[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6115+dfsg1-1-4-g615b235
David Paleino
dapal at debian.org
Fri Dec 20 22:02:46 UTC 2013
The following commit has been merged in the master branch:
commit 51a8af99e590d63756cee7b9c3a01568e2fea92d
Author: David Paleino <dapal at debian.org>
Date: Fri Dec 20 22:16:43 2013 +0100
Imported Upstream version 0.0.svn6502+dfsg1
diff --git a/.classpath b/.classpath
index e137759..dc2d827 100644
--- a/.classpath
+++ b/.classpath
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test/unit"/>
- <classpathentry kind="src" path="test/functional"/>
- <classpathentry excluding="build/|data_nodist/|dist/|doc/|lib/|macosx/|nb/|src/|test/|test/build/|test/functional/|test/performance/|test/unit/|tools/|utils/" kind="src" path=""/>
- <classpathentry kind="src" path="test/performance"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
- <classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
- <classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar"/>
- <classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar"/>
- <classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
- <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
- <classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
- <classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
- <classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.3.jar"/>
- <classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.jar"/>
- <classpathentry kind="lib" path="test/lib/unitils-core/junit-4.4.jar"/>
- <classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar"/>
- <classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.1.jar"/>
- <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="test/unit"/>
+ <classpathentry kind="src" path="test/functional"/>
+ <classpathentry excluding="build/|data_nodist/|dist/|doc/|lib/|macosx/|nb/|src/|test/|test/build/|test/functional/|test/performance/|test/unit/|tools/|utils/" kind="src" path=""/>
+ <classpathentry kind="src" path="test/performance"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
+ <classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
+ <classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar"/>
+ <classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar"/>
+ <classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
+ <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
+ <classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
+ <classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
+ <classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.3.jar"/>
+ <classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.jar"/>
+ <classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar"/>
+ <classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.3.jar"/>
+ <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..4824b80
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 9b4b707..6fcdf65 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Wed Jan 27 11:53:40 EST 2010
cleanup_settings_version=2
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
@@ -13,6 +12,7 @@ sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=false
sp_cleanup.always_use_parentheses_in_expressions=false
@@ -50,7 +50,7 @@ sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
diff --git a/CONTRIBUTION b/CONTRIBUTION
index 05866b7..dec5a68 100644
--- a/CONTRIBUTION
+++ b/CONTRIBUTION
@@ -2,7 +2,7 @@ JOSM was originally designed and coded by Immanuel Scholz,
and is now maintained by the OpenStreetMap community.
The current JOSM maintainer is Dirk Stöcker.
-A lot of administration work is done by Paul Hartmann.
+A lot of administration work is done by Paul Hartmann and Vincent Privat.
Major code contributions from (in alphabetical order):
@@ -42,3 +42,23 @@ with Apache license version 2.0.
The signpost code (http://code.google.com/p/oauth-signpost/)
is from Matthias Käppler and licensed with the Apache License 2.0.
+
+The NTv2 transformation code (http://jgridshift.sourceforge.net/)
+is from Peter Yuill and licensed with LGPL.
+
+The MultiSplitPane is from Hans Muller and licensed with LGPL
+(https://today.java.net/pub/a/today/2006/03/23/multi-split-pane.html).
+
+The Diff code (http://www.bmsi.com/java/#diff)
+is from Stuart D. Gathman and licensed with GPL.
+
+The Ellipsoid code (http://www.i3s.unice.fr/~johan/gps/)
+is from Johan Montagnat and licensed with GPL.
+
+The JSON code (https://github.com/douglascrockford/JSON-java)
+is from Douglas Crockford and licensed as follows:
+"The Software shall be used for Good, not Evil."
+
+The opening hour validation uses code from opening_hour.js
+(https://github.com/ypid/opening_hours.js) which is licensed
+with the New (2-clause) BSD license.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 17848b8..ad758c9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,8 +10,8 @@ http://www.gnu.org/licenses/gpl.html
The GPL v2 is accessible here:
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-When compiled with Bzip2 support code included the whole software is licensed
-GPL v3 or later.
+When compiled with Bzip2 support code included the whole software is
+licensed GPL v3 or later.
diff --git a/README b/README
index b8b1884..5b26e50 100644
--- a/README
+++ b/README
@@ -16,8 +16,8 @@ How to get Java Runtime Environment
-----------------------------------
You need JRE Version 1.6 (also called Java 6), or later.
-Microsoft Windows users should visit http://www.java.com
-and download the latest Java executable for Windows systems.
+Microsoft Windows and Apple Mac OS X users should visit http://www.java.com
+and download the latest Java executable for their system.
Linux users should visit http://www.oracle.com/technetwork/java/index.html
There is a Linux binary installer, which you must execute from a console, or
@@ -101,14 +101,18 @@ This is an overview of the files and directories in the JOSM code repository:
- sytles_nodist/ files needed for map style maintenance
- potlatch2/README infos on how to update the Potlatch 2 style from upstream sources
- test/ automated software tests
+ - data/ resources used for some tests
- functional/ functional tests (source code)
- lib/ libraries needed for (some of) the tests
+ - performance/ performance tests (source code)
- unit/ unit tests (source code)
- tools/ libraries and tools that help in the development process
- - animal-sniffer-ant-tasks-1.7.jar
+ - animal-sniffer-ant-tasks-1.8.jar
TODO: what is this?
+ - appbundler-1.0ea.jar used to build Mac OS X package for Oracle Java 7
- 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
+ - jacocoant.jar used to include coverage data into JUnit test reports
- javacc.jar used in the build process to generate some .java files from a javacc source file
(src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
- proguard.jar optimize final binary jar - see build.xml (not used in production so far)
diff --git a/REVISION b/REVISION
index 9f637c5..231a96a 100644
--- a/REVISION
+++ b/REVISION
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
+ revision="6502"
kind="dir"
- path="trunk"
- revision="5759">
+ path="trunk">
<url>http://josm.openstreetmap.de/svn/trunk</url>
<repository>
<root>http://josm.openstreetmap.de/svn</root>
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="5759">
-<author>Don-vip</author>
-<date>2013-03-06T21:41:42.179450Z</date>
+ revision="6502">
+<author>simon04</author>
+<date>2013-12-19T21:48:46.640985Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index d9aade0..fcdf49d 100644
--- a/build.xml
+++ b/build.xml
@@ -7,9 +7,8 @@
** This will create 'josm-custom.jar' in directory 'dist'. See also
** https://josm.openstreetmap.de/wiki/CreateBuild
**
-**
-->
-<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" basedir=".">
+<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
<property name="test.dir" location="test"/>
<property name="src.dir" location="src"/>
<property name="build.dir" location="build"/>
@@ -29,16 +28,16 @@
</path>
<!--
- ** Used by Eclipse ant builder for updating
- ** the REVISION file used by JOSM
- -->
+ ** Used by Eclipse ant builder for updating
+ ** the REVISION file used by JOSM
+ -->
<target name="create-revision-eclipse">
<property name="revision.dir" value="bin"/>
<antcall target="create-revision"/>
</target>
<!--
- ** Creates the REVISION file to be included in the distribution
- -->
+ ** Creates the REVISION file to be included in the distribution
+ -->
<target name="create-revision">
<property name="revision.dir" value="${build.dir}"/>
<exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
@@ -62,7 +61,15 @@ Is-Local-Build: true
Build-Date: ${build.tstamp}
</echo>
</target>
- <target name="dist" depends="compile,create-revision">
+ <target name="check-schemas">
+ <schemavalidate file="data/defaultpresets.xml" >
+ <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="data/tagging-preset.xsd" />
+ </schemavalidate>
+ <schemavalidate file="styles/standard/elemstyles.xml" >
+ <schema namespace="http://josm.openstreetmap.de/mappaint-style-1.0" file="data/mappaint-style.xsd" />
+ </schemavalidate>
+ </target>
+ <target name="dist" depends="compile,create-revision,check-schemas">
<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
<env key="LANG" value="C"/>
<arg value="info"/>
@@ -85,6 +92,9 @@ Build-Date: ${build.tstamp}
<attribute name="Main-class" value="JOSM"/>
<attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
<attribute name="Main-Date" value="${version.entry.commit.date}"/>
+ <attribute name="Permissions" value="all-permissions"/>
+ <attribute name="Codebase" value="josm.openstreetmap.de"/>
+ <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
@@ -95,6 +105,7 @@ Build-Date: ${build.tstamp}
<!-- <zipfileset src="lib/signpost-core-1.2.1.1.jar"/> -->
</jar>
</target>
+ <!-- Compatibility Mac OS X target for Java 6 (incompatible with new on for Java 7, see #8654, #9035) -->
<target name="distmac" depends="dist">
<!-- modify MacOS X Info.plist file to hold the SVN version number -->
<copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
@@ -108,16 +119,65 @@ Build-Date: ${build.tstamp}
<zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
</zip>
</target>
+ <!-- New Mac OS X target for Java 7 -->
+ <target name="distmac7" depends="dist">
+ <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
+ <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="tools/appbundler-1.0ea.jar"/>
+ <!-- create MacOS X application bundle -->
+ <bundleapp outputdirectory="dist" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
+ mainclassname="org.openstreetmap.josm.gui.MainApplication"
+ copyright="JOSM, and all its integral parts, are released under the GNU General Public License v2 or later"
+ applicationCategory="public.app-category.utilities"
+ shortversion="${version.entry.commit.revision} SVN"
+ version="${version.entry.commit.revision} SVN"
+ icon="macosx/JOSM.app/Contents/Resources/JOSM.icns"
+ highResolutionCapable="true">
+
+ <arch name="x86_64"/>
+ <arch name="i386"/>
+
+ <classpath file="dist/josm-custom.jar"/>
+
+ <option value="-Xmx512m"/>
+
+ <option value="-Xdock:icon=Contents/Resources/JOSM.icns"/>
+ <option value="-Xdock:name=JOSM"/>
+
+ <!-- OSX specific options, optional -->
+ <option value="-Dapple.laf.useScreenMenuBar=true"/>
+ <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
+ <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
+ <option value="-Dcom.apple.mrj.application.apple.menu.about.name=JOSM"/>
+ <option value="-Dcom.apple.smallTabs=true"/>
+ </bundleapp>
+
+ <!-- appbundler lacks the possibility of defining our own keys or using a template, so update the .plist manually -->
+ <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="tools/xmltask.jar"/>
+
+ <xmltask source="dist/JOSM.app/Contents/Info.plist" dest="dist/JOSM.app/Contents/Info.plist" indent="false">
+ <insert position="before" path="/plist/dict/key[1]"><![CDATA[<key>CFBundleAllowMixedLocalizations</key>
+<string>true</string>
+]]></insert>
+ </xmltask>
+
+ <!-- create ZIP file with MacOS X application bundle -->
+ <zip destfile="dist/josm-custom-macosx-java7.zip" update="true">
+ <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
+ <zipfileset dir="dist" includes="JOSM.app/**/*" filemode="755" />
+ </zip>
+ </target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
<exec append="false" executable="java" failifexecutionfails="true">
<arg value="-cp"/>
<arg value="${javacc.home}/javacc.jar"/>
<arg value="javacc"/>
+ <arg value="-JDK_VERSION=1.6"/>
+ <arg value="-GRAMMAR_ENCODING=UTF-8"/>
+ <arg value="-UNICODE_INPUT"/>
<arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
<arg value="${mapcss.dir}/MapCSSParser.jj"/>
</exec>
-<!-- <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
</target>
<target name="compile" depends="init,javacc">
<javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="iso-8859-1"/>
@@ -162,39 +222,44 @@ Build-Date: ${build.tstamp}
<pathelement path="dist/josm-custom.jar"/>
</path>
<target name="test-init">
- <mkdir dir="${test.dir}/${build.dir}"/>
+ <mkdir dir="${test.dir}/build"/>
<mkdir dir="${test.dir}/report"/>
</target>
<target name="test-clean">
- <delete dir="${test.dir}/${build.dir}"/>
+ <delete dir="${test.dir}/build"/>
<delete dir="${test.dir}/report"/>
+ <delete file="${test.dir}/jacoco.exec" />
</target>
<target name="test-compile" depends="test-init,dist">
- <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}" target="1.5" source="1.5" debug="on" encoding="UTF-8">
+ <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
- <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}" target="1.5" source="1.5" debug="on" encoding="UTF-8">
+ <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
</target>
<target name="test" depends="test-compile">
- <junit printsummary="yes">
- <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
- <sysproperty key="java.awt.headless" value="true"/>
- <sysproperty key="suppressPermanentFailure" value="${suppressPermanentFailure}"/>
- <classpath>
- <path refid="test.classpath"/>
- <pathelement path="${test.dir}/${build.dir}"/>
- <pathelement path="${test.dir}/config"/>
- </classpath>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <batchtest fork="yes" todir="${test.dir}/report">
- <fileset dir="${test.dir}/unit" includes="**/*.java"/>
- </batchtest>
- </junit>
+ <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="tools/jacocoant.jar" />
+ <jacoco:coverage destfile="${test.dir}/jacoco.exec">
+ <junit printsummary="yes" fork="true" forkmode="once">
+ <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
+ <sysproperty key="josm.test.data" value="${test.dir}/data"/>
+ <sysproperty key="java.awt.headless" value="true"/>
+ <sysproperty key="suppressPermanentFailure" value="${suppressPermanentFailure}"/>
+ <classpath>
+ <path refid="test.classpath"/>
+ <pathelement path="${test.dir}/build"/>
+ <pathelement path="${test.dir}/config"/>
+ </classpath>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest fork="yes" todir="${test.dir}/report">
+ <fileset dir="${test.dir}/unit" includes="**/*.java"/>
+ </batchtest>
+ </junit>
+ </jacoco:coverage>
</target>
<target name="test-html" depends="test" description="Generate HTML test reports">
<!-- May require additional ant dependencies like ant-trax package -->
@@ -204,6 +269,20 @@ Build-Date: ${build.tstamp}
</fileset>
<report todir="${test.dir}/report/html"/>
</junitreport>
+ <jacoco:report>
+ <executiondata>
+ <file file="${test.dir}/jacoco.exec"/>
+ </executiondata>
+ <structure name="JOSM Test Coverage">
+ <classfiles>
+ <fileset dir="${build.dir}" includes="org/openstreetmap/"/>
+ </classfiles>
+ <sourcefiles encoding="UTF-8">
+ <fileset dir="${src.dir}" includes="org/openstreetmap/"/>
+ </sourcefiles>
+ </structure>
+ <html destdir="${test.dir}/report/jacoco"/>
+ </jacoco:report>
</target>
<target name="dist-optimized" depends="dist">
<taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar"/>
@@ -244,7 +323,7 @@ Build-Date: ${build.tstamp}
# Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'. This notes should not be a problem as we don't use obfuscation
-dontnote
- </proguard>
+ </proguard>
</target>
<target name="check-plugins" depends="dist-optimized">
<echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
@@ -284,29 +363,29 @@ Build-Date: ${build.tstamp}
<replaceregex pattern="^.*;" replace="" flags="gi"/>
</tokenfilter>
</filterchain>
- </loadresource>
- <!-- Delete files that are not in plugin list (like old plugins) -->
- <loadresource property="file-list">
- <propertyresource name="plugins"/>
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="^.*/(.*)$" replace="\1\|" flags=""/>
- </tokenfilter>
- <striplinebreaks/>
- <tokenfilter>
- <replaceregex pattern="\|$" replace="" flags="gi"/>
- </tokenfilter>
- </filterchain>
- </loadresource>
- <delete>
- <restrict>
- <fileset dir="${dir}"/>
- <not>
- <name regex="${file-list}"/>
- </not>
- </restrict>
- </delete>
- <!-- Download plugins -->
+ </loadresource>
+ <!-- Delete files that are not in plugin list (like old plugins) -->
+ <loadresource property="file-list">
+ <propertyresource name="plugins"/>
+ <filterchain>
+ <tokenfilter>
+ <replaceregex pattern="^.*/(.*)$" replace="\1\|" flags=""/>
+ </tokenfilter>
+ <striplinebreaks/>
+ <tokenfilter>
+ <replaceregex pattern="\|$" replace="" flags="gi"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <delete>
+ <restrict>
+ <fileset dir="${dir}"/>
+ <not>
+ <name regex="${file-list}"/>
+ </not>
+ </restrict>
+ </delete>
+ <!-- Download plugins -->
<copy todir="${dir}" flatten="true">
<resourcelist>
<string value="${plugins}"/>
@@ -319,7 +398,7 @@ Build-Date: ${build.tstamp}
<fileset file="${java.home}/lib/rt.jar"/>
<fileset file="${java.home}/lib/jce.jar"/>
</path>
- </as:build-signatures>
+ </as:build-signatures>
<as:check-signature signature="${dir}/api.sig">
<ignore classname="org.jgraph.*"/>
<ignore classname="com.touchgraph.*"/>
@@ -336,23 +415,23 @@ Build-Date: ${build.tstamp}
</target>
<target name="findbugs" depends="dist">
- <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/findbugs/findbugs-ant.jar"/>
+ <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/findbugs/findbugs-ant.jar"/>
<path id="findbugs-classpath">
<fileset dir="tools/findbugs/">
<include name="*.jar"/>
</fileset>
</path>
- <property name="findbugs-classpath" refid="findbugs-classpath"/>
- <findbugs output="xml"
+ <property name="findbugs-classpath" refid="findbugs-classpath"/>
+ <findbugs output="xml"
outputFile="findbugs-josm.xml"
- classpath="${findbugs-classpath}"
- pluginList=""
- excludeFilter="tools/findbugs/josm-filter.xml"
- effort="max"
- >
- <sourcePath path="${basedir}/src" />
- <class location="${basedir}/dist/josm-custom.jar" />
- </findbugs>
+ classpath="${findbugs-classpath}"
+ pluginList=""
+ excludeFilter="tools/findbugs/josm-filter.xml"
+ effort="max"
+ >
+ <sourcePath path="${basedir}/src" />
+ <class location="${basedir}/dist/josm-custom.jar" />
+ </findbugs>
</target>
<target name="run" depends="dist">
<java jar="dist/josm-custom.jar" fork="true">
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 105c0bd..41fd0be 100755
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -18,12 +18,23 @@ item:
name_template: define custom formatting for OSM primitives
see http://josm.openstreetmap.de/wiki/NameTemplate
+group: a group of items (same syntax as "item")
+
link: link to the relating map features website
href: the URL
label: simple static text label
text: the text to display
+space: empty line
+
+optional: optional tags, short for "space" plus "label" plus "space"
+ text: the text to display (defaults to "Optional Attributes:")
+
+separator: separator line in menus
+
+item_separator: horizontal separator line between items (in window)
+
key: fixed key/value pair to be set
key: key to set
value: value to set
@@ -46,19 +57,26 @@ text: text box
combo: combo box, with multiple choices and possible to enter free form text
key: key to set
text: fixed label to display
- values: comma separated list of values
+ delimiter: character that separates values (default: comma)
+ values: separated list of values
+ values_from: to use instead of "values" if the list of values has to be obtained with a Java method
+ of this form: public static String[] getValues();
+ The value must be: "full.package.name.ClassName#methodName"
display_values: comma separated list of values to be displayed instead of the
database values, order and number must be equal to values
short_descriptions: comma separated list of texts to be displayed below each
display_value. (Only if it is not possible to describe
- the entry in 2-3 words.) Instead of comma separeted list
+ the entry in 2-3 words.) Instead of comma separated list
instead using values, display_values and short_descriptions, the following form is also supported:
- <list_entry value="" display_value="' short_description="" icon="" icon_size=""/>
+ <list_entry value="" display_value="" short_description="" icon="" icon_size="" />
icon: location of icon
icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
default: default string to display (defaults to "")
use_last_as_default: true/false/force (default is "false")
+ editable: allow to add other values as text (default is "true")
match: none/key/key!/keyvalue (default is none, see below for more information)
+ values_searchable: true/false (whether to search in combo (display_)values when searching for presets)
+ length: length of input box (number of characters allowed)
multiselect: list of values from which zero or more can be selected
key: key to set
@@ -66,6 +84,9 @@ multiselect: list of values from which zero or more can be selected
delimiter: character that separates values (default: semicolon) - this
will also be used to separate selected values in the tag.
values: delimiter-separated list of values (delimiter can be escaped with backslash)
+ values_from: to use instead of "values" if the list of values has to be obtained with a Java method
+ of this form: public static String[] getValues();
+ The value must be: "full.package.name.ClassName#methodName"
rows: specify the number of rows to display (default -1)
display_values: delimiter-separated list of values to be displayed instead of the
database values, order and number must be equal to values
@@ -73,12 +94,16 @@ multiselect: list of values from which zero or more can be selected
display_value. (Only if it is not possible to describe
the entry in 2-3 words.) Instead of a separated list
instead using values, display_values and short_descriptions, the following form is also supported:
- <list_entry value="" display_value="' short_description="" icon="" icon_size=""/>
+ <list_entry value="" display_value="' short_description="" icon="" icon_size="" />
icon: location of icon
icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
default: default string to display (defaults to "")
use_last_as_default: true/false/force (default is "false")
match: none/key/key!/keyvalue (default is "none", see below for more information)
+ values_searchable: true/false (whether to search in multiselect (display_)values when searching for presets)
+
+checkgroup: group of checks
+ columns: number of columns
check: checkbox
key: key to set
@@ -132,6 +157,7 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=motorway"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=motorway"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:highway=motorway"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=motorway"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=motorway"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway" />
@@ -141,16 +167,19 @@ Note that for a match, at least one positive and no negative is required.
<text key="ref" text="Reference" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <check key="oneway" text="Oneway" default="on" />
- <check key="bridge" text="Bridge" default="off" />
- <check key="tunnel" text="Tunnel" default="off" />
- <check key="cutting" text="Cutting" default="off" />
- <check key="embankment" text="Embankment" default="off" />
- <check key="lit" text="Lit" default="off" />
+ <checkgroup columns="4">
+ <check key="oneway" text="Oneway" default="on" />
+ <check key="bridge" text="Bridge" default="off" />
+ <check key="tunnel" text="Tunnel" default="off" />
+ <check key="cutting" text="Cutting" default="off" />
+ <check key="embankment" text="Embankment" default="off" />
+ <check key="lit" text="Lit" default="off" />
+ <check key="toll" text="Toll" default="off" />
+ </checkgroup>
</optional>
</item>
<item name="Motorway Link" icon="presets/motorway.png" type="way">
@@ -164,19 +193,21 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_link"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway_link" />
<label text="Edit Motorway Link" />
- <space />
<key key="highway" value="motorway_link" />
<optional>
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <check key="oneway" text="Oneway" default="on" />
- <check key="bridge" text="Bridge" default="off" />
- <check key="tunnel" text="Tunnel" default="off" />
- <check key="cutting" text="Cutting" default="off" />
- <check key="embankment" text="Embankment" default="off" />
- <check key="lit" text="Lit" default="off" />
+ <checkgroup columns="4">
+ <check key="oneway" text="Oneway" default="on" />
+ <check key="bridge" text="Bridge" />
+ <check key="tunnel" text="Tunnel" />
+ <check key="cutting" text="Cutting" />
+ <check key="embankment" text="Embankment" />
+ <check key="lit" text="Lit" />
+ <check key="toll" text="Toll" />
+ </checkgroup>
</optional>
</item>
<item name="Trunk" icon="presets/trunk.png" type="way">
@@ -185,6 +216,7 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=trunk"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=trunk"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=trunk"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=trunk"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=trunk"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=trunk"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=trunk" />
@@ -194,17 +226,20 @@ Note that for a match, at least one positive and no negative is required.
<text key="ref" text="Reference" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="2" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <check key="oneway" text="Oneway" default="on" />
- <check key="motorroad" text="Motorroad" default="on" />
- <check key="bridge" text="Bridge" default="off" />
- <check key="tunnel" text="Tunnel" default="off" />
- <check key="cutting" text="Cutting" default="off" />
- <check key="embankment" text="Embankment" default="off" />
- <check key="lit" text="Lit" default="off" />
+ <checkgroup columns="4">
+ <check key="oneway" text="Oneway" default="on" />
+ <check key="motorroad" text="Motorroad" default="on" />
+ <check key="bridge" text="Bridge" />
+ <check key="tunnel" text="Tunnel" />
+ <check key="cutting" text="Cutting" />
+ <check key="embankment" text="Embankment" />
+ <check key="lit" text="Lit" />
+ <check key="toll" text="Toll" />
+ </checkgroup>
</optional>
</item>
<item name="Trunk Link" icon="presets/trunk.png" type="way">
@@ -214,23 +249,26 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
<label text="Edit Trunk Link" />
<space />
<key key="highway" value="trunk_link" />
<text key="ref" text="Reference" />
<optional>
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" default="1" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <check key="oneway" text="Oneway" default="on" />
- <check key="motorroad" text="Motorroad" default="on" />
- <check key="bridge" text="Bridge" default="off" />
- <check key="tunnel" text="Tunnel" default="off" />
- <check key="cutting" text="Cutting" default="off" />
- <check key="embankment" text="Embankment" default="off" />
- <check key="lit" text="Lit" default="off" />
+ <checkgroup columns="4">
+ <check key="oneway" text="Oneway" default="on" />
+ <check key="motorroad" text="Motorroad" default="on" />
+ <check key="bridge" text="Bridge" />
+ <check key="tunnel" text="Tunnel" />
+ <check key="cutting" text="Cutting" />
+ <check key="embankment" text="Embankment" />
+ <check key="lit" text="Lit" />
+ <check key="toll" text="Toll" />
+ </checkgroup>
</optional>
</item>
<separator/>
@@ -239,6 +277,8 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=primary"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=primary"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=primary"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:highway=primary"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=primary"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=primary"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=primary" />
@@ -248,9 +288,8 @@ Note that for a match, at least one positive and no negative is required.
<text key="ref" text="Reference" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
@@ -259,6 +298,7 @@ Note that for a match, at least one positive and no negative is required.
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
</optional>
</item>
@@ -269,14 +309,12 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
<label text="Edit Primary Link" />
- <space />
<key key="highway" value="primary_link" />
<optional>
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
@@ -285,6 +323,7 @@ Note that for a match, at least one positive and no negative is required.
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
</optional>
</item>
@@ -293,7 +332,9 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=secondary"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=secondary"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=secondary"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=secondary"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=secondary"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=secondary"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=secondary" />
@@ -303,9 +344,8 @@ Note that for a match, at least one positive and no negative is required.
<text key="ref" text="Reference" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
@@ -313,6 +353,7 @@ Note that for a match, at least one positive and no negative is required.
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
</optional>
</item>
@@ -323,14 +364,12 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
<label text="Edit Secondary Link" />
- <space />
<key key="highway" value="secondary_link" />
<optional>
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
@@ -338,6 +377,7 @@ Note that for a match, at least one positive and no negative is required.
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
</optional>
</item>
@@ -347,7 +387,9 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=tertiary"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=tertiary"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=tertiary"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=tertiary"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=tertiary"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=tertiary"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=tertiary" />
@@ -357,9 +399,8 @@ Note that for a match, at least one positive and no negative is required.
<text key="ref" text="Reference" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
@@ -367,6 +408,7 @@ Note that for a match, at least one positive and no negative is required.
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
</optional>
</item>
@@ -377,14 +419,12 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Link_(highway)"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Link_(highway)"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Link_(highway)"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)"/>
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
<label text="Edit Tertiary Link" />
- <space />
<key key="highway" value="tertiary_link" />
<optional>
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
@@ -392,44 +432,47 @@ Note that for a match, at least one positive and no negative is required.
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
</optional>
</item>
- <item name="Unclassified" icon="presets/way_unclassified.png" type="way">
+ <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=unclassified"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=unclassified"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=unclassified"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=unclassified"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=unclassified"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=unclassified" />
<label text="Edit Unclassified Road" />
- <space />
<key key="highway" value="unclassified" />
<optional>
<text key="name" text="Name" />
+ <text key="ref" text="Reference" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
<check key="passing_places" text="Passing Places" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <text key="maxspeed" text="Max. speed (km/h)" />
- <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
- <item name="Residential" icon="presets/residential.png" type="way">
+ <item name="Residential" icon="presets/residential.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=residential"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=residential"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=residential"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=residential"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=residential"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=residential"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential" />
@@ -438,42 +481,73 @@ Note that for a match, at least one positive and no negative is required.
<key key="highway" value="residential" />
<text key="name" text="Name" />
<optional>
+ <text key="ref" text="Reference" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
+ <text key="width" text="Width (meters)" />
+ </optional>
+ </item>
+ <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bicycle_road"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bicycle_road" />
+ <label text="Edit Bicycle Road" />
+ <space />
+ <key key="bicycle_road" value="yes" />
+ <key key="bicycle" value="designated" />
+ <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" />
+ <text key="name" text="Name" />
+ <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
+ <text key="maxspeed" text="Max. speed (km/h)" default="30" />
+ <optional>
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
<combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <text key="width" text="Width (meters)" />
+ <check key="oneway" text="Oneway" default="off" />
+ <check key="oneway:bicycle" text="Oneway for bicycle" default="off" />
+ <check key="bridge" text="Bridge" default="off" />
+ <check key="tunnel" text="Tunnel" default="off" />
+ <check key="cutting" text="Cutting" default="off" />
+ <check key="embankment" text="Embankment" default="off" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <check key="lit" text="Lit" default="off" />
+ <text key="width" text="Width (meters)" />
</optional>
</item>
- <item name="Living Street" icon="presets/living_street.png" type="way">
+ <item name="Living Street" icon="presets/living_street.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=living_street"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=living_street"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=living_street"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=living_street"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=living_street" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=living_street"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=living_street" />
<label text="Edit Living Street" />
<space />
<key key="highway" value="living_street" />
<text key="name" text="Name" />
<optional>
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation">
@@ -483,6 +557,7 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=pedestrian"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=pedestrian"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=pedestrian"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=pedestrian"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=pedestrian"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=pedestrian"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=pedestrian" />
@@ -491,20 +566,20 @@ Note that for a match, at least one positive and no negative is required.
<key key="highway" value="pedestrian" />
<text key="name" text="Name" />
<optional>
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="area" text="Area" default="off" />
- <check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
- <item name="Service" icon="presets/way_unclassified.png" type="way">
+ <item name="Service" icon="presets/way_unclassified.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=service"
@@ -513,94 +588,97 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=service"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=service"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=service" />
- <label text="Edit Serviceway" />
+ <label text="Edit Service Way" />
<space />
<key key="highway" value="service" />
+ <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
<optional>
- <combo key="service" text="Serviceway type" values="alley,driveway,parking_aisle" />
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
<check key="passing_places" text="Passing Places" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
- <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way">
+ <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:service=parking_aisle"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:service=parking_aisle"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:service=parking_aisle"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:service=parking_aisle"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:service=parking_aisle" />
<label text="Edit Parking Aisle" />
- <space />
<key key="highway" value="service" />
<key key="service" value="parking_aisle" />
<optional>
- <check key="oneway" text="Oneway" default="off" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+ <check key="oneway" text="Oneway" default="off" />
<check key="lit" text="Lit" default="off" />
</optional>
</item>
- <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way">
+ <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=road"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=road"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=road"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=road"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=road"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=road" />
<label text="Edit Road of unknown type" />
- <space />
<key key="highway" value="road" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
- <item name="Construction" icon="presets/construction.png" type="way">
- <label text="Edit Highway Under Construction" />
+ <item name="Construction" icon="presets/construction.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:construction"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:construction"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:construction"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:construction"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:construction" />
- <space />
+ <label text="Edit Highway Under Construction" />
<key key="highway" value="construction" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
- <text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<separator/>
@@ -617,14 +695,17 @@ Note that for a match, at least one positive and no negative is required.
sv.href="http://wiki.openstreetmap.org/wiki/Sv:Key:access"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:access" />
<label text="Edit Road Restrictions" />
+ <space />
<check key="oneway" text="Oneway" default="off" />
<check key="toll" text="Toll" default="off" />
<check key="noexit" text="No exit (cul-de-sac)" default="off" />
<label text="Transport mode restrictions" />
- <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
+ <space />
+ <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
<combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
<combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
<label text="Vehicles per type" />
+ <space />
<combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
<combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" match="key" />
<combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
@@ -633,10 +714,12 @@ Note that for a match, at least one positive and no negative is required.
<combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
<combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
<label text="Vehicles per use" />
+ <space />
<combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" />
- <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,permissive,private,no" match="key" />
+ <combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,permissive,private,no" match="keyvalue" />
<combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
<combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
+ <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
<text key="maxspeed" text="Max. speed (km/h)" />
<text key="minspeed" text="Min. speed (km/h)" match="key" />
<text key="maxweight" text="Max. weight (tonnes)" match="key" />
@@ -656,22 +739,23 @@ Note that for a match, at least one positive and no negative is required.
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:junction=roundabout"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:junction=roundabout"
ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:junction=roundabout" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:junction=roundabout"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:junction=roundabout" />
<label text="Edit Junction" />
<space />
<key key="junction" value="roundabout" />
<combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
- <text key="width" text="Width (meters)" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <text key="width" text="Width (meters)" />
</optional>
</item>
<item name="Bridge" icon="presets/bridge.png" type="way">
@@ -681,27 +765,30 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:bridge"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:bridge"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:bridge"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:bridge"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:bridge"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:bridge" />
<label text="Edit Bridge" />
<space />
- <combo key="bridge" text="Bridge" values="yes,viaduct,swing,aqueduct" match="key!" default="yes" />
+ <combo key="bridge" text="Bridge" values="yes,viaduct,suspension,swing,aqueduct" match="keyvalue" default="yes" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<text key="maxweight" text="Max. weight (tonnes)" />
- <text key="width" text="Width (meters)" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <text key="width" text="Width (meters)" />
+ <check key="toll" text="Toll" />
</optional>
</item>
<item name="Ford" icon="presets/ford.png" type="node,way">
- <label text="Edit Ford" />
<link href="http://wiki.openstreetmap.org/wiki/Key:ford"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:ford" />
- <space />
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Key:ford"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:ford"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:ford" />
+ <label text="Edit Ford" />
<key key="ford" value="yes" />
<optional>
<text key="name" text="Name" />
@@ -710,55 +797,67 @@ Note that for a match, at least one positive and no negative is required.
</item>
</group> <!-- Streets -->
<group name="Ways" icon="presets/way_unclassified.png">
- <item name="Track" icon="presets/track1.png" type="way">
+ <item name="Track" icon="presets/track1.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=track"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=track"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=track"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=track"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=track"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=track"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=track"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=track"
sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=track"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=track" />
<label text="Edit Track" />
- <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
<space />
+ <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
<key key="highway" value="track" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
- <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
+ <check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <check key="oneway" text="Oneway" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
<combo key="access" text="General access" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
<combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
<combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
<combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
- <item name="Path" icon="presets/path.png" type="way">
+ <item name="Path" icon="presets/path.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=path"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=path"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=path"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:highway=path"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=path"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=path"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=path"
sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=path" />
<label text="Edit Path" />
- <space />
<key key="highway" value="path" />
<optional>
<text key="name" text="Name" />
- <combo key="sac_scale" text="SAC Scale">
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+ <check key="oneway" text="Oneway" default="off" />
+ <check key="bridge" text="Bridge" default="off" />
+ <check key="tunnel" text="Tunnel" default="off" />
+ <check key="cutting" text="Cutting" default="off" />
+ <check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <check key="lit" text="Lit" default="off" />
+ <combo key="sac_scale" text="SAC Scale" values_searchable="true">
<list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
<list_entry value="mountain_hiking" display_value="T2 - mountain hiking trail" short_description="Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible" />
<list_entry value="demanding_mountain_hiking" display_value="T3 - difficult, exposed hiking trail" short_description="exposed sites may be secured with ropes or chains, possible need to use hands for balance. Partly exposed sites with fall hazard, scree, pathless jagged rocks" />
@@ -767,14 +866,7 @@ Note that for a match, at least one positive and no negative is required.
<list_entry value="difficult_alpine_hiking" display_value="T6 - hazardous alpine trail with climbing" short_description="climbing up to second grade. Often very exposed, precarious jagged rocks, glacier with danger to slip and fall" />
</combo>
<combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
- <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
- <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" />
- <check key="bridge" text="Bridge" default="off" />
- <check key="tunnel" text="Tunnel" default="off" />
- <check key="cutting" text="Cutting" default="off" />
- <check key="embankment" text="Embankment" default="off" />
- <check key="lit" text="Lit" default="off" />
- <check key="oneway" text="Oneway" default="off" />
+ <combo key="trail_visibility" text="Visibility" values="excellent,good,intermediate,bad,horrible,no" values_context="trail_visibility" />
<combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,private,no" />
<combo key="bicycle" text="Bicycle" values="yes,official,designated,permissive,destination,delivery,private,no" />
<combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" />
@@ -782,10 +874,7 @@ Note that for a match, at least one positive and no negative is required.
<combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
<combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
<!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" /> -->
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<separator/>
@@ -797,24 +886,23 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bridleway"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=bridleway" />
<label text="Edit Bridleway" />
- <space />
<key key="highway" value="bridleway" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ <text key="maxspeed" text="Max. speed (km/h)" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
- <text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
- <item name="Cycle Lane" type="way">
+ <item name="Cycle Lane/Track" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Bicycle"
de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Bicycle"
@@ -822,16 +910,20 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Bicycle"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Bicycle"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Bicycle"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Bicycle"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Bicycle"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Bicycle" />
- <label text="Edit Cycle Lane" />
+ <label text="Edit Cycle Lane or Track" />
+ <space />
<combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
<combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
<combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
<check key="oneway:bicycle" text="Oneway (bicycle)" default="off" />
<space />
- <label text="Edit Highway" />
- <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
- <check key="oneway" text="Oneway" default="off" />
+ <optional text="Edit Highway Attributes:">
+ <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
+ <check key="oneway" text="Oneway" default="off" />
+ </optional>
</item>
<item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
@@ -839,24 +931,24 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=cycleway"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=cycleway"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=cycleway"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=cycleway"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=cycleway" />
<label text="Edit Cycleway" />
- <space />
<key key="highway" value="cycleway" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
<combo key="foot" text="Pedestrians" values="unknown,yes,no" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way">
@@ -864,23 +956,22 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
<label text="Edit Cycleway" />
- <space />
<key key="highway" value="path" />
<key key="bicycle" value="designated" />
<key key="foot" value="designated" />
<key key="segregated" value="yes" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way">
@@ -888,24 +979,23 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
<label text="Edit Cycleway" />
- <space />
<key key="highway" value="path" />
<key key="bicycle" value="designated" />
<key key="foot" value="designated" />
<key key="segregated" value="no" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
<check key="passing_places" text="Passing Places" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<item name="Dedicated Footway" icon="presets/footway.png" type="way">
@@ -913,24 +1003,26 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=footway"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=footway"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=footway"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=footway"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:highway=footway"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=footway"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=footway"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=footway" />
<label text="Edit Footway" />
- <space />
<key key="highway" value="footway" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
+ <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
<check key="lit" text="Lit" default="off" />
- <check key="passing_places" text="Passing Places" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <check key="bicycle" text="Bicycle" default="off" />
<text key="width" text="Width (meters)" />
- <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<item name="Steps" icon="presets/steps.png" type="way">
@@ -942,20 +1034,19 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=steps"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=steps" />
<label text="Edit Flight of Steps" />
- <space />
<key key="highway" value="steps" />
<optional>
<text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
+ <text key="step_count" text="Amount of Steps" />
<check key="oneway" text="Oneway" default="off" />
<check key="bridge" text="Bridge" default="off" />
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
<check key="lit" text="Lit" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
<text key="width" text="Width (meters)" />
- <text key="step_count" text="Amount of Steps" />
</optional>
</item>
</group> <!-- Ways -->
@@ -977,11 +1068,11 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=services"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=services"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=services"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=services"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=services"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=services" />
<label text="Edit Service Station" />
- <space />
<key key="highway" value="services" />
<optional>
<text key="name" text="Name" />
@@ -999,20 +1090,13 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=rest_area"
sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=rest_area" />
<label text="Edit Rest Area" />
- <space />
<key key="highway" value="rest_area" />
<optional>
<text key="name" text="Name" />
<check key="toilets" text="Toilets" default="off" />
+ <check key="drinking_water" text="Drinking Water" default="off" />
</optional>
</item>
- <item name="Emergency Phone" icon="presets/telephone.png" type="node">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
- <key key="emergency" value="phone" />
- </item>
<separator/>
<item name="Traffic Signal" icon="presets/traffic-light.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
@@ -1020,13 +1104,14 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=traffic_signals"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=traffic_signals"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=traffic_signals" />
+ <label text="Edit Traffic Signal" />
<key key="highway" value="traffic_signals" />
- <optional>
+ <optional text="Optional crossing attributes:">
<combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
- <check key="horse" text="Cross on horseback" default="off" />
- <check key="bicycle" text="Cross by bicycle" default="off" />
- <check key="supervised" text="Crossing attendant" default="off" />
<combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+ <check key="supervised" text="Crossing attendant" default="off" />
+ <check key="bicycle" text="Cross by bicycle" default="off" />
+ <check key="horse" text="Cross on horseback" default="off" />
</optional>
</item>
<item name="Stop" icon="presets/Stop.png" type="node">
@@ -1043,6 +1128,8 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=mini_roundabout"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=mini_roundabout" />
<key key="highway" value="mini_roundabout" />
+ <label text="Edit Mini-Roundabout" />
+ <space />
<combo key="direction" text="Direction" values="clockwise" />
</item>
<item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node">
@@ -1051,33 +1138,36 @@ Note that for a match, at least one positive and no negative is required.
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:crossing"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:crossing"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:crossing"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:crossing"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:crossing"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:crossing" />
- <label text="Edit Crossing" />
+ <label text="Edit Pedestrian Crossing" />
+ <space />
<key key="highway" value="crossing" />
- <combo key="crossing" text="Type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+ <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+ <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
+ <check key="supervised" text="Crossing attendant" default="off" />
<check key="bicycle" text="Cross by bicycle" default="off" />
<check key="horse" text="Cross on horseback" default="off" />
- <check key="supervised" text="Crossing attendant" default="off" />
- <combo key="crossing_ref" text="Type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
</item>
- <item name="Traffic Calming" icon="presets/chicane.png" type="node">
+ <item name="Traffic Calming" icon="presets/chicane.png" type="node,way">
<link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_calming"
es.href="http://wiki.openstreetmap.org/wiki/ES:Key:traffic_calming"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:traffic_calming"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:traffic_calming"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:traffic_calming"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:traffic_calming"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:traffic_calming"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming"/>
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
<label text="Edit Traffic Calming" />
- <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" />
+ <space />
+ <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" values_searchable="true" />
</item>
<item name="Passing Place" icon="presets/passingplace.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=passing_place"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=passing_place"/>
- <label text="Edit Passing Place" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=passing_place" />
<key key="highway" value="passing_place" />
</item>
<item name="Turning Circle" icon="presets/turning_circle.png" type="node">
@@ -1091,21 +1181,26 @@ Note that for a match, at least one positive and no negative is required.
<item name="City Limit" icon="presets/citylimit.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign=city_limit"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
+ fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:traffic_sign"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:traffic_sign"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_sign" />
<label text="Edit City Limit Sign" />
<space />
<key key="traffic_sign" value="city_limit" />
- <space />
<text key="name" text="Name" />
<text key="alt_name" text="Second Name" />
</item>
<item name="Speed Camera" icon="presets/speed_camera.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
+ az.href="http://wiki.openstreetmap.org/wiki/Az:Tag:highway=speed_camera"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=speed_camera"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=speed_camera"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=speed_camera"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=speed_camera" />
<key key="highway" value="speed_camera" />
+ <optional>
+ <text key="maxspeed" text="Max. speed (km/h)" />
+ </optional>
</item>
<separator/>
<item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node">
@@ -1124,7 +1219,6 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:mountain_pass"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:mountain_pass" />
<label text="Edit Mountain Pass" />
- <space />
<key key="mountain_pass" value="yes" />
<optional>
<text key="name" text="Name" />
@@ -1133,80 +1227,105 @@ Note that for a match, at least one positive and no negative is required.
</optional>
</item>
</group> <!-- Waypoints -->
- <group name="Barriers" icon="presets/barrier.png">
-
- <!-- *** node barriers *** -->
+ <group name="Barriers" icon="presets/barrier.png"> <!-- *** node barriers *** -->
+ <item name="Block" icon="presets/block.png" type="node,way,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=block"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=block" />
+ <label text="Edit Block" />
+ <key key="barrier" value="block" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ <combo key="material" text="Material" values="concrete,stone" />
+ </optional>
+ </item> <!-- block -->
<item name="Bollard" icon="presets/bollard.png" type="node,way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=bollard"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=bollard"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=bollard"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:barrier=bollard"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bollard"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=bollard" />
<label text="Edit Bollard" />
<space />
<key key="barrier" value="bollard" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
+ <combo key="bollard" text="Bollard type" values="rising,removable" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+ </optional>
</item> <!-- bollard -->
<item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node">
- <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cycle_barrier"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cycle_barrier"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=cycle_barrier"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cycle_barrier" />
+ <label text="Edit Cycle Barrier" />
<key key="barrier" value="cycle_barrier" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- cycle_barrier -->
- <item name="Block" icon="presets/block.png" type="node,way,closedway">
- <key key="barrier" value="block" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- </item> <!-- block -->
<item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
<label text="Edit Cattle Grid" />
- <space />
<key key="barrier" value="cattle_grid" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
</item> <!-- cattle_grid -->
<item name="Bus Trap" icon="presets/empty.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bus_trap" />
+ <label text="Edit Bus Trap" />
<key key="barrier" value="bus_trap" />
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- bus_trap -->
<item name="Spikes" icon="presets/empty.png" type="node">
<label text="Edit Spikes" />
- <space />
<key key="barrier" value="spikes" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
</item> <!-- spikes -->
<item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=toll_booth"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=toll_booth"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=toll_booth"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=toll_booth"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=toll_booth"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=toll_booth" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=toll_booth"
+ zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=toll_booth" />
<label text="Edit Toll Booth" />
- <space />
<key key="barrier" value="toll_booth" />
<optional>
<text key="name" text="Name" />
@@ -1215,28 +1334,33 @@ Note that for a match, at least one positive and no negative is required.
</item> <!-- toll_booth -->
<item name="Border Control" icon="presets/douane.png" type="node">
<label text="Edit Border Control" />
- <space />
<key key="barrier" value="border_control" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
</item> <!-- border_control -->
- <separator/>
-
- <!-- *** linear barriers *** -->
+ <separator/> <!-- *** linear barriers *** -->
<item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=hedge"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=hedge"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=hedge"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:barrier=hedge"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=hedge"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=hedge"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=hedge" />
+ <label text="Edit Hedge" />
<key key="barrier" value="hedge" />
+ <optional>
+ <text key="height" text="Height (meters)" length="7" />
+ <text key="genus" text="Genus" />
+ <text key="species" text="Species" />
+ <text key="taxon" text="Taxon" />
+ </optional>
</item> <!-- hedge -->
<item name="Fence" icon="presets/fence.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence"
@@ -1247,152 +1371,240 @@ Note that for a match, at least one positive and no negative is required.
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=fence"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=fence"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=fence" />
+ <label text="Edit Fence" />
<key key="barrier" value="fence" />
<optional>
- <combo key="fence_type" text="Type" values="barbed_wire,chain,electric,hedge,pole,split_rail,wood" />
+ <combo key="fence_type" text="Type" values="barbed_wire,chain_link,electric,metal,pole,split_rail,wire,wood" />
+ <text key="height" text="Height (meters)" length="7" />
</optional>
</item> <!-- fence -->
+ <item name="Guard Rail" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
+ <label text="Edit Guard Rail" />
+ <key key="barrier" value="guard_rail" />
+ <optional>
+ <text key="height" text="Height (meters)" length="7" />
+ </optional>
+ </item> <!-- guard_rail -->
<item name="Wall" icon="presets/wall.png" type="way,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=wall"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=wall"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=wall"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=wall"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=wall"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=wall"
+ zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=wall" />
+ <label text="Edit Wall" />
<key key="barrier" value="wall" />
+ <optional>
+ <text key="height" text="Height (meters)" length="7" />
+ </optional>
</item> <!-- wall -->
<item name="City Wall" icon="presets/city_wall.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=city_wall"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=city_wall"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=city_wall" />
+ <label text="Edit City Wall" />
<key key="barrier" value="city_wall" />
+ <optional>
+ <text key="height" text="Height (meters)" length="7" />
+ </optional>
</item> <!-- city_wall -->
<item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=retaining_wall"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=retaining_wall"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=retaining_wall"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=retaining_wall"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=retaining_wall"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=retaining_wall" />
+ <label text="Edit Retaining Wall" />
<key key="barrier" value="retaining_wall" />
+ <optional>
+ <text key="height" text="Height (meters)" length="7" />
+ </optional>
</item> <!-- retaining_wall -->
- <item name="Ditch" type="way">
+ <item name="Ditch" name_context="Barrier" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=ditch"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=ditch"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=ditch" />
+ <label text="Edit Ditch" text_context="Barrier" />
<key key="barrier" value="ditch" />
<optional>
- <text key="width" text="Width (meters)" />
+ <text key="width" text="Width (meters)" length="7" />
</optional>
</item> <!-- ditch -->
- <separator/>
-
- <!-- *** access *** -->
- <item name="Entrance" icon="styles/standard/vehicle/entrance.png" type="node">
- <label text="Edit Entrance" />
- <space />
+ <item name="Kerb" type="way,closedway">
+ <label text="Edit Kerb" />
+ <key key="barrier" value="kerb" />
+ <optional>
+ <text key="height" text="Height (meters)" length="7" />
+ </optional>
+ </item> <!-- kerb -->
+ <separator/> <!-- *** access *** -->
+ <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=entrance"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=entrance" />
+ <label text="Edit Entrance (barrier opening)" />
<key key="barrier" value="entrance" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- entrance -->
<item name="Gate" icon="presets/gate.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:barrier=gate"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=gate"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=gate"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=gate"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=gate" />
<label text="Edit Gate" />
- <space />
<key key="barrier" value="gate" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- gate -->
<item name="Lift Gate" icon="presets/lift_gate.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=lift_gate"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=lift_gate"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=lift_gate"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:barrier=lift_gate"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=lift_gate" />
<label text="Edit Lift Gate" />
- <space />
<key key="barrier" value="lift_gate" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- lift_gate -->
<item name="Hampshire Gate" icon="presets/empty.png" type="node">
<label text="Edit Hampshire Gate" />
- <space />
<key key="barrier" value="hampshire_gate" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- hampshire_gate -->
<item name="Bump Gate" icon="presets/empty.png" type="node">
<label text="Edit Bump Gate" />
- <space />
<key key="barrier" value="bump_gate" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- bump_gate -->
<item name="Kissing Gate" icon="presets/empty.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate" />
<label text="Edit Kissing Gate" />
- <space />
<key key="barrier" value="kissing_gate" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- kissing_gate -->
+ <item name="Chain" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
+ <label text="Edit Chain" />
+ <key key="barrier" value="chain" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
+ <optional>
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
+ </item> <!-- chain -->
<item name="Stile" icon="presets/stile.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
<label text="Edit Stile" />
<space />
<key key="barrier" value="stile" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="off" />
+ <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
+ <optional>
+ <combo key="material" text="Material" values="metal,stone,wood" />
+ </optional>
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="off" />
+ </optional>
</item> <!-- stile -->
<item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=stile"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=stile" />
<label text="Edit Turnstile" />
- <space />
<key key="barrier" value="turnstile" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="off" />
+ </optional>
</item> <!-- turnstile -->
<item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=sally_port" />
<label text="Edit Sally Port" />
- <space />
<key key="barrier" value="sally_port" />
- <label text="Allowed traffic:" />
- <space />
- <check key="foot" text="Foot" default="on" />
- <check key="bicycle" text="Bicycle" default="on" />
- <check key="horse" text="Horse" default="off" />
- <check key="motorcycle" text="Motorcycle" default="off" />
- <check key="motorcar" text="Motorcar" default="off" />
+ <optional text="Allowed traffic:">
+ <check key="foot" text="Foot" default="on" />
+ <check key="bicycle" text="Bicycle" default="on" />
+ <check key="horse" text="Horse" default="off" />
+ <check key="motorcycle" text="Motorcycle" default="off" />
+ <check key="motorcar" text="Motorcar" default="off" />
+ </optional>
+ <optional>
+ <text key="maxheight" text="Max. height (meters)" length="7" />
+ <text key="maxwidth" text="Max. width (meters)" length="7" />
+ </optional>
</item> <!-- sally_port -->
-
</group> <!-- Barriers -->
<group name="Passageways" icon="presets/tunnel.png">
<item name="Tunnel" icon="presets/tunnel.png" type="way">
- <label text="Edit Tunnel"/>
<link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel"
@@ -1402,18 +1614,18 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
- <space />
+ <label text="Edit Tunnel" />
<key key="tunnel" value="yes" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+ <check key="toll" text="Toll" />
</optional>
</item>
<item name="Building Passage" icon="presets/tunnel.png" type="way">
- <label text="Edit Building Passage"/>
<link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel"
@@ -1423,52 +1635,53 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
- <space />
+ <label text="Edit Building Passage" />
<key key="tunnel" value="building_passage" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
</item>
<item name="Arcade" type="way">
- <label text="Edit Arcade"/>
<link href="http://wiki.openstreetmap.org/wiki/Key:covered"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:covered"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:covered"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:covered"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:covered"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:covered" />
+ <label text="Edit Arcade" />
<space />
<key key="covered" value="arcade" />
<check key="arcade:left" value_on="open" text="Open on left side" />
<check key="arcade:right" value_on="open" text="Open on right side" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="width" text="Width (meters)" />
</optional>
</item>
<item name="Colonnade" type="way">
- <label text="Edit Colonnade"/>
<link href="http://wiki.openstreetmap.org/wiki/Key:covered"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:covered"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:covered"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:covered" />
+ <label text="Edit Colonnade" />
<space />
<key key="covered" value="colonnade" />
<check key="colonnade:left" value_on="open" text="Open on left side" />
<check key="colonnade:right" value_on="open" text="Open on right side" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="width" text="Width (meters)" />
</optional>
</item>
<item name="Avalanche Protector" type="way">
- <label text="Edit Avalanche Protector"/>
<link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel"
@@ -1478,13 +1691,14 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:tunnel"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:tunnel"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
+ <label text="Edit Avalanche Protector" />
<space />
<key key="tunnel" value="avalanche_protector" />
<check key="avalanche_protector:left" value_on="open" text="Open on left side" />
<check key="avalanche_protector:right" value_on="open" text="Open on right side" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="width" text="Width (meters)" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
@@ -1493,7 +1707,6 @@ Note that for a match, at least one positive and no negative is required.
</group> <!-- Passageways -->
<group name="Water" icon="presets/waterway.png">
<group name="Water" icon="presets/waterway.png">
- <separator/>
<item name="Drain" icon="presets/waterway.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=drain"
@@ -1503,7 +1716,7 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="waterway" value="drain" />
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
</item>
<item name="Ditch" icon="presets/waterway.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
@@ -1514,7 +1727,7 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="waterway" value="ditch" />
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
</item>
<item name="Stream" icon="presets/waterway.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
@@ -1528,7 +1741,15 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="waterway" value="stream" />
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+ </item>
+ <item name="Wadi" icon="presets/waterway.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
+ <label text="Edit Wadi" />
+ <space />
+ <key key="waterway" value="wadi" />
+ <text key="name" text="Name" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
</item>
<item name="Canal" icon="presets/waterway.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
@@ -1540,7 +1761,7 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="waterway" value="canal" />
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="wikipedia" text="Wikipedia" />
</item>
<item name="River" icon="presets/river.png" type="way">
@@ -1554,17 +1775,19 @@ Note that for a match, at least one positive and no negative is required.
<space />
<key key="waterway" value="river" />
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="wikipedia" text="Wikipedia" />
</item>
<separator/>
<item name="Spring" icon="presets/spring.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=spring"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=spring"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=spring"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=spring"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
<label text="Edit Spring" />
+ <space />
<key key="natural" value="spring" />
<text key="name" text="Name" />
</item>
@@ -1590,7 +1813,9 @@ Note that for a match, at least one positive and no negative is required.
<item name="Dam" icon="presets/dam.png" type="node,way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dam"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=dam"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=dam"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=dam"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=dam"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dam" />
<label text="Edit Dam" />
@@ -1604,15 +1829,13 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=groyne"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
- <label text="Edit Groyne" />
- <space />
<key key="man_made" value="groyne" />
</item>
<item name="Breakwater" icon="presets/groyne.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=breakwater"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=breakwater" />
- <label text="Edit Breakwater"/>
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=breakwater"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=breakwater" />
+ <label text="Edit Breakwater" />
<space />
<key key="man_made" value="breakwater" />
<text key="ref" text="Reference" />
@@ -1620,17 +1843,17 @@ Note that for a match, at least one positive and no negative is required.
</item>
<separator/>
<item name="Culvert" icon="presets/tunnel.png" type="way">
- <label text="Edit Culvert"/>
<link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
- de.href="http://wiki.openstreetmap.org/wiki/DE:tunnel=culvert"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:tunnel=culvert"
- pl.href="http://wiki.openstreetmap.org/wiki/Pl:tunnel=culvert"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:tunnel=culvert" />
- <space />
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tunnel=culvert"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tunnel=culvert"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tunnel=culvert"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tunnel=culvert"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tunnel=culvert" />
+ <label text="Edit Culvert" />
<key key="tunnel" value="culvert" />
<optional>
<text key="name" text="Name" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
<text key="width" text="Width (meters)" />
<combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
</optional>
@@ -1655,6 +1878,7 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation">
<label text="Edit Covered Reservoir" />
+ <space />
<key key="man_made" value="reservoir_covered" />
<text key="name" text="Name" />
</item>
@@ -1667,11 +1891,14 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
<label text="Edit Water" />
+ <space />
<key key="natural" value="water" />
<text key="name" text="Name" />
+ <combo key="water" text="Water Body" values="lake,lagoon,pond,reservoir" match="key" values_searchable="true" />
</item>
<item name="Land" icon="presets/landuse.png" type="node,closedway,relation">
<label text="Edit Land" />
+ <space />
<key key="natural" value="land" />
<text key="name" text="Name" />
</item>
@@ -1681,6 +1908,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=coastline"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
<label text="Edit Coastline" />
+ <space />
<key key="natural" value="coastline" />
<text key="name" text="Name" />
</item>
@@ -1690,8 +1918,10 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=riverbank"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=riverbank"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=riverbank"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=riverbank" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=riverbank"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:waterway=riverbank" />
<label text="Edit Riverbank" />
+ <space />
<key key="waterway" value="riverbank" />
<text key="name" text="Name" />
</item>
@@ -1703,17 +1933,20 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=wetland"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=wetland"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=wetland"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=wetland"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wetland"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
<label text="Edit Wetland" />
+ <space />
<key key="natural" value="wetland" />
<text key="name" text="Name" />
- <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" />
+ <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
</item>
<item name="Mud" icon="presets/mud.png" type="node,closedway,relation">
<label text="Edit Mud" />
<key key="natural" value="mud" />
+ <space />
<text key="name" text="Name" />
</item>
<item name="Beach" icon="presets/beach.png" type="node,closedway,relation">
@@ -1723,21 +1956,25 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=beach"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
<label text="Edit Beach" />
+ <space />
<key key="natural" value="beach" />
<text key="name" text="Name" />
</item>
<item name="Bay" icon="presets/bay.png" type="node,closedway,relation">
<label text="Edit Bay" />
+ <space />
<key key="natural" value="bay" />
<text key="name" text="Name" />
</item>
<item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cliff"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=cliff"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=cliff"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cliff"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
<label text="Edit Cliff" />
+ <space />
<key key="natural" value="cliff" />
<text key="name" text="Name" />
</item>
@@ -1751,9 +1988,10 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=ferry_terminal"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=ferry_terminal" />
<label text="Edit Ferry Terminal" />
+ <space />
<key key="amenity" value="ferry_terminal" />
<text key="name" text="Name" />
- <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" />
+ <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
</item>
<item name="Ferry Route" icon="presets/ferry.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry"
@@ -1762,7 +2000,6 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=ferry"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=ferry" />
<label text="Edit Ferry" />
- <space />
<key key="route" value="ferry" />
<optional>
<text key="name" text="Name" />
@@ -1771,22 +2008,26 @@ Note that for a match, at least one positive and no negative is required.
<separator/>
<item name="Marina" icon="presets/marina.png" type="node,closedway">
<label text="Edit Marina" />
+ <space />
<key key="leisure" value="marina" />
<text key="name" text="Name" />
</item>
<item name="Pier" icon="presets/pier.png" type="way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pier"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=pier"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=pier"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pier"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pier" />
<label text="Edit Pier" />
+ <space />
<key key="man_made" value="pier" />
<text key="name" text="Name" />
</item>
<item name="Lock Gate" icon="presets/lock_gate.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=lock_gate"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=lock_gate"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=lock_gate"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=lock_gate" />
<key key="waterway" value="lock_gate" />
@@ -1806,11 +2047,15 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=slipway" />
<label text="Edit Slipway" />
<key key="leisure" value="slipway" />
- <text key="name" text="Name" />
+ <optional>
+ <text key="name" text="Name" />
+ </optional>
</item>
<item name="Boatyard" icon="presets/boatyard.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=boatyard" />
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=boatyard"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=boatyard"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=boatyard" />
<label text="Edit Boatyard" />
<space />
<key key="waterway" value="boatyard" />
@@ -1832,94 +2077,103 @@ Note that for a match, at least one positive and no negative is required.
<group name="Railway" icon="presets/railway.png">
<item name="Rail" icon="presets/railway.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=rail"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=rail"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=rail"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=rail"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=rail" />
<label text="Edit Rail" />
- <space />
<key key="railway" value="rail" />
<optional>
- <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism" />
- <combo key="service" text="Service/Type" values="yard,siding,spur" />
- <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
+ <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
- <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
</optional>
</item>
<item name="Narrow Gauge Rail" icon="presets/railway.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
<label text="Edit Narrow Gauge Rail" />
- <space />
<key key="railway" value="narrow_gauge" />
<optional>
- <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
- <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
</optional>
</item>
<item name="Monorail" icon="presets/railway.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=monorail"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=monorail" />
<label text="Edit Monorail" />
- <space />
<key key="railway" value="monorail" />
<optional>
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <combo key="service" text="Service type" values="yard,siding,spur" />
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
- <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
</optional>
</item>
<item name="Preserved" icon="presets/rail_preserved.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved" />
<label text="Edit Preserved Railway" />
- <space />
<key key="railway" value="preserved" />
<optional>
- <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
- <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
</optional>
</item>
<item name="Light Rail" icon="presets/rail_light.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
<label text="Edit Light Rail" />
- <space />
<key key="railway" value="light_rail" />
<optional>
- <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
- <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
</optional>
</item>
<item name="Subway" icon="presets/rail_light.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway" />
<label text="Edit Subway" />
- <space />
<key key="railway" value="subway" />
<optional>
- <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
- <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
</optional>
</item>
<item name="Tram" icon="presets/tram.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=tram"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=tram"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=tram" />
<label text="Edit Tram" />
- <space />
<key key="railway" value="tram" />
<optional>
- <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" />
- <combo key="service" text="Types" values="yard,siding,spur" />
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
<combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
- <combo key="voltage" text="Voltage" values="600,650,750,1500,3000,15000,25000" />
- <combo key="frequency" text="Frequency (Hz)" values="0,16.7,50,60" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
</optional>
</item>
<item name="Bus Guideway" icon="presets/busway.png" type="way">
@@ -1927,7 +2181,6 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_guideway"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_guideway" />
<label text="Edit Bus Guideway" />
- <space />
<key key="highway" value="bus_guideway" />
<optional>
<text key="name" text="Name" />
@@ -1936,7 +2189,7 @@ Note that for a match, at least one positive and no negative is required.
<check key="tunnel" text="Tunnel" default="off" />
<check key="cutting" text="Cutting" default="off" />
<check key="embankment" text="Embankment" default="off" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
<text key="maxspeed" text="Max. speed (km/h)" />
<text key="width" text="Width (meters)" />
@@ -1945,36 +2198,63 @@ Note that for a match, at least one positive and no negative is required.
</item>
<separator/>
<item name="Disused Rail" icon="presets/railway.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused" />
<label text="Edit Disused Railway" />
- <space />
<key key="railway" value="disused" />
- <combo key="service" text="Optional Types" values="yard,siding,spur" />
+ <optional>
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ </optional>
</item>
<item name="Abandoned Rail" icon="presets/railway.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned" />
+ <label text="Edit Abandoned Railway" />
<key key="railway" value="abandoned" />
+ <optional>
+ <combo key="service" text="Service type" values="yard,siding,spur" />
+ </optional>
</item>
<separator/>
<item name="Level Crossing" icon="presets/level_crossing.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
- bg.href="http://wiki.openstreetmap.org/wiki/BG:Tag:railway=level_crossing"
+ bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:railway=level_crossing"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=level_crossing"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=level_crossing"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:railway=level_crossing"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=level_crossing"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:railway=level_crossing"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=level_crossing"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:railway=level_crossing"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=level_crossing"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=level_crossing" />
+ <label text="Edit Level Crossing" />
<key key="railway" value="level_crossing" />
+ <optional>
+ <check key="supervised" text="Supervised" default="off" />
+ <check key="crossing:light" text="Traffic lights" default="off" />
+ <check key="crossing:bell" text="Sound signals" default="off" />
+ <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
+ </optional>
</item>
<item name="Crossing" icon="presets/crossing.png" type="node">
- <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
+ <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+ bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:crossing"
+ fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:crossing"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:crossing"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:crossing"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:crossing" />
+ <label text="Edit Crossing" />
<key key="railway" value="crossing" />
<optional>
- <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
- <check key="horse" text="Cross on horseback" default="off" />
- <check key="bicycle" text="Cross by bicycle" default="off" />
- <check key="supervised" text="Crossing attendant" default="off" />
+ <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
+ <check key="horse" text="Cross on horseback" default="off" />
+ <check key="bicycle" text="Cross by bicycle" default="off" />
+ <check key="supervised" text="Supervised" default="off" />
+ <check key="crossing:light" text="Traffic lights" default="off" />
+ <check key="crossing:bell" text="Sound signals" default="off" />
+ <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
</optional>
</item>
<item name="Turntable" icon="presets/turntable.png" type="node,closedway">
@@ -1991,8 +2271,10 @@ Note that for a match, at least one positive and no negative is required.
</group> <!-- Railway -->
<group name="Aerialway" icon="presets/aerialway.png">
<item name="Chair Lift" icon="presets/chair_lift.png" type="way">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
<label text="Edit Chair Lift" />
+ <space />
<key key="aerialway" value="chair_lift" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2007,6 +2289,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Drag Lift" icon="presets/drag_lift.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
<label text="Edit Drag Lift" />
+ <space />
<key key="aerialway" value="drag_lift" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2017,10 +2300,13 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Cable Car" icon="presets/cable_car.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=cable_car"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aerialway=cable_car"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=cable_car"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=cable_car"
sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:aerialway=cable_car" />
<label text="Edit Cable Car" />
+ <space />
<key key="aerialway" value="cable_car" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2037,6 +2323,7 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/Piste_Maps"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Proposed_features/Piste_Maps" />
<label text="Edit Gondola" />
+ <space />
<key key="aerialway" value="gondola" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2050,6 +2337,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Mixed Lift" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
<label text="Edit Mixed Lift (containing both gondolas and chairs)" />
+ <space />
<key key="aerialway" value="mixed_lift" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2062,8 +2350,12 @@ Note that for a match, at least one positive and no negative is required.
</optional>
</item>
<item name="T-bar Lift" icon="presets/drag_lift.png" type="way">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Proposed_features/Piste_Maps"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/Piste_Maps"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Proposed_features/Piste_Maps" />
<label text="Edit T-bar Lift" />
+ <space />
<key key="aerialway" value="t-bar" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2075,6 +2367,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="J-bar Lift" icon="presets/drag_lift.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
<label text="Edit J-bar Lift" />
+ <space />
<key key="aerialway" value="j-bar" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2086,6 +2379,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Platter Lift" icon="presets/drag_lift.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
<label text="Edit Platter Lift" />
+ <space />
<key key="aerialway" value="platter" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2097,6 +2391,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Rope Tow" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
<label text="Edit Rope Tow" />
+ <space />
<key key="aerialway" value="rope_tow" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2108,6 +2403,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Magic Carpet" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
<label text="Edit Magic Carpet" />
+ <space />
<key key="aerialway" value="magic_carpet" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2116,8 +2412,9 @@ Note that for a match, at least one positive and no negative is required.
<text key="aerialway:duration" text="Typical journey time in minutes" />
</optional>
</item>
- <item name="Goods" name_context="aerialway" icon="presets/goods.png" type="way">
- <label text="Edit Goods" text_context="aerialway" />
+ <item name="Goods" icon="presets/goods.png" type="way">
+ <label text="Edit Goods" />
+ <space />
<key key="aerialway" value="goods" />
<text key="name" text="Name" />
<text key="ref" text="Reference number" />
@@ -2129,12 +2426,14 @@ Note that for a match, at least one positive and no negative is required.
<item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
<label text="Edit Station" text_context="aerialway" />
+ <space />
<key key="aerialway" value="station" />
<text key="name" text="Name" />
</item>
- <item name="Pylon" name_context="aerialway" icon="presets/power_tower.png" type="node">
+ <item name="Pylon" icon="presets/power_tower.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
- <label text="Edit Pylon" text_context="aerialway" />
+ <label text="Edit Pylon" />
+ <space />
<key key="aerialway" value="pylon" />
<text key="name" text="Name" />
</item>
@@ -2144,17 +2443,20 @@ Note that for a match, at least one positive and no negative is required.
<item name="Parking" icon="presets/parking.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=parking"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=parking"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=parking"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=parking"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=parking"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=parking"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=parking" />
<label text="Edit Parking" />
+ <space />
<key key="amenity" value="parking" />
<text key="name" text="Name" />
+ <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
<text key="ref" text="Reference number" />
- <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" />
<text key="maxheight" text="Max. height (meters)" />
<combo key="access" text="Access" values="yes,private,customers,permissive,no" />
<combo key="park_ride" text="Park and Ride" values="yes,no" />
@@ -2170,12 +2472,16 @@ Note that for a match, at least one positive and no negative is required.
<item name="Parking space" icon="presets/parking.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_space"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_space" />
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=parking_space"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_space"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=parking_space"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=parking_space" />
<label text="Edit Parking space" />
+ <space />
<key key="amenity" value="parking_space" />
<text key="name" text="Name" />
- <text key="ref" text="Reference number" />
<combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
+ <text key="ref" text="Reference number" />
<text key="capacity" text="Capacity" />
<space />
<combo key="access" text="Access" values="yes,private,customers,permissive,no" />
@@ -2186,17 +2492,21 @@ Note that for a match, at least one positive and no negative is required.
<combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
<combo key="supervised" text="Supervised" values="yes,no,interval" />
<combo key="lit" text="Lit" values="yes,no,interval" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Parking entrance" icon="presets/parking.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_entrance" />
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_entrance"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_entrance"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=parking_entrance"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=parking_entrance" />
<label text="Edit Parking entrance" />
+ <space />
<key key="amenity" value="parking_entrance" />
<text key="name" text="Name" />
+ <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
<text key="ref" text="Reference number" />
<space />
- <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
<combo key="access" text="Access" values="yes,private,customers,permissive,no" />
<combo key="fee" text="Fee" values="yes,no,interval" />
<text key="operator" text="Operator" />
@@ -2205,7 +2515,7 @@ Note that for a match, at least one positive and no negative is required.
<combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
<combo key="supervised" text="Supervised" values="yes,no,interval" />
<combo key="lit" text="Lit" values="yes,no,interval" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Fuel" icon="presets/fuel.png" type="node,closedway">
@@ -2218,37 +2528,42 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fuel"
no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=fuel"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fuel"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fuel"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=fuel" />
<label text="Edit Fuel" />
+ <space />
<key key="amenity" value="fuel" />
- <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" />
+ <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" values_searchable="true" />
<optional>
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
<label text="Fuel types:" />
- <check key="fuel:diesel" text="Diesel" default="off" />
- <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
- <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
- <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
- <check key="fuel:octane_80" text="Octane 80" default="off" />
- <check key="fuel:octane_91" text="Octane 91" default="off" />
- <check key="fuel:octane_92" text="Octane 92" default="off" />
- <check key="fuel:octane_95" text="Octane 95" default="off" />
- <check key="fuel:octane_98" text="Octane 98" default="off" />
- <check key="fuel:octane_100" text="Octane 100" default="off" />
- <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
- <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
- <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
- <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
- <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
- <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
+ <checkgroup columns="2">
+ <check key="fuel:diesel" text="Diesel" default="off" />
+ <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
+ <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
+ <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
+ <check key="fuel:octane_80" text="Octane 80" default="off" />
+ <check key="fuel:octane_91" text="Octane 91" default="off" />
+ <check key="fuel:octane_92" text="Octane 92" default="off" />
+ <check key="fuel:octane_95" text="Octane 95" default="off" />
+ <check key="fuel:octane_98" text="Octane 98" default="off" />
+ <check key="fuel:octane_100" text="Octane 100" default="off" />
+ <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
+ <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
+ <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
+ <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
+ <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
+ <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
+ </checkgroup>
</optional>
</item>
<item name="Charging Station" icon="styles/standard/accommodation/camping/hookup.png" type="node">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel" />
<label text="Edit Charging Station (for electric cars)" />
+ <space />
<key key="amenity" value="charging_station" />
<text key="operator" text="Operator" />
<text key="voltage" text="Voltage" />
@@ -2256,11 +2571,12 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Wash" icon="presets/car_wash.png" type="node,closedway">
<label text="Edit Car Wash" />
+ <space />
<key key="amenity" value="car_wash" />
<text key="name" text="Name" />
<text key="brand" text="Brand" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Car Dealer" icon="presets/car.png" type="node,closedway">
@@ -2272,31 +2588,47 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=car"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car" />
<label text="Edit Car Shop" />
+ <space />
<key key="shop" value="car" />
<text key="name" text="Name" />
+ <text key="brand" text="Brand" />
<text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Repair" icon="presets/car_repair.png" type="node,closedway">
<label text="Edit Car Repair" />
+ <space />
<key key="shop" value="car_repair" />
<text key="name" text="Name" />
<text key="brand" text="Brand" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car_parts" />
+ <label text="Edit Car Parts" />
+ <space />
+ <key key="shop" value="car_parts" />
+ <text key="name" text="Name" />
+ <text key="brand" text="Brand" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Tyres" icon="presets/tyres.png" type="node,closedway">
<label text="Edit Tyres" />
+ <space />
<key key="shop" value="tyres" />
<text key="name" text="Name" />
<text key="brand" text="Brand" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<label text="Contact:" />
<text key="phone" text="Phone Number" />
<text key="fax" text="Fax Number" />
<text key="website" text="Website" />
<text key="email" text="Email Address" />
- </item>
+ </item>
<separator/>
<item name="Rental" icon="presets/car_rental.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
@@ -2305,11 +2637,13 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=car_rental"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_rental" />
<label text="Edit Car Rental" />
+ <space />
<key key="amenity" value="car_rental" />
<text key="name" text="Name" />
<text key="brand" text="Brand" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="second_hand" text="Second hand" values="only,yes,no" />
</item>
<item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing"
@@ -2320,47 +2654,53 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=car_sharing"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_sharing" />
<label text="Edit Car Sharing" />
+ <space />
<key key="amenity" value="car_sharing" />
<text key="operator" text="Operator" />
<text key="capacity" text="Capacity" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<text key="website" text="Website" />
</item>
</group> <!-- Car -->
<group name="Motorcycle" icon="presets/motorbike.png">
<item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway">
<label text="Edit Motorcycle Parking" />
+ <space />
<key key="amenity" value="motorcycle_parking" />
<text key="name" text="Name" />
<text key="capacity" text="Capacity" />
- <combo key="parking" text="Type" values="multi-storey,surface,underground" default="surface" />
+ <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
<combo key="fee" text="Fee" values="yes,no" />
</item>
<item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=motorcycle"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=motorcycle"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=motorcycle"/>
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=motorcycle" />
<label text="Edit Shop Motorcycle" />
+ <space />
<key key="shop" value="motorcycle" />
<text key="name" text="Name" />
<combo key="brand" text="Brand" values="independent" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
- <label text="Services:" />
- <combo key="sale" text="Sale" values="yes,brand,used,no" values_context="motorcycle" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="second_hand" text="Second hand" values="only,yes,no" />
+ <optional text="Services:">
+ <combo key="sale" text="Sale" values="yes,brand,no" />
<combo key="rental" text="Rental" values="yes,brand,no" />
<combo key="repair" text="Repair" values="yes,brand,oldtimer,no" />
<combo key="safety_inspection" text="Safety inspection" values="yes,DEKRA,GTÜ,MOT,TÜV,no" />
<combo key="parts" text="Parts" values="yes,brand,oldtimer,no" />
<combo key="clothes" text="Clothes" values="yes,brand,no" />
<text key="services" text="Other" />
- <label text="Contact:" />
+ </optional>
+ <optional text="Contact:">
<text key="phone" text="Phone Number" />
<text key="fax" text="Fax Number" />
<text key="website" text="Website" />
<text key="email" text="Email Address" />
+ </optional>
</item>
</group> <!-- Motorcycle -->
<group name="Bicycle" icon="presets/bike.png">
@@ -2371,9 +2711,11 @@ Note that for a match, at least one positive and no negative is required.
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=bicycle_parking"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=bicycle_parking"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bicycle_parking"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=bicycle_parking"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_parking"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_parking" />
<label text="Edit Bicycle Parking" />
+ <space />
<key key="amenity" value="bicycle_parking" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
@@ -2387,19 +2729,22 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bicycle"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=bicycle"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bicycle"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=bicycle"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=bicycle"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bicycle"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=bicycle" />
<label text="Edit Bicycle Shop" />
+ <space />
<key key="shop" value="bicycle" />
<text key="name" text="Name" />
- <check key="service:bicycle:retail" text="Bicycles are sold" />
- <check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
- <check key="service:bicycle:repair" text="Bicycles are repaired" />
- <check key="service:bicycle:rental" text="Bicycles are rented" />
- <check key="service:bicycle:pump" text="Free bicycle pump" />
- <check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
- <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
+ <check key="service:bicycle:retail" text="Bicycles are sold" />
+ <check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
+ <check key="service:bicycle:repair" text="Bicycles are repaired" />
+ <check key="service:bicycle:rental" text="Bicycles are rented" />
+ <check key="service:bicycle:pump" text="Free bicycle pump" />
+ <check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
+ <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
</item>
<item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
@@ -2409,29 +2754,32 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=bicycle_rental"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=bicycle_rental"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bicycle_rental"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=bicycle_rental"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bicycle_rental"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bicycle_rental"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_rental" />
<label text="Edit Bicycle Rental" />
+ <space />
<key key="amenity" value="bicycle_rental" />
<text key="name" text="Name" />
</item>
</group> <!-- Bicycle -->
<group name="Public Transport" icon="presets/bus.png">
- <item name="Route" icon="presets/path.png" type="relation">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route"/>
- <label text="Edit Route"/>
- <key key="type" value="route"/>
- <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
- <text key="name" text="Name"/>
- <text key="ref" text="Reference"/>
+ <item name="Public transport route" icon="presets/path.png" type="relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
+ <label text="Edit Route" />
+ <space />
+ <key key="type" value="route" />
+ <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" />
+ <text key="name" text="Name" />
+ <text key="ref" text="Reference" />
<optional>
- <text key="from" text="From (initial stop)"/>
- <text key="to" text="To (terminal stop)"/>
- <text key="via" text="Via (intermediate stops)"/>
- <text key="operator" text="Operator"/>
- <text key="network" text="Network"/>
- <text key="description" text="Description"/>
+ <text key="from" text="From (initial stop)" />
+ <text key="to" text="To (terminal stop)" />
+ <text key="via" text="Via (intermediate stops)" />
+ <text key="operator" text="Operator" />
+ <text key="network" text="Network" />
+ <text key="description" text="Description" />
<combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
</optional>
<roles>
@@ -2445,105 +2793,115 @@ Note that for a match, at least one positive and no negative is required.
</roles>
</item>
<item name="Route master" icon="presets/path.png" type="relation">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master"/>
- <label text="Edit Route master"/>
- <key key="type" value="route_master"/>
- <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry"/>
- <text key="name" text="Name"/>
- <text key="ref" text="Reference"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
+ <label text="Edit Route master" />
+ <space />
+ <key key="type" value="route_master" />
+ <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
+ <text key="name" text="Name" />
+ <text key="ref" text="Reference" />
<optional>
- <text key="operator" text="Operator"/>
- <text key="network" text="Network"/>
+ <text key="operator" text="Operator" />
+ <text key="network" text="Network" />
<combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
</optional>
<roles>
- <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route"/> <!-- FIXME: at least 2 members are required -->
+ <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- FIXME: at least 2 members are required -->
</roles>
</item>
<item name="Stop Area" type="relation" icon="presets/interpolation.png">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
- <label text="Edit Stop Area"/>
- <key key="type" value="public_transport"/>
- <key key="public_transport" value="stop_area"/>
- <text key="name" text="Name"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
+ <label text="Edit Stop Area" />
+ <space />
+ <key key="type" value="public_transport" />
+ <key key="public_transport" value="stop_area" />
+ <text key="name" text="Name" />
<optional>
- <text key="ref" text="Reference"/>
- <text key="uic_ref" text="UIC reference"/>
- <text key="uic_name" text="UIC name"/>
- <text key="operator" text="Operator"/>
- <text key="network" text="Network"/>
+ <text key="ref" text="Reference" />
+ <text key="uic_ref" text="UIC reference" />
+ <text key="uic_name" text="UIC name" />
+ <text key="operator" text="Operator" />
+ <text key="network" text="Network" />
</optional>
<roles>
- <role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position"/>
- <role key="platform" text="Platform" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform"/>
- <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station"/>
+ <role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
+ <role key="platform" text="Platform" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
+ <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
</roles>
</item>
<separator/>
<item name="Stop Position" type="node" icon="presets/barrier.png">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area"/>
- <key key="public_transport" value="stop_position"/>
- <text key="name" text="Name"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
+ <label text="Edit Stop Position" />
+ <space />
+ <key key="public_transport" value="stop_position" />
+ <text key="name" text="Name" />
<optional>
- <text key="ref" text="Reference"/>
- <text key="uic_ref" text="UIC reference"/>
- <text key="uic_name" text="UIC name"/>
- <text key="operator" text="Operator"/>
- <text key="network" text="Network"/>
+ <text key="ref" text="Reference" />
+ <text key="uic_ref" text="UIC reference" />
+ <text key="uic_name" text="UIC name" />
+ <text key="operator" text="Operator" />
+ <text key="network" text="Network" />
</optional>
- <space/>
- <check key="bus" text="Bus"/>
- <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)"/>
- <check key="tram" text="Tram"/>
- <check key="railway" value_on="tram_stop" value_off="" text="Tram stop (legacy)"/>
- <check key="train" text="Train"/>
- <check key="railway" value_on="station" value_off="" text="Railway station (legacy)"/>
- <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)"/>
- <check key="trolleybus" text="Trolleybus"/>
- <check key="share_taxi" text="Share taxi"/>
- <check key="subway" text="Subway"/>
- <check key="monorail" text="Monorail"/>
- <check key="funicular" text="Funicular"/>
- <check key="aerialway" text="Aerialway"/>
- <check key="ferry" text="Ferry"/>
+ <check key="bus" text="Bus" />
+ <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)" />
+ <check key="tram" text="Tram" />
+ <check key="railway" value_on="tram_stop" value_off="" text="Tram stop (legacy)" />
+ <check key="train" text="Train" />
+ <check key="railway" value_on="station" value_off="" text="Railway station (legacy)" />
+ <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)" />
+ <check key="trolleybus" text="Trolleybus" />
+ <check key="share_taxi" text="Share taxi" />
+ <check key="subway" text="Subway" />
+ <check key="monorail" text="Monorail" />
+ <check key="funicular" text="Funicular" />
+ <check key="aerialway" text="Aerialway" />
+ <check key="ferry" text="Ferry" />
</item>
<item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform"/>
- <key key="public_transport" value="platform"/>
- <text key="name" text="Name"/>
- <check key="bench" text="Bench"/>
- <check key="shelter" text="Shelter"/>
- <check key="covered" text="Covered"/>
- <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
+ <label text="Edit Platform" />
+ <space />
+ <key key="public_transport" value="platform" />
+ <text key="name" text="Name" />
+ <check key="bench" text="Bench" />
+ <check key="shelter" text="Shelter" />
+ <check key="covered" text="Covered" />
+ <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only" />
<optional>
- <text key="ref" text="Reference"/>
- <text key="uic_ref" text="UIC reference"/>
- <text key="uic_name" text="UIC name"/>
- <text key="operator" text="Operator"/>
- <text key="network" text="Network"/>
+ <text key="ref" text="Reference" />
+ <text key="uic_ref" text="UIC reference" />
+ <text key="uic_name" text="UIC name" />
+ <text key="operator" text="Operator" />
+ <text key="network" text="Network" />
<space/>
- <check key="bus" text="Bus"/>
- <check key="highway" value_on="platform" text="Highway platform (legacy)"/>
- <check key="tram" text="Tram"/>
- <check key="train" text="Train"/>
- <check key="railway" value_on="platform" text="Railway platform (legacy)"/>
- <check key="trolleybus" text="Trolleybus"/>
- <check key="share_taxi" text="Share taxi"/>
- <check key="subway" text="Subway"/>
- <check key="monorail" text="Monorail"/>
- <check key="funicular" text="funicular"/>
- <check key="aerialway" text="aerialway"/>
- <check key="ferry" text="ferry"/>
- </optional>
- </item>
- <item name="Station" type="node,closedway" icon="styles/standard/transport/railway_station.png">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"/>
- <key key="public_transport" value="station"/>
- <text key="name" text="Name"/>
- <check key="area" text="Area"/>
- <check key="building" text="Building"/>
- <text key="operator" text="Operator"/>
- <text key="network" text="Network"/>
+ <check key="bus" text="Bus" />
+ <check key="highway" value_on="platform" text="Highway platform (legacy)" />
+ <check key="tram" text="Tram" />
+ <check key="train" text="Train" />
+ <check key="railway" value_on="platform" text="Railway platform (legacy)" />
+ <check key="trolleybus" text="Trolleybus" />
+ <check key="share_taxi" text="Share taxi" />
+ <check key="subway" text="Subway" />
+ <check key="monorail" text="Monorail" />
+ <check key="funicular" text="funicular" />
+ <check key="aerialway" text="aerialway" />
+ <check key="ferry" text="ferry" />
+ </optional>
+ </item>
+ <item name="Station" name_context="railway" type="node,closedway" icon="styles/standard/transport/railway_station.png">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:public_transport=station"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:public_transport=station"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:public_transport=station" />
+ <label text="Edit Station" text_context="railway" />
+ <space />
+ <key key="public_transport" value="station" />
+ <text key="name" text="Name" />
+ <check key="area" text="Area" />
+ <check key="building" text="Building" />
+ <text key="operator" text="Operator" />
+ <text key="network" text="Network" />
</item>
<separator/>
<item name="Subway Entrance" icon="presets/underground.png" type="node">
@@ -2552,7 +2910,6 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=subway_entrance"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
<label text="Edit Subway Entrance" />
- <space />
<key key="railway" value="subway_entrance" />
<optional>
<text key="name" text="Name" />
@@ -2560,17 +2917,19 @@ Note that for a match, at least one positive and no negative is required.
<check key="bicycle" text="Bicycle" default="off" />
</optional>
</item>
- <item name="Ticket Machine" de.name="Fahrausweisautomat" icon="presets/vending_machine.png" type="node">
+ <item name="Ticket Machine" icon="presets/vending_machine.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=vending_machine"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine"/>
- <key key="amenity" value="vending_machine"/>
- <key key="vending" value="public_transport_tickets"/>
- <text key="name" text="Name"/>
- <text key="operator" text="Operator"/>
- <text key="ref" text="Reference Number"/>
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
+ <label text="Edit Ticket Machine" />
+ <space />
+ <key key="amenity" value="vending_machine" />
+ <key key="vending" value="public_transport_tickets" />
+ <text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <text key="ref" text="Reference Number" />
<check key="payment:coins" text="Coins" default="off" />
<check key="payment:notes" text="Notes" default="off" />
<check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
@@ -2586,9 +2945,9 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=station"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=station"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=station"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=station"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=station" />
<label text="Edit Station" text_context="railway" />
- <space />
<key key="railway" value="station" />
<optional>
<text key="name" text="Name" />
@@ -2601,7 +2960,6 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=halt"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=halt" />
<label text="Edit Halt" />
- <space />
<key key="railway" value="halt" />
<optional>
<text key="name" text="Name" />
@@ -2612,7 +2970,6 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram_stop" />
<label text="Edit Tram Stop" />
- <space />
<key key="railway" value="tram_stop" />
<optional>
<text key="name" text="Name" />
@@ -2623,8 +2980,8 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=platform" />
<label text="Edit Railway Platform" />
- <key key="railway" value="platform" />
<space />
+ <key key="railway" value="platform" />
<text key="ref" text="Reference (track number)" />
<text key="width" text="Width (meters)" />
<check key="area" text="Area" default="off" />
@@ -2647,23 +3004,23 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=bus_stop"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=bus_stop"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_stop"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bus_stop" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=bus_stop"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:highway=bus_stop" />
<label text="Edit Bus Stop" />
- <space />
<key key="highway" value="bus_stop" />
<optional>
<text key="name" text="Name" />
<combo key="shelter" text="Shelter" values="yes,no" />
<combo key="bench" text="Bench" values="yes,no" />
<combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
-
</optional>
</item>
<item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway">
<label text="Edit Bus Platform" />
- <key key="highway" value="platform" />
<space />
+ <key key="highway" value="platform" />
<text key="ref" text="Reference (track number)" />
<text key="width" text="Width (meters)" />
<check key="area" text="Area" default="off" />
@@ -2671,10 +3028,14 @@ Note that for a match, at least one positive and no negative is required.
</group> <!-- Public Transport -->
<item name="Taxi" icon="presets/taxi.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi"
+ et.href="http://wiki.openstreetmap.org/wiki/Et:Tag:amenity=taxi"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=taxi"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=taxi"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=taxi"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=taxi"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=taxi" />
- <label text="Edit Taxi station" />
+ <label text="Edit Taxi Station" />
+ <space />
<key key="amenity" value="taxi" />
<text key="name" text="Name" />
</item>
@@ -2685,6 +3046,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=aerodrome"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=aerodrome" />
<label text="Edit Airport Ground" />
+ <space />
<key key="aeroway" value="aerodrome" />
<text key="name" text="Name" />
<optional>
@@ -2719,6 +3081,7 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aeroway=helipad"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=helipad"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=helipad"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=helipad" />
@@ -2733,42 +3096,45 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=apron"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=apron"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=apron" />
- <label text="Apron" />
<key key="aeroway" value="apron" />
</item>
<item name="Hangar" icon="presets/hangar.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
- <label text="Hangar" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:aeroway=hangar" />
<key key="building" value="hangar" />
</item>
<item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
- <label text="Beacon" />
<key key="man_made" value="beacon" />
</item>
<item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock" />
- <label text="Windsock" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=windsock" />
<key key="aeroway" value="windsock" />
</item>
<separator/>
<item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:aeroway=terminal"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=terminal"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=terminal"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=terminal" />
<label text="Edit Terminal" />
+ <space />
<key key="aeroway" value="terminal" />
<text key="name" text="Name" />
+ <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+ <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
</item>
<item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=gate"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=gate" />
<label text="Edit Terminal Gate" />
+ <space />
<key key="aeroway" value="gate" />
<text key="ref" text="Reference" />
</item>
@@ -2778,12 +3144,15 @@ Note that for a match, at least one positive and no negative is required.
<group name="Accommodation" icon="presets/bed.png">
<item name="Hotel" icon="presets/bed.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hotel"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hotel"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=hotel"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=hotel"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hotel"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=hotel" />
<label text="Edit Hotel" />
+ <space />
<key key="tourism" value="hotel" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
@@ -2802,8 +3171,10 @@ Note that for a match, at least one positive and no negative is required.
<item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=motel"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=motel" />
<label text="Edit Motel" />
+ <space />
<key key="tourism" value="motel" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
@@ -2820,9 +3191,15 @@ Note that for a match, at least one positive and no negative is required.
<text key="email" text="Email Address" />
</item>
<item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=guest_house"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=guest_house" />
<label text="Edit Guest House" />
+ <space />
<key key="tourism" value="guest_house" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
@@ -2838,11 +3215,14 @@ Note that for a match, at least one positive and no negative is required.
<item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:tourism=chalet"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=chalet"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=chalet"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=chalet" />
<label text="Edit Chalet" />
+ <space />
<key key="tourism" value="chalet" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
@@ -2859,8 +3239,11 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hostel"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=hostel"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hostel" />
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=hostel"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=hostel"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=hostel" />
<label text="Edit Hostel" />
+ <space />
<key key="tourism" value="hostel" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
@@ -2877,7 +3260,14 @@ Note that for a match, at least one positive and no negative is required.
<text key="email" text="Email Address" />
</item>
<item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=alpine_hut"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=alpine_hut"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=alpine_hut"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=alpine_hut"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:tourism=alpine_hut" />
<label text="Edit Alpine Hut" />
+ <space />
<key key="tourism" value="alpine_hut" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
@@ -2895,9 +3285,15 @@ Note that for a match, at least one positive and no negative is required.
</item>
<separator/>
<item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=caravan_site"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=caravan_site" />
<label text="Edit Caravan Site" />
+ <space />
<key key="tourism" value="caravan_site" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
@@ -2921,10 +3317,14 @@ Note that for a match, at least one positive and no negative is required.
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=camp_site"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=camp_site"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=camp_site"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=camp_site" />
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=camp_site"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=camp_site"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=camp_site" />
<label text="Edit Camping Site" />
+ <space />
<key key="tourism" value="camp_site" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
@@ -2948,12 +3348,13 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=restaurant"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=restaurant" />
<label text="Edit Restaurant" />
+ <space />
<key key="amenity" value="restaurant" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi"/>
+ <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
<check key="microbrewery" text="Microbrewery" default="off" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
@@ -2973,11 +3374,12 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fast_food"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fast_food" />
<label text="Edit Fast Food Restaurant" />
+ <space />
<key key="amenity" value="fast_food" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
<combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
<combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
@@ -2992,11 +3394,14 @@ Note that for a match, at least one positive and no negative is required.
<item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=food_court"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=food_court" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=food_court"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=food_court" />
<label text="Edit Food Court" />
+ <space />
<key key="amenity" value="food_court" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
<combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
@@ -3010,16 +3415,21 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Cafe" icon="presets/cafe.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cafe"
+ et.href="http://wiki.openstreetmap.org/wiki/Et:Tag:amenity=cafe"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=cafe"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=cafe"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=cafe"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=cafe"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=cafe" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=cafe"
+ zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:amenity=cafe" />
<label text="Edit Cafe" />
+ <space />
<key key="amenity" value="cafe" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
<combo key="cuisine" text="Cuisine" values="ice_cream" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
<combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
@@ -3038,11 +3448,12 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pub"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pub" />
<label text="Edit Pub" />
+ <space />
<key key="amenity" value="pub" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
<check key="microbrewery" text="Microbrewery" default="off" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
<combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
@@ -3055,10 +3466,18 @@ Note that for a match, at least one positive and no negative is required.
<text key="email" text="Email Address" />
</item>
<item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=biergarten"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=biergarten"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=biergarten"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=biergarten" />
<label text="Edit Biergarten" />
+ <space />
<key key="amenity" value="biergarten" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <check key="microbrewery" text="Microbrewery" default="off" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
<combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
@@ -3077,11 +3496,14 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=bar"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bar"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bar"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bar" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bar"
+ zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:amenity=bar" />
<label text="Edit Bar" />
+ <space />
<key key="amenity" value="bar" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<space />
<combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
<combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
@@ -3095,16 +3517,20 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Nightclub" icon="presets/bar.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=nightclub"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=nightclub"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=nightclub"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=nightclub"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=nightclub"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=nightclub"
ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:amenity=nightclub"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=nightclub" />
<label text="Edit Nightclub" />
+ <space />
<key key="amenity" value="nightclub" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<space />
<combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
<combo key="wheelchair" text="Wheelchairs" values="yes,no" />
@@ -3114,21 +3540,48 @@ Note that for a match, at least one positive and no negative is required.
<text key="website" text="Website" />
<text key="email" text="Email Address" />
</item>
- </group> <!-- Food+Drinks -->
- <group name="Tourism" icon="presets/sightseeing.png">
- <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway">
+ <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=stripclub"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=stripclub"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=stripclub" />
+ <label text="Edit Stripclub" />
+ <space />
+ <key key="amenity" value="stripclub" />
+ <text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <space />
+ <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+ <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+ <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+ <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+ <space />
+ <text key="phone" text="Phone Number" />
+ <text key="fax" text="Fax Number" />
+ <text key="website" text="Website" />
+ <text key="email" text="Email Address" />
+ </item>
+ </group> <!-- Food+Drinks -->
+ <group name="Tourism" icon="presets/sightseeing.png">
+ <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway">
<label text="Edit Attraction" />
+ <space />
<key key="tourism" value="attraction" />
<text key="name" text="Name" />
- <text key="opening_hours" text="Opening Hours" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=viewpoint"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=viewpoint"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=viewpoint"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=viewpoint" />
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=viewpoint"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=viewpoint"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=viewpoint" />
<label text="Edit Viewpoint" />
+ <space />
<key key="tourism" value="viewpoint" />
<text key="name" text="Name" />
<!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" />-->
@@ -3139,58 +3592,74 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:information"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:information"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:information"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
+ <label text="Edit Information Office" />
+ <space />
<key key="tourism" value="information" />
<key key="information" value="office" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+ <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
</item>
<item name="Map" icon="presets/map.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+ <label text="Edit Information Map" />
+ <space />
<key key="tourism" value="information" />
<key key="information" value="map" />
<text key="name" text="Name" />
- <combo key="map_type" text="Detail Grade" values="topo,street,scheme" />
+ <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" />
<combo key="map_size" text="Shown Area" values="site,city,region" />
<text key="description" text="Closer Description" />
- <space />
- <label text="Routes shown for:" />
- <check key="hiking" text="Hiking" default="off" />
- <check key="bicycle" text="Cycling" default="off" />
- <check key="mtb" text="Mountainbiking" default="off" />
- <check key="ski" text="Skiing" default="off" />
- <check key="horse" text="Riding" default="off" />
- <label text="... other transportation modes possible" />
+ <optional text="Routes shown for:">
+ <check key="hiking" text="Hiking" default="off" />
+ <check key="bicycle" text="Cycling" default="off" />
+ <check key="mtb" text="Mountainbiking" default="off" />
+ <check key="ski" text="Skiing" default="off" />
+ <check key="horse" text="Riding" default="off" />
+ <space />
+ <label text="... other transportation modes possible" />
+ </optional>
</item>
<item name="Information Board" icon="presets/board.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:information=board"
de.href="http://wiki.openstreetmap.org/wiki/DE:Proposed_features/information"
it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/information" />
+ <label text="Edit Information Board" />
+ <space />
<key key="tourism" value="information" />
<key key="information" value="board" />
<text key="name" text="Name" />
- <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" default="board" />
+ <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" />
<text key="description" text="Closer Description" />
</item>
<item name="Guidepost" icon="presets/guidepost.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:information=guidepost"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:information=guidepost"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:information=guidepost" />
+ <label text="Edit Guidepost" />
+ <space />
<key key="tourism" value="information" />
<key key="information" value="guidepost" />
<text key="name" text="Name" />
<text key="ele" text="Elevation" />
- <space />
- <label text="Routes shown for:" />
- <check key="hiking" text="Hiking" default="off" />
- <check key="bicycle" text="Cycling" default="off" />
- <check key="mtb" text="Mountainbiking" default="off" />
- <check key="ski" text="Skiing" default="off" />
- <check key="horse" text="Riding" default="off" />
- <label text="... other transportation modes possible" />
+ <optional text="Routes shown for:">
+ <check key="hiking" text="Hiking" default="off" />
+ <check key="bicycle" text="Cycling" default="off" />
+ <check key="mtb" text="Mountainbiking" default="off" />
+ <check key="ski" text="Skiing" default="off" />
+ <check key="horse" text="Riding" default="off" />
+ <space />
+ <label text="... other transportation modes possible" />
+ </optional>
</item>
<item name="Information Terminal" icon="presets/information.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+ <label text="Edit Information Terminal" />
+ <space />
<key key="tourism" value="information" />
<key key="information" value="terminal" />
<text key="name" text="Name" />
@@ -3198,9 +3667,13 @@ Note that for a match, at least one positive and no negative is required.
<text key="operator" text="Operator" />
<text key="ref" text="Reference number" />
<combo key="fee" text="Fee" values="yes,no" />
+ <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+ <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
</item>
<item name="Audioguide" icon="presets/information.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+ <label text="Edit Audioguide" />
+ <space />
<key key="tourism" value="information" />
<key key="information" value="audioguide" />
<text key="name" text="Name" />
@@ -3212,12 +3685,15 @@ Note that for a match, at least one positive and no negative is required.
<label text="Audioguide via mobile phone?" />
<text key="phone" text="Phone number" />
</item>
- <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
+ <item name="Other Information Point" icon="presets/information.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=information"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=information"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=information"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=information"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
+ <label text="Edit Information Point" />
+ <space />
<key key="tourism" value="information" />
<text key="name" text="Name" />
<text key="description" text="Closer Description" />
@@ -3232,58 +3708,140 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=cinema"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=cinema" />
<label text="Edit Cinema" />
+ <space />
<key key="amenity" value="cinema" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Zoo" icon="presets/zoo.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zoo"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=zoo"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=zoo" />
<label text="Edit Zoo" />
+ <space />
<key key="tourism" value="zoo" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<text key="wikipedia" text="Wikipedia" />
+ <space />
+ <text key="phone" text="Phone Number" />
+ <text key="fax" text="Fax Number" />
+ <text key="website" text="Website" />
+ <text key="email" text="Email Address" />
</item>
<item name="Dog Park" icon="presets/dogpark.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:leisure=dog_park"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=dog_park"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=dog_park"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:leisure=dog_park"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:leisure=dog_park"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=dog_park"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=dog_park"
sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:leisure=dog_park" />
<label text="Edit Dog Park" />
+ <space />
<key key="leisure" value="dog_park" />
<text key="name" text="Name" />
<check key="area" text="Area" default="off" />
<combo key="barrier" text="Barrier" values="fence,wall" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<check key="lit" text="Lit" default="off" />
</item>
<item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=theme_park"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=theme_park" />
<label text="Edit Theme Park" />
+ <space />
<key key="tourism" value="theme_park" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <space />
+ <text key="phone" text="Phone Number" />
+ <text key="fax" text="Fax Number" />
+ <text key="website" text="Website" />
+ <text key="email" text="Email Address" />
</item>
<item name="Water Park" icon="presets/swimming.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=water_park"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:leisure=water_park"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=water_park"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=water_park"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=water_park"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=water_park" />
<label text="Edit Water Park" />
+ <space />
<key key="leisure" value="water_park" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <space />
+ <text key="phone" text="Phone Number" />
+ <text key="fax" text="Fax Number" />
+ <text key="website" text="Website" />
+ <text key="email" text="Email Address" />
</item>
<item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=sauna"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=sauna"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=sauna" />
<label text="Edit Sauna" />
- <space />
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Sauna" />
- <label text="Edit Sauna" de.text="bearbeite Sauna" />
- <space />
+ <space />
<key key="leisure" value="sauna" />
<text key="name" text="Name" />
- <text key="operator" text="Operator" de.text="Betreiber" />
- <combo key="opening_hours" text="Opening Hours" de.text="Öffnungszeiten" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<combo key="access" text="Access" values="yes,permissive,private,unknown" />
+ <space />
+ <text key="phone" text="Phone Number" />
+ <text key="fax" text="Fax Number" />
+ <text key="website" text="Website" />
+ <text key="email" text="Email Address" />
+ </item>
+ <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
+ <label text="Edit Horse riding" />
+ <space />
+ <key key="leisure" value="horse_riding" />
+ <text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <text key="fee" text="Fee" />
+ <space />
+ <text key="phone" text="Phone Number" />
+ <text key="fax" text="Fax Number" />
+ <text key="website" text="Website" />
+ <text key="email" text="Email Address" />
+ </item>
+ <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=brothel"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=brothel"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=brothel"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=brothel"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=brothel"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=brothel" />
+ <label text="Edit Brothel" />
+ <space />
+ <key key="amenity" value="brothel" />
+ <text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <space />
+ <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+ <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+ <space />
+ <text key="phone" text="Phone Number" />
+ <text key="fax" text="Fax Number" />
+ <text key="website" text="Website" />
+ <text key="email" text="Email Address" />
</item>
<separator/>
<item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
@@ -3297,11 +3855,13 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=playground"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=playground" />
<label text="Edit Playground" />
+ <space />
<key key="leisure" value="playground" />
<text key="name" text="Name" />
</item>
<item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
<label text="Edit Picnic Site" />
+ <space />
<key key="tourism" value="picnic_site" />
<text key="name" text="Name" />
<check key="fireplace" text="Fireplace" default="off" />
@@ -3312,15 +3872,20 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bbq"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bbq"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
- <label text="Edit Public Grill"/>
+ <label text="Edit Public Grill" />
<space />
<key key="amenity" value="bbq" />
<text key="name" text="Name" />
<combo key="covered" text="Covered" values="yes,no" />
<combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
- </item>
+ </item>
<item name="Fishing" icon="presets/fishing.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
+ pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=fishing"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=fishing" />
<label text="Edit Fishing" />
+ <space />
<key key="leisure" value="fishing" />
<text key="name" text="Name" />
</item>
@@ -3332,12 +3897,16 @@ Note that for a match, at least one positive and no negative is required.
<group name="Culture" icon="presets/theater.png">
<item name="Museum" icon="presets/State_Public.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=museum"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=museum"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=museum"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=museum" />
<label text="Edit Museum" />
+ <space />
<key key="tourism" value="museum" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<text key="wikipedia" text="Wikipedia" />
</item>
<item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
@@ -3347,21 +3916,26 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=theatre"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=theatre" />
<label text="Edit Theatre" />
+ <space />
<key key="amenity" value="theatre" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
</item>
<item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library"
+ et.href="http://wiki.openstreetmap.org/wiki/Et:Tag:amenity=library"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=library"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=library"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=library"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=library" />
<label text="Edit Library" />
+ <space />
<key key="amenity" value="library" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
@@ -3370,6 +3944,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=arts_centre"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=arts_centre" />
<label text="Edit Arts Centre" />
+ <space />
<key key="amenity" value="arts_centre" />
<text key="name" text="Name" />
</item>
@@ -3379,30 +3954,14 @@ Note that for a match, at least one positive and no negative is required.
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=artwork"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:tourism=artwork"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:tourism=artwork"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork" />
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=artwork"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=artwork"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=artwork" />
<label text="Edit Artwork" />
+ <space />
<key key="tourism" value="artwork" />
<text key="name" text="Name" />
</item>
- <item name="Place of Worship" icon="presets/church.png" type="node,closedway,relation">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
- da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
- it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
- ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
- no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
- sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
- <label text="Edit Place of Worship" />
- <key key="amenity" value="place_of_worship" />
- <text key="name" text="Name" />
- <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
- <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
- <combo key="service_times" text="Service Times" values="Su 10:00,Su 10:30,Su 11:00" />
- <combo key="opening_hours" text="Opening Hours for visiting" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
- </item>
<item name="Recording Studio" icon="presets/studio.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=studio"
@@ -3415,8 +3974,172 @@ Note that for a match, at least one positive and no negative is required.
<combo key="type" text="Type" values="audio,video" />
<text key="phone" text="Phone Number" />
<text key="website" text="Website" />
- </item>
+ </item>
</group> <!-- Culture -->
+ <group name="Place of Worship" icon="styles/standard/religion.png">
+ <item name="Church" icon="styles/standard/religion/church.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
+ no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
+ <label text="Edit Church" />
+ <space />
+ <key key="amenity" value="place_of_worship" />
+ <key key="religion" value="christian" />
+ <text key="name" text="Name" />
+ <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" match="keyvalue" values_searchable="true" />
+ <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" match="keyvalue" values_searchable="true" />
+ <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
+ no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
+ <label text="Edit Mosque" />
+ <space />
+ <key key="amenity" value="place_of_worship" />
+ <key key="religion" value="muslim" />
+ <text key="name" text="Name" />
+ <combo key="building" text="Building type" values="mosque" match="keyvalue" values_searchable="true" />
+ <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" match="keyvalue" values_searchable="true" />
+ <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
+ no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
+ <label text="Edit Synagogue" />
+ <space />
+ <key key="amenity" value="place_of_worship" />
+ <key key="religion" value="jewish" />
+ <text key="name" text="Name" />
+ <combo key="building" text="Building type" values="synagogue" match="keyvalue" values_searchable="true" />
+ <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" match="keyvalue" values_searchable="true" />
+ <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
+ no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
+ <label text="Edit Buddhist Temple" />
+ <space />
+ <key key="amenity" value="place_of_worship" />
+ <key key="religion" value="buddhist" />
+ <text key="name" text="Name" />
+ <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" match="keyvalue" values_searchable="true" />
+ <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
+ no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
+ <label text="Edit Hindu Temple" />
+ <space />
+ <key key="amenity" value="place_of_worship" />
+ <key key="religion" value="hindu" />
+ <text key="name" text="Name" />
+ <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" match="keyvalue" values_searchable="true" />
+ <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
+ no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
+ <label text="Edit Shinto Shrine" />
+ <space />
+ <key key="amenity" value="place_of_worship" />
+ <key key="religion" value="shinto" />
+ <text key="name" text="Name" />
+ <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Other Place of Worship" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+ da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
+ no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
+ <label text="Edit other Place of Worship" />
+ <space />
+ <key key="amenity" value="place_of_worship" />
+ <text key="name" text="Name" />
+ <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
+ <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ </group> <!-- Place of Worship -->
<group name="Public Building" icon="presets/townhall.png">
<item name="Public Building" icon="styles/standard/service.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building"
@@ -3424,21 +4147,24 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=public_building"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=public_building" />
<label text="Edit Public Building" />
+ <space />
<key key="amenity" value="public_building" />
<text key="name" text="Name" />
</item>
<item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=townhall"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=townhall"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=townhall"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=townhall"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=townhall" />
<label text="Edit Town hall" />
+ <space />
<key key="amenity" value="townhall" />
<text key="name" text="Name" />
</item>
- <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway">
+ <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=community_centre"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=community_centre"
@@ -3450,8 +4176,8 @@ Note that for a match, at least one positive and no negative is required.
<key key="amenity" value="community_centre" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=embassy"
@@ -3459,6 +4185,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=embassy"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=embassy" />
<label text="Edit Embassy" />
+ <space />
<key key="amenity" value="embassy" />
<text key="name" text="Name" />
</item>
@@ -3469,6 +4196,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=courthouse"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=courthouse" />
<label text="Edit Courthouse" />
+ <space />
<key key="amenity" value="courthouse" />
<text key="name" text="Name" />
</item>
@@ -3479,6 +4207,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=prison"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
<label text="Edit Prison" />
+ <space />
<key key="amenity" value="prison" />
<text key="name" text="Name" />
</item>
@@ -3492,6 +4221,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=police"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=police" />
<label text="Edit Police" />
+ <space />
<key key="amenity" value="police" />
<text key="name" text="Name" />
</item>
@@ -3501,29 +4231,35 @@ Note that for a match, at least one positive and no negative is required.
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fire_station"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=fire_station"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fire_station"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=fire_station"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fire_station"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fire_station" />
<label text="Edit Fire Station" />
+ <space />
<key key="amenity" value="fire_station" />
<text key="name" text="Name" />
</item>
<item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_office"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=post_office"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=post_office"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=post_office"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=post_office"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=post_office"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_office"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_office" />
<label text="Edit Post Office" />
+ <space />
<key key="amenity" value="post_office" />
<text key="name" text="Name" />
- <text key="operator" text="Operator" />
+ <text key="operator" text="Operator" />
</item>
</group> <!-- Public Buildings -->
<group name="Education" icon="presets/school.png">
<item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation">
<label text="Edit Kindergarten" />
+ <space />
<key key="amenity" value="kindergarten" />
<text key="name" text="Name" />
</item>
@@ -3539,6 +4275,7 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=school"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
<label text="Edit School" />
+ <space />
<key key="amenity" value="school" />
<text key="name" text="Name" />
</item>
@@ -3546,65 +4283,84 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=university"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=university"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=university"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=university"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=university"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=university"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=university"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
<label text="Edit University" />
+ <space />
<key key="amenity" value="university" />
<text key="name" text="Name" />
</item>
<item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=college"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=college"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=college"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=college"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
<label text="Edit College" />
+ <space />
<key key="amenity" value="college" />
<text key="name" text="Name" />
</item>
<item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Proposed_features/driving_school" />
- <label text="Edit Driving School"/>
+ <label text="Edit Driving School" />
<space />
<key key="amenity" value="driving_school" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <text key="license_classes" text="License Classes" values="A1;A;B;BE;C" />
+ <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
</item>
</group> <!-- Education -->
<group name="Health" icon="presets/pharmacy.png">
<item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=hospital"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=hospital"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=hospital"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=hospital"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=hospital"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=hospital"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=hospital" />
<label text="Edit Hospital" />
+ <space />
<key key="amenity" value="hospital" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ </item>
+ <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
+ <label text="Edit Clinic" />
+ <space />
+ <key key="amenity" value="clinic" />
+ <text key="name" text="Name" />
</item>
<item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=doctors" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=doctors"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=doctors" />
<label text="Edit Doctors" />
+ <space />
<key key="amenity" value="doctors" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
<label text="Edit Dentist" />
+ <space />
<key key="amenity" value="dentist" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Nursing Home" type="node,closedway">
<label text="Edit Nursing Home" />
+ <space />
<key key="amenity" value="nursing_home" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
@@ -3616,6 +4372,7 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:social_facility"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:social_facility" />
<label text="Edit Retirement Home" />
+ <space />
<key key="amenity" value="social_facility" />
<key key="social_facility" value="group_home" />
<key key="social_facility:for" value="senior" />
@@ -3630,28 +4387,31 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=pharmacy"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=pharmacy"
no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=pharmacy"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=pharmacy"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=pharmacy"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pharmacy" />
<label text="Edit Pharmacy" />
+ <space />
<key key="amenity" value="pharmacy" />
- <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"/>
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hearing_aids" />
<label text="Edit Hearing Aids" />
<space />
<key key="shop" value="hearing_aids" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
- cs.href="http://wiki.openstreetmap.org/wiki/CS:Tag:amenity=baby_hatch"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=baby_hatch"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=baby_hatch"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=baby_hatch"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=baby_hatch"
@@ -3661,9 +4421,10 @@ Note that for a match, at least one positive and no negative is required.
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=baby_hatch"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=baby_hatch" />
<label text="Edit Baby Hatch" />
+ <space />
<key key="amenity" value="baby_hatch" />
<text key="operator" text="Operator" />
- <text key="opening_hours" text="Opening Hours" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
@@ -3686,38 +4447,58 @@ Note that for a match, at least one positive and no negative is required.
<item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=veterinary"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=veterinary"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=veterinary"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=veterinary"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=veterinary"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=veterinary" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=veterinary"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=veterinary" />
<label text="Edit Veterinary" />
+ <space />
<key key="amenity" value="veterinary" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
</group> <!-- Health -->
<group name="Facilities" icon="presets/telephone.png">
<item name="Toilets" icon="presets/toilet.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=toilets"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=toilets"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=toilets"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=toilets"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=toilets" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=toilets"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=toilets" />
+ <label text="Edit Toilets" />
+ <space />
<key key="amenity" value="toilets" />
- <text key="operator" text="Operator" />
- <text key="ref" text="Reference number" />
- <combo key="fee" text="Fee" values="yes,no" />
- <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
- <text key="note" text="Note" />
+ <combo key="access" text="Access rights" values="public,permissive,customers" />
+ <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
+ <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
+ <optional>
+ <text key="description" text="Description" />
+ <combo key="fee" text="Fee" values="yes,no" />
+ <text key="operator" text="Operator" />
+ <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
+ <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+ </optional>
</item>
<item name="Post Box" icon="styles/standard/service/post_box.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=post_box"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=post_box"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=post_box"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_box" />
+ <label text="Edit Postbox" />
+ <space />
<key key="amenity" value="post_box" />
<text key="operator" text="Operator" />
+ <text key="ref" text="Reference number" />
+ <combo key="collection_times" text="Collection times" delimiter="|" values="11:30|Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00|Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off" />
+ <check key="drive_through" text="Drive through" />
</item>
<item name="Telephone" icon="presets/telephone.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
@@ -3728,6 +4509,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=telephone"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=telephone" />
<label text="Edit Telephone" />
+ <space />
<key key="amenity" value="telephone" />
<text key="operator" text="Operator" />
<check key="payment:coins" text="Coins" default="off" />
@@ -3737,6 +4519,43 @@ Note that for a match, at least one positive and no negative is required.
<check key="payment:credit_cards" text="Credit cards" default="off" />
<check key="payment:telephone_cards" text="Telephone cards" default="off" />
</item>
+ <item name="Emergency Phone" icon="presets/telephone.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
+ <key key="emergency" value="phone" />
+ </item>
+ <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Key:internet_access"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:internet_access"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:internet_access"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:internet_access" />
+ <label text="Edit Internet Access" />
+ <space />
+ <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
+ <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
+ </item>
+ <item name="Automated Defibrillator" icon="presets/aed.svg" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=aed"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=aed"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=aed"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=aed" />
+ <label text="Edit Automated External Defibrillator" />
+ <space />
+ <key key="emergency" value="aed" />
+ <combo key="opening_hours" text="Opening Hours" values="24/7,limited" />
+ <text key="operator" text="Operator" />
+ <check key="indoor" text="Located inside a building?" default="off" />
+ <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
+ <optional>
+ <text key="lastcheck" text="Last check date (YYYY-MM-DD)" />
+ <text key="lastcheck:note" text="Last check note" />
+ </optional>
+ -->
+ </item>
<item name="Clock" icon="styles/standard/service/clock.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
@@ -3746,8 +4565,8 @@ Note that for a match, at least one positive and no negative is required.
<label text="Edit Clock" />
<key key="amenity" value="clock" />
<optional>
- <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" values_context="display" />
- <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" />
+ <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" />
+ <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
<combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
<check key="date" text="Shows current date" default="off" />
<check key="thermometer" text="Shows temperature" default="off" />
@@ -3763,8 +4582,11 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=recycling"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=recycling"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=recycling"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=recycling" />
- <label text="Edit Recycling station" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=recycling"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=recycling"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=recycling" />
+ <label text="Edit Recycling Station" />
+ <space />
<key key="amenity" value="recycling" />
<check key="recycling:batteries" text="Batteries" default="off" />
<check key="recycling:cans" text="Cans" default="off" />
@@ -3780,28 +4602,35 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=waste_basket"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=waste_basket"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=waste_basket"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=waste_basket"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_basket"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_basket" />
- <label text="Edit Waste Basket" />
<key key="amenity" value="waste_basket" />
</item>
<item name="Waste Disposal" icon="styles/standard/service/recycling/waste_disposal.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_disposal"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=waste_disposal"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=waste_disposal"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=waste_disposal"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_disposal"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
- <label text="Edit Waste Disposal" />
<key key="amenity" value="waste_disposal" />
</item>
<separator/>
<item name="Bench" icon="presets/bench.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bench"
+ et.href="http://wiki.openstreetmap.org/wiki/Et:Tag:amenity=bench"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=bench"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bench"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=bench"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=bench"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bench"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bench" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bench"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bench"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=bench" />
+ <label text="Edit Bench" />
+ <space />
<key key="amenity" value="bench" />
<combo key="backrest" text="Backrest" values="yes,no" />
<combo key="material" text="Material" values="stone,metal,wood,plastic" />
@@ -3810,15 +4639,17 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Shelter" icon="presets/shelter.png" type="node,closedway">
<label text="Edit Shelter" />
+ <space />
<key key="amenity" value="shelter" />
<text key="name" text="Name" />
<check key="fireplace" text="Fireplace" default="off" />
- <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" />
+ <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
</item>
<item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
<label text="Edit Hunting Stand" />
+ <space />
<key key="amenity" value="hunting_stand" />
- <combo key="height" text="Height" values="low,half,full,5,10,15,20" />
+ <combo key="height" text="Height" values="low,half,full,5,10,15,20" values_context="height" />
<combo key="shelter" text="Shelter" values="yes,no,unknown" />
<combo key="hide" text="Hide" values="yes,no,unknown" />
<combo key="lock" text="Lock" values="yes,no,unknown" />
@@ -3827,12 +4658,19 @@ Note that for a match, at least one positive and no negative is required.
<item name="Drinking Water" icon="presets/drinking_water.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=drinking_water"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=drinking_water"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=drinking_water"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=drinking_water"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=drinking_water" />
- <label text="Edit Drinking Water" />
+ <label text="Edit Source of Potable Water" />
+ <space />
<key key="amenity" value="drinking_water" />
- <text key="name" text="Name" />
+ <check key="indoor" text="Indoor" default="off" />
+ <optional>
+ <text key="name" text="Name" />
+ <text key="description" text="Description" />
+ </optional>
</item>
<item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
@@ -3843,6 +4681,7 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=fire_hydrant"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:emergency=fire_hydrant" />
<label text="Edit Fire Hydrant" />
+ <space />
<key key="emergency" value="fire_hydrant" />
<combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
<combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
@@ -3851,9 +4690,9 @@ Note that for a match, at least one positive and no negative is required.
<text key="ref" text="Reference" />
<text key="operator" text="Operator" />
<space />
- <combo key="fire_hydrant:position" text="Position" values_context="hydrant position" values="lane,parking_lot,sidewalk,green" />
+ <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
<combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
- <text key="fire_hydrant:count" text="Count" values="" />
+ <text key="fire_hydrant:count" text="Count" />
</item>
</group> <!-- Facilities -->
</group> <!-- Facilities -->
@@ -3861,171 +4700,191 @@ Note that for a match, at least one positive and no negative is required.
<group name="Sport Facilities" icon="presets/stadium.png">
<item name="Stadium" icon="presets/stadium.png" type="node,closedway">
<label text="Edit Stadium" />
+ <space />
<key key="leisure" value="stadium" />
<text key="name" text="Name" />
- <space />
- <label text="select sport:" />
- <space />
- <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
+ <optional text="Select sport:">
+ <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+ </optional>
</item>
<item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
<label text="Edit Sports Centre" />
+ <space />
<key key="leisure" value="sports_centre" />
<text key="name" text="Name" />
- <space />
- <label text="select sport:" />
- <space />
- <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" />
+ <optional text="Select sport:">
+ <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+ </optional>
</item>
<item name="Pitch" icon="presets/pitch.png" type="node,closedway">
<label text="Edit Pitch" />
+ <space />
<key key="leisure" value="pitch" />
<text key="name" text="Name" />
- <space />
- <label text="select sport:" />
- <space />
- <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
+ <optional text="Select sport:">
+ <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+ </optional>
</item>
<item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
<label text="Edit Racetrack" />
+ <space />
<key key="leisure" value="track" />
<text key="name" text="Name" />
- <space />
- <label text="select sport:" />
- <space />
- <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,table_tennis,tennis" />
+ <optional text="Select sport:">
+ <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+ </optional>
</item>
<item name="Golf Course" icon="presets/golf.png" type="node,closedway">
<label text="Edit Golf Course" />
+ <space />
<key key="leisure" value="golf_course" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
<label text="Edit Miniature Golf" />
+ <space />
<key key="leisure" value="miniature_golf" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
</group> <!-- Sport facilities -->
<group name="Sport" icon="presets/rowing.png">
<item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
<label text="Edit Multi" />
+ <space />
<key key="sport" value="multi" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
</item>
<item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
<label text="Edit 9pin" />
+ <space />
<key key="sport" value="9pin" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
<item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
<label text="Edit 10pin" />
+ <space />
<key key="sport" value="10pin" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
<item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery" />
<label text="Edit Archery" />
+ <space />
<key key="sport" value="archery" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
<item name="Athletics" icon="presets/athletics.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
<label text="Edit Athletics" />
+ <space />
<key key="sport" value="athletics" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
</item>
- <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
+ <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing" />
<label text="Edit Climbing" />
+ <space />
<key key="sport" value="climbing" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="sports_centre" />
+ <combo key="leisure" text="Type" values="sports_centre" />
</item>
<item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
<label text="Edit Canoeing" />
+ <space />
<key key="sport" value="canoe" />
<text key="name" text="Name" />
</item>
<item name="Cycling" icon="presets/cycling.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
<label text="Edit Cycling" />
+ <space />
<key key="sport" value="cycling" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
</item>
<item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
<label text="Edit Dog Racing" />
+ <space />
<key key="sport" value="dog_racing" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
</item>
<item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
<label text="Edit Equestrian" />
+ <space />
<key key="sport" value="equestrian" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="horse_riding,pitch,sports_centre,stadium,track" default="horse_riding" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+ <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
</item>
<item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
<label text="Edit Horse Racing" />
+ <space />
<key key="sport" value="horse_racing" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+ <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
</item>
<item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
<label text="Edit Gymnastics" />
+ <space />
<key key="sport" value="gymnastics" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
<item name="Skating" icon="presets/skating.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
<label text="Edit Skating" />
+ <space />
<key key="sport" value="skating" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
+ <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
</item>
<item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
<label text="Edit Skateboard" />
+ <space />
<key key="sport" value="skateboard" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
</item>
<item name="Swimming" icon="presets/swimming.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
<label text="Edit Swimming" />
+ <space />
<key key="sport" value="swimming" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" />
+ <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
</item>
<item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
<label text="Edit Skiing" />
+ <space />
<key key="sport" value="skiing" />
<text key="name" text="Name" />
<combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
- <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" />
- <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" />
+ <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
+ <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
</item>
<item name="Shooting" icon="presets/range.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
@@ -4034,86 +4893,97 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=shooting"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=shooting" />
<label text="Edit Shooting" />
+ <space />
<key key="sport" value="shooting" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
</group> <!-- Sport -->
<group name="Sport (Ball)" icon="presets/soccer.png">
<item name="Soccer" icon="presets/soccer.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=soccer"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=soccer"/>
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=soccer" />
<label text="Edit Soccer" />
+ <space />
<key key="sport" value="soccer" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
<label text="Edit Australian Football" />
+ <space />
<key key="sport" value="australian_football" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="American Football" icon="presets/football.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
<label text="Edit American Football" />
+ <space />
<key key="sport" value="american_football" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Canadian Football" icon="presets/football.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
<label text="Edit Canadian Football" />
+ <space />
<key key="sport" value="canadian_football" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
<label text="Edit Gaelic Games" />
+ <space />
<key key="sport" value="gaelic_games" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
<optional>
- <check key="gaelic_games:hurling" text="Hurling" text_context="gaelic game" default="off" />
- <check key="gaelic_games:football" text="Football" text_context="gaelic game" default="off" />
- <check key="gaelic_games:camogie" text="Camogie" text_context="gaelic game" default="off" />
- <check key="gaelic_games:rounders" text="Rounders" text_context="gaelic game" default="off" />
+ <check key="gaelic_games:hurling" text="Hurling" />
+ <check key="gaelic_games:football" text="Football" />
+ <check key="gaelic_games:camogie" text="Camogie" />
+ <check key="gaelic_games:rounders" text="Rounders" />
</optional>
</item>
<item name="Rugby League" icon="presets/football.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league"/>
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league" />
<label text="Edit Rugby League" />
+ <space />
<key key="sport" value="rugby_league" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Rugby Union" icon="presets/football.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union"/>
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union" />
<label text="Edit Rugby Union" />
+ <space />
<key key="sport" value="rugby_union" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Baseball" icon="presets/baseball.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
<label text="Edit Baseball" />
+ <space />
<key key="sport" value="baseball" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Basketball" icon="presets/basketball.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
<label text="Edit Basketball" />
+ <space />
<key key="sport" value="basketball" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
- <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">
+ <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
<label text="Edit Volleyball" />
<space />
@@ -4133,123 +5003,141 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Golf" icon="presets/golf.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=golf"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf"/>
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf" />
<label text="Edit Golf" />
+ <space />
<key key="sport" value="golf" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
+ <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
</item>
<item name="Boule" icon="presets/boule.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
<label text="Edit Boule" />
+ <space />
<key key="sport" value="boules" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Bowls" icon="presets/boule.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
<label text="Edit Bowls" />
+ <space />
<key key="sport" value="bowls" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Cricket" icon="presets/cricket.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
<label text="Edit Cricket" />
+ <space />
<key key="sport" value="cricket" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
<label text="Edit Cricket Nets" />
+ <space />
<key key="sport" value="cricket_nets" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
<item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
<label text="Edit Croquet" />
+ <space />
<key key="sport" value="croquet" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
<label text="Edit Hockey" />
+ <space />
<key key="sport" value="hockey" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="ice_rink,pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
</item>
<item name="Pelota" icon="presets/pelota.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota"/>
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota" />
<label text="Edit Pelota" />
+ <space />
<key key="sport" value="pelota" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
<item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
- uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet"/>
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
<label text="Edit Racquet" />
+ <space />
<key key="sport" value="racquet" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
<item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
<label text="Edit Table Tennis" />
+ <space />
<key key="sport" value="table_tennis" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
</item>
<item name="Tennis" icon="presets/tennis.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
<label text="Edit Tennis" />
+ <space />
<key key="sport" value="tennis" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium" default="pitch" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</item>
</group> <!-- Sport (Ball) -->
<group name="Motorsport" icon="presets/motorbike.png">
<item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway">
<label text="Edit Motorsport" />
+ <space />
<key key="sport" value="motor" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
</item>
<item name="Karting" icon="presets/karting.png" type="node,closedway">
<label text="Edit Karting" />
+ <space />
<key key="sport" value="karting" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
</item>
<item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
<label text="Edit Motocross" />
+ <space />
<key key="sport" value="motocross" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
</item>
<item name="Safety Training" icon="presets/safety_training.png" type="node,closedway">
<label text="Edit Safety Training" />
+ <space />
<key key="sport" value="safety_training" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
</item>
<separator/>
<item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway">
<label text="Edit Model Aerodrome" />
+ <space />
<key key="sport" value="model_aerodrome" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
</item>
<item name="RC Car" icon="presets/car.png" type="node,closedway">
<label text="Edit RC Car" />
+ <space />
<key key="sport" value="rc_car" />
<text key="name" text="Name" />
- <combo key="leisure" text="type" values="pitch,sports_centre,track" />
+ <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
</item>
</group> <!-- Motorsport -->
</group> <!-- Sports -->
@@ -4259,7 +5147,7 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Key:building"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:building"
- hu.href="http://wiki.openstreetmap.org/wiki/HU:Key:building"
+ hu.href="http://wiki.openstreetmap.org/wiki/Hu:Key:building"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:building"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:building"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:building"
@@ -4269,7 +5157,8 @@ Note that for a match, at least one positive and no negative is required.
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
<label text="Edit Building" />
- <combo key="building" text="Building" values="yes,roof,garage,industrial,church,school,hangar,commercial,farm,transportation,greenhouse,office,university" default="yes" match="keyvalue" />
+ <space />
+ <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed" values_context="building" default="yes" match="keyvalue" values_searchable="true" />
<text key="name" text="Name" />
</item>
<item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation">
@@ -4280,14 +5169,29 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:building"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:building"
no.href="http://wiki.openstreetmap.org/wiki/NO:Key:building"
- pl.href="http://wiki.openstreetmap.org/wiki/PL:Key:building"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:building"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
<label text="Edit Residential Building" />
- <combo key="building" text="Building" values="residential,apartments,house,hut,terrace,detached,roof" default="residential" match="keyvalue" />
+ <space />
+ <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" values_searchable="true" />
<text key="name" text="Name" />
</item>
+ <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:entrance"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:entrance"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:entrance"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:entrance" />
+ <label text="Edit Entrance" />
+ <space />
+ <combo key="entrance" text="Entrance" values="yes,main,service,exit,emergency" values_context="entrance" default="yes" match="key" />
+ <combo key="access" text="Access" values="yes,delivery,private,no" />
+ <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+ </item>
<item name="Tower" icon="presets/tower.png" type="node,closedway">
<label text="Edit Tower" />
+ <space />
<key key="man_made" value="tower" />
<text key="name" text="Name" />
<combo key="tower:type" text="Tower type" values="communication,observation" />
@@ -4304,6 +5208,7 @@ Note that for a match, at least one positive and no negative is required.
<separator/>
<item name="Works" icon="presets/works.png" type="node,closedway">
<label text="Edit Works" />
+ <space />
<key key="man_made" value="works" />
<text key="name" text="Name" />
</item>
@@ -4318,15 +5223,18 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Windmill" icon="presets/windmill.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=windmill"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=windmill"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:man_made=windmill"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill" />
<label text="Edit Windmill" />
+ <space />
<key key="man_made" value="windmill" />
<text key="name" text="Name" />
</item>
<item name="Gasometer" icon="presets/gasometer.png" type="node,closedway">
<label text="Edit Gasometer" />
+ <space />
<key key="man_made" value="gasometer" />
<text key="name" text="Name" />
</item>
@@ -4334,8 +5242,9 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=pipeline"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline"/>
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
<label text="Edit Pipeline" />
+ <space />
<key key="man_made" value="pipeline" />
<text key="operator" text="Operator" />
<combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
@@ -4344,8 +5253,10 @@ Note that for a match, at least one positive and no negative is required.
<item name="Crane" icon="presets/crane.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=crane"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=crane"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=crane" />
<label text="Edit Crane" />
+ <space />
<key key="man_made" value="crane" />
<text key="name" text="Name" />
</item>
@@ -4354,6 +5265,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=mineshaft" />
<label text="Edit Mineshaft" />
+ <space />
<key key="man_made" value="mineshaft" />
<text key="name" text="Name" />
<combo key="mineshaft_type" text="Function" values="winding,air" />
@@ -4366,9 +5278,12 @@ Note that for a match, at least one positive and no negative is required.
<item name="Adit" icon="presets/adit.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=adit"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=adit"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=adit"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=adit"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=adit" />
<label text="Edit Adit" />
+ <space />
<key key="man_made" value="adit" />
<text key="name" text="Name" />
<text key="length" text="Length in meters" />
@@ -4379,11 +5294,13 @@ Note that for a match, at least one positive and no negative is required.
<separator/>
<item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
<label text="Edit Water Tower" />
+ <space />
<key key="man_made" value="water_tower" />
<text key="name" text="Name" />
</item>
<item name="Water Works" icon="presets/water_works.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_works"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_works"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_works" />
@@ -4402,14 +5319,17 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=wastewater_plant"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=wastewater_plant" />
<label text="Edit Wastewater Plant" />
+ <space />
<key key="man_made" value="wastewater_plant" />
<text key="name" text="Name" />
</item>
- <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node">
+ <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=watermill"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=watermill"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=watermill"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
- <label text="Edit Watermill"/>
+ <label text="Edit Watermill" />
<space />
<key key="man_made" value="watermill" />
<text key="name" text="Name" />
@@ -4418,11 +5338,13 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=fountain"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fountain"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fountain"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fountain"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fountain" />
<label text="Edit Fountain" />
+ <space />
<key key="amenity" value="fountain" />
<text key="name" text="Name" />
</item>
@@ -4430,18 +5352,22 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_well"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_well"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=water_well"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_well" />
<label text="Edit Water Well" />
+ <space />
<key key="man_made" value="water_well" />
<text key="name" text="Name" />
</item>
<separator/>
<item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=lighthouse"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=lighthouse"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=lighthouse"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=lighthouse" />
<label text="Edit Lighthouse" />
+ <space />
<key key="man_made" value="lighthouse" />
<text key="name" text="Name" />
</item>
@@ -4450,49 +5376,117 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
<label text="Edit Beacon" />
+ <space />
<key key="man_made" value="beacon" />
<text key="name" text="Name" />
</item>
- <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node">
+ <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=street_lamp"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=street_lamp"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
<label text="Edit Street Lamp" />
<space />
<key key="highway" value="street_lamp" />
<combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
</item>
- <item name="Measurement Station" icon="presets/measurement_station.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/measurement_station" />
- <label text="Edit Measurement Station" />
+ <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
+ <label text="Edit Monitoring Station" />
<space />
- <key key="man_made" value="measurement_station" />
+ <key key="man_made" value="monitoring_station" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="measurement" text="Measurement" values="particulate_matter,seismic,water_level,weather" />
- <combo key="recording" text="Recording" values="manually,automated,remote,no" />
- <combo key="display" text="Display" values="analog,digital,no" values_context="display" />
- </item>
+ <label text="Monitoring:" />
+ <checkgroup columns="3">
+ <check key="monitoring:weather" text="Weather" />
+ <check key="monitoring:water_level" text="Water level" />
+ <check key="monitoring:tide_gauge" text="Tide Level" />
+ <check key="monitoring:traffic" text="Traffic" />
+ <check key="monitoring:air_quality" text="Air Quality" />
+ <check key="monitoring:noise" text="Noise" />
+ <check key="monitoring:gps" text="GPS Signals" />
+ <check key="monitoring:glonass" text="GLONASS Signals" />
+ <check key="monitoring:galileo" text="Galileo Signals" />
+ <check key="monitoring:radiation" text="Radiation" />
+ <check key="monitoring:seismic_activity" text="Seismic Activity" />
+ </checkgroup>
+ <label text="Recording:" />
+ <checkgroup columns="3">
+ <check key="recording:automated" text="Automated" />
+ <check key="recording:manually" text="Manually" />
+ <check key="recording:remote" text="Remote" />
+ </checkgroup>
+ <label text="Display:" />
+ <checkgroup columns="2">
+ <check key="display:analog" text="Analog" />
+ <check key="display:digital" text="Digital" />
+ </checkgroup>
+ </item>
<item name="Survey Point" icon="presets/survey_point.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=survey_point"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point" />
<label text="Edit Survey Point" />
+ <space />
<key key="man_made" value="survey_point" />
<text key="name" text="Name" />
</item>
- <item name="Surveillance" icon="presets/surveillance.png" type="node,closedway">
+ <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=surveillance"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=surveillance" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=surveillance"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=surveillance" />
<label text="Edit Surveillance Camera" />
+ <space />
<key key="man_made" value="surveillance" />
+ <key key="surveillance:type" value="camera" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
<combo key="surveillance" text="Type" values="indoor,outdoor,public" />
+ <combo key="surveillance:zone" text="Zone" values="town,parking,traffic,shop,bank,building" />
+ <space />
+ <label text="Camera" />
+ <space />
+ <combo key="camera:type" text="Type" values="fixed,panning,dome" match="key" />
+ <combo key="camera:mount" text="Mounted on" values="wall,pole,ceiling" match="key" />
+ <optional>
+ <text key="camera:direction" text="Direction in degrees" match="key" />
+ <text key="camera:angle" text="Inclination in degrees" match="key" />
+ <text key="height" text="Height in meter (m)" />
+ </optional>
</item>
</group> <!-- Man Made -->
<group name="Power" icon="presets/power.png">
- <item name="Power Generator" icon="presets/power.png" type="node,closedway">
+ <item name="Power Plant" icon="presets/power.png" type="closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=plant" />
+ <label text="Edit Power Plant" />
+ <space />
+ <key key="power" value="plant" />
+ <text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <text key="ref" text="Reference" />
+ <text key="start_date" text="Start date" />
+ <optional>
+ <label text="Output forms of energy" />
+ <label text="(please add this information to the generators if possible)" />
+ <space />
+ <combo key="plant:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="plant:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="plant:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="plant:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="plant:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="plant:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="plant:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+ </optional>
+ </item>
+ <item name="Power Generator" icon="presets/power.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
@@ -4500,55 +5494,115 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
<label text="Edit Power Generator" />
+ <space />
<key key="power" value="generator" />
<text key="name" text="Name" />
- <combo key="generator:source" text="Source" values="biofuel,biogas,biomass,coal,diesel,gas,gasoline,geothermal,hydro,nuclear,oil,osmotic,solar,tidal,waste,wave,wind" />
- <combo key="generator:method" text="Method" values="anaerobic_digestion,combustion,dam,fission,fusion,gasification,photovoltaic,pumped-storage,pumping,pyrolysis,run-of-the-river,thermal" />
- <space />
- <label text="Output forms of energy" />
- <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
- <combo key="generator:output:battery_charging" text="battery charging" values="yes,2 W,3 kW,5 MW,7 GW" />
- </item>
- <item name="Power Station" icon="presets/power.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
- fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
- pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
- <label text="Edit Power Station" />
- <key key="power" value="station" />
- <text key="name" text="Name" />
<text key="operator" text="Operator" />
<text key="ref" text="Reference" />
+ <text key="start_date" text="Start date" />
+ <combo key="generator:source" text="Source" values_searchable="true">
+ <list_entry value="biofuel" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
+ <list_entry value="biogas" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
+ <list_entry value="biomass" icon="http://wiki.openstreetmap.org/w/images/6/6b/Bahnpirat-power_source-biofuel.svg" />
+ <list_entry value="coal" icon="http://wiki.openstreetmap.org/w/images/4/4b/Bahnpirat-power_source-coal.svg" />
+ <list_entry value="diesel" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
+ <list_entry value="gas" icon="http://wiki.openstreetmap.org/w/images/e/e6/Bahnpirat-power_source-gas.svg" />
+ <list_entry value="gasoline" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
+ <list_entry value="geothermal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+ <list_entry value="hydro" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+ <list_entry value="nuclear" icon="http://wiki.openstreetmap.org/w/images/3/3e/2020_stBN_powergensource_nuclear.svg" />
+ <list_entry value="oil" icon="http://wiki.openstreetmap.org/w/images/f/f7/Bahnpirat-power_source-oil.svg" />
+ <list_entry value="osmotic" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+ <list_entry value="solar" icon="http://wiki.openstreetmap.org/w/images/2/22/2020_stBN_powergensource_sun.svg" />
+ <list_entry value="tidal" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+ <list_entry value="waste" icon="http://wiki.openstreetmap.org/w/images/2/2f/Bahnpirat-power_source-waste.svg" />
+ <list_entry value="wave" icon="http://wiki.openstreetmap.org/w/images/e/ed/2020_stBN_powergensource_water.svg" />
+ <list_entry value="wind" icon="http://wiki.openstreetmap.org/w/images/0/03/2020_stBN_powergensource_wind.svg" />
+ </combo>
+ <combo key="generator:method" text="Method" values_context="generator method" values_searchable="true">
+ <list_entry value="anaerobic_digestion" short_description="" /> <!-- Recheck -->
+ <list_entry value="barrage" short_description="tidal" />
+ <list_entry value="combustion" short_description="bio / coal / diesel / gas / gasoline / oil / waste" />
+ <list_entry value="fission" short_description="nuclear" />
+ <list_entry value="fusion" short_description="nuclear" />
+ <list_entry value="gasification" short_description="biomass / waste" />
+ <list_entry value="photovoltaic" short_description="solar" />
+ <list_entry value="pyrolysis" short_description="" /> <!-- Recheck -->
+ <list_entry value="run-of-the-river" short_description="hydro" />
+ <list_entry value="stream" short_description="tidal" />
+ <list_entry value="thermal" short_description="solar" />
+ <list_entry value="water-pumped-storage" short_description="hydro" />
+ <list_entry value="water-storage" short_description="hydro" />
+ </combo>
+ <combo key="generator:type" text="Generator Type" values_searchable="true">
+ <list_entry value="combined_cycle" short_description="gas combustion" />
+ <list_entry value="francis_turbine" short_description="hydro" />
+ <list_entry value="gas_turbine" short_description="biogas, biomass, gas, waste combustion" />
+ <list_entry value="heat_pump" short_description="geothermal" />
+ <list_entry value="horizontal_axis" short_description="tidal steam / wind" />
+ <list_entry value="kaplan_turbine" short_description="hygro run-of-the-river / hydro water-storage / tidal barrage" />
+ <list_entry value="pelton_turbine" short_description="hygro run-of-the-river / hydro water-storage" />
+ <list_entry value="reciprocating_engine" short_description="biofuel, biogas, diesel, gas, gasoline" />
+ <list_entry value="solar_photovoltaic_panel" short_description="solar photovoltaic" />
+ <list_entry value="solar_thermal_collector" short_description="solar thermal" />
+ <list_entry value="steam_generator" short_description="bio, coal, diesel, gas, gasoline, oil, waste combustion" />
+ <list_entry value="steam_turbine" short_description="geothermal / solar thermal / bio, coal, oil, waste combustion" />
+ <list_entry value="stellarator" short_description="nuclear fusion" />
+ <list_entry value="tokamak" short_description="nuclear fusion" />
+ <list_entry value="vertical_axis" short_description="tidal steam / wind" />
+ <list_entry value="BWR-1" display_value="Boiling Water Reactor 1 (BWR-1)" short_description="nuclear fission" />
+ <list_entry value="BWR-2" display_value="Boiling Water Reactor 2 (BWR-2)" short_description="nuclear fission" />
+ <list_entry value="BWR-3" display_value="Boiling Water Reactor 3 (BWR-3)" short_description="nuclear fission" />
+ <list_entry value="BWR-4" display_value="Boiling Water Reactor 4 (BWR-4)" short_description="nuclear fission" />
+ <list_entry value="BWR-5" display_value="Boiling Water Reactor 5 (BWR-5)" short_description="nuclear fission" />
+ <list_entry value="BWR-6" display_value="Boiling Water Reactor 6 (BWR-6)" short_description="nuclear fission" />
+ <list_entry value="CANDU" display_value="CANada Deuterium Uranium reactor (CANDU)" short_description="nuclear fission" />
+ <list_entry value="CPR-1000" display_value="China Pressurized Reactor (CPR-1000)" short_description="nuclear fission" />
+ <list_entry value="EPR" display_value="European Pressurized Reactor (EPR)" short_description="nuclear fission" />
+ <list_entry value="ICF" display_value="Inertial Confinement Fusion (ICF)" short_description="nuclear fusion" />
+ <list_entry value="PWR" display_value="Pressurized water reactor (PWR)" short_description="nuclear fission" />
+ <list_entry value="RBMK-1000" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)" short_description="nuclear fission" />
+ <list_entry value="RBMK-1500" display_value="Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)" short_description="nuclear fission" />
+ <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="nuclear fission" />
+ </combo>
+ <optional text="Output forms of energy:">
+ <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+ </optional>
</item>
<item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=sub_station"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=sub_station"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=sub_station"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=sub_station"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=sub_station" />
<label text="Edit Power Sub Station" />
+ <space />
<key key="power" value="sub_station" />
<text key="operator" text="Operator" />
<text key="ref" text="Line reference" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
</item>
<item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=cable_distribution_cabinet" />
<label text="Edit Cable Distribution Cabinet" />
+ <space />
<key key="power" value="cable_distribution_cabinet" />
<text key="operator" text="Operator" />
<text key="ref" text="Reference" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
</item>
<separator/>
<item name="Power Tower" icon="presets/power_tower.png" type="node">
@@ -4561,8 +5615,12 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=tower"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
<label text="Edit Power Tower" />
+ <space />
<key key="power" value="tower" />
+ <text key="operator" text="Operator" />
<text key="ref" text="Tower reference" />
+ <text key="height" text="Height in meter (m)" />
+ <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
</item>
<item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
@@ -4573,18 +5631,29 @@ Note that for a match, at least one positive and no negative is required.
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=pole"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
<label text="Edit Power Pole" />
+ <space />
<key key="power" value="pole" />
+ <text key="operator" text="Operator" />
<text key="ref" text="Pole reference" />
+ <text key="height" text="Height in meter (m)" />
+ <combo key="material" text="Material" values="metal,plastic,steel,stone,wood" />
</item>
<item name="Power Line" icon="presets/power.png" type="way">
<link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
- de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
+ fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=line"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=line"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=line"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=line"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=line"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
<label text="Edit Power Line" />
- <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" match="keyvalue" />
+ <space />
+ <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
<text key="operator" text="Operator" />
<text key="ref" text="Line reference" />
- <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
- <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" />
+ <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,750,400,220,110,high,medium,low,750000;200000,110000;20000" />
+ <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
<text key="cables" text="Amount of Cables" />
<combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" />
</item>
@@ -4593,17 +5662,20 @@ Note that for a match, at least one positive and no negative is required.
<item name="Castle" icon="presets/State_Tourist.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=castle" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=castle"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=castle" />
<label text="Edit Castle" />
+ <space />
<key key="historic" value="castle" />
<text key="name" text="Name" />
<text key="wikipedia" text="Wikipedia" />
</item>
<item name="Ruins" icon="presets/ruins.png" type="node,closedway">
<label text="Edit Ruins" />
+ <space />
<key key="historic" value="ruins" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
@@ -4612,54 +5684,65 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=archaeological_site"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=archaeological_site" />
<label text="Edit Archaeological Site" />
+ <space />
<key key="historic" value="archaeological_site" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=battlefield"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:historic=battlefield"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:historic=battlefield"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=battlefield"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=battlefield" />
<label text="Edit Battlefield" />
+ <space />
<key key="historic" value="battlefield" />
<text key="name" text="Name" />
</item>
<item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
<label text="Edit Palaeontological Site" />
+ <space />
<key key="geological" value="palaeontological_site" />
<text key="name" text="Name" />
</item>
<separator/>
<item name="Monument" icon="presets/monument.png" type="node,closedway">
<label text="Edit Monument" />
+ <space />
<key key="historic" value="monument" />
<text key="name" text="Name" />
</item>
<item name="Memorial" icon="presets/memorial.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=memorial"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=memorial"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:historic=memorial"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:historic=memorial"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=memorial" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=memorial"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:historic=memorial" />
<label text="Edit Memorial" />
+ <space />
<key key="historic" value="memorial" />
<text key="name" text="Name" />
</item>
<item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway">
<label text="Edit Wayside Cross" />
+ <space />
<key key="historic" value="wayside_cross" />
<text key="name" text="Name" />
</item>
<item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
<label text="Edit Wayside Shrine" />
+ <space />
<key key="historic" value="wayside_shrine" />
<text key="name" text="Name" />
</item>
<item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway">
<label text="Edit Boundary Stone" />
+ <space />
<key key="historic" value="boundary_stone" />
<text key="name" text="Name" />
</item>
@@ -4668,46 +5751,59 @@ Note that for a match, at least one positive and no negative is required.
<group name="Shops" icon="styles/standard/shop/mall.png">
<group name="Food" icon="styles/standard/shop/supermarket.png">
<item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=supermarket"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=supermarket"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=supermarket"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=supermarket"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=supermarket"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=supermarket" />
<label text="Edit Supermarket" />
+ <space />
<key key="shop" value="supermarket" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=convenience"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=convenience"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=convenience"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=convenience" />
<label text="Edit Convenience Store" />
+ <space />
<key key="shop" value="convenience" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=kiosk"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=kiosk"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kiosk"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=kiosk" />
<label text="Edit Kiosk" />
+ <space />
<key key="shop" value="kiosk" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
- <item name="Baker" icon="presets/baker.png" type="node,closedway">
+ <item name="Bakery" icon="presets/baker.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery"
ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:shop=bakery"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bakery"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=bakery"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bakery"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=bakery"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bakery"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=bakery"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=bakery" />
- <label text="Edit Baker" />
+ <label text="Edit Bakery" />
+ <space />
<key key="shop" value="bakery" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Butcher" icon="presets/cow.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
@@ -4718,40 +5814,50 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=butcher"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=butcher" />
<label text="Edit Butcher" />
+ <space />
<key key="shop" value="butcher" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Seafood" icon="presets/seafood.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood"/>
- <label text="Edit Seafood" />
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=seafood"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=seafood" />
+ <label text="Edit Seafood Shop" />
<space />
<key key="shop" value="seafood" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=deli"/>
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=deli"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=deli"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=deli"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=deli" />
<label text="Edit Deli (Fine Food)" />
- <space />
+ <space />
<key key="shop" value="deli" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=confectionery"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=confectionery"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=confectionery"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=confectionery"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=confectionery"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=confectionery" />
<label text="Edit Confectionery" />
+ <space />
<key key="shop" value="confectionery" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway">
@@ -4768,168 +5874,251 @@ Note that for a match, at least one positive and no negative is required.
<key key="amenity" value="marketplace" />
<text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <text key="website" text="Website" />
+ <combo key="organic" text="Organic" values="only,yes,no" />
+ </item>
<item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=greengrocer"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=greengrocer"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=greengrocer"/>
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=greengrocer"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=greengrocer" />
<label text="Edit Greengrocer" />
<space />
<key key="shop" value="greengrocer" />
- <text key="name" text="Name" />
- <text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+ <text key="name" text="Name" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <text key="website" text="Website" />
+ <combo key="organic" text="Organic" values="only,yes,no" />
+ </item>
+ <item name="Farm Stand" icon="presets/apple.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=farm"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=farm"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=farm" />
+ <label text="Edit Farm Stand" />
+ <space />
+ <key key="shop" value="farm" />
+ <text key="name" text="Name" />
+ <text key="description" text="Description" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <text key="phone" text="Phone Number" match="key" />
+ <text key="website" text="Website" />
+ <combo key="organic" text="Organic" values="only,yes,no" />
</item>
<separator/>
<item name="Organic" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Key:organic" />
+ <link href="http://wiki.openstreetmap.org/wiki/Key:organic"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Key:organic" />
<label text="Edit Organic/Bio" />
- <combo text="Organic/Bio" key="organic" values="no,yes,only" match="key" />
+ <space />
+ <combo text="Organic/Bio" key="organic" values="only,yes,no" match="key" />
</item>
<item name="Fair Trade" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
<label text="Edit Fair Trade" />
+ <space />
<combo text="Fair Trade" key="fair_trade" values="no,yes,only" match="key" />
</item>
<separator/>
<item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=alcohol"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=alcohol"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=alcohol" />
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=alcohol"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=alcohol"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=alcohol" />
<label text="Edit Alcohol Shop" />
+ <space />
<key key="shop" value="alcohol" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beverages"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beverages"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beverages" />
<label text="Edit Beverages Shop" />
+ <space />
<key key="shop" value="beverages" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
</group> <!-- Food -->
<group name="Clothes" icon="styles/standard/shop/clothes.png">
<item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=clothes"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=clothes"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=clothes"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=clothes"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=clothes"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=clothes" />
<label text="Edit Clothes Shop" />
+ <space />
<key key="shop" value="clothes" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="second_hand" text="Second hand" values="only,yes,no" />
+ <combo key="organic" text="Organic" values="only,yes,no" />
</item>
<item name="Boutique" icon="presets/boutique.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=boutique"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=boutique"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=boutique"/>
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=boutique"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=boutique" />
<label text="Edit Boutique" />
- <space />
+ <space />
<key key="shop" value="boutique" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
- <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=shoes"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=shoes" />
<label text="Edit Shoe Shop" />
+ <space />
<key key="shop" value="shoes" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="second_hand" text="Second hand" values="only,yes,no" />
+ <combo key="organic" text="Organic" values="only,yes,no" />
</item>
<item name="Outdoor" icon="presets/tent.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=outdoor"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=outdoor" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=outdoor"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=outdoor" />
<label text="Edit Outdoor Shop" />
+ <space />
<key key="shop" value="outdoor" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Sports" icon="presets/rowing.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=sports"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=sports" />
<label text="Edit Sports Shop" />
+ <space />
<key key="shop" value="sports" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dry_cleaning"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=dry_cleaning"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=dry_cleaning" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=dry_cleaning"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=dry_cleaning" />
<label text="Edit Dry Cleaning" />
+ <space />
<key key="shop" value="dry_cleaning" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Laundry" icon="presets/laundry.png" type="node,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=laundry"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=laundry"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=laundry" />
<label text="Edit Laundry" />
+ <space />
<key key="shop" value="laundry" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
<label text="Edit Tailor" />
+ <space />
<key key="shop" value="tailor" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Fabric" icon="presets/fabric.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=fabric"/>
- <label text="Edit Fabric" />
- <space />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=fabric"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=fabric" />
+ <label text="Edit Fabric Shop" />
+ <space />
<key key="shop" value="fabric" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
</group> <!-- Clothes -->
<group name="Electronic" icon="styles/standard/shop/electronics.png">
<item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=computer"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=computer"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=computer"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=computer" />
<label text="Edit Computer Shop" />
+ <space />
<key key="shop" value="computer" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=electronics"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=electronics"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=electronics" />
<label text="Edit Electronics Shop" />
+ <space />
<key key="shop" value="electronics" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mobile_phone"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mobile_phone"/>
- <label text="Edit Mobile Phone" />
- <space />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mobile_phone" />
+ <label text="Edit Mobile Phone Shop" />
+ <space />
<key key="shop" value="mobile_phone" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"/>
- <label text="Edit Vacuum Cleaner" />
- <space />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=vacuum_cleaner" />
+ <label text="Edit Vacuum Cleaner Shop" />
+ <space />
<key key="shop" value="vacuum_cleaner" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=hifi"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hifi"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hifi" />
<label text="Edit Hifi Shop" />
+ <space />
<key key="shop" value="hifi" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
- <item name="Video" name_context="shop" icon="styles/standard/shop/video.png" type="node,closedway">
+ <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=video"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=video"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=video" />
<label text="Edit Video Shop" />
+ <space />
<key key="shop" value="video" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
</group> <!-- Electronic -->
<group name="Cash" icon="presets/dollar.png">
@@ -4937,16 +6126,20 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bank"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=bank"
+ hr.href="http://wiki.openstreetmap.org/wiki/Hr:Tag:amenity=bank"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bank"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=bank"
no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=bank"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=bank"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bank"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bank" />
<label text="Edit Bank" />
+ <space />
<key key="amenity" value="bank" />
<text key="name" text="Name" />
+ <text key="brand" text="Brand" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
<check key="atm" text="Automated Teller Machine" default="on" />
</item>
<item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
@@ -4957,9 +6150,10 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bureau_de_change"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bureau_de_change" />
<label text="Edit Money Exchange" />
+ <space />
<key key="amenity" value="bureau_de_change" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
@@ -4969,12 +6163,26 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=atm"
hr.href="http://wiki.openstreetmap.org/wiki/Hr:Tag:amenity=atm"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=atm"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=atm"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=atm"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=atm"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=atm" />
<label text="Edit Automated Teller Machine" />
+ <space />
<key key="amenity" value="atm" />
+ <text key="brand" text="Brand" />
<text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=pawnbroker"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=pawnbroker" />
+ <label text="Edit Pawnbroker" />
+ <space />
+ <key key="shop" value="pawnbroker" />
+ <text key="name" text="Name" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
</group> <!-- Cash -->
<group name="Other" icon="styles/standard/shop/mall.png">
@@ -4983,65 +6191,102 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=department_store"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=department_store"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=department_store"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=department_store"/>
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=department_store" />
<label text="Edit Department Store" />
- <space />
+ <space />
<key key="shop" value="department_store" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=mall"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mall"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mall"/>
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mall" />
<label text="Edit Mall" />
- <space />
+ <space />
<key key="shop" value="mall" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<separator/>
<item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=chemist"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=chemist"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=chemist" />
<label text="Edit Chemist" />
+ <space />
<key key="shop" value="chemist" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=hairdresser"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=hairdresser"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hairdresser"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hairdresser" />
<label text="Edit Hairdresser" />
+ <space />
<key key="shop" value="hairdresser" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=optician"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=optician" />
<label text="Edit Optician" />
+ <space />
<key key="shop" value="optician" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"/>
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=jewelry" />
<label text="Edit Jewelry" />
- <space />
+ <space />
<key key="shop" value="jewelry" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
+ <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=gift"
+ ko.href="http://wiki.openstreetmap.org/wiki/Ko:Tag:shop=gift"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=gift"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=gift" />
+ <label text="Edit Gift Shop" />
+ <space />
+ <key key="shop" value="gift" />
+ <text key="name" text="Name" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <optional>
+ <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+ <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
+ </optional>
+ </item>
<item name="Erotic" icon="presets/erotic.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"/>
- <label text="Edit Erotic" />
- <space />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=erotic" />
+ <label text="Edit Erotic Shop" />
+ <space />
<key key="shop" value="erotic" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<separator/>
<item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist"
@@ -5051,142 +6296,203 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=florist"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=florist" />
<label text="Edit Florist" />
+ <space />
<key key="shop" value="florist" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=garden_centre"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=garden_centre"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=garden_centre"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=garden_centre" />
+ ko.href="http://wiki.openstreetmap.org/wiki/Ko:Tag:shop=garden_centre"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=garden_centre"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=garden_centre" />
<label text="Edit Garden Centre" />
+ <space />
<key key="shop" value="garden_centre" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="brand" text="Brand" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=doityourself"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=doityourself"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=doityourself" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=doityourself"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=doityourself" />
<label text="Edit Do-it-yourself-store" />
+ <space />
<key key="shop" value="doityourself" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="brand" text="Brand" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Hardware" icon="presets/hardware.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hardware" />
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=hardware"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hardware"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hardware" />
<label text="Edit Hardware Store" />
+ <space />
<key key="shop" value="hardware" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Paint" icon="presets/paint.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=paint"/>
- <label text="Edit Paint" />
- <space />
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=paint"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=paint"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=paint" />
+ <label text="Edit Paint Shop" />
+ <space />
<key key="shop" value="paint" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<separator/>
<item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
<label text="Edit Furniture Shop" />
+ <space />
<key key="shop" value="furniture" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="brand" text="Brand" />
+ <text key="operator" text="Operator" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kitchen"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=kitchen"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kitchen"/>
- <label text="Edit Kitchen" />
- <space />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kitchen"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=kitchen" />
+ <label text="Edit Kitchen Store" />
+ <space />
<key key="shop" value="kitchen" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
+ <text key="brand" text="Brand" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<item name="Curtain" icon="presets/curtain.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=curtain"/>
- <label text="Edit Curtain" />
- <space />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=curtain"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=curtain" />
+ <label text="Edit Curtain Shop" />
+ <space />
<key key="shop" value="curtain" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<item name="Frame" icon="presets/frame.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=frame"/>
- <label text="Edit Frames" />
- <space />
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=frame"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=frame"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=frame" />
+ <label text="Edit Frames Shop" />
+ <space />
<key key="shop" value="frame" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<separator/>
<item name="Stationery" icon="presets/stationery.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=stationery"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=stationery"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=stationery" />
<label text="Edit Stationery Shop" />
+ <space />
<key key="shop" value="stationery" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=copyshop"/>
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=copyshop"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=copyshop"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=copyshop" />
<label text="Edit Copyshop" />
- <space />
+ <space />
<key key="shop" value="copyshop" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Book Store" icon="presets/book.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=book"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=book"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=book"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=book"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=book" />
<label text="Edit Book Store" />
+ <space />
<key key="shop" value="books" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="brand" text="Brand" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ <combo key="second_hand" text="Second hand" values="only,yes,no" />
+ </item>
+ <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=newsagent"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=newsagent"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=newsagent"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=newsagent" />
+ <label text="Edit Newsagent's shop" />
+ <space />
+ <key key="shop" value="newsagent" />
+ <text key="name" text="Name" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<separator/>
<item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=travel_agency"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=travel_agency" />
<label text="Edit Travel Agency" />
+ <space />
<key key="shop" value="travel_agency" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <text key="brand" text="Brand" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=musical_instrument"/>
- <label text="Edit Musical Instruments" />
- <space />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=musical_instrument"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=musical_instrument" />
+ <label text="Edit Musical Instruments Shop" />
+ <space />
<key key="shop" value="musical_instrument" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
- </item>
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+ </item>
<item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toy"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=toy"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=toy" />
<label text="Edit Toy Shop" />
+ <space />
<key key="shop" value="toys" />
<text key="name" text="Name" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
<item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=variety_store"/>
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=variety_store"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=variety_store" />
<label text="Edit Variety Store" />
- <space />
+ <space />
<key key="shop" value="variety_store" />
- <text key="name" text="Name" />
+ <text key="name" text="Name" />
<text key="operator" text="Operator" />
- <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+ <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
</item>
</group> <!-- Other -->
<item name="Vending machine" icon="presets/vending_machine.png" type="node">
@@ -5195,8 +6501,9 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
<label text="Edit Vending machine" />
+ <space />
<key key="amenity" value="vending_machine" />
- <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" />
+ <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
<text key="operator" text="Operator" />
<text key="ref" text="Reference number" />
<text key="note" text="Note" />
@@ -5208,7 +6515,7 @@ Note that for a match, at least one positive and no negative is required.
<check key="payment:account_cards" text="Account or loyalty cards" default="off" />
</item>
</group> <!-- Shops -->
- <group name="Geography" icon="presets/peak.png">
+ <group name="Geography" icon="presets/peak.svg">
<group name="Boundaries" icon="presets/boundaries.png">
<item name="National" icon="presets/boundaries.png" type="closedway,relation">
<label text="Edit National Boundary" />
@@ -5311,6 +6618,7 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
<label text="Edit Suburb" />
@@ -5357,6 +6665,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
<label text="Edit Neighbourhood" />
<space />
@@ -5371,6 +6680,7 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=locality"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=locality"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=locality"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=locality"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=locality" />
<label text="Edit Locality" />
@@ -5380,22 +6690,38 @@ Note that for a match, at least one positive and no negative is required.
<text key="wikipedia" text="Wikipedia" />
</item>
</group> <!-- Places -->
- <group name="Geography" icon="presets/peak.png">
- <item name="Peak" icon="presets/peak.png" type="node">
+ <group name="Geography" icon="presets/peak.svg">
+ <item name="Peak" icon="presets/peak.svg" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=peak"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=peak"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:natural=peak" />
<label text="Edit Peak" />
+ <space />
<key key="natural" value="peak" />
<text key="name" text="Name" />
<text key="ele" text="Elevation" />
<text key="wikipedia" text="Wikipedia" />
</item>
+ <item name="Saddle" icon="presets/saddle.svg" type="node">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
+ <label text="Edit Saddle" />
+ <space/>
+ <key key="natural" value="saddle" />
+ <text key="name" text="Name" />
+ <text key="ele" text="Elevation" />
+ <text key="wikipedia" text="Wikipedia" />
+ </item>
<item name="Glacier" icon="presets/glacier.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=glacier"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
<label text="Edit Glacier" />
+ <space />
<key key="natural" value="glacier" />
<text key="name" text="Name" />
<text key="ele" text="Elevation" />
@@ -5404,8 +6730,10 @@ Note that for a match, at least one positive and no negative is required.
<item name="Volcano" icon="presets/volcano.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
- pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano" />
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=volcano" />
<label text="Edit Volcano" />
+ <space />
<key key="natural" value="volcano" />
<text key="name" text="Name" />
<text key="ele" text="Elevation" />
@@ -5413,8 +6741,10 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=cave_entrance"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance" />
<label text="Edit Cave Entrance" />
+ <space />
<key key="natural" value="cave_entrance" />
<text key="name" text="Name" />
<text key="wikipedia" text="Wikipedia" />
@@ -5448,17 +6778,34 @@ Note that for a match, at least one positive and no negative is required.
<item name="Tree" icon="presets/tree.png" type="node">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=tree"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=tree"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=tree"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=tree"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
<label text="Edit Tree" />
+ <space />
<key key="natural" value="tree" />
<text key="name" text="Name" />
- <text key="type" text="Type" />
- <text key="height" text="Height" />
+ <combo key="type" text="Type" values="broad_leaved,conifer,palm" />
+ <text key="height" text="Height in meter (m)" />
<text key="name:botanical" text="Botanical Name" />
+ <optional>
+ <text key="genus" text="Genus" />
+ <text key="species" text="Species" />
+ <text key="taxon" text="Taxon" />
+ </optional>
+ </item>
+ <item name="Tree Row" icon="presets/tree.png" type="way">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree_row"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=tree_row"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=tree_row"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree_row"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" />
+ <key key="natural" value="tree_row" />
</item>
<item name="Wood" icon="presets/landuse.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
@@ -5467,9 +6814,10 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wood"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
<label text="Edit Wood" />
+ <space />
<key key="natural" value="wood" />
<text key="name" text="Name" />
- <combo key="wood" text="Type" values="coniferous,deciduous,mixed" values_context="wood" />
+ <combo key="wood" text="Type" values="coniferous,deciduous,mixed" />
</item>
<item name="Forest" icon="presets/landuse.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
@@ -5490,7 +6838,8 @@ Note that for a match, at least one positive and no negative is required.
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=grassland"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=grassland"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=grassland"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=grassland" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=grassland"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=grassland" />
<label text="Edit Grassland" />
<space />
<key key="natural" value="grassland" />
@@ -5499,12 +6848,14 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation">
<label text="Edit Nature Reserve" />
+ <space />
<key key="leisure" value="nature_reserve" />
<text key="name" text="Name" />
</item>
<separator/>
<item name="Scree" icon="presets/empty.png" type="node,closedway,relation">
<label text="Edit Scree" />
+ <space />
<key key="natural" value="scree" />
<text key="name" text="Name" />
</item>
@@ -5514,11 +6865,13 @@ Note that for a match, at least one positive and no negative is required.
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
<label text="Edit Fell" />
+ <space />
<key key="natural" value="fell" />
<text key="name" text="Name" />
</item>
<item name="Scrub" icon="presets/empty.png" type="node,closedway,relation">
<label text="Edit Scrub" />
+ <space />
<key key="natural" value="scrub" />
<text key="name" text="Name" />
</item>
@@ -5526,9 +6879,11 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=heath"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=heath"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=heath"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=heath"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
<label text="Edit Heath" />
+ <space />
<key key="natural" value="heath" />
<text key="name" text="Name" />
</item>
@@ -5539,6 +6894,7 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=farmyard"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=farmyard"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=farmyard"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=farmyard" />
<label text="Edit Farmyard Landuse" />
<space />
@@ -5557,6 +6913,18 @@ Note that for a match, at least one positive and no negative is required.
<key key="landuse" value="meadow" />
<text key="name" text="Name" />
</item>
+ <item name="Orchard" icon="presets/landuse.png" type="closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=orchard"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=orchard"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=orchard"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=orchard"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=orchard" />
+ <label text="Edit Orchard Landuse" />
+ <space />
+ <key key="landuse" value="orchard" />
+ <text key="name" text="Name" />
+ </item>
<item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation">
<label text="Edit Vineyard Landuse" />
<space />
@@ -5583,6 +6951,7 @@ Note that for a match, at least one positive and no negative is required.
<separator/>
<item name="Garden" icon="presets/empty.png" type="node,closedway,relation">
<label text="Edit Garden" />
+ <space />
<key key="leisure" value="garden" />
<text key="name" text="Name" />
</item>
@@ -5595,6 +6964,7 @@ Note that for a match, at least one positive and no negative is required.
<item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation">
<link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=village_green"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=village_green"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=village_green" />
<label text="Edit Village Green Landuse" />
@@ -5606,11 +6976,13 @@ Note that for a match, at least one positive and no negative is required.
<link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=common" />
<label text="Edit Common" />
+ <space />
<key key="leisure" value="common" />
<text key="name" text="Name" />
</item>
<item name="Park" icon="presets/empty.png" type="node,closedway,relation">
<label text="Edit Park" />
+ <space />
<key key="leisure" value="park" />
<text key="name" text="Name" />
</item>
@@ -5626,7 +6998,7 @@ Note that for a match, at least one positive and no negative is required.
<text key="name" text="Name" />
</item>
<separator/>
- <item name="Residential area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation">
+ <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation">
<label text="Edit Residential Landuse" />
<space />
<key key="landuse" value="residential" />
@@ -5638,12 +7010,14 @@ Note that for a match, at least one positive and no negative is required.
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=grave_yard"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=grave_yard"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:amenity=grave_yard"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=grave_yard"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=grave_yard"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=grave_yard" />
<label text="Edit Graveyard" />
+ <space />
<key key="amenity" value="grave_yard" />
<text key="name" text="Name" />
- <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+ <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
</item>
<item name="Cemetery" icon="presets/cemetery.png" type="node,closedway,relation">
@@ -5654,27 +7028,45 @@ Note that for a match, at least one positive and no negative is required.
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:landuse=cemetery"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=cemetery"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=cemetery"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=cemetery" />
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=cemetery"
+ zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:landuse=cemetery" />
<label text="Edit Cemetery Landuse" />
<space />
<key key="landuse" value="cemetery" />
<text key="name" text="Name" />
- <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+ <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
</item>
<item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=retail"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=retail"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=retail"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=retail" />
<label text="Edit Retail Landuse" />
<space />
<key key="landuse" value="retail" />
<text key="name" text="Name" />
</item>
<item name="Commercial" icon="presets/empty.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=commercial"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=commercial"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=commercial"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=commercial" />
<label text="Edit Commercial Landuse" />
<space />
<key key="landuse" value="commercial" />
<text key="name" text="Name" />
</item>
<item name="Industrial" icon="presets/works.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=industrial"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=industrial"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=industrial"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:landuse=industrial"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=industrial"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=industrial" />
<label text="Edit Industrial Landuse" />
<space />
<key key="landuse" value="industrial" />
@@ -5704,6 +7096,10 @@ Note that for a match, at least one positive and no negative is required.
<text key="name" text="Name" />
</item>
<item name="Military" icon="presets/military.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=military"
+ pt-br.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=military"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=military" />
<label text="Edit Military Landuse" />
<space />
<key key="landuse" value="military" />
@@ -5711,41 +7107,107 @@ Note that for a match, at least one positive and no negative is required.
</item>
<separator/>
<item name="Construction area" icon="presets/construction.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=construction"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:landuse=construction"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=construction"
+ pt-BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=construction"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=construction" />
<label text="Edit Construction Landuse" />
<space />
<key key="landuse" value="construction" />
<text key="name" text="Name" />
</item>
<item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=brownfield"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=brownfield"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=brownfield"
+ pt-BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield" />
<label text="Edit Brownfield Landuse" />
<space />
<key key="landuse" value="brownfield" />
<text key="name" text="Name" />
</item>
<item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=greenfield"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenfield"
+ pt-BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenfield" />
<label text="Edit Greenfield Landuse" />
<space />
<key key="landuse" value="greenfield" />
<text key="name" text="Name" />
</item>
<item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=landfill"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=landfill"
+ pt-BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=landfill"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=landfill" />
<label text="Edit Landfill Landuse" />
<space />
<key key="landuse" value="landfill" />
<text key="name" text="Name" />
</item>
<item name="Quarry" icon="presets/mine.png" type="node,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=quarry"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=quarry"
+ pt-BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=quarry"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=quarry" />
<label text="Edit Quarry Landuse" />
<space />
<key key="landuse" value="quarry" />
<text key="name" text="Name" />
+ <text key="operator" text="Operator" />
</item>
</group> <!-- Landuse -->
</group>
<group name="Annotation" icon="presets/addresses.png">
- <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
- de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+ <item name="Name" icon="presets/message.png" type="node,way,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:name"
+ ar.href="http://wiki.openstreetmap.org/wiki/Ar:Key:name"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:name"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Key:name"
+ fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:name"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:name"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Key:name"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:name"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:name"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:name"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:name"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:name"
+ sv.href="http://wiki.openstreetmap.org/wiki/Sv:Key:name"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:name"
+ zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:name" />
+ <label text="Edit Name Information" />
+ <space />
+ <text key="name" text="Name" />
+ <optional>
+ <text key="alt_name" text="Alternative name" match="key" />
+ <text key="old_name" text="Historical name" match="key" />
+ <text key="loc_name" text="Local name" match="key" />
+ <text key="reg_name" text="Regional name" match="key" />
+ <text key="nat_name" text="National name" match="key" />
+ <text key="int_name" text="International name" match="key" />
+ <text key="official_name" text="Official name" match="key" />
+ <text key="short_name" text="Common name abbreviation" match="key" />
+ </optional>
+ </item>
+ <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Key:addr"
+ et.href="http://wiki.openstreetmap.org/wiki/Et:Key:addr"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:addr"
+ hr.href="http://wiki.openstreetmap.org/wiki/Hr:Key:addr"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Key:addr"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:addr"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:addr"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
<label text="Edit Address Information" />
<space />
<text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
@@ -5754,15 +7216,28 @@ Note that for a match, at least one positive and no negative is required.
<text key="addr:street" text="Street name" use_last_as_default="force" match="key" />
<text key="addr:city" text="City name" use_last_as_default="force" match="key" />
<text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
- <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,RS,US" use_last_as_default="force" match="key" />
+ <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
</optional>
</item>
<item name="Address Interpolation" icon="presets/interpolation.png" type="way">
- <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
- de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+ <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Key:addr"
+ et.href="http://wiki.openstreetmap.org/wiki/Et:Key:addr"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:addr"
+ hr.href="http://wiki.openstreetmap.org/wiki/Hr:Key:addr"
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Key:addr"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:addr"
+ nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:addr"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
+ pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
<label text="Edit Address Interpolation" />
<space />
<combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" />
+ <optional>
+ <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
+ </optional>
</item>
<item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation">
<label text="Edit Contact information" />
@@ -5777,6 +7252,12 @@ Note that for a match, at least one positive and no negative is required.
<text key="image" text="Image" />
</item>
<item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:contact"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:contact"
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:contact"
+ pt-BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:contact"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:contact" />
<label text="Edit Contact information (new schema)" />
<space />
<text key="contact:phone" text="Phone Number" match="key" />
@@ -5817,10 +7298,11 @@ Note that for a match, at least one positive and no negative is required.
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:boundary"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
<label text="Edit Boundary" />
+ <space />
<key key="type" value="boundary" />
<text key="name" text="Name" />
<optional>
- <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" />
+ <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" values_searchable="true" />
<combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
</optional>
<roles>
@@ -5832,8 +7314,10 @@ Note that for a match, at least one positive and no negative is required.
</roles>
</item>
<item name="Site" type="relation">
- <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Site"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Relations=Site"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations=Site" />
<label text="Edit Site" />
+ <space />
<key key="type" value="site" />
<text key="name" text="Site name" />
<roles>
@@ -5853,10 +7337,11 @@ Note that for a match, at least one positive and no negative is required.
ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:restriction"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:restriction"
pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Relation:restriction"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction"/>
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction" />
<label text="Edit Turn Restriction" />
+ <space />
<key key="type" value="restriction" />
- <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" />
+ <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" values_searchable="true" />
<optional>
<text key="name" text="Name" />
</optional>
@@ -5871,8 +7356,10 @@ Note that for a match, at least one positive and no negative is required.
de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:enforcement"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:enforcement"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement"/>
+ it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:enforcement"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement" />
<label text="Edit Enforcement" />
+ <space />
<key key="type" value="enforcement" />
<combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check " />
<text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
@@ -5886,17 +7373,19 @@ Note that for a match, at least one positive and no negative is required.
</roles>
</item>
<separator/>
- <item name="Route (legacy)" icon="presets/path.png" type="relation">
+ <item name="General route" icon="presets/path.png" type="relation">
<link href="http://wiki.openstreetmap.org/wiki/Relation:route"
de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"
es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:route"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:route"
it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:route"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:route"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route"/>
- <label text="Edit Route (legacy)" />
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:route"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:route" />
+ <label text="Edit general route" />
+ <space />
<key key="type" value="route" />
- <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" />
+ <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" values_context="route type" values_searchable="true" />
<text key="name" text="Name" />
<text key="ref" text="Reference" />
<text key="symbol" text="Symbol description" />
@@ -5920,9 +7409,10 @@ Note that for a match, at least one positive and no negative is required.
<role key="backward_stop" text="backward halt point" requisite="optional" type="node" />
</roles>
</item>
- <item name="Route network" icon="presets/path.png" type="relation">
- <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
- <label text="Edit route network" />
+ <item name="Route Network" icon="presets/path.png" type="relation">
+ <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
+ <label text="Edit Route Network" />
+ <space />
<key key="type" value="network" />
<text key="name" text="Name" />
<optional>
@@ -5934,12 +7424,14 @@ Note that for a match, at least one positive and no negative is required.
</roles>
</item>
<separator/>
- <item name="Associated street" icon="presets/addresses.png" type="relation">
+ <item name="Associated Street" icon="presets/addresses.png" type="relation">
<link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
- pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"/>
- <label text="Edit associated street" />
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:associatedStreet" />
+ <label text="Edit Associated Street" />
+ <space />
<key key="type" value="associatedStreet" />
<text key="name" text="Street name" />
<roles>
@@ -5949,8 +7441,9 @@ Note that for a match, at least one positive and no negative is required.
</item>
<item name="Street" type="relation">
<link href="http://wiki.openstreetmap.org/wiki/Relation:street"
- fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street"/>
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street" />
<label text="Edit Street" />
+ <space />
<key key="type" value="street" />
<text key="name" text="Name" />
<roles>
@@ -5966,8 +7459,10 @@ Note that for a match, at least one positive and no negative is required.
es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:destination_sign"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:destination_sign"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:destination_sign"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign"/>
- <label text="Edit Destination sign" />
+ pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:destination_sign"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign" />
+ <label text="Edit Destination Sign" />
+ <space />
<key key="type" value="destination_sign" />
<text key="destination" text="Destination written on sign (w/o distance)" />
<text key="distance" text="Distance (km)" />
@@ -5984,10 +7479,11 @@ Note that for a match, at least one positive and no negative is required.
</item>
<separator/>
<item name="Waterway" icon="presets/river.png" type="relation">
- <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway" />
<label text="Edit Waterway" />
+ <space />
<key key="type" value="waterway" />
- <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" />
+ <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" values_searchable="true" />
<text key="name" text="Name" />
<optional>
<text key="destination" text="Name of river/sea/ocean" />
@@ -6002,16 +7498,18 @@ Note that for a match, at least one positive and no negative is required.
<roles>
<role key="" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
<role key="main_stream" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
- <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank"/>
+ <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
<role key="spring" text="spring of waterway" requisite="optional" type="node" />
</roles>
</item>
<item name="Bridge" icon="presets/bridge.png" type="relation">
<link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
- ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels"/>
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Relations/Proposed/Bridges_and_Tunnels"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels" />
<label text="Edit Bridge" />
+ <space />
<key key="type" value="bridge" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="name" text="Name" />
<text key="ref" text="Reference" />
<text key="height" text="Height (meters)" />
@@ -6020,23 +7518,24 @@ Note that for a match, at least one positive and no negative is required.
<roles>
<role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
<role key="under" text="ways passing under the bridge" requisite="optional" type="way" />
- <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway" />
- <role key="edge" text="nodes forming the outline" requisite="optional" type="node" />
+ <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
+ <role key="edge" text="edge ways parallel to 'across'" requisite="optional" type="way" />
</roles>
</item>
<item name="Tunnel" icon="presets/tunnel.png" type="relation">
- <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"/>
+ <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
<label text="Edit Tunnel" />
+ <space />
<key key="type" value="tunnel" />
- <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
+ <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
<text key="name" text="Name" />
<text key="ref" text="Reference" />
<text key="length" text="Length (meters)" />
<text key="operator" text="Operator" />
<roles>
<role key="through" text="ways passing through the tunnel" requisite="required" type="way" />
- <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway" />
- <role key="edge" text="nodes forming the outline" requisite="optional" type="node" />
+ <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
+ <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
</roles>
</item>
</group> <!-- Relations -->
diff --git a/data/gpx-extensions.xsd b/data/gpx-extensions.xsd
new file mode 100644
index 0000000..bc5452e
--- /dev/null
+++ b/data/gpx-extensions.xsd
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://josm.openstreetmap.de/gpx-extensions-1.0"
+ xmlns:tns="http://josm.openstreetmap.de/gpx-extensions-1.0" elementFormDefault="qualified">
+
+ <!-- true, if gpx data has been downloaded from the osm server -->
+ <!-- it this case, JOSM improves the rendering of clouds of anonymous TrackPoints -->
+ <element name="from-server" type="boolean"/>
+
+ <!-- the following properties are only set for marker layer export -->
+ <element name="offset" type="decimal"/>
+ <element name="sync-offset" type="decimal"/>
+ <element name="text" type="string"/>
+
+</schema>
diff --git a/data/BETA2007.gsb b/data/projection/BETA2007.gsb
similarity index 100%
rename from data/BETA2007.gsb
rename to data/projection/BETA2007.gsb
diff --git a/data/epsg b/data/projection/epsg
similarity index 99%
rename from data/epsg
rename to data/projection/epsg
index d993f79..ed494e6 100644
--- a/data/epsg
+++ b/data/projection/epsg
@@ -52,6 +52,8 @@
<4326> +proj=lonlat +ellps=WGS84 +datum=WGS84 +bounds=-180,-90,180,90 <>
# Swiss Grid (Switzerland)
<21781> +proj=somerc +lat_0=46d57'8.66" +lon_0=7d26'22.5" +x_0=600000 +y_0=200000 +ellps=bessel +towgs84=674.374,15.056,405.346 +bounds=5.7,45.7,10.6,47.9 <>
+# HD72 / EOV (Hungary)
+<23700> +proj=somerc +lat_0=47.14439372222222 +lon_0=19.04857177777778 +x_0=650000 +y_0=200000 +ellps=GRS67 +towgs84=57.01,-69.97,-9.29 +bounds=16.1200,45.7800,22.9100,48.6000 <>
# Lambert 4 Zones France (Nord)
<27561> +proj=lcc +lat_0=49.5 +lat_1=48d35'54.682" +lat_2=50d23'45.282" +lon_0=2d20'14.025" +x_0=600000 +y_0=200000 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93_b.gsb +bounds=-4.416666666666665,46.65,9.18,51.300000000000004 <>
# Lambert 4 Zones France (Centre)
diff --git a/data/ntf_r93_b.gsb b/data/projection/ntf_r93_b.gsb
similarity index 100%
rename from data/ntf_r93_b.gsb
rename to data/projection/ntf_r93_b.gsb
diff --git a/data/tagging-preset.xsd b/data/tagging-preset.xsd
index 8f737f7..af5cdf3 100644
--- a/data/tagging-preset.xsd
+++ b/data/tagging-preset.xsd
@@ -8,7 +8,16 @@
errors, elements have specified prohibited attributes -->
<element name="annotations" type="tns:root" />
- <element name="presets" type="tns:root" />
+ <element name="presets" type="tns:root">
+ <unique name="chunk_id">
+ <selector xpath=".//tns:chunk"/>
+ <field xpath="@id"/>
+ </unique>
+ <keyref name="chunk_ref" refer="tns:chunk_id">
+ <selector xpath=".//tns:reference"/>
+ <field xpath="@ref"/>
+ </keyref>
+ </element>
<complexType name="root">
<complexContent>
@@ -27,6 +36,7 @@
<complexType name="group-parent">
<sequence>
<choice minOccurs="1" maxOccurs="unbounded">
+ <element name="chunk" type="tns:chunk"/>
<element name="group" type="tns:group" />
<element name="item" type="tns:item" />
<element name="separator" type="tns:separator" />
@@ -70,8 +80,25 @@
<complexType name="optional">
<group ref="tns:optional_elements" maxOccurs="unbounded" />
+ <attribute name="text" type="string" />
+ <attribute name="text_context" type="string" />
</complexType>
+ <complexType name="chunk">
+ <sequence>
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <group ref="tns:optional_elements" />
+ <element name="key" type="tns:key" />
+ <element name="optional" type="tns:optional" minOccurs="0" />
+ </choice>
+ </sequence>
+ <attribute name="id" type="ID" use="required" />
+ </complexType>
+
+ <complexType name="reference">
+ <attribute name="ref" type="IDREF" use="required" />
+ </complexType>
+
<group name="optional_elements">
<choice>
<element name="label" type="tns:label" />
@@ -80,7 +107,10 @@
<element name="text" type="tns:text" />
<element name="combo" type="tns:combo" />
<element name="multiselect" type="tns:multiselect" />
+ <element name="checkgroup" type="tns:checkgroup" />
<element name="check" type="tns:check" />
+ <element name="item_separator" type="tns:separator" />
+ <element name="reference" type="tns:reference" />
</choice>
</group>
@@ -118,7 +148,7 @@
<attribute name="use_last_as_default" type="tns:last_default" />
<attribute name="auto_increment" type="string" />
<attribute name="match" type="tns:match" />
- <attribute name="length" type="positiveInteger" />
+ <attribute name="length" type="positiveInteger" />
<attribute name="type" use="prohibited" />
<attribute name="name" use="prohibited" />
@@ -146,12 +176,16 @@
<attribute name="text" type="string" />
<attribute name="text_context" type="string" />
<attribute name="values" type="string" />
+ <attribute name="values_from" type="string" />
<attribute name="values_context" type="string" />
<attribute name="display_values" type="string" />
+ <attribute name="values_searchable" type="boolean" />
<attribute name="default" type="string" />
<attribute name="use_last_as_default" type="tns:last_default" />
+ <attribute name="delimiter" type="string" />
<attribute name="editable" type="boolean" />
<attribute name="match" type="tns:match" />
+ <attribute name="length" type="positiveInteger" />
<attribute name="type" use="prohibited" />
<attribute name="value" use="prohibited" />
@@ -162,12 +196,18 @@
</complexType>
<complexType name="multiselect">
+ <!-- use either list_entry's or a combination of values/display_values -->
+ <sequence>
+ <element name="list_entry" type="tns:list_entry" minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
<attribute name="key" type="string" use="required" />
<attribute name="text" type="string" />
<attribute name="text_context" type="string" />
- <attribute name="values" type="string" use="required" />
+ <attribute name="values" type="string" />
+ <attribute name="values_from" type="string" />
<attribute name="values_context" type="string" />
<attribute name="display_values" type="string" />
+ <attribute name="values_searchable" type="boolean" />
<attribute name="default" type="string" />
<attribute name="use_last_as_default" type="tns:last_default" />
<attribute name="delimiter" type="string" />
@@ -181,6 +221,16 @@
<anyAttribute processContents="skip" />
</complexType>
+ <complexType name="checkgroup">
+ <sequence>
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element name="check" type="tns:check" />
+ </choice>
+ </sequence>
+ <attribute name="columns" type="positiveInteger" />
+ <anyAttribute processContents="skip" />
+ </complexType>
+
<complexType name="check">
<attribute name="key" type="string" use="required" />
<attribute name="text" type="string" />
@@ -234,6 +284,7 @@
<attribute name="type" type="string" />
<attribute name="count" type="integer" />
<attribute name="member_expression" type="string" />
+ <anyAttribute processContents="skip" />
</complexType>
<simpleType name="role_requisite">
diff --git a/data/ignoretags.cfg b/data/validator/ignoretags.cfg
similarity index 98%
rename from data/ignoretags.cfg
rename to data/validator/ignoretags.cfg
index 5f68e5a..3e96a8c 100644
--- a/data/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -19,6 +19,7 @@ S:au.gov.abs:
S:qroti:
S:is_in
S:wikipedia
+S:source:
S:source_ref:
;
; Ignore valid and semi-valid keys that equal...
@@ -49,6 +50,13 @@ E:abutters
E:survey_date
E:right:state
E:left:state
+E:height
+E:opening_hours
+E:service_times
+E:collection_times
+E:maxspeed
+E:colour
+E:level
;
; Ignore valid and semi-valid keys that end with...
;
@@ -57,6 +65,7 @@ F::forward
F::backward
F::left
F::right
+F::conditional
;
; Misc Tags
;
diff --git a/data/validator/opening_hours.js b/data/validator/opening_hours.js
new file mode 100644
index 0000000..c340b3c
--- /dev/null
+++ b/data/validator/opening_hours.js
@@ -0,0 +1,3833 @@
+(function (root, factory) {
+ //======================================================================
+ // Constants
+ //======================================================================
+ var holidays = {
+ 'fr': {
+ 'PH': { // http://fr.wikipedia.org/wiki/F%C3%AAtes_et_jours_f%C3%A9ri%C3%A9s_en_France
+ "Jour de l'an" : [ 1, 1 ],
+ "Vendredi saint" : [ 'easter', -2, [ 'Moselle', 'Bas-Rhin', 'Haut-Rhin', 'Guadeloupe', 'Martinique', 'Polynésie française' ] ],
+ "Lundi de Pâques" : [ 'easter', 1 ],
+ "Saint-Pierre-Chanel" : [ 4, 28, [ 'Wallis-et-Futuna' ] ],
+ "Fête du Travail" : [ 5, 1 ],
+ "Fête de la Victoire" : [ 5, 8 ],
+ "Abolition de l'esclavage" : [ 5, 22, [ 'Martinique' ] ],
+ "Abolition de l'esclavage" : [ 5, 27, [ 'Guadeloupe' ] ],
+ "Jeudi de l'Ascension" : [ 'easter', 39 ],
+ "Lundi de Pentecôte" : [ 'easter', 50 ],
+ "Abolition de l'esclavage" : [ 6, 10, [ 'Guyane' ] ],
+ "Fête de l'autonomie" : [ 6, 29, [ 'Polynésie française' ] ],
+ "Fête nationale" : [ 7, 14 ],
+ "Fête Victor Schoelcher" : [ 7, 21, [ 'Guadeloupe', 'Martinique' ] ],
+ "Fête du Territoire" : [ 7, 29, [ 'Wallis-et-Futuna' ] ],
+ "Assomption" : [ 8, 15 ],
+ "Fête de la citoyenneté" : [ 9, 24, [ 'Nouvelle-Calédonie' ] ],
+ "Toussaint" : [ 11, 1 ],
+ "Armistice" : [ 11, 11 ],
+ "Abolition de l'esclavage" : [ 12, 20, [ 'Réunion' ] ],
+ "Noël" : [ 12, 25 ],
+ "Saint-Étienne " : [ 12, 26, [ 'Moselle', 'Bas-Rhin', 'Haut-Rhin' ] ]
+ }
+ },
+ 'de': {
+ 'PH': { // http://de.wikipedia.org/wiki/Feiertage_in_Deutschland
+ 'Neujahrstag' : [ 1, 1 ], // month 1, day 1, whole Germany
+ 'Heilige Drei Könige' : [ 1, 6, [ 'Baden-Württemberg', 'Bayern', 'Sachsen-Anhalt'] ], // only in the specified states
+ 'Tag der Arbeit' : [ 5, 1 ], // whole Germany
+ 'Karfreitag' : [ 'easter', -2 ], // two days before easter
+ 'Ostersonntag' : [ 'easter', 0, [ 'Brandenburg'] ],
+ 'Ostermontag' : [ 'easter', 1 ],
+ 'Christi Himmelfahrt' : [ 'easter', 39 ],
+ 'Pfingstsonntag' : [ 'easter', 49, [ 'Brandenburg'] ],
+ 'Pfingstmontag' : [ 'easter', 50 ],
+ 'Fronleichnam' : [ 'easter', 60, [ 'Baden-Württemberg', 'Bayern', 'Hessen', 'Nordrhein-Westfalen', 'Rheinland-Pfalz', 'Saarland' ] ],
+ 'Mariä Himmelfahrt' : [ 8, 15, [ 'Saarland'] ],
+ 'Tag der Deutschen Einheit' : [ 10, 3 ],
+ 'Reformationstag' : [ 10, 31, [ 'Brandenburg', 'Mecklenburg-Vorpommern', 'Sachsen', 'Sachsen-Anhalt', 'Thüringen'] ],
+ 'Allerheiligen' : [ 11, 1, [ 'Baden-Württemberg', 'Bayern', 'Nordrhein-Westfalen', 'Rheinland-Pfalz', 'Saarland' ] ],
+ '1. Weihnachtstag' : [ 12, 25 ],
+ '2. Weihnachtstag' : [ 12, 26 ],
+ // 'Silvester' : [ 12, 31 ], // for testing
+ },
+ 'Baden-Württemberg': { // does only apply in Baden-Württemberg
+ // This more specific rule set overwrites the country wide one (they are just ignored).
+ // You may use this instead of the country wide with some
+ // additional holidays for some states, if one state
+ // totally disagrees about how to do public holidays …
+ // 'PH': {
+ // '2. Weihnachtstag' : [ 12, 26 ],
+ // },
+
+ // school holiday normally variate between states
+ 'SH': [ // generated by convert_ical_to_json
+ // You may can adjust this script to use other resources (for other countries) too.
+ {
+ name: 'Osterferien',
+ 2005: [ 3, 24, /* to */ 3, 24, 3, 29, /* to */ 4, 2 ],
+ 2006: [ 4, 18, /* to */ 4, 22 ],
+ 2007: [ 4, 2, /* to */ 4, 14 ],
+ 2008: [ 3, 17, /* to */ 3, 28 ],
+ 2009: [ 4, 9, /* to */ 4, 9, 4, 14, /* to */ 4, 17 ],
+ 2010: [ 4, 1, /* to */ 4, 1, 4, 6, /* to */ 4, 10 ],
+ 2011: [ 4, 21, /* to */ 4, 21, 4, 26, /* to */ 4, 30 ],
+ 2012: [ 4, 2, /* to */ 4, 13 ],
+ 2013: [ 3, 25, /* to */ 4, 5 ],
+ 2014: [ 4, 14, /* to */ 4, 25 ],
+ 2015: [ 3, 30, /* to */ 4, 10 ],
+ 2016: [ 3, 29, /* to */ 4, 2 ],
+ 2017: [ 4, 10, /* to */ 4, 21 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2005: [ 5, 17, /* to */ 5, 28 ],
+ 2006: [ 5, 29, /* to */ 6, 10 ],
+ 2007: [ 5, 29, /* to */ 6, 9 ],
+ 2008: [ 5, 13, /* to */ 5, 23 ],
+ 2009: [ 5, 25, /* to */ 6, 6 ],
+ 2010: [ 5, 25, /* to */ 6, 5 ],
+ 2011: [ 6, 14, /* to */ 6, 25 ],
+ 2012: [ 5, 29, /* to */ 6, 9 ],
+ 2013: [ 5, 21, /* to */ 6, 1 ],
+ 2014: [ 6, 10, /* to */ 6, 21 ],
+ 2015: [ 5, 26, /* to */ 6, 6 ],
+ 2016: [ 5, 17, /* to */ 5, 28 ],
+ 2017: [ 6, 6, /* to */ 6, 16 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2005: [ 7, 28, /* to */ 9, 10 ],
+ 2006: [ 8, 3, /* to */ 9, 16 ],
+ 2007: [ 7, 26, /* to */ 9, 8 ],
+ 2008: [ 7, 24, /* to */ 9, 6 ],
+ 2009: [ 7, 30, /* to */ 9, 12 ],
+ 2010: [ 7, 29, /* to */ 9, 11 ],
+ 2011: [ 7, 28, /* to */ 9, 10 ],
+ 2012: [ 7, 26, /* to */ 9, 8 ],
+ 2013: [ 7, 25, /* to */ 9, 7 ],
+ 2014: [ 7, 31, /* to */ 9, 13 ],
+ 2015: [ 7, 30, /* to */ 9, 12 ],
+ 2016: [ 7, 28, /* to */ 9, 10 ],
+ 2017: [ 7, 27, /* to */ 9, 9 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2005: [ 11, 2, /* to */ 11, 4 ],
+ 2006: [ 10, 30, /* to */ 11, 3 ],
+ 2007: [ 10, 29, /* to */ 11, 3 ],
+ 2008: [ 10, 27, /* to */ 10, 31 ],
+ 2009: [ 10, 26, /* to */ 10, 31 ],
+ 2010: [ 11, 2, /* to */ 11, 6 ],
+ 2011: [ 10, 31, /* to */ 10, 31, 11, 2, /* to */ 11, 4 ],
+ 2012: [ 10, 29, /* to */ 11, 2 ],
+ 2013: [ 10, 28, /* to */ 10, 30 ],
+ 2014: [ 10, 27, /* to */ 10, 30 ],
+ 2015: [ 11, 2, /* to */ 11, 6 ],
+ 2016: [ 11, 2, /* to */ 11, 4 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2005: [ 12, 22, /* to */ 1, 5 ],
+ 2006: [ 12, 27, /* to */ 1, 5 ],
+ 2007: [ 12, 24, /* to */ 1, 5 ],
+ 2008: [ 12, 22, /* to */ 1, 10 ],
+ 2009: [ 12, 23, /* to */ 1, 9 ],
+ 2010: [ 12, 23, /* to */ 1, 8 ],
+ 2011: [ 12, 23, /* to */ 1, 5 ],
+ 2012: [ 12, 24, /* to */ 1, 5 ],
+ 2013: [ 12, 23, /* to */ 1, 4 ],
+ 2014: [ 12, 22, /* to */ 1, 5 ],
+ 2015: [ 12, 23, /* to */ 1, 9 ],
+ 2016: [ 12, 23, /* to */ 1, 7 ],
+ },
+ ],
+ },
+ 'Mecklenburg-Vorpommern': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 6, /* to */ 2, 20 ],
+ 2011: [ 2, 7, /* to */ 2, 19 ],
+ 2012: [ 2, 6, /* to */ 2, 17 ],
+ 2013: [ 2, 4, /* to */ 2, 15 ],
+ 2014: [ 2, 3, /* to */ 2, 15 ],
+ 2015: [ 2, 2, /* to */ 2, 14 ],
+ 2016: [ 2, 1, /* to */ 2, 13 ],
+ 2017: [ 2, 6, /* to */ 2, 18 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 29, /* to */ 4, 7 ],
+ 2011: [ 4, 16, /* to */ 4, 27 ],
+ 2012: [ 4, 2, /* to */ 4, 11 ],
+ 2013: [ 3, 25, /* to */ 4, 3 ],
+ 2014: [ 4, 14, /* to */ 4, 23 ],
+ 2015: [ 3, 30, /* to */ 4, 8 ],
+ 2016: [ 3, 21, /* to */ 3, 30 ],
+ 2017: [ 4, 10, /* to */ 4, 19 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 21, /* to */ 5, 22 ],
+ 2011: [ 6, 10, /* to */ 6, 14 ],
+ 2012: [ 5, 25, /* to */ 5, 29 ],
+ 2013: [ 5, 17, /* to */ 5, 21 ],
+ 2014: [ 6, 6, /* to */ 6, 10 ],
+ 2015: [ 5, 22, /* to */ 5, 26 ],
+ 2016: [ 5, 14, /* to */ 5, 17 ],
+ 2017: [ 6, 2, /* to */ 6, 6 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 12, /* to */ 8, 21 ],
+ 2011: [ 7, 4, /* to */ 8, 13 ],
+ 2012: [ 6, 23, /* to */ 8, 4 ],
+ 2013: [ 6, 22, /* to */ 8, 3 ],
+ 2014: [ 7, 14, /* to */ 8, 23 ],
+ 2015: [ 7, 20, /* to */ 8, 29 ],
+ 2016: [ 7, 25, /* to */ 9, 3 ],
+ 2017: [ 7, 24, /* to */ 9, 2 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 18, /* to */ 10, 23 ],
+ 2011: [ 10, 17, /* to */ 10, 21 ],
+ 2012: [ 10, 1, /* to */ 10, 5 ],
+ 2013: [ 10, 14, /* to */ 10, 19 ],
+ 2014: [ 10, 20, /* to */ 10, 25 ],
+ 2015: [ 10, 24, /* to */ 10, 30 ],
+ 2016: [ 10, 24, /* to */ 10, 28 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 12, 31 ],
+ 2011: [ 12, 23, /* to */ 1, 3 ],
+ 2012: [ 12, 21, /* to */ 1, 4 ],
+ 2013: [ 12, 23, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 2 ],
+ 2015: [ 12, 21, /* to */ 1, 2 ],
+ 2016: [ 12, 22, /* to */ 1, 2 ],
+ },
+ ],
+ },
+ 'Hessen': {
+ 'SH': [
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 29, /* to */ 4, 10 ],
+ 2011: [ 4, 18, /* to */ 4, 30 ],
+ 2012: [ 4, 2, /* to */ 4, 14 ],
+ 2013: [ 3, 25, /* to */ 4, 6 ],
+ 2014: [ 4, 14, /* to */ 4, 26 ],
+ 2015: [ 3, 30, /* to */ 4, 11 ],
+ 2016: [ 3, 29, /* to */ 4, 9 ],
+ 2017: [ 4, 3, /* to */ 4, 15 ],
+ 2018: [ 3, 26, /* to */ 4, 7 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 5, /* to */ 8, 14 ],
+ 2011: [ 6, 27, /* to */ 8, 5 ],
+ 2012: [ 7, 2, /* to */ 8, 10 ],
+ 2013: [ 7, 8, /* to */ 8, 16 ],
+ 2014: [ 7, 28, /* to */ 9, 5 ],
+ 2015: [ 7, 27, /* to */ 9, 5 ],
+ 2016: [ 7, 18, /* to */ 8, 26 ],
+ 2017: [ 7, 3, /* to */ 8, 11 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 11, /* to */ 10, 22 ],
+ 2011: [ 10, 10, /* to */ 10, 22 ],
+ 2012: [ 10, 15, /* to */ 10, 27 ],
+ 2013: [ 10, 14, /* to */ 10, 26 ],
+ 2014: [ 10, 20, /* to */ 11, 1 ],
+ 2015: [ 10, 19, /* to */ 10, 31 ],
+ 2016: [ 10, 17, /* to */ 10, 29 ],
+ 2017: [ 10, 9, /* to */ 10, 21 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 20, /* to */ 1, 7 ],
+ 2011: [ 12, 21, /* to */ 1, 6 ],
+ 2012: [ 12, 24, /* to */ 1, 12 ],
+ 2013: [ 12, 23, /* to */ 1, 11 ],
+ 2014: [ 12, 22, /* to */ 1, 10 ],
+ 2015: [ 12, 23, /* to */ 1, 9 ],
+ 2016: [ 12, 22, /* to */ 1, 7 ],
+ 2017: [ 12, 24, /* to */ 1, 13 ],
+ },
+ ],
+ },
+ 'Schleswig-Holstein': {
+ 'SH': [
+ {
+ name: 'Osterferien',
+ 2010: [ 4, 3, /* to */ 4, 17 ],
+ 2011: [ 4, 15, /* to */ 4, 30 ],
+ 2012: [ 3, 30, /* to */ 4, 13 ],
+ 2013: [ 3, 25, /* to */ 4, 9 ],
+ 2014: [ 4, 16, /* to */ 5, 2 ],
+ 2015: [ 4, 1, /* to */ 4, 17 ],
+ 2016: [ 3, 24, /* to */ 4, 9 ],
+ 2017: [ 4, 7, /* to */ 4, 21 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 12, /* to */ 8, 21 ],
+ 2011: [ 7, 4, /* to */ 8, 13 ],
+ 2012: [ 6, 25, /* to */ 8, 4 ],
+ 2013: [ 6, 24, /* to */ 8, 3 ],
+ 2014: [ 7, 14, /* to */ 8, 23 ],
+ 2015: [ 7, 20, /* to */ 8, 29 ],
+ 2016: [ 7, 25, /* to */ 9, 3 ],
+ 2017: [ 7, 24, /* to */ 9, 2 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2011: [ 6, 3, /* to */ 6, 4 ],
+ 2012: [ 5, 18, /* to */ 5, 18 ],
+ 2013: [ 5, 10, /* to */ 5, 10 ],
+ 2014: [ 5, 30, /* to */ 5, 30 ],
+ 2015: [ 5, 15, /* to */ 5, 15 ],
+ 2016: [ 5, 6, /* to */ 5, 6 ],
+ 2017: [ 5, 26, /* to */ 5, 26 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 11, /* to */ 10, 23 ],
+ 2011: [ 10, 10, /* to */ 10, 22 ],
+ 2012: [ 10, 4, /* to */ 10, 19 ],
+ 2013: [ 10, 4, /* to */ 10, 18 ],
+ 2014: [ 10, 13, /* to */ 10, 25 ],
+ 2015: [ 10, 19, /* to */ 10, 31 ],
+ 2016: [ 10, 17, /* to */ 10, 29 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 1, 7 ],
+ 2011: [ 12, 23, /* to */ 1, 6 ],
+ 2012: [ 12, 24, /* to */ 1, 5 ],
+ 2013: [ 12, 23, /* to */ 1, 6 ],
+ 2014: [ 12, 22, /* to */ 1, 6 ],
+ 2015: [ 12, 21, /* to */ 1, 6 ],
+ 2016: [ 12, 23, /* to */ 1, 6 ],
+ },
+ ],
+ },
+ 'Berlin': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 1, /* to */ 2, 6 ],
+ 2011: [ 1, 31, /* to */ 2, 5 ],
+ 2012: [ 1, 30, /* to */ 2, 4 ],
+ 2013: [ 2, 4, /* to */ 2, 9 ],
+ 2014: [ 2, 3, /* to */ 2, 8 ],
+ 2015: [ 2, 2, /* to */ 2, 7 ],
+ 2016: [ 2, 1, /* to */ 2, 6 ],
+ 2017: [ 1, 30, /* to */ 2, 4 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 31, /* to */ 4, 10 ],
+ 2011: [ 4, 18, /* to */ 4, 30 ],
+ 2012: [ 4, 2, /* to */ 4, 14, 4, 30, /* to */ 4, 30 ],
+ 2013: [ 3, 25, /* to */ 4, 6 ],
+ 2014: [ 4, 14, /* to */ 4, 26, 5, 2, /* to */ 5, 2 ],
+ 2015: [ 3, 30, /* to */ 4, 11 ],
+ 2016: [ 3, 21, /* to */ 4, 2 ],
+ 2017: [ 4, 10, /* to */ 4, 22 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 14, /* to */ 5, 14, 5, 25, /* to */ 5, 25 ],
+ 2011: [ 6, 3, /* to */ 6, 3 ],
+ 2012: [ 5, 18, /* to */ 5, 18 ],
+ 2013: [ 5, 10, /* to */ 5, 10, 5, 21, /* to */ 5, 21 ],
+ 2014: [ 5, 30, /* to */ 5, 30 ],
+ 2015: [ 5, 15, /* to */ 5, 15 ],
+ 2016: [ 5, 6, /* to */ 5, 6, 5, 17, /* to */ 5, 17 ],
+ 2017: [ 5, 26, /* to */ 5, 26 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 7, /* to */ 8, 21 ],
+ 2011: [ 6, 29, /* to */ 8, 12 ],
+ 2012: [ 6, 20, /* to */ 8, 3 ],
+ 2013: [ 6, 19, /* to */ 8, 2 ],
+ 2014: [ 7, 9, /* to */ 8, 22 ],
+ 2015: [ 7, 15, /* to */ 8, 28 ],
+ 2016: [ 7, 20, /* to */ 9, 2 ],
+ 2017: [ 7, 19, /* to */ 9, 1 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 11, /* to */ 10, 23 ],
+ 2011: [ 10, 4, /* to */ 10, 14 ],
+ 2012: [ 10, 1, /* to */ 10, 13 ],
+ 2013: [ 9, 30, /* to */ 10, 12 ],
+ 2014: [ 10, 20, /* to */ 11, 1 ],
+ 2015: [ 10, 19, /* to */ 10, 31 ],
+ 2016: [ 10, 17, /* to */ 10, 28 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 1, 1 ],
+ 2011: [ 12, 23, /* to */ 1, 3 ],
+ 2012: [ 12, 24, /* to */ 1, 4 ],
+ 2013: [ 12, 23, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 2 ],
+ 2015: [ 12, 23, /* to */ 1, 2 ],
+ 2016: [ 12, 23, /* to */ 1, 3 ],
+ },
+ ],
+ },
+ 'Saarland': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 15, /* to */ 2, 20 ],
+ 2011: [ 3, 7, /* to */ 3, 12 ],
+ 2012: [ 2, 20, /* to */ 2, 25 ],
+ 2013: [ 2, 11, /* to */ 2, 16 ],
+ 2014: [ 3, 3, /* to */ 3, 8 ],
+ 2015: [ 2, 16, /* to */ 2, 21 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 29, /* to */ 4, 10 ],
+ 2011: [ 4, 18, /* to */ 4, 30 ],
+ 2012: [ 4, 2, /* to */ 4, 14 ],
+ 2013: [ 3, 25, /* to */ 4, 6 ],
+ 2014: [ 4, 14, /* to */ 4, 26 ],
+ 2015: [ 3, 30, /* to */ 4, 11 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 5, /* to */ 8, 14 ],
+ 2011: [ 6, 24, /* to */ 8, 6 ],
+ 2012: [ 7, 2, /* to */ 8, 14 ],
+ 2013: [ 7, 8, /* to */ 8, 17 ],
+ 2014: [ 7, 28, /* to */ 9, 6 ],
+ 2015: [ 7, 27, /* to */ 9, 4 ],
+ 2016: [ 7, 18, /* to */ 8, 26 ],
+ 2017: [ 7, 3, /* to */ 8, 14 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 11, /* to */ 10, 23 ],
+ 2011: [ 10, 4, /* to */ 10, 15 ],
+ 2012: [ 10, 22, /* to */ 11, 3 ],
+ 2013: [ 10, 21, /* to */ 11, 2 ],
+ 2014: [ 10, 20, /* to */ 10, 31 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 20, /* to */ 1, 1 ],
+ 2011: [ 12, 23, /* to */ 1, 4 ],
+ 2012: [ 12, 24, /* to */ 1, 5 ],
+ 2013: [ 12, 20, /* to */ 1, 4 ],
+ 2014: [ 12, 22, /* to */ 1, 7 ],
+ },
+ ],
+ },
+ 'Bremen': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 1, /* to */ 2, 2 ],
+ 2011: [ 1, 31, /* to */ 2, 1 ],
+ 2012: [ 1, 30, /* to */ 1, 31 ],
+ 2013: [ 1, 31, /* to */ 2, 1 ],
+ 2014: [ 1, 30, /* to */ 1, 31 ],
+ 2015: [ 2, 2, /* to */ 2, 3 ],
+ 2016: [ 1, 28, /* to */ 1, 29 ],
+ 2017: [ 1, 30, /* to */ 1, 31 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 19, /* to */ 4, 6 ],
+ 2011: [ 4, 16, /* to */ 4, 30 ],
+ 2012: [ 3, 26, /* to */ 4, 11, 4, 30, /* to */ 4, 30 ],
+ 2013: [ 3, 16, /* to */ 4, 2 ],
+ 2014: [ 4, 3, /* to */ 4, 22, 5, 2, /* to */ 5, 2 ],
+ 2015: [ 3, 25, /* to */ 4, 10 ],
+ 2016: [ 3, 18, /* to */ 4, 2 ],
+ 2017: [ 4, 10, /* to */ 4, 22 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 14, /* to */ 5, 14, 5, 25, /* to */ 5, 25 ],
+ 2011: [ 6, 3, /* to */ 6, 3, 6, 14, /* to */ 6, 14 ],
+ 2012: [ 5, 18, /* to */ 5, 18, 5, 29, /* to */ 5, 29 ],
+ 2013: [ 5, 10, /* to */ 5, 10, 5, 21, /* to */ 5, 21 ],
+ 2014: [ 5, 30, /* to */ 5, 30, 6, 10, /* to */ 6, 10 ],
+ 2015: [ 5, 15, /* to */ 5, 15, 5, 26, /* to */ 5, 26 ],
+ 2016: [ 5, 6, /* to */ 5, 6, 5, 17, /* to */ 5, 17 ],
+ 2017: [ 5, 26, /* to */ 5, 26, 6, 6, /* to */ 6, 6 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 6, 24, /* to */ 8, 4 ],
+ 2011: [ 7, 7, /* to */ 8, 17 ],
+ 2012: [ 7, 23, /* to */ 8, 31 ],
+ 2013: [ 6, 27, /* to */ 8, 7 ],
+ 2014: [ 7, 31, /* to */ 9, 10 ],
+ 2015: [ 7, 23, /* to */ 9, 2 ],
+ 2016: [ 6, 23, /* to */ 8, 3 ],
+ 2017: [ 6, 22, /* to */ 8, 2 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 9, /* to */ 10, 23 ],
+ 2011: [ 10, 17, /* to */ 10, 29 ],
+ 2012: [ 10, 22, /* to */ 11, 3 ],
+ 2013: [ 10, 4, /* to */ 10, 18 ],
+ 2014: [ 10, 27, /* to */ 11, 8 ],
+ 2015: [ 10, 19, /* to */ 10, 31 ],
+ 2016: [ 10, 4, /* to */ 10, 15 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 22, /* to */ 1, 5 ],
+ 2011: [ 12, 23, /* to */ 1, 4 ],
+ 2012: [ 12, 24, /* to */ 1, 5 ],
+ 2013: [ 12, 23, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 5 ],
+ 2015: [ 12, 23, /* to */ 1, 6 ],
+ 2016: [ 12, 21, /* to */ 1, 6 ],
+ },
+ ],
+ },
+ 'Bayern': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 15, /* to */ 2, 20 ],
+ 2011: [ 3, 7, /* to */ 3, 11 ],
+ 2012: [ 2, 20, /* to */ 2, 24 ],
+ 2013: [ 2, 11, /* to */ 2, 15 ],
+ 2014: [ 3, 3, /* to */ 3, 7 ],
+ 2015: [ 2, 16, /* to */ 2, 20 ],
+ 2016: [ 2, 8, /* to */ 2, 12 ],
+ 2017: [ 2, 27, /* to */ 3, 3 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 29, /* to */ 4, 10 ],
+ 2011: [ 4, 18, /* to */ 4, 30 ],
+ 2012: [ 4, 2, /* to */ 4, 14 ],
+ 2013: [ 3, 25, /* to */ 4, 6 ],
+ 2014: [ 4, 14, /* to */ 4, 26 ],
+ 2015: [ 3, 30, /* to */ 4, 11 ],
+ 2016: [ 3, 21, /* to */ 4, 1 ],
+ 2017: [ 4, 10, /* to */ 4, 22 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 25, /* to */ 6, 5 ],
+ 2011: [ 6, 14, /* to */ 6, 25 ],
+ 2012: [ 5, 29, /* to */ 6, 9 ],
+ 2013: [ 5, 21, /* to */ 5, 31 ],
+ 2014: [ 6, 10, /* to */ 6, 21 ],
+ 2015: [ 5, 26, /* to */ 6, 5 ],
+ 2016: [ 5, 17, /* to */ 5, 28 ],
+ 2017: [ 6, 6, /* to */ 6, 16 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 8, 2, /* to */ 9, 13 ],
+ 2011: [ 7, 30, /* to */ 9, 12 ],
+ 2012: [ 8, 1, /* to */ 9, 12 ],
+ 2013: [ 7, 31, /* to */ 9, 11 ],
+ 2014: [ 7, 30, /* to */ 9, 15 ],
+ 2015: [ 8, 1, /* to */ 9, 14 ],
+ 2016: [ 7, 30, /* to */ 9, 12 ],
+ 2017: [ 7, 29, /* to */ 9, 11 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 11, 2, /* to */ 11, 5 ],
+ 2011: [ 10, 31, /* to */ 11, 5 ],
+ 2012: [ 10, 29, /* to */ 11, 3 ],
+ 2013: [ 10, 28, /* to */ 10, 31 ],
+ 2014: [ 10, 27, /* to */ 10, 31 ],
+ 2015: [ 11, 2, /* to */ 11, 7 ],
+ 2016: [ 10, 31, /* to */ 11, 4 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 24, /* to */ 1, 7 ],
+ 2011: [ 12, 27, /* to */ 1, 5 ],
+ 2012: [ 12, 24, /* to */ 1, 5 ],
+ 2013: [ 12, 23, /* to */ 1, 4 ],
+ 2014: [ 12, 24, /* to */ 1, 5 ],
+ 2015: [ 12, 24, /* to */ 1, 5 ],
+ 2016: [ 12, 24, /* to */ 1, 5 ],
+ },
+ ],
+ },
+ 'Niedersachsen': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 1, /* to */ 2, 2 ],
+ 2011: [ 1, 31, /* to */ 2, 1 ],
+ 2012: [ 1, 30, /* to */ 1, 31 ],
+ 2013: [ 1, 31, /* to */ 2, 1 ],
+ 2014: [ 1, 30, /* to */ 1, 31 ],
+ 2015: [ 2, 2, /* to */ 2, 3 ],
+ 2016: [ 1, 28, /* to */ 1, 29 ],
+ 2017: [ 1, 30, /* to */ 1, 31 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 19, /* to */ 4, 6 ],
+ 2011: [ 4, 16, /* to */ 4, 30 ],
+ 2012: [ 3, 26, /* to */ 4, 11, 4, 30, /* to */ 4, 30 ],
+ 2013: [ 3, 16, /* to */ 4, 2 ],
+ 2014: [ 4, 3, /* to */ 4, 22, 5, 2, /* to */ 5, 2 ],
+ 2015: [ 3, 25, /* to */ 4, 10 ],
+ 2016: [ 3, 18, /* to */ 4, 2 ],
+ 2017: [ 4, 10, /* to */ 4, 22 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 14, /* to */ 5, 14, 5, 25, /* to */ 5, 25 ],
+ 2011: [ 6, 3, /* to */ 6, 3, 6, 14, /* to */ 6, 14 ],
+ 2012: [ 5, 18, /* to */ 5, 18, 5, 29, /* to */ 5, 29 ],
+ 2013: [ 5, 10, /* to */ 5, 10, 5, 21, /* to */ 5, 21 ],
+ 2014: [ 5, 30, /* to */ 5, 30, 6, 10, /* to */ 6, 10 ],
+ 2015: [ 5, 15, /* to */ 5, 15, 5, 26, /* to */ 5, 26 ],
+ 2016: [ 5, 6, /* to */ 5, 6, 5, 17, /* to */ 5, 17 ],
+ 2017: [ 5, 26, /* to */ 5, 26, 6, 6, /* to */ 6, 6 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 6, 24, /* to */ 8, 4 ],
+ 2011: [ 7, 7, /* to */ 8, 17 ],
+ 2012: [ 7, 23, /* to */ 8, 31 ],
+ 2013: [ 6, 27, /* to */ 8, 7 ],
+ 2014: [ 7, 31, /* to */ 9, 10 ],
+ 2015: [ 7, 23, /* to */ 9, 2 ],
+ 2016: [ 6, 23, /* to */ 8, 3 ],
+ 2017: [ 6, 22, /* to */ 8, 2 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 9, /* to */ 10, 23 ],
+ 2011: [ 10, 17, /* to */ 10, 29 ],
+ 2012: [ 10, 22, /* to */ 11, 3 ],
+ 2013: [ 10, 4, /* to */ 10, 18 ],
+ 2014: [ 10, 27, /* to */ 11, 8 ],
+ 2015: [ 10, 19, /* to */ 10, 31 ],
+ 2016: [ 10, 4, /* to */ 10, 15 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 22, /* to */ 1, 5 ],
+ 2011: [ 12, 23, /* to */ 1, 4 ],
+ 2012: [ 12, 24, /* to */ 1, 5 ],
+ 2013: [ 12, 23, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 5 ],
+ 2015: [ 12, 23, /* to */ 1, 6 ],
+ 2016: [ 12, 21, /* to */ 1, 6 ],
+ },
+ ],
+ },
+ 'Nordrhein-Westfalen': {
+ 'SH': [
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 27, /* to */ 4, 10 ],
+ 2011: [ 4, 18, /* to */ 4, 30 ],
+ 2012: [ 4, 2, /* to */ 4, 14 ],
+ 2013: [ 3, 25, /* to */ 4, 6 ],
+ 2014: [ 4, 14, /* to */ 4, 26 ],
+ 2015: [ 3, 30, /* to */ 4, 11 ],
+ 2016: [ 3, 21, /* to */ 4, 2 ],
+ 2017: [ 4, 10, /* to */ 4, 22 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 25, /* to */ 5, 25 ],
+ 2012: [ 5, 29, /* to */ 5, 29 ],
+ 2013: [ 5, 21, /* to */ 5, 21 ],
+ 2014: [ 6, 10, /* to */ 6, 10 ],
+ 2015: [ 5, 26, /* to */ 5, 26 ],
+ 2016: [ 5, 17, /* to */ 5, 17 ],
+ 2017: [ 6, 6, /* to */ 6, 6 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 15, /* to */ 8, 27 ],
+ 2011: [ 7, 25, /* to */ 9, 6 ],
+ 2012: [ 7, 9, /* to */ 8, 21 ],
+ 2013: [ 7, 22, /* to */ 9, 3 ],
+ 2014: [ 7, 7, /* to */ 8, 19 ],
+ 2015: [ 6, 29, /* to */ 8, 11 ],
+ 2016: [ 7, 11, /* to */ 8, 23 ],
+ 2017: [ 7, 17, /* to */ 8, 29 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 11, /* to */ 10, 23 ],
+ 2011: [ 10, 24, /* to */ 11, 5 ],
+ 2012: [ 10, 8, /* to */ 10, 20 ],
+ 2013: [ 10, 21, /* to */ 11, 2 ],
+ 2014: [ 10, 6, /* to */ 10, 18 ],
+ 2015: [ 10, 5, /* to */ 10, 17 ],
+ 2016: [ 10, 10, /* to */ 10, 21 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 24, /* to */ 1, 8 ],
+ 2011: [ 12, 23, /* to */ 1, 6 ],
+ 2012: [ 12, 21, /* to */ 1, 4 ],
+ 2013: [ 12, 23, /* to */ 1, 7 ],
+ 2014: [ 12, 22, /* to */ 1, 6 ],
+ 2015: [ 12, 23, /* to */ 1, 6 ],
+ 2016: [ 12, 23, /* to */ 1, 6 ],
+ },
+ ],
+ },
+ 'Sachsen': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 8, /* to */ 2, 20 ],
+ 2011: [ 2, 12, /* to */ 2, 26 ],
+ 2012: [ 2, 13, /* to */ 2, 25 ],
+ 2013: [ 2, 4, /* to */ 2, 15 ],
+ 2014: [ 2, 17, /* to */ 3, 1 ],
+ 2015: [ 2, 9, /* to */ 2, 21 ],
+ 2016: [ 2, 8, /* to */ 2, 20 ],
+ 2017: [ 2, 13, /* to */ 2, 24 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 4, 1, /* to */ 4, 10 ],
+ 2011: [ 4, 22, /* to */ 4, 30 ],
+ 2012: [ 4, 6, /* to */ 4, 14 ],
+ 2013: [ 3, 29, /* to */ 4, 6 ],
+ 2014: [ 4, 18, /* to */ 4, 26 ],
+ 2015: [ 4, 2, /* to */ 4, 11 ],
+ 2016: [ 3, 25, /* to */ 4, 2 ],
+ 2017: [ 4, 13, /* to */ 4, 22 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 14, /* to */ 5, 14 ],
+ 2011: [ 6, 3, /* to */ 6, 3 ],
+ 2012: [ 5, 18, /* to */ 5, 18 ],
+ 2013: [ 5, 10, /* to */ 5, 10, 5, 18, /* to */ 5, 22 ],
+ 2014: [ 5, 30, /* to */ 5, 30 ],
+ 2015: [ 5, 15, /* to */ 5, 15 ],
+ 2016: [ 5, 6, /* to */ 5, 6 ],
+ 2017: [ 5, 26, /* to */ 5, 26 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 6, 28, /* to */ 8, 6 ],
+ 2011: [ 7, 11, /* to */ 8, 19 ],
+ 2012: [ 7, 23, /* to */ 8, 31 ],
+ 2013: [ 7, 15, /* to */ 8, 23 ],
+ 2014: [ 7, 21, /* to */ 8, 29 ],
+ 2015: [ 7, 13, /* to */ 8, 21 ],
+ 2016: [ 6, 27, /* to */ 8, 5 ],
+ 2017: [ 6, 26, /* to */ 8, 4 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 4, /* to */ 10, 16 ],
+ 2011: [ 10, 17, /* to */ 10, 28 ],
+ 2012: [ 10, 22, /* to */ 11, 2 ],
+ 2013: [ 10, 21, /* to */ 11, 1 ],
+ 2014: [ 10, 20, /* to */ 10, 31 ],
+ 2015: [ 10, 12, /* to */ 10, 24 ],
+ 2016: [ 10, 3, /* to */ 10, 15 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 1, 1 ],
+ 2011: [ 12, 23, /* to */ 1, 2 ],
+ 2012: [ 12, 22, /* to */ 1, 2 ],
+ 2013: [ 12, 21, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 3 ],
+ 2015: [ 12, 21, /* to */ 1, 2 ],
+ 2016: [ 12, 23, /* to */ 1, 2 ],
+ },
+ ],
+ },
+ 'Thüringen': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 1, /* to */ 2, 6 ],
+ 2011: [ 1, 31, /* to */ 2, 5 ],
+ 2012: [ 2, 6, /* to */ 2, 11 ],
+ 2013: [ 2, 18, /* to */ 2, 23 ],
+ 2014: [ 2, 17, /* to */ 2, 22 ],
+ 2015: [ 2, 2, /* to */ 2, 7 ],
+ 2016: [ 2, 1, /* to */ 2, 6 ],
+ 2017: [ 2, 6, /* to */ 2, 11 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 29, /* to */ 4, 9 ],
+ 2011: [ 4, 18, /* to */ 4, 30 ],
+ 2012: [ 4, 2, /* to */ 4, 13 ],
+ 2013: [ 3, 25, /* to */ 4, 6 ],
+ 2014: [ 4, 19, /* to */ 5, 2 ],
+ 2015: [ 3, 30, /* to */ 4, 11 ],
+ 2016: [ 3, 24, /* to */ 4, 2 ],
+ 2017: [ 4, 10, /* to */ 4, 21 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 6, 24, /* to */ 8, 4 ],
+ 2011: [ 7, 11, /* to */ 8, 19 ],
+ 2012: [ 7, 23, /* to */ 8, 31 ],
+ 2013: [ 7, 15, /* to */ 8, 23 ],
+ 2014: [ 7, 21, /* to */ 8, 29 ],
+ 2015: [ 7, 13, /* to */ 8, 21 ],
+ 2016: [ 6, 27, /* to */ 8, 10 ],
+ 2017: [ 6, 26, /* to */ 8, 9 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2011: [ 6, 11, /* to */ 6, 14 ],
+ 2012: [ 5, 25, /* to */ 5, 29 ],
+ 2013: [ 5, 10, /* to */ 5, 10 ],
+ 2014: [ 5, 30, /* to */ 5, 30 ],
+ 2015: [ 5, 15, /* to */ 5, 15 ],
+ 2016: [ 5, 6, /* to */ 5, 6 ],
+ 2017: [ 5, 26, /* to */ 5, 26 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 9, /* to */ 10, 23 ],
+ 2011: [ 10, 17, /* to */ 10, 28 ],
+ 2012: [ 10, 22, /* to */ 11, 3 ],
+ 2013: [ 10, 21, /* to */ 11, 2 ],
+ 2014: [ 10, 6, /* to */ 10, 18 ],
+ 2015: [ 10, 5, /* to */ 10, 17 ],
+ 2016: [ 10, 10, /* to */ 10, 22 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 1, 1 ],
+ 2011: [ 12, 23, /* to */ 1, 1 ],
+ 2012: [ 12, 24, /* to */ 1, 5 ],
+ 2013: [ 12, 23, /* to */ 1, 4 ],
+ 2014: [ 12, 22, /* to */ 1, 3 ],
+ 2015: [ 12, 23, /* to */ 1, 2 ],
+ 2016: [ 12, 23, /* to */ 12, 31 ],
+ },
+ ],
+ },
+ 'Hamburg': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 1, 29, /* to */ 1, 29 ],
+ 2011: [ 1, 31, /* to */ 1, 31 ],
+ 2012: [ 1, 30, /* to */ 1, 30 ],
+ 2013: [ 2, 1, /* to */ 2, 1 ],
+ 2014: [ 1, 31, /* to */ 1, 31 ],
+ 2015: [ 1, 30, /* to */ 1, 30 ],
+ 2016: [ 1, 29, /* to */ 1, 29 ],
+ 2017: [ 1, 30, /* to */ 1, 30 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 8, /* to */ 3, 20 ],
+ 2011: [ 3, 7, /* to */ 3, 18 ],
+ 2012: [ 3, 5, /* to */ 3, 16 ],
+ 2013: [ 3, 4, /* to */ 3, 15 ],
+ 2014: [ 3, 3, /* to */ 3, 14 ],
+ 2015: [ 3, 2, /* to */ 3, 13 ],
+ 2016: [ 3, 7, /* to */ 3, 18 ],
+ 2017: [ 3, 6, /* to */ 3, 17 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 14, /* to */ 5, 22 ],
+ 2011: [ 4, 26, /* to */ 4, 29, 6, 3, /* to */ 6, 3 ],
+ 2012: [ 4, 30, /* to */ 5, 4, 5, 18, /* to */ 5, 18 ],
+ 2013: [ 5, 2, /* to */ 5, 10 ],
+ 2014: [ 4, 28, /* to */ 5, 2, 5, 30, /* to */ 5, 30 ],
+ 2015: [ 5, 11, /* to */ 5, 15 ],
+ 2016: [ 5, 6, /* to */ 5, 6, 5, 17, /* to */ 5, 20 ],
+ 2017: [ 5, 22, /* to */ 5, 26 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 8, /* to */ 8, 18 ],
+ 2011: [ 6, 30, /* to */ 8, 10 ],
+ 2012: [ 6, 21, /* to */ 8, 1 ],
+ 2013: [ 6, 20, /* to */ 7, 31 ],
+ 2014: [ 7, 10, /* to */ 8, 20 ],
+ 2015: [ 7, 16, /* to */ 8, 26 ],
+ 2016: [ 7, 21, /* to */ 8, 31 ],
+ 2017: [ 7, 20, /* to */ 8, 30 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 4, /* to */ 10, 15 ],
+ 2011: [ 10, 4, /* to */ 10, 14 ],
+ 2012: [ 10, 1, /* to */ 10, 12 ],
+ 2013: [ 9, 30, /* to */ 10, 11 ],
+ 2014: [ 10, 13, /* to */ 10, 24 ],
+ 2015: [ 10, 19, /* to */ 10, 30 ],
+ 2016: [ 10, 17, /* to */ 10, 28 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 1, 3 ],
+ 2011: [ 12, 27, /* to */ 1, 6 ],
+ 2012: [ 12, 21, /* to */ 1, 4 ],
+ 2013: [ 12, 19, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 6 ],
+ 2015: [ 12, 21, /* to */ 1, 1 ],
+ 2016: [ 12, 27, /* to */ 1, 6 ],
+ },
+ ],
+ },
+ 'Sachsen-Anhalt': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 8, /* to */ 2, 13 ],
+ 2011: [ 2, 5, /* to */ 2, 12 ],
+ 2012: [ 2, 4, /* to */ 2, 11 ],
+ 2013: [ 2, 1, /* to */ 2, 8 ],
+ 2014: [ 2, 1, /* to */ 2, 12 ],
+ 2015: [ 2, 2, /* to */ 2, 14 ],
+ 2016: [ 2, 1, /* to */ 2, 10 ],
+ 2017: [ 2, 4, /* to */ 2, 11 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 29, /* to */ 4, 9 ],
+ 2011: [ 4, 18, /* to */ 4, 27 ],
+ 2012: [ 4, 2, /* to */ 4, 7 ],
+ 2013: [ 3, 25, /* to */ 3, 30 ],
+ 2014: [ 4, 14, /* to */ 4, 17 ],
+ 2015: [ 4, 2, /* to */ 4, 2 ],
+ 2016: [ 3, 24, /* to */ 3, 24 ],
+ 2017: [ 4, 10, /* to */ 4, 13 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 14, /* to */ 5, 22 ],
+ 2011: [ 6, 14, /* to */ 6, 18 ],
+ 2012: [ 5, 18, /* to */ 5, 25 ],
+ 2013: [ 5, 10, /* to */ 5, 18 ],
+ 2014: [ 5, 30, /* to */ 6, 7 ],
+ 2015: [ 5, 15, /* to */ 5, 23 ],
+ 2016: [ 5, 6, /* to */ 5, 14 ],
+ 2017: [ 5, 26, /* to */ 5, 26 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 6, 24, /* to */ 8, 4 ],
+ 2011: [ 7, 11, /* to */ 8, 24 ],
+ 2012: [ 7, 23, /* to */ 9, 5 ],
+ 2013: [ 7, 15, /* to */ 8, 28 ],
+ 2014: [ 7, 21, /* to */ 9, 3 ],
+ 2015: [ 7, 13, /* to */ 8, 26 ],
+ 2016: [ 6, 27, /* to */ 8, 10 ],
+ 2017: [ 6, 26, /* to */ 8, 9 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 18, /* to */ 10, 23 ],
+ 2011: [ 10, 17, /* to */ 10, 22 ],
+ 2012: [ 10, 29, /* to */ 11, 2 ],
+ 2013: [ 10, 21, /* to */ 10, 25 ],
+ 2014: [ 10, 27, /* to */ 10, 30 ],
+ 2015: [ 10, 17, /* to */ 10, 24 ],
+ 2016: [ 10, 4, /* to */ 10, 15 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 22, /* to */ 1, 5 ],
+ 2011: [ 12, 22, /* to */ 1, 7 ],
+ 2012: [ 12, 19, /* to */ 1, 4 ],
+ 2013: [ 12, 21, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 5 ],
+ 2015: [ 12, 21, /* to */ 1, 5 ],
+ 2016: [ 12, 19, /* to */ 1, 2 ],
+ },
+ ],
+ },
+ 'Rheinland-Pfalz': {
+ 'SH': [
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 26, /* to */ 4, 9 ],
+ 2011: [ 4, 18, /* to */ 4, 29 ],
+ 2012: [ 3, 29, /* to */ 4, 13 ],
+ 2013: [ 3, 20, /* to */ 4, 5 ],
+ 2014: [ 4, 11, /* to */ 4, 25 ],
+ 2015: [ 3, 26, /* to */ 4, 10 ],
+ 2016: [ 3, 18, /* to */ 4, 1 ],
+ 2017: [ 4, 10, /* to */ 4, 21 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 5, /* to */ 8, 13 ],
+ 2011: [ 6, 27, /* to */ 8, 5 ],
+ 2012: [ 7, 2, /* to */ 8, 10 ],
+ 2013: [ 7, 8, /* to */ 8, 16 ],
+ 2014: [ 7, 28, /* to */ 9, 5 ],
+ 2015: [ 7, 27, /* to */ 9, 4 ],
+ 2016: [ 7, 18, /* to */ 8, 26 ],
+ 2017: [ 7, 3, /* to */ 8, 11 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 11, /* to */ 10, 22 ],
+ 2011: [ 10, 4, /* to */ 10, 14 ],
+ 2012: [ 10, 1, /* to */ 10, 12 ],
+ 2013: [ 10, 4, /* to */ 10, 18 ],
+ 2014: [ 10, 20, /* to */ 10, 31 ],
+ 2015: [ 10, 19, /* to */ 10, 30 ],
+ 2016: [ 10, 10, /* to */ 10, 21 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 1, 7 ],
+ 2011: [ 12, 22, /* to */ 1, 6 ],
+ 2012: [ 12, 20, /* to */ 1, 4 ],
+ 2013: [ 12, 23, /* to */ 1, 7 ],
+ 2014: [ 12, 22, /* to */ 1, 7 ],
+ 2015: [ 12, 23, /* to */ 1, 8 ],
+ 2016: [ 12, 22, /* to */ 1, 6 ],
+ },
+ ],
+ },
+ 'Brandenburg': {
+ 'SH': [
+ {
+ name: 'Winterferien',
+ 2010: [ 2, 1, /* to */ 2, 6 ],
+ 2011: [ 1, 31, /* to */ 2, 5 ],
+ 2012: [ 1, 30, /* to */ 2, 4 ],
+ 2013: [ 2, 4, /* to */ 2, 9 ],
+ 2014: [ 2, 3, /* to */ 2, 8 ],
+ 2015: [ 2, 2, /* to */ 2, 7 ],
+ 2016: [ 2, 1, /* to */ 2, 6 ],
+ 2017: [ 1, 30, /* to */ 2, 4 ],
+ },
+ {
+ name: 'Osterferien',
+ 2010: [ 3, 31, /* to */ 4, 10 ],
+ 2011: [ 4, 20, /* to */ 4, 30 ],
+ 2012: [ 4, 4, /* to */ 4, 14, 4, 30, /* to */ 4, 30 ],
+ 2013: [ 3, 27, /* to */ 4, 6 ],
+ 2014: [ 4, 16, /* to */ 4, 26, 5, 2, /* to */ 5, 2 ],
+ 2015: [ 4, 1, /* to */ 4, 11 ],
+ 2016: [ 3, 23, /* to */ 4, 2 ],
+ 2017: [ 4, 12, /* to */ 4, 22 ],
+ },
+ {
+ name: 'Pfingstferien',
+ 2010: [ 5, 14, /* to */ 5, 14 ],
+ 2011: [ 6, 3, /* to */ 6, 3 ],
+ 2012: [ 5, 18, /* to */ 5, 18 ],
+ 2013: [ 5, 10, /* to */ 5, 10 ],
+ 2014: [ 5, 30, /* to */ 5, 30 ],
+ 2015: [ 5, 15, /* to */ 5, 15 ],
+ 2016: [ 5, 6, /* to */ 5, 6, 5, 17, /* to */ 5, 17 ],
+ 2017: [ 5, 26, /* to */ 5, 26 ],
+ },
+ {
+ name: 'Sommerferien',
+ 2010: [ 7, 8, /* to */ 8, 21 ],
+ 2011: [ 6, 30, /* to */ 8, 13 ],
+ 2012: [ 6, 21, /* to */ 8, 3 ],
+ 2013: [ 6, 20, /* to */ 8, 2 ],
+ 2014: [ 7, 10, /* to */ 8, 22 ],
+ 2015: [ 7, 16, /* to */ 8, 28 ],
+ 2016: [ 7, 21, /* to */ 9, 3 ],
+ 2017: [ 7, 20, /* to */ 9, 1 ],
+ },
+ {
+ name: 'Herbstferien',
+ 2010: [ 10, 11, /* to */ 10, 23 ],
+ 2011: [ 10, 4, /* to */ 10, 14 ],
+ 2012: [ 10, 1, /* to */ 10, 13 ],
+ 2013: [ 9, 30, /* to */ 10, 12, 11, 1, /* to */ 11, 1 ],
+ 2014: [ 10, 20, /* to */ 11, 1 ],
+ 2015: [ 10, 19, /* to */ 10, 30 ],
+ 2016: [ 10, 17, /* to */ 10, 28 ],
+ },
+ {
+ name: 'Weihnachtsferien',
+ 2010: [ 12, 23, /* to */ 1, 1 ],
+ 2011: [ 12, 23, /* to */ 1, 3 ],
+ 2012: [ 12, 24, /* to */ 1, 4 ],
+ 2013: [ 12, 23, /* to */ 1, 3 ],
+ 2014: [ 12, 22, /* to */ 1, 2 ],
+ 2015: [ 12, 23, /* to */ 1, 2 ],
+ 2016: [ 12, 23, /* to */ 1, 3 ],
+ },
+ ],
+ },
+ },
+ 'at': {
+ 'PH': { // http://de.wikipedia.org/wiki/Feiertage_in_%C3%96sterreich
+ 'Neujahrstag' : [ 1, 1 ],
+ 'Heilige Drei Könige' : [ 1, 6 ],
+ // 'Josef' : [ 3, 19, [ 'Kärnten', 'Steiermark', 'Tirol', 'Vorarlberg' ] ],
+ // 'Karfreitag' : [ 'easter', -2 ],
+ 'Ostermontag' : [ 'easter', 1 ],
+ 'Staatsfeiertag' : [ 5, 1 ],
+ // 'Florian' : [ 5, 4, [ 'Oberösterreich' ] ],
+ 'Christi Himmelfahrt' : [ 'easter', 39 ],
+ 'Pfingstmontag' : [ 'easter', 50 ],
+ 'Fronleichnam' : [ 'easter', 60 ],
+ 'Mariä Himmelfahrt' : [ 8, 15 ],
+ // 'Rupert' : [ 9, 24, [ 'Salzburg' ] ],
+ // 'Tag der Volksabstimmung' : [ 10, 10, [ 'Kärnten' ] ],
+ 'Nationalfeiertag' : [ 10, 26 ],
+ 'Allerheiligen' : [ 11, 1 ],
+ // 'Martin' : [ 11, 11, [ 'Burgenland' ] ],
+ // 'Leopold' : [ 11, 15, [ 'Niederösterreich', 'Wien' ] ],
+ 'Mariä Empfängnis' : [ 12, 8 ],
+ // 'Heiliger Abend' : [ 12, 24 ],
+ 'Christtag' : [ 12, 25 ],
+ 'Stefanitag' : [ 12, 26 ],
+ // 'Silvester' : [ 12, 31 ],
+ },
+ },
+ };
+
+ //----------------------------------------------------------------------------
+ // error correction
+ // Taken form http://www.netzwolf.info/j/osm/time_domain.js
+ // Credits go to Netzwolf
+ //
+ // Key to word_error_correction is the token name except wrong_words
+ //----------------------------------------------------------------------------
+ var word_error_correction = {
+ wrong_words: {
+ 'Assuming "<ok>" for "<ko>"': {
+ spring: 'Mar-May',
+ summer: 'Jun-Aug',
+ autumn: 'Sep-Nov',
+ winter: 'Dec-Feb',
+ }, 'Bitte benutze die englische Schreibweise "<ok>" für "<ko>".': {
+ sommer: 'summer',
+ }, 'Bitte benutze "<ok>" für "<ko>". Beispiel: "Mo-Fr 08:00-12:00; Tu off"': {
+ ruhetag: 'off',
+ ruhetage: 'off',
+ geschlossen: 'off',
+ }, 'Assuming "<ok>" for "<ko>". Please avoid using "workday": http://wiki.openstreetmap.org/wiki/Talk:Key:opening_hours#need_syntax_for_holidays_and_workingdays': {
+ // // Used around 260 times but the problem is, that work day might be different in other countries.
+ wd: 'Mo-Fr',
+ weekday: 'Mo-Fr',
+ weekdays: 'Mo-Fr',
+ }, 'Please ommit "<ko>" or use a colon instead: "12:00-14:00".': {
+ h: '',
+ }, 'Please ommit "<ko>".': {
+ season: '',
+ hs: '',
+ hrs: '',
+ hours: '',
+ }, 'Please ommit "<ko>". You might want to express open end which can be specified as "12:00+" for example': {
+ from: '',
+ }, 'Please use notation "<ok>" for "<ko>". If the times are unsure or vary consider a comment e.g. 12:00-14:00 "only on sunshine".': {
+ '~': '-',
+ '～': '-',
+ }, 'Please use notation "<ok>" for "<ko>".': {
+ '–': '-',
+ 'ー': '-',
+ to: '-',
+ till: '-',
+ and: ',',
+ '&': ',',
+ '：': ':',
+ daily: 'Mo-Su',
+ everyday: 'Mo-Su',
+ always: '24/7',
+ nonstop: '24/7',
+ midnight: '00:00',
+ holiday: 'PH',
+ holidays: 'PH',
+ // summerholiday: 'SH',
+ // summerholidays: 'SH',
+ }, 'Please use time format in 24 hours notation ("<ko>").': {
+ pm: '',
+ am: '',
+ }, 'Bitte verzichte auf "<ko>".': {
+ uhr: '',
+ }, 'Bitte verzichte auf "<ko>". Sie möchten eventuell eine Öffnungszeit ohne vorgegebenes Ende angeben. Beispiel: "12:00+"': {
+ ab: '',
+ von: '',
+ }, 'Bitte benutze die Schreibweise "<ok>" für "<ko>".': {
+ bis: '-',
+ 'täglich': 'Mo-Su',
+ }, 'Bitte benutze die Schreibweise "<ok>" als Ersatz für "und" bzw. "u.".': {
+ und: ',',
+ u: ',',
+ }, 'Bitte benutze die englische Abkürzung "<ok>" für "<ko>".': {
+ feiertag: 'PH',
+ feiertags: 'PH',
+ feiertage: 'PH',
+ feiertagen: 'PH'
+ }, 'S\'il vous plaît utiliser "<ok>" pour "<ko>".': {
+ 'fermé': 'off',
+ 'et': ',',
+ 'à': '-',
+ }, 'Neem de engelse afkorting "<ok>" voor "<ko>" alstublieft.': {
+ feestdag: 'PH',
+ feestdagen: 'PH',
+ }
+ },
+
+ month: {
+ 'default': {
+ jan: 0,
+ feb: 1,
+ mar: 2,
+ apr: 3,
+ may: 4,
+ jun: 5,
+ jul: 6,
+ aug: 7,
+ sep: 8,
+ oct: 9,
+ nov: 10,
+ dec: 11,
+ }, 'Please use the English abbreviation "<ok>" for "<ko>".': {
+ january: 0,
+ february: 1,
+ march: 2,
+ april: 3,
+ // may: 4,
+ june: 5,
+ july: 6,
+ august: 7,
+ september: 8,
+ sept: 8,
+ october: 9,
+ november: 10,
+ december: 11,
+ }, 'Bitte benutze die englische Abkürzung "<ok>" für "<ko>".': {
+ januar: 0,
+ februar: 1,
+ 'märz': 2,
+ maerz: 2,
+ mai: 4,
+ juni: 5,
+ juli: 6,
+ okt: 9,
+ oktober: 9,
+ dez: 11,
+ dezember: 11,
+ }, 'S\'il vous plaît utiliser l\'abréviation "<ok>" pour "<ko>".': {
+ janvier: 0,
+ février: 1,
+ fév: 1,
+ mars: 2,
+ avril: 3,
+ avr: 3,
+ mai: 4,
+ juin: 5,
+ juillet: 6,
+ août: 7,
+ aoû: 7,
+ septembre: 8,
+ octobre: 9,
+ novembre: 10,
+ décembre: 11,
+ }, 'Neem de engelse afkorting "<ok>" voor "<ko>" alstublieft.': {
+ januari: 0,
+ februari: 1,
+ maart: 2,
+ mei: 4,
+ augustus: 7,
+ }
+ },
+
+ weekday: { // good source: http://www.omniglot.com/language/time/days.htm
+ 'default': {
+ su: 0,
+ mo: 1,
+ tu: 2,
+ we: 3,
+ th: 4,
+ fr: 5,
+ sa: 6,
+ }, 'Assuming "<ok>" for "<ko>"': {
+ m: 1,
+ w: 3,
+ f: 5,
+ }, 'Please use the abbreviation "<ok>" for "<ko>".': {
+ sun: 0,
+ sunday: 0,
+ sundays: 0,
+ mon: 1,
+ monday: 1,
+ mondays: 1,
+ tue: 2,
+ tuesday: 2,
+ tuesdays: 2,
+ wed: 3,
+ wednesday: 3,
+ wednesdays: 3,
+ thu: 4,
+ thursday: 4,
+ thursdays: 4,
+ fri: 5,
+ friday: 5,
+ fridays: 5,
+ sat: 6,
+ saturday: 6,
+ saturdays: 6,
+ }, 'Bitte benutze die englische Abkürzung "<ok>" für "<ko>". Could also mean Saturday in Polish …': {
+ so: 0,
+ }, 'Bitte benutze die englische Abkürzung "<ok>" für "<ko>".': {
+ son: 0,
+ sonntag: 0,
+ sonntags: 0,
+ montag: 1,
+ montags: 1,
+ di: 2,
+ die: 2,
+ dienstag: 2,
+ dienstags: 2,
+ mi: 3,
+ mit: 3,
+ mittwoch: 3,
+ mittwochs: 3,
+ 'do': 4,
+ don: 4,
+ donnerstag: 4,
+ donnerstags: 4,
+ fre: 5,
+ freitag: 5,
+ freitags: 5,
+ sam: 6,
+ samstag: 6,
+ samstags: 6,
+ }, 'S\'il vous plaît utiliser l\'abréviation "<ok>" pour "<ko>".': {
+ dim: 0,
+ dimanche: 0,
+ lu: 1,
+ lun: 1,
+ lundi: 1,
+ mardi: 2,
+ mer: 3,
+ mercredi: 3,
+ je: 4,
+ jeu: 4,
+ jeudi: 4,
+ ve: 5,
+ ven: 5,
+ vendredi: 5,
+ samedi: 6,
+ }, 'Neem de engelse afkorting "<ok>" voor "<ko>" alstublieft.': {
+ zo: 0,
+ zon: 0,
+ zontag: 0,
+ maandag: 1,
+ din: 2,
+ dinsdag: 2,
+ wo: 3,
+ woe: 3,
+ woensdag: 3,
+ donderdag: 4,
+ vr: 5,
+ vri: 5,
+ vrijdag: 5,
+ za: 6,
+ zat: 6,
+ zaterdag: 6,
+ }, 'Please use the English abbreviation "<ok>" for "<ko>".': { // FIXME: Translate to Czech.
+ 'neděle': 0,
+ 'ne': 0,
+ 'pondělí': 1,
+ 'po': 1,
+ 'úterý': 2,
+ 'út': 2,
+ 'středa': 3,
+ 'st': 3,
+ 'čtvrtek': 4,
+ 'čt': 4,
+ 'pátek': 5,
+ 'pá': 5,
+ 'sobota': 6,
+ }, 'Please use the English abbreviation "<ok>" for "<ko>".': {
+ // Spanish.
+ 'martes': 0,
+ 'miércoles': 1,
+ 'jueves': 2,
+ 'viernes': 3,
+ 'sábado': 4,
+ 'domingo': 5,
+ 'lunes': 6,
+ // Indonesian.
+ 'selasa': 0,
+ 'rabu': 1,
+ 'kami': 2,
+ 'jumat': 3,
+ 'sabtu': 4,
+ 'minggu': 5,
+ 'senin': 6,
+ // Swedish
+ 'söndag': 0,
+ 'måndag': 1,
+ ma: 1,
+ 'tisdag': 2,
+ 'onsdag': 3,
+ 'torsdag': 4,
+ 'fredag': 5,
+ 'lördag': 6,
+ // Polish
+ 'niedziela': 0, 'niedz': 0, 'n': 0, 'ndz': 0,
+ 'poniedziałek': 1, 'poniedzialek': 1, 'pon': 1, 'pn': 1,
+ 'wtorek': 2, 'wt': 2,
+ 'środa': 3, 'sroda': 3, 'śr': 3, 'sr': 3,
+ 'czwartek': 4, 'czw': 4, 'cz': 4,
+ 'piątek': 5, 'piatek': 5, 'pt': 5,
+ 'sobota': 6, 'sob': 6, // 'so': 6 // abbreviation also used in German
+ },
+ },
+
+ timevar: { // Special time variables which actual value depends on the date and the position of the facility.
+ 'default': {
+ sunrise: 'sunrise',
+ sunset: 'sunset',
+ dawn: 'dawn',
+ dusk: 'dusk',
+ }, 'Please use notation "<ok>" for "<ko>".': {
+ sundown: 'sunset',
+ }, 'Bitte benutze die Schreibweise "<ok>" für "<ko>".': {
+ 'morgendämmerung': 'dawn',
+ 'abenddämmerung': 'dusk',
+ sonnenaufgang: 'sunrise',
+ sonnenuntergang: ',',
+ },
+ },
+
+ 'event': { // variable events
+ 'default': {
+ easter: 'easter',
+ }, 'Bitte benutze die Schreibweise "<ok>" für "<ko>".': {
+ ostern: 'easter',
+ },
+ },
+ };
+
+ if (typeof exports === 'object') {
+ // For nodejs
+ var SunCalc = require('suncalc');
+ module.exports = factory(SunCalc, holidays, word_error_correction);
+ } else {
+ // For browsers
+ root.opening_hours = factory(root.SunCalc, holidays, word_error_correction);
+ }
+}(this, function (SunCalc, holidays, word_error_correction) {
+ return function(value, nominatiomJSON, oh_mode) {
+ var word_value_replacement = { // if the correct values can not be calculated
+ dawn : 60 * 5 + 30,
+ sunrise : 60 * 6,
+ sunset : 60 * 18,
+ dusk : 60 * 18 + 30,
+ };
+ var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
+ var weekdays = ['Su','Mo','Tu','We','Th','Fr','Sa'];
+ var default_prettify_conf = {
+ 'leading_zero_hour': true, // enforce leading zero
+ 'one_zero_if_hour_zero': false, // only one zero "0" if hour is zero "0"
+ 'leave_off_closed': true, // leave keywords of and closed as is
+ 'keyword_for_off_closed': 'off', // use given keyword instead of "off" or "closed"
+ 'block_sep_string': ' ', // separate blocks by string
+ 'print_semicolon': true, // print token which separates normal blocks
+ 'leave_weekday_sep_one_day_betw': true, // use the separator (either "," or "-" which is used to separate days which follow to each other like Sa,Su or Su-Mo
+ 'sep_one_day_between': ',' // separator which should be used
+ };
+
+ var minutes_in_day = 60 * 24;
+ var msec_in_day = 1000 * 60 * minutes_in_day;
+ var msec_in_week = msec_in_day * 7;
+
+ //======================================================================
+ // Constructor - entry to parsing code
+ //======================================================================
+ // Terminology:
+ //
+ // Mo-Fr 10:00-11:00; Th 10:00-12:00
+ // \_____block_____/ \____block___/
+ //
+ // The README refers to blocks as rules, which is more intuitive but less clear.
+ // Because of that only the README uses the term rule in that context.
+ // In all internal parts of this project, the term block is used.
+ //
+ // Mo-Fr Jan 10:00-11:00
+ // \__/ \_/ \_________/
+ // selectors (left to right: weekday, month, time)
+ //
+ // Logic:
+ // - Tokenize
+ // Foreach block:
+ // - Run toplevel (block) parser
+ // - Which calls subparser for specific selector types
+ // - Which produce selector functions
+
+
+ // Evaluate additional information which can be given. They are
+ // required to reasonably calculate 'sunrise' and so on and to use the
+ // correct holidays.
+ var location_cc, location_state, lat, lon;
+ if (typeof nominatiomJSON != 'undefined') {
+ if (typeof nominatiomJSON.address != 'undefined' &&
+ typeof nominatiomJSON.address.state != 'undefined') { // country_code will be tested later …
+ location_cc = nominatiomJSON.address.country_code;
+ location_state = nominatiomJSON.address.state;
+ }
+
+ if (typeof nominatiomJSON.lon != 'undefined') { // lat will be tested later …
+ lat = nominatiomJSON.lat;
+ lon = nominatiomJSON.lon;
+ }
+ }
+
+ // 0: time ranges (opening_hours, lit, …) default
+ // 1: points in time (collection_times, service_times, …)
+ // 2: both (time ranges and points in time)
+ if (typeof oh_mode == 'undefined') {
+ oh_mode = 0;
+ } else if (!(typeof oh_mode == 'number' && (oh_mode == 0 || oh_mode == 1 || oh_mode == 2))) {
+ throw 'The third constructor parameter is oh_mode and must be a number (0, 1 or 2)'
+ }
+
+ if (value.match(/^(\s*;?\s*)+$/))
+ throw 'Value contains nothing meaningful which can be parsed';
+
+ var parsing_warnings = [];
+ var done_with_warnings = false; // The functions which throw warnings can be called multiple times.
+ var has_token = {};
+ var tokens = tokenize(value);
+ // console.log(JSON.stringify(tokens, null, '\t'));
+ var prettified_value = '';
+ var used_subparsers = {}; // Used sub parsers for one block, will be asdreset for each block. Declared as global, because it is manipulation inside much sub parsers.
+ var week_stable = true;
+
+ var blocks = [];
+
+ for (var nblock = 0; nblock < tokens.length; nblock++) {
+ if (tokens[nblock][0].length == 0) continue;
+ // Block does contain nothing useful e.g. second block of '10:00-12:00;' (empty) which needs to be handled.
+
+ var continue_at = 0;
+ do {
+ if (continue_at == tokens[nblock][0].length) break;
+ // Additional block does contain nothing useful e.g. second block of '10:00-12:00,' (empty) which needs to be handled.
+
+ var selectors = {
+ // Time selectors
+ time: [],
+
+ // Temporary array of selectors from time wrapped to the next day
+ wraptime: [],
+
+ // Date selectors
+ weekday: [],
+ holiday: [],
+ week: [],
+ month: [],
+ monthday: [],
+ year: [],
+
+ // Array with non-empty date selector types, with most optimal ordering
+ date: [],
+
+ fallback: tokens[nblock][1],
+ additional: continue_at ? true : false,
+ meaning: true,
+ unknown: false,
+ comment: undefined,
+ build_from_token_block: undefined,
+ };
+
+ selectors.build_from_token_block = [ nblock, continue_at ];
+ continue_at = parseGroup(tokens[nblock][0], continue_at, selectors, nblock);
+ if (typeof continue_at == 'object')
+ continue_at = continue_at[0];
+ else
+ continue_at = 0;
+
+ if (selectors.year.length > 0)
+ selectors.date.push(selectors.year);
+ if (selectors.holiday.length > 0)
+ selectors.date.push(selectors.holiday);
+ if (selectors.month.length > 0)
+ selectors.date.push(selectors.month);
+ if (selectors.monthday.length > 0)
+ selectors.date.push(selectors.monthday);
+ if (selectors.week.length > 0)
+ selectors.date.push(selectors.week);
+ if (selectors.weekday.length > 0)
+ selectors.date.push(selectors.weekday);
+
+ blocks.push(selectors);
+
+ // this handles selectors with time ranges wrapping over midnight (e.g. 10:00-02:00)
+ // it generates wrappers for all selectors and creates a new block
+ if (selectors.wraptime.length > 0) {
+ var wrapselectors = {
+ time: selectors.wraptime,
+ date: [],
+
+ meaning: selectors.meaning,
+ unknown: selectors.unknown,
+ comment: selectors.comment,
+
+ wrapped: true,
+ };
+
+ for (var dselg = 0; dselg < selectors.date.length; dselg++) {
+ wrapselectors.date.push([]);
+ for (var dsel = 0; dsel < selectors.date[dselg].length; dsel++) {
+ wrapselectors.date[wrapselectors.date.length-1].push(
+ generateDateShifter(selectors.date[dselg][dsel], -msec_in_day)
+ );
+ }
+ }
+
+ blocks.push(wrapselectors);
+ }
+ } while (continue_at)
+ }
+
+ // Tokenization function: Splits string into parts.
+ // output: array of arrays of pairs [content, type]
+ function tokenize(value) {
+ var all_tokens = new Array();
+ var curr_block_tokens = new Array();
+
+ var last_block_fallback_terminated = false;
+
+ while (value != '') {
+ var tmp;
+ if (tmp = value.match(/^(?:week\b|open|unknown)/i)) {
+ // reserved word
+ curr_block_tokens.push([tmp[0].toLowerCase(), tmp[0].toLowerCase(), value.length ]);
+ value = value.substr(tmp[0].length);
+ } else if (tmp = value.match(/^24\/7/i)) {
+ // reserved word
+ has_token[tmp[0]] = true;
+ curr_block_tokens.push([tmp[0], tmp[0], value.length ]);
+ value = value.substr(tmp[0].length);
+ } else if (tmp = value.match(/^(?:off|closed)/i)) {
+ // reserved word
+ curr_block_tokens.push([tmp[0].toLowerCase(), 'closed', value.length ]);
+ value = value.substr(tmp[0].length);
+ } else if (tmp = value.match(/^(?:PH|SH)/i)) {
+ // special day name (holidays)
+ curr_block_tokens.push([tmp[0].toUpperCase(), 'holiday', value.length ]);
+ value = value.substr(2);
+ } else if (tmp = value.match(/^days?/i)) {
+ curr_block_tokens.push([tmp[0].toLowerCase(), 'calcday', value.length ]);
+ value = value.substr(tmp[0].length);
+ } else if (tmp = value.match(/^(&|–|ー|~|～|：|[a-zA-ZäÄàÀéÉ]+\b)\.?/i)) {
+ // Handle all remaining words with error tolerance
+ var correct_val = returnCorrectWordOrToken(tmp[1].toLowerCase(), value.length);
+ if (typeof correct_val == 'object') {
+ curr_block_tokens.push([ correct_val[0], correct_val[1], value.length ]);
+ value = value.substr(tmp[0].length);
+ } else if (typeof correct_val == 'string') {
+ value = correct_val + value.substr(tmp[0].length);
+ } else {
+ // other single-character tokens
+ curr_block_tokens.push([value[0].toLowerCase(), value[0].toLowerCase(), value.length - 1 ]);
+ value = value.substr(1);
+ }
+ } else if (tmp = value.match(/^\d+/)) {
+ // number
+ if (tmp[0] > 1900) // assumed to be a year number
+ curr_block_tokens.push([tmp[0], 'year', value.length ]);
+ else
+ curr_block_tokens.push([+tmp[0], 'number', value.length ]);
+ value = value.substr(tmp[0].length);
+ } else if (tmp = value.match(/^"([^"]*)"/)) {
+ // comment
+ curr_block_tokens.push([tmp[1], 'comment', value.length ]);
+ value = value.substr(tmp[0].length);
+ } else if (value.match(/^;/)) {
+ // semicolon terminates block
+ // next tokens belong to a new block
+ all_tokens.push([ curr_block_tokens, last_block_fallback_terminated, value.length ]);
+ value = value.substr(1);
+
+ curr_block_tokens = [];
+ last_block_fallback_terminated = false;
+ } else if (value.match(/^\|\|/)) {
+ // || terminates block
+ // next tokens belong to a fallback block
+ if (curr_block_tokens.length == 0)
+ throw formatWarnErrorMessage(-1, value.length - 2, 'Rule before fallback rule does not contain anything useful');
+
+ all_tokens.push([ curr_block_tokens, last_block_fallback_terminated, value.length ]);
+ value = value.substr(2);
+
+ curr_block_tokens = [];
+ last_block_fallback_terminated = true;
+ } else if (value.match(/^(?:␣|\s)/)) {
+ // Using "␣" as space is not expected to be a normal mistake. Just ignore it to make using taginfo easier.
+ value = value.substr(1);
+ } else if (tmp = value.match(/^\s+/)) {
+ // whitespace is ignored
+ value = value.substr(tmp[0].length);
+ } else if (value.match(/^[:.]/)) {
+ // time separator
+ if (value[0] == '.' && !done_with_warnings)
+ parsing_warnings.push([ -1, value.length - 1, 'Please use ":" as hour/minute-separator' ]);
+ curr_block_tokens.push([ ':', 'timesep', value.length ]);
+ value = value.substr(1);
+ } else {
+ // other single-character tokens
+ curr_block_tokens.push([value[0].toLowerCase(), value[0].toLowerCase(), value.length ]);
+ value = value.substr(1);
+ }
+ }
+
+ all_tokens.push([ curr_block_tokens, last_block_fallback_terminated ]);
+
+ return all_tokens;
+ }
+
+ // error correction/tolerance
+ function returnCorrectWordOrToken(word, value_length) {
+ for (var token_name in word_error_correction) {
+ for (var comment in word_error_correction[token_name]) {
+ for (var old_val in word_error_correction[token_name][comment]) {
+ if (old_val == word) {
+ var val = word_error_correction[token_name][comment][old_val];
+ if (token_name == 'wrong_words' && !done_with_warnings) {
+ parsing_warnings.push([ -1, value_length - old_val.length,
+ comment.replace(/<ko>/, old_val).replace(/<ok>/, val) ]);
+ return val;
+ } else if (comment != 'default'){
+ var correct_abbr;
+ for (correct_abbr in word_error_correction[token_name]['default']) {
+ if (word_error_correction[token_name]['default'][correct_abbr] == val)
+ break;
+ }
+ if (token_name != 'timevar') { // normally written in lower case
+ correct_abbr = correct_abbr.charAt(0).toUpperCase() + correct_abbr.slice(1);
+ }
+ if (!done_with_warnings)
+ parsing_warnings.push([ -1, value_length - old_val.length,
+ comment.replace(/<ko>/, old_val).replace(/<ok>/, correct_abbr) ]);
+ }
+ return [ val, token_name ];
+ }
+ }
+ }
+ }
+ }
+
+ function getWarnings(it) {
+
+ if (typeof it == 'object') { // getWarnings was called in a state without critical errors. We can do extended tests.
+
+ // Check if 24/7 is used and it does not mean 24/7 because there are other rules. This can be avoided.
+ var has_advanced = it.advance();
+
+ if (has_advanced === true && has_token['24/7'] && !done_with_warnings) {
+ parsing_warnings.push([ -1, 0, 'You used 24/7 in a way that is probably not interpreted as "24 hours 7 days a week".'
+ // Probably because of: "24/7; 12:00-14:00 open", ". Needs extra testing.
+ + ' For correctness you might want to use "open" or "closed"'
+ + ' for this rule and then write your exceptions which should achieve the same goal and is more clear'
+ + ' e.g. "open; Mo 12:00-14:00 off".']);
+ }
+ }
+
+ var warnings = [];
+ for (var i = 0; i < parsing_warnings.length; i++) {
+ warnings.push( formatWarnErrorMessage(parsing_warnings[i][0], parsing_warnings[i][1], parsing_warnings[i][2]) );
+ }
+ return warnings;
+ }
+
+ // Function to check token array for specific pattern
+ function matchTokens(tokens, at /*, matches... */) {
+ if (at + arguments.length - 2 > tokens.length)
+ return false;
+ for (var i = 0; i < arguments.length - 2; i++) {
+ if (tokens[at + i][1] !== arguments[i + 2])
+ return false;
+ }
+
+ return true;
+ }
+
+ function generateDateShifter(func, shift) {
+ return function(date) {
+ var res = func(new Date(date.getTime() + shift));
+
+ if (typeof res[1] === 'undefined')
+ return res;
+ return [ res[0], new Date(res[1].getTime() - shift) ];
+ }
+ }
+
+ //======================================================================
+ // Top-level parser
+ //======================================================================
+ function parseGroup(tokens, at, selectors, nblock, conf) {
+ var prettified_group_value = '';
+ used_subparsers = { 'time ranges': [ ] };
+
+ // console.log(tokens); // useful for debugging of tokenize
+ while (at < tokens.length) {
+ var old_at = at;
+ // console.log('Parsing at position', at +':', tokens[at]);
+ if (matchTokens(tokens, at, 'weekday')) {
+ at = parseWeekdayRange(tokens, at, selectors);
+ } else if (matchTokens(tokens, at, '24/7')) {
+ // selectors.time.push(function(date) { return [true]; });
+ // Not needed. If there is no selector it automatically matches everything.
+ at++;
+ } else if (matchTokens(tokens, at, 'holiday')) {
+ if (matchTokens(tokens, at+1, ','))
+ at = parseHoliday(tokens, at, selectors, true);
+ else
+ at = parseHoliday(tokens, at, selectors, false);
+ week_stable = false;
+ } else if (matchTokens(tokens, at, 'month', 'number')
+ || matchTokens(tokens, at, 'month', 'weekday')
+ || matchTokens(tokens, at, 'year', 'month', 'number')
+ || matchTokens(tokens, at, 'year', 'event')
+ || matchTokens(tokens, at, 'event')) {
+ at = parseMonthdayRange(tokens, at, nblock);
+ week_stable = false;
+ } else if (matchTokens(tokens, at, 'year')) {
+ at = parseYearRange(tokens, at);
+ week_stable = false;
+ } else if (matchTokens(tokens, at, 'month')) {
+ at = parseMonthRange(tokens, at);
+ // week_stable = false; // decided based on actual values
+ } else if (matchTokens(tokens, at, 'week')) {
+ at = parseWeekRange(tokens, at + 1);
+ week_stable = false;
+
+ // if (prettified_group_value[-1] != ' ')
+ // prettified_group_value = prettified_group_value.substring(0, prettified_group_value.length - 1);
+ } else if (at != 0 && at != tokens.length - 1 && tokens[at][0] == ':') {
+ // Ignore colon if they appear somewhere else than as time separator.
+ // Except the start or end of the value.
+ // This provides compatibility with the syntax proposed by Netzwolf:
+ // http://wiki.openstreetmap.org/wiki/Key:opening_hours:specification
+ if (!done_with_warnings && matchTokens(tokens, at-1, 'weekday') || matchTokens(tokens, at-1, 'holiday'))
+ parsing_warnings.push([nblock, at, 'Please don’t use ":" after ' + tokens[at-1][1] + '.']);
+
+ if (prettified_group_value[-1] != ' ')
+ prettified_group_value = prettified_group_value.substring(0, prettified_group_value.length - 1);
+ at++;
+ } else if (matchTokens(tokens, at, 'number', 'timesep')
+ || matchTokens(tokens, at, 'timevar')
+ || matchTokens(tokens, at, '(', 'timevar')
+ || matchTokens(tokens, at, 'number', '-')) {
+ at = parseTimeRange(tokens, at, selectors);
+
+ used_subparsers['time ranges'].push(at);
+ } else if (matchTokens(tokens, at, 'closed')) {
+ selectors.meaning = false;
+ at++;
+ if (matchTokens(tokens, at, ',')) // additional block
+ at = [ at + 1 ];
+
+ if (typeof used_subparsers['state keywords'] != 'object')
+ used_subparsers['state keywords'] = [ at ];
+ else
+ used_subparsers['state keywords'].push(at);
+ } else if (matchTokens(tokens, at, 'open')) {
+ selectors.meaning = true;
+ at++;
+ if (matchTokens(tokens, at, ',')) // additional block
+ at = [ at + 1 ];
+
+ if (typeof used_subparsers['state keywords'] != 'object')
+ used_subparsers['state keywords'] = [ at ];
+ else
+ used_subparsers['state keywords'].push(at);
+ } else if (matchTokens(tokens, at, 'unknown')) {
+ selectors.meaning = false;
+ selectors.unknown = true;
+ at++;
+ if (matchTokens(tokens, at, ',')) // additional block
+ at = [ at + 1 ];
+
+ if (typeof used_subparsers['state keywords'] != 'object')
+ used_subparsers['state keywords'] = [ at ];
+ else
+ used_subparsers['state keywords'].push(at);
+ } else if (matchTokens(tokens, at, 'comment')) {
+ selectors.comment = tokens[at][0];
+ if (at > 0) {
+ if (!matchTokens(tokens, at - 1, 'open')
+ && !matchTokens(tokens, at - 1, 'closed')) {
+ // Then it is unknown. Either with unknown explicitly
+ // specified or just a comment behind.
+ selectors.meaning = false;
+ selectors.unknown = true;
+ }
+ } else { // block starts with comment
+ // selectors.time.push(function(date) { return [true]; });
+ // Not needed. If there is no selector it automatically matches everything.
+ selectors.meaning = false;
+ selectors.unknown = true;
+ }
+ at++;
+ if (matchTokens(tokens, at, ',')) // additional block
+ at = [ at + 1 ];
+
+ if (typeof used_subparsers['comments'] != 'object')
+ used_subparsers['comments'] = [ at ];
+ else
+ used_subparsers['comments'].push(at);
+ } else {
+ var warnings = getWarnings();
+ throw formatWarnErrorMessage(nblock, at, 'Unexpected token: "' + tokens[at][1]
+ + '" This means that the syntax is not valid at that point or it is currently not supported.')
+ + (warnings ? ' ' + warnings.join('; ') : '');
+ }
+
+ if (typeof conf != 'undefined') {
+
+ // 'Mo: 12:00-13:00' -> 'Mo 12:00-13:00'
+ if (used_subparsers['time ranges'] && old_at > 1 && tokens[old_at-1][0] == ':'
+ && matchTokens(tokens, old_at - 2, 'weekday'))
+ prettified_group_value = prettified_group_value.substring(0, prettified_group_value.length - 2) + ' ';
+
+ // 'week 1, week 3' -> 'week 1,week 3'
+ if (prettified_group_value.substr(prettified_group_value.length -2, 2) == ', '
+ && matchTokens(tokens, old_at, 'week'))
+ prettified_group_value = prettified_group_value.substring(0, prettified_group_value.length - 1);
+
+ prettified_group_value += prettifySelector(tokens, old_at, at, conf, used_subparsers['time ranges'].length);
+ }
+
+ if (typeof at == 'object') // additional block
+ break;
+ }
+
+ prettified_value += prettified_group_value.replace(/\s+$/, '');
+
+ if (!done_with_warnings) {
+ for (var subparser_name in used_subparsers) {
+ if (used_subparsers[subparser_name].length > 1) {
+ parsing_warnings.push([nblock, used_subparsers[subparser_name][used_subparsers[subparser_name].length - 1] - 1,
+ 'You have used ' + used_subparsers[subparser_name].length
+ + (subparser_name.match(/^(?:comments|state keywords)/) ?
+ ' ' + subparser_name + ' in one rule.'
+ + ' You may only use one in one rule.'
+ :
+ ' not connected ' + subparser_name + ' in one rule.'
+ + ' This is probably an error.'
+ + ' Equal selector types can (and should) always be written in conjunction separated by comma or something.'
+ + ' Example for time ranges "12:00-13:00,15:00-18:00".'
+ )
+ + ' Rules can be separated by ";".' ]
+ );
+ }
+ }
+ }
+
+ return at;
+ }
+
+ //======================================================================
+ // Time range parser (10:00-12:00,14:00-16:00)
+ //======================================================================
+ function parseTimeRange(tokens, at, selectors) {
+ for (; at < tokens.length; at++) {
+ var has_time_var_calc = [], has_normal_time = []; // element 0: start time, 1: end time
+ has_normal_time[0] = matchTokens(tokens, at, 'number', 'timesep', 'number');
+ has_time_var_calc[0] = matchTokens(tokens, at, '(', 'timevar');
+ if (has_normal_time[0] || matchTokens(tokens, at, 'timevar') || has_time_var_calc[0]) {
+ // relying on the fact that always *one* of them is true
+
+ var is_point_in_time = false; // default no time range
+ var has_open_end = false; // default no open end
+ var timevar_add = [ 0, 0 ];
+ var timevar_string = []; // capture timevar string like 'sunrise' to calculate it for the current date.
+
+ // minutes_from
+ if (has_normal_time[0]) {
+ var minutes_from = getMinutesByHoursMinutes(tokens, nblock, at+has_time_var_calc[0]);
+ } else {
+ timevar_string[0] = tokens[at+has_time_var_calc[0]][0];
+ var minutes_from = word_value_replacement[timevar_string[0]];
+
+ if (has_time_var_calc[0]) {
+ timevar_add[0] = parseTimevarCalc(tokens, at);
+ minutes_from += timevar_add[0];
+ }
+ }
+
+ var at_end_time = at+(has_normal_time[0] ? 3 : (has_time_var_calc[0] ? 7 : 1))+1; // after '-'
+ if (!matchTokens(tokens, at_end_time - 1, '-')) { // not time range
+ if (matchTokens(tokens, at_end_time - 1, '+')) {
+ has_open_end = true;
+ } else {
+ if (oh_mode == 0) {
+ throw formatWarnErrorMessage(nblock, at+(has_normal_time[0] ? 3 : (has_time_var_calc[0] ? 2 : 1)),
+ 'hyphen (-) or open end (+) in time range '
+ + (has_time_var_calc[0] ? 'calculation ' : '') + 'expected.'
+ + ' For working with points in time, the mode for opening_hours.js has to be altered.'
+ + ' Maybe wrong tag?');
+ } else {
+ var minutes_to = minutes_from + 1;
+ is_point_in_time = true;
+ }
+ }
+ }
+
+ // minutes_to
+ if (has_open_end) {
+ if (minutes_from >= 22 * 60)
+ var minutes_to = minutes_from + 8 * 60;
+ else if (minutes_from >= 17 * 60)
+ var minutes_to = minutes_from + 10 * 60;
+ else
+ var minutes_to = minutes_in_day;
+ } else if (!is_point_in_time) {
+ has_normal_time[1] = matchTokens(tokens, at_end_time, 'number', 'timesep', 'number');
+ has_time_var_calc[1] = matchTokens(tokens, at_end_time, '(', 'timevar');
+ if (!has_normal_time[1] && !matchTokens(tokens, at_end_time, 'timevar') && !has_time_var_calc[1]) {
+ throw formatWarnErrorMessage(nblock, at_end_time, 'time range does not continue as expected');
+ } else {
+ if (has_normal_time[1]) {
+ var minutes_to = getMinutesByHoursMinutes(tokens, nblock, at_end_time);
+ } else {
+ timevar_string[1] = tokens[at_end_time+has_time_var_calc[1]][0]
+ var minutes_to = word_value_replacement[timevar_string[1]];
+ }
+
+ if (has_time_var_calc[1]) {
+ timevar_add[1] = parseTimevarCalc(tokens, at_end_time);
+ minutes_to += timevar_add[1];
+ }
+ }
+ }
+
+ at = at_end_time + (is_point_in_time ? -1 :
+ (has_normal_time[1] ? 3 : (has_time_var_calc[1] ? 7 : !has_open_end))
+ );
+
+ if (matchTokens(tokens, at, '/', 'number')) {
+ if (matchTokens(tokens, at + 2, 'timesep', 'number')) { // /hours:minutes
+ var point_in_time_period = getMinutesByHoursMinutes(tokens, nblock, at + 1);
+ at += 4;
+ } else { // /minutes
+ var point_in_time_period = tokens[at + 1][0];
+ at += 2;
+ if (matchTokens(tokens, at, 'timesep'))
+ throw formatWarnErrorMessage(nblock, at,
+ 'Time period does not continue as expected. Exampe "/01:30".');
+ }
+
+ if (oh_mode == 0)
+ throw formatWarnErrorMessage(nblock, at - 1,
+ 'opening_hours is running in "time range mode". Found point in time.');
+
+ is_point_in_time = true;
+ } else if (oh_mode == 1 && !is_point_in_time) {
+ throw formatWarnErrorMessage(nblock, at_end_time,
+ 'opening_hours is running in "points in time mode". Found time range.');
+ }
+
+ if (typeof lat != 'undefined') { // lon will also be defined (see above)
+ if (!has_normal_time[0] || !(has_normal_time[1] || has_open_end || is_point_in_time) )
+ week_stable = false;
+ } else { // we can not calculate exact times so we use the already applied constants (word_value_replacement).
+ timevar_string = [];
+ }
+
+ // normalize minutes into range
+ if (minutes_from >= minutes_in_day)
+ throw formatWarnErrorMessage(nblock, at_end_time - 1,
+ 'Time range starts outside of the current day');
+ if (minutes_to < minutes_from || ((has_normal_time[0] && has_normal_time[1]) && minutes_from == minutes_to))
+ minutes_to += minutes_in_day;
+ if (minutes_to > minutes_in_day * 2)
+ throw formatWarnErrorMessage(nblock, at_end_time + (has_normal_time[1] ? 3 : (has_time_var_calc[1] ? 7 : 1)) - 1,
+ 'Time spanning more than two midnights not supported');
+
+ // this shortcut makes always-open range check faster
+ if (!(minutes_from == 0 && minutes_to == minutes_in_day)) {
+ if (minutes_to > minutes_in_day) { // has_normal_time[1] must be true
+ selectors.time.push(function(minutes_from, minutes_to, timevar_string, timevar_add, has_open_end, is_point_in_time, point_in_time_period) { return function(date) {
+ var ourminutes = date.getHours() * 60 + date.getMinutes();
+
+ if (timevar_string[0]) {
+ var date_from = eval('SunCalc.getTimes(date, lat, lon).' + timevar_string[0]);
+ minutes_from = date_from.getHours() * 60 + date_from.getMinutes() + timevar_add[0];
+ }
+ if (timevar_string[1]) {
+ var date_to = eval('SunCalc.getTimes(date, lat, lon).' + timevar_string[1]);
+ minutes_to = date_to.getHours() * 60 + date_to.getMinutes() + timevar_add[1];
+ minutes_to += minutes_in_day;
+ // Needs to be added because it was added by
+ // normal times: if (minutes_to < minutes_from)
+ // above the selector construction.
+ } else if (is_point_in_time && typeof point_in_time_period != 'number') {
+ minutes_to = minutes_from + 1;
+ }
+
+ if (typeof point_in_time_period == 'number') {
+ if (ourminutes < minutes_from) {
+ return [false, dateAtDayMinutes(date, minutes_from)];
+ } else if (ourminutes <= minutes_to) {
+ for (var cur_min = minutes_from; ourminutes + point_in_time_period >= cur_min; cur_min += point_in_time_period) {
+ if (cur_min == ourminutes) {
+ return [true, dateAtDayMinutes(date, ourminutes + 1)];
+ } else if (ourminutes < cur_min) {
+ return [false, dateAtDayMinutes(date, cur_min)];
+ }
+ }
+ }
+ return [false, dateAtDayMinutes(date, minutes_in_day)];
+ } else {
+ if (ourminutes < minutes_from)
+ return [false, dateAtDayMinutes(date, minutes_from)];
+ else
+ return [true, dateAtDayMinutes(date, minutes_to), has_open_end];
+ }
+ }}(minutes_from, minutes_to, timevar_string, timevar_add, has_open_end, is_point_in_time, point_in_time_period));
+
+ selectors.wraptime.push(function(minutes_from, minutes_to, timevar_string, timevar_add, has_open_end, is_point_in_time, point_in_time_period) { return function(date) {
+ var ourminutes = date.getHours() * 60 + date.getMinutes();
+
+ if (timevar_string[0]) {
+ var date_from = eval('SunCalc.getTimes(date, lat, lon).' + timevar_string[0]);
+ minutes_from = date_from.getHours() * 60 + date_from.getMinutes() + timevar_add[0];
+ }
+ if (timevar_string[1]) {
+ var date_to = eval('SunCalc.getTimes(date, lat, lon).' + timevar_string[1]);
+ minutes_to = date_to.getHours() * 60 + date_to.getMinutes() + timevar_add[1];
+ // minutes_in_day does not need to be added.
+ // For normal times in it was added in: if (minutes_to < // minutes_from)
+ // above the selector construction and
+ // subtracted in the selector construction call
+ // which returns the selector function.
+ }
+
+ if (typeof point_in_time_period == 'number') {
+ if (ourminutes <= minutes_to) {
+ for (var cur_min = 0; ourminutes + point_in_time_period >= cur_min; cur_min += point_in_time_period) {
+ if (cur_min == ourminutes) {
+ return [true, dateAtDayMinutes(date, ourminutes + 1)];
+ } else if (ourminutes < cur_min) {
+ return [false, dateAtDayMinutes(date, cur_min)];
+ }
+ }
+ }
+ } else {
+ if (ourminutes < minutes_to)
+ return [true, dateAtDayMinutes(date, minutes_to), has_open_end];
+ }
+ return [false, undefined];
+ }}(minutes_from, minutes_to - minutes_in_day, timevar_string, timevar_add, has_open_end, is_point_in_time, point_in_time_period));
+ } else {
+ selectors.time.push(function(minutes_from, minutes_to, timevar_string, timevar_add, has_open_end, is_point_in_time, point_in_time_period) { return function(date) {
+ var ourminutes = date.getHours() * 60 + date.getMinutes();
+
+ if (timevar_string[0]) {
+ var date_from = eval('SunCalc.getTimes(date, lat, lon).' + timevar_string[0]);
+ minutes_from = date_from.getHours() * 60 + date_from.getMinutes() + timevar_add[0];
+ }
+ if (timevar_string[1]) {
+ var date_to = eval('SunCalc.getTimes(date, lat, lon).' + timevar_string[1]);
+ minutes_to = date_to.getHours() * 60 + date_to.getMinutes() + timevar_add[1];
+ } else if (is_point_in_time && typeof point_in_time_period != 'number') {
+ minutes_to = minutes_from + 1;
+ }
+
+ if (typeof point_in_time_period == 'number') {
+ if (ourminutes < minutes_from) {
+ return [false, dateAtDayMinutes(date, minutes_from)];
+ } else if (ourminutes <= minutes_to) {
+ for (var cur_min = minutes_from; ourminutes + point_in_time_period >= cur_min; cur_min += point_in_time_period) {
+ if (cur_min == ourminutes) {
+ return [true, dateAtDayMinutes(date, ourminutes + 1)];
+ } else if (ourminutes < cur_min) {
+ return [false, dateAtDayMinutes(date, cur_min)];
+ }
+ }
+ }
+ return [false, dateAtDayMinutes(date, minutes_in_day)];
+ } else {
+ if (ourminutes < minutes_from)
+ return [false, dateAtDayMinutes(date, minutes_from)];
+ else if (ourminutes < minutes_to)
+ return [true, dateAtDayMinutes(date, minutes_to), has_open_end];
+ else
+ return [false, dateAtDayMinutes(date, minutes_from + minutes_in_day)];
+ }
+ }}(minutes_from, minutes_to, timevar_string, timevar_add, has_open_end, is_point_in_time, point_in_time_period));
+ }
+ }
+ } else if (matchTokens(tokens, at, 'number', '-', 'number')) { // "Mo 09-18" -> "Mo 09:00-18:00". Please don’t use this
+ var minutes_from = tokens[at][0] * 60;
+ var minutes_to = tokens[at+2][0] * 60;
+ if (!done_with_warnings)
+ parsing_warnings.push([nblock, at + 2,
+ 'Time range without minutes specified. Not very explicit! Please use this syntax instead e.g. "12:00-14:00".']);
+
+ if (minutes_from >= minutes_in_day)
+ throw formatWarnErrorMessage(nblock, at,
+ 'Time range starts outside of the current day');
+ if (minutes_to < minutes_from)
+ minutes_to += minutes_in_day;
+ if (minutes_to > minutes_in_day * 2)
+ throw formatWarnErrorMessage(nblock, at + 2,
+ 'Time spanning more than two midnights not supported');
+
+ if (minutes_to > minutes_in_day) {
+ selectors.time.push(function(minutes_from, minutes_to) { return function(date) {
+ var ourminutes = date.getHours() * 60 + date.getMinutes();
+
+ if (ourminutes < minutes_from)
+ return [false, dateAtDayMinutes(date, minutes_from)];
+ else
+ return [true, dateAtDayMinutes(date, minutes_to)];
+ }}(minutes_from, minutes_to));
+
+ selectors.wraptime.push(function(minutes_from, minutes_to) { return function(date) {
+ var ourminutes = date.getHours() * 60 + date.getMinutes();
+
+ if (ourminutes < minutes_to)
+ return [true, dateAtDayMinutes(date, minutes_to)];
+ else
+ return [false, undefined];
+ }}(minutes_from, minutes_to - minutes_in_day));
+ } else {
+ selectors.time.push(function(minutes_from, minutes_to) { return function(date) {
+ var ourminutes = date.getHours() * 60 + date.getMinutes();
+
+ if (ourminutes < minutes_from)
+ return [false, dateAtDayMinutes(date, minutes_from)];
+ else if (ourminutes < minutes_to)
+ return [true, dateAtDayMinutes(date, minutes_to), has_open_end];
+ else
+ return [false, dateAtDayMinutes(date, minutes_from + minutes_in_day)];
+ }}(minutes_from, minutes_to));
+ }
+
+ at += 3;
+ } else { // additional block
+ if (matchTokens(tokens, at, '('))
+ throw formatWarnErrorMessage(nblock, at+1, 'Missing variable time (e.g. sunrise) after: "' + tokens[at][1] + '"');
+ if (matchTokens(tokens, at, 'number', 'timesep'))
+ throw formatWarnErrorMessage(nblock, at+2, 'Missing minutes in time range after: "' + tokens[at+1][1] + '"');
+ if (matchTokens(tokens, at, 'number'))
+ throw formatWarnErrorMessage(nblock, at+2, 'Missing time seperator in time range after: "' + tokens[at][1] + '"');
+ return [ at ];
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+ }
+
+ return at;
+ }
+
+ // for given date, returns date moved to the start of specified day minute
+ function dateAtDayMinutes(date, minutes) {
+ return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, minutes);
+ }
+
+ // extract the added or subtracted time of "(sunrise-01:30)"
+ // returns in minutes e.g. -90
+ function parseTimevarCalc(tokens, at) {
+ if (matchTokens(tokens, at+2, '+') || matchTokens(tokens, at+2, '-')) {
+ if (matchTokens(tokens, at+3, 'number', 'timesep', 'number')) {
+ if (matchTokens(tokens, at+6, ')')) {
+ var add_or_subtract = tokens[at+2][0] == '+' ? '1' : '-1';
+ var minutes = (tokens[at+3][0] * 60 + tokens[at+5][0]) * add_or_subtract;
+ if (minutes == 0)
+ parsing_warnings.push([ nblock, at+5, 'Adding zero in a variable time calculation does not change the variable time.'
+ + ' Please omit the calculation (example: "12:00-sunset").' ]
+ );
+ return minutes;
+ } else {
+ error = [ at+6, '. Missing ")".'];
+ }
+ } else {
+ error = [ at+5, ' (time).'];
+ }
+ } else {
+ error = [ at+2, '. "+" or "-" expected.'];
+ }
+
+ if (error)
+ throw formatWarnErrorMessage(nblock, error[0],
+ 'Calculcation with variable time is not in the right syntax' + error[1]);
+ }
+
+ // Only used if throwing an error is wanted.
+ function getMinutesByHoursMinutes(tokens, nblock, at) {
+ if (tokens[at+2][0] > 59)
+ throw formatWarnErrorMessage(nblock, at+2,
+ 'Minutes are greater than 59.');
+ return tokens[at][0] * 60 + tokens[at+2][0];
+ }
+
+ //======================================================================
+ // Weekday range parser (Mo,We-Fr,Sa[1-2,-1])
+ //======================================================================
+ function parseWeekdayRange(tokens, at, selectors) {
+ for (; at < tokens.length; at++) {
+ if (matchTokens(tokens, at, 'weekday', '[')) {
+ // Conditional weekday (Mo[3])
+ var numbers = [];
+
+ // Get list of constraints
+ var endat = parseNumRange(tokens, at+2, function(from, to, at) {
+
+ // bad number
+ if (from == 0 || from < -5 || from > 5)
+ throw formatWarnErrorMessage(nblock, at,
+ 'Number between -5 and 5 (except 0) expected');
+
+ if (from == to) {
+ numbers.push(from);
+ } else if (from < to) {
+ for (var i = from; i <= to; i++) {
+ // bad number
+ if (i == 0 || i < -5 || i > 5)
+ throw formatWarnErrorMessage(nblock, at+2,
+ 'Number between -5 and 5 (except 0) expected.');
+
+ numbers.push(i);
+ }
+ } else {
+ throw formatWarnErrorMessage(nblock, at+2,
+ 'Bad range: ' + from + '-' + to);
+ }
+ });
+
+ if (!matchTokens(tokens, endat, ']'))
+ throw formatWarnErrorMessage(nblock, endat, '"]" or more numbers expected.');
+
+ var add_days = getMoveDays(tokens, endat+1, 6, 'constrained weekdays');
+ week_stable = false;
+
+ // Create selector for each list element
+ for (var nnumber = 0; nnumber < numbers.length; nnumber++) {
+
+ selectors.weekday.push(function(weekday, number, add_days) { return function(date) {
+ var date_num = getValueForDate(date, false); // Year not needed to distinguish.
+ var start_of_this_month = new Date(date.getFullYear(), date.getMonth(), 1);
+ var start_of_next_month = new Date(date.getFullYear(), date.getMonth() + 1, 1);
+
+ var target_day_this_month;
+
+ target_day_this_month = getDateForConstrainedWeekday(date.getFullYear(), date.getMonth(), weekday, [ number ]);
+
+ var target_day_with_added_days_this_month = new Date(target_day_this_month.getFullYear(),
+ target_day_this_month.getMonth(), target_day_this_month.getDate() + add_days);
+
+ // The target day with added days can be before this month
+ if (target_day_with_added_days_this_month.getTime() < start_of_this_month.getTime()) {
+ // but in this case, the target day without the days added needs to be in this month
+ if (target_day_this_month.getTime() >= start_of_this_month.getTime()) {
+ // so we calculate it for the month
+ // following this month and hope that the
+ // target day will actually be this month.
+
+ target_day_with_added_days_this_month = dateAtNextWeekday(
+ new Date(date.getFullYear(), date.getMonth() + (number > 0 ? 0 : 1) + 1, 1), weekday);
+ target_day_this_month.setDate(target_day_with_added_days_this_month.getDate()
+ + (number + (number > 0 ? -1 : 0)) * 7 + add_days);
+ } else {
+ // Calculated target day is not inside this month
+ // therefore the specified weekday (e.g. fifth Sunday)
+ // does not exist this month. Try it next month.
+ return [false, start_of_next_month];
+ }
+ } else if (target_day_with_added_days_this_month.getTime() >= start_of_next_month.getTime()) {
+ // The target day is in the next month. If the target day without the added days is not in this month
+ if (target_day_this_month.getTime() >= start_of_next_month.getTime())
+ return [false, start_of_next_month];
+ }
+
+ if (add_days > 0) {
+ var target_day_with_added_moved_days_this_month = dateAtNextWeekday(
+ new Date(date.getFullYear(), date.getMonth() + (number > 0 ? 0 : 1) -1, 1), weekday);
+ target_day_with_added_moved_days_this_month.setDate(target_day_with_added_moved_days_this_month.getDate()
+ + (number + (number > 0 ? -1 : 0)) * 7 + add_days);
+
+ if (date_num == getValueForDate(target_day_with_added_moved_days_this_month, false))
+ return [true, dateAtDayMinutes(date, minutes_in_day)];
+ } else if (add_days < 0) {
+ var target_day_with_added_moved_days_this_month = dateAtNextWeekday(
+ new Date(date.getFullYear(), date.getMonth() + (number > 0 ? 0 : 1) + 1, 1), weekday);
+ target_day_with_added_moved_days_this_month.setDate(target_day_with_added_moved_days_this_month.getDate()
+ + (number + (number > 0 ? -1 : 0)) * 7 + add_days);
+
+ if (target_day_with_added_moved_days_this_month.getTime() >= start_of_next_month.getTime()) {
+ if (target_day_with_added_days_this_month.getTime() >= start_of_next_month.getTime())
+ return [false, target_day_with_added_moved_days_this_month];
+ } else {
+ if (target_day_with_added_days_this_month.getTime() < start_of_next_month.getTime()
+ && getValueForDate(target_day_with_added_days_this_month, false) == date_num)
+ return [true, dateAtDayMinutes(date, minutes_in_day)];
+
+ target_day_with_added_days_this_month = target_day_with_added_moved_days_this_month;
+ }
+ }
+
+ // we hit the target day
+ if (date.getDate() == target_day_with_added_days_this_month.getDate()) {
+ return [true, dateAtDayMinutes(date, minutes_in_day)];
+ }
+
+ // we're before target day
+ if (date.getDate() < target_day_with_added_days_this_month.getDate()) {
+ return [false, target_day_with_added_days_this_month];
+ }
+
+ // we're after target day, set check date to next month
+ return [false, start_of_next_month];
+ }}(tokens[at][0], numbers[nnumber], add_days[0]));
+ }
+
+ at = endat + 1 + add_days[1];
+ } else if (matchTokens(tokens, at, 'weekday')) {
+ // Single weekday (Mo) or weekday range (Mo-Fr)
+ var is_range = matchTokens(tokens, at+1, '-', 'weekday');
+
+ var weekday_from = tokens[at][0];
+ var weekday_to = is_range ? tokens[at+2][0] : weekday_from;
+
+ var inside = true;
+
+ // handle reversed range
+ if (weekday_to < weekday_from) {
+ var tmp = weekday_to;
+ weekday_to = weekday_from - 1;
+ weekday_from = tmp + 1;
+ inside = false;
+ }
+
+ if (weekday_to < weekday_from) { // handle full range
+ // selectors.weekday.push(function(date) { return [true]; });
+ // Not needed. If there is no selector it automatically matches everything.
+ } else {
+ selectors.weekday.push(function(weekday_from, weekday_to, inside) { return function(date) {
+ var ourweekday = date.getDay();
+
+ if (ourweekday < weekday_from || ourweekday > weekday_to) {
+ return [!inside, dateAtNextWeekday(date, weekday_from)];
+ } else {
+ return [inside, dateAtNextWeekday(date, weekday_to + 1)];
+ }
+ }}(weekday_from, weekday_to, inside));
+ }
+
+ at += is_range ? 3 : 1;
+ } else if (matchTokens(tokens, at, 'holiday')) {
+ week_stable = false;
+ return parseHoliday(tokens, at, selectors, true);
+ } else {
+ throw formatWarnErrorMessage(nblock, at, 'Unexpected token in weekday range: ' + tokens[at][1]);
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+ }
+
+ if (typeof used_subparsers['weekdays'] != 'object')
+ used_subparsers['weekdays'] = [ at ];
+ else
+ used_subparsers['weekdays'].push(at);
+
+ return at;
+ }
+
+ // Numeric list parser (1,2,3-4,-1), used in weekday parser above
+ function parseNumRange(tokens, at, func) {
+ for (; at < tokens.length; at++) {
+ if (matchTokens(tokens, at, 'number', '-', 'number')) {
+ // Number range
+ func(tokens[at][0], tokens[at+2][0], at);
+ at += 3;
+ } else if (matchTokens(tokens, at, '-', 'number')) {
+ // Negative number
+ func(-tokens[at+1][0], -tokens[at+1][0], at);
+ at += 2
+ } else if (matchTokens(tokens, at, 'number')) {
+ // Single number
+ func(tokens[at][0], tokens[at][0], at);
+ at++;
+ } else {
+ throw formatWarnErrorMessage(nblock, at + matchTokens(tokens, at, '-'),
+ 'Unexpected token in number range: ' + tokens[at][1]);
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+ }
+
+ return at;
+ }
+
+ function getMoveDays(tokens, at, max_differ, name) {
+ var add_days = [ 0, 0 ]; // [ 'add days', 'how many tokens' ]
+ add_days[0] = matchTokens(tokens, at, '+') || (matchTokens(tokens, at, '-') ? -1 : 0);
+ if (add_days[0] != 0 && matchTokens(tokens, at+1, 'number', 'calcday')) {
+ // continues with '+ 5 days' or something like that
+ if (tokens[at+1][0] > max_differ)
+ throw formatWarnErrorMessage(nblock, at+2,
+ 'There should be no reason to differ more than ' + max_differ + ' days from a ' + name + '. If so tell us …');
+ add_days[0] *= tokens[at+1][0];
+ if (add_days[0] == 0 && !done_with_warnings)
+ parsing_warnings.push([ nblock, at+2, 'Adding 0 does not change the date. Please omit this.' ]);
+ add_days[1] = 3;
+ } else {
+ add_days[0] = 0;
+ }
+ return add_days;
+ }
+
+
+ // for given date, returns date moved to the specific day of week
+ function dateAtNextWeekday(date, day) {
+ var delta = day - date.getDay();
+ return new Date(date.getFullYear(), date.getMonth(), date.getDate() + delta + (delta < 0 ? 7 : 0));
+ }
+
+ //======================================================================
+ // Holiday parser for public and school holidays (PH,SH)
+ // push_to_weekday will push the selector into the weekday selector array which has the desired side effect of working in conjunction with the weekday selectors (either the holiday match or the weekday), which is the normal and expected behavior.
+ //======================================================================
+ function parseHoliday(tokens, at, selectors, push_to_weekday) {
+ for (; at < tokens.length; at++) {
+ if (matchTokens(tokens, at, 'holiday')) {
+ if (tokens[at][0] == 'PH') {
+ var applying_holidays = getMatchingHoliday(tokens[at][0]);
+
+ // Only allow moving one day in the past or in the future.
+ // This makes implementation easier because only one holiday is assumed to be moved to the next year.
+ var add_days = getMoveDays(tokens, at+1, 1, 'public holiday');
+
+ var selector = function(applying_holidays, add_days) { return function(date) {
+
+ var holidays = getApplyingHolidaysForYear(applying_holidays, date.getFullYear(), add_days);
+ // Needs to be calculated each time because of movable days.
+
+ var date_num = getValueForDate(date, true);
+
+ for (var i = 0; i < holidays.length; i++) {
+ var next_holiday_date_num = getValueForDate(holidays[i][0], true);
+
+ if (date_num < next_holiday_date_num) {
+
+ if (add_days[0] > 0) {
+ // Calculate the last holiday from previous year to tested against it.
+ var holidays_last_year = getApplyingHolidaysForYear(applying_holidays, date.getFullYear() - 1, add_days);
+ var last_holiday_last_year = holidays_last_year[holidays_last_year.length - 1];
+ var last_holiday_last_year_num = getValueForDate(last_holiday_last_year[0], true);
+
+ if (date_num < last_holiday_last_year_num ) {
+ return [ false, last_holiday_last_year[0] ];
+ } else if (date_num == last_holiday_last_year_num) {
+ return [true, dateAtDayMinutes(last_holiday_last_year[0], minutes_in_day),
+ 'Day after ' +last_holiday_last_year[1] ];
+ }
+ }
+
+ return [ false, holidays[i][0] ];
+ } else if (date_num == next_holiday_date_num) {
+ return [true, new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1),
+ (add_days[0] > 0 ? 'Day after ' : (add_days[0] < 0 ? 'Day before ' : '')) + holidays[i][1] ];
+ }
+ }
+
+ if (add_days[0] < 0) {
+ // Calculate the first holiday from next year to tested against it.
+ var holidays_next_year = getApplyingHolidaysForYear(applying_holidays, date.getFullYear() + 1, add_days);
+ var first_holidays_next_year = holidays_next_year[0];
+ var first_holidays_next_year_num = getValueForDate(first_holidays_next_year[0], true);
+ if (date_num == first_holidays_next_year_num) {
+ return [true, dateAtDayMinutes(first_holidays_next_year[0], minutes_in_day),
+ 'Day before ' + first_holidays_next_year[1] ];
+ }
+ }
+
+ // continue next year
+ return [ false, new Date(holidays[0][0].getFullYear() + 1,
+ holidays[0][0].getMonth(),
+ holidays[0][0].getDate()) ];
+
+ }}(applying_holidays, add_days);
+
+ if (push_to_weekday)
+ selectors.weekday.push(selector);
+ else
+ selectors.holiday.push(selector);
+
+ at += 1 + add_days[1];
+ } else if (tokens[at][0] == 'SH') {
+ var applying_holidays = getMatchingHoliday(tokens[at][0]);
+
+ var holidays = []; // needs to be sorted each time because of movable days
+
+ var selector = function(applying_holidays) { return function(date) {
+ var date_num = getValueForDate(date);
+
+ // Iterate over holiday array containing the different holiday ranges.
+ for (var i = 0; i < applying_holidays.length; i++) {
+
+ var holiday = getSHForYear(applying_holidays[i], date.getFullYear());
+
+ for (var h = 0; h < holiday.length; h+=4) {
+ var holiday_to_plus = new Date(date.getFullYear(), holiday[2+h] - 1, holiday[3+h] + 1);
+ var holiday_from = (holiday[0+h] - 1) * 100 + holiday[1+h];
+ var holiday_to = (holiday[2+h] - 1) * 100 + holiday[3+h];
+ holiday_to_plus = getValueForDate(holiday_to_plus);
+
+ var holiday_ends_next_year = holiday_to < holiday_from;
+
+ if (date_num < holiday_from) { // date is before selected holiday
+
+ // check if we are in the holidays from the last year spanning into this year
+ var last_year_holiday = getSHForYear(applying_holidays[applying_holidays.length - 1], date.getFullYear() - 1, false);
+ if (typeof last_year_holiday != 'undefined') {
+ var last_year_holiday_from = (last_year_holiday[last_year_holiday.length - 4] - 1) * 100
+ + last_year_holiday[last_year_holiday.length - 3]; // e.g. 1125
+ var last_year_holiday_to = (last_year_holiday[last_year_holiday.length - 2] - 1) * 100
+ + last_year_holiday[last_year_holiday.length - 1]; // e.g. 0005
+
+ if (last_year_holiday_to < last_year_holiday_from && date_num < last_year_holiday_to)
+ return [ true, new Date(date.getFullYear(),
+ last_year_holiday[last_year_holiday.length - 2] - 1,
+ last_year_holiday[last_year_holiday.length - 1] + 1),
+ applying_holidays[applying_holidays.length - 1].name ];
+ else
+ return [ false, new Date(date.getFullYear(), holiday[0+h] - 1, holiday[1+h]) ];
+ } else { // school holidays for last year are not defined.
+ return [ false, new Date(date.getFullYear(), holiday[0+h] - 1, holiday[1+h]) ];
+ }
+ } else if (holiday_from <= date_num && (date_num < holiday_to_plus || holiday_ends_next_year)) {
+ return [ true, new Date(date.getFullYear() + holiday_ends_next_year, holiday[2+h] - 1, holiday[3+h] + 1),
+ applying_holidays[i].name ];
+ } else if (holiday_to_plus == date_num) { // selected holiday end is equal to month and day
+ if (h + 4 < holiday.length) { // next holiday is next date range of the same holidays
+ h += 4;
+ return [ false, new Date(date.getFullYear(), holiday[0+h] - 1, holiday[1+h]) ];
+ } else {
+ if (i + 1 == applying_holidays.length) { // last holidays are handled, continue all over again
+ var holiday = getSHForYear(applying_holidays[0], date.getFullYear() + 1);
+ return [ false, new Date(date.getFullYear() + !holiday_ends_next_year, holiday[0+h] - 1, holiday[1+h]) ];
+ } else { // return the start of the next holidays
+ var holiday = getSHForYear(applying_holidays[i+1], date.getFullYear());
+ return [ false, new Date(date.getFullYear(), holiday[0] - 1, holiday[1]) ];
+ }
+ }
+ }
+ }
+ }
+ return [ false ];
+ }}(applying_holidays);
+
+ if (push_to_weekday)
+ selectors.weekday.push(selector);
+ else
+ selectors.holiday.push(selector);
+ at += 1;
+ }
+ } else if (matchTokens(tokens, at, 'weekday')) {
+ return parseWeekdayRange(tokens, at, selectors);
+ } else {
+ throw formatWarnErrorMessage(nblock, at, 'Unexpected token (school holiday parser): ' + tokens[at][1]);
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+ }
+
+ return at;
+ }
+
+ // Returns a number for a date which can then be used to compare just the dates (without the time).
+ // This is necessary because a selector could be called for the middle of the day and we need to tell if it matches that day.
+ // Example: Returns 20150015 for Jan 01 2015
+ function getValueForDate(date, include_year) {
+ // Implicit because undefined evaluates to false
+ // include_year = typeof include_year != 'undefined' ? include_year : false;
+
+ return (include_year ? date.getFullYear() * 10000 : 0) + date.getMonth() * 100 + date.getDate();
+ }
+
+ // return the school holiday definition e.g. [ 5, 25, /* to */ 6, 5 ],
+ // for the specified year
+ function getSHForYear(SH_hash, year, fatal) {
+ if (typeof fatal == 'undefined')
+ fatal = true;
+
+ var holiday = SH_hash[year];
+ if (typeof holiday == 'undefined') {
+ holiday = SH_hash['default']; // applies for any year without explicit definition
+ if (typeof holiday == 'undefined') {
+ if (fatal) {
+ throw 'School holiday ' + SH_hash.name + ' has no definition for the year ' + year + '.';
+ } else {
+ return undefined;
+ }
+ }
+ }
+ return holiday;
+ }
+
+ // Return closed holiday definition available.
+ // First try to get the state, if missing get the country wide holidays
+ // (which can be limited to some states).
+ function getMatchingHoliday(type_of_holidays) {
+ if (typeof location_cc != 'undefined') {
+ if (holidays.hasOwnProperty(location_cc)) {
+ if (typeof location_state != 'undefined') {
+ if (holidays[location_cc][location_state]
+ && holidays[location_cc][location_state][type_of_holidays]) {
+ // if holidays for the state are specified use it
+ // and ignore lesser specific ones (for the country)
+ return holidays[location_cc][location_state][type_of_holidays];
+ } else if (holidays[location_cc][type_of_holidays]) {
+ // holidays are only defined country wide
+ matching_holiday = {}; // holidays in the country wide scope can be limited to certain states
+ for (var holiday_name in holidays[location_cc][type_of_holidays]) {
+ if (typeof holidays[location_cc][type_of_holidays][holiday_name][2] === 'object') {
+ if (-1 != indexOf.call(holidays[location_cc][type_of_holidays][holiday_name][2], location_state))
+ matching_holiday[holiday_name] = holidays[location_cc][type_of_holidays][holiday_name];
+ } else {
+ matching_holiday[holiday_name] = holidays[location_cc][type_of_holidays][holiday_name];
+ }
+ }
+ if (Object.keys(matching_holiday).length == 0)
+ throw 'There are no holidays ' + type_of_holidays + ' defined for country ' + location_cc + '.'
+ + ' Please add them: https://github.com/ypid/opening_hours.js ';
+ return matching_holiday;
+ } else {
+ throw 'Holidays ' + type_of_holidays + ' are not defined for country ' + location_cc
+ + ' and state ' + location_state + '.'
+ + ' Please add them.';
+ }
+ }
+ } else {
+ throw 'No holidays are defined for country ' + location_cc + '. Please add them: https://github.com/ypid/opening_hours.js ';
+ }
+ } else { // we have no idea which holidays do apply because the country code was not provided
+ throw 'Country code missing which is needed to select the correct holidays (see README how to provide it)'
+ }
+ }
+
+ function getMovableEventsForYear(Y) {
+ // calculate easter
+ var C = Math.floor(Y/100);
+ var N = Y - 19*Math.floor(Y/19);
+ var K = Math.floor((C - 17)/25);
+ var I = C - Math.floor(C/4) - Math.floor((C - K)/3) + 19*N + 15;
+ I = I - 30*Math.floor((I/30));
+ I = I - Math.floor(I/28)*(1 - Math.floor(I/28)*Math.floor(29/(I + 1))*Math.floor((21 - N)/11));
+ var J = Y + Math.floor(Y/4) + I + 2 - C + Math.floor(C/4);
+ J = J - 7*Math.floor(J/7);
+ var L = I - J;
+ var M = 3 + Math.floor((L + 40)/44);
+ var D = L + 28 - 31*Math.floor(M/4);
+
+ return {
+ 'easter': new Date(Y, M - 1, D),
+ };
+ }
+
+ function indexOf(needle) {
+ if(typeof Array.prototype.indexOf === 'function') {
+ indexOf = Array.prototype.indexOf;
+ } else {
+ indexOf = function(needle) {
+ var i = -1, index = -1;
+ for(i = 0; i < this.length; i++) {
+ if(this[i] === needle) {
+ index = i;
+ break;
+ }
+ }
+ return index;
+ };
+ }
+ return indexOf.call(this, needle);
+ }
+
+ function getApplyingHolidaysForYear(applying_holidays, year, add_days) {
+ var movableDays = getMovableEventsForYear(year);
+
+ var sorted_holidays = [];
+
+ for (var holiday_name in applying_holidays) {
+ if (typeof applying_holidays[holiday_name][0] == 'string') {
+ var selected_movableDay = movableDays[applying_holidays[holiday_name][0]];
+ if (!selected_movableDay)
+ throw 'Movable day ' + applying_holidays[holiday_name][0] + ' can not not be calculated.'
+ + ' Please add the formula how to calculate it.';
+ var next_holiday = new Date(selected_movableDay.getFullYear(),
+ selected_movableDay.getMonth(),
+ selected_movableDay.getDate()
+ + applying_holidays[holiday_name][1]
+ );
+ if (year != next_holiday.getFullYear())
+ throw 'The movable day ' + applying_holidays[holiday_name][0] + ' plus '
+ + applying_holidays[holiday_name][1]
+ + ' days is not in the year of the movable day anymore. Currently not supported.';
+ } else {
+ var next_holiday = new Date(year,
+ applying_holidays[holiday_name][0] - 1,
+ applying_holidays[holiday_name][1]
+ );
+ }
+ if (add_days[0])
+ next_holiday.setDate(next_holiday.getDate() + add_days[0]);
+
+ sorted_holidays.push([ next_holiday, holiday_name ]);
+ }
+
+ sorted_holidays = sorted_holidays.sort(function(a,b){
+ if (a[0].getTime() < b[0].getTime()) return -1;
+ if (a[0].getTime() > b[0].getTime()) return 1;
+ return 0;
+ });
+
+ return sorted_holidays;
+ }
+
+ //======================================================================
+ // Year range parser (2013,2016-2018,2020/2)
+ //======================================================================
+ function parseYearRange(tokens, at) {
+ for (; at < tokens.length; at++) {
+ if (matchTokens(tokens, at, 'year')) {
+ var is_range = false, has_period = false;
+ if (matchTokens(tokens, at+1, '-', 'year', '/', 'number')) {
+ var is_range = true;
+ var has_period = true;
+ if (!done_with_warnings && tokens[at+4][0] == 1)
+ parsing_warnings.push([nblock, at+1+3, 'Please don’t use year ranges with period equals one (see README)']);
+ } else {
+ var is_range = matchTokens(tokens, at+1, '-', 'year');
+ var has_period = matchTokens(tokens, at+1, '/', 'number');
+ }
+
+ selectors.year.push(function(tokens, at, is_range, has_period) { return function(date) {
+ var ouryear = date.getFullYear();
+ var year_from = tokens[at][0];
+ var year_to = is_range ? tokens[at+2][0] : year_from;
+
+ // handle reversed range
+ if (year_to < year_from) {
+ var tmp = year_to;
+ year_to = year_from;
+ year_from = tmp;
+ }
+
+ if (ouryear < year_from ){
+ return [false, new Date(year_from, 0, 1)];
+ } else if (has_period) {
+ if (year_from <= ouryear) {
+ if (is_range) {
+ var period = tokens[at+4][0];
+
+ if (year_to < ouryear)
+ return [false];
+ } else {
+ var period = tokens[at+2][0];
+ }
+ if (period > 0) {
+ if ((ouryear - year_from) % period == 0) {
+ return [true, new Date(ouryear + 1, 0, 1)];
+ } else {
+ return [false, new Date(ouryear + period - 1, 0, 1)];
+ }
+ }
+ }
+ } else if (is_range) {
+ if (year_from <= ouryear && ouryear <= year_to)
+ return [true, new Date(year_to + 1, 0, 1)];
+ } else if (ouryear == year_from) {
+ return [true];
+ }
+
+ return [false];
+
+ }}(tokens, at, is_range, has_period));
+
+ at += 1 + (is_range ? 2 : 0) + (has_period ? 2 : 0);
+ } else {
+ throw formatWarnErrorMessage(nblock, at, 'Unexpected token in year range: ' + tokens[at][1]);
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+ }
+
+ if (typeof used_subparsers['year ranges'] != 'object')
+ used_subparsers['year ranges'] = [ at ];
+ else
+ used_subparsers['year ranges'].push(at);
+
+ return at;
+ }
+
+ //======================================================================
+ // Week range parser (week 11-20, week 1-53/2)
+ //======================================================================
+ function parseWeekRange(tokens, at) {
+ for (; at < tokens.length; at++) {
+ if (matchTokens(tokens, at, 'number')) {
+ var is_range = matchTokens(tokens, at+1, '-', 'number'), has_period = false;
+ if (is_range) {
+ has_period = matchTokens(tokens, at+3, '/', 'number');
+ // if (week_stable) {
+ // if (tokens[at][0] == 1 && tokens[at+2][0] >) // Maximum?
+ // week_stable = true;
+ // else
+ // week_stable = false;
+ // } else {
+ // week_stable = false;
+ // }
+ }
+
+ selectors.week.push(function(tokens, at, is_range, has_period) { return function(date) {
+ var ourweek = Math.floor((date - dateAtWeek(date, 0)) / msec_in_week);
+
+ var week_from = tokens[at][0] - 1;
+ var week_to = is_range ? tokens[at+2][0] - 1 : week_from;
+
+ var start_of_next_year = new Date(date.getFullYear() + 1, 0, 1);
+
+ // before range
+ if (ourweek < week_from)
+ return [false, getMinDate(dateAtWeek(date, week_from), start_of_next_year)];
+
+ // we're after range, set check date to next year
+ if (ourweek > week_to)
+ return [false, start_of_next_year];
+
+ // we're in range
+ var period;
+ if (has_period) {
+ var period = tokens[at+4][0];
+ if (period > 1) {
+ var in_period = (ourweek - week_from) % period == 0;
+ if (in_period)
+ return [true, getMinDate(dateAtWeek(date, ourweek + 1), start_of_next_year)];
+ else
+ return [false, getMinDate(dateAtWeek(date, ourweek + period - 1), start_of_next_year)];
+ }
+ }
+
+ return [true, getMinDate(dateAtWeek(date, week_to + 1), start_of_next_year)];
+ }}(tokens, at, is_range, has_period));
+
+ at += 1 + (is_range ? 2 : 0) + (has_period ? 2 : 0);
+ } else {
+ throw formatWarnErrorMessage(nblock, at, 'Unexpected token in week range: ' + tokens[at][1]);
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+
+ if (!matchTokens(tokens, at+1, 'number')) {
+ at++; // we don‘t need the comma in parseGroup
+ break;
+ }
+ }
+
+ if (typeof used_subparsers['week ranges'] != 'object')
+ used_subparsers['week ranges'] = [ at ];
+ else
+ used_subparsers['week ranges'].push;
+
+ return at;
+ }
+
+ function dateAtWeek(date, week) {
+ var tmpdate = new Date(date.getFullYear(), 0, 1);
+ tmpdate.setDate(1 - (tmpdate.getDay() + 6) % 7 + week * 7); // start of week n where week starts on Monday
+ return tmpdate;
+ }
+
+ function getMinDate(date /*, ...*/) {
+ for (var i = 1; i < arguments.length; i++)
+ if (arguments[i].getTime() < date.getTime())
+ date = arguments[i];
+ return date;
+ }
+
+ //======================================================================
+ // Month range parser (Jan,Feb-Mar)
+ //======================================================================
+ function parseMonthRange(tokens, at) {
+ for (; at < tokens.length; at++) {
+ if (matchTokens(tokens, at, 'month')) {
+ // Single month (Jan) or month range (Feb-Mar)
+ var is_range = matchTokens(tokens, at+1, '-', 'month');
+
+ if (is_range && week_stable) {
+ var month_from = tokens[at][0];
+ var month_to = tokens[at+2][0];
+ if (month_from == (month_to + 1) % 12)
+ week_stable = true;
+ else
+ week_stable = false;
+ } else {
+ week_stable = false;
+ }
+
+ selectors.month.push(function(tokens, at, is_range) { return function(date) {
+ var ourmonth = date.getMonth();
+ var month_from = tokens[at][0];
+ var month_to = is_range ? tokens[at+2][0] : month_from;
+
+ var inside = true;
+
+ // handle reversed range
+ if (month_to < month_from) {
+ var tmp = month_to;
+ month_to = month_from - 1;
+ month_from = tmp + 1;
+ inside = false;
+ }
+
+ // handle full range
+ if (month_to < month_from)
+ return [!inside];
+
+ if (ourmonth < month_from || ourmonth > month_to) {
+ return [!inside, dateAtNextMonth(date, month_from)];
+ } else {
+ return [inside, dateAtNextMonth(date, month_to + 1)];
+ }
+ }}(tokens, at, is_range));
+
+ at += is_range ? 3 : 1;
+ } else {
+ throw formatWarnErrorMessage(nblock, at, 'Unexpected token in month range: ' + tokens[at][1]);
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+ }
+
+ if (typeof used_subparsers['months'] != 'object')
+ used_subparsers['months'] = [ at ];
+ else
+ used_subparsers['months'].push(at);
+
+ return at;
+ }
+
+ function dateAtNextMonth(date, month) {
+ return new Date(date.getFullYear(), month < date.getMonth() ? month + 12 : month);
+ }
+
+ function getConstrainedWeekday(tokens, at) {
+ var number = 0;
+ var endat = parseNumRange(tokens, at, function(from, to, at) {
+
+ // bad number
+ if (from == 0 || from < -5 || from > 5)
+ throw formatWarnErrorMessage(nblock, at,
+ 'Number between -5 and 5 (except 0) expected');
+
+ if (from == to) {
+ if (number != 0)
+ throw formatWarnErrorMessage(nblock, at,
+ 'You can not use a more than one constrained weekday in a month range');
+ number = from;
+ } else {
+ throw formatWarnErrorMessage(nblock, at+2,
+ 'You can not use a range of constrained weekdays in a month range');
+ }
+ });
+
+ if (!matchTokens(tokens, endat, ']'))
+ throw formatWarnErrorMessage(nblock, endat, '"]" expected.');
+
+ return [ number, endat + 1 ];
+ }
+
+ function getDateForConstrainedWeekday(year, month, weekday, constrained_weekday, add_days) {
+ var tmp_date = dateAtNextWeekday(
+ new Date(year, month + (constrained_weekday[0] > 0 ? 0 : 1), 1), weekday);
+
+ tmp_date.setDate(tmp_date.getDate() + (constrained_weekday[0] + (constrained_weekday[0] > 0 ? -1 : 0)) * 7);
+
+ if (typeof add_days != 'undefined' && add_days[1])
+ tmp_date.setDate(tmp_date.getDate() + add_days[0]);
+
+ return tmp_date;
+ }
+
+ //======================================================================
+ // Month day range parser (Jan 26-31; Jan 26-Feb 26)
+ //======================================================================
+ function parseMonthdayRange(tokens, at, nblock) {
+ for (; at < tokens.length; at++) {
+ var has_year = [], has_month = [], has_event = [], has_calc = [], has_constrained_weekday = [], has_calc = [];
+ has_year[0] = matchTokens(tokens, at, 'year');
+ has_month[0] = matchTokens(tokens, at+has_year[0], 'month', 'number');
+ has_event[0] = matchTokens(tokens, at+has_year[0], 'event');
+ if (has_event[0])
+ has_calc[0] = getMoveDays(tokens, at+has_year[0]+1, 200, 'event like easter');
+
+ if (matchTokens(tokens, at+has_year[0], 'month', 'weekday', '[')) {
+ has_constrained_weekday[0] = getConstrainedWeekday(tokens, at+has_year[0]+3);
+ has_calc[0] = getMoveDays(tokens, has_constrained_weekday[0][1], 6, 'constrained weekdays');
+ var at_range_sep = has_constrained_weekday[0][1] + (typeof has_calc[0] != 'undefined' && has_calc[0][1] ? 3 : 0);
+ } else {
+ var at_range_sep = at+has_year[0]
+ + (has_event[0]
+ ? (typeof has_calc[0] != 'undefined' && has_calc[0][1] ? 4 : 1)
+ : 2);
+ }
+
+ if ((has_month[0] || has_event[0] || has_constrained_weekday[0]) && matchTokens(tokens, at_range_sep, '-')) {
+ has_year[1] = matchTokens(tokens, at_range_sep+1, 'year');
+ var at_sec_event_or_month = at_range_sep+1+has_year[1];
+ has_month[1] = matchTokens(tokens, at_sec_event_or_month, 'month', 'number');
+ if (!has_month[1]) {
+ has_event[1] = matchTokens(tokens, at_sec_event_or_month, 'event');
+ if (has_event[1]) {
+ has_calc[1] = getMoveDays(tokens, at_sec_event_or_month+1, 366, 'event like easter');
+ } else if (matchTokens(tokens, at_sec_event_or_month, 'month', 'weekday', '[')) {
+ has_constrained_weekday[1] = getConstrainedWeekday(tokens, at_sec_event_or_month+3);
+ has_calc[1] = getMoveDays(tokens, has_constrained_weekday[1][1], 6, 'constrained weekdays');
+ }
+ }
+ }
+
+ if (has_year[0] == has_year[1] && (has_month[1] || has_event[1] || has_constrained_weekday[1])) {
+
+ selectors.monthday.push(function(tokens, at, nblock, has_year, has_event, has_calc, at_sec_event_or_month, has_constrained_weekday) { return function(date) {
+ var start_of_next_year = new Date(date.getFullYear() + 1, 0, 1);
+
+ if (has_event[0]) {
+ var movableDays = getMovableEventsForYear(has_year[0] ? parseInt(tokens[at][0]) : date.getFullYear());
+ var from_date = movableDays[tokens[at+has_year[0]][0]];
+
+ if (typeof has_calc[0] != 'undefined' && has_calc[0][1]) {
+ var from_year_before_calc = from_date.getFullYear();
+ from_date.setDate(from_date.getDate() + has_calc[0][0]);
+ if (from_year_before_calc != from_date.getFullYear())
+ throw formatWarnErrorMessage(nblock, at+has_year[0]+has_calc[0][1]*3,
+ 'The movable day ' + tokens[at+has_year[0]][0] + ' plus ' + has_calc[0][0]
+ + ' days is not in the year of the movable day anymore. Currently not supported.');
+ }
+ } else if (has_constrained_weekday[0]) {
+ var from_date = getDateForConstrainedWeekday((has_year[0] ? tokens[at][0] : date.getFullYear()), // year
+ tokens[at+has_year[0]][0], // month
+ tokens[at+has_year[0]+1][0], // weekday
+ has_constrained_weekday[0],
+ has_calc[0]);
+ // var from_date_without_calc = getDateForConstrainedWeekday((has_year[0] ? tokens[at][0] : date.getFullYear()), // year
+ // tokens[at+has_year[0]][0], // month
+ // tokens[at+has_year[0]+1][0], // weekday
+ // has_constrained_weekday[0],
+ // [ 0, 0 ]);
+ // if (from_date_without_calc.getFullYear() != from_date.getFullYear())
+ // throw formatWarnErrorMessage(nblock, at+has_year[0]+has_calc[0][1],
+ // 'The constrained ' + weekdays[tokens[at+has_year[0]+1][0]] + ' plus ' + has_calc[0][0]
+ // + ' days is not in the year of the movable day anymore. Currently not supported.');
+ } else {
+ var from_date = new Date((has_year[0] ? tokens[at][0] : date.getFullYear()),
+ tokens[at+has_year[0]][0], tokens[at+has_year[0]+1][0]);
+ }
+
+ if (has_event[1]) {
+ var movableDays = getMovableEventsForYear(has_year[1]
+ ? parseInt(tokens[at_sec_event_or_month-1][0])
+ : date.getFullYear());
+ var to_date = movableDays[tokens[at_sec_event_or_month][0]];
+
+ if (typeof has_calc[1] != 'undefined' && has_calc[1][1]) {
+ var to_year_before_calc = to_date.getFullYear();
+ to_date.setDate(to_date.getDate() + has_calc[1][0]);
+ if (to_year_before_calc != to_date.getFullYear())
+ throw formatWarnErrorMessage(nblock, at_sec_event_or_month+has_calc[1][1],
+ 'The movable day ' + tokens[at_sec_event_or_month][0] + ' plus ' + has_calc[1][0]
+ + ' days is not in the year of the movable day anymore. Currently not supported.');
+ }
+ } else if (has_constrained_weekday[1]) {
+ var to_date = getDateForConstrainedWeekday((has_year[1] ? tokens[at_sec_event_or_month-1][0] : date.getFullYear()), // year
+ tokens[at_sec_event_or_month][0], // month
+ tokens[at_sec_event_or_month+1][0], // weekday
+ has_constrained_weekday[1],
+ has_calc[1]);
+ } else {
+ var to_date = new Date((has_year[1] ? tokens[at_sec_event_or_month-1][0] : date.getFullYear()),
+ tokens[at_sec_event_or_month][0], tokens[at_sec_event_or_month+1][0] + 1);
+ }
+
+ var inside = true;
+
+ if (to_date < from_date) {
+ var tmp = to_date;
+ to_date = from_date;
+ from_date = tmp;
+ inside = false;
+ }
+
+ if (date.getTime() < from_date.getTime()) {
+ return [!inside, from_date];
+ } else if (date.getTime() < to_date.getTime()) {
+ return [inside, to_date];
+ } else {
+ if (has_year[0]) {
+ return [!inside];
+ } else {
+ // // back matching, if from_date is moved to last year
+ // var from_date_next_year = getDateForConstrainedWeekday(date.getFullYear() + 1, // year
+ // tokens[at+has_year[0]][0], // month
+ // tokens[at+has_year[0]+1][0], // weekday
+ // has_constrained_weekday[0],
+ // has_calc[0]);
+ // if (date.getFullYear() == from_date_next_year.getFullYear()) {
+ // if (date.getTime() < from_date_next_year.getTime()) {
+ // return [!inside, from_date_next_year];
+ // }
+ // }
+
+ return [!inside, start_of_next_year];
+ }
+ }
+ }}(tokens, at, nblock, has_year, has_event, has_calc, at_sec_event_or_month, has_constrained_weekday));
+
+ at = (has_constrained_weekday[1]
+ ? has_constrained_weekday[1][1]
+ : at_sec_event_or_month + (has_event[1] ? 1 : 2))
+ + (typeof has_calc[1] != 'undefined' ? has_calc[1][1] : 0);
+
+ } else if (has_month[0]) {
+
+ var is_range = matchTokens(tokens, at+2+has_year[0], '-', 'number'), has_period = false;
+ if (is_range)
+ has_period = matchTokens(tokens, at+4+has_year[0], '/', 'number');
+
+ var at_timesep_if_monthRange = at + has_year[0] + 1 // at month number
+ + (is_range ? 2 : 0) + (has_period ? 2 : 0)
+ + !(is_range || has_period); // if not range nor has_period, add one
+
+ if (matchTokens(tokens, at_timesep_if_monthRange, 'timesep', 'number')
+ && (matchTokens(tokens, at_timesep_if_monthRange+2, '+')
+ || matchTokens(tokens, at_timesep_if_monthRange+2, '-')))
+ return parseMonthRange(tokens, at);
+
+ selectors.monthday.push(function(tokens, at, is_range, has_period, has_year) { return function(date) {
+ var start_of_next_year = new Date(date.getFullYear() + 1, 0, 1);
+
+ var from_date = new Date((has_year ? tokens[at][0] : date.getFullYear()),
+ tokens[at+has_year][0], tokens[at+1 + has_year][0]);
+ var to_date = new Date(from_date.getFullYear(), from_date.getMonth(),
+ tokens[at+(is_range ? 3 : 1)+has_year][0] + 1);
+
+ if (date.getTime() < from_date.getTime())
+ return [false, from_date];
+ else if (date.getTime() >= to_date.getTime())
+ return [false, start_of_next_year];
+ else if (!has_period)
+ return [true, to_date];
+
+ var period = tokens[at+has_year+5][0];
+ if (!done_with_warnings && period == 1)
+ parsing_warnings.push([nblock, at+has_year+5, 'Please don’t use day ranges with period equals one (see README)']);
+ var nday = Math.floor((date.getTime() - from_date.getTime()) / msec_in_day);
+ var in_period = nday % period;
+
+ if (in_period == 0)
+ return [true, new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1)];
+ else
+ return [false, new Date(date.getFullYear(), date.getMonth(), date.getDate() + period - in_period)];
+
+ }}(tokens, at, is_range, has_period, has_year[0]));
+
+ at += 2 + has_year[0] + (is_range ? 2 : 0) + (has_period ? 2 : 0);
+
+ } else if (has_event[0]) {
+
+ selectors.monthday.push(function(tokens, at, nblock, has_event, has_year, add_days) { return function(date) {
+
+ // console.log('enter selector with date: ' + date);
+ var movableDays = getMovableEventsForYear((has_year ? tokens[at][0] : date.getFullYear()));
+ var event_date = movableDays[tokens[at+has_year][0]];
+ if (!event_date)
+ throw 'Movable day ' + tokens[at+has_year][0] + ' can not not be calculated.'
+ + ' Please add the formula how to calculate it.';
+
+ if (add_days[0]) {
+ event_date.setDate(event_date.getDate() + add_days[0]);
+ if (date.getFullYear() != event_date.getFullYear())
+ throw formatWarnErrorMessage(nblock, at+has_year+add_days[1], 'The movable day ' + tokens[at+has_year][0] + ' plus '
+ + add_days[0]
+ + ' days is not in the year of the movable day anymore. Currently not supported.');
+ }
+
+ if (date.getTime() < event_date.getTime())
+ return [false, event_date];
+ // else if (date.getTime() < event_date.getTime() + msec_in_day) // does not work because of daylight saving times
+ else if (event_date.getMonth() * 100 + event_date.getDate() == date.getMonth() * 100 + date.getDate())
+ return [true, new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1)];
+ else
+ return [false, new Date(date.getFullYear() + 1, 0, 1)];
+
+ }}(tokens, at, nblock, has_event[0], has_year[0], has_calc[0]));
+
+ at += has_year[0] + has_event[0] + (typeof has_calc[0][1] != 'undefined' && has_calc[0][1] ? 3 : 0);
+ } else if (has_constrained_weekday[0]) {
+ at = parseMonthRange(tokens, at);
+ } else if (matchTokens(tokens, at, 'month')) {
+ return parseMonthRange(tokens, at);
+ } else {
+ // throw 'Unexpected token in monthday range: "' + tokens[at] + '"';
+ return at;
+ }
+
+ if (!matchTokens(tokens, at, ','))
+ break;
+ }
+
+ if (typeof used_subparsers['monthday ranges'] != 'object')
+ used_subparsers['monhday ranges'] = [ at ];
+ else
+ used_subparsers['monhday ranges'].push(at);
+
+ return at;
+ }
+
+ //======================================================================
+ // Main selector traversal function
+ //======================================================================
+ this.getStatePair = function(date) {
+ var resultstate = false;
+ var changedate;
+ var unknown = false;
+ var comment;
+ var match_block;
+
+ var date_matching_blocks = [];
+
+ for (var nblock = 0; nblock < blocks.length; nblock++) {
+ var matching_date_block = true;
+ // console.log(nblock, 'length', blocks[nblock].date.length);
+
+ // Try each date selector type
+ for (var ndateselector = 0; ndateselector < blocks[nblock].date.length; ndateselector++) {
+ var dateselectors = blocks[nblock].date[ndateselector];
+ // console.log(nblock, ndateselector);
+
+ var has_matching_selector = false;
+ for (var datesel = 0; datesel < dateselectors.length; datesel++) {
+ var res = dateselectors[datesel](date);
+ if (res[0]) {
+ has_matching_selector = true;
+
+ if (typeof res[2] == 'string') { // holiday name
+ comment = [ res[2] ];
+ }
+
+ }
+ if (typeof changedate === 'undefined' || (typeof res[1] !== 'undefined' && res[1].getTime() < changedate.getTime()))
+ changedate = res[1];
+ }
+
+ if (!has_matching_selector) {
+ matching_date_block = false;
+ // We can ignore other date selectors, as the state won't change
+ // anyway until THIS selector matches (due to conjunction of date
+ // selectors of different types).
+ // This is also an optimization, if widest date selector types
+ // are checked first.
+ break;
+ }
+
+ }
+
+ if (matching_date_block) {
+ // The following lines implement date overwriting logic (e.g. for
+ // "Mo-Fr 10:00-20:00; We 10:00-16:00", We block overrides Mo-Fr block.
+ //
+ // This is the only way to be consistent. I thought about ("22:00-02:00; Tu 12:00-14:00") letting Th override 22:00-02:00 partly:
+ // Like: Th 00:00-02:00,12:00-14:00 but this would result in including 22:00-00:00 for Th which is probably not what you want.
+ if (blocks[nblock].date.length > 0 && (blocks[nblock].meaning || blocks[nblock].unknown)
+ && !blocks[nblock].wrapped && !blocks[nblock].additional && !blocks[nblock].fallback) {
+ // var old_date_matching_blocks = date_matching_blocks;
+ date_matching_blocks = [];
+ // for (var nblock = 0; nblock < old_date_matching_blocks.length; nblock++) {
+ // if (!blocks[old_date_matching_blocks[nblock]].wrapped)
+ // date_matching_blocks.push(nblock);
+ // }
+ }
+ date_matching_blocks.push(nblock);
+ }
+ }
+
+ block:
+ for (var nblock = 0; nblock < date_matching_blocks.length; nblock++) {
+ var block = date_matching_blocks[nblock];
+
+ // console.log('Processing block ' + block + ':\t' + blocks[block].comment + ' with date', date,
+ // 'and', blocks[block].time.length, 'time selectors');
+
+ // there is no time specified, state applies to the whole day
+ if (blocks[block].time.length == 0) {
+ // console.log('there is no time', date);
+ if (!blocks[block].fallback || (blocks[block].fallback && !(resultstate || unknown))) {
+ resultstate = blocks[block].meaning;
+ unknown = blocks[block].unknown;
+ match_block = block;
+
+ if (typeof blocks[block].comment != 'undefined')
+ comment = blocks[block].comment;
+ else if (typeof comment == 'object') // holiday name
+ comment = comment[0];
+
+ if (blocks[block].fallback)
+ break block; // fallback block matched, no need for checking the rest
+ }
+ }
+
+ for (var timesel = 0; timesel < blocks[block].time.length; timesel++) {
+ var res = blocks[block].time[timesel](date);
+
+ // console.log('res:', res);
+ if (res[0]) {
+ if (!blocks[block].fallback || (blocks[block].fallback && !(resultstate || unknown))) {
+ resultstate = blocks[block].meaning;
+ unknown = blocks[block].unknown;
+ match_block = block;
+
+ if (typeof blocks[block].comment != 'undefined') // only use comment if one is specified
+ comment = blocks[block].comment;
+ else if (typeof comment == 'object') // holiday name
+ comment = comment[0];
+ else if (comment === 'Specified as open end. Closing time was guessed.')
+ comment = blocks[block].comment;
+
+ // open end
+ if (typeof res[2] == 'boolean' && res[2] && (resultstate || unknown)) {
+ if (typeof comment == 'undefined')
+ comment = 'Specified as open end. Closing time was guessed.';
+ resultstate = false;
+ unknown = true;
+ }
+
+ if (blocks[block].fallback) {
+ if (typeof changedate === 'undefined' || (typeof res[1] !== 'undefined' && res[1] < changedate))
+ changedate = res[1];
+
+ break block; // fallback block matched, no need for checking the rest
+ }
+ }
+ }
+ if (typeof changedate === 'undefined' || (typeof res[1] !== 'undefined' && res[1] < changedate))
+ changedate = res[1];
+ }
+ }
+
+ // console.log('changedate', changedate, resultstate, comment, match_block);
+ return [ resultstate, changedate, unknown, comment, match_block ];
+ }
+
+ function formatWarnErrorMessage(nblock, at, message) {
+ var pos = 0;
+ if (nblock == -1) { // usage of block index not required because we do have access to value.length
+ pos = value.length - at;
+ } else { // Issue accrued at a later time, position in string needs to be reconstructed.
+ if (typeof tokens[nblock][0][at] == 'undefined') {
+ pos = value.length;
+ } else {
+ pos = value.length;
+ if (typeof tokens[nblock][0][at+1] != 'undefined')
+ pos -= tokens[nblock][0][at+1][2];
+ else if (typeof tokens[nblock][2] != 'undefined')
+ pos -= tokens[nblock][2];
+ }
+ }
+ return value.substring(0, pos) + ' <--- (' + message + ')';
+ }
+
+ function prettifySelector(tokens, at, last_at, conf, used_parseTimeRange) {
+ var value = '';
+ var start_at = at;
+ while (at < last_at) {
+ if (matchTokens(tokens, at, 'weekday')) { // FIXME
+ if (!conf.leave_weekday_sep_one_day_betw
+ && at - start_at > 1 && (matchTokens(tokens, at-1, ',') || matchTokens(tokens, at-1, '-'))
+ && matchTokens(tokens, at-2, 'weekday')
+ && tokens[at][0] == (tokens[at-2][0] + 1) % 7) {
+ value = value.substring(0, value.length - 1) + conf.sep_one_day_between;
+ }
+ value += weekdays[tokens[at][0]];
+ } else if (at - start_at > 0 && used_parseTimeRange > 0 && matchTokens(tokens, at-1, 'timesep')
+ && matchTokens(tokens, at, 'number')) { // '09:0' -> '09:00'
+ value += (tokens[at][0] < 10 ? '0' : '') + tokens[at][0].toString();
+ } else if (used_parseTimeRange > 0 && conf.leading_zero_hour && at != tokens.length
+ && matchTokens(tokens, at, 'number')
+ && matchTokens(tokens, at+1, 'timesep')) { // '9:00' -> '19:00'
+ value += (tokens[at][0] < 10 ? (tokens[at][0] == 0 && conf.one_zero_if_hour_zero ? '' : '0') : '') + tokens[at][0].toString();
+ } else if (used_parseTimeRange > 0 && at + 2 < last_at
+ && matchTokens(tokens, at, 'number')
+ && matchTokens(tokens, at+1, '-')
+ && matchTokens(tokens, at+2, 'number')) { // '9-18' -> '09:00-18:00'
+ value += (tokens[at][0] < 10 ? (tokens[at][0] == 0 && conf.one_zero_if_hour_zero ? '' : '0') : '') + tokens[at][0].toString();
+ value += ':00-';
+ value += (tokens[at+2][0] < 10 ? '0' : '') + tokens[at+2][0].toString();
+ value += ':00';
+ at += 2;
+ } else if (matchTokens(tokens, at, 'comment')) {
+ value += '"' + tokens[at][0].toString() + '"';
+ } else if (matchTokens(tokens, at, 'closed')) {
+ value += (conf.leave_off_closed ? tokens[at][0] : conf.keyword_for_off_closed);
+ } else if (at - start_at > 0 && matchTokens(tokens, at, 'number')
+ && (matchTokens(tokens, at-1, 'month')
+ || matchTokens(tokens, at-1, 'week')
+ )) {
+ value += ' ' + tokens[at][0];
+ } else if (at - start_at > 0 && matchTokens(tokens, at, 'month')
+ && matchTokens(tokens, at-1, 'year')) {
+ value += ' ' + months[[tokens[at][0]]];
+ } else if (at - start_at > 0 && matchTokens(tokens, at, 'event')
+ && matchTokens(tokens, at-1, 'year')) {
+ value += ' ' + tokens[at][0];
+ } else if (matchTokens(tokens, at, 'month')) {
+ value += months[[tokens[at][0]]];
+ if (at + 1 < last_at && matchTokens(tokens, at+1, 'weekday'))
+ value += ' ';
+ } else if (at + 2 < last_at
+ && (matchTokens(tokens, at, '-') || matchTokens(tokens, at, '+'))
+ && matchTokens(tokens, at+1, 'number', 'calcday')) {
+ value += ' ' + tokens[at][0] + tokens[at+1][0] + ' day' + (Math.abs(tokens[at+1][0]) == 1 ? '' : 's');
+ at += 2;
+ } else {
+ // if (matchTokens(tokens, at, 'open') || matchTokens(tokens, at, 'unknown'))
+ // value += ' ';
+
+ value += tokens[at][0].toString();
+ }
+ at++;
+ }
+ return value + ' ';
+ }
+
+ //======================================================================
+ // Public interface
+ // All functions below are considered public.
+ //======================================================================
+
+ //======================================================================
+ // Iterator interface
+ //======================================================================
+ this.getIterator = function(date) {
+ return new function(oh) {
+ if (typeof date === 'undefined')
+ date = new Date();
+
+ var prevstate = [ undefined, date, undefined, undefined, undefined ];
+ var state = oh.getStatePair(date);
+
+ this.setDate = function(date) {
+ if (typeof date != 'object')
+ throw 'Date as parameter needed.';
+
+ prevstate = [ undefined, date, undefined, undefined, undefined ];
+ state = oh.getStatePair(date);
+ }
+
+ this.getDate = function() {
+ return prevstate[1];
+ }
+
+ this.getState = function() {
+ return state[0];
+ }
+
+ this.getUnknown = function() {
+ return state[2];
+ }
+
+ this.getStateString = function(past) {
+ return (state[0] ? 'open' : (state[2] ? 'unknown' : (past ? 'closed' : 'close')));
+ }
+
+ this.getComment = function() {
+ return state[3];
+ }
+
+ this.getMatchingRule = function(user_conf) {
+ if (typeof state[4] == 'undefined')
+ return undefined;
+
+ if (typeof user_conf != 'object')
+ var user_conf = {};
+ for (key in default_prettify_conf) {
+ if (typeof user_conf[key] == 'undefined')
+ user_conf[key] = default_prettify_conf[key];
+ }
+
+ var really_done_with_warnings = done_with_warnings; // getWarnings can be called later.
+ done_with_warnings = true;
+ prettified_value = '';
+ var selectors = { // Not really needed. This whole thing is only necessary because of the token used for additional blocks.
+ time: [], weekday: [], holiday: [], week: [], month: [], monthday: [], year: [], wraptime: [],
+
+ fallback: false, // does not matter
+ additional: false,
+ meaning: true,
+ unknown: false,
+ comment: undefined,
+ };
+
+ // token block index used to build the selectors for this block.
+ var token_block = blocks[state[4]].build_from_token_block;
+ parseGroup(tokens[token_block[0]][0], token_block[1], selectors, state[4], user_conf);
+
+ if (prettified_value[prettified_value.length - 1] == ',')
+ prettified_value = prettified_value.substr(0, prettified_value.length - 1);
+
+ done_with_warnings = really_done_with_warnings;
+
+ return prettified_value;
+ }
+
+ this.advance = function(datelimit) {
+ if (typeof datelimit === 'undefined')
+ datelimit = new Date(prevstate[1].getTime() + msec_in_day * 366 * 5);
+ else if (datelimit.getTime() <= prevstate[1].getTime())
+ return false; // The limit for advance needs to be after the current time.
+
+ do {
+ // open range, we won't be able to advance
+ if (typeof state[1] === 'undefined')
+ return false;
+
+ // console.log('\n' + 'previous check time:', prevstate[1]
+ // + ', current check time:',
+ // // (state[1].getHours() < 10 ? '0' : '') + state[1].getHours() +
+ // // ':'+(state[1].getMinutes() < 10 ? '0' : '')+ state[1].getMinutes(), state[1].getDate(),
+ // state[1],
+ // (state[0] ? 'open' : (state[2] ? 'unknown' : 'closed')) + ', comment:', state[3]);
+
+ // We're going backwards or staying at place.
+ // This always indicates coding error in a selector code.
+ if (state[1].getTime() <= prevstate[1].getTime())
+ throw 'Fatal: infinite loop in nextChange';
+
+ // don't advance beyond limits (same as open range)
+ if (state[1].getTime() >= datelimit.getTime())
+ return false;
+
+ // do advance
+ prevstate = state;
+ state = oh.getStatePair(prevstate[1]);
+ } while (state[0] === prevstate[0] && state[2] === prevstate[2] && state[3] === prevstate[3]);
+ return true;
+ }
+ }(this);
+ }
+
+ // get parse warnings
+ // returns an empty string if there are no warnings
+ this.getWarnings = function() {
+ var it = this.getIterator();
+ return getWarnings(it);
+ }
+
+ // get a nicely formated value.
+ this.prettifyValue = function(user_conf) {
+ if (typeof user_conf != 'object')
+ var user_conf = {};
+
+ for (key in default_prettify_conf) {
+ if (typeof user_conf[key] == 'undefined')
+ user_conf[key] = default_prettify_conf[key];
+ }
+
+ var really_done_with_warnings = done_with_warnings; // getWarnings can be called later.
+ done_with_warnings = true;
+
+ prettified_value = '';
+ for (var nblock = 0; nblock < tokens.length; nblock++) {
+ if (tokens[nblock][0].length == 0) continue;
+ // Block does contain nothing useful e.g. second block of '10:00-12:00;' (empty) which needs to be handled.
+
+ if (nblock != 0)
+ prettified_value += (tokens[nblock][1]
+ ? user_conf.block_sep_string + '|| '
+ : (user_conf.print_semicolon ? ';' : '') + user_conf.block_sep_string);
+
+ var continue_at = 0;
+ do {
+ if (continue_at == tokens[nblock][0].length) break;
+ // Block does contain nothing useful e.g. second block of '10:00-12:00,' (empty) which needs to be handled.
+
+ var selectors = { // Not really needed. This whole thing is only necessary because of the token used for additional blocks.
+ time: [], weekday: [], holiday: [], week: [], month: [], monthday: [], year: [], wraptime: [],
+
+ fallback: tokens[nblock][1],
+ additional: continue_at ? true : false,
+ meaning: true,
+ unknown: false,
+ comment: undefined,
+ };
+
+ continue_at = parseGroup(tokens[nblock][0], continue_at, selectors, nblock, user_conf);
+
+ if (typeof continue_at == 'object') {
+ continue_at = continue_at[0];
+ prettified_value += user_conf.block_sep_string;
+ } else {
+ continue_at = 0;
+ }
+
+ } while (continue_at)
+ }
+
+ done_with_warnings = really_done_with_warnings;
+
+ return prettified_value;
+ }
+
+ // check whether facility is `open' on the given date (or now)
+ this.getState = function(date) {
+ var it = this.getIterator(date);
+ return it.getState();
+ }
+
+ // If the state of a amenity is conditional. Conditions can be expressed in comments.
+ // True will only be returned if the state is false as the getState only
+ // returns true if the amenity is really open. So you may want to check
+ // the resold of getUnknown if getState returned false.
+ this.getUnknown = function(date) {
+ var it = this.getIterator(date);
+ return it.getUnknown();
+ }
+
+ // Return state string. Either 'open', 'unknown' or 'closed'.
+ this.getStateString = function(date, past) {
+ var it = this.getIterator(date);
+ return it.getStateString(past);
+ }
+
+ // Returns the comment.
+ // Most often this will be an empty string as comments are not used that
+ // often in OSM yet.
+ this.getComment = function(date) {
+ var it = this.getIterator(date);
+ return it.getComment();
+ }
+
+ this.getMatchingRule = function(date) {
+ var it = this.getIterator(date);
+ return it.getMatchingRule();
+ }
+
+ // returns time of next status change
+ this.getNextChange = function(date, maxdate) {
+ var it = this.getIterator(date);
+ if (!it.advance(maxdate))
+ return undefined;
+ return it.getDate();
+ }
+
+ // return array of open intervals between two dates
+ this.getOpenIntervals = function(from, to) {
+ var res = [];
+
+ var it = this.getIterator(from);
+
+ if (it.getState() || it.getUnknown())
+ res.push([from, undefined, it.getUnknown(), it.getComment()]);
+
+ while (it.advance(to)) {
+ if (it.getState() || it.getUnknown()) {
+ if (res.length != 0 && typeof res[res.length - 1][1] == 'undefined') {
+ // last state was also open or unknown
+ res[res.length - 1][1] = it.getDate();
+ }
+ res.push([it.getDate(), undefined, it.getUnknown(), it.getComment()]);
+ } else {
+ if (res.length != 0 && typeof res[res.length - 1][1] == 'undefined') {
+ // only use the first time as closing/change time and ignore closing times which might follow
+ res[res.length - 1][1] = it.getDate();
+ }
+ }
+ }
+
+ if (res.length > 0 && typeof res[res.length - 1][1] === 'undefined')
+ res[res.length - 1][1] = to;
+
+ return res;
+ }
+
+ // return total number of milliseconds a facility is open within a given date range
+ this.getOpenDuration = function(from, to) {
+ // console.log('-----------');
+
+ var open = 0;
+ var unknown = 0;
+
+ var it = this.getIterator(from);
+ var prevdate = (it.getState() || it.getUnknown()) ? from : undefined;
+ var prevstate = it.getState();
+ var prevunknown = it.getUnknown();
+
+ while (it.advance(to)) {
+ if (it.getState() || it.getUnknown()) {
+
+ if (typeof prevdate !== 'undefined') {
+ // last state was also open or unknown
+ if (prevunknown) //
+ unknown += it.getDate().getTime() - prevdate.getTime();
+ else if (prevstate)
+ open += it.getDate().getTime() - prevdate.getTime();
+ }
+
+ prevdate = it.getDate();
+ prevstate = it.getState();
+ prevunknown = it.getUnknown();
+ // console.log('if', prevdate, open / (1000 * 60 * 60), unknown / (1000 * 60 * 60));
+ } else {
+ // console.log('else', prevdate);
+ if (typeof prevdate !== 'undefined') {
+ if (prevunknown)
+ unknown += it.getDate().getTime() - prevdate.getTime();
+ else
+ open += it.getDate().getTime() - prevdate.getTime();
+ prevdate = undefined;
+ }
+ }
+ }
+
+ if (typeof prevdate !== 'undefined') {
+ if (prevunknown)
+ unknown += to.getTime() - prevdate.getTime();
+ else
+ open += to.getTime() - prevdate.getTime();
+ }
+
+ return [ open, unknown ];
+ }
+
+ this.isWeekStable = function() {
+ return week_stable;
+ }
+ }
+}));
diff --git a/data/validator/speed_limits.json b/data/validator/speed_limits.json
new file mode 100644
index 0000000..118f3b8
--- /dev/null
+++ b/data/validator/speed_limits.json
@@ -0,0 +1,234 @@
+{
+ "AT" : {
+ "ref": [
+ "http://ec.europa.eu/transport/road_safety/going_abroad/austria/speed_limits_en.htm",
+ "http://www.bmvit.gv.at/en/service/publications/downloads/folder_austria.pdf"
+ ],
+ "speeds" : {
+ "urban": "50",
+ "rural": "100",
+ "motorway": "130"
+ }
+ },
+ "AU" : {
+ "ref": ["http://www.ntc.gov.au/filemedia/Reports/ARRFeb12.pdf"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "100"
+ }
+ },
+ "BE" : {
+ "ref": [
+ "http://ec.europa.eu/transport/road_safety/going_abroad/belgium/speed_limits_en.htm",
+ "http://www.code-de-la-route.be/textes-legaux/sections/ar/code-de-la-route/170-art11-v15-170",
+ "http://www.code-de-la-route.be/textes-legaux/sections/ar/code-de-la-route/182-art22bis"
+ ],
+ "speeds" : {
+ "living_street": "20",
+ "urban": "50",
+ "rural": "90",
+ "motorway": "120"
+ }
+ },
+ "BG" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/bulgaria/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "trunk" : "120",
+ "motorway": "140"
+ }
+ },
+ "CH" : {
+ "ref": ["http://www.ch.ch/en/driving-over-speed-limit"],
+ "speeds" : {
+ "living_street": "20",
+ "urban": "50",
+ "rural": "80",
+ "trunk": "100",
+ "motorway": "120"
+ }
+ },
+ "CZ" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/czech_republic/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "motorway": "130"
+ }
+ },
+ "DE" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/germany/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "100"
+ }
+ },
+ "DK" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/denmark/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "motorway": "130"
+ }
+ },
+ "EE" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/estonia/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "motorway": "90"
+ }
+ },
+ "ES" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/spain/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "rural_shoulder": "100",
+ "motorway": "120"
+ }
+ },
+ "FI" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/finland/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "80"
+ }
+ },
+ "FR" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/france/speed_limits_en.htm"],
+ "speeds" : {
+ "living_street" : "20",
+ "urban": "50",
+ "rural": "90",
+ "trunk": "110",
+ "motorway": "130"
+ }
+ },
+ "GB" : {
+ "ref": [
+ "http://www.gov.uk/speed-limits",
+ "http://ec.europa.eu/transport/road_safety/going_abroad/united_kingdom/speed_limits_en.htm"
+ ],
+ "speeds" : {
+ "urban": "30 mph",
+ "nsl_single": "60 mph",
+ "nsl_dual": "70 mph",
+ "motorway": "70 mph"
+ }
+ },
+ "HU" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/hungary/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "trunk": "110",
+ "motorway": "130"
+ }
+ },
+ "IT" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/italy/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "motorway": "130"
+ }
+ },
+ "LT" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/lithuania/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "unpaved": "70",
+ "rural": "90",
+ "motorway": "120"
+ }
+ },
+ "NL" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/netherlands/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "80",
+ "trunk": "100",
+ "motorway": "130"
+ }
+ },
+ "NO" : {
+ "ref": ["http://www.visitnorway.com/en/About-Norway/Safety-first/Driving-in-Norway/"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "80",
+ "trunk": "90",
+ "motorway": "100"
+ }
+ },
+ "PL" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/poland/speed_limits_en.htm"],
+ "speeds" : {
+ "living_street": "20",
+ "urban": "50",
+ "rural": "90",
+ "rural_dual": "100",
+ "trunk_single": "100",
+ "trunk": "120",
+ "motorway": "140"
+ }
+ },
+ "RO" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/romania/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "trunk": "100",
+ "motorway": "130"
+ }
+ },
+ "RU" : {
+ "speeds" : {
+ "urban": "60",
+ "rural": "90",
+ "motorway": "110"
+ }
+ },
+ "SE" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/sweden/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "70",
+ "motorway": "110"
+ }
+ },
+ "SI" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/slovenia/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "trunk": "110",
+ "motorway": "130"
+ }
+ },
+ "SK" : {
+ "ref": ["http://ec.europa.eu/transport/road_safety/going_abroad/slovakia/speed_limits_en.htm"],
+ "speeds" : {
+ "urban": "50",
+ "rural": "90",
+ "motorway": "130"
+ }
+ },
+ "UA" : {
+ "speeds" : {
+ "urban": "60",
+ "rural": "90",
+ "trunk": "110",
+ "motorway": "130"
+ }
+ },
+ "ZA" : {
+ "ref": ["http://www.southafrica.info/travel/advice/driving.htm"],
+ "speeds" : {
+ "urban": "60",
+ "rural": "100",
+ "motorway": "120"
+ }
+ }
+}
\ No newline at end of file
diff --git a/data/tagchecker.cfg b/data/validator/tagchecker.cfg
similarity index 52%
rename from data/tagchecker.cfg
rename to data/validator/tagchecker.cfg
index dcaf7bc..ac60cf2 100644
--- a/data/tagchecker.cfg
+++ b/data/validator/tagchecker.cfg
@@ -17,7 +17,7 @@
# I - an low priority informational warning
#
# Key and value are expressions describing certain keys and values of these keys.
-# Regulator expressions are supported. In this case the expressions starts and
+# Regular expressions are supported. In this case the expressions starts and
# ends with a / sign. If an 'i' is appended, the regular expression is
# case insensitive. For instance, /foo|bar/i
#
@@ -36,22 +36,16 @@
#
# Empty lines and space signs are ignored
-way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i # abbreviated street name
-
-node : W : oneway == * # oneway tag on a node
-node : W : bridge == BOOLEAN_TRUE # bridge tag on a node
-node : W : highway == tertiary # wrong highway tag on a node
-node : W : highway == secondary # wrong highway tag on a node
-node : W : highway == residential # wrong highway tag on a node
-node : W : highway == unclassified # wrong highway tag on a node
-node : W : highway == track # wrong highway tag on a node
-way : I : highway == unclassified && name != * # Unnamed unclassified highway
-way : I : highway == secondary && ref != * # highway without a reference
-way : I : highway == tertiary && ref != * # highway without a reference
-way : I : highway == motorway && nat_ref != * # highway without a reference
-* : W : highway == road # temporary highway type
-* : W : / *name */i == * && name != * # misspelled key name
-* : W : sport == gaelic_football # gaelic_football was replaced by gaelic_games
+way : W : highway == * && name == /.* (Ave|Blvd|Br|Brg|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i # abbreviated street name
+
+node : W : oneway == * # oneway tag on a node
+node : W : bridge == BOOLEAN_TRUE # bridge tag on a node
+node : W : highway == /motorway*|trunk*|primary*|secondary*|tertiary*|unclassified|residential|service|living_street|pedestrian|track|path|footway/ # wrong highway tag on a node
+way : W : /highway|railway/ == crossing # wrong crossing tag on a way
+way : I : highway == unclassified && name != * # Unnamed unclassified highway
+way : I : highway == /motorway|trunk|primary|secondary|tertiary/ && ref != * # highway without a reference
+* : W : highway == road # temporary highway type
+* : W : / *name */i == * && name != * # misspelled key name
# The following could replace unnamed way check. Still at the moment we keep it as it is
#way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
@@ -80,11 +74,28 @@ relation : E : type != * # relation withou
node : I : amenity == /restaurant|cafe|fast_food/ && name != * # restaurant without name
#way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
#* : W : natural == water && waterway == * # unusual tag combination (natural=water & waterway)
-* : W : highway == * && waterway == * # unusual tag combination (highway & waterway)
+* : W : highway == * && waterway == * && waterway != dam # unusual tag combination (highway & waterway)
* : W : highway == * && natural == * # unusual tag combination (highway & natural)
+* : W : landuse == * && building == * # unusual tag combination (landuse & building)
+
+* : W : highway == proposed && access == * # unnecessary access key
+* : W : highway == /motorway*|trunk*|primary*|secondary*|tertiary*|unclassified|residential|service|living_street/ && motor_vehicle == BOOLEAN_TRUE # unnecessary motor_vehicle=yes
+
+* : W : natural == water && leisure == swimming_pool # natural water used for swimming pool
+* : W : natural == water && amenity == swimming_pool # natural water used for swimming pool
+
+* : W : /\d+/ == * # numerical key
+
+# see #9071
+relation : W : type == route_master && route_master != * # route_master relation without route_master=*
+
+# power related stuff (incomplete)
+* : W : power == /line|minor_line|cable/ && voltage != * # power line without voltage
+* : W : substation == * && power != substation # substation key without power=substation
+* : W : transformer == * && power != * # transformer key without power
+* : I : power == substation && substation != * # missing substation=*
+* : I : power == transformer && transformer != * # missing transformer=*
-* : W : natural == water && leisure == swimming_pool # natural water used for swimming pool
-* : W : natural == water && amenity == swimming_pool # natural water used for swimming pool
########################################
# Rules derived from Taginfo statistics
@@ -92,24 +103,24 @@ node : I : amenity == /restaurant|cafe|fast_food/ && name != * # restaurant with
# see ticket #5017
# Taginfo query: select keypairs.key1, keypairs.key2, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key1='waterway' and keys.key=keypairs.key2 and (key1<>'highway' or keypairs.count_all>12000) and (key1<>'railway' or keypairs.count_all>3000) and (key1<>'waterway' or keypairs.count_all>800) and key2 not like '%:%' and from_fraction_all>0.97 and 1 union select keypairs.key2, keypairs.key1, keypairs.count_all, keys.count_all, cast(keypairs.count_all as real)/keys.count_all as from_fraction_all from keys, keypairs where key2='waterway' and keys.key=keypairs.key1 and (key2<>'highway' or keypairs.count_all>12000) and (key2<>'railway' or keypairs.count_all>3000) and (key2<>'waterway' or keypairs.count_all>800) and key1 not like '%:%' and from_fraction_all>0.97 and 1 order by keypairs.count_all desc limit 1000;
-* : W : incline == * && highway != * # incline without highway
+* : W : incline == * && highway != * && railway != * # incline without highway or railway
way : W : junction == * && highway != * # junction without highway
* : W : lanes == * && highway != * # lanes without highway
* : W : lcn == * && highway != * # lcn without highway
-* : W : lit == * && highway != * && public_transport != platform # lit without highway
+* : W : lit == * && highway != * && railway != * && piste:type != * && amenity != /parking.*/ && public_transport != platform # lit without highway/railway/piste/parking/platform
* : W : living_street == * && highway != * # living_street without highway
* : W : maintenance == * && highway != * # maintenance without highway
* : W : median == * && highway != * # median without highway
* : W : motorroad == * && highway != * # motorroad without highway
* : W : ntd_id == * && highway != * # ntd_id without highway
-* : W : oneway == * && highway != * # oneway without highway
+* : W : oneway == * && highway != * && railway != * # oneway without highway or railway
* : W : sac_scale == * && highway != * # sac_scale without highway
* : W : segregated == * && highway != * # segregated without highway
* : W : sidewalk == * && highway != * # sidewalk without highway
* : W : smoothness == * && highway != * # smoothness without highway
* : W : snowplowing == * && highway != * # snowplowing without highway
* : W : step_count == * && highway != * # step_count without highway
-* : W : toll == * && highway != * # toll without highway
+* : W : toll == * && highway != * && route != ferry # toll without highway
* : W : tracktype == * && highway != * # tracktype without highway
* : W : trail_visibility == * && highway != * # trail_visibility without highway
* : W : trolley_wire == * && highway != * # trolley_wire without highway
@@ -141,18 +152,56 @@ way : W : junction == * && highway != *
* : W : llid == * && waterway != * # llid without waterway
* : W : canal == * && waterway != * # canal without waterway
* : W : have_riverbank == * && waterway != * # have_riverbank without waterway
-* : W : tunnel == * && highway != * && railway != * && waterway != * # tunnel without highway/railway/waterway
-* : W : bridge == * && highway != * && railway != * && waterway != * # bridge without highway/railway/waterway
-* : W : psv == * && highway != * && railway != * && waterway != * # psv without highway/railway/waterway
-* : W : width == * && highway != * && railway != * && waterway != * && aeroway != * # width without highway/railway/waterway/aeroway
-* : W : maxspeed == * && highway != * && railway != * && traffic_sign != maxspeed && type != enforcement # maxspeed without highway/railway/traffic_sign
+* : W : tunnel == * && highway != * && railway != * && waterway != * && public_transport != platform && man_made != pipeline # tunnel without highway/railway/waterway/platform/pipeline
+* : W : bridge == * && highway != * && railway != * && waterway != * && piste:type != * && public_transport != platform && man_made != /bridge|pipeline/ && building != bridge # bridge without highway/railway/waterway/platform/piste/pipeline
+* : W : psv == * && highway != * && railway != * && waterway != * && amenity != /parking.*/ # psv without highway/railway/waterway/parking
+* : W : width == * && highway != * && railway != * && waterway != * && aeroway != * && cycleway != * && footway != * && barrier != * && man_made != * && entrance != * # width without physical linear feature
+* : W : maxspeed == * && highway != * && railway != * && traffic_sign != /(.*;)?maxspeed(;.*)?/ && type != enforcement # maxspeed without highway/railway/traffic_sign/enforcement
+* : W : fence_type == * && barrier != fence # fence_type without barrier=fence
+* : W : border_type == * && boundary != * # border_type without boundary
+* : W : recycling_type == * && amenity != recycling # recycling_type without amenity=recycling
+* : W : board_type == * && information != board # board_type without information=board
+* : W : shelter_type == * && amenity != shelter # shelter_type without amenity=shelter
+* : W : lamp_type == * && highway != street_lamp # lamp_type without highway=street_lamp
+* : W : map_type == * && information != map # map_type without information=map
+* : W : site_type == * && historic != archaeological_site # site_type without historic=archaeological_site
+* : W : artwork_type == * && tourism != artwork # artwork_type without tourism=artwork
+* : W : castle_type == * && historic != castle # castle_type without historic=castle
+* : W : reservoir_type == * && landuse != reservoir && water != reservoir # reservoir_type without landuse/water=reservoir
+* : W : bunker_type == * && military != bunker # bunker_type without military=bunker
+* : W : source:addr == * && /addr:*/ != * # source:addr without addr:*
+* : W : source:date == * && source != * # source:date without source
+* : W : source:name == * && name != * # source:name without name
+* : W : source:maxspeed == * && maxspeed != * # source:maxspeed without maxspeed
+* : W : source:building == * && building != * # source:building without building
+* : W : source:ref == * && ref != * # source:ref without ref
+* : W : source:population == * && population != * # source:population without population
+node : W : source:geometry == * # source:geometry on a node
+* : W : /source:*postcode/ == * && addr:postcode != * # source:[addr:]postcode without addr:postcode
+* : W : source:postal_code == * && addr:postcode != * # source:postal_code without addr:postcode
+* : W : source:ele == * && ele != * # source:ele without ele
+* : W : source:ref:INSEE == * && ref:INSEE != * # source:ref:INSEE without ref:INSEE
+* : W : source:lit == * && lit != * # source:lit without lit
+* : W : source:hgv == * && hgv != * # source:hgv without hgv
+node : W : source:outline == * # source:outline on a node
+* : W : source:highway == * && highway != * # source:highway without highway
+* : W : source:maxaxleload == * && maxaxleload != * # source:maxaxleload without maxaxleload
+* : W : source:surface == * && surface != * # source:surface without surface
+* : W : source:bridge == * && bridge != * # source:bridge without bridge
+* : W : source:old_name == * && old_name != * # source:old_name without old_name
+* : W : source:bicycle == * && bicycle != * # source:bicycle without bicycle
+* : W : source:designation == * && designation != * # source:designation without designation
+* : W : /source:*housenumber/ == * && addr:housenumber != * # source:[addr:]housenumber without addr:housenumber
+* : W : source:height == * && height != * # source:height without height
+* : W : source:lanes == * && lanes != * # source:lanes without lanes
+
################################
# Religion / Denomination tests
################################
* : I : religion == /christian|jewish|muslim/ && denomination != * # religion without denomination
-* : I : religion == christian && denomination == * && denomination != /anglican|apostolic|baptist|catholic|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_orthodox|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|roman_catholic|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|united|united_reformed|uniting/ # unknown christian denomination
+* : I : religion == christian && denomination == * && denomination != /anglican|apostolic|baptist|catholic|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|roman_catholic|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|united|united_reformed|uniting/ # unknown christian denomination
* : I : religion == muslim && denomination == * && denomination != /alaouite|druze|ibadi|ismaili|nondenominational|shia|sunni/ # unknown muslim denomination
* : I : religion == jewish && denomination == * && denomination != /alternative|ashkenazi|conservative|hasidic|humanistic|liberal|modern_orthodox|neo_orthodox|nondenominational|orthodox|progressive|reconstructionist|reform|renewal|samaritan|ultra_orthodox/ # unknown jewish denomination
@@ -164,4 +213,20 @@ way : W : junction == * && highway != *
# If there is no language at all, this is broken. Also catches 'wikipedia' used as 'email', 'website', 'ele' [sic!] ...
* : E : wikipedia == * && wikipedia != /[a-zA-Z_-]{2,12}:.*/ # no wikipedia-language given, use ''wikipedia''=''language:page title''
# Valid languages are extracted from <http://de.wikipedia.org/w/api.php?action=sitematrix&format=xml>, which may change, so this is a warning only.
-* : W : wikipedia == /[a-zA-Z_-]{2,12}:.*/ && wikipedia != /(aa|ab|ace|af|ak|als|am|an|ang|ar|arc|arz|as|ast|av|ay|az|ba|bar|bat-smg|bcl|be|be-x-old|bg|bh|bi|bjn|bm|bn|bo|bpy|br|bs|bug|bxr|ca|cbk-zam|cdo|ce|ceb|ch|cho|chr|chy|ckb|co|cr|crh|cs|csb|cu|cv|cy|cz|da|de|diq|dk|dsb|dv|dz|ee|el|eml|en|eo|epo|es|et|eu|ext|fa|ff|fi|fiu-vro|fj|fo|fr|frp|frr|fur|fy|ga|gag|gan|gd|gl|glk|gn|got|gu|gv|ha|hak|haw|he|hi|hif|ho|hr|hsb|ht|hu|hy|hz|ia|id|ie|ig|ii|ik|ilo|io|is|it|iu|ja|jbo|jp|jv|ka|kaa|kab|kbd|kg|ki|kj|kk|kl|km|kn|ko|koi|kr|krc|ks|ksh|ku|kv|kw|ky|la|lad|lb|lbe|lez|lg|li|lij|lmo|ln|lo|lt|ltg|lv|map-bms|mdf|mg|mh|mhr|mi|minnan|mk|ml|mn|mo|mr|mrj|ms|mt|mus|mwl|my|myv|mzn|na|nah|nan|nap|nb|nds|nds-nl|ne|new|ng|nl|nn|no|nov|nrm|nso|nv|ny|oc|om|or|os|pa|pag|pam|pap|pcd|pdc|pfl|pi|pih|pl|pms|pnb|pnt|ps|pt|qu|rm|rmy|rn|ro|roa-rup|roa-tara|ru|rue|rw|sa|sah|sc|scn|sco|sd|se|sg|sh|si|simple|sk|sl|sm|sn|so|sq|sr|srn|ss|st|stq|su|sv|sw|szl|ta|te|tet|tg|th|ti|tk|tl|tn|to|tpi|tr|ts|tt|tum|tw|ty|udm|ug|uk|ur|uz|ve|vec|vep|vi|vls|vo|wa|war|wo|wuu|xal|xh|xmf|yi|yo|za|zea|zh|zh-cfr|zh-classical|zh-min-nan|zh-yue|zu):.*/ # unkown language prefix in wikipedia tag
+* : W : wikipedia == /[a-zA-Z_-]{2,12}:.*/ && wikipedia != /(aa|ab|ace|af|ak|als|am|an|ang|ar|arc|arz|as|ast|av|ay|az|ba|bar|bat-smg|bcl|be|be-x-old|bg|bh|bi|bjn|bm|bn|bo|bpy|br|bs|bug|bxr|ca|cbk-zam|cdo|ce|ceb|ch|cho|chr|chy|ckb|co|cr|crh|cs|csb|cu|cv|cy|cz|da|de|diq|dk|dsb|dv|dz|ee|el|eml|en|eo|epo|es|et|eu|ext|fa|ff|fi|fiu-vro|fj|fo|fr|frp|frr|fur|fy|ga|gag|gan|gd|gl|glk|gn|got|gu|gv|ha|hak|haw|he|hi|hif|ho|hr|hsb|ht|hu|hy|hz|ia|id|ie|ig|ii|ik|ilo|io|is|it|iu|ja|jbo|jp|jv|ka|kaa|kab|kbd|kg|ki|kj|kk|kl|km|kn|ko|koi|kr|krc|ks|ksh|ku|kv|kw|ky|la|lad|lb|lbe|lez|lg|li|lij|lmo|ln|lo|lt|ltg|lv|map-bms|mdf|mg|mh|mhr|mi|minnan|mk|ml|mn|mo|mr|mrj|ms|mt|mus|mwl|my|myv|mzn|na|nah|nan|nap|nb|nds|nds-nl|ne|new|ng|nl|nn|no|nov|nrm|nso|nv|ny|oc|om|or|os|pa|pag|pam|pap|pcd|pdc|pfl|pi|pih|pl|pms|pnb|pnt|ps|pt|qu|rm|rmy|rn|ro|roa-rup|roa-tara|ru|rue|rw|sa|sah|sc|scn|sco|sd|se|sg|sh|si|simple|sk|sl|sm|sn|so|sq|sr|srn|ss|st|stq|su|sv|sw|szl|ta|te|tet|tg|th|ti|tk|tl|tn|to|tpi|tr|ts|tt|tum|tw|ty|udm|ug|uk|ur|uz|ve|vec|vep|vi|vls|vo|wa|war|wo|wuu|xal|xh|xmf|yi|yo|za|zea|zh|zh-cfr|zh-classical|zh-min-nan|zh-yue|zu):.*/ # unknown language prefix in wikipedia tag
+
+# measurement values and units warnings (ticket #8687)
+way : W : layer == * && layer != /^0$|^-?[1-5]$/ # layer should be between -5 and 5
+* : W : level == * && level != /^((([0-9]|-[1-9])|[1-9][0-9]*)(\.5)?)(;(([0-9]|-[1-9])|[1-9][0-9]*)(\.5)?)*$|^-0\.5$/ # level should be numbers with optional .5 increments
+* : W : height == * && height != /^(([0-9]+\.?[0-9]*( m)?)|([1-9][0-9]*\'((10|11|[0-9])((\.[0-9]+)?)\")?))$/ # height: meters is default; period is separator; if units, put space then unit
+
+* : W : maxheight == * && maxheight != /^(([1-9][0-9]*(\.[0-9]+)?( m)?)|([0-9]+\'([0-9]|10|11)(\.[0-9]*)?\"))$/ # maxheight: meters is default; period is separator; if units, put space then unit
+way : W : width == * && width != /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/ # width: meters is default; period is separator; if units, put space then unit
+* : W : maxwidth == * && maxwidth != /^(([0-9]+\.?[0-9]*( m)?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/ # maxwidth: meters is default; period is separator; if units, put space then unit
+way : W : maxspeed == * && maxspeed != /^(signals|none|unposted|unknown|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/ # unusual maxspeed format
+way : W : voltage == * && voltage == /(.*[A-Za-z].*)|.*,.*|.*( ).*/ # voltage should be in volts with no units/delimiter/spaces
+# some users are using frequency for other purposes (not electromagnetic) with the values 'perennial' and 'intermittent'; the vast majority are 0, 16.7, 50 and 60
+way : W : frequency == * && frequency != /^(0|[1-9][0-9]*(\.[0-9]+)?)( (kHz|MHz|GHz|THz))?$/ # unusual frequency specification
+way : W : gauge == * && gauge != /^([1-9][0-9]{1,3}(;[1-9][0-9]{1,3})*|broad|standard|narrow)$/ # unusual train track gauge; use mm with no separator
+# the numbers for percentage and degrees include could probably be bracketed a bit more precisely
+way : W : incline == * && incline != /^(up|down|-?([0-9]+?(\.[1-9]%)?|100)[%°]?)$/ # unusual incline; use percentages/degrees or up/down
diff --git a/data/words.cfg b/data/validator/words.cfg
similarity index 100%
rename from data/words.cfg
rename to data/validator/words.cfg
diff --git a/i18n/README.TXT b/i18n/README.TXT
index 106c7bb..d747632 100644
--- a/i18n/README.TXT
+++ b/i18n/README.TXT
@@ -31,6 +31,9 @@ Call "./launchpad.pl download". You need to set login information (see file how
Can also be issued by hand on the Launchpad web page.
After some time a mail is sent with a URL. With this URL step (3) can be done.
+7) Build a single plugin:
+Call "ant -Dplugin=name singleplugintrans"
+
NOTE:
a) Your repositories should not have any local modifications which modify string elements!
b) Always do an "svn up" for core and plugins before starting!
diff --git a/i18n/build.xml b/i18n/build.xml
index c96073a..993140c 100644
--- a/i18n/build.xml
+++ b/i18n/build.xml
@@ -5,7 +5,7 @@
<property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/>
<property name="josm.style" value="${josm.build.dir}/styles/standard/elemstyles.xml"/>
<property name="plugin.dir" value="../plugins"/>
- <property name="validator.tagfile" value="${josm.build.dir}/data/tagchecker.cfg"/>
+ <property name="validator.tagfile" value="${josm.build.dir}/data/validator/tagchecker.cfg"/>
<property name="wms.srcfile" value="http://josm.openstreetmap.de/maps"/>
<property name="surveyor.srcfile" value="${plugin.dir}/surveyor/resources/surveyor.xml"/>
<property name="i18n.build.dir" value="build"/>
@@ -59,6 +59,11 @@
</path>
</foreach>
</target>
+ <target name="singleplugintrans" depends="po/josm.pot,init">
+ <antcall target="plugintrans">
+ <param name="path" value="${plugin}"/>
+ </antcall>
+ </target>
<target name="buildcore" depends="po/josm.pot,init">
<gettext-merge keysFile="josm.pot" poDirectory="po"/>
<antcall target="coretrans"/>
diff --git a/i18n/convpreset.pl b/i18n/convpreset.pl
index 8e6cfc8..bc9a86d 100644
--- a/i18n/convpreset.pl
+++ b/i18n/convpreset.pl
@@ -27,9 +27,12 @@ sub fix($)
return $val;
}
+my $linenr = 0;
while(my $line = <>)
{
+ ++$linenr;
chomp($line);
+ print "tr(\"\"); ";
if($line =~ /<item\s+name=(".*?")/)
{
my $val = fix($1);
@@ -110,6 +113,18 @@ while(my $line = <>)
print "/* item $item role $n */ tr($n);\n";
}
}
+ elsif($line =~ /<optional.*\s+text=(".*?")/)
+ {
+ my $n = fix($1);
+ if($line =~ /text_context=(".*?")/)
+ {
+ print "/* item $item optional $n */ trc($1,$n);\n";
+ }
+ else
+ {
+ print "/* item $item optional $n */ tr($n);\n";
+ }
+ }
elsif($line =~ /<(combo|multiselect).*\s+text=(".*?")/)
{
my ($type,$n) = ($1,fix($2));
@@ -120,11 +135,11 @@ while(my $line = <>)
my $tctx = ($line =~ /text_context=(".*?")/) ? $1 : undef;
print "/* item $item $type $n */" . ($tctx ? " trc($tctx, $n);" : " tr($n);");
# display_values / values
- my $sp = ($type eq "combo" ? ",":";");
+ my $sp = ($line =~ /delimiter="(.*?)"/) ? $1 : ($type eq "combo" ? ",":";");
my $vals = ($line =~ /display_values="(.*?)"/) ? $1 : ($line =~ /values="(.*?)"/) ? $1 : undef;
if($vals)
{
- my @combo_values = split $sp,$vals;
+ my @combo_values = split "\Q$sp\E" ,$vals;
foreach my $val (@combo_values)
{
next if $val =~ /^[0-9-]+$/; # search for non-numbers
@@ -168,6 +183,7 @@ while(my $line = <>)
elsif($line =~ /<\/combo/)
{
$combo_n = "";
+ print "\n";
}
elsif(!$line)
{
@@ -179,6 +195,8 @@ while(my $line = <>)
|| $line =~ /<\/?optional>/
|| $line =~ /<key/
|| $line =~ /<presets/
+ || $line =~ /<checkgroup/
+ || $line =~ /<\/checkgroup/
|| $line =~ /<\/presets/
|| $line =~ /roles/
|| $line =~ /href=/
@@ -192,7 +210,7 @@ while(my $line = <>)
else
{
print "/* unparsed line $line */\n";
- print STDERR "/* unparsed line $line */\n";
+ print STDERR "/* unparsed line $linenr $line */\n";
$result = 20
}
diff --git a/i18n/convstyle.pl b/i18n/convstyle.pl
index 9951a16..0a4dddd 100644
--- a/i18n/convstyle.pl
+++ b/i18n/convstyle.pl
@@ -5,6 +5,8 @@
use strict;
+my $rule_cond; # cumulated conditions from current rule
+
# This is a simple conversion and in no way a complete XML parser
# but it works with a default Perl installation
@@ -15,13 +17,50 @@ print "class trans_style { void tr(String s){} void f() {";
while(my $line = <>)
{
chomp($line);
+ print "tr(\"\"); ";
if($line =~ /<rules\s+name=(".*?")/)
{
print "/* mappaint style named $1 */ tr($1);\n";
}
+ elsif($line =~ /<rule\s*>/)
+ {
+ $rule_cond = "";
+ print "/* $line */\n";
+ }
+ elsif($line =~ /<condition.*\s+k="([^"]*)"/)
+ {
+ my $cond_k = $1; # according to schema, k is always present
+ my $cond_v = ($line =~ /\s+v="([^"]*)"/) ? $1 : "";
+ my $cond_b = ($line =~ /\s+b="([^"]*)"/) ? $1 : "";
+ print STDERR "$0: Found both v=\"$cond_v\" and b=\"$cond_b\" for k=\"$cond_k\" at line $.\n" if ($cond_v && $cond_b);
+ my $cond = ($cond_v || $cond_b) ? "$cond_k=$cond_v$cond_b" : "$cond_k"; # v and b shouldn't appear both
+ if ($rule_cond)
+ {
+ $rule_cond .= ", " . $cond;
+ }
+ else
+ {
+ $rule_cond = $cond;
+ }
+ print "/* $line */\n";
+ }
elsif($line =~ /colour="([^"]+)#/)
{
- print "/* color $1 */ tr(\"$1\");\n";
+ if ($line =~ /\s+colour="([^"]+)#/)
+ {
+ my $c = $1;
+ my $co = $1;
+ $c =~ s/[^a-z0-9]+/./g;
+ print "/* color $co (applied for \"$rule_cond\") */ tr(\"$c\");";
+ }
+ if ($line =~ /\s+dashedcolour="([^"]+)#/)
+ {
+ my $c = $1;
+ my $co = $1;
+ $c =~ s/[^a-z0-9]+/./g;
+ print "/* color $co (applied for \"$rule_cond\") */ tr(\"$c\");";
+ }
+ print "\n";
}
else
{
diff --git a/i18n/convsurveyor.pl b/i18n/convsurveyor.pl
index e03ae8a..f0e373c 100644
--- a/i18n/convsurveyor.pl
+++ b/i18n/convsurveyor.pl
@@ -18,6 +18,7 @@ print "class trans_surveyor { void tr(String s){} void f() {";
while(my $line = <>)
{
chomp($line);
+ print "tr(\"\"); ";
if($line =~ /^#(.*)$/)
{
print "/* $1 */\n";
diff --git a/i18n/convvalidator.pl b/i18n/convvalidator.pl
index 9a32329..d230bc0 100644
--- a/i18n/convvalidator.pl
+++ b/i18n/convvalidator.pl
@@ -18,6 +18,7 @@ print "class trans_validator { void tr(String s){} void f() {";
while(my $line = <>)
{
chomp($line);
+ print "tr(\"\"); ";
if($line =~ /^#(.*)$/)
{
print "/* $1 */\n";
diff --git a/i18n/convwms.pl b/i18n/convwms.pl
index 0b0cdb4..ce45ead 100644
--- a/i18n/convwms.pl
+++ b/i18n/convwms.pl
@@ -33,6 +33,7 @@ for my $line (@lines)
{
$line =~ s/\r//g;
chomp($line);
+ print "tr(\"\"); ";
if($line =~ /<name>(.*)<\/name>/)
{
my $val = $1;
diff --git a/i18n/po/af.po b/i18n/po/af.po
index a8e30cd..e9d767c 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:31+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr "laai af"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr "Verwyder"
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr "Geskiedenis"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/am.po b/i18n/po/am.po
index 82ec989..68cf375 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:32+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index a9d4ae7..bf894c6 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 14:17+0000\n"
"Last-Translator: Chdoula <chdoula at gmail.com>\n"
"Language-Team: Arabic <ar at li.org>\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:32+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -151,13 +166,13 @@ msgid "About JOSM..."
msgstr "حول JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -200,6 +215,9 @@ msgstr "لا يوجد طبقات هدف"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -239,9 +257,6 @@ msgstr "العدة: {0}"
msgid "Please select at least four nodes."
msgstr "الرجاء إختيار أربعة عقد على الأقل."
-msgid "Information"
-msgstr "المعلومات"
-
msgid "Align Nodes in Line"
msgstr "صفّ العقد في خطّ مستقيم"
@@ -266,6 +281,9 @@ msgstr "التناقض"
msgid "download"
msgstr "نزّل"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "السابق"
@@ -275,6 +293,9 @@ msgstr "التالي"
msgid "Nothing selected to zoom to."
msgstr "لا يوجد شيء محدد للتكبير/للتصغير."
+msgid "Information"
+msgstr "المعلومات"
+
msgid "Zoom to {0}"
msgstr "زوم الى {0}"
@@ -330,9 +351,9 @@ msgstr ""
"لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "ادمج {0} طرقات"
@@ -387,18 +408,35 @@ msgstr "أحذف"
msgid "Delete selected objects."
msgstr "امحي الأغراض المختارة."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "وزّع العقد"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "وزع العقد المختارة على مسافاة متساوية على طول خط."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "نزّل من أو.أس.أم ..."
msgid "Download map data from the OSM server."
msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -493,6 +531,9 @@ msgstr "الخط الزمني"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -606,7 +647,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -756,8 +797,8 @@ msgid "Merge nodes into the oldest one."
msgstr "ادمج العقد إلى العقدة الأعتق."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -914,8 +955,8 @@ msgid "Download Data"
msgstr "نزل معطيات"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -942,12 +983,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -965,9 +1002,6 @@ msgstr "إسقاط عمودي"
msgid "Usage"
msgstr "الاستعمال"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1074,6 +1108,15 @@ msgstr "و غير إسم الملف"
msgid "Could not rename file ''{0}''"
msgstr "لم أتمكن من إعادة تسمية الوثيقة ''{0}''"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1124,9 +1167,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1188,6 +1228,9 @@ msgstr "تقرير عن الحالة"
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "اغلق"
@@ -1266,13 +1309,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1361,6 +1404,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "تَراجَع"
@@ -1385,9 +1449,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1583,6 +1644,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "تقدّم بطيء"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "تنزيل معطيات جهاز نظام تحديد المواقع العالمي"
@@ -1592,6 +1656,18 @@ msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواق
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "جاري تحميل المعطيات"
@@ -1611,6 +1687,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "نزل {0} من {1} (باقية {2} )"
@@ -1661,25 +1762,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1822,6 +1904,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1846,8 +1931,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1863,6 +1948,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2269,6 +2357,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2429,13 +2520,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2444,6 +2535,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2462,8 +2556,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2549,6 +2642,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2585,10 +2681,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2612,8 +2708,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2717,6 +2813,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2777,8 +2876,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2808,11 +2907,11 @@ msgstr "طبق التغييرات المختارة"
msgid "Do not apply changes"
msgstr "لا تطبق التغييرات"
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
-msgstr "خصائص "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr ""
@@ -2832,6 +2931,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2862,18 +2964,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2882,8 +2984,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2891,13 +2993,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2911,8 +3011,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2942,11 +3042,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "مجهول"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3111,8 +3210,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3219,7 +3317,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3238,6 +3336,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3254,9 +3355,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3295,6 +3393,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "عناوين"
@@ -3319,6 +3420,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3378,13 +3488,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3454,6 +3564,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "متعدد الضلوع"
@@ -3523,6 +3651,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3580,13 +3714,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3618,10 +3752,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3755,7 +3889,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3830,6 +3964,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3860,9 +3997,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3887,10 +4021,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3953,23 +4087,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4077,7 +4194,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr "جاري تنزيل \"أخبار اليوم\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4273,9 +4390,24 @@ msgstr "العرض"
msgid "Tools"
msgstr "العدة"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "الخيار"
+
msgid "Presets"
msgstr "التعيينات المسبقة"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4291,10 +4423,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "سمعيّ"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4303,6 +4447,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4362,6 +4509,9 @@ msgstr "(لا يوجد أي غرض)"
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "الطبقة ليست في اللائحة."
@@ -4389,19 +4539,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "غير مفعّل : لا تطبق هذه المواصفة على الأغراض المختارة"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4689,29 +4826,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
-msgid ""
+msgid "> before"
+msgstr ""
+
+msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4726,7 +4881,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4778,14 +4933,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5039,14 +5186,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5567,6 +5714,9 @@ msgstr "عرض/إخفاء"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5650,6 +5800,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "مختلط"
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "العلاقات"
@@ -5671,9 +5848,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "العلاقات: {0}"
-msgid "Selection"
-msgstr "الخيار"
-
msgid "Open a selection list window."
msgstr "إفتح نافذة لائحة خيارات."
@@ -5698,18 +5872,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "الخيار: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5726,6 +5888,18 @@ msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شر
msgid "Click to minimize/maximize the panel content"
msgstr "أنقر لتكبير/تصغير محتويات اللوحة"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "المؤلفين"
@@ -5743,8 +5917,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5770,9 +5943,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5917,9 +6087,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6204,8 +6371,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6270,35 +6437,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "خصائص/عضويات"
+msgid "Discardable key: selection Background"
+msgstr ""
+
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "خصائص الأغراض المختارة."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<مختلف>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "عضو من"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "الخصائص: {0} / العضويات: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "الخصائص/ العضويات"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
-msgid "Delete Properties"
-msgstr "أمحي الخصائص"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "غيّر العلاقة"
@@ -6312,13 +6491,13 @@ msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
msgid "Add a new key/value pair to all objects"
msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6397,12 +6576,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6432,9 +6605,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6472,7 +6651,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6532,6 +6711,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6787,6 +6969,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "إشارات مرجعية"
@@ -6852,9 +7053,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6921,21 +7119,8 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "مختلط"
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr ""
+msgid "Start downloading"
+msgstr "بدأ التنزيل"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6945,23 +7130,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "بدأ التنزيل"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7058,7 +7229,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7157,6 +7328,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7244,7 +7418,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7264,6 +7438,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7330,8 +7510,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7406,8 +7585,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7421,8 +7600,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7637,12 +7815,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7651,6 +7823,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7666,6 +7854,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7673,8 +7876,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7786,9 +7989,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7798,6 +7998,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7814,7 +8017,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7960,7 +8163,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7990,7 +8193,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8104,6 +8307,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8141,6 +8347,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8337,9 +8546,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8358,6 +8564,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8415,6 +8624,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8481,9 +8696,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8496,8 +8708,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "نزّل كلّ شيئ بين:"
@@ -8523,12 +8738,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8661,14 +8880,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8683,7 +8898,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8693,8 +8908,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8914,7 +9128,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8980,6 +9194,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9037,9 +9257,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9287,6 +9504,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"يجب عليك إعادة بدء تشغيل ج.أو.أس.أم كي تُأخذ بعض التغييرات بعين الإعتبار."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "التحم عن بعد"
@@ -9415,6 +9635,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9457,6 +9683,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9507,19 +9736,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9537,40 +9757,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9594,6 +9823,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9650,6 +9912,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9703,6 +9968,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9985,7 +10255,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10154,6 +10430,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10217,7 +10499,7 @@ msgstr "إعدادات الخريطة"
msgid "Settings for the map projection and data interpretation."
msgstr "إعدادت إسقاط الخريطة و تفسير المعطيات."
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10475,40 +10757,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10561,8 +10843,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10571,20 +10853,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10666,14 +10953,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr "مُعَطَّل"
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10717,32 +10998,41 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "العناصر من الفصيلة {0} هي مدعومة"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "غيّر غرض {0}"
+msgstr[1] "غيّر {0} غرضين"
+msgstr[2] "غيّر {0} أغراض"
+msgstr[3] "غيّر {0} غرض"
+msgstr[4] "غيّر {0} أغراض"
+msgstr[5] "غيّر {0} غرض"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "الخيار فارغ !"
+
+msgid "Selection unsuitable!"
+msgstr "الخيار غير مناسب !"
+
+msgid "Apply Preset"
+msgstr "طبّق الخيار المسبق"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "مزيد من المعلومات عن هذه الميزة"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -10750,6 +11040,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "مزيد من المعلومات عن هذه الميزة"
+
msgid "Available roles"
msgstr ""
@@ -10765,63 +11058,61 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "ميزات خيارية:"
-msgid "Use preset ''{0}'' of group ''{1}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Use preset ''{0}''"
-msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
-
-msgid "Unknown type: {0}"
-msgstr "نوع غير معروف: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Error parsing {0}: "
-msgstr "خطأ في التحليل النحوي {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "العناصر من الفصيلة {0} هي مدعومة"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "غيّر غرض {0}"
-msgstr[1] "غيّر {0} غرضين"
-msgstr[2] "غيّر {0} أغراض"
-msgstr[3] "غيّر {0} غرض"
-msgstr[4] "غيّر {0} أغراض"
-msgstr[5] "غيّر {0} غرض"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
-msgstr "الخيار فارغ !"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "الخيار غير مناسب !"
+msgid "Unknown type: {0}"
+msgstr "نوع غير معروف: {0}"
-msgid "Apply Preset"
-msgstr "طبّق الخيار المسبق"
+msgid "Preset group {1} / {0}"
+msgstr ""
-msgid "New relation"
+msgid "Preset group {0}"
msgstr ""
-msgid "Change Properties"
-msgstr "غيّر الخصائص"
+msgid "Roles cannot appear more than once"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "خطأ في التحليل النحوي {0}: "
+
msgid "Search preset"
msgstr ""
@@ -10837,6 +11128,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10866,6 +11165,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "غير مفعّل : لا تطبق هذه المواصفة على الأغراض المختارة"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10896,7 +11238,7 @@ msgid "Contacting OSM Server..."
msgstr "جاري الإتصال بالخادم أو.أس.أم"
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10936,28 +11278,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11054,6 +11394,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11069,12 +11412,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11153,8 +11504,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "نجاح إسيراد NMEA"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "فشل إستيراد NMEA !"
@@ -11252,35 +11603,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11290,8 +11617,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11318,10 +11645,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11332,9 +11656,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11356,6 +11677,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11405,8 +11729,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11549,6 +11873,9 @@ msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11567,6 +11894,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11591,16 +11927,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11612,6 +11951,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11626,6 +11973,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11656,19 +12012,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11690,11 +12046,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11764,13 +12132,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11913,10 +12281,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11931,22 +12299,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12015,8 +12382,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12031,9 +12397,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12355,17 +12736,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12376,9 +12751,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12410,9 +12828,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12735,6 +13167,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12814,6 +13251,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12915,9 +13356,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12973,6 +13411,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12997,9 +13438,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13025,9 +13463,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13064,6 +13499,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13110,9 +13550,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13197,6 +13634,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13287,6 +13727,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13305,10 +13789,10 @@ msgstr "مساحة"
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13320,6 +13804,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13347,18 +13834,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13368,9 +13849,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13380,13 +13858,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13434,6 +13912,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13518,6 +13999,9 @@ msgstr "حرّر جسر"
msgid "viaduct"
msgstr "جسر"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13622,21 +14106,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13652,10 +14145,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13691,7 +14184,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13760,12 +14253,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "هاتف طوارئ"
+msgid "Drinking Water"
+msgstr "ماء شفة"
msgid "Traffic Signal"
msgstr "إشارة سير"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "نوع التقاطع للمشاة"
@@ -13781,15 +14280,6 @@ msgstr "جزيرة"
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13811,6 +14301,15 @@ msgstr ""
msgid "tiger"
msgstr "نمر"
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "إشارة وقوف"
@@ -13820,6 +14319,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "مستديرة صغيرة"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "الإتجاه"
@@ -13829,10 +14331,7 @@ msgstr "إتجاه عقارب الساعة"
msgid "Pedestrian Crossing"
msgstr "تقاطع مشاة"
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13865,10 +14364,7 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
-msgid "Turning Circle"
+msgid "Turning Circle"
msgstr ""
msgid "City Limit"
@@ -13901,19 +14397,43 @@ msgstr ""
msgid "Barriers"
msgstr "حواجز"
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr "السير المسموح:"
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
+msgid "Bollard"
+msgstr ""
+
+msgid "Edit Bollard"
+msgstr ""
+
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
msgid "Cycle Barrier"
msgstr "حاجز دراجة"
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13925,6 +14445,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13946,19 +14469,34 @@ msgstr "حرّر مراقبة الحدود"
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13967,22 +14505,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "حائط/جدار"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "حائط/جدار مدينة"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14015,12 +14582,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14078,6 +14660,9 @@ msgstr "مسرب"
msgid "Edit Drain"
msgstr "حرّر مسرب"
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14087,6 +14672,12 @@ msgstr "جدول نهر"
msgid "Edit Stream"
msgstr "حرّر جدول نهر"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "قناة"
@@ -14126,9 +14717,6 @@ msgstr "حرّر سدّ"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14162,6 +14750,21 @@ msgstr "حرّر خزان مغطى"
msgid "Edit Water"
msgstr "حرّر الماء"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "الأرض اليابسة"
@@ -14243,18 +14846,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14327,7 +14935,10 @@ msgstr "عسكري"
msgid "tourism"
msgstr "سياحة"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14351,10 +14962,13 @@ msgstr ""
msgid "rail"
msgstr "سكة حديد"
-msgid "Voltage"
-msgstr "التوتر"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14366,9 +14980,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "قطار ذات سكة حديد واحدة"
@@ -14411,18 +15022,56 @@ msgstr "سكة حديد غير مستعملة"
msgid "Edit Disused Railway"
msgstr "حرّر سكة حديد غير مستعملة"
-msgid "Optional Types"
-msgstr ""
-
msgid "Abandoned Rail"
msgstr "سكة حديد مهجورة"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14522,11 +15171,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14538,11 +15185,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14561,10 +15206,10 @@ msgstr "مساحة"
msgid "underground"
msgstr "تحت الأرض"
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14594,9 +15239,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "إستيعاب"
@@ -14612,19 +15254,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "أزقات الإفتتاح"
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14774,6 +15432,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "التوتر"
+
msgid "Amperage"
msgstr ""
@@ -14795,6 +15456,12 @@ msgstr "تصليح سيارات"
msgid "Edit Car Repair"
msgstr "حرّر تصليح سيارات"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14822,6 +15489,12 @@ msgstr "إستئجار سيارة"
msgid "Edit Car Rental"
msgstr "حرّر إستئجار سيارة"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "مشاركة السيارة"
@@ -14846,22 +15519,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14883,9 +15540,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "ملابس"
@@ -14949,8 +15603,8 @@ msgstr "حرر إستأجار دراجة"
msgid "Public Transport"
msgstr "النقل المشترك"
-msgid "Route"
-msgstr "الطريق"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "حرّر طريق"
@@ -15080,6 +15734,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15110,6 +15767,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15122,9 +15782,6 @@ msgstr "مناسب لكرسي المقعدين"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15134,9 +15791,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "مبنى"
@@ -15149,6 +15811,9 @@ msgstr "حرّر مدخل قطار نفقي"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15173,14 +15838,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15229,8 +15886,8 @@ msgstr ""
msgid "Taxi"
msgstr "تاكسي"
-msgid "Edit Taxi station"
-msgstr "حرّر موقف تاكسي"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "مطار"
@@ -15283,6 +15940,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr ""
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -15305,21 +15977,6 @@ msgstr "حرّر فندق"
msgid "Stars"
msgstr "النجوم"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr ""
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -15503,6 +16160,12 @@ msgstr "نادي سهر / نادي ليلي"
msgid "Edit Nightclub"
msgstr "حرّر نادي سهر/ نادي ليلي"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "سياحة"
@@ -15524,9 +16187,15 @@ msgstr "برج مراقبة"
msgid "Information Office"
msgstr "مكتب إستعلامات"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "الخريطة"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15539,6 +16208,9 @@ msgstr "شارع"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15578,6 +16250,9 @@ msgstr ""
msgid "Information Board"
msgstr "لوحة معلومات"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15599,22 +16274,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15638,9 +16325,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15665,7 +16349,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15738,49 +16431,43 @@ msgstr "أعمال فنية"
msgid "Edit Artwork"
msgstr "حرّر أعمال فنية"
-msgid "Place of Worship"
-msgstr "معبد"
-
-msgid "Edit Place of Worship"
-msgstr "حرّر معبد"
+msgid "Recording Studio"
+msgstr ""
-msgid "Religion"
-msgstr "الديانة"
+msgid "Edit Studio"
+msgstr ""
-msgid "bahai"
-msgstr "بهائي"
+msgid "audio"
+msgstr ""
-msgid "buddhist"
-msgstr "بوذي"
+msgid "video"
+msgstr ""
-msgid "christian"
-msgstr "نصراني"
+msgid "Place of Worship"
+msgstr "معبد"
-msgid "hindu"
-msgstr "هندوس"
+msgid "Church"
+msgstr "كنيسة"
-msgid "jain"
+msgid "Edit Church"
msgstr ""
-msgid "jewish"
-msgstr "يهودي"
-
-msgid "muslim"
-msgstr "مسلم"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "سيخ"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "روحاني"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15798,6 +16485,12 @@ msgstr "كثليك"
msgid "evangelical"
msgstr "إنجيلي"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "شهود يهوه"
@@ -15810,6 +16503,9 @@ msgstr "منهجي"
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "أرثدكس"
@@ -15825,37 +16521,140 @@ msgstr "بروتستاني"
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "شيعي"
msgid "sunni"
msgstr "سنّي"
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "الديانة"
+
+msgid "bahai"
+msgstr "بهائي"
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr "سيخ"
+
+msgid "spiritualist"
+msgstr "روحاني"
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15945,6 +16744,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "صحة"
@@ -15954,6 +16759,12 @@ msgstr "مستشفى"
msgid "Edit Hospital"
msgstr "حرّر مستشفى"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "أطباء"
@@ -16020,12 +16831,66 @@ msgstr "بيطري"
msgid "Edit Veterinary"
msgstr "حرّر بيطري"
-msgid "Note"
-msgstr "الملاحظة"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "صندوق بريد"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "هاتف"
@@ -16035,6 +16900,30 @@ msgstr "حرّر هاتف"
msgid "Telephone cards"
msgstr "بطاقات هاتفية"
+msgid "Emergency Phone"
+msgstr "هاتف طوارئ"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16044,31 +16933,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16096,8 +16991,8 @@ msgstr ""
msgid "Recycling"
msgstr "إعادة تصنيع الأشياء"
-msgid "Edit Recycling station"
-msgstr "حرّر إعادة تصنيع الأشياء"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "بطاريات"
@@ -16123,27 +17018,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16178,14 +17061,17 @@ msgstr ""
msgid "Height"
msgstr "الإرتفاع"
+msgctxt "height"
msgid "low"
-msgstr "منخفض"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "نصف"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "ملء"
+msgstr ""
msgid "Hide"
msgstr "مخبئ"
@@ -16193,11 +17079,11 @@ msgstr "مخبئ"
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "ماء شفة"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "حرّر ماء شفة"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr ""
@@ -16224,6 +17110,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16261,119 +17150,155 @@ msgstr "مدرج ألعاب رياضية"
msgid "Edit Stadium"
msgstr "حرّر مدرج ألعاب رياضية"
-msgid "select sport:"
-msgstr "إختر الرياضة :"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "الرياضة"
+msgid "Sport"
+msgstr "رياضة"
+msgctxt "sport"
msgid "multi"
-msgstr "متعدد"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "أسلحة الرماية"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "كرة القدم الأوسترالية"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "كرة المضرب"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "كرة السلّة"
+msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "التسلق"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "ركوب الدراجة"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "سبق الكلاب"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "ركوب الخيل"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "الجمباز"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "سبق الخيل"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "رياضة المحركات"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "التزلج"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "كرة القدم"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "السباحة"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "تنس الطاولة"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "التنس"
+msgstr ""
msgid "Sports Centre"
msgstr "مركز/نادي رياضي"
@@ -16405,26 +17330,27 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr "رياضة"
-
msgid "Multi"
msgstr "متعدد"
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "النوع"
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "مركز/نادي رياضي"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "مدرج ألعاب رياضية"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16432,6 +17358,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "مركز/نادي رياضي"
+
+msgid "stadium"
+msgstr "مدرج ألعاب رياضية"
+
msgid "10pin"
msgstr ""
@@ -16465,6 +17400,22 @@ msgstr "حرّر غدف"
msgid "Edit Cycling"
msgstr "حرّر ركب الدراجة"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "سباق الكلاب"
@@ -16477,9 +17428,34 @@ msgstr "فروسي"
msgid "Edit Equestrian"
msgstr "حرّر فروسي"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
msgstr ""
+msgid "mud"
+msgstr "طين"
+
msgid "Horse Racing"
msgstr "سباق الخيل"
@@ -16496,7 +17472,7 @@ msgid "Skating"
msgstr "تزحلق"
msgid "Edit Skating"
-msgstr "حرّر تزحلق"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16540,36 +17516,54 @@ msgstr ""
msgid "Difficulty"
msgstr "الصعوبة"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "مبتدئ"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "سهل"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "خبير"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16612,19 +17606,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16763,6 +17753,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16775,60 +17777,134 @@ msgstr "من صنع الإنسان"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "برج"
@@ -16844,9 +17920,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17056,41 +18129,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17099,8 +18198,8 @@ msgstr "نقطة رؤية"
msgid "Edit Survey Point"
msgstr "حرّر نقطة رؤية"
-msgid "Surveillance"
-msgstr "مراقبة"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "حرّر كامرة مراقبة"
@@ -17111,12 +18210,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "متجر/دكان"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "مولد طاقة"
@@ -17168,99 +18357,217 @@ msgstr "أرياح"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "كهرباء شمسية"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "محطة توليد طاقة"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "حرّر محطة توليد طاقة"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "محطة طاقة فرعية"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "حرّر محطة طاقة فرعية"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "محطة طاقة فرعية"
+
+msgid "Edit Power Sub Station"
+msgstr "حرّر محطة طاقة فرعية"
+
+msgid "Line reference"
msgstr "رقم الخط"
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "منخفض"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17276,6 +18583,9 @@ msgstr "حرّر عمود كهربائي"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17294,11 +18604,9 @@ msgstr "حرّر عمود كهربائي"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17407,11 +18715,11 @@ msgstr "كشك"
msgid "Edit Kiosk"
msgstr "حرّر كشك"
-msgid "Baker"
-msgstr "خباز"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "حرّر خباز"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "جزار"
@@ -17422,7 +18730,7 @@ msgstr "حرّر جزار"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17443,14 +18751,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "مأكولات عضوية"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "مأكولات عضوية"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17521,7 +18835,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17542,13 +18856,13 @@ msgstr "حرّر إلكترونيات"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17557,9 +18871,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "حرّر مبيع Hifi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "مرئيّات"
msgid "Edit Video Shop"
msgstr "حرّر مبيع مرئيّات"
@@ -17585,6 +18898,12 @@ msgstr "حرّر صرّاف"
msgid "Edit Automated Teller Machine"
msgstr "حرّر صراف آلي"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17621,10 +18940,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "بوذي"
+
+msgid "christian"
+msgstr "نصراني"
+
+msgid "hindu"
+msgstr "هندوس"
+
+msgid "jewish"
+msgstr "يهودي"
+
+msgid "muslim"
+msgstr "مسلم"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17654,7 +18994,7 @@ msgstr "حرّر مخزن خردوات/أدوات منزلية"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17666,19 +19006,19 @@ msgstr "حرّر مبيع فرش/أثاث"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17699,6 +19039,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17708,7 +19054,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17789,6 +19135,9 @@ msgstr "ألعاب"
msgid "vouchers"
msgstr "قسائم"
+msgid "Note"
+msgstr "الملاحظة"
+
msgid "Geography"
msgstr ""
@@ -17918,6 +19267,12 @@ msgstr "قمّة"
msgid "Edit Peak"
msgstr "حرّر قمّة"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "جليد"
@@ -17957,26 +19312,35 @@ msgstr "شجرة"
msgid "Edit Tree"
msgstr "حرّر شجرة"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "حرّر اإسم النباتي"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "حرج"
msgid "Edit Wood"
msgstr "حرّر حرج"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "صنوبري الثمر"
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "مختلط"
msgid "Forest"
msgstr "غابة"
@@ -17984,15 +19348,6 @@ msgstr "غابة"
msgid "Edit Forest Landuse"
msgstr "حرّر غابة"
-msgid "coniferous"
-msgstr "صنوبري الثمر"
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr "مختلط"
-
msgid "Grassland"
msgstr ""
@@ -18068,6 +19423,12 @@ msgstr "مرج"
msgid "Edit Meadow Landuse"
msgstr "حرّر مرج"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "كرم عنب"
@@ -18122,8 +19483,8 @@ msgstr "ميدان ألعاب"
msgid "Edit Recreation Ground Landuse"
msgstr "حرّر ميدان ألعاب"
-msgid "Residential area"
-msgstr "منطقة سكنية"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "حرّر منطقة سكنية"
@@ -18134,6 +19495,9 @@ msgstr "مقبرة"
msgid "Edit Graveyard"
msgstr "حرّر مقبرة"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "مقبرة"
@@ -18209,6 +19573,33 @@ msgstr "حرّر كسّارة / مقلع حجارة"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "حرّر معلومات عنوان"
@@ -18227,30 +19618,6 @@ msgstr "إسم المدينة"
msgid "Country code"
msgstr "رمز البلد"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "إستيفاء العنوان"
@@ -18269,6 +19636,18 @@ msgstr "مثنى"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18431,27 +19810,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "الطريق"
+msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr "وصف الرمز"
@@ -18497,19 +19905,22 @@ msgstr "نقطة التوقف الأمامية"
msgid "backward halt point"
msgstr "نقطة التوقف الخلفية"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18533,7 +19944,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18629,18 +20040,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "جسر"
msgid "deprecated"
msgstr "مهجور"
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr "خيل"
@@ -18650,7 +20070,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18659,10 +20082,10 @@ msgstr ""
msgid "ford"
msgstr "مخاضة"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18680,6 +20103,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18695,28 +20121,28 @@ msgstr "سكة حديد قديمة"
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18737,20 +20163,20 @@ msgstr "مارينا"
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "صحة"
-msgid "shop"
-msgstr "متجر/دكان"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "فندق"
@@ -18815,9 +20241,6 @@ msgstr "أرض بور"
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "طين"
-
msgid "beach"
msgstr "شاطئ"
@@ -18827,10 +20250,13 @@ msgstr "طريق"
msgid "boundary"
msgstr "الحدود"
+msgid "sport"
+msgstr "الرياضة"
+
msgid "place"
msgstr "المكان"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18845,9 +20271,6 @@ msgstr "القرية/المدينة"
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr "كنيسة"
-
msgid "Fuel Station"
msgstr "محطة محروقات"
@@ -18875,6 +20298,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18920,46 +20346,76 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
-msgid "natural water used for swimming pool"
+msgid "unusual tag combination (landuse & building)"
msgstr ""
-msgid "incline without highway"
+msgid "unnecessary access key"
msgstr ""
-msgid "junction without highway"
+msgid "unnecessary motor_vehicle=yes"
msgstr ""
-msgid "lanes without highway"
+msgid "natural water used for swimming pool"
msgstr ""
-msgid "lcn without highway"
+msgid "numerical key"
msgstr ""
-msgid "lit without highway"
+msgid "route_master relation without route_master=*"
msgstr ""
-msgid "living_street without highway"
+msgid "power line without voltage"
msgstr ""
-msgid "maintenance without highway"
+msgid "substation key without power=substation"
msgstr ""
-msgid "median without highway"
+msgid "transformer key without power"
msgstr ""
-msgid "motorroad without highway"
+msgid "missing substation=*"
msgstr ""
-msgid "ntd_id without highway"
+msgid "missing transformer=*"
msgstr ""
-msgid "oneway without highway"
+msgid "incline without highway or railway"
msgstr ""
-msgid "sac_scale without highway"
+msgid "junction without highway"
msgstr ""
-msgid "segregated without highway"
+msgid "lanes without highway"
+msgstr ""
+
+msgid "lcn without highway"
+msgstr ""
+
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr ""
+
+msgid "living_street without highway"
+msgstr ""
+
+msgid "maintenance without highway"
+msgstr ""
+
+msgid "median without highway"
+msgstr ""
+
+msgid "motorroad without highway"
+msgstr ""
+
+msgid "ntd_id without highway"
+msgstr ""
+
+msgid "oneway without highway or railway"
+msgstr ""
+
+msgid "sac_scale without highway"
+msgstr ""
+
+msgid "segregated without highway"
msgstr ""
msgid "sidewalk without highway"
@@ -19070,19 +20526,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:lit without lit"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:hgv without hgv"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:outline on a node"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19101,13 +20668,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19116,19 +20719,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19143,142 +20755,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "شوارع NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19317,148 +20978,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19662,6 +21386,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19683,13 +21419,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19952,9 +21682,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19976,6 +21712,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20054,9 +21793,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20141,7 +21892,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20412,15 +22163,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20591,6 +22333,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20609,12 +22354,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20750,6 +22489,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20767,6 +22509,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20847,48 +22592,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr ""
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -20941,19 +22644,75 @@ msgstr ""
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "إستعادة كعكة الإنترنت"
msgid "Get a new cookie (session timeout)"
msgstr "أطلب كعكة إنترنت جديدة (إنتهاء مهلة الجلسة)"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20979,7 +22738,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21029,7 +22791,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21074,6 +22836,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21134,16 +22899,81 @@ msgstr ""
msgid "External tools"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr "هل أنت متأكد ؟"
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
-msgstr "هل أنت متأكد ؟"
+msgid "Logout"
+msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21185,27 +23015,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21601,6 +23413,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21848,12 +23663,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21863,16 +23672,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22235,9 +24041,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22292,9 +24095,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22336,25 +24156,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22491,9 +24311,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22518,12 +24335,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22672,6 +24498,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22688,6 +24517,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22921,13 +24761,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "وقع خطأ: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22980,18 +24813,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr "أوصف المشكلة بدقة"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23049,6 +24870,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23256,9 +25080,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23338,7 +25159,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23492,6 +25331,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23513,6 +25355,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23806,9 +25651,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23877,9 +25719,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24006,9 +25845,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24030,6 +25866,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24062,15 +25901,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "غيّر الخصائص"
+
msgid "Country preset:"
msgstr ""
@@ -24080,6 +25935,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24182,9 +26040,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24300,6 +26155,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24360,19 +26218,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24510,6 +26368,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24585,6 +26446,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24600,9 +26550,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24624,6 +26571,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24776,9 +26726,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25404,7 +27351,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25412,10 +27362,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25424,18 +27371,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25478,15 +27413,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25608,18 +27534,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25797,9 +27711,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "مرئيّات"
-
msgid "Import Video"
msgstr ""
@@ -25926,7 +27837,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25946,9 +27857,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26081,9 +27989,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index ec4a7a1..932209d 100644
--- a/i18n/po/ast.po
+++ b/i18n/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-07-14 21:47+0000\n"
"Last-Translator: Xuacu Saturio <xuacusk8 at gmail.com>\n"
"Language-Team: Asturian <ast at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:33+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Condiciones d'usu del fondu"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Nun hai sofitu p'abrir l'enllaz na plataforma actual (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Executando l'enganche d'aniciu de la plataforma"
@@ -153,20 +168,14 @@ msgid "About JOSM..."
msgstr "Tocante a JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ATENCIÓN: formatu inesperáu de la URL base del API. La redireición a la "
-"páxina d'información o d'historial del oxetu OSM probablemente fallará. La "
-"URL base del API ye: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ATENCIÓN: formatu inesperáu de la URL base del API. La redireición a la "
-"páxina del usuariu OSM probablemente fallará. La URL base de la API ye: "
-"''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -212,6 +221,9 @@ msgstr "Nun hai capes destín"
msgid "Add imagery layer {0}"
msgstr "Amestar capa de imaxes {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -251,9 +263,6 @@ msgstr "Ferramienta: {0}"
msgid "Please select at least four nodes."
msgstr "Por favor, seleiciona polo menos cuatro nodos."
-msgid "Information"
-msgstr "Información"
-
msgid "Align Nodes in Line"
msgstr "Alliniar en reuta los nodos"
@@ -278,6 +287,9 @@ msgstr "conflictu"
msgid "download"
msgstr "descarga"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "anterior"
@@ -287,6 +299,9 @@ msgstr "siguiente"
msgid "Nothing selected to zoom to."
msgstr "Nun s'esbilló nada p'ampliar."
+msgid "Information"
+msgstr "Información"
+
msgid "Zoom to {0}"
msgstr "Acercar a {0}"
@@ -343,11 +358,9 @@ msgstr ""
"dalgunes?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Nun se pudieron combinar les víes (Nun se pudieron amestar nuna cadena de "
-"nodos única)"
msgid "Combine {0} ways"
msgstr "Combinar {0} víes"
@@ -404,6 +417,12 @@ msgstr "Desaniciar"
msgid "Delete selected objects."
msgstr "Desaniciar los oxetos seleicionaos."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distribuir nodos"
@@ -412,12 +431,23 @@ msgstr ""
"Distribuir los nodos seleicionaos a distancies iguales a lo llargo d'una "
"llinia."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descargar d'OSM..."
msgid "Download map data from the OSM server."
msgstr "Descargar datos del mapa del sirvidor OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Descargar datos"
+
msgid "Download object..."
msgstr "Descargar oxetu..."
@@ -516,6 +546,9 @@ msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
"Amostrar la información del historial de víes, nodos o rellaciones d'OSM."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "Historial (web)"
@@ -642,11 +675,9 @@ msgid "Joined overlapping areas"
msgstr "Se xuntaron árees superpuestes"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Delles víes pertenecen a rellaciones que se camudaron. Por favor comprueba "
-"que nun s'amestara dengún fallu."
msgid "Fix tag conflicts"
msgstr "Arreglar conflictos d'etiquetes"
@@ -805,11 +836,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Sumir nodos nel más antiguu."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Por favor, seleiciona polo menos dos nodos para xunir o un nodu que tea "
-"cerca d'otru."
msgid "Abort Merging"
msgstr "Encaboxar fusión"
@@ -972,11 +1001,9 @@ msgid "Download Data"
msgstr "Descargar datos"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Nun se pue abrir la URL ''{0}'' porque nun ta disponible una xera de "
-"descarga afayadiza.</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1007,15 +1034,9 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizar / Desfacer"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalizar forma / Desfacer\n"
-"¡Esbilla nodos que se movieron cola aición Ortogonalizar forma anterior!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Desfacer ortogonalizar forma"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1035,9 +1056,6 @@ msgstr "Ortogonalizar"
msgid "Usage"
msgstr "Usu"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Los elementos esbillaos nun pueden ortogonalizase"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1158,6 +1176,15 @@ msgstr "Tamién renomar el ficheru"
msgid "Could not rename file ''{0}''"
msgstr "Nun se pudo renomar el ficheru ''{0}''"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr "Invertir vía"
@@ -1210,9 +1237,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1276,6 +1300,9 @@ msgstr "Informe d'estáu"
msgid "Copy to clipboard and close"
msgstr "Copiar al cartafueyu y zarrar"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Zarrar"
@@ -1358,18 +1385,14 @@ msgstr ""
"na metá de la vía)."
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>La pertenencia a una rellación basada en roles se copió a toles víes "
-"nueves.<br>Deberíes comprobales y correxilo cuando faiga falta.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>La pertenencia a una rellación se copió a toles víes "
-"nueves.<br>Deberíes comprobales y correxilo cuando faiga falta.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Partir la vía {0} en {1} partes"
@@ -1457,6 +1480,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Desfacer"
@@ -1481,9 +1525,6 @@ msgstr "Anovar datos"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr "Descargar datos"
-
msgid "Update modified"
msgstr "Anovamientu camudáu"
@@ -1679,6 +1720,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Alantre más adulces"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Descargando datos GPS"
@@ -1688,6 +1732,18 @@ msgstr "Datos GPX descargaos"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Descargando datos"
@@ -1707,6 +1763,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Hebo {0} conflictu na importación."
+msgstr[1] "Hebo {0} conflictos na importación."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflictu na descarga"
+msgstr[1] "Conflictos na descarga"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Cargando padres del nodu {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Cargando padres de la vía {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Cargando padres de la rellación {2}"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Descargando {0} de {1} (queden {2})"
@@ -1759,25 +1840,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Fallos na descarga"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Hebo {0} conflictu na importación."
-msgstr[1] "Hebo {0} conflictos na importación."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflictu na descarga"
-msgstr[1] "Conflictos na descarga"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Cargando padres del nodu {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Cargando padres de la vía {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Cargando padres de la rellación {2}"
-
msgid "Error during download"
msgstr "Fallu na descarga"
@@ -1928,6 +1990,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1952,8 +2017,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1969,6 +2034,9 @@ msgstr "Paralela"
msgid "Make parallel copies of ways"
msgstr "Facer copies paraleles de víes"
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2394,6 +2462,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2554,14 +2625,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
-msgstr "S'esperaba la id primitiva"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "S'esperaba un conxuntu de cambios"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "S'esperaba una versión"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2569,6 +2640,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr "S'esperaba la id primitiva"
+
msgid "Range of numbers expected"
msgstr "S'esperaba un rangu de númberos"
@@ -2587,8 +2661,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr "Falta un operador pa «NOT»"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2678,6 +2751,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Amestáu {0} oxetu"
msgstr[1] "Amestaos {0} oxetos"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Camudar nodu {0}"
@@ -2714,10 +2790,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2740,8 +2816,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2845,6 +2921,9 @@ msgstr[1] "Purgaos {0} oxetos"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Iguarr conflictos na llista de miembros de la rellación {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Xirar {0} nodu"
@@ -2905,8 +2984,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2936,11 +3015,11 @@ msgstr "Aplicar los cambios seleicionaos"
msgid "Do not apply changes"
msgstr "Nun aplicar los cambios"
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
-msgstr "Propiedaes de "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Roles nes rellaciones que refieren a"
@@ -2960,6 +3039,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2990,18 +3072,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -3010,8 +3092,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -3019,13 +3101,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -3039,8 +3119,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3070,11 +3150,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "DESCONOCÍU"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3226,8 +3305,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3334,7 +3412,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3353,6 +3431,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3369,9 +3450,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3410,6 +3488,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3434,6 +3515,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3493,13 +3583,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3569,6 +3659,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3638,6 +3746,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3695,13 +3809,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3733,10 +3847,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3870,7 +3984,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3945,6 +4059,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3975,9 +4092,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4002,10 +4116,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4068,23 +4182,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4188,7 +4285,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4384,9 +4481,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Seleición"
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4402,10 +4514,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4414,6 +4538,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4473,6 +4600,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4500,27 +4630,14 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
+msgid "{0} ({1} ms)"
msgstr ""
-msgid "true: the property is explicitly switched on"
+msgid ""
+"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
msgstr ""
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
-msgid "{0} ({1} ms)"
-msgstr ""
-
-msgid ""
-"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
-msgstr ""
-
-msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
+msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr ""
msgid "Details..."
@@ -4800,29 +4917,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4837,7 +4972,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4889,14 +5024,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5146,14 +5273,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5674,6 +5801,9 @@ msgstr "Amuesa / Escuende"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5757,6 +5887,36 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Triba d'oxetu:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "amestáu"
+
+msgid "Choose the OSM object type"
+msgstr "Escueyi la triba d'oxetu OSM"
+
+msgid "Object ID:"
+msgstr "ID del oxetu:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Escribi la ID del oxetu que se tien de descargar"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Les IDs del oxetu de pueden separtar con comes o espacios.<br/> Exemplos: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En mou mistu, conseña los "
+"oxetos d'esta forma: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5778,9 +5938,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr "Seleición"
-
msgid "Open a selection list window."
msgstr "Abrir una ventana de seleición."
@@ -5805,32 +5962,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5850,8 +6007,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5877,9 +6033,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -6024,9 +6177,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6311,8 +6461,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6377,34 +6527,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr "<diferente>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Desaniciar la clave seleicionada en tolos oxetos"
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6419,13 +6581,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr "Amestar una nueva parexa clave/valor pa tolos oxetos"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Editar el valor de la clave seleicionada pa tolos oxetos"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6504,12 +6666,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6539,9 +6695,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6579,7 +6741,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6639,6 +6801,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6894,6 +7059,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Marcadores"
@@ -6959,9 +7143,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -7028,21 +7209,8 @@ msgstr "Descargar referencies (rellaciones padre)"
msgid "Download object"
msgstr "Descargar oxetu"
-msgid "Object type:"
-msgstr "Triba d'oxetu:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "amestáu"
-
-msgid "Choose the OSM object type"
-msgstr "Escueyi la triba d'oxetu OSM"
-
-msgid "Object ID:"
-msgstr "ID del oxetu:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Escribi la ID del oxetu que se tien de descargar"
+msgid "Start downloading"
+msgstr "Aniciar descarga"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7055,28 +7223,9 @@ msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
"Seleicionar si los miembros d'una rellación tienen de descargase tamién"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Les IDs del oxetu de pueden separtar con comes o espacios.<br/> Exemplos: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En mou mistu, conseña los "
-"oxetos d'esta forma: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Descargar referencies (víes y rellaciones padre)"
-msgid "Start downloading"
-msgstr "Aniciar descarga"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Llista conseñada d'ID inválida\n"
-"Nun se pue descargar l'oxetu."
-
msgid "Class Type"
msgstr ""
@@ -7173,7 +7322,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7272,6 +7421,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7359,7 +7511,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7378,6 +7530,12 @@ msgstr "Pon-yos un breve comentariu a los cambéos que tas xubiendo:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7444,8 +7602,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7520,8 +7677,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7535,8 +7692,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7751,12 +7907,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7765,6 +7915,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7780,6 +7946,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7787,8 +7968,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7900,9 +8081,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7912,6 +8090,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7928,7 +8109,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8074,7 +8255,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8104,7 +8285,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8220,6 +8401,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8257,6 +8441,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8453,9 +8640,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8474,6 +8658,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Imaxes Xeomarcáes"
@@ -8531,6 +8718,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8597,9 +8790,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8612,7 +8802,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8639,12 +8832,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8773,14 +8970,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8795,7 +8988,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8805,8 +8998,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9026,7 +9218,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9092,6 +9284,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9149,9 +9347,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9398,6 +9593,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9526,6 +9724,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9568,6 +9772,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9618,19 +9825,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
+msgid "Export selected items"
msgstr ""
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9648,40 +9846,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
+msgstr ""
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "shortcut"
msgstr ""
-msgid "Current value is default."
+msgid "color"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "toolbar"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "imagery"
msgstr ""
-msgid "Select Setting Type:"
+msgid "Reset preferences"
msgstr ""
-msgid "Simple"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List"
+msgid "Load profile"
msgstr ""
-msgid "List of lists"
+msgid "Save {0} profile"
msgstr ""
-msgid "List of maps"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Add setting"
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9705,6 +9912,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9761,6 +10001,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9814,6 +10057,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10095,7 +10343,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10264,6 +10518,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10327,7 +10587,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10585,40 +10845,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10671,8 +10931,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10681,20 +10941,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10776,14 +11041,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10827,31 +11086,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10860,6 +11124,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10875,57 +11142,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10943,6 +11212,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10972,6 +11249,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11002,7 +11322,7 @@ msgid "Contacting OSM Server..."
msgstr "Contautando col Sirvidor d'OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11042,28 +11362,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11158,6 +11476,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11173,12 +11494,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11257,7 +11586,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11356,46 +11685,22 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11422,10 +11727,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11436,9 +11738,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11460,6 +11759,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11509,8 +11811,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11653,6 +11955,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11671,6 +11976,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11695,16 +12009,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11716,6 +12033,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11730,6 +12055,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11760,19 +12094,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11794,11 +12128,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11868,13 +12214,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12017,10 +12363,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12035,22 +12381,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12121,8 +12466,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12137,9 +12481,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12461,17 +12820,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12482,9 +12835,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12516,9 +12912,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12841,6 +13251,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12920,6 +13335,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13021,9 +13440,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13079,6 +13495,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13103,9 +13522,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13131,9 +13547,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13170,6 +13583,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13216,9 +13634,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13303,6 +13718,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13393,6 +13811,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13411,10 +13873,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13426,6 +13888,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13453,18 +13918,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13474,9 +13933,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13486,13 +13942,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13540,6 +13996,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13624,6 +14083,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13728,21 +14190,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13758,10 +14229,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13797,7 +14268,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13866,12 +14337,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13887,15 +14364,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13917,6 +14385,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13926,6 +14403,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13935,10 +14415,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13971,9 +14448,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14007,43 +14481,70 @@ msgstr ""
msgid "Barriers"
msgstr ""
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr ""
-msgid "Cycle Barrier"
+msgid "Material"
msgstr ""
-msgid "Block"
+msgid "stone"
msgstr ""
-msgid "Cattle Grid"
+msgid "Bollard"
msgstr ""
-msgid "Edit Cattle Grid"
+msgid "Edit Bollard"
msgstr ""
-msgid "Bus Trap"
+msgid "Bollard type"
msgstr ""
-msgid "Spikes"
+msgid "rising"
msgstr ""
-msgid "Edit Spikes"
+msgid "removable"
msgstr ""
-msgid "Toll Booth"
+msgid "plastic"
msgstr ""
-msgid "Edit Toll Booth"
+msgid "Cycle Barrier"
msgstr ""
-msgid "Border Control"
+msgid "Edit Cycle Barrier"
+msgstr ""
+
+msgid "Cattle Grid"
+msgstr ""
+
+msgid "Edit Cattle Grid"
+msgstr ""
+
+msgid "Bus Trap"
+msgstr ""
+
+msgid "Edit Bus Trap"
+msgstr ""
+
+msgid "Spikes"
+msgstr ""
+
+msgid "Edit Spikes"
+msgstr ""
+
+msgid "Toll Booth"
+msgstr ""
+
+msgid "Edit Toll Booth"
+msgstr ""
+
+msgid "Border Control"
msgstr ""
msgid "Edit Border Control"
@@ -14052,19 +14553,34 @@ msgstr ""
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14073,22 +14589,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14121,12 +14666,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14184,6 +14744,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14193,6 +14756,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14232,9 +14801,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14268,6 +14834,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14349,18 +14930,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14433,7 +15019,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14457,10 +15046,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14472,9 +15064,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14517,18 +15106,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14628,11 +15255,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14644,11 +15269,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14667,10 +15290,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14700,9 +15323,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14718,19 +15338,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14880,6 +15516,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14901,6 +15540,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14928,6 +15573,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14952,22 +15603,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14989,9 +15624,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15055,7 +15687,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15186,6 +15818,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15216,6 +15851,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15228,9 +15866,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15240,9 +15875,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15255,6 +15895,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15279,14 +15922,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15335,7 +15970,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15389,41 +16024,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15609,6 +16244,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15630,9 +16271,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15645,6 +16292,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15684,6 +16334,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15705,22 +16358,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15744,9 +16409,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15771,10 +16433,19 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
msgstr ""
-msgid "Playground"
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
+
+msgid "Playground"
msgstr ""
msgid "Edit Playground"
@@ -15844,49 +16515,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15904,6 +16569,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15916,6 +16587,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15931,37 +16605,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -16051,6 +16828,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -16060,6 +16843,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -16126,12 +16915,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16141,6 +16984,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16150,31 +17017,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16202,7 +17075,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16229,27 +17102,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16284,12 +17145,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16299,10 +17163,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16330,6 +17194,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16367,117 +17234,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16511,33 +17414,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16571,6 +17484,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16583,7 +17512,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16646,36 +17600,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
-msgid "advanced"
+msgctxt "piste:difficulty"
+msgid "intermediate"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "advanced"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16718,19 +17690,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16869,6 +17837,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16881,60 +17861,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16950,9 +18004,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17162,41 +18213,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17205,7 +18282,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17217,12 +18294,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17274,88 +18441,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17367,6 +18637,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17382,6 +18667,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17400,11 +18688,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17513,10 +18799,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17528,7 +18814,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17549,13 +18835,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17627,7 +18919,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17648,13 +18940,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17663,7 +18955,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17691,6 +18982,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17727,10 +19024,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17760,7 +19078,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17772,19 +19090,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17805,6 +19123,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17814,7 +19138,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17895,6 +19219,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -18024,6 +19351,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18063,24 +19396,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -18090,15 +19432,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18174,6 +19507,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18228,7 +19567,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18240,6 +19579,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18315,46 +19657,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
+msgstr ""
+
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18375,6 +19720,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18537,27 +19894,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18603,19 +19989,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18639,7 +20028,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18735,18 +20124,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18756,7 +20154,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18765,10 +20166,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18786,6 +20187,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18801,28 +20205,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18843,19 +20247,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18921,9 +20325,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18933,10 +20334,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18951,9 +20355,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18981,6 +20382,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19026,10 +20430,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19041,7 +20475,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19059,7 +20493,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19176,19 +20610,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "map_type without information=map"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19207,13 +20752,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19222,19 +20803,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19249,142 +20839,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19423,148 +21062,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr ""
+
+msgid "ScanEx IRS"
+msgstr ""
+
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19768,6 +21470,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19789,13 +21503,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20058,9 +21766,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20082,6 +21796,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20160,9 +21877,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20247,7 +21976,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20518,15 +22247,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20697,6 +22417,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20715,12 +22438,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20856,6 +22573,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20873,6 +22593,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20953,113 +22676,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21085,7 +22822,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21135,7 +22875,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21180,6 +22920,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21249,7 +22992,72 @@ msgstr ""
msgid "New tool..."
msgstr ""
-msgid "Install"
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21291,27 +23099,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21707,6 +23497,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21954,12 +23747,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21969,16 +23756,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22341,9 +24125,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22398,9 +24179,30 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>La pertenencia a una rellación basada en roles se copió a toles víes "
+"nueves.<br>Deberíes comprobales y correxilo cuando faiga falta.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>La pertenencia a una rellación se copió a toles víes "
+"nueves.<br>Deberíes comprobales y correxilo cuando faiga falta.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22442,25 +24244,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22597,9 +24399,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22624,12 +24423,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22778,6 +24586,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22794,6 +24605,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23027,13 +24849,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Hubo un error: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23086,18 +24901,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23155,6 +24958,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23362,9 +25168,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23444,7 +25247,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23598,6 +25419,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23619,6 +25443,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23912,9 +25739,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23983,9 +25807,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24112,9 +25933,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24136,6 +25954,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24168,15 +25989,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24186,6 +26023,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24288,9 +26128,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24406,6 +26243,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24466,19 +26306,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24616,6 +26456,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24691,6 +26534,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24706,9 +26638,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24730,6 +26659,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24882,9 +26814,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25510,7 +27439,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25518,10 +27450,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25530,18 +27459,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25584,15 +27501,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25714,18 +27622,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25903,9 +27799,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26032,7 +27925,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -26052,9 +27945,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26187,9 +28077,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 816cad0..f5cf4c2 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-01-12 17:56+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:34+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -49,6 +49,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -149,13 +164,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -198,6 +213,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -237,9 +255,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -264,6 +279,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -273,6 +291,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -327,7 +348,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -384,18 +405,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -490,6 +528,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -603,7 +644,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -753,8 +794,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -911,8 +952,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -939,12 +980,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -962,9 +999,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1071,6 +1105,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1121,9 +1164,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1185,6 +1225,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1259,13 +1302,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1354,6 +1397,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1378,9 +1442,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1576,6 +1637,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1585,6 +1649,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1604,6 +1680,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1654,25 +1755,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1815,6 +1897,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1839,8 +1924,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1856,6 +1941,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2262,6 +2350,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2422,13 +2513,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2437,6 +2528,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2455,8 +2549,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2542,6 +2635,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2578,10 +2674,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2604,8 +2700,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2709,6 +2805,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2769,8 +2868,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2800,10 +2899,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2824,6 +2923,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2854,18 +2956,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2874,8 +2976,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2883,13 +2985,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2903,8 +3003,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2934,11 +3034,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3091,8 +3190,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3199,7 +3297,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3218,6 +3316,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3234,9 +3335,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3275,6 +3373,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3299,6 +3400,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3358,13 +3468,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3434,6 +3544,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3503,6 +3631,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3560,13 +3694,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3598,10 +3732,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3735,7 +3869,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3810,6 +3944,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3840,9 +3977,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3867,10 +4001,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3933,23 +4067,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4053,7 +4170,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4249,9 +4366,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4267,10 +4399,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4279,6 +4423,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4338,6 +4485,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4365,19 +4515,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4665,29 +4802,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4702,7 +4857,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4754,14 +4909,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5011,14 +5158,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5539,6 +5686,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5622,6 +5772,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5643,9 +5820,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5670,32 +5844,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5715,8 +5889,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5742,9 +5915,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5889,9 +6059,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6176,8 +6343,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6242,34 +6409,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6284,13 +6463,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6369,12 +6548,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6404,9 +6577,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6444,7 +6623,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6504,6 +6683,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6759,6 +6941,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6824,9 +7025,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6893,20 +7091,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6917,23 +7102,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7030,7 +7201,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7129,6 +7300,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7216,7 +7390,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7235,6 +7409,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7301,8 +7481,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7377,8 +7556,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7392,8 +7571,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7608,12 +7786,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7622,6 +7794,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7637,6 +7825,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7644,8 +7847,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7757,9 +7960,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7769,6 +7969,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7785,7 +7988,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7931,7 +8134,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7961,7 +8164,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8075,6 +8278,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8112,6 +8318,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8308,9 +8517,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8329,6 +8535,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8386,6 +8595,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8452,9 +8667,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8467,7 +8679,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8494,12 +8709,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8628,14 +8847,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8650,7 +8865,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8660,8 +8875,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8881,7 +9095,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8947,6 +9161,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9004,9 +9224,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9253,6 +9470,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9381,6 +9601,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9423,6 +9649,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9473,19 +9702,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9503,40 +9723,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9560,6 +9789,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9616,6 +9878,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9669,6 +9934,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9950,7 +10220,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10119,6 +10395,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10182,7 +10464,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10440,40 +10722,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10526,8 +10808,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10536,20 +10818,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10631,14 +10918,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10682,31 +10963,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10715,6 +11001,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10730,57 +11019,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10798,6 +11089,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10827,6 +11126,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10857,7 +11199,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10897,28 +11239,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11013,6 +11353,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11028,12 +11371,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11112,7 +11463,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11211,35 +11562,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11249,8 +11576,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11277,10 +11604,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11291,9 +11615,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11315,6 +11636,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11364,8 +11688,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11508,6 +11832,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11526,6 +11853,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11550,16 +11886,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11571,6 +11910,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11585,6 +11932,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11615,19 +11971,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11649,11 +12005,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11723,13 +12091,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11872,10 +12240,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11890,22 +12258,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11974,8 +12341,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11990,9 +12356,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12314,17 +12695,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12335,9 +12710,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12369,9 +12787,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12694,6 +13126,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12773,6 +13210,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12874,9 +13315,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12932,6 +13370,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12956,9 +13397,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12984,9 +13422,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13023,6 +13458,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13069,9 +13509,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13156,6 +13593,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13246,6 +13686,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13264,10 +13748,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13279,6 +13763,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13306,18 +13793,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13327,9 +13808,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13339,13 +13817,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13393,6 +13871,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13477,6 +13958,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13581,21 +14065,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13611,10 +14104,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13650,7 +14143,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13719,12 +14212,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13740,15 +14239,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13770,6 +14260,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13779,6 +14278,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13788,10 +14290,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13824,9 +14323,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13860,19 +14356,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13884,6 +14404,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13905,55 +14428,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13974,12 +14541,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14037,6 +14619,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14046,6 +14631,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14085,9 +14676,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14121,6 +14709,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14202,18 +14805,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14286,7 +14894,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14310,10 +14921,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14325,9 +14939,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14370,18 +14981,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14481,11 +15130,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14497,11 +15144,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14520,10 +15165,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14553,9 +15198,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14571,19 +15213,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14733,6 +15391,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14754,6 +15415,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14781,6 +15448,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14805,22 +15478,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14842,9 +15499,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14908,7 +15562,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15039,6 +15693,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15069,6 +15726,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15081,9 +15741,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15093,9 +15750,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15108,6 +15770,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15132,14 +15797,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15188,7 +15845,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15242,41 +15899,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15462,6 +16119,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15483,9 +16146,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15498,6 +16167,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15537,6 +16209,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15558,22 +16233,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15597,9 +16284,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15624,7 +16308,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15697,52 +16390,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15757,6 +16444,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15769,6 +16462,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15784,37 +16480,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15904,6 +16703,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15913,6 +16718,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15979,12 +16790,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15994,6 +16859,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16003,31 +16892,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16055,7 +16950,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16082,27 +16977,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16137,12 +17020,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16152,10 +17038,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16183,6 +17069,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16220,117 +17109,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16364,33 +17289,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16424,6 +17359,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16436,7 +17387,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16499,36 +17475,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16571,19 +17565,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16722,6 +17712,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16734,60 +17736,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16803,9 +17879,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17015,41 +18088,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17058,7 +18157,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17070,12 +18169,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17127,88 +18316,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17220,6 +18512,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17235,6 +18542,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17253,11 +18563,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17366,10 +18674,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17381,7 +18689,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17402,13 +18710,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17480,7 +18794,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17501,13 +18815,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17516,7 +18830,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17544,6 +18857,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17580,40 +18899,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17625,19 +18965,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17658,6 +18998,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17667,7 +19013,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17748,6 +19094,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17877,6 +19226,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17916,24 +19271,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17943,15 +19307,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18027,6 +19382,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18081,7 +19442,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18093,6 +19454,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18168,46 +19532,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18228,6 +19595,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18390,27 +19769,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18456,19 +19864,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18492,7 +19903,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18588,18 +19999,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18609,7 +20029,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18618,10 +20041,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18639,6 +20062,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18654,28 +20080,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18696,19 +20122,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18774,9 +20200,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18786,10 +20209,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18804,9 +20230,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18834,6 +20257,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18879,10 +20305,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18894,7 +20350,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18912,7 +20368,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19029,19 +20485,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19060,13 +20627,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19075,19 +20678,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19102,142 +20714,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19276,148 +20937,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19621,6 +21345,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19642,13 +21378,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19911,9 +21641,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19935,6 +21671,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20013,9 +21752,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20100,7 +21851,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20371,15 +22122,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20550,6 +22292,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20568,12 +22313,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20709,6 +22448,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20726,6 +22468,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20806,113 +22551,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20938,7 +22697,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20988,7 +22750,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21033,6 +22795,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21090,19 +22855,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21144,27 +22974,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21560,6 +23372,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21807,12 +23622,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21822,16 +23631,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22194,9 +24000,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22251,9 +24054,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22295,25 +24115,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22450,9 +24270,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22477,12 +24294,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22631,6 +24457,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22647,6 +24476,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22880,13 +24720,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22939,18 +24772,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23008,6 +24829,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23215,9 +25039,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23297,7 +25118,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23451,6 +25290,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23472,6 +25314,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23765,9 +25610,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23836,9 +25678,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23965,9 +25804,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23989,6 +25825,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24021,15 +25860,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24039,6 +25894,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24141,9 +25999,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24259,6 +26114,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24319,19 +26177,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24469,6 +26327,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24544,6 +26405,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24559,9 +26509,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24583,6 +26530,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24735,9 +26685,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25363,7 +27310,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25371,10 +27321,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25383,18 +27330,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25437,15 +27372,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25567,18 +27493,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25756,9 +27670,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25885,7 +27796,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25905,9 +27816,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26040,9 +27948,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 8c4dc9c..43941dd 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-06 05:55+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-07-08 12:07+0000\n"
"Last-Translator: Andrew West <2thewest at gmail.com>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
"MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:34+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr "Умовы выкарыстання падкладкі"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Пераход па спасылцы не падтрымліваецца на гэтай платформе ('' {0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr "ПАПЯРЭДЖАНЬНЕ: {0}"
+
+msgid "INFO: {0}"
+msgstr "ІНФАРМАЦЫЯ: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "Адладка: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Выкананне стартавых працэдур"
@@ -155,16 +170,14 @@ msgid "About JOSM..."
msgstr "Пра JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"УВАГА: Неадпаведны фармат URL да асноўнага API. Рэдырект да старонкі "
-"карыстача магчыма неспрацуе. URL да асноўнага API: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -209,6 +222,9 @@ msgstr "Няма канчатковых слаёў"
msgid "Add imagery layer {0}"
msgstr "Дадаць слой здымка {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr "Выбраць WMS слой"
@@ -250,9 +266,6 @@ msgstr "Інструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Выбераце як-меней чатыры ноды."
-msgid "Information"
-msgstr "Інфармацыя"
-
msgid "Align Nodes in Line"
msgstr "Размеркаваць ноды ўздоуж лініі"
@@ -277,6 +290,9 @@ msgstr "канфлікт"
msgid "download"
msgstr "запампоўка"
+msgid "problem"
+msgstr "праблема"
+
msgid "previous"
msgstr "папярэдняе"
@@ -286,6 +302,9 @@ msgstr "далей/наступнае"
msgid "Nothing selected to zoom to."
msgstr "Нічога не выбрана для прагляду"
+msgid "Information"
+msgstr "Інфармацыя"
+
msgid "Zoom to {0}"
msgstr "Праглядзець {0}"
@@ -341,10 +360,9 @@ msgstr ""
"Так лініі не могуць быць з'язднаны. Магцыма змяніць напрамак некаторых з іх?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Немагчыма з'язднаць лініі (Ноды не могуць быць з'яднаны у адну лінію )"
msgid "Combine {0} ways"
msgstr ""
@@ -400,18 +418,35 @@ msgstr "Выдаліць"
msgid "Delete selected objects."
msgstr "Выдаліць выбраныя аб'екты."
+msgid "Toggle dialogs panel"
+msgstr "Пераключыць панэлі дыялогаў"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Размеркаваць ноды"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Размеркаваць ноды праз аднолькавую адлегласць па лініі"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Запампоўка з OSM..."
msgid "Download map data from the OSM server."
msgstr "Запампоўка карты з сервера OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Запампоўка дадзеных"
+
msgid "Download object..."
msgstr "Запампаваць аб'ект..."
@@ -513,6 +548,9 @@ msgstr "Гісторыя"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Паказаць гістарычную інфармацыю аб лініях, нодах ці суадносінах OSM."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "Гісторыя (на сайце OSM)"
@@ -528,7 +566,7 @@ msgid "Adjust the position of this imagery layer"
msgstr "Наладзіць становішча дадзенага пласта са здымкамі"
msgid "Adjust imagery offset"
-msgstr ""
+msgstr "Наладзіць зрушэнне дадзенага слою са здымкамі"
msgid "OK"
msgstr "OK"
@@ -635,11 +673,9 @@ msgid "Joined overlapping areas"
msgstr "З'яднаны плошчы з перакрывам"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Некаторыя лініі былі звязаныя суадносінамі якія змяніліся. Правеце што гэта "
-"не дадала памылак."
msgid "Fix tag conflicts"
msgstr "Вырашыць канфлікты з меткамі"
@@ -757,18 +793,20 @@ msgid "Visit Homepage"
msgstr "Наведаць дамашнюю старонку"
msgid "WMS URL or Image ID:"
-msgstr ""
+msgstr "WMS URL або ID Выявы:"
msgid "Add Rectified Image"
-msgstr ""
+msgstr "Дадаць трансфармаваную выяву"
msgid ""
"Couldn''t match the entered link or id to the selected service. Please try "
"again."
msgstr ""
+"Немагчыма супаставіць уведзеную спасылку або id з абраным сэрвісам. Калі "
+"ласка, паспрабуйце зноў."
msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "Няма верных WMS URL або ID"
msgid "Merge layer"
msgstr "Зліць слой"
@@ -777,7 +815,7 @@ msgid "Merge the current layer into another layer"
msgstr "Зліць гэты слой у другі"
msgid "Merging layers with different upload policies"
-msgstr ""
+msgstr "Аб'яднанне слаёў з рознымі палітыкамі перадачы на сервер"
msgid ""
"You are about to merge data between layers ''{0}'' and ''{1}''.<br /><br "
@@ -799,8 +837,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Зліць ноды у адну найстарэйшаю"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -820,10 +858,11 @@ msgid "Merge selection"
msgstr "Зліць выбранае"
msgid "Merge the currently selected objects into another layer"
-msgstr ""
+msgstr "Аб'яднаць вылучаныя аб'екты ў іншы слой"
msgid "Merging too many objects with different upload policies"
msgstr ""
+"Аб'ядноўваецца занадта шмат аб'ектаў з рознымі палітыкамі перадачы на сервер"
msgid ""
"You are about to merge more than 1 object between layers ''{0}'' and "
@@ -878,7 +917,7 @@ msgid "Create a new map layer."
msgstr "Стварыць новы слой мапы"
msgid "URL Files"
-msgstr ""
+msgstr "URL Файлы"
msgid "Open..."
msgstr "Адкрыць..."
@@ -892,6 +931,10 @@ msgstr "Файлы адкрываюцца"
msgid "Cannot open {0} file with the file importer ''{1}''."
msgid_plural "Cannot open {0} files with the file importer ''{1}''."
msgstr[0] "Немагчыма адкрыць файл(ы) {0} з дапамогай файлімпарта \"{1}\""
+msgstr[1] ""
+"Немагчыма адкрыць {0} файла з дапамогай транслятара файлаў'' {1}''."
+msgstr[2] ""
+"Немагчыма адкрыць {0} файлаў з дапамогай транслятара файлаў'' {1}''."
msgid ""
"Cannot open {0} file because file does not exist or no suitable file "
@@ -900,13 +943,20 @@ msgid_plural ""
"Cannot open {0} files because files do not exist or no suitable file "
"importer is available."
msgstr[0] ""
+"Немагчыма адкрыць {0} файл: файл не існуе ці недаступны прыдатны транслятар "
+"файлаў."
msgstr[1] ""
+"Немагчыма адкрыць {0} файлаў: файлы не існуюць ці недаступны прыдатны "
+"транслятар файлаў."
+msgstr[2] ""
+"Немагчыма адкрыць {0} файла: файлы не існуюць ці недаступны прыдатны "
+"транслятар файлаў."
msgid "no importer"
-msgstr ""
+msgstr "няма фільтра імпарту"
msgid "does not exist"
-msgstr ""
+msgstr "не існуе"
msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
msgstr "<html>Немагчыма адкрыць папку ''{0}''.<br>Выбірайце файл.</html>"
@@ -916,7 +966,9 @@ msgstr "Адкрыць файл"
msgid "Opening {0} file..."
msgid_plural "Opening {0} files..."
-msgstr[0] "Адкрыццё {0} файлаў..."
+msgstr[0] "Адкрыццё {0} файлаў ..."
+msgstr[1] "Адкрыццё {0} файлаў ..."
+msgstr[2] "Адкрыццё {0} файлаў ..."
msgid "Opening file ''{0}'' ..."
msgstr "Файл \"{0}\" адкрываецца.."
@@ -955,8 +1007,8 @@ msgid "Download Data"
msgstr "Запампаваць дадзеныя"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -988,13 +1040,9 @@ msgid "Orthogonalize / Undo"
msgstr "Артаганалізацыя / Адмяніць"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr "Артаганалізацыя фігуры / Адмяніць"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Адмяніць артаганалізацыю фігуры"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
+msgstr ""
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1014,9 +1062,6 @@ msgstr "Артаганалізаваць"
msgid "Usage"
msgstr "Выкарыстаньне"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Выбраныя элементы артаганалізаваць немагчыма"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1044,6 +1089,8 @@ msgid ""
"objects are removed. Do you want to paste the data without the incomplete "
"objects?"
msgstr ""
+"Капіяваныя дадзеныя ўтрымліваюць няпоўныя аб'екты. Пры ўстаўцы яны будуць "
+"выдаленыя. Вы хочаце ўставіць дадзеныя без няпоўных аб'ектаў?"
msgid "Paste Tags"
msgstr "Уклеіць Меткі"
@@ -1053,13 +1100,15 @@ msgstr "Прысвоіць меткі з буфера ўсім выбраным
msgid "Pasting {0} tag"
msgid_plural "Pasting {0} tags"
-msgstr[0] "Уклейка {0} меткі"
-msgstr[1] "Уклейка {0} метак"
+msgstr[0] "Уставіць {0} тэгаў"
+msgstr[1] "Уставіць {0} тэга"
+msgstr[2] "Уставіць {0} тэгаў"
msgid "to {0} object"
msgid_plural "to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "у {0} аб'ект"
+msgstr[1] "у {0} аб'екта"
+msgstr[2] "у {0} аб'ектаў"
msgid "Preferences..."
msgstr "Настаўленні..."
@@ -1071,38 +1120,45 @@ msgid "Preferences"
msgstr "Настаўленні"
msgid "Purge..."
-msgstr ""
+msgstr "Ачысціць ..."
msgid "Forget objects but do not delete them on server when uploading."
-msgstr ""
+msgstr "Ігнараваць аб'екты, але не выдаляць іх з сервера пры перадачы."
msgid "Purge"
-msgstr ""
+msgstr "Ачысціць"
msgid "Confirm Purging"
-msgstr ""
+msgstr "Пацвердзіце ачыстку"
msgid ""
"This operation makes JOSM forget the selected objects.<br> They will be "
"removed from the layer, but <i>not</i> deleted<br> on the server when "
"uploading."
msgstr ""
+"Гэтая аперацыя дазволіць JOSM не звяртаць увагі на выдзеленыя аб'екты. <br> "
+"Яны буду выдаленыя са слою, але <i> не будуць </ i> выдаленыя <br> на "
+"серверы падчас перадачы дадзеных."
msgid ""
"The following dependent objects will be purged<br> in addition to the "
"selected objects:"
msgstr ""
+"Наступныя залежныя аб'екты будуць ачышчаны <br> у дадатак да вылучаных "
+"аб'ектаў:"
msgid "Add to selection"
-msgstr ""
+msgstr "Дадаць да выдзялення"
msgid ""
"Some of the objects are modified.<br> Proceed, if these changes should be "
"discarded.</html>"
msgstr ""
+"Некаторыя аб'екты былі змененыя. <br> Калі працягнуць, то гэтыя змены будуць "
+"адмененыя. </ html>"
msgid "Clear Undo/Redo buffer"
-msgstr ""
+msgstr "Ачысціць буфер апошніх дзеянняў"
msgid "Redo"
msgstr "Паўтарыць"
@@ -1111,10 +1167,10 @@ msgid "Redo the last undone action."
msgstr "Паўтарыць апошнюю адмену"
msgid "Redo ..."
-msgstr ""
+msgstr "Вярнуць..."
msgid "Redo {0}"
-msgstr ""
+msgstr "Вярнуць {0}"
msgid "Rename layer"
msgstr "Змяніць імя слою"
@@ -1125,8 +1181,17 @@ msgstr "Таксама змяніць імя файлу"
msgid "Could not rename file ''{0}''"
msgstr "Немагчама змяніць імя файла ''{0}''"
+msgid "Restart"
+msgstr "Перазапусьціць"
+
+msgid "Restart the application."
+msgstr "Перазапусціць праграму."
+
+msgid "Click to restart later."
+msgstr "Націсьніце, каб перазапусціць пазней."
+
msgid "Reverse way"
-msgstr ""
+msgstr "Разгарнуць лінію"
msgid "Reverse Ways"
msgstr "Змяніць накірунак лініі"
@@ -1172,58 +1237,59 @@ msgstr ""
"няскончаныя аб'екты"
msgid "Load Session"
-msgstr ""
+msgstr "Запампаваць сесію"
msgid "Load a session from file."
-msgstr ""
-
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
+msgstr "Запампаваць сесію з файла"
msgid "Open session"
-msgstr ""
+msgstr "Адкрыць сессію"
msgid "Loading session ''{0}''"
-msgstr ""
+msgstr "Загрузка сессіі ''{0}''"
msgid "<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
+"<html> Не атрымалася загрузіць файл сесіі'' {0}''. <br> Памылка: <br> {1} </ "
+"html>"
msgid "Data Error"
-msgstr ""
+msgstr "Памылка дадзеных"
msgid "IO Error"
-msgstr ""
+msgstr "Памылка ўводу / вываду"
msgid "Save Session As..."
-msgstr ""
+msgstr "Захаваць сесію як ..."
msgid "Save the current session to a new file."
-msgstr ""
+msgstr "Захаваць цяперашнюю сесію у новы файл."
msgid "Session file (archive) (*.joz)"
-msgstr ""
+msgstr "Файл сесіі (архіўны) (*. joz)"
msgid "Session file (*.jos)"
-msgstr ""
+msgstr "Файл сесіі (архіўны) (*. jos)"
msgid "Save session"
-msgstr ""
+msgstr "Захаваць сесію"
msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
+"<html> Не атрымалася захаваць файл сесіі'' {0}''. <br> Памылка: <br> {1} </ "
+"html>"
msgid "Save Session"
-msgstr ""
+msgstr "Захаваць сесію"
msgid "Save As"
-msgstr ""
+msgstr "Захаваць як"
msgid "Layers"
-msgstr ""
+msgstr "Слаі"
msgid "No exporter for this layer"
-msgstr ""
+msgstr "Для гэтага слоя інструмент для экспарту адсутнічае"
msgid "Show Status Report"
msgstr "Паказаць статус рапорт"
@@ -1242,6 +1308,9 @@ msgstr "Статус рапорт"
msgid "Copy to clipboard and close"
msgstr "Скапіраваць у буфер і закрыць"
+msgid "Report bug"
+msgstr "Паведаміць пра памылку"
+
msgid "Close"
msgstr "Закрыць"
@@ -1274,11 +1343,13 @@ msgid "Simplify {0} way"
msgid_plural "Simplify {0} ways"
msgstr[0] "Спрасціць лінію {0}"
msgstr[1] "Спрасціць лініі {0}"
+msgstr[2] "Спрасціць {0} ліній"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
msgstr[0] "Спрасціць лінію (выдаліць {0} ноду)"
msgstr[1] "Спрасціць лінію (выдаліць {0} нодаў)"
+msgstr[2] "Спрасціць лінію (выдаліць {0} нодаў)"
msgid "Split Way"
msgstr "Падзяліць лінію"
@@ -1288,15 +1359,16 @@ msgstr "Падзяліць лінію па выбранай нодзе"
msgid ""
"The current selection cannot be used for splitting - no node is selected."
-msgstr ""
+msgstr "Цяперашнее вылучэнне немагчыма падзяліць - ня вылучана кропка."
msgid "The selected nodes do not share the same way."
msgstr "Выбраныя ноды не належаць адной лініі."
msgid "The selected node is not in the middle of any way."
msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Выбраная нода не ёсць прамежкавай ні на якіх лініях"
-msgstr[1] "Выбраныя ноды не ёсць прамежкавымі ні на якіх лініях"
+msgstr[0] "Вылучаная кропка не знаходзіцца ў сярэдзіне якой-небудзь лініі."
+msgstr[1] "Вылучаныя кропкі не знаходзяцца ў сярэдзіне якой-небудзь лініі."
+msgstr[2] "Вылучаныя кропкі не знаходзяцца ў сярэдзіне якой-небудзь лініі."
msgid ""
"There is more than one way using the node you selected. Please select the "
@@ -1305,9 +1377,14 @@ msgid_plural ""
"There is more than one way using the nodes you selected. Please select the "
"way also."
msgstr[0] ""
-"Праз гэту ноду праходзіць некалькі ліній. Выберыце таксама патрэбную лінію."
+"Ёсць некалькі ліній, якія выкарыстоўваюць кропку, якую вы вылучылі. Калі "
+"ласка, вылучыце лінію таксама."
msgstr[1] ""
-"Праз гэтыя ноды праходзіць некалькі ліній. Выберыце таксама патрэбную лінію."
+"Ёсць некалькі ліній, якія выкарыстоўваюць кропкі, якія вы вылучылі. Калі "
+"ласка, вылучыце лінію таксама."
+msgstr[2] ""
+"Ёсць некалькі ліній, якія выкарыстоўваюць кропкі, якія вы вылучылі. Калі "
+"ласка, вылучыце лінію таксама."
msgid "You must select two or more nodes to split a circular way."
msgstr "Выберыце як-меней 2 ноды каб падзялиць кругавую лінію"
@@ -1320,18 +1397,14 @@ msgstr ""
"на канцах лініі.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Усе новыя лініі атрымалі сяброўства у ралявых суадносінах.Трэба "
-"спраўдзіць і выправіць калі патрэбна.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"Усе новыя лініі атрымалі сяброўства у суадносінах.Трэба спраўдзіць і "
-"выправіць калі патрэбна.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Падзяліць лінію {0} на {1} кавалкаў"
@@ -1346,7 +1419,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Змяніць глабальню настройку ''{0}''."
msgid "Encourage/discourage upload"
-msgstr ""
+msgstr "Дапускаць / не рэкамендаваць перадачу на сервер"
msgid "UnGlue Ways"
msgstr "Расклеіць лініі"
@@ -1411,20 +1484,47 @@ msgid "Dupe {0} node into {1} nodes"
msgid_plural "Dupe {0} nodes into {1} nodes"
msgstr[0] "Здублікаваць ноду {0} у {1} нодаў"
msgstr[1] "Здублікаваць ноды {0} у {1} нодаў"
+msgstr[2] "Стварыць {1} копій кропкі {0}"
msgid "Unglue confirmation"
-msgstr ""
+msgstr "Запыт на раз'яднанне"
msgid ""
"You are about to unglue nodes outside of the area you have "
"downloaded.<br>This can cause problems because other objects (that you do "
"not see) might use them.<br>Do you really want to unglue?"
msgstr ""
+"Вы збіраецеся раз'яднаць пункту па-за запампаванай зоны. <br> Гэта можа "
+"прывесці да памылак, паколькі нябачныя для Вас аб'екты могуць выкарыстоўваць "
+"гэтыя кропкі. <br> Вы сапраўды хочаце раз'яднаць іх?"
msgid ""
"You are about to unglue incomplete objects.<br>This will cause problems "
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+"Вы збіраецеся раз'яднаць няпоўны аб'ект <br> Гэта прывядзе да памылак, "
+"паколькі вы бачыце не ўвесь аб'ект. <br> Вы сапраўды хочаце раз'яднаць іх?"
+
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
msgid "Undo"
msgstr "Вярнуць"
@@ -1433,10 +1533,10 @@ msgid "Undo the last action."
msgstr "Адмяніць апошняе дзеянне."
msgid "Undo ..."
-msgstr ""
+msgstr "Адмяніць ..."
msgid "Undo {0}"
-msgstr ""
+msgstr "Адмяніць {0}"
msgid "Unselect All"
msgstr "Зняць усе вылучэньні"
@@ -1450,9 +1550,6 @@ msgstr "Абнавіць дадзеныя"
msgid "Updates the objects in the active data layer from the server."
msgstr "Абновіць аб'екты на бягучым слаі з сервера"
-msgid "Download data"
-msgstr "Запампоўка дадзеных"
-
msgid "Update modified"
msgstr "Абнавіць праўленае"
@@ -1493,7 +1590,7 @@ msgstr ""
"канфліктах на слаі ''{0}''.<br>Спачатку трэба вырашыць канфлікты.</html>"
msgid "Upload discouraged"
-msgstr ""
+msgstr "Перадача не рэкамендавана"
msgid ""
"You are about to upload data from the layer ''{0}''.<br /><br />Sending data "
@@ -1503,7 +1600,7 @@ msgid ""
msgstr ""
msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Ігнараваць гэта і перадаць"
msgid "No changes to upload."
msgstr "Няма зменау для запампоўкі на сервер."
@@ -1516,188 +1613,234 @@ msgid "Upload selection"
msgstr "Запампаваць выбранае"
msgid "Upload all changes in the current selection to the OSM server."
-msgstr ""
+msgstr "Перадаць на сервер OSM ўсе змены ў вылучаным."
msgid "Checking parents for deleted objects"
-msgstr ""
+msgstr "Праверка бацькоў для выдаленых аб'ектаў"
msgid "Reading parents of ''{0}''"
-msgstr ""
+msgstr "Чытанне бацькоў для'' {0}''"
msgid "Checking for deleted parents in the local dataset"
-msgstr ""
+msgstr "Праверка на выдаленых бацькоў у лакальным наборы дадзеных"
msgid "Validation"
-msgstr ""
+msgstr "Праверка"
msgid "Performs the data validation"
-msgstr ""
+msgstr "Правесьці праверку дадзеных"
msgid "Validating"
-msgstr ""
+msgstr "Праверка"
msgid "Test {0}/{1}: Starting {2}"
-msgstr ""
+msgstr "Тэст {0} / {1}: Ідзе {2}"
msgid "Updating ignored errors ..."
-msgstr ""
+msgstr "Абнаўленне праігнаравалі памылак ..."
msgid "Viewport Following"
-msgstr ""
+msgstr "Рэжым прытрымлівання"
msgid "Enable/disable automatic moving of the map view to last placed node"
msgstr ""
+"Уключыць / адключыць аўтаперамяшчэнне бачнай вобласці карты да апошняй "
+"размешчанай кропкі"
msgid "Toggle Viewport Following"
-msgstr ""
+msgstr "Пераключыць рэжым прытрымлівання"
msgid "Wireframe View"
-msgstr ""
+msgstr "Каркас"
msgid "Enable/disable rendering the map as wireframe only"
-msgstr ""
+msgstr "Уключыць / выключыць адмалёўку карты ў выглядзе каркаса"
msgid "Toggle Wireframe view"
-msgstr ""
+msgstr "Паказаць / схаваць каркас"
msgid "Zoom In"
msgstr "Павялічыць"
msgid "Zoom In (Keypad)"
-msgstr ""
+msgstr "Павялічыць маштаб (лічбавая клавіятура)"
msgid "Zoom Out"
msgstr "Зьменшыць"
msgid "Zoom Out (Keypad)"
-msgstr ""
+msgstr "Паменmшыць маштаб (лічбавая клавіятура)"
msgid "Zoom to"
-msgstr ""
+msgstr "Маштабаваць да"
msgid "Zoom to the object the first selected member refers to"
-msgstr ""
+msgstr "Маштабаванне набліжае да першага абранага аб'екту"
msgid "Zooming disabled because layer of this relation is not active"
-msgstr ""
+msgstr "Маштабаванне адменена, таму што пласт гэтай адносіны не актыўны"
msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Маштабаванне блакаванае, таму што вы не абралі ўдзельніка"
msgid "Zoom to the first selected node"
-msgstr ""
+msgstr "Наблізіцца да першай выдзеленай кропкі"
msgid "Zooming disabled because layer of this way is not active"
-msgstr ""
+msgstr "Маштабаванне адключана бо слой з гэтай лініяй ня актыўны"
msgid "Zooming disabled because there is no selected node"
-msgstr ""
+msgstr "Маштабаванне адключана бо кропка не абрана"
msgctxt "audio"
msgid "Back"
-msgstr ""
+msgstr "Вярнуць"
msgctxt "audio"
msgid "Jump back."
-msgstr ""
+msgstr "Пераматаць назад."
msgid "Audio: {0}"
msgstr "Аўдыё: {0}"
msgctxt "audio"
msgid "Faster"
-msgstr ""
+msgstr "Хутчэй"
msgctxt "audio"
msgid "Faster Forward"
-msgstr ""
+msgstr "Граць хутчэй."
msgctxt "audio"
msgid "Forward"
-msgstr ""
+msgstr "Наперад"
msgctxt "audio"
msgid "Jump forward"
-msgstr ""
+msgstr "Пераматаць наперад"
msgctxt "audio"
msgid "Next Marker"
-msgstr ""
+msgstr "Наступны маркер"
msgctxt "audio"
msgid "Play next marker."
-msgstr ""
+msgstr "Прайграць наступны маркер"
msgctxt "audio"
msgid "Play/Pause"
-msgstr ""
+msgstr "Граць/Паўза"
msgid "Play/pause audio."
-msgstr ""
+msgstr "Граць / Паўза аўдыё"
msgctxt "audio"
msgid "Previous Marker"
-msgstr ""
+msgstr "Папярэдні маркер"
msgctxt "audio"
msgid "Play previous marker."
-msgstr ""
+msgstr "Прайграць папярэдні маркер"
msgctxt "audio"
msgid "Slower"
-msgstr ""
+msgstr "Павольней"
msgctxt "audio"
msgid "Slower Forward"
-msgstr ""
+msgstr "Граць павольней"
+
+msgid "Download GPS"
+msgstr "Спампаваць GPS дадзеныя"
msgid "Downloading GPS data"
-msgstr ""
+msgstr "Запампоўку дадзеных GPS"
msgid "Downloaded GPX Data"
-msgstr ""
+msgstr "Запампаваныя дадзеныя GPX"
msgid "Markers from {0}"
+msgstr "Маркеры з {0}"
+
+msgid "Download Compressed OSM Change"
msgstr ""
-msgid "Downloading data"
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
msgstr ""
+msgid "Downloading data"
+msgstr "Запампоўку дадзеных"
+
msgid ""
"Ignoring exception because download has been canceled. Exception was: {0}"
-msgstr ""
+msgstr "Ігнараванне памылкі, так як загрузка была адменена. Памылка: {0}"
msgid "No data found in this area."
-msgstr ""
+msgstr "У гэтым месцы няма дадзеных."
msgid "OSM Server URL:"
-msgstr ""
+msgstr "URL-адрас сервера OSM:"
msgid "Command"
-msgstr ""
+msgstr "Каманда"
msgid "Request details: {0}"
+msgstr "Параметры запыту: {0}"
+
+msgid "Download OSM URL"
msgstr ""
-msgid "Download {0} of {1} ({2} left)"
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Адбыўся {0} канфлікт падчас імпарту."
+msgstr[1] "Произошло {0} конфликта во время импорта."
+msgstr[2] "Адбылося {0} канфліктаў падчас імпарту"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Канфлікт падчас запампоўкі з сервера"
+msgstr[1] "Канфлікта падчас запампоўкі з сервера"
+msgstr[2] "Канфліктаў падчас запампоўкі з сервера"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0} / {1}) Загрузка бацькоў пункту {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0} / {1}) Загрузка бацькоў лініі {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0} / {1}) Загрузка бацькоў адносіны {2}"
+
+msgid "Download session"
msgstr ""
+msgid "Download {0} of {1} ({2} left)"
+msgstr "Запампоўку {0} з {1} ({2} засталося)"
+
msgid "Updating data"
-msgstr ""
+msgstr "Абнаўленне дадзеных"
msgid "Check on the server"
-msgstr ""
+msgstr "Праверыць на серверы"
msgid ""
"Click to check whether objects in your local dataset are deleted on the "
"server"
msgstr ""
+"Націсніце, каб праверыць, ці не выдалены на серверы аб'екты, якія "
+"знаходзяцца ў вашай базе дадзеных"
msgid "Ignore"
-msgstr ""
+msgstr "Ігнараваць"
msgid "Click to abort and to resume editing"
-msgstr ""
+msgstr "Націсніце, каб перапыніць працэс і працягнуць праўку"
msgid ""
"There is {0} object in your local dataset which might be deleted on the "
@@ -1708,54 +1851,51 @@ msgid_plural ""
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
msgstr[0] ""
+"У вашым лакальным наборы дадзеных {0} аб'ект, які мог быць выдалены на "
+"серверы. <br> Калі пазней вы паспрабуеце выдаліць або абнавіць яго, сервер, "
+"верагодна, паведаміць пра канфлікт."
msgstr[1] ""
+"У вашым лакальным наборы дадзеных {0} аб'екта, якія маглі быць выдаленыя на "
+"серверы. <br> Калі пазней вы паспрабуеце выдаліць або абнавіць іх, сервер, "
+"верагодна, паведаміць пра канфлікт."
+msgstr[2] ""
+"У вашым лакальным наборы дадзеных {0} аб'ектаў, якія маглі быць выдаленыя на "
+"серверы. <br> Калі пазней вы паспрабуеце выдаліць або абнавіць іх, сервер, "
+"верагодна, паведаміць пра канфлікт."
msgid ""
"Click <strong>{0}</strong> to check the state of this object on the server."
msgid_plural ""
"Click <strong>{0}</strong> to check the state of these objects on the server."
msgstr[0] ""
+"Націсніце <strong> {0} </ STRONG>, каб праверыць стан аб'екта на серверы."
msgstr[1] ""
+"Націсніце <strong> {0} </ STRONG>, каб праверыць стан аб'ектаў на серверы."
+msgstr[2] ""
+"Націсніце <strong> {0} </ STRONG>, каб праверыць стан аб'ектаў на серверы."
msgid "Click <strong>{0}</strong> to ignore.</html>"
-msgstr ""
+msgstr "Націсніце <strong> {0} </ STRONG>, каб праігнараваць. </ Html>"
msgid "Deleted or moved objects"
-msgstr ""
+msgstr "Выдаленыя або перамешчаныя аб'екты"
msgid "The following errors occurred during mass download: {0}"
-msgstr ""
+msgstr "Падчас масавай запампоўкі адбыліся наступныя памылкі: {0}"
msgid "Errors during download"
-msgstr ""
-
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
+msgstr "Памылкі пры запампоўцы з сервера"
msgid "Error during download"
-msgstr ""
+msgstr "Памылка падчас запампоўкі з сервера"
msgid "Delete Mode"
-msgstr ""
+msgstr "Рэжым выдалення"
msgid "Delete nodes or ways."
msgstr ""
+"Выдаліць вылучаныя кропкі і лініі (Увага! Пры націску на гэтую кнопку, "
+"вылучаныя аб'екты будзе выдалены без дыялогу)."
msgid "Mode: {0}"
msgstr "Рэжым: {0}"
@@ -1764,107 +1904,112 @@ msgid ""
"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
"when deleting a way. Ctrl: delete referring objects."
msgstr ""
+"Клікніце для выдалення. Shift: выдаліць сегмент. Alt: не выдаляць "
+"невыкарыстоўваемыя кропкі пры выдаленні лініі. Ctrl: выдаліць спасылаючыя "
+"аб'екты."
msgid "Draw"
msgstr "Маляваць"
msgid "Draw nodes"
-msgstr ""
+msgstr "Маляваць кропкі"
msgid "Mode: Draw Angle snapping"
-msgstr ""
+msgstr "Рэжым: Маляванне з прывязкай да кутоў"
msgid "Backspace in Add mode"
-msgstr ""
+msgstr "Backspace ў рэжыме дадання"
msgid "helper line"
-msgstr ""
+msgstr "дапаможная лінія"
msgid "Cannot add a node outside of the world."
-msgstr ""
+msgstr "Кропка не можа быць дададзеная за межамі свету."
msgid "Add node"
-msgstr ""
+msgstr "Дадаць ноду"
msgid "Add node into way"
-msgstr ""
+msgstr "Уставіць кропку ў лінію"
msgid "Connect existing way to node"
-msgstr ""
+msgstr "Далучыць лінію да кропкі"
msgid "Add a new node to an existing way"
-msgstr ""
+msgstr "Дадаць новую кропку да лініі"
msgid "Add node into way and connect"
-msgstr ""
+msgstr "Дадаць кропку да лініі і далучыць"
msgid "Create new node."
-msgstr ""
+msgstr "Стварыць новую кропку."
msgid "Select node under cursor."
-msgstr ""
+msgstr "Вылучыць кропку пад курсорам."
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ўставіць новую кропку у {0} лінію."
+msgstr[1] "Ўставіць новую кропку у {0} лініі."
+msgstr[2] "Ўставіць новую кропку у {0} ліній."
msgid "Start new way from last node."
-msgstr ""
+msgstr "Пачаць новую лінію з апошняй кропкі."
msgid "Continue way from last node."
-msgstr ""
+msgstr "Працягнуць лінію з апошняй кропкі."
msgid "Angle snapping active."
-msgstr ""
+msgstr "Ўключаная прывязка да кутоў."
msgid "Finish drawing."
-msgstr ""
+msgstr "Скончана вычэрчванне."
msgid "FIX"
-msgstr ""
+msgstr "Фікс."
msgid "draw angle snap"
-msgstr ""
+msgstr "Прывязка да кутоў"
msgid "draw angle snap highlight"
-msgstr ""
+msgstr "Прывязка да кутоў: падсьветка"
msgid "Toggle snapping by {0}"
-msgstr ""
+msgstr "Пераключэнне прывязкі {0}"
msgid "Show helper geometry"
-msgstr ""
+msgstr "Паказваць дапаможную лінію"
msgid "Snap to node projections"
-msgstr ""
+msgstr "Прывязка да праекцыі кропак"
msgid "Disable"
-msgstr ""
+msgstr "Адключыць"
msgid "0,90,..."
-msgstr ""
+msgstr "0,90,…"
msgid "0,45,90,..."
-msgstr ""
+msgstr "0,45,90,…"
msgid "0,30,45,60,90,..."
-msgstr ""
+msgstr "0,30,45,60,90,…"
msgid "Angle snapping"
-msgstr ""
+msgstr "Прывязка да кутоў"
msgid "Switch angle snapping mode while drawing"
-msgstr ""
+msgstr "Пераключэнне рэжыму прывязкі да кутоў падчас чарчэння"
msgid "Extrude"
-msgstr ""
+msgstr "Выціснуць"
msgid "Create areas"
-msgstr ""
+msgstr "Стварэнне вобласці"
msgid "Move a segment along its normal, then release the mouse button."
msgstr ""
+"Перамясціце сегмент ўздоўж яго перпендыкуляру, затым адпусціце кнопку мышы."
msgid "Draw a rectangle of the desired size, then release the mouse button."
msgstr ""
@@ -1888,371 +2033,425 @@ msgid "Improve Way Accuracy"
msgstr ""
msgid "Improve Way Accuracy mode"
+msgstr "Рэжым паляпшэння дакладнасці лініі"
+
+msgid "improve way accuracy helper line"
msgstr ""
msgid "Click on the way to start improving its shape."
-msgstr ""
+msgstr "Націсніце на лінію, каб пачаць паляпшаць яе форму."
msgid "Select a way that you want to make more accurate."
-msgstr ""
+msgstr "Вылучыце лінію, якую вы хочаце зрабіць больш дакладнай."
msgid ""
"Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
"delete."
msgstr ""
+"Клікніце, каб дадаць новую кропку. Адпусціце Ctrl для перамяшчэння існуючых "
+"кропак ці ўтрымлівайце націснутай Alt для выдалення."
msgid ""
"Click to delete the highlighted node. Release Alt to move existing nodes or "
"hold Ctrl to add new nodes."
msgstr ""
+"Клікніце, каб выдаліць выдзеленую кропку. Адпусціце Alt для перамяшчэння "
+"існуючых кропак ці ўтрымлівайце націснутай Ctrl для дадання новых кропак."
msgid ""
"Click to move the highlighted node. Hold Ctrl to add new nodes, or Alt to "
"delete."
msgstr ""
+"Клікніце, каб перамясціць вылучаную кропку. Ўтрымлівайце націснутай Ctrl для "
+"дадання новых кропак ці Alt для выдалення."
msgid "Cannot place a node outside of the world."
-msgstr ""
+msgstr "Не ўдаецца змясціць кропку за межамі свету"
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
-msgstr ""
+msgstr "Немагчыма выдаліць кропку, што ўваходзіць у некалькі аб'ектаў"
msgid "Cannot delete node that has tags"
-msgstr ""
+msgstr "Нельга выдаліць кропку, якая мае тэгі"
msgid "Parallel"
-msgstr ""
+msgstr "Паралель"
msgid "Make parallel copies of ways"
+msgstr "Ствараць паралельныя копіі ліній"
+
+msgid "make parallel helper line"
msgstr ""
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
msgstr ""
+"Вылучыце лініі. Цягніце вылучаныя лініі або адну лінію для стварэння "
+"паралельных копій (Alt пераключае захаванне тэгаў)"
msgid "Hold Ctrl to toggle snapping"
-msgstr ""
+msgstr "Ўтрымлівайце Ctrl для пераключэння прывязкі"
msgid ""
"ParallelWayAction\n"
"The ways selected must form a simple branchless path"
msgstr ""
+"Капіяванне паралельна:\n"
+"Абраныя лініі павінны мець простую форму без адгалінаванняў"
msgid "Make parallel way error"
-msgstr ""
+msgstr "Памылка стварэння паралельнай лініі"
msgid "Drag play head"
-msgstr ""
+msgstr "Перацягнуць галоўку гуказдымальніка"
msgid ""
"Drag play head and release near track to play audio from there; "
"SHIFT+release to synchronize audio at that point."
msgstr ""
+"Перасуньце значок з лапкай прайгравальніка і адпусціце каля трэка для "
+"прайгравання гуку ў гэтым месцы. SHIFT + адпусціць для сінхранізацыі гуку ў "
+"гэтай кропцы"
msgid "Select"
msgstr "Выбар"
msgid "Select, move, scale and rotate objects"
-msgstr ""
+msgstr "Выдзяляць, перамяшчаць, маштабаваць і круціць аб'екты"
msgid "Move elements"
-msgstr ""
+msgstr "Перамясціць элементы?"
msgid "Move them"
-msgstr ""
+msgstr "Перамясціць"
msgid "Undo move"
-msgstr ""
+msgstr "Адмена перамяшчэння"
msgid ""
"You moved more than {0} elements. Moving a large number of elements is often "
"an error.\n"
"Really move them?"
msgstr ""
+"Вы перамясцілі больш {0} элементаў. Перамяшчэнне вялікай колькасці "
+"элементаў\n"
+"часта вырабляецца па памылцы. Сапраўды перамясціць іх?"
msgid "Release the mouse button to select the objects in the rectangle."
-msgstr ""
+msgstr "Адпусціце кнопку мышы, каб вылучыць аб'екты ў прамавугольніку."
msgid "Ctrl to merge with nearest node."
-msgstr ""
+msgstr "Ctrl для аб'яднання з бліжэйшай кропкай."
msgid "Release the mouse button to stop moving."
-msgstr ""
+msgstr "Адпусціце кнопку мышы, каб спыніць перамяшчэнне."
msgid "Release the mouse button to stop rotating."
-msgstr ""
+msgstr "Адпусціце кнопку мышы, каб спыніць кручэнне."
msgid "Release the mouse button to stop scaling."
-msgstr ""
+msgstr "Адпусціце кнопку мышы, каб завяршыць маштабаванне"
msgid ""
"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
"Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
msgstr ""
+"Перамяшчэнне аб'ектаў перацягваннем; Націсніце Shift для дадання да ўжо "
+"вылучаных аб'ектах (Ctrl для пераключэння); Shift-Ctrl - для кручэння "
+"вылучаных аб'ектаў; Alt-Ctrl - для змены маштабу вылучаных аб'ектаў; або для "
+"змены вылучэння"
msgid "Add and move a virtual new node to way"
msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Дадайце або перамясціце новую віртуальную кропку на {0} лінію"
+msgstr[1] "Дадайце або перамясціце новую віртуальную кропку на {0} лініі"
+msgstr[2] "Дадайце або перамясціце новую віртуальную кропку на {0} ліній"
msgid "Zoom"
msgstr "Маштабаванне"
msgid "Zoom and move map"
-msgstr ""
+msgstr "Змяняць маштаб і рухаць карту"
msgid ""
"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
"move zoom with right button"
msgstr ""
+"Змяняйце маштаб колам мышы, або клавішамі Ctrl +. і Ctrl +,; перамяшчайце "
+"карту, націснуўшы правую кнопку мышы, або Ctrl + уверх / ўніз / налева / "
+"направа"
msgid "Add all objects selected in the current dataset after the last member"
msgstr ""
+"Дадаць усе аб'екты, вылучаныя ў гэтым наборы, пасля апошняга ўдзельніка"
msgid "Add selection to relation"
-msgstr ""
+msgstr "Дадаць вылучэнне да стаўлення"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Дадаць вылучанае да {0} адносіны"
+msgstr[1] "Дадаць вылучанае да {0} адносін"
+msgstr[2] "Дадаць вылучанае да {0} адносін"
msgid "Delete the selected relation"
-msgstr ""
+msgstr "Выдаліць абраную адносіну"
msgid "Download all members of the selected relations"
-msgstr ""
+msgstr "Спампаваць з сервера ўсіх удзельнікаў вылучаных адносін"
msgid "Download members"
-msgstr ""
+msgstr "Спампаваць удзельнікаў"
msgid "Download incomplete members of selected relations"
-msgstr ""
+msgstr "Дапампаваць з сервера удзельнікаў выбраных адносін"
msgid "Download incomplete members"
-msgstr ""
+msgstr "Дапампаваць удзельнікаў"
msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
+msgstr "Стварыць копію гэтай адносіны і адкрыць яе ў іншым акне рэдактара"
msgid "Edit"
msgstr "Змяніць"
msgid "Call relation editor for selected relation"
-msgstr ""
+msgstr "Запусціць рэдактар адносін для вылучанай адносіны"
msgid "Select in relation list"
-msgstr ""
+msgstr "Абраць у спісе адносін"
msgid "Select relation in relation list."
-msgstr ""
+msgstr "Выбраць адносіну ў спісе адносін."
msgid "Add the members of all selected relations to current selection"
-msgstr ""
+msgstr "Дадаць ўдзельнікаў усіх выбраных адносін да бягучага вылучэння"
msgid "Select the members of all selected relations"
-msgstr ""
+msgstr "Вылучыце ўдзельнікаў усіх выбраных адносін"
msgid "Select members (add)"
-msgstr ""
+msgstr "Выбраць удзельнікаў (дадаць)"
msgid "Select members"
-msgstr ""
+msgstr "Абраць удзельнікаў"
msgid "Add the selected relations to the current selection"
-msgstr ""
+msgstr "Дадаць выбраныя адносіны да бягучага выбару"
msgid "Set the current selection to the list of selected relations"
-msgstr ""
+msgstr "Устанавіць бягучы выбар на спісе вылучаных адносін"
msgid "Select relation (add)"
-msgstr ""
+msgstr "Абраць адносіну (дадаць)"
msgid "Select relation"
-msgstr ""
+msgstr "Абраць адносіну"
msgid "<not>"
-msgstr ""
+msgstr "<not>"
msgid "<or>"
-msgstr ""
+msgstr "<or>"
msgid "<xor>"
-msgstr ""
+msgstr "<xor>"
msgid "<left parent>"
-msgstr ""
+msgstr "<left parent>"
msgid "<right parent>"
-msgstr ""
+msgstr "<right parent>"
msgid "<colon>"
-msgstr ""
+msgstr "<colon>"
msgid "<equals>"
-msgstr ""
+msgstr "<equals>"
msgid "<key>"
-msgstr ""
+msgstr "<key>"
msgid "<question mark>"
-msgstr ""
+msgstr "<question mark>"
msgid "<end-of-file>"
-msgstr ""
+msgstr "<end-of-file>"
msgid "Search..."
msgstr "Шукаць..."
msgid "Search for objects."
-msgstr ""
+msgstr "Пошук аб'ектаў"
msgid "{0}: "
-msgstr ""
+msgstr "{0}: "
msgid "Filter string:"
-msgstr ""
+msgstr "Радок фільтра:"
msgid "Search string:"
-msgstr ""
+msgstr "Радок пошуку"
msgid "Enter the search expression"
-msgstr ""
+msgstr "Увядзіце выраз для пошуку"
msgid "replace selection"
-msgstr ""
+msgstr "замяніць вылучэнне"
msgid "add to selection"
-msgstr ""
+msgstr "дадаць да вылучэння"
msgid "remove from selection"
-msgstr ""
+msgstr "прыбраць з выдзялення"
msgid "find in selection"
-msgstr ""
+msgstr "знайсці ў вылучаным"
msgid "case sensitive"
msgstr "улічваць рэгістр"
msgid "all objects"
-msgstr ""
+msgstr "ўсе аб'екты"
msgid "Also include incomplete and deleted objects in search."
-msgstr ""
+msgstr "Уключыць у пошук няскончаныя і выдаленыя аб'екты"
msgid "regular expression"
msgstr "рэгулярны выраз"
msgid "add toolbar button"
-msgstr ""
+msgstr "дадаць кнопку на панэлі інструмэнтаў"
msgid "Filter"
-msgstr ""
+msgstr "Фільтар"
msgid "Search"
msgstr "Шукаць"
msgid "Submit filter"
-msgstr ""
+msgstr "Прыняць фільтр"
msgid "Start Search"
-msgstr ""
+msgstr "Пачаць пошук"
msgid ""
"Search expression is not valid: \n"
"\n"
" {0}"
msgstr ""
+"Няправільны выраз для пошуку: \n"
+"\n"
+"{0}"
msgid "Invalid search expression"
-msgstr ""
+msgstr "Няправільны выраз для пошуку"
msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr ""
+msgstr "<b> Baker Street </ b> -'' Baker'' і'' Street'' ў любым тэгу"
msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr ""
+msgstr "<b> Baker Street </ b> -'' Baker'' і'' Street'' ў любым тэгу"
msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr ""
+msgstr "<b> key: Bak </ b> -'' Bak'' ў любым месцы тэгу \"key\""
msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr ""
+msgstr "<b>-key: Bak </ b> -'' Bak'' не ўваходзіць ў тэг \"key\""
msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr ""
+msgstr "<b> key = value </ b> - тэг \"key\" са значэннем \"value\""
msgid ""
"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
msgstr ""
+"<b> key = *</ b> - тэг \"key\" з любым значэннем. Паспрабуйце таксама <b> * "
+"= value </ b>, <b> key = </ b>, <b> * = * </ b>, <b> * = </ b>"
msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr ""
+msgstr "<b>key:</ b> - тэг \"key\" з якім-небудзь значэннем"
msgid ""
"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
msgstr ""
+"<b>key?</ b> - тэг \"key\" са значэннямі \"yes\",\"true\",\"1\" ці \"on\""
msgid "Special targets"
-msgstr ""
+msgstr "Спецыяльныя мэты"
msgid ""
"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
"<b>relation</b>)"
msgstr ""
+"<b> type: </ b> ... - Аб'екты адпаведныя тыпу (<b> node </ b>, <b> way </ "
+"b>, <b> relation </ b>)"
msgid "<b>user:</b>... - objects changed by user"
-msgstr ""
+msgstr "<b> user: </ b> ... - Аб'екты зменены карыстальнікам"
msgid "<b>user:anonymous</b> - objects changed by anonymous users"
msgstr ""
+"<b> user: anonymous </ b> - аб'екты зменены ананімнымі карыстальнікамі"
msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr ""
+msgstr "<b> id: </ b> ... - Аб'екты з дадзеным ID (0 для новых аб'ектаў)"
msgid ""
"<b>version:</b>... - objects with given version (0 objects without an "
"assigned version)"
msgstr ""
+"<b> version: </ b> ... - Аб'екты дадзенай версіі (0 аб'екты без версіі)"
msgid ""
"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
"assigned changeset)"
msgstr ""
+"<b> changeset: </ b> ... - Аб'екты з зададзеным нумарам пакета правак "
+"(пакажыце 0 для аб'ектаў, якія не ўваходзяць у пакеты правак)"
msgid ""
"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
msgstr ""
+"<b> nodes: </ b> ... - Аб'екты з дадзеным лікам кропак (<b> nodes: </ b> "
+"лік, <b> nodes: </ b> мін-макс, <b> nodes: </ b> мін-ці <b> nodes: </ b>-"
+"макс)"
msgid ""
"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
msgstr ""
+"<b> tags: </ b> ... - Аб'екты з дадзеным лікам тэгаў (<b> tags: </ b> лік, "
+"<b> tags: </ b> мін-макс, <b> tags: </ b> мін-ці <b> tags: </ b>-макс)"
msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr ""
+msgstr "<b> role: </ b> ... - Аб'екты з дадзенай роляй у адносінах"
msgid ""
"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
msgstr ""
+"<b> timestamp: </ b> час - аб'екты з апошнім часам змяненняў (2009-11-12T14: "
+"51:09 Z, 2009-11-12 Або T14: 51 ...)"
msgid ""
"<b>timestamp:</b>min/max - objects with last modification within range"
msgstr ""
+"<b> timestamp: </ b> min / max - аб'екты, якія былі зменены ў гэтым дыяпазоне"
msgid ""
"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
"max or <b>areasize:</b>max)"
msgstr ""
+"<b> areasize: </ b> ... - Замкнёныя лініі з плошчай ... (м ²) (<b> areasize: "
+"</ b> мін-макс або <b> areasize: </ b> макс)"
msgid "<b>modified</b> - all changed objects"
msgstr ""
@@ -2337,6 +2536,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2497,13 +2699,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2512,6 +2714,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2530,8 +2735,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2617,6 +2821,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2653,10 +2860,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2679,8 +2886,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2784,6 +2991,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2844,8 +3054,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2875,10 +3085,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2899,6 +3109,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2929,18 +3142,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2949,8 +3162,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2958,13 +3171,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2978,8 +3189,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3009,11 +3220,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3166,8 +3376,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3274,7 +3483,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3293,6 +3502,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3309,9 +3521,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3350,6 +3559,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3374,6 +3586,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3433,13 +3654,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3509,6 +3730,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3578,6 +3817,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3635,13 +3880,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3673,10 +3918,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3810,7 +4055,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3885,6 +4130,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3915,9 +4163,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3942,10 +4187,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4008,23 +4253,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4128,7 +4356,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4324,9 +4552,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4342,10 +4585,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4354,6 +4609,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4413,6 +4671,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4440,19 +4701,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4740,29 +4988,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4777,7 +5043,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4829,14 +5095,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5086,14 +5344,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5614,6 +5872,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5697,6 +5958,36 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Тып аб'екта"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "Змешаны"
+
+msgid "Choose the OSM object type"
+msgstr "Выбераце тып аб'екта OSM"
+
+msgid "Object ID:"
+msgstr "ID аб'екта:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Пазначце ID аб'екта для запампоўкі"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Ідэнтыфікатары аб'ектаў могуць быць падзеленыя коскамі або прабеламі <br/> "
+"Прыклады:. <b> <ul> <li> 1 2 5 </ li> <li> 1,2,5 </ li> </ UL> <бр / > </ B> "
+"У змешаным рэжыме указвайце аб'екты так: <b> W123, n110, w12, r15 </ B> <br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5718,9 +6009,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5745,32 +6033,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5790,8 +6078,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5817,9 +6104,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5964,9 +6248,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6251,8 +6532,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6317,34 +6598,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: foreground"
+msgstr ""
+
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6359,13 +6652,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6444,12 +6737,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6479,9 +6766,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6519,7 +6812,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6579,6 +6872,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6834,6 +7130,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6899,9 +7214,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6968,21 +7280,8 @@ msgstr "Спампаваць спасылаюшчых на аб'ект (баць
msgid "Download object"
msgstr "Запампоўка аб'екта"
-msgid "Object type:"
-msgstr "Тып аб'екта"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "Змешаны"
-
-msgid "Choose the OSM object type"
-msgstr "Выбераце тып аб'екта OSM"
-
-msgid "Object ID:"
-msgstr "ID аб'екта:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Пазначце ID аб'екта для запампоўкі"
+msgid "Start downloading"
+msgstr "Пачатак запампоўкі"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6994,28 +7293,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Адзначце, калі павінны быць запампаваны і ўдзельнікі адносіны"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Ідэнтыфікатары аб'ектаў могуць быць падзеленыя коскамі або прабеламі <br/> "
-"Прыклады:. <b> <ul> <li> 1 2 5 </ li> <li> 1,2,5 </ li> </ UL> <бр / > </ B> "
-"У змешаным рэжыме указвайце аб'екты так: <b> W123, n110, w12, r15 </ B> <br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Спампаваць аб'екты, якія спасылаюцца (бацькоўскія адносіны і лініі)"
-msgid "Start downloading"
-msgstr "Пачатак запампоўкі"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Няправільны спіс ідэнтыфікатараў.\n"
-"Немагчыма запампаваць аб'ект."
-
msgid "Class Type"
msgstr ""
@@ -7112,7 +7392,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7211,6 +7491,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7298,7 +7581,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7317,6 +7600,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7383,8 +7672,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7459,8 +7747,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7474,8 +7762,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7690,12 +7977,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7704,6 +7985,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7719,6 +8016,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7726,8 +8038,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7839,9 +8151,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7851,6 +8160,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7867,7 +8179,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8013,7 +8325,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8043,7 +8355,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8159,6 +8471,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8196,6 +8511,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8392,9 +8710,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8413,6 +8728,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8470,6 +8788,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8536,9 +8860,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8551,7 +8872,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8578,12 +8902,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8712,14 +9040,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8734,7 +9058,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8744,8 +9068,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8965,7 +9288,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9031,6 +9354,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9088,9 +9417,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9337,6 +9663,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9465,6 +9794,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9507,6 +9842,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9557,19 +9895,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9587,40 +9916,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9644,6 +9982,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9700,6 +10071,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9753,6 +10127,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10034,7 +10413,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10203,10 +10588,16 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
-msgid "File backup"
+msgid "Notification at each save"
msgstr ""
-msgid "Configure whether to create backup files"
+msgid "When saving, display a small notification"
+msgstr ""
+
+msgid "File backup"
+msgstr ""
+
+msgid "Configure whether to create backup files"
msgstr ""
msgid "Enable built-in icon defaults"
@@ -10266,7 +10657,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10524,40 +10915,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10610,8 +11001,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10620,20 +11011,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10715,14 +11111,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10766,31 +11156,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10799,6 +11194,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10814,57 +11212,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10882,6 +11282,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10911,6 +11319,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10941,7 +11392,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10981,28 +11432,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11097,6 +11546,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11112,12 +11564,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11196,7 +11656,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11295,35 +11755,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11333,8 +11769,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11361,10 +11797,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11375,9 +11808,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11399,6 +11829,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11448,8 +11881,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11592,6 +12025,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11610,6 +12046,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11634,16 +12079,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11655,6 +12103,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11669,6 +12125,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11699,19 +12164,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11733,11 +12198,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Файл сессіі (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11807,13 +12284,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11956,10 +12433,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11974,22 +12451,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12058,8 +12534,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12074,9 +12549,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12398,17 +12888,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12419,9 +12903,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12453,9 +12980,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12778,6 +13319,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12857,6 +13403,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12958,9 +13508,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13016,6 +13563,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13040,9 +13590,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13068,9 +13615,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13107,6 +13651,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13153,9 +13702,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13240,6 +13786,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13330,6 +13879,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13348,10 +13941,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13363,6 +13956,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13390,18 +13986,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13411,9 +14001,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13423,13 +14010,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13477,6 +14064,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13561,6 +14151,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13665,21 +14258,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13695,10 +14297,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13734,7 +14336,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13803,12 +14405,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13824,15 +14432,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13854,6 +14453,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13863,6 +14471,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13872,10 +14483,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13908,9 +14516,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13944,19 +14549,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13968,6 +14597,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13989,19 +14621,34 @@ msgstr ""
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14010,22 +14657,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14058,12 +14734,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14121,6 +14812,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14130,6 +14824,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14169,9 +14869,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14205,6 +14902,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14286,18 +14998,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14370,7 +15087,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14394,10 +15114,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14409,9 +15132,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14454,18 +15174,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14565,11 +15323,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14581,11 +15337,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14604,10 +15358,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14637,9 +15391,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Ёмістасць"
@@ -14655,19 +15406,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14817,6 +15584,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14838,6 +15608,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14865,6 +15641,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14889,22 +15671,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14926,9 +15692,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14992,7 +15755,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15123,6 +15886,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15153,6 +15919,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15165,9 +15934,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15177,9 +15943,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15192,6 +15963,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15216,14 +15990,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15272,7 +16038,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15326,41 +16092,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15546,6 +16312,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15567,9 +16339,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15582,6 +16360,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15621,6 +16402,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15642,22 +16426,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15681,9 +16477,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15708,7 +16501,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15781,49 +16583,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15841,6 +16637,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15853,6 +16655,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15868,145 +16673,260 @@ msgstr ""
msgid "quaker"
msgstr ""
-msgid "shia"
+msgid "roman_catholic"
msgstr ""
-msgid "sunni"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
+msgid "Sa 18:00; Su 10:45"
msgstr ""
-msgid "Edit Studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
msgstr ""
-msgid "audio"
+msgid "Sa 10:00+"
msgstr ""
-msgid "video"
+msgid "Mosque"
msgstr ""
-msgid "Public Building"
+msgid "Edit Mosque"
msgstr ""
-msgid "Edit Public Building"
+msgid "mosque"
msgstr ""
-msgid "Town hall"
+msgid "ibadi"
msgstr ""
-msgid "Edit Town hall"
+msgid "shia"
msgstr ""
-msgid "Community Centre"
+msgid "sunni"
msgstr ""
-msgid "Embassy"
+msgid "Synagogue"
msgstr ""
-msgid "Edit Embassy"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Courthouse"
+msgid "synagogue"
msgstr ""
-msgid "Edit Courthouse"
+msgid "conservative"
msgstr ""
-msgid "Prison"
+msgid "reform"
msgstr ""
-msgid "Edit Prison"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Police"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "Edit Police"
+msgid "theravada"
msgstr ""
-msgid "Fire Station"
+msgid "mahayana"
msgstr ""
-msgid "Edit Fire Station"
+msgid "vajrayana"
msgstr ""
-msgid "Post Office"
+msgid "Hindu Temple"
msgstr ""
-msgid "Edit Post Office"
+msgid "Edit Hindu Temple"
msgstr ""
-msgid "Education"
+msgid "vaishnavism"
msgstr ""
-msgid "Kindergarten"
+msgid "shaivism"
msgstr ""
-msgid "Edit Kindergarten"
+msgid "shaktism"
msgstr ""
-msgid "School"
+msgid "smartism"
msgstr ""
-msgid "Edit School"
+msgid "Shinto Shrine"
msgstr ""
-msgid "University"
+msgid "Edit Shinto Shrine"
msgstr ""
-msgid "Edit University"
+msgid "Other Place of Worship"
msgstr ""
-msgid "College"
+msgid "Edit other Place of Worship"
msgstr ""
-msgid "Edit College"
+msgid "Religion"
msgstr ""
-msgid "Driving School"
+msgid "bahai"
msgstr ""
-msgid "Edit Driving School"
+msgid "jain"
msgstr ""
-msgid "License Classes"
+msgid "sikh"
msgstr ""
-msgid "Health"
+msgid "spiritualist"
msgstr ""
-msgid "Hospital"
+msgid "taoist"
msgstr ""
-msgid "Edit Hospital"
+msgid "unitarian"
msgstr ""
-msgid "Doctors"
+msgid "zoroastrian"
msgstr ""
-msgid "Edit Doctors"
+msgid "Public Building"
msgstr ""
-msgid "Dentist"
+msgid "Edit Public Building"
msgstr ""
-msgid "Edit Dentist"
+msgid "Town hall"
+msgstr ""
+
+msgid "Edit Town hall"
+msgstr ""
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr ""
+
+msgid "Edit Embassy"
+msgstr ""
+
+msgid "Courthouse"
+msgstr ""
+
+msgid "Edit Courthouse"
+msgstr ""
+
+msgid "Prison"
+msgstr ""
+
+msgid "Edit Prison"
+msgstr ""
+
+msgid "Police"
+msgstr ""
+
+msgid "Edit Police"
+msgstr ""
+
+msgid "Fire Station"
+msgstr ""
+
+msgid "Edit Fire Station"
+msgstr ""
+
+msgid "Post Office"
+msgstr ""
+
+msgid "Edit Post Office"
+msgstr ""
+
+msgid "Education"
+msgstr ""
+
+msgid "Kindergarten"
+msgstr ""
+
+msgid "Edit Kindergarten"
+msgstr ""
+
+msgid "School"
+msgstr ""
+
+msgid "Edit School"
+msgstr ""
+
+msgid "University"
+msgstr ""
+
+msgid "Edit University"
+msgstr ""
+
+msgid "College"
+msgstr ""
+
+msgid "Edit College"
+msgstr ""
+
+msgid "Driving School"
+msgstr ""
+
+msgid "Edit Driving School"
+msgstr ""
+
+msgid "License Classes"
+msgstr ""
+
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
+msgid "Health"
+msgstr ""
+
+msgid "Hospital"
+msgstr ""
+
+msgid "Edit Hospital"
+msgstr ""
+
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
+msgid "Doctors"
+msgstr ""
+
+msgid "Edit Doctors"
+msgstr ""
+
+msgid "Dentist"
+msgstr ""
+
+msgid "Edit Dentist"
msgstr ""
msgid "Nursing Home"
@@ -16063,12 +16983,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16078,6 +17052,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16087,31 +17085,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16139,7 +17143,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16166,27 +17170,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16221,12 +17213,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16236,10 +17231,10 @@ msgstr "Схаваць"
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16267,6 +17262,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16304,117 +17302,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16448,33 +17482,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16508,6 +17552,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16520,7 +17580,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16583,36 +17668,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16655,19 +17758,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16806,6 +17905,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16818,60 +17929,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
msgstr ""
-msgid "school"
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
+msgctxt "building"
+msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16887,9 +18072,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17099,41 +18281,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17142,7 +18350,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17154,12 +18362,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17211,88 +18509,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17304,6 +18705,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17319,6 +18735,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17337,11 +18756,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17450,10 +18867,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17465,7 +18882,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17486,13 +18903,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17564,7 +18987,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17585,13 +19008,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17600,7 +19023,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17628,6 +19050,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17664,40 +19092,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
+msgstr ""
+
+msgid "Edit Florist"
+msgstr ""
+
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17709,19 +19158,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17742,6 +19191,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17751,7 +19206,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17832,6 +19287,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17961,6 +19419,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18000,24 +19464,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr "Змяніць лес"
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -18027,15 +19500,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18111,6 +19575,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18165,7 +19635,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18177,6 +19647,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18252,46 +19725,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18312,6 +19788,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18474,27 +19962,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18540,19 +20057,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18576,7 +20096,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18672,18 +20192,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18693,7 +20222,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18702,10 +20234,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18723,6 +20255,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18738,28 +20273,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18780,19 +20315,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18858,9 +20393,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18870,10 +20402,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18888,9 +20423,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18918,6 +20450,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18963,10 +20498,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18978,7 +20543,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18996,7 +20561,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19113,19 +20678,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "map_type without information=map"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19144,13 +20820,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19159,19 +20871,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19186,142 +20907,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19337,13 +21107,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Лоді - Італія"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Сіцылія - Італія"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -19360,148 +21130,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr ""
+
+msgid "ScanEx IRS"
+msgstr ""
+
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19705,6 +21538,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19726,13 +21571,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19995,9 +21834,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20019,6 +21864,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20097,9 +21945,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20184,7 +22044,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20455,15 +22315,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20634,6 +22485,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20652,12 +22506,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20793,6 +22641,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20810,6 +22661,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20890,113 +22744,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21022,7 +22890,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21072,7 +22943,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21117,6 +22988,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21186,7 +23060,72 @@ msgstr ""
msgid "New tool..."
msgstr ""
-msgid "Install"
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21228,27 +23167,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21644,6 +23565,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21891,12 +23815,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21906,16 +23824,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22278,9 +24193,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22335,9 +24247,30 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Усе новыя лініі атрымалі сяброўства у ралявых суадносінах.Трэба "
+"спраўдзіць і выправіць калі патрэбна.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"Усе новыя лініі атрымалі сяброўства у суадносінах.Трэба спраўдзіць і "
+"выправіць калі патрэбна.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22379,25 +24312,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22534,9 +24467,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22561,12 +24491,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22715,6 +24654,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22731,6 +24673,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22964,13 +24917,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23023,18 +24969,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23092,6 +25026,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23299,9 +25236,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23381,7 +25315,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23535,6 +25487,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23556,6 +25511,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23849,9 +25807,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23920,9 +25875,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24049,9 +26001,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24073,6 +26022,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24105,15 +26057,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24123,6 +26091,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24225,9 +26196,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24343,6 +26311,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24403,19 +26374,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24553,6 +26524,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24628,6 +26602,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24643,9 +26706,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24667,6 +26727,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24819,9 +26882,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25447,7 +27507,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25455,10 +27518,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25467,18 +27527,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25521,15 +27569,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25651,18 +27690,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25840,9 +27867,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25969,7 +27993,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25989,9 +28013,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26124,9 +28145,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index 054ccea..fc11a6b 100644
--- a/i18n/po/bg.po
+++ b/i18n/po/bg.po
@@ -2,53 +2,69 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:31+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-06-24 15:10+0000\n"
+"Last-Translator: Ventsislav Nikolov <ventsi.nikolov at gmail.com>\n"
"Language-Team: Bulgarian <bg 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: 2013-04-05 04:36+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: опция ''{1}'' е съмнителна"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: опция ''--{1}'' не позволява аргумент"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: опция ''{1}{2}'' не позволява аргумент"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr ""
+msgstr "{0}: опция ''{1}'' изисква аргумент"
msgid "{0}: unrecognized option ''--{1}''"
-msgstr ""
+msgstr "{0}: неразпозната опция ''--{1}''"
msgid "{0}: unrecognized option ''{1}{2}''"
-msgstr ""
+msgstr "{0}: неразпозната опция ''{1}{2}''"
msgid "{0}: illegal option -- {1}"
-msgstr ""
+msgstr "{0}: непозволена опция -- {1}"
msgid "{0}: invalid option -- {1}"
-msgstr ""
+msgstr "{0}: непозволена опция -- {1}"
msgid "{0}: option requires an argument -- {1}"
-msgstr ""
+msgstr "{0}: опцията изисква аргумент -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr ""
+msgstr "Невалидна стойност {0} за параметър ''has_arg''"
msgid "Background Terms of Use"
msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+"Отварянето на връзката не се поддържа на текущата платформа (''{0}'')"
+
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: {0}"
+
+msgid "INFO: {0}"
+msgstr "ИНФО: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
msgid "Executing platform startup hook"
msgstr ""
@@ -154,33 +170,33 @@ msgid "About JOSM..."
msgstr "За JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ВНИМАНИЕ: неочакван формат на базовия API адрес. Пренасочването към личната "
-"страница на OSM-потребителя невъзможно. Базовият API адрес: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
msgstr ""
+"На път сте да отворите {0} прозореца на браузъра<br>Това може да претрупа "
+"екрана ви с отворени прозорци<br>и да отнеме известно време."
msgid "Continue"
msgstr "Продължи"
msgid "Click to continue and to open {0} browsers"
-msgstr ""
+msgstr "Щракнете, за да продължите с отварянето на {0} браузъра"
msgid "Cancel"
msgstr "Отмяна"
msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Щракнете за да прекъснете стартирането на външни браузъри"
msgid "Please select at least one already uploaded node, way, or relation."
msgstr "Моля, изберете поне една качена вече точка, линия или релация."
@@ -202,28 +218,31 @@ msgstr ""
"обедини.</html>"
msgid "No target layers"
-msgstr "Няма слоеве за целта"
+msgstr "Няма целеви слоеве"
msgid "Add imagery layer {0}"
-msgstr ""
+msgstr "Добавете слой с изображения {0}"
+
+msgid "Select image format for WMS layer"
+msgstr "Изберете формат на изображение за WMS слоя"
msgid "Select WMS layers"
-msgstr ""
+msgstr "Изберете WMS слоеве"
msgid "Add layers"
-msgstr ""
+msgstr "Добавете слоеве"
msgid "Invalid service URL."
-msgstr ""
+msgstr "Невалиден адрес на услугата"
msgid "WMS Error"
-msgstr ""
+msgstr "WMS грешка"
msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "Неуспешно получаването на списъка с WMS слоеве"
msgid "Could not parse WMS layer list."
-msgstr ""
+msgstr "Неуспешно обработването на списъка с WMS слоеве"
msgid "Add Node..."
msgstr "Добавяне на точка..."
@@ -246,9 +265,6 @@ msgstr "Инструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Моля изберете поне четири точки."
-msgid "Information"
-msgstr "Информация"
-
msgid "Align Nodes in Line"
msgstr "Подреди точките в линия"
@@ -273,6 +289,9 @@ msgstr "конфликт"
msgid "download"
msgstr "свалено"
+msgid "problem"
+msgstr "проблем"
+
msgid "previous"
msgstr "предишен"
@@ -282,6 +301,9 @@ msgstr "следващ"
msgid "Nothing selected to zoom to."
msgstr "Няма нищо избрано за показване."
+msgid "Information"
+msgstr "Информация"
+
msgid "Zoom to {0}"
msgstr "Показване на {0}"
@@ -338,11 +360,9 @@ msgstr ""
"посоката на някои от тях?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Не може да се обединят линиите (Не могат да бъдат представени като една "
-"последователност от възли)."
msgid "Combine {0} ways"
msgstr "Обединяване {0} линии"
@@ -360,10 +380,10 @@ msgid "Please select something to copy."
msgstr "Моля, изберете нещо за копиране."
msgid "Copy Coordinates"
-msgstr ""
+msgstr "Копиране на координати"
msgid "Copy coordinates of selected nodes to clipboard."
-msgstr ""
+msgstr "Копиране на координатите на избраните възли в клипборда"
msgid "Create Circle"
msgstr "Създаване окръжност"
@@ -386,7 +406,7 @@ msgid "Create multipolygon."
msgstr "Създаване на мултиполигон."
msgid "No data loaded."
-msgstr "Никакви данни не са заредени."
+msgstr "Няма заредени данни"
msgid "You must select at least one way."
msgstr "Трябва да изберете поне един път."
@@ -397,6 +417,12 @@ msgstr "Изтриване"
msgid "Delete selected objects."
msgstr "Изтриване на избраните обекти."
+msgid "Toggle dialogs panel"
+msgstr "Включване на диалоговия панел"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Включване на диалоговия панел, максимално увеличаване на картата"
+
msgid "Distribute Nodes"
msgstr "Разпределяне на точки"
@@ -404,12 +430,25 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Разпределяне на избраните точки на равни разстояния по дължината на линия"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Игнориране на {0} възли с невалидни координати"
+
msgid "Download from OSM..."
msgstr "Сваляне от OSM..."
msgid "Download map data from the OSM server."
msgstr "Сваляне на картографски данни от OSM сървър."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Това действие ще изисква {0} отделни<br>заявки за сваляне. "
+"Продължаване?</html>"
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "Сваляне на обект..."
@@ -434,17 +473,17 @@ msgstr ""
"ID е непознат за него."
msgid "missing objects:"
-msgstr ""
+msgstr "липсващи обекти:"
msgid "Object deleted"
msgid_plural "Objects deleted"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Обектът изтрит"
+msgstr[1] "Обектите изтрити"
msgid "One downloaded object is deleted."
msgid_plural "{0} downloaded objects are deleted."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Един свален обекти е изтрит"
+msgstr[1] "{0} свалени обекти са изтрити"
msgid "Ok"
msgstr "ОК"
@@ -453,7 +492,7 @@ msgid "Download parent ways/relations..."
msgstr "Сваляне на родителски пътища/релации"
msgid "Download objects referring to one of the selected objects"
-msgstr ""
+msgstr "Свалете обекти свързани с избраните обекти"
msgid "Duplicate"
msgstr "Дублиране"
@@ -469,25 +508,25 @@ msgid "Exit the application."
msgstr "Изход от програмата."
msgid "Expert Mode"
-msgstr ""
+msgstr "Режим Експерт"
msgid "Enable/disable expert mode"
-msgstr ""
+msgstr "Включване/изключване на режим Експерт"
msgid "Follow line"
-msgstr ""
+msgstr "Проследяване на линия"
msgid "Continues drawing a line that shares nodes with another line."
-msgstr ""
+msgstr "Продължава чертането на линия, която има общи възли с друга линия."
msgid "Follow"
-msgstr ""
+msgstr "Проследяване"
msgid "Fullscreen view"
msgstr "Цял екран"
msgid "Toggle fullscreen view"
-msgstr "Превключване режима на цял екран"
+msgstr "Превключване в режим на цял екран"
msgid "Export to GPX..."
msgstr "Експорт до GPX..."
@@ -507,9 +546,12 @@ msgstr "История"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Показва информация за историята на OSM линии, точки или релации."
-msgid "History (web)"
+msgid "Show history"
msgstr ""
+msgid "History (web)"
+msgstr "История (уеб)"
+
msgid ""
"Display history information about OSM ways, nodes, or relations in web "
"browser."
@@ -517,13 +559,13 @@ msgstr ""
"Показва цялата информация за точки, пътища и релации от OSM в браузър."
msgid "New offset"
-msgstr ""
+msgstr "Ново отместване"
msgid "Adjust the position of this imagery layer"
-msgstr "Позиция на слоя с изображение."
+msgstr "Коригиране на позицията на слоя с изображения"
msgid "Adjust imagery offset"
-msgstr "Отместване на изображението."
+msgstr "Коригиране на отместването на изображението"
msgid "OK"
msgstr "ОК"
@@ -540,31 +582,33 @@ msgstr ""
"Ако искате да запазите настройките, въведете име в полето."
msgid "Offset: "
-msgstr ""
+msgstr "Отместване: "
msgid "Bookmark name: "
-msgstr ""
+msgstr "Отметка име: "
msgid "Overwrite"
-msgstr "Презаписване"
+msgstr "Презапис"
msgid "Offset bookmark already exists. Overwrite?"
-msgstr ""
+msgstr "Отметката за отместване съществува. Презапис?"
msgid "Advanced info"
-msgstr ""
+msgstr "Разширена информация"
msgid ""
"Display advanced object information about OSM nodes, ways, or relations."
-msgstr ""
+msgstr "Показване на разширена информация за OSM възли, пътища или релации."
msgid "Advanced info (web)"
-msgstr ""
+msgstr "Разширена информация (уеб)"
msgid ""
"Display object information about OSM nodes, ways, or relations in web "
"browser."
msgstr ""
+"Показване на разширена информация за OSM възли, пътища или релации в уеб "
+"браузър."
msgid "Join overlapping Areas"
msgstr "Обедини припокриващи се области"
@@ -573,87 +617,93 @@ msgid "Joins areas that overlap each other"
msgstr "Свързване на области, които се препокриват една с друга"
msgid "Please select at least one closed way that should be joined."
-msgstr ""
+msgstr "Моля изберете поне един затворен път, който да бъде добавен."
msgid ""
"One of the selected ways is not closed and therefore cannot be joined."
msgstr ""
+"Един от избраните пътища не е достатъчно близо и затова не може да бъде "
+"добавен."
msgid "Join area confirmation"
-msgstr ""
+msgstr "Потвърждение за свързване на област"
msgid "The selected way has nodes outside of the downloaded data region."
msgid_plural ""
"The selected ways have nodes outside of the downloaded data region."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Избраният път има възли извън сваления район"
+msgstr[1] "Избраните пътища имат възли извън сваления район"
msgid "This can lead to nodes being deleted accidentally."
-msgstr ""
+msgstr "Това може да доведе до случайно изтриване на възли."
msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Сигурни ли сте, че искате да продължите?"
msgid "Please abort if you are not sure"
msgstr "Моля откажете се, ако не сте сигурни"
msgid "The selected area is incomplete. Continue?"
-msgstr ""
+msgstr "Избраната област е недовършена. Продължаване?"
msgid "No intersection found. Nothing was changed."
msgstr "Няма намерено пресичане. Няма направени промени."
msgid "Reverting changes"
-msgstr ""
+msgstr "Връщане на промени"
msgid "Removed duplicate nodes"
-msgstr ""
+msgstr "Премахнати дупликирани възли"
msgid "Added node on all intersections"
msgstr "Добавен възел на всички кръстовища"
msgid "Assemble new polygons"
-msgstr ""
+msgstr "Събиране на нови полигони"
msgid "Delete relations"
-msgstr ""
+msgstr "Изтриване на релации"
msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr "Изтриване Пътища, които не са част от вътрешен мултиполигон"
+msgstr "Изтриване на Пътища, които не са част от вътрешен мултиполигон"
msgid "Joined overlapping areas"
msgstr "Свързана пресичаща област"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Някои от пътищата са част от релации, които са били променяни. Моля, "
-"проверете дали няма да се появят грешки."
msgid "Fix tag conflicts"
msgstr "Поправяне конфликти маркери"
msgid "Split ways into fragments"
-msgstr ""
+msgstr "Разделяне пътища на части"
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgstr ""
-"Съжаляваме, програмата не може да обработи релация мултиполигон с няколко "
-"външни пътя."
+"Съжаляваме. Релации тип мултиполигон с няколко външни пътя не могат да бъдат "
+"обработени."
msgid ""
"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
msgstr ""
+"Съжаляваме. Път, който е външен в няколко релации тип мултиполигон не може "
+"да бъде обработен."
msgid ""
"Sorry. Cannot handle way that is both inner and outer in multipolygon "
"relations."
msgstr ""
+"Съжаляваме. Път, който е външен и вътрешен в релация тип мултиполигон не "
+"може да бъде обработен."
msgid ""
"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
msgstr ""
+"Съжаляваме. Път, който е вътрешен за няколко релации тип мулти полигон не "
+"може да бъде обработен."
msgid "Removed Element from Relations"
msgstr "Премахнати елементи от релации"
@@ -668,7 +718,7 @@ msgid "Join Node to Way"
msgstr "Прикрепяне точка към пътен сегмент"
msgid "Include a node into the nearest way segments"
-msgstr ""
+msgstr "Добавете възел към най-близкия сегмент от път"
msgid "Join Node and Line"
msgstr "Свързване на точка с линия"
@@ -714,25 +764,25 @@ msgid "Unable to parse Lon/Lat"
msgstr "Неможе да се прочете Дълж/Шир"
msgid "Lasso Mode"
-msgstr ""
+msgstr "Режим Ласо"
msgid "Lasso selection mode: select objects within a hand-drawn region"
-msgstr ""
+msgstr "Режим на селекция Ласо: избиране на обекти в начертан на ръка район"
msgid "Rectified Image..."
msgstr "Трансформирано изображение..."
msgid "Download Rectified Images From Various Services"
-msgstr ""
+msgstr "Сваляне на коригирани изображения от различни услуги"
msgid "Imagery: {0}"
-msgstr ""
+msgstr "Изображения: {0}"
msgid "Custom WMS Link"
-msgstr ""
+msgstr "Потребителски WMS адрес"
msgid "Supported Rectifier Services:"
-msgstr ""
+msgstr "Пддържани услуги за корекция:"
msgid "Visit Homepage"
msgstr "домашната страница"
@@ -758,7 +808,7 @@ msgid "Merge the current layer into another layer"
msgstr "Обединява текущия слой в друг слой"
msgid "Merging layers with different upload policies"
-msgstr ""
+msgstr "Обединяване на слоеве с различна политика на качване"
msgid ""
"You are about to merge data between layers ''{0}'' and ''{1}''.<br /><br "
@@ -769,9 +819,16 @@ msgid ""
"one by one, by using ''<i>Merge selection</i>''.<br /><br />Are you sure you "
"want to continue?"
msgstr ""
+"На път сте да обедините информацията на слоевете ''{0}'' и ''{1}''.<br /><br "
+"/>Тези слоеве имат различна политика на качване и не трябва да се обединяват "
+"като такива<br />Обединяването им ще наложи по-стриктна политика (качването "
+"не се препоръчва) на ''{1}''.<br /><br /><b>Това не е препоръчителен начин "
+"за обединяване на такива данни</b>.<br />Вместо това трябва да проверите и "
+"обедините обектите един по един, ползвайки ''<i>Обедини селекция</i>''.<br "
+"/><br />Сигурни ли сте, че искате да продължите?"
msgid "Ignore this hint and merge anyway"
-msgstr ""
+msgstr "Игнорирайте тази подсказка и обединете"
msgid "Merge Nodes"
msgstr "Обедини точки"
@@ -780,19 +837,21 @@ msgid "Merge nodes into the oldest one."
msgstr "Обедини точките в най-старата от тях."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
-msgstr ""
+msgstr "Прекъсване на обединяването"
msgid "Click to abort merging nodes"
-msgstr ""
+msgstr "Щракнете, за да прекъснете обединението на възлите"
msgid ""
"Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
msgstr ""
+"Невъзможно е обединяването на възли: Налага се изтриването на път {0} , "
+"който все още се използва от {1}"
msgid "Merge {0} nodes"
msgstr "Обедини {0} точки"
@@ -801,10 +860,10 @@ msgid "Merge selection"
msgstr "Обединява избраното"
msgid "Merge the currently selected objects into another layer"
-msgstr ""
+msgstr "Обединяване на избраните обекти в друг слой"
msgid "Merging too many objects with different upload policies"
-msgstr ""
+msgstr "Обединяване на твърде много обекти с различни политики на качване"
msgid ""
"You are about to merge more than 1 object between layers ''{0}'' and "
@@ -847,19 +906,19 @@ msgid "Cannot move objects outside of the world."
msgstr "Невъзможно да се премества обектите извън границите на света."
msgid "Move Node..."
-msgstr ""
+msgstr "Преместване на възел..."
msgid "Edit latitude and longitude of a node."
-msgstr ""
+msgstr "Редактиране на координатите на възел."
msgid "New Layer"
msgstr "Нов слой"
msgid "Create a new map layer."
-msgstr ""
+msgstr "Създаване на нов картен слой"
msgid "URL Files"
-msgstr ""
+msgstr "Адресни файлове"
msgid "Open..."
msgstr "Отвори..."
@@ -888,18 +947,19 @@ msgid "no importer"
msgstr ""
msgid "does not exist"
-msgstr ""
+msgstr "не съществува"
msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
msgstr ""
+"<html>Директория ''{0}'' не може да се отвори.<br>Моля, изберете файл.</html>"
msgid "Open file"
-msgstr ""
+msgstr "Отваряне на файл"
msgid "Opening {0} file..."
msgid_plural "Opening {0} files..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Отваряне на {0} файл..."
+msgstr[1] "Отваряне на {0} файла..."
msgid "Opening file ''{0}'' ..."
msgstr "Отваряне на файла ''{0}'' ..."
@@ -914,7 +974,7 @@ msgid "Separate Layer"
msgstr "На отделен слой"
msgid "Select if the data should be downloaded into a new layer"
-msgstr ""
+msgstr "Изберете дали данните да бъдат свалени в нов слой"
msgid "Enter URL to download:"
msgstr "Въведете URL за сваляне:"
@@ -935,11 +995,11 @@ msgid "Close dialog and cancel downloading"
msgstr "Затвори и прекрати свалянето"
msgid "Download Data"
-msgstr ""
+msgstr "Сваляне на данни"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -954,24 +1014,20 @@ msgid "Orthogonalize Shape"
msgstr "Ортогонализиране"
msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr ""
+msgstr "Преместване на възлите, така че всички ъгли да са 90 или 180 градуса"
msgid "Orthogonalize Shape / Undo"
-msgstr ""
+msgstr "Ортогонализиране на форма / Отмяна"
msgid "Undo orthogonalization for certain nodes"
-msgstr ""
+msgstr "Отмяна на ортогонализацията на определени ъгли"
msgid "Orthogonalize / Undo"
-msgstr ""
+msgstr "Ортогонализиране / Отмяна"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -984,7 +1040,7 @@ msgstr ""
"избягване на това предупреждение.<br>Ще продължите ли?</html>"
msgid "Selection must consist only of ways and nodes."
-msgstr ""
+msgstr "Селекцията трябва да съдържа само пътища и възли."
msgid "Orthogonalize"
msgstr "Ортогонализиране"
@@ -992,16 +1048,15 @@ msgstr "Ортогонализиране"
msgid "Usage"
msgstr "Използване"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
msgstr ""
+"<html>Моля, уверете се, че всички избрани пътища са в една посока<br>или ги "
+"ортогонализирайте един по един.</html>"
msgid "Please select ways with angles of approximately 90 or 180 degrees."
-msgstr ""
+msgstr "Моля, изберете пътища с ъгли приблизително 90 или 180 градуса."
msgid "Paste"
msgstr "Поставяне"
@@ -1010,16 +1065,18 @@ msgid "Paste contents of paste buffer."
msgstr "Поставяне на съдържанието на буфера"
msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Изтриване на непълни членове?"
msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Поставяне без непълни членове"
msgid ""
"The copied data contains incomplete objects. When pasting the incomplete "
"objects are removed. Do you want to paste the data without the incomplete "
"objects?"
msgstr ""
+"Копираните данни съдържат непълни обекти. При поставяне, непълните обекти се "
+"премахват. Искате ли да поставите данните без непълните обекти?"
msgid "Paste Tags"
msgstr "Поставяне на маркери"
@@ -1034,29 +1091,29 @@ msgstr[1] "Поставяне на {0} етикета"
msgid "to {0} object"
msgid_plural "to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "към {0} обект"
+msgstr[1] "към {0} обекта"
msgid "Preferences..."
msgstr "Настройки…"
msgid "Open a preferences dialog for global settings."
-msgstr ""
+msgstr "Отворяне на глобални настройки."
msgid "Preferences"
msgstr "Настройки"
msgid "Purge..."
-msgstr ""
+msgstr "Изчистване..."
msgid "Forget objects but do not delete them on server when uploading."
msgstr ""
msgid "Purge"
-msgstr ""
+msgstr "Изчистване"
msgid "Confirm Purging"
-msgstr ""
+msgstr "Потвърждаване на изчистването"
msgid ""
"This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1068,17 +1125,21 @@ msgid ""
"The following dependent objects will be purged<br> in addition to the "
"selected objects:"
msgstr ""
+"Следните свързани обекти ще бъдат изчистени<br> в добавка към избраните "
+"обекти:"
msgid "Add to selection"
-msgstr ""
+msgstr "Добавяне към селекция"
msgid ""
"Some of the objects are modified.<br> Proceed, if these changes should be "
"discarded.</html>"
msgstr ""
+"Някои от обектите са променени.<br> Продължете, ако тези промени трябва да "
+"се отменят.</html>"
msgid "Clear Undo/Redo buffer"
-msgstr ""
+msgstr "Изчистване на буфера за Отмяна/Повторение"
msgid "Redo"
msgstr "Отново"
@@ -1087,10 +1148,10 @@ msgid "Redo the last undone action."
msgstr "Повтаряне на последното отменено действие."
msgid "Redo ..."
-msgstr ""
+msgstr "Повтори..."
msgid "Redo {0}"
-msgstr ""
+msgstr "Повторено {0}"
msgid "Rename layer"
msgstr "Преименуване на слой"
@@ -1101,8 +1162,17 @@ msgstr "Също преименувай файл"
msgid "Could not rename file ''{0}''"
msgstr "Невъзможно преименуването на файла ''{0}''"
+msgid "Restart"
+msgstr "Рестартиране"
+
+msgid "Restart the application."
+msgstr "Рестартиране на програмата."
+
+msgid "Click to restart later."
+msgstr "Щракнете за да рестартирате по-късно."
+
msgid "Reverse way"
-msgstr ""
+msgstr "Обръщане на път"
msgid "Reverse Ways"
msgstr "Промяна посоката на линиите"
@@ -1148,58 +1218,55 @@ msgstr ""
"обекти също."
msgid "Load Session"
-msgstr ""
+msgstr "Зареждане на сесия"
msgid "Load a session from file."
-msgstr ""
-
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
+msgstr "Зареждане на сесия от файл."
msgid "Open session"
-msgstr ""
+msgstr "Отваряне на сесия"
msgid "Loading session ''{0}''"
-msgstr ""
+msgstr "Зареждане на сесия ''{0}''"
msgid "<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>"
-msgstr ""
+msgstr "<html>Не може да зареди сесия ''{0}''.<br>Грешката е:<br>{1}</html>"
msgid "Data Error"
-msgstr ""
+msgstr "Грешка данни"
msgid "IO Error"
-msgstr ""
+msgstr "Грешка вход/изход"
msgid "Save Session As..."
-msgstr ""
+msgstr "Запис на сесия като..."
msgid "Save the current session to a new file."
-msgstr ""
+msgstr "Запис на текущата сесия в нов файл."
msgid "Session file (archive) (*.joz)"
-msgstr ""
+msgstr "Сесия (архив) (*.joz)"
msgid "Session file (*.jos)"
-msgstr ""
+msgstr "Сесия (*.jos)"
msgid "Save session"
-msgstr ""
+msgstr "Запис на сесия"
msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
-msgstr ""
+msgstr "<html>Не може да запише сесия ''{0}''.<br>Грешката е:<br>{1}</html>"
msgid "Save Session"
-msgstr ""
+msgstr "Запис на сесия"
msgid "Save As"
-msgstr ""
+msgstr "Запис като"
msgid "Layers"
msgstr "Слоеве"
msgid "No exporter for this layer"
-msgstr ""
+msgstr "Невъзможен експорт за този слой"
msgid "Show Status Report"
msgstr "Показване статус"
@@ -1219,6 +1286,9 @@ msgstr "Статус Репорт"
msgid "Copy to clipboard and close"
msgstr "Копиране в клипборда и затваряне"
+msgid "Report bug"
+msgstr "Докладване за грешка"
+
msgid "Close"
msgstr "Затваряне"
@@ -1235,22 +1305,24 @@ msgid "Yes"
msgstr "Да"
msgid "Simplify all selected ways"
-msgstr ""
+msgstr "Опростяване на всички избрани пътища"
msgid "Cancel operation"
-msgstr ""
+msgstr "Отмяна на операцията"
msgid ""
"The selection contains {0} ways. Are you sure you want to simplify them all?"
msgstr ""
+"Селекцията съдържа {0} пътища. Сигурни ли сте, че искате да ги опростите "
+"всички?"
msgid "Simplify ways?"
-msgstr ""
+msgstr "Опростяване на пътища?"
msgid "Simplify {0} way"
msgid_plural "Simplify {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Опростен {0} път"
+msgstr[1] "Опростени {0} пътища"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
@@ -1266,6 +1338,8 @@ msgstr "Разделяне на линията в избраната точка.
msgid ""
"The current selection cannot be used for splitting - no node is selected."
msgstr ""
+"Текущата селекция не може да бъде използвана за разделяне - няма избран "
+"възел."
msgid "The selected nodes do not share the same way."
msgstr "Избраните точки не се явяват част от един и същ път."
@@ -1301,18 +1375,14 @@ msgstr ""
"средата на пътя.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Ролевото членство в релация беше копирано за всички нови "
-"пътища.<br>Трябва да го проверите и коригирате ако е необходимо.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Членството в релация беше копирано за всички нови пътища.<br>Трябва да "
-"го проверите и коригирате ако е необходимо.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Разделяне път {0} на {1} части"
@@ -1407,6 +1477,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Отмяна"
@@ -1431,9 +1522,6 @@ msgstr "Обновяване на данните"
msgid "Updates the objects in the active data layer from the server."
msgstr "Обновява обектите в текущия слой от сървъра"
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr "Обновяване на модифицираното"
@@ -1629,6 +1717,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "По-бавно възпроизвеждане"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Сваляне на GPS данни"
@@ -1638,6 +1729,18 @@ msgstr "Свалени GPX данни"
msgid "Markers from {0}"
msgstr "Маркери от {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Сваляне на данни"
@@ -1657,6 +1760,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Зареждане на родителите на възел {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Зареждане на родителите на път {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Зареждане на родителите на релация {2}"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Сваляне {0} от {1} ({2} остава)"
@@ -1707,25 +1835,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Зареждане на родителите на възел {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Зареждане на родителите на път {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Зареждане на родителите на релация {2}"
-
msgid "Error during download"
msgstr ""
@@ -1872,6 +1981,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1896,8 +2008,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1913,6 +2025,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2328,6 +2443,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2493,13 +2611,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2512,6 +2630,9 @@ msgstr ""
"Непознат тип на примитив: {0}. Позволените стойности са: възел, път или "
"релация."
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2530,8 +2651,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2617,6 +2737,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Промяна на възел {0}"
@@ -2653,10 +2776,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2679,8 +2802,8 @@ msgid "Double conflict"
msgstr "Двоен конфликт"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2790,6 +2913,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Разрешаване на конфликтите в списъка с членовете на релация {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Завърти {0} възел"
@@ -2850,11 +2976,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"При обръщане направлението на линията, предлагаме да се направят следните "
-"промени на пътищата, и техните възли за да се съхрани целостта на данните."
msgid "Relation"
msgstr "Релация"
@@ -2883,11 +3007,11 @@ msgstr "Приложи избраните промени"
msgid "Do not apply changes"
msgstr "Не прилагай промените"
-msgid "Please select which property changes you want to apply."
-msgstr "Моля, изберете кои промени на параметри желаете да приложите."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Свойства на "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Роли в релации, отнасящи се за"
@@ -2907,6 +3031,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2937,21 +3064,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Внимание: неуспех при инициализиране на предпочитанията. Директорията за "
-"предпочитания ''{0}'' не е директория."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -2961,11 +3086,9 @@ msgstr ""
"предпочитания ''{0}'' не е директория."
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Внимание: Грешка при инициализация на предпочитанията. Неуспешно създаване "
-"на липсваща директория за параметри: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -2974,13 +3097,11 @@ msgstr ""
"<html>Грешка при инициализация на предпочитанията.<br>Неуспешно създаване на "
"липсваща директория за параметри: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2994,8 +3115,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3025,11 +3146,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "НЕИЗВЕСТНО"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3182,8 +3302,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3290,7 +3409,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3309,6 +3428,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3325,9 +3447,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3368,6 +3487,9 @@ msgstr "друго при проверка"
msgid "Running test {0}"
msgstr "Проверява се за: {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Адреси"
@@ -3392,6 +3514,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3453,15 +3584,15 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Повтарящи се точки"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Този тест проверява за точки, които се намират на едно и също място."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3529,6 +3660,24 @@ msgstr "Повтарящи се точки"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Проверява за пътища с последователни точки с еднакви координати"
+msgid "Highways"
+msgstr "Пътища"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Мултиполигон"
@@ -3598,6 +3747,12 @@ msgstr "Точки с еднакви имена"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Този тест проверява за точки с еднаки имена (може да са повторения)"
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3657,13 +3812,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3699,13 +3854,11 @@ msgstr ""
"Дадения тест проверява за пътища с подобни имена. Възможно е това да е от "
"правописни грешки."
-msgid "Properties checker :"
-msgstr "Проверка на параметрите:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
-"Това разширение проверява за грешки в ключовете на маркиране и техните "
-"стойности"
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Невалидна линия на таг-проверка - {0}: {1}"
@@ -3844,8 +3997,8 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Използване на файла за проверка на правопис по подразбиране (препоръчвано)."
-msgid "Fix properties"
-msgstr "Поправи параметрите"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Не може да бъде открит типа на елемента"
@@ -3919,6 +4072,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr "Това проверява дали пътища, които са кръгови са затворени."
+msgid "Unclosed way"
+msgstr "Незатворен път"
+
msgid "natural type {0}"
msgstr "естествен тип {0}"
@@ -3949,9 +4105,6 @@ msgstr "сграда"
msgid "area"
msgstr "област"
-msgid "Unclosed way"
-msgstr "Незатворен път"
-
msgid "Unconnected ways"
msgstr ""
@@ -3977,10 +4130,10 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Този тест проверява за немаркирани точки, които не са част от някой път."
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4044,25 +4197,6 @@ msgstr "Обърната брегова линия: земята не е отл
msgid "Reversed land: land not on left side"
msgstr "Обърната посока на линията на сушата: земята не е от ляво"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Невъзможно прочитането на отметките от<br>''{0}''<br>Грешката е: "
-"{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4166,7 +4300,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr "Зареждане на \"Съобщение на деня\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4369,9 +4503,24 @@ msgstr "Преглед"
msgid "Tools"
msgstr "Инструменти"
+msgid "More tools"
+msgstr "Още инструменти"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Избор"
+
msgid "Presets"
msgstr "Шаблони"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4387,10 +4536,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Аудио"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4399,6 +4560,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4458,6 +4622,9 @@ msgstr "(няма обект)"
msgid "User:"
msgstr "Потребител:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "слоя не е в списъка."
@@ -4485,21 +4652,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "false: параметъра е изрично изключен"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: параметъра е изрично включен"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"partial: различните избрани обекти имат различни стойности, не променяйте."
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-"unset: не променяйте стойността на този параметър на избраните обекти"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4787,29 +4939,47 @@ msgstr "> долу"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4824,8 +4994,8 @@ msgstr ""
msgid "Up"
msgstr "Нагоре"
-msgid "Move up the selected elements by one position."
-msgstr "Преместване нагоре на избраните елементи с една позиция"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Надолу"
@@ -4877,14 +5047,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Възел"
@@ -5134,14 +5296,14 @@ msgctxt "tag"
msgid "Key:"
msgstr "Ключ:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr "Стойност:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5664,6 +5826,9 @@ msgstr "Показване/скриване"
msgid "Information about layer"
msgstr "Информация за слоя"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5747,6 +5912,33 @@ msgstr ""
msgid "No"
msgstr "Не"
+msgid "Object type:"
+msgstr "Тип на обекта:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "смесен"
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr "ID на обекта:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Връзки"
@@ -5768,9 +5960,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Връзки: {0}"
-msgid "Selection"
-msgstr "Избор"
-
msgid "Open a selection list window."
msgstr "Отваряне на списък с избрани обекти."
@@ -5795,18 +5984,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Избрано: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5825,6 +6002,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Намаляване/увеличаване на панела"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Автори"
@@ -5842,8 +6031,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5869,9 +6057,6 @@ msgstr "Отваряне на прозореца с проверките."
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Показване на проблема"
-
msgid "Fix"
msgstr "Поправяне"
@@ -6016,9 +6201,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6303,8 +6485,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6369,35 +6551,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Параметри/Отношения"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Параметри на избраните обекти"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<различни>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Член на"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Свойства: {0} / Членство: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Параметри / Отношения"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Изтриване на избрания ключ за всички обекти"
-msgid "Delete Properties"
-msgstr "Изтриване на параметри"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Промяна на релация"
@@ -6411,13 +6605,13 @@ msgstr "Изваждане на избраните обекти от релац
msgid "Add a new key/value pair to all objects"
msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Редактиране стойността на избрания ключ за всички обекти"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6496,12 +6690,6 @@ msgstr[1] "Промяна параметрите на {0} обекта"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6531,9 +6719,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6571,7 +6765,7 @@ msgstr "Връзката е изтрита"
msgid "Downloading relation {0}"
msgstr "Сваляне на релация {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6631,6 +6825,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6886,6 +7083,27 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Невъзможно прочитането на отметките от<br>''{0}''<br>Грешката е: "
+"{1}</html>"
+
msgid "Bookmarks"
msgstr "Отметки"
@@ -6953,9 +7171,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -7024,21 +7239,8 @@ msgstr ""
msgid "Download object"
msgstr "Сваляне на обект"
-msgid "Object type:"
-msgstr "Тип на обекта:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "смесен"
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr "ID на обекта:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr ""
+msgid "Start downloading"
+msgstr "Започни сваляне"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7048,23 +7250,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Започни сваляне"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7161,7 +7349,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7260,6 +7448,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7360,7 +7551,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7379,6 +7570,12 @@ msgstr "Опишете измененията на качваните от ва
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7447,8 +7644,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7523,8 +7719,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7538,8 +7734,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7755,12 +7950,6 @@ msgstr "Качване на променените примитиви"
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7769,6 +7958,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7784,6 +7989,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Прекъсване на качването и продължаване с редактирането"
@@ -7791,8 +8011,8 @@ msgid "Tags of changeset {0}"
msgstr "Етикети на списък с промени {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7915,9 +8135,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Качване на {0} обект..."
@@ -7927,6 +8144,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7943,7 +8163,7 @@ msgstr "Изберете обекти за качване"
msgid "Cancel uploading"
msgstr "Прекратяване на качването"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8089,7 +8309,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8119,7 +8339,7 @@ msgstr "версия {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8235,6 +8455,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8274,6 +8497,9 @@ msgstr "Презареждане грешни квадранти"
msgid "Alpha channel"
msgstr "Алфа канал"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8479,9 +8705,6 @@ msgstr "Извличане на GPS координати от EXIF"
msgid "Starting directory scan"
msgstr "Започване на преглед на директории"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Прочитане на снимки..."
@@ -8500,6 +8723,9 @@ msgstr "Намерен е празен файл в директория {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Грешка при четене на файлове от директория {0}\n"
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Изображения с данни за местоположение"
@@ -8557,6 +8783,12 @@ msgstr "Следващ"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Центриране на изгледа"
@@ -8627,9 +8859,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8642,8 +8871,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Свали от OSM по дължина на тази следа"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Свали всичко в пределите на:"
@@ -8669,15 +8901,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Свали от OSM по дължина на тази следа"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>Това действие ще изисква {0} отделни<br>заявки за сваляне. "
-"Продължаване?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -8818,14 +9052,10 @@ msgstr "Възникна грешка при опит да се покаже URL
msgid "(URL was: "
msgstr "(URL беше: "
-msgid "Error displaying URL"
-msgstr "Грешка показване URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8840,7 +9070,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8850,8 +9080,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9071,7 +9300,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9137,6 +9366,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9194,9 +9429,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9458,6 +9690,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"Трябва да рестартирате JOSM, за да може изменените настройки да подействат."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Дистанционно"
@@ -9586,6 +9821,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9628,6 +9869,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Проверка на данни"
@@ -9680,19 +9924,10 @@ msgstr "Търси: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9710,40 +9945,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
+msgstr ""
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "shortcut"
msgstr ""
-msgid "Current value is default."
+msgid "color"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "toolbar"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "imagery"
msgstr ""
-msgid "Select Setting Type:"
+msgid "Reset preferences"
msgstr ""
-msgid "Simple"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List"
+msgid "Load profile"
msgstr ""
-msgid "List of lists"
+msgid "Save {0} profile"
msgstr ""
-msgid "List of maps"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Add setting"
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9767,6 +10011,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9823,6 +10100,9 @@ msgstr "Изобразявай виртуални възли в режим на
msgid "Draw inactive layers in other color"
msgstr "Изобразявай неактивните слоеве в друг цвят"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9878,6 +10158,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10173,7 +10458,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10342,6 +10633,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10405,8 +10702,8 @@ msgstr "Настройки на картата"
msgid "Settings for the map projection and data interpretation."
msgstr "Параметри на проекцията на картата и интерпретацията на данните."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10664,40 +10961,40 @@ msgstr "Швейцарска Мрежа (Швейцария)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
-msgstr "Север"
-
-msgid "South"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "Hemisphere"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "UTM Zone"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "North"
+msgstr "Север"
+
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10750,8 +11047,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10760,20 +11057,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10855,16 +11157,10 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-msgid "disabled"
-msgstr "изключено"
-
-msgid "no modifier"
-msgstr "без модификатор"
-
msgid "Shortcut Background: User"
msgstr ""
@@ -10906,39 +11202,47 @@ msgstr ""
msgid "Add a new tag"
msgstr "Добавяне на нов етикет"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Използване шаблон ''{0}'' от група ''{1}''"
+
+msgid "Use preset ''{0}''"
+msgstr "Използване шаблон ''{0}''"
+
+msgid "Elements of type {0} are supported."
+msgstr "Елементи от тип {0} се поддържат."
+
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Промяна {0} обект"
+msgstr[1] "Промяна {0} обекта"
+
+msgid "Nothing selected!"
+msgstr "Нищо не е избрано!"
+
+msgid "Selection unsuitable!"
+msgstr "Селекцията е неподходяща!"
+
+msgid "Apply Preset"
+msgstr "Прилагане шаблон"
+
+msgid "New relation"
msgstr ""
-msgid "{0}:"
+msgid "Change Tags"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Unknown requisite: {0}"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Illegal member expression: {0}"
msgstr ""
msgid "More information about this feature"
msgstr "Повече информация за тази възможност"
-msgid "Unknown requisite: {0}"
-msgstr ""
-
-msgid "Illegal member expression: {0}"
-msgstr ""
-
msgid "Available roles"
msgstr ""
@@ -10954,59 +11258,61 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Незадължителни Атрибути:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Използване шаблон ''{0}'' от група ''{1}''"
-
-msgid "Use preset ''{0}''"
-msgstr "Използване шаблон ''{0}''"
-
-msgid "Unknown type: {0}"
-msgstr "Неизвестен тип: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Error parsing {0}: "
-msgstr "Грешка при разбор {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Elements of type {0} are supported."
-msgstr "Елементи от тип {0} се поддържат."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Промяна {0} обект"
-msgstr[1] "Промяна {0} обекта"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Нищо не е избрано!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Селекцията е неподходяща!"
+msgid "Unknown type: {0}"
+msgstr "Неизвестен тип: {0}"
-msgid "Apply Preset"
-msgstr "Прилагане шаблон"
+msgid "Preset group {1} / {0}"
+msgstr ""
-msgid "New relation"
+msgid "Preset group {0}"
msgstr ""
-msgid "Change Properties"
-msgstr "Промяна параметри"
+msgid "Roles cannot appear more than once"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "Грешка при разбор {0}: "
+
msgid "Search preset"
msgstr "Търсене"
@@ -11022,6 +11328,14 @@ msgstr ""
msgid "Search in tags"
msgstr "Търсене в етикетите"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -11051,6 +11365,51 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr "false: параметъра е изрично изключен"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true: параметъра е изрично включен"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"partial: различните избрани обекти имат различни стойности, не променяйте."
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+"unset: не променяйте стойността на този параметър на избраните обекти"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11081,7 +11440,7 @@ msgid "Contacting OSM Server..."
msgstr "Свързване с OSM Сървър..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11121,28 +11480,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11241,6 +11598,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Грешка при разбор: невалидна структура на gpx документа"
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr "Непознат режим {0}."
@@ -11256,12 +11616,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11340,8 +11708,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Успешно NMEA импортиране"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Грешка при NMEA импортиране!"
@@ -11439,35 +11807,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11477,8 +11821,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11505,10 +11849,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11521,9 +11862,6 @@ msgstr ""
"<html>Възникна грешка при въстановяването на бекъп файла.<br> Грешката е: "
"<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11545,6 +11883,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11594,8 +11935,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11739,6 +12080,9 @@ msgstr "Съхрани потребителското име и паролата
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11757,6 +12101,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11781,16 +12134,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11802,6 +12158,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11819,6 +12183,15 @@ msgid "Remote Control has been asked to load data from the API."
msgstr ""
"Дистанционното управление получи заявка за зареждане на данни от API-то."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11849,19 +12222,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11883,11 +12256,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Сесия (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11957,13 +12342,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12107,10 +12492,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12125,22 +12510,21 @@ msgstr "Запазване на добавка"
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12215,8 +12599,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12231,9 +12614,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12555,17 +12953,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12576,46 +12968,103 @@ msgid ""
"platform first."
msgstr ""
-msgid "reserved"
+msgid "Opening URL: {0}"
msgstr ""
-msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+msgid "zoom"
msgstr ""
-msgid "There was {0} tag found in the buffer, it is suspicious!"
-msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] ""
-msgstr[1] ""
+msgid "latitude"
+msgstr ""
-msgid "Key is too long (max {0} characters):"
+msgid "longitude"
msgstr ""
-msgid "Suspicious characters in key:"
+msgid "URL does not contain {0}/{1}/{2}"
msgstr ""
-msgid "Value is too long (max {0} characters):"
+msgid "URL does not contain valid {0}"
msgstr ""
-msgid "Do you want to paste these tags?"
+msgid "reserved"
msgstr ""
-msgid "Clear buffer"
+msgid "Outdated Java version"
msgstr ""
-msgid "Ignore warnings"
+msgid "Update Java"
msgstr ""
-msgid ""
-"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
-"contain any JOSM object or suitable text. </p></html>"
+msgid "You are running version {0} of Java."
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "February 2013"
msgstr ""
msgid ""
-"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
-"geometry from preferences."
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
+msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+msgstr ""
+
+msgid "There was {0} tag found in the buffer, it is suspicious!"
+msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Key is too long (max {0} characters):"
+msgstr ""
+
+msgid "Suspicious characters in key:"
+msgstr ""
+
+msgid "Value is too long (max {0} characters):"
+msgstr ""
+
+msgid "Do you want to paste these tags?"
+msgstr ""
+
+msgid "Clear buffer"
+msgstr ""
+
+msgid "Ignore warnings"
+msgstr ""
+
+msgid ""
+"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
+"contain any JOSM object or suitable text. </p></html>"
+msgstr ""
+
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
+"geometry from preferences."
msgstr ""
msgid ""
@@ -12939,6 +13388,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13020,6 +13474,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13128,9 +13586,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13193,6 +13648,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13219,9 +13677,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13247,9 +13702,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13290,6 +13742,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13336,9 +13793,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Пътища"
-
msgid "Streets"
msgstr "Автомобилни"
@@ -13423,6 +13877,9 @@ msgstr "Насип"
msgid "Lit"
msgstr "осветен(-а)"
+msgid "Toll"
+msgstr "Пътна такса"
+
msgid "Motorway Link"
msgstr "Автомагистрална връзка"
@@ -13513,6 +13970,50 @@ msgstr "Улица"
msgid "Edit Residential Street"
msgstr "Редактиране улица от населено място"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Клас път"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "да"
+
+msgid "no"
+msgstr "не"
+
+msgid "destination"
+msgstr "с назначение"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Жилищна улица"
@@ -13531,11 +14032,11 @@ msgstr "Област"
msgid "Service"
msgstr "Помощна улица"
-msgid "Edit Serviceway"
-msgstr "Редактиране помощна улица"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Тип помощна улица"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "алея"
@@ -13546,6 +14047,9 @@ msgstr "автомобилен"
msgid "parking_aisle"
msgstr "паркинг"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Улица паркинг"
@@ -13573,18 +14077,12 @@ msgstr "кръгово"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "да"
-
msgid "Road Restrictions"
msgstr "Пътни ограничения"
msgid "Edit Road Restrictions"
msgstr "Редактиране пътни ограничения"
-msgid "Toll"
-msgstr "Пътна такса"
-
msgid "No exit (cul-de-sac)"
msgstr "Без изход"
@@ -13594,9 +14092,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "с назначение"
-
msgid "delivery"
msgstr ""
@@ -13606,15 +14101,15 @@ msgstr "разрешителен"
msgid "private"
msgstr "частен"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "селскостопански"
msgid "forestry"
msgstr "горски път"
-msgid "no"
-msgstr "не"
-
msgid "official"
msgstr ""
@@ -13660,6 +14155,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Обществен транспорт"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Мин. скорост (км/ч)"
@@ -13744,6 +14242,9 @@ msgstr "Редактирай мост"
msgid "viaduct"
msgstr "виадукт"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13848,21 +14349,30 @@ msgstr ""
msgid "Visibility"
msgstr "Видимост"
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "за средно ниво"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13878,10 +14388,10 @@ msgstr "Черен път за езда"
msgid "Edit Bridleway"
msgstr "Редактиране алея за езда"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13917,7 +14427,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13986,12 +14496,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Телефон за спешен случай"
+msgid "Drinking Water"
+msgstr "Питейна вода"
msgid "Traffic Signal"
msgstr "Светофар"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Тип пешеходна пътека"
@@ -14007,15 +14523,6 @@ msgstr "остров"
msgid "unmarked"
msgstr "немаркиран"
-msgid "Cross on horseback"
-msgstr "Пресичане върху кон"
-
-msgid "Cross by bicycle"
-msgstr "Пресичане с велосипед"
-
-msgid "Crossing attendant"
-msgstr "Помощник при пресъчане"
-
msgid "Crossing type name (UK)"
msgstr "Име на типа пътека (UK)"
@@ -14037,6 +14544,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Помощник при пресъчане"
+
+msgid "Cross by bicycle"
+msgstr "Пресичане с велосипед"
+
+msgid "Cross on horseback"
+msgstr "Пресичане върху кон"
+
msgid "Stop"
msgstr "Стоп"
@@ -14046,6 +14562,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Мини кръгово движение"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Посока"
@@ -14055,11 +14574,8 @@ msgstr "по часовниковата стрелка"
msgid "Pedestrian Crossing"
msgstr "Пешеходна пътека"
-msgid "Edit Crossing"
-msgstr "Редактиране на пресечно място или кръстовище"
-
-msgid "Type name (UK)"
-msgstr "Тип име (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr ""
@@ -14091,9 +14607,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Обръщало"
@@ -14127,20 +14640,44 @@ msgstr ""
msgid "Barriers"
msgstr "Прегради"
+msgid "Block"
+msgstr "Бетонен блок"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Разрешено преминаване:"
+
+msgid "Material"
+msgstr "Материал"
+
+msgid "stone"
+msgstr "камък"
+
msgid "Bollard"
msgstr "колчета"
msgid "Edit Bollard"
msgstr "редактиране на ограничителни колчета"
-msgid "Allowed traffic:"
-msgstr "Разрешено преминаване:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "пластмаса"
msgid "Cycle Barrier"
msgstr "Вело бариера"
-msgid "Block"
-msgstr "Бетонен блок"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Тексаска мрежа (препятствие за животни)"
@@ -14151,6 +14688,9 @@ msgstr "Редактирай тексаска мрежа"
msgid "Bus Trap"
msgstr "Бус трап"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Шипове"
@@ -14172,19 +14712,34 @@ msgstr "Редактирай граничен контрол"
msgid "Hedge"
msgstr "Плет"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Височина (в метри)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Ограда / стобор"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14193,23 +14748,52 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Стена"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Градска стена"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Подпорна стена"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
-msgstr "Вход"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Редактирай вход"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Порта"
@@ -14241,12 +14825,27 @@ msgstr "Кисинг гейт (преграда срещу животни)"
msgid "Edit Kissing Gate"
msgstr "Редактирай кисинг гейт"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Стълби за преминаване през ограда"
msgid "Edit Stile"
msgstr "Редактиране на: стълби за преминаване през ограда"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "турникет (контрол на достъпа)"
@@ -14304,6 +14903,9 @@ msgstr "Отточен канал"
msgid "Edit Drain"
msgstr "Редактирай отточен канал"
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14313,6 +14915,12 @@ msgstr "Поток"
msgid "Edit Stream"
msgstr "Редактирай поток"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Канал"
@@ -14352,9 +14960,6 @@ msgstr "Редактирай язовирна стена"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14388,6 +14993,21 @@ msgstr "Редактирай закрит резервоар"
msgid "Edit Water"
msgstr "Редактирай водата"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Суша"
@@ -14469,18 +15089,23 @@ msgstr "Редактирай ферибот терминал"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "велосипед"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14553,7 +15178,10 @@ msgstr "военни"
msgid "tourism"
msgstr "туризъм"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14577,10 +15205,13 @@ msgstr ""
msgid "rail"
msgstr "ЖП"
-msgid "Voltage"
-msgstr "Волтаж"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14592,9 +15223,6 @@ msgstr "Теснолинейка"
msgid "Edit Narrow Gauge Rail"
msgstr "Редактирай теснолинейка"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Монорелса"
@@ -14637,18 +15265,56 @@ msgstr "Неизползвана ЖП линия"
msgid "Edit Disused Railway"
msgstr "Редактирай неизползвана ЖП линия"
-msgid "Optional Types"
-msgstr "Незадължителни типове"
-
msgid "Abandoned Rail"
msgstr "Изоставена ЖП линия"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Регулиран ЖП прелез"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "ЖП прелез"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Тип пресичане"
@@ -14748,11 +15414,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14764,11 +15428,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14787,12 +15449,12 @@ msgstr "наземен"
msgid "underground"
msgstr "подземен"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Достъп"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14820,9 +15482,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Капацитет"
@@ -14838,19 +15497,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Работно време"
msgid "24/7"
msgstr "денонощно"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "понеделник-петък 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -15000,6 +15675,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Волтаж"
+
msgid "Amperage"
msgstr ""
@@ -15021,6 +15699,12 @@ msgstr "Сервиз"
msgid "Edit Car Repair"
msgstr "Редактирай автосервиз"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15048,6 +15732,12 @@ msgstr "Под наем"
msgid "Edit Car Rental"
msgstr "Редактиране коли под наем"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Споделяне на автомобили"
@@ -15072,22 +15762,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15109,9 +15783,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Дрехи"
@@ -15175,8 +15846,8 @@ msgstr "Редактиране велосипеди под наем"
msgid "Public Transport"
msgstr "Обществен транспорт"
-msgid "Route"
-msgstr "Маршрут"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Редактиране маршрут"
@@ -15306,6 +15977,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15336,6 +16010,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Скамейка"
@@ -15348,9 +16025,6 @@ msgstr "Инвалидна количка"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15360,8 +16034,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Гара / Спирка"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Редактиране: гара / станция"
msgid "Building"
msgstr "Сграда"
@@ -15375,6 +16054,9 @@ msgstr "Редактирай вход в метро"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15399,14 +16081,6 @@ msgstr "клиентски карти"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Гара / Спирка"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Редактиране: гара / станция"
-
msgid "UIC-Reference"
msgstr "UIC-Референция"
@@ -15455,8 +16129,8 @@ msgstr "Редактирай автобусна платформа"
msgid "Taxi"
msgstr "Такси"
-msgid "Edit Taxi station"
-msgstr "Редактирай стоянка таксита"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Летище"
@@ -15509,6 +16183,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "терминал"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -15531,21 +16220,6 @@ msgstr "Редактирай хотел"
msgid "Stars"
msgstr "Звезди"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "терминал"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -15729,6 +16403,12 @@ msgstr "Нощен клуб"
msgid "Edit Nightclub"
msgstr "Редактирай нощен клуб"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Туризъм"
@@ -15750,9 +16430,15 @@ msgstr "Наблюдателница"
msgid "Information Office"
msgstr "Информационен пункт"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Карта"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15765,6 +16451,9 @@ msgstr "улица"
msgid "scheme"
msgstr "схема"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15804,6 +16493,9 @@ msgstr "... възможни са други способи за придвиж
msgid "Information Board"
msgstr "Информационно табло"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Съдържание на таблото"
@@ -15825,23 +16517,35 @@ msgstr "растения"
msgid "Guidepost"
msgstr "Упътване"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Информационен пункт"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "По-точно описание"
msgid "Audioguide"
msgstr "Аудио напътствия"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Аудио-напътствия по мобилен телефон?"
msgid "Phone number"
msgstr "Тел. номер"
-msgid "Other Information Points"
-msgstr "Други информационни точки"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Места за отдих и развлечения"
@@ -15864,9 +16568,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15891,8 +16592,17 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Площадка"
@@ -15964,50 +16674,44 @@ msgstr "Творба на изкуството"
msgid "Edit Artwork"
msgstr "Редактирай творба на изкуството"
-msgid "Place of Worship"
-msgstr "Място за богослужение"
-
-msgid "Edit Place of Worship"
-msgstr "Редактирай място за богослужение"
-
-msgid "Religion"
-msgstr "Религия"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "Бахаи"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "Будизъм"
+msgid "audio"
+msgstr ""
-msgid "christian"
-msgstr "Християнство"
+msgid "video"
+msgstr ""
-msgid "hindu"
-msgstr "Индуизъм"
+msgid "Place of Worship"
+msgstr "Място за богослужение"
-msgid "jain"
-msgstr "Джайнизъм"
+msgid "Church"
+msgstr "Църква"
-msgid "jewish"
-msgstr "Юдаизъм"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "Мусулманство"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "Сикхизъм"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "Спиритуализъм"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "Даосизъм"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "Унитаристи"
+msgid "church"
+msgstr ""
-msgid "zoroastrian"
-msgstr "Зороастризъм"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Конфесия"
@@ -16024,6 +16728,12 @@ msgstr "Католическо"
msgid "evangelical"
msgstr "Евангелска"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Свидетели на Йехова"
@@ -16036,6 +16746,9 @@ msgstr "Методизъм"
msgid "mormon"
msgstr "Мормони"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "Православие"
@@ -16051,39 +16764,142 @@ msgstr "Протестантизъм"
msgid "quaker"
msgstr "Кваркери"
-msgid "shia"
-msgstr "Шийти"
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "Шийти"
msgid "sunni"
msgstr "Сунити"
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
msgstr ""
+msgid "Religion"
+msgstr "Религия"
+
+msgid "bahai"
+msgstr "Бахаи"
+
+msgid "jain"
+msgstr "Джайнизъм"
+
+msgid "sikh"
+msgstr "Сикхизъм"
+
+msgid "spiritualist"
+msgstr "Спиритуализъм"
+
+msgid "taoist"
+msgstr "Даосизъм"
+
+msgid "unitarian"
+msgstr "Унитаристи"
+
+msgid "zoroastrian"
+msgstr "Зороастризъм"
+
msgid "Public Building"
msgstr "Обществена сграда"
@@ -16171,6 +16987,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Здраве"
@@ -16180,6 +17002,12 @@ msgstr "Болница"
msgid "Edit Hospital"
msgstr "Редактирай болница"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Лекар"
@@ -16246,12 +17074,66 @@ msgstr "Ветеринар"
msgid "Edit Veterinary"
msgstr "Редактирай ветеринар"
-msgid "Note"
-msgstr "Забележка"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Пощенска кутия"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Телефон"
@@ -16261,6 +17143,30 @@ msgstr "Редактирай телефон"
msgid "Telephone cards"
msgstr "Телефонни карти"
+msgid "Emergency Phone"
+msgstr "Телефон за спешен случай"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16270,31 +17176,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16322,8 +17234,8 @@ msgstr ""
msgid "Recycling"
msgstr "Рециклиране"
-msgid "Edit Recycling station"
-msgstr "Редактиране на станция за рециклиране"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Батерии"
@@ -16349,27 +17261,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr "Материал"
-
-msgid "stone"
-msgstr "камък"
-
-msgid "plastic"
-msgstr "пластмаса"
-
msgid "Amount of Seats"
msgstr "Брой седящи места"
@@ -16404,14 +17304,17 @@ msgstr "Редактирай ловно скривалище"
msgid "Height"
msgstr "Височина"
+msgctxt "height"
msgid "low"
-msgstr "нисък"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "среден"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "пълен"
+msgstr ""
msgid "Hide"
msgstr "Скривалище"
@@ -16419,11 +17322,11 @@ msgstr "Скривалище"
msgid "Lock"
msgstr "Заключване"
-msgid "Drinking Water"
-msgstr "Питейна вода"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Редактирай питейна вода"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Пожарен кран"
@@ -16450,6 +17353,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16487,119 +17393,155 @@ msgstr "Стадион"
msgid "Edit Stadium"
msgstr "Редактирай стадион"
-msgid "select sport:"
-msgstr "вид спорт:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "спорт"
+msgid "Sport"
+msgstr "Спорт"
+msgctxt "sport"
msgid "multi"
-msgstr "многобой"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "стрелба с лък"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "атлетика"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "австралийски футбол"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "бейзбол"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "баскетбол"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "игра с мет.топчета"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "игра с асим.топки"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "кану"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "алпинизъм"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "крикет"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "крикет мрежи"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "крокет"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "велоспорт"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "кучешки надбягвания"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "конна езда"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "голф"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "гимнастика"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "хокей"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "конни надбягвания"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "моторен спорт"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "бейзбол"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "ракет бол"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "стрелба"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "скейтборд"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "фигурно пързаляне"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "ски"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "футбол"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "плуване"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "тенис на маса"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "тенис"
+msgstr ""
msgid "Sports Centre"
msgstr "Спортен център"
@@ -16631,26 +17573,27 @@ msgstr "Миниголф"
msgid "Edit Miniature Golf"
msgstr "Редактирай миниголф"
-msgid "Sport"
-msgstr "Спорт"
-
msgid "Multi"
msgstr "Многобой"
msgid "Edit Multi"
msgstr "Редактирай многобой"
-msgid "type"
-msgstr "тип"
-
+msgctxt "running"
msgid "pitch"
-msgstr "игрище"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "спортен център"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "стадион"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16658,6 +17601,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "игрище"
+
+msgid "sports_centre"
+msgstr "спортен център"
+
+msgid "stadium"
+msgstr "стадион"
+
msgid "10pin"
msgstr "Боулинг зала"
@@ -16691,6 +17643,22 @@ msgstr "Редактирай кану"
msgid "Edit Cycling"
msgstr "Редактирай велосипедизъм"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Надпреварване с кучета"
@@ -16703,14 +17671,39 @@ msgstr "Конна езда"
msgid "Edit Equestrian"
msgstr "Редактирай конна езда"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
-msgid "Horse Racing"
-msgstr "Конни надбягвания"
-
-msgid "Edit Horse Racing"
-msgstr "Редактирай конни надбягвания"
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "кал"
+
+msgid "Horse Racing"
+msgstr "Конни надбягвания"
+
+msgid "Edit Horse Racing"
+msgstr "Редактирай конни надбягвания"
msgid "Gymnastics"
msgstr "Гимнастика"
@@ -16722,7 +17715,7 @@ msgid "Skating"
msgstr "Фигурно пързаляне"
msgid "Edit Skating"
-msgstr "Редактирай фигурно пързаляне"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16766,36 +17759,54 @@ msgstr "Зимен парк"
msgid "Difficulty"
msgstr "Трудност"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "начинаещ"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "лесно"
+msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "за напреднали"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "експерт"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "свободна езда"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16838,19 +17849,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16989,6 +17996,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -17001,60 +18020,134 @@ msgstr "Изкуствени"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr "Жилищна сграда"
msgid "Edit Residential Building"
msgstr "Редактиране на жилищна сграда"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Вход"
+
+msgid "Edit Entrance"
+msgstr "Редактирай вход"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Кула"
@@ -17070,9 +18163,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr "Височина (в метри)"
-
msgid "Flagpole"
msgstr ""
@@ -17282,41 +18372,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17325,8 +18441,8 @@ msgstr "Точка на наблюдение"
msgid "Edit Survey Point"
msgstr "Редактирай точка на наблюдение"
-msgid "Surveillance"
-msgstr "Видеонаблюдение"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Редактирай видеонаблюдение"
@@ -17337,12 +18453,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "магазин"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Електроцентрала"
@@ -17394,156 +18600,275 @@ msgstr "вятърна енергия"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "слънчева енергия"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Електростанция"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Редактирай електростанция"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Електроподстанция"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Редактирай електроподстанция"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
-msgstr "Означение"
+msgid "solar photovoltaic"
+msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "solar thermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Електрически стълб от ЕПМ"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Редактирай стълб от ЕПМ"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
+msgid "steam_turbine"
msgstr ""
-msgid "Pole"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
msgstr ""
-msgid "Edit Power Pole"
+msgid "stellarator"
msgstr ""
-msgid "Pole reference"
+msgid "nuclear fusion"
msgstr ""
-msgid "Power Line"
-msgstr "Линия за електропренос"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Редактирай линия за електропренос"
+msgid "vertical_axis"
+msgstr ""
-msgid "Line type"
-msgstr "Тип на линия"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgid "nuclear fission"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Amount of Cables"
-msgstr "Брой проводници"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
-msgstr "Брой на жилата на всеки кабел"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
-msgid "single"
-msgstr "един"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
-msgid "double"
-msgstr "два"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
-msgid "triple"
-msgstr "три"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
-msgid "quad"
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Електроподстанция"
+
+msgid "Edit Power Sub Station"
+msgstr "Редактирай електроподстанция"
+
+msgid "Line reference"
+msgstr "Означение"
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "нисък"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Електрически стълб от ЕПМ"
+
+msgid "Edit Power Tower"
+msgstr "Редактирай стълб от ЕПМ"
+
+msgid "Tower reference"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr "Линия за електропренос"
+
+msgid "Edit Power Line"
+msgstr "Редактирай линия за електропренос"
+
+msgid "Line type"
+msgstr "Тип на линия"
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr "Брой проводници"
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr "Брой на жилата на всеки кабел"
+
+msgid "single"
+msgstr "един"
+
+msgid "double"
+msgstr "два"
+
+msgid "triple"
+msgstr "три"
+
+msgid "quad"
msgstr "четири"
msgid "Historic Places"
@@ -17633,11 +18958,11 @@ msgstr "Будка"
msgid "Edit Kiosk"
msgstr "Редактирай будка"
-msgid "Baker"
-msgstr "Фурна"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Редактирай фурна"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Месарница"
@@ -17648,7 +18973,7 @@ msgstr "Редактирай месарница"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17669,14 +18994,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Био магазин"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Био магазин"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17747,7 +19078,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17768,13 +19099,13 @@ msgstr "Редактирай магазин за електроника"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17783,9 +19114,8 @@ msgstr "Аудио HiFi"
msgid "Edit Hifi Shop"
msgstr "Редактирай магазин за Аудио HiFi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Видео"
msgid "Edit Video Shop"
msgstr "Редактирай Видео-магазин"
@@ -17811,6 +19141,12 @@ msgstr "Редактирай обмяна на валута"
msgid "Edit Automated Teller Machine"
msgstr "Редактирай банкомат"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17847,10 +19183,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "Будизъм"
+
+msgid "christian"
+msgstr "Християнство"
+
+msgid "hindu"
+msgstr "Индуизъм"
+
+msgid "jewish"
+msgstr "Юдаизъм"
+
+msgid "muslim"
+msgstr "Мусулманство"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17880,7 +19237,7 @@ msgstr "Редактирай железария"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17892,19 +19249,19 @@ msgstr "Редактирай мебелен магазин"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17925,6 +19282,12 @@ msgstr "Книжарница"
msgid "Edit Book Store"
msgstr "Редактиране на книжарница"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Туристическа агенция"
@@ -17934,7 +19297,7 @@ msgstr "Редактиране на туристическа агенция"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18015,6 +19378,9 @@ msgstr "играчки"
msgid "vouchers"
msgstr "ваучери"
+msgid "Note"
+msgstr "Забележка"
+
msgid "Geography"
msgstr "География"
@@ -18144,6 +19510,12 @@ msgstr "Връх"
msgid "Edit Peak"
msgstr "Редактиране връх"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Ледник"
@@ -18183,26 +19555,35 @@ msgstr "Дърво"
msgid "Edit Tree"
msgstr "Редактирай дърво"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Ботаническо название"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Гора"
msgid "Edit Wood"
msgstr "редактиране на \"гора\""
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "иглолистен"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "широколистен"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "смесен"
msgid "Forest"
msgstr "Гора"
@@ -18210,15 +19591,6 @@ msgstr "Гора"
msgid "Edit Forest Landuse"
msgstr "редактиране на \"залесена площ\""
-msgid "coniferous"
-msgstr "иглолистен"
-
-msgid "deciduous"
-msgstr "широколистен"
-
-msgid "mixed"
-msgstr "смесен"
-
msgid "Grassland"
msgstr ""
@@ -18294,6 +19666,12 @@ msgstr "Поляна"
msgid "Edit Meadow Landuse"
msgstr "Редактиране поляна"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Лозе"
@@ -18348,8 +19726,8 @@ msgstr "Спортна площадка"
msgid "Edit Recreation Ground Landuse"
msgstr "Редактирай спортна площадка"
-msgid "Residential area"
-msgstr "Жилищна зона"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Редактирай жилищна зона"
@@ -18360,6 +19738,9 @@ msgstr "Църковно гробище"
msgid "Edit Graveyard"
msgstr "Редактирай църковно гробище"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Гробище"
@@ -18435,6 +19816,33 @@ msgstr "Редактирай кариера"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Редактиране на информацията за адреса"
@@ -18453,30 +19861,6 @@ msgstr "Име на град"
msgid "Country code"
msgstr "Код на държава"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "Интерполация на адреси"
@@ -18495,6 +19879,18 @@ msgstr "четни"
msgid "alphabetic"
msgstr "по азбучен ред"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18657,26 +20053,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "път"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "ски"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "пеш"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "туристически маршрут"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "обиколка"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Описание на символ"
@@ -18723,19 +20148,22 @@ msgstr "точка за спиране напред"
msgid "backward halt point"
msgstr "точка за спиране назад"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18759,7 +20187,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18855,18 +20283,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "мост"
msgid "deprecated"
msgstr "остарял, вече невалиден"
+msgid "bicycle"
+msgstr "велосипед"
+
+msgid "foot"
+msgstr "пеш"
+
msgid "horse"
msgstr "кон"
@@ -18876,8 +20313,11 @@ msgstr "бариера"
msgid "motorroad"
msgstr "автомобилен път"
-msgid "highway_track"
-msgstr "път_от_пътна_мрежа"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "услуги"
@@ -18885,11 +20325,11 @@ msgstr "услуги"
msgid "ford"
msgstr "форд"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "точка за връзка със спешна помощ"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "речен бряг"
@@ -18906,6 +20346,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "ЖП точка"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18921,29 +20364,29 @@ msgstr "стара ЖП линия"
msgid "aeroway"
msgstr "въздушен транспорт"
-msgid "aeroway_dark"
-msgstr "Надземен_транспорт_тъмен"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "Надземен_транспорт_светъл"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "лесна ски писта"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "средно трудна ски писта"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "ски писта за напреднали"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "ски писта за експерти"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "ски писта freeride"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "ски писта за начинаещи"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "захранване"
@@ -18963,20 +20406,20 @@ msgstr "яхт пристан"
msgid "amenity"
msgstr "Обществени услуги"
-msgid "amenity_traffic"
-msgstr "Обществен трафик"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "Обществено осветление"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "светла_вода"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "здравеопазване"
-msgid "shop"
-msgstr "магазин"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "хотел"
@@ -19041,9 +20484,6 @@ msgstr "пустош"
msgid "woodarea"
msgstr "гориста местност"
-msgid "mud"
-msgstr "кал"
-
msgid "beach"
msgstr "плаж"
@@ -19053,10 +20493,13 @@ msgstr "маршрут"
msgid "boundary"
msgstr "граница"
+msgid "sport"
+msgstr "спорт"
+
msgid "place"
msgstr "място"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19071,9 +20514,6 @@ msgstr "Град/Село"
msgid "One Way"
msgstr "Еднопосочна"
-msgid "Church"
-msgstr "Църква"
-
msgid "Fuel Station"
msgstr "Бензиностанция"
@@ -19101,6 +20541,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19146,10 +20589,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19161,7 +20634,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19179,7 +20652,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19296,19 +20769,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:population without population"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:geometry on a node"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19327,13 +20911,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19342,23 +20962,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19369,142 +20998,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Улици NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19520,13 +21198,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italy"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Сицилия - Италия"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -19543,149 +21221,212 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
msgstr ""
-msgid "PNOA Spain"
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx IRS"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OSM Export"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "SUMO Export"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "Export"
msgstr ""
-msgid "2u"
-msgstr ""
+msgid "Port:"
+msgstr "Порт:"
+
+msgid "refresh the port list"
+msgstr "обнови списъка с портове"
+
+msgid "Configure"
+msgstr "Настройки"
+
+msgid "Connection Error."
+msgstr "Грешка при свързване."
+
+msgid "configure the connected DG100"
+msgstr "конфигуриране на свързаното DG100"
+
+msgid "delete data after import"
+msgstr "изтриване на данните след импорт"
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19890,6 +21631,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19911,13 +21664,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20180,9 +21927,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Обновяване свойствата на {0} обект"
@@ -20204,6 +21957,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20282,9 +22038,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20369,7 +22137,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20640,15 +22408,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20819,6 +22578,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20837,12 +22599,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20990,6 +22746,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21008,6 +22767,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Добавяне на \"source=...\" към ?"
@@ -21090,48 +22852,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr "Изток"
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21186,20 +22906,76 @@ msgstr "Добавяне на нов слой"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Нулиране на cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Взимане ново cookie (изтичане на сесията)"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr ""
-msgid "Export as PNG format (only raster images)"
-msgstr "Експортирай във формат PNG (само растерни изображения)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr "Изток"
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
msgid "Adjust WMS"
msgstr "Настройка на WMS"
@@ -21226,8 +23002,11 @@ msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)"
msgid "Is not vectorized."
msgstr "Не е векоторизиран."
-msgid "Raster size: {0}"
-msgstr "Размер на растера: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Векторизиран."
@@ -21278,7 +23057,7 @@ msgstr "Изтриване на избраната схема от списък
msgid "Color Schemes"
msgstr "Цветни схеми"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21325,6 +23104,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21391,10 +23173,75 @@ msgstr ""
msgid "Are you sure?"
msgstr "Сигурни ли сте?"
-msgid "New tool..."
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
msgstr ""
-msgid "Install"
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21436,27 +23283,9 @@ msgstr "Изключване на натрупването на данни ак
msgid "Unknown logFormat"
msgstr "Неизвестен формат за натрупване"
-msgid "Port:"
-msgstr "Порт:"
-
-msgid "refresh the port list"
-msgstr "обнови списъка с портове"
-
-msgid "Configure"
-msgstr "Настройки"
-
msgid "Configure Device"
msgstr "Конфигуриране на устройство"
-msgid "Connection Error."
-msgstr "Грешка при свързване."
-
-msgid "configure the connected DG100"
-msgstr "конфигуриране на свързаното DG100"
-
-msgid "delete data after import"
-msgstr "изтриване на данните след импорт"
-
msgid "Importing data from device."
msgstr "Импортиране на данни от устройство."
@@ -21855,6 +23684,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22052,7 +23884,7 @@ msgid "Please select the imagery layer to adjust."
msgstr ""
msgid "Start adjusting"
-msgstr "Начало на подравняването"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
msgstr ""
@@ -22102,12 +23934,6 @@ msgstr "Импортирани изображения"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Файлове с изображения (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Отваряне на изобранията в ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Зареждане набор изображения в нов слой."
-
msgid "Import vector graphics"
msgstr ""
@@ -22117,16 +23943,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22503,9 +24326,6 @@ msgstr "Авто-Център"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Постоянно центриране на LiveGPS слоя към текущата позиция."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -22561,9 +24381,30 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Ролевото членство в релация беше копирано за всички нови "
+"пътища.<br>Трябва да го проверите и коригирате ако е необходимо.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Членството в релация беше копирано за всички нови пътища.<br>Трябва да "
+"го проверите и коригирате ако е необходимо.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22605,25 +24446,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Преобразуване до мултиполигон"
+msgid "Select OSM mirror URL to download from."
+msgstr ""
-msgid "Convert to multipolygon."
-msgstr "Преобразуване до мултиполигон."
+msgid "Base URL"
+msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22760,9 +24601,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22787,12 +24625,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22941,6 +24788,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22957,6 +24807,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23192,15 +25053,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Възникна грешка: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Невъзможно да бъде създаден нов бъг. Резултат: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Заглавната част съдържа няколко стойности и не може да бъде представена с "
-"един низ."
-
msgid "Process queue"
msgstr ""
@@ -23257,18 +25109,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "Нов проблем"
-
-msgid "Create issue"
-msgstr "Създаване на нов проблем"
-
-msgid "Describe the problem precisely"
-msgstr "Опишете проблема колкото можете по-подробно"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23329,6 +25169,9 @@ msgstr "изпълним файл на Firefox"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23536,9 +25379,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23618,7 +25458,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23772,6 +25630,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23793,6 +25654,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24086,9 +25950,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24157,9 +26018,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24286,9 +26144,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24310,6 +26165,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24342,15 +26200,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Промяна параметри"
+
msgid "Country preset:"
msgstr ""
@@ -24360,6 +26234,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24462,9 +26339,6 @@ msgstr "Настройки на разширение маршрутизатор"
msgid "Configure routing preferences."
msgstr "Настройване предпочитания за маршрутизиране"
-msgid "Highway type"
-msgstr "Клас път"
-
msgid "Speed (Km/h)"
msgstr "Скорост (км/ч)"
@@ -24580,6 +26454,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24640,19 +26517,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24795,6 +26672,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24870,6 +26750,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24885,9 +26854,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr "Запис на файл със подписите."
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24909,6 +26875,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25061,9 +27030,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25689,7 +27655,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25697,10 +27666,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25709,18 +27675,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr "Още инструменти"
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25763,15 +27717,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25893,18 +27838,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26082,9 +28015,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Видео"
-
msgid "Import Video"
msgstr ""
@@ -26211,8 +28141,8 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
-msgstr "Сканирана карта..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26231,9 +28161,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26366,9 +28293,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index 1fb17b2..794ccad 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2010-05-09 09:48+0000\n"
-"Last-Translator: Ferdaus <ferdausalamin at yahoo.ca>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-06-13 16:28+0000\n"
+"Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
"Language-Team: Bengali <bn 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: 2013-04-05 04:35+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:35+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -45,11 +45,26 @@ msgid "Invalid value {0} for parameter ''has_arg''"
msgstr ""
msgid "Background Terms of Use"
-msgstr ""
+msgstr "পটভূমি ব্যবহারের শর্তাবলী"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -96,7 +111,7 @@ msgid ""
msgstr ""
msgid "Exit JOSM"
-msgstr ""
+msgstr "JOSM থেকে প্রস্থান করুন"
msgid "Continue, try anyway"
msgstr ""
@@ -150,17 +165,14 @@ msgid "About JOSM..."
msgstr "JOSMএর সম্বন্ধে।"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"সতর্কতা: এ.পি.আই. ভিত্তি ইউআরএলের অপ্রত্যাশিত ফরম্যাট। OSM ব্যবহারকারীর জন্য "
-"ব্যবহারকারী পাতাতে দিক পরিবর্তন সম্ভবত ব্যর্থ হবে। এ.পি.আই. ভিত্তি ইউআরএল: "
-"''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -203,11 +215,14 @@ msgstr "কোনও লক্ষ্য স্তর না"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
msgid "Add layers"
-msgstr ""
+msgstr "স্তর যোগ করুন"
msgid "Invalid service URL."
msgstr ""
@@ -242,9 +257,6 @@ msgstr "টুল:{0}"
msgid "Please select at least four nodes."
msgstr "দয়া করে অন্তত চার নোড নির্বাচন করুন।"
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr "লাইনে নোড সারি দিয়ে সাজান"
@@ -269,6 +281,9 @@ msgstr "সংঘাত"
msgid "download"
msgstr "ডাউনলোড করুন"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -278,6 +293,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr "বড় করে দেখতে কিছুই নির্বাচন করা হয়নি"
+msgid "Information"
+msgstr "তথ্যাদি"
+
msgid "Zoom to {0}"
msgstr "{0} তে করে ছোট বা বড় করে দেখুন।"
@@ -303,7 +321,7 @@ msgid "Closes open changesets"
msgstr ""
msgid "File: {0}"
-msgstr ""
+msgstr "ফাইল: {0}"
msgid "There are no open changesets"
msgstr ""
@@ -334,7 +352,7 @@ msgstr ""
"উল্টো করতে চান?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -345,7 +363,7 @@ msgid "Please select at least two ways to combine."
msgstr "দয়া করে যুক্ত করতে অন্তত দুই উপায় নির্বাচন করুন।"
msgid "Copy"
-msgstr ""
+msgstr "কপি করুন"
msgid "Copy selected objects to paste buffer."
msgstr ""
@@ -391,16 +409,33 @@ msgstr "মুছে ফেলুন"
msgid "Delete selected objects."
msgstr "নির্বাচিত বস্তু মুছে ফেলুন।"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSM থেকে ডাউনলোড করুন।"
msgid "Download map data from the OSM server."
+msgstr "OSM সার্ভার থেকে মানচিত্র ডেটা ডাউনলোড করুন"
+
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
msgstr ""
msgid "Download object..."
@@ -438,7 +473,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "Ok"
-msgstr ""
+msgstr "ঠিক আছে"
msgid "Download parent ways/relations..."
msgstr ""
@@ -453,10 +488,10 @@ msgid "Duplicate selection by copy and immediate paste."
msgstr ""
msgid "Exit"
-msgstr ""
+msgstr "প্রস্থান করুন"
msgid "Exit the application."
-msgstr ""
+msgstr "অ্যাপ্লিকেশন থেকে প্রস্থান করুন"
msgid "Expert Mode"
msgstr ""
@@ -465,13 +500,13 @@ msgid "Enable/disable expert mode"
msgstr ""
msgid "Follow line"
-msgstr ""
+msgstr "লাইন অনুসরণ করুন"
msgid "Continues drawing a line that shares nodes with another line."
msgstr ""
msgid "Follow"
-msgstr ""
+msgstr "অনুসরণ করুন"
msgid "Fullscreen view"
msgstr ""
@@ -497,6 +532,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -610,7 +648,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -760,8 +798,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -918,8 +956,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -946,12 +984,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -969,9 +1003,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1078,6 +1109,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1128,9 +1168,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1192,6 +1229,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1266,13 +1306,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1361,6 +1401,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1385,9 +1446,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1583,6 +1641,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1592,6 +1653,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1611,6 +1684,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1661,25 +1759,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1822,6 +1901,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1846,8 +1928,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1863,6 +1945,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2269,6 +2354,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2429,13 +2517,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2444,6 +2532,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2462,8 +2553,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2549,6 +2639,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2585,10 +2678,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2611,8 +2704,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2716,6 +2809,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2776,8 +2872,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2807,10 +2903,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2831,6 +2927,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2861,18 +2960,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2881,8 +2980,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2890,13 +2989,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2910,8 +3007,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2941,11 +3038,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "অজ্ঞাত"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3098,8 +3194,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3206,7 +3301,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3225,6 +3320,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3241,9 +3339,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3282,6 +3377,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3306,6 +3404,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3365,13 +3472,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3441,6 +3548,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3510,6 +3635,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3567,13 +3698,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3605,10 +3736,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3742,7 +3873,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3817,6 +3948,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3847,9 +3981,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3874,10 +4005,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3940,23 +4071,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4060,7 +4174,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4256,9 +4370,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4274,10 +4403,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4286,6 +4427,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4345,6 +4489,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4372,24 +4519,11 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
+msgid "{0} ({1} ms)"
msgstr ""
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
-msgid "{0} ({1} ms)"
-msgstr ""
-
-msgid ""
-"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
+msgid ""
+"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
msgstr ""
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -4672,29 +4806,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4709,7 +4861,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4761,14 +4913,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5018,14 +5162,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5546,6 +5690,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5629,6 +5776,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5650,9 +5824,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5677,32 +5848,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5722,8 +5893,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5749,9 +5919,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5896,9 +6063,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6183,8 +6347,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6249,34 +6413,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: foreground"
+msgstr ""
+
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6291,13 +6467,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6376,12 +6552,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6411,9 +6581,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6451,7 +6627,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6511,6 +6687,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6766,6 +6945,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6831,9 +7029,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6900,20 +7095,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6924,23 +7106,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7037,7 +7205,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7136,6 +7304,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7223,7 +7394,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7242,6 +7413,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7308,8 +7485,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7384,8 +7560,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7399,8 +7575,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7615,12 +7790,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7629,6 +7798,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7644,6 +7829,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7651,8 +7851,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7764,9 +7964,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7776,6 +7973,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7792,7 +7992,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7938,7 +8138,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7968,7 +8168,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8082,6 +8282,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8119,6 +8322,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8315,9 +8521,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8336,6 +8539,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8393,6 +8599,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8459,9 +8671,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8474,7 +8683,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8501,12 +8713,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8635,14 +8851,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8657,7 +8869,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8667,8 +8879,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8888,7 +9099,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8954,6 +9165,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9011,9 +9228,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9260,6 +9474,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9388,6 +9605,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9430,6 +9653,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9480,19 +9706,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9510,40 +9727,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9567,6 +9793,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9623,6 +9882,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9676,6 +9938,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9957,7 +10224,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10126,6 +10399,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10189,7 +10468,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10447,40 +10726,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10533,8 +10812,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10543,20 +10822,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10638,14 +10922,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10689,31 +10967,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10722,6 +11005,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10737,57 +11023,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10805,6 +11093,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10834,6 +11130,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10864,7 +11203,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10904,28 +11243,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11020,6 +11357,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11035,12 +11375,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11119,7 +11467,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11218,52 +11566,28 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
+msgid "Parsing changeset content ..."
msgstr ""
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid "Parsing changeset content ..."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
msgstr ""
msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
@@ -11284,10 +11608,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11298,9 +11619,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11322,6 +11640,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11371,8 +11692,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11515,6 +11836,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11533,6 +11857,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11557,16 +11890,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11578,6 +11914,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11592,6 +11936,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11622,19 +11975,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11656,11 +12009,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11730,13 +12095,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11879,10 +12244,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11897,22 +12262,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11981,8 +12345,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11997,9 +12360,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12321,17 +12699,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12342,9 +12714,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12376,9 +12791,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12701,6 +13130,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12780,6 +13214,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12881,9 +13319,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12939,6 +13374,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12963,9 +13401,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12991,9 +13426,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13030,6 +13462,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13076,9 +13513,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13163,6 +13597,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13253,6 +13690,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13271,10 +13752,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13286,6 +13767,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13313,18 +13797,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13334,9 +13812,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13346,13 +13821,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13400,6 +13875,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13484,6 +13962,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13588,21 +14069,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13618,10 +14108,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13657,7 +14147,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13726,12 +14216,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13747,15 +14243,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13777,6 +14264,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13786,6 +14282,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13795,10 +14294,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13831,9 +14327,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13867,64 +14360,106 @@ msgstr ""
msgid "Barriers"
msgstr ""
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr ""
-msgid "Cycle Barrier"
+msgid "Material"
msgstr ""
-msgid "Block"
+msgid "stone"
msgstr ""
-msgid "Cattle Grid"
+msgid "Bollard"
msgstr ""
-msgid "Edit Cattle Grid"
+msgid "Edit Bollard"
msgstr ""
-msgid "Bus Trap"
+msgid "Bollard type"
msgstr ""
-msgid "Spikes"
+msgid "rising"
msgstr ""
-msgid "Edit Spikes"
+msgid "removable"
msgstr ""
-msgid "Toll Booth"
+msgid "plastic"
msgstr ""
-msgid "Edit Toll Booth"
+msgid "Cycle Barrier"
msgstr ""
-msgid "Border Control"
+msgid "Edit Cycle Barrier"
msgstr ""
-msgid "Edit Border Control"
+msgid "Cattle Grid"
msgstr ""
-msgid "Hedge"
+msgid "Edit Cattle Grid"
+msgstr ""
+
+msgid "Bus Trap"
+msgstr ""
+
+msgid "Edit Bus Trap"
+msgstr ""
+
+msgid "Spikes"
+msgstr ""
+
+msgid "Edit Spikes"
+msgstr ""
+
+msgid "Toll Booth"
+msgstr ""
+
+msgid "Edit Toll Booth"
+msgstr ""
+
+msgid "Border Control"
+msgstr ""
+
+msgid "Edit Border Control"
+msgstr ""
+
+msgid "Hedge"
+msgstr ""
+
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
msgstr ""
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13933,22 +14468,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -13981,12 +14545,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14044,6 +14623,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14053,6 +14635,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14092,9 +14680,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14128,6 +14713,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14209,18 +14809,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14293,7 +14898,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14317,10 +14925,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14332,9 +14943,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14377,18 +14985,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14488,11 +15134,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14504,11 +15148,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14527,10 +15169,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14560,9 +15202,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14578,19 +15217,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14740,6 +15395,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14761,6 +15419,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14788,6 +15452,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14812,22 +15482,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14849,9 +15503,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14915,7 +15566,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15046,6 +15697,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15076,6 +15730,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15088,9 +15745,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15100,9 +15754,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15115,6 +15774,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15139,14 +15801,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15195,7 +15849,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15249,41 +15903,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15469,6 +16123,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15490,9 +16150,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15505,6 +16171,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15544,6 +16213,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15565,22 +16237,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15604,9 +16288,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15631,10 +16312,19 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
msgstr ""
-msgid "Playground"
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
+
+msgid "Playground"
msgstr ""
msgid "Edit Playground"
@@ -15704,49 +16394,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15764,6 +16448,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15776,6 +16466,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15791,37 +16484,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15911,6 +16707,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15920,6 +16722,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15986,12 +16794,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16001,6 +16863,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16010,31 +16896,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16062,7 +16954,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16089,27 +16981,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16144,12 +17024,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16159,10 +17042,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16190,6 +17073,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16227,117 +17113,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16371,33 +17293,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16431,6 +17363,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16443,7 +17391,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16506,36 +17479,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
-msgid "advanced"
+msgctxt "piste:difficulty"
+msgid "intermediate"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "advanced"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16578,19 +17569,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16729,6 +17716,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16741,60 +17740,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16810,9 +17883,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17022,41 +18092,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17065,7 +18161,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17077,12 +18173,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17134,88 +18320,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17227,6 +18516,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17242,6 +18546,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17260,11 +18567,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17373,10 +18678,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17388,7 +18693,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17409,13 +18714,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17487,7 +18798,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17508,13 +18819,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17523,7 +18834,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17551,6 +18861,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17587,10 +18903,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17620,7 +18957,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17632,19 +18969,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17665,6 +19002,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17674,7 +19017,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17755,6 +19098,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17884,6 +19230,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17923,24 +19275,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17950,15 +19311,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18034,6 +19386,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18088,7 +19446,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18100,6 +19458,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18175,46 +19536,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
+msgstr ""
+
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18235,6 +19599,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18397,27 +19773,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18463,19 +19868,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18499,7 +19907,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18595,18 +20003,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18616,7 +20033,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18625,10 +20045,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18646,6 +20066,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18661,28 +20084,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18703,19 +20126,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18781,9 +20204,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18793,10 +20213,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18811,9 +20234,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18841,6 +20261,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18886,10 +20309,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18901,7 +20354,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18919,7 +20372,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19036,19 +20489,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:old_name without old_name"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:designation without designation"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19067,13 +20631,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19082,19 +20682,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19109,142 +20718,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19283,148 +20941,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19628,6 +21349,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19649,13 +21382,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19918,9 +21645,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19942,6 +21675,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20020,9 +21756,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20107,7 +21855,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20378,15 +22126,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20557,6 +22296,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20575,12 +22317,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20716,6 +22452,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20733,6 +22472,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20813,113 +22555,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20945,7 +22701,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20995,7 +22754,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21040,6 +22799,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21097,19 +22859,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21151,27 +22978,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21567,6 +23376,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21814,12 +23626,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21829,16 +23635,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22201,9 +24004,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22258,9 +24058,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22302,25 +24119,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22457,9 +24274,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22484,12 +24298,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22638,6 +24461,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22654,6 +24480,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22887,13 +24724,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22946,18 +24776,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23015,6 +24833,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23222,9 +25043,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23304,7 +25122,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23458,6 +25294,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23479,6 +25318,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23772,9 +25614,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23843,9 +25682,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23972,9 +25808,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23996,6 +25829,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24028,15 +25864,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24046,6 +25898,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24148,9 +26003,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24266,6 +26118,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24326,19 +26181,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24476,6 +26331,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24551,6 +26409,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24566,9 +26513,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24590,6 +26534,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24742,9 +26689,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25370,7 +27314,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25378,10 +27325,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25390,18 +27334,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25444,15 +27376,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25574,18 +27497,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25763,9 +27674,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25892,7 +27800,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25912,9 +27820,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26047,9 +27952,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/br.po b/i18n/po/br.po
index 980ab14..c247013 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:36+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: br\n"
msgid "License"
@@ -53,6 +53,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Diwar-benn JOSM"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr "Ostilh : {0}"
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "Titouroù"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr "tabut"
msgid "download"
msgstr "pellgargañ"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "Titouroù"
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "DIANAV"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr "O vont e darempred gant servijer OSM"
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 5869489..24ca44f 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:35+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:36+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr "Uslovi korištenja pozadine"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Otvaranje linka nije podržano na trenutnoj platformi (\"{0}\")"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -154,19 +169,14 @@ msgid "About JOSM..."
msgstr "O JOSM-u..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"UPOZORENJE: Neočekivani format URL baze API. Preusmjeravanje na stranicu "
-"info ili historija za OSM objekte vjerovatno neće uspjeti. Osnovni URL za "
-"bazu API je:'' {0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"UPOZORENJE: neočekivani format API osnovnog URL-a. Preusmjeravanje na OSM "
-"korisničku stranicu vjerovatno neće uspjeti. API osnovni URL je: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -208,6 +218,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -247,9 +260,6 @@ msgstr "Alat: {0}"
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "Informacije"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -274,6 +284,9 @@ msgstr "sukob"
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -283,6 +296,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "Informacije"
+
msgid "Zoom to {0}"
msgstr ""
@@ -339,7 +355,7 @@ msgstr ""
"obrnuti neke od njih?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -396,18 +412,35 @@ msgstr "Obriši"
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -502,6 +535,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -615,7 +651,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -765,8 +801,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -923,8 +959,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -951,12 +987,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -974,9 +1006,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1083,6 +1112,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1133,9 +1171,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1197,6 +1232,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1271,13 +1309,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1366,6 +1404,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1390,9 +1449,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1588,6 +1644,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1597,6 +1656,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1616,6 +1687,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1666,25 +1762,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1827,6 +1904,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1851,8 +1931,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1868,6 +1948,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2274,6 +2357,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2434,13 +2520,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2449,6 +2535,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2467,8 +2556,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2554,6 +2642,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2590,10 +2681,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2616,8 +2707,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2721,6 +2812,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2781,8 +2875,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2812,10 +2906,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2836,6 +2930,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2866,18 +2963,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2886,8 +2983,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2895,13 +2992,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2915,8 +3010,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2946,11 +3041,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "NEPOZNAT"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3103,8 +3197,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3211,7 +3304,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3230,6 +3323,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3246,9 +3342,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3287,6 +3380,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3311,6 +3407,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3370,13 +3475,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3446,6 +3551,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3515,6 +3638,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3572,13 +3701,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3610,10 +3739,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3747,7 +3876,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3822,6 +3951,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3852,9 +3984,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3879,10 +4008,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3945,23 +4074,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4065,7 +4177,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4261,9 +4373,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4279,10 +4406,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4291,6 +4430,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4350,6 +4492,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4377,19 +4522,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4677,29 +4809,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4714,7 +4864,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4766,14 +4916,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5023,14 +5165,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5551,6 +5693,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5634,6 +5779,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5655,9 +5827,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5682,32 +5851,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5727,8 +5896,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5754,9 +5922,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5901,9 +6066,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6188,8 +6350,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6254,34 +6416,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6296,13 +6470,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6381,12 +6555,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6416,9 +6584,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6456,7 +6630,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6516,6 +6690,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6771,6 +6948,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6836,9 +7032,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6905,20 +7098,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6929,23 +7109,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7042,7 +7208,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7141,6 +7307,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7228,7 +7397,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7247,6 +7416,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7313,8 +7488,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7389,8 +7563,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7404,8 +7578,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7620,12 +7793,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7634,6 +7801,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7649,6 +7832,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7656,8 +7854,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7769,9 +7967,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7781,6 +7976,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7797,7 +7995,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7943,7 +8141,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7973,7 +8171,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8087,6 +8285,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8124,6 +8325,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8320,9 +8524,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8341,6 +8542,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8398,6 +8602,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8464,9 +8674,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8479,7 +8686,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8506,12 +8716,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8640,14 +8854,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8662,7 +8872,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8672,8 +8882,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8893,7 +9102,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8959,6 +9168,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9016,9 +9231,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9265,6 +9477,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9393,6 +9608,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9435,6 +9656,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9485,19 +9709,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9515,40 +9730,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9572,6 +9796,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9628,6 +9885,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9681,6 +9941,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9962,7 +10227,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10131,6 +10402,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10194,7 +10471,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10452,40 +10729,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10538,8 +10815,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10548,20 +10825,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10643,14 +10925,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10694,31 +10970,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10727,6 +11008,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10742,57 +11026,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10810,6 +11096,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10839,6 +11133,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10869,7 +11206,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10909,28 +11246,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11025,6 +11360,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11040,12 +11378,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11124,7 +11470,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11223,35 +11569,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11261,8 +11583,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11289,10 +11611,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11303,9 +11622,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11327,6 +11643,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11376,8 +11695,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11520,6 +11839,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11538,6 +11860,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11562,16 +11893,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11583,6 +11917,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11597,6 +11939,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11627,19 +11978,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11661,11 +12012,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11735,13 +12098,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11884,10 +12247,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11902,22 +12265,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11986,8 +12348,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12002,9 +12363,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12326,17 +12702,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12347,9 +12717,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12381,9 +12794,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12706,6 +13133,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12785,6 +13217,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12886,9 +13322,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12944,6 +13377,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12968,9 +13404,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12996,9 +13429,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13035,6 +13465,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13081,9 +13516,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13168,6 +13600,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13258,6 +13693,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13276,10 +13755,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13291,6 +13770,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13318,18 +13800,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13339,9 +13815,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13351,13 +13824,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13405,6 +13878,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13489,6 +13965,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13593,21 +14072,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13623,10 +14111,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13662,7 +14150,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13731,12 +14219,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13752,15 +14246,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13782,6 +14267,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13791,6 +14285,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13800,10 +14297,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13836,9 +14330,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13872,19 +14363,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13896,6 +14411,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13917,55 +14435,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13986,12 +14548,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14049,6 +14626,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14058,6 +14638,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14097,9 +14683,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14133,6 +14716,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14214,18 +14812,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14298,7 +14901,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14322,10 +14928,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14337,9 +14946,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14382,18 +14988,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14493,11 +15137,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14509,11 +15151,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14532,10 +15172,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14565,9 +15205,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14583,19 +15220,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14745,6 +15398,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14766,6 +15422,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14793,6 +15455,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14817,22 +15485,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14854,9 +15506,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14920,7 +15569,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15051,6 +15700,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15081,6 +15733,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15093,9 +15748,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15105,9 +15757,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15120,6 +15777,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15144,14 +15804,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15200,7 +15852,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15254,41 +15906,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15474,6 +16126,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15495,9 +16153,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15510,6 +16174,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15549,6 +16216,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15570,22 +16240,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15609,9 +16291,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15636,7 +16315,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15709,52 +16397,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15769,6 +16451,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15781,6 +16469,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15796,37 +16487,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15916,6 +16710,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15925,6 +16725,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15991,12 +16797,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16006,6 +16866,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16015,31 +16899,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16067,7 +16957,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16094,27 +16984,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16149,12 +17027,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16164,10 +17045,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16195,6 +17076,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16232,117 +17116,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16376,33 +17296,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16436,6 +17366,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16448,7 +17394,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16511,36 +17482,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16583,19 +17572,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16734,6 +17719,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16746,60 +17743,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16815,9 +17886,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17027,41 +18095,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17070,7 +18164,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17082,12 +18176,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17139,88 +18323,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17232,6 +18519,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17247,6 +18549,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17265,11 +18570,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17378,10 +18681,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17393,7 +18696,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17414,13 +18717,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17492,7 +18801,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17513,13 +18822,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17528,7 +18837,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17556,6 +18864,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17592,40 +18906,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17637,19 +18972,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17670,6 +19005,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17679,7 +19020,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17760,6 +19101,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17889,6 +19233,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17928,24 +19278,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17955,15 +19314,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18039,6 +19389,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18093,7 +19449,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18105,6 +19461,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18180,46 +19539,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18240,6 +19602,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18402,27 +19776,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18468,19 +19871,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18504,7 +19910,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18600,18 +20006,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18621,7 +20036,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18630,10 +20048,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18651,6 +20069,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18666,28 +20087,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18708,19 +20129,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18786,9 +20207,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18798,10 +20216,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18816,9 +20237,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18846,6 +20264,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18891,10 +20312,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18906,7 +20357,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18924,7 +20375,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19041,19 +20492,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19072,13 +20634,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19087,19 +20685,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19114,142 +20721,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19288,148 +20944,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19633,6 +21352,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19654,13 +21385,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19923,9 +21648,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19947,6 +21678,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20025,9 +21759,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20112,7 +21858,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20383,15 +22129,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20562,6 +22299,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20580,12 +22320,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20721,6 +22455,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20738,6 +22475,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20818,113 +22558,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20950,7 +22704,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21000,7 +22757,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21045,6 +22802,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21102,19 +22862,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21156,27 +22981,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21572,6 +23379,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21819,12 +23629,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21834,16 +23638,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22206,9 +24007,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22263,9 +24061,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22307,25 +24122,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22462,9 +24277,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22489,12 +24301,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22643,6 +24464,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22659,6 +24483,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22892,13 +24727,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22951,18 +24779,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23020,6 +24836,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23227,9 +25046,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23309,7 +25125,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23463,6 +25297,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23484,6 +25321,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23777,9 +25617,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23848,9 +25685,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23977,9 +25811,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24001,6 +25832,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24033,15 +25867,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24051,6 +25901,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24153,9 +26006,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24271,6 +26121,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24331,19 +26184,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24481,6 +26334,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24556,6 +26412,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24571,9 +26516,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24595,6 +26537,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24747,9 +26692,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25375,7 +27317,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25383,10 +27328,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25395,18 +27337,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25449,15 +27379,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25579,18 +27500,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25768,9 +27677,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25897,7 +27803,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25917,9 +27823,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26052,9 +27955,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index da23df9..35d0ebd 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:13+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido at gmail.com>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-19 07:41+0000\n"
+"Last-Translator: pitort <pitort at eclipso.eu>\n"
"Language-Team: el_libre - - www.catmidia.cat\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: 2013-04-05 04:37+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-20 04:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -21,7 +21,7 @@ msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr "{0}: l''opció ''--{1}'' no permet cap argument"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: l''opci´o ''{1}{2}'' no permet cap argument"
+msgstr "{0}: l''opció ''{1}{2}'' no permet cap argument"
msgid "{0}: option ''{1}'' requires an argument"
msgstr "{0}: l''opció ''{1}'' requereix un argument"
@@ -50,6 +50,21 @@ msgstr "Termes d''ús de la imatge de fons"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "L''enllaç no pot ser obert en aquesta plataforma (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ERROR: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ATENCIÓ: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFORMACIÓ: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr "Causa: "
+
msgid "Executing platform startup hook"
msgstr "Inicialitzacions específiques de la plataforma"
@@ -63,7 +78,7 @@ msgid "Initializing OSM API"
msgstr "S''està inicialitzant l''API de l''OSM"
msgid "Initializing presets"
-msgstr "Inicialitzant les predefinicions"
+msgstr "S''estan inicialitzant les predefinicions"
msgid "Initializing validator"
msgstr "S''està inicialitzant el validador"
@@ -156,19 +171,19 @@ msgid "About JOSM..."
msgstr "Quant al JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Avís: el format de l''adreça URL de l''API no és l''esperat. La redirecció "
-"vers l''històric de l''objecte probablement fallarà. L''adreça és: ''{0}''"
+"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
+"vers la pàgina d''informació o de l''historial d''objectes OSM. La URL de "
+"l''API és: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ADVERTÈNCIA: format inesperat de l''API de base URL. Redirecció a la pàgina "
-"d''usuari per a l''usuari d''OSM probablement fallarà. API de base de URL "
-"és: ''{0}''"
+"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
+"vers la pàgina d''usuari OSM. La URL de l''API és: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -214,6 +229,9 @@ msgstr "No hi ha capes de destí"
msgid "Add imagery layer {0}"
msgstr "Afegeix la capa d''imatge {0}"
+msgid "Select image format for WMS layer"
+msgstr "Seleccioneu el format d''imatge de la capa WMS"
+
msgid "Select WMS layers"
msgstr "Selecciona capes WMS"
@@ -255,9 +273,6 @@ msgstr "Eina: {0}"
msgid "Please select at least four nodes."
msgstr "Seleccioneu com a mínim quatre nodes."
-msgid "Information"
-msgstr "Informació"
-
msgid "Align Nodes in Line"
msgstr "Alinea els nodes en una línia"
@@ -282,15 +297,21 @@ msgstr "conflicte"
msgid "download"
msgstr "baixa"
+msgid "problem"
+msgstr "problema"
+
msgid "previous"
-msgstr "anterior"
+msgstr "enrere"
msgid "next"
-msgstr "següent"
+msgstr "endavant"
msgid "Nothing selected to zoom to."
msgstr "No hi ha res seleccionat per ampliar."
+msgid "Information"
+msgstr "Informació"
+
msgid "Zoom to {0}"
msgstr "Amplia {0}"
@@ -348,11 +369,11 @@ msgstr ""
"dels sentits?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"No es poden combinar les vies (No es poden fusionar com una sola cadena de "
-"nodes)"
+"No és possible la combinació de les vies<br>(No poden ser unides per a "
+"formar una única sèrie de nodes)"
msgid "Combine {0} ways"
msgstr "Combina {0} vies"
@@ -407,6 +428,12 @@ msgstr "Suprimeix"
msgid "Delete selected objects."
msgstr "Suprimeix els objectes seleccionats"
+msgid "Toggle dialogs panel"
+msgstr "Commuta les finestres"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Commuta les finestres, maximitza la vista del mapa"
+
msgid "Distribute Nodes"
msgstr "Distribueix els nodes"
@@ -414,12 +441,25 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribueix els nodes seleccionats en distàncies iguals a llarg d''una línia"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignorant {0} nodes amb coordenades nul·les"
+
msgid "Download from OSM..."
msgstr "Baixa des de l''OSM..."
msgid "Download map data from the OSM server."
msgstr "Baixa les dades dels mapes des del servidor OSM"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Aquesta acció requerirà {0} peticions <br>de descàrrega. Voleu "
+"<br>continuar?</html>"
+
+msgid "Download data"
+msgstr "Baixa dades"
+
msgid "Download object..."
msgstr "Baixa l''objecte..."
@@ -469,7 +509,7 @@ msgid "Duplicate"
msgstr "Duplica"
msgid "Duplicate selection by copy and immediate paste."
-msgstr "Selecció duplicada per copiar i enganxar immediatament"
+msgstr "Dupliqueu la selecció copiant i enganxant-la immediatament"
msgid "Exit"
msgstr "Surt"
@@ -519,6 +559,9 @@ msgstr ""
"Mostra informació de la història sobre les vies, nodes, o les relacions de "
"OSM."
+msgid "Show history"
+msgstr "Mostra l''historial"
+
msgid "History (web)"
msgstr "Historial (web)"
@@ -530,13 +573,13 @@ msgstr ""
"web."
msgid "New offset"
-msgstr "Nou desplaçament"
+msgstr "Desplaçament nou"
msgid "Adjust the position of this imagery layer"
msgstr "Ajusta la posició d''aquesta capa d''imatge"
msgid "Adjust imagery offset"
-msgstr "Ajustar el decalatge de la imatge"
+msgstr "Ajusta el desplaçament de la imatge"
msgid "OK"
msgstr "D’acord"
@@ -557,13 +600,13 @@ msgid "Offset: "
msgstr "Desplaçament: "
msgid "Bookmark name: "
-msgstr "Nom del favorit: "
+msgstr "Nom del preferit: "
msgid "Overwrite"
msgstr "Sobreescriu"
msgid "Offset bookmark already exists. Overwrite?"
-msgstr "Ja existeix un favorit amb aquest nom. Remplaçar?"
+msgstr "Ja existeix un preferit amb aquest nom. Voleu sobreescriure''l?"
msgid "Advanced info"
msgstr "Informació avançada"
@@ -634,7 +677,7 @@ msgid "Assemble new polygons"
msgstr "Assembleu nous polígons"
msgid "Delete relations"
-msgstr "Esborra relacions"
+msgstr "Suprimeix les relacions"
msgid "Delete Ways that are not part of an inner multipolygon"
msgstr "Suprimeix les vies que no formen part d''un multipolígon intern"
@@ -643,11 +686,11 @@ msgid "Joined overlapping areas"
msgstr "Zones superposades fusionades"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Alguns de les vies eren part de relacions que han estat modificades. "
-"Verifiqueu que no s''ha introduït cap error."
+"Algunes vies eren part de relacions que han estat modificades.<br>Si us "
+"plau, comproveu que no s''han introduit errors."
msgid "Fix tag conflicts"
msgstr "Arregla conflictes d''etiquetes"
@@ -707,7 +750,7 @@ msgid "Opens a dialog that allows to jump to a specific location"
msgstr "Obre una finestra que permet saltar a una posició específica"
msgid "Enter Lat/Lon to jump to position."
-msgstr "Entreu Latitud/Longitud per saltar a la posició"
+msgstr "Introduïu la latitud/ongitud per saltar a la posició"
msgid "You can also paste an URL from www.openstreetmap.org"
msgstr "També podeu enganxar una adreça web de www.openstreetmap.org"
@@ -719,7 +762,7 @@ msgid "Longitude"
msgstr "Longitud"
msgid "Zoom (in metres)"
-msgstr "Apropar (en metres)"
+msgstr "Escala (en metres)"
msgid "URL"
msgstr "Adreça URL"
@@ -816,10 +859,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Fusiona dos o més nodes en el més antic"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Seleccioneu almenys dos nodes per fusionar o un node proper a un altre."
+"Si us plau, seleccioneu com a mínim dos nodes per ajuntar-los o un node "
+"proper a un altre."
msgid "Abort Merging"
msgstr "Anul·la la fusió"
@@ -893,10 +937,10 @@ msgid "Move Node..."
msgstr "Mou el node..."
msgid "Edit latitude and longitude of a node."
-msgstr "Edita latitud i longitud d''un node."
+msgstr "Edita la latitud i longitud d''un node."
msgid "New Layer"
-msgstr "Nova capa"
+msgstr "Capa nova"
msgid "Create a new map layer."
msgstr "Crea una capa del mapa nova"
@@ -947,11 +991,11 @@ msgstr "Obre un fitxer"
msgid "Opening {0} file..."
msgid_plural "Opening {0} files..."
-msgstr[0] "Obrint el fitxer {0} ..."
-msgstr[1] "Obrint els fitxers {0} ..."
+msgstr[0] "S''està obrint el fitxer {0} ..."
+msgstr[1] "S''estan obrint els fitxers {0} ..."
msgid "Opening file ''{0}'' ..."
-msgstr "Obre el fitxer ''{0}'' ..."
+msgstr "S''està obrint el fitxer ''{0}'' ..."
msgid "Open Location..."
msgstr "Obre una ubicació..."
@@ -975,7 +1019,7 @@ msgid "Download Location"
msgstr "Ubicació de descàrrega"
msgid "Download URL"
-msgstr "URL descàrrega"
+msgstr "URL de baixada"
msgid "Start downloading data"
msgstr "Comença a baixar dades"
@@ -984,14 +1028,14 @@ msgid "Close dialog and cancel downloading"
msgstr "Tanca el diàleg i cancel·la la baixada"
msgid "Download Data"
-msgstr "Descarrega dades"
+msgstr "Baixa dades"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>No es pot obrir l''URL ''{0}'' perquè no hi ha disponible cap tasca de "
-"baixada adient.</html>"
+"No ha estat possible d''obrir la URL ''{0}''<br>Les segünets tasques de "
+"descàrrega accepten els patrons d''URL que d''indiquen:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1010,28 +1054,23 @@ msgid "Orthogonalize Shape"
msgstr "Normalitza la figura"
msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr "Moure els nodes de manera que els angles siguin de 90 o de 180 graus"
+msgstr "Mou els nodes de manera que els angles siguin de 90 o de 180 graus"
msgid "Orthogonalize Shape / Undo"
msgstr "Normalitza formes / Desfà"
msgid "Undo orthogonalization for certain nodes"
-msgstr "Desfer la normalització de a certs nodes"
+msgstr "Desfà la normalització de a certs nodes"
msgid "Orthogonalize / Undo"
msgstr "Normalitza / Desfés"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalitza la figura / Desfés\n"
-"Seleccioneu els nodes que han estat desplaçats per la darrera acció "
-"d''ortogonalització!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Desfà la normalització d''una figura"
+"Normalització de la figura / Anul·lació<br>Si us plau, seleccioneu els nodes "
+"que han estat moguts per l''acció precedent de normalització!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1051,9 +1090,6 @@ msgstr "Normalitza"
msgid "Usage"
msgstr "Ús"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Elements seleccionats no poden ser ortogonalizats"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1087,7 +1123,7 @@ msgstr ""
"copiades sense els objectes incomplets?"
msgid "Paste Tags"
-msgstr "Enganxa Etiquetes"
+msgstr "Enganxa les etiquetes"
msgid "Apply tags of contents of paste buffer to all selected items."
msgstr ""
@@ -1117,13 +1153,13 @@ msgstr "Neteja..."
msgid "Forget objects but do not delete them on server when uploading."
msgstr ""
-"Ignorar els objectes en anviar però sense que siguin esborrats al servidor."
+"Ignora els objectes en enviar però sense que siguin esborrats al servidor."
msgid "Purge"
msgstr "Neteja"
msgid "Confirm Purging"
-msgstr "Confirma la neteja"
+msgstr "Confirmeu la neteja"
msgid ""
"This operation makes JOSM forget the selected objects.<br> They will be "
@@ -1175,6 +1211,15 @@ msgstr "Canvia també el nom del fitxer"
msgid "Could not rename file ''{0}''"
msgstr "No s''ha pogut canviar el nom del fitxer ''{0}''"
+msgid "Restart"
+msgstr "Reinicia"
+
+msgid "Restart the application."
+msgstr "Reinicia l''aplicació"
+
+msgid "Click to restart later."
+msgstr "Feu clic per reiniciar després"
+
msgid "Reverse way"
msgstr "Sentit contrari"
@@ -1182,19 +1227,19 @@ msgid "Reverse Ways"
msgstr "Canvia el sentit de les vies"
msgid "Reverse the direction of all selected ways."
-msgstr "Inverdeteix la direcció de totes les vies seleccionades"
+msgstr "Inverteix el sentit de totes les vies seleccionades"
msgid "Please select at least one way."
-msgstr "Si us plau, seleccioneu com a mínim una via."
+msgstr "Seleccioneu com a mínim una via."
msgid "Reverse ways"
-msgstr "Inverteix vies"
+msgstr "Inverteix les vies"
msgid "Save"
msgstr "Desa"
msgid "Save the current data."
-msgstr "Desa les ades actuals."
+msgstr "Desa les dades actuals."
msgid "File {0} exists. Overwrite?"
msgstr "El fitxer {0} ja existeix. Voleu sobreescriure''l?"
@@ -1222,16 +1267,13 @@ msgstr ""
"selecciona objectes incomplets."
msgid "Load Session"
-msgstr "Carrega sessió"
+msgstr "Carrega una sessió"
msgid "Load a session from file."
-msgstr "Carregar una sessió d''un fitxer."
-
-msgid "Session file (*.jos, *.joz)"
-msgstr "Fitxer de la sessió (*.jos, *.joz)"
+msgstr "Carrega una sessió d''un fitxer."
msgid "Open session"
-msgstr "Obre sessió"
+msgstr "Obre una sessió"
msgid "Loading session ''{0}''"
msgstr "Carregant sessió ''{0}''"
@@ -1251,7 +1293,7 @@ msgid "Save Session As..."
msgstr "Desa sessió com a..."
msgid "Save the current session to a new file."
-msgstr "Enregistrar la sessió actual en un nou fitxer."
+msgstr "Desa la sessió actual en un fitxer nou."
msgid "Session file (archive) (*.joz)"
msgstr "Fitxer de sessió (arxiu) (*.joz)"
@@ -1260,7 +1302,7 @@ msgid "Session file (*.jos)"
msgstr "Fitxer de sessió (*.jos)"
msgid "Save session"
-msgstr "Desa sessió..."
+msgstr "Desa la sessió..."
msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
@@ -1268,10 +1310,10 @@ msgstr ""
"és:<br>{1}</html>"
msgid "Save Session"
-msgstr "Desa sessió"
+msgstr "Desa la sessió"
msgid "Save As"
-msgstr "Desa com a"
+msgstr "Anomena i desa"
msgid "Layers"
msgstr "Capes"
@@ -1295,19 +1337,22 @@ msgid "Status Report"
msgstr "Informe d''estat"
msgid "Copy to clipboard and close"
-msgstr "Copia al portaretalls i tanca"
+msgstr "Copia al porta-retalls i tanca"
+
+msgid "Report bug"
+msgstr "Informa d''un error"
msgid "Close"
msgstr "Tanca"
msgid "Simplify Way"
-msgstr "Simplifica via"
+msgstr "Simplifica la via"
msgid "Delete unnecessary nodes from a way."
-msgstr "Esborra nodes innecessaris d''una via."
+msgstr "Suprimeix els nodes innecessaris d''una via."
msgid "Please select at least one way to simplify."
-msgstr "Si us plau seleccioneu una via per simplificar."
+msgstr "Seleccioneu una via per simplificar."
msgid "Yes"
msgstr "Sí"
@@ -1316,7 +1361,7 @@ msgid "Simplify all selected ways"
msgstr "Simplifica totes les vies seleccionades"
msgid "Cancel operation"
-msgstr "Abortar operacio"
+msgstr "Cancel·la l''operació"
msgid ""
"The selection contains {0} ways. Are you sure you want to simplify them all?"
@@ -1332,8 +1377,8 @@ msgstr[1] "Simplifica {0} vies"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Simplifica via (eliminar {0} node)"
-msgstr[1] "Simplifica via (eliminar {0} nodes)"
+msgstr[0] "Simplifica la via (suprimeix {0} node)"
+msgstr[1] "Simplifica la via (suprimeix {0} nodes)"
msgid "Split Way"
msgstr "Divideix la via"
@@ -1376,24 +1421,24 @@ msgid ""
"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
"middle of the way.)"
msgstr ""
-"La via no es pot dividir en els nodes seleccionats. (Consell: Selecciona "
+"La via no es pot dividir en els nodes seleccionats. (Consell: seleccioneu "
"nodes al mig de la via.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Un rol basat membre de la relació fou copiat a totes les noves "
-"vies.<br> Caldria que comprovessiu si això és correcte i fessiu les "
-"correccions quan sigui necessari.</html>"
+"Una pertinença a una relació basada al rol ha estat copiada a totes les "
+"noves vies.<br>Haurieu de comprovar-ho i fer les correccions necessàries si "
+"calgués."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Una relació de membre fou copiada a totes les noves vies.<br> Caldria "
-"que comprovessiu si això és correcte i fessiu les correccions quan sigui "
-"necessari.</html>"
+"Una pertinença a una relació ha estat copiada a totes les noves "
+"vies.<br>Haurieu de comprovar-ho i fer les correccions necessàries si "
+"calgués."
msgid "Split way {0} into {1} parts"
msgstr "Divideix la via {0} en {1} parts"
@@ -1402,7 +1447,7 @@ msgid "Toggle GPX Lines"
msgstr "Canvia les línies GPX"
msgid "Draw lines between raw gps points."
-msgstr "Dibuixar línies entre els punts GPS."
+msgstr "Dibuixa les línies entre els punts GPS."
msgid "Toggles the global setting ''{0}''."
msgstr "Canvia la configuració global ''{0}''."
@@ -1414,7 +1459,7 @@ msgid "UnGlue Ways"
msgstr "Separa les vies"
msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Duplica nodes utilitzats a diferents vies"
+msgstr "Duplica els nodes utilitzats a diferents vies"
msgid "This node is not glued to anything else."
msgstr "Aquest node no està unit a cap altre"
@@ -1429,7 +1474,7 @@ msgid "The current selection cannot be used for unglueing."
msgstr "La selecció actual no pot ser utilitzada per fer una separació"
msgid "Select either:"
-msgstr "Selecciona un altre:"
+msgstr "Seleccioneu un altre:"
msgid "* One tagged node, or"
msgstr "* Un node etiquetat, o"
@@ -1491,6 +1536,29 @@ msgstr ""
"Sou a punt de separar objectes incomplets.<br>Això pot causar problemes "
"perquè no veieu l''objecte real.<br>Segur que els voleu separar?"
+msgid "Disconnect Node from Way"
+msgstr "Desconnecta el node de la via"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Desconnecta nodes d''una via a la qual pertanyen"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Seleccioneu com a mínim un node a desconnectar."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "El node seleccionat no pot ser desconnectat de res."
+msgstr[1] "Els nodes seleccionats no poden ser desconnectats de res."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"La via afectada despareixeria un cop es desconnecti el node seleccionat."
+msgstr[1] ""
+"La via afectada despareixeria un cop es desconnectin els nodes seleccionats."
+
msgid "Undo"
msgstr "Desfés"
@@ -1504,7 +1572,7 @@ msgid "Undo {0}"
msgstr "Desfés {0}"
msgid "Unselect All"
-msgstr "Desselecciona-ho tot"
+msgstr "No seleccionis res"
msgid "Unselect all objects."
msgstr "Desselecciona tots els objectes."
@@ -1516,9 +1584,6 @@ msgid "Updates the objects in the active data layer from the server."
msgstr ""
"Actualitza els objectes de la capa activa amb el que hi ha al servidor."
-msgid "Download data"
-msgstr "Descarrega dades"
-
msgid "Update modified"
msgstr "Actualitza el modificat"
@@ -1537,7 +1602,7 @@ msgstr ""
"dades actual."
msgid "Update selection"
-msgstr "Actualitza selecció"
+msgstr "Actualitza la selecció"
msgid ""
"Updates the currently selected objects from the server (re-downloads data)"
@@ -1588,7 +1653,7 @@ msgid "Nothing to upload. Get some data first."
msgstr "No hi ha res a enviar. Abans d''enviar heu d''obtenir dades."
msgid "Upload selection"
-msgstr "Puja selecció"
+msgstr "Puja la selecció"
msgid "Upload all changes in the current selection to the OSM server."
msgstr "Puja tots els canvis de la selecció actual al servidor de l''OSM."
@@ -1630,19 +1695,19 @@ msgid "Toggle Viewport Following"
msgstr "Activa/desactiva el seguiment de la vista"
msgid "Wireframe View"
-msgstr "Vista esquemàtica"
+msgstr "Visualització esquemàtica"
msgid "Enable/disable rendering the map as wireframe only"
msgstr "Activar/desactivar la renderització del mapa en forma esquemàtica"
msgid "Toggle Wireframe view"
-msgstr "Commutar a vista esquemàtica"
+msgstr "Canvia a la visualització esquemàtica"
msgid "Zoom In"
msgstr "Apropa"
msgid "Zoom In (Keypad)"
-msgstr "Amplia (teclat)"
+msgstr "Apropa (teclat)"
msgid "Zoom Out"
msgstr "Allunya"
@@ -1714,7 +1779,7 @@ msgid "Play/Pause"
msgstr "Reprodueix/Pausa"
msgid "Play/pause audio."
-msgstr "Reprodueix/Pausar audio"
+msgstr "Reprodueix/Pausa l''àudio"
msgctxt "audio"
msgid "Previous Marker"
@@ -1722,7 +1787,7 @@ msgstr "Marcador anterior"
msgctxt "audio"
msgid "Play previous marker."
-msgstr "Reproduir el marcador anterior"
+msgstr "Reprodueix el marcador anterior"
msgctxt "audio"
msgid "Slower"
@@ -1732,15 +1797,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avança a poc a poc"
+msgid "Download GPS"
+msgstr "Descarrega GPS"
+
msgid "Downloading GPS data"
msgstr "Descarregant dades del GPS"
msgid "Downloaded GPX Data"
-msgstr "Dades GPX descarregades"
+msgstr "Dades GPX baixades"
msgid "Markers from {0}"
msgstr "Marcadors de {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Descarrega modificacions OSM comprimides"
+
+msgid "Download OSM Change"
+msgstr "Descarrega modificacions OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Descarrega OSM comprimit"
+
+msgid "Download OSM"
+msgstr "Descarregar OSM"
+
msgid "Downloading data"
msgstr "Descarregant dades"
@@ -1760,7 +1840,32 @@ msgid "Command"
msgstr "Ordre"
msgid "Request details: {0}"
-msgstr ""
+msgstr "Detalls de la petició: {0}"
+
+msgid "Download OSM URL"
+msgstr "Descarrega la URL d''OSM"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Ha hagut {0} conflicte durant la importació."
+msgstr[1] "Ha hagut {0} conflictes durant la importació."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflicte durant la descàrrega."
+msgstr[1] "Conflictes durant la descàrrega."
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Carregant parents del node {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Carregant parents de la via {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Carregant parents de la relació {2}"
+
+msgid "Download session"
+msgstr "Descarrega sessió"
msgid "Download {0} of {1} ({2} left)"
msgstr "Baixa {0} de {1} (manquen {2})"
@@ -1824,25 +1929,6 @@ msgstr "Els errors següents han aparegut durant la descàrrega massiva: {0}"
msgid "Errors during download"
msgstr "Errors durant la descàrrega"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Ha hagut {0} conflicte durant la importació."
-msgstr[1] "Ha hagut {0} conflictes durant la importació."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflicte durant la descàrrega."
-msgstr[1] "Conflictes durant la descàrrega."
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Carregant parents del node {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Carregant parents de la via {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Carregant parents de la relació {2}"
-
msgid "Error during download"
msgstr "Error durant la descàrrega"
@@ -1876,7 +1962,7 @@ msgid "Backspace in Add mode"
msgstr "Retrocés en mode d''afegir"
msgid "helper line"
-msgstr ""
+msgstr "línia d''ajuda"
msgid "Cannot add a node outside of the world."
msgstr "No és possible afegir un node fora del món."
@@ -1897,18 +1983,18 @@ msgid "Add node into way and connect"
msgstr "Afegeix un node a una via i connectar-lo"
msgid "Create new node."
-msgstr "Crea nou node."
+msgstr "Crea un node nou."
msgid "Select node under cursor."
-msgstr "Seleccionar un node sota el cursor"
+msgstr "Selecciona el node sota el cursor"
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Inserir un node a una via."
-msgstr[1] "Inserir un node a {0} vies."
+msgstr[0] "Insereix un node a una via."
+msgstr[1] "Insereix un node a {0} vies."
msgid "Start new way from last node."
-msgstr "Començar una nova via a partir del darrer node."
+msgstr "Comença una via nova a partir del darrer node."
msgid "Continue way from last node."
msgstr "Continua la via des del darrer node."
@@ -1932,13 +2018,13 @@ msgid "Toggle snapping by {0}"
msgstr "Commuta la discretització amb {0}"
msgid "Show helper geometry"
-msgstr "Mostrar l''assistent de geometria"
+msgstr "Mostra l''assistent de geometria"
msgid "Snap to node projections"
msgstr "Ajusta a les projeccions dels nodes"
msgid "Disable"
-msgstr "Deshabilita"
+msgstr "Desactiva"
msgid "0,90,..."
msgstr "0,90,..."
@@ -1981,7 +2067,7 @@ msgstr ""
"clic per a afegir un nou node."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Extrudeix: línia primcipal"
msgid "Extrude: helper line"
msgstr "Extrueix: línia d''ajuda"
@@ -1990,11 +2076,14 @@ msgid "Extrude Way"
msgstr "Extreu una via"
msgid "Improve Way Accuracy"
-msgstr "Millorar la precisió de les vies"
+msgstr "Millora la precisió de les vies"
msgid "Improve Way Accuracy mode"
msgstr "Mode de millora de la precisió de les vies"
+msgid "improve way accuracy helper line"
+msgstr "línia d''ajuda per a millorar l''exactitud de la via"
+
msgid "Click on the way to start improving its shape."
msgstr "Feu clic sobre la via per començar a millorar la seva forma."
@@ -2025,10 +2114,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "No és possible de posar un node fora del Món."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Afegeix un node a una via"
-msgstr[1] "Afegeix un node a {0} vies"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Afegeix un nou node a la via"
+msgstr[1] "Afegeix un nou node a {0} vies"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "No es pot esborrar un node que fa referència a múltiples objectes"
@@ -2042,6 +2131,9 @@ msgstr "Paral·lel"
msgid "Make parallel copies of ways"
msgstr "Fer una còpia paral·lela de les vies"
+msgid "make parallel helper line"
+msgstr "fes una línia d''ajuda paral·lela"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2084,18 +2176,18 @@ msgid "Move elements"
msgstr "Mou elements"
msgid "Move them"
-msgstr "Moure''ls"
+msgstr "Mou-los"
msgid "Undo move"
-msgstr "Desfés moviment"
+msgstr "Desfés el moviment"
msgid ""
"You moved more than {0} elements. Moving a large number of elements is often "
"an error.\n"
"Really move them?"
msgstr ""
-"Heu mogut més de {0} elements. Movent un gran nombre d''elements sovint "
-"causa un error.\n"
+"Heu mogut més de {0} elements. Moure un gran nombre d''elements sovint causa "
+"un error.\n"
"Segur que els voleu moure?"
msgid "Release the mouse button to select the objects in the rectangle."
@@ -2219,10 +2311,10 @@ msgid "<xor>"
msgstr "<oex>"
msgid "<left parent>"
-msgstr ""
+msgstr "<parent esquerre>"
msgid "<right parent>"
-msgstr ""
+msgstr "<parent dret>"
msgid "<colon>"
msgstr "<punt>"
@@ -2258,7 +2350,7 @@ msgid "Enter the search expression"
msgstr "Introduïu l''expressió de cerca"
msgid "replace selection"
-msgstr "reemplaça selecció"
+msgstr "reemplaça la selecció"
msgid "add to selection"
msgstr "afegeix a la selecció"
@@ -2276,7 +2368,7 @@ msgid "all objects"
msgstr "tots els objectes"
msgid "Also include incomplete and deleted objects in search."
-msgstr "Incloure a la cerca els objectes incomplets i els esborrats."
+msgstr "Inclou a la cerca els objectes incomplets i els esborrats."
msgid "regular expression"
msgstr "expressió regular"
@@ -2291,7 +2383,7 @@ msgid "Search"
msgstr "Cerca"
msgid "Submit filter"
-msgstr "Envia filtre"
+msgstr "Envia el filtre"
msgid "Start Search"
msgstr "Inicia la cerca"
@@ -2507,6 +2599,10 @@ msgstr "''valor'' a qualsevol clau"
msgid "matches if ''key'' exists"
msgstr "s''acompleix si la ''clau'' existeix"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+"es correspon si \"key\" és més gran que \"value\" (anàleg a menor que)"
+
msgid "combinators"
msgstr "combinadors"
@@ -2544,7 +2640,7 @@ msgid "all closed ways"
msgstr "totes les vies tancades"
msgid "object without useful tags"
-msgstr ""
+msgstr "objecte sense dades útils"
msgid "metadata"
msgstr "metadada"
@@ -2680,14 +2776,14 @@ msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
"Esperant <i>mín</i>/<i>màx</i> després de ''timestamp'' (data i hora)"
-msgid "Primitive id expected"
-msgstr "S''esperava l''ID de l''objecte"
+msgid "Range of primitive ids expected"
+msgstr "Interval d''identificadors de primietives esperat"
-msgid "Changeset id expected"
-msgstr "S''esperava l''ID del conjunt de canvis"
+msgid "Range of changeset ids expected"
+msgstr "Interval d''identificadors de conjunts de canvis esperat"
-msgid "Version expected"
-msgstr "Versió esperada"
+msgid "Range of versions expected"
+msgstr "Interval de versions esperades"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2698,6 +2794,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Tipus d''objecte desconegut: {0}. Els valors admesos són node, via o relació."
+msgid "Primitive id expected"
+msgstr "S''esperava l''ID de l''objecte"
+
msgid "Range of numbers expected"
msgstr "Sèrie de nombres esperats"
@@ -2716,11 +2815,10 @@ msgstr "Manca un paràmetre per l''XOR"
msgid "Missing operator for NOT"
msgstr "Manca l''operador per al NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Avís: truncament automàtic del valor de l''atribut ''{0}'' de l''objecte "
-"suprimit {1}"
+"Truncament automàtic del valor de l''etiqueta \"{0}\" de l''objecte suprimit "
+"{1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2813,6 +2911,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Afegit {0} objecte"
msgstr[1] "Afegits {0} objectes"
+msgid "New way {0} has 0 nodes"
+msgstr "La nova via {0} no té cap node"
+
msgid "Change node {0}"
msgstr "Canvia node {0}"
@@ -2849,11 +2950,11 @@ msgstr "Suprimir \"{0}\" de {1} objectes"
msgid "Set {0}={1} for {2} objects"
msgstr "Definir {0}={1} per a {2} objectes"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "{0} propietats suprimides de {1} objectes"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "{0} etiquetes han estat suprimides per {1} objectes"
-msgid "Set {0} properties for {1} objects"
-msgstr "Definir {0} propietats per a {1} objectes"
+msgid "Set {0} tags for {1} objects"
+msgstr "{0} etiquetes han estat establertes per {1} objectes"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Reemplaçar \"{0}\" per \"{1}\" per"
@@ -2877,11 +2978,11 @@ msgid "Double conflict"
msgstr "Conflicte doble"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Avís: la capa ''{0}'' ja no existeix. No és possible d''eliminar el "
-"conflicte amb l''objecte ''{1}''."
+"La capa ''{0}'' ja no existeix. No és possible de suprimir el conflicte per "
+"l''objecte ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Afegeix un conflicte per ''{0}''"
@@ -2999,6 +3100,9 @@ msgstr[1] "{0} objectes eliminats"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resoldre els conflictes de la llista de membres de la relació {0}"
+msgid "Removed nodes from {0}"
+msgstr "Nodes suprimits de {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotar {0} node"
@@ -3053,17 +3157,25 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
+"<html>Sou a punt d''invertir la via ''{0}'',<br/> però el significat "
+"semàntic d''aquesta etiqueta ''{1}'' és definit per la seva "
+"direcció.<br/>Segur que voleu canviar la direcció de la via i al mateix "
+"temps canviar el seu significat semàntic?</html>"
msgstr[1] ""
+"<html>Sou a punt d''invertir la via ''{0}'',<br/> però el significat "
+"semàntic d''aquestes etiquetes ''{1}'' és definit per la seva "
+"direcció.<br/>Segur que voleu canviar la direcció de la via i al mateix "
+"temps canviar el significat semàntic?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Canvia el sentit de la vía."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Si revertiu el sentit d''aquesta via, suggerim fer també els següents canvis "
-"a les propietats de la via per tal de mantenir la consistència de les dades."
+"Quan a la reversió d''aquesta via, hom suggereix els següents canvis per tal "
+"de conservar la consistència de les dades."
msgid "Relation"
msgstr "Relació"
@@ -3092,12 +3204,11 @@ msgstr "Aplicar els canvis seleccionats"
msgid "Do not apply changes"
msgstr "No aplicar els canvis"
-msgid "Please select which property changes you want to apply."
-msgstr ""
-"Si us plau, seleccioneu quines modificacions de propietats voleu aplicar."
+msgid "Please select which changes you want to apply."
+msgstr "Si us plau, seleccioneu els canvis que voleu aplicar."
-msgid "Properties of "
-msgstr "Propietats de "
+msgid "Tags of "
+msgstr "Etiquetes de "
msgid "Roles in relations referring to"
msgstr "Els rols referits a les relacions"
@@ -3121,6 +3232,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "No és possible de suprimir l''antiga còpia de seguretat {0}"
+msgid "Your work has been saved automatically."
+msgstr "S''ha fet una còpia de seguretat automàtica de la vostra feina."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
"Error mentre es creava una còpia de seguretat de la capa suprimida: {0}"
@@ -3155,21 +3269,21 @@ msgstr ""
"però en aquest moment no es coneix el seu valor predefinit<br/> Si us plau, "
"activeu manualment la funció corresponent i torneu a importar una altre cop."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Avís: ha fallat la creació del directori de memòria cau mancant: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Ha fallat la creació del directori mancant per la memòria cau: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Ha fallat la creació del directori de memòria cau: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Avís: ha fallat fer persistents les preferències a ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Ha fallat la persistència de les preferències sobre \"{0}\""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Avís: Ha fallat la inicialització de les preferències. El directori de les "
-"preferències ''{0}'' no és un directori"
+"Ha fallat la inicialització de les preferències. El directori de les "
+"preferències ''{0}'' no és un directori."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3179,11 +3293,11 @@ msgstr ""
"les preferències ''{0}'' no és un directori.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Avís: Ha fallat la inicialització de les preferències. Ha fallat la creació "
-"del directori de preferències que manca: {0}"
+"Ha fallat la inicialització de les preferències. Ha fallat la creació del "
+"directori de preferències mancants: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3192,18 +3306,16 @@ msgstr ""
"<html>Ha fallat la inicialització de les preferències. <br>Ha fallat la "
"creació del directori de preferències que manca: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Informació: manca el fitxer de preferències ''{0}''. Creant un fitxer "
-"predeterminat."
+"Manca el fitxer de les preferències ''{0}''. Creant un fitxer predefinit de "
+"preferències."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Avís: Reemplaçant el fitxer de preferències existent ''{0}'' amb el fitxer "
-"predeterminat."
+"Reemplaçant el fitxer de les prreferències existent ''{0}'' amb el fitxer de "
+"preferències predefinit."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3221,11 +3333,11 @@ msgstr ""
"preferències predeterminat.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Avís: Ha fallat la inicialització de les preferències. Error en inicialitzar "
-"el fitxer amb els valors predeterminats: {0}"
+"Ha fallat la inicialització de les preferències. Ha fallat la inicialització "
+"del fitxer de preferències amb els valors predefinits: {0}"
msgid "Paint style {0}: {1}"
msgstr "Model de renderització {0}: {1}"
@@ -3254,14 +3366,13 @@ msgstr "El recurs ''{0}'' no ha pogut ser carregat. Error: {1}"
msgid "UNKNOWN"
msgstr "Desconegut"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Avís: s''ha trobat un nombre de versió de JOSM inesperat al fitxer de "
-"revisions, el seu valor és ''{0}''"
+"Número inesperat de la versió de JOSM al fitxer de revisió, el valor és "
+"''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Avís: manca el fitxer de revisió \"/REVISIO\"."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Manca el fitxer de revisió ''/REVISION''."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Ja ha estat enregistrat un conflicte per l''objecte ''{0}''"
@@ -3433,11 +3544,10 @@ msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
"El paràmetre {0} no te un valor entre 0 i {1}. El seu valor és ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Error: ha fallat la càrrega de la classe de rederització ''{0}''. No s''ha "
-"trobat la classe."
+"Ha fallat la càrrega de la classe de renderització de mapes ''{0}''. La "
+"classe no ha estat trobada."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3552,8 +3662,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Identificador del datum desconegut: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum requerit (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Datum requerit (+datum=*, +towgs84=* o +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3574,6 +3684,9 @@ msgstr ""
"El nombre d''arguments del paràmetre ''+bounds'' no és l''esperat (ha de ser "
"4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Paràmetre ''{0}'' desconegut"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Nombre esperat d''arguments per al paràmetre ''{0}''"
@@ -3594,10 +3707,6 @@ msgstr "Projecció personalitzada"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Error: ha fallat l''obertura del flux d''entrada pel recurs ''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3638,6 +3747,9 @@ msgstr "altres validacions"
msgid "Running test {0}"
msgstr "Test {0} en execució"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "El test ''{0}'' ha estat completat en {1}"
+
msgid "Addresses"
msgstr "Adreces"
@@ -3653,7 +3765,7 @@ msgid "House number without street"
msgstr "Número sense carrer"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Número de portal ''{0}'' duplicat"
msgid "Duplicate house numbers"
msgstr "Nombres de carrer duplicats"
@@ -3664,6 +3776,15 @@ msgstr "Varis noms de carrer a la relació"
msgid "House number too far from street"
msgstr "El nombre és massa lluny del carrer"
+msgid "Barriers and entrances"
+msgstr "Barreres i entrades"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Recerca d''errors a barreres i entrades"
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "L''entrada de barrera no és sobre una barrera."
+
msgid "Building inside building"
msgstr "Contrucció a l''interior d''una altra"
@@ -3726,6 +3847,9 @@ msgstr " o "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} és obsolet, utilitzeu {1} en el seu lloc"
+msgid "{0} is unnecessary"
+msgstr "{0} no és necessari"
+
msgid "Duplicated nodes"
msgstr "Nodes duplicats"
@@ -3733,9 +3857,6 @@ msgid "This test checks that there are no nodes at the very same location."
msgstr ""
"Aquest test comprova si hi ha nodes diferents que són a la mateixa posició."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Nodes duplicats a dues vies no tancades"
-
msgid "Mixed type duplicated nodes"
msgstr "Nodes duplicats de diferents tipus"
@@ -3807,6 +3928,24 @@ msgstr "Nodes de via duplicats"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Cerca si hi ha vies amb nodes consecutius idèntics"
+msgid "Highways"
+msgstr "Vies"
+
+msgid "Performs semantic checks on highways."
+msgstr "Fa una comprovació semàntica de les vies."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Rotonda incorrecta (via: {0} en comptes de {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Manca informació sobre l''encreuament de vies per a vianants"
+
+msgid "Unknown country code: {0}"
+msgstr "Codi d''estat desconegut: {0}"
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr "Font desconeguda:context de velocitat màxima: {0}"
+
msgid "Multipolygon"
msgstr "Multipolígon"
@@ -3880,6 +4019,14 @@ msgstr "Nodes amb el mateix nom"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Aquest test cerca nodes amb el mateix nom (podrien estar duplicats)."
+msgid "Opening hours syntax"
+msgstr "Sintaxi d''horari d''obertura"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+"Aquest test verifica la utilització correcta de la sintaxi de les hores "
+"d''obertura"
+
msgid "Overlapping Areas"
msgstr "Zones o superfícies superposades"
@@ -3943,15 +4090,15 @@ msgstr "El tipus de relació no és conegut"
msgid "Relation is empty"
msgstr "La relació és buida"
+msgid "Role verification problem"
+msgstr "Problema de verificació del rol"
+
msgid "<empty>"
msgstr "<buit>"
msgid "Role {0} missing"
msgstr "Manca rol {0}"
-msgid "Role verification problem"
-msgstr "Problema de verificació del rol"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Un nombre de {0} rols és massa petit ({1})"
@@ -3983,11 +4130,13 @@ msgstr ""
"Aquest test comprova si hi ha vies que tenen un nom similar i es podria "
"tractar d''un error d''ortografia"
-msgid "Properties checker :"
-msgstr "Verificador de propietats:"
+msgid "Tag checker"
+msgstr "Verificador d''etiquetes"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Aquest test comprova si hi ha errors a les claus i els valors"
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
+"Aquest test verifica si hi ha errors a les claus o als valors de les "
+"etiquetes."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Línia no vàlida al comprovador d''etiquetes - {0}: {1}"
@@ -4132,8 +4281,8 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Utilitzar el fitxer de comprovació d''ortografia de defecte (recomanat)."
-msgid "Fix properties"
-msgstr "Corregit les propietats"
+msgid "Fix tags"
+msgstr "Correcció d''etiquetes"
msgid "Could not find element type"
msgstr "No s''ha pogut trobar el tipus d''element"
@@ -4208,6 +4357,9 @@ msgid "This tests if ways which should be circular are closed."
msgstr ""
"Aquest test comprova si les vies que han de ser circulars són tancades"
+msgid "Unclosed way"
+msgstr "Via sense tancar"
+
msgid "natural type {0}"
msgstr "tipus d''element natural {0}"
@@ -4238,9 +4390,6 @@ msgstr "edifici"
msgid "area"
msgstr "àrea"
-msgid "Unclosed way"
-msgstr "Via sense tancar"
-
msgid "Unconnected ways"
msgstr "Vies sense connexió"
@@ -4267,12 +4416,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Aquest test cerca nodes sense etiquetes i que no són part de cap via."
-msgid "No tags"
-msgstr "Cap etiqueta"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nodes no connectats sense etiquetes físiques"
+msgid "No tags"
+msgstr "Cap etiqueta"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Te una etiqueta amb ''fixme'' o ''FIXME''"
@@ -4335,26 +4484,6 @@ msgstr "Línia de costa invertida: la terra no és al costat esquerre"
msgid "Reversed land: land not on left side"
msgstr "Terra invertida: la terra no és al costat esquerrre"
-msgid "Wrong number of arguments for bookmark"
-msgstr "El nombre d''aruments no és correcte pel favorit"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Error llegint entrada de favorits: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Error: Línia ''{0}'' no esperada al fitxer de favorits ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Valor duplicat ''{0}'' incorrecte a la línia ''{1}'' al fitxer de "
-"favorits ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>No es poden llegir els favorits de<br>''{0}''<br>Error: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "No tornar a mostrar (recordar selecció)"
@@ -4458,8 +4587,8 @@ msgstr "Mostrar ajuda"
msgid "Downloading \"Message of the day\""
msgstr "Baixant el \"Missatge del dia\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Avís: ha fallat la lectura de MOTD. L''excepció ha estat: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Ha fallat la lectura de MOTD. L''excepció ha estat: {0}"
msgid "Message of the day not available"
msgstr "El missatge del dia no és a l''abast del sistema"
@@ -4468,7 +4597,7 @@ msgid "Click to close the dialog"
msgstr "Feu clic per tancar la finestra de diàleg"
msgid "Imagery offset"
-msgstr "Decalatge de l''imatgeria"
+msgstr "Decalatge de la imatgeria"
msgid "Imagery"
msgstr "Imatgeria"
@@ -4671,9 +4800,24 @@ msgstr "Visualitza"
msgid "Tools"
msgstr "Eines"
+msgid "More tools"
+msgstr "Més eines"
+
+msgid "Data"
+msgstr "Dades"
+
+msgid "Selection"
+msgstr "Selecció"
+
msgid "Presets"
msgstr "Predefinicions"
+msgid "More..."
+msgstr "Més ..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Finestres"
@@ -4690,11 +4834,25 @@ msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
"Activa la visibilitat de la barra d''eines d''edició (p.ex. barra vertical)"
+msgid "Preset preferences"
+msgstr "preferències preestablertes"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+"Feu clic per obrir la pestanya d''etiquetes preconfigurades a les "
+"preferències"
+
+msgid "Imagery preferences"
+msgstr "Preferències de la imatgeria"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Feu clic per obrir la pestanya de la imatgeria a les preferències"
+
msgid "Audio"
msgstr "Àudio"
-msgid "Hide edit toolbar"
-msgstr "Amaga la barra d''eines d''edició"
+msgid "Do not hide toolbar"
+msgstr "No amagis la barra d''eines"
msgid "Hide this button"
msgstr "Ocultar aquest botó"
@@ -4702,6 +4860,9 @@ msgstr "Ocultar aquest botó"
msgid "Click the arrow at the bottom to show it again."
msgstr "Feu clic sobre la part inferior de la fletxa per tornar-ho a mostrar"
+msgid "Hide edit toolbar"
+msgstr "Amaga la barra d''eines d''edició"
+
msgid "Hide or show this toggle button"
msgstr "Amaga o mostra aquest botó"
@@ -4764,6 +4925,9 @@ msgstr "(cap objecte)"
msgid "User:"
msgstr "Nom d''usuari:"
+msgid "Do not hide status bar"
+msgstr "No amagis la barra d''eines"
+
msgid "Layer not in list."
msgstr "La capa no és a la llista."
@@ -4791,22 +4955,6 @@ msgstr "En segon pla"
msgid "Click to run job in background"
msgstr "Feu clic per llançar la tasca en segon pla"
-msgid "false: the property is explicitly switched off"
-msgstr "fals: la propietat ha estat deshabilitada expressament"
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-"cert: la propietat ha estat habilitada expressament<html>Please confirm to "
-"remove <strong>1 object</strong> from <strong>1 relation</strong>.</html>"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parcial: els objectes seleccionats tenen diferents propietats, no ho canvieu"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "no definit: no aplicar aquesta propietat als objectes seleccionats"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -5123,6 +5271,9 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Copiar els elements seleccionats al final de la llista combinada d''elements"
+msgid "> before"
+msgstr "> abans"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5130,6 +5281,9 @@ msgstr ""
"Copiar els elements seleccionats abans del primer element seleccionat a la "
"llista combinada d''elements"
+msgid "> after"
+msgstr "> després"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5137,14 +5291,23 @@ msgstr ""
"Copiar els elements selecionats després del primer element seleccionat a la "
"llista combinada d''elements."
+msgid "< top"
+msgstr "< a dalt"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "Copiar els seus elements a l''inici de la llista fusionada"
+msgid "< bottom"
+msgstr "< a sota"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "Copiar els seus elements al final de la llista fusionada"
+msgid "< before"
+msgstr "< abans"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5152,6 +5315,9 @@ msgstr ""
"Copiar els seus elements seleccionats abans del primer node seleccionat de "
"la llista fusionada"
+msgid "< after"
+msgstr "< després"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5168,8 +5334,8 @@ msgstr "Copia tots els seus nodes a la versió fusionada"
msgid "Up"
msgstr "Amunt"
-msgid "Move up the selected elements by one position."
-msgstr "Moure amunt una posició els elements seleccionats"
+msgid "Move up the selected entries by one position."
+msgstr "Mou amunt una posició els elements seleccionats"
msgid "Down"
msgstr "Avall"
@@ -5225,16 +5391,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "La seva versió ({0} entrada)"
msgstr[1] "La seva versió ({0} entrades)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Ajustament {0} encara no enregistrat. No es pot establir la particiapació a "
-"l''ajustament sincronitzat."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Ajustament {0} encara no enregistrat."
-
msgid "Node"
msgstr "Node"
@@ -5515,18 +5671,18 @@ msgctxt "tag"
msgid "Key:"
msgstr "Clau:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Entreu una clau per l''etiqueta, p.ex. "
+"<html>Escriu la clau de l'etiqueta, per exemple "
"<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valor:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Entreu un valor d''etiqueta, p. ex. <strong><tt>check "
+"<html>Escriu el valor de l'etiqueta, per exemple <strong><tt>check "
"members</tt></strong></html>"
msgid ""
@@ -5642,12 +5798,14 @@ msgstr ""
"esborrats)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Seleccioneu un nivell d''ampliació"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Selecciona els objectes que són part d''aquesta comanda (excepte si han "
+"estat suprimits) i fa una apliaciço de la zona on es troben"
msgid "Undo the selected and all later commands"
msgstr "Desfer la comanda seleccionada i totes les següents"
@@ -6117,6 +6275,9 @@ msgstr "Mostra/Amaga"
msgid "Information about layer"
msgstr "Informació sobre la capa"
+msgid "Map paint preferences"
+msgstr "Preferències de dibuix del mapa"
+
msgid "Map Paint Styles"
msgstr "Estils d''acoloriment de mapes"
@@ -6200,8 +6361,40 @@ msgstr "Està actiu l''estil?"
msgid "No"
msgstr "No"
-msgid "Relations"
-msgstr "Relacions"
+msgid "Object type:"
+msgstr "Tipus d''objecte:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "barrejat"
+
+msgid "Choose the OSM object type"
+msgstr "Seleccioneu el tipus d''objecte OSM"
+
+msgid "Object ID:"
+msgstr "ID d''objecte"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Indiqueu l''ID de l''objecte a baixar"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Els ID dels objectes poden ser separats per comes o per espais.<br/> "
+"Exemples: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En mode mixt, "
+"especifiqueu els objectes d''aquesta manera: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"S''ha especificat un ID de llista invàlid\n"
+"No es pot continuar."
+
+msgid "Relations"
+msgstr "Relacions"
msgid "Open a list of all relations."
msgstr "Obre una llista amb totes les relacions."
@@ -6221,9 +6414,6 @@ msgstr "Relacions: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relacions: {0}"
-msgid "Selection"
-msgstr "Selecció"
-
msgid "Open a selection list window."
msgstr "Obre la finestra de la llista de relacions"
@@ -6248,18 +6438,6 @@ msgstr "Ara no és seleccionable"
msgid "Selection: {0}"
msgstr "Selecció: {0}"
-msgid "Side buttons"
-msgstr "Botons laterals"
-
-msgid "Always shown"
-msgstr "Mostra-ho sempre"
-
-msgid "Dynamic"
-msgstr "Dinàmic"
-
-msgid "Always hidden"
-msgstr "Sempre amagat"
-
msgid "Toggle dynamic buttons"
msgstr "Commuta botons dinàmics"
@@ -6278,6 +6456,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Feu clic per a minimitzar/maximitzar el contingut del pannell"
+msgid "Side buttons"
+msgstr "Botons laterals"
+
+msgid "Always shown"
+msgstr "Mostra-ho sempre"
+
+msgid "Dynamic"
+msgstr "Dinàmic"
+
+msgid "Always hidden"
+msgstr "Sempre amagat"
+
msgid "Authors"
msgstr "Autors/es"
@@ -6296,11 +6486,10 @@ msgstr "Seleccionar els objectes d''aquest usuari"
msgid "Launches a browser with information about the user"
msgstr "Obre un navegador web amb informació sobre l''usuari"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Avís: només s''està mostrant informació al navegador del primer {0} dels {1} "
-"usuaris seleccionats"
+"Només es mostrarà informació al navegador per {0} dels {1} usuaris "
+"seleccionats"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6327,9 +6516,6 @@ msgstr "Obre la finestra de validació"
msgid "Validation results"
msgstr "Resultat de la validació"
-msgid "Zoom to problem"
-msgstr "Ampliar la zona del problema"
-
msgid "Fix"
msgstr "Arregla"
@@ -6483,9 +6669,6 @@ msgid "Update the changeset content from the OSM server"
msgstr ""
"Actualitzar el contingut del conjunt de canvis amb dades del servidor OSM"
-msgid "Show history"
-msgstr "Mostra l''historial"
-
msgid "Download and show the history of the selected objects"
msgstr "Descarregar i mostrar l''historial de l''objecte seleccionat"
@@ -6825,11 +7008,11 @@ msgstr ""
"<html>Descarregar els conjunts de canvis de la vista actual del mapa</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Avís: valor inesperat per la preferència ''{0}'', hi ha ''{1}''. "
-"Reinicialitzant amb la la consulta per defecte"
+"Valor inesperat per la preferència ''{0}'', s''ha obtingut ''{1}''. "
+"Reinicialitzant am la consulta predefinida."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6874,7 +7057,7 @@ msgid "Querying and downloading changesets"
msgstr "Consultant i descarregant conjunts de canvis"
msgid "Determine user id for current user..."
-msgstr "Determinar l''ID dde l''usuari actual..."
+msgstr "Determinar l''ID de l''usuari actual..."
msgid "Query and download changesets ..."
msgstr "Consultar i descarregar conjunts de canvis ..."
@@ -6901,35 +7084,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Aquesta URL de consulta de conjunts de canvis no és vàlida"
-msgid "Select objects for which to change properties."
-msgstr "Seleccionar objectes per canviar les seves propietats"
+msgid "Discardable key: selection Foreground"
+msgstr "Clau descartable: selecció en primer pla"
+
+msgid "Discardable key: selection Background"
+msgstr "Clau descartable: selecció en el fons"
-msgid "Properties/Memberships"
-msgstr "Propietats/Membres"
+msgid "Discardable key: foreground"
+msgstr "Clau descartable: selecció en primer pla"
-msgid "Properties for selected objects."
-msgstr "Propietats dels objectes seleccionats"
+msgid "Discardable key: background"
+msgstr "Clau descartable: selecció en el fons"
msgid "<different>"
msgstr "<diferent>"
+msgid "Select objects for which to change tags."
+msgstr "Seleccioneu els objectes del quals voleu modificar les etiquetes"
+
+msgid "Tags/Memberships"
+msgstr "Etiquetes/Pertinença"
+
+msgid "Tags for selected objects."
+msgstr "Etiquetes pels objectes seleccionats"
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr "Posició"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propietats: {0} / Membres: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Etiquetes: {0} / Pertinença: {1}"
-msgid "Properties / Memberships"
-msgstr "Propietats / Membres"
+msgid "Tags / Memberships"
+msgstr "Etiquetes / Pertinença"
msgid "Delete the selected key in all objects"
msgstr "Suprimir la clau seleccionada a tots els objectes"
-msgid "Delete Properties"
-msgstr "Suprimir propietats"
+msgid "Delete Tags"
+msgstr "Suprimeix les etiquetes"
msgid "Change relation"
msgstr "Canviar la relació"
@@ -6943,14 +7138,14 @@ msgstr "Segur que voleu suprimir la selecció de la relació {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Afegeix un nou parell clau/valor a tots els objectes"
-msgid "Add Property"
-msgstr "Afegeir una propietat"
+msgid "Add Tag"
+msgstr "Afegeix etiqueta"
msgid "Edit the value of the selected key for all objects"
msgstr "Editar el valor de la clau seleccionada per a tots els objectes"
-msgid "Edit Properties"
-msgstr "Editar les propietats"
+msgid "Edit Tags"
+msgstr "Modifica les etiquetes"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Anar al wiki OSM per obtenir ajuda (F1)"
@@ -6960,10 +7155,10 @@ msgstr ""
"Obre la pàgina wiki d''ajuda de l''objecte seleccionat a un navegador web"
msgid "Paste Value"
-msgstr ""
+msgstr "Enganxa el valor"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "Enganxa del porta-retalls el valor de l''etiqueta seleccionada"
msgid "Copy Value"
msgstr "Copia el valor"
@@ -7032,13 +7227,7 @@ msgstr[0] "Canviar les propietats de {0} objecte"
msgstr[1] "Canviar les propietats de {0} objectes"
msgid "Use English language for tag by default"
-msgstr ""
-
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
+msgstr "Usa l''anglès per etiquetar de forma predeterminada"
msgid "Add value?"
msgstr "Afegir el valor?"
@@ -7055,23 +7244,31 @@ msgid "Please select a value"
msgstr "Si us plau seleccioneu un valor"
msgid "Set number of recently added tags"
-msgstr ""
+msgstr "Estableix el nombre de les etiquetes afegides recentment"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Recorda les últimes etiquetes usades"
msgid "Please enter the number of recently added tags to display"
msgstr ""
+"Si us plau, establiu el nombre de les etiquetes recentment afegides a "
+"visualitzar"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "Instroduïu un nombre enter entre 0 i {0}"
msgid "Recently added tags"
msgstr "Etiquetes afegides recentment"
+msgid "Choose recent tag {0}"
+msgstr "Escolliu una etiqueta recent {0}"
+
msgid "Use this tag again"
msgstr "Utilitza aquesta etiqueta un altre cop"
+msgid "Apply recent tag {0}"
+msgstr "Aplica una etiqueta recent {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "La clau ''{0}'' ja ha estat utilitzada"
@@ -7113,9 +7310,9 @@ msgstr "La relació està suprimida"
msgid "Downloading relation {0}"
msgstr "Descarregant relació {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Avís: Ignorant l''excepció perquè la tasca fou anulada. Excepció: {0}"
+"Ignorant l''excepció a causa de l''anul·lació de la tasca. Excepció: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7178,6 +7375,11 @@ msgstr "Suprimir-les, netejar la relació"
msgid "Ignore them, leave relation as is"
msgstr "Ignorar-les, deixar la relació com està"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Ho sentim, la drecera \"{0}\" no pot ser activada a la finestra de "
+"modificació de relacions"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7462,6 +7664,28 @@ msgstr ""
"la via no està connectada ni a un membre anterior ni a un membre posterior "
"de la relació"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "El nombre d''aruments no és correcte pel favorit"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Error llegint entrada de favorits: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Línia ''{0}'' inesperada al fitxer de preferits ''{1}'"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Valor doble no vàlid \"{0}\" a la línia \"{1}\" del fitxer de preferits "
+"''{2}'"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>No es poden llegir els favorits de<br>''{0}''<br>Error: {1}</html>"
+
msgid "Bookmarks"
msgstr "Favorits"
@@ -7533,9 +7757,6 @@ msgstr "La latitud ha d''estar compresa entre -90 i 90 graus."
msgid "Value for longitude in range [-180,180] required."
msgstr "La laongitud ha d''estar compresa entre -180 i 180 graus."
-msgid "Paste URL from clipboard"
-msgstr "Copiar l''adreça del portaretalls"
-
msgid "Data Sources and Types:"
msgstr "Tipus i fonts de dades:"
@@ -7616,21 +7837,8 @@ msgstr "Baixa les referències (relacions de parentiu)"
msgid "Download object"
msgstr "Baixa l''objecte"
-msgid "Object type:"
-msgstr "Tipus d''objecte:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "barrejat"
-
-msgid "Choose the OSM object type"
-msgstr "Seleccioneu el tipus d''objecte OSM"
-
-msgid "Object ID:"
-msgstr "ID d''objecte"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Indiqueu l''ID de l''objecte a baixar"
+msgid "Start downloading"
+msgstr "Inicia la baixada"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7643,28 +7851,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Indiqueu si els membres de la relació també han de ser descarregats"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Els ID dels objectes poden ser separats per comes o per espais.<br/> "
-"Exemples: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En mode mixt, "
-"especifiqueu els objectes d''aquesta manera: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Baixa lesrelacions (relacions de parentiu i vies)"
-msgid "Start downloading"
-msgstr "Inicia la baixada"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"L''ID especificat no és vàlid\n"
-"L''objecte no pot ser descarregat."
-
msgid "Class Type"
msgstr "Classe"
@@ -7777,9 +7966,8 @@ msgstr "Vés a la pàgina següent"
msgid "Go to the JOSM help home page"
msgstr "Va a la pàgina incial d''ajuda de JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
-"Avís: localització incorrecta al document HTML. La excepció ha estat: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Posició incorrecta al document HTML. L''excepció ha estat: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "No s''ha pogut obrir la pàgina d''ajuda. La URL és buida."
@@ -7890,6 +8078,9 @@ msgstr ""
"<html>La versió <strong>{0}</strong> ha estat creada a "
"<strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Comentari del conjunt de canvis"
+
msgid "Changeset info"
msgstr "Informació del conjunt de canvis"
@@ -8000,10 +8191,8 @@ msgstr ""
msgid "Object still in use"
msgstr "L''objecte ja és en ús"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Avís: la capálera d''error ''{0}'' no es correspon amb cap dels patrons "
-"esperats"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "La capçalera d''error \"{0}\" no es correspon amb el patró esperat."
msgid "Upload"
msgstr "Puja"
@@ -8025,6 +8214,12 @@ msgstr "Afegiu un comentari descrivint els canvis que esteu pujant:"
msgid "Enter an upload comment"
msgstr "Afegeix un comentari"
+msgid "Specify the data source for the changes:"
+msgstr "Especifiqueu la font de dades pels canvis:"
+
+msgid "Enter a source"
+msgstr "Indiqueu una font"
+
msgid "Changeset id:"
msgstr "ID del conjunt de canvis:"
@@ -8095,11 +8290,10 @@ msgid "Closing changeset {0}"
msgstr "Tancant el conjunt de canvis {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Avís: ha fallat l''intent de posicionar la finestra de Credencials en primer "
-"pla. Ha estat interceptada una excepció de seguretat."
+"Ha fallat la configuració per a posar sempre en primer pla la finestra de "
+"les credencials. S''ha detectat una excepció de seguretat."
msgid "Enter credentials for OSM API"
msgstr "Indiqueu unes credencials per a l''API OSM"
@@ -8183,11 +8377,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Desempaquetant {0} en {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Avís: No és possible de descarregar el fitxer ''{0}''. El seu enllaç de "
-"descàrrega ''{1}'' no és una URL vàlida. Ignorant la descàrrega."
+"El fitxer ''{0}'' no pot ser descarregat. El seu enllaç de descàrrega "
+"''{1}'' no és una URL vàlida. Omentent la descàrrega."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8203,10 +8397,9 @@ msgid "Missing user identity"
msgstr "Manca la identitat de l''usuari"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Avís: Ha fallat l''obtenció d''informació de l''usuari. L''excepció ha "
+"Ha fallat l''obtenció d''informació de l''usuari de JOSM. L''excepció ha "
"estat: {0}"
msgid "Download objects"
@@ -8461,12 +8654,6 @@ msgstr "Pujar les primitives canviades"
msgid "Please revise upload comment"
msgstr "Si us plau, reviseu el comentari de la pujada"
-msgid "Revise"
-msgstr "Revisar"
-
-msgid "Continue as is"
-msgstr "Continuar com està"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8480,6 +8667,27 @@ msgstr ""
"d''entendre<br />que heu fet!<br /><br />Si dediqueu uns instats a explicar "
"la vostra modificació, facilitareu la feina<br />de molts d''atres usuaris."
+msgid "Please specify a changeset source"
+msgstr "Si us plau, especifiqueu una font pel conjunt de canvis"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"No heu especificat una font per les vostres modificacions.<br />Això és "
+"tècnicament correcte, però si ho feu podeu ajudar els altres usuaris <br />a "
+"entendre l''origen de les dades.<br /><br />Si ara dediqueu un minut a "
+"explicar la vostra modificació fareu facilitareu<br />la feina d''altres "
+"usuaris."
+
+msgid "Revise"
+msgstr "Revisar"
+
+msgid "Continue as is"
+msgstr "Continuar com està"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Tornar a la finestra anterior per introduir un comentari més descriptiu"
@@ -8496,6 +8704,25 @@ msgstr "Si us plau entreu primer una mida de fragment vàlida"
msgid "Illegal chunk size"
msgstr "La mida de fragment és errònia"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>L''etiqueta del següent conjunt de canvis conté una clau/valor "
+"buit:<br>{0}<br>Continuar?</html>"
+msgstr[1] ""
+"<html>Les etiquetes del següent conjunt de canvis conté una "
+"clau/valor:<br>{0}<br>Continuar?</html>"
+
+msgid "Empty metadata"
+msgstr "Metadades buides"
+
msgid "Cancel the upload and resume editing"
msgstr "Anul·lar la pujada i reprendre les modificacions"
@@ -8503,11 +8730,11 @@ msgid "Tags of changeset {0}"
msgstr "Etiquetes del conjunt de canvis {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Avís: l''objecte ''{0}'' ja ha estat suprimit al servidor. Ignorant aquest "
-"objecte i intentant continuar la pujada."
+"L''objecte ''{0}\" ja ha estat suprimit al servidor. Omentent l''objecte i "
+"reintentant la pujada."
msgid "Preparing objects to upload ..."
msgstr "Preparant els objectes a pujar ..."
@@ -8647,9 +8874,6 @@ msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
"L''objecte ''{0}'' ha estat suprimit. Ignorant l''objecte a la pujada"
-msgid "Warning: {0}"
-msgstr "Avís: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Pujant {0} objecte ..."
@@ -8660,6 +8884,9 @@ msgid ""
msgstr ""
"Ignorant l''excepció perquè la pujada ha estat anul·lada. L''excepció és: {0}"
+msgid "Upload successful!"
+msgstr "Pujada reeixida!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8680,9 +8907,9 @@ msgstr "Seleccionar objectes a pujar"
msgid "Cancel uploading"
msgstr "Cancel·lar la pujada"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Avís: valor inesperat per la clau ''{0}'' a les preferències, valor obtingut "
+"Valor inesperat per a la clau ''{0}'' de les preferències, s''ha obtingut "
"''{1}''"
msgid "Please select the upload strategy:"
@@ -8837,7 +9064,7 @@ msgstr "Marcador següent"
msgid "Jump to next marker"
msgstr "Saltar al següent marcador"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Marcador anterior"
msgid "Jump to previous marker"
@@ -8870,10 +9097,10 @@ msgstr "versió {0}"
msgid "Merging layers"
msgstr "Combinant capes"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
-"Avís: barrejar dades de les versions 0.6 i 0.5 farà que les dades resultants "
-"siguin de la versió 0.5"
+"La barreja de dades amb versions 0.5 i 0.6 donarà com a resultat dades de la "
+"versió 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8993,6 +9220,10 @@ msgstr "incrementa el nivell d''ampliació per veure més detalls"
msgid "No tiles at this zoom level"
msgstr "No hi ha tessel·les en aquest nivell d''ampliació"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+"La capa TMS ({0}) està sent descarregada amb un nivell d''ampliació {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG: les projeccions 4326 i Mercator són suportades"
@@ -9034,6 +9265,9 @@ msgstr "Recarrega les tessel·les amb error"
msgid "Alpha channel"
msgstr "Canal alfa"
+msgid "Automatically change resolution"
+msgstr "Canvia la resolució automàticament"
+
msgid "Set WMS Bookmark"
msgstr "Establir un favorit WMS"
@@ -9249,9 +9483,6 @@ msgstr "Extreïent localitzacions GPS a partir de la informació EXIF"
msgid "Starting directory scan"
msgstr "Iniciant l''exploració del directori"
-msgid "One of the selected files was null"
-msgstr "Un dels fitxers seleccionats era nul"
-
msgid "Read photos..."
msgstr "Llegir fotos..."
@@ -9270,6 +9501,9 @@ msgstr "Trobat un fitxer buit al directori {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Error en recuperar fitxers del directori {0}\n"
+msgid "One of the selected files was null"
+msgstr "Un dels fitxers seleccionats era nul"
+
msgid "Geotagged Images"
msgstr "Imatges geolocalitzades"
@@ -9329,6 +9563,12 @@ msgstr "Següent"
msgid "Show next Image"
msgstr "Mostrar la imatge següent"
+msgid "Show first Image"
+msgstr "Mostra la primera imatge"
+
+msgid "Show last Image"
+msgstr "Mostra la darrera imatge"
+
msgid "Center view"
msgstr "Centrar la vista"
@@ -9380,7 +9620,7 @@ msgid "Choose visible tracks"
msgstr "Escollir tracks visibles"
msgid "Select by date"
-msgstr ""
+msgstr "Selecciona per data"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -9412,23 +9652,23 @@ msgstr ""
"<html>La pujada de dades GPS sense processar sobre el mapa es considera "
"nociva<br>Si voleu pujar tracks mireu aquí:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Personalitzar el dibuix dels tracks"
msgid "From"
-msgstr ""
+msgstr "Des de"
msgid "To"
-msgstr ""
+msgstr "A"
msgid "No timestamp"
msgstr "Sense data i hora"
-msgid "Download from OSM along this track"
-msgstr "Descarregar d''OSM al llarg d''aquest track"
+msgid "Select to download OSM data."
+msgstr "Seleccioneu per a descarregar les dades OSM."
+
+msgid "Select to download GPS traces."
+msgstr "Seleccioneu per a descarregar les dades GPS."
msgid "Download everything within:"
msgstr "Descarregar tot el que hi hagi en:"
@@ -9454,16 +9694,18 @@ msgstr "només fites"
msgid "track and waypoints"
msgstr "el track i les fites"
+msgid "Click to download"
+msgstr "Feu clic per a descarregar"
+
+msgid "Click to cancel"
+msgstr "Feu clic per a anul·lar"
+
+msgid "Download from OSM along this track"
+msgstr "Descarregar d''OSM al llarg d''aquest track"
+
msgid "Calculating Download Area"
msgstr "Calculant l''àrea a descarregar"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Aquesta acció requerirà {0} peticions <br>de descàrrega. Voleu "
-"<br>continuar?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Precarrega en memòria tessel·les d''imatgeria al llarg del track"
@@ -9607,17 +9849,13 @@ msgstr ""
msgid "(URL was: "
msgstr "(La URL era: "
-msgid "Error displaying URL"
-msgstr "Error mostrant la URL"
-
msgid "Select the map painting styles"
msgstr "Seleccionar els estils per dibuixar el mapa"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Avía: ha fallat la càrrega dels etils de dibuix de mapes de ''{0}''. "
-"L''excepció ha estat: {1}"
+"Ha fallat la càrrega dels estils de Mappaint de ''{0}''. L''excepció ha "
+"estat: {1}"
msgid "loading style ''{0}''..."
msgstr "carregant l''estil ''{0}''..."
@@ -9635,10 +9873,10 @@ msgstr[1] ""
"Ha hagut {0} errors en carregar aquest estil. Seleccioneu ''Informació'' al "
"menú que obtindreu amb el botó dret del ratolí per a més detalls."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Avís: ha fallat l''anàlisi dels models de dibuix de mapes a partir de "
-"''{0}''. L''error ha estat: {1}"
+"Ha fallat l''anàlisi dels estils de Mappaint de ''{0}''. L''excepció ha "
+"estat: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "L''estil de traçat no és válid, els valors han de ser positius"
@@ -9649,11 +9887,10 @@ msgstr ""
"gran que zero"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Avís: ha fallat l''anàlisi dels models de dibuix de mapes a partir de "
-"''{0}''. Error: [{1}:{2}] {3}"
+"Ha fallat l''anàlisi dels estils de Mappaint desde ''{0}''. L''excepció ha "
+"estat: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Clau del testimoni d''autenticació:"
@@ -9934,8 +10171,8 @@ msgstr "Tancar la finestra i anul·lar l''autorització"
msgid "Close the dialog and accept the Access Token"
msgstr "Tanca la finestra i accepta el testimoni d''autenticació"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Avís: ha fallat la cancel·lació de l''operació OAuth en funcionament"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Ha fallat l''anul·lació de l''operació OAuth en execució"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Obtenint una petició de testimoni Oauth de ''{0}''"
@@ -10005,6 +10242,12 @@ msgstr "Autoritzar l''escriptura de les vostres preferències"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Autoritzar a JOSM a escriure les vostres preferències"
+msgid "Allow modifications of notes"
+msgstr "Permet la modificació de notes"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Seleccioneu permetre que JOSM modifiqui les notes en nom vostre"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Obtenint testimoni d''autenticació OAuth..."
@@ -10080,9 +10323,6 @@ msgstr ""
"acceptar. JOSM l''utilitzarà a partir de llavors per autenticació i "
"autorització al servidor OSM.<br><br>El testimoni d''autenticació és: </html>"
-msgid "Restart"
-msgstr "Reinicia"
-
msgid "Click to retrieve a Request Token"
msgstr "Feu clic per obtenir el testimoni demanat"
@@ -10382,6 +10622,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"Heu de reiniciar JOSM per tal que algunes configuracions tinguin efecte"
+msgid "Would you like to restart now?"
+msgstr "Voleu reiniciar ara?"
+
msgid "Remote Control"
msgstr "Control remot"
@@ -10518,6 +10761,12 @@ msgstr "Suprimeix de la barra d''eines"
msgid "Configure toolbar"
msgstr "Configurar la barra d''eines"
+msgid "Edit shortcut"
+msgstr "Edita la drecera"
+
+msgid "Do not hide toolbar and menu"
+msgstr "No amaguis la barra d''eines ni el menú"
+
msgid "Actions"
msgstr "Accions"
@@ -10562,6 +10811,9 @@ msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
"Acció enregistrada {0} de la barra d''eines sobreescrita: {1} esdevé {2}"
+msgid "Toolbar: {0}"
+msgstr "Barra d''eines: {0}"
+
msgid "Data validator"
msgstr "Validador de dades"
@@ -10614,24 +10866,12 @@ msgstr "Cercar: "
msgid "Read from file"
msgstr "Llegir d''un fitxer"
-msgid "Open JOSM customization file"
-msgstr "Obre el fitxer de personalització de JOSM"
-
-msgid "Import log"
-msgstr "Registre de la importació"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Aquí hi ha el resum de la importació del fitxer. <br/>Podeu refusar "
-"els canvis a les preferències fent clic sobre \"Cancel·lar\" a la finestra "
-"de preferències <br/>Per activar alguns canvis potser calgui reiniciar JOSM."
-
msgid "Export selected items"
msgstr "Exportar els elements seleccionats"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Fitxers de configuracions personalitzades de JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Si us plau seleccioneu algunes claus de les preferències no marcades per "
@@ -10651,43 +10891,59 @@ msgstr "Afegir les preferències del fitxer als valors existents"
msgid "Replace existing values"
msgstr "Reemplaçar els valors existents"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Fitxers de configuracions personalitzades de JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Obre el fitxer de personalització de JOSM"
-msgid "Advanced Background: Changed"
-msgstr "Fons avançat: canviat"
+msgid "Import log"
+msgstr "Registre de la importació"
-msgid "Advanced Background: NonDefalut"
-msgstr "Fons avançat: SensePredeterminació"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Aquí hi ha el resum de la importació del fitxer. <br/>Podeu refusar "
+"els canvis a les preferències fent clic sobre \"Cancel·lar\" a la finestra "
+"de preferències <br/>Per activar alguns canvis potser calgui reiniciar JOSM."
-msgid "Current value is default."
-msgstr "El valor per defecte és l''actual"
+msgid "shortcut"
+msgstr "drecera"
-msgid "Default value is ''{0}''."
-msgstr "El valor per defecte és ''{0}''."
+msgid "color"
+msgstr "color"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Actualment no hi ha valor per defecte (aquesta configuració encara no ha "
-"estat utilitzada)."
+msgid "toolbar"
+msgstr "barra d''eines"
-msgid "Select Setting Type:"
-msgstr "Seleccionar el tipus de paràmetre:"
+msgid "imagery"
+msgstr "imatgeria"
-msgid "Simple"
-msgstr "Simple"
+msgid "Reset preferences"
+msgstr "Inicialitza les preferències"
-msgid "List"
-msgstr "Llista"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Sou a punt de cancel·lar les preferències substituïnt-les pels seus valors "
+"predefinits.<br />Totes les vostres configuracions seran suprimides: "
+"connectors, imatgeria, filtres, botons de la barra d''eines, teclat, etc.<br "
+"/>Segur que voleu continuar?"
-msgid "List of lists"
-msgstr "Llista de llistes"
+msgid "Load profile"
+msgstr "Carrega un perfil"
-msgid "List of maps"
-msgstr "Llista de mapes"
+msgid "Save {0} profile"
+msgstr "Desa el perfil {0}"
-msgid "Add setting"
-msgstr "Afegir paràmetre"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Totes les preferències d''aquest grup són de tipus predeterminat, no hi ha "
+"res a desar"
+
+msgid "Choose profile file"
+msgstr "Escolliu el fitxer del perfil"
msgid "Change list setting"
msgstr "Canviar la llista de paràmetres"
@@ -10710,6 +10966,41 @@ msgstr "Canvia la llista de configuracions de mapes"
msgid "Entry {0}"
msgstr "Entrada {0}"
+msgid "Select Setting Type:"
+msgstr "Seleccionar el tipus de paràmetre:"
+
+msgid "Simple"
+msgstr "Simple"
+
+msgid "List"
+msgstr "Llista"
+
+msgid "List of lists"
+msgstr "Llista de llistes"
+
+msgid "List of maps"
+msgstr "Llista de mapes"
+
+msgid "Add setting"
+msgstr "Afegir paràmetre"
+
+msgid "Advanced Background: Changed"
+msgstr "Fons avançat: canviat"
+
+msgid "Advanced Background: NonDefault"
+msgstr "Fons avançat: No defecte"
+
+msgid "Current value is default."
+msgstr "El valor per defecte és l''actual"
+
+msgid "Default value is ''{0}''."
+msgstr "El valor per defecte és ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Actualment no hi ha valor per defecte (aquesta configuració encara no ha "
+"estat utilitzada)."
+
msgid "Change string setting"
msgstr "Modifica un paràmetre de tipus cadena de caràcters"
@@ -10768,6 +11059,9 @@ msgstr "Dibuixar nodes virtuals al mode seleccionat"
msgid "Draw inactive layers in other color"
msgstr "Mostrar les capes inactives en un altre color"
+msgid "Display discardable keys"
+msgstr "Mostra les claus descartables"
+
msgid "Highlight target ways and nodes"
msgstr "Ressaltar les vies i nodes de destinació"
@@ -10832,17 +11126,24 @@ msgstr ""
"Aquesta opció suprimeix l''emplenament de les àrees, superposant-se a "
"qualsevol estil d''emplenament seleccionat"
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Mostra les claus que han estat considerades com a poc interessants fins el "
+"punt que poden ser eliminades."
+
msgid "Options that affect drawing performance"
msgstr "Opcions que afecten el dibuix"
msgid "Segment drawing options"
-msgstr ""
+msgstr "Opcions de dibuix de segments"
msgid "Select and draw mode options"
-msgstr ""
+msgstr "Opcions de selecció i del mode de dibuix"
msgid "Other options"
-msgstr ""
+msgstr "Altres opcions"
msgid "OSM Data"
msgstr "Dades OSM"
@@ -11141,8 +11442,14 @@ msgstr "Obté capes"
msgid "2. Select layers"
msgstr "2. Seleccioneu capes"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Verifique la URL d''imatges WMS generada"
+msgid "3. Select image format"
+msgstr "3. Seleccioneu el format de la imatge"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Comproveu la URL generada pel servidor WMS"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Indiqueu un nom per aquesta capa"
msgid "Show Bounds"
msgstr "Mostra límits"
@@ -11320,6 +11627,12 @@ msgstr ""
"<i>(JOSM pot conservar un fitxer de còpia de seguretat en desar les capes. "
"Afegirà ''~'' al nom del fitxer i el desarà a la mateix carpeta.)</i>"
+msgid "Notification at each save"
+msgstr "Notificació cada vegada que es desi"
+
+msgid "When saving, display a small notification"
+msgstr "Quan es desi, motra una petita notificació"
+
msgid "File backup"
msgstr "Arxiu de còpia de seguretat"
@@ -11389,10 +11702,8 @@ msgstr "Paràmetres dels mapes"
msgid "Settings for the map projection and data interpretation."
msgstr "Paràmetres de projecció i interpretació de dades dels mapes."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
-"Avís: no ha estat possible de llegir la font de les etiquetes predefindes: "
-"{0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "No és possible de llegir la font d''etiquetes predefinides: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11676,21 +11987,6 @@ msgstr "Swiss Grid (Suïssa)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (sense correccions locals)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zona UTM"
-
-msgid "North"
-msgstr "Nord"
-
-msgid "South"
-msgstr "Sud"
-
-msgid "Hemisphere"
-msgstr "Hemisferi"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadalupe Fort-Marigot 1949"
@@ -11712,6 +12008,21 @@ msgstr "UTM França (DOM)"
msgid "UTM Geodesic system"
msgstr "Sistema geodèsic UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zona UTM"
+
+msgid "North"
+msgstr "Nord"
+
+msgid "South"
+msgstr "Sud"
+
+msgid "Hemisphere"
+msgstr "Hemisferi"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Provant la URL de l''API OSM ''{0}''"
@@ -11779,11 +12090,11 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Selecciona d''utilitzar OAuth com a mecanisme d''autenticació"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Avís: valor no suportat a la preferència ''{0}'', hi ha ''{1}''. utilitzant "
-"el mètode d''''Autenticació bàsica''"
+"Valor no suportat a la preferència ''{0}'', s''ha obtingut ''{1}''. "
+"Utilitzant el mètode d''autenticació \"Autenticació Bàsica\"."
msgid "OSM username:"
msgstr "Non d''usuari OSM:"
@@ -11791,25 +12102,31 @@ msgstr "Non d''usuari OSM:"
msgid "OSM password:"
msgstr "Contrasenya OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "Avís: ha fallat la recuperació de les credencials del seu gestor"
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr ""
+"La fallat l''obtenció de les credencials OSM del gestor de credencials."
msgid "Current credential manager is of type ''{0}''"
msgstr "El gestor de credencials actual és de tipus ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "Avís: ha fallat l''ació de desar les credencials al gestor."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
+"Les credencials OSM no han pogut ser desades al gestor de credencials."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Comprova periòdicament si hi ha nous missatges"
+
+msgid "Check interval (minutes):"
+msgstr "Interval de comprovació (minuts):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Avís: Ha fallat l''obtenció del testimoni d''autenticació OAuth del gestor "
-"de credencials"
+"Ha fallat l''obtenció del testimoni d''accés OAuth del gestor de credencials"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Avís: Ha fallat l''emmagatzemament del testimoni d''autenticació al gestor "
-"de credencials"
+"Ha fallat l''emmagatzemament del testimoni d''accés OAuth al gestor de "
+"credencials"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11904,18 +12221,13 @@ msgid "Use a SOCKS proxy"
msgstr "Utilitzar un proxi SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Avís: JOSM ha estat configurat per utilitzar servidors intermediaris però la "
-"màquina virtual de Java no ha estat configurada per trobar-los. Canvieu les "
-"preferències a \"Sense seervidor intermediari\"."
-
-msgid "disabled"
-msgstr "deshabilitat"
-
-msgid "no modifier"
-msgstr "sense modificador"
+"JOSM ha estat configurat per a utilitzar el servidor proxi que hi ha als "
+"paràmetres del sistema, però la màquina virtual de java (JVM) no ha estat "
+"configurada per obtenir-lo. Reinicialitzada la preferència vers el valor "
+"\"Cap proxi\"."
msgid "Shortcut Background: User"
msgstr "Drecera de fons: Usuari"
@@ -11958,38 +12270,37 @@ msgstr "Suprimeix la selecció a la taula d''etiquetes"
msgid "Add a new tag"
msgstr "Afegeix una nova etiqueta"
-msgid "Select auto-increment of {0} for this field"
-msgstr "Selecciona un increment automàtic de {0} per aquest camp"
+msgid "Paste tags from buffer"
+msgstr "Enganxa etiquetes de la memòria intermèdia"
-msgid "Cancel auto-increment for this field"
-msgstr "Anul·la l''increment automàtic per aquest camp"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Utilitzar preconfiguració ''{0}'' del grup ''{1}''"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Utilitzar preconfiguració ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Avís sobre les etiquetes predefinides \"{0}-{1}\": Ignorant l''atribut "
-"''{2}'' com ''{3}'' elements son donats."
+msgid "Elements of type {0} are supported."
+msgstr "Els elements de tipus {0} són suportats."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
-"d''elements ''display_values'' ha de ser el mateix que el de ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Modificar {0} objecte"
+msgstr[1] "Modificar {0} objectes"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
-"d''elements ''short_descriptions'' ha de ser el mateix que el de ''values''"
+msgid "Nothing selected!"
+msgstr "Selecció buida."
-msgid "More information about this feature"
-msgstr "Més informació sobre aquesta funcionalitat"
+msgid "Selection unsuitable!"
+msgstr "Selecció no apropiada!"
+
+msgid "Apply Preset"
+msgstr "Aplicar"
+
+msgid "New relation"
+msgstr "Nova relació"
+
+msgid "Change Tags"
+msgstr "Canvia les etiquetes"
msgid "Unknown requisite: {0}"
msgstr "Requisit desconegut: {0}"
@@ -11997,6 +12308,9 @@ msgstr "Requisit desconegut: {0}"
msgid "Illegal member expression: {0}"
msgstr "Expressió de membre incorrecta: {0}"
+msgid "More information about this feature"
+msgstr "Més informació sobre aquesta funcionalitat"
+
msgid "Available roles"
msgstr "Rols disponibles"
@@ -12012,15 +12326,59 @@ msgstr "elements"
msgid "Optional Attributes:"
msgstr "Atributs Opcionals:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Utilitzar preconfiguració ''{0}'' del grup ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr "Selecciona un increment automàtic de {0} per aquest camp"
-msgid "Use preset ''{0}''"
-msgstr "Utilitzar preconfiguració ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr "Anul·la l''increment automàtic per aquest camp"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Avís sobre les etiquetes predefinides \"{0}-{1}\": Ignorant l''atribut "
+"''{2}'' com ''{3}'' elements son donats."
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Etiqueta preconfigurada \"{0}-{1}\" trencada - El mètode Java utilitzat a "
+"''values_from'' no és \"{2}\""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Etiqueta preconfigurada \"{0}-{1}\" trencada - El mètode Java utilitzat a "
+"''values_from'' ha generat {2} ({3})"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
+"d''elements ''display_values'' ha de ser el mateix que el de ''values''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
+"d''elements ''short_descriptions'' ha de ser el mateix que el de ''values''"
msgid "Unknown type: {0}"
msgstr "Tipus desconegut: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Grup de preconfiguracions {1}/{0}"
+
+msgid "Preset group {0}"
+msgstr "Grup de prconfiguracions {0}"
+
msgid "Roles cannot appear more than once"
msgstr "Els rols només poden aparèixer un sol cop"
@@ -12030,41 +12388,9 @@ msgstr "Element de rol predefinit sense parent"
msgid "Preset sub element without parent"
msgstr "Sotselement predefinit sense parent"
-msgid "Could not read tagging preset source: {0}"
-msgstr "No és possible de llegir la font d''etiquetes predefinides: {0}"
-
msgid "Error parsing {0}: "
msgstr "Error d''anàlisi {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "Els elements de tipus {0} són suportats."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Modificar {0} objecte"
-msgstr[1] "Modificar {0} objectes"
-
-msgid "Nothing selected!"
-msgstr "Selecció buida."
-
-msgid "Selection unsuitable!"
-msgstr "Selecció no apropiada!"
-
-msgid "Apply Preset"
-msgstr "Aplicar"
-
-msgid "New relation"
-msgstr "Nova relació"
-
-msgid "Change Properties"
-msgstr "Canvia propietats"
-
-msgid "Preset group {1} / {0}"
-msgstr "Grup de preconfiguracions {1}/{0}"
-
-msgid "Preset group {0}"
-msgstr "Grup de prconfiguracions {0}"
-
msgid "Search preset"
msgstr "Cerca predefinit"
@@ -12080,6 +12406,16 @@ msgstr "Mostrar només el que sigui aplicable a la selecció"
msgid "Search in tags"
msgstr "Cerca entre les etiquetes"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Ajustament {0} encara no enregistrat. No es pot establir la particiapació a "
+"l''ajustament sincronitzat."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Ajustament {0} encara no enregistrat."
+
msgid "All files (*.*)"
msgstr "Tots els fitxers (*.*)"
@@ -12115,29 +12451,85 @@ msgstr ""
"El valor no és un ID vàlid. Si us plau, indiqueu un valor enter més gran que "
"zero"
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"La via amb un ID extern ''{0}'' inclou un node amb ID ''{1}'' que manca"
-
-msgid "Deleted node {0} is part of way {1}"
-msgstr "El node esborrat {0} és part de la via {1}"
+msgid "false: the property is explicitly switched off"
+msgstr "fals: la propietat ha estat deshabilitada expressament"
-msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+msgid "true: the property is explicitly switched on"
msgstr ""
-"La via {0} te {1} nodes i no està completa perquè com a mínim un dels seus "
-"nodes manca a les dades carregades."
+"cert: la propietat ha estat habilitada expressament<html>Please confirm to "
+"remove <strong>1 object</strong> from <strong>1 relation</strong>.</html>"
msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
+"partial: different selected objects have different values, do not change"
msgstr ""
-"La relació amb ID extern ''{0}'' fa referència a un objecte amb ID ''{1}'' "
-"que manca."
+"parcial: els objectes seleccionats tenen diferents propietats, no ho canvieu"
-msgid "Deleted member {0} is used by relation {1}"
+msgid "unset: do not set this property on the selected objects"
+msgstr "no definit: no aplicar aquesta propietat als objectes seleccionats"
+
+msgid "Cut"
+msgstr "Retalla"
+
+msgid "Right click = copy to clipboard"
+msgstr "Clic amb el botó dret = copiar al portaretalls"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "L''atribut ''{0}'' manca i és obligatori."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long''. El seu "
+"valor és ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long'' (>=0) . "
+"El seu valor és ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut ''{0}'' de tipus ''double''. El seu valor és "
+"''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''lboolean''. El "
+"seu valor és ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus "
+"''OsmPrimitiveType''. El seu valor és ''{1}''"
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"La via amb un ID extern ''{0}'' inclou un node amb ID ''{1}'' que manca"
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "El node esborrat {0} és part de la via {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"La via {0} te {1} nodes i no està completa perquè com a mínim un dels seus "
+"nodes manca a les dades carregades."
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+"La relació amb ID extern ''{0}'' fa referència a un objecte amb ID ''{1}'' "
+"que manca."
+
+msgid "Deleted member {0} is used by relation {1}"
msgstr "El membre esborrat {0} és utilitzat per la relació {1}"
msgid "All Formats"
@@ -12150,11 +12542,11 @@ msgid "Contacting OSM Server..."
msgstr "Contactant amb el servidor OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Avís: el valor de l''atribut ''{0}'' de l''element ''{1}'' no és adequat per "
-"les capacitats del servidor. El seu valor és ''{2}''"
+"Valor invàlid per l''atribut ''{0}'' de l''element ''{1}'' a les capacitats "
+"del serevidor. El valor és ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -12204,41 +12596,39 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Nombre de port incorrecte a la preferència ''{0}''. Hi ha {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Avís: s''ha trobat un valor no esperat per a la preferència ''{0}''. Hi ha "
-"''{1}''. No s''utilitzarà el servidor intermediari."
+"S''ha trobat un valor inesperat per la preferència ''{0}''. El valor trobat "
+"és ''{1}''. No s''utilitzarà cap proxi."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Avís: Paràmetres incorrectes per al servidor intermediari HTTP. Configurat "
-"host ''{0}'' i port ''{1}''."
+"Paràmetres inesperats per al servidor intermiediari d''HTTP. El host "
+"obtingut és ''{0}'' i el port el ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Avís: Paràmetres incorrectes per al servidor intermediari SOCKS. Configurat "
-"host ''{0}'' i port ''{1}''."
+"Paràmetres inesperats per al servidor intermiediari de SOCKS. El host "
+"obtingut és ''{0}'' i el port el ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Error: Ha fallat la connexió al servidor intermediari ''{0}'' per a "
-"l''adreça ''{1}''. L''excepció ha estat: {2}"
+"Ha fallat la conexió al servidor intermediari ''{0}'' per la URI ''{1}''. "
+"L''excepció ha estat: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Avís: la màquina virtual de Java no ha estat configurada per poder trobar "
-"servidors intermediaris a partir de la configuració del sistema. la "
-"propietat ''java.net.useSystemProxies'' mancava en el moment d''iniciar. No "
-"serà possible la utilització de servidors intermediaris."
+"La màquina virtual de java (JVM) no ha estat configurada per a obtenir "
+"servidors intermediaris dels paràmetres del sistema. La propietat "
+"''java.net.useSystemProxies'' mancava en el moment d''iniciar. No "
+"s''utilitzarà cap servidor intermediari."
msgid "Parsing response from server..."
msgstr "Analitzant la resposta del servidor..."
@@ -12341,6 +12731,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Error de sintaxi: l''estructura del document GPX no és correcta"
+msgid "(at line {0}, column {1})"
+msgstr "(a la línia {0}, columna {1})"
+
msgid "Unknown mode {0}."
msgstr "Node {0} desconegut."
@@ -12356,15 +12749,23 @@ msgstr "Cercant fitxers d''imatges"
msgid "No image files found."
msgstr "No s''han trobat fitxers d''imatge"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Teniu {0} missatge sense llegir"
+msgstr[1] "Teniu {0} missatges sense llegir"
+
+msgid "Click here to see your inbox."
+msgstr "Feu clic aquí per a veure la vostra bústia."
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Ha fallat l''obertura d''un fux d''entrada pel recurs ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Avís: ha fallat l''obertura del fitxer amb extensió ''{2}'' i nom ''{3}'' "
-"del fitxer zip ''{0}''. L''excepció ha estat: {1}"
+"Ha fallat l''obertura del fitxer amb extensió ''{2}'' i nom ''{3}'' del zip "
+"''{0}''. L''excepció ha estat: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "No s''ha pogut canviar el nom del fitxer {0} a {1}."
@@ -12453,8 +12854,8 @@ msgstr "Sentències desconegudes: {0}"
msgid "Zero coordinates: {0}"
msgstr "Sense coordenades: {0}"
-msgid "NMEA import success"
-msgstr "Importació NMEA correcta"
+msgid "NMEA import success:"
+msgstr "Importació NMEA reeixida:"
msgid "NMEA import failure!"
msgstr "La importació NMEA ha fallat!"
@@ -12563,49 +12964,15 @@ msgstr "NO s''han trobat dades al fitxer {0}."
msgid "Open OsmChange file"
msgstr "Obre fitxer OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "L''atribut ''{0}'' manca i és obligatori."
-
msgid "Unsupported version: {0}"
msgstr "Versió no suportada: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long''. El seu "
-"valor és ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long'' (>=0) . "
-"El seu valor és ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut ''{0}'' de tipus ''double''. El seu valor és "
-"''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''lboolean''. El "
-"seu valor és ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus "
-"''OsmPrimitiveType''. El seu valor és ''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Avís: l''element d''inici ''{0}'' situat a la posició ({1},{2}) dins del "
-"conjunt de canvis no està suportat. Anul·lant."
+"Element inicial ''{0}'' no suportat al contigut del conjunt de canvis a la "
+"posició ({1},{2}). Omentent."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12615,11 +12982,11 @@ msgstr ""
"estat trobat fora d''un bloc ''create'', ''modify'', o ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Avís: l''element de final ''{0}'' situat a la posició ({1},{2}) dins del "
-"conjunt de canvis no està suportat. Anul·lant."
+"Element final ''{0}'' no suportat al contigut del conjunt de canvis a la "
+"posició ({1},{2}). Omentent."
msgid "Parsing changeset content ..."
msgstr "Processant el contingut del conjunt de canvis ..."
@@ -12649,11 +13016,8 @@ msgstr ""
"Ha fallat la signatura d''una connexió HTTP amb una capçalera "
"d''autenticació OAuth."
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Avís: valor no esperat de la preferència ''{0}''. És ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(a la línia {0}, columna {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Valor inesperat per a la preferència ''{0}''. És ''{1}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Ha hagut un error en desar.<br>L''error és:<br>{0}</html>"
@@ -12665,9 +13029,6 @@ msgstr ""
"<html>Ha hagut un error en restaurar la còpia de seguretat.<br>L''error "
"és:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "No es pot fer la còpia de seguretat. L''excepció ha estat: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Fitxers del servidor OSM comprimits amb gzip"
@@ -12689,6 +13050,9 @@ msgstr "No s''han trobat dades al fitxer ''{0}''."
msgid "Open OSM file"
msgstr "Obre fitxer OSM"
+msgid "Reading was canceled"
+msgstr "La lectura ha estat cancel·lada"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12748,11 +13112,11 @@ msgstr ""
"Valor incorrecte de l''atribut ''versió'' a l''objecte amb ID {0}. Hi ha {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"Avís: Normalitzant el valor de l''atribut ''version'' de l''element {0} fins "
-"{2}, la versió de l''API és ''{3}''. Valor obtingut {1}."
+"Normalitzant el valor de l''aatribut \"versió\" de l''element {0} al {2}, la "
+"versió de l''API és ''{3}''. S''ha obtingut {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "La versió de l''API és desconeguda o no suportada. La versió és {0}."
@@ -12905,26 +13269,39 @@ msgid "Save user and password (unencrypted)"
msgstr "Desar nom d''usuari i contrasenya (sense encriptar)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<supressió de {0} objectes>"
+
+msgid "Old values of"
+msgstr "Valors antics de"
msgid "Add tags to selected objects"
msgstr "Afegir etiquetes als objectes seleccionats"
msgid "Add selected tags"
-msgstr ""
+msgstr "Afegeix les etiquetes seleccionades"
msgid "Add all tags"
-msgstr ""
+msgstr "Afegeix totes les etiquetes"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "Afegeix les etiquetes verificades als objectes seleccionats"
msgid "Shift+Enter: Add all tags to selected objects"
msgstr ""
+"Majúscula+Enter: Afegeix totes les etiquetes als objectes seleccionats"
msgid "Assume"
msgstr "Assumeix"
+msgid "Existing values"
+msgstr "Valors existents"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Marqueu la casella de verificació per acceptar el valor"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Accepta totes les etiquetes de {0} per aquesta sessió"
+
msgid "Load data from API"
msgstr "Carregar dades de l''API"
@@ -12949,19 +13326,20 @@ msgstr "Crear nous objectes"
msgid "Read protocol version"
msgstr "Llegir la versió del protocol"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
-msgstr ""
-"Avís: no és possible d''iniciar el control remot del servidor al port {0}: "
-"{1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr "No es possible iniciar el servidor de control remot al port {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Control remot::Acceptant connexions a través del port {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Control remot::Servidor aturat."
msgid "Remote Control has been asked to create a new node."
msgstr "El control remot ha demanat de crear un nou node"
msgid "There is no layer opened to add node"
-msgstr ""
-
-msgid "Add way"
-msgstr "Afegir via"
+msgstr "No hi ha una capa oberta on afegir nodes"
msgid "Remote Control has been asked to create a new way."
msgstr "El control remot ha demanat de crear una via"
@@ -12970,7 +13348,18 @@ msgid "Invalid coordinates: {0}"
msgstr "Coordenades invàlides: {0}"
msgid "There is no layer opened to add way"
+msgstr "No hi ha una capa oberta on afegir vies"
+
+msgid "Add way"
+msgstr "Afegir via"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
msgstr ""
+"S''ha demanat al Control Remot que informi de les característiques que "
+"suporta. Això permet els llocs web saber la versió de JOSM que s''eatà "
+"utilitzant."
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
@@ -12988,6 +13377,15 @@ msgstr "El control remot ha demanat d''importar dades de la següent URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "El control remot ha demanat de carregar dades de l''API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr "Les latituds han d''estar entre {0} i {1}"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "Les longituds han d''estar entre {0} i {1}"
+
+msgid "The minima must be less than the maxima"
+msgstr "El mínim ha de ser més petit que el màxim"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -13024,20 +13422,20 @@ msgstr "Dades:"
msgid "local file"
msgstr "fitxer local"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Enllaç a un fitxer de dades OSM al disc local."
+msgid "Link to a GPX file on your local disk."
+msgstr "Enllaç vers un fitxer GPX del vostre disc local."
msgid "include"
msgstr "inclou"
-msgid "Include OSM data in the .joz session file."
-msgstr "Incloure dades OSM al fitxer .joz de la sessió."
+msgid "Include GPX data in the .joz session file."
+msgstr "Inclou dades GPX al fitxer de sessió .joz."
msgid "No file association"
msgstr "Cap associació de fitxer"
-msgid "OSM data will be included in the session file."
-msgstr "Les dades OSM seran incloses al fitxer de la sessió."
+msgid "GPX data will be included in the session file."
+msgstr "Les dades GPX seran incloses al fitxer de sessió-"
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13062,6 +13460,15 @@ msgstr "La capa conté dades no desades - desar a un fitxer."
msgid "Layer does not contain unsaved data."
msgstr "La capa no conté dades sense desar."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Enllaç a un fitxer de dades OSM al disc local."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Incloure dades OSM al fitxer .joz de la sessió."
+
+msgid "OSM data will be included in the session file."
+msgstr "Les dades OSM seran incloses al fitxer de la sessió."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -13069,6 +13476,9 @@ msgstr ""
"La versió ''{0}'' de les metadades de la capa de dades OSM no està "
"suportada. S''esperava la versió: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Fitxer de la sessió (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "No és possible localitzar el fitxer ''{0}''."
@@ -13145,18 +13555,18 @@ msgid "Download skipped"
msgstr "Descàrrega ignorada"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Avís: No es pot descarregar el connector ''{0}''. No es coneix el seu enllaç "
-"de descàrrega. Ignorant la descàrrega."
+"No és possible la descàrrega del connector ''{0}''. No es coneix l''enllaç "
+"de descàrrega. Omentent la descàrrega."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Avís: No es pot descarregar el connector ''{0}''. El seu enllaç de "
-"descàrrega ''{1}''no és una URL vàlida. Ignorant la descàrrega."
+"No és possible la descàrrega del connector ''{0}''. El seu enllaç de "
+"descàrrega ''{1}'' no és una URL vàlida. Omentent la descàrrega."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Ha fallat la creació del directori de connectors ''{0}''"
@@ -13328,12 +13738,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Ha fallat l''actualització del connector"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Avís: el connector {0} no ha pogut ser trobat"
+msgid "Failed to find plugin {0}"
+msgstr "No ha estat possible de trobar el connector {0}"
-msgid "Warning: failed to download plugin information list"
-msgstr ""
-"Avís: ha fallat la descàrrega de la llista d''informació dels connectors"
+msgid "Failed to download plugin information list"
+msgstr "Ha fallat la descàrrega de la llista d''informació de connectors"
msgid "Disable plugin"
msgstr "Deshabilitar connector"
@@ -13347,28 +13756,28 @@ msgstr "Conservar el connector"
msgid "Click to keep the plugin ''{0}''"
msgstr "Feu clic per conservar el connector ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
-"Avís: ha fallat la supresió del connector ''{0}'' que està desactualitzat"
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Ha fallat la supressió del connector obsolet ''{0}''."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Avís: ha fallat la instal·lació del connector descarregat ''{0}''. Anul·lant "
-"la instal·lació. JOSM carregarà la versió antiga del connector."
+"Ha fallat la instal·lació del connector descarregat ''{0}''. Ometent la "
+"instal·lació. JOSM continuarà carregant la versió anterior del connector."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
+"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
+"descarregat. {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Avís: ha fallat la instal·lació del connector ''{0}'' a partir del fitxer "
-"temporal descarregat ''{1}''. Ha fallat l''acció d''anomenar-lo."
+"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
+"descarregat. Ha fallat el canvi de nom."
msgid "Click to disable the plugin ''{0}''"
msgstr "Feu clic per deshabilitar el connector ''{0}''"
@@ -13412,7 +13821,7 @@ msgstr ""
"Preferències -> Connectors)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Fitxer jar ''{0}'' no vàlid"
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "El fitxer del connector ''{0}'' no inclou un Manifest."
@@ -13447,10 +13856,10 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr "S''està processant el fitxer ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Avís: Ha fallat la cerca d''informació del connector al fitxer ''{0}''."
+"Ha fallat l''escaneig del fitxer ''{0}'' per la informació del connector. "
+"Ometent."
msgid "Processing plugin site cache icon files..."
msgstr ""
@@ -13466,12 +13875,28 @@ msgstr "Descarregada la llista de connectors..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Descarregant la llista de connectors de ''{0}''"
+msgid "Plugin list download error"
+msgstr "Error a la descàrrega de la llista de connectors"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM no ha aconseguit descarregar la llista de connectors:"
+
+msgid "Details:"
+msgstr "Detalls:"
+
+msgid "Plugin icons download error"
+msgstr "Error en la descàrrega de les icones dels connectos"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM no ha aconseguit descarregar les icones dels connectors:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Avís: ha fallat la creació el directori del connector ''{0}''. No ha estat "
-"possible de posar a la memòria cau la llista de connectors del lloc ''{1}''"
+"Ha fallat la creació del directori dels connectors ''{0}''. Ha estat "
+"impossible d''inserir a la memòria cau la llista de connectors del lloc "
+"''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Escrivint la llista de connectors a la memòria cau local ''{0}''"
@@ -13940,24 +14365,15 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Ha fallat la localització la imatge ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Avís: ha fallat la manipulació del fitxer zip ''{0}''. L''excepció ha estat: "
-"{1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Avís: ha fallat l''accés al directori ''{0}'' per raons de seguretat. "
-"L''excepcióha estat: {1}"
+"Ha fallat la gestió del fitxer zip ''{0}''. L''excepció ha estat: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Avís: ha fallat la derivació al prefix de llegua per la wiki des del codi "
-"local de JOSM ''{0}''. Utilitzant el codi predeterminat ''en''."
+"Ha fallat l''accés al directori ''{0}'' per raons de seguretat. L''excepció "
+"ha estat: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [si us plau escriviu el nombre]"
@@ -13969,42 +14385,107 @@ msgstr ""
"Ha fallat l''obertura de la URL. No hi ha una plataforma establerta. Si us "
"plau, establiu-ne una primer."
+msgid "Opening URL: {0}"
+msgstr "Obrint la URL: {0}"
+
+msgid "zoom"
+msgstr "ampliació"
+
+msgid "latitude"
+msgstr "latitud"
+
+msgid "longitude"
+msgstr "longitud"
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr "La URL no conté {0}/{1}/{2}"
+
+msgid "URL does not contain valid {0}"
+msgstr "La URL no conté un {0} vàlid"
+
msgid "reserved"
msgstr "reservat"
+msgid "Outdated Java version"
+msgstr "Versió obsoleta de Java"
+
+msgid "Update Java"
+msgstr "Actualitzeu Java"
+
+msgid "You are running version {0} of Java."
+msgstr "Utilitzeu la versió {0} de Java."
+
+msgid "February 2013"
+msgstr "Febrer de 2013"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+"Aquesta versió no és suportada per {0} des de {1} i no es recomana la seva "
+"utilització."
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+"JOSM deixarà de funcionar aviat amb aquesta versió; recomanem actualitzar "
+"vers la versió de Java {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Voleu actualitzar-la ara?"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Conflicte de drecera: ''{0}'' ha estat mogut per ''{1}'' a ''{2}''."
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
+"Ha estat trobat {0} etiqueta a la memòria intermèdia, això és sospitós!"
msgstr[1] ""
+"Han estat trobades {0} etiquetes a la memòria intermèdia, això és sospitós!"
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "La clau és massa llarga (màx {0} caràcters):"
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "Hi ha caràcters sospitosos a la clau"
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "El valor és massa llarg (màx. {0} caràcters):"
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Voleu enganxar aquestes etiquetes?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Neteja la memòria intermèdia"
msgid "Ignore warnings"
-msgstr ""
+msgstr "Ignora els avisos"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
+"<html><p> Ho sentim, No és possible d''enganxar etiquetes de la memòria "
+"intermèdia perquè no conté cap objecte JOSM ni cap text apropiat. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Clic amb el botó dret = copiar al portaretalls"
+msgid "ms"
+msgstr "ms"
+
+msgid "s"
+msgstr "s"
+
+msgid "min"
+msgstr "min"
+
+msgid "h"
+msgstr "h"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dia"
+msgstr[1] "dies"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14353,6 +14834,13 @@ msgid "Saturation:"
msgstr "Saturació:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permet modificar la informació del trànsit i exportar-la al simulador de "
+"mobilitat urbana SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14387,6 +14875,10 @@ msgid ""
"white background with matching colors for better visibility in bright "
"sunlight. See dialog in display preferences."
msgstr ""
+"Permet a l''usuari de crear diferents combinacions de color i commutar entre "
+"elles. Simplement modifiqueu els colors i creeu una nova combinació. Es pot "
+"passar a un fons blanc amb els colors corresponents per a una millor "
+"visibilitat amb llum solar. Consulteu la finestra de preferències."
msgid ""
"Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
@@ -14451,6 +14943,12 @@ msgstr ""
"Cerca i correcció d''adreces (carrers) incorrectes de manera senzilla."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Parleu amb els usuaris que fan modificacions del mapa a prop vostre, sereu "
+"avisats quan algú tanqui la seva sessió."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14488,12 +14986,14 @@ msgstr ""
"amb un botó."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Estil d''ajustament de la imatgeria WMSPlugin"
+msgstr "Mode de mapa d''ajustament de la imatgeria en estil WMSPlugin"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
"not in huge cache directories"
msgstr ""
+"Aquest connector experimental permet al JOSM emmagatzemar les tessel·les en "
+"fitxers de bases de dades, no en immensos directoris"
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14580,9 +15080,6 @@ msgstr "Afegeix una prohibició de gir a l''esquerra a conjunts de 4 o 5 vies"
msgid "Simplifies download from different read-only APIs."
msgstr "Simplifica la descàrrega de diferents APIs de només lectura"
-msgid "Simply convert an area to a multipolygon."
-msgstr "Converteix un àrea en un multipolígon de manera simple"
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Permet l''assignació d''etiquetes a tots els objectes d''una àrea "
@@ -14654,6 +15151,10 @@ msgstr ""
"Escriu la posició gps a la capçalera de la imatge. Utilitzeu aquesta opció "
"fent clic amb el botó dret sobre el menú de la capa de la imatge."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+"Fa que les fotografies es puguin moure i les posiciona sobre el mapa."
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14682,9 +15183,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Tauler de creació i modificació de relacions i multipolígons"
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Afegeix l''opció de reiniciar al menú de JOSM."
-
msgid "Plugin for reverting changesets"
msgstr "Connector per desfer conjunts de canvis"
@@ -14718,9 +15216,6 @@ msgstr ""
"Simplifica àrees suprimint els nodes amb angles molt obtusos. Això pot ser "
"limitat indicant un màxim per l''àrea a suprimir."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Crea i modifica cartes marines per OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Modifica funcions per OpenSeaMap"
@@ -14758,6 +15253,10 @@ msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
"Activate by holding T and slip map with left mouse button"
msgstr ""
+"Forneix la possibilitat d''utilitzar tecles auxiliars per a permetre la "
+"utilització de dispositius com l''stylus, sense equivalent al botó dret del "
+"ratolí. La simulació es fa prement la tecla T i mantenint activat "
+"l''equivalent al botó esquerre del ratolí."
msgid ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -14766,6 +15265,13 @@ msgstr ""
"Dibuixa edificis a partir del mapa del cadastre txec. Requereix tenir "
"TracerServer (.NET o Mono) funcionant."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+"Traça edificis i altres formes d''un mapa. Requereix que el servidor Tracer2 "
+"estigui en funcionament."
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Connector per signar digitalment dades OSM"
@@ -14823,9 +15329,6 @@ msgid ""
"behind."
msgstr "Condueix un cotxe de carreres del punt A al B sobre imatge aèries"
-msgid "Highways"
-msgstr "Vies"
-
msgid "Streets"
msgstr "Carrers"
@@ -14910,6 +15413,9 @@ msgstr "Terraplè"
msgid "Lit"
msgstr "Llum"
+msgid "Toll"
+msgstr "Peatge"
+
msgid "Motorway Link"
msgstr "Enllaç d''autopista"
@@ -15000,6 +15506,50 @@ msgstr "Carrer"
msgid "Edit Residential Street"
msgstr "Edita carrer"
+msgid "Bicycle Road"
+msgstr "Carrer per bicicletes"
+
+msgid "Edit Bicycle Road"
+msgstr "Modifica carrer per bicicletes"
+
+msgid "Highway type"
+msgstr "Tipus de carretera"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "residencial"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "via de servei"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "sense classificació"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "camí"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "carril bici"
+
+msgid "Vehicle access"
+msgstr "Accés de vehicles"
+
+msgid "yes"
+msgstr "sí"
+
+msgid "no"
+msgstr "no"
+
+msgid "destination"
+msgstr "destinació"
+
+msgid "Oneway for bicycle"
+msgstr "Sentit únic per bicicletes"
+
msgid "Living Street"
msgstr "Zona Residencial (20)"
@@ -15018,10 +15568,10 @@ msgstr "Àrea"
msgid "Service"
msgstr "Via de servei"
-msgid "Edit Serviceway"
-msgstr "Modificar via de servei"
+msgid "Edit Service Way"
+msgstr "Modifica Service Way"
-msgid "Serviceway type"
+msgid "Service way type"
msgstr "Tipus de via de servei"
msgid "alley"
@@ -15033,6 +15583,9 @@ msgstr "entrada de vehicles"
msgid "parking_aisle"
msgstr "via d''aparcament"
+msgid "drive-through"
+msgstr "accés a servei amb cotxe (drive-through)"
+
msgid "Parking Aisle"
msgstr "Via d''aparcament"
@@ -15060,18 +15613,12 @@ msgstr "rotonda"
msgid "jughandle"
msgstr "desviament"
-msgid "yes"
-msgstr "sí"
-
msgid "Road Restrictions"
msgstr "Restriccions a la via"
msgid "Edit Road Restrictions"
msgstr "Edita les restriccions a la via"
-msgid "Toll"
-msgstr "Peatge"
-
msgid "No exit (cul-de-sac)"
msgstr "Sense sortida (cul de sac)"
@@ -15081,9 +15628,6 @@ msgstr "Restriccions del mode de transport"
msgid "General Access"
msgstr "Accés general"
-msgid "destination"
-msgstr "destinació"
-
msgid "delivery"
msgstr "lliurament"
@@ -15093,15 +15637,15 @@ msgstr "permissiu"
msgid "private"
msgstr "privat"
+msgid "customers"
+msgstr "clients"
+
msgid "agricultural"
msgstr "agrícola"
msgid "forestry"
msgstr "forestal"
-msgid "no"
-msgstr "no"
-
msgid "official"
msgstr "oficial"
@@ -15147,6 +15691,9 @@ msgstr "Vehicles amb alta ocupació (VAO)"
msgid "Public Service Vehicles (psv)"
msgstr "Vehicles de servei públic (SP)"
+msgid "Tourist buses"
+msgstr "Autobús turístic"
+
msgid "Min. speed (km/h)"
msgstr "Velocitat Min (km/h)"
@@ -15231,6 +15778,9 @@ msgstr "Edita Pont"
msgid "viaduct"
msgstr "viaducte"
+msgid "suspension"
+msgstr "suspensió"
+
msgid "swing"
msgstr "giratori"
@@ -15349,20 +15899,29 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilitat"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "excel·lent"
+msgstr "exceŀlent"
+msgctxt "trail_visibility"
msgid "good"
-msgstr "bo"
+msgstr "bona"
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "intermedi"
+msgstr "regular"
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "dolent"
+msgstr "dolenta"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "horrible"
+msgstr "pèssima"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "no"
msgid "Wheelchairs"
msgstr "Cadires de rodes"
@@ -15379,11 +15938,11 @@ msgstr "Camí de ferradura"
msgid "Edit Bridleway"
msgstr "Editar camí de ferradura"
-msgid "Cycle Lane"
-msgstr "Carril bici"
+msgid "Cycle Lane/Track"
+msgstr "Carril bici/Pista"
-msgid "Edit Cycle Lane"
-msgstr "Edita carril bici"
+msgid "Edit Cycle Lane or Track"
+msgstr "Modifica carril bici o pista"
msgid "Cycleway"
msgstr "Via ciclista"
@@ -15418,8 +15977,8 @@ msgstr "Via ciclista a la dreta"
msgid "Oneway (bicycle)"
msgstr "Unidireccional (bicicleta)"
-msgid "Edit Highway"
-msgstr "Edita carretera"
+msgid "Edit Highway Attributes:"
+msgstr "Modifica els atributs de la via"
msgid "Highway"
msgstr "Carretera"
@@ -15487,12 +16046,18 @@ msgstr "Àrea de descans"
msgid "Edit Rest Area"
msgstr "Edita Àrea de Descans"
-msgid "Emergency Phone"
-msgstr "Telèfon d''emergència (pal SOS)"
+msgid "Drinking Water"
+msgstr "Aigua potable"
msgid "Traffic Signal"
msgstr "Semàfor"
+msgid "Edit Traffic Signal"
+msgstr "Modifica senyal de trànsit"
+
+msgid "Optional crossing attributes:"
+msgstr "Atributs opcional d''una cruïlla:"
+
msgid "Pedestrian crossing type"
msgstr "Tipus de pas de vianants"
@@ -15500,7 +16065,7 @@ msgid "uncontrolled"
msgstr "sense control"
msgid "traffic_signals"
-msgstr "semafor"
+msgstr "traffic_signals"
msgid "island"
msgstr "illa"
@@ -15508,15 +16073,6 @@ msgstr "illa"
msgid "unmarked"
msgstr "sense marcar"
-msgid "Cross on horseback"
-msgstr "Cruïlla a cavall"
-
-msgid "Cross by bicycle"
-msgstr "Cruïlla amb bicicleta"
-
-msgid "Crossing attendant"
-msgstr "Cruïlla assistida"
-
msgid "Crossing type name (UK)"
msgstr "Nom de Tipus de Cruïlla (Regne Unit)"
@@ -15538,6 +16094,15 @@ msgstr "pegàs"
msgid "tiger"
msgstr "tigre"
+msgid "Crossing attendant"
+msgstr "Cruïlla assistida"
+
+msgid "Cross by bicycle"
+msgstr "Cruïlla amb bicicleta"
+
+msgid "Cross on horseback"
+msgstr "Cruïlla a cavall"
+
msgid "Stop"
msgstr "Stop"
@@ -15547,6 +16112,9 @@ msgstr "Cediu el pas"
msgid "Mini-roundabout"
msgstr "Minirotonda"
+msgid "Edit Mini-Roundabout"
+msgstr "Modifica mini-rotonda"
+
msgid "Direction"
msgstr "Direcció"
@@ -15556,11 +16124,8 @@ msgstr "sentit de les agulles del rellotge"
msgid "Pedestrian Crossing"
msgstr "Pas de vianants"
-msgid "Edit Crossing"
-msgstr "Edita Pas de vianants"
-
-msgid "Type name (UK)"
-msgstr "Introdueix el nom (Regne Unit)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Modifica pas de vianants"
msgid "Traffic Calming"
msgstr "Pacificació del trànsit"
@@ -15592,9 +16157,6 @@ msgstr "taula"
msgid "Passing Place"
msgstr "Lloc de Passants"
-msgid "Edit Passing Place"
-msgstr "Edita Lloc de Passants"
-
msgid "Turning Circle"
msgstr "Cercle de gir"
@@ -15628,20 +16190,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barreres"
+msgid "Block"
+msgstr "Bloc"
+
+msgid "Edit Block"
+msgstr "Edita bloc"
+
+msgid "Allowed traffic:"
+msgstr "Trànsit permès:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
+
msgid "Bollard"
msgstr "Bol·lard"
msgid "Edit Bollard"
-msgstr "Edita Bol·lard"
+msgstr "Modifica bol·lard"
-msgid "Allowed traffic:"
-msgstr "Trànsit permès:"
+msgid "Bollard type"
+msgstr "Tipus de bol·lard"
+
+msgid "rising"
+msgstr "ascendent"
+
+msgid "removable"
+msgstr "suprimible"
+
+msgid "plastic"
+msgstr "plàstic"
msgid "Cycle Barrier"
msgstr "Barrera ciclista"
-msgid "Block"
-msgstr "Bloc"
+msgid "Edit Cycle Barrier"
+msgstr "Modifica barrera per bicicletes"
msgid "Cattle Grid"
msgstr "Barrera canadenc"
@@ -15652,6 +16238,9 @@ msgstr "Edita barrera canadenca"
msgid "Bus Trap"
msgstr "Trampa per cotxes"
+msgid "Edit Bus Trap"
+msgstr "Modifica excavació per deixar passar només autobusos"
+
msgid "Spikes"
msgstr "Puntes"
@@ -15671,46 +16260,90 @@ msgid "Edit Border Control"
msgstr "Edita Duana"
msgid "Hedge"
-msgstr "Arbustos"
+msgstr "Bardissa"
+
+msgid "Edit Hedge"
+msgstr "Modifica bardissa"
+
+msgid "Height (meters)"
+msgstr "Altura (metres)"
+
+msgid "Genus"
+msgstr "Gènere"
+
+msgid "Species"
+msgstr "Espècies"
+
+msgid "Taxon"
+msgstr "Tàxon"
msgid "Fence"
msgstr "Tanca"
+msgid "Edit Fence"
+msgstr "Modifica tanca"
+
msgid "barbed_wire"
msgstr "filferro_espinat"
-msgid "chain"
-msgstr "cadena"
+msgid "chain_link"
+msgstr "tela metàl·lica"
msgid "electric"
msgstr "elèctric"
-msgid "hedge"
-msgstr "arbustos"
-
msgid "pole"
msgstr "pal"
msgid "split_rail"
msgstr "divisió_de_ferrocarril"
+msgid "wire"
+msgstr "fil metàl·lic"
+
+msgid "Guard Rail"
+msgstr "Guarda-rail"
+
+msgid "Edit Guard Rail"
+msgstr "Modifica guarda-rail"
+
msgid "Wall"
msgstr "Mur"
+msgid "Edit Wall"
+msgstr "Edita el mur"
+
msgid "City Wall"
msgstr "Muralla"
+msgid "Edit City Wall"
+msgstr "Modifica muralla"
+
msgid "Retaining Wall"
msgstr "Mur de contenció"
+msgid "Edit Retaining Wall"
+msgstr "Modifica mur de contenció"
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Sèquia"
+msgstr "Rasa"
-msgid "Entrance"
-msgstr "Entrada"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Modifica sèquia"
-msgid "Edit Entrance"
-msgstr "Edita l''entrada"
+msgid "Kerb"
+msgstr "Vorada"
+
+msgid "Edit Kerb"
+msgstr "Modifica vorada"
+
+msgid "Entrance (barrier opening)"
+msgstr "Accés (barrera oberta)"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Modifica accés (barrera oberta)"
msgid "Gate"
msgstr "Porta"
@@ -15743,12 +16376,27 @@ msgstr "Portella giratòria"
msgid "Edit Kissing Gate"
msgstr "Edita portella giratòria"
+msgid "Chain"
+msgstr "Cadena"
+
+msgid "Edit Chain"
+msgstr "Modifica cadena"
+
msgid "Stile"
msgstr "Escala de pas"
msgid "Edit Stile"
msgstr "Edita escala de pas"
+msgid "ladder"
+msgstr "Pas d''escala"
+
+msgid "squeezer"
+msgstr "pas d''escletxa"
+
+msgid "stepover"
+msgstr "pas de graons"
+
msgid "Turnstile"
msgstr "Torn"
@@ -15806,6 +16454,9 @@ msgstr "Canal de drenatge"
msgid "Edit Drain"
msgstr "Editar canal de drenatge"
+msgid "Ditch"
+msgstr "Sèquia"
+
msgid "Edit Ditch"
msgstr "Edita sèquia"
@@ -15815,6 +16466,12 @@ msgstr "Riera / Torrent"
msgid "Edit Stream"
msgstr "Edita riera / torrent"
+msgid "Wadi"
+msgstr "uadi"
+
+msgid "Edit Wadi"
+msgstr "Modifica uadi"
+
msgid "Canal"
msgstr "Canal"
@@ -15854,9 +16511,6 @@ msgstr "Edita presa"
msgid "Groyne"
msgstr "Espigó"
-msgid "Edit Groyne"
-msgstr "Edita Espigó"
-
msgid "Breakwater"
msgstr "Escullera"
@@ -15890,6 +16544,21 @@ msgstr "Modificar dipòsit cobert"
msgid "Edit Water"
msgstr "Edita aigua"
+msgid "Water Body"
+msgstr "Cos d''aigua"
+
+msgid "lake"
+msgstr "llac"
+
+msgid "lagoon"
+msgstr "llacuna"
+
+msgid "pond"
+msgstr "bassa"
+
+msgid "reservoir"
+msgstr "embassament"
+
msgid "Land"
msgstr "Aqüífer"
@@ -15971,20 +16640,25 @@ msgstr "Edita terminal de ferris"
msgid "Cargo"
msgstr "Càrrega"
+msgctxt "cargo"
msgid "passengers"
msgstr "passatgers"
+msgctxt "cargo"
msgid "vehicle"
msgstr "vehicle"
+msgctxt "cargo"
msgid "bicycle"
msgstr "bicicleta"
+msgctxt "cargo"
msgid "hgv"
-msgstr "vehicles pesants"
+msgstr "vehicle per a mercaderies pesants"
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "passatgers;vehicle"
+msgstr "passatgers;vehicles"
msgid "Ferry Route"
msgstr "Ruta de ferri"
@@ -16055,8 +16729,11 @@ msgstr "militar"
msgid "tourism"
msgstr "turisme"
-msgid "Service/Type"
-msgstr "Servei/Tipus"
+msgid "freight"
+msgstr "noli"
+
+msgid "Service type"
+msgstr "Tipus de servei"
msgid "yard"
msgstr "iardes"
@@ -16079,11 +16756,14 @@ msgstr "catenària"
msgid "rail"
msgstr "via fèrria"
-msgid "Voltage"
-msgstr "Tensió"
+msgid "Voltage in Volts (V)"
+msgstr "Voltatge en volts (V)"
-msgid "Frequency (Hz)"
-msgstr "Freqüència (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr "Freqüència en hertz (Hz)"
+
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -16094,9 +16774,6 @@ msgstr "Ferrocarril de via estreta"
msgid "Edit Narrow Gauge Rail"
msgstr "Edita ferrocarril de via estreta"
-msgid "Types"
-msgstr "Tipus"
-
msgid "Monorail"
msgstr "Funicular"
@@ -16139,18 +16816,56 @@ msgstr "Vies en desús"
msgid "Edit Disused Railway"
msgstr "Edita vies en desús"
-msgid "Optional Types"
-msgstr "Tipus opcionals"
-
msgid "Abandoned Rail"
msgstr "Vies abandonades"
+msgid "Edit Abandoned Railway"
+msgstr "Modifica via fèrria abandonada"
+
msgid "Level Crossing"
msgstr "Pas a nivell"
+msgid "Edit Level Crossing"
+msgstr "Modifica pas a nivell"
+
+msgid "Supervised"
+msgstr "Amb vigilància"
+
+msgid "Traffic lights"
+msgstr "Semàfors"
+
+msgid "Sound signals"
+msgstr "Senyals sonors"
+
+msgid "Barrier"
+msgstr "Barrera"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "si"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "no"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "mitja"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "completa"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "doble mitja barrera"
+
msgid "Crossing"
msgstr "Cruïlla"
+msgid "Edit Crossing"
+msgstr "Modifica cruïlla"
+
msgid "Crossing type"
msgstr "Tipus de cruïlla"
@@ -16250,13 +16965,11 @@ msgstr "Catifa màgica"
msgid "Edit Magic Carpet"
msgstr "Edita catifa màgica"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Mercaderies"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Edita mercaderies"
+msgstr "Modifica mercaderies"
msgctxt "aerialway"
msgid "Station"
@@ -16266,13 +16979,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Edita l''estació"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pilona"
+msgstr "Piló"
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Edita Pilona"
+msgstr "Modifica piló"
msgid "Parking"
msgstr "Aparcament"
@@ -16289,12 +17000,12 @@ msgstr "superfície"
msgid "underground"
msgstr "soterrat"
+msgid "rooftop"
+msgstr "terrat"
+
msgid "Access"
msgstr "Accés"
-msgid "customers"
-msgstr "clients"
-
msgid "Park and Ride"
msgstr "Aparcament Dissuasiu (P-R)"
@@ -16322,9 +17033,6 @@ msgstr "Places d''aparcament"
msgid "Edit Parking space"
msgstr "Edita places d''aparcament"
-msgid "rooftop"
-msgstr "terrat"
-
msgid "Capacity"
msgstr "Capacitat"
@@ -16340,20 +17048,38 @@ msgstr "Límit de temps (minuts)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Amb vigilància"
-
msgid "Opening Hours"
msgstr "Horari d''obertura"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Dll-Dv 8:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Dim-Diu 8:00-15:00;Dis 8:00-12:00"
+msgid "Sa-Su 00:00-24:00"
+msgstr "ds-dg 00:00-24:00"
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "dl-dv 08:30-20:00; ds,dg 08:00-15:00; festius tancat"
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "dl-dv 08:30-20:00,dt-dg 08:00-15:00; ds 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"dl-dg 08:00-18:00; 10-15 abril tancat; juny 08:00-14:00; agost tancat; 25 "
+"dec 25 tancat"
+
+msgid "sunrise-sunset"
+msgstr "ortus-ocàs"
+
+msgid "Su 10:00+"
+msgstr "dg 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "setmana 1-53/2 dv 09:00-12:00; setmana 2-52/2 dc 09:00-12:00"
msgid "Parking entrance"
msgstr "Entrada de l''aparcament"
@@ -16502,6 +17228,9 @@ msgstr "Estació de càrrega"
msgid "Edit Charging Station (for electric cars)"
msgstr "Edita estació de càrrega (cotxes elèctrics)"
+msgid "Voltage"
+msgstr "Tensió"
+
msgid "Amperage"
msgstr "Amperatge"
@@ -16523,6 +17252,12 @@ msgstr "Taller mecànic"
msgid "Edit Car Repair"
msgstr "Edita taller mecànic"
+msgid "Parts"
+msgstr "Parts"
+
+msgid "Edit Car Parts"
+msgstr "Modifica botiga de recanvis d''automòbil"
+
msgid "Tyres"
msgstr "Pneumàtics"
@@ -16550,6 +17285,12 @@ msgstr "Lloguer"
msgid "Edit Car Rental"
msgstr "Edita Lloguer de cotxes"
+msgid "Second hand"
+msgstr "Segona mà"
+
+msgid "only"
+msgstr "només"
+
msgid "Sharing"
msgstr "Compartició"
@@ -16574,22 +17315,6 @@ msgstr "Serveis:"
msgid "Sale"
msgstr "Venda"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "sí"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "marca"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "utilitzat"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "no"
-
msgid "brand"
msgstr "marca"
@@ -16611,9 +17336,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Parts"
-
msgid "Clothes"
msgstr "Roba"
@@ -16679,8 +17401,8 @@ msgstr "Edita Lloguer de bicicletes"
msgid "Public Transport"
msgstr "Transport públic"
-msgid "Route"
-msgstr "Ruta"
+msgid "Public transport route"
+msgstr "Ruta de transport públic"
msgid "Edit Route"
msgstr "Edita ruta"
@@ -16810,6 +17532,9 @@ msgstr "Andana"
msgid "Station or amenities"
msgstr "Estació o atractiu"
+msgid "Edit Stop Position"
+msgstr "Modifica la posició de la parada"
+
msgid "Bus"
msgstr "Autobús"
@@ -16840,6 +17565,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Transbordador"
+msgid "Edit Platform"
+msgstr "Modifica andana"
+
msgid "Bench"
msgstr "Banc per seure"
@@ -16852,9 +17580,6 @@ msgstr "Cadira de rodes"
msgid "limited"
msgstr "limitat"
-msgid "only"
-msgstr "només"
-
msgid "Highway platform (legacy)"
msgstr "Andana de carretera (antiga)"
@@ -16864,9 +17589,14 @@ msgstr "Andana de ferrocarril (antiga)"
msgid "funicular"
msgstr "funicular"
+msgctxt "railway"
msgid "Station"
msgstr "Estació"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edita Estació"
+
msgid "Building"
msgstr "Edifici"
@@ -16879,6 +17609,9 @@ msgstr "Edita Boca de metro"
msgid "Ticket Machine"
msgstr "Màquina Expenedora de bitllets"
+msgid "Edit Ticket Machine"
+msgstr "Modifica màquina expenedora de tiquets"
+
msgid "Reference Number"
msgstr "Número de línia"
@@ -16903,14 +17636,6 @@ msgstr "A compte o targetes de fidelització"
msgid "Public Transport (legacy)"
msgstr "Transport públic (antic)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Estació"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Edita Estació"
-
msgid "UIC-Reference"
msgstr "UIC-Referència"
@@ -16959,8 +17684,8 @@ msgstr "Edita andana de l''estació d''autobusos"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Edita parada de Taxis"
+msgid "Edit Taxi Station"
+msgstr "Modifica parada de taxis"
msgid "Airport"
msgstr "Aeroport"
@@ -17013,6 +17738,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Edita Terminal"
+msgid "Internet access"
+msgstr "Accés a Internet"
+
+msgid "wlan"
+msgstr "wi-fi"
+
+msgid "wired"
+msgstr "amb cable"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Tarifa d''accés a Internet"
+
msgctxt "airport"
msgid "Gate"
msgstr "Porta"
@@ -17035,21 +17775,6 @@ msgstr "Edita hotel"
msgid "Stars"
msgstr "Estrelles"
-msgid "Internet access"
-msgstr "Accés a Internet"
-
-msgid "wlan"
-msgstr "wi-fi"
-
-msgid "wired"
-msgstr "amb cable"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Tarifa d''accés a Internet"
-
msgid "Smoking"
msgstr "Fumar"
@@ -17233,6 +17958,12 @@ msgstr "Discoteca"
msgid "Edit Nightclub"
msgstr "Edita Discoteca"
+msgid "Stripclub"
+msgstr "Striptease"
+
+msgid "Edit Stripclub"
+msgstr "Modifica striptease"
+
msgid "Tourism"
msgstr "Turisme"
@@ -17254,9 +17985,15 @@ msgstr "Torre de guaita"
msgid "Information Office"
msgstr "Oficina d''informació"
+msgid "Edit Information Office"
+msgstr "Modifica oficina d''informació"
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr "Modifica mapa informatiu"
+
msgid "Detail Grade"
msgstr "Grau de Detall del mapa"
@@ -17269,6 +18006,9 @@ msgstr "carrer"
msgid "scheme"
msgstr "esquemàtic"
+msgid "toposcope"
+msgstr "Taula d''orientació"
+
msgid "Shown Area"
msgstr "Àrea que es mostra"
@@ -17308,6 +18048,9 @@ msgstr "... altres modes de transport possibles"
msgid "Information Board"
msgstr "Panell informatiu"
+msgid "Edit Information Board"
+msgstr "Modifica tauler informatiu"
+
msgid "Board Content"
msgstr "Contingut del panell"
@@ -17329,23 +18072,35 @@ msgstr "plantes"
msgid "Guidepost"
msgstr "Fita"
+msgid "Edit Guidepost"
+msgstr "Modifica pal indicatiu"
+
msgid "Information Terminal"
msgstr "Terminal d''informació"
+msgid "Edit Information Terminal"
+msgstr "Modifica terminal d''informació"
+
msgid "Closer description"
msgstr "Descripció"
msgid "Audioguide"
msgstr "Audioguia"
+msgid "Edit Audioguide"
+msgstr "Modifica audioguia"
+
msgid "Audioguide via mobile phone?"
msgstr "Audioguia a través del telèfon mòbil?"
msgid "Phone number"
msgstr "Número de telèfon"
-msgid "Other Information Points"
-msgstr "Altres punts d''informació"
+msgid "Other Information Point"
+msgstr "Altres tipus de punts d''informació"
+
+msgid "Edit Information Point"
+msgstr "Modifica punt d''informació"
msgid "Leisure"
msgstr "Oci"
@@ -17368,9 +18123,6 @@ msgstr "Parc per a gossos"
msgid "Edit Dog Park"
msgstr "Edita parc per a gossos"
-msgid "Barrier"
-msgstr "Barrera"
-
msgid "fence"
msgstr "tanca"
@@ -17395,11 +18147,20 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Edita Sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Dim-Diu 8:00-15:00;Dis 8:00-12:00"
+msgid "Horse riding"
+msgstr "Equitació"
-msgid "Playground"
-msgstr "Zona de jocs infantil"
+msgid "Edit Horse riding"
+msgstr "Modifica equitació"
+
+msgid "Brothel"
+msgstr "Bordell"
+
+msgid "Edit Brothel"
+msgstr "Modifica bordell"
+
+msgid "Playground"
+msgstr "Zona de jocs infantil"
msgid "Edit Playground"
msgstr "Edita Zona de jocs infantil"
@@ -17468,50 +18229,44 @@ msgstr "Art"
msgid "Edit Artwork"
msgstr "Edita Art"
-msgid "Place of Worship"
-msgstr "Lloc de culte"
-
-msgid "Edit Place of Worship"
-msgstr "Edita Lloc de culte"
-
-msgid "Religion"
-msgstr "Religió"
+msgid "Recording Studio"
+msgstr "Estudi de Gravació"
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr "Edita Estudi de Gravació"
-msgid "buddhist"
-msgstr "budista"
+msgid "audio"
+msgstr "àudio"
-msgid "christian"
-msgstr "cristià"
+msgid "video"
+msgstr "vídeo"
-msgid "hindu"
-msgstr "hindú"
+msgid "Place of Worship"
+msgstr "Lloc de culte"
-msgid "jain"
-msgstr "jainista"
+msgid "Church"
+msgstr "Església"
-msgid "jewish"
-msgstr "jueu"
+msgid "Edit Church"
+msgstr "Modifica església"
-msgid "muslim"
-msgstr "musulmà"
+msgid "Building type"
+msgstr "Tipus d''edifici"
-msgid "sikh"
-msgstr "sij"
+msgid "basilica"
+msgstr "basílica"
-msgid "spiritualist"
-msgstr "espiritualista"
+msgid "cathedral"
+msgstr "catedral"
-msgid "taoist"
-msgstr "taoista"
+msgid "chapel"
+msgstr "capella"
-msgid "unitarian"
-msgstr "unitari"
+msgid "church"
+msgstr "església"
-msgid "zoroastrian"
-msgstr "zoroastrià"
+msgid "temple"
+msgstr "temple"
msgid "Denomination"
msgstr "Denominació"
@@ -17528,6 +18283,12 @@ msgstr "catòlic"
msgid "evangelical"
msgstr "evangèlic"
+msgid "greek_catholic"
+msgstr "catòlica grega"
+
+msgid "greek_orthodox"
+msgstr "ortodoxa grega"
+
msgid "jehovahs_witness"
msgstr "testimonis_jehovà"
@@ -17540,6 +18301,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormó"
+msgid "new_apostolic"
+msgstr "neo apostòlica"
+
msgid "orthodox"
msgstr "ortodox"
@@ -17555,38 +18319,143 @@ msgstr "protestant"
msgid "quaker"
msgstr "quàquer"
+msgid "roman_catholic"
+msgstr "Catòlica romana"
+
+msgid "russian_orthodox"
+msgstr "otodoxa russa"
+
+msgid "seventh_day_adventist"
+msgstr "adventista del setè dia"
+
+msgid "Service Times"
+msgstr "Horari"
+
+msgid "18:00"
+msgstr "18:00"
+
+msgid "sunset,sunrise"
+msgstr "ortus,ocàs"
+
+msgid "Su 9:30,11:00"
+msgstr "dg 9:30,11:00"
+
+msgid "Sa,Su,PH 9:00"
+msgstr "ds,dg,festius 9:00"
+
+msgid "Sa 18:00; Su 10:45"
+msgstr "ds 18:00; dg 10:45"
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"dv 08:00-18:00; 10-15 abril tancat; juny 07:00-20:00; agost tancat; 24 dec "
+"08:00-24:00"
+
+msgid "Sa 10:00+"
+msgstr "ds 10:00+"
+
+msgid "Mosque"
+msgstr "Mesquita"
+
+msgid "Edit Mosque"
+msgstr "Modifica mesquita"
+
+msgid "mosque"
+msgstr "mesquita"
+
+msgid "ibadi"
+msgstr "ibadista"
+
msgid "shia"
msgstr "shia"
msgid "sunni"
msgstr "sunnita"
-msgid "Service Times"
-msgstr "Horari"
+msgid "Synagogue"
+msgstr "sinagoga"
-msgid "Su 10:00"
-msgstr "Dg 10:00"
+msgid "Edit Synagogue"
+msgstr "Modifica sinagoga"
-msgid "Su 10:30"
-msgstr "Dg 10:30"
+msgid "synagogue"
+msgstr "sinagoga"
-msgid "Su 11:00"
-msgstr "Dg 11:00"
+msgid "conservative"
+msgstr "conservador"
-msgid "Opening Hours for visiting"
-msgstr "Horaris de visita"
+msgid "reform"
+msgstr "reformista"
-msgid "Recording Studio"
-msgstr "Estudi de Gravació"
+msgid "Buddhist Temple"
+msgstr "Temple budista"
-msgid "Edit Studio"
-msgstr "Edita Estudi de Gravació"
+msgid "Edit Buddhist Temple"
+msgstr "Modifica temple budista"
-msgid "audio"
-msgstr "àudio"
+msgid "theravada"
+msgstr "theravada"
-msgid "video"
-msgstr "vídeo"
+msgid "mahayana"
+msgstr "mahayana"
+
+msgid "vajrayana"
+msgstr "vajrayana"
+
+msgid "Hindu Temple"
+msgstr "Temple hindú"
+
+msgid "Edit Hindu Temple"
+msgstr "Modifica temple hindú"
+
+msgid "vaishnavism"
+msgstr "vixnuisme"
+
+msgid "shaivism"
+msgstr "xivaisme"
+
+msgid "shaktism"
+msgstr "xactisme"
+
+msgid "smartism"
+msgstr "smartisme"
+
+msgid "Shinto Shrine"
+msgstr "Jinja"
+
+msgid "Edit Shinto Shrine"
+msgstr "Modifica jinja"
+
+msgid "Other Place of Worship"
+msgstr "Altre tipus de lloc de culte"
+
+msgid "Edit other Place of Worship"
+msgstr "Modifica altre tipus de lloc de culte"
+
+msgid "Religion"
+msgstr "Religió"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jainista"
+
+msgid "sikh"
+msgstr "sij"
+
+msgid "spiritualist"
+msgstr "espiritualista"
+
+msgid "taoist"
+msgstr "taoista"
+
+msgid "unitarian"
+msgstr "unitari"
+
+msgid "zoroastrian"
+msgstr "zoroastrià"
msgid "Public Building"
msgstr "Edificis Públics"
@@ -17675,6 +18544,12 @@ msgstr "Edita Autoescola"
msgid "License Classes"
msgstr "Tipus de carnet"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Salut"
@@ -17684,6 +18559,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Edita Hospital"
+msgid "Clinic"
+msgstr "Clinica"
+
+msgid "Edit Clinic"
+msgstr "Modifica clínica"
+
msgid "Doctors"
msgstr "CAP - Centre d''Atenció Primària"
@@ -17750,12 +18631,66 @@ msgstr "Veterinari"
msgid "Edit Veterinary"
msgstr "Edita Veterinari"
-msgid "Note"
-msgstr "Nota"
+msgid "Edit Toilets"
+msgstr "Modifica vàters públics"
+
+msgid "Access rights"
+msgstr "Drets d''accés"
+
+msgid "public"
+msgstr "públic"
+
+msgid "seasonal"
+msgstr "estacional"
+
+msgid "flush"
+msgstr "descàrrega"
+
+msgid "pitlatrine"
+msgstr "pou mort"
+
+msgid "chemical"
+msgstr "químic"
+
+msgid "bucket"
+msgstr "fossa sèptica"
+
+msgid "Usage Position"
+msgstr "Posició d''utilització"
+
+msgid "seated"
+msgstr "seient"
+
+msgid "seated;urinal"
+msgstr "seient; urinari"
+
+msgid "squat"
+msgstr "a la gatzoneta"
+
+msgid "urinal"
+msgstr "orinal"
msgid "Post Box"
msgstr "Bústia"
+msgid "Edit Postbox"
+msgstr "Modifica bústia"
+
+msgid "Collection times"
+msgstr "Horari de recollida"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "dl-dv 15:00,17:45,19:00,23:00; ds 15:10; dg 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "dl-dv 09:00-12:00,17:15; ds 14:00; festius tancat"
+
+msgid "Drive through"
+msgstr "Accés a servei amb cotxe (drive-through)"
+
msgid "Telephone"
msgstr "Telèfon"
@@ -17765,6 +18700,30 @@ msgstr "Edita Telèfon"
msgid "Telephone cards"
msgstr "Targetes telefòniques"
+msgid "Emergency Phone"
+msgstr "Telèfon d''emergència (pal SOS)"
+
+msgid "Internet Access"
+msgstr "Accés a Internet"
+
+msgid "Edit Internet Access"
+msgstr "Modifica accés a Internet"
+
+msgid "Automated Defibrillator"
+msgstr "Desfibril·lador automàtic"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Modifica desfibril·lador automàtic extern"
+
+msgid "Located inside a building?"
+msgstr "És a dins de l''edifici?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Darrera verificació (AAAA-MM-DD)"
+
+msgid "Last check note"
+msgstr "Darrera nota de verificació"
+
msgid "Clock"
msgstr "Rellotge"
@@ -17774,30 +18733,36 @@ msgstr "Edita rellotge"
msgid "Display"
msgstr "Pantalla"
-msgctxt "display"
msgid "analog"
msgstr "analògic"
-msgctxt "display"
msgid "digital"
msgstr "digital"
-msgctxt "display"
msgid "sundial"
msgstr "rellotge de sol"
-msgctxt "display"
msgid "unorthodox"
msgstr "no ortodox"
msgid "Support"
msgstr "Suport"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "pal"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr "mural"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "cartellera"
+msgstr "tanca publicitària"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "sòl"
msgid "Visibility/readability"
msgstr "Visibilitat/llegibilitat"
@@ -17826,8 +18791,8 @@ msgstr "Mostra la humitat"
msgid "Recycling"
msgstr "Recollida selectiva / Punt Net"
-msgid "Edit Recycling station"
-msgstr "Edita recollida selectiva/ Punt Net"
+msgid "Edit Recycling Station"
+msgstr "Modifica punt de reciclatge. Deixalleria."
msgid "Batteries"
msgstr "Piles"
@@ -17853,27 +18818,15 @@ msgstr "centre"
msgid "Waste Basket"
msgstr "Paperera"
-msgid "Edit Waste Basket"
-msgstr "Edita paperera"
-
msgid "Waste Disposal"
msgstr "Abocador"
-msgid "Edit Waste Disposal"
-msgstr "MOdificar abocador"
+msgid "Edit Bench"
+msgstr "Modifica banc"
msgid "Backrest"
msgstr "respatller"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
-msgid "plastic"
-msgstr "plàstic"
-
msgid "Amount of Seats"
msgstr "Quantitat de seients"
@@ -17908,14 +18861,17 @@ msgstr "Edita Base de caça"
msgid "Height"
msgstr "Alçada"
+msgctxt "height"
msgid "low"
msgstr "baix"
+msgctxt "height"
msgid "half"
-msgstr "mig"
+msgstr "mitja"
+msgctxt "height"
msgid "full"
-msgstr "complet"
+msgstr "alta"
msgid "Hide"
msgstr "Aguait"
@@ -17923,11 +18879,11 @@ msgstr "Aguait"
msgid "Lock"
msgstr "Bloca"
-msgid "Drinking Water"
-msgstr "Aigua potable"
+msgid "Edit Source of Potable Water"
+msgstr "Modifica font d''aigua potable"
-msgid "Edit Drinking Water"
-msgstr "Edita aigua potable"
+msgid "Indoor"
+msgstr "Interior"
msgid "Fire Hydrant"
msgstr "Boca d''incendis"
@@ -17954,6 +18910,9 @@ msgstr "estany"
msgid "Diameter (in mm)"
msgstr "Diàmetre (en mm)"
+msgid "Hydrant Position"
+msgstr "Emplaçament d''hidrant"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "carril"
@@ -17991,117 +18950,153 @@ msgstr "Estadi"
msgid "Edit Stadium"
msgstr "Edita estadi"
-msgid "select sport:"
-msgstr "Selecciona l''esport:"
+msgid "Select sport:"
+msgstr "Seleccioneu esport:"
-msgid "sport"
-msgstr "esport"
+msgid "Sport"
+msgstr "Esport"
+msgctxt "sport"
msgid "multi"
-msgstr "multiplica"
+msgstr "multi"
+msgctxt "sport"
msgid "archery"
msgstr "tir amb arc"
+msgctxt "sport"
msgid "athletics"
msgstr "atletisme"
+msgctxt "sport"
msgid "american_football"
-msgstr "futbol_americà"
+msgstr "futbol americà"
+msgctxt "sport"
msgid "australian_football"
-msgstr "futbol_australià"
+msgstr "futbol australià"
+msgctxt "sport"
msgid "baseball"
msgstr "beisbol"
+msgctxt "sport"
msgid "basketball"
msgstr "bàsquet"
+msgctxt "sport"
msgid "boules"
-msgstr "petanca"
+msgstr "Esport de boles"
+msgctxt "sport"
msgid "bowls"
-msgstr "bitlles"
+msgstr "bowls"
+msgctxt "sport"
msgid "canadian_football"
-msgstr "futbol_canadenc"
+msgstr "futbol canadenc"
+msgctxt "sport"
msgid "canoe"
msgstr "canoa"
+msgctxt "sport"
msgid "climbing"
msgstr "escalada"
+msgctxt "sport"
msgid "cricket"
msgstr "criquet"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "xarxa_criquet"
+msgstr "Xarxa de criquet"
+msgctxt "sport"
msgid "croquet"
msgstr "croquet"
+msgctxt "sport"
msgid "cycling"
msgstr "ciclisme"
+msgctxt "sport"
msgid "dog_racing"
-msgstr "carrera_gossos - canòdrom"
+msgstr "cursa de llebrers"
+msgctxt "sport"
msgid "equestrian"
-msgstr "hípica - hipòdrom"
+msgstr "equitació"
+msgctxt "sport"
msgid "gaelic_games"
msgstr "jocs gaèlics"
+msgctxt "sport"
msgid "golf"
msgstr "golf"
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gimnàstica"
+msgstr "ginnàtica"
+msgctxt "sport"
msgid "hockey"
msgstr "hoquei"
+msgctxt "sport"
msgid "horse_racing"
-msgstr "carrera_cavalls"
+msgstr "cursa de cavalls"
+msgctxt "sport"
msgid "motor"
msgstr "motor"
+msgctxt "sport"
msgid "pelota"
-msgstr "pilota basca/valenciana"
+msgstr "pilota"
+msgctxt "sport"
msgid "racquet"
msgstr "raqueta"
+msgctxt "sport"
msgid "rugby_league"
-msgstr "lliga_rugbi"
+msgstr "rugbi a 13"
+msgctxt "sport"
msgid "rugby_union"
-msgstr "unió_rugbi"
+msgstr "rugbi a 15"
+msgctxt "sport"
msgid "shooting"
msgstr "tir"
+msgctxt "sport"
msgid "skateboard"
msgstr "monopatí"
+msgctxt "sport"
msgid "skating"
msgstr "patinatge"
+msgctxt "sport"
msgid "skiing"
msgstr "esquí"
+msgctxt "sport"
msgid "soccer"
msgstr "futbol"
+msgctxt "sport"
msgid "swimming"
msgstr "natació"
+msgctxt "sport"
msgid "table_tennis"
-msgstr "tennis_taula"
+msgstr "tennis taula"
+msgctxt "sport"
msgid "tennis"
msgstr "tennis"
@@ -18135,33 +19130,43 @@ msgstr "Mini-Golf"
msgid "Edit Miniature Golf"
msgstr "Edita Mini-Golf"
-msgid "Sport"
-msgstr "Esport"
-
msgid "Multi"
msgstr "Multi"
msgid "Edit Multi"
msgstr "Edita Multi"
-msgid "type"
-msgstr "tipus"
-
+msgctxt "running"
msgid "pitch"
msgstr "pista/camp"
+msgctxt "running"
msgid "sports_centre"
-msgstr "centre_esports"
+msgstr "centre esportiu"
+msgctxt "running"
msgid "stadium"
msgstr "estadi"
+msgctxt "running"
+msgid "track"
+msgstr "pista"
+
msgid "9pin"
msgstr "9 forats"
msgid "Edit 9pin"
msgstr "Edita 9 forats"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgid "sports_centre"
+msgstr "centre_esports"
+
+msgid "stadium"
+msgstr "estadi"
+
msgid "10pin"
msgstr "10 forats"
@@ -18195,6 +19200,22 @@ msgstr "Edita Piragüisme"
msgid "Edit Cycling"
msgstr "Edita Ciclisme"
+msgctxt "racing"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "centre esportiu"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "estadi"
+
+msgctxt "racing"
+msgid "track"
+msgstr "pista"
+
msgid "Dog Racing"
msgstr "Canòdrom"
@@ -18207,8 +19228,33 @@ msgstr "Hípica"
msgid "Edit Equestrian"
msgstr "Edita Hípica"
-msgid "horse_riding"
-msgstr "muntar_cavalls"
+msgctxt "riding"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "centre esportiu"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "estadi"
+
+msgctxt "riding"
+msgid "track"
+msgstr "pista"
+
+msgid "clay"
+msgstr "argila"
+
+msgid "dirt"
+msgstr "terra"
+
+msgid "fine_gravel"
+msgstr "grava fina"
+
+msgid "mud"
+msgstr "fangar"
msgid "Horse Racing"
msgstr "Hipòdrom"
@@ -18226,7 +19272,7 @@ msgid "Skating"
msgstr "Patinatge"
msgid "Edit Skating"
-msgstr "Edita patinatge"
+msgstr "Modifica patinatge"
msgid "ice_rink"
msgstr "pista de gel"
@@ -18270,38 +19316,56 @@ msgstr "snow_park"
msgid "Difficulty"
msgstr "Dificultat"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "principiant"
+msgstr "principiants (verda)"
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "fàcil"
+msgstr "fàcil (blava)"
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "intermèdia (vermella)"
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "avançat"
+msgstr "difícil (negra)"
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "expert"
+msgstr "experts"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "esquí forapista"
+msgstr "freeride"
msgid "Grooming"
msgstr "màquina trepitjaneu"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "clàssic"
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "bamp"
+msgstr "acrobàtic"
+
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "patinatge"
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "clàssic;patinatge"
+msgstr "clàssic;patinador"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "moto de neu"
+msgstr "motoneu"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "fora_de_pista"
+msgstr "fora pista"
msgid "Shooting"
msgstr "Tir"
@@ -18342,19 +19406,15 @@ msgstr "Jocs Gaèlics"
msgid "Edit Gaelic Games"
msgstr "Modifica jocs gaèlics"
-msgctxt "gaelic game"
msgid "Hurling"
msgstr "Hurling"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Futbol gaèlic"
+msgstr "Futbol"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "Rounders"
@@ -18493,6 +19553,18 @@ msgstr "Aeromodelisme"
msgid "Edit Model Aerodrome"
msgstr "Edita Aeromodelisme"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "centre esportiu"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "pista"
+
msgid "RC Car"
msgstr "Pista per a cotxes teledirigits"
@@ -18505,59 +19577,133 @@ msgstr "Construccions"
msgid "Edit Building"
msgstr "Edita Edifici"
+msgctxt "building"
+msgid "yes"
+msgstr "si"
+
+msgctxt "building"
msgid "roof"
-msgstr "sostre"
+msgstr "cobert"
+msgctxt "building"
msgid "garage"
msgstr "garatge"
-msgid "church"
-msgstr "església"
+msgctxt "building"
+msgid "garages"
+msgstr "aparcaments"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+msgctxt "building"
msgid "school"
msgstr "escola"
+msgctxt "building"
msgid "hangar"
msgstr "hangar"
+msgctxt "building"
msgid "commercial"
msgstr "comercial"
+msgctxt "building"
msgid "farm"
msgstr "granja"
+msgctxt "building"
msgid "transportation"
msgstr "transports"
+msgctxt "building"
msgid "greenhouse"
msgstr "hivernacle"
+msgctxt "building"
msgid "office"
msgstr "oficina"
+msgctxt "building"
msgid "university"
msgstr "universitat"
+msgctxt "building"
+msgid "hospital"
+msgstr "hospital"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "magatzem"
+
+msgctxt "building"
+msgid "retail"
+msgstr "comerç al detall"
+
+msgctxt "building"
+msgid "shed"
+msgstr "cobert"
+
msgid "Residential Building"
msgstr "Edifici residencial"
msgid "Edit Residential Building"
msgstr "Edita edifici residencial"
-msgid "apartments"
+msgctxt "building"
+msgid "residential"
+msgstr "residencial"
+
+msgctxt "building"
+msgid "apartments"
msgstr "apartaments"
+msgctxt "building"
msgid "house"
msgstr "casa"
+msgctxt "building"
msgid "hut"
-msgstr "barraca"
+msgstr "refugi"
+msgctxt "building"
+msgid "dormitory"
+msgstr "dormitori"
+
+msgctxt "building"
msgid "terrace"
-msgstr "terrassa"
+msgstr "casa en filera"
+msgctxt "building"
msgid "detached"
-msgstr "separada"
+msgstr "casa unifamiliar"
+
+msgid "Entrance"
+msgstr "Entrada"
+
+msgid "Edit Entrance"
+msgstr "Edita l''entrada"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "si"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "principal"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "servei"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "sortida"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "emergència"
msgid "Tower"
msgstr "Torre"
@@ -18574,9 +19720,6 @@ msgstr "comunicacions"
msgid "observation"
msgstr "observació"
-msgid "Height (meters)"
-msgstr "Altura (metres)"
-
msgid "Flagpole"
msgstr "Pal de bandera"
@@ -18786,42 +19929,68 @@ msgstr "Horari de funcionament"
msgid "Mo-Fr 22:00-05:00"
msgstr "Dll-Dv 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Estació de mesurament"
+msgid "Monitoring Station"
+msgstr "Estació de monitorització"
-msgid "Edit Measurement Station"
-msgstr "Edita estació de mesurament"
+msgid "Edit Monitoring Station"
+msgstr "Edita estació de monitorització"
-msgid "Measurement"
-msgstr "Mesurament"
+msgid "Monitoring:"
+msgstr "Monitoritza:"
-msgid "particulate_matter"
-msgstr "partícules en suspensió"
+msgid "Weather"
+msgstr "Meteorologia"
-msgid "seismic"
-msgstr "sísmic"
+msgid "Water level"
+msgstr "Nivell d'aigua"
-msgid "water_level"
-msgstr "nivell_aigua"
+msgid "Tide Level"
+msgstr "NIvell de la marea"
-msgid "weather"
-msgstr "meteo"
+msgid "Traffic"
+msgstr "Trànsit"
-msgid "Recording"
-msgstr "Enregistrament"
+msgid "Air Quality"
+msgstr "Qualitat de l'aire"
-msgid "manually"
-msgstr "manualment"
+msgid "Noise"
+msgstr "Soroll"
-msgid "automated"
-msgstr "automatitzat"
+msgid "GPS Signals"
+msgstr "Senyal de GPS"
-msgid "remote"
-msgstr "remot"
+msgid "GLONASS Signals"
+msgstr "Senyals GLONASS"
-msgctxt "display"
-msgid "no"
-msgstr "no"
+msgid "Galileo Signals"
+msgstr "Senyals Galileu"
+
+msgid "Radiation"
+msgstr "Radiació"
+
+msgid "Seismic Activity"
+msgstr "Activitat sísmica"
+
+msgid "Recording:"
+msgstr "Enregistrament:"
+
+msgid "Automated"
+msgstr "Automatitzat"
+
+msgid "Manually"
+msgstr "Manual"
+
+msgid "Remote"
+msgstr "Remot"
+
+msgid "Display:"
+msgstr "Pantalla:"
+
+msgid "Analog"
+msgstr "Analògic"
+
+msgid "Digital"
+msgstr "Digital"
msgid "Survey Point"
msgstr "Vèrtex geodèsic"
@@ -18829,8 +19998,8 @@ msgstr "Vèrtex geodèsic"
msgid "Edit Survey Point"
msgstr "Edita vèrtex geodèsic"
-msgid "Surveillance"
-msgstr "Vigilància"
+msgid "Surveillance Camera"
+msgstr "Càmera de videovigilància"
msgid "Edit Surveillance Camera"
msgstr "Edita càmera de vigilància"
@@ -18841,12 +20010,103 @@ msgstr "interior"
msgid "outdoor"
msgstr "exterior"
-msgid "public"
-msgstr "públic"
+msgid "Zone"
+msgstr "Zona"
+
+msgid "parking"
+msgstr "aparcament"
+
+msgid "traffic"
+msgstr "trànsit"
+
+msgid "shop"
+msgstr "botiga"
+
+msgid "bank"
+msgstr "banc"
+
+msgid "Camera"
+msgstr "Càmera"
+
+msgid "fixed"
+msgstr "fixa"
+
+msgid "panning"
+msgstr "escombratge"
+
+msgid "dome"
+msgstr "dom"
+
+msgid "Mounted on"
+msgstr "Muntada sobre"
+
+msgid "ceiling"
+msgstr "sostre"
+
+msgid "Direction in degrees"
+msgstr "Direcció en graus"
+
+msgid "Inclination in degrees"
+msgstr "Inclinació en graus"
+
+msgid "Height in meter (m)"
+msgstr "Altura en metres (m)"
msgid "Power"
msgstr "Energia"
+msgid "Power Plant"
+msgstr "Central elèctrica"
+
+msgid "Edit Power Plant"
+msgstr "Modifica central elèctrica"
+
+msgid "Start date"
+msgstr "Data d''inici"
+
+msgid "Output forms of energy"
+msgstr "Formes de sortida d''energia"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+"(si us plau, afegiu aquesta informació pels generadors si és possible)"
+
+msgid "electricity"
+msgstr "electricitat"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "aigua calenta"
+
+msgid "hot air"
+msgstr "aire calent"
+
+msgid "cold water"
+msgstr "aigua freda"
+
+msgid "cold air"
+msgstr "aire fred"
+
+msgid "compressed air"
+msgstr "aire comprimit"
+
+msgid "steam"
+msgstr "de vapor"
+
+msgid "vacuum"
+msgstr "buit"
+
msgid "Power Generator"
msgstr "Generador elèctric"
@@ -18898,89 +20158,194 @@ msgstr "vent"
msgid "Method"
msgstr "Mètode"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "Digestió anaeròbica"
+msgstr "digestió anaeròbica"
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr "presa"
+msgctxt "generator method"
msgid "combustion"
msgstr "combustió"
-msgid "dam"
-msgstr "presa"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "bio / carbó/ gasoli / gas / gasolina / petroli / residus"
+msgctxt "generator method"
msgid "fission"
msgstr "fissió"
+msgctxt "generator method"
msgid "fusion"
msgstr "fusió"
+msgctxt "generator method"
msgid "gasification"
msgstr "gasificació"
-msgid "photovoltaic"
-msgstr "fotovoltaica"
-
-msgid "pumped-storage"
-msgstr "d''emmagatzematge per bombeig"
+msgid "biomass / waste"
+msgstr "biomassa / residus"
-msgid "pumping"
-msgstr "de bombeig"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "fotovoltaic"
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "piròlisi"
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr "central d''aigua fluent"
+msgctxt "generator method"
+msgid "stream"
+msgstr "corrent d''aigua"
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "termal"
+msgstr "tèrmica"
-msgid "Output forms of energy"
-msgstr "Formes de sortida d''energia"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "hidroelèctrica reversible"
-msgid "electricity"
-msgstr "electricitat"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "hidroelèctrica"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Tipus de generador"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr "cicle combinat"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "combustió de gas"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "turbina Francis"
-msgid "hot water"
-msgstr "aigua calenta"
+msgid "gas_turbine"
+msgstr "turbina de gas"
-msgid "hot air"
-msgstr "aire calent"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "biogas, biomassa, gas, combustió de residus"
-msgid "cold water"
-msgstr "aigua freda"
+msgid "heat_pump"
+msgstr "bomba de calor"
-msgid "cold air"
-msgstr "aire fred"
+msgid "horizontal_axis"
+msgstr "d''eix horitzontal"
-msgid "compressed air"
-msgstr "aire comprimit"
+msgid "tidal steam / wind"
+msgstr "mareomotriu / vent"
-msgid "steam"
-msgstr "de vapor"
+msgid "kaplan_turbine"
+msgstr "turbina Kaplan"
-msgid "vacuum"
-msgstr "buit"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+"central d''aigua fluent / central hidroelèctrica / central mareomotriu"
-msgid "battery charging"
-msgstr "càrrega de bateries"
+msgid "pelton_turbine"
+msgstr "turbina Pelton"
-msgid "Power Station"
-msgstr "Central elèctrica"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "central d''aigua fluent / central hidroelèctrica"
+
+msgid "reciprocating_engine"
+msgstr "motor d''explosió"
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "biocombustible, biogas, gasoli, gas, benzina"
+
+msgid "solar_photovoltaic_panel"
+msgstr "placa solar fotovoltaica"
+
+msgid "solar photovoltaic"
+msgstr "solar fotovoltaica"
+
+msgid "solar_thermal_collector"
+msgstr "col·lector tèrmic solar"
+
+msgid "solar thermal"
+msgstr "solar tèrmica"
+
+msgid "steam_generator"
+msgstr "generador de vapor"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "bio, carbó, gasoli, gas, benzina, petroli, combustió de residus"
+
+msgid "steam_turbine"
+msgstr "turbina de gas"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"geotèrmica / solar tèrmica / bio, carbó, petroli, combustió de residus"
+
+msgid "stellarator"
+msgstr "reactor estel·lar"
+
+msgid "nuclear fusion"
+msgstr "fusió nuclear"
+
+msgid "tokamak"
+msgstr "tokamak"
+
+msgid "vertical_axis"
+msgstr "d''eix vertical"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "reactor nuclear d''aigua bullent"
+
+msgid "nuclear fission"
+msgstr "fissió nuclear"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Reactor nuclear d''aigua bullint 2 (BWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Reactor nuclear d''aigua bullint 3 (BWR-3)"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Reactor nuclear d''aigua bullint 4 (BWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Reactor nuclear d''aigua bullint 5 (BWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Reactor nuclear d''aigua bullint 6 (BWR-6)"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Reactor CANDU"
-msgid "Edit Power Station"
-msgstr "Edita central elèctrica"
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "CPR-1000 (reactor xinès PWR)"
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Reactor europeu pressuritzat"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Fusió en confinament inercial"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Reactor d'aigua pressuritzada (PWR)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Reactor Vodo-Vodyanoi Energetichesky (VVER)"
+
+msgid "Output forms of energy:"
+msgstr "Formes d''energia produïda:"
msgid "Power Sub Station"
msgstr "Subestació elèctrica"
@@ -18991,6 +20356,21 @@ msgstr "Edita Subestació elèctrica"
msgid "Line reference"
msgstr "Línia de referència"
+msgid "high"
+msgstr "alt"
+
+msgid "medium"
+msgstr "mitjà"
+
+msgid "low"
+msgstr "baix"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "Armari de distribució"
@@ -19006,6 +20386,9 @@ msgstr "Edita Torre elèctrica"
msgid "Tower reference"
msgstr "Torre de referència"
+msgid "steel"
+msgstr "acer"
+
msgid "Pole"
msgstr "Pal"
@@ -19024,13 +20407,11 @@ msgstr "Edita línia elèctrica"
msgid "Line type"
msgstr "Tipus de línia"
-msgctxt "Power Line"
msgid "line"
msgstr "línia"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "línia_baixa_tensió"
+msgstr "línia secundària"
msgid "Amount of Cables"
msgstr "Quantitat de cables"
@@ -19137,11 +20518,11 @@ msgstr "Quiosc"
msgid "Edit Kiosk"
msgstr "Edita quiosc"
-msgid "Baker"
-msgstr "Fleca"
+msgid "Bakery"
+msgstr "Forn"
-msgid "Edit Baker"
-msgstr "Edita fleca"
+msgid "Edit Bakery"
+msgstr "Modifica forn"
msgid "Butcher"
msgstr "Carnisseria"
@@ -19152,8 +20533,8 @@ msgstr "Edita Carnisseria"
msgid "Seafood"
msgstr "Peixateria"
-msgid "Edit Seafood"
-msgstr "Edita Peixateria"
+msgid "Edit Seafood Shop"
+msgstr "Modifica peixateria"
msgid "Deli (Fine Food)"
msgstr "Delicatessen (al detall)"
@@ -19173,14 +20554,20 @@ msgstr "Mercat"
msgid "Edit Marketplace"
msgstr "Edita mercat"
+msgid "Organic"
+msgstr "Orgànica"
+
msgid "Greengrocer"
msgstr "Fruiteria"
msgid "Edit Greengrocer"
msgstr "Edita Fruiteria"
-msgid "Organic"
-msgstr "Orgànica"
+msgid "Farm Stand"
+msgstr "Venda directa de productes agraris"
+
+msgid "Edit Farm Stand"
+msgstr "Modifica venda directa de productes agraris"
msgid "Edit Organic/Bio"
msgstr "Modificar botiga d''aliments ecològics"
@@ -19251,8 +20638,8 @@ msgstr "Edita sastreria"
msgid "Fabric"
msgstr "Teixits"
-msgid "Edit Fabric"
-msgstr "Edita Botiga de teixits"
+msgid "Edit Fabric Shop"
+msgstr "Modifica botiga de teixits"
msgid "Electronic"
msgstr "Electrònica"
@@ -19272,14 +20659,14 @@ msgstr "Edita botiga d''electrònica"
msgid "Mobile Phone"
msgstr "Telèfons mòbils"
-msgid "Edit Mobile Phone"
-msgstr "Edita telèfons mòbils"
+msgid "Edit Mobile Phone Shop"
+msgstr "Modifica botiga de telefonia mòbil"
msgid "Vacuum Cleaner"
msgstr "Aspiradora"
-msgid "Edit Vacuum Cleaner"
-msgstr "Edita Aspiradora"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Modifica botiga d''aspiradores"
msgid "Hifi"
msgstr "Equips d''àudio"
@@ -19287,7 +20674,6 @@ msgstr "Equips d''àudio"
msgid "Edit Hifi Shop"
msgstr "Edita botiga d''equips d''àudio"
-msgctxt "shop"
msgid "Video"
msgstr "Vídeo"
@@ -19315,6 +20701,12 @@ msgstr "Edita Canvi de moneda"
msgid "Edit Automated Teller Machine"
msgstr "Edita caixer automàtic"
+msgid "Pawnbroker"
+msgstr "Empenyorament"
+
+msgid "Edit Pawnbroker"
+msgstr "Modifica empenyorament"
+
msgid "Department Store"
msgstr "Grans magatzems"
@@ -19351,11 +20743,32 @@ msgstr "Joieria"
msgid "Edit Jewelry"
msgstr "Edita Joieria"
+msgid "Gift"
+msgstr "Articles de regal"
+
+msgid "Edit Gift Shop"
+msgstr "Modifica botiga d''articles de regal"
+
+msgid "buddhist"
+msgstr "budista"
+
+msgid "christian"
+msgstr "cristià"
+
+msgid "hindu"
+msgstr "hindú"
+
+msgid "jewish"
+msgstr "jueu"
+
+msgid "muslim"
+msgstr "musulmà"
+
msgid "Erotic"
msgstr "Sex-shop"
-msgid "Edit Erotic"
-msgstr "Edita Sex-shop"
+msgid "Edit Erotic Shop"
+msgstr "Modifica sex shop"
msgid "Florist"
msgstr "Florista"
@@ -19384,8 +20797,8 @@ msgstr "Edita Botiga de Maquinari"
msgid "Paint"
msgstr "Pintura"
-msgid "Edit Paint"
-msgstr "Edita Pintura"
+msgid "Edit Paint Shop"
+msgstr "Modifica botiga de pintures"
msgid "Furniture"
msgstr "Mobles"
@@ -19396,20 +20809,20 @@ msgstr "Edita Botiga de mobles"
msgid "Kitchen"
msgstr "Cuines"
-msgid "Edit Kitchen"
-msgstr "Edita Botiga de Cuines"
+msgid "Edit Kitchen Store"
+msgstr "Modifica botiga de cuines"
msgid "Curtain"
msgstr "Cortina"
-msgid "Edit Curtain"
-msgstr "Edita Cortina"
+msgid "Edit Curtain Shop"
+msgstr "Modifica botiga de cortines"
msgid "Frame"
msgstr "Marc"
-msgid "Edit Frames"
-msgstr "Edita Marc"
+msgid "Edit Frames Shop"
+msgstr "Modifica botiga de marcs"
msgid "Stationery"
msgstr "Papereria"
@@ -19429,6 +20842,12 @@ msgstr "Llibreria"
msgid "Edit Book Store"
msgstr "Edita Llibreria"
+msgid "Newsagent''s shop"
+msgstr "Agència de premsa"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Modifica agència de premsa"
+
msgid "Travel Agency"
msgstr "Agència de Viatges"
@@ -19438,8 +20857,8 @@ msgstr "Edita Agència de Viatges"
msgid "Musical Instrument"
msgstr "Instruments Musicals"
-msgid "Edit Musical Instruments"
-msgstr "Edita Instruments Musicals"
+msgid "Edit Musical Instruments Shop"
+msgstr "Modifica botiga d''instruments musicals"
msgid "Toys"
msgstr "Joguineria"
@@ -19519,6 +20938,9 @@ msgstr "joguines"
msgid "vouchers"
msgstr "bons"
+msgid "Note"
+msgstr "Nota"
+
msgid "Geography"
msgstr "Geografia"
@@ -19648,6 +21070,12 @@ msgstr "Pic"
msgid "Edit Peak"
msgstr "Edita Pic"
+msgid "Saddle"
+msgstr "Coll"
+
+msgid "Edit Saddle"
+msgstr "Modifica coll"
+
msgid "Glacier"
msgstr "Glacera"
@@ -19687,24 +21115,33 @@ msgstr "Arbre"
msgid "Edit Tree"
msgstr "Edita arbre"
+msgid "broad_leaved"
+msgstr "planifoli"
+
+msgid "conifer"
+msgstr "coníferes"
+
+msgid "palm"
+msgstr "palmera"
+
msgid "Botanical Name"
msgstr "Nom botànic"
+msgid "Tree Row"
+msgstr "Filera d''arbres"
+
msgid "Wood"
msgstr "Bosc"
msgid "Edit Wood"
msgstr "Edita bosc"
-msgctxt "wood"
msgid "coniferous"
msgstr "coníferes"
-msgctxt "wood"
msgid "deciduous"
msgstr "caduc"
-msgctxt "wood"
msgid "mixed"
msgstr "barrejat"
@@ -19714,38 +21151,29 @@ msgstr "Plantació forestal"
msgid "Edit Forest Landuse"
msgstr "Edita plantació forestal"
-msgid "coniferous"
-msgstr "coníferes"
-
-msgid "deciduous"
-msgstr "caduc"
-
-msgid "mixed"
-msgstr "barrejat"
-
msgid "Grassland"
-msgstr ""
+msgstr "Prada"
msgid "Edit Grassland"
-msgstr ""
+msgstr "Modifica prada"
msgid "pampas"
-msgstr ""
+msgstr "pampa"
msgid "prairie"
-msgstr ""
+msgstr "prada"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
-msgstr ""
+msgstr "sabana"
msgid "steppe"
-msgstr ""
+msgstr "estepa"
msgid "veld"
-msgstr ""
+msgstr "veld"
msgid "Nature Reserve"
msgstr "Reserva Natural"
@@ -19798,6 +21226,12 @@ msgstr "Prat"
msgid "Edit Meadow Landuse"
msgstr "Edita Prat"
+msgid "Orchard"
+msgstr "Verger"
+
+msgid "Edit Orchard Landuse"
+msgstr "Modifica verger"
+
msgid "Vineyard"
msgstr "Vinya"
@@ -19852,8 +21286,8 @@ msgstr "Zona d''esbarjo"
msgid "Edit Recreation Ground Landuse"
msgstr "MOdifica Zona d''esbarjo"
-msgid "Residential area"
-msgstr "Zona residencial"
+msgid "Residential Area"
+msgstr "Àrea residencial"
msgid "Edit Residential Landuse"
msgstr "Edita zona residencial"
@@ -19864,6 +21298,9 @@ msgstr "Cementiri"
msgid "Edit Graveyard"
msgstr "Edita Cementiri"
+msgid "shinto"
+msgstr "xintoisme"
+
msgid "Cemetery"
msgstr "Cementiri"
@@ -19939,6 +21376,33 @@ msgstr "Edita Informació d''adreça"
msgid "Annotation"
msgstr "Anotacions"
+msgid "Edit Name Information"
+msgstr "Modifica el nom d''informació"
+
+msgid "Alternative name"
+msgstr "Nom alternatiu"
+
+msgid "Historical name"
+msgstr "Nom històric"
+
+msgid "Local name"
+msgstr "Nom local"
+
+msgid "Regional name"
+msgstr "Nom regional"
+
+msgid "National name"
+msgstr "Nom nacional"
+
+msgid "International name"
+msgstr "Nom internacional"
+
+msgid "Official name"
+msgstr "Nom oficial"
+
+msgid "Common name abbreviation"
+msgstr "Nom comú abreviat"
+
msgid "Edit Address Information"
msgstr "Edita informació d''adreça"
@@ -19957,30 +21421,6 @@ msgstr "Nom de la ciutat"
msgid "Country code"
msgstr "Codi del país"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "EUA"
-
msgid "Address Interpolation"
msgstr "Informació de l''adreça"
@@ -19999,6 +21439,18 @@ msgstr "parell"
msgid "alphabetic"
msgstr "alfabètic"
+msgid "Accuracy"
+msgstr "Acurat"
+
+msgid "actual"
+msgstr "actual"
+
+msgid "estimate"
+msgstr "estimat"
+
+msgid "potential"
+msgstr "potencial"
+
msgid "Contact (common schema)"
msgstr "Contacte (esquema comú)"
@@ -20161,26 +21613,55 @@ msgstr "on finalitza la sancionabilitat"
msgid "traffic light or barrier that stops you"
msgstr "semàfor o barrera que us atura"
-msgid "Route (legacy)"
-msgstr "Ruta (antiga)"
+msgid "General route"
+msgstr "Ruta genèrica"
-msgid "Edit Route (legacy)"
-msgstr "Modifica ruta (antiga)"
+msgid "Edit general route"
+msgstr "Modifica ruta genèrica"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "bicicleta"
+
+msgctxt "route type"
+msgid "bus"
+msgstr "autobús"
+
+msgctxt "route type"
msgid "road"
-msgstr "desconeguda"
+msgstr "carretera"
+
+msgctxt "route type"
+msgid "ferry"
+msgstr "ferri"
+msgctxt "route type"
msgid "ski"
-msgstr "esquí"
+msgstr "pista d''esquí"
+msgctxt "route type"
msgid "foot"
msgstr "a peu"
+msgctxt "route type"
msgid "hiking"
msgstr "excursionisme"
+msgctxt "route type"
+msgid "tram"
+msgstr "tramvia"
+
+msgctxt "route type"
msgid "detour"
-msgstr "desviament"
+msgstr "trencall"
+
+msgctxt "route type"
+msgid "railway"
+msgstr "ferrocarril"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "metro"
msgid "Symbol description"
msgstr "Descripció de símbols"
@@ -20227,20 +21708,23 @@ msgstr "punt final d''anada"
msgid "backward halt point"
msgstr "punt final de tornada"
-msgid "Route network"
-msgstr "Xarxa de Rutes"
+msgid "Route Network"
+msgstr "Xarxa de carreteres"
-msgid "Edit route network"
-msgstr "Edita xarxa de rutes"
+msgid "Edit Route Network"
+msgstr "Modifica xarxa de carreteres"
msgid "member"
msgstr "membre"
-msgid "Associated street"
+msgid "Associated Street"
msgstr "Carrer associat"
-msgid "Edit associated street"
-msgstr "Edita Carrer associat"
+msgid "Edit Associated Street"
+msgstr "Modifica carrer associat"
+
+msgid "house"
+msgstr "casa"
msgid "Street"
msgstr "Carrer"
@@ -20263,8 +21747,8 @@ msgstr "tot el relacionat amb el carrer"
msgid "Destination sign"
msgstr "Senyal de Destí"
-msgid "Edit Destination sign"
-msgstr "Edita Senyal de Destí"
+msgid "Edit Destination Sign"
+msgstr "Modifica senyal d''indicació"
msgid "Destination written on sign (w/o distance)"
msgstr "Destinació escrita al senyal (amb o sense distància)"
@@ -20359,18 +21843,27 @@ msgstr "vies que passen per sota del pont"
msgid "way forming the outline footprint"
msgstr "via que forma el pas de la gent"
-msgid "nodes forming the outline"
-msgstr "nodes que formen el pas"
+msgid "edge ways parallel to ''across''"
+msgstr "vies paral·leles a ''across''"
msgid "ways passing through the tunnel"
msgstr "vies que passen a través del túnel"
+msgid "edge ways parallel to ''through''"
+msgstr "vies paral·leles a ''through''"
+
msgid "bridge"
msgstr "pont"
msgid "deprecated"
msgstr "en desús"
+msgid "bicycle"
+msgstr "bicicleta"
+
+msgid "foot"
+msgstr "a peu"
+
msgid "horse"
msgstr "cavall"
@@ -20380,8 +21873,11 @@ msgstr "barrera"
msgid "motorroad"
msgstr "autopista/autovia"
-msgid "highway_track"
-msgstr "traçat_autopista"
+msgid "highway.track"
+msgstr "via.pista"
+
+msgid "livingdashed"
+msgstr "carrer residencial discontinu"
msgid "services"
msgstr "serveis"
@@ -20389,11 +21885,11 @@ msgstr "serveis"
msgid "ford"
msgstr "gual"
-msgid "highway_platform"
-msgstr "plataforma_autopista"
+msgid "highway.platform"
+msgstr "via.andana"
-msgid "emergency_access_point"
-msgstr "accés_punt_emergència"
+msgid "emergency.access.point"
+msgstr "emergència.punt d''accés"
msgid "riverbank"
msgstr "riba del riu"
@@ -20410,6 +21906,9 @@ msgstr "ràpids"
msgid "railwaypoint"
msgstr "punt de via fèrria"
+msgid "raildashed"
+msgstr "via fèrria discontínua"
+
msgid "railyard"
msgstr "platja de vies"
@@ -20425,29 +21924,29 @@ msgstr "via fèrria antiga"
msgid "aeroway"
msgstr "via aèria"
-msgid "aeroway_dark"
-msgstr "via_aèria_fosca"
+msgid "aeroway.dark"
+msgstr "aeroport.fosc"
-msgid "aeroway_light"
-msgstr "via_aèria_llum"
+msgid "aeroway.light"
+msgstr "aeroport.llum"
-msgid "piste_easy"
-msgstr "pista_verda"
+msgid "piste.easy"
+msgstr "pista fàcil"
-msgid "piste_intermediate"
-msgstr "pista_blava"
+msgid "piste.intermediate"
+msgstr "pista intermèdia"
-msgid "piste_advanced"
-msgstr "pista_vermella"
+msgid "piste.advanced"
+msgstr "pista avançada"
-msgid "piste_expert"
-msgstr "pista_negra"
+msgid "piste.expert"
+msgstr "pista expert"
-msgid "piste_freeride"
-msgstr "esquí forapista"
+msgid "piste.freeride"
+msgstr "pista freeride"
-msgid "piste_novice"
-msgstr "pista_iniciació"
+msgid "piste.novice"
+msgstr "pista debutants"
msgid "power"
msgstr "energia"
@@ -20467,20 +21966,20 @@ msgstr "port_esportiu"
msgid "amenity"
msgstr "equipament"
-msgid "amenity_traffic"
-msgstr "instal.lacions_semafor"
+msgid "amenity.traffic"
+msgstr "estructura de servei.trànsit"
-msgid "amenity_light"
-msgstr "estructura de servei (llum)"
+msgid "amenity.light"
+msgstr "estructura de servei.llum"
-msgid "light_water"
-msgstr "aigua (llum)"
+msgid "light.water"
+msgstr "llum.aigua"
msgid "health"
msgstr "salut"
-msgid "shop"
-msgstr "botiga"
+msgid "office"
+msgstr "oficina"
msgid "hotel"
msgstr "hotel"
@@ -20545,9 +22044,6 @@ msgstr "arbustos"
msgid "woodarea"
msgstr "bosc"
-msgid "mud"
-msgstr "fangar"
-
msgid "beach"
msgstr "platja"
@@ -20557,11 +22053,14 @@ msgstr "ruta"
msgid "boundary"
msgstr "límit"
+msgid "sport"
+msgstr "esport"
+
msgid "place"
msgstr "lloc"
-msgid "tiger_data"
-msgstr "dades_tiger"
+msgid "tiger.data"
+msgstr "dades TIGER"
msgid "address"
msgstr "adreça"
@@ -20575,9 +22074,6 @@ msgstr "Poble/Ciutat"
msgid "One Way"
msgstr "Sentit Únic"
-msgid "Church"
-msgstr "Església"
-
msgid "Fuel Station"
msgstr "Benzinera"
@@ -20594,272 +22090,471 @@ msgid "Test"
msgstr "Prova"
msgid "abbreviated street name"
-msgstr ""
+msgstr "nom abreviat del carrer"
msgid "oneway tag on a node"
-msgstr ""
+msgstr "etiqueta de sentit únic a un node"
msgid "bridge tag on a node"
-msgstr ""
+msgstr "etiqueta de pont a un node"
msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "etiqueta de via errònia a un node"
+
+msgid "wrong crossing tag on a way"
+msgstr "etiqueta incorrecta de cruïlla a una via"
msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "Via no classificada sense nom"
msgid "highway without a reference"
-msgstr ""
+msgstr "via sense referència"
msgid "temporary highway type"
-msgstr ""
+msgstr "via de tipus temporal"
msgid "misspelled key name"
-msgstr ""
+msgstr "nom de clau amb errors d''ortografia"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "carril bici amb etiqueta de bicicleta"
msgid "footway with tag foot"
-msgstr ""
+msgstr "camí per vianants amb etiqueta \"a peu\" (foot)"
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "carril bici independent com a part d''un carril bici"
msgid "barrier used on a way"
-msgstr ""
+msgstr "barrera utilitzada sobre una via"
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "velocitat màxima utilitzada a un camí per vianants"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "etiqueta de capa amb el signe +"
msgid "street name contains ss"
-msgstr ""
+msgstr "el nom del carrer conté ss"
msgid "relation without type"
-msgstr ""
+msgstr "relació sense tipus"
msgid "restaurant without name"
-msgstr ""
+msgstr "restaurant sense nom"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "combinació inusual d''etiquetes (via i curs d''aigua)"
msgid "unusual tag combination (highway & natural)"
-msgstr ""
+msgstr "combinació inusual d''etiquetes (via i natural)"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr "combinació inusual d''etiquetes (\"landuse\" i \"building\")"
+
+msgid "unnecessary access key"
+msgstr "clau d''accés innecessària"
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "clau \"motor_vehicle=yes\" innecessària"
msgid "natural water used for swimming pool"
-msgstr ""
+msgstr "etiqueta \"aigua natural\" utilitzada a una piscina"
-msgid "incline without highway"
-msgstr ""
+msgid "numerical key"
+msgstr "clau numèrica"
+
+msgid "route_master relation without route_master=*"
+msgstr "relació route_master sense route_master=*"
+
+msgid "power line without voltage"
+msgstr "xarxa elèctrica sense voltatge"
+
+msgid "substation key without power=substation"
+msgstr "etiqueta de subestació sense power=substation"
+
+msgid "transformer key without power"
+msgstr "transformador sense power"
+
+msgid "missing substation=*"
+msgstr "manca substation=*"
+
+msgid "missing transformer=*"
+msgstr "manca transformer=*"
+
+msgid "incline without highway or railway"
+msgstr "inclinació sense via o via fèrria"
msgid "junction without highway"
-msgstr ""
+msgstr "cruïlla sense via"
msgid "lanes without highway"
-msgstr ""
+msgstr "carrils sense via"
msgid "lcn without highway"
-msgstr ""
+msgstr "lcn sense via"
-msgid "lit without highway"
-msgstr ""
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "lit sense highway/railway/piste/parking/platform"
msgid "living_street without highway"
-msgstr ""
+msgstr "carrer residencial sense via"
msgid "maintenance without highway"
-msgstr ""
+msgstr "manteniment sense via"
msgid "median without highway"
-msgstr ""
+msgstr "mediana sense via"
msgid "motorroad without highway"
-msgstr ""
+msgstr "autopista sense via"
msgid "ntd_id without highway"
-msgstr ""
+msgstr "ntd_id sense via"
-msgid "oneway without highway"
-msgstr ""
+msgid "oneway without highway or railway"
+msgstr "sentit únic sense via o via fèrria"
msgid "sac_scale without highway"
-msgstr ""
+msgstr "escala sac sense via"
msgid "segregated without highway"
-msgstr ""
+msgstr "via segregada sense via"
msgid "sidewalk without highway"
-msgstr ""
+msgstr "vorera sense via"
msgid "smoothness without highway"
-msgstr ""
+msgstr "uniformitat de la superfície (smoothness) sense via"
msgid "snowplowing without highway"
-msgstr ""
+msgstr "llevaneus sense via"
msgid "step_count without highway"
-msgstr ""
+msgstr "step_count sense via"
msgid "toll without highway"
-msgstr ""
+msgstr "peatge sense via"
msgid "tracktype without highway"
-msgstr ""
+msgstr "tipus de pista sense via"
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "visibilitat de camí sense via"
msgid "trolley_wire without highway"
-msgstr ""
+msgstr "cable de tròlei sense via"
msgid "zip_left without highway"
-msgstr ""
+msgstr "zip_left sense via"
msgid "zip_right without highway"
-msgstr ""
+msgstr "zip_right sense via"
msgid "detail without railway"
-msgstr ""
+msgstr "detall sense via fèrria"
msgid "eddy_current_brake without railway"
-msgstr ""
+msgstr "fre elèctric sense ferrocarril"
msgid "electrified without railway"
-msgstr ""
+msgstr "electrificació sense ferrocarril"
msgid "etcs without railway"
-msgstr ""
+msgstr "sistema de control ETCS sense via fèrria"
msgid "gauge without railway"
-msgstr ""
+msgstr "ample de via sense via fèrria"
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "pendent de la via sense via fèrria"
msgid "kursbuchstrecke without railway"
-msgstr ""
+msgstr "kursbuchstrecke (horaris de tren) sense via fèrria"
msgid "lzb without railway"
-msgstr ""
+msgstr "senyalització LZB sense via fèrria"
msgid "old_railway_operator without railway"
-msgstr ""
+msgstr "antic operador de ferrocarril sense via fèrria"
msgid "operating_procedure without railway"
-msgstr ""
+msgstr "procediment d''operació sense via fèrria"
msgid "pzb without railway"
-msgstr ""
+msgstr "sistema de seguretat PZB sense via fèrria"
msgid "radio without railway"
-msgstr ""
+msgstr "ràdio sense via fèrria"
msgid "structure_gauge without railway"
-msgstr ""
+msgstr "gàlib sense via fèrria"
msgid "tilting_technologie without railway"
-msgstr ""
+msgstr "tecnologia pendular sense via fèrria"
msgid "track_class without railway"
-msgstr ""
+msgstr "tipus de via sense ferrocarril"
msgid "tracks without railway"
-msgstr ""
+msgstr "vies sense ferrocarril"
msgid "traffic_mode without railway"
-msgstr ""
+msgstr "mode de trànsit sense via fèrria"
msgid "usage without railway"
-msgstr ""
+msgstr "utilització sense via fèrria"
msgid "workrules without railway"
-msgstr ""
+msgstr "normes de treball sense via fèrria"
msgid "stream without waterway"
-msgstr ""
+msgstr "rierol sense curs d''aigua"
msgid "intermittent without waterway"
-msgstr ""
+msgstr "curs intermintent sense curs d''aigua"
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "vaixell sense curs d''aigua / aigua natural"
msgid "length_unit without waterway"
-msgstr ""
+msgstr "unitat de mesura sense curs d''aigua"
msgid "llid without waterway"
-msgstr ""
+msgstr "llid sense curs d''aigua"
msgid "canal without waterway"
-msgstr ""
+msgstr "canal sense curs d''aigua"
msgid "have_riverbank without waterway"
-msgstr ""
+msgstr "banc fluvial sense curs d''aigua"
-msgid "tunnel without highway/railway/waterway"
-msgstr ""
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "túnel sense highway/railway/waterway/platform/pipeline"
-msgid "bridge without highway/railway/waterway"
-msgstr ""
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "pont sense highway/railway/waterway/platform/piste/pipeline"
-msgid "psv without highway/railway/waterway"
-msgstr ""
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psv sense via/via fèrria/curs d''aigua/aparcament"
-msgid "width without highway/railway/waterway/aeroway"
-msgstr ""
+msgid "width without physical linear feature"
+msgstr "amplada sense una característica física lineal"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr ""
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "velocitat màxima sense via/via fèrria/senyal de trànsit"
+
+msgid "fence_type without barrier=fence"
+msgstr "tipus de tancat sense barrier=fence"
+
+msgid "border_type without boundary"
+msgstr "border_type sense boundary"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "recycling_type sense amenity=recycling"
+
+msgid "board_type without information=board"
+msgstr "board_type sense information=board"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "shelter_type sense amenity=shelter"
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "lamp_type sense highway=street_lamp"
+
+msgid "map_type without information=map"
+msgstr "map_type sense information=map"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "site_type sense historic=archaeological_site"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "artwork_type sense tourism=artwork"
+
+msgid "castle_type without historic=castle"
+msgstr "castle_type sense historic=castle"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "reservoir_type senselanduse/water=reservoir"
+
+msgid "bunker_type without military=bunker"
+msgstr "bunker_type sense military=bunker"
+
+msgid "source:addr without addr:*"
+msgstr "font:addr sense addr:*"
+
+msgid "source:date without source"
+msgstr "font:data sense font"
+
+msgid "source:name without name"
+msgstr "font:nom sense nom"
+
+msgid "source:maxspeed without maxspeed"
+msgstr "font:velocitat màxima sense velocitat màxima"
+
+msgid "source:building without building"
+msgstr "font:edifici sense edifici"
+
+msgid "source:ref without ref"
+msgstr "font:ref sense ref"
+
+msgid "source:population without population"
+msgstr "font: població sense població"
+
+msgid "source:geometry on a node"
+msgstr "font:geometria sobre un node"
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr "font:[addr:]codi postal sense addr:postcode"
+
+msgid "source:postal_code without addr:postcode"
+msgstr "font:postal_code sense addr:postcode"
+
+msgid "source:ele without ele"
+msgstr "font:ele sense ele"
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "font:ref:INSEE sense ref:INSEE"
+
+msgid "source:lit without lit"
+msgstr "font:lit sense lit"
+
+msgid "source:hgv without hgv"
+msgstr "font:hgv sense hgv"
+
+msgid "source:outline on a node"
+msgstr "font:contorn sobre un node"
+
+msgid "source:highway without highway"
+msgstr "font: via sense via"
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr "font:pes màxim per eix sense pes màxim per eix"
+
+msgid "source:surface without surface"
+msgstr "font:superfíce sense superfície"
+
+msgid "source:bridge without bridge"
+msgstr "font:pont sense pont"
+
+msgid "source:old_name without old_name"
+msgstr "font:old_name sense old_name"
+
+msgid "source:bicycle without bicycle"
+msgstr "font:bicicleta sense bicicleta"
+
+msgid "source:designation without designation"
+msgstr "font:designació sense designació"
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr "font:[addr:]housenumber sense addr:housenumber"
+
+msgid "source:height without height"
+msgstr "font:altura sense altura"
+
+msgid "source:lanes without lanes"
+msgstr "font:carrils sense carrils"
msgid "religion without denomination"
-msgstr ""
+msgstr "religió sense denominació"
msgid "unknown christian denomination"
-msgstr ""
+msgstr "denominació cristiana sense especificar"
msgid "unknown muslim denomination"
-msgstr ""
+msgstr "denominació musulmana sense especificar"
msgid "unknown jewish denomination"
-msgstr ""
+msgstr "denominació jueva sense especificar"
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"manca l''indicatiu de llengua de la viqupèdia, utilitzeu "
+"''wikipedia''=''llengua:article'' (p.ex: ''wikipedia''=''ca:Montseny''"
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr "prefix de llengua desconegut a l''etiqueta viquipèdia"
+
+msgid "layer should be between -5 and 5"
+msgstr "la capa ha d''estar entre -5 i 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr "el nivell ha de ser un nombre amb increments opcionals de .5"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"altura: en metres per defecte; el separador és el punt; en cas de la unitat "
+"inseriu un espai i llavors la unitat"
-msgid "unkown language prefix in wikipedia tag"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
+"altura màxima: en metres per defecte; el separador és el punt; en cas de la "
+"unitat inseriu un espai i llavors la unitat"
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"amplada: en metres per defecte; el separador és el punt; en cas de la unitat "
+"inseriu un espai i llavors la unitat"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"amplada màxima: en metres per defecte; el separador és el punt; en cas de la "
+"unitat inseriu un espai i llavors la unitat"
+
+msgid "unusual maxspeed format"
+msgstr "format inusual de velocitat màxima"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr "el voltatge ha d''estar en volts sense unitat/delimitador/espais"
+
+msgid "unusual frequency specification"
+msgstr "especificació inusual de freqüència"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "ample de via inusual; utilitzeu mm sense separador"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "pendent inusual; utilitzeu percentatges/graus o amunt/avall"
msgid "Landsat"
msgstr "Landsat"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "Inspector OSM: Robot de redacció"
-
msgid "Yahoo Sat"
msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
+
msgid "MapBox Satellite"
-msgstr "MapBox Satèl·lit"
+msgstr "MapBox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr "Tracks GPS d''Copy text \t OpenStreetMap"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Blanc i Negre)"
+msgstr "OpenStreetMap (Mapnik Black & White)"
+
+msgid "skobbler"
+msgstr "skobbler"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -20871,145 +22566,199 @@ msgid "Public Transport (ÖPNV)"
msgstr "Transport públic (ÖPNV)"
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Estil alemany)"
-
-msgid "Streets NRW Geofabrik.de"
-msgstr "Carrers NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Hike & Bike"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (sòrab)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (alemany)"
+msgstr "OpenStreetMap (estil alemany)"
-msgid "OpenPT Map (overlay)"
-msgstr "Mapa OpenPT (superposició)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodja, Laos, Tailàndia, Vietnam bilingüe"
-msgid "Bavaria (2 m)"
-msgstr "Baviera (2 m)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (40 cm)"
-msgstr "Hamburg (40 cm)"
-
-msgid "Hamburg (DK5)"
-msgstr "Hamburg (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI black-and-white 2.5m"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
-msgstr "Graz: Basiskarte (mapa base)"
+msgstr "Graz: Basiskarte (base map)"
msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris: DGM (model del terreny)"
+msgstr "Tiris: DGM (Terrain model)"
msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris: DOM (Model de superfície)"
+msgstr "Tiris: DOM (model de superfície)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Viena: Mehrzweckkarte (propòsit general)"
+msgstr "Vienna: Mehrzweckkarte (propòsit general)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Viena: Beschriftungen (anotacions)"
+msgstr "Vienna: Beschriftungen (anotacions)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Viena: Ortofoto (imatges aèries)"
+msgstr "Vienna: Orthofoto (imatgeria aèria)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Cantó d''Aargau 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Ciutat d''Uster Ortofoto 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Stadtplan Zürich"
-msgstr "Plànol de Zürich"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terrain model)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Cantó de Solothurn 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (model de superficie)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Cantó de Solothurn 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrography"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Cantó de Solothurn Infraroig 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Geobase Roads"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Cantó de Ginebra 5 cm (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Cantó de Neuchâtel 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Cantó del Jura 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Cantó de Fribourg 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Ciutat de Berna 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Dinamarca)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Ortofoto de Yverdon-les-Bains 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Dinamarca)"
-msgid "Geobase Hydrography"
-msgstr "Geobase Hidrografia"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Dinamarca)"
-msgid "Geobase Roads"
-msgstr "Geobase Carrers"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estonia Basemap (Maaamet)"
-msgid "Canvec"
-msgstr "Canvec"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortho (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr "Columbia Britànica Mosaic"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr "MSR Mapes Topogràfics"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgid "MSR Maps Urban"
-msgstr "MSR Mapes Urbans"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "USGS Scanned Topographic Maps"
-msgstr "Mapes Topogràfics USGS escanejats"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "USGS Large Scale Imagery"
-msgstr "Imatgeria USGS a gran escala"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "OSM US TIGER 2012 carreteres superposades"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "Czech CUZK:KM"
-msgstr "Txèquia CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Txèquia UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historic"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Orthophotos 2000"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-polzades Escòcia 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Orthophotoplan 2011"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Orthophotoplan 2007"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Orthophotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthophotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Streets NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Llengua sòrab)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (llengua alemanya)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Bavaria (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Erlangen 2013 imatge aèria (6,25 cm)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Erlangen 2011 imatge aèria (5,0 cm)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+"Mapa antic de Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Mapa antic de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haití)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -21027,7 +22776,7 @@ msgid "Lodi - Italy"
msgstr "Lodi - Itàlia"
msgid "Lombardia - Italy (CTR)"
-msgstr "Llombardia - Itàlia (CTR)"
+msgstr "Lombardia - Itàlia (CTR)"
msgid "Sicily - Italy"
msgstr "Sicília - Itàlia"
@@ -21039,58 +22788,61 @@ msgid "PCN 2008 - IT Lazio+Umbria"
msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr "URSS - Letònia"
+msgstr "URSS- Letònia"
msgid "50cm ortho - Latvia"
-msgstr "50cm ortho - Letònia"
+msgstr "50cm orto - Letònia"
msgid "20cm ortho - Coastline"
-msgstr "20cm orto - Línia costanera"
+msgstr "20cm ortho - Coastline"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lituània)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger Delta Oct 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinan/Bulacan (Filipines alta resolució)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Car"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Cyclo"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - Ortofotos 2010-2012"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Ski"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slovakia EEA GMES Urban Atlas"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Ortofotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slovakia EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Ortofotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr "Mapes històrics de Eslovàquia"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "South Africa CD:NGI Aerial"
msgid "Catastro Spain"
-msgstr "Cadastre Espanya"
+msgstr "Cadastre d''Espanya"
msgid "PNOA Spain"
msgstr "PNOA Espanya"
@@ -21102,94 +22854,154 @@ msgid "GRAFCAN - Canary Islands"
msgstr "GRAFCAN - Illes Canàries"
msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castella i Lleó"
+msgstr "ITACyL - Castilla i Lleó"
+
+msgid "IDEIB - Balearic Islands"
+msgstr "IDEIB - Illes Balears"
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stadt Uster Orthophoto 2008 10cm"
+
+msgid "Stadtplan Zürich"
+msgstr "Stadtplan Zürich"
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Canton de Génève 5cm (SITG 2011)"
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton du Jura 50cm (RCJU 1998)"
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Canton de Fribourg 50cm (2005)"
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stadt Bern 10cm/25cm (2008)"
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Orthophoto 2012"
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthophoto 2012"
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Orthophoto technique 2012"
+
+msgid "MSR Maps Topo"
+msgstr "MSR Maps Topo"
+
+msgid "MSR Maps Urban"
+msgstr "MSR Maps Urban"
+
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Scanned Topographic Maps"
-msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Illes Balears"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Large Scale Imagery"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Mapa base d''Estònia (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Roads Overlay"
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estònia Orto (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Nous carrers creats per TIGER desalineats (TIGER 2013)"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estònia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
+msgstr "OSM - Tiger Edited Map"
-msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Dinamarca)"
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dinamarca)"
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ukraine - Orthophotomaps 2012"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
+msgstr "OS New Popular Edition historic"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodja,Laos,Tailàndia,Vietnam bilingüe"
+msgid "Surrey Air Survey"
+msgstr "Surrey Air Survey"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr ""
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "South Africa CD:NGI Aerial"
-msgstr "Sud-àfrica CD:NGI Aeri"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Cotxes"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Excursionisme"
+msgid "OS 1:25k historic (OSM)"
+msgstr "OS 1:25k historic (OSM)"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Bicicleta"
+msgid "OS Scottish Popular historic"
+msgstr "OS Scottish Popular historic"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Esquí"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "Plànols de ciutats OS, Cupar 1854 (NLS)"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
+msgstr "Exporta OSM"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporta dades de trànsit a un fitxer SUMO"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
+msgstr "Exportació SUMO"
-msgid "Slovakia Historic Maps"
-msgstr "Slovakia Historic Maps"
+msgid "Export"
+msgstr "Exporta"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI blanc-i-negre 2.5m"
+msgid "Port:"
+msgstr "Port:"
-msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Edició Tiger"
+msgid "refresh the port list"
+msgstr "refrescar la llista de ports"
-msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k històric (OSM)"
+msgid "Configure"
+msgstr "Configura"
-msgid "OS Scottish Popular historic"
-msgstr "OS Scottish Popular historic"
+msgid "Connection Error."
+msgstr "S''ha produït un error en la connexió."
-msgid "Stuttgart (Luftbild)"
-msgstr "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
+msgstr "configura el DG100 connectat"
-msgid "2u"
-msgstr ""
+msgid "delete data after import"
+msgstr "suprimir les dades després d''importar"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -21198,7 +23010,7 @@ msgid "Importing CSV file ''%s''..."
msgstr "Important fitxer CSV ''%s''..."
msgid "Markers of "
-msgstr ""
+msgstr "Marcadors de "
msgid "Show summary after import"
msgstr "Mostra resum després d''importació"
@@ -21401,6 +23213,18 @@ msgstr "Mostra el perfil d''alçada"
msgid "Elevation Profile"
msgstr "Perfil de desnivell"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Capa de graella d''elevació (experimental)"
+
+msgid "Shows elevation grid layer"
+msgstr "Mostra la capa de la graella d''elevació"
+
+msgid "Elevation Grid"
+msgstr "Graella d''elevació"
+
+msgid "No SRTM data"
+msgstr "Cap dada de tipus SRTM"
+
msgid "Open the elevation profile window."
msgstr "Obre la finestra del perfil de desnivell"
@@ -21422,14 +23246,8 @@ msgstr "Guany"
msgid "Time"
msgstr "Hora"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "Automàtic"
-
-msgid "Fixed value"
-msgstr "Valor fix"
+msgid "Tracks"
+msgstr "Tracks"
msgid "Elevation profile for track ''{0}''."
msgstr "Perfil de desnivell del track ''{0}''."
@@ -21459,7 +23277,7 @@ msgid "Enter key mode"
msgstr "Escriu mode de clau"
msgid "Auto add tags"
-msgstr ""
+msgstr "Afegeix etiquetes automàticament"
msgid "Autosimplify"
msgstr "Autosimplifica"
@@ -21480,10 +23298,10 @@ msgid "Add fixed points on spacebar"
msgstr "Afegeix punts fixos a la barra d''espai"
msgid "Draw closed polygons only"
-msgstr ""
+msgstr "Dibuixa només polígons tancats"
msgid "Try copying tags from properties table"
-msgstr ""
+msgstr "Prova de copiar les etiquetes de la taula de propietats"
msgid "FastDraw settings"
msgstr "Configuració FastDraw"
@@ -21704,9 +23522,15 @@ msgstr "Selecciona les adreces incompletes"
msgid "Selects all addresses with incomplete data."
msgstr "Selecciona totes les adreces amb dades incompletes."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Utilitzeu les etiquetes 'addr:street' o 'addr:place'"
+
msgid "House Number Editor"
msgstr "Editor de numeraricó de carrers"
+msgid "House number increment:"
+msgstr "Increment de número de carrer:"
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Actualitzant les propietats d''{0} objecte"
@@ -21733,6 +23557,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Propietats de la capa"
+msgid "Error while creating image layer: {0}"
+msgstr "Error en crear la capa d''imatge: {0}"
+
msgid "Import image"
msgstr "Importa imatge"
@@ -21813,9 +23640,21 @@ msgstr "Obre una finetra amb una llista de selecció d''OSM Inspector"
msgid "Current Selected Bug Info"
msgstr "Informació sobre els errors seleccionats"
+msgid "Prev OSMI bug"
+msgstr "Error OSMI anterior"
+
+msgid "Next OSMI bug"
+msgstr "Error OSMI següent"
+
msgid "Osm Inspector Bugs"
msgstr "Errors d''Osm Inspector"
+msgid "OSM Inspector Bugs"
+msgstr "Inspector d''errors d''OSM"
+
+msgid "Selected Bug Info"
+msgstr "Informació dels errors seleccionats"
+
msgid "Handy Address Interpolation Functions"
msgstr "Funcions facilitades per la interpolació d''adreces"
@@ -21903,8 +23742,8 @@ msgstr "S''esperen nombres imparells"
msgid "Expected even numbers for addresses"
msgstr "S''esperen nombres parells"
-msgid "Expected valid number for address increment"
-msgstr "S''esperava un nombre vàlid per l''increment de l''adreça"
+msgid "Expected valid number for increment"
+msgstr "S''esperava un número vàlid com a increment"
msgid "Country code must be 2 letters"
msgstr "El codi de país ha de contenir dues lletres"
@@ -22283,15 +24122,6 @@ msgstr "Nombre de carrer:"
msgid "Street Name:"
msgstr "Nom del carrer:"
-msgid "Increment"
-msgstr "Increment"
-
-msgid "Decrement"
-msgstr "Disminueix"
-
-msgid "Numbers:"
-msgstr "Nombres:"
-
msgid "Big buildings mode"
msgstr "Mode de grans edificis"
@@ -22486,6 +24316,9 @@ msgstr "Desactiva l''enquadrament de les imatges durant la georeferenciació"
msgid "Use \"Tableau d''assemblage\""
msgstr "Utilitza el \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr "Substitueix l''ombrejat en gris per color blanc"
+
msgid "Select first WMS layer in list."
msgstr "Seleccionar la primera capa WMS de la llista."
@@ -22506,12 +24339,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alt"
-
-msgid "medium"
-msgstr "mitjà"
-
msgid "symbol"
msgstr "símbol"
@@ -22666,6 +24493,11 @@ msgstr ""
"Afegeix els ''tableaux d''assemblage\" (taulers d''assemblatge) a la llista "
"de capes cadastrals a descarregar"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Substitueix l''escala de grisos per color blanc (fitxers més petits i poca "
+"utilització de memòria)"
+
msgid "Display crosspieces:"
msgstr "Mostra encavalcaments:"
@@ -22686,6 +24518,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Habiliteu això per utilitzar l''etiqueta \"add:street\" als nodes."
+msgid "Unexpected file extension. {0}"
+msgstr "Extensió de fitxer no esperada. [{0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "Afegir \"source=...\" (font) als objectes?"
@@ -22775,54 +24610,6 @@ msgstr ""
"Aquesta imatge conté dades georeferenciades.\n"
"Les voleu utilitzar?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Feu clic sobre el primer punt (cantonada) per retallar la imatge\n"
-"(es necessiten dos punts)"
-
-msgid "Image cropping"
-msgstr "Retallat de la imatge"
-
-msgid "Click second corner for image cropping"
-msgstr "Feu clic sobre el segon punt (cantonada) per retallar la imatge"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Feu clic sobre el primer encreuament Lambert per georeferenciar \n"
-"(són necessaris dos punts)"
-
-msgid "Image georeferencing"
-msgstr "Georeferenciació d''imatges"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Feu clic sobre el segon encreuament Lambert per georeferenciar"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Voleu anul·lar definitivament\n"
-"o només tornar a provar "
-
-msgid "Enter cadastre east,north position"
-msgstr "Indiqueu una posició del cadastre (coordenades est i nord)"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Avís: comproveu el nord amb la fletxa !!)"
-
-msgid "East"
-msgstr "Est"
-
-msgid "I use the mouse"
-msgstr "Utilitzo el ratolí"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Establir {0} coordenades Lambert"
-
msgid "Load layer from cache"
msgstr "Carregar de la memòria cau"
@@ -22880,7 +24667,13 @@ msgid "Add new layer"
msgstr "Afegeix una nova capa"
msgid "Open Cadastre Preferences"
-msgstr ""
+msgstr "Preferències de l''Open Cadastre"
+
+msgid "Refine georeferencing"
+msgstr "Refina la georeferenciació"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Millora la georeferenciació (només imatges ràster)"
msgid "Reset cookie"
msgstr "Inicialitzar galeta"
@@ -22888,14 +24681,72 @@ msgstr "Inicialitzar galeta"
msgid "Get a new cookie (session timeout)"
msgstr "Obtenir una nova galeta (la sessió ha expirat)"
-msgid "Save image as PNG"
-msgstr "Desar la imatge com a PNG"
+msgid "Save image as..."
+msgstr "Desa la imatge com..."
msgid "PNG files (*.png)"
msgstr "Fitxers PNG (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Exporta en format PNG (només les imatges ràster)"
+msgid "GeoTiff files (*.tif)"
+msgstr "Fitxer GeoTiff (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Exporta la imatge (nomes imatges ràster)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Feu clic sobre el primer punt (cantonada) per retallar la imatge\n"
+"(es necessiten dos punts)"
+
+msgid "Image cropping"
+msgstr "Retallat de la imatge"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Feu clic sobre el primer encreuament Lambert per georeferenciar \n"
+"(són necessaris dos punts)"
+
+msgid "Image georeferencing"
+msgstr "Georeferenciació d''imatges"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Voleu anul·lar definitivament\n"
+"o només tornar a provar "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Ui! no s''han obtingut totes les coordenades\n"
+"correctsment. Si us plau torneu a provar."
+
+msgid "Enter cadastre east,north position"
+msgstr "Indiqueu una posició del cadastre (coordenades est i nord)"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Avís: comproveu el nord amb la fletxa !!)"
+
+msgid "East"
+msgstr "Est"
+
+msgid "I use the mouse"
+msgstr "Utilitzo el ratolí"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Establir {0} coordenades Lambert"
+
+msgid "Click second corner for image cropping"
+msgstr "Feu clic sobre el segon punt (cantonada) per retallar la imatge"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Feu clic sobre el segon encreuament Lambert per georeferenciar"
msgid "Adjust WMS"
msgstr "Adjustament WMS"
@@ -22923,8 +24774,11 @@ msgstr "Capa WMS ({0}), {1} tessel·les carregades"
msgid "Is not vectorized."
msgstr "No és vectorial"
-msgid "Raster size: {0}"
-msgstr "Mida de la imatge ràster: {0}"
+msgid "Bounding box: {0}"
+msgstr "Rectangle de selecció: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Mida de la imatge (px): {0}/{1}"
msgid "Is vectorized."
msgstr "ÉS vectorial."
@@ -22976,7 +24830,7 @@ msgstr "Suprimir l''esquema seleccionat de la llista."
msgid "Color Schemes"
msgstr "Esquemes de color"
-msgid "Adress"
+msgid "Address"
msgstr "Adreça"
msgid "Split area"
@@ -23024,6 +24878,9 @@ msgid "Please select 1 or more ways to download along"
msgstr ""
"Si us plau seleccioneu 1 o més vies per descarregar dades al seu llarg"
+msgid "Download from OSM along selected ways"
+msgstr "Descarrega dades d''OSM al llarg de les vies seleccionades"
+
msgid "{0} intermediate nodes to download."
msgstr "{0} nodes intermedis a descarregar"
@@ -23099,6 +24956,73 @@ msgstr "Eina nova..."
msgid "Install"
msgstr "Instal·la"
+msgid "Public"
+msgstr "Públic"
+
+msgid "Could not get server response, check logs"
+msgstr ""
+"No ha estat possible d''obtenir una resposta del servidor, mireu el registre "
+"per més informació"
+
+msgid "Failed to login as {0}:"
+msgstr "Ha fallat l''accés com {0}:"
+
+msgid "The server did not return user ID"
+msgstr "El servidor no ha retornat l''ID d''usuari"
+
+msgid "Failed to send message:"
+msgstr "Ha fallat l''enviament del missatge:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Ha fallat l''obtenció de missatges com {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Open GeoChat panel"
+
+msgid "Zoom in to see messages"
+msgstr "Amplia per veure missatges"
+
+msgid "Login"
+msgstr "Inici de sessió"
+
+msgid "Enable autologin"
+msgstr "Activa l''inici automàtic de sessió"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} usuari"
+msgstr[1] "{0} usuaris"
+
+msgid "not logged in"
+msgstr "no connectat"
+
+msgid "User {0} has left"
+msgstr "L''usuari {0} ha sortit"
+
+msgid "User {0} is mapping nearby"
+msgstr "L''usuari {0} està cartografiant a la rodalia"
+
+msgid "Users mapping nearby:"
+msgstr "Usuaris que es troben cartografiant a la rodalia:"
+
+msgid "Private chat"
+msgstr "Xat privat"
+
+msgid "Close tab"
+msgstr "Tanca la pestanya"
+
+msgid "Logout"
+msgstr "Tanca la sessió"
+
+msgid "Clear log"
+msgstr "Neteja el registre"
+
+msgid "Show users on map"
+msgstr "Mostra usuaris sobre el mapa"
+
msgid "Position only"
msgstr "Només posició"
@@ -23140,26 +25064,8 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Format de registre desconegut"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refrescar la llista de ports"
-
-msgid "Configure"
-msgstr "Configura"
-
-msgid "Configure Device"
-msgstr "Configura dispositiu"
-
-msgid "Connection Error."
-msgstr "S''ha produït un error en la connexió."
-
-msgid "configure the connected DG100"
-msgstr "configura el DG100 connectat"
-
-msgid "delete data after import"
-msgstr "suprimir les dades després d''importar"
+msgid "Configure Device"
+msgstr "Configura dispositiu"
msgid "Importing data from device."
msgstr "Important dades del dispositiu"
@@ -23587,6 +25493,9 @@ msgstr "Generar límits d''imatgeria XML per la selecció"
msgid "edit bounds for selected defaults"
msgstr "modificar límits pels predeterminats seleccionats"
+msgid "Download imagery XML bounds"
+msgstr "Descarrega els límits XML de la imatgeria"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23600,42 +25509,47 @@ msgid "Open Imagery XML file"
msgstr "Obre fitxer d''imatgeria XML"
msgid "Calibration Layer"
-msgstr ""
+msgstr "Capa de calibratge"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Una geometria de calibratge obsoleta de {0} nodes prop de {1}"
msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Una geometria de calibratge de {0} nodes prop de {1}"
msgid "Change Color"
-msgstr ""
+msgstr "Canvia el color"
msgid "Deprecate Offset"
-msgstr ""
+msgstr "Decalatge obsolet"
msgid "Are you sure this imagery offset is wrong?"
-msgstr ""
+msgstr "Esteu segur que el decalatge de la imatgeria és dolent?"
msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr ""
+msgstr "Esteu segur que aquesta geometria de calibratge està mal alineada?"
msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgstr "Avís: l''obsolescència és irreversible!"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr ""
+"Per enregistrar decalatges d''imatgeria heu de ser un usuari registrat d''OSM"
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
msgstr ""
+"Si us plau, indiqueu la raó per la que voleu marcar aquest decalatge "
+"d''imatgeria com a obsolet"
msgid ""
"Please enter the reason why you mark this calibration geometry as deprecated"
msgstr ""
+"Si us plau, indiqueu la raó per la que voleu marcar aquest calibratge de "
+"geometria com a obsolet"
msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgstr "Notificant de l''obsolescència al servidor..."
msgid "Get Imagery Offset..."
msgstr "Obté el decalatge de la imatgeria...."
@@ -23646,24 +25560,26 @@ msgstr "Descarrega del servidor els decalatges de la imatgeria actual"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"No hi ha dades per la regió seleccionada. Si us plau, ajusteu la capa de la "
+"imatgeria i pujeu un decalatge."
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Carregant decalatges d''imatgeria..."
msgid "Error processing XML response: {0}"
-msgstr ""
+msgstr "Error en processar la resposta XML:{0}"
msgid "Offset"
-msgstr ""
+msgstr "Decalatge"
msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Base de dades dels decalatges d''imatgeria"
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
@@ -23672,66 +25588,75 @@ msgid "km"
msgstr "km"
msgid "Calibration geometries"
-msgstr ""
+msgstr "Geometria de calibratge"
msgid "Deprecated offsets"
-msgstr ""
+msgstr "Decalatges obsolets"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
"OSM data in the area. Please check that the offset is still valid\n"
"by downloading GPS tracks and comparing them and OSM data to the imagery."
msgstr ""
+"La capa superior de la imatgeria ha estat desplaçada, presumiblement per a "
+"fer coincidir\n"
+"les dades OSM de lazona. Si us plau verifiqueu que el decalatge continua "
+"sent\n"
+"vàlid carregant tacks GPS i comparant-los amb les dades OSM i amb la "
+"imatgeria aèria."
msgid ""
"A layer has been added with a calibration geometry. Hide data layers,\n"
"find the corresponding feature on the imagery layer and move it accordingly."
msgstr ""
+"S''ha afegit una capa amb una geometria calibrada. Amageu capes de dades,\n"
+"trobeu la característica corresponent a la capa d''imatgeri i moveu-la "
+"segons convingui."
msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "Marcat com a obsolet per {0} el {1}"
msgid "Created by {0} on {1}"
-msgstr ""
+msgstr "Creat per {0} el {1}"
msgid "Offset Information"
-msgstr ""
+msgstr "Informació de decalatge"
msgid "Report this offset"
-msgstr ""
+msgstr "Informa d''aquest decalatge"
msgid "You are to notify moderators of this offset. Why?"
-msgstr ""
+msgstr "Notificareu els moderadors d''aquest decalatge. Per què?"
msgid "Reporting the offset..."
-msgstr ""
+msgstr "Informant del decalatge ..."
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "Un decalatge d''imatgeria de {0}"
msgid "Imagery ID"
-msgstr ""
+msgstr "ID de la imatgeria"
msgid "A calibration geometry of {0} nodes"
-msgstr ""
+msgstr "Un calibratge d''imatgeria de {0} nodes"
msgid "Determined right here"
-msgstr ""
+msgstr "Determinat aquí"
msgid "Determined {0} away"
-msgstr ""
+msgstr "Determinat {0} lluny"
msgid "Reason"
-msgstr ""
+msgstr "Motiu"
msgid "This entry has been reported."
-msgstr ""
+msgstr "Aquest element ha estat informat"
msgid "Server has rejected the request"
-msgstr ""
+msgstr "El servidor ha refusat la consulta"
msgid "Unable to connect to the server"
-msgstr ""
+msgstr "No ha estat possible de connectar amb el servidor"
msgid "Store Imagery Offset..."
msgstr "Desa decalatge de la imatgeria..."
@@ -23740,22 +25665,28 @@ msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
"server"
msgstr ""
+"Puja un decalatge per a la imatgeria actual (o un objecte de geometria de "
+"calibratge) al servidor"
msgid "Store calibration geometry"
-msgstr ""
+msgstr "Desa la geometria de calibratge"
msgid "Store imagery offset"
-msgstr ""
+msgstr "Desa el decalatge de la imatgeria"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
"intend to do?"
msgstr ""
+"L''objecte seleccionat pot ser utilitzat com a geometria de calibratge. Què "
+"voleu fer?"
msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
"this?"
msgstr ""
+"La capa superior d''imatgeria no te cap decalatge. Esteu segur que voleu "
+"pujar això?"
msgid ""
"You are registering an imagery offset. Other users in this area will be able "
@@ -23763,6 +25694,10 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
+"Esteu enregistrant un desplaçament de la imatgeria. Altres usuaris en "
+"aquesta àrea el podran usar per a cartografiar.\n"
+"Assegureu-vos que sigui tan precís com sigui possible i descriviu una regió "
+"on s''aplica aquest desplaçament."
msgid ""
"You are registering a calibration geometry. It should be the most precisely "
@@ -23770,30 +25705,35 @@ msgid ""
"clearly visible boundaries on various satellite imagery. Please describe "
"this object and its whereabouts."
msgstr ""
+"Esteu enregistrant una geometria de calibratge. Ha de ser la posició més "
+"precisa possible de l''objecte, amb els límits ben definits sobre diferents "
+"imatges de satèl·lit. Si us plau descriviu aquest objecte i la seva posició "
+"amb precisió."
msgid "Uploading a new offset..."
-msgstr ""
+msgstr "Descarregant un nou decalatge ..."
msgid "This string should be 3 to 200 letters long."
-msgstr ""
+msgstr "El text ha de ser d''una longitud d''entre 3 i 200 lletres."
msgid "Adjust imagery"
-msgstr "Ajustar imatgeria"
+msgstr "Ajusta la imatgeria"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajustar la posició de la capa d''imatgeria seleccionada"
+msgstr "Ajusta la posició de la capa d''imatgeria seleccionada"
msgid "Please select the imagery layer to adjust."
-msgstr "Si us plau seleccioneu la capa d''imatgeria a ajustar"
+msgstr "Si us plau seleccioneu la capa d''imatgeria a ajustar."
msgid "Start adjusting"
-msgstr "Inici de l''ajustament"
+msgstr "Inicia l''ajustament"
msgid "There are currently no imagery layer to adjust."
-msgstr "No hi ha cap capa d''imatgeria a ajustar"
+msgstr ""
+"En aquest moment no hi ha cap capa d''imatgeria que pugui ser ajustada"
msgid "No layers to adjust"
-msgstr "Cap capa a ajustar"
+msgstr "No hi ha capes que puguin ser ajustades"
msgid "Normal"
msgstr "Normal"
@@ -23837,12 +25777,6 @@ msgstr "Imatges importades"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Fitxers d''imatge (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Obre imatges amb ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Carrega un conjunt d''imatges com una nova capa"
-
msgid "Import vector graphics"
msgstr "Importa gràfics vectorials"
@@ -23852,18 +25786,15 @@ msgstr "Escala:"
msgid "unit(s) = "
msgstr "unitat(s) = "
-msgid "Import..."
-msgstr "Importa..."
-
-msgid "Import vector graphics."
-msgstr "Importa gràfics vectorials."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Dibuixos SVG (*.svg)"
-
msgid "Importing..."
msgstr "Important..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "Fitxers SVG [Connector ImportVec] (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Si us plau, obriu o creeu una capa de dades abans d''importar"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -24258,9 +26189,6 @@ msgstr "Autocentrat"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrar de manera contínua laq capa LiveGPS a la posició actual"
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Obre MapDust"
@@ -24316,9 +26244,36 @@ msgstr "Fusiona les superposicions de vies"
msgid "Merge Overlap (combine)"
msgstr "Fusiona la superposició (combinar)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Un rol basat membre de la relació fou copiat a totes les noves "
+"vies.<br> Caldria que comprovessiu si això és correcte i fessiu les "
+"correccions quan sigui necessari.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Una relació de membre fou copiada a totes les noves vies.<br> Caldria "
+"que comprovessiu si això és correcte i fessiu les correccions quan sigui "
+"necessari.</html>"
+
msgid "Split way"
msgstr "Divideix la via"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Entreu una clau per l''etiqueta, p.ex. "
+"<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Entreu un valor d''etiqueta, p. ex. <strong><tt>check "
+"members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan esquerra"
@@ -24367,6 +26322,15 @@ msgstr "Tipus d''objecte OSM a descarregar (''*'' indica qualsevol)"
msgid "XAPI query: "
msgstr "Consulta XAPI: "
+msgid "Download from Overpass API ..."
+msgstr "Descarrega de l''API d''Overpass..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Descarrega dades del servidor de l''API d''Overpass..."
+
+msgid "Overpass query: "
+msgstr "Consulta d''Overpass: "
+
msgid "Select OSM mirror URL"
msgstr "Seleccionar la URL del servidor rèplica d''OSM"
@@ -24379,15 +26343,6 @@ msgstr "Adreça URL base"
msgid "Enforce meta data"
msgstr "Aplica meta dades"
-msgid "Convert to multipolygon"
-msgstr "Convertir a multipolígon"
-
-msgid "Convert to multipolygon."
-msgstr "Convertir a multipolígon."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Una de les vies seleccionades forma part d''un altre multipolígon."
-
msgid "About Plugin"
msgstr "Quant al connector"
@@ -24535,9 +26490,6 @@ msgstr "Dividir per barris"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Dividir aquestes dades per barris (admin_level=11)."
-msgid "Open Data"
-msgstr "Open Data"
-
msgid "CSV files"
msgstr "Fitxers CSV"
@@ -24562,12 +26514,21 @@ msgstr "Fitxers GML"
msgid "Zip Files"
msgstr "Fitxers zip"
+msgid "7Zip Files"
+msgstr "Fitxer 7Zip"
+
msgid "OpenData XML files"
msgstr "Fitxers OpenData XML"
+msgid "Download open data"
+msgstr "Descarrega dades lliues"
+
msgid "License URL not available: {0}"
msgstr "URL de llicència no disponible: {0}"
+msgid "OpenData preferences"
+msgstr "Preferències d''OpenData"
+
msgid "License Agreement"
msgstr "Acord de llicència"
@@ -24737,6 +26698,9 @@ msgstr "S''estan descarregant les dades..."
msgid "File to load"
msgstr "Fitxer a carregar"
+msgid "Reading 7Zip file..."
+msgstr "Llegint un fitxer de tipus 7zip..."
+
msgid "Reading Zip file..."
msgstr "Llegint el fitxer Zip..."
@@ -24757,6 +26721,20 @@ msgstr ""
msgid "Try lenient method"
msgstr "Provar un mètode més indulgent"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"No és possible de detectar les Coordenades del Sistema de Referència.\n"
+"Voleu retornar al sistema ESPG:4326 (WGS 84) ?"
+
+msgid "Warning: CRS not found"
+msgstr "Avís: no s''ha trobar el Sistema de Referència de les Coordenades"
+
+msgid "Unable to detect CRS !"
+msgstr ""
+"El Sistema de Referència de les Coordenades no ha pogut ser detectat!"
+
msgid "Unable to find a data store for file {0}"
msgstr "No és possible de trobar un magatzem de dades pel fitxer {0}"
@@ -25035,15 +27013,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "S''ha produït un error: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "No ha estat possible crear el nou error. Resultat: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"La capçalera conté varis valors i no pot ser cartografiada en una cadena "
-"simple"
-
msgid "Process queue"
msgstr "Cua de procés"
@@ -25100,18 +27069,6 @@ msgstr ""
msgid "Close: "
msgstr "Tanca: "
-msgid "New issue"
-msgstr "Nou problema"
-
-msgid "Create issue"
-msgstr "Crear nou problema"
-
-msgid "Describe the problem precisely"
-msgstr "Descriviu el problema de manera precisa"
-
-msgid "Create: "
-msgstr "Crea: "
-
msgid "Open in browser"
msgstr "Obre al navegador web"
@@ -25172,6 +27129,9 @@ msgstr "Executable de Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "Fitxers pbf comprimits del servidor OSM"
+msgid "Download PBF"
+msgstr "Descarrega dades PBF (Protocolbuffer Binary Format)"
+
msgid "Invalid changeset id: {0}"
msgstr "Identificador invàlid del conjunt de canvis: {0}"
@@ -25381,9 +27341,6 @@ msgstr "Importar fitxer PDF."
msgid "Import PDF"
msgstr "Importar PDF"
-msgid "Import PDf file"
-msgstr "Importar fitxer PDF"
-
msgid " {0} objects so far"
msgstr " {0} objectes fins ara"
@@ -25467,8 +27424,27 @@ msgstr "El test ha fallat: no ha estat possible de llegir ''mtime''"
msgid "Test failed: Could not write mtime."
msgstr "Ha fallat el test: No s''ha pogut escriure mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr "Ajusta fotografies"
+
+msgid "Move and position photos"
+msgstr "Mou i posiciona fotografies"
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+"Clic+arrossegar per moure la foto o majúscula+clic per posicionar la foto"
+
+msgid "Please load some photos."
+msgstr "Si us plau carregeu alguna foto"
+
+msgid "Toggle the image thumbnail preview"
+msgstr "Commuta la vista prèvia de la imatge en miniatura"
+
+msgid "New layer for untagged images"
+msgstr "Nova capa per imatges no etiquetades"
+
+msgid "Untagged Images"
+msgstr "Imatges no etiquetades"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Voleu desar el calibratge de la capa {0}?"
@@ -25626,6 +27602,11 @@ msgstr "No hi ha res al portaretalls"
msgid "The clipboard data is not an image"
msgstr "Les dades que hi ha al portaretalls no són imatges"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Avís: ha fallat la manipulació del fitxer zip ''{0}''. L''excepció ha estat: "
+"{1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "S''ha trobat un fitxer de calibratge associat a la fotografia: {0}\n"
@@ -25650,6 +27631,9 @@ msgid ""
msgstr ""
"A partir d''ara el fitxers de calibratge seran carregats automàticament."
+msgid "Download Osmosis poly"
+msgstr "Descarrega dades Osmosis poly (Osmosis polygon filter file format)"
+
msgid "Reading polygon filter file..."
msgstr "Llegint el fitxer de filtre de polígons..."
@@ -25945,9 +27929,6 @@ msgstr "El fitxer GPX no conté cap track ni cap fita"
msgid "Create Stops from GPX"
msgstr "Crear parades a partir d''un fitxer GPX"
-msgid "Tracks"
-msgstr "Tracks"
-
msgid "Tracks in this GPX file:"
msgstr "Tracks d''aquest fitxer GPX:"
@@ -26018,9 +27999,6 @@ msgstr "Especificar rol"
msgid "Change relation member roles to {0}"
msgstr "Canvia els rols dels membres de la relació a {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Modificar els paràmetres de creació de multipolígons"
-
msgid "Create administrative boundary relations"
msgstr "Crea relacions de límits administratius"
@@ -26153,9 +28131,6 @@ msgstr "Trobat un node sense els rols ''label'' o ''admin_centre''"
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Trobada una via sense els rols ''inner'' o ''outer''"
-msgid "Restart JOSM"
-msgstr "Reiniciar JOSM"
-
msgid "Revert changeset fully"
msgstr "Revertir el conjunt de canvis sencer"
@@ -26172,10 +28147,13 @@ msgid "Revert"
msgstr "Recupera"
msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "Entreu l''ID del conjunt de canvis que ha de ser revertit"
msgid "Reverted changeset"
-msgstr ""
+msgstr "Conjunt de canvis revertit"
+
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "No és permès de revertir el grup de canvis de {0}"
msgid "Missing merge target for {0} with id {1}"
msgstr "Manca un objectiu de fusió per {0} amb l''ID {1}"
@@ -26212,32 +28190,55 @@ msgstr "Obtenint les primitives que manquen"
msgid "Downloading changeset"
msgstr "Descarregant conjunt de canvis"
+msgid "See {0}"
+msgstr "Vegeu {0}"
+
msgid "Revert changeset #{0}"
msgstr "Reverteix el conjunt de canvis #{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Avís: l''element d''inici ''{0}'' situat a la posició ({1},{2}) dins del "
+"conjunt de canvis no està suportat. Anul·lant."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Avís: l''element de final ''{0}'' situat a la posició ({1},{2}) dins del "
+"conjunt de canvis no està suportat. Anul·lant."
+
msgid "Road Sign Plugin"
msgstr "Connector de senyals de trànsit"
msgid "signs"
-msgstr ""
+msgstr "senyals"
+
+msgid "Change Properties"
+msgstr "Canvia propietats"
msgid "Country preset:"
-msgstr ""
+msgstr "Preconfiguracions del país:"
msgid "Show all signs"
-msgstr ""
+msgstr "Mostra tots els senyals"
msgid "Show a selection of the most useful signs"
-msgstr ""
+msgstr "Mostra una selecció dels senyals més útils"
+
+msgid "Spain"
+msgstr "Espanya"
msgid "Germany"
-msgstr ""
+msgstr "Alemanya"
msgid "Poland"
-msgstr ""
+msgstr "Polònia"
msgid "Slovakia"
-msgstr ""
+msgstr "Eslovàquia"
msgid "Roadsign tagging"
msgstr "Etiquetatge de senyals de trànsit"
@@ -26249,7 +28250,7 @@ msgid "Roadsigns plugin: open dialog"
msgstr "Connector de senyals de trànsit: obrir finestra"
msgid "custom"
-msgstr ""
+msgstr "personalitzat"
msgid "Could not read tagging preset source: ''{0}''"
msgstr "No es pot llegir la font de preconfiguració d''etiquetatge: ''{0}''"
@@ -26332,9 +28333,6 @@ msgstr "Preferències del connector de càlcul d''itineraris"
msgid "Configure routing preferences."
msgstr "Configurar les preferències de càlcul d''itineraris"
-msgid "Highway type"
-msgstr "Tipus de carretera"
-
msgid "Speed (Km/h)"
msgstr "Velocitat (km/h)"
@@ -26462,6 +28460,9 @@ msgstr ""
msgid "Save SDS file"
msgstr "Enregistrar el fitxer SDS"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "No es pot fer la còpia de seguretat. L''excepció ha estat: {0}"
+
msgid "Simplify Area"
msgstr "Simplifica àrea"
@@ -26537,20 +28538,20 @@ msgstr "Factor de distància"
msgid "Merge Nearby Nodes Threshold"
msgstr "Llindar per fusionar nodes propers"
-msgid "Online Help"
-msgstr "Ajuda en línia"
+msgid "SeaMap Editor"
+msgstr "Editor de cartes nàutiques"
-msgid "Load"
-msgstr "Carrega"
+msgid "No object selected"
+msgstr "No heu seleccionat cap objecte"
-msgid "invisible"
-msgstr "invisible"
+msgid "Seamark Inspector"
+msgstr "Inspector Seamark"
-msgid "SeaMap Editor"
-msgstr "Editor de cartes nàutiques"
+msgid "Select only one object"
+msgstr "Seleccioneu un sol objecte"
-msgid "Export"
-msgstr ""
+msgid "Select a map object"
+msgstr "Seleccioneu un objecte del mapa"
msgid "AutoSave LiveData"
msgstr "Desament automàtic de LiveData"
@@ -26696,6 +28697,9 @@ msgstr "suprimir la via de contorn"
msgid "Street name: "
msgstr "Nom del carrer: "
+msgid "Building: "
+msgstr "Edifici: "
+
msgid "Even/Odd"
msgstr "Parell/Senar"
@@ -26774,6 +28778,103 @@ msgstr "Traçador."
msgid "Tracer building"
msgstr "Traçar edifici"
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2."
+
+msgid "Change tag {0} to {1}"
+msgstr "Modifica de l''etiqueta {0} a la {1}"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"La versió del servidor Tracer2 no és compatible amb aquest connector. Si us "
+"plau descarregueu la versió {0} de\n"
+"{1}."
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+"HI ha una nova versió del servidor Tracer2. Si us plau actualitzeu a la "
+"versió {0} per tal d''obtenir millors resultats."
+
+msgid "No set of parameter is active!"
+msgstr "No hi ha cap conjunt de paràmetres actiu!"
+
+msgid "Select parameter"
+msgstr "Seleccioneu un paràmetre"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: afegeix una via amb {0} punts"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: modifica una via amb {0} punts"
+
+msgid "Tracer2 error"
+msgstr "Error de Tracer2"
+
+msgid "Parameter for server request"
+msgstr "Paràmetre per consultar el servidor"
+
+msgid "Tile size:"
+msgstr "Mida de la tessel·la"
+
+msgid "Resolution:"
+msgstr "Resolució:"
+
+msgid "Mode:"
+msgstr "Mode:"
+
+msgid "Threshold:"
+msgstr "Llindar:"
+
+msgid "Points per circle:"
+msgstr "Punts per cercle:"
+
+msgid "Tag:"
+msgstr "Etiqueta:"
+
+msgid "Preferred values:"
+msgstr "Valors preferits:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "Voleu suprimir el paràmetre \"{0}\"?"
+
+msgid "Add new"
+msgstr "Afegeix nou"
+
+msgid "Add predefined"
+msgstr "Afegeix predefinit"
+
+msgid "Select predefined parameter"
+msgstr "Seleccioneu un paràmetre predefinit"
+
+msgid "Modify list of parameter for server request."
+msgstr "Modifica la llista de paràmetres per consultar el servidor"
+
+msgid "Parameter:"
+msgstr "Paràmetre:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+"El servidor Tracer2 no està iniciat. Si us plau inicieu el servidor.\n"
+"Si no teniu el servidor, el podeu descarregar de\n"
+"{0}."
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "El servidor Tracer2 no ha trobat res."
+
+msgid "Tracer2Server has detected an error."
+msgstr "El servidor Tracer2 ha trobat un error."
+
msgid "GPG"
msgstr "GPG"
@@ -26789,9 +28890,6 @@ msgstr "Exportar signatures a XML..."
msgid "Save Signatures file"
msgstr "Enregistrar el fitxer de signatures"
-msgid "Download OSM"
-msgstr "Descarregar OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr "Obtenir tots els objectes OSM referenciats però absents al servidor."
@@ -26816,6 +28914,10 @@ msgstr "Descarregar objectes del servidor"
msgid "Download signed data"
msgstr "Descarregar dades signades"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Avís: Ignorant l''excepció perquè la tasca fou anulada. Excepció: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -26986,9 +29088,6 @@ msgstr "Signatura cancel·lada!"
msgid "Please give a tolerance in meters"
msgstr "Si us plau indiqueu un tolerància en metres"
-msgid "Accuracy"
-msgstr "Acurat"
-
msgid "Select as much as you like:"
msgstr "Seleccioneu tant com vulgueu:"
@@ -27709,8 +29808,11 @@ msgstr "Recuperar un objecte esborrat ..."
msgid "Undelete object by id"
msgstr "Recuperar un objecte esborrat per ID"
-msgid "Select if the data should be added into a new layer"
-msgstr "Seleccionar si les dades han de ser afegides a una nova capa"
+msgid "Undelete Object"
+msgstr "Recuperar objecte esborrat"
+
+msgid "Undelete object"
+msgstr "Recuperar objecte esborrat"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -27719,11 +29821,8 @@ msgstr ""
"Indiqueu el tious i l''ID dels objectes esborrats que han de ser recuperats, "
"p.ex. \"n1 w2\""
-msgid "Undelete Object"
-msgstr "Recuperar objecte esborrat"
-
-msgid "Undelete object"
-msgstr "Recuperar objecte esborrat"
+msgid "Select if the data should be added into a new layer"
+msgstr "Seleccionar si les dades han de ser afegides a una nova capa"
msgid "Start undeleting"
msgstr "Inici de la recuperació"
@@ -27731,18 +29830,6 @@ msgstr "Inici de la recuperació"
msgid "Close dialog and cancel"
msgstr "Tancar la finestra i cancel·lar"
-msgid "Will get {0}"
-msgstr "S''obtindrà {0}"
-
-msgid "Looking for {0}"
-msgstr "Cercant {0}"
-
-msgid "Found {0}"
-msgstr "S''ha trobat {0}"
-
-msgid "More tools"
-msgstr "Més eines"
-
msgid "Add nodes at intersections"
msgstr "Afegir nodes a les interseccions"
@@ -27790,15 +29877,6 @@ msgstr ""
"Enganxa les pertinences a relacions dels objectes de la memòria intermèdia "
"sobre els objectes seleccionats."
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Divideix l''objecte"
@@ -27937,18 +30015,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Configuració d''una URL personalitzada"
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Eina Lat Lon"
@@ -28169,9 +30235,6 @@ msgstr "Desseleccionar nodes"
msgid "Removes all nodes from selection"
msgstr "Suprimir tots els nodes de la selecció"
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar un vídeo"
@@ -28182,7 +30245,7 @@ msgid "Remove Video"
msgstr "Suprimir un vídeo"
msgid "removes current video from layer"
-msgstr "suprimir el vídeo actual de la capa"
+msgstr "suprimeix el vídeo actual de la capa"
msgid "Play/Pause"
msgstr "Reprodueix/Pausa"
@@ -28302,8 +30365,8 @@ msgstr "bucle"
msgid "mute"
msgstr "silencia"
-msgid "Scanned Map..."
-msgstr "Mapa escanejat ..."
+msgid "Walking Papers Scanned Map"
+msgstr "Mapa Walking Papers escanejat"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28326,9 +30389,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Capa Walking Papers ({0}) en nivell d''ampliació {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Descarregar una via"
@@ -28413,6 +30473,8 @@ msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
+"Copia el model {0} al porta-retalls del sistema instanciat amb les "
+"coordenades del primer node seleccionat."
msgid "Copy {0} template"
msgstr "Copia la plantilla {0}"
@@ -28424,6 +30486,8 @@ msgid ""
"Double click on item to search for object with article name (and center "
"coordinate)"
msgstr ""
+"Feu doble clic sobre l''element per cercar l''objecte amb el nom de "
+"l''article (i centrar a les seves coordenades)"
msgid "Available via WIWOSM server"
msgstr "Disponible a través del servidor WIWOSM"
@@ -28444,7 +30508,7 @@ msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr "Mostra les coordenades de la Viquipèdia a la vista actual"
msgid "coordinates"
-msgstr ""
+msgstr "coordenades"
msgid "Category"
msgstr "Categoria"
@@ -28457,13 +30521,14 @@ msgid "Enter the Wikipedia category"
msgstr "Indiqueu una categoria de la viquipèdia"
msgid "Clipboard"
-msgstr ""
+msgstr "Porta-retalls"
msgid "Pastes Wikipedia articles from the system clipboard"
msgstr ""
+"Enganxa els articles de la Viquipèdia des del porta-retalls del sistema"
msgid "clipboard"
-msgstr ""
+msgstr "porta-retalls"
msgid "Open Article"
msgstr "Obre l''article"
@@ -28479,9 +30544,6 @@ msgstr "Estableix la llengua per defecte per als articles de la Viquipèdia"
msgid "Enter the Wikipedia language"
msgstr "Indiqueu el lleguatge per a la Viquipèdia"
-msgid "Add Tag"
-msgstr "Afegeix etiqueta"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ca.po b/i18n/po/ca at valencia.po
similarity index 83%
copy from i18n/po/ca.po
copy to i18n/po/ca at valencia.po
index da23df9..88221ff 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca at valencia.po
@@ -2,17 +2,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:13+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido at gmail.com>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-10-22 10:01+0000\n"
+"Last-Translator: pitort <pitort at eclipso.eu>\n"
"Language-Team: el_libre - - www.catmidia.cat\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: 2013-04-05 04:37+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
-"Language: ca\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:09+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
+"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: l''opció ''{1}'' és ambigua"
@@ -21,7 +21,7 @@ msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr "{0}: l''opció ''--{1}'' no permet cap argument"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: l''opci´o ''{1}{2}'' no permet cap argument"
+msgstr "{0}: l''opció ''{1}{2}'' no permet cap argument"
msgid "{0}: option ''{1}'' requires an argument"
msgstr "{0}: l''opció ''{1}'' requereix un argument"
@@ -48,7 +48,22 @@ msgid "Background Terms of Use"
msgstr "Termes d''ús de la imatge de fons"
msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "L''enllaç no pot ser obert en aquesta plataforma (''{0}'')"
+msgstr "L''enllaç no pot ser obert en esta plataforma (''{0}'')"
+
+msgid "ERROR: {0}"
+msgstr "ERROR: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ATENCIÓ: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFORMACIÓ: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
msgid "Executing platform startup hook"
msgstr "Inicialitzacions específiques de la plataforma"
@@ -63,7 +78,7 @@ msgid "Initializing OSM API"
msgstr "S''està inicialitzant l''API de l''OSM"
msgid "Initializing presets"
-msgstr "Inicialitzant les predefinicions"
+msgstr "S''estan inicialitzant les predefinicions"
msgid "Initializing validator"
msgstr "S''està inicialitzant el validador"
@@ -102,7 +117,7 @@ msgstr ""
"informació:"
msgid "Exit JOSM"
-msgstr "Surt del JOSM"
+msgstr "Ix del JOSM"
msgid "Continue, try anyway"
msgstr "Continua, intenteu-ho altre cop"
@@ -138,7 +153,7 @@ msgid "Info"
msgstr "Informació"
msgid "Readme"
-msgstr "Llegeix-me"
+msgstr "Llig-me"
msgid "Revision"
msgstr "Revisió"
@@ -156,19 +171,19 @@ msgid "About JOSM..."
msgstr "Quant al JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Avís: el format de l''adreça URL de l''API no és l''esperat. La redirecció "
-"vers l''històric de l''objecte probablement fallarà. L''adreça és: ''{0}''"
+"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
+"vers la pàgina d''informació o de l''historial d''objectes OSM. La URL de "
+"l''API és: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ADVERTÈNCIA: format inesperat de l''API de base URL. Redirecció a la pàgina "
-"d''usuari per a l''usuari d''OSM probablement fallarà. API de base de URL "
-"és: ''{0}''"
+"Format inesperat per la URL de l''API. Probablement fallarà la redirecció "
+"vers la pàgina d''usuari OSM. La URL de l''API és: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -190,7 +205,7 @@ msgid "Click to abort launching external browsers"
msgstr "Feu clic per cancel·lar el llançament de navegadors externs"
msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Seleccioneu com a mínim un node, via o relació que ja estigui pujat."
+msgstr "Seleccioneu com a mínim un node, via o relació que ja estiga pujat."
msgid "Please select the target layer."
msgstr "Seleccioneu la capa de destí"
@@ -205,20 +220,23 @@ msgid ""
"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
"to.</html>"
msgstr ""
-"<html>No hi ha capes a la capa font<br>''{0}''<br>amb la que es pugui "
+"<html>No hi ha capes a la capa font<br>''{0}''<br>amb la que es puga "
"combinar.</html>"
msgid "No target layers"
msgstr "No hi ha capes de destí"
msgid "Add imagery layer {0}"
-msgstr "Afegeix la capa d''imatge {0}"
+msgstr "Afig la capa d''imatge {0}"
+
+msgid "Select image format for WMS layer"
+msgstr "Seleccioneu el format d''imatge de la capa WMS"
msgid "Select WMS layers"
msgstr "Selecciona capes WMS"
msgid "Add layers"
-msgstr "Afegeix capes"
+msgstr "Afig capes"
msgid "Invalid service URL."
msgstr "URL de servei no válida"
@@ -233,12 +251,11 @@ msgid "Could not parse WMS layer list."
msgstr "No es pot analitzar la llista de capes WMS."
msgid "Add Node..."
-msgstr "Afegeix un node..."
+msgstr "Afig un node..."
msgid "Add a node by entering latitude / longitude or easting / northing."
msgstr ""
-"Afegeix un node indicant la latitud i la longitud o les coordenades est i "
-"nord."
+"Afig un node indicant la latitud i la longitud o les coordenades est i nord."
msgid "Edit: {0}"
msgstr "Edita: {0}"
@@ -255,9 +272,6 @@ msgstr "Eina: {0}"
msgid "Please select at least four nodes."
msgstr "Seleccioneu com a mínim quatre nodes."
-msgid "Information"
-msgstr "Informació"
-
msgid "Align Nodes in Line"
msgstr "Alinea els nodes en una línia"
@@ -282,15 +296,21 @@ msgstr "conflicte"
msgid "download"
msgstr "baixa"
+msgid "problem"
+msgstr "problema"
+
msgid "previous"
-msgstr "anterior"
+msgstr "arrere"
msgid "next"
-msgstr "següent"
+msgstr "avant"
msgid "Nothing selected to zoom to."
msgstr "No hi ha res seleccionat per ampliar."
+msgid "Information"
+msgstr "Informació"
+
msgid "Zoom to {0}"
msgstr "Amplia {0}"
@@ -348,11 +368,11 @@ msgstr ""
"dels sentits?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"No es poden combinar les vies (No es poden fusionar com una sola cadena de "
-"nodes)"
+"No és possible la combinació de les vies<br>(No poden ser unides per a "
+"formar una única sèrie de nodes)"
msgid "Combine {0} ways"
msgstr "Combina {0} vies"
@@ -407,6 +427,12 @@ msgstr "Suprimeix"
msgid "Delete selected objects."
msgstr "Suprimeix els objectes seleccionats"
+msgid "Toggle dialogs panel"
+msgstr "Commuta les finestres"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Commuta les finestres, maximitza la vista del mapa"
+
msgid "Distribute Nodes"
msgstr "Distribueix els nodes"
@@ -414,12 +440,25 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribueix els nodes seleccionats en distàncies iguals a llarg d''una línia"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignorant {0} nodes amb coordenades nul·les"
+
msgid "Download from OSM..."
msgstr "Baixa des de l''OSM..."
msgid "Download map data from the OSM server."
msgstr "Baixa les dades dels mapes des del servidor OSM"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acció requerirà {0} peticions <br>de descàrrega. Voleu "
+"<br>continuar?</html>"
+
+msgid "Download data"
+msgstr "Baixa dades"
+
msgid "Download object..."
msgstr "Baixa l''objecte..."
@@ -469,13 +508,13 @@ msgid "Duplicate"
msgstr "Duplica"
msgid "Duplicate selection by copy and immediate paste."
-msgstr "Selecció duplicada per copiar i enganxar immediatament"
+msgstr "Dupliqueu la selecció copiant i apegant-la immediatament"
msgid "Exit"
-msgstr "Surt"
+msgstr "Ix"
msgid "Exit the application."
-msgstr "Sortir de l''aplicació"
+msgstr "Eixir de l''aplicació"
msgid "Expert Mode"
msgstr "Mode expert"
@@ -506,7 +545,7 @@ msgid "Export the data to GPX file."
msgstr "Exporta les dades a un fitxer GPX."
msgid "Nothing to export. Get some data first."
-msgstr "No hi ha res a exportar. Primer heu d''obtenir dades."
+msgstr "No hi ha res a exportar. Primer heu d''obtindre dades."
msgid "Export GPX file"
msgstr "Exporta el fitxer GPX"
@@ -519,6 +558,9 @@ msgstr ""
"Mostra informació de la història sobre les vies, nodes, o les relacions de "
"OSM."
+msgid "Show history"
+msgstr "Mostra l''historial"
+
msgid "History (web)"
msgstr "Historial (web)"
@@ -530,13 +572,13 @@ msgstr ""
"web."
msgid "New offset"
-msgstr "Nou desplaçament"
+msgstr "Desplaçament nou"
msgid "Adjust the position of this imagery layer"
-msgstr "Ajusta la posició d''aquesta capa d''imatge"
+msgstr "Ajusta la posició d''esta capa d''imatge"
msgid "Adjust imagery offset"
-msgstr "Ajustar el decalatge de la imatge"
+msgstr "Ajusta el desplaçament de la imatge"
msgid "OK"
msgstr "D’acord"
@@ -557,13 +599,13 @@ msgid "Offset: "
msgstr "Desplaçament: "
msgid "Bookmark name: "
-msgstr "Nom del favorit: "
+msgstr "Nom del preferit: "
msgid "Overwrite"
msgstr "Sobreescriu"
msgid "Offset bookmark already exists. Overwrite?"
-msgstr "Ja existeix un favorit amb aquest nom. Remplaçar?"
+msgstr "Ja existeix un preferit amb este nom. Voleu sobreescriure''l?"
msgid "Advanced info"
msgstr "Informació avançada"
@@ -634,7 +676,7 @@ msgid "Assemble new polygons"
msgstr "Assembleu nous polígons"
msgid "Delete relations"
-msgstr "Esborra relacions"
+msgstr "Suprimeix les relacions"
msgid "Delete Ways that are not part of an inner multipolygon"
msgstr "Suprimeix les vies que no formen part d''un multipolígon intern"
@@ -643,11 +685,11 @@ msgid "Joined overlapping areas"
msgstr "Zones superposades fusionades"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Alguns de les vies eren part de relacions que han estat modificades. "
-"Verifiqueu que no s''ha introduït cap error."
+"Algunes vies eren part de relacions que han estat modificades.<br>Si vos "
+"plau, comproveu que no s''han introduit errors."
msgid "Fix tag conflicts"
msgstr "Arregla conflictes d''etiquetes"
@@ -663,21 +705,21 @@ msgstr ""
msgid ""
"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
msgstr ""
-"Disculpeu. No és possible crear una via que sigui exterior a múltiples "
+"Disculpeu. No és possible crear una via que siga exterior a múltiples "
"relacions entre multipolígons."
msgid ""
"Sorry. Cannot handle way that is both inner and outer in multipolygon "
"relations."
msgstr ""
-"Disculpeu. No és possible crear una via que al mateix temps sigui interior i "
+"Disculpeu. No és possible crear una via que al mateix temps siga interior i "
"exterior a una relació multipoligonal."
msgid ""
"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
msgstr ""
-"Disculpeu. No és possible crear una via que sigui interior a vàries "
-"relacions multipoligonals."
+"Disculpeu. No és possible crear una via que siga interior a vàries relacions "
+"multipoligonals."
msgid "Removed Element from Relations"
msgstr "Element de relacions suprimit."
@@ -704,13 +746,13 @@ msgid "Jump To Position"
msgstr "Salta a la posició"
msgid "Opens a dialog that allows to jump to a specific location"
-msgstr "Obre una finestra que permet saltar a una posició específica"
+msgstr "Obri una finestra que permet saltar a una posició específica"
msgid "Enter Lat/Lon to jump to position."
-msgstr "Entreu Latitud/Longitud per saltar a la posició"
+msgstr "Introduïu la latitud/ongitud per saltar a la posició"
msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "També podeu enganxar una adreça web de www.openstreetmap.org"
+msgstr "També podeu apegar una adreça web de www.openstreetmap.org"
msgid "Latitude"
msgstr "Latitud"
@@ -719,7 +761,7 @@ msgid "Longitude"
msgstr "Longitud"
msgid "Zoom (in metres)"
-msgstr "Apropar (en metres)"
+msgstr "Escala (en metres)"
msgid "URL"
msgstr "Adreça URL"
@@ -767,7 +809,7 @@ msgid "WMS URL or Image ID:"
msgstr "Adreça del servei WMS o identificador de la imatge:"
msgid "Add Rectified Image"
-msgstr "Afegeix imatge rectificada"
+msgstr "Afig imatge rectificada"
msgid ""
"Couldn''t match the entered link or id to the selected service. Please try "
@@ -798,16 +840,16 @@ msgid ""
"want to continue?"
msgstr ""
"Sou a punt de fusionar dades de les capes ''{0}'' i ''{1}''.<br /><br "
-"/>Aquestes capes tenen diferents polítiques de pujada i no han de ser "
-"fusionades d''aquesta manera.<br />La seva fusió comportaria l''aplicació de "
-"la política més estricta (es desaconsella la pujada) a ''{1}''.<br /><br "
-"/><b>Aquesta no és la manera recomanada per a fusionar aquest tipus de "
+"/>Estes capes tenen diferents polítiques de pujada i no han de ser "
+"fusionades d''esta manera.<br />La seua fusió comportaria l''aplicació de la "
+"política més estricta (es desaconsella la pujada) a ''{1}''.<br /><br "
+"/><b>Esta no és la manera recomanada per a fusionar este tipus de "
"dades</b>.<br />En comptes d''això haurieu de comprovar i fusionar els "
"objectes per separat, un a un, utilitzant l''opció ''<i>Fusionar "
"selecció</i>''.<br /><br />Segur que voleu continuar?"
msgid "Ignore this hint and merge anyway"
-msgstr "Ignora aquest avís i fusiona"
+msgstr "Ignora este avís i fusiona"
msgid "Merge Nodes"
msgstr "Fusiona els nodes"
@@ -816,10 +858,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Fusiona dos o més nodes en el més antic"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Seleccioneu almenys dos nodes per fusionar o un node proper a un altre."
+"Per favor, seleccioneu com a mínim dos nodes per ajuntar-los o un node "
+"proper a un altre."
msgid "Abort Merging"
msgstr "Anul·la la fusió"
@@ -852,7 +895,7 @@ msgid ""
"one</b>.<br /><br />Are you sure you want to continue?"
msgstr ""
"Sou a punt de fusionar varis objectes de les capes ''{0}'' i ''{1}''.<br "
-"/><br /><b>Aquesta no és la manera recomanada per a fusionar aquest tipus de "
+"/><br /><b>Esta no és la manera recomanada per a fusionar este tipus de "
"dades</b>.<br />En comptes d''això haurieu de fusionar cada obecte per "
"separat, <b>un a un</b>.<br /><br />Segur que voleu continuar?"
@@ -863,7 +906,7 @@ msgid "Mirror selected nodes and ways."
msgstr "Fer una rèplica simètrica dels nodes i de les vies"
msgid "Please select at least one node or way."
-msgstr "Si us plau, seleccioneu com a mínim un node o una via"
+msgstr "Per favor, seleccioneu com a mínim un node o una via"
msgid "up"
msgstr "amunt"
@@ -893,10 +936,10 @@ msgid "Move Node..."
msgstr "Mou el node..."
msgid "Edit latitude and longitude of a node."
-msgstr "Edita latitud i longitud d''un node."
+msgstr "Edita la latitud i longitud d''un node."
msgid "New Layer"
-msgstr "Nova capa"
+msgstr "Capa nova"
msgid "Create a new map layer."
msgstr "Crea una capa del mapa nova"
@@ -905,10 +948,10 @@ msgid "URL Files"
msgstr "Adreça URL dels arxius"
msgid "Open..."
-msgstr "Obre..."
+msgstr "Obri..."
msgid "Open a file."
-msgstr "Obre un fitxer."
+msgstr "Obri un fitxer."
msgid "Opening files"
msgstr "Obrint fitxers"
@@ -939,25 +982,25 @@ msgstr "no existeix"
msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
msgstr ""
-"<html>No es pot obrir el directori ''{0}''.<br>Si us plau, seleccioneu un "
+"<html>No es pot obrir el directori ''{0}''.<br>Per favor, seleccioneu un "
"fitxer.</html>"
msgid "Open file"
-msgstr "Obre un fitxer"
+msgstr "Obri un fitxer"
msgid "Opening {0} file..."
msgid_plural "Opening {0} files..."
-msgstr[0] "Obrint el fitxer {0} ..."
-msgstr[1] "Obrint els fitxers {0} ..."
+msgstr[0] "S''està obrint el fitxer {0} ..."
+msgstr[1] "S''estan obrint els fitxers {0} ..."
msgid "Opening file ''{0}'' ..."
-msgstr "Obre el fitxer ''{0}'' ..."
+msgstr "S''està obrint el fitxer ''{0}'' ..."
msgid "Open Location..."
-msgstr "Obre una ubicació..."
+msgstr "Obri una ubicació..."
msgid "Open an URL."
-msgstr "Obre una adreça URL"
+msgstr "Obri una adreça URL"
msgid "Separate Layer"
msgstr "Capa separada"
@@ -975,7 +1018,7 @@ msgid "Download Location"
msgstr "Ubicació de descàrrega"
msgid "Download URL"
-msgstr "URL descàrrega"
+msgstr "URL de baixada"
msgid "Start downloading data"
msgstr "Comença a baixar dades"
@@ -984,14 +1027,14 @@ msgid "Close dialog and cancel downloading"
msgstr "Tanca el diàleg i cancel·la la baixada"
msgid "Download Data"
-msgstr "Descarrega dades"
+msgstr "Baixa dades"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>No es pot obrir l''URL ''{0}'' perquè no hi ha disponible cap tasca de "
-"baixada adient.</html>"
+"No ha estat possible d''obrir la URL ''{0}''<br>Les segünets tasques de "
+"descàrrega accepten els patrons d''URL que d''indiquen:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1001,8 +1044,8 @@ msgid ""
"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
msgstr ""
"<h3>Quan se seleccionen vies la forma s''ajusta de manera que els angles "
-"siguin de 90 o de 180º.</h3>Podeu afegir dos nodes a la selecció. Llavors la "
-"direcció serà determinada per aquests dos nodes de referència. (Podeu desfer "
+"siguen de 90 o de 180º.</h3>Podeu afegir dos nodes a la selecció. Llavors la "
+"direcció serà determinada per estos dos nodes de referència. (Podeu desfer "
"els moviments de certs nodes:<br>Seleccionant-los i utilitzant la drecera "
"per anul·lar la normaltzació, que per defecte és Majúscula+Q.)"
@@ -1010,40 +1053,35 @@ msgid "Orthogonalize Shape"
msgstr "Normalitza la figura"
msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr "Moure els nodes de manera que els angles siguin de 90 o de 180 graus"
+msgstr "Mou els nodes de manera que els angles siguen de 90 o de 180 graus"
msgid "Orthogonalize Shape / Undo"
msgstr "Normalitza formes / Desfà"
msgid "Undo orthogonalization for certain nodes"
-msgstr "Desfer la normalització de a certs nodes"
+msgstr "Desfà la normalització d'a certs nodes"
msgid "Orthogonalize / Undo"
msgstr "Normalitza / Desfés"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalitza la figura / Desfés\n"
-"Seleccioneu els nodes que han estat desplaçats per la darrera acció "
-"d''ortogonalització!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Desfà la normalització d''una figura"
+"Normalització de la figura / Anul·lació<br>Per favor, seleccioneu els nodes "
+"que han estat moguts per l''acció precedent de normalització!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
"undesirable results when doing rectangular alignments.<br>Change your "
"projection to get rid of this warning.<br>Do you want to continue?</html>"
msgstr ""
-"<html>Esteu utilitzant la projecció EPSG:4326 i això portarà a<br>obtenir "
-"resultats no desitjats quan es facin alineacions rectangulars.<br>Canvieu la "
-"vostra projecció per tal de suprimir aquest avís.<br>Voleu continuar?</html>"
+"<html>Esteu utilitzant la projecció EPSG:4326 i això portarà a<br>obtindre "
+"resultats no desitjats quan es facen alineacions rectangulars.<br>Canvieu la "
+"vostra projecció per tal de suprimir este avís.<br>Voleu continuar?</html>"
msgid "Selection must consist only of ways and nodes."
-msgstr "La selecció només pot contenir vies i nodes."
+msgstr "La selecció només pot contindre vies i nodes."
msgid "Orthogonalize"
msgstr "Normalitza"
@@ -1051,14 +1089,11 @@ msgstr "Normalitza"
msgid "Usage"
msgstr "Ús"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Elements seleccionats no poden ser ortogonalizats"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
msgstr ""
-"<html>Si us plau, assegureu-vos que totes les vies seleccionades tenen la "
+"<html>Per favor, assegureu-vos que totes les vies seleccionades tenen la "
"mateixa direcció<br>o apliqueu l''ortogonalització una a una.</html>"
msgid "Please select ways with angles of approximately 90 or 180 degrees."
@@ -1066,28 +1101,28 @@ msgstr ""
"Seleccioneu vies que formin un angle de 90 o 180 graus, aproximadament."
msgid "Paste"
-msgstr "Enganxa"
+msgstr "Apega"
msgid "Paste contents of paste buffer."
-msgstr "Enganxa el contingut de la memòria d''enganxat."
+msgstr "Apega el contingut de la memòria d''apegat."
msgid "Delete incomplete members?"
msgstr "Voleu suprimir membres incomplets?"
msgid "Paste without incomplete members"
-msgstr "Enganxa sense els memebres incomplets"
+msgstr "Apega sense els memebres incomplets"
msgid ""
"The copied data contains incomplete objects. When pasting the incomplete "
"objects are removed. Do you want to paste the data without the incomplete "
"objects?"
msgstr ""
-"Les dades que heu copiat contenen objectes incomplets. Aquests objectes no "
-"seran ignorats en fer l''operació d''enganxar. Voleu enganxar les dades "
-"copiades sense els objectes incomplets?"
+"Les dades que heu copiat contenen objectes incomplets. Estos objectes no "
+"seran ignorats en fer l''operació d''apegar. Voleu apegar les dades copiades "
+"sense els objectes incomplets?"
msgid "Paste Tags"
-msgstr "Enganxa Etiquetes"
+msgstr "Apega les etiquetes"
msgid "Apply tags of contents of paste buffer to all selected items."
msgstr ""
@@ -1095,8 +1130,8 @@ msgstr ""
msgid "Pasting {0} tag"
msgid_plural "Pasting {0} tags"
-msgstr[0] "Enganxa {0} etiqueta"
-msgstr[1] "Enganxa {0} etiquetes"
+msgstr[0] "Apega {0} etiqueta"
+msgstr[1] "Apega {0} etiquetes"
msgid "to {0} object"
msgid_plural "to {0} objects"
@@ -1107,7 +1142,7 @@ msgid "Preferences..."
msgstr "Preferències..."
msgid "Open a preferences dialog for global settings."
-msgstr "Obre el diàleg de preferències de configuracions globals"
+msgstr "Obri el diàleg de preferències de configuracions globals"
msgid "Preferences"
msgstr "Preferències"
@@ -1117,22 +1152,22 @@ msgstr "Neteja..."
msgid "Forget objects but do not delete them on server when uploading."
msgstr ""
-"Ignorar els objectes en anviar però sense que siguin esborrats al servidor."
+"Ignora els objectes en enviar però sense que siguen esborrats al servidor."
msgid "Purge"
msgstr "Neteja"
msgid "Confirm Purging"
-msgstr "Confirma la neteja"
+msgstr "Confirmeu la neteja"
msgid ""
"This operation makes JOSM forget the selected objects.<br> They will be "
"removed from the layer, but <i>not</i> deleted<br> on the server when "
"uploading."
msgstr ""
-"Aquesta operació farà que JOSM descarti els objectes seleccionats.<br> Seran "
+"Esta operació farà que JOSM descarti els objectes seleccionats.<br> Seran "
"eliminats de la capa però <i>no</i> seran eliminats<br> del servidor quan "
-"siguin enviats."
+"siguen enviats."
msgid ""
"The following dependent objects will be purged<br> in addition to the "
@@ -1142,14 +1177,14 @@ msgstr ""
"objectes seleccionats:"
msgid "Add to selection"
-msgstr "Afegeix a la selecció"
+msgstr "Afig a la selecció"
msgid ""
"Some of the objects are modified.<br> Proceed, if these changes should be "
"discarded.</html>"
msgstr ""
"Alguns dels objectes han estat modificats.<br>Continueu si voleu descartar "
-"aquests canvis.</html>"
+"estos canvis.</html>"
msgid "Clear Undo/Redo buffer"
msgstr "Esborrar la memòria cau de la comanda Desfer/Refer"
@@ -1175,6 +1210,15 @@ msgstr "Canvia també el nom del fitxer"
msgid "Could not rename file ''{0}''"
msgstr "No s''ha pogut canviar el nom del fitxer ''{0}''"
+msgid "Restart"
+msgstr "Reinicia"
+
+msgid "Restart the application."
+msgstr "Reinicia l''aplicació"
+
+msgid "Click to restart later."
+msgstr "Feu clic per reiniciar després"
+
msgid "Reverse way"
msgstr "Sentit contrari"
@@ -1182,19 +1226,19 @@ msgid "Reverse Ways"
msgstr "Canvia el sentit de les vies"
msgid "Reverse the direction of all selected ways."
-msgstr "Inverdeteix la direcció de totes les vies seleccionades"
+msgstr "Inverteix el sentit de totes les vies seleccionades"
msgid "Please select at least one way."
-msgstr "Si us plau, seleccioneu com a mínim una via."
+msgstr "Seleccioneu com a mínim una via."
msgid "Reverse ways"
-msgstr "Inverteix vies"
+msgstr "Inverteix les vies"
msgid "Save"
-msgstr "Desa"
+msgstr "Guarda"
msgid "Save the current data."
-msgstr "Desa les ades actuals."
+msgstr "Guarda les dades actuals."
msgid "File {0} exists. Overwrite?"
msgstr "El fitxer {0} ja existeix. Voleu sobreescriure''l?"
@@ -1206,10 +1250,10 @@ msgid "File exists. Overwrite?"
msgstr "El fitxer ja existeix. El voleu sobreescriure?"
msgid "Save As..."
-msgstr "Anomena i desa..."
+msgstr "Anomena i guarda..."
msgid "Save the current data to a new file."
-msgstr "Desa les dades actuals en un fitxer nou"
+msgstr "Guarda les dades actuals en un fitxer nou"
msgid "Select All"
msgstr "Selecciona-ho tot"
@@ -1222,16 +1266,13 @@ msgstr ""
"selecciona objectes incomplets."
msgid "Load Session"
-msgstr "Carrega sessió"
+msgstr "Carrega una sessió"
msgid "Load a session from file."
-msgstr "Carregar una sessió d''un fitxer."
-
-msgid "Session file (*.jos, *.joz)"
-msgstr "Fitxer de la sessió (*.jos, *.joz)"
+msgstr "Carrega una sessió d''un fitxer."
msgid "Open session"
-msgstr "Obre sessió"
+msgstr "Obri una sessió"
msgid "Loading session ''{0}''"
msgstr "Carregant sessió ''{0}''"
@@ -1245,13 +1286,13 @@ msgid "Data Error"
msgstr "Error de dades"
msgid "IO Error"
-msgstr "S''ha produït un error d''entrada/sortida"
+msgstr "S''ha produït un error d''entrada/eixida"
msgid "Save Session As..."
-msgstr "Desa sessió com a..."
+msgstr "Guarda sessió com a..."
msgid "Save the current session to a new file."
-msgstr "Enregistrar la sessió actual en un nou fitxer."
+msgstr "Guarda la sessió actual en un fitxer nou."
msgid "Session file (archive) (*.joz)"
msgstr "Fitxer de sessió (arxiu) (*.joz)"
@@ -1260,7 +1301,7 @@ msgid "Session file (*.jos)"
msgstr "Fitxer de sessió (*.jos)"
msgid "Save session"
-msgstr "Desa sessió..."
+msgstr "Guarda la sessió..."
msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
@@ -1268,16 +1309,16 @@ msgstr ""
"és:<br>{1}</html>"
msgid "Save Session"
-msgstr "Desa sessió"
+msgstr "Guarda la sessió"
msgid "Save As"
-msgstr "Desa com a"
+msgstr "Anomena i guarda"
msgid "Layers"
msgstr "Capes"
msgid "No exporter for this layer"
-msgstr "No hi ha cap gestor d''exportació per a aquesta capa."
+msgstr "No hi ha cap gestor d''exportació per a esta capa."
msgid "Show Status Report"
msgstr "Mostra l''informe d''estat"
@@ -1295,19 +1336,22 @@ msgid "Status Report"
msgstr "Informe d''estat"
msgid "Copy to clipboard and close"
-msgstr "Copia al portaretalls i tanca"
+msgstr "Copia al porta-retalls i tanca"
+
+msgid "Report bug"
+msgstr "Informa d''un error"
msgid "Close"
msgstr "Tanca"
msgid "Simplify Way"
-msgstr "Simplifica via"
+msgstr "Simplifica la via"
msgid "Delete unnecessary nodes from a way."
-msgstr "Esborra nodes innecessaris d''una via."
+msgstr "Suprimeix els nodes innecessaris d''una via."
msgid "Please select at least one way to simplify."
-msgstr "Si us plau seleccioneu una via per simplificar."
+msgstr "Seleccioneu una via per simplificar."
msgid "Yes"
msgstr "Sí"
@@ -1316,7 +1360,7 @@ msgid "Simplify all selected ways"
msgstr "Simplifica totes les vies seleccionades"
msgid "Cancel operation"
-msgstr "Abortar operacio"
+msgstr "Cancel·la l''operació"
msgid ""
"The selection contains {0} ways. Are you sure you want to simplify them all?"
@@ -1332,8 +1376,8 @@ msgstr[1] "Simplifica {0} vies"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Simplifica via (eliminar {0} node)"
-msgstr[1] "Simplifica via (eliminar {0} nodes)"
+msgstr[0] "Simplifica la via (suprimeix {0} node)"
+msgstr[1] "Simplifica la via (suprimeix {0} nodes)"
msgid "Split Way"
msgstr "Divideix la via"
@@ -1376,24 +1420,24 @@ msgid ""
"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
"middle of the way.)"
msgstr ""
-"La via no es pot dividir en els nodes seleccionats. (Consell: Selecciona "
+"La via no es pot dividir en els nodes seleccionats. (Consell: seleccioneu "
"nodes al mig de la via.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Un rol basat membre de la relació fou copiat a totes les noves "
-"vies.<br> Caldria que comprovessiu si això és correcte i fessiu les "
-"correccions quan sigui necessari.</html>"
+"Una pertinença a una relació basada al rol ha estat copiada a totes les "
+"noves vies.<br>Haurieu de comprovar-ho i fer les correccions necessàries si "
+"calguera."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Una relació de membre fou copiada a totes les noves vies.<br> Caldria "
-"que comprovessiu si això és correcte i fessiu les correccions quan sigui "
-"necessari.</html>"
+"Una pertinença a una relació ha estat copiada a totes les noves "
+"vies.<br>Haurieu de comprovar-ho i fer les correccions necessàries si "
+"calguera."
msgid "Split way {0} into {1} parts"
msgstr "Divideix la via {0} en {1} parts"
@@ -1402,7 +1446,7 @@ msgid "Toggle GPX Lines"
msgstr "Canvia les línies GPX"
msgid "Draw lines between raw gps points."
-msgstr "Dibuixar línies entre els punts GPS."
+msgstr "Dibuixa les línies entre els punts GPS."
msgid "Toggles the global setting ''{0}''."
msgstr "Canvia la configuració global ''{0}''."
@@ -1414,22 +1458,22 @@ msgid "UnGlue Ways"
msgstr "Separa les vies"
msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Duplica nodes utilitzats a diferents vies"
+msgstr "Duplica els nodes utilitzats a diferents vies"
msgid "This node is not glued to anything else."
-msgstr "Aquest node no està unit a cap altre"
+msgstr "Este node no està unit a cap altre"
msgid "None of these nodes are glued to anything else."
-msgstr "Cap d''aquests nodes està unit a un altre"
+msgstr "Cap d''estos nodes està unit a un altre"
msgid "None of this way''s nodes are glued to anything else."
-msgstr "Cap d''aquest nodes de la via no està unit a un altre"
+msgstr "Cap d''este nodes de la via no està unit a un altre"
msgid "The current selection cannot be used for unglueing."
msgstr "La selecció actual no pot ser utilitzada per fer una separació"
msgid "Select either:"
-msgstr "Selecciona un altre:"
+msgstr "Seleccioneu un altre:"
msgid "* One tagged node, or"
msgstr "* Un node etiquetat, o"
@@ -1458,7 +1502,7 @@ msgid ""
msgstr ""
"Nota: Si una via és seleccionada, rebrà noves còpies dels nodes separats\n"
"i els nous nodes seran seleccionats. D''una altra manera, totes les vies "
-"obtindran la seva\n"
+"obtindran la seua\n"
"còpia i tots els nodes seran seleccionats."
msgid "Unglued Node"
@@ -1491,6 +1535,29 @@ msgstr ""
"Sou a punt de separar objectes incomplets.<br>Això pot causar problemes "
"perquè no veieu l''objecte real.<br>Segur que els voleu separar?"
+msgid "Disconnect Node from Way"
+msgstr "Desconnecta el node de la via"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Desconnecta nodes d''una via a la qual pertanyen"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Seleccioneu com a mínim un node a desconnectar."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "El node seleccionat no pot ser desconnectat de res."
+msgstr[1] "Els nodes seleccionats no poden ser desconnectats de res."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"La via afectada despareixeria un cop es desconnecte el node seleccionat."
+msgstr[1] ""
+"La via afectada despareixeria un cop es desconnecten els nodes seleccionats."
+
msgid "Undo"
msgstr "Desfés"
@@ -1504,7 +1571,7 @@ msgid "Undo {0}"
msgstr "Desfés {0}"
msgid "Unselect All"
-msgstr "Desselecciona-ho tot"
+msgstr "No seleccionis res"
msgid "Unselect all objects."
msgstr "Desselecciona tots els objectes."
@@ -1516,9 +1583,6 @@ msgid "Updates the objects in the active data layer from the server."
msgstr ""
"Actualitza els objectes de la capa activa amb el que hi ha al servidor."
-msgid "Download data"
-msgstr "Descarrega dades"
-
msgid "Update modified"
msgstr "Actualitza el modificat"
@@ -1537,7 +1601,7 @@ msgstr ""
"dades actual."
msgid "Update selection"
-msgstr "Actualitza selecció"
+msgstr "Actualitza la selecció"
msgid ""
"Updates the currently selected objects from the server (re-downloads data)"
@@ -1574,9 +1638,9 @@ msgid ""
"contributors to.<br /><br />Are you sure you want to continue?"
msgstr ""
"Sou a punt de pujar dades de la capa ''{0}''.<br /><br />L''enviament de "
-"dades d''aquesta capa està <b>totalment desaconsellat</b>. Si continueu,<br "
+"dades d''esta capa està <b>totalment desaconsellat</b>. Si continueu,<br "
"/>segurament caldrà que revertiu els canvis o que d''altres usuaris ho "
-"facin.<br /><br />Segur que voleu continuar?"
+"facen.<br /><br />Segur que voleu continuar?"
msgid "Ignore this hint and upload anyway"
msgstr "Ignora el consell i enviar"
@@ -1585,10 +1649,10 @@ msgid "No changes to upload."
msgstr "No hi ha canvis a pujar."
msgid "Nothing to upload. Get some data first."
-msgstr "No hi ha res a enviar. Abans d''enviar heu d''obtenir dades."
+msgstr "No hi ha res a enviar. Abans d''enviar heu d''obtindre dades."
msgid "Upload selection"
-msgstr "Puja selecció"
+msgstr "Puja la selecció"
msgid "Upload all changes in the current selection to the OSM server."
msgstr "Puja tots els canvis de la selecció actual al servidor de l''OSM."
@@ -1630,19 +1694,19 @@ msgid "Toggle Viewport Following"
msgstr "Activa/desactiva el seguiment de la vista"
msgid "Wireframe View"
-msgstr "Vista esquemàtica"
+msgstr "Visualització esquemàtica"
msgid "Enable/disable rendering the map as wireframe only"
msgstr "Activar/desactivar la renderització del mapa en forma esquemàtica"
msgid "Toggle Wireframe view"
-msgstr "Commutar a vista esquemàtica"
+msgstr "Canvia a la visualització esquemàtica"
msgid "Zoom In"
msgstr "Apropa"
msgid "Zoom In (Keypad)"
-msgstr "Amplia (teclat)"
+msgstr "Apropa (teclat)"
msgid "Zoom Out"
msgstr "Allunya"
@@ -1660,7 +1724,7 @@ msgstr ""
msgid "Zooming disabled because layer of this relation is not active"
msgstr ""
-"Ampliació deshabilitada perquè la capa d''aquesta relació no està activa"
+"Ampliació deshabilitada perquè la capa d''esta relació no està activa"
msgid "Zooming disabled because there is no selected member"
msgstr "ampliació deshabilitada perquè no hi ha cap membre seleccionat"
@@ -1669,18 +1733,18 @@ msgid "Zoom to the first selected node"
msgstr "Amplia la zona del primer node seleccionat"
msgid "Zooming disabled because layer of this way is not active"
-msgstr "Ampliació deshabilitada perquè la capa d''aquesta via no està activa"
+msgstr "Ampliació deshabilitada perquè la capa d''esta via no està activa"
msgid "Zooming disabled because there is no selected node"
msgstr "Ampliació deshabilitada perquè no hi ha cap nnode seleccionat"
msgctxt "audio"
msgid "Back"
-msgstr "Enrere"
+msgstr "Arrere"
msgctxt "audio"
msgid "Jump back."
-msgstr "Salta enrere."
+msgstr "Salta arrere."
msgid "Audio: {0}"
msgstr "Àudio: {0}"
@@ -1699,7 +1763,7 @@ msgstr "Avança"
msgctxt "audio"
msgid "Jump forward"
-msgstr "Salta endavant"
+msgstr "Salta avant"
msgctxt "audio"
msgid "Next Marker"
@@ -1714,7 +1778,7 @@ msgid "Play/Pause"
msgstr "Reprodueix/Pausa"
msgid "Play/pause audio."
-msgstr "Reprodueix/Pausar audio"
+msgstr "Reprodueix/Pausa l''àudio"
msgctxt "audio"
msgid "Previous Marker"
@@ -1722,7 +1786,7 @@ msgstr "Marcador anterior"
msgctxt "audio"
msgid "Play previous marker."
-msgstr "Reproduir el marcador anterior"
+msgstr "Reprodueix el marcador anterior"
msgctxt "audio"
msgid "Slower"
@@ -1732,15 +1796,30 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avança a poc a poc"
+msgid "Download GPS"
+msgstr "Descarrega GPS"
+
msgid "Downloading GPS data"
msgstr "Descarregant dades del GPS"
msgid "Downloaded GPX Data"
-msgstr "Dades GPX descarregades"
+msgstr "Dades GPX baixades"
msgid "Markers from {0}"
msgstr "Marcadors de {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Descarrega modificacions OSM comprimides"
+
+msgid "Download OSM Change"
+msgstr "Descarrega modificacions OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Descarrega OSM comprimit"
+
+msgid "Download OSM"
+msgstr "Descarregar OSM"
+
msgid "Downloading data"
msgstr "Descarregant dades"
@@ -1751,16 +1830,41 @@ msgstr ""
"era: {0}"
msgid "No data found in this area."
-msgstr "No s''ha trobat cap dada en aquesta àrea."
+msgstr "No s''ha trobat cap dada en esta àrea."
msgid "OSM Server URL:"
msgstr "URL del servidor OSM:"
msgid "Command"
-msgstr "Ordre"
+msgstr "Orde"
msgid "Request details: {0}"
-msgstr ""
+msgstr "Detalls de la petició: {0}"
+
+msgid "Download OSM URL"
+msgstr "Descarrega la URL d''OSM"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Ha hagut {0} conflicte durant la importació."
+msgstr[1] "Ha hagut {0} conflictes durant la importació."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflicte durant la descàrrega."
+msgstr[1] "Conflictes durant la descàrrega."
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Carregant parents del node {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Carregant parents de la via {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Carregant parents de la relació {2}"
+
+msgid "Download session"
+msgstr "Descarrega sessió"
msgid "Download {0} of {1} ({2} left)"
msgstr "Baixa {0} de {1} (manquen {2})"
@@ -1794,23 +1898,23 @@ msgid_plural ""
"report a conflict."
msgstr[0] ""
"Hi ha {0} objecte al vostre conjunt de dades local que podria ser suprimit "
-"del servidor.<br>Si més endavant intenteu suprimir-lo o actualitzar-lo el "
+"del servidor.<br>Si més avant intenteu suprimir-lo o actualitzar-lo el "
"servidor podria generar un conflicte."
msgstr[1] ""
"Hi ha {0} objectes al vostre conjunt de dades local que podrien ser "
-"suprimits del servidor.<br>Si més endavant intenteu suprimir-los o "
-"actualitzar-los el servidor podria generar un conflicte."
+"suprimits del servidor.<br>Si més avant intenteu suprimir-los o actualitzar-"
+"los el servidor podria generar un conflicte."
msgid ""
"Click <strong>{0}</strong> to check the state of this object on the server."
msgid_plural ""
"Click <strong>{0}</strong> to check the state of these objects on the server."
msgstr[0] ""
-"Fes clic sobre <strong>{0}</strong> per verificar l''estat d''aquest objecte "
+"Fes clic sobre <strong>{0}</strong> per verificar l''estat d''este objecte "
"al servidor."
msgstr[1] ""
-"Fes clic sobre <strong>{0}</strong> per verificar l''estat d''aquests "
-"objectes al servidor."
+"Fes clic sobre <strong>{0}</strong> per verificar l''estat d''estos objectes "
+"al servidor."
msgid "Click <strong>{0}</strong> to ignore.</html>"
msgstr "Feu clic sobre <strong>{0}</strong> per ignorar.</html>"
@@ -1824,25 +1928,6 @@ msgstr "Els errors següents han aparegut durant la descàrrega massiva: {0}"
msgid "Errors during download"
msgstr "Errors durant la descàrrega"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Ha hagut {0} conflicte durant la importació."
-msgstr[1] "Ha hagut {0} conflictes durant la importació."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflicte durant la descàrrega."
-msgstr[1] "Conflictes durant la descàrrega."
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Carregant parents del node {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Carregant parents de la via {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Carregant parents de la relació {2}"
-
msgid "Error during download"
msgstr "Error durant la descàrrega"
@@ -1876,39 +1961,39 @@ msgid "Backspace in Add mode"
msgstr "Retrocés en mode d''afegir"
msgid "helper line"
-msgstr ""
+msgstr "línia d''ajuda"
msgid "Cannot add a node outside of the world."
msgstr "No és possible afegir un node fora del món."
msgid "Add node"
-msgstr "Afegeix node"
+msgstr "Afig node"
msgid "Add node into way"
-msgstr "Afegeix node a la via"
+msgstr "Afig node a la via"
msgid "Connect existing way to node"
msgstr "Connecta via existent al node"
msgid "Add a new node to an existing way"
-msgstr "Afegeix un node a una via"
+msgstr "Afig un node a una via"
msgid "Add node into way and connect"
-msgstr "Afegeix un node a una via i connectar-lo"
+msgstr "Afig un node a una via i connectar-lo"
msgid "Create new node."
-msgstr "Crea nou node."
+msgstr "Crea un node nou."
msgid "Select node under cursor."
-msgstr "Seleccionar un node sota el cursor"
+msgstr "Selecciona el node sota el cursor"
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Inserir un node a una via."
-msgstr[1] "Inserir un node a {0} vies."
+msgstr[0] "Insereix un node a una via."
+msgstr[1] "Insereix un node a {0} vies."
msgid "Start new way from last node."
-msgstr "Començar una nova via a partir del darrer node."
+msgstr "Comença una via nova a partir del darrer node."
msgid "Continue way from last node."
msgstr "Continua la via des del darrer node."
@@ -1932,13 +2017,13 @@ msgid "Toggle snapping by {0}"
msgstr "Commuta la discretització amb {0}"
msgid "Show helper geometry"
-msgstr "Mostrar l''assistent de geometria"
+msgstr "Mostra l''assistent de geometria"
msgid "Snap to node projections"
msgstr "Ajusta a les projeccions dels nodes"
msgid "Disable"
-msgstr "Deshabilita"
+msgstr "Desactiva"
msgid "0,90,..."
msgstr "0,90,..."
@@ -1981,22 +2066,25 @@ msgstr ""
"clic per a afegir un nou node."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Extrudeix: línia primcipal"
msgid "Extrude: helper line"
msgstr "Extrueix: línia d''ajuda"
msgid "Extrude Way"
-msgstr "Extreu una via"
+msgstr "Extrau una via"
msgid "Improve Way Accuracy"
-msgstr "Millorar la precisió de les vies"
+msgstr "Millora la precisió de les vies"
msgid "Improve Way Accuracy mode"
msgstr "Mode de millora de la precisió de les vies"
+msgid "improve way accuracy helper line"
+msgstr "línia d''ajuda per a millorar l''exactitud de la via"
+
msgid "Click on the way to start improving its shape."
-msgstr "Feu clic sobre la via per començar a millorar la seva forma."
+msgstr "Feu clic sobre la via per començar a millorar la seua forma."
msgid "Select a way that you want to make more accurate."
msgstr "Seleccioneu la via que voleu fer més precisa."
@@ -2025,10 +2113,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "No és possible de posar un node fora del Món."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Afegeix un node a una via"
-msgstr[1] "Afegeix un node a {0} vies"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "No es pot esborrar un node que fa referència a múltiples objectes"
@@ -2042,6 +2130,9 @@ msgstr "Paral·lel"
msgid "Make parallel copies of ways"
msgstr "Fer una còpia paral·lela de les vies"
+msgid "make parallel helper line"
+msgstr "fes una línia d''ajuda paral·lela"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2051,7 +2142,7 @@ msgstr ""
"la conservació de les etiquetes)"
msgid "Hold Ctrl to toggle snapping"
-msgstr "Mantenir premuda la tecla CTRL per commutar el desplaçament"
+msgstr "Mantindre premuda la tecla CTRL per commutar el desplaçament"
msgid ""
"ParallelWayAction\n"
@@ -2084,18 +2175,18 @@ msgid "Move elements"
msgstr "Mou elements"
msgid "Move them"
-msgstr "Moure''ls"
+msgstr "Mou-los"
msgid "Undo move"
-msgstr "Desfés moviment"
+msgstr "Desfés el moviment"
msgid ""
"You moved more than {0} elements. Moving a large number of elements is often "
"an error.\n"
"Really move them?"
msgstr ""
-"Heu mogut més de {0} elements. Movent un gran nombre d''elements sovint "
-"causa un error.\n"
+"Heu mogut més de {0} elements. Moure un gran nombre d''elements sovint causa "
+"un error.\n"
"Segur que els voleu moure?"
msgid "Release the mouse button to select the objects in the rectangle."
@@ -2106,13 +2197,13 @@ msgid "Ctrl to merge with nearest node."
msgstr "Ctrl per fusionar amb el node més proper."
msgid "Release the mouse button to stop moving."
-msgstr "Deixeu anar el botó del ratolí per aturar el desplaçament."
+msgstr "Deixeu anar el botó del ratolí per parar el desplaçament."
msgid "Release the mouse button to stop rotating."
-msgstr "Deixeu anar el botó del ratolí per aturar la rotació."
+msgstr "Deixeu anar el botó del ratolí per parar la rotació."
msgid "Release the mouse button to stop scaling."
-msgstr "Deixeu anar el botó del ratolí per aturar l''ampliació"
+msgstr "Deixeu anar el botó del ratolí per parar l''ampliació"
msgid ""
"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2124,8 +2215,8 @@ msgstr ""
msgid "Add and move a virtual new node to way"
msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Afegeix i mou un node virtual a la via"
-msgstr[1] "Afegeix i mou un node virtual a {0} vies"
+msgstr[0] "Afig i mou un node virtual a la via"
+msgstr[1] "Afig i mou un node virtual a {0} vies"
msgid "Zoom"
msgstr "Apropa"
@@ -2142,16 +2233,15 @@ msgstr ""
"nivell d''ampliació amb el botó de la dreta"
msgid "Add all objects selected in the current dataset after the last member"
-msgstr ""
-"Afegeix els objectes seleccionats al final del conjunt de dades actual"
+msgstr "Afig els objectes seleccionats al final del conjunt de dades actual"
msgid "Add selection to relation"
-msgstr "Afegeix la selecció a la relació"
+msgstr "Afig la selecció a la relació"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] "Afegeix la seleció la relació {0}"
-msgstr[1] "Afegeix la seleció les relacions {0}"
+msgstr[0] "Afig la seleció la relació {0}"
+msgstr[1] "Afig la seleció les relacions {0}"
msgid "Delete the selected relation"
msgstr "Suprimir la relació seleccionada"
@@ -2170,7 +2260,7 @@ msgstr "Descarrega membres incomplets"
msgid "Create a copy of this relation and open it in another editor window"
msgstr ""
-"Crea una còpia d''aquesta relació i obrir-la a una altra finestra d''edició"
+"Crea una còpia d''esta relació i obrir-la a una altra finestra d''edició"
msgid "Edit"
msgstr "Edita"
@@ -2185,8 +2275,7 @@ msgid "Select relation in relation list."
msgstr "Selecciona la relació a la llista"
msgid "Add the members of all selected relations to current selection"
-msgstr ""
-"Afegeix els membres de les relacions seleccionades a la selecció actual"
+msgstr "Afig els membres de les relacions seleccionades a la selecció actual"
msgid "Select the members of all selected relations"
msgstr "Selecciona els membres de la relació"
@@ -2198,7 +2287,7 @@ msgid "Select members"
msgstr "Selecciona membres"
msgid "Add the selected relations to the current selection"
-msgstr "Afegeix les relacions seleccionades a la selecció actual"
+msgstr "Afig les relacions seleccionades a la selecció actual"
msgid "Set the current selection to the list of selected relations"
msgstr "Selecciona els elements de la relació"
@@ -2219,10 +2308,10 @@ msgid "<xor>"
msgstr "<oex>"
msgid "<left parent>"
-msgstr ""
+msgstr "<parent esquerre>"
msgid "<right parent>"
-msgstr ""
+msgstr "<parent dret>"
msgid "<colon>"
msgstr "<punt>"
@@ -2258,10 +2347,10 @@ msgid "Enter the search expression"
msgstr "Introduïu l''expressió de cerca"
msgid "replace selection"
-msgstr "reemplaça selecció"
+msgstr "reemplaça la selecció"
msgid "add to selection"
-msgstr "afegeix a la selecció"
+msgstr "afig a la selecció"
msgid "remove from selection"
msgstr "esborra de la selecció"
@@ -2276,13 +2365,13 @@ msgid "all objects"
msgstr "tots els objectes"
msgid "Also include incomplete and deleted objects in search."
-msgstr "Incloure a la cerca els objectes incomplets i els esborrats."
+msgstr "Inclou a la cerca els objectes incomplets i els esborrats."
msgid "regular expression"
msgstr "expressió regular"
msgid "add toolbar button"
-msgstr "afegeix un botó a la barra d''eines"
+msgstr "afig un botó a la barra d''eines"
msgid "Filter"
msgstr "Filtre"
@@ -2291,7 +2380,7 @@ msgid "Search"
msgstr "Cerca"
msgid "Submit filter"
-msgstr "Envia filtre"
+msgstr "Envia el filtre"
msgid "Start Search"
msgstr "Inicia la cerca"
@@ -2429,13 +2518,13 @@ msgstr ""
msgid ""
"<b>child <i>expr</i></b> - all children of objects matching the expression"
msgstr ""
-"<b>fill <i>expr</i></b> - tots els fills dels objectes que acompleixin amb "
+"<b>fill <i>expr</i></b> - tots els fills dels objectes que acomplisquen amb "
"l''expressió"
msgid ""
"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
msgstr ""
-"<b>parent <i>expr</i></b> - tots els parents dels objectes que acompleixin "
+"<b>parent <i>expr</i></b> - tots els parents dels objectes que acomplisquen "
"amb l''expressió"
msgid ""
@@ -2507,6 +2596,9 @@ msgstr "''valor'' a qualsevol clau"
msgid "matches if ''key'' exists"
msgstr "s''acompleix si la ''clau'' existeix"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "combinadors"
@@ -2544,7 +2636,7 @@ msgid "all closed ways"
msgstr "totes les vies tancades"
msgid "object without useful tags"
-msgstr ""
+msgstr "objecte sense dades útils"
msgid "metadata"
msgstr "metadada"
@@ -2598,10 +2690,10 @@ msgid "related objects"
msgstr "objectes relacionats"
msgid "all children of objects matching the expression"
-msgstr "tots els fills dels objectes que acompleixin l''expressió"
+msgstr "tots els fills dels objectes que acomplisquen l''expressió"
msgid "all parents of objects matching the expression"
-msgstr "tots els parents dels objectes que acompleixin l''expressió"
+msgstr "tots els parents dels objectes que acomplisquen l''expressió"
msgid "n-th member of relation and/or n-th node of way"
msgstr "n-èsim membre de la relació i/o n-èsim node de la via"
@@ -2680,14 +2772,14 @@ msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
"Esperant <i>mín</i>/<i>màx</i> després de ''timestamp'' (data i hora)"
-msgid "Primitive id expected"
-msgstr "S''esperava l''ID de l''objecte"
+msgid "Range of primitive ids expected"
+msgstr "Interval d''identificadors de primietives esperat"
-msgid "Changeset id expected"
-msgstr "S''esperava l''ID del conjunt de canvis"
+msgid "Range of changeset ids expected"
+msgstr "Interval d''identificadors de conjunts de canvis esperat"
-msgid "Version expected"
-msgstr "Versió esperada"
+msgid "Range of versions expected"
+msgstr "Interval de versions esperades"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2698,6 +2790,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Tipus d''objecte desconegut: {0}. Els valors admesos són node, via o relació."
+msgid "Primitive id expected"
+msgstr "S''esperava l''ID de l''objecte"
+
msgid "Range of numbers expected"
msgstr "Sèrie de nombres esperats"
@@ -2716,11 +2811,10 @@ msgstr "Manca un paràmetre per l''XOR"
msgid "Missing operator for NOT"
msgstr "Manca l''operador per al NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Avís: truncament automàtic del valor de l''atribut ''{0}'' de l''objecte "
-"suprimit {1}"
+"Truncament automàtic del valor de l''etiqueta \"{0}\" de l''objecte suprimit "
+"{1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2733,7 +2827,7 @@ msgid "Precondition Violation"
msgstr "Violació de la precondició"
msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} nodes a la via {1} superen el nombre màxim de {2} nodes permès"
+msgstr "{0} nodes a la via {1} superen el nombre màxim de {2} nodes permés"
msgid "API Capabilities Violation"
msgstr "Violació de les capacitats de l''API"
@@ -2753,7 +2847,7 @@ msgid ""
"dependency.</html>"
msgstr ""
"<html>{0} relacions generen un bucle infinit perquè fan referència mútua les "
-"unes a les altres.<br>JOSM no les pot carregar. Si us plau modifiqueu les "
+"unes a les altres.<br>JOSM no les pot carregar. Per favor modifiqueu les "
"relacions i suprimiu les dependències cícliques.</html>"
msgid "Relation ..."
@@ -2785,7 +2879,7 @@ msgid "Warnings"
msgstr "Avisos"
msgid "Fix these when possible."
-msgstr "Corregir-ho quan sigui possible."
+msgstr "Corregir-ho quan siga possible."
msgid "Other"
msgstr "Altre"
@@ -2800,19 +2894,22 @@ msgid "Continue upload"
msgstr "Continua la pujada"
msgid "Add node {0}"
-msgstr "Afegeix node {0}"
+msgstr "Afig node {0}"
msgid "Add way {0}"
-msgstr "Afegeix via {0}"
+msgstr "Afig via {0}"
msgid "Add relation {0}"
-msgstr "Afegeix relació {0}"
+msgstr "Afig relació {0}"
msgid "Added {0} object"
msgid_plural "Added {0} objects"
msgstr[0] "Afegit {0} objecte"
msgstr[1] "Afegits {0} objectes"
+msgid "New way {0} has 0 nodes"
+msgstr "La nova via {0} no té cap node"
+
msgid "Change node {0}"
msgstr "Canvia node {0}"
@@ -2849,11 +2946,11 @@ msgstr "Suprimir \"{0}\" de {1} objectes"
msgid "Set {0}={1} for {2} objects"
msgstr "Definir {0}={1} per a {2} objectes"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "{0} propietats suprimides de {1} objectes"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Definir {0} propietats per a {1} objectes"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Reemplaçar \"{0}\" per \"{1}\" per"
@@ -2870,21 +2967,21 @@ msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
"conflict cannot be added.</html>"
msgstr ""
-"<html>La capa ''{0}'' ja te un conflicte amb "
-"l''objecte<br>''{1}''.<br>Aquest conflicte no pot ser afegit.</html>"
+"<html>La capa ''{0}'' ja te un conflicte amb l''objecte<br>''{1}''.<br>Este "
+"conflicte no pot ser afegit.</html>"
msgid "Double conflict"
msgstr "Conflicte doble"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Avís: la capa ''{0}'' ja no existeix. No és possible d''eliminar el "
-"conflicte amb l''objecte ''{1}''."
+"La capa ''{0}'' ja no existeix. No és possible de suprimir el conflicte per "
+"l''objecte ''{1}''."
msgid "Add conflict for ''{0}''"
-msgstr "Afegeix un conflicte per ''{0}''"
+msgstr "Afig un conflicte per ''{0}''"
msgid ""
"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
@@ -2963,12 +3060,12 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
-"Sou a punt de suprimir {0} relació: {1}<br/>Aquesta acció és necessària molt "
+"Sou a punt de suprimir {0} relació: {1}<br/>Esta acció és necessària molt "
"poques vegades i no és fàcil de desfer un cop ha estat processada pel "
"servidor.<br/>Segur que voleu continuar?"
msgstr[1] ""
-"Sou a punt de suprimir {0} relacions: {1}<br/>Aquesta acció és necessària "
-"molt poques vegades i no és fàcil de desfer un cop ha estat processada pel "
+"Sou a punt de suprimir {0} relacions: {1}<br/>Esta acció és necessària molt "
+"poques vegades i no és fàcil de desfer un cop ha estat processada pel "
"servidor.<br/>Segur que voleu continuar?"
msgid "Delete relation?"
@@ -2999,6 +3096,9 @@ msgstr[1] "{0} objectes eliminats"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resoldre els conflictes de la llista de membres de la relació {0}"
+msgid "Removed nodes from {0}"
+msgstr "Nodes suprimits de {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotar {0} node"
@@ -3053,17 +3153,23 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
+"<html>Sou a punt d''invertir la via ''{0}'',<br/> però el significat "
+"semàntic d''esta etiqueta ''{1}'' és definit per la seua direcció.<br/>Segur "
+"que voleu canviar la direcció de la via i al mateix temps canviar el seu "
+"significat semàntic?</html>"
msgstr[1] ""
+"<html>Sou a punt d''invertir la via ''{0}'',<br/> però el significat "
+"semàntic d''estes etiquetes ''{1}'' és definit per la seua "
+"direcció.<br/>Segur que voleu canviar la direcció de la via i al mateix "
+"temps canviar el significat semàntic?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Canvia el sentit de la vía."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Si revertiu el sentit d''aquesta via, suggerim fer també els següents canvis "
-"a les propietats de la via per tal de mantenir la consistència de les dades."
msgid "Relation"
msgstr "Relació"
@@ -3092,12 +3198,11 @@ msgstr "Aplicar els canvis seleccionats"
msgid "Do not apply changes"
msgstr "No aplicar els canvis"
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-"Si us plau, seleccioneu quines modificacions de propietats voleu aplicar."
-msgid "Properties of "
-msgstr "Propietats de "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Els rols referits a les relacions"
@@ -3115,12 +3220,15 @@ msgstr "El fitxer {0} no pot ser creat, heu d''utilitzar un altre nom"
msgid "IOError while creating file, autosave will be skipped: {0}"
msgstr ""
-"Error d''entrada/sortida durant la creació del fitxer, la còpia de seguretat "
+"Error d''entrada/eixida durant la creació del fitxer, la còpia de seguretat "
"automàtica serà omesa: {0}"
msgid "Unable to delete old backup file {0}"
msgstr "No és possible de suprimir l''antiga còpia de seguretat {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
"Error mentre es creava una còpia de seguretat de la capa suprimida: {0}"
@@ -3152,24 +3260,24 @@ msgid ""
"function manually and retry importing."
msgstr ""
"<html>El fitxer de paràmetres vol afegir preferències a <b>{0}</b>,<br/> "
-"però en aquest moment no es coneix el seu valor predefinit<br/> Si us plau, "
+"però en este moment no es coneix el seu valor predefinit<br/> Per favor, "
"activeu manualment la funció corresponent i torneu a importar una altre cop."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Avís: ha fallat la creació del directori de memòria cau mancant: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Ha fallat la creació del directori mancant per la memòria cau: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Ha fallat la creació del directori de memòria cau: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Avís: ha fallat fer persistents les preferències a ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Ha fallat la persistència de les preferències sobre \"{0}\""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Avís: Ha fallat la inicialització de les preferències. El directori de les "
-"preferències ''{0}'' no és un directori"
+"Ha fallat la inicialització de les preferències. El directori de les "
+"preferències ''{0}'' no és un directori."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3179,11 +3287,11 @@ msgstr ""
"les preferències ''{0}'' no és un directori.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Avís: Ha fallat la inicialització de les preferències. Ha fallat la creació "
-"del directori de preferències que manca: {0}"
+"Ha fallat la inicialització de les preferències. Ha fallat la creació del "
+"directori de preferències mancants: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3192,18 +3300,16 @@ msgstr ""
"<html>Ha fallat la inicialització de les preferències. <br>Ha fallat la "
"creació del directori de preferències que manca: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Informació: manca el fitxer de preferències ''{0}''. Creant un fitxer "
-"predeterminat."
+"Manca el fitxer de les preferències ''{0}''. Creant un fitxer predefinit de "
+"preferències."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Avís: Reemplaçant el fitxer de preferències existent ''{0}'' amb el fitxer "
-"predeterminat."
+"Reemplaçant el fitxer de les prreferències existent ''{0}'' amb el fitxer de "
+"preferències predefinit."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3221,11 +3327,11 @@ msgstr ""
"preferències predeterminat.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Avís: Ha fallat la inicialització de les preferències. Error en inicialitzar "
-"el fitxer amb els valors predeterminats: {0}"
+"Ha fallat la inicialització de les preferències. Ha fallat la inicialització "
+"del fitxer de preferències amb els valors predefinits: {0}"
msgid "Paint style {0}: {1}"
msgstr "Model de renderització {0}: {1}"
@@ -3254,14 +3360,13 @@ msgstr "El recurs ''{0}'' no ha pogut ser carregat. Error: {1}"
msgid "UNKNOWN"
msgstr "Desconegut"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Avís: s''ha trobat un nombre de versió de JOSM inesperat al fitxer de "
-"revisions, el seu valor és ''{0}''"
+"Número inesperat de la versió de JOSM al fitxer de revisió, el valor és "
+"''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Avís: manca el fitxer de revisió \"/REVISIO\"."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Manca el fitxer de revisió ''/REVISION''."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Ja ha estat enregistrat un conflicte per l''objecte ''{0}''"
@@ -3329,8 +3434,8 @@ msgid ""
"error, it should be safe to continue in your work."
msgstr ""
"JOSM esperava trobar l''objecte [{0} {1}] al conjunt de dades però no hi és. "
-"Si us plau, reporteu això a http://josm.openstreetmap.de/. Això no és un "
-"error crític, podeu continuar amb la vostra feina sense problemes."
+"Per favor, reporteu això a http://josm.openstreetmap.de/. Això no és un "
+"error crític, podeu continuar amb la vostra faena sense problemes."
msgid "Missing merge target for way with id {0}"
msgstr "Manca l''element a fusionar amb la via amb id {0}"
@@ -3433,11 +3538,10 @@ msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
"El paràmetre {0} no te un valor entre 0 i {1}. El seu valor és ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Error: ha fallat la càrrega de la classe de rederització ''{0}''. No s''ha "
-"trobat la classe."
+"Ha fallat la càrrega de la classe de renderització de mapes ''{0}''. La "
+"classe no ha estat trobada."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3552,8 +3656,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Identificador del datum desconegut: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum requerit (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr ""
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3574,6 +3678,9 @@ msgstr ""
"El nombre d''arguments del paràmetre ''+bounds'' no és l''esperat (ha de ser "
"4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Paràmetre ''{0}'' desconegut"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Nombre esperat d''arguments per al paràmetre ''{0}''"
@@ -3594,10 +3701,6 @@ msgstr "Projecció personalitzada"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Error: ha fallat l''obertura del flux d''entrada pel recurs ''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3638,6 +3741,9 @@ msgstr "altres validacions"
msgid "Running test {0}"
msgstr "Test {0} en execució"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adreces"
@@ -3653,7 +3759,7 @@ msgid "House number without street"
msgstr "Número sense carrer"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Número de portal ''{0}'' duplicat"
msgid "Duplicate house numbers"
msgstr "Nombres de carrer duplicats"
@@ -3664,6 +3770,15 @@ msgstr "Varis noms de carrer a la relació"
msgid "House number too far from street"
msgstr "El nombre és massa lluny del carrer"
+msgid "Barriers and entrances"
+msgstr "Barreres i entrades"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Recerca d''errors a barreres i entrades"
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "L''entrada de barrera no és sobre una barrera."
+
msgid "Building inside building"
msgstr "Contrucció a l''interior d''una altra"
@@ -3674,7 +3789,7 @@ msgid "Coastlines"
msgstr "Línia costanera"
msgid "This test checks that coastlines are correct."
-msgstr "Aquest test comprova que les línies de costa són correctes"
+msgstr "Este test comprova que les línies de costa són correctes"
msgid "Unconnected coastline"
msgstr "Línia costanera no connectada"
@@ -3692,9 +3807,9 @@ msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
"the same layer, but are not connected by a node."
msgstr ""
-"Aquest test comprova si dues vies, línies de ferrocarril, cursos d''aigua o "
-"construccions tenen encreuaments sense que en tinguin cap node en comú que "
-"faci d''interconnexió."
+"Este test comprova si dues vies, línies de ferrocarril, cursos d''aigua o "
+"construccions tenen encreuaments sense que en tinguen cap node en comú que "
+"faça d''interconnexió."
msgid "Crossing buildings"
msgstr "Construccions encavalcades"
@@ -3726,15 +3841,15 @@ msgstr " o "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} és obsolet, utilitzeu {1} en el seu lloc"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Nodes duplicats"
msgid "This test checks that there are no nodes at the very same location."
msgstr ""
-"Aquest test comprova si hi ha nodes diferents que són a la mateixa posició."
-
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Nodes duplicats a dues vies no tancades"
+"Este test comprova si hi ha nodes diferents que són a la mateixa posició."
msgid "Mixed type duplicated nodes"
msgstr "Nodes duplicats de diferents tipus"
@@ -3776,7 +3891,7 @@ msgid ""
"This test checks that there are no relations with same tags and same members "
"with same roles."
msgstr ""
-"Aquest test verifica si hi ha relacions amb les mateixes etiquetes i els "
+"Este test verifica si hi ha relacions amb les mateixes etiquetes i els "
"mateixos membres amb rols iguals"
msgid "Relations with same members"
@@ -3792,7 +3907,7 @@ msgid ""
"This test checks that there are no ways with same node coordinates and "
"optionally also same tags."
msgstr ""
-"Aquest test comprova si hi ha vies amb les mateixes coordenades pels nodes i "
+"Este test comprova si hi ha vies amb les mateixes coordenades pels nodes i "
"opcionalment les mateixes etiquetes."
msgid "Ways with same position"
@@ -3807,11 +3922,29 @@ msgstr "Nodes de via duplicats"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Cerca si hi ha vies amb nodes consecutius idèntics"
+msgid "Highways"
+msgstr "Vies"
+
+msgid "Performs semantic checks on highways."
+msgstr "Fa una comprovació semàntica de les vies."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Totonda incorrecta (via: {0} en comptes de {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolígon"
msgid "This test checks if multipolygons are valid."
-msgstr "Aquest test verifica si els multipolígons són vàlids"
+msgstr "Este test verifica si els multipolígons són vàlids"
msgid "Area style way is not closed"
msgstr "La via que delimita l''àrea no està tancada"
@@ -3854,7 +3987,7 @@ msgid ""
"to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
"e.g., Italia - Italien - Italy."
msgstr ""
-"Aquest test cerca objectes multi-llengua als quals l''atribut ''name'' no es "
+"Este test cerca objectes multi-llengua als quals l''atribut ''name'' no es "
"correspon a cap dels atributs ''name:*'' ni a una composició del tipus "
"Itàlia - Italien - Italy."
@@ -3878,13 +4011,19 @@ msgid "Nodes with same name"
msgstr "Nodes amb el mateix nom"
msgid "This test finds nodes that have the same name (might be duplicates)."
-msgstr "Aquest test cerca nodes amb el mateix nom (podrien estar duplicats)."
+msgstr "Este test cerca nodes amb el mateix nom (podrien estar duplicats)."
+
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
msgid "Overlapping Areas"
msgstr "Zones o superfícies superposades"
msgid "This test checks if areas overlap."
-msgstr "Aquest test verifica si les zones se superposen."
+msgstr "Este test verifica si les zones se superposen."
msgid "Overlapping Water Areas"
msgstr "Supefícies d''aigua que s''encavalquen"
@@ -3896,7 +4035,7 @@ msgid ""
"This test checks that a connection between two nodes is not used by more "
"than one way."
msgstr ""
-"Aquest test verifica si una connexió entre dos nodes és utilitzada per més "
+"Este test verifica si una connexió entre dos nodes és utilitzada per més "
"d''una via."
msgid "Areas share segment"
@@ -3925,7 +4064,7 @@ msgstr "Línies elèctriques"
msgid ""
"Checks for nodes in power lines that do not have a power=tower/pole tag."
msgstr ""
-"Comprova si hi ha nodes de les línies elèctriques que no siguin torres "
+"Comprova si hi ha nodes de les línies elèctriques que no siguen torres "
"elèctriques o pals."
msgid "Missing power tower/pole within power line"
@@ -3935,7 +4074,7 @@ msgid "Relation checker"
msgstr "Verificador de relacions"
msgid "This plugin checks for errors in relations."
-msgstr "Aquest connector comprova si hi ha errors a les relacions"
+msgstr "Este connector comprova si hi ha errors a les relacions"
msgid "Relation type is unknown"
msgstr "El tipus de relació no és conegut"
@@ -3943,15 +4082,15 @@ msgstr "El tipus de relació no és conegut"
msgid "Relation is empty"
msgstr "La relació és buida"
+msgid "Role verification problem"
+msgstr "Problema de verificació del rol"
+
msgid "<empty>"
msgstr "<buit>"
msgid "Role {0} missing"
msgstr "Manca rol {0}"
-msgid "Role verification problem"
-msgstr "Problema de verificació del rol"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Un nombre de {0} rols és massa petit ({1})"
@@ -3972,7 +4111,7 @@ msgstr "Vies que s''encreuen amb elles mateixes"
msgid ""
"This test checks for ways that contain some of their nodes more than once."
-msgstr "Aquest test comprova si hi ha vies que tenen nodes repetits"
+msgstr "Este test comprova si hi ha vies que tenen nodes repetits"
msgid "Similarly named ways"
msgstr "Vies amb un nom similar"
@@ -3980,14 +4119,14 @@ msgstr "Vies amb un nom similar"
msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-"Aquest test comprova si hi ha vies que tenen un nom similar i es podria "
+"Este test comprova si hi ha vies que tenen un nom similar i es podria "
"tractar d''un error d''ortografia"
-msgid "Properties checker :"
-msgstr "Verificador de propietats:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Aquest test comprova si hi ha errors a les claus i els valors"
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Línia no vàlida al comprovador d''etiquetes - {0}: {1}"
@@ -4068,16 +4207,16 @@ msgstr ""
"complexes."
msgid "Add"
-msgstr "Afegeix"
+msgstr "Afig"
msgid "TagChecker source"
msgstr "Font de TagChecker"
msgid "Please select the row to edit."
-msgstr "Si us plau, seleccioneu la línia a modificar"
+msgstr "Per favor, seleccioneu la línia a modificar"
msgid "Please select the row to delete."
-msgstr "Si us plau, seleccioneu la línia a suprimir"
+msgstr "Per favor, seleccioneu la línia a suprimir"
msgid ""
"The sources (URL or filename) of spell check (see "
@@ -4089,7 +4228,7 @@ msgstr ""
"dades per verificar l''ortografia."
msgid "Add a new source to the list."
-msgstr "Afegeix una nova font a la llista"
+msgstr "Afig una nova font a la llista"
msgid "Edit the selected source."
msgstr "Modificar la font seleccionada"
@@ -4132,8 +4271,8 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Utilitzar el fitxer de comprovació d''ortografia de defecte (recomanat)."
-msgid "Fix properties"
-msgstr "Corregit les propietats"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "No s''ha pogut trobar el tipus d''element"
@@ -4154,7 +4293,7 @@ msgid "Turnrestrictions"
msgstr "Prohibicions de gir"
msgid "This test checks if turnrestrictions are valid"
-msgstr "Aquest test comprova si les prohibicions de gir són vàlides"
+msgstr "Este test comprova si les prohibicions de gir són vàlides"
msgid "Unknown role"
msgstr "Rol desconegut"
@@ -4205,8 +4344,10 @@ msgid "Unclosed Ways"
msgstr "Vies no tancades"
msgid "This tests if ways which should be circular are closed."
-msgstr ""
-"Aquest test comprova si les vies que han de ser circulars són tancades"
+msgstr "Este test comprova si les vies que han de ser circulars són tancades"
+
+msgid "Unclosed way"
+msgstr "Via sense tancar"
msgid "natural type {0}"
msgstr "tipus d''element natural {0}"
@@ -4238,15 +4379,12 @@ msgstr "edifici"
msgid "area"
msgstr "àrea"
-msgid "Unclosed way"
-msgstr "Via sense tancar"
-
msgid "Unconnected ways"
msgstr "Vies sense connexió"
msgid "This test checks if a way has an endpoint very near to another way."
msgstr ""
-"Aquest test comprova si el final d''una via és molt a prop d''una altra via."
+"Este test comprova si el final d''una via és molt a prop d''una altra via."
msgid "Way end node near other highway"
msgstr "El final del cami és a prop d''una carretera"
@@ -4264,15 +4402,14 @@ msgid "Untagged and unconnected nodes"
msgstr "nodes sense etiquetes i sense connexió"
msgid "This test checks for untagged nodes that are not part of any way."
-msgstr ""
-"Aquest test cerca nodes sense etiquetes i que no són part de cap via."
-
-msgid "No tags"
-msgstr "Cap etiqueta"
+msgstr "Este test cerca nodes sense etiquetes i que no són part de cap via."
msgid "Unconnected nodes without physical tags"
msgstr "Nodes no connectats sense etiquetes físiques"
+msgid "No tags"
+msgstr "Cap etiqueta"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Te una etiqueta amb ''fixme'' o ''FIXME''"
@@ -4292,7 +4429,7 @@ msgid "Untagged, empty and one node ways"
msgstr "Vies sense etiquetar, buides i amb un únic node."
msgid "This test checks for untagged, empty and one node ways."
-msgstr "Aquest test cerca vies sense etiquetar, buides i amb un únic node."
+msgstr "Este test cerca vies sense etiquetar, buides i amb un únic node."
msgid "Unnamed ways"
msgstr "Vies sense nom"
@@ -4326,7 +4463,7 @@ msgstr "Vies odenades de manera incorrecta"
msgid "This test checks the direction of water, land and coastline ways."
msgstr ""
-"Aquest test comprova la direcció d''un curs d''aigua, de la terra i de la "
+"Este test comprova la direcció d''un curs d''aigua, de la terra i de la "
"línia costanera"
msgid "Reversed coastline: land not on left side"
@@ -4335,26 +4472,6 @@ msgstr "Línia de costa invertida: la terra no és al costat esquerre"
msgid "Reversed land: land not on left side"
msgstr "Terra invertida: la terra no és al costat esquerrre"
-msgid "Wrong number of arguments for bookmark"
-msgstr "El nombre d''aruments no és correcte pel favorit"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Error llegint entrada de favorits: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Error: Línia ''{0}'' no esperada al fitxer de favorits ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Valor duplicat ''{0}'' incorrecte a la línia ''{1}'' al fitxer de "
-"favorits ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>No es poden llegir els favorits de<br>''{0}''<br>Error: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "No tornar a mostrar (recordar selecció)"
@@ -4458,8 +4575,8 @@ msgstr "Mostrar ajuda"
msgid "Downloading \"Message of the day\""
msgstr "Baixant el \"Missatge del dia\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Avís: ha fallat la lectura de MOTD. L''excepció ha estat: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Ha fallat la lectura de MOTD. L''excepció ha estat: {0}"
msgid "Message of the day not available"
msgstr "El missatge del dia no és a l''abast del sistema"
@@ -4468,7 +4585,7 @@ msgid "Click to close the dialog"
msgstr "Feu clic per tancar la finestra de diàleg"
msgid "Imagery offset"
-msgstr "Decalatge de l''imatgeria"
+msgstr "Decalatge de la imatgeria"
msgid "Imagery"
msgstr "Imatgeria"
@@ -4521,8 +4638,8 @@ msgid ""
"Add each to the initial selection. Can be a google-like search string or an "
"URL which returns osm-xml"
msgstr ""
-"Afegeix cada element a la selecció inicial. Pot ser una cadena de text "
-"similar a les cerques de google ouna URL que retorni osm-xml"
+"Afig cada element a la selecció inicial. Pot ser una cadena de text similar "
+"a les cerques de google ouna URL que retorne osm-xml"
msgid "any"
msgstr "qualsevol"
@@ -4543,7 +4660,7 @@ msgid "options"
msgstr "opcions"
msgid "Show this help"
-msgstr "Mostra aquesta ajuda"
+msgstr "Mostra esta ajuda"
msgid "Standard unix geometry argument"
msgstr "Argument de geometria estàndard UNIX"
@@ -4555,7 +4672,7 @@ msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
msgstr "Descarrega la localització de la URL (amb lat=x&lon=y&zoom=z)"
msgid "Open a file (any file type that can be opened with File/Open)"
-msgstr "Obre un fitxer (de qualsevol tipus que pugui ser obert per osm)"
+msgstr "Obri un fitxer (de qualsevol tipus que puga ser obert per osm)"
msgid "Download the bounding box as raw GPS"
msgstr "Descarrega la zona delimitada com a dades GPS"
@@ -4568,7 +4685,7 @@ msgid "Select with the given search"
msgstr "Selecciona amb la cerca donada"
msgid "Launch in maximized mode"
-msgstr "Obre en mode de pantalla sencera"
+msgstr "Obri en mode de pantalla sencera"
msgid "Reset the preferences to default"
msgstr "Restabliment de les preferències de defecte"
@@ -4583,7 +4700,7 @@ msgid "Set the language"
msgstr "Tria l''idioma"
msgid "Displays the JOSM version and exits"
-msgstr "Mostra la versió de JOSM i sortir"
+msgstr "Mostra la versió de JOSM i eixir"
msgid "options provided as Java system properties"
msgstr "opcions proporcionades com a propietats de sistema de Java"
@@ -4601,7 +4718,7 @@ msgid ""
"megabytes"
msgstr ""
"nota: Per certs tipus de feines JOSM necessita força memòria. És possible "
-"que sigui necessari afegir la següent\n"
+"que siga necessari afegir la següent\n"
" Opció de Java per tal d''especificar la mida màxima de memòria "
"assignada en megabytes"
@@ -4612,8 +4729,8 @@ msgid ""
"Parameters --download, --downloadgps, and --selection are processed in this "
"order."
msgstr ""
-"Els paràmetres -download, --downloadgps i --selection són processats en "
-"aquest ordre."
+"Els paràmetres -download, --downloadgps i --selection són processats en este "
+"orde."
msgid "Make sure you load some data if you use --selection."
msgstr "Assegureu-vos que carregueu dades si utilitzeu --selection."
@@ -4656,7 +4773,7 @@ msgstr[1] "JOSM ha trobat {0} capes d''osm sense enregistrar. "
msgid ""
"It looks like JOSM crashed last time. Would you like to restore the data?"
msgstr ""
-"Sembla que JOSM va quedar bloquejat la darrera vegada. Voleu restaurar les "
+"Pareix que JOSM va quedar bloquejat la darrera vegada. Voleu restaurar les "
"dades?"
msgid "File"
@@ -4671,9 +4788,24 @@ msgstr "Visualitza"
msgid "Tools"
msgstr "Eines"
+msgid "More tools"
+msgstr "Més eines"
+
+msgid "Data"
+msgstr "Dades"
+
+msgid "Selection"
+msgstr "Selecció"
+
msgid "Presets"
msgstr "Predefinicions"
+msgid "More..."
+msgstr "Més ..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Finestres"
@@ -4690,20 +4822,35 @@ msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
"Activa la visibilitat de la barra d''eines d''edició (p.ex. barra vertical)"
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Àudio"
-msgid "Hide edit toolbar"
-msgstr "Amaga la barra d''eines d''edició"
+msgid "Do not hide toolbar"
+msgstr "No amagis la barra d''eines"
msgid "Hide this button"
-msgstr "Ocultar aquest botó"
+msgstr "Ocultar este botó"
msgid "Click the arrow at the bottom to show it again."
msgstr "Feu clic sobre la part inferior de la fletxa per tornar-ho a mostrar"
+msgid "Hide edit toolbar"
+msgstr "Amaga la barra d''eines d''edició"
+
msgid "Hide or show this toggle button"
-msgstr "Amaga o mostra aquest botó"
+msgstr "Amaga o mostra este botó"
msgid "Move right"
msgstr "Mou a la dreta"
@@ -4756,7 +4903,7 @@ msgid ""
msgstr ""
"Feu clic un altre cop amb el botó del mig per continuar el "
"cicle.<br>Manteniu premuda la tecla CTRL per fer una selecció directa "
-"d''aquesta llista amb el ratolí.<hr>"
+"d''esta llista amb el ratolí.<hr>"
msgid "(no object)"
msgstr "(cap objecte)"
@@ -4764,6 +4911,9 @@ msgstr "(cap objecte)"
msgid "User:"
msgstr "Nom d''usuari:"
+msgid "Do not hide status bar"
+msgstr "No amagis la barra d''eines"
+
msgid "Layer not in list."
msgstr "La capa no és a la llista."
@@ -4774,7 +4924,7 @@ msgid "Metric"
msgstr "Mètric"
msgid "Chinese"
-msgstr "Xinès"
+msgstr "Xinés"
msgid "Imperial"
msgstr "Imperial"
@@ -4791,29 +4941,13 @@ msgstr "En segon pla"
msgid "Click to run job in background"
msgstr "Feu clic per llançar la tasca en segon pla"
-msgid "false: the property is explicitly switched off"
-msgstr "fals: la propietat ha estat deshabilitada expressament"
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-"cert: la propietat ha estat habilitada expressament<html>Please confirm to "
-"remove <strong>1 object</strong> from <strong>1 relation</strong>.</html>"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parcial: els objectes seleccionats tenen diferents propietats, no ho canvieu"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "no definit: no aplicar aquesta propietat als objectes seleccionats"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
msgid ""
"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
msgstr ""
-"La imatgeria aèria podria estar desalineada. Si us plau verifiqueu el seu "
+"La imatgeria aèria podria estar desalineada. Per favor verifiqueu el seu "
"decalatge utilitzant un tack GPS!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -4823,27 +4957,27 @@ msgid "Details..."
msgstr "Detalls..."
msgid "Hide this message and never show it again"
-msgstr "Amagar aquest missatge i no tornar-ho a mostrar"
+msgstr "Amagar este missatge i no tornar-ho a mostrar"
msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
"relation</strong>.</html>"
msgstr ""
-"<html>Si us plau confirmeu la supressió d''<strong>1 objecte</strong> "
+"<html>Per favor confirmeu la supressió d''<strong>1 objecte</strong> "
"d''<strong>1 relació</strong>.</html>"
msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
"relations</strong>.</html>"
msgstr ""
-"<html>Si us plau confirmeu la supressió d''<strong>1 objecte</strong> de "
+"<html>Per favor confirmeu la supressió d''<strong>1 objecte</strong> de "
"<strong>{0} relacions</strong>.</html>"
msgid ""
"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
"relations</strong>.</html>"
msgstr ""
-"<html>Si us plau confirmeu la supressió de <strong>{0} objectes</strong> de "
+"<html>Per favor confirmeu la supressió de <strong>{0} objectes</strong> de "
"<strong>{1} relacions</strong>.</html>"
msgid "Deleting {0} object"
@@ -4870,13 +5004,13 @@ msgid "Click to close the dialog and remove the object from the relations"
msgstr "Feu clic per tancar la finestra i eliminar l''objecte de relacions"
msgid "Click to close the dialog and to abort deleting the objects"
-msgstr "Feu clic per tancar la finestra i aturar la supressió d''objectes"
+msgstr "Feu clic per tancar la finestra i parar la supressió d''objectes"
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
"level.</html>"
msgstr ""
-"<html>Si us plau, seleccioneu un <strong>interval de tessel·les OSM</strong> "
+"<html>Per favor, seleccioneu un <strong>interval de tessel·les OSM</strong> "
"al nivell d''ampliació donat.</html>"
msgid "Zoom level:"
@@ -4906,13 +5040,13 @@ msgid "Apply the tile address"
msgstr "Aplica l''adreça de la tessel·la"
msgid "Please enter a tile address"
-msgstr "Si us plau, introduïu una adreça de tessel·la"
+msgstr "Per favor, introduïu una adreça de tessel·la"
msgid "The current value isn''t a valid tile address"
msgstr "El valor no és una adreça de tessel·la vàlida"
msgid "Please enter a tile index"
-msgstr "Si us plau introduïu un índex de tessel·les"
+msgstr "Per favor introduïu un índex de tessel·les"
msgid "The current value isn''t a valid tile index for the given zoom level"
msgstr ""
@@ -4976,7 +5110,7 @@ msgid "Conflict background: same position in opposite"
msgstr "Conflicte al fons: igual posició oposat"
msgid "My with Their"
-msgstr "La meva amb la seva"
+msgstr "La meua amb la seua"
msgid "My with Merged"
msgstr "El meu amb el fusionat"
@@ -5018,14 +5152,14 @@ msgstr "Nodes(solucionat)"
msgid ""
"Merged node list frozen. No pending conflicts in the node list of this way"
msgstr ""
-"La llista de nodes fusionats està bloquejada. No hi ha conflictes d''aquesta "
+"La llista de nodes fusionats està bloquejada. No hi ha conflictes d''esta "
"via a la llista."
msgid "Nodes(with conflicts)"
msgstr "Nodes(amb conflictes)"
msgid "Pending conflicts in the node list of this way"
-msgstr "Conflictes pendents de resoldre a la llista de nodes d''aquesta via"
+msgstr "Conflictes pendents de resoldre a la llista de nodes d''esta via"
msgid "Members(resolved)"
msgstr "Membres(solucionat)"
@@ -5034,14 +5168,14 @@ msgid ""
"Merged member list frozen. No pending conflicts in the member list of this "
"relation"
msgstr ""
-"La llista de membres fusuinats està bloquejada.No hi ha conflictes "
-"d''aquesta via a la llista."
+"La llista de membres fusuinats està bloquejada.No hi ha conflictes d''esta "
+"via a la llista."
msgid "Members(with conflicts)"
msgstr "Membres(amb conflictes)"
msgid "Pending conflicts in the member list of this relation"
-msgstr "Hi ha conflictes pendents a la llista de membres d''aquesta relació"
+msgstr "Hi ha conflictes pendents a la llista de membres d''esta relació"
msgid "No pending property conflicts"
msgstr "No hi ha conflictes de propietats"
@@ -5084,7 +5218,7 @@ msgid "Compare "
msgstr "Compara "
msgid "My version"
-msgstr "La meva versió"
+msgstr "La meua versió"
msgid "List of elements in my dataset, i.e. the local dataset"
msgstr ""
@@ -5098,11 +5232,11 @@ msgid ""
"List of merged elements. They will replace the list of my elements when the "
"merge decisions are applied."
msgstr ""
-"Llista d''elements fusionats. Aquests elements remplaçaran la meva llista "
-"d''elements quan sigui aplicada la fusió."
+"Llista d''elements fusionats. Estos elements remplaçaran la meua llista "
+"d''elements quan siga aplicada la fusió."
msgid "Their version"
-msgstr "La seva versió"
+msgstr "La seua versió"
msgid "List of elements in their dataset, i.e. the server dataset"
msgstr ""
@@ -5123,6 +5257,9 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Copiar els elements seleccionats al final de la llista combinada d''elements"
+msgid "> before"
+msgstr "> abans"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5130,6 +5267,9 @@ msgstr ""
"Copiar els elements seleccionats abans del primer element seleccionat a la "
"llista combinada d''elements"
+msgid "> after"
+msgstr "> després"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5137,14 +5277,23 @@ msgstr ""
"Copiar els elements selecionats després del primer element seleccionat a la "
"llista combinada d''elements."
+msgid "< top"
+msgstr "< a dalt"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "Copiar els seus elements a l''inici de la llista fusionada"
+msgid "< bottom"
+msgstr "< a sota"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "Copiar els seus elements al final de la llista fusionada"
+msgid "< before"
+msgstr "< abans"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5152,6 +5301,9 @@ msgstr ""
"Copiar els seus elements seleccionats abans del primer node seleccionat de "
"la llista fusionada"
+msgid "< after"
+msgstr "< després"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5168,8 +5320,8 @@ msgstr "Copia tots els seus nodes a la versió fusionada"
msgid "Up"
msgstr "Amunt"
-msgid "Move up the selected elements by one position."
-msgstr "Moure amunt una posició els elements seleccionats"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Avall"
@@ -5201,19 +5353,19 @@ msgid ""
"entries.</html>"
msgstr ""
"<html>Cliqueu sobre <strong>{0}</strong> per començar la combinació entre "
-"les meves i les seves entrades.</html>"
+"les meues i les seues entrades.</html>"
msgid ""
"<html>Click <strong>{0}</strong> to finish merging my and their "
"entries.</html>"
msgstr ""
"<html>Cliqueu sobre <strong>{0}</strong> per finalitzar la combinació entre "
-"les meves i les seves entrades.</html>"
+"les meues i les seues entrades.</html>"
msgid "My version ({0} entry)"
msgid_plural "My version ({0} entries)"
-msgstr[0] "La meva versió ({0} entrada)"
-msgstr[1] "La meva versió ({0} entrades)"
+msgstr[0] "La meua versió ({0} entrada)"
+msgstr[1] "La meua versió ({0} entrades)"
msgid "Merged version ({0} entry)"
msgid_plural "Merged version ({0} entries)"
@@ -5222,18 +5374,8 @@ msgstr[1] "Versió fusionada ({0} entrades)"
msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
-msgstr[0] "La seva versió ({0} entrada)"
-msgstr[1] "La seva versió ({0} entrades)"
-
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Ajustament {0} encara no enregistrat. No es pot establir la particiapació a "
-"l''ajustament sincronitzat."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Ajustament {0} encara no enregistrat."
+msgstr[0] "La seua versió ({0} entrada)"
+msgstr[1] "La seua versió ({0} entrades)"
msgid "Node"
msgstr "Node"
@@ -5278,10 +5420,10 @@ msgid "not deleted"
msgstr "no suprimit"
msgid "Keep my coordinates"
-msgstr "Conservar les meves coordenades"
+msgstr "Conservar les meues coordenades"
msgid "Keep their coordinates"
-msgstr "Conservar les seves coordenades"
+msgstr "Conservar les seues coordenades"
msgid "Undecide conflict between different coordinates"
msgstr "Conflictes a resoldre entre coodenades diferents"
@@ -5325,10 +5467,10 @@ msgstr ""
"No és possible marcar com a no resolt l''element objecte de la fusió."
msgid "My version (local dataset)"
-msgstr "La meva versió (conjunt local de dades)"
+msgstr "La meua versió (conjunt local de dades)"
msgid "Their version (server dataset)"
-msgstr "La seva versió (conjunt de dades del servidor)"
+msgstr "La seua versió (conjunt de dades del servidor)"
msgid "Keep the selected key/value pairs from the local dataset"
msgstr "Conservar la parella clau/valor del conjunt de dades local"
@@ -5380,15 +5522,15 @@ msgid_plural ""
"want to continue?"
msgstr[0] ""
"Sou a punt de combinar {1} objectes, que formen part d''{0} relació:<br/>{2} "
-"Combinant aquests objectes podeu trencar la relació. Si no esteu segur, si "
-"us plau cancel·leu aquesta operació.<br/>Si voleu continuar, accedireu a una "
-"finestra que us ajudarà a decidir com adaptar la relació.<br/><br/>Voleu "
+"Combinant estos objectes podeu trencar la relació. Si no esteu segur, si vos "
+"plau cancel·leu esta operació.<br/>Si voleu continuar, accedireu a una "
+"finestra que vos ajudarà a decidir com adaptar la relació.<br/><br/>Voleu "
"continuar?"
msgstr[1] ""
"Sou a punt de combinar {1} objectes, que formen part de {0} "
-"relacions:<br/>{2} Combinant aquests objectes podeu trencar les relacions. "
-"Si no esteu segur, si us plau cancel·leu aquesta operació.<br/>Si voleu "
-"continuar, accedireu a una finestra que us ajudarà a decidir com adaptar les "
+"relacions:<br/>{2} Combinant estos objectes podeu trencar les relacions. Si "
+"no esteu segur, per favor cancel·leu esta operació.<br/>Si voleu continuar, "
+"accedireu a una finestra que vos ajudarà a decidir com adaptar les "
"relacions.<br/><br/>Voleu continuar?"
msgid "Combine confirmation"
@@ -5407,8 +5549,8 @@ msgid ""
"to fix the conflicting tags.<br/><br/>Do you want to continue?"
msgstr ""
"Sou a punt de combinar {0} objectes, però les etiquetes següents són "
-"conflictives:<br/>{1} Si aquests es combinenen aquests objectes, l''onjecte "
-"resultant pot contenir etiquetes no desitjades.<br/>Si continueu, anireu a "
+"conflictives:<br/>{1} Si estos es combinenen estos objectes, l''onjecte "
+"resultant pot contindre etiquetes no desitjades.<br/>Si continueu, anireu a "
"una finestra per resoldre el conflicte amb les etiquetes.<br/><br/>Voleu "
"continuar?"
@@ -5422,7 +5564,7 @@ msgid "Choose a value"
msgstr "Seleccioneu un valor"
msgid "Please decide which values to keep"
-msgstr "Si us plau, decidiu els valors a conservar"
+msgstr "Per favor, decidiu els valors a conservar"
msgid "Value ''{0}'' is going to be applied for key ''{1}''"
msgstr "El valor ''{0}'' serà aplicat a la clau ''{1}''"
@@ -5453,7 +5595,7 @@ msgid "Conflicts in pasted tags"
msgstr "Conflictes a etiquetes enganxades"
msgid "Paste ..."
-msgstr "Enganxa ..."
+msgstr "Apega ..."
msgid "From ..."
msgstr "De..."
@@ -5481,13 +5623,13 @@ msgstr ""
"la posició {0} és fora dels límmits. El nombre actual de membres és {1}."
msgid "Remove this relation member from the relation"
-msgstr "Suprimir aquest membre de la relació"
+msgstr "Suprimir este membre de la relació"
msgid "Keep"
msgstr "Manté"
msgid "Keep this relation member for the target object"
-msgstr "Conservar aquest membre per a l''objecte de destinació"
+msgstr "Conservar este membre per a l''objecte de destinació"
msgid "Undecided"
msgstr "No decidit"
@@ -5515,19 +5657,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Clau:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Entreu una clau per l''etiqueta, p.ex. "
-"<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valor:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Entreu un valor d''etiqueta, p. ex. <strong><tt>check "
-"members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5537,7 +5675,7 @@ msgid ""
"ways that are members of the same relation: the combined way will take the "
"place of the original way in the relation.</html>"
msgstr ""
-"<html>Les vies combinades són membres d''una o més relacions. Sis us plau, "
+"<html>Les vies combinades són membres d''una o més relacions. Sis vos plau, "
"decidiu quins dels membres voleu <strong>conservar</strong> a la via "
"combinada resultant i quins voleu <strong>suprimir</strong>.<br>El que està "
"predeterminat és de <strong>conservar</strong> la primera via i "
@@ -5553,7 +5691,7 @@ msgid ""
"other nodes that are members of the same relation: the target node will take "
"the place of the original node in the relation.</html>"
msgstr ""
-"<html>Els nodes combinats són membres d''una o més relacions. Sis us plau, "
+"<html>Els nodes combinats són membres d''una o més relacions. Sis vos plau, "
"decidiu quins dels membres voleu <strong>conservar</strong> al node "
"resultant i quins voleu <strong>suprimir</strong>.<br>El que està "
"predeterminat és de <strong>conservar</strong> el primer node i "
@@ -5561,7 +5699,7 @@ msgstr ""
"el node resultant prendrà el lloc del node original a la relació.</html>"
msgid "Apply this role to all members"
-msgstr "Aplicar aquest rol a tots els membres"
+msgstr "Aplicar este rol a tots els membres"
msgid "Orig. Way"
msgstr "Via original"
@@ -5571,7 +5709,7 @@ msgstr "Decisió"
msgid "<html>Please select the values to keep for the following tags.</html>"
msgstr ""
-"<html>Si us plau, seleccioneu els valors a conservar per a les següents "
+"<html>Per favor, seleccioneu els valors a conservar per a les següents "
"etiquetes.</html>"
msgid "Show tags with conflicts only"
@@ -5596,7 +5734,7 @@ msgid "Changesets"
msgstr "Conjunt de canvis"
msgid "Open the list of changesets in the current layer."
-msgstr "Obre la llista de canvis de la capa actual"
+msgstr "Obri la llista de canvis de la capa actual"
msgid "Select all objects assigned to the currently selected changesets"
msgstr "Selecciona tot els objectes al conjunt de canvis seleccionat"
@@ -5616,21 +5754,21 @@ msgid "Show info"
msgstr "Mostra informació"
msgid "Open a web page for each selected changeset"
-msgstr "Obre una pàgina web per a cada conjunt de canvis"
+msgstr "Obri una pàgina web per a cada conjunt de canvis"
msgid "Details"
msgstr "Detalls"
msgid "Opens the Changeset Manager window for the selected changesets"
msgstr ""
-"Obre la finestra del gestor de modificacions per a les modificacions "
+"Obri la finestra del gestor de modificacions per a les modificacions "
"seleccionades"
msgid "Command Stack"
-msgstr "Pila d''ordres"
+msgstr "Pila d''ordes"
msgid "Open a list of all commands (undo buffer)."
-msgstr "Obre un llista amb totes les comandes (desfer memòria intermèdia)"
+msgstr "Obri un llista amb totes les comandes (desfer memòria intermèdia)"
msgid "Toggle: {0}"
msgstr "Commuta: {0}"
@@ -5638,16 +5776,18 @@ msgstr "Commuta: {0}"
msgid ""
"Selects the objects that take part in this command (unless currently deleted)"
msgstr ""
-"Selecciona els objectes que participen a la comanda (llevat que hagin estat "
+"Selecciona els objectes que participen a la comanda (llevat que hagen estat "
"esborrats)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Seleccioneu un nivell d''ampliació"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Selecciona els objectes que són part d''esta comanda (excepte si han estat "
+"suprimits) i fa una apliaciço de la zona on es troben"
msgid "Undo the selected and all later commands"
msgstr "Desfer la comanda seleccionada i totes les següents"
@@ -5666,7 +5806,7 @@ msgstr "Resol"
msgid "Open a merge dialog of all selected items in the list above."
msgstr ""
-"Obre una finestra per fusionar els elements seleccionats a la llista."
+"Obri una finestra per fusionar els elements seleccionats a la llista."
msgid ""
"Set the selected elements on the map to the selected items in the list above."
@@ -5679,7 +5819,7 @@ msgstr[0] "Ha estat detectat {0} conflicte."
msgstr[1] "Han estat detectats {0} conflictes."
msgid "Click to close this dialog and continue editing"
-msgstr "Feu clic per a tancar aquesta finestra i continuar editant"
+msgstr "Feu clic per a tancar esta finestra i continuar editant"
msgid "Conflicts detected"
msgstr "Conflictes detectats"
@@ -5707,9 +5847,9 @@ msgid ""
"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
"conflicts.</html>"
msgstr ""
-"<html>No heu acabat la combinació de les diferències d''aquest "
-"conflicte.<br>La seva resolució no podrà aplicada fins que totes les "
-"diferències<br>hagin estat resoltes.<br>Feu clic sobre <strong>{0}</strong> "
+"<html>No heu acabat la combinació de les diferències d''este "
+"conflicte.<br>La seua resolució no podrà aplicada fins que totes les "
+"diferències<br>hagen estat resoltes.<br>Feu clic sobre <strong>{0}</strong> "
"per tancar.<strong> Les diferències<br>solucionades no seran "
"aplicades.</strong><br>Feu clic sobre <strong>{1}</strong> per tornar a la "
"finestra de resolució de conflictes.</html>"
@@ -5745,7 +5885,7 @@ msgid "Filter mode"
msgstr "Mode filtre"
msgid "Add filter."
-msgstr "Afegeix filtre."
+msgstr "Afig filtre."
msgid "Edit filter."
msgstr "Modifica filtre"
@@ -6042,10 +6182,10 @@ msgid "East/North"
msgstr "Nord-est"
msgid "Please enter a GPS coordinates"
-msgstr "Si us plau introduïu les coordenades GPS"
+msgstr "Per favor introduïu les coordenades GPS"
msgid "Please enter a Easting and Northing"
-msgstr "Si us plau introduïu les coordenades cartesianes (x,y)"
+msgstr "Per favor introduïu les coordenades cartesianes (x,y)"
msgid "Toggle visibility of layer: {0}"
msgstr "Commuta la visibilitat de la capa: {0}"
@@ -6081,7 +6221,7 @@ msgid "Activate layer"
msgstr "Activar la capa"
msgid "Merge this layer into another layer"
-msgstr "Fusiona aquesta capa amb una altra"
+msgstr "Fusiona esta capa amb una altra"
msgid "Duplicate this layer"
msgstr "Duplica la capa"
@@ -6099,11 +6239,10 @@ msgid "layer is currently hidden (click to show layer)"
msgstr "la capa està oculta (cliqueu per mostrar-la)"
msgid "this layer is the active layer"
-msgstr "aquesta capa és l''activa"
+msgstr "esta capa és l''activa"
msgid "this layer is not currently active (click to activate)"
-msgstr ""
-"aquesta capa no està activa en aquest moment (cliqueu per activar-la)"
+msgstr "esta capa no està activa en este moment (cliqueu per activar-la)"
msgid "Move the selected layer one row up."
msgstr "Moure la capa seleccionada una fila amunt"
@@ -6117,6 +6256,9 @@ msgstr "Mostra/Amaga"
msgid "Information about layer"
msgstr "Informació sobre la capa"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Estils d''acoloriment de mapes"
@@ -6150,10 +6292,10 @@ msgid "reload selected styles from file"
msgstr "recarregar els estils seleccionats del fitxer"
msgid "Save as..."
-msgstr "Anomena i desa..."
+msgstr "Anomena i guarda..."
msgid "Save a copy of this Style to file and add it to the list"
-msgstr "Desa una copia d''aquest estil a un fitxer i afegir-ho a la llista"
+msgstr "Guarda una copia d''este estil a un fitxer i afegir-ho a la llista"
msgid "Map paint style file (*.mapcss, *.zip)"
msgstr "Fitxer d''estil del mapa (*.mapcss, *.zip)"
@@ -6165,7 +6307,7 @@ msgid "Reloading style sources"
msgstr "Recarregant les fonts d''estils"
msgid "Save style ''{0}'' as ''{1}''"
-msgstr "Desa estil ''{0}'' as ''{1}''"
+msgstr "Guarda estil ''{0}'' as ''{1}''"
msgid "view meta information, error log and source definition"
msgstr "mostra meta-informació, el registre d''errors i la font de definició"
@@ -6200,11 +6342,41 @@ msgstr "Està actiu l''estil?"
msgid "No"
msgstr "No"
+msgid "Object type:"
+msgstr "Tipus d''objecte:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "barrejat"
+
+msgid "Choose the OSM object type"
+msgstr "Seleccioneu el tipus d''objecte OSM"
+
+msgid "Object ID:"
+msgstr "ID d''objecte"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Indiqueu l''ID de l''objecte a baixar"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Els ID dels objectes poden ser separats per comes o per espais.<br/> "
+"Exemples: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En mode mixt, "
+"especifiqueu els objectes d''esta manera: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relacions"
msgid "Open a list of all relations."
-msgstr "Obre una llista amb totes les relacions."
+msgstr "Obri una llista amb totes les relacions."
msgid "Relation list filter"
msgstr "Filtre de la llista de relacions"
@@ -6221,11 +6393,8 @@ msgstr "Relacions: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relacions: {0}"
-msgid "Selection"
-msgstr "Selecció"
-
msgid "Open a selection list window."
-msgstr "Obre la finestra de la llista de relacions"
+msgstr "Obri la finestra de la llista de relacions"
msgid "Current Selection"
msgstr "Selecció actual"
@@ -6248,23 +6417,11 @@ msgstr "Ara no és seleccionable"
msgid "Selection: {0}"
msgstr "Selecció: {0}"
-msgid "Side buttons"
-msgstr "Botons laterals"
-
-msgid "Always shown"
-msgstr "Mostra-ho sempre"
-
-msgid "Dynamic"
-msgstr "Dinàmic"
-
-msgid "Always hidden"
-msgstr "Sempre amagat"
-
msgid "Toggle dynamic buttons"
msgstr "Commuta botons dinàmics"
msgid "Open preferences for this panel"
-msgstr "Obre les preferències d''aquesta pantalla"
+msgstr "Obri les preferències d''esta pantalla"
msgid "Undock the panel"
msgstr "Separa el tauler"
@@ -6272,18 +6429,30 @@ msgstr "Separa el tauler"
msgid ""
"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-"Tanqueu aquest tauler. El podreu tornar a obrir amb els botons de "
-"l''esquerra de la barra d''eines."
+"Tanqueu este tauler. El podreu tornar a obrir amb els botons de l''esquerra "
+"de la barra d''eines."
msgid "Click to minimize/maximize the panel content"
msgstr "Feu clic per a minimitzar/maximitzar el contingut del pannell"
+msgid "Side buttons"
+msgstr "Botons laterals"
+
+msgid "Always shown"
+msgstr "Mostra-ho sempre"
+
+msgid "Dynamic"
+msgstr "Dinàmic"
+
+msgid "Always hidden"
+msgstr "Sempre amagat"
+
msgid "Authors"
msgstr "Autors/es"
msgid "Open a list of people working on the selected objects."
msgstr ""
-"Obre la llista de les persones que han treballat en els objectes seleccionats"
+"Obri la llista de les persones que han treballat en els objectes seleccionats"
msgid "{0} Author"
msgid_plural "{0} Authors"
@@ -6291,23 +6460,22 @@ msgstr[0] "{0} Autor"
msgstr[1] "{0} Autors"
msgid "Select objects submitted by this user"
-msgstr "Seleccionar els objectes d''aquest usuari"
+msgstr "Seleccionar els objectes d''este usuari"
msgid "Launches a browser with information about the user"
-msgstr "Obre un navegador web amb informació sobre l''usuari"
+msgstr "Obri un navegador web amb informació sobre l''usuari"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Avís: només s''està mostrant informació al navegador del primer {0} dels {1} "
-"usuaris seleccionats"
+"Només es mostrarà informació al navegador per {0} dels {1} usuaris "
+"seleccionats"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
"this system.</html>"
msgstr ""
"<html>Ha fallat la creació d''una URL perquè la codificació ''{0}''<br>no "
-"està disponible en aquest sistema</html>"
+"està disponible en este sistema</html>"
msgid "Missing encoding"
msgstr "Codificació mancant"
@@ -6322,14 +6490,11 @@ msgid "Validation Results"
msgstr "Validació de resultats"
msgid "Open the validation window."
-msgstr "Obre la finestra de validació"
+msgstr "Obri la finestra de validació"
msgid "Validation results"
msgstr "Resultat de la validació"
-msgid "Zoom to problem"
-msgstr "Ampliar la zona del problema"
-
msgid "Fix"
msgstr "Arregla"
@@ -6386,7 +6551,7 @@ msgid "Query"
msgstr "Consulta"
msgid "Launch the dialog for querying changesets"
-msgstr "Obre la finestra per fer consultes sobre conjunts de canvis"
+msgstr "Obri la finestra per fer consultes sobre conjunts de canvis"
msgid "Remove from cache"
msgstr "Eliminar de la memòria cau"
@@ -6434,7 +6599,7 @@ msgstr "buit"
msgctxt "changeset.state"
msgid "Open"
-msgstr "Obre"
+msgstr "Obri"
msgctxt "changeset.state"
msgid "Closed"
@@ -6450,7 +6615,7 @@ msgid "Comment"
msgstr "Comentari"
msgid "Open"
-msgstr "Obre"
+msgstr "Obri"
msgid "User"
msgstr "Usuari"
@@ -6483,9 +6648,6 @@ msgid "Update the changeset content from the OSM server"
msgstr ""
"Actualitzar el contingut del conjunt de canvis amb dades del servidor OSM"
-msgid "Show history"
-msgstr "Mostra l''historial"
-
msgid "Download and show the history of the selected objects"
msgstr "Descarregar i mostrar l''historial de l''objecte seleccionat"
@@ -6522,7 +6684,7 @@ msgstr "Res a ampliar"
msgid "The content of this changeset is not downloaded yet."
msgstr ""
-"El contingut d''aquest conjunt de canvis encara no ha estat descarregat."
+"El contingut d''este conjunt de canvis encara no ha estat descarregat."
msgid "Download now"
msgstr "Baixa-ho ara"
@@ -6572,8 +6734,8 @@ msgid ""
"Select the primitives in the content of this changeset in the current data "
"layer"
msgstr ""
-"Seleccionar les primitives en el contingut d''aquest conjunt de canvis de "
-"les dades actuals"
+"Seleccionar les primitives en el contingut d''este conjunt de canvis de les "
+"dades actuals"
msgid ""
"<html>None of the objects in the content of changeset {0} is available in "
@@ -6586,7 +6748,7 @@ msgid ""
"Zoom to the objects in the content of this changeset in the current data "
"layer"
msgstr ""
-"Amplia els objectes en el contingut d''aquest conjunt de canvis a la capa "
+"Amplia els objectes en el contingut d''este conjunt de canvis a la capa "
"actual"
msgid "Download changesets"
@@ -6622,7 +6784,7 @@ msgstr "Selecciona conjunts de canvis en funció de si són oberts o tancats"
msgid ""
"Select changesets based on the date/time they have been created or closed"
msgstr ""
-"Seleccionar conjunts de canvis en base a la data i hora de la seva creació o "
+"Seleccionar conjunts de canvis en base a la data i hora de la seua creació o "
"tancament."
msgid "Select only changesets related to a specific bounding box"
@@ -6675,13 +6837,13 @@ msgstr ""
"d''usuari ''{0}''"
msgid "Please enter a valid user ID"
-msgstr "Si us plau, indiqueu un ID d''usuari vàlid"
+msgstr "Per favor, indiqueu un ID d''usuari vàlid"
msgid "Invalid user ID"
msgstr "L''ID de l''usuari no és vàlid"
msgid "Please enter a non-empty user name"
-msgstr "Si us plau, indiqueu un nom d''usuari"
+msgstr "Per favor, indiqueu un nom d''usuari"
msgid "Invalid user name"
msgstr "Nom d''usuari no vàlid"
@@ -6719,7 +6881,7 @@ msgid ""
"<html>Please enter valid date/time values to restrict<br>the query to a "
"specific time range.</html>"
msgstr ""
-"<html>Si us plau, indiqueu una data i hora vàlides per a limitar<br>la "
+"<html>Per favor, indiqueu una data i hora vàlides per a limitar<br>la "
"consulta a un interval de temps específic.</html>"
msgid "Invalid date/time values"
@@ -6736,9 +6898,8 @@ msgid ""
"<html>Please enter valid longitude/latitude values to restrict<br>the "
"changeset query to a specific bounding box.</html>"
msgstr ""
-"<html>Si us plau, indiqueu una longitud i latitud vàlides per a "
-"limitar<br>al consulta sobre els conjunts de canvis a una zona "
-"específica.</html>"
+"<html>Per favor, indiqueu una longitud i latitud vàlides per a limitar<br>al "
+"consulta sobre els conjunts de canvis a una zona específica.</html>"
msgid "Invalid bounding box"
msgstr "El límits no són vàlids"
@@ -6746,34 +6907,34 @@ msgstr "El límits no són vàlids"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-"El valor actual no és un ID d''usuari vàlid. Si us plau, introduïu un valor "
+"El valor actual no és un ID d''usuari vàlid. Per favor, introduïu un valor "
"enter > 0"
msgid "Please enter an integer value > 0"
-msgstr "Si us plau, indiqueu un valor enter més gran que 0"
+msgstr "Per favor, indiqueu un valor enter més gran que 0"
msgid ""
"<html>The current value is not a valid user name.<br>Please enter an non-"
"empty user name.</html>"
msgstr ""
-"<html>El valor actual no és un nom d''usuari vàlid.<br>Si us plau, "
-"indiqueuun nom d''usuari"
+"<html>El valor actual no és un nom d''usuari vàlid.<br>Per favor, indiqueuun "
+"nom d''usuari"
msgid "Please enter an non-empty user name"
-msgstr "Si us plau entreu un nom d''usuari"
+msgstr "Per favor entreu un nom d''usuari"
msgid ""
"Please enter a date in the usual format for your locale.<br>Example: "
"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-"Si us plau, indiqueu una data en el vostre format local.<br>Exemple: "
+"Per favor, indiqueu una data en el vostre format local.<br>Exemple: "
"{0}<br>Exemple: {1}<br>Exemple: {2}<br>Exemple: {3}<br>"
msgid ""
"Please enter a valid time in the usual format for your locale.<br>Example: "
"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
-"Si us plau, indiqueu una hora en el vostre format local.<br>Exemple: "
+"Per favor, indiqueu una hora en el vostre format local.<br>Exemple: "
"{0}<br>Exemple: {1}<br>Exemple: {2}<br>Exemple: {3}<br>"
msgid "Download my changesets only"
@@ -6793,7 +6954,7 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
-"<html>Si us plau, seleccioneu una de les següents <strong>consultes "
+"<html>Per favor, seleccioneu una de les següents <strong>consultes "
"estàndard</strong>.Seleccioneu <strong>Descarregar només els meus conjunts "
"de canvis</strong> si només voleu descarregar els que heu creat.<br>Tingueu "
"en consideració que JOSM descarregarà un màxim de 100 conjunts de "
@@ -6807,7 +6968,7 @@ msgid ""
"user name in the preferences first.</em></html>"
msgstr ""
"<html>Descarregar els meus conjunts de canvis oberts<br><em>Deshabilitat. Si "
-"us plau, indiqueu primer el vostre nom d''usuari OSM a les "
+"vos plau, indiqueu primer el vostre nom d''usuari OSM a les "
"preferències.</em></html>"
msgid "<html>Download my open changesets</html>"
@@ -6825,11 +6986,11 @@ msgstr ""
"<html>Descarregar els conjunts de canvis de la vista actual del mapa</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Avís: valor inesperat per la preferència ''{0}'', hi ha ''{1}''. "
-"Reinicialitzant amb la la consulta per defecte"
+"Valor inesperat per la preferència ''{0}'', s''ha obtingut ''{1}''. "
+"Reinicialitzant am la consulta predefinida."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6861,11 +7022,10 @@ msgid "Query and download changesets"
msgstr "Consultar i descarregar conjunts de canvis"
msgid "Please enter a valid changeset query URL first."
-msgstr ""
-"Si us plau, indiqueu una consulta de URL de conjunts de canvis vàlida"
+msgstr "Per favor, indiqueu una consulta d'URL de conjunts de canvis vàlida"
msgid "Illegal changeset query URL"
-msgstr "Consulta de URL de conjunts de canvis incorecta"
+msgstr "Consulta d'URL de conjunts de canvis incorecta"
msgid "Close the dialog and abort querying of changesets"
msgstr "Tancar la finestra i anular la consulta de conjunts de canvis"
@@ -6874,7 +7034,7 @@ msgid "Querying and downloading changesets"
msgstr "Consultant i descarregant conjunts de canvis"
msgid "Determine user id for current user..."
-msgstr "Determinar l''ID dde l''usuari actual..."
+msgstr "Determinar l''ID de l''usuari actual..."
msgid "Query and download changesets ..."
msgstr "Consultar i descarregar conjunts de canvis ..."
@@ -6884,7 +7044,7 @@ msgstr "Adreça URL: "
msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
msgstr ""
-"Si us plau, indiqueu o enganxeu una URL per recuperar conjunts de canvis de "
+"Per favor, indiqueu o apegueu una URL per recuperar conjunts de canvis de "
"l''API OSM"
msgid "Examples"
@@ -6895,41 +7055,53 @@ msgid ""
"regardless of the host, port and path of the URL entered below."
msgstr ""
"Noteu que les peticions del conjunt de canvis són sempre enviades a ''{0}'', "
-"sense tenir en compte el servidor, el port i el camí de la URL que s''havia "
+"sense tindre en compte el servidor, el port i el camí de la URL que s''havia "
"entrat."
msgid "This changeset query URL is invalid"
-msgstr "Aquesta URL de consulta de conjunts de canvis no és vàlida"
+msgstr "Esta URL de consulta de conjunts de canvis no és vàlida"
+
+msgid "Discardable key: selection Foreground"
+msgstr "Clau descartable: selecció en primer pla"
-msgid "Select objects for which to change properties."
-msgstr "Seleccionar objectes per canviar les seves propietats"
+msgid "Discardable key: selection Background"
+msgstr "Clau descartable: selecció en el fons"
-msgid "Properties/Memberships"
-msgstr "Propietats/Membres"
+msgid "Discardable key: foreground"
+msgstr "Clau descartable: selecció en primer pla"
-msgid "Properties for selected objects."
-msgstr "Propietats dels objectes seleccionats"
+msgid "Discardable key: background"
+msgstr "Clau descartable: selecció en el fons"
msgid "<different>"
msgstr "<diferent>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr "Posició"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propietats: {0} / Membres: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Propietats / Membres"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Suprimir la clau seleccionada a tots els objectes"
-msgid "Delete Properties"
-msgstr "Suprimir propietats"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Canviar la relació"
@@ -6941,29 +7113,29 @@ msgid "Really delete selection from relation {0}?"
msgstr "Segur que voleu suprimir la selecció de la relació {0}?"
msgid "Add a new key/value pair to all objects"
-msgstr "Afegeix un nou parell clau/valor a tots els objectes"
+msgstr "Afig un nou parell clau/valor a tots els objectes"
-msgid "Add Property"
-msgstr "Afegeir una propietat"
+msgid "Add Tag"
+msgstr "Afig etiqueta"
msgid "Edit the value of the selected key for all objects"
msgstr "Editar el valor de la clau seleccionada per a tots els objectes"
-msgid "Edit Properties"
-msgstr "Editar les propietats"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
-msgstr "Anar al wiki OSM per obtenir ajuda (F1)"
+msgstr "Anar al wiki OSM per obtindre ajuda (F1)"
msgid "Launch browser with wiki help for selected object"
msgstr ""
-"Obre la pàgina wiki d''ajuda de l''objecte seleccionat a un navegador web"
+"Obri la pàgina wiki d''ajuda de l''objecte seleccionat a un navegador web"
msgid "Paste Value"
-msgstr ""
+msgstr "Apega el valor"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "Apega del porta-retalls el valor de l''etiqueta seleccionada"
msgid "Copy Value"
msgstr "Copia el valor"
@@ -7032,13 +7204,7 @@ msgstr[0] "Canviar les propietats de {0} objecte"
msgstr[1] "Canviar les propietats de {0} objectes"
msgid "Use English language for tag by default"
-msgstr ""
-
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
+msgstr "Usa l''anglés per etiquetar de forma predeterminada"
msgid "Add value?"
msgstr "Afegir el valor?"
@@ -7049,28 +7215,36 @@ msgstr[0] "Això canviarà {0} objecte."
msgstr[1] "Això canviarà {0} objectes."
msgid "Please select a key"
-msgstr "Si us plau seleccioneu una clau"
+msgstr "Per favor seleccioneu una clau"
msgid "Please select a value"
-msgstr "Si us plau seleccioneu un valor"
+msgstr "Per favor seleccioneu un valor"
msgid "Set number of recently added tags"
-msgstr ""
+msgstr "Estableix el nombre de les etiquetes afegides recentment"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Recorda les últimes etiquetes usades"
msgid "Please enter the number of recently added tags to display"
msgstr ""
+"Per favor, establiu el nombre de les etiquetes recentment afegides a "
+"visualitzar"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "Instroduïu un nombre enter entre 0 i {0}"
msgid "Recently added tags"
msgstr "Etiquetes afegides recentment"
+msgid "Choose recent tag {0}"
+msgstr "Escolliu una etiqueta recent {0}"
+
msgid "Use this tag again"
-msgstr "Utilitza aquesta etiqueta un altre cop"
+msgstr "Utilitza esta etiqueta un altre cop"
+
+msgid "Apply recent tag {0}"
+msgstr "Aplica una etiqueta recent {0}"
msgid "The key ''{0}'' is already used"
msgstr "La clau ''{0}'' ja ha estat utilitzada"
@@ -7113,9 +7287,9 @@ msgstr "La relació està suprimida"
msgid "Downloading relation {0}"
msgstr "Descarregant relació {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Avís: Ignorant l''excepció perquè la tasca fou anulada. Excepció: {0}"
+"Ignorant l''excepció a causa de l''anul·lació de la tasca. Excepció: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7168,8 +7342,8 @@ msgid ""
"relation itself.<br>This creates circular dependencies and is "
"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
msgstr ""
-"<html>Com a mínim, hi ha un membre d''aquesta relació que fa referència<br>a "
-"la relació mateixa.<br>Això crea dependències circulars, cosa totalment "
+"<html>Com a mínim, hi ha un membre d''esta relació que fa referència<br>a la "
+"relació mateixa.<br>Això crea dependències circulars, cosa totalment "
"desaconsellada.<br>Com voleu procedir amb les dependències circulars?</html>"
msgid "Remove them, clean up relation"
@@ -7178,12 +7352,17 @@ msgstr "Suprimir-les, netejar la relació"
msgid "Ignore them, leave relation as is"
msgstr "Ignorar-les, deixar la relació com està"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Ho sentim, la drecera \"{0}\" no pot ser activada a la finestra de "
+"modificació de relacions"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
"member?</html>"
msgstr ""
-"<html>Aquesta relació ja te un o més membres que fan referència a "
+"<html>Esta relació ja te un o més membres que fan referència a "
"<br>l''objecte ''{0}''<br><br>Segur que voleu afegir un altre membre a la "
"relació?</html>"
@@ -7202,7 +7381,7 @@ msgstr ""
msgid ""
"Add all objects selected in the current dataset before the first member"
msgstr ""
-"Afegeix els objectes seleccionats al conjunt de dades abans del primer membre"
+"Afig els objectes seleccionats al conjunt de dades abans del primer membre"
msgid ""
"Add all objects selected in the current dataset before the first selected "
@@ -7213,8 +7392,8 @@ msgid ""
"Add all objects selected in the current dataset after the last selected "
"member"
msgstr ""
-"Afegeix els objectes seleccionats al conjunt de dades deprés del darrer "
-"membre seleccionat"
+"Afig els objectes seleccionats al conjunt de dades deprés del darrer membre "
+"seleccionat"
msgid "Remove all members referring to one of the selected objects"
msgstr "Suprimir els membres que es refereixen als objectes seleccionats"
@@ -7232,7 +7411,7 @@ msgstr ""
"la selecció"
msgid "Select objects for selected relation members"
-msgstr "Escull objectes pels membres de la relació seleccionats"
+msgstr "Trieu objectes pels membres de la relació seleccionats"
msgid "Sort the relation members"
msgstr "Ordenar els membres de la relació"
@@ -7244,7 +7423,7 @@ msgid "Relation Editor: Sort"
msgstr "Editor de relacions: Ordenar"
msgid "Reverse the order of the relation members"
-msgstr "Invertir l''ordre dels membres de la relació"
+msgstr "Invertir l''orde dels membres de la relació"
msgid "Reverse"
msgstr "Invertir"
@@ -7262,7 +7441,7 @@ msgid "Relation Editor: Move Down"
msgstr "Editor de relacions: Moure avall"
msgid "Remove the currently selected members from this relation"
-msgstr "Suprimir d''aquesta relació els membres seleccionats"
+msgstr "Suprimir d''esta relació els membres seleccionats"
msgid "Relation Editor: Remove"
msgstr "Editor de relacions: Suprimir"
@@ -7275,7 +7454,7 @@ msgid ""
"relation editor\n"
"was open. They have been removed from the relation members list."
msgstr ""
-"Un o més membres d''aquesta relació han estat esborrats mentre l''editor de "
+"Un o més membres d''esta relació han estat esborrats mentre l''editor de "
"relacions\n"
"era obert. Han estat suprimides de la llista de membres."
@@ -7283,7 +7462,7 @@ msgid "Yes, create a conflict and close"
msgstr "Si, crear un conflicte i tancar"
msgid "Click to create a conflict and close this relation editor"
-msgstr "Cliqueu per a crear un conflicte i tancar aquest editor de relacions"
+msgstr "Cliqueu per a crear un conflicte i tancar este editor de relacions"
msgid "No, continue editing"
msgstr "No, continuar modificant"
@@ -7298,7 +7477,7 @@ msgid ""
"apply your changes and continue editing.<br><br>Do you want to create a "
"conflict and close the editor?</html>"
msgstr ""
-"<html>Aquesta relació ha canviat fora de l''editor.<br>No podeu aplicar "
+"<html>Esta relació ha canviat fora de l''editor.<br>No podeu aplicar "
"elsvostres canvis i continuar editant.<br><br>Voleu crear un conflicte i "
"tancar l''editor?</html>"
@@ -7306,8 +7485,8 @@ msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
msgstr ""
-"<html>La capa ''{0}'' té un conflicte per l''objecte<br>''{1}''.<br>Si us "
-"plau resolgueu primer aquest conflicte i llavors toneu a provar.</html>"
+"<html>La capa ''{0}'' té un conflicte per l''objecte<br>''{1}''.<br>Si vos "
+"plau resolgueu primer este conflicte i llavors toneu a provar.</html>"
msgid "Apply the current updates"
msgstr "Aplicar les actualitzacions"
@@ -7319,16 +7498,16 @@ msgid "Cancel the updates and close the dialog"
msgstr "Anular les actualitzacions i tancar la finestra"
msgid "Yes, save the changes and close"
-msgstr "Si, desar els canvis i tancar"
+msgstr "Si, guardar els canvis i tancar"
msgid "Click to save the changes and close this relation editor"
-msgstr "Feu clic per desar els canvis i tancar aquest editor de relacions"
+msgstr "Feu clic per guardar els canvis i tancar este editor de relacions"
msgid "No, discard the changes and close"
msgstr "No, descartar els canvis i tancar"
msgid "Click to discard the changes and close this relation editor"
-msgstr "Feu cli perdescartar els canvis i tancar aquest editor de relacions"
+msgstr "Feu cli perdescartar els canvis i tancar este editor de relacions"
msgid "Cancel, continue editing"
msgstr "Cancel·lar, continuar l''edició"
@@ -7336,13 +7515,13 @@ msgstr "Cancel·lar, continuar l''edició"
msgid ""
"<html>The relation has been changed.<br><br>Do you want to save your "
"changes?</html>"
-msgstr "<html>La relació ha canviat.<br><br>Voleu desar elsvostres canvis?"
+msgstr "<html>La relació ha canviat.<br><br>Voleu guardar elsvostres canvis?"
msgid "Unsaved changes"
-msgstr "Canvis sense desar"
+msgstr "Canvis sense guardar"
msgid "Add an empty tag"
-msgstr "Afegeix una etiqueta buida"
+msgstr "Afig una etiqueta buida"
msgid "Download all incomplete members"
msgstr "Descarregant els membres incomplets"
@@ -7368,7 +7547,7 @@ msgstr[0] "Esteu configurant un rol buit per a {0} objecte."
msgstr[1] "Esteu configurant un rol buit per a {0} objectes."
msgid "This is equal to deleting the roles of these objects."
-msgstr "Això és el mateix que esborrar els rols d''aquests objectes"
+msgstr "Això és el mateix que esborrar els rols d''estos objectes"
msgid "Do you really want to apply the new role?"
msgstr "Segur que voleu aplicar el nou rol?"
@@ -7462,6 +7641,28 @@ msgstr ""
"la via no està connectada ni a un membre anterior ni a un membre posterior "
"de la relació"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "El nombre d''aruments no és correcte pel favorit"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Error llegint entrada de favorits: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Línia ''{0}'' inesperada al fitxer de preferits ''{1}'"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Valor doble no vàlid \"{0}\" a la línia \"{1}\" del fitxer de preferits "
+"''{2}'"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>No es poden llegir els favorits de<br>''{0}''<br>Error: {1}</html>"
+
msgid "Bookmarks"
msgstr "Favorits"
@@ -7479,16 +7680,16 @@ msgid "Create bookmark"
msgstr "Crear un favorit"
msgid "Add a bookmark for the currently selected download area"
-msgstr "Afegeix un marcador per la zona descarregada"
+msgstr "Afig un marcador per la zona descarregada"
msgid ""
"Currently, there is no download area selected. Please select an area first."
msgstr ""
-"No hi ha cap zona seleccionada a l''àrea descarregada. Si us plau, "
+"No hi ha cap zona seleccionada a l''àrea descarregada. Per favor, "
"seleccioneu-ne una."
msgid "Please enter a name for the bookmarked download area."
-msgstr "Si us plau, indiqueu un nom pel marcador de la zona descarregada."
+msgstr "Per favor, indiqueu un nom pel marcador de la zona descarregada."
msgid "Name of location"
msgstr "Nom de la ubicació"
@@ -7518,7 +7719,7 @@ msgid ""
"URL from www.openstreetmap.org (you can paste an URL here to download the "
"area)"
msgstr ""
-"URL de www.openstreetmap.org (aqui podeu enganxar l''adreça de la zona a "
+"URL de www.openstreetmap.org (aqui podeu apegar l''adreça de la zona a "
"descarregar)"
msgid "Bounding Box"
@@ -7533,9 +7734,6 @@ msgstr "La latitud ha d''estar compresa entre -90 i 90 graus."
msgid "Value for longitude in range [-180,180] required."
msgstr "La laongitud ha d''estar compresa entre -180 i 180 graus."
-msgid "Paste URL from clipboard"
-msgstr "Copiar l''adreça del portaretalls"
-
msgid "Data Sources and Types:"
msgstr "Tipus i fonts de dades:"
@@ -7562,13 +7760,13 @@ msgstr ""
"per descarregar-les a la capa activa.</html>"
msgid "Open this dialog on startup"
-msgstr "Obre aquesta finestra a l''inici"
+msgstr "Obri esta finestra a l''inici"
msgid ""
"<html>Autostart ''Download from OSM'' dialog every time JOSM is "
"started.<br>You can open it manually from File menu or toolbar.</html>"
msgstr ""
-"Obre automàticament la finestra ''Descarrega d''OSM'' cada vegada que JOSM "
+"Obri automàticament la finestra ''Descarrega d''OSM'' cada vegada que JOSM "
"s''inicia.<br>El podeu obrir manualment utilitzant el menú Fitxer o la barra "
"d''eines.</html>"
@@ -7589,7 +7787,7 @@ msgstr ""
msgid "Download area ok, size probably acceptable to server"
msgstr ""
-"L''àrea de descàrrega és correcta, la seva mida sembla aceptable per al "
+"L''àrea de descàrrega és correcta, la seua mida pareix aceptable per al "
"servidor"
msgid "Click to close the dialog and to abort downloading"
@@ -7607,8 +7805,8 @@ msgid ""
"both.</html>"
msgstr ""
"<html>No heu seleccionat ni <strong>{0}</strong> ni "
-"<strong>{1}</strong>.<br>Si us plau escolliu entre descarregar dades OSM, "
-"GPX o ambdues.</html>"
+"<strong>{1}</strong>.<br>Per favor escolliu entre descarregar dades OSM, GPX "
+" o ambdues.</html>"
msgid "Download referrers (parent relations)"
msgstr "Baixa les referències (relacions de parentiu)"
@@ -7616,21 +7814,8 @@ msgstr "Baixa les referències (relacions de parentiu)"
msgid "Download object"
msgstr "Baixa l''objecte"
-msgid "Object type:"
-msgstr "Tipus d''objecte:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "barrejat"
-
-msgid "Choose the OSM object type"
-msgstr "Seleccioneu el tipus d''objecte OSM"
-
-msgid "Object ID:"
-msgstr "ID d''objecte"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Indiqueu l''ID de l''objecte a baixar"
+msgid "Start downloading"
+msgstr "Inicia la baixada"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7643,28 +7828,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Indiqueu si els membres de la relació també han de ser descarregats"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Els ID dels objectes poden ser separats per comes o per espais.<br/> "
-"Exemples: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En mode mixt, "
-"especifiqueu els objectes d''aquesta manera: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Baixa lesrelacions (relacions de parentiu i vies)"
-msgid "Start downloading"
-msgstr "Inicia la baixada"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"L''ID especificat no és vàlid\n"
-"L''objecte no pot ser descarregat."
-
msgid "Class Type"
msgstr "Classe"
@@ -7726,9 +7892,9 @@ msgstr ""
"<html><p class=\"warning-header\">Manca informació d''ajuda pel tema</p><p "
"class=\"warning-body\">Encara no hi ha contigut disponible pel tema "
"<strong>{0}</strong>. Manca tant a la vostra llengua ({1}) com en "
-"anglès.<br><br>Si us plau, ajudeu a millorar el sistema d''ajuda de JOSM "
+"anglés.<br><br>Per favor, ajudeu a millorar el sistema d''ajuda de JOSM "
"afegint la informació que manca. Podeu editar el <a href=\"{2}\">tema en la "
-"vostra llengua ({1})</a> i/o en <a href=\"{3}\">anglès</a>.</p></html>"
+"vostra llengua ({1})</a> i/o en <a href=\"{3}\">anglés</a>.</p></html>"
msgid ""
"<html><p class=\"error-header\">Error when retrieving help information</p><p "
@@ -7746,14 +7912,14 @@ msgid ""
"network problem, please check<br>your internet connection</html>"
msgstr ""
"<html>Ha fallat l''obertura de la pàgina d''ajuda a la url {0}.<br>Això "
-"acostuma a ser degut a un problema amb la xarxa, si us plau, comproveu<br>la "
+"acostuma a ser degut a un problema amb la xarxa, per favor, comproveu<br>la "
"vostra connexió a Internet</html>"
msgid "Failed to open URL"
msgstr "Ha fallat l''obertura de la URL"
msgid "Open the current help page in an external browser"
-msgstr "Obre la pàgina d''ajuda a un navegador web extern"
+msgstr "Obri la pàgina d''ajuda a un navegador web extern"
msgid "Edit the current help page"
msgstr "Modifica la pàgina d''ajuda actual"
@@ -7777,9 +7943,8 @@ msgstr "Vés a la pàgina següent"
msgid "Go to the JOSM help home page"
msgstr "Va a la pàgina incial d''ajuda de JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
-"Avís: localització incorrecta al document HTML. La excepció ha estat: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Posició incorrecta al document HTML. L''excepció ha estat: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "No s''ha pogut obrir la pàgina d''ajuda. La URL és buida."
@@ -7862,7 +8027,7 @@ msgid "Zoom to this node in the current data layer"
msgstr "Ampliar la zona del node a la capa actual"
msgid "Open a history browser with the history of this node"
-msgstr "Obre l''historial d''aquest node a un navegador web"
+msgstr "Obri l''historial d''este node a un navegador web"
msgid "Way {0}"
msgstr "Via {0}"
@@ -7890,6 +8055,9 @@ msgstr ""
"<html>La versió <strong>{0}</strong> ha estat creada a "
"<strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informació del conjunt de canvis"
@@ -7974,7 +8142,7 @@ msgid ""
"again with a new or an existing open changeset.</html>"
msgstr ""
"<html>La pujada <strong>ha fallat</strong> perquè heu estat utilitzant "
-"un<br>conjunt de dades {0} que ja fou tancat el {1}.<br>Si us plau pujeu les "
+"un<br>conjunt de dades {0} que ja fou tancat el {1}.<br>Per favor pujeu les "
"dades amb un nou conjunt de dades o amb un d''obert.</html>"
msgid "Changeset closed"
@@ -8000,10 +8168,8 @@ msgstr ""
msgid "Object still in use"
msgstr "L''objecte ja és en ús"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Avís: la capálera d''error ''{0}'' no es correspon amb cap dels patrons "
-"esperats"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "La capçalera d''error \"{0}\" no es correspon amb el patró esperat."
msgid "Upload"
msgstr "Puja"
@@ -8014,16 +8180,22 @@ msgid ""
"server.<br/>Check \"Save\" to save the layer to the file specified on the "
"left.</html>"
msgstr ""
-"<html>Seleccioneu les accions a fer per aquesta capa si feu clic sobre el "
-"botó situat més a l''esquerra.<br/>Marqueu \"Pujar\" per pujar els canvis al "
-"servidor OSM<br/>Marqueu \"Desar\" per desar la capa al fitxer especificat a "
-"l''esquerra.</html>"
+"<html>Seleccioneu les accions a fer per esta capa si feu clic sobre el botó "
+"situat més a l''esquerra.<br/>Marqueu \"Pujar\" per pujar els canvis al "
+"servidor OSM<br/>Marqueu \"Guardar\" per guardar la capa al fitxer "
+"especificat a l''esquerra.</html>"
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Afegiu un comentari descrivint els canvis que esteu pujant:"
msgid "Enter an upload comment"
-msgstr "Afegeix un comentari"
+msgstr "Afig un comentari"
+
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
msgid "Changeset id:"
msgstr "ID del conjunt de canvis:"
@@ -8041,7 +8213,7 @@ msgid ""
"Please decide what changeset the data is uploaded to and whether to close "
"the changeset after the next upload."
msgstr ""
-"Si us plau, decidiu quin conjunt de canvis serà pujats i si el voleu tancar "
+"Per favor, decidiu quin conjunt de canvis serà pujats i si el voleu tancar "
"un cop pujat."
msgid "Upload to a new changeset"
@@ -8049,7 +8221,7 @@ msgstr "Pujar vers un nou conjunt de canvis"
msgid "Open a new changeset and use it in the next upload"
msgstr ""
-"Obre un nou conjunt de cavis i utilitzar-lo a la propera pujada de dades"
+"Obri un nou conjunt de cavis i utilitzar-lo a la propera pujada de dades"
msgid "Upload to an existing changeset"
msgstr "Pujar vers un conjunt de canvis existent:"
@@ -8074,10 +8246,10 @@ msgstr "Tancar el conjunt de canvis seleccionat"
msgid "<html>Please select the changesets you want to close</html>"
msgstr ""
-"<html>Si us plau, seleccioneu el conjunt de canvis que voleu tancar</html>"
+"<html>Per favor, seleccioneu el conjunt de canvis que voleu tancar</html>"
msgid "Open changesets"
-msgstr "Obre conjunts de canvis"
+msgstr "Obri conjunts de canvis"
msgid "Close changesets"
msgstr "Tancar conjunts de canvis"
@@ -8095,11 +8267,10 @@ msgid "Closing changeset {0}"
msgstr "Tancant el conjunt de canvis {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Avís: ha fallat l''intent de posicionar la finestra de Credencials en primer "
-"pla. Ha estat interceptada una excepció de seguretat."
+"Ha fallat la configuració per a posar sempre en primer pla la finestra de "
+"les credencials. S''ha detectat una excepció de seguretat."
msgid "Enter credentials for OSM API"
msgstr "Indiqueu unes credencials per a l''API OSM"
@@ -8111,41 +8282,41 @@ msgid "Enter credentials for HTTP proxy"
msgstr "Indiqueu unes credencials pel proxi HTTP"
msgid "Please enter the user name of your OSM account"
-msgstr "Si us plau, indiqueu el vostre nom d''usuari OSM"
+msgstr "Per favor, indiqueu el vostre nom d''usuari OSM"
msgid "Please enter the password of your OSM account"
-msgstr "Si us plau, indiqueu la vostra contrasenya"
+msgstr "Per favor, indiqueu la vostra contrasenya"
msgid ""
"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
"and a valid password."
msgstr ""
-"Ha fallat l''autenticació a l''API OSM ''{0}''. Si us plau, indiqueu un nom "
+"Ha fallat l''autenticació a l''API OSM ''{0}''. Per favor, indiqueu un nom "
"d''usuari i una contrasenya vàlids."
msgid "Warning: The password is transferred unencrypted."
msgstr "Avís: La contrasenya és enviada sense encriptar."
msgid "Please enter the user name of your account"
-msgstr "Si us plau indiqueu el vostre nom d''usuari"
+msgstr "Per favor indiqueu el vostre nom d''usuari"
msgid "Please enter the password of your account"
-msgstr "Si us plau indiqueu la vostra contrasenya"
+msgstr "Per favor indiqueu la vostra contrasenya"
msgid ""
"Authenticating at the host ''{0}'' failed. Please enter a valid username and "
"a valid password."
msgstr ""
-"Ha fallat l''autenticació al servidor ''{0}''. Si us plau, indiqueu un nom "
+"Ha fallat l''autenticació al servidor ''{0}''. Per favor, indiqueu un nom "
"d''usuari i una contrasenya vàlids."
msgid "Please enter the user name for authenticating at your proxy server"
msgstr ""
-"Si us plau, indiqueu un nom d''usuari per autenticar-vos al servidor proxi"
+"Per favor, indiqueu un nom d''usuari per autenticar-vos al servidor proxi"
msgid "Please enter the password for authenticating at your proxy server"
msgstr ""
-"Si us plau, indiqueu la contrasenya per autieticar-vos al servidor proxi"
+"Per favor, indiqueu la contrasenya per autieticar-vos al servidor proxi"
msgid ""
"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
@@ -8158,7 +8329,7 @@ msgid ""
"Warning: depending on the authentication method the proxy server uses the "
"password may be transferred unencrypted."
msgstr ""
-"Avís: en funció del mètode d''autenticació que utilitzi el servidor proxi "
+"Avís: en funció del mètode d''autenticació que utilitze el servidor proxi "
"lacontrasenya pot ser enviada sense encriptar."
msgid "Authenticate"
@@ -8183,11 +8354,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Desempaquetant {0} en {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Avís: No és possible de descarregar el fitxer ''{0}''. El seu enllaç de "
-"descàrrega ''{1}'' no és una URL vàlida. Ignorant la descàrrega."
+"El fitxer ''{0}'' no pot ser descarregat. El seu enllaç de descàrrega "
+"''{1}'' no és una URL vàlida. Omentent la descàrrega."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8195,7 +8366,7 @@ msgid ""
"not entitled<br>to know the identity of the user on whose behalf you are "
"working."
msgstr ""
-"No podeu obtenir la llista dels conjunts de canvis oberts perquè<br>JOSM no "
+"No podeu obtindre la llista dels conjunts de canvis oberts perquè<br>JOSM no "
"coneix la vostra identitat.<br>Heu escollit de treballar de manera anònima o "
"bé no teniu autorització<br> per a conèixer la identitat de l''usuari."
@@ -8203,10 +8374,9 @@ msgid "Missing user identity"
msgstr "Manca la identitat de l''usuari"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Avís: Ha fallat l''obtenció d''informació de l''usuari. L''excepció ha "
+"Ha fallat l''obtenció d''informació de l''usuari de JOSM. L''excepció ha "
"estat: {0}"
msgid "Download objects"
@@ -8216,7 +8386,7 @@ msgid "Initializing nodes to download ..."
msgstr "Inicialitzant nodes a descarregar ..."
msgid "Launch a file chooser to select a file"
-msgstr "Obre un selector per a escollir un fitxer"
+msgstr "Obri un selector per a escollir un fitxer"
msgid "Select filename"
msgstr "Seleccionar nom de fitxer"
@@ -8232,20 +8402,20 @@ msgid "The bold text is the name of the layer."
msgstr "El text en negreta és el nom de la capa."
msgid "Click here to choose save path"
-msgstr "Fes clic aquí per escollir la ruta d''enregistrament"
+msgstr "Fes clic ací per escollir la ruta d''enregistrament"
msgid "Layer ''{0}'' is not backed by a file"
msgstr "La capa ''{0}'' no està associada a cap còpia de seguretat"
msgid "File ''{0}'' is not writable. Please enter another file name."
msgstr ""
-"El fitxer ''{0}'' no pot ser escrit. Si us plau indiqueu un altre fitxer."
+"El fitxer ''{0}'' no pot ser escrit. Per favor indiqueu un altre fitxer."
msgid "Click cell to change the file path."
msgstr "Fes clic sobre la cel·la per modificar la ruta d''enregistrament"
msgid "Open Recent"
-msgstr "Obre recents"
+msgstr "Obri recents"
msgid "List of recently opened files"
msgstr "Llista dels fitxers recentment oberts"
@@ -8325,17 +8495,17 @@ msgstr[1] ""
"els canvis.<br>Capes amb un fitxer que no pot ser escrit:</html>"
msgid "Unsaved data non-writable files"
-msgstr "Hi ha dades no desades i els fitxers no poden ser escrits"
+msgstr "Hi ha dades no guardades i els fitxers no poden ser escrits"
msgid "Close this dialog and resume editing in JOSM"
msgstr "Tancar la finestra i reprendre les modificacions"
msgid "Exit now!"
-msgstr "Sortir ara!"
+msgstr "Eixir ara!"
msgid "Exit JOSM without saving. Unsaved changes are lost."
msgstr ""
-"Sortir de JOSM sense enregistrar. Els canvis pendents d''enregistrar es "
+"Eixir de JOSM sense enregistrar. Els canvis pendents d''enregistrar es "
"perdran."
msgid "Delete now!"
@@ -8347,7 +8517,7 @@ msgstr ""
"perdran."
msgid "Perform actions before exiting"
-msgstr "Fer accions abans de sortir"
+msgstr "Fer accions abans d'eixir"
msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
@@ -8459,13 +8629,7 @@ msgid "Upload the changed primitives"
msgstr "Pujar les primitives canviades"
msgid "Please revise upload comment"
-msgstr "Si us plau, reviseu el comentari de la pujada"
-
-msgid "Revise"
-msgstr "Revisar"
-
-msgid "Continue as is"
-msgstr "Continuar com està"
+msgstr "Per favor, reviseu el comentari de la pujada"
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -8475,10 +8639,26 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
"El comentari és <i>en blanc</i> o <i>massa curt</i>.<br /><br />Això és "
-"permés, però considereu si us plau que d''altres usuaris que mirin els "
-"canvis<br />d''aquesta zona necessitarien un comentari apropiat per tal "
+"permés, però considereu per favor que d''altres usuaris que mirin els "
+"canvis<br />d''esta zona necessitarien un comentari apropiat per tal "
"d''entendre<br />que heu fet!<br /><br />Si dediqueu uns instats a explicar "
-"la vostra modificació, facilitareu la feina<br />de molts d''atres usuaris."
+"la vostra modificació, facilitareu la faena<br />de molts d''atres usuaris."
+
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Revisar"
+
+msgid "Continue as is"
+msgstr "Continuar com està"
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -8488,14 +8668,33 @@ msgid "Cancel and return to the previous dialog"
msgstr "Anul·lar i tornar a la finestra anterior"
msgid "Do not show this message again"
-msgstr "No tornar a mostrar aquest missatge"
+msgstr "No tornar a mostrar este missatge"
msgid "Please enter a valid chunk size first"
-msgstr "Si us plau entreu primer una mida de fragment vàlida"
+msgstr "Per favor entreu primer una mida de fragment vàlida"
msgid "Illegal chunk size"
msgstr "La mida de fragment és errònia"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>L''etiqueta del següent conjunt de canvis conté una clau/valor "
+"buit:<br>{0}<br>Continuar?</html>"
+msgstr[1] ""
+"<html>Les etiquetes del següent conjunt de canvis conté una "
+"clau/valor:<br>{0}<br>Continuar?</html>"
+
+msgid "Empty metadata"
+msgstr "Metadades buides"
+
msgid "Cancel the upload and resume editing"
msgstr "Anul·lar la pujada i reprendre les modificacions"
@@ -8503,11 +8702,11 @@ msgid "Tags of changeset {0}"
msgstr "Etiquetes del conjunt de canvis {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Avís: l''objecte ''{0}'' ja ha estat suprimit al servidor. Ignorant aquest "
-"objecte i intentant continuar la pujada."
+"L''objecte ''{0}\" ja ha estat suprimit al servidor. Omentent l''objecte i "
+"reintentant la pujada."
msgid "Preparing objects to upload ..."
msgstr "Preparant els objectes a pujar ..."
@@ -8525,11 +8724,11 @@ msgstr ""
msgid ""
"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr "El conjunt de canvis serà <strong>tancat</strong> quan sigui pujat"
+msgstr "El conjunt de canvis serà <strong>tancat</strong> quan siga pujat"
msgid "The changeset is <strong>left open</strong> after this upload"
msgstr ""
-"El conjunt de canvis serà <strong>obert a l''esquerra</strong> quan sigui "
+"El conjunt de canvis serà <strong>obert a l''esquerra</strong> quan siga "
"pujat"
msgid "configure changeset"
@@ -8573,7 +8772,7 @@ msgid ""
"proceed with <strong>multiple changesets</strong>"
msgstr ""
"{0} objectes excedeixen el màxim permés ({1}) a un conjunt de canvis al "
-"servidor ''{2}''. Si us plau, <a href=\"urn:advanced-"
+"servidor ''{2}''. Per favor, <a href=\"urn:advanced-"
"configuration\">configureu</a> com procedir amb <strong>múltiples conjunts "
"de canvis</strong>"
@@ -8647,9 +8846,6 @@ msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
"L''objecte ''{0}'' ha estat suprimit. Ignorant l''objecte a la pujada"
-msgid "Warning: {0}"
-msgstr "Avís: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Pujant {0} objecte ..."
@@ -8660,6 +8856,9 @@ msgid ""
msgstr ""
"Ignorant l''excepció perquè la pujada ha estat anul·lada. L''excepció és: {0}"
+msgid "Upload successful!"
+msgstr "Pujada reeixida!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8680,13 +8879,13 @@ msgstr "Seleccionar objectes a pujar"
msgid "Cancel uploading"
msgstr "Cancel·lar la pujada"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Avís: valor inesperat per la clau ''{0}'' a les preferències, valor obtingut "
+"Valor inesperat per a la clau ''{0}'' de les preferències, s''ha obtingut "
"''{1}''"
msgid "Please select the upload strategy:"
-msgstr "Si us plau, seleccioneu una estratègia de pujada:"
+msgstr "Per favor, seleccioneu una estratègia de pujada:"
msgid "Upload data in one request"
msgstr "Pujar les dades en una petició"
@@ -8708,7 +8907,7 @@ msgid "Fill up one changeset and return to the Upload Dialog"
msgstr "Omplir un conjunt de canvis i tronar a la finestra de pujades"
msgid "Open and use as many new changesets as necessary"
-msgstr "Obre tants conjunts de canvis com sigui necessari"
+msgstr "Obri tants conjunts de canvis com siga necessari"
msgid "Upload in one request not possible (too many objects to upload)"
msgstr "La pujada en una petició no és possible (hhi ha massa objectes)"
@@ -8733,7 +8932,7 @@ msgstr[1] "({0} peticions)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
msgstr ""
-"Mida de fragment incorrecta (<= 0). Si us plau, entreu un nombre enter > 1"
+"Mida de fragment incorrecta (<= 0). Per favor, entreu un nombre enter > 1"
msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
msgstr ""
@@ -8741,11 +8940,11 @@ msgstr ""
"servidor ''{2}''"
msgid "Please enter an integer > 1"
-msgstr "Si us plau indiqueu un nombre enter més gran que 1"
+msgstr "Per favor indiqueu un nombre enter més gran que 1"
msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
msgstr ""
-"El valor ''{0}'' no és un nombre. Si us plau, indiqueu un nombre enter més "
+"El valor ''{0}'' no és un nombre. Per favor, indiqueu un nombre enter més "
"gran que 1"
msgid "Objects to add:"
@@ -8823,7 +9022,7 @@ msgstr[0] "{0} track, "
msgstr[1] "{0} tracks, "
msgid "Save GPX file"
-msgstr "Desa-ho en format GPX"
+msgstr "Guarda-ho en format GPX"
msgid "Imagery fade"
msgstr "Degradació de la imatgeria"
@@ -8837,7 +9036,7 @@ msgstr "Marcador següent"
msgid "Jump to next marker"
msgstr "Saltar al següent marcador"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Marcador anterior"
msgid "Jump to previous marker"
@@ -8856,7 +9055,7 @@ msgstr ""
"Canvieu la projecció o suprimiu la capa."
msgid "Save Layer"
-msgstr "Desa la capa"
+msgstr "Guarda la capa"
msgid "Data Layer {0}"
msgstr "Capa de dades {0}"
@@ -8870,10 +9069,10 @@ msgstr "versió {0}"
msgid "Merging layers"
msgstr "Combinant capes"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
-"Avís: barrejar dades de les versions 0.6 i 0.5 farà que les dades resultants "
-"siguin de la versió 0.5"
+"La barreja de dades amb versions 0.5 i 0.6 donarà com a resultat dades de la "
+"versió 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8905,13 +9104,13 @@ msgid "No problems found"
msgstr "No s''ha trobat cap problema"
msgid "Following problems found:"
-msgstr "S''han trobat aquests problemes:"
+msgstr "S''han trobat estos problemes:"
msgid "Empty document"
msgstr "Document buit"
msgid "Save anyway"
-msgstr "Desa''l igualment"
+msgstr "Guarda''l igualment"
msgid "The document contains no data."
msgstr "El document no conté dades."
@@ -8920,7 +9119,7 @@ msgid "Conflicts"
msgstr "Conflictes"
msgid "Reject Conflicts and Save"
-msgstr "Refusa conflictes i desa"
+msgstr "Refusa conflictes i guarda"
msgid ""
"There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -8930,13 +9129,13 @@ msgstr ""
"tractats com a refusats. Voleu continuar?"
msgid "Save OSM file"
-msgstr "Desa el fitxer OSM"
+msgstr "Guarda el fitxer OSM"
msgid ""
"{0} is not a valid TMS argument. Please check this server URL:\n"
"{1}"
msgstr ""
-"{0} no és un argument TMS vàlid. Si us plau verifiqueu aquesta URL:\n"
+"{0} no és un argument TMS vàlid. Per favor verifiqueu esta URL:\n"
"{1}"
msgid ""
@@ -8991,7 +9190,11 @@ msgid "increase zoom level to see more detail"
msgstr "incrementa el nivell d''ampliació per veure més detalls"
msgid "No tiles at this zoom level"
-msgstr "No hi ha tessel·les en aquest nivell d''ampliació"
+msgstr "No hi ha tessel·les en este nivell d''ampliació"
+
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+"La capa TMS ({0}) està sent descarregada amb un nivell d''ampliació {1}"
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG: les projeccions 4326 i Mercator són suportades"
@@ -9022,7 +9225,7 @@ msgstr "Descarrega les tessel·les visibles"
msgid ""
"The requested area is too big. Please zoom in a little, or change resolution"
msgstr ""
-"La zona demanada és massa gran. Si us plau feu-la una mica més petita o "
+"La zona demanada és massa gran. Per favor feu-la una mica més petita o "
"canvieu la resolució"
msgid "Change resolution"
@@ -9034,6 +9237,9 @@ msgstr "Recarrega les tessel·les amb error"
msgid "Alpha channel"
msgstr "Canal alfa"
+msgid "Automatically change resolution"
+msgstr "Canvia la resolució automàticament"
+
msgid "Set WMS Bookmark"
msgstr "Establir un favorit WMS"
@@ -9073,7 +9279,7 @@ msgid ""
"read on the photo and select a timezone<hr></html>"
msgstr ""
"<html>Preneu una fotografia del vostre receptor GPS mostrant "
-"l''hora.<br>Mostreu la fotografia aquí.<br>LLavors captureu l''hora que "
+"l''hora.<br>Mostreu la fotografia ací.<br>LLavors captureu l''hora que "
"mostra la fotografia i seleccioneu una zona horària<hr></html>"
msgid "Photo time (from exif):"
@@ -9092,7 +9298,7 @@ msgid "No date"
msgstr "Sense data"
msgid "Open another photo"
-msgstr "Obre una altra fotografia"
+msgstr "Obri una altra fotografia"
msgid "Synchronize time from a photo of the GPS receiver"
msgstr "Sincronitzar l''hora amb una fotografia del receptor GPS"
@@ -9102,7 +9308,7 @@ msgid ""
"Please use the requested format"
msgstr ""
"Error en analitzar la data.\n"
-"Si us plau, utilitzeu el format demanat"
+"Per favor, utilitzeu el format demanat"
msgid "Invalid date"
msgstr "La data no és vàlida"
@@ -9114,7 +9320,7 @@ msgid "GPX track: "
msgstr "Recorregut en GPX: "
msgid "Open another GPX trace"
-msgstr "Obre un altre recorregut en GPX"
+msgstr "Obri un altre recorregut en GPX"
msgid ""
"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -9217,7 +9423,7 @@ msgid ""
"The selected GPX track does not contain timestamps. Please select another "
"one."
msgstr ""
-"El track GPX que heu seleccionat no conté informació de data i hora. Si us "
+"El track GPX que heu seleccionat no conté informació de data i hora. Si vos "
"plau, seleccionaeu un altre."
msgid "GPX Track has no time information"
@@ -9249,9 +9455,6 @@ msgstr "Extreïent localitzacions GPS a partir de la informació EXIF"
msgid "Starting directory scan"
msgstr "Iniciant l''exploració del directori"
-msgid "One of the selected files was null"
-msgstr "Un dels fitxers seleccionats era nul"
-
msgid "Read photos..."
msgstr "Llegir fotos..."
@@ -9259,7 +9462,7 @@ msgid "Reading {0}..."
msgstr "Llegint {0}..."
msgid "Unable to get canonical path for directory {0}\n"
-msgstr "No és possible obtenir la ruta canònica del directori {0}\n"
+msgstr "No és possible obtindre la ruta canònica del directori {0}\n"
msgid "Scanning directory {0}"
msgstr "Explorant el directori {0}"
@@ -9270,6 +9473,9 @@ msgstr "Trobat un fitxer buit al directori {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Error en recuperar fitxers del directori {0}\n"
+msgid "One of the selected files was null"
+msgstr "Un dels fitxers seleccionats era nul"
+
msgid "Geotagged Images"
msgstr "Imatges geolocalitzades"
@@ -9329,6 +9535,12 @@ msgstr "Següent"
msgid "Show next Image"
msgstr "Mostrar la imatge següent"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centrar la vista"
@@ -9380,7 +9592,7 @@ msgid "Choose visible tracks"
msgstr "Escollir tracks visibles"
msgid "Select by date"
-msgstr ""
+msgstr "Selecciona per data"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -9390,7 +9602,7 @@ msgstr ""
"<html>Seleccioneu tots els tracks que voleu visualitzar. Podeu seleccionar "
"un grup de tracks arrossegant-los amb el ratolí o prement CTRL+Clic per "
"seleccionar-ne alguns d''específics. El mapa s''actualitzarà en temps real "
-"en segon pla. Podeu obrir un track fent doble clic sobre la seva adreça "
+"en segon pla. Podeu obrir un track fent doble clic sobre la seua adreça "
"URL.</html>"
msgid "Set track visibility for {0}"
@@ -9410,28 +9622,28 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
"<html>La pujada de dades GPS sense processar sobre el mapa es considera "
-"nociva<br>Si voleu pujar tracks mireu aquí:</html>"
-
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
+"nociva<br>Si voleu pujar tracks mireu ací:</html>"
msgid "Customize track drawing"
msgstr "Personalitzar el dibuix dels tracks"
msgid "From"
-msgstr ""
+msgstr "Des de"
msgid "To"
-msgstr ""
+msgstr "A"
msgid "No timestamp"
msgstr "Sense data i hora"
-msgid "Download from OSM along this track"
-msgstr "Descarregar d''OSM al llarg d''aquest track"
+msgid "Select to download OSM data."
+msgstr "Seleccioneu per a descarregar les dades OSM."
+
+msgid "Select to download GPS traces."
+msgstr "Seleccioneu per a descarregar les dades GPS."
msgid "Download everything within:"
-msgstr "Descarregar tot el que hi hagi en:"
+msgstr "Descarregar tot el que hi haja en:"
msgid "{0} meters"
msgstr "{0} metres"
@@ -9454,16 +9666,18 @@ msgstr "només fites"
msgid "track and waypoints"
msgstr "el track i les fites"
+msgid "Click to download"
+msgstr "Feu clic per a descarregar"
+
+msgid "Click to cancel"
+msgstr "Feu clic per a anul·lar"
+
+msgid "Download from OSM along this track"
+msgstr "Descarregar d''OSM al llarg d''este track"
+
msgid "Calculating Download Area"
msgstr "Calculant l''àrea a descarregar"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Aquesta acció requerirà {0} peticions <br>de descàrrega. Voleu "
-"<br>continuar?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Precarrega en memòria tessel·les d''imatgeria al llarg del track"
@@ -9471,7 +9685,7 @@ msgid "Precaching WMS"
msgstr "Precarregant WMS"
msgid "Please select the imagery layer."
-msgstr "Si us plau, seleccioneu un capa d''imatgeria"
+msgstr "Per favor, seleccioneu un capa d''imatgeria"
msgid "Select imagery layer"
msgstr "Seleccionar una capa d''imatgeria"
@@ -9517,7 +9731,7 @@ msgid ""
"Some waypoints which were too far from the track to sensibly estimate their "
"time were omitted."
msgstr ""
-"Alguns punts de fita massa allunyats del track per poder estimar la seva "
+"Alguns punts de fita massa allunyats del track per poder estimar la seua "
"data i hora han estat ignorats."
msgid "Import images"
@@ -9581,7 +9795,7 @@ msgid ""
"You need to have paused audio at the point on the track where you want the "
"marker."
msgstr ""
-"Cal que atureu l''àudio en el punt del track on voleu posar el marcador."
+"Cal que pareu l''àudio en el punt del track on voleu posar el marcador."
msgid ""
"You need to drag the play head near to the GPX track whose associated sound "
@@ -9602,22 +9816,18 @@ msgstr "No és possible de crear un nou marcador d''àudio"
msgid "There was an error while trying to display the URL for this marker"
msgstr ""
-"Ha hagut un error mentre s''intentava mostrar la URL d''aquest marcador"
+"Ha hagut un error mentre s''intentava mostrar la URL d''este marcador"
msgid "(URL was: "
msgstr "(La URL era: "
-msgid "Error displaying URL"
-msgstr "Error mostrant la URL"
-
msgid "Select the map painting styles"
msgstr "Seleccionar els estils per dibuixar el mapa"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Avía: ha fallat la càrrega dels etils de dibuix de mapes de ''{0}''. "
-"L''excepció ha estat: {1}"
+"Ha fallat la càrrega dels estils de Mappaint de ''{0}''. L''excepció ha "
+"estat: {1}"
msgid "loading style ''{0}''..."
msgstr "carregant l''estil ''{0}''..."
@@ -9629,16 +9839,16 @@ msgid_plural ""
"There were {0} errors when loading this style. Select ''Info'' from the "
"right click menu for details."
msgstr[0] ""
-"Ha hagut un error en carregar aquest estil. Seleccioneu ''Informació'' al "
-"menú que obtindreu amb el botó dret del ratolí per a més detalls."
+"Ha hagut un error en carregar este estil. Seleccioneu ''Informació'' al menú "
+"que obtindreu amb el botó dret del ratolí per a més detalls."
msgstr[1] ""
-"Ha hagut {0} errors en carregar aquest estil. Seleccioneu ''Informació'' al "
+"Ha hagut {0} errors en carregar este estil. Seleccioneu ''Informació'' al "
"menú que obtindreu amb el botó dret del ratolí per a més detalls."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Avís: ha fallat l''anàlisi dels models de dibuix de mapes a partir de "
-"''{0}''. L''error ha estat: {1}"
+"Ha fallat l''anàlisi dels estils de Mappaint de ''{0}''. L''excepció ha "
+"estat: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "L''estil de traçat no és válid, els valors han de ser positius"
@@ -9649,11 +9859,10 @@ msgstr ""
"gran que zero"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Avís: ha fallat l''anàlisi dels models de dibuix de mapes a partir de "
-"''{0}''. Error: [{1}:{2}] {3}"
+"Ha fallat l''anàlisi dels estils de Mappaint desde ''{0}''. L''excepció ha "
+"estat: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Clau del testimoni d''autenticació:"
@@ -9662,15 +9871,15 @@ msgid "Access Token Secret:"
msgstr "Secret del testimoni d''autenticació:"
msgid "Save Access Token in preferences"
-msgstr "Desa el testimoni d''autenticació a les preferències"
+msgstr "Guarda el testimoni d''autenticació a les preferències"
msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
-"<html>Seleccioneu per desar el testimoni d''autenticació a les preferències "
-"de JOSM.<br>Desseleccioneu per utilitzar el testimoni d''autenticació només "
-"en aquesta sessió.</html>"
+"<html>Seleccioneu per guardar el testimoni d''autenticació a les "
+"preferències de JOSM.<br>Desseleccioneu per utilitzar el testimoni "
+"d''autenticació només en esta sessió.</html>"
msgid "Use default settings"
msgstr "Utilitza els paràmetres per defecte"
@@ -9726,7 +9935,7 @@ msgid ""
"fully<br>automatically authorizes the user and retrieves an Access "
"Token.</html>"
msgstr ""
-"<html>Segueix un procediment automàtic per obtenir un testimoni "
+"<html>Segueix un procediment automàtic per obtindre un testimoni "
"d''autenticació del lloc web d''OSM.<br>JOSM accedeix al lloc web com "
"l''usuari i de manera totalment <br>automàtica autoritza l''usuari i obté un "
"testimoni d''autenticació.</html>"
@@ -9738,7 +9947,7 @@ msgid ""
"external browser<br>to authenticate itself and to accept the request token "
"submitted by JOSM.</html>"
msgstr ""
-"<html>Segueix un procediment semiautomàtic per obtenir un testimoni "
+"<html>Segueix un procediment semiautomàtic per obtindre un testimoni "
"d''autenticació del lloc web d''OSM.<br>JOSM enviarà la petició OAuth "
"estandard per demanar un testimoni i un<br>testimoni d''autenticació. "
"Enviarà l''usuari al lloc web d''OSM a través d''un navegador "
@@ -9758,7 +9967,7 @@ msgid ""
"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
"data upload requests don''t use your password any more."
msgstr ""
-"Sis us plau, introduïu el vostre nom d''usuari i contrasenya d''OSM. La "
+"Sis vos plau, introduïu el vostre nom d''usuari i contrasenya d''OSM. La "
"contrasenya <strong>no</strong> serà enregistrada sense codificar a les "
"preferències de JOSM i serà enviada al servidor OSM <strong>un únic "
"cop</strong>. Les dades que pugeu a partir de llavors no utilitzaran el "
@@ -9793,7 +10002,7 @@ msgid ""
msgstr ""
"<html>Heu obtingut un testimoni d''autenticació OAuth del lloc web d''OSM "
"Feu clic sobre <strong>{0}</strong> per acceptar el testimoni. JOSM "
-"l''utilitzarà a les peticions següents per obtenir l''accés a l''API "
+"l''utilitzarà a les peticions següents per obtindre l''accés a l''API "
"OSM.</html>"
msgid "Authorize now"
@@ -9805,7 +10014,7 @@ msgstr ""
"web de JOSM"
msgid "Back"
-msgstr "Endarrere"
+msgstr "Arrere"
msgid "Run the automatic authorization steps again"
msgstr "Tornar a executar la seqüència d''autorització"
@@ -9814,19 +10023,19 @@ msgid "Test Access Token"
msgstr "Provar el testimoni d''autenticació"
msgid "Please enter your OSM user name"
-msgstr "Si us plau, introduïu el vostre nom d''usuari OSM"
+msgstr "Per favor, introduïu el vostre nom d''usuari OSM"
msgid "The user name cannot be empty. Please enter your OSM user name"
msgstr ""
-"El nom d''usuari no pot estar buit. Si us plau, introduïu el vostre nom "
+"El nom d''usuari no pot estar buit. Per favor, introduïu el vostre nom "
"d''usuari OSM"
msgid "Please enter your OSM password"
-msgstr "Si us plau, introduïu la vostra contrasenya OSM"
+msgstr "Per favor, introduïu la vostra contrasenya OSM"
msgid "The password cannot be empty. Please enter your OSM password"
msgstr ""
-"La contrasenya no pot estar buida. Si us plau, introduïu la vostra "
+"La contrasenya no pot estar buida. Per favor, introduïu la vostra "
"contrasenya OSM"
msgid "Authorize JOSM to access the OSM API"
@@ -9837,9 +10046,9 @@ msgid ""
"OSM server failed.<br><br>Please try again or choose another kind of "
"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
msgstr ""
-"<html>El procés automàtic per obtenir un testimoni d''autenticació "
-"OAuth<br>del servidor OSM ha fallat.<br><br>Si us plau, proveu un altre cop "
-"o escolliu un altre tipus de procés d''autorització,<br>un procés "
+"<html>El procés automàtic per obtindre un testimoni d''autenticació "
+"OAuth<br>del servidor OSM ha fallat.<br><br>Per favor, proveu un altre cop o "
+"escolliu un altre tipus de procés d''autorització,<br>un procés "
"semiautomàtic o manual, per exemple.</html>"
msgid "OAuth authorization failed"
@@ -9851,28 +10060,28 @@ msgid ""
"from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your "
"advanced setting and try again.</html>"
msgstr ""
-"<html>El procés automàtic per obtenir un testimoni d''autenticació OAuth<br> "
-"del servidor OSM ha fallat perquè JOSM no ha pogut construir<br> una URL de "
-"login vàlida a partir del punt final de la URL d''autoritzacions d''OAuth "
-"''{0}''.<br><br>Si us plau, comproveu la vostra configuració avançada i "
-"proveu un altre cop.</html>"
+"<html>El procés automàtic per obtindre un testimoni d''autenticació "
+"OAuth<br> del servidor OSM ha fallat perquè JOSM no ha pogut construir<br> "
+"una URL de login vàlida a partir del punt final de la URL d''autoritzacions "
+"d''OAuth ''{0}''.<br><br>Per favor, comproveu la vostra configuració "
+"avançada i proveu un altre cop.</html>"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
"OSM server failed. JOSM failed to log into {0}<br>for user "
"{1}.<br><br>Please check username and password and try again.</html>"
msgstr ""
-"<html>El procés automàtic per obtenir un testimoni d''autenticació OAuth<br> "
-"del servidor OSM ha fallat. JOSM no ha aconseguit la connexió a {0}<br>per "
-"l''usuari {1}.<br><br>Si us plau, comproveu el nom d''usuari i la "
+"<html>El procés automàtic per obtindre un testimoni d''autenticació "
+"OAuth<br> del servidor OSM ha fallat. JOSM no ha aconseguit la connexió a "
+"{0}<br>per l''usuari {1}.<br><br>Per favor, comproveu el nom d''usuari i la "
"contrasenya i proveu un altre cop.</html>"
msgid ""
"Please enter an OAuth Access Token which is authorized to access the OSM "
"server ''{0}''."
msgstr ""
-"Si us plau, entreu un testimoni d''autenticació OAuth que estigui autoritzat "
-"a accedir al servidor OSM ''{0}''."
+"Per favor, entreu un testimoni d''autenticació OAuth que estiga autoritzat a "
+"accedir al servidor OSM ''{0}''."
msgid "Access Token"
msgstr "Testimoni d''autenticació"
@@ -9890,27 +10099,27 @@ msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
-"<html><body>Si us plau, entreu un testimoni d''autenticació OAuth que "
-"estigui autoritzat a accedir al servidor OSM ''{0}''.</body></html>"
+"<html><body>Per favor, entreu un testimoni d''autenticació OAuth que estiga "
+"autoritzat a accedir al servidor OSM ''{0}''.</body></html>"
msgid "Please enter an Access Token Key"
-msgstr "Si us plau, entreu una clau del testimoni d''autenticació"
+msgstr "Per favor, entreu una clau del testimoni d''autenticació"
msgid ""
"The Access Token Key must not be empty. Please enter an Access Token Key"
msgstr ""
-"La clau del testimoni d''autenticació no pot estar buida. Si us plau, entreu "
+"La clau del testimoni d''autenticació no pot estar buida. Per favor, entreu "
"una clau pel testimoni d''autenticació"
msgid "Please enter an Access Token Secret"
-msgstr "Si us plau entreu un Secret pel testimoni d''autenticació"
+msgstr "Per favor entreu un Secret pel testimoni d''autenticació"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
"Secret"
msgstr ""
-"el Secret del testimoni d''autenticació no pot estar buit. Si us plau, "
-"entreu un secret pel testimoni d''autenticació"
+"el Secret del testimoni d''autenticació no pot estar buit. Per favor, entreu "
+"un secret pel testimoni d''autenticació"
msgid "Click to test the Access Token"
msgstr "Feu clic per fer un test del testimoni d''autenticació"
@@ -9923,7 +10132,7 @@ msgstr ""
"vostre nom (<a href=\"{0}\">més informació...</a>)."
msgid "Please select an authorization procedure: "
-msgstr "Si us plau, seleccioneu un procediment d''autorització: "
+msgstr "Per favor, seleccioneu un procediment d''autorització: "
msgid "Get an Access Token for ''{0}''"
msgstr "Obté un testimoni d''autenticació per ''{0}''"
@@ -9934,8 +10143,8 @@ msgstr "Tancar la finestra i anul·lar l''autorització"
msgid "Close the dialog and accept the Access Token"
msgstr "Tanca la finestra i accepta el testimoni d''autenticació"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Avís: ha fallat la cancel·lació de l''operació OAuth en funcionament"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Ha fallat l''anul·lació de l''operació OAuth en execució"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Obtenint una petició de testimoni Oauth de ''{0}''"
@@ -10005,6 +10214,12 @@ msgstr "Autoritzar l''escriptura de les vostres preferències"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Autoritzar a JOSM a escriure les vostres preferències"
+msgid "Allow modifications of notes"
+msgstr "Permet la modificació de notes"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Seleccioneu permetre que JOSM modifiqui les notes en nom vostre"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Obtenint testimoni d''autenticació OAuth..."
@@ -10034,15 +10249,15 @@ msgid ""
"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
"Token from ''{1}''.</html>"
msgstr ""
-"<html>Si us plau, feu clic sobre <strong>{0}</strong> per obtenir una "
+"<html>Per favor, feu clic sobre <strong>{0}</strong> per obtindre una "
"petició de testimoni OAuth de ''{1}''.</html>"
msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr "<html>Pas 1/3: obtenir una petició de testimoni OAuth</html>"
+msgstr "<html>Pas 1/3: obtindre una petició de testimoni OAuth</html>"
msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
msgstr ""
-"<html>Pas 2/3: Autoritzar i obtenir un testimoni d''autenticació</html>"
+"<html>Pas 2/3: Autoritzar i obtindre un testimoni d''autenticació</html>"
msgid "Request Access Token"
msgstr "Demana un testimoni d''autenticació"
@@ -10057,12 +10272,12 @@ msgid ""
"browser.</html>"
msgstr ""
"<html>JOSM ha aconseguit una petició de testimoni d''autenticació i ara està "
-"obrint una pàgina d''autorització a un navegador extern. Si us plau, "
+"obrint una pàgina d''autorització a un navegador extern. Per favor, "
"introduïu el vostre nom d''usuari i contrasenya OSM i seguiu les "
-"instruccions per autoritzar la petició de testimoni. Després retorneu a "
-"aquesta finestra i feu clic sobre <strong>{0}</strong><br><br>Si falla "
-"l''obertura del navegador extern podeu copiar la següent URL i enganxar-la "
-"al vostre navegador.</html>"
+"instruccions per autoritzar la petició de testimoni. Després retorneu a esta "
+"finestra i feu clic sobre <strong>{0}</strong><br><br>Si falla l''obertura "
+"del navegador extern podeu copiar la següent URL i apegar-la al vostre "
+"navegador.</html>"
msgid "Go back to step 1/3"
msgstr "Retorna al pas 1/3"
@@ -10080,17 +10295,14 @@ msgstr ""
"acceptar. JOSM l''utilitzarà a partir de llavors per autenticació i "
"autorització al servidor OSM.<br><br>El testimoni d''autenticació és: </html>"
-msgid "Restart"
-msgstr "Reinicia"
-
msgid "Click to retrieve a Request Token"
-msgstr "Feu clic per obtenir el testimoni demanat"
+msgstr "Feu clic per obtindre el testimoni demanat"
msgid "Retrieve Access Token"
msgstr "Obté un testimoni d''autenticació"
msgid "Click to retrieve an Access Token"
-msgstr "Feu clic per obtenir un testimoni d''autenticació"
+msgstr "Feu clic per obtindre un testimoni d''autenticació"
msgid "Testing OAuth Access Token"
msgstr "Provant el testimoni d''autenticació OAuth"
@@ -10126,7 +10338,7 @@ msgstr ""
"<html>Ha fallat l''accés al servidor OSM ''{0}''<br>amb el testimoni "
"d''autenticació ''{1}''.<br>El servidor ha refusat el testimoni en "
"considerar-lo com no autoritzat. No <br>podeu accedir a cap recurs protegit "
-"d''aquest servidor utilitzant aquest testimoni.</html>"
+"d''este servidor utilitzant este testimoni.</html>"
msgid "Test failed"
msgstr "El test ha fallat"
@@ -10140,7 +10352,7 @@ msgid ""
msgstr ""
"<html>El testimoni d''autenticació ''{1}'' és conegut pel servidor OSM "
"''{0}''.<br>No obstant això, el test per aconseguir els detalls de l''usuari "
-"ha fallat.<br>Tanmateix, en funció dels drets que atorgui aquest testimoni, "
+"ha fallat.<br>Tanmateix, en funció dels drets que atorgui este testimoni, "
"potser el podreu utilitzar<br>per pujar dades, carregar tracks GPS i/o "
"accedir a d''altres recursos protegits.</html>"
@@ -10154,7 +10366,7 @@ msgid ""
"Carefully check the server<br>URL and your Internet connection.</html>"
msgstr ""
"<html>No s''ha aconseguit informació sobre l''usuari del servidor OSM "
-"''{0}''.<br>Possiblement no sigui un problema causat pel testimoni "
+"''{0}''.<br>Possiblement no siga un problema causat pel testimoni "
"d''autenticació testejat, sinó<br>provocat per la configuració del servidor. "
"Comproveu acuradament el servidor<br>la URL i la vostra connexió a "
"Internet.</html>"
@@ -10164,7 +10376,7 @@ msgid ""
"''{1}''.<br>The token ist probably invalid.</html>"
msgstr ""
"<html>Ha fallat la signatura de la petició pel servidor OSM ''{0}'' amb el "
-"testimoni ''{1}''.<br>Possiblement el testimoni no sigui vàlid.</html>"
+"testimoni ''{1}''.<br>Possiblement el testimoni no siga vàlid.</html>"
msgid ""
"<html>The test failed because the server responded with an internal "
@@ -10172,7 +10384,7 @@ msgid ""
"later.</html>"
msgstr ""
"<html>El test ha fallat perquè el servidor ha respost amb un error "
-"intern.<br>JOSM no pot decdicir si el testimoni és vàlid. Si us plau, torneu "
+"intern.<br>JOSM no pot decdicir si el testimoni és vàlid. Per favor, torneu "
"a intentar-lo més tard.</html>"
msgid "Retrieving user info..."
@@ -10198,7 +10410,7 @@ msgstr "Fites explícites amb data i hora vàlides"
msgid "Explicit waypoints with time estimated from track position."
msgstr ""
-"Fites explícites amb data i hora estimades a partir de la seva posició"
+"Fites explícites amb data i hora estimades a partir de la seua posició"
msgid "Named trackpoints."
msgstr "Punts del track amb nom."
@@ -10208,7 +10420,7 @@ msgstr "Dates i hores modificades als fitxers d''àudio"
msgid "Start of track (will always do this if no other markers available)."
msgstr ""
-"Prinicpi del track (fer això sempre que no hi hagi altres marcadors "
+"Prinicpi del track (fer això sempre que no hi haja altres marcadors "
"disponibles)."
msgid "Show or hide the audio menu entry on the main menu bar."
@@ -10226,7 +10438,7 @@ msgid ""
"button icons."
msgstr ""
"Posar etiquetes al costat dels marcadors d''àudio (imatge i web) i de les "
-"seves icones."
+"seues icones."
msgid "When importing audio, make markers from..."
msgstr "Quan s''importi àudio, crear marcadors..."
@@ -10253,10 +10465,10 @@ msgid ""
"The number of seconds to jump forward or back when the relevant button is "
"pressed"
msgstr ""
-"El nombre de segons a saltar endavant o endarrera en prémer el botó adient"
+"El nombre de segons a saltar avant o endarrera en prémer el botó adient"
msgid "Forward/back time (seconds)"
-msgstr "Temps endavant/endarrera (segons)"
+msgstr "Temps avant/endarrera (segons)"
msgid "The amount by which the speed is multiplied for fast forwarding"
msgstr ""
@@ -10270,7 +10482,7 @@ msgid ""
"Playback starts this number of seconds before (or after, if negative) the "
"audio track position requested"
msgstr ""
-"La reproducció comença aquest nombre de segons abans (o després si és "
+"La reproducció comença este nombre de segons abans (o després si és "
"negatiu) de la posició demanada a la pista d''àudio"
msgid "Lead-in time (seconds)"
@@ -10333,7 +10545,7 @@ msgstr "Actualitzar els connectors seleccionats"
msgid "Please restart JOSM to activate the downloaded plugins."
msgstr ""
-"Si us plau, reinicieu JOSM per tal d''activar els connectors descarregats."
+"Per favor, reinicieu JOSM per tal d''activar els connectors descarregats."
msgid ""
"All installed plugins are up to date. JOSM does not have to download newer "
@@ -10352,13 +10564,13 @@ msgid "Configure the list of sites where plugins are downloaded from"
msgstr "Configurar la llista de llocs web per a descarregar connectors"
msgid "Add JOSM Plugin description URL."
-msgstr "Afegeix una URL descriptiva del connector de JOSM"
+msgstr "Afig una URL descriptiva del connector de JOSM"
msgid "Enter URL"
msgstr "Introduir una URL"
msgid "Please select an entry."
-msgstr "Si us plau seleccioneu una entrada"
+msgstr "Per favor seleccioneu una entrada"
msgid "Edit JOSM Plugin description URL."
msgstr "Modificar la descripció de la URL de connectors de JOSM"
@@ -10373,14 +10585,17 @@ msgid "Close the preferences dialog and discard preference updates"
msgstr "Tancar la finestra de preferències i descartar els canvis"
msgid "Save the preferences and close the dialog"
-msgstr "Desar les preferències i tancar la finestra"
+msgstr "Guardar les preferències i tancar la finestra"
msgid "Download plugins"
msgstr "Descarregar connector"
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
-"Heu de reiniciar JOSM per tal que algunes configuracions tinguin efecte"
+"Heu de reiniciar JOSM per tal que algunes configuracions tinguen efecte"
+
+msgid "Would you like to restart now?"
+msgstr "Voleu reiniciar ara?"
msgid "Remote Control"
msgstr "Control remot"
@@ -10398,7 +10613,7 @@ msgid ""
"Allows JOSM to be controlled from other applications, e.g. from a web "
"browser."
msgstr ""
-"Permetre que JOSM sigui controlat per d''altres aplicacions, per exemple de "
+"Permetre que JOSM siga controlat per d''altres aplicacions, per exemple de "
"d''un navegador web."
msgid ""
@@ -10406,9 +10621,9 @@ msgid ""
"not configurable because it is referenced by external applications talking "
"to JOSM."
msgstr ""
-"JOSM sempre escoltarà el <b>port 8111</b> del localhost. <br>Aquest port no "
-"és configurable perquè està referenciat a una aplicació externa que parla "
-"amb JOSM"
+"JOSM sempre escoltarà el <b>port 8111</b> del localhost. <br>Este port no és "
+"configurable perquè està referenciat a una aplicació externa que parla amb "
+"JOSM"
msgid "Enable remote control"
msgstr "Activar el control remot"
@@ -10498,7 +10713,7 @@ msgid "Reset to default"
msgstr "Restaurar els valors per defecte"
msgid "Add a new icon path"
-msgstr "Afegeix una nova ruta d''icones"
+msgstr "Afig una nova ruta d''icones"
msgid "Remove the selected icon paths"
msgstr "Suprimeix les rutes d''icones seleccionades"
@@ -10518,6 +10733,12 @@ msgstr "Suprimeix de la barra d''eines"
msgid "Configure toolbar"
msgstr "Configurar la barra d''eines"
+msgid "Edit shortcut"
+msgstr "Edita la drecera"
+
+msgid "Do not hide toolbar and menu"
+msgstr "No amaguis la barra d''eines ni el menú"
+
msgid "Actions"
msgstr "Accions"
@@ -10562,6 +10783,9 @@ msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
"Acció enregistrada {0} de la barra d''eines sobreescrita: {1} esdevé {2}"
+msgid "Toolbar: {0}"
+msgstr "Barra d''eines: {0}"
+
msgid "Data validator"
msgstr "Validador de dades"
@@ -10569,7 +10793,7 @@ msgid ""
"An OSM data validator that checks for common errors made by users and editor "
"programs."
msgstr ""
-"Un validador de dades OSM que verifica que no hi hagi errors fets pels "
+"Un validador de dades OSM que verifica que no hi haja errors fets pels "
"usuaris o els programes d''edició"
msgid "Use ignore list."
@@ -10614,27 +10838,15 @@ msgstr "Cercar: "
msgid "Read from file"
msgstr "Llegir d''un fitxer"
-msgid "Open JOSM customization file"
-msgstr "Obre el fitxer de personalització de JOSM"
-
-msgid "Import log"
-msgstr "Registre de la importació"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Aquí hi ha el resum de la importació del fitxer. <br/>Podeu refusar "
-"els canvis a les preferències fent clic sobre \"Cancel·lar\" a la finestra "
-"de preferències <br/>Per activar alguns canvis potser calgui reiniciar JOSM."
-
msgid "Export selected items"
msgstr "Exportar els elements seleccionats"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Fitxers de configuracions personalitzades de JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
-"Si us plau seleccioneu algunes claus de les preferències no marcades per "
+"Per favor seleccioneu algunes claus de les preferències no marcades per "
"defecte"
msgid "Export preferences keys to JOSM customization file"
@@ -10642,7 +10854,7 @@ msgstr "Exportar les preferències a un fitxer de persoalització de JOSM"
msgid "What to do with preference lists when this file is to be imported?"
msgstr ""
-"Què s''ha de fer amb la llista de preferències quan aquest fritxer sigui "
+"Què s''ha de fer amb la llista de preferències quan este fritxer siga "
"importat?"
msgid "Append preferences from file to existing values"
@@ -10651,43 +10863,59 @@ msgstr "Afegir les preferències del fitxer als valors existents"
msgid "Replace existing values"
msgstr "Reemplaçar els valors existents"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Fitxers de configuracions personalitzades de JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Obri el fitxer de personalització de JOSM"
-msgid "Advanced Background: Changed"
-msgstr "Fons avançat: canviat"
+msgid "Import log"
+msgstr "Registre de la importació"
-msgid "Advanced Background: NonDefalut"
-msgstr "Fons avançat: SensePredeterminació"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Ací hi ha el resum de la importació del fitxer. <br/>Podeu refusar els "
+"canvis a les preferències fent clic sobre \"Cancel·lar\" a la finestra de "
+"preferències <br/>Per activar alguns canvis potser calga reiniciar JOSM."
-msgid "Current value is default."
-msgstr "El valor per defecte és l''actual"
+msgid "shortcut"
+msgstr "drecera"
-msgid "Default value is ''{0}''."
-msgstr "El valor per defecte és ''{0}''."
+msgid "color"
+msgstr "color"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Actualment no hi ha valor per defecte (aquesta configuració encara no ha "
-"estat utilitzada)."
+msgid "toolbar"
+msgstr "barra d''eines"
-msgid "Select Setting Type:"
-msgstr "Seleccionar el tipus de paràmetre:"
+msgid "imagery"
+msgstr "imatgeria"
-msgid "Simple"
-msgstr "Simple"
+msgid "Reset preferences"
+msgstr "Inicialitza les preferències"
-msgid "List"
-msgstr "Llista"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Sou a punt de cancel·lar les preferències substituïnt-les pels seus valors "
+"predefinits.<br />Totes les vostres configuracions seran suprimides: "
+"connectors, imatgeria, filtres, botons de la barra d''eines, teclat, etc.<br "
+"/>Segur que voleu continuar?"
-msgid "List of lists"
-msgstr "Llista de llistes"
+msgid "Load profile"
+msgstr "Carrega un perfil"
-msgid "List of maps"
-msgstr "Llista de mapes"
+msgid "Save {0} profile"
+msgstr "Guarda el perfil {0}"
-msgid "Add setting"
-msgstr "Afegir paràmetre"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Totes les preferències d''este grup són de tipus predeterminat, no hi ha res "
+"a guardar"
+
+msgid "Choose profile file"
+msgstr "Escolliu el fitxer del perfil"
msgid "Change list setting"
msgstr "Canviar la llista de paràmetres"
@@ -10710,6 +10938,41 @@ msgstr "Canvia la llista de configuracions de mapes"
msgid "Entry {0}"
msgstr "Entrada {0}"
+msgid "Select Setting Type:"
+msgstr "Seleccionar el tipus de paràmetre:"
+
+msgid "Simple"
+msgstr "Simple"
+
+msgid "List"
+msgstr "Llista"
+
+msgid "List of lists"
+msgstr "Llista de llistes"
+
+msgid "List of maps"
+msgstr "Llista de mapes"
+
+msgid "Add setting"
+msgstr "Afegir paràmetre"
+
+msgid "Advanced Background: Changed"
+msgstr "Fons avançat: canviat"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "El valor per defecte és l''actual"
+
+msgid "Default value is ''{0}''."
+msgstr "El valor per defecte és ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Actualment no hi ha valor per defecte (esta configuració encara no ha estat "
+"utilitzada)."
+
msgid "Change string setting"
msgstr "Modifica un paràmetre de tipus cadena de caràcters"
@@ -10757,7 +11020,7 @@ msgid "Draw oneway arrows."
msgstr "Dibuixar fletxes de direcció única"
msgid "Draw segment order numbers"
-msgstr "Mostrar nombres d''ordre de segment"
+msgstr "Mostrar nombres d''orde de segment"
msgid "Draw boundaries of downloaded data"
msgstr "Dibuixar els límits de les dades descarregades"
@@ -10768,6 +11031,9 @@ msgstr "Dibuixar nodes virtuals al mode seleccionat"
msgid "Draw inactive layers in other color"
msgstr "Mostrar les capes inactives en un altre color"
+msgid "Display discardable keys"
+msgstr "Mostra les claus descartables"
+
msgid "Highlight target ways and nodes"
msgstr "Ressaltar les vies i nodes de destinació"
@@ -10795,7 +11061,7 @@ msgstr ""
"direccionals"
msgid "Draw the order numbers of all segments within their way."
-msgstr "Mostrar el nombre d''ordre de tots els segments a la seva via"
+msgstr "Mostrar el nombre d''orde de tots els segments a la seua via"
msgid "Draw the boundaries of data loaded from the server."
msgstr "Dibuixar els límits de les dades descarregades del servidor"
@@ -10829,20 +11095,27 @@ msgid ""
"This option suppresses the filling of areas, overriding anything specified "
"in the selected style."
msgstr ""
-"Aquesta opció suprimeix l''emplenament de les àrees, superposant-se a "
-"qualsevol estil d''emplenament seleccionat"
+"Esta opció suprimeix l''emplenament de les àrees, superposant-se a qualsevol "
+"estil d''emplenament seleccionat"
+
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Mostra les claus que han estat considerades com a poc interessants fins el "
+"punt que poden ser eliminades."
msgid "Options that affect drawing performance"
msgstr "Opcions que afecten el dibuix"
msgid "Segment drawing options"
-msgstr ""
+msgstr "Opcions de dibuix de segments"
msgid "Select and draw mode options"
-msgstr ""
+msgstr "Opcions de selecció i del mode de dibuix"
msgid "Other options"
-msgstr ""
+msgstr "Altres opcions"
msgid "OSM Data"
msgstr "Dades OSM"
@@ -10889,13 +11162,13 @@ msgid "Draw a circle from HDOP value"
msgstr "Dibuixa un circle a partir del valor HDOP"
msgid "Velocity (red = slow, green = fast)"
-msgstr "Velocitat (vermell = lent, verd = ràpid)"
+msgstr "Velocitat (roig = lent, verd = ràpid)"
msgid "Direction (red = west, yellow = north, green = east, blue = south)"
-msgstr "Direcció (vermell = oest, groc = nord, verd = est, balu =sud)"
+msgstr "Direcció (roig = oest, groc = nord, verd = est, balu =sud)"
msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr "Dilució de la precisió (vermell = alta, verd = baixa, si disponible)"
+msgstr "Dilució de la precisió (roig = alta, verd = baixa, si disponible)"
msgid "Track date"
msgstr "Dades del recorregut"
@@ -10927,7 +11200,7 @@ msgstr "Millora els gràfics GPX (antialiàsing)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
-msgstr "Fer un capa per a cada fita quan s''obri un fitxer GPX"
+msgstr "Fer un capa per a cada fita quan s''òbriga un fitxer GPX"
msgid "Draw lines between raw GPS points"
msgstr "Dibuixar línies entre els punts GPS"
@@ -10969,8 +11242,7 @@ msgid ""
"Do not draw arrows if they are not at least this distance away from the last "
"one."
msgstr ""
-"No dibuixar línies si com mínim no hi ha aquesta distància des de "
-"l''anterior."
+"No dibuixar línies si com mínim no hi ha esta distància des de l''anterior."
msgid "Minimum distance (pixels)"
msgstr "Distància mínima (píxels)"
@@ -11011,12 +11283,12 @@ msgid ""
"capture device needs to log that information."
msgstr ""
"Acoloreix els punts i els segments del track segons la dilució de la posició "
-"horitzontal (HDOP). El dispositiu de captura ha d''enregistrar aquesta "
+"horitzontal (HDOP). El dispositiu de captura ha d''enregistrar esta "
"informació."
msgid "Colors points and track segments by its timestamp."
msgstr ""
-"Acoloreix els punts i els segments del track segons la seva data i hora."
+"Acoloreix els punts i els segments del track segons la seua data i hora."
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
@@ -11081,7 +11353,7 @@ msgid "Default (Auto determined)"
msgstr "Defecte (autodeterminat)"
msgid "Add Imagery URL"
-msgstr "Afegeix una URL d''imatgeria"
+msgstr "Afig una URL d''imatgeria"
msgid "1. Enter URL"
msgstr "1. Entreu una URL"
@@ -11141,14 +11413,20 @@ msgstr "Obté capes"
msgid "2. Select layers"
msgstr "2. Seleccioneu capes"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Verifique la URL d''imatges WMS generada"
+msgid "3. Select image format"
+msgstr "3. Seleccioneu el format de la imatge"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Comproveu la URL generada pel servidor WMS"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Indiqueu un nom per esta capa"
msgid "Show Bounds"
msgstr "Mostra límits"
msgid "No bounding box was found for this layer."
-msgstr "No ha estat trobat cap límit per aquesta capa."
+msgstr "No ha estat trobat cap límit per esta capa."
msgid "imagery fade"
msgstr "degrada la imatgeria"
@@ -11200,7 +11478,7 @@ msgid "Selected entries:"
msgstr "Entrades seleccionades:"
msgid "Add a new {0} entry by entering the URL"
-msgstr "Afegeix una nova entrada {0} indicant la seva URL"
+msgstr "Afig una nova entrada {0} indicant la seua URL"
msgid "Remove entry"
msgstr "Esborra entrada"
@@ -11209,7 +11487,7 @@ msgid "copy selected defaults"
msgstr "copiar els valors de defecte seleccionats"
msgid "Please select at least one row to copy."
-msgstr "Si us plau, seleccioneu com a mínim una fila per copiar"
+msgstr "Per favor, seleccioneu com a mínim una fila per copiar"
msgid "reload defaults"
msgstr "recarregar valors per defecte"
@@ -11266,8 +11544,8 @@ msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
msgstr ""
-"Aquesta capa no suporta cap de les projeccions de JOSM,\n"
-"per això no la podeu utilitzar. Aquest missatge no toranarà a ser mostrat."
+"Esta capa no suporta cap de les projeccions de JOSM,\n"
+"per això no la podeu utilitzar. Este missatge no toranarà a ser mostrat."
msgid "Downloader:"
msgstr "Descarregador:"
@@ -11285,10 +11563,10 @@ msgid "% of north:"
msgstr "% nord:"
msgid "Auto save enabled"
-msgstr "Activar desament automàtic"
+msgstr "Activar guardat automàtic"
msgid "Auto save interval (seconds)"
-msgstr "Interval de desament automàtic (segons)"
+msgstr "Interval de guardat automàtic (segons)"
msgid "Default value: {0}"
msgstr "Valor predeterminat: {0}"
@@ -11301,25 +11579,31 @@ msgid ""
"backups are saved in JOSM''s preference folder. In case of a crash, JOSM "
"tries to recover the unsaved changes on next start.)</i>"
msgstr ""
-"<i>(El desament automàtic enregistrarà les capes modificades en intervals "
-"periòdics. Aquestes còpies de seguretat són creats a la carpeta "
-"especificada a les preferències de JOSM. En cas de problemes JOSM intentarà "
-"recuperar els canvis no desats \r\n"
-"la següent vegada que sigui iniciat.)</i>"
+"<i>(El guardat automàtic enregistrarà les capes modificades en intervals "
+"periòdics. Estes còpies de seguretat són creats a la carpeta especificada a "
+"les preferències de JOSM. En cas de problemes JOSM intentarà recuperar els "
+"canvis no guardats \r\n"
+"la següent vegada que siga iniciat.)</i>"
msgid "Keep backup files when saving data layers"
-msgstr "Conservar una còpia de seguratat de les capes en desar les capes"
+msgstr "Conservar una còpia de seguratat de les capes en guardar les capes"
msgid "When saving, keep backup files ending with a ~"
-msgstr "En desar, conservar un fitxer de còpia de seguretat acabat en ~"
+msgstr "En guardar, conservar un fitxer de còpia de seguretat acabat en ~"
msgid ""
"<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
"the file name and saves it in the same folder.)</i>"
msgstr ""
-"<i>(JOSM pot conservar un fitxer de còpia de seguretat en desar les capes. "
+"<i>(JOSM pot conservar un fitxer de còpia de seguretat en guardar les capes. "
"Afegirà ''~'' al nom del fitxer i el desarà a la mateix carpeta.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Arxiu de còpia de seguretat"
@@ -11336,7 +11620,7 @@ msgid "Active styles:"
msgstr "Estils actius:"
msgid "Add a new style by entering filename or URL"
-msgstr "Afegeix un estil nou indicant un nom de fitxer o una URL"
+msgstr "Afig un estil nou indicant un nom de fitxer o una URL"
msgid "New style entry:"
msgstr "Nova entrada d''estil:"
@@ -11389,10 +11673,8 @@ msgstr "Paràmetres dels mapes"
msgid "Settings for the map projection and data interpretation."
msgstr "Paràmetres de projecció i interpretació de dades dels mapes."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
-"Avís: no ha estat possible de llegir la font de les etiquetes predefindes: "
-"{0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "No és possible de llegir la font d''etiquetes predefinides: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11417,9 +11699,6 @@ msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
msgstr ""
-"<html>L''anàlisi de a font d''etiquetes predefindes {0} no és possible. "
-"Segur que la voleu utilitzar?<br><br><table width=400>L''error és: [{1}:{2}] "
-"{3}</table></html>"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
@@ -11450,7 +11729,7 @@ msgid "Active presets:"
msgstr "Predefinicions actives:"
msgid "Add a new preset by entering filename or URL"
-msgstr "Afegeix una nova predefinició indicant un fitxer o una URL"
+msgstr "Afig una nova predefinició indicant un fitxer o una URL"
msgid "New preset entry:"
msgstr "Nova predefinió:"
@@ -11464,8 +11743,7 @@ msgstr ""
"Modifica el nom de l''arxiu o la URL de la predefinció activa seleccionada"
msgid "Add the selected available presets to the list of active presets"
-msgstr ""
-"Afegeix els elements seleccionats a la llista de predefinicions actives"
+msgstr "Afig els elements seleccionats a la llista de predefinicions actives"
msgid "Reloads the list of available presets from ''{0}''"
msgstr "Recarrega la llista de predefinicions disponibles de ''{0}''"
@@ -11498,13 +11776,13 @@ msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available plugins."
msgstr ""
-"Si us plau, feu clic sobre<strong>Descarregar llista</strong> per tal de "
+"Per favor, feu clic sobre<strong>Descarregar llista</strong> per tal de "
"descarregar i mostrar una llista amb els connectors disponibles."
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] "El connector {0} és encara utilitzat per aquest altre"
-msgstr[1] "El connector {0} és encara utilitzat per aquests {1} altres:"
+msgstr[0] "El connector {0} és encara utilitzat per este altre"
+msgstr[1] "El connector {0} és encara utilitzat per estos {1} altres:"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: Versió {1} (local: {2})"
@@ -11525,7 +11803,7 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins at "
"startup after an update of JOSM itself."
msgstr ""
-"Si us plau, decidiu si JOSM ha d''actualitzar automàticament els connectors "
+"Per favor, decidiu si JOSM ha d''actualitzar automàticament els connectors "
"actius en iniciar-se després d''una actualització de JOSM"
msgid "Update interval (in days):"
@@ -11535,7 +11813,7 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins after a "
"certain period of time."
msgstr ""
-"Si us plau, decidiu si JOSM ha d''actualitzar els connectors actius després "
+"Per favor, decidiu si JOSM ha d''actualitzar els connectors actius després "
"d''un cert període de temps"
msgid "By Code (EPSG)"
@@ -11676,21 +11954,6 @@ msgstr "Swiss Grid (Suïssa)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (sense correccions locals)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zona UTM"
-
-msgid "North"
-msgstr "Nord"
-
-msgid "South"
-msgstr "Sud"
-
-msgid "Hemisphere"
-msgstr "Hemisferi"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadalupe Fort-Marigot 1949"
@@ -11712,6 +11975,21 @@ msgstr "UTM França (DOM)"
msgid "UTM Geodesic system"
msgstr "Sistema geodèsic UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zona UTM"
+
+msgid "North"
+msgstr "Nord"
+
+msgid "South"
+msgstr "Sud"
+
+msgid "Hemisphere"
+msgstr "Hemisferi"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Provant la URL de l''API OSM ''{0}''"
@@ -11719,7 +11997,7 @@ msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
-"''{0}'' no és una URL d''una API OSM vàlida.<br>Si us plau, comproveu "
+"''{0}'' no és una URL d''una API OSM vàlida.<br>Per favor, comproveu "
"l''ortografia i torneu a validar un altre cop.</html>"
msgid "Invalid API URL"
@@ -11730,14 +12008,14 @@ msgid ""
"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
"<html>Ha fallat la construcció de la URL ''{0}'' per a validar el servidor "
-"d''API OSM.<br>Si us plau, comproveu l''ortografia de ''{1}'' i torneu a "
+"d''API OSM.<br>Per favor, comproveu l''ortografia de ''{1}'' i torneu a "
"validar un altre cop.</html>"
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
"''{1}'' and your Internet connection and validate again.</html>"
msgstr ""
-"<html>Ha fallat la connexió a la URL ''{0}.<br>Si us plau, verifiqueu "
+"<html>Ha fallat la connexió a la URL ''{0}.<br>Per favor, verifiqueu "
"l''ortografia de ''{1}'' i la vostra connexió a Internet i torneu a validar "
"un altre cop.</html>"
@@ -11751,7 +12029,7 @@ msgid ""
msgstr ""
"<html>Ha fallat la recuperació de la llista de conjunts de canvis del "
"servidor d''API OSM a <br>''{1}. El servidor ha contestat retornant el codi "
-"d''error {0} en comptes de 200.<br>Si us plau, comproveu l''ortografia de "
+"d''error {0} en comptes de 200.<br>Per favor, comproveu l''ortografia de "
"''{1}'' i torneu a validar un altre cop.</html>"
msgid ""
@@ -11760,7 +12038,7 @@ msgid ""
"spelling of ''{0}'' and validate again.</html>"
msgstr ""
"<html>El servidor d''API OSM a ''{0}'' no ha donat una resposta "
-"vàlida.<br>És com si ''{0}'' no fos un servidor d''API OSM.<br>Si us plau, "
+"vàlida.<br>És com si ''{0}'' no fos un servidor d''API OSM.<br>Per favor, "
"comproveu l''ortografia de ''{0}'' i torneu a validar un altre cop.</html>"
msgid "Use Basic Authentication"
@@ -11779,11 +12057,11 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Selecciona d''utilitzar OAuth com a mecanisme d''autenticació"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Avís: valor no suportat a la preferència ''{0}'', hi ha ''{1}''. utilitzant "
-"el mètode d''''Autenticació bàsica''"
+"Valor no suportat a la preferència ''{0}'', s''ha obtingut ''{1}''. "
+"Utilitzant el mètode d''autenticació \"Autenticació Bàsica\"."
msgid "OSM username:"
msgstr "Non d''usuari OSM:"
@@ -11791,32 +12069,38 @@ msgstr "Non d''usuari OSM:"
msgid "OSM password:"
msgstr "Contrasenya OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "Avís: ha fallat la recuperació de les credencials del seu gestor"
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr ""
+"La fallat l''obtenció de les credencials OSM del gestor de credencials."
msgid "Current credential manager is of type ''{0}''"
msgstr "El gestor de credencials actual és de tipus ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "Avís: ha fallat l''ació de desar les credencials al gestor."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
+"Les credencials OSM no han pogut ser guardades al gestor de credencials."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-"Avís: Ha fallat l''obtenció del testimoni d''autenticació OAuth del gestor "
-"de credencials"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Avís: Ha fallat l''emmagatzemament del testimoni d''autenticació al gestor "
-"de credencials"
+"Ha fallat l''obtenció del testimoni d''accés OAuth del gestor de credencials"
+
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+"Ha fallat l''emmagatzemament del testimoni d''accés OAuth al gestor de "
+"credencials"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
"Please authorize first."
msgstr ""
"Encara no teniu un testimoni d''autenticació per accedir al servidor OSM "
-"utilitzant OAuth. Si us plau, autoritzeu primer."
+"utilitzant OAuth. Per favor, autoritzeu primer."
msgid ""
"You already have an Access Token to access the OSM server using OAuth."
@@ -11825,7 +12109,7 @@ msgstr ""
"OAuth."
msgid "Save to preferences"
-msgstr "Desar a les preferències"
+msgstr "Guardar a les preferències"
msgid "Click to step through the OAuth authorization process"
msgstr "Feu clic per seguir el procés d''autorització d''OAuth"
@@ -11856,17 +12140,17 @@ msgid "The API URL is valid."
msgstr "La URL de l''API és vàlida"
msgid "Validation failed. The API URL seems to be invalid."
-msgstr "La validació ha fallat. La URL de l''API no sembla vàlida."
+msgstr "La validació ha fallat. La URL de l''API no pareix vàlida."
msgid "OSM API URL must not be empty. Please enter the OSM API URL."
msgstr ""
-"La URL de l''API no pot ser buida. Si us plau indiqueu la URL de l''API."
+"La URL de l''API no pot ser buida. Per favor indiqueu la URL de l''API."
msgid "The current value is not a valid URL"
msgstr "El valor actual no és una URL vàlida."
msgid "Please enter the OSM API URL."
-msgstr "Si us plau, indiqueu la URL de l''API"
+msgstr "Per favor, indiqueu la URL de l''API"
msgid "Host:"
msgstr "Ordinador:"
@@ -11878,8 +12162,8 @@ msgstr "Port:"
msgid ""
"Please enter a username and a password if your proxy requires authentication."
msgstr ""
-"Si us plau, indiqueu un nom d''usuari i una contrasenya si el vostre "
-"servidor intermediari requereix autenticació."
+"Per favor, indiqueu un nom d''usuari i una contrasenya si el vostre servidor "
+"intermediari requereix autenticació."
msgid "Password:"
msgstr "Contrasenya:"
@@ -11904,18 +12188,13 @@ msgid "Use a SOCKS proxy"
msgstr "Utilitzar un proxi SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Avís: JOSM ha estat configurat per utilitzar servidors intermediaris però la "
-"màquina virtual de Java no ha estat configurada per trobar-los. Canvieu les "
-"preferències a \"Sense seervidor intermediari\"."
-
-msgid "disabled"
-msgstr "deshabilitat"
-
-msgid "no modifier"
-msgstr "sense modificador"
+"JOSM ha estat configurat per a utilitzar el servidor proxi que hi ha als "
+"paràmetres del sistema, però la màquina virtual de java (JVM) no ha estat "
+"configurada per obtindre-lo. Reinicialitzada la preferència vers el valor "
+"\"Cap proxi\"."
msgid "Shortcut Background: User"
msgstr "Drecera de fons: Usuari"
@@ -11956,40 +12235,39 @@ msgid "Delete the selection in the tag table"
msgstr "Suprimeix la selecció a la taula d''etiquetes"
msgid "Add a new tag"
-msgstr "Afegeix una nova etiqueta"
+msgstr "Afig una nova etiqueta"
-msgid "Select auto-increment of {0} for this field"
-msgstr "Selecciona un increment automàtic de {0} per aquest camp"
+msgid "Paste tags from buffer"
+msgstr "Apega etiquetes de la memòria intermèdia"
-msgid "Cancel auto-increment for this field"
-msgstr "Anul·la l''increment automàtic per aquest camp"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Utilitzar preconfiguració ''{0}'' del grup ''{1}''"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Utilitzar preconfiguració ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Avís sobre les etiquetes predefinides \"{0}-{1}\": Ignorant l''atribut "
-"''{2}'' com ''{3}'' elements son donats."
+msgid "Elements of type {0} are supported."
+msgstr "Els elements de tipus {0} són suportats."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
-"d''elements ''display_values'' ha de ser el mateix que el de ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Modificar {0} objecte"
+msgstr[1] "Modificar {0} objectes"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
-"d''elements ''short_descriptions'' ha de ser el mateix que el de ''values''"
+msgid "Nothing selected!"
+msgstr "Selecció buida."
-msgid "More information about this feature"
-msgstr "Més informació sobre aquesta funcionalitat"
+msgid "Selection unsuitable!"
+msgstr "Selecció no apropiada!"
+
+msgid "Apply Preset"
+msgstr "Aplicar"
+
+msgid "New relation"
+msgstr "Nova relació"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Requisit desconegut: {0}"
@@ -11997,6 +12275,9 @@ msgstr "Requisit desconegut: {0}"
msgid "Illegal member expression: {0}"
msgstr "Expressió de membre incorrecta: {0}"
+msgid "More information about this feature"
+msgstr "Més informació sobre esta funcionalitat"
+
msgid "Available roles"
msgstr "Rols disponibles"
@@ -12012,15 +12293,59 @@ msgstr "elements"
msgid "Optional Attributes:"
msgstr "Atributs Opcionals:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Utilitzar preconfiguració ''{0}'' del grup ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr "Selecciona un increment automàtic de {0} per este camp"
-msgid "Use preset ''{0}''"
-msgstr "Utilitzar preconfiguració ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr "Anul·la l''increment automàtic per este camp"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Avís sobre les etiquetes predefinides \"{0}-{1}\": Ignorant l''atribut "
+"''{2}'' com ''{3}'' elements son donats."
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Etiqueta preconfigurada \"{0}-{1}\" trencada - El mètode Java utilitzat a "
+"''values_from'' no és \"{2}\""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Etiqueta preconfigurada \"{0}-{1}\" trencada - El mètode Java utilitzat a "
+"''values_from'' ha generat {2} ({3})"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
+"d''elements ''display_values'' ha de ser el mateix que el de ''values''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"El nombre d''etiquetes predefinides \"{0}-{1}\" no és coherent. El nombre "
+"d''elements ''short_descriptions'' ha de ser el mateix que el de ''values''"
msgid "Unknown type: {0}"
msgstr "Tipus desconegut: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Grup de preconfiguracions {1}/{0}"
+
+msgid "Preset group {0}"
+msgstr "Grup de prconfiguracions {0}"
+
msgid "Roles cannot appear more than once"
msgstr "Els rols només poden aparèixer un sol cop"
@@ -12030,41 +12355,9 @@ msgstr "Element de rol predefinit sense parent"
msgid "Preset sub element without parent"
msgstr "Sotselement predefinit sense parent"
-msgid "Could not read tagging preset source: {0}"
-msgstr "No és possible de llegir la font d''etiquetes predefinides: {0}"
-
msgid "Error parsing {0}: "
msgstr "Error d''anàlisi {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "Els elements de tipus {0} són suportats."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Modificar {0} objecte"
-msgstr[1] "Modificar {0} objectes"
-
-msgid "Nothing selected!"
-msgstr "Selecció buida."
-
-msgid "Selection unsuitable!"
-msgstr "Selecció no apropiada!"
-
-msgid "Apply Preset"
-msgstr "Aplicar"
-
-msgid "New relation"
-msgstr "Nova relació"
-
-msgid "Change Properties"
-msgstr "Canvia propietats"
-
-msgid "Preset group {1} / {0}"
-msgstr "Grup de preconfiguracions {1}/{0}"
-
-msgid "Preset group {0}"
-msgstr "Grup de prconfiguracions {0}"
-
msgid "Search preset"
msgstr "Cerca predefinit"
@@ -12075,11 +12368,21 @@ msgid "Search presets"
msgstr "Cercar element predefinit"
msgid "Show only applicable to selection"
-msgstr "Mostrar només el que sigui aplicable a la selecció"
+msgstr "Mostrar només el que siga aplicable a la selecció"
msgid "Search in tags"
msgstr "Cerca entre les etiquetes"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Ajustament {0} encara no enregistrat. No es pot establir la particiapació a "
+"l''ajustament sincronitzat."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Ajustament {0} encara no enregistrat."
+
msgid "All files (*.*)"
msgstr "Tots els fitxers (*.*)"
@@ -12099,23 +12402,79 @@ msgid ""
"URL from www.openstreetmap.org (you can paste a download URL here to specify "
"a bounding box)"
msgstr ""
-"URL de www.openstreetmap.org (aquí podeu enganxar la URL d''una àrea "
+"URL de www.openstreetmap.org (ací podeu apegar la URL d''una àrea "
"descarregada per especificar una zona determinada)"
msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
"> 0"
msgstr ""
-"El valor actual no és vàlid com a ID d''un conjunt de canvis. Si us plau, "
+"El valor actual no és vàlid com a ID d''un conjunt de canvis. Per favor, "
"indiqueu un valor enter > 0"
msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
-"El valor no és un ID vàlid. Si us plau, indiqueu un valor enter més gran que "
+"El valor no és un ID vàlid. Per favor, indiqueu un valor enter més gran que "
"zero"
-msgid ""
+msgid "false: the property is explicitly switched off"
+msgstr "fals: la propietat ha estat deshabilitada expressament"
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+"cert: la propietat ha estat habilitada expressament<html>Please confirm to "
+"remove <strong>1 object</strong> from <strong>1 relation</strong>.</html>"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"parcial: els objectes seleccionats tenen diferents propietats, no ho canvieu"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "no definit: no aplicar esta propietat als objectes seleccionats"
+
+msgid "Cut"
+msgstr "Retalla"
+
+msgid "Right click = copy to clipboard"
+msgstr "Clic amb el botó dret = copiar al portaretalls"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "L''atribut ''{0}'' manca i és obligatori."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long''. El seu "
+"valor és ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long'' (>=0) . "
+"El seu valor és ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut ''{0}'' de tipus ''double''. El seu valor és "
+"''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''lboolean''. El "
+"seu valor és ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus "
+"''OsmPrimitiveType''. El seu valor és ''{1}''"
+
+msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
"La via amb un ID extern ''{0}'' inclou un node amb ID ''{1}'' que manca"
@@ -12150,11 +12509,11 @@ msgid "Contacting OSM Server..."
msgstr "Contactant amb el servidor OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Avís: el valor de l''atribut ''{0}'' de l''element ''{1}'' no és adequat per "
-"les capacitats del servidor. El seu valor és ''{2}''"
+"Valor invàlid per l''atribut ''{0}'' de l''element ''{1}'' a les capacitats "
+"del serevidor. El valor és ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
@@ -12204,41 +12563,39 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Nombre de port incorrecte a la preferència ''{0}''. Hi ha {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Avís: s''ha trobat un valor no esperat per a la preferència ''{0}''. Hi ha "
-"''{1}''. No s''utilitzarà el servidor intermediari."
+"S''ha trobat un valor inesperat per la preferència ''{0}''. El valor trobat "
+"és ''{1}''. No s''utilitzarà cap proxi."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Avís: Paràmetres incorrectes per al servidor intermediari HTTP. Configurat "
-"host ''{0}'' i port ''{1}''."
+"Paràmetres inesperats per al servidor intermiediari d''HTTP. El host "
+"obtingut és ''{0}'' i el port el ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Avís: Paràmetres incorrectes per al servidor intermediari SOCKS. Configurat "
-"host ''{0}'' i port ''{1}''."
+"Paràmetres inesperats per al servidor intermiediari de SOCKS. El host "
+"obtingut és ''{0}'' i el port el ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Error: Ha fallat la connexió al servidor intermediari ''{0}'' per a "
-"l''adreça ''{1}''. L''excepció ha estat: {2}"
+"Ha fallat la conexió al servidor intermediari ''{0}'' per la URI ''{1}''. "
+"L''excepció ha estat: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Avís: la màquina virtual de Java no ha estat configurada per poder trobar "
-"servidors intermediaris a partir de la configuració del sistema. la "
-"propietat ''java.net.useSystemProxies'' mancava en el moment d''iniciar. No "
-"serà possible la utilització de servidors intermediaris."
+"La màquina virtual de java (JVM) no ha estat configurada per a obtindre "
+"servidors intermediaris dels paràmetres del sistema. La propietat "
+"''java.net.useSystemProxies'' mancava en el moment d''iniciar. No "
+"s''utilitzarà cap servidor intermediari."
msgid "Parsing response from server..."
msgstr "Analitzant la resposta del servidor..."
@@ -12282,7 +12639,7 @@ msgid "GPS track description"
msgstr "Descripció del track GPS"
msgid "Add author information"
-msgstr "Afegeix informació d''autor"
+msgstr "Afig informació d''autor"
msgid "Real name"
msgstr "Nom real"
@@ -12306,7 +12663,7 @@ msgid "Export options"
msgstr "Opcions d''exportació"
msgid "Export and Save"
-msgstr "Exporta i desa"
+msgstr "Exporta i guarda"
msgid ""
"Error while exporting {0}:\n"
@@ -12341,6 +12698,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Error de sintaxi: l''estructura del document GPX no és correcta"
+msgid "(at line {0}, column {1})"
+msgstr "(a la línia {0}, columna {1})"
+
msgid "Unknown mode {0}."
msgstr "Node {0} desconegut."
@@ -12356,15 +12716,23 @@ msgstr "Cercant fitxers d''imatges"
msgid "No image files found."
msgstr "No s''han trobat fitxers d''imatge"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Ha fallat l''obertura d''un fux d''entrada pel recurs ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Avís: ha fallat l''obertura del fitxer amb extensió ''{2}'' i nom ''{3}'' "
-"del fitxer zip ''{0}''. L''excepció ha estat: {1}"
+"Ha fallat l''obertura del fitxer amb extensió ''{2}'' i nom ''{3}'' del zip "
+"''{0}''. L''excepció ha estat: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "No s''ha pogut canviar el nom del fitxer {0} a {1}."
@@ -12420,7 +12788,7 @@ msgstr ""
"per a cada objecte."
msgid "Downloading OSM data..."
-msgstr "Descarregant dades des de OSM..."
+msgstr "Descarregant dades des d'OSM..."
msgid "Fetching node with id {0} from ''{1}''"
msgstr "Recuperant el node amb ID {0} de ''{1}''"
@@ -12453,8 +12821,8 @@ msgstr "Sentències desconegudes: {0}"
msgid "Zero coordinates: {0}"
msgstr "Sense coordenades: {0}"
-msgid "NMEA import success"
-msgstr "Importació NMEA correcta"
+msgid "NMEA import success:"
+msgstr "Importació NMEA reeixida:"
msgid "NMEA import failure!"
msgstr "La importació NMEA ha fallat!"
@@ -12463,7 +12831,7 @@ msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
msgstr "Manca la preferència ''{0}''. No és possible d''inicialitzar OsmApi."
msgid "This version of JOSM is incompatible with the configured server."
-msgstr "Aquesta versió de JOSM és incompatible amb el servidor configurat"
+msgstr "Esta versió de JOSM és incompatible amb el servidor configurat"
msgid ""
"It supports protocol version 0.6, while the server says it supports {0} to "
@@ -12543,12 +12911,12 @@ msgstr "Servidor OSM fitxers comprimits bzip2"
msgid "Prolog of OsmChange document already written. Please write only once."
msgstr ""
-"El pròleg del document OsmChange ja ha estat escrit. Si us plau, només s''ha "
+"El pròleg del document OsmChange ja ha estat escrit. Per favor, només s''ha "
"d''escriure un cop."
msgid "Prolog of OsmChange document not written yet. Please write first."
msgstr ""
-"El pròleg del document OsmChange encara no ha estat escrit. Si us plau, cal "
+"El pròleg del document OsmChange encara no ha estat escrit. Per favor, cal "
"escriure''l primer."
msgid "OsmChange File"
@@ -12561,51 +12929,17 @@ msgid "No data found in file {0}."
msgstr "NO s''han trobat dades al fitxer {0}."
msgid "Open OsmChange file"
-msgstr "Obre fitxer OsmChange"
-
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "L''atribut ''{0}'' manca i és obligatori."
+msgstr "Obri fitxer OsmChange"
msgid "Unsupported version: {0}"
msgstr "Versió no suportada: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long''. El seu "
-"valor és ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''long'' (>=0) . "
-"El seu valor és ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut ''{0}'' de tipus ''double''. El seu valor és "
-"''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus ''lboolean''. El "
-"seu valor és ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Valor incorrecte de l''atribut obligatori ''{0}'' de tipus "
-"''OsmPrimitiveType''. El seu valor és ''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Avís: l''element d''inici ''{0}'' situat a la posició ({1},{2}) dins del "
-"conjunt de canvis no està suportat. Anul·lant."
+"Element inicial ''{0}'' no suportat al contigut del conjunt de canvis a la "
+"posició ({1},{2}). Omentent."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12615,11 +12949,11 @@ msgstr ""
"estat trobat fora d''un bloc ''create'', ''modify'', o ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Avís: l''element de final ''{0}'' situat a la posició ({1},{2}) dins del "
-"conjunt de canvis no està suportat. Anul·lant."
+"Element final ''{0}'' no suportat al contigut del conjunt de canvis a la "
+"posició ({1},{2}). Omentent."
msgid "Parsing changeset content ..."
msgstr "Processant el contingut del conjunt de canvis ..."
@@ -12649,14 +12983,11 @@ msgstr ""
"Ha fallat la signatura d''una connexió HTTP amb una capçalera "
"d''autenticació OAuth."
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Avís: valor no esperat de la preferència ''{0}''. És ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(a la línia {0}, columna {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Valor inesperat per a la preferència ''{0}''. És ''{1}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
-msgstr "<html>Ha hagut un error en desar.<br>L''error és:<br>{0}</html>"
+msgstr "<html>Ha hagut un error en guardar.<br>L''error és:<br>{0}</html>"
msgid ""
"<html>An error occurred while restoring backup file.<br>Error "
@@ -12665,9 +12996,6 @@ msgstr ""
"<html>Ha hagut un error en restaurar la còpia de seguretat.<br>L''error "
"és:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "No es pot fer la còpia de seguretat. L''excepció ha estat: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Fitxers del servidor OSM comprimits amb gzip"
@@ -12687,7 +13015,10 @@ msgid "No data found in file ''{0}''."
msgstr "No s''han trobat dades al fitxer ''{0}''."
msgid "Open OSM file"
-msgstr "Obre fitxer OSM"
+msgstr "Obri fitxer OSM"
+
+msgid "Reading was canceled"
+msgstr "La lectura ha estat cancel·lada"
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
@@ -12748,11 +13079,11 @@ msgstr ""
"Valor incorrecte de l''atribut ''versió'' a l''objecte amb ID {0}. Hi ha {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"Avís: Normalitzant el valor de l''atribut ''version'' de l''element {0} fins "
-"{2}, la versió de l''API és ''{3}''. Valor obtingut {1}."
+"Normalitzant el valor de l''aatribut \"versió\" de l''element {0} al {2}, la "
+"versió de l''API és ''{3}''. S''ha obtingut {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "La versió de l''API és desconeguda o no suportada. La versió és {0}."
@@ -12835,8 +13166,8 @@ msgstr "Ha fallat l''obertura de la connexió amb l''API {0}."
msgid ""
"Could not connect to the OSM server. Please check your internet connection."
msgstr ""
-"No ha estat possible de connectar amb el servidor OSM. Si us plau, "
-"verifiqueu la vostra connexió a Internet."
+"No ha estat possible de connectar amb el servidor OSM. Per favor, verifiqueu "
+"la vostra connexió a Internet."
msgid "Reading error text failed."
msgstr "Ha fallat la lectura del text de l''error"
@@ -12902,29 +13233,41 @@ msgstr ""
"valuosa.</strong></p></body></html>"
msgid "Save user and password (unencrypted)"
-msgstr "Desar nom d''usuari i contrasenya (sense encriptar)"
+msgstr "Guardar nom d''usuari i contrasenya (sense encriptar)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<supressió de {0} objectes>"
+
+msgid "Old values of"
+msgstr "Valors antics de"
msgid "Add tags to selected objects"
msgstr "Afegir etiquetes als objectes seleccionats"
msgid "Add selected tags"
-msgstr ""
+msgstr "Afig les etiquetes seleccionades"
msgid "Add all tags"
-msgstr ""
+msgstr "Afig totes les etiquetes"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "Afig les etiquetes verificades als objectes seleccionats"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Majúscula+Enter: Afig totes les etiquetes als objectes seleccionats"
msgid "Assume"
msgstr "Assumeix"
+msgid "Existing values"
+msgstr "Valors existents"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Marqueu la casella de verificació per acceptar el valor"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Accepta totes les etiquetes de {0} per esta sessió"
+
msgid "Load data from API"
msgstr "Carregar dades de l''API"
@@ -12932,7 +13275,7 @@ msgid "Import data from URL"
msgstr "Importar dades de la URL"
msgid "Open local files"
-msgstr "Obre fitxers locals"
+msgstr "Obri fitxers locals"
msgid "Load imagery layers"
msgstr "Carrega les capes d''imatgeria"
@@ -12949,19 +13292,20 @@ msgstr "Crear nous objectes"
msgid "Read protocol version"
msgstr "Llegir la versió del protocol"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
-msgstr ""
-"Avís: no és possible d''iniciar el control remot del servidor al port {0}: "
-"{1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr "No es possible iniciar el servidor de control remot al port {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Control remot::Acceptant connexions a través del port {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Control remot::Servidor parat."
msgid "Remote Control has been asked to create a new node."
msgstr "El control remot ha demanat de crear un nou node"
msgid "There is no layer opened to add node"
-msgstr ""
-
-msgid "Add way"
-msgstr "Afegir via"
+msgstr "No hi ha una capa oberta on afegir nodes"
msgid "Remote Control has been asked to create a new way."
msgstr "El control remot ha demanat de crear una via"
@@ -12970,7 +13314,18 @@ msgid "Invalid coordinates: {0}"
msgstr "Coordenades invàlides: {0}"
msgid "There is no layer opened to add way"
+msgstr "No hi ha una capa oberta on afegir vies"
+
+msgid "Add way"
+msgstr "Afegir via"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
msgstr ""
+"S''ha demanat al Control Remot que informi de les característiques que "
+"suporta. Això permet els llocs web saber la versió de JOSM que s''eatà "
+"utilitzant."
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
@@ -12988,6 +13343,15 @@ msgstr "El control remot ha demanat d''importar dades de la següent URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "El control remot ha demanat de carregar dades de l''API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -13024,20 +13388,20 @@ msgstr "Dades:"
msgid "local file"
msgstr "fitxer local"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Enllaç a un fitxer de dades OSM al disc local."
+msgid "Link to a GPX file on your local disk."
+msgstr "Enllaç vers un fitxer GPX del vostre disc local."
msgid "include"
msgstr "inclou"
-msgid "Include OSM data in the .joz session file."
-msgstr "Incloure dades OSM al fitxer .joz de la sessió."
+msgid "Include GPX data in the .joz session file."
+msgstr "Inclou dades GPX al fitxer de sessió .joz."
msgid "No file association"
msgstr "Cap associació de fitxer"
-msgid "OSM data will be included in the session file."
-msgstr "Les dades OSM seran incloses al fitxer de la sessió."
+msgid "GPX data will be included in the session file."
+msgstr "Les dades GPX seran incloses al fitxer de sessió-"
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13057,10 +13421,19 @@ msgstr ""
"suportada. S''esperava la versió: 0.1"
msgid "Layer contains unsaved data - save to file."
-msgstr "La capa conté dades no desades - desar a un fitxer."
+msgstr "La capa conté dades no guardades - guardar a un fitxer."
msgid "Layer does not contain unsaved data."
-msgstr "La capa no conté dades sense desar."
+msgstr "La capa no conté dades sense guardar."
+
+msgid "Link to a OSM data file on your local disk."
+msgstr "Enllaç a un fitxer de dades OSM al disc local."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Incloure dades OSM al fitxer .joz de la sessió."
+
+msgid "OSM data will be included in the session file."
+msgstr "Les dades OSM seran incloses al fitxer de la sessió."
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
@@ -13069,6 +13442,9 @@ msgstr ""
"La versió ''{0}'' de les metadades de la capa de dades OSM no està "
"suportada. S''esperava la versió: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Fitxer de la sessió (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "No és possible localitzar el fitxer ''{0}''."
@@ -13145,18 +13521,18 @@ msgid "Download skipped"
msgstr "Descàrrega ignorada"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Avís: No es pot descarregar el connector ''{0}''. No es coneix el seu enllaç "
-"de descàrrega. Ignorant la descàrrega."
+"No és possible la descàrrega del connector ''{0}''. No es coneix l''enllaç "
+"de descàrrega. Omentent la descàrrega."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Avís: No es pot descarregar el connector ''{0}''. El seu enllaç de "
-"descàrrega ''{1}''no és una URL vàlida. Ignorant la descàrrega."
+"No és possible la descàrrega del connector ''{0}''. El seu enllaç de "
+"descàrrega ''{1}'' no és una URL vàlida. Omentent la descàrrega."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Ha fallat la creació del directori de connectors ''{0}''"
@@ -13263,7 +13639,7 @@ msgid ""
"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
msgstr ""
"<html>El connector {0} necessita la versió {1} de JOSM. La versió actual és "
-"{2}.<br>Heu d''actualitzar JOSM si voleu utilitzar aquest connector.</html>"
+"{2}.<br>Heu d''actualitzar JOSM si voleu utilitzar este connector.</html>"
msgid "Could not load plugin {0}. Delete from preferences?"
msgstr "El connector {0} no pot ser carregat. Esborrar de les preferències?"
@@ -13275,7 +13651,7 @@ msgid ""
"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
"not found.<br>Delete from preferences?</html>"
msgstr ""
-"<html>El connector {0} no pot ser carregat perquè la seva<br>classe "
+"<html>El connector {0} no pot ser carregat perquè la seua<br>classe "
"principal ''{1}'' no ha estat trobada.<br>Esborrar de les "
"preferències?</html>"
@@ -13309,8 +13685,8 @@ msgstr "Suprimint els connectors sense manteniment..."
msgid "Updating the following plugin has failed:"
msgid_plural "Updating the following plugins has failed:"
-msgstr[0] "Ha fallat l''actualització d''aquest connector:"
-msgstr[1] "Ha fallat l''actualització d''aquests connectors:"
+msgstr[0] "Ha fallat l''actualització d''este connector:"
+msgstr[1] "Ha fallat l''actualització d''estos connectors:"
msgid ""
"Please open the Preference Dialog after JOSM has started and try to update "
@@ -13319,21 +13695,20 @@ msgid_plural ""
"Please open the Preference Dialog after JOSM has started and try to update "
"them manually."
msgstr[0] ""
-"Si us plau, obriu la finestra de preferències un cop JOSM s''hagi inciat i "
+"Per favor, obriu la finestra de preferències un cop JOSM s''haja inciat i "
"proveu d''actualitzar-lo manualment."
msgstr[1] ""
-"Si us plau, obriu la finestra de preferències un cop JOSM s''hagi inciat i "
+"Per favor, obriu la finestra de preferències un cop JOSM s''haja inciat i "
"proveu d''actualitzar-los manualment."
msgid "Plugin update failed"
msgstr "Ha fallat l''actualització del connector"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Avís: el connector {0} no ha pogut ser trobat"
+msgid "Failed to find plugin {0}"
+msgstr "No ha estat possible de trobar el connector {0}"
-msgid "Warning: failed to download plugin information list"
-msgstr ""
-"Avís: ha fallat la descàrrega de la llista d''informació dels connectors"
+msgid "Failed to download plugin information list"
+msgstr "Ha fallat la descàrrega de la llista d''informació de connectors"
msgid "Disable plugin"
msgstr "Deshabilitar connector"
@@ -13347,28 +13722,28 @@ msgstr "Conservar el connector"
msgid "Click to keep the plugin ''{0}''"
msgstr "Feu clic per conservar el connector ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
-"Avís: ha fallat la supresió del connector ''{0}'' que està desactualitzat"
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Ha fallat la supressió del connector obsolet ''{0}''."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Avís: ha fallat la instal·lació del connector descarregat ''{0}''. Anul·lant "
-"la instal·lació. JOSM carregarà la versió antiga del connector."
+"Ha fallat la instal·lació del connector descarregat ''{0}''. Ometent la "
+"instal·lació. JOSM continuarà carregant la versió anterior del connector."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
+"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
+"descarregat. {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Avís: ha fallat la instal·lació del connector ''{0}'' a partir del fitxer "
-"temporal descarregat ''{1}''. Ha fallat l''acció d''anomenar-lo."
+"Ha fallat la instal·lació del connector ''{0}'' del fitxer temporal ''{1}'' "
+"descarregat. Ha fallat el canvi de nom."
msgid "Click to disable the plugin ''{0}''"
msgstr "Feu clic per deshabilitar el connector ''{0}''"
@@ -13395,8 +13770,8 @@ msgid ""
"The plugin has been removed from the configuration. Please restart JOSM to "
"unload the plugin."
msgstr ""
-"El connector ha estat suprimit de la configuració. Si us plau, reinicieu "
-"JOSM per tal de carregar el connector."
+"El connector ha estat suprimit de la configuració. Per favor, reinicieu JOSM "
+"per tal de carregar el connector."
msgid "Plugin information"
msgstr "Informació del connector"
@@ -13408,11 +13783,11 @@ msgid ""
"Do not ask again and remember my decision (go to Preferences->Plugins to "
"change it later)"
msgstr ""
-"Recorda la meva decisió i no tornar a preguntar (es podrà modificar a "
+"Recorda la meua decisió i no tornar a preguntar (es podrà modificar a "
"Preferències -> Connectors)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Fitxer jar ''{0}'' no vàlid"
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "El fitxer del connector ''{0}'' no inclou un Manifest."
@@ -13447,10 +13822,10 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr "S''està processant el fitxer ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Avís: Ha fallat la cerca d''informació del connector al fitxer ''{0}''."
+"Ha fallat l''escaneig del fitxer ''{0}'' per la informació del connector. "
+"Ometent."
msgid "Processing plugin site cache icon files..."
msgstr ""
@@ -13466,12 +13841,28 @@ msgstr "Descarregada la llista de connectors..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Descarregant la llista de connectors de ''{0}''"
+msgid "Plugin list download error"
+msgstr "Error a la descàrrega de la llista de connectors"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM no ha aconseguit descarregar la llista de connectors:"
+
+msgid "Details:"
+msgstr "Detalls:"
+
+msgid "Plugin icons download error"
+msgstr "Error en la descàrrega de les icones dels connectos"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM no ha aconseguit descarregar les icones dels connectors:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Avís: ha fallat la creació el directori del connector ''{0}''. No ha estat "
-"possible de posar a la memòria cau la llista de connectors del lloc ''{1}''"
+"Ha fallat la creació del directori dels connectors ''{0}''. Ha estat "
+"impossible d''inserir a la memòria cau la llista de connectors del lloc "
+"''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Escrivint la llista de connectors a la memòria cau local ''{0}''"
@@ -13502,7 +13893,7 @@ msgid "Unexpected Exception"
msgstr "Excepció no esperada"
msgid "Do nothing"
-msgstr "No facis res"
+msgstr "No faces res"
msgid "Report Bug"
msgstr "Informa d''un error"
@@ -13513,32 +13904,32 @@ msgid ""
"file a bug report."
msgstr ""
"Ha hagut una excepció no esperada.<br>Això sempre és a causa d''un error al "
-"codi del programa. Si esteu utilitzant<br>la darrera versió de JOSM, si us "
+"codi del programa. Si esteu utilitzant<br>la darrera versió de JOSM, si vos "
"plau, considereu l''opció d''omplir un informe d''error."
msgid "Suppress further error dialogs for this session."
-msgstr "No tornar a mostrar la finestra d''error durant aquesta sessió."
+msgstr "No tornar a mostrar la finestra d''error durant esta sessió."
msgid ""
"You have encountered an error in JOSM. Before you file a bug report make "
"sure you have updated to the latest version of JOSM here:"
msgstr ""
"Heu trobat un error a JOSM. Abans d''emplenar el formulari per reportar "
-"l''error assegureu-vos que heu actualitzat JOSM a la darrera versió aquí:"
+"l''error assegureu-vos que heu actualitzat JOSM a la darrera versió ací:"
msgid ""
"You should also update your plugins. If neither of those help please file a "
"bug report in our bugtracker using this link:"
msgstr ""
"Hauríeu d''actualitzar també els vostres connectors. Si el problema "
-"persisteix, si us plau, ompliu un informe d''error al nostre lloc web:"
+"persisteix, per favor, ompliu un informe d''error al nostre lloc web:"
msgid ""
"There the error information provided below should already be filled in for "
"you. Please include information on how to reproduce the error and try to "
"supply as much detail as possible."
msgstr ""
-"La informació sobre el problema que hi ha a sota ja ha estat inclosa. Si us "
+"La informació sobre el problema que hi ha a sota ja ha estat inclosa. Si vos "
"plau, afegiu informació sobre la manera de reproduir el problema i aporteu "
"el màxim possible de detalls."
@@ -13547,7 +13938,7 @@ msgid ""
"information below at this URL:"
msgstr ""
"Alternativament, si no funciona, podeu omplir manualment la informació en "
-"aquesta adreça URL:"
+"esta adreça URL:"
msgid "(The text has already been copied to your clipboard.)"
msgstr "(El text ja ha estat copiat al vostre portaretalls.)"
@@ -13571,7 +13962,7 @@ msgid ""
msgstr ""
"<html>Ha fallat l''autenticació al servidor OSM ''{0}''.<br>Esteu utilitzant "
"OAuth per autenticar-vos però no hi ha un<br>testimoni d''autenticació OAuth "
-"configurat.<br>Si us plau, obriu la finestra de preferències i genereu o "
+"configurat.<br>Per favor, obriu la finestra de preferències i genereu o "
"introduïu-ne un.</html>"
msgid ""
@@ -13583,12 +13974,12 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. "
-"Aquest node encara està referenciat pel node {1}.<br>Si us plau, carregeu el "
-"node, suprimiu la referència i carregeu les dades un altre cop."
+"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. Este "
+"node encara està referenciat pel node {1}.<br>Per favor, carregeu el node, "
+"suprimiu la referència i carregeu les dades un altre cop."
msgstr[1] ""
"<strong>Ha fallat</strong> la supressió <strong> dels nodes {0}</strong>. "
-"Aquests nodes encara es troben referenciats pels nodes {1}.<br>Si us plau, "
+"Estos nodes encara es troben referenciats pels nodes {1}.<br>Per favor, "
"carregeu els nodes, suprimiu les referències i carregeu les dades un altre "
"cop."
@@ -13601,12 +13992,12 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. "
-"Aquest node encara es troba referenciat per la via {1}.<br>Si us plau, "
-"carregeu la via, suprimiu la referència i carregeu les dades un altre cop."
+"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. Este "
+"node encara es troba referenciat per la via {1}.<br>Per favor, carregeu la "
+"via, suprimiu la referència i carregeu les dades un altre cop."
msgstr[1] ""
"<strong>Ha fallat</strong> la supressió <strong> dels nodes {0}</strong>. "
-"Aquest node encara es troba referenciat per les vies {1}.<br>Si us plau, "
+"Este node encara es troba referenciat per les vies {1}.<br>Per favor, "
"carregeu les vies, suprimiu les referències i carregeu les dades un altre "
"cop."
@@ -13619,15 +14010,14 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the node, and upload again."
msgstr[0] ""
-"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. "
-"Aquest node encara es troba referenciat per la relació {1}.<br>Si us plau, "
-"carregeu la relació, suprimiu la referència i carregeu les dades un altre "
-"cop."
+"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. Este "
+"node encara es troba referenciat per la relació {1}.<br>Per favor, carregeu "
+"la relació, suprimiu la referència i carregeu les dades un altre cop."
msgstr[1] ""
-"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. "
-"Aquest node encara es troba referenciat per les relacions {1}.<br>Si us "
-"plau, carregeu les relacins, suprimiu les referències i carregeu les dades "
-"un altre cop."
+"<strong>Ha fallat</strong> la supressió <strong> del node {0}</strong>. Este "
+"node encara es troba referenciat per les relacions {1}.<br>Si vos plau, "
+"carregeu les relacins, suprimiu les referències i carregeu les dades un "
+"altre cop."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -13639,12 +14029,12 @@ msgid_plural ""
"the way, and upload again."
msgstr[0] ""
"<strong>Ha fallat</strong> la supressió <strong> de la via {0}</strong>. "
-"Aquesta via encara es troba referenciada pel node {1}.<br>Si us plau, "
-"carregeu el node, suprimiu la referència i carregeu les dades un altre cop."
+"Esta via encara es troba referenciada pel node {1}.<br>Per favor, carregeu "
+"el node, suprimiu la referència i carregeu les dades un altre cop."
msgstr[1] ""
"<strong>Ha fallat</strong> la supressió <strong> de la via {0}</strong>. "
-"Aquesta via encara es troba referenciada pels nodes {1}.<br>Si us plau, "
-"carregeu els nodes, suprimiu la referència i carregeu les dades un altre cop."
+"Esta via encara es troba referenciada pels nodes {1}.<br>Per favor, carregeu "
+"els nodes, suprimiu la referència i carregeu les dades un altre cop."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -13656,11 +14046,11 @@ msgid_plural ""
"the way, and upload again."
msgstr[0] ""
"<strong>Ha fallat</strong> la supressió <strong> de la via {0}</strong>. "
-"Aquesta via encara es troba referenciada per la via {1}.<br>Si us plau, "
-"carregeu la via, suprimiu la referència i carregeu les dades un altre cop."
+"Esta via encara es troba referenciada per la via {1}.<br>Per favor, carregeu "
+"la via, suprimiu la referència i carregeu les dades un altre cop."
msgstr[1] ""
"<strong>Ha fallat</strong> la supressió <strong> de la via {0}</strong>. "
-"Aquesta via encara es troba referenciada per les vies {1}.<br>Si us plau, "
+"Esta via encara es troba referenciada per les vies {1}.<br>Per favor, "
"carregeu la via, suprimiu les referènces i carregeu les dades un altre cop."
msgid ""
@@ -13672,15 +14062,14 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the way, and upload again."
msgstr[0] ""
-"<strong>Ha fallat</strong> la supressió <strong>de la via {0}</strong>. "
-"Aquesta via encara es troba referenciada per la relació {1}.<br>Si us plau, "
-"carregueu la relació, surpimiu la referència i carregueu les dades un altre "
-"cop."
+"<strong>Ha fallat</strong> la supressió <strong>de la via {0}</strong>. Esta "
+"via encara es troba referenciada per la relació {1}.<br>Per favor, carregueu "
+"la relació, surpimiu la referència i carregueu les dades un altre cop."
msgstr[1] ""
-"<strong>Ha fallat</strong> la supressió <strong>de la via {0}</strong>. "
-"Aquesta via encara es troba referenciada per les relacions {1}.<br>Si us "
-"plau, carregueu les relacions, surpimiu la referència i carregueu les dades "
-"un altre cop."
+"<strong>Ha fallat</strong> la supressió <strong>de la via {0}</strong>. Esta "
+"via encara es troba referenciada per les relacions {1}.<br>Si vos plau, "
+"carregueu les relacions, surpimiu la referència i carregueu les dades un "
+"altre cop."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -13692,11 +14081,11 @@ msgid_plural ""
"the relation, and upload again."
msgstr[0] ""
"<strong>Ha fallat</strong> la supressió <strong>de la relació {0}</strong>. "
-"Aquesta relació encara es troba referenciada pel node {1}.<br>Si us plau, "
+"Esta relació encara es troba referenciada pel node {1}.<br>Per favor, "
"carregueu el node, suprimiu la referència i carregeu les dades un altre cop."
msgstr[1] ""
"<strong>Ha fallat</strong> la supressió <strong>de la relació {0}</strong>. "
-"Aquesta relació encara es troba referenciada pels nodes {1}.<br>Si us plau, "
+"Esta relació encara es troba referenciada pels nodes {1}.<br>Per favor, "
"carregueu els nodes, suprimiu la referència i carregeu les dades un altre "
"cop."
@@ -13710,13 +14099,12 @@ msgid_plural ""
"the relation, and upload again."
msgstr[0] ""
"<strong>Ha fallat</strong> la supressió <strong>de la relació {0}</strong>. "
-"Aquesta relació encara es troba referenciada per la via {1}.<br>Si us plau, "
+"Esta relació encara es troba referenciada per la via {1}.<br>Per favor, "
"carregueu la via, suprimiu la referència i carregeu les dades un altre cop."
msgstr[1] ""
"<strong>Ha fallat</strong> la supressió <strong>de la relació {0}</strong>. "
-"Aquesta relació encara es troba referenciada per les vies {1}.<br>Si us "
-"plau, carregueu les vies, suprimiu la referència i carregeu les dades un "
-"altre cop."
+"Esta relació encara es troba referenciada per les vies {1}.<br>Si vos plau, "
+"carregueu les vies, suprimiu la referència i carregeu les dades un altre cop."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -13728,12 +14116,12 @@ msgid_plural ""
"reference to the relation, and upload again."
msgstr[0] ""
"<strong>Ha fallat</strong> la supressió <strong>de la relació {0}</strong>. "
-"Aquesta relació encara es troba referenciada per la relació {1}.<br>Si us "
+"Esta relació encara es troba referenciada per la relació {1}.<br>Si vos "
"plau, carregueu la relació, suprimiu la referència i carregeu les dades un "
"altre cop."
msgstr[1] ""
"<strong>Ha fallat</strong> la supressió <strong>de la relació {0}</strong>. "
-"Aquesta relació encara es troba referenciada per les relacions {1}.<br>Si us "
+"Esta relació encara es troba referenciada per les relacions {1}.<br>Si vos "
"plau, carregueu les relacions, suprimiu la referència i carregeu les dades "
"un altre cop."
@@ -13752,7 +14140,7 @@ msgid ""
"preferences.</html>"
msgstr ""
"<html>Ha fallat l''autenticació al servidor OSM amb el nom d''usuari "
-"''{0}''.<br>Si us plau, verifiqueu el nom d''usuari i la contrasenya a les "
+"''{0}''.<br>Per favor, verifiqueu el nom d''usuari i la contrasenya a les "
"preferències de JOSM.</html>"
msgid ""
@@ -13761,7 +14149,7 @@ msgid ""
"token.</html>"
msgstr ""
"<html>L''autenticació al servidor OSM amb el testimoni d''autenticació oaUTH "
-"''{0}'' ha fallat.<br>Si us plau, obriu la finestra de preferències i "
+"''{0}'' ha fallat.<br>Per favor, obriu la finestra de preferències i "
"aconseguiu un altre.</html>"
msgid ""
@@ -13782,15 +14170,15 @@ msgid ""
msgstr ""
"<html>Ha fallat l''autorització al servidor OSM anb el testimoni "
"d''autenticació ''{0}''. <br>El testimoni no està autoritzat a accedir al "
-"recurs protegit<br>''{1}''.<br>Si us plau, obriu la finestra de les "
+"recurs protegit<br>''{1}''.<br>Per favor, obriu la finestra de les "
"preferències i obtingueu un altre testimoni d''autenticació OAuth.</html>"
msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
"later.</html>"
msgstr ""
-"<html>La comunicació amb el servidor OSM ''{0}'' no ha estat possible. Si us "
-"plau torneu a intentar-ho més tard.</html>"
+"<html>La comunicació amb el servidor OSM ''{0}'' no ha estat possible. Si "
+"vos plau torneu a intentar-ho més tard.</html>"
msgid "no error message available"
msgstr "no hi ha missatge d''error disponible"
@@ -13874,7 +14262,7 @@ msgid ""
"error.<br>This is most likely a temporary problem. Please try again later."
msgstr ""
"<html>El servidor OSM<br>''{0}''<br>ha informat d''un error intern del "
-"mateix servidor.<br>Això acostuma a ser un problema temporal. Si us plau, "
+"mateix servidor.<br>Això acostuma a ser un problema temporal. Per favor, "
"torneu a intentar-ho més tard."
msgid "The OSM server ''{0}'' reported a bad request.<br>"
@@ -13900,7 +14288,7 @@ msgid ""
msgstr ""
"El servidor OSM ''{0}'' no te coneixement d''un dels objectes<br>que heu "
"intentat llegir, actualitzar o suprimir. L''objecte <br>no existeix al "
-"servidor o esteu utilitzant una URL no vàlida per accedir-hi.<br> Si us "
+"servidor o esteu utilitzant una URL no vàlida per accedir-hi.<br> Si vos "
"plau, comproveu que l''adreça del servidor ''{0}'' no conté errors "
"tipogràfics."
@@ -13910,7 +14298,7 @@ msgid ""
"preferences and your internet connection."
msgstr ""
"<html>Ha fallat l''obertura d''una connexió amb el servidor "
-"remot<br>''{0}''.<br>El nom ''{1}'' no ha pogut ser resolt. <br>Si us plau "
+"remot<br>''{0}''.<br>El nom ''{1}'' no ha pogut ser resolt. <br>Per favor "
"comproveu la URL de l''API a les vostres preferències i la vostra connexió a "
"Internet."
@@ -13921,9 +14309,9 @@ msgid ""
"object.<br><br>The error message is:<br>{0}</html>"
msgstr ""
"<html>El servidor informa que un objecte ha estat suprimit.<br><strong>La "
-"pujada fallarà</strong> en intentar actualitzar o suprimir aquest "
-"objecte.<br> <strong>També fallarà la descàrrega</strong> d''aquest "
-"objecte.<br><br>El missatge d''error és:<br>{0}</html>"
+"pujada fallarà</strong> en intentar actualitzar o suprimir este objecte.<br> "
+"<strong>També fallarà la descàrrega</strong> d''este objecte.<br><br>El "
+"missatge d''error és:<br>{0}</html>"
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -13940,71 +14328,123 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Ha fallat la localització la imatge ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Avís: ha fallat la manipulació del fitxer zip ''{0}''. L''excepció ha estat: "
-"{1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Avís: ha fallat l''accés al directori ''{0}'' per raons de seguretat. "
-"L''excepcióha estat: {1}"
+"Ha fallat la gestió del fitxer zip ''{0}''. L''excepció ha estat: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Avís: ha fallat la derivació al prefix de llegua per la wiki des del codi "
-"local de JOSM ''{0}''. Utilitzant el codi predeterminat ''en''."
+"Ha fallat l''accés al directori ''{0}'' per raons de seguretat. L''excepció "
+"ha estat: {1}"
msgid "{0}... [please type its number]"
-msgstr "{0}... [si us plau escriviu el nombre]"
+msgstr "{0}... [per favor escriviu el nombre]"
msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgstr ""
-"Ha fallat l''obertura de la URL. No hi ha una plataforma establerta. Si us "
+"Ha fallat l''obertura de la URL. No hi ha una plataforma establerta. Si vos "
"plau, establiu-ne una primer."
+msgid "Opening URL: {0}"
+msgstr "Obrint la URL: {0}"
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr "reservat"
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "Conflicte de drecera: ''{0}'' ha estat mogut per ''{1}'' a ''{2}''."
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
msgstr[0] ""
+"Ha estat trobat {0} etiqueta a la memòria intermèdia, això és sospitós!"
msgstr[1] ""
+"Han estat trobades {0} etiquetes a la memòria intermèdia, això és sospitós!"
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "La clau és massa llarga (màx {0} caràcters):"
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "Hi ha caràcters sospitosos a la clau"
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "El valor és massa llarg (màx. {0} caràcters):"
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Voleu apegar estes etiquetes?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Neteja la memòria intermèdia"
msgid "Ignore warnings"
-msgstr ""
+msgstr "Ignora els avisos"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
+"<html><p> Ho sentim, No és possible d''apegar etiquetes de la memòria "
+"intermèdia perquè no conté cap objecte JOSM ni cap text apropiat. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Clic amb el botó dret = copiar al portaretalls"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14061,7 +14501,7 @@ msgid ""
"context"
msgstr ""
"Error a la posició {0} de l''expressió de cerca - l''operador NOT (-) no pot "
-"ser utilitzat en aquest context"
+"ser utilitzat en este context"
msgid ""
"Error in search expression on position {0} - expression must return "
@@ -14096,7 +14536,7 @@ msgid "Database offline for maintenance"
msgstr "La base de dades és fora de línia per manteniment"
msgid "You have downloaded too much data. Please try again later."
-msgstr "Heu descarregat massa dades. Si us plau, proveu més tard."
+msgstr "Heu descarregat massa dades. Per favor, proveu més tard."
msgid ""
"The maximum bbox size is 0.25, and your request was too large. Either "
@@ -14110,7 +14550,7 @@ msgstr "Entrada a JOSM-Trac a josm.openstreetmap.de"
msgid "could not get audio input stream from input URL"
msgstr ""
-"no es pot obtenir un flux d''entrada d''àudio a partir de la URL d''entrada"
+"no es pot obtindre un flux d''entrada d''àudio a partir de la URL d''entrada"
msgid "Audio Device Unavailable"
msgstr "Dispositiu d''àudio fora de l''abast"
@@ -14293,10 +14733,10 @@ msgid "New Folder"
msgstr "Carpeta nova"
msgid "Open selected file"
-msgstr "Obre el fitxer seleccionat"
+msgstr "Obri el fitxer seleccionat"
msgid "Open selected file."
-msgstr "Obre el fitxer seleccionat."
+msgstr "Obri el fitxer seleccionat."
msgid "Refresh"
msgstr "Actualitza"
@@ -14308,13 +14748,13 @@ msgid "Rename file \"{0}\" to"
msgstr "Canvia el nom del fitxer \"{0}\" a"
msgid "Save in:"
-msgstr "Desa a:"
+msgstr "Guarda a:"
msgid "Save In:"
-msgstr "Desa a:"
+msgstr "Guarda a:"
msgid "Save selected file."
-msgstr "Desa el fitxer seleccionat."
+msgstr "Guarda el fitxer seleccionat."
msgid "Selection:"
msgstr "Selecció:"
@@ -14347,12 +14787,19 @@ msgid "GTK Color Chooser"
msgstr "Selector de color del KDE"
msgid "Red:"
-msgstr "Vermell:"
+msgstr "Roig:"
msgid "Saturation:"
msgstr "Saturació:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permet modificar la informació del trànsit i exportar-la al simulador de "
+"mobilitat urbana SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14371,7 +14818,7 @@ msgid "Tools for drawing buildings."
msgstr "Eines per dibuixar edificis."
msgid "A special handler for the French land registry WMS server."
-msgstr "Una eina especial per manegar el servidor WMS del cadastre francès."
+msgstr "Una eina especial per manegar el servidor WMS del cadastre francés."
msgid ""
"Overlays the canvec tile grid on the map and prints URL''s to the .zip "
@@ -14387,6 +14834,10 @@ msgid ""
"white background with matching colors for better visibility in bright "
"sunlight. See dialog in display preferences."
msgstr ""
+"Permet a l''usuari de crear diferents combinacions de color i commutar entre "
+"elles. Simplement modifiqueu els colors i creeu una nova combinació. Es pot "
+"passar a un fons blanc amb els colors corresponents per a una millor "
+"visibilitat amb llum solar. Consulteu la finestra de preferències."
msgid ""
"Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
@@ -14399,9 +14850,8 @@ msgid ""
"Implements a command line and enables to create your commands. See link for "
"standard commands (arc, circle etc.)"
msgstr ""
-"Implementa una línia d''ordres i habilita la creació de les vostres pròpies "
-"ordres. Utilitzeu l''enllaç per veure les ordres estàndard (arc, cercle, "
-"etc.)"
+"Implementa una línia d''ordes i habilita la creació de les vostres pròpies "
+"ordes. Utilitzeu l''enllaç per veure les ordes estàndard (arc, cercle, etc.)"
msgid "Create a grid of ways."
msgstr "Crea una graella de vies."
@@ -14420,7 +14870,7 @@ msgid ""
"This plugin directly upload GPS Traces from current active layer in JOSM to "
"openstreetmap.org."
msgstr ""
-"Aquest connector puja tracks GPS directament des de la capa activa de JOSM "
+"Este connector puja tracks GPS directament des de la capa activa de JOSM "
"vers openstreetmap.org."
msgid "Downloads OSM data along a way"
@@ -14438,7 +14888,7 @@ msgstr ""
"Mostra el perfil vertical i d''altres dades estadístiques d''un track GPX."
msgid "Handling of French EPCIs (boundary=local_authority)"
-msgstr "Manega l''EPCIs francès (boundary=local_authority)"
+msgstr "Manega l''EPCIs francés (boundary=local_authority)"
msgid "Use external scripts in JOSM"
msgstr "Utilitza scripts externs a JOSM"
@@ -14451,6 +14901,12 @@ msgstr ""
"Cerca i correcció d''adreces (carrers) incorrectes de manera senzilla."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Parleu amb els usuaris que fan modificacions del mapa a prop vostre, sereu "
+"avisats quan algú tanque la seua sessió."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14465,7 +14921,7 @@ msgstr "Descarrega punts GPS de Globalsat dg100 directament a JOSM."
msgid ""
"Analyse a set of GPS points to obtain its centre and direction of spread."
msgstr ""
-"Analitza un conjunt de punts GPS per tal d''obtenir el seu centre i la seva "
+"Analitza un conjunt de punts GPS per tal d''obtindre el seu centre i la seua "
"direcció"
msgid "Allows to filter out unnecessary GPS tracks"
@@ -14488,12 +14944,14 @@ msgstr ""
"amb un botó."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Estil d''ajustament de la imatgeria WMSPlugin"
+msgstr "Mode de mapa d''ajustament de la imatgeria en estil WMSPlugin"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
"not in huge cache directories"
msgstr ""
+"Este connector experimental permet al JOSM emmagatzemar les tessel·les en "
+"fitxers de bases de dades, no en immensos directoris"
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14514,7 +14972,7 @@ msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
-"Mostra informacó addicional sobre els objectes de la capa actual - en aquest "
+"Mostra informacó addicional sobre els objectes de la capa actual - en este "
"moment informació sobre els punts del track GPX"
msgid "A helper for IRS satellite adjustment."
@@ -14551,14 +15009,14 @@ msgid ""
msgstr ""
"Proveeix la llibreria Log4j per ser utilitzada per d''altres connectors de "
"JOSM. Això significa que serà instal·lat com a dependència pels connectors "
-"que ho requereixin i no directament pels usuaris."
+"que ho requerisquen i no directament pels usuaris."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
"create, close,invalidate, re-open and comment bug reports by using this "
"plugin."
msgstr ""
-"El connector MapDust mostra sobre el mapa la ubicació d''errors. Amb aquest "
+"El connector MapDust mostra sobre el mapa la ubicació d''errors. Amb este "
"connector podreu crear, tancar, invalidar, reobrir i comentar els errors "
"reportats que es mostren."
@@ -14575,14 +15033,11 @@ msgid "Merge overlapping part of ways."
msgstr "Fusiona les parts de les vies que se superposen"
msgid "Adds no left turn for sets of 4 or 5 ways"
-msgstr "Afegeix una prohibició de gir a l''esquerra a conjunts de 4 o 5 vies"
+msgstr "Afig una prohibició de gir a l''esquerra a conjunts de 4 o 5 vies"
msgid "Simplifies download from different read-only APIs."
msgstr "Simplifica la descàrrega de diferents APIs de només lectura"
-msgid "Simply convert an area to a multipolygon."
-msgstr "Converteix un àrea en un multipolígon de manera simple"
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Permet l''assignació d''etiquetes a tots els objectes d''una àrea "
@@ -14611,8 +15066,8 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
-"Dehabilita la utilització de JOSM per sempre (AVÍS: aquest connector evita "
-"que JOSM es carregui i és difícil de treure''l un cop instal·lat)"
+"Dehabilita la utilització de JOSM per sempre (AVÍS: este connector evita que "
+"JOSM es carregui i és difícil de traure''l un cop instal·lat)"
msgid "Convert data from Open Data portals to OSM layer"
msgstr "Converteix dades dels portals Open Data ver una capa OSM"
@@ -14651,40 +15106,40 @@ msgid ""
"Write gps position info to the image file header. Run this feature from the "
"right click menu of the image layer."
msgstr ""
-"Escriu la posició gps a la capçalera de la imatge. Utilitzeu aquesta opció "
-"fent clic amb el botó dret sobre el menú de la capa de la imatge."
+"Escriu la posició gps a la capçalera de la imatge. Utilitzeu esta opció fent "
+"clic amb el botó dret sobre el menú de la capa de la imatge."
+
+msgid "Make photos movable and position them on the map."
+msgstr ""
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
msgstr ""
-"Aquest connector permet mostrar qualsevol imatge com a fons a l''editor i "
+"Este connector permet mostrar qualsevol imatge com a fons a l''editor i "
"aliniar-la amb el mapa."
msgid "The great JGoodies Plastic Look and Feel."
msgstr "La configuració d''aspecte i comportament de JGoodies Plastic"
msgid "Read and write osmosis poly filter files"
-msgstr "Llegeix i escriu fitxers de polifiltres osmosis"
+msgstr "Llig i escriu fitxers de polifiltres osmosis"
msgid "Adds map printing to JOSM"
-msgstr "Afegeix capacitats d''impresió de mapes a JOSM"
+msgstr "Afig capacitats d''impresió de mapes a JOSM"
msgid "adds projections from Proj4J"
-msgstr "Afegeix projeccions des de Proj4J"
+msgstr "Afig projeccions des de Proj4J"
msgid ""
"This plugin simplifies the mapping and editing of public transport routes."
msgstr ""
-"Aquest connector simplifica el procés d''afegir i modificar rutes de "
-"transport públic al mapa."
+"Este connector simplifica el procés d''afegir i modificar rutes de transport "
+"públic al mapa."
msgid "Relation and multipolygon creating and editing panel."
msgstr "Tauler de creació i modificació de relacions i multipolígons"
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Afegeix l''opció de reiniciar al menú de JOSM."
-
msgid "Plugin for reverting changesets"
msgstr "Connector per desfer conjunts de canvis"
@@ -14706,7 +15161,7 @@ msgstr ""
"de ser definits al fitxer routes.xml al directori del connector"
msgid "Provides routing capabilities."
-msgstr "Afegeix capacitat de generar rutes."
+msgstr "Afig capacitat de generar rutes."
msgid "Loads data from SDS"
msgstr "Carrega dades de SDS"
@@ -14718,9 +15173,6 @@ msgstr ""
"Simplifica àrees suprimint els nodes amb angles molt obtusos. Això pot ser "
"limitat indicant un màxim per l''àrea a suprimir."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Crea i modifica cartes marines per OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Modifica funcions per OpenSeaMap"
@@ -14734,19 +15186,19 @@ msgid ""
"Launch browser to a Web resource about a selected object having known tags, "
"such as Wikipedia"
msgstr ""
-"Obre un navegador amb un recurs web sobre unobjecte seleccionat amb una "
+"Obri un navegador amb un recurs web sobre unobjecte seleccionat amb una "
"etiqueta coneguda, com la Viquipèdia"
msgid "Provides a dialog for editing tags in a tabular grid."
msgstr ""
-"Obre una finestra per modificar etiquetes a una taula en forma de graella."
+"Obri una finestra per modificar etiquetes a una taula en forma de graella."
msgid ""
"Adds a tagging preset tester to the help menu, which helps you developing of "
"tagging presets (quick preview of the dialog that will popup). You can start "
"the jar-file as standalone as well."
msgstr ""
-"Afegeix un verificador d''etiquetes preconfigurades al menú d''ajuda, amb "
+"Afig un verificador d''etiquetes preconfigurades al menú d''ajuda, amb "
"l''objectiu d''ajudar-vos en el desenvolupament d''etiquetes preconfigurades "
"(vista prèvia ràpida en una finestra emergent). També podeu iniciar el "
"fitxer jar manualment de manera independent."
@@ -14758,14 +15210,23 @@ msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
"Activate by holding T and slip map with left mouse button"
msgstr ""
+"Forneix la possibilitat d''utilitzar tecles auxiliars per a permetre la "
+"utilització de dispositius com l''stylus, sense equivalent al botó dret del "
+"ratolí. La simulació es fa prement la tecla T i mantenint activat "
+"l''equivalent al botó esquerre del ratolí."
msgid ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
"to be running."
msgstr ""
-"Dibuixa edificis a partir del mapa del cadastre txec. Requereix tenir "
+"Dibuixa edificis a partir del mapa del cadastre txec. Requereix tindre "
"TracerServer (.NET o Mono) funcionant."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Connector per signar digitalment dades OSM"
@@ -14779,14 +15240,14 @@ msgid ""
"The turnrestrictions plugin allows to enter maintain information about turn "
"restrictions in the OpenStreetMap database."
msgstr ""
-"El connector de prohibicions de gir permet afegir i mantenir informació "
+"El connector de prohibicions de gir permet afegir i mantindre informació "
"sobre prohibicions de gir a la base de dades d''OpenStreetMap."
msgid "Allows undeleting object from OSM database"
msgstr "Permet recuperar objectes esborrats de la base de dades d''OSM"
msgid "Several utilities that make your life easier."
-msgstr "Vàries utilitats per fer-vos més fàcil la vostra feina."
+msgstr "Vàries utilitats per fer-vos més fàcil la vostra faena."
msgid ""
"(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -14801,8 +15262,8 @@ msgid ""
"plugin is still under early development and may be buggy."
msgstr ""
"Suporta la descàrrega de walking-papers.org de tessel·les de mapes "
-"escanejats. Aquest connnector és encara en un estadi inicial de "
-"desenvolupament i pot tenir errors."
+"escanejats. Este connnector és encara en un estadi inicial de "
+"desenvolupament i pot tindre errors."
msgid "Easy downloading along a long set of interconnected ways"
msgstr ""
@@ -14823,9 +15284,6 @@ msgid ""
"behind."
msgstr "Condueix un cotxe de carreres del punt A al B sobre imatge aèries"
-msgid "Highways"
-msgstr "Vies"
-
msgid "Streets"
msgstr "Carrers"
@@ -14910,6 +15368,9 @@ msgstr "Terraplè"
msgid "Lit"
msgstr "Llum"
+msgid "Toll"
+msgstr "Peatge"
+
msgid "Motorway Link"
msgstr "Enllaç d''autopista"
@@ -15000,14 +15461,58 @@ msgstr "Carrer"
msgid "Edit Residential Street"
msgstr "Edita carrer"
-msgid "Living Street"
-msgstr "Zona Residencial (20)"
+msgid "Bicycle Road"
+msgstr "Carrer per bicicletes"
-msgid "Edit Living Street"
-msgstr "Edita zona residencial (20)"
+msgid "Edit Bicycle Road"
+msgstr "Modifica carrer per bicicletes"
-msgid "Pedestrian"
-msgstr "Carrer per vianants"
+msgid "Highway type"
+msgstr "Tipus de carretera"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "residencial"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "via de servei"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "sense classificació"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "camí"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "carril bici"
+
+msgid "Vehicle access"
+msgstr "Accés de vehicles"
+
+msgid "yes"
+msgstr "sí"
+
+msgid "no"
+msgstr "no"
+
+msgid "destination"
+msgstr "destinació"
+
+msgid "Oneway for bicycle"
+msgstr "Sentit únic per bicicletes"
+
+msgid "Living Street"
+msgstr "Zona Residencial (20)"
+
+msgid "Edit Living Street"
+msgstr "Edita zona residencial (20)"
+
+msgid "Pedestrian"
+msgstr "Carrer per vianants"
msgid "Edit Pedestrian Street"
msgstr "Edita carrer per vianants"
@@ -15018,10 +15523,10 @@ msgstr "Àrea"
msgid "Service"
msgstr "Via de servei"
-msgid "Edit Serviceway"
-msgstr "Modificar via de servei"
+msgid "Edit Service Way"
+msgstr "Modifica Service Way"
-msgid "Serviceway type"
+msgid "Service way type"
msgstr "Tipus de via de servei"
msgid "alley"
@@ -15033,6 +15538,9 @@ msgstr "entrada de vehicles"
msgid "parking_aisle"
msgstr "via d''aparcament"
+msgid "drive-through"
+msgstr "accés a servei amb cotxe (drive-through)"
+
msgid "Parking Aisle"
msgstr "Via d''aparcament"
@@ -15060,20 +15568,14 @@ msgstr "rotonda"
msgid "jughandle"
msgstr "desviament"
-msgid "yes"
-msgstr "sí"
-
msgid "Road Restrictions"
msgstr "Restriccions a la via"
msgid "Edit Road Restrictions"
msgstr "Edita les restriccions a la via"
-msgid "Toll"
-msgstr "Peatge"
-
msgid "No exit (cul-de-sac)"
-msgstr "Sense sortida (cul de sac)"
+msgstr "Sense eixida (cul de sac)"
msgid "Transport mode restrictions"
msgstr "Restriccions del mode de transport"
@@ -15081,9 +15583,6 @@ msgstr "Restriccions del mode de transport"
msgid "General Access"
msgstr "Accés general"
-msgid "destination"
-msgstr "destinació"
-
msgid "delivery"
msgstr "lliurament"
@@ -15093,15 +15592,15 @@ msgstr "permissiu"
msgid "private"
msgstr "privat"
+msgid "customers"
+msgstr "clients"
+
msgid "agricultural"
msgstr "agrícola"
msgid "forestry"
msgstr "forestal"
-msgid "no"
-msgstr "no"
-
msgid "official"
msgstr "oficial"
@@ -15147,6 +15646,9 @@ msgstr "Vehicles amb alta ocupació (VAO)"
msgid "Public Service Vehicles (psv)"
msgstr "Vehicles de servei públic (SP)"
+msgid "Tourist buses"
+msgstr "Autobús turístic"
+
msgid "Min. speed (km/h)"
msgstr "Velocitat Min (km/h)"
@@ -15172,7 +15674,7 @@ msgid "both"
msgstr "ambdós"
msgid "forward"
-msgstr "endavant"
+msgstr "avant"
msgid "backward"
msgstr "enrera"
@@ -15231,6 +15733,9 @@ msgstr "Edita Pont"
msgid "viaduct"
msgstr "viaducte"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "giratori"
@@ -15311,7 +15816,7 @@ msgid ""
"jagged rocks"
msgstr ""
"els llocs exposats es poden assegurar amb cordes o cadenes, possible "
-"necessitat d''utilitzar les mans per mantenir l''equilibri. Llocs "
+"necessitat d''utilitzar les mans per mantindre l''equilibri. Llocs "
"parcialment protegits amb risc de caiguda, pedregar, roques dentades sense "
"ruta"
@@ -15349,20 +15854,29 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilitat"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "excel·lent"
+msgstr "exceŀlent"
+msgctxt "trail_visibility"
msgid "good"
-msgstr "bo"
+msgstr "bona"
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "intermedi"
+msgstr "regular"
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "dolent"
+msgstr "dolenta"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "horrible"
+msgstr "pèssima"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "no"
msgid "Wheelchairs"
msgstr "Cadires de rodes"
@@ -15379,11 +15893,11 @@ msgstr "Camí de ferradura"
msgid "Edit Bridleway"
msgstr "Editar camí de ferradura"
-msgid "Cycle Lane"
-msgstr "Carril bici"
+msgid "Cycle Lane/Track"
+msgstr "Carril bici/Pista"
-msgid "Edit Cycle Lane"
-msgstr "Edita carril bici"
+msgid "Edit Cycle Lane or Track"
+msgstr "Modifica carril bici o pista"
msgid "Cycleway"
msgstr "Via ciclista"
@@ -15418,8 +15932,8 @@ msgstr "Via ciclista a la dreta"
msgid "Oneway (bicycle)"
msgstr "Unidireccional (bicicleta)"
-msgid "Edit Highway"
-msgstr "Edita carretera"
+msgid "Edit Highway Attributes:"
+msgstr "Modifica els atributs de la via"
msgid "Highway"
msgstr "Carretera"
@@ -15467,7 +15981,7 @@ msgid "Number"
msgstr "Nombre"
msgid "Exit to"
-msgstr "Surt per"
+msgstr "Ix per"
msgid "Services"
msgstr "Àrea de servei"
@@ -15487,12 +16001,18 @@ msgstr "Àrea de descans"
msgid "Edit Rest Area"
msgstr "Edita Àrea de Descans"
-msgid "Emergency Phone"
-msgstr "Telèfon d''emergència (pal SOS)"
+msgid "Drinking Water"
+msgstr "Aigua potable"
msgid "Traffic Signal"
msgstr "Semàfor"
+msgid "Edit Traffic Signal"
+msgstr "Modifica senyal de trànsit"
+
+msgid "Optional crossing attributes:"
+msgstr "Atributs opcional d''una cruïlla:"
+
msgid "Pedestrian crossing type"
msgstr "Tipus de pas de vianants"
@@ -15500,7 +16020,7 @@ msgid "uncontrolled"
msgstr "sense control"
msgid "traffic_signals"
-msgstr "semafor"
+msgstr "traffic_signals"
msgid "island"
msgstr "illa"
@@ -15508,15 +16028,6 @@ msgstr "illa"
msgid "unmarked"
msgstr "sense marcar"
-msgid "Cross on horseback"
-msgstr "Cruïlla a cavall"
-
-msgid "Cross by bicycle"
-msgstr "Cruïlla amb bicicleta"
-
-msgid "Crossing attendant"
-msgstr "Cruïlla assistida"
-
msgid "Crossing type name (UK)"
msgstr "Nom de Tipus de Cruïlla (Regne Unit)"
@@ -15538,6 +16049,15 @@ msgstr "pegàs"
msgid "tiger"
msgstr "tigre"
+msgid "Crossing attendant"
+msgstr "Cruïlla assistida"
+
+msgid "Cross by bicycle"
+msgstr "Cruïlla amb bicicleta"
+
+msgid "Cross on horseback"
+msgstr "Cruïlla a cavall"
+
msgid "Stop"
msgstr "Stop"
@@ -15547,6 +16067,9 @@ msgstr "Cediu el pas"
msgid "Mini-roundabout"
msgstr "Minirotonda"
+msgid "Edit Mini-Roundabout"
+msgstr "Modifica mini-rotonda"
+
msgid "Direction"
msgstr "Direcció"
@@ -15556,11 +16079,8 @@ msgstr "sentit de les agulles del rellotge"
msgid "Pedestrian Crossing"
msgstr "Pas de vianants"
-msgid "Edit Crossing"
-msgstr "Edita Pas de vianants"
-
-msgid "Type name (UK)"
-msgstr "Introdueix el nom (Regne Unit)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Modifica pas de vianants"
msgid "Traffic Calming"
msgstr "Pacificació del trànsit"
@@ -15592,9 +16112,6 @@ msgstr "taula"
msgid "Passing Place"
msgstr "Lloc de Passants"
-msgid "Edit Passing Place"
-msgstr "Edita Lloc de Passants"
-
msgid "Turning Circle"
msgstr "Cercle de gir"
@@ -15628,20 +16145,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barreres"
+msgid "Block"
+msgstr "Bloc"
+
+msgid "Edit Block"
+msgstr "Edita bloc"
+
+msgid "Allowed traffic:"
+msgstr "Trànsit permés:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
+
msgid "Bollard"
msgstr "Bol·lard"
msgid "Edit Bollard"
-msgstr "Edita Bol·lard"
+msgstr "Modifica bol·lard"
-msgid "Allowed traffic:"
-msgstr "Trànsit permès:"
+msgid "Bollard type"
+msgstr "Tipus de bol·lard"
+
+msgid "rising"
+msgstr "ascendent"
+
+msgid "removable"
+msgstr "suprimible"
+
+msgid "plastic"
+msgstr "plàstic"
msgid "Cycle Barrier"
msgstr "Barrera ciclista"
-msgid "Block"
-msgstr "Bloc"
+msgid "Edit Cycle Barrier"
+msgstr "Modifica barrera per bicicletes"
msgid "Cattle Grid"
msgstr "Barrera canadenc"
@@ -15652,6 +16193,9 @@ msgstr "Edita barrera canadenca"
msgid "Bus Trap"
msgstr "Trampa per cotxes"
+msgid "Edit Bus Trap"
+msgstr "Modifica excavació per deixar passar només autobusos"
+
msgid "Spikes"
msgstr "Puntes"
@@ -15671,46 +16215,90 @@ msgid "Edit Border Control"
msgstr "Edita Duana"
msgid "Hedge"
-msgstr "Arbustos"
+msgstr "Bardissa"
+
+msgid "Edit Hedge"
+msgstr "Modifica bardissa"
+
+msgid "Height (meters)"
+msgstr "Altura (metres)"
+
+msgid "Genus"
+msgstr "Gènere"
+
+msgid "Species"
+msgstr "Espècies"
+
+msgid "Taxon"
+msgstr "Tàxon"
msgid "Fence"
msgstr "Tanca"
+msgid "Edit Fence"
+msgstr "Modifica tanca"
+
msgid "barbed_wire"
msgstr "filferro_espinat"
-msgid "chain"
-msgstr "cadena"
+msgid "chain_link"
+msgstr "tela metàl·lica"
msgid "electric"
msgstr "elèctric"
-msgid "hedge"
-msgstr "arbustos"
-
msgid "pole"
msgstr "pal"
msgid "split_rail"
msgstr "divisió_de_ferrocarril"
+msgid "wire"
+msgstr "fil metàl·lic"
+
+msgid "Guard Rail"
+msgstr "Guarda-rail"
+
+msgid "Edit Guard Rail"
+msgstr "Modifica guarda-rail"
+
msgid "Wall"
msgstr "Mur"
+msgid "Edit Wall"
+msgstr "Edita el mur"
+
msgid "City Wall"
msgstr "Muralla"
+msgid "Edit City Wall"
+msgstr "Modifica muralla"
+
msgid "Retaining Wall"
msgstr "Mur de contenció"
+msgid "Edit Retaining Wall"
+msgstr "Modifica mur de contenció"
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Sèquia"
+msgstr "Rasa"
-msgid "Entrance"
-msgstr "Entrada"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Modifica sèquia"
-msgid "Edit Entrance"
-msgstr "Edita l''entrada"
+msgid "Kerb"
+msgstr "Vorada"
+
+msgid "Edit Kerb"
+msgstr "Modifica vorada"
+
+msgid "Entrance (barrier opening)"
+msgstr "Accés (barrera oberta)"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Modifica accés (barrera oberta)"
msgid "Gate"
msgstr "Porta"
@@ -15732,10 +16320,10 @@ msgstr "Edita portella de malla metàl·lica"
msgid "Bump Gate"
msgstr ""
-"Portella de cop (a finques ramaderes,s''obre sense sortir del vehicle)"
+"Portella de colp (a finques ramaderes,s''obri sense eixir del vehicle)"
msgid "Edit Bump Gate"
-msgstr "Edita portella de cop"
+msgstr "Edita portella de colp"
msgid "Kissing Gate"
msgstr "Portella giratòria"
@@ -15743,12 +16331,27 @@ msgstr "Portella giratòria"
msgid "Edit Kissing Gate"
msgstr "Edita portella giratòria"
+msgid "Chain"
+msgstr "Cadena"
+
+msgid "Edit Chain"
+msgstr "Modifica cadena"
+
msgid "Stile"
msgstr "Escala de pas"
msgid "Edit Stile"
msgstr "Edita escala de pas"
+msgid "ladder"
+msgstr "Pas d''escala"
+
+msgid "squeezer"
+msgstr "pas d''escletxa"
+
+msgid "stepover"
+msgstr "pas de graons"
+
msgid "Turnstile"
msgstr "Torn"
@@ -15806,6 +16409,9 @@ msgstr "Canal de drenatge"
msgid "Edit Drain"
msgstr "Editar canal de drenatge"
+msgid "Ditch"
+msgstr "Sèquia"
+
msgid "Edit Ditch"
msgstr "Edita sèquia"
@@ -15815,6 +16421,12 @@ msgstr "Riera / Torrent"
msgid "Edit Stream"
msgstr "Edita riera / torrent"
+msgid "Wadi"
+msgstr "uadi"
+
+msgid "Edit Wadi"
+msgstr "Modifica uadi"
+
msgid "Canal"
msgstr "Canal"
@@ -15854,9 +16466,6 @@ msgstr "Edita presa"
msgid "Groyne"
msgstr "Espigó"
-msgid "Edit Groyne"
-msgstr "Edita Espigó"
-
msgid "Breakwater"
msgstr "Escullera"
@@ -15890,6 +16499,21 @@ msgstr "Modificar dipòsit cobert"
msgid "Edit Water"
msgstr "Edita aigua"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Aqüífer"
@@ -15971,20 +16595,25 @@ msgstr "Edita terminal de ferris"
msgid "Cargo"
msgstr "Càrrega"
+msgctxt "cargo"
msgid "passengers"
msgstr "passatgers"
+msgctxt "cargo"
msgid "vehicle"
msgstr "vehicle"
+msgctxt "cargo"
msgid "bicycle"
msgstr "bicicleta"
+msgctxt "cargo"
msgid "hgv"
-msgstr "vehicles pesants"
+msgstr "vehicle per a mercaderies pesants"
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "passatgers;vehicle"
+msgstr "passatgers;vehicles"
msgid "Ferry Route"
msgstr "Ruta de ferri"
@@ -16055,8 +16684,11 @@ msgstr "militar"
msgid "tourism"
msgstr "turisme"
-msgid "Service/Type"
-msgstr "Servei/Tipus"
+msgid "freight"
+msgstr "noli"
+
+msgid "Service type"
+msgstr "Tipus de servei"
msgid "yard"
msgstr "iardes"
@@ -16079,11 +16711,14 @@ msgstr "catenària"
msgid "rail"
msgstr "via fèrria"
-msgid "Voltage"
-msgstr "Tensió"
+msgid "Voltage in Volts (V)"
+msgstr "Voltatge en volts (V)"
-msgid "Frequency (Hz)"
-msgstr "Freqüència (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr "Freqüència en hertz (Hz)"
+
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -16094,9 +16729,6 @@ msgstr "Ferrocarril de via estreta"
msgid "Edit Narrow Gauge Rail"
msgstr "Edita ferrocarril de via estreta"
-msgid "Types"
-msgstr "Tipus"
-
msgid "Monorail"
msgstr "Funicular"
@@ -16139,18 +16771,56 @@ msgstr "Vies en desús"
msgid "Edit Disused Railway"
msgstr "Edita vies en desús"
-msgid "Optional Types"
-msgstr "Tipus opcionals"
-
msgid "Abandoned Rail"
msgstr "Vies abandonades"
+msgid "Edit Abandoned Railway"
+msgstr "Modifica via fèrria abandonada"
+
msgid "Level Crossing"
msgstr "Pas a nivell"
+msgid "Edit Level Crossing"
+msgstr "Modifica pas a nivell"
+
+msgid "Supervised"
+msgstr "Amb vigilància"
+
+msgid "Traffic lights"
+msgstr "Semàfors"
+
+msgid "Sound signals"
+msgstr "Senyals sonors"
+
+msgid "Barrier"
+msgstr "Barrera"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "si"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "no"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "mitja"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "completa"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "doble mitja barrera"
+
msgid "Crossing"
msgstr "Cruïlla"
+msgid "Edit Crossing"
+msgstr "Modifica cruïlla"
+
msgid "Crossing type"
msgstr "Tipus de cruïlla"
@@ -16250,13 +16920,11 @@ msgstr "Catifa màgica"
msgid "Edit Magic Carpet"
msgstr "Edita catifa màgica"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Mercaderies"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Edita mercaderies"
+msgstr "Modifica mercaderies"
msgctxt "aerialway"
msgid "Station"
@@ -16266,13 +16934,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Edita l''estació"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pilona"
+msgstr "Piló"
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Edita Pilona"
+msgstr "Modifica piló"
msgid "Parking"
msgstr "Aparcament"
@@ -16289,12 +16955,12 @@ msgstr "superfície"
msgid "underground"
msgstr "soterrat"
+msgid "rooftop"
+msgstr "terrat"
+
msgid "Access"
msgstr "Accés"
-msgid "customers"
-msgstr "clients"
-
msgid "Park and Ride"
msgstr "Aparcament Dissuasiu (P-R)"
@@ -16322,9 +16988,6 @@ msgstr "Places d''aparcament"
msgid "Edit Parking space"
msgstr "Edita places d''aparcament"
-msgid "rooftop"
-msgstr "terrat"
-
msgid "Capacity"
msgstr "Capacitat"
@@ -16340,20 +17003,36 @@ msgstr "Límit de temps (minuts)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Amb vigilància"
-
msgid "Opening Hours"
msgstr "Horari d''obertura"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Dll-Dv 8:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Dim-Diu 8:00-15:00;Dis 8:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Entrada de l''aparcament"
@@ -16502,6 +17181,9 @@ msgstr "Estació de càrrega"
msgid "Edit Charging Station (for electric cars)"
msgstr "Edita estació de càrrega (cotxes elèctrics)"
+msgid "Voltage"
+msgstr "Tensió"
+
msgid "Amperage"
msgstr "Amperatge"
@@ -16523,6 +17205,12 @@ msgstr "Taller mecànic"
msgid "Edit Car Repair"
msgstr "Edita taller mecànic"
+msgid "Parts"
+msgstr "Parts"
+
+msgid "Edit Car Parts"
+msgstr "Modifica botiga de recanvis d''automòbil"
+
msgid "Tyres"
msgstr "Pneumàtics"
@@ -16550,6 +17238,12 @@ msgstr "Lloguer"
msgid "Edit Car Rental"
msgstr "Edita Lloguer de cotxes"
+msgid "Second hand"
+msgstr "Segona mà"
+
+msgid "only"
+msgstr "només"
+
msgid "Sharing"
msgstr "Compartició"
@@ -16574,22 +17268,6 @@ msgstr "Serveis:"
msgid "Sale"
msgstr "Venda"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "sí"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "marca"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "utilitzat"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "no"
-
msgid "brand"
msgstr "marca"
@@ -16611,9 +17289,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Parts"
-
msgid "Clothes"
msgstr "Roba"
@@ -16679,8 +17354,8 @@ msgstr "Edita Lloguer de bicicletes"
msgid "Public Transport"
msgstr "Transport públic"
-msgid "Route"
-msgstr "Ruta"
+msgid "Public transport route"
+msgstr "Ruta de transport públic"
msgid "Edit Route"
msgstr "Edita ruta"
@@ -16741,7 +17416,7 @@ msgstr "verd"
msgctxt "color"
msgid "red"
-msgstr "vermell"
+msgstr "roig"
msgctxt "color"
msgid "blue"
@@ -16766,7 +17441,7 @@ msgid "stop position"
msgstr "situació de la parada"
msgid "stop position (exit only)"
-msgstr "situació de la parada (només sortida)"
+msgstr "situació de la parada (només eixida)"
msgid "stop position (entry only)"
msgstr "situació de la parada (només entrada)"
@@ -16775,7 +17450,7 @@ msgid "platform"
msgstr "andana"
msgid "platform (exit only)"
-msgstr "andana (només sortida)"
+msgstr "andana (només eixida)"
msgid "platform (entry only)"
msgstr "andana (només entrada)"
@@ -16810,6 +17485,9 @@ msgstr "Andana"
msgid "Station or amenities"
msgstr "Estació o atractiu"
+msgid "Edit Stop Position"
+msgstr "Modifica la posició de la parada"
+
msgid "Bus"
msgstr "Autobús"
@@ -16840,6 +17518,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Transbordador"
+msgid "Edit Platform"
+msgstr "Modifica andana"
+
msgid "Bench"
msgstr "Banc per seure"
@@ -16852,9 +17533,6 @@ msgstr "Cadira de rodes"
msgid "limited"
msgstr "limitat"
-msgid "only"
-msgstr "només"
-
msgid "Highway platform (legacy)"
msgstr "Andana de carretera (antiga)"
@@ -16864,9 +17542,14 @@ msgstr "Andana de ferrocarril (antiga)"
msgid "funicular"
msgstr "funicular"
+msgctxt "railway"
msgid "Station"
msgstr "Estació"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edita Estació"
+
msgid "Building"
msgstr "Edifici"
@@ -16879,6 +17562,9 @@ msgstr "Edita Boca de metro"
msgid "Ticket Machine"
msgstr "Màquina Expenedora de bitllets"
+msgid "Edit Ticket Machine"
+msgstr "Modifica màquina expenedora de tiquets"
+
msgid "Reference Number"
msgstr "Número de línia"
@@ -16903,14 +17589,6 @@ msgstr "A compte o targetes de fidelització"
msgid "Public Transport (legacy)"
msgstr "Transport públic (antic)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Estació"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Edita Estació"
-
msgid "UIC-Reference"
msgstr "UIC-Referència"
@@ -16959,8 +17637,8 @@ msgstr "Edita andana de l''estació d''autobusos"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Edita parada de Taxis"
+msgid "Edit Taxi Station"
+msgstr "Modifica parada de taxis"
msgid "Airport"
msgstr "Aeroport"
@@ -17013,8 +17691,23 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Edita Terminal"
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
+msgstr "Accés a Internet"
+
+msgid "wlan"
+msgstr "wi-fi"
+
+msgid "wired"
+msgstr "amb cable"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Tarifa d''accés a Internet"
+
+msgctxt "airport"
+msgid "Gate"
msgstr "Porta"
msgid "Edit Terminal Gate"
@@ -17035,21 +17728,6 @@ msgstr "Edita hotel"
msgid "Stars"
msgstr "Estrelles"
-msgid "Internet access"
-msgstr "Accés a Internet"
-
-msgid "wlan"
-msgstr "wi-fi"
-
-msgid "wired"
-msgstr "amb cable"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Tarifa d''accés a Internet"
-
msgid "Smoking"
msgstr "Fumar"
@@ -17162,16 +17840,16 @@ msgid "asian"
msgstr "asiàtic"
msgid "thai"
-msgstr "tailandès"
+msgstr "tailandés"
msgid "mexican"
msgstr "mexicà"
msgid "japanese"
-msgstr "japonès"
+msgstr "japonés"
msgid "french"
-msgstr "francès"
+msgstr "francés"
msgid "sandwich"
msgstr "sandwich"
@@ -17233,14 +17911,20 @@ msgstr "Discoteca"
msgid "Edit Nightclub"
msgstr "Edita Discoteca"
+msgid "Stripclub"
+msgstr "Striptease"
+
+msgid "Edit Stripclub"
+msgstr "Modifica striptease"
+
msgid "Tourism"
msgstr "Turisme"
msgid "Attraction"
-msgstr "Llocs d''interès"
+msgstr "Llocs d''interés"
msgid "Edit Attraction"
-msgstr "Edita lloc d''interès"
+msgstr "Edita lloc d''interés"
msgid "Viewpoint"
msgstr "Mirador"
@@ -17254,9 +17938,15 @@ msgstr "Torre de guaita"
msgid "Information Office"
msgstr "Oficina d''informació"
+msgid "Edit Information Office"
+msgstr "Modifica oficina d''informació"
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr "Modifica mapa informatiu"
+
msgid "Detail Grade"
msgstr "Grau de Detall del mapa"
@@ -17269,6 +17959,9 @@ msgstr "carrer"
msgid "scheme"
msgstr "esquemàtic"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Àrea que es mostra"
@@ -17308,6 +18001,9 @@ msgstr "... altres modes de transport possibles"
msgid "Information Board"
msgstr "Panell informatiu"
+msgid "Edit Information Board"
+msgstr "Modifica tauler informatiu"
+
msgid "Board Content"
msgstr "Contingut del panell"
@@ -17329,23 +18025,35 @@ msgstr "plantes"
msgid "Guidepost"
msgstr "Fita"
+msgid "Edit Guidepost"
+msgstr "Modifica pal indicatiu"
+
msgid "Information Terminal"
msgstr "Terminal d''informació"
+msgid "Edit Information Terminal"
+msgstr "Modifica terminal d''informació"
+
msgid "Closer description"
msgstr "Descripció"
msgid "Audioguide"
msgstr "Audioguia"
+msgid "Edit Audioguide"
+msgstr "Modifica audioguia"
+
msgid "Audioguide via mobile phone?"
msgstr "Audioguia a través del telèfon mòbil?"
msgid "Phone number"
msgstr "Número de telèfon"
-msgid "Other Information Points"
-msgstr "Altres punts d''informació"
+msgid "Other Information Point"
+msgstr "Altres tipus de punts d''informació"
+
+msgid "Edit Information Point"
+msgstr "Modifica punt d''informació"
msgid "Leisure"
msgstr "Oci"
@@ -17368,9 +18076,6 @@ msgstr "Parc per a gossos"
msgid "Edit Dog Park"
msgstr "Edita parc per a gossos"
-msgid "Barrier"
-msgstr "Barrera"
-
msgid "fence"
msgstr "tanca"
@@ -17395,8 +18100,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Edita Sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Dim-Diu 8:00-15:00;Dis 8:00-12:00"
+msgid "Horse riding"
+msgstr "Equitació"
+
+msgid "Edit Horse riding"
+msgstr "Modifica equitació"
+
+msgid "Brothel"
+msgstr "Bordell"
+
+msgid "Edit Brothel"
+msgstr "Modifica bordell"
msgid "Playground"
msgstr "Zona de jocs infantil"
@@ -17468,50 +18182,44 @@ msgstr "Art"
msgid "Edit Artwork"
msgstr "Edita Art"
-msgid "Place of Worship"
-msgstr "Lloc de culte"
-
-msgid "Edit Place of Worship"
-msgstr "Edita Lloc de culte"
-
-msgid "Religion"
-msgstr "Religió"
+msgid "Recording Studio"
+msgstr "Estudi de Gravació"
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr "Edita Estudi de Gravació"
-msgid "buddhist"
-msgstr "budista"
+msgid "audio"
+msgstr "àudio"
-msgid "christian"
-msgstr "cristià"
+msgid "video"
+msgstr "vídeo"
-msgid "hindu"
-msgstr "hindú"
+msgid "Place of Worship"
+msgstr "Lloc de culte"
-msgid "jain"
-msgstr "jainista"
+msgid "Church"
+msgstr "Església"
-msgid "jewish"
-msgstr "jueu"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "musulmà"
+msgid "Building type"
+msgstr "Tipus d''edifici"
-msgid "sikh"
-msgstr "sij"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "espiritualista"
+msgid "cathedral"
+msgstr "catedral"
-msgid "taoist"
-msgstr "taoista"
+msgid "chapel"
+msgstr "capella"
-msgid "unitarian"
-msgstr "unitari"
+msgid "church"
+msgstr "església"
-msgid "zoroastrian"
-msgstr "zoroastrià"
+msgid "temple"
+msgstr "temple"
msgid "Denomination"
msgstr "Denominació"
@@ -17528,6 +18236,12 @@ msgstr "catòlic"
msgid "evangelical"
msgstr "evangèlic"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testimonis_jehovà"
@@ -17540,6 +18254,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormó"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodox"
@@ -17555,38 +18272,141 @@ msgstr "protestant"
msgid "quaker"
msgstr "quàquer"
+msgid "roman_catholic"
+msgstr "Catòlica romana"
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "Horari"
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr "mesquita"
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "shia"
msgid "sunni"
msgstr "sunnita"
-msgid "Service Times"
-msgstr "Horari"
+msgid "Synagogue"
+msgstr ""
-msgid "Su 10:00"
-msgstr "Dg 10:00"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Dg 10:30"
+msgid "synagogue"
+msgstr "sinagoga"
-msgid "Su 11:00"
-msgstr "Dg 11:00"
+msgid "conservative"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Horaris de visita"
+msgid "reform"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Estudi de Gravació"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Edita Estudi de Gravació"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "audio"
-msgstr "àudio"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "vídeo"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religió"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jainista"
+
+msgid "sikh"
+msgstr "sij"
+
+msgid "spiritualist"
+msgstr "espiritualista"
+
+msgid "taoist"
+msgstr "taoista"
+
+msgid "unitarian"
+msgstr "unitari"
+
+msgid "zoroastrian"
+msgstr "zoroastrià"
msgid "Public Building"
msgstr "Edificis Públics"
@@ -17675,6 +18495,12 @@ msgstr "Edita Autoescola"
msgid "License Classes"
msgstr "Tipus de carnet"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Salut"
@@ -17684,6 +18510,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Edita Hospital"
+msgid "Clinic"
+msgstr "Clinica"
+
+msgid "Edit Clinic"
+msgstr "Modifica clínica"
+
msgid "Doctors"
msgstr "CAP - Centre d''Atenció Primària"
@@ -17750,12 +18582,66 @@ msgstr "Veterinari"
msgid "Edit Veterinary"
msgstr "Edita Veterinari"
-msgid "Note"
-msgstr "Nota"
+msgid "Edit Toilets"
+msgstr "Modifica vàters públics"
+
+msgid "Access rights"
+msgstr "Drets d''accés"
+
+msgid "public"
+msgstr "públic"
+
+msgid "seasonal"
+msgstr "estacional"
+
+msgid "flush"
+msgstr "descàrrega"
+
+msgid "pitlatrine"
+msgstr "pou mort"
+
+msgid "chemical"
+msgstr "químic"
+
+msgid "bucket"
+msgstr "fossa sèptica"
+
+msgid "Usage Position"
+msgstr "Posició d''utilització"
+
+msgid "seated"
+msgstr "seient"
+
+msgid "seated;urinal"
+msgstr "seient; urinari"
+
+msgid "squat"
+msgstr "a la gatzoneta"
+
+msgid "urinal"
+msgstr "orinal"
msgid "Post Box"
msgstr "Bústia"
+msgid "Edit Postbox"
+msgstr "Modifica bústia"
+
+msgid "Collection times"
+msgstr "Horari de recollida"
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr "Accés a servei amb cotxe (drive-through)"
+
msgid "Telephone"
msgstr "Telèfon"
@@ -17765,6 +18651,30 @@ msgstr "Edita Telèfon"
msgid "Telephone cards"
msgstr "Targetes telefòniques"
+msgid "Emergency Phone"
+msgstr "Telèfon d''emergència (pal SOS)"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr "Desfibril·lador automàtic"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Modifica desfibril·lador automàtic extern"
+
+msgid "Located inside a building?"
+msgstr "És a dins de l''edifici?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Darrera verificació (AAAA-MM-DD)"
+
+msgid "Last check note"
+msgstr "Darrera nota de verificació"
+
msgid "Clock"
msgstr "Rellotge"
@@ -17774,30 +18684,36 @@ msgstr "Edita rellotge"
msgid "Display"
msgstr "Pantalla"
-msgctxt "display"
msgid "analog"
msgstr "analògic"
-msgctxt "display"
msgid "digital"
msgstr "digital"
-msgctxt "display"
msgid "sundial"
msgstr "rellotge de sol"
-msgctxt "display"
msgid "unorthodox"
msgstr "no ortodox"
msgid "Support"
msgstr "Suport"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "pal"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr "mural"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "cartellera"
+msgstr "tanca publicitària"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "sòl"
msgid "Visibility/readability"
msgstr "Visibilitat/llegibilitat"
@@ -17826,8 +18742,8 @@ msgstr "Mostra la humitat"
msgid "Recycling"
msgstr "Recollida selectiva / Punt Net"
-msgid "Edit Recycling station"
-msgstr "Edita recollida selectiva/ Punt Net"
+msgid "Edit Recycling Station"
+msgstr "Modifica punt de reciclatge. Deixalleria."
msgid "Batteries"
msgstr "Piles"
@@ -17853,27 +18769,15 @@ msgstr "centre"
msgid "Waste Basket"
msgstr "Paperera"
-msgid "Edit Waste Basket"
-msgstr "Edita paperera"
-
msgid "Waste Disposal"
msgstr "Abocador"
-msgid "Edit Waste Disposal"
-msgstr "MOdificar abocador"
+msgid "Edit Bench"
+msgstr "Modifica banc"
msgid "Backrest"
msgstr "respatller"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
-msgid "plastic"
-msgstr "plàstic"
-
msgid "Amount of Seats"
msgstr "Quantitat de seients"
@@ -17908,14 +18812,17 @@ msgstr "Edita Base de caça"
msgid "Height"
msgstr "Alçada"
+msgctxt "height"
msgid "low"
msgstr "baix"
+msgctxt "height"
msgid "half"
-msgstr "mig"
+msgstr "mitja"
+msgctxt "height"
msgid "full"
-msgstr "complet"
+msgstr "alta"
msgid "Hide"
msgstr "Aguait"
@@ -17923,11 +18830,11 @@ msgstr "Aguait"
msgid "Lock"
msgstr "Bloca"
-msgid "Drinking Water"
-msgstr "Aigua potable"
+msgid "Edit Source of Potable Water"
+msgstr "Modifica font d''aigua potable"
-msgid "Edit Drinking Water"
-msgstr "Edita aigua potable"
+msgid "Indoor"
+msgstr "Interior"
msgid "Fire Hydrant"
msgstr "Boca d''incendis"
@@ -17954,6 +18861,9 @@ msgstr "estany"
msgid "Diameter (in mm)"
msgstr "Diàmetre (en mm)"
+msgid "Hydrant Position"
+msgstr "Emplaçament d''hidrant"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "carril"
@@ -17991,117 +18901,153 @@ msgstr "Estadi"
msgid "Edit Stadium"
msgstr "Edita estadi"
-msgid "select sport:"
-msgstr "Selecciona l''esport:"
+msgid "Select sport:"
+msgstr "Seleccioneu esport:"
-msgid "sport"
-msgstr "esport"
+msgid "Sport"
+msgstr "Esport"
+msgctxt "sport"
msgid "multi"
-msgstr "multiplica"
+msgstr "multi"
+msgctxt "sport"
msgid "archery"
msgstr "tir amb arc"
+msgctxt "sport"
msgid "athletics"
msgstr "atletisme"
+msgctxt "sport"
msgid "american_football"
-msgstr "futbol_americà"
+msgstr "futbol americà"
+msgctxt "sport"
msgid "australian_football"
-msgstr "futbol_australià"
+msgstr "futbol australià"
+msgctxt "sport"
msgid "baseball"
msgstr "beisbol"
+msgctxt "sport"
msgid "basketball"
msgstr "bàsquet"
+msgctxt "sport"
msgid "boules"
-msgstr "petanca"
+msgstr "Esport de boles"
+msgctxt "sport"
msgid "bowls"
-msgstr "bitlles"
+msgstr "bowls"
+msgctxt "sport"
msgid "canadian_football"
-msgstr "futbol_canadenc"
+msgstr "futbol canadenc"
+msgctxt "sport"
msgid "canoe"
msgstr "canoa"
+msgctxt "sport"
msgid "climbing"
msgstr "escalada"
+msgctxt "sport"
msgid "cricket"
msgstr "criquet"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "xarxa_criquet"
+msgstr "Xarxa de criquet"
+msgctxt "sport"
msgid "croquet"
msgstr "croquet"
+msgctxt "sport"
msgid "cycling"
msgstr "ciclisme"
+msgctxt "sport"
msgid "dog_racing"
-msgstr "carrera_gossos - canòdrom"
+msgstr "cursa de llebrers"
+msgctxt "sport"
msgid "equestrian"
-msgstr "hípica - hipòdrom"
+msgstr "equitació"
+msgctxt "sport"
msgid "gaelic_games"
msgstr "jocs gaèlics"
+msgctxt "sport"
msgid "golf"
msgstr "golf"
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gimnàstica"
+msgstr "ginnàtica"
+msgctxt "sport"
msgid "hockey"
msgstr "hoquei"
+msgctxt "sport"
msgid "horse_racing"
-msgstr "carrera_cavalls"
+msgstr "cursa de cavalls"
+msgctxt "sport"
msgid "motor"
msgstr "motor"
+msgctxt "sport"
msgid "pelota"
-msgstr "pilota basca/valenciana"
+msgstr "pilota"
+msgctxt "sport"
msgid "racquet"
msgstr "raqueta"
+msgctxt "sport"
msgid "rugby_league"
-msgstr "lliga_rugbi"
+msgstr "rugbi a 13"
+msgctxt "sport"
msgid "rugby_union"
-msgstr "unió_rugbi"
+msgstr "rugbi a 15"
+msgctxt "sport"
msgid "shooting"
msgstr "tir"
+msgctxt "sport"
msgid "skateboard"
msgstr "monopatí"
+msgctxt "sport"
msgid "skating"
msgstr "patinatge"
+msgctxt "sport"
msgid "skiing"
msgstr "esquí"
+msgctxt "sport"
msgid "soccer"
msgstr "futbol"
+msgctxt "sport"
msgid "swimming"
msgstr "natació"
+msgctxt "sport"
msgid "table_tennis"
-msgstr "tennis_taula"
+msgstr "tennis taula"
+msgctxt "sport"
msgid "tennis"
msgstr "tennis"
@@ -18135,33 +19081,43 @@ msgstr "Mini-Golf"
msgid "Edit Miniature Golf"
msgstr "Edita Mini-Golf"
-msgid "Sport"
-msgstr "Esport"
-
msgid "Multi"
msgstr "Multi"
msgid "Edit Multi"
msgstr "Edita Multi"
-msgid "type"
-msgstr "tipus"
-
+msgctxt "running"
msgid "pitch"
msgstr "pista/camp"
+msgctxt "running"
msgid "sports_centre"
-msgstr "centre_esports"
+msgstr "centre esportiu"
+msgctxt "running"
msgid "stadium"
msgstr "estadi"
+msgctxt "running"
+msgid "track"
+msgstr "pista"
+
msgid "9pin"
msgstr "9 forats"
msgid "Edit 9pin"
msgstr "Edita 9 forats"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgid "sports_centre"
+msgstr "centre_esports"
+
+msgid "stadium"
+msgstr "estadi"
+
msgid "10pin"
msgstr "10 forats"
@@ -18195,6 +19151,22 @@ msgstr "Edita Piragüisme"
msgid "Edit Cycling"
msgstr "Edita Ciclisme"
+msgctxt "racing"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "centre esportiu"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "estadi"
+
+msgctxt "racing"
+msgid "track"
+msgstr "pista"
+
msgid "Dog Racing"
msgstr "Canòdrom"
@@ -18207,8 +19179,33 @@ msgstr "Hípica"
msgid "Edit Equestrian"
msgstr "Edita Hípica"
-msgid "horse_riding"
-msgstr "muntar_cavalls"
+msgctxt "riding"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "centre esportiu"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "estadi"
+
+msgctxt "riding"
+msgid "track"
+msgstr "pista"
+
+msgid "clay"
+msgstr "argila"
+
+msgid "dirt"
+msgstr "terra"
+
+msgid "fine_gravel"
+msgstr "grava fina"
+
+msgid "mud"
+msgstr "fangar"
msgid "Horse Racing"
msgstr "Hipòdrom"
@@ -18226,7 +19223,7 @@ msgid "Skating"
msgstr "Patinatge"
msgid "Edit Skating"
-msgstr "Edita patinatge"
+msgstr "Modifica patinatge"
msgid "ice_rink"
msgstr "pista de gel"
@@ -18270,38 +19267,56 @@ msgstr "snow_park"
msgid "Difficulty"
msgstr "Dificultat"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "principiant"
+msgstr "principiants (verda)"
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "fàcil"
+msgstr "fàcil (blava)"
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "intermèdia (roja)"
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "avançat"
+msgstr "difícil (negra)"
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "expert"
+msgstr "experts"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "esquí forapista"
+msgstr "freeride"
msgid "Grooming"
msgstr "màquina trepitjaneu"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "clàssic"
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "bamp"
+msgstr "acrobàtic"
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "patinatge"
+
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "clàssic;patinatge"
+msgstr "clàssic;patinador"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "moto de neu"
+msgstr "motoneu"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "fora_de_pista"
+msgstr "fora pista"
msgid "Shooting"
msgstr "Tir"
@@ -18342,19 +19357,15 @@ msgstr "Jocs Gaèlics"
msgid "Edit Gaelic Games"
msgstr "Modifica jocs gaèlics"
-msgctxt "gaelic game"
msgid "Hurling"
msgstr "Hurling"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Futbol gaèlic"
+msgstr "Futbol"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "Rounders"
@@ -18493,6 +19504,18 @@ msgstr "Aeromodelisme"
msgid "Edit Model Aerodrome"
msgstr "Edita Aeromodelisme"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "pista/camp"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "centre esportiu"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "pista"
+
msgid "RC Car"
msgstr "Pista per a cotxes teledirigits"
@@ -18505,59 +19528,133 @@ msgstr "Construccions"
msgid "Edit Building"
msgstr "Edita Edifici"
+msgctxt "building"
+msgid "yes"
+msgstr "si"
+
+msgctxt "building"
msgid "roof"
-msgstr "sostre"
+msgstr "cobert"
+msgctxt "building"
msgid "garage"
msgstr "garatge"
-msgid "church"
-msgstr "església"
+msgctxt "building"
+msgid "garages"
+msgstr "aparcaments"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+msgctxt "building"
msgid "school"
msgstr "escola"
+msgctxt "building"
msgid "hangar"
msgstr "hangar"
+msgctxt "building"
msgid "commercial"
msgstr "comercial"
+msgctxt "building"
msgid "farm"
msgstr "granja"
+msgctxt "building"
msgid "transportation"
msgstr "transports"
+msgctxt "building"
msgid "greenhouse"
msgstr "hivernacle"
+msgctxt "building"
msgid "office"
msgstr "oficina"
+msgctxt "building"
msgid "university"
msgstr "universitat"
+msgctxt "building"
+msgid "hospital"
+msgstr "hospital"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "magatzem"
+
+msgctxt "building"
+msgid "retail"
+msgstr "comerç al detall"
+
+msgctxt "building"
+msgid "shed"
+msgstr "cobert"
+
msgid "Residential Building"
msgstr "Edifici residencial"
msgid "Edit Residential Building"
msgstr "Edita edifici residencial"
+msgctxt "building"
+msgid "residential"
+msgstr "residencial"
+
+msgctxt "building"
msgid "apartments"
msgstr "apartaments"
+msgctxt "building"
msgid "house"
msgstr "casa"
+msgctxt "building"
msgid "hut"
-msgstr "barraca"
+msgstr "refugi"
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
-msgstr "terrassa"
+msgstr "casa en filera"
+msgctxt "building"
msgid "detached"
-msgstr "separada"
+msgstr "casa unifamiliar"
+
+msgid "Entrance"
+msgstr "Entrada"
+
+msgid "Edit Entrance"
+msgstr "Edita l''entrada"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "si"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "principal"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "servei"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "eixida"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "emergència"
msgid "Tower"
msgstr "Torre"
@@ -18574,9 +19671,6 @@ msgstr "comunicacions"
msgid "observation"
msgstr "observació"
-msgid "Height (meters)"
-msgstr "Altura (metres)"
-
msgid "Flagpole"
msgstr "Pal de bandera"
@@ -18786,42 +19880,68 @@ msgstr "Horari de funcionament"
msgid "Mo-Fr 22:00-05:00"
msgstr "Dll-Dv 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Estació de mesurament"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
+
+msgid "Monitoring:"
+msgstr ""
+
+msgid "Weather"
+msgstr ""
+
+msgid "Water level"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Edita estació de mesurament"
+msgid "Tide Level"
+msgstr ""
-msgid "Measurement"
-msgstr "Mesurament"
+msgid "Traffic"
+msgstr ""
-msgid "particulate_matter"
-msgstr "partícules en suspensió"
+msgid "Air Quality"
+msgstr ""
-msgid "seismic"
-msgstr "sísmic"
+msgid "Noise"
+msgstr ""
-msgid "water_level"
-msgstr "nivell_aigua"
+msgid "GPS Signals"
+msgstr ""
-msgid "weather"
-msgstr "meteo"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "Recording"
-msgstr "Enregistrament"
+msgid "Galileo Signals"
+msgstr ""
-msgid "manually"
-msgstr "manualment"
+msgid "Radiation"
+msgstr ""
-msgid "automated"
-msgstr "automatitzat"
+msgid "Seismic Activity"
+msgstr ""
-msgid "remote"
-msgstr "remot"
+msgid "Recording:"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "no"
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Vèrtex geodèsic"
@@ -18829,8 +19949,8 @@ msgstr "Vèrtex geodèsic"
msgid "Edit Survey Point"
msgstr "Edita vèrtex geodèsic"
-msgid "Surveillance"
-msgstr "Vigilància"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Edita càmera de vigilància"
@@ -18841,12 +19961,102 @@ msgstr "interior"
msgid "outdoor"
msgstr "exterior"
-msgid "public"
-msgstr "públic"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "botiga"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Altura en metres (m)"
msgid "Power"
msgstr "Energia"
+msgid "Power Plant"
+msgstr "Central elèctrica"
+
+msgid "Edit Power Plant"
+msgstr "Modifica central elèctrica"
+
+msgid "Start date"
+msgstr "Data d''inici"
+
+msgid "Output forms of energy"
+msgstr "Formes d'eixida d''energia"
+
+msgid "(please add this information to the generators if possible)"
+msgstr "(per favor, afegiu esta informació pels generadors si és possible)"
+
+msgid "electricity"
+msgstr "electricitat"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "aigua calenta"
+
+msgid "hot air"
+msgstr "aire calent"
+
+msgid "cold water"
+msgstr "aigua freda"
+
+msgid "cold air"
+msgstr "aire fred"
+
+msgid "compressed air"
+msgstr "aire comprimit"
+
+msgid "steam"
+msgstr "de vapor"
+
+msgid "vacuum"
+msgstr "buit"
+
msgid "Power Generator"
msgstr "Generador elèctric"
@@ -18898,101 +20108,221 @@ msgstr "vent"
msgid "Method"
msgstr "Mètode"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "Digestió anaeròbica"
+msgstr "digestió anaeròbica"
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr "presa"
+msgctxt "generator method"
msgid "combustion"
msgstr "combustió"
-msgid "dam"
-msgstr "presa"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "bio / carbó/ gasoli / gas / gasolina / petroli / residus"
+msgctxt "generator method"
msgid "fission"
msgstr "fissió"
+msgctxt "generator method"
msgid "fusion"
msgstr "fusió"
+msgctxt "generator method"
msgid "gasification"
msgstr "gasificació"
-msgid "photovoltaic"
-msgstr "fotovoltaica"
-
-msgid "pumped-storage"
-msgstr "d''emmagatzematge per bombeig"
+msgid "biomass / waste"
+msgstr "biomassa / residus"
-msgid "pumping"
-msgstr "de bombeig"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "fotovoltaic"
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "piròlisi"
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr "central d''aigua fluent"
+msgctxt "generator method"
+msgid "stream"
+msgstr "corrent d''aigua"
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "termal"
+msgstr "tèrmica"
-msgid "Output forms of energy"
-msgstr "Formes de sortida d''energia"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "hidroelèctrica reversible"
-msgid "electricity"
-msgstr "electricitat"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "hidroelèctrica"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Tipus de generador"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr "cicle combinat"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "combustió de gas"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "turbina Francis"
-msgid "hot water"
-msgstr "aigua calenta"
+msgid "gas_turbine"
+msgstr "turbina de gas"
-msgid "hot air"
-msgstr "aire calent"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "biogas, biomassa, gas, combustió de residus"
-msgid "cold water"
-msgstr "aigua freda"
+msgid "heat_pump"
+msgstr "bomba de calor"
-msgid "cold air"
-msgstr "aire fred"
+msgid "horizontal_axis"
+msgstr "d''eix horitzontal"
-msgid "compressed air"
-msgstr "aire comprimit"
+msgid "tidal steam / wind"
+msgstr "mareomotriu / vent"
-msgid "steam"
-msgstr "de vapor"
+msgid "kaplan_turbine"
+msgstr "turbina Kaplan"
-msgid "vacuum"
-msgstr "buit"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+"central d''aigua fluent / central hidroelèctrica / central mareomotriu"
-msgid "battery charging"
-msgstr "càrrega de bateries"
+msgid "pelton_turbine"
+msgstr "turbina Pelton"
-msgid "Power Station"
-msgstr "Central elèctrica"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "central d''aigua fluent / central hidroelèctrica"
-msgid "Edit Power Station"
-msgstr "Edita central elèctrica"
+msgid "reciprocating_engine"
+msgstr "motor d''explosió"
-msgid "Power Sub Station"
-msgstr "Subestació elèctrica"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "biocombustible, biogas, gasoli, gas, benzina"
-msgid "Edit Power Sub Station"
-msgstr "Edita Subestació elèctrica"
+msgid "solar_photovoltaic_panel"
+msgstr "placa solar fotovoltaica"
-msgid "Line reference"
-msgstr "Línia de referència"
+msgid "solar photovoltaic"
+msgstr "solar fotovoltaica"
-msgid "Cable Distribution Cabinet"
-msgstr "Armari de distribució"
+msgid "solar_thermal_collector"
+msgstr "col·lector tèrmic solar"
+
+msgid "solar thermal"
+msgstr "solar tèrmica"
+
+msgid "steam_generator"
+msgstr "generador de vapor"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "bio, carbó, gasoli, gas, benzina, petroli, combustió de residus"
+
+msgid "steam_turbine"
+msgstr "turbina de gas"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"geotèrmica / solar tèrmica / bio, carbó, petroli, combustió de residus"
+
+msgid "stellarator"
+msgstr "reactor estel·lar"
+
+msgid "nuclear fusion"
+msgstr "fusió nuclear"
+
+msgid "tokamak"
+msgstr "tokamak"
+
+msgid "vertical_axis"
+msgstr "d''eix vertical"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "reactor nuclear d''aigua bullent"
+
+msgid "nuclear fission"
+msgstr "fissió nuclear"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Reactor nuclear d''aigua bullint 2 (BWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Reactor nuclear d''aigua bullint 3 (BWR-3)"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Reactor nuclear d''aigua bullint 4 (BWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Reactor nuclear d''aigua bullint 5 (BWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Reactor nuclear d''aigua bullint 6 (BWR-6)"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Reactor CANDU"
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "CPR-1000 (reactor xinés PWR)"
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Reactor europeu pressuritzat"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Fusió en confinament inercial"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Reactor d'aigua pressuritzada (PWR)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Reactor Vodo-Vodyanoi Energetichesky (VVER)"
+
+msgid "Output forms of energy:"
+msgstr "Formes d''energia produïda:"
+
+msgid "Power Sub Station"
+msgstr "Subestació elèctrica"
+
+msgid "Edit Power Sub Station"
+msgstr "Edita Subestació elèctrica"
+
+msgid "Line reference"
+msgstr "Línia de referència"
+
+msgid "high"
+msgstr "alt"
+
+msgid "medium"
+msgstr "mitjà"
+
+msgid "low"
+msgstr "baix"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
+msgid "Cable Distribution Cabinet"
+msgstr "Armari de distribució"
msgid "Edit Cable Distribution Cabinet"
msgstr "Edita Armari de distribució"
@@ -19006,6 +20336,9 @@ msgstr "Edita Torre elèctrica"
msgid "Tower reference"
msgstr "Torre de referència"
+msgid "steel"
+msgstr "acer"
+
msgid "Pole"
msgstr "Pal"
@@ -19024,13 +20357,11 @@ msgstr "Edita línia elèctrica"
msgid "Line type"
msgstr "Tipus de línia"
-msgctxt "Power Line"
msgid "line"
msgstr "línia"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "línia_baixa_tensió"
+msgstr "línia secundària"
msgid "Amount of Cables"
msgstr "Quantitat de cables"
@@ -19137,11 +20468,11 @@ msgstr "Quiosc"
msgid "Edit Kiosk"
msgstr "Edita quiosc"
-msgid "Baker"
-msgstr "Fleca"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Edita fleca"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Carnisseria"
@@ -19152,8 +20483,8 @@ msgstr "Edita Carnisseria"
msgid "Seafood"
msgstr "Peixateria"
-msgid "Edit Seafood"
-msgstr "Edita Peixateria"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Delicatessen (al detall)"
@@ -19173,14 +20504,20 @@ msgstr "Mercat"
msgid "Edit Marketplace"
msgstr "Edita mercat"
+msgid "Organic"
+msgstr "Orgànica"
+
msgid "Greengrocer"
msgstr "Fruiteria"
msgid "Edit Greengrocer"
msgstr "Edita Fruiteria"
-msgid "Organic"
-msgstr "Orgànica"
+msgid "Farm Stand"
+msgstr "Venda directa de productes agraris"
+
+msgid "Edit Farm Stand"
+msgstr "Modifica venda directa de productes agraris"
msgid "Edit Organic/Bio"
msgstr "Modificar botiga d''aliments ecològics"
@@ -19251,8 +20588,8 @@ msgstr "Edita sastreria"
msgid "Fabric"
msgstr "Teixits"
-msgid "Edit Fabric"
-msgstr "Edita Botiga de teixits"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Electrònica"
@@ -19272,14 +20609,14 @@ msgstr "Edita botiga d''electrònica"
msgid "Mobile Phone"
msgstr "Telèfons mòbils"
-msgid "Edit Mobile Phone"
-msgstr "Edita telèfons mòbils"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Aspiradora"
-msgid "Edit Vacuum Cleaner"
-msgstr "Edita Aspiradora"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Equips d''àudio"
@@ -19287,7 +20624,6 @@ msgstr "Equips d''àudio"
msgid "Edit Hifi Shop"
msgstr "Edita botiga d''equips d''àudio"
-msgctxt "shop"
msgid "Video"
msgstr "Vídeo"
@@ -19315,6 +20651,12 @@ msgstr "Edita Canvi de moneda"
msgid "Edit Automated Teller Machine"
msgstr "Edita caixer automàtic"
+msgid "Pawnbroker"
+msgstr "Empenyorament"
+
+msgid "Edit Pawnbroker"
+msgstr "Modifica empenyorament"
+
msgid "Department Store"
msgstr "Grans magatzems"
@@ -19351,11 +20693,32 @@ msgstr "Joieria"
msgid "Edit Jewelry"
msgstr "Edita Joieria"
+msgid "Gift"
+msgstr "Articles de regal"
+
+msgid "Edit Gift Shop"
+msgstr "Modifica botiga d''articles de regal"
+
+msgid "buddhist"
+msgstr "budista"
+
+msgid "christian"
+msgstr "cristià"
+
+msgid "hindu"
+msgstr "hindú"
+
+msgid "jewish"
+msgstr "jueu"
+
+msgid "muslim"
+msgstr "musulmà"
+
msgid "Erotic"
msgstr "Sex-shop"
-msgid "Edit Erotic"
-msgstr "Edita Sex-shop"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Florista"
@@ -19384,8 +20747,8 @@ msgstr "Edita Botiga de Maquinari"
msgid "Paint"
msgstr "Pintura"
-msgid "Edit Paint"
-msgstr "Edita Pintura"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Mobles"
@@ -19396,20 +20759,20 @@ msgstr "Edita Botiga de mobles"
msgid "Kitchen"
msgstr "Cuines"
-msgid "Edit Kitchen"
-msgstr "Edita Botiga de Cuines"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Cortina"
-msgid "Edit Curtain"
-msgstr "Edita Cortina"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Marc"
-msgid "Edit Frames"
-msgstr "Edita Marc"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Papereria"
@@ -19429,6 +20792,12 @@ msgstr "Llibreria"
msgid "Edit Book Store"
msgstr "Edita Llibreria"
+msgid "Newsagent''s shop"
+msgstr "Agència de premsa"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Modifica agència de premsa"
+
msgid "Travel Agency"
msgstr "Agència de Viatges"
@@ -19438,8 +20807,8 @@ msgstr "Edita Agència de Viatges"
msgid "Musical Instrument"
msgstr "Instruments Musicals"
-msgid "Edit Musical Instruments"
-msgstr "Edita Instruments Musicals"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Joguineria"
@@ -19519,6 +20888,9 @@ msgstr "joguines"
msgid "vouchers"
msgstr "bons"
+msgid "Note"
+msgstr "Nota"
+
msgid "Geography"
msgstr "Geografia"
@@ -19648,6 +21020,12 @@ msgstr "Pic"
msgid "Edit Peak"
msgstr "Edita Pic"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacera"
@@ -19687,24 +21065,33 @@ msgstr "Arbre"
msgid "Edit Tree"
msgstr "Edita arbre"
+msgid "broad_leaved"
+msgstr "planifoli"
+
+msgid "conifer"
+msgstr "coníferes"
+
+msgid "palm"
+msgstr "palmera"
+
msgid "Botanical Name"
msgstr "Nom botànic"
+msgid "Tree Row"
+msgstr "Filera d''arbres"
+
msgid "Wood"
msgstr "Bosc"
msgid "Edit Wood"
msgstr "Edita bosc"
-msgctxt "wood"
msgid "coniferous"
msgstr "coníferes"
-msgctxt "wood"
msgid "deciduous"
msgstr "caduc"
-msgctxt "wood"
msgid "mixed"
msgstr "barrejat"
@@ -19714,38 +21101,29 @@ msgstr "Plantació forestal"
msgid "Edit Forest Landuse"
msgstr "Edita plantació forestal"
-msgid "coniferous"
-msgstr "coníferes"
-
-msgid "deciduous"
-msgstr "caduc"
-
-msgid "mixed"
-msgstr "barrejat"
-
msgid "Grassland"
-msgstr ""
+msgstr "Prada"
msgid "Edit Grassland"
-msgstr ""
+msgstr "Modifica prada"
msgid "pampas"
-msgstr ""
+msgstr "pampa"
msgid "prairie"
-msgstr ""
+msgstr "prada"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
-msgstr ""
+msgstr "sabana"
msgid "steppe"
-msgstr ""
+msgstr "estepa"
msgid "veld"
-msgstr ""
+msgstr "veld"
msgid "Nature Reserve"
msgstr "Reserva Natural"
@@ -19798,6 +21176,12 @@ msgstr "Prat"
msgid "Edit Meadow Landuse"
msgstr "Edita Prat"
+msgid "Orchard"
+msgstr "Verger"
+
+msgid "Edit Orchard Landuse"
+msgstr "Modifica verger"
+
msgid "Vineyard"
msgstr "Vinya"
@@ -19852,8 +21236,8 @@ msgstr "Zona d''esbarjo"
msgid "Edit Recreation Ground Landuse"
msgstr "MOdifica Zona d''esbarjo"
-msgid "Residential area"
-msgstr "Zona residencial"
+msgid "Residential Area"
+msgstr "Àrea residencial"
msgid "Edit Residential Landuse"
msgstr "Edita zona residencial"
@@ -19864,6 +21248,9 @@ msgstr "Cementiri"
msgid "Edit Graveyard"
msgstr "Edita Cementiri"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cementiri"
@@ -19939,6 +21326,33 @@ msgstr "Edita Informació d''adreça"
msgid "Annotation"
msgstr "Anotacions"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Edita informació d''adreça"
@@ -19957,30 +21371,6 @@ msgstr "Nom de la ciutat"
msgid "Country code"
msgstr "Codi del país"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "EUA"
-
msgid "Address Interpolation"
msgstr "Informació de l''adreça"
@@ -19999,6 +21389,18 @@ msgstr "parell"
msgid "alphabetic"
msgstr "alfabètic"
+msgid "Accuracy"
+msgstr "Acurat"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Contacte (esquema comú)"
@@ -20159,28 +21561,57 @@ msgid "where enforcement ends"
msgstr "on finalitza la sancionabilitat"
msgid "traffic light or barrier that stops you"
-msgstr "semàfor o barrera que us atura"
+msgstr "semàfor o barrera que vos para"
+
+msgid "General route"
+msgstr "Ruta genèrica"
+
+msgid "Edit general route"
+msgstr "Modifica ruta genèrica"
-msgid "Route (legacy)"
-msgstr "Ruta (antiga)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "bicicleta"
-msgid "Edit Route (legacy)"
-msgstr "Modifica ruta (antiga)"
+msgctxt "route type"
+msgid "bus"
+msgstr "autobús"
+msgctxt "route type"
msgid "road"
-msgstr "desconeguda"
+msgstr "carretera"
+msgctxt "route type"
+msgid "ferry"
+msgstr "ferri"
+
+msgctxt "route type"
msgid "ski"
-msgstr "esquí"
+msgstr "pista d''esquí"
+msgctxt "route type"
msgid "foot"
msgstr "a peu"
+msgctxt "route type"
msgid "hiking"
msgstr "excursionisme"
+msgctxt "route type"
+msgid "tram"
+msgstr "tramvia"
+
+msgctxt "route type"
msgid "detour"
-msgstr "desviament"
+msgstr "trencall"
+
+msgctxt "route type"
+msgid "railway"
+msgstr "ferrocarril"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "metro"
msgid "Symbol description"
msgstr "Descripció de símbols"
@@ -20227,20 +21658,23 @@ msgstr "punt final d''anada"
msgid "backward halt point"
msgstr "punt final de tornada"
-msgid "Route network"
-msgstr "Xarxa de Rutes"
+msgid "Route Network"
+msgstr "Xarxa de carreteres"
-msgid "Edit route network"
-msgstr "Edita xarxa de rutes"
+msgid "Edit Route Network"
+msgstr "Modifica xarxa de carreteres"
msgid "member"
msgstr "membre"
-msgid "Associated street"
+msgid "Associated Street"
msgstr "Carrer associat"
-msgid "Edit associated street"
-msgstr "Edita Carrer associat"
+msgid "Edit Associated Street"
+msgstr "Modifica carrer associat"
+
+msgid "house"
+msgstr "casa"
msgid "Street"
msgstr "Carrer"
@@ -20263,8 +21697,8 @@ msgstr "tot el relacionat amb el carrer"
msgid "Destination sign"
msgstr "Senyal de Destí"
-msgid "Edit Destination sign"
-msgstr "Edita Senyal de Destí"
+msgid "Edit Destination Sign"
+msgstr "Modifica senyal d''indicació"
msgid "Destination written on sign (w/o distance)"
msgstr "Destinació escrita al senyal (amb o sense distància)"
@@ -20359,18 +21793,27 @@ msgstr "vies que passen per sota del pont"
msgid "way forming the outline footprint"
msgstr "via que forma el pas de la gent"
-msgid "nodes forming the outline"
-msgstr "nodes que formen el pas"
+msgid "edge ways parallel to ''across''"
+msgstr "vies paral·leles a ''across''"
msgid "ways passing through the tunnel"
msgstr "vies que passen a través del túnel"
+msgid "edge ways parallel to ''through''"
+msgstr "vies paral·leles a ''through''"
+
msgid "bridge"
msgstr "pont"
msgid "deprecated"
msgstr "en desús"
+msgid "bicycle"
+msgstr "bicicleta"
+
+msgid "foot"
+msgstr "a peu"
+
msgid "horse"
msgstr "cavall"
@@ -20380,8 +21823,11 @@ msgstr "barrera"
msgid "motorroad"
msgstr "autopista/autovia"
-msgid "highway_track"
-msgstr "traçat_autopista"
+msgid "highway.track"
+msgstr "via.pista"
+
+msgid "livingdashed"
+msgstr "carrer residencial discontinu"
msgid "services"
msgstr "serveis"
@@ -20389,11 +21835,11 @@ msgstr "serveis"
msgid "ford"
msgstr "gual"
-msgid "highway_platform"
-msgstr "plataforma_autopista"
+msgid "highway.platform"
+msgstr "via.andana"
-msgid "emergency_access_point"
-msgstr "accés_punt_emergència"
+msgid "emergency.access.point"
+msgstr "emergència.punt d''accés"
msgid "riverbank"
msgstr "riba del riu"
@@ -20410,6 +21856,9 @@ msgstr "ràpids"
msgid "railwaypoint"
msgstr "punt de via fèrria"
+msgid "raildashed"
+msgstr "via fèrria discontínua"
+
msgid "railyard"
msgstr "platja de vies"
@@ -20425,29 +21874,29 @@ msgstr "via fèrria antiga"
msgid "aeroway"
msgstr "via aèria"
-msgid "aeroway_dark"
-msgstr "via_aèria_fosca"
+msgid "aeroway.dark"
+msgstr "aeroport.fosc"
-msgid "aeroway_light"
-msgstr "via_aèria_llum"
+msgid "aeroway.light"
+msgstr "aeroport.llum"
-msgid "piste_easy"
-msgstr "pista_verda"
+msgid "piste.easy"
+msgstr "pista fàcil"
-msgid "piste_intermediate"
-msgstr "pista_blava"
+msgid "piste.intermediate"
+msgstr "pista intermèdia"
-msgid "piste_advanced"
-msgstr "pista_vermella"
+msgid "piste.advanced"
+msgstr "pista avançada"
-msgid "piste_expert"
-msgstr "pista_negra"
+msgid "piste.expert"
+msgstr "pista expert"
-msgid "piste_freeride"
-msgstr "esquí forapista"
+msgid "piste.freeride"
+msgstr "pista freeride"
-msgid "piste_novice"
-msgstr "pista_iniciació"
+msgid "piste.novice"
+msgstr "pista debutants"
msgid "power"
msgstr "energia"
@@ -20467,20 +21916,20 @@ msgstr "port_esportiu"
msgid "amenity"
msgstr "equipament"
-msgid "amenity_traffic"
-msgstr "instal.lacions_semafor"
+msgid "amenity.traffic"
+msgstr "estructura de servei.trànsit"
-msgid "amenity_light"
-msgstr "estructura de servei (llum)"
+msgid "amenity.light"
+msgstr "estructura de servei.llum"
-msgid "light_water"
-msgstr "aigua (llum)"
+msgid "light.water"
+msgstr "llum.aigua"
msgid "health"
msgstr "salut"
-msgid "shop"
-msgstr "botiga"
+msgid "office"
+msgstr "oficina"
msgid "hotel"
msgstr "hotel"
@@ -20545,9 +21994,6 @@ msgstr "arbustos"
msgid "woodarea"
msgstr "bosc"
-msgid "mud"
-msgstr "fangar"
-
msgid "beach"
msgstr "platja"
@@ -20557,11 +22003,14 @@ msgstr "ruta"
msgid "boundary"
msgstr "límit"
+msgid "sport"
+msgstr "esport"
+
msgid "place"
msgstr "lloc"
-msgid "tiger_data"
-msgstr "dades_tiger"
+msgid "tiger.data"
+msgstr "dades TIGER"
msgid "address"
msgstr "adreça"
@@ -20575,9 +22024,6 @@ msgstr "Poble/Ciutat"
msgid "One Way"
msgstr "Sentit Únic"
-msgid "Church"
-msgstr "Església"
-
msgid "Fuel Station"
msgstr "Benzinera"
@@ -20594,272 +22040,463 @@ msgid "Test"
msgstr "Prova"
msgid "abbreviated street name"
-msgstr ""
+msgstr "nom abreviat del carrer"
msgid "oneway tag on a node"
-msgstr ""
+msgstr "etiqueta de sentit únic a un node"
msgid "bridge tag on a node"
-msgstr ""
+msgstr "etiqueta de pont a un node"
msgid "wrong highway tag on a node"
+msgstr "etiqueta de via errònia a un node"
+
+msgid "wrong crossing tag on a way"
msgstr ""
msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "Via no classificada sense nom"
msgid "highway without a reference"
-msgstr ""
+msgstr "via sense referència"
msgid "temporary highway type"
-msgstr ""
+msgstr "via de tipus temporal"
msgid "misspelled key name"
-msgstr ""
+msgstr "nom de clau amb errors d''ortografia"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "carril bici amb etiqueta de bicicleta"
msgid "footway with tag foot"
-msgstr ""
+msgstr "camí per vianants amb etiqueta \"a peu\" (foot)"
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "carril bici independent com a part d''un carril bici"
msgid "barrier used on a way"
-msgstr ""
+msgstr "barrera utilitzada sobre una via"
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "velocitat màxima utilitzada a un camí per vianants"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "etiqueta de capa amb el signe +"
msgid "street name contains ss"
-msgstr ""
+msgstr "el nom del carrer conté ss"
msgid "relation without type"
-msgstr ""
+msgstr "relació sense tipus"
msgid "restaurant without name"
-msgstr ""
+msgstr "restaurant sense nom"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "combinació inusual d''etiquetes (via i curs d''aigua)"
msgid "unusual tag combination (highway & natural)"
+msgstr "combinació inusual d''etiquetes (via i natural)"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
msgstr ""
msgid "natural water used for swimming pool"
+msgstr "etiqueta \"aigua natural\" utilitzada a una piscina"
+
+msgid "numerical key"
+msgstr "clau numèrica"
+
+msgid "route_master relation without route_master=*"
+msgstr "relació route_master sense route_master=*"
+
+msgid "power line without voltage"
msgstr ""
-msgid "incline without highway"
+msgid "substation key without power=substation"
msgstr ""
-msgid "junction without highway"
+msgid "transformer key without power"
msgstr ""
-msgid "lanes without highway"
+msgid "missing substation=*"
msgstr ""
-msgid "lcn without highway"
+msgid "missing transformer=*"
msgstr ""
-msgid "lit without highway"
+msgid "incline without highway or railway"
+msgstr "inclinació sense via o via fèrria"
+
+msgid "junction without highway"
+msgstr "cruïlla sense via"
+
+msgid "lanes without highway"
+msgstr "carrils sense via"
+
+msgid "lcn without highway"
+msgstr "lcn sense via"
+
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
-msgstr ""
+msgstr "carrer residencial sense via"
msgid "maintenance without highway"
-msgstr ""
+msgstr "manteniment sense via"
msgid "median without highway"
-msgstr ""
+msgstr "mediana sense via"
msgid "motorroad without highway"
-msgstr ""
+msgstr "autopista sense via"
msgid "ntd_id without highway"
-msgstr ""
+msgstr "ntd_id sense via"
-msgid "oneway without highway"
-msgstr ""
+msgid "oneway without highway or railway"
+msgstr "sentit únic sense via o via fèrria"
msgid "sac_scale without highway"
-msgstr ""
+msgstr "escala sac sense via"
msgid "segregated without highway"
-msgstr ""
+msgstr "via segregada sense via"
msgid "sidewalk without highway"
-msgstr ""
+msgstr "vorera sense via"
msgid "smoothness without highway"
-msgstr ""
+msgstr "uniformitat de la superfície (smoothness) sense via"
msgid "snowplowing without highway"
-msgstr ""
+msgstr "llevaneus sense via"
msgid "step_count without highway"
-msgstr ""
+msgstr "step_count sense via"
msgid "toll without highway"
-msgstr ""
+msgstr "peatge sense via"
msgid "tracktype without highway"
-msgstr ""
+msgstr "tipus de pista sense via"
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "visibilitat de camí sense via"
msgid "trolley_wire without highway"
-msgstr ""
+msgstr "cable de tròlei sense via"
msgid "zip_left without highway"
-msgstr ""
+msgstr "zip_left sense via"
msgid "zip_right without highway"
-msgstr ""
+msgstr "zip_right sense via"
msgid "detail without railway"
-msgstr ""
+msgstr "detall sense via fèrria"
msgid "eddy_current_brake without railway"
-msgstr ""
+msgstr "fre elèctric sense ferrocarril"
msgid "electrified without railway"
-msgstr ""
+msgstr "electrificació sense ferrocarril"
msgid "etcs without railway"
-msgstr ""
+msgstr "sistema de control ETCS sense via fèrria"
msgid "gauge without railway"
-msgstr ""
+msgstr "ample de via sense via fèrria"
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "pendent de la via sense via fèrria"
msgid "kursbuchstrecke without railway"
-msgstr ""
+msgstr "kursbuchstrecke (horaris de tren) sense via fèrria"
msgid "lzb without railway"
-msgstr ""
+msgstr "senyalització LZB sense via fèrria"
msgid "old_railway_operator without railway"
-msgstr ""
+msgstr "antic operador de ferrocarril sense via fèrria"
msgid "operating_procedure without railway"
-msgstr ""
+msgstr "procediment d''operació sense via fèrria"
msgid "pzb without railway"
-msgstr ""
+msgstr "sistema de seguretat PZB sense via fèrria"
msgid "radio without railway"
-msgstr ""
+msgstr "ràdio sense via fèrria"
msgid "structure_gauge without railway"
-msgstr ""
+msgstr "gàlib sense via fèrria"
msgid "tilting_technologie without railway"
-msgstr ""
+msgstr "tecnologia pendular sense via fèrria"
msgid "track_class without railway"
-msgstr ""
+msgstr "tipus de via sense ferrocarril"
msgid "tracks without railway"
-msgstr ""
+msgstr "vies sense ferrocarril"
msgid "traffic_mode without railway"
-msgstr ""
+msgstr "mode de trànsit sense via fèrria"
msgid "usage without railway"
-msgstr ""
+msgstr "utilització sense via fèrria"
msgid "workrules without railway"
-msgstr ""
+msgstr "normes de treball sense via fèrria"
msgid "stream without waterway"
-msgstr ""
+msgstr "rierol sense curs d''aigua"
msgid "intermittent without waterway"
-msgstr ""
+msgstr "curs intermintent sense curs d''aigua"
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "vaixell sense curs d''aigua / aigua natural"
msgid "length_unit without waterway"
-msgstr ""
+msgstr "unitat de mesura sense curs d''aigua"
msgid "llid without waterway"
-msgstr ""
+msgstr "llid sense curs d''aigua"
msgid "canal without waterway"
-msgstr ""
+msgstr "canal sense curs d''aigua"
msgid "have_riverbank without waterway"
+msgstr "banc fluvial sense curs d''aigua"
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "width without physical linear feature"
+msgstr "amplada sense una característica física lineal"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "fence_type without barrier=fence"
+msgstr "tipus de tancat sense barrier=fence"
+
+msgid "border_type without boundary"
+msgstr "border_type sense boundary"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "recycling_type sense amenity=recycling"
+
+msgid "board_type without information=board"
+msgstr "board_type sense information=board"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "shelter_type sense amenity=shelter"
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "lamp_type sense highway=street_lamp"
+
+msgid "map_type without information=map"
+msgstr "map_type sense information=map"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "site_type sense historic=archaeological_site"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "artwork_type sense tourism=artwork"
+
+msgid "castle_type without historic=castle"
+msgstr "castle_type sense historic=castle"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "reservoir_type senselanduse/water=reservoir"
+
+msgid "bunker_type without military=bunker"
+msgstr "bunker_type sense military=bunker"
+
+msgid "source:addr without addr:*"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:date without source"
msgstr ""
-msgid "religion without denomination"
+msgid "source:name without name"
msgstr ""
-msgid "unknown christian denomination"
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "source:building without building"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
msgstr ""
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
+msgstr ""
+
+msgid "religion without denomination"
+msgstr "religió sense denominació"
+
+msgid "unknown christian denomination"
+msgstr "denominació cristiana sense especificar"
+
+msgid "unknown muslim denomination"
+msgstr "denominació musulmana sense especificar"
+
+msgid "unknown jewish denomination"
+msgstr "denominació jueva sense especificar"
+
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"manca l''indicatiu de llengua de la viqupèdia, utilitzeu "
+"''wikipedia''=''llengua:article'' (p.ex: ''wikipedia''=''ca:Montseny''"
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr "prefix de llengua desconegut a l''etiqueta viquipèdia"
+
+msgid "layer should be between -5 and 5"
+msgstr "la capa ha d''estar entre -5 i 5"
-msgid "unkown language prefix in wikipedia tag"
+msgid "level should be numbers with optional .5 increments"
+msgstr "el nivell ha de ser un nombre amb increments opcionals de .5"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
+msgid "unusual maxspeed format"
+msgstr "format inusual de velocitat màxima"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr "el voltatge ha d''estar en volts sense unitat/delimitador/espais"
+
+msgid "unusual frequency specification"
+msgstr "especificació inusual de freqüència"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "ample de via inusual; utilitzeu mm sense separador"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "pendent inusual; utilitzeu percentatges/graus o amunt/avall"
+
msgid "Landsat"
msgstr "Landsat"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "Inspector OSM: Robot de redacció"
-
msgid "Yahoo Sat"
msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
-msgstr "MapBox Satèl·lit"
+msgstr "MapBox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Blanc i Negre)"
+msgstr "OpenStreetMap (Mapnik Black & White)"
+
+msgid "skobbler"
+msgstr ""
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -20871,145 +22508,199 @@ msgid "Public Transport (ÖPNV)"
msgstr "Transport públic (ÖPNV)"
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Estil alemany)"
+msgstr "OpenStreetMap (estil alemany)"
-msgid "Streets NRW Geofabrik.de"
-msgstr "Carrers NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Hike & Bike"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (sòrab)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (alemany)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "Mapa OpenPT (superposició)"
-
-msgid "Bavaria (2 m)"
-msgstr "Baviera (2 m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodja, Laos, Tailàndia, Vietnam bilingüe"
-msgid "Hamburg (40 cm)"
-msgstr "Hamburg (40 cm)"
+msgid "osmfr"
+msgstr ""
-msgid "Hamburg (DK5)"
-msgstr "Hamburg (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI black-and-white 2.5m"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr ""
+
msgid "Graz: Basiskarte (base map)"
-msgstr "Graz: Basiskarte (mapa base)"
+msgstr "Graz: Basiskarte (base map)"
msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris: DGM (model del terreny)"
+msgstr "Tiris: DGM (Terrain model)"
msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris: DOM (Model de superfície)"
+msgstr "Tiris: DOM (model de superfície)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Viena: Mehrzweckkarte (propòsit general)"
+msgstr "Vienna: Mehrzweckkarte (propòsit general)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Viena: Beschriftungen (anotacions)"
+msgstr "Vienna: Beschriftungen (anotacions)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Viena: Ortofoto (imatges aèries)"
+msgstr "Vienna: Orthofoto (imatgeria aèria)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Cantó d''Aargau 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Ciutat d''Uster Ortofoto 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Stadtplan Zürich"
-msgstr "Plànol de Zürich"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terrain model)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Cantó de Solothurn 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (model de superficie)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Cantó de Solothurn 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrography"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Cantó de Solothurn Infraroig 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Geobase Roads"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Cantó de Ginebra 5 cm (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Cantó de Neuchâtel 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Cantó del Jura 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Cantó de Fribourg 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Ciutat de Berna 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Dinamarca)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Ortofoto de Yverdon-les-Bains 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Dinamarca)"
-msgid "Geobase Hydrography"
-msgstr "Geobase Hidrografia"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Dinamarca)"
-msgid "Geobase Roads"
-msgstr "Geobase Carrers"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estonia Basemap (Maaamet)"
-msgid "Canvec"
-msgstr "Canvec"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortho (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr "Columbia Britànica Mosaic"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr "MSR Mapes Topogràfics"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgid "MSR Maps Urban"
-msgstr "MSR Mapes Urbans"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "USGS Scanned Topographic Maps"
-msgstr "Mapes Topogràfics USGS escanejats"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "USGS Large Scale Imagery"
-msgstr "Imatgeria USGS a gran escala"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "OSM US TIGER 2012 carreteres superposades"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "Czech CUZK:KM"
-msgstr "Txèquia CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Txèquia UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historic"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Orthophotos 2000"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-polzades Escòcia 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Orthophotoplan 2011"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Orthophotoplan 2007"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Orthophotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthophotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Streets NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Llengua sòrab)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (llengua alemanya)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Bavaria (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+"Mapa antic de Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Mapa antic de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haití)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -21027,7 +22718,7 @@ msgid "Lodi - Italy"
msgstr "Lodi - Itàlia"
msgid "Lombardia - Italy (CTR)"
-msgstr "Llombardia - Itàlia (CTR)"
+msgstr "Lombardia - Itàlia (CTR)"
msgid "Sicily - Italy"
msgstr "Sicília - Itàlia"
@@ -21039,58 +22730,61 @@ msgid "PCN 2008 - IT Lazio+Umbria"
msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr "URSS - Letònia"
+msgstr "URSS- Letònia"
msgid "50cm ortho - Latvia"
-msgstr "50cm ortho - Letònia"
+msgstr "50cm orto - Letònia"
msgid "20cm ortho - Coastline"
-msgstr "20cm orto - Línia costanera"
+msgstr "20cm ortho - Coastline"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lituània)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger Delta Oct 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinan/Bulacan (Filipines alta resolució)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Car"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Cyclo"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - Ortofotos 2010-2012"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Ski"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slovakia EEA GMES Urban Atlas"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Ortofotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slovakia EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Ortofotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr "Mapes històrics d'Eslovàquia"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "South Africa CD:NGI Aerial"
msgid "Catastro Spain"
-msgstr "Cadastre Espanya"
+msgstr "Cadastre d''Espanya"
msgid "PNOA Spain"
msgstr "PNOA Espanya"
@@ -21102,94 +22796,154 @@ msgid "GRAFCAN - Canary Islands"
msgstr "GRAFCAN - Illes Canàries"
msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castella i Lleó"
+msgstr "ITACyL - Castilla i Lleó"
msgid "IDEIB - Balearic Islands"
msgstr "IDEIB - Illes Balears"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Mapa base d''Estònia (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estònia Orto (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stadt Uster Orthophoto 2008 10cm"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estònia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
+msgstr "Stadtplan Zürich"
-msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Dinamarca)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dinamarca)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Canton de Génève 5cm (SITG 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton du Jura 50cm (RCJU 1998)"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Canton de Fribourg 50cm (2005)"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodja,Laos,Tailàndia,Vietnam bilingüe"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stadt Bern 10cm/25cm (2008)"
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Orthophoto 2012"
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthophoto 2012"
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Orthophoto technique 2012"
+
+msgid "MSR Maps Topo"
+msgstr "MSR Maps Topo"
+
+msgid "MSR Maps Urban"
+msgstr "MSR Maps Urban"
+
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Scanned Topographic Maps"
+
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Large Scale Imagery"
+
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Roads Overlay"
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
-msgstr "Sud-àfrica CD:NGI Aeri"
+msgid "OSM - Tiger Edited Map"
+msgstr "OSM - Tiger Edited Map"
+
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ukraine - Orthophotomaps 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr "OS New Popular Edition historic"
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
+
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
+
+msgid "Surrey Air Survey"
+msgstr "Surrey Air Survey"
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Cotxes"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Excursionisme"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Bicicleta"
+msgid "OS 1:25k historic (OSM)"
+msgstr "OS 1:25k historic (OSM)"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Esquí"
+msgid "OS Scottish Popular historic"
+msgstr "OS Scottish Popular historic"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
+msgid "OSM Export"
+msgstr "Exporta OSM"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporta dades de trànsit a un fitxer SUMO"
-msgid "Slovakia Historic Maps"
-msgstr "Slovakia Historic Maps"
+msgid "SUMO Export"
+msgstr "Exportació SUMO"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI blanc-i-negre 2.5m"
+msgid "Export"
+msgstr "Exporta"
-msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Edició Tiger"
+msgid "Port:"
+msgstr "Port:"
-msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k històric (OSM)"
+msgid "refresh the port list"
+msgstr "refrescar la llista de ports"
-msgid "OS Scottish Popular historic"
-msgstr "OS Scottish Popular historic"
+msgid "Configure"
+msgstr "Configura"
-msgid "Stuttgart (Luftbild)"
-msgstr "Stuttgart (Luftbild)"
+msgid "Connection Error."
+msgstr "S''ha produït un error en la connexió."
-msgid "2u"
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "configura el DG100 connectat"
+
+msgid "delete data after import"
+msgstr "suprimir les dades després d''importar"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 fitxers CSV"
@@ -21198,7 +22952,7 @@ msgid "Importing CSV file ''%s''..."
msgstr "Important fitxer CSV ''%s''..."
msgid "Markers of "
-msgstr ""
+msgstr "Marcadors de "
msgid "Show summary after import"
msgstr "Mostra resum després d''importació"
@@ -21222,7 +22976,7 @@ msgid "Missing audio file"
msgstr "Falta l''arxiu d''àudio"
msgid "Commands"
-msgstr "Ordres"
+msgstr "Ordes"
msgid "Processing..."
msgstr "S''està processant..."
@@ -21234,10 +22988,10 @@ msgid "Error executing the script: "
msgstr "S''ha produït un error en executar la seqüència: "
msgid "Command line"
-msgstr "Línia d''ordres"
+msgstr "Línia d''ordes"
msgid "Set input focus to the command line."
-msgstr "Estableix el focus d''entrada a la línia d''ordres."
+msgstr "Estableix el focus d''entrada a la línia d''ordes."
msgid "Point on the start"
msgstr "Punt al començament"
@@ -21292,7 +23046,7 @@ msgid "Download Track ..."
msgstr "Descarrega Recorregut ..."
msgid "Download GPX track from openstreetmap.org"
-msgstr "Descarrega recorregut en GPX des de openstreetmap.org"
+msgstr "Descarrega recorregut en GPX des d'openstreetmap.org"
msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
@@ -21351,13 +23105,13 @@ msgid "(What does that mean?)"
msgstr "(Què significa això?)"
msgid "Please enter Description about your trace."
-msgstr "Si us plau, introdueix la descripció del teu traçat."
+msgstr "Per favor, introdueix la descripció del teu traçat."
msgid "Tags (comma delimited)"
msgstr "Etiquetes (delimitades per comes)"
msgid "Please enter tags about your trace."
-msgstr "Si us plau, introdueix les etiquetes sobre el teu traçat."
+msgstr "Per favor, introdueix les etiquetes sobre el teu traçat."
msgid "Selected track: {0}"
msgstr "Recorregut seleccionat: {0}"
@@ -21381,13 +23135,13 @@ msgid "GPX upload was successful"
msgstr "La pujada de GPX s''ha realitzat correctament"
msgid "Upload failed. Server returned the following message: "
-msgstr "Pujada fallida.El servidor ha retornat aquest missatge: "
+msgstr "Pujada fallida.El servidor ha retornat este missatge: "
msgid "Uploading GPX track: {0}% ({1} of {2})"
msgstr "Pujant track GPX:{0}% ({1} de {2})"
msgid "No description provided. Please provide some description."
-msgstr "Sense descripció.Si us plau escriu alguna descripció."
+msgstr "Sense descripció.Per favor escriu alguna descripció."
msgid "Uploading GPX Track"
msgstr "Pujant recorregut en GPX"
@@ -21401,8 +23155,20 @@ msgstr "Mostra el perfil d''alçada"
msgid "Elevation Profile"
msgstr "Perfil de desnivell"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Capa de graella d''elevació (experimental)"
+
+msgid "Shows elevation grid layer"
+msgstr "Mostra la capa de la graella d''elevació"
+
+msgid "Elevation Grid"
+msgstr "Graella d''elevació"
+
+msgid "No SRTM data"
+msgstr "Cap dada de tipus SRTM"
+
msgid "Open the elevation profile window."
-msgstr "Obre la finestra del perfil de desnivell"
+msgstr "Obri la finestra del perfil de desnivell"
msgid "Min"
msgstr "Mín"
@@ -21422,14 +23188,8 @@ msgstr "Guany"
msgid "Time"
msgstr "Hora"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "Automàtic"
-
-msgid "Fixed value"
-msgstr "Valor fix"
+msgid "Tracks"
+msgstr "Tracks"
msgid "Elevation profile for track ''{0}''."
msgstr "Perfil de desnivell del track ''{0}''."
@@ -21441,7 +23201,7 @@ msgid "(No elevation data)"
msgstr "(No hi ha dades d''alçada)"
msgid "Can not save preferences"
-msgstr "No es poden desar les preferències"
+msgstr "No es poden guardar les preferències"
msgid "FastDraw configuration"
msgstr "Configuració FastDraw"
@@ -21459,7 +23219,7 @@ msgid "Enter key mode"
msgstr "Escriu mode de clau"
msgid "Auto add tags"
-msgstr ""
+msgstr "Afig etiquetes automàticament"
msgid "Autosimplify"
msgstr "Autosimplifica"
@@ -21468,42 +23228,42 @@ msgid "Simplify with initial epsilon"
msgstr "Simplifica les tasques amb èpsilon inicial"
msgid "Save as is"
-msgstr "Desa com està"
+msgstr "Guarda com està"
msgid "Snap to nodes"
msgstr "Ajusta als nodes"
msgid "Add fixed points on click"
-msgstr "Afegeix punts fixos en clicar"
+msgstr "Afig punts fixos en clicar"
msgid "Add fixed points on spacebar"
-msgstr "Afegeix punts fixos a la barra d''espai"
+msgstr "Afig punts fixos a la barra d''espai"
msgid "Draw closed polygons only"
-msgstr ""
+msgstr "Dibuixa només polígons tancats"
msgid "Try copying tags from properties table"
-msgstr ""
+msgstr "Prova de copiar les etiquetes de la taula de propietats"
msgid "FastDraw settings"
msgstr "Configuració FastDraw"
msgid "Save settings"
-msgstr "Desa la configuració"
+msgstr "Guarda la configuració"
msgid "Can not read settings"
msgstr "No es pot llegir la configuració"
msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
msgstr ""
-"Q=Opcions, Intro=Desa, Ctrl+Intro=Desa amb etiquetes,Amunt/Avall=ajusta"
+"Q=Opcions, Intro=Guarda, Ctrl+Intro=Guarda amb etiquetes,Amunt/Avall=ajusta"
msgid ""
"Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
"to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"
msgstr ""
"Clica o Clica i Arrosega per continuar,Ctrl+Clic per afegir un node "
-"fix,Majus+clic per esborrar-lo,Intro per simplificar o Desar, "
+"fix,Majus+clic per esborrar-lo,Intro per simplificar o Guardar, "
"Ctrl+Majus+Clic per iniciar una nova línia"
msgid "FastDrawing"
@@ -21513,7 +23273,7 @@ msgid "Fast drawing mode"
msgstr "Mode de dibuix ràpid"
msgid "Please move the mouse to draw new way"
-msgstr "Si us plau, mou el ratolí per dibuixar una nova via"
+msgstr "Per favor, mou el ratolí per dibuixar una nova via"
msgid "Are you sure you do not want to save the line containing {0} points?"
msgstr "Esteu segur que no voleu enregistrar la línia que conté {0} punts?"
@@ -21572,19 +23332,19 @@ msgid "Guess values for "
msgstr "Estima valors per "
msgid "Address has no street"
-msgstr "Aquesta adreça no té cap carrer"
+msgstr "Esta adreça no té cap carrer"
msgid "Address has no valid street"
-msgstr "Aquesta adreça no té cap carrer vàlid"
+msgstr "Esta adreça no té cap carrer vàlid"
msgid "Address has no post code"
-msgstr "Aquesta adreça no té codi postal"
+msgstr "Esta adreça no té codi postal"
msgid "Address has no city"
-msgstr "Aquesta adreça no té cap ciutat"
+msgstr "Esta adreça no té cap ciutat"
msgid "Address has no country"
-msgstr "Aquesta adreça no té cap país"
+msgstr "Esta adreça no té cap país"
msgid "Assign to"
msgstr "Assigna a"
@@ -21664,7 +23424,7 @@ msgid ""
"Create relation between street and related addresses for ALL streets in the "
"current layer."
msgstr ""
-"Crea una relació entre el carrer i les seves adreces relacionades per totes "
+"Crea una relació entre el carrer i les seues adreces relacionades per totes "
"les adreces de la capa activa."
msgid "Convert to relation."
@@ -21704,9 +23464,15 @@ msgstr "Selecciona les adreces incompletes"
msgid "Selects all addresses with incomplete data."
msgstr "Selecciona totes les adreces amb dades incompletes."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr "Editor de numeraricó de carrers"
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Actualitzant les propietats d''{0} objecte"
@@ -21733,6 +23499,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Propietats de la capa"
+msgid "Error while creating image layer: {0}"
+msgstr "Error en crear la capa d''imatge: {0}"
+
msgid "Import image"
msgstr "Importa imatge"
@@ -21752,10 +23521,10 @@ msgid "NanoLog of {0} lines, {1} of them with coordinates."
msgstr "NanoLog de {0} línies, {1} d''ells amb les coordenades."
msgid "Open NanoLog panel"
-msgstr "Obre el panell NanoLog"
+msgstr "Obri el panell NanoLog"
msgid "Open NanoLog file..."
-msgstr "Obre el fitxer NanoLog..."
+msgstr "Obri el fitxer NanoLog..."
msgid "Edit opening hours"
msgstr "Edita les hores d''obertura"
@@ -21775,7 +23544,7 @@ msgid "Display clock in 12h mode."
msgstr "Mostra rellotge en mode 12h."
msgid "Choose key"
-msgstr "Escull una clau"
+msgstr "Trieu una clau"
msgid "apply {0}"
msgstr "aplica {0}"
@@ -21802,20 +23571,32 @@ msgid "OsmInspector"
msgstr "OsmInspector"
msgid "Open OsmInspector"
-msgstr "Obre OsmInspector"
+msgstr "Obri OsmInspector"
msgid "OsmBugInfo"
msgstr "OsmBugInfo"
msgid "Open a OSM Inspector selection list window."
-msgstr "Obre una finetra amb una llista de selecció d''OSM Inspector"
+msgstr "Obri una finetra amb una llista de selecció d''OSM Inspector"
msgid "Current Selected Bug Info"
msgstr "Informació sobre els errors seleccionats"
+msgid "Prev OSMI bug"
+msgstr "Error OSMI anterior"
+
+msgid "Next OSMI bug"
+msgstr "Error OSMI següent"
+
msgid "Osm Inspector Bugs"
msgstr "Errors d''Osm Inspector"
+msgid "OSM Inspector Bugs"
+msgstr "Inspector d''errors d''OSM"
+
+msgid "Selected Bug Info"
+msgstr "Informació dels errors seleccionats"
+
msgid "Handy Address Interpolation Functions"
msgstr "Funcions facilitades per la interpolació d''adreces"
@@ -21890,12 +23671,12 @@ msgstr "Informació opcional:"
msgid "Please select a street to associate with address interpolation way"
msgstr ""
-"Si us plau, selecciona un carrer per associar amb la interpolació d''adreça "
+"Per favor, selecciona un carrer per associar amb la interpolació d''adreça "
"de la via"
msgid "Please select address interpolation way for this street"
msgstr ""
-"Si us plau, seleccioneu un tipus d''interpolació d''adreces per aquest carrer"
+"Per favor, seleccioneu un tipus d''interpolació d''adreces per este carrer"
msgid "Expected odd numbers for addresses"
msgstr "S''esperen nombres imparells"
@@ -21903,15 +23684,14 @@ msgstr "S''esperen nombres imparells"
msgid "Expected even numbers for addresses"
msgstr "S''esperen nombres parells"
-msgid "Expected valid number for address increment"
-msgstr "S''esperava un nombre vàlid per l''increment de l''adreça"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
-msgstr "El codi de país ha de contenir dues lletres"
+msgstr "El codi de país ha de contindre dues lletres"
msgid "Please enter valid number for starting and ending address"
-msgstr ""
-"Si us plau, introduïu un nombre vàlid per les adreces inicial i final"
+msgstr "Per favor, introduïu un nombre vàlid per les adreces inicial i final"
msgid "Alphabetic address must end with a letter"
msgstr "Les adreces alfabètiques han d''acabar amb una lletra"
@@ -21925,10 +23705,10 @@ msgid "Starting address letter must be less than ending address letter"
msgstr "La lletra inicial de l''adreça ha de ser més petita que la final"
msgid "Please enter valid number for starting address"
-msgstr "Si us plau, indiqueu un nombre vàlid per l''adreça inicial"
+msgstr "Per favor, indiqueu un nombre vàlid per l''adreça inicial"
msgid "Please enter valid number for ending address"
-msgstr "Si us plau, indiqueu un nombre vàlid per l''adreça final"
+msgstr "Per favor, indiqueu un nombre vàlid per l''adreça final"
msgid "Starting address number must be less than ending address number"
msgstr "el nombre inicial de l''adreça ha de ser més petit que el final"
@@ -21943,7 +23723,7 @@ msgid ""
"Please select two segments that don''t share any nodes.\n"
"Alternatively put the pivot on their common node.\n"
msgstr ""
-"Si us plau seleccioneu dos segments que no comparteixin cap node.\n"
+"Per favor seleccioneu dos segments que no compartisquen cap node.\n"
"Alternativamen poseu el centre de rotació sobre el seu node comú.\n"
msgid ""
@@ -21976,7 +23756,7 @@ msgid ""
"This is an unsupported scenario.\n"
msgstr ""
"Un punt d''intersecció cauria fora dels nodes adjacents.\n"
-"Aquesta possibilitat no està suportada.\n"
+"Esta possibilitat no està suportada.\n"
msgid "Undocumented problem occured.\n"
msgstr "Ha hagut un problema no documentat.\n"
@@ -21991,7 +23771,7 @@ msgid ""
"Please select two segments that don''t share any nodes\n"
" or put the pivot on their common node.\n"
msgstr ""
-"Si us plau, seleccioneu dos segments que no comparteixin cap node\n"
+"Per favor, seleccioneu dos segments que no compartisquen cap node\n"
" o establiu com a centre el node comú.\n"
msgid "Align Way Segments: Modes"
@@ -22001,7 +23781,7 @@ msgid "Align Ways control panel"
msgstr "Tauler de control de l''alineació de vies (AlignWayS)"
msgid "This panel activates in Align Ways mode:"
-msgstr "Aquest tauler s''activa en mode d''alineació de vies:"
+msgstr "Este tauler s''activa en mode d''alineació de vies:"
msgid "Length preserved"
msgstr "Longitud conservada"
@@ -22017,7 +23797,7 @@ msgid ""
"preserved.</html>"
msgstr ""
"<html>Alinea el segment de la via a la referència de manera que es conserva "
-"la seva longitud.</html>"
+"la seua longitud.</html>"
msgid ""
"<html>Aligns the way segment to the reference so that the angles of its "
@@ -22048,7 +23828,7 @@ msgid ""
"Please choose a different segment to be aligned."
msgstr ""
"El segment a alinear no pot ser el mateix que el de referència.\n"
-"Si us plau, escolliu un segment diferent per ser alineat"
+"Per favor, escolliu un segment diferent per ser alineat"
msgid "AlignWayS message"
msgstr "Missatge d''AlignWays (Alineació de vies)"
@@ -22058,7 +23838,7 @@ msgid ""
"Please choose a different reference segment."
msgstr ""
"El segment de referència No pot ser el mateix que el segment a alinear.\n"
-"Si us plau, escolliu un segment de referència diferent."
+"Per favor, escolliu un segment de referència diferent."
msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
msgstr ""
@@ -22114,13 +23894,13 @@ msgid ""
"\n"
msgstr ""
"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays us\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays vos\n"
"ajudarà a alinear dos segments de via. Això pot ser útil quan, per exemple,\n"
-"traceu el contron d''un edifici i voleu que els seus costats siguin "
+"traceu el contron d''un edifici i voleu que els seus costats siguen "
"paral·lels\n"
"a un carrer o un carretera.<br>\n"
"<br>\n"
-"Alguns consells que us poden ajudar abans de començar:\n"
+"Alguns consells que vos poden ajudar abans de començar:\n"
"</p>\n"
"</html>\n"
"\n"
@@ -22145,7 +23925,7 @@ msgstr ""
"utilitzant les tecles<b><i><span style=\"color:green\">Ctrl-"
"clic</span></i></b>ing\n"
"sobre un segment. L''altre segment esdevindrà paral·lel a\n"
-"aquest. </li>\n"
+"este. </li>\n"
"</ul>\n"
"</div>\n"
"</html>\n"
@@ -22199,8 +23979,8 @@ msgstr ""
"<div style=\"font-family:sans-serif\">\n"
"<ul>\n"
" <li>Optionalmnet <b>podeu modificar el punt de rotació</b>. Fer fer "
-"paral·lel el segment de referència amb el segment a alinear, aquest darrer "
-"rotarà al voltant d''aquest punt. Podeu escollir els dos extrems o el centre "
+"paral·lel el segment de referència amb el segment a alinear, este darrer "
+"rotarà al voltant d''este punt. Podeu escollir els dos extrems o el centre "
"del segment fent<b><i><span style=\"color:green\">clic</span></i></b>sobre "
"el punt escollit. \n"
" </li>\n"
@@ -22229,7 +24009,7 @@ msgstr ""
" <li><b>Alineació de segments.</b> Premeu <b><i><span "
"style=\"color:green\">{0}</span></i></b>. Alternativament podeu cercar la "
"comanda al menú d''<b>Eines</b>\n"
-"i potser podria ser necessari de posar aquest acció a la <b>barra "
+"i potser podria ser necessari de posar este acció a la <b>barra "
"d''eines</b>.\n"
" </li>\n"
"</ul>\n"
@@ -22263,7 +24043,7 @@ msgid "What''s new..."
msgstr "Novetats..."
msgid "Added <b>angle preserving</b> aligning mode"
-msgstr "Afegeix la modalitat d''alineació <b>d''angles invariables</b>"
+msgstr "Afig la modalitat d''alineació <b>d''angles invariables</b>"
msgid "Various improvements and bugfixes"
msgstr "Vàries millores i correccions d''errors"
@@ -22283,15 +24063,6 @@ msgstr "Nombre de carrer:"
msgid "Street Name:"
msgstr "Nom del carrer:"
-msgid "Increment"
-msgstr "Increment"
-
-msgid "Decrement"
-msgstr "Disminueix"
-
-msgid "Numbers:"
-msgstr "Nombres:"
-
msgid "Big buildings mode"
msgstr "Mode de grans edificis"
@@ -22347,7 +24118,7 @@ msgid "on polygon"
msgstr "al polígon"
msgid "Add address"
-msgstr "Afegeix una adreça"
+msgstr "Afig una adreça"
msgid "Helping tool for tag address"
msgstr "Eina d''ajuda per afegir adreces"
@@ -22433,10 +24204,10 @@ msgid ""
"The new grabbing key is F10, but you can change the key\n"
"in the shortcut settings if you want."
msgstr ""
-"el connector del cadastre francès utilitzava la tecla de drecera F11per "
+"el connector del cadastre francés utilitzava la tecla de drecera F11per "
"descarregar,\n"
-"aquesta tecla ara està assignada a la commutació a la visualització en "
-"pantalla completa.\n"
+"esta tecla ara està assignada a la commutació a la visualització en pantalla "
+"completa.\n"
"La nova tecla per descarregar és F10, però si voleu, podeu canviar-la\n"
"a la configuració de dreceres."
@@ -22445,7 +24216,7 @@ msgid ""
"configuration.\n"
"Layers ''Building'' and ''Parcel'' added by default."
msgstr ""
-"Si us plau, habiliteu com a mínim dues capes WMS a la configuració del "
+"Per favor, habiliteu com a mínim dues capes WMS a la configuració del "
"connector del cadastre-fr.\n"
"Les capes ''Building'' (edificis) i ''Parcel'' (parcel·les) han estat "
"afegides de manera predeterminada."
@@ -22486,6 +24257,9 @@ msgstr "Desactiva l''enquadrament de les imatges durant la georeferenciació"
msgid "Use \"Tableau d''assemblage\""
msgstr "Utilitza el \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr "Substitueix l''ombrejat en gris per color blanc"
+
msgid "Select first WMS layer in list."
msgstr "Seleccionar la primera capa WMS de la llista."
@@ -22506,12 +24280,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alt"
-
-msgid "medium"
-msgstr "mitjà"
-
msgid "symbol"
msgstr "símbol"
@@ -22537,7 +24305,7 @@ msgid "Max. cache size (in MB)"
msgstr "Mida màxima de la memòria cau (en MB)"
msgid "French cadastre WMS"
-msgstr "Cadastre francès WMS"
+msgstr "Cadastre francés WMS"
msgid ""
"A special handler of the French cadastre wms at "
@@ -22548,13 +24316,13 @@ msgid ""
"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
"<BR>before any upload of data created by this plugin."
msgstr ""
-"Una eina especial per treballar amb el cadastre francès en wms de "
-"www.cadastre.gouv.fr<BR><BR>Si us plau, llegiu les condicions d''utilització "
-"aquí (en freancès): <br><a "
+"Una eina especial per treballar amb el cadastre francés en wms de "
+"www.cadastre.gouv.fr<BR><BR>Per favor, llegiu les condicions d''utilització "
+"ací (en freancés): <br><a "
"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
"l\"> "
"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>abans de cada pujada de dades creades amb aquest connector."
+"<BR>abans de cada pujada de dades creades amb este connector."
msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
msgstr ""
@@ -22663,8 +24431,13 @@ msgstr "Multiplicador d''imatges amb format de trama descaregades:"
msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
-"Afegeix els ''tableaux d''assemblage\" (taulers d''assemblatge) a la llista "
-"de capes cadastrals a descarregar"
+"Afig els ''tableaux d''assemblage\" (taulers d''assemblatge) a la llista de "
+"capes cadastrals a descarregar"
+
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Substitueix l''escala de grisos per color blanc (fitxers més petits i poca "
+"utilització de memòria)"
msgid "Display crosspieces:"
msgstr "Mostra encavalcaments:"
@@ -22686,6 +24459,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Habiliteu això per utilitzar l''etiqueta \"add:street\" als nodes."
+msgid "Unexpected file extension. {0}"
+msgstr "Extensió de fitxer no esperada. [{0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "Afegir \"source=...\" (font) als objectes?"
@@ -22707,13 +24483,13 @@ msgstr ""
msgid "Please, enable auto-sourcing and check cadastre millesime."
msgstr ""
-"Si us plau, activeu l''enregistrament automàtic i verifiqueu la mil·lèsima"
+"Per favor, activeu l''enregistrament automàtic i verifiqueu la mil·lèsima"
msgid "Extract SVG ViewBox..."
-msgstr "Extreu la ViewBox del SVG..."
+msgstr "Extrau la ViewBox del SVG..."
msgid "Extract best fitting boundary..."
-msgstr "Extreu els límits més apropiats..."
+msgstr "Extrau els límits més apropiats..."
msgid "Create boundary"
msgstr "Crear límit"
@@ -22729,17 +24505,17 @@ msgid ""
"Use the normal Cadastre Grab menu."
msgstr ""
"Municipi vectoritzat !\n"
-"Utilitzeu el menú de descàrrega del cadastre francès."
+"Utilitzeu el menú de descàrrega del cadastre francés."
msgid ""
"This commune is not vectorized.\n"
"Please use the other menu entry to georeference a \"Plan image\""
msgstr ""
-"Aquest municipi no ha estat vectoritzat.\n"
-"Si us plau, utilitzeu una altra eina per georeferenciar la imatge."
+"Este municipi no ha estat vectoritzat.\n"
+"Per favor, utilitzeu una altra eina per georeferenciar la imatge."
msgid "Extract commune boundary"
-msgstr "Extreure els límts de la comuna"
+msgstr "Extraure els límts de la comuna"
msgid "Only on vectorized layers"
msgstr "Només sobre capes vectorials"
@@ -22754,7 +24530,7 @@ msgid "Cadastre grab"
msgstr "Descàrrega del cadastre"
msgid "Download Image from French Cadastre WMS"
-msgstr "Descarregar imatge del cadastre francès WMS"
+msgstr "Descarregar imatge del cadastre francés WMS"
msgid "Cadastre: {0}"
msgstr "Cadastre: {0}"
@@ -22772,63 +24548,15 @@ msgid ""
"This image contains georeference data.\n"
"Do you want to use them ?"
msgstr ""
-"Aquesta imatge conté dades georeferenciades.\n"
+"Esta imatge conté dades georeferenciades.\n"
"Les voleu utilitzar?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Feu clic sobre el primer punt (cantonada) per retallar la imatge\n"
-"(es necessiten dos punts)"
-
-msgid "Image cropping"
-msgstr "Retallat de la imatge"
-
-msgid "Click second corner for image cropping"
-msgstr "Feu clic sobre el segon punt (cantonada) per retallar la imatge"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Feu clic sobre el primer encreuament Lambert per georeferenciar \n"
-"(són necessaris dos punts)"
-
-msgid "Image georeferencing"
-msgstr "Georeferenciació d''imatges"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Feu clic sobre el segon encreuament Lambert per georeferenciar"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Voleu anul·lar definitivament\n"
-"o només tornar a provar "
-
-msgid "Enter cadastre east,north position"
-msgstr "Indiqueu una posició del cadastre (coordenades est i nord)"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Avís: comproveu el nord amb la fletxa !!)"
-
-msgid "East"
-msgstr "Est"
-
-msgid "I use the mouse"
-msgstr "Utilitzo el ratolí"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Establir {0} coordenades Lambert"
-
msgid "Load layer from cache"
msgstr "Carregar de la memòria cau"
msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-"Carregar la localització de la memòria cau (només si aquesta està activada)"
+"Carregar la localització de la memòria cau (només si esta està activada)"
msgid "{0} not allowed with the current projection"
msgstr "{0} no és possible amb la projecció actual"
@@ -22842,8 +24570,8 @@ msgstr ""
msgid ""
"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-"El fitxer seleccionat {0} no és a la memòria cau d''aquest connector "
-"(extensió incorrecta)"
+"El fitxer seleccionat {0} no és a la memòria cau d''este connector (extensió "
+"incorrecta)"
msgid "The location {0} is already on screen. Cache not loaded."
msgstr "El lloc {0} ja és a la pantalla. No s''ha utilitzat la memòria cau."
@@ -22858,7 +24586,7 @@ msgid "Set a new location for the next request"
msgstr "Seleccionar un nou lloc per a la següent petició"
msgid "Add a new municipality layer"
-msgstr "Afegeix una nova capa de municipi"
+msgstr "Afig una nova capa de municipi"
msgid "Commune"
msgstr "Comuna"
@@ -22877,25 +24605,89 @@ msgid "<html>Departement number (optional)</html>"
msgstr "<html>Codi de departament (opcional)</html>"
msgid "Add new layer"
-msgstr "Afegeix una nova capa"
+msgstr "Afig una nova capa"
msgid "Open Cadastre Preferences"
-msgstr ""
+msgstr "Preferències de l''Open Cadastre"
+
+msgid "Refine georeferencing"
+msgstr "Refina la georeferenciació"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Millora la georeferenciació (només imatges ràster)"
msgid "Reset cookie"
msgstr "Inicialitzar galeta"
msgid "Get a new cookie (session timeout)"
-msgstr "Obtenir una nova galeta (la sessió ha expirat)"
+msgstr "Obtindre una nova galeta (la sessió ha expirat)"
-msgid "Save image as PNG"
-msgstr "Desar la imatge com a PNG"
+msgid "Save image as..."
+msgstr "Guarda la imatge com..."
msgid "PNG files (*.png)"
msgstr "Fitxers PNG (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Exporta en format PNG (només les imatges ràster)"
+msgid "GeoTiff files (*.tif)"
+msgstr "Fitxer GeoTiff (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Exporta la imatge (nomes imatges ràster)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Feu clic sobre el primer punt (cantonada) per retallar la imatge\n"
+"(es necessiten dos punts)"
+
+msgid "Image cropping"
+msgstr "Retallat de la imatge"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Feu clic sobre el primer encreuament Lambert per georeferenciar \n"
+"(són necessaris dos punts)"
+
+msgid "Image georeferencing"
+msgstr "Georeferenciació d''imatges"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Voleu anul·lar definitivament\n"
+"o només tornar a provar "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Ui! no s''han obtingut totes les coordenades\n"
+"correctsment. Per favor torneu a provar."
+
+msgid "Enter cadastre east,north position"
+msgstr "Indiqueu una posició del cadastre (coordenades est i nord)"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Avís: comproveu el nord amb la fletxa !!)"
+
+msgid "East"
+msgstr "Est"
+
+msgid "I use the mouse"
+msgstr "Utilitzo el ratolí"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Establir {0} coordenades Lambert"
+
+msgid "Click second corner for image cropping"
+msgstr "Feu clic sobre el segon punt (cantonada) per retallar la imatge"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Feu clic sobre el segon encreuament Lambert per georeferenciar"
msgid "Adjust WMS"
msgstr "Adjustament WMS"
@@ -22923,8 +24715,11 @@ msgstr "Capa WMS ({0}), {1} tessel·les carregades"
msgid "Is not vectorized."
msgstr "No és vectorial"
-msgid "Raster size: {0}"
-msgstr "Mida de la imatge ràster: {0}"
+msgid "Bounding box: {0}"
+msgstr "Rectangle de selecció: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Mida de la imatge (px): {0}/{1}"
msgid "Is vectorized."
msgstr "ÉS vectorial."
@@ -22956,13 +24751,13 @@ msgid "Use"
msgstr "Ús"
msgid "Please select a scheme to use."
-msgstr "Si us plau seleccioneu l''esquema a utilitzar"
+msgstr "Per favor seleccioneu l''esquema a utilitzar"
msgid "Color Scheme"
msgstr "Esquema de color"
msgid "Please select the scheme to delete."
-msgstr "Si us plau seleccioneu l''equema a suprimir"
+msgstr "Per favor seleccioneu l''equema a suprimir"
msgid "Use the selected scheme from the list."
msgstr "Utilitzar l''esquema seleccionat de la llista."
@@ -22976,7 +24771,7 @@ msgstr "Suprimir l''esquema seleccionat de la llista."
msgid "Color Schemes"
msgstr "Esquemes de color"
-msgid "Adress"
+msgid "Address"
msgstr "Adreça"
msgid "Split area"
@@ -22991,7 +24786,7 @@ msgid ""
"Remove the area from the relation before splitting it."
msgstr ""
"L''àrea selecciona no pot ser dividida perquè és membre d''alguna relació.\n"
-"Abans de pode dividir heu de treure l''àrea de la relació."
+"Abans de pode dividir heu de traure l''àrea de la relació."
msgid "TangoGPS Files (*.log)"
msgstr "Fitxers TangoGPS (*.log)"
@@ -23022,7 +24817,10 @@ msgstr "Descarrega al llarg"
msgid "Please select 1 or more ways to download along"
msgstr ""
-"Si us plau seleccioneu 1 o més vies per descarregar dades al seu llarg"
+"Per favor seleccioneu 1 o més vies per descarregar dades al seu llarg"
+
+msgid "Download from OSM along selected ways"
+msgstr "Descarrega dades d''OSM al llarg de les vies seleccionades"
msgid "{0} intermediate nodes to download."
msgstr "{0} nodes intermedis a descarregar"
@@ -23099,6 +24897,73 @@ msgstr "Eina nova..."
msgid "Install"
msgstr "Instal·la"
+msgid "Public"
+msgstr "Públic"
+
+msgid "Could not get server response, check logs"
+msgstr ""
+"No ha estat possible d''obtindre una resposta del servidor, mireu el "
+"registre per més informació"
+
+msgid "Failed to login as {0}:"
+msgstr "Ha fallat l''accés com {0}:"
+
+msgid "The server did not return user ID"
+msgstr "El servidor no ha retornat l''ID d''usuari"
+
+msgid "Failed to send message:"
+msgstr "Ha fallat l''enviament del missatge:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Ha fallat l''obtenció de missatges com {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Open GeoChat panel"
+
+msgid "Zoom in to see messages"
+msgstr "Amplia per veure missatges"
+
+msgid "Login"
+msgstr "Inici de sessió"
+
+msgid "Enable autologin"
+msgstr "Activa l''inici automàtic de sessió"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} usuari"
+msgstr[1] "{0} usuaris"
+
+msgid "not logged in"
+msgstr "no connectat"
+
+msgid "User {0} has left"
+msgstr "L''usuari {0} ha eixit"
+
+msgid "User {0} is mapping nearby"
+msgstr "L''usuari {0} està cartografiant a la rodalia"
+
+msgid "Users mapping nearby:"
+msgstr "Usuaris que es troben cartografiant a la rodalia:"
+
+msgid "Private chat"
+msgstr "Xat privat"
+
+msgid "Close tab"
+msgstr "Tanca la pestanya"
+
+msgid "Logout"
+msgstr "Tanca la sessió"
+
+msgid "Clear log"
+msgstr "Neteja el registre"
+
+msgid "Show users on map"
+msgstr "Mostra usuaris sobre el mapa"
+
msgid "Position only"
msgstr "Només posició"
@@ -23140,27 +25005,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Format de registre desconegut"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refrescar la llista de ports"
-
-msgid "Configure"
-msgstr "Configura"
-
msgid "Configure Device"
msgstr "Configura dispositiu"
-msgid "Connection Error."
-msgstr "S''ha produït un error en la connexió."
-
-msgid "configure the connected DG100"
-msgstr "configura el DG100 connectat"
-
-msgid "delete data after import"
-msgstr "suprimir les dades després d''importar"
-
msgid "Importing data from device."
msgstr "Important dades del dispositiu"
@@ -23208,7 +25055,7 @@ msgstr ""
"selecciona punts gpx i \"blam!\" trova el centre i la direcció de propagació"
msgid "Add EGPX layer"
-msgstr "Afegeix capa EGPX"
+msgstr "Afig capa EGPX"
msgid "GPX Data"
msgstr "Dades GPX"
@@ -23237,7 +25084,7 @@ msgid "Tag without value (key is {0})"
msgstr "Etiqueta sense valor (la clau és {0})"
msgid "Closed classes while it was not open"
-msgstr "Tancament de classes sense que hagin estat obertes"
+msgstr "Tancament de classes sense que hagen estat obertes"
msgid "Closed classes element before all class elements were closed"
msgstr "Tancament de classe abans d''haver tancat tots els elements."
@@ -23246,10 +25093,10 @@ msgid "Closed class element while none was open"
msgstr "Element de classe tancat tot i que cap fou obert"
msgid "Closed basetags while it was not open"
-msgstr "Etiquetes de base tancades mentre no siguin obertes"
+msgstr "Etiquetes de base tancades mentre no siguen obertes"
msgid "Closed implications while it was not open"
-msgstr "Implicacions tancades mentre no s''obrin"
+msgstr "Implicacions tancades mentre no s''òbriguen"
msgid "Tag element inside other tag element"
msgstr "Etiqueta dins d''una altra etiqueta"
@@ -23279,7 +25126,7 @@ msgid "Unknown tag for condition: {0}"
msgstr "Etiqueta desconeguda de condició: {0}"
msgid "Element must not have childs: {0}"
-msgstr "L''element no pot tenir fills: {0}"
+msgstr "L''element no pot tindre fills: {0}"
msgid "Condition is already finished at </{0}>"
msgstr "La condició ja ha estat finalitzada a </{0}>"
@@ -23303,7 +25150,7 @@ msgid "Group not yet evaluated"
msgstr "El grup encara ho ha estat avaluat"
msgid "Collection must contain at least one condition"
-msgstr "La col·lecció ha de contenir una condició com a mínim"
+msgstr "La col·lecció ha de contindre una condició com a mínim"
msgid "No ruleset has been selected!"
msgstr "Cap conjunt de regles ha estat seleccionat!"
@@ -23363,13 +25210,13 @@ msgid "Bookmark name already exists!"
msgstr "El nom del favorit ja existeix."
msgid "Bookmark name must not contain ''{0}''!"
-msgstr "El nom del favorit no ha de contenir ''{0}''!"
+msgstr "El nom del favorit no ha de contindre ''{0}''!"
msgid "Access class"
msgstr "Classe d''accés"
msgid "Access class must not contain ''{0}''!"
-msgstr "La classe d''accés no ha de contenir ''{0}''!"
+msgstr "La classe d''accés no ha de contindre ''{0}''!"
msgid "Access types"
msgstr "Tipus d''accés"
@@ -23420,7 +25267,7 @@ msgid "Graph View Dialog"
msgstr "Finestra de configuració de vista gràfica"
msgid "Open the dialog for graph view configuration."
-msgstr "Obre la finestra de configuració de vista gràfica"
+msgstr "Obri la finestra de configuració de vista gràfica"
msgid "default"
msgstr "predeterminat"
@@ -23569,14 +25416,14 @@ msgid ""
"Surface values must not contain any of the following characters: '','', '' "
"'{' '', '' '}' '', ''='', ''|''"
msgstr ""
-"Els valors de superfície no han de contenir cap d''aquests caràcters: '','', "
+"Els valors de superfície no han de contindre cap d''estos caràcters: '','', "
"'' '{' '', '' '}' '', ''='', ''|''"
msgid "Imagery XML Files"
msgstr "Fitxer d''imatgeria XML"
msgid "Save Imagery XML file"
-msgstr "Desa fitxer d''imatgeria XML"
+msgstr "Guarda fitxer d''imatgeria XML"
msgid "XML Imagery Bounds"
msgstr "Límits de la imatgeria XML"
@@ -23587,6 +25434,9 @@ msgstr "Generar límits d''imatgeria XML per la selecció"
msgid "edit bounds for selected defaults"
msgstr "modificar límits pels predeterminats seleccionats"
+msgid "Download imagery XML bounds"
+msgstr "Descarrega els límits XML de la imatgeria"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23597,45 +25447,50 @@ msgstr ""
"Voleu continuar sense validar el fitxer?"
msgid "Open Imagery XML file"
-msgstr "Obre fitxer d''imatgeria XML"
+msgstr "Obri fitxer d''imatgeria XML"
msgid "Calibration Layer"
-msgstr ""
+msgstr "Capa de calibratge"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Una geometria de calibratge obsoleta de {0} nodes prop de {1}"
msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Una geometria de calibratge de {0} nodes prop de {1}"
msgid "Change Color"
-msgstr ""
+msgstr "Canvia el color"
msgid "Deprecate Offset"
-msgstr ""
+msgstr "Decalatge obsolet"
msgid "Are you sure this imagery offset is wrong?"
-msgstr ""
+msgstr "Esteu segur que el decalatge de la imatgeria és dolent?"
msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr ""
+msgstr "Esteu segur que esta geometria de calibratge està mal alineada?"
msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgstr "Avís: l''obsolescència és irreversible!"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr ""
+"Per enregistrar decalatges d''imatgeria heu de ser un usuari registrat d''OSM"
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
msgstr ""
+"Per favor, indiqueu la raó per la que voleu marcar este decalatge "
+"d''imatgeria com a obsolet"
msgid ""
"Please enter the reason why you mark this calibration geometry as deprecated"
msgstr ""
+"Per favor, indiqueu la raó per la que voleu marcar este calibratge de "
+"geometria com a obsolet"
msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgstr "Notificant de l''obsolescència al servidor..."
msgid "Get Imagery Offset..."
msgstr "Obté el decalatge de la imatgeria...."
@@ -23646,24 +25501,26 @@ msgstr "Descarrega del servidor els decalatges de la imatgeria actual"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"No hi ha dades per la regió seleccionada. Per favor, ajusteu la capa de la "
+"imatgeria i pujeu un decalatge."
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Carregant decalatges d''imatgeria..."
msgid "Error processing XML response: {0}"
-msgstr ""
+msgstr "Error en processar la resposta XML:{0}"
msgid "Offset"
-msgstr ""
+msgstr "Decalatge"
msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Base de dades dels decalatges d''imatgeria"
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
@@ -23672,90 +25529,105 @@ msgid "km"
msgstr "km"
msgid "Calibration geometries"
-msgstr ""
+msgstr "Geometria de calibratge"
msgid "Deprecated offsets"
-msgstr ""
+msgstr "Decalatges obsolets"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
"OSM data in the area. Please check that the offset is still valid\n"
"by downloading GPS tracks and comparing them and OSM data to the imagery."
msgstr ""
+"La capa superior de la imatgeria ha estat desplaçada, presumiblement per a "
+"fer coincidir\n"
+"les dades OSM de lazona. Per favor verifiqueu que el decalatge continua "
+"sent\n"
+"vàlid carregant tacks GPS i comparant-los amb les dades OSM i amb la "
+"imatgeria aèria."
msgid ""
"A layer has been added with a calibration geometry. Hide data layers,\n"
"find the corresponding feature on the imagery layer and move it accordingly."
msgstr ""
+"S''ha afegit una capa amb una geometria calibrada. Amageu capes de dades,\n"
+"trobeu la característica corresponent a la capa d''imatgeri i moveu-la "
+"segons convingui."
msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "Marcat com a obsolet per {0} el {1}"
msgid "Created by {0} on {1}"
-msgstr ""
+msgstr "Creat per {0} el {1}"
msgid "Offset Information"
-msgstr ""
+msgstr "Informació de decalatge"
msgid "Report this offset"
-msgstr ""
+msgstr "Informa d''este decalatge"
msgid "You are to notify moderators of this offset. Why?"
-msgstr ""
+msgstr "Notificareu els moderadors d''este decalatge. Per què?"
msgid "Reporting the offset..."
-msgstr ""
+msgstr "Informant del decalatge ..."
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "Un decalatge d''imatgeria de {0}"
msgid "Imagery ID"
-msgstr ""
+msgstr "ID de la imatgeria"
msgid "A calibration geometry of {0} nodes"
-msgstr ""
+msgstr "Un calibratge d''imatgeria de {0} nodes"
msgid "Determined right here"
-msgstr ""
+msgstr "Determinat ací"
msgid "Determined {0} away"
-msgstr ""
+msgstr "Determinat {0} lluny"
msgid "Reason"
-msgstr ""
+msgstr "Motiu"
msgid "This entry has been reported."
-msgstr ""
+msgstr "Este element ha estat informat"
msgid "Server has rejected the request"
-msgstr ""
+msgstr "El servidor ha refusat la consulta"
msgid "Unable to connect to the server"
-msgstr ""
+msgstr "No ha estat possible de connectar amb el servidor"
msgid "Store Imagery Offset..."
-msgstr "Desa decalatge de la imatgeria..."
+msgstr "Guarda decalatge de la imatgeria..."
msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
"server"
msgstr ""
+"Puja un decalatge per a la imatgeria actual (o un objecte de geometria de "
+"calibratge) al servidor"
msgid "Store calibration geometry"
-msgstr ""
+msgstr "Guarda la geometria de calibratge"
msgid "Store imagery offset"
-msgstr ""
+msgstr "Guarda el decalatge de la imatgeria"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
"intend to do?"
msgstr ""
+"L''objecte seleccionat pot ser utilitzat com a geometria de calibratge. Què "
+"voleu fer?"
msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
"this?"
msgstr ""
+"La capa superior d''imatgeria no te cap decalatge. Esteu segur que voleu "
+"pujar això?"
msgid ""
"You are registering an imagery offset. Other users in this area will be able "
@@ -23763,6 +25635,10 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
+"Esteu enregistrant un desplaçament de la imatgeria. Altres usuaris en esta "
+"àrea el podran usar per a cartografiar.\n"
+"Assegureu-vos que siga tan precís com siga possible i descriviu una regió on "
+"s''aplica este desplaçament."
msgid ""
"You are registering a calibration geometry. It should be the most precisely "
@@ -23770,30 +25646,34 @@ msgid ""
"clearly visible boundaries on various satellite imagery. Please describe "
"this object and its whereabouts."
msgstr ""
+"Esteu enregistrant una geometria de calibratge. Ha de ser la posició més "
+"precisa possible de l''objecte, amb els límits ben definits sobre diferents "
+"imatges de satèl·lit. Per favor descriviu este objecte i la seua posició amb "
+"precisió."
msgid "Uploading a new offset..."
-msgstr ""
+msgstr "Descarregant un nou decalatge ..."
msgid "This string should be 3 to 200 letters long."
-msgstr ""
+msgstr "El text ha de ser d''una longitud d''entre 3 i 200 lletres."
msgid "Adjust imagery"
-msgstr "Ajustar imatgeria"
+msgstr "Ajusta la imatgeria"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajustar la posició de la capa d''imatgeria seleccionada"
+msgstr "Ajusta la posició de la capa d''imatgeria seleccionada"
msgid "Please select the imagery layer to adjust."
-msgstr "Si us plau seleccioneu la capa d''imatgeria a ajustar"
+msgstr "Per favor seleccioneu la capa d''imatgeria a ajustar."
msgid "Start adjusting"
-msgstr "Inici de l''ajustament"
+msgstr "Inicia l''ajustament"
msgid "There are currently no imagery layer to adjust."
-msgstr "No hi ha cap capa d''imatgeria a ajustar"
+msgstr "En este moment no hi ha cap capa d''imatgeria que puga ser ajustada"
msgid "No layers to adjust"
-msgstr "Cap capa a ajustar"
+msgstr "No hi ha capes que puguen ser ajustades"
msgid "Normal"
msgstr "Normal"
@@ -23837,12 +25717,6 @@ msgstr "Imatges importades"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Fitxers d''imatge (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Obre imatges amb ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Carrega un conjunt d''imatges com una nova capa"
-
msgid "Import vector graphics"
msgstr "Importa gràfics vectorials"
@@ -23852,18 +25726,15 @@ msgstr "Escala:"
msgid "unit(s) = "
msgstr "unitat(s) = "
-msgid "Import..."
-msgstr "Importa..."
-
-msgid "Import vector graphics."
-msgstr "Importa gràfics vectorials."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Dibuixos SVG (*.svg)"
-
msgid "Importing..."
msgstr "Important..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "Fitxers SVG [Connector ImportVec] (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Per favor, obriu o creeu una capa de dades abans d''importar"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -23881,7 +25752,7 @@ msgid "Delete this"
msgstr "Esborra això"
msgid "Delete this&older"
-msgstr "Suprimeix aquest i els més vells"
+msgstr "Suprimeix este i els més vells"
msgid "km/h"
msgstr "km/h"
@@ -23898,9 +25769,9 @@ msgid ""
"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
"with [irs rectify] in subject."
msgstr ""
-"Aquesta opció crea una capa d''ajustament IRS i una petita via a dins. "
-"Primer heu d''ajustar la posició de la capa WMS.\n"
-"La capa resultant ha de ser desada com a .osm i enviada a Komzpa "
+"Esta opció crea una capa d''ajustament IRS i una petita via a dins. Primer "
+"heu d''ajustar la posició de la capa WMS.\n"
+"La capa resultant ha de ser guardada com a .osm i enviada a Komzpa "
"(me at komzpa.net) amb [irs rectify] a l''assumpte."
msgid "IRS Adjustment Layer"
@@ -23913,7 +25784,7 @@ msgid "Create Channel Digraph"
msgstr "Crea Channel Digraph"
msgid "this layer is no osm data layer"
-msgstr "aquesta capa no és de tipus osm"
+msgstr "esta capa no és de tipus osm"
msgid "Converting OSM graph into Channel Digraph"
msgstr "Convertint gràfic OSM vers Channel Digraph"
@@ -23937,7 +25808,7 @@ msgid "JunctionChecking"
msgstr "Validador de cruïlles"
msgid "Open the junctionchecking window."
-msgstr "Obre la finestra del validador de cruïlles"
+msgstr "Obri la finestra del validador de cruïlles"
msgid "junctions"
msgstr "cruïlles"
@@ -23955,7 +25826,7 @@ msgid "Junctionchecking/junctions searching"
msgstr "Verificació/cerca de cruïlles"
msgid "order of junction (n):"
-msgstr "ordre de cruïlla (n)"
+msgstr "orde de cruïlla (n)"
msgid "produce OSM-Relations: junction"
msgstr "produeix relacions OSM: cruïlla"
@@ -23986,8 +25857,8 @@ msgid ""
"candidat mark these channel and press the \"Check\" button again."
msgstr ""
"Els canals marcats contenen un candidat d''encreuament (blanc). Per provar "
-"aquest candidat, marqueu aquests canals i premeu el botó \"Verifica\" un "
-"altre cop."
+"este candidat, marqueu estos canals i premeu el botó \"Verifica\" un altre "
+"cop."
msgid "The marked channels are a {0}-ways junction"
msgstr "Els canals marcats formen un encreuament de {0} vies"
@@ -24002,7 +25873,7 @@ msgid "Number of {0}-ways junctions found: {1}"
msgstr "Nombre de cruïlles de {0} vies trobades: {1}"
msgid "generate all combinations from entrie/exit candidates"
-msgstr "genera totes les combinacions de candidats entrada/sortida"
+msgstr "genera totes les combinacions de candidats entrada/eixida"
msgid "Direction index ''{0}'' not found"
msgstr "Índex de direcció ''{0}'' no trobat"
@@ -24258,11 +26129,8 @@ msgstr "Autocentrat"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrar de manera contínua laq capa LiveGPS a la posició actual"
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
-msgstr "Obre MapDust"
+msgstr "Obri MapDust"
msgid "MapDust bug reports"
msgstr "Llistats de probelemes de MapDust"
@@ -24277,7 +26145,7 @@ msgid "Measured values"
msgstr "Valors mesurats"
msgid "Open the measurement window."
-msgstr "Obre la finestra de mesurar"
+msgstr "Obri la finestra de mesurar"
msgid "Reset current measurement results and delete measurement path."
msgstr ""
@@ -24316,33 +26184,59 @@ msgstr "Fusiona les superposicions de vies"
msgid "Merge Overlap (combine)"
msgstr "Fusiona la superposició (combinar)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Un rol basat membre de la relació fou copiat a totes les noves "
+"vies.<br> Caldria que comprovessiu si això és correcte i fessiu les "
+"correccions quan siga necessari.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Una relació de membre fou copiada a totes les noves vies.<br> Caldria "
+"que comprovessiu si això és correcte i fessiu les correccions quan siga "
+"necessari.</html>"
+
msgid "Split way"
msgstr "Divideix la via"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Entreu una clau per l''etiqueta, p.ex. "
+"<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Entreu un valor d''etiqueta, p. ex. <strong><tt>check "
+"members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan esquerra"
msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr "Afegeix una prohibició de gir a l''esquerra sobre 4 o 5 vies."
+msgstr "Afig una prohibició de gir a l''esquerra sobre 4 o 5 vies."
msgid "Please select 4 or 5 ways to assign no left turns."
msgstr ""
-"Si us plau, seleccioneu 4 o 5 vies per assignar la prohibició de gir a "
+"Per favor, seleccioneu 4 o 5 vies per assignar la prohibició de gir a "
"l''esquerra"
msgid "Please select 4 ways that form a closed relation."
-msgstr "Si us plau, seleccioneu 4 vies que formin una relació tancada"
+msgstr "Per favor, seleccioneu 4 vies que formin una relació tancada"
msgid "Unable to order the ways. Please verify their directions"
msgstr ""
-"No és possible d''ordenar les vies. Si us plau verifiqueu les seves "
-"direccions"
+"No és possible d''ordenar les vies. Per favor verifiqueu les seues direccions"
msgid "Create Michigan left turn restriction"
msgstr "Crear una prohibició de gir de tipus Michigan esquerra"
msgid "Unable to find via nodes. Please check your selection"
-msgstr "No s''han trobat nodes. Si us plau verifiqueu la vostra selecció"
+msgstr "No s''han trobat nodes. Per favor verifiqueu la vostra selecció"
msgid ""
"XAPI query, e.g., '''' (to download all data), ''[highway=*]'', or "
@@ -24355,8 +26249,7 @@ msgid "Download from OSM mirror..."
msgstr "Descarregar del servidor rèplica OSM ..."
msgid "This XAPI query seems to be invalid, please doublecheck"
-msgstr ""
-"Aquesta consulta XAPI sembla invàlida, si us plau torneu a verificar-la."
+msgstr "Esta consulta XAPI pareix invàlida, per favor torneu a verificar-la."
msgid "Object type: "
msgstr "Tipus d''objecte "
@@ -24367,6 +26260,15 @@ msgstr "Tipus d''objecte OSM a descarregar (''*'' indica qualsevol)"
msgid "XAPI query: "
msgstr "Consulta XAPI: "
+msgid "Download from Overpass API ..."
+msgstr "Descarrega de l''API d''Overpass..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Descarrega dades del servidor de l''API d''Overpass..."
+
+msgid "Overpass query: "
+msgstr "Consulta d''Overpass: "
+
msgid "Select OSM mirror URL"
msgstr "Seleccionar la URL del servidor rèplica d''OSM"
@@ -24379,15 +26281,6 @@ msgstr "Adreça URL base"
msgid "Enforce meta data"
msgstr "Aplica meta dades"
-msgid "Convert to multipolygon"
-msgstr "Convertir a multipolígon"
-
-msgid "Convert to multipolygon."
-msgstr "Convertir a multipolígon."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Una de les vies seleccionades forma part d''un altre multipolígon."
-
msgid "About Plugin"
msgstr "Quant al connector"
@@ -24402,7 +26295,7 @@ msgid ""
"default keyring / wallet first."
msgstr ""
"En funció del vostre sistema operatiu / distribució és possible que primer "
-"sigui necessari crear un portaclaus predefinit."
+"siga necessari crear un portaclaus predefinit."
msgid "No thanks, use JOSM''s plain text preferences storage"
msgstr ""
@@ -24433,7 +26326,7 @@ msgid "Finish"
msgstr "Finalitza"
msgid "Confirm the setup and close this dialog"
-msgstr "Confirmar la configuració i tancar aquesta finestra"
+msgstr "Confirmar la configuració i tancar esta finestra"
msgid "JOSM/OSM API/Username"
msgstr "JOSM/OSM API/Nom_d''usuari"
@@ -24521,22 +26414,19 @@ msgid "Split by municipality"
msgstr "Divideix per municipi"
msgid "Split this data by municipality (admin_level=8)."
-msgstr "Divideix aquestes dades per minucipi (admin_level=8)."
+msgstr "Divideix estes dades per minucipi (admin_level=8)."
msgid "Split by sector"
msgstr "Dividir per sector"
msgid "Split this data by sector (admin_level=10)."
-msgstr "Dividir aquestes dades per sector (admin_level=10)."
+msgstr "Dividir estes dades per sector (admin_level=10)."
msgid "Split by neighbourhood"
msgstr "Dividir per barris"
msgid "Split this data by neighbourhood (admin_level=11)."
-msgstr "Dividir aquestes dades per barris (admin_level=11)."
-
-msgid "Open Data"
-msgstr "Open Data"
+msgstr "Dividir estes dades per barris (admin_level=11)."
msgid "CSV files"
msgstr "Fitxers CSV"
@@ -24562,12 +26452,21 @@ msgstr "Fitxers GML"
msgid "Zip Files"
msgstr "Fitxers zip"
+msgid "7Zip Files"
+msgstr "Fitxer 7Zip"
+
msgid "OpenData XML files"
msgstr "Fitxers OpenData XML"
+msgid "Download open data"
+msgstr "Descarrega dades lliues"
+
msgid "License URL not available: {0}"
msgstr "URL de llicència no disponible: {0}"
+msgid "OpenData preferences"
+msgstr "Preferències d''OpenData"
+
msgid "License Agreement"
msgstr "Acord de llicència"
@@ -24578,13 +26477,13 @@ msgid "Refuse"
msgstr "Refusar"
msgid "I understand and accept these terms and conditions"
-msgstr "Ho entenc i accepto aquestes condicions"
+msgstr "Ho entenc i accepte estes condicions"
msgid "View the full text of this license"
-msgstr "Veure el text sencer d''aquesta llicència"
+msgstr "Veure el text sencer d''esta llicència"
msgid "I refuse these terms and conditions. Cancel download."
-msgstr "No accepto aquestes condicions. Cancel·lar la descàrregar"
+msgstr "No accepte estes condicions. Cancel·lar la descàrregar"
msgid "Module bundled with opendata plugin"
msgstr "Mòdul inclòs amb el connector opendata"
@@ -24593,7 +26492,7 @@ msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available modules."
msgstr ""
-"Si us plau, feu clic sobre <strong>llista de descàrrega</strong> per "
+"Per favor, feu clic sobre <strong>llista de descàrrega</strong> per "
"descarregar i mostrar un llista amb els mòduls disponibles."
msgid ""
@@ -24630,8 +26529,7 @@ msgid "Update the selected modules"
msgstr "Actualitzar els mòduls seleccionats"
msgid "Please restart JOSM to activate the downloaded modules."
-msgstr ""
-"Si us plau reinicieu JOSM per tal d''activar els mmòduls descarregats"
+msgstr "Per favor reinicieu JOSM per tal d''activar els mmòduls descarregats"
msgid ""
"All installed modules are up to date. JOSM does not have to download newer "
@@ -24649,7 +26547,7 @@ msgstr ""
"mòduls"
msgid "Add Open Data Module description URL."
-msgstr "Afegeix una URL de descripció del mòdul OpenData"
+msgstr "Afig una URL de descripció del mòdul OpenData"
msgid "Edit Open Data Module description URL."
msgstr "Modifica la URL de descripció del mòdul OpenData"
@@ -24669,10 +26567,10 @@ msgstr ""
"servidor OSM"
msgid "Open tools menu for this data."
-msgstr "Obre el menú d''eines per aquestes dades."
+msgstr "Obri el menú d''eines per estes dades."
msgid "Open the OpenData window."
-msgstr "Obre la finestra OpenData"
+msgstr "Obri la finestra OpenData"
msgid "Raw data"
msgstr "Dades sense tractar"
@@ -24685,9 +26583,9 @@ msgid ""
"Terms and Conditions of Use of each portal<br/>before any upload of data "
"loaded by this plugin."
msgstr ""
-"Un manegador especial per a varis portals OpenData<br/></br>Si us plau "
-"llegiu les condicions d''utilització de cadascun</br>abans de pujar "
-"qualsevol dada amb aquest connector."
+"Un manegador especial per a varis portals OpenData<br/></br>Per favor llegiu "
+"les condicions d''utilització de cadascun</br>abans de pujar qualsevol dada "
+"amb este connector."
msgid "General settings"
msgstr "Paràmetres generals"
@@ -24737,6 +26635,9 @@ msgstr "S''estan descarregant les dades..."
msgid "File to load"
msgstr "Fitxer a carregar"
+msgid "Reading 7Zip file..."
+msgstr "Llegint un fitxer de tipus 7zip..."
+
msgid "Reading Zip file..."
msgstr "Llegint el fitxer Zip..."
@@ -24750,13 +26651,27 @@ msgid ""
"km</b>) ?<br/><br/>If so, <b>do NOT upload</b> such data to OSM !"
msgstr ""
"JOSM no ha pogut trobar una transformació matemàtica precisa entre ''{0}'' i "
-"WGS84.<br /><br />Voleu provar un mètode més <i>indulgent</i> que faci una "
+"WGS84.<br /><br />Voleu provar un mètode més <i>indulgent</i> que faça una "
"transformació menys precisa (<b>amb errors de localització de fins a 1 "
"km</b>) ?<br/><br/>Si feu això, <b>NO pujeu</b> les dades al servidor OSM !"
msgid "Try lenient method"
msgstr "Provar un mètode més indulgent"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"No és possible de detectar les Coordenades del Sistema de Referència.\n"
+"Voleu retornar al sistema ESPG:4326 (WGS 84) ?"
+
+msgid "Warning: CRS not found"
+msgstr "Avís: no s''ha trobar el Sistema de Referència de les Coordenades"
+
+msgid "Unable to detect CRS !"
+msgstr ""
+"El Sistema de Referència de les Coordenades no ha pogut ser detectat!"
+
msgid "Unable to find a data store for file {0}"
msgstr "No és possible de trobar un magatzem de dades pel fitxer {0}"
@@ -24776,7 +26691,7 @@ msgstr "Veure la pàgina wiki d''OSM"
msgid "Launch browser to the OSM Wiki page of the selected data set"
msgstr ""
-"Obre al navegador web la pàgina del wiki d''OSM relativa al conjunt de dades "
+"Obri al navegador web la pàgina del wiki d''OSM relativa al conjunt de dades "
"seleccionat"
msgid "View Local Portal page"
@@ -24784,7 +26699,7 @@ msgstr "Visualitza la pàgina del portal local"
msgid "Launch browser to the local portal page of the selected data set"
msgstr ""
-"Obre el navegador sobre la pàgina del portal local relativa al conjunt de "
+"Obri el navegador sobre la pàgina del portal local relativa al conjunt de "
"dades seleccionat"
msgid "View National Portal page"
@@ -24792,7 +26707,7 @@ msgstr "Mira la pàgina del Portal Nacional"
msgid "Launch browser to the national portal page of the selected data set"
msgstr ""
-"Obre el navegador web la pàgina del portal nacional relativa al conjunt de "
+"Obri el navegador web la pàgina del portal nacional relativa al conjunt de "
"dades seleccionat."
msgid "View License"
@@ -24800,7 +26715,7 @@ msgstr "Veure llicència"
msgid "Launch browser to the license page of the selected data set"
msgstr ""
-"Obre un navegador web apuntant a la pàgina de la llicència del conjunt de "
+"Obri un navegador web apuntant a la pàgina de la llicència del conjunt de "
"dades seleccionat"
msgid "View License (summary)"
@@ -24808,7 +26723,7 @@ msgstr "Veure llicència (resum)"
msgid "Launch browser to the summary license page of the selected data set"
msgstr ""
-"Obre un navegador web apuntant a la pàgina amb el resum de la llicència del "
+"Obri un navegador web apuntant a la pàgina amb el resum de la llicència del "
"conjunt de dades seleccionat"
msgid "View the license of the selected data set"
@@ -24936,7 +26851,7 @@ msgid ""
"Do not ask again and remember my decision (go to Preferences->Modules to "
"change it later)"
msgstr ""
-"No tornar a preguntar i recordar la meva decisió (anar a les Preferències-"
+"No tornar a preguntar i recordar la meua decisió (anar a les Preferències-"
">Mòduls per canviar-ho més tard)"
msgid "The module file ''{0}'' does not include a Manifest."
@@ -25030,28 +26945,19 @@ msgid ""
"upload this data. Maybe you have selected the wrong layer?"
msgstr ""
"<html>Les dades seleccionades contenen dades d''OpenStreetBugs.<br>No podeu "
-"pujar aquestes dades. Potser heu seleccionat una capa equivocada?"
+"pujar estes dades. Potser heu seleccionat una capa equivocada?"
msgid "An error occurred: {0}"
msgstr "S''ha produït un error: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "No ha estat possible crear el nou error. Resultat: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"La capçalera conté varis valors i no pot ser cartografiada en una cadena "
-"simple"
-
msgid "Process queue"
msgstr "Cua de procés"
msgid "Open OpenStreetBugs"
-msgstr "Obre OpenStreetBugs"
+msgstr "Obri OpenStreetBugs"
msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr "Obre la finestra d''OpenStreetBugs i activa la descàrrega automàtica"
+msgstr "Obri la finestra d''OpenStreetBugs i activa la descàrrega automàtica"
msgid "Bug list"
msgstr "Llista d''errors"
@@ -25076,7 +26982,7 @@ msgid "OpenStreetBugs ({0})"
msgstr "OpenStreetBugs ({0})"
msgid "Add a comment"
-msgstr "Afegeix un comentari"
+msgstr "Afig un comentari"
msgid "Enter your comment"
msgstr "Introdueix el teu comentari"
@@ -25094,35 +27000,23 @@ msgid ""
"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
"comment:</html>"
msgstr ""
-"<html>Segur que voleu marcar aquest problema com a ''resolt''?<br><br>Podeu "
+"<html>Segur que voleu marcar este problema com a ''resolt''?<br><br>Podeu "
"afegir un comentari:</html>"
msgid "Close: "
msgstr "Tanca: "
-msgid "New issue"
-msgstr "Nou problema"
-
-msgid "Create issue"
-msgstr "Crear nou problema"
-
-msgid "Describe the problem precisely"
-msgstr "Descriviu el problema de manera precisa"
-
-msgid "Create: "
-msgstr "Crea: "
-
msgid "Open in browser"
-msgstr "Obre al navegador web"
+msgstr "Obri al navegador web"
msgid "No item selected"
msgstr "Cap element seleccionat"
msgid "Open in browser: "
-msgstr "Obre al navegador web: "
+msgstr "Obri al navegador web: "
msgid "Please enter a user name"
-msgstr "Si us plau introdueix un nom d''usuari"
+msgstr "Per favor introdueix un nom d''usuari"
msgid "Unknown issue state"
msgstr "Estat del problema: desconegut"
@@ -25135,16 +27029,16 @@ msgstr "Canvia a mode desconnectat"
msgid ""
"You have unsaved changes in your queue. Do you want to submit them now?"
-msgstr "Teniu dades sense desar. Les voleu desar ara?"
+msgstr "Teniu dades sense guardar. Les voleu guardar ara?"
msgid "OpenStreetBugs"
msgstr "OpenStreetBugs"
msgid "Open Visible..."
-msgstr "Obre visible..."
+msgstr "Obri visible..."
msgid "Open only files that are visible in current view."
-msgstr "Obre només els fitxers que són visibles a la vista actual"
+msgstr "Obri només els fitxers que són visibles a la vista actual"
msgid "No view open - cannot determine boundaries!"
msgstr "Cap vista oberta - no és possible de determinar els límits!"
@@ -25162,7 +27056,7 @@ msgid ""
"Firefox not found. Please set firefox executable in the Map Settings page of "
"the preferences."
msgstr ""
-"Firefox no ha estat trobat. Si us plau, configureu la ubicació de "
+"Firefox no ha estat trobat. Per favor, configureu la ubicació de "
"l''executable de Firefox a la finestra de paràmetres del mapa a les "
"preferències."
@@ -25172,6 +27066,9 @@ msgstr "Executable de Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "Fitxers pbf comprimits del servidor OSM"
+msgid "Download PBF"
+msgstr "Descarrega dades PBF (Protocolbuffer Binary Format)"
+
msgid "Invalid changeset id: {0}"
msgstr "Identificador invàlid del conjunt de canvis: {0}"
@@ -25230,7 +27127,7 @@ msgid "Remove objects larger than"
msgstr "Suprimir objectes més grans que"
msgid "Only this color"
-msgstr "Només aquest color"
+msgstr "Només este color"
msgid "Remove parallel lines"
msgstr "Suprimir línies paral·leles"
@@ -25298,7 +27195,7 @@ msgid "Imported PDF: "
msgstr "PDF importat: "
msgid "Please select exactly one node."
-msgstr "Si us plau, seleccioneu un únic node."
+msgstr "Per favor, seleccioneu un únic node."
msgid "PDF files"
msgstr "Fitxers PDF"
@@ -25349,10 +27246,10 @@ msgid "Finalizing layers"
msgstr "Finalitzant capes"
msgid "Please set a projection."
-msgstr "Si us plau establiu una projecció"
+msgstr "Per favor establiu una projecció"
msgid "Could not parse numbers. Please check."
-msgstr "No és possible d''analitzar els nombres. Si us plau, comproveu-los."
+msgstr "No és possible d''analitzar els nombres. Per favor, comproveu-los."
msgid "Building JOSM layer"
msgstr "Construïnt la capa JOSM"
@@ -25381,9 +27278,6 @@ msgstr "Importar fitxer PDF."
msgid "Import PDF"
msgstr "Importar PDF"
-msgid "Import PDf file"
-msgstr "Importar fitxer PDF"
-
msgid " {0} objects so far"
msgstr " {0} objectes fins ara"
@@ -25394,7 +27288,7 @@ msgid "Encrypted documents not supported."
msgstr "No se suporten documents encriptats."
msgid "The PDF file must have exactly one page."
-msgstr "El fitxer PDF ha de tenir una única pàgina."
+msgstr "El fitxer PDF ha de tindre una única pàgina."
msgid "Read error: "
msgstr "Error de lectura: "
@@ -25467,11 +27361,29 @@ msgstr "El test ha fallat: no ha estat possible de llegir ''mtime''"
msgid "Test failed: Could not write mtime."
msgstr "Ha fallat el test: No s''ha pogut escriure mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
-msgstr "Voleu desar el calibratge de la capa {0}?"
+msgstr "Voleu guardar el calibratge de la capa {0}?"
msgid "Load Picture Calibration..."
msgstr "Carrega el calibratge de la fotografia..."
@@ -25498,13 +27410,13 @@ msgid "Calibration reset"
msgstr "Calibratge inicialitzat"
msgid "Save Picture Calibration..."
-msgstr "Desa calibratge de la fotografia..."
+msgstr "Guarda calibratge de la fotografia..."
msgid "Saves calibration data to a file"
-msgstr "Desa les dades de calibratge a un fitxer"
+msgstr "Guarda les dades de calibratge a un fitxer"
msgid "Saving file failed: {0}"
-msgstr "No s''ha pogut desar el fitxer : {0}"
+msgstr "No s''ha pogut guardar el fitxer : {0}"
msgid "New picture layer from clipboard"
msgstr "Nova capa de fotografia del portaretalls"
@@ -25523,7 +27435,7 @@ msgid ""
msgstr ""
"El calibratge KML és en un estadi beta i pot produir capes amb un calibratge "
"incorrecte!\n"
-"Si us plau utilitzeu http://josm.openstreetmap.de/ticket/5451 per pujar els "
+"Per favor utilitzeu http://josm.openstreetmap.de/ticket/5451 per pujar els "
"KMLs amb calibratge incorrecte."
msgid "PicLayer move"
@@ -25626,6 +27538,11 @@ msgstr "No hi ha res al portaretalls"
msgid "The clipboard data is not an image"
msgstr "Les dades que hi ha al portaretalls no són imatges"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Avís: ha fallat la manipulació del fitxer zip ''{0}''. L''excepció ha estat: "
+"{1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "S''ha trobat un fitxer de calibratge associat a la fotografia: {0}\n"
@@ -25650,6 +27567,9 @@ msgid ""
msgstr ""
"A partir d''ara el fitxers de calibratge seran carregats automàticament."
+msgid "Download Osmosis poly"
+msgstr "Descarrega dades Osmosis poly (Osmosis polygon filter file format)"
+
msgid "Reading polygon filter file..."
msgstr "Llegint el fitxer de filtre de polígons..."
@@ -25663,7 +27583,7 @@ msgid "There are less than 2 points in an area"
msgstr "Hi ha menys de 2 punts a una àrea."
msgid "A polygon coordinate line must contain exactly 2 numbers"
-msgstr "Una línea de coordenades de polígons ha de contenir dos nombres"
+msgstr "Una línea de coordenades de polígons ha de contindre dos nombres"
msgid "Unable to parse {0} as a number"
msgstr "No és possible tractar {0} com un nombre"
@@ -25723,7 +27643,7 @@ msgid "Printing has been cancelled."
msgstr "La impressió ha estat anulada"
msgid "Printing stopped"
-msgstr "Impressió aturada"
+msgstr "Impressió parada"
msgid "Printing has failed."
msgstr "La impressió ha fallat"
@@ -25768,7 +27688,7 @@ msgid "File \"{0}\" does not exist"
msgstr "No existeix el fitxer \"{0}\""
msgid "IOException \"{0}\" occurred"
-msgstr "Ha hagut una excepció d''entrada/sortida \"{0}\""
+msgstr "Ha hagut una excepció d''entrada/eixida \"{0}\""
msgid ""
"There exists no dataset. Try to download data from the server or open an OSM "
@@ -25835,7 +27755,7 @@ msgid "Enable"
msgstr "Activa"
msgid "Can''t parse a time from this string."
-msgstr "No és possible de llegir la hora d''aquesta cadena de text."
+msgstr "No és possible de llegir la hora d''esta cadena de text."
msgid "Invalid value"
msgstr "Valor Invàlid"
@@ -25844,7 +27764,7 @@ msgid "moved"
msgstr "mogut"
msgid "Public Transport: Join GTFS stops"
-msgstr "Transport públic: afegeix parades GTFS"
+msgstr "Transport públic: afig parades GTFS"
msgid "Id"
msgstr "Id"
@@ -25907,7 +27827,7 @@ msgid "Additional tags:"
msgstr "Etiquetes adicionals:"
msgid "Add a new Tag"
-msgstr "Afegeix una nova etiqueta"
+msgstr "Afig una nova etiqueta"
msgid "Name/Id"
msgstr "Nom/Id"
@@ -25916,7 +27836,7 @@ msgid "Ref"
msgstr "Ref"
msgid "Stops are possible on the"
-msgstr "Les aturades són possible a"
+msgstr "Les parades són possible a"
msgid "right hand side"
msgstr "costat dret"
@@ -25945,11 +27865,8 @@ msgstr "El fitxer GPX no conté cap track ni cap fita"
msgid "Create Stops from GPX"
msgstr "Crear parades a partir d''un fitxer GPX"
-msgid "Tracks"
-msgstr "Tracks"
-
msgid "Tracks in this GPX file:"
-msgstr "Tracks d''aquest fitxer GPX:"
+msgstr "Tracks d''este fitxer GPX:"
msgid "Detach"
msgstr "Desacobla"
@@ -25961,8 +27878,8 @@ msgid ""
"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
"has trackpoints."
msgstr ""
-"El fitxer GPX no conté cap punt vàlid. Si us plau utilitzeu un fitxer GPX "
-"que tingui punts vàlids."
+"El fitxer GPX no conté cap punt vàlid. Per favor utilitzeu un fitxer GPX que "
+"tinga punts vàlids."
msgid "GPX File Trouble"
msgstr "Problema amb el fitxer GPX"
@@ -25977,7 +27894,7 @@ msgid "Public Transport: Delete track stop"
msgstr "Transport públic: suprimir una parada"
msgid "Public Transport: Detach track stop list"
-msgstr "Transport públic: extreure una llista de parades"
+msgstr "Transport públic: extraure una llista de parades"
msgid "Public Transport: Edit track stop list"
msgstr "Transport públic: modificar una llista de parades"
@@ -26010,7 +27927,7 @@ msgid "Relation Toolbox"
msgstr "Caixa d''eines de relacions"
msgid "Open relation/multipolygon editor panel"
-msgstr "Obre el quadre d''edició de relacions/multipolígons"
+msgstr "Obri el quadre d''edició de relacions/multipolígons"
msgid "Specify role"
msgstr "Especificar rol"
@@ -26018,16 +27935,13 @@ msgstr "Especificar rol"
msgid "Change relation member roles to {0}"
msgstr "Canvia els rols dels membres de la relació a {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Modificar els paràmetres de creació de multipolígons"
-
msgid "Create administrative boundary relations"
msgstr "Crea relacions de límits administratius"
msgid "Add tags boundary and admin_level to boundary relation ways"
msgstr ""
-"Afegeix etiquetes de límit i nivell d''administració (admin_level) a la "
-"relació de límits."
+"Afig etiquetes de límit i nivell d''administració (admin_level) a la relació "
+"de límits."
msgid "Move area tags from contour to relation"
msgstr "Mou les etiquetes d''àrea dels contorns vers la relació"
@@ -26096,7 +28010,7 @@ msgid "Duplicate relation"
msgstr "Duplicar relació"
msgid "Open relation editor for the chosen relation"
-msgstr "Obre la relació escollida a l''editor de relacions"
+msgstr "Obri la relació escollida a l''editor de relacions"
msgid "Find a relation"
msgstr "Cercar una relació"
@@ -26114,7 +28028,7 @@ msgid "Reconstruct polygons from relation {0}"
msgstr "Reconstruir polígons a partir de la relació {0}"
msgid "Open relation wiki page"
-msgstr "Obre la pàgina wiki de la relació"
+msgstr "Obri la pàgina wiki de la relació"
msgid "Select relation in main selection."
msgstr "Seleccionar la relació a la selecció principal"
@@ -26153,9 +28067,6 @@ msgstr "Trobat un node sense els rols ''label'' o ''admin_centre''"
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Trobada una via sense els rols ''inner'' o ''outer''"
-msgid "Restart JOSM"
-msgstr "Reiniciar JOSM"
-
msgid "Revert changeset fully"
msgstr "Revertir el conjunt de canvis sencer"
@@ -26172,9 +28083,12 @@ msgid "Revert"
msgstr "Recupera"
msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "Entreu l''ID del conjunt de canvis que ha de ser revertit"
msgid "Reverted changeset"
+msgstr "Conjunt de canvis revertit"
+
+msgid "It is not allowed to revert changeset from {0}"
msgstr ""
msgid "Missing merge target for {0} with id {1}"
@@ -26199,7 +28113,7 @@ msgid ""
"This changeset has objects that are not present in current dataset.\n"
"It is needed to download them before reverting. Do you want to continue?"
msgstr ""
-"Aquest conjunt de canvis te objectes que no són presents al conjunt de dades "
+"Este conjunt de canvis te objectes que no són presents al conjunt de dades "
"actual.\n"
"Caldria descarregar-los abans de revertir. Voleu continuar?"
@@ -26212,32 +28126,55 @@ msgstr "Obtenint les primitives que manquen"
msgid "Downloading changeset"
msgstr "Descarregant conjunt de canvis"
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr "Reverteix el conjunt de canvis #{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Avís: l''element d''inici ''{0}'' situat a la posició ({1},{2}) dins del "
+"conjunt de canvis no està suportat. Anul·lant."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Avís: l''element de final ''{0}'' situat a la posició ({1},{2}) dins del "
+"conjunt de canvis no està suportat. Anul·lant."
+
msgid "Road Sign Plugin"
msgstr "Connector de senyals de trànsit"
msgid "signs"
-msgstr ""
+msgstr "senyals"
+
+msgid "Change Properties"
+msgstr "Canvia propietats"
msgid "Country preset:"
-msgstr ""
+msgstr "Preconfiguracions del país:"
msgid "Show all signs"
-msgstr ""
+msgstr "Mostra tots els senyals"
msgid "Show a selection of the most useful signs"
-msgstr ""
+msgstr "Mostra una selecció dels senyals més útils"
+
+msgid "Spain"
+msgstr "Espanya"
msgid "Germany"
-msgstr ""
+msgstr "Alemanya"
msgid "Poland"
-msgstr ""
+msgstr "Polònia"
msgid "Slovakia"
-msgstr ""
+msgstr "Eslovàquia"
msgid "Roadsign tagging"
msgstr "Etiquetatge de senyals de trànsit"
@@ -26249,7 +28186,7 @@ msgid "Roadsigns plugin: open dialog"
msgstr "Connector de senyals de trànsit: obrir finestra"
msgid "custom"
-msgstr ""
+msgstr "personalitzat"
msgid "Could not read tagging preset source: ''{0}''"
msgstr "No es pot llegir la font de preconfiguració d''etiquetatge: ''{0}''"
@@ -26300,10 +28237,10 @@ msgid "Click to remove destination"
msgstr "Feu clic per a suprimir la destinació"
msgid "Open a list of routing nodes"
-msgstr "Obre una llista amb els nodes de càlcul d''itinerari"
+msgstr "Obri una llista amb els nodes de càlcul d''itinerari"
msgid "Add routing layer"
-msgstr "Afegeix una capa de càlcul d''itineraris"
+msgstr "Afig una capa de càlcul d''itineraris"
msgid "Criteria"
msgstr "Criteri"
@@ -26332,9 +28269,6 @@ msgstr "Preferències del connector de càlcul d''itineraris"
msgid "Configure routing preferences."
msgstr "Configurar les preferències de càlcul d''itineraris"
-msgid "Highway type"
-msgstr "Tipus de carretera"
-
msgid "Speed (Km/h)"
msgstr "Velocitat (km/h)"
@@ -26362,16 +28296,16 @@ msgid "Enter credentials for Separate Data Store API"
msgstr "Introduïu les credencials per a l''API Separate Data Store (SDS)"
msgid "Please enter the user name of your SDS account"
-msgstr "Si us plau introduïu el nom d''usuari del vostre compte SDS"
+msgstr "Per favor introduïu el nom d''usuari del vostre compte SDS"
msgid "Please enter the password of your SDS account"
-msgstr "Si us plau introduïu la contrasenya del vostre compte SDS"
+msgstr "Per favor introduïu la contrasenya del vostre compte SDS"
msgid ""
"Authenticating at the SDS API ''{0}'' failed. Please enter a valid username "
"and a valid password."
msgstr ""
-"Ha fallat l''autenticació de l''API SDS ''{0}''. Si us plau introduïu un nom "
+"Ha fallat l''autenticació de l''API SDS ''{0}''. Per favor introduïu un nom "
"d''usuari i una contrasenya vàlids."
msgid "SDS data file"
@@ -26396,7 +28330,7 @@ msgid "About SDS..."
msgstr "Quan al SDS..."
msgid "Open a preferences dialog for SDS."
-msgstr "Obre la finestra de preferències de SDS"
+msgstr "Obri la finestra de preferències de SDS"
msgid "Separate Data Store"
msgstr "Separate Data Store"
@@ -26428,7 +28362,7 @@ msgid ""
"Tags beginning with this prefix are never saved to OSM, but to the SDS "
"server only."
msgstr ""
-"Les etiquetes que comencen amb aquest prefix no han estar mai enregistrades "
+"Les etiquetes que comencen amb este prefix no han estar mai enregistrades "
"per l''OSM sinó pel servidor SDS."
msgid "SDS server URL"
@@ -26457,11 +28391,14 @@ msgstr "Enregistrar..."
msgid "Save the current separate data store information to a file."
msgstr ""
-"Desa la informació del connector \"separate data store\" a un fitxer."
+"Guarda la informació del connector \"separate data store\" a un fitxer."
msgid "Save SDS file"
msgstr "Enregistrar el fitxer SDS"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "No es pot fer la còpia de seguretat. L''excepció ha estat: {0}"
+
msgid "Simplify Area"
msgstr "Simplifica àrea"
@@ -26512,7 +28449,7 @@ msgstr ""
"distància ortogonal is de desviació (respecte al track)</li></ul>Tots tres "
"<u>pesos</u> multiplicats pels seus <u>factors</u> són sumats i el node amb "
"la suma més petita és suprimit primer. La supressió continuarà fins que no "
-"quedi cap node per suprimir. La fusió de nodes veïns és un altre pas de la "
+"quede cap node per suprimir. La fusió de nodes veïns és un altre pas de la "
"simplificació que uneix nodes adjacents que són dintre dels límits del "
"<u>llindar</u> expressat en metres."
@@ -26537,19 +28474,19 @@ msgstr "Factor de distància"
msgid "Merge Nearby Nodes Threshold"
msgstr "Llindar per fusionar nodes propers"
-msgid "Online Help"
-msgstr "Ajuda en línia"
+msgid "SeaMap Editor"
+msgstr "Editor de cartes nàutiques"
-msgid "Load"
-msgstr "Carrega"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "invisible"
+msgid "Seamark Inspector"
+msgstr "Inspector Seamark"
-msgid "SeaMap Editor"
-msgstr "Editor de cartes nàutiques"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -26567,14 +28504,14 @@ msgstr ""
msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
msgstr ""
-"El connector Surveyor necessita LiveGps, però aquest darrer connector no ha "
+"El connector Surveyor necessita LiveGps, però este darrer connector no ha "
"estat trobat!"
msgid "Surveyor..."
msgstr "Surveyor..."
msgid "Open surveyor tool."
-msgstr "Obre l''eina Surveyor."
+msgstr "Obri l''eina Surveyor."
msgid "Surveyor"
msgstr "Surveyor"
@@ -26601,13 +28538,13 @@ msgid "Surveyor Actions"
msgstr "Accions de Surveyor"
msgid "Open surveyor2 button panel"
-msgstr "Obre el quadre de boton de surveyor2"
+msgstr "Obri el quadre de boton de surveyor2"
msgid "Surveyor Timeline"
msgstr "Surveyor Timeline"
msgid "Open surveyor2 time line panel"
-msgstr "Obre el quadre de la línia del temps de surveyor2"
+msgstr "Obri el quadre de la línia del temps de surveyor2"
msgid "Tag2Link Preferences"
msgstr "Preferències de Tag2Link"
@@ -26619,7 +28556,7 @@ msgid ""
"Launch your default software for sending an email to the selected contact "
"address"
msgstr ""
-"Obre el programari de predeterminat per enviar un correu electrònic a "
+"Obri el programari de predeterminat per enviar un correu electrònic a "
"l''adreça del contacte seleccionat"
msgid "Edit tags"
@@ -26655,7 +28592,7 @@ msgstr "Comprovador de les etiquetes preconfigurades"
msgid ""
"Open the tagging preset test tool for previewing tagging preset dialogs."
msgstr ""
-"Obre l''eina de comprovació de les etiquetes preconfigurades per veure la "
+"Obri l''eina de comprovació de les etiquetes preconfigurades per veure la "
"previsualització de la finestra d''etiquetes preconfigurades"
msgid "You have to specify tagging preset sources in the preferences first."
@@ -26685,7 +28622,7 @@ msgid "List of Numbers"
msgstr "Llista de nombres"
msgid "add to existing associatedStreet relation"
-msgstr "afegeix a la relació associatedStreet (carrer associat) existent"
+msgstr "afig a la relació associatedStreet (carrer associat) existent"
msgid "create an associatedStreet relation"
msgstr "crea una relació associatedStreet (carrer associat)"
@@ -26696,6 +28633,9 @@ msgstr "suprimir la via de contorn"
msgid "Street name: "
msgstr "Nom del carrer: "
+msgid "Building: "
+msgstr "Edifici: "
+
msgid "Even/Odd"
msgstr "Parell/Senar"
@@ -26774,6 +28714,95 @@ msgstr "Traçador."
msgid "Tracer building"
msgstr "Traçar edifici"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -26789,12 +28818,10 @@ msgstr "Exportar signatures a XML..."
msgid "Save Signatures file"
msgstr "Enregistrar el fitxer de signatures"
-msgid "Download OSM"
-msgstr "Descarregar OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
-msgstr "Obtenir tots els objectes OSM referenciats però absents al servidor."
+msgstr ""
+"Obtindre tots els objectes OSM referenciats però absents al servidor."
msgid "Download referenced osm objects..."
msgstr "Descarregar els objectes osm referenciats..."
@@ -26816,6 +28843,10 @@ msgstr "Descarregar objectes del servidor"
msgid "Download signed data"
msgstr "Descarregar dades signades"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Avís: Ignorant l''excepció perquè la tasca fou anulada. Excepció: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -26842,7 +28873,7 @@ msgid "Object signatures"
msgstr "Signatures de l''objecte"
msgid "Open object signing window."
-msgstr "Obre la finestra de signatura de l''objecte"
+msgstr "Obri la finestra de signatura de l''objecte"
msgid "Check"
msgstr "Comprova"
@@ -26963,7 +28994,7 @@ msgid "Don''t ask again for the key"
msgstr "No tornar a demanar per la clau"
msgid "Use a random key from this list"
-msgstr "Utilitzar una clau aleatòria per a aquesta llista"
+msgstr "Utilitzar una clau aleatòria per a esta llista"
msgid "Create new Key"
msgstr "Crea una clau nova"
@@ -26984,10 +29015,7 @@ msgid "Signing canceled!"
msgstr "Signatura cancel·lada!"
msgid "Please give a tolerance in meters"
-msgstr "Si us plau indiqueu un tolerància en metres"
-
-msgid "Accuracy"
-msgstr "Acurat"
+msgstr "Per favor indiqueu un tolerància en metres"
msgid "Select as much as you like:"
msgstr "Seleccioneu tant com vulgueu:"
@@ -27060,13 +29088,13 @@ msgid ""
"missing lanes tags.</html>"
msgstr ""
"<html>El nombre de carrils no ha estat especificat per una o més carreteres; "
-"si us plau afegiu les etiquetes de carril que manquen.</html>"
+"per favor afegiu les etiquetes de carril que manquen.</html>"
msgid ""
"<html>An error occurred while constructing the model. Please run the "
"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
msgstr ""
-"<html>Ha hagut un error durant la construcció del model. Si us plau inicieu "
+"<html>Ha hagut un error durant la construcció del model. Per favor inicieu "
"el validador per assegurar-vos de la consistència de les "
"dades.<br><br>Error: {0}</html>"
@@ -27099,7 +29127,7 @@ msgid "Selects the offending relation."
msgstr "Selecciona la relació implicada."
msgid "Add turn"
-msgstr "Afegeix un gir"
+msgstr "Afig un gir"
msgid "Delete lane."
msgstr "Suprimeix el carril"
@@ -27139,7 +29167,7 @@ msgid ""
"OSM relation representing this turn restriction."
msgstr ""
"A la taula següent podeu modificar els <strong>membres</strong> de la "
-"relació OSM que representen aquesta prohibició de gir."
+"relació OSM que representen esta prohibició de gir."
msgid "Type:"
msgstr "Tipus:"
@@ -27183,14 +29211,14 @@ msgid "Edit basic attributes of a turn restriction"
msgstr "Modificar els atributs bàsics d''una prohibició de gir"
msgid "Edit the raw tags and members of this turn restriction"
-msgstr "Modificar les etiquetes i els membres d''aquesta prohibició de gir"
+msgstr "Modificar les etiquetes i els membres d''esta prohibició de gir"
msgid "Errors/Warnings"
msgstr "Errors/Avisos"
msgid "Show errors and warnings related to this turn restriction"
msgstr ""
-"Mostrar els errors i els avisos relacionats amb aquesta prohibició de gir"
+"Mostrar els errors i els avisos relacionats amb esta prohibició de gir"
msgid "Create a new turn restriction in layer ''{0}''"
msgstr "Crear una nova prohibició de gir a la capa ''{0}''"
@@ -27208,11 +29236,11 @@ msgid_plural ""
"There are still {0} errors and/or warnings identified for this turn "
"restriction. You are recommended to resolve these issues first."
msgstr[0] ""
-"Encara hi ha un error o un avís per resoldre en aquesta prohibició de gir. "
-"Es recomana de resoldre primer aquest problema."
+"Encara hi ha un error o un avís per resoldre en esta prohibició de gir. Es "
+"recomana de resoldre primer este problema."
msgstr[1] ""
-"Encara hi ha un {0} errors i/o un avisos per resoldre en aquesta prohibició "
-"de gir. Es recomana de resoldre primer aquests problemes."
+"Encara hi ha un {0} errors i/o un avisos per resoldre en esta prohibició de "
+"gir. Es recomana de resoldre primer estos problemes."
msgid "Do you want to save anyway?"
msgstr "Voleu enregistrar-ho de totes maneres?"
@@ -27239,17 +29267,17 @@ msgid_plural ""
"This turn restriction refers to {0} objects which were deleted outside of "
"this turn restriction editor:"
msgstr[0] ""
-"Aquesta prohibició de gir es refereix a un objecte que ha estat esborrat "
-"fora d''aquest editor de prohibicions:"
+"Esta prohibició de gir es refereix a un objecte que ha estat esborrat fora "
+"d''este editor de prohibicions:"
msgstr[1] ""
-"Aquesta prohibició de gir es refereix a {0} objectes que han estat esborrats "
-"fora d''aquest editor de prohibicions"
+"Esta prohibició de gir es refereix a {0} objectes que han estat esborrats "
+"fora d''este editor de prohibicions"
msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
"removed.<br>How to you want to proceed?"
msgstr ""
-"L''actualització d''aquesta prohibició de gir no pot ser enregistrada si els "
+"L''actualització d''esta prohibició de gir no pot ser enregistrada si els "
"membres esborrats no s''eliminen.<br>Com voleu procedir?"
msgid "Remove deleted members and save"
@@ -27272,7 +29300,7 @@ msgid ""
"cannot apply your changes and continue editing.<br><br>Do you want to create "
"a conflict and close the editor?</html>"
msgstr ""
-"<html>Aquesta prohibició de gir ha estat modificada fora de l''editor.<br>No "
+"<html>Esta prohibició de gir ha estat modificada fora de l''editor.<br>No "
"podeu aplicar els vostres canvisi continuar editant.<br><br>Voleu crear un "
"conflicte i tancar l''editor?</html>"
@@ -27280,15 +29308,15 @@ msgid "Already participating in a conflict"
msgstr "Ja participen a un conflicte"
msgid "Delete this turn restriction"
-msgstr "Suprimir aquesta prohibició de gir"
+msgstr "Suprimir esta prohibició de gir"
msgid "Select this turn restriction"
-msgstr "Seleccionar aquesta prohibició de gir"
+msgstr "Seleccionar esta prohibició de gir"
msgid "Activate the layer this turn restriction belongs to and zoom to it"
msgstr ""
-"Activa la capa que conté aquesta prohibició de gir i es posiciona i amplia "
-"la seva zona."
+"Activa la capa que conté esta prohibició de gir i es posiciona i amplia la "
+"seua zona."
msgid "{0} warning"
msgid_plural "{0} warnings"
@@ -27304,7 +29332,7 @@ msgid "no issues"
msgstr "cap problema"
msgid "please select a way"
-msgstr "si us plau seleccioneu una via"
+msgstr "per favor seleccioneu una via"
msgid "multiple objects with role ''{0}''"
msgstr "múltiples objectes amb el rol ''{0}''"
@@ -27316,13 +29344,13 @@ msgid "Accept the currently selected way"
msgstr "Acceptar la via seleccionada"
msgid "Paste from the clipboard"
-msgstr "Enganxa el contingut del porta-retalls"
+msgstr "Apega el contingut del porta-retalls"
msgid "Create new turn restriction"
msgstr "Crear una nova prohibició de gir"
msgid "Launch the turn restriction editor to create a new turn restriction"
-msgstr "Obre l''editor de prohibicions de gir per crear-ne una de nova"
+msgstr "Obri l''editor de prohibicions de gir per crear-ne una de nova"
msgid "No Right Turn"
msgstr "Prohibició de girar a la dreta"
@@ -27351,13 +29379,13 @@ msgstr ""
"''{0}''"
msgid "please select a turn restriction type"
-msgstr "si us plau seleccioneu un tipus de prohibició de gir"
+msgstr "per favor seleccioneu un tipus de prohibició de gir"
msgid ""
"Select the vehicle types this turn restriction is <strong>not</strong> "
"applicable for."
msgstr ""
-"Seleccioneu el tipus de vehicle per als que aquesta prohibició de gir "
+"Seleccioneu el tipus de vehicle per als que esta prohibició de gir "
"<strong>no</strong> és aplicable"
msgid "Public Service Vehicles"
@@ -27436,7 +29464,7 @@ msgid "Display and manage turn restrictions in the current data set"
msgstr "Mostrar i gestionar les prohibicions de gir del conjunt de dades"
msgid "Open an editor for the selected turn restriction"
-msgstr "Obre un editor per la prohibició de gir seleccionada"
+msgstr "Obri un editor per la prohibició de gir seleccionada"
msgid "Delete the selected turn restriction"
msgstr "Suprimeix la prohibició de gir seleccionada"
@@ -27492,7 +29520,7 @@ msgstr "Senyals de trànsit-Grup B"
msgid "Please select the set of road sign icons to be used in the plugin."
msgstr ""
-"Si us plau seleccioneu un grup de senyals de trànsit per ser utilitzades pel "
+"Per favor seleccioneu un grup de senyals de trànsit per ser utilitzades pel "
"connector."
msgid ""
@@ -27508,7 +29536,7 @@ msgid ""
"turn restriction, the way with role <tt>from</tt> should be different from "
"the way with role <tt>to</tt>, though."
msgstr ""
-"Aquesta prohibició de gir utilitza la via <span class=\"object-"
+"Esta prohibició de gir utilitza la via <span class=\"object-"
"name\">{0}</span> amb el rol <tt>from</tt> <strong>i</strong> amb el rol "
"<tt>to</tt>. A una prohibició de gir, la via amb el rol <tt>from</tt> ha de "
"ser diferent de la via que fa el rol <tt>to</tt>."
@@ -27539,9 +29567,9 @@ msgid ""
"the tag key <tt>restriction</tt>. It is recommended to use standard values "
"only. Please select one in the Basic editor."
msgstr ""
-"Aquesta prohibició de gir utilitza un tipus no estàndard de prohibició "
+"Esta prohibició de gir utilitza un tipus no estàndard de prohibició "
"<tt>{0}</tt> per a l''etiqueta de la clau <tt>restriction</tt> (prohibició). "
-"Es recomana d''utilitzar només valors estàndards Si us plau, seleccioneu-ne "
+"Es recomana d''utilitzar només valors estàndards Per favor, seleccioneu-ne "
"un a l''editor bàsic."
msgid "Go to Basic Editor and manually choose a turn restriction type"
@@ -27556,7 +29584,7 @@ msgid ""
msgstr ""
"La via <strong>from</strong> <span class=\"object-name\">{0}</span> i la via "
"<strong>to</strong> <span class=\"object-name\">{1}</span> es creuen al node "
-"<span class=\"object-name\">{2}</span> però aquest node no és un objecte de "
+"<span class=\"object-name\">{2}</span> però este node no és un objecte de "
"tipus <strong>via</strong>.<br> Es recomana de convertir-lo en un objecte "
"<strong>via</strong> únic."
@@ -27576,7 +29604,7 @@ msgid ""
"A turn restriction must declare the type of restriction. Please select a "
"type in the Basic Editor."
msgstr ""
-"Una prohibició de gir ha de tenir declarat un tipus de prohibició. Si us "
+"Una prohibició de gir ha de tindre declarat un tipus de prohibició. Si vos "
"plau seleccioneu un tipus a l''editor bàsic."
msgid "A way with role <tt>from</tt> is required in a turn restriction."
@@ -27586,16 +29614,16 @@ msgid "A way with role <tt>to</tt> is required in a turn restriction."
msgstr "Cal una via amb el rol <tt>to</tt> a una prohibició de gir."
msgid "Please go to the Basic editor and manually choose a way."
-msgstr "Si us plau, aneu a l''editor bàsic i seleccioneu una via manualment"
+msgstr "Per favor, aneu a l''editor bàsic i seleccioneu una via manualment"
msgid "Add in editor"
msgstr "Afegir a l''editor"
msgid "Add a way with role ''from''"
-msgstr "Afegeix una via amb el rol ''from''"
+msgstr "Afig una via amb el rol ''from''"
msgid "Add a way with role ''to''"
-msgstr "Afegeix una via amb el rol ''to''"
+msgstr "Afig una via amb el rol ''to''"
msgid ""
"The two ways participating in the turn restriction <strong>aren''t "
@@ -27618,17 +29646,15 @@ msgid ""
"A turn restriction requires exactly one way with role <tt>from</tt>. This "
"turn restriction has {0} ways in this role. Please remove {1} of them."
msgstr ""
-"Una prohibició de gir requereix una única via amb el rol <tt>from</tt>. "
-"Aquesta prohibició de gir te {0} vies amb aquest rol. Si us plau suprimiu "
-"{1}."
+"Una prohibició de gir requereix una única via amb el rol <tt>from</tt>. Esta "
+"prohibició de gir te {0} vies amb este rol. Per favor suprimiu {1}."
msgid ""
"A turn restriction requires exactly one way with role <tt>to</tt>. This turn "
"restriction has {0} ways in this role. Please remove {1} of them."
msgstr ""
-"Una prohibició de gir requereix una única via amb el rol <tt>to</tt>. "
-"Aquesta prohibició de gir te {0} vies amb aquest rol. Si us plau suprimiu "
-"{1}."
+"Una prohibició de gir requereix una única via amb el rol <tt>to</tt>. Esta "
+"prohibició de gir te {0} vies amb este rol. Per favor suprimiu {1}."
msgid "Go to the Advanced Editor and remove the members"
msgstr "Anar a l''editor avançat i suprimir els membres"
@@ -27649,10 +29675,10 @@ msgid "The required tag <tt>{0}={1}</tt> is missing."
msgstr "Manca l''etiqueta requerida <tt>{0}={1}</tt>."
msgid "Add missing tag"
-msgstr "Afegeix etiqueta que manca"
+msgstr "Afig etiqueta que manca"
msgid "Add the missing tag {0}={1}"
-msgstr "Afegeix l''etiqueta {0}={1} que manca"
+msgstr "Afig l''etiqueta {0}={1} que manca"
msgid ""
"The way <span class=\"object-name\">{0}</span> with role <tt>from</tt> and "
@@ -27684,14 +29710,14 @@ msgid ""
"This turn restriction uses the node <span class=\"object-name\">{0}</span> "
"as member with role <tt>{1}</tt>."
msgstr ""
-"Aquesta prohibició de gir utilitza el node <span class=\"object-"
+"Esta prohibició de gir utilitza el node <span class=\"object-"
"name\">{0}</span> com a membre amb el rol <tt>{1}</tt>."
msgid ""
"This turn restriction uses the relation <span class=\"object-"
"name\">{0}</span> as member with role <tt>{1}</tt>."
msgstr ""
-"Aquesta prohibició de gir utilitza la relació <span class=\"object-"
+"Esta prohibició de gir utilitza la relació <span class=\"object-"
"name\">{0}</span> com a membre amb el rol <tt>{1}</tt>."
msgid "A way is required instead."
@@ -27709,8 +29735,11 @@ msgstr "Recuperar un objecte esborrat ..."
msgid "Undelete object by id"
msgstr "Recuperar un objecte esborrat per ID"
-msgid "Select if the data should be added into a new layer"
-msgstr "Seleccionar si les dades han de ser afegides a una nova capa"
+msgid "Undelete Object"
+msgstr "Recuperar objecte esborrat"
+
+msgid "Undelete object"
+msgstr "Recuperar objecte esborrat"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -27719,11 +29748,8 @@ msgstr ""
"Indiqueu el tious i l''ID dels objectes esborrats que han de ser recuperats, "
"p.ex. \"n1 w2\""
-msgid "Undelete Object"
-msgstr "Recuperar objecte esborrat"
-
-msgid "Undelete object"
-msgstr "Recuperar objecte esborrat"
+msgid "Select if the data should be added into a new layer"
+msgstr "Seleccionar si les dades han de ser afegides a una nova capa"
msgid "Start undeleting"
msgstr "Inici de la recuperació"
@@ -27731,18 +29757,6 @@ msgstr "Inici de la recuperació"
msgid "Close dialog and cancel"
msgstr "Tancar la finestra i cancel·lar"
-msgid "Will get {0}"
-msgstr "S''obtindrà {0}"
-
-msgid "Looking for {0}"
-msgstr "Cercant {0}"
-
-msgid "Found {0}"
-msgstr "S''ha trobat {0}"
-
-msgid "More tools"
-msgstr "Més eines"
-
msgid "Add nodes at intersections"
msgstr "Afegir nodes a les interseccions"
@@ -27751,7 +29765,7 @@ msgstr ""
"Afegir els nodes que manquen a les interseccions de les vies seleccionades"
msgid "Please select one or more ways with intersections of segments."
-msgstr "Si us plau seleccioneu una o més vies amb interseccions"
+msgstr "Per favor seleccioneu una o més vies amb interseccions"
msgid "Align Way Nodes"
msgstr "Alinea els nodes de la via"
@@ -27769,36 +29783,27 @@ msgid "Extract node"
msgstr "Exteure un node"
msgid "Extracts node from a way"
-msgstr "Extreure un node d''una via"
+msgstr "Extraure un node d''una via"
msgid ""
"This tool extracts node from its ways and requires single node to be "
"selected."
msgstr ""
-"Aquesta eina extreu un node de les seves vies i requereix que seleccioneu un "
+"Esta eina extrau un node de les seues vies i requereix que seleccioneu un "
"únic node."
msgid "Extract node from line"
-msgstr "Extreure un node de la línia"
+msgstr "Extraure un node de la línia"
msgid "Paste Relations"
-msgstr "Enganxar relacions"
+msgstr "Apegar relacions"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-"Enganxa les pertinences a relacions dels objectes de la memòria intermèdia "
+"Apega les pertinences a relacions dels objectes de la memòria intermèdia "
"sobre els objectes seleccionats."
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Divideix l''objecte"
@@ -27820,7 +29825,7 @@ msgid ""
"The selected way is not a split way, please select split points or split way "
"too."
msgstr ""
-"La via seleccionada no està dividida, si us plau, seleccioneu els punts de "
+"La via seleccionada no està dividida, per favor, seleccioneu els punts de "
"divisió o dividiu la via."
msgid "The selected nodes can not be consecutive nodes in the object."
@@ -27846,20 +29851,20 @@ msgid ""
"Please select at least two nodes for symmetry axis and something else to "
"mirror."
msgstr ""
-"Si us plau, seleccioneu com a mínim dos nodes per definir l''eix de simetria "
+"Per favor, seleccioneu com a mínim dos nodes per definir l''eix de simetria "
"i un altre per rèplica."
msgid "Copy tags from previous selection"
msgstr "Copia etiquetes de la selecció prèvia"
msgid "Pastes tags of previously selected object(s)"
-msgstr "Enganxa les etiquetes dels objectes prèviament seleccionats"
+msgstr "Apega les etiquetes dels objectes prèviament seleccionats"
msgid "Add Source Tag"
-msgstr "Afegeix una font d''etiquetes"
+msgstr "Afig una font d''etiquetes"
msgid "Add remembered source tag"
-msgstr "Afegeix la font d''etiquetes memoritzada"
+msgstr "Afig la font d''etiquetes memoritzada"
msgid "UnGlue Relation"
msgstr "Separa relació"
@@ -27889,7 +29894,7 @@ msgstr "Seleccionar una URL personalitzada"
msgid "Please select one of custom URLs (configured in Preferences)"
msgstr ""
-"Si us plau seleccioneu una de les URL personalitzades (configurades a les "
+"Per favor seleccioneu una de les URL personalitzades (configurades a les "
"Preferències)"
msgid "Ask every time"
@@ -27899,19 +29904,19 @@ msgid "Configure custom URL"
msgstr "Configurar una URL personalitzada"
msgid "Open custom URL"
-msgstr "Obre la URL personalitzada"
+msgstr "Obri la URL personalitzada"
msgid "Opens specified URL browser"
-msgstr "Obre la URL especificada al nevegador web"
+msgstr "Obri la URL especificada al nevegador web"
msgid "Utilsplugin2 settings [TESTING]"
msgstr "Paràmetres d''Utilsplugin2 [PROVANT]"
msgid "Here you can change some preferences of Utilsplugin2 functions"
-msgstr "Aquí podeu canviar paràmetres de les funcions d''Utilsplugin2"
+msgstr "Ací podeu canviar paràmetres de les funcions d''Utilsplugin2"
msgid "Save to file"
-msgstr "Desa a un fitxer"
+msgstr "Guarda a un fitxer"
msgid "Load from file"
msgstr "Carrega d''un fitxer"
@@ -27925,10 +29930,10 @@ msgid ""
"latitude/longitude <br/> Your can manually load settings from file "
"<b>customurl.txt</b> in JOSM folder"
msgstr ""
-"Si us plau modifiqueu les URL persolaitzades i seleccioneu una fila per ser "
-"utilitzada amb aquesta eina<br/> <b>{key}</b> és reemplaçada amb "
-"el valor de l''etiqueta<br/> <b>{#id}</b> és reemplaçat amb el "
-"valor de l''element ID<br/> <b>{#type}</b> és reemplaçat amb el "
+"Per favor modifiqueu les URL persolaitzades i seleccioneu una fila per ser "
+"utilitzada amb esta eina<br/> <b>{key}</b> és reemplaçada amb el "
+"valor de l''etiqueta<br/> <b>{#id}</b> és reemplaçat amb el valor "
+"de l''element ID<br/> <b>{#type}</b> és reemplaçat amb el "
"\"node\", la \"via\" o la \"relació\" <br/> <b>{#lat} , "
"{#lon}</b> és reemplaçat per latitud/longitud del centre del mapa "
"<br/> Podeu carregar manualment la configuració del fitxer "
@@ -27937,18 +29942,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Configuració d''una URL personalitzada"
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Eina Lat Lon"
@@ -27984,7 +29977,7 @@ msgstr ""
"coma.<br/>Utilitzeu nombres positius o les lletres N o E per indicar les "
"direccions cardinals Nord o Est.<br/>Per a les direccions cardinals Sud i "
"Oest podeu utilitzar nombres negatius o les lletres S o W.<br/>Les "
-"coordenades han de ser en un d''aquests tres "
+"coordenades han de ser en un d''estos tres "
"formats:<ul><li><i>graus</i><tt>°</tt></li><li><i>graus</i><tt>°</tt>"
" <i>minuts</i><tt>'</tt></li><li><i>graus</i><tt>°</tt> "
"<i>minuts</i><tt>'</tt> <i>segons</i><tt>"</tt></li></ul>Els símbols "
@@ -28010,14 +30003,14 @@ msgid ""
"This tool replaces geometry of one object with another, and so requires "
"exactly two objects to be selected."
msgstr ""
-"Aquesta eina reemplaça la geometria d''un objecte per la d''un altre i "
+"Esta eina reemplaça la geometria d''un objecte per la d''un altre i "
"requereix que seleccioneu dos objectes."
msgid ""
"This tool can only replace a node, upgrade a node to a way or a "
"multipolygon, or replace a way with a way."
msgstr ""
-"Aquesta eina només pot reemplaçar un node, convertir un node en una via o un "
+"Esta eina només pot reemplaçar un node, convertir un node en una via o un "
"multipolígon, o reemplaçar una via per una altra."
msgid "Node belongs to way(s), cannot replace."
@@ -28034,8 +30027,8 @@ msgid ""
"Please select one way that exists in the database and one new way with "
"correct geometry."
msgstr ""
-"Si us plau seleccioneu una via existent a la base de dades i una nova via "
-"amb una geometria correcta."
+"Per favor seleccioneu una via existent a la base de dades i una nova via amb "
+"una geometria correcta."
msgid "The ways must be entirely within the downloaded area."
msgstr "Les vies han de ser completament dins de l''àrea descarregada."
@@ -28044,8 +30037,8 @@ msgid ""
"The way to be replaced cannot have any nodes with properties or relation "
"memberships unless they belong to both ways."
msgstr ""
-"La via a substituir no ha de tenir cap node amb propietats o que siguin part "
-"d''una relació, tret que pertanyin a les dues vies."
+"La via a substituir no ha de tindre cap node amb propietats o que siguen "
+"part d''una relació, tret que pertanyin a les dues vies."
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr ""
@@ -28082,7 +30075,7 @@ msgstr "Seleccionar les vies que s''interseccionen"
msgid "Please select some ways to find connected and intersecting ways!"
msgstr ""
-"Si us plau seleccioneu diferents vies per tal de trobar les que són "
+"Per favor seleccioneu diferents vies per tal de trobar les que són "
"connectades i s''interseccionen."
msgid "All intersecting ways"
@@ -28093,7 +30086,7 @@ msgstr "Seleccionar totes les vies que s''interseccionen"
msgid "Please select some ways to find all connected and intersecting ways!"
msgstr ""
-"Si us plau seleccioneu diferents vies per tal de trobar les que són "
+"Per favor seleccioneu diferents vies per tal de trobar les que són "
"interconnectades i s''intereseccionen !"
msgid "Middle nodes"
@@ -28103,7 +30096,7 @@ msgid "Select middle nodes"
msgstr "Seleccionar els nodes intermedis"
msgid "Please select two nodes connected by way!"
-msgstr "Si us plau seleccioneu dos nodes connectats per una via !"
+msgstr "Per favor seleccioneu dos nodes connectats per una via !"
msgid "Too many ways are added: {0}!"
msgstr "Han estat afegits massa vies: {0}!"
@@ -28118,8 +30111,8 @@ msgid ""
"Nothing found. Please select some closed ways or multipolygons to find all "
"primitives inside them!"
msgstr ""
-"Res trobat. Si us plau, seleccioneu algunes vies tancades o multipolígons "
-"per trobar els objectes al seu interior!"
+"Res trobat. Per favor, seleccioneu algunes vies tancades o multipolígons per "
+"trobar els objectes al seu interior!"
msgid "Area boundary [testing]"
msgstr "Límits de l''àrea [verificant]"
@@ -28132,7 +30125,7 @@ msgid ""
"Nothing found. Please select way that is a part of some polygon formed by "
"connected ways"
msgstr ""
-"Res trobat. Si us plau, seleccioneu una via que sigui part d''un polígon "
+"Res trobat. Per favor, seleccioneu una via que siga part d''un polígon "
"format per les vies connectades"
msgid "Select Highway"
@@ -28142,7 +30135,7 @@ msgid "Select highway for the name/ref given"
msgstr "Selecciona una carretera per al nom o la referència donada"
msgid "Please select one or two ways for this action"
-msgstr "Si us plau, seleccioneu una o dues vies per poder fer aquesta acció"
+msgstr "Per favor, seleccioneu una o dues vies per poder fer esta acció"
msgid "Select last modified nodes"
msgstr "Seleccionar els darrers nodes modificats"
@@ -28169,20 +30162,17 @@ msgstr "Desseleccionar nodes"
msgid "Removes all nodes from selection"
msgstr "Suprimir tots els nodes de la selecció"
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar un vídeo"
msgid "Sync a video against this GPS track"
-msgstr "Sincronitza un vídeo contra aquest track GPS"
+msgstr "Sincronitza un vídeo contra este track GPS"
msgid "Remove Video"
msgstr "Suprimir un vídeo"
msgid "removes current video from layer"
-msgstr "suprimir el vídeo actual de la capa"
+msgstr "suprimeix el vídeo actual de la capa"
msgid "Play/Pause"
msgstr "Reprodueix/Pausa"
@@ -28194,7 +30184,7 @@ msgid "Video: {0}"
msgstr "Vídeo: {0}"
msgid "Backward"
-msgstr "Endarrere"
+msgstr "Arrere"
msgid "jumps n sec back"
msgstr "salta n segons enrera"
@@ -28203,7 +30193,7 @@ msgid "Forward"
msgstr "Reenvia"
msgid "jumps n sec forward"
-msgstr "salta n segons endavant"
+msgstr "salta n segons avant"
msgid "Faster"
msgstr "Més ràpid"
@@ -28230,7 +30220,7 @@ msgid "loops n sec around current position"
msgstr "reproduir repetitivament n segons al voltant de la posició actual"
msgid "Keep centered"
-msgstr "Mantenir centrat"
+msgstr "Mantindre centrat"
msgid "follows the video icon automaticly"
msgstr "segueix la icona del vídeo automàticament"
@@ -28270,8 +30260,8 @@ msgid ""
"correctly installed on your system. Its architecture (32/64 bits) must also "
"be the same as the JRE that runs JOSM."
msgstr ""
-"La llibreria VLC no està correctament inicialitzad. Si us plau, verifiqueu "
-"que VLC {0} es troba correctament instal·lada al vostre sistema. La seva "
+"La llibreria VLC no està correctament inicialitzad. Per favor, verifiqueu "
+"que VLC {0} es troba correctament instal·lada al vostre sistema. La seua "
"arquitectura (32 o 64 bits) ha de ser la mateixa que el JRE amb el que "
"s''executa JOSM."
@@ -28302,8 +30292,8 @@ msgstr "bucle"
msgid "mute"
msgstr "silencia"
-msgid "Scanned Map..."
-msgstr "Mapa escanejat ..."
+msgid "Walking Papers Scanned Map"
+msgstr "Mapa Walking Papers escanejat"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28326,9 +30316,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Capa Walking Papers ({0}) en nivell d''ampliació {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Descarregar una via"
@@ -28383,7 +30370,7 @@ msgid "Node ''{0}'' is a junction with more than 2 connected ways."
msgstr "El node ''{0}'' és una unió entre més de 2 vies."
msgid "Enter search expression here.."
-msgstr "Indiqueu aquí l''expressió de cerca."
+msgstr "Indiqueu ací l''expressió de cerca."
msgid "Select waypoint to move map"
msgstr "Seleccioneu una fita per moure el mapa"
@@ -28401,7 +30388,7 @@ msgid "Select non-branching sequences of ways"
msgstr "Seleccioneu seqüències de vies no ramificades"
msgid "Add names from Wikipedia"
-msgstr "Afegeix noms de la viquipèdia"
+msgstr "Afig noms de la viquipèdia"
msgid ""
"Fetches interwiki links from Wikipedia in order to add several name tags"
@@ -28413,6 +30400,8 @@ msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
+"Copia el model {0} al porta-retalls del sistema instanciat amb les "
+"coordenades del primer node seleccionat."
msgid "Copy {0} template"
msgstr "Copia la plantilla {0}"
@@ -28424,6 +30413,8 @@ msgid ""
"Double click on item to search for object with article name (and center "
"coordinate)"
msgstr ""
+"Feu doble clic sobre l''element per cercar l''objecte amb el nom de "
+"l''article (i centrar a les seues coordenades)"
msgid "Available via WIWOSM server"
msgstr "Disponible a través del servidor WIWOSM"
@@ -28444,7 +30435,7 @@ msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr "Mostra les coordenades de la Viquipèdia a la vista actual"
msgid "coordinates"
-msgstr ""
+msgstr "coordenades"
msgid "Category"
msgstr "Categoria"
@@ -28457,20 +30448,21 @@ msgid "Enter the Wikipedia category"
msgstr "Indiqueu una categoria de la viquipèdia"
msgid "Clipboard"
-msgstr ""
+msgstr "Porta-retalls"
msgid "Pastes Wikipedia articles from the system clipboard"
msgstr ""
+"Apega els articles de la Viquipèdia des del porta-retalls del sistema"
msgid "clipboard"
-msgstr ""
+msgstr "porta-retalls"
msgid "Open Article"
-msgstr "Obre l''article"
+msgstr "Obri l''article"
msgid "Opens the Wikipedia article of the selected item in a browser"
msgstr ""
-"Obre l''article de la Viquipèdia sobre l''element seleccionat a un navegador "
+"Obri l''article de la Viquipèdia sobre l''element seleccionat a un navegador "
"web"
msgid "Sets the default language for the Wikipedia articles"
@@ -28479,15 +30471,12 @@ msgstr "Estableix la llengua per defecte per als articles de la Viquipèdia"
msgid "Enter the Wikipedia language"
msgstr "Indiqueu el lleguatge per a la Viquipèdia"
-msgid "Add Tag"
-msgstr "Afegeix etiqueta"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
-"Afegeix una etiqueta \"wikipedia\" corresponent a aquest article als "
-"objectes seleccionats"
+"Afig una etiqueta \"wikipedia\" corresponent a este article als objectes "
+"seleccionats"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr "Ultimate WMS Super-speed Turbo Challenge II"
@@ -28496,4 +30485,4 @@ msgid "Go driving"
msgstr "Anar en cotxe"
msgid "Drive a race car on this layer"
-msgstr "Conduir un cotxe de carreres sobre aquesta capa"
+msgstr "Conduir un cotxe de carreres sobre esta capa"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 7dfa81c..7fd3967 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:33+0000\n"
-"Last-Translator: Acci <jakub.onderka at gmail.com>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-11-29 12:17+0000\n"
+"Last-Translator: Jezevec <Unknown>\n"
"Language-Team: Czech <cs 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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2013-04-05 04:37+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,8 +50,23 @@ msgstr "Podmínky použití podkladové mapy"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Otevírání odkazů není na současné platformě (''{0}'') podporováno"
+msgid "ERROR: {0}"
+msgstr "CHYBA: {0}"
+
+msgid "WARNING: {0}"
+msgstr "VAROVÁNÍ: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "LADĚNÍ: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
-msgstr "Provádím připojování k startu platformy"
+msgstr "Startovací činnosti specfické pro platformu"
msgid "Building main menu"
msgstr "Sestavování hlavního menu"
@@ -87,7 +102,7 @@ msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
msgstr "Parametr \"downloadgps\" neakceptuje jména souborů nebo URL"
msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorují se nekorektní URL: \"{0}\""
+msgstr "Ignoruji vadné URL: \"{0}\""
msgid ""
"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
@@ -153,19 +168,18 @@ msgid "About JOSM..."
msgstr "O JOSM…"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"VAROVÁNÍ: neočekávaný formát základní URL adresu rozhranní API. Přesměrování "
-"do informační stránky nebo stránky historie OSM objektu pravděpodobně selže. "
-"Základní URL adresa rozhranní API je: \"{0}\""
+"Formát URL pro API nebyl rozponán. Přesměrování na stránku s informaci či "
+"historií objektu OSM pravděpodobně selže. Základ pro URL API: \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Varování: neočekávaný formát základní URL API. Přesměrování na uživatelskou "
-"stránku OSM prvku pravděpodobně selže. Základní URL API je: ''{0}''"
+"Formát URL pro API nebyl rozponán. Přesměrování na stránku uživatele "
+"pravděpodobně selže. Základ pro URL API: \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -211,11 +225,14 @@ msgstr "Žádné cílové vrstvy"
msgid "Add imagery layer {0}"
msgstr "Přidat vrstvu podkladových map {0}"
+msgid "Select image format for WMS layer"
+msgstr "Vyber obrazový formát pro vrstvu WMS"
+
msgid "Select WMS layers"
-msgstr ""
+msgstr "Vybrat WMS vrstvy"
msgid "Add layers"
-msgstr ""
+msgstr "Přidat vrstvy"
msgid "Invalid service URL."
msgstr "Neplatné URL služby."
@@ -252,9 +269,6 @@ msgstr "Nástroj: {0}"
msgid "Please select at least four nodes."
msgstr "Vyberte minimálně 4 uzly"
-msgid "Information"
-msgstr "Informace"
-
msgid "Align Nodes in Line"
msgstr "Seřadit uzly do přímky"
@@ -279,6 +293,9 @@ msgstr "konflikt"
msgid "download"
msgstr "stáhnutou oblast"
+msgid "problem"
+msgstr "problém"
+
msgid "previous"
msgstr "předchozí"
@@ -288,6 +305,9 @@ msgstr "následující"
msgid "Nothing selected to zoom to."
msgstr "Není zvoleno nic co by se dalo přiblížit"
+msgid "Information"
+msgstr "Informace"
+
msgid "Zoom to {0}"
msgstr "Zvětšit na {0}"
@@ -344,12 +364,12 @@ msgstr ""
"orientaci?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)"
+msgstr "Nemohu spojit cesty.<br>(Nemohou být spojeny do jednoho uzlu)"
msgid "Combine {0} ways"
-msgstr "Kombinovat {0} cesty"
+msgstr "Spojit {0} cesty"
msgid "Please select at least two ways to combine."
msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
@@ -402,18 +422,37 @@ msgstr "Smazat"
msgid "Delete selected objects."
msgstr "Smazat označené objekty"
+msgid "Toggle dialogs panel"
+msgstr "Přepínat panely dialogů"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Přepínat panely dialogů, maximalizovat zobrazení mapy"
+
msgid "Distribute Nodes"
msgstr "Rozdělit uzly"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Rozdělit zvolené uzly ve stejné vzdálenosti podél přímky."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignoruje sa {0} bodov s prázdnymi súradnicami"
+
msgid "Download from OSM..."
msgstr "Stáhnout z OSM..."
msgid "Download map data from the OSM server."
msgstr "Stáhnout data z OSM serveru"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Tato akce bude potřebovat<br>{0} samostatných stažení dat.<br>Chcete "
+"pokračovat?</html>"
+
+msgid "Download data"
+msgstr "Stáhnout data"
+
msgid "Download object..."
msgstr "Stáhnout objekt..."
@@ -514,6 +553,9 @@ msgstr "Historie"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Zobrazit historii cest, uzlů a relací v OSM."
+msgid "Show history"
+msgstr "Zobrazit historii"
+
msgid "History (web)"
msgstr "Historie (web)"
@@ -638,11 +680,9 @@ msgid "Joined overlapping areas"
msgstr "Spojeny překrývající se plochy"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Některé z cest byly prvky relací, které byly změněny. Prosíme, ověřte, zda "
-"tímto nedošlo ke vzniku chyb."
msgid "Fix tag conflicts"
msgstr "Opravit konflikty tagů"
@@ -778,7 +818,7 @@ msgid "Merge the current layer into another layer"
msgstr "Sloučit aktuální vrstvu do jiné vrstvy"
msgid "Merging layers with different upload policies"
-msgstr ""
+msgstr "Slučování vrstev s odlišnými pravidly nahrávání"
msgid ""
"You are about to merge data between layers ''{0}'' and ''{1}''.<br /><br "
@@ -789,6 +829,13 @@ msgid ""
"one by one, by using ''<i>Merge selection</i>''.<br /><br />Are you sure you "
"want to continue?"
msgstr ""
+"Chystáte sa zlúčiť dáta medzi vrstvami \"{0}\" a \"{1}\".<br /><br />Tieto "
+"vrstvy majú odlišné nahrávacie stratégie a nemali by byť zlúčené tak ako "
+"sú.<br />Ich zlúčenie bude mať za následok vynútenie striktnejšej stratégie "
+"(neodporúčané nahratie) pre ''{1}''.<br /><br /><b>Toto nie je odporúčaný "
+"spôsob zlúčenia dát</b>.<br />Miesto toho by ste mali skontrolovať a zlúčiť "
+"každý objekt jeden po druhom, použitím funkcie ''<i>Zlúčiť výber</i>''.<br "
+"/><br />Naozaj chcete pokračovať?"
msgid "Ignore this hint and merge anyway"
msgstr "Sluč vrstvy i přes tuto poznámku"
@@ -800,11 +847,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Spoj uzly do nejstaršího"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Aby bylo možné body spojit, vyberte prosím alespoň dva body, nebo jeden bod "
-"v blízkosti jiného."
+"Označte prosím alespoň dva uzly, které chcete spojit, nebo jeden uzel, který "
+"je blízko jinému."
msgid "Abort Merging"
msgstr "Zrušit slučování"
@@ -835,6 +882,10 @@ msgid ""
"data</b>.<br />You should instead check and merge each object, <b>one by "
"one</b>.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Chystáte sa zlúčiť viac ako 1 objekt medzi vrstvami \"{0}\" a \"{1}\".<br "
+"/><br /><b>Toto nie je odporúčaný spôsob ako zlučovať dáta</b>.<br />Miesto "
+"toho by ste mali skontrolovať a zlúčiť každý objekt, <b>jeden po "
+"druhom</b>.<br /><br />Naozaj chcete pokračovať?"
msgid "Mirror"
msgstr "Zrcadlit"
@@ -971,11 +1022,9 @@ msgid "Download Data"
msgstr "Stáhnout data"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Nelze otevřít URL ''{0}'' protože neexistuje vhodná metoda "
-"stahování.</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1007,13 +1056,9 @@ msgid "Orthogonalize / Undo"
msgstr "Pravoúhlost / Zpět"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr "Ortogonální tvar / Zpět"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Zpět ortogonální tvar"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
+msgstr ""
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1033,9 +1078,6 @@ msgstr "Ortogonalizovat"
msgid "Usage"
msgstr "Využití"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Vybrané prvky nelze uspořádat do pravých úhlů"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1153,6 +1195,15 @@ msgstr "Přejmenovat také soubor"
msgid "Could not rename file ''{0}''"
msgstr "Nemohu přejmenovat soubor ''{0}''"
+msgid "Restart"
+msgstr "Restartovat"
+
+msgid "Restart the application."
+msgstr "Restartovat aplikaci"
+
+msgid "Click to restart later."
+msgstr "Klikněte pro pozdější restartování."
+
msgid "Reverse way"
msgstr "Otočit směr cesty"
@@ -1205,9 +1256,6 @@ msgstr "Načíst sezení"
msgid "Load a session from file."
msgstr "Načíst sezení ze souboru."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Soubor s uloženým sezením (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Otevřít sezení"
@@ -1274,6 +1322,9 @@ msgstr "Zpráva o stavu"
msgid "Copy to clipboard and close"
msgstr "Zkopírovat do schránky a zavřít"
+msgid "Report bug"
+msgstr "Nahlásit chybu"
+
msgid "Close"
msgstr "Zavřít"
@@ -1356,19 +1407,18 @@ msgstr ""
"cesty.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Relace založená na rolích byla zkopírována na všechny nové "
-"cesty.<br>Mělo by být ověřeno, zda je zkopírování správné a případně "
-"opraveno.</html>"
+"Členství i s rolí bylo zkopírováno do všech nových cest.<br>Je třeba provést "
+"kontrolu a případné opravy."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Členství v relaci bylo zkopírováno na všechny nové cesty.<br>Mělo by "
-"být ověřeno, zda je zkopírování správné a případně opraveno.</html>"
+"Členství v relacích bylo zkopírováno do všech nových cest.<br>Je třeba "
+"provést kontrolu a případné opravy."
msgid "Split way {0} into {1} parts"
msgstr "Rozdělit cestu {0} do {1} částí"
@@ -1470,6 +1520,29 @@ msgstr ""
"Chystáte se oddělit neúplné objekty. <br>To způsobí problémy, protože "
"nevidíte skutečné objekty. <br>Opravdu si přejete uzly oddělit?"
+msgid "Disconnect Node from Way"
+msgstr "Odpojit uzel od cesty"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Odpojit uzel z cesty na které leží"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Vyberte alespoň jeden uzel, který má být odpojen"
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Vybraný bod není čeho odpojit."
+msgstr[1] "Vybrané body není čeho odpojit."
+msgstr[2] "Vybrané body není čeho odpojit."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] "Dotčená cesta by po odpojení uzlu přestala existovat."
+msgstr[1] "Dotčená cesta by po odpojení uzlů přestala existovat."
+msgstr[2] "Dotčená cesta by po odpojení uzlů přestala existovat."
+
msgid "Undo"
msgstr "Zpět"
@@ -1494,9 +1567,6 @@ msgstr "Aktualizovat data"
msgid "Updates the objects in the active data layer from the server."
msgstr "Aktualizuje ze serveru objekty v aktuální datové vrstvě."
-msgid "Download data"
-msgstr "Stáhnout data"
-
msgid "Update modified"
msgstr "Aktualizovat modifikované"
@@ -1698,6 +1768,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Zpomalené přehrávání"
+msgid "Download GPS"
+msgstr "Stiahnuť GPS"
+
msgid "Downloading GPS data"
msgstr "Stahování dat GPS"
@@ -1707,6 +1780,18 @@ msgstr "Stažená GPX data"
msgid "Markers from {0}"
msgstr "Značky z {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Stiahnuť komprimovanú OSM zmenu"
+
+msgid "Download OSM Change"
+msgstr "Stiahnuť OSM zmenu"
+
+msgid "Download Compressed OSM"
+msgstr "Stiahnuť komprimované OSM"
+
+msgid "Download OSM"
+msgstr "Stiahnuť OSM"
+
msgid "Downloading data"
msgstr "Stahování dat"
@@ -1724,7 +1809,34 @@ msgid "Command"
msgstr "Příkaz"
msgid "Request details: {0}"
-msgstr ""
+msgstr "Detaily dotazu: {0}"
+
+msgid "Download OSM URL"
+msgstr "Stiahnuť OSM URL"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Nastal konflikt {0} během importu"
+msgstr[1] "Nastaly konflikty {0} během importu"
+msgstr[2] "Nastaly konflikty {0} během importu"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt během stahování"
+msgstr[1] "Konflikty během stahování"
+msgstr[2] "Konflikty během stahování"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Nahrávám rodiče uzlu {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Nahrávám rodiče cesty {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Nahrávám rodiče relace {2}"
+
+msgid "Download session"
+msgstr "Stáhni sezení"
msgid "Download {0} of {1} ({2} left)"
msgstr "Stahování {0} z {1} ({2} zbývá"
@@ -1795,27 +1907,6 @@ msgstr "Během hromadného stahování došlo k následujícím chybám: {0}"
msgid "Errors during download"
msgstr "Chyby během stahování"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Nastal konflikt {0} během importu"
-msgstr[1] "Nastaly konflikty {0} během importu"
-msgstr[2] "Nastaly konflikty {0} během importu"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt během stahování"
-msgstr[1] "Konflikty během stahování"
-msgstr[2] "Konflikty během stahování"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Nahrávám rodiče uzlu {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Nahrávám rodiče cesty {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Nahrávám rodiče relace {2}"
-
msgid "Error during download"
msgstr "Nastala chyba během stahování"
@@ -1848,7 +1939,7 @@ msgid "Backspace in Add mode"
msgstr "Backspace v režimu změn"
msgid "helper line"
-msgstr ""
+msgstr "pomocná čára"
msgid "Cannot add a node outside of the world."
msgstr "Nemůžu přidat uzel ležící mimo Zemi."
@@ -1902,7 +1993,7 @@ msgid "draw angle snap highlight"
msgstr "Zvýraznění přichytávání úhlů"
msgid "Toggle snapping by {0}"
-msgstr ""
+msgstr "přepínat přichytávání {0}"
msgid "Show helper geometry"
msgstr "Ukázat pomocnou geometrii"
@@ -1949,10 +2040,10 @@ msgstr ""
"normály. Alt - vytvoření nového obdélníku, dvojklik - přidání nového bodu."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Vytiahnuť: hlavné línie"
msgid "Extrude: helper line"
-msgstr ""
+msgstr "Vytiahnuť: linku pomoci"
msgid "Extrude Way"
msgstr "Vytáhnout cestu"
@@ -1963,6 +2054,9 @@ msgstr "Zvyšování přesnosti cest"
msgid "Improve Way Accuracy mode"
msgstr "Režim Zvyšovánípřesnosti cest"
+msgid "improve way accuracy helper line"
+msgstr "pomocná čiara pre zvýšenie presnosti cesty"
+
msgid "Click on the way to start improving its shape."
msgstr "Klikněte na cestu a začněte zpřesňovat její tvar"
@@ -1993,11 +2087,11 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Nemohu umístit uzel mimo svět."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Přidat nový uzel do cesty"
-msgstr[1] "Přidat nový uzel do {0} cest"
-msgstr[2] "Přidat nový uzel do {0} cest"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Přidat nový bod do cesty"
+msgstr[1] "Přidat nový bod do {0} cest"
+msgstr[2] "Přidat nový bod do {0} cest"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Nemohu odstranit uzel odkazovaný více cestami."
@@ -2011,6 +2105,9 @@ msgstr "Paralelní"
msgid "Make parallel copies of ways"
msgstr "Vytvořit paralelní kopie cest"
+msgid "make parallel helper line"
+msgstr "vytvoriť paralelnú pomocnú čiaru"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2466,6 +2563,9 @@ msgstr "\"hodnota\" v libovolném klíči"
msgid "matches if ''key'' exists"
msgstr "shoduje se pokud \"klíč\" existuje"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "kombinace"
@@ -2486,6 +2586,9 @@ msgid ""
"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
"<b>\\\\</b>)."
msgstr ""
+"deaktivovať operátory.<br>V rámci reťazcov v úvodzovkách musia byť znaky "
+"<b>\"</b> a <b>\\</b> sprevádzané pomocou predchádzajúceho <b>\\</b> (napr. "
+"<b>\\\"</b> a <b>\\\\</b>)."
msgid "objects"
msgstr "objekty"
@@ -2500,7 +2603,7 @@ msgid "all closed ways"
msgstr "všechny uzavřené cesty"
msgid "object without useful tags"
-msgstr ""
+msgstr "objekt bez užitočných značiek"
msgid "metadata"
msgstr "metadata"
@@ -2551,7 +2654,7 @@ msgid "all incomplete objects"
msgstr "všechny nekompletní objekty"
msgid "related objects"
-msgstr ""
+msgstr "súvisiace objekty"
msgid "all children of objects matching the expression"
msgstr "všichni potomci objektů vyhovujících podmínkám"
@@ -2560,10 +2663,10 @@ msgid "all parents of objects matching the expression"
msgstr "všichni rodiče objektů vyhovujících podmínkám"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "n-tý člen relácie a/alebo n-tý bod cesty"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "každý n-tý člen relácie a/alebo každý n-tý bod cesty"
msgid "view"
msgstr "zobrazení"
@@ -2632,14 +2735,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Očekávám <i>min</i>/<i>max</i> za ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Očekáváno ID prvku"
+msgid "Range of primitive ids expected"
+msgstr "Očakáva sa rozsah identifikátorov (ID) základných objektov"
-msgid "Changeset id expected"
-msgstr "Očekáváno ID sady změn"
+msgid "Range of changeset ids expected"
+msgstr "Očakáva sa rozsah identifikátorov (ID) súborov zmien."
-msgid "Version expected"
-msgstr "Očekávána verze"
+msgid "Range of versions expected"
+msgstr "Očakáva sa rozsah verzií"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2649,6 +2752,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace"
+msgid "Primitive id expected"
+msgstr "Očekáváno ID prvku"
+
msgid "Range of numbers expected"
msgstr "Číselný rozsah byl překročen"
@@ -2667,10 +2773,8 @@ msgstr "Chybějící parametr pro XOR"
msgid "Missing operator for NOT"
msgstr "Chybějící operátor pro NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Upozornění: automaticky ořezávám hodnotu tagu ''{0}'' u smazaného objektu {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2693,10 +2797,10 @@ msgid "Cyclic dependency between relations:"
msgstr "Kruhová závislost mezi relacemi:"
msgid "Removed obsolete tags"
-msgstr ""
+msgstr "Odobraté zastarané značky"
msgid "Fix deprecated tags"
-msgstr ""
+msgstr "Opraviť zastarané značky"
msgid ""
"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -2765,6 +2869,9 @@ msgstr[0] "Přidán {0} objekt"
msgstr[1] "Přidány {0} objekty"
msgstr[2] "Přidáno {0} objektů"
+msgid "New way {0} has 0 nodes"
+msgstr "Nová cesta {0} nemá žádné body"
+
msgid "Change node {0}"
msgstr "Změnit bod {0}"
@@ -2801,11 +2908,11 @@ msgstr "Odstranit \"{0}\" pro {1} objekt(ů)"
msgid "Set {0}={1} for {2} objects"
msgstr "Nastavit {0}={1} pro {2} objekt(ů)"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Smazáno {0} vlastností pro {1} objektů"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "Smazáno {0} tagů na {1} objektech"
-msgid "Set {0} properties for {1} objects"
-msgstr "Nastaveno {0} vlastností pro {1} objektů"
+msgid "Set {0} tags for {1} objects"
+msgstr "Nastaveno {0} tagů na {1} objektech"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Zaměňte \"{0}\" za \"{1}\" pro"
@@ -2830,11 +2937,10 @@ msgid "Double conflict"
msgstr "Dvojí konflikt"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
-msgstr ""
-"Varování: vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt objektu "
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
"''{1}''."
+msgstr ""
+"Vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt pro objekt ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Přidání konfliktu pro ''{0}''"
@@ -2958,6 +3064,9 @@ msgstr[2] "Odstraněno {0} objektů"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Vyřešit konflikty v seznamu členů relace {0}"
+msgid "Removed nodes from {0}"
+msgstr "Uzly odstraněny z {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Otočit uzel {0}"
@@ -3015,17 +3124,25 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
+"<html>Chystáte sa otočiť smer cesty ''{0}'',<br/> ktorej významový zmysel "
+"značky ''{1}'' je definovaný jej smerom.<br/> Naozaj chcete zmeniť smer "
+"cesty a tým aj jej významový zmysel?</html>"
msgstr[1] ""
+"<html>Chystáte sa otočiť smer cesty ''{0}'',<br/> u ktorej významový zmysel "
+"jej značiek je definovaný jej smerom: ''{1}''<br/> Naozaj chcete zmeniť smer "
+"cesty a tým aj jej významový zmysel?</html>"
+msgstr[2] ""
+"<html>Chystáte sa otočiť smer cesty ''{0}'',<br/> u ktorej významový zmysel "
+"jej značiek je definovaný jej smerom: ''{1}''<br/> Naozaj chcete zmeniť smer "
+"cesty a tým aj jej významový zmysel?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Otočiť smerovanú cestu."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Při otáčení směru cesty jsou kvůli zachování konzistence dat doporučeny "
-"následující změny vlastností cesty a jejích bodů."
msgid "Relation"
msgstr "Vztah"
@@ -3054,11 +3171,11 @@ msgstr "Použít zvolené změny"
msgid "Do not apply changes"
msgstr "Neprovádět změny"
-msgid "Please select which property changes you want to apply."
-msgstr "Prosím vyberte které změny vlastností chcete použít."
+msgid "Please select which changes you want to apply."
+msgstr "Vyberte si prosím změny, které chcete aplikovat."
-msgid "Properties of "
-msgstr "Vlastnosti "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Role v relaci odkazující na"
@@ -3079,6 +3196,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Nemohu smazat starý záložní soubor {0}"
+msgid "Your work has been saved automatically."
+msgstr "Vaše práce byla automaticky uložena."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Chyba při vytváření zálohy odstraněné vrstvy: {0}"
@@ -3108,22 +3228,23 @@ msgid ""
"default value is unknown at this moment.<br/> Please activate corresponding "
"function manually and retry importing."
msgstr ""
+"<html>Nastavenie súboru žiada pripojiť preferencie <b>{0}</b>,<br/> , ale "
+"jeho východisková hodnota je v tomto okamihu neznáma.<br/> Aktivujte si "
+"prosím zodpovedajúcu funkciu ručne a skúste to znova importovať."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Varování: Vytváření chybějícího adresáře mezipaměti selhalo: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Chybějící adresář cache se nepodařilo vytvořit: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Nepodařilo se vytvořit chybějící adresář cache: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Upozornění: chyba při ukládání předvoleb do ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Varování: Nepodařilo se načíst konfiguraci. Nastavená cesta ''{0}'' není "
-"adresářem."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3133,11 +3254,11 @@ msgstr ""
"rejstříkem.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Upozornění: Inicializace předvoleb selhala. Nepodařilo se vytvořit chybějící "
-"rejstřík předvoleb ''{0}''"
+"Předvolby se nepodařilo inicializovat. Chybějící adresář s předvobami "
+"\"{0}\" nelze vytvořit."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3146,17 +3267,15 @@ msgstr ""
"<html>Inicializace předvoleb selhala. <br/>Nepodařilo se vytvořit chybějící "
"rejstřík předvoleb ''{0}''</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Info: Chybí soubor s nastaveními ''{0}''. Vytvářím výchozí soubor nastavení."
+"Soubor předvoleb \"{0}\" nenalezen. Vytvářím výchozí soubor předvoleb."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Varování: Nahrazuji existující soubor s nastavením ''{0}'' souborem s "
-"výchozím nastavením."
+"Nahrazuji současný soubor s předvolbami \"{0}\" souborem se standardními "
+"výchozími předvolbami."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3174,11 +3293,9 @@ msgstr ""
"výchozími hodnotami.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Upozornění: Inicializace předvoleb selhala. Nepodařilo se obnovit výchozí "
-"hodnoty souboru předvoleb: {0}"
msgid "Paint style {0}: {1}"
msgstr "Styl kreslení {0}: {1}"
@@ -3207,14 +3324,11 @@ msgstr "Nepodařilo se načíst zdroj ''{0}'', chyba je {1}."
msgid "UNKNOWN"
msgstr "NEZNÁMÝ"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr ""
-"Upozornění: neočekávané číslo verze JOSM v souboru s vydáními, hodnota je "
-"''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr "Neočekávané číslo veze JOSM v revizním souboru \"{0}\""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Varování: soubor revizí ''/REVISION'' chybí."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Již je registrován konflikt pro objekt ''{0}''."
@@ -3371,7 +3485,7 @@ msgid "Deleted node referenced by {0}"
msgstr "Uzel odkazovaný {0} byl smazán"
msgid "Complete node {0} with null coordinates in way {1}"
-msgstr ""
+msgstr "Kompletný bod {0} s neplatnými súradnicami v ceste {1}"
msgid ""
"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
@@ -3380,11 +3494,8 @@ msgstr "Nelze srovnat objekt s ID ''{0}'' s objektem s ID ''{1}''."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Chyba: nepodařilo se načíst třídu mapového renederu ''{0}''. Třída nebyla "
-"nalezena."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3448,7 +3559,7 @@ msgid "highlight"
msgstr "zvýraznit"
msgid "highlight wireframe"
-msgstr ""
+msgstr "zvýraznenie drôtového modelu"
msgid "untagged"
msgstr "neotagovaný"
@@ -3466,16 +3577,16 @@ msgid "Unkown parameter: ''{0}''."
msgstr "Neznámý parametr: ''{0}''."
msgid "Value expected for parameter ''{0}''."
-msgstr ""
+msgstr "Očakávaná hodnota pre parameter ''{0}''."
msgid "No value expected for parameter ''{0}''."
-msgstr ""
+msgstr "Žiadna hodnota nebola očakávaná pre parameter ''{0}''."
msgid "Unexpected parameter format (''{0}'')"
msgstr "Neočekávaný formát parametru (''{0}'')"
msgid "Value ''{0}'' for option +init not supported."
-msgstr ""
+msgstr "Hodnota ''{0}'' pre možnosť + init nie je podporovaný."
msgid ": "
msgstr ": "
@@ -3487,7 +3598,7 @@ msgid "Combination of ellipsoid parameters is not supported."
msgstr "Tato kombinace parametrů elipsoidu není podporována."
msgid "Ellipsoid required (+ellps=* or +a=*, +b=*)"
-msgstr ""
+msgstr "Elipsoid vyžaduje (+ ellps = * alebo + = *, + b = *)"
msgid "Grid shift file ''{0}'' for option +nadgrids not supported."
msgstr ""
@@ -3495,8 +3606,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Neznámý identifikátor data: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Požadováno datum (+datum=*, +towgs84=* nebo +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr ""
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3514,6 +3625,9 @@ msgstr "Neznámý identifikátor projekce: ''{0}''"
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr "Neočekávaný počet argumentů parametru ''+bounds'' (musí být 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Neznámy parameter ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Neočekávaný počet argumentů parametru ''{0}''"
@@ -3531,10 +3645,6 @@ msgstr "Vlastní nastavení projekce"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Chyba: selhalo otevírání vstupního datového proudu zdroje ''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3545,7 +3655,7 @@ msgid "Lambert Conformal Conic"
msgstr "Lamertovo úhlojevné kuželové zobrazení"
msgid "Lat/lon (Geodetic)"
-msgstr ""
+msgstr "Zeměpisné geodetické souřadnice (Lat/Lon)"
msgid "Mercator"
msgstr "Mercatorova projekce"
@@ -3575,29 +3685,41 @@ msgstr "ostatní kontroly"
msgid "Running test {0}"
msgstr "Spouštím test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Test ''{0}'' dokončen za {1}"
+
msgid "Addresses"
msgstr "Adresy"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr ""
+msgstr "Zkontrolujte chyby v adresách a přidružených relacích."
msgid "Multiple associatedStreet relations"
-msgstr ""
+msgstr "Několik přidružených relací adres"
msgid "House number without street"
-msgstr ""
+msgstr "Číslo domu bez ulice"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Číslo domu ''{0}'' je duplicitné"
msgid "Duplicate house numbers"
-msgstr ""
+msgstr "Duplicitné čísla domov"
msgid "Multiple street names in relation"
-msgstr ""
+msgstr "Viacnásobný počet názvu ulice v relácii"
msgid "House number too far from street"
-msgstr ""
+msgstr "Dom číslo je príliš ďaleko od ulice"
+
+msgid "Barriers and entrances"
+msgstr "Bariéry a vstupy"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Zkontroluje chyby v bariérách a vstupech."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Na bariéře není nastaven vstup"
msgid "Building inside building"
msgstr "Budova uvnitř budovy"
@@ -3634,7 +3756,7 @@ msgid "Crossing buildings"
msgstr "Křížící se budovy"
msgid "Crossing waterways"
-msgstr ""
+msgstr "Križovanie vodných ciest"
msgid "Crossing waterway/highway"
msgstr "Křížící se vodní tok a silnice"
@@ -3660,6 +3782,9 @@ msgstr " nebo "
msgid "{0} is deprecated, use {1} instead"
msgstr "Štítek {0} je zavržený, použijte míste něj {1}"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Duplicitní uzly"
@@ -3667,9 +3792,6 @@ msgid "This test checks that there are no nodes at the very same location."
msgstr ""
"Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Duplicitní body ve dvou neuzavřených cestách"
-
msgid "Mixed type duplicated nodes"
msgstr "Smíšené typy duplicitních bodů"
@@ -3741,6 +3863,24 @@ msgstr "Duplicitní uzly v cestě"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Zkontroluje cesty jestli neobsahují identické uzly za sebou."
+msgid "Highways"
+msgstr "Silniční síť"
+
+msgid "Performs semantic checks on highways."
+msgstr "Vykonať kontroly zmyslu na cestách."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Chybný kruhový objazd (highway: {0} namiesto {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolygon"
@@ -3801,13 +3941,13 @@ msgid "A name is missing, even though name:* exists."
msgstr "Chybí tag name, ačkoliv name:* existuje."
msgid "Nodes duplicating way tags"
-msgstr ""
+msgstr "Body duplikujúce značky cesty"
msgid "Checks for nodes that have the same tags as their parent way."
-msgstr ""
+msgstr "Hľadá body, ktoré majú rovnaké značky ako cesta ktorej sú súčasťou."
msgid "Nodes duplicating parent way tags"
-msgstr ""
+msgstr "Body duplikujúce značky cesty ktorej sú súčasťou"
msgid "Nodes with same name"
msgstr "Uzly se stejným jménem"
@@ -3816,6 +3956,12 @@ msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
"Tento test kontroluje, jestli nemají uzly stejné jméno (mohou být duplikáty)."
+msgid "Opening hours syntax"
+msgstr "Syntaxe otevíracích hodin"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr "Tento test kontroluje korektní zápis otevíracích hodin."
+
msgid "Overlapping Areas"
msgstr "Překrývající se plochy"
@@ -3823,7 +3969,7 @@ msgid "This test checks if areas overlap."
msgstr "Tento test kontroluje překryv ploch."
msgid "Overlapping Water Areas"
-msgstr ""
+msgstr "Překrývající se vodní plochy"
msgid "Overlapping ways"
msgstr "Překrývající se cesty"
@@ -3859,6 +4005,7 @@ msgstr "Elektrická vedení"
msgid ""
"Checks for nodes in power lines that do not have a power=tower/pole tag."
msgstr ""
+"Hľadá body na elektrických vedeniach, ktoré nemajú značku power=tower/pole."
msgid "Missing power tower/pole within power line"
msgstr "Chybějící sloupy/veže elektrického vedení"
@@ -3875,15 +4022,15 @@ msgstr "Neznámý typ relace"
msgid "Relation is empty"
msgstr "Relace je prázdná"
+msgid "Role verification problem"
+msgstr "Problém při kontrole rolí"
+
msgid "<empty>"
msgstr "<prázdné>"
msgid "Role {0} missing"
msgstr "Role {0} chybí"
-msgid "Role verification problem"
-msgstr "Problém při kontrole rolí"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Počet rolí {0} je příliš nízký ({1})"
@@ -3915,11 +4062,11 @@ msgid ""
msgstr ""
"Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep."
-msgid "Properties checker :"
-msgstr "Kontrola vlastností:"
+msgid "Tag checker"
+msgstr "Kontrola tagů"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Tento plugin kontroluje chyby klíčů a jejich hodnot."
+msgid "This test checks for errors in tag keys and values."
+msgstr "Tento test kontroluje chyby ve značkování a nastavených hodnotách."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Neplatný řádek při kontrole tagů - {0}: {1}"
@@ -4057,8 +4204,8 @@ msgstr "Použít standarní slovníkový soubor."
msgid "Use the default spellcheck file (recommended)."
msgstr "Použít standardní slovník (doporučeno)."
-msgid "Fix properties"
-msgstr "Opravit vlastnosti"
+msgid "Fix tags"
+msgstr "Opravit tagy"
msgid "Could not find element type"
msgstr "Nelze najít typ elementu"
@@ -4112,7 +4259,7 @@ msgid "The \"from\" way does not start or end at a \"via\" node"
msgstr "Počáteční ceste (\"z\") nezačíná ani nekončí ve uzlu (\"přes\")"
msgid "Superfluous turnrestriction as \"to\" way is oneway"
-msgstr ""
+msgstr "Nadbytočný zákaz odbočenia \"do\" cesta je jednosmerná"
msgid "The \"to\" way does not start or end at a \"via\" node"
msgstr ""
@@ -4136,6 +4283,9 @@ msgstr ""
"Tento test kontroluje cesty, které by měly být uzavřené, jestli jsou "
"skutečně uzavřené."
+msgid "Unclosed way"
+msgstr "Neuzavřená cesta"
+
msgid "natural type {0}"
msgstr "typ krajiny (natural) {0}"
@@ -4166,9 +4316,6 @@ msgstr "budova"
msgid "area"
msgstr "oblast"
-msgid "Unclosed way"
-msgstr "Neuzavřená cesta"
-
msgid "Unconnected ways"
msgstr "Nenapojené cesty"
@@ -4194,12 +4341,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Tento test hledá neotagované uzly, které nejsou součástí žádné cesty."
-msgid "No tags"
-msgstr "Žádné tagy"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nenapojené uzly bez fyzických tagů"
+msgid "No tags"
+msgstr "Žádné tagy"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Má tag obsahující ''fixme'' nebo ''FIXME''"
@@ -4260,25 +4407,6 @@ msgstr "Obrácené pobřeží: země není na levé straně"
msgid "Reversed land: land not on left side"
msgstr "Obrácená země: země není na levé straně"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Nesprávný počet argumentů pro záložku"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Chyba při čtení záložky: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Chyba: neočekávaná řádka ''{0}'' v souboru záložek ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Chyba: Nepřípustná hodnota typu double ''{0}'' na řádku {1} v souboru se "
-"záložkami ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>Nelze načíst záložky z<br>''{0}''<br>Chyba: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Neptat se příště (zapamatovat si volbu)"
@@ -4358,7 +4486,7 @@ msgid "Authentication Failed"
msgstr "Autentizace selhala"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr ""
+msgstr "Prístup k redigované verzii ''{0}'' z {1} {2} je zakázaný."
msgid "Authorisation Failed"
msgstr "Autorizase selhala"
@@ -4384,8 +4512,8 @@ msgstr "Zobrazit informace o pomoci"
msgid "Downloading \"Message of the day\""
msgstr "Stahování zprávy dne"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr ""
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Chyba načtení MOTD. Vyjímka byla: {0}"
msgid "Message of the day not available"
msgstr "Zprávu dne není možné zobrazit"
@@ -4476,7 +4604,7 @@ msgid "Download the bounding box"
msgstr "Stáhnout ohraničující box"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
-msgstr ""
+msgstr "Stiahnite si umiestnenie na adrese URL (s lat=x&lon=y&zoom=z)"
msgid "Open a file (any file type that can be opened with File/Open)"
msgstr "Otevřít soubor (libovolný typ který lze otevřít v Soubor/Otevřít)"
@@ -4486,6 +4614,8 @@ msgstr "Stáhnout ohraničující box jako čisté GPS"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
msgstr ""
+"Stiahnite si umiestnenie na adrese URL (s lat = x & lon = y & snímke = z) "
+"ako surové GPS"
msgid "Select with the given search"
msgstr "Vybrat zadaným hledáním"
@@ -4497,16 +4627,16 @@ msgid "Reset the preferences to default"
msgstr "Nastavit výchozí hodnoty"
msgid "Changes preferences according to the XML file"
-msgstr ""
+msgstr "Zmeny nastavení podľa XML súboru"
msgid "Set preference key to value"
-msgstr ""
+msgstr "Nastavte prednastavený kľúč na hodnotu"
msgid "Set the language"
msgstr "Nastavit jazyk"
msgid "Displays the JOSM version and exits"
-msgstr ""
+msgstr "Zobrazí JOSM verziu a skončí"
msgid "options provided as Java system properties"
msgstr "Volby poskytované jako systémové vlastnosti Java"
@@ -4593,9 +4723,24 @@ msgstr "Zobrazit"
msgid "Tools"
msgstr "Nástroje"
+msgid "More tools"
+msgstr "Další nástroje"
+
+msgid "Data"
+msgstr "Údaje"
+
+msgid "Selection"
+msgstr "Výběr"
+
msgid "Presets"
msgstr "Předvolby"
+msgid "More..."
+msgstr "Ďalšie..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Okna"
@@ -4611,11 +4756,23 @@ msgstr "Editační nástrojová lišta"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "Přepíná viditelnost editační nástrojové lišty"
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Zvuk"
-msgid "Hide edit toolbar"
-msgstr "Skrýt editační nástrojovou lištu"
+msgid "Do not hide toolbar"
+msgstr "Neskrývať nástrojovú lištu"
msgid "Hide this button"
msgstr "Skrýt toto tlačítko"
@@ -4623,8 +4780,11 @@ msgstr "Skrýt toto tlačítko"
msgid "Click the arrow at the bottom to show it again."
msgstr "Pro opakované zobrazení klikněte na šipku dole"
-msgid "Hide or show this toggle button"
-msgstr "Skrýt nebo zobrazit toto přepínací tlačítko"
+msgid "Hide edit toolbar"
+msgstr "Skrýt editační nástrojovou lištu"
+
+msgid "Hide or show this toggle button"
+msgstr "Skrýt nebo zobrazit toto přepínací tlačítko"
msgid "Move right"
msgstr "Posunout doprava"
@@ -4684,6 +4844,9 @@ msgstr "(žádný objekt)"
msgid "User:"
msgstr "Uživatel:"
+msgid "Do not hide status bar"
+msgstr "Neskrývať stavový riadok"
+
msgid "Layer not in list."
msgstr "vrstva není v seznamu"
@@ -4700,7 +4863,7 @@ msgid "Imperial"
msgstr "Imperiální"
msgid "Nautical Mile"
-msgstr ""
+msgstr "Námořní míle"
msgid "Click to cancel the current operation"
msgstr "Klikněte pro zrušení aktuální operace"
@@ -4711,20 +4874,6 @@ msgstr "Na pozadí"
msgid "Click to run job in background"
msgstr "Kliknutím přesunete úlohu na pozadí"
-msgid "false: the property is explicitly switched off"
-msgstr "odvybráno: vlastnost je explicitně vypnutá"
-
-msgid "true: the property is explicitly switched on"
-msgstr "vybráno: vlastnost je explicitně zapnutá"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"částečně vybráno: vlastnost je u vybraných objektů nastavena rozdílně"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "nenastaveno: vlastnost není pro vybrané objekty nastavena"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4735,7 +4884,7 @@ msgstr ""
"GPS záznamů!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgid "Details..."
msgstr "Podrobnosti…"
@@ -5037,12 +5186,18 @@ msgstr "> spodek"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů"
+msgid "> before"
+msgstr "> před"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
"Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5050,16 +5205,25 @@ msgstr ""
"Kopírovat mé vybrané elementy za vybraný element ze seznamu slučovaných "
"elementů"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů"
+msgid "< before"
+msgstr "< před"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5067,6 +5231,9 @@ msgstr ""
"Kopírovat cizí vybrané elementy před vybraný element ze seznamu slučovaných "
"elementů"
+msgid "< after"
+msgstr "< po"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5083,8 +5250,8 @@ msgstr "Kopírovat všechny cizí elementy do cíle"
msgid "Up"
msgstr "Nahoru"
-msgid "Move up the selected elements by one position."
-msgstr "Posunout vybrané elementy o jednu pozici nahoru"
+msgid "Move up the selected entries by one position."
+msgstr "Posune vybrané položky o jednu pozici nahoru."
msgid "Down"
msgstr "Dolu"
@@ -5142,16 +5309,6 @@ msgstr[0] "Cizí verze ({0} položka)"
msgstr[1] "Cizí verze ({0} položky)"
msgstr[2] "Cizí verze ({0} položek)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Nastaviteľný {0} ešte neregistrovaný. Nemôžem nastaviť spoluúčasť v "
-"nastavení synchronizácie."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Nastaviteľný {0} ešte neregistrovaný."
-
msgid "Node"
msgstr "Bod"
@@ -5430,16 +5587,16 @@ msgctxt "tag"
msgid "Key:"
msgstr "Klíč:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Vložte klíč tagu, t.j. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Zadejte tag, např. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Hodnota:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Vložte hodnotu tagu, t.j. <strong><tt>zkontrolovat "
+"<html>Zadejte hodnotu tagu, např. <strong><tt>zkontrolovat "
"členy</tt></strong></html>"
msgid ""
@@ -5548,12 +5705,14 @@ msgstr ""
"Označí objekty, které se účastní tohoto příkazu (pokud nejsou smazané)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Vybrať a priblížiť"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Vyberie objekty, v tomto príkaze (ak už nie sú vymazané), potom ich priblíži "
+"na obrazovku"
msgid "Undo the selected and all later commands"
msgstr "Vrátit vybraný příkaz a všechny pozdější"
@@ -5614,6 +5773,12 @@ msgid ""
"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
"conflicts.</html>"
msgstr ""
+"<html> Nemôžete ukončiť zlučovanie v tomto konflikte.<br>Vyriešenie "
+"konfliktu nemôže byť aplikované pokiaľ všetky rozdiely<br>nebudú "
+"vyriešené.<br>Kliknite <strong>{0}</strong> ak chcete aj tak "
+"ukončiť.<strong> Už<br> vyriešené rozdiely nebudú "
+"použité.</strong><br>Kliknite <strong>{1}</strong> pre návrat k riešeniu "
+"konfliktov.</html>"
msgid "Conflict not resolved completely"
msgstr "Konflikt není vyřešen kompletně"
@@ -5631,7 +5796,7 @@ msgid "Enable filter"
msgstr "Aktivovat filtr."
msgid "Multikey: {0}"
-msgstr ""
+msgstr "Kombinace kláves: {0}"
msgid "Hide filter"
msgstr "Skrýt filtr"
@@ -5812,7 +5977,7 @@ msgid "Bounding box: "
msgstr "Ohraničující obdélník: "
msgid "Bounding box (projected): "
-msgstr ""
+msgstr "Ohraničovací rámček (plánovaný): "
msgid "Coordinates: "
msgstr "Souřadnice: "
@@ -6014,6 +6179,9 @@ msgstr "Zobrazit/Skrýt"
msgid "Information about layer"
msgstr "Informace o vrstvě"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Styly kreslení mapy"
@@ -6054,10 +6222,10 @@ msgid "Save a copy of this Style to file and add it to the list"
msgstr "Uložit kopii tohoto stylu do souboru a přidat jej do seznamu"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "Súbor farebného štýlu mapy (*.mapcss, *.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "Súbor farebného štýlu mapy (*.xml, *.zip)"
msgid "Reloading style sources"
msgstr "Aktualizuji zdroje stylů"
@@ -6098,6 +6266,36 @@ msgstr "Styl momentálně aktivní?"
msgid "No"
msgstr "Ne"
+msgid "Object type:"
+msgstr "Typ objektu:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "smíšený"
+
+msgid "Choose the OSM object type"
+msgstr "Vyberte typ OSM objektu"
+
+msgid "Object ID:"
+msgstr "ID objektu:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Zadat ID objektu, který chcete stáhnout"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"ID objektů mohou být oddělena mezerami nebo čárkami.<br/> Příklady: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Ve smíšeném režimu "
+"zadávejte objekty následovně: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relace"
@@ -6105,7 +6303,7 @@ msgid "Open a list of all relations."
msgstr "Otevřít seznam všech relací"
msgid "Relation list filter"
-msgstr ""
+msgstr "Filter zoznamu relácie"
msgid "Create a new relation"
msgstr "Vytvořit novou relaci"
@@ -6114,14 +6312,11 @@ msgid "New"
msgstr "Nový"
msgid "Relations: {0}/{1}"
-msgstr ""
+msgstr "Relácie: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relace: {0}"
-msgid "Selection"
-msgstr "Výběr"
-
msgid "Open a selection list window."
msgstr "Otevřít okno s výběrem."
@@ -6146,23 +6341,11 @@ msgstr "Aktuálně nevybratelné"
msgid "Selection: {0}"
msgstr "Výběr: {0}"
-msgid "Side buttons"
-msgstr "Postranní tlačítka"
-
-msgid "Always shown"
-msgstr "Vždy zobrazit"
-
-msgid "Dynamic"
-msgstr "Dynamicky"
-
-msgid "Always hidden"
-msgstr "Vždy skryto"
-
msgid "Toggle dynamic buttons"
msgstr "Přepíná dynamická tlačítka"
msgid "Open preferences for this panel"
-msgstr ""
+msgstr "Otvoriť nastavenia pre tento panel"
msgid "Undock the panel"
msgstr "Vytrhnout panel"
@@ -6176,6 +6359,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Minimalizovat nebo maximalizovat obsah panelu"
+msgid "Side buttons"
+msgstr "Postranní tlačítka"
+
+msgid "Always shown"
+msgstr "Vždy zobrazit"
+
+msgid "Dynamic"
+msgstr "Dynamicky"
+
+msgid "Always hidden"
+msgstr "Vždy skryto"
+
msgid "Authors"
msgstr "Autoři"
@@ -6194,11 +6389,8 @@ msgstr "Vybrat objekty vložené tímto uživatelem"
msgid "Launches a browser with information about the user"
msgstr "Spustit prohlížeč s informacemi o uživateli"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Upozornění: spouštím prohlížeč pouze pro prvních {0} z {1} zvolených "
-"uživatelů"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6225,9 +6417,6 @@ msgstr "Otevřít okno s výsledkem kontroly."
msgid "Validation results"
msgstr "Výsledky validace"
-msgid "Zoom to problem"
-msgstr "Přiblížit na problém"
-
msgid "Fix"
msgstr "Opravit"
@@ -6374,9 +6563,6 @@ msgstr "Aktualizovat obsah"
msgid "Update the changeset content from the OSM server"
msgstr "Aktualizovat obsah sady změn z OSM serveru"
-msgid "Show history"
-msgstr "Zobrazit historii"
-
msgid "Download and show the history of the selected objects"
msgstr "Stáhni a zobraz historii vybraných objektů"
@@ -6455,6 +6641,8 @@ msgstr "Uzavřeno dne:"
msgid "Remove the changeset in the detail view panel from the local cache"
msgstr ""
+"Odstrániť zmenový súbor v detailnom pohľadovom panely z lokálnej "
+"vyrovnávacej pamäte (cache)"
msgid "Update the changeset from the OSM server"
msgstr "Aktualizovat sadu změn z OSM serveru"
@@ -6463,6 +6651,8 @@ msgid ""
"Select the primitives in the content of this changeset in the current data "
"layer"
msgstr ""
+"Vyberte základné objektu v obsahu tohoto zmenového súboru v aktuálnej "
+"dátovej vrstve"
msgid ""
"<html>None of the objects in the content of changeset {0} is available in "
@@ -6475,6 +6665,8 @@ msgid ""
"Zoom to the objects in the content of this changeset in the current data "
"layer"
msgstr ""
+"Priblížiť na objekty v obsahu tohto zmenového súboru v súčasnej dátovej "
+"vrstve"
msgid "Download changesets"
msgstr "Stáhnout sady změn"
@@ -6696,8 +6888,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Stáhnout změny dat v aktuálním pohledu na mapu</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6758,39 +6950,53 @@ msgid ""
"Note that changeset queries are currently always submitted to ''{0}'', "
"regardless of the host, port and path of the URL entered below."
msgstr ""
+"Všimnite si, že požiadavky na zmenové súbory sú súčasne vždy predložené "
+"''{0}'', bez ohľadu na host, port a cestu URL zadanú nižšie."
msgid "This changeset query URL is invalid"
msgstr "Toto URL dotazu na datové změny není platné"
-msgid "Select objects for which to change properties."
-msgstr "Vyberte objekty, jejichž vlastnosti chcete měnit."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Vlastnosti/Členství"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Vlastnosti pro zvolené objekty"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<různé>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Člen"
msgid "Position"
msgstr "Pozice"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Vlastnosti: {0} / Členství: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Vlastnosti / Členství"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Smaže zvolený klíč ve všech objektech"
-msgid "Delete Properties"
-msgstr "Smazat vlastnosti"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Změnit relaci"
@@ -6804,14 +7010,14 @@ msgstr "Opravdu smazat výběr z relace {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
-msgid "Add Property"
-msgstr "Přidat vlastnost"
+msgid "Add Tag"
+msgstr "Pridať značku"
msgid "Edit the value of the selected key for all objects"
msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
-msgid "Edit Properties"
-msgstr "Upravit vlastnosti"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Podívat se informace o tagu na OSM wiki (F1)"
@@ -6820,10 +7026,10 @@ msgid "Launch browser with wiki help for selected object"
msgstr "Spustit prohlížeč s wiki nápovědou k vybranému objektu"
msgid "Paste Value"
-msgstr ""
+msgstr "Vložiť Hodnoty"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "Vložiť hodnoty vybranej značky zo schránky"
msgid "Copy Value"
msgstr "Kopírovat hodnotu"
@@ -6894,13 +7100,7 @@ msgstr[1] "Změnit vlastnosti až {0} objektů."
msgstr[2] "Změnit vlastnosti až {0} objektů."
msgid "Use English language for tag by default"
-msgstr ""
-
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
+msgstr "Použite anglický jazyk pre značku v predvolenom nastavení"
msgid "Add value?"
msgstr "Přidat hodnotu?"
@@ -6918,23 +7118,29 @@ msgid "Please select a value"
msgstr "Vyberte prosím hodnotu"
msgid "Set number of recently added tags"
-msgstr ""
+msgstr "Nastavte počet novo pridaných značiek"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Zapamätať naposledy použité značky"
msgid "Please enter the number of recently added tags to display"
-msgstr ""
+msgstr "Zadajte prosím počet nedávno pridaných značiek pre zobrazenie"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "Vložte prosím celé číslo mezi 0 a {0}"
msgid "Recently added tags"
msgstr "Naposledy přidané tagy"
+msgid "Choose recent tag {0}"
+msgstr "Vybrať nedávnu značku {0}"
+
msgid "Use this tag again"
msgstr "Použít teno tag znovu"
+msgid "Apply recent tag {0}"
+msgstr "Použiť nedávnu značku {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "Klíč ''{0}'' je již použit"
@@ -6975,8 +7181,8 @@ msgstr "Relace je smazána"
msgid "Downloading relation {0}"
msgstr "Stahování relace {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Ignoruji chybu, protože úloha byla přerušena. Chyba: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7021,7 +7227,7 @@ msgid "New Relation"
msgstr "Nová relace"
msgid "Focus Relation Editor with relation ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "Vystrediť Editor relácie s reláciou''{0}''vo vrstve''{1}''"
msgid "Relation Editor: {0}"
msgstr "Editor relací: {0}"
@@ -7041,6 +7247,9 @@ msgstr "Odstranit, vyčistit relaci"
msgid "Ignore them, leave relation as is"
msgstr "Ignorovat, ponechat relaci jak je"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7165,6 +7374,8 @@ msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
msgstr ""
+"<html>Vrstva ''{0}'' už má konflikt na objekte <br>''{1}''.<br> Prosím "
+"vyriešte najskôr tento konflikt, potom to skúste znova.</html>"
msgid "Apply the current updates"
msgstr "Aplikovat aktuální změny"
@@ -7315,6 +7526,25 @@ msgstr "cesta je připojena na následujícího člena relace"
msgid "way is not connected to previous or next relation member"
msgstr "cesta není připojena na předchozího ani následujícího člena relace"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Nesprávný počet argumentů pro záložku"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Chyba při čtení záložky: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr "Chybná hodnota double ''{0}'' na řádku ''{1}'' v souboru ''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>Nelze načíst záložky z<br>''{0}''<br>Chyba: {1}</html>"
+
msgid "Bookmarks"
msgstr "Záložky"
@@ -7383,9 +7613,6 @@ msgstr "Hodnota zeměpisné šířky musí být v rozmezí [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "Hodnota zeměpisné délky musí být v rozmezí [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Vložit URL ze schránky"
-
msgid "Data Sources and Types:"
msgstr "Zdroje a typy dat:"
@@ -7418,11 +7645,16 @@ msgid ""
"<html>Autostart ''Download from OSM'' dialog every time JOSM is "
"started.<br>You can open it manually from File menu or toolbar.</html>"
msgstr ""
+"<html>Autom. spustenie okna ''Stiahnuť z OSM'' vždy po spustení JOSM-"
+"u.<br>Môžete ho otvoriť ručne z ponuky Súbor alebo panela nástrojov.</html>"
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
"map, wheel or +/- to zoom."
msgstr ""
+"Použite kliknutie ľavým tlačidlom myši a potiahnutie pre výber oblasti, "
+"šípky alebo pravé tlačidlo myši na rolovanie mapy, koliesko alebo +/- pre "
+"priblíženie."
msgid "No area selected yet"
msgstr "Ještě není vybrána oblast"
@@ -7447,6 +7679,9 @@ msgid ""
"enabled.<br>Please choose to either download OSM data, or GPX data, or "
"both.</html>"
msgstr ""
+"<html>Žiaden<strong>{0}</strong>, a ani <strong>{1}</strong> nie je "
+"povolený.<br>Vyberte buď stiahnuť OSM dáta, alebo GPX dáta, alebo "
+"oboje.</html>"
msgid "Download referrers (parent relations)"
msgstr "Stáhnout odkazující objekty (rodičovské relace)"
@@ -7454,21 +7689,8 @@ msgstr "Stáhnout odkazující objekty (rodičovské relace)"
msgid "Download object"
msgstr "Stáhnout objekt"
-msgid "Object type:"
-msgstr "Typ objektu:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "smíšený"
-
-msgid "Choose the OSM object type"
-msgstr "Vyberte typ OSM objektu"
-
-msgid "Object ID:"
-msgstr "ID objektu:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Zadat ID objektu, který chcete stáhnout"
+msgid "Start downloading"
+msgstr "Začínám stahování"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7480,28 +7702,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Zvolte, jestli mají být staženy také členy relace"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"ID objektů mohou být oddělena mezerami nebo čárkami.<br/> Příklady: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Ve smíšeném režimu "
-"zadávejte objekty následovně: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Stáhnout odkazující objekty (rodičovské relace a cesty)"
-msgid "Start downloading"
-msgstr "Začínám stahování"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Specifikován neplatný seznam ID\n"
-"Nemohu stáhnout objekt"
-
msgid "Class Type"
msgstr "Typ třídy"
@@ -7560,6 +7763,13 @@ msgid ""
"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
"English</a>.</p></html>"
msgstr ""
+"<html><p class=\"warning-header\">Obsah pomocníka k téme pomoci chýba</p><p "
+"class=\"warning-body\">Obsah pomocníka pre tému pomocníka "
+"<strong>{0}</strong> nie je k dispozícii. Chýba ako vo vašom jazyku ({1}) "
+"tak aj v anglickom jazyku.<br><br>Pomôžte zlepšiť JOSM systém nápovedy a "
+"vyplniť chýbajúce informácie. Môžete tak upraviť <a href=\"{2}\"> tému "
+"pomocníka vo vašom jazyku ({1})</a> a <a href=\"{3}\">tému pomocníka v "
+"angličtine</a>.</p></html>"
msgid ""
"<html><p class=\"error-header\">Error when retrieving help information</p><p "
@@ -7575,6 +7785,9 @@ msgid ""
"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
"network problem, please check<br>your internet connection</html>"
msgstr ""
+"<html>Neúspešné otvorenie stránky pomoci na url {0}.<br>Je veľmi "
+"pravdepodobne spôsobené sieťovým problémom, skontrolujte prosím<br>vaše "
+"internetové pripojenie</html>"
msgid "Failed to open URL"
msgstr "Nepodařilo se otevřít URL"
@@ -7604,8 +7817,8 @@ msgstr "Přejít na následující stránku"
msgid "Go to the JOSM help home page"
msgstr "Jít na domovskou stránku nápovědy pro JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Upozornění: špatná pozice v HTML dokumentu. Výjimka: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "Nepodařilo se otevřít stránku s nápovědou. Cílové URL je prázdné."
@@ -7639,22 +7852,28 @@ msgstr "Aktualizovat historii ze serveru"
msgid "History not initialized yet. Failed to set reference primitive."
msgstr ""
+"História nie je zatiaľ inicializovaná. Neporadilo sa nastaviť odkaz na "
+"základný objekt."
msgid ""
"Failed to set reference. Reference ID {0} does not match history ID {1}."
msgstr ""
+"Neúspešné nastavenie odkazu. Odkaz ID {0} je nenájdený v histórii ID {1}."
msgid ""
"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
+msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
msgid "History not initialized yet. Failed to set current primitive."
msgstr ""
+"História nie je ešte inicializovaná. Nepodarilo sa nastaviť základný objekt."
msgid ""
"Failed to set current primitive. Current version {0} not available in "
"history."
msgstr ""
+"Nepodarilo sa nastaviť základný objekt. Aktuálna verzia {0} nie je platná v "
+"priebehu histórie."
msgid "Load history"
msgstr "Načíst historii"
@@ -7705,6 +7924,9 @@ msgid ""
msgstr ""
"<html>Verze <strong>{0}</strong> vytvořená <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informace o sadě změn"
@@ -7798,7 +8020,7 @@ msgid "Prepare conflict resolution"
msgstr "Příprava řešení konfliktů"
msgid "Click to download all referring objects for {0}"
-msgstr ""
+msgstr "Kliknite na stiahnutie všetkých odkazujúcich objektov na {0}"
msgid "Click to cancel and to resume editing the map"
msgstr "Kliknutím zrušte a pokračujte v editovaní mapy"
@@ -7807,11 +8029,13 @@ msgid ""
"Click <strong>{0}</strong> to load them now.<br>If necessary JOSM will "
"create conflicts which you can resolve in the Conflict Resolution Dialog."
msgstr ""
+"Kliknite na tlačidlo <strong>{0}</strong> pre načítanie teraz. Ak JOSM bude "
+"vytvárať konflikty, môžete ich vyriešiť v Dialógu riešenie konfliktov."
msgid "Object still in use"
msgstr "Objekt je stále používán"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7834,6 +8058,12 @@ msgstr "Napište stručný komentář ke změnám, které nahráváte na server:
msgid "Enter an upload comment"
msgstr "Zadejte komentář k nahraným datům"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "ID sady změn:"
@@ -7902,15 +8132,14 @@ msgid "Closing changeset {0}"
msgstr "Zavírám sadu změn {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
msgstr "Zadejte přihlašovací údaje pro OSM API"
msgid "Enter credentials for host"
-msgstr ""
+msgstr "Zadajte prihlasovacie údaje pre hostiteľa"
msgid "Enter credentials for HTTP proxy"
msgstr "Zadejte přihlašovací údaje pro HTTP proxy"
@@ -7941,6 +8170,8 @@ msgid ""
"Authenticating at the host ''{0}'' failed. Please enter a valid username and "
"a valid password."
msgstr ""
+"Overovanie na hostiteľovi ''{0}'' zlyhalo. Prosím, zadajte platné "
+"používateľské meno a platné heslo."
msgid "Please enter the user name for authenticating at your proxy server"
msgstr "Prosím, zadejte uživatelské jméno pro přístup na proxy server"
@@ -7984,11 +8215,9 @@ msgid "Unpacking {0} into {1}"
msgstr "Rozbalování {0} do {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Varování: Nelze stáhnout soubor ''{0}''. Odkaz na něj ''{1}'' není korektní "
-"URL. Přeskakuji stahování."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8004,9 +8233,8 @@ msgid "Missing user identity"
msgstr "Chybějící totožnost uživatele"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
-msgstr "Varování: Získání informací o uživateli se nezdařilo. Důvod: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
+msgstr ""
msgid "Download objects"
msgstr "Stáhnout objekty"
@@ -8015,7 +8243,7 @@ msgid "Initializing nodes to download ..."
msgstr "Inicializace bodů je stažení ..."
msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru"
msgid "Select filename"
msgstr "Vyberte soubor"
@@ -8130,7 +8358,7 @@ msgstr[2] ""
"modifikace.<br>Vrstvy s nezapisovatelným souborem:</html>"
msgid "Unsaved data non-writable files"
-msgstr ""
+msgstr "Neuložené dáta nezapisovateľných súborov"
msgid "Close this dialog and resume editing in JOSM"
msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
@@ -8196,7 +8424,7 @@ msgid ""
msgstr "Vrstva ''{0}'' obsahuje změny, které by měly být nahrány na server."
msgid "Layer ''{0}'' has modifications which are discouraged to be uploaded."
-msgstr ""
+msgstr "Vrstva ''{0}'' obsahuje zmeny, ktoré sa neodporúča nahrať."
msgid "Layer ''{0}'' has no modifications to be uploaded."
msgstr "Vrstva ''{0}'' nemá žádné změny k nahrání na server."
@@ -8262,12 +8490,6 @@ msgstr "Nahrát změněné objekty"
msgid "Please revise upload comment"
msgstr "Prosím opravte komentář změny"
-msgid "Revise"
-msgstr "Opravit"
-
-msgid "Continue as is"
-msgstr "Pokračovat beze změn"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8281,6 +8503,22 @@ msgstr ""
"komentářů<br />aby pochopili, co se děje!<br /><br />Pokud strávíte minutku "
"k popisu vaší změny,<br />ulehčíte život spoustě maperů."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Opravit"
+
+msgid "Continue as is"
+msgstr "Pokračovat beze změn"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "Návrat k předchozímu dialogu a vložení podrobnějšího komentáře"
@@ -8296,6 +8534,21 @@ msgstr "Prosím, zadejte nejprve platnou velikost bloku"
msgid "Illegal chunk size"
msgstr "Neplatná velikost bloku"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Zrušit nahrávání na server a pokračovat v editaci"
@@ -8303,11 +8556,9 @@ msgid "Tags of changeset {0}"
msgstr "Značky sady změn {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Varování: objekt ''{0}'' je na serveru již smazán. Přeskakuji tento objekt a "
-"opakuji nahrávání."
msgid "Preparing objects to upload ..."
msgstr "Příprava objektů pro nahrávání ..."
@@ -8438,17 +8689,14 @@ msgid "Node ''{0}'' is already deleted. Skipping object in upload."
msgstr "Uzel ''{0}'' je již smazán. Přeskakuji objekt při nahrávání."
msgid "Way ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Cesta ''{0}'' je už odstránená. Preskakujem objekt v nahrávaní."
msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Relácia ''{0}'' je už odstránená. Preskakujem objekt v nahrávaní."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "Objekt ''{0}'' je již smazán. Přeskakuji objekt při nahrávání."
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Nahrávám {0} objekt..."
@@ -8458,16 +8706,24 @@ msgstr[2] "Nahrávám {0} objektů..."
msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
+
+msgid "Upload successful!"
+msgstr "Nahrání proběhlo úspěšně!"
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
msgstr ""
+"<html>Oznečené zmenené objekty <strong>z aktuálneho výberu</strong> bude "
+"nahratý na server.</html>"
msgid ""
"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
"server.</html>"
msgstr ""
+"<html>Označené <strong>lokálne zmazané objekty</strong> budú vymazané na "
+"serveri.</html>"
msgid "Select objects to upload"
msgstr "Vybrat objekty k nahrání na server"
@@ -8475,7 +8731,7 @@ msgstr "Vybrat objekty k nahrání na server"
msgid "Cancel uploading"
msgstr "Ukončit nahrávání"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8494,12 +8750,14 @@ msgid ""
"<html>There are <strong>multiple changesets</strong> necessary in order to "
"upload {0} objects. Which strategy do you want to use?</html>"
msgstr ""
+"<html>Sú tam <strong>viacnásobné zmenové súbory</strong> je potrebné určiť "
+"poradie nahrávania {0} objektov.Ktorú stratégiu chcete použiť?</html>"
msgid "Fill up one changeset and return to the Upload Dialog"
-msgstr ""
+msgstr "Naplniť jeden zmenový súbor a vrátiť sa do dialógu nahrávania"
msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "Je nutné otvoriť a používať viac nových zmenových súborov"
msgid "Upload in one request not possible (too many objects to upload)"
msgstr "Nahrání v jednom požadavku není možné (příliš mnoho objektů)"
@@ -8508,6 +8766,8 @@ msgid ""
"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
"size {1} on server ''{2}'' is exceeded.</html>"
msgstr ""
+"<html>Nemôžem nahrať {0} objektov v jednej požiadavke pretože<br>max. "
+"veľkosť zmenového súboru {1} na server ''{2}'' je prekročená.</html>"
msgid "(1 request)"
msgstr "(1 požadavek)"
@@ -8620,19 +8880,19 @@ msgid "Save GPX file"
msgstr "Uložit GPX soubor"
msgid "Imagery fade"
-msgstr ""
+msgstr "Zoslabenie mapového podkladu"
msgid "ERROR"
msgstr "CHYBA"
msgid "Next marker"
-msgstr ""
+msgstr "Nasledujúca značka"
msgid "Jump to next marker"
msgstr "Přejít na další značku"
-msgid "Previos marker"
-msgstr ""
+msgid "Previous marker"
+msgstr "Předchozí značka"
msgid "Jump to previous marker"
msgstr "Přejít na předchozí značku"
@@ -8664,9 +8924,8 @@ msgstr "verze {0}"
msgid "Merging layers"
msgstr "Slučování vrstev"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
-"Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8684,7 +8943,7 @@ msgid "API version: {0}"
msgstr "Verze API: {0}"
msgid "Upload is discouraged"
-msgstr ""
+msgstr "Nahratie sa neoporúča"
msgid "Convert to GPX layer"
msgstr "Převést do GPX vrstvy"
@@ -8770,7 +9029,7 @@ msgid "Decrease zoom"
msgstr "Zmenšit přiblížení"
msgid "Snap to tile size"
-msgstr ""
+msgstr "Snímka na veľkosť dlaždice"
msgid "Flush Tile Cache"
msgstr "Vyprázdnit cache dlaždic"
@@ -8787,6 +9046,9 @@ msgstr "zvětšete přiblížení abyste viděli více detailů"
msgid "No tiles at this zoom level"
msgstr "Na této úrovni přiblížení nejsou žádné dlaždice"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "Projekce EPSG:4326 a Mercator jsou podporované"
@@ -8825,6 +9087,9 @@ msgstr "Aktualizovat chybné dlaždice"
msgid "Alpha channel"
msgstr "Alfa kanál"
+msgid "Automatically change resolution"
+msgstr "Automaticky měnit rozlišení"
+
msgid "Set WMS Bookmark"
msgstr "Nastavit záložku WMS"
@@ -8841,7 +9106,7 @@ msgid "Unsupported WMS file version; found {0}, expected {1}"
msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
msgid "Save WMS file"
-msgstr ""
+msgstr "Uložiť WMS súbor"
msgid "Correlate to GPX"
msgstr "Korelovat vůči GPX"
@@ -9036,9 +9301,6 @@ msgstr "Extrahovat pozice GPS z EXIFu"
msgid "Starting directory scan"
msgstr "Začínam prohledávat adresář"
-msgid "One of the selected files was null"
-msgstr "Jeden z vybraných souborů byl prázdný"
-
msgid "Read photos..."
msgstr "Načíst fotografie..."
@@ -9057,6 +9319,9 @@ msgstr "Nalezen nulový soubor v adresáři {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Chyba při získávání souborů z adresáře {0}\n"
+msgid "One of the selected files was null"
+msgstr "Jeden z vybraných souborů byl prázdný"
+
msgid "Geotagged Images"
msgstr "Obrázky s GPS souřadnicemi"
@@ -9068,8 +9333,9 @@ msgstr[2] "{0} obrázků nahráno."
msgid "{0} was found to be GPS tagged."
msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} bol založený s GPS značkou."
+msgstr[1] "{0} boli založené s GPS značkou."
+msgstr[2] "{0} bolo založených s GPS značkou."
msgid "Delete image file from disk"
msgstr "Smazat obrázek z disku"
@@ -9094,7 +9360,7 @@ msgid "Error on file {0}"
msgstr "Chyba v souboru {0}"
msgid "Display geotagged images"
-msgstr ""
+msgstr "Zobraziť obrázky s geotagmi"
msgid "Previous"
msgstr "Předchozí"
@@ -9103,7 +9369,7 @@ msgid "Show previous Image"
msgstr "Zobrazit předchozí obrázek"
msgid "Geoimage: {0}"
-msgstr ""
+msgstr "Geoobrázok: {0}"
msgid "Remove photo from layer"
msgstr "Odebrat fotografii z vrstvy"
@@ -9117,11 +9383,17 @@ msgstr "Další"
msgid "Show next Image"
msgstr "Zobrazit další obrázek"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centrovat pohled"
msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "Najvhodnejšie zväčšenie a 1:1"
msgid "Move dialog to the side pane"
msgstr "Přesunout dialog do postraního panelu"
@@ -9151,29 +9423,37 @@ msgid ""
"\n"
"EXIF time: {0}"
msgstr ""
+"\n"
+"EXIF čas: {0}"
msgid ""
"\n"
"GPS time: {0}"
msgstr ""
+"\n"
+"GPS čas: {0}"
msgid "JPEG images (*.jpg)"
msgstr "JPEG obrázky (*.jpg)"
msgid "Choose visible tracks"
-msgstr ""
+msgstr "Vyberte viditeľné stopy"
msgid "Select by date"
-msgstr ""
+msgstr "Výber podľa dátumu"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
"range of tracks or use CTRL+Click to select specific ones. The map is "
"updated live in the background. Open the URLs by double clicking them.</html>"
msgstr ""
+"<html> Vyberte všetky stopy, ktoré chcete zobraziť. Môžete ťahaním vybrať "
+"rozsah stôp, alebo použite klávesovú skratku CTRL + Kliknutím vyberte "
+"presne. Mapa sa aktualizuje na pozadí. Otvorte URL dvojitým kliknutím na "
+"ňu.</html>"
msgid "Set track visibility for {0}"
-msgstr ""
+msgstr "Zvoliť viditeľnosť stopy pre {0}"
msgid "Show all"
msgstr "Zobrazit vše"
@@ -9188,24 +9468,26 @@ msgid ""
"<html>Upload of unprocessed GPS data as map data is considered "
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
+"<html>Nahrať nespracované GPS dáta do mapy nie je dobrý nápad. <br>Ak chcete "
+"nahrať stopy, pozrite sem:</html>"
msgid "Customize track drawing"
msgstr "Přizpůsobení kreslení záznamu"
msgid "From"
-msgstr ""
+msgstr "Od"
msgid "To"
-msgstr ""
+msgstr "Pre"
msgid "No timestamp"
msgstr "Chybí časový údaj"
-msgid "Download from OSM along this track"
-msgstr "Stáhnout data z OSM podél této trasy"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Stáhnout vše v rozmezí:"
@@ -9231,16 +9513,18 @@ msgstr "pouze značky"
msgid "track and waypoints"
msgstr "trasy a značky"
+msgid "Click to download"
+msgstr "Kliknite pre stiahnutie"
+
+msgid "Click to cancel"
+msgstr "Kliknite pre zrušenie"
+
+msgid "Download from OSM along this track"
+msgstr "Stáhnout data z OSM podél této trasy"
+
msgid "Calculating Download Area"
msgstr "Výpočet stahované oblasti"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Tato akce bude potřebovat<br>{0} samostatných stažení dat.<br>Chcete "
-"pokračovat?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Přednačtení podkladu podél tohoto záznamu"
@@ -9267,6 +9551,8 @@ msgid ""
"server.<br>Because its way points do not include a timestamp we cannot "
"correlate them with audio data.</html>"
msgstr ""
+"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
+"cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</html>"
msgid "Import not possible"
msgstr "Import není možný"
@@ -9284,6 +9570,8 @@ msgid ""
"Some waypoints with timestamps from before the start of the track or after "
"the end were omitted or moved to the start."
msgstr ""
+"Niektoré body (waypointy) s časovou značkou pred začiatkom stopy(track), "
+"alebo za koncom, boli vynechané, alebo presunuté na začiatok."
msgid ""
"Some waypoints which were too far from the track to sensibly estimate their "
@@ -9300,6 +9588,8 @@ msgid ""
"server.<br>Because its way points do not include a timestamp we cannot "
"correlate them with images.</html>"
msgstr ""
+"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
+"cesty neobsahujú časovú značku nemôžme ich zladiť s obrázkami.</html>"
msgid "Markers From Named Points"
msgstr "Značky z pojmenovaných bodů"
@@ -9324,6 +9614,8 @@ msgstr[2] "{0} se skládá z {1} značek"
msgid "No existing audio markers in this layer to offset from."
msgstr ""
+"Neexistujú zvukové značky v tejto vrstve, voči ktorým by bolo možné nastaviť "
+"posunutie."
msgid "Show Text/Icons"
msgstr "Zobrazit text/ikony"
@@ -9346,22 +9638,27 @@ msgid "Unable to synchronize in layer being played."
msgstr "Není možno synchronizovat v již přehrávané vrstvě"
msgid "Make Audio Marker at Play Head"
-msgstr ""
+msgstr "Vytvoriť Zvukovú značku v \"Play Head\""
msgid ""
"You need to have paused audio at the point on the track where you want the "
"marker."
msgstr ""
+"Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
msgid ""
"You need to drag the play head near to the GPX track whose associated sound "
"track you were playing (after the first marker)."
msgstr ""
+"Potrebujete presunúť tlačítko \"play head\" blízko GPX stopy pre ktorú je "
+"priradená zvuková stopa, ktorá sa má prehrávať (po prvej značke)."
msgid ""
"You need to SHIFT-drag the play head onto an audio marker or onto the track "
"point where you want to synchronize."
msgstr ""
+"Potrebujete ťahať \"play head\" so stlačeným SHIFT až na audio značku, alebo "
+"až na track point, ktorý chcete zosynchronizovať."
msgid "Unable to create new audio marker."
msgstr "Není možné vztvořit novou zvukovou značku"
@@ -9372,14 +9669,10 @@ msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě"
msgid "(URL was: "
msgstr "(URL bylo: "
-msgid "Error displaying URL"
-msgstr "Chyba při zobrazování URL"
-
msgid "Select the map painting styles"
-msgstr ""
+msgstr "Vybrať štýl kreslenia mapy"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -9401,18 +9694,18 @@ msgstr[2] ""
"Došlo k {0} chybám při načítání tohoto stylu. Vyberete ''Info'' z "
"kontextového menu pokud chcete znát detaily."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Nesprávna kresba prerušovanej čiary, hodnoty musia byť kladné"
msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
+"Nesprávna kresba prerušovanej čiary, aspoň jedna hodnota musí byť > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9428,6 +9721,9 @@ msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
+"<html>Vybrať na uloženie autorizačný prístup v JOSM "
+"nastaveniach.<br>Pozastaviť používanie autorizačného prístupu iba v tomto "
+"spustení programu JOSM.</html>"
msgid "Use default settings"
msgstr "Použít standardní nastavení"
@@ -9439,7 +9735,7 @@ msgid "Consumer Secret:"
msgstr "Tajný klíč:"
msgid "Request Token URL:"
-msgstr ""
+msgstr "URL požiadavky prístupu:"
msgid "Access Token URL:"
msgstr "URL přístupového tokenu:"
@@ -9457,6 +9753,8 @@ msgid ""
"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
"current custom settings are not saved.</html>"
msgstr ""
+"<html> JOSM sa chystá obnoviť OAuth nastavenia na predvolené "
+"hodnoty.<br>Aktuálne vlastné nastavenia sa neukladajú.</html>"
msgid "Overwrite custom OAuth settings?"
msgstr "Přepsat vlastní OAuth nastavení?"
@@ -9591,17 +9889,28 @@ msgid ""
"from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your "
"advanced setting and try again.</html>"
msgstr ""
+"<html>Automatický proces pre získanie OAuth autorizačného prístupu<br>z OSM "
+"servera prebehol neúspešne pretože JOSM nie je schopný vytvoriť<br>platné "
+"URL prihlásenie z OAuth autorizačným URL koncovým bodom "
+"''{0}''.<br><br>Skontrolujte prosím vaše rozšírené nastavenia a skúste "
+"znovu.</html>"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
"OSM server failed. JOSM failed to log into {0}<br>for user "
"{1}.<br><br>Please check username and password and try again.</html>"
msgstr ""
+"<html>Automatický proces pre získanie OAuth autorizačného prístupu<br>z OSM "
+"servera prebehol neúspešne. JOSM neúspešne vstúpil do záznamu {0}<br>pre "
+"používateľa {1}.<br><br>Skontrolujte meno a heslo používateľa a skúste "
+"znovu.</html>"
msgid ""
"Please enter an OAuth Access Token which is authorized to access the OSM "
"server ''{0}''."
msgstr ""
+"Zadajte prosím OAuth autorizačný prístup, ktorý je oprávnený k prístupu k "
+"serveru OSM ''{0}''."
msgid "Access Token"
msgstr "Přístupový token"
@@ -9619,21 +9928,27 @@ msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
+"<html><body>Zadajte prosím OAuth autorizačný prístup, ktorý je oprávnený k "
+"prístupu k serveru OSM ''{0}''.</body></html>"
msgid "Please enter an Access Token Key"
-msgstr ""
+msgstr "Prosím, zadajte Kľúč autorizačného prístupu"
msgid ""
"The Access Token Key must not be empty. Please enter an Access Token Key"
msgstr ""
+"Kľúč autorizačného prístupu nesmie byť prázdny. Prosím, zadajte kľúč "
+"autorizačného prístupu"
msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "Prosím, zadajte Heslo autorizačného prístupu"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
"Secret"
msgstr ""
+"Heslo autorizačného prístupu nesmie byť prázdne. Prosím, zadajte heslo "
+"autorizačného prístupu"
msgid "Click to test the Access Token"
msgstr "Klikněte pro test přístupového tokenu"
@@ -9657,14 +9972,14 @@ msgstr "Zavžit zialog a zrušit přihlášení"
msgid "Close the dialog and accept the Access Token"
msgstr "Zavřít dialog a přijmout přístupový token"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Varování: Nepodařilo se přerušit běžící operaci Oauth"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
-msgstr ""
+msgstr "Získavam OAuth žiadosť prístupu z ''{0}''"
msgid "Retrieving OAuth Access Token from ''{0}''"
-msgstr ""
+msgstr "Získavam OAuth autorizačný prístup z ''{0}''"
msgid "OSM website did not return a session cookie in response to ''{0}'',"
msgstr "Web OSM nevrátil session cookie v reakci na ''{0}'',"
@@ -9676,7 +9991,7 @@ msgstr ""
"OAuth"
msgid "Failed to authorize OAuth request ''{0}''"
-msgstr ""
+msgstr "Nepodarilo sa povoliť OAuth žiadosť ''{0}''"
msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
msgstr "Autorizace žádosti o OAuth token ''{0}'' na webu OSM ..."
@@ -9688,10 +10003,10 @@ msgid "Authenticating the session for user ''{0}''..."
msgstr "Autetizační sezení pro uživatele ''{0}''..."
msgid "Authorizing request token ''{0}''..."
-msgstr ""
+msgstr "Povoľujem žiadosť prístupu ''{0}''..."
msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Odhlásujem sedenie ''{0}''..."
msgid "Allow to upload map data"
msgstr "Povolit nahrávání mapových dat"
@@ -9727,6 +10042,12 @@ msgstr "Povolit zápis vašich preferencí"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Vyberte pro udělení práv pro JOSM zapisovat preference na server"
+msgid "Allow modifications of notes"
+msgstr "Povoliť zmeny poznámok (notes)"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Povolenie umožní JOSM meniť poznámky podľa Vašich pokynov"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Přijímání přístupového tokenu OAuth..."
@@ -9796,26 +10117,27 @@ msgstr ""
"akceptovat. JOSM jej bude používat při všech dalších autentizacích a "
"autorizacích vůči serveru OSM.<br><br>Přístupový token je: </html>"
-msgid "Restart"
-msgstr "Restartovat"
-
msgid "Click to retrieve a Request Token"
-msgstr ""
+msgstr "Kliknite na tlačidlo pre načítanie žiadosti o prístup"
msgid "Retrieve Access Token"
-msgstr ""
+msgstr "Načítať autorizačný prístup"
msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "Kliknite na tlačidlo pre načítanie autorizačného prístupu"
msgid "Testing OAuth Access Token"
msgstr "Testuji přístupový token služby OAuth"
msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
msgstr ""
+"Získavam detaily používateľa s kľúčom autorizačného prístupu''{0}'', ktorý "
+"bol zamietnutý."
msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
msgstr ""
+"Získavam detaily používateľa s kľúčom autorizačného prístupu''{0}'', bol "
+"zakázaný."
msgid ""
"<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
@@ -9835,6 +10157,9 @@ msgid ""
"not<br>be able to access any protected resource on this server using this "
"token.</html>"
msgstr ""
+"<html>Nepodaril sa prístup na OSM server ''{0}''<br>s autorizačným prístupom "
+"''{1}''.<br>Server zamietol autorizačný prístup ako neautorizovaný. Nebudete "
+"môcť<br>pristupovať k žiadnemu chránenému obsahu na tomto serveri.</html>"
msgid "Test failed"
msgstr "Test selhal"
@@ -9860,11 +10185,18 @@ msgid ""
"Access Token, but<br>rather a problem with the server configuration. "
"Carefully check the server<br>URL and your Internet connection.</html>"
msgstr ""
+"<html>Nepodarilo sa získať informácie o aktuálnom používateľovi z OSM "
+"servera ''{0}''.<br> To asi nie je problém spôsobený testovaním "
+"autorizačného prístupu, ale<br>skôr problém s konfiguráciou servera. "
+"Starostlivo skontrolujte URL servera<br> a vaše pripojenie k "
+"internetu.</html>"
msgid ""
"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
"''{1}''.<br>The token ist probably invalid.</html>"
msgstr ""
+"<html>Nepodarilo sa podpísať žiadosť pre OSMserver ''{0}'' s prístupom "
+"''{1}''.<br>Prístup je pravdepodobne neplatný.</html>"
msgid ""
"<html>The test failed because the server responded with an internal "
@@ -9887,25 +10219,25 @@ msgid "Display the Audio menu."
msgstr "Zobrazovat v menu nabídku Zvuk"
msgid "Label audio (and image and web) markers."
-msgstr ""
+msgstr "Popis zvukovej (obrázka a web) značky"
msgid "Display live audio trace."
-msgstr ""
+msgstr "Zobraziť prehrávanú(live) zvukovú stopu."
msgid "Explicit waypoints with valid timestamps."
-msgstr ""
+msgstr "Podrobné body cesty(waypoints) s platnou časovou značkou."
msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
+msgstr "Podrobné body cesty s časom odhadovaným z pozície stopy(track)."
msgid "Named trackpoints."
msgstr "Pojmenované trasové body"
msgid "Modified times (time stamps) of audio files."
-msgstr ""
+msgstr "Zmenené časy (časových značiek) zvukových súborov."
msgid "Start of track (will always do this if no other markers available)."
-msgstr ""
+msgstr "Začiatok stopy (bude použité vždy ak nie sú dostupné iné značky)"
msgid "Show or hide the audio menu entry on the main menu bar."
msgstr "Zobrazit nebo skrýt menu Zvuk v menu hlavní nabídky."
@@ -9921,6 +10253,8 @@ msgid ""
"Put text labels against audio (and image and web) markers as well as their "
"button icons."
msgstr ""
+"Umiestniť text vedľa zvukovej značky (a obrázok a web) takisto ako jeho "
+"ikony."
msgid "When importing audio, make markers from..."
msgstr "Při importu zvuku udělat značky z..."
@@ -9932,11 +10266,15 @@ msgid ""
"Automatically create audio markers from trackpoints (rather than explicit "
"waypoints) with names or descriptions."
msgstr ""
+"Automatické vytváření audio poznámek ze záznamů trasy (místo z vybraných "
+"waitpointů) s názvy nebo popisky."
msgid ""
"Create audio markers at the position on the track corresponding to the "
"modified time of each audio WAV file imported."
msgstr ""
+"Vytvorenie zvukových značiek na mieste, kde čas stopy zodpovedá času "
+"uloženia každého zvukové WAV súboru."
msgid ""
"The number of seconds to jump forward or back when the relevant button is "
@@ -9966,6 +10304,7 @@ msgstr "Posun zahájení (sekund)"
msgid "The ratio of voice recorder elapsed time to true elapsed time"
msgstr ""
+"Časový posun medzi spustením nahrávania a skutočným začiatkom nahrávania."
msgid "Voice recorder calibration"
msgstr "Kalibrace nahrávání zvuku"
@@ -10064,6 +10403,9 @@ msgstr "Stáhnout pluginy"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Některá nastavení se projeví až po restartování JOSM."
+msgid "Would you like to restart now?"
+msgstr "Prajete si teraz reštartovať?"
+
msgid "Remote Control"
msgstr "Vzdálené ovládání"
@@ -10120,25 +10462,25 @@ msgid "Icon paths:"
msgstr "Cesty pro ikony:"
msgid "Short Description:"
-msgstr ""
+msgstr "Krátky popis:"
msgid "Author:"
-msgstr ""
+msgstr "Autor:"
msgid "Webpage:"
-msgstr ""
+msgstr "web stránka:"
msgid "Description:"
-msgstr ""
+msgstr "Popis:"
msgid "Version:"
-msgstr ""
+msgstr "Verzia:"
msgid "Minimum JOSM Version:"
-msgstr ""
+msgstr "Minimálna JOSM verzia:"
msgid "by {0}"
-msgstr ""
+msgstr "{0}"
msgid "Name (optional):"
msgstr "Jméno (nepovinné):"
@@ -10150,25 +10492,25 @@ msgid "active"
msgstr "aktivní"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr ""
+msgstr "Súbory štýlu kreslenia mapy (*.xml, *.mapcss, *.zip)"
msgid "Preset definition file (*.xml, *.zip)"
-msgstr ""
+msgstr "Prednastavený definičný súbor (*. xml, *. zip)"
msgid "Edit source entry:"
-msgstr ""
+msgstr "Upraviť položku zdroja:"
msgid "Entry ''{0}'' requires JOSM Version {1}. (Currently running: {2})"
-msgstr ""
+msgstr "Vstup'' {0}'' vyžaduje JOSM verziu {1}. (V súčasnej dobe beží: {2})"
msgid "Continue anyway"
-msgstr ""
+msgstr "Napriek tomu pokračovať"
msgid "Ignore warning and install style anyway"
-msgstr ""
+msgstr "Ignorovať varovanie a aj tak nainštalovať štýl"
msgid "Some entries have unmet dependencies:"
-msgstr ""
+msgstr "Niektoré položky majú neúplné závislosti:"
msgid "Reset"
msgstr "Reset"
@@ -10197,6 +10539,12 @@ msgstr "Odstranit z nástrojové lišty"
msgid "Configure toolbar"
msgstr "Konfigurovat nástrojovou lištu"
+msgid "Edit shortcut"
+msgstr "Upraviť skratku"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Neskrývať nástroje a menu"
+
msgid "Actions"
msgstr "Akce"
@@ -10231,13 +10579,16 @@ msgid "Strange toolbar value: {0}"
msgstr "Podivné hodnoty na nástrojové liště: {0}"
msgid "Toolbar action {0} overwritten: {1} gets {2}"
-msgstr ""
+msgstr "Akcia panela nástrojov {0} prepísaná: {1} dostaneme {2}"
msgid "Registered toolbar action without name: {0}"
-msgstr ""
+msgstr "Registrovaná akcia panela nástrojov bez mena: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
-msgstr ""
+msgstr "Registrovaná akcia panela nástrojov {0} prepísaná: {1} dostaneme {2}"
+
+msgid "Toolbar: {0}"
+msgstr "Nástrojová lišta: {0}"
msgid "Data validator"
msgstr "Kontrola dat"
@@ -10290,21 +10641,12 @@ msgstr "Hledání: "
msgid "Read from file"
msgstr "Načíst ze souboru"
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
msgid "Export selected items"
msgstr "Uložit do souboru vybrané položky"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM soubory s nastavením (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Vyberte prosím některé z nastavení, které nejsou označeny jako výchozí."
@@ -10314,31 +10656,86 @@ msgstr "Uložit vlastní nastavení do souboru"
msgid "What to do with preference lists when this file is to be imported?"
msgstr ""
+"Čo robiť s preferenčnými zoznamami, keď tento súbor je potrebné importovať?"
msgid "Append preferences from file to existing values"
-msgstr ""
+msgstr "Pripojiť preferencie zo súboru do existujúcich hodnôt"
msgid "Replace existing values"
-msgstr ""
+msgstr "Nahradiť existujúce hodnoty"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM soubory s nastavením (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Otvoriť súbor pre prispôsobenie JOSMu"
-msgid "Advanced Background: Changed"
-msgstr ""
+msgid "Import log"
+msgstr "Importovať log"
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
+"<html>Tu je zhrnutie importovaného súboru. <br/>Môžete odmietnuť predvoľby "
+"zmeny stlačením tlačidla \"Cancel\" v dialógu predvolieb <br/> Ak chcete "
+"aktivovať niektoré zmeny, môže byť potrebný reštart JOSMu.</html>"
-msgid "Current value is default."
+msgid "shortcut"
+msgstr "skratka"
+
+msgid "color"
+msgstr "farba"
+
+msgid "toolbar"
+msgstr "nástrojová lišta"
+
+msgid "imagery"
+msgstr "mapový podklad"
+
+msgid "Reset preferences"
+msgstr "Vynulovať (resetovať) nastavenia"
+
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
+"Chystáte sa vymazať všetky nastavenia na ich východzie hodnoty<br />Všetky "
+"Vaše nastavenia budú vymazané: pluginy, podklady, filtre, nástroje na lište, "
+"klávesové skratky, atď. <br />Naozaj chcete pokračovať?"
-msgid "Default value is ''{0}''."
+msgid "Load profile"
+msgstr "Načítať profil"
+
+msgid "Save {0} profile"
+msgstr "Uložiť profil {0}"
+
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "Choose profile file"
msgstr ""
+msgid "Change list setting"
+msgstr "Zmeniť nastavenie zoznamu"
+
+msgid "Key: {0}"
+msgstr "Klíč: {0}"
+
+msgid "Change list of lists setting"
+msgstr "Zmeniť nastavenie zoznamu zoznamov"
+
+msgid "add entry"
+msgstr "přidat položku"
+
+msgid "Remove the selected entry"
+msgstr "Odstranit vybranou položku"
+
+msgid "Change list of maps setting"
+msgstr "Zmeniť zoznam mapových nastavení"
+
+msgid "Entry {0}"
+msgstr "Položka {0}"
+
msgid "Select Setting Type:"
msgstr "Vybrat typ nastavení:"
@@ -10357,29 +10754,23 @@ msgstr "Seznam map"
msgid "Add setting"
msgstr "Přidat nastavení"
-msgid "Change list setting"
+msgid "Advanced Background: Changed"
msgstr ""
-msgid "Key: {0}"
-msgstr "Klíč: {0}"
-
-msgid "Change list of lists setting"
+msgid "Advanced Background: NonDefault"
msgstr ""
-msgid "add entry"
-msgstr "přidat položku"
-
-msgid "Remove the selected entry"
-msgstr "Odstranit vybranou položku"
+msgid "Current value is default."
+msgstr "Aktuálna hodnota je predvolená."
-msgid "Change list of maps setting"
-msgstr ""
+msgid "Default value is ''{0}''."
+msgstr "Predvolená hodnota je ''{0}''."
-msgid "Entry {0}"
-msgstr "Položka {0}"
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Predvolená hodnota nie je známa (nastavenie nebolo doteraz použité)."
msgid "Change string setting"
-msgstr ""
+msgstr "Zmeniť nastavenie reťazca"
msgid "Value: "
msgstr "Hodnota: "
@@ -10434,9 +10825,12 @@ msgstr "Vykreslovat virtuální uzly v modu výběru"
msgid "Draw inactive layers in other color"
msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
-msgid "Highlight target ways and nodes"
+msgid "Display discardable keys"
msgstr ""
+msgid "Highlight target ways and nodes"
+msgstr "Zvýrazniť cieľové cesty a body"
+
msgid "Draw rubber-band helper line"
msgstr "Vykreslovat pomocnou čáru od posledního bodu."
@@ -10444,7 +10838,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "Vyhlazené mapy (antialiasing)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr ""
+msgstr "Vyhladiť mapy v režime drôtového modelu (antialiasing)"
msgid "Draw only outlines of areas"
msgstr "Vykreslovat pouze obrysy ploch"
@@ -10457,6 +10851,7 @@ msgstr "Zobrazovat směr u segmentů cesty."
msgid "Draw arrows in the direction of oneways and other directed features."
msgstr ""
+"Nakreslite šípky v smere jednosmerných ciest a ďalšie smerové vlastnosti."
msgid "Draw the order numbers of all segments within their way."
msgstr "Zobrazovat pořadí u všech segmentů v cestách."
@@ -10478,18 +10873,27 @@ msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
+"Aplikovať vyhladzovanie (antialiasing) v režime drôtového modelu pre "
+"jemnejšie zobrazenie."
msgid "Hightlight target nodes and ways while drawing or selecting"
-msgstr ""
+msgstr "Zvýrazniť cieľové body a cesty počas kreslenia alebo výberu"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
"in the selected style."
msgstr ""
+"Táto možnosť potlačí vypĺňanie oblastí, prevažujúce čokoľvek uvedené vo "
+"vybranom štýle."
-msgid "Options that affect drawing performance"
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
msgstr ""
+msgid "Options that affect drawing performance"
+msgstr "Možnosti, ktoré ovplyvnia výkonnosť kreslenia"
+
msgid "Segment drawing options"
msgstr ""
@@ -10497,7 +10901,7 @@ msgid "Select and draw mode options"
msgstr ""
msgid "Other options"
-msgstr ""
+msgstr "Ďalšie voľby"
msgid "OSM Data"
msgstr "OSM data"
@@ -10535,13 +10939,13 @@ msgid "Local files"
msgstr "Místní soubory"
msgid "Force lines if no segments imported"
-msgstr ""
+msgstr "Sila čiary ak nie sú doplnené segmenty"
msgid "Draw large GPS points"
msgstr "Kreslit velké GPS body"
msgid "Draw a circle from HDOP value"
-msgstr ""
+msgstr "Nakresliť kruh z hodnoty HDOP"
msgid "Velocity (red = slow, green = fast)"
msgstr "Rychlost (červená = pomalá, zelená = rychlá)"
@@ -10578,7 +10982,7 @@ msgid "Dynamic color range based on data limits"
msgstr "Dynamické barvy závisle na hodnotách dat"
msgid "Smooth GPX graphics (antialiasing)"
-msgstr ""
+msgstr "Vyhladiť GPX grafiku (antialiasing)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -10592,6 +10996,8 @@ msgid ""
"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
"draw all lines."
msgstr ""
+"Maximálna dĺžka (v metroch) pre kresbu čiar lokálnych súborov. Nastavte ''-"
+"1'' pre kresbu všetkých čiar."
msgid "Maximum length for local files (meters)"
msgstr "Maximální délka lokálních souborů (v metrech)"
@@ -10626,7 +11032,7 @@ msgid "Minimum distance (pixels)"
msgstr "Minimální vzdálenost (pixelů)"
msgid "Draw a circle from HDOP value."
-msgstr ""
+msgstr "Nakreslite kruh z hodnoty HDOP."
msgid "Draw larger dots for the GPS points."
msgstr "Zobrazovat větší tečky pro GPS body."
@@ -10640,6 +11046,7 @@ msgstr "Šířka kreslených GPX linií"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgstr ""
+"Aplikovať vyhladzovanie (antialiasing) na čiary GPX pre jemnejšie zobrazenie."
msgid ""
"All points and track segments will have the same color. Can be customized in "
@@ -10658,6 +11065,8 @@ msgid ""
"Colors points and track segments by dilution of position (HDOP). Your "
"capture device needs to log that information."
msgstr ""
+"Farby bodov a sledované segmenty pozície riedenia (HDOP). Vaše zariadenie "
+"pre digitalizáciu musia zaznamenať informácie."
msgid "Colors points and track segments by its timestamp."
msgstr "Obarvovat body a segmenty podle časových značek."
@@ -10669,22 +11078,22 @@ msgid "Track and Point Coloring"
msgstr "Barvy tras a bodů"
msgid "Colors points and track segments by data limits."
-msgstr ""
+msgstr "Vyfarbiť body vyznačiť segmenty podľa časových limitov."
msgid "Waypoint labelling"
msgstr "Značení bodů"
msgid "Audio waypoint labelling"
-msgstr ""
+msgstr "Označenie bodu so zvukovým záznamom"
msgid "Incorrect waypoint label pattern: {0}"
-msgstr ""
+msgstr "Nesprávne označenie formátu bodu: {0}"
msgid "Incorrect pattern"
msgstr "Nesprávný formát"
msgid "Incorrect audio waypoint label pattern: {0}"
-msgstr ""
+msgstr "Nesprávny formát bodu so zvukovým záznamom: {0}"
msgid "Show splash screen at startup"
msgstr "Zobrazovat při startu úvodní obrazovku"
@@ -10725,7 +11134,7 @@ msgid "Add Imagery URL"
msgstr "Přidat URL podkladových map"
msgid "1. Enter URL"
-msgstr ""
+msgstr "1. Zadajte adresu URL"
msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
@@ -10752,22 +11161,22 @@ msgid ""
msgstr ""
msgid "2. Enter maximum zoom (optional)"
-msgstr ""
+msgstr "2. Zadajte maximálny zoom (voliteľné)"
msgid "3. Verify generated TMS URL"
-msgstr ""
+msgstr "3. Overte vytvorený TMS URL"
msgid "4. Enter name for this layer"
-msgstr ""
+msgstr "4. Zadajte názov pre túto vrstvu"
msgid "Store WMS endpoint only, select layers at usage"
msgstr "Uložit pouze základní adresu WMS, výběr vrstev až při použití"
msgid "Show bounds"
-msgstr ""
+msgstr "Zobraziť hranice"
msgid "1. Enter service URL"
-msgstr ""
+msgstr "1. Zadajte adresu URL služby"
msgid "Get layers"
msgstr ""
@@ -10775,7 +11184,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10824,7 +11239,7 @@ msgid "Offset bookmarks"
msgstr "Záložky posunu podkladu"
msgid "Imagery Background: Default"
-msgstr ""
+msgstr "Pozadie snímok: Predvolené"
msgid "Available default entries:"
msgstr "Dostupné výchozí položky:"
@@ -10890,7 +11305,7 @@ msgid "Max. zoom level: "
msgstr "Max. úroveň přiblížení: "
msgid "Add to slippymap chooser: "
-msgstr ""
+msgstr "Pridať do výberu slippymap: "
msgid "Tile cache directory: "
msgstr "Adresář cache dlaždic: "
@@ -10899,6 +11314,8 @@ msgid ""
"That layer does not support any of JOSM''s projections,\n"
"so you can not use it. This message will not show again."
msgstr ""
+"Táto vrstva nepodporuje žiadne z JOSM''projekcie,\n"
+"takže ju nemožno použiť. Táto správa sa znovu nezobrazí ."
msgid "Downloader:"
msgstr "Stahovač:"
@@ -10950,6 +11367,12 @@ msgstr ""
"<i>(JOSM může zachovat záložní soubor po uložení datových vrstev. K názvu "
"souboru bude připojeno ''~'' a bude uložen do stejného adresáře.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Záložní soubory"
@@ -10969,7 +11392,7 @@ msgid "Add a new style by entering filename or URL"
msgstr "Přidat nový styl ze souboru nebo URL"
msgid "New style entry:"
-msgstr ""
+msgstr "Položka nového štýlu:"
msgid "Remove the selected styles from the list of active styles"
msgstr "Odstranit vybrané styly ze seznamu aktivních"
@@ -10990,9 +11413,12 @@ msgid ""
"<html>Failed to load the list of style sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
+"<html>Neúspešné načítanie obsahu zdrojov štýlov z<br>''{0}''.<br><br>Detaily "
+"(nepreložené):<br>{1}</html>"
msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
msgstr ""
+"Varovanie: neplatný formát počtu v štýle obsahu ''{0}''. Dostal som ''{1}''"
msgid "JOSM Internal Style"
msgstr "Interní styl JOSM"
@@ -11015,37 +11441,48 @@ msgstr "Nastavení mapy"
msgid "Settings for the map projection and data interpretation."
msgstr "Nastavení projekce mapy a interpretace dat."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
"Do you want to keep it?"
msgstr ""
+"Nemôžem čítať zdroj predvolieb označovania: {0}\n"
+"Prajete si, ho zachovať?"
msgid "Could not read tagging preset source {0}"
-msgstr ""
+msgstr "Nemôžem čítať zdroj predvolieb označovania: {0}"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
"{3}</table></html>"
msgstr ""
+"<html>Zdroj predvolieb označovania {0} môže byť nahratý, ale obsahuje chyby. "
+"Naozaj ho chcete používať?<br><br><table width=600>Chyba je: [{1}:{2}] "
+"{3}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
msgstr ""
+"<html>Nemožno spracovať zdroj predvolieb označovania: {0}. Naozaj ho chcete "
+"používať?<br><br><table width=400>Chyba je: [{1}:{2}] {3}</table></html>"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
+"<html>Zdroj predvolieb označovania {0} môže byť nahratý, ale obsahuje chyby. "
+"Naozaj chcete používať?<br><br><table width=600>Chyba je: {1}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
+"<html>Nemožno spracovať zdroj predvolieb označovania: {0}. Naozaj ho chcete "
+"používať?<br><br><table width=600>Chyba je: {1}</table></html>"
msgid "Sort presets menu"
msgstr "Setřídit nabídku s přednastaveními"
@@ -11084,9 +11521,13 @@ msgid ""
"<html>Failed to load the list of preset sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
+"<html>Nepodarilo sa načítať zoznam prednastavených zdrojov z "
+"<br>''{0}''.<br><br>Detaily (nepreložené):<br>{1}</html>"
msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
msgstr ""
+"Varovanie: Nedovolený formát zápisu do prednastaveného zoznamu ''{0}''. Máte "
+"''{1}''"
msgid "Internal Preset"
msgstr "Interní předvolby"
@@ -11106,14 +11547,15 @@ msgstr ""
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Plugin {0} je stále používaný týmto {1} pluginom:"
+msgstr[1] "Plugin {0} je stále používaný týmito {1} pluginmi:"
+msgstr[2] "Plugin {0} je stále používaný týmito {1} pluginmi:"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: Verze {1} (lokálně: {2})"
msgid " (requires: {0})"
-msgstr ""
+msgstr " (vyžaduje: {0})"
msgid "Ask before updating"
msgstr "Dotaz před aktualizací"
@@ -11145,43 +11587,43 @@ msgid "By Code (EPSG)"
msgstr ""
msgid "Invalid projection configuration: {0}"
-msgstr ""
+msgstr "Neplatná konfigurácia projekcie : {0}"
msgid "Projection configuration is valid."
-msgstr ""
+msgstr "Konfigurácia projekcie je platná."
msgid "Validate"
msgstr "Ověřit"
msgid "Parameter information..."
-msgstr ""
+msgstr "Informácie o parametroch..."
msgid "Parameter information"
-msgstr ""
+msgstr "Informácie o parametroch"
msgid "Projection name"
-msgstr ""
+msgstr "Názov projekcie"
msgid "Supported values:"
-msgstr ""
+msgstr "Podporované hodnoty:"
msgid "Projection parameters"
-msgstr ""
+msgstr "Parametre projekcie"
msgid "False easting and false northing"
-msgstr ""
+msgstr "Zlé smerovanie na východ a sever"
msgid "Central meridian"
-msgstr ""
+msgstr "Hlavný poludník"
msgid "Scaling factor"
-msgstr ""
+msgstr "Koeficient zväčšenia"
msgid "Ellipsoid name"
-msgstr ""
+msgstr "Názov elipsoidu"
msgid "Ellipsoid parameters"
-msgstr ""
+msgstr "Parametre elipsoidu"
msgid "Datum name"
msgstr ""
@@ -11193,10 +11635,10 @@ msgid "NTv2 grid file"
msgstr ""
msgid "Built-in:"
-msgstr ""
+msgstr "Zabudované:"
msgid "Projection bounds (in degrees)"
-msgstr ""
+msgstr "Hranice projekcie (v stupňoch)"
msgid "Gauß-Krüger"
msgstr "Gauß-Krüger"
@@ -11205,7 +11647,7 @@ msgid "GK Zone"
msgstr "G-K pásmo"
msgid "Gauß-Krüger Zone {0}"
-msgstr ""
+msgstr "Gauß-Krüger Zone {0}"
msgid "{0} ({1} to {2} degrees)"
msgstr "{0} ({1} až {2} stupňů)"
@@ -11279,21 +11721,6 @@ msgstr "Švýcarský Grid"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (bez lokálních korekcí)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zóna UTM"
-
-msgid "North"
-msgstr "Sever"
-
-msgid "South"
-msgstr "Jih"
-
-msgid "Hemisphere"
-msgstr "Polokoule"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11315,6 +11742,21 @@ msgstr "UTM Francie (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Geodesický systém"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zóna UTM"
+
+msgid "North"
+msgstr "Sever"
+
+msgid "South"
+msgstr "Jih"
+
+msgid "Hemisphere"
+msgstr "Polokoule"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Testuji OSM API URL ''{0}''"
@@ -11322,6 +11764,8 @@ msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
+"<html>''{0}'' nie je platná OSM API URL.<br>Prosím, skontrolujte pravopis a "
+"znovu potvrďte.</html>"
msgid "Invalid API URL"
msgstr "Neplatné API URL"
@@ -11330,11 +11774,15 @@ msgid ""
"<html>Failed to build URL ''{0}'' for validating the OSM API "
"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
+"<html>Nepodarilo sa doplniť URL ''{0}'' pre overenie OSM API "
+"servera.<br>Skontrolujte prosím váš text ''{1}'' a overte znova.</html>"
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
"''{1}'' and your Internet connection and validate again.</html>"
msgstr ""
+"<html>Neúspešné pripojenie k URL ''{0}''.<br>Prosím, skontrolujte pravopis z "
+"''{1}'' a vaše internetové pripojenie a potvrďte znovu.</html>"
msgid "Connection to API failed"
msgstr "Připojení k API selhalo"
@@ -11344,12 +11792,18 @@ msgid ""
"at<br>''{1}''. The server responded with the return code {0} instead of "
"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
+"<html>Neúspešné získanie zoznamu zmenových súborov z OSM API servera "
+"v<br>''{1}''. Server odpovedal kódom {0} namiesto 200.<br>Prosím, "
+"skontrolujte pravopis z ''{1}'' a potvrďte znovu.</html>"
msgid ""
"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
"spelling of ''{0}'' and validate again.</html>"
msgstr ""
+"<html>OSM API server v ''{0}'' neposlal platnú odpoveď.<br>Môže byť že "
+"''{0}'' nie je OSM API server.<br>Prosím, skontrolujte pravopis z ''{0}'' a "
+"potvrďte znovu.</html>"
msgid "Use Basic Authentication"
msgstr "Použít základní autentizaci"
@@ -11367,8 +11821,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Vybere OAuth jako autentizační mechanismus"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11377,20 +11831,25 @@ msgstr "Uživatelské jméno:"
msgid "OSM password:"
msgstr "Heslo:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
+msgstr "Aktuálny správca prihlasovacích údajov je typu ''{0}''"
+
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Periodically check for new messages"
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -11422,6 +11881,7 @@ msgstr ""
msgid "Click test access to the OSM server with the current access token"
msgstr ""
+"Kliknite na test prístup k serveru OSM so súčasným autorizačným prístupom"
msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
msgstr ""
@@ -11480,18 +11940,9 @@ msgid "Use a SOCKS proxy"
msgstr "Použít SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Varování: JOSM je nakonfigurován k používání systémové proxy, ale JVM není "
-"nakonfigurován k jejímu převzetí. Konfigurace byla resetována na ''Žádná "
-"proxy''"
-
-msgid "disabled"
-msgstr "zakázáno"
-
-msgid "no modifier"
-msgstr "žádný přepínač"
msgid "Shortcut Background: User"
msgstr ""
@@ -11521,7 +11972,7 @@ msgid "Shortcut"
msgstr "Klávesová zkratka"
msgid "multiple"
-msgstr ""
+msgstr "viacnásobný"
msgid "Remove old keys from up to {0} object"
msgid_plural "Remove old keys from up to {0} objects"
@@ -11535,38 +11986,47 @@ msgstr "Smazat vybrané prvky v seznamu tagů"
msgid "Add a new tag"
msgstr "Přidat nový tag"
-msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgid "Paste tags from buffer"
+msgstr "Vložiť značky zo zásobníka"
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Použít přednastavení \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Objekty typu {0} nejsou podporovány."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Změnit {0} objekt"
+msgstr[1] "Změnit {0} objekty"
+msgstr[2] "Změnit {0} objektů"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
+msgid "Nothing selected!"
+msgstr "Nic není zvoleno!"
-msgid "More information about this feature"
-msgstr "Více informací o tomto přednastavení"
+msgid "Selection unsuitable!"
+msgstr "Vybrány nevhodné objekty!"
-msgid "Unknown requisite: {0}"
+msgid "Apply Preset"
+msgstr "Aplikovat přednastavení"
+
+msgid "New relation"
+msgstr "Nová relace"
+
+msgid "Change Tags"
msgstr ""
+msgid "Unknown requisite: {0}"
+msgstr "Neznámy žiadaný: {0}"
+
msgid "Illegal member expression: {0}"
-msgstr ""
+msgstr "Nepovolený členský výraz: {0}"
+
+msgid "More information about this feature"
+msgstr "Více informací o tomto přednastavení"
msgid "Available roles"
msgstr "Dostupné role"
@@ -11583,53 +12043,52 @@ msgstr "prvky"
msgid "Optional Attributes:"
msgstr "Volitelné atributy:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
+msgid "Select auto-increment of {0} for this field"
+msgstr "Zvoliť automatické zvyšovanie {0} pre toto pole"
-msgid "Use preset ''{0}''"
-msgstr "Použít přednastavení \"{0}\""
+msgid "Cancel auto-increment for this field"
+msgstr "Zrušiť automatické zvyšovanie pre toto pole"
-msgid "Unknown type: {0}"
-msgstr "Neznámý typ: {0}"
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
+"Varovanie v prednastavení tagovania \"{0}-{1}\": Ignoruje sa atribút ''{2}'' "
+"pretože boli zadané elementy ''{3}''"
-msgid "Preset role element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
+"Chybné prednastavenie tagovania \"{0}-{1}\" - Java metóda zadaná v "
+"''values_from'' nie je \"{2}\""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
+"Chybné prednastavenie tagovania \"{0}-{1}\" - Java metóda zadaná v "
+"''values_from'' vrátila výnimku {2} ({3})"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Chyba parsování {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Objekty typu {0} nejsou podporovány."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Změnit {0} objekt"
-msgstr[1] "Změnit {0} objekty"
-msgstr[2] "Změnit {0} objektů"
-
-msgid "Nothing selected!"
-msgstr "Nic není zvoleno!"
-
-msgid "Selection unsuitable!"
-msgstr "Vybrány nevhodné objekty!"
-
-msgid "Apply Preset"
-msgstr "Aplikovat přednastavení"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Poškodené prednastavenie tagovania \"{0}-{1}\" - počet položiek v "
+"''display_values'' musí byť rovnaký ako vo ''values''"
-msgid "New relation"
-msgstr "Nová relace"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Poškodené prednastavenie tagovania \"{0}-{1}\" - počet položiek v "
+"''short_descriptions'' musí byť rovnaký ako vo ''values''"
-msgid "Change Properties"
-msgstr "Změnit vlastnosti"
+msgid "Unknown type: {0}"
+msgstr "Neznámý typ: {0}"
msgid "Preset group {1} / {0}"
msgstr "Skupina předvoleb {1} / {0}"
@@ -11637,11 +12096,23 @@ msgstr "Skupina předvoleb {1} / {0}"
msgid "Preset group {0}"
msgstr "Skupina předvoleb {0}"
+msgid "Roles cannot appear more than once"
+msgstr "Role sa nesmú vyskytovať viackrát"
+
+msgid "Preset role element without parent"
+msgstr "Prednastavené úlohy prvkom, bez materských"
+
+msgid "Preset sub element without parent"
+msgstr "Prednastavený sub prvok bez materských"
+
+msgid "Error parsing {0}: "
+msgstr "Chyba parsování {0}: "
+
msgid "Search preset"
msgstr "Najít předvolbu"
msgid "Show preset search dialog"
-msgstr ""
+msgstr "Zobraziť vyhľadávací dialóg prednastavení"
msgid "Search presets"
msgstr "Najít předvolby"
@@ -11652,8 +12123,18 @@ msgstr "Zobrazit pouze aplikovatelné na výběr"
msgid "Search in tags"
msgstr "Hledat ve značkách (tags)"
-msgid "All files (*.*)"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
msgstr ""
+"Nastaviteľný {0} ešte neregistrovaný. Nemôžem nastaviť spoluúčasť v "
+"nastavení synchronizácie."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Nastaviteľný {0} ešte neregistrovaný."
+
+msgid "All files (*.*)"
+msgstr "Všetky súbory (*.*)"
msgid "Min. latitude"
msgstr "Min. šířka"
@@ -11671,6 +12152,8 @@ msgid ""
"URL from www.openstreetmap.org (you can paste a download URL here to specify "
"a bounding box)"
msgstr ""
+"URL z www.openstreetmap.org (môžete ju vložiť na stiahnutie z URL pre "
+"špecifikáciu hraníc box)"
msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
@@ -11682,6 +12165,56 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr "Aktuální hodnota není validním ID OSM. Zadejte prosím celé číslo > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "odvybráno: vlastnost je explicitně vypnutá"
+
+msgid "true: the property is explicitly switched on"
+msgstr "vybráno: vlastnost je explicitně zapnutá"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"částečně vybráno: vlastnost je u vybraných objektů nastavena rozdílně"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "nenastaveno: vlastnost není pro vybrané objekty nastavena"
+
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+msgid "Right click = copy to clipboard"
+msgstr "Pravé kliknutí = kopírovat do schránky"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "povinný atribut ''{0}'' chybí"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu long , zadáno ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu long (>=0), zadáno ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Chybná hodnota v atribúte ''{0}'' typu \"double\". Zadané bolo ''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu boolean, zadáno ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu OsmPrimitiveType, zadáno "
+"''{1}''"
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11717,38 +12250,45 @@ msgid "Contacting OSM Server..."
msgstr "Připojování k serveru OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
msgid "Failed to parse date ''{0}'' replied by server."
-msgstr ""
+msgstr "Neúspešné rozloženie údajov ''{0}'' odpovedal server."
msgid ""
"Unexpected format of error header for conflict in changeset update. Got "
"''{0}''"
msgstr ""
+"Nečakaný chybný formát záhlavia pre konflikt v aktualizácii súboru zmien. "
+"Dostal som ''{0}''"
msgid "Illegal longitude value for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Neplatná hodnota parametra zem. dĺžky ''{0}'', dostal som {1}"
msgid "Illegal latitude value for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Neplatná hodnota parametra zem. šírky ''{0}'', dostal som {1}"
msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
msgstr ""
+"Neočakávaná hodnota pre ''{0}'' v URL požiadavke zmevého súboru, dostal "
+"som{1}"
msgid ""
"Cannot create a changeset query including both the query parameters ''uid'' "
"and ''display_name''"
msgstr ""
+"Nemožno vytvoriť požiadavku na zmenový súbor, vrátane parametrov požiadavky "
+"''uid'' a ''display_name''"
msgid "Unsupported parameter ''{0}'' in changeset query string"
msgstr ""
+"Nepodporovaný parameter ''{0}'' v reťazci požiadavky zmenového súboru"
msgid ""
"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Neočakávaný formát pre číslo portu v nastavení ''{0}''. Mám ''{1}''."
msgid "The proxy will not be used."
msgstr "Proxy server nebude použit."
@@ -11757,30 +12297,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Chybné číslo portu v nastavení ''{0}''. Nalezeno {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Varování: neočekávaná hodnota v položce ''{0}''. Zadáno ''{1}''. Proxy "
-"nebude použita."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11808,10 +12344,10 @@ msgid "Invalid bz2 file."
msgstr "poškozený bz2 soubor."
msgid "GeoJSON Files"
-msgstr ""
+msgstr "GeoJSON súbory"
msgid "Layer ''{0}'' not supported"
-msgstr ""
+msgstr "Vrstva ''{0}'' nie je podporovaná"
msgid ""
"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -11864,7 +12400,7 @@ msgid "GPX Files"
msgstr "GPX soubory"
msgid "Parsing data for layer ''{0}'' failed"
-msgstr ""
+msgstr "Analyzácia dát pre vsrstvu ''{0}'' zlyhala"
msgid ""
"Error occurred while parsing gpx data for layer ''{0}''. Only a part of the "
@@ -11882,6 +12418,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
+msgid "(at line {0}, column {1})"
+msgstr "(na řádce {0}, sloupci {1})"
+
msgid "Unknown mode {0}."
msgstr "Neznámý režim {0}."
@@ -11897,12 +12436,20 @@ msgstr "Hledám soubory s obrázky"
msgid "No image files found."
msgstr "Nenalezeny žádné soubory s obrázky."
-msgid "Failed to open input stream for resource ''{0}''"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
msgstr ""
+msgid "Failed to open input stream for resource ''{0}''"
+msgstr "Nepodarilo sa otvoriť vstupný tok pre zdroj ''{0}''"
+
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11917,6 +12464,8 @@ msgid ""
"Unexpected response from HTTP server. Got {0} response without ''Location'' "
"header. Can''t redirect. Aborting."
msgstr ""
+"Neočakávaná odpoveď servera HTTP. Máte {0} miesto odpovedi ''Poloha'' v "
+"záhlaví. Nemôžem presmerovať. Prerušujem."
msgid "Too many redirects to the download URL detected. Aborting."
msgstr "Detekováno příliš mnoho přesměrování URL. Přerušení akce."
@@ -11975,25 +12524,25 @@ msgid "Coordinates imported: {0}"
msgstr "Importované souřadnice: {0}"
msgid "Malformed sentences: {0}"
-msgstr ""
+msgstr "Chybné vety: {0}"
msgid "Checksum errors: {0}"
msgstr "Chyby kontrolních součtů: {0}"
msgid "Unknown sentences: {0}"
-msgstr ""
+msgstr "Neznáme vety: {0}"
msgid "Zero coordinates: {0}"
msgstr "Nulové souřadnice: {0}"
-msgid "NMEA import success"
-msgstr "NMEA import úspěšný"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA import selhal!"
msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
-msgstr ""
+msgstr "Chýbajú preferencie ''{0}''. Nemôžem inicializovať OsmApi."
msgid "This version of JOSM is incompatible with the configured server."
msgstr "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem."
@@ -12007,6 +12556,7 @@ msgstr ""
msgid "Removed layer {0} because it is not allowed by the configured API."
msgstr ""
+"Odstránená vrstva {0}, pretože to nie je povolený nakonfigurovaný API."
msgid "Unexpected format of ID replied by the server. Got ''{0}''."
msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''"
@@ -12071,13 +12621,14 @@ msgid "OSM Server Files bzip2 compressed"
msgstr "OSM soubory komprimované pomocí bzip2"
msgid "Prolog of OsmChange document already written. Please write only once."
-msgstr ""
+msgstr "Prológ dokumentu OsmChange už bol napísaný. Prosím, napíšte iba raz."
msgid "Prolog of OsmChange document not written yet. Please write first."
msgstr ""
+"Úvod z OsmChange dokumentu nie je napísaný. Prosím, napíšte ho ako prvý."
msgid "OsmChange File"
-msgstr ""
+msgstr "OsmChange súbor"
msgid "File ''{0}'' does not exist."
msgstr "Soubor \"{0}\" neexistuje"
@@ -12086,42 +12637,13 @@ msgid "No data found in file {0}."
msgstr "V souboru {0} nebyla nalezena žádná data."
msgid "Open OsmChange file"
-msgstr ""
-
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "povinný atribut ''{0}'' chybí"
+msgstr "Otvoriť súbor OsmChange"
msgid "Unsupported version: {0}"
msgstr "Nepodporovaná verze: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"nedovolená hodnota povinného atributu ''{0}'' typu long , zadáno ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"nedovolená hodnota povinného atributu ''{0}'' typu long (>=0), zadáno ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"nedovolená hodnota povinného atributu ''{0}'' typu boolean, zadáno ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"nedovolená hodnota povinného atributu ''{0}'' typu OsmPrimitiveType, zadáno "
-"''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -12129,10 +12651,12 @@ msgid ""
"Illegal document structure. Found node, way, or relation outside of "
"''create'', ''modify'', or ''delete''."
msgstr ""
+"Chybná štruktúra dokumentu. Vytvorená bod, cesta, alebo relácia sa nedá "
+"''vytvoriť'','' zmeniť'', alebo odstrániť''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -12160,12 +12684,8 @@ msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
"Nepodařilo se podepsat HTTP konexi pomocí autentizační hlavičky OAuth"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
-"Upozornění: Neočakávaná hodnota preference ''{0}''. Nalezeno ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(na řádce {0}, sloupci {1})"
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Při ukládání došlo k chybě.<br>Chyba: <br>{0}</html>"
@@ -12176,9 +12696,6 @@ msgid ""
msgstr ""
"<html>Došlo k chybě při obnovování zálohy souboru.<br>Chyba: <br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nemohu zálohovat soubor. Vyjímka: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM soubory komprimované pomocí gzip"
@@ -12189,7 +12706,7 @@ msgid "OSM Server Files"
msgstr "Soubory z OSM serveru"
msgid "Invalid dataset"
-msgstr ""
+msgstr "Neplatný dátový súbor"
msgid "No data found for layer ''{0}''."
msgstr "Pro vrstvu ''{0}'' nenalezena žádná data."
@@ -12200,10 +12717,15 @@ msgstr "V souboru ''{0}'' nenalezena žádná data."
msgid "Open OSM file"
msgstr "Otevřít OSM soubor"
+msgid "Reading was canceled"
+msgstr "Čítanie bolo zrušené"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
msgstr ""
+"Chýbajú povinné atribúty pre element''hranice''. Máte minlon =''{0}'',minlat "
+"=''{1}'',maxlon =''{3}'',maxlat =''{4}'', pôvod =''{5}''."
msgid "Deleted way {0} contains nodes"
msgstr "Smazaná cesta {0} obsahuje uzly"
@@ -12240,7 +12762,7 @@ msgid "Missing key or value attribute in tag."
msgstr "V tagu chybí atribut \"key\" nebo \"value\"."
msgid "Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
+msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam."
msgid "Illegal object with ID=0."
msgstr "Neplatný objekt s id=0"
@@ -12249,10 +12771,12 @@ msgid ""
"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
"{1}."
msgstr ""
+"Neplatná hodnota pre vlastnosť \"version\" (verzia) na OSM základnom objekte "
+"s ID {0}. Prijatá hodnota je {1}"
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -12265,6 +12789,8 @@ msgid ""
"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
"Resetting to 0."
msgstr ""
+"Chybné hodnoty atribútu ''changeset'' pre nový objekt {1}. Dostal som {0}. "
+"Resetujem na 0."
msgid "Illegal value for attribute ''changeset''. Got {0}."
msgstr "Neplatná hodnota pro atribut ''changeset''. Nalezeno {0}."
@@ -12274,6 +12800,7 @@ msgstr "Chybějící povinný atribut ''{0}''."
msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
msgstr ""
+"Neplatná dlhá hodnota pre vlastnosť \"{0}\". Prijatá hodnota je \"{1}\""
msgid "Prepare OSM data..."
msgstr "Připravuji OSM data..."
@@ -12336,7 +12863,7 @@ msgstr ""
"internetu."
msgid "Reading error text failed."
-msgstr ""
+msgstr "Čítanie textu chyby zlyhalo."
msgid "XML tag <user> is missing."
msgstr "Chybí XML tag <user>."
@@ -12382,7 +12909,7 @@ msgid "Uploading data ..."
msgstr "Nahrávám data na server ..."
msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
+msgstr "Najdené neočakávané id 0 pre OSM základný objekt"
msgid "WMS Files (*.wms)"
msgstr "WMS soubory (*.wms)"
@@ -12402,25 +12929,37 @@ msgid "Save user and password (unencrypted)"
msgstr "Uložit uživatelské jméno a heslo (nezašifrované)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<vymazať z {0} objektov>"
+
+msgid "Old values of"
+msgstr "Staré hodnoty"
msgid "Add tags to selected objects"
msgstr "Přidat tagy ke zvoleným objektům"
msgid "Add selected tags"
-msgstr ""
+msgstr "Pridať vybrané značky"
msgid "Add all tags"
-msgstr ""
+msgstr "Pridať všetky značky"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "Pridať zaškrtnuté značky do vybraných objektov"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Shift+Enter: Pridať všetky značky do vybraných objektov"
msgid "Assume"
-msgstr ""
+msgstr "Prevziať"
+
+msgid "Existing values"
+msgstr "Súčasné hodnoty"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Hodnotu prijmete zaškrtnutím políčka"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Prijať všetky značky z {0} pre toto sedenie"
msgid "Load data from API"
msgstr "Nahrávat data z API"
@@ -12446,25 +12985,36 @@ msgstr "Vytvářet nové objekty"
msgid "Read protocol version"
msgstr "Číst verzi protokolu"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
-msgstr "Vzdálené ovládání bylo požádáno o vytvoření nového uzlu."
-
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "Add way"
+msgid "RemoteControl::Server stopped."
msgstr ""
+msgid "Remote Control has been asked to create a new node."
+msgstr "Vzdálené ovládání bylo požádáno o vytvoření nového uzlu."
+
+msgid "There is no layer opened to add node"
+msgstr "Pre pridanie bodu nie je otvorená žiadna vrstva"
+
msgid "Remote Control has been asked to create a new way."
msgstr ""
msgid "Invalid coordinates: {0}"
-msgstr ""
+msgstr "Neplatné súradnice: {0}"
msgid "There is no layer opened to add way"
+msgstr "Pre pridanie cesty nie je otvorená žiadna vrstva"
+
+msgid "Add way"
+msgstr "Pridať cestu"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
msgstr ""
msgid ""
@@ -12475,7 +13025,7 @@ msgstr ""
"následující adresy:"
msgid "Remote imagery"
-msgstr ""
+msgstr "Diaľkové mapové podklady"
msgid "Remote Control has been asked to import data from the following URL:"
msgstr "Vzdálené ovládání bylo požádáno o import dat z následujícího URL:"
@@ -12483,6 +13033,15 @@ msgstr "Vzdálené ovládání bylo požádáno o import dat z následujícího
msgid "Remote Control has been asked to load data from the API."
msgstr "Vzdálené ovládání bylo požádáno o nahrání dat z API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12515,19 +13074,19 @@ msgstr "Data:"
msgid "local file"
msgstr "lokální soubor"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Odkaz na lokální datový soubor OSM."
+msgid "Link to a GPX file on your local disk."
+msgstr ""
msgid "include"
-msgstr ""
+msgstr "zahrnúť"
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
-msgstr ""
+msgstr "Žiadna asociácia súboru"
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12536,7 +13095,7 @@ msgid ""
msgstr ""
msgid "File name expected for layer no. {0}"
-msgstr ""
+msgstr "Názov súboru očakávaný pre vrstvu č. {0}"
msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
@@ -12547,18 +13106,32 @@ msgid "Layer contains unsaved data - save to file."
msgstr "Vrstva obsahuj neuložená data - uložit do souboru."
msgid "Layer does not contain unsaved data."
-msgstr ""
+msgstr "Vrstva neobsahuje neuložené dáta."
+
+msgid "Link to a OSM data file on your local disk."
+msgstr "Odkaz na lokální datový soubor OSM."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Zahrnúť OSM dáta do .joz súboru sedenia."
+
+msgid "OSM data will be included in the session file."
+msgstr "OSM dáta budú zahrnuté v súbore sedenia."
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+"Verzia ''{0}'' metaúdajov pre vrstvu OSM dát nie je podporovaná. Očakávala "
+"sa: 0.1"
+
+msgid "Session file (*.jos, *.joz)"
+msgstr "Soubor s uloženým sezením (*.jos, *.joz)"
msgid "Unable to locate file ''{0}''."
msgstr "Nepodařilo se nalézt soubor ''{0}''."
msgid "Unsupported scheme ''{0}'' in URI ''{1}''."
-msgstr ""
+msgstr "Nepodporovaný režim ''{0}'' in URI ''{1}''."
msgid "Unexpected root element ''{0}'' in session file"
msgstr "Neočekávaný kořenový element ''{0}'' v souboru sezení"
@@ -12590,6 +13163,7 @@ msgstr "Nelze načíst vrstvu"
msgid ""
"Cannot load layer of type ''{0}'' because no suitable importer was found."
msgstr ""
+"Nedá sa načítať vrstva typu \"{0}\" pretože sa nenašiel vhodný importér."
msgid ""
"Cannot load layer {0} because it depends on layer {1} which has been skipped."
@@ -12624,18 +13198,14 @@ msgid "Download skipped"
msgstr "Stahování přeskočeno"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Varování: Nelze stáhnout plugin ''{0}''. Odkaz ke stažení se nepodařilo "
-"nalézt. Přeskakuji."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Varování: Nelze stáhnout plugin ''{0}''. Odkaz ke stažení ''{1}'' není "
-"platné URL. Přeskakuji."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Nepodařilo se vytvořit adresář pro pluginy ''{0}''"
@@ -12653,7 +13223,7 @@ msgid "replaced by new {0} plugin"
msgstr "nahrazeno novým pluginem {0}"
msgid "no longer required"
-msgstr ""
+msgstr "už nie je potrebný"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
@@ -12721,6 +13291,8 @@ msgstr ""
msgid ""
"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
msgstr ""
+"Neočakávaná hodnota ''{0}'' pre nastavenie ''{1}''. Bude sa predpoklať "
+"hodnota ''ask'' (spýtať sa)."
msgid ""
"Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -12806,10 +13378,10 @@ msgstr[2] ""
msgid "Plugin update failed"
msgstr "Aktualizace pluginů selhala"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12824,22 +13396,21 @@ msgstr "Ponechat plugin"
msgid "Click to keep the plugin ''{0}''"
msgstr "Klikněte pro ponechání pluginu ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Varování: nepodařilo se smazat zastaralý plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12881,7 +13452,7 @@ msgstr ""
"Neptat příště se a zapamatovat si volbu (změnit lze v Nastavení -> Pluginy)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Chybný jar súbor \"{0}\""
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "Soubor pluginu ''{0}'' neobsahuje Manifest."
@@ -12890,7 +13461,7 @@ msgid "Invalid URL ''{0}'' in plugin {1}"
msgstr "Neplatné URL ''{0}'' v pluginu {1}"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Chybný popis \"{0}\" v plugine {1}"
msgid "More info..."
msgstr "Více informací..."
@@ -12900,12 +13471,13 @@ msgstr "<b>Plugin je poskytován externím zdrojem:</b> {0}"
msgid "Failed to create plugin information from manifest for plugin ''{0}''"
msgstr ""
+"Nepodarilo sa vytvoriť informácie o pluginoch z manifestu pre pluginy ''{0}''"
msgid "Illegal entry in plugin list."
-msgstr ""
+msgstr "Nedovolený záznam v zozname pluginov."
msgid "Reading local plugin information.."
-msgstr ""
+msgstr "Čítam miestne informácie o pluginoch ..."
msgid "Processing plugin site cache files..."
msgstr "Zpracovávám cache pluginů..."
@@ -12913,8 +13485,7 @@ msgstr "Zpracovávám cache pluginů..."
msgid "Processing file ''{0}''"
msgstr "Zpracovávám soubor ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12929,9 +13500,24 @@ msgstr "Stahuji seznam pluginů..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Stahuji seznam pluginů z ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12944,6 +13530,8 @@ msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
+"Nemožno rozložiť dokument zoznamu pluginov z umiestnenia ''{0}''. "
+"Vynechávam. Výnimka bola: {1}"
msgid "Processing plugin list from site ''{0}''"
msgstr "Zpracovávám seznam pluginů z webu ''{0}''"
@@ -13005,6 +13593,8 @@ msgid ""
"Alternatively, if that does not work you can manually fill in the "
"information below at this URL:"
msgstr ""
+"Prípadne, ak to nebude fungovať, môžete ručne vyplniť údaje nižšie na tejto "
+"URL:"
msgid "(The text has already been copied to your clipboard.)"
msgstr "(Text již byl zkopírován do schránky.)"
@@ -13016,6 +13606,8 @@ msgid ""
"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
"the server URL in your preferences and your internet connection."
msgstr ""
+"<html>Zlyhala inicializácia komunikácie s OSM serverom {0}.<br>Skontrlujte "
+"URL servera vo Vašich nastaveniach a Vaše internetové pripojenie."
msgid ""
"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
@@ -13036,7 +13628,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the node, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -13047,7 +13649,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the node, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z cesty {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -13058,7 +13670,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the node, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na bod a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na bod a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na bod a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -13069,7 +13691,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the way, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -13080,7 +13712,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the way, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z cesty {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -13091,7 +13733,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the way, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte reláciu, odstráňte "
+"odkazovanie na cestu a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na cestu a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
+"odkazovaná z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na cestu a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -13102,7 +13754,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -13113,7 +13775,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z cestu {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -13124,7 +13796,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the relation, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte reláciu, odstráňte "
+"odkazovanie na reláciu a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na reláciu a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na reláciu a nahrajte dáta znovu."
msgid ""
"<html>Uploading to the server <strong>failed</strong> because your "
@@ -13168,11 +13850,16 @@ msgid ""
"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
"another OAuth token.</html>"
msgstr ""
+"<html>Overenie na serveri OSM s OAuth prístupom ''{0}'' zlyhalo.<br>Pre "
+"overenie nie je povolený prístup k chránenému zdroju <br>''{1}''.<br>Prosím "
+"otvorte dialóg nastavení a získajte ďalší OAuth prístup.</html>"
msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
"later.</html>"
msgstr ""
+"<html>Spojenie s OSM serverom ''{0}'' vypršalo. Prosím, skúste to znova "
+"neskôr.</Html>"
msgid "no error message available"
msgstr "není k dizpozici žádké chybové hlášení"
@@ -13183,16 +13870,24 @@ msgid ""
"message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
"(untranslated)</strong>: {2}</html>"
msgstr ""
+"<html>Spojenie s OSM serverom ''{0}'' zlyhalo. Server "
+"odpovedal<br>nasledujúcim kódom chyby a nasledujúcim chybovým "
+"hlásením:<br><strong> Kód chyby: <strong> {1}<br><strong>Chybové hlásenie "
+"(nepreložené)</strong>: {2}</HTML>"
msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
"already been closed."
msgstr ""
+"<html>Zatváranie zmenového súboru <strong>{0}</strong> zlyhalo, <br>pretože "
+"už bol zatvorený."
msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
"already been closed on {1}."
msgstr ""
+"<html>Zatváranie zmenového súboru <strong>{0}</strong> zlyhalo, <br>pretože "
+"už bol zatvorený na {1}."
msgid ""
"<html>The server reported that it has detected a conflict.<br>Error message "
@@ -13202,23 +13897,30 @@ msgstr ""
"(nepřeloženo):<br>{0}</html>"
msgid "<html>The server reported that it has detected a conflict."
-msgstr ""
+msgstr "<html>Server nahlásil zistenie konfliktu."
msgid ""
"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
"already been closed on {1}."
msgstr ""
+"<html>Zlyhalo nahrávanie zmenového súboru <strong>{0},</strong><br>pretožebe "
+"už bol zatvorený na {1}."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
"security reasons. This is most likely because you are running<br>in an "
"applet and because you did not load your applet from ''{1}''."
msgstr ""
+"<html>Zlyhalo otvorenie pripojenia na vzdialený server<br>''{0}''<br>kvôli "
+"bezpečnostným príčinám. Toto je pravdepodobne kvôli tomu, že ste "
+"spustený<br>v aplete. a pretože ste nenačítali aplet z ''{1}''."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
"check your internet connection."
msgstr ""
+"<html>Zlyhalo otvorenie pripojenia na vzdialený "
+"server<br>''{0}''.<br>Prosím, skontrolujte Vaše internetové pripojenie."
msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
@@ -13229,6 +13931,8 @@ msgid ""
"<html>Failed to download data. Its format is either unsupported, ill-formed, "
"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
msgstr ""
+"<html>Nepodarilo sa stiahnuť dáta. Ich formát je buď nepodporovaný, chybný, "
+"a / alebo nekonzistentný.<br><br>Detaily (nepreložené): {0}</html>"
msgid ""
"<html>The OSM server<br>''{0}''<br>reported an internal server "
@@ -13245,9 +13949,9 @@ msgid ""
"large.<br>Either request a smaller area or use an export file provided by "
"the OSM community."
msgstr ""
-"Oblast kterou chcete stáhnout je příliš rozsáhlá nebo obsahuje příliš mnoho "
-"prvků.<br>Vyberte menší oblast nebo použijte exportované soubory poskytované "
-"komunitou OSM."
+"Oblast, kterou chcete stáhnout, je příliš rozsáhlá nebo obsahuje příliš "
+"mnoho prvků.<br>Vyberte menší oblast nebo použijte exportované soubory "
+"poskytované komunitou OSM."
msgid "<br>Error message(untranslated): {0}"
msgstr "<br>Chybové hlášení (nepřeložené): {0}"
@@ -13258,6 +13962,10 @@ msgid ""
"server or you are using an invalid URL to access<br>it. Please carefully "
"check the server''s address ''{0}'' for typos."
msgstr ""
+"OSM server ''{0}'' nepozná objekt<br>pokúsili ste sa čítať, aktualizovať, "
+"alebo vymazať. Jeden príslušný objekt<br>neexistuje na serveri alebo "
+"používate chybnú URL pre prístup<br>naň. Prosím dôkladne skontrolujte adresy "
+"serverov ''{0}'' kvôli preklepom."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -13271,6 +13979,10 @@ msgid ""
"<strong>Downloading failed</strong> if you tried to download this "
"object.<br><br>The error message is:<br>{0}</html>"
msgstr ""
+"<html>Server hlási, že objekt je zmazaný.<br><strong>Nahrávanie je "
+"neúspešné</strong> Ak ste sa snažili nahrať, alebo vymazať tento objekt.<br> "
+"<strong>Nahrávanie neúspešné</strong> ak ste sa snažili nahrať tento "
+"objekt.<br><br>Chybová správa je:<br>{0}</html>"
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Nelze najít překlad pro jazyk {0}. Vracím se k {1}."
@@ -13279,21 +13991,17 @@ msgid ""
"Fatal: failed to locate image ''{0}''. This is a serious configuration "
"problem. JOSM will stop working."
msgstr ""
+"Fatálne: neúspešná lokalizácia obrázka ''{0}''. Toto je vážny konfiguračný "
+"problém. JOSM prestane pracovať."
msgid "Failed to locate image ''{0}''"
msgstr "Nepodařilo se nalézt obrázek ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13303,8 +14011,53 @@ msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgstr ""
+"Nepodarilo sa otvoriť URL. V súčasnej dobe neexistuje nastavenie platformy. "
+"Prosím nastavte najskôr platformu."
+
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
msgid "reserved"
+msgstr "rezervované"
+
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
msgstr ""
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
@@ -13312,54 +14065,79 @@ msgstr ""
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "V zásobníku sa našla {0} značka, čo je nezvyčajné!"
+msgstr[1] "V zásobníku sa našli {0} značky, čo je nezvyčajné!"
+msgstr[2] "V zásobníku sa našlo {0} značiek, čo je nezvyčajné!"
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "Kľúč je príliš dlhý (maximum {0} znakov):"
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "V kľúči sú použité podozrivé znaky:"
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "Hodnota je príliš dlhá (maximum {0} znakov):"
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Chcete vložiť tieto značky?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Vymazať zásobník"
msgid "Ignore warnings"
-msgstr ""
+msgstr "Ignorovať varovanie"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
+"<html><p> Prepáčte, ale nie je možné vložiť značky z vyrovnávacej pamäte. "
+"Neobsahujú žiadne objekty JOSM, alebo vhodné texty. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Pravé kliknutí = kopírovat do schránky"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
msgstr ""
+"nastavenie s kľúčom ''{0}'' neobsahuje ''{1}''. Nemôžem obnoviť geometriu "
+"okna z nastavení."
msgid ""
"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
"{2}. Cannot restore window geometry from preferences."
msgstr ""
+"nastavenie s kľúčom ''{0}'' nemôžem dodať vnútornú hodnotu pre ''{1}''. "
+"Dodaná {2}. Nemôžem obnoviť geometriu okna z nastavení."
msgid ""
"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
"{2}. Cannot restore window geometry from preferences."
msgstr ""
+"neúspešné rozloženie poľa ''{1}'' v nastavení s kľúčom ''{0}''. Odchýlka "
+"bola: {2}. Nemôžem obnoviť geometriu okna z nastavení."
msgid ""
"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
"from preferences."
msgstr ""
+"nastavenie s kľúčom ''{0}'' neexistuje. Nemôžem obnoviť geometriu okna z "
+"nastavení."
msgid "Ignoring malformed geometry: {0}"
msgstr ""
@@ -13371,36 +14149,44 @@ msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
msgstr ""
+"Chyba pri hľadaní výrazu na pozícii {0} - pravá strana, alebo (|) výraz musí "
+"vrátiť sadu elementov"
msgid ""
"Error in search expression on position {0} - left side of or(|) expression "
"must return set of primitives"
msgstr ""
+"Chyba pri hľadaní výrazu na pozícii {0} - ľavá strana, alebo (|) výraz musí "
+"vrátiť sadu elementov"
msgid ""
"Error in search expression on position {0} - not(-) cannot be used in this "
"context"
msgstr ""
+"Chyba pri hľadaní výrazu na pozícii {0} - nie (-) nemožno použiť v tomto "
+"kontexte"
msgid ""
"Error in search expression on position {0} - expression must return "
"different then current primitive"
msgstr ""
+"Chyba pri hľadaní výrazu na pozícii {0} - výraz musí vrátiť iné aktuálne "
+"elementy"
msgid "Unexpected token ({0}) on position {1}"
-msgstr ""
+msgstr "Neočakávaný znak ({0}) na pozícii {1}"
msgid "Unexpected token on position {0}. Expected {1}, found {2}"
-msgstr ""
+msgstr "Neočakávaný znak na pozícii {0}. Očakávané {1}, našiel {2}"
msgid "Error while parsing search expression on position {0}"
-msgstr ""
+msgstr "Chyba pri analýze hľadaného výrazu na pozícii {0}"
msgid "Unexpected char on {0}. Expected {1} found {2}"
-msgstr ""
+msgstr "Neočakávaný znak na {0}. Očakávané {1} najdené {2}"
msgid "Expected search expression"
-msgstr ""
+msgstr "Očakávaný hľadaný výraz"
msgid ""
"You requested too many nodes (limit is 50,000). Either request a smaller "
@@ -13413,7 +14199,7 @@ msgid "Database offline for maintenance"
msgstr "Databáze je mimo provoz kvůli údržbě"
msgid "You have downloaded too much data. Please try again later."
-msgstr ""
+msgstr "Stiahli ste si príliš veľké množstvo dát. Skúste to prosím neskôr."
msgid ""
"The maximum bbox size is 0.25, and your request was too large. Either "
@@ -13426,7 +14212,7 @@ msgid "JOSM-Trac login at josm.openstreetmap.de"
msgstr "JOSM-Trac login na josm.openstreetmap.de"
msgid "could not get audio input stream from input URL"
-msgstr ""
+msgstr "nemôžem získať zvuk zo vstupu URL"
msgid "Audio Device Unavailable"
msgstr "Audio zařízení je nedostupné"
@@ -13451,7 +14237,7 @@ msgstr "obytná oblast"
msgctxt "natural"
msgid "scrub"
-msgstr ""
+msgstr "kosodrevina"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -13463,7 +14249,7 @@ msgstr "hranice"
msgctxt "Relation type"
msgid "enforcement"
-msgstr ""
+msgstr "vynútenie"
msgctxt "Relation type"
msgid "line"
@@ -13507,7 +14293,7 @@ msgstr "lokalita"
msgctxt "Place type"
msgid "village"
-msgstr ""
+msgstr "obec (dedina)"
msgctxt "Place type"
msgid "town"
@@ -13515,11 +14301,11 @@ msgstr "město"
msgctxt "Place type"
msgid "borough"
-msgstr ""
+msgstr "mestský obvod"
msgctxt "Place type"
msgid "municipality"
-msgstr ""
+msgstr "obce so spojenou administratívou"
msgctxt "Place type"
msgid "island"
@@ -13544,7 +14330,7 @@ msgid "Attributes"
msgstr "Atributy"
msgid "Abort file chooser dialog"
-msgstr ""
+msgstr "Zrušiť dialóg pre výber súboru"
msgid "Abort file chooser dialog."
msgstr "Zrušit dialog na vybrání souboru."
@@ -13592,7 +14378,7 @@ msgid "Folders"
msgstr "Adresáře"
msgid "Home"
-msgstr ""
+msgstr "Domáci"
msgid "Look in:"
msgstr "Hledat v:"
@@ -13658,7 +14444,7 @@ msgid "Hue:"
msgstr "Odstín:"
msgid "GTK Color Chooser"
-msgstr ""
+msgstr "GTK Výber Farieb"
msgid "Red:"
msgstr "Červená:"
@@ -13667,14 +14453,23 @@ msgid "Saturation:"
msgstr "Sytost:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
+"Skupina spoločných vstupov pre Interpoláciu adries v jednom dialógu, rovnako "
+"ako možnosť automaticky generovať jednotlivé číslo domu bodov z línie."
msgid ""
"Makes a pair of selected way segments parallel by rotating one of them "
"around a chosen pivot."
msgstr ""
+"Vytvoriť dvojicu vybraných segmentov cesty paralelným otočením jedného z "
+"nich na vybranom bode."
msgid "Tools for drawing buildings."
msgstr "Nástroje pro tvorbu budov."
@@ -13698,6 +14493,8 @@ msgid ""
"Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
"into a GPX layer."
msgstr ""
+"Vložiť vlastné CSV súbory z Columbus/Visiontac V-900 GPS logger do vrstvy "
+"GPX."
msgid ""
"Implements a command line and enables to create your commands. See link for "
@@ -13752,6 +14549,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Pohodlné nalezení a oprava vadných adres."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13771,10 +14572,10 @@ msgid "Visualizes routing information as a routing graph."
msgstr "Vizualizuje informace o směrování v podobě grafu."
msgid "Simple tool to tag house numbers."
-msgstr ""
+msgstr "Jednoduchý nástroj na označenie čísla domov."
msgid "Generate Imagery XML bounds from a multipolygon"
-msgstr ""
+msgstr "Generovať hranicu XML mapových podkladov z multipolygónu"
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
@@ -13794,9 +14595,12 @@ msgid ""
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
"matches the filename of an image."
msgstr ""
+"Ďalší plugin pre zladenie obrázkov s bodmi v GPS súbore. Zladenie je "
+"urobené, keď ''name(meno)'', ''cmt(komentár)'' or ''desc(poznámky)'' "
+"vlastnosti zo značiek cestných bodov zodpovedajú názvu súboru obrázka."
msgid "Plugin for importing spatial referenced images"
-msgstr ""
+msgstr "Plugin pre import priestorovo odkazovaných obrázkov"
msgid "Import vector graphics (SVG)"
msgstr "Import vektorové grafiky (SVG)"
@@ -13805,9 +14609,11 @@ msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
+"Ďalšie informácie o aktuálnych objektoch vrstvy vo vyskakovacom okne - "
+"aktuálne info o bodoch GPX stopy"
msgid "A helper for IRS satellite adjustment."
-msgstr ""
+msgstr "Pomocník pre IRS nastavenie satelitu."
msgid ""
"Provides Java Topology Suite (JTS) library and related utilities. Not meant "
@@ -13859,9 +14665,6 @@ msgstr "Přidá zákaz odbočení vlevo pro sadu 4 nebo 5 cest"
msgid "Simplifies download from different read-only APIs."
msgstr "Zjednodušuje stahování z různých API určených pouze pro čtení."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Jednoduchá konverze plochy do multipolygonu."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Umožňuje otagovat vlastnosti všech objektů ve vybrané oblasti najednou."
@@ -13927,6 +14730,9 @@ msgstr ""
"Zapíše GPS souřadnice do hlaviček obrázku. Použijte tuto funkci z "
"kontextového menu (pravým kliknutím) obrázkové vrstvy."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13953,9 +14759,6 @@ msgstr "Tento plugin zjednodušuje mapování a úpravy tras veřejné dopravy."
msgid "Relation and multipolygon creating and editing panel."
msgstr "Panel pro vytváření a editace relací a multipolygonů."
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr "Plugin pro vracení sad změn zpět (revert)"
@@ -13964,6 +14767,9 @@ msgid ""
"can be opened by clicking a small icon in the upper right corner of the "
"properties window. Available country presets: Germany."
msgstr ""
+"Plugin pre označenie objektov na základe výberu dopravného značenia. "
+"Dialógové okno je možné otvoriť kliknutím na malú ikonku v pravom hornom "
+"rohu okna Vlastnosti. K dispozícii predvoľby krajiny: Nemecko."
msgid ""
"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13976,7 +14782,7 @@ msgid "Provides routing capabilities."
msgstr "Poskytuje směrování"
msgid "Loads data from SDS"
-msgstr ""
+msgstr "Načíta dáta z SDS"
msgid ""
"Simplify area by removing nodes on very obtuse angles. This can be "
@@ -13986,9 +14792,6 @@ msgstr ""
"omezit maximální odstraněnou velikostí plochy. Průměruje taktéž body "
"umístěné blízko sebe."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Vytváření a editace námořních map pro OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -14002,6 +14805,8 @@ msgid ""
"Launch browser to a Web resource about a selected object having known tags, "
"such as Wikipedia"
msgstr ""
+"Spustí prehliadač webového zdroja vybratého objektu, ak taký obsahuje, ako "
+"je napríklad Wikipedia"
msgid "Provides a dialog for editing tags in a tabular grid."
msgstr "Poskytuje dialog umožňující editovat tagy v tabulce."
@@ -14011,6 +14816,9 @@ msgid ""
"tagging presets (quick preview of the dialog that will popup). You can start "
"the jar-file as standalone as well."
msgstr ""
+"Pridať tagging preset tester do pomocného menu, ktoré pomôže vyvolaniu "
+"tagging presets (rýchly náhľad na dialóg zvoľte vyskakovací). Môžete spustiť "
+"jar-súbor rovnako ako samostatne."
msgid "Make terraced houses out of single blocks."
msgstr "Vytváření řadových domků z jednotlivých bloků."
@@ -14027,6 +14835,11 @@ msgstr ""
"Trasuje budovy případně další polygony z České katastrální mapy (nebo i "
"jinde), je třeba aby běžel TracerServer (.NET nebo Mono)."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin pro digitální podepisování OSM-dat"
@@ -14070,7 +14883,7 @@ msgid "Select a sequence of non-branching connected ways"
msgstr "Vyberte sekvenci nevětvících se spojených cest"
msgid "Simplifys linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "Zjednoduší prepojenie OSM objektov na články na Wikipedii"
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -14079,9 +14892,6 @@ msgstr ""
"Řidte závodní auto z bodu A do bodu B přes letecké snímky, zanechávajíc "
"kaktusy za sebou."
-msgid "Highways"
-msgstr "Silniční síť"
-
msgid "Streets"
msgstr "Uliční a silniční síť"
@@ -14137,7 +14947,7 @@ msgid "compacted"
msgstr "zhutněná"
msgid "grass_paver"
-msgstr ""
+msgstr "zatrávňovacie panely (grass_paver)"
msgid "grass"
msgstr "tráva"
@@ -14166,6 +14976,9 @@ msgstr "Násep"
msgid "Lit"
msgstr "Osvětlení"
+msgid "Toll"
+msgstr "Poplatek"
+
msgid "Motorway Link"
msgstr "Dálnice - nájezd, rampa, kolektor"
@@ -14256,6 +15069,50 @@ msgstr "Místní komunikace (ulice)"
msgid "Edit Residential Street"
msgstr "Upravit místní komunikaci (ulici)"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Typ silnice"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "ano"
+
+msgid "no"
+msgstr "ne"
+
+msgid "destination"
+msgstr "dopravní obsluha"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Obytná zóna"
@@ -14274,11 +15131,11 @@ msgstr "Označit jako plochu"
msgid "Service"
msgstr "Účelová komunikace"
-msgid "Edit Serviceway"
-msgstr "Upravit účelovou komunikaci"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Typ účelové komunikace"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "ulička"
@@ -14289,6 +15146,9 @@ msgstr "příjezdová cesta"
msgid "parking_aisle"
msgstr "Obslužná silnice na parkovišti"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Obslužná silnice na parkovišti"
@@ -14314,10 +15174,7 @@ msgid "roundabout"
msgstr "kruhový objezd"
msgid "jughandle"
-msgstr ""
-
-msgid "yes"
-msgstr "ano"
+msgstr "prípojka"
msgid "Road Restrictions"
msgstr "Silniční omezení"
@@ -14325,21 +15182,15 @@ msgstr "Silniční omezení"
msgid "Edit Road Restrictions"
msgstr "Upravit silniční omezení"
-msgid "Toll"
-msgstr "Poplatek"
-
msgid "No exit (cul-de-sac)"
msgstr "Slepá komunikace"
msgid "Transport mode restrictions"
-msgstr ""
+msgstr "Obmedzenia spôsobu prepravy"
msgid "General Access"
msgstr "Obecný přístup"
-msgid "destination"
-msgstr "dopravní obsluha"
-
msgid "delivery"
msgstr "zásobování"
@@ -14349,17 +15200,17 @@ msgstr "na povolení"
msgid "private"
msgstr "soukromý"
+msgid "customers"
+msgstr "zákazníci"
+
msgid "agricultural"
msgstr "zemědelská vozidla"
msgid "forestry"
-msgstr ""
-
-msgid "no"
-msgstr "ne"
+msgstr "lestníctvo"
msgid "official"
-msgstr ""
+msgstr "oficiálne určené"
msgid "designated"
msgstr "vyhrazený(preferovaný)"
@@ -14392,17 +15243,20 @@ msgid "Vehicles per use"
msgstr "Vozidla podle druhu použití"
msgid "Agricultural"
-msgstr ""
+msgstr "Poľnohospodárske"
msgid "Emergency vehicles"
msgstr "Záchranná vozidla"
msgid "High-occupancy vehicles (hov)"
-msgstr ""
+msgstr "Vozidlá vysoko obsadené (hov)"
msgid "Public Service Vehicles (psv)"
msgstr "Vozidla MHD"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. rychlost (km/h)"
@@ -14422,16 +15276,16 @@ msgid "Max. length (meters)"
msgstr "Max. délka (m)"
msgid "Overtaking"
-msgstr ""
+msgstr "Predbiehanie"
msgid "both"
-msgstr ""
+msgstr "obidva"
msgid "forward"
-msgstr ""
+msgstr "dopredu"
msgid "backward"
-msgstr ""
+msgstr "dozadu"
msgid "Roundabout"
msgstr "Kruhový objezd"
@@ -14487,9 +15341,12 @@ msgstr "Edituj most"
msgid "viaduct"
msgstr "viadukt"
-msgid "swing"
+msgid "suspension"
msgstr ""
+msgid "swing"
+msgstr "otočný"
+
msgid "aqueduct"
msgstr "akvadukt"
@@ -14546,6 +15403,8 @@ msgstr "T1 - turistická cesta"
msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
msgstr ""
+"Chodník dobre vyčistený. Oblasť rovinatá, prípadne mierne svahovitá, žiadne "
+"nebezpečenstvo pádu"
msgid "T2 - mountain hiking trail"
msgstr "T2 - horská turistická cesta"
@@ -14554,6 +15413,8 @@ msgid ""
"Trail with continuous line and balanced ascent. Terrain partially steep, "
"fall hazard possible"
msgstr ""
+"Chodník so súvislou líniu a vyvážené stúpanie. Terén čiastočne strmí, "
+"nebezpečenstvo možného pádu"
msgid "T3 - difficult, exposed hiking trail"
msgstr "T3 - obtížná, nekrytá turistická cesta"
@@ -14563,6 +15424,9 @@ msgid ""
"hands for balance. Partly exposed sites with fall hazard, scree, pathless "
"jagged rocks"
msgstr ""
+"ťažké, exponované lokality môžu byť zaistené lanami, alebo reťazami, možno "
+"treba použiť ruky pre rovnováhu. Čiastočne exponované lokality s rizikom "
+"pádu, sute, neschodné zubaté skaly"
msgid "T4 - difficult, exposed, steep alpine trail"
msgstr "T4 - obtížná, nekrytá, prudká horská cesta"
@@ -14571,6 +15435,8 @@ msgid ""
"sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
"grassy acclivities, jagged rocks, facile snow-free glaciers"
msgstr ""
+"niekedy môže byť treba pomoc rúk na postup dopredu. Terén dosť exponovaný, "
+"neisté trávnaté svahy, rozoklané skaly, ľahký sneh bez ľadovca"
msgid "T5 - difficult alpine trail with climbing"
msgstr "T5 - obtížná horská cesta s lezením"
@@ -14579,6 +15445,8 @@ msgid ""
"single plainly climbing up to second grade. Exposed, demanding terrain, "
"jagged rocks, few dangerous glacier and snow"
msgstr ""
+"lezenie v druhom stupni obtiažnosti. Exponované, náročné terény, zubaté "
+"skaly, málo nebezpečný ľadovec a sneh"
msgid "T6 - hazardous alpine trail with climbing"
msgstr "T6 - nebezpečná horská cesta s lezením"
@@ -14587,24 +15455,35 @@ msgid ""
"climbing up to second grade. Often very exposed, precarious jagged rocks, "
"glacier with danger to slip and fall"
msgstr ""
+"lezenie v druhom stupni obtiažnosti. Často veľmi exponované, neisté "
+"rozoklané skaly, ľadovec s nebezpečenstvom pošmyknutia a pádu"
msgid "Visibility"
msgstr "Viditelnost"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "vynikající"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "dobrá"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "pro středně pokročilé (červená)"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "špatná"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "příšerná"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Vozíky pro invalidy"
@@ -14621,20 +15500,20 @@ msgstr "Stezka pro koně"
msgid "Edit Bridleway"
msgstr "Upravit cestu pro koně"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
msgstr "Cyklostezka"
msgid "lane"
-msgstr ""
+msgstr "prúd"
msgid "track"
-msgstr ""
+msgstr "stopa (dráha)"
msgid "opposite_lane"
msgstr ""
@@ -14652,19 +15531,19 @@ msgid "shared_lane"
msgstr ""
msgid "Cycleway left"
-msgstr ""
+msgstr "Chodník pre cyklistov vľavo"
msgid "Cycleway right"
-msgstr ""
+msgstr "Chodník pre cyklistov vpravo"
msgid "Oneway (bicycle)"
-msgstr ""
+msgstr "Jednosmerná (bicykel)"
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
-msgstr ""
+msgstr "Hlavná cesta"
msgid "Dedicated Cycleway"
msgstr "Cyklostezka"
@@ -14709,7 +15588,7 @@ msgid "Number"
msgstr "Číslo"
msgid "Exit to"
-msgstr ""
+msgstr "Výjazd do"
msgid "Services"
msgstr "Služby motoristům (odpočívadla)"
@@ -14729,12 +15608,18 @@ msgstr "Odpočinková zóna"
msgid "Edit Rest Area"
msgstr "Upravit odpočinkovou zónu"
-msgid "Emergency Phone"
-msgstr "Nouzový telefon"
+msgid "Drinking Water"
+msgstr "Pitná voda"
msgid "Traffic Signal"
msgstr "Semafory"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Typ přechodu pro chodce"
@@ -14745,20 +15630,11 @@ msgid "traffic_signals"
msgstr "světelná signalizace"
msgid "island"
-msgstr "ostrov"
+msgstr "ostrůvek"
msgid "unmarked"
msgstr "neoznačený"
-msgid "Cross on horseback"
-msgstr "Přechod na koni"
-
-msgid "Cross by bicycle"
-msgstr "Přechod na kole"
-
-msgid "Crossing attendant"
-msgstr "Dohled nad přechodem"
-
msgid "Crossing type name (UK)"
msgstr "Typ přechodu (UK)"
@@ -14781,15 +15657,27 @@ msgstr ""
msgid "tiger"
msgstr "tygr"
+msgid "Crossing attendant"
+msgstr "Dohled nad přechodem"
+
+msgid "Cross by bicycle"
+msgstr "Přechod na kole"
+
+msgid "Cross on horseback"
+msgstr "Přechod na koni"
+
msgid "Stop"
msgstr "Stop"
msgid "Give way"
-msgstr ""
+msgstr "Odpočívadlo"
msgid "Mini-roundabout"
msgstr "Malý kruhový objezd"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Směr"
@@ -14799,11 +15687,8 @@ msgstr "po směru hodinových ručiček"
msgid "Pedestrian Crossing"
msgstr "Přechod pro chodce"
-msgid "Edit Crossing"
-msgstr "Upravit přechod"
-
-msgid "Type name (UK)"
-msgstr "Jméno typu (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Zpomalovací retardér"
@@ -14812,32 +15697,29 @@ msgid "Edit Traffic Calming"
msgstr "Upravit zpomalovací retardér"
msgid "bump"
-msgstr ""
+msgstr "boule"
msgid "chicane"
-msgstr ""
+msgstr "šikana"
msgid "choker"
-msgstr ""
+msgstr "zúžení"
msgid "cushion"
-msgstr ""
+msgstr "desky (širší rozchod projede)"
msgid "hump"
-msgstr ""
+msgstr "hrb (2-4m)"
msgid "rumble_strip"
-msgstr ""
+msgstr "varovné pruhy (jen hluk)"
msgid "table"
-msgstr ""
+msgstr "deska (rovná střední část)"
msgid "Passing Place"
msgstr "Výhybna"
-msgid "Edit Passing Place"
-msgstr "Upravit výhybnu"
-
msgid "Turning Circle"
msgstr "Obratiště"
@@ -14871,20 +15753,44 @@ msgstr "Wikipedie"
msgid "Barriers"
msgstr "Bariéry"
+msgid "Block"
+msgstr "Zátarasa"
+
+msgid "Edit Block"
+msgstr "Upraviť balvan"
+
+msgid "Allowed traffic:"
+msgstr "Povolený provoz:"
+
+msgid "Material"
+msgstr "Materiál"
+
+msgid "stone"
+msgstr "kámen"
+
msgid "Bollard"
msgstr "Sloupek"
msgid "Edit Bollard"
msgstr "Upravit sloupek"
-msgid "Allowed traffic:"
-msgstr "Povolený provoz:"
+msgid "Bollard type"
+msgstr "Typ stĺpika"
+
+msgid "rising"
+msgstr "vysúvateľný"
+
+msgid "removable"
+msgstr "odstrániteľný"
+
+msgid "plastic"
+msgstr "plast"
msgid "Cycle Barrier"
msgstr "Zábrana proti kolům"
-msgid "Block"
-msgstr "Zátarasa"
+msgid "Edit Cycle Barrier"
+msgstr "Upraviť cyklo-prekážku"
msgid "Cattle Grid"
msgstr "Mříž proti dobytku"
@@ -14895,6 +15801,9 @@ msgstr "Upravit mříž proti dobytku"
msgid "Bus Trap"
msgstr "Zábrana průjezdná pouze autobusem"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Jednosměrné hroty"
@@ -14916,44 +15825,88 @@ msgstr "Upravit hraniční kontrolu"
msgid "Hedge"
msgstr "Živý plot"
+msgid "Edit Hedge"
+msgstr "Upraviť živý plot"
+
+msgid "Height (meters)"
+msgstr "Výška (metrů)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Plot"
+msgid "Edit Fence"
+msgstr "Upraviť plot"
+
msgid "barbed_wire"
msgstr "ostnatý drát"
-msgid "chain"
-msgstr "řetěz"
+msgid "chain_link"
+msgstr "pletivo"
msgid "electric"
msgstr "elektřina"
-msgid "hedge"
-msgstr "živý plot"
-
msgid "pole"
msgstr "stožár"
msgid "split_rail"
+msgstr "rozchod železnice"
+
+msgid "wire"
msgstr ""
+msgid "Guard Rail"
+msgstr "Zvodidlá"
+
+msgid "Edit Guard Rail"
+msgstr "Upraviť zvodidlá"
+
msgid "Wall"
msgstr "Zeď"
+msgid "Edit Wall"
+msgstr "Upraviť múr"
+
msgid "City Wall"
msgstr "Městské hradby"
+msgid "Edit City Wall"
+msgstr "Upraviť mestské hradby"
+
msgid "Retaining Wall"
msgstr "Opěrná zeď"
+msgid "Edit Retaining Wall"
+msgstr "Upraviť oporný múr"
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Strouha"
+msgstr "Priekopa (ditch)"
-msgid "Entrance"
-msgstr "Vstup"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Upravit vstup"
+msgid "Kerb"
+msgstr "Obrubník"
+
+msgid "Edit Kerb"
+msgstr "Upraviť obrubník"
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Brána"
@@ -14985,12 +15938,27 @@ msgstr "Průchod v ohrazení s ostrou zatáčkou"
msgid "Edit Kissing Gate"
msgstr "Upravit průchod v ohrazení s ostrou zatáčkou"
+msgid "Chain"
+msgstr "Reťaz"
+
+msgid "Edit Chain"
+msgstr "Upraviť reťaz"
+
msgid "Stile"
msgstr "Schůdky přes ohrazení"
msgid "Edit Stile"
msgstr "Upravit schůdky přes ohrazení"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Turniket"
@@ -15004,40 +15972,40 @@ msgid "Edit Sally Port"
msgstr "Upravit výpadovou bránu (v opevnění)"
msgid "Passageways"
-msgstr ""
+msgstr "Chodby(pasáž)"
msgid "Edit Tunnel"
msgstr "Upravit tunel"
msgid "Building Passage"
-msgstr ""
+msgstr "Pasáž pod budovou"
msgid "Edit Building Passage"
-msgstr ""
+msgstr "Upraviť pasáž pod budovou"
msgid "Arcade"
-msgstr ""
+msgstr "Pasáž"
msgid "Edit Arcade"
-msgstr ""
+msgstr "Editovať Pasáž"
msgid "Open on left side"
-msgstr ""
+msgstr "Otvoriť na ľavej strane"
msgid "Open on right side"
-msgstr ""
+msgstr "Otvoriť na pravej strane"
msgid "Colonnade"
-msgstr ""
+msgstr "Kolonáda"
msgid "Edit Colonnade"
-msgstr ""
+msgstr "Upraviť Kolonádu"
msgid "Avalanche Protector"
-msgstr ""
+msgstr "Lavínová ochrana"
msgid "Edit Avalanche Protector"
-msgstr ""
+msgstr "Upraviť lavínovú ochranu"
msgid "Water"
msgstr "Vodstvo"
@@ -15048,6 +16016,9 @@ msgstr "Odvodňovací kanál, meliorace"
msgid "Edit Drain"
msgstr "Upravit odvodňovací kanál, meliorace"
+msgid "Ditch"
+msgstr "Strouha"
+
msgid "Edit Ditch"
msgstr "Upravit strouhu"
@@ -15057,6 +16028,12 @@ msgstr "Potok"
msgid "Edit Stream"
msgstr "Upravit potok"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Plavební kanál"
@@ -15096,14 +16073,11 @@ msgstr "Upravit přehradu"
msgid "Groyne"
msgstr "Vlnolam"
-msgid "Edit Groyne"
-msgstr "Upravit vlnolam"
-
msgid "Breakwater"
-msgstr ""
+msgstr "Vlnolam"
msgid "Edit Breakwater"
-msgstr ""
+msgstr "Upraviť Vlnolam"
msgid "Culvert"
msgstr "Propustek"
@@ -15132,6 +16106,21 @@ msgstr "Upravit zakrytou umělou vodní plochu"
msgid "Edit Water"
msgstr "Upravit vodní plochu"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Země (souš)"
@@ -15213,20 +16202,25 @@ msgstr "Upravit přístaviště přivozu"
msgid "Cargo"
msgstr "Náklad"
+msgctxt "cargo"
msgid "passengers"
-msgstr "pasažéři"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "vozidla"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicykl"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "nákladní vozidla"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "pasažéři;vozidla"
+msgstr ""
msgid "Ferry Route"
msgstr "Přívoz"
@@ -15283,10 +16277,10 @@ msgid "Edit Rail"
msgstr "Upravit železnici"
msgid "main"
-msgstr ""
+msgstr "hlavná"
msgid "branch"
-msgstr ""
+msgstr "vetva"
msgid "industrial"
msgstr "průmysl"
@@ -15297,7 +16291,10 @@ msgstr "vojenský"
msgid "tourism"
msgstr "turistika"
-msgid "Service/Type"
+msgid "freight"
+msgstr "náklad"
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15321,11 +16318,14 @@ msgstr "trolejové vedení"
msgid "rail"
msgstr "železnice"
-msgid "Voltage"
-msgstr "Napětí"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frekvence (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15336,9 +16336,6 @@ msgstr "Úzkorozchodná železnice"
msgid "Edit Narrow Gauge Rail"
msgstr "Upravit úzkorozchodnou železnici"
-msgid "Types"
-msgstr "Typy"
-
msgid "Monorail"
msgstr "Jednokolejnicová dráha"
@@ -15381,18 +16378,56 @@ msgstr "Nepoužívaná železnice"
msgid "Edit Disused Railway"
msgstr "Upravit nepoužívanou železnici"
-msgid "Optional Types"
-msgstr "Volitelné typy"
-
msgid "Abandoned Rail"
msgstr "Snesená železnice (pouze žel. spodek)"
+msgid "Edit Abandoned Railway"
+msgstr "Upraviť opustenú železnicu"
+
msgid "Level Crossing"
msgstr "Železniční přejezd"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr "Hlídané"
+
+msgid "Traffic lights"
+msgstr "Semafor"
+
+msgid "Sound signals"
+msgstr "Zvukový signál"
+
+msgid "Barrier"
+msgstr "Závory"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Železniční přechod pro chodce"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Druh křížení"
@@ -15418,16 +16453,16 @@ msgid "Number of people per hour"
msgstr "Počet osob za hodinu"
msgid "Number of people per chair"
-msgstr ""
+msgstr "Počet ľudí na sedadlo"
msgid "Typical journey time in minutes"
-msgstr ""
+msgstr "Typický čas trasy v minútach"
msgid "Has bubble?"
-msgstr ""
+msgstr "Má kryt?"
msgid "Has heating?"
-msgstr ""
+msgstr "Má vyhrievanie?"
msgid "Drag Lift"
msgstr "Lyžařský vlek"
@@ -15442,7 +16477,7 @@ msgid "Edit Cable Car"
msgstr "Upravit kyvadlovou kabinkovou lanovku"
msgid "Number of people per car"
-msgstr ""
+msgstr "Počet ľudí v kabínke"
msgid "Gondola"
msgstr "Oběžná kabinková lanovka"
@@ -15451,16 +16486,16 @@ msgid "Edit Gondola"
msgstr "Upravit oběžnou kabinkovou lanovku"
msgid "Number of people per gondola"
-msgstr ""
+msgstr "Počet ľudí v gondole"
msgid "Mixed Lift"
-msgstr ""
+msgstr "Zmiešané lanovky"
msgid "Edit Mixed Lift (containing both gondolas and chairs)"
-msgstr ""
+msgstr "Upraviť zmiešané lanovky (obsahujúce kabínové a sedačkové)"
msgid "Number of people per gondola/chair"
-msgstr ""
+msgstr "Počet ľudí na gondolu/kreslo"
msgid "T-bar Lift"
msgstr "Kotva"
@@ -15469,16 +16504,16 @@ msgid "Edit T-bar Lift"
msgstr "Upravit kotvu"
msgid "J-bar Lift"
-msgstr ""
+msgstr "Vlek s jednomiestnou kotvou"
msgid "Edit J-bar Lift"
-msgstr ""
+msgstr "Upraviť vlek s jednomiestnou kotvou"
msgid "Platter Lift"
-msgstr ""
+msgstr "Vlek Poma (disk)"
msgid "Edit Platter Lift"
-msgstr ""
+msgstr "Upraviť vlek Pomu (disk)"
msgid "Rope Tow"
msgstr "Dětský provazový vlek"
@@ -15492,13 +16527,11 @@ msgstr "Pojízdný pás"
msgid "Edit Magic Carpet"
msgstr "Upravit pojízdný pás"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Dopravní lanovka"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Upravit dopravní lanovku"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -15508,13 +16541,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Upravit stanici"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Stožár"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Upravit stožár"
+msgstr ""
msgid "Parking"
msgstr "Parkoviště"
@@ -15531,12 +16562,12 @@ msgstr "povrchové"
msgid "underground"
msgstr "podzemní"
+msgid "rooftop"
+msgstr "zastrešené"
+
msgid "Access"
msgstr "Přístup"
-msgid "customers"
-msgstr "zákazníci"
-
msgid "Park and Ride"
msgstr "Parkoviště P+R"
@@ -15564,9 +16595,6 @@ msgstr "Parkovací místo"
msgid "Edit Parking space"
msgstr "Upravit parkovací místo"
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Kapacita"
@@ -15582,20 +16610,36 @@ msgstr "Časový limit (min)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Hlídané"
-
msgid "Opening Hours"
msgstr "Otevírací doba"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Po-Pá 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Út-Ne od 8:00 do 15:00, So 8:00 - 12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Vjezd na parkoviště"
@@ -15744,6 +16788,9 @@ msgstr "Nabíjecí stanice"
msgid "Edit Charging Station (for electric cars)"
msgstr "Upravit nabíjecí stanici (pro elektromobily)"
+msgid "Voltage"
+msgstr "Napětí"
+
msgid "Amperage"
msgstr "Proud"
@@ -15765,6 +16812,12 @@ msgstr "Opravna"
msgid "Edit Car Repair"
msgstr "Upravit autoopravnu"
+msgid "Parts"
+msgstr "Součástky"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Pneuservis"
@@ -15792,6 +16845,12 @@ msgstr "Půjčovna"
msgid "Edit Car Rental"
msgstr "Upravit půjčovnu aut"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "výhradně"
+
msgid "Sharing"
msgstr "Carsharing (sdílené vlastnictví vozidel)"
@@ -15816,30 +16875,14 @@ msgstr "Služby:"
msgid "Sale"
msgstr "Prodej"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "ano"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "značka"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "použité"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "ne"
-
msgid "brand"
msgstr "značka"
msgid "oldtimer"
-msgstr ""
+msgstr "použité"
msgid "Safety inspection"
-msgstr ""
+msgstr "Revízia bezpečnosti"
msgid "DEKRA"
msgstr "DEKRA"
@@ -15853,9 +16896,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Součástky"
-
msgid "Clothes"
msgstr "Oblečení"
@@ -15893,22 +16933,22 @@ msgid "Edit Bicycle Shop"
msgstr "Upravit prodejnu kol"
msgid "Bicycles are sold"
-msgstr ""
+msgstr "Predaj bicyklov"
msgid "Second-hand bicycles are sold"
-msgstr ""
+msgstr "Predaj second-hand bicyklov"
msgid "Bicycles are repaired"
-msgstr ""
+msgstr "Oprava bicyklov"
msgid "Bicycles are rented"
-msgstr ""
+msgstr "Požičovňa bicyklov"
msgid "Free bicycle pump"
-msgstr ""
+msgstr "Verejná pumpa pre bicykle"
msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
-msgstr ""
+msgstr "Nástroje pre svojpomocnú opravu (môže byť bike co-operative)"
msgid "Bicycles are washed (for a fee)"
msgstr "Umývání jízdních kol (za poplatek)"
@@ -15919,8 +16959,8 @@ msgstr "Upravit půjčovnu kol"
msgid "Public Transport"
msgstr "Hromadná doprava"
-msgid "Route"
-msgstr "Trasa"
+msgid "Public transport route"
+msgstr "Trasa hromadnej dopravy"
msgid "Edit Route"
msgstr "Upravit trasu"
@@ -15959,7 +16999,7 @@ msgid "To (terminal stop)"
msgstr "Do (koncová zastávka)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Cez (zastávka)"
msgid "Network"
msgstr "Síť"
@@ -15969,11 +17009,11 @@ msgstr "Barva (HTML název nebo hexadecimální kód)"
msgctxt "color"
msgid "black"
-msgstr ""
+msgstr "čierna"
msgctxt "color"
msgid "brown"
-msgstr ""
+msgstr "hnedá"
msgctxt "color"
msgid "green"
@@ -15981,23 +17021,23 @@ msgstr "zelená"
msgctxt "color"
msgid "red"
-msgstr ""
+msgstr "červená"
msgctxt "color"
msgid "blue"
-msgstr ""
+msgstr "modrá"
msgctxt "color"
msgid "gray"
-msgstr ""
+msgstr "šedá"
msgctxt "color"
msgid "white"
-msgstr ""
+msgstr "biela"
msgctxt "color"
msgid "#CD853F"
-msgstr ""
+msgstr "#CD853F"
msgid "route segment"
msgstr "segment trasy"
@@ -16050,6 +17090,9 @@ msgstr "Nástupiště"
msgid "Station or amenities"
msgstr "Zastávky nebo veřejná zařízení"
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Autobus"
@@ -16072,7 +17115,7 @@ msgid "Trolleybus"
msgstr "Trolejbus"
msgid "Share taxi"
-msgstr ""
+msgstr "Zdieľané taxi"
msgid "Funicular"
msgstr "Pozemní lanovka"
@@ -16080,6 +17123,9 @@ msgstr "Pozemní lanovka"
msgid "Ferry"
msgstr "Trajekt/přívoz"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Lavička"
@@ -16092,9 +17138,6 @@ msgstr "Invalidní vozík"
msgid "limited"
msgstr "omezené"
-msgid "only"
-msgstr "výhradně"
-
msgid "Highway platform (legacy)"
msgstr "Silniční nástupiště (původní)"
@@ -16104,8 +17147,13 @@ msgstr "Železniční nástupiště (původní)"
msgid "funicular"
msgstr "pozemní lanovka"
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Vlaková stanice"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Upravit stanici"
msgid "Building"
msgstr "Budova"
@@ -16119,6 +17167,9 @@ msgstr "Upravit vchod do metra"
msgid "Ticket Machine"
msgstr "Automat na jízdenky"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Referenční číslo"
@@ -16143,14 +17194,6 @@ msgstr "Zůstatkové nebo věrnostní karty"
msgid "Public Transport (legacy)"
msgstr "Hromadná doprava (původní)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Vlaková stanice"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Upravit stanici"
-
msgid "UIC-Reference"
msgstr "UIC-Reference"
@@ -16199,17 +17242,17 @@ msgstr "Upravit nástupiště autobusu"
msgid "Taxi"
msgstr "Stanoviště taxi"
-msgid "Edit Taxi station"
-msgstr "Upravit stanoviště taxi"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Letiště"
msgid "Airport Ground"
-msgstr ""
+msgstr "Letisko, pozemné"
msgid "Edit Airport Ground"
-msgstr ""
+msgstr "Upraviť pozemné letisko"
msgid "IATA"
msgstr "IATA"
@@ -16253,15 +17296,30 @@ msgstr "Terminál"
msgid "Edit Terminal"
msgstr "Upravit terminál"
+msgid "Internet access"
+msgstr "Přístup k Internetu"
+
+msgid "wlan"
+msgstr "wifi"
+
+msgid "wired"
+msgstr "káblový"
+
+msgid "terminal"
+msgstr "terminál"
+
+msgid "Internet access fee"
+msgstr "poplatek za přístup k Internetu"
+
msgctxt "airport"
msgid "Gate"
msgstr "Brána"
msgid "Edit Terminal Gate"
-msgstr ""
+msgstr "Upraviť terminál"
msgid "Facilities"
-msgstr ""
+msgstr "Občianska vybavenosť"
msgid "Accommodation"
msgstr "Ubytování"
@@ -16275,21 +17333,6 @@ msgstr "Upravit hotel"
msgid "Stars"
msgstr "Počet hvězdiček"
-msgid "Internet access"
-msgstr "Přístup k Internetu"
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminál"
-
-msgid "Internet access fee"
-msgstr "poplatek za přístup k Internetu"
-
msgid "Smoking"
msgstr "Kuřáci"
@@ -16420,7 +17463,7 @@ msgid "sushi"
msgstr "suši"
msgid "Microbrewery"
-msgstr ""
+msgstr "Minipivovar"
msgid "Fast Food"
msgstr "Rychlé občersvení"
@@ -16429,7 +17472,7 @@ msgid "Edit Fast Food Restaurant"
msgstr "Upravit rychlé občerstvení"
msgid "fish_and_chips"
-msgstr ""
+msgstr "Ryba a hranolky (UK)"
msgid "chicken"
msgstr "kuřata"
@@ -16473,6 +17516,12 @@ msgstr "Noční klub"
msgid "Edit Nightclub"
msgstr "Upravit noční klub"
+msgid "Stripclub"
+msgstr "Striptízový klub"
+
+msgid "Edit Stripclub"
+msgstr "Upraviť striptízový klub"
+
msgid "Tourism"
msgstr "Turistika"
@@ -16494,9 +17543,15 @@ msgstr "Vyhlídková věž"
msgid "Information Office"
msgstr "Turistické informační centrum"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Přehledová mapa"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Úroveň detailů"
@@ -16509,6 +17564,9 @@ msgstr "ulice"
msgid "scheme"
msgstr "orientační"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Zobrazený areál"
@@ -16548,6 +17606,9 @@ msgstr "... možný i jiný druh přepravy"
msgid "Information Board"
msgstr "Informační nástěnka"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Obsah tabule"
@@ -16569,23 +17630,35 @@ msgstr "rostliny"
msgid "Guidepost"
msgstr "Rozcestník"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Informační terminál"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Bližší popis"
msgid "Audioguide"
msgstr "Audioprůvodce"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Audioprůvodce přes mobilní telefon?"
msgid "Phone number"
msgstr "Telefonní číslo"
-msgid "Other Information Points"
-msgstr "Jiný informační bod"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Volný čas"
@@ -16603,13 +17676,10 @@ msgid "Edit Zoo"
msgstr "Upravit zoo"
msgid "Dog Park"
-msgstr ""
+msgstr "Cvičisko pre psov"
msgid "Edit Dog Park"
-msgstr ""
-
-msgid "Barrier"
-msgstr "Ohrada"
+msgstr "Upraviť cvičisko pre psov"
msgid "fence"
msgstr "plot"
@@ -16635,8 +17705,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Upravit saunu"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Út-Ne 08:00-15:00; So 08:00-12:00"
+msgid "Horse riding"
+msgstr "Jazda na koni"
+
+msgid "Edit Horse riding"
+msgstr "Upraviť jazdu na koni"
+
+msgid "Brothel"
+msgstr "Nevestinec"
+
+msgid "Edit Brothel"
+msgstr "Upraviť nevestinec"
msgid "Playground"
msgstr "Hřiště"
@@ -16708,50 +17787,44 @@ msgstr "Umělecké dílo"
msgid "Edit Artwork"
msgstr "Upravit umělecké dílo"
-msgid "Place of Worship"
-msgstr "Chrám (kostel, synagoga, mešita)"
-
-msgid "Edit Place of Worship"
-msgstr "Upravit chrám"
-
-msgid "Religion"
-msgstr "Náboženství"
+msgid "Recording Studio"
+msgstr "Nahrávací studio"
-msgid "bahai"
-msgstr "bahá’í"
+msgid "Edit Studio"
+msgstr "Upravit nahrávací studio"
-msgid "buddhist"
-msgstr "budhistické"
+msgid "audio"
+msgstr "audio"
-msgid "christian"
-msgstr "křesťanské"
+msgid "video"
+msgstr "video"
-msgid "hindu"
-msgstr "hindské"
+msgid "Place of Worship"
+msgstr "Chrám (kostel, synagoga, mešita)"
-msgid "jain"
-msgstr "džinistické"
+msgid "Church"
+msgstr "Kostel"
-msgid "jewish"
-msgstr "židovské"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muslimské"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualistické"
+msgid "cathedral"
+msgstr "katedrála"
-msgid "taoist"
-msgstr "taoistické"
+msgid "chapel"
+msgstr "kaple"
-msgid "unitarian"
-msgstr "Unitářské"
+msgid "church"
+msgstr "kostel"
-msgid "zoroastrian"
-msgstr "zoroastristické"
+msgid "temple"
+msgstr "chrám"
msgid "Denomination"
msgstr "Vyznání"
@@ -16768,6 +17841,12 @@ msgstr "katolické"
msgid "evangelical"
msgstr "evangelické"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "svědkové Jehovovi"
@@ -16780,6 +17859,9 @@ msgstr "metodistické"
msgid "mormon"
msgstr "mormonské"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "pravoslavné"
@@ -16795,38 +17877,141 @@ msgstr "protestantské"
msgid "quaker"
msgstr "kvakerské"
+msgid "roman_catholic"
+msgstr "římskokatolické"
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "Časy bohoslužeb"
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr "mešita"
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "ší’itské"
msgid "sunni"
msgstr "sunnitské"
-msgid "Service Times"
-msgstr "Časy bohoslužeb"
+msgid "Synagogue"
+msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
+msgstr "synagoga"
+
+msgid "conservative"
msgstr ""
-msgid "Su 11:00"
+msgid "reform"
msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Otevírací doba pro návštěvníky"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Nahrávací studio"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Upravit nahrávací studio"
+msgid "theravada"
+msgstr ""
-msgid "audio"
-msgstr "audio"
+msgid "mahayana"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Náboženství"
+
+msgid "bahai"
+msgstr "bahá’í"
+
+msgid "jain"
+msgstr "džinistické"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualistické"
+
+msgid "taoist"
+msgstr "taoistické"
+
+msgid "unitarian"
+msgstr "unitářské"
+
+msgid "zoroastrian"
+msgstr "zoroastristické"
msgid "Public Building"
msgstr "Veřejná budova"
@@ -16915,6 +18100,12 @@ msgstr "Upravit autoškolu"
msgid "License Classes"
msgstr "Typy oprávnění"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Zdraví"
@@ -16924,6 +18115,12 @@ msgstr "Nemocnice"
msgid "Edit Hospital"
msgstr "Upravit nemocnici"
+msgid "Clinic"
+msgstr "Klinika"
+
+msgid "Edit Clinic"
+msgstr "Upraviť kliniku"
+
msgid "Doctors"
msgstr "Zdravotní středisko, poliklinika"
@@ -16937,16 +18134,16 @@ msgid "Edit Dentist"
msgstr "Upravit zubařskou ordinaci"
msgid "Nursing Home"
-msgstr ""
+msgstr "Sanatórium"
msgid "Edit Nursing Home"
-msgstr ""
+msgstr "Upraviť Sanatórium"
msgid "Retirement Home"
-msgstr ""
+msgstr "Domov dôchodcov"
msgid "Edit Retirement Home"
-msgstr ""
+msgstr "Upraviť Domov dôchodcov"
msgid "Pharmacy"
msgstr "Lékárna"
@@ -16990,21 +18187,99 @@ msgstr "Veterinář"
msgid "Edit Veterinary"
msgstr "Upravit veterinární ordinaci"
-msgid "Note"
-msgstr "Poznámka"
+msgid "Edit Toilets"
+msgstr ""
-msgid "Post Box"
-msgstr "Poštovní schránka"
+msgid "Access rights"
+msgstr ""
-msgid "Telephone"
-msgstr "Telefon"
+msgid "public"
+msgstr "veřejný"
-msgid "Edit Telephone"
-msgstr "Upravit telefon"
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
+
+msgid "Post Box"
+msgstr "Poštovní schránka"
+
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
+msgid "Telephone"
+msgstr "Telefon"
+
+msgid "Edit Telephone"
+msgstr "Upravit telefon"
msgid "Telephone cards"
msgstr "Telefonní karty"
+msgid "Emergency Phone"
+msgstr "Nouzový telefon"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Hodiny"
@@ -17014,42 +18289,48 @@ msgstr "Upravit hodiny"
msgid "Display"
msgstr "Typ"
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr "Umístění"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "nástěnné"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
msgid "Visibility/readability"
msgstr "Viditelnost/čitelnost"
msgid "house (up to 5m)"
-msgstr ""
+msgstr "dom (viac ako 5 m)"
msgid "street (up to 20m)"
-msgstr ""
+msgstr "ulica (viac ako 20 m)"
msgid "area (more than 20m)"
-msgstr ""
+msgstr "oblasť (viac ako 20 m)"
msgid "Shows current date"
msgstr "Zobrazeno datum"
@@ -17066,8 +18347,8 @@ msgstr "Zobrazena vlkhost vzduchu"
msgid "Recycling"
msgstr "Recyklační stanoviště"
-msgid "Edit Recycling station"
-msgstr "Upravit recyklační stanoviště"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Baterie"
@@ -17085,35 +18366,23 @@ msgid "Scrap Metal"
msgstr "Kovový šrot"
msgid "container"
-msgstr ""
+msgstr "kontajner"
msgid "centre"
-msgstr ""
+msgstr "stredisko"
msgid "Waste Basket"
msgstr "Odpadkový koš"
-msgid "Edit Waste Basket"
-msgstr "Upravit odpadkový koš"
-
msgid "Waste Disposal"
-msgstr ""
+msgstr "Odpadkový kôš"
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Opěrka zad"
-msgid "Material"
-msgstr "Materiál"
-
-msgid "stone"
-msgstr "kámen"
-
-msgid "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Počet sedadel"
@@ -17148,14 +18417,17 @@ msgstr "Upravit posed"
msgid "Height"
msgstr "Výška"
+msgctxt "height"
msgid "low"
-msgstr "nízká"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "střední"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "plná"
+msgstr ""
msgid "Hide"
msgstr "Úkryt"
@@ -17163,11 +18435,11 @@ msgstr "Úkryt"
msgid "Lock"
msgstr "Uzamknutelný"
-msgid "Drinking Water"
-msgstr "Pitná voda"
+msgid "Edit Source of Potable Water"
+msgstr "Upraviť zdroj pitnej vody"
-msgid "Edit Drinking Water"
-msgstr "Upravit pitnou vodu"
+msgid "Indoor"
+msgstr "V budove"
msgid "Fire Hydrant"
msgstr "Požární hydrant"
@@ -17192,26 +18464,29 @@ msgid "pond"
msgstr "rybník"
msgid "Diameter (in mm)"
+msgstr "Priemer (v mm)"
+
+msgid "Hydrant Position"
msgstr ""
msgctxt "hydrant position"
msgid "lane"
-msgstr ""
+msgstr "ochranné okolie"
msgctxt "hydrant position"
msgid "parking_lot"
-msgstr ""
+msgstr "parkovisko"
msgctxt "hydrant position"
msgid "sidewalk"
-msgstr ""
+msgstr "chodník"
msgctxt "hydrant position"
msgid "green"
-msgstr ""
+msgstr "zeleň"
msgid "Pressure (in bar)"
-msgstr ""
+msgstr "Tlak (v baroch)"
msgid "suction"
msgstr "sání"
@@ -17231,119 +18506,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Upravit stadion"
-msgid "select sport:"
-msgstr "vyberte sport:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "kombinovaný"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "lukostřelba"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletika"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "americký fotbal"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "australský fotbal"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basketbal"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "Hry s koulemi (např. pétanque)"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "bowls"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "kanadský fotbal"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kanoistika"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "Horolezení"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "kriket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "ohražené místo pro tréning kriketu"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "kroket"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "cyklistika"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "závody psů"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "krasojízda"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gymnastika"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hokej"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "dostihy"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motoristické sporty"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota (míčová hra)"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "pálkové (raketové) sporty"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "ragby liga"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "ragby svaz"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "střelba"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "bruslení"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "lyžování"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "fotbal"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "plavání"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "stolní tenis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenis"
+msgstr ""
msgid "Sports Centre"
msgstr "Sportovní centrum"
@@ -17375,26 +18686,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Upravit minigolf"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Kombinováné"
msgid "Edit Multi"
msgstr "Upravit kombinované"
-msgid "type"
-msgstr "typ"
-
+msgctxt "running"
msgid "pitch"
-msgstr "hřiště"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sportovní centrum"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -17402,6 +18714,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "hřiště"
+
+msgid "sports_centre"
+msgstr "sportovní centrum"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "Bowling"
@@ -17435,6 +18756,22 @@ msgstr "Upravit kanoistiku"
msgid "Edit Cycling"
msgstr "Upravit cyklistiku"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Závody psů"
@@ -17447,8 +18784,33 @@ msgstr "Krasojízda"
msgid "Edit Equestrian"
msgstr "Upravit krasojízdu"
-msgid "horse_riding"
-msgstr ""
+msgctxt "riding"
+msgid "pitch"
+msgstr "dráha"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "Konské športovisko"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "štadión"
+
+msgctxt "riding"
+msgid "track"
+msgstr "dráha"
+
+msgid "clay"
+msgstr "hlina"
+
+msgid "dirt"
+msgstr "blato"
+
+msgid "fine_gravel"
+msgstr "jemný štrk"
+
+msgid "mud"
+msgstr "bahno"
msgid "Horse Racing"
msgstr "Dostihy"
@@ -17466,10 +18828,10 @@ msgid "Skating"
msgstr "Bruslení"
msgid "Edit Skating"
-msgstr "Upravit bruslení"
+msgstr ""
msgid "ice_rink"
-msgstr ""
+msgstr "zimný štadión"
msgid "Skateboard"
msgstr "Skateboard"
@@ -17484,10 +18846,10 @@ msgid "Edit Swimming"
msgstr "Upravit plavání"
msgid "swimming_pool"
-msgstr ""
+msgstr "kúpalisko"
msgid "water_park"
-msgstr ""
+msgstr "aquapark"
msgid "Edit Skiing"
msgstr "Upravit lyžování"
@@ -17510,36 +18872,54 @@ msgstr "snow park"
msgid "Difficulty"
msgstr "Obtížnost"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "pro začátečníky (zelená)"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "jednoduchá (modrá)"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "pro zkušené (černá)"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "pro experty (oranžová)"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "volný terén - freeride (žlutá)"
+msgstr ""
msgid "Grooming"
-msgstr ""
+msgstr "Bez dozoru"
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17582,19 +18962,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17722,10 +19098,10 @@ msgid "Edit Motocross"
msgstr "Upravit motokros"
msgid "Safety Training"
-msgstr ""
+msgstr "Bezpečnostný výcvik"
msgid "Edit Safety Training"
-msgstr ""
+msgstr "Upraviť bezpečnostný výcvik"
msgid "Model Aerodrome"
msgstr "Modelářské letiště"
@@ -17733,6 +19109,18 @@ msgstr "Modelářské letiště"
msgid "Edit Model Aerodrome"
msgstr "Upravit modelářské letiště"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "RC auta"
@@ -17745,38 +19133,73 @@ msgstr "Inženýrské objekty"
msgid "Edit Building"
msgstr "Upravit budovu"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "garáž"
+msgstr ""
-msgid "church"
-msgstr "kostel"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "škola"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "hangár"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "kanceláře"
+msgstr ""
+msgctxt "building"
msgid "farm"
-msgstr "farma/stodola"
+msgstr ""
+msgctxt "building"
msgid "transportation"
-msgstr "doprava"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "skleník/fóliák"
+msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "vysoká škola"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr "Obytná budova"
@@ -17784,26 +19207,65 @@ msgstr "Obytná budova"
msgid "Edit Residential Building"
msgstr "Upravit obytnou budovu"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "dům"
+msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
-msgid "Tower"
-msgstr "Věž"
+msgid "Entrance"
+msgstr "Vstup"
-msgid "Edit Tower"
-msgstr "Upravit věž"
+msgid "Edit Entrance"
+msgstr "Upravit vstup"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
+msgid "Tower"
+msgstr "Věž"
+
+msgid "Edit Tower"
+msgstr "Upravit věž"
msgid "Tower type"
msgstr "Typ věže"
@@ -17814,9 +19276,6 @@ msgstr "telekomunikační"
msgid "observation"
msgstr "pozorovací"
-msgid "Height (meters)"
-msgstr "Výška (metrů)"
-
msgid "Flagpole"
msgstr "Vlajkový stožár"
@@ -17916,7 +19375,7 @@ msgid "copper"
msgstr "měď"
msgid "dimension_stone"
-msgstr ""
+msgstr "dekoračné kamene"
msgid "gold"
msgstr "zlato"
@@ -18024,43 +19483,69 @@ msgid "Operation times"
msgstr "Doba provozu"
msgid "Mo-Fr 22:00-05:00"
+msgstr "Po-Pi 22:00-05:00"
+
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement Station"
-msgstr "Měřící stanice"
+msgid "Monitoring:"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Upravit měřící stanici"
+msgid "Weather"
+msgstr ""
-msgid "Measurement"
-msgstr "Měření"
+msgid "Water level"
+msgstr ""
-msgid "particulate_matter"
+msgid "Tide Level"
msgstr ""
-msgid "seismic"
-msgstr "seizmické"
+msgid "Traffic"
+msgstr ""
-msgid "water_level"
-msgstr "úroveň vody"
+msgid "Air Quality"
+msgstr ""
-msgid "weather"
-msgstr "počasí"
+msgid "Noise"
+msgstr ""
-msgid "Recording"
-msgstr "Záznam"
+msgid "GPS Signals"
+msgstr ""
-msgid "manually"
-msgstr "ruční"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "automated"
-msgstr "automatický"
+msgid "Galileo Signals"
+msgstr ""
-msgid "remote"
-msgstr "vzdálený"
+msgid "Radiation"
+msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -18069,8 +19554,8 @@ msgstr "Triangulační bod"
msgid "Edit Survey Point"
msgstr "Upravit triangulační bod"
-msgid "Surveillance"
-msgstr "Sledovací kamera"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Upravit sledovací kameru"
@@ -18081,12 +19566,102 @@ msgstr "vnitřní"
msgid "outdoor"
msgstr "venkovní"
-msgid "public"
-msgstr "veřejný"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "obchod"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "Energie"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr "Výstupné formy energie"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "elektrina"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "horúca voda"
+
+msgid "hot air"
+msgstr "horúci vzduch"
+
+msgid "cold water"
+msgstr "studená voda"
+
+msgid "cold air"
+msgstr "studený vzduch"
+
+msgid "compressed air"
+msgstr "stlačený vzduch"
+
+msgid "steam"
+msgstr "para"
+
+msgid "vacuum"
+msgstr "vysávač"
+
msgid "Power Generator"
msgstr "Elektrárna"
@@ -18094,19 +19669,19 @@ msgid "Edit Power Generator"
msgstr "Upravit elektrárnu"
msgid "biofuel"
-msgstr ""
+msgstr "biopalivo"
msgid "biogas"
-msgstr ""
+msgstr "bioplyn"
msgid "biomass"
-msgstr ""
+msgstr "biomasa"
msgid "diesel"
-msgstr ""
+msgstr "nafta"
msgid "gasoline"
-msgstr ""
+msgstr "benzín"
msgid "geothermal"
msgstr "geotermální"
@@ -18118,16 +19693,16 @@ msgid "nuclear"
msgstr "jaderná"
msgid "osmotic"
-msgstr ""
+msgstr "osmotický"
msgid "solar"
msgstr "sluneční"
msgid "tidal"
-msgstr ""
+msgstr "prílivová"
msgid "waste"
-msgstr ""
+msgstr "odpad"
msgid "wave"
msgstr "příbojová"
@@ -18136,91 +19711,194 @@ msgid "wind"
msgstr "větrná"
msgid "Method"
-msgstr ""
+msgstr "Metóda (spôsob výroby)"
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "spalování"
+msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "fotovoltaická"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "tepelná"
+msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
-msgstr "Rozvodna"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Upravit rozvodnu"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Trafostanice"
@@ -18231,6 +19909,21 @@ msgstr "Upravit trafostanici"
msgid "Line reference"
msgstr "Číslo vedení"
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "nízká"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "Rozvodná skříň"
@@ -18244,6 +19937,9 @@ msgid "Edit Power Tower"
msgstr "Upravit stožár elektrického vedení"
msgid "Tower reference"
+msgstr "Označenie veže"
+
+msgid "steel"
msgstr ""
msgid "Pole"
@@ -18253,7 +19949,7 @@ msgid "Edit Power Pole"
msgstr "Upravit sloup"
msgid "Pole reference"
-msgstr ""
+msgstr "Označenie stĺpa"
msgid "Power Line"
msgstr "Dráty elektrického vedení"
@@ -18264,13 +19960,11 @@ msgstr "Upravit dráty elektrického vedení"
msgid "Line type"
msgstr "Typ vedení"
-msgctxt "Power Line"
msgid "line"
-msgstr "vedení"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "vedlejší vedení"
+msgstr ""
msgid "Amount of Cables"
msgstr "Počet kabelů"
@@ -18377,11 +20071,11 @@ msgstr "Kiosek"
msgid "Edit Kiosk"
msgstr "Upravit kiosek"
-msgid "Baker"
-msgstr "Pekařství"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Upravit pekařství"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Řeznictví"
@@ -18392,8 +20086,8 @@ msgstr "Upravit řeznictví"
msgid "Seafood"
msgstr "Mořské plody"
-msgid "Edit Seafood"
-msgstr "Upravit obchod s mořskými plody"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Delikatesy"
@@ -18413,20 +20107,26 @@ msgstr "Tržiště"
msgid "Edit Marketplace"
msgstr "Upravit tržiště"
+msgid "Organic"
+msgstr "Obchod se zdravou výživou"
+
msgid "Greengrocer"
msgstr "Zelinářství"
msgid "Edit Greengrocer"
msgstr "Upravit zelinářství"
-msgid "Organic"
-msgstr "Obchod se zdravou výživou"
+msgid "Farm Stand"
+msgstr "Stánok farmy"
+
+msgid "Edit Farm Stand"
+msgstr "Upraviť stánok farmy"
msgid "Edit Organic/Bio"
-msgstr ""
+msgstr "Upraviť bio produkty"
msgid "Organic/Bio"
-msgstr ""
+msgstr "Bio produkty"
msgid "Fair Trade"
msgstr "Fair Trade"
@@ -18491,8 +20191,8 @@ msgstr "Upravit krejčího"
msgid "Fabric"
msgstr "Látka"
-msgid "Edit Fabric"
-msgstr "Upravit látky"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronika"
@@ -18512,14 +20212,14 @@ msgstr "Upravit obchod s elektronikou"
msgid "Mobile Phone"
msgstr "Mobilní telefony"
-msgid "Edit Mobile Phone"
-msgstr "Upravit mobilní telefony"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Vysavače"
-msgid "Edit Vacuum Cleaner"
-msgstr "Upravit vysavače"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hifi"
@@ -18527,9 +20227,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Upravit obchod s hifi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Videopůjčovna/prodejna"
msgid "Edit Video Shop"
msgstr "Upravit videopůjčovnu/prodejnu"
@@ -18555,6 +20254,12 @@ msgstr "Upravit směnárnu"
msgid "Edit Automated Teller Machine"
msgstr "Upravit bankomat"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Obchodní dům"
@@ -18591,14 +20296,35 @@ msgstr "Zlatnictví"
msgid "Edit Jewelry"
msgstr "Upravit zlatnictví"
-msgid "Erotic"
-msgstr "Sexshop"
+msgid "Gift"
+msgstr ""
-msgid "Edit Erotic"
-msgstr "Upravit sexshop"
+msgid "Edit Gift Shop"
+msgstr ""
-msgid "Florist"
-msgstr "Květinářství"
+msgid "buddhist"
+msgstr "budhistické"
+
+msgid "christian"
+msgstr "křesťanské"
+
+msgid "hindu"
+msgstr "hindské"
+
+msgid "jewish"
+msgstr "židovské"
+
+msgid "muslim"
+msgstr "muslimské"
+
+msgid "Erotic"
+msgstr "Sexshop"
+
+msgid "Edit Erotic Shop"
+msgstr ""
+
+msgid "Florist"
+msgstr "Květinářství"
msgid "Edit Florist"
msgstr "Upravit květinářství"
@@ -18624,8 +20350,8 @@ msgstr "Upravit železářství"
msgid "Paint"
msgstr "Malířské potřeby"
-msgid "Edit Paint"
-msgstr "Upravit obchod s malířskými potřebami"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Nábytek"
@@ -18636,19 +20362,19 @@ msgstr "Upravit obchod s nábytkem"
msgid "Kitchen"
msgstr "Kuchyně"
-msgid "Edit Kitchen"
-msgstr "Upravit Kuchyni"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Obchod se závěsy"
-msgid "Edit Curtain"
-msgstr "Upravit obchod se závěsy"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -18669,6 +20395,12 @@ msgstr "Knihkupectví"
msgid "Edit Book Store"
msgstr "Upravit knihkupectví"
+msgid "Newsagent''s shop"
+msgstr "Novinový stánok"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Upraviť novinový stánok"
+
msgid "Travel Agency"
msgstr "Cestovní kancelář"
@@ -18678,8 +20410,8 @@ msgstr "Upravit cestovní kancelář"
msgid "Musical Instrument"
msgstr "Hudební nástroje"
-msgid "Edit Musical Instruments"
-msgstr "Upravit obchod s hudebními nástroji"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Hračky"
@@ -18688,10 +20420,10 @@ msgid "Edit Toy Shop"
msgstr "Upravit obchod s hračkami"
msgid "Variety Store"
-msgstr ""
+msgstr "Zmiešaný tovar"
msgid "Edit Variety Store"
-msgstr ""
+msgstr "Upraviť Zmiešaný tovar"
msgid "Vending machine"
msgstr "Prodejní automat"
@@ -18706,7 +20438,7 @@ msgid "animal_food"
msgstr "krmivo pro zvířata"
msgid "bicycle_tube"
-msgstr ""
+msgstr "duše na bicykle"
msgid "cigarettes"
msgstr "cigarety"
@@ -18759,6 +20491,9 @@ msgstr "hračky"
msgid "vouchers"
msgstr "poukazy"
+msgid "Note"
+msgstr "Poznámka"
+
msgid "Geography"
msgstr "Geografie"
@@ -18778,7 +20513,7 @@ msgid "Edit Administrative Boundary"
msgstr "Upravit administrativní hranici"
msgid "Civil"
-msgstr ""
+msgstr "Občianske"
msgid "Edit Civil Boundary"
msgstr "Upravit civilní hranici"
@@ -18829,7 +20564,7 @@ msgid "Edit County"
msgstr "Upravit okres"
msgid "Population"
-msgstr ""
+msgstr "Počet obyvateľov"
msgid "Post code"
msgstr "Poštovní směrovací číslo"
@@ -18865,16 +20600,16 @@ msgid "Edit Hamlet"
msgstr "Upravit samotu"
msgid "Isolated Dwelling"
-msgstr ""
+msgstr "Izolované obydlie"
msgid "Edit Isolated Dwelling"
-msgstr ""
+msgstr "Upraviť izolované obydlie"
msgid "Neighbourhood"
-msgstr ""
+msgstr "Okolie"
msgid "Edit Neighbourhood"
-msgstr ""
+msgstr "Upraviť okolie"
msgid "Locality"
msgstr "Místní název"
@@ -18888,6 +20623,12 @@ msgstr "Vrchol"
msgid "Edit Peak"
msgstr "Upravit vrchol"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Ledovec"
@@ -18927,26 +20668,35 @@ msgstr "Strom"
msgid "Edit Tree"
msgstr "Upravit strom"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botanické jméno"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Prales"
msgid "Edit Wood"
msgstr "Upravit prales"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "jehličnatý"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "listnatý"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "smíšený"
msgid "Forest"
msgstr "Les"
@@ -18954,38 +20704,29 @@ msgstr "Les"
msgid "Edit Forest Landuse"
msgstr "Upravit lesní plochu"
-msgid "coniferous"
-msgstr "jehličnatý"
-
-msgid "deciduous"
-msgstr "listnatý"
-
-msgid "mixed"
-msgstr "smíšený"
-
msgid "Grassland"
-msgstr ""
+msgstr "Lúka"
msgid "Edit Grassland"
-msgstr ""
+msgstr "Upraviť lúka"
msgid "pampas"
-msgstr ""
+msgstr "pampa"
msgid "prairie"
-msgstr ""
+msgstr "préria"
msgid "puszta"
-msgstr ""
+msgstr "pusta"
msgid "savanna"
-msgstr ""
+msgstr "savana"
msgid "steppe"
-msgstr ""
+msgstr "step"
msgid "veld"
-msgstr ""
+msgstr "veld"
msgid "Nature Reserve"
msgstr "Přírodní rezervace"
@@ -19038,6 +20779,12 @@ msgstr "Louka"
msgid "Edit Meadow Landuse"
msgstr "Upravit louku"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinice"
@@ -19092,8 +20839,8 @@ msgstr "Rekreační plocha"
msgid "Edit Recreation Ground Landuse"
msgstr "Upravit rekreační plochu"
-msgid "Residential area"
-msgstr "Obytná plocha"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Upravit obytnou plochu"
@@ -19104,6 +20851,9 @@ msgstr "Malý hřbitov"
msgid "Edit Graveyard"
msgstr "Upravit malý hřbitov"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Hřbitov"
@@ -19179,6 +20929,33 @@ msgstr "Upravit lom"
msgid "Annotation"
msgstr "Anotace"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Upravit informace o adrese"
@@ -19197,30 +20974,6 @@ msgstr "Jméno města"
msgid "Country code"
msgstr "Kód země"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolace adres"
@@ -19239,9 +20992,21 @@ msgstr "sudé"
msgid "alphabetic"
msgstr "abecední"
-msgid "Contact (common schema)"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
msgstr ""
+msgid "Contact (common schema)"
+msgstr "Kontakt (spoločné schéma)"
+
msgid "Edit Contact information"
msgstr "Upravit kontaktní informace"
@@ -19252,7 +21017,7 @@ msgid "Contact (schema with ''contact:*'' prefix)"
msgstr ""
msgid "Edit Contact information (new schema)"
-msgstr ""
+msgstr "Upraviť Kontaktné informácie (nová schéma)"
msgid "Edit Multipolygon"
msgstr "Upravit multipolygon"
@@ -19285,16 +21050,16 @@ msgid "political"
msgstr "politická"
msgid "Administrative level"
-msgstr ""
+msgstr "Administratívna úroveň"
msgid "Sub area"
-msgstr ""
+msgstr "Podoblasť"
msgid "Administration centre"
msgstr "Administrativní centrum"
msgid "Label point"
-msgstr ""
+msgstr "Miesto pre menovku"
msgid "Site"
msgstr "Místo"
@@ -19357,28 +21122,28 @@ msgid "to way"
msgstr "na cestu"
msgid "Enforcement"
-msgstr ""
+msgstr "Vynútenie dopravného obmedzenia"
msgid "Edit Enforcement"
-msgstr ""
+msgstr "Upraviť vynútenie dopravného obmedzenia"
msgid "Type of enforcement"
-msgstr ""
+msgstr "Typ vynútenia"
msgid "maxheight"
-msgstr ""
+msgstr "max výška"
msgid "maxweight"
-msgstr ""
+msgstr "max hmotnosť"
msgid "maxspeed"
-msgstr ""
+msgstr "max rýchlosť"
msgid "mindistance"
-msgstr ""
+msgstr "min vzdialenosť"
msgid "check "
-msgstr ""
+msgstr "cestná kontrola "
msgid "Max. height (meters, only if enforcement=maxheight)"
msgstr "Max. výška (metry, pouze pokud enforcement=maxheight)"
@@ -19390,37 +21155,66 @@ msgid "Max. speed (km/h, only if enforcement=maxspeed)"
msgstr "Max. rychlost (km/h, pouze pokud enforcement=maxspeed)"
msgid "location of enforcement device"
-msgstr ""
+msgstr "umiestnenie kontrolného zariadenia"
msgid "node on way where enforcement starts"
-msgstr ""
+msgstr "bod na ceste kde kontrola obmedzenia začína"
msgid "where enforcement ends"
-msgstr ""
+msgstr "kde kontrola obmedzenia končí"
msgid "traffic light or barrier that stops you"
-msgstr ""
+msgstr "semafor alebo bariéra, ktorá vás zastaví"
+
+msgid "General route"
+msgstr "Všeobecná trasa"
-msgid "Route (legacy)"
+msgid "Edit general route"
+msgstr "Upraviť všeobecnú trasu"
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "silnice"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "lyžařská"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "pěší"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "turistická"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "objízdná"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Popis symbolu"
@@ -19467,142 +21261,148 @@ msgstr "dopředná zastávka"
msgid "backward halt point"
msgstr "zpětná zastávka"
-msgid "Route network"
-msgstr "Síť cest"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Upravit síť cest"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "člen"
-msgid "Associated street"
-msgstr "Přiřazená ulice"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Upravit přiřazenou ulici"
+msgid "house"
+msgstr "dům"
msgid "Street"
msgstr "Ulice"
msgid "Edit Street"
-msgstr ""
+msgstr "Upraviť ulicu"
msgid "ways being part of street"
-msgstr ""
+msgstr "cesty súčasťou ulice"
msgid "addresses belonging to the street"
-msgstr ""
+msgstr "adresy patriace do ulice"
msgid "houses belonging to the street"
-msgstr ""
+msgstr "domy patriace do ulice"
msgid "anything related to the street"
-msgstr ""
+msgstr "niečo vzťahujúce sa k ulici"
msgid "Destination sign"
-msgstr ""
+msgstr "Smerovník"
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
-msgstr ""
+msgstr "Cieľ vyznačený na smerovníku (bez vzdialenosti)"
msgid "Distance (km)"
-msgstr ""
+msgstr "Vzdialenosť (km)"
msgid "Time (hh:mm, for trekking)"
-msgstr ""
+msgstr "Čas (hh:mm, pre chôdzu)"
msgid "Colour of background"
-msgstr ""
+msgstr "Farba pozadia"
msgid "Colour of text"
-msgstr ""
+msgstr "Farba textu"
msgid "Colour of border/arrow"
-msgstr ""
+msgstr "Farba ohraničenia/šípka"
msgid "last way before junction"
-msgstr ""
+msgstr "posledný úsek pred križovatkou"
msgid "node of the intersection"
-msgstr ""
+msgstr "bod križovatky"
msgid "first way after junction"
-msgstr ""
+msgstr "prvý úsek po križovatke"
msgid "position of sign"
-msgstr ""
+msgstr "umiestnenie smerovníka"
msgid "Waterway"
-msgstr ""
+msgstr "Vodné cesty"
msgid "Edit Waterway"
-msgstr ""
+msgstr "Upraviť vodné cesty"
msgid "Subtype of waterway (largest one of members)"
-msgstr ""
+msgstr "Podtyp vodných ciest (najväčší z členov)"
msgid "river"
-msgstr ""
+msgstr "rieka (river)"
msgid "stream"
msgstr "potok"
msgid "canal"
-msgstr ""
+msgstr "prieplav"
msgid "drain"
-msgstr ""
+msgstr "kanál"
msgid "ditch"
-msgstr ""
+msgstr "jarok"
msgid "Name of river/sea/ocean"
-msgstr ""
+msgstr "Meno rieky/mora/oceánu"
msgid "Reference Sandre (FR)"
-msgstr ""
+msgstr "Reference Sandre (FR)"
msgid "Reference FGKZ (DE)"
-msgstr ""
+msgstr "Reference FGKZ (DE)"
msgid "Reference REGINE (NO)"
-msgstr ""
+msgstr "Reference REGINE (NO)"
msgid "Reference GNIS (USA)"
-msgstr ""
+msgstr "Reference GNIS (USA)"
msgid "Reference GNBC (CA)"
-msgstr ""
+msgstr "Reference GNBC (CA)"
msgid "waterways (no riverbank)"
-msgstr ""
+msgstr "vodná cesta (bez nábrežia)"
msgid "branch waterways (no riverbank)"
-msgstr ""
+msgstr "vetva vodnej cesty (bez nábrežia)"
msgid "spring of waterway"
-msgstr ""
+msgstr "prameň vodného toku"
msgid "Length (meters)"
-msgstr ""
+msgstr "Dĺžka (v metroch)"
msgid "ways supported by (on top of) the bridge"
-msgstr ""
+msgstr "cesty nesené mostom"
msgid "ways passing under the bridge"
-msgstr ""
+msgstr "cesty prechádzajúce pod mostom"
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
+msgstr "cesty prechádzajúce tunelom"
+
+msgid "edge ways parallel to ''through''"
msgstr ""
msgid "bridge"
@@ -19611,6 +21411,12 @@ msgstr "most"
msgid "deprecated"
msgstr "zastaralý"
+msgid "bicycle"
+msgstr "bicykl"
+
+msgid "foot"
+msgstr "pěší"
+
msgid "horse"
msgstr "koňská"
@@ -19620,8 +21426,11 @@ msgstr "překážka"
msgid "motorroad"
msgstr "silnice pro motorová vozidla"
-msgid "highway_track"
-msgstr "dálnice"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "služby"
@@ -19629,10 +21438,10 @@ msgstr "služby"
msgid "ford"
msgstr "brod"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19648,46 +21457,49 @@ msgid "rapids"
msgstr "peřeje"
msgid "railwaypoint"
+msgstr "železničná výhybka"
+
+msgid "raildashed"
msgstr ""
msgid "railyard"
-msgstr ""
+msgstr "koľajisko"
msgid "otherrail"
-msgstr ""
+msgstr "iná koľaj"
msgid "railover"
-msgstr ""
+msgstr "nadchod nad železnicou"
msgid "oldrail"
-msgstr ""
+msgstr "historická železnica (turistická)"
msgid "aeroway"
msgstr "letecké cesty"
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
-msgstr "lehká sjezdovka"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "střední sjezdovka"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "těžká sjezdovka"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "sjezdovka pro experty"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "sjezdovka pro freeride (piste_freeride)"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "sjezdovka pro začátečníky"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "energetika"
@@ -19707,20 +21519,20 @@ msgstr "přísav"
msgid "amenity"
msgstr "občanská vybavenost"
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
-msgstr "menší vodní plochy"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "zdravotnictví"
-msgid "shop"
-msgstr "obchod"
+msgid "office"
+msgstr "úrad"
msgid "hotel"
msgstr "hotel"
@@ -19785,9 +21597,6 @@ msgstr "vřesoviště"
msgid "woodarea"
msgstr "zalesněné území"
-msgid "mud"
-msgstr "bahno"
-
msgid "beach"
msgstr "pláž"
@@ -19797,11 +21606,14 @@ msgstr "cesta"
msgid "boundary"
msgstr "hranice"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "místo"
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "adresa"
@@ -19815,9 +21627,6 @@ msgstr "Vesnice/Město"
msgid "One Way"
msgstr "Jednosměrka"
-msgid "Church"
-msgstr "Kostel"
-
msgid "Fuel Station"
msgstr "Čerpací stanice"
@@ -19834,608 +21643,912 @@ msgid "Test"
msgstr "Test"
msgid "abbreviated street name"
-msgstr ""
+msgstr "skrátený názov ulice"
msgid "oneway tag on a node"
-msgstr ""
+msgstr "značka \"jednosmerná\" na bode"
msgid "bridge tag on a node"
-msgstr ""
+msgstr "značka \"most\" na bode"
msgid "wrong highway tag on a node"
+msgstr "nesprávna značka \"highway\" na bode"
+
+msgid "wrong crossing tag on a way"
msgstr ""
msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "nepomenovaná neklasifikovaná cesta"
msgid "highway without a reference"
-msgstr ""
+msgstr "cesta bez označenia \"ref\""
msgid "temporary highway type"
-msgstr ""
+msgstr "dočasný typ cesty"
msgid "misspelled key name"
-msgstr ""
+msgstr "názov kľúča s preklepom"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "cyklotrasa so značkou \"bicycle\""
msgid "footway with tag foot"
-msgstr ""
+msgstr "cesta pre peších so značkou \"foot\""
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "samostatný chodník pre cyklistov ako pruh na cyklotrase"
msgid "barrier used on a way"
-msgstr ""
+msgstr "bariéry na úseku cesty"
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "maximálna rýchlosť pre chodník"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "hodnota značky \"layer\" so znamienkom +"
msgid "street name contains ss"
-msgstr ""
+msgstr "názov ulice obsahuje ss (Nemecko)"
msgid "relation without type"
-msgstr ""
+msgstr "relácia bez \"type\""
msgid "restaurant without name"
-msgstr ""
+msgstr "reštaurácia bez názvu (\"name\")"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "nezvyčajná kombinácia značiek (highway a waterway)"
msgid "unusual tag combination (highway & natural)"
-msgstr ""
+msgstr "nezvyčajná kombinácia značiek (highway & natural)"
-msgid "natural water used for swimming pool"
+msgid "unusual tag combination (landuse & building)"
msgstr ""
-msgid "incline without highway"
+msgid "unnecessary access key"
msgstr ""
-msgid "junction without highway"
+msgid "unnecessary motor_vehicle=yes"
msgstr ""
-msgid "lanes without highway"
+msgid "natural water used for swimming pool"
+msgstr "značka \"natural=water\" použitá pre plavecký bazén"
+
+msgid "numerical key"
msgstr ""
-msgid "lcn without highway"
+msgid "route_master relation without route_master=*"
msgstr ""
-msgid "lit without highway"
+msgid "power line without voltage"
msgstr ""
-msgid "living_street without highway"
+msgid "substation key without power=substation"
msgstr ""
-msgid "maintenance without highway"
+msgid "transformer key without power"
msgstr ""
-msgid "median without highway"
+msgid "missing substation=*"
msgstr ""
-msgid "motorroad without highway"
+msgid "missing transformer=*"
msgstr ""
-msgid "ntd_id without highway"
+msgid "incline without highway or railway"
msgstr ""
-msgid "oneway without highway"
+msgid "junction without highway"
+msgstr "\"junction\" bez \"highway\""
+
+msgid "lanes without highway"
+msgstr "\"lanes\" bez \"highway\""
+
+msgid "lcn without highway"
+msgstr "\"lcn\" bez \"highway\""
+
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
-msgid "sac_scale without highway"
+msgid "living_street without highway"
+msgstr "\"living_street\" bez \"highway\""
+
+msgid "maintenance without highway"
+msgstr "\"maintenance\" bez \"highway\""
+
+msgid "median without highway"
+msgstr "\"median\" bez \"highway\""
+
+msgid "motorroad without highway"
+msgstr "\"motorroad\" bez \"highway\""
+
+msgid "ntd_id without highway"
+msgstr "\"ntd_id\" bez \"highway\""
+
+msgid "oneway without highway or railway"
msgstr ""
+msgid "sac_scale without highway"
+msgstr "\"sac_scale\" bez \"highway\""
+
msgid "segregated without highway"
-msgstr ""
+msgstr "\"segregated\" bez \"highway\""
msgid "sidewalk without highway"
-msgstr ""
+msgstr "\"sidewalk\" bez \"highway\""
msgid "smoothness without highway"
-msgstr ""
+msgstr "\"smoothness\" bez \"highway\""
msgid "snowplowing without highway"
-msgstr ""
+msgstr "\"snowplowing\" bez \"highway\""
msgid "step_count without highway"
-msgstr ""
+msgstr "\"step_count\" bez \"highway\""
msgid "toll without highway"
-msgstr ""
+msgstr "\"toll\" bez \"highway\""
msgid "tracktype without highway"
-msgstr ""
+msgstr "\"tracktype\" bez \"highway\""
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "\"trail_visibility\" bez \"highway\""
msgid "trolley_wire without highway"
-msgstr ""
+msgstr "\"trolley_wire\" bez \"highway\""
msgid "zip_left without highway"
-msgstr ""
+msgstr "\"zip_left\" bez \"highway\""
msgid "zip_right without highway"
-msgstr ""
+msgstr "\"zip_right\" bez \"highway\""
msgid "detail without railway"
-msgstr ""
+msgstr "\"detail\" bez \"railway\""
msgid "eddy_current_brake without railway"
-msgstr ""
+msgstr "\"eddy_current_brake\" bez \"railway\""
msgid "electrified without railway"
-msgstr ""
+msgstr "\"electrified\" bez \"railway\""
msgid "etcs without railway"
-msgstr ""
+msgstr "\"etcs\" bez \"railway\""
msgid "gauge without railway"
-msgstr ""
+msgstr "\"gauge\" bez \"railway\""
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "\"grade_of_track\" bez \"railway\""
msgid "kursbuchstrecke without railway"
-msgstr ""
+msgstr "\"kursbuchstrecke\" bez \"railway\""
msgid "lzb without railway"
-msgstr ""
+msgstr "\"lzb\" bez \"railway\""
msgid "old_railway_operator without railway"
-msgstr ""
+msgstr "\"old_railway_operator\" bez \"railway\""
msgid "operating_procedure without railway"
-msgstr ""
+msgstr "\"operating_procedure\" bez \"railway\""
msgid "pzb without railway"
-msgstr ""
+msgstr "\"pzb\" bez \"railway\""
msgid "radio without railway"
-msgstr ""
+msgstr "\"radio\" bez \"railway\""
msgid "structure_gauge without railway"
-msgstr ""
+msgstr "\"structure_gauge\" bez \"railway\""
msgid "tilting_technologie without railway"
-msgstr ""
+msgstr "\"tilting_technologie\" bez \"railway\""
msgid "track_class without railway"
-msgstr ""
+msgstr "\"track_class\" bez \"railway\""
msgid "tracks without railway"
-msgstr ""
+msgstr "\"tracks\" bez \"railway\""
msgid "traffic_mode without railway"
-msgstr ""
+msgstr "\"traffic_mode\" bez \"railway\""
msgid "usage without railway"
-msgstr ""
+msgstr "\"usage\" bez \"railway\""
msgid "workrules without railway"
-msgstr ""
+msgstr "\"workrules\" bez \"railway\""
msgid "stream without waterway"
-msgstr ""
+msgstr "\"stream\" bez \"railway\""
msgid "intermittent without waterway"
-msgstr ""
+msgstr "\"intermittent\" bez \"railway\""
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "\"boat\" bez \"waterway\" alebo \"natural=water\""
msgid "length_unit without waterway"
-msgstr ""
+msgstr "\"length_unit\" bez \"waterway\""
msgid "llid without waterway"
-msgstr ""
+msgstr "\"llid\" bez \"waterway\""
msgid "canal without waterway"
-msgstr ""
+msgstr "\"canal\" bez \"waterway\""
msgid "have_riverbank without waterway"
+msgstr "\"have_riverbank\" bez \"waterway\""
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "width without physical linear feature"
+msgstr "\"width\" bez fyzickej cesty"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "border_type without boundary"
msgstr ""
-msgid "religion without denomination"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "unknown christian denomination"
+msgid "board_type without information=board"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid "map_type without information=map"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "artwork_type without tourism=artwork"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "Yahoo Sat"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "Bing Sat"
-msgstr "Bing Sat"
+msgid "bunker_type without military=bunker"
+msgstr ""
-msgid "MapBox Satellite"
+msgid "source:addr without addr:*"
msgstr ""
-msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open fotomapa"
+msgid "source:date without source"
+msgstr ""
-msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgid "source:name without name"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "Skobbler"
+msgid "source:building without building"
msgstr ""
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "source:ref without ref"
+msgstr ""
-msgid "MapQuest OSM"
+msgid "source:population without population"
msgstr ""
-msgid "Public Transport (ÖPNV)"
-msgstr "Hromadná doprava (ÖPNV)"
+msgid "source:geometry on a node"
+msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Ulice NRW Geofabrik.de"
+msgid "source:postal_code without addr:postcode"
+msgstr ""
-msgid "Hike & Bike"
+msgid "source:ele without ele"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "source:ref:INSEE without ref:INSEE"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "source:lit without lit"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "source:hgv without hgv"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "source:outline on a node"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "source:highway without highway"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "source:maxaxleload without maxaxleload"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "source:surface without surface"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "source:bridge without bridge"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "source:old_name without old_name"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "source:designation without designation"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Vienna: Orthofoto (fotomapa)"
+msgid "source:height without height"
+msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "source:lanes without lanes"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "religion without denomination"
+msgstr "\"religion\" bez \"denomination\""
+
+msgid "unknown christian denomination"
+msgstr "neznáma kresťanská \"denomination\""
+
+msgid "unknown muslim denomination"
+msgstr "neznáma moslimská \"denomination\""
+
+msgid "unknown jewish denomination"
+msgstr "neznáma židovská \"denomination\""
+
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"nezadaný jazyk pre wikipediu, použite \"wikipedia=jazyk:názov stránky\""
-msgid "Stadtplan Zürich"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "unusual maxspeed format"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "unusual frequency specification"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "unusual train track gauge; use mm with no separator"
msgstr ""
-msgid "Geobase Roads"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
-msgid "Canvec"
+msgid "Landsat"
+msgstr "Landsat"
+
+msgid "Yahoo Sat"
+msgstr "Yahoo Sat"
+
+msgid "Bing Sat"
+msgstr "Bing Sat"
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "MapBox Satellite"
+msgstr "MapBox Satellite"
+
+msgid "MapQuest Open Aerial"
+msgstr "MapQuest Open Aerial"
+
+msgid "OpenStreetMap GPS Traces"
msgstr ""
-msgid "MSR Maps Topo"
-msgstr "MSR Maps Topo"
+msgid "OpenStreetMap (Mapnik)"
+msgstr "OpenStreetMap (Mapnik)"
-msgid "MSR Maps Urban"
-msgstr "MSR Maps Urban"
+msgid "OpenStreetMap (Mapnik Black & White)"
+msgstr "OpenStreetMap (Mapnik Čiernobiely)"
-msgid "USGS Scanned Topographic Maps"
+msgid "skobbler"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
+
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
+
+msgid "MapQuest OSM"
+msgstr "MapQuest OSM"
+
+msgid "Public Transport (ÖPNV)"
+msgstr "Public Transport (ÖPNV)"
+
+msgid "OpenStreetMap (German Style)"
+msgstr "OpenStreetMap (Nemecký štýl)"
+
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
+
+msgid "osmfr"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI black-and-white 2.5m"
+
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
+msgid "basemap.at"
msgstr ""
+msgid "Graz: Basiskarte (base map)"
+msgstr "Graz: Basiskarte (base map)"
+
+msgid "Tiris: DGM (Terrain model)"
+msgstr "Tiris: DGM (Terrain model)"
+
+msgid "Tiris: DOM (Surface model)"
+msgstr "Tiris: DOM (Surface model)"
+
+msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgstr "Vienna: Mehrzweckkarte (general purpose)"
+
+msgid "Vienna: Beschriftungen (annotations)"
+msgstr "Vienna: Beschriftungen (annotations)"
+
+msgid "Vienna: Orthofoto (aerial image)"
+msgstr "Vienna: Orthofoto (aerial image)"
+
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
+
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
+
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terrain model)"
+
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Surface model)"
+
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrography"
+
+msgid "Geobase Roads"
+msgstr "Geobase Roads"
+
+msgid "Canvec"
+msgstr "Canvec"
+
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic"
+
msgid "Czech CUZK:KM"
-msgstr "český CUZK:KM"
+msgstr "Czech CUZK:KM"
msgid "Czech UHUL:ORTOFOTO"
-msgstr "český UHUL:ortofoto"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Denmark)"
-msgid "OS New Popular Edition historic"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Denmark)"
+
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Denmark)"
+
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estonia Basemap (Maaamet)"
+
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortho (Maaamet)"
+
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
+
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
+
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
+
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
+
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
+
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
+
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
+
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Orthophotos 2000"
+
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
+
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
+
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Orthophotoplan 2011"
+
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Orthophotoplan 2007"
+
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Orthophotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthophotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
-msgid "OS OpenData StreetView"
+msgid "Streets NRW Geofabrik.de"
+msgstr "Streets NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Sorbian Language)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (German Language)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Bavaria (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Physical DE - Physische Karte (Naturräume)"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
msgstr ""
-msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
msgstr ""
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haiti)"
+
+msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr ""
+msgstr "Ireland Bartholomew Quarter-Inch 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Ireland EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr ""
+msgstr "Ireland EEA CORINE 2006"
msgid "Lodi - Italy"
-msgstr "Lodi - Itálie"
+msgstr "Lodi - Italy"
msgid "Lombardia - Italy (CTR)"
-msgstr ""
+msgstr "Lombardia - Italy (CTR)"
msgid "Sicily - Italy"
-msgstr "Sicily - Itálie"
+msgstr "Sicily - Italy"
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Itálie"
+msgstr "PCN 2006 - Italy"
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr ""
+msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr ""
+msgstr "USSR - Latvia"
msgid "50cm ortho - Latvia"
-msgstr ""
+msgstr "50cm ortho - Latvia"
msgid "20cm ortho - Coastline"
-msgstr ""
+msgstr "20cm ortho - Coastline"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr ""
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lithuania)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr ""
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger Delta Oct 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr ""
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr ""
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr ""
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr ""
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Car (Auto)"
-msgid "Géobretagne - Morbihan 2010"
-msgstr ""
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking (Turistika)"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr ""
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Cyclo (Bicyklovanie)"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr ""
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Ski (Lyžovanie)"
-msgid "Géolittoral - Sentiers"
-msgstr ""
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slovakia EEA GMES Urban Atlas"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slovakia EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008"
-msgstr ""
+msgid "Slovakia Historic Maps"
+msgstr "Slovakia Historic Maps (historické mapy)"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "South Africa CD:NGI Aerial"
msgid "Catastro Spain"
-msgstr ""
+msgstr "Catastro Spain"
msgid "PNOA Spain"
-msgstr "PNOA Španělsko"
+msgstr "PNOA Spain"
msgid "SIGPAC Spain"
-msgstr ""
+msgstr "SIGPAC Spain"
msgid "GRAFCAN - Canary Islands"
-msgstr ""
+msgstr "GRAFCAN - Canary Islands"
msgid "ITACyL - Castile and León"
-msgstr ""
+msgstr "ITACyL - Castile and León"
msgid "IDEIB - Balearic Islands"
-msgstr ""
+msgstr "IDEIB - Balearic Islands"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estonsko Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estonsko Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stadt Uster Orthophoto 2008 10cm"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonsko Multi (Maaamet)"
+msgid "Stadtplan Zürich"
+msgstr "Stadtplan Zürich"
-msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Dánsko)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dánsko)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr ""
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Canton de Génève 5cm (SITG 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton du Jura 50cm (RCJU 1998)"
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Canton de Fribourg 50cm (2005)"
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stadt Bern 10cm/25cm (2008)"
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Orthophoto 2012"
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthophoto 2012"
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Orthophoto technique 2012"
+
+msgid "MSR Maps Topo"
+msgstr "MSR Maps Topo"
+
+msgid "MSR Maps Urban"
+msgstr "MSR Maps Urban"
+
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Scanned Topographic Maps"
+
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Large Scale Imagery"
+
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Roads Overlay"
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
-msgstr ""
+msgid "OSM - Tiger Edited Map"
+msgstr "OSM - Tiger Edited Map"
+
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ukraine - Orthophotomaps 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr "OS New Popular Edition historic"
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
-msgid "ScanEx SPOT"
-msgstr ""
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgid "Surrey Air Survey"
+msgstr "Surrey Air Survey"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr ""
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-inch Scotland 1842-82"
-msgid "South Africa CD:NGI Aerial"
-msgstr ""
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
-msgid "Freemap.sk Car"
-msgstr ""
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
-msgid "Freemap.sk Hiking"
-msgstr ""
+msgid "OS 1:25k historic (OSM)"
+msgstr "OS 1:25k historic (OSM)"
-msgid "Freemap.sk Cyclo"
-msgstr ""
+msgid "OS Scottish Popular historic"
+msgstr "OS Scottish Popular historic"
-msgid "Freemap.sk Ski"
-msgstr ""
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
-msgstr ""
+msgid "Port:"
+msgstr "Port:"
-msgid "OSM - Tiger Edited Map"
-msgstr ""
+msgid "refresh the port list"
+msgstr "obnovit seznam portů"
-msgid "OS 1:25k historic (OSM)"
-msgstr ""
+msgid "Configure"
+msgstr "Nastavit"
-msgid "OS Scottish Popular historic"
-msgstr ""
+msgid "Connection Error."
+msgstr "Chyba při připojování."
-msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "nastavit připojené DG100"
-msgid "2u"
-msgstr ""
+msgid "delete data after import"
+msgstr "smazat data po importu"
msgid "Columbus V-900 CSV Files"
msgstr "CSV soubory Columbus V-900"
msgid "Importing CSV file ''%s''..."
-msgstr ""
+msgstr "Import CSV súboru ''%s''..."
msgid "Markers of "
msgstr ""
@@ -20477,19 +22590,19 @@ msgid "Command line"
msgstr "Příkazový řádek"
msgid "Set input focus to the command line."
-msgstr ""
+msgstr "Nastavte vstupný fokus na príkazovom riadku."
msgid "Point on the start"
-msgstr ""
+msgstr "Bod na začiatku"
msgid "Point on the end"
-msgstr ""
+msgstr "Bod na konci"
msgid "Missing definition of new object with id {0}."
-msgstr ""
+msgstr "Chýbajú definície nového objektu s id {0}."
msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
-msgstr ""
+msgstr "Chýba povinný atribút ''{0}'' na členovi (<member>) relácie {1}."
msgid "Illegal value for attribute ''uid''. Got ''{0}''."
msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
@@ -20516,6 +22629,8 @@ msgid ""
"Forms a grid of ways in base to two existing that have various nodes and one "
"in common"
msgstr ""
+"Tvar cestnej siete na základe dvoch existujúcich, ktoré majú rôzne body a "
+"jeden spoločný"
msgid "Select two ways with a node in common"
msgstr "Vybrat svě cesty se společným bodem."
@@ -20527,7 +22642,7 @@ msgid "Create a grid of ways"
msgstr "Vytvořit mřížku cest"
msgid "Download Track ..."
-msgstr ""
+msgstr "Stiahnuť Stopy ..."
msgid "Download GPX track from openstreetmap.org"
msgstr "Stáhnout GPX trasy z openstreetmap.org"
@@ -20549,7 +22664,7 @@ msgid "Error parsing data from URL {0}"
msgstr "Chyba při načítání dat z URL {0}"
msgid "Download Track"
-msgstr ""
+msgstr "Stiahnuť stopu"
msgid "Filename"
msgstr "Jméno souboru"
@@ -20578,7 +22693,7 @@ msgid "Upload Traces"
msgstr "Nahrát trasy na server"
msgid "Defines the visibility of your trace for other OSM users."
-msgstr ""
+msgstr "Definovať viditeľnosť pre vašu stopu pre iných používateľov OSM."
msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -20608,7 +22723,7 @@ msgid "Connecting..."
msgstr "Připojuji se..."
msgid "Upload canceled"
-msgstr ""
+msgstr "Nahrávanie bolo zrušené"
msgid "Error while uploading"
msgstr "Chyba při nahrávání na server"
@@ -20637,6 +22752,18 @@ msgstr "Zobrazit výškový profil"
msgid "Elevation Profile"
msgstr "Výškový profil"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr "Otevřít okno výškového profilu."
@@ -20653,22 +22780,16 @@ msgid "Dist"
msgstr "Vzdálenost"
msgid "Gain"
-msgstr ""
+msgstr "Zvýšenie"
msgid "Time"
msgstr "Čas"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
-msgstr "Pevná hodnota"
+msgid "Tracks"
+msgstr "Stopy"
msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "Výškový profil pre stopu ''{0}''."
msgid "Elevation profile"
msgstr "Výškový profil"
@@ -20677,7 +22798,7 @@ msgid "(No elevation data)"
msgstr "(žádné údaje o nadmořské výšce)"
msgid "Can not save preferences"
-msgstr ""
+msgstr "Nemožno uložiť predvoľby"
msgid "FastDraw configuration"
msgstr ""
@@ -20689,7 +22810,7 @@ msgid "Starting Epsilon"
msgstr ""
msgid "Max points count per 1 km"
-msgstr ""
+msgstr "Max počet bodov na 1 km"
msgid "Enter key mode"
msgstr ""
@@ -20776,13 +22897,13 @@ msgid "Eps={0}, {1} points, {2} p/km"
msgstr ""
msgid "Fix addresses"
-msgstr ""
+msgstr "Oprava adries"
msgid "Show dialog with incomplete addresses"
msgstr "Zobrazit dialog s nekompletními adresami"
msgid "Include objects used for guesses"
-msgstr ""
+msgstr "Vložte objekty použité pre odhady"
msgid "Fix street addresses"
msgstr "Opravit adresy ulic"
@@ -20861,13 +22982,13 @@ msgstr "žádné položky"
msgctxt "address"
msgid "City"
-msgstr ""
+msgstr "Mesto"
msgid "Postcode"
msgstr "PSČ"
msgid "Turns all guesses into the corresponding tag values."
-msgstr ""
+msgstr "Vytvoriť príslušné hodnoty značiek zo všetkých odhadov."
msgid "Applied guessed values"
msgstr "Aplikovány uhodnuté hodnoty"
@@ -20879,7 +23000,7 @@ msgid "Assign address to street"
msgstr "Přiřadit adresy k ulici"
msgid "Assign the selected address(es) to the selected street."
-msgstr ""
+msgstr "Priradiť vybrané adresy vybranej ulici."
msgid "Set street name"
msgstr "Nastavit jméno ulice"
@@ -20910,6 +23031,8 @@ msgid ""
"Tries to guess address data by picking the name of the closest object with "
"according tag."
msgstr ""
+"Pokúsi sa uhádnuť údaje adresy vybraním názvu najbližšieho objektu s "
+"potrebnou značkou."
msgid "Guessing address values"
msgstr "Odhaduji hodnoty pro adresy"
@@ -20929,9 +23052,15 @@ msgstr "Vyberat neúplné adresy"
msgid "Selects all addresses with incomplete data."
msgstr "Vyberat všechny adresy s neúplnými údaji."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Upravit vlastnosti {0} objektů"
@@ -20954,14 +23083,17 @@ msgstr ""
msgid "Layer Properties"
msgstr "Vlastnosti vrstvy"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "Importovat obrázek"
msgid "Import georeferenced image"
-msgstr ""
+msgstr "Import georeferenčného obrázka"
msgid "Error while creating image layer: "
-msgstr ""
+msgstr "Chyba pri vytváraní obrazu vrstvy: "
msgid "NanoLog"
msgstr ""
@@ -20982,16 +23114,16 @@ msgid "Edit opening hours"
msgstr "Upravit otevírací dobu"
msgid "Edit time-tag of selected element in a graphical interface"
-msgstr ""
+msgstr "Úpravy časovú značku vybraných prvkov v grafickom rozhraní"
msgid "edit existing tag"
-msgstr ""
+msgstr "upraviť existujúcu značku"
msgid "edit new tag"
-msgstr ""
+msgstr "upraviť novú značku"
msgid "Display clock in 12h mode."
-msgstr ""
+msgstr "Zobraziť čas v 12 hodinovom formáte."
msgid "Choose key"
msgstr "Vyberte klíč"
@@ -21000,7 +23132,7 @@ msgid "apply {0}"
msgstr "použít {0}"
msgid "There is something wrong in the value near:"
-msgstr ""
+msgstr "Je nejaká chyba v hodnote:"
msgid "Info: {0}"
msgstr "Info: {0}"
@@ -21012,7 +23144,7 @@ msgid "Error in timeformat"
msgstr "Chyba ve formátu času"
msgid "open end"
-msgstr ""
+msgstr "otvorené zatvorené"
msgid "Import Osm Inspector Bugs..."
msgstr ""
@@ -21032,11 +23164,24 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
+"Handy Address Interpolation Functions (Funkcia šikovného priraďovania adresy)"
msgid "Define Address Interpolation"
msgstr "Definovat interpolaci adres"
@@ -21051,16 +23196,16 @@ msgid "Alphabetic"
msgstr "Abecedně"
msgid "Numeric"
-msgstr ""
+msgstr "Číselný"
msgid "Actual"
-msgstr ""
+msgstr "Aktuálna"
msgid "Estimate"
msgstr "Odhad"
msgid "Potential"
-msgstr ""
+msgstr "Potenciál"
msgid "Relation: {0}"
msgstr "Relace: {0}"
@@ -21119,7 +23264,7 @@ msgstr "Očekávána lichá čísla pro adresy"
msgid "Expected even numbers for addresses"
msgstr "Očekávána sudá čísla pro adresy"
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -21192,6 +23337,8 @@ msgid ""
"Please select two segments that don''t share any nodes\n"
" or put the pivot on their common node.\n"
msgstr ""
+"Prosím, vyberte dva segmenty, ktoré nezdieľaju body\n"
+"alebo zvoľte ich spoločný bod.\n"
msgid "Align Way Segments: Modes"
msgstr ""
@@ -21203,13 +23350,13 @@ msgid "This panel activates in Align Ways mode:"
msgstr ""
msgid "Length preserved"
-msgstr ""
+msgstr "Zachovaná dĺžka"
msgid "Angle preserved"
-msgstr ""
+msgstr "Zachovaný uhol"
msgid "Align with:"
-msgstr ""
+msgstr "Zarovnať s:"
msgid ""
"<html>Aligns the way segment to the reference so that its length is "
@@ -21229,7 +23376,7 @@ msgid "AlignWays Tips"
msgstr "AlignWays Tipy"
msgid "AlignWays: What''s New..."
-msgstr ""
+msgstr "AlignWays: Čo je nové..."
msgid "Align Ways mode"
msgstr "Režim rovnání cest"
@@ -21241,6 +23388,8 @@ msgid ""
"Segment to be aligned cannot be the same with the reference segment.\n"
"Please choose a different segment to be aligned."
msgstr ""
+"Segment musí byť zarovnaný, nemôže byť rovnaký s referenčným segmentom.\n"
+"Prosím, vyberte iný zarovnaný segment."
msgid "AlignWayS message"
msgstr "AlignWayS zpráva"
@@ -21249,6 +23398,8 @@ msgid ""
"Reference segment cannot be the same with the segment to be aligned.\n"
"Please choose a different reference segment."
msgstr ""
+"Referenčný segment nemôže byť rovnaký ako segment zarovnávaný.\n"
+"Prosím, vyberte iný referenčný segment."
msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
msgstr ""
@@ -21367,7 +23518,7 @@ msgid "Don''t show this again"
msgstr "Toto již víckrát neukazovat"
msgid "What''s new..."
-msgstr ""
+msgstr "Čo je nové..."
msgid "Added <b>angle preserving</b> aligning mode"
msgstr ""
@@ -21390,15 +23541,6 @@ msgstr "Číslo domu:"
msgid "Street Name:"
msgstr "Ulice:"
-msgid "Increment"
-msgstr "Vzestupně"
-
-msgid "Decrement"
-msgstr "Sestupně"
-
-msgid "Numbers:"
-msgstr "Čísla:"
-
msgid "Big buildings mode"
msgstr ""
@@ -21473,6 +23615,9 @@ msgid ""
"Load cache first ?\n"
"(No = new cache)"
msgstr ""
+"Umiestnenie \"{0}\" vyhľadané v cache.\n"
+"Najskôr načítať cache?\n"
+"(Nie = nová cache)"
msgid "Select Feuille"
msgstr "Vybrat Feuille"
@@ -21485,10 +23630,10 @@ msgstr ""
"Pravděpodobně jde o starou verzi cache souboru."
msgid "Lambert Zone {0} cache file (.{0})"
-msgstr ""
+msgstr "Lambert Zone {0} cache súbor (.{0})"
msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
-msgstr ""
+msgstr "Lambert CC9 Zone {0} cache file (.CC{0})"
msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
msgstr "Guadeloupe Fort-Marigot cache soubor (.UTM1)"
@@ -21509,6 +23654,8 @@ msgid ""
"Cannot open a new client session.\n"
"Server in maintenance or temporary overloaded."
msgstr ""
+"Nemožno otvoriť nové sedenie klienta.\n"
+"Server je v údržbe alebo dočasne preťažený."
msgid ""
"Town/city {0} not found or not available\n"
@@ -21547,12 +23694,17 @@ msgstr ""
msgid ""
"Warning: failed to put option pane dialog always on top. Exception was: {0}"
msgstr ""
+"Varovanie: neúspešná voľba umiestniť panel dialógu vždy na vrchu. Výnimky "
+"boli: {0}"
msgid ""
"To enable the cadastre WMS plugin, change\n"
"the current projection to one of the cadastre\n"
"projections and retry"
msgstr ""
+"Zapnúť the cadastre WMS plugin, zmena\n"
+"aktuálnej projekcie na jednu z the cadastre\n"
+"projekcií a opakovať"
msgid "Change the current projection"
msgstr ""
@@ -21571,33 +23723,31 @@ msgstr "Zobrazovat hranice stažených dat."
msgid "Disable image cropping during georeferencing."
msgstr ""
+"Vypnuté orezávanie obrázkov pri určovaní zemepisnej polohy (georeferencingu)."
msgid "Use \"Tableau d''assemblage\""
msgstr "Použít \"Tableau d''assemblage\""
-msgid "Select first WMS layer in list."
+msgid "Replace grey shades by white color only"
msgstr ""
+msgid "Select first WMS layer in list."
+msgstr "Zvoľte najprv WMS vrstvu v zozname."
+
msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
-msgstr ""
+msgstr "Nepoužívaj reláciu pre adresy, ale addr:street na prvku."
msgid "off"
msgstr ""
msgid "25 m"
-msgstr ""
+msgstr "25 m"
msgid "50 m"
-msgstr ""
+msgstr "50 m"
msgid "100 m"
-msgstr ""
-
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
+msgstr "100 m"
msgid "symbol"
msgstr "symbol"
@@ -21612,7 +23762,7 @@ msgid "locality"
msgstr "lokalita"
msgid "section"
-msgstr ""
+msgstr "kraj"
msgid "commune"
msgstr "obec"
@@ -21635,6 +23785,13 @@ msgid ""
"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
"<BR>before any upload of data created by this plugin."
msgstr ""
+"Špeciálny manipulant pre francúzsky kataster wms at "
+"www.cadastre.gouv.fr<BR><BR>Prosím čítajte Podmienky pre využívanie "
+"(francúzsky): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>predtým, ako nahráte nejaké dáta vytvorené týmto pluginom."
msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
msgstr ""
@@ -21675,7 +23832,7 @@ msgid "Low resolution (600x400)"
msgstr "Nízké rozlišení (600x400)"
msgid "Image filter interpolation:"
-msgstr ""
+msgstr "Obrázkový filter interpolácie:"
msgid "Nearest-Neighbor (fastest) [ Default ]"
msgstr "Nejbližší soused (nejrychlejší) [ výchozí ]"
@@ -21687,10 +23844,10 @@ msgid "Bicubic (slow)"
msgstr "Bikubický (pomalé)"
msgid "Vector images grab multiplier:"
-msgstr ""
+msgstr "Zachytávač vektorových obrázkov multiplikátor:"
msgid "Grab one image full screen"
-msgstr ""
+msgstr "Zachytiť obrázok celej obrazovky"
msgid "Grab smaller images (higher quality but use more memory)"
msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)"
@@ -21732,15 +23889,18 @@ msgid "Municipality administrative borders."
msgstr "Administrativní hranice samospráv."
msgid "Raster images grab multiplier:"
-msgstr ""
+msgstr "Zachytávač rastrových obrázkov multiplikátor:"
msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
-msgid "Display crosspieces:"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
msgstr ""
+msgid "Display crosspieces:"
+msgstr "Zobraziť kríže:"
+
msgid "Allows an automatic caching"
msgstr ""
@@ -21752,10 +23912,15 @@ msgid ""
"Automatically selects the first WMS layer if multiple layers exist when "
"grabbing."
msgstr ""
+"Automaticky vyberie prvú WMS vrstvu, ak existuje viac vrstiev pri "
+"zachytávaní(grabovaní)."
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Přidat \"source=...\" k objektům?"
@@ -21776,13 +23941,13 @@ msgstr ""
"import budov je omezen na max. 1 km2."
msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr ""
+msgstr "Prosím, zapnite automatický zdroj a kontrolu štvorcov máp katastra."
msgid "Extract SVG ViewBox..."
msgstr "Extrahovat SVG ViewBox..."
msgid "Extract best fitting boundary..."
-msgstr ""
+msgstr "Vyberte najvhodnejšie rozhranie(hranice)..."
msgid "Create boundary"
msgstr "Vytvořit hranice"
@@ -21797,6 +23962,8 @@ msgid ""
"Municipality vectorized !\n"
"Use the normal Cadastre Grab menu."
msgstr ""
+"Obec je vektorizovaná !\n"
+"Použite normálne Cadastre Grab menu."
msgid ""
"This commune is not vectorized.\n"
@@ -21804,7 +23971,7 @@ msgid ""
msgstr ""
msgid "Extract commune boundary"
-msgstr ""
+msgstr "Vybrať hranice obce(samosprávy)"
msgid "Only on vectorized layers"
msgstr "Pouze na vektorizovaných vrstvách"
@@ -21828,61 +23995,17 @@ msgid "Georeference an image"
msgstr ""
msgid "Grab non-georeferenced image"
-msgstr ""
+msgstr "Zachytený obrázok bez zemepisných súradníc"
msgid "Georeferencing interrupted"
-msgstr ""
+msgstr "Určovanie zemepisných súradníc prerušené"
msgid ""
"This image contains georeference data.\n"
"Do you want to use them ?"
msgstr ""
-
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Klikněte na první roh pro oříznutí obrázku\n"
-"(jsou potřeba dva body)"
-
-msgid "Image cropping"
-msgstr "Ořezávání obrázků"
-
-msgid "Click second corner for image cropping"
-msgstr "Klikněte na druhý roh pro oříznutí obrázku"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Chcete zrušit úplně\n"
-"nebo jen opakovat "
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr "Východ"
-
-msgid "I use the mouse"
-msgstr "Používám myš"
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
+"Tento obrázok obsahuje georeferenčné dáta.\n"
+"Chcete ich použiť?"
msgid "Load layer from cache"
msgstr ""
@@ -21896,13 +24019,16 @@ msgstr "{0} není se současnou projekcí dovolena"
msgid ""
"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
+"Nemôžem načítať cache {0} ktorá nie je kompatabilná s aktuálnou zónou "
+"projekcie"
msgid ""
"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
+"Vybratý súbor {0} nieje cache súborom tohto pluginu (chybné rozšírenie)"
msgid "The location {0} is already on screen. Cache not loaded."
-msgstr ""
+msgstr "Poloha {0} je práve na obrazovke. Cache nie je načítaná."
msgid "(optional)"
msgstr "(volitelné)"
@@ -21938,20 +24064,84 @@ msgstr "Přidat novou vrstvu"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Vymazat cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Získat nový cookie (vypršení sezení)"
-msgid "Save image as PNG"
+msgid "Save image as..."
+msgstr ""
+
+msgid "PNG files (*.png)"
+msgstr "PNG soubory (*.png)"
+
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Klikněte na první roh pro oříznutí obrázku\n"
+"(jsou potřeba dva body)"
+
+msgid "Image cropping"
+msgstr "Ořezávání obrázků"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Kliknite na prvý Lambertov priečnik (crosspiece) pre georeferencing\n"
+"(povinné sú dva body)"
+
+msgid "Image georeferencing"
+msgstr "Určovanie zemepisnej polohy obrázkov"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Chcete zrušit úplně\n"
+"nebo jen opakovat "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr "Vstúpiť do cadastre na východ, sever pozícii"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Varovanie: potvrdte sever so šípkou !!)"
+
+msgid "East"
+msgstr "Východ"
+
+msgid "I use the mouse"
+msgstr "Používám myš"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Zvoliť {0} Lambert súradnice"
+
+msgid "Click second corner for image cropping"
+msgstr "Klikněte na druhý roh pro oříznutí obrázku"
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
-
-msgid "PNG files (*.png)"
-msgstr "PNG soubory (*.png)"
-
-msgid "Export as PNG format (only raster images)"
-msgstr "Exportovat v PNG formátu (pouze rastrové obrázky)"
+"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej "
+"polohy(georeferencing)"
msgid "Adjust WMS"
msgstr "Upravit WMS"
@@ -21978,14 +24168,17 @@ msgstr "WMS vrstva ({0}), nahráno {1} dlaždic"
msgid "Is not vectorized."
msgstr "Není vektorizovaný."
-msgid "Raster size: {0}"
-msgstr "Velikost rastru: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Je vektorizovaný."
msgid "Commune bbox: {0}"
-msgstr ""
+msgstr "Hranice obce bbox: {0}"
msgid ""
"Unsupported cache file version; found {0}, expected {1}\n"
@@ -22031,8 +24224,8 @@ msgstr "Smazat vybrané schéma ze seznamu."
msgid "Color Schemes"
msgstr "Schémata barev"
-msgid "Adress"
-msgstr "Adresy"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr "Rozdělit oblast"
@@ -22078,6 +24271,9 @@ msgstr "Stáhnout podél"
msgid "Please select 1 or more ways to download along"
msgstr "Vyberte jednu nebo více cest, podél kterých stahovat"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr "{0} mezilehlých uzlů ke stažení."
@@ -22150,6 +24346,71 @@ msgstr "Nový nástroj..."
msgid "Install"
msgstr "Nainstalovat"
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Jen pozice"
@@ -22189,27 +24450,9 @@ msgstr "Přestat logovat data, když vzdálenost klesne pod"
msgid "Unknown logFormat"
msgstr "Neznámý formát logu"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "obnovit seznam portů"
-
-msgid "Configure"
-msgstr "Nastavit"
-
msgid "Configure Device"
msgstr "Konfigurovat zařízení"
-msgid "Connection Error."
-msgstr "Chyba při připojování."
-
-msgid "configure the connected DG100"
-msgstr "nastavit připojené DG100"
-
-msgid "delete data after import"
-msgstr "smazat data po importu"
-
msgid "Importing data from device."
msgstr "Importovat data ze zařízení."
@@ -22259,7 +24502,7 @@ msgid "Add EGPX layer"
msgstr "Přidat EGPX vrstvu"
msgid "GPX Data"
-msgstr ""
+msgstr "GPX dáta"
msgid "Classes element below root child level"
msgstr ""
@@ -22379,31 +24622,31 @@ msgid "Couldn''t find built-in ruleset {0}"
msgstr ""
msgid "height (m)"
-msgstr ""
+msgstr "výška (m)"
msgid "width (m)"
-msgstr ""
+msgstr "šírka (m)"
msgid "length (m)"
-msgstr ""
+msgstr "dĺžka (m)"
msgid "speed (km/h)"
-msgstr ""
+msgstr "rýchlosť (km/h)"
msgid "weight (t)"
-msgstr ""
+msgstr "váha (t)"
msgid "axleload (t)"
-msgstr ""
+msgstr "zaťaženie na nápravu (t)"
msgid "Bookmark name"
-msgstr ""
+msgstr "Názov záložky"
msgid "Bookmark name already exists!"
-msgstr ""
+msgstr "Názov záložky už existuje!"
msgid "Bookmark name must not contain ''{0}''!"
-msgstr ""
+msgstr "Názov záložky nesmie obsahovať \"{0}\"!"
msgid "Access class"
msgstr ""
@@ -22421,13 +24664,13 @@ msgid "Road requirements"
msgstr ""
msgid "Max. incline up (%, pos.)"
-msgstr ""
+msgstr "Max. stúpanie (%)"
msgid "Maximum incline the vehicle can go up"
msgstr "Maximální stoupání, které je vozidlo schopné vyjet"
msgid "Max. incline down (%, pos.)"
-msgstr ""
+msgstr "Max. klesanie (%)"
msgid "Maximum incline the vehicle can go down"
msgstr "Maximální stoupání, které je vozidlo schopné sjet"
@@ -22513,10 +24756,10 @@ msgid "Draw directions separately"
msgstr ""
msgid "Node color"
-msgstr ""
+msgstr "Farba bodu"
msgid "Arrow color"
-msgstr ""
+msgstr "Farba šípky"
msgid "Arrowhead fill color"
msgstr ""
@@ -22528,7 +24771,7 @@ msgid "New bookmark"
msgstr ""
msgid "Really delete \"{0}\"?"
-msgstr ""
+msgstr "Naozaj zmazať \"{0}\"?"
msgid "Bookmark deletion"
msgstr ""
@@ -22569,12 +24812,16 @@ msgid ""
"Weights must be given as positive decimal numbers with unit \"t\" or without "
"unit."
msgstr ""
+"Hmotnosť musí byť zadaná ako kladné desatinné číslo s jednotkou \"t\" alebo "
+"bez jednotky."
msgid ""
"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
"\"mi\" or without unit.\n"
"Alternatively, the format FEET'' INCHES\" can be used."
msgstr ""
+"Dĺžka musí byť zadaná ako kladné desatinné číslo s jednotkami \"m\", \"km\", "
+"\"mi\" alebo bez jednotiek."
msgid ""
"Speeds should be given as numbers without unit or as numbers followed by "
@@ -22585,7 +24832,7 @@ msgstr ""
msgid ""
"Inclines must be given as positive decimal numbers with followed by \"%\"."
-msgstr ""
+msgstr "Sklon musí byť zadaný ako kladné desatinné číslo nasledované \"%\"."
msgid "Tracktype grades must be given as integers between 0 and 5."
msgstr ""
@@ -22596,20 +24843,23 @@ msgid ""
msgstr ""
msgid "Imagery XML Files"
-msgstr ""
+msgstr "XML súbory mapových podkladov"
msgid "Save Imagery XML file"
-msgstr ""
+msgstr "Uložiť XML súbor mapového podkladu"
msgid "XML Imagery Bounds"
-msgstr ""
+msgstr "XML hranice mapového podkladu"
msgid "Generate Imagery XML bounds for the selection"
-msgstr ""
+msgstr "Generovať XML hranice mapového podkladu pre výber"
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22617,7 +24867,7 @@ msgid ""
msgstr ""
msgid "Open Imagery XML file"
-msgstr ""
+msgstr "Otvoriť XML súbor mapového podkladu"
msgid "Calibration Layer"
msgstr ""
@@ -22661,7 +24911,7 @@ msgid "Get Imagery Offset..."
msgstr ""
msgid "Download offsets for current imagery from a server"
-msgstr ""
+msgstr "Stiahnuť posun aktuálneho mapového podkladu zo servera"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
@@ -22680,16 +24930,16 @@ msgid "Imagery Offset Database"
msgstr ""
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
msgid "km"
-msgstr ""
+msgstr "km"
msgid "Calibration geometries"
msgstr ""
@@ -22798,22 +25048,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Upravit podkladovou mapu"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "Upravit pozici zvolené vrstvy podkladové mapy"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Vyberte vrstvu podkladových map k úpravě."
+msgstr ""
msgid "Start adjusting"
-msgstr "Začít upravování"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "Momentálně nejsou žádné vrstvy podkladových map k úpravě."
+msgstr ""
msgid "No layers to adjust"
-msgstr "Žádné vrstvy k upravování"
+msgstr ""
msgid "Normal"
msgstr "Normální"
@@ -22846,7 +25096,7 @@ msgid "Rotate image right"
msgstr "Otočit obrázek vpravo"
msgid "WayPoint Image"
-msgstr ""
+msgstr "WayPoint Image"
msgid "Display non-geotagged photos"
msgstr "Zobrazit negeotagované fotografie"
@@ -22857,12 +25107,6 @@ msgstr "Importované obrázky"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Obrázky (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Otevře obrázek s ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Otevřít skupinu obrázků jako novou vrstvu."
-
msgid "Import vector graphics"
msgstr "Import vektorové kresby"
@@ -22872,18 +25116,15 @@ msgstr "Měřítko:"
msgid "unit(s) = "
msgstr "jednotka = "
-msgid "Import..."
-msgstr "Import..."
-
-msgid "Import vector graphics."
-msgstr "Import vektorové kresby."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG kresba (*.svg)"
-
msgid "Importing..."
msgstr "Probíhá import…"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -22902,10 +25143,10 @@ msgid "Delete this&older"
msgstr ""
msgid "km/h"
-msgstr ""
+msgstr "km/h"
msgid "Track name: "
-msgstr ""
+msgstr "Názov stopy: "
msgid "Update IRS adjustment layer"
msgstr ""
@@ -23142,6 +25383,8 @@ msgid ""
"Maximum number of nodes to generate before bailing out (before simplifying "
"lines). Default 50000."
msgstr ""
+"Maximálny počet bodov na tvorbu pred sanáciou (pred zjednodušením línií). "
+"Štandardne 50000."
msgid ""
"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
@@ -23258,11 +25501,8 @@ msgstr "Automaticky vystředit"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Udržovat vrstvu LiveGPS vystředěnou na současné pozici."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
-msgstr ""
+msgstr "Otvoriť MapDust"
msgid "MapDust bug reports"
msgstr ""
@@ -23315,29 +25555,54 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Relace založená na rolích byla zkopírována na všechny nové "
+"cesty.<br>Mělo by být ověřeno, zda je zkopírování správné a případně "
+"opraveno.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Členství v relaci bylo zkopírováno na všechny nové cesty.<br>Mělo by "
+"být ověřeno, zda je zkopírování správné a případně opraveno.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Vložte klíč tagu, t.j. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Vložte hodnotu tagu, t.j. <strong><tt>zkontrolovat "
+"členy</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan Left"
msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "Pridť zákaz zabočenia vľavo pre sadu zo 4 alebo 5 ciest."
msgid "Please select 4 or 5 ways to assign no left turns."
-msgstr ""
+msgstr "Prosím vybrať 4 alebo 5 ciest na priradenie zákazu zabočenia v ľavo."
msgid "Please select 4 ways that form a closed relation."
-msgstr ""
+msgstr "Prosím označte 4 cesty, ktoré tvoria uzavretú reláciu."
msgid "Unable to order the ways. Please verify their directions"
-msgstr ""
+msgstr "Pre neschopnosť usporiadať cesty. Prosím skontrolovať ich smery"
msgid "Create Michigan left turn restriction"
-msgstr ""
+msgstr "Vytvoriť Michigan zákaz odbočenia vľavo"
msgid "Unable to find via nodes. Please check your selection"
msgstr ""
+"Nie som schopný nájsť sprostredkujúce body. Prosím skontrolujte váš výber."
msgid ""
"XAPI query, e.g., '''' (to download all data), ''[highway=*]'', or "
@@ -23359,6 +25624,15 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
+msgid "Download from Overpass API ..."
+msgstr ""
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr ""
@@ -23371,15 +25645,6 @@ msgstr ""
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Převést na multipolygon"
-
-msgid "Convert to multipolygon."
-msgstr "Převést na multipolygon."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Jedna z vybraných cest je již součástí jiného multipolygonu."
-
msgid "About Plugin"
msgstr "O pluginu"
@@ -23409,13 +25674,13 @@ msgid "No, just keep it"
msgstr ""
msgid "Close the dialog and discard all changes"
-msgstr ""
+msgstr "Zavrieť okno a zahodiť všetky zmeny"
msgid "Proceed and go to the next page"
msgstr ""
msgid "Finish"
-msgstr ""
+msgstr "Dokončiť"
msgid "Confirm the setup and close this dialog"
msgstr ""
@@ -23463,10 +25728,10 @@ msgid "proxy password"
msgstr ""
msgid "oauth key"
-msgstr ""
+msgstr "oauth kľúč"
msgid "oauth secret"
-msgstr ""
+msgstr "oauth heslo"
msgid ""
"<br><strong>Warning:</strong> There may be sensitive data left in your "
@@ -23483,7 +25748,7 @@ msgid "Use {0}"
msgstr ""
msgid "Encrypt data with Windows logon credentials"
-msgstr ""
+msgstr "Zakódovať údaje s prihlasovacími údajmi Windows"
msgid "The native password manager plugin detected {0} on your system."
msgstr ""
@@ -23514,39 +25779,45 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
-msgstr ""
+msgstr "CSV súbory"
msgid "XLS files"
-msgstr ""
+msgstr "XLS súbory"
msgid "ODS files"
-msgstr ""
+msgstr "ODS súbory"
msgid "Shapefiles"
-msgstr ""
+msgstr "shp súbory"
msgid "MapInfo files"
-msgstr ""
+msgstr "MapInfo súbory"
msgid "KML/KMZ files"
-msgstr ""
+msgstr "KML/KMZ súbory"
msgid "GML files"
-msgstr ""
+msgstr "GML súbory"
msgid "Zip Files"
+msgstr "zip súbory"
+
+msgid "7Zip Files"
msgstr ""
msgid "OpenData XML files"
+msgstr "OpenData XML súbory"
+
+msgid "Download open data"
msgstr ""
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23554,7 +25825,7 @@ msgid "Accept"
msgstr "Přijmout"
msgid "Refuse"
-msgstr ""
+msgstr "Odmietnuť"
msgid "I understand and accept these terms and conditions"
msgstr ""
@@ -23602,7 +25873,7 @@ msgid "Update modules"
msgstr ""
msgid "Update the selected modules"
-msgstr ""
+msgstr "Aktualizovať vybrané moduly"
msgid "Please restart JOSM to activate the downloaded modules."
msgstr ""
@@ -23695,6 +25966,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23711,6 +25985,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23949,16 +26234,8 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Stala se chyba : {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Nelze vytvořit novou chybu. Výsledek: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Hlavička obsahuje několik hodnot a nelze ji mapovat do jednoduchého řetězce"
-
msgid "Process queue"
-msgstr ""
+msgstr "Proces poradia"
msgid "Open OpenStreetBugs"
msgstr "Otevřít OpenStreetBugs"
@@ -24013,18 +26290,6 @@ msgstr ""
msgid "Close: "
msgstr "Uzavřít: "
-msgid "New issue"
-msgstr "Nový problém"
-
-msgid "Create issue"
-msgstr "Vytvořit problém"
-
-msgid "Describe the problem precisely"
-msgstr "Podrobně popište problém"
-
-msgid "Create: "
-msgstr "Vytvořit: "
-
msgid "Open in browser"
msgstr ""
@@ -24082,6 +26347,9 @@ msgid "Firefox executable"
msgstr "Spustitelný soubor Firefoxu"
msgid "OSM Server Files pbf compressed"
+msgstr "Súbory OSM servera skomprimované v pbf"
+
+msgid "Download PBF"
msgstr ""
msgid "Invalid changeset id: {0}"
@@ -24291,9 +26559,6 @@ msgstr "Import PDF souboru."
msgid "Import PDF"
msgstr "Import PDF"
-msgid "Import PDf file"
-msgstr "Import PDF souboru"
-
msgid " {0} objects so far"
msgstr " zatím {0} objektů"
@@ -24317,7 +26582,7 @@ msgstr "Zapsat souřadnice do hlavičky obrázku"
msgid ""
"Write position information into the exif header of the following files:"
-msgstr ""
+msgstr "Zapíše informáciu o polohe do hlavičky EXIF nasledujúcich súborov:"
msgid "settings"
msgstr "nastavení"
@@ -24335,7 +26600,7 @@ msgid "to previous value (unchanged mtime)"
msgstr "na předchozí hodnotu (nezměněný čas)"
msgid "Photo Geotagging Plugin"
-msgstr ""
+msgstr "Photo Geotagging Plugin"
msgid "Writing position information to image files..."
msgstr "Zápis informací o poloze do souborů s obrázky…"
@@ -24353,7 +26618,7 @@ msgid "Could not rename file!"
msgstr "Nepovedlo se přejmenování souboru!"
msgid "<html><h3>There are old backup files in the image directory!</h3>"
-msgstr ""
+msgstr "<html><h3>Existujú staré zálohy súborov v adresári obrázkov!</h3>"
msgid "Override old backup files?"
msgstr "Přepsat staré záložní soubory?"
@@ -24373,8 +26638,26 @@ msgstr "Test selhal: nelze přečíst čas modifikace."
msgid "Test failed: Could not write mtime."
msgstr "Test selhal: nelze zapsat čas modifikace."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -24404,13 +26687,13 @@ msgid "Calibration reset"
msgstr ""
msgid "Save Picture Calibration..."
-msgstr ""
+msgstr "Ukladám kalibráciu obrázka ..."
msgid "Saves calibration data to a file"
-msgstr ""
+msgstr "Kalibračné údaje uložené do súboru"
msgid "Saving file failed: {0}"
-msgstr ""
+msgstr "Uloženie súboru zlyhalo: {0}"
msgid "New picture layer from clipboard"
msgstr "Nová vrstva s obrázkem ze schránky"
@@ -24435,7 +26718,7 @@ msgid "Moved"
msgstr ""
msgid "Drag to move the picture"
-msgstr ""
+msgstr "Pretiahnite obrázok"
msgid "PicLayer rotate"
msgstr "PicLayer otočení"
@@ -24444,7 +26727,7 @@ msgid "Rotated"
msgstr ""
msgid "Drag to rotate the picture"
-msgstr ""
+msgstr "Ťahajte pre otočenie obrázka"
msgid "PicLayer scale X"
msgstr "PicLayer měřítko X"
@@ -24453,7 +26736,7 @@ msgid "Scaled by X"
msgstr ""
msgid "Drag to scale the picture in the X Axis"
-msgstr ""
+msgstr "Dotiahnuť do mierky obrázka v osi X"
msgid "PicLayer scale"
msgstr "PicLayer měřítko"
@@ -24462,7 +26745,7 @@ msgid "Scaled"
msgstr ""
msgid "Drag to scale the picture in the X and Y Axis"
-msgstr ""
+msgstr "Dotiahnuť do mierky obrázka v osi X a Y"
msgid "PicLayer scale Y"
msgstr "PicLayer měřítko Y"
@@ -24471,25 +26754,25 @@ msgid "Scaled by Y"
msgstr ""
msgid "Drag to scale the picture in the Y Axis"
-msgstr ""
+msgstr "Ťahať na mierku obrázku v osi Y"
msgid "PicLayer shear"
-msgstr ""
+msgstr "PicLayer skosenie"
msgid "Sheared"
msgstr ""
msgid "Drag to shear the picture"
-msgstr ""
+msgstr "Pretiahnite pre skosenie obrázka"
msgid "PicLayer Move point"
-msgstr ""
+msgstr "PicLayer premiestnenie bodu"
msgid "Point added/moved"
msgstr ""
msgid "Drag or create point on the picture"
-msgstr ""
+msgstr "Premiestniť alebo vytvoriť bod na obrázku"
msgid "PicLayer Remove point"
msgstr ""
@@ -24501,7 +26784,7 @@ msgid "Remove point on the picture"
msgstr ""
msgid "PicLayer Transform point"
-msgstr ""
+msgstr "PicLayer transformácia bodu"
msgid "Point transformed"
msgstr ""
@@ -24516,10 +26799,10 @@ msgid "Calibration Files"
msgstr "Kalibrační súbory"
msgid "Could not find the map object."
-msgstr ""
+msgstr "Nepodarilo sa nájsť objekt na mape."
msgid "PicLayer failed to load or import the image."
-msgstr ""
+msgstr "PicLayer zlyhal pri načítavaní alebo importovaní obrázku."
msgid "Nothing in clipboard"
msgstr "Ve schránce nic není"
@@ -24527,6 +26810,10 @@ msgstr "Ve schránce nic není"
msgid "The clipboard data is not an image"
msgstr "Data ve schránce nejsou obrázek"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Varovanie: Nepodarilo sa spracovať zip súbor ''{0}''. Výnimka bola: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -24548,6 +26835,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24576,55 +26866,55 @@ msgid "Osmosis polygon filter files"
msgstr ""
msgid "Print..."
-msgstr ""
+msgstr "Tlač..."
msgid "Print the map"
-msgstr ""
+msgstr "Vytlačiť mapu"
msgid "Print the Map"
-msgstr ""
+msgstr "Vytlačiť mapu"
msgid "Printer"
-msgstr ""
+msgstr "Tlačiareň"
msgid "Media"
msgstr ""
msgid "Orientation"
-msgstr ""
+msgstr "Orientácia"
msgid "Printer settings"
-msgstr ""
+msgstr "Nastavenie tlačiarne"
msgid "Scale"
-msgstr ""
+msgstr "Mierka"
msgid "Resolution"
-msgstr ""
+msgstr "Rozlíšenie"
msgid "Map information"
-msgstr ""
+msgstr "Informácie o mape"
msgid "Map Preview"
-msgstr ""
+msgstr "Náhľad mapy"
msgid "Zoom To Page"
-msgstr ""
+msgstr "Celá stránka"
msgid "Zoom To Actual Size"
-msgstr ""
+msgstr "Skutočná veľkosť"
msgid "Print"
-msgstr ""
+msgstr "Tlač"
msgid "Printing has been cancelled."
-msgstr ""
+msgstr "Tlač bola zrušená."
msgid "Printing stopped"
-msgstr ""
+msgstr "Tlač zastavená"
msgid "Printing has failed."
-msgstr ""
+msgstr "Tlač zlyhala."
msgid "Proj4J: {0} selected"
msgstr ""
@@ -24767,10 +27057,10 @@ msgid " [ID] {0}"
msgstr ""
msgid "Route patterns ..."
-msgstr ""
+msgstr "Vzory trás"
msgid "Edit Route patterns for public transport"
-msgstr ""
+msgstr "Upraviť vzory trás liniek pre hromadnú dopravu"
msgid "Route Patterns"
msgstr ""
@@ -24779,13 +27069,13 @@ msgid "Overview"
msgstr "Přehled"
msgid "Itinerary"
-msgstr ""
+msgstr "Cestovný poriadok"
msgid "Stops"
msgstr "Zastávky"
msgid "Meta"
-msgstr ""
+msgstr "Doplňujúce informácie"
msgid "Existing route patterns:"
msgstr ""
@@ -24827,7 +27117,7 @@ msgid "Public Transport: Change stop type"
msgstr ""
msgid "Create Stops from GPX ..."
-msgstr ""
+msgstr "Vytváranie zastávok z GPX ..."
msgid "Create Stops from a GPX file"
msgstr "Vytvořit zastávky z GPX souboru"
@@ -24841,9 +27131,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24912,9 +27199,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24964,7 +27248,7 @@ msgid "Admin level"
msgstr ""
msgid "Create a relation from selected objects"
-msgstr ""
+msgstr "Vytvoriť reláciu z vybraných objektov"
msgid "Choose a type for the relation:"
msgstr ""
@@ -24973,7 +27257,7 @@ msgid "Delete relation"
msgstr "Smazat relaci"
msgid "Download incomplete members for the chosen relation"
-msgstr ""
+msgstr "Stiahnuť nekompletných členov vybranej relácie"
msgid "Download referrers"
msgstr "Stáhnout odkazující objekty"
@@ -25009,7 +27293,7 @@ msgid "Select relation in main selection."
msgstr "Vybere relaci v hlavním výběru."
msgid "Fix roles of the chosen relation members"
-msgstr ""
+msgstr "Opraviť úlohy vybratých členov relácie"
msgid "Complete multipolygon for way {0}"
msgstr ""
@@ -25041,9 +27325,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "Restartovat JOSM"
-
msgid "Revert changeset fully"
msgstr "Vrátit zpět celou sadu změn"
@@ -25065,9 +27346,12 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
-msgid "Missing merge target for {0} with id {1}"
+msgid "It is not allowed to revert changeset from {0}"
msgstr ""
+msgid "Missing merge target for {0} with id {1}"
+msgstr "Chýba zlučovaný cieľ pre {0} s id {1}"
+
msgid "Objects history"
msgstr "Historie objektů"
@@ -25075,7 +27359,7 @@ msgid "History reverter"
msgstr ""
msgid "Preparing history data..."
-msgstr ""
+msgstr "Pripravujem dáta histórie..."
msgid "Remote Control has been asked to revert a changeset."
msgstr ""
@@ -25097,56 +27381,79 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
-msgid "Road Sign Plugin"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
+"Upozornenie: Nepodporovaný začiatočný prvok ''{0}'' v obsahu zmenového "
+"súboru na pozícii ({1},{2}). Vynechávam."
-msgid "signs"
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
+"Upozornenie: Nepodporovaný koncový prvok ''{0}'' v obsahu zmenového súboru "
+"na pozícii ({1},{2}). Vynechávam."
+
+msgid "Road Sign Plugin"
+msgstr "Plugin Dopravné značky (Road Sign Plugin)"
+
+msgid "signs"
+msgstr "dopravné značky"
+
+msgid "Change Properties"
+msgstr "Změnit vlastnosti"
msgid "Country preset:"
-msgstr ""
+msgstr "Prednastavenie krajiny:"
msgid "Show all signs"
-msgstr ""
+msgstr "Zobrazovať všetky značky"
msgid "Show a selection of the most useful signs"
-msgstr ""
+msgstr "Zobrazovať výber najdôležitejších značiek"
+
+msgid "Spain"
+msgstr "Španielsko"
msgid "Germany"
-msgstr ""
+msgstr "Nemecko"
msgid "Poland"
-msgstr ""
+msgstr "Poľsko"
msgid "Slovakia"
-msgstr ""
+msgstr "Slovensko"
msgid "Roadsign tagging"
-msgstr ""
+msgstr "Dopravné značky"
msgid "Add tags by clicking on road signs"
-msgstr ""
+msgstr "Pridajte značky kliknutím na dopravné značky"
msgid "Roadsigns plugin: open dialog"
-msgstr ""
+msgstr "Plugin Dopravné značky: otvoriť dialóg"
msgid "custom"
-msgstr ""
+msgstr "prispôsobené"
msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "Nepodarilo sa načítať zdroj prednastavených značiek: ''{0}''"
msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "Chyba pri čítaní prednastavených značiek z ''{0}'':\n"
msgid "Sign {0}"
-msgstr ""
+msgstr "Dopravná značka {0}"
msgid "Additional sign {0}"
-msgstr ""
+msgstr "Doplňujúca dopravná značka {0}"
msgid "Edit relation"
msgstr "Upravit relaci"
@@ -25200,7 +27507,7 @@ msgid "Fastest"
msgstr "Nejrychlejší"
msgid "Ignore oneways"
-msgstr ""
+msgstr "Ignorovať jednosmerky"
msgid "Reverse route"
msgstr "Obrátit cestu"
@@ -25217,9 +27524,6 @@ msgstr "Nastavení pluginu routing"
msgid "Configure routing preferences."
msgstr "Nastavení předvoleb směrování"
-msgid "Highway type"
-msgstr "Typ silnice"
-
msgid "Speed (Km/h)"
msgstr "Rychlost (Km/h)"
@@ -25258,13 +27562,13 @@ msgid "SDS data file"
msgstr ""
msgid "Load..."
-msgstr ""
+msgstr "Načítať..."
msgid "Load separate data store data from a file."
msgstr ""
msgid "Loading files"
-msgstr ""
+msgstr "Načítajú sa súbory"
msgid "SDS"
msgstr ""
@@ -25285,7 +27589,7 @@ msgid "Configures access to the Separate Data Store."
msgstr ""
msgid "Server"
-msgstr ""
+msgstr "Server"
msgid "The URL under which the SDS server can be contacted."
msgstr ""
@@ -25317,19 +27621,19 @@ msgid "SDS password"
msgstr ""
msgid "Test credentials now"
-msgstr ""
+msgstr "Otestovať prihlasovacie údaje"
msgid "SDS tag prefix"
msgstr ""
msgid "Connection successful."
-msgstr ""
+msgstr "Spojenie úspešné"
msgid "Cannot connect to SDS server: "
msgstr ""
msgid "Save..."
-msgstr ""
+msgstr "Uložiť..."
msgid "Save the current separate data store information to a file."
msgstr ""
@@ -25337,6 +27641,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Nemohu zálohovat soubor. Vyjímka: {0}"
+
msgid "Simplify Area"
msgstr "Zjednodušit plochu"
@@ -25397,19 +27704,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
-msgstr "Online nápověda"
+msgid "SeaMap Editor"
+msgstr ""
-msgid "Load"
-msgstr "Načíst"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "neviditelný"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25439,13 +27746,13 @@ msgid "Surveyor"
msgstr "Surveyor"
msgid "Could not read surveyor definition: {0}"
-msgstr ""
+msgstr "Nemôžem čítať meračské rozlíšenie: {0}"
msgid "Error parsing {0}: {1}"
msgstr "Chyba při čtení {0}: {1}"
msgid "Surveyor waypoint layer"
-msgstr ""
+msgstr "Vrstva bodov pre plugin Surveyor"
msgid "{0} start"
msgstr "{0} začátek"
@@ -25454,7 +27761,7 @@ msgid "{0} end"
msgstr "{0} konec"
msgid "Waypoint Description"
-msgstr ""
+msgstr "Popis bodov"
msgid "Surveyor Actions"
msgstr ""
@@ -25520,7 +27827,7 @@ msgid "Enter housenumbers or amount of segments"
msgstr "Zadejte domovní čísla nebo počet částí"
msgid "Terrace a house"
-msgstr ""
+msgstr "Radové domy"
msgid "Interpolation"
msgstr "Interpolace"
@@ -25529,7 +27836,7 @@ msgid "Lowest Number"
msgstr "Nejnižší číslo"
msgid "Lowest housenumber of the terraced house"
-msgstr ""
+msgstr "Najnižšie číslo domu v radovej zástavbe"
msgid "Highest Number"
msgstr "Nejvyšší číslo"
@@ -25549,6 +27856,9 @@ msgstr "smazat vnější obrys"
msgid "Street name: "
msgstr "Jméno ulice: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Sudé/Liché"
@@ -25562,10 +27872,10 @@ msgid "Lowest housenumber cannot be higher than highest housenumber"
msgstr "Nejnižší číslo domu nemůže být vyšší než nejvyšší číslo domu"
msgid "Housenumbers do not match odd/even setting"
-msgstr ""
+msgstr "Čísla domov sa nezhodujú s nastavením nepárne/párne"
msgid "Segment must be a number greater 1"
-msgstr ""
+msgstr "Počet segmentov musí byť číslo väčšie ako 1"
msgid "{0} must be greater than 0"
msgstr "{0} musí být větší než 0"
@@ -25610,7 +27920,7 @@ msgid "Browse"
msgstr "Prohlížet"
msgid "Browse map with left button"
-msgstr ""
+msgstr "Prezerať mapu s ľavým tlačidlom"
msgid "Merge objects nodes"
msgstr "Sloučit uzly objektů"
@@ -25624,6 +27934,95 @@ msgstr "Trasovač."
msgid "Tracer building"
msgstr "Tracer budov"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -25639,9 +28038,6 @@ msgstr "Uložit podpisy do XML..."
msgid "Save Signatures file"
msgstr "Uložit soubor s podpisy"
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25663,6 +28059,10 @@ msgstr "Načíst objekty ze serveru"
msgid "Download signed data"
msgstr "Stáhnout podepsaná data"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Upozornenie: Ignorujem výnimku, pretože úloha bola zrušená. Výnimka: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25815,9 +28215,6 @@ msgstr "Podepisování přerušeno!"
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25984,36 +28381,38 @@ msgid ""
"Cannot add object ''{0}'' as relation member because it is deleted or "
"invisible in layer ''{1}''"
msgstr ""
+"Nemožno pridať objekt ''{0}'' ako člena relácie, pretože je odstránená, "
+"alebo neviditeľné vo vrstve ''{1}''"
msgid "Clear the selected roles or delete the selected members"
-msgstr ""
+msgstr "Vymazať vybrané úlohy alebo odstrániť vybraných členov"
msgid "Insert new relation members from object in the clipboard"
-msgstr ""
+msgstr "Vložiť nových členov relácie zo schránky"
msgid "Move the selected relation members down by one position"
-msgstr ""
+msgstr "Presunutie vybratých členov relácie dole o jednu pozíciu"
msgid "Move the selected relation members up by one position"
-msgstr ""
+msgstr "Presunutie vybratých členov relácie hore o jednu pozíciu"
msgid "Edit basic attributes of a turn restriction"
-msgstr ""
+msgstr "Upraviť základné atribúty zákazu odbočenia"
msgid "Edit the raw tags and members of this turn restriction"
-msgstr ""
+msgstr "Upraviť raw značky a členov tohto zákazu odbočenia"
msgid "Errors/Warnings"
msgstr "Chyby/Varování"
msgid "Show errors and warnings related to this turn restriction"
-msgstr ""
+msgstr "Zobraziť chyby a varovania týkajúce sa tohto zákazu odbočenia"
msgid "Create a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "Vytvoriť nový zákaz odbočenia vo vrstve ''{0}''"
msgid "Edit a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "Upraviť nový zákaz odbočenia vo vrstve ''{0}''"
msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
msgstr "Upravit zákaz odbočení ''{0}'' ve vrstvě ''{1}''"
@@ -26065,6 +28464,8 @@ msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
"removed.<br>How to you want to proceed?"
msgstr ""
+"Aktualizácia tohto zákazu odbočenia nemôže byť uložená, iba ak vymazané "
+"členy sú odstránené.<br>Ako chcete pokračovať?"
msgid "Remove deleted members and save"
msgstr "Odstranit smazané členy a uložit"
@@ -26076,16 +28477,19 @@ msgid "Deleted members in turn restriction"
msgstr "Smazané členy v zákaze odbočení"
msgid "Create a conflict and close this turn restriction editor"
-msgstr ""
+msgstr "Spôsobiť konflikt a zavrieť editor zákazu odbočenia"
msgid "Return to the turn restriction editor and resume editing"
-msgstr ""
+msgstr "Návrat do editora zákazu odbočenia a pokračovať v úprave"
msgid ""
"<html>This turn restriction has been changed outside of the editor.<br>You "
"cannot apply your changes and continue editing.<br><br>Do you want to create "
"a conflict and close the editor?</html>"
msgstr ""
+"<html>Tento zákaz odbočenia bol zmenený mimo editora.<br>Nemôžete použiť "
+"vaše zmeny a pokračovať v úprave.<br>Chcete spôsobiť konflikt a zatvoriť "
+"editor?</html>"
msgid "Already participating in a conflict"
msgstr "Již se účasní v konfliktu"
@@ -26098,6 +28502,7 @@ msgstr "Vybrat tento zákaz odbočení"
msgid "Activate the layer this turn restriction belongs to and zoom to it"
msgstr ""
+"Aktivovať vrstvu, ku ktorej patrí tento zákaz odbočenia a priblížiť naňho"
msgid "{0} warning"
msgid_plural "{0} warnings"
@@ -26134,6 +28539,7 @@ msgstr "Vytvořit nové pravidlo odbočování"
msgid "Launch the turn restriction editor to create a new turn restriction"
msgstr ""
+"Spustenie editora zákazu odbočenia pre vytvorenie nového zákazu odbočenia"
msgid "No Right Turn"
msgstr "Zákaz odbočení vpravo"
@@ -26157,7 +28563,7 @@ msgid "Only Straight On"
msgstr "Přikázaný směr jízdy přímo"
msgid "Warning: failed to load icon for turn restriction type ''{0}''"
-msgstr ""
+msgstr "Upozornenie: nepodarilo sa načítať ikonu pre typ obmedzenia ''{0}''"
msgid "please select a turn restriction type"
msgstr "prosím vyberte typ pravidla"
@@ -26191,24 +28597,26 @@ msgid "Use non-standard exceptions"
msgstr "Použít nestandardní vyjímky"
msgid "Remove the currently selected vias"
-msgstr ""
+msgstr "Vymazať aktuálne vybraté \"cez (via)\" objekty"
msgid "Move the selected vias down by one position"
-msgstr ""
+msgstr "Presunutie vybratých \"cez (via)\" objektov dole o jednu pozíciu"
msgid "Move the selected vias up by one position"
-msgstr ""
+msgstr "Presunutie vybratých \"cez (via)\" objektov hore o jednu pozíciu"
msgid "Copy the selected vias to the clipboard"
-msgstr ""
+msgstr "Kopírovať vybrané \"cez (via)\" objekty do schránky"
msgid "Insert ''via'' objects from the clipboard"
-msgstr ""
+msgstr "Vložiť ''cez (via)'' objekty zo schránky"
msgid ""
"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
"''via''."
msgstr ""
+"Nepodarilo sa získať OSM objekt s id {0} z dátového súboru {1}. Nemožno "
+"pridať ako \"cez (via)\"."
msgctxt "turnrestrictions"
msgid "From:"
@@ -26219,10 +28627,10 @@ msgid "To:"
msgstr "Do:"
msgid "no participating way with role ''from''"
-msgstr ""
+msgstr "nezúčastňujúca sa cesta s funkciou ''z (from)''"
msgid "no participating way with role ''to''"
-msgstr ""
+msgstr "nezúčastňujúca sa cesta s funkciou ''do (to)''"
msgid "Only participating in selection"
msgstr "Pouze k vybraným objektům"
@@ -26251,10 +28659,10 @@ msgid "Create a new turn restriction"
msgstr "Vytvořit nový zákaz odbočení"
msgid "Set the current JOSM selection to the selected turn restrictions"
-msgstr ""
+msgstr "Nastaviť aktuálny JOSM výber na vybrané zákazy odbočenia"
msgid "Select in current data layer"
-msgstr ""
+msgstr "Vyberte v aktuálnej dátovej vrstve"
msgid "Zoom to the currently selected turn restrictions"
msgstr "Přiblížit na aktuálně vybrané omezenáí odbočení"
@@ -26270,7 +28678,7 @@ msgstr ""
"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgid "Configure the preferences for the turnrestrictions plugin"
-msgstr ""
+msgstr "Nastaviť predvoľby pre plugin zákaz odbočenia"
msgid "Sponsor"
msgstr "Sponzor"
@@ -26300,6 +28708,8 @@ msgid ""
"Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
"Assuming the default value ''set-a''."
msgstr ""
+"Upozornenie: nastavený kľúč ''{0}'' má nepodporovanú hodnotu ''{1}''. Za "
+"predpokladu, že sú východiskové hodnoty ''sady-a''."
msgid ""
"This turn restriction uses the way <span class=\"object-name\">{0}</span> "
@@ -26326,6 +28736,7 @@ msgstr "Opravit v editoru"
msgid ""
"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
msgstr ""
+"Prejsť do Základného Editora a ručne zvoliť členov s funkciou ''z'' a ''na''"
msgid ""
"This turn restriction uses a non-standard restriction type <tt>{0}</tt> for "
@@ -26337,7 +28748,7 @@ msgstr ""
"Vyberte se prosím jednu z možností v základním editoru."
msgid "Go to Basic Editor and manually choose a turn restriction type"
-msgstr ""
+msgstr "Prejsť na Základný Editor a ručne zvoliť typ zákazu odbočenia"
msgid ""
"The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
@@ -26367,48 +28778,56 @@ msgstr ""
"základním editoru."
msgid "A way with role <tt>from</tt> is required in a turn restriction."
-msgstr ""
+msgstr "Cesta s úlohou <tt>z (from)</tt> je potrebná pri zákaze odbočenia."
msgid "A way with role <tt>to</tt> is required in a turn restriction."
-msgstr ""
+msgstr "Cesta s úlohou <tt>do (to)</tt> je potrebná pri zákaze odbočenia."
msgid "Please go to the Basic editor and manually choose a way."
msgstr "Otevřete si prosím základní editor a vyberte cestu manuálně."
msgid "Add in editor"
-msgstr ""
+msgstr "Pridať do editora"
msgid "Add a way with role ''from''"
-msgstr ""
+msgstr "Pridať cestu s úlohou \"z (from)\""
msgid "Add a way with role ''to''"
-msgstr ""
+msgstr "Pridať cestu s úlohou \"do (to)\""
msgid ""
"The two ways participating in the turn restriction <strong>aren''t "
"connected.</strong>"
-msgstr ""
+msgstr "Cesty v zákaze odbočenia <strong>nie sú spojené.</strong>"
msgid ""
"Make sure you add one or more via objects (nodes or ways) to the turn "
"restriction."
msgstr ""
+"Uistite sa že zákaz odbočenia obsahuje jeden alebo viac cez (via) objektov "
+"(body alebo cesty)."
msgid "Go to the Advanced Editor and add via objects"
-msgstr ""
+msgstr "Prejsť na rozšírený editor a pridať \"cez (via)\" objekty."
msgid ""
"A turn restriction requires exactly one way with role <tt>from</tt>. This "
"turn restriction has {0} ways in this role. Please remove {1} of them."
msgstr ""
+"Zákaz odbočenia vyžaduje presne jednu cestu s funkciou <tt>z (from)</tt>. "
+"Tento zákaz odbočenia má {0} cesty v tejto funkcii. Prosím odstráňte {1} z "
+"nich."
msgid ""
"A turn restriction requires exactly one way with role <tt>to</tt>. This turn "
"restriction has {0} ways in this role. Please remove {1} of them."
msgstr ""
+"Zákaz odbočenia vyžaduje presne jednu cestu s funkciou <tt>do (to)</tt>. "
+"Tento zákaz odbočenia má {0} cesty v tejto funkcii. Prosím odstráňte {1} z "
+"nich."
msgid "Go to the Advanced Editor and remove the members"
-msgstr ""
+msgstr "Prejsť na pokročilý editor a odstrániť členov"
msgid ""
"The tag <tt>except</tt> has the non-standard value <tt>{0}</tt>. It is "
@@ -26419,6 +28838,8 @@ msgstr ""
msgid "Go to Basic Editor and select standard vehicle type based exceptions"
msgstr ""
+"Prejdite na základný editor a vyberte štandardný typ vozidla na základe "
+"výnimky"
msgid "The required tag <tt>{0}={1}</tt> is missing."
msgstr "Povinný tag <tt>{0}={1}</tt> chybí."
@@ -26445,28 +28866,35 @@ msgid ""
"be split at node <span class=\"object-name\">{2}</span> where it connects to "
"way <span class=\"object-name\">{3}</span>."
msgstr ""
+"Cesta <span class=\"object-name\">{0}</span> s úlohou <tt>{1}</tt> by mala "
+"byť rozdelená v bode <span class=\"object-name\">{2}</span> kde sa pripája "
+"na cestu <span class=\"object-name\">{3}</span>."
msgid "Split now"
msgstr "Rozdělit teď"
msgid "Split the ways"
-msgstr ""
+msgstr "Rozdelí cesty"
msgid ""
"This turn restriction uses the node <span class=\"object-name\">{0}</span> "
"as member with role <tt>{1}</tt>."
msgstr ""
+"Tento zákaz odbočenia používa bod <span class=\"object-name\">{0}</span> ako "
+"člena s úlohou <tt>{1}</tt>."
msgid ""
"This turn restriction uses the relation <span class=\"object-"
"name\">{0}</span> as member with role <tt>{1}</tt>."
msgstr ""
+"Tento zákaz odbočenia používa reláciu <span class=\"object-name\">{0}</span> "
+"ako člena s úlohou <tt>{1}</tt>."
msgid "A way is required instead."
-msgstr ""
+msgstr "Je vyžadovaná cesta."
msgid "Delete the member from the turn restriction"
-msgstr ""
+msgstr "Vymazať člena zo zákazu odbočenia"
msgid "Change to the Basic Editor and select a way"
msgstr "Přejít do základního editoru a vybrat cestu"
@@ -26477,19 +28905,19 @@ msgstr "Obnovit objekt..."
msgid "Undelete object by id"
msgstr "Obnovit objekt podle id"
-msgid "Select if the data should be added into a new layer"
-msgstr "Vyberte, pokud se mají data přidat do nové vrstvy"
+msgid "Undelete Object"
+msgstr "Obnovit objekt"
+
+msgid "Undelete object"
+msgstr "Obnovit objekt"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr "Obnovit objekt"
-
-msgid "Undelete object"
-msgstr "Obnovit objekt"
+msgid "Select if the data should be added into a new layer"
+msgstr "Vyberte, pokud se mají data přidat do nové vrstvy"
msgid "Start undeleting"
msgstr "Začít obnovování"
@@ -26497,18 +28925,6 @@ msgstr "Začít obnovování"
msgid "Close dialog and cancel"
msgstr "Zavřít dialog a zrušit"
-msgid "Will get {0}"
-msgstr "Dostanu {0}"
-
-msgid "Looking for {0}"
-msgstr "Hledám {0}"
-
-msgid "Found {0}"
-msgstr "Nalezeno {0}"
-
-msgid "More tools"
-msgstr "Další nástroje"
-
msgid "Add nodes at intersections"
msgstr "Přidat uzly na průsečíkách"
@@ -26519,46 +28935,39 @@ msgid "Please select one or more ways with intersections of segments."
msgstr ""
msgid "Align Way Nodes"
-msgstr ""
+msgstr "Zarovnať body cesty"
msgid "Align nodes in a way"
-msgstr ""
+msgstr "Zarovnať body v ceste"
msgid "The way with selected nodes can not be straightened."
-msgstr ""
+msgstr "Cesta s vybranými bodmi nemôže byť vyrovnaná."
msgid "Internal error: number of nodes is {0}."
-msgstr ""
+msgstr "Interná chyba: počet bodov je {0}."
msgid "Extract node"
msgstr "Vyjmout bod"
msgid "Extracts node from a way"
-msgstr ""
+msgstr "Extrahuje bod z cesty"
msgid ""
"This tool extracts node from its ways and requires single node to be "
"selected."
msgstr ""
+"Tento nástroj extrahuje bod z jeho cesty a potrebuje aby bol vybratý samotný "
+"bod."
msgid "Extract node from line"
msgstr "Vyjme bod z cesty"
msgid "Paste Relations"
-msgstr ""
+msgstr "Prilepiť relácie"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
-msgstr ""
-
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
+msgstr "Vložiť členstvo relácie z objektov v zásobníku ma vybraný objekt(y)"
msgid "Split Object"
msgstr "Rozdělit objekt"
@@ -26582,6 +28991,7 @@ msgid ""
"The selected way is not a split way, please select split points or split way "
"too."
msgstr ""
+"Vybraná cesta nerozdeľuje objekt, prosím zvoľte rozdeľujúce body a cestu."
msgid "The selected nodes can not be consecutive nodes in the object."
msgstr "Zvolené uzly nemohou být po sobě těsně následující uzly v objektu."
@@ -26596,6 +29006,8 @@ msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
"participating in this operation."
msgstr ""
+"Existuje viacero ciest obsahujúcich jeden z rozdeľujúcich bodov. Vyberte "
+"cesty požadované pre túto operáciu."
msgid "Symmetry"
msgstr "Symetrie"
@@ -26620,20 +29032,20 @@ msgid "Add remembered source tag"
msgstr "Přidat zapamatovaný (poslední použitý) tag source"
msgid "UnGlue Relation"
-msgstr ""
+msgstr "Odlepiť reláciu"
msgid ""
"Duplicate nodes, ways and relations that are used by multiple relations."
msgstr "Zduplikovat uzly, cest a relace používané několika relacemi"
msgid "UnGlue Relations"
-msgstr ""
+msgstr "Odlepiť relácie"
msgid "Unglued Relations"
-msgstr ""
+msgstr "Odlepené relácie"
msgid "Change relation member for {0} {1}"
-msgstr ""
+msgstr "Zmeniť člena relácie pre {0} {1}"
msgid "Circle arc"
msgstr "Kruhová výseč"
@@ -26642,19 +29054,19 @@ msgid "Create a circle arc"
msgstr "Vytvoří kruhovou výseč z posledních 3 uzlů"
msgid "Select custom URL"
-msgstr ""
+msgstr "Vybrať vlastnú URL"
msgid "Please select one of custom URLs (configured in Preferences)"
msgstr ""
msgid "Ask every time"
-msgstr ""
+msgstr "Vždy sa pýtať"
msgid "Configure custom URL"
msgstr ""
msgid "Open custom URL"
-msgstr ""
+msgstr "Otvoriť vlastnú URL"
msgid "Opens specified URL browser"
msgstr ""
@@ -26684,18 +29096,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Souřadnice"
@@ -26747,7 +29147,7 @@ msgstr ""
"deg 11' 47.60\" E</li></ul>"
msgid "Replace Geometry"
-msgstr ""
+msgstr "Nahradiť geometriu"
msgid "Replace geometry of selected object with a new one"
msgstr ""
@@ -26765,32 +29165,36 @@ msgstr ""
"nebo nahradit cestu jinou cestou."
msgid "Node belongs to way(s), cannot replace."
-msgstr ""
+msgstr "Bod patrí ceste(ám), nemôže byť nahradený."
msgid "Replace geometry for node {0}"
-msgstr ""
+msgstr "Nahradiť geometriu pre bod {0}"
msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
+msgstr "Relácia nie je multipolygón, nemôže byť použitý ako náhrada."
msgid ""
"Please select one way that exists in the database and one new way with "
"correct geometry."
msgstr ""
+"Prosím, vyberte jednu cestu, ktorá existuje v databáze a jednu novú cestu so "
+"správnou geometriou."
msgid "The ways must be entirely within the downloaded area."
-msgstr ""
+msgstr "Cesty musia byť kompletne v stiahnutej oblasti."
msgid ""
"The way to be replaced cannot have any nodes with properties or relation "
"memberships unless they belong to both ways."
msgstr ""
+"Cesta, ktorá má byť nahradená, nemôže obsahovať žiadne body s vlastnosťou "
+"členstva v relácii, pokiaľ nepatria obom cestám."
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr "Překročen limit iterací pro robustní metodu, použita zjednodušená."
msgid "Replace geometry for way {0}"
-msgstr ""
+msgstr "Nahradiť geometriu pre cestu {0}"
msgid "Adjacent nodes"
msgstr "Sousedící uzly"
@@ -26830,16 +29234,16 @@ msgstr ""
"Vyberte prosím nějakou cestu aby bylo možné určit všechny protínající cesty!"
msgid "Middle nodes"
-msgstr ""
+msgstr "Stredné body"
msgid "Select middle nodes"
-msgstr ""
+msgstr "Vybrať stredné body"
msgid "Please select two nodes connected by way!"
-msgstr ""
+msgstr "Prosím, vyberte dva body spojené cestou!"
msgid "Too many ways are added: {0}!"
-msgstr ""
+msgstr "Je pridaných príliš veľa ciest: {0}!"
msgid "All inside [testing]"
msgstr "Vše uvnitř [testování]"
@@ -26864,6 +29268,8 @@ msgid ""
"Nothing found. Please select way that is a part of some polygon formed by "
"connected ways"
msgstr ""
+"Nič sa nenašlo. Prosím, vyberte cestu, ktorá je súčasťou nejakého polygónu "
+"formovaného spojenými cestami"
msgid "Select Highway"
msgstr "Vybrat silnici"
@@ -26898,9 +29304,6 @@ msgstr "Zrušit výběr uzlů"
msgid "Removes all nodes from selection"
msgstr "Odstraní všechny uzly z výběru"
-msgid "Video"
-msgstr "Videopůjčovna/prodejna"
-
msgid "Import Video"
msgstr "Importovat video"
@@ -26920,7 +29323,7 @@ msgid "starts/pauses video playback"
msgstr "spustí/pozastaví přehrávání videa"
msgid "Video: {0}"
-msgstr ""
+msgstr "Video: {0}"
msgid "Backward"
msgstr "Zpět"
@@ -27027,8 +29430,8 @@ msgstr "smyčka"
msgid "mute"
msgstr "ztišit"
-msgid "Scanned Map..."
-msgstr "Skenovaná mapa ..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -27048,9 +29451,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers vrstva ({0}) zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Stažení cest"
@@ -27067,7 +29467,7 @@ msgstr ""
"cestu.</html>"
msgid "<html>Could not find a unique node to start downloading from.</html>"
-msgstr ""
+msgstr "<html>Nemôžem nájsť jedinečný bod pre začiatok sťahovania.</html>"
msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
msgstr "<html>K uzlu ''{0}'' nejsou připojeny žádné cesty. Přerušuji.</html>"
@@ -27086,6 +29486,10 @@ msgid ""
"''{1}''<br>Merge the duplicate node onto the currently selected node and "
"continue way downloading?</html>"
msgstr ""
+"<html>Nie sú ďalšie pripojené cesty na stiahnutie. <br>Bol zistený "
+"potenciálny duplicitný bod z práve vybraných bodov, hoci. <br>Aktuálne "
+"vybraný bod je ''{0}''<br>Potenciálny duplicitný bod je ''{1}''<br>Spojiť "
+"duplicitné body na aktuálne vybraný bod a pokračovať v sťahovaní?</html>"
msgid "Merge duplicate node?"
msgstr "Sloučit duplicitní body?"
@@ -27101,10 +29505,10 @@ msgid "Enter search expression here.."
msgstr "Sem zadejte vyhledávaný výraz"
msgid "Select waypoint to move map"
-msgstr ""
+msgstr "Vybrať waypoint na premiestnenie mapy"
msgid "Waypoint search"
-msgstr ""
+msgstr "Hľadanie waypointu"
msgid "Search after waypoint. Click and move the map view to the waypoint."
msgstr ""
@@ -27131,7 +29535,7 @@ msgid "Copy {0} template"
msgstr ""
msgid "Fetch Wikipedia articles with coordinates"
-msgstr ""
+msgstr "Získať články Wikipedie so súradnicami"
msgid ""
"Double click on item to search for object with article name (and center "
@@ -27154,19 +29558,19 @@ msgid "{0}.Wikipedia.org: {1}"
msgstr ""
msgid "Fetches all coordinates from Wikipedia in the current view"
-msgstr ""
+msgstr "Získa všetky súradnice z Wikipedie v aktuálnom zobrazení"
msgid "coordinates"
msgstr ""
msgid "Category"
-msgstr ""
+msgstr "Kategória"
msgid "Fetches a list of all Wikipedia articles of a category"
-msgstr ""
+msgstr "Získa zoznam všetkých článkov Wikipedie pre danú kategóriu"
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Zadajte kategóriu Wikipedie"
msgid "Clipboard"
msgstr ""
@@ -27178,24 +29582,22 @@ msgid "clipboard"
msgstr ""
msgid "Open Article"
-msgstr ""
+msgstr "Otvoriť článok"
msgid "Opens the Wikipedia article of the selected item in a browser"
-msgstr ""
+msgstr "Otvorí v prehliadači článok Wikipedie pre zvolenú položku"
msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Nastaví štandardný jazyk pre články Wikipedie"
msgid "Enter the Wikipedia language"
-msgstr ""
-
-msgid "Add Tag"
-msgstr ""
+msgstr "Zadajte jazyk Wikipedie"
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
+"Pridá značku \"wikipedia\" zodpovedajúci tomuto článku pre vybraté objekty"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr "Ultimativní WMS Vysokorychlostní Turbo výzva II"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index 7f47425..04f5fdf 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 05:04+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:05+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -151,13 +166,13 @@ msgid "About JOSM..."
msgstr "Ynglyn JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -200,6 +215,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -239,9 +257,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -266,6 +281,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -275,6 +293,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -329,7 +350,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -386,18 +407,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -492,6 +530,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -605,7 +646,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -755,8 +796,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -913,8 +954,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -941,12 +982,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -964,9 +1001,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1073,6 +1107,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1123,9 +1166,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1187,6 +1227,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1261,13 +1304,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1356,6 +1399,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1380,9 +1444,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1578,6 +1639,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1587,6 +1651,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1606,6 +1682,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1656,25 +1757,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1817,6 +1899,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1841,8 +1926,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1858,6 +1943,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2264,6 +2352,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2424,13 +2515,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2439,6 +2530,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2457,8 +2551,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2544,6 +2637,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2580,10 +2676,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2606,8 +2702,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2711,6 +2807,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2771,8 +2870,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2802,10 +2901,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2826,6 +2925,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2856,18 +2958,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2876,8 +2978,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2885,13 +2987,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2905,8 +3005,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2936,11 +3036,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "ANHYSBYS"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3093,8 +3192,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3201,7 +3299,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3220,6 +3318,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3236,9 +3337,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3277,6 +3375,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3301,6 +3402,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3360,13 +3470,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3436,6 +3546,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3505,6 +3633,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3562,13 +3696,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3600,10 +3734,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3737,7 +3871,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3812,6 +3946,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3842,9 +3979,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3869,10 +4003,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3935,23 +4069,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4055,7 +4172,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4251,9 +4368,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4269,10 +4401,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4281,6 +4425,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4340,6 +4487,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4367,19 +4517,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4667,29 +4804,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4704,7 +4859,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4756,14 +4911,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5013,14 +5160,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5541,6 +5688,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5624,6 +5774,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5645,9 +5822,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5672,32 +5846,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5717,8 +5891,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5744,9 +5917,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5891,9 +6061,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6178,8 +6345,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6244,34 +6411,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6286,13 +6465,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6371,12 +6550,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6406,9 +6579,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6446,7 +6625,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6506,6 +6685,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6761,6 +6943,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6826,9 +7027,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6895,20 +7093,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6919,23 +7104,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7032,7 +7203,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7131,6 +7302,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7218,7 +7392,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7237,6 +7411,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7303,8 +7483,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7379,8 +7558,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7394,8 +7573,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7610,12 +7788,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7624,6 +7796,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7639,6 +7827,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7646,8 +7849,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7759,9 +7962,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7771,6 +7971,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7787,7 +7990,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7933,7 +8136,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7963,7 +8166,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8077,6 +8280,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8114,6 +8320,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8310,9 +8519,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8331,6 +8537,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8388,6 +8597,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8454,9 +8669,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8469,7 +8681,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8496,12 +8711,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8630,14 +8849,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8652,7 +8867,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8662,8 +8877,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8883,7 +9097,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8949,6 +9163,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9006,9 +9226,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9255,6 +9472,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9383,6 +9603,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9425,6 +9651,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9475,19 +9704,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9505,40 +9725,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9562,6 +9791,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9618,6 +9880,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9671,6 +9936,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9952,7 +10222,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10121,6 +10397,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10184,7 +10466,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10442,40 +10724,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10528,8 +10810,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10538,20 +10820,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10633,14 +10920,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10684,31 +10965,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10717,6 +11003,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10732,57 +11021,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10800,6 +11091,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10829,6 +11128,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10859,7 +11201,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10899,28 +11241,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11015,6 +11355,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11030,12 +11373,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11114,7 +11465,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11213,35 +11564,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11251,8 +11578,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11279,10 +11606,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11293,9 +11617,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11317,6 +11638,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11366,8 +11690,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11510,6 +11834,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11528,6 +11855,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11552,16 +11888,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11573,6 +11912,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11587,6 +11934,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11617,19 +11973,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11651,11 +12007,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11725,13 +12093,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11874,10 +12242,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11892,22 +12260,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11976,8 +12343,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11992,9 +12358,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12316,17 +12697,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12337,9 +12712,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12371,9 +12789,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12696,6 +13128,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12775,6 +13212,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12876,9 +13317,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12934,6 +13372,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12958,9 +13399,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12986,9 +13424,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13025,6 +13460,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13071,9 +13511,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13158,6 +13595,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13248,6 +13688,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13266,10 +13750,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13281,6 +13765,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13308,18 +13795,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13329,9 +13810,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13341,13 +13819,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13395,6 +13873,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13479,6 +13960,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13583,21 +14067,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13613,10 +14106,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13652,7 +14145,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13721,12 +14214,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13742,15 +14241,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13772,6 +14262,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13781,6 +14280,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13790,10 +14292,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13826,9 +14325,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13862,19 +14358,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13886,6 +14406,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13907,55 +14430,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13976,12 +14543,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14039,6 +14621,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14048,6 +14633,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14087,9 +14678,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14123,6 +14711,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14204,18 +14807,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14288,7 +14896,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14312,10 +14923,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14327,9 +14941,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14372,18 +14983,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14483,11 +15132,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14499,11 +15146,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14522,10 +15167,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14555,9 +15200,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14573,19 +15215,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14735,6 +15393,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14756,6 +15417,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14783,6 +15450,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14807,22 +15480,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14844,9 +15501,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14910,7 +15564,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15041,6 +15695,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15071,6 +15728,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15083,9 +15743,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15095,9 +15752,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15110,6 +15772,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15134,14 +15799,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15190,7 +15847,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15244,41 +15901,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15464,6 +16121,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15485,9 +16148,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15500,6 +16169,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15539,6 +16211,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15560,22 +16235,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15599,9 +16286,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15626,7 +16310,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15699,52 +16392,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15759,6 +16446,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15771,6 +16464,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15786,37 +16482,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15906,6 +16705,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15915,6 +16720,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15981,12 +16792,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15996,6 +16861,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16005,31 +16894,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16057,7 +16952,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16084,27 +16979,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16139,12 +17022,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16154,10 +17040,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16185,6 +17071,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16222,117 +17111,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16366,33 +17291,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16426,6 +17361,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16438,7 +17389,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16501,36 +17477,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16573,19 +17567,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16724,6 +17714,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16736,60 +17738,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16805,9 +17881,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17017,41 +18090,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17060,7 +18159,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17072,12 +18171,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17129,88 +18318,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17222,6 +18514,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17237,6 +18544,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17255,11 +18565,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17368,10 +18676,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17383,7 +18691,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17404,13 +18712,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17482,7 +18796,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17503,13 +18817,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17518,7 +18832,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17546,6 +18859,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17582,40 +18901,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17627,19 +18967,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17660,6 +19000,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17669,7 +19015,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17750,6 +19096,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17879,6 +19228,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17918,24 +19273,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17945,15 +19309,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18029,6 +19384,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18083,7 +19444,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18095,6 +19456,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18170,46 +19534,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18230,6 +19597,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18392,27 +19771,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18458,19 +19866,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18494,7 +19905,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18590,18 +20001,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18611,7 +20031,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18620,10 +20043,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18641,6 +20064,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18656,28 +20082,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18698,19 +20124,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18776,9 +20202,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18788,10 +20211,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18806,9 +20232,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18836,6 +20259,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18881,10 +20307,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18896,7 +20352,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18914,7 +20370,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19031,19 +20487,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19062,13 +20629,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19077,19 +20680,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19104,142 +20716,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19278,148 +20939,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19623,6 +21347,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19644,13 +21380,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19913,9 +21643,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19937,6 +21673,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20015,9 +21754,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20102,7 +21853,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20373,15 +22124,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20552,6 +22294,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20570,12 +22315,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20711,6 +22450,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20728,6 +22470,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20808,113 +22553,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20940,7 +22699,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20990,7 +22752,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21035,6 +22797,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21092,19 +22857,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21146,27 +22976,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21562,6 +23374,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21809,12 +23624,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21824,16 +23633,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22196,9 +24002,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22253,9 +24056,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22297,25 +24117,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22452,9 +24272,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22479,12 +24296,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22633,6 +24459,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22649,6 +24478,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22882,13 +24722,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22941,18 +24774,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23010,6 +24831,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23217,9 +25041,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23299,7 +25120,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23453,6 +25292,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23474,6 +25316,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23767,9 +25612,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23838,9 +25680,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23967,9 +25806,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23991,6 +25827,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24023,15 +25862,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24041,6 +25896,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24143,9 +26001,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24261,6 +26116,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24321,19 +26179,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24471,6 +26329,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24546,6 +26407,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24561,9 +26511,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24585,6 +26532,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24737,9 +26687,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25365,7 +27312,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25373,10 +27323,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25385,18 +27332,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25439,15 +27374,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25569,18 +27495,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25758,9 +27672,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25887,7 +27798,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25907,9 +27818,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26042,9 +27950,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/da.po b/i18n/po/da.po
index 20f5ac6..6af002f 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:33+0000\n"
-"Last-Translator: Jens Hyllegaard <jens at linushvj.dk>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-10-20 19:17+0000\n"
+"Last-Translator: Michael Andersen <Unknown>\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: 2013-04-05 04:38+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:38+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -51,6 +51,21 @@ msgstr "Betingelser for brug af baggrund"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Åbning af link ikke understøttet på den nuværende platform (\"{0}\")"
+msgid "ERROR: {0}"
+msgstr "FEJL: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ADVARSEL: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Afvikler platforms opstartskrog"
@@ -154,19 +169,18 @@ msgid "About JOSM..."
msgstr "Om JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ADVARSEL: Uforventet format af base-URL til API. Viderestilling til info- "
-"eller historik-side for OSM-objektet vil sandsynligvis fejle. Base-URL til "
-"API er: \"{0}\""
+"Ukendt format af API basis URL. Omdirigering til info eller historikside for "
+"OSM objekt vil sandsynligvis mislykkes. API basis URL er: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Advarsel: uventet format af API base URL. Redirektion til bruger side for "
-"OSM bruger vil sandsynligvis fejle. API base URL er: ''{0}''"
+"Ukendt format af API basis URL. Omdirigering til brugerside for OSM bruger "
+"vil sandsynligvis mislykkes. API basis URL er: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -212,6 +226,9 @@ msgstr "Ingen ønskede lag"
msgid "Add imagery layer {0}"
msgstr "Tilføj billedlag {0}"
+msgid "Select image format for WMS layer"
+msgstr "Vælg billedformat for WMS laget"
+
msgid "Select WMS layers"
msgstr "Vælg WMS lag"
@@ -235,7 +252,8 @@ msgstr "Tilføj punkt..."
msgid "Add a node by entering latitude / longitude or easting / northing."
msgstr ""
-"Tilføj et punkt ved at angive bredde-/længdegrad eller østlig / nordlig?"
+"Tilføj et punkt ved at angive bredde-/længdegrad eller østlig afstand / "
+"nordlig afstand"
msgid "Edit: {0}"
msgstr "Rediger: {0}"
@@ -252,9 +270,6 @@ msgstr "Værktøj: {0}"
msgid "Please select at least four nodes."
msgstr "Vælg mindst fire punkter."
-msgid "Information"
-msgstr "Information"
-
msgid "Align Nodes in Line"
msgstr "Stil punkter op på linje"
@@ -279,6 +294,9 @@ msgstr "konflikt"
msgid "download"
msgstr "download"
+msgid "problem"
+msgstr "problem"
+
msgid "previous"
msgstr "forrige"
@@ -288,6 +306,9 @@ msgstr "næste"
msgid "Nothing selected to zoom to."
msgstr "Intet markeret at zoome ind på."
+msgid "Information"
+msgstr "Information"
+
msgid "Zoom to {0}"
msgstr "Zoom til {0}"
@@ -344,10 +365,11 @@ msgstr ""
"nogle af dem?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Kunne ikke kombinere veje (de kunne ikke samles i en enkelt række punkter)"
+"Kunne ikke kombinere vejene<br>(De kunne ikke sammenlægges til en enkelt "
+"række punkter)"
msgid "Combine {0} ways"
msgstr "Kombiner {0} veje"
@@ -404,18 +426,37 @@ msgstr "Slet"
msgid "Delete selected objects."
msgstr "Slet valgte objekter."
+msgid "Toggle dialogs panel"
+msgstr "Vis/skjul dialog panel"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Vis/skjul dialog panel, maksimer kortvisning"
+
msgid "Distribute Nodes"
msgstr "Fordel punkter"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Fordel de valgte punkter med ens afstande langs en linje"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignorerer {0} punkter med null koordinater"
+
msgid "Download from OSM..."
msgstr "Download fra OSM..."
msgid "Download map data from the OSM server."
msgstr "Download kort-data fra OSM serveren."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>This handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
+"du<br>at fortsætte?</html>"
+
+msgid "Download data"
+msgstr "Download data"
+
msgid "Download object..."
msgstr "Download objekt..."
@@ -456,7 +497,7 @@ msgid "Ok"
msgstr "O.k."
msgid "Download parent ways/relations..."
-msgstr "Download forældre-veje/-relationer"
+msgstr "Download forældreveje/-relationer"
msgid "Download objects referring to one of the selected objects"
msgstr "Hent objekter, som refererer til et af de valgte objekter"
@@ -512,6 +553,9 @@ msgstr "Historik"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Vis historik for OSM-veje, -punkter eller -relationer."
+msgid "Show history"
+msgstr "Vis historik"
+
msgid "History (web)"
msgstr "Historik (web)"
@@ -633,11 +677,11 @@ msgid "Joined overlapping areas"
msgstr "Forbandt overlappende områder"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Nogle af vejene var dele af relationer der er blevet modificeret. Kontroller "
-"venligst at ingen nye fejl er blevet introduceret."
+"Nogle af vejene var en del af relationer der er blevet ændret.<br>Kontrollér "
+"venligst at der ikke er kommet nogen fejl."
msgid "Fix tag conflicts"
msgstr "Løs tag konflikter"
@@ -801,11 +845,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Læg punkter sammen til den ældste"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Angiv venligst mindst to punkter der skal sammenføjes, eller et punkt er tæt "
-"på et andet punkt."
+"Vælg venligst mindst to punkter der skal sammenlægges eller et punkt der er "
+"tæt på et andet punkt."
msgid "Abort Merging"
msgstr "Afbryd sammenlægning"
@@ -971,11 +1015,11 @@ msgid "Download Data"
msgstr "Download data"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Kan ikke åbne URLen ''{0}'' da der ikke var nogen brugbare "
-"downloadopgaver tilgængelig.</html>"
+"Kan ikke åbne URL ''{0}''<br>Følgende download opgaver accepterer de viste "
+"URL mønstre:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1006,15 +1050,9 @@ msgid "Orthogonalize / Undo"
msgstr "Retvinkl / Fortryd"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Retvinkl figur / Fortryd\n"
-"Vælg punkter der blev flyttet af den foregående Retvinkl figur aktion!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Fortryd retvinkling af figur"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1035,9 +1073,6 @@ msgstr "Retvinkl"
msgid "Usage"
msgstr "Anvendelse"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "De valgte elementer kan ikke retvinkles"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1156,6 +1191,15 @@ msgstr "Omdøb også filen"
msgid "Could not rename file ''{0}''"
msgstr "Kunne ikke omdøbe filen \"{0}\""
+msgid "Restart"
+msgstr "Genstart"
+
+msgid "Restart the application."
+msgstr "Genstart programmet."
+
+msgid "Click to restart later."
+msgstr "Klik for at genstarte senere."
+
msgid "Reverse way"
msgstr "Vend vej om"
@@ -1208,9 +1252,6 @@ msgstr "Indlæs session"
msgid "Load a session from file."
msgstr "Indlæs en session fra en fil."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Sessionsfil (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Åbn session"
@@ -1275,6 +1316,9 @@ msgstr "Statusrapport"
msgid "Copy to clipboard and close"
msgstr "Kopier til udklipsholder og luk"
+msgid "Report bug"
+msgstr "Anmeld fejl"
+
msgid "Close"
msgstr "Luk"
@@ -1355,18 +1399,18 @@ msgstr ""
"vejen.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Et rollebaseret relationsmedlemsskab blev kopieret til alle nye "
-"veje.<br>Du bør kontrollere dette og om nødvendigt korrigere det.</html>"
+"Et rollebaseret relations-medlemskab blev kopieret til alle nye veje.<br>Du "
+"bør tjekke dette, og korrigere hvor nødvendigt."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Et relationsmedlemsskab blev kopieret til alle nye veje.<br>Du bør "
-"kontrollere dette og om nødvendigt korrigere det.</html>"
+"Et relations-medlemskab blev kopieret til alle nye veje.<br>Du bør tjekke "
+"dette, og korrigere hvor nødvendigt."
msgid "Split way {0} into {1} parts"
msgstr "Opdel vejen {0} i {1} stykker"
@@ -1466,6 +1510,29 @@ msgstr ""
"Du er ved at adskille ufærdige objekter.<br>Dette vil skabe problemer, da du "
"ikke ser rigtige objekt.<br>Er du sikker på at du ønsker at adskille?"
+msgid "Disconnect Node from Way"
+msgstr "Frakobl punkt fra vej"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Frakobler punkter fra den vej de aktuelt hører til"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Vælg mindst et punkt der skal frakobles."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Valgt punkt kan ikke frakobles fra noget."
+msgstr[1] "Valgte punkter kan ikke frakobles fra noget."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"Den påvirkede vej ville forsvinde efter frakobling af valgt punkt."
+msgstr[1] ""
+"Den påvirkede vej ville forsvinde efter frakobling af valgte punkter."
+
msgid "Undo"
msgstr "Fortryd"
@@ -1490,9 +1557,6 @@ msgstr "Opdater data"
msgid "Updates the objects in the active data layer from the server."
msgstr "Opdaterer objekterne i det aktive datalag fra serveren"
-msgid "Download data"
-msgstr "Download data"
-
msgid "Update modified"
msgstr "Opdater ændret"
@@ -1699,6 +1763,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Langsommere fremad"
+msgid "Download GPS"
+msgstr "Download GPS"
+
msgid "Downloading GPS data"
msgstr "Downloader GPS-data"
@@ -1708,6 +1775,18 @@ msgstr "Downloadede GPX-data"
msgid "Markers from {0}"
msgstr "Markører fra {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Download komprimeret OSM ændring"
+
+msgid "Download OSM Change"
+msgstr "Download OSM ændring"
+
+msgid "Download Compressed OSM"
+msgstr "Download komprimeret OSM"
+
+msgid "Download OSM"
+msgstr "Download OSM"
+
msgid "Downloading data"
msgstr "Downloader data"
@@ -1725,7 +1804,32 @@ msgid "Command"
msgstr "Kommando"
msgid "Request details: {0}"
-msgstr ""
+msgstr "Forespørgselsdetaljer: {0}"
+
+msgid "Download OSM URL"
+msgstr "Download OSM URL"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Der var {0} konflikt under import."
+msgstr[1] "Der var {0} konflikter under import."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt under download"
+msgstr[1] "Konfilkter under download"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Henter forældre til punkt {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Henter forældre til vej {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Henter forældre til relation {2}"
+
+msgid "Download session"
+msgstr "Download session"
msgid "Download {0} of {1} ({2} left)"
msgstr "Henter {0} af {1} ({2} tilbage)"
@@ -1787,25 +1891,6 @@ msgstr "Følgende fejl opstod under masse-download: {0}"
msgid "Errors during download"
msgstr "Fejl under download"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Der var {0} konflikt under import."
-msgstr[1] "Der var {0} konflikter under import."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt under download"
-msgstr[1] "Konfilkter under download"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Henter forældre til punkt {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Henter forældre til vej {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Henter forældre til relation {2}"
-
msgid "Error during download"
msgstr "Fejl under download"
@@ -1838,7 +1923,7 @@ msgid "Backspace in Add mode"
msgstr "Backspace i tilføj tilstand"
msgid "helper line"
-msgstr ""
+msgstr "hjælpelinje"
msgid "Cannot add a node outside of the world."
msgstr "Kan ikke tilføje et punkt uden for verdenen."
@@ -1939,7 +2024,7 @@ msgstr ""
"dobbeltklik for at tilføje et nyt punkt."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Udvid: primær linje"
msgid "Extrude: helper line"
msgstr "Extrude: hjælpelinje"
@@ -1953,6 +2038,9 @@ msgstr "Forøg vej-korrekthed"
msgid "Improve Way Accuracy mode"
msgstr "Forøg vej-korrekthed tilstand"
+msgid "improve way accuracy helper line"
+msgstr "forøg vej-korrekthed hjælpelinje"
+
msgid "Click on the way to start improving its shape."
msgstr "Klik på vejen for at forbedre dens form."
@@ -1983,10 +2071,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Kan ikke placere et punkt uden for verdenen."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Tilføj og et nyt punk til vejen"
-msgstr[1] "Tilføj og et nyt punk til {0} veje"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Kan ikke slette et punkt der henvises til af flere objekter"
@@ -2000,6 +2088,9 @@ msgstr "Parallel"
msgid "Make parallel copies of ways"
msgstr "Lav paralelle kopier af veje"
+msgid "make parallel helper line"
+msgstr "lav paralel hjælpelinje"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2014,6 +2105,8 @@ msgid ""
"ParallelWayAction\n"
"The ways selected must form a simple branchless path"
msgstr ""
+"ParallelWayAction\n"
+"De valgte veje skal være en simpel forgreningsløs vej"
msgid "Make parallel way error"
msgstr "Fejl i udførsel af parallel vej"
@@ -2404,7 +2497,7 @@ msgstr ""
msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
msgstr ""
-"Brug <b>|</b> eller <b>OR</b> to for at forbinde med et logisk \"eller\""
+"Brug <b>|</b> eller <b>OR</b> for at forbinde med et logisk \"eller\""
msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
msgstr ""
@@ -2457,6 +2550,9 @@ msgstr "\"værdi\" i en vilkårlig nøgle"
msgid "matches if ''key'' exists"
msgstr "passer hvis \"nøgle\" eksisterer"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "kombinationer"
@@ -2477,6 +2573,9 @@ msgid ""
"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
"<b>\\\\</b>)."
msgstr ""
+"til at anføre operatorer.<br>Inden for citerede strenge skal <b>\"</b> og "
+"<b>\\</b> tegnene afgrænses af et foranstillet <b>\\</b> (f.eks. <b>\\\"</b> "
+"og <b>\\\\</b>)."
msgid "objects"
msgstr "objekter"
@@ -2491,7 +2590,7 @@ msgid "all closed ways"
msgstr "alle lukkede veje"
msgid "object without useful tags"
-msgstr ""
+msgstr "objekt uden brugbare tags"
msgid "metadata"
msgstr "metadata"
@@ -2551,10 +2650,10 @@ msgid "all parents of objects matching the expression"
msgstr "alle forældre til objekter der svarer til udtrykket"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "n''te medlem af relation og/eller n''te punkt i vej"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "hver n''te medlem af relation og/eller hver n''te punkt i vej"
msgid "view"
msgstr "visning"
@@ -2628,14 +2727,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Forventede <i>min</i>/<i>max</i> efter ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Primitiv-id forventet"
+msgid "Range of primitive ids expected"
+msgstr "Udvalg af primitiv-ID''er forventet"
-msgid "Changeset id expected"
-msgstr "Changeset id forventet"
+msgid "Range of changeset ids expected"
+msgstr "Udvalg af rettesæts-ID''er forventet"
-msgid "Version expected"
-msgstr "Forventet version"
+msgid "Range of versions expected"
+msgstr "Udvalg af versioner forventet"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2645,6 +2744,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Ukendt primitiv type: {0}. Tilladte værdier er node, way eller relation"
+msgid "Primitive id expected"
+msgstr "Primitiv-id forventet"
+
msgid "Range of numbers expected"
msgstr "Forventet talområde"
@@ -2663,10 +2765,8 @@ msgstr "Manglende parameter for XOR"
msgid "Missing operator for NOT"
msgstr "Manglende operatør for NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
-"Advarsel: Afkorter automatisk værdi af tag ''{0}'' på slettet objekt {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr "Afkorter automatisk værdien af tag ''{0}'' på slettet objekt {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2761,6 +2861,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Tilføjede {0} objekt"
msgstr[1] "Tilføjede {0} objekter"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Ændr punkt {0}"
@@ -2797,11 +2900,11 @@ msgstr "Fjern \"{0}\" for {1} objekter"
msgid "Set {0}={1} for {2} objects"
msgstr "Sæt {0}={1} for {2} objekter"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Slettede {0} egenskaber for {1} objekter"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Indstillede {0} egenskaber for {1} objekter"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Erstat \"{0}\" med \"{1}\" for"
@@ -2825,10 +2928,10 @@ msgid "Double conflict"
msgstr "Dobbelt konflikt"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Advarsel: Lag ''{0}'' eksistere ikke mere. Kan ikke fjerne konflikt for "
+"Laget ''{0}'' eksisterer ikke længere. Kan ikke fjerne konflikten for "
"objektet ''{1}''."
msgid "Add conflict for ''{0}''"
@@ -2945,6 +3048,9 @@ msgstr[1] "Slette {0} objekter"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Løs konflikter i relation {0}’s medlemsliste"
+msgid "Removed nodes from {0}"
+msgstr "Fjernede punkter fra {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Roter {0} punkt"
@@ -3011,11 +3117,9 @@ msgid "Reverse directional way."
msgstr "Omvend ensrettet vej."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Når denne vej bliver vendt om, vil følgende af vejens og punkternes "
-"egenskaber foreslås ændret for at opretholde data-ensartethed."
msgid "Relation"
msgstr "Relation"
@@ -3044,11 +3148,11 @@ msgstr "Udfør valgte ændringer"
msgid "Do not apply changes"
msgstr "Undlad at udføre ændringer"
-msgid "Please select which property changes you want to apply."
-msgstr "Vælg hvilke ændringer af egenskaber som du vil gennemføre."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Egenskaber for "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Roller i relationer refererende til"
@@ -3069,6 +3173,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Kunne ikke slette gammel backupfil {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Fejl ved oprettelse af backup for fjernet lag: {0}"
@@ -3102,21 +3209,21 @@ msgstr ""
"<b>{0}</b>,<br/> men dens standardværdi er ukendt i øjeblikket.<br/> Aktiver "
"venligst den tilsvarende funktion manuelt og prøv at importere igen."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Advarsel: Kunne ikke oprette manglende cache mappe: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Kunne ikke oprette manglende cachemappe: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Advarsel: Kunne ikke oprette manglende cache mappe: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Advarsel: Kunne ikke gemme indstillinger i \"{0}\""
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Kunne ikke gemme indstillinger i ''{0}''"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Advarsel: Kunne ikke initialisere indstillinger. Indstillingsmappe \"{0}\" "
-"er ikke en mappe."
+"Kunne ikke initiallisere indstillingerne. Indstillingsmappen ''{0}'' er ikke "
+"en mappe."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3126,11 +3233,11 @@ msgstr ""
"ikke en mappe.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Advarsel: Kunne ikke initialisere indstillinger. Kunne ikke oprette "
-"manglende indstillingsmappe: {0}"
+"Kunne ikke initiallisere indstillingerne. Kunne ikke oprette manglende "
+"indstilingsmappe: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3139,18 +3246,14 @@ msgstr ""
"<html>Kunne ikke initialisere indstillinger.<br>Kunne ikke oprette manglende "
"indstillingsmappe: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Info: Manglende indstillingsfil \"{0}\". Opretter en standard "
-"indstillingsfil."
+"Manglende indstillingsfil ''{0}''. Opretter standard indstillingsfil."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Advarsel: Erstatter eksisterende indstillingsfil \"{0}\" med standard-"
-"indstillingsfil."
+"Erstat eksisterende indstillingsfil ''{0}'' med standard indstillingsfil."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3167,10 +3270,10 @@ msgstr ""
"<br>{0}<br> og opretter en ny standard-indstillingsfil.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Advarsel: Kunne ikke initialisere indstillinger. Kunne ikke nulstille "
+"Kunne ikke initiallisere indstillingerne. Kunne ikke nulstille "
"indstillingsfilen til standard: {0}"
msgid "Paint style {0}: {1}"
@@ -3201,13 +3304,11 @@ msgstr "Kunne ikke indlæse ressource \"{0}\". Fejl er {1}."
msgid "UNKNOWN"
msgstr "UKENDT"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr ""
-"Advarsel: uventet JOSM versionsnummer i revisionsfilen, værdien er ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr "Uventet JOSM versionsnummer i revisionsfilen, værdien er ''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Advarsel: revisionsfilen \"/REVISION\" mangler."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Revistionsfilen ''/REVISION'' mangler."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Har allerede registreret en konflikt for primitiv \"{0}\"."
@@ -3376,11 +3477,9 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parameter {0} ikke i interval 0..{1}. Fik ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Fejl: kunne ikke indlæse korttegningsklassen \"{0}\". Klassen blev ikke "
-"fundet."
+"Kunne ikke indlæse kortfortolkningsklassen ''{0}''. Klassen blev ikke fundet."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3491,8 +3590,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Ukendt datum identifikation: \"{0}\""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum påkrævet (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr ""
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3511,6 +3610,9 @@ msgstr "Ukendt projektions indentifikation: ''{0}''"
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr "Ukendt antal argumenter til parameteren \"+bounds\" (skal være 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Ukendt parameter \"{0}\""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Forventede numerisk argument for parameteren \"{0}\""
@@ -3530,9 +3632,6 @@ msgstr "Tilpasset projektion"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "Fejl: Kunne ikke åbne inputstrømmen for ressourcen \"/data/{0}\"."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3573,14 +3672,17 @@ msgstr "validering andet"
msgid "Running test {0}"
msgstr "Kører test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresser"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr ""
+msgstr "Søger efter fejl i adresser og associatedStreet relationer."
msgid "Multiple associatedStreet relations"
-msgstr ""
+msgstr "Flere associatedStreet relationer"
msgid "House number without street"
msgstr "Husnummer uden vej"
@@ -3597,6 +3699,15 @@ msgstr "Adskillige vejnavne i relationen"
msgid "House number too far from street"
msgstr "Husnummer for langt fra vejen"
+msgid "Barriers and entrances"
+msgstr "Barrierer og indgange"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Søger efter fejl i barrierer og indgange."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Barriere indgang ikke sat på barrieren"
+
msgid "Building inside building"
msgstr "Bygning inden i bygning"
@@ -3658,6 +3769,9 @@ msgstr " eller "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} er forældet, brug {1} i stedet"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Dublet-punkter"
@@ -3666,9 +3780,6 @@ msgstr ""
"Denne test tjekker at der ikke er nogen punkter, som ligger på præcis samme "
"sted."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Dublet-punkter i to u-lukkede veje"
-
msgid "Mixed type duplicated nodes"
msgstr "Blandede typer af duplikerede punkter"
@@ -3740,6 +3851,24 @@ msgstr "Dublet-vejpunkter"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Tjekker for veje med identiske på hinanden følgende punkter."
+msgid "Highways"
+msgstr "Veje"
+
+msgid "Performs semantic checks on highways."
+msgstr "Udfører semantiske tjek af veje."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Ugyldig rundkørsel (highway: {0} i stedet for {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolygon"
@@ -3812,6 +3941,12 @@ msgstr "Punkter med samme navn"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Denne test finder punkter, som har samme navn (kan være dubletter)"
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "Overlappende områder"
@@ -3872,15 +4007,15 @@ msgstr "Relationstypen er ukendt"
msgid "Relation is empty"
msgstr "Relationen er tom"
+msgid "Role verification problem"
+msgstr "Rolle-verificeringsproblem"
+
msgid "<empty>"
msgstr "<tom>"
msgid "Role {0} missing"
msgstr "Rolle {0} mangler"
-msgid "Role verification problem"
-msgstr "Rolle-verificeringsproblem"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Antallet af {0} roller er for lav ({1})"
@@ -3914,11 +4049,11 @@ msgstr ""
"Denne test tjekker for veje med næsten identiske navne, som blot kan være "
"stavet forkert."
-msgid "Properties checker :"
-msgstr "Egenskabstjekker:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Denne udvidelse tjekker for fejl i egenskabsnøgler og -værdier"
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Ugyldig tagtjekker-linje - {0}: {1}"
@@ -4058,8 +4193,8 @@ msgstr "Brug stavekontrollens standardfil."
msgid "Use the default spellcheck file (recommended)."
msgstr "Brug stavekontrollens standardfil (anbefales)."
-msgid "Fix properties"
-msgstr "Ret egenskaber"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Kunne ikke finde element-typen"
@@ -4133,6 +4268,9 @@ msgstr "Ulukkede veje"
msgid "This tests if ways which should be circular are closed."
msgstr "Denne tester om veje, som burde være cirkulære, er lukkede."
+msgid "Unclosed way"
+msgstr "Uafsluttet vej"
+
msgid "natural type {0}"
msgstr "natur-type {0}"
@@ -4163,9 +4301,6 @@ msgstr "bygning"
msgid "area"
msgstr "område"
-msgid "Unclosed way"
-msgstr "Uafsluttet vej"
-
msgid "Unconnected ways"
msgstr "Uforbundne veje"
@@ -4192,12 +4327,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Denne test tjekker for utaggede punkter, som ikke er del af nogen vej."
-msgid "No tags"
-msgstr "Ingen tags"
-
msgid "Unconnected nodes without physical tags"
msgstr "Uforbundne punkter uden fysiske tags"
+msgid "No tags"
+msgstr "Ingen tags"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Har tag indholdende \"fixme\" eller \"FIXME\""
@@ -4260,25 +4395,6 @@ msgstr "Modsatrettet kystlinje: Der er ikke land på venstre side"
msgid "Reversed land: land not on left side"
msgstr "Modsatrettet land: Der er ikke land på venstre side"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Forkert antal argumenter til bogmærket"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Fejl ved læsning af bogmærkeemnet: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Fejl: Uventet linje ''{0}'' i bogmærkefil ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Fejl: Ulovlig double værdi ''{0}'' i linje ''{1}'' i bogmærkefil ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Kunne ikke læse bogmærker fra<br>''{0}''<br>Fejl var: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Vis ikke igen (husker valg)"
@@ -4382,8 +4498,8 @@ msgstr "Vis Hjælp-information"
msgid "Downloading \"Message of the day\""
msgstr "Downloader \"Dagens besked\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Advarsel: kunne ikke læse MOTD. Undtagelsen var: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Kunne ikke læse MOTD. Undtagelsen var: {0}"
msgid "Message of the day not available"
msgstr "Dagens besked er ikke tilgængelig"
@@ -4591,9 +4707,24 @@ msgstr "Vis"
msgid "Tools"
msgstr "Funktioner"
+msgid "More tools"
+msgstr "Flere værktøjer"
+
+msgid "Data"
+msgstr "Data"
+
+msgid "Selection"
+msgstr "Markering"
+
msgid "Presets"
msgstr "Prædefinerede"
+msgid "More..."
+msgstr "Mere..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Vinduer"
@@ -4610,11 +4741,23 @@ msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
"Viser/skjuler værktøjslinjen Rediger (dvs. den vertikale værktøjslinje)"
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Lyd"
-msgid "Hide edit toolbar"
-msgstr "Skjul værktøjslinjen Rediger"
+msgid "Do not hide toolbar"
+msgstr "Skjul ikke værktøjslinje"
msgid "Hide this button"
msgstr "Skjul denne knap"
@@ -4622,6 +4765,9 @@ msgstr "Skjul denne knap"
msgid "Click the arrow at the bottom to show it again."
msgstr "Klik på pilen i bundet for at vise den igen."
+msgid "Hide edit toolbar"
+msgstr "Skjul værktøjslinjen Rediger"
+
msgid "Hide or show this toggle button"
msgstr "Skjul eller vis denne knap"
@@ -4683,6 +4829,9 @@ msgstr "(intet objekt)"
msgid "User:"
msgstr "Bruger:"
+msgid "Do not hide status bar"
+msgstr "Skjul ikke statuslinje"
+
msgid "Layer not in list."
msgstr "lag er ikke i listen"
@@ -4710,20 +4859,6 @@ msgstr "I baggrunden"
msgid "Click to run job in background"
msgstr "Klik for at afvikle jobbet i baggrunden"
-msgid "false: the property is explicitly switched off"
-msgstr "falsk: egenskaben er eksplicit slået fra"
-
-msgid "true: the property is explicitly switched on"
-msgstr "sand: egenskaben er eksplicit slået til"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"opdelt: forskellige valgte objekter har forskellige værdier; skift ikke."
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "uangivet: sæt ikke denne egenskab for de valgte objekter"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -5038,6 +5173,9 @@ msgstr ""
"Kopiér mine markerede elementer til enden af den sammenlagte liste over "
"elementer"
+msgid "> before"
+msgstr "> før"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5045,6 +5183,9 @@ msgstr ""
"Kopiér mine markerede elementer ind før det første markerede element i "
"listen over sammenlagte elementer."
+msgid "> after"
+msgstr "> efter"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5052,18 +5193,27 @@ msgstr ""
"Kopiér mine markerede elementer ind efter det første markerede element i "
"listen over sammenlagte elementer."
+msgid "< top"
+msgstr "< top"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Kopiér deres markerede element til starten af listen over sammenlagte "
"elementer."
+msgid "< bottom"
+msgstr "< bund"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Kopiér deres markerede elementer til enden af listen over sammenlagte "
"elementer."
+msgid "< before"
+msgstr "< før"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5071,6 +5221,9 @@ msgstr ""
"Kopiér deres markerede elementer ind før det første markerede element i "
"listen over sammenlagte elementer."
+msgid "< after"
+msgstr "< efter"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5087,8 +5240,8 @@ msgstr "Kopiér alle deres elementer til målet"
msgid "Up"
msgstr "Op"
-msgid "Move up the selected elements by one position."
-msgstr "Flyt de valgte elementer ét trin op"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Ned"
@@ -5143,16 +5296,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Deres version ({0} indlæg)"
msgstr[1] "Deres version ({0} indlæg)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Justerbar {0} ikke registreret endnu. Kan ikke sætte deltagelse i "
-"synkroniseret justering."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Justerbar {0} ikke registreret endnu."
-
msgid "Node"
msgstr "Punkt"
@@ -5423,18 +5566,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Nøgle:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Indtast en tag nøgle, f.eks. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Værdi:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Indtast en tag værdi, f.eks. <strong><tt>Tjek "
-"medlemmer</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5637,7 +5777,7 @@ msgid "Enable filter"
msgstr "Slå filter til"
msgid "Multikey: {0}"
-msgstr ""
+msgstr "Flertast: {0}"
msgid "Hide filter"
msgstr "Skjul filter"
@@ -5935,8 +6075,8 @@ msgstr "Projekterede koordinater:"
msgid ""
"Enter easting and northing (x and y) separated by space, comma or semicolon."
msgstr ""
-"Indtast Easting og Northing (x og y) adskilt af mellemrum, komma eller "
-"semikolon."
+"Indtast østlig og nordlig afstand (x og y) adskilt af mellemrum, komma "
+"eller semikolon."
msgid "Lat/Lon"
msgstr "Bred./Læng."
@@ -5948,7 +6088,7 @@ msgid "Please enter a GPS coordinates"
msgstr "Indtast venligst et GPS koordinat"
msgid "Please enter a Easting and Northing"
-msgstr "Indtast venligst Easting og Northing"
+msgstr "Indtast venligst østlig og nordlig afstand"
msgid "Toggle visibility of layer: {0}"
msgstr "Vælg synlighed for laget: {0}"
@@ -6019,6 +6159,9 @@ msgstr "Vis/skjul"
msgid "Information about layer"
msgstr "Information om lag"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Korttegningsstile"
@@ -6102,6 +6245,36 @@ msgstr "Stilart er aktiv i øjeblikket?"
msgid "No"
msgstr "Nej"
+msgid "Object type:"
+msgstr "Objekttype:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "blandet"
+
+msgid "Choose the OSM object type"
+msgstr "Vælg OSM objekt type"
+
+msgid "Object ID:"
+msgstr "Objekt ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Indtast ID’et fra det objekt der skal downloads"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Objekt ID’er kan adskilles med et komma eller mellemrum.<br/> Eksempler: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> I blandet tilstand, angiv "
+"objekter således: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relationer"
@@ -6123,9 +6296,6 @@ msgstr "Relationer: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relationer: {0}"
-msgid "Selection"
-msgstr "Markering"
-
msgid "Open a selection list window."
msgstr "Åbn et vindue med en markeringsliste."
@@ -6150,18 +6320,6 @@ msgstr "Kan ikke markeres nu"
msgid "Selection: {0}"
msgstr "Markering: {0}"
-msgid "Side buttons"
-msgstr "Sideknapper"
-
-msgid "Always shown"
-msgstr "Altid vist"
-
-msgid "Dynamic"
-msgstr "Dynamisk"
-
-msgid "Always hidden"
-msgstr "Altid skjult"
-
msgid "Toggle dynamic buttons"
msgstr "Dynamiske knapper til eller fra"
@@ -6178,6 +6336,18 @@ msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar."
msgid "Click to minimize/maximize the panel content"
msgstr "Klik for at minimere/maksimere panelet"
+msgid "Side buttons"
+msgstr "Sideknapper"
+
+msgid "Always shown"
+msgstr "Altid vist"
+
+msgid "Dynamic"
+msgstr "Dynamisk"
+
+msgid "Always hidden"
+msgstr "Altid skjult"
+
msgid "Authors"
msgstr "Forfattere"
@@ -6195,11 +6365,8 @@ msgstr "Vælg objekter indsendt af denne bruger"
msgid "Launches a browser with information about the user"
msgstr "starter en browser med information om brugeren"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr ""
-"Advarsel: Starter kun infobrowsere for de første {0} af {1} markerede "
-"brugere."
+msgid "Only launching info browsers for the first {0} of {1} selected users"
+msgstr "Starter kun info-browsere for de første {0} af {1} valgte brugere"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6226,9 +6393,6 @@ msgstr "Åbn valideringsvindue"
msgid "Validation results"
msgstr "Valideringsresultater"
-msgid "Zoom to problem"
-msgstr "Zoom til problem"
-
msgid "Fix"
msgstr "Ret"
@@ -6376,9 +6540,6 @@ msgstr "Opdatér indhold"
msgid "Update the changeset content from the OSM server"
msgstr "Opdatér indhold af rettesæt fra OSM-serveren"
-msgid "Show history"
-msgstr "Vis historik"
-
msgid "Download and show the history of the selected objects"
msgstr "Download og vis historikken for de valgte objekter"
@@ -6706,10 +6867,10 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Download rettesæt i den akutelle kortvisning</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Advarsel: Uventet værdi for indstilling ''{0}''. Fik ''{1}''. Nulstiller til "
+"Uventet værdi for indstillingen ''{0}'', fik ''{1}''. Nulstiller til "
"standard forespørgsel."
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6778,35 +6939,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Denne rettesætsforespørgselsURL er ugyldig"
-msgid "Select objects for which to change properties."
-msgstr "Vælg objekter der skal ændres egenskaber for."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Egenskaber/medlemsskaber"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Egenskaber for valgte objekter."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<forskellige>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Medlem af"
msgid "Position"
msgstr "Placering"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Egenskaber: {0} / Medlemskaber: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Egenskaber / Medlemskaber"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Fjern den valgte nøgle i alle objekter"
-msgid "Delete Properties"
-msgstr "Fjern egenskaber"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Skift relation"
@@ -6820,14 +6993,14 @@ msgstr "Slet virkelig det markerede fra relation {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
-msgid "Add Property"
-msgstr "Tilføj egenskab"
+msgid "Add Tag"
+msgstr "Tilføj tag"
msgid "Edit the value of the selected key for all objects"
msgstr "Rediger værdien for den valgte nøgle for alle objekter"
-msgid "Edit Properties"
-msgstr "Redigér egenskaber"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Gå til OSM wiki’en for tag-hjælp (F1)"
@@ -6909,12 +7082,6 @@ msgstr[1] "Ret egenskaber for op til {0} objekter"
msgid "Use English language for tag by default"
msgstr "Brug engelsk sprog for tag som standard"
-msgid "Paste tag"
-msgstr "Indsæt tag"
-
-msgid "Paste value"
-msgstr "Indsæt værdi"
-
msgid "Add value?"
msgstr "Tilføj værdi?"
@@ -6933,7 +7100,7 @@ msgid "Set number of recently added tags"
msgstr "Indstil antallet af nyligt tilføjede tags"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Husk sidst brugte tags"
msgid "Please enter the number of recently added tags to display"
msgstr "Indtast venligst antallet af nyligt tilføjede tags der skal vises"
@@ -6944,9 +7111,15 @@ msgstr "Indtast venligst et heltalsnummer mellem 0 og {0}"
msgid "Recently added tags"
msgstr "Nyligt tilføjede tags"
+msgid "Choose recent tag {0}"
+msgstr "Vælg nyligt tag {0}"
+
msgid "Use this tag again"
msgstr "Brug dette tag igen"
+msgid "Apply recent tag {0}"
+msgstr "Anvend nyligt tag {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "Nøglen \"{0}\" er allerede brugt"
@@ -6986,9 +7159,8 @@ msgstr "Relation er slettet"
msgid "Downloading relation {0}"
msgstr "Downloader relation {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Advarsel: Ignorerer undtagelsen da opgaven blev annulleret. Undtagelse: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Ignorerer undtagelsen da opgaven blev annulleret. Undtagelse: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7051,6 +7223,9 @@ msgstr "Fjern dem og ryd op i relationen."
msgid "Ignore them, leave relation as is"
msgstr "Ignorer dem og lad relationen være som den er."
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr "Beklager, genvejen \"{0}\" kan ikke aktiveres i relations editoren"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7334,6 +7509,27 @@ msgstr "vej er forbundet til næste relationsmedlem"
msgid "way is not connected to previous or next relation member"
msgstr "vej er ikke forbundet til foregående eller næste relationsmedlem"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Forkert antal argumenter til bogmærket"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Fejl ved læsning af bogmærkeemnet: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Uventet linje ''{0}'' i bogmærkefilen ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Ugyldig dobbeltværdi ''{0}'' på linje ''{1}'' i bogmærkefilen ''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Kunne ikke læse bogmærker fra<br>''{0}''<br>Fejl var: {1}</html>"
+
msgid "Bookmarks"
msgstr "Bogmærker"
@@ -7405,9 +7601,6 @@ msgstr "Værdi for breddegrad i intervallet [-90,90] krævet."
msgid "Value for longitude in range [-180,180] required."
msgstr "Værdi for længdegrad i intervallet [-180,180] krævet."
-msgid "Paste URL from clipboard"
-msgstr "Indsæt URL fra udklipsholder"
-
msgid "Data Sources and Types:"
msgstr "Datakilder og typer:"
@@ -7486,21 +7679,8 @@ msgstr "Download de referende (forælder relationer)"
msgid "Download object"
msgstr "Download objekt"
-msgid "Object type:"
-msgstr "Objekttype:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "blandet"
-
-msgid "Choose the OSM object type"
-msgstr "Vælg OSM objekt type"
-
-msgid "Object ID:"
-msgstr "Objekt ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Indtast ID’et fra det objekt der skal downloads"
+msgid "Start downloading"
+msgstr "Start downloading"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7512,28 +7692,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Vælg om medlemmer af relationen også skal downloades"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Objekt ID’er kan adskilles med et komma eller mellemrum.<br/> Eksempler: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> I blandet tilstand, angiv "
-"objekter således: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Download refererende (forælder-relationer og veje)"
-msgid "Start downloading"
-msgstr "Start downloading"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Ugyldig ID liste angivet\n"
-"Kan ikke downloade objektet."
-
msgid "Class Type"
msgstr "Klassetype"
@@ -7644,8 +7805,8 @@ msgstr "Gå til næste side"
msgid "Go to the JOSM help home page"
msgstr "Gå til JOSM’s Hjælp-hjemmeside"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Advarsel: dårlig lokationo HTML dokumentet. Undtagelsen var: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "Kunne ikke åbne Hjælp-side. URL’en er tom."
@@ -7749,6 +7910,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> oprettet den <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Rettesætsinfo"
@@ -7857,9 +8021,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Objekt stadig i brug"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Advarsel: Fejloverskrift \"{0}\" matchede ikke med et forventet mønster"
msgid "Upload"
msgstr "Upload"
@@ -7881,6 +8044,12 @@ msgstr "Angiv en kort kommentar for de ændringer du uploader:"
msgid "Enter an upload comment"
msgstr "Indtast en upload-kommentar"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Rettesæts-ID"
@@ -7949,11 +8118,8 @@ msgid "Closing changeset {0}"
msgstr "Lukker rettesæt {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Advarsel: Kunne ikke placere brugerinfo-dialog altid-øverst. Fangede "
-"sikkerhedsundtagelse."
msgid "Enter credentials for OSM API"
msgstr "Indtast brugeroplysninger for OSM-API"
@@ -8035,11 +8201,9 @@ msgid "Unpacking {0} into {1}"
msgstr "Udpakker {0} til {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Advarsel: Kan ikke downloade filen \"{0}\". Dets download-link \"{1}\" er "
-"ikke en gyldig URL. Downloader ikke."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8056,11 +8220,8 @@ msgid "Missing user identity"
msgstr "Mangler brugeridentitet"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Advarsel: Kunne ikke hente brugeroplysninger for den aktuelle JOSM bruger. "
-"Undtagelsen var: {0}"
msgid "Download objects"
msgstr "Download objekter"
@@ -8295,12 +8456,6 @@ msgstr "Upload de ændrede primitiver"
msgid "Please revise upload comment"
msgstr "Tilpas venligst upload kommentaren"
-msgid "Revise"
-msgstr "Tilpas"
-
-msgid "Continue as is"
-msgstr "Forsæt som den er"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8315,6 +8470,22 @@ msgstr ""
"bruger et øjeblik nu på at forklare dine ændringer,<br />gør du livet "
"lettere for mange andre brugere."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Tilpas"
+
+msgid "Continue as is"
+msgstr "Forsæt som den er"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Gå til foregående dialogboks for at udfylde en mere beskrivende kommentar"
@@ -8331,6 +8502,21 @@ msgstr "Indtast venligst først en gyldig størrelse for bidderne"
msgid "Illegal chunk size"
msgstr "Ulovlig størrelse af bidder"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Annullér uploaden og genoptag redigeringen"
@@ -8338,11 +8524,9 @@ msgid "Tags of changeset {0}"
msgstr "Tags i rettesæt {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Advarsel: objekt ''{0}'' er allerede slettet fra serveren. Springer over "
-"dette objekt og prøver igen at uploade."
msgid "Preparing objects to upload ..."
msgstr "Forbereder objekter der skal uploades ..."
@@ -8479,9 +8663,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "Objekt ''{0}'' er allerede slettet. Springer over objekt i upload."
-msgid "Warning: {0}"
-msgstr "Advarsel: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Uploader {0} objekt..."
@@ -8492,6 +8673,9 @@ msgid ""
msgstr ""
"Ignorerer fanget undtagelse fordi upload blev annulleret. Undtagelse er: {0}"
+msgid "Upload successful!"
+msgstr "Upload lykkedes!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8512,9 +8696,8 @@ msgstr "Vælg objekter at uploade"
msgid "Cancel uploading"
msgstr "Annullér upload"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Advarsel: uventet værdi for nøgle ''{0}'' i indstillinger. Fik ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Vælg venligst upload-strategien:"
@@ -8639,8 +8822,8 @@ msgstr[1] "{0} ruter, "
msgid "{0} waypoint"
msgid_plural "{0} waypoints"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkter"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
msgid "gps point"
msgstr "gps-punkt"
@@ -8665,7 +8848,7 @@ msgstr "Næste markør"
msgid "Jump to next marker"
msgstr "Hop til næste markør"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Forrige markør"
msgid "Jump to previous marker"
@@ -8698,8 +8881,8 @@ msgstr "version {0}"
msgid "Merging layers"
msgstr "Sammenlægger lag"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Advarsel: At blande 0.6 og 0.5 data resulterer i version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8819,6 +9002,9 @@ msgstr "forøg zoomniveau for at se flere detaljer"
msgid "No tiles at this zoom level"
msgstr "Ingen tern på dette zoom niveau"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "TMS lag ({0}), downloader i zoom {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326 og Mercator projektion er understøttet"
@@ -8858,6 +9044,9 @@ msgstr "Genhent fejlagtige tern"
msgid "Alpha channel"
msgstr "Alpha-kanal"
+msgid "Automatically change resolution"
+msgstr "Skift opløsning automatisk"
+
msgid "Set WMS Bookmark"
msgstr "Sæt WMS-bogmærke"
@@ -9068,9 +9257,6 @@ msgstr "Trækker GPS-lokaliteter ud fra EXIF"
msgid "Starting directory scan"
msgstr "Begynder scanning af mappe"
-msgid "One of the selected files was null"
-msgstr "En af de markerede filer var havde en null-værdi"
-
msgid "Read photos..."
msgstr "Indlæs billeder..."
@@ -9089,6 +9275,9 @@ msgstr "Fandt en null-fil i mappen {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Fejl ved hentning af filer fra mappen {0}\n"
+msgid "One of the selected files was null"
+msgstr "En af de markerede filer var havde en null-værdi"
+
msgid "Geotagged Images"
msgstr "Geotaggede billeder"
@@ -9148,6 +9337,12 @@ msgstr "Næste"
msgid "Show next Image"
msgstr "Vis næste billede"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centrer synsfelt"
@@ -9230,9 +9425,6 @@ msgstr ""
"<html>Upload af ubehandlede GPS-data som kortdata betragtes som skadeligt "
"<br>Hvis du vil uploade traces, så kig her:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Tilpas sportegning"
@@ -9245,8 +9437,11 @@ msgstr "Til"
msgid "No timestamp"
msgstr "Intet tidsstempel"
-msgid "Download from OSM along this track"
-msgstr "Download fra OSM langs dette spor"
+msgid "Select to download OSM data."
+msgstr "Vælg for at downloade OSM data."
+
+msgid "Select to download GPS traces."
+msgstr "Vælg for at downloade GPS spor."
msgid "Download everything within:"
msgstr "Download alt indenfor:"
@@ -9267,21 +9462,23 @@ msgid "track only"
msgstr "kun spor"
msgid "waypoints only"
-msgstr "kun punkter"
+msgstr "kun waypoints"
msgid "track and waypoints"
-msgstr "spor og punkter"
+msgstr "spor og waypoints"
+
+msgid "Click to download"
+msgstr "Klik for at downloade"
+
+msgid "Click to cancel"
+msgstr "Klik for at annullere"
+
+msgid "Download from OSM along this track"
+msgstr "Download fra OSM langs dette spor"
msgid "Calculating Download Area"
msgstr "Udregner download område"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>This handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
-"du<br>at fortsætte?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Forudhent billedtern langs dette spor"
@@ -9426,17 +9623,11 @@ msgstr "Der opstod en fejl i forsøget på at vise URL’en for denne markør"
msgid "(URL was: "
msgstr "(URL var: "
-msgid "Error displaying URL"
-msgstr "Fejl ved visning af URL"
-
msgid "Select the map painting styles"
msgstr "Vælg korttegningsstilene"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Advarsel: kunne ikke indlæse Mappaint stilarter fra \"{0}\". Undtagelsen "
-"var: {1}"
msgid "loading style ''{0}''..."
msgstr "indlæser stilart \"{0}''..."
@@ -9454,9 +9645,8 @@ msgstr[1] ""
"Der opstod {0} fejl ved indlæsning af denne stilart. Vælg \"Info\" fra "
"højrekliks-menuen for detaljer."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Advarsel: kunne ikke fortolke Mappaint stilarter fra \"{0}\". Fejlen var: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Ulovligt streg-mønster. Værdierne skal være positive."
@@ -9465,11 +9655,8 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Ulovligt streg-mønster. Mindst en værdi skal være over > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Advarsel: kunne ikke fortolke Mappaint stilarter fra \"{0}\". Fejlen var: "
-"[{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Adgangspolet-nøgle:"
@@ -9736,8 +9923,8 @@ msgstr "Luk dialogen og annullér autorisationen"
msgid "Close the dialog and accept the Access Token"
msgstr "Luk dialogen og acceptér adgangsudtrykket"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Advarsel: Kunne ikke annullere kørende OAuth-operation"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Henter OAuth anmodningsudtryk fra ''{0}''"
@@ -9807,6 +9994,12 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
"Markér for at give JOSM retten til at skrive dine serverindstillinger"
+msgid "Allow modifications of notes"
+msgstr "Tillad ændringer af noter"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Markér for at tillade JOSM at ændrer noter på dine vegne"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Henter OAuth adgangsudtryk..."
@@ -9876,9 +10069,6 @@ msgstr ""
"polet. JOSM vil bruge den fremover til identificering og tilladelser mod OSM "
"serveren.<br><br>Adgangspoletten er: </html>"
-msgid "Restart"
-msgstr "Genstart"
-
msgid "Click to retrieve a Request Token"
msgstr "Klik for at hente et anmodningsudtryk"
@@ -9987,10 +10177,10 @@ msgid "Display live audio trace."
msgstr "Vis live lydspor."
msgid "Explicit waypoints with valid timestamps."
-msgstr "Tydelige vejpunkter med gyldige tidsstempler."
+msgstr "Tydelige waypoints med gyldige tidsstempler."
msgid "Explicit waypoints with time estimated from track position."
-msgstr "Tydelige vejpunkter med tid anslået udfra sporposition"
+msgstr "Tydelige waypoints med tid anslået udfra sporposition."
msgid "Named trackpoints."
msgstr "Navngivne sporpunkter"
@@ -10024,7 +10214,7 @@ msgid "When importing audio, make markers from..."
msgstr "Når lyd importeres, opret markører ud fra..."
msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr "Når lyd importeres, tilknyt den til ethvert vejpunkt i GPX-laget."
+msgstr "Når lyd importeres, tilknyt den til ethvert waypoint i GPX-laget."
msgid ""
"Automatically create audio markers from trackpoints (rather than explicit "
@@ -10165,6 +10355,9 @@ msgstr "Download plugins"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft."
+msgid "Would you like to restart now?"
+msgstr "Vil du genstarte nu?"
+
msgid "Remote Control"
msgstr "Fjernstyring"
@@ -10298,6 +10491,12 @@ msgstr "Fjern fra værktøjslinjen"
msgid "Configure toolbar"
msgstr "Konfigurer værktøjslinjen"
+msgid "Edit shortcut"
+msgstr "Rediger genvej"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Skjul ikke værktøjslinje og menu"
+
msgid "Actions"
msgstr "Handlinger"
@@ -10340,6 +10539,9 @@ msgstr "Registreret værktøjslinje handling uden et navn: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "Registreret værktøjslinje handling {0} overskrevet: {1} for {2}"
+msgid "Toolbar: {0}"
+msgstr "Værktøjslinje: {0}"
+
msgid "Data validator"
msgstr "Datavalidator"
@@ -10391,24 +10593,12 @@ msgstr "Søg: "
msgid "Read from file"
msgstr "Læs fra filen"
-msgid "Open JOSM customization file"
-msgstr "Åben JOSM tilpasningsfil"
-
-msgid "Import log"
-msgstr "Importér log"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Her er filimport sammendraget. <br/>Du kan afvise indstillings-"
-"ændringer ved at trykke på \"Annuller\" i indstillings-dialogen <br/>JOSM "
-"skal muligvis genstartes for at aktivere nogle ændringer.</html>"
-
msgid "Export selected items"
msgstr "Eksportér valgte emner"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM tilpasset indstillings-fil (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Vælg venligst nogle indstillingsnøgler der ikke er markeret som standard"
@@ -10426,42 +10616,57 @@ msgstr "Tilføj indstillingerne fra filen til eksisterende værdier"
msgid "Replace existing values"
msgstr "Erstat eksisterende værdier"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM tilpasset indstillings-fil (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Åben JOSM tilpasningsfil"
-msgid "Advanced Background: Changed"
-msgstr "Avanceret baggrund: Ændret"
+msgid "Import log"
+msgstr "Importér log"
-msgid "Advanced Background: NonDefalut"
-msgstr "Avanceret baggrund:: Ikke-standard"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Her er filimport sammendraget. <br/>Du kan afvise indstillings-"
+"ændringer ved at trykke på \"Annuller\" i indstillings-dialogen <br/>JOSM "
+"skal muligvis genstartes for at aktivere nogle ændringer.</html>"
-msgid "Current value is default."
-msgstr "Den aktuelle værdi er standard."
+msgid "shortcut"
+msgstr "genvej"
-msgid "Default value is ''{0}''."
-msgstr "Standardværdien er \"{0}\"."
+msgid "color"
+msgstr "farve"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Standardværdien er i øjeblikket ukent (indstillingen er ikke brugt endnu)."
+msgid "toolbar"
+msgstr "værktøjslinje"
-msgid "Select Setting Type:"
-msgstr "Vælg indstillingstype:"
+msgid "imagery"
+msgstr "billedlag"
-msgid "Simple"
-msgstr "Simpel"
+msgid "Reset preferences"
+msgstr "Nulstil indstillinger"
-msgid "List"
-msgstr "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Du er ved at nulstille alle indstillinger til deres standardværdier<br "
+"/>Alle dine indstillinger vil blive slettet: udvidelser, billedlag, filtrer, "
+"værktøjslinje knapper, tastatur osv. <br />Er du sikker på at du ønsker at "
+"fortsætte?"
-msgid "List of lists"
-msgstr "Liste over lister"
+msgid "Load profile"
+msgstr "Indlæs profil"
-msgid "List of maps"
-msgstr "Liste over kort"
+msgid "Save {0} profile"
+msgstr "Gem {0} profil"
-msgid "Add setting"
-msgstr "Tilføj indstilling"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr "Alle indstillingerne for denne gruppe er standard, intet at gemme"
+
+msgid "Choose profile file"
+msgstr "Vælg profil-fil"
msgid "Change list setting"
msgstr "Tilpas liste indstilling"
@@ -10484,6 +10689,40 @@ msgstr "Ændringsliste over kortindstillinger"
msgid "Entry {0}"
msgstr "Punkt {0}"
+msgid "Select Setting Type:"
+msgstr "Vælg indstillingstype:"
+
+msgid "Simple"
+msgstr "Simpel"
+
+msgid "List"
+msgstr "List"
+
+msgid "List of lists"
+msgstr "Liste over lister"
+
+msgid "List of maps"
+msgstr "Liste over kort"
+
+msgid "Add setting"
+msgstr "Tilføj indstilling"
+
+msgid "Advanced Background: Changed"
+msgstr "Avanceret baggrund: Ændret"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Den aktuelle værdi er standard."
+
+msgid "Default value is ''{0}''."
+msgstr "Standardværdien er \"{0}\"."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Standardværdien er i øjeblikket ukent (indstillingen er ikke brugt endnu)."
+
msgid "Change string setting"
msgstr "Tilpas strengindstilling"
@@ -10542,6 +10781,9 @@ msgstr "Tegn virtuelle punkter i valg-tilstand"
msgid "Draw inactive layers in other color"
msgstr "Tegn inaktive lag i anden farve"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "Fremhæv destinations vej og punkter"
@@ -10602,14 +10844,19 @@ msgstr ""
"Denne indstilling undertrykker udfyldningen af område, hvad der end måtte "
"være angivet i den valgte stilart."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr "Indstillinger der påvirker tegne-ydelsen"
msgid "Segment drawing options"
-msgstr ""
+msgstr "Segment tegningsindstillinger"
msgid "Select and draw mode options"
-msgstr ""
+msgstr "Markerings- og tegnetilstands indstillinger"
msgid "Other options"
msgstr "Andre indstillinger"
@@ -10698,7 +10945,7 @@ msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
msgstr ""
-"Lav automatisk et markørlag udfra ethvert vejpunkt ved åbning af et GPX-lag."
+"Lav automatisk et markørlag udfra ethvert waypoint ved åbning af et GPX-lag."
msgid "Draw lines between raw GPS points"
msgstr "Tegn linjer mellem rå GPS-punkter"
@@ -10794,7 +11041,7 @@ msgid "Colors points and track segments by data limits."
msgstr "Farvelægger punkter og sporsegmenter efter databegrænsninger."
msgid "Waypoint labelling"
-msgstr ""
+msgstr "Wapoint mærkning"
msgid "Audio waypoint labelling"
msgstr ""
@@ -10887,7 +11134,7 @@ msgid "4. Enter name for this layer"
msgstr "4. Indtast navn for dette lag"
msgid "Store WMS endpoint only, select layers at usage"
-msgstr ""
+msgstr "Gem kun WMS slutpunkt, vælg lag ved brug"
msgid "Show bounds"
msgstr "Vis grænser"
@@ -10901,8 +11148,14 @@ msgstr "Hent lag"
msgid "2. Select layers"
msgstr "2. Vælg lag"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Verificer genereret WMS URL"
+msgid "3. Select image format"
+msgstr "3. Vælg billedformat"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Bekræft genereret WMS URL"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Indstast navnet for dette lag"
msgid "Show Bounds"
msgstr "Vis grænser"
@@ -10998,10 +11251,10 @@ msgid "Layer"
msgstr "Lag"
msgid "Easting"
-msgstr "Easting"
+msgstr "Østlig afstand"
msgid "Northing"
-msgstr "Northing"
+msgstr "Nordlig afstand"
msgid "Auto zoom by default: "
msgstr "Auto-zoom som standard: "
@@ -11077,6 +11330,12 @@ msgstr ""
"<i>(JOSM kan beholde en backupfil når der gemmes datalag. Den tilføjer ''~'' "
"til filnavnet og gemmer den i den samme mappe.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Backup af filer"
@@ -11143,37 +11402,50 @@ msgstr "Indstillinger for kort"
msgid "Settings for the map projection and data interpretation."
msgstr "Indstillinger for kortprojektion og datafortolkning"
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Kunne ikke læse kilde med prædefinerede tags: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
"Do you want to keep it?"
msgstr ""
+"Kunne ikke indlæse kilde med prædefinerede tags: {0}\n"
+"Ønsker du at beholde den?"
msgid "Could not read tagging preset source {0}"
-msgstr ""
+msgstr "Kunne ikke læse kilde med prædefinerede tags {0}"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
"{3}</table></html>"
msgstr ""
+"<html>Kilden med prædefinerede tags {0} kan indlæses, men indeholder fejl. "
+"Ønsker du virkelig at bruge den?<br><br><table width=600>Fejlen er: "
+"[{1}:{2}] {3}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
msgstr ""
+"<html>Kunne ikke tolke kilden med prædefinerede tags: {0}. Ønsker du "
+"virkelig at bruge den?<br><br><table width=400>Fejlen er: [{1}:{2}] "
+"{3}</table></html>"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
+"<html>Kilden med prædefinerede tags {0} kan indlæses, men indeholder fejl. "
+"Ønsker du virkelig at bruge den?<br><br><table width=600>Fejlen er: "
+"{1}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
+"<html>Kunne ikke tolke kilden med prædefinerede tags: {0}. Ønsker du "
+"virkelig at bruge den?<br><br><table width=600>Fejlen er: {1}</table></html>"
msgid "Sort presets menu"
msgstr "Sortér menu med prædefinerede tags"
@@ -11220,6 +11492,7 @@ msgstr ""
msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
msgstr ""
+"Advarsel: ugyldigt format af emne i prædefineret listen \"{0}\". Fik \"{1}\""
msgid "Internal Preset"
msgstr "Intern prædefinition"
@@ -11275,7 +11548,7 @@ msgstr ""
"et bestemt stykke tid."
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "Efter kode (EPSG)"
msgid "Invalid projection configuration: {0}"
msgstr "Ugyldig projektions-konfiguration: {0}"
@@ -11302,10 +11575,10 @@ msgid "Projection parameters"
msgstr "Projektion parametre"
msgid "False easting and false northing"
-msgstr ""
+msgstr "Falsk østlig og nordlig afstand"
msgid "Central meridian"
-msgstr ""
+msgstr "Centrale meridian"
msgid "Scaling factor"
msgstr "Skaleringsfaktor"
@@ -11412,21 +11685,6 @@ msgstr "Swiss Grid (Switzerland)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (uden lokale korrigeringer)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zone"
-
-msgid "North"
-msgstr "Nord"
-
-msgid "South"
-msgstr "Syd"
-
-msgid "Hemisphere"
-msgstr "Halvkugle"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11448,6 +11706,21 @@ msgstr "UTM Frankrig (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM geodætiske system"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zone"
+
+msgid "North"
+msgstr "Nord"
+
+msgid "South"
+msgstr "Syd"
+
+msgid "Hemisphere"
+msgstr "Halvkugle"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Tester OSM API URL ''{0}''"
@@ -11513,8 +11786,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Markér for at bruge Oauth som autentikationsmekanisme"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11523,21 +11796,25 @@ msgstr "OSM-brugernavn:"
msgid "OSM password:"
msgstr "OSM-adgangskode:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Advarsel: Kunne ikke hente OSM-brugerinfo fra brugerinfo-håndteringen."
msgid "Current credential manager is of type ''{0}''"
msgstr "Nuværende brugerinfohåndtering er af typen \"{0}\""
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "Advarsel: Kunne ikke gemme OSM-brugerinfo i brugerinfohåndteringen."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -11626,24 +11903,15 @@ msgid "Use a SOCKS proxy"
msgstr "Brug en SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Advarsel: JOSM er konfigureret til at bruge proxyer fra systemindstillingen, "
-"men JVM’et er ikke konfigureret til at finde dem. Nulstiller indstillinger "
-"til \"Ingen proxy\"."
-
-msgid "disabled"
-msgstr "slået fra"
-
-msgid "no modifier"
-msgstr "ingen tilføjelse"
msgid "Shortcut Background: User"
-msgstr ""
+msgstr "Genvej baggrund: Bruger"
msgid "Shortcut Background: Modified"
-msgstr ""
+msgstr "Genvej baggrund: Ændret"
msgid "Use default"
msgstr "Brug standard"
@@ -11680,38 +11948,46 @@ msgstr "Slet markeringen i tag-tabellen"
msgid "Add a new tag"
msgstr "Tilføj en ny tag"
-msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgid "Paste tags from buffer"
+msgstr "Indsæt tags fra buffer"
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Brug prædefinition \"{0}\" af gruppe \"{1}\""
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Brug prædefinition \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Elementer af typen {0} er understøttet."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Ret {0} objekt"
+msgstr[1] "Ret {0} objekter"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
+msgid "Nothing selected!"
+msgstr "Intet er valgt!"
-msgid "More information about this feature"
-msgstr "Mere information om denne feature"
+msgid "Selection unsuitable!"
+msgstr "Markering uegnet!"
+
+msgid "Apply Preset"
+msgstr "Anvend prædefinition"
+
+msgid "New relation"
+msgstr "Ny relation"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Ukendt krav: {0}"
msgid "Illegal member expression: {0}"
-msgstr ""
+msgstr "Ugyldig medlemsudtryk: {0}"
+
+msgid "More information about this feature"
+msgstr "Mere information om denne funktion"
msgid "Available roles"
msgstr "Tilgængelige roller"
@@ -11728,52 +12004,42 @@ msgstr "elementer"
msgid "Optional Attributes:"
msgstr "Valgfri attributter:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Brug prædefinition \"{0}\" af gruppe \"{1}\""
+msgid "Select auto-increment of {0} for this field"
+msgstr "Vælg auto-forøgelse på {0} for dette felt"
-msgid "Use preset ''{0}''"
-msgstr "Brug prædefinition \"{0}\""
+msgid "Cancel auto-increment for this field"
+msgstr "Annuller auto-forøgelse for dette felt"
-msgid "Unknown type: {0}"
-msgstr "Ukendt type: {0}"
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Kunne ikke læse kilde med prædefinerede tags: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Fejl ved fortolkning af {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Elementer af typen {0} er understøttet."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Ret {0} objekt"
-msgstr[1] "Ret {0} objekter"
-
-msgid "Nothing selected!"
-msgstr "Intet er valgt!"
-
-msgid "Selection unsuitable!"
-msgstr "Markering uegnet!"
-
-msgid "Apply Preset"
-msgstr "Anvend prædefinition"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "New relation"
-msgstr "Ny relation"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Change Properties"
-msgstr "Ret egenskaber"
+msgid "Unknown type: {0}"
+msgstr "Ukendt type: {0}"
msgid "Preset group {1} / {0}"
msgstr "Prædefinitionsgruppe {1} / {0}"
@@ -11781,6 +12047,18 @@ msgstr "Prædefinitionsgruppe {1} / {0}"
msgid "Preset group {0}"
msgstr "Prædefinitionsgruppe {0}"
+msgid "Roles cannot appear more than once"
+msgstr "Roller kan ikke optræde mere end én gang"
+
+msgid "Preset role element without parent"
+msgstr "Prædefineret rolleelement uden forælder"
+
+msgid "Preset sub element without parent"
+msgstr "Prædefineret under-element uden forælder"
+
+msgid "Error parsing {0}: "
+msgstr "Fejl ved fortolkning af {0}: "
+
msgid "Search preset"
msgstr "Søg prædefineret"
@@ -11796,6 +12074,16 @@ msgstr "Vis kun dem der kan bruges på markeringen"
msgid "Search in tags"
msgstr "Søg i tags"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Justerbar {0} ikke registreret endnu. Kan ikke sætte deltagelse i "
+"synkroniseret justering."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Justerbar {0} ikke registreret endnu."
+
msgid "All files (*.*)"
msgstr "Alle filer(*.*)"
@@ -11831,10 +12119,60 @@ msgstr ""
"Den aktuelle værdi er ikke et gyldig OSM ID. Indtast venligst en "
"heltalsværdi > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "falsk: egenskaben er eksplicit slået fra"
+
+msgid "true: the property is explicitly switched on"
+msgstr "sand: egenskaben er eksplicit slået til"
+
msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+"partial: different selected objects have different values, do not change"
msgstr ""
-"Vejen med det eksterne id \"{0}\" inkluderer manglende punkt med eksternt id "
+"opdelt: forskellige valgte objekter har forskellige værdier; skift ikke."
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "uangivet: sæt ikke denne egenskab for de valgte objekter"
+
+msgid "Cut"
+msgstr "Klip"
+
+msgid "Right click = copy to clipboard"
+msgstr "Højreklik = kopier til udklipsholderen"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Mangler obligatorisk attribut \"{0}\""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Ulovlig værdi af obligatorisk attribut \"{0}\" af type long. Fik \"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Ulovlig værdi af obligatorisk attribut \"{0}\" af type long (>=0). Fik "
+"\"{1}\"."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr "Ulovlig værdi for atributten \"{0}\" med typen double. Fik \"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Ulovlig værdi af obligatorisk attribut \"{0}\" af type boolean. Fik \"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Ulovlig værdi af obligatorisk attribut \"{0}\" af type OsmPrimitiveType. Fik "
+"\"{1}\"."
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Vejen med det eksterne id \"{0}\" inkluderer manglende punkt med eksternt id "
"\"{1}\"."
msgid "Deleted node {0} is part of way {1}"
@@ -11867,11 +12205,9 @@ msgid "Contacting OSM Server..."
msgstr "Kontakter OSM-serveren..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Advarsel: ugyldig brug af attributten \"{0}\" for elementet \"{1}\" i "
-"serverkapaciteten. Fik \"{2}\""
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Kunne ikke fortolke dato \"{0}\" meldt tilbage af serveren."
@@ -11912,40 +12248,27 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Ulovligt portnummer i indstilling ''{0}''. Fik ''{1}''"
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Advarsel: Uventet værdi af indstilling ''{0}'' fundet. Fik ''{1}''. Vil ikke "
-"bruge nogen proxy."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Advarsel: Uventede parametre for HTTP-proxy. Fik vært ''{0}'' og port "
-"''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Advarsel: Uventede parametre for SOCKS-proxy. Fik vært ''{0}'' og port "
-"''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Fejl: Forbindelse til proxy ''{0}'' for URI ''{1}'' fejlede. Undtagelse var: "
-"{2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Advarsel: JVM er ikke konfigureret til at bruge proxier fra system-"
-"indstillingerne. Egenskaben \"java.net.useSystemProxies\" manglede ved "
-"opstarten. Vil ikke bruge proxy."
msgid "Parsing response from server..."
msgstr "Fortolker svar fra server..."
@@ -12047,6 +12370,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
+msgid "(at line {0}, column {1})"
+msgstr "(ved linje {0}, kolonne {1})"
+
msgid "Unknown mode {0}."
msgstr "Ukendt tilstand {0}."
@@ -12062,15 +12388,21 @@ msgstr "Leder efter billedfiler"
msgid "No image files found."
msgstr "Ingen billedfiler fundet."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Kunne ikke åbne input-strøm for resurse ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Advarsel: kunne ikke åbne filen med udvidelsen \"{2}\" og navnedelen \"{3}\" "
-"i zip filen \"{0}\". Undtagelsen var: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Kunne ikke omdøbe filen {0} til {1}."
@@ -12154,8 +12486,8 @@ msgstr "Ukendte sætninger: {0}"
msgid "Zero coordinates: {0}"
msgstr "Nul-koordinater: {0}"
-msgid "NMEA import success"
-msgstr "NMEA-import succesfuld"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Fejl ved NMEAimport!"
@@ -12259,45 +12591,13 @@ msgstr "Ingen data fundet i filen {0}."
msgid "Open OsmChange file"
msgstr "Åben OsmChange fil"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Mangler obligatorisk attribut \"{0}\""
-
msgid "Unsupported version: {0}"
msgstr "Ikke understøttet version: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Ulovlig værdi af obligatorisk attribut \"{0}\" af type long. Fik \"{1}\"."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Ulovlig værdi af obligatorisk attribut \"{0}\" af type long (>=0). Fik "
-"\"{1}\"."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr "Ulovlig værdi for atributten \"{0}\" med typen double. Fik \"{1}\"."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Ulovlig værdi af obligatorisk attribut \"{0}\" af type boolean. Fik \"{1}\"."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Ulovlig værdi af obligatorisk attribut \"{0}\" af type OsmPrimitiveType. Fik "
-"\"{1}\"."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Advarsel ikkeunderstøttet startelement ''{0}'' i rettesætsindhold på "
-"position ({1},{2}). Springer over."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12307,11 +12607,9 @@ msgstr ""
"\"create\", \"modify\" eller \"delete\"."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Advarsel ikkeunderstøttet slutelement ''{0}'' i rettesætsindhold på position "
-"({1},{2}). Springer over."
msgid "Parsing changeset content ..."
msgstr "Fortolker indhold af rettesæt ..."
@@ -12339,11 +12637,8 @@ msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
"Kunne ikke signere en HTTP forbindelse med en OAuth Bekræftelses header"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Advarsel: Uventet værdi af indstilling ''{0}''. Fik ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(ved linje {0}, kolonne {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
@@ -12356,9 +12651,6 @@ msgstr ""
"<html>Der opstod en fejl ved forsøg på at gendanne backupfilen.<br>Fejlen "
"er:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kan ikke sikkerhedskopiere filen. Undtagelsen er: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM serverfiler gzip komprimeret"
@@ -12380,6 +12672,9 @@ msgstr "Ingen data fundet u filen \"{0}\"."
msgid "Open OSM file"
msgstr "Åben OSM fil"
+msgid "Reading was canceled"
+msgstr "Læsning blev annulleret"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12433,11 +12728,9 @@ msgstr ""
"Ulovlig værdi af attribut ''version'' på OSM-primitiv med ID {0}. Fik {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"Advarsel: Normaliserer værdi af attribut ''version'' i element {0} til {2}, "
-"API version er ''{3}''. Fik {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Ukendt eller ikke understøttet API version. Fik {0}."
@@ -12585,26 +12878,38 @@ msgid "Save user and password (unencrypted)"
msgstr "Gem brugernavn og adgangskode (ukrypteret)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<slet fra {0} objekter>"
+
+msgid "Old values of"
+msgstr "Gamle værdier på"
msgid "Add tags to selected objects"
msgstr "Tilføj tags til markerede objekter"
msgid "Add selected tags"
-msgstr ""
+msgstr "Tilføj markerede tags"
msgid "Add all tags"
-msgstr ""
+msgstr "Tilføj alle tags"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "Tilføj markerede tags til markerede objekter"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Shift+Enter: Tilføj alle tags til markerede objekter"
msgid "Assume"
msgstr "Formod"
+msgid "Existing values"
+msgstr "Eksisterende værdier"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Markér afkrydsningboksen for at acceptere værdien"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Accepter alle tags fra {0} i denne session"
+
msgid "Load data from API"
msgstr "Indlæs data fra API"
@@ -12629,25 +12934,36 @@ msgstr "Opret nye objekter"
msgid "Read protocol version"
msgstr "Læse protokolversionen"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
-msgstr "Advarsel: Kan ikke starte fjernstyringsserveren på på {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Fjernstyring::Accepterer forbindelser på port {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Fjernstyring::Server stoppet."
msgid "Remote Control has been asked to create a new node."
msgstr "Fjernstyring er blevet spurgt om at oprette et nyt punkt."
msgid "There is no layer opened to add node"
-msgstr ""
-
-msgid "Add way"
-msgstr "Tilføj vej"
+msgstr "Der er ikke åbnet noget lag, hvor der kan tilføjes punkt"
msgid "Remote Control has been asked to create a new way."
msgstr "Fjernstyring er blevet bedt om at oprette en ny vej."
msgid "Invalid coordinates: {0}"
-msgstr ""
+msgstr "Ugyldige koordinater: {0}"
msgid "There is no layer opened to add way"
+msgstr "Der er ikke åbnet noget lag, hvor der kan tilføjes vej"
+
+msgid "Add way"
+msgstr "Tilføj vej"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
msgstr ""
msgid ""
@@ -12657,7 +12973,7 @@ msgstr ""
"Fjernbetjeningen er blevet bedt om at hente et billedlag fra følgende URL:"
msgid "Remote imagery"
-msgstr ""
+msgstr "Fjernstyring billedlag"
msgid "Remote Control has been asked to import data from the following URL:"
msgstr "Fjernstyringen er blevet bedt om at importere data fra følgende URL:"
@@ -12665,6 +12981,15 @@ msgstr "Fjernstyringen er blevet bedt om at importere data fra følgende URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Fjernstyringen er blevet bedt om at indlæse data fra API’et."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12701,20 +13026,20 @@ msgstr "Data:"
msgid "local file"
msgstr "lokal fil"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Link til en OSM-datafil på din egen disk."
+msgid "Link to a GPX file on your local disk."
+msgstr ""
msgid "include"
msgstr "inkludér"
-msgid "Include OSM data in the .joz session file."
-msgstr "Inkludér OSM-data i .joz-sessionsfilen"
+msgid "Include GPX data in the .joz session file."
+msgstr ""
msgid "No file association"
msgstr "Ingen fil-association"
-msgid "OSM data will be included in the session file."
-msgstr "OSM-data vil blive inkluderet i sessionsfilen"
+msgid "GPX data will be included in the session file."
+msgstr ""
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -12739,6 +13064,15 @@ msgstr "Laget indeholder ej-gemte data - gem til fil."
msgid "Layer does not contain unsaved data."
msgstr "Laget indeholder ikke data der ikke er gemt."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Link til en OSM-datafil på din egen disk."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Inkludér OSM-data i .joz-sessionsfilen"
+
+msgid "OSM data will be included in the session file."
+msgstr "OSM-data vil blive inkluderet i sessionsfilen"
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -12746,6 +13080,9 @@ msgstr ""
"Version \"{0}\" af metadata for OSM datalaget er ikke understøttet. "
"Forventede: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Sessionsfil (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Kunne ikke finde filen \"{0}\"."
@@ -12820,18 +13157,14 @@ msgid "Download skipped"
msgstr "Download sprunget over"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Advarsel: Kan ikke downloade udvidelsen \"{0}\". Dets downloadlink er ikke "
-"kendt. Downloades ikke."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Advarsel: Kan ikke downloade udvidelsen \"{0}\". Dets download link \"{1}\" "
-"er ikke en gyldig URL. Downloades ikke."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Kunne ikke oprette udvidelsesmappen \"{0}\""
@@ -13001,11 +13334,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Udvidelses-opdatering mislykkedes"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Advarsel: kunne ikke finde udvidelsen {0}"
+msgid "Failed to find plugin {0}"
+msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "Advarsel: kunne ikke download listen med informationer om udvidelser"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Slå udvidelse fra."
@@ -13019,28 +13352,22 @@ msgstr "Behold udvidelse"
msgid "Click to keep the plugin ''{0}''"
msgstr "Klik for at beholde udvidelsen \"{0}\""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Advarsel: kunne ikke slette forældet udvidelse \"{0}\"."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Advarsel: kunne ikke installere allerede downloadet udvidelse \"{0}\". "
-"Springer over installationen. JOSM vil stadig indlæse den gamle version af "
-"udvidelsen."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Advarsel: kunne ikke installere udvidelsen \"{0}\" fra den midlertidigt "
-"downloade fil \"{1}\". Omdøbning mislykkedes."
msgid "Click to disable the plugin ''{0}''"
msgstr "Klik for at deaktivere udvidelsen \"{0}\""
@@ -13082,7 +13409,7 @@ msgstr ""
"ændre dette senere)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Ugyldig jar fil ''{0}''"
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "Udvidensesfilen \"{0}\" indeholder ikke et manifest."
@@ -13110,19 +13437,16 @@ msgid "Reading local plugin information.."
msgstr "Læser lokal udvidelsesinformation..."
msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "Behandler udvidelsesstedets cachefiler..."
msgid "Processing file ''{0}''"
msgstr "Behandler filen \"{0}\""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Advarsel: Kunne ikke skanne filen \"{0}\" for udvidelsesinformation. "
-"Springer over."
msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "Behandler udvidelsesstedets ikon cachefiler..."
msgid "Processing plugin files..."
msgstr "Behandler udvidelsesfiler..."
@@ -13133,13 +13457,28 @@ msgstr "Download udvidelsesliste..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Downloader udvidelsesliste fra \"{0}\""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "Skriver udvidelsesliste til lokal cache \"{0}\""
msgid "Parsing plugin list from site ''{0}''"
msgstr "Fortolker udvidelseslisten fra webstedet \"{0}\""
@@ -13503,6 +13842,9 @@ msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
"problem with transferring data.<br>Details (untranslated): {1}</html>"
msgstr ""
+"<html>Kunne ikke hverken uploade eller downloade data "
+"til/fra<br>''{0}''<br>på grund af et problem med at overføre "
+"data.<br>Detaljer(uoversatte): {1}</html>"
msgid ""
"<html>Failed to download data. Its format is either unsupported, ill-formed, "
@@ -13513,9 +13855,11 @@ msgid ""
"<html>The OSM server<br>''{0}''<br>reported an internal server "
"error.<br>This is most likely a temporary problem. Please try again later."
msgstr ""
+"<html>OSM serveren<br>''{0}''<br>rapporterede en intern serverfejl.<br>Dette "
+"er sandsynligvis et midlertidigt problem. Prøv venligst igen senere."
msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
+msgstr "OSM serveren ''{0}'' rapporetede en dårlig forespøgsel.<br>"
msgid ""
"The area you tried to download is too big or your request was too "
@@ -13571,23 +13915,12 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Kunne ikke finde billedet \"{0}\""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Advarsel: kunne ikke håndtere zip filen \"{0}\". Undtagelsen var: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Advarsel: kunne ikke tilgå mappen \"{0}\" af sikkerhedsårsager. Undtagelsen "
-"var: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Advarsel: kunne ikke udlede wiki sprogprædik fra JOSM sprogkoden \"{0}\". "
-"Bruger standard kode \"en\"."
msgid "{0}... [please type its number]"
msgstr "{0}... [indtast venligst dens nummer]"
@@ -13596,35 +13929,80 @@ msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgstr ""
+"Kunne ikke åbne URL''en. Der er ikke angivet nogen platform. Angiv først en "
+"platform."
+
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
msgid "reserved"
msgstr "reserveret"
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Der blev fundet {0} tag i bufferen, det er mistænkeligt!"
+msgstr[1] "Der blev fundet {0} tags i bufferen, det er mistænkeligt!"
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "Nøglen er for lang (maks {0} tegn):"
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "Mistænkelige tegn i nøglen:"
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "Værdien er for lang (maks {0} tegn):"
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Ønsker du at indsætte disse tags?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Ryd buffer"
msgid "Ignore warnings"
-msgstr ""
+msgstr "Ignorer advarsler"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
@@ -13633,8 +14011,22 @@ msgstr ""
"<html><p> Beklager, det er ikke muligt at indsætte tags fra udklipsholderen. "
"Den indeholder ikke noget JOSM objekt, eller passende tekst. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Højreklik = kopier til udklipsholderen"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -13685,10 +14077,10 @@ msgid ""
msgstr ""
msgid "Unexpected token ({0}) on position {1}"
-msgstr ""
+msgstr "Uventet token ({0}) i position {1}"
msgid "Unexpected token on position {0}. Expected {1}, found {2}"
-msgstr ""
+msgstr "Uventet token i position {0}. Forventede {1}, fandt {2}"
msgid "Error while parsing search expression on position {0}"
msgstr ""
@@ -13965,6 +14357,11 @@ msgid "Saturation:"
msgstr "Mætning:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14051,6 +14448,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Finder og fikser ugyldige gade-adresse på en nem måde."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14091,6 +14492,8 @@ msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
"not in huge cache directories"
msgstr ""
+"Denne eksperimentale udvidelse lader JOSM gemme terncachen i databasefiler, "
+"i stedet for store cachemapper"
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14159,19 +14562,16 @@ msgid "Merge overlapping part of ways."
msgstr "Sammenlæg overlappende dele af veje."
msgid "Adds no left turn for sets of 4 or 5 ways"
-msgstr ""
+msgstr "Tilføjer \"ingen venstresving\" for sæt af 4 eller 5 veje"
msgid "Simplifies download from different read-only APIs."
msgstr "Gør download fra forskellige kun-læs API’ere nemmere."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Omdanner et område til en multipolygon."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
msgid "NanoLog adjustment and browsing layer"
-msgstr ""
+msgstr "NanoLog tilpasnings- og visningslag"
msgid ""
"Use your system''s password manager to store the API username and password. "
@@ -14233,6 +14633,9 @@ msgstr ""
"Skriv gps positionsinfo i billed-filheaderen. Kør denne funktion fra "
"højrekliksmenuen for billedlaget."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14244,7 +14647,7 @@ msgid "The great JGoodies Plastic Look and Feel."
msgstr ""
msgid "Read and write osmosis poly filter files"
-msgstr ""
+msgstr "Læs og skriv osmosis poly filter filer"
msgid "Adds map printing to JOSM"
msgstr "Tilføje kortudskrivning til JOSM"
@@ -14261,9 +14664,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Panel til oprettelse og redigering af relationer og multipolygoner."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Tilføjer Genstart JOSM emne til menuen Filer."
-
msgid "Plugin for reverting changesets"
msgstr "Plugin for tilbagerulning af rettesæt"
@@ -14294,9 +14694,6 @@ msgstr ""
"kan blive begrænset af den maksimalt fjernede områdestørrelse. Normalisér "
"også nærliggende punkter."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Opret og rediger søkort for OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -14339,6 +14736,11 @@ msgstr ""
"Optegner bgninger fra Tjekkisk cadastral kort. Kræver at TracerServer (.Net "
"eller Mono) kører."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Udvidelse til at signere OSM-data digitalt"
@@ -14390,9 +14792,6 @@ msgstr ""
"Kør en racerbil fra punkt A til punkt B over luftfoto, efterladende "
"kaktusser."
-msgid "Highways"
-msgstr "Veje"
-
msgid "Streets"
msgstr "Veje"
@@ -14477,6 +14876,9 @@ msgstr "Vold"
msgid "Lit"
msgstr "Oplyst"
+msgid "Toll"
+msgstr "Betalingsanlæg"
+
msgid "Motorway Link"
msgstr "Motorvejsforbindelse"
@@ -14532,10 +14934,10 @@ msgid "Edit Secondary Road"
msgstr "Rediger sekundær vej"
msgid "Secondary Link"
-msgstr ""
+msgstr "Sekundær forbindelse"
msgid "Edit Secondary Link"
-msgstr ""
+msgstr "Rediger sekundær forbindelse"
msgid "Tertiary"
msgstr "Tertiær"
@@ -14544,10 +14946,10 @@ msgid "Edit Tertiary Road"
msgstr "Rediger tertiær vej"
msgid "Tertiary Link"
-msgstr ""
+msgstr "Tertiær forbindelse"
msgid "Edit Tertiary Link"
-msgstr ""
+msgstr "Rediger tertiær forbindelse"
msgid "Unclassified"
msgstr "Uklassificeret"
@@ -14556,7 +14958,7 @@ msgid "Edit Unclassified Road"
msgstr "Rediger uklassificeret vej"
msgid "Passing Places"
-msgstr "Passerer steder"
+msgstr "Vigesteder"
msgid "Width (meters)"
msgstr "Bredde (meter)"
@@ -14567,6 +14969,50 @@ msgstr "Beboelse"
msgid "Edit Residential Street"
msgstr "Ret beboelsesgade"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Vej-type"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "ja"
+
+msgid "no"
+msgstr "nej"
+
+msgid "destination"
+msgstr "destination"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Legegade"
@@ -14585,10 +15031,10 @@ msgstr "Område"
msgid "Service"
msgstr "Service"
-msgid "Edit Serviceway"
-msgstr "Ret servicevej"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -14600,6 +15046,9 @@ msgstr "indkørsel"
msgid "parking_aisle"
msgstr "Vej mellem parkeringsbåse"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Vej mellem parkeringsbåse"
@@ -14627,18 +15076,12 @@ msgstr "rundkørsel"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "ja"
-
msgid "Road Restrictions"
msgstr "Adgangsbegrænsninger"
msgid "Edit Road Restrictions"
msgstr "Ret adgangsbegrænsninger"
-msgid "Toll"
-msgstr "Betalingsanlæg"
-
msgid "No exit (cul-de-sac)"
msgstr "Blind vej"
@@ -14648,9 +15091,6 @@ msgstr ""
msgid "General Access"
msgstr "Generel adgang"
-msgid "destination"
-msgstr "destination"
-
msgid "delivery"
msgstr "levering"
@@ -14660,15 +15100,15 @@ msgstr "tilladt"
msgid "private"
msgstr "privat"
+msgid "customers"
+msgstr "kunder"
+
msgid "agricultural"
msgstr "landbrug"
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "nej"
-
msgid "official"
msgstr "officielt"
@@ -14714,6 +15154,9 @@ msgstr "Busser"
msgid "Public Service Vehicles (psv)"
msgstr "Offentlig transport"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. hastighed (km/t)"
@@ -14798,6 +15241,9 @@ msgstr "Rediger bro"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14820,7 +15266,7 @@ msgid "Edit Track"
msgstr "Rediger kørespor"
msgid "Tracktype"
-msgstr ""
+msgstr "Sportype"
msgid "grade1"
msgstr ""
@@ -14838,7 +15284,7 @@ msgid "grade5"
msgstr ""
msgid "MTB Scale"
-msgstr ""
+msgstr "MTB skala"
msgid "General access"
msgstr "Generel adgang"
@@ -14850,7 +15296,7 @@ msgid "Edit Path"
msgstr "Redigér sti"
msgid "SAC Scale"
-msgstr ""
+msgstr "SAC skala"
msgid "T1 - hiking trail"
msgstr ""
@@ -14902,20 +15348,29 @@ msgstr ""
msgid "Visibility"
msgstr "Synlighed"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "fremragnede"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "god"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "nogenlunde"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "dårlig"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "forfærdelig"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Kørestole"
@@ -14932,11 +15387,11 @@ msgstr "Dedikeret ridesti"
msgid "Edit Bridleway"
msgstr "Ret ridesti"
-msgid "Cycle Lane"
-msgstr "Cykelspor"
+msgid "Cycle Lane/Track"
+msgstr "Cykel-bane/spor"
-msgid "Edit Cycle Lane"
-msgstr "Rediger cykelbane"
+msgid "Edit Cycle Lane or Track"
+msgstr "Rediger cykelbane eller spor"
msgid "Cycleway"
msgstr "Cykelsti"
@@ -14948,19 +15403,19 @@ msgid "track"
msgstr "spor"
msgid "opposite_lane"
-msgstr ""
+msgstr "modsat bane"
msgid "opposite_track"
-msgstr ""
+msgstr "modsat spor"
msgid "opposite"
-msgstr ""
+msgstr "modsat"
msgid "share_busway"
-msgstr ""
+msgstr "delt busvej"
msgid "shared_lane"
-msgstr ""
+msgstr "delt bane"
msgid "Cycleway left"
msgstr "Cykelsti venstre"
@@ -14971,8 +15426,8 @@ msgstr "Cykelsti højre"
msgid "Oneway (bicycle)"
msgstr "Ensrettet (cykel)"
-msgid "Edit Highway"
-msgstr "Rediger highway"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Hovedvej"
@@ -15008,7 +15463,7 @@ msgid "Amount of Steps"
msgstr "Antal trin"
msgid "Waypoints"
-msgstr "Vejpunkter"
+msgstr "Waypoints"
msgid "Motorway Junction"
msgstr "Motorvejskryds"
@@ -15040,12 +15495,18 @@ msgstr "Rasteplads"
msgid "Edit Rest Area"
msgstr "Rediger rasteplads"
-msgid "Emergency Phone"
-msgstr "Nødtelefon"
+msgid "Drinking Water"
+msgstr "Vandpost"
msgid "Traffic Signal"
msgstr "Færdselssignal"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Type af fodgængerfelt"
@@ -15053,7 +15514,7 @@ msgid "uncontrolled"
msgstr "ukontrolleret"
msgid "traffic_signals"
-msgstr "trafik_lys"
+msgstr "traffic_signals"
msgid "island"
msgstr "helleanlæg"
@@ -15061,15 +15522,6 @@ msgstr "helleanlæg"
msgid "unmarked"
msgstr "uden markering"
-msgid "Cross on horseback"
-msgstr "Overgangssted for ridende"
-
-msgid "Cross by bicycle"
-msgstr "Overkørsel for cykler"
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -15091,6 +15543,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr "Overkørsel for cykler"
+
+msgid "Cross on horseback"
+msgstr "Overgangssted for ridende"
+
msgid "Stop"
msgstr "Stop"
@@ -15100,6 +15561,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rundkørsel"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Retning"
@@ -15109,11 +15573,8 @@ msgstr "med uret"
msgid "Pedestrian Crossing"
msgstr "Fodgængerfelt"
-msgid "Edit Crossing"
-msgstr "Ret fodgængerovergang"
-
-msgid "Type name (UK)"
-msgstr "Typenavn (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "trafikdæmpning"
@@ -15122,31 +15583,28 @@ msgid "Edit Traffic Calming"
msgstr "Rediger trafikdæmpning"
msgid "bump"
-msgstr ""
+msgstr "bump"
msgid "chicane"
-msgstr ""
+msgstr "chikane"
msgid "choker"
-msgstr ""
+msgstr "indsnævring"
msgid "cushion"
msgstr ""
msgid "hump"
-msgstr ""
+msgstr "hump"
msgid "rumble_strip"
-msgstr ""
+msgstr "rumlestriber"
msgid "table"
msgstr ""
msgid "Passing Place"
-msgstr "Passerer sted"
-
-msgid "Edit Passing Place"
-msgstr "Rediger passagested"
+msgstr "Vigested"
msgid "Turning Circle"
msgstr "Vendeplads"
@@ -15181,20 +15639,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barrierer"
+msgid "Block"
+msgstr "Betonblok/stor sten"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Tilladt trafik:"
+
+msgid "Material"
+msgstr "Materiale"
+
+msgid "stone"
+msgstr "sten"
+
msgid "Bollard"
msgstr "Pæl"
msgid "Edit Bollard"
msgstr "Ret en pæl"
-msgid "Allowed traffic:"
-msgstr "Tilladt trafik:"
+msgid "Bollard type"
+msgstr "Pæletype"
+
+msgid "rising"
+msgstr "opstigende"
+
+msgid "removable"
+msgstr "flytbar"
+
+msgid "plastic"
+msgstr "plastik"
msgid "Cycle Barrier"
msgstr "Cykelhindring"
-msgid "Block"
-msgstr "Betonblok/stor sten"
+msgid "Edit Cycle Barrier"
+msgstr "Rediger cykelhindring"
msgid "Cattle Grid"
msgstr "Kreaturrist"
@@ -15205,11 +15687,14 @@ msgstr "Ret en kreaturrist"
msgid "Bus Trap"
msgstr "Bussluse"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Pigge"
msgid "Edit Spikes"
-msgstr ""
+msgstr "Rediger pigge"
msgid "Toll Booth"
msgstr "Betalingsanlæg"
@@ -15226,44 +15711,88 @@ msgstr "Ret grænsekontrol"
msgid "Hedge"
msgstr "Hæk"
+msgid "Edit Hedge"
+msgstr "Rediger hæk"
+
+msgid "Height (meters)"
+msgstr "Højde (meter)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr "Arter"
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Hegn"
+msgid "Edit Fence"
+msgstr "Rediger hegn"
+
msgid "barbed_wire"
msgstr "pigtråd"
-msgid "chain"
-msgstr "Trådhegn"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "elektrisk"
-msgid "hedge"
-msgstr ""
-
msgid "pole"
msgstr "stang"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Mur"
+msgid "Edit Wall"
+msgstr "Rediger mur"
+
msgid "City Wall"
msgstr "Bymur"
+msgid "Edit City Wall"
+msgstr "Rediger bymur"
+
msgid "Retaining Wall"
msgstr "Støttemur"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Grøft"
-msgid "Entrance"
-msgstr "Indgang"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Ret indgang"
+msgid "Kerb"
+msgstr "Kantsten"
+
+msgid "Edit Kerb"
+msgstr "Rediger kantsten"
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Låge/led"
@@ -15295,12 +15824,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr "Kæde"
+
+msgid "Edit Chain"
+msgstr "Rediger kæde"
+
msgid "Stile"
msgstr "Stente"
msgid "Edit Stile"
msgstr "Ret en stente"
+msgid "ladder"
+msgstr "stige"
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Tælleapparat"
@@ -15314,16 +15858,16 @@ msgid "Edit Sally Port"
msgstr "Ret en udfaldsport"
msgid "Passageways"
-msgstr ""
+msgstr "Passager"
msgid "Edit Tunnel"
msgstr "Rediger tunnel"
msgid "Building Passage"
-msgstr ""
+msgstr "Bygningspassage"
msgid "Edit Building Passage"
-msgstr ""
+msgstr "Rediger bygningspassage"
msgid "Arcade"
msgstr "Arkade"
@@ -15332,10 +15876,10 @@ msgid "Edit Arcade"
msgstr "Rediger arkade"
msgid "Open on left side"
-msgstr ""
+msgstr "Åben på venstre side"
msgid "Open on right side"
-msgstr ""
+msgstr "Åben på højre side"
msgid "Colonnade"
msgstr "Kolonnade"
@@ -15358,6 +15902,9 @@ msgstr "Dræn"
msgid "Edit Drain"
msgstr "Ret dræn"
+msgid "Ditch"
+msgstr "Grøft"
+
msgid "Edit Ditch"
msgstr "Redigér grøft"
@@ -15367,6 +15914,12 @@ msgstr "Bæk"
msgid "Edit Stream"
msgstr "Ret bæk"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -15406,9 +15959,6 @@ msgstr "Ret dæmning"
msgid "Groyne"
msgstr "Høfde"
-msgid "Edit Groyne"
-msgstr "Redigér høfde"
-
msgid "Breakwater"
msgstr "Bølgebryder"
@@ -15442,6 +15992,21 @@ msgstr "Ret overdækket reservoir"
msgid "Edit Water"
msgstr "Ret vandområde"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Land"
@@ -15523,18 +16088,23 @@ msgstr "Ret færgehavn"
msgid "Cargo"
msgstr "Fragt"
+msgctxt "cargo"
msgid "passengers"
-msgstr "passagere"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "køretøj"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "cykel"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -15551,10 +16121,10 @@ msgid "Edit Marina"
msgstr "Ret lystbådehavn"
msgid "Pier"
-msgstr "Mole"
+msgstr "Bådebro"
msgid "Edit Pier"
-msgstr "Ret mole"
+msgstr "Ret bådebro"
msgid "Lock Gate"
msgstr "Sluseport"
@@ -15596,7 +16166,7 @@ msgid "main"
msgstr ""
msgid "branch"
-msgstr ""
+msgstr "gren"
msgid "industrial"
msgstr "industri"
@@ -15607,7 +16177,10 @@ msgstr "militær"
msgid "tourism"
msgstr "turisme"
-msgid "Service/Type"
+msgid "freight"
+msgstr "fragt"
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15631,24 +16204,24 @@ msgstr ""
msgid "rail"
msgstr "bane"
-msgid "Voltage"
-msgstr "Spænding"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frekvens (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "16.7"
+msgid "16.67"
msgstr ""
+msgid "16.7"
+msgstr "16.7"
+
msgid "Narrow Gauge Rail"
msgstr "Smalsporet bane"
msgid "Edit Narrow Gauge Rail"
msgstr "Ret smalsporet jernbane"
-msgid "Types"
-msgstr "Typer"
-
msgid "Monorail"
msgstr "Monorail"
@@ -15691,18 +16264,56 @@ msgstr "Ubrugt jernbanespor"
msgid "Edit Disused Railway"
msgstr "Ret ubrugt jernbanespor"
-msgid "Optional Types"
-msgstr "Valgfri typer"
-
msgid "Abandoned Rail"
msgstr "Fjernet jernbane"
+msgid "Edit Abandoned Railway"
+msgstr "Rediger forladt jernbane"
+
msgid "Level Crossing"
msgstr "Jernbaneoverskæring"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr "Overvåget"
+
+msgid "Traffic lights"
+msgstr "Trafiklys"
+
+msgid "Sound signals"
+msgstr "Lydsignaler"
+
+msgid "Barrier"
+msgstr "Afgrænsning"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Fodgængerovergang (over jernbane)"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Overgangstype"
@@ -15737,7 +16348,7 @@ msgid "Has bubble?"
msgstr ""
msgid "Has heating?"
-msgstr ""
+msgstr "Opvarmet?"
msgid "Drag Lift"
msgstr "Træklift"
@@ -15764,10 +16375,10 @@ msgid "Number of people per gondola"
msgstr "Antal personer per gondol"
msgid "Mixed Lift"
-msgstr ""
+msgstr "Blandet lift"
msgid "Edit Mixed Lift (containing both gondolas and chairs)"
-msgstr ""
+msgstr "Rediger blandet lift (har både gondoler og stole)"
msgid "Number of people per gondola/chair"
msgstr "Antal personer per gondol/stol"
@@ -15802,13 +16413,11 @@ msgstr "Flyvende tæppe"
msgid "Edit Magic Carpet"
msgstr "Redigér flyvende tæppe"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Varer"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Redigér varer"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -15818,11 +16427,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Rediger station"
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15841,12 +16448,12 @@ msgstr "overflade"
msgid "underground"
msgstr "underjordisk"
+msgid "rooftop"
+msgstr "taget"
+
msgid "Access"
msgstr "Adgang"
-msgid "customers"
-msgstr "kunder"
-
msgid "Park and Ride"
msgstr "Parkér og kør"
@@ -15874,9 +16481,6 @@ msgstr "Parkeringsbås"
msgid "Edit Parking space"
msgstr "Rediger parkeringsbås"
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Kapacitet"
@@ -15892,20 +16496,36 @@ msgstr "Tidsbegrænsning (minutter)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Overvåget"
-
msgid "Opening Hours"
msgstr "Åbningstider"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mandag-Fredag 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Parkeringsindkørsel"
@@ -15995,7 +16615,7 @@ msgid "convenience"
msgstr ""
msgid "kiosk"
-msgstr ""
+msgstr "kiosk"
msgid "Fuel types:"
msgstr "Brændstoftyper:"
@@ -16054,6 +16674,9 @@ msgstr "Opladestation"
msgid "Edit Charging Station (for electric cars)"
msgstr "Ret opladestation (for elektriske biler)"
+msgid "Voltage"
+msgstr "Spænding"
+
msgid "Amperage"
msgstr "Ampere"
@@ -16075,6 +16698,12 @@ msgstr "Bilmekaniker"
msgid "Edit Car Repair"
msgstr "Ret bilmekaniker"
+msgid "Parts"
+msgstr "Dele"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Dæk"
@@ -16102,6 +16731,12 @@ msgstr "Udlejning"
msgid "Edit Car Rental"
msgstr "Ret biludlejning"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "kun"
+
msgid "Sharing"
msgstr "Deling"
@@ -16126,27 +16761,11 @@ msgstr "Services:"
msgid "Sale"
msgstr "Udsalg"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "ja"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "mærke"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "brugt"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "nej"
-
msgid "brand"
msgstr "mærke"
msgid "oldtimer"
-msgstr ""
+msgstr "veteran"
msgid "Safety inspection"
msgstr "Sikkerhedsinspektion"
@@ -16163,9 +16782,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Dele"
-
msgid "Clothes"
msgstr "Tøj"
@@ -16182,7 +16798,7 @@ msgid "informal"
msgstr ""
msgid "lockers"
-msgstr ""
+msgstr "skabe"
msgid "shed"
msgstr "skur"
@@ -16218,7 +16834,7 @@ msgid "Free bicycle pump"
msgstr "Gratis pumpning af cykler"
msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
-msgstr ""
+msgstr "Værktøj til gør-det-selv reparationer (kan være et cykel fællesskab)"
msgid "Bicycles are washed (for a fee)"
msgstr "Cykler vaskes (for et beløb)"
@@ -16229,8 +16845,8 @@ msgstr "Ret cykeludlejning"
msgid "Public Transport"
msgstr "Offentlig transport"
-msgid "Route"
-msgstr "Rute"
+msgid "Public transport route"
+msgstr "Offentlig transportrute"
msgid "Edit Route"
msgstr "Ret rute"
@@ -16254,7 +16870,7 @@ msgid "bus"
msgstr "bus"
msgid "trolleybus"
-msgstr ""
+msgstr "trolleybus"
msgid "aerialway"
msgstr ""
@@ -16269,7 +16885,7 @@ msgid "To (terminal stop)"
msgstr "Til (sidste stop)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Via (mellemliggende stop)"
msgid "Network"
msgstr "Netværk"
@@ -16331,13 +16947,13 @@ msgid "platform (entry only)"
msgstr "platform (kun indgang)"
msgid "Route master"
-msgstr ""
+msgstr "Rutemaster"
msgid "Edit Route master"
-msgstr ""
+msgstr "Rediger rutemaster"
msgid "route variant/direction (at least 2)"
-msgstr ""
+msgstr "rute variant/retning (mindst 2)"
msgid "Stop Area"
msgstr "Stopområde"
@@ -16352,7 +16968,7 @@ msgid "UIC name"
msgstr "UIC navn"
msgid "Stop Position"
-msgstr ""
+msgstr "Stopposition"
msgid "Platform"
msgstr "Platform"
@@ -16360,6 +16976,9 @@ msgstr "Platform"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Bus"
@@ -16379,17 +16998,20 @@ msgid "Railway halt (legacy)"
msgstr "Jernbanestop (gammel)"
msgid "Trolleybus"
-msgstr ""
+msgstr "Trolleybus"
msgid "Share taxi"
-msgstr ""
+msgstr "Deletaxi"
msgid "Funicular"
-msgstr ""
+msgstr "Kabelbane"
msgid "Ferry"
msgstr "Færge"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bænk"
@@ -16402,9 +17024,6 @@ msgstr "kørestol"
msgid "limited"
msgstr "begrænset"
-msgid "only"
-msgstr "kun"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16412,11 +17031,16 @@ msgid "Railway platform (legacy)"
msgstr "Jernbaneplatform (gammel)"
msgid "funicular"
-msgstr ""
+msgstr "kabelbane"
+msgctxt "railway"
msgid "Station"
msgstr "Station"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Rediger station"
+
msgid "Building"
msgstr "Bygning"
@@ -16429,6 +17053,9 @@ msgstr "Ret nedgang til undergrundsbane"
msgid "Ticket Machine"
msgstr "Billetautomat"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Referencenummer"
@@ -16448,19 +17075,11 @@ msgid "Credit cards"
msgstr "Kreditkort"
msgid "Account or loyalty cards"
-msgstr ""
+msgstr "Konto eller loyalitetsskort"
msgid "Public Transport (legacy)"
msgstr "Offentlig transport (gammel)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Station"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Rediger station"
-
msgid "UIC-Reference"
msgstr "UIC-reference"
@@ -16509,8 +17128,8 @@ msgstr "Ret bus-platform"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Ret taxiholdeplads"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Lufthavn"
@@ -16546,7 +17165,7 @@ msgid "Edit Helipad"
msgstr "Rediger helikopterlandingsplads"
msgid "Apron"
-msgstr "Forklæde"
+msgstr "Forplads"
msgid "Hangar"
msgstr "Hangar"
@@ -16563,6 +17182,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Redigér terminal"
+msgid "Internet access"
+msgstr "Internet-adgang"
+
+msgid "wlan"
+msgstr "wlan"
+
+msgid "wired"
+msgstr "kablet"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Gebyr for Internet-adgang"
+
msgctxt "airport"
msgid "Gate"
msgstr "Gate"
@@ -16585,21 +17219,6 @@ msgstr "Ret hotel"
msgid "Stars"
msgstr "Stjerner"
-msgid "Internet access"
-msgstr "Internet-adgang"
-
-msgid "wlan"
-msgstr "wlan"
-
-msgid "wired"
-msgstr "kablet"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Gebyr for Internet-adgang"
-
msgid "Smoking"
msgstr "Rygning"
@@ -16783,6 +17402,12 @@ msgstr "Natklub"
msgid "Edit Nightclub"
msgstr "Ret natklub"
+msgid "Stripclub"
+msgstr "Stripklub"
+
+msgid "Edit Stripclub"
+msgstr "Rediger stripklub"
+
msgid "Tourism"
msgstr "Turisme"
@@ -16804,9 +17429,15 @@ msgstr "Udkigstårn"
msgid "Information Office"
msgstr "Informationskontor"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Kort"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -16819,6 +17450,9 @@ msgstr "gade"
msgid "scheme"
msgstr "skema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Vist område"
@@ -16858,11 +17492,14 @@ msgstr "... andre transporttyper er mulige"
msgid "Information Board"
msgstr "Informationstavle"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
msgid "notice"
-msgstr ""
+msgstr "oplysning"
msgid "history"
msgstr "historik"
@@ -16879,23 +17516,35 @@ msgstr "planter"
msgid "Guidepost"
msgstr "Guide post"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Informations terminal"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Nærmere beskrivelse"
msgid "Audioguide"
msgstr "Audio guide"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Lydguide via mobiltelefon?"
msgid "Phone number"
msgstr "Telefonnummer"
-msgid "Other Information Points"
-msgstr "Andre informations punkter"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Rekreation"
@@ -16918,9 +17567,6 @@ msgstr "Hundepark"
msgid "Edit Dog Park"
msgstr "Redigér hundepark"
-msgid "Barrier"
-msgstr "Afgrænsning"
-
msgid "fence"
msgstr "hegn"
@@ -16945,8 +17591,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Redigér sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr "Hesteridning"
+
+msgid "Edit Horse riding"
+msgstr "Rediger hesteridning"
+
+msgid "Brothel"
+msgstr "Bordel"
+
+msgid "Edit Brothel"
+msgstr "Rediger bordel"
msgid "Playground"
msgstr "Legeplads"
@@ -17018,50 +17673,44 @@ msgstr "Kunstværk"
msgid "Edit Artwork"
msgstr "Ret kunstværk"
-msgid "Place of Worship"
-msgstr "Sted for tilbedelse"
-
-msgid "Edit Place of Worship"
-msgstr "Ret sted for tilbedelse"
-
-msgid "Religion"
-msgstr "Religion"
+msgid "Recording Studio"
+msgstr "Lydstudie"
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr "Rediger studie"
-msgid "buddhist"
-msgstr "buddhistisk"
+msgid "audio"
+msgstr "lyd"
-msgid "christian"
-msgstr "kristen"
+msgid "video"
+msgstr "video"
-msgid "hindu"
-msgstr "hinduistisk"
+msgid "Place of Worship"
+msgstr "Sted for tilbedelse"
-msgid "jain"
-msgstr "jainistisk"
+msgid "Church"
+msgstr "Kirke"
-msgid "jewish"
-msgstr "jødisk"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muslimsk"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritistisk"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoistisk"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitar"
+msgid "church"
+msgstr "kirke"
-msgid "zoroastrian"
-msgstr "zoroastristisk"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Trosretning"
@@ -17078,6 +17727,12 @@ msgstr "katolsk"
msgid "evangelical"
msgstr "evangelisk"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Jehovas Vidner"
@@ -17090,6 +17745,9 @@ msgstr "metodistisk"
msgid "mormon"
msgstr "mormonsk"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoks"
@@ -17105,70 +17763,173 @@ msgstr "protestantisk"
msgid "quaker"
msgstr "kvæker"
-msgid "shia"
-msgstr "shiitisk"
+msgid "roman_catholic"
+msgstr "Romersk katolsk"
-msgid "sunni"
-msgstr "sunnitisk"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Servicetider"
-msgid "Su 10:00"
-msgstr "Su 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Su 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Su 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Åbningstider for besøg"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Lydstudie"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Rediger studie"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
-msgid "audio"
-msgstr "lyd"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "Offentlig bygning"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Ret offentlig bygning"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Rådhus"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Ret rådhus"
+msgid "shia"
+msgstr "shiitisk"
-msgid "Community Centre"
-msgstr "Medborgerhus"
+msgid "sunni"
+msgstr "sunnitisk"
-msgid "Embassy"
-msgstr "Ambassade"
+msgid "Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Ret ambassade"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Domhus"
+msgid "synagogue"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Ret domhus"
+msgid "conservative"
+msgstr ""
-msgid "Prison"
-msgstr "Fængsel"
+msgid "reform"
+msgstr ""
-msgid "Edit Prison"
+msgid "Buddhist Temple"
+msgstr ""
+
+msgid "Edit Buddhist Temple"
+msgstr ""
+
+msgid "theravada"
+msgstr ""
+
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religion"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jainistisk"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritistisk"
+
+msgid "taoist"
+msgstr "taoistisk"
+
+msgid "unitarian"
+msgstr "unitar"
+
+msgid "zoroastrian"
+msgstr "zoroastristisk"
+
+msgid "Public Building"
+msgstr "Offentlig bygning"
+
+msgid "Edit Public Building"
+msgstr "Ret offentlig bygning"
+
+msgid "Town hall"
+msgstr "Rådhus"
+
+msgid "Edit Town hall"
+msgstr "Ret rådhus"
+
+msgid "Community Centre"
+msgstr "Medborgerhus"
+
+msgid "Embassy"
+msgstr "Ambassade"
+
+msgid "Edit Embassy"
+msgstr "Ret ambassade"
+
+msgid "Courthouse"
+msgstr "Domhus"
+
+msgid "Edit Courthouse"
+msgstr "Ret domhus"
+
+msgid "Prison"
+msgstr "Fængsel"
+
+msgid "Edit Prison"
msgstr "Ret fængsel"
msgid "Police"
@@ -17225,6 +17986,12 @@ msgstr "Ret køreskole"
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Sundhed"
@@ -17234,6 +18001,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Ret Hospital"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Lægehus"
@@ -17253,10 +18026,10 @@ msgid "Edit Nursing Home"
msgstr "Redigér plejehjem"
msgid "Retirement Home"
-msgstr ""
+msgstr "Plejehjem"
msgid "Edit Retirement Home"
-msgstr ""
+msgstr "Rediger plejehjem"
msgid "Pharmacy"
msgstr "Apotek"
@@ -17300,12 +18073,66 @@ msgstr "Dyrlæge"
msgid "Edit Veterinary"
msgstr "Ret dyrlæge"
-msgid "Note"
-msgstr "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "offentlig"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Postkasse"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefon"
@@ -17315,6 +18142,30 @@ msgstr "Ret telefon"
msgid "Telephone cards"
msgstr "Telefonkort"
+msgid "Emergency Phone"
+msgstr "Nødtelefon"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Ur"
@@ -17322,32 +18173,38 @@ msgid "Edit Clock"
msgstr "Rediger ur"
msgid "Display"
-msgstr ""
+msgstr "Display"
-msgctxt "display"
msgid "analog"
-msgstr "analog"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "digital"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "solur"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "reklameskilt"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
msgid "Visibility/readability"
msgstr "Synlighed/læsbarhed"
@@ -17376,8 +18233,8 @@ msgstr "Viser fugtighed"
msgid "Recycling"
msgstr "Genbrug"
-msgid "Edit Recycling station"
-msgstr "Ret genbrugsplads"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batterier"
@@ -17395,43 +18252,31 @@ msgid "Scrap Metal"
msgstr "Skrotjern"
msgid "container"
-msgstr ""
+msgstr "container"
msgid "centre"
-msgstr ""
+msgstr "center"
msgid "Waste Basket"
msgstr "Skraldespand"
-msgid "Edit Waste Basket"
-msgstr "Rediger skraldespand"
-
msgid "Waste Disposal"
-msgstr ""
+msgstr "Affaldsbortskaffelse"
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Ryglæn"
-msgid "Material"
-msgstr "Materiale"
-
-msgid "stone"
-msgstr "sten"
-
-msgid "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr "Antal sæder"
msgid "Edit Shelter"
-msgstr "Ret shelter"
+msgstr "Ret læskur"
msgid "Type of shelter"
-msgstr "Shelter type"
+msgstr "Læskurstype"
msgctxt "shelter"
msgid "weather_shelter"
@@ -17439,7 +18284,7 @@ msgstr ""
msgctxt "shelter"
msgid "public_transport"
-msgstr ""
+msgstr "offentlig transport"
msgctxt "shelter"
msgid "picnic_shelter"
@@ -17458,14 +18303,17 @@ msgstr "Ret jagttårn"
msgid "Height"
msgstr "Højde"
+msgctxt "height"
msgid "low"
-msgstr "lav"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "halv"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "fuld"
+msgstr ""
msgid "Hide"
msgstr "Skjul"
@@ -17473,11 +18321,11 @@ msgstr "Skjul"
msgid "Lock"
msgstr "Lås"
-msgid "Drinking Water"
-msgstr "Vandpost"
+msgid "Edit Source of Potable Water"
+msgstr "Rediger kilde til drikkevand"
-msgid "Edit Drinking Water"
-msgstr "Ret vandpost"
+msgid "Indoor"
+msgstr "Indendørs"
msgid "Fire Hydrant"
msgstr "Brandhane"
@@ -17504,9 +18352,12 @@ msgstr "dam"
msgid "Diameter (in mm)"
msgstr "Diameter (i mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
-msgstr ""
+msgstr "bane"
msgctxt "hydrant position"
msgid "parking_lot"
@@ -17518,7 +18369,7 @@ msgstr "fortov"
msgctxt "hydrant position"
msgid "green"
-msgstr ""
+msgstr "grøn"
msgid "Pressure (in bar)"
msgstr "Tryk (i bar)"
@@ -17541,119 +18392,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Ret stadion"
-msgid "select sport:"
-msgstr "vælg sportsgren:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "multi"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "bueskydning"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletik"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "australsk fodbold"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basketball"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "petanque"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kano"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "klatring"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "kroket"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "cykling"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "hundeløb"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "ridning"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gymnastik"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hockey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "travbane"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motor"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "skydebane"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "skøjteløb"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "skisport"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "fodbold"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "svømning"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "bordtennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Idrætscenter"
@@ -17685,26 +18572,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Ret minigolf"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Multi"
msgid "Edit Multi"
msgstr "Ret multi"
-msgid "type"
-msgstr "type"
-
+msgctxt "running"
msgid "pitch"
-msgstr "bane"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sportshal"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -17712,6 +18600,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "bane"
+
+msgid "sports_centre"
+msgstr "sportshal"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "Bowling"
@@ -17745,21 +18642,62 @@ msgstr "Ret kanosport"
msgid "Edit Cycling"
msgstr "Ret cykling"
-msgid "Dog Racing"
-msgstr "Hundeløb"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
-msgid "Edit Dog Racing"
-msgstr "Ret hundeløb"
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
-msgid "Equestrian"
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
+msgid "Dog Racing"
+msgstr "Hundeløb"
+
+msgid "Edit Dog Racing"
+msgstr "Ret hundeløb"
+
+msgid "Equestrian"
msgstr "Ridning"
msgid "Edit Equestrian"
msgstr "Ret ridning"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr "bane"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "sportshal"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "stadion"
+
+msgctxt "riding"
+msgid "track"
+msgstr "spor"
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
msgstr ""
+msgid "mud"
+msgstr "mudder"
+
msgid "Horse Racing"
msgstr "Galopbane"
@@ -17776,7 +18714,7 @@ msgid "Skating"
msgstr "Skøjteløb"
msgid "Edit Skating"
-msgstr "Rediger skøjteløb"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17797,7 +18735,7 @@ msgid "swimming_pool"
msgstr ""
msgid "water_park"
-msgstr ""
+msgstr "badeland"
msgid "Edit Skiing"
msgstr "Ret skisport"
@@ -17820,36 +18758,54 @@ msgstr ""
msgid "Difficulty"
msgstr "Sværhedsgrad"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "nybegynder"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "let"
+msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "avanceret"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "ekspert"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
-msgstr "klassisk"
+msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "scooter"
+msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17892,19 +18848,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -18043,6 +18995,18 @@ msgstr "Model flyveplads"
msgid "Edit Model Aerodrome"
msgstr "Redigér model flyveplads"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "Fjernstyret bil"
@@ -18055,38 +19019,73 @@ msgstr "Menneskeskabt"
msgid "Edit Building"
msgstr "Rediger bygning"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "tag"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "garage"
+msgstr ""
-msgid "church"
-msgstr "kirke"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "skole"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "hangar"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "kommerciel"
+msgstr ""
+msgctxt "building"
msgid "farm"
-msgstr "gård"
+msgstr ""
+msgctxt "building"
msgid "transportation"
-msgstr "transport"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "drivhus"
+msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "kontor"
+msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "universitet"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr ""
@@ -18094,21 +19093,60 @@ msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "lejligheder"
+msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "hus"
+msgstr ""
+msgctxt "building"
msgid "hut"
-msgstr "hytte"
+msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Indgang"
+
+msgid "Edit Entrance"
+msgstr "Ret indgang"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Tårn"
@@ -18124,9 +19162,6 @@ msgstr "kommunikation"
msgid "observation"
msgstr "observation"
-msgid "Height (meters)"
-msgstr "Højde (meter)"
-
msgid "Flagpole"
msgstr "Flagstang"
@@ -18336,42 +19371,68 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Målestation"
+msgid "Monitoring Station"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Ret målestation"
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Measurement"
-msgstr "Måling"
+msgid "Monitoring:"
+msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
-msgstr "vejer"
+msgid "Traffic"
+msgstr ""
-msgid "Recording"
-msgstr "Optager"
+msgid "Air Quality"
+msgstr ""
-msgid "manually"
-msgstr "manuelt"
+msgid "Noise"
+msgstr ""
-msgid "automated"
-msgstr "automatiseret"
+msgid "GPS Signals"
+msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "nej"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Målepunkt"
@@ -18379,8 +19440,8 @@ msgstr "Målepunkt"
msgid "Edit Survey Point"
msgstr "Ret målepunkt"
-msgid "Surveillance"
-msgstr "Overvågning"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Ret overvågningskamera"
@@ -18391,12 +19452,102 @@ msgstr "indendørs"
msgid "outdoor"
msgstr "udendørs"
-msgid "public"
-msgstr "offentlig"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "butik"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "Strøm"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "elekticitet"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "varmt vand"
+
+msgid "hot air"
+msgstr "varm luft"
+
+msgid "cold water"
+msgstr "koldt vand"
+
+msgid "cold air"
+msgstr "kold luft"
+
+msgid "compressed air"
+msgstr "komprimeret luft"
+
+msgid "steam"
+msgstr "damp"
+
+msgid "vacuum"
+msgstr "vakuum"
+
msgid "Power Generator"
msgstr "Generator"
@@ -18448,89 +19599,192 @@ msgstr "vind"
msgid "Method"
msgstr "Metode"
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "forbrænding"
+msgstr ""
-msgid "dam"
-msgstr "dæmning"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "fission"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "fusion"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "sol"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "termisk"
+msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
-msgstr "elekticitet"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "varmt vand"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "varm luft"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "koldt vand"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "kold luft"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "komprimeret luft"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "damp"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vakuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
-msgid "battery charging"
-msgstr "batteri opladning"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
-msgid "Power Station"
-msgstr "Kraftværk"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Ret kraftværk"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Transformatorstation"
@@ -18541,6 +19795,21 @@ msgstr "Ret transformatorstation"
msgid "Line reference"
msgstr "Linie reference"
+msgid "high"
+msgstr "høj"
+
+msgid "medium"
+msgstr "medium"
+
+msgid "low"
+msgstr "lav"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "Fordelerskab"
@@ -18556,6 +19825,9 @@ msgstr "Ret elmast"
msgid "Tower reference"
msgstr "Tårn reference"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Pæl"
@@ -18574,11 +19846,9 @@ msgstr "Ret strømkabel"
msgid "Line type"
msgstr "Linie type"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18687,11 +19957,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Ret kiosk"
-msgid "Baker"
-msgstr "Bager"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Ret bager"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Slagter"
@@ -18702,7 +19972,7 @@ msgstr "Ret slagter"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18723,14 +19993,20 @@ msgstr "Markedsplads"
msgid "Edit Marketplace"
msgstr "Rediger markedsplads"
+msgid "Organic"
+msgstr "Økologisk"
+
msgid "Greengrocer"
msgstr "Grønthandler"
msgid "Edit Greengrocer"
msgstr "Ret Grønthandler"
-msgid "Organic"
-msgstr "Økologisk"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -18801,8 +20077,8 @@ msgstr "Rediger skrædder"
msgid "Fabric"
msgstr "Stof"
-msgid "Edit Fabric"
-msgstr "Rediger stof"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronisk"
@@ -18822,14 +20098,14 @@ msgstr "Ret elektronikforretning"
msgid "Mobile Phone"
msgstr "Mobiltelefon"
-msgid "Edit Mobile Phone"
-msgstr "Ret Mobiltelefon"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Støvsuger"
-msgid "Edit Vacuum Cleaner"
-msgstr "Ret Støvsuger"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hi-fi"
@@ -18837,7 +20113,6 @@ msgstr "Hi-fi"
msgid "Edit Hifi Shop"
msgstr "Ret hi-fi-forhandler"
-msgctxt "shop"
msgid "Video"
msgstr "Video"
@@ -18865,6 +20140,12 @@ msgstr "Ret vekselkontor"
msgid "Edit Automated Teller Machine"
msgstr "Ret pengeautomat"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18901,11 +20182,32 @@ msgstr "Guldsmed"
msgid "Edit Jewelry"
msgstr "Rediger guldsmed"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "buddhistisk"
+
+msgid "christian"
+msgstr "kristen"
+
+msgid "hindu"
+msgstr "hinduistisk"
+
+msgid "jewish"
+msgstr "jødisk"
+
+msgid "muslim"
+msgstr "muslimsk"
+
msgid "Erotic"
msgstr "Erotisk"
-msgid "Edit Erotic"
-msgstr "Ret Erotisk"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Blomsterhandler"
@@ -18934,8 +20236,8 @@ msgstr "Ret isenkræmmer"
msgid "Paint"
msgstr "Maling"
-msgid "Edit Paint"
-msgstr "Rediger maling"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Møbelforretning"
@@ -18946,20 +20248,20 @@ msgstr "Ret møbelforretning"
msgid "Kitchen"
msgstr "Køkken"
-msgid "Edit Kitchen"
-msgstr "Ret Køkken"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Gardin"
-msgid "Edit Curtain"
-msgstr "Redigér gardin"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Ramme"
-msgid "Edit Frames"
-msgstr "Redigér rammer"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Kontorforsyning"
@@ -18979,6 +20281,12 @@ msgstr "Boghandler"
msgid "Edit Book Store"
msgstr "Ret boghandler"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Rejsebureau"
@@ -18988,8 +20296,8 @@ msgstr "Ret rejsebureau"
msgid "Musical Instrument"
msgstr "Musikinstrumenter"
-msgid "Edit Musical Instruments"
-msgstr "Redigér musikinstrumenter"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Legetøjsbutik"
@@ -19069,6 +20377,9 @@ msgstr "legetøj"
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr "Note"
+
msgid "Geography"
msgstr "Geografi"
@@ -19181,10 +20492,10 @@ msgid "Edit Isolated Dwelling"
msgstr "Redigér isoleret bygning"
msgid "Neighbourhood"
-msgstr ""
+msgstr "Nabolag"
msgid "Edit Neighbourhood"
-msgstr ""
+msgstr "Rediger nabolag"
msgid "Locality"
msgstr "Egn"
@@ -19198,6 +20509,12 @@ msgstr "Tinde"
msgid "Edit Peak"
msgstr "Ret tinde"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Gletsjer"
@@ -19237,24 +20554,33 @@ msgstr "Træ"
msgid "Edit Tree"
msgstr "Ret et træ"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botanisk navn"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Naturskov"
msgid "Edit Wood"
msgstr "Ret naturskov"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "Nåleskov"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "Løvskov"
-msgctxt "wood"
msgid "mixed"
msgstr "blandet"
@@ -19264,15 +20590,6 @@ msgstr "Skov"
msgid "Edit Forest Landuse"
msgstr "Ret skovområde"
-msgid "coniferous"
-msgstr "Nåleskov"
-
-msgid "deciduous"
-msgstr "Løvskov"
-
-msgid "mixed"
-msgstr "blandet"
-
msgid "Grassland"
msgstr ""
@@ -19283,13 +20600,13 @@ msgid "pampas"
msgstr ""
msgid "prairie"
-msgstr ""
+msgstr "prærie"
msgid "puszta"
msgstr ""
msgid "savanna"
-msgstr ""
+msgstr "savanne"
msgid "steppe"
msgstr ""
@@ -19348,6 +20665,12 @@ msgstr "Eng"
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr "Frugtplantage"
+
+msgid "Edit Orchard Landuse"
+msgstr "Rediger frugtplantage område"
+
msgid "Vineyard"
msgstr "Vingård"
@@ -19385,7 +20708,7 @@ msgid "Edit Village Green Landuse"
msgstr ""
msgid "Common"
-msgstr ""
+msgstr "Fælles"
msgid "Edit Common"
msgstr ""
@@ -19402,8 +20725,8 @@ msgstr "Rekreativt område"
msgid "Edit Recreation Ground Landuse"
msgstr "Ret rekreativt område"
-msgid "Residential area"
-msgstr "Beboelseområde"
+msgid "Residential Area"
+msgstr "Beboelsesområde"
msgid "Edit Residential Landuse"
msgstr ""
@@ -19414,6 +20737,9 @@ msgstr "Gravplads"
msgid "Edit Graveyard"
msgstr "Ret gravplads"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Kirkegård"
@@ -19489,6 +20815,33 @@ msgstr "Ret grusgrav/stenbrudsområde"
msgid "Annotation"
msgstr "Henvisning"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Ret adresseinformation"
@@ -19507,30 +20860,6 @@ msgstr "Bynavn"
msgid "Country code"
msgstr "Landekode"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Adresse-interpolering"
@@ -19549,9 +20878,21 @@ msgstr "lige"
msgid "alphabetic"
msgstr "alfabetisk"
-msgid "Contact (common schema)"
+msgid "Accuracy"
+msgstr "Præcision"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
msgstr ""
+msgid "potential"
+msgstr ""
+
+msgid "Contact (common schema)"
+msgstr "Kontakt (normalt skema)"
+
msgid "Edit Contact information"
msgstr "Ret kontaktinformationer"
@@ -19559,7 +20900,7 @@ msgid "Image"
msgstr "Billede"
msgid "Contact (schema with ''contact:*'' prefix)"
-msgstr ""
+msgstr "Kontakt (skema med \"contact:*\" præfiks)"
msgid "Edit Contact information (new schema)"
msgstr "Ret kontaktinformationer (nyt format)"
@@ -19598,7 +20939,7 @@ msgid "Administrative level"
msgstr "Administrativt niveau"
msgid "Sub area"
-msgstr ""
+msgstr "Underområde"
msgid "Administration centre"
msgstr ""
@@ -19607,7 +20948,7 @@ msgid "Label point"
msgstr ""
msgid "Site"
-msgstr ""
+msgstr "Sted"
msgid "Edit Site"
msgstr ""
@@ -19667,70 +21008,99 @@ msgid "to way"
msgstr "til vej"
msgid "Enforcement"
-msgstr ""
+msgstr "Håndhævelse"
msgid "Edit Enforcement"
-msgstr ""
+msgstr "Rediger håndhævelse"
msgid "Type of enforcement"
-msgstr ""
+msgstr "Type af håndhævelse"
msgid "maxheight"
-msgstr ""
+msgstr "maxheight"
msgid "maxweight"
-msgstr ""
+msgstr "maxweight"
msgid "maxspeed"
-msgstr ""
+msgstr "maxspeed"
msgid "mindistance"
-msgstr ""
+msgstr "mindistance"
msgid "check "
msgstr "tjek "
msgid "Max. height (meters, only if enforcement=maxheight)"
-msgstr ""
+msgstr "Maks højde (meter, kun hvis enforcement=maxheight)"
msgid "Max. weight (tonnes, only if enforcement=maxweight)"
-msgstr ""
+msgstr "Maks vægt (ton, kun hvis enforcement=maxweight)"
msgid "Max. speed (km/h, only if enforcement=maxspeed)"
-msgstr ""
+msgstr "Maks fart (km/t, kun hvis enforcement=maxspeed)"
msgid "location of enforcement device"
-msgstr ""
+msgstr "placering for håndhævelsesenhed"
msgid "node on way where enforcement starts"
-msgstr ""
+msgstr "punkt på vej hvor håndhævelse starter"
msgid "where enforcement ends"
-msgstr ""
+msgstr "hvor håndhævelse slutter"
msgid "traffic light or barrier that stops you"
msgstr "traffiklys eller barriere der stopper dig"
-msgid "Route (legacy)"
+msgid "General route"
+msgstr "Generel rute"
+
+msgid "Edit general route"
+msgstr "Rediger generel rute"
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "vej"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "fod"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "vandring"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "omvej"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Symbol beskrivelse"
@@ -19757,16 +21127,16 @@ msgid "backward segment"
msgstr "tilbage segment"
msgid "east segment (North America)"
-msgstr ""
+msgstr "øst segment (Nordamerika)"
msgid "north segment (North America)"
-msgstr ""
+msgstr "nord segment (Nordamerika)"
msgid "west segment (North America)"
-msgstr ""
+msgstr "vest segment (Nordamerika)"
msgid "south segment (North America)"
-msgstr ""
+msgstr "syd segment (Nordamerika)"
msgid "halt point"
msgstr "stoppested"
@@ -19777,20 +21147,23 @@ msgstr "forlæns stoppested"
msgid "backward halt point"
msgstr "baglæns stoppested"
-msgid "Route network"
-msgstr "Rutenetværk"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Rediger rutenetværk"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "medlem"
-msgid "Associated street"
-msgstr "Tilknyttet vej"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Rediger tilknyttet vej"
+msgid "house"
+msgstr "hus"
msgid "Street"
msgstr "Gade"
@@ -19813,8 +21186,8 @@ msgstr "alt der er relateret til vejen"
msgid "Destination sign"
msgstr "Destinationsskilt"
-msgid "Edit Destination sign"
-msgstr "Rediger destinationsskilt"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "Destination skrevet på skilt (uden afstand)"
@@ -19874,19 +21247,19 @@ msgid "Name of river/sea/ocean"
msgstr "Navn på flod/hav/ocean"
msgid "Reference Sandre (FR)"
-msgstr ""
+msgstr "Reference Sandre (FR)"
msgid "Reference FGKZ (DE)"
-msgstr ""
+msgstr "Reference FGKZ (DE)"
msgid "Reference REGINE (NO)"
-msgstr ""
+msgstr "Reference REGINE (NO)"
msgid "Reference GNIS (USA)"
-msgstr ""
+msgstr "Reference GNIS (USA)"
msgid "Reference GNBC (CA)"
-msgstr ""
+msgstr "Reference GNBC (CA)"
msgid "waterways (no riverbank)"
msgstr ""
@@ -19909,28 +21282,40 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "bro"
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr "cykel"
+
+msgid "foot"
+msgstr "fod"
+
msgid "horse"
msgstr "hest"
msgid "barrier"
-msgstr ""
+msgstr "barriere"
msgid "motorroad"
msgstr "hovedvej"
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19939,10 +21324,10 @@ msgstr "services"
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19960,6 +21345,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19975,35 +21363,35 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
msgstr "kraft"
msgid "pier"
-msgstr "mole"
+msgstr "bådebro"
msgid "pipeline"
msgstr "rørledning"
@@ -20015,22 +21403,22 @@ msgid "marina"
msgstr "marina"
msgid "amenity"
-msgstr ""
+msgstr "facilitet"
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "helbred"
-msgid "shop"
-msgstr "butik"
+msgid "office"
+msgstr "kontor"
msgid "hotel"
msgstr "hotel"
@@ -20060,7 +21448,7 @@ msgid "farmyard"
msgstr "gårdsplads"
msgid "retail"
-msgstr ""
+msgstr "detail"
msgid "brownfield"
msgstr ""
@@ -20095,9 +21483,6 @@ msgstr "hede"
msgid "woodarea"
msgstr "træområde"
-msgid "mud"
-msgstr "mudder"
-
msgid "beach"
msgstr "strand"
@@ -20107,10 +21492,13 @@ msgstr "rute"
msgid "boundary"
msgstr "grænse"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "sted"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -20125,9 +21513,6 @@ msgstr "By"
msgid "One Way"
msgstr "Ensrettet"
-msgid "Church"
-msgstr "Kirke"
-
msgid "Fuel Station"
msgstr "Benzintank"
@@ -20144,272 +21529,462 @@ msgid "Test"
msgstr "Test"
msgid "abbreviated street name"
-msgstr ""
+msgstr "forkortet vejnavn"
msgid "oneway tag on a node"
-msgstr ""
+msgstr "oneway tag på et punkt"
msgid "bridge tag on a node"
-msgstr ""
+msgstr "bridge tag på et punkt"
msgid "wrong highway tag on a node"
+msgstr "forkert highway tag på et punkt"
+
+msgid "wrong crossing tag on a way"
msgstr ""
msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "Unavngivet uklassificeret highway"
msgid "highway without a reference"
-msgstr ""
+msgstr "highway uden en reference"
msgid "temporary highway type"
-msgstr ""
+msgstr "midlertidig highway type"
msgid "misspelled key name"
-msgstr ""
+msgstr "forkert stavet nøglenavn"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "cycleway med tagget bicycle"
msgid "footway with tag foot"
-msgstr ""
+msgstr "footway med tagget foot"
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "separat cycleway som spor på en cycleway"
msgid "barrier used on a way"
-msgstr ""
+msgstr "barrier brugt på en vej"
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "maxspeed brugt på footway"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "layer tag med + tegn"
msgid "street name contains ss"
-msgstr ""
+msgstr "vejnavn indeholder ss"
msgid "relation without type"
-msgstr ""
+msgstr "relation uden type"
msgid "restaurant without name"
-msgstr ""
+msgstr "restaurant uden navn"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "usædvanlig tag kombination (highway & waterway)"
msgid "unusual tag combination (highway & natural)"
+msgstr "usædvanlig tag kombination (highway & natural)"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
msgstr ""
msgid "natural water used for swimming pool"
+msgstr "natural water brugt til swimming pool"
+
+msgid "numerical key"
msgstr ""
-msgid "incline without highway"
+msgid "route_master relation without route_master=*"
msgstr ""
-msgid "junction without highway"
+msgid "power line without voltage"
msgstr ""
-msgid "lanes without highway"
+msgid "substation key without power=substation"
msgstr ""
-msgid "lcn without highway"
+msgid "transformer key without power"
msgstr ""
-msgid "lit without highway"
+msgid "missing substation=*"
msgstr ""
-msgid "living_street without highway"
+msgid "missing transformer=*"
msgstr ""
-msgid "maintenance without highway"
+msgid "incline without highway or railway"
msgstr ""
-msgid "median without highway"
+msgid "junction without highway"
+msgstr "junction uden highway"
+
+msgid "lanes without highway"
+msgstr "lanes uden highway"
+
+msgid "lcn without highway"
+msgstr "lcn uden highway"
+
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
+msgid "living_street without highway"
+msgstr "living_street uden highway"
+
+msgid "maintenance without highway"
+msgstr "maintenance uden highway"
+
+msgid "median without highway"
+msgstr "median uden highway"
+
msgid "motorroad without highway"
-msgstr ""
+msgstr "motorroad uden highway"
msgid "ntd_id without highway"
-msgstr ""
+msgstr "ntd_id uden highway"
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
-msgstr ""
+msgstr "sac_scale uden highway"
msgid "segregated without highway"
-msgstr ""
+msgstr "segregated uden highway"
msgid "sidewalk without highway"
-msgstr ""
+msgstr "sidewalk uden highway"
msgid "smoothness without highway"
-msgstr ""
+msgstr "smoothness uden highway"
msgid "snowplowing without highway"
-msgstr ""
+msgstr "snowplowing uden highway"
msgid "step_count without highway"
-msgstr ""
+msgstr "step_count uden highway"
msgid "toll without highway"
-msgstr ""
+msgstr "toll uden highway"
msgid "tracktype without highway"
-msgstr ""
+msgstr "tracktype uden highway"
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "trail_visibility uden highway"
msgid "trolley_wire without highway"
-msgstr ""
+msgstr "trolley_wire uden highway"
msgid "zip_left without highway"
-msgstr ""
+msgstr "zip_left uden highway"
msgid "zip_right without highway"
-msgstr ""
+msgstr "zip_right uden highway"
msgid "detail without railway"
-msgstr ""
+msgstr "detail uden railway"
msgid "eddy_current_brake without railway"
-msgstr ""
+msgstr "eddy_current_brake uden railway"
msgid "electrified without railway"
-msgstr ""
+msgstr "electrified uden railway"
msgid "etcs without railway"
-msgstr ""
+msgstr "etcs uden railway"
msgid "gauge without railway"
-msgstr ""
+msgstr "gauge uden railway"
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "grade_of_track uden railway"
msgid "kursbuchstrecke without railway"
-msgstr ""
+msgstr "kursbuchstrecke uden railway"
msgid "lzb without railway"
-msgstr ""
+msgstr "lzb uden railway"
msgid "old_railway_operator without railway"
-msgstr ""
+msgstr "old_railway_operator uden railway"
msgid "operating_procedure without railway"
-msgstr ""
+msgstr "operating_procedure uden railway"
msgid "pzb without railway"
-msgstr ""
+msgstr "pzb uden railway"
msgid "radio without railway"
-msgstr ""
+msgstr "radio uden railway"
msgid "structure_gauge without railway"
-msgstr ""
+msgstr "structure_gauge uden railway"
msgid "tilting_technologie without railway"
-msgstr ""
+msgstr "tilting_technologie uden railway"
msgid "track_class without railway"
-msgstr ""
+msgstr "track_class uden railway"
msgid "tracks without railway"
-msgstr ""
+msgstr "tracks uden railway"
msgid "traffic_mode without railway"
-msgstr ""
+msgstr "traffic_mode uden railway"
msgid "usage without railway"
-msgstr ""
+msgstr "usage uden railway"
msgid "workrules without railway"
-msgstr ""
+msgstr "workrules uden railway"
msgid "stream without waterway"
-msgstr ""
+msgstr "stream uden waterway"
msgid "intermittent without waterway"
-msgstr ""
+msgstr "intermittent uden waterway"
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "boat uden waterway / natural=water"
msgid "length_unit without waterway"
-msgstr ""
+msgstr "length_unit uden waterway"
msgid "llid without waterway"
-msgstr ""
+msgstr "llid uden waterway"
msgid "canal without waterway"
-msgstr ""
+msgstr "canal uden waterway"
msgid "have_riverbank without waterway"
+msgstr "have_riverbank uden waterway"
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "width without physical linear feature"
+msgstr "width uden fysiske lineære træk"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "border_type without boundary"
msgstr ""
-msgid "religion without denomination"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "unknown christian denomination"
+msgid "board_type without information=board"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
msgstr ""
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
+msgstr ""
+
+msgid "religion without denomination"
+msgstr "religion uden trosretning"
+
+msgid "unknown christian denomination"
+msgstr "ukendt kristen trosretning"
+
+msgid "unknown muslim denomination"
+msgstr "ukendt muslimsk trosretning"
+
+msgid "unknown jewish denomination"
+msgstr "ukendt jødisk trosretning"
+
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"intet wikipedia-sprog angivet, brug \"wikipedia\"=\"sprog:sidetitel\""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
+msgstr "Landsat"
+
msgid "Yahoo Sat"
msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
-msgid "MapBox Satellite"
+msgid "HDDM (Humanitarian OpenStreetMap)"
msgstr ""
+msgid "MapBox Satellite"
+msgstr "MapBox Satellite"
+
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik sort & hvid)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -20421,13 +21996,149 @@ msgid "Public Transport (ÖPNV)"
msgstr "Offentlig transport (ÖPNV)"
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (tysk stilart)"
+msgstr "OpenStreetMap (Tysk stilart)"
+
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam tosproget"
+
+msgid "osmfr"
+msgstr ""
+
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI sort-og-hvid 2.5m"
+
+msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
+msgid "basemap.at"
+msgstr ""
+
+msgid "Graz: Basiskarte (base map)"
+msgstr "Graz: Basiskarte (base map)"
+
+msgid "Tiris: DGM (Terrain model)"
+msgstr "Tiris: DGM (Terrænmodel)"
+
+msgid "Tiris: DOM (Surface model)"
+msgstr "Tiris: DOM (Overflademodel)"
+
+msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgstr "Vienna: Mehrzweckkarte (generelle formål)"
+
+msgid "Vienna: Beschriftungen (annotations)"
+msgstr "Vienna: Beschriftungen (annoteringer)"
+
+msgid "Vienna: Orthofoto (aerial image)"
+msgstr "Vienna: Orthofoto (luftfoto)"
+
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
+
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
+
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terrain model)"
+
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Surface model)"
+
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrography"
+
+msgid "Geobase Roads"
+msgstr "Geobase Roads"
+
+msgid "Canvec"
+msgstr "Canvec"
+
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic"
+
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
+
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
+
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Danmark)"
+
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Danmark)"
+
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Denmark)"
+
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estonia Basemap (Maaamet)"
+
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortho (Maaamet)"
+
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
+
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
+
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
+
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
+
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
+
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
+
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
+
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Orthophotos 2000"
+
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
+
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
+
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Orthophotoplan 2011"
+
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Orthophotoplan 2007"
+
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Orthophotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthophotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgid "Streets NRW Geofabrik.de"
msgstr "Streets NRW Geofabrik.de"
msgid "Hike & Bike"
-msgstr "Vandre & cykel"
+msgstr "Hike & Bike"
msgid "OpenStreetMap (Sorbian Language)"
msgstr "OpenStreetMap (Sorbian Language)"
@@ -20438,35 +22149,142 @@ msgstr "OpenStreetMap (German Language)"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (overlay)"
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
msgid "Bavaria (2 m)"
msgstr "Bavaria (2 m)"
-msgid "Hamburg (40 cm)"
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
msgstr ""
-msgid "Geoimage.at MaxRes"
-msgstr "Geoimage.at MaxRes"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris: DGM (Terrænmodel)"
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
-msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris: DOM (Overflademodel)"
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haiti)"
+
+msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+
+msgid "Ireland Bartholomew Quarter-Inch 1940"
+msgstr "Ireland Bartholomew Quarter-Inch 1940"
+
+msgid "Ireland EEA GMES Urban Atlas"
+msgstr "Ireland EEA GMES Urban Atlas"
+
+msgid "Ireland EEA CORINE 2006"
+msgstr "Ireland EEA CORINE 2006"
+
+msgid "Lodi - Italy"
+msgstr "Lodi - Italien"
+
+msgid "Lombardia - Italy (CTR)"
+msgstr "Lombardia - Italien (CTR)"
+
+msgid "Sicily - Italy"
+msgstr "Sicilen - Italien"
+
+msgid "PCN 2006 - Italy"
+msgstr "PCN 2006 - Italien"
+
+msgid "PCN 2008 - IT Lazio+Umbria"
+msgstr "PCN 2008 - IT Lazio+Umbria"
+
+msgid "USSR - Latvia"
+msgstr "USSR - Latvia"
+
+msgid "50cm ortho - Latvia"
+msgstr "50cm ortho - Latvia"
+
+msgid "20cm ortho - Coastline"
+msgstr "20cm ortho - Kystlinje"
+
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lithuania)"
+
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger Delta Oct 2012 Landsat"
+
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
+
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
+
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
+
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Car"
+
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking"
+
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Cyclo"
+
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Ski"
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slovakia EEA GMES Urban Atlas"
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slovakia EEA CORINE 2006"
+
+msgid "Slovakia Historic Maps"
+msgstr "Slovakia Historic Maps"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "South Africa CD:NGI Aerial"
+
+msgid "Catastro Spain"
+msgstr "Catastro Spain"
+
+msgid "PNOA Spain"
+msgstr "PNOA Spain"
+
+msgid "SIGPAC Spain"
+msgstr "SIGPAC Spain"
-msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Vienna: Mehrzweckkarte (general purpose)"
+msgid "GRAFCAN - Canary Islands"
+msgstr "GRAFCAN - Canary Islands"
-msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Vienna: Beschriftungen (annotations)"
+msgid "ITACyL - Castile and León"
+msgstr "ITACyL - Castile and León"
-msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Vienna: Orthofoto (aerial image)"
+msgid "IDEIB - Balearic Islands"
+msgstr "IDEIB - Balearic Islands"
msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr "Kanton Aargau 25cm (AGIS 2011)"
@@ -20504,17 +22322,17 @@ msgstr "Stadt Bern 10cm/25cm (2008)"
msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgid "Geobase Hydrography"
-msgstr ""
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgid "Geobase Roads"
-msgstr ""
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Orthophoto 2012"
-msgid "Canvec"
-msgstr ""
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthophoto 2012"
-msgid "British Columbia Mosaic"
-msgstr ""
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Orthophoto technique 2012"
msgid "MSR Maps Topo"
msgstr "MSR Maps Topo"
@@ -20529,13 +22347,22 @@ msgid "USGS Large Scale Imagery"
msgstr "USGS Large Scale Imagery"
msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Roads Overlay"
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "OSM - Tiger Edited Map"
+msgstr "OSM - Tiger Edited Map"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ukraine - Orthophotomaps 2012"
msgid "7th Series (OS7)"
msgstr "7th Series (OS7)"
@@ -20561,191 +22388,53 @@ msgstr "NLS - OS 1:25k 1st Series 1937-61"
msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr "NLS - OS 1-inch 7th Series 1955-61"
-msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-
-msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ireland Bartholomew Quarter-Inch 1940"
-
-msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Ireland EEA GMES Urban Atlas"
-
-msgid "Ireland EEA CORINE 2006"
-msgstr "Ireland EEA CORINE 2006"
-
-msgid "Lodi - Italy"
-msgstr "Lodi - Italien"
-
-msgid "Lombardia - Italy (CTR)"
-msgstr "Lombardia - Italy (CTR)"
-
-msgid "Sicily - Italy"
-msgstr "Sicilen - Italien"
-
-msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Italy"
-
-msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio+Umbria"
-
-msgid "USSR - Latvia"
-msgstr "USSR - Latvia"
-
-msgid "50cm ortho - Latvia"
-msgstr "50cm ortho - Latvia"
-
-msgid "20cm ortho - Coastline"
-msgstr "20cm ortho - kystlinje"
-
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
-
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
-
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
-
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
-
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
-
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
-
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
-
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr ""
+msgid "OS 1:25k historic (OSM)"
+msgstr "OS 1:25k historic (OSM)"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "OS Scottish Popular historic"
+msgstr "OS Scottish Popular historic"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Orthophotos 2008-2010"
-
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthophotos 2008"
-
-msgid "Catastro Spain"
-msgstr "Catastro Spanien"
-
-msgid "PNOA Spain"
-msgstr "PNOA Spanien"
-
-msgid "SIGPAC Spain"
-msgstr "SIGPAC Spanien"
-
-msgid "GRAFCAN - Canary Islands"
-msgstr "GRAFCAN - Kanarieøerne"
-
-msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castile and León"
-
-msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Balearic Islands"
-
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estonia Basemap (Maaamet)"
-
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estonia Ortho (Maaamet)"
-
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
-
-msgid "ORT10LT (Lithuania)"
+msgid "OSM Export"
msgstr ""
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Danmark)"
-
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Danmark)"
-
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danmark)"
-
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
-
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
-
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
-
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "SUMO Export"
msgstr ""
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Bil"
-
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Vandrer"
-
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Cykel"
-
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Ski"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
-
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
-
-msgid "Slovakia Historic Maps"
-msgstr "Slovakia Historic Maps"
+msgid "Export"
+msgstr "Eksporter"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI black-and-white 2.5m"
+msgid "Port:"
+msgstr "Port:"
-msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Tiger Edited Map"
+msgid "refresh the port list"
+msgstr "opdatér port liste"
-msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k historisk (OSM)"
+msgid "Configure"
+msgstr "Konfigurer"
-msgid "OS Scottish Popular historic"
-msgstr "OS Scottish Popular historic"
+msgid "Connection Error."
+msgstr "Forbindelsesfejl"
-msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "konfigurer den forbundne DG100"
-msgid "2u"
-msgstr ""
+msgid "delete data after import"
+msgstr "slet data efter import"
msgid "Columbus V-900 CSV Files"
-msgstr ""
+msgstr "Columbus V-900 CSV Filer"
msgid "Importing CSV file ''%s''..."
-msgstr ""
+msgstr "Importerer CSV filen ''%s''..."
msgid "Markers of "
msgstr ""
@@ -20948,17 +22637,29 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
msgid "Min"
-msgstr ""
+msgstr "Min."
msgid "Avrg"
msgstr ""
msgid "Max"
-msgstr ""
+msgstr "Maks."
msgid "Dist"
msgstr ""
@@ -20967,16 +22668,10 @@ msgid "Gain"
msgstr ""
msgid "Time"
-msgstr ""
-
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
+msgstr "Tid"
-msgid "Fixed value"
-msgstr ""
+msgid "Tracks"
+msgstr "Spor"
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -21036,7 +22731,7 @@ msgid "FastDraw settings"
msgstr ""
msgid "Save settings"
-msgstr ""
+msgstr "Gem indstillinger"
msgid "Can not read settings"
msgstr ""
@@ -21072,7 +22767,7 @@ msgid "Line information"
msgstr ""
msgid "Cannot place node outside of the world."
-msgstr ""
+msgstr "Kan ikke placere et punkt uden for verdenen."
msgid "Draw the way by mouse"
msgstr ""
@@ -21172,7 +22867,7 @@ msgstr "ingen emner"
msgctxt "address"
msgid "City"
-msgstr ""
+msgstr "By"
msgid "Postcode"
msgstr "Postnummer"
@@ -21238,9 +22933,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Opdaterer op til {0} objekts egenskaber"
@@ -21262,6 +22963,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -21340,9 +23044,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -21377,7 +23093,7 @@ msgid "Associate with street using:"
msgstr ""
msgid "Numbering Scheme:"
-msgstr ""
+msgstr "Nummereringssystem:"
msgid "Increment:"
msgstr "Forøgelse:"
@@ -21427,8 +23143,8 @@ msgstr "Forventede ulige numre for adresser"
msgid "Expected even numbers for addresses"
msgstr "Forventede lige numre for adresser"
-msgid "Expected valid number for address increment"
-msgstr "Forventede gyldige numre for adresser i stigende orden"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "Landekode skal være på 2 bogstaver"
@@ -21512,10 +23228,10 @@ msgid "This panel activates in Align Ways mode:"
msgstr ""
msgid "Length preserved"
-msgstr ""
+msgstr "Længde bevaret"
msgid "Angle preserved"
-msgstr ""
+msgstr "Vinkel bevaret"
msgid "Align with:"
msgstr ""
@@ -21532,7 +23248,7 @@ msgid ""
msgstr ""
msgid "I''m ready!"
-msgstr ""
+msgstr "Jeg er klar!"
msgid "AlignWays Tips"
msgstr ""
@@ -21699,15 +23415,6 @@ msgstr "Husnummer:"
msgid "Street Name:"
msgstr "Vejnavn:"
-msgid "Increment"
-msgstr "Forøgelse"
-
-msgid "Decrement"
-msgstr "Formindskelse"
-
-msgid "Numbers:"
-msgstr "Numre:"
-
msgid "Big buildings mode"
msgstr "Store-bygninger tilstand"
@@ -21742,7 +23449,7 @@ msgid "Buildings width:"
msgstr "Bygningsbredde:"
msgid "Length step:"
-msgstr ""
+msgstr "Længde trin:"
msgid "Advanced..."
msgstr "Avanceret..."
@@ -21751,13 +23458,13 @@ msgid "Draw buildings"
msgstr "Tegn bygninger"
msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "Klik på hjørnet af bygningen for at starte med at tegne"
msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Klik på den modsatte ende af bygningen"
msgid "Set width of the building"
-msgstr ""
+msgstr "Indstil bredde for bygningen"
msgid "on polygon"
msgstr "på polygon"
@@ -21880,6 +23587,9 @@ msgstr "Slå billedbeskæring fra under geo-referencering."
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21887,7 +23597,7 @@ msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
msgstr ""
msgid "off"
-msgstr ""
+msgstr "fra"
msgid "25 m"
msgstr "25 m"
@@ -21898,12 +23608,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "høj"
-
-msgid "medium"
-msgstr "medium"
-
msgid "symbol"
msgstr "symbol"
@@ -21914,10 +23618,10 @@ msgid "parcel number"
msgstr ""
msgid "locality"
-msgstr ""
+msgstr "lokalitet"
msgid "section"
-msgstr ""
+msgstr "sektion"
msgid "commune"
msgstr ""
@@ -22005,7 +23709,7 @@ msgid "Fixed size (from 25 to 1000 meters)"
msgstr "Fast størrelse (fra 25 til 1.000 meter)"
msgid "Layers:"
-msgstr ""
+msgstr "Lag:"
msgid "See, rivers, swimming pools."
msgstr ""
@@ -22041,6 +23745,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -22056,7 +23763,10 @@ msgid ""
"grabbing."
msgstr ""
-msgid "Enable this to use the tag \"add:street\" on nodes."
+msgid "Enable this to use the tag \"add:street\" on nodes."
+msgstr ""
+
+msgid "Unexpected file extension. {0}"
msgstr ""
msgid "Add \"source=...\" to elements?"
@@ -22141,50 +23851,6 @@ msgstr ""
"Dette billede indeholder georeference-data\n"
"Ønsker du at bruge dem?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Klik første hjørne til billedbeskæring\n"
-"(der kræves to punkter)"
-
-msgid "Image cropping"
-msgstr "Billedbeskæring"
-
-msgid "Click second corner for image cropping"
-msgstr "Klik andet hjørne til billedbeskæring"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr "Øst"
-
-msgid "I use the mouse"
-msgstr "Jeg bruger musen"
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -22208,7 +23874,7 @@ msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
msgid "(optional)"
-msgstr ""
+msgstr "(valgfri)"
msgid "Change location"
msgstr "Skift lokalitet"
@@ -22239,19 +23905,77 @@ msgstr "Tilføj nyt lag"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Nulstil cookie"
msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr "PNG filer (*.png)"
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Klik første hjørne til billedbeskæring\n"
+"(der kræves to punkter)"
+
+msgid "Image cropping"
+msgstr "Billedbeskæring"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr "Øst"
+
+msgid "I use the mouse"
+msgstr "Jeg bruger musen"
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr "Klik andet hjørne til billedbeskæring"
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -22277,8 +24001,11 @@ msgstr ""
msgid "Is not vectorized."
msgstr "Er ikke vektoriseret"
-msgid "Raster size: {0}"
-msgstr "Raster størrelse: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Er vektoriseret"
@@ -22327,8 +24054,8 @@ msgstr "Slet det valgte skema fra listen."
msgid "Color Schemes"
msgstr "Farveskemaer"
-msgid "Adress"
-msgstr "Adresse"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr "Opdel område"
@@ -22375,11 +24102,14 @@ msgstr "Download ommkring"
msgid "Please select 1 or more ways to download along"
msgstr "Vælg venligst 1 eller flere veje der skal downloades omkring"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
msgid "between {0} {1} and {2} {3}"
-msgstr ""
+msgstr "mellem {0} {1} og {2} {3}"
msgid " adding {0} {1}"
msgstr ""
@@ -22409,7 +24139,7 @@ msgid "External tool error"
msgstr ""
msgid "Error executing the script:"
-msgstr ""
+msgstr "Fejl ved udførelse af script:"
msgid ""
"Child script have returned invalid data.\n"
@@ -22427,7 +24157,7 @@ msgid "Edit tool"
msgstr ""
msgid "Name:"
-msgstr ""
+msgstr "Navn:"
msgid "CmdLine:"
msgstr ""
@@ -22447,6 +24177,71 @@ msgstr "Nyt værktøj"
msgid "Install"
msgstr "Installér"
+msgid "Public"
+msgstr "Offentlig"
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr "Log ind"
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} bruger"
+msgstr[1] "{0} brugere"
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr "Luk fane"
+
+msgid "Logout"
+msgstr "Log ud"
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Kun position"
@@ -22486,27 +24281,9 @@ msgstr "Slå datalogning fra hvis afstand falder under"
msgid "Unknown logFormat"
msgstr "Ukendt log format"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "opdatér port liste"
-
-msgid "Configure"
-msgstr "Konfigurer"
-
msgid "Configure Device"
msgstr "Konfigurer enhed"
-msgid "Connection Error."
-msgstr "Forbindelsesfejl"
-
-msgid "configure the connected DG100"
-msgstr "konfigurer den forbundne DG100"
-
-msgid "delete data after import"
-msgstr "slet data efter import"
-
msgid "Importing data from device."
msgstr "Importerer data fra enhed"
@@ -22660,6 +24437,8 @@ msgid ""
"File not found:\n"
"{0}"
msgstr ""
+"Fil ikke fundet:\n"
+"{0}"
msgid ""
"Problem when accessing a file:\n"
@@ -22667,31 +24446,31 @@ msgid ""
msgstr ""
msgid "File not found:\n"
-msgstr ""
+msgstr "Fil ikke fundet:\n"
msgid "Couldn''t find built-in ruleset {0}"
msgstr ""
msgid "height (m)"
-msgstr ""
+msgstr "højde (m)"
msgid "width (m)"
-msgstr ""
+msgstr "bredde (m)"
msgid "length (m)"
-msgstr ""
+msgstr "længde (m)"
msgid "speed (km/h)"
-msgstr ""
+msgstr "hastighed (km/t)"
msgid "weight (t)"
-msgstr ""
+msgstr "vægt (t)"
msgid "axleload (t)"
msgstr ""
msgid "Bookmark name"
-msgstr ""
+msgstr "Bogmærkenavn"
msgid "Bookmark name already exists!"
msgstr ""
@@ -22755,13 +24534,13 @@ msgid "Open the dialog for graph view configuration."
msgstr ""
msgid "default"
-msgstr ""
+msgstr "standard"
msgid "end nodes"
msgstr ""
msgid "incline"
-msgstr ""
+msgstr "stigning"
msgid "Ruleset:"
msgstr ""
@@ -22791,16 +24570,16 @@ msgid "External ruleset directory:"
msgstr ""
msgid "Select directory"
-msgstr ""
+msgstr "Vælg mappe"
msgid "Vehicle"
msgstr "Køretøj"
msgid "Create"
-msgstr ""
+msgstr "Opret"
msgid "Restore defaults"
-msgstr ""
+msgstr "Gendan standarder"
msgid "Visualization"
msgstr ""
@@ -22904,6 +24683,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22968,22 +24750,22 @@ msgid "Error processing XML response: {0}"
msgstr ""
msgid "Offset"
-msgstr ""
+msgstr "Offset"
msgid "Imagery Offset Database"
msgstr ""
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
-msgstr ""
+msgstr "m"
msgid "km"
-msgstr ""
+msgstr "km"
msgid "Calibration geometries"
msgstr ""
@@ -23021,7 +24803,7 @@ msgid "Reporting the offset..."
msgstr ""
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "En billedforskydning på {0}"
msgid "Imagery ID"
msgstr ""
@@ -23036,7 +24818,7 @@ msgid "Determined {0} away"
msgstr ""
msgid "Reason"
-msgstr ""
+msgstr "Årsag"
msgid "This entry has been reported."
msgstr ""
@@ -23098,7 +24880,7 @@ msgid "Adjust the position of the selected imagery layer"
msgstr "Justér det valgte billedlags position"
msgid "Please select the imagery layer to adjust."
-msgstr "Marker venligst det billedlag der skal justeres"
+msgstr "Marker venligst det billedlag der skal justeres."
msgid "Start adjusting"
msgstr ""
@@ -23151,31 +24933,22 @@ msgstr "Importerede billeder"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Billedfiler (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Åbn billeder med ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Hent billedsæt som et nyt lag."
-
msgid "Import vector graphics"
msgstr ""
msgid "Scale:"
-msgstr ""
+msgstr "Skala:"
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -23196,7 +24969,7 @@ msgid "Delete this&older"
msgstr ""
msgid "km/h"
-msgstr ""
+msgstr "km/t"
msgid "Track name: "
msgstr ""
@@ -23276,13 +25049,13 @@ msgid "create the channel digraph"
msgstr ""
msgid "Check "
-msgstr ""
+msgstr "Tjek "
msgid "check the subust for junction properties"
msgstr ""
msgid "Search "
-msgstr ""
+msgstr "Søg "
msgid "search for junctions in the channel subset"
msgstr ""
@@ -23542,11 +25315,8 @@ msgstr "Auto-centrér"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrér LiveGPS-laget løbende til den nuværende position."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
-msgstr ""
+msgstr "Åben MapDust"
msgid "MapDust bug reports"
msgstr ""
@@ -23599,14 +25369,38 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Et rollebaseret relationsmedlemsskab blev kopieret til alle nye "
+"veje.<br>Du bør kontrollere dette og om nødvendigt korrigere det.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Et relationsmedlemsskab blev kopieret til alle nye veje.<br>Du bør "
+"kontrollere dette og om nødvendigt korrigere det.</html>"
+
msgid "Split way"
+msgstr "Opdel vej"
+
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Indtast en tag nøgle, f.eks. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
msgstr ""
+"<html>Indtast en tag værdi, f.eks. <strong><tt>Tjek "
+"medlemmer</tt></strong></html>"
msgid "Michigan Left"
msgstr "Michigan venstre"
msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "Tilføjer ingen venstresving for sæt af 4 eller 5 veje."
msgid "Please select 4 or 5 ways to assign no left turns."
msgstr ""
@@ -23627,21 +25421,33 @@ msgid ""
"XAPI query, e.g., '''' (to download all data), ''[highway=*]'', or "
"''[[network=VRR][ref=603|613]''"
msgstr ""
+"XAPI forespørgsel, f.eks., '''' (for at downloade alle data), "
+"''[highway=*]'', eller ''[[network=VRR][ref=603|613]''"
msgid "Download from OSM mirror..."
msgstr "Download fra OSM spejl..."
msgid "This XAPI query seems to be invalid, please doublecheck"
msgstr ""
+"Denne XAPI forespørgsel ser ud til at være ugyldig, tjek venligst igen"
msgid "Object type: "
-msgstr ""
+msgstr "Objekttype: "
msgid "OSM object type to download (''*'' stands for any)"
-msgstr ""
+msgstr "OSM objekttype der skal downloades (''*'' betyder alle)"
msgid "XAPI query: "
-msgstr ""
+msgstr "XAPI forespørgsel: "
+
+msgid "Download from Overpass API ..."
+msgstr "Download fra Overpass API ..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Download kortdata fra Overpass API server."
+
+msgid "Overpass query: "
+msgstr "Overpass forespørgsel: "
msgid "Select OSM mirror URL"
msgstr "Vælg OSM spejl URL"
@@ -23650,22 +25456,13 @@ msgid "Select OSM mirror URL to download from."
msgstr "Vælg OSM spejl URL der skal downloades fra."
msgid "Base URL"
-msgstr ""
+msgstr "Grund URL"
msgid "Enforce meta data"
-msgstr ""
-
-msgid "Convert to multipolygon"
-msgstr ""
-
-msgid "Convert to multipolygon."
-msgstr ""
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
+msgstr "Håndhæv metadata"
msgid "About Plugin"
-msgstr ""
+msgstr "Om udvidelse"
msgid "Native password manager plugin"
msgstr ""
@@ -23711,10 +25508,10 @@ msgid "JOSM/OSM API/Password"
msgstr ""
msgid "{0}/Username"
-msgstr ""
+msgstr "{0}/Brugernavn"
msgid "{0}/Password"
-msgstr ""
+msgstr "{0}/Kodeord"
msgid "JOSM/Proxy/Username"
msgstr ""
@@ -23735,10 +25532,10 @@ msgid "The username and password is protected by {0}."
msgstr ""
msgid "username"
-msgstr ""
+msgstr "brugernavn"
msgid "password"
-msgstr ""
+msgstr "kodeord"
msgid "proxy username"
msgstr ""
@@ -23764,7 +25561,7 @@ msgid "Plain text, JOSM default"
msgstr ""
msgid "Use {0}"
-msgstr ""
+msgstr "Brug {0}"
msgid "Encrypt data with Windows logon credentials"
msgstr ""
@@ -23798,9 +25595,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -23825,17 +25619,26 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
msgid "Accept"
-msgstr ""
+msgstr "Accepter"
msgid "Refuse"
msgstr ""
@@ -23915,7 +25718,7 @@ msgid "Download OSM data corresponding to the current data set."
msgstr ""
msgid "Diff"
-msgstr ""
+msgstr "Diff"
msgid "Perform diff between current data set and existing OSM data."
msgstr ""
@@ -23939,7 +25742,7 @@ msgid ""
msgstr ""
msgid "General settings"
-msgstr ""
+msgstr "Generelle indstillinger"
msgid ""
"Import only raw data (i.e. do not add/delete tags or replace them by "
@@ -23974,9 +25777,12 @@ msgid ""
msgstr ""
msgid "Downloading data..."
+msgstr "Downloader data..."
+
+msgid "File to load"
msgstr ""
-msgid "File to load"
+msgid "Reading 7Zip file..."
msgstr ""
msgid "Reading Zip file..."
@@ -23995,6 +25801,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -24233,14 +26050,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "En fejl opstod: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Kunne ikke oprette ny fejlrapport. Resultat: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Header indeholder adskillige værdier og kan ikke mappes til en enkelt streng"
-
msgid "Process queue"
msgstr "Behandlingskø"
@@ -24297,18 +26106,6 @@ msgstr ""
msgid "Close: "
msgstr "Luk: "
-msgid "New issue"
-msgstr "Ny fejlrapport"
-
-msgid "Create issue"
-msgstr "Opret fejlrapport"
-
-msgid "Describe the problem precisely"
-msgstr "Beskriv problemet præcist"
-
-msgid "Create: "
-msgstr "Opret: "
-
msgid "Open in browser"
msgstr "Åben i browser"
@@ -24368,6 +26165,9 @@ msgstr "Firefox-programfil"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24405,7 +26205,7 @@ msgid "Load file..."
msgstr "Indlæs fil..."
msgid "Place"
-msgstr ""
+msgstr "Sted"
msgid "Show target"
msgstr ""
@@ -24456,7 +26256,7 @@ msgid "Bind to coordinates"
msgstr ""
msgid "Projection:"
-msgstr ""
+msgstr "Projektion:"
msgid "Bottom left (min) corner:"
msgstr ""
@@ -24516,10 +26316,10 @@ msgid "Parsing file"
msgstr ""
msgid "File not found."
-msgstr ""
+msgstr "Filen blev ikke fundet."
msgid "Error while parsing: {0}"
-msgstr ""
+msgstr "Fejl under fortolkning: {0}"
msgid "Removing parallel segments"
msgstr ""
@@ -24575,9 +26375,6 @@ msgstr "Importer PDF fil."
msgid "Import PDF"
msgstr "Importer PDF"
-msgid "Import PDf file"
-msgstr "Importer PDF fil"
-
msgid " {0} objects so far"
msgstr " {0} objekter indtil videre"
@@ -24634,7 +26431,7 @@ msgid "File could not be deleted!"
msgstr ""
msgid "Could not rename file!"
-msgstr ""
+msgstr "Kunne ikke omdøbe filen!"
msgid "<html><h3>There are old backup files in the image directory!</h3>"
msgstr ""
@@ -24657,8 +26454,26 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -24716,7 +26531,7 @@ msgid "PicLayer move"
msgstr ""
msgid "Moved"
-msgstr ""
+msgstr "Flyttet"
msgid "Drag to move the picture"
msgstr ""
@@ -24743,7 +26558,7 @@ msgid "PicLayer scale"
msgstr ""
msgid "Scaled"
-msgstr ""
+msgstr "Skaleret"
msgid "Drag to scale the picture in the X and Y Axis"
msgstr ""
@@ -24794,7 +26609,7 @@ msgid "Transform point on the picture"
msgstr ""
msgid "PicLayer: {0}"
-msgstr ""
+msgstr "PicLayer: {0}"
msgid "Calibration Files"
msgstr ""
@@ -24811,6 +26626,10 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Advarsel: kunne ikke håndtere zip filen \"{0}\". Undtagelsen var: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -24835,6 +26654,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24929,16 +26751,16 @@ msgid "added"
msgstr "tilføjet"
msgid "Public Transport: Enable GTFSStops"
-msgstr ""
+msgstr "Offentligt transport: Aktiver GTFSStops"
msgid "Public Transport: Catch GTFS stops"
-msgstr ""
+msgstr "Offentligt transport: Opfang GTFS stop"
msgid "skipped"
-msgstr ""
+msgstr "sprunget over"
msgid "Public Transport: Disable GTFS"
-msgstr ""
+msgstr "Offentlig transport: Deaktiver GTFS"
msgid "Create Stops from GTFS ..."
msgstr "Opret stop fra GTFS ..."
@@ -24953,21 +26775,23 @@ msgid "File \"{0}\" does not exist"
msgstr "Fil \"{0}\" findes ikke"
msgid "IOException \"{0}\" occurred"
-msgstr ""
+msgstr "IOException \"{0}\" opstod"
msgid ""
"There exists no dataset. Try to download data from the server or open an OSM "
"file."
msgstr ""
+"Der findes ikke noget datasæt. Prøv at downloade data fra serveren eller "
+"åben en OSM fil."
msgid "No data found"
-msgstr ""
+msgstr "Ingen data fundet"
msgid "The GTFS file was empty."
-msgstr ""
+msgstr "GTFS filen var tom."
msgid "light_rail"
-msgstr ""
+msgstr "letbane"
msgid "Create Stops from GTFS"
msgstr "Opret stop fra GTFS"
@@ -24982,7 +26806,7 @@ msgid "Time on your GPS device"
msgstr "Tid på din GPS enhed"
msgid "HH:MM:SS.sss"
-msgstr ""
+msgstr "TT:MM:SS.sss"
msgid "Time on your stopwatch"
msgstr "Tid på dit stopur"
@@ -24991,7 +26815,7 @@ msgid "Time window"
msgstr "Tidsvindue"
msgid "seconds"
-msgstr ""
+msgstr "sekunder"
msgid "Move Threshold"
msgstr "Grænseværdi for bevægelse"
@@ -25009,16 +26833,16 @@ msgid "Mark"
msgstr "Marker"
msgid "Catch"
-msgstr ""
+msgstr "Opfang"
msgid "Join"
-msgstr ""
+msgstr "Sammenlæg"
msgid "Enable"
msgstr "Aktiver"
msgid "Can''t parse a time from this string."
-msgstr ""
+msgstr "Kan ikke udlede en tid fra denne streng."
msgid "Invalid value"
msgstr "Ugyldig værdi"
@@ -25030,16 +26854,16 @@ msgid "Public Transport: Join GTFS stops"
msgstr "Offentlig transport: Sammenlæg GTFS stop"
msgid "Id"
-msgstr ""
+msgstr "Id"
msgid "pending"
-msgstr ""
+msgstr "afventer"
msgid "outside"
msgstr "udenfor"
msgid "[incomplete]"
-msgstr ""
+msgstr "[ufuldstændig]"
msgid "[empty way]"
msgstr "[tom vej]"
@@ -25048,7 +26872,7 @@ msgid "[ID] {0}"
msgstr "[ID] {0}"
msgid "[gap]"
-msgstr ""
+msgstr "[mellemrum]"
msgid " [ID] {0}"
msgstr " [ID] {0}"
@@ -25072,7 +26896,7 @@ msgid "Stops"
msgstr "Stop"
msgid "Meta"
-msgstr ""
+msgstr "Meta"
msgid "Existing route patterns:"
msgstr "Eksisterende rutemønstre:"
@@ -25111,7 +26935,7 @@ msgid "Maximum distance from route"
msgstr "Maksimum afstand fra ruten"
msgid "Public Transport: Change stop type"
-msgstr ""
+msgstr "Offentlig Transport: Skift stop type"
msgid "Create Stops from GPX ..."
msgstr "Opret stop fra GPX ..."
@@ -25120,17 +26944,14 @@ msgid "Create Stops from a GPX file"
msgstr "Opret stoppesteder fra en GPX fil"
msgid "Select GPX file"
-msgstr ""
+msgstr "Vælg GPX fil"
msgid "The GPX file contained no tracks or waypoints."
-msgstr "GPX filen indeholdt ikke nogen spor eller vejpunkter."
+msgstr "GPX filen indeholdt ikke nogen spor eller waypoints."
msgid "Create Stops from GPX"
msgstr "Opret stop fra GPX"
-msgid "Tracks"
-msgstr "Spor"
-
msgid "Tracks in this GPX file:"
msgstr "Spor i denne GPX fil:"
@@ -25138,30 +26959,32 @@ msgid "Detach"
msgstr "Frigør"
msgid "implicit"
-msgstr ""
+msgstr "underforstået"
msgid ""
"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
"has trackpoints."
msgstr ""
+"GPX filen indeholder ikke gyldige sporpunkter. Brug venligst en GPX fil der "
+"har sporpunkter."
msgid "GPX File Trouble"
-msgstr ""
+msgstr "GPX fil-problem"
msgid "unnamed"
msgstr "unavngivet"
msgid "Public Transport: Add track stop"
-msgstr ""
+msgstr "Offentlig transport: Tilføj spor stop"
msgid "Public Transport: Delete track stop"
-msgstr ""
+msgstr "Offentlig transport: Slet spor stop"
msgid "Public Transport: Detach track stop list"
msgstr "Offentlig transport: Frigør spor-stop liste"
msgid "Public Transport: Edit track stop list"
-msgstr ""
+msgstr "Offentlig transport: Rediger spor stop liste"
msgid "Public Transport: Relocate nodes in track stoplist"
msgstr ""
@@ -25173,19 +26996,19 @@ msgid "Public Transport: Suggest stops"
msgstr "Offentlig transport: Foreslå stop"
msgid "Stopname"
-msgstr ""
+msgstr "Stopnavn"
msgid "Public Transport: Detach waypoints"
-msgstr "Offentlig transport: Frigør vejpunkter"
+msgstr "Offentlig transport: Frigør waypoints"
msgid "Public Transport: Disable waypoints"
-msgstr ""
+msgstr "Offentlig transport: Deaktiver waypoints"
msgid "Public Transport: Enable waypoints"
-msgstr "Offentlig transport: Aktiver vejpunkter"
+msgstr "Offentlig transport: Aktiver waypoints"
msgid "Public Transport: Edit waypoint name"
-msgstr ""
+msgstr "Offentlig transport: Rediger waypoint-navn"
msgid "Relation Toolbox"
msgstr ""
@@ -25199,9 +27022,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr "Opret administrative grænse-relationer"
@@ -25257,7 +27077,7 @@ msgid "Choose a type for the relation:"
msgstr ""
msgid "Delete relation"
-msgstr ""
+msgstr "Slet relation"
msgid "Download incomplete members for the chosen relation"
msgstr ""
@@ -25328,9 +27148,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "Genstart JOSM"
-
msgid "Revert changeset fully"
msgstr ""
@@ -25352,11 +27169,14 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
msgid "Objects history"
-msgstr ""
+msgstr "Objekts historik"
msgid "History reverter"
msgstr ""
@@ -25379,7 +27199,7 @@ msgstr ""
"fortsætte?"
msgid "Confirm"
-msgstr ""
+msgstr "Bekræft"
msgid "Fetching missing primitives"
msgstr ""
@@ -25387,32 +27207,55 @@ msgstr ""
msgid "Downloading changeset"
msgstr "Henter rettesæt"
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Advarsel ikkeunderstøttet startelement ''{0}'' i rettesætsindhold på "
+"position ({1},{2}). Springer over."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Advarsel ikkeunderstøttet slutelement ''{0}'' i rettesætsindhold på position "
+"({1},{2}). Springer over."
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
-msgstr ""
+msgstr "skilte"
+
+msgid "Change Properties"
+msgstr "Ret egenskaber"
msgid "Country preset:"
msgstr ""
msgid "Show all signs"
-msgstr ""
+msgstr "Vis alle skilte"
msgid "Show a selection of the most useful signs"
+msgstr "Vis et udvalg af de mest brugte skilte"
+
+msgid "Spain"
msgstr ""
msgid "Germany"
-msgstr ""
+msgstr "Tyskland"
msgid "Poland"
-msgstr ""
+msgstr "Polen"
msgid "Slovakia"
-msgstr ""
+msgstr "Slovakiet"
msgid "Roadsign tagging"
msgstr ""
@@ -25424,7 +27267,7 @@ msgid "Roadsigns plugin: open dialog"
msgstr ""
msgid "custom"
-msgstr ""
+msgstr "tilpasset"
msgid "Could not read tagging preset source: ''{0}''"
msgstr "Kunne ikke læse kilde til prædefinerede tags: ''{0}''"
@@ -25507,9 +27350,6 @@ msgstr "Indstillinger for Ruteplan-udvidelse"
msgid "Configure routing preferences."
msgstr "Ret indstillinger for ruteplan"
-msgid "Highway type"
-msgstr "Vej-type"
-
msgid "Speed (Km/h)"
msgstr "Hastighed (km/t)"
@@ -25575,7 +27415,7 @@ msgid "Configures access to the Separate Data Store."
msgstr ""
msgid "Server"
-msgstr ""
+msgstr "Server"
msgid "The URL under which the SDS server can be contacted."
msgstr ""
@@ -25625,6 +27465,9 @@ msgstr ""
msgid "Save SDS file"
msgstr "Gem SDS fil"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Kan ikke sikkerhedskopiere filen. Undtagelsen er: {0}"
+
msgid "Simplify Area"
msgstr "Simplificer område"
@@ -25685,19 +27528,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
-msgstr "Onlinehjælp"
+msgid "SeaMap Editor"
+msgstr ""
-msgid "Load"
-msgstr "Indlæs"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25740,7 +27583,7 @@ msgid "{0} end"
msgstr "{0} slut"
msgid "Waypoint Description"
-msgstr "Punkt beskrivelse"
+msgstr "Waypoint beskrivelse"
msgid "Surveyor Actions"
msgstr ""
@@ -25815,7 +27658,7 @@ msgid "Terrace a house"
msgstr ""
msgid "Interpolation"
-msgstr ""
+msgstr "Interpolering"
msgid "Lowest Number"
msgstr "Laveste tal"
@@ -25824,7 +27667,7 @@ msgid "Lowest housenumber of the terraced house"
msgstr ""
msgid "Highest Number"
-msgstr ""
+msgstr "Højeste nummer"
msgid "List of Numbers"
msgstr ""
@@ -25841,6 +27684,9 @@ msgstr ""
msgid "Street name: "
msgstr "Vejnavn: "
+msgid "Building: "
+msgstr "Bygning: "
+
msgid "Even/Odd"
msgstr "Lige/ulige"
@@ -25899,7 +27745,7 @@ msgid "Terrace"
msgstr "Rækkehus"
msgid "Browse"
-msgstr ""
+msgstr "Gennemse"
msgid "Browse map with left button"
msgstr ""
@@ -25916,6 +27762,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -25931,9 +27866,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr "Gem signaturfil"
-msgid "Download OSM"
-msgstr "Download OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25955,6 +27887,10 @@ msgstr "Indlæs objekter fra serveren"
msgid "Download signed data"
msgstr "Download underskrevet data"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Advarsel: Ignorerer undtagelsen da opgaven blev annulleret. Undtagelse: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25982,7 +27918,7 @@ msgid "Open object signing window."
msgstr ""
msgid "Check"
-msgstr ""
+msgstr "Tjek"
msgid "Check all available signatures for selected object."
msgstr "Kontrollér alle tilgængelige signaturer for valgte objekter."
@@ -26110,9 +28046,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr "Vælg så mange som du har lyst til:"
@@ -26389,8 +28322,8 @@ msgstr ""
msgid "{0} warning"
msgid_plural "{0} warnings"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} advarsel"
+msgstr[1] "{0} advarsler"
msgid "{0} error"
msgid_plural "{0} errors"
@@ -26594,7 +28527,7 @@ msgid "Removes the member with role ''from''"
msgstr ""
msgid "Delete ''to''"
-msgstr ""
+msgstr "Slet \"til\""
msgid "Removes the member with role ''to''"
msgstr ""
@@ -26744,7 +28677,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -26752,10 +28688,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -26764,18 +28697,6 @@ msgstr "Start gendannelse"
msgid "Close dialog and cancel"
msgstr "Luk dialog og annuller"
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr "Fandt {0}"
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr "Tilføj punkter ved overskæringer"
@@ -26818,20 +28739,11 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
-msgstr ""
+msgstr "Opdel objekt"
msgid "Split an object at the selected nodes."
-msgstr ""
+msgstr "Opdeler et objekt ved de markerede punkter."
msgid "The current selection cannot be used for splitting."
msgstr "Det markerede kan ikke opdeles"
@@ -26948,18 +28860,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -27137,9 +29037,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr "Fjern alle punkter fra markeringen"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Importér video"
@@ -27204,10 +29101,10 @@ msgid "follows the video icon automaticly"
msgstr ""
msgid "Subtitles"
-msgstr ""
+msgstr "Undertekster"
msgid "Show subtitles in video"
-msgstr ""
+msgstr "Vis undertekster i video"
msgid "Jump length"
msgstr ""
@@ -27240,7 +29137,7 @@ msgid ""
msgstr ""
msgid "Jump to"
-msgstr ""
+msgstr "Gå til"
msgid "Jump to GPS time"
msgstr ""
@@ -27258,16 +29155,16 @@ msgid "Unable to find native libvlc library!"
msgstr ""
msgid "play"
-msgstr ""
+msgstr "afspil"
msgid "loop"
-msgstr ""
+msgstr "loop"
msgid "mute"
-msgstr ""
+msgstr "lyd fra"
-msgid "Scanned Map..."
-msgstr "Skannet kort..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -27287,9 +29184,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Vej-download"
@@ -27347,10 +29241,10 @@ msgid "Select waypoint to move map"
msgstr ""
msgid "Waypoint search"
-msgstr ""
+msgstr "Waypoint søgning"
msgid "Search after waypoint. Click and move the map view to the waypoint."
-msgstr ""
+msgstr "Søg efter waypointy. Klik og flyt kortvisningen til waypointet."
msgid "Way Select"
msgstr ""
@@ -27400,7 +29294,7 @@ msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr "Henter alle koordinater fra Wikipedia i det viste udsnit af kortet"
msgid "coordinates"
-msgstr ""
+msgstr "koordinater"
msgid "Category"
msgstr "Kategori"
@@ -27412,13 +29306,13 @@ msgid "Enter the Wikipedia category"
msgstr "Indtast Wikipedia kategorien"
msgid "Clipboard"
-msgstr ""
+msgstr "Udklipsholder"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Indsætter Wikipedia artikler fra systemets udklipsholder"
msgid "clipboard"
-msgstr ""
+msgstr "udklipsholder"
msgid "Open Article"
msgstr "Åben artikel"
@@ -27432,9 +29326,6 @@ msgstr "Sætter standard sproget for Wikipedia-artiklerne"
msgid "Enter the Wikipedia language"
msgstr "Angiv Wikipedia sproget"
-msgid "Add Tag"
-msgstr "Tilføj tag"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index b61410c..05a530f 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -2,28 +2,31 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 11:48+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
-"Language-Team: <de at li.org>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-19 20:43+0000\n"
+"Last-Translator: framm <Unknown>\n"
+"Language-Team: German <kde-i18n-de 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: 2013-04-05 04:41+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-20 04:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
+"Language: de\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr "{0}: Option ''{1}'' ist mehrdeutig"
+msgstr "{0}: Option ''{1}'' ist mehrdeutig"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr "{0}: Option ''--{1}'' erlaubt kein Argument"
+msgstr "{0}: Option ''--{1}'' erlaubt kein Argument"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: Option ''{1}{2}'' erlaubt kein Argument"
+msgstr "{0}: Option ''{1}{2}'' erlaubt kein Argument"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr "{0}: Option ''{1}'' verlangt nach einem Argument"
+msgstr "{0}: Option ''{1}'' verlangt nach einem Argument"
msgid "{0}: unrecognized option ''--{1}''"
msgstr "{0}: unerkannte Option ''--{1}''"
@@ -51,6 +54,21 @@ msgstr ""
"Das Öffnen von Links wird von der derzeitigen Plattform (''{0}'') nicht "
"unterstützt"
+msgid "ERROR: {0}"
+msgstr "Fehler: {0}"
+
+msgid "WARNING: {0}"
+msgstr "WARNUNG: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr "Ursache: "
+
msgid "Executing platform startup hook"
msgstr "Plattform-Start ausführen"
@@ -155,19 +173,19 @@ msgid "About JOSM..."
msgstr "Über JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNUNG: Unerwartetes Format der API-Basis-URL. Weiterleitung zur Info- oder "
+"Unerwartetes Format der API-Basis-URL. Weiterleitung zur Info- oder "
"Chronikseite wird wahrscheinlich scheitern. API-Basis-URL ist: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNUNG: Unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den OSM-"
+"Unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den OSM-"
"Nutzerseiten wird wahrscheinlich fehlschlagen. Die API-Basis-URL lautet: "
-"\"{0}\""
+"''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -215,6 +233,9 @@ msgstr "Keine Zielebenen"
msgid "Add imagery layer {0}"
msgstr "Hintergrund-Ebene {0} hinzufügen"
+msgid "Select image format for WMS layer"
+msgstr "Bildformat der WMS-Ebene wählen"
+
msgid "Select WMS layers"
msgstr "WMS-Ebenen auswählen"
@@ -256,9 +277,6 @@ msgstr "Werkzeug: {0}"
msgid "Please select at least four nodes."
msgstr "Bitte mindestens vier Punkte auswählen."
-msgid "Information"
-msgstr "Information"
-
msgid "Align Nodes in Line"
msgstr "Punkte in einer Gerade anordnen"
@@ -283,6 +301,9 @@ msgstr "Konflikt"
msgid "download"
msgstr "heruntergeladene Daten"
+msgid "problem"
+msgstr "Problem"
+
msgid "previous"
msgstr "vorheriger"
@@ -292,6 +313,9 @@ msgstr "nächster"
msgid "Nothing selected to zoom to."
msgstr "Nichts ausgewählt, auf das gezoomt werden kann."
+msgid "Information"
+msgstr "Information"
+
msgid "Zoom to {0}"
msgstr "Auf {0} zoomen"
@@ -348,10 +372,10 @@ msgstr ""
"werden. Sollen die Richtungen angepasst werden?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Linien können nicht verbunden werden (Sie können nicht in eine eindeutige "
+"Linien können nicht verbunden werden<br>(Sie können nicht in eine eindeutige "
"Reihenfolge gebracht werden)"
msgid "Combine {0} ways"
@@ -409,18 +433,37 @@ msgstr "Entfernen"
msgid "Delete selected objects."
msgstr "Ausgewählte Objekte löschen."
+msgid "Toggle dialogs panel"
+msgstr "Dialogbedienfeld umschalten"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Dialogbedienfeld umschalten, Kartenanzeige maximieren"
+
msgid "Distribute Nodes"
msgstr "Punkte verteilen"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Gewählte Punkte gleichmäßig auf einer Linie verteilen."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "{0} Punkte mit leeren Koordinaten ignoriert"
+
msgid "Download from OSM..."
msgstr "Vom OSM-Server herunterladen..."
msgid "Download map data from the OSM server."
msgstr "Kartendaten vom OSM-Server herunterladen."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Diese Aktion benötigt {0} individuelle Serveranfragen.<br>Wollen Sie "
+"fortfahren?</html>"
+
+msgid "Download data"
+msgstr "Daten herunterladen"
+
msgid "Download object..."
msgstr "Objekt herunterladen..."
@@ -520,6 +563,9 @@ msgstr "Versionsprotokoll"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Versionsprotokoll der Linien, Punkte oder Relationen anzeigen."
+msgid "Show history"
+msgstr "Versionsprotokoll anzeigen"
+
msgid "History (web)"
msgstr "Versionsprotokoll (Web)"
@@ -649,11 +695,11 @@ msgid "Joined overlapping areas"
msgstr "Überlappende Flächen verbunden"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Einige der Linien waren Elemente von Relationen, welche geändert wurden. "
-"Bitte prüfen Sie, dass keine Fehler entstanden sind."
+"Einige der Linien waren Elemente von Relationen, welche geändert "
+"wurden.<br>Bitte prüfen Sie, dass keine Fehler entstanden sind."
msgid "Fix tag conflicts"
msgstr "Merkmalskonflikte beheben"
@@ -821,8 +867,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Mehrere Punkte zum Ältesten vereinigen."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
"Bitte wählen Sie mindestens zwei Punkte zum Vereinigen oder einen Punkt, der "
"nahe an einem anderen liegt."
@@ -998,11 +1044,11 @@ msgid "Download Data"
msgstr "Daten herunterladen"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Die URL ''{0}'' kann nicht geöffnet werden, da kein passendes Modul "
-"zum Herunterladen verfügbar ist.</html>"
+"URL ''{0}'' kann nicht geöffnet werden.<br>Die folgenden "
+"Herunterladefunktionen akzeptieren die angezeigten URL-Muster:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1034,16 +1080,11 @@ msgid "Orthogonalize / Undo"
msgstr "Rechtwinklig anordnen / Rückgängig machen"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Rechtwinklig anordnen / Rückgängig machen\n"
-"Bitte wählen Sie die Punkte aus, die zuvor beim rechtwinklig Anordnen "
-"verschoben wurden."
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Rechtwinklige Anordnung rückgängig machen"
+"Rechtwinklig anordnen / Rückgängig machen<br>Bitte wählen Sie die Punkte "
+"aus, die zuvor beim rechtwinklig Anordnen verschoben wurden."
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1063,9 +1104,6 @@ msgstr "Rechtwinklig machen"
msgid "Usage"
msgstr "Verwendung"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Die ausgewählten Objekte können nicht rechtwinklig angeordnet werden"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1185,6 +1223,15 @@ msgstr "Die Datei auch umbenennen"
msgid "Could not rename file ''{0}''"
msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden"
+msgid "Restart"
+msgstr "Neu starten"
+
+msgid "Restart the application."
+msgstr "Anwendung neu starten."
+
+msgid "Click to restart later."
+msgstr "Klicken, um später neu zu starten."
+
msgid "Reverse way"
msgstr "Linienrichtung umkehren"
@@ -1237,9 +1284,6 @@ msgstr "Sitzung laden"
msgid "Load a session from file."
msgstr "Eine Sitzung aus einer Datei laden."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Sitzungsdatei (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Sitzung öffnen"
@@ -1306,6 +1350,9 @@ msgstr "Statusbericht"
msgid "Copy to clipboard and close"
msgstr "In die Zwischenablage kopieren und schließen"
+msgid "Report bug"
+msgstr "Fehler melden"
+
msgid "Close"
msgstr "Schließen"
@@ -1390,19 +1437,18 @@ msgstr ""
"Punkte in der Mitte der Linie.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen "
-"Linien kopiert.<br>Sie sollten dies überprüfen und falls nötig "
-"korrigieren.</html>"
+"Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Linien "
+"kopiert.<br>Sie sollten dies überprüfen und falls nötig korrigieren."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Alle neuen Linien wurden als Elemente in einer Relation "
-"eingefügt.<br>Sie sollten dies überprüfen und falls nötig korrigieren.</html>"
+"Alle neuen Linien wurden als Elemente in einer Relation eingefügt.<br>Sie "
+"sollten dies überprüfen und falls nötig korrigieren."
msgid "Split way {0} into {1} parts"
msgstr "Linie {0} in {1} Teile teilen"
@@ -1507,6 +1553,29 @@ msgstr ""
"wahrscheinlich zu Problemen, da das wirkliche Objekt momentan nicht sichtbar "
"ist.<br>Wollen Sie mit dem Trennen wirklich fortfahren?"
+msgid "Disconnect Node from Way"
+msgstr "Punkt von Linie trennen"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Punkte von Linien trennen, zu denen sie momentan gehören"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Mindestens einen Punkt zum abtrennen wählen."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Gewählter Punkt kann von nichts abgetrennt werden."
+msgstr[1] "Gewählte Punkte können von nichts abgetrennt werden."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"Die betroffene Linie würde nach dem Abtrennen des Punktes verschwinden."
+msgstr[1] ""
+"Die betroffene Linie würde nach dem Abtrennen der Punkte verschwinden."
+
msgid "Undo"
msgstr "Rückgängig"
@@ -1532,9 +1601,6 @@ msgid "Updates the objects in the active data layer from the server."
msgstr ""
"Die Objekte der aktuellen Datenebene mittels des Servers aktualisieren."
-msgid "Download data"
-msgstr "Daten herunterladen"
-
msgid "Update modified"
msgstr "Geändertes aktualisieren"
@@ -1746,6 +1812,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Langsamer abspielen"
+msgid "Download GPS"
+msgstr "GPS herunterladen"
+
msgid "Downloading GPS data"
msgstr "Hole GPS-Daten"
@@ -1755,6 +1824,18 @@ msgstr "Heruntergeladene GPS-Daten"
msgid "Markers from {0}"
msgstr "Wegpunkte von {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Komprimierte OSM-Änderung herunterladen"
+
+msgid "Download OSM Change"
+msgstr "OSM-Änderung herunterladen"
+
+msgid "Download Compressed OSM"
+msgstr "Komprimierte OSM-Daten herunterladen"
+
+msgid "Download OSM"
+msgstr "OSM herunterladen"
+
msgid "Downloading data"
msgstr "Daten herunterladen"
@@ -1776,6 +1857,31 @@ msgstr "Befehl"
msgid "Request details: {0}"
msgstr "Anfragedetails: {0}"
+msgid "Download OSM URL"
+msgstr "OSM-Daten herunterladen"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Es trat {0} Konflikt während des Imports auf."
+msgstr[1] "Es traten {0} Konflikte während des Imports auf."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt beim Herunterladen"
+msgstr[1] "Konflikte beim Herunterladen"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Eltern des Punktes {2} laden"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Eltern der Linie {2} laden"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Eltern der Relation {2} laden"
+
+msgid "Download session"
+msgstr "Sitzung herunterladen"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "{0} von {1} herunterladen (noch {2})"
@@ -1840,25 +1946,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Fehler beim Herunterladen"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Es trat {0} Konflikt während des Imports auf."
-msgstr[1] "Es traten {0} Konflikte während des Imports auf."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt beim Herunterladen"
-msgstr[1] "Konflikte beim Herunterladen"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Eltern des Punktes {2} laden"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Eltern der Linie {2} laden"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Eltern der Relation {2} laden"
-
msgid "Error during download"
msgstr "Fehler beim Herunterladen"
@@ -2011,6 +2098,9 @@ msgstr "Liniengenauigkeit verbessern"
msgid "Improve Way Accuracy mode"
msgstr "Modus zum Verbessern der Liniengenauigkeit"
+msgid "improve way accuracy helper line"
+msgstr "Hilfslinie für Verbesserung der Weggenauigkeit"
+
msgid "Click on the way to start improving its shape."
msgstr "Klicken Sie auf eine Linie, um ihre Form zu verbessern."
@@ -2044,10 +2134,10 @@ msgstr ""
"Ein Punkt kann nicht außerhalb des heruntergeladenen Bereichs platziert "
"werden."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Neuen Punkt zur Linie hinzufügen"
-msgstr[1] "Neuen Punkt zur {0} Linien hinzufügen"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Einen neuen Knotenpunkt zum Weg hinzufügen"
+msgstr[1] "Einen neuen Knotenpunkt zu {0} Wegen hinzufügen"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Kann von mehreren Objekten verwendeten Punkt nicht löschen"
@@ -2061,6 +2151,9 @@ msgstr "Parallel"
msgid "Make parallel copies of ways"
msgstr "Parallele Kopien einer Linie erstellen"
+msgid "make parallel helper line"
+msgstr "Parallelweg-Hilfslinie"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2525,6 +2618,11 @@ msgstr "\"Wert\" in beliebigem Schlüssel"
msgid "matches if ''key'' exists"
msgstr "Übereinstimmung, falls \"Schlüssel\" existiert"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+"Übereinstimmung, falls ''Schlüssel'' größer als ''Wert'' ist (analog für "
+"kleiner als)"
+
msgid "combinators"
msgstr "Kombinationen"
@@ -2636,7 +2734,7 @@ msgstr "Objekte in der aktuellen Ansicht"
msgid "objects (and all its way nodes / relation members) in current view"
msgstr ""
-"Objekte (und alle Linienpunkte / Relationselemente) in der aktuellen Ansicht"
+"Objekte (und alle Linienpunkte / Relationselemente) in der aktuellen Ansicht"
msgid "objects in downloaded area"
msgstr "Objekte im heruntergeladenen Bereich"
@@ -2698,14 +2796,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Angaben <i>min</i>/<i>max</i> hinter ''timestamp'' erwartet"
-msgid "Primitive id expected"
-msgstr "Erwarte eine Objekt-ID"
+msgid "Range of primitive ids expected"
+msgstr "Bereich von Objektnummern erwartet"
-msgid "Changeset id expected"
-msgstr "Änderungssatz-Nummer benötigt"
+msgid "Range of changeset ids expected"
+msgstr "Bereich von Änderungssatznummern erwartet"
-msgid "Version expected"
-msgstr "Version erwartet"
+msgid "Range of versions expected"
+msgstr "Bereich von Versionsnummern erwartet"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2716,6 +2814,9 @@ msgstr ""
"Unbekannter OSM-Typ: {0}. Erlaubte Werte sind \"node\", \"way\" oder "
"\"relation\"."
+msgid "Primitive id expected"
+msgstr "Erwarte eine Objekt-ID"
+
msgid "Range of numbers expected"
msgstr "Erwarte einen Zahlenbereich"
@@ -2734,11 +2835,9 @@ msgstr "Fehlender Parameter für XOR"
msgid "Missing operator for NOT"
msgstr "Fehlender Operator für ''NOT''."
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Warnung: automatisches Abschneiden der Wertmarkierung ''{0}'' am gelöschten "
-"Objekt {1}"
+"Automatisches Abschneiden der Wertmarkierung ''{0}'' am gelöschten Objekt {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2834,6 +2933,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "{0} Objekt wurde hinzugefügt"
msgstr[1] "{0} Objekte wurden hinzugefügt"
+msgid "New way {0} has 0 nodes"
+msgstr "Neue Linie {0} hat 0 Punkte"
+
msgid "Change node {0}"
msgstr "Punkt {0} verändern"
@@ -2870,11 +2972,11 @@ msgstr "\"{0}\" entfernen für {1} Objekte"
msgid "Set {0}={1} for {2} objects"
msgstr "{0}={1} setzen für {2} Objekte"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "{0} Eigenschaften für {1} Objekte gelöscht"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "{0} Schlagwörter für {1} Objekte gelöscht"
-msgid "Set {0} properties for {1} objects"
-msgstr "{0} Eigenschaften für {1} Objekte festlegen"
+msgid "Set {0} tags for {1} objects"
+msgstr "{0} Schlagwörter für {1} Objekte festlegen"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "\"{0}\" mit \"{1}\" ersetzen für"
@@ -2898,11 +3000,11 @@ msgid "Double conflict"
msgstr "Doppelter Konflikt"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Warnung: Ebene ''{0}'' existiert nicht mehr. Konflikt für Objekt ''{1}'' "
-"konnte nicht aufgelöst werden."
+"Ebene ''{0}'' existiert nicht mehr. Konflikt für Objekt ''{1}'' konnte nicht "
+"aufgelöst werden."
msgid "Add conflict for ''{0}''"
msgstr "Konflikt für \"{0}\" hinzufügen"
@@ -3020,6 +3122,9 @@ msgstr[1] "{0} Objekte wurden bereinigt"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Konflikte in der Elementenliste für Relation {0} auflösen"
+msgid "Removed nodes from {0}"
+msgstr "Punkte von {0} entfernt"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "{0} Punkt drehen"
@@ -3086,11 +3191,11 @@ msgid "Reverse directional way."
msgstr "Richtung von gerichtetem Weg umdrehen."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Für das Umkehren der Linie werden zum Erhalt der Datenintegrität folgende "
-"Eigenschaftsänderungen an der Linie und ihren Punkten vorgeschlagen."
+"Beim Umkehren der Richtung dieses Weges werden folgende Änderungen "
+"vorgeschlagen, um die Datenkonsistenz zu erhalten."
msgid "Relation"
msgstr "Relation"
@@ -3119,11 +3224,11 @@ msgstr "Ausgewählte Änderungen anwenden"
msgid "Do not apply changes"
msgstr "Änderungen nicht anbringen"
-msgid "Please select which property changes you want to apply."
-msgstr "Bitte wählen Sie, welche Objekteigenschaften geändert werden sollen."
+msgid "Please select which changes you want to apply."
+msgstr "Bitte wählen Sie aus, welche Änderungen angewendet werden sollen."
-msgid "Properties of "
-msgstr "Eigenschaften von "
+msgid "Tags of "
+msgstr "Schlagwörter von "
msgid "Roles in relations referring to"
msgstr "Rollen in Relationen beziehen sich auf"
@@ -3149,6 +3254,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Fehler bei Löschung der alten Backup-Datei {0}"
+msgid "Your work has been saved automatically."
+msgstr "Ihre Arbeit wurde automatisch gespeichert."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Fehler bei der Erstellung des entfernten Layers: {0}"
@@ -3182,25 +3290,24 @@ msgstr ""
"aber dessen Standardwert ist nicht bekannt.<br/> Bitte aktivieren Sie die "
"entsprechende Funktion manuell und wiederholen Sie den Import."
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
-"Warnung: Erstellen des fehlenden Zwischenspeicherverzeichnisses "
-"fehlgeschlagen: {0}"
+"Erstellen des fehlenden Zwischenspeicherverzeichnisses fehlgeschlagen: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
"<html>Erstellen des fehlenden Zwischenspeicherverzeichnisses fehlgeschlagen: "
"{0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Achtung: Fehler beim Speichern der Voreinstellungen in \"{0}\""
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Fehler beim Speichern der Voreinstellungen in ''{0}''"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Achtung: Fehler beim Setzen der Voreinstellungen, da das angegebene "
-"Verzeichnis \"{0}\" kein Verzeichnis ist."
+"Fehler beim Setzen der Voreinstellungen, da das angegebene Verzeichnis "
+"''{0}'' kein Verzeichnis ist."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3210,11 +3317,11 @@ msgstr ""
"\"{0}\" kein Verzeichnis ist.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Achtung: Fehler beim Setzen der Voreinstellungen, da das Verzeichnis \"{0}\" "
-"nicht erstellt werden konnte."
+"Fehler beim Setzen der Voreinstellungen, da das Verzeichnis ''{0}'' nicht "
+"erstellt werden konnte."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3223,18 +3330,14 @@ msgstr ""
"<html>Initialisierung der Einstellungen fehlgeschlagen.<br>Fehlendes "
"Einstellungsverzeichnis konnte nicht erstellt werden: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
-msgstr ""
-"Information: Einstellungsdatei ''{0}'' fehlt. Erstelle "
-"Standardeinstellungsdatei."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
+msgstr "Einstellungsdatei ''{0}'' fehlt. Erstelle Standardeinstellungsdatei."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Warnung: Vorhandene Einstellungsdatei \"{0}\" wird mit den "
-"Standardeinstellungen ersetzt."
+"Vorhandene Einstellungsdatei ''{0}'' wird mit den Standardeinstellungen "
+"ersetzt."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3252,10 +3355,10 @@ msgstr ""
"Standardwerten erzeugt.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Warnung: Initialisierung der Einstellungen fehlgeschlagen. Einstellungsdatei "
+"Initialisierung der Einstellungen fehlgeschlagen.<br>Einstellungsdatei "
"konnte nicht auf Standardwerte zurückgesetzt werden: {0}"
msgid "Paint style {0}: {1}"
@@ -3287,14 +3390,12 @@ msgstr ""
msgid "UNKNOWN"
msgstr "UNBEKANNT"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Warnung: Unerwartete Versionsnummer für JOSM in der Versions-Datei, der Wert "
-"ist ''{0}''"
+"Unerwartete JOSM-Versionsnummer in der Revisions-Datei, der Wert ist ''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Warnung: Die Revisions-Datei ''/REVISION'' fehlt."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Die Revisions-Datei ''/REVISION'' fehlt."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Konflikt mit Element \"{0}\" besteht bereits"
@@ -3476,11 +3577,10 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Fehler: Laden der Kartenrenderer-Klasse ''{0}'' fehlgeschlagen. Die Klasse "
-"wurde nicht gefunden."
+"Laden der Kartenrenderer-Klasse ''{0}'' fehlgeschlagen. Die Klasse wurde "
+"nicht gefunden."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3594,8 +3694,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Unbekannter Datumsbezeichner: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Bezugspunkt erforderlich (+datum=*, +towgs84=* oder +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Datum erforderlich (+datum=*, +towgs84=* or +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3617,6 +3717,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Unerwartete Anzahl an Argumenten für Parameter ''+bounds'' (muss 4 sein)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Unbekannter Parameter \"{0}\""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Erwartet Nummernargument für Parameter ''{0}''"
@@ -3637,11 +3740,6 @@ msgstr "Benutzerdefinierte Projektion"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Fehler: Öffnen des Eingabedatenstroms für Ressource ''/data/{0}'' "
-"fehlgeschlagen."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3682,6 +3780,9 @@ msgstr "Datenprüfung: Andere"
msgid "Running test {0}"
msgstr "Test {0} ausführen"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Test ''{0}'' in {1} beendet"
+
msgid "Addresses"
msgstr "Adressen"
@@ -3706,6 +3807,15 @@ msgstr "Mehrere Straßennamen in Relation"
msgid "House number too far from street"
msgstr "Hausnummer zu weit von der Straße entfernt"
+msgid "Barriers and entrances"
+msgstr "Barrieren und Eingänge"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Prüfungen für Fehler in Barrieren und Eingängen."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Barriere-Eingang auf Nicht-Barriere gesetzt"
+
msgid "Building inside building"
msgstr "Gebäude im Gebäude"
@@ -3734,8 +3844,8 @@ msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
"the same layer, but are not connected by a node."
msgstr ""
-"Dieser Test prüft, ob sich zwei Straßen, Schienen- oder Wasserwege oder "
-"Gebäude auf derselben Ebene schneiden ohne mit einem Punkt verbunden zu sein."
+"Dieser Test prüft, ob sich zwei Straßen, Gleise, Wasserstraßen oder Gebäude "
+"auf der selben Ebene überschneiden, ohne mit einem Punkt verbunden zu sein."
msgid "Crossing buildings"
msgstr "Überschneidende Gebäude"
@@ -3767,15 +3877,15 @@ msgstr " oder "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} ist veraltet, stattdessen {1} nutzen"
+msgid "{0} is unnecessary"
+msgstr "{0} ist unnötig"
+
msgid "Duplicated nodes"
msgstr "Doppelte Punkte"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Dieser Test prüft auf doppelte Punkte an der selben Stelle."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Doppelte Punkte in zwei nicht geschlossenen Linien"
-
msgid "Mixed type duplicated nodes"
msgstr "Doppelte Punkte verschiedenen Typs"
@@ -3783,7 +3893,7 @@ msgid "Highway duplicated nodes"
msgstr "Doppelte Straßenpunkte"
msgid "Railway duplicated nodes"
-msgstr "Doppelte Eisenbahnpunkte"
+msgstr "Doppelte Gleispunkte"
msgid "Waterway duplicated nodes"
msgstr "Doppelte Wasserwegpunkte"
@@ -3810,7 +3920,7 @@ msgid "Nodes at same position"
msgstr "Punkte auf der selben Position"
msgid "Duplicated relations"
-msgstr "Doppelte Relationen."
+msgstr "Doppelte Relationen"
msgid ""
"This test checks that there are no relations with same tags and same members "
@@ -3832,8 +3942,8 @@ msgid ""
"This test checks that there are no ways with same node coordinates and "
"optionally also same tags."
msgstr ""
-"Dieser Test prüft, dass keine Linien auf den selben Koordinaten liegen "
-"optional auch mit den gleichen Merkmalen."
+"Dieser Test prüft, dass keine Linien auf den selben Koordinaten liegen, "
+"optional auch mit den gleichen Merkmalen."
msgid "Ways with same position"
msgstr "Linien mit gleicher Position."
@@ -3847,6 +3957,24 @@ msgstr "Punkte doppelt in Linie"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Prüft auf Linien mit identischen aufeinanderfolgenden Punkten"
+msgid "Highways"
+msgstr "Straßen"
+
+msgid "Performs semantic checks on highways."
+msgstr "Semantik-Prüfungen bei Straßen"
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Ungültiger Kreisverkehr (highway: {0} anstatt {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Fehlende Angabe zum Fußgängerübergang"
+
+msgid "Unknown country code: {0}"
+msgstr "Unbekannter Ländercode: {0}"
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr "Unbekannter ''source:maxspeed''-Kontext: {0}"
+
msgid "Multipolygon"
msgstr "Multipolygon"
@@ -3921,6 +4049,12 @@ msgstr ""
"Dieser Test findet Punkte mit dem selben Namen (könnte auf Duplikate "
"hinweisen)."
+msgid "Opening hours syntax"
+msgstr "Syntax von Öffnungszeiten"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr "Dieser Test prüft die korrekte Verwendung der Öffnungszeiten-Syntax."
+
msgid "Overlapping Areas"
msgstr "Überlappende Gebiete"
@@ -3947,7 +4081,7 @@ msgid "Highways share segment with area"
msgstr "Straßensegment mit Fläche gemeinsam"
msgid "Railways share segment with area"
-msgstr "Eisenbahnensegment mit Fläche gemeinsam"
+msgstr "Gleise teilen sich ein Segment mit einer Fläche"
msgid "Ways share segment with area"
msgstr "Liniensegment mit Fläche gemeinsam"
@@ -3956,7 +4090,7 @@ msgid "Overlapping highways"
msgstr "Überlappende Straßen"
msgid "Overlapping railways"
-msgstr "Überlappende Schienen"
+msgstr "Überlappende Gleise"
msgid "Power lines"
msgstr "Hochspannungsleitungen"
@@ -3982,15 +4116,15 @@ msgstr "Relationstyp unbekannt"
msgid "Relation is empty"
msgstr "Relation ist leer"
+msgid "Role verification problem"
+msgstr "Problem bei Rollenprüfung"
+
msgid "<empty>"
msgstr "<leer>"
msgid "Role {0} missing"
msgstr "Rolle {0} fehlt"
-msgid "Role verification problem"
-msgstr "Problem bei Rollenprüfung"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Anzahl der {0}-Rollen ist zu klein ({1})"
@@ -4023,11 +4157,11 @@ msgstr ""
"Dieser Test prüft auf ähnlich benannte Linien, was auf Schreibfehler "
"hinweisen könnte."
-msgid "Properties checker :"
-msgstr "Eigenschaftsprüfer:"
+msgid "Tag checker"
+msgstr "Eigenschaftsprüfer"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Dieses Plugin prüft auf Fehler in Schlüsseln und Werten"
+msgid "This test checks for errors in tag keys and values."
+msgstr "Dieser Test prüft auf Fehler in Schlüssel und Werten eines Merkmals."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Ungültige Zeile im Merkmalsprüfer - {0}: {1}"
@@ -4168,8 +4302,8 @@ msgstr "Standarddatei für Schreibprüfung verwenden"
msgid "Use the default spellcheck file (recommended)."
msgstr "Standarddatei für die Schreibfehlerprüfung verwenden (empfohlen)."
-msgid "Fix properties"
-msgstr "Eigenschaften korrigieren"
+msgid "Fix tags"
+msgstr "Schlagwörter korrigieren"
msgid "Could not find element type"
msgstr "Konnte Elementtyp nicht finden"
@@ -4243,6 +4377,9 @@ msgstr "Nicht geschlossene Linien"
msgid "This tests if ways which should be circular are closed."
msgstr "Testen, ob kreisförmige Linien korrekt geschlossen sind."
+msgid "Unclosed way"
+msgstr "Nicht geschlossene Linie"
+
msgid "natural type {0}"
msgstr "Naturflächentyp {0}"
@@ -4273,9 +4410,6 @@ msgstr "Gebäude"
msgid "area"
msgstr "Fläche"
-msgid "Unclosed way"
-msgstr "Nicht geschlossene Linie"
-
msgid "Unconnected ways"
msgstr "Unverbundene Linien"
@@ -4304,12 +4438,12 @@ msgstr ""
"Dieser Test prüft auf Punkte ohne Merkmale, welche nicht Teil einer Linie "
"sind."
-msgid "No tags"
-msgstr "Keine Merkmale"
-
msgid "Unconnected nodes without physical tags"
msgstr "Unverbundener Punkt ohne physische Merkmale"
+msgid "No tags"
+msgstr "Keine Merkmale"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Hat Schlüssel mit \"fixme\" oder \"FIXME\""
@@ -4372,27 +4506,6 @@ msgstr "Verdrehte Küstenlinie: Land nicht auf der linken Seite"
msgid "Reversed land: land not on left side"
msgstr "Verdrehtes Land: Land nicht auf der linken Seite"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Falsche Anzahl Argumente für Lesezeichen"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Fehler beim Lesen von Lesezeicheneintrag: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Fehler: Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Fehler: Unzulässiger Wert ''{0}'' vom Typ double in der Zeile ''{1}'' der "
-"Lesezeichen-Datei ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Lesezeichen konnten nicht von<br>\"{0}\"<br>gelesen werden. Der Fehler "
-"war: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Nicht noch einmal zeigen (speichert Auswahl)"
@@ -4415,7 +4528,7 @@ msgid "highway"
msgstr "Straße"
msgid "railway"
-msgstr "Eisenbahn"
+msgstr "Gleise"
msgid "waterway"
msgstr "Gewässer"
@@ -4497,8 +4610,8 @@ msgstr "Hilfe anzeigen"
msgid "Downloading \"Message of the day\""
msgstr "Nachricht des Tages herunterladen"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Warnung: Lesen von MOTD fehlgeschlagen. Ausnahmesituation war: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Lesen von MOTD fehlgeschlagen. Fehler: {0}"
msgid "Message of the day not available"
msgstr "Nachricht des Tages nicht verfügbar"
@@ -4658,7 +4771,7 @@ msgstr ""
msgid "Make sure you load some data if you use --selection."
msgstr ""
-"Stellen Sie sicher, dass sie Daten laden, falls Sie --selection verwenden."
+"Stellen Sie sicher, dass Sie Daten laden, falls Sie --selection verwenden."
msgid "Initializing"
msgstr "Initialisieren"
@@ -4713,9 +4826,24 @@ msgstr "Ansicht"
msgid "Tools"
msgstr "Werkzeuge"
+msgid "More tools"
+msgstr "Werkzeuge 2"
+
+msgid "Data"
+msgstr "Daten"
+
+msgid "Selection"
+msgstr "Auswahl"
+
msgid "Presets"
msgstr "Vorlagen"
+msgid "More..."
+msgstr "Mehr..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Fenster"
@@ -4726,18 +4854,29 @@ msgid "Save and load the current session (list of layers, etc.)"
msgstr "Speichern und Laden der aktuellen Sitzung (Ebenenliste, ...)"
msgid "Edit toolbar"
-msgstr "Symbolleiste bearbeiten"
+msgstr "Werkzeugleiste bearbeiten"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
-"Umschalten der Sichtbarkeit der Bearbeitungs-Symbolleiste (d.h. "
-"Vertikalwerkzeug)"
+"Werkzeugleiste »Bearbeiten« (z.B. das Vertikalwerkzeug) ein-/ausblenden"
+
+msgid "Preset preferences"
+msgstr "Objektvorlagen-Einstellungen"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr "Klicken, um die Objektvorlagen in den Einstellungen zu öffnen"
+
+msgid "Imagery preferences"
+msgstr "Hintergrund-Einstellungen"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Klicken, um die Hintergrund in den Einstellungen zu öffnen"
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
-msgstr "Bearbeitungs-Symbolleiste ausblenden"
+msgid "Do not hide toolbar"
+msgstr "Werkzeugleiste nicht ausblenden"
msgid "Hide this button"
msgstr "Diesen Button verbergen"
@@ -4745,6 +4884,9 @@ msgstr "Diesen Button verbergen"
msgid "Click the arrow at the bottom to show it again."
msgstr "Zum erneuten Anzeigen den unteren Pfeil anklicken"
+msgid "Hide edit toolbar"
+msgstr "Werkzeugleiste »Bearbeiten« ausblenden"
+
msgid "Hide or show this toggle button"
msgstr "Anzeigen oder Verbergen dieses Buttons"
@@ -4806,6 +4948,9 @@ msgstr "(kein Objekt)"
msgid "User:"
msgstr "Nutzer:"
+msgid "Do not hide status bar"
+msgstr "Statusleiste nicht ausblenden"
+
msgid "Layer not in list."
msgstr "Ebene nicht in der Liste."
@@ -4833,21 +4978,6 @@ msgstr "Im Hintergrund"
msgid "Click to run job in background"
msgstr "Klicken, um Arbeit im Hintergrund auszuführen"
-msgid "false: the property is explicitly switched off"
-msgstr "falsch: Diese Eigenschaft wurde explizit ausgeschaltet"
-
-msgid "true: the property is explicitly switched on"
-msgstr "wahr: diese Eigenschaft wurde explizit angeschaltet"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"teilweise: verschiedene gewählte Objekte haben verschiedene Werte, nicht "
-"ändern"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "ungesetzt: diese Eigenschaft bei den gewählten Objekten nicht setzen"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4960,7 +5090,7 @@ msgstr "Bitte geben Sie einen Kachelindex ein"
msgid "The current value isn''t a valid tile index for the given zoom level"
msgstr ""
-"Der aktuelle Wert ist kein gültiger Kachelindex für die angegebene Zoomstufe"
+"Der aktuelle Wert ist kein gültiger Kachelindex für die angegebene Zoomstufe"
msgid "Conflict background: no conflict"
msgstr "Konflikt-Hintergrund: Kein Konflikt"
@@ -5163,6 +5293,9 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Kopiere meine gewählten Elemente an das Ende der Liste vereinigter Elemente."
+msgid "> before"
+msgstr "> davor"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5170,6 +5303,9 @@ msgstr ""
"Kopiere meine gewählten Elemente vor das erste ausgewählte Element der Liste "
"vereinigter Elemente."
+msgid "> after"
+msgstr "> danach"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5177,17 +5313,26 @@ msgstr ""
"Kopiere meine gewählten Elemente hinter das erste ausgewählte Element der "
"Liste vereinigter Elemente."
+msgid "< top"
+msgstr "< Kopf"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Kopiere meine gewählten Elemente an den Anfang der Liste vereinigter "
"Elemente."
+msgid "< bottom"
+msgstr "< Fuß"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente."
+msgid "< before"
+msgstr "< davor"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5195,6 +5340,9 @@ msgstr ""
"Kopiere deren gewählten Elemente vor das erste ausgewählte Element der Liste "
"vereinigter Elemente."
+msgid "< after"
+msgstr "< danach"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5211,8 +5359,8 @@ msgstr "Alle Serverwerte ins Ziel kopieren"
msgid "Up"
msgstr "Hoch"
-msgid "Move up the selected elements by one position."
-msgstr "Den ausgewählten Eintrag eine Position nach oben schieben."
+msgid "Move up the selected entries by one position."
+msgstr "Die ausgewählten Einträge um eine Position nach oben verschieben"
msgid "Down"
msgstr "Runter"
@@ -5266,16 +5414,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Deren Version ({0} Eintrag)"
msgstr[1] "Deren Version ({0} Einträge)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Anpassbare Komponente {0} ist noch nicht registriert. Sie kann nicht am "
-"synchronen Anpassen teilnehmen."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Anpassbare Komponente {0} ist noch nicht registriert."
-
msgid "Node"
msgstr "Punkt"
@@ -5552,19 +5690,19 @@ msgctxt "tag"
msgid "Key:"
msgstr "Schlüssel:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
"<html>Geben Sie den Schlüssel eines Merkmals ein, zum Beispiel "
-"<string><tt>fixme</tt></strong></html>"
+"<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Wert:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Geben Sie den Wert eines Merkmals ein, zum Beispiel "
-"<strong><tt>Mitglieder überprüfen</tt></strong></html>"
+"<html>Schlagwortwert eingeben, z.B. <strong><tt>Mitglieder "
+"überprüfen</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5753,7 +5891,7 @@ msgid ""
msgstr ""
"<html>Sie haben noch nicht alle Unterschiede in diesem Konflikt "
"bereinigt.<br>Der Konflikt gilt erst als gelöst, wenn alle Unterschiede "
-"bereinigt sind.<br>Klicken Sie auf <strong>{0}</strong> um den Dialog "
+"bereinigt sind.<br>Klicken Sie auf <strong>{0}</strong> um den Dialog "
"trotzdem zu schließen. Bereits getroffene Entscheidungen werden nicht "
"übernommen. <br>Klicken Sie <strong>{1}</strong> um mit der Bereinigung des "
"Konflikts fortzufahren.</html>"
@@ -6047,11 +6185,11 @@ msgid ""
"24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg 42' 52.13\" N, 21 "
"deg 11' 47.60\" E</li></ul>"
msgstr ""
-"Geben sie die Koordinaten für den neuen Punkt ein.<br>Längen- und "
+"Geben Sie die Koordinaten für den neuen Punkt ein.<br>Längen- und "
"Breitengrad werden durch Leerzeichen, Komma oder Semikolon "
-"getrennt.<br>Koordinaten kann in drei unterschiedlichen Formaten vorliegen: "
-"<ul><li><i>Grad</i><tt>°</tt></li><li><i>Grad</i><tt>°</tt> "
-"<i>Minuten</i><tt>'</tt></li><li><i>Grad</i><tt>°</tt> "
+"getrennt.<br>Koordinaten können in drei unterschiedlichen Formaten "
+"vorliegen: <ul><li><i>Grad</i><tt>°</tt></li><li><i>Grad</i><tt>°</tt"
+"> <i>Minuten</i><tt>'</tt></li><li><i>Grad</i><tt>°</tt> "
"<i>Minuten</i><tt>'</tt> "
"<i>Sekunden</i><tt>"</tt></li></ul>Symbole<tt>°</tt>, "
"<tt>'</tt>, <tt>′</tt>, <tt>"</tt>, <tt>″</tt> sind "
@@ -6156,6 +6294,9 @@ msgstr "Anzeigen/Ausblenden"
msgid "Information about layer"
msgstr "Ebeneninformation"
+msgid "Map paint preferences"
+msgstr "MapPaint-Einstellungen"
+
msgid "Map Paint Styles"
msgstr "MapPaint-Stile"
@@ -6240,14 +6381,46 @@ msgstr "Stil ist gerade aktiv?"
msgid "No"
msgstr "Nein"
-msgid "Relations"
-msgstr "Relationen"
+msgid "Object type:"
+msgstr "Objekttyp:"
-msgid "Open a list of all relations."
-msgstr "Eine Liste aller Relationen öffnen."
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "gemischt"
-msgid "Relation list filter"
-msgstr "Relationslistenfilter"
+msgid "Choose the OSM object type"
+msgstr "OSM Objekttypen auswählen"
+
+msgid "Object ID:"
+msgstr "Objekt ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "ID des herunterzuladenden Objekts eingeben"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Objekt IDs können durch ein Komma oder Leerzeichen getrennt werden.<br/> "
+"Beispiele: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Im gemischten "
+"Modus geben Sie Objekte wie folgt an: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"Ungültige ID-Liste angegeben\n"
+"Es kann nicht fortgefahren werden."
+
+msgid "Relations"
+msgstr "Relationen"
+
+msgid "Open a list of all relations."
+msgstr "Eine Liste aller Relationen öffnen."
+
+msgid "Relation list filter"
+msgstr "Relationslistenfilter"
msgid "Create a new relation"
msgstr "Eine neue Relation erstellen"
@@ -6261,9 +6434,6 @@ msgstr "Relationen: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relationen: {0}"
-msgid "Selection"
-msgstr "Auswahl"
-
msgid "Open a selection list window."
msgstr "Ein Fenster mit der aktuellen Auswahl öffnen."
@@ -6288,18 +6458,6 @@ msgstr "Jetzt nicht auswählbar"
msgid "Selection: {0}"
msgstr "Auswahl: {0}"
-msgid "Side buttons"
-msgstr "Seitenschaltflächen"
-
-msgid "Always shown"
-msgstr "Immer angezeigt"
-
-msgid "Dynamic"
-msgstr "Dynamisch"
-
-msgid "Always hidden"
-msgstr "Immer versteckt"
-
msgid "Toggle dynamic buttons"
msgstr "Dynamische Schaltflächen umschalten"
@@ -6312,12 +6470,24 @@ msgstr "Ansicht separat darstellen"
msgid ""
"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-"Die Ansicht schließen. Neuöffnen mit den Schaltflächen in der linken "
+"Diese Ansicht schließen. Neu öffnen mit den Knöpfen in der linken "
"Werkzeugleiste."
msgid "Click to minimize/maximize the panel content"
msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht"
+msgid "Side buttons"
+msgstr "Seitenschaltflächen"
+
+msgid "Always shown"
+msgstr "Immer angezeigt"
+
+msgid "Dynamic"
+msgstr "Dynamisch"
+
+msgid "Always hidden"
+msgstr "Immer versteckt"
+
msgid "Authors"
msgstr "Autoren"
@@ -6337,11 +6507,10 @@ msgstr "Wählen Sie Objekte, die von diesem Nutzer übermittelt wurden"
msgid "Launches a browser with information about the user"
msgstr "Informationsseite über den Nutzer im Browser öffnen"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Warnung: es werden nur Informationsseiten für die ersten {0} der {1} "
-"ausgewählten Nutzer im Browser geöffnet"
+"Die Informationsseiten werden nur für die ersten {0} der {1} ausgewählten "
+"Nutzer im Browser geöffnet"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6368,9 +6537,6 @@ msgstr "Fenster mit dem Ergebnis der Prüfung öffnen."
msgid "Validation results"
msgstr "Prüfergebnisse"
-msgid "Zoom to problem"
-msgstr "Zoom auf Problem"
-
msgid "Fix"
msgstr "Reparieren"
@@ -6521,9 +6687,6 @@ msgstr "Inhalt aktualisieren"
msgid "Update the changeset content from the OSM server"
msgstr "Den Inhalt des Änderungssatzes vom OSM-Server aktualisieren"
-msgid "Show history"
-msgstr "Versionsprotokoll anzeigen"
-
msgid "Download and show the history of the selected objects"
msgstr "Herunterladen und Anzeigen der Chronik des ausgewählten Objekts"
@@ -6825,10 +6988,10 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
-"<html>Bitte wählen Sie eine der folgenden <strong>standard Abfragen</strong> "
+"<html>Bitte wählen Sie eine der folgenden <strong>Standardabfragen</strong> "
"aus. Wählen Sie <strong>Nur eigene Änderungssätze herunterladen</strong>, "
-"falls Sie nur Änderungssätze wollen welche von Ihnen erstellt "
-"wurden.<br>Beachten Sie, dass JOSM höchstens 100 Änderungssätze "
+"falls Sie nur Änderungssätze herunterladen möchten, welche von Ihnen "
+"erstellt wurden.<br>Beachten Sie, dass JOSM höchstens 100 Änderungssätze "
"herunterladen wird.</html>"
msgid "<html>Download the latest changesets</html>"
@@ -6856,11 +7019,11 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Änderungsätze in die aktuelle Ansicht herunterladen</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Warnung: Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende "
-"Standard-Abfrage."
+"Ungeeigneter Wert ''{1}'' für die Einstellung ''{0}''. Verwende Standard-"
+"Abfrage."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6931,35 +7094,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Dieser URL ist keine gültige Änderungssatzanfrage."
-msgid "Select objects for which to change properties."
-msgstr "Bitte Objekte zum Ändern der Eigenschaften auswählen."
+msgid "Discardable key: selection Foreground"
+msgstr "Überflüssiger Schlüssel: Auswahl-Vordergrund"
+
+msgid "Discardable key: selection Background"
+msgstr "Überflüssiger Schlüssel: Auswahl-Hintergrund"
-msgid "Properties/Memberships"
-msgstr "Eigenschaften/Mitgliedschaften"
+msgid "Discardable key: foreground"
+msgstr "Überflüssiger Schlüssel: Vordergrund"
-msgid "Properties for selected objects."
-msgstr "Eigenschaften der ausgewählten Objekte."
+msgid "Discardable key: background"
+msgstr "Überflüssiger Schlüssel: Hintergrund"
msgid "<different>"
msgstr "<unterschiedlich>"
+msgid "Select objects for which to change tags."
+msgstr "Bitte Objekte zum Ändern der Merkmale auswählen."
+
+msgid "Tags/Memberships"
+msgstr "Schlagwörter/Mitgliedschaften"
+
+msgid "Tags for selected objects."
+msgstr "Schlagwörter für ausgewählte Objekte."
+
msgid "Member Of"
msgstr "Element von"
msgid "Position"
msgstr "Position"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Schlagwörter: {0} / Mitgliedschaften: {1}"
-msgid "Properties / Memberships"
-msgstr "Eigenschaften / Mitgliedschaften"
+msgid "Tags / Memberships"
+msgstr "Schlagwörter / Mitgliedschaften"
msgid "Delete the selected key in all objects"
msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
-msgid "Delete Properties"
-msgstr "Eigenschaften entfernen"
+msgid "Delete Tags"
+msgstr "Schlagwörter löschen"
msgid "Change relation"
msgstr "Relation ändern"
@@ -6973,14 +7148,14 @@ msgstr "Auswahl wirklich aus Relation {0} entfernen?"
msgid "Add a new key/value pair to all objects"
msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
-msgid "Add Property"
-msgstr "Eigenschaft hinzufügen"
+msgid "Add Tag"
+msgstr "Merkmal hinzufügen"
msgid "Edit the value of the selected key for all objects"
msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
-msgid "Edit Properties"
-msgstr "Eigenschaften ändern"
+msgid "Edit Tags"
+msgstr "Schlagwörter bearbeiten"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Zur OSM-Wiki für Hilfe zu Merkmalen gehen (F1)"
@@ -7064,12 +7239,6 @@ msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
msgid "Use English language for tag by default"
msgstr "Standardmäßig englische Sprache für Merkmal verwenden"
-msgid "Paste tag"
-msgstr "Merkmal einfügen"
-
-msgid "Paste value"
-msgstr "Wert Einfügen"
-
msgid "Add value?"
msgstr "Wert hinzufügen?"
@@ -7100,9 +7269,15 @@ msgstr "Bitte eine ganze Zahl zwischen 0 und {0} eingeben"
msgid "Recently added tags"
msgstr "Zuletzt verwendete Merkmale"
+msgid "Choose recent tag {0}"
+msgstr "Wähle das neueste Tag {0}"
+
msgid "Use this tag again"
msgstr "Merkmal wieder verwenden"
+msgid "Apply recent tag {0}"
+msgstr "Wende das neueste Tag an {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "Die Taste ''{0}'' wird bereits benutzt"
@@ -7143,9 +7318,8 @@ msgstr "Relation gelöscht"
msgid "Downloading relation {0}"
msgstr "Relation {0} wird heruntergeladen"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Warnung: Ignoriere Fehler, da die Aufgabe abgebrochen wurde: Fehler: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Ignoriere Fehler, da die Aufgabe abgebrochen wurde: Fehler: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7208,6 +7382,10 @@ msgstr "Objekt entfernen und Verbindung lösen"
msgid "Ignore them, leave relation as is"
msgstr "Ignorieren und die aktuelle Verbindung belassen"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Tastenkürzel ''{0}'' kann im Relationseditordialog nicht genutzt werden"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7505,6 +7683,29 @@ msgstr ""
"Die Linie ist weder mit dem vorhergehenden, noch mit dem nächsten Element "
"verbunden"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Falsche Anzahl Argumente für Lesezeichen"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Fehler beim Lesen von Lesezeicheneintrag: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Unerwartete Zeile ''{0}'' in der Lesezeichen-Datei ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Unzulässiger Wert ''{0}'' vom Typ double in der Zeile ''{1}'' der "
+"Lesezeichen-Datei ''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Lesezeichen konnten nicht von<br>\"{0}\"<br>gelesen werden. Der Fehler "
+"war: {1}</html>"
+
msgid "Bookmarks"
msgstr "Lesezeichen"
@@ -7574,10 +7775,7 @@ msgid "Value for latitude in range [-90,90] required."
msgstr "Als Breitengrad wird ein Wert im Intervall [-90,90] erwartet."
msgid "Value for longitude in range [-180,180] required."
-msgstr "AlsLängengrad wird ein Wert im Intervall [-180,180] erwartet."
-
-msgid "Paste URL from clipboard"
-msgstr "URL aus der Zwischenablage einfügen"
+msgstr "Als Längengrad wird ein Wert im Intervall [-180,180] erwartet."
msgid "Data Sources and Types:"
msgstr "Datenquellen und -typen:"
@@ -7656,21 +7854,8 @@ msgstr "Verweise herunterladen (Eltern-Relationen)"
msgid "Download object"
msgstr "Objekt herunterladen"
-msgid "Object type:"
-msgstr "Objekttyp:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "gemischt"
-
-msgid "Choose the OSM object type"
-msgstr "OSM Objekttypen auswählen"
-
-msgid "Object ID:"
-msgstr "Objekt ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "ID des herunterzuladenden Objekts eingeben"
+msgid "Start downloading"
+msgstr "Herunterladen beginnen"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7684,28 +7869,9 @@ msgstr ""
"Wählen Sie aus, ob die Mitglieder einer Relation ebenfalls heruntergeladen "
"werden sollen"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Objekt IDs können durch ein Komma oder Leerzeichen getrennt werden.<br/> "
-"Beispiele: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Im gemischten "
-"Modus geben Sie Objekte wie folgt an: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Verweise herunterladen (Eltern-Relationen und Linien)"
-msgid "Start downloading"
-msgstr "Herunterladen beginnen"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Ungültige ID-Liste angegeben\n"
-"Objekt kann nicht heruntergeladen werden."
-
msgid "Class Type"
msgstr "Klassentyp"
@@ -7769,7 +7935,7 @@ msgstr ""
"fehlt</p><p class=\"warning-body\">Inhalt der Hilfe für das Hilfethema "
"<strong>{0}</strong> ist noch nicht verfügbar. Es fehlt sowohl in Ihrer "
"Landessprache ({1}) als auch in Englisch.<br><br>Bitte helfen Sie mit beim "
-"Verbessern des JOSM Hilfesystems und ergänzen Sie fehlende Informationen. "
+"Verbessern des JOSM Hilfesystems und ergänzen Sie fehlende Informationen. "
"Sie können sowohl das <a href=\"{2}\">Hilfethema in Ihrer "
"Landessprache({1})</a> als auch das a href=\"{3}\">Hilfethema in "
"Englisch</a> bearbeiten.</p></html>"
@@ -7789,7 +7955,7 @@ msgid ""
"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
"network problem, please check<br>your internet connection</html>"
msgstr ""
-"<html>Die Hilfe-Seite unter der URL {0} konnte nicht geöffnet "
+"<html>Die Hilfe-Seite unter der URL {0} konnte nicht geöffnet "
"werden.<br>Vermutlich ist Ihre Internet-Verbindung unterbrochen.</html>"
msgid "Failed to open URL"
@@ -7820,8 +7986,8 @@ msgstr "Zur nächsten Seite gehen"
msgid "Go to the JOSM help home page"
msgstr "Gehe zur Start-Seite für die JOSM-Hilfe"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Warnung: Falsche Position im HTML-Dokument. Der Fehler war: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Falsche Position im HTML-Dokument. Der Fehler war: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Die Hilfe-Seite konnte nicht geöffnet werden. Die Ziel-URL ist leer."
@@ -7930,6 +8096,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Änderungssatzkommentar"
+
msgid "Changeset info"
msgstr "Informationen zum Änderungssatz"
@@ -8042,10 +8211,9 @@ msgstr ""
msgid "Object still in use"
msgstr "Objekt wird noch benutzt"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Warnung: die Fehlermeldung ''{0}'' stimmt nicht mit einem erwarteten Muster "
-"überein"
+"Die Fehlermeldung ''{0}'' stimmt nicht mit einem erwarteten Muster überein"
msgid "Upload"
msgstr "Hochladen"
@@ -8068,6 +8236,12 @@ msgstr "Ein kurzer Kommentar über die hochzuladenden Änderungen:"
msgid "Enter an upload comment"
msgstr "Kommentar zum Hochladen eingeben"
+msgid "Specify the data source for the changes:"
+msgstr "Die Datenquelle für die Änderungen:"
+
+msgid "Enter a source"
+msgstr "Quelle eingeben"
+
msgid "Changeset id:"
msgstr "Änderungssatz-Nummer:"
@@ -8140,11 +8314,10 @@ msgid "Closing changeset {0}"
msgstr "Änderungssatz {0} schließen"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Warnung: Der Autorisierungsdialog wird wegen einer Java-"
-"Sicherheitseinschränkung möglicherweise nicht als oberstes Fenster gezeigt."
+"Der Autorisierungsdialog wird wegen einer Java-Sicherheitseinschränkung "
+"möglicherweise nicht als oberstes Fenster gezeigt."
msgid "Enter credentials for OSM API"
msgstr "Geben Sie Ihre Anmeldeinformationen für die OSM-API ein"
@@ -8227,11 +8400,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Entpacke {0} in {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Warnung: Datei ''{0}'' konnte nicht heruntergeladen werden. Ihr Link zum "
-"Herunterladen ''{1}'' ist keine gültige URL. Herunterladen wird übersprungen."
+"Datei ''{0}'' konnte nicht heruntergeladen werden, da der Link ''{1}'' keine "
+"gültige URL ist. Herunterladen wird übersprungen."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8240,18 +8413,17 @@ msgid ""
"working."
msgstr ""
"Kann die Liste der offenen Änderungssätze nicht abrufen,<br>weil JOSM Ihre "
-"Identität nicht kennt.<br>Entweder arbeiten Sie anonym, oder sie haben kein "
+"Identität nicht kennt.<br>Entweder arbeiten Sie anonym, oder Sie haben kein "
"Recht<br>die Identität des Benutzers zu kennen, in dessen Name Sie arbeiten."
msgid "Missing user identity"
msgstr "Fehlende Nutzeridentität"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Warnung: Informationen zum aktuellen JOSM-Nutzer konnten nicht abgerufen "
-"werden. Fehler: {0}"
+"Informationen zum aktuellen JOSM-Nutzer konnten nicht abgerufen werden. "
+"Fehler: {0}"
msgid "Download objects"
msgstr "Objekte herunterladen"
@@ -8287,7 +8459,7 @@ msgstr ""
"Dateinamen."
msgid "Click cell to change the file path."
-msgstr "Klicke auf die Zelle um den Dateipfad zu wählen"
+msgstr "Klicken Sie auf die Zelle, um den Dateipfad zu wählen."
msgid "Open Recent"
msgstr "Zuletzt geöffnet"
@@ -8504,12 +8676,6 @@ msgstr "Geänderte Objekte hochladen"
msgid "Please revise upload comment"
msgstr "Bitte den Kommentar überdenken"
-msgid "Revise"
-msgstr "Überarbeiten"
-
-msgid "Continue as is"
-msgstr "Trotzdem fortsetzen"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8524,6 +8690,28 @@ msgstr ""
"/><br />Wenn Sie kurz erklären was geändert wurde, erleichtert dies die "
"Arbeit vieler anderer Nutzer."
+msgid "Please specify a changeset source"
+msgstr "Bitte Quelle für Änderungssatz angeben"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"Sie haben keine Quelle für die Änderungen angegeben.<br />\r\n"
+"Dies ist technisch erlaubt, aber eine Quellenangabe erleichtert anderen "
+"Nutzern<br />\r\n"
+"die Daten später einzuschätzen.\r\n"
+"<br /><br />Wenn Sie kurz erklären worauf die Änderungen basieren, <br />\r\n"
+"erleichtert dies die Arbeit vieler anderer Nutzer."
+
+msgid "Revise"
+msgstr "Überarbeiten"
+
+msgid "Continue as is"
+msgstr "Trotzdem fortsetzen"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Zum vorherigen Dialog zurückkehren um eine bessere Beschreibung einzugeben"
@@ -8540,6 +8728,25 @@ msgstr "Bitte geben Sie zuerst eine zulässige Blockgröße an."
msgid "Illegal chunk size"
msgstr "Ungültge Blockgröße"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>Das folgende Merkmal im Änderungssatz enthält einen leeren "
+"Schlüssel/Wert:<br>{0}<br>Fortfahren?</html>"
+msgstr[1] ""
+"<html>Die folgenden Merkmale im Änderungssatz enthalten leeren "
+"Schlüssel/Werte:<br>{0}<br>Fortfahren?</html>"
+
+msgid "Empty metadata"
+msgstr "Leere Metadaten"
+
msgid "Cancel the upload and resume editing"
msgstr "Hochladen abbrechen und Bearbeitung fortsetzen"
@@ -8547,11 +8754,11 @@ msgid "Tags of changeset {0}"
msgstr "Merkmale für Änderungssatz {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe "
-"dieses Objekt und fahre mit dem Hochladen fort."
+"Das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe dieses "
+"Objekt und fahre mit dem Hochladen fort."
msgid "Preparing objects to upload ..."
msgstr "Objekte zum Hochladen werden vorbereitet ..."
@@ -8606,7 +8813,7 @@ msgid ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>{1} requests</strong>"
msgstr ""
-"<strong>{0} Objekte</strong> werden mit <strong>{1} Vorgängen</strong> zu "
+"<strong>{0} Objekte</strong> werden mit <strong>{1} Vorgängen</strong> zu "
"<strong>einem Änderungssatz</strong> hinzugefügt."
msgid "advanced configuration"
@@ -8626,7 +8833,7 @@ msgid ""
"Uploading <strong>{0} objects</strong> to <strong>multiple "
"changesets</strong> using <strong>{1} requests</strong>"
msgstr ""
-"<strong>{0} Objekte</strong> werden in <strong>{1} Anfragen</strong> in "
+"<strong>{0} Objekte</strong> werden in <strong>{1} Anfragen</strong> in "
"<strong>mehreren Änderungssätzen</strong> hinzugefügt."
msgid "Uploading data for layer ''{0}''"
@@ -8695,9 +8902,6 @@ msgstr ""
"Das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe dieses "
"Objekt beim Hochladen."
-msgid "Warning: {0}"
-msgstr "Warnung: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "{0} Objekt hochladen..."
@@ -8709,6 +8913,9 @@ msgstr ""
"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die "
"Fehlermeldung war: {0}"
+msgid "Upload successful!"
+msgstr "Hochladen war erfolgreich!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8729,10 +8936,9 @@ msgstr "Objekte zum Hochladen auswählen"
msgid "Cancel uploading"
msgstr "Hochladen abbrechen"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Warnung: unerwarteter Wert für Schlüssel ''{0}'' in den Einstellungen, "
-"erhielt ''{1}''"
+"Unerwarteter Wert für Schlüssel ''{0}'' in den Einstellungen: ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Bitte die Vorgehensweise wählen:"
@@ -8751,7 +8957,7 @@ msgid ""
"upload {0} objects. Which strategy do you want to use?</html>"
msgstr ""
"<html>Es sind <strong>mehrere Änderungssätze</strong> notwendig, um {0} "
-"Objekte hochzuladen. Welche Vorgehensweise wollen sie nutzen?</html>"
+"Objekte hochzuladen. Welche Vorgehensweise wollen Sie nutzen?</html>"
msgid "Fill up one changeset and return to the Upload Dialog"
msgstr "Einen Änderungssatz füllen und zurück zum Hochlade-Dialog"
@@ -8781,14 +8987,15 @@ msgstr[0] "({0} Anfrage)"
msgstr[1] "({0} Anfragen)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr "Ungültge Blockgröße <= 0. Bitter gib eine Ganzahl > 1 ein."
+msgstr ""
+"Ungültige Blockgröße <= 0. Bitte geben Sie eine Ganzzahl größer 1 ein."
msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
msgstr ""
"Blockgröße {0} überschreitet max. Änderungssatzgröße {1} für Server ''{2}''"
msgid "Please enter an integer > 1"
-msgstr "Bitter gib eine Ganzahl > 1 ein."
+msgstr "Bitte geben Sie eine Ganzzahl größer 1 ein."
msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
msgstr ""
@@ -8883,8 +9090,8 @@ msgstr "Nächste Markierung"
msgid "Jump to next marker"
msgstr "Auf nächste Markierung springen"
-msgid "Previos marker"
-msgstr "Vorherige Markierung"
+msgid "Previous marker"
+msgstr "Vorherige Marke"
msgid "Jump to previous marker"
msgstr "Auf vorherige Markierung springen"
@@ -8916,9 +9123,8 @@ msgstr "Version {0}"
msgid "Merging layers"
msgstr "Ebenen vereinen"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -9038,6 +9244,9 @@ msgstr "Zoomstufe erhöhen, um mehr Details zu sehen"
msgid "No tiles at this zoom level"
msgstr "Keine Kacheln auf dieser Zoomstufe"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "TMS-Ebene ({0}), herunterladend in Zoomstufe {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326 und Mercator-Projektion werden unterstützt"
@@ -9077,6 +9286,9 @@ msgstr "Fehlerhafte Kacheln neu laden"
msgid "Alpha channel"
msgstr "Alphakanal"
+msgid "Automatically change resolution"
+msgstr "Auflösung automatisch ändern"
+
msgid "Set WMS Bookmark"
msgstr "WMS-Lesezeichen erstellen"
@@ -9084,7 +9296,7 @@ msgid "Automatic downloading"
msgstr "Automatisches Laden"
msgid "Zoom to native resolution"
-msgstr "Auf Vorgabeauflösung zoomen"
+msgstr "Auf Vorgabeauflösung zoomen"
msgid "Supported projections are: {0}"
msgstr "Unterstützte Projektionen sind: {0}"
@@ -9290,9 +9502,6 @@ msgstr "GPS-Positionen aus EXIF-Daten extrahieren"
msgid "Starting directory scan"
msgstr "Verzeichnisuntersuchen starten"
-msgid "One of the selected files was null"
-msgstr "Eine der ausgewählten Dateien war nicht vorhanden."
-
msgid "Read photos..."
msgstr "Photos lesen..."
@@ -9311,6 +9520,9 @@ msgstr "Leere Datei im Verzeichnis {0} gefunden\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
+msgid "One of the selected files was null"
+msgstr "Eine der ausgewählten Dateien war nicht vorhanden."
+
msgid "Geotagged Images"
msgstr "Georeferenzierte Bilder"
@@ -9370,6 +9582,12 @@ msgstr "Nächstes"
msgid "Show next Image"
msgstr "Nächstes Bild zeigen"
+msgid "Show first Image"
+msgstr "Erstes Bild zeigen"
+
+msgid "Show last Image"
+msgstr "Letztes Bild zeigen"
+
msgid "Center view"
msgstr "Anzeige zentrieren"
@@ -9453,9 +9671,6 @@ msgstr ""
"<html>Das Hochladen unbearbeiteter GPS-Daten wird als schädlich "
"angesehen.<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Spur-Anzeige anpassen"
@@ -9468,8 +9683,11 @@ msgstr "Bis"
msgid "No timestamp"
msgstr "Kein Zeitstempel"
-msgid "Download from OSM along this track"
-msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
+msgid "Select to download OSM data."
+msgstr "Auswählen zum Herunterladen von OSM-Daten"
+
+msgid "Select to download GPS traces."
+msgstr "Auswählen zum Herunterladen von GPS-Spuren"
msgid "Download everything within:"
msgstr "Alles im Bereich herunterladen:"
@@ -9495,16 +9713,18 @@ msgstr "Nur Wegpunkte"
msgid "track and waypoints"
msgstr "GPS-Spur und Wegpunkte"
+msgid "Click to download"
+msgstr "Zum herunterladen klicken"
+
+msgid "Click to cancel"
+msgstr "Zum Abbrechen klicken"
+
+msgid "Download from OSM along this track"
+msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
+
msgid "Calculating Download Area"
msgstr "Gebiet zum Herunterladen berechnen"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Diese Aktion benötigt {0} individuelle Serveranfragen.<br>Wollen Sie "
-"fortfahren?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Bildkacheln entlang der Spur zwischenspeichern"
@@ -9653,17 +9873,12 @@ msgstr "Fehler beim Anzeigen der URL für diesen Wegpunkt"
msgid "(URL was: "
msgstr "(Die URL lautet: "
-msgid "Error displaying URL"
-msgstr "Fehler beim Anzeigen der URL"
-
msgid "Select the map painting styles"
msgstr "Wählen Sie den Kartenzeichnungsstil"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Warnung: Mappaint-Stile konnten nicht von ''{0}'' geladen werden. "
-"Fehlermeldung war: {1}"
+"Mappaint-Stile konnten nicht von ''{0}'' geladen werden. Fehler war: {1}"
msgid "loading style ''{0}''..."
msgstr "Lade Stil ''{0}''..."
@@ -9681,8 +9896,8 @@ msgstr[1] ""
"Beim Laden dieses Stils traten {0} Fehler auf. Wählen Sie ''Info'' aus dem "
"Rechtsklick-Menü, um weitere Einzelheiten zu erfahren."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr "Warnung: Mappaint-Stile in ''{0}'' enthalten Fehler: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr "Mappaint-Stile in ''{0}'' enthalten Fehler: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Ungültiges Strichelungsmuster - Werte müssen positiv sein"
@@ -9692,9 +9907,8 @@ msgstr ""
"Ungültiges Strichelungsmuster - mindestens ein Wert muss positiv sein"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
-msgstr "Warnung: Mappaint-Stile in ''{0}'' enthalten Fehler: [{1}:{2}] {3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
+msgstr "Mappaint-Stile in ''{0}'' enthalten Fehler: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Schlüssel der Zugriffskennung:"
@@ -9709,7 +9923,7 @@ msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
-"<html>Auswählen, um die Zugriffskennung in den JOSM-Einstellungen zu "
+"<html>Auswählen, um die Zugriffskennung in den JOSM-Einstellungen zu "
"speichern.<br>Ansonsten wird die Zugriffskennung nur in der aktuellen JOSM-"
"Sitzung genutzt.</html>"
@@ -9965,8 +10179,8 @@ msgstr "Dialog schließen und Autorisierung abbrechen"
msgid "Close the dialog and accept the Access Token"
msgstr "Dialog schließen und Zugriffskennung annehmen"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Warnung: Abbruch der laufenden OAuth-Anfrage fehlgeschlagen"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Abbruch der laufenden OAuth-Anfrage fehlgeschlagen"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "OAuth-Anfragekennung von ''{0}'' abrufen"
@@ -10042,6 +10256,13 @@ msgstr ""
"Auswählen, um JOSM das Schreiben Ihrer server-gespeicherten Einstellungen zu "
"erlauben"
+msgid "Allow modifications of notes"
+msgstr "Ändern von Fehlermeldungen (Notes) erlauben"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+"Auswählen, um JOSM das Ändern von Fehlermeldungen (Notes) zu erlauben"
+
msgid "Retrieving OAuth Access Token..."
msgstr "OAuth-Zugriffskennung abrufen..."
@@ -10115,9 +10336,6 @@ msgstr ""
"diese Kennung nun akzeptieren. JOSM wird sie in Zukunft zur Autorisierung "
"beim OSM-Server verwenden.<br><br>Die Zugriffskennung ist: </html>"
-msgid "Restart"
-msgstr "Neu starten"
-
msgid "Click to retrieve a Request Token"
msgstr "Klicken, um eine Anfragekennung abzurufen"
@@ -10416,6 +10634,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam."
+msgid "Would you like to restart now?"
+msgstr "Möchten Sie jetzt neu starten?"
+
msgid "Remote Control"
msgstr "Fernsteuerung"
@@ -10519,7 +10740,7 @@ msgid "Ignore warning and install style anyway"
msgstr "Warnung ignorieren und Stil trotzdem installieren"
msgid "Some entries have unmet dependencies:"
-msgstr "Einige Einträge haben unerfüllte Abhängigkeiten:"
+msgstr "Einige Einträge haben unerfüllte Abhängigkeiten:"
msgid "Reset"
msgstr "Zurücksetzen"
@@ -10548,6 +10769,12 @@ msgstr "Aus Werkzeugleiste entfernen"
msgid "Configure toolbar"
msgstr "Werkzeugleiste konfigurieren"
+msgid "Edit shortcut"
+msgstr "Tastenkürzel bearbeiten"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Menü und Werkzeugleiste nicht verstecken"
+
msgid "Actions"
msgstr "Aktionen"
@@ -10590,6 +10817,9 @@ msgstr "Registrierte Werkzeugleistenaktion ohne Namen: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "Registrierte Werkzeugleistenaktion {0} überschrieben: {1} wird {2}"
+msgid "Toolbar: {0}"
+msgstr "Werkzeugleiste: {0}"
+
msgid "Data validator"
msgstr "Datenprüfungs-Plugin"
@@ -10642,25 +10872,12 @@ msgstr "Suche: "
msgid "Read from file"
msgstr "Lesen aus Datei"
-msgid "Open JOSM customization file"
-msgstr "JOSM-Anpassungsdatei öffnen"
-
-msgid "Import log"
-msgstr "Importprotokoll"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Im Folgenden wird die Import-Zusammenfassung ausgegeben. <br/>Sie "
-"können die Änderungen verwerfen, indem Sie auf \"Abbrechen\" im "
-"Einstellungsdialog klicken.<br/>Um manche Änderungen anzuwenden, kann ein "
-"Neustart von JOSM notwendig sein.</html>"
-
msgid "Export selected items"
msgstr "Ausgewählte Elemente exportieren"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Benutzerdefinierte Einstellungsdateien für JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Bitte wählen Sie einige, nicht als Standardeinstellung markierte, "
@@ -10680,43 +10897,60 @@ msgstr "Einstellungen aus Datei an vorhandene Werte anhängen"
msgid "Replace existing values"
msgstr "Vorhandene Werte ersetzen"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Benutzerdefinierte Einstellungsdateien für JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "JOSM-Anpassungsdatei öffnen"
-msgid "Advanced Background: Changed"
-msgstr "Erweiterter Hintergrund: Geändert"
+msgid "Import log"
+msgstr "Importprotokoll"
-msgid "Advanced Background: NonDefalut"
-msgstr "Erweiterter Hintergrund: keine Standardeinstellung"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Im Folgenden wird die Import-Zusammenfassung ausgegeben. <br/>Sie "
+"können die Änderungen verwerfen, indem Sie auf \"Abbrechen\" im "
+"Einstellungsdialog klicken.<br/>Um manche Änderungen anzuwenden, kann ein "
+"Neustart von JOSM notwendig sein.</html>"
-msgid "Current value is default."
-msgstr "Aktueller Wert ist Voreinstellung."
+msgid "shortcut"
+msgstr "Tastenkürzel"
-msgid "Default value is ''{0}''."
-msgstr "Voreinstellung ist ''{0}''."
+msgid "color"
+msgstr "Farbe"
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
+msgstr "Werkzeugleiste"
+
+msgid "imagery"
+msgstr "Hintergrundbilder"
+
+msgid "Reset preferences"
+msgstr "Einstellungen zurücksetzen"
+
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-"Voreinstellung momentan unbekannt (Parameter wurde bisher noch nicht "
-"benutzt)."
+"Es sollen alle Einstellungen auf die Standardwerte zurückgesetzt "
+"werden.<br/>Alle Ihre Einstellungen werden gelöscht: Plugins, "
+"Hintergrundbilder, Filter, Werkzeugleisteneinträge, Tastaturkürzel, "
+"...<br/>Wollen Sie wirklich fortfahren?"
-msgid "Select Setting Type:"
-msgstr "Einstellungstyp wählen"
+msgid "Load profile"
+msgstr "Profil laden"
-msgid "Simple"
-msgstr "Einfach"
+msgid "Save {0} profile"
+msgstr "{0} Profil speichern"
-msgid "List"
-msgstr "Liste"
-
-msgid "List of lists"
-msgstr "Feld"
-
-msgid "List of maps"
-msgstr "Hashliste"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Alle Einstellungen dieser Gruppe entsprechen den Vorgaben, nichts zu "
+"speichern"
-msgid "Add setting"
-msgstr "Einstellung hinzufügen"
+msgid "Choose profile file"
+msgstr "Profildatei auswählen"
msgid "Change list setting"
msgstr "Listeneinstellung ändern"
@@ -10739,6 +10973,41 @@ msgstr "Hashlisteneinstellung andern"
msgid "Entry {0}"
msgstr "Eintrag {0}"
+msgid "Select Setting Type:"
+msgstr "Einstellungstyp wählen"
+
+msgid "Simple"
+msgstr "Einfach"
+
+msgid "List"
+msgstr "Liste"
+
+msgid "List of lists"
+msgstr "Feld"
+
+msgid "List of maps"
+msgstr "Hashliste"
+
+msgid "Add setting"
+msgstr "Einstellung hinzufügen"
+
+msgid "Advanced Background: Changed"
+msgstr "Erweiterter Hintergrund: Geändert"
+
+msgid "Advanced Background: NonDefault"
+msgstr "Erweiterter Hintergrund: keine Standardeinstellung"
+
+msgid "Current value is default."
+msgstr "Aktueller Wert ist Voreinstellung."
+
+msgid "Default value is ''{0}''."
+msgstr "Voreinstellung ist ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Voreinstellung momentan unbekannt (Parameter wurde bisher noch nicht "
+"benutzt)."
+
msgid "Change string setting"
msgstr "Zeichenketteneinstellung ändern"
@@ -10795,6 +11064,9 @@ msgstr "Virtuelle Punkte im Auswahlmodus zeichnen"
msgid "Draw inactive layers in other color"
msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
+msgid "Display discardable keys"
+msgstr "Überflüssige Schlüssel anzeigen"
+
msgid "Highlight target ways and nodes"
msgstr "Ziel-Linien und -punkte hervorheben"
@@ -10859,6 +11131,13 @@ msgstr ""
"Diese Option unterdrückt die Füllung von Bereichen, vorrangig vor allem "
"anderen im ausgewählten Stil."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Schlüssel anzeigen, welche als so unwichtig angesehen werden, sodass sie "
+"ohne Rückfrage verworfen werden."
+
msgid "Options that affect drawing performance"
msgstr "Optionen, welche die Zeichenleistung betreffen"
@@ -11080,7 +11359,7 @@ msgid "Show object ID in selection lists"
msgstr "Objektnummer in Auswahllisten anzeigen"
msgid "Show localized name in selection lists"
-msgstr "Übersetzten Namen in Auswahllisten anzeigen"
+msgstr "Übersetzte Namen in Auswahllisten anzeigen"
msgid "Modeless working (Potlatch style)"
msgstr "Modusloses Zeichnen (potlatchartig)"
@@ -11170,11 +11449,17 @@ msgstr "Ebenen abrufen"
msgid "2. Select layers"
msgstr "2. Ebenen auswählen"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Generierte WMS-URL überprüfen"
+msgid "3. Select image format"
+msgstr "3. Bildformat auswählen"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Generierte MWS-URL überprüfen"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Diese Ebene benennen"
msgid "Show Bounds"
-msgstr "Zeige Bereichsgrenzen"
+msgstr "Bereichsgrenzen anzeigen"
msgid "No bounding box was found for this layer."
msgstr "Für diese Ebene wurden keine Bereichsgrenzen gefunden."
@@ -11351,6 +11636,12 @@ msgstr ""
"Es wird ''~'' an den Dateinamen angefügt und im gleichen Verzeichnis "
"gespeichert.)</i>"
+msgid "Notification at each save"
+msgstr "Hinweis bei jedem Speichern"
+
+msgid "When saving, display a small notification"
+msgstr "Beim Speichern einen kleinen Hinweis anzeigen"
+
msgid "File backup"
msgstr "Sicherungsdatei"
@@ -11421,8 +11712,8 @@ msgstr "Karten-Einstellungen"
msgid "Settings for the map projection and data interpretation."
msgstr "Einstellungen der Karten-Projektion und Daten-Interpretation."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Warnung: Konnte Objektvorlage nicht laden: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11707,21 +11998,6 @@ msgstr "Swissgrid (Schweiz)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (ohne lokale Korrekturen)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zone"
-
-msgid "North"
-msgstr "Nord"
-
-msgid "South"
-msgstr "Süd"
-
-msgid "Hemisphere"
-msgstr "Hemisphäre"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11743,6 +12019,21 @@ msgstr "UTM-Frankreich (DOM)"
msgid "UTM Geodesic system"
msgstr "Geodätisches System UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zone"
+
+msgid "North"
+msgstr "Nord"
+
+msgid "South"
+msgstr "Süd"
+
+msgid "Hemisphere"
+msgstr "Hemisphäre"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Teste OSM API URL ''{0}''"
@@ -11809,10 +12100,10 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Auswählen für OAuth-Authentifizierungsmethode"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Warnung: Nicht unterstützter Wert ''{1}'' in Einstellung ''{0}''. "
+"Nicht unterstützter Wert ''{1}'' in Einstellung ''{0}''. "
"Authentifizierungsmethode ''Basisauthentifizierung'' wird verwendet."
msgid "OSM username:"
@@ -11821,29 +12112,30 @@ msgstr "OSM-Benutzername:"
msgid "OSM password:"
msgstr "OSM-Passwort:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Warnung: Empfang der OSM-Berechtigungen vom Berechtigungsverwalter "
-"fehlgeschlagen."
+"Empfang der OSM-Berechtigungen vom Berechtigungsverwalter fehlgeschlagen."
msgid "Current credential manager is of type ''{0}''"
msgstr "Aktueller Berechtigungsverwalter ist vom Typ ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Warnung: Speichern der OSM-Berechtigungen beim Berechtigungsverwalter "
-"fehlgeschlagen."
+"Speichern der OSM-Berechtigungen beim Berechtigungsverwalter fehlgeschlagen."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Regelmäßig auf neue Nachrichten prüfen"
+
+msgid "Check interval (minutes):"
+msgstr "Überprüfungsintervall (Minuten):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Warnung: Empfang der OAuth-Zugangsmarke vom Berechtigungsverwalter "
-"fehlgeschlagen."
+"Empfang der OAuth-Zugangsmarke vom Berechtigungsverwalter fehlgeschlagen."
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Warnung: Speichern der OAuth-Zugangsmarke beim Berechtigungsverwalter "
-"fehlgeschlagen."
+"Speichern der OAuth-Zugangsmarke beim Berechtigungsverwalter fehlgeschlagen."
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11936,18 +12228,12 @@ msgid "Use a SOCKS proxy"
msgstr "SOCKS-Proxy nutzen"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Warnung: JOSM ist konfiguriert, die Proxies aus den Systemeinstellungen zu "
-"verwenden. Jedoch ist die JVM nicht eingerichtet, diese zu laden. Die "
-"Konfiguration wird auf ''Kein Proxy'' zurückgesetzt."
-
-msgid "disabled"
-msgstr "ausgeschaltet"
-
-msgid "no modifier"
-msgstr "Keine Steuertaste"
+"JOSM ist konfiguriert, die Proxies aus den Systemeinstellungen zu verwenden. "
+"Jedoch ist die JVM nicht eingerichtet, diese zu laden. Die Konfiguration "
+"wird auf ''Kein Proxy'' zurückgesetzt."
msgid "Shortcut Background: User"
msgstr "Tastenkürzelhintergrund: Nutzer"
@@ -11965,16 +12251,16 @@ msgid "Attention: Use real keyboard keys only!"
msgstr "Achtung: Nur echte Tasten verwenden!"
msgid "Keyboard Shortcuts"
-msgstr "Tastaturkürzel"
+msgstr "Tastenkürzel"
msgid "Changing keyboard shortcuts manually."
-msgstr "Tastaturkürzel manuell anpassen."
+msgstr "Tastenkürzel manuell anpassen."
msgid "Action"
msgstr "Aktion"
msgid "Shortcut"
-msgstr "Tastaturkürzel"
+msgstr "Tastenkürzel"
msgid "multiple"
msgstr "mehrere"
@@ -11990,38 +12276,37 @@ msgstr "Auswahl in der Merkmalstabelle löschen"
msgid "Add a new tag"
msgstr "Neues Merkmal hinzufügen"
-msgid "Select auto-increment of {0} for this field"
-msgstr "Auto-Inkrement von {0} für dieses Feld auswählen"
+msgid "Paste tags from buffer"
+msgstr "Tags aus dem Speicher einfügen"
-msgid "Cancel auto-increment for this field"
-msgstr "Auto-Inkrement für dieses Feld aufheben"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\""
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Verwende Vorlage \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Warnung in Objektvorlage \"{0}-{1}\": Ignoriere das Attribut ''{2}'', da "
-"''{3}'' Elemente vorhanden sind."
+msgid "Elements of type {0} are supported."
+msgstr "Elemente des Typs {0} werden unterstützt."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Defekte Objektvorlage \"{0}-{1}\" - Anzahl der Datenworte in "
-"''display_values'' und in ''values'' müssen gleich sein"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Ändere {0} Objekt"
+msgstr[1] "Ändere {0} Objekte"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Defekte Objektvorlage \"{0}-{1}\" - Anzahl der Datenworte in "
-"''short_descriptions'' und in ''values'' müssen gleich sein"
+msgid "Nothing selected!"
+msgstr "Nichts ausgewählt!"
-msgid "More information about this feature"
-msgstr "Mehr Informationen zu dieser Vorlage"
+msgid "Selection unsuitable!"
+msgstr "Auswahl unpassend!"
+
+msgid "Apply Preset"
+msgstr "Vorlage anwenden"
+
+msgid "New relation"
+msgstr "Neue Relation"
+
+msgid "Change Tags"
+msgstr "Schlagwörter ändern"
msgid "Unknown requisite: {0}"
msgstr "Unbekannte Vorraussetzung: {0}"
@@ -12029,6 +12314,9 @@ msgstr "Unbekannte Vorraussetzung: {0}"
msgid "Illegal member expression: {0}"
msgstr "Ungültiger Elementausdruck: {0}"
+msgid "More information about this feature"
+msgstr "Mehr Informationen zu dieser Vorlage"
+
msgid "Available roles"
msgstr "Verfügbare Rollen"
@@ -12044,15 +12332,59 @@ msgstr "Elemente"
msgid "Optional Attributes:"
msgstr "Optionale Attribute:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\""
+msgid "Select auto-increment of {0} for this field"
+msgstr "Auto-Inkrement von {0} für dieses Feld auswählen"
-msgid "Use preset ''{0}''"
-msgstr "Verwende Vorlage \"{0}\""
+msgid "Cancel auto-increment for this field"
+msgstr "Auto-Inkrement für dieses Feld aufheben"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Warnung in Objektvorlage \"{0}-{1}\": Ignoriere das Attribut ''{2}'', da "
+"''{3}'' Elemente vorhanden sind."
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Ungültige Objektvorlage \"{0}-{1}\" - Java-Methode in ''values_from'' ist "
+"nicht ''{2}''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Ungültige Objektvorlage \"{0}-{1}\" - Java-Methode in ''values_from'' warf "
+"{2} ({3})"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Defekte Objektvorlage \"{0}-{1}\" - Anzahl der Datenworte in "
+"''display_values'' und in ''values'' müssen gleich sein"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Defekte Objektvorlage \"{0}-{1}\" - Anzahl der Datenworte in "
+"''short_descriptions'' und in ''values'' müssen gleich sein"
msgid "Unknown type: {0}"
msgstr "Unbekannter Typ: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Vorlagengruppe {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "Vorlagengruppe {0}"
+
msgid "Roles cannot appear more than once"
msgstr "Rollen können nicht mehr als einmal vorkommen"
@@ -12062,41 +12394,9 @@ msgstr "Vorlagenelement Rolle ohne Vorgänger"
msgid "Preset sub element without parent"
msgstr "Vorlagenelement ohne Elternelement"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
-
msgid "Error parsing {0}: "
msgstr "Fehler beim Einlesen von {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "Elemente des Typs {0} werden unterstützt."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Ändere {0} Objekt"
-msgstr[1] "Ändere {0} Objekte"
-
-msgid "Nothing selected!"
-msgstr "Nichts ausgewählt!"
-
-msgid "Selection unsuitable!"
-msgstr "Auswahl unpassend!"
-
-msgid "Apply Preset"
-msgstr "Vorlage anwenden"
-
-msgid "New relation"
-msgstr "Neue Relation"
-
-msgid "Change Properties"
-msgstr "Einstellungen ändern"
-
-msgid "Preset group {1} / {0}"
-msgstr "Vorlagengruppe {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "Vorlagengruppe {0}"
-
msgid "Search preset"
msgstr "Vorlage suchen"
@@ -12112,6 +12412,16 @@ msgstr "Nur Einträge passend zur Auswahl zeigen"
msgid "Search in tags"
msgstr "Suche in Merkmalen"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Anpassbare Komponente {0} ist noch nicht registriert. Sie kann nicht am "
+"synchronen Anpassen teilnehmen."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Anpassbare Komponente {0} ist noch nicht registriert."
+
msgid "All files (*.*)"
msgstr "Alle Dateien (*.*)"
@@ -12147,28 +12457,83 @@ msgstr ""
"Der aktuelle Wert ist keine gültige OSM-ID. Bitte einen Ganzzahlwert > 1 "
"eingeben"
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Die Linie mit der externen ID ''{0}'' enthält einen nicht vorhandenen Punkt "
-"mit externer ID ''{1}''."
+msgid "false: the property is explicitly switched off"
+msgstr "falsch: Diese Eigenschaft wurde explizit ausgeschaltet"
-msgid "Deleted node {0} is part of way {1}"
-msgstr "Gelöschter Punkt {0} ist Teil der Linie {1}"
+msgid "true: the property is explicitly switched on"
+msgstr "wahr: diese Eigenschaft wurde explizit angeschaltet"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"partial: different selected objects have different values, do not change"
msgstr ""
-"Die Linie {0} mit {1} Punkten enthält unvollständige Punkte, weil mindestens "
-"ein Punkt nicht in den geladenen Daten enthalten war."
+"teilweise: verschiedene gewählte Objekte haben verschiedene Werte, nicht "
+"ändern"
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
-msgstr ""
-"Die Relation mit externer ID ''{0}'' verweist auf ein fehlendes Objekt mit "
-"externer ID ''{1}''."
+msgid "unset: do not set this property on the selected objects"
+msgstr "ungesetzt: diese Eigenschaft bei den gewählten Objekten nicht setzen"
+
+msgid "Cut"
+msgstr "Ausschneiden"
+
+msgid "Right click = copy to clipboard"
+msgstr "Rechtsklick = in Zwischenablage kopieren"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "notwendiges Attribut \"{0}\" fehlt"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ 64-Bit-"
+"Ganzzahl."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive 64-"
+"Bit-Ganzzahl (>=0)."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Ungültiger Wert ''{1}'' für notwendiges Attribut ''{0}'' vom Typ "
+"Gleitkommazahl."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
+"Wahrheitswert."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
+"OsmPrimitiveType."
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Die Linie mit der externen ID ''{0}'' enthält einen nicht vorhandenen Punkt "
+"mit externer ID ''{1}''."
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Gelöschter Punkt {0} ist Teil der Linie {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"Die Linie {0} mit {1} Punkten enthält unvollständige Punkte, weil mindestens "
+"ein Punkt nicht in den geladenen Daten enthalten war."
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+"Die Relation mit externer ID ''{0}'' verweist auf ein fehlendes Objekt mit "
+"externer ID ''{1}''."
msgid "Deleted member {0} is used by relation {1}"
msgstr "Gelöschtes Element {0} wird in der Relation {1} verwendet"
@@ -12183,10 +12548,10 @@ msgid "Contacting OSM Server..."
msgstr "Verbindung zum OSM-Server..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Warnung: ungültiger Wert des Attributs ''{0}'' von Element ''{1}'' der "
+"Ungültiger Wert des Attributs ''{0}'' von Element ''{1}'' der "
"Servermöglichkeiten. ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
@@ -12236,40 +12601,38 @@ msgstr ""
"Ungültige Portnummer in den Einstellungen ''{0}''. Erhaltener Wert: {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Warnung: unerwarteten Wert ''{1}'' für Einstellung ''{0}'' gefunden. Proxy "
-"wird nicht verwendet."
+"Unerwarteten Wert ''{1}'' für Einstellung ''{0}'' gefunden. Proxy wird nicht "
+"verwendet."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Warnung: Unerwartete Parameter für den HTTP Proxy. Eingabe war Host \"{0}\" "
-"und Port \"{1}\"."
+"Unerwartete Parameter für den HTTP Proxy. Eingabe war Host ''{0}'' und Port "
+"''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Warnung: Unerwartete Parameter für den SOCKS-Proxy. Eingabe war Host \"{0}\" "
-"und Port \"{1}\"."
+"Unerwartete Parameter für den SOCKS-Proxy. Eingabe war Host ''{0}'' und Port "
+"''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Fehler: Verbindung zum Proxy \"{0}\" mit der URL \"{1}\" ist fehlgeschlagen. "
-"Der Fehler war: {2}"
+"Verbindung zum Proxy ''{0}'' mit der URL ''{1}'' ist fehlgeschlagen. Der "
+"Fehler war: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Warnung: Die JVM ist nicht konfiguriert, die Proxies aus den "
-"Systemeinstellungen zu laden. Die Option ''java.net.useSystemProxies'' war "
-"beim Start nicht gesetzt. Es wird kein Proxy verwendet."
+"Die JVM ist nicht konfiguriert, die Proxies aus den Systemeinstellungen zu "
+"laden. Die Option ''java.net.useSystemProxies'' war beim Start nicht "
+"gesetzt. Es wird kein Proxy verwendet."
msgid "Parsing response from server..."
msgstr "Server-Antwort wird verarbeitet..."
@@ -12374,6 +12737,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
+msgid "(at line {0}, column {1})"
+msgstr "(in Zeile {0}, Spalte {1})"
+
msgid "Unknown mode {0}."
msgstr "Unbekannter Modus {0}."
@@ -12389,16 +12755,24 @@ msgstr "Nach Bilddateien suchen..."
msgid "No image files found."
msgstr "Keine Bilddateien gefunden."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Sie haben {0} ungelesene Nachricht."
+msgstr[1] "Sie haben {0} ungelesene Nachrichten."
+
+msgid "Click here to see your inbox."
+msgstr "Hier klicken um den Posteingang zu sehen."
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
"Das Öffnen eines Eingabestroms für die Resource ''{0}'' ist fehlgeschlagen."
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Warnung: Fehler beim Öffnen der Datei mit Endung ''{2}'' and Namensteil "
-"''{3}'' in Zipdatei ''{0}''. Die Fehlermeldung lautet: {1}"
+"Fehler beim Öffnen der Datei mit Endung ''{2}'' und Namensteil ''{3}'' in "
+"Zip-Datei ''{0}''. Die Fehlermeldung lautet: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Datei umbenennen von {0} in {1} fehlgeschlagen."
@@ -12485,8 +12859,8 @@ msgstr "Unbekannte Einträge: {0}"
msgid "Zero coordinates: {0}"
msgstr "Leere Koordinaten: {0}"
-msgid "NMEA import success"
-msgstr "NMEA-Einlesen erfolgreich"
+msgid "NMEA import success:"
+msgstr "NMEA-Einlesen erfolgreich:"
msgid "NMEA import failure!"
msgstr "NMEA-Einlesen fehlgeschlagen!"
@@ -12599,49 +12973,15 @@ msgstr "Keine Daten in Datei {0} gefunden."
msgid "Open OsmChange file"
msgstr "OsmChange-Datei öffnen"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "notwendiges Attribut \"{0}\" fehlt"
-
msgid "Unsupported version: {0}"
msgstr "Nicht unterstützte Version: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ 64-Bit-"
-"Ganzzahl."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive 64-"
-"Bit-Ganzzahl (>=0)."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Ungültiger Wert ''{1}'' für notwendiges Attribut ''{0}'' vom Typ "
-"Gleitkommazahl."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
-"Wahrheitswert."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ "
-"OsmPrimitiveType."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Warnung: nicht unterstütztes Startelement ''{0}'' im Inhalt des "
-"Änderungssatzes an der Position ({1},{2}) wird übersprungen."
+"Nicht unterstütztes Startelement ''{0}'' im Inhalt des Änderungssatzes an "
+"der Position ({1},{2}) wird übersprungen."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12651,11 +12991,11 @@ msgstr ""
"außerhalb von ''create'', ''modify'' oder ''delete'' gefunden."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Warnung: nicht unterstütztes Endelement ''{0}'' im Inhalt des "
-"Änderungssatzes an der Position ({1},{2}) übersprungen."
+"Nicht unterstütztes Endelement ''{0}'' im Inhalt des Änderungssatzes an der "
+"Position ({1},{2}) übersprungen."
msgid "Parsing changeset content ..."
msgstr "Inhalt des Änderungssatzes analysieren..."
@@ -12684,11 +13024,8 @@ msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
"Anlegen einer HTTP-Verbindung mit einer OAuth-Authentifikation fehlgeschlagen"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Warnung: Unerwarteter Wert für Einstellung ''{0}'': ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(in Zeile {0}, Spalte {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Unerwarteter Wert für Einstellung ''{0}'': ''{1}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
@@ -12702,10 +13039,6 @@ msgstr ""
"<html>Beim Wiederherstellen der Sicherheitskopie ist ein Fehler "
"aufgetreten.<br>Der Fehler lautet:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-"Sicherung der Datei konnte nicht erstellt werden. Der Fehler ist: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM-Server-Dateien (gzip-komprimiert)"
@@ -12727,6 +13060,9 @@ msgstr "Keine Daten in Datei ''{0}'' gefunden."
msgid "Open OSM file"
msgstr "OSM-Datei öffnen"
+msgid "Reading was canceled"
+msgstr "Lesevorgang wurde abgebrochen"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12785,12 +13121,12 @@ msgstr ""
"{0}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"WARNUNG: setze den Wert des Attributs ''version'' für das XML Element {0} "
-"auf den Standardwert {2}. Die Version des API ist ''{3}''. Der Wert von "
-"''version'' war {1}."
+"Setze den Wert des Attributs ''version'' für das XML Element {0} auf den "
+"Standardwert {2}. Die Version des API ist ''{3}''. Der Wert von ''version'' "
+"war {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
@@ -12942,6 +13278,9 @@ msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
msgid "<delete from {0} objects>"
msgstr "<von {0} Objekten löschen>"
+msgid "Old values of"
+msgstr "Alte Werte von"
+
msgid "Add tags to selected objects"
msgstr "Merkmale zu gewählten Objekten hinzufügen"
@@ -12961,6 +13300,15 @@ msgstr ""
msgid "Assume"
msgstr "Annehmen"
+msgid "Existing values"
+msgstr "Existierende Werte"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Feld anhaken, um den Wert zu akzeptieren"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Alle Schlagwörter von {0} für diese Sitzung akzeptieren"
+
msgid "Load data from API"
msgstr "Daten über API laden"
@@ -12985,10 +13333,16 @@ msgstr "Neue Objekte erstellen"
msgid "Read protocol version"
msgstr "Protokollversion lesen"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-"Warnung: Der Fernsteuerungsserver auf Port {0}: {1} konnte nicht gestartet "
-"werden"
+"Der Fernsteuerungsserver auf Port {0} konnte nicht gestartet werden: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+"RemoteControl::Eingehende Verbindungen auf Port {0} werden akzeptiert"
+
+msgid "RemoteControl::Server stopped."
+msgstr "RemoteControl::Server angehalten."
msgid "Remote Control has been asked to create a new node."
msgstr "Die Fernsteuerung soll einen neuen Punkt erstellen."
@@ -12996,9 +13350,6 @@ msgstr "Die Fernsteuerung soll einen neuen Punkt erstellen."
msgid "There is no layer opened to add node"
msgstr "Keine Ebene geöffnet um Punkt hinzuzufügen"
-msgid "Add way"
-msgstr "Linie hinzufügen"
-
msgid "Remote Control has been asked to create a new way."
msgstr "Die Fernsteuerung wurde aufgefordert, eine neue Linie zu erstellen."
@@ -13008,6 +13359,16 @@ msgstr "Ungültige Koordinaten: {0}"
msgid "There is no layer opened to add way"
msgstr "Keine Ebene geöffnet um Linie hinzuzufügen"
+msgid "Add way"
+msgstr "Linie hinzufügen"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+"Die Fernsteuerung soll ihre unterstützten Eigenschaften melden. Damit können "
+"Webseiten eine laufende JOSM-Version erkennen."
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -13023,6 +13384,15 @@ msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Die Fernsteuerung soll Daten von der API herunterladen."
+msgid "The latitudes must be between {0} and {1}"
+msgstr "Breitengrad müssen zwischen {0} und {1} liegen"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "Längengrade müssen zwischen {0} und {1} liegen"
+
+msgid "The minima must be less than the maxima"
+msgstr "Die Minima müssen geringer als die Maxima sein"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -13059,20 +13429,20 @@ msgstr "Daten:"
msgid "local file"
msgstr "Lokale Datei"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Verweis zu einer OSM-Datei auf der lokalen Festplatte."
+msgid "Link to a GPX file on your local disk."
+msgstr "Verweis zu einer GPX-Datei auf der lokalen Festplatte."
msgid "include"
msgstr "Hinzufügen"
-msgid "Include OSM data in the .joz session file."
-msgstr "OSM-Daten im der Sitzungsdatei (.joz) integrieren."
+msgid "Include GPX data in the .joz session file."
+msgstr "GPX-Daten im der Sitzungsdatei (.joz) integrieren."
msgid "No file association"
msgstr "Keine Dateiverbindung"
-msgid "OSM data will be included in the session file."
-msgstr "OSM-Daten werden in Sitzungsdatei integriert."
+msgid "GPX data will be included in the session file."
+msgstr "GPX-Daten werden in Sitzungsdatei integriert."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13097,6 +13467,15 @@ msgstr "Ebene enthält ungespeicherte Daten - In Datei speichern."
msgid "Layer does not contain unsaved data."
msgstr "Ebene enthält keine ungespeicherten Daten."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Verweis zu einer OSM-Datei auf der lokalen Festplatte."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "OSM-Daten im der Sitzungsdatei (.joz) integrieren."
+
+msgid "OSM data will be included in the session file."
+msgstr "OSM-Daten werden in Sitzungsdatei integriert."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -13104,6 +13483,9 @@ msgstr ""
"Version ''{0}'' in Metadaten der OSM-Datenebene wird nicht unterstützt. "
"Erwartet: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Sitzungsdatei (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Datei ''{0}'' nicht gefunden."
@@ -13182,18 +13564,18 @@ msgid "Download skipped"
msgstr "Herunterladen übersprungen"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Warnung: Das Plugin \"{0}\" kann nicht heruntergeladen werden. Sein Link zum "
-"Herunterladen ist unbekannt. Das Herunterladen wird übersprungen."
+"Das Plugin {0} kann nicht heruntergeladen werden, da der Link unbekannt ist. "
+"Das Herunterladen wird übersprungen."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Warnung: Das Plugin \"{0}\" kann nicht heruntergeladen werden. Sein Link zum "
-"Herunterladen ''{1}'' ist kein gültiger URL."
+"Das Plugin {0} kann nicht heruntergeladen werden, da der Link ''{1}'' "
+"ungültig ist. Das Herunterladen wird übersprungen."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Erstellen des Plugin-Verzeichnisses ''{0}'' fehlgeschlagen"
@@ -13306,7 +13688,7 @@ msgstr ""
"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
msgid "loading plugin ''{0}'' (version {1})"
-msgstr "lade Plugin ''{0}'' (Version {1})"
+msgstr "Lade Plugin ''{0}'' (Version {1})"
msgid ""
"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
@@ -13365,11 +13747,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Plugin-Aktualisierung fehlgeschlagen"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Warnung: Plugin {0} konnte nicht gefunden werden"
+msgid "Failed to find plugin {0}"
+msgstr "Plugin {0} konnte nicht gefunden werden"
-msgid "Warning: failed to download plugin information list"
-msgstr "Achtung: Plugin-Informationen konnten nicht herunter geladen werden"
+msgid "Failed to download plugin information list"
+msgstr "Plugin-Informationen konnten nicht herunter geladen werden"
msgid "Disable plugin"
msgstr "Plugin abschalten"
@@ -13383,30 +13765,28 @@ msgstr "Plugin behalten"
msgid "Click to keep the plugin ''{0}''"
msgstr "Plugin \"{0}\" behalten"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
-"Warnung: Das Entfernen des veralteten Plugins \"{0}\" ist fehlgeschlagen."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Das Entfernen des veralteten Plugins {0} ist fehlgeschlagen."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Warnung: die Installation des heruntergeladenen Plugins ''{0}'' ist "
-"fehlgeschlagen. JOSM wird weiterhin die alte Version des Plugins nutzen."
+"Die Installation des heruntergeladenen Plugins {0} ist fehlgeschlagen. JOSM "
+"wird weiterhin die alte Version des Plugins nutzen."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
-"Warnung: Die Installation des Plugins ''{0}'' aus der temporären Datei "
-"''{1}'' ist fehlgeschlagen. {2}"
+"Die Installation des Plugins {0} aus der temporären Datei ''{1}'' ist "
+"fehlgeschlagen. {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Warnung: Die Installation des Plugins \"{0}\" aus der temporären Datei "
-"''{1}'' ist fehlgeschlagen. Die Datei konnte nicht umbenannt werden."
+"Die Installation des Plugins {0} aus der temporären Datei ''{1}'' ist "
+"fehlgeschlagen. Die Datei konnte nicht umbenannt werden."
msgid "Click to disable the plugin ''{0}''"
msgstr "Plugin \"{0}\" deaktivieren"
@@ -13484,11 +13864,10 @@ msgstr "Verarbeite zwischengespeicherte Dateien der Plugin-Quellen..."
msgid "Processing file ''{0}''"
msgstr "Verarbeite Datei ''{0}''..."
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Warnung: Das Durchsuchen der Datei ''{0}'' nach Plugin-Informationen ist "
-"fehlgeschlagen. Ausgelassen."
+"Das Durchsuchen der Datei ''{0}'' nach Plugin-Informationen ist "
+"fehlgeschlagen. Datei wird übersprungen."
msgid "Processing plugin site cache icon files..."
msgstr "Verarbeite zwischengespeicherte Bilddateien der Plugin-Quellen..."
@@ -13502,12 +13881,27 @@ msgstr "Lade Plugin-Liste herunter..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Herunterladen der Plugin-Liste von ''{0}''"
+msgid "Plugin list download error"
+msgstr "Plugin-Liste-Herunterlade-Fehler"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM konnte Plugin-Liste nicht herunterladen:"
+
+msgid "Details:"
+msgstr "Details:"
+
+msgid "Plugin icons download error"
+msgstr "Plugin-Icons-Herunterlade-Fehler"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM konnte Plugin-Icons nicht herunterladen:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Warnung: Das Anlegen des Plugin-Verzeichnisses ''{0}'' ist fehlgeschlagen. "
-"Kann die Plugin-Liste der Quelle ''{1}'' nicht zwischenspeichern."
+"Das Anlegen des Plugin-Verzeichnisses ''{0}'' ist fehlgeschlagen. Kann die "
+"Plugin-Liste der Quelle ''{1}'' nicht zwischenspeichern."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Schreibe Plugin-Liste in den lokalen Zwischenspeicher ''{0}''"
@@ -13969,25 +14363,15 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Fehler beim Laden des Bildes ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Warnung: Fehler beim Bearbeiten der Zip-Datei ''{0}''. Fehlermeldung war: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Fehler beim Bearbeiten der Zip-Datei ''{0}''. Fehlermeldung war: {1}"
msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Warnung: der Zugrif auf das Verzeichnis ''{0}'' wurde aus Sicherheitsgründen "
+"Der Zugriff auf das Verzeichnis ''{0}'' wurde aus Sicherheitsgründen "
"verweigert. Fehlermeldung: {1}"
-msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
-msgstr ""
-"Warnung: Das Sprach-Präfix für das JOSM-Wiki konnte nicht aus den aktuellen "
-"Spracheinstellungen ''{0}'' abgeleitet werden. Die Standardspracheinstellung "
-"''en'' wird benutzt."
-
msgid "{0}... [please type its number]"
msgstr "{0}... [Bitte Nummer eingeben]"
@@ -13998,9 +14382,56 @@ msgstr ""
"URL kann nicht geöffnet werden. Es ist aktuell keine Plattform ausgewählt. "
"Bitte zuerst eine Plattform setzen."
+msgid "Opening URL: {0}"
+msgstr "Öffne URL: {0}"
+
+msgid "zoom"
+msgstr "Zoom"
+
+msgid "latitude"
+msgstr "Breitengrad"
+
+msgid "longitude"
+msgstr "Längengrad"
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr "URL enthält nicht {0}/{1}/{2}"
+
+msgid "URL does not contain valid {0}"
+msgstr "URL enthält keinen gültigen {0}"
+
msgid "reserved"
msgstr "reserviert"
+msgid "Outdated Java version"
+msgstr "Veraltete Java-Version"
+
+msgid "Update Java"
+msgstr "Java aktualisieren"
+
+msgid "You are running version {0} of Java."
+msgstr "Sie verwenden die Java-Version {0}"
+
+msgid "February 2013"
+msgstr "Februar 2013"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+"Diese Version wird von {0} seit {1} nicht mehr unterstützt. Deshalb wird von "
+"der Verwendung abgeraten."
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+"JOSM wird mit dieser Version bald nicht mehr funktionieren. Wir empfehlen "
+"eine Aktualisierung auf Java {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Möchten Sie jetzt die Aktualisierung durchführen?"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Tastenkürzelkonflikt: ''{0}'' wurde von ''{1}'' auf ''{2}'' verschoben."
@@ -14036,8 +14467,22 @@ msgstr ""
"werden, da diese keine JOSM-Objekte und keinen passenden Text enthält. "
"</p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Rechtsklick = in Zwischenablage kopieren"
+msgid "ms"
+msgstr "ms"
+
+msgid "s"
+msgstr "s"
+
+msgid "min"
+msgstr "min"
+
+msgid "h"
+msgstr "h"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "Tag"
+msgstr[1] "Tage"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14387,6 +14832,13 @@ msgid "Saturation:"
msgstr "Sättigung:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Erlaubt das Bearbeiten von Verkehrsinformationen und das Exportieren zum "
+"Simulator SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14489,6 +14941,12 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Findet und korrigiert fehlerhafte Adressen."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Mit in der Nähe arbeitenden Nutzern reden, benachrichtigt werden, wenn "
+"jemand in die Nähe kommt."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14527,7 +14985,7 @@ msgstr ""
"einer Schaltfläche."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Bildjustierung im Kartenmodus-Stil des WMS-Plugins"
+msgstr "WMS-Plugin ähnlicher Modus zum Kartenverschieben"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -14621,9 +15079,6 @@ msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Linien hinzu"
msgid "Simplifies download from different read-only APIs."
msgstr "Vereinfacht das Herunterladen von verschiedenen Nur-Lese-APIs."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Eine Fläche einfach in ein Multipolygon konvertieren."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Ermöglicht das unmittelbare Zuordnen von Schlagwörtern zu allen Objekten "
@@ -14694,6 +15149,9 @@ msgstr ""
"Schreibt GPS-Position in die Dateiinformationen von Fotos. Rufen Sie diese "
"Funktion per Rechtsklick auf der Foto-Ebene auf."
+msgid "Make photos movable and position them on the map."
+msgstr "Fotos verschiebbar machen und auf der Karte platzieren."
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14723,9 +15181,6 @@ msgid "Relation and multipolygon creating and editing panel."
msgstr ""
"Werkzeuge zum Erstellen und Ändern von Relationen und Multipolygonen."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Fügt JOSM neustarten in das Datei-Menü ein."
-
msgid "Plugin for reverting changesets"
msgstr "Plugin zum Umkehren von Änderungssätzen"
@@ -14760,9 +15215,6 @@ msgstr ""
"Dies kann mittels einer maximalen Flächenreduktion eingeschränkt werden. "
"Außerdem werden nahe beieinanderliegende Punkte gemittelt."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Erstellen und Ändern von Seekarten für OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Bearbeitungsfunktionen für OpenSeaMap"
@@ -14810,6 +15262,13 @@ msgstr ""
"Gebäude von der tschechischen Katasterkarte abzeichnen. TracerServer (.NET "
"oder Mono) muss dazu laufen."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+"Gebäude und andere Formen von einer Karte abzeichnen. Benötigt einen "
+"laufenden Tracer2Server."
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin zum digitalen Signieren von OSM-Daten"
@@ -14869,9 +15328,6 @@ msgstr ""
"Ein Rennauto von Punkt A nach Punkt B über ein Luftbild fahren und Kakteen "
"zurücklassen."
-msgid "Highways"
-msgstr "Straßen"
-
msgid "Streets"
msgstr "Straßen"
@@ -14956,6 +15412,9 @@ msgstr "Straßendamm"
msgid "Lit"
msgstr "Beleuchtet"
+msgid "Toll"
+msgstr "Maut"
+
msgid "Motorway Link"
msgstr "Autobahnanschluss"
@@ -15046,6 +15505,50 @@ msgstr "Ortsstraße"
msgid "Edit Residential Street"
msgstr "Ortsstraße bearbeiten"
+msgid "Bicycle Road"
+msgstr "Fahrradstraße"
+
+msgid "Edit Bicycle Road"
+msgstr "Fahrradstraße anpassen"
+
+msgid "Highway type"
+msgstr "Straßentyp"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "Ortsstraße"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "Zufahrtsstraße"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "Verbindungsstraße"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "Pfad"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "Radweg"
+
+msgid "Vehicle access"
+msgstr "Nutzbarkeit für Fahrzeuge"
+
+msgid "yes"
+msgstr "ja"
+
+msgid "no"
+msgstr "nein"
+
+msgid "destination"
+msgstr "Anlieger frei"
+
+msgid "Oneway for bicycle"
+msgstr "Einbahn (Fahrrad)"
+
msgid "Living Street"
msgstr "Spielstraße"
@@ -15064,10 +15567,10 @@ msgstr "Fläche"
msgid "Service"
msgstr "Zufahrtsstraße"
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr "Zufahrtsstraße bearbeiten"
-msgid "Serviceway type"
+msgid "Service way type"
msgstr "Zufahrtsstraßentyp"
msgid "alley"
@@ -15079,6 +15582,9 @@ msgstr "Auffahrt"
msgid "parking_aisle"
msgstr "Parkplatzweg"
+msgid "drive-through"
+msgstr "Durchfahrtsbedienung"
+
msgid "Parking Aisle"
msgstr "Parkplatzweg"
@@ -15106,18 +15612,12 @@ msgstr "Kreisverkehr"
msgid "jughandle"
msgstr "Abbiegerampe"
-msgid "yes"
-msgstr "ja"
-
msgid "Road Restrictions"
msgstr "Straßenbeschränkungen"
msgid "Edit Road Restrictions"
msgstr "Straßenbeschränkungen bearbeiten"
-msgid "Toll"
-msgstr "Maut"
-
msgid "No exit (cul-de-sac)"
msgstr "Kein Ausgang (Sackgasse)"
@@ -15127,9 +15627,6 @@ msgstr "Transportarteinschränkung"
msgid "General Access"
msgstr "Genereller Zugang"
-msgid "destination"
-msgstr "Anlieger frei"
-
msgid "delivery"
msgstr "Lieferverkehr frei"
@@ -15139,15 +15636,15 @@ msgstr "Privat; Zugang gestattet"
msgid "private"
msgstr "Privat"
+msgid "customers"
+msgstr "Kunden"
+
msgid "agricultural"
msgstr "Landwirtschaftlicher Verkehr gestattet"
msgid "forestry"
msgstr "Forstwirtschaftlicher Verkehr gestattet"
-msgid "no"
-msgstr "nein"
-
msgid "official"
msgstr "Offizielle Nutzungsart"
@@ -15193,6 +15690,9 @@ msgstr "Fahrgemeinschaft"
msgid "Public Service Vehicles (psv)"
msgstr "Öffentlicher Verkehr & Taxi"
+msgid "Tourist buses"
+msgstr "Tourismusbusse"
+
msgid "Min. speed (km/h)"
msgstr "Min. Geschwindigkeit (km/h)"
@@ -15277,6 +15777,9 @@ msgstr "Brücke bearbeiten"
msgid "viaduct"
msgstr "Viadukt"
+msgid "suspension"
+msgstr "Hängebrücke"
+
msgid "swing"
msgstr "Drehbrücke"
@@ -15356,10 +15859,9 @@ msgid ""
"hands for balance. Partly exposed sites with fall hazard, scree, pathless "
"jagged rocks"
msgstr ""
-"Heikle Stellen können mit Seilen oder Ketten gesichert sein. Leitern sind "
-"möglich. Eventuell sind die Hände fürs Gleichgewicht nötig. Teilweise "
-"exponiert mit Absturzgefahr. Einfache Firnfelder, apere Gletscher, heikle "
-"Grashalden und Schrofen."
+"Heikle Stellen können mit Seilen oder Ketten gesichert sein. Eventuell sind "
+"die Hände fürs Gleichgewicht nötig. Teilweise exponiert mit Absturzgefahr. "
+"Schrofen und Geröllflächen möglich."
msgid "T4 - difficult, exposed, steep alpine trail"
msgstr "T4 - schwieriger alpiner Steig"
@@ -15369,7 +15871,8 @@ msgid ""
"grassy acclivities, jagged rocks, facile snow-free glaciers"
msgstr ""
"Wegspur kaum vorhanden. An gewissen Stellen benötigt man die Hände zum "
-"weiterkommen."
+"Weiterkommen. Recht exponiert, heikle Grashalden und Schrofen. Apere "
+"Gletscher und einfache Firnfelder."
msgid "T5 - difficult alpine trail with climbing"
msgstr "T5 - schwieriger alpiner Steig mit Kletterstellen"
@@ -15395,21 +15898,30 @@ msgstr ""
msgid "Visibility"
msgstr "Sichtbarkeit"
+msgctxt "trail_visibility"
msgid "excellent"
msgstr "exzellent"
+msgctxt "trail_visibility"
msgid "good"
msgstr "gut"
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr "mittelschwer"
+msgctxt "trail_visibility"
msgid "bad"
msgstr "schlecht"
+msgctxt "trail_visibility"
msgid "horrible"
msgstr "sehr schlecht"
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "nein"
+
msgid "Wheelchairs"
msgstr "Rollstuhl"
@@ -15425,11 +15937,11 @@ msgstr "Ausgewiesener Reitweg"
msgid "Edit Bridleway"
msgstr "Reitweg bearbeiten"
-msgid "Cycle Lane"
-msgstr "Fahrradspur"
+msgid "Cycle Lane/Track"
+msgstr "Fahrradspur/-fahrbahn"
-msgid "Edit Cycle Lane"
-msgstr "Fahrradspur bearbeiten"
+msgid "Edit Cycle Lane or Track"
+msgstr "Fahrradspur/-fahrbahn bearbeiten"
msgid "Cycleway"
msgstr "Radweg"
@@ -15464,8 +15976,8 @@ msgstr "Fahrradweg rechts"
msgid "Oneway (bicycle)"
msgstr "Einbahn (Fahrrad)"
-msgid "Edit Highway"
-msgstr "Straße bearbeiten"
+msgid "Edit Highway Attributes:"
+msgstr "Straßen-Attribute bearbeiten"
msgid "Highway"
msgstr "Straße"
@@ -15533,12 +16045,18 @@ msgstr "Raststelle"
msgid "Edit Rest Area"
msgstr "Raststelle bearbeiten"
-msgid "Emergency Phone"
-msgstr "Notfalltelefon"
+msgid "Drinking Water"
+msgstr "Trinkwasser"
msgid "Traffic Signal"
msgstr "Ampel"
+msgid "Edit Traffic Signal"
+msgstr "Ampel anpassen"
+
+msgid "Optional crossing attributes:"
+msgstr "Optionale Übergangs-Attribute:"
+
msgid "Pedestrian crossing type"
msgstr "Typ des Fußgängerüberwegs"
@@ -15554,15 +16072,6 @@ msgstr "Insel"
msgid "unmarked"
msgstr "unmarkiert"
-msgid "Cross on horseback"
-msgstr "Zu Pferd"
-
-msgid "Cross by bicycle"
-msgstr "Mit Fahrrad"
-
-msgid "Crossing attendant"
-msgstr "Schülerlotse"
-
msgid "Crossing type name (UK)"
msgstr "Übergangstyp (UK)"
@@ -15584,6 +16093,15 @@ msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
msgid "tiger"
msgstr "Zebrastreifen (Tiger)"
+msgid "Crossing attendant"
+msgstr "Schülerlotse"
+
+msgid "Cross by bicycle"
+msgstr "Mit Fahrrad"
+
+msgid "Cross on horseback"
+msgstr "Zu Pferd"
+
msgid "Stop"
msgstr "Stopp-Schild"
@@ -15593,6 +16111,9 @@ msgstr "Vorfahrt gewähren / Vorrang geben"
msgid "Mini-roundabout"
msgstr "Kleiner Kreisverkehr"
+msgid "Edit Mini-Roundabout"
+msgstr "Kleinen Kreisverkehr anpassen"
+
msgid "Direction"
msgstr "Richtung"
@@ -15602,11 +16123,8 @@ msgstr "Im Uhrzeigersinn"
msgid "Pedestrian Crossing"
msgstr "Fußgängerüberweg"
-msgid "Edit Crossing"
-msgstr "Fußgängerüberweg bearbeiten"
-
-msgid "Type name (UK)"
-msgstr "Typname (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Fußgängerüberweg anpassen"
msgid "Traffic Calming"
msgstr "Verkehrsberuhigung"
@@ -15638,9 +16156,6 @@ msgstr "Bodenwelle (sehr lang und flach)"
msgid "Passing Place"
msgstr "Ausweichstelle"
-msgid "Edit Passing Place"
-msgstr "Ausweichstelle bearbeiten"
-
msgid "Turning Circle"
msgstr "Wendestelle"
@@ -15674,20 +16189,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barrieren"
+msgid "Block"
+msgstr "Steinblock"
+
+msgid "Edit Block"
+msgstr "Steinblock"
+
+msgid "Allowed traffic:"
+msgstr "Erlaubter Verkehr:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "Stein"
+
msgid "Bollard"
msgstr "Poller"
msgid "Edit Bollard"
msgstr "Poller bearbeiten"
-msgid "Allowed traffic:"
-msgstr "Erlaubter Verkehr:"
+msgid "Bollard type"
+msgstr "Pollertyp"
+
+msgid "rising"
+msgstr "ausfahrend"
+
+msgid "removable"
+msgstr "entfernbar"
+
+msgid "plastic"
+msgstr "Kunststoff"
msgid "Cycle Barrier"
msgstr "Umlaufgitter"
-msgid "Block"
-msgstr "Steinblock"
+msgid "Edit Cycle Barrier"
+msgstr "Fahrradsperre bearbeiten"
msgid "Cattle Grid"
msgstr "Viehgitter"
@@ -15698,6 +16237,9 @@ msgstr "Viehgitter bearbeiten"
msgid "Bus Trap"
msgstr "Busschleuse"
+msgid "Edit Bus Trap"
+msgstr "Busschleuse bearbeiten"
+
msgid "Spikes"
msgstr "Spikes / Dornen"
@@ -15719,44 +16261,88 @@ msgstr "Grenzkontrolle bearbeiten"
msgid "Hedge"
msgstr "Hecke"
+msgid "Edit Hedge"
+msgstr "Hecke bearbeiten"
+
+msgid "Height (meters)"
+msgstr "Höhe (in Meter)"
+
+msgid "Genus"
+msgstr "Gattung"
+
+msgid "Species"
+msgstr "Spezies"
+
+msgid "Taxon"
+msgstr "Taxonomie"
+
msgid "Fence"
msgstr "Zaun"
+msgid "Edit Fence"
+msgstr "Zaun bearbeiten"
+
msgid "barbed_wire"
msgstr "Stacheldraht"
-msgid "chain"
-msgstr "Kette"
+msgid "chain_link"
+msgstr "Maschendraht"
msgid "electric"
msgstr "Elektrisch"
-msgid "hedge"
-msgstr "Hecke"
-
msgid "pole"
msgstr "Mast"
msgid "split_rail"
msgstr "Holzbalken"
+msgid "wire"
+msgstr "Drahtzaun"
+
+msgid "Guard Rail"
+msgstr "Leitplanke"
+
+msgid "Edit Guard Rail"
+msgstr "Leitplanke bearbeiten"
+
msgid "Wall"
msgstr "Mauer"
+msgid "Edit Wall"
+msgstr "Wand bearbeiten"
+
msgid "City Wall"
msgstr "Stadtmauer"
+msgid "Edit City Wall"
+msgstr "Stadtwall bearbeiten"
+
msgid "Retaining Wall"
msgstr "Stützmauer"
+msgid "Edit Retaining Wall"
+msgstr "Stützmauer bearbeiten"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Wassergraben"
-msgid "Entrance"
-msgstr "Eingang"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Wassergraben bearbeiten"
-msgid "Edit Entrance"
-msgstr "Eingang bearbeiten"
+msgid "Kerb"
+msgstr "Bordstein"
+
+msgid "Edit Kerb"
+msgstr "Bordstein bearbeiten"
+
+msgid "Entrance (barrier opening)"
+msgstr "Barriere-Eingang/Öffnung"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Barriere-Eingang/Öffnung bearbeiten"
msgid "Gate"
msgstr "Gatter / Tor"
@@ -15788,12 +16374,27 @@ msgstr "Personengatter"
msgid "Edit Kissing Gate"
msgstr "Personengatter bearbeiten"
+msgid "Chain"
+msgstr "Kette"
+
+msgid "Edit Chain"
+msgstr "Kette bearbeiten"
+
msgid "Stile"
msgstr "Zauntreppe"
msgid "Edit Stile"
msgstr "Zauntreppe bearbeiten"
+msgid "ladder"
+msgstr "Leiter"
+
+msgid "squeezer"
+msgstr "Schmale Lücke"
+
+msgid "stepover"
+msgstr "Übertritt"
+
msgid "Turnstile"
msgstr "Drehsperre"
@@ -15851,6 +16452,9 @@ msgstr "Abwassergraben"
msgid "Edit Drain"
msgstr "Abwassergraben bearbeiten"
+msgid "Ditch"
+msgstr "Wassergraben"
+
msgid "Edit Ditch"
msgstr "Wassergraben bearbeiten"
@@ -15860,6 +16464,12 @@ msgstr "Bach"
msgid "Edit Stream"
msgstr "Bach bearbeiten"
+msgid "Wadi"
+msgstr "Wadi"
+
+msgid "Edit Wadi"
+msgstr "Wadi bearbeiten"
+
msgid "Canal"
msgstr "Kanal"
@@ -15899,9 +16509,6 @@ msgstr "Damm bearbeiten"
msgid "Groyne"
msgstr "Buhne"
-msgid "Edit Groyne"
-msgstr "Bearbeite Buhne"
-
msgid "Breakwater"
msgstr "Wellenbrecher"
@@ -15935,6 +16542,21 @@ msgstr "Überdecktes Speicherbassin bearbeiten"
msgid "Edit Water"
msgstr "Wasserfläche bearbeiten"
+msgid "Water Body"
+msgstr "Wasserfläche"
+
+msgid "lake"
+msgstr "See"
+
+msgid "lagoon"
+msgstr "Lagune"
+
+msgid "pond"
+msgstr "Teich"
+
+msgid "reservoir"
+msgstr "Speicherbecken"
+
msgid "Land"
msgstr "Land"
@@ -16016,20 +16638,25 @@ msgstr "Fährstelle bearbeiten"
msgid "Cargo"
msgstr "Fracht"
+msgctxt "cargo"
msgid "passengers"
msgstr "Passagiere"
+msgctxt "cargo"
msgid "vehicle"
msgstr "Fahrzeuge"
+msgctxt "cargo"
msgid "bicycle"
msgstr "Fahrrad"
+msgctxt "cargo"
msgid "hgv"
msgstr "LKW"
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "Passagiere&Fahrzeuge"
+msgstr "Passagiere und Fahrzeuge"
msgid "Ferry Route"
msgstr "Fährroute"
@@ -16077,7 +16704,7 @@ msgid "Transport"
msgstr "Transport"
msgid "Railway"
-msgstr "Eisenbahn"
+msgstr "Gleise"
msgid "Rail"
msgstr "Eisenbahn"
@@ -16100,8 +16727,11 @@ msgstr "Militär"
msgid "tourism"
msgstr "Tourismus"
-msgid "Service/Type"
-msgstr "Dienst/Typ"
+msgid "freight"
+msgstr "Güterzüge"
+
+msgid "Service type"
+msgstr "Service-Typ"
msgid "yard"
msgstr "Rangiergleis"
@@ -16124,11 +16754,14 @@ msgstr "Oberleitung"
msgid "rail"
msgstr "Eisenbahn"
-msgid "Voltage"
-msgstr "Spannung"
+msgid "Voltage in Volts (V)"
+msgstr "Spannung in Volt (V)"
-msgid "Frequency (Hz)"
-msgstr "Frequenz (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frequenz in Hertz (Hz)"
+
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16,7"
@@ -16139,9 +16772,6 @@ msgstr "Schmalspurbahn"
msgid "Edit Narrow Gauge Rail"
msgstr "Schmalspurbahn bearbeiten"
-msgid "Types"
-msgstr "Arten"
-
msgid "Monorail"
msgstr "Einschienenbahn"
@@ -16182,20 +16812,58 @@ msgid "Disused Rail"
msgstr "Stillgelegte Strecke"
msgid "Edit Disused Railway"
-msgstr "Stillgelegte Strecke bearbeiten"
-
-msgid "Optional Types"
-msgstr "Optionale Typen"
+msgstr "Ungenutzte Gleise bearbeiten"
msgid "Abandoned Rail"
msgstr "Strecke abgebaut"
+msgid "Edit Abandoned Railway"
+msgstr "Stillgelegte Gleise bearbeiten"
+
msgid "Level Crossing"
msgstr "Bahnübergang"
+msgid "Edit Level Crossing"
+msgstr "Bahnübergang bearbeiten"
+
+msgid "Supervised"
+msgstr "Bewacht"
+
+msgid "Traffic lights"
+msgstr "Lichtsignal"
+
+msgid "Sound signals"
+msgstr "akustisches Warnsignal"
+
+msgid "Barrier"
+msgstr "Barriere"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "ja"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "nein"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "halb"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "voll"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "beidseitige Halbschranken"
+
msgid "Crossing"
msgstr "(Fuß-)Übergang"
+msgid "Edit Crossing"
+msgstr "(Fuß-)Übergang bearbeiten"
+
msgid "Crossing type"
msgstr "Art des Übergangs"
@@ -16295,11 +16963,9 @@ msgstr "Laufband"
msgid "Edit Magic Carpet"
msgstr "Laufband bearbeiten"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Materialseilbahn"
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr "Materialseilbahn bearbeiten"
@@ -16311,11 +16977,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Station bearbeiten"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Pfeiler"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Pfeiler bearbeiten"
@@ -16334,12 +16998,12 @@ msgstr "ebenerdig"
msgid "underground"
msgstr "Tiefgarage"
+msgid "rooftop"
+msgstr "Hausdach"
+
msgid "Access"
msgstr "Genereller Zugang"
-msgid "customers"
-msgstr "Kunden"
-
msgid "Park and Ride"
msgstr "Park and Ride"
@@ -16367,9 +17031,6 @@ msgstr "Stellplatz"
msgid "Edit Parking space"
msgstr "Stellplatz anpassen"
-msgid "rooftop"
-msgstr "Hausdach"
-
msgid "Capacity"
msgstr "Kapazität"
@@ -16385,20 +17046,37 @@ msgstr "Zeitlimit (Minuten)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Bewacht"
-
msgid "Opening Hours"
msgstr "Öffnungszeiten"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Sa-Su 00:00-24:00"
+msgstr "Sa-Su 00:00-24:00"
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+
+msgid "sunrise-sunset"
+msgstr "sunrise-sunset"
+
+msgid "Su 10:00+"
+msgstr "Su 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgid "Parking entrance"
msgstr "Parkplatz-Einfahrt"
@@ -16547,6 +17225,9 @@ msgstr "Elektrotankstelle"
msgid "Edit Charging Station (for electric cars)"
msgstr "Bearbeite Elektrotankstelle"
+msgid "Voltage"
+msgstr "Spannung"
+
msgid "Amperage"
msgstr "Stromstärke"
@@ -16568,6 +17249,12 @@ msgstr "Werkstatt"
msgid "Edit Car Repair"
msgstr "Autowerkstatt bearbeiten"
+msgid "Parts"
+msgstr "Ersatzteile"
+
+msgid "Edit Car Parts"
+msgstr "Autoteile bearbeiten"
+
msgid "Tyres"
msgstr "Reifenhändler"
@@ -16595,6 +17282,12 @@ msgstr "Vermietung"
msgid "Edit Car Rental"
msgstr "Autovermietung bearbeiten"
+msgid "Second hand"
+msgstr "Aus zweiter Hand"
+
+msgid "only"
+msgstr "nur"
+
msgid "Sharing"
msgstr "Autotausch / Car Sharing"
@@ -16619,22 +17312,6 @@ msgstr "Dienstleistungen:"
msgid "Sale"
msgstr "Verkauf"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "ja"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "Marke"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "Gebraucht"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "nein"
-
msgid "brand"
msgstr "Marke"
@@ -16656,9 +17333,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Ersatzteile"
-
msgid "Clothes"
msgstr "Kleidung"
@@ -16723,8 +17397,8 @@ msgstr "Fahrradleihstelle bearbeiten"
msgid "Public Transport"
msgstr "Öffentlicher Verkehr"
-msgid "Route"
-msgstr "Route"
+msgid "Public transport route"
+msgstr "Route (Öffentlicher Verkehr)"
msgid "Edit Route"
msgstr "Route bearbeiten"
@@ -16854,6 +17528,9 @@ msgstr "Plattform"
msgid "Station or amenities"
msgstr "Station oder Amenities"
+msgid "Edit Stop Position"
+msgstr "Halteposition bearbeiten"
+
msgid "Bus"
msgstr "Bus"
@@ -16867,10 +17544,10 @@ msgid "Train"
msgstr "Zug"
msgid "Railway station (legacy)"
-msgstr "Bahnhof (legacy/veraltet)"
+msgstr "Bahnhof (veraltet)"
msgid "Railway halt (legacy)"
-msgstr "Eisenbahnpunkt (legacy/veraltet)"
+msgstr "Bahnstation (veraltet)"
msgid "Trolleybus"
msgstr "Trolleybus"
@@ -16884,6 +17561,9 @@ msgstr "Standseilbahn"
msgid "Ferry"
msgstr "Fähre"
+msgid "Edit Platform"
+msgstr "Plattform bearbeiten"
+
msgid "Bench"
msgstr "Sitzbank"
@@ -16896,21 +17576,23 @@ msgstr "Rollstuhl"
msgid "limited"
msgstr "limitiert"
-msgid "only"
-msgstr "nur"
-
msgid "Highway platform (legacy)"
msgstr "Bussteig (legacy/veraltet)"
msgid "Railway platform (legacy)"
-msgstr "Bahnsteig (legacy/veraltet)"
+msgstr "Bahnsteig (veraltet)"
msgid "funicular"
msgstr "Standseilbahn"
+msgctxt "railway"
msgid "Station"
msgstr "Bahnhof"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Bahnhof bearbeiten"
+
msgid "Building"
msgstr "Gebäude"
@@ -16923,6 +17605,9 @@ msgstr "U-Bahn-Eingang bearbeiten"
msgid "Ticket Machine"
msgstr "Fahrausweisautomat"
+msgid "Edit Ticket Machine"
+msgstr "Fahrkartenautomat bearbeiten"
+
msgid "Reference Number"
msgstr "Referenznummer"
@@ -16947,19 +17632,11 @@ msgstr "Kundenkarten"
msgid "Public Transport (legacy)"
msgstr "Öffentlicher Verkehr (legacy/veraltet)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Bahnhof"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Bahnhof bearbeiten"
-
msgid "UIC-Reference"
msgstr "UIC-Referenz"
msgid "Railway Halt"
-msgstr "Eisenbahnhaltepunkt"
+msgstr "Bahnstation"
msgid "Edit Halt"
msgstr "Haltepunkt bearbeiten"
@@ -17003,8 +17680,8 @@ msgstr "Bussteig bearbeiten"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Taxihaltepunkt bearbeiten"
+msgid "Edit Taxi Station"
+msgstr "Taxistand bearbeiten"
msgid "Airport"
msgstr "Flughafen"
@@ -17057,6 +17734,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Terminal bearbeiten"
+msgid "Internet access"
+msgstr "Internetzugang"
+
+msgid "wlan"
+msgstr "WLAN"
+
+msgid "wired"
+msgstr "Kabel"
+
+msgid "terminal"
+msgstr "Terminal"
+
+msgid "Internet access fee"
+msgstr "Internetgebühr"
+
msgctxt "airport"
msgid "Gate"
msgstr "Flugsteig/Gate"
@@ -17079,21 +17771,6 @@ msgstr "Hotel bearbeiten"
msgid "Stars"
msgstr "Sterne"
-msgid "Internet access"
-msgstr "Internetzugang"
-
-msgid "wlan"
-msgstr "WLAN"
-
-msgid "wired"
-msgstr "Kabel"
-
-msgid "terminal"
-msgstr "Terminal"
-
-msgid "Internet access fee"
-msgstr "Internetgebühr"
-
msgid "Smoking"
msgstr "Rauchen"
@@ -17277,6 +17954,12 @@ msgstr "Nachtclub"
msgid "Edit Nightclub"
msgstr "Nachtclub bearbeiten"
+msgid "Stripclub"
+msgstr "Strip-Klub"
+
+msgid "Edit Stripclub"
+msgstr "Strip-Klub ändern"
+
msgid "Tourism"
msgstr "Tourismus"
@@ -17298,9 +17981,15 @@ msgstr "Aussichtsturm"
msgid "Information Office"
msgstr "Informationsbüro"
+msgid "Edit Information Office"
+msgstr "Informationsbüro bearbeiten"
+
msgid "Map"
msgstr "Karte"
+msgid "Edit Information Map"
+msgstr "Informationskarte bearbeiten"
+
msgid "Detail Grade"
msgstr "Detailgrad"
@@ -17313,8 +18002,11 @@ msgstr "Straße"
msgid "scheme"
msgstr "schematisch"
+msgid "toposcope"
+msgstr "Toposkop"
+
msgid "Shown Area"
-msgstr "Kartenausschnitt"
+msgstr "Gezeigtes Gebiet"
msgid "site"
msgstr "Örtlichkeit"
@@ -17352,6 +18044,9 @@ msgstr "...andere mögliche Transportarten"
msgid "Information Board"
msgstr "Informationstafel"
+msgid "Edit Information Board"
+msgstr "Informationstafel bearbeiten"
+
msgid "Board Content"
msgstr "Inhalt"
@@ -17373,23 +18068,35 @@ msgstr "Pflanzen"
msgid "Guidepost"
msgstr "Wegweiser"
+msgid "Edit Guidepost"
+msgstr "Wegweiser bearbeiten"
+
msgid "Information Terminal"
msgstr "Informationsterminal"
+msgid "Edit Information Terminal"
+msgstr "Informationsterminal bearbeiten"
+
msgid "Closer description"
msgstr "Nähere Beschreibung"
msgid "Audioguide"
msgstr "Audioguide"
+msgid "Edit Audioguide"
+msgstr "Audioführung bearbeiten"
+
msgid "Audioguide via mobile phone?"
msgstr "Audioguide per Handy?"
msgid "Phone number"
msgstr "Telefonnummer"
-msgid "Other Information Points"
-msgstr "Andere Informationspunkte"
+msgid "Other Information Point"
+msgstr "Anderer Informationspunkt"
+
+msgid "Edit Information Point"
+msgstr "Informationspunkt bearbeiten"
msgid "Leisure"
msgstr "Freizeit"
@@ -17412,9 +18119,6 @@ msgstr "Hundepark"
msgid "Edit Dog Park"
msgstr "Hundepark anpassen"
-msgid "Barrier"
-msgstr "Barriere"
-
msgid "fence"
msgstr "Zaun"
@@ -17439,8 +18143,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Sauna bearbeiten"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr "Pferdereitplatz"
+
+msgid "Edit Horse riding"
+msgstr "Pferdereitplatz bearbeiten"
+
+msgid "Brothel"
+msgstr "Bordell"
+
+msgid "Edit Brothel"
+msgstr "Bordell bearbeiten"
msgid "Playground"
msgstr "Spielplatz"
@@ -17512,50 +18225,44 @@ msgstr "Kunstwerk (im öffentlichen Raum)"
msgid "Edit Artwork"
msgstr "Kunstwerk (im öffentlichen Raum) bearbeiten"
-msgid "Place of Worship"
-msgstr "Kirche"
-
-msgid "Edit Place of Worship"
-msgstr "Kirche bearbeiten"
-
-msgid "Religion"
-msgstr "Religion"
+msgid "Recording Studio"
+msgstr "Aufnahmestudio"
-msgid "bahai"
-msgstr "bahaiistisch"
+msgid "Edit Studio"
+msgstr "Studio bearbeiten"
-msgid "buddhist"
-msgstr "buddhistisch"
+msgid "audio"
+msgstr "Audio"
-msgid "christian"
-msgstr "christlich"
+msgid "video"
+msgstr "Video"
-msgid "hindu"
-msgstr "hinduistisch"
+msgid "Place of Worship"
+msgstr "Kirche"
-msgid "jain"
-msgstr "jainistisch"
+msgid "Church"
+msgstr "Kirche"
-msgid "jewish"
-msgstr "jüdisch"
+msgid "Edit Church"
+msgstr "Kirche bearbeiten"
-msgid "muslim"
-msgstr "moslemisch"
+msgid "Building type"
+msgstr "Gebäudetyp"
-msgid "sikh"
-msgstr "sikhistisch"
+msgid "basilica"
+msgstr "Basilika"
-msgid "spiritualist"
-msgstr "spiritistisch"
+msgid "cathedral"
+msgstr "Kathedrale"
-msgid "taoist"
-msgstr "taoistisch"
+msgid "chapel"
+msgstr "Kapelle"
-msgid "unitarian"
-msgstr "unitarisch"
+msgid "church"
+msgstr "Kirche"
-msgid "zoroastrian"
-msgstr "zoroastrisch"
+msgid "temple"
+msgstr "Tempel"
msgid "Denomination"
msgstr "Konfession"
@@ -17572,6 +18279,12 @@ msgstr "katholisch"
msgid "evangelical"
msgstr "evangelikal"
+msgid "greek_catholic"
+msgstr "griechisch-katholisch"
+
+msgid "greek_orthodox"
+msgstr "griechisch-orthodox"
+
msgid "jehovahs_witness"
msgstr "Zeugen Jehovas"
@@ -17584,6 +18297,9 @@ msgstr "methodistisch"
msgid "mormon"
msgstr "mormonisch"
+msgid "new_apostolic"
+msgstr "neuapostolisch"
+
msgid "orthodox"
msgstr "orthodox"
@@ -17599,38 +18315,142 @@ msgstr "evangelisch-protestantisch"
msgid "quaker"
msgstr "Quäker"
+msgid "roman_catholic"
+msgstr "Römisch-katholisch"
+
+msgid "russian_orthodox"
+msgstr "russisch-orthodox"
+
+msgid "seventh_day_adventist"
+msgstr "Siebenten-Tags-Adventisten"
+
+msgid "Service Times"
+msgstr "Servicezeiten"
+
+msgid "18:00"
+msgstr "18:00"
+
+msgid "sunset,sunrise"
+msgstr "sunset,sunrise"
+
+msgid "Su 9:30,11:00"
+msgstr "Su 9:30,11:00"
+
+msgid "Sa,Su,PH 9:00"
+msgstr "Sa,Su,PH 9:00"
+
+msgid "Sa 18:00; Su 10:45"
+msgstr "Sa 18:00; Su 10:45"
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+
+msgid "Sa 10:00+"
+msgstr "Sa 10:00+"
+
+msgid "Mosque"
+msgstr "Moschee"
+
+msgid "Edit Mosque"
+msgstr "Moschee bearbeiten"
+
+msgid "mosque"
+msgstr "Moschee"
+
+msgid "ibadi"
+msgstr "Ibaditen"
+
msgid "shia"
msgstr "schiitisch"
msgid "sunni"
msgstr "sunnitisch"
-msgid "Service Times"
-msgstr "Servicezeiten"
+msgid "Synagogue"
+msgstr "Synagoge"
-msgid "Su 10:00"
-msgstr "Su 10:00"
+msgid "Edit Synagogue"
+msgstr "Synagoge bearbeiten"
-msgid "Su 10:30"
-msgstr "Su 10:30"
+msgid "synagogue"
+msgstr "Synagoge"
-msgid "Su 11:00"
-msgstr "Su 11:00"
+msgid "conservative"
+msgstr "konservativ"
-msgid "Opening Hours for visiting"
-msgstr "Besuchszeiten"
+msgid "reform"
+msgstr "Reform"
-msgid "Recording Studio"
-msgstr "Aufnahmestudio"
+msgid "Buddhist Temple"
+msgstr "Buddhistischer Tempel"
-msgid "Edit Studio"
-msgstr "Studio bearbeiten"
+msgid "Edit Buddhist Temple"
+msgstr "Buddhistischer Tempel bearbeiten"
-msgid "audio"
-msgstr "Audio"
+msgid "theravada"
+msgstr "Theravada"
-msgid "video"
-msgstr "Video"
+msgid "mahayana"
+msgstr "Mahajana"
+
+msgid "vajrayana"
+msgstr "Vajrayana"
+
+msgid "Hindu Temple"
+msgstr "Hinduistischer Tempel"
+
+msgid "Edit Hindu Temple"
+msgstr "Hinduistischer Tempel bearbeiten"
+
+msgid "vaishnavism"
+msgstr "Vishnuismus"
+
+msgid "shaivism"
+msgstr "Shivaismus"
+
+msgid "shaktism"
+msgstr "Shaktismus"
+
+msgid "smartism"
+msgstr "Smarta Tradition"
+
+msgid "Shinto Shrine"
+msgstr "Schintoistischer Schrein"
+
+msgid "Edit Shinto Shrine"
+msgstr "Schintoistischer Schrein bearbeiten"
+
+msgid "Other Place of Worship"
+msgstr "Andere Andachtsstätte"
+
+msgid "Edit other Place of Worship"
+msgstr "Andere Andachtsstätte bearbeiten"
+
+msgid "Religion"
+msgstr "Religion"
+
+msgid "bahai"
+msgstr "bahaiistisch"
+
+msgid "jain"
+msgstr "jainistisch"
+
+msgid "sikh"
+msgstr "sikhistisch"
+
+msgid "spiritualist"
+msgstr "spiritistisch"
+
+msgid "taoist"
+msgstr "taoistisch"
+
+msgid "unitarian"
+msgstr "unitarisch"
+
+msgid "zoroastrian"
+msgstr "zoroastrisch"
msgid "Public Building"
msgstr "Öffentliches Gebäude"
@@ -17719,6 +18539,12 @@ msgstr "Fahrschule bearbeiten"
msgid "License Classes"
msgstr "Führerscheinklassen"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Gesundheit"
@@ -17728,6 +18554,12 @@ msgstr "Krankenhaus"
msgid "Edit Hospital"
msgstr "Krankenhaus bearbeiten"
+msgid "Clinic"
+msgstr "Klinik"
+
+msgid "Edit Clinic"
+msgstr "Klinik bearbeiten"
+
msgid "Doctors"
msgstr "Arzt"
@@ -17794,12 +18626,66 @@ msgstr "Tierarzt"
msgid "Edit Veterinary"
msgstr "Tierarzt bearbeiten"
-msgid "Note"
-msgstr "Kommentar"
+msgid "Edit Toilets"
+msgstr "Toiletten bearbeiten"
+
+msgid "Access rights"
+msgstr "Zugangsarten"
+
+msgid "public"
+msgstr "öffentlich"
+
+msgid "seasonal"
+msgstr "saisonal"
+
+msgid "flush"
+msgstr "Spülung"
+
+msgid "pitlatrine"
+msgstr "Grubenlatrine"
+
+msgid "chemical"
+msgstr "chemisch"
+
+msgid "bucket"
+msgstr "Eimer"
+
+msgid "Usage Position"
+msgstr "Gebrauchsstellung"
+
+msgid "seated"
+msgstr "Sitz"
+
+msgid "seated;urinal"
+msgstr "Sitz und Urinal"
+
+msgid "squat"
+msgstr "hocken"
+
+msgid "urinal"
+msgstr "Pissoir"
msgid "Post Box"
msgstr "Briefkasten"
+msgid "Edit Postbox"
+msgstr "Briefkasten bearbeiten"
+
+msgid "Collection times"
+msgstr "Leerungszeiten"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+
+msgid "Drive through"
+msgstr "Durchfahrt"
+
msgid "Telephone"
msgstr "Telefon"
@@ -17809,6 +18695,30 @@ msgstr "Telefon bearbeiten"
msgid "Telephone cards"
msgstr "Telefonkarten"
+msgid "Emergency Phone"
+msgstr "Notfalltelefon"
+
+msgid "Internet Access"
+msgstr "Internetzugang"
+
+msgid "Edit Internet Access"
+msgstr "Internetzugang bearbeiten"
+
+msgid "Automated Defibrillator"
+msgstr "Automatisierter Defibrillator"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Automatisierten externen Defibrillator bearbeiten"
+
+msgid "Located inside a building?"
+msgstr "Im Gebäude befindlich?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Letztes Prüfdatum (JJJJ-MM-TT)"
+
+msgid "Last check note"
+msgstr "Letzter Prüfvermerk"
+
msgid "Clock"
msgstr "Uhr"
@@ -17818,30 +18728,36 @@ msgstr "Uhr anpassen"
msgid "Display"
msgstr "Anzeige"
-msgctxt "display"
msgid "analog"
msgstr "analog"
-msgctxt "display"
msgid "digital"
msgstr "digital"
-msgctxt "display"
msgid "sundial"
msgstr "Sonnenuhr"
-msgctxt "display"
msgid "unorthodox"
msgstr "unkonventionell"
msgid "Support"
-msgstr "Anbringung"
+msgstr "Hilfe"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "Mast"
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "Wanduhr"
+msgstr "wandhängend"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "Werbeschild"
+msgstr "Plakatwand"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "bodenmontiert"
msgid "Visibility/readability"
msgstr "Ablesbarkeit"
@@ -17870,8 +18786,8 @@ msgstr "Feuchtigkeitsanzeige"
msgid "Recycling"
msgstr "Recyclingstelle & -container"
-msgid "Edit Recycling station"
-msgstr "Recyclingstelle oder -container bearbeiten"
+msgid "Edit Recycling Station"
+msgstr "Abfallverwertungsstation bearbeiten"
msgid "Batteries"
msgstr "Batterien"
@@ -17897,27 +18813,15 @@ msgstr "Zentrum"
msgid "Waste Basket"
msgstr "Abfalleimer"
-msgid "Edit Waste Basket"
-msgstr "Abfalleimer bearbeiten"
-
msgid "Waste Disposal"
msgstr "Abfallentsorgung"
-msgid "Edit Waste Disposal"
-msgstr "Abfallentsorgung bearbeiten"
+msgid "Edit Bench"
+msgstr "Sitzbank bearbeiten"
msgid "Backrest"
msgstr "Lehne"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "Stein"
-
-msgid "plastic"
-msgstr "Kunststoff"
-
msgid "Amount of Seats"
msgstr "Anzahl der Sitzplätze"
@@ -17952,12 +18856,15 @@ msgstr "Jagdanstand bearbeiten"
msgid "Height"
msgstr "Höhe"
+msgctxt "height"
msgid "low"
msgstr "niedrig"
+msgctxt "height"
msgid "half"
msgstr "halb"
+msgctxt "height"
msgid "full"
msgstr "voll"
@@ -17967,11 +18874,11 @@ msgstr "Versteck"
msgid "Lock"
msgstr "Schloss"
-msgid "Drinking Water"
-msgstr "Trinkwasser"
+msgid "Edit Source of Potable Water"
+msgstr "Wasserspender bearbeien"
-msgid "Edit Drinking Water"
-msgstr "Trinkwasserabgabe bearbeiten"
+msgid "Indoor"
+msgstr "Innenraum"
msgid "Fire Hydrant"
msgstr "Hydrant"
@@ -17998,6 +18905,9 @@ msgstr "Teich"
msgid "Diameter (in mm)"
msgstr "Durchmesser (in mm)"
+msgid "Hydrant Position"
+msgstr "Hydrantposition"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "Fahrbahn"
@@ -18035,117 +18945,153 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Stadion bearbeiten"
-msgid "select sport:"
-msgstr "Sportart wählen:"
+msgid "Select sport:"
+msgstr "Sport auswählen:"
-msgid "sport"
+msgid "Sport"
msgstr "Sport"
+msgctxt "sport"
msgid "multi"
msgstr "Mehrfachnutzung"
+msgctxt "sport"
msgid "archery"
msgstr "Bogenschießen"
+msgctxt "sport"
msgid "athletics"
msgstr "Leichtathletik"
+msgctxt "sport"
msgid "american_football"
msgstr "American Football"
+msgctxt "sport"
msgid "australian_football"
msgstr "Australian Football"
+msgctxt "sport"
msgid "baseball"
msgstr "Baseball"
+msgctxt "sport"
msgid "basketball"
msgstr "Basketball"
+msgctxt "sport"
msgid "boules"
msgstr "Boule"
+msgctxt "sport"
msgid "bowls"
msgstr "Bowls"
+msgctxt "sport"
msgid "canadian_football"
msgstr "Canadian Football"
+msgctxt "sport"
msgid "canoe"
msgstr "Kanu"
+msgctxt "sport"
msgid "climbing"
msgstr "Klettern"
+msgctxt "sport"
msgid "cricket"
msgstr "Kricket"
+msgctxt "sport"
msgid "cricket_nets"
msgstr "Kricketnetze"
+msgctxt "sport"
msgid "croquet"
msgstr "Krocket"
+msgctxt "sport"
msgid "cycling"
msgstr "Fahrradfahren"
+msgctxt "sport"
msgid "dog_racing"
msgstr "Hunderennen"
+msgctxt "sport"
msgid "equestrian"
msgstr "Reiten"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "gaelic_games"
+msgstr "Gälische Spiele"
+msgctxt "sport"
msgid "golf"
msgstr "Golf"
+msgctxt "sport"
msgid "gymnastics"
msgstr "Gymnastik"
+msgctxt "sport"
msgid "hockey"
msgstr "Hockey"
+msgctxt "sport"
msgid "horse_racing"
msgstr "Pferderennen"
+msgctxt "sport"
msgid "motor"
msgstr "Motorsport"
+msgctxt "sport"
msgid "pelota"
msgstr "Pelota"
+msgctxt "sport"
msgid "racquet"
msgstr "Schlagball (Racquet)"
+msgctxt "sport"
msgid "rugby_league"
msgstr "Rugby League"
+msgctxt "sport"
msgid "rugby_union"
msgstr "Rugby Union"
+msgctxt "sport"
msgid "shooting"
msgstr "Schießen"
+msgctxt "sport"
msgid "skateboard"
msgstr "Skateboard"
+msgctxt "sport"
msgid "skating"
msgstr "Eislaufen"
+msgctxt "sport"
msgid "skiing"
msgstr "Skifahren"
+msgctxt "sport"
msgid "soccer"
msgstr "Fußball"
+msgctxt "sport"
msgid "swimming"
msgstr "Schwimmen"
+msgctxt "sport"
msgid "table_tennis"
msgstr "Tischtennis"
+msgctxt "sport"
msgid "tennis"
msgstr "Tennis"
@@ -18179,33 +19125,43 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Minigolfplatz bearbeiten"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Mehrfachnutzung"
msgid "Edit Multi"
msgstr "Mehrfach genutzten Sportplatz bearbeiten"
-msgid "type"
-msgstr "Typ"
-
+msgctxt "running"
msgid "pitch"
msgstr "Spielfeld"
+msgctxt "running"
msgid "sports_centre"
-msgstr "Sporthalle / Fitnesscenter"
+msgstr "Sportzentrum"
+msgctxt "running"
msgid "stadium"
msgstr "Stadion"
+msgctxt "running"
+msgid "track"
+msgstr "Laufbahn"
+
msgid "9pin"
msgstr "Kegeln"
msgid "Edit 9pin"
msgstr "Kegenbahn ändern"
+msgid "pitch"
+msgstr "Spielfeld"
+
+msgid "sports_centre"
+msgstr "Sporthalle / Fitnesscenter"
+
+msgid "stadium"
+msgstr "Stadion"
+
msgid "10pin"
msgstr "Bowling"
@@ -18239,6 +19195,22 @@ msgstr "Kanufahrtstrecke bearbeiten"
msgid "Edit Cycling"
msgstr "Radsporthalle oder -kurs bearbeiten"
+msgctxt "racing"
+msgid "pitch"
+msgstr "Bahn"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "Sportzentrum"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "Stadion"
+
+msgctxt "racing"
+msgid "track"
+msgstr "Strecke"
+
msgid "Dog Racing"
msgstr "Hunderennen"
@@ -18251,8 +19223,33 @@ msgstr "Reitplatz"
msgid "Edit Equestrian"
msgstr "Reitplatz bearbeiten"
-msgid "horse_riding"
-msgstr "Reiten"
+msgctxt "riding"
+msgid "pitch"
+msgstr "Reitfeld"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "Reithalle"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "Stadion"
+
+msgctxt "riding"
+msgid "track"
+msgstr "Reitbahn"
+
+msgid "clay"
+msgstr "Lehm"
+
+msgid "dirt"
+msgstr "Dreck"
+
+msgid "fine_gravel"
+msgstr "feiner Schotter"
+
+msgid "mud"
+msgstr "Schlick & Moor"
msgid "Horse Racing"
msgstr "Pferderennen"
@@ -18270,7 +19267,7 @@ msgid "Skating"
msgstr "Eislaufen"
msgid "Edit Skating"
-msgstr "Eislaufbahn bearbeiten"
+msgstr "Eislaufen bearbeiten"
msgid "ice_rink"
msgstr "Eisbahn"
@@ -18314,36 +19311,54 @@ msgstr "Schneepark"
msgid "Difficulty"
msgstr "Schwierigkeit"
+msgctxt "piste:difficulty"
msgid "novice"
msgstr "Anfänger"
+msgctxt "piste:difficulty"
msgid "easy"
msgstr "einfach"
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "mittelschwer"
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr "fortgeschritten"
+msgctxt "piste:difficulty"
msgid "expert"
msgstr "Experte"
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr "Freistil"
msgid "Grooming"
msgstr "Präparierung"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "Klassisch"
+msgctxt "piste:grooming"
msgid "mogul"
msgstr "Buckelpiste"
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "Eislaufen"
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr "Klassisch;Eislauf"
+msgctxt "piste:grooming"
msgid "scooter"
msgstr "Klassisch schmal"
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr "Tourenski"
@@ -18386,19 +19401,15 @@ msgstr "Gälische Spiele"
msgid "Edit Gaelic Games"
msgstr "Gälische Spiele bearbeiten"
-msgctxt "gaelic game"
msgid "Hurling"
msgstr "Hurling"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Fußball"
+msgstr "Football"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "Rounders"
@@ -18537,6 +19548,18 @@ msgstr "Modellflugplatz"
msgid "Edit Model Aerodrome"
msgstr "Modellflugplatz bearbeiten"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "Bahn"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "Sportzentrum"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "Bahn"
+
msgid "RC Car"
msgstr "RC-Modellauto"
@@ -18549,62 +19572,136 @@ msgstr "Zivilisationsbauten"
msgid "Edit Building"
msgstr "Gebäude bearbeiten"
+msgctxt "building"
+msgid "yes"
+msgstr "ja"
+
+msgctxt "building"
msgid "roof"
msgstr "Dach"
+msgctxt "building"
msgid "garage"
msgstr "Garage"
-msgid "church"
-msgstr "Kirche"
+msgctxt "building"
+msgid "garages"
+msgstr "Garagen"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "Industrie"
+msgctxt "building"
msgid "school"
msgstr "Schule"
+msgctxt "building"
msgid "hangar"
msgstr "Hangar"
+msgctxt "building"
msgid "commercial"
-msgstr "gewerblich"
+msgstr "Gewerblich"
+msgctxt "building"
msgid "farm"
msgstr "Bauernhof"
+msgctxt "building"
msgid "transportation"
msgstr "Transportwesen"
+msgctxt "building"
msgid "greenhouse"
msgstr "Gewächshaus"
+msgctxt "building"
msgid "office"
msgstr "Büro"
+msgctxt "building"
msgid "university"
msgstr "Universität"
+msgctxt "building"
+msgid "hospital"
+msgstr "Krankenhaus"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "Lagerhalle"
+
+msgctxt "building"
+msgid "retail"
+msgstr "Einzelhandel"
+
+msgctxt "building"
+msgid "shed"
+msgstr "Unterstand"
+
msgid "Residential Building"
msgstr "Wohngebäude"
msgid "Edit Residential Building"
msgstr "Wohngebäude bearbeiten"
+msgctxt "building"
+msgid "residential"
+msgstr "Wohngebäude"
+
+msgctxt "building"
msgid "apartments"
msgstr "Wohnungen"
+msgctxt "building"
msgid "house"
msgstr "Haus"
+msgctxt "building"
msgid "hut"
msgstr "Hütte"
+msgctxt "building"
+msgid "dormitory"
+msgstr "Studentenwohnheim"
+
+msgctxt "building"
msgid "terrace"
-msgstr "Reihenhaus"
+msgstr "Terrasse"
+msgctxt "building"
msgid "detached"
-msgstr "freistehendes Haus bzw. Einfamilienhaus"
+msgstr "freistehend"
-msgid "Tower"
-msgstr "Turm"
+msgid "Entrance"
+msgstr "Eingang"
+
+msgid "Edit Entrance"
+msgstr "Eingang bearbeiten"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "ja"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "Haupteingang"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "Dienstboteneingang"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "Ausgang"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "Notfall"
+
+msgid "Tower"
+msgstr "Turm"
msgid "Edit Tower"
msgstr "Turm bearbeiten"
@@ -18618,9 +19715,6 @@ msgstr "Kommunikation"
msgid "observation"
msgstr "Beobachtung"
-msgid "Height (meters)"
-msgstr "Höhe (in Meter)"
-
msgid "Flagpole"
msgstr "Fahnenmast"
@@ -18830,42 +19924,68 @@ msgstr "Betriebszeit"
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Messstation"
+msgid "Monitoring Station"
+msgstr "Beobachtungs-/Messstation"
-msgid "Edit Measurement Station"
-msgstr "Messstation bearbeiten"
+msgid "Edit Monitoring Station"
+msgstr "Beobachtungs-/Messstation bearbeiten"
-msgid "Measurement"
-msgstr "Messart"
+msgid "Monitoring:"
+msgstr "Beobachtung:"
-msgid "particulate_matter"
-msgstr "Feststoffe"
+msgid "Weather"
+msgstr "Wetter"
-msgid "seismic"
-msgstr "seismisch"
+msgid "Water level"
+msgstr "Pegel/Wasserstand"
-msgid "water_level"
-msgstr "Wasserstand"
+msgid "Tide Level"
+msgstr "Gezeitenhub"
-msgid "weather"
-msgstr "Wetter"
+msgid "Traffic"
+msgstr "Verkehr"
-msgid "Recording"
-msgstr "Aufnahmeart"
+msgid "Air Quality"
+msgstr "Luftqualität"
-msgid "manually"
-msgstr "manuell"
+msgid "Noise"
+msgstr "Lärm"
-msgid "automated"
-msgstr "automatisiert"
+msgid "GPS Signals"
+msgstr "GPS-Signale"
-msgid "remote"
-msgstr "ferngesteuert"
+msgid "GLONASS Signals"
+msgstr "GLONASS-Signale"
-msgctxt "display"
-msgid "no"
-msgstr "kein"
+msgid "Galileo Signals"
+msgstr "Galileo-Signale"
+
+msgid "Radiation"
+msgstr "Strahlung"
+
+msgid "Seismic Activity"
+msgstr "Seismische Aktivität"
+
+msgid "Recording:"
+msgstr "Aufzeichnung"
+
+msgid "Automated"
+msgstr "Automatisch"
+
+msgid "Manually"
+msgstr "Manuell"
+
+msgid "Remote"
+msgstr "Fernaufzeichnung"
+
+msgid "Display:"
+msgstr "Anzeige:"
+
+msgid "Analog"
+msgstr "Analog"
+
+msgid "Digital"
+msgstr "Digital"
msgid "Survey Point"
msgstr "Vermessungspunkt"
@@ -18873,7 +19993,7 @@ msgstr "Vermessungspunkt"
msgid "Edit Survey Point"
msgstr "Vermessungspunkt bearbeiten"
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr "Überwachungskamera"
msgid "Edit Surveillance Camera"
@@ -18885,12 +20005,104 @@ msgstr "im Gebäude"
msgid "outdoor"
msgstr "im Freien"
-msgid "public"
-msgstr "öffentlich"
+msgid "Zone"
+msgstr "Bereich"
+
+msgid "parking"
+msgstr "Parkplatz"
+
+msgid "traffic"
+msgstr "Verkehr"
+
+msgid "shop"
+msgstr "Geschäft"
+
+msgid "bank"
+msgstr "Bank"
+
+msgid "Camera"
+msgstr "Kamera"
+
+msgid "fixed"
+msgstr "fixiert"
+
+msgid "panning"
+msgstr "schwenkbar"
+
+msgid "dome"
+msgstr "Domkamera"
+
+msgid "Mounted on"
+msgstr "Befestigt an"
+
+msgid "ceiling"
+msgstr "Decke"
+
+msgid "Direction in degrees"
+msgstr "Richtung in Grad"
+
+msgid "Inclination in degrees"
+msgstr "Neigung in Grad"
+
+msgid "Height in meter (m)"
+msgstr "Höhe in Meter (m)"
msgid "Power"
msgstr "Energieversorgung"
+msgid "Power Plant"
+msgstr "Kraftwerk"
+
+msgid "Edit Power Plant"
+msgstr "Kraftwerk anpassen"
+
+msgid "Start date"
+msgstr "Startdatum"
+
+msgid "Output forms of energy"
+msgstr "Energieausgabeform"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+"(Wenn möglich, fügen Sie bitte diese Information über den Stromerzeuger "
+"hinzu)"
+
+msgid "electricity"
+msgstr "Elektrizität"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "Heißwasser"
+
+msgid "hot air"
+msgstr "Heißluft"
+
+msgid "cold water"
+msgstr "Kaltwasser"
+
+msgid "cold air"
+msgstr "Kaltluft"
+
+msgid "compressed air"
+msgstr "Druckluft"
+
+msgid "steam"
+msgstr "Dampf"
+
+msgid "vacuum"
+msgstr "Vacuum"
+
msgid "Power Generator"
msgstr "Stromgenerator"
@@ -18942,89 +20154,192 @@ msgstr "Wind"
msgid "Method"
msgstr "Methode"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "Anaerobe Gärung"
+msgstr "Biogasanlage"
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr "Staustufe"
+msgctxt "generator method"
msgid "combustion"
msgstr "Verbrennung"
-msgid "dam"
-msgstr "Damm"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "Bio / Kohle / Diesel / Gas / Benzin / Öl / Müll"
+msgctxt "generator method"
msgid "fission"
msgstr "Kernspaltung"
+msgctxt "generator method"
msgid "fusion"
-msgstr "Fusion"
+msgstr "Kernfusion"
+msgctxt "generator method"
msgid "gasification"
msgstr "Vergasung"
+msgid "biomass / waste"
+msgstr "Biomasse / Müll"
+
+msgctxt "generator method"
msgid "photovoltaic"
msgstr "Photovoltaik"
-msgid "pumped-storage"
-msgstr "Pumpspeicher"
-
-msgid "pumping"
-msgstr "Pumpen"
-
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "Thermische Zersetzung (Pyrolyse)"
+msgstr "Pyrolyse"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "Flußlauf"
+msgstr "Laufwasserkraftwerk"
+
+msgctxt "generator method"
+msgid "stream"
+msgstr "Fluss"
+msgctxt "generator method"
msgid "thermal"
-msgstr "Thermal"
+msgstr "thermisch"
-msgid "Output forms of energy"
-msgstr "Energieausgabeform"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "Pumpspeicherbecken"
-msgid "electricity"
-msgstr "Elektrizität"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "Speicherbecken"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Generatortyp"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr "kombinierter Zyklus"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "Gasverbrennung"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "Francis-Turbine"
-msgid "hot water"
-msgstr "Heißwasser"
+msgid "gas_turbine"
+msgstr "Gasturbine"
-msgid "hot air"
-msgstr "Heißluft"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "Biogas, Biomasse, Gas, Müllverbrennung"
-msgid "cold water"
-msgstr "Kaltwasser"
+msgid "heat_pump"
+msgstr "Wärmepumpe"
-msgid "cold air"
-msgstr "Kaltluft"
+msgid "horizontal_axis"
+msgstr "waagrechte Achse"
-msgid "compressed air"
-msgstr "Druckluft"
+msgid "tidal steam / wind"
+msgstr "Gezeiten- / Windkraftwerk"
-msgid "steam"
-msgstr "Dampf"
+msgid "kaplan_turbine"
+msgstr "Kaplan-Turbine"
-msgid "vacuum"
-msgstr "Vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "Laufwasser- / Pumpspeicher- / Gezeitenkraftwerk"
+
+msgid "pelton_turbine"
+msgstr "Pelton-Turbine"
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "Laufwasser- / Pumpspeicherkraftwerk"
+
+msgid "reciprocating_engine"
+msgstr "Kolbenmotor"
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "Biokraftstoff, Biogas, Diesel, Gas, Benzin"
+
+msgid "solar_photovoltaic_panel"
+msgstr "Photovoltaik-Panel"
+
+msgid "solar photovoltaic"
+msgstr "solare Photovoltaik"
+
+msgid "solar_thermal_collector"
+msgstr "thermischer Sonnenkollektor"
+
+msgid "solar thermal"
+msgstr "solarthermisch"
+
+msgid "steam_generator"
+msgstr "Dampferzeuger"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "Bio, Kohle, Diesel, Gas, Benzin, Öl, Müllverbrennung"
+
+msgid "steam_turbine"
+msgstr "Dampfturbine"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr "Geothermie / Solarthermie / Bio, Kohle, Öl, Müllverbrennung"
+
+msgid "stellarator"
+msgstr "Stellerator"
+
+msgid "nuclear fusion"
+msgstr "Kernfusion"
+
+msgid "tokamak"
+msgstr "Tokamak"
+
+msgid "vertical_axis"
+msgstr "vertikale Achse"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Siedewasserreaktor 1 (SWR-1)"
+
+msgid "nuclear fission"
+msgstr "Kernfusion"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Siedewasserreaktor 2 (SWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Siedewasserreaktor 3 (SWR-3)"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Siedewasserreaktor 4 (SWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Siedewasserreaktor 5 (SWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Siedewasserreaktor 6 (SWR-6)"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "CANada Deuterium Uranium-Reaktor (CANDU)"
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "Chinesischer Druckwasserreaktor (CPR-1000)"
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Europäischer Druckwasserreaktor (EPR)"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Trägheitsfusion"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Druckwasserreaktor (DWR)"
-msgid "battery charging"
-msgstr "Batterieaufladung"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgid "Power Station"
-msgstr "Umspannwerk"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgid "Edit Power Station"
-msgstr "Umspannwerk bearbeiten"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Wasser-Wasser-Energie-Reaktor (WWER)"
+
+msgid "Output forms of energy:"
+msgstr "Formen der abgegebenen Energie:"
msgid "Power Sub Station"
msgstr "Trafostation"
@@ -19035,6 +20350,21 @@ msgstr "Trafostation bearbeiten"
msgid "Line reference"
msgstr "Liniennummer"
+msgid "high"
+msgstr "hoch"
+
+msgid "medium"
+msgstr "mittel"
+
+msgid "low"
+msgstr "niedrig"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "Kabelverteilerschrank"
@@ -19050,6 +20380,9 @@ msgstr "Strommast bearbeiten"
msgid "Tower reference"
msgstr "Identifikation des Turms"
+msgid "steel"
+msgstr "Stahl"
+
msgid "Pole"
msgstr "Kleiner Freileitungsmast"
@@ -19068,13 +20401,11 @@ msgstr "Stromleitung bearbeiten"
msgid "Line type"
msgstr "Art der Stromleitung"
-msgctxt "Power Line"
msgid "line"
-msgstr "Freileitung (Starkstrom)"
+msgstr "Freileitung"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "Freileitung (Schwachstrom)"
+msgstr "Freileitung für Nieder- oder Mittelspannung"
msgid "Amount of Cables"
msgstr "Anzahl Leitungen"
@@ -19128,10 +20459,10 @@ msgid "Edit Palaeontological Site"
msgstr "Paläontologische Stätte bearbeiten"
msgid "Monument"
-msgstr "Baudenkmal"
+msgstr "monumentale Gedenkstätte"
msgid "Edit Monument"
-msgstr "Baudenkmal bearbeiten"
+msgstr "Monument bearbeiten"
msgid "Memorial"
msgstr "Gedenkstätte"
@@ -19181,11 +20512,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Kiosk bearbeiten"
-msgid "Baker"
-msgstr "Bäcker"
+msgid "Bakery"
+msgstr "Bäckerei"
-msgid "Edit Baker"
-msgstr "Bäcker bearbeiten"
+msgid "Edit Bakery"
+msgstr "Bäckerei bearbeiten"
msgid "Butcher"
msgstr "Fleischer"
@@ -19196,7 +20527,7 @@ msgstr "Fleischer bearbeiten"
msgid "Seafood"
msgstr "Fischhändler"
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr "Fischhändler bearbeiten"
msgid "Deli (Fine Food)"
@@ -19217,14 +20548,20 @@ msgstr "Marktplatz"
msgid "Edit Marketplace"
msgstr "Marktplatz bearbeiten"
+msgid "Organic"
+msgstr "Bioladen"
+
msgid "Greengrocer"
msgstr "Obst- und Gemüseladen"
msgid "Edit Greengrocer"
msgstr "Obst- und Gemüseladen bearbeiten"
-msgid "Organic"
-msgstr "Bioladen"
+msgid "Farm Stand"
+msgstr "Hofladen"
+
+msgid "Edit Farm Stand"
+msgstr "Hofladen bearbeiten"
msgid "Edit Organic/Bio"
msgstr "Organisch/Biologisch bearbeiten"
@@ -19295,8 +20632,8 @@ msgstr "Schneider ändern"
msgid "Fabric"
msgstr "Textilgeschäft"
-msgid "Edit Fabric"
-msgstr "Textilgeschäft bearbeiten"
+msgid "Edit Fabric Shop"
+msgstr "Autohaus bearbeiten"
msgid "Electronic"
msgstr "Elektronik"
@@ -19316,14 +20653,14 @@ msgstr "Elektronikgeschäft bearbeiten"
msgid "Mobile Phone"
msgstr "Mobiltelefon"
-msgid "Edit Mobile Phone"
-msgstr "Mobiltelefon bearbeiten"
+msgid "Edit Mobile Phone Shop"
+msgstr "Mobiltelefon-Geschäft bearbeiten"
msgid "Vacuum Cleaner"
msgstr "Staubsauger"
-msgid "Edit Vacuum Cleaner"
-msgstr "Staubsauger bearbeiten"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Staubsaugergeschäft bearbeiten"
msgid "Hifi"
msgstr "Hifi"
@@ -19331,9 +20668,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Hifi-Geschäft bearbeiten"
-msgctxt "shop"
msgid "Video"
-msgstr "Videoverleih"
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Videogeschäft bearbeiten"
@@ -19359,6 +20695,12 @@ msgstr "Wechselstube bearbeiten"
msgid "Edit Automated Teller Machine"
msgstr "Geldautomat bearbeiten"
+msgid "Pawnbroker"
+msgstr "Pfandleiher"
+
+msgid "Edit Pawnbroker"
+msgstr "Pfandleiher bearbeiten"
+
msgid "Department Store"
msgstr "Warenhaus"
@@ -19395,10 +20737,31 @@ msgstr "Juwelier"
msgid "Edit Jewelry"
msgstr "Juwelier bearbeiten"
+msgid "Gift"
+msgstr "Geschenk"
+
+msgid "Edit Gift Shop"
+msgstr "Geschenkartikelladen bearbeiten"
+
+msgid "buddhist"
+msgstr "buddhistisch"
+
+msgid "christian"
+msgstr "christlich"
+
+msgid "hindu"
+msgstr "hinduistisch"
+
+msgid "jewish"
+msgstr "jüdisch"
+
+msgid "muslim"
+msgstr "moslemisch"
+
msgid "Erotic"
msgstr "Erotikhandel"
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr "Erotikhandel bearbeiten"
msgid "Florist"
@@ -19428,8 +20791,8 @@ msgstr "Eisenwaren bearbeiten"
msgid "Paint"
msgstr "Farben"
-msgid "Edit Paint"
-msgstr "Farben bearbeiten"
+msgid "Edit Paint Shop"
+msgstr "Farbengeschäft bearbeiten"
msgid "Furniture"
msgstr "Möbel"
@@ -19440,20 +20803,20 @@ msgstr "Möbelgeschäft bearbeiten"
msgid "Kitchen"
msgstr "Küchenstudio"
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr "Küchenstudio bearbeiten"
msgid "Curtain"
msgstr "Gardinen"
-msgid "Edit Curtain"
-msgstr "Gardinen bearbeiten"
+msgid "Edit Curtain Shop"
+msgstr "Gardinen-Geschäft bearbeiten"
msgid "Frame"
msgstr "Bilderrahmen"
-msgid "Edit Frames"
-msgstr "Bilderrahmen bearbeiten"
+msgid "Edit Frames Shop"
+msgstr "Bilderrahmen-Geschäft bearbeiten"
msgid "Stationery"
msgstr "Bürobedarf"
@@ -19473,6 +20836,12 @@ msgstr "Buchhandlung"
msgid "Edit Book Store"
msgstr "Buchhandlung bearbeiten"
+msgid "Newsagent''s shop"
+msgstr "Zeitschriftengeschäft"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Zeitschriftengeschäft bearbeiten"
+
msgid "Travel Agency"
msgstr "Reisebüro"
@@ -19482,7 +20851,7 @@ msgstr "Reisebüro bearbeiten"
msgid "Musical Instrument"
msgstr "Musikhaus"
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr "Musikhaus bearbeiten"
msgid "Toys"
@@ -19563,6 +20932,9 @@ msgstr "Spielzeug"
msgid "vouchers"
msgstr "Karten/Belege"
+msgid "Note"
+msgstr "Kommentar"
+
msgid "Geography"
msgstr "Geografie"
@@ -19692,6 +21064,12 @@ msgstr "Bergspitze"
msgid "Edit Peak"
msgstr "Bergspitze bearbeiten"
+msgid "Saddle"
+msgstr "Sattelpunkt"
+
+msgid "Edit Saddle"
+msgstr "Sattelpunkt bearbeiten"
+
msgid "Glacier"
msgstr "Gletscher"
@@ -19731,24 +21109,33 @@ msgstr "Baum"
msgid "Edit Tree"
msgstr "Baum bearbeiten"
+msgid "broad_leaved"
+msgstr "Laubbaum"
+
+msgid "conifer"
+msgstr "Nadelbaum"
+
+msgid "palm"
+msgstr "Palme"
+
msgid "Botanical Name"
msgstr "Botanischer Name"
+msgid "Tree Row"
+msgstr "Baumreihe"
+
msgid "Wood"
msgstr "Naturwald"
msgid "Edit Wood"
msgstr "Naturwald bearbeiten"
-msgctxt "wood"
msgid "coniferous"
msgstr "Nadelwald"
-msgctxt "wood"
msgid "deciduous"
msgstr "Laubwald"
-msgctxt "wood"
msgid "mixed"
msgstr "Mischwald"
@@ -19758,15 +21145,6 @@ msgstr "Forst"
msgid "Edit Forest Landuse"
msgstr "Forst bearbeiten"
-msgid "coniferous"
-msgstr "Nadelwald"
-
-msgid "deciduous"
-msgstr "Laubwald"
-
-msgid "mixed"
-msgstr "Mischwald"
-
msgid "Grassland"
msgstr "Wiese/Grünland/Weideland"
@@ -19845,6 +21223,12 @@ msgstr "Wiese"
msgid "Edit Meadow Landuse"
msgstr "Wiese bearbeiten"
+msgid "Orchard"
+msgstr "Obstgarten"
+
+msgid "Edit Orchard Landuse"
+msgstr "Obstgarten bearbeiten"
+
msgid "Vineyard"
msgstr "Weinberg"
@@ -19899,7 +21283,7 @@ msgstr "Erholungsgebiet"
msgid "Edit Recreation Ground Landuse"
msgstr "Erholungsgebiet bearbeiten"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Wohngebiet"
msgid "Edit Residential Landuse"
@@ -19911,6 +21295,9 @@ msgstr "Kleiner Friedhof"
msgid "Edit Graveyard"
msgstr "Kleinen Friedhof bearbeiten"
+msgid "shinto"
+msgstr "schintoistisch"
+
msgid "Cemetery"
msgstr "Friedhof"
@@ -19986,6 +21373,33 @@ msgstr "Steinbruch bearbeiten"
msgid "Annotation"
msgstr "Anmerkung"
+msgid "Edit Name Information"
+msgstr "Namensinformationen bearbeiten"
+
+msgid "Alternative name"
+msgstr "Alternativer Name"
+
+msgid "Historical name"
+msgstr "Historischer Name"
+
+msgid "Local name"
+msgstr "Lokaler Name"
+
+msgid "Regional name"
+msgstr "Regionaler Name"
+
+msgid "National name"
+msgstr "Nationaler Name"
+
+msgid "International name"
+msgstr "Internationaler Name"
+
+msgid "Official name"
+msgstr "Offizieller Name"
+
+msgid "Common name abbreviation"
+msgstr "Übliche Namensabkürzung"
+
msgid "Edit Address Information"
msgstr "Adressinformationen bearbeiten"
@@ -20002,31 +21416,7 @@ msgid "City name"
msgstr "Ortsname"
msgid "Country code"
-msgstr "Länderkennung"
-
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
+msgstr "Ländercode"
msgid "Address Interpolation"
msgstr "Adressinterpolation"
@@ -20046,6 +21436,18 @@ msgstr "gerade"
msgid "alphabetic"
msgstr "alphabetisch"
+msgid "Accuracy"
+msgstr "Genauigkeit"
+
+msgid "actual"
+msgstr "exakt"
+
+msgid "estimate"
+msgstr "geschätzt"
+
+msgid "potential"
+msgstr "potentiell"
+
msgid "Contact (common schema)"
msgstr "Kontakt (übliche Methode)"
@@ -20208,27 +21610,56 @@ msgstr "Ende der Kontrolle"
msgid "traffic light or barrier that stops you"
msgstr "Weiterfahrt behindernde Ampel oder Barriere"
-msgid "Route (legacy)"
-msgstr "Route (legacy/veraltet)"
+msgid "General route"
+msgstr "Route (Allgemein)"
+
+msgid "Edit general route"
+msgstr "Allgemeine Route bearbeiten"
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr "Fahrrad"
-msgid "Edit Route (legacy)"
-msgstr "Route bearbeiten (legacy/veraltet)"
+msgctxt "route type"
+msgid "bus"
+msgstr "Bus"
+msgctxt "route type"
msgid "road"
msgstr "Straße"
+msgctxt "route type"
+msgid "ferry"
+msgstr "Fähre"
+
+msgctxt "route type"
msgid "ski"
msgstr "Ski"
+msgctxt "route type"
msgid "foot"
-msgstr "Fuß"
+msgstr "Fußweg"
+msgctxt "route type"
msgid "hiking"
-msgstr "Wandern"
+msgstr "Wanderweg"
+
+msgctxt "route type"
+msgid "tram"
+msgstr "Straßenbahn"
+msgctxt "route type"
msgid "detour"
msgstr "Umleitung"
+msgctxt "route type"
+msgid "railway"
+msgstr "Eisenbahn"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "U-Bahn"
+
msgid "Symbol description"
msgstr "Symbolbeschreibung"
@@ -20274,21 +21705,24 @@ msgstr "Vorwärts-Haltepunkt"
msgid "backward halt point"
msgstr "Rückwärts-Haltepunkt"
-msgid "Route network"
-msgstr "Liniennetz"
+msgid "Route Network"
+msgstr "Netzwerk"
-msgid "Edit route network"
-msgstr "Liniennetz bearbeiten"
+msgid "Edit Route Network"
+msgstr "Netzwerk bearbeiten"
msgid "member"
msgstr "Element"
-msgid "Associated street"
+msgid "Associated Street"
msgstr "Zugehörige Straße"
-msgid "Edit associated street"
+msgid "Edit Associated Street"
msgstr "Zugehörige Straße bearbeiten"
+msgid "house"
+msgstr "Haus"
+
msgid "Street"
msgstr "Straße"
@@ -20310,7 +21744,7 @@ msgstr "Andere zur Straße gehörnde Objekte"
msgid "Destination sign"
msgstr "Wegweiser"
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr "Wegweiser bearbeiten"
msgid "Destination written on sign (w/o distance)"
@@ -20406,18 +21840,27 @@ msgstr "Linien unter der Brücke"
msgid "way forming the outline footprint"
msgstr "Die Außenkante bildende Linien"
-msgid "nodes forming the outline"
-msgstr "Die Außenkante bildende Punkte"
+msgid "edge ways parallel to ''across''"
+msgstr "Kantenlinien parallel zur Brücke"
msgid "ways passing through the tunnel"
msgstr "Durch den Tunnel führende Linien"
+msgid "edge ways parallel to ''through''"
+msgstr "Kantenlinien parallel zum Tunnel"
+
msgid "bridge"
msgstr "Brücke"
msgid "deprecated"
msgstr "veraltet"
+msgid "bicycle"
+msgstr "Fahrrad"
+
+msgid "foot"
+msgstr "Fuß"
+
msgid "horse"
msgstr "Pferd"
@@ -20427,19 +21870,22 @@ msgstr "Barriere"
msgid "motorroad"
msgstr "Autostraße"
-msgid "highway_track"
+msgid "highway.track"
msgstr "Weg"
+msgid "livingdashed"
+msgstr "Spielstraße, Plattform"
+
msgid "services"
msgstr "Dienstleistungen"
msgid "ford"
msgstr "Furt"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr "Haltestelle"
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr "Notfallrettungspunkt"
msgid "riverbank"
@@ -20455,7 +21901,10 @@ msgid "rapids"
msgstr "Stromschnelle"
msgid "railwaypoint"
-msgstr "Eisenbahnpunkt"
+msgstr "Gleispunkt"
+
+msgid "raildashed"
+msgstr "Eisenbahn"
msgid "railyard"
msgstr "Gleisgelände"
@@ -20472,28 +21921,28 @@ msgstr "Alte Eisenbahn"
msgid "aeroway"
msgstr "Rollweg"
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr "Rollweg (dunkel)"
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr "Rollweg (hell)"
-msgid "piste_easy"
+msgid "piste.easy"
msgstr "Einfache Piste"
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr "Mittelschwere Piste"
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr "Fortgeschrittenenpiste"
-msgid "piste_expert"
+msgid "piste.expert"
msgstr "Expertenpiste"
-msgid "piste_freeride"
-msgstr "freie Piste"
+msgid "piste.freeride"
+msgstr "Free-Ride-Piste"
-msgid "piste_novice"
+msgid "piste.novice"
msgstr "Anfängerpiste"
msgid "power"
@@ -20514,20 +21963,20 @@ msgstr "Jachthafen"
msgid "amenity"
msgstr "Einrichtungen"
-msgid "amenity_traffic"
-msgstr "Verkehrseinrichtungen"
+msgid "amenity.traffic"
+msgstr "Transport-Einrichtungen"
-msgid "amenity_light"
+msgid "amenity.light"
msgstr "Einrichtungen (hell)"
-msgid "light_water"
-msgstr "Wasser (hell)"
+msgid "light.water"
+msgstr "Trinkwasser"
msgid "health"
msgstr "Gesundheit"
-msgid "shop"
-msgstr "Geschäft"
+msgid "office"
+msgstr "Büro"
msgid "hotel"
msgstr "Hotel"
@@ -20592,9 +22041,6 @@ msgstr "Heide"
msgid "woodarea"
msgstr "Waldfläche"
-msgid "mud"
-msgstr "Schlick & Moor"
-
msgid "beach"
msgstr "Strand"
@@ -20604,10 +22050,13 @@ msgstr "Route"
msgid "boundary"
msgstr "Grenze"
+msgid "sport"
+msgstr "Sport"
+
msgid "place"
msgstr "Ort"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr "Tiger-Daten"
msgid "address"
@@ -20622,9 +22071,6 @@ msgstr "Stadt"
msgid "One Way"
msgstr "Einbahnstraße"
-msgid "Church"
-msgstr "Kirche"
-
msgid "Fuel Station"
msgstr "Tankstelle"
@@ -20652,6 +22098,9 @@ msgstr "Brückenmerkmal auf einem Punkt"
msgid "wrong highway tag on a node"
msgstr "Falsches Straßenmerkmal auf einem Punkt"
+msgid "wrong crossing tag on a way"
+msgstr "Falscher Übergangs-Merkmal auf einem Weg"
+
msgid "Unnamed unclassified highway"
msgstr "Unbenannte klassenlose Straße"
@@ -20697,11 +22146,41 @@ msgstr "Ungewöhnliche Merkmalskombinationen (Straße und Wasser)"
msgid "unusual tag combination (highway & natural)"
msgstr "Ungewöhnliche Merkmalskombinationen (Straße und Natur)"
+msgid "unusual tag combination (landuse & building)"
+msgstr "Ungewöhnliche Merkmalskombinationen (Landnutzung und Gebäude)"
+
+msgid "unnecessary access key"
+msgstr "Unnötiger Schlüssel ''access''"
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "Unnötiges Merkmal ''motor_vehicle=yes''"
+
msgid "natural water used for swimming pool"
msgstr "Merkmal natural=water für Schwimmingpool genutzt"
-msgid "incline without highway"
-msgstr "Steigung ohne Straßenmerkmal"
+msgid "numerical key"
+msgstr "Numerischer Schlüssel"
+
+msgid "route_master relation without route_master=*"
+msgstr "Hauptroute-Relation ohne route_master=*"
+
+msgid "power line without voltage"
+msgstr "Stromleitung ohne Spannung"
+
+msgid "substation key without power=substation"
+msgstr "Schlüssel ''substation'' ohne Merkmal ''power=substation''"
+
+msgid "transformer key without power"
+msgstr "Schlüssel ''transformer'' ohne ''power''"
+
+msgid "missing substation=*"
+msgstr "Schlüssel ''substation'' fehlt"
+
+msgid "missing transformer=*"
+msgstr "Schlüssel ''transformer'' fehlt"
+
+msgid "incline without highway or railway"
+msgstr "Steigung ohne Straße/Eisenbahn"
msgid "junction without highway"
msgstr "Kreuzung ohne Straße"
@@ -20712,8 +22191,8 @@ msgstr "Fahrbahnen ohne Straße"
msgid "lcn without highway"
msgstr "Schlüssel ''lcn'' ohne Straßenmerkmal"
-msgid "lit without highway"
-msgstr "Beleuchtung ohne Straßenmerkmal"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "Beleuchtung ohne Straße/Eisenbahn/Parkplatz/Plattform"
msgid "living_street without highway"
msgstr "Spielstraße ohne Straßenmerkmal"
@@ -20730,8 +22209,8 @@ msgstr "Kraftfahrstraße ohne Straßenmerkmal"
msgid "ntd_id without highway"
msgstr "Schlüssel ''ntd_id'' ohne Straßenmerkmal"
-msgid "oneway without highway"
-msgstr "Einbahnstraße ohne Straße"
+msgid "oneway without highway or railway"
+msgstr "Einbahn ohne Straße/Eisenbahn"
msgid "sac_scale without highway"
msgstr "SAC-Wanderskala ohne Straße"
@@ -20770,61 +22249,61 @@ msgid "zip_right without highway"
msgstr "Schlüssel ''zip_right'' ohne Straßenmerkmal"
msgid "detail without railway"
-msgstr "Schlüssel ''detail'' ohne Eisenbahn"
+msgstr "Schlüssel ''detail'' ohne Gleise"
msgid "eddy_current_brake without railway"
-msgstr "Schlüssel ''eddy_current_brake'' ohne Eisenbahn"
+msgstr "Schlüssel ''eddy_current_brake'' ohne Gleise"
msgid "electrified without railway"
-msgstr "Schlüssel ''electrified'' ohne Eisenbahn"
+msgstr "Schlüssel ''electrified'' ohne Gleise"
msgid "etcs without railway"
-msgstr "Schlüssel ''etcs'' ohne Eisenbahn"
+msgstr "Schlüssel ''etcs'' ohne Gleise"
msgid "gauge without railway"
-msgstr "Schlüssel ''gauge'' ohne Eisenbahn"
+msgstr "Schlüssel ''gauge'' ohne Gleise"
msgid "grade_of_track without railway"
-msgstr "Schlüssel ''grade_of_track'' ohne Eisenbahn"
+msgstr "Schlüssel ''grade_of_track'' ohne Gleise"
msgid "kursbuchstrecke without railway"
-msgstr "Schlüssel ''kursbuchstrecke'' ohne Eisenbahn"
+msgstr "Schlüssel ''kursbuchstrecke'' ohne Gleise"
msgid "lzb without railway"
-msgstr "Schlüssel ''lzb'' ohne Eisenbahn"
+msgstr "Schlüssel ''lzb'' ohne Gleise"
msgid "old_railway_operator without railway"
-msgstr "Schlüssel ''old_railway_operator'' ohne Eisenbahn"
+msgstr "Schlüssel ''old_railway_operator'' ohne Gleise"
msgid "operating_procedure without railway"
-msgstr "Schlüssel ''operating_procedure'' ohne Eisenbahn"
+msgstr "Schlüssel ''operating_procedure'' ohne Gleise"
msgid "pzb without railway"
-msgstr "Schlüssel ''pzb'' ohne Eisenbahn"
+msgstr "Schlüssel ''pzb'' ohne Gleise"
msgid "radio without railway"
-msgstr "Schlüssel ''radio'' ohne Eisenbahn"
+msgstr "Schlüssel ''radio'' ohne Gleise"
msgid "structure_gauge without railway"
-msgstr "Schlüssel ''structure_gauge'' ohne Eisenbahn"
+msgstr "Schlüssel ''structure_gauge'' ohne Gleise"
msgid "tilting_technologie without railway"
-msgstr "Schlüssel ''tilting_technologie'' ohne Eisenbahn"
+msgstr "Schlüssel ''tilting_technologie'' ohne Gleise"
msgid "track_class without railway"
-msgstr "Schlüssel ''track_class'' ohne Eisenbahn"
+msgstr "Schlüssel ''track_class'' ohne Gleise"
msgid "tracks without railway"
-msgstr "Schlüssel ''tracks'' ohne Eisenbahn"
+msgstr "Schlüssel ''tracks'' ohne Gleise"
msgid "traffic_mode without railway"
-msgstr "Schlüssel ''traffic_mode'' ohne Eisenbahn"
+msgstr "Schlüssel ''traffic_mode'' ohne Gleise"
msgid "usage without railway"
-msgstr "Schlüssel ''usage'' ohne Eisenbahn"
+msgstr "Schlüssel ''usage'' ohne Gleise"
msgid "workrules without railway"
-msgstr "Schlüssel ''workrules'' ohne Eisenbahn"
+msgstr "Schlüssel ''workrules'' ohne Gleise"
msgid "stream without waterway"
msgstr "Bach ohne Wasserweg"
@@ -20847,21 +22326,135 @@ msgstr "Kanal ohne Wasserweg"
msgid "have_riverbank without waterway"
msgstr "Schlüssel ''have_riverbank'' ohne Wasserstraße"
-msgid "tunnel without highway/railway/waterway"
-msgstr "Tunnel ohne Straße, Wasserstraße oder Eisenbahn"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "Tunnel ohne Straße/Eisenbahn/Wasserweg/Plattform/Pipeline"
-msgid "bridge without highway/railway/waterway"
-msgstr "Brücke ohne Straße/Eisenbahn/Wasserweg"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "Brücke ohne Straße/Eisenbahn/Wasserweg/Piste/Pipeline"
-msgid "psv without highway/railway/waterway"
-msgstr "Schlüssel ''psv'' ohne Straße, Wasserstraße oder Eisenbahn"
+msgid "psv without highway/railway/waterway/parking"
+msgstr "Schlüssel ''psv'' ohne Straße/Eisenbahn/Wasserweg/Parkplatz"
-msgid "width without highway/railway/waterway/aeroway"
+msgid "width without physical linear feature"
+msgstr "Breite ohne physische Linie"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-"Schlüssel ''width'' ohne Straße, Wasserstraße, Eisenbahn oder Rollweg"
+"Schlüssel ''maxspeed'' ohne Straße/Eisenbahn/Verkehrsschild/Verkehrskontrolle"
+
+msgid "fence_type without barrier=fence"
+msgstr "Zauntyp ohne Zaun"
+
+msgid "border_type without boundary"
+msgstr "Grenztyp ohne Grenze"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "Recycling-Typ ohne Recycling"
+
+msgid "board_type without information=board"
+msgstr "Tafel-Typ ohne Informationstafel"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "Unterstands-Typ ohne Unterstand"
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "Lampen-Typ ohne Straßenlampe"
+
+msgid "map_type without information=map"
+msgstr "Karten-Typ ohne Karte"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "Typ ohne Ausgrabungsstelle"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "Typ ohne Kunstausstellung"
+
+msgid "castle_type without historic=castle"
+msgstr "Typ ohne Burg/Schloss"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "Typ ohne Speicherbecken"
+
+msgid "bunker_type without military=bunker"
+msgstr "Typ ohne Bunker"
+
+msgid "source:addr without addr:*"
+msgstr "Schlüssel ''source:addr'' ohne Adresse (addr:*)"
+
+msgid "source:date without source"
+msgstr "Schlüssel ''source:date'' ohne Quellenangabe (source)"
+
+msgid "source:name without name"
+msgstr "Schlüssel ''source:name'' ohne Namen (name)"
+
+msgid "source:maxspeed without maxspeed"
+msgstr "Schlüssel ''source:maxspeed'' ohne Höchstgeschwindigkeit (maxspeed)"
+
+msgid "source:building without building"
+msgstr "Schlüssel ''source:building'' ohne Gebäude (building)"
+
+msgid "source:ref without ref"
+msgstr "Schlüssel ''source:ref'' ohne Referenz (ref)"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "Schlüssel ''maxspeed'' ohne Straße, Eisenbahn oder Verkehrsschild"
+msgid "source:population without population"
+msgstr "Schlüssel ''source:population'' ohne Einwohnerzahl (population)"
+
+msgid "source:geometry on a node"
+msgstr "Schlüssel ''source:geometry'' auf einem Punkt"
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+"Schlüssel ''source:[addr:]postcode'' ohne Postleitzahl (addr:postcode)"
+
+msgid "source:postal_code without addr:postcode"
+msgstr "Schlüssel ''source:postal_code'' ohne Postleitzahl (addr:postcode)"
+
+msgid "source:ele without ele"
+msgstr "Schlüssel ''source:ele'' ohne Höhenangabe (ele)"
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "Schlüssel ''source:ref:INSEE'' ohne Schlüssel ''ref:INSEE''"
+
+msgid "source:lit without lit"
+msgstr "Schlüssel ''source:lit'' ohne Beleuchtung (lit)"
+
+msgid "source:hgv without hgv"
+msgstr "Schlüssel ''source:hgv'' ohne LKW (hgv)"
+
+msgid "source:outline on a node"
+msgstr "Schlüssel ''source:outline'' an einem Punkt"
+
+msgid "source:highway without highway"
+msgstr "Schlüssel ''source:highway'' ohne Straßenmerkmal (highway)"
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr "Schlüssel ''source:maxaxleload'' ohne max. Achslast (maxaxleload)"
+
+msgid "source:surface without surface"
+msgstr "Schlüssel ''source:surface'' ohne Oberfläche (surface)"
+
+msgid "source:bridge without bridge"
+msgstr "Schlüssel ''source:bridge'' ohne Brücke (bridge)"
+
+msgid "source:old_name without old_name"
+msgstr "Schlüssel ''source:old_name'' ohne alten Namen (old_name)"
+
+msgid "source:bicycle without bicycle"
+msgstr "Schlüssel ''source:bicycle'' ohne Fahrrad (bicycle)"
+
+msgid "source:designation without designation"
+msgstr ""
+"Schlüssel ''source:designation'' ohne ''Anlieger frei'' (designation)"
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+"Schlüssel ''source:[addr:]housenumber'' ohne Hausnummer (addr:housenumber)"
+
+msgid "source:height without height"
+msgstr "Schlüssel ''source:height'' ohne Höhenangabe (height)"
+
+msgid "source:lanes without lanes"
+msgstr "Schlüssel ''source:lanes'' ohne Fahrspuren (lanes)"
msgid "religion without denomination"
msgstr "Religion ohne Konfession"
@@ -20881,26 +22474,79 @@ msgstr ""
"kein Sprachkürzel in ''wikipedia''-Merkmal, "
"''wikipedia''=''Sprache:Artikel'' wird empfohlen"
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr "unbekanntes Sprachkürzel in ''wikipedia''-Merkmal"
-msgid "Landsat"
-msgstr "LandSat"
+msgid "layer should be between -5 and 5"
+msgstr "Ebene sollte zwischen -5 und 5 liegen"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr "Stockwerk sollte numerisch sein (ggf. mit .5 Zwischenschritten)"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"Höhe: Meter ist Standardeinheit; Punkt als Dezimaltrennzeichen; Leerzeichen "
+"vor Einheit"
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"Max. Höhe: Meter ist Standardeinheit; Punkt als Dezimaltrennzeichen; "
+"Leerzeichen vor Einheit"
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"Breite: Meter ist Standardeinheit; Punkt als Dezimaltrennzeichen; "
+"Leerzeichen vor Einheit"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"Max. Breite: Meter ist Standardeinheit; Punkt als Dezimaltrennzeichen; "
+"Leerzeichen vor Einheit"
+
+msgid "unusual maxspeed format"
+msgstr "Ungewöhnliches Format für Höchstgeschwindigkeit"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+"Spannung sollte in Volt ohne Einheitensymbol oder Leerzeichen angegeben "
+"werden"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "OSM-Inspektor: Reduktionsroboter"
+msgid "unusual frequency specification"
+msgstr "Ungewöhnliche Frequenz-Angabe"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+"Ungewöhnliche Spurweite; Bitte Einheit mm ohne Trennzeichen verwenden"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "Ungewöhnliche Steigung; Bitte Angaben in Prozent/Grad oder up/down"
+
+msgid "Landsat"
+msgstr "Landsat"
msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgstr "Yahoo-Satelitenbilder"
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr "Bing-Satelitenbilder"
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
msgid "MapBox Satellite"
-msgstr "MapBox Satellite"
+msgstr "MapBox-Satellitenbilder"
msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open Aerial"
+msgstr "MapQuest offene Luftbilder"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS-Spuren"
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
@@ -20908,50 +22554,41 @@ msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Schwarz/Weiß)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "Skobbler Aktivitätskarte"
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr "Fahrradkarte"
msgid "MapQuest OSM"
msgstr "MapQuest OSM"
msgid "Public Transport (ÖPNV)"
-msgstr "Öffentlicher Nahverkehr (ÖPNV)"
+msgstr "Öffentlicher Transport (ÖPNV)"
msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (Deutscher Stil)"
-msgid "Streets NRW Geofabrik.de"
-msgstr "Straßen NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Wandern & Radfahren"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbische Sprache)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Deutsche Sprache)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "OpenPT-Karte (Overlay)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Kambodscha, Laos, Thailand, Vietnam - zweisprachig"
-msgid "Bavaria (2 m)"
-msgstr "Bayern (2 m)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (40 cm)"
-msgstr "Hamburg (40 cm)"
-
-msgid "Hamburg (DK5)"
-msgstr "Hamburg (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI Schwarz/Weiß 2.5m"
msgid "Geoimage.at MaxRes"
-msgstr "Geoimage.at MaxRes"
+msgstr "Geoimage.at Höchste Auflösung"
+
+msgid "basemap.at"
+msgstr "basemap.at"
msgid "Graz: Basiskarte (base map)"
-msgstr "Graz: Basiskarte (base map)"
+msgstr "Graz: Basiskarte"
msgid "Tiris: DGM (Terrain model)"
msgstr "Tiris: DGM (Geländemodell)"
@@ -20966,115 +22603,181 @@ msgid "Vienna: Beschriftungen (annotations)"
msgstr "Wien: Beschriftungen"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Wien: Orthofoto"
+msgstr "Wien: Luftbilder"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Kanton Aargau 25 cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Stadt Uster Orthophoto 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Stadtplan Zürich"
-msgstr "Stadtplan Zürich"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Geländemodell)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Kanton Solothurn 12,5 cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Oberflächenmodell)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn 12,5 cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Geobase-Gewässernetz"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn Infrarot 12,5 cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Geobase-Straßen"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Kanton Genf 5 cm (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Kanton Neuenburg 50 cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Kanton Jura 50 cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr "Tschechisches CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Kanton Freiburg 50 cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Tschechisches UHUL:Luftbild"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10 cm/25 cm (2008)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Dänemark)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25 cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Dänemark)"
-msgid "Geobase Hydrography"
-msgstr "Geobase Hydrography"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Dänemark)"
-msgid "Geobase Roads"
-msgstr "Geobase Roads"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estland - Grundkarte (Maaamet)"
-msgid "Canvec"
-msgstr "Canvec"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estland - Luftbild (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr "British Columbia Mosaik"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estland - Mehrzweck (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr "MSR Maps Topo"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgid "MSR Maps Urban"
-msgstr "MSR Maps Urban"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "USGS Scanned Topographic Maps"
-msgstr "USGS Gescannte Topographische Karten"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "USGS Large Scale Imagery"
-msgstr "USGS Großmaßstäbige Bilder"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "OSM US TIGER 2012 Roads Overlay"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "Czech CUZK:KM"
-msgstr "Tschechien CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Tschechien UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
-msgid "7th Series (OS7)"
-msgstr "7. Serie (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition (historisch)"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Luftbilder 2000"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData-StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Luftbilder 2010-2012"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData-Locator"
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
-msgid "Surrey Air Survey"
-msgstr "Surrey Luftvermesung"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Luftbilder 2012 - 20 cm"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-inch Scotland 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Luftbildplan 2011"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Luftbildplan 2007"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Luftbilder 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Luftbilder 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Luftbilder 1999 -"
+" 1 m"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Straßen-NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Rad- und Wanderkarte (Hike & Bike)"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (sorbisch)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (deutsch)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT-Karte (Überlagerung)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Bayern (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Erlangen 2013 Luftbild (6,25 cm)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Erlangen 2011 Luftbild (5,0 cm)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+"Alte Karte von Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Alte Karte Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Luftbilder (Haiti)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Irland Britishes Kriegsministerium Ein-Zoll 1941-43 GSGS 4136"
+msgstr "Irland Britisches Kriegs-Büro 1 Zoll 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Irland Bartholomew Vietelzoll 1940"
+msgstr "Irland Bartholomäus Viertel-Zoll 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Irland EEA GMES Urban Atlas"
+msgstr "Irland EEA GMES Städtischer Atlas"
msgid "Ireland EEA CORINE 2006"
msgstr "Irland EEA CORINE 2006"
msgid "Lodi - Italy"
-msgstr "Lodi (Lauden) - Italien"
+msgstr "Lodi - Italien"
msgid "Lombardia - Italy (CTR)"
msgstr "Lombardei - Italien (CTR)"
@@ -21083,67 +22786,70 @@ msgid "Sicily - Italy"
msgstr "Sizilien - Italien"
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Italy"
+msgstr "PCN 2006 - Italien"
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio+Umbria"
+msgstr "PCN 2008 - Italien, Latium+Umbrien"
msgid "USSR - Latvia"
-msgstr "UdSSR - Lettland"
+msgstr "Lettland"
msgid "50cm ortho - Latvia"
-msgstr "50 cm Luftbild - Lettland"
+msgstr "50cm-Luftbilder - Lettland"
msgid "20cm ortho - Coastline"
-msgstr "20 cm Luftbild - Küstenlinie"
+msgstr "20cm-Luftbilder - Lettland Küstenlinie"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Litauen)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger-Delta Oktober 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinan/Bulacan (Philippinen hochaufgelöst)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
+
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Autokarte"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Wanderkarte"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Radkarte"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Skikarte"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - Orthofotos 2010-2012"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katasterkarte Slowakei (KaPor, 2010-04)"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katasterkarte Slowakei (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr "Toulouse - Orthophotoplan 2011"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slowakei EEA GMES Städtischer Atlas"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slowakei EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Orthophotos 2008-2010"
+msgid "Slovakia Historic Maps"
+msgstr "Slowakei Historische Karten"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Luftbilder 2008"
+msgid "South Africa CD:NGI Aerial"
+msgstr "Südafrika CD:NGI Luftbilder"
msgid "Catastro Spain"
-msgstr "Kataster Spanien"
+msgstr "Katasterkarte Spanien"
msgid "PNOA Spain"
-msgstr "PNOA-Spanien"
+msgstr "PNOA Spanien"
msgid "SIGPAC Spain"
msgstr "SIGPAC Spanien"
@@ -21152,94 +22858,154 @@ msgid "GRAFCAN - Canary Islands"
msgstr "GRAFCAN - Kanarische Inseln"
msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castile und León"
+msgstr "ITACyL - Kastilien und León"
msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Balearen"
-
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estland Basiskarte (Maaamet)"
+msgstr "IDEIB - Balearische Inseln"
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estland Luftbild (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25 cm (AGIS 2011)"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estland Multi (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stadt Uster Luftbilder 2008 10 cm"
-msgid "ORT10LT (Lithuania)"
-msgstr "ORT10LT (Litauen)"
+msgid "Stadtplan Zürich"
+msgstr "Stadtplan Zürich"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Dänemark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12,5 cm (SOGIS 2007)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dänemark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12,5 cm (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dänemark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12,5 cm (SOGIS 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipinen HiRes)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Kanton Genf 5 cm (SITG 2011)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Kanton Neuenburg 50 cm (SITN 2006)"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Kanton Jura 50 cm (RCJU 1998)"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Kambodscha, Laos, Thailand, Vietnam zweisprachig"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Kanton Freiburg 50 cm (2005)"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr "Niger Delta Oct 2012 Landsat"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stadt Bern 10 cm/25 cm (2008)"
-msgid "South Africa CD:NGI Aerial"
-msgstr "Südafrika CD:NGI Luftbild"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Luftbilder Yverdon-les-Bains 25 cm (2007)"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Auto"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Stadt Nyon - Luftbilder 2010 HD 5 cm/pi"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Wandern"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Luftbilder 2012"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Rad"
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Luftbilder 2012"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Ski"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Luftbilder 2012"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katasterkarte Slowakei (KaPor, 2010-04)"
+msgid "MSR Maps Topo"
+msgstr "MSR-Karten topographisch"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katasterkarte Slowakei (KaPor, 2011-05)"
+msgid "MSR Maps Urban"
+msgstr "MSR-Karten städtisch"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slowakei EEA GMES Stadtkarte"
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS eingescannte topographische Karten"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slowakei EEA CORINE 2006"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Groß skalierte Bilder"
-msgid "Slovakia Historic Maps"
-msgstr "Historische Karten Slowakei"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Straßen"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI schwarzweiß 2,5 m"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Neue & falsch ausgerichtete TIGER-Straßen (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Tiger-Änderungskarte"
+msgstr "OSM - Tiger bearbeitete Karte"
+
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Luftbilder"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ukraine - Luftbilder 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr "OS Neue Popular Ausgabe historisch"
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
+
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
+
+msgid "Surrey Air Survey"
+msgstr "Surrey Luftbilder"
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6 Zoll Schottland 1842-82"
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1. Ausgabe 1937-61"
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1 Zoll 7. Ausgabe 1955-61"
msgid "OS 1:25k historic (OSM)"
msgstr "OS 1:25k historisch (OSM)"
msgid "OS Scottish Popular historic"
-msgstr "OS Schottland Popular historisch"
+msgstr "OS Schottisch Popular historisch"
-msgid "Stuttgart (Luftbild)"
-msgstr "Stuttgart (Luftbild)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomäus Halb-Zoll, 1897-1907"
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "OS Stadtpläne, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "OSM-Export"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Verkehrsdaten in SUMO-Netzwerk-Datei exportieren."
+
+msgid "SUMO Export"
+msgstr "SUMO-Export"
+
+msgid "Export"
+msgstr "Exportieren"
+
+msgid "Port:"
+msgstr "Schnittstelle:"
+
+msgid "refresh the port list"
+msgstr "Schnittstellenliste aktualisieren."
+
+msgid "Configure"
+msgstr "Einstellen"
+
+msgid "Connection Error."
+msgstr "Verbindungsfehler."
+
+msgid "configure the connected DG100"
+msgstr "Angeschlossenen DG100 einstellen"
-msgid "2u"
-msgstr "2u"
+msgid "delete data after import"
+msgstr "Daten nach Import löschen"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-Dateien"
@@ -21452,6 +23218,18 @@ msgstr "Höhenprofil anzeigen"
msgid "Elevation Profile"
msgstr "Höhenprofil"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Höhengitterebene (experimentell!)"
+
+msgid "Shows elevation grid layer"
+msgstr "Zeigt die Höhengitterebene an"
+
+msgid "Elevation Grid"
+msgstr "Höhengitter"
+
+msgid "No SRTM data"
+msgstr "Keine SRTM-Daten"
+
msgid "Open the elevation profile window."
msgstr "Das Fenster mit Höhenprofil öffnen."
@@ -21473,14 +23251,8 @@ msgstr "Steigung"
msgid "Time"
msgstr "Dauer"
-msgid "Geoid"
-msgstr "GeoID"
-
-msgid "Automatic"
-msgstr "Automatisch"
-
-msgid "Fixed value"
-msgstr "Fester Wert"
+msgid "Tracks"
+msgstr "Spuren"
msgid "Elevation profile for track ''{0}''."
msgstr "Höhenprofil für Spur ''{0}''."
@@ -21756,9 +23528,15 @@ msgstr "Unvollständige Adressen auswählen"
msgid "Selects all addresses with incomplete data."
msgstr "Alle Adressen mit fehlenden Daten auswählen."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Merkmal 'addr:street' oder 'addr:place' verwenden"
+
msgid "House Number Editor"
msgstr "Hausnummerneditor"
+msgid "House number increment:"
+msgstr "Hausnummern-Schrittweite"
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Eigenschaften von bis zu {0} Objekt aktualisieren"
@@ -21784,6 +23562,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Ebenen-Eigenschaften"
+msgid "Error while creating image layer: {0}"
+msgstr "Fehler beim Erstellen der Bildebene: {0}"
+
msgid "Import image"
msgstr "Bild importieren"
@@ -21862,9 +23643,21 @@ msgstr "Öffnet ein OSM-Inspektor-Auswahlfenster"
msgid "Current Selected Bug Info"
msgstr "Aktuell ausgewählte Fehlerinformation"
+msgid "Prev OSMI bug"
+msgstr "Vorheriger OSMI-Fehler"
+
+msgid "Next OSMI bug"
+msgstr "Nächster OSMI-Fehler"
+
msgid "Osm Inspector Bugs"
msgstr "OsmInspector-Fehler"
+msgid "OSM Inspector Bugs"
+msgstr "OSM-Inspektor-Fehler"
+
+msgid "Selected Bug Info"
+msgstr "Fehlerinformation wählen"
+
msgid "Handy Address Interpolation Functions"
msgstr "Praktische Funktionen zur Adressinterpolation"
@@ -21953,8 +23746,8 @@ msgstr "Ungerade Hausnummern erwartet"
msgid "Expected even numbers for addresses"
msgstr "Gerade Hausnummern erwartet"
-msgid "Expected valid number for address increment"
-msgstr "Erwartete gültige Zahl für Adresserhöhung"
+msgid "Expected valid number for increment"
+msgstr "Gültige Zahl für Schrittweite erwartet"
msgid "Country code must be 2 letters"
msgstr "Ländercode muss aus 2 Buchstaben bestehen"
@@ -22330,15 +24123,6 @@ msgstr "Hausnummer:"
msgid "Street Name:"
msgstr "Straße:"
-msgid "Increment"
-msgstr "Erhöhen"
-
-msgid "Decrement"
-msgstr "Reduzieren"
-
-msgid "Numbers:"
-msgstr "Hausnummern:"
-
msgid "Big buildings mode"
msgstr "Modeus Große Gebäude"
@@ -22532,6 +24316,9 @@ msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren"
msgid "Use \"Tableau d''assemblage\""
msgstr "Nutze \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr "Nur graue Schatten durch weiße Farbe ersetzen"
+
msgid "Select first WMS layer in list."
msgstr "Erste WMS-Ebene in Liste wählen."
@@ -22551,12 +24338,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "hoch"
-
-msgid "medium"
-msgstr "mittel"
-
msgid "symbol"
msgstr "Symbol"
@@ -22708,6 +24489,11 @@ msgstr ""
"Das \"Tableau(x) d''assemblage\" in die Liste der zu holenden Katasterseiten "
"aufnehmen."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Graustufen durch weiße Farbe ersetzen (geringere Dateigröße und "
+"Speicherverbrauch)"
+
msgid "Display crosspieces:"
msgstr "Anzeige der Querstücke:"
@@ -22728,6 +24514,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Aktivieren, um den Schlüssel \"addr:street\" auf Punkten zu nutzen."
+msgid "Unexpected file extension. {0}"
+msgstr "Unerwartete Dateiendung. {0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "Merkmal \"source=...\" zu Elementen hinzufügen?"
@@ -22819,54 +24608,6 @@ msgstr ""
"Dieses Bild enthält georeferenzierte Daten.\n"
"Wollen Sie sie benutzen?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Klicke in die erste Ecke um das Bild zu beschneiden.\n"
-"(Es werden zwei Punkte benötigt.)"
-
-msgid "Image cropping"
-msgstr "Bild beschneiden"
-
-msgid "Click second corner for image cropping"
-msgstr "Klicke in die zweite Ecke um das Bild zu beschneiden."
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Klicke zur Georeferenzierung auf das erste Lambert-Kreuz.\n"
-"(Es werden zwei Punkte benötigt.)"
-
-msgid "Image georeferencing"
-msgstr "Bild georeferenzieren"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Klicken Sie auf das zweite Lambert-Kreuzstück zur Georeferenzierung"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Wollen Sie komplett abbrechen,\n"
-"oder es erneut versuchen "
-
-msgid "Enter cadastre east,north position"
-msgstr "Bitte die Cadastre Ost,Nord-Position eingeben"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Achtung: Pfeil muss nach Norden zeigen!)"
-
-msgid "East"
-msgstr "Ost"
-
-msgid "I use the mouse"
-msgstr "Benutzung der Maus"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Setze {0} Lambert-Koordinaten"
-
msgid "Load layer from cache"
msgstr "Ebene aus Zwischenspeicher laden"
@@ -22925,20 +24666,83 @@ msgstr "Eine neue Ebene hinzufügen"
msgid "Open Cadastre Preferences"
msgstr "Open Cadastre Einstellungen"
-msgid "Reset cookie"
-msgstr "Cookie zurücksetzen"
+msgid "Refine georeferencing"
+msgstr "Georeferenzierung verfeinern"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Georeferenzierung verbessern (nur Rasterbilder)"
+
+msgid "Reset cookie"
+msgstr "Cookie zurücksetzen"
+
+msgid "Get a new cookie (session timeout)"
+msgstr "Einen neuen Cookie holen (Sitzung abgelaufen)"
+
+msgid "Save image as..."
+msgstr "BIld speichern unter ..."
+
+msgid "PNG files (*.png)"
+msgstr "PNG-Bilder (*.png)"
+
+msgid "GeoTiff files (*.tif)"
+msgstr "GeoTiff-Dateien (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Bild exportieren (nur Rasterbilder)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Klicke in die erste Ecke um das Bild zu beschneiden.\n"
+"(Es werden zwei Punkte benötigt.)"
+
+msgid "Image cropping"
+msgstr "Bild beschneiden"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Klicke zur Georeferenzierung auf das erste Lambert-Kreuz.\n"
+"(Es werden zwei Punkte benötigt.)"
+
+msgid "Image georeferencing"
+msgstr "Bild georeferenzieren"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Wollen Sie komplett abbrechen,\n"
+"oder es erneut versuchen "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Es wurden nicht alle Koordinaten korrekt erfasst. Bitte erneut versuchen."
+
+msgid "Enter cadastre east,north position"
+msgstr "Bitte die Cadastre Ost,Nord-Position eingeben"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Achtung: Pfeil muss nach Norden zeigen!)"
+
+msgid "East"
+msgstr "Ost"
-msgid "Get a new cookie (session timeout)"
-msgstr "Einen neuen Cookie holen (Sitzung abgelaufen)"
+msgid "I use the mouse"
+msgstr "Benutzung der Maus"
-msgid "Save image as PNG"
-msgstr "Bild als PNG speichern"
+msgid "Set {0} Lambert coordinates"
+msgstr "Setze {0} Lambert-Koordinaten"
-msgid "PNG files (*.png)"
-msgstr "PNG-Bilder (*.png)"
+msgid "Click second corner for image cropping"
+msgstr "Klicke in die zweite Ecke um das Bild zu beschneiden."
-msgid "Export as PNG format (only raster images)"
-msgstr "Im PNG-Format exportieren (nur Pixelgrafiken)"
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Klicken Sie auf das zweite Lambert-Kreuzstück zur Georeferenzierung"
msgid "Adjust WMS"
msgstr "WMS justieren"
@@ -22965,8 +24769,11 @@ msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen"
msgid "Is not vectorized."
msgstr "Ist nicht vektorisiert."
-msgid "Raster size: {0}"
-msgstr "Rastergröße: {0}"
+msgid "Bounding box: {0}"
+msgstr "Rahmen: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Bildgröße (px): {0}/{1}"
msgid "Is vectorized."
msgstr "Ist vektorisiert."
@@ -23020,7 +24827,7 @@ msgstr "Das ausgewählte Farbschema aus der Liste löschen."
msgid "Color Schemes"
msgstr "Farbschemata"
-msgid "Adress"
+msgid "Address"
msgstr "Adresse"
msgid "Split area"
@@ -23070,6 +24877,9 @@ msgstr ""
"Bitte 1 oder mehr Linien auswählen entlang welchen das Herunterladen "
"erfolgen soll"
+msgid "Download from OSM along selected ways"
+msgstr "OSM-Daten entlang gewählter Wege herunterladen"
+
msgid "{0} intermediate nodes to download."
msgstr "{0} Zwischenpunkte herunterzuladen."
@@ -23145,6 +24955,71 @@ msgstr "Neues Werkzeug..."
msgid "Install"
msgstr "Installieren"
+msgid "Public"
+msgstr "Öffentlich"
+
+msgid "Could not get server response, check logs"
+msgstr "Keine Serverantwort erhalten, Bitte Loginformationen prüfen"
+
+msgid "Failed to login as {0}:"
+msgstr "Fehler beim Anmelden als {0}:"
+
+msgid "The server did not return user ID"
+msgstr "Der Server hat keine Benutzerkennung zurückgeliefert"
+
+msgid "Failed to send message:"
+msgstr "Fehler beim Senden der Nachricht:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Fehler beim Holen der Nachrichten als {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "GeoChat-Anzeige öffnen"
+
+msgid "Zoom in to see messages"
+msgstr "Hineinzoomen, um Nachrichten zu sehen"
+
+msgid "Login"
+msgstr "Anmelden"
+
+msgid "Enable autologin"
+msgstr "Automatische Anmeldung aktivieren"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} Benutzer"
+msgstr[1] "{0} Benutzer"
+
+msgid "not logged in"
+msgstr "nicht angemeldet"
+
+msgid "User {0} has left"
+msgstr "Nutzer {0} ist gegangen"
+
+msgid "User {0} is mapping nearby"
+msgstr "Nutzer {0} arbeitet in der Nähe"
+
+msgid "Users mapping nearby:"
+msgstr "In der Nähe arbeitende Nutzer:"
+
+msgid "Private chat"
+msgstr "Privatunterhaltung"
+
+msgid "Close tab"
+msgstr "Reiter schließen"
+
+msgid "Logout"
+msgstr "Abmelden"
+
+msgid "Clear log"
+msgstr "Protokoll leeren"
+
+msgid "Show users on map"
+msgstr "Nutzer auf Karte anzeigen"
+
msgid "Position only"
msgstr "Nur Position"
@@ -23184,27 +25059,9 @@ msgstr "Aufzeichnung ausschalten bei Distanz unter"
msgid "Unknown logFormat"
msgstr "Unbekanntes Aufzeichnungsformat"
-msgid "Port:"
-msgstr "Schnittstelle:"
-
-msgid "refresh the port list"
-msgstr "Schnittstellenliste aktualisieren."
-
-msgid "Configure"
-msgstr "Einstellen"
-
msgid "Configure Device"
msgstr "Gerät einstellen"
-msgid "Connection Error."
-msgstr "Verbindungsfehler."
-
-msgid "configure the connected DG100"
-msgstr "Angeschlossenen DG100 einstellen"
-
-msgid "delete data after import"
-msgstr "Daten nach Import löschen"
-
msgid "Importing data from device."
msgstr "Daten vom Gerät importieren."
@@ -23630,6 +25487,9 @@ msgstr "XML-Bildgrenzen für Auswahl generieren"
msgid "edit bounds for selected defaults"
msgstr "Grenzen für ausgewählte Standards ändern"
+msgid "Download imagery XML bounds"
+msgstr "XML-Datei der Hintergrundbildgrenzen herunterladen"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23753,7 +25613,7 @@ msgid "Created by {0} on {1}"
msgstr "Erstellt von {0} zur Zeit {1}"
msgid "Offset Information"
-msgstr "Versatz-Onformation"
+msgstr "Versatz-Information"
msgid "Report this offset"
msgstr "Diesen Versatz melden"
@@ -23826,10 +25686,10 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
-"Sie registrieren einen Bildversatz. Andere Nutzer in diesem Gebiet können es "
-"für die Datenerfassung nutzen.\n"
-"Bitte stellen Sie sicher, das der Wert so präzise wie möglich ist und "
-"beschreiben Sie die Region in der der Wert gilt."
+"Sie registrieren Sie einen Bildversatz. Andere Nutzer in diesem Gebiet "
+"können ihn für die Datenerfassung nutzen.\n"
+"Bitte stellen Sie sicher, dass der Wert so präzise wie möglich ist, und "
+"beschreiben Sie die Region, in der der Wert gilt."
msgid ""
"You are registering a calibration geometry. It should be the most precisely "
@@ -23849,22 +25709,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr "Der Text sollte 3 bis 200 Zeichen lang sein."
msgid "Adjust imagery"
-msgstr "Hintergrund-Bildebene anpassen"
+msgstr "Hintergrundbild justieren"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Position der gewählten Hintergrund-Bildebene anpassen"
+msgstr "Position der gewählten Hintergrundebene anpassen"
msgid "Please select the imagery layer to adjust."
-msgstr "Bitte wählen Sie die anzupassende Hintergrund-Bildebene."
+msgstr "Bitte die Hintergrundbildebene zum anpassen auswählen"
msgid "Start adjusting"
-msgstr "Justierung starten"
+msgstr "Justierung beginnen"
msgid "There are currently no imagery layer to adjust."
-msgstr "Momentan sind keine Hintergrund-Bildebenen zur Anpassung vorhanden."
+msgstr "Es gibt momentan keine Hintergrundbildebenen zum anpassen."
msgid "No layers to adjust"
-msgstr "Keine Ebenen zum Justieren"
+msgstr "Keine Ebenen zum anpassen"
msgid "Normal"
msgstr "Normal"
@@ -23908,12 +25768,6 @@ msgstr "Importierte Bilder"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Bilddateien (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Bilder mit ImageWayPoint öffnen"
-
-msgid "Load set of images as a new layer."
-msgstr "Einen Satz Bilder als neue Ebene laden."
-
msgid "Import vector graphics"
msgstr "Vektorgrafiken importieren"
@@ -23923,17 +25777,14 @@ msgstr "Maßstab:"
msgid "unit(s) = "
msgstr "Einheit(en) = "
-msgid "Import..."
+msgid "Importing..."
msgstr "Importieren…"
-msgid "Import vector graphics."
-msgstr "Vektorgrafiken importieren."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "SVG-Dateien [ImportVec-Plugin] (*.svg)"
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG-Zeichnungen (*.svg)"
-
-msgid "Importing..."
-msgstr "Importieren…"
+msgid "Please open or create data layer before importing"
+msgstr "Bitte vor dem Import Datenebene öffnen oder erzeugen"
msgid "InfoMode"
msgstr "Informationsmodus"
@@ -24321,9 +26172,6 @@ msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
"Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren."
-msgid "LiveGPS"
-msgstr "Live GPS"
-
msgid "Open MapDust"
msgstr "MapDust öffnen"
@@ -24378,9 +26226,35 @@ msgstr "Überlappung von Linien vereinigen"
msgid "Merge Overlap (combine)"
msgstr "Überlappung vereinigen (kombinieren)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen "
+"Linien kopiert.<br>Sie sollten dies überprüfen und falls nötig "
+"korrigieren.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Alle neuen Linien wurden als Elemente in einer Relation "
+"eingefügt.<br>Sie sollten dies überprüfen und falls nötig korrigieren.</html>"
+
msgid "Split way"
msgstr "Linie teilen"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Geben Sie den Schlüssel eines Merkmals ein, zum Beispiel "
+"<string><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Geben Sie den Wert eines Merkmals ein, zum Beispiel "
+"<strong><tt>Mitglieder überprüfen</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan Left"
@@ -24430,6 +26304,15 @@ msgstr "OSM-Objekttyp zum Herunterladen (''*'' steht für beliebig)"
msgid "XAPI query: "
msgstr "XAPI-Abfrage: "
+msgid "Download from Overpass API ..."
+msgstr "Mittels Overpass-API laden"
+
+msgid "Download map data from Overpass API server."
+msgstr "Kartendaten mittels Overpass-API laden"
+
+msgid "Overpass query: "
+msgstr "Overpass-Abfrage: "
+
msgid "Select OSM mirror URL"
msgstr "OSM-Spiegel-URL wählen"
@@ -24443,17 +26326,6 @@ msgstr "Basis-URL"
msgid "Enforce meta data"
msgstr "Metadaten erzwingen"
-msgid "Convert to multipolygon"
-msgstr "In Multipolygon konvertieren"
-
-msgid "Convert to multipolygon."
-msgstr "In Multipolygon konvertieren."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-"Eine der ausgewählten Linien ist bereits in einem anderen Multipolygon "
-"enthalten."
-
msgid "About Plugin"
msgstr "Über Plugin"
@@ -24595,9 +26467,6 @@ msgstr "Nach Vierteln trennen"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Diese Daten nach Stadvierteln trennen (admin_level=11)."
-msgid "Open Data"
-msgstr "Offene Daten"
-
msgid "CSV files"
msgstr "CSV-Dateien"
@@ -24608,7 +26477,7 @@ msgid "ODS files"
msgstr "ODS-Dateien"
msgid "Shapefiles"
-msgstr "Formdateien"
+msgstr "Shape-Dateien"
msgid "MapInfo files"
msgstr "MapInfo-Dateien"
@@ -24622,12 +26491,21 @@ msgstr "GML-Dateien"
msgid "Zip Files"
msgstr "ZIP-Dateien"
+msgid "7Zip Files"
+msgstr "7Zip-Dateien"
+
msgid "OpenData XML files"
msgstr "OpenData-XML-Dateien"
+msgid "Download open data"
+msgstr "OpenData herunterladen"
+
msgid "License URL not available: {0}"
msgstr "Lizenz-URL nicht verfügbar: {0}"
+msgid "OpenData preferences"
+msgstr "OpenData-Einstellungen"
+
msgid "License Agreement"
msgstr "Lizenzvereinbarung"
@@ -24799,6 +26677,9 @@ msgstr "Daten werden heruntergeladen..."
msgid "File to load"
msgstr "Zu ladende Datei"
+msgid "Reading 7Zip file..."
+msgstr "7Zip-Datei lesen..."
+
msgid "Reading Zip file..."
msgstr "ZIP-Datei wird gelesen..."
@@ -24819,11 +26700,24 @@ msgstr ""
msgid "Try lenient method"
msgstr "Nachsichtige Methode probieren"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"Koordinatenreferenzsystem konnte nicht ermittelt werden.\n"
+"Möchten Sie auf das Reservesystem ESPG:4326 (WGS 84) zurückschalten?"
+
+msgid "Warning: CRS not found"
+msgstr "Warnung: CRS nicht gefunden"
+
+msgid "Unable to detect CRS !"
+msgstr "CRS konnte nicht ermittelt werden !"
+
msgid "Unable to find a data store for file {0}"
msgstr "Es konnte kein Datenspeicher für Datei {0} gefunden werden"
msgid "Loading shapefile ({0} features)"
-msgstr "Lade Formdatei ({0} Funktionalitäten)"
+msgstr "Lade Shape-Datei ({0} Elemente)"
msgid "No valid coordinates have been found."
msgstr "Es konnten keine gültigen Koordinaten gefunden werden."
@@ -25091,15 +26985,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Ein Fehler ist aufgetreten: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Konnte keinen neuen Fehlerbericht anlegen. Ergebnis: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Die Kopfzeile enthält mehrere Werte und kann nicht in eine Zeichenkette "
-"umgewandelt werden"
-
msgid "Process queue"
msgstr "Warteschlange abarbeiten"
@@ -25158,18 +27043,6 @@ msgstr ""
msgid "Close: "
msgstr "Schließen: "
-msgid "New issue"
-msgstr "Neuer Fehler"
-
-msgid "Create issue"
-msgstr "Fehler anlegen"
-
-msgid "Describe the problem precisely"
-msgstr "Beschreiben Sie den Fehler möglichst genau"
-
-msgid "Create: "
-msgstr "Erstellen: "
-
msgid "Open in browser"
msgstr "Im Webbrowser öffnen"
@@ -25231,6 +27104,9 @@ msgstr "Firefox-Programm"
msgid "OSM Server Files pbf compressed"
msgstr "OSM-Server-Dateien pbf-komprimiert"
+msgid "Download PBF"
+msgstr "PBF herunterladen"
+
msgid "Invalid changeset id: {0}"
msgstr "Ungültige Änderungssatznummer: {0}"
@@ -25439,9 +27315,6 @@ msgstr "PDF-Datei importieren."
msgid "Import PDF"
msgstr "PDF importieren"
-msgid "Import PDf file"
-msgstr "PDF-Datei importieren"
-
msgid " {0} objects so far"
msgstr " {0} Objekte bisher"
@@ -25522,8 +27395,28 @@ msgstr "Test fehlgeschlagen: mtime konnte nicht gelesen werden."
msgid "Test failed: Could not write mtime."
msgstr "Test fehlgeschlagen: mtime konnte nicht geschrieben werden."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr "Fotos ausrichten"
+
+msgid "Move and position photos"
+msgstr "Fotos verschieben und positionieren"
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+"Fotos mit gedrückter Maustaste verschieben oder mit Shift+Mausklick "
+"positionieren."
+
+msgid "Please load some photos."
+msgstr "Bitte einige Fotos laden."
+
+msgid "Toggle the image thumbnail preview"
+msgstr "Anzeige von Vorschaubildern umschalten"
+
+msgid "New layer for untagged images"
+msgstr "Neue Ebene für unreferenzierte Bilder"
+
+msgid "Untagged Images"
+msgstr "Unreferenzierte Bilder"
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -25681,6 +27574,10 @@ msgstr "Zwischenablage leer"
msgid "The clipboard data is not an image"
msgstr "Die Zwischenablage enthält kein Bild"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Warnung: Fehler beim Bearbeiten der Zip-Datei ''{0}''. Fehlermeldung war: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "Eine zum Bild passende Kalibrierungsdatei wurde gefunden: {0}\n"
@@ -25692,7 +27589,7 @@ msgstr ""
"automatische Laden von Kalibrierungsdateien."
msgid "Do you want to apply it ?"
-msgstr "Möchten sie dies anwenden?"
+msgstr "Möchten Sie dies anwenden?"
msgid "Load calibration file ?"
msgstr "Kalibrierungsdatei laden?"
@@ -25704,6 +27601,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr "In Zukunft werden Kalibrierungsdateien automatisch geladen."
+msgid "Download Osmosis poly"
+msgstr "Osmosis-Poly herunterladen"
+
msgid "Reading polygon filter file..."
msgstr "Polygonfilterdatei wird gelesen..."
@@ -25999,9 +27899,6 @@ msgstr "Die GPX-Datei enthielt keine Wegstrecken oder Wegpunkte."
msgid "Create Stops from GPX"
msgstr "Haltestellen aus GPX erstellen"
-msgid "Tracks"
-msgstr "Spuren"
-
msgid "Tracks in this GPX file:"
msgstr "Wegstrecken aus dieser GPX-Datei:"
@@ -26072,9 +27969,6 @@ msgstr "Role wählen"
msgid "Change relation member roles to {0}"
msgstr "Rolle der Relationsmitglieder änden zu {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Multipolygon-Erzeugungseinstellungen ändern"
-
msgid "Create administrative boundary relations"
msgstr "Relationen für Verwaltungsgrenzen erstellen"
@@ -26205,11 +28099,8 @@ msgstr "Punkt ohne Rolle ''label'' oder ''admin_centre'' gefunden"
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Linie ohne Rolle ''inner'' oder ''outer'' gefunden"
-msgid "Restart JOSM"
-msgstr "JOSM neustarten"
-
msgid "Revert changeset fully"
-msgstr "Ändersatz vollständig umkehren"
+msgstr "Änderungssatz vollständig umkehren"
msgid "Revert selection only"
msgstr "Nur Auswahl umkehren"
@@ -26229,6 +28120,9 @@ msgstr "ID des umzukehrenden Objekts eingeben"
msgid "Reverted changeset"
msgstr "Umkehrter Änderungssatz"
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "Das Zurücksetzen von Änderungssätzen von {0} ist nicht erlaubt"
+
msgid "Missing merge target for {0} with id {1}"
msgstr "Fehlendes Vereinigungsziel für {0} mit ID {1}"
@@ -26265,15 +28159,35 @@ msgstr "Fehlende Objekte herunterladen"
msgid "Downloading changeset"
msgstr "Änderungssatz herunterladen"
+msgid "See {0}"
+msgstr "Siehe {0}"
+
msgid "Revert changeset #{0}"
msgstr "Änderungssatz {0} umkehren"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Warnung: nicht unterstütztes Startelement ''{0}'' im Inhalt des "
+"Änderungssatzes an der Position ({1},{2}) wird übersprungen."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Warnung: nicht unterstütztes Endelement ''{0}'' im Inhalt des "
+"Änderungssatzes an der Position ({1},{2}) übersprungen."
+
msgid "Road Sign Plugin"
msgstr "Verkehrszeichen Plugin"
msgid "signs"
msgstr "Schilder"
+msgid "Change Properties"
+msgstr "Einstellungen ändern"
+
msgid "Country preset:"
msgstr "Standard-Land:"
@@ -26283,6 +28197,9 @@ msgstr "Alle Zeichen zeigen"
msgid "Show a selection of the most useful signs"
msgstr "Eine Auswahl der wichtigsten Zeichen zeigen"
+msgid "Spain"
+msgstr "Spanien"
+
msgid "Germany"
msgstr "Deutschland"
@@ -26385,9 +28302,6 @@ msgstr "Einstellungen des Routenführungsplugins"
msgid "Configure routing preferences."
msgstr "Routenführung konfigurieren."
-msgid "Highway type"
-msgstr "Straßentyp"
-
msgid "Speed (Km/h)"
msgstr "Geschwindigkeit (km/h)"
@@ -26518,6 +28432,10 @@ msgstr ""
msgid "Save SDS file"
msgstr "SDS-Datei speichern"
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+"Sicherung der Datei konnte nicht erstellt werden. Der Fehler ist: {0}"
+
msgid "Simplify Area"
msgstr "Fläche vereinfachen"
@@ -26591,20 +28509,20 @@ msgstr "Distanzfaktor"
msgid "Merge Nearby Nodes Threshold"
msgstr "Schwellwert zum Vereinen naheliegender Punkte"
-msgid "Online Help"
-msgstr "Online-Hilfe"
+msgid "SeaMap Editor"
+msgstr "SeaMap Editor"
-msgid "Load"
-msgstr "Laden"
+msgid "No object selected"
+msgstr "Kein Objekt ausgewählt"
-msgid "invisible"
-msgstr "unsichtbar"
+msgid "Seamark Inspector"
+msgstr "Schifffahrtszeicheninspektor"
-msgid "SeaMap Editor"
-msgstr "SeaMap Editor"
+msgid "Select only one object"
+msgstr "Nur ein Objekt auswählen"
-msgid "Export"
-msgstr "Exportieren"
+msgid "Select a map object"
+msgstr "Ein Objekt auswählen"
msgid "AutoSave LiveData"
msgstr "Live-Daten automatisch speichern"
@@ -26748,6 +28666,9 @@ msgstr "Umringslinie löschen"
msgid "Street name: "
msgstr "Straßenname: "
+msgid "Building: "
+msgstr "Gebäude: "
+
msgid "Even/Odd"
msgstr "Gerade/Ungerade"
@@ -26826,6 +28747,103 @@ msgstr "Abzeichner."
msgid "Tracer building"
msgstr "Gebäude abzeichnen"
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2."
+
+msgid "Change tag {0} to {1}"
+msgstr "Merkmal {0} in {1} ändern"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"Die Tracer2Server-Version ist mit dieser Erweiterung nicht kompatibel. Bitte "
+"laden Sie Version {0} von\n"
+"{1} herunter."
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+"Eine neue Version von Tracer2Server ist verfügbar. Für beste Ergebnisse "
+"aktualisieren Sie bitte auf Version {0}."
+
+msgid "No set of parameter is active!"
+msgstr "Keine Parameter sind aktiv!"
+
+msgid "Select parameter"
+msgstr "Parameter auswählen"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: Einen Weg mit {0} Punkten hinzufügen"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: Weg an {0} Punkten ändern"
+
+msgid "Tracer2 error"
+msgstr "Tracer2-Fehler"
+
+msgid "Parameter for server request"
+msgstr "Parameter für Serveranfrage"
+
+msgid "Tile size:"
+msgstr "Kachelgröße:"
+
+msgid "Resolution:"
+msgstr "Auflösung:"
+
+msgid "Mode:"
+msgstr "Modus:"
+
+msgid "Threshold:"
+msgstr "Schwellwert:"
+
+msgid "Points per circle:"
+msgstr "Punkte pro Kreis:"
+
+msgid "Tag:"
+msgstr "Schlüssel:"
+
+msgid "Preferred values:"
+msgstr "Bevorzugte Werte:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "Parameter ''{0}'' löschen?"
+
+msgid "Add new"
+msgstr "Neu hinzufügen"
+
+msgid "Add predefined"
+msgstr "Vordefiniert hinzufügen"
+
+msgid "Select predefined parameter"
+msgstr "Vordefinierten Parameter auswählen"
+
+msgid "Modify list of parameter for server request."
+msgstr "Parameterliste für Serveranfrage bearbeiten."
+
+msgid "Parameter:"
+msgstr "Parameter:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+"Tracer2Server läuft nicht. Bitte den Server starten.\n"
+"Falls Sie den Server noch nicht haben, kann er hier heruntergeladen werden:\n"
+"{0}."
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "Tracer2Server hat nichts gefunden."
+
+msgid "Tracer2Server has detected an error."
+msgstr "Tracer2Server hat einen Fehler festgestellt."
+
msgid "GPG"
msgstr "GPG"
@@ -26841,9 +28859,6 @@ msgstr "Exportiere Signaturen in XML-Datei..."
msgid "Save Signatures file"
msgstr "Signaturdatei speichern"
-msgid "Download OSM"
-msgstr "OSM herunterladen"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -26869,6 +28884,10 @@ msgstr "Objekte vom Server laden"
msgid "Download signed data"
msgstr "Signierte Daten herunterladen"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Warnung: Ignoriere Fehler, da die Aufgabe abgebrochen wurde: Fehler: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -27036,9 +29055,6 @@ msgstr "Signierung abgebrochen!"
msgid "Please give a tolerance in meters"
msgstr "Bitte geben Sie eine Toleranz in Metern ein"
-msgid "Accuracy"
-msgstr "Genauigkeit"
-
msgid "Select as much as you like:"
msgstr "Bitte wählen Sie nach Belieben:"
@@ -27762,8 +29778,11 @@ msgstr "Objekt wiederherstellen..."
msgid "Undelete object by id"
msgstr "Objekt mittels ID wiederherstellen"
-msgid "Select if the data should be added into a new layer"
-msgstr "Auswählen, ob die Daten in eine neue Ebene gespeichert werden sollen"
+msgid "Undelete Object"
+msgstr "Objekt wiederherstellen"
+
+msgid "Undelete object"
+msgstr "Objekt wiederherstellen"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -27771,11 +29790,8 @@ msgid ""
msgstr ""
"Typ und ID des wiederherzustellenden Objekts eingeben, z.B. ''n1 w2''"
-msgid "Undelete Object"
-msgstr "Objekt wiederherstellen"
-
-msgid "Undelete object"
-msgstr "Objekt wiederherstellen"
+msgid "Select if the data should be added into a new layer"
+msgstr "Auswählen, ob die Daten in eine neue Ebene gespeichert werden sollen"
msgid "Start undeleting"
msgstr "Wiederherstellen starten"
@@ -27783,18 +29799,6 @@ msgstr "Wiederherstellen starten"
msgid "Close dialog and cancel"
msgstr "Dialog schließen und abbrechen"
-msgid "Will get {0}"
-msgstr "Erhalte {0}"
-
-msgid "Looking for {0}"
-msgstr "Suche nach {0}"
-
-msgid "Found {0}"
-msgstr "{0} gefunden"
-
-msgid "More tools"
-msgstr "Werkzeuge 2"
-
msgid "Add nodes at intersections"
msgstr "Punkt an den Schnittpunkten einfügen"
@@ -27842,17 +29846,6 @@ msgstr ""
"Relationsmitgliedschaft von den Objekten im Puffer auf die gewählten Objekte "
"kopieren."
-msgid "Paste tags [testing]"
-msgstr "Schlagwörter einfügen [Testing]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-"Aus dem Zwischenspeicher erkannte Schlagwörter allen ausgewählten Einträgen "
-"hinzufügen."
-
-msgid "Paste tags"
-msgstr "Schlagwörter einfügen"
-
msgid "Split Object"
msgstr "Objekt aufteilen"
@@ -27992,18 +29985,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "URL konfigurieren"
-msgid "Key is too long:"
-msgstr "Schlüssel ist zu lang:"
-
-msgid "Suspiciouns characters in tag:"
-msgstr "Verdächtige Zeichen im Merkmal:"
-
-msgid "Value too long (max 255 characters):"
-msgstr "Wert zu lang (maximal 255 Zeichen):"
-
-msgid "Ingore warnings"
-msgstr "Warnungen ignorieren"
-
msgid "Lat Lon tool"
msgstr "Länge-Breite-Werkzeug"
@@ -28033,13 +30014,13 @@ msgid ""
"24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg 42' 52.13\" N, 21 "
"deg 11' 47.60\" E</li></ul>"
msgstr ""
-"Geben sie die Koordinaten für die neuen Punkte ein, einen je "
+"Geben Sie die Koordinaten für die neuen Punkte ein, einen je "
"Zeile.<br/>Werden zwei Zeilen mit identischen Koordinaten angegeben, so wird "
"ein doppelter Punkt erstellt.<br/>Längen- und Breitengrad werden durch "
"Leerzeichen, Komma oder Semikolon getrennt.<br>Positive Zahlen oder die "
"Buchstaben N oder E kennzeichnen Nord oder Ost.<br/>Negative Zahlen oder S, "
-"W kennzeichnen Süd oder West.<br/>Koordinaten kann in drei unterschiedlichen "
-"Formaten vorliegen: "
+"W kennzeichnen Süd oder West.<br/>Koordinaten können in drei "
+"unterschiedlichen Formaten vorliegen: "
"<ul><li><i>Grad</i><tt>°</tt></li><li><i>Grad</i><tt>°</tt> "
"<i>Minuten</i><tt>'</tt></li><li><i>Grad</i><tt>°</tt> "
"<i>Minuten</i><tt>'</tt> "
@@ -28228,9 +30209,6 @@ msgstr "Nicht ausgewählte Punkte"
msgid "Removes all nodes from selection"
msgstr "Alle Punkte aus der Auswahl entfernen"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Video importieren"
@@ -28360,8 +30338,8 @@ msgstr "Schleife"
msgid "mute"
msgstr "Stumm schalten"
-msgid "Scanned Map..."
-msgstr "Gescannte Karte..."
+msgid "Walking Papers Scanned Map"
+msgstr "Walking Papers gescannte Karte"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28386,9 +30364,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "WalkingPapers-Ebene ({0}) mit Zoom {1}"
-msgid "Walking Papers"
-msgstr "WalkingPapers"
-
msgid "Way Download"
msgstr "Linien-Herunterladen"
@@ -28541,9 +30516,6 @@ msgstr "Legt die Standardsprache für Wikipedia-Artikel fest"
msgid "Enter the Wikipedia language"
msgstr "Wikipedia-Sprache eintragen"
-msgid "Add Tag"
-msgstr "Merkmal hinzufügen"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 852ec96..b3d3c7f 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:07+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:08+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -154,19 +169,14 @@ msgid "About JOSM..."
msgstr "Über JOSM ..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNUNG: Unerwartetes Format der API-Basis-URL. Weiterleitung zur Info- oder "
-"Chronikseite wird wahrscheinlich scheitern. API-Basis-URL ist: ''{0}'"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNUNG: unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den OSM-"
-"Nutzerseiten wird wahrscheinlich fehlschlagen. Die API-Basis-URL lautet: "
-"\"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -214,6 +224,9 @@ msgstr "Keine Zielebenen"
msgid "Add imagery layer {0}"
msgstr "Lufbild-Ebene {0} hinzufügen"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -253,9 +266,6 @@ msgstr "Werkzeug: {0}"
msgid "Please select at least four nodes."
msgstr "Bitte mindestens vier Knotenpunkte auswählen."
-msgid "Information"
-msgstr "Information"
-
msgid "Align Nodes in Line"
msgstr "Knotenpunkte in einer Line anordnen."
@@ -280,6 +290,9 @@ msgstr "Konflikt"
msgid "download"
msgstr "Herunterladen"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "vorherige"
@@ -289,6 +302,9 @@ msgstr "Weiter"
msgid "Nothing selected to zoom to."
msgstr "Nichts ausgewählt, auf das gezoomt werden kann."
+msgid "Information"
+msgstr "Information"
+
msgid "Zoom to {0}"
msgstr "Auf {0} zoomen"
@@ -345,11 +361,9 @@ msgstr ""
"werden. Sollen die Richtungen angepasst werden?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Wege können nicht verbunden werden (Sie können nicht in eine eindeutige "
-"Reihenfolge gebracht werden)"
msgid "Combine {0} ways"
msgstr "{0} Wege verbinden"
@@ -406,18 +420,35 @@ msgstr "Löschen"
msgid "Delete selected objects."
msgstr "Ausgewählte Objekte löschen."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Knoten verteilen"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Gewählte Knoten gleichmäßig auf einer Linie verteilen."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Vom OSM-Server herunterladen..."
msgid "Download map data from the OSM server."
msgstr "Kartendaten vom OSM-Server herunterladen."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "Objekt herunterladen..."
@@ -512,6 +543,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -625,7 +659,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -775,8 +809,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -933,8 +967,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -961,12 +995,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -984,9 +1014,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1093,6 +1120,15 @@ msgstr "Die Datei auch umbenennen"
msgid "Could not rename file ''{0}''"
msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1143,9 +1179,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1207,6 +1240,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1281,13 +1317,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1376,6 +1412,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1400,9 +1457,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1598,6 +1652,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1607,6 +1664,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1626,6 +1695,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1676,25 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1837,6 +1912,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1861,8 +1939,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1878,6 +1956,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2284,6 +2365,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2444,13 +2528,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2459,6 +2543,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2477,8 +2564,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2564,6 +2650,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2600,10 +2689,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2626,8 +2715,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2731,6 +2820,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2791,8 +2883,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2822,10 +2914,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2846,6 +2938,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2876,18 +2971,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2896,8 +2991,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2905,13 +3000,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2925,8 +3018,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2956,11 +3049,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "UNBEKANNT"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3113,8 +3205,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3221,7 +3312,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3240,6 +3331,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3256,9 +3350,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3297,6 +3388,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3321,6 +3415,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3380,13 +3483,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3456,6 +3559,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3525,6 +3646,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3582,13 +3709,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3620,10 +3747,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3757,7 +3884,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3832,6 +3959,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3862,9 +3992,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3889,10 +4016,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3955,23 +4082,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4075,7 +4185,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4271,9 +4381,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4289,10 +4414,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4301,6 +4438,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4360,6 +4500,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4387,19 +4530,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4687,29 +4817,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4724,7 +4872,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4776,14 +4924,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5033,14 +5173,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5561,6 +5701,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5644,6 +5787,36 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Objekttyp:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "gemischt"
+
+msgid "Choose the OSM object type"
+msgstr "OSM Objekttyp auswählen"
+
+msgid "Object ID:"
+msgstr "Objekt ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "ID des herunterzuladenden Objekts eingeben"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Objekt IDs können durch ein Komma oder Leerzeichen getrennt werden.<br/> "
+"Beispiele: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Im gemischten "
+"Modus geben Sie Objekte wie folgt an: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5665,9 +5838,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5692,32 +5862,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5737,8 +5907,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5764,9 +5933,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5911,9 +6077,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6198,8 +6361,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6264,34 +6427,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6306,13 +6481,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6391,12 +6566,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6426,9 +6595,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6466,7 +6641,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6526,6 +6701,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6781,6 +6959,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6846,9 +7043,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6915,21 +7109,8 @@ msgstr ""
msgid "Download object"
msgstr "Objekt herunterladen"
-msgid "Object type:"
-msgstr "Objekttyp:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "gemischt"
-
-msgid "Choose the OSM object type"
-msgstr "OSM Objekttyp auswählen"
-
-msgid "Object ID:"
-msgstr "Objekt ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "ID des herunterzuladenden Objekts eingeben"
+msgid "Start downloading"
+msgstr "Herunterladen beginnen"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6939,26 +7120,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Objekt IDs können durch ein Komma oder Leerzeichen getrennt werden.<br/> "
-"Beispiele: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Im gemischten "
-"Modus geben Sie Objekte wie folgt an: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Herunterladen beginnen"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7055,7 +7219,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7154,6 +7318,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7241,7 +7408,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7260,6 +7427,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7326,8 +7499,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7402,8 +7574,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7417,8 +7589,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7633,12 +7804,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7647,6 +7812,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7662,6 +7843,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7669,8 +7865,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7782,9 +7978,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7794,6 +7987,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7810,7 +8006,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7956,7 +8152,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7986,7 +8182,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8100,6 +8296,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8137,6 +8336,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8333,9 +8535,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8354,6 +8553,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8411,6 +8613,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8477,9 +8685,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8492,7 +8697,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8519,12 +8727,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8653,14 +8865,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8675,7 +8883,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8685,8 +8893,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8906,7 +9113,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8972,6 +9179,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9029,9 +9242,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9278,6 +9488,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9406,6 +9619,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9448,6 +9667,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9498,19 +9720,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9528,40 +9741,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
-msgstr ""
-
-msgid "Advanced Background: Changed"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "Import log"
msgstr ""
-msgid "Current value is default."
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "shortcut"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "color"
msgstr ""
-msgid "Select Setting Type:"
+msgid "toolbar"
msgstr ""
-msgid "Simple"
+msgid "imagery"
msgstr ""
-msgid "List"
+msgid "Reset preferences"
msgstr ""
-msgid "List of lists"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of maps"
+msgid "Load profile"
msgstr ""
-msgid "Add setting"
+msgid "Save {0} profile"
+msgstr ""
+
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9585,6 +9807,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9641,6 +9896,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9694,6 +9952,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9975,7 +10238,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10144,6 +10413,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10207,7 +10482,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10465,40 +10740,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10551,8 +10826,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10561,20 +10836,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10656,14 +10936,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10707,31 +10981,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10740,6 +11019,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10755,57 +11037,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10823,6 +11107,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10852,6 +11144,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10882,7 +11217,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10922,28 +11257,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11038,6 +11371,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11053,12 +11389,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11137,7 +11481,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11236,58 +11580,34 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
+msgid "Unsupported version: {0}"
msgstr ""
-msgid "Unsupported version: {0}"
+msgid ""
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgid "Parsing changeset content ..."
msgstr ""
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
msgstr ""
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
msgstr ""
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid "Parsing changeset content ..."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
msgstr ""
msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -11302,10 +11622,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11316,9 +11633,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11340,6 +11654,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11389,8 +11706,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11533,6 +11850,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11551,6 +11871,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11575,16 +11904,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11596,6 +11928,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11610,6 +11950,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11640,19 +11989,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11674,11 +12023,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11748,13 +12109,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11897,10 +12258,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11915,22 +12276,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11999,8 +12359,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12015,9 +12374,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12339,17 +12713,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12360,9 +12728,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12394,9 +12805,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12722,6 +13147,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12801,6 +13231,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12902,9 +13336,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12960,6 +13391,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12984,9 +13418,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13012,9 +13443,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13051,6 +13479,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13097,9 +13530,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13184,6 +13614,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13274,6 +13707,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13292,10 +13769,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13307,6 +13784,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13334,18 +13814,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13355,9 +13829,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13367,13 +13838,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13421,6 +13892,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13505,6 +13979,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13609,21 +14086,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13639,10 +14125,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13678,7 +14164,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13747,12 +14233,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13768,15 +14260,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13798,6 +14281,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13807,6 +14299,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13816,10 +14311,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13852,9 +14344,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13888,40 +14377,67 @@ msgstr ""
msgid "Barriers"
msgstr ""
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr ""
-msgid "Cycle Barrier"
+msgid "Material"
msgstr ""
-msgid "Block"
+msgid "stone"
msgstr ""
-msgid "Cattle Grid"
+msgid "Bollard"
msgstr ""
-msgid "Edit Cattle Grid"
+msgid "Edit Bollard"
msgstr ""
-msgid "Bus Trap"
+msgid "Bollard type"
msgstr ""
-msgid "Spikes"
+msgid "rising"
msgstr ""
-msgid "Edit Spikes"
+msgid "removable"
msgstr ""
-msgid "Toll Booth"
+msgid "plastic"
msgstr ""
-msgid "Edit Toll Booth"
+msgid "Cycle Barrier"
+msgstr ""
+
+msgid "Edit Cycle Barrier"
+msgstr ""
+
+msgid "Cattle Grid"
+msgstr ""
+
+msgid "Edit Cattle Grid"
+msgstr ""
+
+msgid "Bus Trap"
+msgstr ""
+
+msgid "Edit Bus Trap"
+msgstr ""
+
+msgid "Spikes"
+msgstr ""
+
+msgid "Edit Spikes"
+msgstr ""
+
+msgid "Toll Booth"
+msgstr ""
+
+msgid "Edit Toll Booth"
msgstr ""
msgid "Border Control"
@@ -13933,19 +14449,34 @@ msgstr ""
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13954,22 +14485,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14002,12 +14562,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14065,6 +14640,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14074,6 +14652,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14113,9 +14697,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14149,6 +14730,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14230,18 +14826,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14314,7 +14915,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14338,10 +14942,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14353,9 +14960,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14398,18 +15002,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14509,11 +15151,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14525,11 +15165,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14548,10 +15186,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14581,9 +15219,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14599,19 +15234,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14761,6 +15412,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14782,6 +15436,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14809,6 +15469,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14833,22 +15499,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14870,9 +15520,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14936,7 +15583,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15067,6 +15714,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15097,6 +15747,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15109,9 +15762,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15121,9 +15771,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15136,6 +15791,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15160,14 +15818,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15216,7 +15866,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15270,41 +15920,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15490,6 +16140,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15511,9 +16167,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15526,6 +16188,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15565,6 +16230,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15586,22 +16254,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15625,9 +16305,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15652,10 +16329,19 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
msgstr ""
-msgid "Playground"
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
+
+msgid "Playground"
msgstr ""
msgid "Edit Playground"
@@ -15725,49 +16411,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15785,6 +16465,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15797,6 +16483,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15812,37 +16501,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15932,6 +16724,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15941,6 +16739,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -16007,12 +16811,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16022,6 +16880,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16031,31 +16913,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16083,7 +16971,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16110,27 +16998,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16165,12 +17041,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16180,10 +17059,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16211,6 +17090,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16248,117 +17130,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16392,33 +17310,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16452,6 +17380,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16464,7 +17408,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16527,36 +17496,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
-msgid "advanced"
+msgctxt "piste:difficulty"
+msgid "intermediate"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "advanced"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16599,19 +17586,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16750,6 +17733,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16762,60 +17757,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16831,9 +17900,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17043,41 +18109,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17086,7 +18178,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17098,12 +18190,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17155,88 +18337,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17248,6 +18533,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17263,6 +18563,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17281,11 +18584,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17394,10 +18695,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17409,7 +18710,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17430,13 +18731,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17508,7 +18815,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17529,13 +18836,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17544,7 +18851,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17572,6 +18878,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17608,10 +18920,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17641,7 +18974,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17653,19 +18986,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17686,6 +19019,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17695,7 +19034,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17776,6 +19115,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17905,6 +19247,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17944,24 +19292,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17971,15 +19328,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18055,6 +19403,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18109,7 +19463,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18121,6 +19475,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18196,48 +19553,51 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
-msgstr "Ländercode"
+msgid "National name"
+msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
msgstr ""
-msgid "RS"
+msgid "Street name"
msgstr ""
-msgid "US"
+msgid "City name"
msgstr ""
+msgid "Country code"
+msgstr "Ländercode"
+
msgid "Address Interpolation"
msgstr ""
@@ -18256,6 +19616,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18418,27 +19790,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18484,19 +19885,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18520,7 +19924,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18616,18 +20020,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18637,7 +20050,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18646,10 +20062,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18667,6 +20083,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18682,28 +20101,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18724,19 +20143,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18802,9 +20221,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18814,10 +20230,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18832,9 +20251,6 @@ msgstr "Dorf/Stadt"
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18862,6 +20278,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18907,10 +20326,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18922,7 +20371,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18940,7 +20389,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19057,19 +20506,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:postal_code without addr:postcode"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:ele without ele"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:ref:INSEE without ref:INSEE"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19088,13 +20648,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19103,19 +20699,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19130,142 +20735,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19304,148 +20958,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19649,6 +21366,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19670,13 +21399,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19939,9 +21662,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19963,6 +21692,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20041,9 +21773,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20128,7 +21872,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20399,15 +22143,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20580,6 +22315,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20598,12 +22336,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20739,6 +22471,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20756,6 +22491,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20836,115 +22574,129 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
+"<html>Namen des Ortes, Dorfes oder der Stadt eingeben.<br>Benutzen Sie die "
+"von www.cadastre.gouv.fr bekannte Syntax.</html>"
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-"<html>Namen des Ortes, Dorfes oder der Stadt eingeben.<br>Benutzen Sie die "
-"von www.cadastre.gouv.fr bekannte Syntax.</html>"
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20970,7 +22722,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21020,7 +22775,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21065,6 +22820,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21122,19 +22880,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21176,27 +22999,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21592,6 +23397,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21839,12 +23647,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21854,16 +23656,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22226,9 +24025,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22283,9 +24079,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22327,25 +24140,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22482,9 +24295,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22509,12 +24319,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22663,6 +24482,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22679,6 +24501,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22912,13 +24745,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22971,18 +24797,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23040,6 +24854,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23247,9 +25064,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23329,7 +25143,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23483,6 +25315,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23504,6 +25339,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23797,9 +25635,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23868,9 +25703,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23997,9 +25829,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24021,6 +25850,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24053,15 +25885,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24071,6 +25919,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24173,9 +26024,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24291,6 +26139,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24351,19 +26202,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24501,6 +26352,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24576,6 +26430,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24591,9 +26534,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24615,6 +26555,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24767,9 +26710,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25395,7 +27335,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25403,10 +27346,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25415,18 +27355,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25469,15 +27397,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25599,18 +27518,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25788,9 +27695,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25917,7 +27821,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25937,9 +27841,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26072,9 +27973,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/el.po b/i18n/po/el.po
index 0f49368..8f418b8 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:01+0000\n"
-"Last-Translator: glavkos <glavkos at gmail.com>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-08-24 07:36+0000\n"
+"Last-Translator: aitolos <Unknown>\n"
"Language-Team: Greek <el 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: 2013-04-05 04:42+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:43+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -42,7 +42,7 @@ msgid "{0}: option requires an argument -- {1}"
msgstr "{0}: η επιλογή απαιτεί έναν ορισμό -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr ""
+msgstr "Μη έγκυρη τιμή {0} για την παράμετρο ''has_arg''"
msgid "Background Terms of Use"
msgstr "Όροι Χρήσης Παρασκηνίου"
@@ -51,6 +51,21 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Το άνοιγμα δεσμού δεν υποστηρίζεται στην τρέχουσα πλατφόρμα (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: {0}"
+
+msgid "INFO: {0}"
+msgstr "ΠΛΗΡΟΦΟΡΙΕΣ: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "ΑΠΟΣΦΑΛΜΑΤΩΣΗ: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -155,20 +170,14 @@ msgid "About JOSM..."
msgstr "Περί του JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη αναμενόμενη μορφή του βασικού URL για το API. Η "
-"ανακατεύθυνση σε πληροφορίες ή σελίδες ιστορικού για αντικείμενα OSM πιθανόν "
-"να αποτύχει. Το βασικό URL για το API είναι: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη αναμενόμενη μορφή του βασικού URL για το API. Η "
-"ανακατεύθυνση σε σελίδα OSM χρήστη πιθανόν να αποτύχει. Το βασικό URL για το "
-"API είναι: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -215,23 +224,26 @@ msgstr "Δεν υπάρχουν επίπεδα στόχοι"
msgid "Add imagery layer {0}"
msgstr "Προσθήκη επιπέδου υπόβαθρου εικόνων {0}"
+msgid "Select image format for WMS layer"
+msgstr "Επιλέξτε μορφή εικόνας για το επίπεδο WMS"
+
msgid "Select WMS layers"
-msgstr ""
+msgstr "Επιλέξτε επίπεδα WMS"
msgid "Add layers"
-msgstr ""
+msgstr "Προσθήκη επιπέδων WMS"
msgid "Invalid service URL."
msgstr "Άκυρη υπηρεσία URL."
msgid "WMS Error"
-msgstr ""
+msgstr "Σφάλμα WMS"
msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "Η λίστα επιπέδων WMS δεν μπορεί να ανακτηθεί."
msgid "Could not parse WMS layer list."
-msgstr ""
+msgstr "Δεν ήταν δυνατή η ανάλυση της λίστας επιπέδων WMS"
msgid "Add Node..."
msgstr "Προσθήκη Κόμβου..."
@@ -255,9 +267,6 @@ msgstr "Εργαλείο: {0}"
msgid "Please select at least four nodes."
msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους."
-msgid "Information"
-msgstr "Πληροφορίες"
-
msgid "Align Nodes in Line"
msgstr "Ευθυγράμμιση κόμβων"
@@ -282,6 +291,9 @@ msgstr "σύγκρουση"
msgid "download"
msgstr "λήψη"
+msgid "problem"
+msgstr "πρόβλημα"
+
msgid "previous"
msgstr "προηγούμενο"
@@ -291,6 +303,9 @@ msgstr "επόμενο"
msgid "Nothing selected to zoom to."
msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ."
+msgid "Information"
+msgstr "Πληροφορίες"
+
msgid "Zoom to {0}"
msgstr "Εστίαση στ(ο,α,η) {0}"
@@ -347,11 +362,9 @@ msgstr ""
"να αντιστρέψετε μερικές από αυτές;"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Δεν ήταν δυνατός ο συνδυασμός των διαδρομών (Δε μπορούν να συγχωνευθούν σε "
-"μια ενιαία σειρά κόμβων)"
msgid "Combine {0} ways"
msgstr "Ένωσε {0} διαδρομές"
@@ -408,6 +421,12 @@ msgstr "Διαγραφή"
msgid "Delete selected objects."
msgstr "Διαγραφή επιλεγμένων αντικειμένων."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Κατανομή Κόμβων"
@@ -415,12 +434,25 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Κατανομή των επιλεγμένων κόμβων σε ίσες αποστάσεις κατά μήκος μιας γραμμής."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Αγνόηση {0} κόμβων με κενές συντεταγμένες"
+
msgid "Download from OSM..."
msgstr "Λήψη από το OSM..."
msgid "Download map data from the OSM server."
msgstr "Λήψη δεδομένων χάρτη από τον διακομιστή του OSM"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Αυτή η ενέργεια απαιτεί {0} ξεχωριστές<br>αιτήσεις λήψης. "
+"Επιθυμείτε<br>να συνεχίσετε;</html>"
+
+msgid "Download data"
+msgstr "Λήψη δεδομένων"
+
msgid "Download object..."
msgstr "Λήψη αντικειμένου..."
@@ -521,6 +553,9 @@ msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
"Εμφάνιση πληροφοριών ιστορικού σχετικά με διαδρομές, κόμβους ή σχέσεις OSM."
+msgid "Show history"
+msgstr "Προβολή ιστορικού"
+
msgid "History (web)"
msgstr "Ιστορικό (ιστός)"
@@ -654,11 +689,9 @@ msgid "Joined overlapping areas"
msgstr "Ενωμένες αλληλεπικαλυπτόμενες περιοχές"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Μερικές από τις διαδρομές ήταν μέρος σχέσεων οι οποίες τροποποιήθηκαν. "
-"Παρακαλώ επαληθεύστε ότι δεν παρουσιάστηκαν σφάλματα."
msgid "Fix tag conflicts"
msgstr "Διόρθωση συγκρούσεων ετικετών"
@@ -703,7 +736,7 @@ msgid "Join Node to Way"
msgstr "Ένωση Κόμβου σε Διαδρομή"
msgid "Include a node into the nearest way segments"
-msgstr ""
+msgstr "Συμπερίληψη ενός κόμβου στο κοντινότερο τμήμα διαδρομής"
msgid "Join Node and Line"
msgstr "Ένωση Κόμβου και Γραμμής"
@@ -743,9 +776,10 @@ msgstr "Άλμα σε Θέση"
msgid "Could not parse Latitude, Longitude or Zoom. Please check."
msgstr ""
+"Δεν μπορεί να αναλυθεί γ. πλάτος, γ. μήκος ή εστίαση, παρακαλώ ελέγξτε."
msgid "Unable to parse Lon/Lat"
-msgstr ""
+msgstr "Αδύνατη η ανάλυση Γ.πλάτους/μήκους"
msgid "Lasso Mode"
msgstr "Λειτουργία λάσο"
@@ -783,6 +817,8 @@ msgid ""
"Couldn''t match the entered link or id to the selected service. Please try "
"again."
msgstr ""
+"Δεν ήταν δυνατή η αντιστοίχηση του εισηγμένου συνδέσμου ή αναγνωριστικού με "
+"την επιλεγμένη υπηρεσία. Παρακαλώ δοκιμάστε ξανά."
msgid "No valid WMS URL or id"
msgstr "Μη έγκυρη Τοποθεσία WMS ή Αναγνωριστικό εικόνας:"
@@ -805,6 +841,15 @@ msgid ""
"one by one, by using ''<i>Merge selection</i>''.<br /><br />Are you sure you "
"want to continue?"
msgstr ""
+"Πρόκειται να συγχωνεύσετε δεδομένα μεταξύ των επιπέδων ''{0}'' και "
+"''{1}''.<br /><br />Αυτά τα επίπεδα έχουν διαφορετικές πολιτικές αποστολής "
+"και δεν πρέπει να συγχωνευτούν ως έχουν.<br />Συγχώνευσή τους θα έχει ως "
+"αποτέλεσμα την επιβολή της αυστηρότερης πολιτικής (η αποστολή αποθαρρύνεται) "
+"στο ''{1}''.<br /><br /><b>Αυτός δεν είναι ο προτεινόμενος τρόπος "
+"συγχώνευσης αυτών των δεδομένων</b>.<br />Αντίθετα θα πρέπει να ελέγξετε "
+"και να συγχωνεύσετε τα αντικείμενα ένα προς ένα χρησιμοποιώντας το "
+"''<i>Συγχώνευση επιλογής</i>''.<br /><br />Είστε σίγουρος ότι θέλετε να "
+"συνεχιστεί;"
msgid "Ignore this hint and merge anyway"
msgstr "Αγνοήστε τη συμβουλή και συγχωνεύστε"
@@ -816,11 +861,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Συγχώνευση κόμβων στον παλαιότερο."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Παρακαλώ επιλέξτε δυο κόμβους προς συγχώνευση ή ένα κόμβο που είναι κοντά σε "
-"άλλο κόμβο."
msgid "Abort Merging"
msgstr "Ακύρωση Συγχώνευσης"
@@ -853,6 +896,11 @@ msgid ""
"data</b>.<br />You should instead check and merge each object, <b>one by "
"one</b>.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Πρόκειται να συγχωνεύσετε περισσότερα από 1 αντικείμενο μεταξύ των επιπέδων "
+"''{0}'' και ''{1}''.<br /><br /><b>Αυτός δεν είναι ο προτεινόμενος τρόπος "
+"συγχώνευσης αυτών των δεδομένων</b>.<br />Αντίθετα θα πρέπει να ελέγξετε "
+"και να συγχωνεύσετε τα αντικείμενα, <b>ένα προς ένα</b>.<br /><br />Είστε "
+"σίγουρος ότι θέλετε να συνεχιστεί;"
msgid "Mirror"
msgstr "Καθρεπτισμός"
@@ -987,8 +1035,8 @@ msgid "Download Data"
msgstr "Λήψη δεδομένων"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -1009,20 +1057,16 @@ msgid "Orthogonalize Shape / Undo"
msgstr "Ορθογωνισμός Σχήματος / Αναίρεση"
msgid "Undo orthogonalization for certain nodes"
-msgstr ""
+msgstr "Αναίρεση ορθογωνισμού για ορισμένους κόμβους"
msgid "Orthogonalize / Undo"
msgstr "Ορθογωνισμός / Αναίρεση"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-msgid "Undo Orthogonalize Shape"
-msgstr "Αναίρεση Ορθογωνισμού Σχήματος"
-
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
"undesirable results when doing rectangular alignments.<br>Change your "
@@ -1038,9 +1082,6 @@ msgstr "Ορθογωνισμός"
msgid "Usage"
msgstr "Χρήση"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Τα επιλεγμένα Στοιχεία δεν μπορούν να ορθογωνιστούν"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1144,10 +1185,10 @@ msgid "Redo the last undone action."
msgstr "Επαναφορά της τελευταίας αναίρεσης."
msgid "Redo ..."
-msgstr ""
+msgstr "Επαναφορά ..."
msgid "Redo {0}"
-msgstr ""
+msgstr "Επαναφορά {0}"
msgid "Rename layer"
msgstr "Μετονομασία επιπέδου"
@@ -1158,6 +1199,15 @@ msgstr "Επιπλέον μετονομασία του αρχείου"
msgid "Could not rename file ''{0}''"
msgstr "Αδυναμία μετονομασίας αρχείου ''{0}''"
+msgid "Restart"
+msgstr "Επανεκκίνηση"
+
+msgid "Restart the application."
+msgstr "Επανεκκίνηση της εφαρμογής"
+
+msgid "Click to restart later."
+msgstr "Πατήστε για επανεκκίνηση αργότερα."
+
msgid "Reverse way"
msgstr "Αντιστροφή διαδρομής"
@@ -1210,9 +1260,6 @@ msgstr "Φόρτωση Συνεδρίας"
msgid "Load a session from file."
msgstr "Φόρτωση συνεδρίας από αρχείο."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Αρχείο συνεδρίας (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Άνοιγμα συνεδρίας"
@@ -1278,6 +1325,9 @@ msgstr "Αναφορά Κατάστασης"
msgid "Copy to clipboard and close"
msgstr "Αντιγραφή στο πρόχειρο και κλείσιμο"
+msgid "Report bug"
+msgstr "Αναφορά σφάλματος"
+
msgid "Close"
msgstr "Κλείσιμο"
@@ -1363,13 +1413,13 @@ msgstr ""
"Επιλέξτε κόμβους στη μέση της διαδρομής.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1385,7 +1435,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr ""
msgid "Encourage/discourage upload"
-msgstr ""
+msgstr "Ενθάρρυνση /αποθάρρυνση αποστολής"
msgid "UnGlue Ways"
msgstr "Αποσύνδεση Διαδρομών"
@@ -1418,6 +1468,8 @@ msgstr "* Ένας κόμβος που χρησιμοποιείται από π
msgid ""
"* One node that is used by more than one way and one of those ways, or"
msgstr ""
+"* Ένας κόμβος ο οποίος χρησιμοποιείται από περισσότερες από μία διαδρομή "
+"και σε μία από αυτές τις διαδρομές, ή"
msgid ""
"* One way that has one or more nodes that are used by more than one way, or"
@@ -1468,6 +1520,27 @@ msgstr ""
"δημιουργήσει προβλήματα επειδή δεν βλέπετε το πραγματικό "
"αντικείμενο.<br>Θέλετε πράγματι να κάνετε αποκόλληση?"
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Αναίρεση"
@@ -1492,9 +1565,6 @@ msgstr "Ανανέωση δεδομένων"
msgid "Updates the objects in the active data layer from the server."
msgstr "Ανανεώνει τα αντικείμενα στο ενεργό επίπεδο από τον διακομιστή."
-msgid "Download data"
-msgstr "Λήψη δεδομένων"
-
msgid "Update modified"
msgstr "Ενημέρωση αλλαγμένων"
@@ -1551,7 +1621,7 @@ msgid ""
msgstr ""
msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Αγνόηση αυτής της συμβουλής και αποστολή"
msgid "No changes to upload."
msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
@@ -1587,7 +1657,7 @@ msgid "Test {0}/{1}: Starting {2}"
msgstr "Δοκιμή {0}/{1}: Εκκίνηση {2}"
msgid "Updating ignored errors ..."
-msgstr ""
+msgstr "Ενημέρωση αγνοημένων σφαλμάτων ..."
msgid "Viewport Following"
msgstr ""
@@ -1611,34 +1681,38 @@ msgid "Zoom In"
msgstr "Μεγέθυνση"
msgid "Zoom In (Keypad)"
-msgstr ""
+msgstr "Μεγέθυνση (πλήκτρα)"
msgid "Zoom Out"
msgstr "Σμίκρυνση"
msgid "Zoom Out (Keypad)"
-msgstr ""
+msgstr "Σμίκρυνση (πλήκτρα)"
msgid "Zoom to"
-msgstr ""
+msgstr "Μεγέθυνση στο"
msgid "Zoom to the object the first selected member refers to"
msgstr ""
msgid "Zooming disabled because layer of this relation is not active"
msgstr ""
+"Η εστίαση απενεργοποιήθηκε επειδή το επίπεδο αυτής της σχέσης δεν είναι "
+"ενεργό"
msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Η εστίαση απενεργοποιήθηκε επειδή δεν υπάρχει επιλεγμένο μέλος"
msgid "Zoom to the first selected node"
-msgstr ""
+msgstr "Εστίαση στον πρώτο επιλεγμένο κόμβο"
msgid "Zooming disabled because layer of this way is not active"
msgstr ""
+"Η εστίαση απενεργοποιήθηκε επειδή το επίπεδο αυτής της διαδρομής δεν είναι "
+"ενεργό"
msgid "Zooming disabled because there is no selected node"
-msgstr ""
+msgstr "Η εστίαση απενεργοποιήθηκε επειδή δεν υπάρχει επιλεγμένος κόμβος"
msgctxt "audio"
msgid "Back"
@@ -1698,6 +1772,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Πιο αργά μπροστά"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Λήψη δεδομένων GPS"
@@ -1707,6 +1784,18 @@ msgstr "Λήψη Δεδομένων GPX"
msgid "Markers from {0}"
msgstr "Σημάδια από {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "Λήψη OSM"
+
msgid "Downloading data"
msgstr "Λήψη δεδομένων"
@@ -1726,6 +1815,31 @@ msgstr "Εντολή"
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Υπήρξε {0} διένεξη κατα τη διάρκεια της εισαγωγής"
+msgstr[1] "Υπήρξαν {0} δινέξεις κατα τη διάρκεια της εισαγωγής"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Διένεξη κατα τη διάρκεια της λήψης"
+msgstr[1] "Διενέξεις κατα τηδιάρκεια της λήψης"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Φόρτωση γονέων κόμβου {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Φόρτωση γονέων σχέσης {2}"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Λήψη {0} από {1} (απομένουν {2})"
@@ -1788,25 +1902,6 @@ msgstr "Τα παρακάτω σφάλματα προέκυψαν κατά τη
msgid "Errors during download"
msgstr "Σφάλματα κατα τη διάρκεια της λήψης"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Υπήρξε {0} διένεξη κατα τη διάρκεια της εισαγωγής"
-msgstr[1] "Υπήρξαν {0} δινέξεις κατα τη διάρκεια της εισαγωγής"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Διένεξη κατα τη διάρκεια της λήψης"
-msgstr[1] "Διενέξεις κατα τηδιάρκεια της λήψης"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Φόρτωση γονέων κόμβου {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Φόρτωση γονέων σχέσης {2}"
-
msgid "Error during download"
msgstr "Σφάλμα κατα τη διάρκεια της λήψης"
@@ -1951,11 +2046,15 @@ msgstr "Βελτίωση Ακρίβειας Διαδρομής"
msgid "Improve Way Accuracy mode"
msgstr "Λειτουργία Βελτίωσης Ακρίβειας Διαδρομής"
-msgid "Click on the way to start improving its shape."
+msgid "improve way accuracy helper line"
msgstr ""
+msgid "Click on the way to start improving its shape."
+msgstr "πατήστε στη διαδρομή για να αρχίσετε τη βελτίωση του σχήματος της"
+
msgid "Select a way that you want to make more accurate."
msgstr ""
+"Επιλέξτε μια διαδρομή την οποία θέλετε να βελτιώσετε την ακρίβειά της"
msgid ""
"Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
@@ -1973,18 +2072,19 @@ msgid ""
msgstr ""
msgid "Cannot place a node outside of the world."
-msgstr ""
+msgstr "Δεν μπορεί να τοποθετηθεί κόμβος εκτός κόσμου."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Προσθήκη νέου κόμβου στη διαδρομή"
-msgstr[1] "Προσθήκη νέου κόμβου σε {0} διαδρομές"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr ""
+"Δεν μπορεί να διαγραφεί κόμβος ο οποίος αναφέρεται από πολλαπλά αντικείμενα"
msgid "Cannot delete node that has tags"
-msgstr ""
+msgstr "Δεν μπορεί να διαγραφεί κόμβος ο οποίος έχει ετικέτες"
msgid "Parallel"
msgstr "Παράλληλο"
@@ -1992,6 +2092,9 @@ msgstr "Παράλληλο"
msgid "Make parallel copies of ways"
msgstr "Δημιουργία παράλληλων αντιγράφων διαδρομών"
+msgid "make parallel helper line"
+msgstr "κατασκευή παράλληλης βοηθητικής γραμμής"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2049,7 +2152,7 @@ msgid "Ctrl to merge with nearest node."
msgstr "Ctrl για συγχώνευση με τον πλησιέστερο κόμβο."
msgid "Release the mouse button to stop moving."
-msgstr ""
+msgstr "Αφήστε το κουμπί του ποντικιού για να σταματήσει η μετακίνηση"
msgid "Release the mouse button to stop rotating."
msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
@@ -2085,12 +2188,12 @@ msgid "Add all objects selected in the current dataset after the last member"
msgstr "Προσθήκη όλων των επιλεγμένων αντικειμένων μετά το τελευταίο μέλος"
msgid "Add selection to relation"
-msgstr ""
+msgstr "Προσθήκη της επιλογής σε σχέση"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Προσθήκη της επιλογής σε {0} σχέση"
+msgstr[1] "Προσθήκη της επιλογής σε {0} σχέσεις"
msgid "Delete the selected relation"
msgstr "Διαγραφή της επιλεγμένης σχέσης"
@@ -2109,12 +2212,14 @@ msgstr "Λήψη των ημιτελών μελών"
msgid "Create a copy of this relation and open it in another editor window"
msgstr ""
+"Δημιουργία αντιγράφου αυτής της σχέσης και άνοιγμα σε άλλο παράθυρο "
+"επεξεργαστή"
msgid "Edit"
msgstr "Επεξεργασία"
msgid "Call relation editor for selected relation"
-msgstr ""
+msgstr "Κλήση του επεξεργαστή σχέσης για την επιλεγμένη σχέση"
msgid "Select in relation list"
msgstr "Επιλογή στη λίστα συσχετίσεων"
@@ -2123,10 +2228,10 @@ msgid "Select relation in relation list."
msgstr "Επιλογή συσχέτισης στη λίστα συσχετίσεων"
msgid "Add the members of all selected relations to current selection"
-msgstr ""
+msgstr "Προσθήκη των μελών όλων των επιλεγμένων σχέσεων στην τρέχουσα σχέση"
msgid "Select the members of all selected relations"
-msgstr ""
+msgstr "Επιλογή των μελών όλων των επιλεγμένων σχέσεων"
msgid "Select members (add)"
msgstr "Επιλογή μελών (προσθήκη)"
@@ -2135,7 +2240,7 @@ msgid "Select members"
msgstr "Επιλογή μελών"
msgid "Add the selected relations to the current selection"
-msgstr ""
+msgstr "Προσθήκη των επιλεγμένων σχέσεων στην τρέχουσα επιλογή"
msgid "Set the current selection to the list of selected relations"
msgstr ""
@@ -2228,7 +2333,7 @@ msgid "Search"
msgstr "Αναζήτηση"
msgid "Submit filter"
-msgstr ""
+msgstr "Υποβολή φίλτρου"
msgid "Start Search"
msgstr "Έναρξη αναζήτησης"
@@ -2416,6 +2521,9 @@ msgstr "''τιμή'' δε οποιοδήποτε κλειδί"
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2450,7 +2558,7 @@ msgid "all closed ways"
msgstr "όλες τις κλειστές διαδρομές"
msgid "object without useful tags"
-msgstr ""
+msgstr "αντικείμενο χωρίς χρήσιμες ετικέτες"
msgid "metadata"
msgstr "μεταδεδομένα"
@@ -2501,7 +2609,7 @@ msgid "all incomplete objects"
msgstr "όλα τα ημιτελή αντικείμενα"
msgid "related objects"
-msgstr ""
+msgstr "σχετικά αντικείμενα"
msgid "all children of objects matching the expression"
msgstr ""
@@ -2576,13 +2684,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2591,6 +2699,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2609,8 +2720,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2628,13 +2738,13 @@ msgid "API Capabilities Violation"
msgstr "Παραβίαση Δυνατοτήτων API"
msgid "Cyclic dependency between relations:"
-msgstr ""
+msgstr "Κυκλική εξάρτηση μεταξύ των σχέσεων"
msgid "Removed obsolete tags"
msgstr ""
msgid "Fix deprecated tags"
-msgstr ""
+msgstr "Επισκευή παρωχημένων ετικετών"
msgid ""
"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -2649,7 +2759,7 @@ msgid "... refers to relation"
msgstr "...αναφέρεται στη σχέση"
msgid "Cycling dependencies"
-msgstr ""
+msgstr "Κυκλικές εξαρτήσεις"
msgid ""
"The following are results of automatic validation. Try fixing these, but be "
@@ -2701,6 +2811,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Προστέθηκε {0} αντικείμενο"
msgstr[1] "Προστέθηκαν {0} αντικείμενα"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Αλλαγή κόμβου {0}"
@@ -2737,10 +2850,10 @@ msgstr "Αφαίρεση \"{0}\" για {1} αντικείμενα"
msgid "Set {0}={1} for {2} objects"
msgstr "Καθορισμός {0}={1} για ''{2}'' αντικείμενα"
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2765,11 +2878,9 @@ msgid "Double conflict"
msgstr "Διπλή διένεξη"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Προειδοποίηση: Το επίπεδο ''{0}'' δεν υπάρχει πια. Δεν μπορώ να αφαιρέσω τη "
-"διένεξη για το αντικείμενο ''{1}''"
msgid "Add conflict for ''{0}''"
msgstr "Προσθήκη διένεξης για ''{0}''"
@@ -2886,6 +2997,9 @@ msgstr[1] "Απαλοιφή {0} αντικειμένων"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Επίλυση διενέξεων στη λίστα μελών της σχέσης {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Περιστροφή {0} κόμβου"
@@ -2946,12 +3060,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Όταν αντιστρέψετε αυτή τη διαδρομή, οι παρακάτω αλλαγές στις ιδιότητες της "
-"διαδρομής και των κόμβων της πρέπει γίνουν ώστε να διατηρηθεί η συνοχή των "
-"δεδομένων."
msgid "Relation"
msgstr "Σχέση"
@@ -2980,11 +3091,11 @@ msgstr "Εφαρμογή επιλεγμένων αλλαγών"
msgid "Do not apply changes"
msgstr "Να μην εφαρμοστούν οι αλλαγές"
-msgid "Please select which property changes you want to apply."
-msgstr "Παρακαλώ επιλέξτε ποιές αλλαγές ιδιοτήτων θέλετε να εφαρμόσετε."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Ιδιότητες του "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Ρόλοι σε σχέσεις που αναφέροντε στο"
@@ -3007,6 +3118,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Αδυναμία διαγραφής του παλιού εφεδρικού αρχείου {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -3037,18 +3151,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -3057,8 +3171,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -3066,13 +3180,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -3086,8 +3198,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3118,11 +3230,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "ΆΓΝΩΣΤΟ"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3275,8 +3386,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Η παράμετρος {0} δεν είναι στο εύρος 0...{1}. Είναι ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3383,7 +3493,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3402,6 +3512,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3418,9 +3531,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3461,6 +3571,9 @@ msgstr "άλλο επαλήθευσης"
msgid "Running test {0}"
msgstr "Εκτέλεση δοκιμής {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Διευθύνσεις"
@@ -3485,6 +3598,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr "Κτήριο εντός κτηρίου"
@@ -3546,15 +3668,15 @@ msgstr " ή "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} είναι παρωχημένες, χρησιμοποίησε {1} αντί αυτών"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Διπλασιασμένοι κόμβοι"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Αυτή δοκιμή ελέγχει ότι δεν υπάρχουν κόμβοι σε ίδια τοποθεσία."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Αναπαραγωγή κόμβων σε δύο μη κλειστές διαδρομές"
-
msgid "Mixed type duplicated nodes"
msgstr "Διπλασιασμένοι κόμβοι διαφορετικού τύπου"
@@ -3624,6 +3746,24 @@ msgstr "Διπλασιασμένοι κόμβοι διαδρομής"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Ελέγχει για διαδρομές με πανομοιότυπους συνεχόμενους κόμβους."
+msgid "Highways"
+msgstr "Λεωφόροι"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Πολύ-πολύγωνο"
@@ -3694,6 +3834,12 @@ msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
"Αυτή η δοκιμή βρίσκει κόμβους που έχουν το ίδιο όνομα (ίσως είναι αντίγραφα)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "Αλληλεπικαλυπτόμενες περιοχές"
@@ -3751,15 +3897,15 @@ msgstr "Ο τύπος της σχέσης είναι αγνωστος"
msgid "Relation is empty"
msgstr "Η σχέση είναι άδεια"
+msgid "Role verification problem"
+msgstr ""
+
msgid "<empty>"
msgstr "<κενό>"
msgid "Role {0} missing"
msgstr ""
-msgid "Role verification problem"
-msgstr ""
-
msgid "Number of {0} roles too low ({1})"
msgstr ""
@@ -3793,12 +3939,11 @@ msgstr ""
"Αυτή η δοκιμή ελέγχει για διαδρομές με παρόμοιο όνομα που μπορεί να είναι "
"ανορθόγραφες."
-msgid "Properties checker :"
-msgstr "Ελεγκτής ιδιοτήτων:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
-"Αυτό το πρόσθετο ελέγχει για σφάλματα στα κλειδιά και τις τιμές ιδιοτήτων."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr ""
@@ -3936,8 +4081,8 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)"
-msgid "Fix properties"
-msgstr "Διόρθωση ιδιοτήτων"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Δεν βρέθηκε ο τύπος του στοιχείου"
@@ -4011,6 +4156,9 @@ msgstr "Ανοικτές Διαδρομές"
msgid "This tests if ways which should be circular are closed."
msgstr "Ελέγχει εάν διαδρομές που πρέπει να είναι κυκλικές είναι κλειστές."
+msgid "Unclosed way"
+msgstr "Ανοικτή διαδρομή"
+
msgid "natural type {0}"
msgstr ""
@@ -4041,9 +4189,6 @@ msgstr "κτίριο"
msgid "area"
msgstr "περιοχή"
-msgid "Unclosed way"
-msgstr "Ανοικτή διαδρομή"
-
msgid "Unconnected ways"
msgstr "Ασύνδετες διαδρομές"
@@ -4072,12 +4217,12 @@ msgstr ""
"Αυτή η δοκιμή ελέγχει για κόμβους χωρίς ετικέτα που δεν είναι μέρος κάποιας "
"διαδρομής."
-msgid "No tags"
-msgstr "Χωρίς ετικέτες"
-
msgid "Unconnected nodes without physical tags"
msgstr "Ασύνδετοι κόμβοι χωρίς ετικέτες"
+msgid "No tags"
+msgstr "Χωρίς ετικέτες"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Έχει ετικέτα που περιέχει ''fixme'' ή ''FIXME''"
@@ -4141,28 +4286,6 @@ msgstr "Ανάποδη ακτογραμμή: η ξηρά δεν είναι στ
msgid "Reversed land: land not on left side"
msgstr "Αντίστροφη ξηρά: η ξηρά δεν είναι στην αριστερή πλευρά"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Σφάλμα ανάγνωσης καταχώρησης σελιδοδείκτη: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Σφάλμα: Μη αναμενόμενη γραμμή ''{0}'' στο αρχείο σελιδοδεικτών ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Σφάλμα: παράτυπη διπλή τιμή ''{0}'' στη γραμμή ''{1}'' στο αρχείο "
-"σελιδοδείκτη ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Δεν μπορώ να διαβάσω τους σελιδοδείκτες από<br>''{0}''<br>Το σφάλμα "
-"ήταν: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Να μην εμφανιστεί ξανά (απομνημόνευση επιλογής)"
@@ -4266,7 +4389,7 @@ msgstr "Εμφάνιση πληροφοριών βοήθειας"
msgid "Downloading \"Message of the day\""
msgstr "Λήψη \"Μηνύματος Ημέρας\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4474,9 +4597,24 @@ msgstr "Προβολή"
msgid "Tools"
msgstr "Εργαλεία"
-msgid "Presets"
-msgstr "Προεπιλογές"
-
+msgid "More tools"
+msgstr "Περισσότερα εργαλεία"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Επιλογή"
+
+msgid "Presets"
+msgstr "Προεπιλογές"
+
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr "Παράθυρα"
@@ -4492,10 +4630,22 @@ msgstr "Επεξεργασία εργαλειοθήκης"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Ήχος"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4504,6 +4654,9 @@ msgstr "Απόκρυψη αυτού του κουμπιού"
msgid "Click the arrow at the bottom to show it again."
msgstr "Κλικ το βέλος στον πάτο για να εμφανιστεί ξανά."
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4563,6 +4716,9 @@ msgstr "(κανένα αντικείμενο)"
msgid "User:"
msgstr "Χρήστης:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "το επίπεδο δεν είναι στη λίστα."
@@ -4590,19 +4746,6 @@ msgstr "στο παρασκήνιο"
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4906,29 +5049,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4943,8 +5104,8 @@ msgstr ""
msgid "Up"
msgstr "Πάνω"
-msgid "Move up the selected elements by one position."
-msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα πάνω κατά μία θέση"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Κάτω"
@@ -4996,14 +5157,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Κόμβος"
@@ -5253,14 +5406,14 @@ msgctxt "tag"
msgid "Key:"
msgstr "Κλειδί:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr "Τιμή:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5787,6 +5940,9 @@ msgstr "Εμφάνιση/Απόκρυψη"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5870,6 +6026,37 @@ msgstr ""
msgid "No"
msgstr "Όχι"
+msgid "Object type:"
+msgstr "Τύπος αντικειμένου:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "μικτό"
+
+msgid "Choose the OSM object type"
+msgstr "Επιλέξτε τον τύπο του αντικειμένου OSM"
+
+msgid "Object ID:"
+msgstr "Αναγνωριστικό Αντικειμένου (ID):"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Εισάγετε το αναγνωριστικό του αντικειμένου του οποίου θα γίνει λήψη"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Τα αναγνωριστικά τω αντικειμένων μπορούν να είναι χωρισμένα με κώμα ή "
+"κενό.<br/> Παραδείγματα: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> "
+"Στον μικτό τρόπο, καθορίστε τα αντικείμενα έτσι: <b>w123, n110, w12, "
+"r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Σχέσεις"
@@ -5891,9 +6078,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Σχέσεις: {0}"
-msgid "Selection"
-msgstr "Επιλογή"
-
msgid "Open a selection list window."
msgstr "Άνοιγμα παραθύρου λίστας επιλεγμένων"
@@ -5918,18 +6102,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Επιλογή: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5949,6 +6121,18 @@ msgid "Click to minimize/maximize the panel content"
msgstr ""
"Κάντε κλικ για να ελαχιστοποιήσετε/μεγιστοποιήσετε το περιεχόμενο του πάνελ"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Συγγραφείς"
@@ -5967,8 +6151,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5994,9 +6177,6 @@ msgstr "Άνοιγμα παραθύρου επικύρωσης."
msgid "Validation results"
msgstr "Αποτελέσματα επικύρωσης"
-msgid "Zoom to problem"
-msgstr "Ζούμ στο πρόβλημα"
-
msgid "Fix"
msgstr "Διόρθωση"
@@ -6150,9 +6330,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr "Ενημέρωση περιεχομένου ομάδας αλλαγών από τον διακομιστή OSM"
-msgid "Show history"
-msgstr "Προβολή ιστορικού"
-
msgid "Download and show the history of the selected objects"
msgstr "Λήψη και προβολή ιστορικού των επιλεγμένων αντικειμένων"
@@ -6441,8 +6618,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6507,35 +6684,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
-msgstr "Επέλεξε τα αντικείμενα στα οποία θέλεις να αλλάξεις τις ιδιότητες."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Ιδιότητες/Υπαγωγές"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<διαφορετικά>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Μέλος του"
msgid "Position"
msgstr "Θέση"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Ιδιότητες / Υπαγωγές"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
-msgid "Delete Properties"
-msgstr "Διαγραφή Ιδιοτήτων"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Αλλαγή σχέσης"
@@ -6549,15 +6738,15 @@ msgstr "Σίγουρα επιθυμήτε την διαγραφή της επι
msgid "Add a new key/value pair to all objects"
msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
-msgid "Add Property"
-msgstr "Προσθήκη Ιδιότητας"
+msgid "Add Tag"
+msgstr "Προσθήκη Ετικέτας"
msgid "Edit the value of the selected key for all objects"
msgstr ""
"Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
-msgid "Edit Properties"
-msgstr "Επεξεργασία Ιδιοτήτων"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr ""
@@ -6636,12 +6825,6 @@ msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr "Προσθήκη τιμής;"
@@ -6671,9 +6854,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6711,7 +6900,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr "Γίνεται λήψη της σχέσης {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6771,6 +6960,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7032,6 +7224,27 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Σφάλμα ανάγνωσης καταχώρησης σελιδοδείκτη: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Δεν μπορώ να διαβάσω τους σελιδοδείκτες από<br>''{0}''<br>Το σφάλμα "
+"ήταν: {1}</html>"
+
msgid "Bookmarks"
msgstr "Σελιδοδείκτες"
@@ -7101,9 +7314,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr "Επικόληση URL από το πρόχειρο"
-
msgid "Data Sources and Types:"
msgstr "Πηγές και τύποι δεδομένων:"
@@ -7173,21 +7383,8 @@ msgstr ""
msgid "Download object"
msgstr "Λήψη Αντικειμένου"
-msgid "Object type:"
-msgstr "Τύπος αντικειμένου:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "μικτό"
-
-msgid "Choose the OSM object type"
-msgstr "Επιλέξτε τον τύπο του αντικειμένου OSM"
-
-msgid "Object ID:"
-msgstr "Αναγνωριστικό Αντικειμένου (ID):"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Εισάγετε το αναγνωριστικό του αντικειμένου του οποίου θα γίνει λήψη"
+msgid "Start downloading"
+msgstr "Εκκίνηση λήψης"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7197,27 +7394,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Επιλέξτε αν θα πρέπει να ληφθούν επίσης και τα μέλη μιας συσχέτισης"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Τα αναγνωριστικά τω αντικειμένων μπορούν να είναι χωρισμένα με κώμα ή "
-"κενό.<br/> Παραδείγματα: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> "
-"Στον μικτό τρόπο, καθορίστε τα αντικείμενα έτσι: <b>w123, n110, w12, "
-"r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Εκκίνηση λήψης"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7314,7 +7493,7 @@ msgstr "Μετάβαση στην επόμενη σελίδα"
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7415,6 +7594,9 @@ msgstr ""
"<html>Έκδοση <strong>{0}</strong> δημιουργήθηκε στις "
"<strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Πληροφορίες ομάδας αλλαγών"
@@ -7510,7 +7692,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7529,6 +7711,12 @@ msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλ
msgid "Enter an upload comment"
msgstr "Εισαγωγή σχολίου αποστολής"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Αναγνωριστικό ομάδας αλλαγών:"
@@ -7597,8 +7785,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7673,8 +7860,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7688,8 +7875,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7915,12 +8101,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr "Παρακαλώ διορθώστε τα σχόλια αποστολής"
-msgid "Revise"
-msgstr "Διόρθωση"
-
-msgid "Continue as is"
-msgstr "Συνέχεια ως έχει"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7935,6 +8115,22 @@ msgstr ""
"λεπτό εξηγώντας τις αλλαγές, θα κάνεις τη ζωή<br />ευκολότερη σε πολλούς "
"άλλους χαρτογράφους."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Διόρθωση"
+
+msgid "Continue as is"
+msgstr "Συνέχεια ως έχει"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7950,6 +8146,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7957,11 +8168,9 @@ msgid "Tags of changeset {0}"
msgstr "Ετικέτες της ομάδας αλλαγών {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Προειδοποίηση: Το αντικείμενο ''{0}'' είναι ήδη διαγραμμένο στον διακομιστή. "
-"Παράλειψη αυτού του αντικειμένου και επανάληψη προσπάθειας αποστολής."
msgid "Preparing objects to upload ..."
msgstr ""
@@ -8090,9 +8299,6 @@ msgstr ""
"Το αντικείμενο ''{0}'' είναι ήδη διαγραμμένο. Παράλειψη αντικειμένου κατά "
"την αποστολή."
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Αποστολή {0} αντικειμένου..."
@@ -8102,6 +8308,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8118,7 +8327,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr "Ακύρωση αποστολής"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8265,7 +8474,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8295,7 +8504,7 @@ msgstr "έκδοση {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8409,6 +8618,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8447,6 +8659,9 @@ msgstr "Ανανέωση λανθασμένων πλακιδίων"
msgid "Alpha channel"
msgstr "Κανάλι άλφα"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8643,9 +8858,6 @@ msgstr "Εξαγωγή τοποθεσιών GPS από EXIF"
msgid "Starting directory scan"
msgstr "Έναρξη σάρωσης καταλόγου"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Ανάγνωση φωτογραφιών"
@@ -8664,7 +8876,10 @@ msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {
msgid "Error while getting files from directory {0}\n"
msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
-msgid "Geotagged Images"
+msgid "One of the selected files was null"
+msgstr ""
+
+msgid "Geotagged Images"
msgstr ""
msgid "{0} image loaded."
@@ -8721,6 +8936,12 @@ msgstr "Επόμενο"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Κεντράρισμα επιπέδου"
@@ -8791,9 +9012,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8806,8 +9024,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Λήψη όλων εντός:"
@@ -8833,15 +9054,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>Αυτή η ενέργεια απαιτεί {0} ξεχωριστές<br>αιτήσεις λήψης. "
-"Επιθυμείτε<br>να συνεχίσετε;</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -8974,14 +9197,10 @@ msgstr ""
msgid "(URL was: "
msgstr "Το URL ήταν: "
-msgid "Error displaying URL"
-msgstr "Σφάλμα στην εμφάνιση του URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8996,7 +9215,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -9006,8 +9225,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9227,7 +9445,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9293,6 +9511,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9350,9 +9574,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr "Επανεκκίνηση"
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9605,6 +9826,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Τηλεχειρισμός"
@@ -9733,6 +9957,12 @@ msgstr "Αφαίρεση από την εργαλειοθήκη"
msgid "Configure toolbar"
msgstr "Ρύθμιση εργαλειοθήκης"
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "Ενέργειες"
@@ -9775,6 +10005,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Επικυρωτής δεδομένων"
@@ -9828,6 +10061,27 @@ msgstr "Αναζήτηση: "
msgid "Read from file"
msgstr ""
+msgid "Export selected items"
+msgstr ""
+
+msgid "JOSM custom settings files (*.xml)"
+msgstr ""
+
+msgid "Please select some preference keys not marked as default"
+msgstr ""
+
+msgid "Export preferences keys to JOSM customization file"
+msgstr ""
+
+msgid "What to do with preference lists when this file is to be imported?"
+msgstr ""
+
+msgid "Append preferences from file to existing values"
+msgstr ""
+
+msgid "Replace existing values"
+msgstr ""
+
msgid "Open JOSM customization file"
msgstr ""
@@ -9840,40 +10094,58 @@ msgid ""
"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Export selected items"
+msgid "shortcut"
msgstr ""
-msgid "Please select some preference keys not marked as default"
+msgid "color"
msgstr ""
-msgid "Export preferences keys to JOSM customization file"
+msgid "toolbar"
msgstr ""
-msgid "What to do with preference lists when this file is to be imported?"
+msgid "imagery"
msgstr ""
-msgid "Append preferences from file to existing values"
+msgid "Reset preferences"
msgstr ""
-msgid "Replace existing values"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Load profile"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Save {0} profile"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Current value is default."
+msgid "Choose profile file"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "Change list setting"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "Key: {0}"
+msgstr ""
+
+msgid "Change list of lists setting"
+msgstr ""
+
+msgid "add entry"
+msgstr ""
+
+msgid "Remove the selected entry"
+msgstr ""
+
+msgid "Change list of maps setting"
+msgstr ""
+
+msgid "Entry {0}"
msgstr ""
msgid "Select Setting Type:"
@@ -9894,25 +10166,19 @@ msgstr ""
msgid "Add setting"
msgstr ""
-msgid "Change list setting"
-msgstr ""
-
-msgid "Key: {0}"
-msgstr ""
-
-msgid "Change list of lists setting"
+msgid "Advanced Background: Changed"
msgstr ""
-msgid "add entry"
+msgid "Advanced Background: NonDefault"
msgstr ""
-msgid "Remove the selected entry"
+msgid "Current value is default."
msgstr ""
-msgid "Change list of maps setting"
+msgid "Default value is ''{0}''."
msgstr ""
-msgid "Entry {0}"
+msgid "Default value currently unknown (setting has not been used yet)."
msgstr ""
msgid "Change string setting"
@@ -9972,6 +10238,9 @@ msgstr "Σχεδιασμός εικονικών κόμβων σε κατάστα
msgid "Draw inactive layers in other color"
msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10026,6 +10295,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10314,7 +10588,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10490,6 +10770,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Εφεδρικά αρχεία"
@@ -10553,7 +10839,7 @@ msgstr "Ρυθμίσεις Χάρτη"
msgid "Settings for the map projection and data interpretation."
msgstr "Ρυθμίσεις για την προβολή χάρτη και την ερμηνεία δεδομένων."
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10813,21 +11099,6 @@ msgstr "Ελβετικό πλέγμα (Ελβετία)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (χωρίς τοπικές διορθώσεις)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Ζώνη UTM"
-
-msgid "North"
-msgstr "Βορράς"
-
-msgid "South"
-msgstr "Νότος"
-
-msgid "Hemisphere"
-msgstr "Ημισφαίριο"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Γουαδελούπη Fort-Marigot 1949"
@@ -10849,6 +11120,21 @@ msgstr "UTM Γαλλία (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Γεωδαιτικό σύστημα"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Ζώνη UTM"
+
+msgid "North"
+msgstr "Βορράς"
+
+msgid "South"
+msgstr "Νότος"
+
+msgid "Hemisphere"
+msgstr "Ημισφαίριο"
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -10900,8 +11186,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Επιλογή χρήσης OAuth ως μηχανισμό πιστοποίησης"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10910,20 +11196,25 @@ msgstr "OSM όνομα χρήστη:"
msgid "OSM password:"
msgstr "OSM κωδικός:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -11011,16 +11302,10 @@ msgid "Use a SOCKS proxy"
msgstr "Χρήση ενός διαμεσολαβητή SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-msgid "disabled"
-msgstr "απενεργοποιημένο"
-
-msgid "no modifier"
-msgstr "κανένας τροποποιητής"
-
msgid "Shortcut Background: User"
msgstr ""
@@ -11062,32 +11347,37 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Χρήση προεπιλογής \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Αλλαγή {0} αντικειμένου"
+msgstr[1] "Αλλαγή {0} αντικειμένων"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Τίποτα επιλεγμένο!"
+
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
-msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
+msgid "Apply Preset"
+msgstr "Εφαρμογή Προεπιλογής"
+
+msgid "New relation"
+msgstr "Νέα σχέση"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11095,6 +11385,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
+
msgid "Available roles"
msgstr "Διαθέσιμοι ρόλοι"
@@ -11110,52 +11403,42 @@ msgstr "στοιχεία"
msgid "Optional Attributes:"
msgstr "Προαιρετικά Χαρακτηριστικά:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
-
-msgid "Use preset ''{0}''"
-msgstr "Χρήση προεπιλογής \"{0}\""
-
-msgid "Unknown type: {0}"
-msgstr "Άγνωστος τύπος: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Error parsing {0}: "
-msgstr "Σφάλμα ανάλυσης {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Αλλαγή {0} αντικειμένου"
-msgstr[1] "Αλλαγή {0} αντικειμένων"
-
-msgid "Nothing selected!"
-msgstr "Τίποτα επιλεγμένο!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Selection unsuitable!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Apply Preset"
-msgstr "Εφαρμογή Προεπιλογής"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "New relation"
-msgstr "Νέα σχέση"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Change Properties"
-msgstr "Αλλαγή ιδιοτήτων"
+msgid "Unknown type: {0}"
+msgstr "Άγνωστος τύπος: {0}"
msgid "Preset group {1} / {0}"
msgstr "Προεπιλογές ομάδας {1} / {0}"
@@ -11163,10 +11446,22 @@ msgstr "Προεπιλογές ομάδας {1} / {0}"
msgid "Preset group {0}"
msgstr "Προεπιλογές ομάδας {0}"
-msgid "Search preset"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Show preset search dialog"
+msgid "Preset role element without parent"
+msgstr ""
+
+msgid "Preset sub element without parent"
+msgstr ""
+
+msgid "Error parsing {0}: "
+msgstr "Σφάλμα ανάλυσης {0}: "
+
+msgid "Search preset"
+msgstr ""
+
+msgid "Show preset search dialog"
msgstr "Εμφάνιση διαλόγου αναζήτησης προεπιλογών"
msgid "Search presets"
@@ -11178,6 +11473,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -11207,6 +11510,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11237,7 +11583,7 @@ msgid "Contacting OSM Server..."
msgstr "Επικοινωνία με τον διακομιστή OSM"
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11277,28 +11623,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11397,6 +11741,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11412,12 +11759,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11496,8 +11851,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Επιτυχία εισαγωγής NMEA"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Αποτυχία εισαγωγής NMEA!"
@@ -11595,35 +11950,11 @@ msgstr "Δεν βρέθηκαν δεδομένα στο αρχείο {0}."
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11633,8 +11964,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11661,10 +11992,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11675,9 +12003,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11699,6 +12024,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11748,8 +12076,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11894,6 +12222,9 @@ msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρ
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11912,6 +12243,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr "Φόρτωση δεδομένων από το API"
@@ -11936,7 +12276,13 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -11945,9 +12291,6 @@ msgstr "Ζητήθηκε από τον Τηλεχειρισμό να δημιο
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr ""
-
msgid "Remote Control has been asked to create a new way."
msgstr "Ζητήθηκε από τον Τηλεχειρισμό να δημιουργήσει μια νέα διαδρομή."
@@ -11957,6 +12300,14 @@ msgstr "Μη έγκυρες συντεταγμένες: {0}"
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11974,6 +12325,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr "Ζητήθηκε από τον Τηλεχειρισμό να φορτώσει δεδομένα από το API:"
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12008,19 +12368,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12042,11 +12402,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Αρχείο συνεδρίας (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -12116,13 +12488,13 @@ msgid "Download skipped"
msgstr "Η λήψη παραλείφθηκε"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12270,10 +12642,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12288,22 +12660,21 @@ msgstr "Διατήρηση πρόσθετου"
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12380,8 +12751,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr "Επεξεργασία αρχείου ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12396,9 +12766,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr "Γίνεται λήψη λίστας πρόσθετων από ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12726,17 +13111,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12747,9 +13126,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12781,9 +13203,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
msgstr ""
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13109,6 +13545,11 @@ msgid "Saturation:"
msgstr "Κορεσμός:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13188,6 +13629,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Βρίσκει και διορθώνει μη έγκυρες διευθύνσεις με εύκολο τρόπο."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13289,9 +13734,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr "Απλή μετατροπή μιας περιοχής σε πολύ-πολύγωνο"
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13347,6 +13789,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13371,9 +13816,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Πίνακας δημιουργίας και επεξεργασίας σχέσης και πολύ-πολυγώνου."
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13399,9 +13841,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13438,6 +13877,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13487,9 +13931,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Λεωφόροι"
-
msgid "Streets"
msgstr "Οδοί"
@@ -13574,6 +14015,9 @@ msgstr "Ανάχωμα"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Διόδια"
+
msgid "Motorway Link"
msgstr ""
@@ -13664,44 +14108,91 @@ msgstr "Οικιστική"
msgid "Edit Residential Street"
msgstr "Επεξεργασία οικιστικής οδού"
-msgid "Living Street"
+msgid "Bicycle Road"
msgstr ""
-msgid "Edit Living Street"
+msgid "Edit Bicycle Road"
msgstr ""
-msgid "Pedestrian"
-msgstr "Πεζόδρομος"
-
-msgid "Edit Pedestrian Street"
-msgstr "Επεξεργασία Πεοζόδρομου"
-
-msgid "Area"
-msgstr "Επιφάνεια"
+msgid "Highway type"
+msgstr "Τύπος οδικής αρτηρίας"
-msgid "Service"
+msgctxt "Highway"
+msgid "residential"
msgstr ""
-msgid "Edit Serviceway"
+msgctxt "Highway"
+msgid "service"
msgstr ""
-msgid "Serviceway type"
+msgctxt "Highway"
+msgid "unclassified"
msgstr ""
-msgid "alley"
+msgctxt "Highway"
+msgid "path"
msgstr ""
-msgid "driveway"
+msgctxt "Highway"
+msgid "cycleway"
msgstr ""
-msgid "parking_aisle"
+msgid "Vehicle access"
msgstr ""
-msgid "Parking Aisle"
-msgstr ""
+msgid "yes"
+msgstr "ναι"
-msgid "Edit Parking Aisle"
-msgstr ""
+msgid "no"
+msgstr "όχι"
+
+msgid "destination"
+msgstr "προορισμός"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
+msgid "Living Street"
+msgstr ""
+
+msgid "Edit Living Street"
+msgstr ""
+
+msgid "Pedestrian"
+msgstr "Πεζόδρομος"
+
+msgid "Edit Pedestrian Street"
+msgstr "Επεξεργασία Πεοζόδρομου"
+
+msgid "Area"
+msgstr "Επιφάνεια"
+
+msgid "Service"
+msgstr ""
+
+msgid "Edit Service Way"
+msgstr ""
+
+msgid "Service way type"
+msgstr ""
+
+msgid "alley"
+msgstr ""
+
+msgid "driveway"
+msgstr ""
+
+msgid "parking_aisle"
+msgstr ""
+
+msgid "drive-through"
+msgstr ""
+
+msgid "Parking Aisle"
+msgstr ""
+
+msgid "Edit Parking Aisle"
+msgstr ""
msgid "Road (Unknown Type)"
msgstr "Δρόμος (Άγνωστος Τύπος)"
@@ -13724,18 +14215,12 @@ msgstr "κυκλικός κόμβος"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "ναι"
-
msgid "Road Restrictions"
msgstr "Περιορισμοί Δρόμου"
msgid "Edit Road Restrictions"
msgstr "Επεξεργασία Περιορισμών Δρόμου"
-msgid "Toll"
-msgstr "Διόδια"
-
msgid "No exit (cul-de-sac)"
msgstr "Αδιέξοδο"
@@ -13745,9 +14230,6 @@ msgstr ""
msgid "General Access"
msgstr "Γενική Πρόσβαση"
-msgid "destination"
-msgstr "προορισμός"
-
msgid "delivery"
msgstr "παράδοση"
@@ -13757,15 +14239,15 @@ msgstr ""
msgid "private"
msgstr "ιδιωτικό"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "αγροτικό"
msgid "forestry"
msgstr "δασικός"
-msgid "no"
-msgstr "όχι"
-
msgid "official"
msgstr ""
@@ -13811,6 +14293,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Μέσα Μαζικής Μεταφοράς (μμμ)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Ελαχ. ταχύτητα (χαω)"
@@ -13895,6 +14380,9 @@ msgstr "Επεξεργασία Γέφυρας"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13999,20 +14487,29 @@ msgstr ""
msgid "Visibility"
msgstr "Ορατότητα"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "άριστη"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "καλή"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "κακή"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "άθλια"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr ""
@@ -14029,10 +14526,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -14068,7 +14565,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr "Μονόδρομος (ποδήλατα)"
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14137,12 +14634,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Τηλέφωνο εκτάκτου ανάγκης"
+msgid "Drinking Water"
+msgstr "Πόσιμο Νερό"
msgid "Traffic Signal"
msgstr "Σηματοδότης"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Τύπος διάβασης πεζών"
@@ -14158,15 +14661,6 @@ msgstr "νησίδα"
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -14188,6 +14682,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "Stop"
@@ -14197,6 +14700,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Μικρός Κυκλικός Κόμβος"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Κατεύθυνση"
@@ -14206,10 +14712,7 @@ msgstr "δεξιόστροφα"
msgid "Pedestrian Crossing"
msgstr "Διάβαση Πεζών"
-msgid "Edit Crossing"
-msgstr "Επεξεργασία Διάβασης Πεζών"
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14242,9 +14745,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14278,19 +14778,43 @@ msgstr ""
msgid "Barriers"
msgstr "Εμπόδια"
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Επιτρεπόμενα οχήματα:"
+
+msgid "Material"
+msgstr "Υλικό"
+
+msgid "stone"
+msgstr "πέτρα"
+
msgid "Bollard"
msgstr "στύλος"
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
-msgstr "Επιτρεπόμενα οχήματα:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "πλαστικό"
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -14302,6 +14826,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -14323,44 +14850,88 @@ msgstr "Επεξεργασία Συνοριακού Σταθμού"
msgid "Hedge"
msgstr "Φράκτης θάμνων"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Ύψος (μέτρα)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Φράκτης"
+msgid "Edit Fence"
+msgstr ""
+
msgid "barbed_wire"
msgstr ""
-msgid "chain"
-msgstr "αλυσίδα"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "ηλεκτρικός"
-msgid "hedge"
-msgstr ""
-
msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Τοίχος"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Χαντάκι"
+msgstr ""
-msgid "Entrance"
-msgstr "Είσοδος"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Επεξεργασία Εισόδου"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Πύλη"
@@ -14392,12 +14963,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14455,6 +15041,9 @@ msgstr "Αποχέτευση"
msgid "Edit Drain"
msgstr "Επεξεργασία Αποχέτευσης"
+msgid "Ditch"
+msgstr "Χαντάκι"
+
msgid "Edit Ditch"
msgstr "Επεξεργασία Χαντακιού"
@@ -14464,6 +15053,12 @@ msgstr "Υδατόρρευμα"
msgid "Edit Stream"
msgstr "Επεξεργασία Υδατορρεύματος"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Κανάλι"
@@ -14503,9 +15098,6 @@ msgstr "Επεξεργασία Φweirράγματος"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14539,6 +15131,21 @@ msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
msgid "Edit Water"
msgstr "Επεξεργασία νερού"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Ξηρά"
@@ -14620,20 +15227,25 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
-msgstr "επιβάτες"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "όχημα"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "ποδήλατο"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "επιβάτες;όχημα"
+msgstr ""
msgid "Ferry Route"
msgstr "Δρομολόγιο Πορθμείου"
@@ -14704,7 +15316,10 @@ msgstr "στρατιωτική"
msgid "tourism"
msgstr "τουρισμός"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14728,11 +15343,14 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
-msgstr "Τάση ρεύματος"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Συχνότητα (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14743,9 +15361,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr "Τύποι"
-
msgid "Monorail"
msgstr ""
@@ -14788,18 +15403,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr "Ισόπεδη διάβαση"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Φυλασόμενη Διάβαση"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Είδος Διάβασης"
@@ -14899,11 +15552,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14915,13 +15566,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Επεξεργασία σταθμού"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Πυλώνας"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Επεξεργασία Πυλώνα"
+msgstr ""
msgid "Parking"
msgstr "Χώρος στάθμευσης"
@@ -14938,12 +15587,12 @@ msgstr "επιφάνεια"
msgid "underground"
msgstr "υπόγειο"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Πρόσβαση"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14971,9 +15620,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Χωρητικότητα"
@@ -14989,20 +15635,36 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Ώρες Λειτουργείας"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Δευ-Παρ 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Τρ-Κυ 08:00-15:00;Σα 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr ""
@@ -15151,6 +15813,9 @@ msgstr "Σταθμός φόρτισης"
msgid "Edit Charging Station (for electric cars)"
msgstr "Επεξεργασία Σταθμού Φόρτισης (για ηλεκτρικά αυτοκίνητα)"
+msgid "Voltage"
+msgstr "Τάση ρεύματος"
+
msgid "Amperage"
msgstr ""
@@ -15172,6 +15837,12 @@ msgstr "Συνεργείο Αυτοκινήτων"
msgid "Edit Car Repair"
msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
+msgid "Parts"
+msgstr "Ανταλλακτικά"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Ελαστικά"
@@ -15199,6 +15870,12 @@ msgstr "Ενοικίαση"
msgid "Edit Car Rental"
msgstr "Επεξεργασία Ενοικίασης"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Κοινή χρήση"
@@ -15223,22 +15900,6 @@ msgstr "Υπηρεσίες:"
msgid "Sale"
msgstr "Πώληση"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "ναι"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "μάρκα"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "μεταχειρισμένα"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "όχι"
-
msgid "brand"
msgstr ""
@@ -15260,9 +15921,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr "Ανταλλακτικά"
-
msgid "Clothes"
msgstr "Ρούχα"
@@ -15326,8 +15984,8 @@ msgstr "Επεξεργασία Ενοικίασης ποδηλάτων"
msgid "Public Transport"
msgstr "Μέσα Μαζικής Μεταφοράς"
-msgid "Route"
-msgstr "Διαδρομή"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Επεξεργασία Διαδρομής"
@@ -15457,6 +16115,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15487,6 +16148,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Παγκάκι"
@@ -15499,9 +16163,6 @@ msgstr "Αναπηρικό καρότσι"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15511,8 +16172,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Σταθμός τρένου"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Επεξεργασία σταθμού"
msgid "Building"
msgstr "Κτήριο"
@@ -15526,6 +16192,9 @@ msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρ
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15550,14 +16219,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Σταθμός τρένου"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Επεξεργασία σταθμού"
-
msgid "UIC-Reference"
msgstr ""
@@ -15606,8 +16267,8 @@ msgstr ""
msgid "Taxi"
msgstr "Ταξί"
-msgid "Edit Taxi station"
-msgstr "Επεξεργασία σταθμού ταξί"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Αεροδρόμιο"
@@ -15660,6 +16321,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr "Πρόσβαση στο διαδίκτυο"
+
+msgid "wlan"
+msgstr "ασύρματο"
+
+msgid "wired"
+msgstr "ενσύρματο"
+
+msgid "terminal"
+msgstr ""
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr "Πύλη"
@@ -15682,21 +16358,6 @@ msgstr "Επεξεργασία Ξενοδοχείου"
msgid "Stars"
msgstr "Αστέρια"
-msgid "Internet access"
-msgstr "Πρόσβαση στο διαδίκτυο"
-
-msgid "wlan"
-msgstr "ασύρματο"
-
-msgid "wired"
-msgstr "ενσύρματο"
-
-msgid "terminal"
-msgstr ""
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr "Κάπνισμα"
@@ -15880,6 +16541,12 @@ msgstr "Νυχτερινό Κέντρο"
msgid "Edit Nightclub"
msgstr "Νυχτερινό Κέντρο"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Τουρισμός"
@@ -15901,9 +16568,15 @@ msgstr "Πύργος Παρατήρησης"
msgid "Information Office"
msgstr "Γραφείο Πληροφοριών"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Χάρτης"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Βαθμός Λεπτομέρειας"
@@ -15916,6 +16589,9 @@ msgstr "οδός"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15955,6 +16631,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15976,22 +16655,34 @@ msgstr "φυτά"
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Φωνητικές οδηγίες μέσω κινητού τηλεφώνου"
msgid "Phone number"
msgstr "Αριθμός τηλεφώνου"
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -16015,9 +16706,6 @@ msgstr "Πάρκο σκύλων"
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "φράκτης"
@@ -16042,8 +16730,17 @@ msgstr "Σάουνα"
msgid "Edit Sauna"
msgstr "Επεξεργασία Σάουνας"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Τρ-Κυ 08:00-15:00; Σα 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Παιδική Χαρά"
@@ -16115,50 +16812,44 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr "Τόπος Λατρείας"
-
-msgid "Edit Place of Worship"
-msgstr "Επεξεργασία Τόπου Λατρείας"
-
-msgid "Religion"
-msgstr "Θρησκεία"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "βουδισμός"
+msgid "audio"
+msgstr "ήχος"
-msgid "christian"
-msgstr "χριστιανισμός"
+msgid "video"
+msgstr "βίντεο"
-msgid "hindu"
-msgstr "ινδουϊσμός"
+msgid "Place of Worship"
+msgstr "Τόπος Λατρείας"
-msgid "jain"
-msgstr "jain"
+msgid "Church"
+msgstr "Εκκλησία"
-msgid "jewish"
-msgstr "ιουδαϊσμός"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "μουσουλμανισμός"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "σιχ"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
-msgstr "ταοϊσμός"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
-msgstr "ζωροαστρισμός"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Δόγμα"
@@ -16175,6 +16866,12 @@ msgstr "καθολικό"
msgid "evangelical"
msgstr "ευαγγελικό"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "μαρτύρων του Ιεχοβά"
@@ -16187,6 +16884,9 @@ msgstr "μεθοδισμός"
msgid "mormon"
msgstr "μορμόνοι"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ορθόδοξο"
@@ -16202,92 +16902,195 @@ msgstr "προτεσταντικό"
msgid "quaker"
msgstr "κουακέροι"
-msgid "shia"
+msgid "roman_catholic"
msgstr ""
-msgid "sunni"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
-msgstr "Κυ 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Κυ 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Κυ 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
+msgid "Sa 18:00; Su 10:45"
msgstr ""
-msgid "Edit Studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
msgstr ""
-msgid "audio"
-msgstr "ήχος"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "βίντεο"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "Δημόσιο Κτήριο"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Επεξεργασία Δημοσίου Κτηρίου"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Δημαρχείο"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Επεξεργασία Δημαρχείου"
+msgid "shia"
+msgstr ""
-msgid "Community Centre"
+msgid "sunni"
msgstr ""
-msgid "Embassy"
-msgstr "Πρεσβεία"
+msgid "Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Επεξεργασία Πρεσβείας"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Δικαστήρια"
+msgid "synagogue"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Επεξεργασία Δικαστηρίων"
+msgid "conservative"
+msgstr ""
-msgid "Prison"
-msgstr "Φυλακή"
+msgid "reform"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Επεξεργασία Φυλακής"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Αστυνομία"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Edit Police"
-msgstr "Επεξεργασία Αστυνομίας"
+msgid "theravada"
+msgstr ""
-msgid "Fire Station"
-msgstr "Σταθμός Πυροσβεστικής"
+msgid "mahayana"
+msgstr ""
-msgid "Edit Fire Station"
-msgstr "Επεξεργασία Σταθμού Πυροσβεστικής"
+msgid "vajrayana"
+msgstr ""
-msgid "Post Office"
-msgstr "Ταχυδρομείο"
+msgid "Hindu Temple"
+msgstr ""
-msgid "Edit Post Office"
-msgstr "Επεξεργασία Ταχυδρομείου"
+msgid "Edit Hindu Temple"
+msgstr ""
-msgid "Education"
-msgstr "Εκπαίδευση"
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Θρησκεία"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jain"
+
+msgid "sikh"
+msgstr "σιχ"
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr "ταοϊσμός"
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
+msgstr "ζωροαστρισμός"
+
+msgid "Public Building"
+msgstr "Δημόσιο Κτήριο"
+
+msgid "Edit Public Building"
+msgstr "Επεξεργασία Δημοσίου Κτηρίου"
+
+msgid "Town hall"
+msgstr "Δημαρχείο"
+
+msgid "Edit Town hall"
+msgstr "Επεξεργασία Δημαρχείου"
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr "Πρεσβεία"
+
+msgid "Edit Embassy"
+msgstr "Επεξεργασία Πρεσβείας"
+
+msgid "Courthouse"
+msgstr "Δικαστήρια"
+
+msgid "Edit Courthouse"
+msgstr "Επεξεργασία Δικαστηρίων"
+
+msgid "Prison"
+msgstr "Φυλακή"
+
+msgid "Edit Prison"
+msgstr "Επεξεργασία Φυλακής"
+
+msgid "Police"
+msgstr "Αστυνομία"
+
+msgid "Edit Police"
+msgstr "Επεξεργασία Αστυνομίας"
+
+msgid "Fire Station"
+msgstr "Σταθμός Πυροσβεστικής"
+
+msgid "Edit Fire Station"
+msgstr "Επεξεργασία Σταθμού Πυροσβεστικής"
+
+msgid "Post Office"
+msgstr "Ταχυδρομείο"
+
+msgid "Edit Post Office"
+msgstr "Επεξεργασία Ταχυδρομείου"
+
+msgid "Education"
+msgstr "Εκπαίδευση"
msgid "Kindergarten"
msgstr "Νηπιαγωγείο"
@@ -16322,6 +17125,12 @@ msgstr "Επεξεργασία Σχολής Οδηγών"
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Υγεία"
@@ -16331,6 +17140,12 @@ msgstr "Νοσοκομείο"
msgid "Edit Hospital"
msgstr "Επεξεργασία Νοσοκομειου"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Ιατροί"
@@ -16397,12 +17212,66 @@ msgstr "Κτηνιατρίο"
msgid "Edit Veterinary"
msgstr "Επεξεργασία Κτηνιατρίου"
-msgid "Note"
-msgstr "Σημείωση"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "δημόσιο"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Γραμματοκιβώτιο"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Τηλέφωνο"
@@ -16412,6 +17281,30 @@ msgstr "Επεξεργασία Τηλεφώνου"
msgid "Telephone cards"
msgstr "Τηλεκάρτες"
+msgid "Emergency Phone"
+msgstr "Τηλέφωνο εκτάκτου ανάγκης"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Ρολόι"
@@ -16421,31 +17314,37 @@ msgstr ""
msgid "Display"
msgstr "Απεικόνιση"
-msgctxt "display"
msgid "analog"
-msgstr "αναλογικό"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "ψηφιακό"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "ηλιακό"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
-msgstr "ανορθόδοξο"
+msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16473,8 +17372,8 @@ msgstr ""
msgid "Recycling"
msgstr "Ανακύκλωση"
-msgid "Edit Recycling station"
-msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Μπαταρίες"
@@ -16500,27 +17399,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr "Υλικό"
-
-msgid "stone"
-msgstr "πέτρα"
-
-msgid "plastic"
-msgstr "πλαστικό"
-
msgid "Amount of Seats"
msgstr "Σύνολο Καθισμάτων"
@@ -16555,14 +17442,17 @@ msgstr ""
msgid "Height"
msgstr "Ύψος"
+msgctxt "height"
msgid "low"
-msgstr "χαμηλό"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "μισό"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "πλήρες"
+msgstr ""
msgid "Hide"
msgstr "Κρυψώνα"
@@ -16570,11 +17460,11 @@ msgstr "Κρυψώνα"
msgid "Lock"
msgstr "Κλειδαριά"
-msgid "Drinking Water"
-msgstr "Πόσιμο Νερό"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Επεξεργασία πόσιμου νερού"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr ""
@@ -16601,6 +17491,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16638,119 +17531,155 @@ msgstr "Στάδιο"
msgid "Edit Stadium"
msgstr "Επεξεργασία Σταδίου"
-msgid "select sport:"
-msgstr "επιλέξτε άθλημα:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "άθληση"
+msgid "Sport"
+msgstr "Άθλημα"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "τοξοβολία"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "Καλαθοσφαίρηση"
+msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "Κανόε"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "αναρρήχηση"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "ποδηλασία"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "κυνοδρομίες"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "σκοποβολή"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "ποδόσφαιρο"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "κολύμβηση"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "επιτραπέζια αντισφαίρηση"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "αντισφαίρηση"
+msgstr ""
msgid "Sports Centre"
msgstr "Αθλητικό Κέντρο"
@@ -16782,26 +17711,27 @@ msgstr "Μίνι Golf"
msgid "Edit Miniature Golf"
msgstr "Επεξεργασία Μίνι Golf"
-msgid "Sport"
-msgstr "Άθλημα"
-
msgid "Multi"
msgstr "Πολλαπλά"
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "τύπος"
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "αθλητικό κέντρο"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "στάδιο"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16809,6 +17739,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "αθλητικό κέντρο"
+
+msgid "stadium"
+msgstr "στάδιο"
+
msgid "10pin"
msgstr ""
@@ -16842,6 +17781,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr "Επεξεργασία Ποδηλασίας"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Κυνοδρομίες"
@@ -16854,28 +17809,53 @@ msgstr "Ιππικό"
msgid "Edit Equestrian"
msgstr "Επεξεργασία Ιππικού"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
-msgid "Horse Racing"
-msgstr "Αγώνες Ιππασίας"
-
-msgid "Edit Horse Racing"
+msgctxt "riding"
+msgid "sports_centre"
msgstr ""
-msgid "Gymnastics"
+msgctxt "riding"
+msgid "stadium"
msgstr ""
-msgid "Edit Gymnastics"
+msgctxt "riding"
+msgid "track"
msgstr ""
-msgid "Skating"
+msgid "clay"
msgstr ""
-msgid "Edit Skating"
+msgid "dirt"
msgstr ""
-msgid "ice_rink"
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "λάσπη"
+
+msgid "Horse Racing"
+msgstr "Αγώνες Ιππασίας"
+
+msgid "Edit Horse Racing"
+msgstr ""
+
+msgid "Gymnastics"
+msgstr ""
+
+msgid "Edit Gymnastics"
+msgstr ""
+
+msgid "Skating"
+msgstr ""
+
+msgid "Edit Skating"
+msgstr ""
+
+msgid "ice_rink"
msgstr ""
msgid "Skateboard"
@@ -16917,36 +17897,54 @@ msgstr ""
msgid "Difficulty"
msgstr "Δυσκολία"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "αρχαρίων"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "εύκολη"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "για προχωρημένους"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "για προχωρημένους"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16989,19 +17987,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17140,6 +18134,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -17152,60 +18158,134 @@ msgstr "Τεχνητά"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "σπίτι"
+msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Είσοδος"
+
+msgid "Edit Entrance"
+msgstr "Επεξεργασία Εισόδου"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Πύργος"
@@ -17221,9 +18301,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr "Ύψος (μέτρα)"
-
msgid "Flagpole"
msgstr "Ιστός"
@@ -17433,42 +18510,68 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr "Δε-Πα 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Σταθμός Μέτρησης"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
+
+msgid "Monitoring:"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Επεξεργασία Σταθμού Μέτρησης"
+msgid "Weather"
+msgstr ""
-msgid "Measurement"
-msgstr "Μέτρηση"
+msgid "Water level"
+msgstr ""
-msgid "particulate_matter"
+msgid "Tide Level"
msgstr ""
-msgid "seismic"
+msgid "Traffic"
msgstr ""
-msgid "water_level"
+msgid "Air Quality"
msgstr ""
-msgid "weather"
-msgstr "καιρός"
+msgid "Noise"
+msgstr ""
-msgid "Recording"
+msgid "GPS Signals"
msgstr ""
-msgid "manually"
-msgstr "χειροκίνητα"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "automated"
+msgid "Galileo Signals"
msgstr ""
-msgid "remote"
+msgid "Radiation"
msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "όχι"
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Σημείο Επιτήρησης"
@@ -17476,8 +18579,8 @@ msgstr "Σημείο Επιτήρησης"
msgid "Edit Survey Point"
msgstr "Επεξεργασία Σημείου Επιτήρησης"
-msgid "Surveillance"
-msgstr "Παρακολούθηση"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
@@ -17488,12 +18591,102 @@ msgstr ""
msgid "outdoor"
msgstr "υπαίθριο"
-msgid "public"
-msgstr "δημόσιο"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "κατάστημα"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "Ενέργεια"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "ηλεκτρισμός"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "ζεστό νερό"
+
+msgid "hot air"
+msgstr "ζεστός αέρας"
+
+msgid "cold water"
+msgstr "κρύο νερό"
+
+msgid "cold air"
+msgstr "κρύος αέρας"
+
+msgid "compressed air"
+msgstr "πεπιεσμένος αέρας"
+
+msgid "steam"
+msgstr "ατμός"
+
+msgid "vacuum"
+msgstr "υποπίεση"
+
msgid "Power Generator"
msgstr "Γεννήτρια Ρεύματος"
@@ -17545,100 +18738,218 @@ msgstr "Αέρας"
msgid "Method"
msgstr "Μέθοδος"
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "καύση"
+msgstr ""
-msgid "dam"
-msgstr "φράγμα"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "σχάση"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "σύντηξη"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "Φωτοβολταϊκό"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
-msgstr "ηλεκτρισμός"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "ζεστό νερό"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "ζεστός αέρας"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "κρύο νερό"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "κρύος αέρας"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "πεπιεσμένος αέρας"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "ατμός"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "υποπίεση"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Σταθμός Παραγωγής Ρεύματος"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Υποσταθμός Ρεύματος"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
+msgid "solar photovoltaic"
msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Υποσταθμός Ρεύματος"
+
+msgid "Edit Power Sub Station"
+msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
+
+msgid "Line reference"
+msgstr ""
+
+msgid "high"
+msgstr "υψηλό"
+
+msgid "medium"
+msgstr "μεσαίο"
+
+msgid "low"
+msgstr "χαμηλό"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
msgstr "Κιβώτιο Διανομής Καλωδίων"
msgid "Edit Cable Distribution Cabinet"
@@ -17653,6 +18964,9 @@ msgstr "Επεξεργασία Πυλώνα Ρεύματος"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Στύλος ρεύματος"
@@ -17671,11 +18985,9 @@ msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17784,11 +19096,11 @@ msgstr "Περίπτερο"
msgid "Edit Kiosk"
msgstr "Επεξεργασία Περιπτέρου"
-msgid "Baker"
-msgstr "Φούρνος"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Επεξεργασία Φούρνου"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Κρεοπωλείο"
@@ -17799,8 +19111,8 @@ msgstr "Επεξεργασία Κρεοπωλείου"
msgid "Seafood"
msgstr "Ιχθυοπωλείο"
-msgid "Edit Seafood"
-msgstr "Επεξεργασία Ιχθυοπωλείου"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Ντελικατέσεν (εκλεκτά προϊόντα)"
@@ -17820,14 +19132,20 @@ msgstr "Αγορά"
msgid "Edit Marketplace"
msgstr "Επεξεργασία Αγοράς"
+msgid "Organic"
+msgstr "Βιολογικά"
+
msgid "Greengrocer"
msgstr "Μανάβικο"
msgid "Edit Greengrocer"
msgstr "Επεξεργασία Μανάβικου"
-msgid "Organic"
-msgstr "Βιολογικά"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17898,8 +19216,8 @@ msgstr "Επεξεργασία Ραφείου"
msgid "Fabric"
msgstr "Ύφασμα"
-msgid "Edit Fabric"
-msgstr "Επεξεργασία καταστήματος Υφασμάτων"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Ηλεκτρονικά"
@@ -17919,13 +19237,13 @@ msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών
msgid "Mobile Phone"
msgstr "Κινητό τηλέφωνο"
-msgid "Edit Mobile Phone"
-msgstr "Επεξεργασία Κινητού τηλεφώνου"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17934,7 +19252,6 @@ msgstr "Ηχοσυστήματα"
msgid "Edit Hifi Shop"
msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17962,6 +19279,12 @@ msgstr "Επεξεργασία Συναλλακτηρίου"
msgid "Edit Automated Teller Machine"
msgstr "Επεξεργασία ΑΤΜ"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Πολυκατάστημα"
@@ -17998,10 +19321,31 @@ msgstr "Κοσμηματοπωλείο"
msgid "Edit Jewelry"
msgstr "Επεξεργασία Κοσμηματοπωλείου"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "βουδισμός"
+
+msgid "christian"
+msgstr "χριστιανισμός"
+
+msgid "hindu"
+msgstr "ινδουϊσμός"
+
+msgid "jewish"
+msgstr "ιουδαϊσμός"
+
+msgid "muslim"
+msgstr "μουσουλμανισμός"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18031,8 +19375,8 @@ msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
msgid "Paint"
msgstr "Χρώματα"
-msgid "Edit Paint"
-msgstr "Επεξεργασία Χρωματοπωλείου"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Έπιπλα"
@@ -18043,20 +19387,20 @@ msgstr "Επεξεργασία Καταστήματος Επίπλων"
msgid "Kitchen"
msgstr "Κουζίνα"
-msgid "Edit Kitchen"
-msgstr "Επεξεργασία Κουζίνας"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Κουρτίνες"
-msgid "Edit Curtain"
-msgstr "Επεξεργασία καταστήματος Κουρτινών"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Κορνίζες"
-msgid "Edit Frames"
-msgstr "Επεξεργασία καταστήματος Κορνιζών"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Χαρτικά"
@@ -18076,6 +19420,12 @@ msgstr "Βιβλιοπωλείο"
msgid "Edit Book Store"
msgstr "Επεξεργασία Βιβλιοπωλείου"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Ταξιδιωτικό Γραφείο"
@@ -18085,8 +19435,8 @@ msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου"
msgid "Musical Instrument"
msgstr "Μουσικά Όργανα"
-msgid "Edit Musical Instruments"
-msgstr "Επεξεργασία Μουσικών Οργάνων"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Παιχνίδια"
@@ -18166,6 +19516,9 @@ msgstr "Παιχνίδια"
msgid "vouchers"
msgstr "κουπόνια"
+msgid "Note"
+msgstr "Σημείωση"
+
msgid "Geography"
msgstr "Γεωγραφία"
@@ -18295,6 +19648,12 @@ msgstr "Κορυφή"
msgid "Edit Peak"
msgstr "Επεξεργασία κορυφής"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Παγετώνας"
@@ -18334,26 +19693,35 @@ msgstr "Δένδρο"
msgid "Edit Tree"
msgstr "Επεξεργασία δένδρου"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Βοτανικό όνομα"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Άλσος"
msgid "Edit Wood"
msgstr "Επεξεργασία άλσους"
-msgctxt "wood"
msgid "coniferous"
-msgstr "Κωνοφόρα"
+msgstr "Κωνοφόρο"
-msgctxt "wood"
msgid "deciduous"
msgstr "φυλλοβόλα"
-msgctxt "wood"
msgid "mixed"
-msgstr "μικτό"
+msgstr "Μικτό"
msgid "Forest"
msgstr "Δάσος"
@@ -18361,15 +19729,6 @@ msgstr "Δάσος"
msgid "Edit Forest Landuse"
msgstr "Επεξεργασία Δάσους"
-msgid "coniferous"
-msgstr "Κωνοφόρο"
-
-msgid "deciduous"
-msgstr "φυλλοβόλα"
-
-msgid "mixed"
-msgstr "Μικτό"
-
msgid "Grassland"
msgstr ""
@@ -18445,6 +19804,12 @@ msgstr "Λειβάδι"
msgid "Edit Meadow Landuse"
msgstr "Επεξεργασία Λειβαδιού"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Αμπελώνας"
@@ -18499,8 +19864,8 @@ msgstr "Χώρος αναψυχής"
msgid "Edit Recreation Ground Landuse"
msgstr "Επεξεργασία χώρου αναψυχής"
-msgid "Residential area"
-msgstr "Οικιστική περιοχή"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Επεξεργασία οικιστικής περιοχής"
@@ -18511,6 +19876,9 @@ msgstr "Νεκροταφείο"
msgid "Edit Graveyard"
msgstr "Επεξεργασία Νεκροταφείου"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Κοιμητήριο"
@@ -18586,6 +19954,33 @@ msgstr "Επεξεργασία Λατομείου"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Επεξεργασία διεύθυνσης"
@@ -18604,30 +19999,6 @@ msgstr "Όνομα πόλης"
msgid "Country code"
msgstr "Κωδικός χώρας"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Παρεμβολή Διευθύνσεων"
@@ -18646,6 +20017,18 @@ msgstr "Ζυγά"
msgid "alphabetic"
msgstr "αλφαβητικά"
+msgid "Accuracy"
+msgstr "Ακρίβεια"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18808,26 +20191,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+
+msgctxt "route type"
msgid "road"
-msgstr "δρόμος"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "σκι"
+msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "πεζοπορία"
+msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
-msgstr "παράκαμψη"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Περιγραφή συμβόλου"
@@ -18874,21 +20286,24 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr "μέλος"
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
msgstr ""
+msgid "house"
+msgstr "σπίτι"
+
msgid "Street"
msgstr "Οδός"
@@ -18910,7 +20325,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19006,18 +20421,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "γέφυρα"
msgid "deprecated"
msgstr "παρωχημένο"
+msgid "bicycle"
+msgstr "ποδήλατο"
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr "άλογο"
@@ -19027,7 +20451,10 @@ msgstr ""
msgid "motorroad"
msgstr "αυτοκινητόδρομος"
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19036,10 +20463,10 @@ msgstr ""
msgid "ford"
msgstr "κοιτόστρωση"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19057,6 +20484,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19072,29 +20502,29 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
-msgstr "πίστα εύκολη"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "πίστα μεσαία"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "πίστα προχορημένη"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
-msgstr "πιστα αρχαρίων"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "ενέργεια"
@@ -19114,20 +20544,20 @@ msgstr "μαρίνα"
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "υγεία"
-msgid "shop"
-msgstr "κατάστημα"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "ξενοδοχείο"
@@ -19192,9 +20622,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "λάσπη"
-
msgid "beach"
msgstr "παραλία"
@@ -19204,10 +20631,13 @@ msgstr "διαδρομή"
msgid "boundary"
msgstr "όριο"
+msgid "sport"
+msgstr "άθληση"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19222,9 +20652,6 @@ msgstr "Χωριό/Πόλη"
msgid "One Way"
msgstr "Μονόδρομος"
-msgid "Church"
-msgstr "Εκκλησία"
-
msgid "Fuel Station"
msgstr "Σταθμός Καυσίμων"
@@ -19252,6 +20679,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19297,31 +20727,61 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
-msgid "natural water used for swimming pool"
+msgid "unusual tag combination (landuse & building)"
msgstr ""
-msgid "incline without highway"
+msgid "unnecessary access key"
msgstr ""
-msgid "junction without highway"
+msgid "unnecessary motor_vehicle=yes"
msgstr ""
-msgid "lanes without highway"
+msgid "natural water used for swimming pool"
msgstr ""
-msgid "lcn without highway"
+msgid "numerical key"
msgstr ""
-msgid "lit without highway"
+msgid "route_master relation without route_master=*"
msgstr ""
-msgid "living_street without highway"
+msgid "power line without voltage"
msgstr ""
-msgid "maintenance without highway"
+msgid "substation key without power=substation"
msgstr ""
-msgid "median without highway"
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
+msgstr ""
+
+msgid "junction without highway"
+msgstr ""
+
+msgid "lanes without highway"
+msgstr ""
+
+msgid "lcn without highway"
+msgstr ""
+
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr ""
+
+msgid "living_street without highway"
+msgstr ""
+
+msgid "maintenance without highway"
+msgstr ""
+
+msgid "median without highway"
msgstr ""
msgid "motorroad without highway"
@@ -19330,7 +20790,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19447,19 +20907,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:hgv without hgv"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:outline on a node"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:highway without highway"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19478,41 +21049,86 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgstr ""
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr ""
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open Aerial"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Μαύρο & Άσπρο)"
+msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -19520,142 +21136,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19694,46 +21359,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -19745,99 +21413,159 @@ msgstr ""
msgid "SIGPAC Spain"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OSM Export"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
msgstr ""
+msgid "Port:"
+msgstr "Θύρα:"
+
+msgid "refresh the port list"
+msgstr "ανανέωση της λίστας θυρών"
+
+msgid "Configure"
+msgstr "Ρύθμιση"
+
+msgid "Connection Error."
+msgstr "Σφάλμα Σύνδεσης."
+
+msgid "configure the connected DG100"
+msgstr "ρύθμιση του συνδεδεμένου DG100"
+
+msgid "delete data after import"
+msgstr "διαγραφή δεδομένων μετά την εισαγωγή"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20039,6 +21767,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20060,15 +21800,9 @@ msgstr ""
msgid "Time"
msgstr "Ώρα"
-msgid "Geoid"
+msgid "Tracks"
msgstr ""
-msgid "Automatic"
-msgstr "Αυτόματα"
-
-msgid "Fixed value"
-msgstr "Διορθωμένη τιμή"
-
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -20331,9 +22065,15 @@ msgstr "Επιλογή ημιτελών διευθύνσεων"
msgid "Selects all addresses with incomplete data."
msgstr "Επιλέγει όλες τις διευθύνσεις με ημιτελή δεδομένα."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20355,6 +22095,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Ιδιότητες Επιπέδου"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20433,9 +22176,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20520,7 +22275,7 @@ msgstr "Αναμένονταν μονοί αριθμοί για τις διευ
msgid "Expected even numbers for addresses"
msgstr "Αναμένονταν ζυγοί αριθμοί για τις διευθύνσεις"
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20793,15 +22548,6 @@ msgstr "Αριθμός σπιτιού"
msgid "Street Name:"
msgstr "Όνομα Οδού:"
-msgid "Increment"
-msgstr "Αύξηση"
-
-msgid "Decrement"
-msgstr "Μείωση"
-
-msgid "Numbers:"
-msgstr "Αριθμοί:"
-
msgid "Big buildings mode"
msgstr ""
@@ -20972,6 +22718,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20991,12 +22740,6 @@ msgstr "50 μ"
msgid "100 m"
msgstr "100 μ"
-msgid "high"
-msgstr "υψηλό"
-
-msgid "medium"
-msgstr "μεσαίο"
-
msgid "symbol"
msgstr ""
@@ -21133,6 +22876,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21151,6 +22897,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Προσθήκη \"source=...\" στα στοιχεία;"
@@ -21231,48 +22980,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr "Ανατολή"
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21325,19 +23032,75 @@ msgstr "Προσθήκη νέου επιπέδου"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr ""
msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr "Αρχεία PNG (*.png)"
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr "Ανατολή"
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21365,7 +23128,10 @@ msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν"
msgid "Is not vectorized."
msgstr "Δεν είναι διανυσματικό."
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21415,7 +23181,7 @@ msgstr "Διαγραφή του επιλεγμένου θέματος από τ
msgid "Color Schemes"
msgstr "Θέματα χρωμάτων"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21464,6 +23230,9 @@ msgid "Please select 1 or more ways to download along"
msgstr ""
"Παρακαλώ επιλέξτε 1 ή περισσότερες διαδρομές για να γίνει λήψη κατά μήκος"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21536,6 +23305,71 @@ msgstr "Νέο εργαλείο..."
msgid "Install"
msgstr "Εγκατάσταση"
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Θέση μόνο"
@@ -21569,33 +23403,15 @@ msgstr ""
msgid "Disable data logging if speed falls below"
msgstr ""
-msgid "Disable data logging if distance falls below"
-msgstr ""
-
-msgid "Unknown logFormat"
-msgstr ""
-
-msgid "Port:"
-msgstr "Θύρα:"
-
-msgid "refresh the port list"
-msgstr "ανανέωση της λίστας θυρών"
+msgid "Disable data logging if distance falls below"
+msgstr ""
-msgid "Configure"
-msgstr "Ρύθμιση"
+msgid "Unknown logFormat"
+msgstr ""
msgid "Configure Device"
msgstr "Ρύθμιση συσκευής"
-msgid "Connection Error."
-msgstr "Σφάλμα Σύνδεσης."
-
-msgid "configure the connected DG100"
-msgstr "ρύθμιση του συνδεδεμένου DG100"
-
-msgid "delete data after import"
-msgstr "διαγραφή δεδομένων μετά την εισαγωγή"
-
msgid "Importing data from device."
msgstr "Εισαγωγή δεδομένων από την συσκευή."
@@ -21993,6 +23809,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22181,19 +24000,19 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Προσαρμογή υπόβαθρου εικόνων"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "Προσαρμογή της θέσης του επιλεγμένου επιπέδου υπόβαθρου εικόνων"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Παρακαλώ επιλέξτε το επίπεδο υπόβαθρου εικόνων προς προσαρμογή."
+msgstr ""
msgid "Start adjusting"
msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "Δεν υπάρχει επίπεδο υπόβαθρου εικόνων προς προσαρμογή."
+msgstr ""
msgid "No layers to adjust"
msgstr ""
@@ -22240,12 +24059,6 @@ msgstr "Εισαγμένες Εικόνες"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Αρχεία εικόνων (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Άνοιγμα εικόνων με το ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Φόρτωση ομάδας εικόνων ως νέο επίπεδο."
-
msgid "Import vector graphics"
msgstr ""
@@ -22255,18 +24068,15 @@ msgstr "Κλίμακα:"
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr "Εισαγωγή..."
+msgid "Importing..."
+msgstr "Γίνεται εισαγωγή..."
-msgid "Import vector graphics."
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "Please open or create data layer before importing"
msgstr ""
-msgid "Importing..."
-msgstr "Γίνεται εισαγωγή..."
-
msgid "InfoMode"
msgstr ""
@@ -22641,9 +24451,6 @@ msgstr "Αυτόματο Κεντράρισμα"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση συνεχώς."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -22698,9 +24505,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22742,27 +24566,26 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Μετατροπή σε πολύ-πολύγωνο"
+msgid "Select OSM mirror URL to download from."
+msgstr ""
-msgid "Convert to multipolygon."
-msgstr "Μετατροπή σε πολύ-πολύγωνο."
+msgid "Base URL"
+msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
-"Μία από τις επιλεγμένες διαδρομές είναι ήδη μέρος άλλου πολύ-πολυγώνου."
msgid "About Plugin"
msgstr ""
@@ -22898,9 +24721,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22925,12 +24745,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23079,6 +24908,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23095,6 +24927,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23328,15 +25171,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Προέκυψε σφάλμα: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Η κεφαλίδα περιέχει πολλαπλές τιμές και δεν μπορεί να αντιστοιχηθεί σε ένα "
-"λεκτικό"
-
msgid "Process queue"
msgstr ""
@@ -23391,18 +25225,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "Νέο θέμα"
-
-msgid "Create issue"
-msgstr "Δημιουργία θέματος"
-
-msgid "Describe the problem precisely"
-msgstr "Περιγράψτε το πρόβλημα επακριβώς"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr "Άνοιγμα στον περιηγητή"
@@ -23462,6 +25284,9 @@ msgstr "εκτελέσιμο Firefox"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23669,9 +25494,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23751,7 +25573,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23905,6 +25745,9 @@ msgstr "Το πρόχειρο είναι κενό"
msgid "The clipboard data is not an image"
msgstr "Τα δεδομένα στο πρόχειρο δεν είναι εικόνα"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23926,6 +25769,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24221,9 +26067,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr "Δημιουργία Στάσεων από GPX"
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr "Ίχνη σε αυτό το ερχείο GPX:"
@@ -24292,9 +26135,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr "Αλλαγή ρυθμίσεων δημιουργίας πολύ-πολυγώνου"
-
msgid "Create administrative boundary relations"
msgstr "Δημιουργία σχέσης διοικητικού ορίου"
@@ -24421,9 +26261,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr "Ολοκληρωτική επαναφορά"
@@ -24446,6 +26283,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24478,15 +26318,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr "Επαναφορά ομάδας αλλαγών #{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Αλλαγή ιδιοτήτων"
+
msgid "Country preset:"
msgstr ""
@@ -24496,6 +26352,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24598,9 +26457,6 @@ msgstr "Προτιμήσεις πρόσθετου Δρομολόγησης"
msgid "Configure routing preferences."
msgstr "Ρύθμιση προτιμήσεων δρομολόγησης"
-msgid "Highway type"
-msgstr "Τύπος οδικής αρτηρίας"
-
msgid "Speed (Km/h)"
msgstr "Ταχύτητα (ΧΑΩ)"
@@ -24716,6 +26572,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24776,19 +26635,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
-msgstr "Φόρτωση"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "αόρατο"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24926,6 +26785,9 @@ msgstr ""
msgid "Street name: "
msgstr "Όνομα οδού: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Ζυγά/Μονά"
@@ -25001,6 +26863,95 @@ msgstr "Ιχνηλάτης."
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -25016,9 +26967,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr "Λήψη OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25040,6 +26988,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25192,9 +27143,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "Ακρίβεια"
-
msgid "Select as much as you like:"
msgstr ""
@@ -25858,38 +27806,26 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
-msgstr "Επιλέξτε αν τα δεδομένα θα προστεθούν σε ένα νέο επίπεδο"
-
-msgid ""
-"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
-"w2''"
-msgstr ""
-
msgid "Undelete Object"
msgstr ""
msgid "Undelete object"
msgstr ""
-msgid "Start undeleting"
-msgstr ""
-
-msgid "Close dialog and cancel"
+msgid ""
+"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
+"w2''"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
+msgid "Select if the data should be added into a new layer"
+msgstr "Επιλέξτε αν τα δεδομένα θα προστεθούν σε ένα νέο επίπεδο"
-msgid "Looking for {0}"
+msgid "Start undeleting"
msgstr ""
-msgid "Found {0}"
+msgid "Close dialog and cancel"
msgstr ""
-msgid "More tools"
-msgstr "Περισσότερα εργαλεία"
-
msgid "Add nodes at intersections"
msgstr "Προσθήκη κόμβων σε διασταυρώσεις"
@@ -25933,15 +27869,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Διαχωρισμός αντικειμένου"
@@ -26066,18 +27993,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26259,9 +28174,6 @@ msgstr "Αποεπιλογή κόμβων"
msgid "Removes all nodes from selection"
msgstr "Αφαιρεί όλους τους κόμβους από την επιλογή"
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26388,8 +28300,8 @@ msgstr "επανάληψη"
msgid "mute"
msgstr "σίγαση"
-msgid "Scanned Map..."
-msgstr "Σαρωμένος Χάρτης..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26408,9 +28320,6 @@ msgstr "Χαρτιά που περπατάνε: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr "Χαρτιά που περπατάνε"
-
msgid "Way Download"
msgstr "Λήψη Διαδρομής"
@@ -26547,9 +28456,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr "Προσθήκη Ετικέτας"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 6151e9f..df22349 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 14:03+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:05+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:06+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,16 +165,14 @@ msgid "About JOSM..."
msgstr "About JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -205,6 +218,9 @@ msgstr "No target layers"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -244,9 +260,6 @@ msgstr "Tool: {0}"
msgid "Please select at least four nodes."
msgstr "Please select at least four nodes."
-msgid "Information"
-msgstr "Information"
-
msgid "Align Nodes in Line"
msgstr "Align Nodes in Line"
@@ -271,6 +284,9 @@ msgstr "conflict"
msgid "download"
msgstr "download"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "previous"
@@ -280,6 +296,9 @@ msgstr "next"
msgid "Nothing selected to zoom to."
msgstr "Nothing selected to zoom to."
+msgid "Information"
+msgstr "Information"
+
msgid "Zoom to {0}"
msgstr "Zoom to {0}"
@@ -336,11 +355,9 @@ msgstr ""
"reverse some of them?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Could not combine ways (They could not be merged into a single string of "
-"nodes)"
msgid "Combine {0} ways"
msgstr "Combine {0} ways"
@@ -397,18 +414,37 @@ msgstr "Delete"
msgid "Delete selected objects."
msgstr "Delete selected objects."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distribute Nodes"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribute the selected nodes to equal distances along a line."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Download from OSM..."
msgid "Download map data from the OSM server."
msgstr "Download map data from the OSM server."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+
+msgid "Download data"
+msgstr "Download data"
+
msgid "Download object..."
msgstr "Download object..."
@@ -503,6 +539,9 @@ msgstr "History"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Display history information about OSM ways, nodes, or relations."
+msgid "Show history"
+msgstr "Show history"
+
msgid "History (web)"
msgstr ""
@@ -617,11 +656,9 @@ msgid "Joined overlapping areas"
msgstr "Joined overlapping areas"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Some of the ways were part of relations that have been modified. Please "
-"verify no errors have been introduced."
msgid "Fix tag conflicts"
msgstr "Fix tag conflicts"
@@ -769,8 +806,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Merge nodes into the oldest one."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -927,8 +964,8 @@ msgid "Download Data"
msgstr "Download Data"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -960,16 +997,9 @@ msgid "Orthogonalize / Undo"
msgstr "Orthogonalise / Undo"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Orthogonalise Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalise Shape "
-"action!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Undo Orthogonalise Shape"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -989,9 +1019,6 @@ msgstr "Orthogonalise"
msgid "Usage"
msgstr "Usage"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Selected Elements cannot be orthogonalised"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1100,6 +1127,15 @@ msgstr "Also rename the file"
msgid "Could not rename file ''{0}''"
msgstr "Could not rename file ''{0}''"
+msgid "Restart"
+msgstr "Restart"
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1152,9 +1188,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1217,6 +1250,9 @@ msgstr "Status Report"
msgid "Copy to clipboard and close"
msgstr "Copy to clipboard and close"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Close"
@@ -1298,18 +1334,14 @@ msgstr ""
"middle of the way.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Split way {0} into {1} parts"
@@ -1404,6 +1436,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Undo"
@@ -1428,9 +1481,6 @@ msgstr "Update data"
msgid "Updates the objects in the active data layer from the server."
msgstr "Updates the objects in the active data layer from the server."
-msgid "Download data"
-msgstr "Download data"
-
msgid "Update modified"
msgstr "Update modified"
@@ -1630,6 +1680,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Slower Forwards"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Downloading GPS data"
@@ -1639,6 +1692,18 @@ msgstr "Downloaded GPX Data"
msgid "Markers from {0}"
msgstr "Markers from {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Downloading data"
@@ -1658,6 +1723,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "There was {0} conflict during import."
+msgstr[1] "There were {0} conflicts during import."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflict during download"
+msgstr[1] "Conflicts during download"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Loading parents of node {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Loading parents of way {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Loading parents of relation {2}"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Download {0} of {1} ({2} left)"
@@ -1710,25 +1800,6 @@ msgstr "The following errors occurred during mass download: {0}"
msgid "Errors during download"
msgstr "Errors during download"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "There was {0} conflict during import."
-msgstr[1] "There were {0} conflicts during import."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflict during download"
-msgstr[1] "Conflicts during download"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Loading parents of node {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Loading parents of way {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Loading parents of relation {2}"
-
msgid "Error during download"
msgstr ""
@@ -1873,6 +1944,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1897,8 +1971,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1914,6 +1988,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2331,6 +2408,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2494,14 +2574,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
-msgstr "Primitive id expected"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "Changeset id expected"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "Version expected"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2510,6 +2590,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgid "Primitive id expected"
+msgstr "Primitive id expected"
+
msgid "Range of numbers expected"
msgstr "Range of numbers expected"
@@ -2528,10 +2611,8 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr "Missing operator for NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2621,6 +2702,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Added {0} object"
msgstr[1] "Added {0} objects"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Change node {0}"
@@ -2657,10 +2741,10 @@ msgstr "Remove \"{0}\" for {1} objects"
msgid "Set {0}={1} for {2} objects"
msgstr "Set {0}={1} for {2} objects"
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2683,8 +2767,8 @@ msgid "Double conflict"
msgstr "Double conflict"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2792,6 +2876,9 @@ msgstr[1] "Purged {0} objects"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resolve conflicts in member list of relation {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotate {0} node"
@@ -2852,11 +2939,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
msgid "Relation"
msgstr "Relation"
@@ -2885,11 +2970,11 @@ msgstr "Apply selected changes"
msgid "Do not apply changes"
msgstr "Do not apply changes"
-msgid "Please select which property changes you want to apply."
-msgstr "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Properties of "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Roles in relations referring to"
@@ -2909,6 +2994,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2939,21 +3027,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Warning: Failed to initialise preferences. Preference directory ''{0}'' is "
-"not a directory."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -2963,11 +3049,9 @@ msgstr ""
"not a directory.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Warning: Failed to initialise preferences. Failed to create missing "
-"preference directory: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -2976,16 +3060,12 @@ msgstr ""
"<html>Failed to initialise preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3002,8 +3082,8 @@ msgstr ""
"<br>{0}<br> and creating a new default preference file.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3033,12 +3113,11 @@ msgstr "Failed to load resource ''{0}'', error is {1}."
msgid "UNKNOWN"
msgstr "UNKNOWN"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "already registered a conflict for primitive ''{0}''"
@@ -3199,8 +3278,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "parameter {0} not in range 0..{1}, got {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3307,7 +3385,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3326,6 +3404,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3342,9 +3423,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3385,6 +3463,9 @@ msgstr "validation other"
msgid "Running test {0}"
msgstr "Running test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Addresses"
@@ -3409,6 +3490,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3470,15 +3560,15 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Duplicated nodes"
msgid "This test checks that there are no nodes at the very same location."
msgstr "This test checks that there are no nodes at the very same location."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3546,6 +3636,24 @@ msgstr "Duplicated way nodes"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Checks for ways with identical consecutive nodes."
+msgid "Highways"
+msgstr "Highways"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolygon"
@@ -3615,6 +3723,12 @@ msgstr "Nodes with same name"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "This test finds nodes that have the same name (might be duplicates)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3674,13 +3788,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3714,11 +3828,11 @@ msgid ""
msgstr ""
"This test checks for ways with similar names that may have been misspelt."
-msgid "Properties checker :"
-msgstr "Properties checker :"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "This plug-in checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Invalid tagchecker line - {0}: {1}"
@@ -3857,8 +3971,8 @@ msgstr "Use default spellcheck file."
msgid "Use the default spellcheck file (recommended)."
msgstr "Use the default spellcheck file (recommended)."
-msgid "Fix properties"
-msgstr "Fix properties"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Could not find element type"
@@ -3932,6 +4046,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr "This tests if ways which should be circular are closed."
+msgid "Unclosed way"
+msgstr "Unclosed way"
+
msgid "natural type {0}"
msgstr "natural type {0}"
@@ -3962,9 +4079,6 @@ msgstr "building"
msgid "area"
msgstr "area"
-msgid "Unclosed way"
-msgstr "Unclosed way"
-
msgid "Unconnected ways"
msgstr ""
@@ -3989,10 +4103,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "This test checks for untagged nodes that are not part of any way."
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4055,25 +4169,6 @@ msgstr "Reversed coastline: land not on left side"
msgid "Reversed land: land not on left side"
msgstr "Reversed land: land not on left side"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Do not show again (remembers choice)"
@@ -4177,7 +4272,7 @@ msgstr "Show help information"
msgid "Downloading \"Message of the day\""
msgstr "Downloading \"Message of the day\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4385,9 +4480,24 @@ msgstr "View"
msgid "Tools"
msgstr "Tools"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Selection"
+
msgid "Presets"
msgstr "Presets"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4403,10 +4513,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4415,6 +4537,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4476,6 +4601,9 @@ msgstr "(no object)"
msgid "User:"
msgstr "User:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "layer not in list."
@@ -4503,20 +4631,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "false: the property is explicitly switched off"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: the property is explicitly switched on"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"partial: different selected objects have different values, do not change"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "unset: do not set this property on the selected objects"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4815,6 +4929,9 @@ msgstr "> bottom"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "Copy my selected elements to the end of the list of merged elements"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -4822,6 +4939,9 @@ msgstr ""
"Copy my selected elements before the first selected element in the list of "
"merged elements"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -4829,16 +4949,25 @@ msgstr ""
"Copy my selected elements after the first selected element in the list of "
"merged elements"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Copy their selected element to the start of the list of merged elements"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Copy their selected elements to the end of the list of merged elements"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -4846,6 +4975,9 @@ msgstr ""
"Copy their selected elements before the first selected element in the list "
"of merged elements"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4862,8 +4994,8 @@ msgstr "Copy all their elements to the target"
msgid "Up"
msgstr "Up"
-msgid "Move up the selected elements by one position."
-msgstr "Move up the selected elements by one position"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Down"
@@ -4917,16 +5049,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Their version ({0} entry)"
msgstr[1] "Their version ({0} entries)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronised "
-"adjustment."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Adjustable {0} not registered yet."
-
msgid "Node"
msgstr "Node"
@@ -5180,16 +5302,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Key:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
msgid "Value:"
msgstr "Value:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5733,6 +5854,9 @@ msgstr "Show/Hide"
msgid "Information about layer"
msgstr "Information about layer"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Map Paint Styles"
@@ -5816,6 +5940,33 @@ msgstr ""
msgid "No"
msgstr "No"
+msgid "Object type:"
+msgstr "Object type:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr "Object ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Enter the ID of the object that should be downloaded"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relations"
@@ -5837,9 +5988,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relations: {0}"
-msgid "Selection"
-msgstr "Selection"
-
msgid "Open a selection list window."
msgstr "Open a selection list window."
@@ -5864,18 +6012,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Selection: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5893,6 +6029,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Click to minimise/maximise the panel content"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Authors"
@@ -5910,10 +6058,8 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr "Launches a browser with information about the user"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -5940,9 +6086,6 @@ msgstr "Open the validation window."
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Zoom to problem"
-
msgid "Fix"
msgstr "Fix"
@@ -6091,9 +6234,6 @@ msgstr "Update content"
msgid "Update the changeset content from the OSM server"
msgstr "Update the changeset content from the OSM server"
-msgid "Show history"
-msgstr "Show history"
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6407,11 +6547,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6478,35 +6616,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "This changeset query URL is invalid"
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Properties/Memberships"
+msgid "Discardable key: selection Background"
+msgstr ""
+
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Properties for selected objects."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<different>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Member Of"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Properties / Memberships"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Delete the selected key in all objects"
-msgid "Delete Properties"
-msgstr "Delete Properties"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Change relation"
@@ -6520,13 +6670,13 @@ msgstr "Really delete selection from relation {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Add a new key/value pair to all objects"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Edit the value of the selected key for all objects"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6605,12 +6755,6 @@ msgstr[1] "Change properties of up to {0} objects"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6640,9 +6784,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6680,7 +6830,7 @@ msgstr "Relation is deleted"
msgid "Downloading relation {0}"
msgstr "Downloading relation {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6743,6 +6893,9 @@ msgstr "Remove them, clean up relation"
msgid "Ignore them, leave relation as is"
msgstr "Ignore them, leave relation as is"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7008,6 +7161,26 @@ msgstr "way is connected to next relation member"
msgid "way is not connected to previous or next relation member"
msgstr "way is not connected to previous or next relation member"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+
msgid "Bookmarks"
msgstr "Bookmarks"
@@ -7078,9 +7251,6 @@ msgstr "Value for latitude in range [-90,90] required."
msgid "Value for longitude in range [-180,180] required."
msgstr "Value for longitude in range [-180,180] required."
-msgid "Paste URL from clipboard"
-msgstr "Paste URL from clipboard"
-
msgid "Data Sources and Types:"
msgstr "Data Sources and Types:"
@@ -7149,21 +7319,8 @@ msgstr ""
msgid "Download object"
msgstr "Download object"
-msgid "Object type:"
-msgstr "Object type:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr "Object ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
+msgstr "Start downloading"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7173,23 +7330,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Start downloading"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr "Class Type"
@@ -7294,8 +7437,8 @@ msgstr "Go to the next page"
msgid "Go to the JOSM help home page"
msgstr "Go to the JOSM help home page"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "Failed to open help page. The target URL is empty."
@@ -7397,6 +7540,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Changeset info"
@@ -7503,8 +7649,8 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr ""
msgid "Upload"
msgstr "Upload"
@@ -7522,6 +7668,12 @@ msgstr "Provide a brief comment for the changes you are uploading:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Changeset id:"
@@ -7590,11 +7742,8 @@ msgid "Closing changeset {0}"
msgstr "Closing changeset {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Warning: failed to put Credential Dialogue always on top. Caught security "
-"exception."
msgid "Enter credentials for OSM API"
msgstr "Enter credentials for OSM API"
@@ -7674,8 +7823,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7693,11 +7842,8 @@ msgid "Missing user identity"
msgstr "Missing user identity"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
msgid "Download objects"
msgstr ""
@@ -7929,12 +8075,6 @@ msgstr "Upload the changed primitives"
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7943,6 +8083,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7958,6 +8114,21 @@ msgstr "Please enter a valid chunk size first"
msgid "Illegal chunk size"
msgstr "Illegal chunk size"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Cancel the upload and resume editing"
@@ -7965,11 +8136,9 @@ msgid "Tags of changeset {0}"
msgstr "Tags of changeset {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
msgid "Preparing objects to upload ..."
msgstr ""
@@ -8103,9 +8272,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "Object ''{0}'' is already deleted. Skipping object in upload."
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Uploading {0} object..."
@@ -8116,6 +8282,9 @@ msgid ""
msgstr ""
"Ignoring caught exception because upload is cancelled. Exception is: {0}"
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8136,9 +8305,8 @@ msgstr "Select objects to upload"
msgid "Cancel uploading"
msgstr "Cancel uploading"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Please select the upload strategy:"
@@ -8287,7 +8455,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8317,8 +8485,8 @@ msgstr "version {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8433,6 +8601,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8471,6 +8642,9 @@ msgstr "Reload erroneous tiles"
msgid "Alpha channel"
msgstr "Alpha channel"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr "Set WMS Bookmark"
@@ -8682,9 +8856,6 @@ msgstr "Extracting GPS locations from EXIF"
msgid "Starting directory scan"
msgstr "Starting directory scan"
-msgid "One of the selected files was null"
-msgstr "One of the selected files was null"
-
msgid "Read photos..."
msgstr "Read photos..."
@@ -8703,6 +8874,9 @@ msgstr "Found null file in directory {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Error while getting files from directory {0}\n"
+msgid "One of the selected files was null"
+msgstr "One of the selected files was null"
+
msgid "Geotagged Images"
msgstr "Geotagged Images"
@@ -8762,6 +8936,12 @@ msgstr "Next"
msgid "Show next Image"
msgstr "Show next Image"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centre view"
@@ -8834,9 +9014,6 @@ msgstr ""
"<html>Upload of unprocessed GPS data as map data is considered "
"harmful.<br>If you want to upload traces, look here:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8849,8 +9026,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Download everything within:"
@@ -8876,15 +9056,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Download from OSM along this track"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9029,16 +9211,11 @@ msgstr "There was an error while trying to display the URL for this marker"
msgid "(URL was: "
msgstr "(URL was: "
-msgid "Error displaying URL"
-msgstr "Error displaying URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgid "loading style ''{0}''..."
msgstr ""
@@ -9052,7 +9229,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -9062,8 +9239,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Illegal dash pattern, at least one value must be > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9318,8 +9494,8 @@ msgstr "Close the dialogue and cancel authorisation"
msgid "Close the dialog and accept the Access Token"
msgstr "Close the dialogue and accept the Access Token"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Retrieving OAuth Request Token from ''{0}''"
@@ -9387,8 +9563,14 @@ msgstr "Allow to write your preferences"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Select to grant JOSM the right to write your server preferences"
-msgid "Retrieving OAuth Access Token..."
-msgstr "Retrieving OAuth Access Token..."
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
+msgid "Retrieving OAuth Access Token..."
+msgstr "Retrieving OAuth Access Token..."
msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
msgstr "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
@@ -9456,9 +9638,6 @@ msgstr ""
"this token. JOSM will use it in the future for authentication and "
"authorisation to the OSM server.<br><br>The access token is: </html>"
-msgid "Restart"
-msgstr "Restart"
-
msgid "Click to retrieve a Request Token"
msgstr "Click to retrieve a Request Token"
@@ -9740,6 +9919,9 @@ msgstr "Download plug-ins"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "You have to restart JOSM for some settings to take effect."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Remote Control"
@@ -9868,6 +10050,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "Actions"
@@ -9910,6 +10098,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Data validator"
@@ -9962,19 +10153,10 @@ msgstr "Search: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9992,40 +10174,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -10049,6 +10240,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -10107,6 +10331,9 @@ msgstr "Draw virtual nodes in select mode"
msgid "Draw inactive layers in other color"
msgstr "Draw inactive layers in other colour"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10161,6 +10388,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10455,7 +10687,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10624,6 +10862,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "File backup"
@@ -10689,8 +10933,8 @@ msgstr "Map Settings"
msgid "Settings for the map projection and data interpretation."
msgstr "Settings for the map projection and data interpretation."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Could not read tagging preset source: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10951,21 +11195,6 @@ msgstr "Swiss Grid (Switzerland)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zone"
-
-msgid "North"
-msgstr "North"
-
-msgid "South"
-msgstr ""
-
-msgid "Hemisphere"
-msgstr ""
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -10987,6 +11216,21 @@ msgstr ""
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zone"
+
+msgid "North"
+msgstr "North"
+
+msgid "South"
+msgstr ""
+
+msgid "Hemisphere"
+msgstr ""
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Testing OSM API URL ''{0}''"
@@ -11050,8 +11294,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Select to use OAuth as authentication mechanism"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11060,22 +11304,26 @@ msgstr "OSM username:"
msgid "OSM password:"
msgstr "OSM password:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr "Current credential manager is of type ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr ""
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11164,17 +11412,9 @@ msgid "Use a SOCKS proxy"
msgstr "Use a SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-
-msgid "disabled"
-msgstr "disabled"
-
-msgid "no modifier"
-msgstr "no modifier"
msgid "Shortcut Background: User"
msgstr ""
@@ -11217,32 +11457,37 @@ msgstr "Delete the selection in the tag table"
msgid "Add a new tag"
msgstr "Add a new tag"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Elements of type {0} are supported."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Change {0} object"
+msgstr[1] "Change {0} objects"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Nothing selected!"
+
+msgid "Selection unsuitable!"
+msgstr "Selection unsuitable!"
+
+msgid "Apply Preset"
+msgstr "Apply Preset"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "More information about this feature"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11250,6 +11495,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "More information about this feature"
+
msgid "Available roles"
msgstr ""
@@ -11265,52 +11513,42 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Optional Attributes:"
-msgid "Use preset ''{0}'' of group ''{1}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Use preset ''{0}''"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Unknown type: {0}"
-msgstr "Unknown type: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Could not read tagging preset source: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Error parsing {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Elements of type {0} are supported."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Change {0} object"
-msgstr[1] "Change {0} objects"
-
-msgid "Nothing selected!"
-msgstr "Nothing selected!"
-
-msgid "Selection unsuitable!"
-msgstr "Selection unsuitable!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Apply Preset"
-msgstr "Apply Preset"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "New relation"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change Properties"
-msgstr "Change Properties"
+msgid "Unknown type: {0}"
+msgstr "Unknown type: {0}"
msgid "Preset group {1} / {0}"
msgstr "Preset group {1} / {0}"
@@ -11318,6 +11556,18 @@ msgstr "Preset group {1} / {0}"
msgid "Preset group {0}"
msgstr "Preset group {0}"
+msgid "Roles cannot appear more than once"
+msgstr ""
+
+msgid "Preset role element without parent"
+msgstr ""
+
+msgid "Preset sub element without parent"
+msgstr ""
+
+msgid "Error parsing {0}: "
+msgstr "Error parsing {0}: "
+
msgid "Search preset"
msgstr ""
@@ -11333,6 +11583,16 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronised "
+"adjustment."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Adjustable {0} not registered yet."
+
msgid "All files (*.*)"
msgstr ""
@@ -11367,10 +11627,59 @@ msgid ""
msgstr ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "false: the property is explicitly switched off"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true: the property is explicitly switched on"
+
msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+"partial: different selected objects have different values, do not change"
msgstr ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+"partial: different selected objects have different values, do not change"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "unset: do not set this property on the selected objects"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "mandatory attribute ''{0}'' missing"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
+"''{1}''"
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgid "Deleted node {0} is part of way {1}"
msgstr "Deleted node {0} is part of way {1}"
@@ -11402,11 +11711,9 @@ msgid "Contacting OSM Server..."
msgstr "Contacting OSM Server..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Failed to parse date ''{0}'' replied by server."
@@ -11449,39 +11756,27 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Illegal port number in preference ''{0}''. Got {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
msgid "Parsing response from server..."
msgstr "Parsing response from server..."
@@ -11579,6 +11874,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Parse error: invalid document structure for gpx document"
+msgid "(at line {0}, column {1})"
+msgstr "(at line {0}, column {1})"
+
msgid "Unknown mode {0}."
msgstr "Unknown mode {0}."
@@ -11594,15 +11892,21 @@ msgstr "Looking for image files"
msgid "No image files found."
msgstr "No image files found."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Failed to open input stream for resource ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr ""
@@ -11681,8 +11985,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "NMEA import success"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA import failure!"
@@ -11784,44 +12088,13 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "mandatory attribute ''{0}'' missing"
-
msgid "Unsupported version: {0}"
msgstr "Unsupported version: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -11831,11 +12104,9 @@ msgstr ""
"''create'', ''modify'', or ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
msgid "Parsing changeset content ..."
msgstr "Parsing changeset content ..."
@@ -11861,11 +12132,8 @@ msgstr "Parsing list of changesets..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "Failed to sign a HTTP connection with an OAuth Authentication header"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
@@ -11877,9 +12145,6 @@ msgstr ""
"<html>An error occurred while restoring backup file.<br>Error is: "
"<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Could not back up file. Exception is: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM Server Files gzip compressed"
@@ -11901,6 +12166,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11954,11 +12222,9 @@ msgstr ""
"{1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"WARNING: Normalising value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Unknown or unsupported API version. Got {0}."
@@ -12107,6 +12373,9 @@ msgstr "Save user and password (unencrypted)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -12125,6 +12394,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -12149,7 +12427,13 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -12158,9 +12442,6 @@ msgstr "Remote Control has been asked to create a new node."
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr ""
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
@@ -12170,6 +12451,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12184,6 +12473,15 @@ msgstr "Remote Control has been asked to import data from the following URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Remote Control has been asked to load data from the API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12214,19 +12512,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12248,11 +12546,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -12322,18 +12632,14 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Warning: Cannot download plug-in ''{0}''. Its download link is not known. "
-"Skipping download."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Warning: Cannot download plug-in ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Failed to create plug-in directory ''{0}''"
@@ -12500,11 +12806,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Plug-in update failed"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "Warning: failed to download plug-in information list"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Disable plug-in"
@@ -12518,27 +12824,22 @@ msgstr "Keep plug-in"
msgid "Click to keep the plugin ''{0}''"
msgstr "Click to keep the plug-in ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Warning: failed to delete outdated plug-in ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Warning: failed to install already downloaded plug-in ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plug-in version."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Warning: failed to install plug-in ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
msgid "Click to disable the plugin ''{0}''"
msgstr "Click to disable the plug-in ''{0}''"
@@ -12613,10 +12914,8 @@ msgstr "Processing plug-in site cache files..."
msgid "Processing file ''{0}''"
msgstr "Processing file ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Warning: Failed to scan file ''{0}'' for plug-in information. Skipping."
msgid "Processing plugin site cache icon files..."
msgstr ""
@@ -12630,12 +12929,25 @@ msgstr "Download plug-in list..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Downloading plug-in list from ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Warning: failed to create plug-in directory ''{0}''. Cannot cache plug-in "
-"list from plug-in site ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Writing plug-in list to local cache ''{0}''"
@@ -13002,22 +13314,12 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
msgid "{0}... [please type its number]"
msgstr ""
@@ -13029,9 +13331,52 @@ msgstr ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -13063,9 +13408,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
msgstr ""
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13400,6 +13759,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13486,6 +13850,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13595,9 +13963,6 @@ msgstr "Adds no left turn for sets of 4 or 5 ways"
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13660,6 +14025,9 @@ msgstr ""
"Write gps position info to the image file header. Run this feature from the "
"right click menu of the image layer."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13687,9 +14055,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13717,9 +14082,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13761,6 +14123,11 @@ msgstr ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
"to be running."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13811,9 +14178,6 @@ msgstr ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
"behind."
-msgid "Highways"
-msgstr "Highways"
-
msgid "Streets"
msgstr "Streets"
@@ -13898,6 +14262,9 @@ msgstr "Embankment"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Toll"
+
msgid "Motorway Link"
msgstr "Motorway Link"
@@ -13988,39 +14355,86 @@ msgstr "Residential"
msgid "Edit Residential Street"
msgstr "Edit Residential Street"
-msgid "Living Street"
-msgstr "Living Street"
+msgid "Bicycle Road"
+msgstr ""
-msgid "Edit Living Street"
-msgstr "Edit Living Street"
+msgid "Edit Bicycle Road"
+msgstr ""
-msgid "Pedestrian"
-msgstr "Pedestrian"
+msgid "Highway type"
+msgstr "Highway type"
-msgid "Edit Pedestrian Street"
-msgstr "Edit Pedestrian Street"
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
-msgid "Area"
-msgstr "Area"
+msgctxt "Highway"
+msgid "service"
+msgstr ""
-msgid "Service"
-msgstr "Service"
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
-msgid "Edit Serviceway"
-msgstr "Edit Serviceway"
+msgctxt "Highway"
+msgid "path"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Serviceway type"
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
-msgid "alley"
-msgstr "alley"
+msgid "Vehicle access"
+msgstr ""
-msgid "driveway"
+msgid "yes"
+msgstr "yes"
+
+msgid "no"
+msgstr "no"
+
+msgid "destination"
+msgstr "destination"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
+msgid "Living Street"
+msgstr "Living Street"
+
+msgid "Edit Living Street"
+msgstr "Edit Living Street"
+
+msgid "Pedestrian"
+msgstr "Pedestrian"
+
+msgid "Edit Pedestrian Street"
+msgstr "Edit Pedestrian Street"
+
+msgid "Area"
+msgstr "Area"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Edit Service Way"
+msgstr ""
+
+msgid "Service way type"
+msgstr ""
+
+msgid "alley"
+msgstr "alley"
+
+msgid "driveway"
msgstr "driveway"
msgid "parking_aisle"
msgstr "parking_aisle"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parking Aisle"
@@ -14048,18 +14462,12 @@ msgstr "roundabout"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "yes"
-
msgid "Road Restrictions"
msgstr "Road Restrictions"
msgid "Edit Road Restrictions"
msgstr "Edit Road Restrictions"
-msgid "Toll"
-msgstr "Toll"
-
msgid "No exit (cul-de-sac)"
msgstr "No exit (cul-de-sac)"
@@ -14069,9 +14477,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destination"
-
msgid "delivery"
msgstr "delivery"
@@ -14081,15 +14486,15 @@ msgstr "permissive"
msgid "private"
msgstr "private"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "agricultural"
msgid "forestry"
msgstr "forestry"
-msgid "no"
-msgstr "no"
-
msgid "official"
msgstr "official"
@@ -14135,6 +14540,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Public Service Vehicles (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. speed (km/h)"
@@ -14219,6 +14627,9 @@ msgstr "Edit Bridge"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14323,20 +14734,29 @@ msgstr ""
msgid "Visibility"
msgstr "Visibility"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "excellent"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "good"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "intermediate"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "bad"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "horrible"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Wheelchairs"
@@ -14353,10 +14773,10 @@ msgstr "Dedicated Bridleway"
msgid "Edit Bridleway"
msgstr "Edit Bridleway"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -14392,7 +14812,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14461,12 +14881,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Emergency Phone"
+msgid "Drinking Water"
+msgstr "Drinking Water"
msgid "Traffic Signal"
msgstr "Traffic Lights"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Pedestrian crossing type"
@@ -14482,15 +14908,6 @@ msgstr "island"
msgid "unmarked"
msgstr "unmarked"
-msgid "Cross on horseback"
-msgstr "Cross on horseback"
-
-msgid "Cross by bicycle"
-msgstr "Cross by bicycle"
-
-msgid "Crossing attendant"
-msgstr "Crossing attendant"
-
msgid "Crossing type name (UK)"
msgstr "Crossing type name (UK)"
@@ -14512,6 +14929,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Crossing attendant"
+
+msgid "Cross by bicycle"
+msgstr "Cross by bicycle"
+
+msgid "Cross on horseback"
+msgstr "Cross on horseback"
+
msgid "Stop"
msgstr "Stop"
@@ -14521,6 +14947,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-roundabout"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Direction"
@@ -14530,11 +14959,8 @@ msgstr "clockwise"
msgid "Pedestrian Crossing"
msgstr "Pedestrian Crossing"
-msgid "Edit Crossing"
-msgstr "Edit Crossing"
-
-msgid "Type name (UK)"
-msgstr "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Traffic Calming"
@@ -14566,9 +14992,6 @@ msgstr "table"
msgid "Passing Place"
msgstr "Passing Place"
-msgid "Edit Passing Place"
-msgstr "Edit Passing Place"
-
msgid "Turning Circle"
msgstr "Turning Circle"
@@ -14602,20 +15025,44 @@ msgstr ""
msgid "Barriers"
msgstr "Barriers"
+msgid "Block"
+msgstr "Block"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Allowed traffic:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "stone"
+
msgid "Bollard"
msgstr "Bollard"
msgid "Edit Bollard"
msgstr "Edit Bollard"
-msgid "Allowed traffic:"
-msgstr "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plastic"
msgid "Cycle Barrier"
msgstr "Cycle Barrier"
-msgid "Block"
-msgstr "Block"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Cattle Grid"
@@ -14626,6 +15073,9 @@ msgstr "Edit Cattle Grid"
msgid "Bus Trap"
msgstr "Bus Trap"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Spikes"
@@ -14647,19 +15097,34 @@ msgstr "Edit Border Control point"
msgid "Hedge"
msgstr "Hedge"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Height (metres)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Fence"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14668,23 +15133,52 @@ msgstr "pole"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Wall"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "City Wall"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Retaining Wall"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Ditch"
+msgstr ""
-msgid "Entrance"
-msgstr "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Edit an Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Gate"
@@ -14716,12 +15210,27 @@ msgstr "Kissing Gate"
msgid "Edit Kissing Gate"
msgstr "Edit Kissing Gate"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Stile"
msgid "Edit Stile"
msgstr "Edit Stile"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Turnstile"
@@ -14779,6 +15288,9 @@ msgstr "Drain"
msgid "Edit Drain"
msgstr "Edit Drain"
+msgid "Ditch"
+msgstr "Ditch"
+
msgid "Edit Ditch"
msgstr "Edit Ditch"
@@ -14788,6 +15300,12 @@ msgstr "Stream"
msgid "Edit Stream"
msgstr "Edit Stream"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -14827,9 +15345,6 @@ msgstr "Edit Dam"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14863,6 +15378,21 @@ msgstr "Edit Covered Reservoir"
msgid "Edit Water"
msgstr "Edit Water"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Land"
@@ -14944,18 +15474,23 @@ msgstr "Edit Ferry Terminal"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicycle"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -15028,7 +15563,10 @@ msgstr "military"
msgid "tourism"
msgstr "tourism"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15052,11 +15590,14 @@ msgstr "contact_line"
msgid "rail"
msgstr "rail"
-msgid "Voltage"
-msgstr "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frequency (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15067,9 +15608,6 @@ msgstr "Narrow Gauge Railway"
msgid "Edit Narrow Gauge Rail"
msgstr "Edit Narrow Gauge Railway"
-msgid "Types"
-msgstr "Types"
-
msgid "Monorail"
msgstr "Monorail"
@@ -15112,18 +15650,56 @@ msgstr "Disused Rail"
msgid "Edit Disused Railway"
msgstr "Edit Disused Railway"
-msgid "Optional Types"
-msgstr "Optional Types"
-
msgid "Abandoned Rail"
msgstr "Abandoned Rail"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Level Crossing"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Crossing"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Crossing type"
@@ -15223,11 +15799,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15239,13 +15813,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Edit Station"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pylon"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Edit Pylon"
+msgstr ""
msgid "Parking"
msgstr "Parking"
@@ -15262,12 +15834,12 @@ msgstr "surface"
msgid "underground"
msgstr "underground"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Access"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr "Park and Ride"
@@ -15295,9 +15867,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Capacity"
@@ -15313,19 +15882,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Opening Hours"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -15475,6 +16060,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltage"
+
msgid "Amperage"
msgstr ""
@@ -15496,6 +16084,12 @@ msgstr "Repair"
msgid "Edit Car Repair"
msgstr "Edit Car Repair"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15523,6 +16117,12 @@ msgstr "Rental"
msgid "Edit Car Rental"
msgstr "Edit Car Rental"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Sharing"
@@ -15547,22 +16147,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15584,9 +16168,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Clothes"
@@ -15650,8 +16231,8 @@ msgstr "Edit Bicycle Rental"
msgid "Public Transport"
msgstr "Public Transport"
-msgid "Route"
-msgstr "Route"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Edit Route"
@@ -15781,6 +16362,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15811,6 +16395,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bench"
@@ -15823,9 +16410,6 @@ msgstr "Wheelchair"
msgid "limited"
msgstr "limited"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15835,8 +16419,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Station"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edit Station"
msgid "Building"
msgstr "Building"
@@ -15850,6 +16439,9 @@ msgstr "Edit Subway Entrance"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15874,14 +16466,6 @@ msgstr "Account or loyalty cards"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Station"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Edit Station"
-
msgid "UIC-Reference"
msgstr "UIC-Reference"
@@ -15930,8 +16514,8 @@ msgstr "Edit Bus Platform"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Edit Taxi station"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Airport"
@@ -15984,6 +16568,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Edit Terminal"
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -16006,21 +16605,6 @@ msgstr "Edit Hotel"
msgid "Stars"
msgstr "Stars"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -16204,6 +16788,12 @@ msgstr "Nightclub"
msgid "Edit Nightclub"
msgstr "Edit Nightclub"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Tourism"
@@ -16225,9 +16815,15 @@ msgstr "Look-Out Tower"
msgid "Information Office"
msgstr "Information Office"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Map"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Detail Grade"
@@ -16240,6 +16836,9 @@ msgstr "street"
msgid "scheme"
msgstr "scheme"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Shown Area"
@@ -16279,6 +16878,9 @@ msgstr "... other transportation modes possible"
msgid "Information Board"
msgstr "Information Board"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Board Content"
@@ -16300,23 +16902,35 @@ msgstr "plants"
msgid "Guidepost"
msgstr "Guidepost"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Information Terminal"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Closer description"
msgid "Audioguide"
msgstr "Audioguide"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Audioguide via mobile phone?"
msgid "Phone number"
msgstr "Phone number"
-msgid "Other Information Points"
-msgstr "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Leisure"
@@ -16339,9 +16953,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "fence"
@@ -16366,8 +16977,17 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Playground"
@@ -16439,50 +17059,44 @@ msgstr "Artwork"
msgid "Edit Artwork"
msgstr "Edit Artwork"
-msgid "Place of Worship"
-msgstr "Place of Worship"
-
-msgid "Edit Place of Worship"
-msgstr "Edit Place of Worship"
-
-msgid "Religion"
-msgstr "Religion"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "buddhist"
+msgid "audio"
+msgstr ""
-msgid "christian"
-msgstr "christian"
+msgid "video"
+msgstr ""
-msgid "hindu"
-msgstr "hindu"
+msgid "Place of Worship"
+msgstr "Place of Worship"
-msgid "jain"
-msgstr "jain"
+msgid "Church"
+msgstr "Church"
-msgid "jewish"
-msgstr "jewish"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muslim"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualist"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoist"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarian"
+msgid "church"
+msgstr ""
-msgid "zoroastrian"
-msgstr "zoroastrian"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Denomination"
@@ -16499,6 +17113,12 @@ msgstr "catholic"
msgid "evangelical"
msgstr "evangelical"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehovahs_witness"
@@ -16511,6 +17131,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -16526,94 +17149,197 @@ msgstr "protestant"
msgid "quaker"
msgstr "quaker"
-msgid "shia"
-msgstr "shia"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "sunni"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
+msgid "Sa 18:00; Su 10:45"
msgstr ""
-msgid "Edit Studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
msgstr ""
-msgid "audio"
+msgid "Sa 10:00+"
msgstr ""
-msgid "video"
+msgid "Mosque"
msgstr ""
-msgid "Public Building"
-msgstr "Public Building"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Edit Public Building"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Town hall"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Edit Town hall"
+msgid "shia"
+msgstr "shia"
-msgid "Community Centre"
+msgid "sunni"
+msgstr "sunni"
+
+msgid "Synagogue"
msgstr ""
-msgid "Embassy"
-msgstr "Embassy"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Edit Embassy"
+msgid "synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Courthouse"
+msgid "conservative"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Edit Courthouse"
+msgid "reform"
+msgstr ""
-msgid "Prison"
-msgstr "Prison"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Edit Prison"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Police"
+msgid "theravada"
+msgstr ""
-msgid "Edit Police"
-msgstr "Edit Police"
+msgid "mahayana"
+msgstr ""
-msgid "Fire Station"
-msgstr "Fire Station"
+msgid "vajrayana"
+msgstr ""
-msgid "Edit Fire Station"
-msgstr "Edit Fire Station"
+msgid "Hindu Temple"
+msgstr ""
-msgid "Post Office"
-msgstr "Post Office"
+msgid "Edit Hindu Temple"
+msgstr ""
-msgid "Edit Post Office"
-msgstr "Edit Post Office"
+msgid "vaishnavism"
+msgstr ""
-msgid "Education"
+msgid "shaivism"
msgstr ""
-msgid "Kindergarten"
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religion"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jain"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualist"
+
+msgid "taoist"
+msgstr "taoist"
+
+msgid "unitarian"
+msgstr "unitarian"
+
+msgid "zoroastrian"
+msgstr "zoroastrian"
+
+msgid "Public Building"
+msgstr "Public Building"
+
+msgid "Edit Public Building"
+msgstr "Edit Public Building"
+
+msgid "Town hall"
+msgstr "Town hall"
+
+msgid "Edit Town hall"
+msgstr "Edit Town hall"
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr "Embassy"
+
+msgid "Edit Embassy"
+msgstr "Edit Embassy"
+
+msgid "Courthouse"
+msgstr "Courthouse"
+
+msgid "Edit Courthouse"
+msgstr "Edit Courthouse"
+
+msgid "Prison"
+msgstr "Prison"
+
+msgid "Edit Prison"
+msgstr "Edit Prison"
+
+msgid "Police"
+msgstr "Police"
+
+msgid "Edit Police"
+msgstr "Edit Police"
+
+msgid "Fire Station"
+msgstr "Fire Station"
+
+msgid "Edit Fire Station"
+msgstr "Edit Fire Station"
+
+msgid "Post Office"
+msgstr "Post Office"
+
+msgid "Edit Post Office"
+msgstr "Edit Post Office"
+
+msgid "Education"
+msgstr ""
+
+msgid "Kindergarten"
msgstr "Preschool"
msgid "Edit Kindergarten"
@@ -16646,6 +17372,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Health"
@@ -16655,6 +17387,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Edit Hospital"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Doctors"
@@ -16721,12 +17459,66 @@ msgstr "Veterinary"
msgid "Edit Veterinary"
msgstr "Edit Veterinary"
-msgid "Note"
-msgstr "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "public"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Post Box"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telephone"
@@ -16736,6 +17528,30 @@ msgstr "Edit Telephone"
msgid "Telephone cards"
msgstr "Telephone cards"
+msgid "Emergency Phone"
+msgstr "Emergency Phone"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16745,31 +17561,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16797,8 +17619,8 @@ msgstr ""
msgid "Recycling"
msgstr "Recycling"
-msgid "Edit Recycling station"
-msgstr "Edit Recycling station"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batteries"
@@ -16824,27 +17646,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Waste Basket"
-msgid "Edit Waste Basket"
-msgstr "Edit Waste Basket"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Backrest"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stone"
-
-msgid "plastic"
-msgstr "plastic"
-
msgid "Amount of Seats"
msgstr "Amount of Seats"
@@ -16879,14 +17689,17 @@ msgstr "Edit Hunting Stand"
msgid "Height"
msgstr "Height"
+msgctxt "height"
msgid "low"
-msgstr "low"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "half"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "full"
+msgstr ""
msgid "Hide"
msgstr "Hide"
@@ -16894,11 +17707,11 @@ msgstr "Hide"
msgid "Lock"
msgstr "Lock"
-msgid "Drinking Water"
-msgstr "Drinking Water"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Edit Drinking Water"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Fire Hydrant"
@@ -16925,6 +17738,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16962,119 +17778,155 @@ msgstr "Stadium"
msgid "Edit Stadium"
msgstr "Edit Stadium"
-msgid "select sport:"
-msgstr "select sport:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "multi"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "archery"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "athletics"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "australian_football"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basketball"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "lawn bowls"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "canoeing"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "climbing"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "cricket nets"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "cycling"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "dog racing"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "equestrian"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gymnastics"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hockey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "horse_racing"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motor"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "racquet"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "shooting"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "skating"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "skiing"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "soccer"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "swimming"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "table_tennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Sports Centre"
@@ -17106,26 +17958,27 @@ msgstr "Miniature Golf"
msgid "Edit Miniature Golf"
msgstr "Edit Miniature Golf"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Multi"
msgid "Edit Multi"
msgstr "Edit Multi"
-msgid "type"
-msgstr "type"
-
+msgctxt "running"
msgid "pitch"
-msgstr "pitch"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sports_centre"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadium"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -17133,6 +17986,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "pitch"
+
+msgid "sports_centre"
+msgstr "sports_centre"
+
+msgid "stadium"
+msgstr "stadium"
+
msgid "10pin"
msgstr "10pin"
@@ -17166,6 +18028,22 @@ msgstr "Edit Canoeing"
msgid "Edit Cycling"
msgstr "Edit Cycling"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Dog Racing"
@@ -17178,11 +18056,36 @@ msgstr "Equestrian"
msgid "Edit Equestrian"
msgstr "Edit Equestrian"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
-msgid "Horse Racing"
-msgstr "Horse Racing"
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "mud"
+
+msgid "Horse Racing"
+msgstr "Horse Racing"
msgid "Edit Horse Racing"
msgstr "Edit Horse Racing"
@@ -17197,7 +18100,7 @@ msgid "Skating"
msgstr "Skating"
msgid "Edit Skating"
-msgstr "Edit Skating"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17241,36 +18144,54 @@ msgstr "snow_park"
msgid "Difficulty"
msgstr "Difficulty"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "novice"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "easy"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "advanced"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "expert"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "freeride"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17313,19 +18234,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17464,6 +18381,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -17476,60 +18405,134 @@ msgstr "Man Made"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Entrance"
+
+msgid "Edit Entrance"
+msgstr "Edit an Entrance"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Tower"
@@ -17545,9 +18548,6 @@ msgstr "communication"
msgid "observation"
msgstr "observation"
-msgid "Height (meters)"
-msgstr "Height (metres)"
-
msgid "Flagpole"
msgstr ""
@@ -17757,41 +18757,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17800,8 +18826,8 @@ msgstr "Survey Point"
msgid "Edit Survey Point"
msgstr "Edit Survey Point"
-msgid "Surveillance"
-msgstr "Surveillance"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Edit Surveillance Camera"
@@ -17812,12 +18838,102 @@ msgstr "indoor"
msgid "outdoor"
msgstr "outdoor"
-msgid "public"
-msgstr "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "shop"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Power Generator"
@@ -17869,153 +18985,272 @@ msgstr "wind"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "photovoltaic"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Power Station"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Edit Power Station"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Power Sub Station"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Edit Power Sub Station"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
-msgstr "Line reference"
+msgid "solar photovoltaic"
+msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "solar thermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Power Tower"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Edit Power Tower"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
-msgstr "Tower reference"
+msgid "steam_turbine"
+msgstr ""
-msgid "Pole"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
msgstr ""
-msgid "Edit Power Pole"
+msgid "stellarator"
msgstr ""
-msgid "Pole reference"
+msgid "nuclear fusion"
msgstr ""
-msgid "Power Line"
-msgstr "Power Line"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Edit Power Line"
+msgid "vertical_axis"
+msgstr ""
-msgid "Line type"
-msgstr "Line type"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgid "nuclear fission"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Amount of Cables"
-msgstr "Amount of Cables"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
-msgstr "Number of wires (better: conductors) per power cable"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
-msgid "single"
-msgstr "single"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
-msgid "double"
-msgstr "double"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
-msgid "triple"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Power Sub Station"
+
+msgid "Edit Power Sub Station"
+msgstr "Edit Power Sub Station"
+
+msgid "Line reference"
+msgstr "Line reference"
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "low"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Power Tower"
+
+msgid "Edit Power Tower"
+msgstr "Edit Power Tower"
+
+msgid "Tower reference"
+msgstr "Tower reference"
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr "Power Line"
+
+msgid "Edit Power Line"
+msgstr "Edit Power Line"
+
+msgid "Line type"
+msgstr "Line type"
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr "Amount of Cables"
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr "Number of wires (better: conductors) per power cable"
+
+msgid "single"
+msgstr "single"
+
+msgid "double"
+msgstr "double"
+
+msgid "triple"
msgstr "triple"
msgid "quad"
@@ -18108,11 +19343,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Edit Kiosk"
-msgid "Baker"
-msgstr "Baker"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Edit Baker"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Butcher"
@@ -18123,7 +19358,7 @@ msgstr "Edit Butcher"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18144,14 +19379,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Organic"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -18222,7 +19463,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18243,13 +19484,13 @@ msgstr "Edit Electronics Shop"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -18258,9 +19499,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Edit Hifi Shop"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Edit Video Shop"
@@ -18286,6 +19526,12 @@ msgstr "Edit Money Exchange"
msgid "Edit Automated Teller Machine"
msgstr "Edit Automated Teller Machine"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18322,10 +19568,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "buddhist"
+
+msgid "christian"
+msgstr "christian"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "jewish"
+
+msgid "muslim"
+msgstr "muslim"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18355,7 +19622,7 @@ msgstr "Edit Hardware Store"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18367,19 +19634,19 @@ msgstr "Edit Furniture Shop"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -18400,6 +19667,12 @@ msgstr "Book Store"
msgid "Edit Book Store"
msgstr "Edit Book Store"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Travel Agency"
@@ -18409,7 +19682,7 @@ msgstr "Edit Travel Agency"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18490,6 +19763,9 @@ msgstr "toys"
msgid "vouchers"
msgstr "vouchers"
+msgid "Note"
+msgstr "Note"
+
msgid "Geography"
msgstr "Geography"
@@ -18619,6 +19895,12 @@ msgstr "Peak"
msgid "Edit Peak"
msgstr "Edit Peak"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacier"
@@ -18658,26 +19940,35 @@ msgstr "Tree"
msgid "Edit Tree"
msgstr "Edit Tree"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botanical Name"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Wood"
msgid "Edit Wood"
msgstr "Edit Wood"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "coniferous"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "deciduous"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "mixed"
msgid "Forest"
msgstr "Forest"
@@ -18685,15 +19976,6 @@ msgstr "Forest"
msgid "Edit Forest Landuse"
msgstr "Edit Forest Landuse"
-msgid "coniferous"
-msgstr "coniferous"
-
-msgid "deciduous"
-msgstr "deciduous"
-
-msgid "mixed"
-msgstr "mixed"
-
msgid "Grassland"
msgstr ""
@@ -18769,6 +20051,12 @@ msgstr "Meadow"
msgid "Edit Meadow Landuse"
msgstr "Edit Meadow Landuse"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vineyard"
@@ -18823,8 +20111,8 @@ msgstr "Recreation Ground"
msgid "Edit Recreation Ground Landuse"
msgstr "Edit Recreation Ground Landuse"
-msgid "Residential area"
-msgstr "Residential area"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Edit Residential Landuse"
@@ -18835,6 +20123,9 @@ msgstr "Graveyard"
msgid "Edit Graveyard"
msgstr "Edit Graveyard"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemetery"
@@ -18910,6 +20201,33 @@ msgstr "Edit Quarry Landuse"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Edit Address Information"
@@ -18928,30 +20246,6 @@ msgstr "City name"
msgid "Country code"
msgstr "Country code"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "Address Interpolation"
@@ -18970,6 +20264,18 @@ msgstr "even"
msgid "alphabetic"
msgstr "alphabetic"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19132,26 +20438,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "road"
+msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "foot"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "hiking"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "detour"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Symbol description"
@@ -19198,19 +20533,22 @@ msgstr "forward halt point"
msgid "backward halt point"
msgstr "backward halt point"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -19234,7 +20572,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19330,18 +20668,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "bridge"
msgid "deprecated"
msgstr "deprecated"
+msgid "bicycle"
+msgstr "bicycle"
+
+msgid "foot"
+msgstr "foot"
+
msgid "horse"
msgstr "horse"
@@ -19351,8 +20698,11 @@ msgstr "barrier"
msgid "motorroad"
msgstr "motorroad"
-msgid "highway_track"
-msgstr "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "services"
@@ -19360,11 +20710,11 @@ msgstr "services"
msgid "ford"
msgstr "ford"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "emergency_access_point"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "riverbank"
@@ -19381,6 +20731,9 @@ msgstr "rapids"
msgid "railwaypoint"
msgstr "railwaypoint"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19396,29 +20749,29 @@ msgstr "oldrail"
msgid "aeroway"
msgstr "aeroway"
-msgid "aeroway_dark"
-msgstr "aeroway_dark"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "aeroway_light"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "piste_easy"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "piste_intermediate"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "piste_advanced"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "piste_expert"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "piste_freeride"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "piste_novice"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "power"
@@ -19438,20 +20791,20 @@ msgstr "marina"
msgid "amenity"
msgstr "amenity"
-msgid "amenity_traffic"
-msgstr "amenity_traffic"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "amenity_light"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "light_water"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "health"
-msgid "shop"
-msgstr "shop"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotel"
@@ -19516,9 +20869,6 @@ msgstr "heath"
msgid "woodarea"
msgstr "woodarea"
-msgid "mud"
-msgstr "mud"
-
msgid "beach"
msgstr "beach"
@@ -19528,11 +20878,14 @@ msgstr "route"
msgid "boundary"
msgstr "boundary"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "place"
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "address"
@@ -19546,9 +20899,6 @@ msgstr "Village/City"
msgid "One Way"
msgstr "One Way"
-msgid "Church"
-msgstr "Church"
-
msgid "Fuel Station"
msgstr "Fuel Station"
@@ -19576,6 +20926,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19621,10 +20974,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19636,7 +21019,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19654,7 +21037,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19771,19 +21154,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:geometry on a node"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:postal_code without addr:postcode"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19802,13 +21296,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19817,23 +21347,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19844,142 +21383,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19995,13 +21583,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italy"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicily - Italy"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -20018,46 +21606,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -20078,90 +21669,150 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
+msgstr ""
+
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OSM Export"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
msgstr ""
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refresh the port list"
+
+msgid "Configure"
+msgstr "Configure"
+
+msgid "Connection Error."
+msgstr "Connection Error."
+
+msgid "configure the connected DG100"
+msgstr "configure the connected DG100"
+
+msgid "delete data after import"
+msgstr "delete data after import"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20367,6 +22018,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20388,13 +22051,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20657,9 +22314,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Updating properties of up to {0} object"
@@ -20681,6 +22344,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20759,9 +22425,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr "Handy Address Interpolation Functions"
@@ -20846,8 +22524,8 @@ msgstr "Expected odd numbers for addresses"
msgid "Expected even numbers for addresses"
msgstr "Expected even numbers for addresses"
-msgid "Expected valid number for address increment"
-msgstr "Expected valid number for address increment"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "Country code must be 2 letters"
@@ -21118,15 +22796,6 @@ msgstr "House number:"
msgid "Street Name:"
msgstr "Street Name:"
-msgid "Increment"
-msgstr "Increment"
-
-msgid "Decrement"
-msgstr "Decrement"
-
-msgid "Numbers:"
-msgstr "Numbers:"
-
msgid "Big buildings mode"
msgstr ""
@@ -21310,6 +22979,9 @@ msgstr "Disable image cropping during georeferencing."
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21328,12 +23000,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "symbol"
@@ -21478,6 +23144,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr "Display crosspieces:"
@@ -21497,6 +23166,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Add \"source=...\" to elements?"
@@ -21583,54 +23255,6 @@ msgstr ""
"This image contains georeference data.\n"
"Do you want to use them ?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Click first corner for image cropping\n"
-"(two points required)"
-
-msgid "Image cropping"
-msgstr "Image cropping"
-
-msgid "Click second corner for image cropping"
-msgstr "Click second corner for image cropping"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-
-msgid "Image georeferencing"
-msgstr "Image georeferencing"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Click second Lambert crosspiece for georeferencing"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Do you want to cancel completely\n"
-"or just retry "
-
-msgid "Enter cadastre east,north position"
-msgstr "Enter cadastre east,north position"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Warning: verify north with arrow !!)"
-
-msgid "East"
-msgstr "East"
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Set {0} Lambert coordinates"
-
msgid "Load layer from cache"
msgstr ""
@@ -21687,20 +23311,82 @@ msgstr "Add new layer"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Reset cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Get a new cookie (session timeout)"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr "PNG files (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Click first corner for image cropping\n"
+"(two points required)"
+
+msgid "Image cropping"
+msgstr "Image cropping"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+
+msgid "Image georeferencing"
+msgstr "Image georeferencing"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Do you want to cancel completely\n"
+"or just retry "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr "Enter cadastre east,north position"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Warning: verify north with arrow !!)"
+
+msgid "East"
+msgstr "East"
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Set {0} Lambert coordinates"
+
+msgid "Click second corner for image cropping"
+msgstr "Click second corner for image cropping"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Click second Lambert crosspiece for georeferencing"
msgid "Adjust WMS"
msgstr "Adjust WMS"
@@ -21727,8 +23413,11 @@ msgstr "WMS layer ({0}), {1} tile(s) loaded"
msgid "Is not vectorized."
msgstr "Is not vectorised."
-msgid "Raster size: {0}"
-msgstr "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Is vectorised."
@@ -21779,7 +23468,7 @@ msgstr "Delete the selected scheme from the list."
msgid "Color Schemes"
msgstr "Colour Schemes"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21827,6 +23516,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21899,6 +23591,71 @@ msgstr ""
msgid "Install"
msgstr ""
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Position only"
@@ -21932,33 +23689,15 @@ msgstr "Data Logging Format"
msgid "Disable data logging if speed falls below"
msgstr "Disable data logging if speed falls below"
-msgid "Disable data logging if distance falls below"
-msgstr "Disable data logging if distance falls below"
-
-msgid "Unknown logFormat"
-msgstr "Unknown logFormat"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refresh the port list"
+msgid "Disable data logging if distance falls below"
+msgstr "Disable data logging if distance falls below"
-msgid "Configure"
-msgstr "Configure"
+msgid "Unknown logFormat"
+msgstr "Unknown logFormat"
msgid "Configure Device"
msgstr "Configure Device"
-msgid "Connection Error."
-msgstr "Connection Error."
-
-msgid "configure the connected DG100"
-msgstr "configure the connected DG100"
-
-msgid "delete data after import"
-msgstr "delete data after import"
-
msgid "Importing data from device."
msgstr "Importing data from device."
@@ -22357,6 +24096,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22554,13 +24296,13 @@ msgid "Please select the imagery layer to adjust."
msgstr ""
msgid "Start adjusting"
-msgstr "Start adjusting"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
msgstr ""
msgid "No layers to adjust"
-msgstr "No layers to adjust"
+msgstr ""
msgid "Normal"
msgstr "Normal"
@@ -22604,12 +24346,6 @@ msgstr "Imported Images"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Open images with ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Load set of images as a new layer."
-
msgid "Import vector graphics"
msgstr ""
@@ -22619,16 +24355,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -23000,9 +24733,6 @@ msgstr "Auto-Centre"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Continuously centre the LiveGPS layer to current position."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -23057,9 +24787,31 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan Left"
@@ -23101,26 +24853,26 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
+msgstr ""
msgid "About Plugin"
msgstr ""
@@ -23256,9 +25008,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -23283,12 +25032,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23437,6 +25195,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23453,6 +25214,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23691,14 +25463,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "An error occurred: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Header contains several values and cannot be mapped to a single string"
-
msgid "Process queue"
msgstr "Process queue"
@@ -23755,18 +25519,6 @@ msgstr ""
msgid "Close: "
msgstr "Close: "
-msgid "New issue"
-msgstr "New issue"
-
-msgid "Create issue"
-msgstr "Create issue"
-
-msgid "Describe the problem precisely"
-msgstr "Describe the problem precisely"
-
-msgid "Create: "
-msgstr "Create: "
-
msgid "Open in browser"
msgstr ""
@@ -23827,6 +25579,9 @@ msgstr "Firefox executable"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24034,9 +25789,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -24117,8 +25869,26 @@ msgstr "Test failed: Could not read mtime."
msgid "Test failed: Could not write mtime."
msgstr "Test failed: Could not write mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -24271,6 +26041,9 @@ msgstr "Nothing in clipboard"
msgid "The clipboard data is not an image"
msgstr "The clipboard data is not an image"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -24292,6 +26065,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24585,9 +26361,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24656,9 +26429,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24785,9 +26555,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24809,6 +26576,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24841,15 +26611,35 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Change Properties"
+
msgid "Country preset:"
msgstr ""
@@ -24859,6 +26649,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24961,9 +26754,6 @@ msgstr "Routing Plug-in Preferences"
msgid "Configure routing preferences."
msgstr "Configure routing preferences."
-msgid "Highway type"
-msgstr "Highway type"
-
msgid "Speed (Km/h)"
msgstr "Speed (Km/h)"
@@ -25079,6 +26869,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Could not back up file. Exception is: {0}"
+
msgid "Simplify Area"
msgstr ""
@@ -25139,19 +26932,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25290,6 +27083,9 @@ msgstr "delete outline way"
msgid "Street name: "
msgstr "Street name: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Even/Odd"
@@ -25365,6 +27161,95 @@ msgstr "Tracer."
msgid "Tracer building"
msgstr "Tracer building"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -25380,9 +27265,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25404,6 +27286,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25556,9 +27441,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26184,7 +28066,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -26192,10 +28077,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -26204,18 +28086,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -26258,15 +28128,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -26388,18 +28249,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26577,9 +28426,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -26706,8 +28552,8 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
-msgstr "Scanned Map..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26728,9 +28574,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers layer ({0}) in zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Way Download"
@@ -26873,9 +28716,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index 9b576ab..233eca3 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:07+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:08+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,16 +165,14 @@ msgid "About JOSM..."
msgstr "About JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -205,6 +218,9 @@ msgstr "No target layers"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -244,9 +260,6 @@ msgstr "Tool: {0}"
msgid "Please select at least four nodes."
msgstr "Please select at least four nodes."
-msgid "Information"
-msgstr "Information"
-
msgid "Align Nodes in Line"
msgstr "Align Nodes in Line"
@@ -271,6 +284,9 @@ msgstr "conflict"
msgid "download"
msgstr "download"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "previous"
@@ -280,6 +296,9 @@ msgstr "next"
msgid "Nothing selected to zoom to."
msgstr "Nothing selected to zoom to."
+msgid "Information"
+msgstr "Information"
+
msgid "Zoom to {0}"
msgstr "Zoom to {0}"
@@ -336,11 +355,9 @@ msgstr ""
"reverse some of them?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Could not combine ways (They could not be merged into a single string of "
-"nodes)"
msgid "Combine {0} ways"
msgstr "Combine {0} ways"
@@ -397,18 +414,35 @@ msgstr "Delete"
msgid "Delete selected objects."
msgstr "Delete selected objects."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distribute Nodes"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribute the selected nodes to equal distances along a line."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Download from OSM..."
msgid "Download map data from the OSM server."
msgstr "Download map data from the OSM server."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "Download object..."
@@ -503,6 +537,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -616,7 +653,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -766,8 +803,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -924,8 +961,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -952,12 +989,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -975,9 +1008,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1084,6 +1114,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1134,9 +1173,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1198,6 +1234,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1272,13 +1311,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1367,6 +1406,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1391,9 +1451,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1589,6 +1646,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1598,6 +1658,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1617,6 +1689,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1667,25 +1764,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1828,6 +1906,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1852,8 +1933,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1869,6 +1950,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2275,6 +2359,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2435,13 +2522,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2450,6 +2537,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2468,8 +2558,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2555,6 +2644,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2591,10 +2683,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2617,8 +2709,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2722,6 +2814,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2782,8 +2877,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2813,10 +2908,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2837,6 +2932,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2867,18 +2965,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2887,8 +2985,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2896,13 +2994,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2916,8 +3012,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2947,11 +3043,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3104,8 +3199,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3212,7 +3306,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3231,6 +3325,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3247,9 +3344,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3288,6 +3382,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3312,6 +3409,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3371,13 +3477,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3447,6 +3553,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3516,6 +3640,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3573,13 +3703,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3611,10 +3741,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3748,7 +3878,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3823,6 +3953,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3853,9 +3986,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3880,10 +4010,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3946,23 +4076,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4066,7 +4179,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4262,9 +4375,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4280,10 +4408,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4292,6 +4432,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4351,6 +4494,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4378,19 +4524,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4678,29 +4811,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4715,7 +4866,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4767,14 +4918,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5024,14 +5167,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5552,6 +5695,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5635,6 +5781,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Object type:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "Choose the OSM object type"
+
+msgid "Object ID:"
+msgstr "Object ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Enter the ID of the object that should be downloaded"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5656,9 +5829,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5683,32 +5853,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5728,8 +5898,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5755,9 +5924,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5902,9 +6068,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6189,8 +6352,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6255,34 +6418,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6297,13 +6472,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6382,12 +6557,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6417,9 +6586,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6457,7 +6632,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6517,6 +6692,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6772,6 +6950,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6837,9 +7034,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6906,21 +7100,8 @@ msgstr ""
msgid "Download object"
msgstr "Download object"
-msgid "Object type:"
-msgstr "Object type:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "Choose the OSM object type"
-
-msgid "Object ID:"
-msgstr "Object ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
+msgstr "Start downloading"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6930,23 +7111,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Start downloading"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7043,7 +7210,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7142,6 +7309,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7229,7 +7399,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7248,6 +7418,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7314,8 +7490,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7390,8 +7565,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7405,8 +7580,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7621,12 +7795,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7635,6 +7803,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7650,6 +7834,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7657,8 +7856,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7770,9 +7969,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7782,6 +7978,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7798,7 +7997,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7944,7 +8143,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7974,7 +8173,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8088,6 +8287,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8125,6 +8327,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8321,9 +8526,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8342,6 +8544,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8399,6 +8604,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8465,9 +8676,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8480,7 +8688,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8507,12 +8718,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8641,14 +8856,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8663,7 +8874,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8673,8 +8884,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8894,7 +9104,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8960,6 +9170,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9017,9 +9233,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9266,6 +9479,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9394,6 +9610,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9436,6 +9658,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9486,19 +9711,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9516,40 +9732,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9573,6 +9798,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9629,6 +9887,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9682,6 +9943,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9963,7 +10229,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10132,6 +10404,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10195,7 +10473,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10453,40 +10731,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10539,8 +10817,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10549,20 +10827,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10644,14 +10927,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10695,31 +10972,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10728,6 +11010,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10743,57 +11028,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10811,6 +11098,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10840,6 +11135,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10870,7 +11208,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10910,28 +11248,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11026,6 +11362,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11041,12 +11380,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11125,7 +11472,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11224,35 +11571,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11262,8 +11585,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11290,10 +11613,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11304,9 +11624,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11328,7 +11645,10 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
-msgid ""
+msgid "Reading was canceled"
+msgstr ""
+
+msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
msgstr ""
@@ -11377,8 +11697,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11521,6 +11841,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11539,6 +11862,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11563,16 +11895,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11584,6 +11919,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11598,6 +11941,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11628,19 +11980,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11662,11 +12014,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11736,13 +12100,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11885,10 +12249,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11903,22 +12267,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11987,8 +12350,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12003,9 +12365,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12327,17 +12704,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12348,9 +12719,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12382,9 +12796,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
msgstr ""
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12707,6 +13135,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12786,6 +13219,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12887,9 +13324,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12945,6 +13379,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12969,9 +13406,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12997,9 +13431,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13036,6 +13467,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13082,9 +13518,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13169,6 +13602,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13259,6 +13695,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13277,10 +13757,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13292,6 +13772,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13319,18 +13802,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13340,9 +13817,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13352,13 +13826,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13406,6 +13880,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13490,6 +13967,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13594,21 +14074,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13624,10 +14113,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13663,7 +14152,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13732,12 +14221,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13753,15 +14248,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13783,6 +14269,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13792,6 +14287,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13801,10 +14299,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13837,9 +14332,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13873,19 +14365,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13897,6 +14413,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13918,49 +14437,93 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
msgstr ""
msgid "Lift Gate"
@@ -13987,12 +14550,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14050,6 +14628,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14059,6 +14640,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14098,9 +14685,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14134,6 +14718,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14215,18 +14814,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14299,7 +14903,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14323,10 +14930,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14338,9 +14948,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14383,18 +14990,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14494,11 +15139,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14510,11 +15153,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14533,10 +15174,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14566,9 +15207,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14584,19 +15222,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14746,6 +15400,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14767,6 +15424,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14794,6 +15457,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14818,22 +15487,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14855,9 +15508,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14921,7 +15571,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15052,6 +15702,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15082,6 +15735,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15094,9 +15750,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15106,9 +15759,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15121,6 +15779,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15145,14 +15806,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15201,7 +15854,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15255,41 +15908,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15475,6 +16128,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15496,9 +16155,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15511,6 +16176,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15550,6 +16218,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15571,22 +16242,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15610,9 +16293,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15637,7 +16317,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15710,52 +16399,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15770,6 +16453,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15782,6 +16471,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15797,37 +16489,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15917,6 +16712,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15926,6 +16727,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15992,12 +16799,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16007,6 +16868,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16016,31 +16901,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16068,7 +16959,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16095,27 +16986,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16150,12 +17029,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16165,10 +17047,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16196,6 +17078,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16233,117 +17118,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16377,33 +17298,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16437,6 +17368,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16449,7 +17396,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16512,36 +17484,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16584,19 +17574,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16735,6 +17721,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16747,60 +17745,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
-msgid "apartments"
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
+msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16816,9 +17888,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17028,41 +18097,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17071,7 +18166,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17083,12 +18178,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17140,88 +18325,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
msgstr ""
-msgid "battery charging"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Power Station"
+msgid "Boiling Water Reactor 3 (BWR-3)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17233,6 +18521,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17248,6 +18551,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17266,11 +18572,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17379,10 +18683,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17394,7 +18698,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17415,13 +18719,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17493,7 +18803,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17514,13 +18824,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17529,7 +18839,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17557,6 +18866,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17593,40 +18908,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
+msgstr ""
+
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17638,19 +18974,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17671,6 +19007,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17680,7 +19022,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17761,6 +19103,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17890,6 +19235,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17929,24 +19280,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17956,15 +19316,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18040,6 +19391,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18094,7 +19451,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18106,6 +19463,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18181,46 +19541,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18241,6 +19604,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18403,27 +19778,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18469,19 +19873,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18505,7 +19912,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18601,18 +20008,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18622,7 +20038,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18631,10 +20050,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18652,6 +20071,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18667,28 +20089,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18709,19 +20131,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18787,9 +20209,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18799,10 +20218,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18817,9 +20239,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18847,6 +20266,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18892,10 +20314,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18907,7 +20359,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18925,7 +20377,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19042,19 +20494,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "map_type without information=map"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19073,13 +20636,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19088,19 +20687,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19115,142 +20723,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19289,148 +20946,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19634,6 +21354,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19655,13 +21387,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19924,9 +21650,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19948,6 +21680,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20026,9 +21761,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20113,7 +21860,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20384,15 +22131,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20563,6 +22301,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20581,12 +22322,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20722,6 +22457,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20739,6 +22477,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20819,113 +22560,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20951,7 +22706,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21001,7 +22759,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21046,6 +22804,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21103,19 +22864,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21157,27 +22983,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21573,6 +23381,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21820,12 +23631,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21835,16 +23640,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22207,9 +24009,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22264,9 +24063,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22308,25 +24124,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22463,9 +24279,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22490,12 +24303,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22644,6 +24466,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22660,6 +24485,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22893,13 +24729,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22952,18 +24781,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23021,6 +24838,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23228,9 +25048,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23310,7 +25127,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23464,6 +25299,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23485,6 +25323,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23778,9 +25619,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23849,9 +25687,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23978,9 +25813,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24002,6 +25834,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24034,15 +25869,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24052,6 +25903,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24154,9 +26008,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24272,6 +26123,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24332,19 +26186,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24482,6 +26336,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24557,6 +26414,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24572,9 +26518,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24596,6 +26539,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24748,9 +26694,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25376,7 +27319,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25384,10 +27330,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25396,18 +27339,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25450,15 +27381,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25580,18 +27502,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25769,9 +27679,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25898,7 +27805,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25918,9 +27825,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26053,9 +27957,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 4e7c9bf..f7f2875 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:01+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-11-27 08:36+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: German <josm-dev at openstreetmap.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: 2013-04-05 05:05+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:06+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Background Terms of Use"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Opening link not supported on current platform (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ERROR: {0}"
+
+msgid "WARNING: {0}"
+msgstr "WARNING: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Executing platform startup hook"
@@ -153,18 +168,18 @@ msgid "About JOSM..."
msgstr "About JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -210,23 +225,26 @@ msgstr "No target layers"
msgid "Add imagery layer {0}"
msgstr "Add imagery layer {0}"
+msgid "Select image format for WMS layer"
+msgstr "Select image format for WMS layer"
+
msgid "Select WMS layers"
-msgstr ""
+msgstr "Select WMS layers"
msgid "Add layers"
-msgstr ""
+msgstr "Add layers"
msgid "Invalid service URL."
-msgstr ""
+msgstr "Invalid service URL."
msgid "WMS Error"
-msgstr ""
+msgstr "WMS Error"
msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "Could not retrieve WMS layer list."
msgid "Could not parse WMS layer list."
-msgstr ""
+msgstr "Could not parse WMS layer list."
msgid "Add Node..."
msgstr "Add Node..."
@@ -249,9 +267,6 @@ msgstr "Tool: {0}"
msgid "Please select at least four nodes."
msgstr "Please select at least four nodes."
-msgid "Information"
-msgstr "Information"
-
msgid "Align Nodes in Line"
msgstr "Align Nodes in Line"
@@ -276,6 +291,9 @@ msgstr "conflict"
msgid "download"
msgstr "download"
+msgid "problem"
+msgstr "problem"
+
msgid "previous"
msgstr "previous"
@@ -285,6 +303,9 @@ msgstr "next"
msgid "Nothing selected to zoom to."
msgstr "Nothing selected to zoom to."
+msgid "Information"
+msgstr "Information"
+
msgid "Zoom to {0}"
msgstr "Zoom to {0}"
@@ -341,10 +362,10 @@ msgstr ""
"reverse some of them?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgid "Combine {0} ways"
@@ -402,18 +423,37 @@ msgstr "Delete"
msgid "Delete selected objects."
msgstr "Delete selected objects."
+msgid "Toggle dialogs panel"
+msgstr "Toggle dialogs panel"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Toggle dialogues panel, maximise mapview"
+
msgid "Distribute Nodes"
msgstr "Distribute Nodes"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribute the selected nodes to equal distances along a line."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignoring {0} nodes with null coordinates"
+
msgid "Download from OSM..."
msgstr "Download from OSM..."
msgid "Download map data from the OSM server."
msgstr "Download map data from the OSM server."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+
+msgid "Download data"
+msgstr "Download data"
+
msgid "Download object..."
msgstr "Download object..."
@@ -472,10 +512,10 @@ msgid "Exit the application."
msgstr "Exit the application."
msgid "Expert Mode"
-msgstr ""
+msgstr "Expert Mode"
msgid "Enable/disable expert mode"
-msgstr ""
+msgstr "Enable/disable expert mode"
msgid "Follow line"
msgstr "Follow line"
@@ -510,6 +550,9 @@ msgstr "History"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Display history information about OSM ways, nodes, or relations."
+msgid "Show history"
+msgstr "Show history"
+
msgid "History (web)"
msgstr "History (web)"
@@ -564,12 +607,14 @@ msgstr ""
"Display advanced object information about OSM nodes, ways, or relations."
msgid "Advanced info (web)"
-msgstr ""
+msgstr "Advanced info (web)"
msgid ""
"Display object information about OSM nodes, ways, or relations in web "
"browser."
msgstr ""
+"Display object information about OSM nodes, ways, or relations in web "
+"browser."
msgid "Join overlapping Areas"
msgstr "Join overlapping Areas"
@@ -583,9 +628,10 @@ msgstr "Please select at least one closed way that should be joined."
msgid ""
"One of the selected ways is not closed and therefore cannot be joined."
msgstr ""
+"One of the selected ways is not closed and therefore cannot be joined."
msgid "Join area confirmation"
-msgstr ""
+msgstr "Join area confirmation"
msgid "The selected way has nodes outside of the downloaded data region."
msgid_plural ""
@@ -604,25 +650,25 @@ msgid "Please abort if you are not sure"
msgstr "Please abort if you are not sure"
msgid "The selected area is incomplete. Continue?"
-msgstr ""
+msgstr "The selected area is incomplete. Continue?"
msgid "No intersection found. Nothing was changed."
msgstr "No intersection found. Nothing was changed."
msgid "Reverting changes"
-msgstr ""
+msgstr "Reverting changes"
msgid "Removed duplicate nodes"
-msgstr ""
+msgstr "Removed duplicate nodes"
msgid "Added node on all intersections"
msgstr "Added node on all intersections"
msgid "Assemble new polygons"
-msgstr ""
+msgstr "Assemble new polygons"
msgid "Delete relations"
-msgstr ""
+msgstr "Delete relations"
msgid "Delete Ways that are not part of an inner multipolygon"
msgstr "Delete Ways that are not part of an inner multipolygon"
@@ -631,33 +677,38 @@ msgid "Joined overlapping areas"
msgstr "Joined overlapping areas"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgid "Fix tag conflicts"
msgstr "Fix tag conflicts"
msgid "Split ways into fragments"
-msgstr ""
+msgstr "Split ways into fragments"
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgstr ""
+"Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgid ""
"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
msgstr ""
+"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
msgid ""
"Sorry. Cannot handle way that is both inner and outer in multipolygon "
"relations."
msgstr ""
+"Sorry. Cannot handle way that is both inner and outer in multipolygon "
+"relations."
msgid ""
"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
msgstr ""
+"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
msgid "Removed Element from Relations"
msgstr "Removed Element from Relations"
@@ -783,8 +834,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Merge nodes into the oldest one."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -941,8 +992,8 @@ msgid "Download Data"
msgstr "Download Data"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -974,16 +1025,9 @@ msgid "Orthogonalize / Undo"
msgstr "Orthogonalise / Undo"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Orthogonalise Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalise Shape "
-"action!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Undo Orthogonalise Shape"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1003,9 +1047,6 @@ msgstr "Orthogonalise"
msgid "Usage"
msgstr "Usage"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Selected Elements cannot be orthogonalised"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1114,6 +1155,15 @@ msgstr "Also rename the file"
msgid "Could not rename file ''{0}''"
msgstr "Could not rename file ''{0}''"
+msgid "Restart"
+msgstr "Restart"
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1166,9 +1216,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1231,6 +1278,9 @@ msgstr "Status Report"
msgid "Copy to clipboard and close"
msgstr "Copy to clipboard and close"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Close"
@@ -1312,18 +1362,14 @@ msgstr ""
"middle of the way.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Split way {0} into {1} parts"
@@ -1418,6 +1464,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Undo"
@@ -1442,9 +1509,6 @@ msgstr "Update data"
msgid "Updates the objects in the active data layer from the server."
msgstr "Updates the objects in the active data layer from the server."
-msgid "Download data"
-msgstr "Download data"
-
msgid "Update modified"
msgstr "Update modified"
@@ -1644,6 +1708,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Slower Forwards"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Downloading GPS data"
@@ -1653,6 +1720,18 @@ msgstr "Downloaded GPX Data"
msgid "Markers from {0}"
msgstr "Markers from {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Downloading data"
@@ -1672,6 +1751,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "There was {0} conflict during import."
+msgstr[1] "There were {0} conflicts during import."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflict during download"
+msgstr[1] "Conflicts during download"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Loading parents of node {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Loading parents of way {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Loading parents of relation {2}"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Download {0} of {1} ({2} left)"
@@ -1724,25 +1828,6 @@ msgstr "The following errors occurred during mass download: {0}"
msgid "Errors during download"
msgstr "Errors during download"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "There was {0} conflict during import."
-msgstr[1] "There were {0} conflicts during import."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflict during download"
-msgstr[1] "Conflicts during download"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Loading parents of node {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Loading parents of way {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Loading parents of relation {2}"
-
msgid "Error during download"
msgstr ""
@@ -1887,6 +1972,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1911,8 +1999,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1928,6 +2016,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2345,6 +2436,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2508,14 +2602,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
-msgstr "Primitive id expected"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "Changeset id expected"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "Version expected"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2524,6 +2618,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgid "Primitive id expected"
+msgstr "Primitive id expected"
+
msgid "Range of numbers expected"
msgstr "Range of numbers expected"
@@ -2542,10 +2639,8 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr "Missing operator for NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2635,6 +2730,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Added {0} object"
msgstr[1] "Added {0} objects"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Change node {0}"
@@ -2671,10 +2769,10 @@ msgstr "Remove \"{0}\" for {1} objects"
msgid "Set {0}={1} for {2} objects"
msgstr "Set {0}={1} for {2} objects"
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2697,8 +2795,8 @@ msgid "Double conflict"
msgstr "Double conflict"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2806,6 +2904,9 @@ msgstr[1] "Purged {0} objects"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resolve conflicts in member list of relation {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotate {0} node"
@@ -2866,11 +2967,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
msgid "Relation"
msgstr "Relation"
@@ -2899,11 +2998,11 @@ msgstr "Apply selected changes"
msgid "Do not apply changes"
msgstr "Do not apply changes"
-msgid "Please select which property changes you want to apply."
-msgstr "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Properties of "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Roles in relations referring to"
@@ -2923,6 +3022,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2953,21 +3055,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Warning: Failed to initialise preferences. Preference directory ''{0}'' is "
-"not a directory."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -2977,11 +3077,9 @@ msgstr ""
"not a directory.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Warning: Failed to initialise preferences. Failed to create missing "
-"preference directory: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -2990,16 +3088,12 @@ msgstr ""
"<html>Failed to initialise preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3016,8 +3110,8 @@ msgstr ""
"<br>{0}<br> and creating a new default preference file.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3047,12 +3141,11 @@ msgstr "Failed to load resource ''{0}'', error is {1}."
msgid "UNKNOWN"
msgstr "UNKNOWN"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "already registered a conflict for primitive ''{0}''"
@@ -3213,8 +3306,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "parameter {0} not in range 0..{1}, got {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3321,7 +3413,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3340,6 +3432,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3356,9 +3451,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3399,6 +3491,9 @@ msgstr "validation other"
msgid "Running test {0}"
msgstr "Running test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Addresses"
@@ -3423,6 +3518,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3484,15 +3588,15 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Duplicated nodes"
msgid "This test checks that there are no nodes at the very same location."
msgstr "This test checks that there are no nodes at the very same location."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3560,6 +3664,24 @@ msgstr "Duplicated way nodes"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Checks for ways with identical consecutive nodes."
+msgid "Highways"
+msgstr "Highways"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolygon"
@@ -3629,6 +3751,12 @@ msgstr "Nodes with same name"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "This test finds nodes that have the same name (might be duplicates)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3688,13 +3816,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3728,11 +3856,11 @@ msgid ""
msgstr ""
"This test checks for ways with similar names that may have been misspelt."
-msgid "Properties checker :"
-msgstr "Properties checker :"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "This plug-in checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Invalid tagchecker line - {0}: {1}"
@@ -3871,8 +3999,8 @@ msgstr "Use default spellcheck file."
msgid "Use the default spellcheck file (recommended)."
msgstr "Use the default spellcheck file (recommended)."
-msgid "Fix properties"
-msgstr "Fix properties"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Could not find element type"
@@ -3946,6 +4074,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr "This tests if ways which should be circular are closed."
+msgid "Unclosed way"
+msgstr "Unclosed way"
+
msgid "natural type {0}"
msgstr "natural type {0}"
@@ -3976,9 +4107,6 @@ msgstr "building"
msgid "area"
msgstr "area"
-msgid "Unclosed way"
-msgstr "Unclosed way"
-
msgid "Unconnected ways"
msgstr ""
@@ -4003,10 +4131,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "This test checks for untagged nodes that are not part of any way."
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4069,25 +4197,6 @@ msgstr "Reversed coastline: land not on left side"
msgid "Reversed land: land not on left side"
msgstr "Reversed land: land not on left side"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Do not show again (remembers choice)"
@@ -4191,7 +4300,7 @@ msgstr "Show help information"
msgid "Downloading \"Message of the day\""
msgstr "Downloading \"Message of the day\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4399,9 +4508,24 @@ msgstr "View"
msgid "Tools"
msgstr "Tools"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Selection"
+
msgid "Presets"
msgstr "Presets"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4417,10 +4541,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4429,6 +4565,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4490,6 +4629,9 @@ msgstr "(no object)"
msgid "User:"
msgstr "User:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "layer not in list."
@@ -4517,20 +4659,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "false: the property is explicitly switched off"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: the property is explicitly switched on"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"partial: different selected objects have different values, do not change"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "unset: do not set this property on the selected objects"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4829,6 +4957,9 @@ msgstr "> bottom"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "Copy my selected elements to the end of the list of merged elements"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -4836,6 +4967,9 @@ msgstr ""
"Copy my selected elements before the first selected element in the list of "
"merged elements"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -4843,16 +4977,25 @@ msgstr ""
"Copy my selected elements after the first selected element in the list of "
"merged elements"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Copy their selected element to the start of the list of merged elements"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Copy their selected elements to the end of the list of merged elements"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -4860,6 +5003,9 @@ msgstr ""
"Copy their selected elements before the first selected element in the list "
"of merged elements"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4876,8 +5022,8 @@ msgstr "Copy all their elements to the target"
msgid "Up"
msgstr "Up"
-msgid "Move up the selected elements by one position."
-msgstr "Move up the selected elements by one position"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Down"
@@ -4931,16 +5077,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Their version ({0} entry)"
msgstr[1] "Their version ({0} entries)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronised "
-"adjustment."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Adjustable {0} not registered yet."
-
msgid "Node"
msgstr "Node"
@@ -5194,16 +5330,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Key:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
msgid "Value:"
msgstr "Value:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5747,6 +5882,9 @@ msgstr "Show/Hide"
msgid "Information about layer"
msgstr "Information about layer"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Map Paint Styles"
@@ -5830,6 +5968,36 @@ msgstr ""
msgid "No"
msgstr "No"
+msgid "Object type:"
+msgstr "Object type:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "mixed"
+
+msgid "Choose the OSM object type"
+msgstr "Choose the OSM object type"
+
+msgid "Object ID:"
+msgstr "Object ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Enter the ID of the object that should be downloaded"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relations"
@@ -5851,9 +6019,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relations: {0}"
-msgid "Selection"
-msgstr "Selection"
-
msgid "Open a selection list window."
msgstr "Open a selection list window."
@@ -5878,18 +6043,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Selection: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5907,6 +6060,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Click to minimise/maximise the panel content"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Authors"
@@ -5924,10 +6089,8 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr "Launches a browser with information about the user"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -5954,9 +6117,6 @@ msgstr "Open the validation window."
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Zoom to problem"
-
msgid "Fix"
msgstr "Fix"
@@ -6105,9 +6265,6 @@ msgstr "Update content"
msgid "Update the changeset content from the OSM server"
msgstr "Update the changeset content from the OSM server"
-msgid "Show history"
-msgstr "Show history"
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6429,11 +6586,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Download changesets in the current map view</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6500,35 +6655,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "This changeset query URL is invalid"
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Properties/Memberships"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Properties for selected objects."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<different>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Member Of"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Properties / Memberships"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Delete the selected key in all objects"
-msgid "Delete Properties"
-msgstr "Delete Properties"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Change relation"
@@ -6542,13 +6709,13 @@ msgstr "Really delete selection from relation {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Add a new key/value pair to all objects"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Edit the value of the selected key for all objects"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6627,12 +6794,6 @@ msgstr[1] "Change properties of up to {0} objects"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6662,9 +6823,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6702,7 +6869,7 @@ msgstr "Relation is deleted"
msgid "Downloading relation {0}"
msgstr "Downloading relation {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6765,6 +6932,9 @@ msgstr "Remove them, clean up relation"
msgid "Ignore them, leave relation as is"
msgstr "Ignore them, leave relation as is"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7032,6 +7202,26 @@ msgstr "way is connected to next relation member"
msgid "way is not connected to previous or next relation member"
msgstr "way is not connected to previous or next relation member"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+
msgid "Bookmarks"
msgstr "Bookmarks"
@@ -7102,9 +7292,6 @@ msgstr "Value for latitude in range [-90,90] required."
msgid "Value for longitude in range [-180,180] required."
msgstr "Value for longitude in range [-180,180] required."
-msgid "Paste URL from clipboard"
-msgstr "Paste URL from clipboard"
-
msgid "Data Sources and Types:"
msgstr "Data Sources and Types:"
@@ -7173,21 +7360,8 @@ msgstr "Download referrers (parent relations)"
msgid "Download object"
msgstr "Download object"
-msgid "Object type:"
-msgstr "Object type:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "mixed"
-
-msgid "Choose the OSM object type"
-msgstr "Choose the OSM object type"
-
-msgid "Object ID:"
-msgstr "Object ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
+msgstr "Start downloading"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7199,28 +7373,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Select if the members of a relation should be downloaded as well"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Download referrers (parent relations and ways)"
-msgid "Start downloading"
-msgstr "Start downloading"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Invalid ID list specified\n"
-"Cannot download object."
-
msgid "Class Type"
msgstr "Class Type"
@@ -7325,8 +7480,8 @@ msgstr "Go to the next page"
msgid "Go to the JOSM help home page"
msgstr "Go to the JOSM help home page"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "Failed to open help page. The target URL is empty."
@@ -7428,6 +7583,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Changeset info"
@@ -7534,8 +7692,8 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr ""
msgid "Upload"
msgstr "Upload"
@@ -7553,6 +7711,12 @@ msgstr "Provide a brief comment for the changes you are uploading:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Changeset id:"
@@ -7621,11 +7785,8 @@ msgid "Closing changeset {0}"
msgstr "Closing changeset {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Warning: failed to put Credential Dialogue always on top. Caught security "
-"exception."
msgid "Enter credentials for OSM API"
msgstr "Enter credentials for OSM API"
@@ -7705,8 +7866,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7724,11 +7885,8 @@ msgid "Missing user identity"
msgstr "Missing user identity"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
msgid "Download objects"
msgstr ""
@@ -7960,12 +8118,6 @@ msgstr "Upload the changed primitives"
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7974,6 +8126,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7989,6 +8157,21 @@ msgstr "Please enter a valid chunk size first"
msgid "Illegal chunk size"
msgstr "Illegal chunk size"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Cancel the upload and resume editing"
@@ -7996,11 +8179,9 @@ msgid "Tags of changeset {0}"
msgstr "Tags of changeset {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
msgid "Preparing objects to upload ..."
msgstr ""
@@ -8134,9 +8315,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "Object ''{0}'' is already deleted. Skipping object in upload."
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Uploading {0} object..."
@@ -8147,6 +8325,9 @@ msgid ""
msgstr ""
"Ignoring caught exception because upload is cancelled. Exception is: {0}"
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8167,9 +8348,8 @@ msgstr "Select objects to upload"
msgid "Cancel uploading"
msgstr "Cancel uploading"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Please select the upload strategy:"
@@ -8318,7 +8498,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8348,8 +8528,8 @@ msgstr "version {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8464,6 +8644,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8502,6 +8685,9 @@ msgstr "Reload erroneous tiles"
msgid "Alpha channel"
msgstr "Alpha channel"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr "Set WMS Bookmark"
@@ -8713,9 +8899,6 @@ msgstr "Extracting GPS locations from EXIF"
msgid "Starting directory scan"
msgstr "Starting directory scan"
-msgid "One of the selected files was null"
-msgstr "One of the selected files was null"
-
msgid "Read photos..."
msgstr "Read photos..."
@@ -8734,6 +8917,9 @@ msgstr "Found null file in directory {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Error while getting files from directory {0}\n"
+msgid "One of the selected files was null"
+msgstr "One of the selected files was null"
+
msgid "Geotagged Images"
msgstr "Geotagged Images"
@@ -8793,6 +8979,12 @@ msgstr "Next"
msgid "Show next Image"
msgstr "Show next Image"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centre view"
@@ -8865,9 +9057,6 @@ msgstr ""
"<html>Upload of unprocessed GPS data as map data is considered "
"harmful.<br>If you want to upload traces, look here:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8880,10 +9069,13 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
-msgid "Download everything within:"
+msgid "Select to download GPS traces."
+msgstr ""
+
+msgid "Download everything within:"
msgstr "Download everything within:"
msgid "{0} meters"
@@ -8907,15 +9099,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Download from OSM along this track"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9060,16 +9254,11 @@ msgstr "There was an error while trying to display the URL for this marker"
msgid "(URL was: "
msgstr "(URL was: "
-msgid "Error displaying URL"
-msgstr "Error displaying URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgid "loading style ''{0}''..."
msgstr ""
@@ -9083,7 +9272,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -9093,8 +9282,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Illegal dash pattern, at least one value must be > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9351,8 +9539,8 @@ msgstr "Close the dialogue and cancel authorisation"
msgid "Close the dialog and accept the Access Token"
msgstr "Close the dialogue and accept the Access Token"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Retrieving OAuth Request Token from ''{0}''"
@@ -9420,6 +9608,12 @@ msgstr "Allow to write your preferences"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Select to grant JOSM the right to write your server preferences"
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "Retrieving OAuth Access Token..."
@@ -9489,9 +9683,6 @@ msgstr ""
"this token. JOSM will use it in the future for authentication and "
"authorisation to the OSM server.<br><br>The access token is: </html>"
-msgid "Restart"
-msgstr "Restart"
-
msgid "Click to retrieve a Request Token"
msgstr "Click to retrieve a Request Token"
@@ -9773,6 +9964,9 @@ msgstr "Download plug-ins"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "You have to restart JOSM for some settings to take effect."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Remote Control"
@@ -9901,6 +10095,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "Actions"
@@ -9943,6 +10143,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Data validator"
@@ -9995,19 +10198,10 @@ msgstr "Search: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -10025,40 +10219,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -10082,6 +10285,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -10140,6 +10376,9 @@ msgstr "Draw virtual nodes in select mode"
msgid "Draw inactive layers in other color"
msgstr "Draw inactive layers in other colour"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10194,6 +10433,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10488,7 +10732,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10657,6 +10907,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "File backup"
@@ -10722,8 +10978,8 @@ msgstr "Map Settings"
msgid "Settings for the map projection and data interpretation."
msgstr "Settings for the map projection and data interpretation."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Could not read tagging preset source: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10984,21 +11240,6 @@ msgstr "Swiss Grid (Switzerland)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zone"
-
-msgid "North"
-msgstr "North"
-
-msgid "South"
-msgstr ""
-
-msgid "Hemisphere"
-msgstr ""
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11020,6 +11261,21 @@ msgstr ""
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zone"
+
+msgid "North"
+msgstr "North"
+
+msgid "South"
+msgstr ""
+
+msgid "Hemisphere"
+msgstr ""
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Testing OSM API URL ''{0}''"
@@ -11083,8 +11339,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Select to use OAuth as authentication mechanism"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11093,22 +11349,26 @@ msgstr "OSM username:"
msgid "OSM password:"
msgstr "OSM password:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr "Current credential manager is of type ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr ""
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11197,17 +11457,9 @@ msgid "Use a SOCKS proxy"
msgstr "Use a SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-
-msgid "disabled"
-msgstr "disabled"
-
-msgid "no modifier"
-msgstr "no modifier"
msgid "Shortcut Background: User"
msgstr ""
@@ -11250,32 +11502,37 @@ msgstr "Delete the selection in the tag table"
msgid "Add a new tag"
msgstr "Add a new tag"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Use preset ''{0}'' of group ''{1}''"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Use preset ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Elements of type {0} are supported."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Change {0} object"
+msgstr[1] "Change {0} objects"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Nothing selected!"
+
+msgid "Selection unsuitable!"
+msgstr "Selection unsuitable!"
+
+msgid "Apply Preset"
+msgstr "Apply Preset"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "More information about this feature"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11283,6 +11540,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "More information about this feature"
+
msgid "Available roles"
msgstr ""
@@ -11298,52 +11558,42 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Optional Attributes:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Use preset ''{0}'' of group ''{1}''"
-
-msgid "Use preset ''{0}''"
-msgstr "Use preset ''{0}''"
-
-msgid "Unknown type: {0}"
-msgstr "Unknown type: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Could not read tagging preset source: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Error parsing {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Elements of type {0} are supported."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Change {0} object"
-msgstr[1] "Change {0} objects"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Nothing selected!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Selection unsuitable!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Apply Preset"
-msgstr "Apply Preset"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "New relation"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change Properties"
-msgstr "Change Properties"
+msgid "Unknown type: {0}"
+msgstr "Unknown type: {0}"
msgid "Preset group {1} / {0}"
msgstr "Preset group {1} / {0}"
@@ -11351,13 +11601,25 @@ msgstr "Preset group {1} / {0}"
msgid "Preset group {0}"
msgstr "Preset group {0}"
-msgid "Search preset"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Show preset search dialog"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Search presets"
+msgid "Preset sub element without parent"
+msgstr ""
+
+msgid "Error parsing {0}: "
+msgstr "Error parsing {0}: "
+
+msgid "Search preset"
+msgstr ""
+
+msgid "Show preset search dialog"
+msgstr ""
+
+msgid "Search presets"
msgstr ""
msgid "Show only applicable to selection"
@@ -11366,6 +11628,16 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronised "
+"adjustment."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Adjustable {0} not registered yet."
+
msgid "All files (*.*)"
msgstr ""
@@ -11400,6 +11672,55 @@ msgid ""
msgstr ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "false: the property is explicitly switched off"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true: the property is explicitly switched on"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"partial: different selected objects have different values, do not change"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "unset: do not set this property on the selected objects"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "mandatory attribute ''{0}'' missing"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
+"''{1}''"
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11435,11 +11756,9 @@ msgid "Contacting OSM Server..."
msgstr "Contacting OSM Server..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Failed to parse date ''{0}'' replied by server."
@@ -11482,39 +11801,27 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Illegal port number in preference ''{0}''. Got {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
msgid "Parsing response from server..."
msgstr "Parsing response from server..."
@@ -11612,6 +11919,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Parse error: invalid document structure for gpx document"
+msgid "(at line {0}, column {1})"
+msgstr "(at line {0}, column {1})"
+
msgid "Unknown mode {0}."
msgstr "Unknown mode {0}."
@@ -11627,15 +11937,21 @@ msgstr "Looking for image files"
msgid "No image files found."
msgstr "No image files found."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Failed to open input stream for resource ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr ""
@@ -11714,8 +12030,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "NMEA import success"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA import failure!"
@@ -11817,44 +12133,13 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "mandatory attribute ''{0}'' missing"
-
msgid "Unsupported version: {0}"
msgstr "Unsupported version: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
-"''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -11864,11 +12149,9 @@ msgstr ""
"''create'', ''modify'', or ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
msgid "Parsing changeset content ..."
msgstr "Parsing changeset content ..."
@@ -11894,11 +12177,8 @@ msgstr "Parsing list of changesets..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "Failed to sign a HTTP connection with an OAuth Authentication header"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
@@ -11910,9 +12190,6 @@ msgstr ""
"<html>An error occurred while restoring backup file.<br>Error is: "
"<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Could not back up file. Exception is: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM Server Files gzip compressed"
@@ -11934,6 +12211,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11987,11 +12267,9 @@ msgstr ""
"{1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"WARNING: Normalising value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Unknown or unsupported API version. Got {0}."
@@ -12140,6 +12418,9 @@ msgstr "Save user and password (unencrypted)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -12158,6 +12439,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -12182,7 +12472,13 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -12191,9 +12487,6 @@ msgstr "Remote Control has been asked to create a new node."
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr ""
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
@@ -12203,6 +12496,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12217,6 +12518,15 @@ msgstr "Remote Control has been asked to import data from the following URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Remote Control has been asked to load data from the API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12247,19 +12557,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12281,11 +12591,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -12355,18 +12677,14 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Warning: Cannot download plug-in ''{0}''. Its download link is not known. "
-"Skipping download."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Warning: Cannot download plug-in ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Failed to create plug-in directory ''{0}''"
@@ -12533,11 +12851,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Plug-in update failed"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "Warning: failed to download plug-in information list"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Disable plug-in"
@@ -12551,27 +12869,22 @@ msgstr "Keep plug-in"
msgid "Click to keep the plugin ''{0}''"
msgstr "Click to keep the plug-in ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Warning: failed to delete outdated plug-in ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Warning: failed to install already downloaded plug-in ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plug-in version."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Warning: failed to install plug-in ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
msgid "Click to disable the plugin ''{0}''"
msgstr "Click to disable the plug-in ''{0}''"
@@ -12646,10 +12959,8 @@ msgstr "Processing plug-in site cache files..."
msgid "Processing file ''{0}''"
msgstr "Processing file ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Warning: Failed to scan file ''{0}'' for plug-in information. Skipping."
msgid "Processing plugin site cache icon files..."
msgstr ""
@@ -12663,12 +12974,25 @@ msgstr "Download plug-in list..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Downloading plug-in list from ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Warning: failed to create plug-in directory ''{0}''. Cannot cache plug-in "
-"list from plug-in site ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Writing plug-in list to local cache ''{0}''"
@@ -13043,22 +13367,12 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
msgid "{0}... [please type its number]"
msgstr ""
@@ -13070,9 +13384,52 @@ msgstr ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -13104,9 +13461,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13441,6 +13812,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13527,6 +13903,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13636,9 +14016,6 @@ msgstr "Adds no left turn for sets of 4 or 5 ways"
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13701,6 +14078,9 @@ msgstr ""
"Write gps position info to the image file header. Run this feature from the "
"right click menu of the image layer."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13728,9 +14108,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13756,9 +14133,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13800,6 +14174,11 @@ msgstr ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
"to be running."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13852,9 +14231,6 @@ msgstr ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
"behind."
-msgid "Highways"
-msgstr "Highways"
-
msgid "Streets"
msgstr "Streets"
@@ -13939,6 +14315,9 @@ msgstr "Embankment"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Toll"
+
msgid "Motorway Link"
msgstr "Motorway Link"
@@ -14029,7 +14408,51 @@ msgstr "Residential"
msgid "Edit Residential Street"
msgstr "Edit Residential Street"
-msgid "Living Street"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Highway type"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "yes"
+
+msgid "no"
+msgstr "no"
+
+msgid "destination"
+msgstr "destination"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
+msgid "Living Street"
msgstr "Living Street"
msgid "Edit Living Street"
@@ -14047,11 +14470,11 @@ msgstr "Area"
msgid "Service"
msgstr "Service"
-msgid "Edit Serviceway"
-msgstr "Edit Serviceway"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Serviceway type"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "alley"
@@ -14062,6 +14485,9 @@ msgstr "driveway"
msgid "parking_aisle"
msgstr "parking_aisle"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parking Aisle"
@@ -14089,18 +14515,12 @@ msgstr "roundabout"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "yes"
-
msgid "Road Restrictions"
msgstr "Road Restrictions"
msgid "Edit Road Restrictions"
msgstr "Edit Road Restrictions"
-msgid "Toll"
-msgstr "Toll"
-
msgid "No exit (cul-de-sac)"
msgstr "No exit (cul-de-sac)"
@@ -14110,9 +14530,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destination"
-
msgid "delivery"
msgstr "delivery"
@@ -14122,15 +14539,15 @@ msgstr "permissive"
msgid "private"
msgstr "private"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "agricultural"
msgid "forestry"
msgstr "forestry"
-msgid "no"
-msgstr "no"
-
msgid "official"
msgstr "official"
@@ -14176,6 +14593,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Public Service Vehicles (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. speed (km/h)"
@@ -14260,6 +14680,9 @@ msgstr "Edit Bridge"
msgid "viaduct"
msgstr "viaduct"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14364,20 +14787,29 @@ msgstr ""
msgid "Visibility"
msgstr "Visibility"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "excellent"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "good"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "intermediate"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "bad"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "horrible"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Wheelchairs"
@@ -14394,10 +14826,10 @@ msgstr "Dedicated Bridleway"
msgid "Edit Bridleway"
msgstr "Edit Bridleway"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -14433,7 +14865,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14502,12 +14934,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Emergency Phone"
+msgid "Drinking Water"
+msgstr "Drinking Water"
msgid "Traffic Signal"
msgstr "Traffic Lights"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Pedestrian crossing type"
@@ -14523,15 +14961,6 @@ msgstr "island"
msgid "unmarked"
msgstr "unmarked"
-msgid "Cross on horseback"
-msgstr "Cross on horseback"
-
-msgid "Cross by bicycle"
-msgstr "Cross by bicycle"
-
-msgid "Crossing attendant"
-msgstr "Crossing attendant"
-
msgid "Crossing type name (UK)"
msgstr "Crossing type name (UK)"
@@ -14553,6 +14982,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Crossing attendant"
+
+msgid "Cross by bicycle"
+msgstr "Cross by bicycle"
+
+msgid "Cross on horseback"
+msgstr "Cross on horseback"
+
msgid "Stop"
msgstr "Stop"
@@ -14562,6 +15000,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-roundabout"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Direction"
@@ -14571,11 +15012,8 @@ msgstr "clockwise"
msgid "Pedestrian Crossing"
msgstr "Pedestrian Crossing"
-msgid "Edit Crossing"
-msgstr "Edit Crossing"
-
-msgid "Type name (UK)"
-msgstr "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Traffic Calming"
@@ -14607,9 +15045,6 @@ msgstr "table"
msgid "Passing Place"
msgstr "Passing Place"
-msgid "Edit Passing Place"
-msgstr "Edit Passing Place"
-
msgid "Turning Circle"
msgstr "Turning Circle"
@@ -14643,20 +15078,44 @@ msgstr ""
msgid "Barriers"
msgstr "Barriers"
+msgid "Block"
+msgstr "Block"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Allowed traffic:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "stone"
+
msgid "Bollard"
msgstr "Bollard"
msgid "Edit Bollard"
msgstr "Edit Bollard"
-msgid "Allowed traffic:"
-msgstr "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plastic"
msgid "Cycle Barrier"
msgstr "Cycle Barrier"
-msgid "Block"
-msgstr "Block"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Cattle Grid"
@@ -14667,6 +15126,9 @@ msgstr "Edit Cattle Grid"
msgid "Bus Trap"
msgstr "Bus Trap"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Spikes"
@@ -14688,19 +15150,34 @@ msgstr "Edit Border Control point"
msgid "Hedge"
msgstr "Hedge"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Height (metres)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Fence"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14709,23 +15186,52 @@ msgstr "pole"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Wall"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "City Wall"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Retaining Wall"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Ditch"
+msgstr ""
-msgid "Entrance"
-msgstr "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Edit an Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Gate"
@@ -14757,12 +15263,27 @@ msgstr "Kissing Gate"
msgid "Edit Kissing Gate"
msgstr "Edit Kissing Gate"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Stile"
msgid "Edit Stile"
msgstr "Edit Stile"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Turnstile"
@@ -14820,6 +15341,9 @@ msgstr "Drain"
msgid "Edit Drain"
msgstr "Edit Drain"
+msgid "Ditch"
+msgstr "Ditch"
+
msgid "Edit Ditch"
msgstr "Edit Ditch"
@@ -14829,6 +15353,12 @@ msgstr "Stream"
msgid "Edit Stream"
msgstr "Edit Stream"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -14868,9 +15398,6 @@ msgstr "Edit Dam"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14904,6 +15431,21 @@ msgstr "Edit Covered Reservoir"
msgid "Edit Water"
msgstr "Edit Water"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Land"
@@ -14985,18 +15527,23 @@ msgstr "Edit Ferry Terminal"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicycle"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -15069,7 +15616,10 @@ msgstr "military"
msgid "tourism"
msgstr "tourism"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15093,11 +15643,14 @@ msgstr "contact_line"
msgid "rail"
msgstr "rail"
-msgid "Voltage"
-msgstr "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frequency (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15108,9 +15661,6 @@ msgstr "Narrow Gauge Railway"
msgid "Edit Narrow Gauge Rail"
msgstr "Edit Narrow Gauge Railway"
-msgid "Types"
-msgstr "Types"
-
msgid "Monorail"
msgstr "Monorail"
@@ -15153,18 +15703,56 @@ msgstr "Disused Rail"
msgid "Edit Disused Railway"
msgstr "Edit Disused Railway"
-msgid "Optional Types"
-msgstr "Optional Types"
-
msgid "Abandoned Rail"
msgstr "Abandoned Rail"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Level Crossing"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Crossing"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Crossing type"
@@ -15264,11 +15852,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15280,13 +15866,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Edit Station"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pylon"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Edit Pylon"
+msgstr ""
msgid "Parking"
msgstr "Parking"
@@ -15303,12 +15887,12 @@ msgstr "surface"
msgid "underground"
msgstr "underground"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Access"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr "Park and Ride"
@@ -15336,9 +15920,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Capacity"
@@ -15354,19 +15935,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Opening Hours"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -15516,6 +16113,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltage"
+
msgid "Amperage"
msgstr ""
@@ -15537,6 +16137,12 @@ msgstr "Repair"
msgid "Edit Car Repair"
msgstr "Edit Car Repair"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15564,6 +16170,12 @@ msgstr "Rental"
msgid "Edit Car Rental"
msgstr "Edit Car Rental"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Sharing"
@@ -15588,22 +16200,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15625,9 +16221,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Clothes"
@@ -15691,8 +16284,8 @@ msgstr "Edit Bicycle Rental"
msgid "Public Transport"
msgstr "Public Transport"
-msgid "Route"
-msgstr "Route"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Edit Route"
@@ -15822,6 +16415,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15852,6 +16448,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bench"
@@ -15864,9 +16463,6 @@ msgstr "Wheelchair"
msgid "limited"
msgstr "limited"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15876,8 +16472,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Station"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edit Station"
msgid "Building"
msgstr "Building"
@@ -15891,6 +16492,9 @@ msgstr "Edit Subway Entrance"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15915,14 +16519,6 @@ msgstr "Account or loyalty cards"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Station"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Edit Station"
-
msgid "UIC-Reference"
msgstr "UIC-Reference"
@@ -15971,8 +16567,8 @@ msgstr "Edit Bus Platform"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Edit Taxi station"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Airport"
@@ -16025,6 +16621,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Edit Terminal"
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -16047,21 +16658,6 @@ msgstr "Edit Hotel"
msgid "Stars"
msgstr "Stars"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -16245,6 +16841,12 @@ msgstr "Nightclub"
msgid "Edit Nightclub"
msgstr "Edit Nightclub"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Tourism"
@@ -16266,9 +16868,15 @@ msgstr "Look-Out Tower"
msgid "Information Office"
msgstr "Information Office"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Map"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Detail Grade"
@@ -16281,6 +16889,9 @@ msgstr "street"
msgid "scheme"
msgstr "scheme"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Shown Area"
@@ -16320,6 +16931,9 @@ msgstr "... other transportation modes possible"
msgid "Information Board"
msgstr "Information Board"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Board Content"
@@ -16341,23 +16955,35 @@ msgstr "plants"
msgid "Guidepost"
msgstr "Guidepost"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Information Terminal"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Closer description"
msgid "Audioguide"
msgstr "Audioguide"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Audioguide via mobile phone?"
msgid "Phone number"
msgstr "Phone number"
-msgid "Other Information Points"
-msgstr "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Leisure"
@@ -16380,9 +17006,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "fence"
@@ -16407,8 +17030,17 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Playground"
@@ -16480,50 +17112,44 @@ msgstr "Artwork"
msgid "Edit Artwork"
msgstr "Edit Artwork"
-msgid "Place of Worship"
-msgstr "Place of Worship"
-
-msgid "Edit Place of Worship"
-msgstr "Edit Place of Worship"
-
-msgid "Religion"
-msgstr "Religion"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "buddhist"
+msgid "audio"
+msgstr ""
-msgid "christian"
-msgstr "christian"
+msgid "video"
+msgstr ""
-msgid "hindu"
-msgstr "hindu"
+msgid "Place of Worship"
+msgstr "Place of Worship"
-msgid "jain"
-msgstr "jain"
+msgid "Church"
+msgstr "Church"
-msgid "jewish"
-msgstr "jewish"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muslim"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualist"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoist"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarian"
+msgid "church"
+msgstr ""
-msgid "zoroastrian"
-msgstr "zoroastrian"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Denomination"
@@ -16540,6 +17166,12 @@ msgstr "catholic"
msgid "evangelical"
msgstr "evangelical"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehovahs_witness"
@@ -16552,6 +17184,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -16567,95 +17202,198 @@ msgstr "protestant"
msgid "quaker"
msgstr "quaker"
-msgid "shia"
-msgstr "shia"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "sunni"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
+msgid "Sa 18:00; Su 10:45"
msgstr ""
-msgid "Edit Studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
msgstr ""
-msgid "audio"
+msgid "Sa 10:00+"
msgstr ""
-msgid "video"
+msgid "Mosque"
msgstr ""
-msgid "Public Building"
-msgstr "Public Building"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Edit Public Building"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Town hall"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Edit Town hall"
+msgid "shia"
+msgstr "shia"
-msgid "Community Centre"
+msgid "sunni"
+msgstr "sunni"
+
+msgid "Synagogue"
msgstr ""
-msgid "Embassy"
-msgstr "Embassy"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Edit Embassy"
+msgid "synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Courthouse"
+msgid "conservative"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Edit Courthouse"
+msgid "reform"
+msgstr ""
-msgid "Prison"
-msgstr "Prison"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Edit Prison"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Police"
+msgid "theravada"
+msgstr ""
-msgid "Edit Police"
-msgstr "Edit Police"
+msgid "mahayana"
+msgstr ""
-msgid "Fire Station"
-msgstr "Fire Station"
+msgid "vajrayana"
+msgstr ""
-msgid "Edit Fire Station"
-msgstr "Edit Fire Station"
+msgid "Hindu Temple"
+msgstr ""
-msgid "Post Office"
-msgstr "Post Office"
+msgid "Edit Hindu Temple"
+msgstr ""
-msgid "Edit Post Office"
-msgstr "Edit Post Office"
+msgid "vaishnavism"
+msgstr ""
-msgid "Education"
+msgid "shaivism"
msgstr ""
-msgid "Kindergarten"
-msgstr "Preschool"
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religion"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jain"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualist"
+
+msgid "taoist"
+msgstr "taoist"
+
+msgid "unitarian"
+msgstr "unitarian"
+
+msgid "zoroastrian"
+msgstr "zoroastrian"
+
+msgid "Public Building"
+msgstr "Public Building"
+
+msgid "Edit Public Building"
+msgstr "Edit Public Building"
+
+msgid "Town hall"
+msgstr "Town hall"
+
+msgid "Edit Town hall"
+msgstr "Edit Town hall"
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr "Embassy"
+
+msgid "Edit Embassy"
+msgstr "Edit Embassy"
+
+msgid "Courthouse"
+msgstr "Courthouse"
+
+msgid "Edit Courthouse"
+msgstr "Edit Courthouse"
+
+msgid "Prison"
+msgstr "Prison"
+
+msgid "Edit Prison"
+msgstr "Edit Prison"
+
+msgid "Police"
+msgstr "Police"
+
+msgid "Edit Police"
+msgstr "Edit Police"
+
+msgid "Fire Station"
+msgstr "Fire Station"
+
+msgid "Edit Fire Station"
+msgstr "Edit Fire Station"
+
+msgid "Post Office"
+msgstr "Post Office"
+
+msgid "Edit Post Office"
+msgstr "Edit Post Office"
+
+msgid "Education"
+msgstr ""
+
+msgid "Kindergarten"
+msgstr "Preschool"
msgid "Edit Kindergarten"
msgstr "Edit Preschool"
@@ -16687,6 +17425,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Health"
@@ -16696,6 +17440,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Edit Hospital"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Doctors"
@@ -16762,12 +17512,66 @@ msgstr "Veterinary"
msgid "Edit Veterinary"
msgstr "Edit Veterinary"
-msgid "Note"
-msgstr "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "public"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Post Box"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telephone"
@@ -16777,6 +17581,30 @@ msgstr "Edit Telephone"
msgid "Telephone cards"
msgstr "Telephone cards"
+msgid "Emergency Phone"
+msgstr "Emergency Phone"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16786,31 +17614,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16838,8 +17672,8 @@ msgstr ""
msgid "Recycling"
msgstr "Recycling"
-msgid "Edit Recycling station"
-msgstr "Edit Recycling station"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batteries"
@@ -16865,27 +17699,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Waste Basket"
-msgid "Edit Waste Basket"
-msgstr "Edit Waste Basket"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Backrest"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stone"
-
-msgid "plastic"
-msgstr "plastic"
-
msgid "Amount of Seats"
msgstr "Amount of Seats"
@@ -16920,14 +17742,17 @@ msgstr "Edit Hunting Stand"
msgid "Height"
msgstr "Height"
+msgctxt "height"
msgid "low"
-msgstr "low"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "half"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "full"
+msgstr ""
msgid "Hide"
msgstr "Hide"
@@ -16935,11 +17760,11 @@ msgstr "Hide"
msgid "Lock"
msgstr "Lock"
-msgid "Drinking Water"
-msgstr "Drinking Water"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Edit Drinking Water"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Fire Hydrant"
@@ -16966,6 +17791,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17003,119 +17831,155 @@ msgstr "Stadium"
msgid "Edit Stadium"
msgstr "Edit Stadium"
-msgid "select sport:"
-msgstr "select sport:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "multi"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "archery"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "athletics"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "australian_football"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basketball"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "lawn bowls"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "canoeing"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "climbing"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "cricket nets"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "cycling"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "dog racing"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "equestrian"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gymnastics"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hockey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "horse_racing"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motor"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "racquet"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "shooting"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "skating"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "skiing"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "soccer"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "swimming"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "table_tennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Sports Centre"
@@ -17147,26 +18011,27 @@ msgstr "Miniature Golf"
msgid "Edit Miniature Golf"
msgstr "Edit Miniature Golf"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Multi"
msgid "Edit Multi"
msgstr "Edit Multi"
-msgid "type"
-msgstr "type"
-
+msgctxt "running"
msgid "pitch"
-msgstr "pitch"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sports_centre"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadium"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -17174,6 +18039,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "pitch"
+
+msgid "sports_centre"
+msgstr "sports_centre"
+
+msgid "stadium"
+msgstr "stadium"
+
msgid "10pin"
msgstr "10pin"
@@ -17207,6 +18081,22 @@ msgstr "Edit Canoeing"
msgid "Edit Cycling"
msgstr "Edit Cycling"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Dog Racing"
@@ -17219,10 +18109,35 @@ msgstr "Equestrian"
msgid "Edit Equestrian"
msgstr "Edit Equestrian"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
-msgid "Horse Racing"
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "mud"
+
+msgid "Horse Racing"
msgstr "Horse Racing"
msgid "Edit Horse Racing"
@@ -17238,7 +18153,7 @@ msgid "Skating"
msgstr "Skating"
msgid "Edit Skating"
-msgstr "Edit Skating"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17282,36 +18197,54 @@ msgstr "snow_park"
msgid "Difficulty"
msgstr "Difficulty"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "novice"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "easy"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "advanced"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "expert"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "freeride"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17354,19 +18287,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17505,6 +18434,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -17517,60 +18458,134 @@ msgstr "Man Made"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
msgstr ""
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Entrance"
+
+msgid "Edit Entrance"
+msgstr "Edit an Entrance"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Tower"
@@ -17586,9 +18601,6 @@ msgstr "communication"
msgid "observation"
msgstr "observation"
-msgid "Height (meters)"
-msgstr "Height (metres)"
-
msgid "Flagpole"
msgstr ""
@@ -17798,41 +18810,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17841,8 +18879,8 @@ msgstr "Survey Point"
msgid "Edit Survey Point"
msgstr "Edit Survey Point"
-msgid "Surveillance"
-msgstr "Surveillance"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Edit Surveillance Camera"
@@ -17853,12 +18891,102 @@ msgstr "indoor"
msgid "outdoor"
msgstr "outdoor"
-msgid "public"
-msgstr "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "shop"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Power Generator"
@@ -17910,154 +19038,273 @@ msgstr "wind"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "photovoltaic"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Power Station"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Edit Power Station"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Power Sub Station"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Edit Power Sub Station"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
-msgstr "Line reference"
+msgid "solar photovoltaic"
+msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "solar thermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Power Tower"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Edit Power Tower"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
-msgstr "Tower reference"
+msgid "steam_turbine"
+msgstr ""
-msgid "Pole"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
msgstr ""
-msgid "Edit Power Pole"
+msgid "stellarator"
msgstr ""
-msgid "Pole reference"
+msgid "nuclear fusion"
msgstr ""
-msgid "Power Line"
-msgstr "Power Line"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Edit Power Line"
+msgid "vertical_axis"
+msgstr ""
-msgid "Line type"
-msgstr "Line type"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgid "nuclear fission"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Amount of Cables"
-msgstr "Amount of Cables"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
-msgstr "Number of wires (better: conductors) per power cable"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
-msgid "single"
-msgstr "single"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
-msgid "double"
-msgstr "double"
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
-msgid "triple"
-msgstr "triple"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Power Sub Station"
+
+msgid "Edit Power Sub Station"
+msgstr "Edit Power Sub Station"
+
+msgid "Line reference"
+msgstr "Line reference"
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "low"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Power Tower"
+
+msgid "Edit Power Tower"
+msgstr "Edit Power Tower"
+
+msgid "Tower reference"
+msgstr "Tower reference"
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr "Power Line"
+
+msgid "Edit Power Line"
+msgstr "Edit Power Line"
+
+msgid "Line type"
+msgstr "Line type"
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr "Amount of Cables"
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr "Number of wires (better: conductors) per power cable"
+
+msgid "single"
+msgstr "single"
+
+msgid "double"
+msgstr "double"
+
+msgid "triple"
+msgstr "triple"
msgid "quad"
msgstr "quad"
@@ -18149,11 +19396,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Edit Kiosk"
-msgid "Baker"
-msgstr "Baker"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Edit Baker"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Butcher"
@@ -18164,7 +19411,7 @@ msgstr "Edit Butcher"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18185,14 +19432,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Organic"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -18263,7 +19516,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18284,13 +19537,13 @@ msgstr "Edit Electronics Shop"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -18299,9 +19552,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Edit Hifi Shop"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Edit Video Shop"
@@ -18327,6 +19579,12 @@ msgstr "Edit Money Exchange"
msgid "Edit Automated Teller Machine"
msgstr "Edit Automated Teller Machine"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18363,10 +19621,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "buddhist"
+
+msgid "christian"
+msgstr "christian"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "jewish"
+
+msgid "muslim"
+msgstr "muslim"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18396,7 +19675,7 @@ msgstr "Edit Hardware Store"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18408,19 +19687,19 @@ msgstr "Edit Furniture Shop"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -18441,6 +19720,12 @@ msgstr "Book Store"
msgid "Edit Book Store"
msgstr "Edit Book Store"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Travel Agency"
@@ -18450,7 +19735,7 @@ msgstr "Edit Travel Agency"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18531,6 +19816,9 @@ msgstr "toys"
msgid "vouchers"
msgstr "vouchers"
+msgid "Note"
+msgstr "Note"
+
msgid "Geography"
msgstr "Geography"
@@ -18660,6 +19948,12 @@ msgstr "Peak"
msgid "Edit Peak"
msgstr "Edit Peak"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacier"
@@ -18699,26 +19993,35 @@ msgstr "Tree"
msgid "Edit Tree"
msgstr "Edit Tree"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botanical Name"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Wood"
msgid "Edit Wood"
msgstr "Edit Wood"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "coniferous"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "deciduous"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "mixed"
msgid "Forest"
msgstr "Forest"
@@ -18726,15 +20029,6 @@ msgstr "Forest"
msgid "Edit Forest Landuse"
msgstr "Edit Forest Landuse"
-msgid "coniferous"
-msgstr "coniferous"
-
-msgid "deciduous"
-msgstr "deciduous"
-
-msgid "mixed"
-msgstr "mixed"
-
msgid "Grassland"
msgstr ""
@@ -18810,6 +20104,12 @@ msgstr "Meadow"
msgid "Edit Meadow Landuse"
msgstr "Edit Meadow Landuse"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vineyard"
@@ -18864,8 +20164,8 @@ msgstr "Recreation Ground"
msgid "Edit Recreation Ground Landuse"
msgstr "Edit Recreation Ground Landuse"
-msgid "Residential area"
-msgstr "Residential area"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Edit Residential Landuse"
@@ -18876,6 +20176,9 @@ msgstr "Graveyard"
msgid "Edit Graveyard"
msgstr "Edit Graveyard"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemetery"
@@ -18951,6 +20254,33 @@ msgstr "Edit Quarry Landuse"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Edit Address Information"
@@ -18969,30 +20299,6 @@ msgstr "City name"
msgid "Country code"
msgstr "Country code"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "Address Interpolation"
@@ -19011,6 +20317,18 @@ msgstr "even"
msgid "alphabetic"
msgstr "alphabetic"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19173,26 +20491,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "road"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "foot"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
-msgstr "detour"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Symbol description"
@@ -19239,19 +20586,22 @@ msgstr "forward halt point"
msgid "backward halt point"
msgstr "backward halt point"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -19275,7 +20625,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19371,18 +20721,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "bridge"
msgid "deprecated"
msgstr "deprecated"
+msgid "bicycle"
+msgstr "bicycle"
+
+msgid "foot"
+msgstr "foot"
+
msgid "horse"
msgstr "horse"
@@ -19392,8 +20751,11 @@ msgstr "barrier"
msgid "motorroad"
msgstr "motorroad"
-msgid "highway_track"
-msgstr "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "services"
@@ -19401,11 +20763,11 @@ msgstr "services"
msgid "ford"
msgstr "ford"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "emergency_access_point"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "riverbank"
@@ -19422,6 +20784,9 @@ msgstr "rapids"
msgid "railwaypoint"
msgstr "railwaypoint"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19437,29 +20802,29 @@ msgstr "oldrail"
msgid "aeroway"
msgstr "aeroway"
-msgid "aeroway_dark"
-msgstr "aeroway_dark"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "aeroway_light"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "piste_easy"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "piste_intermediate"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "piste_advanced"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "piste_expert"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "piste_freeride"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "piste_novice"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "power"
@@ -19479,20 +20844,20 @@ msgstr "marina"
msgid "amenity"
msgstr "amenity"
-msgid "amenity_traffic"
-msgstr "amenity_traffic"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "amenity_light"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "light_water"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "health"
-msgid "shop"
-msgstr "shop"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotel"
@@ -19557,9 +20922,6 @@ msgstr "heath"
msgid "woodarea"
msgstr "woodarea"
-msgid "mud"
-msgstr "mud"
-
msgid "beach"
msgstr "beach"
@@ -19569,11 +20931,14 @@ msgstr "route"
msgid "boundary"
msgstr "boundary"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "place"
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "address"
@@ -19587,9 +20952,6 @@ msgstr "Village/City"
msgid "One Way"
msgstr "One Way"
-msgid "Church"
-msgstr "Church"
-
msgid "Fuel Station"
msgstr "Fuel Station"
@@ -19617,6 +20979,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19662,10 +21027,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19677,7 +21072,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19695,7 +21090,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19812,19 +21207,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:old_name without old_name"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:designation without designation"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19843,13 +21349,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19858,23 +21400,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19885,142 +21436,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -20036,13 +21636,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italy"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicily - Italy"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -20059,46 +21659,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -20119,89 +21722,149 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
+msgstr ""
+
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr ""
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx IRS"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OSM Export"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "SUMO Export"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "Export"
msgstr ""
-msgid "2u"
-msgstr ""
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "refresh the port list"
+
+msgid "Configure"
+msgstr "Configure"
+
+msgid "Connection Error."
+msgstr "Connection Error."
+
+msgid "configure the connected DG100"
+msgstr "configure the connected DG100"
+
+msgid "delete data after import"
+msgstr "delete data after import"
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20408,6 +22071,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20429,14 +22104,8 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
-msgstr ""
+msgid "Tracks"
+msgstr "Tracks"
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -20698,9 +22367,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Updating properties of up to {0} object"
@@ -20722,6 +22397,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20800,9 +22478,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr "Handy Address Interpolation Functions"
@@ -20887,8 +22577,8 @@ msgstr "Expected odd numbers for addresses"
msgid "Expected even numbers for addresses"
msgstr "Expected even numbers for addresses"
-msgid "Expected valid number for address increment"
-msgstr "Expected valid number for address increment"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "Country code must be 2 letters"
@@ -21222,15 +22912,6 @@ msgstr "House number:"
msgid "Street Name:"
msgstr "Street Name:"
-msgid "Increment"
-msgstr "Increment"
-
-msgid "Decrement"
-msgstr "Decrement"
-
-msgid "Numbers:"
-msgstr "Numbers:"
-
msgid "Big buildings mode"
msgstr ""
@@ -21414,6 +23095,9 @@ msgstr "Disable image cropping during georeferencing."
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21432,12 +23116,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "symbol"
@@ -21584,6 +23262,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr "Display crosspieces:"
@@ -21603,6 +23284,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Add \"source=...\" to elements?"
@@ -21689,54 +23373,6 @@ msgstr ""
"This image contains georeference data.\n"
"Do you want to use them ?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Click first corner for image cropping\n"
-"(two points required)"
-
-msgid "Image cropping"
-msgstr "Image cropping"
-
-msgid "Click second corner for image cropping"
-msgstr "Click second corner for image cropping"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-
-msgid "Image georeferencing"
-msgstr "Image georeferencing"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Click second Lambert crosspiece for georeferencing"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Do you want to cancel completely\n"
-"or just retry "
-
-msgid "Enter cadastre east,north position"
-msgstr "Enter cadastre east,north position"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Warning: verify north with arrow !!)"
-
-msgid "East"
-msgstr "East"
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Set {0} Lambert coordinates"
-
msgid "Load layer from cache"
msgstr ""
@@ -21793,20 +23429,82 @@ msgstr "Add new layer"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Reset cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Get a new cookie (session timeout)"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr "PNG files (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Click first corner for image cropping\n"
+"(two points required)"
+
+msgid "Image cropping"
+msgstr "Image cropping"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+
+msgid "Image georeferencing"
+msgstr "Image georeferencing"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Do you want to cancel completely\n"
+"or just retry "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr "Enter cadastre east,north position"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Warning: verify north with arrow !!)"
+
+msgid "East"
+msgstr "East"
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Set {0} Lambert coordinates"
+
+msgid "Click second corner for image cropping"
+msgstr "Click second corner for image cropping"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Click second Lambert crosspiece for georeferencing"
msgid "Adjust WMS"
msgstr "Adjust WMS"
@@ -21833,8 +23531,11 @@ msgstr "WMS layer ({0}), {1} tile(s) loaded"
msgid "Is not vectorized."
msgstr "Is not vectorised."
-msgid "Raster size: {0}"
-msgstr "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Is vectorised."
@@ -21885,7 +23586,7 @@ msgstr "Delete the selected scheme from the list."
msgid "Color Schemes"
msgstr "Colour Schemes"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21933,6 +23634,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -22005,6 +23709,71 @@ msgstr ""
msgid "Install"
msgstr ""
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Position only"
@@ -22038,33 +23807,15 @@ msgstr "Data Logging Format"
msgid "Disable data logging if speed falls below"
msgstr "Disable data logging if speed falls below"
-msgid "Disable data logging if distance falls below"
-msgstr "Disable data logging if distance falls below"
-
-msgid "Unknown logFormat"
-msgstr "Unknown logFormat"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "refresh the port list"
+msgid "Disable data logging if distance falls below"
+msgstr "Disable data logging if distance falls below"
-msgid "Configure"
-msgstr "Configure"
+msgid "Unknown logFormat"
+msgstr "Unknown logFormat"
msgid "Configure Device"
msgstr "Configure Device"
-msgid "Connection Error."
-msgstr "Connection Error."
-
-msgid "configure the connected DG100"
-msgstr "configure the connected DG100"
-
-msgid "delete data after import"
-msgstr "delete data after import"
-
msgid "Importing data from device."
msgstr "Importing data from device."
@@ -22463,6 +24214,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22660,13 +24414,13 @@ msgid "Please select the imagery layer to adjust."
msgstr ""
msgid "Start adjusting"
-msgstr "Start adjusting"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
msgstr ""
msgid "No layers to adjust"
-msgstr "No layers to adjust"
+msgstr ""
msgid "Normal"
msgstr "Normal"
@@ -22710,12 +24464,6 @@ msgstr "Imported Images"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Open images with ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Load set of images as a new layer."
-
msgid "Import vector graphics"
msgstr ""
@@ -22725,16 +24473,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -23106,9 +24851,6 @@ msgstr "Auto-Centre"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Continuously centre the LiveGPS layer to current position."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -23163,9 +24905,31 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan Left"
@@ -23207,6 +24971,15 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
+msgid "Download from Overpass API ..."
+msgstr ""
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr ""
@@ -23219,15 +24992,6 @@ msgstr ""
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Convert to multipolygon"
-
-msgid "Convert to multipolygon."
-msgstr "Convert to multipolygon."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "One of the selected ways is already part of another multipolygon."
-
msgid "About Plugin"
msgstr ""
@@ -23362,9 +25126,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -23389,12 +25150,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23543,6 +25313,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23559,6 +25332,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23797,14 +25581,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "An error occurred: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Header contains several values and cannot be mapped to a single string"
-
msgid "Process queue"
msgstr "Process queue"
@@ -23861,18 +25637,6 @@ msgstr ""
msgid "Close: "
msgstr "Close: "
-msgid "New issue"
-msgstr "New issue"
-
-msgid "Create issue"
-msgstr "Create issue"
-
-msgid "Describe the problem precisely"
-msgstr "Describe the problem precisely"
-
-msgid "Create: "
-msgstr "Create: "
-
msgid "Open in browser"
msgstr ""
@@ -23933,6 +25697,9 @@ msgstr "Firefox executable"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24140,9 +25907,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -24223,8 +25987,26 @@ msgstr "Test failed: Could not read mtime."
msgid "Test failed: Could not write mtime."
msgstr "Test failed: Could not write mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -24377,6 +26159,9 @@ msgstr "Nothing in clipboard"
msgid "The clipboard data is not an image"
msgstr "The clipboard data is not an image"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -24398,6 +26183,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24691,9 +26479,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Tracks"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24762,9 +26547,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24891,9 +26673,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24915,6 +26694,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24947,15 +26729,35 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Change Properties"
+
msgid "Country preset:"
msgstr ""
@@ -24965,6 +26767,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -25067,9 +26872,6 @@ msgstr "Routing Plug-in Preferences"
msgid "Configure routing preferences."
msgstr "Configure routing preferences."
-msgid "Highway type"
-msgstr "Highway type"
-
msgid "Speed (Km/h)"
msgstr "Speed (Km/h)"
@@ -25185,6 +26987,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Could not back up file. Exception is: {0}"
+
msgid "Simplify Area"
msgstr ""
@@ -25245,19 +27050,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25396,6 +27201,9 @@ msgstr "delete outline way"
msgid "Street name: "
msgstr "Street name: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Even/Odd"
@@ -25471,6 +27279,95 @@ msgstr "Tracer."
msgid "Tracer building"
msgstr "Tracer building"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -25486,9 +27383,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25510,6 +27404,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25662,9 +27559,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26300,7 +28194,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -26308,10 +28205,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -26320,18 +28214,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -26374,15 +28256,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -26504,18 +28377,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26693,9 +28554,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -26822,8 +28680,8 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
-msgstr "Scanned Map..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26844,9 +28702,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers layer ({0}) in zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Way Download"
@@ -26989,9 +28844,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index c5c63f7..1d13e80 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-10-03 21:33+0000\n"
"Last-Translator: Michael Moroni <michael.moroni at mailoo.org>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:39+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:39+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Pri JOSM…"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr "Ilo: {0}"
msgid "Please select at least four nodes."
msgstr "Bonvolu elekti almenaŭ kvar nodojn."
-msgid "Information"
-msgstr "Informo"
-
msgid "Align Nodes in Line"
msgstr "Aranĝi nodojn laŭ linion."
@@ -265,6 +280,9 @@ msgstr "konflikto"
msgid "download"
msgstr "elŝuto"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "Informo"
+
msgid "Zoom to {0}"
msgstr "Zomi al {0}"
@@ -330,11 +351,9 @@ msgstr ""
"renversi kelkajn?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Neeblis kunfandi la vojojn. (Ili ne povis esti kunfanditaj en unu nuran "
-"nodĉenon)"
msgid "Combine {0} ways"
msgstr "Kunfandi {0} vojojn."
@@ -389,18 +408,35 @@ msgstr "Forigi"
msgid "Delete selected objects."
msgstr "Forigi la elektitajn objektojn."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distrubui la nodojn"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -495,6 +531,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -608,7 +647,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -758,8 +797,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -916,8 +955,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -944,12 +983,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -967,9 +1002,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1076,6 +1108,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1126,9 +1167,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1190,6 +1228,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1264,13 +1305,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1359,6 +1400,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1383,9 +1445,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1581,6 +1640,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1590,6 +1652,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1609,6 +1683,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1659,25 +1758,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1820,6 +1900,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1844,8 +1927,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1861,6 +1944,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2267,6 +2353,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2427,13 +2516,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2442,6 +2531,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2460,8 +2552,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2547,6 +2638,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2583,10 +2677,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2609,8 +2703,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2714,6 +2808,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2774,8 +2871,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2805,10 +2902,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2829,6 +2926,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2859,18 +2959,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2879,8 +2979,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2888,13 +2988,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2908,8 +3006,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2939,11 +3037,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "NEKONATA"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3096,8 +3193,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3204,7 +3300,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3223,6 +3319,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3239,9 +3338,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3280,6 +3376,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3304,6 +3403,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3363,13 +3471,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3439,6 +3547,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3508,6 +3634,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3565,13 +3697,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3603,10 +3735,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3740,7 +3872,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3815,6 +3947,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3845,9 +3980,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3872,10 +4004,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3938,23 +4070,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4058,7 +4173,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4254,9 +4369,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4272,10 +4402,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4284,6 +4426,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4343,6 +4488,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4370,19 +4518,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4670,29 +4805,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4707,7 +4860,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4759,14 +4912,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5016,14 +5161,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5544,6 +5689,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5627,6 +5775,33 @@ msgstr ""
msgid "No"
msgstr "Ne"
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5648,9 +5823,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5675,32 +5847,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5720,8 +5892,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5747,9 +5918,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5894,9 +6062,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6181,8 +6346,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6247,34 +6412,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6289,13 +6466,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6374,12 +6551,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6409,9 +6580,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6449,7 +6626,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6509,6 +6686,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6764,6 +6944,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6829,9 +7028,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6898,20 +7094,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6922,23 +7105,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7035,7 +7204,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7134,6 +7303,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7221,7 +7393,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7240,6 +7412,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7306,8 +7484,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7382,8 +7559,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7397,8 +7574,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7613,12 +7789,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7627,6 +7797,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7642,6 +7828,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7649,8 +7850,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7762,9 +7963,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7774,6 +7972,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7790,7 +7991,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7936,7 +8137,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7966,7 +8167,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8080,6 +8281,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8117,6 +8321,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8313,9 +8520,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8334,6 +8538,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8391,6 +8598,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8457,9 +8670,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8472,7 +8682,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8499,12 +8712,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8633,14 +8850,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8655,7 +8868,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8665,8 +8878,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8886,7 +9098,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8952,6 +9164,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9009,9 +9227,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9258,6 +9473,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9386,6 +9604,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9428,6 +9652,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9478,19 +9705,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9508,40 +9726,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9565,6 +9792,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9621,6 +9881,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9674,6 +9937,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9955,7 +10223,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10124,6 +10398,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10187,7 +10467,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10445,21 +10725,6 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr ""
-
-msgid "UTM Zone"
-msgstr ""
-
-msgid "North"
-msgstr "Nordo"
-
-msgid "South"
-msgstr "Sudo"
-
-msgid "Hemisphere"
-msgstr ""
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
@@ -10481,6 +10746,21 @@ msgstr ""
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr ""
+
+msgid "UTM Zone"
+msgstr ""
+
+msgid "North"
+msgstr "Nordo"
+
+msgid "South"
+msgstr "Sudo"
+
+msgid "Hemisphere"
+msgstr ""
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -10531,8 +10811,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10541,20 +10821,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10636,14 +10921,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10687,31 +10966,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10720,6 +11004,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10735,57 +11022,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10803,6 +11092,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10832,6 +11129,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10862,7 +11202,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10902,28 +11242,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11022,6 +11360,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11037,12 +11378,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11121,7 +11470,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11220,35 +11569,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11258,8 +11583,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11286,13 +11611,10 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
-msgid "(at line {0}, column {1})"
-msgstr ""
-
-msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
msgid ""
@@ -11300,9 +11622,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11324,6 +11643,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11373,8 +11695,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11517,6 +11839,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11535,6 +11860,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11559,16 +11893,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11580,6 +11917,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11594,6 +11939,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11624,19 +11978,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11658,11 +12012,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11732,13 +12098,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11881,10 +12247,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11899,22 +12265,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11983,8 +12348,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11999,9 +12363,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12323,17 +12702,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12344,9 +12717,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12378,9 +12794,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12703,6 +13133,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12782,6 +13217,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12883,9 +13322,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12941,6 +13377,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12965,9 +13404,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12993,9 +13429,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13032,6 +13465,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13078,9 +13516,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13165,6 +13600,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13255,6 +13693,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "jes"
+
+msgid "no"
+msgstr "ne"
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13273,10 +13755,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13288,6 +13770,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13315,18 +13800,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "jes"
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13336,9 +13815,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13348,15 +13824,15 @@ msgstr ""
msgid "private"
msgstr ""
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ne"
-
msgid "official"
msgstr ""
@@ -13402,6 +13878,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13486,6 +13965,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13590,21 +14072,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "bone"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "malsana"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13620,10 +14111,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13659,7 +14150,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13728,12 +14219,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13749,15 +14246,6 @@ msgstr "insulo"
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13779,6 +14267,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13788,6 +14285,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13797,10 +14297,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13833,9 +14330,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13869,19 +14363,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13893,6 +14411,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13914,44 +14435,88 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
+msgid "pole"
+msgstr ""
+
+msgid "split_rail"
+msgstr ""
+
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
-msgstr "Enirejo"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Modifi Enirejo"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr ""
@@ -13983,12 +14548,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14046,6 +14626,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14055,6 +14638,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14094,9 +14683,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14130,6 +14716,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14211,18 +14812,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "veturilo"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "biciklo"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14295,7 +14901,10 @@ msgstr "milita"
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14319,10 +14928,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14334,9 +14946,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14379,18 +14988,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14490,11 +15137,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14506,11 +15151,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14529,10 +15172,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14562,9 +15205,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14580,19 +15220,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14742,6 +15398,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14763,6 +15422,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14790,6 +15455,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14814,22 +15485,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "jes"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "ne"
-
msgid "brand"
msgstr ""
@@ -14851,9 +15506,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Vestoj"
@@ -14917,7 +15569,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15048,6 +15700,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15078,6 +15733,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15090,9 +15748,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15102,9 +15757,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15117,6 +15777,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15141,14 +15804,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15197,7 +15852,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15251,41 +15906,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15471,6 +16126,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15492,9 +16153,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15507,6 +16174,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15546,6 +16216,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15567,22 +16240,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr "Telefonnumero"
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15606,9 +16291,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15633,7 +16315,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15706,49 +16397,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
-msgstr "kristana"
+msgid "Church"
+msgstr "Preĝejo"
-msgid "hindu"
-msgstr "hindua"
-
-msgid "jain"
-msgstr ""
-
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15766,6 +16451,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15778,6 +16469,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15793,37 +16487,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15913,6 +16710,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15922,6 +16725,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15988,12 +16797,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefono"
@@ -16003,6 +16866,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16012,31 +16899,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16064,7 +16957,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16091,27 +16984,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16146,12 +17027,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16161,10 +17045,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16192,6 +17076,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16229,119 +17116,155 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
-msgstr "sporto"
+msgid "Sport"
+msgstr "Sporto"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "futbalo"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "teniso"
+msgstr ""
msgid "Sports Centre"
msgstr ""
@@ -16373,33 +17296,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr "Sporto"
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16433,6 +17366,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16445,7 +17394,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16508,36 +17482,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "facila"
+msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16580,19 +17572,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16731,72 +17719,158 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
-msgid "RC Car"
+msgctxt "aerialway"
+msgid "pitch"
msgstr ""
-msgid "Edit RC Car"
+msgctxt "aerialway"
+msgid "sports_centre"
msgstr ""
-msgid "Man Made"
+msgctxt "aerialway"
+msgid "track"
msgstr ""
-msgid "Edit Building"
+msgid "RC Car"
+msgstr ""
+
+msgid "Edit RC Car"
+msgstr ""
+
+msgid "Man Made"
+msgstr ""
+
+msgid "Edit Building"
+msgstr ""
+
+msgctxt "building"
+msgid "yes"
msgstr ""
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "domo"
+msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Enirejo"
+
+msgid "Edit Entrance"
+msgstr "Modifi Enirejo"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16812,9 +17886,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17024,41 +18095,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17067,7 +18164,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17079,12 +18176,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "komerco"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17136,88 +18323,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17229,6 +18519,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17244,6 +18549,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17262,11 +18570,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17375,10 +18681,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17390,7 +18696,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17411,13 +18717,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17489,7 +18801,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17510,13 +18822,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17525,7 +18837,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17553,6 +18864,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17589,10 +18906,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr "kristana"
+
+msgid "hindu"
+msgstr "hindua"
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17622,7 +18960,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17634,19 +18972,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17667,6 +19005,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17676,7 +19020,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17757,6 +19101,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17886,6 +19233,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17925,24 +19278,33 @@ msgstr "Arbo"
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17952,15 +19314,6 @@ msgstr "Arbaro"
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18036,6 +19389,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18090,7 +19449,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18102,6 +19461,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Tombejo"
@@ -18177,47 +19539,50 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
-msgstr "Domo numero"
+msgid "Alternative name"
+msgstr ""
-msgid "House name"
-msgstr "Domo nomo"
+msgid "Historical name"
+msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
-msgstr "Urbo nomo"
+msgid "Regional name"
+msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
-msgstr "AT"
+msgid "International name"
+msgstr ""
-msgid "CH"
-msgstr "CH"
+msgid "Official name"
+msgstr ""
-msgid "DE"
-msgstr "DE"
+msgid "Common name abbreviation"
+msgstr ""
-msgid "FR"
-msgstr "FR"
+msgid "Edit Address Information"
+msgstr ""
-msgid "GB"
-msgstr "GB"
+msgid "House number"
+msgstr "Domo numero"
-msgid "IT"
-msgstr "IT"
+msgid "House name"
+msgstr "Domo nomo"
-msgid "RS"
+msgid "Street name"
msgstr ""
-msgid "US"
-msgstr "US"
+msgid "City name"
+msgstr "Urbo nomo"
+
+msgid "Country code"
+msgstr ""
msgid "Address Interpolation"
msgstr ""
@@ -18237,6 +19602,18 @@ msgstr ""
msgid "alphabetic"
msgstr "alfabeta"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18399,27 +19776,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18465,21 +19871,24 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
msgstr ""
+msgid "house"
+msgstr "domo"
+
msgid "Street"
msgstr "Strato"
@@ -18501,7 +19910,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18597,18 +20006,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "ponto"
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr "biciklo"
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr "ĉevalo"
@@ -18618,7 +20036,10 @@ msgstr "barilo"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18627,10 +20048,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18648,6 +20069,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18663,28 +20087,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18705,20 +20129,20 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
-msgstr "komerco"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotelo"
@@ -18783,9 +20207,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr "strando"
@@ -18795,10 +20216,13 @@ msgstr ""
msgid "boundary"
msgstr "landlimo"
+msgid "sport"
+msgstr "sporto"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18813,9 +20237,6 @@ msgstr "Vilaĝo/Urbo"
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr "Preĝejo"
-
msgid "Fuel Station"
msgstr ""
@@ -18843,6 +20264,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18888,10 +20312,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18903,7 +20357,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18921,7 +20375,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19038,19 +20492,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:designation without designation"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:height without height"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19069,13 +20634,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19084,23 +20685,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19111,142 +20721,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19285,148 +20944,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19630,6 +21352,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19651,13 +21385,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19920,9 +21648,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19944,6 +21678,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20022,9 +21759,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20109,7 +21858,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20380,15 +22129,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20559,6 +22299,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20577,12 +22320,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20718,6 +22455,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20735,6 +22475,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20815,113 +22558,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20947,7 +22704,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20997,7 +22757,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21042,6 +22802,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21099,19 +22862,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21153,27 +22981,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21569,6 +23379,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21816,12 +23629,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21831,16 +23638,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22203,9 +24007,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22260,9 +24061,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22304,25 +24122,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22459,9 +24277,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22486,12 +24301,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22640,6 +24464,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22656,6 +24483,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22889,13 +24727,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22948,18 +24779,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23017,6 +24836,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23224,9 +25046,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23306,7 +25125,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23460,6 +25297,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23481,6 +25321,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23774,9 +25617,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23845,9 +25685,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23974,9 +25811,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23998,6 +25832,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24030,15 +25867,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24048,6 +25901,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24150,9 +26006,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24268,6 +26121,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24328,19 +26184,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24478,6 +26334,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24553,6 +26412,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24568,9 +26516,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24592,6 +26537,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24744,9 +26692,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25372,7 +27317,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25380,10 +27328,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25392,18 +27337,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25446,15 +27379,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25576,18 +27500,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25765,9 +27677,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25894,7 +27803,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25914,9 +27823,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26049,9 +27955,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/es.po b/i18n/po/es.po
index d87294f..7c21bf7 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-04-01 09:52+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-14 13:10+0000\n"
"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
"Language-Team: Spanish <es 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: 2013-04-05 04:58+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:59+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: es\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -21,7 +21,7 @@ msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr "{0}: opción\"--{1}\" no permite un argumento"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: opción\"--{1}{2}\" no permite un argumento"
+msgstr "{0}: opción \"{1}{2}\" no permite un argumento"
msgid "{0}: option ''{1}'' requires an argument"
msgstr "{0}: opción\"--{1}\" requiere un argumento"
@@ -50,6 +50,21 @@ msgstr "Condiciones de uso de la imagen de fondo"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "La apertura de enlace no se admite en la plataforma actual (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ERROR: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ADVERTENCIA: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFORMACIÓN: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEPURACIÓN: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Ejecutando enganche de inicio a la plataforma"
@@ -154,27 +169,27 @@ msgid "About JOSM..."
msgstr "Acerca de JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ATENCIÓN: formato inesperado de la URL base de la API. El redireccionado a "
-"la página de información o de histórico del objeto OSM probablemente "
-"fallará. La URL base de la API es: \"{0}\""
+"Formato inesperado de la URL base de la API. La redirección a la página de "
+"de información o historial del el objeto OSM probablemente fallará. La URL "
+"base de la API es:'' {0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Precaución: formato inesperado de la URL de la base API. La redirección "
-"hacia la página de usuario OSM probablemente fallará. La URL de la base API "
-"es:\"{0}\""
+"Formato inesperado para la URL base de la API . La redirección a la página "
+"de usuario para el usuario de OSM probablemente fallará. La URL base de la "
+"API es: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
msgstr ""
-"Está por lanzar {0} ventanas del navegador.<br> Esto puede saturar su "
-"pantalla con ventanas del navegador<br> y tomar algo de tiempo para terminar."
+"Va a lanzar {0} ventanas del navegador.<br> Esto puede saturar su pantalla "
+"con ventanas del navegador<br> y tomar algo de tiempo para terminar."
msgid "Continue"
msgstr "Continuar"
@@ -212,6 +227,9 @@ msgstr "No hay capas objetivo"
msgid "Add imagery layer {0}"
msgstr "Agregar capa de imágenes {0}"
+msgid "Select image format for WMS layer"
+msgstr "Seleccionar formato de imagen para la capa WMS"
+
msgid "Select WMS layers"
msgstr "Seleccionar capas WMS"
@@ -251,9 +269,6 @@ msgstr "Herramienta: {0}"
msgid "Please select at least four nodes."
msgstr "Por favor seleccione al menos cuatro nodos."
-msgid "Information"
-msgstr "Información"
-
msgid "Align Nodes in Line"
msgstr "Alinear nodos en línea"
@@ -278,6 +293,9 @@ msgstr "conflicto"
msgid "download"
msgstr "descarga"
+msgid "problem"
+msgstr "problema"
+
msgid "previous"
msgstr "anterior"
@@ -287,6 +305,9 @@ msgstr "siguiente"
msgid "Nothing selected to zoom to."
msgstr "Nada seleccionado para realizar zoom"
+msgid "Information"
+msgstr "Información"
+
msgid "Zoom to {0}"
msgstr "Zoom a {0}"
@@ -294,7 +315,7 @@ msgid "Zoom the view to {0}."
msgstr "Zoom de la vista a {0}"
msgid "View: {0}"
-msgstr "Vista: {0}"
+msgstr "Ver: {0}"
msgid "No conflicts to zoom to"
msgstr "No hay conflictos para realizar zoom"
@@ -306,7 +327,7 @@ msgid "Toggle visibility of Changeset Manager window"
msgstr "Alternar la visibilidad de la ventana de Administrador de Cambios"
msgid "Close open changesets"
-msgstr "Cerrar conjunto de cambios abiertos"
+msgstr "Cerrar conjunto de cambios abierto"
msgid "Closes open changesets"
msgstr "Cierre de los conjuntos de cambios abiertos"
@@ -343,11 +364,11 @@ msgstr ""
"alguna de ellas?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"No se han podido combinar las vías (no se han podido unir en una cadena "
-"única de nodos)"
+"No fue posible combinar las vías<br>(no pudieron ser combinadas en una única "
+"cadena de nodos)"
msgid "Combine {0} ways"
msgstr "Combinar {0} vías"
@@ -404,6 +425,12 @@ msgstr "Borrar"
msgid "Delete selected objects."
msgstr "Eliminar objetos seleccionados."
+msgid "Toggle dialogs panel"
+msgstr "Activar panel de diálogos"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Conmuta el panel de diálogos, maximiza la vista del mapa"
+
msgid "Distribute Nodes"
msgstr "Distribuir nodos"
@@ -412,12 +439,25 @@ msgstr ""
"Distribuir los nodos seleccionados de forma equidistante a lo largo de una "
"línea."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignorando {0} nodos con coordenadas nulas"
+
msgid "Download from OSM..."
msgstr "Descargar desde OSM..."
msgid "Download map data from the OSM server."
msgstr "Descargar datos del mapa del servidor OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acción requiere {0} peticiones<br>individuales de "
+"descarga.<br¿Desea continuar?</html>"
+
+msgid "Download data"
+msgstr "Descargar datos"
+
msgid "Download object..."
msgstr "Descargar objeto..."
@@ -495,7 +535,7 @@ msgid "Fullscreen view"
msgstr "Pantalla completa"
msgid "Toggle fullscreen view"
-msgstr "Cambiar a ver pantalla completa"
+msgstr "Activar o desactivar pantalla completa"
msgid "Export to GPX..."
msgstr "Exportar a GPX..."
@@ -516,6 +556,9 @@ msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
"Mostrar el historial de información de las vías, nodos o relaciones de OSM."
+msgid "Show history"
+msgstr "Mostrar historial"
+
msgid "History (web)"
msgstr "Historial (web)"
@@ -549,10 +592,10 @@ msgstr ""
"También puede introducir el desplazamiento al Este y al Norte en las "
"coordenadas {0}.\n"
"Si desea guardar el desplazamiento como un marcador, introduzca el nombre "
-"del marcador abajo"
+"del marcador a continuación."
msgid "Offset: "
-msgstr "Contrabalance: "
+msgstr "Desplazamiento: "
msgid "Bookmark name: "
msgstr "Nombre del marcador: "
@@ -644,11 +687,11 @@ msgid "Joined overlapping areas"
msgstr "Unir áreas superpuestas"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Algunas de las vías forman que parte de relaciones han sido modificadas. Por "
-"favor compruebe que errores no se han introducido."
+"Algunas de las vías formaba parte de relaciones que han sido "
+"modificadas.<br>Por favor verifique que no se hayan introducido errores."
msgid "Fix tag conflicts"
msgstr "Arreglar conflictos de etiquetas"
@@ -817,10 +860,10 @@ msgid "Merge nodes into the oldest one."
msgstr "Convertir nodos en el más antiguo."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Por favor, seleccione al menos dos nodos para poder unirlos, o un nodo muy "
+"Por favor seleccione al menos dos nodos para fusionar o un nodo que esté "
"cercano a otro."
msgid "Abort Merging"
@@ -991,11 +1034,11 @@ msgid "Download Data"
msgstr "Descargar datos"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>No se puede abrir la URL ''{0}'' porque no hay ninguna tarea de "
-"descarga apropiada disponible.</html>"
+"No se puede abrir la URL \"{0}\" <br> Las siguientes tareas de descarga "
+"aceptan los patrones de URL que se muestran a continuación:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1004,7 +1047,7 @@ msgid ""
"can undo the movement for certain nodes:<br>Select them and press the "
"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
msgstr ""
-"<h3>Cuando se elige una o más vías la forma se ajusta de tal manera en que "
+"<h3>Cuando se elige una o más vías la forma se ajusta de tal manera de que "
"todos los ángulos son de 90 ó 180 grados.</h3>Puede añadir dos nodos a la "
"selección. Entonces se fija la dirección en función de esos dos nodos de "
"referencia. (Después puede deshacer el movimiento para algunos "
@@ -1027,16 +1070,11 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizar / Deshacer"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalizar forma / Deshacer\n"
-"¡Por favor, seleccione los nodos que fueron movidos por la acción anterior "
-"de Ortogonalizar forma!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Deshacer ortogonalizar forma"
+"Ortogonalizar figura / Deshacer<br>Por favor ¡seleccione nodos que hayan "
+"sido movidos por la acción de Ortogonalizar Figura anterior!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1057,9 +1095,6 @@ msgstr "Ortogonalizar"
msgid "Usage"
msgstr "Uso"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Los elementos seleccionados no pueden ser ortogonalizados"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1181,6 +1216,15 @@ msgstr "También renombrar el archivo"
msgid "Could not rename file ''{0}''"
msgstr "No se pudo renombrar el archivo ''{0}''"
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgid "Restart the application."
+msgstr "Reiniciar la aplicación"
+
+msgid "Click to restart later."
+msgstr "Haga clic para reiniciar más tarde."
+
msgid "Reverse way"
msgstr "Invertir via"
@@ -1233,9 +1277,6 @@ msgstr "Cargar sesión"
msgid "Load a session from file."
msgstr "Cargar una sesión desde archivo."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Archivo de sesión (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Abrir sesión"
@@ -1303,6 +1344,9 @@ msgstr "Informe de estado"
msgid "Copy to clipboard and close"
msgstr "Copiar al portapapeles y cerrar"
+msgid "Report bug"
+msgstr "Reportar error"
+
msgid "Close"
msgstr "Cerrar"
@@ -1387,18 +1431,18 @@ msgstr ""
"nodos de la mitad de la vía)."
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Una parte basada en la relación de miembros fue copiada a todas las "
-"rutas.<br>Debería verificar esto y corregirlo cuando sea necesario.</html>"
+"Un miembro de la relación basada en roles fue copiada a todas las nuevas "
+"vías.<br> Debería verificarlo y corregir en los casos que sea necesario."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Una relación de miembros fue copiada a todas las vías.<br>Deberería "
-"verificar y corregir esto cuando sea necesario.</html>"
+"Un miembro de la relación fue copiado a todas las nuevas vías.<br> Debería "
+"verificarlo y corregirlo donde sea necesario."
msgid "Split way {0} into {1} parts"
msgstr "Dividir la vía {0} en {1} partes"
@@ -1495,6 +1539,30 @@ msgstr ""
"Está a punto de despegar objetos incompletos.<br>Esto causará problemas "
"debido a que no verá el objeto real.<br>¿Realmente quiere despegar?"
+msgid "Disconnect Node from Way"
+msgstr "Desconectar nodo de la vía"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Desconectar nodos desde una vía a la que actualmente pertenecen"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Selecciona al menos un nodo a ser desconectado."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "El nodo seleccionado no puede ser desconectado de la nada."
+msgstr[1] "Los nodos seleccionados no pueden ser desconectados de la nada."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"El camino afectado desaparecería después de desconectar el nodo seleccionado."
+msgstr[1] ""
+"El camino afectado desaparecería después de desconectar los nodos "
+"seleccionados."
+
msgid "Undo"
msgstr "Deshacer"
@@ -1519,9 +1587,6 @@ msgstr "Actualizar datos"
msgid "Updates the objects in the active data layer from the server."
msgstr "Actualizar desde el servidor los objetos en la capa de datos activa."
-msgid "Download data"
-msgstr "Descargar datos"
-
msgid "Update modified"
msgstr "Actualización modificada"
@@ -1576,6 +1641,10 @@ msgid ""
"require you subsequently have to revert your changes, or force other "
"contributors to.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Va a cargar los datos de la capa ''{0}''. <br/> <br/> Enviar datos de esta "
+"capa es <b>muy desaconsejable</b>. Si continúa se podrá requerir "
+"posteriormente que se reviertan los cambios o forzar a otros editores del "
+"mapa a que lo hagan<br /> <br /> ¿Está usted seguro que desea continuar?"
msgid "Ignore this hint and upload anyway"
msgstr "Ignorar esta recomendación y subir los datos de todas formas"
@@ -1634,7 +1703,7 @@ msgid "Enable/disable rendering the map as wireframe only"
msgstr "Activar/desactivar la visualización del mapa únicamente como líneas"
msgid "Toggle Wireframe view"
-msgstr "Interruptor de la vista de rejilla"
+msgstr "Activar o desactivar la vista de rejilla"
msgid "Zoom In"
msgstr "Acercar"
@@ -1728,6 +1797,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avance lento"
+msgid "Download GPS"
+msgstr "Descargar GPS"
+
msgid "Downloading GPS data"
msgstr "Descargando datos GPS"
@@ -1737,6 +1809,18 @@ msgstr "Datos GPX descargados"
msgid "Markers from {0}"
msgstr "Marcadores desde {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Descargar cambios a OSM comprimidos"
+
+msgid "Download OSM Change"
+msgstr "Descargar cambios a OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Descargar OSM comprimido"
+
+msgid "Download OSM"
+msgstr "Descargar OSM"
+
msgid "Downloading data"
msgstr "Descargando datos"
@@ -1758,6 +1842,31 @@ msgstr "Comando"
msgid "Request details: {0}"
msgstr "Detalles de la solicitud: {0}"
+msgid "Download OSM URL"
+msgstr "Descargar ULR de OSM"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Ocurrió {0} conflicto durante la importación."
+msgstr[1] "Ocurrieron {0} conflictos durante la importación."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflicto durante la descarga."
+msgstr[1] "Conflictos durante la descarga."
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Cargando padres del nodo {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Cargando padres de la vía {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Cargando padres de la relación {2}"
+
+msgid "Download session"
+msgstr "Descargar sesion"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Descargando {0} de {1} ({2} pendientes)"
@@ -1789,7 +1898,13 @@ msgid_plural ""
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
msgstr[0] ""
+"Hay {0} objeto dentro de sus modificacionse que probablemente fue eliminado "
+"del servidor.<br>Si después intenta eliminarlo o actualizarlo seguramente el "
+"servidor lo informará como un conflicto."
msgstr[1] ""
+"Hay {0} objetos dentro de sus modificacionse que probablemente fueron "
+"eliminados del servidor.<br>Si después intenta eliminarlos o actualizarlos "
+"seguramente el servidor lo informará como un conflicto."
msgid ""
"Click <strong>{0}</strong> to check the state of this object on the server."
@@ -1814,25 +1929,6 @@ msgstr "Los siguientes errores se produjeron durante la descarga masiva: {0}"
msgid "Errors during download"
msgstr "Errores durante la descarga"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Ocurrió {0} conflicto durante la importación."
-msgstr[1] "Ocurrieron {0} conflictos durante la importación."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflicto durante la descarga."
-msgstr[1] "Conflictos durante la descarga."
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Cargando padres del nodo {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Cargando padres de la vía {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Cargando padres de la relación {2}"
-
msgid "Error during download"
msgstr "Error durante la descarga"
@@ -1865,7 +1961,7 @@ msgid "Backspace in Add mode"
msgstr "Tecla retroceso en modo Agregar"
msgid "helper line"
-msgstr ""
+msgstr "línea del asistente"
msgid "Cannot add a node outside of the world."
msgstr "No se puede añadir un nodo fuera del mundo."
@@ -1915,7 +2011,7 @@ msgid "draw angle snap"
msgstr "dibujar ajuste de ángulo"
msgid "draw angle snap highlight"
-msgstr ""
+msgstr "resaltar dibujado de ángulo de corte"
msgid "Toggle snapping by {0}"
msgstr "Activar/Desactivar instantanea de {0}"
@@ -1968,10 +2064,10 @@ msgstr ""
"rectángulo, haga doble click para añadir un nuevo nodo."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Extrusión: línea principal"
msgid "Extrude: helper line"
-msgstr ""
+msgstr "línea guía extruir"
msgid "Extrude Way"
msgstr "Extruir vía"
@@ -1982,6 +2078,9 @@ msgstr "Mejorar la precisión de la vía"
msgid "Improve Way Accuracy mode"
msgstr "Modo de mejora de la precisión de la vía"
+msgid "improve way accuracy helper line"
+msgstr "línea guía para mejorar la precisión de la vía"
+
msgid "Click on the way to start improving its shape."
msgstr "Haga click en la vía para empezar a mejorar su forma."
@@ -2012,10 +2111,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "No se puede colocar un nodo fuera del mundo."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] "Añadir un nuevo nodo a la vía"
-msgstr[1] "Añadir un nuevo nodo a {0} vías"
+msgstr[1] "Añadir nuevo nodos a las {0} vías"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "No se puede eliminar el nodo que hace referencia a varios objetos"
@@ -2029,6 +2128,9 @@ msgstr "Paralelo"
msgid "Make parallel copies of ways"
msgstr "Hacer copias paralelas de vías"
+msgid "make parallel helper line"
+msgstr "línea guía hacer paralela"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2137,8 +2239,8 @@ msgstr "Añadir la selección a la relación"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Añadir selección a {0} relación"
+msgstr[1] "Añadir selección a {0} relaciones"
msgid "Delete the selected relation"
msgstr "Borrar la relación seleccionada"
@@ -2467,7 +2569,7 @@ msgid "Baker Street"
msgstr "Calle Mayor"
msgid "''Baker'' and ''Street'' in any key"
-msgstr "''Calle'' and ''Mayor'' en cualquier clave"
+msgstr "''Calle'' y ''Mayor'' en cualquier clave"
msgid "\"Baker Street\""
msgstr "\"Calle Mayor\""
@@ -2496,6 +2598,9 @@ msgstr "\"valor\" con ninguna clave"
msgid "matches if ''key'' exists"
msgstr "coincidencias si la \"clave\" existe"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "combinadores"
@@ -2534,7 +2639,7 @@ msgid "all closed ways"
msgstr "todas las vías cerradas"
msgid "object without useful tags"
-msgstr ""
+msgstr "objetos sin etiquetas útiles"
msgid "metadata"
msgstr "metadato"
@@ -2594,13 +2699,13 @@ msgid "all parents of objects matching the expression"
msgstr "todos los padres de los objetos coincidentes con la expresión"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "n-ésimo miembro de la relación y/o n-ésimo nodo de la vía"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "cada n-ésimo miembro de la relación y/o cada n-ésimo nodo de la vía"
msgid "view"
-msgstr "vista"
+msgstr "ver"
msgid "objects in current view"
msgstr "objetos en la vista actual"
@@ -2671,14 +2776,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Esperando <i>min</i>/<i>max</i> después de ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Se esperaba la id. primitiva"
+msgid "Range of primitive ids expected"
+msgstr "Rango de ids primitivos esperado"
-msgid "Changeset id expected"
-msgstr "Se esperaba un conjunto de cambios"
+msgid "Range of changeset ids expected"
+msgstr "Rango de ids de conjuntos de cambios esperado"
-msgid "Version expected"
-msgstr "Se esperaba una versión"
+msgid "Range of versions expected"
+msgstr "Rango de versiones esperados"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2690,6 +2795,9 @@ msgstr ""
"Tipo de primitivo desconocido: {0}. Los valores permitidos son nodo, vía o "
"relación"
+msgid "Primitive id expected"
+msgstr "Se esperaba la id. primitiva"
+
msgid "Range of numbers expected"
msgstr "Se esperaba un rango de números"
@@ -2708,11 +2816,10 @@ msgstr "Falta parámetro para XOR"
msgid "Missing operator for NOT"
msgstr "Falta un para para el ''NOT''"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Aviso: se ha recortado automáticamente el valor del atributo ''{0}'' en el "
-"objeto borrado {1}"
+"Truncar automáticamente el valor de la etiqueta ''{0}'' en el objeto "
+"eliminado {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2737,7 +2844,7 @@ msgid "Removed obsolete tags"
msgstr "Eliminar etiquetas obsoletas"
msgid "Fix deprecated tags"
-msgstr ""
+msgstr "Corregir etiquetas en desuso"
msgid ""
"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -2809,6 +2916,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Añadido {0} objeto"
msgstr[1] "Añadidos {0} objetos"
+msgid "New way {0} has 0 nodes"
+msgstr "La nueva vía {0} tiene 0 nodos"
+
msgid "Change node {0}"
msgstr "Cambiar nodo {0}"
@@ -2845,11 +2955,11 @@ msgstr "Eliminar \"{0}\" para {1} objetos"
msgid "Set {0}={1} for {2} objects"
msgstr "Establecer {0}={1} para {2} objetos"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Borradas {0} propiedades de {1} objetos"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "{0} etiquetas eliminadas para {1} objetos"
-msgid "Set {0} properties for {1} objects"
-msgstr "Establecidas {0} propiedades de {1} objetos"
+msgid "Set {0} tags for {1} objects"
+msgstr "Fijar {0} etiquetas para {1} objetos"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Remplazar\"{0}\" por \"{1}\" para"
@@ -2873,11 +2983,11 @@ msgid "Double conflict"
msgstr "Doble conflicto"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Atención: La capa ''{0}'' ya no existe. No se puede eliminar el conflicto "
-"para el objeto ''{1}''."
+"La capa ''{0}'' no existe. No se puede eliminar el conflicto para el objeto "
+"''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Añadir conflicto para ''{0}''"
@@ -2938,7 +3048,7 @@ msgid ""
"downloaded.<br>This can cause problems because other objects (that you do "
"not see) might use them.<br>Do you really want to delete?"
msgstr ""
-"Está a punto de borrar nodos fuera del área que se ha descargado.<br>Esto "
+"Está a punto de eliminar nodos fuera del área que se ha descargado.<br>Esto "
"puede causar problemas ya que otros objetos (que no puede ver) pueden estar "
"usándolos.<br>¿Esta seguro que quiere borrarlo?"
@@ -2946,8 +3056,8 @@ msgid ""
"You are about to delete incomplete objects.<br>This will cause problems "
"because you don''t see the real object.<br>Do you really want to delete?"
msgstr ""
-"Va a borrar objetos incompletos.<br> Esto causará problemas porque no ve el "
-"objeto real.<br>Desea borrarlos realmente?"
+"Va a eliminar objetos incompletos.<br> Esto causará problemas porque no ve "
+"el objeto real.<br>¿Está seguro que desea borrarlos?"
msgid ""
"You are about to delete {0} relation: {1}<br/>This step is rarely necessary "
@@ -2958,13 +3068,13 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
-"Está a punto de borrar {0} relación: {1}<br/>Este paso raramente es "
-"necesario, y no se puede deshacer de una manera fácil una vez que se ha "
-"subido al servidor.<br/>¿Realmente quiere borrar?"
+"Está a punto de eliminar {0} relación: {1}<br/>Este paso raramente es "
+"necesario y no se puede deshacer de una manera fácil una vez que se ha "
+"subido al servidor.<br/>¿Realmente quiere eliminarla?"
msgstr[1] ""
-"Está a punto de borrar {0} relaciones: {1}<br/>Este paso raramente es "
-"necesario, y no se puede deshacer de una manera fácil una vez que se ha "
-"subido al servidor.<br/>¿Realmente quiere borrar?"
+"Está a punto de eliminar {0} relaciones: {1}<br/>Este paso raramente es "
+"necesario y no se puede deshacer de una manera fácil una vez que se ha "
+"subido al servidor.<br/>¿Realmente quiere eliminarlas?"
msgid "Delete relation?"
msgstr "¿Eliminar relación?"
@@ -2994,6 +3104,9 @@ msgstr[1] "Purgados {0} objetos"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resolver conflictos en la lista de miembros de la relación {0}"
+msgid "Removed nodes from {0}"
+msgstr "Eliminado los nodos de {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotar {0} nodo"
@@ -3059,15 +3172,14 @@ msgstr[1] ""
"significado semántico?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Invertir vías con sentido"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Al modificar el sentido de esta vía se sugieren los siguientes cambios en "
-"las propiedades de la vía y sus nodos con el fin de mantener la consistencia "
-"de los datos."
+"Al invertir esta vía se sugieren los siguientes cambios con el fin de "
+"mantener la coherencia de los datos."
msgid "Relation"
msgstr "Relación"
@@ -3096,11 +3208,11 @@ msgstr "Aplicar los cambios seleccionados"
msgid "Do not apply changes"
msgstr "No aplicar cambios"
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor, seleccione qué cambios de propiedades desea aplicar."
+msgid "Please select which changes you want to apply."
+msgstr "Por favor, seleccione qué cambios desea aplicar."
-msgid "Properties of "
-msgstr "Propiedades de "
+msgid "Tags of "
+msgstr "Etiquetas de "
msgid "Roles in relations referring to"
msgstr "Funciones en la relaciones referidas a"
@@ -3121,6 +3233,9 @@ msgstr "IOError creando el archivo. No se guardará automáticamente: {0}"
msgid "Unable to delete old backup file {0}"
msgstr "No se pudo borrar el anterior archivo de copia de seguridad {0}"
+msgid "Your work has been saved automatically."
+msgstr "Su trabajo se ha guardado automáticamente."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
"Se produjo un error al crear la copia de seguridad de la capa eliminada: {0}"
@@ -3151,24 +3266,28 @@ msgid ""
"default value is unknown at this moment.<br/> Please activate corresponding "
"function manually and retry importing."
msgstr ""
+"<html> El archivo de configuración pide adjuntar las preferencias a <b> {0} "
+"</ b><br/> pero su valor por defecto es desconocido en este momento. <br/> "
+"Por favor, active la función correspondiente de forma manual y vuelva a "
+"intentar la importación."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Advertencia: No se pudo crear el directorio cache que falta: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Error al crear el directorio de caché faltante: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
"<html>Se ha producido un fallo al crear el directorio para la caché: "
"{0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"."
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "No se ha podido conservar las preferencias para ''{0}''"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Aviso: Error al inicializar las preferencias. El directorio de las "
-"preferencias ''{0}'' no es un directorio."
+"Error al inicializar las preferencias. El directorio de preferencias ''{0}'' "
+"no es un directorio."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3178,11 +3297,11 @@ msgstr ""
"preferencias ''{0}'' no es un directorio.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Aviso: Error al inicializar las preferencias. Error al crear el directorio "
-"de preferencias desaparecido: {0}"
+"Error al inicializar las preferencias. No se pudo crear el directorio de "
+"preferencias faltante: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3191,18 +3310,16 @@ msgstr ""
"<html>Error al inicializar las preferencias. <br> Error al crear el "
"directorio de preferencias desaparecido: {0}.</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Info: Falta el archivo de preferencias \\\"{0}\\\". Creando un archivo de "
-"preferencia predeterminado."
+"Falta el archivo de preferencias ''{0}''. Creando un archivo de preferencias "
+"predeterminado."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Aviso: Reemplazando el archivo de preferencias ''{0}'' existente por el "
-"archivo por defecto."
+"Reemplazando el archivo de preferencias existente ''{0}'' con el archivo de "
+"preferencias predeterminado."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3220,10 +3337,10 @@ msgstr ""
"defecto.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Advertencia: No se pudo inicializar las preferencias. Error al restablecer "
+"Error al inicializar las preferencias. No se ha podido restablecer el "
"archivo de preferencias por defecto: {0}"
msgid "Paint style {0}: {1}"
@@ -3254,14 +3371,13 @@ msgstr "Fallo al cargar el recurso \"{0}\", el error es: {1}."
msgid "UNKNOWN"
msgstr "DESCONOCIDO"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Advertencia: Versión inesperada de JOSM en el archivo de revisión, el valor "
-"es''{0}''"
+"Número de versión JOSM inesperado en el archivo de revisión, el valor es "
+"''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "ATENCIÓN: falta el archivo de revisión ''/REVISIÓN''"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Falta el archivo de revisión ''/REVISION''."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Ya se ha registrado un conflicto para la primitiva «{0}»."
@@ -3434,11 +3550,10 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Error: se ha producido un fallo al cargar la clase renderizadora del mapa "
-"''{0}''. No se ha encontrado la clase."
+"Error al cargar la clase de renderizado de mapa ''{0}''. La clase no fue "
+"encontrada."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3549,19 +3664,23 @@ msgstr "Elipsoide requerido (+ellps=* or +a=*, +b=*)"
msgid "Grid shift file ''{0}'' for option +nadgrids not supported."
msgstr ""
+"No se puede usar el archivo de desplazamiento de grilla \"{0}\" para la "
+"opción +nadgris."
msgid "Unkown datum identifier: ''{0}''"
msgstr "Identificador de datum desconocido: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum requerido (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Se requiere (+datum=*, +towgs84=* or +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
msgstr ""
+"Número inesperado de argumentos para el parámetro ''towgs84'' (debe tener 3 "
+"o 7)"
msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
-msgstr ""
+msgstr "No se puede analizar el valor del parámetro ''towgs84'' (''{0}'')"
msgid "Projection required (+proj=*)"
msgstr "Requiere protección (+proj=*)"
@@ -3573,6 +3692,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Número inesperado de argumentos para el parámetro \"+bounds\" (debe de ser 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Parámetro ''{0}'' desconocido"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Número esperado de argumentos para el parámetro ''{0}''"
@@ -3590,11 +3712,6 @@ msgstr "Proyeccion ajustada"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Error: ha fallado la apertura de un flujo de entrada para el recurso "
-"''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3635,6 +3752,9 @@ msgstr "otra validación"
msgid "Running test {0}"
msgstr "Ejecutando test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Test \"{0}\" completado en {1}"
+
msgid "Addresses"
msgstr "Direcciones"
@@ -3660,8 +3780,17 @@ msgstr "Múltiples nombres de calles en la relación"
msgid "House number too far from street"
msgstr "Demasiados números de portal para una calle"
+msgid "Barriers and entrances"
+msgstr "Barreras y entradas"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Busca errores en barreras y entradas"
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Entrada de barrera fijada fuera de una barrera"
+
msgid "Building inside building"
-msgstr "Edificio dentro de edificio"
+msgstr "Edificio dentro de un edificio"
msgid "Checks for building areas inside of buildings."
msgstr ""
@@ -3722,15 +3851,15 @@ msgstr " o "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} está obsoleto, use {1} en su lugar"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Nodos duplicados"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Esta examen comprueba que no haya nodos en el mismo lugar."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Nodos duplicados en dos vías no cerradas"
-
msgid "Mixed type duplicated nodes"
msgstr "Mezclar nodos con tipo duplicado"
@@ -3802,6 +3931,24 @@ msgstr "Nodos de vía duplicados"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Comprueba vías con nodos idénticos consecutivos"
+msgid "Highways"
+msgstr "Viales"
+
+msgid "Performs semantic checks on highways."
+msgstr "Ejecuta verificaciones semánticas sobre los caminos."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Rotonda incorrecta (camino: {0} en lugar de {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolígono"
@@ -3867,7 +4014,7 @@ msgstr ""
"Chequear si hay nodos que tienen las mismas etiquetas que su vía padre"
msgid "Nodes duplicating parent way tags"
-msgstr ""
+msgstr "Nodos que duplican las etiquetas de las vías padre"
msgid "Nodes with same name"
msgstr "Nodos con el mismo nombre"
@@ -3877,6 +4024,13 @@ msgstr ""
"Este test encuentra los nodos que tienen el mismo nombre (podrían ser nodos "
"duplicados)."
+msgid "Opening hours syntax"
+msgstr "Sintaxis de los horarios de apertura"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+"Esta prueba verifica el correcto uso de la sintaxis del horario de apertura."
+
msgid "Overlapping Areas"
msgstr "Áreas superpuestas"
@@ -3903,7 +4057,7 @@ msgid "Highways share segment with area"
msgstr "Segmento de carreteras compartidas con área"
msgid "Railways share segment with area"
-msgstr "Segmento de rieles de tren compartidos con área"
+msgstr "Segmento de vías de ferrocarril compartidos con área"
msgid "Ways share segment with area"
msgstr "Segmento de caminos compartidos con área"
@@ -3923,7 +4077,7 @@ msgstr ""
"Busca nodos en líneas de energía que no tienen una etiqueta power=tower/pole."
msgid "Missing power tower/pole within power line"
-msgstr ""
+msgstr "No se encuentran torres o postes en el tendido eléctrico"
msgid "Relation checker"
msgstr "Comprobación de relaciones"
@@ -3932,10 +4086,13 @@ msgid "This plugin checks for errors in relations."
msgstr "Este plugin revisa errores en relaciones."
msgid "Relation type is unknown"
-msgstr "Tipo de relación desconocido"
+msgstr "Tipo de relación desconocida"
msgid "Relation is empty"
-msgstr "La relación es vacía"
+msgstr "La relación está vacía"
+
+msgid "Role verification problem"
+msgstr "Problema de verificación de rol"
msgid "<empty>"
msgstr "<vacío>"
@@ -3943,9 +4100,6 @@ msgstr "<vacío>"
msgid "Role {0} missing"
msgstr "Falta el rol {0}"
-msgid "Role verification problem"
-msgstr "Problema de verificación de rol"
-
msgid "Number of {0} roles too low ({1})"
msgstr "{0} es una cantidad de roles muy baja ({1})"
@@ -3978,13 +4132,12 @@ msgstr ""
"Este test comprueba vías con nombres similares por si pudieran haberse "
"escrito mal."
-msgid "Properties checker :"
-msgstr "Comprobación de propiedades:"
+msgid "Tag checker"
+msgstr "Corrector de etiquetas"
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
-"Este componente chequea errores en las propiedades de las etiquetas y los "
-"valores."
+"Este test comprueba si hay errores en las claves y valores de la etiqueta."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Línea de test de etiquetas no válida - {0}: {1}"
@@ -4129,8 +4282,8 @@ msgstr "Utilizar el corrector ortográfico predeterminado."
msgid "Use the default spellcheck file (recommended)."
msgstr "Utilizar el corrector ortográfico predeterminado (recomendado)."
-msgid "Fix properties"
-msgstr "Fijar las propiedades"
+msgid "Fix tags"
+msgstr "Corregir etiquetas"
msgid "Could not find element type"
msgstr "No se pudo encontrar el tipo de elemento"
@@ -4185,6 +4338,7 @@ msgstr "La vía \"de\" no comienza o termina en un nodo \"vía\""
msgid "Superfluous turnrestriction as \"to\" way is oneway"
msgstr ""
+"Restricción de giro redundante ya que la vía \"hacia\" es de un solo sentido"
msgid "The \"to\" way does not start or end at a \"via\" node"
msgstr "La vía \"a\" no comienza o termina en el nodo \"vía\""
@@ -4204,6 +4358,9 @@ msgstr "Vías no cerradas"
msgid "This tests if ways which should be circular are closed."
msgstr "Esto analiza si las vías circulares están cerradas."
+msgid "Unclosed way"
+msgstr "Via sin cerrar"
+
msgid "natural type {0}"
msgstr "Tipo natural {0}"
@@ -4234,9 +4391,6 @@ msgstr "edificio"
msgid "area"
msgstr "área"
-msgid "Unclosed way"
-msgstr "Via sin cerrar"
-
msgid "Unconnected ways"
msgstr "Vías no conectadas"
@@ -4264,12 +4418,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Este test comprueba nodos sin etiquetar que no pertenecen a ninguna vía."
-msgid "No tags"
-msgstr "Sin etiquetas"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nodos desconectados sin etiquetas físicas"
+msgid "No tags"
+msgstr "Sin etiquetas"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Tiene una etiqueta que contiene \"fixme\" o \"FIXME\""
@@ -4333,28 +4487,6 @@ msgid "Reversed land: land not on left side"
msgstr ""
"Línea terrestre invertida: la tierra no puede situarse al lado izquierdo"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Numero de argumentos erróneos para el marcados"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Error al leer la entrada del marcador: $s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Error: Valor doble ilegal ''{0}'' en línea ''{1}'' en el archivo de "
-"marcapáginas ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>No se pueden leer los marcadores desde<br>''{0}''<br>El error fue: "
-"{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "No mostrar otra vez (recordar elección)"
@@ -4432,7 +4564,7 @@ msgid "Authentication Failed"
msgstr "Identificación errónea"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr ""
+msgstr "No se permite el acceso a la versión redactada \"{0}\" de {1} {2}"
msgid "Authorisation Failed"
msgstr "Autorización incorrecta"
@@ -4458,8 +4590,8 @@ msgstr "Mostrar información de ayuda"
msgid "Downloading \"Message of the day\""
msgstr "Descargando \"Mensaje del día\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr ""
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Error al leer el MOTD. La excepción fue: {0}"
msgid "Message of the day not available"
msgstr "El mensaje del dia no está disponible"
@@ -4562,6 +4694,8 @@ msgstr "Descargar el cuadro delimitador como GPS raw"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
msgstr ""
+"Descargar la ubicación en la URL (con lat=x&lon=y&zoom=z) como datos GPS en "
+"crudo"
msgid "Select with the given search"
msgstr "Seleccionar dentro de la búsqueda"
@@ -4665,14 +4799,29 @@ msgid "Session"
msgstr "Sesión"
msgid "View"
-msgstr "Vista"
+msgstr "Ver"
msgid "Tools"
msgstr "Herramientas"
+msgid "More tools"
+msgstr "Más herramientas"
+
+msgid "Data"
+msgstr "Datos"
+
+msgid "Selection"
+msgstr "Selección"
+
msgid "Presets"
msgstr "Predefinidos"
+msgid "More..."
+msgstr "Más…"
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Ventanas"
@@ -4690,11 +4839,23 @@ msgstr ""
"Alterna la visibilidad de la barra de herramientas de edición (es decir, la "
"herramienta vertical)"
+msgid "Preset preferences"
+msgstr "Preferencias de los predefinidos"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr "Preferencias de imágenes"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
-msgstr "Ocultar la barra de herramientas"
+msgid "Do not hide toolbar"
+msgstr "No esconder la barra de herramientas"
msgid "Hide this button"
msgstr "Ocultar este botón"
@@ -4702,6 +4863,9 @@ msgstr "Ocultar este botón"
msgid "Click the arrow at the bottom to show it again."
msgstr "Haga clic en la flecha en la parte inferior para mostrar de nuevo."
+msgid "Hide edit toolbar"
+msgstr "Ocultar la barra de herramientas"
+
msgid "Hide or show this toggle button"
msgstr "Botón para ocultar/mostrar"
@@ -4764,6 +4928,9 @@ msgstr "(sin objeto)"
msgid "User:"
msgstr "Usuario:"
+msgid "Do not hide status bar"
+msgstr "No esconder la barra de estado"
+
msgid "Layer not in list."
msgstr "capa no listada"
@@ -4791,21 +4958,6 @@ msgstr "En segundo plano"
msgid "Click to run job in background"
msgstr "Click para ejecutar la tarea en segundo plano"
-msgid "false: the property is explicitly switched off"
-msgstr "falso: la propiedad se encuentra sin marcar"
-
-msgid "true: the property is explicitly switched on"
-msgstr "verdadero: la propiedad se encuentra marcada"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parcial: distintos objetos seleccionados tienen valores diferentes, no "
-"cambiar"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "sin establecer: no agrega esta propiedad a los objetos seleccionados"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4828,21 +4980,21 @@ msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
"relation</strong>.</html>"
msgstr ""
-"<html>Confirme el borrado <strong>1 objeto</strong> de <strong>1 "
+"<html>Confirme el borrado de <strong>1 objeto</strong> de <strong>1 "
"relación</strong>.</html>"
msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
"relations</strong>.</html>"
msgstr ""
-"<html>Confirme el borrado <strong>1 objeto</strong> de <strong>{0} "
+"<html>Confirme el borrado de <strong>1 objeto</strong> de <strong>{0} "
"relaciones</strong>.</html>"
msgid ""
"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
"relations</strong>.</html>"
msgstr ""
-"<html>Confirme el borrado <strong>{0} objetos</strong> de <strong>{1} "
+"<html>Confirme el borrado de <strong>{0} objetos</strong> de <strong>{1} "
"relaciones</strong>.</html>"
msgid "Deleting {0} object"
@@ -4857,10 +5009,10 @@ msgid "To delete"
msgstr "A borrar"
msgid "From Relation"
-msgstr "Desde la relación"
+msgstr "De la relación"
msgid "Pos."
-msgstr "Pos."
+msgstr "Posisión"
msgid "Role"
msgstr "Función"
@@ -5129,6 +5281,9 @@ msgstr ""
"Copiar mis elementos seleccionados al final de la lista de elementos "
"fusionados"
+msgid "> before"
+msgstr "> antes"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5136,6 +5291,9 @@ msgstr ""
"Copiar mis elementos seleccionados antes del primer elemento seleccionado en "
"la lista de elementos fusionados"
+msgid "> after"
+msgstr "> después"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5143,17 +5301,26 @@ msgstr ""
"Copiar mis elementos seleccionados después del primer elemento seleccionado "
"en la lista de elementos fusionados"
+msgid "< top"
+msgstr "< encima"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Copiar su elemento seleccionado al inicio de la lista de elementos fusionados"
+msgid "< bottom"
+msgstr "< debajo"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Copiar sus elementos seleccionados al final de la lista de elementos "
"fusionados"
+msgid "< before"
+msgstr "< antes"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5161,6 +5328,9 @@ msgstr ""
"Copiar sus elementos seleccionados antes del primer elemento seleccionado en "
"la lista de elementos fusionados"
+msgid "< after"
+msgstr "< después"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5177,8 +5347,8 @@ msgstr "Copiar todos sus elementos al destino"
msgid "Up"
msgstr "Subir"
-msgid "Move up the selected elements by one position."
-msgstr "Subir los elementos seleccionados una posición"
+msgid "Move up the selected entries by one position."
+msgstr "Mueva las entradas seleccionadas de a una posición."
msgid "Down"
msgstr "Bajar"
@@ -5234,18 +5404,8 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Su versión ({0} ingresada)"
msgstr[1] "Su versión ({0} ingresadas)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Ajustable {0} no registrado aún. No se puede configurar la participación en "
-"el ajuste sincronizado."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "El componente personalizable {0} no está registrado."
-
-msgid "Node"
-msgstr "Nodo"
+msgid "Node"
+msgstr "Nodo"
msgid "Merged nodes not frozen yet. Cannot build resolution command."
msgstr ""
@@ -5391,7 +5551,17 @@ msgid_plural ""
"are shown a dialog to decide how to adapt the relations.<br/><br/>Do you "
"want to continue?"
msgstr[0] ""
+"Está a punto de combinar {1} objetos, los cuales forman parte de {0} "
+"relación:<br/>{2}Combinando estos objetos puede romper esta relación. Si no "
+"está seguro, por favor cancele esta operación.<br/> Si desea continuar, se "
+"le muestra un cuadro de diálogo para decidir cómo adaptar la "
+"relación.<br/><br/>¿Desea continuar?"
msgstr[1] ""
+"Está a punto de combinar objetos {1}, los cuales forman parte de las {0} "
+"relaciones:<br/>{2}Combinando estos objetos puede romper estas relaciones. "
+"Si no está seguro, por favor cancele esta operación.<br/> Si desea "
+"continuar, se le muestra un cuadro de diálogo para decidir cómo adaptar las "
+"relaciones.<br/><br/>¿Desea continuar?"
msgid "Combine confirmation"
msgstr "Confirmar conbinacion"
@@ -5400,7 +5570,7 @@ msgid ", "
msgstr ", "
msgid "<i>missing</i>"
-msgstr ""
+msgstr "<i>falta</i>"
msgid ""
"You are about to combine {0} objects, but the following tags are used "
@@ -5408,6 +5578,11 @@ msgid ""
"may have unwanted tags.<br/>If you want to continue, you are shown a dialog "
"to fix the conflicting tags.<br/><br/>Do you want to continue?"
msgstr ""
+"Estás a punto de combinar objetos {0} pero las siguientes etiquetas se "
+"utilizan de manera conflictiva:<br/> {1} Si estos objetos se combinan en el "
+"objeto resultante podrá haber etiquetas no deseadas.<br/> Si desea continuar "
+"se le muestra un cuadro de diálogo para solucionar este conflicto "
+"etiquetas.<br/><br/>¿Desea continuar?"
msgid "none"
msgstr "ninguno"
@@ -5512,18 +5687,18 @@ msgctxt "tag"
msgid "Key:"
msgstr "Clave:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Asigne un valor a la clave, por ejemplo. "
-"<strong><tt>fixme</tt></strong></html>"
+"<html>Ingrese una etiqueta aquí, por "
+"ejemplo<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valor:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Asigne un valor al atributo, por ejemplo i.e. <strong><tt>comprobar "
+"<html>Ingrese una etiqueta aquí, por ejemplo <strong><tt>verificar "
"miembros</tt></strong></html>"
msgid ""
@@ -5596,7 +5771,7 @@ msgstr "Abrir la lista de modificaciones de la capa actual."
msgid "Select all objects assigned to the currently selected changesets"
msgstr ""
-"Selecciona todos los objetos asignados a las modificaciones seleccionadas"
+"Selecciona todos los objetos asignados a las modificaciones seleccionadas."
msgid "Download"
msgstr "Descargar"
@@ -5639,12 +5814,14 @@ msgstr ""
"borrados)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Seleccionar y magnificar"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Seleccinoa los objetos que toman parte en este comando (salvo que hayan sido "
+"eliminados) y hacer zoom sobre ellos"
msgid "Undo the selected and all later commands"
msgstr "Deshace el comando seleccionado y todos los posteriores"
@@ -5909,7 +6086,7 @@ msgid "Bounding box: "
msgstr "Cuadro delimitador: "
msgid "Bounding box (projected): "
-msgstr ""
+msgstr "Recuadro de borde (proyectado): "
msgid "Coordinates: "
msgstr "Coordenadas: "
@@ -6112,6 +6289,9 @@ msgstr "Mostrar/Ocultar"
msgid "Information about layer"
msgstr "Información de capa"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Estilos de semiología cartográfica"
@@ -6123,8 +6303,8 @@ msgstr "MapPaint"
msgid "Reloading {0} map style."
msgid_plural "Reloading {0} map styles."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Recargando {0} estilo de mapa."
+msgstr[1] "Recargando {0} estilos de mapa."
msgid "On/Off"
msgstr "Si/No"
@@ -6151,10 +6331,10 @@ msgid "Save a copy of this Style to file and add it to the list"
msgstr "Guarda una copia de este Estilo a un archivo y lo añade a la lista"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "Archivo de estilo de representación de mapa (*.mapcss, *.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "Archivo de estilo de representación de mapa (*.xml, *.zip)"
msgid "Reloading style sources"
msgstr "Volviendo a cargar fuentes de estilos"
@@ -6195,6 +6375,36 @@ msgstr "¿Está activo actualmente el estilo?"
msgid "No"
msgstr "No"
+msgid "Object type:"
+msgstr "Tipo de objeto:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "mixto"
+
+msgid "Choose the OSM object type"
+msgstr "Elija el tipo de objeto de OSM"
+
+msgid "Object ID:"
+msgstr "ID del objeto:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Introduzca la ID del objeto que debe ser descargado"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Los ID de los objetos puede separarse por comas o espacios.<br/> Ejemplos: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En el modo mixto "
+"especifique objetos de esta forma: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relaciones"
@@ -6202,7 +6412,7 @@ msgid "Open a list of all relations."
msgstr "Abrir una lista de todas las relaciones."
msgid "Relation list filter"
-msgstr ""
+msgstr "Filtro de lista de relaciones"
msgid "Create a new relation"
msgstr "Crear una nueva relación"
@@ -6211,14 +6421,11 @@ msgid "New"
msgstr "Nuevo"
msgid "Relations: {0}/{1}"
-msgstr ""
+msgstr "Relaciones: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relaciones: {0}"
-msgid "Selection"
-msgstr "Selección"
-
msgid "Open a selection list window."
msgstr "Abrir una ventana de selección."
@@ -6238,28 +6445,16 @@ msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
msgid "Unselectable now"
-msgstr ""
+msgstr "No se puede seleccionar en este momento"
msgid "Selection: {0}"
msgstr "Selección: {0}"
-msgid "Side buttons"
-msgstr "Botones laterales"
-
-msgid "Always shown"
-msgstr "Mostrar siempre"
-
-msgid "Dynamic"
-msgstr "Dinámico"
-
-msgid "Always hidden"
-msgstr "Siempre oculto"
-
msgid "Toggle dynamic buttons"
msgstr "Conmutar botones dinámicos"
msgid "Open preferences for this panel"
-msgstr ""
+msgstr "Abrir preferencias para este panel"
msgid "Undock the panel"
msgstr "Desacoplar el panel"
@@ -6273,6 +6468,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Haga click para minimizar/maximizar el contenido del panel"
+msgid "Side buttons"
+msgstr "Botones laterales"
+
+msgid "Always shown"
+msgstr "Mostrar siempre"
+
+msgid "Dynamic"
+msgstr "Dinámico"
+
+msgid "Always hidden"
+msgstr "Siempre oculto"
+
msgid "Authors"
msgstr "Autores"
@@ -6290,11 +6497,10 @@ msgstr "Elegir objetos enviados por este usuario"
msgid "Launches a browser with information about the user"
msgstr "Lanza un buscador con información sobre el usuario"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Aviso: sólo se mostrará información para el primero {0} de {1} usuarios "
-"seleccionados"
+"Únicamente lanzar navegadores de información para los primeros {0} de {1} "
+"usuarios seleccionados"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6321,9 +6527,6 @@ msgstr "Abrir la ventana de validación"
msgid "Validation results"
msgstr "Resultados de la validación"
-msgid "Zoom to problem"
-msgstr "Zoom al problema"
-
msgid "Fix"
msgstr "Corregir"
@@ -6477,9 +6680,6 @@ msgstr "Actualizar contenido"
msgid "Update the changeset content from the OSM server"
msgstr "Actualiza el contenido del conjunto de cambios desde el servidor OSM"
-msgid "Show history"
-msgstr "Mostrar historial"
-
msgid "Download and show the history of the selected objects"
msgstr "Descarga y muestra el historial de los objetos seleccionados"
@@ -6791,10 +6991,10 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
-"<html>Por favor elija una de las siguientes <strong>búsquedas "
+"<html>Por favor, elija una de las siguientes <strong>búsquedas "
"estándar</strong>. Si solamente desea descargar conjuntos de cambios creados "
"por usted, seleccione <strong>Descargar solamente mi conjunto de "
-"cambios</strong>.<br>Tenga en cuenta que JOSM descargará máximo 100 "
+"cambios</strong>.<br>Tenga en cuenta que JOSM descargará un máximo 100 "
"conjuntos de cambios.</html>"
msgid "<html>Download the latest changesets</html>"
@@ -6823,11 +7023,11 @@ msgstr ""
"<html>Descargar conjuntos de cambios en la vista actual de mapa</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Advertencia: hay un valor inesperado para la preferencia \"{0}\", era "
-"\"{1}\". De vuelta a la cadena de búsqueda predeterminada."
+"Valor no esperado para la preferencia ''{0}'', se obtuvo ''{1}''. "
+"Restableciendo a consulta por defecto."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6898,35 +7098,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "La URL de consulta de modificaciones no es válida"
-msgid "Select objects for which to change properties."
-msgstr "Seleccione los objetos a los que cambiar las propiedades."
+msgid "Discardable key: selection Foreground"
+msgstr "Clave descartable: selección de Frente"
-msgid "Properties/Memberships"
-msgstr "Propiedades/Relaciones"
+msgid "Discardable key: selection Background"
+msgstr "Discardable key: selección de Fondo"
-msgid "Properties for selected objects."
-msgstr "Propiedades de los objetos seleccionados."
+msgid "Discardable key: foreground"
+msgstr "Clave descartable: frente"
+
+msgid "Discardable key: background"
+msgstr "Clave descartable: fondo"
msgid "<different>"
msgstr "<diferente>"
+msgid "Select objects for which to change tags."
+msgstr "Seleccione los objetos a los que cambiar las etiquetas."
+
+msgid "Tags/Memberships"
+msgstr "Etiquetas/Miembros"
+
+msgid "Tags for selected objects."
+msgstr "Etiquetas para los objetos seleccionados."
+
msgid "Member Of"
msgstr "Miembro de"
msgid "Position"
msgstr "Posición"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propiedades: {0} / Miembros: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Etiquetas: {0} / Miembros: {1}"
-msgid "Properties / Memberships"
-msgstr "Propiedades / Miembros"
+msgid "Tags / Memberships"
+msgstr "Etiquetas / Miembros"
msgid "Delete the selected key in all objects"
msgstr "Borrar la clave seleccionada en todos los objetos"
-msgid "Delete Properties"
-msgstr "Eliminar propiedades"
+msgid "Delete Tags"
+msgstr "Eliminar Etiquetas"
msgid "Change relation"
msgstr "Cambiar relación"
@@ -6940,14 +7152,14 @@ msgstr "¿Seguro de eliminar la selección de la relación {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
-msgid "Add Property"
-msgstr "Añadir Propiedad"
+msgid "Add Tag"
+msgstr "Añadir etiqueta"
msgid "Edit the value of the selected key for all objects"
msgstr "Editar el valor de la clave seleccionada para todos los objetos"
-msgid "Edit Properties"
-msgstr "Editar Propiedades"
+msgid "Edit Tags"
+msgstr "Editar Etiquetas"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Ir a la wiki de OSM para ayuda sobre cómo etiquetar (F1)"
@@ -6956,10 +7168,10 @@ msgid "Launch browser with wiki help for selected object"
msgstr "Inicia el navegador con ayuda de la wiki para el objeto seleccionado"
msgid "Paste Value"
-msgstr ""
+msgstr "Pegar Valor"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "Pegar el valor de la etiqueta seleccionada desde el portapapeles"
msgid "Copy Value"
msgstr "Copiar valor"
@@ -7028,13 +7240,7 @@ msgstr[0] "Cambiar las propiedades de hasta {0} objeto"
msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
msgid "Use English language for tag by default"
-msgstr ""
-
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
+msgstr "Usar el idioma Inglés para la etiqueta por defecto"
msgid "Add value?"
msgstr "¿Añadir valor?"
@@ -7051,25 +7257,32 @@ msgid "Please select a value"
msgstr "Por favor, selecciona un valor"
msgid "Set number of recently added tags"
-msgstr ""
+msgstr "Establecer el número de etiquetas añadidas recientemente"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Recordar últimas etiquetas usadas"
msgid "Please enter the number of recently added tags to display"
msgstr ""
+"Por favor, introduzca el número de etiquetas añadidas recientemente a mostrar"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "Por favor, introduzca un número entero entre 0 y {0}"
msgid "Recently added tags"
msgstr "Etiquetas añadidas recientemente"
+msgid "Choose recent tag {0}"
+msgstr "Escoger etiqueta reciente {0}"
+
msgid "Use this tag again"
msgstr "Utilizar esta etiqueta de nuevo"
+msgid "Apply recent tag {0}"
+msgstr "Aplicar etiqueta reciente {0}"
+
msgid "The key ''{0}'' is already used"
-msgstr ""
+msgstr "La clave ''{0}'' está actualmente en uso"
msgid "Edit the relation the currently selected relation member refers to."
msgstr ""
@@ -7109,10 +7322,8 @@ msgstr "La relación se ha borrado"
msgid "Downloading relation {0}"
msgstr "Descargando relación {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Atención: se ingorará la excepción porque la tarea fue cancelada. Excepción: "
-"{0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Omitiendo la excepción porque la tarea fue cancelada. Excepción: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7177,6 +7388,11 @@ msgstr "Eliminarlas, limpiar la relación"
msgid "Ignore them, leave relation as is"
msgstr "Ignorarlas, dejar la relación como está"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Disculpe, no se puede habilitar el atajo \"{0}\" en el diálogo del editor de "
+"Relaciones"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7402,22 +7618,25 @@ msgstr ""
"están incluidos en la capa actual"
msgid "Select previous Gap"
-msgstr ""
+msgstr "Seleccionar la interrupción anterior"
msgid "Select the previous relation member which gives rise to a gap"
msgstr ""
+"Selecciona al miembro anterior de la relación que da lugar a una interrupción"
msgid "Select next Gap"
-msgstr ""
+msgstr "Seleccionar la interrupción siguiente"
msgid "Select the next relation member which gives rise to a gap"
msgstr ""
+"Selecciona al miembro siguiente de la relación que da lugar a una "
+"interrupción"
msgid "Zoom to Gap"
-msgstr "Zoom al hueco"
+msgstr "Zoom a la interrupción"
msgid "Zoom to the gap in the way sequence"
-msgstr "Zoom al hueco en la secuencia de la vía."
+msgstr "Zoom al interrupción en la secuencia de la vía."
msgid "Refers to"
msgstr "Se refiere a"
@@ -7468,6 +7687,29 @@ msgid "way is not connected to previous or next relation member"
msgstr ""
"la vía no está conectada a los miembros anterior o posterior de la relación"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Numero de argumentos erróneos para el marcados"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Error al leer la entrada del marcador: $s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Línea ''{0}'' no esperada en el archivo de favoritos ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Valor tipo doble ''{0}'' no permitido en la línea ''{1}'' del archivo de "
+"favoritos ''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>No se pueden leer los marcadores desde<br>''{0}''<br>El error fue: "
+"{1}</html>"
+
msgid "Bookmarks"
msgstr "Marcadores"
@@ -7538,9 +7780,6 @@ msgstr "Para la latitud se requiere un valor en el rango [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "Para la longitud se requiere un valor en el rango [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Pegar URL del portapapeles"
-
msgid "Data Sources and Types:"
msgstr "Fuentes y tipos de datos:"
@@ -7573,6 +7812,9 @@ msgid ""
"<html>Autostart ''Download from OSM'' dialog every time JOSM is "
"started.<br>You can open it manually from File menu or toolbar.</html>"
msgstr ""
+"<html>Iniciar automáticamente el diálogo \"Descargar desde OSM\" cada vez "
+"que se inicia JOSM.<br>Puede abrirlo manualmente del menú Archivo o desde la "
+"barra de herramientas.</html>"
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -7618,21 +7860,8 @@ msgstr "Descargar referentes (relaciones padre)"
msgid "Download object"
msgstr "Descargar objeto"
-msgid "Object type:"
-msgstr "Tipo de objeto:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "mixto"
-
-msgid "Choose the OSM object type"
-msgstr "Elija el tipo de objeto de OSM"
-
-msgid "Object ID:"
-msgstr "ID del objeto:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Introduzca la ID del objeto que debe ser descargado"
+msgid "Start downloading"
+msgstr "Iniciar descarga"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7644,28 +7873,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Elegir si los miembros de una relación también habrán de descargarse"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Los ID de los objetos puede separarse por comas o espacios.<br/> Ejemplos: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> En el modo mixto "
-"especifique objetos de esta forma: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Descargar referentes (relaciones y vías padre)"
-msgid "Start downloading"
-msgstr "Iniciar descarga"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Lista de ID especificada inválida\n"
-"No se puede descargar el objeto"
-
msgid "Class Type"
msgstr "Tipo de clase"
@@ -7779,9 +7989,8 @@ msgstr "Ir a la página siguiente"
msgid "Go to the JOSM help home page"
msgstr "Ir a la página de ayuda de JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
-"Advertencia: ubicación incorrecta en el documento HTML. La excepción fue: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Mala ubicación en el documento HTML. La excepción fue: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "No se pudo abrir la página de ayuda. La URL de destino está vacía."
@@ -7892,6 +8101,9 @@ msgid ""
msgstr ""
"<html>Versión <strong>{0}</strong> creada el <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Información del conjunto de cambios"
@@ -8003,10 +8215,9 @@ msgstr ""
msgid "Object still in use"
msgstr "El objeto todavía está en uso."
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Atención: la cabecera de error \"{0}\" no coincide con ninguno de los "
-"patrones esperados."
+"El encabezado de erro \"{0}\" no concuerda con ningún patrón esperado"
msgid "Upload"
msgstr "Subir"
@@ -8017,6 +8228,10 @@ msgid ""
"server.<br/>Check \"Save\" to save the layer to the file specified on the "
"left.</html>"
msgstr ""
+"<html>Seleccionar qué acciones se ejecutarán para esta capa al hacer clic en "
+"el botón de la izquierda.<br/>Tilde la opción \"subir\" para publicar los "
+"cambios en el servidor OSM.<br/>Tilde la opción \"Guardar\" para guardar la "
+"capa en el archivo especificado a la izquierda.</html>"
msgid "Provide a brief comment for the changes you are uploading:"
msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:"
@@ -8024,6 +8239,12 @@ msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:"
msgid "Enter an upload comment"
msgstr "Introduzca un comentario de subida"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "id del conjunto de cambios:"
@@ -8095,11 +8316,10 @@ msgid "Closing changeset {0}"
msgstr "Cerrando conjunto de cambios {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Atención: error al poner el Diálogo de Credenciales siempre encima. Se "
-"atrapó una excepción de seguridad."
+"Hubo una falla al poner el Diálogo de Credenciales al tope de todo. Se "
+"alcanzó una excepción de seguridad."
msgid "Enter credentials for OSM API"
msgstr "Introduzca las credenciales para la API de OSM"
@@ -8182,12 +8402,14 @@ msgid "Download finished"
msgstr "Descarga completa"
msgid "Unpacking {0} into {1}"
-msgstr ""
+msgstr "Desempaquetando {0} de {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
+"No se puede descargar el archivo ''{0}''. Este enlace de descarga ''{1}'' no "
+"es una URL válida. Omitiendo descarga."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8204,11 +8426,10 @@ msgid "Missing user identity"
msgstr "Identidad de usuario perdida"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Atención: No se pudo recuperar la información de usuario para el usuario de "
-"JOSM actual. La excepción fue: {0}"
+"No se pudo recuperar la información de usuario para el usuario actual de "
+"JOSM. La excepción fue: {0}"
msgid "Download objects"
msgstr "Descargar objetos"
@@ -8226,9 +8447,11 @@ msgid ""
"Either edit the path manually in the text field or click the \"...\" button "
"to open a file chooser."
msgstr ""
+"Edite la ruta manualmente en la caja de texto o haga clic en el botón "
+"\"...\" para que se abra un selector de archivo."
msgid "The bold text is the name of the layer."
-msgstr ""
+msgstr "El texto en negritas correspnode al nombre de la capa"
msgid "Click here to choose save path"
msgstr "Haga clic aquí para guardar el dibujo"
@@ -8240,7 +8463,7 @@ msgid "File ''{0}'' is not writable. Please enter another file name."
msgstr "El archivo \"{0}\" no es modificable. Elija otro nombre de archivo."
msgid "Click cell to change the file path."
-msgstr ""
+msgstr "Haga clic en la celda para cambiar la ruta del archivo"
msgid "Open Recent"
msgstr "Abrir reciente"
@@ -8373,7 +8596,7 @@ msgid "should be uploaded"
msgstr "debe subirse"
msgid "should be saved"
-msgstr ""
+msgstr "debería ser guardado"
msgid ""
"Layer ''{0}'' has modifications which should be uploaded to the server."
@@ -8382,6 +8605,7 @@ msgstr ""
msgid "Layer ''{0}'' has modifications which are discouraged to be uploaded."
msgstr ""
+"La capa \"{0}\" contiene modificaciones que no se recomienda que sean subidas"
msgid "Layer ''{0}'' has no modifications to be uploaded."
msgstr "La capa \"{0}\" no tiene modificaciones para subir al servidor."
@@ -8450,12 +8674,6 @@ msgstr "Subir las primitivas que se han cambiado"
msgid "Please revise upload comment"
msgstr "Por favor revise el comentario de subida"
-msgid "Revise"
-msgstr "Revisar"
-
-msgid "Continue as is"
-msgstr "Continuar como está"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8471,6 +8689,22 @@ msgstr ""
"<b>Si emplea un minuto para explicar brevemente su edición hará la vida más "
"sencilla a muchos otros \"mapeadores\"</b>."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Revisar"
+
+msgid "Continue as is"
+msgstr "Continuar como está"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Volver al diálogo anterior para incluir un comentario más descriptivo"
@@ -8487,6 +8721,25 @@ msgstr "Por favor, introduzca primero un tamaño de elemento válido"
msgid "Illegal chunk size"
msgstr "Tamaño de fragmento ilegal"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>La siguiente etiqueta de cambios contiene una clave/valor "
+"vacía:<br>{0}<br>Continuar?</html>"
+msgstr[1] ""
+"<html>Las siguientes etiquetas de cambios contienen clave/valor "
+"vacíos:<br>{0}<br>Continuar?</html>"
+
+msgid "Empty metadata"
+msgstr "Metadatos vacío"
+
msgid "Cancel the upload and resume editing"
msgstr "Cancelar la carga y reanudar la edición"
@@ -8494,11 +8747,11 @@ msgid "Tags of changeset {0}"
msgstr "Etiquetas del conjunto de cambios {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Advertencia: El objeto \"{0}\" ya ha sido borrado del servidor. Omitiendo "
-"este objeto y reintentando subir."
+"El objeto ''{0}'' ya ha sido eliminado en el servidor. Omitiendo este objeto "
+"y reintentando cargar."
msgid "Preparing objects to upload ..."
msgstr "Preparando los objetos a subir..."
@@ -8627,21 +8880,18 @@ msgid "Changeset is full"
msgstr "El conjunto de cambios está lleno"
msgid "Node ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Nodo ''{0}'' está eliminado. Omitiendo objeto en la subida."
msgid "Way ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Vía ''{0}'' está elimada. Omitiendo objeto en la subida."
msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Relación ''{0}'' está eliminada. Omitiendo en la subida."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
"El objeto \"{0}\" ya ha sido borrado. Se omite el objeto en la subida."
-msgid "Warning: {0}"
-msgstr "Advertencia: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Subiendo {0} objeto..."
@@ -8653,6 +8903,9 @@ msgstr ""
"Se ignora la excepción capturada debido a que se ha cancelado la subida. La "
"excepción es: {0}"
+msgid "Upload successful!"
+msgstr "¡Subida exitosa!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8673,10 +8926,9 @@ msgstr "Elelegir objetos a subir"
msgid "Cancel uploading"
msgstr "Cancelar subida"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Advertencia: valor inesperado para la clave \"{0}\" en preferencias, se "
-"obtuvo \"{1}\""
+"Valor no esperado para la clave ''{0}'' en las preferencias, tiene ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Por favor, selecciona la estrategia de subida:"
@@ -8829,7 +9081,7 @@ msgstr "Siguiente marcador"
msgid "Jump to next marker"
msgstr "Saltar al siguiente marcador"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Marcador anterior"
msgid "Jump to previous marker"
@@ -8862,9 +9114,8 @@ msgstr "versión {0}"
msgid "Merging layers"
msgstr "Combinar capas"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Advertencia: mezclar datos de 0.5 y 0.6 da como resultado la versión 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Mezclando resultados de los datos 0.6 y 0.5 en la versión 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8881,7 +9132,7 @@ msgid "API version: {0}"
msgstr "Versión del API: {0}"
msgid "Upload is discouraged"
-msgstr ""
+msgstr "No se recomienda la subida"
msgid "Convert to GPX layer"
msgstr "Convertir a capa GPX"
@@ -8985,6 +9236,9 @@ msgstr "incrementa el nivel de zoom para ver más detalles"
msgid "No tiles at this zoom level"
msgstr "No hay teselas a este nivel de zoom"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "Capa TMS ({0}), descargando en nivel de acercamiento {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "Compatble con EPSG:4326 y la proyección de Mercator"
@@ -9024,6 +9278,9 @@ msgstr "Recargar teselas erróneas"
msgid "Alpha channel"
msgstr "Canal alfa"
+msgid "Automatically change resolution"
+msgstr "Cambiar la resolución de forma autmoática"
+
msgid "Set WMS Bookmark"
msgstr "Fijar marcador WMS"
@@ -9137,7 +9394,7 @@ msgid "Timezone: "
msgstr "Zona horaria: "
msgid "Offset:"
-msgstr "Ajuste:"
+msgstr "Desplazamiento:"
msgid "Correlate images with GPX track"
msgstr "Correlacionar las imágenes con la traza GPX"
@@ -9240,9 +9497,6 @@ msgstr "Extrayendo localizaciones GPS del EXIF"
msgid "Starting directory scan"
msgstr "Iniciando escaneo del directorio"
-msgid "One of the selected files was null"
-msgstr "Uno de los archivos seleccionados era nulo"
-
msgid "Read photos..."
msgstr "Leyendo fotos..."
@@ -9261,6 +9515,9 @@ msgstr "Encontrado archivo nulo en el directorio {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Error mientras se obtenían archivos del directorio {0}\n"
+msgid "One of the selected files was null"
+msgstr "Uno de los archivos seleccionados era nulo"
+
msgid "Geotagged Images"
msgstr "Imagenes Geoetiquetadas"
@@ -9320,6 +9577,12 @@ msgstr "Siguiente"
msgid "Show next Image"
msgstr "Mostrar imagen siguiente"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centrar vista"
@@ -9354,6 +9617,8 @@ msgid ""
"\n"
"EXIF time: {0}"
msgstr ""
+"\n"
+"Tiempo de EXIF: {0}"
msgid ""
"\n"
@@ -9369,7 +9634,7 @@ msgid "Choose visible tracks"
msgstr "Elegir trazas visibles"
msgid "Select by date"
-msgstr ""
+msgstr "Seleccionar por fecha"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -9400,23 +9665,23 @@ msgstr ""
"<html>Se considera dañino subir datos GPS sin procesar como datos de mapa. "
"<br>Si desea subir trazas, ver:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces (EN)"
-
msgid "Customize track drawing"
msgstr "Personalizar la representación de la traza"
msgid "From"
-msgstr ""
+msgstr "Desde"
msgid "To"
-msgstr ""
+msgstr "Hasta"
msgid "No timestamp"
msgstr "No hay fecha y hora"
-msgid "Download from OSM along this track"
-msgstr "Descargar datos de OSM a lo largo de esta traza"
+msgid "Select to download OSM data."
+msgstr "Seleccione para descargar los datos OSM"
+
+msgid "Select to download GPS traces."
+msgstr "Seleccione para descargar las trazas GPS"
msgid "Download everything within:"
msgstr "Descargar todo entre:"
@@ -9442,16 +9707,18 @@ msgstr "Solamente puntos de vía"
msgid "track and waypoints"
msgstr "trazas y puntos de vía"
+msgid "Click to download"
+msgstr "Haga clic para descargar"
+
+msgid "Click to cancel"
+msgstr "Haga clic para cancelar"
+
+msgid "Download from OSM along this track"
+msgstr "Descargar datos de OSM a lo largo de esta traza"
+
msgid "Calculating Download Area"
msgstr "Calculando área a descargar"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Esta acción requiere {0} peticiones<br>individuales de "
-"descarga.<br¿Desea continuar?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Precargar las imágenes de fondo a lo largo de esta pista."
@@ -9598,17 +9865,12 @@ msgstr ""
msgid "(URL was: "
msgstr "(La URL era: "
-msgid "Error displaying URL"
-msgstr "Error mostrando la URL"
-
msgid "Select the map painting styles"
msgstr "Seleciones Estilo de MAPa de imagenes"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Advertencia: Fallo al cargar estilos Mappaint de \"{0}\". La excepción fue: "
-"{1}"
+"Error al cargar los estilos Mappaint desde ''{0}''. La excepción fue: {1}"
msgid "loading style ''{0}''..."
msgstr "cargando estilo ''{0}''..."
@@ -9627,10 +9889,9 @@ msgstr[1] ""
"en el menú emergente al pulsar con el botón derecho del ratón para más "
"detalles."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Atención: fallo al analizar sintácticamente los estilos Mappaint desde "
-"''{0}''. El error fue: {1}"
+"Error al analizar los estilos Mappaint desde ''{0}''. El error fue: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Patrón de guiones ilegal, los valores deben ser positivos"
@@ -9639,11 +9900,10 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Patrón de guiones ilegal, por lo menos un valor debe ser > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Atención: fallo al analizar sintácticamente los estilos Mappaint desde "
-"''{0}''. El error fue: [{1}:{2}] {3}"
+"Error al analizar los estilos Mappaint desde ''{0}''. El error fue: "
+"[{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Llave de acceso:"
@@ -9917,8 +10177,8 @@ msgstr "Cerrar el diálogo y cancelar autorización"
msgid "Close the dialog and accept the Access Token"
msgstr "Cerrar el diálogo y aceptar la llave de Autorización"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Advertencia: falló la cancelación de la operación OAuth"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Error al cancelar la operación de OAuth ejecutandose"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Obteniendo Llave de solicitud OAuth de \"{0}\""
@@ -9996,6 +10256,12 @@ msgstr ""
"Seleccionar para permitir que JOSM tenga permiso para escribir sus "
"preferencias de servidor"
+msgid "Allow modifications of notes"
+msgstr "Permitir la modificación de notas"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Seleccione para garantizar a JOSM que modificará notas de su parte."
+
msgid "Retrieving OAuth Access Token..."
msgstr "Obteniendo llave de Acceso OAuth..."
@@ -10068,9 +10334,6 @@ msgstr ""
"para autentificarse y autorizarse en el servidor OSM.<br><br>La credencial "
"de autentificación de acceso es: </html>"
-msgid "Restart"
-msgstr "Reiniciar"
-
msgid "Click to retrieve a Request Token"
msgstr "Presione para obtener una llave de Solicitud"
@@ -10111,6 +10374,10 @@ msgid ""
"not<br>be able to access any protected resource on this server using this "
"token.</html>"
msgstr ""
+"<html>Falla al acceder al servidor OSM \"{0}''<br> con la Ficha de Acceso "
+"''{1}''.<br>El servidor rechazó la Ficha de Acceso debido a que la misma no "
+"posee autorización. No podrá <br>acceder a ningún recurso protegido en este "
+"servidor utilizando dicha ficha.</html>"
msgid "Test failed"
msgstr "Falló la prueba"
@@ -10321,8 +10588,8 @@ msgid ""
"All installed plugins are up to date. JOSM does not have to download newer "
"versions."
msgstr ""
-"Todos los complementos están actualizados. JOSM no tiene descargas de "
-"versiones nuevas."
+"Todos los complementos se encuentran actualizados. JOSM no tiene descargas "
+"de versiones nuevas."
msgid "Plugins up to date"
msgstr "Complementos actualizados"
@@ -10364,6 +10631,9 @@ msgstr "Descargar complementos"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Debe reiniciar JOSM para que las preferencias tengan efecto."
+msgid "Would you like to restart now?"
+msgstr "¿Desea reiniciar ahora?"
+
msgid "Remote Control"
msgstr "Control Remoto"
@@ -10429,13 +10699,13 @@ msgid "Webpage:"
msgstr "Paguina Web:"
msgid "Description:"
-msgstr ""
+msgstr "Descripción:"
msgid "Version:"
msgstr "Versión:"
msgid "Minimum JOSM Version:"
-msgstr ""
+msgstr "Versión Mínima de JOSM:"
msgid "by {0}"
msgstr "Por {0}"
@@ -10450,25 +10720,27 @@ msgid "active"
msgstr "activo"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr ""
+msgstr "Archivo de estilo de representación de mapa (*.xml, *.mapcss, *.zip)"
msgid "Preset definition file (*.xml, *.zip)"
-msgstr ""
+msgstr "Archivo de definiciones prefijadas (*.xml, *.zip)"
msgid "Edit source entry:"
msgstr "Editar entrada fuente:"
msgid "Entry ''{0}'' requires JOSM Version {1}. (Currently running: {2})"
msgstr ""
+"Entrada ''{0}'' requiere la Versión {1} de JOSM. (Actualmente en ejecución: "
+"{2})"
msgid "Continue anyway"
-msgstr ""
+msgstr "Continuar de todos modos"
msgid "Ignore warning and install style anyway"
-msgstr ""
+msgstr "Ignorar advertencia e instalar estilo de todos modos"
msgid "Some entries have unmet dependencies:"
-msgstr ""
+msgstr "Algunas entradas tienen dependencias incumplidas:"
msgid "Reset"
msgstr "Reiniciar"
@@ -10497,6 +10769,12 @@ msgstr "Eliminar de la barra de herramientas"
msgid "Configure toolbar"
msgstr "Configurar barra de herramientas"
+msgid "Edit shortcut"
+msgstr "Editar atajo"
+
+msgid "Do not hide toolbar and menu"
+msgstr "No esconder la barra de herramientas ni el menú"
+
msgid "Actions"
msgstr "Acciones"
@@ -10540,6 +10818,9 @@ msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
"Acción {0} de barra de herramientas registrada sobreescrita: {1} obtiene {2}"
+msgid "Toolbar: {0}"
+msgstr "Barra de herramientas: {0}"
+
msgid "Data validator"
msgstr "Validador de datos"
@@ -10595,73 +10876,85 @@ msgstr "Buscar: "
msgid "Read from file"
msgstr "Leer desde archivo"
-msgid "Open JOSM customization file"
-msgstr "Abrir JOSM para personalizar Archivo"
-
-msgid "Import log"
-msgstr "Importar Registro"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
msgid "Export selected items"
msgstr "Exportar elementos seleccionados"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Archivos de parametrizaciones personalizadas (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
+"Por favor seleccione algunas claves de preferencias no marcadas por defecto"
msgid "Export preferences keys to JOSM customization file"
msgstr ""
+"Exportar las claves de preferencias al archivo de personalización JOSM"
msgid "What to do with preference lists when this file is to be imported?"
msgstr ""
+"¿Qué desea hacer con las listas de preferencias cuando el archivo sea "
+"importado?"
msgid "Append preferences from file to existing values"
-msgstr ""
+msgstr "Anexar las preferencias del archivo a los valores existentes"
msgid "Replace existing values"
-msgstr ""
+msgstr "Reemplazar los valores existentes"
-msgid "JOSM custom settings files (*.xml)"
-msgstr ""
+msgid "Open JOSM customization file"
+msgstr "Abrir JOSM para personalizar Archivo"
-msgid "Advanced Background: Changed"
-msgstr ""
+msgid "Import log"
+msgstr "Importar Registro"
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
+"<html>Aquí se encuentra el resumen de importación del archivo. <br/>Puede "
+"descargar los cambios a las preferencias oprimiendo \"Cancelar\" en el "
+"diálogo de Preferencias<br/>Algunos cambios requieren una reinicialización "
+"de JOSM para surtir efecto.</html>"
-msgid "Current value is default."
-msgstr "El valor actual es el valor por defecto"
+msgid "shortcut"
+msgstr "atajo"
-msgid "Default value is ''{0}''."
-msgstr "El valor por defecto ''{0}''."
+msgid "color"
+msgstr "color"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"El valor por defecto se desconoce actualmente (la propiedad no ha sido usada "
-"todavía)."
+msgid "toolbar"
+msgstr "barra de herramientas"
-msgid "Select Setting Type:"
-msgstr "Seleccione el tipo de propiedad:"
+msgid "imagery"
+msgstr "Imágenes"
-msgid "Simple"
-msgstr "Sencillo"
+msgid "Reset preferences"
+msgstr "Reiniciar las preferencias"
-msgid "List"
-msgstr "Lista"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Está por volver las preferencias a sus valores por defectos<br /> Todas sus "
+"configuraciones serán eliminadas: complementos, imágenes, filtros, butones "
+"de la barra de herramienta, teclado, etc. <br /> ¿Está seguro de que desea "
+"continuar?"
-msgid "List of lists"
-msgstr "Lista de listas"
+msgid "Load profile"
+msgstr "Cargar perfil"
-msgid "List of maps"
-msgstr "Lista de mapas"
+msgid "Save {0} profile"
+msgstr "Guardar perfil {0}"
-msgid "Add setting"
-msgstr "Añadir ajuste"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Todas las preferencias de este grupo corresponden a las opciones por "
+"defecto, no hay nada por guardar."
+
+msgid "Choose profile file"
+msgstr "Seleccionar archivo de perfil"
msgid "Change list setting"
msgstr "Cambiar lista de propiedades"
@@ -10684,6 +10977,41 @@ msgstr "Cambiar lista de mapas de propiedades"
msgid "Entry {0}"
msgstr "Entrada {0}"
+msgid "Select Setting Type:"
+msgstr "Seleccione el tipo de propiedad:"
+
+msgid "Simple"
+msgstr "Sencillo"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "List of lists"
+msgstr "Lista de listas"
+
+msgid "List of maps"
+msgstr "Lista de mapas"
+
+msgid "Add setting"
+msgstr "Añadir ajuste"
+
+msgid "Advanced Background: Changed"
+msgstr "Fondo avanzado: modificado"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "El valor actual es el valor por defecto"
+
+msgid "Default value is ''{0}''."
+msgstr "El valor por defecto ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"El valor por defecto se desconoce actualmente (la propiedad no ha sido usada "
+"todavía)."
+
msgid "Change string setting"
msgstr "Cambiar texto de la propiedad"
@@ -10740,6 +11068,9 @@ msgstr "Dibujar nodos virtuales en el modo selección"
msgid "Draw inactive layers in other color"
msgstr "Dibujar las capas inactivas en otro color"
+msgid "Display discardable keys"
+msgstr "Claves de visualización descartables"
+
msgid "Highlight target ways and nodes"
msgstr "Resaltar vías y nodos objetivo"
@@ -10790,6 +11121,8 @@ msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
+"Aplicar el suavizado a la vista del mapa en el modo diseño provoca una "
+"apariencia con bordes menos definidos"
msgid "Hightlight target nodes and ways while drawing or selecting"
msgstr "Resaltar nodos y vías objetivo mientras se dibuja o selecciona"
@@ -10801,6 +11134,13 @@ msgstr ""
"Esta opción suprime el relleno de áreas, anulando cualquier cosa "
"especificada en el estilo seleccionado."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Claves de visualizazción que han sido consideradas sin interés al punto que "
+"puede ser eliminadas en modo silencioso."
+
msgid "Options that affect drawing performance"
msgstr "Opciones que afectan al rendimiento del dibujado"
@@ -10893,7 +11233,7 @@ msgid "Dynamic color range based on data limits"
msgstr "Gama de colores dinámica basada en los límites de los datos"
msgid "Smooth GPX graphics (antialiasing)"
-msgstr ""
+msgstr "Gráficos GPX suavizados (antialiasing)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -10963,6 +11303,8 @@ msgstr "Dibujando el ancho de las líneas GPX"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgstr ""
+"Aplicar el suavizado a las líneas de GPX provoca una apariencia con bordes "
+"menos definidos."
msgid ""
"All points and track segments will have the same color. Can be customized in "
@@ -11055,58 +11397,70 @@ msgid "Add Imagery URL"
msgstr "Añadir URL de las imágenes"
msgid "1. Enter URL"
-msgstr ""
+msgstr "1. Ingresar URL"
msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
"level: {1} or {2}<br>reversed zoom level: {3}"
msgstr ""
+"{0} se sustituye por el nivel de zoom de tesela, además "
+"permite:<br>desplazar hasta el nivel de zoom: {1} o {2} <br>\r\n"
+"nivel de zoom revertido: {3}"
msgid "{0} is replaced by X-coordinate of the tile"
-msgstr ""
+msgstr "{0} es reemplazado por la coordenada X del mosaico"
msgid "{0} is replaced by Y-coordinate of the tile"
-msgstr ""
+msgstr "{0} es reemplazado por la coordenada Y del mosaico"
msgid "{0} is replaced by {1} (Yahoo style Y coordinate)"
-msgstr ""
+msgstr "{0} es reemplazado por {1} (coordenada Y del estilo Yahoo)"
msgid ""
"{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
"coordinate)"
msgstr ""
+"{0} es reemplazado por {1} (coordenada Y del estilo OSGeo Tile Map Service)"
msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
"e.g. {1}"
msgstr ""
+"{0} es reemplazado por una selección aleatoria de la lista separada por "
+"comas que se proveyó, es decir {1}"
msgid "2. Enter maximum zoom (optional)"
-msgstr ""
+msgstr "2. Ingresar zoom máximo (opcional)"
msgid "3. Verify generated TMS URL"
-msgstr ""
+msgstr "3. Verificar la URL TMS generada"
msgid "4. Enter name for this layer"
-msgstr ""
+msgstr "4. Introducir un nombre para esta capa"
msgid "Store WMS endpoint only, select layers at usage"
-msgstr ""
+msgstr "Guardar únicamente el extremo WMS, seleccionar la capa en uso"
msgid "Show bounds"
-msgstr ""
+msgstr "Mostrar límites"
msgid "1. Enter service URL"
-msgstr ""
+msgstr "1. Introduzca la URL del servicio"
msgid "Get layers"
-msgstr ""
+msgstr "Obtener capas"
msgid "2. Select layers"
-msgstr ""
+msgstr "2. Seleccionar capas"
-msgid "3. Verify generated WMS URL"
-msgstr ""
+msgid "3. Select image format"
+msgstr "3. Seleccione el formato"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Verifique la URL de WMS generada"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Ingrese el nombre para esta capa"
msgid "Show Bounds"
msgstr "Mostrar los limites"
@@ -11164,7 +11518,7 @@ msgid "Selected entries:"
msgstr "Fuentes seleccionadas:"
msgid "Add a new {0} entry by entering the URL"
-msgstr ""
+msgstr "Añada una nueva entrada {0} ingresando la URL"
msgid "Remove entry"
msgstr "Eliminar entrada"
@@ -11284,6 +11638,12 @@ msgstr ""
"de dato. Añade al final del nombre del fichero \"~\" guardándolo en el mismo "
"directorio.)</i>"
+msgid "Notification at each save"
+msgstr "Notificación en cada grabación"
+
+msgid "When saving, display a small notification"
+msgstr "Al guardar mostrar una pequeña notificación"
+
msgid "File backup"
msgstr "Archivo de respaldo"
@@ -11353,9 +11713,8 @@ msgstr "Ajustes del mapa"
msgid "Settings for the map projection and data interpretation."
msgstr "Ajustes para la proyección del mapa y la interpretación de datos."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
-"Advertencia: No se pudo leer la fuente de etiquetado predefinida: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11461,13 +11820,14 @@ msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available plugins."
msgstr ""
-"Por favor presione en <strong>Descargar lista</strong> para descargar y "
+"Por favor, presione en <strong>Descargar lista</strong> para descargar y "
"mostrar una lista de complementos disponibles."
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] ""
+msgstr[0] "El complemento {0} todavía es requerido por este complemento:"
msgstr[1] ""
+"El complemento {0} todavía es requerido por estos complementos {1}:"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: Versión {1} (local: {2})"
@@ -11502,13 +11862,13 @@ msgstr ""
"activos tras un cierto periodo de tiempo."
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "Por código (EPSG)"
msgid "Invalid projection configuration: {0}"
-msgstr ""
+msgstr "Configuración de proyección inváilda: {0}"
msgid "Projection configuration is valid."
-msgstr ""
+msgstr "La configuración de proyección es válida"
msgid "Validate"
msgstr "Validar"
@@ -11520,43 +11880,43 @@ msgid "Parameter information"
msgstr "Parametros de información"
msgid "Projection name"
-msgstr ""
+msgstr "Nombre de la proyección"
msgid "Supported values:"
msgstr "Soporte de variables:"
msgid "Projection parameters"
-msgstr ""
+msgstr "Parámetros de proyección"
msgid "False easting and false northing"
-msgstr ""
+msgstr "Falso este y falso norte"
msgid "Central meridian"
msgstr "Meridiano central"
msgid "Scaling factor"
-msgstr ""
+msgstr "Factor de escalamiento"
msgid "Ellipsoid name"
-msgstr ""
+msgstr "Nombre del elipsoide"
msgid "Ellipsoid parameters"
-msgstr ""
+msgstr "Parámetros del elipsoide"
msgid "Datum name"
-msgstr ""
+msgstr "Nombre del datum"
msgid "3 or 7 term datum transform parameters"
-msgstr ""
+msgstr "Parámetros de transformación del datum 3 de 7"
msgid "NTv2 grid file"
-msgstr ""
+msgstr "Archivo de grilla NTv2"
msgid "Built-in:"
-msgstr ""
+msgstr "Incorporado:"
msgid "Projection bounds (in degrees)"
-msgstr ""
+msgstr "Límites de proyección (en grados)"
msgid "Gauß-Krüger"
msgstr "Gauß-Krüger"
@@ -11565,7 +11925,7 @@ msgid "GK Zone"
msgstr "Zona GK"
msgid "Gauß-Krüger Zone {0}"
-msgstr ""
+msgstr "Zona de Gauß-Krüger {0}"
msgid "{0} ({1} to {2} degrees)"
msgstr "{0} ({1} a {2} grados)"
@@ -11586,10 +11946,10 @@ msgid "WGS84 Geographic"
msgstr "WGS84 Geográfica"
msgid "Belgian Lambert 1972"
-msgstr ""
+msgstr "Lambert Belga 1972"
msgid "Belgian Lambert 2008"
-msgstr ""
+msgstr "Lambert Belga 2008"
msgid "Lambert Zone (Estonia)"
msgstr "Zona Lambert (Estonia)"
@@ -11639,21 +11999,6 @@ msgstr "Rejilla suiza (Suiza)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (sin correcciones locales)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zona UTM"
-
-msgid "North"
-msgstr "Norte"
-
-msgid "South"
-msgstr "Sur"
-
-msgid "Hemisphere"
-msgstr "Hemisferio"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadalupe Fuerte Marigot 1949"
@@ -11675,6 +12020,21 @@ msgstr "UTM Francia (DOM)"
msgid "UTM Geodesic system"
msgstr "Sistema geodésico UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zona UTM"
+
+msgid "North"
+msgstr "Norte"
+
+msgid "South"
+msgstr "Sur"
+
+msgid "Hemisphere"
+msgstr "Hemisferio"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Probando URL del API OSM \"{0}\""
@@ -11737,9 +12097,11 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Seleccione si desea utilizar OAuth como mecanismo de autenticación"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
+"Valor no soportado en la preferencia ''{0}'', se obtuvo ''{1}''. Utilizando "
+"método de autenticación ''Autenticación Básica''."
msgid "OSM username:"
msgstr "Nombre de usuario OSM:"
@@ -11747,29 +12109,31 @@ msgstr "Nombre de usuario OSM:"
msgid "OSM password:"
msgstr "Contraseña OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Advertencia: Fallo al descargar las credenciales OSM del administrador de "
-"credenciales."
+"Error al recuperar las credenciales de administrador de credenciales de OSM."
msgid "Current credential manager is of type ''{0}''"
msgstr "El administrador de credenciales actual es \"{0}\""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Advertencia: fallo el guardar las credecniales OSM al administrador de "
-"credenciales"
+"Error al guardar las credenciales de OSM en el administrador de credenciales."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Verificar periódicamente si hay nuevos mensajes"
+
+msgid "Check interval (minutes):"
+msgstr "Comprobar cada (minutos):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Advertencia: Fallo al descargar Llave de Acceso OAuth del administrador de "
+"Error al recuperar el Token de Acceso OAuth desde el administrador de "
"credenciales"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Advertencia: Fallo al almacenar Llave de Acceso OAuth al administrador de "
-"credenciales"
+"Error almacenando el Token de Acceso OAuth en el administrador credenciales"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11863,24 +12227,18 @@ msgid "Use a SOCKS proxy"
msgstr "Utilizar un proxy SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Advertencia: JOSM está configurado para utilizar servidores proxy desde las "
-"preferencias del sistema, pero la JVM no está configurado para recuperarlos. "
-"Restableciendo preferencias a \"Sin proxy\""
-
-msgid "disabled"
-msgstr "desactivado"
-
-msgid "no modifier"
-msgstr "sin modificador"
+"JOSM está configurado para utilizar los proxies de la configuración del "
+"sistema, pero la JVM no está configurado para recuperarlos. Restablecer las "
+"preferencias a ''Sin proxy''"
msgid "Shortcut Background: User"
-msgstr ""
+msgstr "Atajo de fondo: Usuario"
msgid "Shortcut Background: Modified"
-msgstr ""
+msgstr "Atajo de fondo: modificado"
msgid "Use default"
msgstr "Usar predefinido"
@@ -11895,7 +12253,7 @@ msgid "Keyboard Shortcuts"
msgstr "Atajos de teclado"
msgid "Changing keyboard shortcuts manually."
-msgstr "Cambiando los atajos de teclado manualmente."
+msgstr "Cambiar los atajos de teclado manualmente."
msgid "Action"
msgstr "Acción"
@@ -11917,42 +12275,46 @@ msgstr "Borrar la selección en la tabla de etiquetas"
msgid "Add a new tag"
msgstr "Añadir una nueva etiqueta"
-msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgid "Paste tags from buffer"
+msgstr "Pegar etiquetas desde la memoria intermedia"
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Usar predefinido ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Los elementos del tipo {0} son soportados"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Etiquetado predeterminado roto \"{0}-{1}\" - el número de objetos en "
-"''display_values'' debe coincidir con ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Modificar objeto {0}"
+msgstr[1] "Modificar {0} objetos"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Etiquetado predeterminado roto \"{0}-{1}\" - el número de objetos en "
-"''short_descriptions'' debe coincidir con ''values''"
+msgid "Nothing selected!"
+msgstr "¡No hay nada seleccionado!"
-msgid "More information about this feature"
-msgstr "Más información sobre esta característica"
+msgid "Selection unsuitable!"
+msgstr "¡Selección inadecuada!"
+
+msgid "Apply Preset"
+msgstr "Aplicar Predeterminados"
+
+msgid "New relation"
+msgstr "Nueva relación"
+
+msgid "Change Tags"
+msgstr "Cambiar Etiquetas"
msgid "Unknown requisite: {0}"
msgstr "Requisito desconocido: {0}"
msgid "Illegal member expression: {0}"
-msgstr ""
+msgstr "Expresión de miembro ielgal: {0}"
+
+msgid "More information about this feature"
+msgstr "Más información sobre esta característica"
msgid "Available roles"
msgstr "Roles disponibles"
@@ -11969,52 +12331,52 @@ msgstr "elementos"
msgid "Optional Attributes:"
msgstr "Atributos opcionales:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr "Seleccionar un autoincremental de {0} para este campo"
-msgid "Use preset ''{0}''"
-msgstr "Usar predefinido ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr "Cancelar el autoincremento de este campo"
-msgid "Unknown type: {0}"
-msgstr "Tipo desconocido: {0}"
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
+"Advertencia en la parametrización del etiquetado \"{0}-{1}\": se ignora el "
+"atributo \"{2}\" dado se encontraron \"{3}\" elementos."
-msgid "Preset role element without parent"
-msgstr "Rol preestablecido sin padre"
-
-msgid "Preset sub element without parent"
-msgstr "Subelmento preestablecido sin padre"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Paramerización de etiquetado \"{0}-{1}\" rota - El método Java encontrado en "
+"\"values_from\" no es \"{2}\""
-msgid "Could not read tagging preset source: {0}"
-msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Paramerización de etiquetado \"{0}-{1}\" rota - El método Java encontrado en "
+"\"values_from\" arrojó {2} ({3})"
-msgid "Error parsing {0}: "
-msgstr "Error analizando {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Etiquetado predeterminado roto \"{0}-{1}\" - el número de objetos en "
+"''display_values'' debe coincidir con ''values''"
-msgid "Elements of type {0} are supported."
-msgstr "Los elementos del tipo {0} son soportados"
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Modificar objeto {0}"
-msgstr[1] "Modificar {0} objetos"
-
-msgid "Nothing selected!"
-msgstr "¡No hay nada seleccionado!"
-
-msgid "Selection unsuitable!"
-msgstr "¡Selección inadecuada!"
-
-msgid "Apply Preset"
-msgstr "Aplicar Predeterminados"
-
-msgid "New relation"
-msgstr "Nueva relación"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Etiquetado predeterminado roto \"{0}-{1}\" - el número de objetos en "
+"''short_descriptions'' debe coincidir con ''values''"
-msgid "Change Properties"
-msgstr "Cambiar propiedades"
+msgid "Unknown type: {0}"
+msgstr "Tipo desconocido: {0}"
msgid "Preset group {1} / {0}"
msgstr "Grupo predefinido {1} / {0}"
@@ -12022,6 +12384,18 @@ msgstr "Grupo predefinido {1} / {0}"
msgid "Preset group {0}"
msgstr "Grupo predefinido {0}"
+msgid "Roles cannot appear more than once"
+msgstr "Los roles no pueden aparecer más de una vez"
+
+msgid "Preset role element without parent"
+msgstr "Rol preestablecido sin padre"
+
+msgid "Preset sub element without parent"
+msgstr "Subelmento preestablecido sin padre"
+
+msgid "Error parsing {0}: "
+msgstr "Error analizando {0}: "
+
msgid "Search preset"
msgstr "Buscar predefinido"
@@ -12037,8 +12411,18 @@ msgstr "La muestra sólo es aplicable a la selección"
msgid "Search in tags"
msgstr "Buscar en etiquetas"
-msgid "All files (*.*)"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
msgstr ""
+"Ajustable {0} no registrado aún. No se puede configurar la participación en "
+"el ajuste sincronizado."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "El componente personalizable {0} no está registrado."
+
+msgid "All files (*.*)"
+msgstr "Todos los archivos (*.*)"
msgid "Min. latitude"
msgstr "Latitud min."
@@ -12072,6 +12456,60 @@ msgstr ""
"El valor actual no es una ID de OSM válida. Por favor, introduzca un número "
"entero mayor que cero"
+msgid "false: the property is explicitly switched off"
+msgstr "falso: la propiedad se encuentra sin marcar"
+
+msgid "true: the property is explicitly switched on"
+msgstr "verdadero: la propiedad se encuentra marcada"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"parcial: distintos objetos seleccionados tienen valores diferentes, no "
+"cambiar"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "sin establecer: no agrega esta propiedad a los objetos seleccionados"
+
+msgid "Cut"
+msgstr "Cortar"
+
+msgid "Right click = copy to clipboard"
+msgstr "Clic derecho = copiar al portapapeles"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Atributo \"{0}\" obligatorio perdido."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo, "
+"obtenido \"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo "
+"(>=0), obtenido \"{1}\"."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Valor no permitido para el atributo \"{0}\" del tipo doble. Se obtuvo \"{1}\""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Valor ilegal para al atributo obligatorio \"{0}\" de tipo booleano, obtenido "
+"\"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Valor ilegal para al atributo obligatorio \"{0}\" de tipo OsmPrimitiveType, "
+"obtenido \"{1}\"."
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -12108,11 +12546,11 @@ msgid "Contacting OSM Server..."
msgstr "Contactando con el servidor OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Advertencia: valor ilegal \"{1}\" para el atributo \"{0}\" en las "
-"capacidades del servidor. Se obtuvo \"{2}\""
+"El valor de atributo ''{0}'' del elemento ''{1}'' no está permitido para las "
+"posibilidades del servidor. Se obtuvo''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Fallo al verificar la fecha \"{0}\" respondida por el servidor."
@@ -12159,40 +12597,38 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Puerto ilegal en la preferencia \"{0}\". Se obtuvo {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Advertencia: valor inesperado para la preferencia \"{0}\". Se obtuvo "
-"\"{1}\". No se usará proxy."
+"Se encontró un valor no esperado para la preferencia ''{0}''. Se obtuvo "
+"''{1}''. No se utilizará proxy."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Advertencia: Parámetros inesperados para el proxy HTTP. Se obtuvo el "
-"servidor \"{0}\" y el puerto \"{1}\"."
+"Parámetros no esperados para el proxy HTTP. Se obtuvo el anfitrión ''{0}'' y "
+"el puerto ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Advertencia: Parámetros inesperados para el proxy SOCKS. Se obtuvo el "
-"servidor \"{0}\" y el puerto \"{1}\"."
+"Parámetros no esperados para el proxy SOCKS. Se obtuvo el anfitrión ''{0}'' "
+"y el puerto ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Error: Falló la conexión al proxy \"{0}\" para la URI \"{1}\". La excepción "
-"fue: {2}"
+"La conexión al servidor proxy ''{0}'' para la URI ''{1}'' fracasó. La "
+"excepción fue: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Advertencia: La JVM no está configurada para encontrar proxys de las "
-"opciones del sistema. La propiedad ''java.net.useSystemProxies'' no estaba "
-"presente cuando inició el programa. No se usará proxy."
+"La JVM no está configurada para buscar los proxies de la configuración del "
+"sistema. Faltaba la propiedad ''java.net.useSystemProxies'' durante el "
+"inicio. No se utilizará un proxy."
msgid "Parsing response from server..."
msgstr "Revisando respuesta del servidor..."
@@ -12298,6 +12734,9 @@ msgstr ""
"Error en el análisis sintáctico: estructura de documento invalida para un "
"documento GPX."
+msgid "(at line {0}, column {1})"
+msgstr "(en la línea {0}, columna {1})"
+
msgid "Unknown mode {0}."
msgstr "Modo desconocido {0}."
@@ -12313,15 +12752,23 @@ msgstr "Buscando archivos de imágenes"
msgid "No image files found."
msgstr "No se encontraron archivos de imágenes"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Tiene {0} mensaje no leído."
+msgstr[1] "Tiene {0} mensajes no leídos."
+
+msgid "Click here to see your inbox."
+msgstr "Haga clic aquí para ver la bandeja de entrada."
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Fallo al abrir canal de lectura para el recurso \"{0}\""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Advertencia: fallo al abrir fichero con extensión \"{2}\" y porción \"{3}\" "
-"en el fichero zip \"{0}\". La excepción fue: {1}"
+"Error al abrir el archivo con extensión ''{2}'' y nombre ''{3}'' en el "
+"archivo zip ''{0}''. La excepción fue: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Falló el cambio de nombre del archivo {0} por el de {1}."
@@ -12407,8 +12854,8 @@ msgstr "Frases desconocidas: {0}"
msgid "Zero coordinates: {0}"
msgstr "Coordenadas cero: {0}"
-msgid "NMEA import success"
-msgstr "Importación NMEA exitosa"
+msgid "NMEA import success:"
+msgstr "Éxito en la importación NMEA:"
msgid "NMEA import failure!"
msgstr "¡Fallo en la importación NMEA!"
@@ -12520,47 +12967,15 @@ msgstr "No se han encontrado datos en el archivo {0}."
msgid "Open OsmChange file"
msgstr "Abrir archivo OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Atributo \"{0}\" obligatorio perdido."
-
msgid "Unsupported version: {0}"
msgstr "Versión no soportada: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo, "
-"obtenido \"{1}\"."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Valor ilegal para al atributo obligatorio \"{0}\" de tipo entero largo "
-"(>=0), obtenido \"{1}\"."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Valor ilegal para al atributo obligatorio \"{0}\" de tipo booleano, obtenido "
-"\"{1}\"."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Valor ilegal para al atributo obligatorio \"{0}\" de tipo OsmPrimitiveType, "
-"obtenido \"{1}\"."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Advertencia: El elemento \"{0}\" no se acepta como comienzo en el contenido "
-"del conjunto de cambios en la posición ({1},{2}). Omitiéndolo."
+"Elemento de inicio no soportado ''{0}'' en el contenido del conjunto de "
+"cambios de la posición ({1},{2}). Ignorando."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12570,11 +12985,11 @@ msgstr ""
"por fuera de \"create\", \"modify\", o \"eliminar\"."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Advertencia: no se soporta el elemento final \"{0}\" en el contenido del "
-"conjunto de cambios en la posición ({1},{2}). Omitiéndolo."
+"Elemento de fin no soportado ''{0}'' en el contenido del conjunto de cambios "
+"de la posición ({1},{2}). Ignornado."
msgid "Parsing changeset content ..."
msgstr "Verificando contenido del conjunto de cambios..."
@@ -12603,12 +13018,8 @@ msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
"Fallo al firmar una conexión HTTP con el encabezado de autenticación OAuth"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-"Advertencia: valor inesperado para la preferencia \"{0}\". Se obtuvo \"{1}\"."
-
-msgid "(at line {0}, column {1})"
-msgstr "(en la línea {0}, columna {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Valor para la preferencia ''{0}'' no esperado. Se obtuvo ''{1}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Ocurrió un error al guardar.<br>El error es:<br>{0}</html>"
@@ -12620,9 +13031,6 @@ msgstr ""
"<html>Un error ocurrió cuando se restablecía archivo de respaldo.<br>El "
"error es:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "No se pudo hacer copia de seguridad. La excepción es: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Archivos del servidor OSM comprimidos con gzip"
@@ -12644,6 +13052,9 @@ msgstr "No se encontraron datos en el archivo ''{0}''."
msgid "Open OSM file"
msgstr "Abrir archivo OSM"
+msgid "Reading was canceled"
+msgstr "La lectura fue cancelada"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12706,11 +13117,11 @@ msgstr ""
"obtuvo {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"ADVERTENCIA: Normalizando el valor del atributo «versión» del elemento {0} a "
-"{2}, la versión de la API es «{3}». Se obtuvo {1}."
+"Normalizando el valor del atributo ''version'' del elemento {0} a {2}, la "
+"versión de la API es ''{3}''. Se obtuvo {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Versión del API desconocida o no soportada. Es {0}."
@@ -12862,26 +13273,38 @@ msgid "Save user and password (unencrypted)"
msgstr "Guardar nombre de usuario y contraseña (sin cifrar)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<eliminar desde {0} objetos>"
+
+msgid "Old values of"
+msgstr "Valores anteriores de"
msgid "Add tags to selected objects"
msgstr "Añadir etiquetas a los objetos seleccionados"
msgid "Add selected tags"
-msgstr ""
+msgstr "Añadir etiquetas seleccionadas"
msgid "Add all tags"
-msgstr ""
+msgstr "Añadir todas las etiquetas"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "Añadir las etiquetas verificadas a los objetos seleccionados"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Mayús+Enter: añade todas las etiquetas a los objetos seleccionados"
msgid "Assume"
msgstr "Asumir"
+msgid "Existing values"
+msgstr "Valores existentes"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Permitir que la casilla de verificación acepte el valor"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Aceptar todas las etiquetas desde {0} para esta sesión"
+
msgid "Load data from API"
msgstr "Cargar datos desde el API"
@@ -12889,7 +13312,7 @@ msgid "Import data from URL"
msgstr "Importar datos desde el URL"
msgid "Open local files"
-msgstr ""
+msgstr "Abrir archivos locales"
msgid "Load imagery layers"
msgstr "Cargar capas de imágenes"
@@ -12906,27 +13329,41 @@ msgstr "Crear nuevos objetos"
msgid "Read protocol version"
msgstr "Leer la versión del protocolo"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-"Atención: No se puede iniciar el servidor remotecontrol en el puerto {0}: {1}"
+"No se puede iniciar el servidor de control remoto en el puerto {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "ControlRemoto::Aceptando conexiones en el puerto {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "ControlRemoto::El servidor fue detenido"
msgid "Remote Control has been asked to create a new node."
msgstr "El Control Remoto recibió una solicitud para crear un nodo nuevo."
msgid "There is no layer opened to add node"
-msgstr ""
-
-msgid "Add way"
-msgstr "Añadir vía"
+msgstr "No hay ninguna capa abierta para añadir un nodo"
msgid "Remote Control has been asked to create a new way."
msgstr "Se ha solicitado a Control Remoto la creación de una nueva vía."
msgid "Invalid coordinates: {0}"
-msgstr ""
+msgstr "Coordenadas inválidas: {0}"
msgid "There is no layer opened to add way"
+msgstr "No hay ninguna capa abierta para añadir una vía"
+
+msgid "Add way"
+msgstr "Añadir vía"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
msgstr ""
+"Control Remoto recibió una petición de características soportadas. Esto "
+"permite a los sitios web adivinar la versión de JOSM que se encuentra "
+"ejecutando."
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
@@ -12944,6 +13381,15 @@ msgstr "Se ha pedido al control remoto importar datos de la siguiente URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Se ha pedido al control remoto cagar datos desde el API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr "Las latitudes deben estar entre {0} y {1}"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "Las longitudes deben estar entre {0} y {1}"
+
+msgid "The minima must be less than the maxima"
+msgstr "Los mínimos debe ser inferior a los máximos"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12952,7 +13398,7 @@ msgstr ""
"(especificados por sus id)."
msgid "Remote Control has been asked to open a local file."
-msgstr ""
+msgstr "Control Remoto recibió una petición de abrir un archivo local"
msgid "Do you want to allow this?"
msgstr "¿Desea permitir esto?"
@@ -12971,6 +13417,8 @@ msgid ""
"Version ''{0}'' of meta data for geoimage layer is not supported. Expected: "
"0.1"
msgstr ""
+"No se soportan los metadatos de la versión \"{0}\" para la capa de "
+"geoimagen. Se esperaba: 0.1"
msgid "Data:"
msgstr "Datos:"
@@ -12978,25 +13426,27 @@ msgstr "Datos:"
msgid "local file"
msgstr "archivo local"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Enlace a un archivo de datos OSM en su disco local."
+msgid "Link to a GPX file on your local disk."
+msgstr "Vínculo a un archivo GPX en su disco local."
msgid "include"
msgstr "incluir"
-msgid "Include OSM data in the .joz session file."
-msgstr "Incluir datos de OSM en el archivo .joz de sesión."
+msgid "Include GPX data in the .joz session file."
+msgstr "Incluir datos GPX en el archivo de sesión .joz."
msgid "No file association"
msgstr "Ninguna asociación de archivo"
-msgid "OSM data will be included in the session file."
-msgstr "Los datos de OSM se incluirán en el archivo de la sesión."
+msgid "GPX data will be included in the session file."
+msgstr "Los datos GPX serán incluidos en el archivo de sesión."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
"0.1"
msgstr ""
+"No se soporta la versión \"{0}\" de los metadatos para la capa de trazado "
+"GPX. Se esperaba: 0.1"
msgid "File name expected for layer no. {0}"
msgstr "Se esperaba un nombre de fichero para la capa nº {0}"
@@ -13005,12 +13455,23 @@ msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
"0.1"
msgstr ""
+"No se soporta la versión \"{0}\" de los metadatos para la capa de imagenes "
+"aéreas. Se esperaba 0.1."
msgid "Layer contains unsaved data - save to file."
msgstr "La capa contiene datos sin guardar - guardar en archivo."
msgid "Layer does not contain unsaved data."
-msgstr ""
+msgstr "La capa contiene datos que no han sido guardados"
+
+msgid "Link to a OSM data file on your local disk."
+msgstr "Enlace a un archivo de datos OSM en su disco local."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Incluir datos de OSM en el archivo .joz de sesión."
+
+msgid "OSM data will be included in the session file."
+msgstr "Los datos de OSM se incluirán en el archivo de la sesión."
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
@@ -13019,6 +13480,9 @@ msgstr ""
"La versión ''{0}'' de metadatos para capas de datos osm no es admitida. Se "
"esperaba: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Archivo de sesión (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "No se puede encontrar el archivo ''{0}''"
@@ -13095,18 +13559,18 @@ msgid "Download skipped"
msgstr "Se omitió la descarga"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Advertencia: No se puede descargar el complemento \"{0}\". Se desconoce el "
-"enlace de descarga. Omitiendo descarga."
+"No se puede descargar el complemento ''{0}''. Este enlace de descarga no se "
+"conoce. Omitiendo descarga."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Advertencia: No se puede descargar el complemento \"{0}\". Su enlace de "
-"descarga \"{1}\" no es una URL válida. Omitiendo descarga."
+"No se puede descargar el complemento ''{0}''. Este enlace de descarga "
+"''{1}'' no es una URL válida. Omitiendo descarga."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Fallo al crear directorio de complemento \"{0}\""
@@ -13124,7 +13588,7 @@ msgid "replaced by new {0} plugin"
msgstr "reemplazado por el nuevo complemento {0}"
msgid "no longer required"
-msgstr ""
+msgstr "ya no se requiere"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
@@ -13283,12 +13747,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Falló la actualización del complemento"
-msgid "Warning: failed to find plugin {0}"
-msgstr ""
+msgid "Failed to find plugin {0}"
+msgstr "No se pudo encontrar el complemento {0}"
-msgid "Warning: failed to download plugin information list"
-msgstr ""
-"Advertencia: fallo al descargar la lista de información del complemento"
+msgid "Failed to download plugin information list"
+msgstr "Error al descargar la lista de información del complemento"
msgid "Disable plugin"
msgstr "Deshabilitar complemento"
@@ -13302,27 +13765,28 @@ msgstr "Mantener complemento"
msgid "Click to keep the plugin ''{0}''"
msgstr "Elija para mantener el complemento \"{0}\""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Advertencia: falló la eliminación del complemento obsoleto ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Error al eliminar los complementos obsoletos ''{0}''."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Advertencia: fallo al instalar complemento previamente descargdo \"{0}\". "
-"Omitiendo instalación. JOSM cargará la versión antigua del complemento."
+"Error al instalar el complemento ya descargado ''{0}''. Omitiendo "
+"instalación. JOSM va a cargar la vieja versión del complemento."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
+"Error al instalar el complemento ''{0}'' desde el archivo de descarga "
+"temporal ''{1}''. {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Advertencia: fallo al instalar el complemento \"{0}\" del fichero descargado "
-"temporalmente \"{1}\". Fallo al renombrar."
+"Error al instalar el complemento ''{0}'' desde el archivo de descarga "
+"temporal ''{1}''. El cambio de nombre falló."
msgid "Click to disable the plugin ''{0}''"
msgstr "Elija para deshabilitar el complemento \"{0}\""
@@ -13366,7 +13830,7 @@ msgstr ""
"Complementos si desea cambiarlo posteriormente)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Archivo JAR inválido\"{0}\""
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "El archivo del complemento \"{0}\" no contiene un Manifiesto."
@@ -13375,7 +13839,7 @@ msgid "Invalid URL ''{0}'' in plugin {1}"
msgstr "URL no válida \"{0}\" en el complemento {1}"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Descripción del complemento \"{0}\" inválida en el complemento {1}"
msgid "More info..."
msgstr "Más información..."
@@ -13399,11 +13863,10 @@ msgstr "Procesando ficheros de caché del sitio del complemento..."
msgid "Processing file ''{0}''"
msgstr "Procesando fichero \"{0}\""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Advertencia: Fallo al revisar el fichero \"{0}\" en búsqueda de información "
-"del complemento. Omitiéndolo."
+"Error al analizar el archivo ''{0}'' para obtener la información del "
+"complemento. Omitiendo."
msgid "Processing plugin site cache icon files..."
msgstr "Procesando archivos de icono del caché del sitio del complemento..."
@@ -13417,12 +13880,27 @@ msgstr "Descargando lista de complementos..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Descargando lista de complementos desde ''{0}''"
+msgid "Plugin list download error"
+msgstr "Error al descargar la lista del complemento"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM falló al descargar la lista del complemento:"
+
+msgid "Details:"
+msgstr "Detalles:"
+
+msgid "Plugin icons download error"
+msgstr "Error al descargar los iconos del complemento"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM falló al descargar iconos del complemento"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Advertencia: fallo al crear directorio del complemento \"{0}\". No se puede "
-"hacer caché de la lista de complementos del sitio \"{1}\"."
+"Error al crear el directorio de complementos ''{0}''. No se puede almacenar "
+"en caché la lista de complementos desde el sitio de complementos ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Escribiendo la lista de complementos a la caché local ''{0}''"
@@ -13716,7 +14194,7 @@ msgstr ""
"siguiente error:<br>''{0}''</html>"
msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr ""
+msgstr "<html>La autorización en el servidor de OSM ha fallado.<br></html>"
msgid ""
"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -13778,8 +14256,8 @@ msgid ""
"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
"already been closed on {1}."
msgstr ""
-"<html>Falló al subir el conjunto de cambios <strong>{0}</strong><br> porque "
-"ya se ha cerrado en {1}."
+"<html>No se ha podido subir el conjunto de cambios <strong>{0}</strong><br> "
+"porque ya se ha cerrado en {1}."
msgid ""
"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
@@ -13802,6 +14280,9 @@ msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
"problem with transferring data.<br>Details (untranslated): {1}</html>"
msgstr ""
+"<html>No se pudo cargar datos o descargar datos desde<br>''{0}''<br>debido a "
+"un problema con la transferencia de datos.<br>Detalles (sin traducir): "
+"{1}</html>"
msgid ""
"<html>Failed to download data. Its format is either unsupported, ill-formed, "
@@ -13880,23 +14361,14 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "No se pudo localizar la imagen ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Advertencia: Fallo al manipular fichero zip \"{0}\". La excepción fue: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
-"Advertencia: fallo al acceder al directorio \"{0}\" por cuestiones de "
-"segurida. La excepción fue: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Error al manipular el archivo zip ''{0}''. La excepción fue: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Advertencia: fallo al derivar prefijo de lenguaje wiki del código \"{0}\" "
-"JOSm de localización. Usando el código predeterminado \"en\"."
+"No se ha podido acceder al directorio ''{0}'' por razones de seguridad. La "
+"excepción fue: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [por favor, teclee su número]"
@@ -13908,65 +14380,125 @@ msgstr ""
"Fallo al abrir la URL. No hay establecida una plataforma actualmente. Por "
"favor indique primero la plataforma."
-msgid "reserved"
-msgstr ""
+msgid "Opening URL: {0}"
+msgstr "Abriendo URL: {0}"
-msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+msgid "zoom"
msgstr ""
-msgid "There was {0} tag found in the buffer, it is suspicious!"
-msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Key is too long (max {0} characters):"
+msgid "latitude"
msgstr ""
-msgid "Suspicious characters in key:"
+msgid "longitude"
msgstr ""
-msgid "Value is too long (max {0} characters):"
+msgid "URL does not contain {0}/{1}/{2}"
msgstr ""
-msgid "Do you want to paste these tags?"
+msgid "URL does not contain valid {0}"
msgstr ""
-msgid "Clear buffer"
+msgid "reserved"
+msgstr "reservado"
+
+msgid "Outdated Java version"
msgstr ""
-msgid "Ignore warnings"
+msgid "Update Java"
msgstr ""
-msgid ""
-"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
-"contain any JOSM object or suitable text. </p></html>"
+msgid "You are running version {0} of Java."
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "February 2013"
msgstr ""
msgid ""
-"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
-"geometry from preferences."
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
msgstr ""
-"La preferencia con llave \"{0}\" no incluye \"{1}\". No se puede restaurar "
-"la geometría de la ventana a partir de las preferencias."
msgid ""
-"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
-"{2}. Cannot restore window geometry from preferences."
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
msgstr ""
-"La preferencia con llave \"{0}\" no provee un valor entero para \"{1}\". Se "
-"obtuvo {2}. No se puede restaurar la geometría de la ventana a partir de las "
-"preferencias"
-msgid ""
-"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
-"{2}. Cannot restore window geometry from preferences."
+msgid "Would you like to update now ?"
msgstr ""
-"Fallo al interpretar el campo \"{1}\" en la preferencia con la llave "
-"\"{0}\". La excepción fue: {2}. No se puede restaurar la geometría de la "
-"ventana a partir de las preferencias."
+
+msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+msgstr "Conflicto de atajo silencioso: ''{0}'' movido por ''{1}'' a ''{2}''."
+
+msgid "There was {0} tag found in the buffer, it is suspicious!"
+msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
+msgstr[0] "Esta etiqueta {0} fue encontrada en el búfer, esto es sospechoso!"
+msgstr[1] ""
+"Estas etiquetas {0} fueron encontradas en el búfer, esto es sospechoso!"
+
+msgid "Key is too long (max {0} characters):"
+msgstr "La clave es demasiada larga (máximo {0} caracteres):"
+
+msgid "Suspicious characters in key:"
+msgstr "Caracteres sospechosos en la clave:"
+
+msgid "Value is too long (max {0} characters):"
+msgstr "El valor es demasiado largo (máximo {0} caracteres):"
+
+msgid "Do you want to paste these tags?"
+msgstr "¿Usted desea pegar estas etiquetas?"
+
+msgid "Clear buffer"
+msgstr "Limpiar búfer"
+
+msgid "Ignore warnings"
+msgstr "Ignorar advertencias"
+
+msgid ""
+"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
+"contain any JOSM object or suitable text. </p></html>"
+msgstr ""
+"<html><p> Lo sentimos, es imposible pegar etiquetas desde la memoria. No "
+"contiene ningún objeto de JOSM o un texto adecuado. </p></html>"
+
+msgid "ms"
+msgstr "ms"
+
+msgid "s"
+msgstr "s"
+
+msgid "min"
+msgstr "mín"
+
+msgid "h"
+msgstr "h"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "día"
+msgstr[1] "días"
+
+msgid ""
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
+"geometry from preferences."
+msgstr ""
+"La preferencia con llave \"{0}\" no incluye \"{1}\". No se puede restaurar "
+"la geometría de la ventana a partir de las preferencias."
+
+msgid ""
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"La preferencia con llave \"{0}\" no provee un valor entero para \"{1}\". Se "
+"obtuvo {2}. No se puede restaurar la geometría de la ventana a partir de las "
+"preferencias"
+
+msgid ""
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"Fallo al interpretar el campo \"{1}\" en la preferencia con la llave "
+"\"{0}\". La excepción fue: {2}. No se puede restaurar la geometría de la "
+"ventana a partir de las preferencias."
msgid ""
"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
@@ -14049,7 +14581,7 @@ msgstr ""
"Solicite un área más pequeña o utilice el archivo planet.osm"
msgid "JOSM-Trac login at josm.openstreetmap.de"
-msgstr ""
+msgstr "Ingreso con JOSM-Trac en josm.openstreetmap.de"
msgid "could not get audio input stream from input URL"
msgstr "No es posible obtener un flujo de audio desde la URL"
@@ -14077,7 +14609,7 @@ msgstr "residencial"
msgctxt "natural"
msgid "scrub"
-msgstr "matorral"
+msgstr "monte bajo (arbustos, matorral o maleza)"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -14293,6 +14825,13 @@ msgid "Saturation:"
msgstr "Saturación:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permitir editar información de tráfico y exportarlo al simulador de "
+"movilidad urbana SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14319,6 +14858,9 @@ msgid ""
"Overlays the canvec tile grid on the map and prints URL''s to the .zip "
"files. Future goals: allow auto-downloading and loading of canvec .osm files"
msgstr ""
+"Superpone la rejilla de mosaico canvec en el mapa e imprime las URL a los "
+"archivos .zip. Objetivos futuros: permitir la descarga y carga automática de "
+"archivos canvec .osm"
msgid ""
"Allows the user to create different color schemes and to switch between "
@@ -14326,6 +14868,11 @@ msgid ""
"white background with matching colors for better visibility in bright "
"sunlight. See dialog in display preferences."
msgstr ""
+"Permite al usuario crear esquemas de color distintos para poder intercambiar "
+"entre ellos. Elija los colores y cree un nuevo esquema. Usado para "
+"intercambiar con un fondo blanco y colores acordes para una visibilidad "
+"mayor bajo un entorno de luz solar. Consulte el diálogo en las preferencias "
+"de visualización."
msgid ""
"Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
@@ -14392,6 +14939,12 @@ msgstr ""
"cómoda."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Hable con los usuarios más cercanos que estén también editando el mapa. Será "
+"notificado cuando alguien se aproxime a su área de edición."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14408,6 +14961,8 @@ msgstr ""
msgid ""
"Analyse a set of GPS points to obtain its centre and direction of spread."
msgstr ""
+"Analiza un conjunto de puntos GPS para obtener su centro y la dirección de "
+"dispersión."
msgid "Allows to filter out unnecessary GPS tracks"
msgstr "Permite filtrar las trazas GPS innecesarias"
@@ -14425,9 +14980,12 @@ msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
msgstr ""
+"Base de datos de imágenes rectificadas: comparte y obtén mediante un botón "
+"imágenes aéreas desplazadas ya compensadas."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Ajusta la imagen al estilo del componente WMS."
+msgstr ""
+"bModo de mapa con ajuste de imágenes aéreas mediante el WMSPlugin-style"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -14493,12 +15051,18 @@ msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Proporciona la biblioteca Log4j para otros componentes de JOSM. No se "
+"pretende que sea instalado directamente por los usuarios, sino más bien que "
+"sirva como una dependencia de otros componentes."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
"create, close,invalidate, re-open and comment bug reports by using this "
"plugin."
msgstr ""
+"El componente MapDust muestra los informes de errores del mapa recogidos en "
+"el sitio web de MapDust. Puede crear, cerrar, invalidar, reabrir y comentar "
+"los informes de errores existentes mediante el uso de este componente."
msgid ""
"Provide a measurement dialog and a layer to measure length and angle of "
@@ -14518,16 +15082,13 @@ msgstr "No añade ningún giro a la izquierda para conjuntos de 4 o 5 vías"
msgid "Simplifies download from different read-only APIs."
msgstr "Simplifica la descarga desde distintas APIs de sólo lectura."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Convierte fácilmente un área en un multipolígono."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Permite asignar a la vez etiquetas a todos los objetos de un área "
"seleccionada."
msgid "NanoLog adjustment and browsing layer"
-msgstr ""
+msgstr "Ajuste NanoLog y capa de navegación"
msgid ""
"Use your system''s password manager to store the API username and password. "
@@ -14550,10 +15111,14 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
+"Deshabilitar de forma permanente el uso de JOSM (ADVERTENCIA: este "
+"complemento impide que JOSM se ejecute y es complicado de deshacer)"
msgid "Convert data from Open Data portals to OSM layer"
msgstr ""
-"Convierte datos desde portales de datos abiertos (open data) a una capa OSM."
+"Permite importar a JOSM archivos de datos de formatos conocidos (shp, kml, "
+"gml, tab, csv, ods, xls, etc.) entre otras características. IMPORTANTE: Solo "
+"para fuentes de datos abiertos (open data)."
msgid "extended options for editing opening_hours"
msgstr ""
@@ -14581,6 +15146,7 @@ msgid ""
"Bring in errors from Osm Inspector and display it on the current JOSM "
"bounding box"
msgstr ""
+"Traer errores de OSM Inspector y visualizarlos en los bordes actuales de JOSM"
msgid "Import OSM data in PBF format"
msgstr "Importa datos OSM en formato PBF"
@@ -14596,6 +15162,9 @@ msgstr ""
"imagen. Acceda a esta característica pulsando el botón derecho del ratón "
"sobre la capa de imagen."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14607,7 +15176,7 @@ msgid "The great JGoodies Plastic Look and Feel."
msgstr "El gran JGoodies Plastic Look and Feel."
msgid "Read and write osmosis poly filter files"
-msgstr ""
+msgstr "Leer y escribir los archivos de filtro osmosis poly"
msgid "Adds map printing to JOSM"
msgstr "Añade la posibilidad de impresión del mapa a JOSM"
@@ -14624,9 +15193,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Panel de edición y creación de multipolígonos y relación"
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Añade el elemento Reiniciar JOSM al menú Archivo."
-
msgid "Plugin for reverting changesets"
msgstr "Componente para revertir conjuntos de cambios"
@@ -14662,17 +15228,14 @@ msgstr ""
"Esto puede condicionarse al tamaño de área máximo a eliminar. Hace además un "
"promedio de los nodos cercanos."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Crea y edita un mapa naútico para OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
-msgstr ""
+msgstr "Editar características de OpenSeaMap"
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
msgid "The surveyor''s toolbox."
-msgstr ""
+msgstr "La caja de herramientas del inspector"
msgid ""
"Launch browser to a Web resource about a selected object having known tags, "
@@ -14703,6 +15266,9 @@ msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
"Activate by holding T and slip map with left mouse button"
msgstr ""
+"Proporciona botones de ayuda para permitir trabajar con un único botón de "
+"ratón (modo stylus). Actívelo manteniendo pulsada la tecla T y desplazando "
+"el mapa con el botón izquierdo del ratón."
msgid ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -14711,6 +15277,13 @@ msgstr ""
"Traza edificios a partir del mapa catastral checo. Requiere TracerServer "
"(.NET o Mono) para funcionar."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+"Traza edificios y otras figuras a partir de un mapa. Necesita que "
+"Tracer2Server se esté ejecutando."
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Complemento para firmar digitalmente datos OSM"
@@ -14738,9 +15311,9 @@ msgid ""
"georeferenced video against a GPS track, to use it for identify visible "
"objects."
msgstr ""
-"(¡¡¡Este componente actualmente es un trabajo en desarrollo!!!) Enlaza y "
+"(¡Este componente actualmente es un trabajo en desarrollo!) Enlaza y "
"sincroniza un vídeo georreferenciado ajustándolo a su posición en la traza "
-"GPS.Util para identificar objetos visibles."
+"GPS. Útil para identificar objetos visibles."
msgid ""
"Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14762,7 +15335,7 @@ msgid "Select a sequence of non-branching connected ways"
msgstr "Selecciona una secuencia de vías conectadas no ramificadas"
msgid "Simplifys linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "Simplifica la vinculación de objetos OSM a artículos de Wikipedia"
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -14771,9 +15344,6 @@ msgstr ""
"Conduce un coche de carreras desde el punto A al B sobre una imagen aérea. "
"Deja a los cactus atrás..."
-msgid "Highways"
-msgstr "Viales"
-
msgid "Streets"
msgstr "Calles/Carreteras"
@@ -14858,6 +15428,9 @@ msgstr "Terraplén"
msgid "Lit"
msgstr "Iluminación"
+msgid "Toll"
+msgstr "Peaje"
+
msgid "Motorway Link"
msgstr "Enlace de autopista"
@@ -14948,6 +15521,50 @@ msgstr "Calle urbana"
msgid "Edit Residential Street"
msgstr "Editar calle urbana"
+msgid "Bicycle Road"
+msgstr "Ciclovía"
+
+msgid "Edit Bicycle Road"
+msgstr "Editar Ciclovía"
+
+msgid "Highway type"
+msgstr "Tipo de vial"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "calle urbana"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "vía de servicio"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "carretera sin clasificación"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "camino"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "ciclovía"
+
+msgid "Vehicle access"
+msgstr "Acceso vehicular"
+
+msgid "yes"
+msgstr "sí"
+
+msgid "no"
+msgstr "no"
+
+msgid "destination"
+msgstr "lugar de destino"
+
+msgid "Oneway for bicycle"
+msgstr "Sentido único para bicicletas"
+
msgid "Living Street"
msgstr "Calle residencial"
@@ -14966,10 +15583,10 @@ msgstr "Área"
msgid "Service"
msgstr "Vía de servicio"
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr "Editar vía de servicio"
-msgid "Serviceway type"
+msgid "Service way type"
msgstr "Tipo de vía de servicio"
msgid "alley"
@@ -14981,6 +15598,11 @@ msgstr "camino de entrada (a garage, casa, finca, etc.)"
msgid "parking_aisle"
msgstr "pasillo de aparcamiento"
+msgid "drive-through"
+msgstr ""
+"carril de servicio para usuarios (comida rápida, banca, colegios, "
+"aeropuerto, etc.)"
+
msgid "Parking Aisle"
msgstr "Pasillo de aparcamiento"
@@ -15006,10 +15628,7 @@ msgid "roundabout"
msgstr "rotonda"
msgid "jughandle"
-msgstr ""
-
-msgid "yes"
-msgstr "sí"
+msgstr "cambio de sentido a distinto nivel"
msgid "Road Restrictions"
msgstr "Restricciones de tráfico"
@@ -15017,9 +15636,6 @@ msgstr "Restricciones de tráfico"
msgid "Edit Road Restrictions"
msgstr "Editar restricciones de tráfico"
-msgid "Toll"
-msgstr "Peaje"
-
msgid "No exit (cul-de-sac)"
msgstr "Sin salida (cul-de-sac)"
@@ -15029,9 +15645,6 @@ msgstr "Restricciones en el modo de transporte"
msgid "General Access"
msgstr "Acceso general"
-msgid "destination"
-msgstr "lugar de destino"
-
msgid "delivery"
msgstr "reparto de mercancías"
@@ -15041,15 +15654,15 @@ msgstr "permisivo"
msgid "private"
msgstr "privado"
+msgid "customers"
+msgstr "clientes"
+
msgid "agricultural"
msgstr "agrícola"
msgid "forestry"
msgstr "forestal"
-msgid "no"
-msgstr "no"
-
msgid "official"
msgstr "oficial"
@@ -15095,6 +15708,9 @@ msgstr "Vehículos de alta ocupación (VAO)"
msgid "Public Service Vehicles (psv)"
msgstr "Vehículos de servicio público (SP)"
+msgid "Tourist buses"
+msgstr "Ómnibus de turistas"
+
msgid "Min. speed (km/h)"
msgstr "Velocidad mínima (km/h)"
@@ -15114,16 +15730,16 @@ msgid "Max. length (meters)"
msgstr "Longitud máxima (metros)"
msgid "Overtaking"
-msgstr ""
+msgstr "sobrepaso"
msgid "both"
-msgstr ""
+msgstr "ambos"
msgid "forward"
-msgstr ""
+msgstr "avanzar"
msgid "backward"
-msgstr ""
+msgstr "retroceder"
msgid "Roundabout"
msgstr "Rotonda"
@@ -15179,6 +15795,9 @@ msgstr "Editar un puente"
msgid "viaduct"
msgstr "viaducto"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "Intercambiador"
@@ -15225,7 +15844,7 @@ msgid "General access"
msgstr "Acceso general"
msgid "Path"
-msgstr "Camino o senda"
+msgstr "Camino o sendero"
msgid "Edit Path"
msgstr "Editar camino"
@@ -15264,12 +15883,15 @@ msgstr ""
"comprometidos con peligro de caída, pedregales, senderos con rocas dentadas."
msgid "T4 - difficult, exposed, steep alpine trail"
-msgstr "T4 - senda alpino empinada, expuesta y dificil"
+msgstr "T4 - sendero alpino empinado, expuesto y dificil"
msgid ""
"sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
"grassy acclivities, jagged rocks, facile snow-free glaciers"
msgstr ""
+"en ocasiones es necesario para el uso manual seguir adelante. Terreno muy "
+"expuesto, pendientes con cubierta vegetal precaria, rocas puntiagudas, "
+"glaciares libres de nieve en la superficie"
msgid "T5 - difficult alpine trail with climbing"
msgstr "T5 - sendero alpino dificil que requiere escalada"
@@ -15294,21 +15916,30 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilidad"
+msgctxt "trail_visibility"
msgid "excellent"
msgstr "excelente"
+msgctxt "trail_visibility"
msgid "good"
msgstr "buena"
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr "intermedia"
+msgctxt "trail_visibility"
msgid "bad"
msgstr "mala"
+msgctxt "trail_visibility"
msgid "horrible"
msgstr "pésima"
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "no"
+
msgid "Wheelchairs"
msgstr "Sillas de ruedas"
@@ -15324,11 +15955,11 @@ msgstr "Camino de herradura dedicado"
msgid "Edit Bridleway"
msgstr "Editar vía ecuestre"
-msgid "Cycle Lane"
-msgstr "Ciclocarril"
+msgid "Cycle Lane/Track"
+msgstr "Pista o carril para bicicletas"
-msgid "Edit Cycle Lane"
-msgstr "Editar ciclocarril"
+msgid "Edit Cycle Lane or Track"
+msgstr "Editar Pista o Carril para bicicletas"
msgid "Cycleway"
msgstr "Carril bici"
@@ -15355,16 +15986,16 @@ msgid "shared_lane"
msgstr "carril_compartido"
msgid "Cycleway left"
-msgstr ""
+msgstr "Ciclovía a la izquierda"
msgid "Cycleway right"
-msgstr ""
+msgstr "Ciclovía a la derecha"
msgid "Oneway (bicycle)"
msgstr "Unidireccional (bicicleta)"
-msgid "Edit Highway"
-msgstr "Editar vía"
+msgid "Edit Highway Attributes:"
+msgstr "Editar atributos de la carretera:"
msgid "Highway"
msgstr "Carretera"
@@ -15432,12 +16063,18 @@ msgstr "Área de descanso"
msgid "Edit Rest Area"
msgstr "Editar área de descanso"
-msgid "Emergency Phone"
-msgstr "Teléfono de emergencia"
+msgid "Drinking Water"
+msgstr "Fuente de agua potable"
msgid "Traffic Signal"
msgstr "Semáforo"
+msgid "Edit Traffic Signal"
+msgstr "Editar Señal de Tráfico"
+
+msgid "Optional crossing attributes:"
+msgstr "Atributos opcionales de cruce:"
+
msgid "Pedestrian crossing type"
msgstr "Tipo de cruce peatonal"
@@ -15453,15 +16090,6 @@ msgstr "isla"
msgid "unmarked"
msgstr "sin marcar"
-msgid "Cross on horseback"
-msgstr "Cruce de caballos"
-
-msgid "Cross by bicycle"
-msgstr "Cruce de bicicletas"
-
-msgid "Crossing attendant"
-msgstr "Guarda cruces"
-
msgid "Crossing type name (UK)"
msgstr "Tipo de nombre de cruce (Reino Unido)"
@@ -15483,6 +16111,15 @@ msgstr "pegaso"
msgid "tiger"
msgstr "tigre"
+msgid "Crossing attendant"
+msgstr "Guarda cruces"
+
+msgid "Cross by bicycle"
+msgstr "Cruce de bicicletas"
+
+msgid "Cross on horseback"
+msgstr "Cruce de caballos"
+
msgid "Stop"
msgstr "Stop"
@@ -15490,7 +16127,10 @@ msgid "Give way"
msgstr "Ceda el paso"
msgid "Mini-roundabout"
-msgstr "Mini-rotonda"
+msgstr "Mini-rotonda (a nivel o ligeramente abombada)"
+
+msgid "Edit Mini-Roundabout"
+msgstr "Editar Mini-Rotonda"
msgid "Direction"
msgstr "Dirección"
@@ -15501,11 +16141,8 @@ msgstr "agujas del reloj"
msgid "Pedestrian Crossing"
msgstr "Paso de peatones"
-msgid "Edit Crossing"
-msgstr "Editar cruce"
-
-msgid "Type name (UK)"
-msgstr "Tipo de nombre (Reino Unido)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Editar cruce Peatonal"
msgid "Traffic Calming"
msgstr "Calmado de tráfico"
@@ -15529,7 +16166,7 @@ msgid "hump"
msgstr "resalte"
msgid "rumble_strip"
-msgstr ""
+msgstr "sonadores"
msgid "table"
msgstr "plataforma elevada"
@@ -15537,9 +16174,6 @@ msgstr "plataforma elevada"
msgid "Passing Place"
msgstr "Lugar de cruce frecuente de la vía"
-msgid "Edit Passing Place"
-msgstr "Editar lugar de cruce frecuente de la vía"
-
msgid "Turning Circle"
msgstr "Círculo de giro"
@@ -15573,30 +16207,57 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barreras"
+msgid "Block"
+msgstr "Bloques"
+
+msgid "Edit Block"
+msgstr "Bloque de edición"
+
+msgid "Allowed traffic:"
+msgstr "Tráfico permitido:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "piedra"
+
msgid "Bollard"
msgstr "Bolardo"
msgid "Edit Bollard"
msgstr "Editar un bolardo"
-msgid "Allowed traffic:"
-msgstr "Tráfico permitido:"
+msgid "Bollard type"
+msgstr "Tipo bolardo"
+
+msgid "rising"
+msgstr "en ascenso"
+
+msgid "removable"
+msgstr "removible"
+
+msgid "plastic"
+msgstr "plástico"
msgid "Cycle Barrier"
msgstr "Barrera para bicicletas"
-msgid "Block"
-msgstr "Bloques"
+msgid "Edit Cycle Barrier"
+msgstr "Editar barrera para ciclistas"
msgid "Cattle Grid"
-msgstr "Barrera canadiense"
+msgstr "Paso canadiense"
msgid "Edit Cattle Grid"
-msgstr "Editar barrera canadiense"
+msgstr "Editar paso canadiense"
msgid "Bus Trap"
msgstr "Trampa para coches"
+msgid "Edit Bus Trap"
+msgstr "Editar trampa para autobuses"
+
msgid "Spikes"
msgstr "Resorte con pinchos (para el control de acceso unidireccional)"
@@ -15618,44 +16279,88 @@ msgstr "Editar aduana"
msgid "Hedge"
msgstr "Seto"
+msgid "Edit Hedge"
+msgstr "Editar borde"
+
+msgid "Height (meters)"
+msgstr "Altura (en metros)"
+
+msgid "Genus"
+msgstr "Género"
+
+msgid "Species"
+msgstr "Clase"
+
+msgid "Taxon"
+msgstr "Taxón"
+
msgid "Fence"
msgstr "Valla o cerca"
+msgid "Edit Fence"
+msgstr "Editar cerca"
+
msgid "barbed_wire"
msgstr "alambre de espino"
-msgid "chain"
+msgid "chain_link"
msgstr "cadena"
msgid "electric"
msgstr "eléctrica"
-msgid "hedge"
-msgstr "seto"
-
msgid "pole"
msgstr "poste"
msgid "split_rail"
-msgstr ""
+msgstr "valla"
+
+msgid "wire"
+msgstr "alambre"
+
+msgid "Guard Rail"
+msgstr "Guardarraíl, bionda o quitamiedos"
+
+msgid "Edit Guard Rail"
+msgstr "Editar guardarraíl"
msgid "Wall"
msgstr "Muro"
+msgid "Edit Wall"
+msgstr "Editar Muro"
+
msgid "City Wall"
msgstr "Muralla"
+msgid "Edit City Wall"
+msgstr "Editar muralla"
+
msgid "Retaining Wall"
msgstr "Muro de contención"
+msgid "Edit Retaining Wall"
+msgstr "Editar muro de contención"
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Acequia"
+msgstr "Zanja"
-msgid "Entrance"
-msgstr "Entrada"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Editar zanja"
-msgid "Edit Entrance"
-msgstr "Editar una entrada"
+msgid "Kerb"
+msgstr "Bordillo"
+
+msgid "Edit Kerb"
+msgstr "Editar bordillo"
+
+msgid "Entrance (barrier opening)"
+msgstr "Entrada (apertura de barrera)"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Editar Entrada (apertura de barrera)"
msgid "Gate"
msgstr "Puerta"
@@ -15688,12 +16393,27 @@ msgstr "Portilla giratoria"
msgid "Edit Kissing Gate"
msgstr "Editar portilla giratoria"
+msgid "Chain"
+msgstr "Cadena"
+
+msgid "Edit Chain"
+msgstr "Editar cadena"
+
msgid "Stile"
msgstr "Escalera de paso"
msgid "Edit Stile"
msgstr "Editar una escalera de paso"
+msgid "ladder"
+msgstr "escalera"
+
+msgid "squeezer"
+msgstr "estrecho"
+
+msgid "stepover"
+msgstr "peldaño"
+
msgid "Turnstile"
msgstr "Torno"
@@ -15725,10 +16445,10 @@ msgid "Edit Arcade"
msgstr "Editar arcada"
msgid "Open on left side"
-msgstr ""
+msgstr "Abierto en el lado izquierdo"
msgid "Open on right side"
-msgstr ""
+msgstr "Abierto en el lado derecho"
msgid "Colonnade"
msgstr "Columnata (galería, soportal, pórtico, peristilo, claustro, etc.)"
@@ -15751,8 +16471,11 @@ msgstr "Desagüe"
msgid "Edit Drain"
msgstr "Editar canal de desagüe"
+msgid "Ditch"
+msgstr "Acequia"
+
msgid "Edit Ditch"
-msgstr "Editar acequia"
+msgstr "Editar zanja"
msgid "Stream"
msgstr "Arroyo o riachuelo"
@@ -15760,6 +16483,12 @@ msgstr "Arroyo o riachuelo"
msgid "Edit Stream"
msgstr "editar arroyo o riachuelo"
+msgid "Wadi"
+msgstr "Uadi"
+
+msgid "Edit Wadi"
+msgstr "Editar Uadi"
+
msgid "Canal"
msgstr "Canal"
@@ -15799,9 +16528,6 @@ msgstr "Editar una presa"
msgid "Groyne"
msgstr "Espigón"
-msgid "Edit Groyne"
-msgstr "Editar espigón"
-
msgid "Breakwater"
msgstr "Rompeolas"
@@ -15835,6 +16561,21 @@ msgstr "Editar depósito de agua"
msgid "Edit Water"
msgstr "Editar lámina de agua"
+msgid "Water Body"
+msgstr "Cuerpo de agua"
+
+msgid "lake"
+msgstr "lago"
+
+msgid "lagoon"
+msgstr "laguna"
+
+msgid "pond"
+msgstr "estanque"
+
+msgid "reservoir"
+msgstr "reservorio"
+
msgid "Land"
msgstr "Suelo"
@@ -15916,18 +16657,23 @@ msgstr "Editar la terminal de ferry"
msgid "Cargo"
msgstr "Carga"
+msgctxt "cargo"
msgid "passengers"
msgstr "pasajeros"
+msgctxt "cargo"
msgid "vehicle"
msgstr "vehículo"
+msgctxt "cargo"
msgid "bicycle"
msgstr "bicicleta"
+msgctxt "cargo"
msgid "hgv"
-msgstr "vehículo de gran tonelaje (hgv)"
+msgstr "vehículos de carga"
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr "pasajeros;vehículo"
@@ -15980,16 +16726,16 @@ msgid "Railway"
msgstr "Ferrocarril"
msgid "Rail"
-msgstr "Vía de tren"
+msgstr "Vía de ferrocarril"
msgid "Edit Rail"
-msgstr "Ediar vía de tren"
+msgstr "Editar vía de ferrocarril"
msgid "main"
-msgstr ""
+msgstr "principal"
msgid "branch"
-msgstr ""
+msgstr "ramal"
msgid "industrial"
msgstr "industrial"
@@ -16000,8 +16746,11 @@ msgstr "zona militar"
msgid "tourism"
msgstr "turismo"
-msgid "Service/Type"
-msgstr ""
+msgid "freight"
+msgstr "carga"
+
+msgid "Service type"
+msgstr "Tipo de servicio"
msgid "yard"
msgstr "yarda"
@@ -16024,11 +16773,14 @@ msgstr "línea_de_contacto"
msgid "rail"
msgstr "ferrocarril"
-msgid "Voltage"
-msgstr "Voltaje"
+msgid "Voltage in Volts (V)"
+msgstr "Voltaje en voltios (V)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frecuencia en hercios (HZ)"
-msgid "Frequency (Hz)"
-msgstr "Frecuencia (Hz)"
+msgid "16.67"
+msgstr "16,67"
msgid "16.7"
msgstr "16.7"
@@ -16039,9 +16791,6 @@ msgstr "Vía estrecha"
msgid "Edit Narrow Gauge Rail"
msgstr "Editar vía estrecha"
-msgid "Types"
-msgstr "Tipos"
-
msgid "Monorail"
msgstr "Monoraíl"
@@ -16049,10 +16798,10 @@ msgid "Edit Monorail"
msgstr "Editar monoraíl"
msgid "Preserved"
-msgstr "Vía para tren histórico"
+msgstr "Vía de ferrocarril histórico"
msgid "Edit Preserved Railway"
-msgstr "Editar vía para tren histórico"
+msgstr "Editar vía de ferrocarril histórico"
msgid "Light Rail"
msgstr "Metro ligero"
@@ -16079,34 +16828,72 @@ msgid "Edit Bus Guideway"
msgstr "Editar vía para autobús guiado"
msgid "Disused Rail"
-msgstr "Vía de tren en desuso"
+msgstr "Vía de ferrocarril en desuso"
msgid "Edit Disused Railway"
-msgstr "Editar vía de tren en desuso"
-
-msgid "Optional Types"
-msgstr "Tipos opcionales"
+msgstr "Editar vía de ferrocarril en desuso"
msgid "Abandoned Rail"
-msgstr "Vía de tren abandonada"
+msgstr "Vía de ferrocarril abandonada"
+
+msgid "Edit Abandoned Railway"
+msgstr "Editar vía de ferrocarril abandonada"
msgid "Level Crossing"
msgstr "Paso a nivel"
-msgid "Crossing"
-msgstr "Paso a nivel peatonal"
+msgid "Edit Level Crossing"
+msgstr "Editar paso a nivel"
-msgid "Crossing type"
-msgstr "Tipo de paso"
+msgid "Supervised"
+msgstr "Supervisado"
-msgid "Turntable"
-msgstr "Plataforma de giro"
+msgid "Traffic lights"
+msgstr "Semáforos"
-msgid "Buffer Stop"
-msgstr "Tope de vía"
+msgid "Sound signals"
+msgstr "Señales sonoras"
-msgid "Aerialway"
-msgstr "Remonte"
+msgid "Barrier"
+msgstr "Barrera"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "sí"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "no"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "media"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "Completa"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "doble mitad"
+
+msgid "Crossing"
+msgstr "Paso a nivel peatonal"
+
+msgid "Edit Crossing"
+msgstr "Editar paso a nivel peatonal"
+
+msgid "Crossing type"
+msgstr "Tipo de paso"
+
+msgid "Turntable"
+msgstr "Plataforma de giro"
+
+msgid "Buffer Stop"
+msgstr "Tope de vía o topera"
+
+msgid "Aerialway"
+msgstr "Remonte"
msgid "Chair Lift"
msgstr "Telesilla"
@@ -16127,7 +16914,7 @@ msgid "Typical journey time in minutes"
msgstr "Tiempo de viaje típico en cuestión de minutos"
msgid "Has bubble?"
-msgstr ""
+msgstr "¿Tiene cápsula protectora?"
msgid "Has heating?"
msgstr "¿Está calefactado?"
@@ -16160,7 +16947,7 @@ msgid "Mixed Lift"
msgstr "Telemix (sillas y cabinas)"
msgid "Edit Mixed Lift (containing both gondolas and chairs)"
-msgstr ""
+msgstr "Editar elevador combinado (contiene tanto bancos como sillas)"
msgid "Number of people per gondola/chair"
msgstr "Número de personas por góndola/silla"
@@ -16195,13 +16982,11 @@ msgstr "Alfombra mágica"
msgid "Edit Magic Carpet"
msgstr "Editar alfombra mágica"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Mercancías"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Editar Mercancías"
+msgstr "Editar mercancías"
msgctxt "aerialway"
msgid "Station"
@@ -16211,11 +16996,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Editar estación de remonte"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Pilona"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Editar pilona"
@@ -16234,12 +17017,12 @@ msgstr "al aire libre"
msgid "underground"
msgstr "subterráneo"
+msgid "rooftop"
+msgstr "en azotea"
+
msgid "Access"
msgstr "Acceso"
-msgid "customers"
-msgstr "clientes"
-
msgid "Park and Ride"
msgstr "Aparcamiento disuasorio (Park & Ride)"
@@ -16267,9 +17050,6 @@ msgstr "Plazas de aparcamiento"
msgid "Edit Parking space"
msgstr "Editar plazas de aparcamiento"
-msgid "rooftop"
-msgstr "en azotea"
-
msgid "Capacity"
msgstr "Capacidad (Coches)"
@@ -16285,20 +17065,38 @@ msgstr "Límite de tiempo (minutos)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Supervisado"
-
msgid "Opening Hours"
msgstr "Horario de apertura"
msgid "24/7"
-msgstr "24/7"
+msgstr "las 24 horas, 7 días a la semana"
+
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
+
+msgid "Sa-Su 00:00-24:00"
+msgstr "S-D 00:00-24:00"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Lu-Vie 08:30-20:00"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "L-V 08:30-20:00; Sa,Su 08:00-15:00; PH cerrado"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Ma-Sa 08:00-15:00;Sa 08:00-12:00"
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "L-V 08:30-20:00,M-S 08:00-15:00; S 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"L-S 08:00-18:00; 10- 15 Abril cerrado; Junio 08:00-14:00; Agosto cerrado; 25 "
+"Diciembre cerrado"
+
+msgid "sunrise-sunset"
+msgstr "amanecer-anochecer"
+
+msgid "Su 10:00+"
+msgstr "D 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "semanas 1-53/2 V 09:00-12:00; semanas 2-52/2 X 09:00-12:00"
msgid "Parking entrance"
msgstr "Entrada de aparcamiento"
@@ -16447,6 +17245,9 @@ msgstr "Punto de recarga (para vehículos eléctricos)"
msgid "Edit Charging Station (for electric cars)"
msgstr "Editar punto de recarga (para vehículos eléctricos)"
+msgid "Voltage"
+msgstr "Voltaje"
+
msgid "Amperage"
msgstr "Amperaje"
@@ -16468,6 +17269,12 @@ msgstr "Taller"
msgid "Edit Car Repair"
msgstr "Editar reparación de automóviles"
+msgid "Parts"
+msgstr "Componentes de automóvil"
+
+msgid "Edit Car Parts"
+msgstr "Editar componentes de automóvil"
+
msgid "Tyres"
msgstr "Neumáticos"
@@ -16495,6 +17302,12 @@ msgstr "Alquiler"
msgid "Edit Car Rental"
msgstr "Editar alquiler de automóviles"
+msgid "Second hand"
+msgstr "Segunda mano"
+
+msgid "only"
+msgstr "solamente"
+
msgid "Sharing"
msgstr "Compartido"
@@ -16519,22 +17332,6 @@ msgstr "Servicios:"
msgid "Sale"
msgstr "Ventas"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "sí"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "marca"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "utilizado"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "no"
-
msgid "brand"
msgstr "marca"
@@ -16556,9 +17353,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Partes"
-
msgid "Clothes"
msgstr "Ropas"
@@ -16569,22 +17363,22 @@ msgid "anchors"
msgstr "anclajes"
msgid "ground_slots"
-msgstr ""
+msgstr "ranuras en el suelo"
msgid "informal"
msgstr "informal"
msgid "lockers"
-msgstr ""
+msgstr "cabinas"
msgid "shed"
-msgstr ""
+msgstr "caseta"
msgid "stands"
-msgstr ""
+msgstr "anclaje para bicicletas"
msgid "wall_loops"
-msgstr ""
+msgstr "estacionamiento con medias anillas"
msgid "Covered"
msgstr "Cubierta"
@@ -16608,10 +17402,12 @@ msgid "Bicycles are rented"
msgstr "Se alquilan bicicletas"
msgid "Free bicycle pump"
-msgstr ""
+msgstr "Servicio gratuito de compresor de aire"
msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
msgstr ""
+"Herramientas para realizar la reparación uno mismo (puede ser una "
+"cooperativa de bicicletas)"
msgid "Bicycles are washed (for a fee)"
msgstr "Se lavan bicicletas (pagando)"
@@ -16622,8 +17418,8 @@ msgstr "Editar alquiler de bicicletas"
msgid "Public Transport"
msgstr "Transporte público"
-msgid "Route"
-msgstr "Ruta"
+msgid "Public transport route"
+msgstr "Ruta de transporte público"
msgid "Edit Route"
msgstr "Editar ruta"
@@ -16662,13 +17458,13 @@ msgid "To (terminal stop)"
msgstr "Hasta (parada final)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Paradas intermedias de referencia"
msgid "Network"
msgstr "Red"
msgid "Color (HTML name or hexadecimal code)"
-msgstr ""
+msgstr "Color (nombre de código HTML o código hexadecimal)"
msgctxt "color"
msgid "black"
@@ -16700,19 +17496,19 @@ msgstr "blanco"
msgctxt "color"
msgid "#CD853F"
-msgstr ""
+msgstr "#CD853F"
msgid "route segment"
msgstr "segmento de la ruta"
msgid "stop position"
-msgstr "parada"
+msgstr "punto de detención"
msgid "stop position (exit only)"
-msgstr "Parada (entrada)"
+msgstr "Punto de detención (salida)"
msgid "stop position (entry only)"
-msgstr "Parada (salida)"
+msgstr "Punto de detención (salida)"
msgid "platform"
msgstr "plataforma"
@@ -16730,7 +17526,7 @@ msgid "Edit Route master"
msgstr "Editar ruta principal"
msgid "route variant/direction (at least 2)"
-msgstr ""
+msgstr "dirección/variante de ruta"
msgid "Stop Area"
msgstr "Área de detención"
@@ -16739,22 +17535,25 @@ msgid "Edit Stop Area"
msgstr "Editar área de detección"
msgid "UIC reference"
-msgstr ""
+msgstr "Referencia NIS (en desuso)"
msgid "UIC name"
-msgstr ""
+msgstr "Nombre NIS"
msgid "Stop Position"
-msgstr "Parada"
+msgstr "Punto de detención"
msgid "Platform"
-msgstr "Plataforma"
+msgstr "Plataforma o andén (parada)"
msgid "Station or amenities"
msgstr "Estación o servicios"
+msgid "Edit Stop Position"
+msgstr "Editar punto de detención"
+
msgid "Bus"
-msgstr ""
+msgstr "Autobús"
msgid "Bus stop (legacy)"
msgstr "Parada de autobús (etiqueta en desuso)"
@@ -16763,7 +17562,7 @@ msgid "Tram stop (legacy)"
msgstr "Trampa para vehículos (etiqueta en desuso)"
msgid "Train"
-msgstr ""
+msgstr "Tren"
msgid "Railway station (legacy)"
msgstr "Estación de ferrocarril (etiqueta en desuso)"
@@ -16772,16 +17571,19 @@ msgid "Railway halt (legacy)"
msgstr "Apeadero de ferrocarril (etiqueta en desuso)"
msgid "Trolleybus"
-msgstr ""
+msgstr "Trolebús"
msgid "Share taxi"
-msgstr ""
+msgstr "Taxi compartido"
msgid "Funicular"
-msgstr ""
+msgstr "Funicular"
msgid "Ferry"
-msgstr ""
+msgstr "Transbordador"
+
+msgid "Edit Platform"
+msgstr "Editar plataforma"
msgid "Bench"
msgstr "Banco"
@@ -16795,20 +17597,22 @@ msgstr "Silla de ruedas"
msgid "limited"
msgstr "limitado"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr "Plataforma de carretera (etiqueta en desuso)"
msgid "Railway platform (legacy)"
-msgstr "Anden de ferrocarril (etiqueta en desuso)"
+msgstr "Andén de ferrocarril (etiqueta en desuso)"
msgid "funicular"
-msgstr ""
+msgstr "funicular"
+msgctxt "railway"
msgid "Station"
-msgstr "Estación"
+msgstr "Estación de ferrocarril"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Editar estación de ferrocarril"
msgid "Building"
msgstr "Edificio"
@@ -16822,6 +17626,9 @@ msgstr "Editar boca de metro"
msgid "Ticket Machine"
msgstr "Máquina expendedora de billetes"
+msgid "Edit Ticket Machine"
+msgstr "Editar máquina expendedora de billetes"
+
msgid "Reference Number"
msgstr "Número de referencia"
@@ -16846,14 +17653,6 @@ msgstr "Tarjetas de fidelización o descuento"
msgid "Public Transport (legacy)"
msgstr "Transporte público (etiqueta en desuso)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Estación de ferrocarril"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Editar estación de ferrocarril"
-
msgid "UIC-Reference"
msgstr "UIC-Referencia"
@@ -16902,8 +17701,8 @@ msgstr "Editar andén de autobús"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Editar parada de taxi"
+msgid "Edit Taxi Station"
+msgstr "Editar estación de taxi"
msgid "Airport"
msgstr "Aeropuerto"
@@ -16956,6 +17755,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Editar Terminal"
+msgid "Internet access"
+msgstr "Acceso a Internet"
+
+msgid "wlan"
+msgstr "inalámbrica"
+
+msgid "wired"
+msgstr "con cable"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Costo del acceso a Internet"
+
msgctxt "airport"
msgid "Gate"
msgstr "Puerta"
@@ -16978,21 +17792,6 @@ msgstr "Editar hotel"
msgid "Stars"
msgstr "Estrellas"
-msgid "Internet access"
-msgstr "Acceso a Internet"
-
-msgid "wlan"
-msgstr "inalámbrica"
-
-msgid "wired"
-msgstr "con cable"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Costo del acceso a Internet"
-
msgid "Smoking"
msgstr "Fumadores"
@@ -17176,6 +17975,12 @@ msgstr "Discoteca"
msgid "Edit Nightclub"
msgstr "Editar discoteca"
+msgid "Stripclub"
+msgstr "Club de striptease"
+
+msgid "Edit Stripclub"
+msgstr "Editar club de striptease"
+
msgid "Tourism"
msgstr "Turismo"
@@ -17186,7 +17991,7 @@ msgid "Edit Attraction"
msgstr "Editar atracción"
msgid "Viewpoint"
-msgstr "Vistas panorámicas (mirador)"
+msgstr "Vista panorámica (mirador)"
msgid "Edit Viewpoint"
msgstr "Editar mirador panorámico"
@@ -17197,9 +18002,15 @@ msgstr "Torre de vigía"
msgid "Information Office"
msgstr "Oficina de información"
+msgid "Edit Information Office"
+msgstr "Editar oficina de información"
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr "Editar información de mapa"
+
msgid "Detail Grade"
msgstr "Grado de detalle"
@@ -17212,6 +18023,9 @@ msgstr "calle"
msgid "scheme"
msgstr "esquema"
+msgid "toposcope"
+msgstr "toposcopio"
+
msgid "Shown Area"
msgstr "Mostrar área"
@@ -17251,6 +18065,9 @@ msgstr "... otros modos de desplazamiento posible"
msgid "Information Board"
msgstr "Panel informativo"
+msgid "Edit Information Board"
+msgstr "Editar panel informativo"
+
msgid "Board Content"
msgstr "Tablón de anuncios"
@@ -17272,23 +18089,35 @@ msgstr "plantas"
msgid "Guidepost"
msgstr "Poste indicador"
+msgid "Edit Guidepost"
+msgstr "Editar poste indicador"
+
msgid "Information Terminal"
msgstr "Punto de información"
+msgid "Edit Information Terminal"
+msgstr "Editar punto de información"
+
msgid "Closer description"
msgstr "Descripción detallada"
msgid "Audioguide"
msgstr "Audioguía"
+msgid "Edit Audioguide"
+msgstr "Editar audioguía"
+
msgid "Audioguide via mobile phone?"
msgstr "¿Audioguía a través de teléfono móvil?"
msgid "Phone number"
msgstr "Número de teléfono"
-msgid "Other Information Points"
-msgstr "Otros puntos de información"
+msgid "Other Information Point"
+msgstr "Otros punto de información"
+
+msgid "Edit Information Point"
+msgstr "Editar punto de información"
msgid "Leisure"
msgstr "Ocio"
@@ -17311,9 +18140,6 @@ msgstr "Parque de perros"
msgid "Edit Dog Park"
msgstr "Editar parque de perros"
-msgid "Barrier"
-msgstr "Barrera"
-
msgid "fence"
msgstr "valla"
@@ -17338,8 +18164,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Editar sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr "Monta a caballo"
+
+msgid "Edit Horse riding"
+msgstr "Editar monta a caballo"
+
+msgid "Brothel"
+msgstr "Burdel o prostíbulo"
+
+msgid "Edit Brothel"
+msgstr "Editar burdel"
msgid "Playground"
msgstr "Zona de juegos"
@@ -17411,50 +18246,44 @@ msgstr "Obra de arte"
msgid "Edit Artwork"
msgstr "Editar obra de arte"
-msgid "Place of Worship"
-msgstr "Lugar de culto (templo, iglesia, mezquita, ermita, etc.)"
-
-msgid "Edit Place of Worship"
-msgstr "Editar lugar de culto"
-
-msgid "Religion"
-msgstr "Religión"
+msgid "Recording Studio"
+msgstr "Estudio de grabación"
-msgid "bahai"
-msgstr "bahaísta"
+msgid "Edit Studio"
+msgstr "Editar estudio"
-msgid "buddhist"
-msgstr "budista"
+msgid "audio"
+msgstr "audio"
-msgid "christian"
-msgstr "cristiana"
+msgid "video"
+msgstr "vídeo"
-msgid "hindu"
-msgstr "hindú"
+msgid "Place of Worship"
+msgstr "Lugar de culto"
-msgid "jain"
-msgstr "jainista"
+msgid "Church"
+msgstr "Iglesia"
-msgid "jewish"
-msgstr "judía"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "musulmana"
+msgid "Building type"
+msgstr "Tipo de edificio"
-msgid "sikh"
-msgstr "sijista"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "espiritualista"
+msgid "cathedral"
+msgstr "catedral"
-msgid "taoist"
-msgstr "taoista"
+msgid "chapel"
+msgstr "capilla o ermita"
-msgid "unitarian"
-msgstr "unitarismo"
+msgid "church"
+msgstr "iglesia"
-msgid "zoroastrian"
-msgstr "zoroástrica"
+msgid "temple"
+msgstr "templo"
msgid "Denomination"
msgstr "Confesión"
@@ -17471,6 +18300,12 @@ msgstr "católico"
msgid "evangelical"
msgstr "evangélico"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testigos de Jehová"
@@ -17483,6 +18318,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormón"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxo"
@@ -17498,70 +18336,174 @@ msgstr "protestante"
msgid "quaker"
msgstr "cuáquero"
-msgid "shia"
-msgstr "chiita"
+msgid "roman_catholic"
+msgstr "católico apostólico romano"
-msgid "sunni"
-msgstr "suní"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Horarios del servicio"
-msgid "Su 10:00"
-msgstr "Do 10:00"
+msgid "18:00"
+msgstr "18:00"
-msgid "Su 10:30"
-msgstr "Do 10:30"
+msgid "sunset,sunrise"
+msgstr "amanecer, atardecer"
-msgid "Su 11:00"
-msgstr "Do 11:00"
+msgid "Su 9:30,11:00"
+msgstr "D 9:30,11:00"
-msgid "Opening Hours for visiting"
-msgstr "Horario de visita"
+msgid "Sa,Su,PH 9:00"
+msgstr "S, D, PH 9:00"
-msgid "Recording Studio"
-msgstr "Estudio de grabación"
+msgid "Sa 18:00; Su 10:45"
+msgstr "S 18:00; D 10:45"
-msgid "Edit Studio"
-msgstr "Editar estudio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"Vi 08:00-18:00; Abr 10-15 off; Jun 07:00-20:00; Ago off; Dec 24 08:00-24:00"
-msgid "audio"
-msgstr "audio"
+msgid "Sa 10:00+"
+msgstr "S 10:00+"
-msgid "video"
-msgstr "vídeo"
+msgid "Mosque"
+msgstr "Mezquita"
-msgid "Public Building"
-msgstr "Edificio público"
+msgid "Edit Mosque"
+msgstr "Editar mezquita"
-msgid "Edit Public Building"
-msgstr "Editar edificio público"
+msgid "mosque"
+msgstr "mezquita"
-msgid "Town hall"
-msgstr "Ayuntamiento"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Editar ayuntamiento"
+msgid "shia"
+msgstr "chiita"
-msgid "Community Centre"
-msgstr "Centro comunitario"
+msgid "sunni"
+msgstr "suní"
-msgid "Embassy"
-msgstr "Embajada"
+msgid "Synagogue"
+msgstr "Sinagoga"
-msgid "Edit Embassy"
-msgstr "Editar embajada"
+msgid "Edit Synagogue"
+msgstr "Editar sinagoga"
-msgid "Courthouse"
-msgstr "Juzgado"
+msgid "synagogue"
+msgstr "sinagoga"
-msgid "Edit Courthouse"
-msgstr "Editar juzgado"
+msgid "conservative"
+msgstr ""
-msgid "Prison"
-msgstr "Prisión"
+msgid "reform"
+msgstr ""
-msgid "Edit Prison"
+msgid "Buddhist Temple"
+msgstr "Templo budista"
+
+msgid "Edit Buddhist Temple"
+msgstr "Editar templo budista"
+
+msgid "theravada"
+msgstr ""
+
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr "Templo hindú"
+
+msgid "Edit Hindu Temple"
+msgstr "Editar templo hindú"
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr "Santuario sintoísta"
+
+msgid "Edit Shinto Shrine"
+msgstr "Editar santuario sintoísta"
+
+msgid "Other Place of Worship"
+msgstr "Otro lugar de culto"
+
+msgid "Edit other Place of Worship"
+msgstr "Editar otro lugar de culto"
+
+msgid "Religion"
+msgstr "Religión"
+
+msgid "bahai"
+msgstr "bahaísta"
+
+msgid "jain"
+msgstr "jainista"
+
+msgid "sikh"
+msgstr "sijista"
+
+msgid "spiritualist"
+msgstr "espiritualista"
+
+msgid "taoist"
+msgstr "taoista"
+
+msgid "unitarian"
+msgstr "unitarismo"
+
+msgid "zoroastrian"
+msgstr "zoroástrica"
+
+msgid "Public Building"
+msgstr "Edificio público"
+
+msgid "Edit Public Building"
+msgstr "Editar edificio público"
+
+msgid "Town hall"
+msgstr "Ayuntamiento"
+
+msgid "Edit Town hall"
+msgstr "Editar ayuntamiento"
+
+msgid "Community Centre"
+msgstr "Centro comunitario"
+
+msgid "Embassy"
+msgstr "Embajada"
+
+msgid "Edit Embassy"
+msgstr "Editar embajada"
+
+msgid "Courthouse"
+msgstr "Juzgado"
+
+msgid "Edit Courthouse"
+msgstr "Editar juzgado"
+
+msgid "Prison"
+msgstr "Prisión"
+
+msgid "Edit Prison"
msgstr "Editar prisión"
msgid "Police"
@@ -17618,6 +18560,12 @@ msgstr "Editar autoescuela"
msgid "License Classes"
msgstr "Clases de licencia"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Centro médico"
@@ -17627,6 +18575,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Editar hospital"
+msgid "Clinic"
+msgstr "Clínica"
+
+msgid "Edit Clinic"
+msgstr "Editar clinica"
+
msgid "Doctors"
msgstr ""
"Consultorio médico (para centros de tratamiento ambulatorio y reconocimiento "
@@ -17650,10 +18604,10 @@ msgid "Edit Nursing Home"
msgstr "Edición Hogar de Ancianos"
msgid "Retirement Home"
-msgstr "Residencia de ancianos"
+msgstr "Centro de la tercera edad"
msgid "Edit Retirement Home"
-msgstr "Editar residencia de ancianos"
+msgstr "Editar centro de la tercera edad"
msgid "Pharmacy"
msgstr "Farmacia/Parafarmacia"
@@ -17697,12 +18651,66 @@ msgstr "Veterinario"
msgid "Edit Veterinary"
msgstr "Editar veterinario"
-msgid "Note"
-msgstr "Nota"
+msgid "Edit Toilets"
+msgstr "Editar baños"
+
+msgid "Access rights"
+msgstr "Permisos de acceso"
+
+msgid "public"
+msgstr "público"
+
+msgid "seasonal"
+msgstr "estacional"
+
+msgid "flush"
+msgstr "cisterna (evacuación de desechos con agua)"
+
+msgid "pitlatrine"
+msgstr "letrina exterior"
+
+msgid "chemical"
+msgstr "químico"
+
+msgid "bucket"
+msgstr "balde"
+
+msgid "Usage Position"
+msgstr "Posición de uso"
+
+msgid "seated"
+msgstr "sentado"
+
+msgid "seated;urinal"
+msgstr "sentado;urinal"
+
+msgid "squat"
+msgstr "cuclillas"
+
+msgid "urinal"
+msgstr "urinario"
msgid "Post Box"
msgstr "Buzón de correos"
+msgid "Edit Postbox"
+msgstr "Editar Buzón Postal"
+
+msgid "Collection times"
+msgstr "Horarios de recolección"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "Lu-Vi 15:00,17:45,19:00,23:00; Sá 15:10; Do 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "Lu-Vi 09:00-12:00,17:15; Sá 14:00; So,PH off"
+
+msgid "Drive through"
+msgstr "Utilizable desde el volante"
+
msgid "Telephone"
msgstr "Teléfono"
@@ -17712,6 +18720,30 @@ msgstr "Editar teléfono"
msgid "Telephone cards"
msgstr "Tarjetas telefónicas"
+msgid "Emergency Phone"
+msgstr "Teléfono de emergencia"
+
+msgid "Internet Access"
+msgstr "Acceso a Internet"
+
+msgid "Edit Internet Access"
+msgstr "Editar Acceso a Internet"
+
+msgid "Automated Defibrillator"
+msgstr "Desfibrilador automático"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Editar Desfibrilador Externo Automatizado"
+
+msgid "Located inside a building?"
+msgstr "¿Ubicado dentro de un edificio?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Última fecha de verificación (YYYY-MM-DD)"
+
+msgid "Last check note"
+msgstr "Nota de la última verificación"
+
msgid "Clock"
msgstr "Reloj"
@@ -17721,42 +18753,48 @@ msgstr "Editar reloj"
msgid "Display"
msgstr "Esfera"
-msgctxt "display"
msgid "analog"
msgstr "análogo"
-msgctxt "display"
msgid "digital"
msgstr "digital"
-msgctxt "display"
msgid "sundial"
msgstr "reloj de sol"
-msgctxt "display"
msgid "unorthodox"
-msgstr ""
+msgstr "no ortodoxo"
msgid "Support"
msgstr "Soporte"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "poste"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "Montado en la pared"
+msgstr "montado en la pared"
+msgctxt "mounting/support"
msgid "billboard"
msgstr "cartelera"
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "tierra"
+
msgid "Visibility/readability"
msgstr "Visibilidad/legibilidad"
msgid "house (up to 5m)"
-msgstr ""
+msgstr "hogareño (hasta 5 m)"
msgid "street (up to 20m)"
-msgstr ""
+msgstr "vial (hasta 20 m)"
msgid "area (more than 20m)"
-msgstr ""
+msgstr "de área (hasta 20 m)"
msgid "Shows current date"
msgstr "Muestra la fecha actual"
@@ -17773,8 +18811,8 @@ msgstr "Muestra la humedad"
msgid "Recycling"
msgstr "Reciclaje"
-msgid "Edit Recycling station"
-msgstr "Editar punto limpio"
+msgid "Edit Recycling Station"
+msgstr "Editar estación de reciclaje"
msgid "Batteries"
msgstr "Baterías"
@@ -17800,27 +18838,15 @@ msgstr "centro"
msgid "Waste Basket"
msgstr "Papelera"
-msgid "Edit Waste Basket"
-msgstr "Editar papelera"
-
msgid "Waste Disposal"
msgstr "Punto de recogida de residuos"
-msgid "Edit Waste Disposal"
-msgstr "Editar punto de recogida de residuos"
+msgid "Edit Bench"
+msgstr "Editar banco"
msgid "Backrest"
msgstr "Respaldo"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "piedra"
-
-msgid "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Número de asientos"
@@ -17832,7 +18858,7 @@ msgstr "Tipo de vivienda"
msgctxt "shelter"
msgid "weather_shelter"
-msgstr ""
+msgstr "refugio contra inclemencias climáticas"
msgctxt "shelter"
msgid "public_transport"
@@ -17840,11 +18866,11 @@ msgstr "transporte_público"
msgctxt "shelter"
msgid "picnic_shelter"
-msgstr ""
+msgstr "refugio para picnic"
msgctxt "shelter"
msgid "wildlife_hide"
-msgstr ""
+msgstr "guarida de observación de vida salvaje"
msgid "Hunting Stand"
msgstr "Apostadero de caza"
@@ -17855,14 +18881,17 @@ msgstr "Editar apostadero de caza"
msgid "Height"
msgstr "Altura"
+msgctxt "height"
msgid "low"
-msgstr "profundidad"
+msgstr "baja"
+msgctxt "height"
msgid "half"
msgstr "media"
+msgctxt "height"
msgid "full"
-msgstr "total"
+msgstr "completa"
msgid "Hide"
msgstr "Oculto"
@@ -17870,12 +18899,12 @@ msgstr "Oculto"
msgid "Lock"
msgstr "Esclusa"
-msgid "Drinking Water"
-msgstr "Fuente de agua potable"
-
-msgid "Edit Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr "Editar fuente de agua potable"
+msgid "Indoor"
+msgstr "Interior"
+
msgid "Fire Hydrant"
msgstr "Hidrante contra incendios"
@@ -17896,22 +18925,25 @@ msgstr "muro"
msgctxt "pipeline"
msgid "pond"
-msgstr "balsa"
+msgstr "balsa de agua"
msgid "Diameter (in mm)"
msgstr "Diametro (en mm)"
+msgid "Hydrant Position"
+msgstr "Posición de hidrante"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "carril"
msgctxt "hydrant position"
msgid "parking_lot"
-msgstr ""
+msgstr "área de estacionamiento"
msgctxt "hydrant position"
msgid "sidewalk"
-msgstr ""
+msgstr "vereda/acera"
msgctxt "hydrant position"
msgid "green"
@@ -17938,117 +18970,153 @@ msgstr "Estadio"
msgid "Edit Stadium"
msgstr "Editar estadio"
-msgid "select sport:"
-msgstr "seleccionar deporte:"
+msgid "Select sport:"
+msgstr "Seleccionar deporte"
-msgid "sport"
-msgstr "deporte"
+msgid "Sport"
+msgstr "Deporte"
+msgctxt "sport"
msgid "multi"
-msgstr "diversos"
+msgstr "múltiple"
+msgctxt "sport"
msgid "archery"
-msgstr "tiro con arco"
+msgstr "arquería"
+msgctxt "sport"
msgid "athletics"
msgstr "atletismo"
+msgctxt "sport"
msgid "american_football"
-msgstr "fútbol_americano"
+msgstr "fútbol americano"
+msgctxt "sport"
msgid "australian_football"
msgstr "fútbol australiano"
+msgctxt "sport"
msgid "baseball"
msgstr "béisbol"
+msgctxt "sport"
msgid "basketball"
msgstr "baloncesto"
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr "Deportes de bolas"
+msgctxt "sport"
msgid "bowls"
-msgstr "bolos"
+msgstr "bowls"
+msgctxt "sport"
msgid "canadian_football"
-msgstr "fútbol_canadiense"
+msgstr "fútbol canadiense"
+msgctxt "sport"
msgid "canoe"
-msgstr "piragua"
+msgstr "canoaje"
+msgctxt "sport"
msgid "climbing"
-msgstr "escalada"
+msgstr "montañismo"
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr "críquet"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "Cricket con redes"
+msgstr "redes de críquet"
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr "cróquet"
+msgctxt "sport"
msgid "cycling"
msgstr "ciclismo"
+msgctxt "sport"
msgid "dog_racing"
-msgstr "carrera de perros"
+msgstr "carreras de perros"
+msgctxt "sport"
msgid "equestrian"
msgstr "hípica"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr ""
+msgstr "juegos gaélicos"
+msgctxt "sport"
msgid "golf"
msgstr "golf"
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gimnasia"
+msgstr "gimnasia acrobática"
+msgctxt "sport"
msgid "hockey"
msgstr "hockey"
+msgctxt "sport"
msgid "horse_racing"
-msgstr "carrera de caballos"
+msgstr "carreras hípicas"
+msgctxt "sport"
msgid "motor"
msgstr "motor"
+msgctxt "sport"
msgid "pelota"
-msgstr "frontón"
+msgstr "pelota"
+msgctxt "sport"
msgid "racquet"
msgstr "raqueta"
+msgctxt "sport"
msgid "rugby_league"
-msgstr "rugby"
+msgstr "rugby liga"
+msgctxt "sport"
msgid "rugby_union"
-msgstr "rugby_union"
+msgstr "rugby unión"
+msgctxt "sport"
msgid "shooting"
msgstr "tiro"
+msgctxt "sport"
msgid "skateboard"
-msgstr "monopatín"
+msgstr "skateboarding"
+msgctxt "sport"
msgid "skating"
msgstr "patinaje"
+msgctxt "sport"
msgid "skiing"
-msgstr "esquí"
+msgstr "Esquí"
+msgctxt "sport"
msgid "soccer"
msgstr "Fútbol"
+msgctxt "sport"
msgid "swimming"
msgstr "natación"
+msgctxt "sport"
msgid "table_tennis"
msgstr "tenis de mesa"
+msgctxt "sport"
msgid "tennis"
msgstr "tenis"
@@ -18082,32 +19150,42 @@ msgstr "Mini golf"
msgid "Edit Miniature Golf"
msgstr "Editar mini golf"
-msgid "Sport"
-msgstr "Deporte"
-
msgid "Multi"
msgstr "Diversos"
msgid "Edit Multi"
msgstr "Editar diversos"
-msgid "type"
-msgstr "tipo"
-
+msgctxt "running"
msgid "pitch"
msgstr "cancha de juego"
+msgctxt "running"
msgid "sports_centre"
msgstr "Polideportivo"
+msgctxt "running"
msgid "stadium"
msgstr "Estadio"
+msgctxt "running"
+msgid "track"
+msgstr "pista"
+
msgid "9pin"
-msgstr ""
+msgstr "9 bolos"
msgid "Edit 9pin"
-msgstr ""
+msgstr "Editar bolos"
+
+msgid "pitch"
+msgstr "cancha de juego"
+
+msgid "sports_centre"
+msgstr "Polideportivo"
+
+msgid "stadium"
+msgstr "Estadio"
msgid "10pin"
msgstr "Bowling (bolos americanos)"
@@ -18142,6 +19220,22 @@ msgstr "Editar piragüismo"
msgid "Edit Cycling"
msgstr "Editar ciclismo"
+msgctxt "racing"
+msgid "pitch"
+msgstr "cancha de juego"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "Polideportivo"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "estadio"
+
+msgctxt "racing"
+msgid "track"
+msgstr "pista"
+
msgid "Dog Racing"
msgstr "Carreras de perros"
@@ -18154,8 +19248,33 @@ msgstr "Hípica"
msgid "Edit Equestrian"
msgstr "Editar hípica"
-msgid "horse_riding"
-msgstr ""
+msgctxt "riding"
+msgid "pitch"
+msgstr "campo de juego"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "Polideportivo"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "Estadio"
+
+msgctxt "riding"
+msgid "track"
+msgstr "pista"
+
+msgid "clay"
+msgstr "cemento"
+
+msgid "dirt"
+msgstr "tierra"
+
+msgid "fine_gravel"
+msgstr "ripiado fino"
+
+msgid "mud"
+msgstr "lodazal"
msgid "Horse Racing"
msgstr "Carreras de caballos"
@@ -18176,7 +19295,7 @@ msgid "Edit Skating"
msgstr "Editar patinaje"
msgid "ice_rink"
-msgstr ""
+msgstr "pista de hielo"
msgid "Skateboard"
msgstr "Monopatín"
@@ -18191,10 +19310,10 @@ msgid "Edit Swimming"
msgstr "Editar natación"
msgid "swimming_pool"
-msgstr ""
+msgstr "pileta"
msgid "water_park"
-msgstr ""
+msgstr "parque acuático"
msgid "Edit Skiing"
msgstr "Editar esquí"
@@ -18209,7 +19328,7 @@ msgid "nordic"
msgstr "nórdico"
msgid "skitour"
-msgstr ""
+msgstr "esquí de travesía"
msgid "snow_park"
msgstr "parque de snowboard"
@@ -18217,38 +19336,56 @@ msgstr "parque de snowboard"
msgid "Difficulty"
msgstr "Dificultad"
+msgctxt "piste:difficulty"
msgid "novice"
msgstr "novato"
+msgctxt "piste:difficulty"
msgid "easy"
msgstr "fácil"
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "intermedia"
+
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "avanzado"
+msgstr "avanzada"
+msgctxt "piste:difficulty"
msgid "expert"
msgstr "experto"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "fuera de pista"
+msgstr "pista libre (freeride)"
msgid "Grooming"
-msgstr ""
+msgstr "estilo de superficie"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "clásico"
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr ""
+msgstr "montículo"
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "patinaje"
+
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr ""
+msgstr "clásico;patinaje"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr ""
+msgstr "scooter"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr ""
+msgstr "esquí libre"
msgid "Shooting"
msgstr "Tiro"
@@ -18284,26 +19421,22 @@ msgid "Edit Canadian Football"
msgstr "Editar fútbol canadiense"
msgid "Gaelic Games"
-msgstr ""
+msgstr "Juegos gaélicos"
msgid "Edit Gaelic Games"
-msgstr ""
+msgstr "Editar juegos gaélicos"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr ""
+msgstr "Lanzamiento"
-msgctxt "gaelic game"
msgid "Football"
-msgstr ""
+msgstr "Fútbol"
-msgctxt "gaelic game"
msgid "Camogie"
-msgstr ""
+msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
-msgstr ""
+msgstr "Rounders"
msgid "Rugby League"
msgstr "Rugby"
@@ -18440,6 +19573,18 @@ msgstr "Aeromodelismo"
msgid "Edit Model Aerodrome"
msgstr "Editar aeromodelismo"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "cancha de juego"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "Polideportivo"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "pista"
+
msgid "RC Car"
msgstr "Vehículos por control remoto"
@@ -18447,64 +19592,138 @@ msgid "Edit RC Car"
msgstr "Editar vehículos por control remoto"
msgid "Man Made"
-msgstr "Construcciones"
+msgstr "Hecho por el hombre"
msgid "Edit Building"
msgstr "Editar edificio"
+msgctxt "building"
+msgid "yes"
+msgstr "sí"
+
+msgctxt "building"
msgid "roof"
msgstr "tejado"
+msgctxt "building"
msgid "garage"
msgstr "garaje"
-msgid "church"
-msgstr "iglesia"
+msgctxt "building"
+msgid "garages"
+msgstr "talleres"
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
+msgctxt "building"
msgid "school"
-msgstr "colegio"
+msgstr "escuela"
+msgctxt "building"
msgid "hangar"
msgstr "hangar"
+msgctxt "building"
msgid "commercial"
msgstr "comercial"
+msgctxt "building"
msgid "farm"
msgstr "granja"
+msgctxt "building"
msgid "transportation"
msgstr "transporte"
+msgctxt "building"
msgid "greenhouse"
-msgstr ""
+msgstr "invernadero"
+msgctxt "building"
msgid "office"
msgstr "oficina"
+msgctxt "building"
msgid "university"
msgstr "universidad"
+msgctxt "building"
+msgid "hospital"
+msgstr "hospital"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "almacén"
+
+msgctxt "building"
+msgid "retail"
+msgstr "zona comercial"
+
+msgctxt "building"
+msgid "shed"
+msgstr "caseta"
+
msgid "Residential Building"
msgstr "Edificio de viviendas"
msgid "Edit Residential Building"
msgstr "Editar edificio de viviendas"
-msgid "apartments"
-msgstr "apartamentos"
+msgctxt "building"
+msgid "residential"
+msgstr "residencial"
+
+msgctxt "building"
+msgid "apartments"
+msgstr "apartamentos"
+msgctxt "building"
msgid "house"
msgstr "casa"
+msgctxt "building"
msgid "hut"
msgstr "cabaña"
-msgid "terrace"
+msgctxt "building"
+msgid "dormitory"
msgstr ""
+msgctxt "building"
+msgid "terrace"
+msgstr "terraza"
+
+msgctxt "building"
msgid "detached"
-msgstr ""
+msgstr "vivienda unifamiliar"
+
+msgid "Entrance"
+msgstr "Entrada"
+
+msgid "Edit Entrance"
+msgstr "Editar una entrada"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "sí"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "principal"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "servicio"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "salida"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "emergencia"
msgid "Tower"
msgstr "Torre o antena"
@@ -18521,9 +19740,6 @@ msgstr "comunicación"
msgid "observation"
msgstr "observación"
-msgid "Height (meters)"
-msgstr "Altura (en metros)"
-
msgid "Flagpole"
msgstr "Mástil de bandera"
@@ -18733,42 +19949,68 @@ msgstr "Ciclo de funcionamiento"
msgid "Mo-Fr 22:00-05:00"
msgstr "Lu-Vi 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Estación de medición"
+msgid "Monitoring Station"
+msgstr "Estación de monitorización"
-msgid "Edit Measurement Station"
-msgstr "Editar estación de medición"
+msgid "Edit Monitoring Station"
+msgstr "Editar estación de monitorización"
-msgid "Measurement"
-msgstr "Medición"
+msgid "Monitoring:"
+msgstr "Monitoreo:"
-msgid "particulate_matter"
-msgstr "material particulado"
+msgid "Weather"
+msgstr "Clima"
-msgid "seismic"
-msgstr "sísmica"
+msgid "Water level"
+msgstr "Nivel del agua"
-msgid "water_level"
-msgstr "aforo de agua"
+msgid "Tide Level"
+msgstr "Nivel de la marea"
-msgid "weather"
-msgstr "atmosférica"
+msgid "Traffic"
+msgstr "Tráfico"
-msgid "Recording"
-msgstr "Registro"
+msgid "Air Quality"
+msgstr "Calidad del aire"
-msgid "manually"
-msgstr "manual"
+msgid "Noise"
+msgstr "Ruido"
-msgid "automated"
-msgstr "automática"
+msgid "GPS Signals"
+msgstr "Señales GPS"
-msgid "remote"
-msgstr "remota"
+msgid "GLONASS Signals"
+msgstr "Señales GLONASS"
-msgctxt "display"
-msgid "no"
-msgstr "no"
+msgid "Galileo Signals"
+msgstr "Señales Galileo"
+
+msgid "Radiation"
+msgstr "Radiación"
+
+msgid "Seismic Activity"
+msgstr "Actividad sísmica"
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Vértice geodésico"
@@ -18776,8 +20018,8 @@ msgstr "Vértice geodésico"
msgid "Edit Survey Point"
msgstr "Editar vértice geodésico"
-msgid "Surveillance"
-msgstr "Cámara de vigilacia"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Editar cámara de vigilancia"
@@ -18788,12 +20030,103 @@ msgstr "interiores"
msgid "outdoor"
msgstr "exteriores"
-msgid "public"
-msgstr "público"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "tienda"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Altura en metros (m)"
msgid "Power"
msgstr "Energía"
+msgid "Power Plant"
+msgstr "Planta generadora de energía"
+
+msgid "Edit Power Plant"
+msgstr "Editar planta generadora"
+
+msgid "Start date"
+msgstr "Fecha de inicio"
+
+msgid "Output forms of energy"
+msgstr "Formas de producción de energía"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+"(por favor añada esta información a los generadores si fuera posible)"
+
+msgid "electricity"
+msgstr "electricidad"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 W"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "agua caliente"
+
+msgid "hot air"
+msgstr "aire caliente"
+
+msgid "cold water"
+msgstr "agua fría"
+
+msgid "cold air"
+msgstr "aire frío"
+
+msgid "compressed air"
+msgstr "aire comprimido"
+
+msgid "steam"
+msgstr "vapor"
+
+msgid "vacuum"
+msgstr "vacío"
+
msgid "Power Generator"
msgstr "Generador de energía"
@@ -18845,89 +20178,196 @@ msgstr "eólico"
msgid "Method"
msgstr "Método"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "digestión_anaerobia"
+msgstr "digestión anaeróbica"
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr "presa"
+msgctxt "generator method"
msgid "combustion"
msgstr "combustión"
-msgid "dam"
-msgstr "presa"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "biológico / carbón / gasóleo / gas / gasolina / desechos"
+msgctxt "generator method"
msgid "fission"
msgstr "fisión"
+msgctxt "generator method"
msgid "fusion"
msgstr "fusión"
+msgctxt "generator method"
msgid "gasification"
msgstr "gasificación"
-msgid "photovoltaic"
-msgstr "fotovoltaico"
-
-msgid "pumped-storage"
-msgstr "almacenamiento por bombeo"
+msgid "biomass / waste"
+msgstr "biomasa / desperdicio"
-msgid "pumping"
-msgstr "de bombeo"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "fotovoltaica"
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "pirólisis"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "corriente-de-río"
+msgstr "corriente del río"
+
+msgctxt "generator method"
+msgid "stream"
+msgstr "arroyo"
+msgctxt "generator method"
msgid "thermal"
-msgstr "termal"
+msgstr "térmico"
-msgid "Output forms of energy"
-msgstr "Formas de producción de energía"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "agua bombeada del almacenaje"
-msgid "electricity"
-msgstr "electricidad"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "almacenamiento de agua"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Tipo de generador"
-msgid "3 kW"
-msgstr "3 W"
+msgid "combined_cycle"
+msgstr "ciclo combinado"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "combustión de gas"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "turbina Francis"
-msgid "hot water"
-msgstr "agua caliente"
+msgid "gas_turbine"
+msgstr "turbina de gas"
-msgid "hot air"
-msgstr "aire caliente"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "biogás, biomasa, gas, combustión de desperdicios"
-msgid "cold water"
-msgstr "agua fría"
+msgid "heat_pump"
+msgstr "bombeo de calor"
-msgid "cold air"
-msgstr "aire frío"
+msgid "horizontal_axis"
+msgstr "eje horizontal"
-msgid "compressed air"
-msgstr "aire comprimido"
+msgid "tidal steam / wind"
+msgstr "mareomotriz / viento"
-msgid "steam"
-msgstr "vapor"
+msgid "kaplan_turbine"
+msgstr "turbina Kaplan"
-msgid "vacuum"
-msgstr "vacío"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+"hidrológico corriente de río /hidrológico almacenamiento de agua / descarga "
+"de marea"
+
+msgid "pelton_turbine"
+msgstr "turbina Pelton"
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "hidrológico corriente del río / hidrológico almacenamiento de agua"
+
+msgid "reciprocating_engine"
+msgstr "motor recíproco"
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "biocombustible, biogás, gasóleo, gasolina"
+
+msgid "solar_photovoltaic_panel"
+msgstr "panel solar fotovoltaico"
-msgid "battery charging"
-msgstr "carga de batería"
+msgid "solar photovoltaic"
+msgstr "fotovoltaico solar"
-msgid "Power Station"
-msgstr "Central eléctrica"
+msgid "solar_thermal_collector"
+msgstr "colector termo solar"
-msgid "Edit Power Station"
-msgstr "Editar central eléctrica"
+msgid "solar thermal"
+msgstr "termo solar"
+
+msgid "steam_generator"
+msgstr "generador de vapor"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+"biológico, carbón, gasóleo, gas, gasolina, petróleo, combustión de desechos"
+
+msgid "steam_turbine"
+msgstr "turbina de vapor"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"geotermal / termo solar / biológico, carbón, petróleo, combustión de desechos"
+
+msgid "stellarator"
+msgstr "reactor estelar"
+
+msgid "nuclear fusion"
+msgstr "fusión nuclear"
+
+msgid "tokamak"
+msgstr "tokamak"
+
+msgid "vertical_axis"
+msgstr "eje vertical"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Reactor de agua hirviente 1 (BWR-1)"
+
+msgid "nuclear fission"
+msgstr "fisión nuclear"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Reactor de agua hirviente 2 (BWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Reactor de agua hirviente 3 (BWR-3)"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Reactor de agua hirviente 4 (BWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Reactor de agua hirviente 5 (BWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Reactor de agua hirviente 6 (BWR-6)"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Reactor de Uranio Deuterio Canadá (CANDU)"
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "Reactor Presurizado de China (CPR-1000)"
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Reactor Presurizado Europeo (EPR)"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Fusión de Confinamiento Inercial (ICF)"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Reactor de agua presurizada (PWR)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Reactor Vodo-Vodyanoi Energetichesky (VVER)"
+
+msgid "Output forms of energy:"
+msgstr "Formas de salida de energía:"
msgid "Power Sub Station"
msgstr "Subestación eléctrica"
@@ -18938,6 +20378,21 @@ msgstr "Editar subestación eléctrica"
msgid "Line reference"
msgstr "Línea de referencia"
+msgid "high"
+msgstr "alto"
+
+msgid "medium"
+msgstr "medio"
+
+msgid "low"
+msgstr "profundidad"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "Armario eléctrico"
@@ -18953,6 +20408,9 @@ msgstr "Editar torre de electricidad"
msgid "Tower reference"
msgstr "Referencia de la torre"
+msgid "steel"
+msgstr "acero"
+
msgid "Pole"
msgstr "Poste"
@@ -18971,13 +20429,11 @@ msgstr "Editar tendido eléctrico"
msgid "Line type"
msgstr "Tipo de línea"
-msgctxt "Power Line"
msgid "line"
-msgstr "Línea"
+msgstr "línea"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "baja tensión"
+msgstr "línea menor"
msgid "Amount of Cables"
msgstr "Cantidad de cables"
@@ -19084,11 +20540,11 @@ msgstr "Kiosco"
msgid "Edit Kiosk"
msgstr "Editar kiosco"
-msgid "Baker"
-msgstr "Panadería"
+msgid "Bakery"
+msgstr "Panadería, pastelería, confitería"
-msgid "Edit Baker"
-msgstr "Editar panadería"
+msgid "Edit Bakery"
+msgstr "Editar panadería, pastelería, confitería"
msgid "Butcher"
msgstr "Carnicería"
@@ -19099,8 +20555,8 @@ msgstr "Editar carnicería"
msgid "Seafood"
msgstr "Pescadería o marisquería"
-msgid "Edit Seafood"
-msgstr "Editarpescadería o marisquería"
+msgid "Edit Seafood Shop"
+msgstr "Editar tienda de mariscos"
msgid "Deli (Fine Food)"
msgstr "Delicatessen"
@@ -19120,20 +20576,26 @@ msgstr "Mercado"
msgid "Edit Marketplace"
msgstr "Editar mercado"
+msgid "Organic"
+msgstr "Tienda de productos orgánicos"
+
msgid "Greengrocer"
msgstr "Frutería o verdulería"
msgid "Edit Greengrocer"
msgstr "Editar frutería o verdulería"
-msgid "Organic"
-msgstr "Tienda de productos orgánicos"
+msgid "Farm Stand"
+msgstr "Productos de granja"
+
+msgid "Edit Farm Stand"
+msgstr "Editar productos de granja"
msgid "Edit Organic/Bio"
-msgstr ""
+msgstr "Editar Orgánico/Bio"
msgid "Organic/Bio"
-msgstr ""
+msgstr "Orgánico/Bio"
msgid "Fair Trade"
msgstr "Tienda de comercio justo"
@@ -19198,7 +20660,7 @@ msgstr "Editar sastrería"
msgid "Fabric"
msgstr "Textil"
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr "Editar tienda textil"
msgid "Electronic"
@@ -19211,7 +20673,7 @@ msgid "Edit Computer Shop"
msgstr "Editar tienda de informática"
msgid "Electronics"
-msgstr "Electrónica"
+msgstr "Electrónica y electrodomésticos"
msgid "Edit Electronics Shop"
msgstr "Editar tienda de electrónica"
@@ -19219,24 +20681,23 @@ msgstr "Editar tienda de electrónica"
msgid "Mobile Phone"
msgstr "Telefonía móvil"
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr "Editar tienda de telefonía móvil"
msgid "Vacuum Cleaner"
msgstr "Tienda de aspiradores"
-msgid "Edit Vacuum Cleaner"
-msgstr "Editar tienda de aspiradoras"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Editar Tienda de Aspiradoras"
msgid "Hifi"
-msgstr "Hi-Fi"
+msgstr "Sonido"
msgid "Edit Hifi Shop"
-msgstr "Editar tienda Hi-Fi"
+msgstr "Editar tienda de sonido"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Vídeo"
msgid "Edit Video Shop"
msgstr "Editar tienda de videos"
@@ -19262,6 +20723,12 @@ msgstr "Editar cambio de moneda"
msgid "Edit Automated Teller Machine"
msgstr "Editar cajero automático"
+msgid "Pawnbroker"
+msgstr "Casa de empeño"
+
+msgid "Edit Pawnbroker"
+msgstr "editar casa de empeño"
+
msgid "Department Store"
msgstr "Grandes almacenes"
@@ -19298,11 +20765,32 @@ msgstr "Joyería"
msgid "Edit Jewelry"
msgstr "Editar joyería"
+msgid "Gift"
+msgstr "Regalo"
+
+msgid "Edit Gift Shop"
+msgstr "Editar tienda de regalo"
+
+msgid "buddhist"
+msgstr "budista"
+
+msgid "christian"
+msgstr "cristiana"
+
+msgid "hindu"
+msgstr "hindú"
+
+msgid "jewish"
+msgstr "judía"
+
+msgid "muslim"
+msgstr "musulmana"
+
msgid "Erotic"
msgstr "Erótico"
-msgid "Edit Erotic"
-msgstr "Editar erótico"
+msgid "Edit Erotic Shop"
+msgstr "Editar Tienda Erótica"
msgid "Florist"
msgstr "Floristería"
@@ -19331,11 +20819,11 @@ msgstr "Editar ferretería"
msgid "Paint"
msgstr "Pinturas"
-msgid "Edit Paint"
-msgstr "Editar pinturas"
+msgid "Edit Paint Shop"
+msgstr "Editar pinturería"
msgid "Furniture"
-msgstr "Muebles"
+msgstr "Muebles y decoración"
msgid "Edit Furniture Shop"
msgstr "Editar mueblería"
@@ -19343,19 +20831,19 @@ msgstr "Editar mueblería"
msgid "Kitchen"
msgstr "Cocinas"
-msgid "Edit Kitchen"
-msgstr "Editar cocinas"
+msgid "Edit Kitchen Store"
+msgstr "Editar tienda de cocinas"
msgid "Curtain"
msgstr "Cortinajes"
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr "Editar tienda de cortinajes"
msgid "Frame"
msgstr "Enmarcaciones"
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr "Editar tienda de enmarcaciones"
msgid "Stationery"
@@ -19376,6 +20864,12 @@ msgstr "Librería"
msgid "Edit Book Store"
msgstr "Editar librería"
+msgid "Newsagent''s shop"
+msgstr "Venta de periódicos"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Editar lugar de venta de periódicos"
+
msgid "Travel Agency"
msgstr "Agencia de viajes"
@@ -19385,8 +20879,8 @@ msgstr "Editar agencia de viajes"
msgid "Musical Instrument"
msgstr "Instrumentos musicales"
-msgid "Edit Musical Instruments"
-msgstr "Editar Instrumentos musicales"
+msgid "Edit Musical Instruments Shop"
+msgstr "Editar tienda de instrumentos musicales"
msgid "Toys"
msgstr "Juguetes"
@@ -19395,7 +20889,7 @@ msgid "Edit Toy Shop"
msgstr "Editar juguetería"
msgid "Variety Store"
-msgstr "Tienda de variedades"
+msgstr "Tienda de variedades o bazar"
msgid "Edit Variety Store"
msgstr "Edición de la tienda variedades"
@@ -19466,6 +20960,9 @@ msgstr "juguetes"
msgid "vouchers"
msgstr "Bonos"
+msgid "Note"
+msgstr "Nota"
+
msgid "Geography"
msgstr "Geografía"
@@ -19536,7 +21033,7 @@ msgid "Edit County"
msgstr "Editar municipio"
msgid "Population"
-msgstr "Población"
+msgstr "Nº de habitantes"
msgid "Post code"
msgstr "Código postal"
@@ -19601,6 +21098,12 @@ msgstr "Pico"
msgid "Edit Peak"
msgstr "Editar pico"
+msgid "Saddle"
+msgstr "Collado"
+
+msgid "Edit Saddle"
+msgstr "Editar collado"
+
msgid "Glacier"
msgstr "Glaciar"
@@ -19640,26 +21143,35 @@ msgstr "Árbol"
msgid "Edit Tree"
msgstr "Editar árbol"
+msgid "broad_leaved"
+msgstr "de hojas anchas"
+
+msgid "conifer"
+msgstr "conífera"
+
+msgid "palm"
+msgstr "palmera"
+
msgid "Botanical Name"
msgstr "Nombre botánico"
+msgid "Tree Row"
+msgstr "Fila de árboles"
+
msgid "Wood"
msgstr "Bosque natural"
msgid "Edit Wood"
msgstr "Editar bosque"
-msgctxt "wood"
msgid "coniferous"
-msgstr "coníferas"
+msgstr "conífera"
-msgctxt "wood"
msgid "deciduous"
msgstr "caducifolio"
-msgctxt "wood"
msgid "mixed"
-msgstr "mezclado"
+msgstr "mixto"
msgid "Forest"
msgstr "Plantación forestal"
@@ -19667,38 +21179,29 @@ msgstr "Plantación forestal"
msgid "Edit Forest Landuse"
msgstr "Editar zona forestal"
-msgid "coniferous"
-msgstr "conífera"
-
-msgid "deciduous"
-msgstr "caducifolio"
-
-msgid "mixed"
-msgstr "mixto"
-
msgid "Grassland"
-msgstr ""
+msgstr "Pradera"
msgid "Edit Grassland"
-msgstr ""
+msgstr "Editar pradera"
msgid "pampas"
-msgstr ""
+msgstr "pampa"
msgid "prairie"
-msgstr ""
+msgstr "pradera"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
-msgstr ""
+msgstr "sabana"
msgid "steppe"
-msgstr ""
+msgstr "estepa"
msgid "veld"
-msgstr ""
+msgstr "veld (meseta sudafricana)"
msgid "Nature Reserve"
msgstr "Reserva natural"
@@ -19719,10 +21222,10 @@ msgid "Edit Fell"
msgstr "Editar braña"
msgid "Scrub"
-msgstr "Matorral"
+msgstr "Monte bajo (arbustos, matorral o maleza)"
msgid "Edit Scrub"
-msgstr "Editar matorral"
+msgstr "Editar monte bajo"
msgid "Heath"
msgstr "Brezal o landa"
@@ -19751,6 +21254,12 @@ msgstr "Prado"
msgid "Edit Meadow Landuse"
msgstr "Editar prado"
+msgid "Orchard"
+msgstr "Huerta"
+
+msgid "Edit Orchard Landuse"
+msgstr "Editar huerta"
+
msgid "Vineyard"
msgstr "Viñedo"
@@ -19793,8 +21302,8 @@ msgstr "Editar parque municipal"
msgid "Common"
msgstr ""
-"Espacio donde el propietario permite el paso (tipología característica en "
-"Reino Unido)"
+"Espacio donde el propietario permite el paso y disfrute (tipología "
+"característica en Reino Unido, no es servidumbre de paso)"
msgid "Edit Common"
msgstr "Editar espacio donde el propietario permite el paso"
@@ -19811,18 +21320,21 @@ msgstr "Área de esparcimiento"
msgid "Edit Recreation Ground Landuse"
msgstr "Editar área de esparcimiento"
-msgid "Residential area"
-msgstr "Área residencial"
+msgid "Residential Area"
+msgstr "Zona residencial"
msgid "Edit Residential Landuse"
msgstr "Editar suelo residencial"
msgid "Graveyard"
-msgstr "Camposanto (para los cementerios próximos a las iglesias)"
+msgstr "Camposanto (para antiguos lugares de enterramiento)"
msgid "Edit Graveyard"
msgstr "Editar camposanto"
+msgid "shinto"
+msgstr "sintoísmo"
+
msgid "Cemetery"
msgstr "Cementerio"
@@ -19830,13 +21342,13 @@ msgid "Edit Cemetery Landuse"
msgstr "Editar cementerio"
msgid "Retail"
-msgstr "Comercios"
+msgstr "Zona comercial"
msgid "Edit Retail Landuse"
-msgstr "Editar comercios"
+msgstr "Editar zona comercial"
msgid "Commercial"
-msgstr "Oficinas"
+msgstr "De negocios"
msgid "Edit Commercial Landuse"
msgstr "Editar oficinas"
@@ -19899,6 +21411,33 @@ msgstr "Editar cantera"
msgid "Annotation"
msgstr "Anotación"
+msgid "Edit Name Information"
+msgstr "Editar información sobre el nombre"
+
+msgid "Alternative name"
+msgstr "Nombre alternativo"
+
+msgid "Historical name"
+msgstr "Nombre histórico"
+
+msgid "Local name"
+msgstr "Nombre local"
+
+msgid "Regional name"
+msgstr "Nombre regional"
+
+msgid "National name"
+msgstr "Nombre nacional"
+
+msgid "International name"
+msgstr "Nombre internacional"
+
+msgid "Official name"
+msgstr "Nombre oficial"
+
+msgid "Common name abbreviation"
+msgstr "Abreviatura común del nombre"
+
msgid "Edit Address Information"
msgstr "Editar direcciones"
@@ -19917,30 +21456,6 @@ msgstr "Nombre de la ciudad"
msgid "Country code"
msgstr "Código del país"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolación de números de portales"
@@ -19959,6 +21474,18 @@ msgstr "pares"
msgid "alphabetic"
msgstr "alfabético"
+msgid "Accuracy"
+msgstr "Precisión"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Contacto (esquema común)"
@@ -20121,27 +21648,56 @@ msgstr "donde termina el control"
msgid "traffic light or barrier that stops you"
msgstr "semáforo o barrera que le detiene"
-msgid "Route (legacy)"
-msgstr "Ruta (etiqueta en desuso)"
+msgid "General route"
+msgstr "Ruta general"
+
+msgid "Edit general route"
+msgstr "Editar ruta general"
-msgid "Edit Route (legacy)"
-msgstr "Editar ruta (etiqueta en desuso)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "bicicleta"
+
+msgctxt "route type"
+msgid "bus"
+msgstr "autobús"
+msgctxt "route type"
msgid "road"
-msgstr "carretera"
+msgstr "camino"
+msgctxt "route type"
+msgid "ferry"
+msgstr "ferry"
+
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr "esquí"
+msgctxt "route type"
msgid "foot"
msgstr "pie"
+msgctxt "route type"
msgid "hiking"
-msgstr "senda"
+msgstr "senderismo"
+msgctxt "route type"
+msgid "tram"
+msgstr "tranvía"
+
+msgctxt "route type"
msgid "detour"
msgstr "desvío"
+msgctxt "route type"
+msgid "railway"
+msgstr "ferrocarril"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "metro"
+
msgid "Symbol description"
msgstr "Descripción del símbolo"
@@ -20167,16 +21723,16 @@ msgid "backward segment"
msgstr "segmento anterior"
msgid "east segment (North America)"
-msgstr ""
+msgstr "segmento este (América del Norte)"
msgid "north segment (North America)"
-msgstr ""
+msgstr "segmento norte (América del Norte)"
msgid "west segment (North America)"
-msgstr ""
+msgstr "segmento oste (América del Norte)"
msgid "south segment (North America)"
-msgstr ""
+msgstr "segmento sur (América del Norte)"
msgid "halt point"
msgstr "punto de detención"
@@ -20187,21 +21743,24 @@ msgstr "próximo punto de parada"
msgid "backward halt point"
msgstr "anterior punto de parada"
-msgid "Route network"
+msgid "Route Network"
msgstr "Red de rutas"
-msgid "Edit route network"
-msgstr "Editar red rutas"
+msgid "Edit Route Network"
+msgstr "Editar red de rutas"
msgid "member"
msgstr "miembro"
-msgid "Associated street"
+msgid "Associated Street"
msgstr "Calle asociada"
-msgid "Edit associated street"
+msgid "Edit Associated Street"
msgstr "Editar calle asociada"
+msgid "house"
+msgstr "casa"
+
msgid "Street"
msgstr "Calle"
@@ -20223,7 +21782,7 @@ msgstr "cualquier cosa relacionada con la calle"
msgid "Destination sign"
msgstr "Señal de destino"
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr "Editar señal de destino"
msgid "Destination written on sign (w/o distance)"
@@ -20266,46 +21825,46 @@ msgid "Subtype of waterway (largest one of members)"
msgstr "Subtipo de vía fluvial (más de un miembro)"
msgid "river"
-msgstr ""
+msgstr "río"
msgid "stream"
msgstr "arroyo"
msgid "canal"
-msgstr ""
+msgstr "canal"
msgid "drain"
-msgstr ""
+msgstr "drenaje"
msgid "ditch"
-msgstr ""
+msgstr "zanja"
msgid "Name of river/sea/ocean"
-msgstr ""
+msgstr "Nombre de río/mar/océano"
msgid "Reference Sandre (FR)"
-msgstr ""
+msgstr "Referencia Sandre (FR)"
msgid "Reference FGKZ (DE)"
-msgstr ""
+msgstr "Referencia FGKZ (DE)"
msgid "Reference REGINE (NO)"
-msgstr ""
+msgstr "Referencia REGINE (NO)"
msgid "Reference GNIS (USA)"
-msgstr ""
+msgstr "Referencia GNIS (USA)"
msgid "Reference GNBC (CA)"
-msgstr ""
+msgstr "Referencia GNBC (Gabinete de Nomenclatura Geográfica de Canadá)"
msgid "waterways (no riverbank)"
msgstr "vía fluvial (no para riberas)"
msgid "branch waterways (no riverbank)"
-msgstr ""
+msgstr "brazos fluviales (no usar para riberas)"
msgid "spring of waterway"
-msgstr ""
+msgstr "naciente del cauce fluvial"
msgid "Length (meters)"
msgstr "Longitud (metros)"
@@ -20317,20 +21876,29 @@ msgid "ways passing under the bridge"
msgstr "vías que pasan bajo el puente"
msgid "way forming the outline footprint"
-msgstr ""
+msgstr "vía que conforma el contorno"
-msgid "nodes forming the outline"
-msgstr ""
+msgid "edge ways parallel to ''across''"
+msgstr "vías frontera paralelas a \"a lo largo de\""
msgid "ways passing through the tunnel"
msgstr "vías que pasan a través del túnel"
+msgid "edge ways parallel to ''through''"
+msgstr "vías frontera paralelas a \"a través\""
+
msgid "bridge"
msgstr "puente"
msgid "deprecated"
msgstr "obsoleto"
+msgid "bicycle"
+msgstr "bicicleta"
+
+msgid "foot"
+msgstr "pie"
+
msgid "horse"
msgstr "caballo"
@@ -20340,8 +21908,11 @@ msgstr "barrera"
msgid "motorroad"
msgstr "Autovía"
-msgid "highway_track"
-msgstr "pista"
+msgid "highway.track"
+msgstr "carretera.pista"
+
+msgid "livingdashed"
+msgstr "livingdashed"
msgid "services"
msgstr "servicios"
@@ -20349,11 +21920,11 @@ msgstr "servicios"
msgid "ford"
msgstr "vado"
-msgid "highway_platform"
-msgstr "plataforma de la carretera"
+msgid "highway.platform"
+msgstr "carretera.plataforma"
-msgid "emergency_access_point"
-msgstr "Punto de acceso de emergencias"
+msgid "emergency.access.point"
+msgstr "emergencia.acceso.punto"
msgid "riverbank"
msgstr "ribera"
@@ -20370,6 +21941,9 @@ msgstr "rápidos"
msgid "railwaypoint"
msgstr "punto ferroviario"
+msgid "raildashed"
+msgstr "raildashed"
+
msgid "railyard"
msgstr "terminal ferroviaria"
@@ -20385,29 +21959,29 @@ msgstr "vía muerta"
msgid "aeroway"
msgstr "aerovía"
-msgid "aeroway_dark"
-msgstr "pista (oscuro)"
+msgid "aeroway.dark"
+msgstr "aeródromo.oscuro"
-msgid "aeroway_light"
-msgstr "pista (claro)"
+msgid "aeroway.light"
+msgstr "aeródromo.claro"
-msgid "piste_easy"
-msgstr "pista fácil"
+msgid "piste.easy"
+msgstr "pista.fácil"
-msgid "piste_intermediate"
-msgstr "pista intermedia"
+msgid "piste.intermediate"
+msgstr "pista.intermedia"
-msgid "piste_advanced"
-msgstr "pista avanzada"
+msgid "piste.advanced"
+msgstr "pista.avanzada"
-msgid "piste_expert"
-msgstr "pista para expertos"
+msgid "piste.expert"
+msgstr "pista.experta"
-msgid "piste_freeride"
-msgstr "pista de estilo libre"
+msgid "piste.freeride"
+msgstr "pista.libre"
-msgid "piste_novice"
-msgstr "pista para iniciados"
+msgid "piste.novice"
+msgstr "pista.novato"
msgid "power"
msgstr "energía"
@@ -20427,20 +22001,20 @@ msgstr "puerto deportivo"
msgid "amenity"
msgstr "servicios"
-msgid "amenity_traffic"
-msgstr "tráfico de ocio"
+msgid "amenity.traffic"
+msgstr "instalación.tráfico"
-msgid "amenity_light"
-msgstr "equipamiento lumínico"
+msgid "amenity.light"
+msgstr "instalación.luz"
-msgid "light_water"
-msgstr "agua (claro)"
+msgid "light.water"
+msgstr "claro.agua"
msgid "health"
msgstr "salud"
-msgid "shop"
-msgstr "tienda"
+msgid "office"
+msgstr "oficina"
msgid "hotel"
msgstr "hotel"
@@ -20470,7 +22044,7 @@ msgid "farmyard"
msgstr "edificio agrario"
msgid "retail"
-msgstr "venta al por menor"
+msgstr "zona comercial"
msgid "brownfield"
msgstr "área postindustrial degradada"
@@ -20497,7 +22071,7 @@ msgid "natural"
msgstr "espacio natural"
msgid "scrub"
-msgstr "matorral"
+msgstr "monte bajo"
msgid "heath"
msgstr "monte"
@@ -20505,9 +22079,6 @@ msgstr "monte"
msgid "woodarea"
msgstr "plantación forestal"
-msgid "mud"
-msgstr "lodazal"
-
msgid "beach"
msgstr "playa"
@@ -20517,11 +22088,14 @@ msgstr "ruta"
msgid "boundary"
msgstr "frontera"
+msgid "sport"
+msgstr "deporte"
+
msgid "place"
msgstr "lugar"
-msgid "tiger_data"
-msgstr "datos_TIGER"
+msgid "tiger.data"
+msgstr "tiger.data"
msgid "address"
msgstr "dirección"
@@ -20535,9 +22109,6 @@ msgstr "Población/Ciudad"
msgid "One Way"
msgstr "Sentido único"
-msgid "Church"
-msgstr "Iglesia"
-
msgid "Fuel Station"
msgstr "Gasolinera"
@@ -20554,263 +22125,459 @@ msgid "Test"
msgstr "Prueba"
msgid "abbreviated street name"
-msgstr ""
+msgstr "nombre de calle abreviado"
msgid "oneway tag on a node"
-msgstr ""
+msgstr "etiqueta de sentido único en un nodo"
msgid "bridge tag on a node"
-msgstr ""
+msgstr "etiqueta bridge en un nodo"
msgid "wrong highway tag on a node"
+msgstr "incorrecta etiqueta highway en un nodo"
+
+msgid "wrong crossing tag on a way"
msgstr ""
msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "unclassified highway sin nombre"
msgid "highway without a reference"
-msgstr ""
+msgstr "highway sin una referencia"
msgid "temporary highway type"
-msgstr ""
+msgstr "tipo de carretera de uso temporal"
msgid "misspelled key name"
-msgstr ""
+msgstr "nombre de la clave mal escrito"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "cycleway con etiqueta bicycle"
msgid "footway with tag foot"
-msgstr ""
+msgstr "footway con etiqueta foot"
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "ciclovías separadas como carriles en una ciclovía"
msgid "barrier used on a way"
-msgstr ""
+msgstr "barrier usado en una vía"
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "maxspeed usado para footway"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "etiqueta layer con el signo +"
msgid "street name contains ss"
-msgstr ""
+msgstr "nombre de calle contiene ss"
msgid "relation without type"
-msgstr ""
+msgstr "relation sin type"
msgid "restaurant without name"
-msgstr ""
+msgstr "restaurant sin name"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "inusual combinación de etiquetas (highway & waterway)"
msgid "unusual tag combination (highway & natural)"
+msgstr "inusual combinación de etiquetas (highway & natural)"
+
+msgid "unusual tag combination (landuse & building)"
msgstr ""
-msgid "natural water used for swimming pool"
+msgid "unnecessary access key"
msgstr ""
-msgid "incline without highway"
+msgid "unnecessary motor_vehicle=yes"
msgstr ""
+msgid "natural water used for swimming pool"
+msgstr "lago/laguna utilizado como piscina"
+
+msgid "numerical key"
+msgstr "tecla numérica"
+
+msgid "route_master relation without route_master=*"
+msgstr "relación route_master sim route_master=*"
+
+msgid "power line without voltage"
+msgstr "Línea eléctrica sin voltaje"
+
+msgid "substation key without power=substation"
+msgstr "clave de subestación sin power=substation"
+
+msgid "transformer key without power"
+msgstr "clave de transformador sin energía"
+
+msgid "missing substation=*"
+msgstr "falta substation=*"
+
+msgid "missing transformer=*"
+msgstr "falta transformer=*"
+
+msgid "incline without highway or railway"
+msgstr "inclinación sin vía o camino"
+
msgid "junction without highway"
-msgstr ""
+msgstr "junction sin highway"
msgid "lanes without highway"
-msgstr ""
+msgstr "lanes sin highway"
msgid "lcn without highway"
-msgstr ""
+msgstr "lcn sin highway"
-msgid "lit without highway"
-msgstr ""
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "iluminación sin vía/ferrocarril/pista/estacionamiento/plataforma"
msgid "living_street without highway"
-msgstr ""
+msgstr "living_street sin highway"
msgid "maintenance without highway"
-msgstr ""
+msgstr "maintenance sin highway"
msgid "median without highway"
-msgstr ""
+msgstr "median sin highway"
msgid "motorroad without highway"
-msgstr ""
+msgstr "motorroad sin highway"
msgid "ntd_id without highway"
-msgstr ""
+msgstr "ntd_id sin highway"
-msgid "oneway without highway"
-msgstr ""
+msgid "oneway without highway or railway"
+msgstr "sentido único sin vía o camino"
msgid "sac_scale without highway"
-msgstr ""
+msgstr "sac_scale sin highway"
msgid "segregated without highway"
-msgstr ""
+msgstr "segregated sin highway"
msgid "sidewalk without highway"
-msgstr ""
+msgstr "sidewalk sin highway"
msgid "smoothness without highway"
-msgstr ""
+msgstr "smoothness sin highway"
msgid "snowplowing without highway"
-msgstr ""
+msgstr "snowplowing sin highway"
msgid "step_count without highway"
-msgstr ""
+msgstr "step_count sin highway"
msgid "toll without highway"
-msgstr ""
+msgstr "toll sin highway"
msgid "tracktype without highway"
-msgstr ""
+msgstr "tracktype sin highway"
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "trail_visibility sin highway"
msgid "trolley_wire without highway"
-msgstr ""
+msgstr "trolley_wire sin highway"
msgid "zip_left without highway"
-msgstr ""
+msgstr "zip_left sin highway"
msgid "zip_right without highway"
-msgstr ""
+msgstr "zip_right sin highway"
msgid "detail without railway"
-msgstr ""
+msgstr "detail sin railway"
msgid "eddy_current_brake without railway"
-msgstr ""
+msgstr "eddy_current_brake sin railway"
msgid "electrified without railway"
-msgstr ""
+msgstr "electrified sin railway"
msgid "etcs without railway"
-msgstr ""
+msgstr "etcs sin railway"
msgid "gauge without railway"
-msgstr ""
+msgstr "gauge sin railway"
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "grade_of_track sin railway"
msgid "kursbuchstrecke without railway"
-msgstr ""
+msgstr "kursbuchstrecke sin railway"
msgid "lzb without railway"
-msgstr ""
+msgstr "lzb sin railway"
msgid "old_railway_operator without railway"
-msgstr ""
+msgstr "old_railway_operator sin railway"
msgid "operating_procedure without railway"
-msgstr ""
+msgstr "operating_procedure sin railway"
msgid "pzb without railway"
-msgstr ""
+msgstr "pzb sin railway"
msgid "radio without railway"
-msgstr ""
+msgstr "radio sin railway"
msgid "structure_gauge without railway"
-msgstr ""
+msgstr "structure_gauge sin railway"
msgid "tilting_technologie without railway"
-msgstr ""
+msgstr "tilting_technologie sin railway"
msgid "track_class without railway"
-msgstr ""
+msgstr "track_class sin railway"
msgid "tracks without railway"
-msgstr ""
+msgstr "tracks sin railway"
msgid "traffic_mode without railway"
-msgstr ""
+msgstr "traffic_mode sin railway"
msgid "usage without railway"
-msgstr ""
+msgstr "usage sin railway"
msgid "workrules without railway"
-msgstr ""
+msgstr "workrules sin railway"
msgid "stream without waterway"
-msgstr ""
+msgstr "stream sin waterway"
msgid "intermittent without waterway"
-msgstr ""
+msgstr "intermittent sin waterway"
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "boat sin waterway / natural=water"
msgid "length_unit without waterway"
-msgstr ""
+msgstr "length_unit sin waterway"
msgid "llid without waterway"
-msgstr ""
+msgstr "llid sin waterway"
msgid "canal without waterway"
-msgstr ""
+msgstr "canal sin waterway"
msgid "have_riverbank without waterway"
+msgstr "have_riverbank sin waterway"
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "túnel sin vía/ferrocarril/cauce fluvial/plataforma/ducto"
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "puente sin vía/ferrocarril/cauce fluvial/plataforma/pista/ducto"
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psv sin vía/ferrocarril/cauce fluvial/estacionamiento"
+
+msgid "width without physical linear feature"
+msgstr "ancho sin característica de línea física"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "velocidad máxima sin vía/ferrocarril/señal de tráfico/forzado"
+
+msgid "fence_type without barrier=fence"
+msgstr "fence_type sin barrier=fence"
+
+msgid "border_type without boundary"
+msgstr "border_type sin boundary"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "recycling_type sin amenity=recycling"
+
+msgid "board_type without information=board"
+msgstr "board_type sin information=board"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "shelter_type sin amenity=shelter"
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "lamp_type sin highway=street_lamp"
+
+msgid "map_type without information=map"
+msgstr "map_type sin information=map"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "site_type sin historic=archaeological_site"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "artwork_type sin tourism=artwork"
+
+msgid "castle_type without historic=castle"
+msgstr "castle_type sin historic=castle"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "reservoir_type sin landuse/water=reservoir"
+
+msgid "bunker_type without military=bunker"
+msgstr "bunker_type sin military=bunker"
+
+msgid "source:addr without addr:*"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "source:date without source"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:name without name"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:building without building"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:ref without ref"
msgstr ""
-msgid "religion without denomination"
+msgid "source:population without population"
msgstr ""
-msgid "unknown christian denomination"
+msgid "source:geometry on a node"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
msgstr ""
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
+msgstr ""
+
+msgid "religion without denomination"
+msgstr "religion sin denomination"
+
+msgid "unknown christian denomination"
+msgstr "denomination desconocido de christian"
+
+msgid "unknown muslim denomination"
+msgstr "denominación musulmana desconocida"
+
+msgid "unknown jewish denomination"
+msgstr "denominación judía desconocida"
+
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"no colocar wikipedia-idioma, use ''wikipedia''=''idioma:título de la página''"
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
+msgstr "prefijo de idioma desconocido en la etiqueta wikipedia"
+
+msgid "layer should be between -5 and 5"
+msgstr "la capa debe estar entre -5 y 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr "level debería ser un número con opcional de .5 incrementos"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
msgstr ""
+"altura: por defecto en metros; el separador es el punto; si fija las "
+"unidades, ingrese un espacio antes de la unidad"
-msgid "Landsat"
-msgstr "Landsat"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"altura máxima: por defecto en metros; el separador es el punto; si fija las "
+"unidades, ingrese un espacio antes de la unidad"
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
msgstr ""
+"ancho: por defecto en metros; el separador es el punto; si fija las "
+"unidades, ingrese un espacio antes de la unidad"
-msgid "Yahoo Sat"
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
+"ancho máximo: por defecto en metros; el separador es el punto; si fija las "
+"unidades, ingrese un espacio antes de la unidad"
+
+msgid "unusual maxspeed format"
+msgstr "formato de velocidad máxima inusual"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+"el voltaje debería ser en voltios sin unidades/delimitadores/espacios"
+
+msgid "unusual frequency specification"
+msgstr "especificación de frecuencia inusual"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "ancho de vía de tren inusual, usar mm sin separación"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "inclinación inusual; usar porcentajes/grados o arriba/abajo"
+
+msgid "Landsat"
+msgstr "Landsat"
+
+msgid "Yahoo Sat"
+msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
-msgid "MapBox Satellite"
+msgid "HDDM (Humanitarian OpenStreetMap)"
msgstr ""
+msgid "MapBox Satellite"
+msgstr "MapBox Satellite"
+
msgid "MapQuest Open Aerial"
-msgstr "Open Aerial de MapQuest"
+msgstr "MapQuest Open Aerial"
+
+msgid "OpenStreetMap GPS Traces"
+msgstr "Trazas GPS de OpenStreetMap"
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
@@ -20818,176 +22585,234 @@ msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr "OpenStreetMap (Mapnik Blanco y Negro)"
-msgid "Skobbler"
-msgstr ""
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "mapa de calor de skobbler"
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr "Copy text \t OpenCycleMap"
msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgstr "OSM MapQuest"
msgid "Public Transport (ÖPNV)"
-msgstr "Transporte público (ÖPNV)"
+msgstr "Transporte Público (ÖPNV)"
msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (estilo alemán)"
-msgid "Streets NRW Geofabrik.de"
-msgstr "Calles NRW Geofabrik.de de Renania del Norte-Westfalia"
-
-msgid "Hike & Bike"
-msgstr ""
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr ""
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Idioma Alemán)"
-
-msgid "OpenPT Map (overlay)"
-msgstr ""
-
-msgid "Bavaria (2 m)"
-msgstr ""
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam bilingüe"
-msgid "Hamburg (40 cm)"
-msgstr ""
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (DK5)"
-msgstr ""
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI blanco-y-negro 2.5m"
msgid "Geoimage.at MaxRes"
+msgstr "Geoimage.at MaxRes"
+
+msgid "basemap.at"
msgstr ""
msgid "Graz: Basiskarte (base map)"
-msgstr ""
+msgstr "Graz: Basiskarte (mapa base)"
msgid "Tiris: DGM (Terrain model)"
-msgstr ""
+msgstr "Tiris: DGM (modelo de terreno)"
msgid "Tiris: DOM (Surface model)"
-msgstr ""
+msgstr "Tiris: DOM (modelo de superficie)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr ""
+msgstr "Viena: Mehrzweckkarte (propósito general)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "Viena: Beschriftungen (anotaciones)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr ""
+msgstr "Viena: Ortofoto (imagen aérea)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr ""
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr ""
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Stadtplan Zürich"
-msgstr ""
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (modelo de terreno)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr ""
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (modelo de superficie)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr ""
+msgid "Geobase Hydrography"
+msgstr "Hidrografía Geobase"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr ""
+msgid "Geobase Roads"
+msgstr "Rutas Geobase"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr ""
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr ""
+msgid "British Columbia Mosaic"
+msgstr "Mosaico de Columbia Británica"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr ""
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr ""
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr ""
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Dinamarca)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr ""
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Dinamarca)"
-msgid "Geobase Hydrography"
-msgstr ""
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Dinamarca)"
-msgid "Geobase Roads"
-msgstr ""
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Mapa base de Estonia (Maaamet)"
-msgid "Canvec"
-msgstr ""
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Orto (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr ""
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr ""
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvernia 2009/2010 - 30 cm"
-msgid "MSR Maps Urban"
-msgstr ""
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "USGS Scanned Topographic Maps"
-msgstr ""
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "USGS Large Scale Imagery"
-msgstr ""
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr ""
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Marítimos 2009 - 40 cm"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Geobretaña - Brest 2010 - 10 cm"
-msgid "7th Series (OS7)"
-msgstr "Serie 7(OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Geobretaña - Morbihan 2010"
-msgid "OS New Popular Edition historic"
-msgstr ""
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Geolitoral - Ortofotos 2000"
-msgid "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Geolitoral - Ortofotos 2010-2012"
+
+msgid "Géolittoral - Sentiers"
+msgstr "Geolitoral - Sentiers"
+
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loira-Atlántico - Orthofotos 2012 - 20 cm"
+
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Ortofotoplan 2011"
+
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Ortofotoplan 2007"
+
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Ortofotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthofotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
+"Vercors - Reserva natural de Hauts-Plateaux du Vercors - Orthofotos 1999 - 1 "
+"m"
-msgid "OS OpenData Locator"
+msgid "Streets NRW Geofabrik.de"
+msgstr "Calles NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Excursión & Ciclismo"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (lenguas sorbias)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (idioma alemán)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "Mapa OpenPT (superposición)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburgo (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Bavaria (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
+"Antiguo mapa de Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
+"Antiguo mapa de Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "DE Físico - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "DE Físico:Harz - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
msgstr ""
+"DE Físico:Harz - Superposición para Bing (z.B. Deckkraft zw. 20 y 50 Prozent "
+"nutzen)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imágenes de Drone (Haiti)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr ""
+msgstr "Oficina de Guerra de Irlanda Británica Una-Pulgada 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr ""
+msgstr "Irlanda Cuarto de Pulgada Bartolomé 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr ""
+msgstr "Irlanda EEA GMES Atlas Urbano"
msgid "Ireland EEA CORINE 2006"
-msgstr ""
+msgstr "Irlanda EEA CORINE 2006"
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
msgid "Lombardia - Italy (CTR)"
-msgstr ""
+msgstr "Lombardía - Italia"
msgid "Sicily - Italy"
msgstr "Sicilia - Italia"
@@ -20996,64 +22821,67 @@ msgid "PCN 2006 - Italy"
msgstr "PCN 2006 - Italia"
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr ""
+msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr ""
+msgstr "URSS - Letonia"
msgid "50cm ortho - Latvia"
-msgstr ""
+msgstr "50cm orto - Letonia"
msgid "20cm ortho - Coastline"
-msgstr ""
+msgstr "20 cm orto - Línea costera"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr ""
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lituania)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr ""
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Delta del Níger Oct 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr ""
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinán/Bulacan (Alta Resolución Filipinas)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr ""
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr ""
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr ""
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Coche"
-msgid "Géobretagne - Morbihan 2010"
-msgstr ""
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Excursionismo"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr ""
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Bici"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr ""
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Esquí"
-msgid "Géolittoral - Sentiers"
-msgstr ""
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Mapa de Katastrálna, Eslovenia (KaPor, 2010-04)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Mapa de Katastrálna, Eslovenia (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr ""
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Eslovaquia EEA GMES Atlas Urbano"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr ""
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Eslovaquia EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008"
-msgstr ""
+msgid "Slovakia Historic Maps"
+msgstr "Mapas Históricos de Eslovaquia"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "Sudáfrica CD:NGI Aérea"
msgid "Catastro Spain"
-msgstr ""
+msgstr "Catastro de España"
msgid "PNOA Spain"
-msgstr "PNOA (España)"
+msgstr "PNOA España"
msgid "SIGPAC Spain"
msgstr "SIGPAC España"
@@ -21061,95 +22889,155 @@ msgstr "SIGPAC España"
msgid "GRAFCAN - Canary Islands"
msgstr "GRAFCAN - Islas Canarias"
-msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castilla y León"
+msgid "ITACyL - Castile and León"
+msgstr "ITACyL - Castilla y León"
+
+msgid "IDEIB - Balearic Islands"
+msgstr "IDEIB - Islas Baleares"
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Cantón Aargau 25cm (AGIS 2011)"
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Ciudad de Uster Ortofoto 2008 10cm"
+
+msgid "Stadtplan Zürich"
+msgstr "Plano de la ciudad de Zúrich"
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Cantón de Solothurn 12.5cm (SOGIS 2007)"
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Cantón Solothurn 12.5cm (SOGIS 2011)"
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Cantón Solothurn Infrarot 12.5cm (SOGIS 2011)"
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Cantón de Ginebra 5cm (SITG 2011)"
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Cantón de Neuchâtel 50cm (SITN 2006)"
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton de Jura 50cm (RCJU 1998)"
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Cantón de Friburgo 50cm (2005)"
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Ciudad de Berna 10cm/25cm (2008)"
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Ortofoto Yverdon-les-Bains 25cm (2007)"
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthofoto 2010 HD 5cm/pi"
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoribera - Orthofoto 2012"
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthofoto 2012"
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausana - Orthofoto técnica 2012"
+
+msgid "MSR Maps Topo"
+msgstr "MSR Mapas Topográfico"
+
+msgid "MSR Maps Urban"
+msgstr "MSR Mapas Urbano"
+
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Mapas Topográficos Escaneados"
-msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Islas Baleares"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Imágenes Satelitales a Gran Escala"
-msgid "Estonia Basemap (Maaamet)"
-msgstr ""
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM TIGER Estados Unidos 2012 Superposición de rutas"
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
-msgstr ""
+msgid "OSM - Tiger Edited Map"
+msgstr "OSM - Tiger Mapa Editado"
-msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcelas"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Dinamarca)"
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Imágenes ortofotográficas"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dinamarca)"
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ucrania - Ortofotomapas 2012"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "7th Series (OS7)"
+msgstr "Séptima serie (OS7)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr ""
+msgid "OS New Popular Edition historic"
+msgstr "OS Nueva Edición Popular histórica"
-msgid "ScanEx IRS"
-msgstr ""
+msgid "OS OpenData StreetView"
+msgstr "OS Vista callejera OpenData"
-msgid "ScanEx SPOT"
-msgstr ""
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Localizador"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr ""
+msgid "Surrey Air Survey"
+msgstr "Surrey Investigación aérea"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr ""
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-pulgadas Escocia 1842-82"
-msgid "South Africa CD:NGI Aerial"
-msgstr ""
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k Primera Serie 1937-61"
-msgid "Freemap.sk Car"
-msgstr ""
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch Séptima Series 1955-61"
-msgid "Freemap.sk Hiking"
-msgstr ""
+msgid "OS 1:25k historic (OSM)"
+msgstr "OS 1:25k histórica (OSM)"
-msgid "Freemap.sk Cyclo"
-msgstr ""
+msgid "OS Scottish Popular historic"
+msgstr "OS Escocés Popular histórica"
-msgid "Freemap.sk Ski"
-msgstr ""
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartolomé Mdia Pulgada, 1897-1907"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr ""
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "Planos de Ciudad OS, Cupar 1854 (NLS)"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr ""
+msgid "OSM Export"
+msgstr "Exportar a OSM"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr ""
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportar datos de tráfico a archivo de red SUMO."
-msgid "Slovakia EEA CORINE 2006"
-msgstr ""
+msgid "SUMO Export"
+msgstr "Exportar a SUMO"
-msgid "Slovakia Historic Maps"
-msgstr ""
+msgid "Export"
+msgstr "Exportar"
-msgid "AGRI black-and-white 2.5m"
-msgstr ""
+msgid "Port:"
+msgstr "Puerto:"
-msgid "OSM - Tiger Edited Map"
-msgstr ""
+msgid "refresh the port list"
+msgstr "refrescar la lista de puertos"
-msgid "OS 1:25k historic (OSM)"
-msgstr ""
+msgid "Configure"
+msgstr "Configurar"
-msgid "OS Scottish Popular historic"
-msgstr ""
+msgid "Connection Error."
+msgstr "Error de conexión."
-msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "Configurar la conexión DG100"
-msgid "2u"
-msgstr ""
+msgid "delete data after import"
+msgstr "Eliminar los datos después de importarlos"
msgid "Columbus V-900 CSV Files"
msgstr "Archivos CSV Columbus V-900"
@@ -21158,7 +23046,7 @@ msgid "Importing CSV file ''%s''..."
msgstr "Importando archivo CSV ''%s''..."
msgid "Markers of "
-msgstr ""
+msgstr "Marcadores de "
msgid "Show summary after import"
msgstr "Mostrar resumen tras importar"
@@ -21210,9 +23098,10 @@ msgstr "Falta definición del nuevo objeto con id {0}."
msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
msgstr ""
+"Falta el atributo obligatorio ''{0}'' en el <miembro> de la relación {1}."
msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr ""
+msgstr "Valor no permitido para el atributo ''uid''. Se obtuvo ''{0}''."
msgid "nodes"
msgstr "nodos"
@@ -21363,6 +23252,18 @@ msgstr "Muestra el perfil de elevación"
msgid "Elevation Profile"
msgstr "Perfil de elevación"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Capa de Elevación de Grilla (¡experimental!)"
+
+msgid "Shows elevation grid layer"
+msgstr "Mostrar la capa de grilla de elevación"
+
+msgid "Elevation Grid"
+msgstr "Grilla de elevación"
+
+msgid "No SRTM data"
+msgstr "No hay datos de SRTM"
+
msgid "Open the elevation profile window."
msgstr "Abrir la ventana del perfil de elevación."
@@ -21384,20 +23285,14 @@ msgstr "Ganancia"
msgid "Time"
msgstr "Tiempo"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "Automática"
-
-msgid "Fixed value"
-msgstr "Valor fijo"
+msgid "Tracks"
+msgstr "Vías"
msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "Perfil del terreno para la traza '' {0}''."
msgid "Elevation profile"
-msgstr "Perfil de elevación"
+msgstr "Perfil del terreno"
msgid "(No elevation data)"
msgstr "(No hay datos de elevación)"
@@ -21406,28 +23301,28 @@ msgid "Can not save preferences"
msgstr "No se puede guardar las preferencias"
msgid "FastDraw configuration"
-msgstr ""
+msgstr "Configuración de dibujo rápido"
msgid "Epsilon multiplier"
-msgstr ""
+msgstr "Multiplicador Épsilon"
msgid "Starting Epsilon"
-msgstr ""
+msgstr "Épsilon Inicial"
msgid "Max points count per 1 km"
-msgstr ""
+msgstr "Máximo número de puntos contabilizados para 1 km"
msgid "Enter key mode"
-msgstr ""
+msgstr "Modo de tecla INTRO"
msgid "Auto add tags"
-msgstr ""
+msgstr "Añadir automáticamente etiquetas"
msgid "Autosimplify"
-msgstr ""
+msgstr "Autosimplificar"
msgid "Simplify with initial epsilon"
-msgstr ""
+msgstr "Simplificar con épsilon inicial"
msgid "Save as is"
msgstr "Salvar como está"
@@ -21442,10 +23337,10 @@ msgid "Add fixed points on spacebar"
msgstr "Añadir puntos fijos con barra espaciadora"
msgid "Draw closed polygons only"
-msgstr ""
+msgstr "Dibujar únicamente polígonos cerrados"
msgid "Try copying tags from properties table"
-msgstr ""
+msgstr "Intentar copiar etiquetas desde la tabla de propiedades"
msgid "FastDraw settings"
msgstr "Ajuste de FastDraw"
@@ -21496,19 +23391,19 @@ msgid "Line information"
msgstr "línea de información"
msgid "Cannot place node outside of the world."
-msgstr ""
+msgstr "No se puede ubicar un nodo fuera del mundo."
msgid "Draw the way by mouse"
-msgstr ""
+msgstr "Dibujar la vía con el ratón"
msgid "min distance={0} px ({1} m)"
msgstr "distancia mínima={0} px ({1} m)"
msgid "Convert way to FastDraw line"
-msgstr ""
+msgstr "Convertir la vía a una línea FastDraw"
msgid "Eps={0}, {1} points, {2} p/km"
-msgstr ""
+msgstr "Eps={0}, {1} puntos, {2} p/km"
msgid "Fix addresses"
msgstr "fijar direcciones"
@@ -21517,7 +23412,7 @@ msgid "Show dialog with incomplete addresses"
msgstr "Muestra un cuadro de diálogo con la direcciones incompletas"
msgid "Include objects used for guesses"
-msgstr ""
+msgstr "Incluir objetos utilizados para las sugerencias"
msgid "Fix street addresses"
msgstr "Corregir direcciones"
@@ -21596,7 +23491,7 @@ msgstr "no hay elementos"
msgctxt "address"
msgid "City"
-msgstr ""
+msgstr "Ciudad"
msgid "Postcode"
msgstr "Código postal"
@@ -21667,7 +23562,13 @@ msgstr "Seleccionar direcciones incompletas"
msgid "Selects all addresses with incomplete data."
msgstr "Seleccionar todas las direcciones con datos incompletos"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Utilice la etiqueta 'addr:street' o 'addr:place'"
+
msgid "House Number Editor"
+msgstr "Editor de número de portal"
+
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -21679,7 +23580,7 @@ msgid "Default image projection"
msgstr "Proyección de la imagen por defecto"
msgid "JOSM''s current projection"
-msgstr ""
+msgstr "Proyección actual de JOSM"
msgid ""
"No projection file (.prj) found.<br>You can choose the default image "
@@ -21687,10 +23588,17 @@ msgid ""
"image projection.<br>(It can be changed later from the right click menu of "
"the image layer.)"
msgstr ""
+"No se encontró el archivo de proyección (.prj).<br>Puede escoger la "
+"proyección de imagen por defecto ({0}) o el editor de proyección actual de "
+"JOSM ({1}) como la proyección de imagen original.<br>(puede ser cambiado "
+"luego con el menú contextual de la capa de imnagen)"
msgid "Layer Properties"
msgstr "Propiedades de la capa"
+msgid "Error while creating image layer: {0}"
+msgstr "Error al crear la capa de imagen: {0}"
+
msgid "Import image"
msgstr "Importar imagen"
@@ -21701,22 +23609,22 @@ msgid "Error while creating image layer: "
msgstr "Error mientras se creaba la capa imagen: "
msgid "NanoLog"
-msgstr ""
+msgstr "NanoLog"
msgid "NanoLog of {0} entries"
-msgstr ""
+msgstr "NanoLog de {0} entradas"
msgid "NanoLog of {0} lines, {1} of them with coordinates."
-msgstr ""
+msgstr "NanoLog de {0} líneas, {1} de ellas con coordenadas."
msgid "Open NanoLog panel"
-msgstr ""
+msgstr "Abrir el panel NanoLog"
msgid "Open NanoLog file..."
-msgstr ""
+msgstr "Abrir el archivo NanoLog..."
msgid "Edit opening hours"
-msgstr "Horas de edición"
+msgstr "Horarios de apertura"
msgid "Edit time-tag of selected element in a graphical interface"
msgstr ""
@@ -21724,10 +23632,10 @@ msgstr ""
"elemento seleccionado."
msgid "edit existing tag"
-msgstr "editar etiqueta existente"
+msgstr "Editar etiqueta existente"
msgid "edit new tag"
-msgstr "editar nueva etiqueta"
+msgstr "Editar nueva etiqueta"
msgid "Display clock in 12h mode."
msgstr "Mostrar reloj en modo 12h."
@@ -21754,25 +23662,37 @@ msgid "open end"
msgstr "terminación accesible"
msgid "Import Osm Inspector Bugs..."
-msgstr ""
+msgstr "Importar los Errores de Osm Inspector..."
msgid "OsmInspector"
-msgstr ""
+msgstr "OsmInspector"
msgid "Open OsmInspector"
-msgstr ""
+msgstr "OsmInspector Abierto"
msgid "OsmBugInfo"
-msgstr ""
+msgstr "OsmBugInfo"
msgid "Open a OSM Inspector selection list window."
-msgstr ""
+msgstr "Abrir una ventana de lista de selección de OSM."
msgid "Current Selected Bug Info"
-msgstr ""
+msgstr "Bug Info actualmente seleccionado"
+
+msgid "Prev OSMI bug"
+msgstr "Previsualizar error OSMI"
+
+msgid "Next OSMI bug"
+msgstr "Siguiente error OSMI"
msgid "Osm Inspector Bugs"
-msgstr ""
+msgstr "Errores de Osm Inspector"
+
+msgid "OSM Inspector Bugs"
+msgstr "Errores de Osm Inspector"
+
+msgid "Selected Bug Info"
+msgstr "Información del Bug Seleccionado"
msgid "Handy Address Interpolation Functions"
msgstr "Funciones manuales de interpolación de números de portales"
@@ -21862,8 +23782,8 @@ msgstr "Se preveía número de portal impar"
msgid "Expected even numbers for addresses"
msgstr "Se preveía número de portal par"
-msgid "Expected valid number for address increment"
-msgstr "Se preveía un número válido para el incremento de número de portal"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "El código de país debe tener 2 letras"
@@ -21905,34 +23825,47 @@ msgid ""
"Please select two segments that don''t share any nodes.\n"
"Alternatively put the pivot on their common node.\n"
msgstr ""
+"Por favor seleccione dos segmentos que no compartan nodos.\n"
+"Otra alternativa es escoger el nodo común como pivote.\n"
msgid ""
"Aligning would result nodes ''outside the world''.\n"
"Alignment not possible.\n"
msgstr ""
+"El alineamiento daría como resultado nodos \"fuera del mundo\".\n"
+"No es posible el alineamiento.\n"
msgid ""
"There is at least a non-pivot endpoint of the alignee that joins more than "
"two way segments.\n"
"Preserved angles type alignment is not possible.\n"
msgstr ""
+"Hay al menos un punto final que no es pivote del alineado y une más de dos "
+"segmentos\n"
+"No es posible el alineamiento preservando los ángulos.\n"
msgid ""
"The alignment is not possible with maintaining the angles of the joint "
"segments.\n"
"Either choose the ''keep length'' aligning method or select other segments.\n"
msgstr ""
+"No es posible el alineamiento manteniendo los ángulos de los segmentos "
+"unidos.\n"
+"Escoja el método de alineamiento \"mantener la longitud\" o seleccione otros "
+"segmentos.\n"
msgid ""
"An intersection point would fall outside its adjacent nodes.\n"
"This is an unsupported scenario.\n"
msgstr ""
+"Un punto de intersección caería fuera de sus nodos adyacentes.\n"
+"Este escenario no está previsto.\n"
msgid "Undocumented problem occured.\n"
-msgstr ""
+msgstr "Ocurrió un problema no documentado.\n"
msgid "AlignWayS: Alignment not possible"
-msgstr "Alinear Vías: No se pudo alinear"
+msgstr "Alinear vías: No se pudo alinear"
msgid "Align way segment"
msgstr "Alinear segmento de vía"
@@ -21945,42 +23878,47 @@ msgstr ""
" o ponga el pivote en el nodo común.\n"
msgid "Align Way Segments: Modes"
-msgstr ""
+msgstr "Alinear Segmentos de Vías: Modos"
msgid "Align Ways control panel"
-msgstr ""
+msgstr "Panel de control de Alinear Vías"
msgid "This panel activates in Align Ways mode:"
-msgstr ""
+msgstr "Este panel se activa en el modo Alinear Vías"
msgid "Length preserved"
-msgstr ""
+msgstr "Se conserva la longitud"
msgid "Angle preserved"
-msgstr ""
+msgstr "Se conservan los ángulos"
msgid "Align with:"
-msgstr ""
+msgstr "Alinear con:"
msgid ""
"<html>Aligns the way segment to the reference so that its length is "
"preserved.</html>"
msgstr ""
+"<html>Alinea el segmento a la referencia de tal manera que mantiene su "
+"longitud.</html>"
msgid ""
"<html>Aligns the way segment to the reference so that the angles of its "
"adjacent segments are preserved.<br/>The length of the aligned segment is "
"likely to change as result.</html>"
msgstr ""
+"<html>Alinea el segmento de la vía a la referencia de tal manera que los "
+"ángulos de los segmentos adyacentes se mantengan.<br/>La longitud de los "
+"segmentos alineados seguramente sufrirá modificaciones.</html>"
msgid "I''m ready!"
msgstr "Estoy list@!"
msgid "AlignWays Tips"
-msgstr "Consejos para Alinear Vías"
+msgstr "Consejos para alinear vías"
msgid "AlignWays: What''s New..."
-msgstr ""
+msgstr "Alinear Vías: Novedades..."
msgid "Align Ways mode"
msgstr "Modo de alineación de vías"
@@ -21994,7 +23932,7 @@ msgid ""
msgstr ""
"El segmento a alinearse no puede ser el mismo que el segmento de "
"referencia.\n"
-"Por favor elija un segmento diferente para ser alineado."
+"Por favor, elija un segmento diferente para ser alineado."
msgid "AlignWayS message"
msgstr "Mensaje de Alinear Vías"
@@ -22009,22 +23947,30 @@ msgstr ""
msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
msgstr ""
+"Ctrl-Clic: seleccionar el segmento de vía de referencia; Alt-clic: quitar de "
+"la selección"
msgid ": Align segments; Alt-click: Clear selection"
-msgstr ""
+msgstr ": Alinear segmentos; Alt-clic: quitar de la selección"
msgid ""
"Ctrl-click: select reference way segment; Click: select way segment to be "
"aligned"
msgstr ""
+"Ctrl-clic: seleccionar segmento de vía de referencia; clic: seleccionar "
+"segmento de vía que será alineado"
msgid "Click: select way segment to be aligned; Alt-click: Clear selection"
msgstr ""
+"Clic: seleccionar el segmento de vía que será alineado; Alt-clic: quitar de "
+"la selección"
msgid ""
"Ctrl-Click: select reference way segment; Click: select way segment to be "
"aligned"
msgstr ""
+"Ctrl-Clic: seleccionar el segmento de vía de referencia; Clic: seleccionar "
+"el segmento de vía que será alineado"
msgid ""
"Welcome to the</span><br>\n"
@@ -22034,6 +23980,12 @@ msgid ""
"...or it rather should be called <br>\n"
"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
msgstr ""
+"Bienvenido al </span><br>\n"
+"<span style=\"font-size: xx-large;\">Complemento Alinear Vía<span "
+"style=\"color: rgb(204, 85, 0);\">S</span><br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...que en realidad debería ser llamado <br>\n"
+"Complemento <span style=\"font-size: large;\">AlinearVíaS(egmentos)</span>..."
msgid ""
"<html>\n"
@@ -22191,19 +24143,19 @@ msgid "Don''t show this again"
msgstr "No mostrar de nuevo"
msgid "What''s new..."
-msgstr ""
+msgstr "Novedades..."
msgid "Added <b>angle preserving</b> aligning mode"
-msgstr ""
+msgstr "Se añadió el modo <b>conservar ángulo</b>"
msgid "Various improvements and bugfixes"
-msgstr ""
+msgstr "Mejoras varias y correción de errores"
msgid "Errr..."
-msgstr ""
+msgstr "Eeeeehh..."
msgid "Browser not supported."
-msgstr ""
+msgstr "Navegador no soportado."
msgid "Building address"
msgstr "Dirección de edificación"
@@ -22214,15 +24166,6 @@ msgstr "Número de Casa:"
msgid "Street Name:"
msgstr "Nombre de Calle:"
-msgid "Increment"
-msgstr "Incremento"
-
-msgid "Decrement"
-msgstr "Decremento"
-
-msgid "Numbers:"
-msgstr "Números:"
-
msgid "Big buildings mode"
msgstr "Modo construcciones grandes"
@@ -22284,7 +24227,7 @@ msgid "Helping tool for tag address"
msgstr "Herramienta de ayuda para establecer dirección"
msgid "CadastreFR - Buildings"
-msgstr ""
+msgstr "CatastroFR - Edificios"
msgid "Next no"
msgstr "Siguiente Número"
@@ -22365,12 +24308,20 @@ msgid ""
"The new grabbing key is F10, but you can change the key\n"
"in the shortcut settings if you want."
msgstr ""
+"El complemento Catastro-fr utilizaba el atajo F11 para grabar, Plugin "
+"cadastre-fr used the key shortcut F11 for sujetar,\n"
+"el cual ahora es utilizado para cambiar al modo pantalla completa.\n"
+"El nuevo atajo es F10, pero puede cambiar el atajo de teclado\n"
+"en las preferencias si así lo desea."
msgid ""
"Please enable at least two WMS layers in the cadastre-fr plugin "
"configuration.\n"
"Layers ''Building'' and ''Parcel'' added by default."
msgstr ""
+"Por favor permitir al menos dos capas WMS en la configuración del "
+"complemento catastro-fr.\n"
+"Las capas \"Edificios\" y \"Parcelas\" fueron añadidas por defecto."
msgid ""
"Warning: failed to put option pane dialog always on top. Exception was: {0}"
@@ -22388,7 +24339,7 @@ msgstr ""
"y reintente"
msgid "Change the current projection"
-msgstr ""
+msgstr "Cambiar la posición actual"
msgid "Replace original background by JOSM background color."
msgstr ""
@@ -22410,6 +24361,9 @@ msgstr "Deshabilitar sesgar(crop) la imagen durante la georeferencia."
msgid "Use \"Tableau d''assemblage\""
msgstr "Usar \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr "Reemplazar sombras grises por color blanco únicamente"
+
msgid "Select first WMS layer in list."
msgstr "Seleccione primero la capa WMS de la lista"
@@ -22429,12 +24383,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alto"
-
-msgid "medium"
-msgstr "medio"
-
msgid "symbol"
msgstr "símbolo"
@@ -22488,6 +24436,8 @@ msgid ""
"Replace the original white background by the background color defined in "
"JOSM preferences."
msgstr ""
+"Reemplazar el fondo blanco original con el color de fondo definido en las "
+"preferencias de JOSM."
msgid ""
"Invert the original black and white colors (and all intermediate greys). "
@@ -22527,7 +24477,7 @@ msgid "Nearest-Neighbor (fastest) [ Default ]"
msgstr "Vecino más cercano (La más rápida) [ Predeterminada ]"
msgid "Bilinear (fast)"
-msgstr "Bilineal (rápida)"
+msgstr "Bilineal (rápido)"
msgid "Bicubic (slow)"
msgstr "Bicúbica (lenta)"
@@ -22584,12 +24534,19 @@ msgstr "Multiplicador de toma de imágenes raster"
msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+"Añadir el \"Tableau(x) d''assemblage\" en las listas de hojas catastrales a "
+"sujetar."
+
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Reemplazar escala de grises por color blanco (archivos más pequeños y menor "
+"uso de memoria)"
msgid "Display crosspieces:"
msgstr "Muestre piezas cruzadas"
msgid "Allows an automatic caching"
-msgstr ""
+msgstr "Permitir almacenamiento en memoria rápida de forma automática"
msgid "Oldest files are automatically deleted when this size is exceeded"
msgstr ""
@@ -22604,6 +24561,9 @@ msgstr "Seleccionar automáticamente la primera capa WMS si hay varias capas."
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Habilitar para emplear la etiqueta \"add:street\" en los nodos."
+msgid "Unexpected file extension. {0}"
+msgstr "Extensión de archivo inesperada. {0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "¿Añadir etiqueta sobre la fuente a los elementos (source=...)?"
@@ -22664,13 +24624,13 @@ msgid "Only on vectorized layers"
msgstr "Únicamente sobre capas vectorizadas"
msgid "Cancel current grab"
-msgstr ""
+msgstr "Cancelar la sujeción actual"
msgid "Cancel current grab (only vector images)"
-msgstr ""
+msgstr "Cancelar la sujeción actual (solo imágenes de vectores)"
msgid "Cadastre grab"
-msgstr ""
+msgstr "Sujetar catastro"
msgid "Download Image from French Cadastre WMS"
msgstr "Descargando imágenes desde el servidor francés WMS del Catastro"
@@ -22679,7 +24639,7 @@ msgid "Cadastre: {0}"
msgstr "Catastro: {0}"
msgid "Georeference an image"
-msgstr ""
+msgstr "Georreferencia una imagen"
msgid "Grab non-georeferenced image"
msgstr "Obtener imagen no georeferenciada"
@@ -22694,54 +24654,8 @@ msgstr ""
"Esta imagen contiene información de georeferencia.\n"
"Desea usarla?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Para esquilar(crop) elija la primera esquina\n"
-"(se requiere dos puntos)"
-
-msgid "Image cropping"
-msgstr "esquilar imagen(cropping)"
-
-msgid "Click second corner for image cropping"
-msgstr "Seleccione la segunda esquina para esquilar(crop)"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr "Haga click en la primera Pieza cruzada Lambert para Georeferenciar"
-
-msgid "Image georeferencing"
-msgstr "Georeferenciar imagen"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Haga click en la segunda Pieza cruzada Lambert para Georeferenciar"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Desea cancelar completamente\n"
-"o reintentar "
-
-msgid "Enter cadastre east,north position"
-msgstr "Entre posición de catastro este,norte"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Advertencia: verifique el norte con la flecha !!)"
-
-msgid "East"
-msgstr "Este"
-
-msgid "I use the mouse"
-msgstr "Uso el ratón"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Establecer {0} coordenadas Lambert"
-
msgid "Load layer from cache"
-msgstr ""
+msgstr "Cargar la capa desde la memoria rápida"
msgid "Load location from cache (only if cache is enabled)"
msgstr "Cargar localizaciones desde cache (solo si la cache está activada)"
@@ -22795,29 +24709,92 @@ msgstr "<html>Número de Departamento (opcional)</html>"
msgid "Add new layer"
msgstr "Añadir nueva capa"
-msgid "Open Cadastre Preferences"
+msgid "Open Cadastre Preferences"
+msgstr "Abrir las Preferencias de Catastro"
+
+msgid "Refine georeferencing"
+msgstr "Refinar el georreferenciamiento"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Mejorar el georreferenciamiento (solo imágenes raster)"
+
+msgid "Reset cookie"
+msgstr "Reinicializar cookie"
+
+msgid "Get a new cookie (session timeout)"
+msgstr "Obtener nueva cookie (sesión caducada)"
+
+msgid "Save image as..."
+msgstr "Guardar imagen como..."
+
+msgid "PNG files (*.png)"
+msgstr "Archivos PNG (*.png)"
+
+msgid "GeoTiff files (*.tif)"
+msgstr "Archivos GeoTiff (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Exportar imagen (solamente imágenes raster)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Para esquilar(crop) elija la primera esquina\n"
+"(se requiere dos puntos)"
+
+msgid "Image cropping"
+msgstr "esquilar imagen(cropping)"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr "Haga click en la primera Pieza cruzada Lambert para Georeferenciar"
+
+msgid "Image georeferencing"
+msgstr "Georeferenciar imagen"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Desea cancelar completamente\n"
+"o reintentar "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
+"Ups. Fallé al intentar obtener todas las coordenadas\n"
+"correctamente. Reintentar por favor."
-msgid "Reset cookie"
-msgstr "Reinicializar cookie"
+msgid "Enter cadastre east,north position"
+msgstr "Entre posición de catastro este,norte"
-msgid "Get a new cookie (session timeout)"
-msgstr "Obtener nueva cookie (sesión caducada)"
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Advertencia: verifique el norte con la flecha !!)"
-msgid "Save image as PNG"
-msgstr "Guardar imagen como PNG"
+msgid "East"
+msgstr "Este"
-msgid "PNG files (*.png)"
-msgstr "Archivos PNG (*.png)"
+msgid "I use the mouse"
+msgstr "Uso el ratón"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Establecer {0} coordenadas Lambert"
+
+msgid "Click second corner for image cropping"
+msgstr "Seleccione la segunda esquina para esquilar(crop)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Exportar como formato PNG (solo imágenes raster)"
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Haga click en la segunda Pieza cruzada Lambert para Georeferenciar"
msgid "Adjust WMS"
msgstr "Ajustar WMS"
msgid "Adjust the position of the WMS layer (saved for raster images only)"
msgstr ""
+"Ajustar la posición de la capa WMS (guardado para imágenes raster únicamente)"
msgid ""
"More than one WMS layer present\n"
@@ -22827,10 +24804,10 @@ msgstr ""
"Seleccione primero una de ellas y reinténtelo"
msgid "Reset offset"
-msgstr ""
+msgstr "Reiniciar rectificación"
msgid "Reset offset (only vector images)"
-msgstr ""
+msgstr "Reiniciar rectificación (únicamente imágenes vectoriales)"
msgid "WMS layer ({0}), {1} tile(s) loaded"
msgstr "Capa WMS ({0}), {1} tesela(s) cargada"
@@ -22838,8 +24815,11 @@ msgstr "Capa WMS ({0}), {1} tesela(s) cargada"
msgid "Is not vectorized."
msgstr "No está vectorizado."
-msgid "Raster size: {0}"
-msgstr "Tamaño de la imagen raster: {0}"
+msgid "Bounding box: {0}"
+msgstr "Marco límite: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Tamaño de la imagen (px): {0}/{1}"
msgid "Is vectorized."
msgstr "Está vectorizado."
@@ -22865,7 +24845,7 @@ msgid "Cache Lambert Zone Error"
msgstr "Error en la zona Lambert de la caché"
msgid "canvec tile helper"
-msgstr ""
+msgstr "ayudante de mosaico canvec"
msgid "Use"
msgstr "Uso"
@@ -22891,8 +24871,8 @@ msgstr "Eliminar el esquema seleccionado de la lista"
msgid "Color Schemes"
msgstr "Esquemas de color"
-msgid "Adress"
-msgstr ""
+msgid "Address"
+msgstr "Dirección"
msgid "Split area"
msgstr "Dividir área"
@@ -22939,6 +24919,9 @@ msgstr "Descargar aledaño"
msgid "Please select 1 or more ways to download along"
msgstr "Por favor seleccione una o más vías para descargar"
+msgid "Download from OSM along selected ways"
+msgstr "Descargar desde OSME a lo largo de las vías seleccionadas"
+
msgid "{0} intermediate nodes to download."
msgstr "{0} nodos intermedios para descargar."
@@ -23014,6 +24997,71 @@ msgstr "Nueva Herramienta..."
msgid "Install"
msgstr "Instalar"
+msgid "Public"
+msgstr "Público"
+
+msgid "Could not get server response, check logs"
+msgstr "No se pudo obtener respuesta del servidor, verifique los registros"
+
+msgid "Failed to login as {0}:"
+msgstr "Hubo una falla al intentar ingresar como {0}:"
+
+msgid "The server did not return user ID"
+msgstr "El servidor no devolvió un ID de usuario"
+
+msgid "Failed to send message:"
+msgstr "Hubo una falla al enviar el mensaje"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Hubo una falla al obtener mensajes de {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Abrir el panel de GeoChat"
+
+msgid "Zoom in to see messages"
+msgstr "Acercar para ver los mensajes"
+
+msgid "Login"
+msgstr "Acceder"
+
+msgid "Enable autologin"
+msgstr "Habilitar acceso automático"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} usuario"
+msgstr[1] "{0} usuarios"
+
+msgid "not logged in"
+msgstr "no ha accedido"
+
+msgid "User {0} has left"
+msgstr "El usuario {0} se ha ido"
+
+msgid "User {0} is mapping nearby"
+msgstr "El usuario {0} está mapeando en las cercanías"
+
+msgid "Users mapping nearby:"
+msgstr "Usuarios mapeando en las cercanías:"
+
+msgid "Private chat"
+msgstr "Conversación privada"
+
+msgid "Close tab"
+msgstr "Cerrar pestaña"
+
+msgid "Logout"
+msgstr "Cerrar sesión"
+
+msgid "Clear log"
+msgstr "Limpiar registro"
+
+msgid "Show users on map"
+msgstr "Mostrar usuarios en el mapa"
+
msgid "Position only"
msgstr "Solo posición"
@@ -23053,27 +25101,9 @@ msgstr "Deshabilitar el registro de datos si la distancia cae por debajo"
msgid "Unknown logFormat"
msgstr "Formato log desconocido"
-msgid "Port:"
-msgstr "Puerto:"
-
-msgid "refresh the port list"
-msgstr "refrescar la lista de puertos"
-
-msgid "Configure"
-msgstr "Configurar"
-
msgid "Configure Device"
msgstr "Configurar dispositivo"
-msgid "Connection Error."
-msgstr "Error de conexión."
-
-msgid "configure the connected DG100"
-msgstr "Configurar la conexión DG100"
-
-msgid "delete data after import"
-msgstr "Eliminar los datos después de importarlos"
-
msgid "Importing data from device."
msgstr "Importando datos desde el dispositivo."
@@ -23111,34 +25141,37 @@ msgid "Import"
msgstr "Importar"
msgid "GPS Blams"
-msgstr ""
+msgstr "GPS Blams"
msgid "GPSBlam"
-msgstr ""
+msgstr "GPS Blam"
msgid "select gpx points and \"blam!\", find centre and direction of spread"
msgstr ""
+"seleccionar puntos gpx y \"¡blam!\", encontrar el centro y la dirección de "
+"lo es"
msgid "Add EGPX layer"
msgstr "Añadir capa EGPX"
msgid "GPX Data"
-msgstr ""
+msgstr "Datos GPX"
msgid "Classes element below root child level"
-msgstr ""
+msgstr "Elementos de clases por debajo del nivel hijo raíz"
msgid "Class element ({0}) outside classes element"
-msgstr ""
+msgstr "Elemento de clase ({0}) fuera del elemento de clases"
msgid "Class element without name"
-msgstr ""
+msgstr "elemento de clase sin nombre"
msgid "Tag element outside basetag and implication elements"
msgstr ""
+"Etiqueta de elemento fuera de la base de etiquetas y elementos de implicación"
msgid "Implications element below root child level"
-msgstr ""
+msgstr "Elemento de impliaciones debajo del nivel de hijo raíz"
msgid "Tag without key"
msgstr "Etiqueta sin clave"
@@ -23147,76 +25180,78 @@ msgid "Tag without value (key is {0})"
msgstr "Etiquetas sin valor (clave es {0})"
msgid "Closed classes while it was not open"
-msgstr ""
+msgstr "Clases cerradas mientras no esté abierto"
msgid "Closed classes element before all class elements were closed"
msgstr ""
+"Elemento de clases cerrado antes de que los elementos de clase hayan sido "
+"cerrados"
msgid "Closed class element while none was open"
-msgstr ""
+msgstr "Elemento de clase cerrado siendo que ninguno ha sido abierto"
msgid "Closed basetags while it was not open"
-msgstr ""
+msgstr "Base de etiquetas cerrada cuando aún no ha sido abierto"
msgid "Closed implications while it was not open"
-msgstr ""
+msgstr "Implicaciones cerradas cuando aún no ha sido abierto"
msgid "Tag element inside other tag element"
-msgstr ""
+msgstr "Elemento de etiqueta dentro de otro elemento de etiqueta"
msgid "Invalid opening xml tag <{0}> in state {1}"
-msgstr ""
+msgstr "Etiqueta de apertura de xml <{0}> en estado {1} inválida"
msgid "Condition isn''t finished at </condition> tag"
-msgstr ""
+msgstr "La condición no ha sido finalizada con la etiqueta </condition>"
msgid "Closing tag element that was not open"
-msgstr ""
+msgstr "Cerrando elemento de etiqueta que no ha sido abierto"
msgid "Invalid closing xml tag </{0}> in state {1}"
-msgstr ""
+msgstr "Etiqueta xml de cierre </{0}> en estado {1} inválida"
msgid "Some tags not been closed; now in state {0}"
-msgstr ""
+msgstr "Algunas etiquetas no han sido cerradas; ahora en estado {0}"
msgid "Key element without attribute k"
-msgstr ""
+msgstr "Elemento clave sin atributo k"
msgid "Condition is already finished at <{0}>"
-msgstr ""
+msgstr "La condición ya ha sido definida en <{0}>"
msgid "Unknown tag for condition: {0}"
-msgstr ""
+msgstr "Etiqueta desconocida para la condición: {0}"
msgid "Element must not have childs: {0}"
-msgstr ""
+msgstr "El elemento no puede tener hijos: {0}"
msgid "Condition is already finished at </{0}>"
-msgstr ""
+msgstr "La condición ya está finalizada en </{0}>"
msgid "<and> needs at least one child"
-msgstr ""
+msgstr "<and> necesita al menos un hijo"
msgid "<or> needs at least one child"
-msgstr ""
+msgstr "<or> necesita al menos un hijo"
msgid "<not> needs at least one child"
-msgstr ""
+msgstr "<not> necesita al menos un hijo"
msgid "Wrong closing tag {0} (</{1}> expected)"
-msgstr ""
+msgstr "Cierre erróneo de etiqueta {0} (se esperaba </{1}>)"
msgid "Condition {0} not yet finished"
-msgstr ""
+msgstr "La condición {0} aún no ha sido finalizada"
msgid "Group not yet evaluated"
-msgstr ""
+msgstr "El grupo aún no ha sido evaluado"
msgid "Collection must contain at least one condition"
-msgstr ""
+msgstr "La colección debe contener al menos una condición"
msgid "No ruleset has been selected!"
-msgstr ""
+msgstr "¡No se ha seleccionado ningún conjunto de reglas!"
msgid "No ruleset"
msgstr "sin conjunto de reglas"
@@ -23225,6 +25260,8 @@ msgid ""
"Syntax exception in access ruleset:\n"
"{0}"
msgstr ""
+"Excepción a la sintaxis en el acceso al conjunto de reglas:\n"
+"{0}"
msgid ""
"File not found:\n"
@@ -23289,7 +25326,7 @@ msgid "Road requirements"
msgstr "Requisitos de la carretera"
msgid "Max. incline up (%, pos.)"
-msgstr "Max. inclinaciún ascendente (%, pos.)"
+msgstr "Max. inclinación ascendente (%, pos.)"
msgid "Maximum incline the vehicle can go up"
msgstr "Inclinación máxima del vehículo en ascenso"
@@ -23307,12 +25344,15 @@ msgid ""
"List of surfaces the vehicle cannot use, values are separated by semicolons "
"(;)"
msgstr ""
+"Lista de superficios que los vehículos no pueden utilizar, los valores están "
+"separados con punto y coma (;)"
msgid "max. tracktype grade"
-msgstr ""
+msgstr "gradiente máximo de tipo de pista"
msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
msgstr ""
+"Peor tipo de pista (1-5) que el vehículo no puede utilizar, 0 para ninguno"
msgid "Change bookmark"
msgstr "Cambiar marcador"
@@ -23321,10 +25361,10 @@ msgid "Edit access parameters"
msgstr "Editar parámetros de acceso"
msgid "Graph View Dialog"
-msgstr ""
+msgstr "Diálogo de vista gráfica"
msgid "Open the dialog for graph view configuration."
-msgstr ""
+msgstr "Abra el cuadro de diálogo para la configuración de la vista gráfica."
msgid "default"
msgstr "predeterminado"
@@ -23342,22 +25382,24 @@ msgid "Parameters:"
msgstr "Parámetros:"
msgid "Coloring:"
-msgstr ""
+msgstr "Coloreado:"
msgid "Create/update graph"
msgstr "Crear/actualizar gráfico"
msgid "Graphview"
-msgstr ""
+msgstr "Graphview"
msgid "Settings for the Graphview plugin that visualizes routing graphs."
msgstr ""
+"Configuración para el componente Graphview que visualiza gráficos de "
+"enrutamiento."
msgid "Ruleset"
msgstr "Conjunto de reglas"
msgid "Use built-in rulesets"
-msgstr ""
+msgstr "Utilizar los conjuntos de reglas incorporados"
msgid "External ruleset directory:"
msgstr "Directorio conjunto de reglas externas"
@@ -23387,16 +25429,16 @@ msgid "Arrow color"
msgstr "Color flecha"
msgid "Arrowhead fill color"
-msgstr ""
+msgstr "Color de relleno de la punta de flecha"
msgid "Arrowhead placement"
-msgstr ""
+msgstr "Ubicación de la punta de flecha"
msgid "New bookmark"
msgstr "Nuevo marcador"
msgid "Really delete \"{0}\"?"
-msgstr ""
+msgstr "¿Está seguro de eliminar \"{0}\"?"
msgid "Bookmark deletion"
msgstr "Eliminación de marcador"
@@ -23418,232 +25460,276 @@ msgid "Choose arrow color"
msgstr "Selección color flecha"
msgid "Choose arrowhead fill color"
-msgstr ""
+msgstr "Escoger el color de relleno de la punta de flecha"
msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
+msgstr "Gráfico de enrutamiento calculado por el componente GraphView"
msgid "GraphView layer is not mergable"
-msgstr ""
+msgstr "La capa de GraphView no es fusionable"
msgid "graphview default node"
-msgstr ""
+msgstr "nodo predeterminado de graphview"
msgid "graphview default segment"
-msgstr ""
+msgstr "segmento por defecto de graphview"
msgid "graphview arrowhead core"
-msgstr ""
+msgstr "Núcleo de la vista gráfica de punta de flecha"
msgid ""
"Weights must be given as positive decimal numbers with unit \"t\" or without "
"unit."
msgstr ""
+"Los pesos debe ser ingresados como números decimales positivos con la unidad "
+"\"t\" o sin unidad."
msgid ""
"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
"\"mi\" or without unit.\n"
"Alternatively, the format FEET'' INCHES\" can be used."
msgstr ""
+"Las longitudes deben ser ingresadas con números decimales positivos y la "
+"unidad \"m\", \"km\", \"mi\" o sin unidad.\n"
+"También puede utilizar el formato PIES'' PULGADAS\"."
msgid ""
"Speeds should be given as numbers without unit or as numbers followed by "
"\"mph\"."
msgstr ""
+"Las velocidades deben ser ingresadas como números in la unidad o como "
+"números seguido por \"mph\"."
msgid ""
"Inclines must be given as positive decimal numbers with followed by \"%\"."
msgstr ""
+"Las pendientes deben ser ingresadas como números positivos seguidos por "
+"\"%\"."
msgid "Tracktype grades must be given as integers between 0 and 5."
msgstr ""
+"Los grados de tipo de pista deben ser ingresados como números enteros entre "
+"0 y 5."
msgid ""
"Surface values must not contain any of the following characters: '','', '' "
"'{' '', '' '}' '', ''='', ''|''"
msgstr ""
+"Los valores de superficie no pueden contener ninguno de los siguientes "
+"caracteres:: '','', '' '{' '', '' '}' '', ''='', ''|''"
msgid "Imagery XML Files"
-msgstr ""
+msgstr "Archivos XML de Imágenes Aéreas"
msgid "Save Imagery XML file"
-msgstr ""
+msgstr "Guardar archivo XML de Imagen Aérea"
msgid "XML Imagery Bounds"
-msgstr ""
+msgstr "Límites del XML de Imagen Aérea"
msgid "Generate Imagery XML bounds for the selection"
-msgstr ""
+msgstr "Generar límites para el XML de imagen aérea para la selección"
msgid "edit bounds for selected defaults"
-msgstr ""
+msgstr "editar los límites seleccionados por defecto"
+
+msgid "Download imagery XML bounds"
+msgstr "Descargar los límites del XML de imagen aérea"
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
"Do you want to continue without validating the file ?"
msgstr ""
+"Validando error en el archivo {0}:\n"
+"{1}\n"
+"¿Desea continuar sin validar el archivo?"
msgid "Open Imagery XML file"
-msgstr ""
+msgstr "Abrir archivo de XML de imagen aérea"
msgid "Calibration Layer"
-msgstr ""
+msgstr "Capa de Calibración"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Una geometría de calibración obsoleto de {0} nodos de {1}"
msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Una geometría de calibración de {0} nodes por {1}"
msgid "Change Color"
-msgstr ""
+msgstr "Cambiar color"
msgid "Deprecate Offset"
-msgstr ""
+msgstr "Rectificación obsoleta"
msgid "Are you sure this imagery offset is wrong?"
-msgstr ""
+msgstr "¿Está seguro de que este desplazamiento de imágenes es incorrecto?"
msgid "Are you sure this calibration geometry is aligned badly?"
msgstr ""
+"¿Está seguro de que esta geometría de calibración se encuentra mal alineada?"
msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgstr "Advertencia: ¡la depreciación es básicamente irreversible!"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr ""
+"Para almacenar imágenes rectificadas debe ser un usuario registrado de OSM."
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
msgstr ""
+"Por favor, introduzca la razón por la que marca esta rectificación de imagen "
+"como obsoleta"
msgid ""
"Please enter the reason why you mark this calibration geometry as deprecated"
msgstr ""
+"Por favor, introduzca la razón por la que marca esta geometría de "
+"calibración como obsoleta"
msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgstr "Notificando al servidor de la depreciación..."
msgid "Get Imagery Offset..."
-msgstr ""
+msgstr "Obteniendo imágenes rectificadas..."
msgid "Download offsets for current imagery from a server"
msgstr ""
+"Descargar rectificaciones para las imágenes actuales desde el servidor"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"No hay datos para esta región. Por favor, ajuste la capa de imágenes y suba "
+"la rectificación."
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Cargando imágenes rectificadas..."
msgid "Error processing XML response: {0}"
-msgstr ""
+msgstr "Error al procesar la respuesta XML: {0}"
msgid "Offset"
-msgstr ""
+msgstr "Desplazamiento"
msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Bases de datos de imágenes rectificadas"
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
msgid "km"
-msgstr ""
+msgstr "km"
msgid "Calibration geometries"
-msgstr ""
+msgstr "Geometrías de calibración"
msgid "Deprecated offsets"
-msgstr ""
+msgstr "Rectificaciones obsoletas"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
"OSM data in the area. Please check that the offset is still valid\n"
"by downloading GPS tracks and comparing them and OSM data to the imagery."
msgstr ""
+"La capa superior de imágenes ha sido cambiada para presumiblemente "
+"coincidir\n"
+"con los datos de OSM de la zona. Por favor, compruebe que el desplazamiento "
+"sigue siendo válido\n"
+"tras descargar las trazas GPS, y compárelas con los datos OSM y las imágenes."
msgid ""
"A layer has been added with a calibration geometry. Hide data layers,\n"
"find the corresponding feature on the imagery layer and move it accordingly."
msgstr ""
+"Se ha añadido una capa con la geometría de calibración. Oculte los datos de "
+"capa,\n"
+"encuentre las características correspondientes en la capa de la imagen y "
+"muévalo adonde corresponda."
msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "Obsoletas {0} de {1}"
msgid "Created by {0} on {1}"
-msgstr ""
+msgstr "Creado por {0} el {1}"
msgid "Offset Information"
-msgstr ""
+msgstr "Información sobre el desplazamiento"
msgid "Report this offset"
-msgstr ""
+msgstr "Informe de este desplazamiento"
msgid "You are to notify moderators of this offset. Why?"
msgstr ""
+"Estás notificando a los moderadores de este desplazamiento. ¿Por qué?"
msgid "Reporting the offset..."
-msgstr ""
+msgstr "Informando del desplazamiento..."
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "Una imagen rectificada de {0}"
msgid "Imagery ID"
-msgstr ""
+msgstr "ID de la imagen aérea"
msgid "A calibration geometry of {0} nodes"
-msgstr ""
+msgstr "Una geometría de calibración de {0} nodos"
msgid "Determined right here"
-msgstr ""
+msgstr "Determinado justo aquí"
msgid "Determined {0} away"
-msgstr ""
+msgstr "Determinado a {0}"
msgid "Reason"
-msgstr ""
+msgstr "Motivo"
msgid "This entry has been reported."
-msgstr ""
+msgstr "Esta entrada ha sido denunciada."
msgid "Server has rejected the request"
-msgstr ""
+msgstr "El servidor ha rechazado la solicitud"
msgid "Unable to connect to the server"
-msgstr ""
+msgstr "No se puede conectar con el servidor"
msgid "Store Imagery Offset..."
-msgstr ""
+msgstr "Almacenar rectificación de imágenes..."
msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
"server"
msgstr ""
+"Subir una rectificación para las imágenes actuales (o geometría de objeto de "
+"calibración) a un servidor"
msgid "Store calibration geometry"
-msgstr ""
+msgstr "Almacenar la geometría de calibración"
msgid "Store imagery offset"
-msgstr ""
+msgstr "Almacenar rectificación de imágenes"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
"intend to do?"
msgstr ""
+"El objeto seleccionado puede ser utilizado como una geometría de "
+"calibración. ¿Qué desea hacer?"
msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
"this?"
msgstr ""
+"La capa de imágenes superior no tiene ninguna rectificación. ¿Está seguro "
+"que desea subirlo?"
msgid ""
"You are registering an imagery offset. Other users in this area will be able "
@@ -23651,6 +25737,10 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
+"Está registrando un desplazamiento de imágenes. Otros usuarios en esta área "
+"serán capaces de utilizarlo para cartografiar.\n"
+"Por favor, asegúrese de que esté lo más preciso posible y describa una "
+"región para la que es aplicable esta rectificación."
msgid ""
"You are registering a calibration geometry. It should be the most precisely "
@@ -23658,30 +25748,35 @@ msgid ""
"clearly visible boundaries on various satellite imagery. Please describe "
"this object and its whereabouts."
msgstr ""
+"Está registrando una geometría de calibración. Debería ser el objeto cuya "
+"posición tenga el mayor grado de precisión,\n"
+"con nítidos límites visibles en varias imágenes de satélite. Por favor "
+"describa el objeto y sus alrededores."
msgid "Uploading a new offset..."
-msgstr ""
+msgstr "Subiendo una nueva rectificación..."
msgid "This string should be 3 to 200 letters long."
msgstr ""
+"Esta cadena de caracteres debería tener entre 3 y 200 letras de longitud."
msgid "Adjust imagery"
-msgstr "Ajustar imágenes"
+msgstr "Ajustar imagen aérea"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajustar la posición de la capa de imágenes seleccionada"
+msgstr "Ajustar la posición de la capa de imagen aérea seleccionada"
msgid "Please select the imagery layer to adjust."
-msgstr "Por favor, seleccione la capa de imágenes a ajustar."
+msgstr "Por favor seleccione la capa de imagen aérea a ajustar."
msgid "Start adjusting"
-msgstr "Inicio de ajuste"
+msgstr "Iniciar el ajuste."
msgid "There are currently no imagery layer to adjust."
-msgstr "Actualmente no hay capas de imágenes para ajustar."
+msgstr "Actualmente no hay ninguna capa de imagen aérea para ajustar."
msgid "No layers to adjust"
-msgstr "Ninguna capa que ajustar"
+msgstr "No hay capas para ajustar"
msgid "Normal"
msgstr "Normal"
@@ -23725,12 +25820,6 @@ msgstr "Imágenes importadas"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Archivos de imagen (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Abrir imágenes con ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Cargar el conjunto de imágenes como una nueva capa."
-
msgid "Import vector graphics"
msgstr "Importar gráficos vectoriales"
@@ -23740,18 +25829,15 @@ msgstr "Escala:"
msgid "unit(s) = "
msgstr "Unidad(es) = "
-msgid "Import..."
-msgstr "Importar..."
-
-msgid "Import vector graphics."
-msgstr "Importar gráficos vectoriales."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Dibujos SVG (*. svg)"
-
msgid "Importing..."
msgstr "Importando..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "Archivos SVG [complemento ImportVec] (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Por favor abra o cree una capa de datos antes de la importación"
+
msgid "InfoMode"
msgstr "ModoInfo"
@@ -23762,12 +25848,14 @@ msgid ""
"Move the mouse to show trackpoint info for current layer. Hold shift to "
"highlight tracks"
msgstr ""
+"Mueva el puntero del ratón para mostrar información de trazado para la capa "
+"actual. Mantenga el desplazamiento para marcar las pistas"
msgid "Delete this"
-msgstr ""
+msgstr "Eliminar esto"
msgid "Delete this&older"
-msgstr ""
+msgstr "Eliminar este&más antiguo"
msgid "km/h"
msgstr "km/h"
@@ -23776,7 +25864,7 @@ msgid "Track name: "
msgstr "Nombre pista: "
msgid "Update IRS adjustment layer"
-msgstr ""
+msgstr "Actualizar la capa de ajuste IRS"
msgid ""
"This option creates IRS adjustment layer and a little way inside it. You "
@@ -23793,58 +25881,58 @@ msgid "IRS Adjustment Layer"
msgstr "Ajuste de capa IRS"
msgid "Channel-Digraph created from the active OSM-Layer"
-msgstr ""
+msgstr "Canal digrafo creado a partir de la capa OSM activa"
msgid "Create Channel Digraph"
-msgstr ""
+msgstr "Crear canal digrafo"
msgid "this layer is no osm data layer"
msgstr "esta capa no es una capa de datos osm"
msgid "Converting OSM graph into Channel Digraph"
-msgstr ""
+msgstr "Convertir gráfico OSM en canal digrafo"
msgid "filtering ways"
msgstr "filtrando vías"
msgid "creating Channel-Digraph"
-msgstr ""
+msgstr "Creando canal digrafo"
msgid "sealing Digraph"
-msgstr ""
+msgstr "Diagrama de sellado"
msgid "calculating Strong Connectedness"
-msgstr ""
+msgstr "calculando la Fortaleza de Conexión"
msgid "creating DigraphLayer"
-msgstr ""
+msgstr "creando capa de digrafo"
msgid "JunctionChecking"
-msgstr ""
+msgstr "Verificación de cruces"
msgid "Open the junctionchecking window."
-msgstr ""
+msgstr "Abrir la ventana de verificación de cruces"
msgid "junctions"
msgstr "intersecciones"
msgid "Channel-Digraph creation"
-msgstr ""
+msgstr "Creación de canal digrafo"
msgid "seal Channel Digraph"
-msgstr ""
+msgstr "Dígrafo de pérdida de Canal"
msgid "calculate strong connected channels"
-msgstr ""
+msgstr "calcular canales fuertemente conectados"
msgid "Junctionchecking/junctions searching"
-msgstr ""
+msgstr "Búsqueda de cruces/verificación de cruces"
msgid "order of junction (n):"
-msgstr ""
+msgstr "Grado de cruce (n):"
msgid "produce OSM-Relations: junction"
-msgstr ""
+msgstr "producir Relaciones-OSM: cruce"
msgid ""
"if enabled the plugin produces osm-relations from the junction subgraphs"
@@ -23853,42 +25941,45 @@ msgstr ""
"subgrafos"
msgid "create the channel digraph"
-msgstr ""
+msgstr "crear el digrama de canal"
msgid "Check "
msgstr "Comprobar "
msgid "check the subust for junction properties"
-msgstr ""
+msgstr "verificar el subust de las propiedades de cruce"
msgid "Search "
msgstr "Buscar "
msgid "search for junctions in the channel subset"
-msgstr ""
+msgstr "buscar por cruces en el subconjunto del canal"
msgid ""
"The marked channels contains a junctioncandidate (white). To test this "
"candidat mark these channel and press the \"Check\" button again."
msgstr ""
+"Los canales marcados contienen un candidato a cruce (blanco). Para probar "
+"este candidato marque este canal y presione el botón \"Verificar\" "
+"nuevamente."
msgid "The marked channels are a {0}-ways junction"
-msgstr ""
+msgstr "Los canales marcados son un cruce de {0}-vías"
msgid "The marked channels are not a junction:"
-msgstr ""
+msgstr "Los canales marcados no son un cruce"
msgid "construct channel digraph and search for junctions"
-msgstr ""
+msgstr "construir el digrama de canal y buscar intersecciones"
msgid "Number of {0}-ways junctions found: {1}"
-msgstr ""
+msgstr "Número de cruces de {0}-vías encontrados: {1}"
msgid "generate all combinations from entrie/exit candidates"
-msgstr ""
+msgstr "generar todas las combinaciones de candidatos para entrada y salida"
msgid "Direction index ''{0}'' not found"
-msgstr ""
+msgstr "Índice de dirección ''{0}'' no encontrado"
msgid "The starting location was not within the bbox"
msgstr "La localización inicial no está dentro de la bbox"
@@ -24132,17 +26223,14 @@ msgstr "Autocentrar"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrar continuamente la capa LiveGPS a la posición actual."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Abrir MapDust"
msgid "MapDust bug reports"
-msgstr ""
+msgstr "Informes de error de MapDust"
msgid "Activates the MapDust bug reporter plugin"
-msgstr ""
+msgstr "Activar el complemento de informes de error de MapDust"
msgid "Missing input data"
msgstr "Faltan datos de entrada"
@@ -24190,8 +26278,33 @@ msgstr "Combinar superposición de vías"
msgid "Merge Overlap (combine)"
msgstr "Combinar superposición"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Una parte basada en la relación de miembros fue copiada a todas las "
+"rutas.<br>Debería verificar esto y corregirlo cuando sea necesario.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Una relación de miembros fue copiada a todas las vías.<br>Deberería "
+"verificar y corregir esto cuando sea necesario.</html>"
+
msgid "Split way"
+msgstr "Dividir la vía"
+
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
msgstr ""
+"<html>Asigne un valor a la clave, por ejemplo. "
+"<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Asigne un valor al atributo, por ejemplo i.e. <strong><tt>comprobar "
+"miembros</tt></strong></html>"
msgid "Michigan Left"
msgstr "Izquierda Michigan"
@@ -24221,252 +26334,278 @@ msgid ""
"XAPI query, e.g., '''' (to download all data), ''[highway=*]'', or "
"''[[network=VRR][ref=603|613]''"
msgstr ""
+"Consulta XAPI, por ejemplo, '''' (para descargar todos los datos), "
+"''[highway=*]'', o ''[[network=VRR][ref=603|613]''"
msgid "Download from OSM mirror..."
-msgstr ""
+msgstr "Descargar desde el servidor espejo OSM..."
msgid "This XAPI query seems to be invalid, please doublecheck"
msgstr ""
+"Esta consulta XAPI pareciera ser incorrecta, por favor realiza una doble "
+"verificación"
msgid "Object type: "
-msgstr ""
+msgstr "Tipo de objeto: "
msgid "OSM object type to download (''*'' stands for any)"
-msgstr ""
+msgstr "Tipo de objeto OSM a descargarse (utilizar ''*'' para cualquiera)"
msgid "XAPI query: "
-msgstr ""
+msgstr "Consulta XAPI: "
+
+msgid "Download from Overpass API ..."
+msgstr "Descargando desde la API Overpass..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Descargar datos del mapa desde el servidor API Overpass."
+
+msgid "Overpass query: "
+msgstr "Consulat de paso elevado: "
msgid "Select OSM mirror URL"
-msgstr ""
+msgstr "Seleccionar la URL del servidor espejo de OSM"
msgid "Select OSM mirror URL to download from."
msgstr ""
+"Seleccionar la URL del servidor espejo de OSM del cual descargar los datos."
msgid "Base URL"
-msgstr ""
+msgstr "URL base"
msgid "Enforce meta data"
-msgstr ""
-
-msgid "Convert to multipolygon"
-msgstr "Convertir a multipolígono"
-
-msgid "Convert to multipolygon."
-msgstr "Convertir a multipolígono"
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-"Una de las vías seleccionadas es en realidad parte de otro multipolígono."
+msgstr "Forzar meta datos"
msgid "About Plugin"
msgstr "Acerca del plugin"
msgid "Native password manager plugin"
-msgstr ""
+msgstr "Complemento de gestión de contraseñas nativas"
msgid "No native password manager could be found!"
-msgstr ""
+msgstr "¡No se pudo encontrar ningún gestor de contraseñas nativas!"
msgid ""
"Depending on your Operating System / Distribution, you may have to create a "
"default keyring / wallet first."
msgstr ""
+"Dependiendo de su Sistema Operativo / Distribución, puede que sea necesario "
+"primero crear un llavero/monedero."
msgid "No thanks, use JOSM''s plain text preferences storage"
msgstr ""
+"No gracias, utilice las preferencias de almacenamiento de JOSM en texto claro"
msgid ""
"Found sensitive data that is still saved in JOSM''s preference file (plain "
"text)."
msgstr ""
+"Se han encontrado datos sensibles que todavía están almacenados en el "
+"archivo de preferencias de JOSM (texto claro)."
msgid "Transfer to password manager and remove from preference file"
msgstr ""
+"Transferir el gestor de contraseñas y eliminar del archivo de preferencias"
msgid "No, just keep it"
-msgstr ""
+msgstr "No, solo consérvelo"
msgid "Close the dialog and discard all changes"
-msgstr ""
+msgstr "Cierre el diálogo y descarte todos los cambios"
msgid "Proceed and go to the next page"
-msgstr ""
+msgstr "Proceda y continúe a la siguente página"
msgid "Finish"
-msgstr ""
+msgstr "Finalizar"
msgid "Confirm the setup and close this dialog"
-msgstr ""
+msgstr "Confirmar la configuración y cerrar este cuadro de diálogo"
msgid "JOSM/OSM API/Username"
-msgstr ""
+msgstr "Nombre de usuario"
msgid "JOSM/OSM API/Password"
-msgstr ""
+msgstr "Contraseña/API JOSM/OSM"
msgid "{0}/Username"
-msgstr ""
+msgstr "{0}/Nombre de usuario"
msgid "{0}/Password"
-msgstr ""
+msgstr "{0}/Contraseña"
msgid "JOSM/Proxy/Username"
-msgstr ""
+msgstr "JOSM/Proxy/Nombre de usuario"
msgid "JOSM/Proxy/Password"
-msgstr ""
+msgstr "JOSM/Proxy/Contraseña"
msgid "JOSM/OAuth/OSM API/Key"
-msgstr ""
+msgstr "Clave/API JOSM/OAuth/OSM"
msgid "JOSM/OAuth/OSM API/Secret"
-msgstr ""
+msgstr "API/Secreto JOSM/OAuth/OSM"
msgid "Native Password Manager Plugin"
-msgstr ""
+msgstr "Complemento Gestor de Contraseñas Nativas"
msgid "The username and password is protected by {0}."
-msgstr ""
+msgstr "El nombre de usuario y la contraseña están protegidos por {0}."
msgid "username"
-msgstr ""
+msgstr "nombre de usuario"
msgid "password"
-msgstr ""
+msgstr "contraseña"
msgid "proxy username"
-msgstr ""
+msgstr "Nombre de usuario del proxy"
msgid "proxy password"
-msgstr ""
+msgstr "contraseña del proxy"
msgid "oauth key"
-msgstr ""
+msgstr "clae oauth"
msgid "oauth secret"
-msgstr ""
+msgstr "secreto oauth"
msgid ""
"<br><strong>Warning:</strong> There may be sensitive data left in your "
"preference file. ({0})"
msgstr ""
+"<br><strong>Advertencia:</strong> Puede haber dejado datos sensibles en su "
+"archivo de preferencias. ({0})"
msgid "Save user and password ({0})"
-msgstr ""
+msgstr "Guardar el usuario y la contraseña ({0})"
msgid "Plain text, JOSM default"
-msgstr ""
+msgstr "Texto claro, JOSM por defecto"
msgid "Use {0}"
-msgstr ""
+msgstr "Utilizar {0}"
msgid "Encrypt data with Windows logon credentials"
msgstr "Cifrar los datos con credenciales de inicio de sesión de Windows"
msgid "The native password manager plugin detected {0} on your system."
msgstr ""
+"El complemento gestor de contraseñas nativas detectó {0} en su sistema."
msgid "Days without mapping: {0}."
-msgstr ""
+msgstr "Días sin mapear: {0}"
msgid ""
"(To miserably continue mapping, edit out no_more_mapping\n"
"from {0})"
msgstr ""
+"(para continuar mapeando miserablemente, edite out no_more_mapping\n"
+"de {0})"
msgid "Split by municipality"
-msgstr ""
+msgstr "Dividir por municipalidad"
msgid "Split this data by municipality (admin_level=8)."
-msgstr ""
+msgstr "Dividir estos datos por municipalidad (admin_level=8)."
msgid "Split by sector"
-msgstr ""
+msgstr "Dividir por sector"
msgid "Split this data by sector (admin_level=10)."
-msgstr ""
+msgstr "Dividir estos datos por sector (admin_level=10)."
msgid "Split by neighbourhood"
-msgstr ""
+msgstr "Dividir por barrio"
msgid "Split this data by neighbourhood (admin_level=11)."
-msgstr ""
-
-msgid "Open Data"
-msgstr ""
+msgstr "Dividir estos datos por barrio (admin_level=11)."
msgid "CSV files"
-msgstr ""
+msgstr "Archivos CSV"
msgid "XLS files"
-msgstr ""
+msgstr "Archivos XLS"
msgid "ODS files"
-msgstr ""
+msgstr "Archivos ODS"
msgid "Shapefiles"
-msgstr ""
+msgstr "Archivos hape"
msgid "MapInfo files"
-msgstr ""
+msgstr "Archivos MapInfo"
msgid "KML/KMZ files"
-msgstr ""
+msgstr "Archivos KML/KMZ"
msgid "GML files"
-msgstr ""
+msgstr "Archivos GML"
msgid "Zip Files"
-msgstr ""
+msgstr "Archivos Zip"
+
+msgid "7Zip Files"
+msgstr "Archivos 7Zip"
msgid "OpenData XML files"
-msgstr ""
+msgstr "Archivos XML OpenData"
+
+msgid "Download open data"
+msgstr "Descargar datos abiertos"
msgid "License URL not available: {0}"
-msgstr ""
+msgstr "URL de licencia no disponible: {0}"
+
+msgid "OpenData preferences"
+msgstr "Preferencias OpenData"
msgid "License Agreement"
-msgstr ""
+msgstr "Términos de Licenciamiento"
msgid "Accept"
msgstr "Aceptar"
msgid "Refuse"
-msgstr ""
+msgstr "Rechazar"
msgid "I understand and accept these terms and conditions"
-msgstr ""
+msgstr "Entiendo y acepto estos términos y condiciones"
msgid "View the full text of this license"
-msgstr ""
+msgstr "Ver el texto completo de esta licencia"
msgid "I refuse these terms and conditions. Cancel download."
-msgstr ""
+msgstr "Rechazo estos términos y condiciones. Cancelar la descarga."
msgid "Module bundled with opendata plugin"
-msgstr ""
+msgstr "Módulo adjunto con el complemento opendata"
msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available modules."
msgstr ""
+"Por favor, presione en <strong>Descargar lista</strong> para descargar y "
+"mostrar una lista de módulos disponibles."
msgid ""
"The following module has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} modules have been downloaded <strong>successfully</strong>:"
msgstr[0] ""
+"El siguiente módulo ha sido descargado <strong>con éxito</strong>:"
msgstr[1] ""
+"El siguientes {0} módulos han sido descargados <strong>con éxito</strong>:"
msgid "Downloading the following module has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} modules has <strong>failed</strong>:"
-msgstr[0] ""
+msgstr[0] "La descarga del siguiente módulo ha <strong>fallado</strong>:"
msgstr[1] ""
+"La descarga de los siguientes {0} módulos ha <strong>fallado</strong>:"
msgid "Modules"
-msgstr ""
+msgstr "Módulos"
msgid "Accept the new module sites and close the dialog"
msgstr "Aceptar el sitio del nuevo módulo y cerrar la ventana de diálogo"
@@ -24475,110 +26614,126 @@ msgid "Configure Module Sites"
msgstr "Configurar sitios de módulo"
msgid "Download the list of available modules"
-msgstr ""
+msgstr "Descargar la lista de módulos disponibles"
msgid "Update modules"
-msgstr ""
+msgstr "Módulos actualizados"
msgid "Update the selected modules"
-msgstr ""
+msgstr "Actualizar los módulos seleccionados"
msgid "Please restart JOSM to activate the downloaded modules."
-msgstr ""
+msgstr "Por favor reinice JOSM para activar los módulos seleccionados"
msgid ""
"All installed modules are up to date. JOSM does not have to download newer "
"versions."
msgstr ""
+"Todos los módulos se encuentran actualizados. JOSM no tiene descargas de "
+"versiones nuevas."
msgid "Modules up to date"
-msgstr ""
+msgstr "Módulos actualizados"
msgid "Configure the list of sites where modules are downloaded from"
msgstr "Configurar la lista de sitios de donde se descargan los módulos:"
msgid "Add Open Data Module description URL."
-msgstr ""
+msgstr "Añadir URL descriptiva de módulo de datos abiertos."
msgid "Edit Open Data Module description URL."
-msgstr ""
+msgstr "Edite la URL de descripción del Módulo Open Data"
msgid "Open Data Module description URL"
-msgstr ""
+msgstr "URL de descripción del Módulo Open Data"
msgid "Download OSM data corresponding to the current data set."
-msgstr ""
+msgstr "Descargar datos OSM correspondientes al conjunto de datos actual."
msgid "Diff"
-msgstr ""
+msgstr "Diferencias"
msgid "Perform diff between current data set and existing OSM data."
msgstr ""
+"Visualizar las diferencias entre el conjutno de datos actuales y los datos "
+"existentes en OSM."
msgid "Open tools menu for this data."
-msgstr ""
+msgstr "Menú de herramientas abierto para estos datos."
msgid "Open the OpenData window."
-msgstr ""
+msgstr "Abrir la ventana de OpenData."
msgid "Raw data"
-msgstr ""
+msgstr "Datos en bruto"
msgid "OpenData Preferences"
-msgstr ""
+msgstr "Preferencias OpenData"
msgid ""
"A special handler for various Open Data portals<br/><br/>Please read the "
"Terms and Conditions of Use of each portal<br/>before any upload of data "
"loaded by this plugin."
msgstr ""
+"Componente para utilizar varios portales de datos abiertos.<br/><br/> Por "
+"favor, lea los términos y condiciones de uso de cada portal antes de subir a "
+"OSM cualquier dato cargado con este componente."
msgid "General settings"
-msgstr ""
+msgstr "Configuración general"
msgid ""
"Import only raw data (i.e. do not add/delete tags or replace them by "
"standard OSM tags)"
msgstr ""
+"Importar sólo datos en bruto (es decir, no añadir/eliminar etiquetas o "
+"sustituirlas por etiquetas estándar de OSM)"
msgid "Overpass API server:"
-msgstr ""
+msgstr "Servidor de API Overpass"
msgid "Overpass API server used to download OSM data"
-msgstr ""
+msgstr "Servidor API Overpass usado para descargar datos OSM"
msgid "XAPI server:"
-msgstr ""
+msgstr "Servidor XAPI"
msgid ""
"XAPI server used to download OSM data when Overpass API is not available"
msgstr ""
+"El servido XAPI utilizado para descargar datos OSM mediante API Overpass no "
+"se encuentra disponible"
msgid "Download modules"
-msgstr ""
+msgstr "Módulos descargados"
msgid "View summary"
-msgstr ""
+msgstr "Ver el resumen"
msgid "View full text"
-msgstr ""
+msgstr "Ver el texto completo"
msgid ""
"''Lambert CC 9 zones'' coordinates found with different zone codes for X and "
"Y: "
msgstr ""
+"Se encontraron coordenadas de ''Zonas de Lambert CC 9'' con códigos de zona "
+"diferente para X e Y: "
msgid "Downloading data..."
-msgstr ""
+msgstr "Descargando datos..."
msgid "File to load"
-msgstr ""
+msgstr "Archivo a cargar"
+
+msgid "Reading 7Zip file..."
+msgstr "Leyendo archivo 7Zip..."
msgid "Reading Zip file..."
-msgstr ""
+msgstr "Leyendo archivo Zip..."
msgid "Cannot transform to WGS84"
-msgstr ""
+msgstr "No se puede transformar a WGS84"
msgid ""
"JOSM was unable to find a strict mathematical transformation between ''{0}'' "
@@ -24586,213 +26741,270 @@ msgid ""
"perform a non-precise transformation (<b>with location errors up to 1 "
"km</b>) ?<br/><br/>If so, <b>do NOT upload</b> such data to OSM !"
msgstr ""
+"JOSM no pudo encontrar una transformación matemática estricta entre ''{0}'' "
+"y WGS84.<br /><br />¿Desea intentar un método <i>tolerante</i> method, el "
+"cual ejecutará una transformación no-precisa (<b>con errores de "
+"posicionamiento de hasta 1 km</b>) ?<br/><br/>Si así lo desea, ¡<b>NO "
+"publique</b> dichos datos en OSM !"
msgid "Try lenient method"
+msgstr "Intentar un método tolerante"
+
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
msgstr ""
+"No se pudo detectar un Sistema de Referencia de Coordenadas.\n"
+"¿Desearía volver a ESPG:4326 (WGS 84) ?"
+
+msgid "Warning: CRS not found"
+msgstr "Advertencia: CRS no encontrado"
+
+msgid "Unable to detect CRS !"
+msgstr "¡No se pudo detectar CRS !"
msgid "Unable to find a data store for file {0}"
-msgstr ""
+msgstr "No se pudo encontrar un almacenamiento de datos para el archivo {0}"
msgid "Loading shapefile ({0} features)"
-msgstr ""
+msgstr "Cargando archivo shape ({0} características)"
msgid "No valid coordinates have been found."
-msgstr ""
+msgstr "No se han encontrado coordenadas válidas."
msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
msgstr ""
+"Archivo incorrecto. Longitud errónea en la línea {0}. Se esperaban {1} "
+"columnas, se obtuvieron {2}."
msgid "View OSM Wiki page"
-msgstr ""
+msgstr "Ver la página Wiki de OSM"
msgid "Launch browser to the OSM Wiki page of the selected data set"
msgstr ""
+"Lanzar el navegador con la página Wiki de OSM para el conjunto de datos "
+"seleccionado"
msgid "View Local Portal page"
-msgstr ""
+msgstr "Ver la página del Portal Local"
msgid "Launch browser to the local portal page of the selected data set"
msgstr ""
+"Lanzar el navegador a la página del portal local para el conjunto de datos "
+"seleccionado"
msgid "View National Portal page"
-msgstr ""
+msgstr "Ver la página del Portal Nacional"
msgid "Launch browser to the national portal page of the selected data set"
msgstr ""
+"Lanzar el navegador a la página del portal nacional del conjunto de datos "
+"seleccionado"
msgid "View License"
-msgstr ""
+msgstr "Ver licencia"
msgid "Launch browser to the license page of the selected data set"
msgstr ""
+"Lanzar el navegador en la página de licencia para el conjunto de datos "
+"seleccionado"
msgid "View License (summary)"
-msgstr ""
+msgstr "Ver la licencia (resumen)"
msgid "Launch browser to the summary license page of the selected data set"
msgstr ""
+"Lanzar el navegador hacia la página de resumen de licencia del conjunto de "
+"datos seleccionado"
msgid "View the license of the selected data set"
-msgstr ""
+msgstr "Ver la licencia del conjunto de datos seleccionado"
msgid ""
"Warning: Cannot download module ''{0}''. Its download link is not known. "
"Skipping download."
msgstr ""
+"Advertencia: no se pudo descargar el módulo ''{0}''. Su vínculo de descarga "
+"es desconocido. Se suspende la descarga"
msgid ""
"Warning: Cannot download module ''{0}''. Its download link ''{1}'' is not a "
"valid URL. Skipping download."
msgstr ""
+"Advertencia: no se pudo descargar el modlo ''{0}''. Su enlace de descarga "
+"''{1}'' no es una URl válida. Se cancela la descarga."
msgid "Downloading Module {0}..."
-msgstr ""
+msgstr "Descargando el módulo {0}..."
msgid "An error occurred in module {0}"
-msgstr ""
+msgstr "Ocurrió un error en el módulo {0}"
msgid "Last module update more than {0} days ago."
-msgstr ""
+msgstr "La última actualización del módulo fue hace más de {0} días."
msgid "Click to update the activated modules"
-msgstr ""
+msgstr "Haga clic para actualizar los módulos activados"
msgid "Click to skip updating the activated modules"
-msgstr ""
+msgstr "Haga clic para omitir la actualización de los módulos activados"
msgid ""
"Skipping module update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
+"Suspender la actualización del modulo una vez transcurrido el intervalo de "
+"actualización. La actualización automática en el inicio se deshabilitará."
msgid ""
"Running module update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
+"Ejecutar el módulo después de transcurrido el intervalo de actualización. La "
+"actualización automática al inicio se deshabilitará."
msgid "Could not load module {0}. Delete from preferences?"
-msgstr ""
+msgstr "No se pudo cargar el módulo {0}. ¿Eliminarlo de las preferencias?"
msgid "loading module ''{0}'' (version {1})"
-msgstr ""
+msgstr "cargando el módulo ''{0}'' (versión {1})"
msgid ""
"<html>Could not load module {0} because the module<br>main class ''{1}'' was "
"not found.<br>Delete from preferences?</html>"
msgstr ""
+"<html>No se pudo cargar el módulo {0} debido a que la clase pain del "
+"módulo<br>''{1}'' no pudo ser encontrada.<br>¿Eliminarlo de las "
+"preferencias?</html>"
msgid "Loading modules ..."
-msgstr ""
+msgstr "Cargando módulos..."
msgid "Checking module preconditions..."
-msgstr ""
+msgstr "Verificando las precondiciones del módulo..."
msgid "Loading module ''{0}''..."
-msgstr ""
+msgstr "Cargando módulo ''{0}''..."
msgid "JOSM could not find information about the following module:"
msgid_plural "JOSM could not find information about the following modules:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM no pudo encontrar información sobre el siguiente módulo:"
+msgstr[1] "JOSM no pudo encontrar información sobre los siguientes módulos:"
msgid "The module is not going to be loaded."
msgid_plural "The modules are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "El módulo no va a ser cargado."
+msgstr[1] "Los módulos no van a ser cargados."
msgid "Updating the following module has failed:"
msgid_plural "Updating the following modules has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La actualización del módulo siguiente ha fallado:"
+msgstr[1] "La actualización de los módulos siguientes han fallado:"
msgid "Module update failed"
-msgstr ""
+msgstr "Falló la actualización del módulo"
msgid "Warning: failed to download module information list"
-msgstr ""
+msgstr "Advertencia: falló la descarga de la lista de información de módulos"
msgid "Disable module"
-msgstr ""
+msgstr "Deshabilitar módulo"
msgid "Click to delete the module ''{0}''"
-msgstr ""
+msgstr "Haga clic para eliminar el módulo ''{0}''"
msgid "Keep module"
-msgstr ""
+msgstr "Conservar el módulo"
msgid "Click to keep the module ''{0}''"
-msgstr ""
+msgstr "Haga clic para conservar el módulo ''{0}''"
msgid "Warning: failed to delete outdated module ''{0}''."
-msgstr ""
+msgstr "Advertencia: hubo una falla al eliminar el módulo vencido ''{0}''."
msgid ""
"Warning: failed to install already downloaded module ''{0}''. Skipping "
"installation. JOSM is still going to load the old module version."
msgstr ""
+"Adertencia: hubo una falla al instalar el módulo ''{0}'' ya descargado. "
+"Suspendiendo la instalación. JOSM todavía cargará la antigua versión del "
+"módulo."
msgid ""
"Warning: failed to install module ''{0}'' from temporary download file "
"''{1}''. Renaming failed."
msgstr ""
+"Advertencia: hubo una falla al instalar el módulo ''{0}'' desde el archivo "
+"temporal de descarga ''{1}''. Falló el renombrado."
msgid ""
"Do not ask again and remember my decision (go to Preferences->Modules to "
"change it later)"
msgstr ""
+"No preguntar otra vez y recordar mi decisión (ir a Preferencias-> Módulos si "
+"desea cambiarla más adelante)"
msgid "The module file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "El archivo de módulo ''{0}'' no incluye un Manifiesto."
msgid "Invalid URL ''{0}'' in module {1}"
-msgstr ""
+msgstr "URL inválida ''{0}'' en el módulo {1}"
msgid "<b>Module provided by an external source:</b> {0}"
-msgstr ""
+msgstr "<b>Módulo provisto por una fuente externa:</b> {0}"
msgid "Failed to create module information from manifest for module ''{0}''"
msgstr ""
+"Hubo una falla al crear información desde el manifiesto para el módulo "
+"''{0}''"
msgid "Illegal entry in module list."
-msgstr ""
+msgstr "Entrada incorrecta en el listado de módulos."
msgid "Reading local module information.."
-msgstr ""
+msgstr "Leyendo información local de módulo"
msgid "Processing module site cache files..."
-msgstr ""
+msgstr "Procesando los archivos de caché de sitios de módulos"
msgid ""
"Warning: Failed to scan file ''{0}'' for module information. Skipping."
msgstr ""
+"Advertencia: hubo una falla al escanear el archivo ''{0}'' para información "
+"del módulo. Suspendiendo."
msgid "Processing module site cache icon files..."
-msgstr ""
+msgstr "Procesando los archivos en caché de íconos de sitio"
msgid "Processing module files..."
-msgstr ""
+msgstr "Procesando archivos de módulos..."
msgid "Download module list..."
-msgstr ""
+msgstr "Descargar lista de módulos..."
msgid "Downloading module list from ''{0}''"
-msgstr ""
+msgstr "Descargando lista de módulos desde ''{0}''"
msgid ""
"Warning: failed to create module directory ''{0}''. Cannot cache module list "
"from module site ''{1}''."
msgstr ""
+"Advertencia: hubo una falla al crear el directorio de módulo ''{0}''. No se "
+"puede poner en memoria rápida el listado de módulos del sitio de módulos "
+"''{1}''."
msgid "Writing module list to local cache ''{0}''"
-msgstr ""
+msgstr "Escribiendo el listado de módulos a la memoria rápida local ''{0}''"
msgid "Parsing module list from site ''{0}''"
-msgstr ""
+msgstr "Interpretando listado de módulos desde el sitio ''{0}''"
msgid ""
"Failed to parse module list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
+"Hubo una falla al interpretar el documento de lista de módulos desde el "
+"sitio ''{0}''. Se suspende el sitio. La excepción fue: {1}"
msgid "Processing module list from site ''{0}''"
msgstr "Procesando lista de módulos desde el sitio '' {0}''"
@@ -24828,15 +27040,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Ha ocurrido un error: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "No se ha podido crear nuevos avisos de errores. Resultado: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"La cabecera contiene varios valores y no puede ser transferida a una sola "
-"cadena"
-
msgid "Process queue"
msgstr "Procesando cola"
@@ -24893,26 +27096,14 @@ msgstr ""
msgid "Close: "
msgstr "Cerrar: "
-msgid "New issue"
-msgstr "Nueva cuestión"
-
-msgid "Create issue"
-msgstr "Crear cuestión"
-
-msgid "Describe the problem precisely"
-msgstr "Describa el problema con precisión"
-
-msgid "Create: "
-msgstr "Crear: "
-
msgid "Open in browser"
-msgstr ""
+msgstr "Abrir con el navegador"
msgid "No item selected"
-msgstr ""
+msgstr "No hay elementos seleccionados"
msgid "Open in browser: "
-msgstr ""
+msgstr "Abrir en el navegador: "
msgid "Please enter a user name"
msgstr "Por favor, introduzca su nombre de usuario"
@@ -24962,19 +27153,22 @@ msgid "Firefox executable"
msgstr "Ejecutable Firefox"
msgid "OSM Server Files pbf compressed"
-msgstr ""
+msgstr "Archivos pbf comprimidos del Servidor OSM"
+
+msgid "Download PBF"
+msgstr "Descargar PBF"
msgid "Invalid changeset id: {0}"
-msgstr ""
+msgstr "Identificador de conjunto de cambios inválido: {0}"
msgid "Invalid timestamp: {0}"
msgstr "fecha y hora inválida: {0}"
msgid "Invalid DenseNodes key/values table"
-msgstr ""
+msgstr "Tabla de claves/valores DenseNodes inválida"
msgid "Reading OSM data..."
-msgstr ""
+msgstr "Leyendo datos OSM..."
msgid "Transform error: Min X must be smaller than max"
msgstr "Transformación de error: Min X debe ser menor que max"
@@ -25070,10 +27264,12 @@ msgid "Projection Preferences"
msgstr "Preferencias de la proyección"
msgid "Close the dialog and apply projection preferences"
-msgstr ""
+msgstr "Cerrar el diálogo y aplicar preferencias de proyección"
msgid "Close the dialog, discard projection preference changes"
msgstr ""
+"Cerrar el cuadro de diálogo y descartar los cambios a las preferencias de "
+"proyección"
msgid "Loading..."
msgstr "Cargando..."
@@ -25171,9 +27367,6 @@ msgstr "Importar archivo PDF."
msgid "Import PDF"
msgstr "Importar PDF"
-msgid "Import PDf file"
-msgstr "Importar archivo PDF"
-
msgid " {0} objects so far"
msgstr " van {0} objetos"
@@ -25187,10 +27380,10 @@ msgid "The PDF file must have exactly one page."
msgstr "El archivo PDF debe tener exáctamente una página"
msgid "Read error: "
-msgstr ""
+msgstr "Error de lectura: "
msgid "Write error: "
-msgstr ""
+msgstr "Error de escritura: "
msgid "Write coordinates to image header"
msgstr "Escribir coordenadas en el encabezado de la imagen"
@@ -25256,12 +27449,30 @@ msgstr "La prueba falló: No se pudo leer el mtime."
msgid "Test failed: Could not write mtime."
msgstr "La prueba falló: no se pudo escribir el mtime"
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
-msgid "Do you want to save current calibration of layer {0}?"
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
+msgid "Do you want to save current calibration of layer {0}?"
+msgstr "¿Desea guardar la calibración de la capa actual {0}?"
+
msgid "Load Picture Calibration..."
msgstr "Cargar calibración de imágenes..."
@@ -25272,19 +27483,19 @@ msgid "Loading file failed: {0}"
msgstr "Falló la carga del fichero: {0}"
msgid "Load World File Calibration..."
-msgstr ""
+msgstr "Cargar la Calibracióndel Archivo Mundial..."
msgid "Loads calibration data from a world file"
-msgstr ""
+msgstr "Cargar datos de calibración desde un archivo mundial"
msgid "Reset Calibration"
-msgstr ""
+msgstr "Reiniciar Calibración"
msgid "Reset calibration"
-msgstr ""
+msgstr "Reiniciar calibración"
msgid "Calibration reset"
-msgstr ""
+msgstr "Reinicialización de calibración"
msgid "Save Picture Calibration..."
msgstr "Guardar calibración de imagen..."
@@ -25299,7 +27510,7 @@ msgid "New picture layer from clipboard"
msgstr "Nueva capa de imágenes desde el portapapeles"
msgid "Supported image files, *.zip, *.kml"
-msgstr ""
+msgstr "Archivos de imagen soportados, *.zip, *.kml"
msgid "New picture layer from file..."
msgstr "Nueva capa de imágenes desde un archivo..."
@@ -25319,7 +27530,7 @@ msgid "PicLayer move"
msgstr "Mover Capa de Imagen(PicLayer)"
msgid "Moved"
-msgstr ""
+msgstr "Movido"
msgid "Drag to move the picture"
msgstr "Arrastrar para mover la imagen"
@@ -25328,7 +27539,7 @@ msgid "PicLayer rotate"
msgstr "Rotar capa de imagen"
msgid "Rotated"
-msgstr ""
+msgstr "Rotado"
msgid "Drag to rotate the picture"
msgstr "Arrastrar para rotar la imagen"
@@ -25337,7 +27548,7 @@ msgid "PicLayer scale X"
msgstr "Escala de PicLayer X"
msgid "Scaled by X"
-msgstr ""
+msgstr "Aplicada escala de factor X"
msgid "Drag to scale the picture in the X Axis"
msgstr "Arrastrar para escalar la imagen en el eje X"
@@ -25346,7 +27557,7 @@ msgid "PicLayer scale"
msgstr "Escala PicLayer"
msgid "Scaled"
-msgstr ""
+msgstr "Escalado"
msgid "Drag to scale the picture in the X and Y Axis"
msgstr "Arrastrar para escalar la imagen en los ejes X e Y"
@@ -25355,7 +27566,7 @@ msgid "PicLayer scale Y"
msgstr "Escala Y PicLayer"
msgid "Scaled by Y"
-msgstr ""
+msgstr "Aplicada escala de factor Y"
msgid "Drag to scale the picture in the Y Axis"
msgstr "Arrastrar para escalar la imagen en el eje Y"
@@ -25364,40 +27575,40 @@ msgid "PicLayer shear"
msgstr "Inclinación PicLayer"
msgid "Sheared"
-msgstr ""
+msgstr "Compartido"
msgid "Drag to shear the picture"
msgstr "Arrastrar para inclinar la imágen"
msgid "PicLayer Move point"
-msgstr ""
+msgstr "Mover punto de PicLayer"
msgid "Point added/moved"
-msgstr ""
+msgstr "Punto añadido/desplazado"
msgid "Drag or create point on the picture"
-msgstr ""
+msgstr "Arrastrar o crear punto en la imagen"
msgid "PicLayer Remove point"
-msgstr ""
+msgstr "Eliminar punto de PicLayer"
msgid "Point removed"
-msgstr ""
+msgstr "Punto eliminado"
msgid "Remove point on the picture"
-msgstr ""
+msgstr "Eliminar punto en la imagen"
msgid "PicLayer Transform point"
-msgstr ""
+msgstr "Transformar punto de PicLayer"
msgid "Point transformed"
-msgstr ""
+msgstr "Punto transformado"
msgid "Transform point on the picture"
-msgstr ""
+msgstr "Transformar punto en el cuadro"
msgid "PicLayer: {0}"
-msgstr ""
+msgstr "PicLayer: {0}"
msgid "Calibration Files"
msgstr "Calibrar ficheros"
@@ -25414,13 +27625,19 @@ msgstr "Nada en el portapapeles"
msgid "The clipboard data is not an image"
msgstr "Los datos del portapapeles no son una imagen"
-msgid "A calibration file associated to the picture file was found: {0}\n"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
+"Advertencia: Fallo al manipular fichero zip \"{0}\". La excepción fue: {1}"
+
+msgid "A calibration file associated to the picture file was found: {0}\n"
+msgstr "Se encontró un archivo de calibración asociado a la imagen: {0}\n"
msgid ""
"Set \"{0}\" to yes/no/ask in the preferences\n"
"to control the autoloading of calibration files."
msgstr ""
+"Fijar \"{0}\" a sí/no/consultar en las preferencias para controlar el "
+"cargado automático de archivos de calibración."
msgid "Do you want to apply it ?"
msgstr "¿Desea aplicarlo?"
@@ -25434,111 +27651,118 @@ msgstr "Se aplicará automáticamente."
msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+"Además, de acá en más, los archivos de calibración serán cargados de forma "
+"automática."
+
+msgid "Download Osmosis poly"
+msgstr "Descargar polígono Osmosis"
msgid "Reading polygon filter file..."
-msgstr ""
+msgstr "Leyendo archivo de filtro de polígono..."
msgid "Error reading poly file: {0}"
-msgstr ""
+msgstr "Error al leer archivo de polígono: {0}"
msgid "The file must begin with a polygon name"
-msgstr ""
+msgstr "El archivo debe tener un nombre de polígono"
msgid "There are less than 2 points in an area"
-msgstr ""
+msgstr "Hay menos de 2 puntos en un área"
msgid "A polygon coordinate line must contain exactly 2 numbers"
msgstr ""
+"Una línea de coordenadas de polígonos debe contener exactamente 2 números"
msgid "Unable to parse {0} as a number"
-msgstr ""
+msgstr "No se pudo interpretar {0} como un número"
msgid "Invalid coordinates were found: {0}, {1}"
-msgstr ""
+msgstr "Se encontraron coordenadas incorrectas: {0}, {1}"
msgid "{0} points were outside world bounds and were moved"
msgstr ""
+"{0} puntos estaban fuera de los límites del mundo y fueron desplazados"
msgid "Osmosis polygon filter files"
-msgstr ""
+msgstr "Archivos de filtro de polígonos de Osmosis"
msgid "Print..."
msgstr "Imprimir..."
msgid "Print the map"
-msgstr ""
+msgstr "Imprimir el mapa"
msgid "Print the Map"
-msgstr ""
+msgstr "Imprimir el Mapa"
msgid "Printer"
-msgstr ""
+msgstr "Impresora"
msgid "Media"
-msgstr ""
+msgstr "Medios"
msgid "Orientation"
-msgstr ""
+msgstr "Orientación"
msgid "Printer settings"
-msgstr ""
+msgstr "Configuración de la impresora"
msgid "Scale"
-msgstr ""
+msgstr "Escala"
msgid "Resolution"
-msgstr ""
+msgstr "Resolución"
msgid "Map information"
-msgstr ""
+msgstr "Información del mapa"
msgid "Map Preview"
-msgstr ""
+msgstr "Previsualización del mapa"
msgid "Zoom To Page"
-msgstr ""
+msgstr "Acercar hasta la página"
msgid "Zoom To Actual Size"
-msgstr ""
+msgstr "Visualizar tamaño real"
msgid "Print"
-msgstr ""
+msgstr "Imprimir"
msgid "Printing has been cancelled."
-msgstr ""
+msgstr "La impresión ha sido cancelada."
msgid "Printing stopped"
-msgstr ""
+msgstr "Impresión detenida"
msgid "Printing has failed."
-msgstr ""
+msgstr "La impresión ha fallado."
msgid "Proj4J: {0} selected"
-msgstr ""
+msgstr "Proj4J: {0} seleccionado"
msgid "Selected: {0}"
-msgstr ""
+msgstr "Seleccionado: {0}"
msgid "Proj4J Plugin"
-msgstr ""
+msgstr "Complemento Proj4J"
msgid "Code"
msgstr "Código"
msgid "added"
-msgstr ""
+msgstr "añadido"
msgid "Public Transport: Enable GTFSStops"
-msgstr "Transporte público: Activar paradas GFTS"
+msgstr "Transporte público: activar paradas GFTS"
msgid "Public Transport: Catch GTFS stops"
-msgstr "Tranporte público: capturar paradas GTFS"
+msgstr "Transporte público: capturar paradas GTFS"
msgid "skipped"
-msgstr ""
+msgstr "omitido"
msgid "Public Transport: Disable GTFS"
-msgstr ""
+msgstr "Transporte público: desactivar GTFS"
msgid "Create Stops from GTFS ..."
msgstr "Crear paradas desde GTFS..."
@@ -25547,7 +27771,7 @@ msgid "Create Stops from a GTFS file"
msgstr "Crear paradas desde un archivo GTFS"
msgid "Select GTFS file (stops.txt)"
-msgstr ""
+msgstr "Seleccionar archivo GTFS (stops.txt)"
msgid "File \"{0}\" does not exist"
msgstr "El archivo \"{0} no existe"
@@ -25566,13 +27790,13 @@ msgid "No data found"
msgstr "No se encontró datos"
msgid "The GTFS file was empty."
-msgstr ""
+msgstr "El archivo GRFS estaba vacío."
msgid "light_rail"
msgstr "tren ligero"
msgid "Create Stops from GTFS"
-msgstr ""
+msgstr "Crear paradas desde GTFS"
msgid "GTFS-Stops"
msgstr "Paradas-GTFS"
@@ -25584,7 +27808,7 @@ msgid "Time on your GPS device"
msgstr "Tiempo en su dispositivo GPS"
msgid "HH:MM:SS.sss"
-msgstr ""
+msgstr "HH:MM:SS.sss"
msgid "Time on your stopwatch"
msgstr "Tiempo en su cronómetro"
@@ -25593,7 +27817,7 @@ msgid "Time window"
msgstr "Período de tiempo"
msgid "seconds"
-msgstr ""
+msgstr "segundos"
msgid "Move Threshold"
msgstr "Umbral de desplazamiento"
@@ -25620,40 +27844,40 @@ msgid "Enable"
msgstr "Activar"
msgid "Can''t parse a time from this string."
-msgstr ""
+msgstr "No se puede interpretar una hora con esta cadena de caracteres."
msgid "Invalid value"
-msgstr ""
+msgstr "Valor no válido"
msgid "moved"
-msgstr ""
+msgstr "Movido"
msgid "Public Transport: Join GTFS stops"
-msgstr "Transporte público: Unir paradas GTFS"
+msgstr "Transporte público: unir paradas GTFS"
msgid "Id"
-msgstr ""
+msgstr "Id"
msgid "pending"
-msgstr ""
+msgstr "pendiente"
msgid "outside"
-msgstr ""
+msgstr "afuera"
msgid "[incomplete]"
-msgstr ""
+msgstr "[incompleto]"
msgid "[empty way]"
-msgstr ""
+msgstr "[vía vacía]"
msgid "[ID] {0}"
-msgstr ""
+msgstr "[ID] {0}"
msgid "[gap]"
-msgstr ""
+msgstr "[interrupción]"
msgid " [ID] {0}"
-msgstr ""
+msgstr " [ID] {0}"
msgid "Route patterns ..."
msgstr "Patrones de ruta..."
@@ -25662,7 +27886,7 @@ msgid "Edit Route patterns for public transport"
msgstr "Editar patrones de ruta para transporte público"
msgid "Route Patterns"
-msgstr ""
+msgstr "Patrones de Ruta"
msgid "Overview"
msgstr "Descripción general"
@@ -25683,37 +27907,37 @@ msgid "Reflect"
msgstr "Voltear"
msgid "Required tags:"
-msgstr ""
+msgstr "Etiquetas requeridas:"
msgid "Common tags:"
-msgstr ""
+msgstr "Etiquetas comunes:"
msgid "Additional tags:"
-msgstr ""
+msgstr "Etiquetas adicionales:"
msgid "Add a new Tag"
-msgstr ""
+msgstr "Añadir una nueva etiqueta"
msgid "Name/Id"
-msgstr ""
+msgstr "Nombre/Id"
msgid "Ref"
-msgstr ""
+msgstr "Referencia"
msgid "Stops are possible on the"
-msgstr ""
+msgstr "Las paradas son posibles en el"
msgid "right hand side"
-msgstr ""
+msgstr "lado de la mano derecha"
msgid "left hand side"
-msgstr ""
+msgstr "lado de la mano izquierda"
msgid "Maximum distance from route"
-msgstr ""
+msgstr "Distancia máxima desde el itinerario"
msgid "Public Transport: Change stop type"
-msgstr ""
+msgstr "Transporte público: cambiar tipo de parada"
msgid "Create Stops from GPX ..."
msgstr "Crear paradas desde GPX..."
@@ -25722,72 +27946,71 @@ msgid "Create Stops from a GPX file"
msgstr "Crear paradas desde un archivo GPX"
msgid "Select GPX file"
-msgstr ""
+msgstr "Seleccionar el archivo GPX"
msgid "The GPX file contained no tracks or waypoints."
-msgstr ""
+msgstr "El archivo GPX no contenía trazas ni puntos de interés."
msgid "Create Stops from GPX"
msgstr "Crear paradas desde GPX"
-msgid "Tracks"
-msgstr "Vías"
-
msgid "Tracks in this GPX file:"
msgstr "Trazas en este archivo GPX:"
msgid "Detach"
-msgstr ""
+msgstr "Despegar"
msgid "implicit"
-msgstr ""
+msgstr "implícito"
msgid ""
"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
"has trackpoints."
msgstr ""
+"El archivo GPX no contiene puntos de traza válidos. Por favor utilice un "
+"archivo GPX que contenga puntos de traza."
msgid "GPX File Trouble"
-msgstr ""
+msgstr "Problema con Archivo GPX"
msgid "unnamed"
msgstr "sin nombre"
msgid "Public Transport: Add track stop"
-msgstr ""
+msgstr "Transporte público: añadir pista de parada"
msgid "Public Transport: Delete track stop"
-msgstr ""
+msgstr "Transporte público: borrar pista de parada"
msgid "Public Transport: Detach track stop list"
-msgstr ""
+msgstr "Transporte público: separar la lista de pistas parada"
msgid "Public Transport: Edit track stop list"
-msgstr ""
+msgstr "Transporte público: editar la lista de paradas"
msgid "Public Transport: Relocate nodes in track stoplist"
-msgstr ""
+msgstr "Transporte público: reubicar nodos en lista de paradas de ruta"
msgid "Public Transport: sort track stop list"
-msgstr ""
+msgstr "Transporte público: ordenar lista de paradas de ruta"
msgid "Public Transport: Suggest stops"
msgstr "Transporte público: paradas sugeridas"
msgid "Stopname"
-msgstr ""
+msgstr "Nombre de parada"
msgid "Public Transport: Detach waypoints"
-msgstr ""
+msgstr "Transporte público: separar punto de ruta"
msgid "Public Transport: Disable waypoints"
-msgstr ""
+msgstr "Transporte público: desactivar punto de ruta"
msgid "Public Transport: Enable waypoints"
-msgstr "Trasmporte público: activar puntos de interés"
+msgstr "Trasmporte público: activar puntos de ruta"
msgid "Public Transport: Edit waypoint name"
-msgstr ""
+msgstr "Transporte público: editar nombre del punto de ruta"
msgid "Relation Toolbox"
msgstr "Caja de herramientas de relaciones"
@@ -25799,31 +28022,30 @@ msgid "Specify role"
msgstr "Especificar rol"
msgid "Change relation member roles to {0}"
-msgstr ""
-
-msgid "Change multipolygon creation settings"
-msgstr "Cambiar la configuración de creación de multipolígono"
+msgstr "Cambiar los roles de los miembros de la relación a {0}"
msgid "Create administrative boundary relations"
-msgstr ""
+msgstr "Crear relaciones de límites administrativos"
msgid "Add tags boundary and admin_level to boundary relation ways"
msgstr ""
+"Añadir etiquetas de límites y admin_level a las vías que componen la "
+"relación de límites"
msgid "Move area tags from contour to relation"
-msgstr ""
+msgstr "Mover las etiquetas de área desde el contorno a la relación"
msgid "When moving tags, consider even non-repeating ones"
-msgstr ""
+msgstr "Al mover etiquetas considere incluso aquellas que no se repiten"
msgid "Always split ways of neighbouring multipolygons"
-msgstr ""
+msgstr "Siempre dividir vías de multipolígonos vecinos"
msgid "Change role"
-msgstr ""
+msgstr "Cambiar rol"
msgid "Enter role for selected members"
-msgstr ""
+msgstr "Ingresar el rol para los miembros seleccionados"
msgid "Relation Toolbox: {0}"
msgstr "Caja de herramientas de relaciones: {0}"
@@ -25835,16 +28057,16 @@ msgid "Add/remove members from the chosen relation"
msgstr "Añadir/quitar miembros de la relación seleccionada"
msgid "Clear the chosen relation"
-msgstr ""
+msgstr "Vaciar la relación elegida"
msgid "Create a multipolygon from selected objects"
msgstr "Crear un multipolígono a partir de los objetos seleccionados"
msgid "Create multipolygons from rings"
-msgstr ""
+msgstr "Crear multipolígonos desde anillos"
msgid "Move tags from ways to relation"
-msgstr ""
+msgstr "Mover etiquetas desde las vías a la relación"
msgid "Enter admin level and name for the border relation:"
msgstr "Introducir nivel administrativo y nombre de la relación de frontera:"
@@ -25853,7 +28075,7 @@ msgid "Admin level"
msgstr "Nivel administrativo"
msgid "Create a relation from selected objects"
-msgstr ""
+msgstr "Crear una relación a partir de los objetos seleccionados"
msgid "Choose a type for the relation:"
msgstr "Elija un tipo para la relación:"
@@ -25862,7 +28084,7 @@ msgid "Delete relation"
msgstr "Borrar relación"
msgid "Download incomplete members for the chosen relation"
-msgstr ""
+msgstr "Descargar miembros incompletos para la relación elegida"
msgid "Download referrers"
msgstr "Descargar referentes"
@@ -25871,7 +28093,7 @@ msgid "Download referrers for the chosen relation and its members."
msgstr "Descargar referentes para la relación seleccionada y sus miembros."
msgid "Duplicate relation"
-msgstr ""
+msgstr "Duplicar relación"
msgid "Open relation editor for the chosen relation"
msgstr "Abrir editor de relaciones para seleccionar una relación"
@@ -25880,16 +28102,18 @@ msgid "Find a relation"
msgstr "Encontrar una relación"
msgid "Reconstruct polygon"
-msgstr ""
+msgstr "Reconstruir polígono"
msgid "Multipolygon must consist only of ways"
-msgstr ""
+msgstr "El multipolígono debe estar compuesta únicamente de vías"
msgid "Reconstruction of polygons can be done only from outer ways"
msgstr ""
+"La reconstrucción de polígonos puede ser hecha únicamente a partir de vías "
+"exteriores"
msgid "Reconstruct polygons from relation {0}"
-msgstr ""
+msgstr "Reconstruir polígonos a partir de la relación {0}"
msgid "Open relation wiki page"
msgstr "Abrir la página de la wiki relacionada"
@@ -25901,37 +28125,34 @@ msgid "Fix roles of the chosen relation members"
msgstr "Fijar funciones de los miembros de la relación elegidos"
msgid "Complete multipolygon for way {0}"
-msgstr ""
+msgstr "Completar multipolígono para la vía {0}"
msgid "Node without ''house'' role found"
-msgstr ""
+msgstr "Se encontró un nodo sin el rol ''house''"
msgid "Way without ''house'' or ''street'' role found"
-msgstr ""
+msgstr "Se encontró una vía sin el rol ''hous'' o ''street''"
msgid "Relation without ''house'' role found"
-msgstr ""
+msgstr "Se encontró una relación sin el rol ''house''"
msgid "Relation does not have name"
-msgstr ""
+msgstr "La relación no tiene un nombre"
msgid "Relation has streets with different names"
-msgstr ""
+msgstr "La relación tiene calles con diferentes nombres"
msgid "fix associatedStreet relation"
-msgstr ""
+msgstr "corregir relación associatedStreet"
msgid "Relation without ''subarea'' role found"
-msgstr ""
+msgstr "Se encontró una relación sin el rol ''subarea''"
msgid "Node without ''label'' or ''admin_centre'' role found"
-msgstr ""
+msgstr "Se encontró un nodo sin el rol ''label'' o ''admin_centre''"
msgid "Way without ''inner'' or ''outer'' role found"
-msgstr ""
-
-msgid "Restart JOSM"
-msgstr "Reiniciar JOSM"
+msgstr "Se encontró una vía sin e lrol ''iner'' o ''outer''"
msgid "Revert changeset fully"
msgstr "Conjunto de cambios revertido en su totalidad"
@@ -25949,10 +28170,13 @@ msgid "Revert"
msgstr "Revertir"
msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "Ingreasr el ID del conjunto de cambios que debería ser revertido"
msgid "Reverted changeset"
-msgstr ""
+msgstr "Conjunto de cambios revertido"
+
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "No está permitido revertir el conjunto de cambios desde {0}"
msgid "Missing merge target for {0} with id {1}"
msgstr "Destino de mezcla ausente para {0} con id {1}"
@@ -25967,51 +28191,77 @@ msgid "Preparing history data..."
msgstr "Preparando datos de historia..."
msgid "Remote Control has been asked to revert a changeset."
-msgstr ""
+msgstr "A Control Remoto se le ha solicitado revertir un conjunto de cambios"
msgid "Reverting..."
-msgstr ""
+msgstr "Revirtiendo..."
msgid ""
"This changeset has objects that are not present in current dataset.\n"
"It is needed to download them before reverting. Do you want to continue?"
msgstr ""
+"Este conjunto de cambios tiene objetos que no están presentes en el conjunto "
+"de datos actual.\n"
+"Se necesita descargarlos antes de iniciar la reversión. ¿Desea continuar?"
msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Buscando las primitivas faltantes"
msgid "Downloading changeset"
-msgstr ""
+msgstr "Descargando conjunto de cambios"
+
+msgid "See {0}"
+msgstr "Ver {0}"
msgid "Revert changeset #{0}"
+msgstr "Revertir conjunto de cambios #{0}"
+
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Advertencia: El elemento \"{0}\" no se acepta como comienzo en el contenido "
+"del conjunto de cambios en la posición ({1},{2}). Omitiéndolo."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
+"Advertencia: no se soporta el elemento final \"{0}\" en el contenido del "
+"conjunto de cambios en la posición ({1},{2}). Omitiéndolo."
msgid "Road Sign Plugin"
msgstr "Plugin de señales de tránsito"
msgid "signs"
-msgstr ""
+msgstr "señales"
+
+msgid "Change Properties"
+msgstr "Cambiar propiedades"
msgid "Country preset:"
-msgstr ""
+msgstr "País prefijado:"
msgid "Show all signs"
-msgstr ""
+msgstr "Mostrar todas las señales"
msgid "Show a selection of the most useful signs"
-msgstr ""
+msgstr "Mostrar una selección de las señales más usadas"
+
+msgid "Spain"
+msgstr "España"
msgid "Germany"
-msgstr ""
+msgstr "Alemania"
msgid "Poland"
-msgstr ""
+msgstr "Polonia"
msgid "Slovakia"
-msgstr ""
+msgstr "Eslovaquia"
msgid "Roadsign tagging"
msgstr "Etiquetas de señales de tránsito"
@@ -26023,7 +28273,7 @@ msgid "Roadsigns plugin: open dialog"
msgstr "plugin de señales de tránsito"
msgid "custom"
-msgstr ""
+msgstr "personalizado"
msgid "Could not read tagging preset source: ''{0}''"
msgstr "No se pudo leer fuente predeterminada de etiquetas: \"{0}\""
@@ -26056,10 +28306,10 @@ msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
msgstr "Eliminar relación ''{0}'' en la posición {1} de la relación ''{2}''"
msgid "routing active route"
-msgstr ""
+msgstr "ruteando itinerario activo"
msgid "routing inactive route"
-msgstr ""
+msgstr "ruteando itinerario inactivo"
msgid "Routing"
msgstr "Enrutamiento"
@@ -26089,7 +28339,7 @@ msgid "Fastest"
msgstr "La más rápida"
msgid "Ignore oneways"
-msgstr ""
+msgstr "Ignorar sentidos únicos"
msgid "Reverse route"
msgstr "Ruta inversa"
@@ -26098,7 +28348,7 @@ msgid "Clear route"
msgstr "Borrar ruta"
msgid "Reconstruct Graph"
-msgstr ""
+msgstr "Reconstruir gráfico"
msgid "Routing Plugin Preferences"
msgstr "Preferencias del componente Routing"
@@ -26106,9 +28356,6 @@ msgstr "Preferencias del componente Routing"
msgid "Configure routing preferences."
msgstr "Configurar las preferencias de enrutamiento"
-msgid "Highway type"
-msgstr "Tipo de vial"
-
msgid "Speed (Km/h)"
msgstr "Velocidad (km/h)"
@@ -26122,107 +28369,122 @@ msgid "New value for {0}"
msgstr "Nuevo valor de {0}"
msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
-msgstr ""
+msgstr "Falta la preferencia ''{0}''. No se puede inicializar SdsApi."
msgid ""
"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
"is stored in plain text in the JOSM preferences file. </p></body></html>"
msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Advertencia:</strong> la "
+"contraseña se almacena en texto claro en el archivo de preferencias de JOSM. "
+"</p></body></html>"
msgid "Enter credentials for Separate Data Store API"
-msgstr ""
+msgstr "Ingresar als credenciales para el API de Separate Data Store"
msgid "Please enter the user name of your SDS account"
-msgstr ""
+msgstr "Por favor ingrese el nombre de usuario para su cuenta SDS"
msgid "Please enter the password of your SDS account"
-msgstr ""
+msgstr "Por favor ingrese la contraseña de su cuenta SDS"
msgid ""
"Authenticating at the SDS API ''{0}'' failed. Please enter a valid username "
"and a valid password."
msgstr ""
+"Falló la autenticación de la API SDS ''{0}''. Por favor ingrese un nombre de "
+"usuario válido y contraseña válidos."
msgid "SDS data file"
-msgstr ""
+msgstr "Archivo de datos SDS"
msgid "Load..."
-msgstr ""
+msgstr "Cargar..."
msgid "Load separate data store data from a file."
-msgstr ""
+msgstr "Cargar datos de almacenamiento separados desde un archivo."
msgid "Loading files"
-msgstr ""
+msgstr "Leyendo archivos"
msgid "SDS"
-msgstr ""
+msgstr "SDS"
msgid "Information about SDS."
-msgstr ""
+msgstr "Información sobre el SDS."
msgid "About SDS..."
-msgstr ""
+msgstr "Acerca de SDS..."
msgid "Open a preferences dialog for SDS."
-msgstr ""
+msgstr "Abrir un cuadro de diálogo de preferencias para SDS"
msgid "Separate Data Store"
-msgstr ""
+msgstr "Separate Data Store"
msgid "Configures access to the Separate Data Store."
-msgstr ""
+msgstr "Configurar acceso al Separate Data Store."
msgid "Server"
-msgstr ""
+msgstr "Servidor"
msgid "The URL under which the SDS server can be contacted."
-msgstr ""
+msgstr "La URL por la cual el servidor SDS puede ser contactada."
msgid ""
"The user name at the SDS server. You need to create an account with the SDS "
"admin first."
msgstr ""
+"El nombre de usuario en el servidor SDS. Necesita crear una cuenta con el "
+"administrador SDS primero."
msgid ""
"The password at the SDS server. You need to create an account with the SDS "
"admin first."
msgstr ""
+"La contraseña en el servidor SDS. Necesita crear una cuenta com el "
+"administrador de SDS primero."
msgid ""
"Tags beginning with this prefix are never saved to OSM, but to the SDS "
"server only."
msgstr ""
+"Las etiquetas que comienzan con este prefijo no serán guardadas en OSM, sino "
+"solamente al servidor SDS."
msgid "SDS server URL"
-msgstr ""
+msgstr "URL del servidor SDS"
msgid "SDS username"
-msgstr ""
+msgstr "Nombre de usuario SDS"
msgid "SDS password"
-msgstr ""
+msgstr "Contraseña SDS"
msgid "Test credentials now"
-msgstr ""
+msgstr "Probar credenciales ahora"
msgid "SDS tag prefix"
-msgstr ""
+msgstr "Prefijo de etiqueta SDS"
msgid "Connection successful."
-msgstr ""
+msgstr "Conexión exitosa."
msgid "Cannot connect to SDS server: "
-msgstr ""
+msgstr "No se pudo conectar al servidor SDS: "
msgid "Save..."
-msgstr ""
+msgstr "Guardar..."
msgid "Save the current separate data store information to a file."
msgstr ""
+"Guardar la información de datos de almacenamiento separado como un archivo"
msgid "Save SDS file"
-msgstr ""
+msgstr "Guardar archivo SDS"
+
+msgid "Could not back up file. Exception is: {0}"
+msgstr "No se pudo hacer copia de seguridad. La excepción es: {0}"
msgid "Simplify Area"
msgstr "Simplificar aŕea"
@@ -26246,7 +28508,7 @@ msgid "Delete nodes outside of data regions?"
msgstr "¿Borrar nodos fuera de las regiones de los datos?"
msgid "average nearby nodes"
-msgstr ""
+msgstr "nodos promedio cercanos"
msgid ""
"Node of the way (area) is removed if all of <u>Angle Weight</u>, <u>Area "
@@ -26262,9 +28524,23 @@ msgid ""
"another step of the simplification that merges adjanced nodes that are "
"closer than <u>Threshold</u> meters."
msgstr ""
+"El nodo de la vía (área) es eliminado si todos los <u>Pesos de Ángulo</u>, "
+"<u>Pesos de Área</u> y <u>Peso de Distancia </u> son mayores que 1. El "
+"<u>Peso</u> se calcula comoun <u>Valor</u> / <u>Umbral</u>, donde el "
+"<u>Valor</u> es uno de <u>Ángulo</u>, <u>Área</u> y <u>Distancia</u> "
+"calculado de cada uno de los tres puntos adyancentes de la vía.<ul><li>El "
+"<u>Valor</u> de <u>Ángulo</u> es el ángulo en grados sobre el segundo "
+"nodo</li><li>El <u>Valor</u> de <u>Área</u> es formado por el "
+"triángulo</li><li>El <u>Valor</u> de la <u>Distancia</u> es la Distancia de "
+"Error de Pista Cruzada></li></ul>Los tres <u>Peso</u>s multiplicados por sus "
+"<u>Factor</u>es son sumados y el nodo mínimo de la suma es eliminado en "
+"primer lugar. La eliminacióncontinúa hasta que no hay nodos por eliminar. La "
+"combinación de Nodos Cercanos es otro paso de la simplificación que combina "
+"los nodos adyacentes que están a una distancia inferior al <u>Umbral</u> en "
+"metros."
msgid "Angle Threshold"
-msgstr ""
+msgstr "Umbral de Ángulo"
msgid "Angle Factor"
msgstr "Factor de Ángulo"
@@ -26282,22 +28558,22 @@ msgid "Distance Factor"
msgstr "Factor de Distancia"
msgid "Merge Nearby Nodes Threshold"
-msgstr ""
+msgstr "Umbral de Combinación de Nodos Cercanos"
-msgid "Online Help"
-msgstr "Ayuda en línea"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
-msgid "Load"
-msgstr "Carga"
+msgid "No object selected"
+msgstr "No hay un objeto seleccionado"
-msgid "invisible"
-msgstr "Invsible"
+msgid "Seamark Inspector"
+msgstr "Inspector Seamark"
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "Select only one object"
+msgstr "Seleccione únicamente un objeto"
-msgid "Export"
-msgstr ""
+msgid "Select a map object"
+msgstr "Seleccione un objeto mapa"
msgid "AutoSave LiveData"
msgstr "Autograbar LiveData"
@@ -26310,6 +28586,7 @@ msgstr "Error mientras se exportaba {0}: {1}"
msgid "Duplicate hotkey for button ''{0}'' - button will be ignored!"
msgstr ""
+"Tecla de atajo duplicada para el botón ''{0}'' - ¡se ignorará el botón!"
msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
msgstr ""
@@ -26344,27 +28621,29 @@ msgid "Waypoint Description"
msgstr "Descripción de punto de vía"
msgid "Surveyor Actions"
-msgstr ""
+msgstr "Acciones de Agrimensura"
msgid "Open surveyor2 button panel"
-msgstr ""
+msgstr "Abrir panel de botón surveyor2"
msgid "Surveyor Timeline"
-msgstr ""
+msgstr "Línea de Tiempo de Agrimensura"
msgid "Open surveyor2 time line panel"
-msgstr ""
+msgstr "Abrir el panel de línea de tiempo de surveyor2"
msgid "Tag2Link Preferences"
-msgstr ""
+msgstr "Preferencias de Tag2Link"
msgid "Launch browser with information about the selected object"
-msgstr ""
+msgstr "Lanzar navegador con información acerca del objeto seleccionado"
msgid ""
"Launch your default software for sending an email to the selected contact "
"address"
msgstr ""
+"Lanzar su programa por defecto para enviar un correo electrónico a las "
+"direcciones de contacto seleccionadas"
msgid "Edit tags"
msgstr "Editar etiquetas"
@@ -26440,6 +28719,9 @@ msgstr "Eliminar vía resaltada"
msgid "Street name: "
msgstr "Nombre de calle: "
+msgid "Building: "
+msgstr "Edificio: "
+
msgid "Even/Odd"
msgstr "Par/Impar"
@@ -26519,6 +28801,99 @@ msgstr "Trazador."
msgid "Tracer building"
msgstr "Trazador de construcción"
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2."
+
+msgid "Change tag {0} to {1}"
+msgstr "Cambiar etiqueta {0} a {1}"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"La versión de Tracer2Server no es compatible con este complemento. Por favor "
+"descargue la versión {0} desde {1}."
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+"Hay una nueva versión de Tracer2Server disponible. Para mejores resultados "
+"por favor actualice a la versión {0}."
+
+msgid "No set of parameter is active!"
+msgstr "¡No hay ningún conjunto de parámetros activo!"
+
+msgid "Select parameter"
+msgstr "Seleccione parámetro"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: añadir una vía con {0} puntos"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: modificar la vía a {0} puntos"
+
+msgid "Tracer2 error"
+msgstr "Error de Tracer2"
+
+msgid "Parameter for server request"
+msgstr "Parámetro para solicitud de servidor"
+
+msgid "Tile size:"
+msgstr "Tamaño de la tesela:"
+
+msgid "Resolution:"
+msgstr "Resolución:"
+
+msgid "Mode:"
+msgstr "Modo:"
+
+msgid "Threshold:"
+msgstr "Umbral:"
+
+msgid "Points per circle:"
+msgstr "Puntos por círculo:"
+
+msgid "Tag:"
+msgstr "Etiqueta:"
+
+msgid "Preferred values:"
+msgstr "Valores preferidos:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "¿Borrar el parámetro \"{0}\"?"
+
+msgid "Add new"
+msgstr "Añadir nuevo"
+
+msgid "Add predefined"
+msgstr "Añadir predefinido"
+
+msgid "Select predefined parameter"
+msgstr "Seleccionar parámetro predefinido"
+
+msgid "Modify list of parameter for server request."
+msgstr "Modificar lista de parámetros para solicitud de servidor."
+
+msgid "Parameter:"
+msgstr "Parámetro:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "Tracer2Server no ha encontrado nada."
+
+msgid "Tracer2Server has detected an error."
+msgstr "Tracer2Server ha detectado un error."
+
msgid "GPG"
msgstr "GPG"
@@ -26534,9 +28909,6 @@ msgstr "Exportar firmas a XML..."
msgid "Save Signatures file"
msgstr "Guardar firmas de ficheros"
-msgid "Download OSM"
-msgstr "Descargar OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -26563,6 +28935,11 @@ msgstr "Cargar objetos del servidor"
msgid "Download signed data"
msgstr "Descargar datos firmados"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Atención: se ingorará la excepción porque la tarea fue cancelada. Excepción: "
+"{0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -26608,6 +28985,7 @@ msgstr "Mostrar todas las firmas disponibles para el atributo seleccionado."
msgid "Show deleted tags and notes if they were signed before"
msgstr ""
+"Mostrar etiquetas eliminadas y notas si estuvieron firmadas con anterioridad"
msgid ""
"Use default (and maybe existing) GnuPG directory ({0}) to store new keys and "
@@ -26646,7 +29024,7 @@ msgid "Signature Info"
msgstr "Información de firma"
msgid "Sorry, there are no Signatures for the selected Node."
-msgstr ""
+msgstr "Disculpe, no hay Firmas para el Nodo seleccionado."
msgid "No Signature found"
msgstr "No se encontró firma"
@@ -26669,10 +29047,10 @@ msgstr ""
"{0}={1}"
msgid "Sorry, there are no Signatures for the selected Segment."
-msgstr ""
+msgstr "Disculpe, no hay Firmas para el Segmento seleccionado."
msgid "Selected WaySegment was:"
-msgstr ""
+msgstr "El SegmentoVía selecciado era:"
msgid "Signature Files"
msgstr "Ficheros de firmas"
@@ -26696,7 +29074,7 @@ msgid "The Signature is broken!"
msgstr "¡La Firma está rota!"
msgid "Manipulation Warning"
-msgstr ""
+msgstr "Advertencia de Manipulación"
msgid "Select a signing key from your keyring-file:"
msgstr "Seleccione una llave de firma para revisar esta traducción"
@@ -26726,22 +29104,19 @@ msgid "Signing canceled!"
msgstr "Firma cancelada!"
msgid "Please give a tolerance in meters"
-msgstr ""
-
-msgid "Accuracy"
-msgstr "Precisión"
+msgstr "Por favor ingrese una tolerancia en metros"
msgid "Select as much as you like:"
msgstr "Elija tanto como quiera:"
msgid "Survey"
-msgstr ""
+msgstr "Planificación"
msgid "Aerial Photography"
msgstr "Fotografía Aérea"
msgid "Web Recherche"
-msgstr ""
+msgstr "Web Recherche"
msgid "Trusted persons told me"
msgstr "Me lo dijeron personas de confianza"
@@ -26795,23 +29170,30 @@ msgid "Create a new signing key"
msgstr "Crear una nueva llave para firmar"
msgid "No such lane."
-msgstr ""
+msgstr "No hay tal carril."
msgid ""
"<html>The number of lanes is not specified for one or more roads; please add "
"missing lanes tags.</html>"
msgstr ""
+"<html>El número de carriles no está especificado para una o más rutas; por "
+"favor añada las etiquetas de carriles faltantes.</html>"
msgid ""
"<html>An error occurred while constructing the model. Please run the "
"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
msgstr ""
+"<html>Ocurrió un error mientras se construía el modelo. Por favor ejecute el "
+"validador para asegurarse que los datos son consistentes.<br><br>Error: "
+"{0}</html>"
msgid "Edit turn relations and lane lengths for selected node."
msgstr ""
+"Editar las relaciones de giro y longitud de los carriles para el nodo "
+"seleccionado"
msgid "Validate turn- and lane-length-relations for consistency."
-msgstr ""
+msgstr "Validar las relaciones giro- y longitud-carriles para consistencia."
msgid "Turn Lanes"
msgstr "Carriles de giro"
@@ -26820,16 +29202,16 @@ msgid "Edit turn lanes"
msgstr "Editar carriles de giro"
msgid "Quick-Fix"
-msgstr ""
+msgstr "Arreglo-Rápido"
msgid "Revalidate all turnlanes-relations."
-msgstr ""
+msgstr "Revalidar todas las relaciones de giro."
msgid "Automatically fixes the issue."
-msgstr ""
+msgstr "Corrige automáticamente los inconvenientes."
msgid "Selects the offending relation."
-msgstr ""
+msgstr "Selecciona la relación transfresora"
msgid "Add turn"
msgstr "Añadir giro"
@@ -26841,19 +29223,19 @@ msgid "Delete turn."
msgstr "Borrar giro."
msgid "{0} lanes are not referenced in any turn-relation."
-msgstr ""
+msgstr "{0} carriles no son referencias por ninguna relación de giro."
msgid "Put the ways in order."
msgstr "Coloca las vías en orden."
msgid "Relation references non-existent (regular) lane {0}"
-msgstr ""
+msgstr "La relación referencia a un carril inexistente (regular) {0}"
msgid "Relation references non-existent extra lane {0}"
-msgstr ""
+msgstr "La relación referencia un carril inexistente extra {0}"
msgid "Integer list \"{0}\" contains unexpected values."
-msgstr ""
+msgstr "La lista de enteros \"{0}\" contiene valores no esperados."
msgid "Create/Edit turn restriction..."
msgstr "Crear/Editar restricción de giro..."
@@ -26975,7 +29357,11 @@ msgid_plural ""
"This turn restriction refers to {0} objects which were deleted outside of "
"this turn restriction editor:"
msgstr[0] ""
+"Esta restricción de giro hace referenciaa un objeto que borrado por fuera de "
+"este editor de restricciones de giro:"
msgstr[1] ""
+"Esta restricción de giro hace referencia a {0} objetos que fueron borrados "
+"fuera de este editor de restricciones de giro:"
msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
@@ -27168,7 +29554,7 @@ msgstr ""
"Mostrar y gestionar las restricciones de giro en el actual conjunto de datos"
msgid "Open an editor for the selected turn restriction"
-msgstr ""
+msgstr "Abrir un editor para la restricción de giro seleccionada"
msgid "Delete the selected turn restriction"
msgstr "Borrar la restricción de giro seleccionada"
@@ -27442,19 +29828,21 @@ msgstr "Recuperar objeto..."
msgid "Undelete object by id"
msgstr "Recuperar objeto por id"
-msgid "Select if the data should be added into a new layer"
-msgstr "Seleccionar si los datos deberían adicionarse a una nueva capa"
+msgid "Undelete Object"
+msgstr "Recuperar objeto borrado"
+
+msgid "Undelete object"
+msgstr "Recuperar objeto borrado"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
+"Ingresar el tipo de ID de los objetos cuya eliminación debería ser deshecha, "
+"por ejemplo, ''n1 w2''"
-msgid "Undelete Object"
-msgstr "Recuperar objeto borrado"
-
-msgid "Undelete object"
-msgstr "Recuperar objeto borrado"
+msgid "Select if the data should be added into a new layer"
+msgstr "Seleccionar si los datos deberían adicionarse a una nueva capa"
msgid "Start undeleting"
msgstr "Iniciar recuperación"
@@ -27462,18 +29850,6 @@ msgstr "Iniciar recuperación"
msgid "Close dialog and cancel"
msgstr "Cerrar diálogo y cancelar"
-msgid "Will get {0}"
-msgstr "Se obtendrá {0}"
-
-msgid "Looking for {0}"
-msgstr "Buscando {0}"
-
-msgid "Found {0}"
-msgstr "Se encontró {0}"
-
-msgid "More tools"
-msgstr "Más herramientas"
-
msgid "Add nodes at intersections"
msgstr "Añadir nodos en las intersecciones"
@@ -27510,7 +29886,7 @@ msgstr ""
"único nodo."
msgid "Extract node from line"
-msgstr ""
+msgstr "Extraer el nodo de la línea"
msgid "Paste Relations"
msgstr "Pegar relaciones"
@@ -27518,15 +29894,8 @@ msgstr "Pegar relaciones"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
+"Pegar miembros de la relación de los objetos en la memoria sobre los objetos "
+"seleccionados"
msgid "Split Object"
msgstr "Dividir objeto"
@@ -27549,6 +29918,8 @@ msgid ""
"The selected way is not a split way, please select split points or split way "
"too."
msgstr ""
+"La vía seleccionada no es una vía divisoria, por favor seleccione puntos de "
+"división o una vía divisoria también."
msgid "The selected nodes can not be consecutive nodes in the object."
msgstr ""
@@ -27564,6 +29935,8 @@ msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
"participating in this operation."
msgstr ""
+"Hay varias vías que contienen uno de los nodos divisorios. Seleccione las "
+"vías que participan en esta operación."
msgid "Symmetry"
msgstr "Simetría"
@@ -27582,7 +29955,7 @@ msgid "Pastes tags of previously selected object(s)"
msgstr "Pega etiquetas de objeto(s) previamente seleccionados(s)"
msgid "Add Source Tag"
-msgstr "Añade etiqueta de fuente"
+msgstr "Añadir etiqueta de fuente"
msgid "Add remembered source tag"
msgstr "Añadir etiqueta de fuente recordada"
@@ -27603,7 +29976,7 @@ msgid "Unglued Relations"
msgstr "Relaciones despegadas"
msgid "Change relation member for {0} {1}"
-msgstr ""
+msgstr "Cambiar el miembro de relación para {0} {1}"
msgid "Circle arc"
msgstr "Arco de círculo"
@@ -27620,7 +29993,7 @@ msgstr ""
"Preferencias)"
msgid "Ask every time"
-msgstr ""
+msgstr "Consultar siempre"
msgid "Configure custom URL"
msgstr "Configurar URL personalizada"
@@ -27629,16 +30002,18 @@ msgid "Open custom URL"
msgstr "Abrir URL personalizada"
msgid "Opens specified URL browser"
-msgstr ""
+msgstr "Abre la URL especificada en el navegador"
msgid "Utilsplugin2 settings [TESTING]"
-msgstr ""
+msgstr "Preferencias de Utilsplugin2 [PRUEBA]"
msgid "Here you can change some preferences of Utilsplugin2 functions"
msgstr ""
+"Aquí puede cambiar algunas de las preferencias de las funciones de "
+"Utilsplugin2"
msgid "Save to file"
-msgstr ""
+msgstr "Guardar en archivo"
msgid "Load from file"
msgstr "Cargar desde archivo"
@@ -27658,29 +30033,17 @@ msgstr ""
"<br/> <b>{#type}</b> es reemplazado con el \"nodo\", \"vía\" o "
"\"relación\" <br/> <b>{#lat} , {#lon}</b> es reemplazado "
"con la latitud/longitud del centro del mapa <br/> Tú puedes cargar "
-"manualmente el archivo de configuración<b>customurl.txt</b> en la carpeta de "
-"JOSM."
+"manualmente el archivo de configuración <b>customurl.txt</b> en la carpeta "
+"de JOSM."
msgid "Custom URL configuration"
msgstr "Configuración de la URL personalizada"
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Herramienta Latitud Longitud"
msgid "Create geometry by entering lat lon coordinates for it."
-msgstr ""
+msgstr "Crear geometría ingresando coordenadas latitud longitud para ella."
msgid ""
"Enter the coordinates for the new nodes, one for each line.<br/>If you enter "
@@ -27705,31 +30068,58 @@ msgid ""
"24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg 42' 52.13\" N, 21 "
"deg 11' 47.60\" E</li></ul>"
msgstr ""
+"Ingrese las coordenadas para los nuevos nodos, uno por cada línea.<br/>Si "
+"ingresa dos líneas com las mismas coordenadas se generarán nodos "
+"duplicados.<br/>Puede separar la latitud y longitud con un espacio, coma o "
+"punto y coma.<br/>Utilice números positivos, o bien los caracteres N y E "
+"para indicar la dirección cardinal Norte o Este.<br/>Para las direcciones "
+"cardinales Sur y Oeste puede utilizar tanto números negativos como "
+"caracteres S y W.<br/>El valor de la coordenada puede estar en uno de los "
+"siguientes tres "
+"formatos:<ul><li><i>grado</i><tt>°</tt></li><li><i>grados</i><tt>°</t"
+"t> <i>minutos</i><tt>'</tt></li><li><i>grados</i><tt>°</tt> "
+"<i>minutos</i><tt>'</tt> <i>segundos</i><tt>"</tt></li>Los "
+"</ul>símbolos <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, "
+"<tt>"</tt>, <tt>″</tt> son opcionales.<br/><br/>Algunos "
+"ejemplos:<ul><li>49.29918° 19.24788°</li><li>N 49.29918 E "
+"19.24788</li><li>W 49°29.918' S 19°24.788'</li><li>N "
+"49°29'04" E 19°24'43"</li><li>49.29918 N, 19.24788 "
+"E</li><li>49°29'21" N 19°24'38" E</li><li>49 29 "
+"51, 19 24 18</li><li>49 29, 19 24</li><li>E 49 29, N 19 24</li><li>49° "
+"29; 19° 24</li><li>N 49° 29, W 19° 24</li><li>49° 29.5 S, "
+"19° 24.6 E</li><li>N 49 29.918 E 19 15.88</li><li>49 29.4 19 "
+"24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg 42' 52.13\" N, 21 "
+"deg 11' 47.60\" E</li></ul>"
msgid "Replace Geometry"
msgstr "Reemplazar geometría"
msgid "Replace geometry of selected object with a new one"
-msgstr ""
+msgstr "Reemplace la geometría del objeto seleccionado con una nueva"
msgid ""
"This tool replaces geometry of one object with another, and so requires "
"exactly two objects to be selected."
msgstr ""
+"Esta herramienta reemplaza la geometría de un objeto con otro, y requiere "
+"que 2 y solo 2 objetos sean seleccionados"
msgid ""
"This tool can only replace a node, upgrade a node to a way or a "
"multipolygon, or replace a way with a way."
msgstr ""
+"Esta herramiento puede reemplazar únicamente un nodo, convewrtir un nodo en "
+"una vía o multipolígono, o reemplazar una vía con una vía."
msgid "Node belongs to way(s), cannot replace."
-msgstr ""
+msgstr "Los nodos que pertenecen a vía(s) no pueden reemplazarse."
msgid "Replace geometry for node {0}"
-msgstr ""
+msgstr "Reemplazar geometría para nodo {0}"
msgid "Relation is not a multipolygon, cannot be used as a replacement."
msgstr ""
+"La relación no es un multipolígono, no puede ser usada como reemplazo."
msgid ""
"Please select one way that exists in the database and one new way with "
@@ -27739,15 +30129,19 @@ msgstr ""
"con geometría correcta."
msgid "The ways must be entirely within the downloaded area."
-msgstr ""
+msgstr "Las vías deben estar completamente dentro del área descargada."
msgid ""
"The way to be replaced cannot have any nodes with properties or relation "
"memberships unless they belong to both ways."
msgstr ""
+"La vía a ser reemplazada no puede tener nodos con propiedades o que sean "
+"miembros de relación excepto que pertenezcan a ambas vías."
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr ""
+"Se excedió el límite de iteraciones para el método robusto, se procederá con "
+"el método más simple."
msgid "Replace geometry for way {0}"
msgstr "Sustituir la geometría para la vía {0}"
@@ -27830,6 +30224,8 @@ msgid ""
"Nothing found. Please select way that is a part of some polygon formed by "
"connected ways"
msgstr ""
+"No se ha encontrado nada. Por favor seleccione una vía que sea parte de un "
+"polígono formado por vías conectadas."
msgid "Select Highway"
msgstr "Seleccionar vía"
@@ -27857,6 +30253,8 @@ msgstr "Deshacer selección"
msgid "Reselect last added object or selection form history"
msgstr ""
+"Vuelve a seleccionar los últimos objetos en ser añadidos o seleccionar desde "
+"el historial"
msgid "Unselect nodes"
msgstr "Deseleccionar nodos"
@@ -27864,29 +30262,26 @@ msgstr "Deseleccionar nodos"
msgid "Removes all nodes from selection"
msgstr "Elimina todos los nodos de la selección"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
-msgstr "Importar Video"
+msgstr "Importar vídeo"
msgid "Sync a video against this GPS track"
-msgstr "Sincronizar un video frente a esta traza GPS"
+msgstr "Sincronizar un vídeo con esta traza GPS"
msgid "Remove Video"
msgstr "Eliminar vídeo"
msgid "removes current video from layer"
-msgstr "Elimina el video actual de la capa"
+msgstr "Elimina el vídeo actual de la capa"
msgid "Play/Pause"
msgstr "Reproducción/Pausa"
msgid "starts/pauses video playback"
-msgstr "Inicia/pausa la reproducción del video"
+msgstr "Iniciar/pausar la reproducción del vídeo"
msgid "Video: {0}"
-msgstr "Video: {0}"
+msgstr "Vídeo: {0}"
msgid "Backward"
msgstr "Hacia atrás"
@@ -27919,22 +30314,22 @@ msgid "jumps to the entered gps time"
msgstr "salta al momento especificado por gps"
msgid "Loop"
-msgstr "Ciclo"
+msgstr "Bucle"
msgid "loops n sec around current position"
-msgstr "ciclo de n segundos alrededor de la posición actual"
+msgstr "bucle de n segundos alrededor de la posición actual"
msgid "Keep centered"
msgstr "Mantener centrado"
msgid "follows the video icon automaticly"
-msgstr "Seguir el ícono de video automáticamente"
+msgstr "Seguir el ícono de vídeo automáticamente"
msgid "Subtitles"
msgstr "Subtítulos"
msgid "Show subtitles in video"
-msgstr "Mostrar subtítulos en el video"
+msgstr "Mostrar subtítulos en el vídeo"
msgid "Jump length"
msgstr "Longitud del salto"
@@ -27943,7 +30338,7 @@ msgid "Set the length of a jump"
msgstr "Establecer la longitud del salto"
msgid "Jump in video for x ms"
-msgstr "Saltar el video por x milisegundos"
+msgstr "Avanzar el vídeo durante x milisegundos"
msgid "Loop length"
msgstr "Longitud del ciclo"
@@ -27965,15 +30360,18 @@ msgid ""
"correctly installed on your system. Its architecture (32/64 bits) must also "
"be the same as the JRE that runs JOSM."
msgstr ""
+"La biblioteca VLC no está iniciada correctamente. Por favor verifique el VLC "
+"{0} está correctamente instalado en su sistema. Su arquitectura (32/64 bits) "
+"debe ser la misma que la del JRE en el que ejecuta JOSM."
msgid "Jump to"
msgstr "Saltar a"
msgid "Jump to GPS time"
-msgstr ""
+msgstr "Saltar a la marca de tiempo GPS"
msgid "Shows current position in the video"
-msgstr "Muestra la posición actual en el video"
+msgstr "Muestra la posición actual en el vídeo"
msgid "Sync"
msgstr "Sincronizar"
@@ -27993,8 +30391,8 @@ msgstr "ciclo"
msgid "mute"
msgstr "silenciar"
-msgid "Scanned Map..."
-msgstr "Mapa escaneado..."
+msgid "Walking Papers Scanned Map"
+msgstr "Mapas Escaneados de Walking Papers"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28017,9 +30415,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Capa Walking Papers ({0}) en zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Descargar vía"
@@ -28086,13 +30481,13 @@ msgstr ""
"Buscar un punto de vía. Mueva la vista de mapa para ver el punto de vía."
msgid "Way Select"
-msgstr "Selección de Vía"
+msgstr "Seleccionar vía"
msgid "Select non-branching sequences of ways"
msgstr "Seleccionar secuencias de vías que no se bifurquen"
msgid "Add names from Wikipedia"
-msgstr ""
+msgstr "Añadir nombres desde Wikipedia"
msgid ""
"Fetches interwiki links from Wikipedia in order to add several name tags"
@@ -28104,84 +30499,88 @@ msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
+"Copia la plantilla {0} al portapapeles del sistema instanciada com las "
+"coordenadas del primer nodo seleccionado"
msgid "Copy {0} template"
-msgstr ""
+msgstr "Copiar plantilla {0}"
msgid "Fetch Wikipedia articles with coordinates"
-msgstr ""
+msgstr "Buscar artículos de Wikipedia con sus coordenadas"
msgid ""
"Double click on item to search for object with article name (and center "
"coordinate)"
msgstr ""
+"Doble clic en un ítem para buscar objetos con el mismo nombre de artículo (y "
+"centro de coordenadas)"
msgid "Available via WIWOSM server"
-msgstr ""
+msgstr "Disponibel vía servidor WIWOSM"
msgid "Available in local dataset"
-msgstr ""
+msgstr "Disponible en el conjunto de datos local"
msgid "Not linked yet"
-msgstr ""
+msgstr "no enlazado aún"
msgid "{0}.Wikipedia.org"
-msgstr ""
+msgstr "{0}.Wikipedia.org"
msgid "{0}.Wikipedia.org: {1}"
-msgstr ""
+msgstr "{0}.Wikipedia.org: {1}"
msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr "Obtiene todas las coordenadas de Wikipedia para la vista actual"
msgid "coordinates"
-msgstr ""
+msgstr "coordenadas"
msgid "Category"
-msgstr ""
+msgstr "Categoría"
msgid "Fetches a list of all Wikipedia articles of a category"
msgstr ""
"Obtiene una lista de todos los artículos de Wikipedia de una categoría"
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Introduzca la categoría de Wikipedia"
msgid "Clipboard"
-msgstr ""
+msgstr "Portapapeles"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Pegar artículos de la Wikipedia desde el portapapeles del sistema"
msgid "clipboard"
-msgstr ""
+msgstr "portapapeles"
msgid "Open Article"
msgstr "Abrir artículo"
msgid "Opens the Wikipedia article of the selected item in a browser"
msgstr ""
+"Abre el artículo de Wikipedia del elemento seleccionado en un navegador"
msgid "Sets the default language for the Wikipedia articles"
msgstr ""
"Establece el idioma predeterminado para los artículos de la Wikipedia"
msgid "Enter the Wikipedia language"
-msgstr ""
-
-msgid "Add Tag"
-msgstr "Añadir etiqueta"
+msgstr "Ingrese el lenguaje de Wikipedia"
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
+"Añade una etiqueta ''wikipedia'' correspondiente a este artículo para los "
+"objetos seleccionados"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr ""
+msgstr "El Ultimate WMS Super-Velocidad Turbo Desafío II"
msgid "Go driving"
-msgstr ""
+msgstr "Ir a manejar"
msgid "Drive a race car on this layer"
msgstr "Conduce un coche de carreras en esta capa"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 37d3495..449c8f7 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-04-01 20:31+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-19 18:04+0000\n"
"Last-Translator: AivoK <aivo.kuhlberg at hot.ee>\n"
"Language-Team: Estonian <et 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: 2013-04-05 04:39+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-20 04:32+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Tausta kasutustingimused"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Linkide avamine ei ole praegusel platvormil toetatud (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "VIGA: {0}"
+
+msgid "WARNING: {0}"
+msgstr "HOIATUS:{0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Käivitan platvormi käivitamise haagi"
@@ -155,23 +170,21 @@ msgid "About JOSM..."
msgstr "JOSMi kohta"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"HOIATUS: API alus-URLi ootamatu vorming. Ümbersuunamine OSM objekti infole "
-"või ajaloole tõenäoliselt ebaõnnestub. API alus-URL on: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"HOIATUS: API alus-URLi ootamatu vorming. Ümbersuunamine OSM kasutaja lehele "
-"tõenäoliselt ebaõnnestub. API alus-URL on: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
msgstr ""
+"Olete käivitamas {0} veebilehitseja akent.<br>See võib ekraanipilti "
+"veebiakendega koormata<br>ning võtta pisut aega."
msgid "Continue"
msgstr "Jätka"
@@ -210,6 +223,9 @@ msgstr "Sihtkihte ei ole"
msgid "Add imagery layer {0}"
msgstr "Lisa aluskaart {0}"
+msgid "Select image format for WMS layer"
+msgstr "Vali WMS kihi pildivorming"
+
msgid "Select WMS layers"
msgstr "Vali WMS-kihid"
@@ -249,9 +265,6 @@ msgstr "Tööriist {0}"
msgid "Please select at least four nodes."
msgstr "Palun vali vähemalt neli sõlme."
-msgid "Information"
-msgstr "Info"
-
msgid "Align Nodes in Line"
msgstr "Paiguta sõlmed ühele joonele"
@@ -276,6 +289,9 @@ msgstr "vastuolu"
msgid "download"
msgstr "allalaetule"
+msgid "problem"
+msgstr "probleem"
+
msgid "previous"
msgstr "eelmine"
@@ -283,7 +299,10 @@ msgid "next"
msgstr "järgmine"
msgid "Nothing selected to zoom to."
-msgstr ""
+msgstr "Ei ole valitud miskit, millele suumida."
+
+msgid "Information"
+msgstr "Info"
msgid "Zoom to {0}"
msgstr "Suumi {0}"
@@ -341,9 +360,9 @@ msgstr ""
"pöörata?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Ei saa jooni ühendada. Ei saa liita üheks sõlmejadaks."
+msgstr ""
msgid "Combine {0} ways"
msgstr "Ühenda {0} teed."
@@ -400,18 +419,35 @@ msgstr "Kustuta"
msgid "Delete selected objects."
msgstr "Kustuta valitud objektid."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Jaga sõlmed."
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Aseta valitud sõlmed võrdsete vahemaade tagant mööda joont."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Laadi andmed OSMist alla"
msgid "Download map data from the OSM server."
msgstr "Laadi kaardi andmed OSMi serverist"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Andmete allalaadimine"
+
msgid "Download object..."
msgstr "Laadi objekt alla..."
@@ -510,6 +546,9 @@ msgstr "Ajalugu"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide ajaloo kohta."
+msgid "Show history"
+msgstr "Näita ajalugu"
+
msgid "History (web)"
msgstr "Ajalugu (veeb)"
@@ -626,11 +665,9 @@ msgid "Joined overlapping areas"
msgstr "Kattuvate alade ühendamine"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Mõned jooned olid muudetud relatsiooni osad. Palun kontrolli, et pole "
-"tekkinud vigu."
msgid "Fix tag conflicts"
msgstr "Paranda sildivastuolud"
@@ -790,11 +827,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Liida sõlmed vanimaks."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Palun vali liitmiseks vähemalt kaks sõlme või sõlm, mis on teise sõlme "
-"lähedal."
msgid "Abort Merging"
msgstr "Katkesta liitmine"
@@ -954,8 +989,8 @@ msgid "Download Data"
msgstr "Andmete allalaadimine"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -982,15 +1017,9 @@ msgid "Orthogonalize / Undo"
msgstr "Muuda täisnurkseks/tühista"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Muuda kujund täisnurkseks/tühista\n"
-"Vali sõlmed, mis olid valitud eelmise täisnurkseks muutmise ajal!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Tühista täisnurkseks muutmise"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1007,9 +1036,6 @@ msgstr "Muuda täisnurkseks"
msgid "Usage"
msgstr "Kasutus"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Valitud elemente ei saa muuta täisnurkseks."
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1124,6 +1150,15 @@ msgstr "Nimeta fail ka ümber."
msgid "Could not rename file ''{0}''"
msgstr "Faili ''{0}'' ei ole võimalik ümber nimetada."
+msgid "Restart"
+msgstr "Taaskäivita"
+
+msgid "Restart the application."
+msgstr "Taaskäivita rakendus"
+
+msgid "Click to restart later."
+msgstr "Kliki, et taaskäivitada hiljem"
+
msgid "Reverse way"
msgstr "Pööra joone suund"
@@ -1175,9 +1210,6 @@ msgstr "Lae seanss"
msgid "Load a session from file."
msgstr "Seansi laadimine failist"
-msgid "Session file (*.jos, *.joz)"
-msgstr "Seansifail (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Ava seanss"
@@ -1200,10 +1232,10 @@ msgid "Save the current session to a new file."
msgstr "Jooksva seansi salvestamine uude faili."
msgid "Session file (archive) (*.joz)"
-msgstr ""
+msgstr "Sessiooni fail (arhiiv) (*.joz)"
msgid "Session file (*.jos)"
-msgstr ""
+msgstr "Sessiooni fail (*.jos)"
msgid "Save session"
msgstr "Salvesta seanss"
@@ -1212,7 +1244,7 @@ msgid "<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
msgid "Save Session"
-msgstr "Salvesta seanss"
+msgstr "Seansi salvestamine"
msgid "Save As"
msgstr "Salvesta nimega"
@@ -1241,6 +1273,9 @@ msgstr "Staatus"
msgid "Copy to clipboard and close"
msgstr "Kopeeri puhvrisse ja sulge."
+msgid "Report bug"
+msgstr "Teata veast"
+
msgid "Close"
msgstr "Sulge"
@@ -1322,13 +1357,13 @@ msgstr ""
"keskel)."
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1424,6 +1459,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Võta tagasi"
@@ -1448,9 +1504,6 @@ msgstr "Uuenda andmed"
msgid "Updates the objects in the active data layer from the server."
msgstr "Uuendab aktiivses andmekihis olevad objektid serverist."
-msgid "Download data"
-msgstr "Andmete allalaadimine"
-
msgid "Update modified"
msgstr "Uuenda muudetud"
@@ -1648,6 +1701,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Aeglasemalt edasi"
+msgid "Download GPS"
+msgstr "GPS allalaadimine"
+
msgid "Downloading GPS data"
msgstr "GPS andmete allalaadimine"
@@ -1657,6 +1713,18 @@ msgstr "Alla laetud GPX andmed"
msgid "Markers from {0}"
msgstr "Markerid {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "OSM allalaadimine"
+
msgid "Downloading data"
msgstr "Laadin andmeid alla"
@@ -1668,14 +1736,39 @@ msgid "No data found in this area."
msgstr "Selles alas ei leitud andmeid."
msgid "OSM Server URL:"
-msgstr ""
+msgstr "OSM serveri URL:"
msgid "Command"
-msgstr ""
+msgstr "Käsk"
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Impordi käigus tekkis {0} vastuolu."
+msgstr[1] "Impordi käigus tekkis {0} vastuolu."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Vastuolu allalaadimisel"
+msgstr[1] "Vastuolu allalaadimisel"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Sõlme {2} vanemate laadimine"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Tee {2} vanemate laadimine"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Relatsiooni {2} vanemate laadimine"
+
+msgid "Download session"
+msgstr "Seansi allalaadimine"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Laadin alla {0} {1}st ( {2} veel)"
@@ -1730,25 +1823,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Viga allalaadimisel"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Impordi käigus tekkis {0} vastuolu."
-msgstr[1] "Impordi käigus tekkis {0} vastuolu."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Vastuolu allalaadimisel"
-msgstr[1] "Vastuolu allalaadimisel"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Sõlme {2} vanemate laadimine"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Tee {2} vanemate laadimine"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Relatsiooni {2} vanemate laadimine"
-
msgid "Error during download"
msgstr "Viga allalaadimisel"
@@ -1841,7 +1915,7 @@ msgid "Snap to node projections"
msgstr ""
msgid "Disable"
-msgstr ""
+msgstr "Välja lülitamine"
msgid "0,90,..."
msgstr ""
@@ -1892,6 +1966,9 @@ msgstr "Täpsusta jooni"
msgid "Improve Way Accuracy mode"
msgstr "Joonte täpsustamise režiim"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1916,8 +1993,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1933,6 +2010,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -1988,7 +2068,7 @@ msgid "Ctrl to merge with nearest node."
msgstr ""
msgid "Release the mouse button to stop moving."
-msgstr ""
+msgstr "Liigutamise lõpetamiseks vabasta hiire nupp."
msgid "Release the mouse button to stop rotating."
msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
@@ -2000,7 +2080,7 @@ msgid ""
"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
"Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection"
msgstr ""
-"Liiguta objekte hiirega lohistades; Shift klahv lisab valikusse (Ctrl "
+"Liiguta hiirega lohistades; Shift klahv lisab valikusse (Ctrl "
"lisab/eemaldab); Shift-Ctrl valiku pööramine; Alt-Ctrl valiku skaleerimine; "
"või valiku muutmine"
@@ -2345,6 +2425,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2505,13 +2588,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2520,6 +2603,9 @@ msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus"
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2538,8 +2624,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2629,6 +2714,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2665,10 +2753,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2691,8 +2779,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2807,6 +2895,9 @@ msgstr[1] "Eemaldatud {0} objekti"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Lahenda vastuolud relatsiooni {0} liikmete nimistus"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2867,11 +2958,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Selle tee pööramisel on andmete kooskõla säilitamiseks soovitav teha tee ja "
-"selle sõlmede atribuutidele järgmised muutused."
msgid "Relation"
msgstr ""
@@ -2900,11 +2989,11 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
-msgstr "Mille atribuudid: "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr ""
@@ -2924,6 +3013,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2940,7 +3032,7 @@ msgid "Question"
msgstr ""
msgid "Message"
-msgstr ""
+msgstr "Teade"
msgid "Enter text"
msgstr ""
@@ -2954,18 +3046,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2974,8 +3066,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2983,13 +3075,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -3003,8 +3093,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3034,11 +3124,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "TUNDMATU"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3191,8 +3280,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3267,7 +3355,7 @@ msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
msgstr ""
msgid "Unkown parameter: ''{0}''."
-msgstr ""
+msgstr "Tundmatu parameeter: ''{0}''."
msgid "Value expected for parameter ''{0}''."
msgstr ""
@@ -3299,7 +3387,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3318,6 +3406,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr "Tundmatu parameeter ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3334,9 +3425,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3375,6 +3463,9 @@ msgstr ""
msgid "Running test {0}"
msgstr "Jooksev test: {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Aadressid"
@@ -3385,18 +3476,27 @@ msgid "Multiple associatedStreet relations"
msgstr ""
msgid "House number without street"
-msgstr ""
+msgstr "Maja number ilma tänavata"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Maja number ''{0}'' duplikaat"
msgid "Duplicate house numbers"
-msgstr ""
+msgstr "Maja numbrid korduvad"
msgid "Multiple street names in relation"
msgstr ""
msgid "House number too far from street"
+msgstr "Maja number tänavast liiga kaugel"
+
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
msgstr ""
msgid "Building inside building"
@@ -3458,13 +3558,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3534,6 +3634,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr "Maanteed"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Liitala"
@@ -3603,6 +3721,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3660,13 +3784,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3698,11 +3822,11 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
-msgstr "Atribuutide kontrollija:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "See plugin kontrollib vigasid väljanimetustes ja nende väärtustes."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr ""
@@ -3835,14 +3959,14 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
-msgstr "Paranda atribuudid"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr ""
msgid "Incorrect number of parameters"
-msgstr ""
+msgstr "Vale arv parameetreid"
msgid "Could not find warning level"
msgstr ""
@@ -3910,6 +4034,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3940,9 +4067,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3967,12 +4091,12 @@ msgstr "Sildistamata ja ühendamata sõlmed"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
-msgstr "Sildid puuduvad"
-
msgid "Unconnected nodes without physical tags"
msgstr "Ühendamata sõlmed ilma füüsiliste siltideta"
+msgid "No tags"
+msgstr "Sildid puuduvad"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr ""
@@ -4033,23 +4157,6 @@ msgstr "Rannik vastupidises suunas: maa ei asu vasakul"
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr "Ära seda teadet rohkem näita (valik jäetakse meelde)"
@@ -4063,10 +4170,10 @@ msgid "House {0}"
msgstr ""
msgid "House number {0} at {1}"
-msgstr ""
+msgstr "Maja number {0} {1} tänaval"
msgid "House number {0}"
-msgstr ""
+msgstr "Maja number {0}"
msgid "highway"
msgstr ""
@@ -4153,14 +4260,14 @@ msgstr "Avab abiinfo lehitseja"
msgid "Downloading \"Message of the day\""
msgstr "Laadin alla \"päeva sõnumit\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
msgstr "Päeva sõnum pole saadaval"
msgid "Click to close the dialog"
-msgstr ""
+msgstr "Sulgeb dialoogiakna"
msgid "Imagery offset"
msgstr "Aluskaardi nihe"
@@ -4347,7 +4454,7 @@ msgid "File"
msgstr "Fail"
msgid "Session"
-msgstr ""
+msgstr "Seanss"
msgid "View"
msgstr "Vaade"
@@ -4355,17 +4462,32 @@ msgstr "Vaade"
msgid "Tools"
msgstr "Tööriistad"
+msgid "More tools"
+msgstr "Lisatööriistad"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Valik"
+
msgid "Presets"
msgstr "Eelseaded"
-msgid "Windows"
+msgid "More..."
msgstr ""
+msgid "GPS"
+msgstr ""
+
+msgid "Windows"
+msgstr "Aknad"
+
msgid "Menu: {0}"
msgstr "Menüü: {0}"
msgid "Save and load the current session (list of layers, etc.)"
-msgstr ""
+msgstr "Salvesta ja laadi praegune seanss (kihtide loend, jne)"
msgid "Edit toolbar"
msgstr "Redigeerimisriba"
@@ -4373,11 +4495,23 @@ msgstr "Redigeerimisriba"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "Näita või peida redigeerimisriba (vasakul servas)"
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Heli"
-msgid "Hide edit toolbar"
-msgstr "Peida redigeerimisriba"
+msgid "Do not hide toolbar"
+msgstr ""
msgid "Hide this button"
msgstr "Peida see nupp"
@@ -4385,6 +4519,9 @@ msgstr "Peida see nupp"
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr "Peida redigeerimisriba"
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4444,6 +4581,9 @@ msgstr "(objekti ei ole)"
msgid "User:"
msgstr "Kasutaja:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "Kiht ei ole nimistus."
@@ -4451,16 +4591,16 @@ msgid "Layer ''{0}'' must be in list of layers"
msgstr "Kiht ''{0}'' peab olema kihtide nimistus"
msgid "Metric"
-msgstr ""
+msgstr "Meetermõõdustik"
msgid "Chinese"
-msgstr ""
+msgstr "Hiina mõõdustik"
msgid "Imperial"
-msgstr ""
+msgstr "Briti mõõdustik"
msgid "Nautical Mile"
-msgstr ""
+msgstr "Meremiilid"
msgid "Click to cancel the current operation"
msgstr ""
@@ -4471,19 +4611,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "väär: omadus on selgesõnaliselt välja lülitatud"
-
-msgid "true: the property is explicitly switched on"
-msgstr "tõene: omadus on selgesõnaliselt sisse lülitatud"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "osaline: erinevad valitud objektid on erineva väärtusega, ei muuda"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "määramata: ei sea seda valikut valitud objektidele"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4773,29 +4900,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4810,7 +4955,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4862,14 +5007,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5105,7 +5242,7 @@ msgid "Role:"
msgstr ""
msgid "Enter a role for all relation memberships"
-msgstr ""
+msgstr "Sisesta roll kõigi relatsiooni liikmete jaoks"
msgid "Tag modified relations with "
msgstr ""
@@ -5119,14 +5256,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5446,22 +5583,22 @@ msgid "State: "
msgstr ""
msgid "Data Set: "
-msgstr ""
+msgstr "Andmekogum: "
msgid "Edited at: "
-msgstr ""
+msgstr "Viimati muudetud: "
msgid "<new object>"
msgstr ""
msgid "Edited by: "
-msgstr ""
+msgstr "Viimane muutja: "
msgid "Version: "
msgstr "Versioon: "
msgid "In changeset: "
-msgstr ""
+msgstr "Muutuskogumis: "
msgid "Tags: "
msgstr "Sildid: "
@@ -5475,7 +5612,7 @@ msgid " as \"{0}\""
msgstr ""
msgid "{0} Nodes: "
-msgstr ""
+msgstr "{0} sõlme: "
msgid "Bounding box: "
msgstr ""
@@ -5650,6 +5787,9 @@ msgstr "Näita/Peida"
msgid "Information about layer"
msgstr "Teave kihi kohta"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Kaardi kujundus"
@@ -5733,6 +5873,36 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Objekti tüüp:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "erinevad"
+
+msgid "Choose the OSM object type"
+msgstr "Vali OSMi objekti tüüp"
+
+msgid "Object ID:"
+msgstr "Objekti ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Sisesta allalaaditava objekti ID"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Objekti ID-d saab eraldada koma või tühikuga.<br/> Näited: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> Eri tüüpe objekte saab kirja panna nii: "
+"<b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relatsioonid"
@@ -5754,9 +5924,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relatsioone: {0}"
-msgid "Selection"
-msgstr "Valik"
-
msgid "Open a selection list window."
msgstr "Ava valitud objektide nimekirja aken"
@@ -5781,18 +5948,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Valik: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5810,6 +5965,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Autorid"
@@ -5827,8 +5994,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr "Näitab brauseris infot kasutaja kohta"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5854,9 +6020,6 @@ msgstr "Ava järelkontrolli aken."
msgid "Validation results"
msgstr "Järelkontrolli tulemused"
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5891,16 +6054,16 @@ msgid "Updating map ..."
msgstr ""
msgid "Display the basic properties of the changeset"
-msgstr "Kuva muutustekogumi põhiatribuudid"
+msgstr "Kuva muutuskogumi põhiatribuudid"
msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Kuva muutuskogumi sildid"
msgid "Content"
msgstr "Sisu"
msgid "Display the objects created, updated, and deleted by the changeset"
-msgstr ""
+msgstr "Kuva objektid, mida muutuskogumiga loodi, uuendati või kustutati"
msgid "Changeset Management Dialog"
msgstr ""
@@ -5912,34 +6075,34 @@ msgid "Query"
msgstr "Päring"
msgid "Launch the dialog for querying changesets"
-msgstr ""
+msgstr "Ava dialoog muutuskogumite päringute tegemiseks"
msgid "Remove from cache"
msgstr ""
msgid "Remove the selected changesets from the local cache"
-msgstr ""
+msgstr "Eemalda valitud muutuskogumid lokaalsest vahemälust"
msgid "Close the selected changesets"
-msgstr ""
+msgstr "Sulge valitud muutuskogumid"
msgid "Update changeset"
-msgstr "Uuenda muutustekogum"
+msgstr "Uuenda muutuskogum"
msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
+msgstr "Värskendab valitud muutuskogumid andmetega OSM serverist"
msgid "Download changeset content"
msgstr ""
msgid "Download the content of the selected changesets from the server"
-msgstr ""
+msgstr "Laadi alla serverist valitud muutuskogumite sisu"
msgid "My changesets"
-msgstr ""
+msgstr "Minu muutuskogumid"
msgid "Download my changesets from the OSM server (max. 100 changesets)"
-msgstr ""
+msgstr "Laadi alla minu muutuskogumid OSM serverist (max 100 muutuskogumit)"
msgid ""
"<html>JOSM is currently running with an anonymous user. It cannot "
@@ -5975,10 +6138,10 @@ msgid "User"
msgstr "Kasutaja"
msgid "Created at"
-msgstr ""
+msgstr "Loodud"
msgid "Closed at"
-msgstr ""
+msgstr "Suletud"
msgid "Downloading changeset content"
msgstr "Laadin alla muutustekogumi sisu"
@@ -5993,25 +6156,22 @@ msgid "Download content"
msgstr ""
msgid "Download the changeset content from the OSM server"
-msgstr ""
+msgstr "Laadi alla muutuskogum OSM serverist"
msgid "Update content"
msgstr "Uuenda sisu"
msgid "Update the changeset content from the OSM server"
-msgstr ""
-
-msgid "Show history"
-msgstr "Näita ajalugu"
+msgstr "Värskenda muutuskogumit OSM serverist"
msgid "Download and show the history of the selected objects"
-msgstr ""
+msgstr "Laadi alla valitud objektid ja näita nende ajalugu"
msgid "Select in layer"
msgstr ""
msgid "Select the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Vali aktiivses andmekihis vastavad objektid"
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
@@ -6020,25 +6180,29 @@ msgid_plural ""
"<html>None of the selected objects is available in the current<br>edit layer "
"''{0}''.</html>"
msgstr[0] ""
+"<html>Valitud objekt ei ole kättesaadav antud<br>redigeerimiskihis "
+"''{0}''.</html>"
msgstr[1] ""
+"<html>Ükski valitud objekt ei ole kättesaadav antud<br>redigeerimiskihis "
+"''{0}''.</html>"
msgid "Nothing to select"
-msgstr ""
+msgstr "Valida pole võimalik"
msgid "Zoom to in layer"
msgstr ""
msgid "Zoom to the corresponding objects in the current data layer"
-msgstr ""
+msgstr "Suumi aktiivses andmekihis vastavate objektideni"
msgid "Nothing to zoom to"
msgstr ""
msgid "The content of this changeset is not downloaded yet."
-msgstr ""
+msgstr "Antud muutuskogumi sisu ei ole veel alla laaditud."
msgid "Download now"
-msgstr ""
+msgstr "Laadi alla"
msgid "Download the changeset content"
msgstr ""
@@ -6074,10 +6238,10 @@ msgid "Closed on:"
msgstr "Sulgemise aeg"
msgid "Remove the changeset in the detail view panel from the local cache"
-msgstr ""
+msgstr "Eemalda muutuskogum lokaalsest vahemälust üksikasjade vaate paneelis"
msgid "Update the changeset from the OSM server"
-msgstr "Uuenda muutustekogum OSM serverist"
+msgstr "Uuenda muutuskogum OSM serverist"
msgid ""
"Select the primitives in the content of this changeset in the current data "
@@ -6107,10 +6271,10 @@ msgid "closed"
msgstr "suletud"
msgid "Changeset ID: "
-msgstr ""
+msgstr "Muutuskogumi ID: "
msgid "Enter a changeset id"
-msgstr ""
+msgstr "Sisesta muutuskogumi id"
msgid ""
"Download the changeset with the specified id, including the changeset content"
@@ -6231,6 +6395,8 @@ msgstr ""
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
+"Praegune väärtus ei ole õige kasutaja ID. Palun sisesta nullist suurem "
+"täisarvuline väärtus."
msgid "Please enter an integer value > 0"
msgstr ""
@@ -6254,7 +6420,7 @@ msgid ""
msgstr ""
msgid "Download my changesets only"
-msgstr ""
+msgstr "Laadi alla ainult minu muutuskogumid"
msgid ""
"<html>Select to restrict the query to your changesets only.<br>Unselect to "
@@ -6267,29 +6433,37 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
+"<html>Palun vali üks järgnevatest <strong>tavapäringutest</strong>.Vali "
+"<strong>Laadi alla ainult minu muutuskogumid</strong> kui sa soovid laadida "
+"alla ainult muutuskogumid, mis on loodud sinul poolt.<br>Pane tähele, et "
+"JOSM laadib alla maksimaalselt 100 muutuskogumit.</html>"
msgid "<html>Download the latest changesets</html>"
-msgstr ""
+msgstr "<html>Laadi alla viimased muutuskogumid</html>"
msgid ""
"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
"user name in the preferences first.</em></html>"
msgstr ""
+"<html>Laadi alla minu avatud muutuskogumid<br><em>Keelatud. Palun sisesta "
+"eelistuste all kõigepealt oma OSM kasutajanimi.</em></html>"
msgid "<html>Download my open changesets</html>"
-msgstr ""
+msgstr "<html>Laadi alla minu avatud muutuskogumid</html>"
msgid ""
"<html>Download changesets in the current map view.<br><em>Disabled. There is "
"currently no map view active.</em></html>"
msgstr ""
+"<html>Laadi alla muutuskogumid praeguses kaardivaates.<br><em>Keelatud. "
+"Hetkel ei ole ühtegi aktiivset kaardivaadet.</em></html>"
msgid "<html>Download changesets in the current map view</html>"
-msgstr ""
+msgstr "<html>Laadi alla muutuskogumid praeguses kaardivaates</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6299,7 +6473,7 @@ msgid "Basic"
msgstr "Lihtne"
msgid "Download changesets using predefined queries"
-msgstr ""
+msgstr "Laadi alla muutuskogumid, kasutades eeldefineeritud päringuid"
msgid "From URL"
msgstr ""
@@ -6354,35 +6528,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
-msgstr "Vali objekt, mille atribuute soovid muuta."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Atribuudid/Liikmelisus"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Valitud objektide atribuudid"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<erinev>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr "Silte/Liikmeid"
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "On liikmeks järgnevas"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Atribuute: {0} / Liikmesusi: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Silte: {0} / Liikmeid: {1}"
-msgid "Properties / Memberships"
-msgstr "Atribuudid / Liikmelisus"
+msgid "Tags / Memberships"
+msgstr "Silte / Liikmeid"
msgid "Delete the selected key in all objects"
msgstr "Kustuta valitud võti kõkides objektides"
-msgid "Delete Properties"
-msgstr "Kustuda atribuudid"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Muuda relatsiooni"
@@ -6396,14 +6582,14 @@ msgstr "Tõesti soovid kustutada valikut seosest {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "Lisa silt"
msgid "Edit the value of the selected key for all objects"
msgstr "Muuda kõikide valitud objektide võtme väärtust"
-msgid "Edit Properties"
-msgstr "Muuda atribuute"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Abi siltide kasutamise kohta saab OSMi vikist (F1)"
@@ -6481,12 +6667,6 @@ msgstr[1] "Muuda kuni {0} objekti seadeid"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr "Lisa väärtuse"
@@ -6516,9 +6696,15 @@ msgstr ""
msgid "Recently added tags"
msgstr "Viimati lisatud sildid"
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6556,7 +6742,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr "Relatsiooni {0} allalaadimine"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6616,6 +6802,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6873,6 +7062,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Järjehoidjad"
@@ -6941,9 +7149,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr "Andmeallikad ja -tüübid:"
@@ -6954,7 +7159,7 @@ msgid "Select to download OSM data in the selected download area."
msgstr "Laadib alla OSM andmed valitud allalaadimisalal"
msgid "Raw GPS data"
-msgstr "Toored GPS andmed"
+msgstr "GPS toorandmed"
msgid "Select to download GPS traces in the selected download area."
msgstr "Laadib alla GPS rajad valitud allalaadimisalal"
@@ -7018,21 +7223,8 @@ msgstr "Laadi alla viitajad (vanemrelatsioonid)"
msgid "Download object"
msgstr "Laadi objekt alla"
-msgid "Object type:"
-msgstr "Objekti tüüp:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "erinevad"
-
-msgid "Choose the OSM object type"
-msgstr "Vali OSMi objekti tüüp"
-
-msgid "Object ID:"
-msgstr "Objekti ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Sisesta allalaaditava objekti ID"
+msgid "Start downloading"
+msgstr "Alusta allalaadimist"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7044,26 +7236,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Vali, kui ka relatsiooni liikmed tuleb alla laadida"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Objekti ID-d saab eraldada koma või tühikuga.<br/> Näited: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> Eri tüüpe objekte saab kirja panna nii: "
-"<b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Laadi alla viitajad (vanemrelatsioonid ja teed)"
-msgid "Start downloading"
-msgstr "Alusta allalaadimist"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7160,7 +7335,7 @@ msgstr "Mine järgmisele lehele"
msgid "Go to the JOSM help home page"
msgstr "Mine JOSM abiinfo kodulehele"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7262,6 +7437,9 @@ msgid ""
msgstr ""
"<html>Versioon <strong>{0}</strong> loodud <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7349,7 +7527,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7372,12 +7550,18 @@ msgstr "Kommenteeri lühidalt üleslaaditavaid muudatusi."
msgid "Enter an upload comment"
msgstr "Sisesta kommentaar"
-msgid "Changeset id:"
+msgid "Specify the data source for the changes:"
msgstr ""
-msgid "Created at:"
+msgid "Enter a source"
msgstr ""
+msgid "Changeset id:"
+msgstr "Muutuskogumi id:"
+
+msgid "Created at:"
+msgstr "Loodud:"
+
msgid "Changeset comment:"
msgstr ""
@@ -7426,7 +7610,7 @@ msgid "Close changesets"
msgstr ""
msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Sulge valitud avatud muutuskogumid"
msgid "Cancel closing of changesets"
msgstr ""
@@ -7438,8 +7622,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7520,8 +7703,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7535,18 +7718,17 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
-msgstr ""
+msgstr "Laadi alla objektid"
msgid "Initializing nodes to download ..."
msgstr "Lähtestan allalaetavad sõlmed..."
msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Ava failide sirvija, et valida fail"
msgid "Select filename"
msgstr ""
@@ -7752,17 +7934,11 @@ msgid "Upload Changes"
msgstr "Laadi muudatused üles"
msgid "Upload the changed primitives"
-msgstr "Laadib üles muudetud primitiivid"
+msgstr "Laadib üles muudetud objektid"
msgid "Please revise upload comment"
msgstr "Palun vaata üleslaadimise kommentaar üle"
-msgid "Revise"
-msgstr "Vaata üle"
-
-msgid "Continue as is"
-msgstr "Jätka nagu on"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7771,6 +7947,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Vaata üle"
+
+msgid "Continue as is"
+msgstr "Jätka nagu on"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7786,6 +7978,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Loobub üleslaadimisest ja jätkab redigeerimist"
@@ -7793,8 +8000,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7908,9 +8115,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "{0} objekti üleslaadimine..."
@@ -7920,6 +8124,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7936,7 +8143,7 @@ msgstr "Vali üleslaetavad objektid"
msgid "Cancel uploading"
msgstr "Katkesta üleslaadimine"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7971,15 +8178,15 @@ msgid ""
msgstr ""
msgid "(1 request)"
-msgstr ""
+msgstr "(1 pöördumine)"
msgid "(# requests unknown)"
msgstr ""
msgid "({0} request)"
msgid_plural "({0} requests)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0} pöördumine)"
+msgstr[1] "({0} pöördumist)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
msgstr ""
@@ -8041,13 +8248,13 @@ msgid "Description"
msgstr ""
msgid "Timespan"
-msgstr ""
+msgstr "Ajavahemik"
msgid "Length"
-msgstr ""
+msgstr "Pikkus"
msgid "Length: {0}"
-msgstr ""
+msgstr "Pikkus: {0}"
msgid "{0} route, "
msgid_plural "{0} routes, "
@@ -8082,7 +8289,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8112,7 +8319,7 @@ msgstr "versioon {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8142,7 +8349,7 @@ msgid "Dataset consistency test"
msgstr ""
msgid "No problems found"
-msgstr ""
+msgstr "Probleeme ei leitud"
msgid "Following problems found:"
msgstr ""
@@ -8228,6 +8435,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8255,6 +8465,7 @@ msgstr ""
msgid ""
"The requested area is too big. Please zoom in a little, or change resolution"
msgstr ""
+"Nõutav ala on liiga suur. Palun suumi natuke sisse või muuda resolutsiooni"
msgid "Change resolution"
msgstr "Muuda resolutsiooni"
@@ -8265,6 +8476,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8303,18 +8517,21 @@ msgid ""
"time.<br>Display that photo here.<br>And then, simply capture the time you "
"read on the photo and select a timezone<hr></html>"
msgstr ""
+"<html>Tee foto oma GPS-vastuvõtjast kui see kuvab aega.<br>Näita siin seda "
+"fotot.<br>Seejärel pane lihtsalt kirja see aeg, mis fotol näha on ja vali "
+"ajavöönd<hr></html>"
msgid "Photo time (from exif):"
-msgstr ""
+msgstr "Foto aeg (exif info põhjal):"
msgid "Gps time (read from the above photo): "
-msgstr ""
+msgstr "GPS aeg (valitud fotol nähtav): "
msgid " [dd/mm/yyyy hh:mm:ss]"
msgstr ""
msgid "I am in the timezone of: "
-msgstr ""
+msgstr "Asun ajavööndis: "
msgid "No date"
msgstr ""
@@ -8323,7 +8540,7 @@ msgid "Open another photo"
msgstr "Ava veel üks foto"
msgid "Synchronize time from a photo of the GPS receiver"
-msgstr ""
+msgstr "Aja sünkroniseerimine GPS-vastuvõtjast tehtud fotolt"
msgid ""
"Error while parsing the date.\n"
@@ -8345,6 +8562,7 @@ msgstr "Ava veel üks GPX-rada"
msgid ""
"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
msgstr ""
+"<html>Kasuta fotot täpsest kellast,<br>nt GPS-vastuvõtja ekraanist</html>"
msgid "Auto-Guess"
msgstr ""
@@ -8368,10 +8586,10 @@ msgid "Show Thumbnail images on the map"
msgstr ""
msgid "Timezone: "
-msgstr ""
+msgstr "Ajavöönd: "
msgid "Offset:"
-msgstr ""
+msgstr "Nihe:"
msgid "Correlate images with GPX track"
msgstr ""
@@ -8380,10 +8598,10 @@ msgid "Correlate"
msgstr ""
msgid "Invalid timezone"
-msgstr ""
+msgstr "Vale ajavöönd"
msgid "Invalid offset"
-msgstr ""
+msgstr "Vigane nihe"
msgid "Try Again"
msgstr ""
@@ -8401,7 +8619,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "Timezone: {0}"
-msgstr ""
+msgstr "Ajavöönd: {0}"
msgid "Minutes: {0}"
msgstr ""
@@ -8423,7 +8641,7 @@ msgid "Matching photos to track failed"
msgstr ""
msgid "Adjust timezone and offset"
-msgstr ""
+msgstr "Ajavööndi ja nihke kohandamine"
msgid "The selected photos do not contain time information."
msgstr ""
@@ -8449,11 +8667,15 @@ msgid ""
"Error while parsing timezone.\n"
"Expected format: {0}"
msgstr ""
+"Viga ajavööndi parsimisel.\n"
+"Oodatud vorming: {0}"
msgid ""
"Error while parsing offset.\n"
"Expected format: {0}"
msgstr ""
+"Viga nihke parsimisel.\n"
+"Oodatud vorming: {0}"
msgid "Extracting GPS locations from EXIF"
msgstr ""
@@ -8461,9 +8683,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr "Käivitan kataloogi skaneerimise"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8482,9 +8701,12 @@ msgstr "Kataloogis {0} faile ei leitud\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Viga failide laadimisel kataloogist {0}\n"
-msgid "Geotagged Images"
+msgid "One of the selected files was null"
msgstr ""
+msgid "Geotagged Images"
+msgstr "Geosildistatud fotod"
+
msgid "{0} image loaded."
msgid_plural "{0} images loaded."
msgstr[0] ""
@@ -8516,7 +8738,7 @@ msgid "Error on file {0}"
msgstr ""
msgid "Display geotagged images"
-msgstr ""
+msgstr "Kuva geosildistatud fotosid"
msgid "Previous"
msgstr ""
@@ -8539,6 +8761,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8572,6 +8800,8 @@ msgid ""
"\n"
"GPS time: {0}"
msgstr ""
+"\n"
+"GPS aeg: {0}"
msgid "JPEG images (*.jpg)"
msgstr ""
@@ -8605,9 +8835,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8620,14 +8847,17 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
msgstr ""
msgid "{0} meters"
-msgstr ""
+msgstr "{0} meetrit"
msgid "Maximum area per request:"
msgstr ""
@@ -8647,12 +8877,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8783,14 +9017,10 @@ msgstr "Tekkis viga kui prooviti kuvada selle markeri URL"
msgid "(URL was: "
msgstr "(URL oli: "
-msgid "Error displaying URL"
-msgstr "Viga URL kuvamisel"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8805,7 +9035,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8815,8 +9045,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9041,7 +9270,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9073,7 +9302,7 @@ msgid "Authorizing request token ''{0}''..."
msgstr ""
msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Seansist väljalogimine ''{0}''..."
msgid "Allow to upload map data"
msgstr ""
@@ -9107,6 +9336,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9164,9 +9399,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9415,6 +9647,9 @@ msgstr "Pluginate allalaadimine"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama."
+msgid "Would you like to restart now?"
+msgstr "Kas soovid kohe taaskäivitada?"
+
msgid "Remote Control"
msgstr "Kaugjuhtimine"
@@ -9422,7 +9657,7 @@ msgid "Settings for the remote control feature."
msgstr "Kaugjuhtimise funktsiooni seaded."
msgid "Download objects to new layer"
-msgstr ""
+msgstr "Objektid laaditakse alla uude andmekihti"
msgid "Confirm all Remote Control actions manually"
msgstr "Kinnita kõik Kaugjuhtimise toimingud käsitsi"
@@ -9442,7 +9677,7 @@ msgstr ""
"muuta, sest seda kasutavad välised rakendused JOSMiga kommunikeerumisel."
msgid "Enable remote control"
-msgstr "Lubatakse kaugjuhtimine"
+msgstr "Kaugjuhtimine lubatakse"
msgid "Permitted actions:"
msgstr "Lubatud toimingud:"
@@ -9451,7 +9686,7 @@ msgid "Connection Settings"
msgstr "Ühenduse sätted"
msgid "Connection Settings for the OSM server."
-msgstr ""
+msgstr "Ühenduse sätted OSM serveri jaoks."
msgid "Authentication"
msgstr "Autentimine"
@@ -9546,6 +9781,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "Toimingud"
@@ -9568,10 +9809,10 @@ msgid "Action parameters"
msgstr ""
msgid "Parameter name"
-msgstr ""
+msgstr "Parameetri nimi"
msgid "Parameter value"
-msgstr ""
+msgstr "Parameetri väärtus"
msgid "Toolbar action without name: {0}"
msgstr ""
@@ -9588,6 +9829,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Andmete validaator"
@@ -9636,6 +9880,27 @@ msgid "Search: "
msgstr ""
msgid "Read from file"
+msgstr "Loe failist"
+
+msgid "Export selected items"
+msgstr "Ekspordi valitud elemendid"
+
+msgid "JOSM custom settings files (*.xml)"
+msgstr ""
+
+msgid "Please select some preference keys not marked as default"
+msgstr ""
+
+msgid "Export preferences keys to JOSM customization file"
+msgstr ""
+
+msgid "What to do with preference lists when this file is to be imported?"
+msgstr ""
+
+msgid "Append preferences from file to existing values"
+msgstr ""
+
+msgid "Replace existing values"
msgstr ""
msgid "Open JOSM customization file"
@@ -9650,40 +9915,58 @@ msgid ""
"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Export selected items"
+msgid "shortcut"
msgstr ""
-msgid "Please select some preference keys not marked as default"
+msgid "color"
msgstr ""
-msgid "Export preferences keys to JOSM customization file"
+msgid "toolbar"
msgstr ""
-msgid "What to do with preference lists when this file is to be imported?"
+msgid "imagery"
msgstr ""
-msgid "Append preferences from file to existing values"
+msgid "Reset preferences"
msgstr ""
-msgid "Replace existing values"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Load profile"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Save {0} profile"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Current value is default."
+msgid "Choose profile file"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "Change list setting"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "Key: {0}"
+msgstr ""
+
+msgid "Change list of lists setting"
+msgstr ""
+
+msgid "add entry"
+msgstr ""
+
+msgid "Remove the selected entry"
+msgstr ""
+
+msgid "Change list of maps setting"
+msgstr ""
+
+msgid "Entry {0}"
msgstr ""
msgid "Select Setting Type:"
@@ -9704,25 +9987,19 @@ msgstr ""
msgid "Add setting"
msgstr ""
-msgid "Change list setting"
-msgstr ""
-
-msgid "Key: {0}"
-msgstr ""
-
-msgid "Change list of lists setting"
+msgid "Advanced Background: Changed"
msgstr ""
-msgid "add entry"
+msgid "Advanced Background: NonDefault"
msgstr ""
-msgid "Remove the selected entry"
+msgid "Current value is default."
msgstr ""
-msgid "Change list of maps setting"
+msgid "Default value is ''{0}''."
msgstr ""
-msgid "Entry {0}"
+msgid "Default value currently unknown (setting has not been used yet)."
msgstr ""
msgid "Change string setting"
@@ -9781,6 +10058,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr "Joonista mitteaktiivsed kihid teist värvi"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9834,6 +10114,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10115,7 +10400,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10284,6 +10575,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10339,16 +10636,16 @@ msgid "Potlatch 2"
msgstr ""
msgid "the main Potlatch 2 style"
-msgstr ""
+msgstr "Peamine Potlatch 2 stiil"
msgid "Map Settings"
msgstr "Kaardi seaded"
msgid "Settings for the map projection and data interpretation."
-msgstr ""
+msgstr "Kaardi projektsiooni ja andmete tõlgendamise sätted."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10481,7 +10778,7 @@ msgid "Projection configuration is valid."
msgstr ""
msgid "Validate"
-msgstr ""
+msgstr "Kontrolli"
msgid "Parameter information..."
msgstr ""
@@ -10496,7 +10793,7 @@ msgid "Supported values:"
msgstr ""
msgid "Projection parameters"
-msgstr ""
+msgstr "Projektsiooni parameetrid"
msgid "False easting and false northing"
msgstr ""
@@ -10511,7 +10808,7 @@ msgid "Ellipsoid name"
msgstr ""
msgid "Ellipsoid parameters"
-msgstr ""
+msgstr "Ellipsoidi parameetrid"
msgid "Datum name"
msgstr ""
@@ -10583,10 +10880,10 @@ msgid "Display coordinates as"
msgstr ""
msgid "System of measurement"
-msgstr ""
+msgstr "Mõõtesüsteem"
msgid "Map Projection"
-msgstr ""
+msgstr "Kaardi projektsioon"
msgid "The projection {0} could not be activated. Using Mercator"
msgstr "Projektsiooni {0} ei saa aktiveerida. Kasutan Mercatori"
@@ -10609,49 +10906,51 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
-msgstr ""
+msgstr "OSM API URL ''{0}'' testimine"
msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
+"<html>''{0}'' ei ole õige OSM API URL.<br>Palun vaata üle kirjapandu ja "
+"kontrolli uuesti.</html>"
msgid "Invalid API URL"
msgstr ""
@@ -10660,11 +10959,15 @@ msgid ""
"<html>Failed to build URL ''{0}'' for validating the OSM API "
"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
+"<html>Ei õnnestunud luua URL-i ''{0}'' et kontrollida OSM API serveri "
+"kehtivust.<br>Palun vaata üle kirjapandu ''{1}'' ja kontrolli uuesti.</html>"
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
"''{1}'' and your Internet connection and validate again.</html>"
msgstr ""
+"<html>Ei õnnestunud luua ühendust URL-ga ''{0}''.<br>Palun vaata üle ''{1}'' "
+"ja kontrolli oma Interneti ühendust ning kontrolli uuesti.</html>"
msgid "Connection to API failed"
msgstr ""
@@ -10674,12 +10977,18 @@ msgid ""
"at<br>''{1}''. The server responded with the return code {0} instead of "
"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
+"<html>Ei õnnestunud alla laadida muutuskogumite loetelu OSM API serverist "
+"kohas<br>''{1}''. Server vastas koodiga {0} selle asemel, et anda kood "
+"200.<br>Palun vaata üle ''{1}'' ja kontrolli uuesti.</html>"
msgid ""
"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
"spelling of ''{0}'' and validate again.</html>"
msgstr ""
+"<html>OSM API server kohas ''{0}'' ei andnud vastuseks õiget "
+"tagasisidet.<br>On tõenäoline, et ''{0}'' ei ole OSM API server.<br>Palun "
+"vaata üle ''{0}'' ja kontrolli uuesti.</html>"
msgid "Use Basic Authentication"
msgstr ""
@@ -10696,8 +11005,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10706,20 +11015,25 @@ msgstr "OSM kasutajanimi:"
msgid "OSM password:"
msgstr "OSMi salasõna:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10750,6 +11064,7 @@ msgstr ""
msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
msgstr ""
+"<html>Kasuta vaikimisi OSM serveri URL-i (<strong>{0}</strong>)</html>"
msgid "Test the API URL"
msgstr ""
@@ -10761,13 +11076,13 @@ msgid "Validation failed. The API URL seems to be invalid."
msgstr "Järelkontroll ebaõnnestus. API URL näib olevat vigane"
msgid "OSM API URL must not be empty. Please enter the OSM API URL."
-msgstr ""
+msgstr "OSM API URL ei tohi olla tühi. Palun sisesta OSM API URL."
msgid "The current value is not a valid URL"
-msgstr ""
+msgstr "Praegune väärtus ei ole õige URL"
msgid "Please enter the OSM API URL."
-msgstr ""
+msgstr "Palun sisesta OSM API URL."
msgid "Host:"
msgstr ""
@@ -10801,14 +11116,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10852,32 +11161,37 @@ msgstr "Kustuta valik siltide tabelist"
msgid "Add a new tag"
msgstr "Lisa uus silt"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Kasuta eelseadet \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Elemente tüübist {0} toetatakse."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Muuda {0} objekt"
+msgstr[1] "Muuda {0} objekti"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
+msgid "Nothing selected!"
+msgstr "Midagi pole valitud!"
-msgid "More information about this feature"
-msgstr "Rohkem teavet sellest funktsioonist"
+msgid "Selection unsuitable!"
+msgstr "Valik ei sobi!"
+
+msgid "Apply Preset"
+msgstr "Rakenda"
+
+msgid "New relation"
+msgstr "Uus relatsioon"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -10885,6 +11199,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Rohkem teavet sellest funktsioonist"
+
msgid "Available roles"
msgstr ""
@@ -10900,52 +11217,42 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Valikulised tunnused:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
-
-msgid "Use preset ''{0}''"
-msgstr "Kasuta eelseadet \"{0}\""
-
-msgid "Unknown type: {0}"
-msgstr "Tundmatu tüüp: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Viga sõelumisel {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Elemente tüübist {0} toetatakse."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Muuda {0} objekt"
-msgstr[1] "Muuda {0} objekti"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Midagi pole valitud!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Valik ei sobi!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Apply Preset"
-msgstr "Rakenda"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "New relation"
-msgstr "Uus relatsioon"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Change Properties"
-msgstr "Muuda atribuute"
+msgid "Unknown type: {0}"
+msgstr "Tundmatu tüüp: {0}"
msgid "Preset group {1} / {0}"
msgstr "Eelseadete grupp {1} / {0}"
@@ -10953,6 +11260,18 @@ msgstr "Eelseadete grupp {1} / {0}"
msgid "Preset group {0}"
msgstr "Eelseadete grupp {0}"
+msgid "Roles cannot appear more than once"
+msgstr ""
+
+msgid "Preset role element without parent"
+msgstr ""
+
+msgid "Preset sub element without parent"
+msgstr ""
+
+msgid "Error parsing {0}: "
+msgstr "Viga sõelumisel {0}: "
+
msgid "Search preset"
msgstr "Otsi eelseadetest"
@@ -10968,6 +11287,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10992,10 +11319,57 @@ msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
"> 0"
msgstr ""
+"Praegune väärtus ei ole õige muutuskogumi ID. Palun sisesta nullist suurem "
+"täisarvuline väärtus."
msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+"Praegune väärtus ei ole õige OSM ID. Palun sisesta nullist suurem "
+"täisarvuline väärtus."
+
+msgid "false: the property is explicitly switched off"
+msgstr "väär: omadus on selgesõnaliselt välja lülitatud"
+
+msgid "true: the property is explicitly switched on"
+msgstr "tõene: omadus on selgesõnaliselt sisse lülitatud"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "osaline: erinevad valitud objektid on erineva väärtusega, ei muuda"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "määramata: ei sea seda valikut valitud objektidele"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr "Paremklõps = kopeerimine lõikepuhvrisse"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
@@ -11027,7 +11401,7 @@ msgid "Contacting OSM Server..."
msgstr "Ühendun OSM serveriga..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11067,28 +11441,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11187,6 +11559,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Parse error: vigane gpx dokumendi struktuur"
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11202,12 +11577,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11286,8 +11669,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "NMEA import oli edukas."
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA impordi viga!"
@@ -11385,35 +11768,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr "Toetuseta versioon: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11423,8 +11782,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11451,10 +11810,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11465,9 +11821,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11489,6 +11842,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11538,8 +11894,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11688,6 +12044,9 @@ msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11706,40 +12065,52 @@ msgstr ""
msgid "Assume"
msgstr ""
-msgid "Load data from API"
+msgid "Existing values"
msgstr ""
-msgid "Import data from URL"
+msgid "Enable the checkbox to accept the value"
msgstr ""
-msgid "Open local files"
+msgid "Accept all tags from {0} for this session"
msgstr ""
+msgid "Load data from API"
+msgstr "Andmete laadimine API-st"
+
+msgid "Import data from URL"
+msgstr "Andmete importimine URL-st"
+
+msgid "Open local files"
+msgstr "Lokaalsete failide avamine"
+
msgid "Load imagery layers"
-msgstr "Lae aluskaardid"
+msgstr "Aluskaardikihtide laadimine"
msgid "Change the selection"
-msgstr "Muuda valikut"
+msgstr "Valiku muutmine"
msgid "Change the viewport"
-msgstr "Muuda vaateava"
+msgstr "Vaateava muutmine"
msgid "Create new objects"
-msgstr ""
+msgstr "Uute objektide loomine"
msgid "Read protocol version"
+msgstr "Protokolli versiooni lugemine"
+
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "Remote Control has been asked to create a new node."
msgstr ""
-msgid "Add way"
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11751,6 +12122,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11765,6 +12144,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11795,19 +12183,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11829,11 +12217,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Seansifail (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11903,13 +12303,13 @@ msgid "Download skipped"
msgstr "Allalaadimine vahele jäetud"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12056,10 +12456,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12074,22 +12474,21 @@ msgstr "Säilita plugin"
msgid "Click to keep the plugin ''{0}''"
msgstr "Klõpsa, et säilitada plugin ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12119,7 +12518,7 @@ msgstr ""
"eemaldada plugin."
msgid "Plugin information"
-msgstr ""
+msgstr "Plugina info"
msgid "no description available"
msgstr "kirjeldust pole saadaval"
@@ -12164,8 +12563,7 @@ msgstr "Pluginate saidi vahemälu failide töötlemine..."
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12180,12 +12578,25 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr "Pluginate nimekirja allalaadimine aadressilt ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Hoiatus: pluginate kataloogi ''{0}'' loomine ebaõnnestus. Ei õnnestu panna "
-"vahemälusse pluginate nimekirja pluginate saidilt ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr ""
@@ -12514,17 +12925,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12535,9 +12940,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr "reserveeritud"
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12569,8 +13017,22 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
-msgstr "Paremklõps = kopeerimine lõikepuhvrisse"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -12797,10 +13259,10 @@ msgid "Error renaming file \"{0}\" to \"{1}\""
msgstr ""
msgid "File name:"
-msgstr ""
+msgstr "Failinimi:"
msgid "File Name:"
-msgstr ""
+msgstr "Failinimi:"
msgid "FileChooser help."
msgstr ""
@@ -12824,10 +13286,10 @@ msgid "Home"
msgstr ""
msgid "Look in:"
-msgstr ""
+msgstr "Vaata:"
msgid "Look In:"
-msgstr ""
+msgstr "Vaata:"
msgid "Modified"
msgstr ""
@@ -12842,7 +13304,7 @@ msgid "Open selected file."
msgstr ""
msgid "Refresh"
-msgstr ""
+msgstr "Värskenda"
msgid "Rename File"
msgstr ""
@@ -12866,7 +13328,7 @@ msgid "Size"
msgstr ""
msgid "Up One Level"
-msgstr ""
+msgstr "Üks tase üles"
msgid "Update"
msgstr "Uuenda"
@@ -12896,6 +13358,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12972,6 +13439,10 @@ msgid "Fast drawing ways by mouse"
msgstr ""
msgid "Finds and fixes invalid street addresses in a comfortable way."
+msgstr "Otsib ja parandab mugavalt vigased tänava aadressid."
+
+msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
msgstr ""
msgid ""
@@ -12994,7 +13465,7 @@ msgid "Visualizes routing information as a routing graph."
msgstr ""
msgid "Simple tool to tag house numbers."
-msgstr ""
+msgstr "Lihtne töövahend majanumbrite märkimiseks"
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
@@ -13076,9 +13547,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr "Muuda ala lihtsal viisil liitalaks."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13105,7 +13573,7 @@ msgid "Convert data from Open Data portals to OSM layer"
msgstr ""
msgid "extended options for editing opening_hours"
-msgstr ""
+msgstr "Vahendid sildi opening_hours redigeerimiseks"
msgid "Imports issues from OpenStreetBugs"
msgstr ""
@@ -13134,6 +13602,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13158,9 +13629,6 @@ msgstr "See plugin lihtsustab ühistranspordiliinide kaardistamist."
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13186,9 +13654,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13225,6 +13690,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13273,9 +13743,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Maanteed"
-
msgid "Streets"
msgstr "Tänavad"
@@ -13360,6 +13827,9 @@ msgstr "Teetamm"
msgid "Lit"
msgstr "Valgustatud"
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13450,6 +13920,50 @@ msgstr "Tänav"
msgid "Edit Residential Street"
msgstr "Lisa andmeid"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "jah"
+
+msgid "no"
+msgstr "ei"
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Õueala"
@@ -13468,10 +13982,10 @@ msgstr ""
msgid "Service"
msgstr "Teenindus"
-msgid "Edit Serviceway"
-msgstr "Lisa andmeid"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13483,6 +13997,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13510,18 +14027,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "jah"
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr "Lisa andmeid"
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13531,9 +14042,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13543,15 +14051,15 @@ msgstr ""
msgid "private"
msgstr ""
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ei"
-
msgid "official"
msgstr ""
@@ -13597,6 +14105,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Ühistranspordi sõidukid"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Vähim kiirus (km/h)"
@@ -13681,6 +14192,9 @@ msgstr "Lisa andmeid"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13785,20 +14299,29 @@ msgstr ""
msgid "Visibility"
msgstr "Nähtavus"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "suurepärane"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "hea"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "keskmine"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "halb"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "kohutav"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Ratastoolid"
@@ -13815,10 +14338,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr "Lisa andmeid"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13854,7 +14377,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13891,7 +14414,7 @@ msgid "Amount of Steps"
msgstr ""
msgid "Waypoints"
-msgstr ""
+msgstr "Teekonnapunktid"
msgid "Motorway Junction"
msgstr ""
@@ -13923,12 +14446,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr "Lisa andmeid"
-msgid "Emergency Phone"
-msgstr ""
+msgid "Drinking Water"
+msgstr "Joogivesi"
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Ülekäiguraja tüüp"
@@ -13944,15 +14473,6 @@ msgstr ""
msgid "unmarked"
msgstr "tähistamata"
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13974,6 +14494,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13983,6 +14512,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Miniring"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13992,10 +14524,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr "Ülekäigurada"
-msgid "Edit Crossing"
-msgstr "Lisa andmeid"
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14028,9 +14557,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Möödasõidukoht"
-msgid "Edit Passing Place"
-msgstr "Lisa andmeid"
-
msgid "Turning Circle"
msgstr ""
@@ -14064,19 +14590,43 @@ msgstr "Vikipeedia"
msgid "Barriers"
msgstr "Tõkked"
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr "Materjal"
+
+msgid "stone"
+msgstr "kivi"
+
msgid "Bollard"
msgstr "Pollar"
msgid "Edit Bollard"
msgstr "Lisa andmeid"
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
msgstr ""
+msgid "plastic"
+msgstr "plastikust"
+
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -14088,6 +14638,9 @@ msgstr "Lisa andmeid"
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -14109,44 +14662,88 @@ msgstr "Lisa andmeid"
msgid "Hedge"
msgstr "Hekk"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Kõrgus (meetrites)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Tara"
+msgid "Edit Fence"
+msgstr ""
+
msgid "barbed_wire"
msgstr ""
-msgid "chain"
+msgid "chain_link"
msgstr ""
msgid "electric"
msgstr "elekter"
-msgid "hedge"
-msgstr "hekk"
-
msgid "pole"
msgstr "post"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Kraav"
+msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
-msgstr "Lisa andmeid"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Värav"
@@ -14178,12 +14775,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr "Lisa andmeid"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr "Lisa andmeid"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14241,6 +14853,9 @@ msgstr "Äravoolutoru"
msgid "Edit Drain"
msgstr "Lisa andmeid"
+msgid "Ditch"
+msgstr "Kraav"
+
msgid "Edit Ditch"
msgstr "Lisa andmeid"
@@ -14250,6 +14865,12 @@ msgstr "Oja"
msgid "Edit Stream"
msgstr "Lisa andmeid"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14289,9 +14910,6 @@ msgstr "Lisa andmeid"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr "Lisa andmeid"
-
msgid "Breakwater"
msgstr ""
@@ -14325,6 +14943,21 @@ msgstr "Lisa andmeid"
msgid "Edit Water"
msgstr "Lisa andmeid"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14406,18 +15039,23 @@ msgstr "Lisa andmeid"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "jalgrattaga"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14490,7 +15128,10 @@ msgstr "militaarala"
msgid "tourism"
msgstr "turism"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14514,10 +15155,13 @@ msgstr ""
msgid "rail"
msgstr "raudtee"
-msgid "Voltage"
-msgstr "Pinge"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14529,9 +15173,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr "Lisa andmeid"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14574,55 +15215,93 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr "Lisa andmeid"
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
-msgid "Crossing"
+msgid "Edit Level Crossing"
msgstr ""
-msgid "Crossing type"
+msgid "Supervised"
msgstr ""
-msgid "Turntable"
+msgid "Traffic lights"
msgstr ""
-msgid "Buffer Stop"
+msgid "Sound signals"
msgstr ""
-msgid "Aerialway"
-msgstr "Köisraudteed"
-
-msgid "Chair Lift"
+msgid "Barrier"
msgstr ""
-msgid "Edit Chair Lift"
-msgstr "Lisa andmeid"
-
-msgid "Reference number"
-msgstr "Viitenumber"
-
-msgid "Number of people per hour"
+msgctxt "crossing:barrier"
+msgid "yes"
msgstr ""
-msgid "Number of people per chair"
+msgctxt "crossing:barrier"
+msgid "no"
msgstr ""
-msgid "Typical journey time in minutes"
+msgctxt "crossing:barrier"
+msgid "half"
msgstr ""
-msgid "Has bubble?"
+msgctxt "crossing:barrier"
+msgid "full"
msgstr ""
-msgid "Has heating?"
+msgctxt "crossing:barrier"
+msgid "double_half"
msgstr ""
-msgid "Drag Lift"
+msgid "Crossing"
+msgstr ""
+
+msgid "Edit Crossing"
+msgstr ""
+
+msgid "Crossing type"
+msgstr ""
+
+msgid "Turntable"
+msgstr ""
+
+msgid "Buffer Stop"
+msgstr ""
+
+msgid "Aerialway"
+msgstr "Köisraudteed"
+
+msgid "Chair Lift"
+msgstr ""
+
+msgid "Edit Chair Lift"
+msgstr "Lisa andmeid"
+
+msgid "Reference number"
+msgstr "Viitenumber"
+
+msgid "Number of people per hour"
+msgstr ""
+
+msgid "Number of people per chair"
+msgstr ""
+
+msgid "Typical journey time in minutes"
+msgstr ""
+
+msgid "Has bubble?"
+msgstr ""
+
+msgid "Has heating?"
+msgstr ""
+
+msgid "Drag Lift"
msgstr ""
msgid "Edit Drag Lift"
@@ -14685,13 +15364,11 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Lisa andmeid"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -14701,13 +15378,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Lisa andmeid"
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Lisa andmeid"
+msgstr ""
msgid "Parking"
msgstr ""
@@ -14724,10 +15399,10 @@ msgstr ""
msgid "underground"
msgstr "maa-alune"
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14757,11 +15432,8 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
-msgstr ""
+msgstr "Mahutavus"
msgid "interval"
msgstr ""
@@ -14775,19 +15447,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Avatud"
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14937,6 +15625,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr "Lisa andmeid"
+msgid "Voltage"
+msgstr "Pinge"
+
msgid "Amperage"
msgstr ""
@@ -14958,6 +15649,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr "Lisa andmeid"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14965,7 +15662,7 @@ msgid "Edit Tyres"
msgstr "Lisa andmeid"
msgid "Contact:"
-msgstr ""
+msgstr "Kontakt:"
msgid "Phone Number"
msgstr "Telefoninumber"
@@ -14985,6 +15682,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr "Lisa andmeid"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15009,22 +15712,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "jah"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "ei"
-
msgid "brand"
msgstr ""
@@ -15046,9 +15733,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Riided"
@@ -15112,8 +15796,8 @@ msgstr "Lisa andmeid"
msgid "Public Transport"
msgstr "Ühistransport"
-msgid "Route"
-msgstr "Marsruut"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Lisa andmeid"
@@ -15146,13 +15830,13 @@ msgid "ferry"
msgstr "praam"
msgid "From (initial stop)"
-msgstr ""
+msgstr "Alates (algpeatus)"
msgid "To (terminal stop)"
-msgstr ""
+msgstr "Lõpetades (lõpp-peatus)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Läbi (vahepeatused)"
msgid "Network"
msgstr "Võrk"
@@ -15223,10 +15907,10 @@ msgid "route variant/direction (at least 2)"
msgstr ""
msgid "Stop Area"
-msgstr ""
+msgstr "Peatuse ala"
msgid "Edit Stop Area"
-msgstr ""
+msgstr "Lisa andmeid"
msgid "UIC reference"
msgstr ""
@@ -15243,23 +15927,26 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
msgid "Bus stop (legacy)"
-msgstr ""
+msgstr "Bussipeatus (pärand)"
msgid "Tram stop (legacy)"
-msgstr ""
+msgstr "Trammipeatus (pärand)"
msgid "Train"
msgstr ""
msgid "Railway station (legacy)"
-msgstr ""
+msgstr "Raudteejaam (pärand)"
msgid "Railway halt (legacy)"
-msgstr ""
+msgstr "Raudteepeatus (pärand)"
msgid "Trolleybus"
msgstr ""
@@ -15273,6 +15960,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Pink"
@@ -15285,21 +15975,23 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
msgid "Railway platform (legacy)"
-msgstr ""
+msgstr "Raudteeperroon (pärand)"
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Lisa andmeid"
+
msgid "Building"
msgstr "Hoone"
@@ -15310,7 +16002,10 @@ msgid "Edit Subway Entrance"
msgstr "Lisa andmeid"
msgid "Ticket Machine"
-msgstr ""
+msgstr "Piletiautomaat"
+
+msgid "Edit Ticket Machine"
+msgstr "Lisa andmeid"
msgid "Reference Number"
msgstr "Viitenumber"
@@ -15334,21 +16029,13 @@ msgid "Account or loyalty cards"
msgstr ""
msgid "Public Transport (legacy)"
-msgstr ""
-
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Lisa andmeid"
+msgstr "Ühistransport (pärand)"
msgid "UIC-Reference"
msgstr ""
msgid "Railway Halt"
-msgstr ""
+msgstr "Raudteepeatus"
msgid "Edit Halt"
msgstr "Lisa andmeid"
@@ -15392,11 +16079,11 @@ msgstr "Lisa andmeid"
msgid "Taxi"
msgstr "Takso"
-msgid "Edit Taxi station"
-msgstr "Lisa andmeid"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
-msgstr ""
+msgstr "Lennujaam"
msgid "Airport Ground"
msgstr "Lennujaam"
@@ -15446,6 +16133,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Lisa andmeid"
+msgid "Internet access"
+msgstr "Internetiühendus"
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Tasuline internetiühendus"
+
msgctxt "airport"
msgid "Gate"
msgstr "Värav"
@@ -15468,21 +16170,6 @@ msgstr "Lisa andmeid"
msgid "Stars"
msgstr "Tähti"
-msgid "Internet access"
-msgstr "Internetiühendus"
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Tasuline internetiühendus"
-
msgid "Smoking"
msgstr "Suitsetamine"
@@ -15666,6 +16353,12 @@ msgstr "Ööklubi"
msgid "Edit Nightclub"
msgstr "Lisa andmeid"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turism"
@@ -15687,9 +16380,15 @@ msgstr "Vaatetorn"
msgid "Information Office"
msgstr "Infopunkt"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Kaart"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Detailsuse aste"
@@ -15702,6 +16401,9 @@ msgstr "tänav"
msgid "scheme"
msgstr "skeem"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Näidatud ala"
@@ -15741,6 +16443,9 @@ msgstr "... võimalikud muud transpordiviisid."
msgid "Information Board"
msgstr "Infotahvel"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Infotahvli sisu"
@@ -15762,23 +16467,35 @@ msgstr "taimed"
msgid "Guidepost"
msgstr "Teeviit"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Infoterminal"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Täpsem kirjeldus"
msgid "Audioguide"
msgstr "Audiogiid"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Audiogiid telefonis?"
msgid "Phone number"
msgstr "Telefoninumber"
-msgid "Other Information Points"
-msgstr "Muud infopuntid"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Puhkus"
@@ -15801,9 +16518,6 @@ msgstr "Koertepark"
msgid "Edit Dog Park"
msgstr "Lisa andmeid"
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "tara"
@@ -15823,14 +16537,23 @@ msgid "Edit Water Park"
msgstr "Lisa andmeid"
msgid "Sauna"
-msgstr ""
+msgstr "Saun"
msgid "Edit Sauna"
msgstr "Lisa andmeid"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
msgstr ""
+msgid "Brothel"
+msgstr "Lõbumaja"
+
+msgid "Edit Brothel"
+msgstr "Lisa andmeid"
+
msgid "Playground"
msgstr "Mänguväljak"
@@ -15901,51 +16624,45 @@ msgstr "Kunstiteos"
msgid "Edit Artwork"
msgstr "Lisa andmeid"
-msgid "Place of Worship"
-msgstr "Palvekoht"
+msgid "Recording Studio"
+msgstr "Salvestusstuudio"
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr "Lisa andmeid"
-msgid "Religion"
-msgstr "Religioon"
-
-msgid "bahai"
-msgstr ""
+msgid "audio"
+msgstr "heli"
-msgid "buddhist"
-msgstr "budist"
+msgid "video"
+msgstr "video"
-msgid "christian"
-msgstr "kristlane"
+msgid "Place of Worship"
+msgstr "Pühapaik"
-msgid "hindu"
-msgstr "hindu"
+msgid "Church"
+msgstr "Kirik"
-msgid "jain"
+msgid "Edit Church"
msgstr ""
-msgid "jewish"
-msgstr "juudi"
+msgid "Building type"
+msgstr ""
-msgid "muslim"
-msgstr "moslem"
+msgid "basilica"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "cathedral"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualist"
+msgid "chapel"
+msgstr ""
-msgid "taoist"
-msgstr "taoist"
+msgid "church"
+msgstr "kirik"
-msgid "unitarian"
+msgid "temple"
msgstr ""
-msgid "zoroastrian"
-msgstr "zoroastrism (pärsia)"
-
msgid "Denomination"
msgstr "Usutunnistus"
@@ -15961,6 +16678,12 @@ msgstr "katoliku"
msgid "evangelical"
msgstr "evangeelne"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehoovatunnistajad"
@@ -15973,6 +16696,9 @@ msgstr "metodist"
msgid "mormon"
msgstr "mormoon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoksne"
@@ -15988,38 +16714,141 @@ msgstr "protestantlik"
msgid "quaker"
msgstr "kveeker"
-msgid "shia"
-msgstr "šiia"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
-msgstr "Salvestusstuudio"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Lisa andmeid"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
-msgid "audio"
-msgstr "heli"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "šiia"
+
+msgid "sunni"
+msgstr ""
+
+msgid "Synagogue"
+msgstr ""
+
+msgid "Edit Synagogue"
+msgstr ""
+
+msgid "synagogue"
+msgstr ""
+
+msgid "conservative"
+msgstr ""
+
+msgid "reform"
+msgstr ""
+
+msgid "Buddhist Temple"
+msgstr ""
+
+msgid "Edit Buddhist Temple"
+msgstr ""
+
+msgid "theravada"
+msgstr ""
+
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religioon"
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualist"
+
+msgid "taoist"
+msgstr "taoist"
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
+msgstr "zoroastrism (pärsia)"
msgid "Public Building"
msgstr "Ühiskondlik hoone"
@@ -16108,6 +16937,12 @@ msgstr "Lisa andmeid"
msgid "License Classes"
msgstr "Juhtimisõiguse kategooriad"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Tervis"
@@ -16117,6 +16952,12 @@ msgstr "Haigla"
msgid "Edit Hospital"
msgstr "Lisa andmeid"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Arstid"
@@ -16183,12 +17024,66 @@ msgstr "Loomaarst"
msgid "Edit Veterinary"
msgstr "Lisa andmeid"
-msgid "Note"
-msgstr "Märkus"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "avalik"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Postkast"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefon"
@@ -16198,6 +17093,30 @@ msgstr "Lisa andmeid"
msgid "Telephone cards"
msgstr "Telefoni kaart"
+msgid "Emergency Phone"
+msgstr "Hädaabi telefon"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Kell"
@@ -16207,30 +17126,36 @@ msgstr "Lisa andmeid"
msgid "Display"
msgstr "Ekraan"
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr "Kinnitus"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "seinakell"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "reklaamtahvel"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
msgid "Visibility/readability"
msgstr "Nähtavus/loetavus"
@@ -16259,8 +17184,8 @@ msgstr "Näitab niiskust"
msgid "Recycling"
msgstr "Jäätmekäitlus"
-msgid "Edit Recycling station"
-msgstr "Lisa andmeid"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Battareid"
@@ -16286,27 +17211,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Prügikorv"
-msgid "Edit Waste Basket"
-msgstr "Lisa andmeid"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Seljatugi"
-msgid "Material"
-msgstr "Materjal"
-
-msgid "stone"
-msgstr "kivi"
-
-msgid "plastic"
-msgstr "plastikust"
-
msgid "Amount of Seats"
msgstr "Istekohtade arv"
@@ -16341,14 +17254,17 @@ msgstr "Lisa andmeid"
msgid "Height"
msgstr "Kõrgus"
+msgctxt "height"
msgid "low"
-msgstr "madal"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "pool"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "täis"
+msgstr ""
msgid "Hide"
msgstr "Peida"
@@ -16356,11 +17272,11 @@ msgstr "Peida"
msgid "Lock"
msgstr "Lukusta"
-msgid "Drinking Water"
-msgstr "Joogivesi"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Lisa andmeid"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Tuletõrjehüdrant"
@@ -16385,6 +17301,9 @@ msgid "pond"
msgstr ""
msgid "Diameter (in mm)"
+msgstr "Läbimõõt (mm)"
+
+msgid "Hydrant Position"
msgstr ""
msgctxt "hydrant position"
@@ -16424,119 +17343,155 @@ msgstr "Staadion"
msgid "Edit Stadium"
msgstr "Lisa andmeid"
-msgid "select sport:"
-msgstr "vali spordiala:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "vibusport"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "pesapall"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr "korvpall"
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kanuu"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "rula"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "uisutamine"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "suusatamine"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "jalgpall"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "ujumine"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "lauatennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Spordikeskus"
@@ -16568,26 +17523,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Lisa andmeid"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Mitu"
msgid "Edit Multi"
msgstr "Lisa andmeid"
-msgid "type"
-msgstr "tüüp"
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "spordihall"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "staadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16595,6 +17551,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "spordihall"
+
+msgid "stadium"
+msgstr "staadion"
+
msgid "10pin"
msgstr "Bowling"
@@ -16628,6 +17593,22 @@ msgstr "Lisa andmeid"
msgid "Edit Cycling"
msgstr "Lisa andmeid"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Koerte võidujooks"
@@ -16640,9 +17621,34 @@ msgstr "Ratsasport"
msgid "Edit Equestrian"
msgstr "Lisa andmeid"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
msgstr ""
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "muda"
+
msgid "Horse Racing"
msgstr "Traavivõistlused"
@@ -16659,7 +17665,7 @@ msgid "Skating"
msgstr "Uisutamine"
msgid "Edit Skating"
-msgstr "Lisa andmeid"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16703,36 +17709,54 @@ msgstr "lumepark"
msgid "Difficulty"
msgstr "Raskusaste"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "algaja"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "kerge"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "edasijõudnu"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "ekspert"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "vabalaskumine"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16775,19 +17799,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16926,6 +17946,18 @@ msgstr "Mudelite lennuväli"
msgid "Edit Model Aerodrome"
msgstr "Lisa andmeid"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "Kaugjuhitav auto"
@@ -16938,38 +17970,73 @@ msgstr "Inimtekkeline"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "katus"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "garaaž"
+msgstr ""
-msgid "church"
-msgstr "kirik"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "kool"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "angaar"
+msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "kasvuhoone"
+msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "ülikool"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr ""
@@ -16977,21 +18044,60 @@ msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "korterid"
+msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "maja"
+msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
-msgstr "ridaelamu"
+msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr "Lisa andmeid"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Torn"
@@ -17007,9 +18113,6 @@ msgstr "side"
msgid "observation"
msgstr "vaatlus"
-msgid "Height (meters)"
-msgstr "Kõrgus (meetrites)"
-
msgid "Flagpole"
msgstr "Lipuvarras"
@@ -17219,42 +18322,68 @@ msgstr "Töötamise aeg"
msgid "Mo-Fr 22:00-05:00"
msgstr "E-R 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Mõõtejaam"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Lisa andmeid"
+msgid "Monitoring:"
+msgstr ""
-msgid "Measurement"
-msgstr "Mõõtmine"
+msgid "Weather"
+msgstr ""
-msgid "particulate_matter"
-msgstr "puisteaine"
+msgid "Water level"
+msgstr ""
-msgid "seismic"
-msgstr "seismoloogia"
+msgid "Tide Level"
+msgstr ""
-msgid "water_level"
-msgstr "veetase"
+msgid "Traffic"
+msgstr ""
-msgid "weather"
-msgstr "ilm"
+msgid "Air Quality"
+msgstr ""
-msgid "Recording"
-msgstr "Salvestamine"
+msgid "Noise"
+msgstr ""
-msgid "manually"
-msgstr "käsitsi"
+msgid "GPS Signals"
+msgstr ""
-msgid "automated"
-msgstr "automatiseeritud"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "remote"
-msgstr "kaugjuhitav"
+msgid "Galileo Signals"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "ei"
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Geodeetiline punkt"
@@ -17262,8 +18391,8 @@ msgstr "Geodeetiline punkt"
msgid "Edit Survey Point"
msgstr "Lisa andmeid"
-msgid "Surveillance"
-msgstr "järelvalve"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Lisa andmeid"
@@ -17274,12 +18403,102 @@ msgstr "ruumides"
msgid "outdoor"
msgstr "väljas"
-msgid "public"
-msgstr "avalik"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "pood"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "Elektrivõrk"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Elektrigeneraator"
@@ -17331,137 +18550,256 @@ msgstr "tuul"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "päikeseenergia"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Elektrijaam"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Lisa andmeid"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Elektrialajaam"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Lisa andmeid"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
-msgstr "Elektriliini number"
+msgid "solar photovoltaic"
+msgstr ""
-msgid "Cable Distribution Cabinet"
-msgstr "Jaotuskilp"
+msgid "solar_thermal_collector"
+msgstr ""
-msgid "Edit Cable Distribution Cabinet"
-msgstr "Lisa andmeid"
+msgid "solar thermal"
+msgstr ""
-msgid "Power Tower"
-msgstr "Elektriliini mast"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Lisa andmeid"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
-msgstr "Masti number"
+msgid "steam_turbine"
+msgstr ""
-msgid "Pole"
-msgstr "Elektripost"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
-msgid "Edit Power Pole"
-msgstr "Lisa andmeid"
+msgid "stellarator"
+msgstr ""
-msgid "Pole reference"
-msgstr "Posti tähis"
+msgid "nuclear fusion"
+msgstr ""
-msgid "Power Line"
-msgstr "Elektriliin"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Lisa andmeid"
+msgid "vertical_axis"
+msgstr ""
-msgid "Line type"
-msgstr "Joonetüüp"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Elektrialajaam"
+
+msgid "Edit Power Sub Station"
+msgstr "Lisa andmeid"
+
+msgid "Line reference"
+msgstr "Elektriliini number"
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "madal"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr "Jaotuskilp"
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr "Lisa andmeid"
+
+msgid "Power Tower"
+msgstr "Elektriliini mast"
+
+msgid "Edit Power Tower"
+msgstr "Lisa andmeid"
+
+msgid "Tower reference"
+msgstr "Masti number"
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr "Elektripost"
+
+msgid "Edit Power Pole"
+msgstr "Lisa andmeid"
+
+msgid "Pole reference"
+msgstr "Posti tähis"
+
+msgid "Power Line"
+msgstr "Elektriliin"
+
+msgid "Edit Power Line"
+msgstr "Lisa andmeid"
+
+msgid "Line type"
+msgstr "Joonetüüp"
-msgctxt "Power Line"
msgid "line"
-msgstr "liin"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17570,11 +18908,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Lisa andmeid"
-msgid "Baker"
-msgstr "Pagar"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Lisa andmeid"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Lihunik"
@@ -17585,8 +18923,8 @@ msgstr "Lisa andmeid"
msgid "Seafood"
msgstr "Mereannid"
-msgid "Edit Seafood"
-msgstr "Lisa andmeid"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Delikatessid"
@@ -17606,14 +18944,20 @@ msgstr "Turg"
msgid "Edit Marketplace"
msgstr "Lisa andmeid"
+msgid "Organic"
+msgstr "Ökokaubad"
+
msgid "Greengrocer"
msgstr "Aedviljad"
msgid "Edit Greengrocer"
msgstr "Lisa andmeid"
-msgid "Organic"
-msgstr "Ökokaubad"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17684,8 +19028,8 @@ msgstr "Lisa andmeid"
msgid "Fabric"
msgstr "Kangad"
-msgid "Edit Fabric"
-msgstr "Lisa andmeid"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektroonika"
@@ -17705,14 +19049,14 @@ msgstr "Lisa andmeid"
msgid "Mobile Phone"
msgstr "Mobiiltelefonid"
-msgid "Edit Mobile Phone"
-msgstr "Lisa andmeid"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Tolmuimejad"
-msgid "Edit Vacuum Cleaner"
-msgstr "Lisa andmeid"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hi-Fi"
@@ -17720,9 +19064,8 @@ msgstr "Hi-Fi"
msgid "Edit Hifi Shop"
msgstr "Lisa andmeid"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Lisa andmeid"
@@ -17748,6 +19091,12 @@ msgstr "Lisa andmeid"
msgid "Edit Automated Teller Machine"
msgstr "Lisa andmeid"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Kaubamaja"
@@ -17784,11 +19133,32 @@ msgstr "Juveelipood"
msgid "Edit Jewelry"
msgstr "Lisa andmeid"
+msgid "Gift"
+msgstr "Kingipood"
+
+msgid "Edit Gift Shop"
+msgstr "Lisa andmeid"
+
+msgid "buddhist"
+msgstr "budist"
+
+msgid "christian"
+msgstr "kristlane"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "juudi"
+
+msgid "muslim"
+msgstr "moslem"
+
msgid "Erotic"
msgstr "Erootikakaubad"
-msgid "Edit Erotic"
-msgstr "Lisa andmeid"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Lilled"
@@ -17817,8 +19187,8 @@ msgstr "Lisa andmeid"
msgid "Paint"
msgstr "Värvid"
-msgid "Edit Paint"
-msgstr "Lisa andmeid"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Mööbel"
@@ -17829,20 +19199,20 @@ msgstr "Lisa andmeid"
msgid "Kitchen"
msgstr "Valmisköögid"
-msgid "Edit Kitchen"
-msgstr "Lisa andmeid"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Kardinad"
-msgid "Edit Curtain"
-msgstr "Lisa andmeid"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Raamimiskoda"
-msgid "Edit Frames"
-msgstr "Lisa andmeid"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Kirjatarbed"
@@ -17862,6 +19232,12 @@ msgstr "Raamatupood"
msgid "Edit Book Store"
msgstr "Lisa andmeid"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Reisibüroo"
@@ -17871,8 +19247,8 @@ msgstr "Lisa andmeid"
msgid "Musical Instrument"
msgstr "Muusikariistad"
-msgid "Edit Musical Instruments"
-msgstr "Lisa andmeid"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Mänguasjad"
@@ -17952,6 +19328,9 @@ msgstr "mänguasjad"
msgid "vouchers"
msgstr "maksedokumendid"
+msgid "Note"
+msgstr "Märkus"
+
msgid "Geography"
msgstr "Geograafia"
@@ -18022,10 +19401,10 @@ msgid "Edit County"
msgstr "Lisa andmeid"
msgid "Population"
-msgstr ""
+msgstr "Elanikke"
msgid "Post code"
-msgstr "Posti kood"
+msgstr "Sihtnumber"
msgid "City"
msgstr "Suurlinn"
@@ -18081,6 +19460,12 @@ msgstr "Mäetipp"
msgid "Edit Peak"
msgstr "Lisa andmeid"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Liustik"
@@ -18120,26 +19505,35 @@ msgstr "Üksik puu"
msgid "Edit Tree"
msgstr "Lisa andmeid"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botaaniline nimi"
+msgid "Tree Row"
+msgstr "Puuderivi"
+
msgid "Wood"
msgstr "Mets"
msgid "Edit Wood"
msgstr "Lisa andmeid"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "okasmets"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "lehtmets"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "segamets"
msgid "Forest"
msgstr "Kultuurmets"
@@ -18147,15 +19541,6 @@ msgstr "Kultuurmets"
msgid "Edit Forest Landuse"
msgstr "Lisa andmeid"
-msgid "coniferous"
-msgstr "okasmets"
-
-msgid "deciduous"
-msgstr "lehtmets"
-
-msgid "mixed"
-msgstr "segamets"
-
msgid "Grassland"
msgstr ""
@@ -18231,6 +19616,12 @@ msgstr "Niit/Karjamaa"
msgid "Edit Meadow Landuse"
msgstr "Lisa andmeid"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Viinapuuistandus"
@@ -18285,8 +19676,8 @@ msgstr "Puhkeala"
msgid "Edit Recreation Ground Landuse"
msgstr "Lisa andmeid"
-msgid "Residential area"
-msgstr "Elamurajoon"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Lisa andmeid"
@@ -18297,6 +19688,9 @@ msgstr "Matmispaik"
msgid "Edit Graveyard"
msgstr "Lisa andmeid"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Kalmistu"
@@ -18372,6 +19766,33 @@ msgstr "Lisa andmeid"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Lisa andmeid"
@@ -18390,32 +19811,8 @@ msgstr "Linna nimi"
msgid "Country code"
msgstr "Riigi kood"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
-msgstr ""
+msgstr "Aadresside interpoleerimine"
msgid "Edit Address Interpolation"
msgstr "Lisa andmeid"
@@ -18432,9 +19829,21 @@ msgstr "paaris"
msgid "alphabetic"
msgstr "tähestikuline"
-msgid "Contact (common schema)"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
msgstr ""
+msgid "Contact (common schema)"
+msgstr "Kontakt (üldskeem)"
+
msgid "Edit Contact information"
msgstr "Lisa andmeid"
@@ -18442,10 +19851,10 @@ msgid "Image"
msgstr "Pilt"
msgid "Contact (schema with ''contact:*'' prefix)"
-msgstr ""
+msgstr "Kontakt (''contact:*'' eesliitega skeem)"
msgid "Edit Contact information (new schema)"
-msgstr ""
+msgstr "Lisa andmeid"
msgid "Edit Multipolygon"
msgstr "Liitala muutmine"
@@ -18594,26 +20003,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "tee"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "suusad"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "jalgsi"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "matkamine"
+msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
-msgstr "ümbersõit"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "sümboolne kirjeldus"
@@ -18660,20 +20098,23 @@ msgstr "edasisuunaline peatuspunkt"
msgid "backward halt point"
msgstr "tagasisuunaline peatuspunkt"
-msgid "Route network"
-msgstr "Marsruutide võrgustik"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Lisa andmeid"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "liige"
-msgid "Associated street"
-msgstr "Seotud tänav"
+msgid "Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Lisa andmeid"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
+msgstr "maja"
msgid "Street"
msgstr ""
@@ -18696,7 +20137,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18792,18 +20233,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "sild"
msgid "deprecated"
msgstr "kasutusest väljas"
+msgid "bicycle"
+msgstr "jalgrattaga"
+
+msgid "foot"
+msgstr "jalgsi"
+
msgid "horse"
msgstr "hobused"
@@ -18813,8 +20263,11 @@ msgstr "tõke"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "teerada"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "teenused"
@@ -18822,10 +20275,10 @@ msgstr "teenused"
msgid "ford"
msgstr "koolmekoht"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18843,6 +20296,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "raudteepunkt"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18858,29 +20314,29 @@ msgstr "kasutamata raudtee"
msgid "aeroway"
msgstr "aeronautika"
-msgid "aeroway_dark"
-msgstr "helikopterid"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "kerglennukid"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "suusanõlv lihtne"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "suusanõlv keskmine"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "suusanõlv edasijõudnutele"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "nõlv_ekspert"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "suusanõlv klassita"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "suusanõlv algajale"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "elektrivarustus"
@@ -18900,20 +20356,20 @@ msgstr "paadisadam"
msgid "amenity"
msgstr "mugavused"
-msgid "amenity_traffic"
-msgstr "autohooldus"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "muud teenused"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "vesi"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "tervishoid"
-msgid "shop"
-msgstr "pood"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotell"
@@ -18978,9 +20434,6 @@ msgstr "nõmm"
msgid "woodarea"
msgstr "metsaala"
-msgid "mud"
-msgstr "muda"
-
msgid "beach"
msgstr "rand"
@@ -18990,10 +20443,13 @@ msgstr "marsruut"
msgid "boundary"
msgstr "piir"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "koht"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19008,9 +20464,6 @@ msgstr "Asula/Linn"
msgid "One Way"
msgstr "ühesuunaline"
-msgid "Church"
-msgstr "Kirik"
-
msgid "Fuel Station"
msgstr "Tankla"
@@ -19038,6 +20491,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19083,10 +20539,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19098,7 +20584,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19116,7 +20602,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19233,19 +20719,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:building without building"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:ref without ref"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:population without population"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19264,13 +20861,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19279,23 +20912,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19306,142 +20948,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Tänavad NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Tšehhi CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Tšehhi UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7. seeria (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19457,16 +21148,16 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Itaalia"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sitsiilia - Itaalia"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Itaalia"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
@@ -19480,46 +21171,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -19540,88 +21234,148 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
+msgstr ""
+
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr ""
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
+msgid "OSM - Tiger Edited Map"
+msgstr ""
+
+msgid "MassGIS L3 Parcels"
+msgstr ""
+
+msgid "NC 2010 Orthoimagery"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19655,7 +21409,7 @@ msgid "Missing audio file"
msgstr ""
msgid "Commands"
-msgstr ""
+msgstr "Käsud"
msgid "Processing..."
msgstr ""
@@ -19825,6 +21579,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19846,13 +21612,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19994,7 +21754,7 @@ msgid "Address has no valid street"
msgstr ""
msgid "Address has no post code"
-msgstr ""
+msgstr "Aadressis puudub sihtnumber"
msgid "Address has no city"
msgstr ""
@@ -20115,9 +21875,15 @@ msgstr "Vali mittetäielikud aadressid"
msgid "Selects all addresses with incomplete data."
msgstr "Valib kõik mittetäielike andmetega aadressid"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20139,6 +21905,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Kihi atribuudid"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20217,12 +21986,24 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
-msgid "Handy Address Interpolation Functions"
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
msgstr ""
+msgid "Handy Address Interpolation Functions"
+msgstr "Käepärased aadresside interpoleerimise funktsioonid"
+
msgid "Define Address Interpolation"
msgstr ""
@@ -20281,7 +22062,7 @@ msgid "State:"
msgstr ""
msgid "Post Code:"
-msgstr ""
+msgstr "Sihtnumber:"
msgid "Country:"
msgstr ""
@@ -20304,7 +22085,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20408,10 +22189,10 @@ msgid ""
msgstr ""
msgid "I''m ready!"
-msgstr ""
+msgstr "Olen valmis!"
msgid "AlignWays Tips"
-msgstr ""
+msgstr "AlignWays nõuanded"
msgid "AlignWays: What''s New..."
msgstr ""
@@ -20475,6 +22256,16 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays aitab "
+"sul\n"
+"joondada kaks joone segmenti. See võib olla kasulik näiteks, kui joonistad\n"
+"hoonet ja soovid, et selle külg oleks paralleelne tänava või teega.<br>\n"
+"<br>\n"
+"Enne alustamist võid abi saada mõningatest nõuannetest:\n"
+"</p>\n"
+"</html>\n"
+"\n"
msgid ""
"<html>\n"
@@ -20549,7 +22340,7 @@ msgid ""
msgstr ""
msgid "Don''t show this again"
-msgstr ""
+msgstr "Ära näita seda enam"
msgid "What''s new..."
msgstr ""
@@ -20570,19 +22361,10 @@ msgid "Building address"
msgstr "hoone aadress"
msgid "House number:"
-msgstr ""
+msgstr "Maja number:"
msgid "Street Name:"
-msgstr ""
-
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
+msgstr "Tänava nimi:"
msgid "Big buildings mode"
msgstr ""
@@ -20754,6 +22536,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20772,12 +22557,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20914,6 +22693,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20931,6 +22713,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -21011,113 +22796,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
+msgstr "Lisa uus kiht"
+
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Refine georeferencing"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Reset cookie"
msgstr ""
-msgid "(optional)"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Change location"
+msgid "Save image as..."
msgstr ""
-msgid "Set a new location for the next request"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Add a new municipality layer"
+msgid "GeoTiff files (*.tif)"
msgstr ""
-msgid "Commune"
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
-msgstr "Lisa uus kiht"
+msgid "Image georeferencing"
+msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
msgstr ""
-msgid "Save image as PNG"
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21143,7 +22942,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21193,7 +22995,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21238,6 +23040,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21310,6 +23115,71 @@ msgstr ""
msgid "Install"
msgstr ""
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr ""
@@ -21349,27 +23219,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21607,7 +23459,7 @@ msgid "Change bookmark"
msgstr ""
msgid "Edit access parameters"
-msgstr ""
+msgstr "Muuda juurdepääsu parameetreid"
msgid "Graph View Dialog"
msgstr ""
@@ -21628,7 +23480,7 @@ msgid "Ruleset:"
msgstr ""
msgid "Parameters:"
-msgstr ""
+msgstr "Parameetrid:"
msgid "Coloring:"
msgstr ""
@@ -21767,6 +23619,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21955,19 +23810,19 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Häälesta aluskaart"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "Häälesta valitud aluskaardi asukoht"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Palun vali häälestatav aluskaart."
+msgstr ""
msgid "Start adjusting"
msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "Praegu ei ole ühtegi aluskaarti, mida häälestada"
+msgstr ""
msgid "No layers to adjust"
msgstr ""
@@ -22005,19 +23860,13 @@ msgstr ""
msgid "WayPoint Image"
msgstr ""
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
-msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
-msgstr ""
+msgid "Display non-geotagged photos"
+msgstr "Kuva mitte-geosildistatud fotosid"
-msgid "Open images with ImageWayPoint"
+msgid "Imported Images"
msgstr ""
-msgid "Load set of images as a new layer."
+msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
msgid "Import vector graphics"
@@ -22029,16 +23878,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22404,9 +24250,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22461,9 +24304,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22505,25 +24365,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Muuda liitalaks"
+msgid "Select OSM mirror URL to download from."
+msgstr ""
-msgid "Convert to multipolygon."
-msgstr "Muuda liitalaks"
+msgid "Base URL"
+msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22660,9 +24520,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22687,12 +24544,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22753,7 +24619,7 @@ msgid "Update the selected modules"
msgstr ""
msgid "Please restart JOSM to activate the downloaded modules."
-msgstr ""
+msgstr "Palun taaskäivita JOSM allalaaditud mooduliste aktiveerimiseks"
msgid ""
"All installed modules are up to date. JOSM does not have to download newer "
@@ -22776,13 +24642,15 @@ msgid "Open Data Module description URL"
msgstr ""
msgid "Download OSM data corresponding to the current data set."
-msgstr ""
+msgstr "Praegusele andmekogumile vastava OSM andmete allalaadimine."
msgid "Diff"
msgstr ""
msgid "Perform diff between current data set and existing OSM data."
msgstr ""
+"Erinevuste võrdlemine praeguse andmekogumi ja olemasolevate OSM andmete "
+"vahel."
msgid "Open tools menu for this data."
msgstr ""
@@ -22843,6 +24711,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22859,6 +24730,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22902,7 +24784,7 @@ msgid "Launch browser to the summary license page of the selected data set"
msgstr ""
msgid "View the license of the selected data set"
-msgstr ""
+msgstr "Vaata valitud andmekogumi litsentsi"
msgid ""
"Warning: Cannot download module ''{0}''. Its download link is not known. "
@@ -23094,21 +24976,14 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Tekkis viga: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
msgid "Open OpenStreetBugs"
-msgstr ""
+msgstr "Ava Openstreetbugs"
msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr ""
+msgstr "Avab Openstreetbugs’i akna ning aktiveerib automaatse allalaadimise"
msgid "Bug list"
msgstr ""
@@ -23153,18 +25028,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23191,7 +25054,7 @@ msgid ""
msgstr ""
msgid "OpenStreetBugs"
-msgstr ""
+msgstr "OpenStreetBugs"
msgid "Open Visible..."
msgstr ""
@@ -23222,9 +25085,12 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
-msgid "Invalid changeset id: {0}"
+msgid "Download PBF"
msgstr ""
+msgid "Invalid changeset id: {0}"
+msgstr "Vigane muutuskogumi id: {0}"
+
msgid "Invalid timestamp: {0}"
msgstr ""
@@ -23429,9 +25295,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23473,7 +25336,7 @@ msgid "to previous value (unchanged mtime)"
msgstr ""
msgid "Photo Geotagging Plugin"
-msgstr ""
+msgstr "Fotode geosildistamise plugin"
msgid "Writing position information to image files..."
msgstr ""
@@ -23511,7 +25374,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23665,6 +25546,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23686,6 +25570,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23792,13 +25679,13 @@ msgid "Public Transport: Disable GTFS"
msgstr ""
msgid "Create Stops from GTFS ..."
-msgstr ""
+msgstr "Loo peatused GTFS-failist ..."
msgid "Create Stops from a GTFS file"
-msgstr ""
+msgstr "Peatuste loomine GTFS-failist"
msgid "Select GTFS file (stops.txt)"
-msgstr ""
+msgstr "Vali GTFS-fail (stops.txt)"
msgid "File \"{0}\" does not exist"
msgstr ""
@@ -23815,16 +25702,16 @@ msgid "No data found"
msgstr ""
msgid "The GTFS file was empty."
-msgstr ""
+msgstr "GTFS-fail oli tühi."
msgid "light_rail"
msgstr ""
msgid "Create Stops from GTFS"
-msgstr ""
+msgstr "Peatuste loomine GTFS-failist"
msgid "GTFS-Stops"
-msgstr ""
+msgstr "GTFS-peatused"
msgid "Type of stops to add"
msgstr ""
@@ -23920,7 +25807,7 @@ msgid "Itinerary"
msgstr ""
msgid "Stops"
-msgstr ""
+msgstr "Peatused"
msgid "Meta"
msgstr ""
@@ -23944,43 +25831,40 @@ msgid "Add a new Tag"
msgstr ""
msgid "Name/Id"
-msgstr ""
+msgstr "Nimi/Id"
msgid "Ref"
msgstr ""
msgid "Stops are possible on the"
-msgstr ""
+msgstr "Peatused võivad olla"
msgid "right hand side"
-msgstr ""
+msgstr "paremal pool"
msgid "left hand side"
-msgstr ""
+msgstr "vasakul pool"
msgid "Maximum distance from route"
-msgstr ""
+msgstr "Suurim kaugus marsruudist"
msgid "Public Transport: Change stop type"
msgstr ""
msgid "Create Stops from GPX ..."
-msgstr ""
+msgstr "Loo peatused GPX-failist ..."
msgid "Create Stops from a GPX file"
-msgstr ""
+msgstr "Peatuste loomine GPX-failist"
msgid "Select GPX file"
-msgstr ""
+msgstr "Vali GPX-fail"
msgid "The GPX file contained no tracks or waypoints."
msgstr ""
msgid "Create Stops from GPX"
-msgstr ""
-
-msgid "Tracks"
-msgstr ""
+msgstr "Peatuste loomine GPX-failist"
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24050,9 +25934,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24179,9 +26060,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24203,6 +26081,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24235,15 +26116,31 @@ msgstr "Tõmban puuduvaid primitiive"
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Muuda atribuute"
+
msgid "Country preset:"
msgstr ""
@@ -24253,6 +26150,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24355,9 +26255,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24473,6 +26370,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24533,19 +26433,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24681,6 +26581,9 @@ msgid "delete outline way"
msgstr ""
msgid "Street name: "
+msgstr "Tänava nimi: "
+
+msgid "Building: "
msgstr ""
msgid "Even/Odd"
@@ -24711,7 +26614,7 @@ msgid "Reverse a terrace"
msgstr ""
msgid "Reverses house numbers on a terrace."
-msgstr ""
+msgstr "Pöörab ridaelamu majanumbrid."
msgid "Reverse a Terrace"
msgstr ""
@@ -24758,6 +26661,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24773,9 +26765,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24797,6 +26786,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24949,9 +26941,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25358,7 +27347,7 @@ msgid "Turn Restrictions"
msgstr "Pöördepiirangud"
msgid "Display and manage turn restrictions in the current data set"
-msgstr "Kuva ja halda pöördepiiranguid antud andmekogus"
+msgstr "Kuva ja halda pöördepiiranguid antud andmekogumis"
msgid "Open an editor for the selected turn restriction"
msgstr "Ava redaktor, et muuta valitud pöördepiirangut"
@@ -25385,7 +27374,7 @@ msgid ""
"Development of the turn restriction plugin was sponsored by <a "
"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgstr ""
-"Põõrdepiirangute plugina väljatöötamist on sponsoreerinud <a "
+"Pöördepiirangute plugina väljatöötamist on sponsoreerinud <a "
"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgid "Configure the preferences for the turnrestrictions plugin"
@@ -25582,7 +27571,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25590,10 +27582,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25602,18 +27591,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr "Lisatööriistad"
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25656,15 +27633,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25786,18 +27754,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25975,9 +27931,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -26104,8 +28057,8 @@ msgstr "kordus"
msgid "mute"
msgstr "vaigista"
-msgid "Scanned Map..."
-msgstr "Skaneeritud kaart..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26124,9 +28077,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Tee allalaadimine"
@@ -26261,9 +28211,6 @@ msgstr "Seab Vikipeedia artiklite vaikekeele"
msgid "Enter the Wikipedia language"
msgstr "Sisesta Vikipeedia keel"
-msgid "Add Tag"
-msgstr "Lisa silt"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index ba9c5fd..4980734 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 13:56+0000\n"
"Last-Translator: Txopi <txopi at sindominio.net>\n"
"Language-Team: Basque <eu at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:34+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Atzeko planoko erabilera baldintzak"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -156,17 +171,14 @@ msgid "About JOSM..."
msgstr "JOSM-i buruz"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"KONTUZ: API-aren URL oinarria ezusteko formatuan. OSM erabiltzaileen "
-"orrietarako berbildalketek huts egin dezakete. API-aren URL oinarria \"{0}\" "
-"da"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -214,6 +226,9 @@ msgstr "Helburu geruzarik ez"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -253,9 +268,6 @@ msgstr "Tresna: {0}"
msgid "Please select at least four nodes."
msgstr "Mesedez, aukeratu lau nodo gutxienez."
-msgid "Information"
-msgstr "Argibideak"
-
msgid "Align Nodes in Line"
msgstr "Lerrokatu nodoak marra zuzen batean"
@@ -280,6 +292,9 @@ msgstr "gatazka"
msgid "download"
msgstr "deskargatu"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "aurrekoa"
@@ -289,6 +304,9 @@ msgstr "hurrengoa"
msgid "Nothing selected to zoom to."
msgstr "Ez da ezer aukeratu zoom egiteko."
+msgid "Information"
+msgstr "Argibideak"
+
msgid "Zoom to {0}"
msgstr "Egin zoom {0} mailara"
@@ -346,10 +364,9 @@ msgstr ""
"norabidea aldatzea nahi al duzu?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Ezin izan dira bideak elkartu (ezin izan dira nodo kate bakar batean batu)"
msgid "Combine {0} ways"
msgstr "{0} bideak bateratu"
@@ -406,6 +423,12 @@ msgstr "Ezabatu"
msgid "Delete selected objects."
msgstr "Aukeratutako objektuak ezabatu."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Banatu nodoak"
@@ -413,12 +436,23 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Banatu aukeraturiko nodoak marra batean zehar, distantzia bera mantenduz."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSMtik deskargatu..."
msgid "Download map data from the OSM server."
msgstr "Mapako datuak OSM-ren zerbitzaritik deskargatu."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Datuak deskargatu"
+
msgid "Download object..."
msgstr "Deskargatu objektua..."
@@ -513,6 +547,9 @@ msgstr "Historia"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "OSM-ko bide, nodo eta erlazioen historiaren informazioa erakutsi."
+msgid "Show history"
+msgstr "Historia erakutsi"
+
msgid "History (web)"
msgstr ""
@@ -629,11 +666,9 @@ msgid "Joined overlapping areas"
msgstr "Elkarren gainean dauden azalerak batu egin dira"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Bide horietako batzuk aldatu diren harremanen parte ziren. Mesedez, baiezta "
-"ezazu ez direla erroreak gehitu."
msgid "Fix tag conflicts"
msgstr "Etiketa gatazkak konpondu"
@@ -785,8 +820,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Nodoak bateratu beraietan zaharrenera"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -947,8 +982,8 @@ msgid "Download Data"
msgstr "Datuak deskargatu"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -980,16 +1015,9 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizatu / Desegin"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Forma ortogonalizatu / Desegin\n"
-"Mesedez, aukera itzatzu aurreko Forma Ortogonalizatu ekintzagatik mugituriko "
-"nodoak!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Forma ortogonalizaketa desegin"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1010,9 +1038,6 @@ msgstr "Ortogonalizatu"
msgid "Usage"
msgstr "Erabilera"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Hautatutako elementuak ezin dira ortogonalizatu"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1133,6 +1158,15 @@ msgstr "Fitxategiaren izena ere aldatu"
msgid "Could not rename file ''{0}''"
msgstr "Ezin izan da ''{0}'' fitxategiaren izena aldatu"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr "Alderantzizko bidea"
@@ -1185,9 +1219,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1251,6 +1282,9 @@ msgstr "Egoera txostena"
msgid "Copy to clipboard and close"
msgstr "Arbelera kopiatu eta itxi"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Itxi"
@@ -1332,19 +1366,14 @@ msgstr ""
"adabegiak aukeratu)."
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Bazkideen roletan oinarrituriko bazkideen zerrenda bat kopiatu egin da "
-"bide berri guztietan.<br>Baieztatu egin beharko zenuke hau eta zuzendu "
-"beharrezkoa denean.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Bazkideen zerrenda kopiatu egin da bide berri guztietan.<br>Baieztatu "
-"egin beharko zenuke hau eta zuzendu beharrezkoa denean.</html>"
msgid "Split way {0} into {1} parts"
msgstr "{0} bidea {1} zatitan banatu"
@@ -1441,6 +1470,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Desegin"
@@ -1465,9 +1515,6 @@ msgstr "Datuak eguneratu"
msgid "Updates the objects in the active data layer from the server."
msgstr "Datu aktiboen geruzako objektuak eguneratzen ditu zerbitzaritik."
-msgid "Download data"
-msgstr "Datuak deskargatu"
-
msgid "Update modified"
msgstr "Eguneraketa aldaturik"
@@ -1671,6 +1718,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Mantsoago aurrera"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "GPS datuak deskargatzen"
@@ -1680,6 +1730,18 @@ msgstr "GPX datuak deskargatuta"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Datuak deskargatzen"
@@ -1699,6 +1761,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "{0} gatazka gertatu dira inportaketan."
+msgstr[1] "{0} gatazka gertatu dira inportaketan."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Gatazka datuak behera kargatzean"
+msgstr[1] "Gatazka datuak behera kargatzean"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) {2} Nodoaren gurasoak kargatzen"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) {2} bidearen gurasoak kargatzen"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Kargatzen {2} erlazioaren gurasoak"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "{1}-tik {0} deskargatuta ({2} falta dira)"
@@ -1756,25 +1843,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Deskarga iraun duen bitartean errore batzuk detektatu dira"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "{0} gatazka gertatu dira inportaketan."
-msgstr[1] "{0} gatazka gertatu dira inportaketan."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Gatazka datuak behera kargatzean"
-msgstr[1] "Gatazka datuak behera kargatzean"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) {2} Nodoaren gurasoak kargatzen"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) {2} bidearen gurasoak kargatzen"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Kargatzen {2} erlazioaren gurasoak"
-
msgid "Error during download"
msgstr "Errorea deskargatzerakoan"
@@ -1921,6 +1989,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1945,8 +2016,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1962,6 +2033,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2388,6 +2462,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2555,14 +2632,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
-msgstr "Hasierako identidadea espero zen"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "Espero zen aldaketa multzoa"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "Espero zen bertsioa"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2574,6 +2651,9 @@ msgstr ""
"Ezezaguna jatorrizko mota : {0}. Onartutako balioak hauexek dira: nodo, bide "
"edo erlazio"
+msgid "Primitive id expected"
+msgstr "Hasierako identidadea espero zen"
+
msgid "Range of numbers expected"
msgstr "Zenbaki-tarte bat espero zen"
@@ -2593,11 +2673,8 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr "Eragilea falta da NOT eragiketan"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Kontuz: automatikoki aldatu da ''{0}'' etiketaren balioa ezabatu den {1} "
-"objektuan"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2690,6 +2767,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Objektu {0} gehitua"
msgstr[1] "{0} objektu gehituta"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Aldatu {0} nodoa"
@@ -2726,10 +2806,10 @@ msgstr "{1}tik \"{0}\" objektu ezabatu"
msgid "Set {0}={1} for {2} objects"
msgstr "{2} objektuentzat {0}={1} ezarri"
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2752,8 +2832,8 @@ msgid "Double conflict"
msgstr "Gatazka bikoitza"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2863,6 +2943,9 @@ msgstr[1] "''{0}'' objektuak ezabatuak"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "{0} erlazioaren partaideen zerrendako gatazka konpondu"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "{0} nodoa biratu"
@@ -2923,11 +3006,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Bide honen norabidea biratzean bidearen eta bere nodoen propietateen "
-"ondorengo aldaketak gomendatzen dizkizugu datuen trinkotasuna mantentzeko."
msgid "Relation"
msgstr "Erlazioa"
@@ -2956,11 +3037,11 @@ msgstr "Aplikatu aukeratutako aldaketak"
msgid "Do not apply changes"
msgstr "Ez aplikatu aldaketak"
-msgid "Please select which property changes you want to apply."
-msgstr "Aukeratu aplikatu nahi dituzun propietate aldaketak."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Propietateak "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Honi dagokion erlazioaren rolak"
@@ -2980,6 +3061,9 @@ msgstr "IOError fitxategia sortzean. Ez da automatikoki gordeko: {0}"
msgid "Unable to delete old backup file {0}"
msgstr "Ezin izan da ezabatu {0} aurreko babeskopia"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Errorea ezabatutako geruzaren babeskopia sortzean: {0}"
@@ -3010,21 +3094,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Kontuz: huts egin du hobespenak ''{0}'' gordetzean"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Kontuz: hobespenak hasieratzen huts egin du. Hobespenen ''{0}'' direktorioa "
-"ez da direktorio bat."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3034,11 +3116,9 @@ msgstr ""
"direktorioa ez da direktorio bat.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Kontuz: Hobespenak berrezartzeak huts egin du. Errorea desagertutako "
-"hobespen direktorioa sortzean: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3047,16 +3127,12 @@ msgstr ""
"<html>Hobespenak berrezartzeak huts egin du.<br>Errorea ezabatutako "
"hobespenen direktorioa sortzean: {0}.</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Kontuz: egungo hobespenen \"{0}\" fitxategia ordeztuko da lehenetsitako "
-"fitxategiagatik."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3073,8 +3149,8 @@ msgstr ""
"da <br>{0}<br>n eta lehenetsitako hobespen fitxategia sortzen.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3104,12 +3180,11 @@ msgstr "''{0}'' baliabidea ezin izan da kargatu, errorea hauxe: {1}."
msgid "UNKNOWN"
msgstr "EZEZAGUNA"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Kontuz: berrikusteko artxiboa ''/REVISION'' galdu egin da."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Jatorrizko ''{0}''(a)rentzako gatazka erregistratu da jada"
@@ -3271,8 +3346,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "{0} parametroa ez dago 0..{1} artean. ''{2}'' dugu."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3379,7 +3453,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3398,6 +3472,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3414,9 +3491,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3455,6 +3529,9 @@ msgstr "bestelakoen balidazioa"
msgid "Running test {0}"
msgstr "{0} testa exekutatzen"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Helbideak"
@@ -3479,6 +3556,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3540,6 +3626,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Nodo bikoiztuak"
@@ -3548,9 +3637,6 @@ msgstr ""
"Proba honek egiaztatzen du ez dagoela kokapen bera duen nodo bat baino "
"gehiago."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3618,6 +3704,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr "Bideak"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipoligonoa"
@@ -3687,6 +3791,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3744,13 +3854,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3782,10 +3892,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3923,8 +4033,8 @@ msgstr "Lehenetsitako zuzentzaile-ortografikoa erabili."
msgid "Use the default spellcheck file (recommended)."
msgstr "Lehenetsitako zuzentzaile-ortografikoa erabili (gomendatua)."
-msgid "Fix properties"
-msgstr "Propietateak konpondu"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Ezin izan da elementu mota aurkitu"
@@ -4000,6 +4110,9 @@ msgstr ""
"Test honen bidez itxita egon beharko liratekeen bide zirkularrak egiaztatzen "
"dira."
+msgid "Unclosed way"
+msgstr "Itxi-gabeko bidea"
+
msgid "natural type {0}"
msgstr "{0} mota naturala"
@@ -4030,9 +4143,6 @@ msgstr "eraikina"
msgid "area"
msgstr "azalera"
-msgid "Unclosed way"
-msgstr "Itxi-gabeko bidea"
-
msgid "Unconnected ways"
msgstr ""
@@ -4061,10 +4171,10 @@ msgstr ""
"Test honek inolako bideren parte ez diren etiketa-gabeko nodoak egiaztatzen "
"du."
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4130,27 +4240,6 @@ msgstr "Alderantzikatutako itsasertza: lurrazala ezin da ezkerretara egon"
msgid "Reversed land: land not on left side"
msgstr "Alderantzikatutako lurrazala: lurrazala ezin da ezkerretara egon"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Errorea: Espero ez zen ''{0}'' lerroa laster-marka honetan ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Errorea: \"{2}\" fitxategi-markatzailearen \"{1}\". lerroan \"{0}\" balio "
-"bikoitz ilegala dago"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Ezin izan ditugu irakurri laster markak "
-"hemendik:<br>''{0}''<br>Errorea: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Ez erakutsi berriz (aukera gogoratzen du)"
@@ -4254,7 +4343,7 @@ msgstr "Erakutsi laguntza informazioa"
msgid "Downloading \"Message of the day\""
msgstr "Eguneko mezua deskargatzen"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4467,9 +4556,24 @@ msgstr "Ikusi"
msgid "Tools"
msgstr "Tresnak"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Aukeraketa"
+
msgid "Presets"
msgstr "Aurrezarpenak"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4485,10 +4589,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Audioa"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4497,6 +4613,9 @@ msgstr "Ezkutatu botoi hau"
msgid "Click the arrow at the bottom to show it again."
msgstr "Klikatu beheko gezia berriro ikusteko"
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4558,6 +4677,9 @@ msgstr "(objekturik ez)"
msgid "User:"
msgstr "Erabiltzailea:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "Geruza hau ez dago zerrendan."
@@ -4585,19 +4707,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "faltsua: propietatea nahita dago kenduta"
-
-msgid "true: the property is explicitly switched on"
-msgstr "egia: propietatea nahita dago jarrita"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "partziala: objektuek aukera desberdinak dituzte, ez aldatu"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "ezarri gabe: ez ezarri propietate hau aukeratutako objektuetan"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4899,12 +5008,18 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Kopiatu nik aukeratutako elementuak batutako elementu zerrendaren bukaerara"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
"Kopiatu nik aukeratutako elementuak batutako elementu zerrendaren hasierara"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -4912,22 +5027,34 @@ msgstr ""
"Kopiatu nik aukeratutako elementuak batutako nodo zerrendaren lehenengo "
"elementuaren ondoren"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Kopiatu beraien elementu hautatuak batutako elementu zerrendaren hasierara."
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Kopiatu beraien elementu hautatuak batutako elementu zerrendaren bukaerara."
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
"Kopiatu beraien elementu hautatuak batutako elementu zerrendaren hasierara."
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4944,8 +5071,8 @@ msgstr "Kopiatu beraien elementu guztiak helburura"
msgid "Up"
msgstr "Gora"
-msgid "Move up the selected elements by one position."
-msgstr "Igo maila bat aukeratutako elementuak."
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Behera"
@@ -5000,14 +5127,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Beraien bertsioa (elementu {0})"
msgstr[1] "Beraien bertsioa ({0} elementu)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Nodoa"
@@ -5260,14 +5379,14 @@ msgctxt "tag"
msgid "Key:"
msgstr "Gakoa:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr "Balioa:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5790,6 +5909,9 @@ msgstr "Erakutsi/Ezabatu"
msgid "Information about layer"
msgstr "Geruzari buruzko informazioa"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5873,6 +5995,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Objektu mota"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "Aukera ezazu OSM objektu mota bat"
+
+msgid "Object ID:"
+msgstr "Objektuaren ID-a"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Idatzi deskargatu nahi duzun objektuaren ID-a"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Erlazioak"
@@ -5894,9 +6043,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Erlazioak: {0}"
-msgid "Selection"
-msgstr "Aukeraketa"
-
msgid "Open a selection list window."
msgstr ""
@@ -5921,32 +6067,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Aukeraketa: {0}"
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5967,8 +6113,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5994,9 +6139,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -6141,9 +6283,6 @@ msgstr "Edukia eguneratu"
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr "Historia erakutsi"
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6428,8 +6567,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6494,35 +6633,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Propietateak/Partaidetzak"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Aukeratutako objektuen propietateak"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<ezberdina>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Partaidea"
msgid "Position"
msgstr "Kokapena"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propietateak: {0} / Partaidetzak: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Propietateak / Partaidetzak"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
-msgstr "Propietateak ezabatu"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Erlazioa aldatu"
@@ -6536,13 +6687,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6621,12 +6772,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6656,9 +6801,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6696,7 +6847,7 @@ msgstr "Erlazioa ezabatu egin da"
msgid "Downloading relation {0}"
msgstr "{0} erlazioa jaisten"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6756,6 +6907,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7011,6 +7165,27 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Ezin izan ditugu irakurri laster markak "
+"hemendik:<br>''{0}''<br>Errorea: {1}</html>"
+
msgid "Bookmarks"
msgstr "Laster-markak"
@@ -7076,9 +7251,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr "Dato jatorri eta motak"
@@ -7145,21 +7317,8 @@ msgstr ""
msgid "Download object"
msgstr "Deskargatu objektu hau"
-msgid "Object type:"
-msgstr "Objektu mota"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "Aukera ezazu OSM objektu mota bat"
-
-msgid "Object ID:"
-msgstr "Objektuaren ID-a"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Idatzi deskargatu nahi duzun objektuaren ID-a"
+msgid "Start downloading"
+msgstr "Hasi deskargatzen"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7169,23 +7328,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Hasi deskargatzen"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7282,7 +7427,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7381,6 +7526,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7468,10 +7616,8 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Oharra: errorearen goiburua \"{0}\" ez dator bat itxarondako patroiren "
-"batekin"
msgid "Upload"
msgstr ""
@@ -7489,6 +7635,12 @@ msgstr "Egin iruzkin labur bat igotzen ari zaren aldaketentzako:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7555,8 +7707,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7631,8 +7782,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7646,8 +7797,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7862,12 +8012,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7876,6 +8020,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7891,6 +8051,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7898,8 +8073,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -8011,9 +8186,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -8023,6 +8195,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8039,7 +8214,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8185,7 +8360,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8215,7 +8390,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8331,6 +8506,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8370,6 +8548,9 @@ msgstr "\"Tile\" okerrak berriz kargatu"
msgid "Alpha channel"
msgstr "Alpha kanala"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr "WMS laster-marka ezarri"
@@ -8567,9 +8748,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8588,6 +8766,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8645,6 +8826,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8711,9 +8898,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8726,7 +8910,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8753,12 +8940,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8887,14 +9078,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8909,7 +9096,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8919,8 +9106,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9140,7 +9326,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9206,6 +9392,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9263,9 +9455,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9512,6 +9701,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9640,6 +9832,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9682,6 +9880,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9732,19 +9933,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
+msgid "Export selected items"
msgstr ""
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9762,40 +9954,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
-msgstr "Zerrenda"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9819,6 +10020,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr "Zerrenda"
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9875,6 +10109,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9928,6 +10165,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10209,7 +10451,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10378,6 +10626,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10441,7 +10695,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10699,21 +10953,6 @@ msgstr "Swiss Grid (Suitza)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zonaldea"
-
-msgid "North"
-msgstr "Iparraldea"
-
-msgid "South"
-msgstr "Hegoaldea"
-
-msgid "Hemisphere"
-msgstr "Hemisferio"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadalupe Fort-Marigot 1949"
@@ -10735,6 +10974,21 @@ msgstr "UTM Frantzia (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Sistema-geodesikoa"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zonaldea"
+
+msgid "North"
+msgstr "Iparraldea"
+
+msgid "South"
+msgstr "Hegoaldea"
+
+msgid "Hemisphere"
+msgstr "Hemisferio"
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -10785,8 +11039,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10795,20 +11049,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10890,14 +11149,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10941,31 +11194,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Aldatu {0} objektua"
+msgstr[1] "Aldatu {0} objektuak"
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10974,6 +11232,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10989,57 +11250,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Use preset ''{0}''"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "{0}:"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Aldatu {0} objektua"
-msgstr[1] "Aldatu {0} objektuak"
-
-msgid "Nothing selected!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "New relation"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Change Properties"
-msgstr "Aldatu propietateak"
-
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -11057,6 +11320,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -11086,6 +11357,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr "faltsua: propietatea nahita dago kenduta"
+
+msgid "true: the property is explicitly switched on"
+msgstr "egia: propietatea nahita dago jarrita"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "partziala: objektuek aukera desberdinak dituzte, ez aldatu"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "ezarri gabe: ez ezarri propietate hau aukeratutako objektuetan"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11116,7 +11430,7 @@ msgid "Contacting OSM Server..."
msgstr "OSM zerbitzariarekin konektatzen..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11156,28 +11470,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11272,6 +11584,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11287,12 +11602,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11371,7 +11694,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11470,36 +11793,12 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
@@ -11508,8 +11807,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11536,10 +11835,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11550,9 +11846,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11574,6 +11867,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11623,8 +11919,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11767,6 +12063,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11785,6 +12084,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11809,16 +12117,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11830,6 +12141,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11844,6 +12163,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11874,19 +12202,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11908,11 +12236,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11982,13 +12322,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12131,10 +12471,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12149,22 +12489,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12233,8 +12572,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12249,9 +12587,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12573,17 +12926,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12594,9 +12941,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12628,9 +13018,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
msgstr ""
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12958,6 +13362,11 @@ msgid "Saturation:"
msgstr "Asetasuna:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13042,6 +13451,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13147,9 +13560,6 @@ msgstr "Ezkerrera biratzeko debekua gehitzen die 4 edo 5 bide-multzoei"
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13211,6 +13621,9 @@ msgstr ""
"Irudi-fitxategiaren goiburuan GPS kokapenaren informazioa gehitzen du. "
"Ezaugarri hau ikusteko irudi-geruzan klik egin eskuineko botoian."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13238,9 +13651,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr "Aldaketa-multzoak"
@@ -13272,9 +13682,6 @@ msgstr ""
"gehienezko area-tamainak prozesua baldintzatu dezake. Gertuko nodoen bataz-"
"bestekoa ere egiten du."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13319,6 +13726,11 @@ msgstr ""
"Eraikinak marrazten ditu txekiar-katastroko mapa erabiliz. TracerServer "
"(.NET edo Mono) behar du ondo aritzeko."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13377,9 +13789,6 @@ msgstr ""
"Gidatu lasterketa-auto bat aire-irudien gainean A puntutik B-raino. Utzi "
"kaktusak atzean..."
-msgid "Highways"
-msgstr "Bideak"
-
msgid "Streets"
msgstr "Kaleak"
@@ -13464,6 +13873,9 @@ msgstr "Lubeta"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Ordainsaria"
+
msgid "Motorway Link"
msgstr "Autobide-lotura"
@@ -13554,6 +13966,50 @@ msgstr "Kalea"
msgid "Edit Residential Street"
msgstr "Hiriko-kalea"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "bai"
+
+msgid "no"
+msgstr "ez"
+
+msgid "destination"
+msgstr "norakoa"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Bizitegi-kalea"
@@ -13572,11 +14028,11 @@ msgstr "Azalera"
msgid "Service"
msgstr "Zerbitzu-bidea"
-msgid "Edit Serviceway"
-msgstr "Zerbitzu-bidea editatu"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Zerbitzu-bide mota"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "kalezuloa"
@@ -13587,6 +14043,9 @@ msgstr "sarrera-bidea (etxe, baserri eta abarrerantz)"
msgid "parking_aisle"
msgstr "aparkalekuetako-bidea"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Aparkalekuetako-bidea"
@@ -13614,18 +14073,12 @@ msgstr "errotonda"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "bai"
-
msgid "Road Restrictions"
msgstr "Trafikoaren murrizketak"
msgid "Edit Road Restrictions"
msgstr "Bidearen murrizketak editatu"
-msgid "Toll"
-msgstr "Ordainsaria"
-
msgid "No exit (cul-de-sac)"
msgstr "Irteera gabea (cul-de-sac)"
@@ -13635,9 +14088,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "norakoa"
-
msgid "delivery"
msgstr "banaketa"
@@ -13647,15 +14097,15 @@ msgstr "baimendua"
msgid "private"
msgstr "pribatua"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "nekazal"
msgid "forestry"
msgstr "baso"
-msgid "no"
-msgstr "ez"
-
msgid "official"
msgstr "ofiziala"
@@ -13701,6 +14151,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Zerbitzu-publikoko ibigailuak (ZPI)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Gutxieneko abiadura (km/o)"
@@ -13785,6 +14238,9 @@ msgstr "Zubia editatu"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13889,20 +14345,29 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "bikaina"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "ona"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "ertaina"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "txarra"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "oso txarra"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Gurpil-aulkiak"
@@ -13919,10 +14384,10 @@ msgstr "Dedikatutako ferra-bidea"
msgid "Edit Bridleway"
msgstr "Dedikatutako ferra-bidea editatu"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13958,7 +14423,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14027,12 +14492,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Larrialdietako telefonoa"
+msgid "Drinking Water"
+msgstr "Iturria (edateko ona)"
msgid "Traffic Signal"
msgstr "Semaforoa"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Oinezkoen bidegurutze mota"
@@ -14048,15 +14519,6 @@ msgstr "irla"
msgid "unmarked"
msgstr "markatugabea"
-msgid "Cross on horseback"
-msgstr "Zaldien bidegurutzea"
-
-msgid "Cross by bicycle"
-msgstr "Bizikleten bidegurutzea"
-
-msgid "Crossing attendant"
-msgstr "Bidegurutze-zaintzailea"
-
msgid "Crossing type name (UK)"
msgstr "Bidegurutze motaren izena (Erresuma Batua)"
@@ -14078,6 +14540,15 @@ msgstr "pegaso"
msgid "tiger"
msgstr "tigrea"
+msgid "Crossing attendant"
+msgstr "Bidegurutze-zaintzailea"
+
+msgid "Cross by bicycle"
+msgstr "Bizikleten bidegurutzea"
+
+msgid "Cross on horseback"
+msgstr "Zaldien bidegurutzea"
+
msgid "Stop"
msgstr "Gelditu"
@@ -14087,6 +14558,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Errotonda txikia"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Norabidea"
@@ -14096,11 +14570,8 @@ msgstr "erlojuaren norabidea"
msgid "Pedestrian Crossing"
msgstr "Oinezkoen pasabidea"
-msgid "Edit Crossing"
-msgstr "Pasabidea editatu"
-
-msgid "Type name (UK)"
-msgstr "Izen-mota (Erresuma batua)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Trafikoaren arinketa"
@@ -14132,9 +14603,6 @@ msgstr "taula"
msgid "Passing Place"
msgstr "Aurreratze-lekua"
-msgid "Edit Passing Place"
-msgstr "Aurreratze-lekua editatu"
-
msgid "Turning Circle"
msgstr "Biraketa-zirkulua"
@@ -14168,20 +14636,44 @@ msgstr ""
msgid "Barriers"
msgstr "Oztopoak"
-msgid "Bollard"
-msgstr "Bolardoa"
+msgid "Block"
+msgstr "Blokea"
-msgid "Edit Bollard"
-msgstr "Bolardoa editatu"
+msgid "Edit Block"
+msgstr ""
msgid "Allowed traffic:"
msgstr "Baimendutako trafikoa"
-msgid "Cycle Barrier"
+msgid "Material"
+msgstr "Materiala"
+
+msgid "stone"
+msgstr "harria"
+
+msgid "Bollard"
+msgstr "Bolardoa"
+
+msgid "Edit Bollard"
+msgstr "Bolardoa editatu"
+
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plastikoa"
+
+msgid "Cycle Barrier"
msgstr "Bizikletentzako oztopoa"
-msgid "Block"
-msgstr "Blokea"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena)"
@@ -14192,6 +14684,9 @@ msgstr "Hesi-kanadiarra (animaliek igaro ez dezaten jartzen dena) editatu"
msgid "Bus Trap"
msgstr "Autobusentzako tranpa"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Arantzak"
@@ -14213,19 +14708,34 @@ msgstr "Muga-kontrola editatu"
msgid "Hedge"
msgstr "Heskai"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Altuera (metrotan)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Hesia"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14234,23 +14744,52 @@ msgstr "postea"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Horma"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Harresia"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Euste-horma"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Erretena"
+msgstr ""
-msgid "Entrance"
-msgstr "Sarrera"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Sarrera editatu"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Atea"
@@ -14282,12 +14821,27 @@ msgstr "Ate-birakorra"
msgid "Edit Kissing Gate"
msgstr "Ate-birakorra editatu"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Eskailera (hesi edo langa gainetik pasatzeko)"
msgid "Edit Stile"
msgstr "Eskailera (hesi edo langa gainetik pasatzeko) editatu"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Tornua"
@@ -14345,6 +14899,9 @@ msgstr "Isurbidea"
msgid "Edit Drain"
msgstr "Isurbidea editatu"
+msgid "Ditch"
+msgstr "Erretena"
+
msgid "Edit Ditch"
msgstr "Erretena editatu"
@@ -14354,6 +14911,12 @@ msgstr "Errekastoa"
msgid "Edit Stream"
msgstr "Errekastoa editatu"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanala"
@@ -14393,9 +14956,6 @@ msgstr "Presa editatu"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14429,6 +14989,21 @@ msgstr "Estalitako urtegia editatu"
msgid "Edit Water"
msgstr "Urazala editatu"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Lurrazala"
@@ -14510,18 +15085,23 @@ msgstr "Ferry terminala editatu"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bizikleta"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14594,7 +15174,10 @@ msgstr "gune militarra"
msgid "tourism"
msgstr "turismoa"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14618,11 +15201,14 @@ msgstr "kontaktu-bidea"
msgid "rail"
msgstr "trenbidea"
-msgid "Voltage"
-msgstr "Tentsioa"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frekuentzia (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14633,9 +15219,6 @@ msgstr "Trenbide estua"
msgid "Edit Narrow Gauge Rail"
msgstr "Trenbide estua editatu"
-msgid "Types"
-msgstr "Motak"
-
msgid "Monorail"
msgstr "Monoraila"
@@ -14678,18 +15261,56 @@ msgstr "Erabilpenik gabeko trenbidea"
msgid "Edit Disused Railway"
msgstr "Erabilpenik gabeko trenbidea editatu"
-msgid "Optional Types"
-msgstr "Aukerako motak"
-
msgid "Abandoned Rail"
msgstr "Utzitako trenbidea"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Trenbide-pasagunea"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Pasagunea"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Pasabide mota"
@@ -14789,11 +15410,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14805,13 +15424,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Estazioa editatu"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pilona"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Pilona editatu"
+msgstr ""
msgid "Parking"
msgstr "Aparkalekua"
@@ -14828,12 +15445,12 @@ msgstr "kanpoan"
msgid "underground"
msgstr "lurrazpian"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Sarbidea"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr "Aparkatu eta gidatu"
@@ -14861,9 +15478,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Edukiera"
@@ -14879,19 +15493,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Irekiera-ordutegia"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Astelehenetik ostiralera 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -15041,6 +15671,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Tentsioa"
+
msgid "Amperage"
msgstr ""
@@ -15062,6 +15695,12 @@ msgstr "Konponketa"
msgid "Edit Car Repair"
msgstr "Autoen konponketa editatu"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15089,6 +15728,12 @@ msgstr "Alokairua"
msgid "Edit Car Rental"
msgstr "Alokairuko autoa editatu"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Partekatzea"
@@ -15113,22 +15758,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15150,9 +15779,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Arropak"
@@ -15216,8 +15842,8 @@ msgstr "Bizikleten alokairua editatu"
msgid "Public Transport"
msgstr ""
-msgid "Route"
-msgstr "Bidea"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Bidea editatu"
@@ -15347,6 +15973,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15377,6 +16006,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Jarlekua"
@@ -15389,9 +16021,6 @@ msgstr "Gurpildun aulkia"
msgid "limited"
msgstr "mugatua"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15401,8 +16030,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Estazioa"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Estazioa editatu"
msgid "Building"
msgstr "Eraikina"
@@ -15416,6 +16050,9 @@ msgstr "Metroaren sarrera editatu"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15440,14 +16077,6 @@ msgstr "Fideltasun edo deskontu txartelak"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Estazioa"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Estazioa editatu"
-
msgid "UIC-Reference"
msgstr "UIC-Erreferentzia"
@@ -15496,8 +16125,8 @@ msgstr "Autobusaren plataforma editatu"
msgid "Taxi"
msgstr "Taxia"
-msgid "Edit Taxi station"
-msgstr "Taxi-geltokia editatu"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Aireportua"
@@ -15550,6 +16179,21 @@ msgstr "Terminala"
msgid "Edit Terminal"
msgstr "Terminala editatu"
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "terminala"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -15572,31 +16216,16 @@ msgstr "Hotela editatu"
msgid "Stars"
msgstr "Izarrak"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
+msgid "Smoking"
msgstr ""
-msgid "wired"
+msgid "dedicated"
msgstr ""
-msgid "terminal"
-msgstr "terminala"
-
-msgid "Internet access fee"
+msgid "separated"
msgstr ""
-msgid "Smoking"
-msgstr ""
-
-msgid "dedicated"
-msgstr ""
-
-msgid "separated"
-msgstr ""
-
-msgid "isolated"
+msgid "isolated"
msgstr ""
msgid "Motel"
@@ -15770,6 +16399,12 @@ msgstr "Diskoteka"
msgid "Edit Nightclub"
msgstr "Diskoteka editatu"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turismoa"
@@ -15791,9 +16426,15 @@ msgstr "Zelata-dorrea"
msgid "Information Office"
msgstr "Informazio bulegoa"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Xehetasun-maila"
@@ -15806,6 +16447,9 @@ msgstr "kalea"
msgid "scheme"
msgstr "eskema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Erakutsitako ingurua"
@@ -15845,6 +16489,9 @@ msgstr "... beste garraio mota batzuk aukeran"
msgid "Information Board"
msgstr "Informazio-panela"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Iragarki-taula"
@@ -15866,23 +16513,35 @@ msgstr "landareak"
msgid "Guidepost"
msgstr "Informazio-zutoina"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Informazio-gunea"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Deskribapen zehatza"
msgid "Audioguide"
msgstr "Audiogida"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Telefono mugikor bidezko audiogida?"
msgid "Phone number"
msgstr "Telefono zenbakia"
-msgid "Other Information Points"
-msgstr "Beste informazio gune batzuk"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Aisia"
@@ -15905,9 +16564,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "hesia"
@@ -15932,8 +16588,17 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Asteartetik Igandera 08:00-15:00; Larunbatetan 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Jolastokia"
@@ -16005,50 +16670,44 @@ msgstr "Artelana"
msgid "Edit Artwork"
msgstr "Artelana editatu"
-msgid "Place of Worship"
-msgstr "Gurtze-lekua"
-
-msgid "Edit Place of Worship"
-msgstr "Gurtze-lekua editatu"
-
-msgid "Religion"
-msgstr "Erlijioa"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "bahaista"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "budista"
+msgid "audio"
+msgstr ""
-msgid "christian"
-msgstr "kristaua"
+msgid "video"
+msgstr ""
-msgid "hindu"
-msgstr "hindua"
+msgid "Place of Worship"
+msgstr "Gurtze-lekua"
-msgid "jain"
-msgstr "jainista"
+msgid "Church"
+msgstr "Eliza"
-msgid "jewish"
-msgstr "judu"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "musulman"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sij"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "espiritualista"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoista"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarismo"
+msgid "church"
+msgstr ""
-msgid "zoroastrian"
-msgstr "zoroastrika"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Sinesmena"
@@ -16065,6 +16724,12 @@ msgstr "katoliko"
msgid "evangelical"
msgstr "ebanjeliko"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Jehovaren lekukoak"
@@ -16077,6 +16742,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormoi"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxo"
@@ -16092,39 +16760,142 @@ msgstr "protestante"
msgid "quaker"
msgstr "kuakero"
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "xii"
msgid "sunni"
msgstr "suni"
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
msgstr ""
+msgid "Religion"
+msgstr "Erlijioa"
+
+msgid "bahai"
+msgstr "bahaista"
+
+msgid "jain"
+msgstr "jainista"
+
+msgid "sikh"
+msgstr "sij"
+
+msgid "spiritualist"
+msgstr "espiritualista"
+
+msgid "taoist"
+msgstr "taoista"
+
+msgid "unitarian"
+msgstr "unitarismo"
+
+msgid "zoroastrian"
+msgstr "zoroastrika"
+
msgid "Public Building"
msgstr "Eraikin-publikoa"
@@ -16212,6 +16983,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Osasuna"
@@ -16221,6 +16998,12 @@ msgstr "Ospitalea"
msgid "Edit Hospital"
msgstr "Ospitalea editatu"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Medikuak"
@@ -16287,12 +17070,66 @@ msgstr "Albaitaria"
msgid "Edit Veterinary"
msgstr "Albaitaria editatu"
-msgid "Note"
-msgstr "Oharra"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "publikoa"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Gutunontzia"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefonoa"
@@ -16302,6 +17139,30 @@ msgstr "Telefonoa editatu"
msgid "Telephone cards"
msgstr "Telefono-txartelak"
+msgid "Emergency Phone"
+msgstr "Larrialdietako telefonoa"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16311,31 +17172,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16363,8 +17230,8 @@ msgstr ""
msgid "Recycling"
msgstr "Birziklapena"
-msgid "Edit Recycling station"
-msgstr "Birziklatze-gunea editatu"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Bateria"
@@ -16390,29 +17257,17 @@ msgstr ""
msgid "Waste Basket"
msgstr "Paperontzia"
-msgid "Edit Waste Basket"
-msgstr "Paperontzia editatu"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Aulkiaren bizkarraldea"
-msgid "Material"
-msgstr "Materiala"
-
-msgid "stone"
-msgstr "harria"
-
-msgid "plastic"
-msgstr "plastikoa"
-
-msgid "Amount of Seats"
-msgstr "Jarleku kopurua"
+msgid "Amount of Seats"
+msgstr "Jarleku kopurua"
msgid "Edit Shelter"
msgstr "Aterpea editatu"
@@ -16445,14 +17300,17 @@ msgstr "Ehiza-postua editatu"
msgid "Height"
msgstr "Garaiera"
+msgctxt "height"
msgid "low"
-msgstr "baxua"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "erdia"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "beteta"
+msgstr ""
msgid "Hide"
msgstr "Ezkutatu"
@@ -16460,11 +17318,11 @@ msgstr "Ezkutatu"
msgid "Lock"
msgstr "Esklusa"
-msgid "Drinking Water"
-msgstr "Iturria (edateko ona)"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Iturria (edateko ona) editatu"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Suteentzako hidrantea"
@@ -16491,6 +17349,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16528,119 +17389,155 @@ msgstr "Estadioa"
msgid "Edit Stadium"
msgstr "Estadioa editatu"
-msgid "select sport:"
-msgstr "aukeratu kirola:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "kirola"
+msgid "Sport"
+msgstr "Kirola"
+msgctxt "sport"
msgid "multi"
-msgstr "multi"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "arku-tiroa"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletismoa"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "futbol australiarra"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "beisbola"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "saskibaloia"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "bola-jokoa"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "piragua"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "alpinismoa"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricketa"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "Saredun-cricketa"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croqueta"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "txirrindularitza"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "txakur-lasterketa"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "hipika"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golfa"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gimnasia"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hockeya"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "zaldi-lasterketa"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motorra"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "euskal pilota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "erraketa"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "tiro"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skate-a"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "patinajea"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "eskia"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "futbola"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "igeriketa"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "ping-pong-a"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenisa"
+msgstr ""
msgid "Sports Centre"
msgstr "Kiroldegia"
@@ -16672,26 +17569,27 @@ msgstr "Minigolfa"
msgid "Edit Miniature Golf"
msgstr "Minigolfa editatu"
-msgid "Sport"
-msgstr "Kirola"
-
msgid "Multi"
msgstr "Multi"
msgid "Edit Multi"
msgstr "Multi"
-msgid "type"
-msgstr "mota"
-
+msgctxt "running"
msgid "pitch"
-msgstr "zelaia"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "kiroldegia"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "estadioa"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16699,6 +17597,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "zelaia"
+
+msgid "sports_centre"
+msgstr "kiroldegia"
+
+msgid "stadium"
+msgstr "estadioa"
+
msgid "10pin"
msgstr "Bola-jokoa"
@@ -16732,6 +17639,22 @@ msgstr "Piraguismoa editatu"
msgid "Edit Cycling"
msgstr "Txirrindularitza editatu"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Txakur-lasterketak"
@@ -16744,9 +17667,34 @@ msgstr "Hipika"
msgid "Edit Equestrian"
msgstr "Hipika editatu"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
msgstr ""
+msgid "mud"
+msgstr "lokatza"
+
msgid "Horse Racing"
msgstr "Zaldi-lasterketak"
@@ -16763,7 +17711,7 @@ msgid "Skating"
msgstr "Patinajea"
msgid "Edit Skating"
-msgstr "Patinajea editatu"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16807,36 +17755,54 @@ msgstr "snowboard parkea"
msgid "Difficulty"
msgstr "Zailtasuna"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "hasiberria"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "erraza"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "aurreratua"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "aditua"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "pistatik kanpo"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16879,19 +17845,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17030,6 +17992,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -17042,60 +18016,134 @@ msgstr "Gizakiak eraikia"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Sarrera"
+
+msgid "Edit Entrance"
+msgstr "Sarrera editatu"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Dorrea"
@@ -17111,9 +18159,6 @@ msgstr "komunikazioa"
msgid "observation"
msgstr "behaketa"
-msgid "Height (meters)"
-msgstr "Altuera (metrotan)"
-
msgid "Flagpole"
msgstr ""
@@ -17323,157 +18368,147 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
msgstr ""
-msgid "Survey Point"
-msgstr "Erpin geodesikoa"
-
-msgid "Edit Survey Point"
-msgstr "Erpin geodesikoa"
-
-msgid "Surveillance"
-msgstr "Zaintza-kamera"
-
-msgid "Edit Surveillance Camera"
-msgstr "Zaintza-kamera editatu"
-
-msgid "indoor"
-msgstr "barruko"
-
-msgid "outdoor"
-msgstr "kanpoko"
-
-msgid "public"
-msgstr "publikoa"
-
-msgid "Power"
+msgid "Radiation"
msgstr ""
-msgid "Power Generator"
-msgstr "Energia-sorgailua"
+msgid "Seismic Activity"
+msgstr ""
-msgid "Edit Power Generator"
-msgstr "Energia sorgailua editatu"
+msgid "Recording:"
+msgstr ""
-msgid "biofuel"
+msgid "Automated"
msgstr ""
-msgid "biogas"
+msgid "Manually"
msgstr ""
-msgid "biomass"
+msgid "Remote"
msgstr ""
-msgid "diesel"
+msgid "Display:"
msgstr ""
-msgid "gasoline"
+msgid "Analog"
msgstr ""
-msgid "geothermal"
+msgid "Digital"
msgstr ""
-msgid "hydro"
-msgstr "hidrauliko"
+msgid "Survey Point"
+msgstr "Erpin geodesikoa"
-msgid "nuclear"
-msgstr "nuklear"
+msgid "Edit Survey Point"
+msgstr "Erpin geodesikoa"
-msgid "osmotic"
+msgid "Surveillance Camera"
msgstr ""
-msgid "solar"
-msgstr ""
+msgid "Edit Surveillance Camera"
+msgstr "Zaintza-kamera editatu"
-msgid "tidal"
+msgid "indoor"
+msgstr "barruko"
+
+msgid "outdoor"
+msgstr "kanpoko"
+
+msgid "Zone"
msgstr ""
-msgid "waste"
+msgid "parking"
msgstr ""
-msgid "wave"
+msgid "traffic"
msgstr ""
-msgid "wind"
-msgstr "haizea"
+msgid "shop"
+msgstr "denda"
-msgid "Method"
+msgid "bank"
msgstr ""
-msgid "anaerobic_digestion"
+msgid "Camera"
msgstr ""
-msgid "combustion"
+msgid "fixed"
msgstr ""
-msgid "dam"
+msgid "panning"
msgstr ""
-msgid "fission"
+msgid "dome"
msgstr ""
-msgid "fusion"
+msgid "Mounted on"
msgstr ""
-msgid "gasification"
+msgid "ceiling"
msgstr ""
-msgid "photovoltaic"
-msgstr "fotovoltaiko"
+msgid "Direction in degrees"
+msgstr ""
-msgid "pumped-storage"
+msgid "Inclination in degrees"
msgstr ""
-msgid "pumping"
+msgid "Height in meter (m)"
msgstr ""
-msgid "pyrolysis"
+msgid "Power"
msgstr ""
-msgid "run-of-the-river"
+msgid "Power Plant"
msgstr ""
-msgid "thermal"
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
msgstr ""
msgid "Output forms of energy"
msgstr ""
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
msgid "electricity"
msgstr ""
@@ -17510,14 +18545,243 @@ msgstr ""
msgid "vacuum"
msgstr ""
-msgid "battery charging"
-msgstr ""
-
-msgid "Power Station"
-msgstr "Zentral elektrikoa"
+msgid "Power Generator"
+msgstr "Energia-sorgailua"
-msgid "Edit Power Station"
-msgstr "Zentral elektrikoa editatu"
+msgid "Edit Power Generator"
+msgstr "Energia sorgailua editatu"
+
+msgid "biofuel"
+msgstr ""
+
+msgid "biogas"
+msgstr ""
+
+msgid "biomass"
+msgstr ""
+
+msgid "diesel"
+msgstr ""
+
+msgid "gasoline"
+msgstr ""
+
+msgid "geothermal"
+msgstr ""
+
+msgid "hydro"
+msgstr "hidrauliko"
+
+msgid "nuclear"
+msgstr "nuklear"
+
+msgid "osmotic"
+msgstr ""
+
+msgid "solar"
+msgstr ""
+
+msgid "tidal"
+msgstr ""
+
+msgid "waste"
+msgstr ""
+
+msgid "wave"
+msgstr ""
+
+msgid "wind"
+msgstr "haizea"
+
+msgid "Method"
+msgstr ""
+
+msgctxt "generator method"
+msgid "anaerobic_digestion"
+msgstr ""
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
+msgid "combustion"
+msgstr ""
+
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+
+msgctxt "generator method"
+msgid "fission"
+msgstr ""
+
+msgctxt "generator method"
+msgid "fusion"
+msgstr ""
+
+msgctxt "generator method"
+msgid "gasification"
+msgstr ""
+
+msgid "biomass / waste"
+msgstr ""
+
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
+
+msgctxt "generator method"
+msgid "pyrolysis"
+msgstr ""
+
+msgctxt "generator method"
+msgid "run-of-the-river"
+msgstr ""
+
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
+msgid "thermal"
+msgstr ""
+
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
+
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
+
+msgid "Generator Type"
+msgstr ""
+
+msgid "combined_cycle"
+msgstr ""
+
+msgid "gas combustion"
+msgstr ""
+
+msgid "francis_turbine"
+msgstr ""
+
+msgid "gas_turbine"
+msgstr ""
+
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
+
+msgid "heat_pump"
+msgstr ""
+
+msgid "horizontal_axis"
+msgstr ""
+
+msgid "tidal steam / wind"
+msgstr ""
+
+msgid "kaplan_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Azpiestazio elektrikoa"
@@ -17528,6 +18792,21 @@ msgstr "Azpiestazio elektrikoa editatu"
msgid "Line reference"
msgstr "Linearen erreferentzia"
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "baxua"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17543,6 +18822,9 @@ msgstr "Elektrizitate-dorrea editatu"
msgid "Tower reference"
msgstr "Dorrearen erreferentzia"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17561,11 +18843,9 @@ msgstr "Linea elektrikoa editatu"
msgid "Line type"
msgstr "Linea mota"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17674,11 +18954,11 @@ msgstr "Kioskoa"
msgid "Edit Kiosk"
msgstr "Kioskoa editatu"
-msgid "Baker"
-msgstr "Okindegia"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Okindegia editatu"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Harategia"
@@ -17689,7 +18969,7 @@ msgstr "Harategia editatu"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17710,14 +18990,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Produktu organikoen denda"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Produktu organikoen denda"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17788,7 +19074,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17809,13 +19095,13 @@ msgstr "Elektronika-denda editatu"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17824,9 +19110,8 @@ msgstr "HI-FI"
msgid "Edit Hifi Shop"
msgstr "HI-FI denda editatu"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Bideoa"
msgid "Edit Video Shop"
msgstr "Bideo-denda editatu"
@@ -17852,6 +19137,12 @@ msgstr "Diru-trukea editatu"
msgid "Edit Automated Teller Machine"
msgstr "Kutxazain automatikoa editatu"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17888,10 +19179,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "budista"
+
+msgid "christian"
+msgstr "kristaua"
+
+msgid "hindu"
+msgstr "hindua"
+
+msgid "jewish"
+msgstr "judu"
+
+msgid "muslim"
+msgstr "musulman"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17921,7 +19233,7 @@ msgstr "Burdindegia editatu"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17933,19 +19245,19 @@ msgstr "Altzari-denda editatu"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17966,6 +19278,12 @@ msgstr "Liburudenda"
msgid "Edit Book Store"
msgstr "Liburudenda editatu"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Bidaia-agentzia"
@@ -17975,7 +19293,7 @@ msgstr "Bidaia-agentzia editatu"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18056,6 +19374,9 @@ msgstr "jostailuak"
msgid "vouchers"
msgstr "Bonuak"
+msgid "Note"
+msgstr "Oharra"
+
msgid "Geography"
msgstr "Geografia"
@@ -18185,6 +19506,12 @@ msgstr "Mendi-tontorra"
msgid "Edit Peak"
msgstr "Mendi-tontorra editatu"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glaziarra"
@@ -18224,26 +19551,35 @@ msgstr "Zuhaitza"
msgid "Edit Tree"
msgstr "Zuhaitza editatu"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Izen-botanikoa"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Basoa"
msgid "Edit Wood"
msgstr "Basoa editatu"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "konifero"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "hostoerorkorra"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "misto"
msgid "Forest"
msgstr "Basoa"
@@ -18251,20 +19587,11 @@ msgstr "Basoa"
msgid "Edit Forest Landuse"
msgstr "Basoa editatu"
-msgid "coniferous"
-msgstr "konifero"
+msgid "Grassland"
+msgstr ""
-msgid "deciduous"
-msgstr "hostoerorkorra"
-
-msgid "mixed"
-msgstr "misto"
-
-msgid "Grassland"
-msgstr ""
-
-msgid "Edit Grassland"
-msgstr ""
+msgid "Edit Grassland"
+msgstr ""
msgid "pampas"
msgstr ""
@@ -18335,6 +19662,12 @@ msgstr "Belardia"
msgid "Edit Meadow Landuse"
msgstr "Belardia editatu"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Mahastia"
@@ -18389,8 +19722,8 @@ msgstr "Aisialdi-gunea"
msgid "Edit Recreation Ground Landuse"
msgstr "Aisialdi-gunea editatu"
-msgid "Residential area"
-msgstr "Bizitegi-gunea"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Bizitegi-gunea editatu"
@@ -18401,6 +19734,9 @@ msgstr "Hilerria (txikia)"
msgid "Edit Graveyard"
msgstr "Hilerria (txikia) editatu"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Hilerria"
@@ -18476,6 +19812,33 @@ msgstr "Harrobia editatu"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Helbideak editatu"
@@ -18494,30 +19857,6 @@ msgstr "Hiriaren izena"
msgid "Country code"
msgstr "Estatuaren kodea"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr ""
@@ -18536,6 +19875,18 @@ msgstr "bikoitia"
msgid "alphabetic"
msgstr "alfabetiko"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18698,26 +20049,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "errepidea"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "oinezkoa"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "xenda"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "desbideratzea"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Sinboloaren deskribapena"
@@ -18764,19 +20144,22 @@ msgstr "hurrengo geldialdi puntua"
msgid "backward halt point"
msgstr "aurreko geldialdi puntua"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18800,7 +20183,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18896,18 +20279,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "zubia"
msgid "deprecated"
msgstr "zaharkitua"
+msgid "bicycle"
+msgstr "bizikleta"
+
+msgid "foot"
+msgstr "oinezkoa"
+
msgid "horse"
msgstr "zaldia"
@@ -18917,8 +20309,11 @@ msgstr "oztopoa"
msgid "motorroad"
msgstr "autobidea"
-msgid "highway_track"
-msgstr "pista"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "zerbitzu-bidea"
@@ -18926,11 +20321,11 @@ msgstr "zerbitzu-bidea"
msgid "ford"
msgstr "ibi"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "Larrialdi-gunera sarrera"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "ibaiertza"
@@ -18947,6 +20342,9 @@ msgstr "ur-lasterrak"
msgid "railwaypoint"
msgstr "trenbide-puntua"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18962,29 +20360,29 @@ msgstr "utzitako bidea"
msgid "aeroway"
msgstr "aireko bidea"
-msgid "aeroway_dark"
-msgstr "aireko bidea (iluna)"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "aireko bidea (argia)"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "pista erraza"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "bitarteko-pista"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "pista aurreratua"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "adituentzako pista"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "estilo libreko pista"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "hasiberrientzako pista"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "energia"
@@ -19004,20 +20402,20 @@ msgstr "itsas-portua"
msgid "amenity"
msgstr "zerbitzuak"
-msgid "amenity_traffic"
-msgstr "zerbitzua_trafikoa"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "zerbitzua_argiztapena"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "ura (argia)"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "osasuna"
-msgid "shop"
-msgstr "denda"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotel"
@@ -19082,9 +20480,6 @@ msgstr "mendia"
msgid "woodarea"
msgstr "basoa"
-msgid "mud"
-msgstr "lokatza"
-
msgid "beach"
msgstr "hondartza"
@@ -19094,11 +20489,14 @@ msgstr "ibilbidea"
msgid "boundary"
msgstr "muga"
+msgid "sport"
+msgstr "kirola"
+
msgid "place"
msgstr "lekua"
-msgid "tiger_data"
-msgstr "TIGER_datuak"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr ""
@@ -19112,9 +20510,6 @@ msgstr "Herria"
msgid "One Way"
msgstr "Norabide bakarra"
-msgid "Church"
-msgstr "Eliza"
-
msgid "Fuel Station"
msgstr "Gasolindegia"
@@ -19142,6 +20537,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19187,10 +20585,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19202,7 +20630,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19220,7 +20648,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19337,19 +20765,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "width without physical linear feature"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19368,13 +20907,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19383,23 +20958,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19410,142 +20994,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "NRW Geofabrik.de kaleak"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (Zazpigarren Serieak) (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19561,13 +21194,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italia"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sizilia - Italia"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -19584,148 +21217,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19929,6 +21625,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19950,13 +21658,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20219,9 +21921,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20243,6 +21951,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20321,9 +22032,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20408,7 +22131,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20679,15 +22402,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20858,6 +22572,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20876,12 +22593,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21017,6 +22728,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21034,6 +22748,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -21114,113 +22831,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
msgstr ""
-msgid "Save image as PNG"
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21246,7 +22977,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21296,7 +23030,7 @@ msgstr ""
msgid "Color Schemes"
msgstr "Kolore-eskemak"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21341,6 +23075,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21413,64 +23150,111 @@ msgstr ""
msgid "Install"
msgstr ""
-msgid "Position only"
+msgid "Public"
msgstr ""
-msgid "Position, Time, Date, Speed"
+msgid "Could not get server response, check logs"
msgstr ""
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Failed to login as {0}:"
msgstr ""
-msgid "A By Time"
+msgid "The server did not return user ID"
msgstr ""
-msgid "A By Distance"
+msgid "Failed to send message:"
msgstr ""
-msgid "B By Time"
+msgid "Failed to get messages as {0}:"
msgstr ""
-msgid "B By Distance"
+msgid "GeoChat"
msgstr ""
-msgid "C By Time"
+msgid "Open GeoChat panel"
msgstr ""
-msgid "C By Distance"
+msgid "Zoom in to see messages"
msgstr ""
-msgid "Data Logging Format"
+msgid "Login"
msgstr ""
-msgid "Disable data logging if speed falls below"
+msgid "Enable autologin"
msgstr ""
-msgid "Disable data logging if distance falls below"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
msgstr ""
-msgid "Unknown logFormat"
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
+msgid "Position only"
+msgstr ""
+
+msgid "Position, Time, Date, Speed"
+msgstr ""
+
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr ""
+
+msgid "A By Time"
+msgstr ""
+
+msgid "A By Distance"
+msgstr ""
+
+msgid "B By Time"
+msgstr ""
+
+msgid "B By Distance"
msgstr ""
-msgid "Port:"
+msgid "C By Time"
msgstr ""
-msgid "refresh the port list"
+msgid "C By Distance"
msgstr ""
-msgid "Configure"
+msgid "Data Logging Format"
msgstr ""
-msgid "Configure Device"
+msgid "Disable data logging if speed falls below"
msgstr ""
-msgid "Connection Error."
+msgid "Disable data logging if distance falls below"
msgstr ""
-msgid "configure the connected DG100"
+msgid "Unknown logFormat"
msgstr ""
-msgid "delete data after import"
+msgid "Configure Device"
msgstr ""
msgid "Importing data from device."
@@ -21868,6 +23652,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22065,13 +23852,13 @@ msgid "Please select the imagery layer to adjust."
msgstr ""
msgid "Start adjusting"
-msgstr "Doiketa hasi"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
msgstr ""
msgid "No layers to adjust"
-msgstr "Ez dago doitzeko geruzarik"
+msgstr ""
msgid "Normal"
msgstr ""
@@ -22115,12 +23902,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -22130,16 +23911,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22502,9 +24280,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22559,9 +24334,31 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Bazkideen roletan oinarrituriko bazkideen zerrenda bat kopiatu egin da "
+"bide berri guztietan.<br>Baieztatu egin beharko zenuke hau eta zuzendu "
+"beharrezkoa denean.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Bazkideen zerrenda kopiatu egin da bide berri guztietan.<br>Baieztatu "
+"egin beharko zenuke hau eta zuzendu beharrezkoa denean.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22603,25 +24400,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Multipoligono bilakatu"
+msgid "Select OSM mirror URL to download from."
+msgstr ""
-msgid "Convert to multipolygon."
-msgstr "Multipoligono bilakatu."
+msgid "Base URL"
+msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22758,9 +24555,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22785,12 +24579,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22939,6 +24742,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22955,6 +24761,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23188,13 +25005,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23247,18 +25057,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23316,6 +25114,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23523,9 +25324,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23605,7 +25403,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23759,6 +25575,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23780,6 +25599,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24073,9 +25895,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24144,9 +25963,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24273,9 +26089,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24297,6 +26110,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24329,15 +26145,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Aldatu propietateak"
+
msgid "Country preset:"
msgstr ""
@@ -24347,6 +26179,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24449,9 +26284,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24567,6 +26399,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24627,19 +26462,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24777,6 +26612,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24852,6 +26690,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24867,9 +26794,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24891,6 +26815,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25043,9 +26970,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25671,7 +27595,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25679,10 +27606,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25691,18 +27615,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25745,15 +27657,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25875,18 +27778,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26064,9 +27955,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Bideoa"
-
msgid "Import Video"
msgstr "Bideoa inportatu"
@@ -26193,8 +28081,8 @@ msgstr "begizta"
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
-msgstr "Eskaneatutako mapa..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26216,9 +28104,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers ({0}) geruza {1} zoom-mailan"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Jaitsi bidea"
@@ -26356,9 +28241,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 142de49..47a1ded 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -2,26 +2,26 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2011-04-14 08:39+0000\n"
-"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-10-21 18:58+0000\n"
+"Last-Translator: reza <reza_khn at yahoo.com>\n"
"Language-Team: Persian <fa 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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 04:53+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:54+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: گزینه ها ''{1}'' مبهم است"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: گزینه ها ''--{1}'' استدلال اجازه نمی دهد"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: گزینه ها ''{1}{2}'' استدلال اجازه نمی دهد"
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
@@ -45,11 +45,26 @@ msgid "Invalid value {0} for parameter ''has_arg''"
msgstr ""
msgid "Background Terms of Use"
-msgstr ""
+msgstr "زمینه و شرایط استفاده"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr "خطا: {0}"
+
+msgid "WARNING: {0}"
+msgstr "هشدار: {0}"
+
+msgid "INFO: {0}"
+msgstr "اطلاعات: {0}"
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "درباره JOSM ..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr "لایه تصویر {0} را اضافه کنید"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr "ابزار: {0}"
msgid "Please select at least four nodes."
msgstr "حداقل چهار نقطه را انتخاب کنید."
-msgid "Information"
-msgstr "اطلاعات"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr "بارگیری"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "قبلی"
@@ -274,6 +292,9 @@ msgstr "بعدی"
msgid "Nothing selected to zoom to."
msgstr "چیزی برای بزرگنمایی انتخاب نشده است."
+msgid "Information"
+msgstr "اطلاعات"
+
msgid "Zoom to {0}"
msgstr "بزرگنمایی {0}"
@@ -330,10 +351,9 @@ msgstr ""
"برعكس شود؟"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"نميتوان مسيرها را ادغام نمود (قابليت ادغام آنها به يك رشته نقطه وجود ندارد)"
msgid "Combine {0} ways"
msgstr "{0} مسیر را ترکیب کن"
@@ -388,18 +408,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr "حذف اشياء انتخاب شده."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "توزيع نقاط"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "توزيع نقاط روى يك خط با فواصل مساوى"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "بارگذارى از OSM..."
msgid "Download map data from the OSM server."
msgstr "بارگذارى داده ها از سرور OSM"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "بارگذارى شئ ..."
@@ -494,6 +531,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "تاريخكم اطلاعات مسير، نقاط يا روابط OSM را نشان بده."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -607,7 +647,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -757,8 +797,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -915,8 +955,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -943,12 +983,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -966,9 +1002,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1075,6 +1108,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1125,9 +1167,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1189,6 +1228,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1263,13 +1305,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1358,6 +1400,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1382,9 +1445,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1580,6 +1640,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1589,6 +1652,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1608,6 +1683,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1658,25 +1758,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1819,6 +1900,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1843,8 +1927,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1860,6 +1944,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2266,6 +2353,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2426,13 +2516,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2441,6 +2531,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2459,8 +2552,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2546,6 +2638,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2582,10 +2677,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2608,8 +2703,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2713,6 +2808,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2773,8 +2871,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2804,10 +2902,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2828,6 +2926,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2858,18 +2959,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2878,8 +2979,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2887,13 +2988,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2907,8 +3006,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2938,11 +3037,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3093,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3201,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3220,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3236,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3277,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3301,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3360,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3436,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3505,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3562,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3600,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3737,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3812,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3842,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3869,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3935,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4055,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4251,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4269,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4281,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4340,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4367,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4667,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4704,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4756,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5013,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5541,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5624,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "نوع شئ:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "نوع شئ OSM را انتخاب كنيد"
+
+msgid "Object ID:"
+msgstr "ID شئ:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "ID شئ مورد بارگذارى را وارد كنيد"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5645,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5672,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5717,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5744,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5891,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6178,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6244,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6286,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6371,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6406,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6446,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6506,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6761,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6826,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6895,21 +7092,8 @@ msgstr ""
msgid "Download object"
msgstr "بارگذارى شئ"
-msgid "Object type:"
-msgstr "نوع شئ:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "نوع شئ OSM را انتخاب كنيد"
-
-msgid "Object ID:"
-msgstr "ID شئ:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "ID شئ مورد بارگذارى را وارد كنيد"
+msgid "Start downloading"
+msgstr "شروع به بارگذارى"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6919,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "شروع به بارگذارى"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7032,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7131,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7218,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7237,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7303,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7379,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7394,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7610,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7624,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7639,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7646,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7759,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7771,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7787,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7933,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7963,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8077,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8114,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8310,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8331,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8388,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8454,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8469,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8496,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8630,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8652,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8662,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8883,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8949,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9006,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9255,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9383,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9425,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9475,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9505,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9562,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9618,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9671,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9952,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10121,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10184,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10442,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10528,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10538,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10633,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10684,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10717,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10732,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10800,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10829,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10859,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10899,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11015,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11030,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11114,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11213,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11251,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11279,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11293,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11317,7 +11637,10 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
-msgid ""
+msgid "Reading was canceled"
+msgstr ""
+
+msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
msgstr ""
@@ -11366,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11510,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11528,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11552,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11573,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11587,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11617,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11651,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11725,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11874,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11892,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11976,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11992,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12316,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12337,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12371,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
msgstr ""
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12696,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12775,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12876,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12934,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12958,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12986,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13025,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13071,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13158,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13248,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13266,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13281,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13308,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13329,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13341,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13395,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13479,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13583,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13613,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13652,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13721,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13742,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13772,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13781,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13790,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13826,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13862,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13886,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13907,49 +14429,93 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
msgstr ""
msgid "Lift Gate"
@@ -13976,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14039,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14048,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14087,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14123,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14204,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14288,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14312,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14327,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14372,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14483,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14499,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14522,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14555,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14573,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14735,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14756,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14783,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14807,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14844,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14910,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15041,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15071,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15083,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15095,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15110,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15134,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15190,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15244,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15464,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15485,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15500,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15539,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15560,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15599,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15626,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15699,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15759,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15771,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15786,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15906,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15915,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15981,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15996,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16005,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16057,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16084,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16139,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16154,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16185,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16222,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16366,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16426,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16438,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16501,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16573,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16724,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16736,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
-msgid "apartments"
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
+msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16805,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17017,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17060,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17072,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17129,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
msgstr ""
-msgid "battery charging"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Power Station"
+msgid "Boiling Water Reactor 3 (BWR-3)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17222,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17237,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17255,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17368,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17383,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17404,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17482,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17503,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17518,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17546,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17582,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
+msgstr ""
+
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17627,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17660,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17669,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17750,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17879,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17918,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17945,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18029,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18083,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18095,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18170,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18230,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18392,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18458,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18494,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18590,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18611,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18620,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18641,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18656,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18698,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18776,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18788,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18806,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18836,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18881,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18896,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18914,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19031,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "map_type without information=map"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19062,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19077,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19104,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19278,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19623,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19644,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19913,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19937,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20015,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20102,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20373,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20552,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20570,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20711,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20728,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20808,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20940,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20990,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21035,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21092,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21146,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21562,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21809,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21824,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22196,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22253,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22297,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22452,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22479,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22633,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22649,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22882,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22941,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23010,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23217,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23299,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23453,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23474,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23767,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23838,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23967,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23991,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24023,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24041,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24143,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24261,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24321,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24471,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24546,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24561,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24585,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24737,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25365,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25373,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25385,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25439,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25569,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25758,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25887,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25907,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26042,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index 5b0bce6..8524fe8 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:08+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-10-20 22:13+0000\n"
+"Last-Translator: Lauri Kytömaa <Unknown>\n"
"Language-Team: Finnish <fi 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: 2013-04-05 04:40+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:40+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Linkkien avaaminen ei onnistu nykyisellä ohjelmisto-alustalla (\"{0}\")"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Alustetaan käyttöjärjestelmäyhteys"
@@ -154,20 +169,14 @@ msgid "About JOSM..."
msgstr "Tietoja JOSM:sta..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"VAROITUS: Odottamaton sovellusrajapinnan URL-perusosoitteen muoto. "
-"Uudelleenohjaus OSM-objektien info- ja historiasivuille tullee "
-"epäonnistumaan. Sovellusrajapinnan URL-perusosoite on \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"VAROITUS: Odottamaton sovellusrajapinnan URL-perusosoitteen muoto. "
-"Aiheuttanee uudelleenohjauksen toimimattomuutta OSM-alkioiden "
-"käyttäjätietosivuile. Sovellusrajapinnan URL-perusosoite on \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -213,6 +222,9 @@ msgstr "Ei kohdetasoja"
msgid "Add imagery layer {0}"
msgstr "Lisää kuvataso {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr "Valitse WMS-taso"
@@ -252,9 +264,6 @@ msgstr "Työkalu: {0}"
msgid "Please select at least four nodes."
msgstr "Valitse ainakin neljä solmua."
-msgid "Information"
-msgstr "Tiedot"
-
msgid "Align Nodes in Line"
msgstr "Aseta solmut suoralle"
@@ -279,6 +288,9 @@ msgstr "ristiriita"
msgid "download"
msgstr "lataukseen"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "edelliseen"
@@ -288,6 +300,9 @@ msgstr "seuraavaan"
msgid "Nothing selected to zoom to."
msgstr "Ei mitään valittuna näkymän sovittamiseksi"
+msgid "Information"
+msgstr "Tiedot"
+
msgid "Zoom to {0}"
msgstr "Sovita näkymä {0}"
@@ -343,11 +358,9 @@ msgstr ""
"Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Polkuja ei voitu yhdistää, koska niitä ei voitu yhdistää yhdeksi solmujen "
-"jonoksi."
msgid "Combine {0} ways"
msgstr "Yhdistä {0} polkua"
@@ -404,18 +417,38 @@ msgstr "Poista"
msgid "Delete selected objects."
msgstr "Poista valitut objektit."
+msgid "Toggle dialogs panel"
+msgstr "Näytä paneelit"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+"Näytä tai piilota oikean reunan muokkauspaneelit karttanäkymän "
+"maksimoimiseksi"
+
msgid "Distribute Nodes"
msgstr "Aseta solmut tasavälein"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Asettaa valitut solmut tasavälein viivan myötäisesti."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Lataa OSM:sta..."
msgid "Download map data from the OSM server."
msgstr "Lataa karttadataa OSM-palvelimelta."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
+
+msgid "Download data"
+msgstr "Lataa dataa"
+
msgid "Download object..."
msgstr "Lataa objekti..."
@@ -512,6 +545,9 @@ msgstr "Historia"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Näytä historiatietoja OSM-solmuista, -poluista tai -relaatioista."
+msgid "Show history"
+msgstr "Näytä historia"
+
msgid "History (web)"
msgstr "Historia (web)"
@@ -634,11 +670,9 @@ msgid "Joined overlapping areas"
msgstr "Yhdistettiin osittain päällekkäiset alueet"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Relaatioita, joihin jotkut poluista kuuluivat, on muutettu. Tarkista ettei "
-"syntynyt virheitä."
msgid "Fix tag conflicts"
msgstr "Korjaa tagikonflikteja"
@@ -794,11 +828,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Yhdistää valitut pisteet viimeisenä valittuun pisteeseen."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Valitse vähintään kaksi pistettä yhdistettäväksi tai piste joka on lähellä "
-"toista pistettä."
msgid "Abort Merging"
msgstr "Peruuta pisteiden yhdistäminen"
@@ -963,11 +995,9 @@ msgid "Download Data"
msgstr "Lataa dataa"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Lataaminen URL:sta \"{0}\" ei onnistu, koska soveltuvaa lataajaa ei "
-"löydy.</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1001,15 +1031,9 @@ msgid "Orthogonalize / Undo"
msgstr "Suorakulmaista / Peruuta"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Suorakulmaista muoto / Peruuta\n"
-"Valitse vain pisteitä joita viimeisin suorakulmaistus siirsi."
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Peruuta muodon suorakulmaistus"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1029,9 +1053,6 @@ msgstr "Suorakulmaista"
msgid "Usage"
msgstr "Käyttö"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Valittuja objekteja ei voi suorakulmaistaa"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1151,6 +1172,15 @@ msgstr "Nimeä myös tiedosto uudelleen"
msgid "Could not rename file ''{0}''"
msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr "Käännä polku"
@@ -1203,9 +1233,6 @@ msgstr "Lataa istunto"
msgid "Load a session from file."
msgstr "Lataa tallennetun istunton tiedostosta."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Istuntotiedosto (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Avaa istunto tiedostosta"
@@ -1270,6 +1297,9 @@ msgstr "Raportti"
msgid "Copy to clipboard and close"
msgstr "Kopioi leikepöydälle ja sulje"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Sulje"
@@ -1352,18 +1382,14 @@ msgstr ""
"pisteitä, jotka eivät ole polun päissä.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Roolin sisältävä relaatiojäsenyys kopioitiin kaikkiin uusin "
-"polkuihin.<br>Sinun tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Relaatiojäsenyydet kopioitiin kaikkiin uusiin polkuihin.<br>Sinun "
-"tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Katkaise polku {0} {1} osaksi"
@@ -1464,6 +1490,27 @@ msgstr ""
"Olet erottamassa kohteita joita ei ole täysin ladattu.<br>Tästä seurannee "
"ongelmia, koska et näe kohdetta oikein.<br>Haluatko varmasti erottaa kohteet?"
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Kumoa"
@@ -1488,9 +1535,6 @@ msgstr "Päivitä data"
msgid "Updates the objects in the active data layer from the server."
msgstr "Päivittää aktiivisen datatason kohteet palvelimelta."
-msgid "Download data"
-msgstr "Lataa dataa"
-
msgid "Update modified"
msgstr "Päivitä muokatut kohteet"
@@ -1539,9 +1583,14 @@ msgid ""
"require you subsequently have to revert your changes, or force other "
"contributors to.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Olet lähettämässä palvelimelle tason \"{0}\" tietoja.<br /><br />Tämän tason "
+"tietoja <b>ei pitäisi lähettää</b>. Jos jatkat lähettämistä,<br />joudut "
+"luultavasti perumaan kaikki muutoksesi palvelimella, tai muiden käyttäjien "
+"on pakko tehdä se puolestasi.<br /><br />Oletko varma että haluat jatkaa "
+"lähettämistä?"
msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Ohita tämä huomautus ja lähetä tiedot palvelimelle"
msgid "No changes to upload."
msgstr "Ei lähetettäviä muutoksia."
@@ -1690,6 +1739,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Hitaammin eteenpäin"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Ladataan GPS-dataa"
@@ -1699,6 +1751,18 @@ msgstr "Ladattu GPX-data"
msgid "Markers from {0}"
msgstr "Merkinnät: {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Ladataan dataa"
@@ -1719,6 +1783,31 @@ msgstr "Komento"
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "{0} uusi ristiriita."
+msgstr[1] "{0} uutta ristiriitaa."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Ristiriita ladatun kohteen kanssa"
+msgstr[1] "Ristiriitoja ladattujen kohteiden kanssa"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Ladataan pisteeseen {2} viittaavat objektit"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Ladataan polun {2} emoelementtejä"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Ladataan relaation {2} emoja"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Ladataan {0}/{1} ({2} jäljellä)"
@@ -1774,25 +1863,6 @@ msgstr "Massalatauksen aikana tapahtui seuraavat virheet: {0}"
msgid "Errors during download"
msgstr "Virheitä latauksen aikana"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "{0} uusi ristiriita."
-msgstr[1] "{0} uutta ristiriitaa."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Ristiriita ladatun kohteen kanssa"
-msgstr[1] "Ristiriitoja ladattujen kohteiden kanssa"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Ladataan pisteeseen {2} viittaavat objektit"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Ladataan polun {2} emoelementtejä"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Ladataan relaation {2} emoja"
-
msgid "Error during download"
msgstr "Virhe latauksen aikana"
@@ -1943,6 +2013,9 @@ msgstr "Tarkenna polkua"
msgid "Improve Way Accuracy mode"
msgstr "Polun nopeutettu tarkennus pisteitä siirtämällä/lisäämällä"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr "Napsauta valitaksesi korostettu polku parannettavaksi."
@@ -1973,10 +2046,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Solmua ei voi sijoittaa maailman ulkopuolelle."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Lisää uusi solmu, polun osaksi"
-msgstr[1] "Lisää uusi solmu osaksi {0} polkua"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Useampaan objektiin kuuluvaa solmua ei voi poistaa"
@@ -1990,6 +2063,9 @@ msgstr "Rinnakkainen"
msgid "Make parallel copies of ways"
msgstr "Tee poluista rinnakkaiskopiot"
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2049,9 +2125,10 @@ msgstr ""
msgid "Ctrl to merge with nearest node."
msgstr ""
+"Ctrl-näppäin painettuna piste yhdistetään lähimpään muuhun pisteeseen."
msgid "Release the mouse button to stop moving."
-msgstr ""
+msgstr "Vapauta hiiren painike lopettaaksesi pisteen siirtäminen."
msgid "Release the mouse button to stop rotating."
msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
@@ -2444,15 +2521,18 @@ msgid "''valuefragment'' nowhere in ''key''"
msgstr ""
msgid "''key'' with exactly ''value''"
-msgstr ""
+msgstr "Avaimen ''key'' arvo on täsmälleen ''value''"
msgid "''key'' with any value"
msgstr ""
msgid "''value'' in any key"
-msgstr ""
+msgstr "Arvo ''value'' minkä tahansa avaimen arvona"
msgid "matches if ''key'' exists"
+msgstr "Kohteet joilla on tagi avaimella ''key''"
+
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
msgid "combinators"
@@ -2489,7 +2569,7 @@ msgid "all closed ways"
msgstr "kaikki suljetut polut"
msgid "object without useful tags"
-msgstr ""
+msgstr "Kohteet joilla ei ole yhtään merkityksellistä tagia"
msgid "metadata"
msgstr "metadata"
@@ -2525,7 +2605,7 @@ msgid "closed ways with an area of 100 m²"
msgstr "suljettu polku jonka alue on 100 m²"
msgid "state"
-msgstr ""
+msgstr "tila"
msgid "all modified objects"
msgstr "kaikki muokatut kohteet"
@@ -2540,7 +2620,7 @@ msgid "all incomplete objects"
msgstr "kaikki keskeneräiset kohteet"
msgid "related objects"
-msgstr ""
+msgstr "emo- ja lapsikohteet"
msgid "all children of objects matching the expression"
msgstr "kaikki hakuehdot täyttävien kohteiden lapsikohteet"
@@ -2549,10 +2629,10 @@ msgid "all parents of objects matching the expression"
msgstr "kaikki hakuehdot täyttävien kohteiden emokohteet"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "Relaation n:s jäsen ja/tai polun n:s piste"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "Relaation joka n:s jäsen ja/tai polun joka n:s piste"
msgid "view"
msgstr "näkymä"
@@ -2625,14 +2705,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "''timestamp'':n jälkeen pitäisi olla <i>alaraja</i>/<i>yläraja</i>"
-msgid "Primitive id expected"
-msgstr "Olisi pitänyt olla objektin tunniste"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "Odotettiin muutoskokoelman tunnusta"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "Odotettiin versiota"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2642,6 +2722,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Tuntematon objektin tyyppi: {0}. Sallitut arvot ovat node, way ja relation"
+msgid "Primitive id expected"
+msgstr "Olisi pitänyt olla objektin tunniste"
+
msgid "Range of numbers expected"
msgstr "Odotettiin lukuväliä"
@@ -2660,10 +2743,8 @@ msgstr "JOKOTAI-operaattorilta puuttuu parametri"
msgid "Missing operator for NOT"
msgstr "EI-operaattorilta puuttuu parametri"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Varoitus: kohteen {1} tagin ''{0}'' arvo typistettiin automaattisesti"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2757,6 +2838,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Lisättiin {0} objekti"
msgstr[1] "Lisättiin {0} objektia"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Muuta pistettä {0}"
@@ -2793,11 +2877,11 @@ msgstr "Poista \"{0}\" {1} objektista."
msgid "Set {0}={1} for {2} objects"
msgstr "Aseta {0}={1} {2} objektille."
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Poista {0} arvoa {1} kohteesta"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Aseta {0} arvoa {1} kohteelle"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Korvaa \"{0}\" → \"{1}\" kohteelle"
@@ -2821,11 +2905,9 @@ msgid "Double conflict"
msgstr "Kaksinkertainen ristiriita"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Varoitus: Tasoa \"{0}\" ei enää ole olemassa. Ei voida poistaa objektin "
-"\"{1}\" konfliktia."
msgid "Add conflict for ''{0}''"
msgstr "Lisää ristiriita kohteelle {0}"
@@ -2940,6 +3022,9 @@ msgstr[1] "Pyyhittiin {0} kohdetta"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Selvitetään ristiriidat relaation {0} jäsenluettelossa"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Kierrä {0} pistettä"
@@ -3000,11 +3085,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Jotta polun kääntäminen ei vääristäisi karttadataa, suositellaan seuraavia "
-"muutoksia polun ja sen pisteiden ominaisuuksiin."
msgid "Relation"
msgstr "Relaatio"
@@ -3033,11 +3116,11 @@ msgstr "Toteuta valitut muutokset"
msgid "Do not apply changes"
msgstr "Älä toteuta muutoksia"
-msgid "Please select which property changes you want to apply."
-msgstr "Valitse toteutettavat ominaisuuksien muutokset."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Ominaisuudet: "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Roolit relaatioissa, jotka viittavat"
@@ -3060,6 +3143,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Vanhan varmuuskopion poisto ei onnistu {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Virhe poistetun tason varmuuskopion luonnissa {0}"
@@ -3090,22 +3176,20 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Varoitus: välimuistihakemiston luominen ei onnistunut: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
"<html>Puuttuvan välimuistihakemiston luominen ei onnistunut: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Varoitus: asetusten tallennus tiedostoon \"{0}\" epäonnistui"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Varoitus: Asetusten alustaminen epäonnistui. Asetushakemisto \"{0}\" ei ole "
-"hakemisto."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3115,11 +3199,9 @@ msgstr ""
"hakemisto.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Varoitus: Asetusten alustaminen epäonnistui. Puuttuvaa asetushakemistoa ei "
-"voitu luoda: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3128,16 +3210,12 @@ msgstr ""
"<html>Asetusten alustaminen epäonnistui.<br>Puuttuvaa asetushakemistoa ei "
"voitu luoda: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Varoitus: Asestustiedosto \"{0}\" korvataan oletusmuotoisella "
-"asetustiedostolla."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3154,11 +3232,9 @@ msgstr ""
"<br>{0}<br> ja luodaan uusi oletusarvoinen asetustiedosto.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Varoitus: asetusten alustus epäonnistui. Myös oletusasetustiedoston käyttö "
-"epäonnistui: {0}"
msgid "Paint style {0}: {1}"
msgstr "Piirtotyyli {0}: {1}"
@@ -3187,14 +3263,11 @@ msgstr "Resurssin \"{0}\" lataus epäonnistui. Virhe on {1}"
msgid "UNKNOWN"
msgstr "TUNTEMATON"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Varoitus: luettiin odottamaton JOSM:n versionumero asennustiedoista. Arvo "
-"oli \"{0}\""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Varoitus: versiotiedosto \"/REVISION\" puuttuu"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Objektille \"{0}\" on jo rekisteröity ristiriita"
@@ -3359,10 +3432,8 @@ msgstr "Objektin \"{0}\" versiota ei voi verrata alkion \"{1}\" versioon."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parametri {0} ei ole välillä 0..{1}. Saatiin ”{2}”."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Virhe: kartanpiirtoluokan ''{0}'' lataaminen ei onnistunut. Luokkaa ei löydy."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3474,7 +3545,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3493,6 +3564,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3509,10 +3583,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Virhe: tietovirran avaaminen ei onnistunut resurssille \"/data/{0}\"."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3553,6 +3623,9 @@ msgstr "muut tarkistukset"
msgid "Running test {0}"
msgstr "Ajetaan testiä {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Osoitteet"
@@ -3577,6 +3650,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr "Talo talon sisällä"
@@ -3638,15 +3720,15 @@ msgstr " tai "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} sijaan kehotetaan nykyään käyttämään {1}"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Päällekkäiset pisteet"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Päällekkäiset pisteet kahdessa polussa"
-
msgid "Mixed type duplicated nodes"
msgstr "Päällekkäiset pisteet erilaisissa poluissa"
@@ -3716,6 +3798,24 @@ msgstr "Polkujen pisteiden kaksoiskappaleet"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Etsii polkuja, joissa sama piste toistuu useasti peräkkäin"
+msgid "Highways"
+msgstr "Väylät"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Monimonikulmio"
@@ -3793,6 +3893,12 @@ msgstr ""
"Etsii pisteet joilla keskenään sama nimi (mahdollisesti turhia "
"kaksoiskappaleita)"
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "Päällekkäiset alueet"
@@ -3850,15 +3956,15 @@ msgstr "Tarkistin ei tunne relaation type-tagia"
msgid "Relation is empty"
msgstr "Relaatiossa ei ole jäseniä"
+msgid "Role verification problem"
+msgstr "Ongelma relaation rooleissa"
+
msgid "<empty>"
msgstr "<tyhjä>"
msgid "Role {0} missing"
msgstr "Ei yhtään jäsentä roolissa {0}"
-msgid "Role verification problem"
-msgstr "Ongelma relaation rooleissa"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Roolissa {0} on liian vähän relaatiojäseniä ({1})"
@@ -3891,11 +3997,11 @@ msgid ""
msgstr ""
"Etsii keskenään lähes samannimisiä polkuja; mahdollisesti kirjoitusvirheitä."
-msgid "Properties checker :"
-msgstr "Ominaisuustarkistin:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Etsii virheellisiä avain/arvo-pareja."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Epäkelpo tagin tarkistussääntö - {0}: {1}"
@@ -4037,8 +4143,8 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)."
-msgid "Fix properties"
-msgstr "Tarkistin: korjaus tageihin"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Elementin tyyppi puuttuu"
@@ -4116,6 +4222,9 @@ msgid "This tests if ways which should be circular are closed."
msgstr ""
"Etsii polkuja, joiden pitäisi tagiensa perusteella olla suljettuja alueita."
+msgid "Unclosed way"
+msgstr "Sulkematon alue"
+
msgid "natural type {0}"
msgstr "tyyppiä natural {0}"
@@ -4146,9 +4255,6 @@ msgstr "rakennus"
msgid "area"
msgstr "alue"
-msgid "Unclosed way"
-msgstr "Sulkematon alue"
-
msgid "Unconnected ways"
msgstr "Puuttuva yhteys polun päästä"
@@ -4173,12 +4279,12 @@ msgstr "Irralliset pisteet ilman tageja"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "Etsii tagittomia pisteitä jotka eivät ole osa mitään polkua."
-msgid "No tags"
-msgstr "Ei tageja"
-
msgid "Unconnected nodes without physical tags"
msgstr "Irralliset pisteet ilman fyysisiä kohteita kuvaavia tageja"
+msgid "No tags"
+msgstr "Ei tageja"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Jossain tagissa ''fixme'' tai ''FIXME''"
@@ -4241,27 +4347,6 @@ msgstr "Rantaviiva väärin päin: maan pitää olla polun vasemmalla puolella."
msgid "Reversed land: land not on left side"
msgstr "Maa-alue väärin päin: maan pitää olla polun vasemmalla puolella."
-msgid "Wrong number of arguments for bookmark"
-msgstr "Kirjanmerkillä on väärä määrä parametreja"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Virhe luettaessa kirjanmerkkiä: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Virhe: Odottamaton rivi \"{0}\" kirjanmerkkitiedostossa \"{1}\""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Virhe: Virheellinen double-liukuluku \"{0}\" kirjanmerkkitiedoston \"{2}\" "
-"rivillä \"{1}\""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Kirjanmerkkejä ei voitu lukea tiedostosta<br>\"{0}\"<br>Virhe oli: "
-"{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Älä näytä uudestaan (muistaa valinnan)"
@@ -4365,7 +4450,7 @@ msgstr "Näytä ohje"
msgid "Downloading \"Message of the day\""
msgstr "Ladataan \"Päivän viestiä\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4572,9 +4657,24 @@ msgstr "Näytä"
msgid "Tools"
msgstr "Työkalut"
+msgid "More tools"
+msgstr "Lisää työkaluja"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Valinta"
+
msgid "Presets"
msgstr "Esivalinnat"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr "Ikkunat"
@@ -4588,12 +4688,24 @@ msgid "Edit toolbar"
msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
+msgstr "Näytä tai piilota vasemman reunan työkalupalkki"
+
+msgid "Preset preferences"
msgstr ""
-msgid "Audio"
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
+msgid "Audio"
msgstr "Ääni"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4602,6 +4714,9 @@ msgstr "Piilota tämä painike"
msgid "Click the arrow at the bottom to show it again."
msgstr "Napsauta alhaalla olevaa nuolta näyttääksesi sen uudestaan."
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr "Näytä tai piilota tämä painike"
@@ -4663,6 +4778,9 @@ msgstr "(ei objektia)"
msgid "User:"
msgstr "Käyttäjä:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "taso ei ole listassa."
@@ -4690,19 +4808,6 @@ msgstr "Taustalle"
msgid "Click to run job in background"
msgstr "Napsauta suorittaaksesi työ taustalla"
-msgid "false: the property is explicitly switched off"
-msgstr "epätosi: asetus on pois päältä"
-
-msgid "true: the property is explicitly switched on"
-msgstr "tosi: asetus on päällä"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "osittainen: valituilla objekteilla on eri arvoja, älä muuta"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "pois päältä: älä aseta tätä ominaisuutta valituille kohteille"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -5008,6 +5113,9 @@ msgstr "alas"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "Kopioi valitut omat kohteet yhdistelmälistan alapäähän"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5015,6 +5123,9 @@ msgstr ""
"Kopioi valitut omat kohteet ensimmäisen yhdistelmälistalta valitun kohteen "
"edelle"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5022,14 +5133,23 @@ msgstr ""
"Kopioi valitut omat kohteet ensimmäisen yhdistelmälistalta valitun kohteen "
"perään"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "Kopioi valitut muiden kohteet yhdistelmälistan yläpäähän"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "Kopioi valitut muiden kohteet yhdistelmälistan alapäähän"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5037,6 +5157,9 @@ msgstr ""
"Kopioi valitut muiden kohteet ensimmäisen yhdistelmälistalta valitun kohteen "
"edelle"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5053,8 +5176,8 @@ msgstr "Kopioi kaikki muiden kohteet yhdistelmään"
msgid "Up"
msgstr "Ylös"
-msgid "Move up the selected elements by one position."
-msgstr "Siirrä valittuja elementtejä yksi rivi ylöspäin"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Alas"
@@ -5109,16 +5232,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Muitten versio ({0} rivi)"
msgstr[1] "Muitten versio ({0} riviä)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Muokattava {0} on vielä rekisteröimättä. Sitä ei voida ottaa mukaan "
-"synkronoituun muokkaukseen."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Muokattava {0} on vielä rekisteröimättä."
-
msgid "Node"
msgstr "Piste"
@@ -5378,16 +5491,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Avain:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Syötä tagin avain, t.s. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
msgid "Value:"
msgstr "Arvo:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Syötä tagin arvo, t.s. <strong><tt>tarkista arvot</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5974,6 +6086,9 @@ msgstr "Näytä/piilota"
msgid "Information about layer"
msgstr "Tietoja tasosta"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Kartanpiirtotyylit"
@@ -6057,6 +6172,36 @@ msgstr "Piirtotyyli on aktivoitu?"
msgid "No"
msgstr "Ei"
+msgid "Object type:"
+msgstr "Objektin tyyppi:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "yhdistelmä"
+
+msgid "Choose the OSM object type"
+msgstr "Valitse objektin tyyppi"
+
+msgid "Object ID:"
+msgstr "Ohjektitunniste:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Anna ladattavan objektin tunniste"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Objektitunnisteet voi erotella pilkulla tai välilyönnillä.<br/>Esimerkki: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Yhdistelmätilassa "
+"määrittele objektit näin: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relaatiot"
@@ -6078,9 +6223,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relaatiot: {0} kpl"
-msgid "Selection"
-msgstr "Valinta"
-
msgid "Open a selection list window."
msgstr "Avaa valintaikkuna."
@@ -6105,18 +6247,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Valinta: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr "Dynaamiset painikkeet päälle/pois"
@@ -6135,6 +6265,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Tekijät"
@@ -6152,11 +6294,8 @@ msgstr "Valitse käyttäjän viimeksi muokkaamat kohteet"
msgid "Launches a browser with information about the user"
msgstr "Avaa käyttäjän tiedot www-selaimessa"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Vain ensimmäisten {0}:n valitun käyttäjän tietosivu avataan (valittuna on "
-"{1})"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6183,9 +6322,6 @@ msgstr "Avaa tarkistusikkuna."
msgid "Validation results"
msgstr "Tarkistimen tulokset"
-msgid "Zoom to problem"
-msgstr "Näytä ongelmakohta"
-
msgid "Fix"
msgstr "Korjaa"
@@ -6335,9 +6471,6 @@ msgstr "Päivitä sisältö"
msgid "Update the changeset content from the OSM server"
msgstr "Päivitä muutoskokoelman sisältö OSM-palvelimelta"
-msgid "Show history"
-msgstr "Näytä historia"
-
msgid "Download and show the history of the selected objects"
msgstr "Hae ja näytä valittujen kohteiden muutoshistoria"
@@ -6655,11 +6788,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Lataa muutoskokoelmat nykyisen karttanäkymän alueelta</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Varoitus: odottamaton arvo asetuksella \"{0}\", arvo \"{1}\" . Käytetään "
-"oletusarvoa."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6727,35 +6858,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Tämä URL ei ole kelvollinen."
-msgid "Select objects for which to change properties."
-msgstr "Valitse kohteet joiden ominaisuuksia haluat muokata."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Ominaisuudet/jäsenyydet"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Valittujen objektien ominaisuudet."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<eri>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Jäsenyydet"
msgid "Position"
msgstr "Sijainti"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Ominaisuudet / Jäsenyydet"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Poista valittu avain kaikista objekteista"
-msgid "Delete Properties"
-msgstr "Poista asetukset"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Muuta relaatiota"
@@ -6769,14 +6912,14 @@ msgstr "Poistetaanko valinta relaatiosta {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
-msgid "Add Property"
-msgstr "Lisää tagi"
+msgid "Add Tag"
+msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
-msgid "Edit Properties"
-msgstr "Muokkaa tagia"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Avaa tagin tietosivu OSM-wikistä. (F1)"
@@ -6859,12 +7002,6 @@ msgstr[1] "Muuta jopa {0} kohteen tageja"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr "Lisää tagi"
@@ -6894,9 +7031,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6936,9 +7079,8 @@ msgstr "Relaatio on poistettu"
msgid "Downloading relation {0}"
msgstr "Ladataan relaatio {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Varoitus: poikkeus ohitetaan, koska tehtävä oli jo peruttu. Poikkeus: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7000,6 +7142,9 @@ msgstr "Poista ne, siivoa relaatio"
msgid "Ignore them, leave relation as is"
msgstr "Ei mitään, jätä relaatio silleen"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7283,6 +7428,27 @@ msgstr "polku on yhteydessä seuraavaan relaatiojäseneen"
msgid "way is not connected to previous or next relation member"
msgstr "polku ei ole yhteydessä edeltävään eikä seuraavaan relaatiojäseneen"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Kirjanmerkillä on väärä määrä parametreja"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Virhe luettaessa kirjanmerkkiä: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Kirjanmerkkejä ei voitu lukea tiedostosta<br>\"{0}\"<br>Virhe oli: "
+"{1}</html>"
+
msgid "Bookmarks"
msgstr "Kirjanmerkit"
@@ -7353,9 +7519,6 @@ msgstr "Leveyspiirin arvo välillä [-90,90] tarvitaan."
msgid "Value for longitude in range [-180,180] required."
msgstr "Pituuspiirin arvo välillä [-180,180] tarvitaan."
-msgid "Paste URL from clipboard"
-msgstr "Liitä URL leikepöydältä"
-
msgid "Data Sources and Types:"
msgstr "Ladattavat tiedot:"
@@ -7433,21 +7596,8 @@ msgstr "Lataa viittaavat kohteet (emorelaatiot)"
msgid "Download object"
msgstr "Lataa objekti"
-msgid "Object type:"
-msgstr "Objektin tyyppi:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "yhdistelmä"
-
-msgid "Choose the OSM object type"
-msgstr "Valitse objektin tyyppi"
-
-msgid "Object ID:"
-msgstr "Ohjektitunniste:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Anna ladattavan objektin tunniste"
+msgid "Start downloading"
+msgstr "Aloittaa latauksen"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7459,26 +7609,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Valitse, jos haluat että myös ladattavan relaation jäsenet ladataan."
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Objektitunnisteet voi erotella pilkulla tai välilyönnillä.<br/>Esimerkki: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Yhdistelmätilassa "
-"määrittele objektit näin: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Lataa viittaavat objektit (emorelaatiot ja -polut)"
-msgid "Start downloading"
-msgstr "Aloittaa latauksen"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr "Karttakohteen tyyppi"
@@ -7593,9 +7726,8 @@ msgstr "Siirry seuraavalle sivulle"
msgid "Go to the JOSM help home page"
msgstr "Siirry JOSMin ohjesivujen etusivulle"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
-"Varoitus: siirtymä ohjesivun sisällä ei onnistunut. Poikkeus oli: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Ohjesivun avaaminen ei onnistu. Kohteen URL-osoite on tyhjä."
@@ -7700,6 +7832,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>Versio <strong>{0}</strong> luotu <strong>{1}</strong><html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Muutoskokoelman tiedot"
@@ -7810,7 +7945,7 @@ msgstr ""
msgid "Object still in use"
msgstr "Kohteeseen on yhä muita viittauksia"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7829,6 +7964,12 @@ msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
msgid "Enter an upload comment"
msgstr "Kirjoita muutoksia kuvaava kommentti"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Muutoskokoleman id:"
@@ -7898,8 +8039,7 @@ msgid "Closing changeset {0}"
msgstr "Muutoskokoelmaa {0} suljetaan"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7978,8 +8118,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7993,8 +8133,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -8225,12 +8364,6 @@ msgstr "Lähetä muutokset"
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8239,6 +8372,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -8254,6 +8403,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Peruuta lähetys ja jatka muokkausta"
@@ -8261,8 +8425,8 @@ msgid "Tags of changeset {0}"
msgstr "Muutoskokoelman {0} tagit"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -8392,9 +8556,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Lähetetään {0} kohde..."
@@ -8404,6 +8565,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8424,7 +8588,7 @@ msgstr "Valitse lähetettävät objektit"
msgid "Cancel uploading"
msgstr "Peruuta lähetys"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8574,7 +8738,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8604,7 +8768,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8723,6 +8887,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8762,6 +8929,9 @@ msgstr "Päivitä virheelliset kuvapalat"
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8963,9 +9133,6 @@ msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
msgid "Starting directory scan"
msgstr "Tutkii hakemistoa"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Luetaan kuvia..."
@@ -8984,6 +9151,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Geo-merkityt kuvat"
@@ -9041,6 +9211,12 @@ msgstr "Seuraava"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Keskitä näkymä"
@@ -9113,9 +9289,6 @@ msgstr ""
"<html>Upload of unprocessed GPS data as map data is considered "
"harmful.<br>If you want to upload traces, look here:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -9128,10 +9301,13 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
+msgid "Select to download OSM data."
+msgstr ""
-msgid "Download everything within:"
+msgid "Select to download GPS traces."
+msgstr ""
+
+msgid "Download everything within:"
msgstr "Lataa kaikki alueella:"
msgid "{0} meters"
@@ -9155,14 +9331,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9290,14 +9469,10 @@ msgstr ""
msgid "(URL was: "
msgstr "(URL oli: "
-msgid "Error displaying URL"
-msgstr "Virhe näytettäessä URL:ia"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -9312,7 +9487,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -9322,8 +9497,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9543,7 +9717,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9609,6 +9783,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9666,9 +9846,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9923,6 +10100,9 @@ msgstr ""
"JOSM on käynnistettävä uudelleen, jotta jotkin asetukset voidaan ottaa "
"käyttöön."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Etähallinta"
@@ -10051,6 +10231,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -10093,6 +10279,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Datantarkistin"
@@ -10145,19 +10334,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -10175,40 +10355,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
-msgstr "Nykyinen arvo on oletusarvo."
+msgid "shortcut"
+msgstr ""
-msgid "Default value is ''{0}''."
-msgstr "Oletusarvo on ''{0}''."
+msgid "color"
+msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -10232,6 +10421,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Nykyinen arvo on oletusarvo."
+
+msgid "Default value is ''{0}''."
+msgstr "Oletusarvo on ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -10288,6 +10510,9 @@ msgstr "Piirrä virtuaalipisteet valintatilassa"
msgid "Draw inactive layers in other color"
msgstr "Piirrä epäaktiiviset tasot eri värillä"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "Korosta pisteet ja polut hiirikursorin alla"
@@ -10348,6 +10573,11 @@ msgstr ""
"Tämä asetus pakottaa alueiden piirtämisen vain reunaviivan piirtämiseksi. "
"Tämä ohittaa piirtotyylissä valitut alueiden täytöt."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr "Asetukset, jotka vaikuttavat piirron nopeuteen"
@@ -10581,6 +10811,8 @@ msgstr ""
msgid ""
"Display buttons in right side menus only when mouse is inside the element"
msgstr ""
+"Näytä oikean reunan paneeleissa painikkeet vain silloin, kun kursori on "
+"paneelin alueella."
msgid "Look and Feel"
msgstr "Ulkoasu ja käyttötuntuma"
@@ -10645,7 +10877,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10825,6 +11063,12 @@ msgstr ""
"nimeen lisätään \"~\" ja se tallennetaan samaan kansioon kuin \"oikea\" "
"tiedosto.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Automaattitallennus"
@@ -10890,8 +11134,8 @@ msgstr "Kartta-asetukset"
msgid "Settings for the map projection and data interpretation."
msgstr "Karttaprojektion ja datatulkinnan asetukset."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11152,21 +11396,6 @@ msgstr "Swiss Grid (Sveitsi)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (ilman paikalliskorjauksia)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM-alue"
-
-msgid "North"
-msgstr "Pohjoinen"
-
-msgid "South"
-msgstr "Etelä"
-
-msgid "Hemisphere"
-msgstr "Pallonpuolisko"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11188,6 +11417,21 @@ msgstr "UTM Ranska (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM-karttajärjestelmä"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM-alue"
+
+msgid "North"
+msgstr "Pohjoinen"
+
+msgid "South"
+msgstr "Etelä"
+
+msgid "Hemisphere"
+msgstr "Pallonpuolisko"
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -11238,8 +11482,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11248,20 +11492,25 @@ msgstr "OSM-käyttäjänimi:"
msgid "OSM password:"
msgstr "OSM-salasana:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -11346,16 +11595,10 @@ msgid "Use a SOCKS proxy"
msgstr "Käytä SOCKS-välityspalvelinta"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-msgid "disabled"
-msgstr "pois käytöstä"
-
-msgid "no modifier"
-msgstr "ei muuttujaa"
-
msgid "Shortcut Background: User"
msgstr ""
@@ -11397,32 +11640,37 @@ msgstr "Poista tagi-listasta valittu sisältö"
msgid "Add a new tag"
msgstr "Lisää tagi"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Käytä esivalintaa ”{0}”"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Muuta {0} objekti"
+msgstr[1] "Muuta {0} objektia"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Ei mitään valittuna!"
+
+msgid "Selection unsuitable!"
+msgstr "Valinta ei ole sopiva!"
+
+msgid "Apply Preset"
+msgstr "Aseta esivalinnan tagit"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "Lisää tietoja tästä ominaisuudesta"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11430,6 +11678,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Lisää tietoja tästä ominaisuudesta"
+
msgid "Available roles"
msgstr ""
@@ -11445,59 +11696,61 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Lisäominaisuudet:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
-
-msgid "Use preset ''{0}''"
-msgstr "Käytä esivalintaa ”{0}”"
-
-msgid "Unknown type: {0}"
-msgstr "Tuntematon tyyppi: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Error parsing {0}: "
-msgstr "Virhe käsiteltäessä {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Muuta {0} objekti"
-msgstr[1] "Muuta {0} objektia"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Ei mitään valittuna!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Valinta ei ole sopiva!"
+msgid "Unknown type: {0}"
+msgstr "Tuntematon tyyppi: {0}"
-msgid "Apply Preset"
-msgstr "Aseta esivalinnan tagit"
+msgid "Preset group {1} / {0}"
+msgstr ""
-msgid "New relation"
+msgid "Preset group {0}"
msgstr ""
-msgid "Change Properties"
-msgstr "Muuta ominaisuuksia"
+msgid "Roles cannot appear more than once"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "Virhe käsiteltäessä {0}: "
+
msgid "Search preset"
msgstr "Etsi vaihtoehdoista"
@@ -11513,7 +11766,17 @@ msgstr "Näytä vain nykyiseen valintaan sopivat vaihtoehdot"
msgid "Search in tags"
msgstr "Etsi myös esivalinnoissa käytetyistä tageista"
-msgid "All files (*.*)"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Muokattava {0} on vielä rekisteröimättä. Sitä ei voida ottaa mukaan "
+"synkronoituun muokkaukseen."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Muokattava {0} on vielä rekisteröimättä."
+
+msgid "All files (*.*)"
msgstr ""
msgid "Min. latitude"
@@ -11544,6 +11807,51 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr "Arvo ei ole OSM ID-numero. Anna positiivinen kokonaisluku."
+msgid "false: the property is explicitly switched off"
+msgstr "epätosi: asetus on pois päältä"
+
+msgid "true: the property is explicitly switched on"
+msgstr "tosi: asetus on päällä"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "osittainen: valituilla objekteilla on eri arvoja, älä muuta"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "pois päältä: älä aseta tätä ominaisuutta valituille kohteille"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Tyypin OsmPrimitiveType pakollisen attribuutin \"{0}\" arvo on virheellinen. "
+"Saatiin \"{1}\"."
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11576,7 +11884,7 @@ msgid "Contacting OSM Server..."
msgstr "Yhdistetään OSM-palvelimeen..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11618,28 +11926,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11738,6 +12044,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11753,12 +12062,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11839,8 +12156,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "NMEA-tuonti onnistui"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA-tuonti epäonnistui"
@@ -11939,37 +12256,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Tyypin OsmPrimitiveType pakollisen attribuutin \"{0}\" arvo on virheellinen. "
-"Saatiin \"{1}\"."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11979,8 +12270,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -12007,10 +12298,7 @@ msgstr "Muutoskokoelmalistaa käsitellään..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -12021,9 +12309,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -12045,6 +12330,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12098,8 +12386,8 @@ msgstr ""
"OSM-objektin {0} \"version\"-attribuutin arvo on virheellinen. Saatiin {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -12248,6 +12536,9 @@ msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -12266,6 +12557,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -12290,16 +12590,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -12311,6 +12614,14 @@ msgstr "Epäkelvot koordinatit: {0}"
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12325,6 +12636,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12355,19 +12675,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12389,11 +12709,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Istuntotiedosto (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -12463,18 +12795,14 @@ msgid "Download skipped"
msgstr "Lataus ohitettu"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Varoitus: Liitännäistä \"{0}\" ei voi ladata. Sen latauslinkkiä ei ole "
-"tiedossa. Lataus ohitetaan."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Varoitus: Liitännäistä \"{0}\" ei voi ladata. Sen latauslinkki \"{1}\" ei "
-"ole kelvollinen URL. Lataus ohitetaan."
msgid "Failed to create plugin directory ''{0}''"
msgstr ""
@@ -12623,10 +12951,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12641,24 +12969,21 @@ msgstr "Pidä liitännäinen"
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Varoitus: aiemmin ladatun liitännäisen \"{0}\" asennus epäonnistui. Asennus "
-"ohitetaan. JOSM lataa silti liitännäisen vanhan version."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12733,10 +13058,8 @@ msgstr "Käsitellään liitännäissivustojen välimuistitiedostoa..."
msgid "Processing file ''{0}''"
msgstr "Käsitellään tiedostoa \"{0}\""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Varoitus: Liitännäistietoja ei saatu luettua tiedostosta \"{0}\". Ohitetaan."
msgid "Processing plugin site cache icon files..."
msgstr "Käsitellään liitännäissivustojen kuvakkeiden välimuistitiedostoa..."
@@ -12750,9 +13073,24 @@ msgstr "Ladataan listaa liitännäisistä..."
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -13097,17 +13435,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13118,9 +13450,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -13154,9 +13529,23 @@ msgstr ""
"<html><p>Valitettavasti tageja ei voitu liittää leikepöydältä, koska se ei "
"sisältänyt JOSM-objektia tai sopivaa tekstiä.</p></html>"
-msgid "Right click = copy to clipboard"
+msgid "ms"
msgstr ""
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13481,6 +13870,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13564,6 +13958,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Helppo tapa etsiä ja korjata puutteelliset katuosoitteet"
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13671,9 +14069,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr "Muuntaa suljetun polun multipolygon-relaatioksi."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13737,6 +14132,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13761,9 +14159,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Lisää valikkoon vaihtoehdon \"Käynnistä JOSM uudelleen\""
-
msgid "Plugin for reverting changesets"
msgstr "Liitännäinen muutoskokoelmien muutosten palauttamiseen ennalleen"
@@ -13789,9 +14184,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13828,6 +14220,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13877,9 +14274,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Väylät"
-
msgid "Streets"
msgstr "Tiet"
@@ -13964,6 +14358,9 @@ msgstr "Penger"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Tietulli"
+
msgid "Motorway Link"
msgstr "Moottoritien ramppi"
@@ -14054,6 +14451,50 @@ msgstr "Asuinkatu"
msgid "Edit Residential Street"
msgstr "Muokkaa asuinkadun ominaisuuksia"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "kyllä"
+
+msgid "no"
+msgstr "ei"
+
+msgid "destination"
+msgstr "määränpää"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Pihakatu"
@@ -14072,10 +14513,10 @@ msgstr "Alue"
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -14087,7 +14528,10 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
-msgid "Parking Aisle"
+msgid "drive-through"
+msgstr ""
+
+msgid "Parking Aisle"
msgstr "Pysäköintialueen ajoväylä"
msgid "Edit Parking Aisle"
@@ -14114,18 +14558,12 @@ msgstr "kiertoliittymä"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "kyllä"
-
msgid "Road Restrictions"
msgstr "Liikennöintirajoitukset"
msgid "Edit Road Restrictions"
msgstr "Muokkaa tietä koskevia rajoituksia"
-msgid "Toll"
-msgstr "Tietulli"
-
msgid "No exit (cul-de-sac)"
msgstr "Umpikuja"
@@ -14135,9 +14573,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "määränpää"
-
msgid "delivery"
msgstr ""
@@ -14147,15 +14582,15 @@ msgstr ""
msgid "private"
msgstr "yksityinen"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ei"
-
msgid "official"
msgstr ""
@@ -14201,6 +14636,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Julkinen liikenne (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Miniminopeus (km/h)"
@@ -14285,6 +14723,9 @@ msgstr "Muokkaa sillan ominaisuuksia"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14389,21 +14830,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -14419,11 +14869,11 @@ msgstr "Ratsastustie"
msgid "Edit Bridleway"
msgstr "Muokkaa ratsastustien ominaisuuksia"
-msgid "Cycle Lane"
-msgstr "Pyörätie/pyöräkaista (tien osana)"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Muokkaa pyöräilyväylän ominaisuuksia"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Pyörätie"
@@ -14458,8 +14908,8 @@ msgstr "Pyörätie oikealla"
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
-msgstr "Muokkaa tien pääluokitusta"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Tien luokitus"
@@ -14527,12 +14977,18 @@ msgstr "Levähdyspaikka"
msgid "Edit Rest Area"
msgstr "Muokkaa levähdyspaikan ominaisuuksia"
-msgid "Emergency Phone"
-msgstr "Hätäpuhelin"
+msgid "Drinking Water"
+msgstr "Juomavesi"
msgid "Traffic Signal"
msgstr "Liikennevalot"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Suojatien tyyppi"
@@ -14548,15 +15004,6 @@ msgstr "saari"
msgid "unmarked"
msgstr "merkitsemätön"
-msgid "Cross on horseback"
-msgstr "Ylitys ratsain"
-
-msgid "Cross by bicycle"
-msgstr "Ylitys pyörällä"
-
-msgid "Crossing attendant"
-msgstr "Suojatien valvoja"
-
msgid "Crossing type name (UK)"
msgstr "Suojatien tyyppi (Iso-Britannia)"
@@ -14578,6 +15025,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr "Suojatien valvoja"
+
+msgid "Cross by bicycle"
+msgstr "Ylitys pyörällä"
+
+msgid "Cross on horseback"
+msgstr "Ylitys ratsain"
+
msgid "Stop"
msgstr ""
@@ -14587,6 +15043,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -14596,10 +15055,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr "Suojatie"
-msgid "Edit Crossing"
-msgstr "Muokkaa suojatietä"
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14632,9 +15088,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Kohtaamispaikka"
-msgid "Edit Passing Place"
-msgstr "Muokkaa kohtaamispaikkaa"
-
msgid "Turning Circle"
msgstr "Kääntöympyrä"
@@ -14668,20 +15121,44 @@ msgstr ""
msgid "Barriers"
msgstr "Esteet"
+msgid "Block"
+msgstr "Betoniporsas tms."
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Sallitut kulkumuodot:"
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr "Sulkutolppa"
msgid "Edit Bollard"
msgstr "Muokkaa sulkutolppaa"
-msgid "Allowed traffic:"
-msgstr "Sallitut kulkumuodot:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
-msgstr "Betoniporsas tms."
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Karjaeste"
@@ -14692,6 +15169,9 @@ msgstr "Muokkaa karjaestettä"
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -14713,19 +15193,34 @@ msgstr "Muokkaa rajanylityspaikkaa"
msgid "Hedge"
msgstr "Pensasaita"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Aita"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14734,22 +15229,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Muuri"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Kaupunginmuuri"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14782,12 +15306,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Tikkaat"
msgid "Edit Stile"
msgstr "Muokkaa tikkaita"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Pyöröportti"
@@ -14845,6 +15384,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14854,6 +15396,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanava"
@@ -14893,9 +15441,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14929,6 +15474,21 @@ msgstr ""
msgid "Edit Water"
msgstr "Muokkaa veden ominaisuuksia"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Maa"
@@ -15010,18 +15570,23 @@ msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "polkupyörä"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -15094,7 +15659,10 @@ msgstr "armeija"
msgid "tourism"
msgstr "turismi"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15118,10 +15686,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
-msgstr "Jännite"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -15133,9 +15704,6 @@ msgstr "Kapean raideleveyden rata"
msgid "Edit Narrow Gauge Rail"
msgstr "Muokkaa kapean raideleveyden rataa"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Yksiraiteinen rautatie"
@@ -15178,18 +15746,56 @@ msgstr "Käytöstä poistettu rata"
msgid "Edit Disused Railway"
msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
-msgid "Optional Types"
-msgstr ""
-
msgid "Abandoned Rail"
msgstr "Purettu rata"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Tasoristeys"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Risteys"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Risteystyyppi"
@@ -15289,11 +15895,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15305,11 +15909,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15328,12 +15930,12 @@ msgstr ""
msgid "underground"
msgstr "maanalainen"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Pääsy (access)"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -15361,9 +15963,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Paikkoja"
@@ -15379,19 +15978,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Aukioloajat"
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -15541,6 +16156,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Jännite"
+
msgid "Amperage"
msgstr ""
@@ -15562,6 +16180,12 @@ msgstr "Korjaamo"
msgid "Edit Car Repair"
msgstr "Muokkaa autokorjaamon ominaisuuksia"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -15589,6 +16213,12 @@ msgstr "Vuokraamo"
msgid "Edit Car Rental"
msgstr "Muokkaa autovuokraamon ominaisuuksia"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -15613,22 +16243,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15650,9 +16264,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Vaatteet"
@@ -15716,7 +16327,7 @@ msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
msgid "Public Transport"
msgstr "Julkinen liikenne"
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15847,6 +16458,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15877,6 +16491,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Penkki"
@@ -15889,9 +16506,6 @@ msgstr "Pyörätuoli"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15901,9 +16515,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Rakennus"
@@ -15916,6 +16535,9 @@ msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15940,14 +16562,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15996,8 +16610,8 @@ msgstr ""
msgid "Taxi"
msgstr "Taksi"
-msgid "Edit Taxi station"
-msgstr "Muokkaa taksitolppaa"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Lentokenttä"
@@ -16050,6 +16664,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "terminaali"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -16072,21 +16701,6 @@ msgstr "Muokkaa hotellia"
msgid "Stars"
msgstr "Tähdet"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminaali"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -16270,6 +16884,12 @@ msgstr "Yökerho"
msgid "Edit Nightclub"
msgstr "Muokkaa yökerhon ominaisuuksia"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turismi"
@@ -16291,9 +16911,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Kartta"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Tarkkuustaso"
@@ -16306,6 +16932,9 @@ msgstr "katu"
msgid "scheme"
msgstr "kaavio"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Kartan laajuus"
@@ -16345,6 +16974,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -16366,22 +16998,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Tarkempi kuvaus"
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -16405,9 +17049,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -16432,7 +17073,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -16505,49 +17155,43 @@ msgstr "Taideteos"
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Religion"
-msgstr "Uskonto"
-
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
-msgstr ""
+msgid "Church"
+msgstr "Kirkko"
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -16565,6 +17209,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -16577,6 +17227,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -16592,37 +17245,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Uskonto"
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -16712,6 +17468,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Terveys"
@@ -16721,6 +17483,12 @@ msgstr "Sairaala"
msgid "Edit Hospital"
msgstr "Muokkaa sairaalan ominaisuuksia"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Lääkäri"
@@ -16787,86 +17555,170 @@ msgstr "Eläinlääkäri"
msgid "Edit Veterinary"
msgstr "Muokkaa eläinlääkärin ominaisuuksia"
-msgid "Note"
+msgid "Edit Toilets"
msgstr ""
-msgid "Post Box"
-msgstr "Postilaatikko"
+msgid "Access rights"
+msgstr ""
-msgid "Telephone"
-msgstr "Puhelin"
+msgid "public"
+msgstr ""
-msgid "Edit Telephone"
-msgstr "Muokkaa puhelimen ominaisuuksia"
+msgid "seasonal"
+msgstr ""
-msgid "Telephone cards"
-msgstr "Puhelinkortit"
+msgid "flush"
+msgstr ""
-msgid "Clock"
+msgid "pitlatrine"
msgstr ""
-msgid "Edit Clock"
+msgid "chemical"
msgstr ""
-msgid "Display"
+msgid "bucket"
msgstr ""
-msgctxt "display"
-msgid "analog"
+msgid "Usage Position"
msgstr ""
-msgctxt "display"
-msgid "digital"
+msgid "seated"
msgstr ""
-msgctxt "display"
-msgid "sundial"
+msgid "seated;urinal"
msgstr ""
-msgctxt "display"
-msgid "unorthodox"
+msgid "squat"
msgstr ""
-msgid "Support"
+msgid "urinal"
msgstr ""
-msgid "wall_mounted"
+msgid "Post Box"
+msgstr "Postilaatikko"
+
+msgid "Edit Postbox"
msgstr ""
-msgid "billboard"
+msgid "Collection times"
msgstr ""
-msgid "Visibility/readability"
+msgid "11:30"
msgstr ""
-msgid "house (up to 5m)"
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
msgstr ""
-msgid "street (up to 20m)"
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
msgstr ""
-msgid "area (more than 20m)"
+msgid "Drive through"
msgstr ""
-msgid "Shows current date"
+msgid "Telephone"
+msgstr "Puhelin"
+
+msgid "Edit Telephone"
+msgstr "Muokkaa puhelimen ominaisuuksia"
+
+msgid "Telephone cards"
+msgstr "Puhelinkortit"
+
+msgid "Emergency Phone"
+msgstr "Hätäpuhelin"
+
+msgid "Internet Access"
msgstr ""
-msgid "Shows temperature"
+msgid "Edit Internet Access"
msgstr ""
-msgid "Shows barometric pressure"
+msgid "Automated Defibrillator"
msgstr ""
-msgid "Shows humidity"
+msgid "Edit Automated External Defibrillator"
msgstr ""
-msgid "Recycling"
-msgstr "Kierrätys"
+msgid "Located inside a building?"
+msgstr ""
-msgid "Edit Recycling station"
-msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
-msgid "Batteries"
+msgid "Last check note"
+msgstr ""
+
+msgid "Clock"
+msgstr ""
+
+msgid "Edit Clock"
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "analog"
+msgstr ""
+
+msgid "digital"
+msgstr ""
+
+msgid "sundial"
+msgstr ""
+
+msgid "unorthodox"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "Visibility/readability"
+msgstr ""
+
+msgid "house (up to 5m)"
+msgstr ""
+
+msgid "street (up to 20m)"
+msgstr ""
+
+msgid "area (more than 20m)"
+msgstr ""
+
+msgid "Shows current date"
+msgstr ""
+
+msgid "Shows temperature"
+msgstr ""
+
+msgid "Shows barometric pressure"
+msgstr ""
+
+msgid "Shows humidity"
+msgstr ""
+
+msgid "Recycling"
+msgstr "Kierrätys"
+
+msgid "Edit Recycling Station"
+msgstr ""
+
+msgid "Batteries"
msgstr "Paristot"
msgid "Cans"
@@ -16890,27 +17742,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16945,14 +17785,17 @@ msgstr "Muokkaa metsästyslavan ominaisuuksia"
msgid "Height"
msgstr "Korkeus"
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "täysi"
+msgstr ""
msgid "Hide"
msgstr ""
@@ -16960,11 +17803,11 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Juomavesi"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Muokkaa juomaveden ominaisuuksia"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr ""
@@ -16991,6 +17834,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -17028,119 +17874,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Muokkaa stadionin ominaisuuksia"
-msgid "select sport:"
-msgstr "Valitse urheilulaji:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "urheilu"
+msgid "Sport"
+msgstr "Urheilu"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "jousiammunta"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "yleisurheilu"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "amerikkalainen jalkapallo"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "australialainen jalkapallo"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "koripallo"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "kuulapelit"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "nurmikeilailu"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "kanadalainen jalkapallo"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kanootti"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "kiipeily"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "kriketti"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "krikettiverkko"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "kroketti"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "pyöräily"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "koirakilpailu"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "ratsastus"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "voimistelu"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "jääkiekko"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "hevoskilpailu"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "moottoriurheilu"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "racquet"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "rugby league"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "rugby union"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "ammunta"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "rullalautailu"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "luistelu"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "hiihto"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "jalkapallo"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "uinti"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "pöytätennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Urheilukeskus"
@@ -17172,26 +18054,27 @@ msgstr "Pienoisgolf"
msgid "Edit Miniature Golf"
msgstr "Muokkaa minigolfin ominaisuuksia"
-msgid "Sport"
-msgstr "Urheilu"
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "tyyppi"
-
+msgctxt "running"
msgid "pitch"
-msgstr "kenttä"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "urheilukeskus"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -17199,6 +18082,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "kenttä"
+
+msgid "sports_centre"
+msgstr "urheilukeskus"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr ""
@@ -17232,6 +18124,22 @@ msgstr "Muokkaa melontaa"
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Koirakilpailu"
@@ -17244,9 +18152,34 @@ msgstr "Ratsastus"
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
msgstr ""
+msgid "mud"
+msgstr "muta"
+
msgid "Horse Racing"
msgstr "Hevoskilpailu"
@@ -17263,7 +18196,7 @@ msgid "Skating"
msgstr "Luistelu"
msgid "Edit Skating"
-msgstr "Muokkaa luistelua"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17307,36 +18240,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17379,19 +18330,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17530,6 +18477,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -17542,60 +18501,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Torni"
@@ -17611,9 +18644,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17823,74 +18853,190 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
msgstr ""
-msgid "Survey Point"
+msgid "Radiation"
msgstr ""
-msgid "Edit Survey Point"
+msgid "Seismic Activity"
msgstr ""
-msgid "Surveillance"
-msgstr "Valvontakamera"
-
-msgid "Edit Surveillance Camera"
-msgstr "Muokkaa valvontakameran ominaisuuksia"
-
-msgid "indoor"
+msgid "Recording:"
msgstr ""
-msgid "outdoor"
+msgid "Automated"
msgstr ""
-msgid "public"
+msgid "Manually"
msgstr ""
-msgid "Power"
+msgid "Remote"
msgstr ""
-msgid "Power Generator"
+msgid "Display:"
msgstr ""
-msgid "Edit Power Generator"
+msgid "Analog"
msgstr ""
-msgid "biofuel"
+msgid "Digital"
+msgstr ""
+
+msgid "Survey Point"
+msgstr ""
+
+msgid "Edit Survey Point"
+msgstr ""
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Muokkaa valvontakameran ominaisuuksia"
+
+msgid "indoor"
+msgstr ""
+
+msgid "outdoor"
+msgstr ""
+
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "kauppa"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
+
+msgid "Power"
+msgstr ""
+
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
+msgid "Power Generator"
+msgstr ""
+
+msgid "Edit Power Generator"
+msgstr ""
+
+msgid "biofuel"
msgstr ""
msgid "biogas"
@@ -17935,88 +19081,191 @@ msgstr "tuuli"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -18028,6 +19277,21 @@ msgstr "Muokkaa muuntamoaseman ominaisuuksia"
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -18043,6 +19307,9 @@ msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -18061,11 +19328,9 @@ msgstr "Muokkaa sähkölinjan ominaisuuksia"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18174,11 +19439,11 @@ msgstr "Kioski"
msgid "Edit Kiosk"
msgstr "Muokkaa kioskin ominaisuuksia"
-msgid "Baker"
-msgstr "Leipomo"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Muokkaa leipomon ominaisuuksia"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Lihakauppa"
@@ -18189,7 +19454,7 @@ msgstr "Muokkaa lihakaupan ominaisuuksia"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18210,14 +19475,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Luomukauppa"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Luomukauppa"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -18288,7 +19559,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -18309,13 +19580,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -18324,7 +19595,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -18352,6 +19622,12 @@ msgstr "Muokkaa rahanvaihdon ominaisuuksia"
msgid "Edit Automated Teller Machine"
msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -18388,10 +19664,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18421,7 +19718,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18433,19 +19730,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -18466,6 +19763,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Matkatoimisto"
@@ -18475,7 +19778,7 @@ msgstr "Muokkaa matkatoimistoa"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18556,6 +19859,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr "Maantiede"
@@ -18685,6 +19991,12 @@ msgstr "Huippu"
msgid "Edit Peak"
msgstr "Muokkaa huipun ominaisuuksia"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Jäätikkö"
@@ -18724,26 +20036,35 @@ msgstr "Puu"
msgid "Edit Tree"
msgstr "Muokkaa puun ominaisuuksia"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Kasvitieteellinen nimi"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Metsä"
msgid "Edit Wood"
msgstr "Muokkaa metsän ominaisuuksia"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "havumetsä"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "lehtimetsä"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "sekametsä"
msgid "Forest"
msgstr "Talousmetsä"
@@ -18751,15 +20072,6 @@ msgstr "Talousmetsä"
msgid "Edit Forest Landuse"
msgstr "Muokkaa talousmetsän ominaisuuksia"
-msgid "coniferous"
-msgstr "havumetsä"
-
-msgid "deciduous"
-msgstr "lehtimetsä"
-
-msgid "mixed"
-msgstr "sekametsä"
-
msgid "Grassland"
msgstr ""
@@ -18835,6 +20147,12 @@ msgstr "Niitty"
msgid "Edit Meadow Landuse"
msgstr "Muokkaa niittyä"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Viinitarha"
@@ -18889,8 +20207,8 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
-msgstr "Asuinalue"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Muokkaa asuinalueen ominaisuuksia"
@@ -18901,6 +20219,9 @@ msgstr "Hautausmaa (pieni)"
msgid "Edit Graveyard"
msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Hautausmaa"
@@ -18976,6 +20297,33 @@ msgstr "Muokkaa louhoksen ominaisuuksia"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Muokkaa osoitetietoja"
@@ -18994,30 +20342,6 @@ msgstr "Kunta"
msgid "Country code"
msgstr "Maakoodi"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "Talonumeroiden interpolointilinja"
@@ -19036,6 +20360,18 @@ msgstr "parillinen"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19198,27 +20534,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
-msgstr "latu"
+msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -19264,20 +20629,23 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
-msgstr "Liittyvä katu"
+msgid "Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Muokkaa liittyvä katu -relaatiota"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
+msgstr ""
msgid "Street"
msgstr "Katu"
@@ -19300,7 +20668,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19396,18 +20764,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "silta"
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr "polkupyörä"
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -19417,7 +20794,10 @@ msgstr ""
msgid "motorroad"
msgstr "moottoriliikennetie"
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19426,10 +20806,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19447,6 +20827,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19462,28 +20845,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -19504,20 +20887,20 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
-msgstr "kauppa"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotelli"
@@ -19582,9 +20965,6 @@ msgstr "nummi"
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "muta"
-
msgid "beach"
msgstr "ranta"
@@ -19594,10 +20974,13 @@ msgstr "reitti"
msgid "boundary"
msgstr "raja"
+msgid "sport"
+msgstr "urheilu"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19612,9 +20995,6 @@ msgstr "Kunta/kaupunki"
msgid "One Way"
msgstr "Yksi Suunta"
-msgid "Church"
-msgstr "Kirkko"
-
msgid "Fuel Station"
msgstr "Huoltoasema"
@@ -19642,6 +21022,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19687,10 +21070,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19702,7 +21115,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19720,7 +21133,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19837,19 +21250,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:name without name"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:building without building"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19868,13 +21392,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19883,19 +21443,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19910,142 +21479,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
-msgstr "Ordnance Survey 7th Series (50-60 -luvun kartat Briteistä)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -20061,13 +21679,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italy"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicily - Italy"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -20084,46 +21702,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -20144,88 +21765,148 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Tanska)"
-
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Tanska)"
+msgid "MassGIS L3 Parcels"
+msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "ScanEx IRS"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "SUMO Export"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "Export"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Port:"
+msgstr "Portti:"
+
+msgid "refresh the port list"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Configure"
+msgstr "Asetukset"
+
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -20429,6 +22110,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20450,13 +22143,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20721,9 +22408,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20745,6 +22438,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20823,9 +22519,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr "Käteviä toimintoja osoitteiden interpolointiin"
@@ -20910,7 +22618,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -21185,15 +22893,6 @@ msgstr ""
msgid "Street Name:"
msgstr "Kadunnimi:"
-msgid "Increment"
-msgstr "Numeroväli"
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21366,6 +23065,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21385,12 +23087,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21526,6 +23222,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21543,6 +23242,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -21623,48 +23325,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr ""
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21719,19 +23379,75 @@ msgstr "Lisää uusi taso"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr ""
msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21757,7 +23473,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21807,7 +23526,7 @@ msgstr "Poista valittu väriteema listasta."
msgid "Color Schemes"
msgstr "Väriteemat"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21852,6 +23571,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21924,6 +23646,71 @@ msgstr ""
msgid "Install"
msgstr ""
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr ""
@@ -21960,28 +23747,10 @@ msgstr ""
msgid "Disable data logging if distance falls below"
msgstr ""
-msgid "Unknown logFormat"
-msgstr ""
-
-msgid "Port:"
-msgstr "Portti:"
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr "Asetukset"
-
-msgid "Configure Device"
-msgstr ""
-
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
+msgid "Unknown logFormat"
msgstr ""
-msgid "delete data after import"
+msgid "Configure Device"
msgstr ""
msgid "Importing data from device."
@@ -22379,6 +24148,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22427,23 +24199,25 @@ msgid "Notifying the server of the deprecation..."
msgstr ""
msgid "Get Imagery Offset..."
-msgstr ""
+msgstr "Hae kuvatason siirros ..."
msgid "Download offsets for current imagery from a server"
-msgstr ""
+msgstr "Lataa nykyisen kuvatason tallennetut siirrostiedot palvelimelta."
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"Alueelta ei löydy tietoa kuvatason sijaintivirheelle. Ole hyvä ja säädä "
+"kuvatason sijainti, ja lähetä siirrostieto palvelimelle."
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Kuvatason siirrostietoja haetaan..."
msgid "Error processing XML response: {0}"
msgstr ""
msgid "Offset"
-msgstr ""
+msgstr "Siirros"
msgid "Imagery Offset Database"
msgstr ""
@@ -22464,7 +24238,7 @@ msgid "Calibration geometries"
msgstr ""
msgid "Deprecated offsets"
-msgstr ""
+msgstr "Hylätyt siirrokset"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
@@ -22484,7 +24258,7 @@ msgid "Created by {0} on {1}"
msgstr ""
msgid "Offset Information"
-msgstr ""
+msgstr "Siirroksen tarkemmat tiedot"
msgid "Report this offset"
msgstr ""
@@ -22523,18 +24297,20 @@ msgid "Unable to connect to the server"
msgstr ""
msgid "Store Imagery Offset..."
-msgstr ""
+msgstr "Tallenna siirros muiden nähtäväksi..."
msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
"server"
msgstr ""
+"Lähetä nykyisen kuvatason siirros palvelimelle (tai kalibrointikohteen "
+"geometria)"
msgid "Store calibration geometry"
msgstr ""
msgid "Store imagery offset"
-msgstr ""
+msgstr "Tallenna siirros"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
@@ -22545,6 +24321,8 @@ msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
"this?"
msgstr ""
+"Päällimmäisellä kuvatasolla ei ole siirrosta (se on nolla joka suuntaan). "
+"Haluatko silti lähettää tiedon?"
msgid ""
"You are registering an imagery offset. Other users in this area will be able "
@@ -22552,6 +24330,10 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
+"Olet tallentamassa siirrostietoa palvelimelle. Muut käyttäjät voivat käyttää "
+"sitä kartan piirrossa.\n"
+"Varmistathan, että siirros on mahdollisimman tarkka, ja kuvaile alue jossa "
+"tämä kuvatason siirros on voimassa."
msgid ""
"You are registering a calibration geometry. It should be the most precisely "
@@ -22561,7 +24343,7 @@ msgid ""
msgstr ""
msgid "Uploading a new offset..."
-msgstr ""
+msgstr "Lähetetään siirrosta palvelimelle..."
msgid "This string should be 3 to 200 letters long."
msgstr ""
@@ -22626,12 +24408,6 @@ msgstr "Tuodut kuvat"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Kuvatiedostot (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Avaa kuvat ImageWayPoint:lla"
-
-msgid "Load set of images as a new layer."
-msgstr "Lataa kuvat uutena tasona."
-
msgid "Import vector graphics"
msgstr ""
@@ -22641,16 +24417,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -23024,9 +24797,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Keskitä LiveGPS-taso jatkuvasti nykyiseen sijaintiin."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -23081,9 +24851,31 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Roolin sisältävä relaatiojäsenyys kopioitiin kaikkiin uusin "
+"polkuihin.<br>Sinun tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Relaatiojäsenyydet kopioitiin kaikkiin uusiin polkuihin.<br>Sinun "
+"tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Syötä tagin avain, t.s. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Syötä tagin arvo, t.s. <strong><tt>tarkista arvot</tt></strong></html>"
+
msgid "Michigan Left"
msgstr ""
@@ -23125,25 +24917,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Muunna monimonikulmioksi"
+msgid "Select OSM mirror URL to download from."
+msgstr ""
-msgid "Convert to multipolygon."
-msgstr "Muunna monimonikulmioksi."
+msgid "Base URL"
+msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -23280,9 +25072,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -23307,12 +25096,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr "OpenData-liitännäisen asetukset"
+
msgid "License Agreement"
msgstr ""
@@ -23461,6 +25259,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23477,6 +25278,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23712,13 +25524,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Virhe tapahtui: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Uutta ohjelmavirhettä ei voida luoda. Tulos: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23774,18 +25579,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "Uusi ongelma"
-
-msgid "Create issue"
-msgstr "Luo ongelma"
-
-msgid "Describe the problem precisely"
-msgstr "Kuvaile ongelma tarkasti"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23845,6 +25638,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24052,9 +25848,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -24134,7 +25927,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -24288,6 +26099,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
"Kansiossa on valittua kuvatiedostoa vastaava kalibrointitiedosto: {0}\n"
@@ -24313,6 +26127,9 @@ msgid ""
msgstr ""
"Jatkossa kuviin kuuluvat kalibrointitiedostot ladataan automaattisesti."
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24606,9 +26423,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24677,9 +26491,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24806,9 +26617,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "Uudelleenkäynnistä JOSM"
-
msgid "Revert changeset fully"
msgstr "Palauta muutoskokoelman muutokset täysin ennalleen"
@@ -24830,6 +26638,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24862,15 +26673,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Muuta ominaisuuksia"
+
msgid "Country preset:"
msgstr ""
@@ -24880,6 +26707,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24982,9 +26812,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25100,6 +26927,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -25160,19 +26990,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25311,6 +27141,9 @@ msgstr ""
msgid "Street name: "
msgstr "Kadunnimi: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -25386,6 +27219,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -25401,9 +27323,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25425,6 +27344,10 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Varoitus: poikkeus ohitetaan, koska tehtävä oli jo peruttu. Poikkeus: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25581,9 +27504,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26211,19 +28131,19 @@ msgstr "Palauta poistettu objekti..."
msgid "Undelete object by id"
msgstr "Palauta poistettu objekti objektitunnisteen perusteella"
-msgid "Select if the data should be added into a new layer"
-msgstr "Valitse, lisätäänkö data uudelle tasolle"
+msgid "Undelete Object"
+msgstr "Palauta objekti"
+
+msgid "Undelete object"
+msgstr "Palauta objekti"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr "Palauta objekti"
-
-msgid "Undelete object"
-msgstr "Palauta objekti"
+msgid "Select if the data should be added into a new layer"
+msgstr "Valitse, lisätäänkö data uudelle tasolle"
msgid "Start undeleting"
msgstr "Aloita poistetun objektin palauttaminen"
@@ -26231,18 +28151,6 @@ msgstr "Aloita poistetun objektin palauttaminen"
msgid "Close dialog and cancel"
msgstr "Sulje ikkuna ja jätä palauttamatta"
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr "Lisää työkaluja"
-
msgid "Add nodes at intersections"
msgstr "Listää pisteet leikkauskohtiin"
@@ -26270,6 +28178,8 @@ msgstr ""
msgid "Extracts node from a way"
msgstr ""
+"Irrottaa valitun solmun kaikista poluista ja siirtää kursorin alle. "
+"Polkuihin luodaan uusi solmu samaan alkuperäiseen kohtaan."
msgid ""
"This tool extracts node from its ways and requires single node to be "
@@ -26286,20 +28196,12 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
-msgstr ""
+msgstr "Jaa elementti"
msgid "Split an object at the selected nodes."
msgstr ""
+"Jakaa polun valittujen solmujen kohdalta kahdeksi erilliseksi kohteeksi"
msgid "The current selection cannot be used for splitting."
msgstr "Valintaa ei voida käyttää jakamiseen."
@@ -26332,12 +28234,14 @@ msgid ""
msgstr ""
msgid "Symmetry"
-msgstr ""
+msgstr "Peilaa valinnan ympäri"
msgid ""
"Please select at least two nodes for symmetry axis and something else to "
"mirror."
msgstr ""
+"Valitse ensin vähintään kaksi solmua peilausakseliksi ja jotain peilattavia "
+"kohteita"
msgid "Copy tags from previous selection"
msgstr "Kopioi tagit edellisestä valinnasta"
@@ -26416,23 +28320,11 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
msgid "Create geometry by entering lat lon coordinates for it."
-msgstr ""
+msgstr "Luo polku syöttämällä lista peräkkäisiä koordinaatteja"
msgid ""
"Enter the coordinates for the new nodes, one for each line.<br/>If you enter "
@@ -26555,7 +28447,7 @@ msgid "Too many ways are added: {0}!"
msgstr ""
msgid "All inside [testing]"
-msgstr ""
+msgstr "Valitun polun sisäpuolella olevat kohteet"
msgid "Select all inside selected polygons"
msgstr "Valitse kaikki objektit valittujen alueiden sisältä"
@@ -26564,6 +28456,8 @@ msgid ""
"Nothing found. Please select some closed ways or multipolygons to find all "
"primitives inside them!"
msgstr ""
+"Ei mitään valittavaa. Valitse ensin yksi tai useampi suljettu polku tai "
+"monimonikulmio."
msgid "Area boundary [testing]"
msgstr ""
@@ -26609,9 +28503,6 @@ msgstr "Poista pisteet valinnasta"
msgid "Removes all nodes from selection"
msgstr "Poistaa kaikki pisteet valinnasta"
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26738,7 +28629,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -26758,14 +28649,11 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr "Lataa polun päästä"
msgid "Download map data on the end of selected way"
-msgstr ""
+msgstr "Lataa karttadataa valitun polun pään ympäriltä."
msgid ""
"<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -26831,19 +28719,23 @@ msgstr ""
"Valitse useampia peräkkäisiä, haarautumattomia polkuja haluamillasi ehdoilla."
msgid "Add names from Wikipedia"
-msgstr ""
+msgstr "Lisää nimen puuttuvat kieliversiot Wikipediasta"
msgid ""
"Fetches interwiki links from Wikipedia in order to add several name tags"
msgstr ""
+"Hae Wikipedian artikkelista linkit eri kieliversioihin ja lisää kohteelle "
+"puuttuvat nimiversiot."
msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
+"Luo leikepöydälle {0} -wiki-mallineen kutsun ensimmäisen valitun solmun "
+"koordinaateilla. Voit liittää sen wikiin."
msgid "Copy {0} template"
-msgstr ""
+msgstr "Luo malline {0} leikepöydälle"
msgid "Fetch Wikipedia articles with coordinates"
msgstr ""
@@ -26904,9 +28796,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 58e29d9..b500033 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:08+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:09+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 88458a2..811ca8f 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 14:09+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-18 19:30+0000\n"
+"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: Fr <>\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: 2013-04-05 04:40+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:41+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: fr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -45,12 +45,27 @@ msgid "Invalid value {0} for parameter ''has_arg''"
msgstr "La valeur {0} est invalide pour le paramètre ''has_arg''"
msgid "Background Terms of Use"
-msgstr "Conditions d’utilisation en arrière-plan"
+msgstr "Conditions d’utilisation du fond de carte"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"L’ouverture du lien n’est pas supportée sur cette plateforme (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "Erreur: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ATTENTION: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr "Cause : "
+
msgid "Executing platform startup hook"
msgstr "Initialisation spécifique à la plateforme"
@@ -80,7 +95,7 @@ msgstr "Mise à jour de l’interface graphique"
msgid "Ignoring malformed file URL: \"{0}\""
msgstr ""
-"L’adresse web du fichier n’est pas valide, elle est ignorée : ''{0}''"
+"L’adresse web du fichier n’est pas valide, elle est ignorée : ’’{0}’’"
msgid "Warning"
msgstr "Avertissement"
@@ -91,7 +106,7 @@ msgstr ""
"fichiers."
msgid "Ignoring malformed URL: \"{0}\""
-msgstr "L’adresse web n’est pas valide, elle est ignorée : ''{0}''"
+msgstr "L’adresse web n’est pas valide, elle est ignorée : ’’{0}’’"
msgid ""
"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
@@ -157,18 +172,19 @@ msgid "About JOSM..."
msgstr "À propos de JOSM"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Attention : le format de l’adresse web est inattendu. La redirection vers "
-"l’historique de l’objet échouera probablement. L’adresse Web est : ''{0}''"
+"Format inattendu de l''URL de base pour l''API. La redirection vers les "
+"pages d''information ou d''historique des objets OSM échouera probablement. "
+"L''URL de base est : ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Attention : le format de l’adresse web est inattendu. La redirection vers la "
-"page de l’utilisateur échouera probablement. L’adresse Web est : ''{0}''"
+"Format inattendu de l''URL de base pour l''API. La redirection vers les "
+"pages utilisateur OSM échouera probablement. L''URL de base est : ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -214,6 +230,9 @@ msgstr "Aucun calque de destination"
msgid "Add imagery layer {0}"
msgstr "Ajouter le calque d’imagerie {0}"
+msgid "Select image format for WMS layer"
+msgstr "Sélectionnez le format d''image pour le calque WMS"
+
msgid "Select WMS layers"
msgstr "Sélectionner les calques WMS"
@@ -254,9 +273,6 @@ msgstr "Outil : {0}"
msgid "Please select at least four nodes."
msgstr "Sélectionnez au moins quatre nœuds."
-msgid "Information"
-msgstr "Informations"
-
msgid "Align Nodes in Line"
msgstr "Aligner les nœuds"
@@ -281,6 +297,9 @@ msgstr "conflit"
msgid "download"
msgstr "télécharger"
+msgid "problem"
+msgstr "problème"
+
msgid "previous"
msgstr "précédent"
@@ -290,6 +309,9 @@ msgstr "suivant"
msgid "Nothing selected to zoom to."
msgstr "Aucune sélection sur laquelle zoomer."
+msgid "Information"
+msgstr "Informations"
+
msgid "Zoom to {0}"
msgstr "Zoomer sur {0}"
@@ -346,11 +368,9 @@ msgstr ""
"sens. Voulez-vous en inverser certains ?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Impossible de fusionner les chemins (ils ne peuvent pas être fusionnés en "
-"une seule chaîne de nœuds)"
msgid "Combine {0} ways"
msgstr "Fusionner {0} chemins"
@@ -407,18 +427,37 @@ msgstr "Supprimer"
msgid "Delete selected objects."
msgstr "Supprimer la sélection"
+msgid "Toggle dialogs panel"
+msgstr "Afficher/Masquer le panneau des fenêtres latérales"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Affiche/Masque le panneau des fenêtres latérales, maximise la carte"
+
msgid "Distribute Nodes"
msgstr "Distribuer les nœuds"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Répartir les nœuds sélectionnés à égale distance le long d’une ligne"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignore {0} nœuds avec des coordonnées nulles"
+
msgid "Download from OSM..."
msgstr "Télécharger"
msgid "Download map data from the OSM server."
msgstr "Télécharger les données de la carte"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Cette action nécessitera {0} requêtes<br>séparées. Voulez-"
+"vous<br>continuer ?</html>"
+
+msgid "Download data"
+msgstr "Télécharger les données."
+
msgid "Download object..."
msgstr "Télécharger un objet"
@@ -515,6 +554,9 @@ msgstr "Historique"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Afficher l’historique des chemins, nœuds ou relations"
+msgid "Show history"
+msgstr "Afficher l’historique"
+
msgid "History (web)"
msgstr "Historique (web)"
@@ -642,11 +684,9 @@ msgid "Joined overlapping areas"
msgstr "A fusionné des zones superposées"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Des chemins faisaient partie des relations qui ont été modifiées. Veuillez "
-"vérifier qu’aucune erreur n’a été introduite."
msgid "Fix tag conflicts"
msgstr "Résoudre les conflits d’attributs"
@@ -743,7 +783,7 @@ msgstr "Mode Lasso"
msgid "Lasso selection mode: select objects within a hand-drawn region"
msgstr ""
-"Mode de sélection lasso: sélectionner des objets au sein d''une zone "
+"Mode de sélection lasso: sélectionner des objets au sein d’’une zone "
"dessinée à la main"
msgid "Rectified Image..."
@@ -817,11 +857,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Fusionner les nœuds sur le plus ancien"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Veuillez sélectionner au moins deux nœuds à fusionner, ou un nœud proche "
-"d’un autre."
msgid "Abort Merging"
msgstr "Annuler la fusion"
@@ -905,7 +943,7 @@ msgid "Create a new map layer."
msgstr "Créer un nouveau calque"
msgid "URL Files"
-msgstr "Fichier d''URL"
+msgstr "Fichier d’’URL"
msgid "Open..."
msgstr "Ouvrir un fichier"
@@ -928,11 +966,11 @@ msgid_plural ""
"Cannot open {0} files because files do not exist or no suitable file "
"importer is available."
msgstr[0] ""
-"Impossible d''ouvrir le fichier {0} car il n''existe pas, ou aucun "
-"gestionnaire adapté n''est disponible."
+"Impossible d’’ouvrir le fichier {0} car il n’’existe pas, ou aucun "
+"gestionnaire adapté n’’est disponible."
msgstr[1] ""
-"Impossible d''ouvrir les fichiers {0} car ils n''existent pas, ou aucun "
-"gestionnaire adapté n''est disponible."
+"Impossible d’’ouvrir les fichiers {0} car ils n’’existent pas, ou aucun "
+"gestionnaire adapté n’’est disponible."
msgid "no importer"
msgstr "Aucun gestionnaire"
@@ -990,11 +1028,11 @@ msgid "Download Data"
msgstr "Télécharger les données"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>L’URL « {0} » ne peut pas être ouverte car aucune tâche de "
-"téléchargement n’est disponible.</html>"
+"Impossible d''ouvrir l''URL ''{0}''<br>Les tâches de téléchargement "
+"acceptent les modèles d''URL suivants:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1026,16 +1064,9 @@ msgid "Orthogonalize / Undo"
msgstr "Mise en forme orthogonale"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Mise en forme orthogonale\n"
-"Veuillez sélectionner les nœuds qui ont été déplacés par la dernière mise en "
-"forme orthogonale !"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Annuler la mise en forme orthogonale"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1056,9 +1087,6 @@ msgstr "Orthogonaliser"
msgid "Usage"
msgstr "Utilisation"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Les éléments sélectionnés ne peuvent être mis en forme orthogonale"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1173,6 +1201,15 @@ msgstr "Renommer également le fichier"
msgid "Could not rename file ''{0}''"
msgstr "Impossible de renommer le fichier ''{0}''"
+msgid "Restart"
+msgstr "Redémarrer"
+
+msgid "Restart the application."
+msgstr "Redémarrer l’’application"
+
+msgid "Click to restart later."
+msgstr "Cliquer pour redémarrer ultérieurement"
+
msgid "Reverse way"
msgstr "Inverser le sens du chemin"
@@ -1225,9 +1262,6 @@ msgstr "Charger la session"
msgid "Load a session from file."
msgstr "Charger une session depuis un fichier."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Fichier session (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Ouvrir la session"
@@ -1275,7 +1309,7 @@ msgid "Layers"
msgstr "Calques"
msgid "No exporter for this layer"
-msgstr "Aucun gestionnaire d''export pour ce calque"
+msgstr "Aucun gestionnaire d’’export pour ce calque"
msgid "Show Status Report"
msgstr "Rapport d’état"
@@ -1295,6 +1329,9 @@ msgstr "Rapport d’état"
msgid "Copy to clipboard and close"
msgstr "Copier dans le presse-papier et fermer"
+msgid "Report bug"
+msgstr "Signaler une erreur"
+
msgid "Close"
msgstr "Fermer"
@@ -1378,19 +1415,14 @@ msgstr ""
"sélectionnez des nœuds au milieu du chemin.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>L’appartenance à une relation fondée sur un rôle a été copiée vers "
-"tous les nouveaux chemins.<br>Vous devriez vérifier et corriger si "
-"nécessaire.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>L’appartenance à une relation a été copiée vers tous les nouveaux "
-"chemins.<br>Vous devriez vérifier et corriger si nécessaire.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Couper le chemin {0} en {1} parties"
@@ -1405,7 +1437,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Bascule vers la configuration globale ''{0}''."
msgid "Encourage/discourage upload"
-msgstr "Encourager/dissuader l''envoi"
+msgstr "Encourager/dissuader l’’envoi"
msgid "UnGlue Ways"
msgstr "Séparer les chemins"
@@ -1479,7 +1511,7 @@ msgid ""
"not see) might use them.<br>Do you really want to unglue?"
msgstr ""
"Vous êtes sur le point de séparer des chemins situés hors de la zone "
-"téléchargée.<br>Ceci peut causer des problèmes parce que d''autres objets "
+"téléchargée.<br>Ceci peut causer des problèmes parce que d’’autres objets "
"(que vous ne voyez pas) peuvent utiliser leurs nœuds.<br>Souhaitez-vous "
"continuer ?"
@@ -1491,6 +1523,28 @@ msgstr ""
"des problèmes parce que vous ne voyez pas l''objet réel.<br>Souhaitez-vous "
"continuer ?"
+msgid "Disconnect Node from Way"
+msgstr "Deconnexion d'un noeud à partir d'un way"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr "Slectionnez au moins un noeud qui doit être deconnecté"
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Le noeud sélectionné ne peut pas être déconnecté d'autre chose"
+msgstr[1] ""
+"Les nœuds sélectionnés ne peuvent pas être déconnectés d'autre chose"
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Annuler"
@@ -1515,9 +1569,6 @@ msgstr "Mettre à jour les données"
msgid "Updates the objects in the active data layer from the server."
msgstr "Mettre à jour les objets du calque actif depuis le serveur"
-msgid "Download data"
-msgstr "Télécharger les données."
-
msgid "Update modified"
msgstr "Mettre à jour les modifications"
@@ -1658,13 +1709,13 @@ msgid "Zooming disabled because there is no selected member"
msgstr "Zoom désactivé car aucun membre n’est sélectionné"
msgid "Zoom to the first selected node"
-msgstr "Zoomer au premier nœud sélectionné"
+msgstr "Zoomer sur le premier noeud sélectionné"
msgid "Zooming disabled because layer of this way is not active"
-msgstr "Zomm désactivé car le calque de ce chemin n''est pas actif"
+msgstr "Zomm désactivé car le calque de ce chemin n’’est pas actif"
msgid "Zooming disabled because there is no selected node"
-msgstr "Zoom désactivé car aucun nœud n''est sélectionné"
+msgstr "Zoom désactivé car aucun nœud n’’est sélectionné"
msgctxt "audio"
msgid "Back"
@@ -1724,6 +1775,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avancer plus lentement"
+msgid "Download GPS"
+msgstr "Téléchargement GPS"
+
msgid "Downloading GPS data"
msgstr "Téléchargement des données GPS"
@@ -1733,6 +1787,18 @@ msgstr "Données GPX téléchargées"
msgid "Markers from {0}"
msgstr "Marqueurs de {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Téléchargement OSM Change compressé"
+
+msgid "Download OSM Change"
+msgstr "Téléchargement OSM Change"
+
+msgid "Download Compressed OSM"
+msgstr "Téléchargement OSM compressé"
+
+msgid "Download OSM"
+msgstr "Télécharger OSM"
+
msgid "Downloading data"
msgstr "Téléchargement des données"
@@ -1754,6 +1820,31 @@ msgstr "Commande"
msgid "Request details: {0}"
msgstr "Demande de détails : {0}"
+msgid "Download OSM URL"
+msgstr "Téléchargement URL OSM"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Il y a eu {0} conflit lors de l’importation."
+msgstr[1] "Il y a eu {0} conflits lors de l’importation."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflit lors du téléchargement"
+msgstr[1] "Conflits lors du téléchargement"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Chargement des parents du nœud {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Chargement des parents du chemin {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Chargement des parents de la relation {2}"
+
+msgid "Download session"
+msgstr "Chargement d'une session"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Téléchargement de {0} de {1} ({2} restant)"
@@ -1816,25 +1907,6 @@ msgstr "Les erreurs suivantes sont survenues lors du téléchargement : {0}"
msgid "Errors during download"
msgstr "Des erreurs sont survenues lors du téléchargement."
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Il y a eu {0} conflit lors de l’importation."
-msgstr[1] "Il y a eu {0} conflits lors de l’importation."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflit lors du téléchargement"
-msgstr[1] "Conflits lors du téléchargement"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Chargement des parents du nœud {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Chargement des parents du chemin {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Chargement des parents de la relation {2}"
-
msgid "Error during download"
msgstr "Une erreur est survenue lors du téléchargement."
@@ -1912,7 +1984,7 @@ msgid "Finish drawing."
msgstr "Terminer le chemin."
msgid "FIX"
-msgstr ""
+msgstr "Correctif"
msgid "draw angle snap"
msgstr "tracer des angles discrets"
@@ -1973,10 +2045,10 @@ msgstr ""
"créer un nouveau rectangle, double-cliquez pour ajouter un nouveau nœud."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Extruder: ligne principale"
msgid "Extrude: helper line"
-msgstr ""
+msgstr "Extruder: ligne de guide"
msgid "Extrude Way"
msgstr "Extruder un chemin"
@@ -1987,6 +2059,9 @@ msgstr "Améliorer la précision des chemins"
msgid "Improve Way Accuracy mode"
msgstr "Améliorer la précision des chemins"
+msgid "improve way accuracy helper line"
+msgstr "ligne de guide d''amélioration de la précision des chemins"
+
msgid "Click on the way to start improving its shape."
msgstr "Cliquez sur le chemin pour commencer à améliorer sa forme."
@@ -2018,10 +2093,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Impossible de placer un nœud hors du monde."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Ajouter un nœud au chemin"
-msgstr[1] "Ajouter un nœud à {0} chemins"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Ajout d'un nouveau noeud au chemin"
+msgstr[1] "Ajout d'un nouveau jeu aux {0} chemins"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Impossible de supprimer un nœud référencé par plusieurs objets"
@@ -2035,6 +2110,9 @@ msgstr "Parallèle"
msgid "Make parallel copies of ways"
msgstr "Créer des chemins parallèles"
+msgid "make parallel helper line"
+msgstr "ligne de guide de parallélisme"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2165,7 +2243,7 @@ msgid "Call relation editor for selected relation"
msgstr "Modifier la relation dans l’éditeur de relation"
msgid "Select in relation list"
-msgstr "Sélectionner la relation dan la liste"
+msgstr "Sélectionner la relation dans la liste"
msgid "Select relation in relation list."
msgstr "Sélectionner la relation dans la liste des relations"
@@ -2268,7 +2346,7 @@ msgid "regular expression"
msgstr "Expression régulière"
msgid "add toolbar button"
-msgstr "Bouton de la barre d''outils"
+msgstr "Bouton de la barre d’’outils"
msgid "Filter"
msgstr "Filtrer"
@@ -2335,14 +2413,14 @@ msgstr ""
"<b>relation</b>)"
msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objets modifiés par l''utilisateur"
+msgstr "<b>user:</b>... - objets modifiés par l’’utilisateur"
msgid "<b>user:anonymous</b> - objects changed by anonymous users"
msgstr ""
"<b>user:anonymous</b> - objets modifiés par des utilisateurs anonymes"
msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b>id:</b>... - objets avec l''ID donné (0 pour les nouveaux objets)"
+msgstr "<b>id:</b>... - objets avec l’’ID donné (0 pour les nouveaux objets)"
msgid ""
"<b>version:</b>... - objects with given version (0 objects without an "
@@ -2355,7 +2433,7 @@ msgid ""
"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
"assigned changeset)"
msgstr ""
-"<b>changeset:</b>... - objets avec l''ID de groupe de modifications donné (0 "
+"<b>changeset:</b>... - objets avec l’’ID de groupe de modifications donné (0 "
"pour les objets sans groupe de modifications assigné)"
msgid ""
@@ -2370,7 +2448,7 @@ msgid ""
"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
msgstr ""
-"<b>tags:</b>... - objets avec le nombre d''attributs donné "
+"<b>tags:</b>... - objets avec le nombre d’’attributs donné "
"(<b>tags:</b>compte, <b>tags:</b>min-max, <b>tags:</b>min- ou <b>tags:</b>-"
"max)"
@@ -2491,6 +2569,9 @@ msgstr "\"valeur\" dans n’importe quelle clé"
msgid "matches if ''key'' exists"
msgstr "correspond si \"clé\" existe"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "combinateurs"
@@ -2528,7 +2609,7 @@ msgid "all closed ways"
msgstr "tous les chemins fermés"
msgid "object without useful tags"
-msgstr ""
+msgstr "objet sans attribut utile"
msgid "metadata"
msgstr "métadonnées"
@@ -2648,7 +2729,7 @@ msgid ""
"\n"
"{2}"
msgstr ""
-"L’expression régulière ''{0}'' a une erreur de syntaxe à l’offset {1}. "
+"L’expression régulière ’’{0}’’ a une erreur de syntaxe à l’offset {1}. "
"Détail de l’erreur :\n"
"\n"
"{2}"
@@ -2666,14 +2747,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "<i>min</i>/<i>max</i> attendu après ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Identifiant de l’objet attendu"
+msgid "Range of primitive ids expected"
+msgstr "Intervalle d’identifiants d’objets attendu"
-msgid "Changeset id expected"
-msgstr "Identifiant du groupe de modifications attendu"
+msgid "Range of changeset ids expected"
+msgstr "Intervalle d’identifiants de groupe de modifications attendu"
-msgid "Version expected"
-msgstr "Version attendue"
+msgid "Range of versions expected"
+msgstr "Intervalle de versions attendu"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2684,6 +2765,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Type d’objet inconnu : {0}. Les valeurs autorisées sont node, way ou relation"
+msgid "Primitive id expected"
+msgstr "Identifiant de l’objet attendu"
+
msgid "Range of numbers expected"
msgstr "Série de nombres attendus"
@@ -2702,11 +2786,8 @@ msgstr "Paramètre manquant pour XOR (ou exclusif)"
msgid "Missing operator for NOT"
msgstr "Paramètre manquant pour NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Attention : coupure automatique de la valeur de l’attribut ''{0}'' sur "
-"l’objet supprimé {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2801,6 +2882,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "{0} objet ajouté"
msgstr[1] "{0} objets ajoutés"
+msgid "New way {0} has 0 nodes"
+msgstr "Le nouveau way {0} ne possède 0 noeud"
+
msgid "Change node {0}"
msgstr "Modifier le nœud {0}"
@@ -2832,19 +2916,19 @@ msgid "Set {0}={1} for relation ''{2}''"
msgstr "Définir {0}={1} pour la relation ''{2}''"
msgid "Remove \"{0}\" for {1} objects"
-msgstr "Retirer ''{0}'' pour {1} objets"
+msgstr "Retirer ’’{0}’’ pour {1} objets"
msgid "Set {0}={1} for {2} objects"
msgstr "Définir {0}={1} pour {2} objets"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "{0} propriétés supprimées pour {1} objets"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "Suppression de {0} tag(s) sur {1} objet(s)"
-msgid "Set {0} properties for {1} objects"
-msgstr "{0} propriétés définies pour {1} objets"
+msgid "Set {0} tags for {1} objects"
+msgstr "Modification de {0} attributs pour {1} objets"
msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr "Remplacer ''{0}'' par ''{1}'' pour"
+msgstr "Remplacer ’’{0}’’ par ’’{1}’’ pour"
msgid "object"
msgid_plural "objects"
@@ -2865,11 +2949,11 @@ msgid "Double conflict"
msgstr "Double conflit"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Attention : le calque ''{0}'' n’existe plus. Impossible de retirer le "
-"conflit sur l’objet ''{1}''."
+"Le calque ''{0}'' n''existe plus. Impossible de supprimer le conflit pour "
+"l''objet ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Ajouter le conflit sur ''{0}''"
@@ -2988,6 +3072,9 @@ msgstr[1] "{0} objets enlevés"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Résoudre les conflits de la liste des membres de la relation {0}"
+msgid "Removed nodes from {0}"
+msgstr "Supprimer les noeuds de {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Faire pivoter {0} nœud"
@@ -3031,7 +3118,7 @@ msgid "Main dataset does not include node {0}"
msgstr "Le jeu de données principal ne contient pas le nœud {0}"
msgid "Apply?"
-msgstr "Appliquer ?"
+msgstr "Appliquer ?"
msgid ""
"<html>You are going to reverse the way ''{0}'',<br/> whose semantic meaning "
@@ -3042,17 +3129,23 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
+"<html>Vous allez inverser le sens du chemin ''{0}'',<br/> ce sens est une "
+"caractéristique importante du tag \"{1}\" car il définit une direction "
+"(flux, circulation,...).<br/>Voulez-vous réellement modifier ce sens et donc "
+"cette caractéristique ?</html>"
msgstr[1] ""
+"<html>Vous allez inverser le sens du chemin ''{0}'',<br/> ce sens est une "
+"caractéristique importante des tags suivants car il définit une direction "
+"(flux, circulation,...).<br/>{1}Voulez-vous réellement modifier ce sens et "
+"donc cette caractéristique ?</html>"
msgid "Reverse directional way."
msgstr "Inversion du sens du tracé"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Les modifications de ces attributs sont suggérées pour préserver la "
-"cohérence des données lors de l’inversion du chemin."
msgid "Relation"
msgstr "Relation"
@@ -3081,10 +3174,10 @@ msgstr "Appliquer les modifications"
msgid "Do not apply changes"
msgstr "Ne pas appliquer les modifications"
-msgid "Please select which property changes you want to apply."
-msgstr "Sélectionnez les modifications que vous voulez appliquer :"
+msgid "Please select which changes you want to apply."
+msgstr "Merci de sélectionner quel changement vous désirez appliquer"
-msgid "Properties of "
+msgid "Tags of "
msgstr "Attributs de "
msgid "Roles in relations referring to"
@@ -3109,6 +3202,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Impossible de supprimer l’ancien fichier de sauvegarde {0}"
+msgid "Your work has been saved automatically."
+msgstr "Votre travail sera automatiquement sauvegardé"
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Erreur pendant la création de la sauvegarde du calque supprimé : {0}"
@@ -3138,26 +3234,24 @@ msgid ""
"default value is unknown at this moment.<br/> Please activate corresponding "
"function manually and retry importing."
msgstr ""
-"<html>Le fichier de paramètres demande d''ajouter les préférences à "
+"<html>Le fichier de paramètres demande d’’ajouter les préférences à "
"<b>{0}</b>,<br/> mais sa valeur par défaut est inconnue à cet instant.<br/> "
"Veuillez activer la fonction correspondante manuellement et recommencer "
-"l''import."
+"l’’import."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Avertissement : échec de création du répertoire cache manquant : {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Échec de création du répertoire cache manquant : {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Attention : impossible de forcer les préférences pour ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Attention : l’initialisation des préférences a échoué. Le dossier des "
-"préférences ''{0}'' n’est pas un dossier."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3167,11 +3261,9 @@ msgstr ""
"préférences ''{0}'' n’est pas un dossier.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Attention : l’initialisation des préférences a échoué. Impossible de créer "
-"le dossier manquant des préférences : {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3180,18 +3272,14 @@ msgstr ""
"<html>L’initialisation des préférences a échoué.<br>Impossible de créer le "
"dossier manquant des préférences : {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Info: fichier de préférences ''{0}'' manquant. Création d''un fichier de "
+"Fichier de préférences ''{0}'' manquant. Création d''un nouveau fichier de "
"préférences par défaut."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Attention : remplacement du fichier des préférences ''{0}'' par le fichier "
-"par défaut."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3209,11 +3297,11 @@ msgstr ""
"préférences par défaut.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Attention: Impossible d''initialiser les préférences. Erreur lors de la "
-"réinitialisation du fichier de préférences à sa valeur par défaut: {0}"
+"Impossible d''initialiser les préférences. Impossible de réinitialiser le "
+"fichier de préférences à sa valeur par défaut : {0}"
msgid "Paint style {0}: {1}"
msgstr "Modèle de rendu {0} : {1}"
@@ -3242,14 +3330,13 @@ msgstr "La ressource ''{0}'' n’a pas pu être chargée. Erreur : {1}"
msgid "UNKNOWN"
msgstr "inconnue"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Avertissement: Numéro de version de JOSM inattendu dans le fichier des "
-"révisions, sa valeur est ''{0}''"
+"Numéro de version de JOSM inattendu dans le fichier de révision, la valeur "
+"est ''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Attention : le fichier de révision \"/REVISION\" est manquant."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Le fichier de révision ''/REVISION'' est manquant."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Un conflit est déjà enregistré pour l’objet ''{0}''"
@@ -3315,9 +3402,9 @@ msgid ""
"Please report this at http://josm.openstreetmap.de/. This is not a critical "
"error, it should be safe to continue in your work."
msgstr ""
-"JOSM s''attendait à trouver la primitive [{0} {1}] dans le jeu de données "
-"mais elle n''y est pas. Merci de remonter ce problème sur "
-"http://josm.openstreetmap.de/. Il ne s''agit pas d''une erreur critique, "
+"JOSM s’’attendait à trouver la primitive [{0} {1}] dans le jeu de données "
+"mais elle n’’y est pas. Merci de remonter ce problème sur "
+"http://josm.openstreetmap.de/. Il ne s’’agit pas d’’une erreur critique, "
"vous devriez pouvoir continuer à travailler en toute sécurité."
msgid "Missing merge target for way with id {0}"
@@ -3403,7 +3490,7 @@ msgid "Cannot add node {0} to incomplete way {1}."
msgstr "Impossible d’ajouter le nœud {0} au chemin incomplet {1}."
msgid "Nodes in way must be in the same dataset"
-msgstr "Les nœuds d''un chemin doivent apartenir au même jeu de données"
+msgstr "Les nœuds d’’un chemin doivent apartenir au même jeu de données"
msgid "Deleted node referenced by {0}"
msgstr "Nœud supprimé référencé par {0}"
@@ -3421,11 +3508,8 @@ msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
"Le paramètre {0} n’est pas dans la plage 0…{1}. Actuellement il est ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Erreur : le chargement de la classe \"{0}\" du rendu de carte a échoué. La "
-"classe n’a pas été trouvée."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3541,8 +3625,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Identifiant de datum inconnu: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum requis (+datum=*, +towgs84=* ou +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr ""
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3563,6 +3647,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Nombre d''arguments inattendu pour le paramètre ''+bounds'' (doit être 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Paramètre inconnu ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Nombre attendu pour le paramètre ''{0}''"
@@ -3583,11 +3670,6 @@ msgstr "Projection personnalisée"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Erreur: impossible d''ouvrir le flux d''entrée pour la ressource "
-"''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3628,6 +3710,9 @@ msgstr "autre validation"
msgid "Running test {0}"
msgstr "Test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Test ''{0}'' exécuté en {1}"
+
msgid "Addresses"
msgstr "Adresse"
@@ -3648,11 +3733,20 @@ msgid "Duplicate house numbers"
msgstr "Numéros dupliqués"
msgid "Multiple street names in relation"
-msgstr "Plusieurs nom de rues dans al relation"
+msgstr "Plusieurs nom de rues dans la relation"
msgid "House number too far from street"
msgstr "Numéro trop loin de la rue"
+msgid "Barriers and entrances"
+msgstr "Barrières et portails"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Test pour barrières et portails"
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Le type de barrière n'est pas défini"
+
msgid "Building inside building"
msgstr "Bâtiment à l’intérieur d’un autre"
@@ -3691,7 +3785,7 @@ msgid "Crossing waterways"
msgstr "Croisement de tracé de cours d’eau"
msgid "Crossing waterway/highway"
-msgstr "cours d''eau/route se croisant"
+msgstr "cours d’’eau/route se croisant"
msgid "Crossing ways"
msgstr "Chemins se croisant"
@@ -3714,15 +3808,15 @@ msgstr " ou "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} est déprécié, utiliser {1} à la place"
+msgid "{0} is unnecessary"
+msgstr "{0} n''est pas nécessaire"
+
msgid "Duplicated nodes"
msgstr "Nœuds dupliqués"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Vérifier si des nœuds occupent exactement la même position."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Nœuds dupliqués dans deux chemins non fermés"
-
msgid "Mixed type duplicated nodes"
msgstr "Nœuds dupliqués de plusieurs types"
@@ -3790,6 +3884,24 @@ msgstr "Nœuds de chemin dupliqués"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Vérifier si les chemins ont des nœuds consécutifs identiques."
+msgid "Highways"
+msgstr "Routes"
+
+msgid "Performs semantic checks on highways."
+msgstr "Effectue des contrôles sémantiques sur les routes."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Rond-point incorrect (highway: {0} à la place de {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Information de passage piéton manquante"
+
+msgid "Unknown country code: {0}"
+msgstr "Code pays inconnu : {0}"
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr "Contexte source:maxspeed inconnu : {0}"
+
msgid "Multipolygon"
msgstr "Multipolygone"
@@ -3844,7 +3956,7 @@ msgid "A name:* translation is missing."
msgstr "Le nom : * traduction est manquant"
msgid "A name is missing, even though name:* exists."
-msgstr "Une clé ''name'' est manquante, même si une clé ''name: *'' existe."
+msgstr "Une clé ’’name’’ est manquante, même si une clé ’’name: *’’ existe."
msgid "Nodes duplicating way tags"
msgstr "Nœuds dupliquant les attributs du chemin"
@@ -3863,6 +3975,12 @@ msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
"Chercher les nœuds avec un nom similaire qui pourraient être dupliqués."
+msgid "Opening hours syntax"
+msgstr "Syntaxe des heures d'ouverture"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr "Ce test vérifie la bonne syntaxe des heures d'ouverture"
+
msgid "Overlapping Areas"
msgstr "Zones superposées"
@@ -3924,15 +4042,15 @@ msgstr "Le type de relation est inconnu"
msgid "Relation is empty"
msgstr "La relation est vide"
+msgid "Role verification problem"
+msgstr "Problème de vérification de rôle"
+
msgid "<empty>"
msgstr "<vide>"
msgid "Role {0} missing"
msgstr "Le rôle {0} manque"
-msgid "Role verification problem"
-msgstr "Problème de vérification de rôle"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Nombre de rôles {0} trop bas ({1})"
@@ -3963,11 +4081,11 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr "Vérifier les chemins avec des noms similaires ou mal orthographiés."
-msgid "Properties checker :"
-msgstr "Vérificateur d’attributs :"
+msgid "Tag checker"
+msgstr "Test de tag"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Vérifier les erreurs dans les clés et les valeurs."
+msgid "This test checks for errors in tag keys and values."
+msgstr "Ce test vérifie les erreurs dans les tags et valeurs"
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Ligne du vérificateur d’attributs invalide - {0} : {1}"
@@ -4111,8 +4229,8 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Utiliser le fichier de vérification orthographique par défaut (recommandé)."
-msgid "Fix properties"
-msgstr "Corriger les propriétés"
+msgid "Fix tags"
+msgstr "Correctif de tag"
msgid "Could not find element type"
msgstr "Impossible de trouver le type element"
@@ -4190,6 +4308,9 @@ msgstr "Chemins non fermés"
msgid "This tests if ways which should be circular are closed."
msgstr "Vérifier si les chemins circulaires sont fermés."
+msgid "Unclosed way"
+msgstr "Chemin non fermé"
+
msgid "natural type {0}"
msgstr "type Nature {0}"
@@ -4220,9 +4341,6 @@ msgstr "bâtiment"
msgid "area"
msgstr "zone"
-msgid "Unclosed way"
-msgstr "Chemin non fermé"
-
msgid "Unconnected ways"
msgstr "Chemins non connectés"
@@ -4247,12 +4365,12 @@ msgstr "nœuds sans attribut et non connectés"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "Vérifier les nœuds sans attribut ne faisant partie d’aucun chemin."
-msgid "No tags"
-msgstr "Aucun attribut"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nœuds non connectés et sans attribut"
+msgid "No tags"
+msgstr "Aucun attribut"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "A un attribut contenant « fixme » ou « FIXME »"
@@ -4314,27 +4432,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr "Terre inversée : la terre n’est pas sur le coté gauche du chemin"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Le nombre d’argument n’est pas valide pour le signet"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Une erreur est survenue lors de la lecture du signet : %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Erreur : ligne ''{0}'' inattendue dans le fichier des signets ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erreur : valeur double erronée ''{0}'' à la ligne ''{1}'' dans le fichier "
-"des signets ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Impossible de lire les signets depuis<br>''{0}''<br>Erreur : {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Ne plus afficher"
@@ -4412,7 +4509,7 @@ msgid "Authentication Failed"
msgstr "L’identification a échoué"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr ""
+msgstr "L''accès à la version rédigée ''{0}'' de {1} {2} est interdit."
msgid "Authorisation Failed"
msgstr "L’autorisation a échoué"
@@ -4438,9 +4535,8 @@ msgstr "Afficher l’aide"
msgid "Downloading \"Message of the day\""
msgstr "Téléchargement du \"Message du jour\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr ""
-"Avertissement: impossible de lire le message du jour. L''exception était: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Impossible de lire le message du jour. L''exception était : {0}"
msgid "Message of the day not available"
msgstr "Message du jour indisponible"
@@ -4657,9 +4753,24 @@ msgstr "Affichage"
msgid "Tools"
msgstr "Outils"
+msgid "More tools"
+msgstr "Plus d’outils"
+
+msgid "Data"
+msgstr "Données"
+
+msgid "Selection"
+msgstr "Sélection"
+
msgid "Presets"
msgstr "Attributs"
+msgid "More..."
+msgstr "Plus…"
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Fenêtres"
@@ -4670,17 +4781,30 @@ msgid "Save and load the current session (list of layers, etc.)"
msgstr "Enregistrer et charger la session courante (liste de calques, etc.)"
msgid "Edit toolbar"
-msgstr "Barre d''outils d''édition"
+msgstr "Barre d’’outils d’’édition"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
-"Change la visibilité de la barre d''outils d''édition (la barre verticale)"
+"Change la visibilité de la barre d’’outils d’’édition (la barre verticale)"
+
+msgid "Preset preferences"
+msgstr "Préférences des modèles"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+"Cliquez pour ouvrir l''onglet des modèles d''attributs dans les préférences"
+
+msgid "Imagery preferences"
+msgstr "Préférences d''imagerie"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Cliquez pour ouvrir l''onglet d''imagerie dans les préférences"
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
-msgstr "Masquer la barre d''outils d''édition"
+msgid "Do not hide toolbar"
+msgstr "Ne pas cacher la barre d’outils"
msgid "Hide this button"
msgstr "Masquer ce bouton"
@@ -4688,6 +4812,9 @@ msgstr "Masquer ce bouton"
msgid "Click the arrow at the bottom to show it again."
msgstr "Cliquez sur la flèche au bas pour l’afficher de nouveau."
+msgid "Hide edit toolbar"
+msgstr "Masquer la barre d’’outils d’’édition"
+
msgid "Hide or show this toggle button"
msgstr "Masquer ou afficher ce bouton"
@@ -4710,7 +4837,7 @@ msgid "Zoom in"
msgstr "Zoomer en avant"
msgid "Zoom out"
-msgstr "Zoomer en arrière"
+msgstr "Dézoomer"
msgid "scale"
msgstr "échelle"
@@ -4749,6 +4876,9 @@ msgstr "(aucune sélection)"
msgid "User:"
msgstr "Utilisateur :"
+msgid "Do not hide status bar"
+msgstr "Ne pas cacher la barre de statut"
+
msgid "Layer not in list."
msgstr "Le calque n’est pas dans la liste."
@@ -4776,20 +4906,6 @@ msgstr "En arrière-plan"
msgid "Click to run job in background"
msgstr "Cliquez pour lancer la tâche en arrière-plan"
-msgid "false: the property is explicitly switched off"
-msgstr "faux : la propriété est désactivée"
-
-msgid "true: the property is explicitly switched on"
-msgstr "coché : la propriété est activée"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"partiel : les objets sélectionnés ont différentes valeurs, ne pas modifier"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "décoché : ne pas utiliser cette propriété sur la sélection"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4806,7 +4922,7 @@ msgid "Details..."
msgstr "Détails..."
msgid "Hide this message and never show it again"
-msgstr "Masquer ce message et ne plus jamais l''afficher"
+msgstr "Masquer ce message et ne plus jamais l’’afficher"
msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
@@ -5081,7 +5197,7 @@ msgid ""
"List of merged elements. They will replace the list of my elements when the "
"merge decisions are applied."
msgstr ""
-"Liste d''éléments fusionnés. Ils remplaceront la liste de mes éléments quand "
+"Liste d’’éléments fusionnés. Ils remplaceront la liste de mes éléments quand "
"les décisions de fusion seront appliquées."
msgid "Their version"
@@ -5104,6 +5220,9 @@ msgstr "> bas"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "Copier mes nœuds sélectionnés à la fin de la version fusionnée"
+msgid "> before"
+msgstr "> avant"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5111,6 +5230,9 @@ msgstr ""
"Copier mes nœuds sélectionnés avant le premier nœud sélectionné de la "
"version fusionnée"
+msgid "> after"
+msgstr "> après"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5118,14 +5240,23 @@ msgstr ""
"Copier mes nœuds sélectionnés après le premier nœud sélectionné de la "
"version fusionnée"
+msgid "< top"
+msgstr "< haut"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "Copier leurs nœuds sélectionnés au début de la version fusionnée"
+msgid "< bottom"
+msgstr "< bas"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "Copier leurs nœuds sélectionnés à la fin de la version fusionnée"
+msgid "< before"
+msgstr "< avant"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5133,6 +5264,9 @@ msgstr ""
"Copier leurs nœuds sélectionnés avant le premier nœud sélectionné de la "
"version fusionnée"
+msgid "< after"
+msgstr "< après"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5149,8 +5283,8 @@ msgstr "Copier tous leurs nœuds dans la version fusionnée"
msgid "Up"
msgstr "Monter"
-msgid "Move up the selected elements by one position."
-msgstr "Monter les nœuds sélectionnés"
+msgid "Move up the selected entries by one position."
+msgstr "Déplacer vers le haut les entrées sélectionnées d''un cran."
msgid "Down"
msgstr "Descendre"
@@ -5204,16 +5338,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Version du serveur ({0} élément)"
msgstr[1] "Version du serveur ({0} éléments)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Le réglage {0} n’est pas encore enregistré. Impossible de régler la "
-"synchronisation."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Le réglage {0} n’est pas encore enregistré."
-
msgid "Node"
msgstr "Nœud"
@@ -5360,13 +5484,13 @@ msgid_plural ""
msgstr[0] ""
"Vous êtes sur le point de combiner {1} objets, qui font partie de {0} "
"relation :<br/>{2}Combiner ces objets peut casser cette relation. Si vous "
-"n''êtes pas sûr, veuillez annuler l''opération.<br/>Si vous voulez "
+"n’’êtes pas sûr, veuillez annuler l’’opération.<br/>Si vous voulez "
"continuer, une boîte de dialogue va vous aider à décider comment adapter la "
"relation.<br/><br/>Voulez-vous continuer ?"
msgstr[1] ""
"Vous êtes sur le point de combiner {1} objets, qui font partie de {0} "
"relations :<br/>{2}Combiner ces objets peut casser ces relations. Si vous "
-"n''êtes pas sûr, veuillez annuler l''opération.<br/>Si vous voulez "
+"n’’êtes pas sûr, veuillez annuler l’’opération.<br/>Si vous voulez "
"continuer, une boîte de dialogue va vous aider à décider comment adapter les "
"relations.<br/><br/>Voulez-vous continuer ?"
@@ -5495,19 +5619,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Clé :"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Entrer un nom d’attribut, par exemple "
-"<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valeur :"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"Entrer une valeur d’attribut, par exemple <strong><tt>vérifier les "
-"membres</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5621,6 +5741,8 @@ msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Sélectionne les objets qui prennent part à cette commande (sauf si "
+"actuellement supprimés) et puis, \"des zooms à ça\""
msgid "Undo the selected and all later commands"
msgstr "Annuler cette commande et les suivantes"
@@ -5940,7 +6062,7 @@ msgstr "Les 2 objets sélectionnés ont des caches de style différents."
msgid ""
"Warning: The 2 selected objects have equal, but not identical style caches."
msgstr ""
-"Attention: Les 2 objets sélectionnés sont égaux, mais n''ont pas les mêmes "
+"Attention: Les 2 objets sélectionnés sont égaux, mais n’’ont pas les mêmes "
"caches de style."
msgid "xml"
@@ -6084,6 +6206,9 @@ msgstr "Afficher/Masquer"
msgid "Information about layer"
msgstr "Informations sur le calque"
+msgid "Map paint preferences"
+msgstr "Préférences du rendu de carte"
+
msgid "Map Paint Styles"
msgstr "Coloriage"
@@ -6123,10 +6248,10 @@ msgid "Save a copy of this Style to file and add it to the list"
msgstr "Enregistrer et ajouter une copie de ce modèle à la liste"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "Fichier de style (*.mapcss, *.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "Fichier de style de carte (*.xml, *.zip)"
msgid "Reloading style sources"
msgstr "Actualisation des modèles"
@@ -6156,7 +6281,7 @@ msgid "Path:"
msgstr "Emplacement :"
msgid "Icon:"
-msgstr "Icône :"
+msgstr "Icône?:"
msgid "Background:"
msgstr "Arrière-plan :"
@@ -6167,11 +6292,41 @@ msgstr "Modèle actuellement actif ?"
msgid "No"
msgstr "Non"
-msgid "Relations"
-msgstr "Relations"
+msgid "Object type:"
+msgstr "Type :"
-msgid "Open a list of all relations."
-msgstr "Afficher la liste des relations"
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "mixte"
+
+msgid "Choose the OSM object type"
+msgstr "Sélectionner le type d’objet OSM"
+
+msgid "Object ID:"
+msgstr "Identifiant :"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Veuillez saisir l’identifiant de l’objet à télécharger"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Les identifiants peuvent être séparés par des virgules ou des espaces.<br> "
+"Exemples : <b><ul><li>1 2 5</li><li>1,2,5</li></ul></b> En mode mixte, "
+"spécifiez les objets comme ceci : <b>w123, n110, w12, r15</b><br>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
+msgid "Relations"
+msgstr "Relations"
+
+msgid "Open a list of all relations."
+msgstr "Afficher la liste des relations"
msgid "Relation list filter"
msgstr "Filtre de la liste des relations"
@@ -6188,9 +6343,6 @@ msgstr "Relations : {0}/{1}"
msgid "Relations: {0}"
msgstr "Relations : {0}"
-msgid "Selection"
-msgstr "Sélection"
-
msgid "Open a selection list window."
msgstr "Afficher la fenêtre de sélection"
@@ -6215,20 +6367,8 @@ msgstr "Non sélectionnable maintenant"
msgid "Selection: {0}"
msgstr "Sélection : {0}"
-msgid "Side buttons"
-msgstr "Boutons latéraux"
-
-msgid "Always shown"
-msgstr "Toujours affiché"
-
-msgid "Dynamic"
-msgstr "Dynamique"
-
-msgid "Always hidden"
-msgstr "Toujours caché"
-
msgid "Toggle dynamic buttons"
-msgstr "Basculer l''affichage des boutons dynamiques"
+msgstr "Basculer l’’affichage des boutons dynamiques"
msgid "Open preferences for this panel"
msgstr "Ouvrir les préférences pour ce panneau"
@@ -6243,6 +6383,18 @@ msgstr "Fermer le panneau"
msgid "Click to minimize/maximize the panel content"
msgstr "Réduire/Agrandir le panneau"
+msgid "Side buttons"
+msgstr "Boutons latéraux"
+
+msgid "Always shown"
+msgstr "Toujours affiché"
+
+msgid "Dynamic"
+msgstr "Dynamique"
+
+msgid "Always hidden"
+msgstr "Toujours caché"
+
msgid "Authors"
msgstr "Auteurs"
@@ -6260,11 +6412,8 @@ msgstr "Sélectionner les objets de cet utilisateur"
msgid "Launches a browser with information about the user"
msgstr "Afficher le profil de cet utilisateur"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Attention : le navigateur a été ouvert pour le premier {0} des {1} "
-"utilisateurs"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6291,9 +6440,6 @@ msgstr "Afficher le validateur de données"
msgid "Validation results"
msgstr "Validation"
-msgid "Zoom to problem"
-msgstr "Zoomer sur le conflit"
-
msgid "Fix"
msgstr "Réparer"
@@ -6443,9 +6589,6 @@ msgstr "Modifier le contenu"
msgid "Update the changeset content from the OSM server"
msgstr "Mettre à jour le contenu du groupe de modifications"
-msgid "Show history"
-msgstr "Afficher l’historique"
-
msgid "Download and show the history of the selected objects"
msgstr "Télécharger et afficher l’historique de la sélection"
@@ -6671,8 +6814,8 @@ msgid ""
"<html>Please enter valid date/time values to restrict<br>the query to a "
"specific time range.</html>"
msgstr ""
-"<html>Entrez des valeurs jour/heure valides pour limiter<br>la requête à une "
-"période spécifique.</html>"
+"<html>Entrez des valeurs jour/heure valides pour restreindre<br>la requête à "
+"une période spécifique.</html>"
msgid "Invalid date/time values"
msgstr "Les valeurs date/temps ne sont valides"
@@ -6774,11 +6917,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Télécharger les groupes de modifications du calque</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Attention : la valeur pour la préférence ''{0}'' est inattendue. "
-"Actuellement elle est ''{1}''. Rétablissement de la requête par défaut."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6849,35 +6990,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Cette adresse web n’est pas valide"
-msgid "Select objects for which to change properties."
-msgstr "Sélectionnez les objets pour lesquels modifier les propriétés."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Propriétés/Appartenances"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Afficher les propriétés de la sélection"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<différent>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr "Attributs/Appartenance"
+
+msgid "Tags for selected objects."
+msgstr "Attributs pour les objets sélectionnés."
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr "Position"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Attributs : {0} / Appartenances : {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Attributs : {0} / Appartenance : {1}"
-msgid "Properties / Memberships"
-msgstr "Attributs et appartenances"
+msgid "Tags / Memberships"
+msgstr "Attributs / Appartenance"
msgid "Delete the selected key in all objects"
msgstr "Supprimer l’attribut"
-msgid "Delete Properties"
-msgstr "Supprimer des propriétés"
+msgid "Delete Tags"
+msgstr "Supprimer les attributs"
msgid "Change relation"
msgstr "Modifier la relation"
@@ -6891,14 +7044,14 @@ msgstr "Voulez-vous vraiment supprimer la sélection de la relation {0} ?"
msgid "Add a new key/value pair to all objects"
msgstr "Ajouter un nouvel attribut"
-msgid "Add Property"
-msgstr "Ajouter une propriété"
+msgid "Add Tag"
+msgstr "Ajouter un tag"
msgid "Edit the value of the selected key for all objects"
msgstr "Modifier l’attribut"
-msgid "Edit Properties"
-msgstr "Modifier les propriétés"
+msgid "Edit Tags"
+msgstr "Modifier les attributs"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Aller sur la page wiki de description de l’attribut (F1)"
@@ -6940,13 +7093,13 @@ msgid ""
"node/way/relation)"
msgstr ""
"Rechercher avec la clé et la valeur de l’attribut sélectionné, restreint au "
-"type (c''est à dire, nœud/chemin/relation)"
+"type (c’’est à dire, nœud/chemin/relation)"
msgid "Search Key/Value"
msgstr "Rechercher Clé/Valeur"
msgid "Search with the key and value of the selected tag"
-msgstr "Rechercher avec la clé et la valeur de l''attribut sélectionné"
+msgstr "Rechercher avec la clé et la valeur de l’’attribut sélectionné"
msgid "Change value?"
msgid_plural "Change values?"
@@ -6982,12 +7135,6 @@ msgstr[1] "Modifier les propriétés de {0} objets"
msgid "Use English language for tag by default"
msgstr "Utiliser la langue anglaise pour les attributs par défaut"
-msgid "Paste tag"
-msgstr "Coller l’attribut"
-
-msgid "Paste value"
-msgstr "Coller la valeur"
-
msgid "Add value?"
msgstr "Ajouter un attribut"
@@ -7018,9 +7165,15 @@ msgstr "Entrez un entier entre 0 et {0}"
msgid "Recently added tags"
msgstr "Attributs récemment ajoutés"
+msgid "Choose recent tag {0}"
+msgstr "Choisir l''attribut récent {0}"
+
msgid "Use this tag again"
msgstr "réutilisez cette balise"
+msgid "Apply recent tag {0}"
+msgstr "Appliquer l''attribut récent {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "La clé ''{0}'' est déjà utilisée"
@@ -7060,10 +7213,8 @@ msgstr "La relation est supprimée."
msgid "Downloading relation {0}"
msgstr "Téléchargement de la relation {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Avertissement: Exception ignorée en raison de l''annulation de la tâche. "
-"Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Exception ignorée parce que la tâche a été annulée. Exception: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7129,6 +7280,11 @@ msgstr "Les enlever et nettoyer la relation"
msgid "Ignore them, leave relation as is"
msgstr "Les ignorer, laisser la relation telle quelle."
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Désolé, le raccourci \"{0}\" ne peut pas être activé dans l''éditeur de "
+"relation"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7276,7 +7432,7 @@ msgstr ""
"Cliquez pour rejeter les modifications et fermer cet éditeur de relation"
msgid "Cancel, continue editing"
-msgstr "Annuler, continuer l''édition"
+msgstr "Annuler, continuer l’’édition"
msgid ""
"<html>The relation has been changed.<br><br>Do you want to save your "
@@ -7406,6 +7562,26 @@ msgid "way is not connected to previous or next relation member"
msgstr ""
"le chemin n’est pas connecté au précédent membre de la relation ni au suivant"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Le nombre d’argument n’est pas valide pour le signet"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Une erreur est survenue lors de la lecture du signet : %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Ligne inattendue ''{0}'' dans le fichier de favoris ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Impossible de lire les signets depuis<br>''{0}''<br>Erreur : {1}</html>"
+
msgid "Bookmarks"
msgstr "Signets"
@@ -7474,9 +7650,6 @@ msgstr "La latitude doit être dans la plage [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "La longitude doit être dans la plage [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Coller l’adresse web contenue dans le presse-papier"
-
msgid "Data Sources and Types:"
msgstr "Sources et types :"
@@ -7554,21 +7727,8 @@ msgstr "Télécharger les référents (relations parentes)"
msgid "Download object"
msgstr "Télécharger un objet"
-msgid "Object type:"
-msgstr "Type :"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "mixte"
-
-msgid "Choose the OSM object type"
-msgstr "Sélectionner le type d’objet OSM"
-
-msgid "Object ID:"
-msgstr "Identifiant :"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Veuillez saisir l’identifiant de l’objet à télécharger"
+msgid "Start downloading"
+msgstr "Télécharger l’objet"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7581,28 +7741,9 @@ msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
"Sélectionnez si les membres de la relation doivent également être téléchargés"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Les identifiants peuvent être séparés par des virgules ou des espaces.<br> "
-"Exemples : <b><ul><li>1 2 5</li><li>1,2,5</li></ul></b> En mode mixte, "
-"spécifiez les objets comme ceci : <b>w123, n110, w12, r15</b><br>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Télécharger les référents (relations parentes et chemins)"
-msgid "Start downloading"
-msgstr "Télécharger l’objet"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Liste d’identifiants invalide\n"
-"Impossible de télécharger les objets."
-
msgid "Class Type"
msgstr "Classe"
@@ -7661,11 +7802,11 @@ msgid ""
"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
"English</a>.</p></html>"
msgstr ""
-"<html><p class=\"warning-header\">Contenu de l''aide manquant pour ce "
-"sujet</p><p class=\"warning-body\">Le contenu de l''aide pour le sujet "
-"<strong>{0}</strong> n''est pas encore disponible. Il est à la fois manquant "
-"dans votre langue locale ({1}) et en anglais.<br><br>Merci d''aider à "
-"l''amélioration de l''aide de JOSM en remplissant les informations "
+"<html><p class=\"warning-header\">Contenu de l’’aide manquant pour ce "
+"sujet</p><p class=\"warning-body\">Le contenu de l’’aide pour le sujet "
+"<strong>{0}</strong> n’’est pas encore disponible. Il est à la fois manquant "
+"dans votre langue locale ({1}) et en anglais.<br><br>Merci d’’aider à "
+"l’’amélioration de l’’aide de JOSM en remplissant les informations "
"manquantes. Vous pouvez à la fois éditer <a href=\"{2}\">le sujet dans votre "
"langue ({1})</a> et <a href=\"{3}\">le sujet en anglais</a>.</p></html>"
@@ -7715,9 +7856,8 @@ msgstr "Avancer d’une page"
msgid "Go to the JOSM help home page"
msgstr "Afficher la page d’accueil"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
-"Attention : mauvais emplacement dans le document HTML. Exception : {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Impossible d’ouvrir la page d’aide. L’adresse web est vide."
@@ -7827,6 +7967,9 @@ msgid ""
msgstr ""
"<html>Version <strong>{0}</strong> créée le <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Commentaire de groupe de modifications"
+
msgid "Changeset info"
msgstr "Information sur le groupe de modifications"
@@ -7937,9 +8080,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Objet encore utilisé"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Attention : l’entête d’erreur ''{0}'' ne correspond à aucun motif attendu."
msgid "Upload"
msgstr "Envoyer"
@@ -7961,6 +8103,12 @@ msgstr "Ajoutez un commentaire :"
msgid "Enter an upload comment"
msgstr "Ajouter un commentaire à votre envoi"
+msgid "Specify the data source for the changes:"
+msgstr "Spécifiez la source de données pour les modifications:"
+
+msgid "Enter a source"
+msgstr "Entrez une source"
+
msgid "Changeset id:"
msgstr "Identifiant :"
@@ -8032,17 +8180,14 @@ msgid "Closing changeset {0}"
msgstr "Fermeture du groupe de modifications {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Attention : l’affichage des références au premier plan a échoué. Exception "
-"de sécurité."
msgid "Enter credentials for OSM API"
msgstr "Identification OSM"
msgid "Enter credentials for host"
-msgstr "Saisir les identifiants pour l''hôte"
+msgstr "Saisir les identifiants pour l’’hôte"
msgid "Enter credentials for HTTP proxy"
msgstr "Identification par proxy HTTP"
@@ -8064,7 +8209,7 @@ msgid "Warning: The password is transferred unencrypted."
msgstr "Attention : le mot de passe est transféré en clair."
msgid "Please enter the user name of your account"
-msgstr "Veuillez saisir votre nom d''utilisateur"
+msgstr "Veuillez saisir votre nom d’’utilisateur"
msgid "Please enter the password of your account"
msgstr "Veuillez saisir votre mot de passe"
@@ -8122,12 +8267,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Décompression de {0} dans {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Avertissement: Impossible de télécharger le fichier ''{0}''. Son lien de "
-"téléchargement ''{1}'' n''est pas une URL valide. Le téléchargement est "
-"ignoré."
+"Impossibilité de télécharger le fichier ''{0}''. Le lien de téléchargement "
+"URL ''{1}'' n'est pas valide. Téléchargement ignoré."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8144,11 +8288,10 @@ msgid "Missing user identity"
msgstr "Identité de l’utilisateur manquante"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Attention : la récupération des informations sur l’utilisateur a échoué. "
-"Exception : {0}"
+"Impossible de retrouver les informations de l''utilisateur courant. "
+"L''exception était : {0}"
msgid "Download objects"
msgstr "Télécharger les objets"
@@ -8167,13 +8310,13 @@ msgid ""
"to open a file chooser."
msgstr ""
"Modifiez le chemin manuellement dans le champ texte ou cliquez sur le bouton "
-"\"...\" pour ouvrir l''assistant."
+"\"...\" pour ouvrir l’’assistant."
msgid "The bold text is the name of the layer."
msgstr "Le texte en gras est le nom du calque."
msgid "Click here to choose save path"
-msgstr "Cliquez ici pour choisir le chemin d''enregistrement"
+msgstr "Cliquez ici pour choisir le chemin d’’enregistrement"
msgid "Layer ''{0}'' is not backed by a file"
msgstr "Le calque ''{0}'' n’est associé à aucun fichier de sauvegarde"
@@ -8184,7 +8327,7 @@ msgstr ""
"fichier."
msgid "Click cell to change the file path."
-msgstr "Cliquez sur la cellule pour modifier le chemin d''enregistrement."
+msgstr "Cliquez sur la cellule pour modifier le chemin d’’enregistrement."
msgid "Open Recent"
msgstr "Récemment ouverts"
@@ -8316,10 +8459,10 @@ msgid_plural ""
"<html>Upload and/or save operations of {0} layers with modifications<br>were "
"canceled or have failed.</html>"
msgstr[0] ""
-"<html>Une opération d''envoi et/ou d''enregistrement d''un calque avec "
+"<html>Une opération d’’envoi et/ou d’’enregistrement d’’un calque avec "
"modifications<br>a été annulée ou a échoué.</html>"
msgstr[1] ""
-"<html>Des opérations d''envoi et/ou d''enregistrement de {0} calques avec "
+"<html>Des opérations d’’envoi et/ou d’’enregistrement de {0} calques avec "
"modifications<br>ont été annulées ou ont échoué.</html>"
msgid "Incomplete upload and/or save"
@@ -8408,12 +8551,6 @@ msgstr "Envoyer les objets"
msgid "Please revise upload comment"
msgstr "Veuillez vérifier le commentaire de votre envoi"
-msgid "Revise"
-msgstr "Vérifier"
-
-msgid "Continue as is"
-msgstr "Continuer"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8427,6 +8564,27 @@ msgstr ""
"modifications, vous rendrez ainsi la vie plus facile pour les autres "
"utilisateurs."
+msgid "Please specify a changeset source"
+msgstr "Veuillez spécifier une source pour le groupe de modifications"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"Vous n''avez pas spécifié de source pour vos modifications.<br />C''est "
+"techniquement autorisé, mais cela aide les autres utilisateurs<br />à "
+"comprendre l''origine des données.<br /><br />Si vous passez une minute "
+"maintenant pour expliquer vos modifications, <br />vous faciliterez la vie "
+"des autres mappeurs."
+
+msgid "Revise"
+msgstr "Vérifier"
+
+msgid "Continue as is"
+msgstr "Continuer"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "Ajouter un commentaire"
@@ -8442,6 +8600,25 @@ msgstr "Entrez d’abord une taille valide"
msgid "Illegal chunk size"
msgstr "La taille est erronée"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>Le changeset à venir contient un tag sans valeur "
+"key/value:<br>{0}<br>Continuer ?</html>"
+msgstr[1] ""
+"<html>Le changeset à venir contient des tag sans valeur "
+"key/value:<br>{0}<br>Continuer ?</html>"
+
+msgid "Empty metadata"
+msgstr "Metadata vide"
+
msgid "Cancel the upload and resume editing"
msgstr "Annuler l’envoi et reprendre les modifications"
@@ -8449,11 +8626,9 @@ msgid "Tags of changeset {0}"
msgstr "Attributs du groupe de modifications {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Attention : l’objet ''{0}'' est déjà supprimé sur le serveur. Il sera ignoré "
-"pour compléter l’envoi."
msgid "Preparing objects to upload ..."
msgstr "Préparation des objets à mettre à jour…"
@@ -8596,9 +8771,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "L’objet ''{0}'' est déjà supprimé. Il sera ignoré lors de l’envoi."
-msgid "Warning: {0}"
-msgstr "Avertissement: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Envoi d’{0} objet…"
@@ -8608,6 +8780,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr "L’exception est ignorée car l’envoi a été annulé. Exception : {0}"
+msgid "Upload successful!"
+msgstr "Succès de l'envoi !"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8628,10 +8803,8 @@ msgstr "Sélectionner les objets à envoyer"
msgid "Cancel uploading"
msgstr "Annuler l’envoi"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Attention : la valeur pour la clé ''{0}'' dans les préférences est "
-"inattendue. Actuellement elle est ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Sélectionnez la méthode d’envoi :"
@@ -8789,8 +8962,8 @@ msgstr "marqueur suivant"
msgid "Jump to next marker"
msgstr "Aller au marqueur suivant"
-msgid "Previos marker"
-msgstr "marqueur précédent"
+msgid "Previous marker"
+msgstr "Marqueur précédent"
msgid "Jump to previous marker"
msgstr "Aller au marqueur précédent"
@@ -8822,10 +8995,8 @@ msgstr "version {0}"
msgid "Merging layers"
msgstr "Fusion des calques"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
-"Attention : le mélange de données 0.6 et 0.5 génère des données de version "
-"0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8842,7 +9013,7 @@ msgid "API version: {0}"
msgstr "Version de l’API : {0}"
msgid "Upload is discouraged"
-msgstr "L''envoi est dissuadé"
+msgstr "L’’envoi est dissuadé"
msgid "Convert to GPX layer"
msgstr "Convertir en calque GPX"
@@ -8888,7 +9059,7 @@ msgid ""
"{0} is not a valid TMS argument. Please check this server URL:\n"
"{1}"
msgstr ""
-"{0} n''est pas un argument TMS valide. Veuillez vérifier cette URL de "
+"{0} n’’est pas un argument TMS valide. Veuillez vérifier cette URL de "
"serveur :\n"
"{1}"
@@ -8946,6 +9117,9 @@ msgstr "Zoomer en avant pour voir les détails"
msgid "No tiles at this zoom level"
msgstr "Pas de tuiles à ce niveau de zoom."
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "Calque TMS ({0}), téléchargement au zoom {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "Les projections EPSG:4326 et Mercator sont supportées."
@@ -8984,6 +9158,9 @@ msgstr "Recharger les tuiles erronées"
msgid "Alpha channel"
msgstr "Canal alpha"
+msgid "Automatically change resolution"
+msgstr "Changer automatiquement la résolution"
+
msgid "Set WMS Bookmark"
msgstr "Placer un signet WMS"
@@ -9011,13 +9188,13 @@ msgid "GPX Files (*.gpx *.gpx.gz)"
msgstr "Fichiers GPX (*.gpx *.gpx.gz)"
msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr "Le fichier {0} est maintenant chargé sous le nom ''{1}''"
+msgstr "Le fichier {0} est maintenant chargé sous le nom ’’{1}’’"
msgid "Error while parsing {0}"
msgstr "Erreur d’analyse de {0}"
msgid "Could not read \"{0}\""
-msgstr "Impossible de lire ''{0}''"
+msgstr "Impossible de lire ’’{0}’’"
msgid ""
"<html>Take a photo of your GPS receiver while it displays the "
@@ -9198,9 +9375,6 @@ msgstr "Extraction des positions GPS depuis les informations EXIF"
msgid "Starting directory scan"
msgstr "Début de l’analyse du dossier"
-msgid "One of the selected files was null"
-msgstr "Un des fichiers sélectionnés était vide"
-
msgid "Read photos..."
msgstr "Lire des photos…"
@@ -9220,6 +9394,9 @@ msgid "Error while getting files from directory {0}\n"
msgstr ""
"Une erreur est survenue lors de la récupération des fichiers du dossier {0}\n"
+msgid "One of the selected files was null"
+msgstr "Un des fichiers sélectionnés était vide"
+
msgid "Geotagged Images"
msgstr "Images géolocalisées"
@@ -9279,6 +9456,12 @@ msgstr "Suivant"
msgid "Show next Image"
msgstr "Afficher la prochaine image"
+msgid "Show first Image"
+msgstr "Afficher la première image"
+
+msgid "Show last Image"
+msgstr "Afficher la dernière image"
+
msgid "Center view"
msgstr "Centrer la vue"
@@ -9361,9 +9544,6 @@ msgstr ""
"<html>L’envoi de données GPS non traitées sur la carte est considéré comme "
"nocif.<br>Si vous voulez envoyer des traces, lisez ceci :</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Personnaliser le dessin des traces"
@@ -9374,10 +9554,13 @@ msgid "To"
msgstr "À"
msgid "No timestamp"
-msgstr "Pas d''horodatage"
+msgstr "Pas d’’horodatage"
-msgid "Download from OSM along this track"
-msgstr "Télécharger le long de cette trace"
+msgid "Select to download OSM data."
+msgstr "Sélectionner pour télécharger les données OSM."
+
+msgid "Select to download GPS traces."
+msgstr "Sélectionner pour télécharger les traces GPS."
msgid "Download everything within:"
msgstr "Télécharger dans un rayon de :"
@@ -9403,33 +9586,35 @@ msgstr "des points de passage"
msgid "track and waypoints"
msgstr "de la trace et des points de passage"
+msgid "Click to download"
+msgstr "Cliquer pour télécharger"
+
+msgid "Click to cancel"
+msgstr "Cliquer pour annuler"
+
+msgid "Download from OSM along this track"
+msgstr "Télécharger le long de cette trace"
+
msgid "Calculating Download Area"
msgstr "Calcul de la zone de téléchargement"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Cette action nécessitera {0} requêtes<br>séparées. Voulez-"
-"vous<br>continuer ?</html>"
-
msgid "Precache imagery tiles along this track"
-msgstr "Mettre en pré-cache les tuiles d''imagerie le long de cette trace"
+msgstr "Mettre en pré-cache les tuiles d’’imagerie le long de cette trace"
msgid "Precaching WMS"
msgstr "Mise en pré-cache WMS"
msgid "Please select the imagery layer."
-msgstr "Veuillez sélectionner le calque d''imagerie."
+msgstr "Veuillez sélectionner le calque d’’imagerie."
msgid "Select imagery layer"
msgstr "Sélectionner un calque d’imagerie"
msgid "There are no imagery layers."
-msgstr "Il n''y a pas de calque d''imagerie."
+msgstr "Il n’’y a pas de calque d’’imagerie."
msgid "No imagery layers"
-msgstr "Aucun calque d''imagerie"
+msgstr "Aucun calque d’’imagerie"
msgid "Import Audio"
msgstr "Importer des sons"
@@ -9561,17 +9746,11 @@ msgstr "Il y a eu une erreur d’affichage de l’adresse web de ce marqueur"
msgid "(URL was: "
msgstr "(L’adresse web était : "
-msgid "Error displaying URL"
-msgstr "Erreur d’affichage de l’adresse web"
-
msgid "Select the map painting styles"
msgstr "Sélectionner les styles de rendu de carte"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Attention : le téléchargement des modèles Mappaint depuis ''{0}'' a échoué. "
-"Exception : {1}"
msgid "loading style ''{0}''..."
msgstr "Chargement du modèle ''{0}''…"
@@ -9589,10 +9768,8 @@ msgstr[1] ""
"Il y a eu {0} erreurs durant le chargement du modèle. Cliquez sur "
"\"Informations\" pour plus de détails."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Attention : l’analyse des modèles Mappaint depuis ''{0}'' a échoué. Erreur : "
-"{1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Le motif est erroné, les valeurs doivent être positives"
@@ -9601,11 +9778,8 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Le motif est erroné, au moins une valeur doit être positive"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Attention : l’analyse des modèles Mappaint depuis ''{0}'' a échoué. Erreur : "
-"[{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Clé de l’autorisation d’accès :"
@@ -9620,8 +9794,8 @@ msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
-"<html>Cocher pour enregistrer l''autorisation d''accès dans les "
-"préférences.<br>Décocher pour l''utiliser seulement dans cette "
+"<html>Cocher pour enregistrer l’’autorisation d’’accès dans les "
+"préférences.<br>Décocher pour l’’utiliser seulement dans cette "
"session.</html>"
msgid "Use default settings"
@@ -9705,7 +9879,7 @@ msgid ""
"data upload requests don''t use your password any more."
msgstr ""
"Veuillez entrer vos identifiants OSM. Votre mot de passe <strong>ne sera "
-"pas</strong> enregistré en clair mais transmis <strong>une unique "
+"pas</strong> enregistré en clair mais transmis <strong>une seule "
"fois</strong> au serveur OSM. Il ne sera plus utilisé lors de vos prochains "
"envois."
@@ -9780,7 +9954,7 @@ msgid ""
msgstr ""
"<html>La récupération de l’autorisation d’accès OAuth depuis le serveur OSM "
"a échoué.<br>Veuillez réessayer ou choisir une autre méthode "
-"d’authentification,<br>par exemple semi-automatique or manuelle.</html>"
+"d’authentification,<br>par exemple semi-automatique ou manuelle.</html>"
msgid "OAuth authorization failed"
msgstr "L’autorisation OAuth a échoué"
@@ -9858,7 +10032,7 @@ msgid ""
"your behalf (<a href=\"{0}\">more info...</a>)."
msgstr ""
"Avec OAuth, vous autorisez JOSM à envoyer les données et les traces GPS "
-"sous votre nom (<a href=''{0}''>plus d’infos…</a>)."
+"sous votre nom (<a href=’’{0}’’>plus d’infos…</a>)."
msgid "Please select an authorization procedure: "
msgstr "Méthode : "
@@ -9872,8 +10046,8 @@ msgstr "Annuler l’autorisation d’accès et fermer la fenêtre"
msgid "Close the dialog and accept the Access Token"
msgstr "Accepter l’autorisation d’accès et fermer la fenêtre"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Attention : impossible d’interrompre le processus OAuth"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Récupération de la requête d’accès OAuth depuis ''{0}''"
@@ -9941,6 +10115,13 @@ msgstr "Autoriser l’écriture de vos préférences"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Autoriser JOSM à écrire vos préférences"
+msgid "Allow modifications of notes"
+msgstr "Autoriser la modification de notes"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+"Sélectionner pour donner à JOSM le droit de modifier les notes en votre nom"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Récupération de l’autorisation d’accès OAuth…"
@@ -10016,9 +10197,6 @@ msgstr ""
"maintenant l’accepter. JOSM l’utilisera pour les futurs identifications et "
"autorisations auprès du serveur OSM.<br>L’autorisation d’accès est : </html>"
-msgid "Restart"
-msgstr "Recommencer"
-
msgid "Click to retrieve a Request Token"
msgstr "Récupérer une requête d’accès"
@@ -10304,6 +10482,9 @@ msgstr "Télécharger les greffons"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Vous devez redémarrer JOSM pour que les réglages prennent effet."
+msgid "Would you like to restart now?"
+msgstr "Souhaitez-vous redémarrer maintenant ?"
+
msgid "Remote Control"
msgstr "Contrôle à distance"
@@ -10320,7 +10501,7 @@ msgid ""
"Allows JOSM to be controlled from other applications, e.g. from a web "
"browser."
msgstr ""
-"Autorise JOSM à être contrôlé depuis d''autres applications, par exemple un "
+"Autorise JOSM à être contrôlé depuis d’’autres applications, par exemple un "
"navigateur."
msgid ""
@@ -10329,7 +10510,7 @@ msgid ""
"to JOSM."
msgstr ""
"JOSM écoutera toujours sur le <b>port 8111</b> de localhost. <br>Ce port "
-"n''est pas configurable car il est référencé par des applications externes "
+"n’’est pas configurable car il est référencé par des applications externes "
"qui communiquent avec JOSM."
msgid "Enable remote control"
@@ -10391,10 +10572,10 @@ msgid "active"
msgstr "Actif"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr ""
+msgstr "Fichier de style de carte (*.xml, *.mapcss, *.zip)"
msgid "Preset definition file (*.xml, *.zip)"
-msgstr ""
+msgstr "Fichier de définition de modèle d''attributs (*.xml, *.zip)"
msgid "Edit source entry:"
msgstr "Modifier la source :"
@@ -10411,7 +10592,7 @@ msgid "Ignore warning and install style anyway"
msgstr "Ignorer les avertissements et installer le style"
msgid "Some entries have unmet dependencies:"
-msgstr ""
+msgstr "Des entrées ont des dépendances non satisfaites:"
msgid "Reset"
msgstr "Rétablir"
@@ -10435,10 +10616,16 @@ msgid "Icon"
msgstr "Icône"
msgid "Remove from toolbar"
-msgstr "Retirer de la barre d''outils"
+msgstr "Retirer de la barre d’’outils"
msgid "Configure toolbar"
-msgstr "Configurer la barre d''outils"
+msgstr "Configurer la barre d’’outils"
+
+msgid "Edit shortcut"
+msgstr "Modifier le raccourci"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Ne pas cacher la barre d’outils et de menu"
msgid "Actions"
msgstr "Actions"
@@ -10468,20 +10655,23 @@ msgid "Parameter value"
msgstr "Valeur du paramètre"
msgid "Toolbar action without name: {0}"
-msgstr "Action de la barre d''outils sans nom : {0}"
+msgstr "Action de la barre d’’outils sans nom : {0}"
msgid "Strange toolbar value: {0}"
-msgstr "Valeur étrange pour la barre d''outils : {0}"
+msgstr "Valeur étrange pour la barre d’’outils : {0}"
msgid "Toolbar action {0} overwritten: {1} gets {2}"
-msgstr "Action {0} de la barre d''outils écrasée: {1} devient {2}"
+msgstr "Action {0} de la barre d’’outils écrasée: {1} devient {2}"
msgid "Registered toolbar action without name: {0}"
-msgstr "Action de la barre d''outils enregistrée sans nom : {0}"
+msgstr "Action de la barre d’’outils enregistrée sans nom : {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
-"Action enregistrée {0} de la barre d''outils écrasée: {1} devient {2}"
+"Action enregistrée {0} de la barre d’’outils écrasée: {1} devient {2}"
+
+msgid "Toolbar: {0}"
+msgstr "Barre d''outils: {0}"
msgid "Data validator"
msgstr "Validateur de données"
@@ -10536,23 +10726,16 @@ msgstr "Rechercher : "
msgid "Read from file"
msgstr "Lire depuis le fichier"
-msgid "Open JOSM customization file"
-msgstr "Ouvrir le fichier de personnalisation de JOSM"
-
-msgid "Import log"
-msgstr "Historique d’import"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
msgid "Export selected items"
msgstr "Exporter les items sélectionnés"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Fichiers de paramètres personnalisés JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
+"Veuillez sélectionner quelques clés de préférence qui diffèrent de leur "
+"valeur par défaut"
msgid "Export preferences keys to JOSM customization file"
msgstr ""
@@ -10569,42 +10752,60 @@ msgstr "Ajouter les préférences du fichier aux valeurs existantes"
msgid "Replace existing values"
msgstr "Remplace les valeurs actuelles"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Fichiers de paramètres personnalisés JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Ouvrir le fichier de personnalisation de JOSM"
-msgid "Advanced Background: Changed"
-msgstr ""
+msgid "Import log"
+msgstr "Historique d’import"
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
+"<html>Voici le résumé de l''import du fichier. <br/>Vous pouvez rejeter les "
+"modifications des préférences en cliquant sur \"Annuler\" dans la fenêtre "
+"des préférences <br/>Pour activer certains changements, un redémarrage de "
+"JOSM peut être requis.</html>"
-msgid "Current value is default."
-msgstr "La valeur courante est celle par défaut."
+msgid "shortcut"
+msgstr "raccourci"
-msgid "Default value is ''{0}''."
-msgstr "La valeur par défaut est ''{0}''."
+msgid "color"
+msgstr "couleur"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"La valeur par défaut est actuellement inconnue (réglage non encore effectué)."
+msgid "toolbar"
+msgstr "barre d''outils"
-msgid "Select Setting Type:"
-msgstr "Type de paramètre:"
+msgid "imagery"
+msgstr "imagerie"
-msgid "Simple"
-msgstr "Simple"
+msgid "Reset preferences"
+msgstr "Réinitialiser les préférences"
-msgid "List"
-msgstr "Liste"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Vous êtes sur le point de réinitialiser toutes les préférences à leur valeur "
+"par défaut<br />Tous vos paramètres vont être supprimés: greffons, imagerie, "
+"filtres, boutons de la barre d''outils, raccourcis clavier, etc. <br />Êtes-"
+"vous sûr de vouloir continuer ?"
-msgid "List of lists"
-msgstr "Liste de listes"
+msgid "Load profile"
+msgstr "Charger le profil"
-msgid "List of maps"
-msgstr "Liste de tables d''association"
+msgid "Save {0} profile"
+msgstr "Sauvegarder {0} profil"
-msgid "Add setting"
-msgstr "Ajouter un paramètre"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Toutes les préférences de ce groupe sont celles par défaut, rien à "
+"enregistrer"
+
+msgid "Choose profile file"
+msgstr "Choisir le fichier de profil"
msgid "Change list setting"
msgstr "Modifier un paramètre \"liste\""
@@ -10619,14 +10820,48 @@ msgid "add entry"
msgstr "Ajouter une entrée"
msgid "Remove the selected entry"
-msgstr "Supprimer l''entrée sélectionnée"
+msgstr "Supprimer l’’entrée sélectionnée"
msgid "Change list of maps setting"
-msgstr "Modifier un paramètre \"liste de tables d''association\""
+msgstr "Modifier un paramètre \"liste de tables d’’association\""
msgid "Entry {0}"
msgstr "Entrée {0}"
+msgid "Select Setting Type:"
+msgstr "Type de paramètre:"
+
+msgid "Simple"
+msgstr "Simple"
+
+msgid "List"
+msgstr "Liste"
+
+msgid "List of lists"
+msgstr "Liste de listes"
+
+msgid "List of maps"
+msgstr "Liste de tables d’’association"
+
+msgid "Add setting"
+msgstr "Ajouter un paramètre"
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "La valeur courante est celle par défaut."
+
+msgid "Default value is ''{0}''."
+msgstr "La valeur par défaut est ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"La valeur par défaut est actuellement inconnue (réglage non encore effectué)."
+
msgid "Change string setting"
msgstr "Modifier un paramètre \"chaîne de caractères\""
@@ -10683,6 +10918,9 @@ msgstr "Afficher les nœuds virtuels dans la fenêtre de sélection"
msgid "Draw inactive layers in other color"
msgstr "Afficher les calques inactifs sous une autre couleur"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "Mettre en surbrillance les nœuds et chemins survolés"
@@ -10693,7 +10931,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "Appliquer un anticrénelage"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr ""
+msgstr "Lissage des graphismes de la carte en mode filaire (anticrénelage)"
msgid "Draw only outlines of areas"
msgstr "Afficher seulement les limites des surfaces"
@@ -10730,6 +10968,8 @@ msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
+"Appliquer l'anticrénelage à la vue de la carte en mode filaire entraînant "
+"une apparence plus lisse."
msgid "Hightlight target nodes and ways while drawing or selecting"
msgstr ""
@@ -10740,14 +10980,19 @@ msgid ""
"in the selected style."
msgstr "Supprimer le remplissage des surfaces."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr "Options affectant les performances de rendu"
msgid "Segment drawing options"
-msgstr ""
+msgstr "Options de dessin des segments"
msgid "Select and draw mode options"
-msgstr ""
+msgstr "Options du mode selection et dessin"
msgid "Other options"
msgstr "Autres options"
@@ -10788,7 +11033,7 @@ msgid "Local files"
msgstr "Les fichiers locaux"
msgid "Force lines if no segments imported"
-msgstr "Forcer les lignes si aucun segment n''a été importé"
+msgstr "Forcer les lignes si aucun segment n’’a été importé"
msgid "Draw large GPS points"
msgstr "Dessiner des points GPS larges"
@@ -10900,7 +11145,7 @@ msgstr "Épaisseur de dessin des lignes GPX"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgstr ""
-"Appliquer l''anti-crènelage aux lignes GPX pour produire une apparence plus "
+"Appliquer l’’anti-crènelage aux lignes GPX pour produire une apparence plus "
"lisse."
msgid ""
@@ -10924,7 +11169,7 @@ msgstr ""
"précision (HDOP). Votre appareil doit enregistrer cette information."
msgid "Colors points and track segments by its timestamp."
-msgstr "Colorier les traces et les points en fonction de l''horodatage."
+msgstr "Colorier les traces et les points en fonction de l’’horodatage."
msgid "Allows to tune the track coloring for different average speeds."
msgstr "Colorier les traces et les points en fonction du type de véhicule."
@@ -10976,7 +11221,7 @@ msgid ""
"Display buttons in right side menus only when mouse is inside the element"
msgstr ""
"Afficher les boutons dans les fenêtre latérales de droite seulement lorsque "
-"la souris est à l''intérieur de la fenêtre."
+"la souris est à l’’intérieur de la fenêtre."
msgid "Look and Feel"
msgstr "Apparence"
@@ -10997,6 +11242,8 @@ msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
"level: {1} or {2}<br>reversed zoom level: {3}"
msgstr ""
+"{0} est remplacé par le niveau de zoom des tuiles, également supporté : <br> "
+"décalages au niveau de zoom: {1} ou {2} <br> niveau de zoom inversé : {3}"
msgid "{0} is replaced by X-coordinate of the tile"
msgstr "{0} est remplacé par la coordonnée X de la tuile"
@@ -11041,8 +11288,14 @@ msgstr "Obtenir les calques"
msgid "2. Select layers"
msgstr "Sélectionner les couches"
-msgid "3. Verify generated WMS URL"
-msgstr "Vérification de la géneration de l’URL du WMS"
+msgid "3. Select image format"
+msgstr "3. Sélectionner le format d''image"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Vérifier l''URL WMS générée"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Entrer un nom pour ce calque"
msgid "Show Bounds"
msgstr "Afficher les limites"
@@ -11090,7 +11343,7 @@ msgid "Offset bookmarks"
msgstr "Décalages"
msgid "Imagery Background: Default"
-msgstr "Arrière-plan d''imagerie: défaut"
+msgstr "Arrière-plan d’’imagerie: défaut"
msgid "Available default entries:"
msgstr "Fournisseurs disponibles :"
@@ -11099,7 +11352,7 @@ msgid "Selected entries:"
msgstr "Fournisseurs actifs :"
msgid "Add a new {0} entry by entering the URL"
-msgstr ""
+msgstr "Ajouter une nouvelle entrée {0} en entrant l'URL"
msgid "Remove entry"
msgstr "Supprimer le fournisseur"
@@ -11220,6 +11473,12 @@ msgstr ""
"JOSM ajoutera ''~'' au nom du fichier et l’enregistrera dans le même "
"dossier.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Fichier de sauvegarde"
@@ -11287,8 +11546,8 @@ msgstr "Paramètres de la carte"
msgid "Settings for the map projection and data interpretation."
msgstr "Choisissez la projection et le modèle de rendu de la carte."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Attention : impossible de lire la source de balisage : {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Impossible de lire le modèle d’attributs : {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11433,7 +11692,7 @@ msgstr ""
"certain temps"
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "Par code (EPSG)"
msgid "Invalid projection configuration: {0}"
msgstr "Configuration de la projection invalide : {0}"
@@ -11469,10 +11728,10 @@ msgid "Scaling factor"
msgstr "Facteur d’échelle"
msgid "Ellipsoid name"
-msgstr "Nom de l''ellipsoïde"
+msgstr "Nom de l’’ellipsoïde"
msgid "Ellipsoid parameters"
-msgstr "Paramètres de l''ellipsoïde"
+msgstr "Paramètres de l’’ellipsoïde"
msgid "Datum name"
msgstr "Nom du datum"
@@ -11484,10 +11743,10 @@ msgid "NTv2 grid file"
msgstr "Grille de conversion NTv2"
msgid "Built-in:"
-msgstr ""
+msgstr "Intégré:"
msgid "Projection bounds (in degrees)"
-msgstr ""
+msgstr "Limites de la projection (en degrés)"
msgid "Gauß-Krüger"
msgstr "Gauss–Krüger"
@@ -11570,21 +11829,6 @@ msgstr "Grille (Suisse)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (sans corrections locales)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zone :"
-
-msgid "North"
-msgstr "Nord :"
-
-msgid "South"
-msgstr "Sud"
-
-msgid "Hemisphere"
-msgstr "Hémisphère :"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort Marigot 1949"
@@ -11606,6 +11850,21 @@ msgstr "UTM France (DOM France)"
msgid "UTM Geodesic system"
msgstr "Système géodésique :"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zone :"
+
+msgid "North"
+msgstr "Nord :"
+
+msgid "South"
+msgstr "Sud"
+
+msgid "Hemisphere"
+msgstr "Hémisphère :"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Test de l’adresse web OSM ''{0}''"
@@ -11670,8 +11929,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Utiliser une identification OAuth"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11680,22 +11939,26 @@ msgstr "Nom d’utilisateur OSM :"
msgid "OSM password:"
msgstr "Mot de passe OSM :"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "Attention : la récupération des références OSM a échoué."
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr "Le gestionnaire d’autorisations actuel est du type ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "Attention : l’enregistrement des références OSM a échoué."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
+
+msgid "Periodically check for new messages"
+msgstr "Fréquence de vérification des nouveaux messages"
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Check interval (minutes):"
msgstr ""
-"Attention : la récupération des autorisations d’accès OAuth a échoué."
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr "Attention : le stockage des autorisations d’accès OAuth a échoué."
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr ""
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11740,7 +12003,7 @@ msgstr "La validation a échoué. L’adresse web ne semble pas valide."
msgid "OSM API URL must not be empty. Please enter the OSM API URL."
msgstr ""
-"L’adresse Web ne doit pas être vide. Veuillez entrer une adresse web OSM."
+"L’adresse web OSM ne doit pas être vide. Veuillez entrer l’adresse web OSM"
msgid "The current value is not a valid URL"
msgstr "L’adresse actuelle n’est pas une adresse web valide"
@@ -11784,18 +12047,9 @@ msgid "Use a SOCKS proxy"
msgstr "Utiliser un proxy SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Attention : JOSM est configuré pour utiliser les proxies présents dans les "
-"paramètres système. Mais Java n’est pas configuré pour les retrouver. "
-"Rétablissement des préférences sur ''Aucun proxy''"
-
-msgid "disabled"
-msgstr "désactivé"
-
-msgid "no modifier"
-msgstr "aucun modifieur"
msgid "Shortcut Background: User"
msgstr ""
@@ -11838,36 +12092,37 @@ msgstr "Supprimer l’attribut"
msgid "Add a new tag"
msgstr "Ajouter un nouvel attribut"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Utiliser l’attribut « {0} » du groupe « {1} »"
-msgid "{0}:"
-msgstr "{0} :"
+msgid "Use preset ''{0}''"
+msgstr "Utiliser l’attribut « {0} »"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Les éléments du type {0} sont supportés."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Le modèle de balisage ''{0}-{1}'' n’est pas valide - ''display_values'' doit "
-"avoir le même nombre d’éléments que ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Modifier {0} objet"
+msgstr[1] "Modifier {0} objets"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Le modèle d’attributs « {0}-{1} » n’est pas valide - « short_descriptions » "
-"doit avoir le même nombre d’éléments que « values »"
+msgid "Nothing selected!"
+msgstr "Aucune sélection !"
-msgid "More information about this feature"
-msgstr "Plus d’infos…"
+msgid "Selection unsuitable!"
+msgstr "Sélection inappropriée !"
+
+msgid "Apply Preset"
+msgstr "Appliquer les attributs"
+
+msgid "New relation"
+msgstr "Nouvelle relation"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Prérequis inconnu : {0}"
@@ -11875,6 +12130,9 @@ msgstr "Prérequis inconnu : {0}"
msgid "Illegal member expression: {0}"
msgstr "Expression de membre illégale : {0}"
+msgid "More information about this feature"
+msgstr "Plus d’infos…"
+
msgid "Available roles"
msgstr "Rôle disponible"
@@ -11890,17 +12148,55 @@ msgstr "Élément"
msgid "Optional Attributes:"
msgstr "Attributs facultatifs :"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Utiliser l’attribut « {0} » du groupe « {1} »"
+msgid "Select auto-increment of {0} for this field"
+msgstr ""
-msgid "Use preset ''{0}''"
-msgstr "Utiliser l’attribut « {0} »"
+msgid "Cancel auto-increment for this field"
+msgstr "Annuler l''auto-incrément pour ce champ"
+
+msgid "{0}:"
+msgstr "{0} :"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Le modèle de balisage ''{0}-{1}'' n’est pas valide - ''display_values'' doit "
+"avoir le même nombre d’éléments que ''values''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Le modèle d’attributs « {0}-{1} » n’est pas valide - « short_descriptions » "
+"doit avoir le même nombre d’éléments que « values »"
msgid "Unknown type: {0}"
msgstr "Type inconnu : {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Groupe d’attributs {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "Groupe d’attributs {0}"
+
msgid "Roles cannot appear more than once"
-msgstr "Le rôle ne peut pas apparaître plus d''une fois"
+msgstr "Le rôle ne peut pas apparaître plus d’’une fois"
msgid "Preset role element without parent"
msgstr "Élément de rôle prédéfini sans parent"
@@ -11908,41 +12204,9 @@ msgstr "Élément de rôle prédéfini sans parent"
msgid "Preset sub element without parent"
msgstr "Sous élément prédéfini sans parent"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Impossible de lire le modèle d’attributs : {0}"
-
msgid "Error parsing {0}: "
msgstr "Erreur d’analyse de {0} : "
-msgid "Elements of type {0} are supported."
-msgstr "Les éléments du type {0} sont supportés."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Modifier {0} objet"
-msgstr[1] "Modifier {0} objets"
-
-msgid "Nothing selected!"
-msgstr "Aucune sélection !"
-
-msgid "Selection unsuitable!"
-msgstr "Sélection inappropriée !"
-
-msgid "Apply Preset"
-msgstr "Appliquer les attributs"
-
-msgid "New relation"
-msgstr "Nouvelle relation"
-
-msgid "Change Properties"
-msgstr "Modifier les propriétés"
-
-msgid "Preset group {1} / {0}"
-msgstr "Groupe d’attributs {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "Groupe d’attributs {0}"
-
msgid "Search preset"
msgstr "Recherche d’attributs"
@@ -11958,6 +12222,16 @@ msgstr "Afficher uniquement les attributs applicables à la sélection"
msgid "Search in tags"
msgstr "Rechercher dans les mots-clés"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Le réglage {0} n’est pas encore enregistré. Impossible de régler la "
+"synchronisation."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Le réglage {0} n’est pas encore enregistré."
+
msgid "All files (*.*)"
msgstr "Tous les fichiers (*.*)"
@@ -11992,47 +12266,98 @@ msgstr ""
"La valeur n’est pas un identifiant OSM valide. Veuillez entrer un entier "
"positif"
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Le chemin avec l’identifiant ''{0}'' contient le nœud manquant avec "
-"l’identifiant ''{1}''."
+msgid "false: the property is explicitly switched off"
+msgstr "faux : la propriété est désactivée"
-msgid "Deleted node {0} is part of way {1}"
-msgstr "Le nœud supprimé {0} fait partie du chemin {1}"
+msgid "true: the property is explicitly switched on"
+msgstr "coché : la propriété est activée"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"partial: different selected objects have different values, do not change"
msgstr ""
-"Le chemin {0} avec {1} nœuds a des nœuds incomplets car au moins un nœud "
-"était manquant dans les données chargées."
+"partiel : les objets sélectionnés ont différentes valeurs, ne pas modifier"
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
-msgstr ""
-"La relation avec l’identifiant ''{0}'' se réfère à un objet manquant avec "
-"l’identifiant ''{1}''."
+msgid "unset: do not set this property on the selected objects"
+msgstr "décoché : ne pas utiliser cette propriété sur la sélection"
-msgid "Deleted member {0} is used by relation {1}"
-msgstr "Le membre supprimé {0} est utilisé par la relation {1}"
+msgid "Cut"
+msgstr "Couper"
-msgid "All Formats"
-msgstr "Tous les formats"
+msgid "Right click = copy to clipboard"
+msgstr "Clic droit = copier vers le presse-papiers"
-msgid "Downloading points {0} to {1}..."
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "L’attribut obligatoire ''{0}'' est manquant."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"La valeur pour l’attribut obligatoire ''{0}'' de type long est erronée. "
+"Actuellement elle est ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"La valeur pour l’attribut obligatoire ''{0}'' de type long (>=0) est "
+"erronée. Actuellement elle est ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Valeur illégale pour l''attribut « {0} » de type double. « {1} » obtenu."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"La valeur pour l’attribut obligatoire ''{0}'' de type booléen est erronée. "
+"Actuellement elle est ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"La valeur pour l’attribut obligatoire ''{0}'' de type OsmPrimitiveType est "
+"erronée. Actuellement elle est ''{1}''"
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Le chemin avec l’identifiant ''{0}'' contient le nœud manquant avec "
+"l’identifiant ''{1}''."
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Le nœud supprimé {0} fait partie du chemin {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"Le chemin {0} avec {1} nœuds a des nœuds incomplets car au moins un nœud "
+"était manquant dans les données chargées."
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+"La relation avec l’identifiant ''{0}'' se réfère à un objet manquant avec "
+"l’identifiant ''{1}''."
+
+msgid "Deleted member {0} is used by relation {1}"
+msgstr "Le membre supprimé {0} est utilisé par la relation {1}"
+
+msgid "All Formats"
+msgstr "Tous les formats"
+
+msgid "Downloading points {0} to {1}..."
msgstr "Téléchargement des points {0} à {1}…"
msgid "Contacting OSM Server..."
msgstr "Connexion au serveur OSM…"
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Attention : la valeur de l’attribut ''{0}'' de l’élément ''{1}'' dans les "
-"capacités du serveur est erronée. Actuellement elle est ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "L’analyse de la date ''{0}'' renvoyée par le serveur a échoué."
@@ -12086,40 +12411,27 @@ msgstr ""
"''{1}''."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Attention : la valeur pour la préférence ''{0}'' est inattendue. "
-"Actuellement elle est ''{1}''. Le proxy ne sera pas utilisé."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Attention : les paramètres pour le proxy HTTP sont inattendus. Actuellement "
-"l’hôte est ''{0}'' et le port est ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Attention : les paramètres pour le proxy SOCKS sont inattendus. Actuellement "
-"l’hôte est ''{0}'' et le port est ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Erreur : la connexion au proxy ''{0}'' avec l’adresse web ''{1}'' a échoué. "
-"Exception : {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Attention : Java n’est pas configuré pour retrouver les proxies depuis les "
-"paramètres système. La propriété ''java.net.useSystemProxies'' est manquante "
-"au démarrage. Aucun proxy ne sera utilisé."
msgid "Parsing response from server..."
msgstr "Analyse de la réponse du serveur…"
@@ -12224,6 +12536,9 @@ msgstr ""
"Erreur de syntaxe : la structure du document n’est pas valide pour un "
"document GPX"
+msgid "(at line {0}, column {1})"
+msgstr "(à la ligne {0}, colonne {1})"
+
msgid "Unknown mode {0}."
msgstr "Mode {0} inconnu."
@@ -12239,15 +12554,21 @@ msgstr "Recherche des fichiers image"
msgid "No image files found."
msgstr "Aucun fichier image n’a été trouvé."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Vous avez {0} message non lu."
+msgstr[1] "Vous avez {0} messages non lus."
+
+msgid "Click here to see your inbox."
+msgstr "Cliquez ici pour ouvrir votre boite de réception"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "L’ouverture du flux d’entrée pour la ressource ''{0}'' a échoué"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Attention : l’ouverture du fichier avec l’extension ''{2}'' et nommé ''{3}'' "
-"dans le fichier zip ''{0}'' a échoué. Exception : {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Impossible de renommer le fichier de {0} à {1}."
@@ -12334,8 +12655,8 @@ msgstr "Phrases inconnues : {0}"
msgid "Zero coordinates: {0}"
msgstr "Coordonnées nulles : {0}"
-msgid "NMEA import success"
-msgstr "Importation des trames NMEA réussie"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "L’importation des trames NMEA a échoué !"
@@ -12436,8 +12757,8 @@ msgstr ""
msgid "Prolog of OsmChange document not written yet. Please write first."
msgstr ""
-"Le prologue du document OsmChange n''a pas encore été écrit. Veuillez "
-"l''écrire au préalable."
+"Le prologue du document OsmChange n’’a pas encore été écrit. Veuillez "
+"l’’écrire au préalable."
msgid "OsmChange File"
msgstr "Fichier OsmChange"
@@ -12451,48 +12772,13 @@ msgstr "Aucune donnée trouvée dans le fichier {0}."
msgid "Open OsmChange file"
msgstr "Ouvrir le fichier OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "L’attribut obligatoire ''{0}'' est manquant."
-
msgid "Unsupported version: {0}"
msgstr "Version non supportée : {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"La valeur pour l’attribut obligatoire ''{0}'' de type long est erronée. "
-"Actuellement elle est ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"La valeur pour l’attribut obligatoire ''{0}'' de type long (>=0) est "
-"erronée. Actuellement elle est ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Valeur illégale pour l''attribut « {0} » de type double. « {1} » obtenu."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"La valeur pour l’attribut obligatoire ''{0}'' de type booléen est erronée. "
-"Actuellement elle est ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"La valeur pour l’attribut obligatoire ''{0}'' de type OsmPrimitiveType est "
-"erronée. Actuellement elle est ''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Attention : l’élément de départ ''{0}'' situé à la position ({1},{2}) dans "
-"le contenu du groupe de modifications n’est pas supporté. Abandon."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12502,11 +12788,9 @@ msgstr ""
"relation figurait hors d’un bloc \"create\", \"modify\" ou \"delete\"."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Attention : l’élément de fin ''{0}'' situé à la position ({1},{2}) dans le "
-"contenu du groupe de modifications n’est pas supporté. Abandon."
msgid "Parsing changeset content ..."
msgstr "Analyse du contenu du groupe de modifications…"
@@ -12540,13 +12824,8 @@ msgstr ""
"L’authentification de la connexion HTTP avec un entête d’identification "
"OAuth a échoué"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
-"Attention : la valeur pour la préférence ''{0}'' est inattendue. "
-"Actuellement elle est ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(à la ligne {0}, colonne {1})"
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
@@ -12560,9 +12839,6 @@ msgstr ""
"<html>Une erreur est survenue lors du chargement d’une sauvegarde.<br>Erreur "
":<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Impossible de récupérer le fichier. Exception : {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Fichiers compressés gzip du serveur OSM"
@@ -12584,6 +12860,9 @@ msgstr "Aucune donnée trouvée dans le fichier ''{0}''."
msgid "Open OSM file"
msgstr "Ouvrir un fichier OSM"
+msgid "Reading was canceled"
+msgstr "La lecture a été annulée"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12645,12 +12924,9 @@ msgstr ""
"est erronée. Actuellement elle est {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"Attention : normalisation de la valeur pour l’attribut ''version'' de "
-"l’élément {0} à {2}, la version API version est ''{3}''. Actuellement elle "
-"est {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr ""
@@ -12814,6 +13090,9 @@ msgstr "Enregistrer le nom d’utilisateur et le mot de passe"
msgid "<delete from {0} objects>"
msgstr "<supprimé de {0} objets>"
+msgid "Old values of"
+msgstr "Anciennes valeurs de"
+
msgid "Add tags to selected objects"
msgstr "Ajouter des attributs aux objects sélectionnés"
@@ -12832,6 +13111,15 @@ msgstr "Shift+Enter : Ajouter tous les attributs aux objets sélectionnés"
msgid "Assume"
msgstr "Supposer"
+msgid "Existing values"
+msgstr "Valeurs existantes"
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr "Charger les données depuis une API"
@@ -12856,10 +13144,14 @@ msgstr "Créer des nouveaux objets"
msgid "Read protocol version"
msgstr "Lire la version du protocole"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-"Avertissement : impossible de démarrer le service de contrôle à distance sur "
-"le port {0} : {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Contrôle à distance::Connexions acceptées sur le port {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Contrôle à distance::Serveur arrêté."
msgid "Remote Control has been asked to create a new node."
msgstr "Il a été demandé au contrôle à distance de créer un nouveau nœud."
@@ -12867,9 +13159,6 @@ msgstr "Il a été demandé au contrôle à distance de créer un nouveau nœud.
msgid "There is no layer opened to add node"
msgstr "Il n’y a pas de calque ouvert pour ajouter des nœuds"
-msgid "Add way"
-msgstr "Ajouter un chemin"
-
msgid "Remote Control has been asked to create a new way."
msgstr "Le contrôle à distance a demandé de créer un nouveau chemin."
@@ -12879,6 +13168,14 @@ msgstr "Coordonnées invalides : {0}"
msgid "There is no layer opened to add way"
msgstr "Il n’y a pas de calque ouvert pour ajouter des way"
+msgid "Add way"
+msgstr "Ajouter un chemin"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12899,6 +13196,15 @@ msgstr ""
"Le contrôle à distance va télécharger des données depuis l’adresse web "
"suivante :"
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12908,7 +13214,7 @@ msgstr ""
msgid "Remote Control has been asked to open a local file."
msgstr ""
-"Le Contrôle à Distance a reçu une demande d''ouverture de fichier local."
+"Le Contrôle à Distance a reçu une demande d’’ouverture de fichier local."
msgid "Do you want to allow this?"
msgstr "Voulez-vous autoriser cela ?"
@@ -12934,20 +13240,20 @@ msgstr "Données :"
msgid "local file"
msgstr "fichier local"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Lier à un fichier de données OSM sur votre disque."
+msgid "Link to a GPX file on your local disk."
+msgstr "Lien vers le fichier GPX sur votre disque local"
msgid "include"
msgstr "inclure"
-msgid "Include OSM data in the .joz session file."
-msgstr "Inclure les données OSM dans le fichier de session .joz."
+msgid "Include GPX data in the .joz session file."
+msgstr ""
msgid "No file association"
-msgstr "Pas d''association de fichier"
+msgstr "Pas d’’association de fichier"
-msgid "OSM data will be included in the session file."
-msgstr "Les données OSM seront inclues dans le fichier de session."
+msgid "GPX data will be included in the session file."
+msgstr "Les données GPX seront inclues dans le fichier de session"
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -12970,6 +13276,15 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr "La couche ne contient pas de données non sauvegardées"
+msgid "Link to a OSM data file on your local disk."
+msgstr "Lier à un fichier de données OSM sur votre disque."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Inclure les données OSM dans le fichier de session .joz."
+
+msgid "OSM data will be included in the session file."
+msgstr "Les données OSM seront inclues dans le fichier de session."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -12977,6 +13292,9 @@ msgstr ""
"La version ''{0}'' des métadonnées pour le calque de données OSM n''est pas "
"prise en charge. Version attendue: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Fichier session (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Impossible de trouver le fichier ''{0}''."
@@ -13002,7 +13320,7 @@ msgstr ""
"l''attribut ''index'' ({0}) pour l''élément ''layer'' doit être unique"
msgid "missing layer with index {0}"
-msgstr "calque manquant avec l''indice {0}"
+msgstr "calque manquant avec l’’indice {0}"
msgid "missing mandatory attribute ''name'' for element ''layer''"
msgstr "attribut requis \"name\" manquant pour l''élément \"layer\""
@@ -13037,7 +13355,7 @@ msgid "Skip layer and continue"
msgstr "Ignorer le calque et continuer"
msgid "expected .jos file inside .joz archive"
-msgstr "fichier .jos attendu à l''intérieur de l''archive .joz"
+msgstr "fichier .jos attendu à l’’intérieur de l’’archive .joz"
msgid "Skip download"
msgstr "Abandonner le téléchargement"
@@ -13055,18 +13373,18 @@ msgid "Download skipped"
msgstr "Téléchargement abandonné"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Attention : impossible de télécharger le greffon ''{0}''. Son lien de "
-"téléchargement est inconnu. Téléchargement abandonné."
+"Impossibilité de télécharger le greffon ''{0}''. Le lien de téléchargement "
+"est inconnu. Avortement du téléchargement."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Attention : impossible de télécharger le greffon ''{0}''. Son lien de "
-"téléchargement ''{1}'' n’est pas valide. Téléchargement abandonné."
+"Impossibilité de télécharger le greffon ''{0}''. Le lien de téléchargement "
+"''{1}'' n'est pas un URL valide. Avortement du téléchargement."
msgid "Failed to create plugin directory ''{0}''"
msgstr "La création du dossier pour le greffon ''{0}'' a échoué"
@@ -13084,7 +13402,7 @@ msgid "replaced by new {0} plugin"
msgstr "remplacé par {0} nouveau greffon"
msgid "no longer required"
-msgstr "n''est plus requis"
+msgstr "n’’est plus requis"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
@@ -13098,7 +13416,7 @@ msgid ""
"longer developed and very likely will produce errors.<br>It should be "
"disabled.<br>Delete from preferences?</html>"
msgstr ""
-"<html>Le téléchargement du greffon ''{0}'' a été demandé.<br>Ce greffon "
+"<html>Le téléchargement du greffon ’’{0}’’ a été demandé.<br>Ce greffon "
"n’est plus supporté et il est susceptible d’entrainer des erreurs.<br>Voulez-"
"vous le supprimer des préférences ?</html>"
@@ -13241,11 +13559,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "La mise à jour du greffon a échoué"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Attention : Echec de la recherche du plugin {0}"
+msgid "Failed to find plugin {0}"
+msgstr "Echec de la recherche du plugin {0}"
-msgid "Warning: failed to download plugin information list"
-msgstr "Attention : le téléchargement de la liste des greffons a échoué"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Désactiver le greffon"
@@ -13259,30 +13577,22 @@ msgstr "Garder le greffon"
msgid "Click to keep the plugin ''{0}''"
msgstr "Garder le greffon ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Attention : la suppression du greffon périmé ''{0}'' a échoué."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Attention : l’installation du greffon ''{0}'' déjà téléchargé a échoué. "
-"L’installation est abandonnée. Une ancienne version du greffon va être "
-"installée."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
-"Attention : échec lors de l''installation du greffon « {0} » depuis le "
-"fichier temporaire téléchargé « {1} ». {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Attention : l’installation du greffon ''{0}'' à partir du dossier temporaire "
-"de téléchargement ''{1}'' a échoué. Impossible de renommer."
msgid "Click to disable the plugin ''{0}''"
msgstr "Désactiver le greffon ''{0}''"
@@ -13357,11 +13667,8 @@ msgstr "Traitement des fichiers cache du greffon…"
msgid "Processing file ''{0}''"
msgstr "Traitement du fichier ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Attention : l’analyse du fichier ''{0}'' concernant l’information du greffon "
-"a échoué. Abandon."
msgid "Processing plugin site cache icon files..."
msgstr "Mise en cache des icônes du greffon…"
@@ -13375,12 +13682,25 @@ msgstr "Téléchargement de la liste des greffons…"
msgid "Downloading plugin list from ''{0}''"
msgstr "Téléchargement de la liste des greffons depuis ''{0}''"
+msgid "Plugin list download error"
+msgstr "Erreur de téléchargemnt de la liste des plugins"
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr "Détails:"
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Attention : la création du dossier pour le greffon ''{0}'' a échoué. "
-"Impossible de mettre en cache la liste des greffons depuis le site ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Écriture de la liste des greffons dans le cache ''{0}''"
@@ -13667,7 +13987,7 @@ msgstr ""
"rapporté l''erreur suivante :<br>''{0}''</html>"
msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr "<html>L''autorisation auprès du serveur OSM a échoué.<br/></html>"
+msgstr "<html>L’’autorisation auprès du serveur OSM a échoué.<br/></html>"
msgid ""
"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -13829,23 +14149,12 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Impossible de trouver l''image \"{0}\""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Attention : l’ouverture du fichier zip ''{0}'' a échoué. Exception : {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Attention : l’accès au dossier ''{0}'' a échoué pour des raisons de "
-"sécurité. Exception : {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Attention : impossible de déterminer le préfixe de la langue à partir du "
-"code JOSM ''{0}''. Le code utilisé par défaut est ''en''."
msgid "{0}... [please type its number]"
msgstr "{0}... [veuillez saisir son nombre]"
@@ -13857,9 +14166,52 @@ msgstr ""
"L’ouverture de l’adresse web a échoué car aucun navigateur n’est défini. "
"Veuillez d’abord choisir un navigateur."
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr "réservé"
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Conflit silencieux de raccourci clavier: ''{0}''déplacé par ''{1}'' vers "
@@ -13883,7 +14235,7 @@ msgid "Do you want to paste these tags?"
msgstr "Voulez-vous coller ces attributs ?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Vider le presse-papier"
msgid "Ignore warnings"
msgstr "Ignorer les avertissements"
@@ -13896,8 +14248,22 @@ msgstr ""
"tampon. Il ne contient aucun objet JOSM ni aucun texte convenable. "
"</p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Clic droit = copier vers le presse-papiers"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -13939,28 +14305,28 @@ msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
"must return set of primitives"
msgstr ""
-"Erreur dans l''expression de recherche à la position {0} - la partie droite "
-"de l''expression or(|) doit retourner un jeu de primitives"
+"Erreur dans l’’expression de recherche à la position {0} - la partie droite "
+"de l’’expression or(|) doit retourner un jeu de primitives"
msgid ""
"Error in search expression on position {0} - left side of or(|) expression "
"must return set of primitives"
msgstr ""
-"Erreur dans l''expression de recherche à la position {0} - la partie gauche "
-"de l''expression or(|) doit retourner un jeu de primitives"
+"Erreur dans l’’expression de recherche à la position {0} - la partie gauche "
+"de l’’expression or(|) doit retourner un jeu de primitives"
msgid ""
"Error in search expression on position {0} - not(-) cannot be used in this "
"context"
msgstr ""
-"Erreur dans l''expression de recherche à la position {0} - not(-) ne peut "
+"Erreur dans l’’expression de recherche à la position {0} - not(-) ne peut "
"pas être utilisé dans ce contexte"
msgid ""
"Error in search expression on position {0} - expression must return "
"different then current primitive"
msgstr ""
-"Erreur dans l''expression de recherche à la position {0} - l''expression "
+"Erreur dans l’’expression de recherche à la position {0} - l’’expression "
"doit retourner autre chose que la primitive courante"
msgid "Unexpected token ({0}) on position {1}"
@@ -13971,7 +14337,7 @@ msgstr "Jeton inattendu à la position {0}. Attendu: {1}, trouvé: {2}"
msgid "Error while parsing search expression on position {0}"
msgstr ""
-"Erreur pendant l''analyse de l''expression de recherche à la position {0}"
+"Erreur pendant l’’analyse de l’’expression de recherche à la position {0}"
msgid "Unexpected char on {0}. Expected {1} found {2}"
msgstr "Caractère inattendu à la position {0}. Attendu : {1} trouvé : {2}"
@@ -14145,7 +14511,7 @@ msgid "Error "
msgstr "Erreur "
msgid "Error renaming file \"{0}\" to \"{1}\""
-msgstr "Erreur lors du renommage du fichier ''{0}'' en ''{1}''"
+msgstr "Erreur lors du renommage du fichier ’’{0}’’ en ’’{1}’’"
msgid "File name:"
msgstr "Nom du fichier :"
@@ -14199,7 +14565,7 @@ msgid "Rename File"
msgstr "Renommer le Fichier"
msgid "Rename file \"{0}\" to"
-msgstr "Renommer le fichier ''{0}'' en"
+msgstr "Renommer le fichier ’’{0}’’ en"
msgid "Save in:"
msgstr "Enregistrer dans :"
@@ -14247,6 +14613,11 @@ msgid "Saturation:"
msgstr "Saturation :"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14339,12 +14710,18 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Trouve et corrige facilement les adresses de rue invalides."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Discuter avec les utilisateurs qui éditent la carte à proximité, être "
+"notifié quand quelqu’un se rapproche."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
"Fournit des éléments de la bibliothèque GeoTools aux autres greffons JOSM. "
-"N''est pas destiné à être installé directement par les utilisateurs, mais "
-"plutôt comme une dépendance pour d''autres greffons."
+"N’’est pas destiné à être installé directement par les utilisateurs, mais "
+"plutôt comme une dépendance pour d’’autres greffons."
msgid ""
"Download GPS points from Globalsat dg100 data logger directly in JOSM."
@@ -14363,7 +14740,7 @@ msgid "Visualizes routing information as a routing graph."
msgstr "Visualise les informations comme un calque de calcul d’itinéraire."
msgid "Simple tool to tag house numbers."
-msgstr "Outil basique d''édition des numéros de rue."
+msgstr "Outil basique d’’édition des numéros de rue."
msgid "Generate Imagery XML bounds from a multipolygon"
msgstr ""
@@ -14374,16 +14751,19 @@ msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
msgstr ""
-"Base de données de décalages d''imagerie: partager et acquérir des décalages "
-"d''imagerie avec un seul bouton."
+"Base de données de décalages d’’imagerie: partager et acquérir des décalages "
+"d’’imagerie avec un seul bouton."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Ajuste l’imagerie à la manière WMS"
+msgstr ""
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
"not in huge cache directories"
msgstr ""
+"Ce greffon expérimental permet à JOSM de stocker le cache des tuiles dans un "
+"fichier de base de données, et non pas dans un important répertoire de "
+"stockage."
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14404,7 +14784,7 @@ msgid ""
"Extra information about current layer objects pop ups - currently GPX "
"trackpoint info"
msgstr ""
-"Informations supplémentaires à propos du calque courant - pour l''instant "
+"Informations supplémentaires à propos du calque courant - pour l’’instant "
"les informations sur les traces GPX"
msgid "A helper for IRS satellite adjustment."
@@ -14416,8 +14796,8 @@ msgid ""
"plugins."
msgstr ""
"Fournit la bibliothèque Java Topology Suite (JTS) et des fonctions "
-"utilitaires liées. N''a pas vocation à être directement installé par les "
-"utilisateurs, mais plutôt comme dépendance d''autres greffons."
+"utilitaires liées. N’’a pas vocation à être directement installé par les "
+"utilisateurs, mais plutôt comme dépendance d’’autres greffons."
msgid ""
"creates a channel digraph and checks a subset of channels if it is a "
@@ -14439,12 +14819,18 @@ msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Fournit la bibliothèque log4j aux autres greffons. N''est pas destiné à être "
+"installé directement par les utilisateurs, mais plutôt en tant que "
+"dépendance d''autre greffon."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
"create, close,invalidate, re-open and comment bug reports by using this "
"plugin."
msgstr ""
+"Le greffon MapDust, affiche les signalements d’erreur sur la carte. Vous "
+"pouvez créer, fermer, invalider, ré-ouvrir et commenter les signalements en "
+"utilisant ce greffon."
msgid ""
"Provide a measurement dialog and a layer to measure length and angle of "
@@ -14467,12 +14853,9 @@ msgid "Simplifies download from different read-only APIs."
msgstr ""
"Simplifie le téléchargement depuis différentes APIs en lecture seule."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Convertit simplement une zone en multipolygone."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
-"Permet d''attribuer en une seule fois des attributs à tous les objets d''une "
+"Permet d’’attribuer en une seule fois des attributs à tous les objets d’’une "
"zone sélectionnée"
msgid "NanoLog adjustment and browsing layer"
@@ -14498,6 +14881,8 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
+"Désactive JOSM pour toujours (ATTENTION: ce greffon empêche JOSM de démarrer "
+"et est difficile à retirer)"
msgid "Convert data from Open Data portals to OSM layer"
msgstr ""
@@ -14531,7 +14916,7 @@ msgid "Import OSM data in PBF format"
msgstr "Importe des données OSM au format PBF"
msgid "Import PDF file and convert to ways."
-msgstr "Permet d''importer des fichiers PDF et de les convertir en chemins."
+msgstr "Permet d’’importer des fichiers PDF et de les convertir en chemins."
msgid ""
"Write gps position info to the image file header. Run this feature from the "
@@ -14540,6 +14925,9 @@ msgstr ""
"Écrit les informations GPS de position dans l’entête du fichier image. "
"Exécutez cette fonctionnalité depuis le menu clic droit du calque."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14567,9 +14955,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Outil de création et d’édition de relations et de multipolygones."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Ajoute l''item Redémarrer JOSM au menu Fichier."
-
msgid "Plugin for reverting changesets"
msgstr "Permet d’annuler les groupes de modifications."
@@ -14587,7 +14972,7 @@ msgid ""
"defined in routes.xml file in plugin directory"
msgstr ""
"Affiche un rendu des itinéraires (lignes de bus, chemins de randonnées, "
-"chemins cyclables, ...). Le type d''itinéraire doit être défini dans le "
+"chemins cyclables, ...). Le type d’’itinéraire doit être défini dans le "
"fichier routes.xml du dossier du greffon."
msgid "Provides routing capabilities."
@@ -14604,11 +14989,8 @@ msgstr ""
"peut être forcé par la taille maximale de la zone supprimée, ainsi que le "
"nombre moyen des nœuds à proximité."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Crée et modifie les cartes maritimes pour OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
-msgstr ""
+msgstr "Fonctions d''édition pour OpenSeaMap"
msgid "Allow adding markers/nodes on current gps positions."
msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS."
@@ -14650,13 +15032,18 @@ msgstr ""
"Dessine des bâtiments à partir du cadastre Tchèque. TraceServer (.NET ou "
"Mono) est nécessaire."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Permet de signer numériquement les données OSM."
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
msgstr ""
-"Fournit une interface intuitive pour l''ajout, l''édition et la suppression "
+"Fournit une interface intuitive pour l’’ajout, l’’édition et la suppression "
"de voies de virage."
msgid ""
@@ -14708,9 +15095,6 @@ msgid ""
msgstr ""
"Dessine un circuit d’un point A à un point B d’après des images aériennes."
-msgid "Highways"
-msgstr "Routes"
-
msgid "Streets"
msgstr "Routes"
@@ -14795,6 +15179,9 @@ msgstr "Remblai"
msgid "Lit"
msgstr "Éclairé"
+msgid "Toll"
+msgstr "Péage"
+
msgid "Motorway Link"
msgstr "Bretelle d’accès à une autoroute"
@@ -14885,29 +15272,73 @@ msgstr "Rue résidentielle"
msgid "Edit Residential Street"
msgstr "Modifier une rue résidentielle"
-msgid "Living Street"
-msgstr "Rue d''habitations"
-
-msgid "Edit Living Street"
-msgstr "Modifier une rue d''habitation"
+msgid "Bicycle Road"
+msgstr "Piste cyclable"
-msgid "Pedestrian"
-msgstr "Rue piétonne"
+msgid "Edit Bicycle Road"
+msgstr "Edition des pistes cyclables"
-msgid "Edit Pedestrian Street"
-msgstr "Modifier une rue piétonne"
+msgid "Highway type"
+msgstr "Type de route"
-msgid "Area"
-msgstr "Surface"
+msgctxt "Highway"
+msgid "residential"
+msgstr "Rue résidentielle"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "Voie d’accès"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "Route mineure"
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "oui"
+
+msgid "no"
+msgstr "non"
+
+msgid "destination"
+msgstr "pour destination"
+
+msgid "Oneway for bicycle"
+msgstr "Sens unique pour cycle"
+
+msgid "Living Street"
+msgstr "Zone de rencontre"
+
+msgid "Edit Living Street"
+msgstr "Modifier une rue d’’habitation"
+
+msgid "Pedestrian"
+msgstr "Rue piétonne"
+
+msgid "Edit Pedestrian Street"
+msgstr "Modifier une rue piétonne"
+
+msgid "Area"
+msgstr "Surface"
msgid "Service"
msgstr "Voie d’accès"
-msgid "Edit Serviceway"
-msgstr "Modifier une voie d’accès"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Type de voie d’accès"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "ruelle"
@@ -14918,6 +15349,9 @@ msgstr "allée"
msgid "parking_aisle"
msgstr "voie de parking"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Voie de parking"
@@ -14945,18 +15379,12 @@ msgstr "rond-point"
msgid "jughandle"
msgstr "Voie de sortie (à droite pour tourner à gauche)"
-msgid "yes"
-msgstr "oui"
-
msgid "Road Restrictions"
msgstr "Restrictions d’accès"
msgid "Edit Road Restrictions"
msgstr "Modifier les restrictions d’une route"
-msgid "Toll"
-msgstr "Péage"
-
msgid "No exit (cul-de-sac)"
msgstr "Sans issue"
@@ -14966,9 +15394,6 @@ msgstr "Par mode de transport"
msgid "General Access"
msgstr "Tous modes de transport"
-msgid "destination"
-msgstr "pour destination"
-
msgid "delivery"
msgstr "véhicules de livraison"
@@ -14978,15 +15403,15 @@ msgstr "autorisé"
msgid "private"
msgstr "privé"
+msgid "customers"
+msgstr "clients"
+
msgid "agricultural"
msgstr "véhicules agricoles"
msgid "forestry"
msgstr "véhicules sylvicoles"
-msgid "no"
-msgstr "non"
-
msgid "official"
msgstr "officiel"
@@ -15032,6 +15457,9 @@ msgstr "Véhicules de covoiturage"
msgid "Public Service Vehicles (psv)"
msgstr "Véhicules de transport public"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Vitesse minimale (km/h)"
@@ -15096,10 +15524,10 @@ msgid "unclassified"
msgstr "route mineure"
msgid "residential"
-msgstr "rue résidentiel"
+msgstr "rue résidentielle"
msgid "living_street"
-msgstr "rue d''habitations"
+msgstr "rue d’’habitations"
msgid "service"
msgstr "voie d’accès"
@@ -15116,6 +15544,9 @@ msgstr "Modifier un pont"
msgid "viaduct"
msgstr "viaduc"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "tournant"
@@ -15230,21 +15661,30 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilité"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "excellente"
+msgstr "excellent"
+msgctxt "trail_visibility"
msgid "good"
msgstr "bonne"
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr "moyenne"
+msgctxt "trail_visibility"
msgid "bad"
msgstr "mauvaise"
+msgctxt "trail_visibility"
msgid "horrible"
msgstr "horrible"
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "aucune"
+
msgid "Wheelchairs"
msgstr "Accessible aux fauteuils roulants"
@@ -15260,11 +15700,11 @@ msgstr "Chemin pour cavaliers"
msgid "Edit Bridleway"
msgstr "Modifier un chemin pour cavaliers"
-msgid "Cycle Lane"
-msgstr "Bande cyclable"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Modifier une bande cyclable"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Bande cyclable"
@@ -15299,8 +15739,8 @@ msgstr "Bande cyclable à droite"
msgid "Oneway (bicycle)"
msgstr "Sens unique"
-msgid "Edit Highway"
-msgstr "Modifier une route"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Route"
@@ -15368,12 +15808,18 @@ msgstr "Aire de restauration"
msgid "Edit Rest Area"
msgstr "Modifier une aire de restauration"
-msgid "Emergency Phone"
-msgstr "Borne d’appel d’urgence"
+msgid "Drinking Water"
+msgstr "Point d’eau"
msgid "Traffic Signal"
msgstr "Feu de circulation"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Passage piéton"
@@ -15389,15 +15835,6 @@ msgstr "avec îlot"
msgid "unmarked"
msgstr "non signalé"
-msgid "Cross on horseback"
-msgstr "Traversée à cheval"
-
-msgid "Cross by bicycle"
-msgstr "Traversée à vélo"
-
-msgid "Crossing attendant"
-msgstr "Aide à la traversée"
-
msgid "Crossing type name (UK)"
msgstr "Type de passage"
@@ -15419,6 +15856,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Aide à la traversée"
+
+msgid "Cross by bicycle"
+msgstr "Traversée à vélo"
+
+msgid "Cross on horseback"
+msgstr "Traversée à cheval"
+
msgid "Stop"
msgstr "Stop"
@@ -15428,6 +15874,9 @@ msgstr "Céder le passage"
msgid "Mini-roundabout"
msgstr "Mini giratoire"
+msgid "Edit Mini-Roundabout"
+msgstr "Édition d'un rond-point (pas giratoire)"
+
msgid "Direction"
msgstr "Sens"
@@ -15437,11 +15886,8 @@ msgstr "sens horaire"
msgid "Pedestrian Crossing"
msgstr "Passage piéton"
-msgid "Edit Crossing"
-msgstr "Modifier un passage piéton"
-
-msgid "Type name (UK)"
-msgstr "Type"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Ralentisseur"
@@ -15473,9 +15919,6 @@ msgstr "plateau"
msgid "Passing Place"
msgstr "Aire de croisement"
-msgid "Edit Passing Place"
-msgstr "Modifier une aire de croisement"
-
msgid "Turning Circle"
msgstr "Rond-point interne"
@@ -15509,20 +15952,44 @@ msgstr "Wikipédia"
msgid "Barriers"
msgstr "Barrières"
+msgid "Block"
+msgstr "Obstacle"
+
+msgid "Edit Block"
+msgstr "Modifier un bloc"
+
+msgid "Allowed traffic:"
+msgstr "Trafic autorisé :"
+
+msgid "Material"
+msgstr "Matériau"
+
+msgid "stone"
+msgstr "pierre"
+
msgid "Bollard"
msgstr "Plot"
msgid "Edit Bollard"
-msgstr "Modifier une bitte d’amarrage"
+msgstr "Modifier un plot"
-msgid "Allowed traffic:"
-msgstr "Trafic autorisé :"
+msgid "Bollard type"
+msgstr "Type de plot"
+
+msgid "rising"
+msgstr "levé"
+
+msgid "removable"
+msgstr "Amovible"
+
+msgid "plastic"
+msgstr "plastique"
msgid "Cycle Barrier"
msgstr "Barrière pour cycles"
-msgid "Block"
-msgstr "Obstacle"
+msgid "Edit Cycle Barrier"
+msgstr "Modifier une barrière pour cycles"
msgid "Cattle Grid"
msgstr "Barrière canadienne"
@@ -15533,6 +16000,9 @@ msgstr "Modifier une barrière canadienne"
msgid "Bus Trap"
msgstr "Entrée de voie de bus (Allemagne)"
+msgid "Edit Bus Trap"
+msgstr "Modifier une entrée de voie de bus"
+
msgid "Spikes"
msgstr "Pointes"
@@ -15554,44 +16024,88 @@ msgstr "Modifier une douane"
msgid "Hedge"
msgstr "Haie"
+msgid "Edit Hedge"
+msgstr "Modifier une haie"
+
+msgid "Height (meters)"
+msgstr "Hauteur (mètres)"
+
+msgid "Genus"
+msgstr "Genre"
+
+msgid "Species"
+msgstr "Espèce"
+
+msgid "Taxon"
+msgstr "Taxon"
+
msgid "Fence"
msgstr "Clôture"
+msgid "Edit Fence"
+msgstr "Editer la barrière"
+
msgid "barbed_wire"
msgstr "fil barbelé"
-msgid "chain"
-msgstr "chaîne"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "électrique"
-msgid "hedge"
-msgstr "haie"
-
msgid "pole"
msgstr "pylône"
msgid "split_rail"
msgstr "Clôture de perches"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr "Glissière de sécurité"
+
+msgid "Edit Guard Rail"
+msgstr "Modifier la glissière de sécurité"
+
msgid "Wall"
msgstr "Mur"
+msgid "Edit Wall"
+msgstr "Editer le mur"
+
msgid "City Wall"
msgstr "Rempart"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Mur de soutènement"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Fossé"
-msgid "Entrance"
-msgstr "Entrée"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Modifier une entrée"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Portail"
@@ -15623,12 +16137,27 @@ msgstr "Portillon"
msgid "Edit Kissing Gate"
msgstr "Modifier un portillon"
+msgid "Chain"
+msgstr "Chaîne"
+
+msgid "Edit Chain"
+msgstr "Editer la Chaîne"
+
msgid "Stile"
msgstr "Échalier"
msgid "Edit Stile"
msgstr "Modifier un échalier"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Portillon"
@@ -15686,6 +16215,9 @@ msgstr "Canal d’évacuation"
msgid "Edit Drain"
msgstr "Modifier un canal d’évacuation"
+msgid "Ditch"
+msgstr "Fossé"
+
msgid "Edit Ditch"
msgstr "Modifier un fossé"
@@ -15695,6 +16227,12 @@ msgstr "Ruisseau"
msgid "Edit Stream"
msgstr "Modifier un ruisseau"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -15734,9 +16272,6 @@ msgstr "Modifier un barrage"
msgid "Groyne"
msgstr "Épi"
-msgid "Edit Groyne"
-msgstr "Modifier un épi"
-
msgid "Breakwater"
msgstr "Digue"
@@ -15770,6 +16305,21 @@ msgstr "Modifier un réservoir couvert"
msgid "Edit Water"
msgstr "Modifier une étendue d’eau"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Terre"
@@ -15851,20 +16401,25 @@ msgstr "Modifier un terminal de ferry"
msgid "Cargo"
msgstr "Type de transport"
+msgctxt "cargo"
msgid "passengers"
-msgstr "passagers"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "véhicules"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "vélos"
+msgstr "vélo/bicyclette"
+msgctxt "cargo"
msgid "hgv"
-msgstr "poids lourds"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "passagers et véhicules"
+msgstr ""
msgid "Ferry Route"
msgstr "Itinéraire de ferry"
@@ -15924,7 +16479,7 @@ msgid "main"
msgstr "principale"
msgid "branch"
-msgstr ""
+msgstr "Embranchement"
msgid "industrial"
msgstr "zone industrielle"
@@ -15935,7 +16490,10 @@ msgstr "terrain militaire"
msgid "tourism"
msgstr "tourisme"
-msgid "Service/Type"
+msgid "freight"
+msgstr "Fret"
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15959,11 +16517,14 @@ msgstr "par câble aérien"
msgid "rail"
msgstr "par rail"
-msgid "Voltage"
-msgstr "Tension"
+msgid "Voltage in Volts (V)"
+msgstr "Voltage en Volts (V)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frequency en Hertz (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Fréquence (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15974,9 +16535,6 @@ msgstr "Voie ferrée étroite"
msgid "Edit Narrow Gauge Rail"
msgstr "Modifier une voie ferrée étroite"
-msgid "Types"
-msgstr "Type"
-
msgid "Monorail"
msgstr "Monorail"
@@ -16019,18 +16577,56 @@ msgstr "Voie désaffectée"
msgid "Edit Disused Railway"
msgstr "Modifier une voie désaffectée"
-msgid "Optional Types"
-msgstr "Types facultatifs"
-
msgid "Abandoned Rail"
msgstr "Voie abandonnée"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Passage à niveau routier"
+msgid "Edit Level Crossing"
+msgstr "Edition de passage à niveau"
+
+msgid "Supervised"
+msgstr "supervisé"
+
+msgid "Traffic lights"
+msgstr "Feux de signalisation"
+
+msgid "Sound signals"
+msgstr "Signaux sonores"
+
+msgid "Barrier"
+msgstr "Barrière"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "Oui"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "aucune"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "Demi-barrière"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "totale"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "Double demi-barrière"
+
msgid "Crossing"
msgstr "Passage à niveau piéton"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Type de passage à niveau"
@@ -16053,7 +16649,7 @@ msgid "Reference number"
msgstr "Numéro de référence"
msgid "Number of people per hour"
-msgstr "Nombre de personnes à l''heure"
+msgstr "Nombre de personnes à l’’heure"
msgid "Number of people per chair"
msgstr "Nombre de personnes par siège"
@@ -16130,13 +16726,11 @@ msgstr "Tapis magique"
msgid "Edit Magic Carpet"
msgstr "Modifier un tapis magique"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Marchandises"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Modifier un transport de marchandise"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -16146,13 +16740,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Modifier une station"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pylône"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Modifier un pylône"
+msgstr ""
msgid "Parking"
msgstr "Parking"
@@ -16169,12 +16761,12 @@ msgstr "en surface"
msgid "underground"
msgstr "souterraine"
+msgid "rooftop"
+msgstr "toit"
+
msgid "Access"
msgstr "Accès"
-msgid "customers"
-msgstr "clients"
-
msgid "Park and Ride"
msgstr "Parc relais"
@@ -16202,9 +16794,6 @@ msgstr "Place de stationnement"
msgid "Edit Parking space"
msgstr "Modifier une place de stationnement"
-msgid "rooftop"
-msgstr "toit"
-
msgid "Capacity"
msgstr "Capacité"
@@ -16220,20 +16809,36 @@ msgstr "Limite de temps (minutes)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "supervisé"
-
msgid "Opening Hours"
msgstr "Horaires d’ouverture"
msgid "24/7"
msgstr "24h/24 7j/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Lu-Ve 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Ma-Di 08:00-15:00, Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Entrée de parking"
@@ -16382,6 +16987,9 @@ msgstr "Borne de recharge"
msgid "Edit Charging Station (for electric cars)"
msgstr "Modifier une borne de recharge"
+msgid "Voltage"
+msgstr "Tension"
+
msgid "Amperage"
msgstr "Ampérage"
@@ -16403,8 +17011,14 @@ msgstr "Garagiste"
msgid "Edit Car Repair"
msgstr "Modifier un garagiste"
-msgid "Tyres"
-msgstr "Magasin de pneus"
+msgid "Parts"
+msgstr "Pièces détachées"
+
+msgid "Edit Car Parts"
+msgstr ""
+
+msgid "Tyres"
+msgstr "Magasin de pneus"
msgid "Edit Tyres"
msgstr "Modifier un magasin de pneus"
@@ -16430,6 +17044,12 @@ msgstr "Location"
msgid "Edit Car Rental"
msgstr "Modifier une location de voiture"
+msgid "Second hand"
+msgstr "Seconde main, occasion"
+
+msgid "only"
+msgstr "uniquement"
+
msgid "Sharing"
msgstr "Autopartage"
@@ -16454,22 +17074,6 @@ msgstr "Services :"
msgid "Sale"
msgstr "Vente"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "oui"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "marque"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "occasion"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "non"
-
msgid "brand"
msgstr "marque"
@@ -16491,9 +17095,6 @@ msgstr "Contrôle technique"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Pièces détachées"
-
msgid "Clothes"
msgstr "Vêtements"
@@ -16557,8 +17158,8 @@ msgstr "Modifier une location de vélos"
msgid "Public Transport"
msgstr "Transport public"
-msgid "Route"
-msgstr "Itinéraire"
+msgid "Public transport route"
+msgstr "Itinéraire de transport en commun"
msgid "Edit Route"
msgstr "Modifier un itinéraire"
@@ -16635,19 +17236,19 @@ msgstr "blanc"
msgctxt "color"
msgid "#CD853F"
-msgstr ""
+msgstr "#CD853F"
msgid "route segment"
msgstr "route (sens aller et retour)"
msgid "stop position"
-msgstr "position d’arrêt"
+msgstr "Arrêt"
msgid "stop position (exit only)"
-msgstr "position d’arrêt (sortie seulement)"
+msgstr "Arrêt (sortie seulement)"
msgid "stop position (entry only)"
-msgstr "position d’arrêt (entrée seulement)"
+msgstr "Arrêt (entrée seulement)"
msgid "platform"
msgstr "plateforme"
@@ -16665,7 +17266,7 @@ msgid "Edit Route master"
msgstr "Modifier un itinéraire maître"
msgid "route variant/direction (at least 2)"
-msgstr "variante/direction de l''itinéraire (au moins 2)"
+msgstr "variante/direction de l’’itinéraire (au moins 2)"
msgid "Stop Area"
msgstr "Aire d’Arrêt"
@@ -16674,10 +17275,10 @@ msgid "Edit Stop Area"
msgstr "Modifier l’aire d’arrêt"
msgid "UIC reference"
-msgstr ""
+msgstr "référence UIC"
msgid "UIC name"
-msgstr ""
+msgstr "nom UIC"
msgid "Stop Position"
msgstr "Position du Stop"
@@ -16688,6 +17289,9 @@ msgstr "Plateforme"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Bus"
@@ -16698,7 +17302,7 @@ msgid "Tram stop (legacy)"
msgstr "Arrêt de tram (obsolète)"
msgid "Train"
-msgstr ""
+msgstr "Train"
msgid "Railway station (legacy)"
msgstr "Station ferrovière (obsolète)"
@@ -16718,6 +17322,9 @@ msgstr "Funiculaire"
msgid "Ferry"
msgstr "Ferry"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banc"
@@ -16730,9 +17337,6 @@ msgstr "Accessible aux fauteuils roulants"
msgid "limited"
msgstr "limité"
-msgid "only"
-msgstr "uniquement"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16742,8 +17346,13 @@ msgstr ""
msgid "funicular"
msgstr "funiculaire"
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Gare"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Modifier une station"
msgid "Building"
msgstr "Bâtiment"
@@ -16757,6 +17366,9 @@ msgstr "Modifier une bouche de métro"
msgid "Ticket Machine"
msgstr "Billetterie automatique"
+msgid "Edit Ticket Machine"
+msgstr "Edition de billeterie automatique"
+
msgid "Reference Number"
msgstr "Numéro de référence"
@@ -16781,14 +17393,6 @@ msgstr "Cartes de fidélité"
msgid "Public Transport (legacy)"
msgstr "Transport public (obsolète)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Gare"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Modifier une station"
-
msgid "UIC-Reference"
msgstr "Référence UIC"
@@ -16837,8 +17441,8 @@ msgstr "Modifier une plateforme de bus"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Modifier une station de taxi"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Aéroport"
@@ -16891,6 +17495,21 @@ msgstr "Aérogare"
msgid "Edit Terminal"
msgstr "Modifier un aérogare"
+msgid "Internet access"
+msgstr "Accès Internet"
+
+msgid "wlan"
+msgstr "wi-fi"
+
+msgid "wired"
+msgstr "prise"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Accès Internet payant"
+
msgctxt "airport"
msgid "Gate"
msgstr "Porte d’embarquement"
@@ -16913,21 +17532,6 @@ msgstr "Modifier un hôtel"
msgid "Stars"
msgstr "Étoiles"
-msgid "Internet access"
-msgstr "Accès Internet"
-
-msgid "wlan"
-msgstr "wi-fi"
-
-msgid "wired"
-msgstr "prise"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Accès Internet payant"
-
msgid "Smoking"
msgstr "Autorisation de fumer"
@@ -17111,6 +17715,12 @@ msgstr "Boîte de nuit"
msgid "Edit Nightclub"
msgstr "Modifier une boîte de nuit"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Tourisme"
@@ -17132,9 +17742,15 @@ msgstr "Tour de vigie"
msgid "Information Office"
msgstr "Office du Tourisme"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Carte"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Niveau de détail"
@@ -17147,6 +17763,9 @@ msgstr "rue"
msgid "scheme"
msgstr "plan"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Zone affichée"
@@ -17186,6 +17805,9 @@ msgstr "…autres modes de transport possibles"
msgid "Information Board"
msgstr "Panneau d’informations"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Contenu du panneau"
@@ -17207,8 +17829,14 @@ msgstr "flore"
msgid "Guidepost"
msgstr "Poteau indicateur"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
-msgstr "Terminal d’informations"
+msgstr "Lieu d’informations"
+
+msgid "Edit Information Terminal"
+msgstr ""
msgid "Closer description"
msgstr "Description"
@@ -17216,14 +17844,20 @@ msgstr "Description"
msgid "Audioguide"
msgstr "Guide audio"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Guide audio par téléphone mobile ?"
msgid "Phone number"
msgstr "Numéro de téléphone"
-msgid "Other Information Points"
-msgstr "Point d’informations"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Loisirs"
@@ -17246,9 +17880,6 @@ msgstr "Parc canin"
msgid "Edit Dog Park"
msgstr "Modifier un parc canin"
-msgid "Barrier"
-msgstr "Barrière"
-
msgid "fence"
msgstr "clôture"
@@ -17273,8 +17904,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Modifier un sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Mar-Dim 08:00-15:00 ; Sam 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr "Bordel"
+
+msgid "Edit Brothel"
+msgstr "Modifier un bordel"
msgid "Playground"
msgstr "Terrain de jeux"
@@ -17346,50 +17986,44 @@ msgstr "Œuvre d’art"
msgid "Edit Artwork"
msgstr "Modifier une œuvre d’art"
-msgid "Place of Worship"
-msgstr "Lieu de culte"
-
-msgid "Edit Place of Worship"
-msgstr "Modifier un lieu de culte"
-
-msgid "Religion"
-msgstr "Religion"
+msgid "Recording Studio"
+msgstr "Studio d’enregistrement"
-msgid "bahai"
-msgstr "bahaïsme"
+msgid "Edit Studio"
+msgstr "Modifier un studio"
-msgid "buddhist"
-msgstr "bouddhiste"
+msgid "audio"
+msgstr "audio"
-msgid "christian"
-msgstr "christianisme"
+msgid "video"
+msgstr "vidéo"
-msgid "hindu"
-msgstr "hindouisme"
+msgid "Place of Worship"
+msgstr "Lieu de culte"
-msgid "jain"
-msgstr "jaïnisme"
+msgid "Church"
+msgstr "Église"
-msgid "jewish"
-msgstr "judaïsme"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "islam"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikhisme"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualisme"
+msgid "cathedral"
+msgstr "Cathédrale"
-msgid "taoist"
-msgstr "taoïsme"
+msgid "chapel"
+msgstr "Chapelle"
-msgid "unitarian"
-msgstr "unitarisme"
+msgid "church"
+msgstr "église"
-msgid "zoroastrian"
-msgstr "zoroastrisme"
+msgid "temple"
+msgstr "Temple"
msgid "Denomination"
msgstr "Dénomination"
@@ -17406,6 +18040,12 @@ msgstr "catholicisme"
msgid "evangelical"
msgstr "évangélisme"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "témoins de Jehovah"
@@ -17418,6 +18058,9 @@ msgstr "méthodisme"
msgid "mormon"
msgstr "mormonisme"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodoxie"
@@ -17433,104 +18076,207 @@ msgstr "protestantisme"
msgid "quaker"
msgstr "Société religieuse des Amis"
-msgid "shia"
-msgstr "chiisme"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "sunnisme"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Horaires de service"
-msgid "Su 10:00"
-msgstr "Di 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Di 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Di 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Horaires d''ouverture"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Studio d’enregistrement"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Modifier un studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
-msgid "audio"
-msgstr "audio"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "vidéo"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "Bâtiment public"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Modifier un bâtiment public"
+msgid "mosque"
+msgstr "Mosquée"
-msgid "Town hall"
-msgstr "Mairie"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Modifier une mairie"
+msgid "shia"
+msgstr "chiisme"
-msgid "Community Centre"
-msgstr "Centre de loisirs"
+msgid "sunni"
+msgstr "sunnisme"
-msgid "Embassy"
-msgstr "Ambassade"
+msgid "Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Modifier une ambassade"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Palais de justice"
+msgid "synagogue"
+msgstr "Synagogue"
-msgid "Edit Courthouse"
-msgstr "Modifier un palais de justice"
+msgid "conservative"
+msgstr ""
-msgid "Prison"
-msgstr "Prison"
+msgid "reform"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Modifier une prison"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Commissariat de police"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Edit Police"
-msgstr "Modifier un commissariat de police"
+msgid "theravada"
+msgstr ""
-msgid "Fire Station"
-msgstr "Caserne de pompiers"
+msgid "mahayana"
+msgstr ""
-msgid "Edit Fire Station"
-msgstr "Modifier une caserne de pompiers"
+msgid "vajrayana"
+msgstr ""
-msgid "Post Office"
-msgstr "Bureau de poste"
+msgid "Hindu Temple"
+msgstr ""
-msgid "Edit Post Office"
-msgstr "Modifier un bureau de poste"
+msgid "Edit Hindu Temple"
+msgstr ""
-msgid "Education"
-msgstr "Éducation"
+msgid "vaishnavism"
+msgstr ""
-msgid "Kindergarten"
-msgstr "Jardin d’enfants"
+msgid "shaivism"
+msgstr ""
-msgid "Edit Kindergarten"
-msgstr "Modifier un jardin d’enfants"
+msgid "shaktism"
+msgstr ""
-msgid "School"
-msgstr "École"
+msgid "smartism"
+msgstr ""
-msgid "Edit School"
-msgstr "Modifier une école"
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religion"
+
+msgid "bahai"
+msgstr "bahaïsme"
+
+msgid "jain"
+msgstr "jaïnisme"
+
+msgid "sikh"
+msgstr "sikhisme"
+
+msgid "spiritualist"
+msgstr "spiritualisme"
+
+msgid "taoist"
+msgstr "taoïsme"
+
+msgid "unitarian"
+msgstr "unitarisme"
+
+msgid "zoroastrian"
+msgstr "zoroastrisme"
+
+msgid "Public Building"
+msgstr "Bâtiment public"
+
+msgid "Edit Public Building"
+msgstr "Modifier un bâtiment public"
+
+msgid "Town hall"
+msgstr "Mairie"
+
+msgid "Edit Town hall"
+msgstr "Modifier une mairie"
+
+msgid "Community Centre"
+msgstr "Centre de loisirs"
+
+msgid "Embassy"
+msgstr "Ambassade"
+
+msgid "Edit Embassy"
+msgstr "Modifier une ambassade"
+
+msgid "Courthouse"
+msgstr "Palais de justice"
+
+msgid "Edit Courthouse"
+msgstr "Modifier un palais de justice"
+
+msgid "Prison"
+msgstr "Prison"
+
+msgid "Edit Prison"
+msgstr "Modifier une prison"
+
+msgid "Police"
+msgstr "Commissariat de police"
+
+msgid "Edit Police"
+msgstr "Modifier un commissariat de police"
+
+msgid "Fire Station"
+msgstr "Caserne de pompiers"
+
+msgid "Edit Fire Station"
+msgstr "Modifier une caserne de pompiers"
+
+msgid "Post Office"
+msgstr "Bureau de poste"
+
+msgid "Edit Post Office"
+msgstr "Modifier un bureau de poste"
+
+msgid "Education"
+msgstr "Éducation"
+
+msgid "Kindergarten"
+msgstr "Jardin d’enfants"
+
+msgid "Edit Kindergarten"
+msgstr "Modifier un jardin d’enfants"
+
+msgid "School"
+msgstr "École"
+
+msgid "Edit School"
+msgstr "Modifier une école"
msgid "University"
msgstr "Université"
@@ -17553,6 +18299,12 @@ msgstr "Modifier une auto-école"
msgid "License Classes"
msgstr "Permis délivré(s)"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Santé"
@@ -17562,6 +18314,12 @@ msgstr "Hôpital"
msgid "Edit Hospital"
msgstr "Modifier un hôpital"
+msgid "Clinic"
+msgstr "Clinique"
+
+msgid "Edit Clinic"
+msgstr "Editer la clinique"
+
msgid "Doctors"
msgstr "Cabinet médical"
@@ -17593,7 +18351,7 @@ msgid "Edit Pharmacy"
msgstr "Modifier une pharmacie"
msgid "Dispensing"
-msgstr "Dispensaire"
+msgstr "Délivre des médicaments"
msgid "Hearing Aids"
msgstr "Audioprothésiste"
@@ -17628,12 +18386,66 @@ msgstr "Cabinet vétérinaire"
msgid "Edit Veterinary"
msgstr "Modifier un cabinet vétérinaire"
-msgid "Note"
-msgstr "Paiement"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "public"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Boîte aux lettres"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Cabine téléphonique"
@@ -17643,6 +18455,30 @@ msgstr "Modifier une cabine téléphonique"
msgid "Telephone cards"
msgstr "Cartes téléphoniques"
+msgid "Emergency Phone"
+msgstr "Borne d’appel d’urgence"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr "Défibrilateur automatique"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Edition de défibrilateur automatique"
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Horloge"
@@ -17652,30 +18488,36 @@ msgstr "Modifier une horloge"
msgid "Display"
msgstr "Cadran"
-msgctxt "display"
msgid "analog"
-msgstr "analogique"
+msgstr "Analogique"
-msgctxt "display"
msgid "digital"
-msgstr "numérique"
+msgstr "Digitale"
-msgctxt "display"
msgid "sundial"
-msgstr "cadran solaire"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
-msgstr "peu orthodoxe"
+msgstr ""
msgid "Support"
msgstr "Support"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "mural"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "panneau"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
msgid "Visibility/readability"
msgstr "Visibilité"
@@ -17704,8 +18546,8 @@ msgstr "Affiche l’humidité"
msgid "Recycling"
msgstr "Point de recyclage"
-msgid "Edit Recycling station"
-msgstr "Modifier un point de recyclage"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batteries"
@@ -17731,27 +18573,15 @@ msgstr "centre de tri"
msgid "Waste Basket"
msgstr "Poubelle"
-msgid "Edit Waste Basket"
-msgstr "Modifier une poubelle"
-
msgid "Waste Disposal"
msgstr "Déchetterie"
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Dossier"
-msgid "Material"
-msgstr "Matériau"
-
-msgid "stone"
-msgstr "pierre"
-
-msgid "plastic"
-msgstr "plastique"
-
msgid "Amount of Seats"
msgstr "Nombre de places"
@@ -17786,14 +18616,17 @@ msgstr "Modifier un abri de chasse"
msgid "Height"
msgstr "Hauteur"
+msgctxt "height"
msgid "low"
-msgstr "Faible"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "moyenne"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "grande"
+msgstr ""
msgid "Hide"
msgstr "Camouflé"
@@ -17801,11 +18634,11 @@ msgstr "Camouflé"
msgid "Lock"
msgstr "Verrouillé"
-msgid "Drinking Water"
-msgstr "Point d’eau"
+msgid "Edit Source of Potable Water"
+msgstr "Modifier le point d’eau"
-msgid "Edit Drinking Water"
-msgstr "Modifier un point d’eau"
+msgid "Indoor"
+msgstr "Intérieur"
msgid "Fire Hydrant"
msgstr "Borne incendie"
@@ -17832,6 +18665,9 @@ msgstr "bassin"
msgid "Diameter (in mm)"
msgstr "Diamètre (en mm)"
+msgid "Hydrant Position"
+msgstr "Position de borne incendie"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "voie"
@@ -17869,119 +18705,155 @@ msgstr "Stade"
msgid "Edit Stadium"
msgstr "Modifier un stade"
-msgid "select sport:"
-msgstr "Selectionnez un sport :"
+msgid "Select sport:"
+msgstr "Selection du sport :"
-msgid "sport"
-msgstr "Sport"
+msgid "Sport"
+msgstr "Sports"
+msgctxt "sport"
msgid "multi"
-msgstr "multisport"
+msgstr "multi"
+msgctxt "sport"
msgid "archery"
-msgstr "tir à l’arc"
+msgstr "Archerie"
+msgctxt "sport"
msgid "athletics"
-msgstr "athlétisme"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "football americain"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "football australien"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basketball"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "boulingrin"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "football canadien"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "canoë"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "escalade"
+msgstr "Escalade"
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "filets de cricket"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "cyclisme"
+msgstr "Cyclisme"
+msgctxt "sport"
msgid "dog_racing"
-msgstr "course de chiens"
+msgstr "Course canine"
+msgctxt "sport"
msgid "equestrian"
-msgstr "équitation"
+msgstr "Equitation"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "jeux_gaéliques"
+msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gymnastique"
+msgstr "Gymnastique"
+msgctxt "sport"
msgid "hockey"
-msgstr "hockey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "course de chevaux"
+msgstr "Course hippique"
+msgctxt "sport"
msgid "motor"
-msgstr "moteur"
+msgstr "Sport mécanique"
+msgctxt "sport"
msgid "pelota"
-msgstr "pelote"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "sport de raquettes"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "rugby (professionnel)"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "rugby (amateur)"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "chasse"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "roller"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "ski"
+msgstr "Ski"
+msgctxt "sport"
msgid "soccer"
-msgstr "football"
+msgstr "Football (Européen)"
+msgctxt "sport"
msgid "swimming"
-msgstr "natation"
+msgstr "Natation"
+msgctxt "sport"
msgid "table_tennis"
-msgstr "tennis de table"
+msgstr "Tennis de table"
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Centre sportif"
@@ -18013,26 +18885,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Modifier un minigolf"
-msgid "Sport"
-msgstr "Sports"
-
msgid "Multi"
msgstr "Multisport"
msgid "Edit Multi"
msgstr "Modifier un terrain multisport"
-msgid "type"
-msgstr "Type"
-
+msgctxt "running"
msgid "pitch"
-msgstr "terrain"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr "centre sportif"
+msgctxt "running"
msgid "stadium"
-msgstr "stade"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr "piste"
msgid "9pin"
msgstr "Bowling (9-pin)"
@@ -18040,6 +18913,15 @@ msgstr "Bowling (9-pin)"
msgid "Edit 9pin"
msgstr "Modifier un bowling (9-pin)"
+msgid "pitch"
+msgstr "terrain"
+
+msgid "sports_centre"
+msgstr "centre sportif"
+
+msgid "stadium"
+msgstr "stade"
+
msgid "10pin"
msgstr "Bowling (10-pin)"
@@ -18073,6 +18955,22 @@ msgstr "Modifier une zone de canoë"
msgid "Edit Cycling"
msgstr "Modifier un terrain de cyclisme"
+msgctxt "racing"
+msgid "pitch"
+msgstr "Terrain"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "stade"
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Course de chiens"
@@ -18085,10 +18983,35 @@ msgstr "Équitation"
msgid "Edit Equestrian"
msgstr "Modifier un terrain de sport équestre"
-msgid "horse_riding"
-msgstr "centre équestre"
+msgctxt "riding"
+msgid "pitch"
+msgstr "Terrain"
-msgid "Horse Racing"
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "centre sportif"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "stade"
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "terrain boueux"
+
+msgid "Horse Racing"
msgstr "Course de chevaux"
msgid "Edit Horse Racing"
@@ -18104,7 +19027,7 @@ msgid "Skating"
msgstr "Roller"
msgid "Edit Skating"
-msgstr "Modifier un terrain de roller"
+msgstr ""
msgid "ice_rink"
msgstr "patinoire"
@@ -18148,38 +19071,56 @@ msgstr "snowpark"
msgid "Difficulty"
msgstr "Difficulté"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "très facile"
+msgstr "Débutant"
+msgctxt "piste:difficulty"
msgid "easy"
msgstr "facile"
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "Intermediaire"
+
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "difficile"
+msgstr "Perfexionné"
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "très difficile"
+msgstr "experimenté"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "hors piste"
+msgstr ""
msgid "Grooming"
msgstr "Damage"
+msgctxt "piste:grooming"
msgid "classic"
-msgstr "classique"
+msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "bosses"
+msgstr ""
+
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "classique;pas de patineur (skating)"
+msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "par une motoneige"
+msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "hors-piste pour ski de randonnée"
+msgstr ""
msgid "Shooting"
msgstr "Tir sportif"
@@ -18220,21 +19161,17 @@ msgstr "Jeux Gaéliques"
msgid "Edit Gaelic Games"
msgstr "Modifier les Jeux Gaéliques"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr "Hurling"
+msgstr ""
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Football"
+msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
-msgstr "Camogie"
+msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
-msgstr "Rounders"
+msgstr ""
msgid "Rugby League"
msgstr "Rugby (professionnel)"
@@ -18371,6 +19308,18 @@ msgstr "Aéromodélisme"
msgid "Edit Model Aerodrome"
msgstr "Modifier un terrain d’aéromodélisme"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "Automodélisme"
@@ -18383,59 +19332,133 @@ msgstr "Édifices"
msgid "Edit Building"
msgstr "Modifier un bâtiment"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "toit"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "garage"
+msgstr ""
-msgid "church"
-msgstr "église"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "Batiment industrielle"
+msgctxt "building"
msgid "school"
-msgstr "école"
+msgstr "Batiment scolaire"
+msgctxt "building"
msgid "hangar"
-msgstr "hangar"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "commercial"
+msgstr "Batiment commerciale"
+msgctxt "building"
msgid "farm"
-msgstr "ferme"
+msgstr "Batiment agricole"
+msgctxt "building"
msgid "transportation"
-msgstr "transports"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "serre"
+msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "bureaux"
+msgstr ""
+msgctxt "building"
msgid "university"
msgstr "université"
+msgctxt "building"
+msgid "hospital"
+msgstr "hôpital"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr "commerce"
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr "Bâtiment résidentiel"
msgid "Edit Residential Building"
msgstr "Modifier un bâtiment résidentiel"
+msgctxt "building"
+msgid "residential"
+msgstr "Batiment d'habitation"
+
+msgctxt "building"
msgid "apartments"
-msgstr "appartements"
+msgstr "Appartement"
+msgctxt "building"
msgid "house"
msgstr "maison"
+msgctxt "building"
msgid "hut"
-msgstr "hutte"
+msgstr ""
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
-msgstr "maison mitoyenne"
+msgstr ""
+msgctxt "building"
msgid "detached"
-msgstr "maison individuelle"
+msgstr ""
+
+msgid "Entrance"
+msgstr "Entrée"
+
+msgid "Edit Entrance"
+msgstr "Modifier une entrée"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr "principale"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "Entrée de service"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "sortie"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "urgence"
msgid "Tower"
msgstr "Grande structure"
@@ -18452,9 +19475,6 @@ msgstr "communication"
msgid "observation"
msgstr "observation"
-msgid "Height (meters)"
-msgstr "Hauteur (mètres)"
-
msgid "Flagpole"
msgstr "Mât"
@@ -18664,42 +19684,68 @@ msgstr "Horaires de fonctionnement"
msgid "Mo-Fr 22:00-05:00"
msgstr "Lu-Ve 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Station météorologique"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
+
+msgid "Monitoring:"
+msgstr ""
+
+msgid "Weather"
+msgstr ""
+
+msgid "Water level"
+msgstr ""
+
+msgid "Tide Level"
+msgstr ""
+
+msgid "Traffic"
+msgstr ""
+
+msgid "Air Quality"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Modifier une station météorologique"
+msgid "Noise"
+msgstr ""
-msgid "Measurement"
-msgstr "Capteur"
+msgid "GPS Signals"
+msgstr ""
-msgid "particulate_matter"
-msgstr "qualité de l’air"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "seismic"
-msgstr "sismique"
+msgid "Galileo Signals"
+msgstr ""
-msgid "water_level"
-msgstr "niveau d’eau"
+msgid "Radiation"
+msgstr ""
-msgid "weather"
-msgstr "météorologique"
+msgid "Seismic Activity"
+msgstr ""
-msgid "Recording"
-msgstr "Mesure"
+msgid "Recording:"
+msgstr ""
-msgid "manually"
-msgstr "manuelle"
+msgid "Automated"
+msgstr ""
-msgid "automated"
-msgstr "automatique"
+msgid "Manually"
+msgstr ""
-msgid "remote"
-msgstr "distante"
+msgid "Remote"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "aucun"
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Point géodésique"
@@ -18707,8 +19753,8 @@ msgstr "Point géodésique"
msgid "Edit Survey Point"
msgstr "Modifier un point géodésique"
-msgid "Surveillance"
-msgstr "Caméra de surveillance"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Modifier une caméra de surveillance"
@@ -18719,12 +19765,102 @@ msgstr "intérieur"
msgid "outdoor"
msgstr "extérieur"
-msgid "public"
-msgstr "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "magasin"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Hauteur en mètre (m)"
msgid "Power"
msgstr "Électricité"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr "Formes d’énergie en sortie"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "électricité"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "eau chaude"
+
+msgid "hot air"
+msgstr "air chaud"
+
+msgid "cold water"
+msgstr "eau froide"
+
+msgid "cold air"
+msgstr "air froid"
+
+msgid "compressed air"
+msgstr "air comprimé"
+
+msgid "steam"
+msgstr "vapeur"
+
+msgid "vacuum"
+msgstr "vide"
+
msgid "Power Generator"
msgstr "Centrale électrique"
@@ -18776,89 +19912,192 @@ msgstr "éolienne"
msgid "Method"
msgstr "Méthode"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "méthanisation"
+msgstr ""
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr "Barrage hydraulique"
+msgctxt "generator method"
msgid "combustion"
-msgstr "combustion"
+msgstr "Centrale à combustion"
-msgid "dam"
-msgstr "barrage"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "fission nucléaire"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "fusion"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
-msgstr "gazéification"
-
-msgid "photovoltaic"
-msgstr "solaire photovoltaïque"
+msgstr ""
-msgid "pumped-storage"
-msgstr "pompage-turbinage"
+msgid "biomass / waste"
+msgstr ""
-msgid "pumping"
-msgstr "pompe à chaleur (géothermie)"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "Génerateur photovoltaique"
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "pyrolyse"
+msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "fil de l''eau"
+msgstr ""
+
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+msgctxt "generator method"
msgid "thermal"
-msgstr "transfert thermique"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "Formes d’énergie en sortie"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "electricity"
-msgstr "électricité"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "eau chaude"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "air chaud"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "eau froide"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "air froid"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "air comprimé"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "vapeur"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vide"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr "Fission nucléaire"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
-msgid "battery charging"
-msgstr "charge de batterie"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
-msgid "Power Station"
-msgstr "Station électrique"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Modifier une station électrique"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Poste électrique"
@@ -18869,6 +20108,21 @@ msgstr "Modifier un poste électrique"
msgid "Line reference"
msgstr "Référence de la ligne"
+msgid "high"
+msgstr "Élevée"
+
+msgid "medium"
+msgstr "Moyenne"
+
+msgid "low"
+msgstr "Faible"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "Transformateur"
@@ -18884,6 +20138,9 @@ msgstr "Modifier un pylône haute-tension"
msgid "Tower reference"
msgstr "Référence"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Pylône basse-tension"
@@ -18902,13 +20159,11 @@ msgstr "Modifier une ligne électrique"
msgid "Line type"
msgstr "Type de ligne"
-msgctxt "Power Line"
msgid "line"
-msgstr "haute-tension"
+msgstr "ligne"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "faible-tension"
+msgstr "Ligne basse tension"
msgid "Amount of Cables"
msgstr "Nombre de câbles"
@@ -19015,11 +20270,11 @@ msgstr "Kiosque"
msgid "Edit Kiosk"
msgstr "Modifier un kiosque"
-msgid "Baker"
-msgstr "Boulangerie"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Modifier une boulangerie"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Boucherie"
@@ -19030,8 +20285,8 @@ msgstr "Modifier une boucherie"
msgid "Seafood"
msgstr "Poissonnerie"
-msgid "Edit Seafood"
-msgstr "Modifier une poissonnerie"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Épicerie fine"
@@ -19051,14 +20306,20 @@ msgstr "Place de marché"
msgid "Edit Marketplace"
msgstr "Modifier une place de marché"
+msgid "Organic"
+msgstr "Magasin bio"
+
msgid "Greengrocer"
msgstr "Fruits et légumes"
msgid "Edit Greengrocer"
msgstr "Modifier un magasin de fruits et légumes"
-msgid "Organic"
-msgstr "Magasin bio"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr "Modifier Organique/Bio"
@@ -19129,8 +20390,8 @@ msgstr "Modifier un tailleur"
msgid "Fabric"
msgstr "Tissus"
-msgid "Edit Fabric"
-msgstr "Modifier un magasin de tissus"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Électronique"
@@ -19142,22 +20403,22 @@ msgid "Edit Computer Shop"
msgstr "Modifier un magasin d’informatique"
msgid "Electronics"
-msgstr "Électronique"
+msgstr "Électroménager"
msgid "Edit Electronics Shop"
-msgstr "Modifier un magasin d’électronique"
+msgstr "Modifier un magasin d’électroménager"
msgid "Mobile Phone"
msgstr "Téléphonie mobile"
-msgid "Edit Mobile Phone"
-msgstr "Modifier un magasin de téléphonie mobile"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Aspirateur"
-msgid "Edit Vacuum Cleaner"
-msgstr "Modifier un magasin d’aspirateurs"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hi-Fi"
@@ -19165,9 +20426,8 @@ msgstr "Hi-Fi"
msgid "Edit Hifi Shop"
msgstr "Modifier un magasin Hi-Fi"
-msgctxt "shop"
msgid "Video"
-msgstr "Vidéo-club"
+msgstr "Vidéo"
msgid "Edit Video Shop"
msgstr "Modifier un vidéo-club"
@@ -19193,6 +20453,12 @@ msgstr "Modifier un bureau de change"
msgid "Edit Automated Teller Machine"
msgstr "Modifier un distributeur automatique"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Grand magasin"
@@ -19229,11 +20495,32 @@ msgstr "Bijouterie"
msgid "Edit Jewelry"
msgstr "Modifier une bijouterie"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "bouddhiste"
+
+msgid "christian"
+msgstr "christianisme"
+
+msgid "hindu"
+msgstr "hindouisme"
+
+msgid "jewish"
+msgstr "judaïsme"
+
+msgid "muslim"
+msgstr "islam"
+
msgid "Erotic"
msgstr "Érotique"
-msgid "Edit Erotic"
-msgstr "Modifier un magasin coquin"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Fleuriste"
@@ -19262,8 +20549,8 @@ msgstr "Modifier une quincaillerie"
msgid "Paint"
msgstr "Peinture"
-msgid "Edit Paint"
-msgstr "Modifier un magasin de peinture"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Ameublement"
@@ -19274,20 +20561,20 @@ msgstr "Modifier un magasin d’ameublement"
msgid "Kitchen"
msgstr "Cuisine"
-msgid "Edit Kitchen"
-msgstr "Modifier un cuisiniste"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Rideaux"
-msgid "Edit Curtain"
-msgstr "Modifier un magasin de rideaux"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Cadres"
-msgid "Edit Frames"
-msgstr "Modifier un encadreur"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Papeterie"
@@ -19307,6 +20594,12 @@ msgstr "Librairie"
msgid "Edit Book Store"
msgstr "Modifier une librairie"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Agence de voyage"
@@ -19316,8 +20609,8 @@ msgstr "Modifier une agence de voyage"
msgid "Musical Instrument"
msgstr "Instruments de musique"
-msgid "Edit Musical Instruments"
-msgstr "Modifier un magasin d’instruments de musique"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Jouets"
@@ -19397,6 +20690,9 @@ msgstr "jouets"
msgid "vouchers"
msgstr "bons"
+msgid "Note"
+msgstr "Paiement"
+
msgid "Geography"
msgstr "Géographie"
@@ -19526,6 +20822,12 @@ msgstr "Sommet"
msgid "Edit Peak"
msgstr "Modifier un sommet"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glacier"
@@ -19565,26 +20867,35 @@ msgstr "Arbre"
msgid "Edit Tree"
msgstr "Modifier un arbre"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr "Conifère"
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Nom botanique"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Bois"
msgid "Edit Wood"
msgstr "Modifier un bois"
-msgctxt "wood"
msgid "coniferous"
msgstr "conifères"
-msgctxt "wood"
msgid "deciduous"
msgstr "feuillus"
-msgctxt "wood"
msgid "mixed"
-msgstr "mixte"
+msgstr "conifères et feuillus"
msgid "Forest"
msgstr "Forêt"
@@ -19592,15 +20903,6 @@ msgstr "Forêt"
msgid "Edit Forest Landuse"
msgstr "Modifier une forêt"
-msgid "coniferous"
-msgstr "conifères"
-
-msgid "deciduous"
-msgstr "feuillus"
-
-msgid "mixed"
-msgstr "conifères et feuillus"
-
msgid "Grassland"
msgstr ""
@@ -19608,19 +20910,19 @@ msgid "Edit Grassland"
msgstr ""
msgid "pampas"
-msgstr ""
+msgstr "pampa"
msgid "prairie"
-msgstr ""
+msgstr "prairie"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
-msgstr ""
+msgstr "Savanne"
msgid "steppe"
-msgstr ""
+msgstr "steppe"
msgid "veld"
msgstr ""
@@ -19676,6 +20978,12 @@ msgstr "Prairie"
msgid "Edit Meadow Landuse"
msgstr "Modifier une prairie"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vigne"
@@ -19730,7 +21038,7 @@ msgstr "Aire de jeux"
msgid "Edit Recreation Ground Landuse"
msgstr "Modifier une aire de jeux"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Zone résidentielle"
msgid "Edit Residential Landuse"
@@ -19742,6 +21050,9 @@ msgstr "Petit cimetière"
msgid "Edit Graveyard"
msgstr "Modifier un petit cimetière"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cimetière"
@@ -19817,6 +21128,33 @@ msgstr "Modifier une carrière"
msgid "Annotation"
msgstr "Commentaire"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Modifier une adresse"
@@ -19835,30 +21173,6 @@ msgstr "Ville"
msgid "Country code"
msgstr "Indicatif du pays"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolation d’adresse"
@@ -19877,6 +21191,18 @@ msgstr "pair"
msgid "alphabetic"
msgstr "alphabétique"
+msgid "Accuracy"
+msgstr "Précision"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Contact (schéma commun)"
@@ -20001,7 +21327,7 @@ msgid "Edit Enforcement"
msgstr "Modifier un équipement de sécurité routière"
msgid "Type of enforcement"
-msgstr "Type d''équipement"
+msgstr "Type d’’équipement"
msgid "maxheight"
msgstr "hauteur maximale"
@@ -20028,37 +21354,66 @@ msgid "Max. speed (km/h, only if enforcement=maxspeed)"
msgstr "Vitesse maximale (en km/h, seulement avec enforcement=maxspeed)"
msgid "location of enforcement device"
-msgstr "position de l’équipement"
+msgstr "position de l’équipement de contrôle"
msgid "node on way where enforcement starts"
msgstr "nœud sur la voie où le contrôle commence"
msgid "where enforcement ends"
-msgstr "où le contrôle s''arrête"
+msgstr "où le contrôle s’’arrête"
msgid "traffic light or barrier that stops you"
msgstr "Feu ou barrière vous arrêtant"
-msgid "Route (legacy)"
-msgstr "Route (obsolète)"
+msgid "General route"
+msgstr "Route générale"
+
+msgid "Edit general route"
+msgstr "Editer la route générale"
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "route"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr "ferry"
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "chemin pour piétons"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "randonnée"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr "tramway"
+msgctxt "route type"
msgid "detour"
-msgstr "déviation"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr "métropolitain"
msgid "Symbol description"
msgstr "Symbole"
@@ -20105,20 +21460,23 @@ msgstr "arrêt (sens aller uniquement)"
msgid "backward halt point"
msgstr "arrêt (sens retour uniquement)"
-msgid "Route network"
-msgstr "Réseau routier"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Modifier un réseau routier"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "membre"
-msgid "Associated street"
-msgstr "Rue associée"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Modifier une rue associée"
+msgid "house"
+msgstr "maison"
msgid "Street"
msgstr "Rue :"
@@ -20141,8 +21499,8 @@ msgstr "toute autre chose liée à la rue"
msgid "Destination sign"
msgstr "Signe de destination"
-msgid "Edit Destination sign"
-msgstr "Modifier un signe de destination"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "Destination marquée sur le signe (sans la distance)"
@@ -20154,7 +21512,7 @@ msgid "Time (hh:mm, for trekking)"
msgstr "Temps (hh:mm, pour le trekking)"
msgid "Colour of background"
-msgstr "Couleur d''arrière-plan"
+msgstr "Couleur d’’arrière-plan"
msgid "Colour of text"
msgstr "Couleur du texte"
@@ -20166,7 +21524,7 @@ msgid "last way before junction"
msgstr "dernier chemin avant la jonction"
msgid "node of the intersection"
-msgstr "nœud de l''intersection"
+msgstr "nœud de l’’intersection"
msgid "first way after junction"
msgstr "premier chemin après la jonction"
@@ -20175,13 +21533,13 @@ msgid "position of sign"
msgstr "position du signe"
msgid "Waterway"
-msgstr "Cours d''eau"
+msgstr "Cours d’’eau"
msgid "Edit Waterway"
-msgstr "Modifier un cours d''eau"
+msgstr "Modifier un cours d’’eau"
msgid "Subtype of waterway (largest one of members)"
-msgstr "Type de cours d''eau (le plus gros de ses membres)"
+msgstr "Type de cours d’’eau (le plus gros de ses membres)"
msgid "river"
msgstr "rivière"
@@ -20193,7 +21551,7 @@ msgid "canal"
msgstr "canal"
msgid "drain"
-msgstr "canal d''évacuation"
+msgstr "canal d’’évacuation"
msgid "ditch"
msgstr "fossé"
@@ -20217,13 +21575,13 @@ msgid "Reference GNBC (CA)"
msgstr "Référence GNBC (CA)"
msgid "waterways (no riverbank)"
-msgstr "cours d''eau (sans les berges)"
+msgstr "cours d’’eau (sans les berges)"
msgid "branch waterways (no riverbank)"
msgstr "branches (sans les berges)"
msgid "spring of waterway"
-msgstr "source du cours d''eau"
+msgstr "source du cours d’’eau"
msgid "Length (meters)"
msgstr "Longueur (mètres)"
@@ -20237,18 +21595,27 @@ msgstr "chemins passant sous le pont"
msgid "way forming the outline footprint"
msgstr "chemin formant le contour de l’empreinte au sol"
-msgid "nodes forming the outline"
-msgstr "nœuds formant le contour"
+msgid "edge ways parallel to ''across''"
+msgstr ""
msgid "ways passing through the tunnel"
msgstr "chemins passant à travers le tunnel"
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "pont"
msgid "deprecated"
msgstr "déprécié"
+msgid "bicycle"
+msgstr "vélos"
+
+msgid "foot"
+msgstr "chemin pour piétons"
+
msgid "horse"
msgstr "chemin pour cavaliers"
@@ -20258,8 +21625,11 @@ msgstr "barrière"
msgid "motorroad"
msgstr "route à accès réglementé"
-msgid "highway_track"
-msgstr "piste"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "aire de repos"
@@ -20267,11 +21637,11 @@ msgstr "aire de repos"
msgid "ford"
msgstr "gué"
-msgid "highway_platform"
-msgstr "plate-forme d’attente"
+msgid "highway.platform"
+msgstr ""
-msgid "emergency_access_point"
-msgstr "point d’accès d’urgence"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "lit d’un fleuve, d’une rivière"
@@ -20288,6 +21658,9 @@ msgstr "rapides"
msgid "railwaypoint"
msgstr "gare/arrêt ferroviaire"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "dépôt de locomotives"
@@ -20303,29 +21676,29 @@ msgstr "ligne ferroviaire touristique"
msgid "aeroway"
msgstr "aéroport"
-msgid "aeroway_dark"
-msgstr "héliport"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "aire de stationnement pour avions"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "piste de ski facile"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "piste de ski moyenne"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "piste de ski difficile"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "piste de ski très difficile"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "piste de ski hors piste"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "piste de ski très facile"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "alimentation électrique"
@@ -20345,20 +21718,20 @@ msgstr "port"
msgid "amenity"
msgstr "équipement"
-msgid "amenity_traffic"
-msgstr "équipement de circulation"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "balise lumineuse"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "point d’eau"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "santé"
-msgid "shop"
-msgstr "magasin"
+msgid "office"
+msgstr "bureaux"
msgid "hotel"
msgstr "hôtel"
@@ -20423,9 +21796,6 @@ msgstr "lande"
msgid "woodarea"
msgstr "zone forestière"
-msgid "mud"
-msgstr "terrain boueux"
-
msgid "beach"
msgstr "plage"
@@ -20435,11 +21805,14 @@ msgstr "itinéraire"
msgid "boundary"
msgstr "frontière"
+msgid "sport"
+msgstr "Sport"
+
msgid "place"
msgstr "lieu"
-msgid "tiger_data"
-msgstr "données TIGER"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "adresse"
@@ -20453,9 +21826,6 @@ msgstr "Village/Ville"
msgid "One Way"
msgstr "Sens unique"
-msgid "Church"
-msgstr "Église"
-
msgid "Fuel Station"
msgstr "Station essence"
@@ -20483,6 +21853,9 @@ msgstr "attribut de pont sur un noeud"
msgid "wrong highway tag on a node"
msgstr "mauvais attribut de route sur un noeud"
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr "Route mineure non nommée"
@@ -20528,11 +21901,41 @@ msgstr "Combinaison de tag incompatible (highway et waterway)"
msgid "unusual tag combination (highway & natural)"
msgstr "Combinaison de tag incompatible (highway et natural)"
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
+msgstr "Eau naturelle utilisée pour une piscine"
+
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
msgstr ""
-msgid "incline without highway"
-msgstr "inclinaison sans route"
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
+msgstr "Tag inclide sans highway ou railway"
msgid "junction without highway"
msgstr "jonction sans route"
@@ -20543,11 +21946,11 @@ msgstr "voies sans route"
msgid "lcn without highway"
msgstr "lcn sans route"
-msgid "lit without highway"
-msgstr "éclairage sans route"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr ""
msgid "living_street without highway"
-msgstr ""
+msgstr "living_street sans le tag highway"
msgid "maintenance without highway"
msgstr ""
@@ -20561,8 +21964,8 @@ msgstr "autoroute sans route"
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
-msgstr "sens unique sans route"
+msgid "oneway without highway or railway"
+msgstr "Sens unique sans highway ou aerialway"
msgid "sac_scale without highway"
msgstr "sac_scale sans route"
@@ -20586,7 +21989,7 @@ msgid "toll without highway"
msgstr "Tag toll (voie payante) sans tag highway (voie de circulation)"
msgid "tracktype without highway"
-msgstr ""
+msgstr "tag tracktype utilisé sans tag highway"
msgid "trail_visibility without highway"
msgstr ""
@@ -20607,16 +22010,16 @@ msgid "eddy_current_brake without railway"
msgstr ""
msgid "electrified without railway"
-msgstr ""
+msgstr "electrified sans railway"
msgid "etcs without railway"
msgstr ""
msgid "gauge without railway"
-msgstr ""
+msgstr "tag gauge utilisé sans tag railway"
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "grade_of_track sans railway"
msgid "kursbuchstrecke without railway"
msgstr ""
@@ -20637,7 +22040,7 @@ msgid "radio without railway"
msgstr ""
msgid "structure_gauge without railway"
-msgstr ""
+msgstr "Ecartement de voie sans voie ferrée"
msgid "tilting_technologie without railway"
msgstr ""
@@ -20658,13 +22061,13 @@ msgid "workrules without railway"
msgstr ""
msgid "stream without waterway"
-msgstr ""
+msgstr "stream sans waterway"
msgid "intermittent without waterway"
msgstr ""
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "boat sans waterway / natural=water"
msgid "length_unit without waterway"
msgstr ""
@@ -20673,24 +22076,135 @@ msgid "llid without waterway"
msgstr ""
msgid "canal without waterway"
-msgstr ""
+msgstr "canal sans waterway"
msgid "have_riverbank without waterway"
+msgstr "Berge( riverbank) sans cours d'eau"
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "border_type without boundary"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -20709,83 +22223,116 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
-msgstr "préfixe de language inconnu dans cet attribut wikipédia"
+msgid "unknown language prefix in wikipedia tag"
+msgstr "prefixe de langue absent sur le tag Wikipedia"
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr "Le niveau doit être compris entre -5 et 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr "Format incorrect de la vitesse maximum"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr "la tension doit être en Volts sans unité/delimiter/ espace"
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "Mauvaise valeur d'inclinaison, doit être en %/degré ou up/down"
+
+msgid "Landsat"
+msgstr "Imagerie Landsat"
+
msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgstr "Vue satellite de Yahoo"
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr "Vue satellite de Bing"
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
msgid "MapBox Satellite"
-msgstr "Satellite MapBox"
+msgstr "Vue satellite de MapBox"
msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open Aerial"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik noir & blanc)"
+msgstr ""
+
+msgid "skobbler"
+msgstr ""
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler heatmap"
+msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
-msgstr "OSM MapQuest"
+msgstr ""
msgid "Public Transport (ÖPNV)"
-msgstr "Transport en commun"
+msgstr ""
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (style allemand)"
-
-msgid "Streets NRW Geofabrik.de"
-msgstr "Geofabrik.de - Rhénanie-du-Nord-Westphalie (Allemagne)"
-
-msgid "Hike & Bike"
-msgstr "Autostop et vélo"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (sorabe)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (allemand)"
-
-msgid "OpenPT Map (overlay)"
msgstr ""
-msgid "Bavaria (2 m)"
-msgstr "Bavière (2 m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hamburg (40 cm)"
-msgstr "Hambourg (40 cm)"
+msgid "osmfr"
+msgstr ""
-msgid "Hamburg (DK5)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
msgid "Geoimage.at MaxRes"
-msgstr "Geoimage.at MaxRes"
+msgstr ""
+
+msgid "basemap.at"
+msgstr ""
msgid "Graz: Basiskarte (base map)"
msgstr ""
msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris : DGM (modèle de terrain)"
+msgstr ""
msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris : DOM (modèle de surface)"
+msgstr ""
msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
@@ -20796,125 +22343,186 @@ msgstr ""
msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Stadtplan Zürich"
-msgstr "Plan de la ville de Zürich"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Canton de Génève 5cm (SITG 2011)"
+msgid "Canvec"
+msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Canton du Jura 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Canton de Fribourg 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr ""
-msgid "Geobase Hydrography"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Geobase Roads"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Canvec"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "MSR Maps Topo"
-msgstr "Microsoft Research - Cartes topographiques (États-Unis)"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr ""
-msgid "MSR Maps Urban"
-msgstr "Microsoft Research - orthocartographie urbaine (États-Unis)"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "?ÚZK - KM (République tchèque)"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "ÚHÚL - Orthophoto (République tchèque)"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "Ordnance Survey - 7th series (Royaume-Uni)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr ""
-msgid "OS New Popular Edition historic"
-msgstr "OS Nouvelle édition populaire (historique)"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr ""
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "Surrey Air Survey"
-msgstr "Surrey - Air Survey (Royaume-Uni)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr ""
+
+msgid "Tours - Orthophotos 2008"
+msgstr ""
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr ""
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ireland Bartholomew Quarter-Inch 1940"
+msgstr ""
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Ireland EEA GMES Urban Atlas"
+msgstr ""
msgid "Ireland EEA CORINE 2006"
-msgstr "Ireland EEA CORINE 2006"
+msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italie"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicile - Italie"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN (2006) - Italie"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio+Umbria"
+msgstr ""
msgid "USSR - Latvia"
msgstr ""
@@ -20925,149 +22533,212 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr ""
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
+msgstr ""
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
msgid "Catastro Spain"
-msgstr "Cadastre (Espagne)"
+msgstr ""
msgid "PNOA Spain"
-msgstr "IDEE - Espagne"
+msgstr ""
msgid "SIGPAC Spain"
-msgstr "SIGPAC (Espagne)"
+msgstr ""
msgid "GRAFCAN - Canary Islands"
-msgstr "GRAFCAN - Îles Canaries"
+msgstr ""
msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castille et León"
+msgstr ""
msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Îles Baléares"
-
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Maa-amet Base Map - Estonie"
+msgstr ""
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Maa-amet Ortho - Estonie"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
-msgid "Estonia Multi (Maaamet)"
-msgstr "Maa-amet Multi - Estonie"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "Fugro (Denmark)"
-msgstr "Fugro Aerial Mapping - Danemark"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
-msgid "Stevns (Denmark)"
-msgstr "Stevns - Danemark"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danemark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipines haute résolution)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS - Russie"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT - Russie"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodge, Laos, Thaïlande, Vietnam bilingue"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk - Voitures (Slovaquie)"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk - Autostop (Slovaquie)"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk - Cyclo (Slovaquie)"
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk - Ski (Slovaquie)"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "KaPor - Carte cadastrale 2010-04 (Slovaquie)"
+msgid "MSR Maps Topo"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "KaPor - Carte cadastrale 2011-05 (Slovaquie)"
+msgid "MSR Maps Urban"
+msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "EEA - Atlas urbain GMES (Slovaquie)"
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
-msgid "Slovakia EEA CORINE 2006"
-msgstr "EEA - CORINE 2006 (Slovaquie)"
+msgid "USGS Large Scale Imagery"
+msgstr ""
-msgid "Slovakia Historic Maps"
-msgstr "Cartes historiques (Slovaquie)"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
msgid "OSM - Tiger Edited Map"
msgstr ""
+msgid "MassGIS L3 Parcels"
+msgstr ""
+
+msgid "NC 2010 Orthoimagery"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
+
msgid "OS 1:25k historic (OSM)"
msgstr ""
msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "2u"
-msgstr "2u"
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
+msgstr ""
+
+msgid "Export"
+msgstr "Exporter"
+
+msgid "Port:"
+msgstr "Port :"
+
+msgid "refresh the port list"
+msgstr "Rafraichir la liste des ports"
+
+msgid "Configure"
+msgstr "Configurer"
+
+msgid "Connection Error."
+msgstr "Erreur de connexion"
+
+msgid "configure the connected DG100"
+msgstr "configurer le DG100 connecté"
+
+msgid "delete data after import"
+msgstr "supprimer les données après l’importation"
msgid "Columbus V-900 CSV Files"
msgstr "Fichiers CSV de Columbus V-900"
@@ -21178,7 +22849,7 @@ msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
"available."
msgstr ""
-"Une erreur s''est produite pendant la lecture du fichier GPX {0}. Seule une "
+"Une erreur s’’est produite pendant la lecture du fichier GPX {0}. Seule une "
"partie du fichier sera disponible."
msgid "Invalid URL {0}"
@@ -21286,6 +22957,18 @@ msgstr "Afficher le profil d’élévation"
msgid "Elevation Profile"
msgstr "Profil d’élévation"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr "Afficher la fenêtre du profil d’élévation."
@@ -21307,14 +22990,8 @@ msgstr "Gain"
msgid "Time"
msgstr "Heure"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "Automatique"
-
-msgid "Fixed value"
-msgstr "Valeur fixe"
+msgid "Tracks"
+msgstr "Traces"
msgid "Elevation profile for track ''{0}''."
msgstr "Profil d''élévation pour la trace ''{0}''."
@@ -21592,16 +23269,22 @@ msgstr "Sélectionner les adresses incomplètes"
msgid "Selects all addresses with incomplete data."
msgstr "Sélectionner toutes les adresses incomplètes"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Mise à jour des propriétés de {0} objet"
msgstr[1] "Mise à jour des propriétés de {0} objets"
msgid "Default image projection"
-msgstr "Projection par défaut de l''image"
+msgstr "Projection par défaut de l’’image"
msgid "JOSM''s current projection"
msgstr "Projection actuelle de JOSM"
@@ -21620,6 +23303,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Propriétés du calque"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "Importer une image"
@@ -21657,7 +23343,7 @@ msgid "edit new tag"
msgstr "Créer un nouvel attribut"
msgid "Display clock in 12h mode."
-msgstr "Afficher l''horloge au format 12h."
+msgstr "Afficher l’’horloge au format 12h."
msgid "Choose key"
msgstr "Choisir la clé"
@@ -21681,13 +23367,13 @@ msgid "open end"
msgstr "fin ouverte"
msgid "Import Osm Inspector Bugs..."
-msgstr ""
+msgstr "Import des signalements d’erreur d’OSM Inspector"
msgid "OsmInspector"
-msgstr ""
+msgstr "OSM Inspector"
msgid "Open OsmInspector"
-msgstr ""
+msgstr "Ouvrir OSM Inspector"
msgid "OsmBugInfo"
msgstr ""
@@ -21698,9 +23384,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr "Fonctions pratiques d’interpolation d’adresse"
@@ -21785,8 +23483,8 @@ msgstr "Numéros impairs attendus pour les adresses"
msgid "Expected even numbers for addresses"
msgstr "Numéro pairs attendus pour les adresses"
-msgid "Expected valid number for address increment"
-msgstr "Numéro valide attendu pour l’incrémentation d’adresse"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "Le code du pays doit contenir 2 lettres."
@@ -21978,7 +23676,7 @@ msgstr ""
"greffon <span style=\"font-size: xx-large;\">AlignWay<span style=\"color: "
"rgb(204, 85, 0);\">S</span><br>\n"
"</span><span style=\"font-size: medium;\"><br>\n"
-"...qui devrait d''ailleurs s’appeler <br>\n"
+"...qui devrait d’’ailleurs s’appeler <br>\n"
"greffon <span style=\"font-size: large;\">AlignWayS(egments)</span>..."
msgid ""
@@ -22162,15 +23860,6 @@ msgstr "Numéro de la maison :"
msgid "Street Name:"
msgstr "Nom de la rue :"
-msgid "Increment"
-msgstr "Incrémentation"
-
-msgid "Decrement"
-msgstr "Décrementation"
-
-msgid "Numbers:"
-msgstr "Numéros :"
-
msgid "Big buildings mode"
msgstr "Mode Grand bâtiments"
@@ -22359,6 +24048,9 @@ msgstr "Ne pas recadrer pendant le géoréférencement"
msgid "Use \"Tableau d''assemblage\""
msgstr "Utiliser le tableau d’assemblage"
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "Sélectionner le premier calque WMS dans la liste"
@@ -22379,12 +24071,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "Élevée"
-
-msgid "medium"
-msgstr "Moyenne"
-
msgid "symbol"
msgstr "symbole"
@@ -22536,6 +24222,9 @@ msgstr ""
"Ajouter les tableaux d’assemblages dans la liste des calques cadastraux à "
"télécharger."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr "Chevauchements :"
@@ -22557,6 +24246,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Utiliser l’attribut \"add:street\" sur les nœuds."
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Voulez-vous ajouter une source aux objets ?"
@@ -22646,54 +24338,6 @@ msgstr ""
"Cette image contient des données géographiques.\n"
"Voulez-vous les utiliser ?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Cliquez sur le premier coin pour le recadrage.\n"
-"(deux points sont nécessaires)"
-
-msgid "Image cropping"
-msgstr "Recadrage de l’image"
-
-msgid "Click second corner for image cropping"
-msgstr "Cliquez sur le second coin pour le recadrage."
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Cliquer sur la première croix Lambert pour géoréférencer.\n"
-"(deux points sont nécessaires)"
-
-msgid "Image georeferencing"
-msgstr "Géoréférencement de l’image"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Cliquer sur la seconde croix Lambert pour géoréférencer."
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Voulez-vous annuler\n"
-"ou réessayer "
-
-msgid "Enter cadastre east,north position"
-msgstr "Entrer la position Est et Nord du cadastre."
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Attention : vérifiez le Nord avec la flèche !)"
-
-msgid "East"
-msgstr "Est :"
-
-msgid "I use the mouse"
-msgstr "Utiliser la souris"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Indiquer les {0} coordonnées Lambert"
-
msgid "Load layer from cache"
msgstr "Charger le calque depuis le cache"
@@ -22750,6 +24394,12 @@ msgid "Add new layer"
msgstr "Ajouter un nouveau calque"
msgid "Open Cadastre Preferences"
+msgstr "Préfèrences pour l'utilisation du cadastre"
+
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
msgstr ""
msgid "Reset cookie"
@@ -22758,14 +24408,72 @@ msgstr "Réinitialiser le cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Obtenir un nouveau cookie (session expirée)"
-msgid "Save image as PNG"
-msgstr "Enregistrer l’image au format PNG"
+msgid "Save image as..."
+msgstr "Sauvegarder l'image sous..."
msgid "PNG files (*.png)"
msgstr "Fichiers PNG (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Exporter au format PNG (images matricielles seulement)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr "Export de l'image (seulement imagerie raster)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Cliquez sur le premier coin pour le recadrage.\n"
+"(deux points sont nécessaires)"
+
+msgid "Image cropping"
+msgstr "Recadrage de l’image"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Cliquer sur la première croix Lambert pour géoréférencer.\n"
+"(deux points sont nécessaires)"
+
+msgid "Image georeferencing"
+msgstr "Géoréférencement de l’image"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Voulez-vous annuler\n"
+"ou réessayer "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Oups..., échec de capture de toutes les coordonnées\n"
+"Merci de réessayer"
+
+msgid "Enter cadastre east,north position"
+msgstr "Entrer la position Est et Nord du cadastre."
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Attention : vérifiez le Nord avec la flèche !)"
+
+msgid "East"
+msgstr "Est :"
+
+msgid "I use the mouse"
+msgstr "Utiliser la souris"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Indiquer les {0} coordonnées Lambert"
+
+msgid "Click second corner for image cropping"
+msgstr "Cliquez sur le second coin pour le recadrage."
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Cliquer sur la seconde croix Lambert pour géoréférencer."
msgid "Adjust WMS"
msgstr "Ajuster WMS"
@@ -22794,8 +24502,11 @@ msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)"
msgid "Is not vectorized."
msgstr "N’est pas vectorisée."
-msgid "Raster size: {0}"
-msgstr "Taille de l’image matricielle : {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "La commune est vectorisée."
@@ -22849,7 +24560,7 @@ msgstr "Supprimer le jeu sélectionné de la liste"
msgid "Color Schemes"
msgstr "Jeux de couleurs"
-msgid "Adress"
+msgid "Address"
msgstr "Adresse"
msgid "Split area"
@@ -22896,6 +24607,9 @@ msgstr "Télécharger le long"
msgid "Please select 1 or more ways to download along"
msgstr "Sélectionnez un ou plusieurs chemins à télécharger le long"
+msgid "Download from OSM along selected ways"
+msgstr "Téléchargement depuis OSM le long du/des chemin(s) selectionné(s)"
+
msgid "{0} intermediate nodes to download."
msgstr "{0} nœuds intermédiaires à télécharger."
@@ -22960,7 +24674,7 @@ msgid "External tools"
msgstr "Outils externes"
msgid "Delete tool \"{0}\"?"
-msgstr "Supprimer l’outil ''{0}'' ?"
+msgstr "Supprimer l’outil ’’{0}’’ ?"
msgid "Are you sure?"
msgstr "Êtes-vous sûr(e) ?"
@@ -22971,6 +24685,71 @@ msgstr "Nouvel outil…"
msgid "Install"
msgstr "Installer"
+msgid "Public"
+msgstr "Publique"
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Ouverture du contrôle GeoChat"
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr "Connexion"
+
+msgid "Enable autologin"
+msgstr "Activer la connexion automatique"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} utilisateur"
+msgstr[1] "{0} utilisateurs"
+
+msgid "not logged in"
+msgstr "non connecté"
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr "Des utilisateurs contribuent à proximté"
+
+msgid "Private chat"
+msgstr "Chat privé"
+
+msgid "Close tab"
+msgstr "Fermer l'onglet"
+
+msgid "Logout"
+msgstr "Déconnexion"
+
+msgid "Clear log"
+msgstr "Effacer le journal"
+
+msgid "Show users on map"
+msgstr "Afficher les utilisateurs sur la carte"
+
msgid "Position only"
msgstr "Seulement la position"
@@ -23012,27 +24791,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Le format de données est inconnu"
-msgid "Port:"
-msgstr "Port :"
-
-msgid "refresh the port list"
-msgstr "Rafraichir la liste des ports"
-
-msgid "Configure"
-msgstr "Configurer"
-
msgid "Configure Device"
msgstr "Configurer le périphérique"
-msgid "Connection Error."
-msgstr "Erreur de connexion"
-
-msgid "configure the connected DG100"
-msgstr "configurer le DG100 connecté"
-
-msgid "delete data after import"
-msgstr "supprimer les données après l’importation"
-
msgid "Importing data from device."
msgstr "Importation des données depuis le périphérique"
@@ -23154,7 +24915,7 @@ msgid "Unknown tag for condition: {0}"
msgstr "Balise inconnue pour la condition : {0}"
msgid "Element must not have childs: {0}"
-msgstr "L''élement ne doit pas avoir d''enfants : {0}"
+msgstr "L’’élement ne doit pas avoir d’’enfants : {0}"
msgid "Condition is already finished at </{0}>"
msgstr "La condition est déjà terminée à </{0}>"
@@ -23172,7 +24933,7 @@ msgid "Wrong closing tag {0} (</{1}> expected)"
msgstr "Mauvaise balise de fermeture {0} (</{1}> attendue)"
msgid "Condition {0} not yet finished"
-msgstr "La condition {0} n''est pas encore terminée"
+msgstr "La condition {0} n’’est pas encore terminée"
msgid "Group not yet evaluated"
msgstr "Groupe non encore évalué"
@@ -23204,7 +24965,7 @@ msgid ""
"Problem when accessing a file:\n"
"{0}"
msgstr ""
-"Problème lors de l''accès au fichier :\n"
+"Problème lors de l’’accès au fichier :\n"
"{0}"
msgid "File not found:\n"
@@ -23241,7 +25002,7 @@ msgid "Bookmark name must not contain ''{0}''!"
msgstr "Le nom du favori ne doit pas contenir ''{0}'' !"
msgid "Access class"
-msgstr "Classe d''accès"
+msgstr "Classe d’’accès"
msgid "Access class must not contain ''{0}''!"
msgstr "La classe d''accès ne doit pas contenir ''{0}'' !"
@@ -23287,7 +25048,7 @@ msgid "Change bookmark"
msgstr "Modifier un signet"
msgid "Edit access parameters"
-msgstr "Éditer les paramètres d''accès"
+msgstr "Éditer les paramètres d’’accès"
msgid "Graph View Dialog"
msgstr "Dialogue VueGraphe"
@@ -23328,10 +25089,10 @@ msgid "Ruleset"
msgstr "Ensemble de règles"
msgid "Use built-in rulesets"
-msgstr "Utiliser l''ensemble de règles prédéfini"
+msgstr "Utiliser l’’ensemble de règles prédéfini"
msgid "External ruleset directory:"
-msgstr "Dossier de l''ensemble de règles externe :"
+msgstr "Dossier de l’’ensemble de règles externe :"
msgid "Select directory"
msgstr "Sélection du dossier"
@@ -23370,7 +25131,7 @@ msgid "Really delete \"{0}\"?"
msgstr "Souhaitez-vous vraiment supprimer \"{0}\" ?"
msgid "Bookmark deletion"
-msgstr "Suppression d''un favori"
+msgstr "Suppression d’’un favori"
msgid ""
"Really restore default bookmarks?\n"
@@ -23447,20 +25208,23 @@ msgstr ""
"'','', ''{'', ''}'', ''='', ''|''"
msgid "Imagery XML Files"
-msgstr "Fichiers d''imagerie XML"
+msgstr "Fichiers d’’imagerie XML"
msgid "Save Imagery XML file"
-msgstr "Enregistrer un fichier d''imagerie XML"
+msgstr "Enregistrer un fichier d’’imagerie XML"
msgid "XML Imagery Bounds"
-msgstr "Limites XML de la source d''imagerie"
+msgstr "Limites XML de la source d’’imagerie"
msgid "Generate Imagery XML bounds for the selection"
-msgstr "Générer les limites XML de la source d''imagerie pour la sélection"
+msgstr "Générer les limites XML de la source d’’imagerie pour la sélection"
msgid "edit bounds for selected defaults"
msgstr "modifier les limites pour les valeurs par défaut sélectionnées"
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23471,10 +25235,10 @@ msgstr ""
"Souhaitez-vous continuer sans valider le fichier ?"
msgid "Open Imagery XML file"
-msgstr "Ouvrir un fichier d''imagerie XML"
+msgstr "Ouvrir un fichier d’’imagerie XML"
msgid "Calibration Layer"
-msgstr ""
+msgstr "Calque de calibration"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
msgstr ""
@@ -23483,46 +25247,52 @@ msgid "A calibration geometry of {0} nodes by {1}"
msgstr ""
msgid "Change Color"
-msgstr ""
+msgstr "Modifier la couleur"
msgid "Deprecate Offset"
-msgstr ""
+msgstr "Déprecier l'ajustement"
msgid "Are you sure this imagery offset is wrong?"
-msgstr ""
+msgstr "Êtes-vous sûr que l'ajustement de l'imagerie est mauvaise ?"
msgid "Are you sure this calibration geometry is aligned badly?"
msgstr ""
msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgstr "Attention ! La dépréciation est irrevocable"
msgid "To store imagery offsets you must be a registered OSM user."
-msgstr ""
+msgstr "La sauvegarde d'ajustement d'imagerie necessite un compte OSM"
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
msgstr ""
+"Merci d'indiquer la raison pour laquelle vous dépréciez l'ajustement "
+"d'imagerie"
msgid ""
"Please enter the reason why you mark this calibration geometry as deprecated"
msgstr ""
+"Merci d'indiquer la raison pour laquelle vous déprécier la calibration de "
+"l'imagerie"
msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgstr "Notifier le serveur de la dépréciation..."
msgid "Get Imagery Offset..."
-msgstr ""
+msgstr "Obtenir un ajustement d'imagerie"
msgid "Download offsets for current imagery from a server"
-msgstr ""
+msgstr "Téléchargement du serveur pour l'ajustement d'imagerie courante"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"Pas de données pour cette zone. Merci d'ajuster l'imagerie de ce calque et "
+"le sauvegarder sur le serveur"
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Chargement de l'ajustement d'imagerie en cours..."
msgid "Error processing XML response: {0}"
msgstr ""
@@ -23531,13 +25301,13 @@ msgid "Offset"
msgstr ""
msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Base de données des ajustement de décalage d'imagerie"
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
@@ -23546,10 +25316,10 @@ msgid "km"
msgstr "km"
msgid "Calibration geometries"
-msgstr ""
+msgstr "Calibration des géometries"
msgid "Deprecated offsets"
-msgstr ""
+msgstr "Déprécier un ajustement"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
@@ -23569,13 +25339,13 @@ msgid "Created by {0} on {1}"
msgstr ""
msgid "Offset Information"
-msgstr ""
+msgstr "Information d'ajustement"
msgid "Report this offset"
msgstr ""
msgid "You are to notify moderators of this offset. Why?"
-msgstr ""
+msgstr "Vous avez signalé cet ajustement à la modération pour quel raison :"
msgid "Reporting the offset..."
msgstr ""
@@ -23596,19 +25366,19 @@ msgid "Determined {0} away"
msgstr ""
msgid "Reason"
-msgstr ""
+msgstr "Motif"
msgid "This entry has been reported."
msgstr ""
msgid "Server has rejected the request"
-msgstr ""
+msgstr "Le serveur a rejeté la requête"
msgid "Unable to connect to the server"
-msgstr ""
+msgstr "Impossible de se connecter au serveur"
msgid "Store Imagery Offset..."
-msgstr ""
+msgstr "Stockage de l'ajustement en cours ..."
msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
@@ -23652,22 +25422,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Ajuster l’imagerie"
+msgstr "Ajustement de l'imagerie"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajuster le décalage d’imagerie"
+msgstr "Ajuster la position du calque d'imagerie selectionné"
msgid "Please select the imagery layer to adjust."
-msgstr "Sélectionnez le calque d’imagerie à ajuster."
+msgstr "Merci de selectionné le calque d'imagerie à ajuster"
msgid "Start adjusting"
-msgstr "Commencer à ajuster"
+msgstr "Début de l'ajustemeent"
msgid "There are currently no imagery layer to adjust."
-msgstr "Il n’y a aucun calque d’imagerie à ajuster."
+msgstr ""
msgid "No layers to adjust"
-msgstr "Pas de calque à ajuster."
+msgstr "Pas de calque à ajuster"
msgid "Normal"
msgstr "Normal"
@@ -23711,12 +25481,6 @@ msgstr "Images importées"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Fichiers image (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Ouvrir les images avec ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Charger l’ensemble des images sur un nouveau calque."
-
msgid "Import vector graphics"
msgstr "Importer des images vectorielles"
@@ -23726,17 +25490,14 @@ msgstr "Échelle :"
msgid "unit(s) = "
msgstr "unité(s) = "
-msgid "Import..."
+msgid "Importing..."
msgstr "Importation…"
-msgid "Import vector graphics."
-msgstr "Importer des dessins vectoriels."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Dessin SVG (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
-msgid "Importing..."
-msgstr "Importation…"
+msgid "Please open or create data layer before importing"
+msgstr ""
msgid "InfoMode"
msgstr "ModeInfo"
@@ -24124,17 +25885,14 @@ msgstr "Centrage automatique"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrer continuellement le calque LiveGPS sur la position actuelle."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Ouvrir MapDust"
msgid "MapDust bug reports"
-msgstr ""
+msgstr "Signalement d’erreurs MapDust"
msgid "Activates the MapDust bug reporter plugin"
-msgstr ""
+msgstr "Activation du greffon Rapport d’erreur MapDust"
msgid "Missing input data"
msgstr "Données manquantes"
@@ -24181,9 +25939,35 @@ msgstr "Fusionner la superposition de chemins"
msgid "Merge Overlap (combine)"
msgstr "Fusionner la superposition (combiner)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>L’appartenance à une relation fondée sur un rôle a été copiée vers "
+"tous les nouveaux chemins.<br>Vous devriez vérifier et corriger si "
+"nécessaire.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>L’appartenance à une relation a été copiée vers tous les nouveaux "
+"chemins.<br>Vous devriez vérifier et corriger si nécessaire.</html>"
+
msgid "Split way"
msgstr "Diviser le chemin"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Entrer un nom d’attribut, par exemple "
+"<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"Entrer une valeur d’attribut, par exemple <strong><tt>vérifier les "
+"membres</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan Left"
@@ -24229,8 +26013,18 @@ msgstr ""
msgid "XAPI query: "
msgstr "Requête XAPI : "
+msgid "Download from Overpass API ..."
+msgstr "Téléchargement depuis Overpass API ..."
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+"Téléchargement des données cartographique depuis un serveur Overpass API ."
+
+msgid "Overpass query: "
+msgstr "Requête Overpass : "
+
msgid "Select OSM mirror URL"
-msgstr "Sélectionner l''URL du miroir OSM"
+msgstr "Sélectionner l’’URL du miroir OSM"
msgid "Select OSM mirror URL to download from."
msgstr ""
@@ -24241,16 +26035,6 @@ msgstr "URL de base"
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Convertir en multipolygone"
-
-msgid "Convert to multipolygon."
-msgstr "Convertir en multipolygone."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-"Un des chemins sélectionnés fait déjà partie d''un autre multipolygone."
-
msgid "About Plugin"
msgstr "À propos du greffon"
@@ -24258,14 +26042,14 @@ msgid "Native password manager plugin"
msgstr "Greffon de gestionnaire natif de mots de passe"
msgid "No native password manager could be found!"
-msgstr "Aucun gestionnaire natif de mots de passe n''a été trouvé !"
+msgstr "Aucun gestionnaire natif de mots de passe n’’a été trouvé !"
msgid ""
"Depending on your Operating System / Distribution, you may have to create a "
"default keyring / wallet first."
msgstr ""
-"Suivant votre système d''exploitation/distribution, vous pouvez avoir à "
-"créée d''abord un trousseau de clés / portefeuille."
+"Suivant votre système d’’exploitation/distribution, vous pouvez avoir à "
+"créée d’’abord un trousseau de clés / portefeuille."
msgid "No thanks, use JOSM''s plain text preferences storage"
msgstr "Non merci, utiliser le système d''enregistrement en clair de JOSM"
@@ -24298,7 +26082,7 @@ msgid "Confirm the setup and close this dialog"
msgstr "Confirme les réglages et ferme ce dialogue"
msgid "JOSM/OSM API/Username"
-msgstr "JOSM/API OSM/Nom d''utilisateur"
+msgstr "JOSM/API OSM/Nom d’’utilisateur"
msgid "JOSM/OSM API/Password"
msgstr "JOSM/API OSM/Mot de passe"
@@ -24310,7 +26094,7 @@ msgid "{0}/Password"
msgstr "{0} / Mot de passe"
msgid "JOSM/Proxy/Username"
-msgstr "JOSM/Proxy/Nom d''utilisateur"
+msgstr "JOSM/Proxy/Nom d’’utilisateur"
msgid "JOSM/Proxy/Password"
msgstr "JOSM/Proxy/Mot de passe"
@@ -24325,7 +26109,7 @@ msgid "Native Password Manager Plugin"
msgstr "Greffon de gestionnaire natif de mot de passe"
msgid "The username and password is protected by {0}."
-msgstr "Le nom d''utilisateur et le mot de passe sont protégés par {0}."
+msgstr "Le nom d’’utilisateur et le mot de passe sont protégés par {0}."
msgid "username"
msgstr "nom d’utilisateur"
@@ -24353,7 +26137,7 @@ msgstr ""
"dans votre fichier de préférences. ({0})"
msgid "Save user and password ({0})"
-msgstr "Enregistrer le nom d''utilisateur et le mot de passe ({0})"
+msgstr "Enregistrer le nom d’’utilisateur et le mot de passe ({0})"
msgid "Plain text, JOSM default"
msgstr "En clair, mode par défaut de JOSM"
@@ -24362,7 +26146,7 @@ msgid "Use {0}"
msgstr "Utiliser {0}"
msgid "Encrypt data with Windows logon credentials"
-msgstr "Crypter les données avec les informations d''identification Windows"
+msgstr "Crypter les données avec les informations d’’identification Windows"
msgid "The native password manager plugin detected {0} on your system."
msgstr ""
@@ -24395,9 +26179,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr "Open Data"
-
msgid "CSV files"
msgstr "Fichiers CSV"
@@ -24422,12 +26203,21 @@ msgstr "Fichiers GML"
msgid "Zip Files"
msgstr "Fichiers Zip"
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr "Fichiers OpenData XML"
+msgid "Download open data"
+msgstr "Téléchargement de données ouvertes"
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr "Contrat de licence"
@@ -24459,14 +26249,16 @@ msgid ""
"The following module has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} modules have been downloaded <strong>successfully</strong>:"
-msgstr[0] ""
+msgstr[0] "Le module suivant a été téléchargé <strong>avec succès</strong> :"
msgstr[1] ""
+"Les {0} modules suivants ont été téléchargés <strong>avec succès</strong> :"
msgid "Downloading the following module has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} modules has <strong>failed</strong>:"
-msgstr[0] ""
+msgstr[0] "Le téléchargement du module suivant a <strong>échoué</strong> :"
msgstr[1] ""
+"Le téléchargement des {0} modules suivants a <strong>échoué</strong> :"
msgid "Modules"
msgstr "Modules"
@@ -24487,7 +26279,7 @@ msgid "Update the selected modules"
msgstr "Mise à jour des modules sélectionnés"
msgid "Please restart JOSM to activate the downloaded modules."
-msgstr "Merci de redémarrer JOSM pour activer lesm odules téléchargés"
+msgstr "Merci de redémarrer JOSM pour activer les modules téléchargés"
msgid ""
"All installed modules are up to date. JOSM does not have to download newer "
@@ -24521,7 +26313,7 @@ msgid "Perform diff between current data set and existing OSM data."
msgstr ""
msgid "Open tools menu for this data."
-msgstr ""
+msgstr "Ouvrir le menu de gestion de ces données"
msgid "Open the OpenData window."
msgstr ""
@@ -24530,7 +26322,7 @@ msgid "Raw data"
msgstr "Données brutes"
msgid "OpenData Preferences"
-msgstr ""
+msgstr "OpenData réglage"
msgid ""
"A special handler for various Open Data portals<br/><br/>Please read the "
@@ -24579,11 +26371,14 @@ msgstr "Téléchargement des données..."
msgid "File to load"
msgstr "Fichier à charger"
+msgid "Reading 7Zip file..."
+msgstr "Lecture du fichier 7Zip..."
+
msgid "Reading Zip file..."
-msgstr ""
+msgstr "Lecture d’un fichier Zip..."
msgid "Cannot transform to WGS84"
-msgstr ""
+msgstr "Conversion impossible en WGS84"
msgid ""
"JOSM was unable to find a strict mathematical transformation between ''{0}'' "
@@ -24595,6 +26390,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -24612,6 +26418,8 @@ msgstr "Voir la page Wiki OSM"
msgid "Launch browser to the OSM Wiki page of the selected data set"
msgstr ""
+"Lancement du navigateur sur la page du Wiki d'OSM pour selectionner les "
+"données"
msgid "View Local Portal page"
msgstr ""
@@ -24632,13 +26440,13 @@ msgid "Launch browser to the license page of the selected data set"
msgstr ""
msgid "View License (summary)"
-msgstr ""
+msgstr "Voir la licence (résumé)"
msgid "Launch browser to the summary license page of the selected data set"
msgstr ""
msgid "View the license of the selected data set"
-msgstr ""
+msgstr "Voir la licence des données selectionnées"
msgid ""
"Warning: Cannot download module ''{0}''. Its download link is not known. "
@@ -24657,10 +26465,10 @@ msgid "An error occurred in module {0}"
msgstr ""
msgid "Last module update more than {0} days ago."
-msgstr ""
+msgstr "La dernière mise à jour du module date de {0} jours"
msgid "Click to update the activated modules"
-msgstr ""
+msgstr "Cliquez pour activer la mise à jour du module"
msgid "Click to skip updating the activated modules"
msgstr ""
@@ -24676,10 +26484,10 @@ msgid ""
msgstr ""
msgid "Could not load module {0}. Delete from preferences?"
-msgstr ""
+msgstr "Chargement du module impossible {0}. A supprimer de vos préférences"
msgid "loading module ''{0}'' (version {1})"
-msgstr ""
+msgstr "Chargement du module ''{0}'' (version {1}"
msgid ""
"<html>Could not load module {0} because the module<br>main class ''{1}'' was "
@@ -24687,10 +26495,10 @@ msgid ""
msgstr ""
msgid "Loading modules ..."
-msgstr ""
+msgstr "Chargement du module ..."
msgid "Checking module preconditions..."
-msgstr ""
+msgstr "Test des préconisation du module..."
msgid "Loading module ''{0}''..."
msgstr "Chargement du module ''{0}''..."
@@ -24707,11 +26515,11 @@ msgstr[1] ""
msgid "Updating the following module has failed:"
msgid_plural "Updating the following modules has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La mise à jour du module suivant a échoué :"
+msgstr[1] "La mise à jour des modules suivants a échoué :"
msgid "Module update failed"
-msgstr ""
+msgstr "Echec de la mise à jour du module"
msgid "Warning: failed to download module information list"
msgstr ""
@@ -24745,12 +26553,14 @@ msgid ""
"Do not ask again and remember my decision (go to Preferences->Modules to "
"change it later)"
msgstr ""
+"Ne pas se souvenir de ma décision (aller dans les préférences=> Modules à "
+"modifier la prochaine fois)"
msgid "The module file ''{0}'' does not include a Manifest."
msgstr ""
msgid "Invalid URL ''{0}'' in module {1}"
-msgstr ""
+msgstr "URL invalide ''{0}'' dans le module {1}"
msgid "<b>Module provided by an external source:</b> {0}"
msgstr ""
@@ -24781,7 +26591,7 @@ msgid "Download module list..."
msgstr ""
msgid "Downloading module list from ''{0}''"
-msgstr ""
+msgstr "Téléchargement de la liste des modules depuis ''{0}''"
msgid ""
"Warning: failed to create module directory ''{0}''. Cannot cache module list "
@@ -24835,15 +26645,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Une erreur est survenue : {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Impossible de créer une nouvelle erreur. Résultat : {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"L’entête contient plusieurs valeurs et ne peut pas être décrit en une seule "
-"chaine"
-
msgid "Process queue"
msgstr "Traiter la file d’attente"
@@ -24900,18 +26701,6 @@ msgstr ""
msgid "Close: "
msgstr "Fermer : "
-msgid "New issue"
-msgstr "Marquer un nouveau problème"
-
-msgid "Create issue"
-msgstr "Créer un problème"
-
-msgid "Describe the problem precisely"
-msgstr "Décrire le problème précisément"
-
-msgid "Create: "
-msgstr "Créer : "
-
msgid "Open in browser"
msgstr "Ouvrir dans un navigateur externe"
@@ -24955,7 +26744,7 @@ msgid "Unknown file extension: {0}"
msgstr "Extension de fichier inconnue : {0}"
msgid "Parsing file \"{0}\" failed"
-msgstr "L’analyse du fichier ''{0}'' a échoué"
+msgstr "L’analyse du fichier ’’{0}’’ a échoué"
msgid "Osmarender"
msgstr "Osmarender"
@@ -24973,6 +26762,9 @@ msgstr "Exécutable Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "Fichiers compressés pbf du serveur OSM"
+msgid "Download PBF"
+msgstr "Téléchargement de PBF"
+
msgid "Invalid changeset id: {0}"
msgstr "Identifiant de groupe de modifications invalide : {0}"
@@ -25180,9 +26972,6 @@ msgstr "Importer le fichier PDF."
msgid "Import PDF"
msgstr "Importer le fichier PDF"
-msgid "Import PDf file"
-msgstr "Importer le fichier PDF"
-
msgid " {0} objects so far"
msgstr " {0} objets jusqu’à présent"
@@ -25266,8 +27055,26 @@ msgstr "Le test a échoué : impossible de lire mtime."
msgid "Test failed: Could not write mtime."
msgstr "Le test a échoué : impossible d’écrire mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Voulez-vous enregistrer le calibrage du calque {0} ?"
@@ -25395,7 +27202,7 @@ msgid "Point removed"
msgstr "Point retiré"
msgid "Remove point on the picture"
-msgstr "Retire le point sur l''image"
+msgstr "Retire le point sur l’’image"
msgid "PicLayer Transform point"
msgstr "Calque image - Transformer un point"
@@ -25424,6 +27231,10 @@ msgstr "Rien dans le presse-papier"
msgid "The clipboard data is not an image"
msgstr "La donnée du presse-papier n’est pas une image"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Attention : l’ouverture du fichier zip ''{0}'' a échoué. Exception : {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
"Un fichier de calibrage associé au fichier d’image a été trouvé : {0}\n"
@@ -25450,11 +27261,14 @@ msgstr ""
"Également, à partir de maintenant, les fichiers de calibrage seront toujours "
"chargés automatiquement."
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
msgid "Error reading poly file: {0}"
-msgstr ""
+msgstr "Erreur de lecture du fichier Poly {0}"
msgid "The file must begin with a polygon name"
msgstr ""
@@ -25469,7 +27283,7 @@ msgid "Unable to parse {0} as a number"
msgstr ""
msgid "Invalid coordinates were found: {0}, {1}"
-msgstr ""
+msgstr "Coordonnées invalides trouvées : {0}, {1}"
msgid "{0} points were outside world bounds and were moved"
msgstr ""
@@ -25496,7 +27310,7 @@ msgid "Orientation"
msgstr "Orientation"
msgid "Printer settings"
-msgstr "Paramètres de l''imprimante"
+msgstr "Paramètres de l’’imprimante"
msgid "Scale"
msgstr "Échelle"
@@ -25520,13 +27334,13 @@ msgid "Print"
msgstr "Imprimer"
msgid "Printing has been cancelled."
-msgstr "L''impression a été annulée."
+msgstr "L’’impression a été annulée."
msgid "Printing stopped"
msgstr "L’impression a été arrêtée"
msgid "Printing has failed."
-msgstr "L''impression a échoué."
+msgstr "L’’impression a échoué."
msgid "Proj4J: {0} selected"
msgstr ""
@@ -25535,7 +27349,7 @@ msgid "Selected: {0}"
msgstr "Sélectionné : {0}"
msgid "Proj4J Plugin"
-msgstr ""
+msgstr "Proj4J greffon"
msgid "Code"
msgstr "Code"
@@ -25565,16 +27379,16 @@ msgid "Select GTFS file (stops.txt)"
msgstr "Sélectionner le fichier GTFS (stops.txt)"
msgid "File \"{0}\" does not exist"
-msgstr "Le fichier ''{0}'' n’existe pas"
+msgstr "Le fichier ’’{0}’’ n’existe pas"
msgid "IOException \"{0}\" occurred"
-msgstr "L’exception I/O ''{0}'' s’est produite"
+msgstr "L’exception I/O ’’{0}’’ s’est produite"
msgid ""
"There exists no dataset. Try to download data from the server or open an OSM "
"file."
msgstr ""
-"Aucun jeu de données n''existe. Veuillez télécharger des données du serveur "
+"Aucun jeu de données n’’existe. Veuillez télécharger des données du serveur "
"ou ouvrir un fichier OSM."
msgid "No data found"
@@ -25745,9 +27559,6 @@ msgstr "Le fichier GPX ne contient aucune trace ou de point de passage."
msgid "Create Stops from GPX"
msgstr "Création d’arrêts à partir du fichier GPX"
-msgid "Tracks"
-msgstr "Traces"
-
msgid "Tracks in this GPX file:"
msgstr "Parcours dans le fichier GPX :"
@@ -25792,7 +27603,7 @@ msgid "Public Transport: Suggest stops"
msgstr "Transport public : suggérer des arrêts"
msgid "Stopname"
-msgstr "Nom de l''arrêt"
+msgstr "Nom de l’’arrêt"
msgid "Public Transport: Detach waypoints"
msgstr "Transport public : détacher des points de chemins"
@@ -25818,9 +27629,6 @@ msgstr "Précisez le rôle"
msgid "Change relation member roles to {0}"
msgstr "Changer les rôles des membres de la relation en {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Modifier les paramètres de création de multipolygone"
-
msgid "Create administrative boundary relations"
msgstr "Créer des relations de limites administratives"
@@ -25895,7 +27703,7 @@ msgid "Duplicate relation"
msgstr "Dupliquer la relation"
msgid "Open relation editor for the chosen relation"
-msgstr "Ouvrir l''éditeur de relation pour la relation choisie"
+msgstr "Ouvrir l’’éditeur de relation pour la relation choisie"
msgid "Find a relation"
msgstr "Trouver une relation"
@@ -25930,7 +27738,7 @@ msgid "Node without ''house'' role found"
msgstr "Noeud sans \"house\" trouvé"
msgid "Way without ''house'' or ''street'' role found"
-msgstr ""
+msgstr "Chemin sans rôle \"house\" ou \"street\""
msgid "Relation without ''house'' role found"
msgstr ""
@@ -25939,7 +27747,7 @@ msgid "Relation does not have name"
msgstr "La relation n’a pas de nom"
msgid "Relation has streets with different names"
-msgstr ""
+msgstr "Relation street avec plusieurs noms"
msgid "fix associatedStreet relation"
msgstr "réparer la relation associatedStreet"
@@ -25951,10 +27759,7 @@ msgid "Node without ''label'' or ''admin_centre'' role found"
msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
-msgstr ""
-
-msgid "Restart JOSM"
-msgstr "Redémarrer JOSM"
+msgstr "Présence d'un way sans rôle \"inner\" ou \"outer\""
msgid "Revert changeset fully"
msgstr "Annuler le groupe de modifications"
@@ -25977,6 +27782,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr "Cible de fusion manquante pour {0} avec l’identifiant {1}"
@@ -26014,23 +27822,46 @@ msgstr "Récupération des primitives manquantes"
msgid "Downloading changeset"
msgstr "Téléchargement du groupe de modifications"
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr "Revient sur le groupe de modifications nº {0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Attention : l’élément de départ ''{0}'' situé à la position ({1},{2}) dans "
+"le contenu du groupe de modifications n’est pas supporté. Abandon."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Attention : l’élément de fin ''{0}'' situé à la position ({1},{2}) dans le "
+"contenu du groupe de modifications n’est pas supporté. Abandon."
+
msgid "Road Sign Plugin"
msgstr "Greffon Signalisation Routière"
msgid "signs"
-msgstr ""
+msgstr "Signalisation routière"
+
+msgid "Change Properties"
+msgstr "Modifier les propriétés"
msgid "Country preset:"
-msgstr ""
+msgstr "Préréglages par pays"
msgid "Show all signs"
-msgstr ""
+msgstr "Afficher toute la signalisation routière"
msgid "Show a selection of the most useful signs"
-msgstr ""
+msgstr "Affichage des signalisations les plus utilisées"
+
+msgid "Spain"
+msgstr "Espagne"
msgid "Germany"
msgstr "Allemagne"
@@ -26138,9 +27969,6 @@ msgstr "Préférences du greffon de calcul d’itinéraire"
msgid "Configure routing preferences."
msgstr "Configurer les préférences du calcul d’itinéraire"
-msgid "Highway type"
-msgstr "Type de route"
-
msgid "Speed (Km/h)"
msgstr "Vitesse (Km/h)"
@@ -26160,6 +27988,9 @@ msgid ""
"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
"is stored in plain text in the JOSM preferences file. </p></body></html>"
msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Attention:</strong> Le mot de "
+"passe est stocké en clair dans le fichier de configuration de JOSM. "
+"</p></body></html>"
msgid "Enter credentials for Separate Data Store API"
msgstr ""
@@ -26176,7 +28007,7 @@ msgid ""
msgstr ""
msgid "SDS data file"
-msgstr ""
+msgstr "Fichier de données SDS"
msgid "Load..."
msgstr "Charger..."
@@ -26191,7 +28022,7 @@ msgid "SDS"
msgstr ""
msgid "Information about SDS."
-msgstr ""
+msgstr "Information sur SDS"
msgid "About SDS..."
msgstr "Au sujet de SDS..."
@@ -26227,13 +28058,13 @@ msgid ""
msgstr ""
msgid "SDS server URL"
-msgstr ""
+msgstr "URL du serveur SDS"
msgid "SDS username"
-msgstr ""
+msgstr "Nom d'utilisateur SDS"
msgid "SDS password"
-msgstr ""
+msgstr "Mot de passe SDS"
msgid "Test credentials now"
msgstr ""
@@ -26245,7 +28076,7 @@ msgid "Connection successful."
msgstr "Connexion réussie"
msgid "Cannot connect to SDS server: "
-msgstr ""
+msgstr "Impossibilité de se connecter au serveur SDS "
msgid "Save..."
msgstr "Sauvegarder..."
@@ -26254,7 +28085,10 @@ msgid "Save the current separate data store information to a file."
msgstr ""
msgid "Save SDS file"
-msgstr ""
+msgstr "Sauvegarde du fichier SDS"
+
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Impossible de récupérer le fichier. Exception : {0}"
msgid "Simplify Area"
msgstr "Simplifier la zone"
@@ -26316,20 +28150,20 @@ msgstr "Facteur de distance"
msgid "Merge Nearby Nodes Threshold"
msgstr "Seuil de fusion des nœuds voisins"
-msgid "Online Help"
-msgstr "Aide en ligne"
+msgid "SeaMap Editor"
+msgstr "Éditeur de carte maritime"
-msgid "Load"
-msgstr "Charger"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "invisible"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "Éditeur de carte maritime"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
-msgstr "Exporter"
+msgid "Select a map object"
+msgstr ""
msgid "AutoSave LiveData"
msgstr "Sauvegarde automatique des données en direct"
@@ -26392,7 +28226,7 @@ msgstr "Préférences de Tag2Link"
msgid "Launch browser with information about the selected object"
msgstr ""
-"Ouvre votre navigateur vers une information Web concernant l''objet "
+"Ouvre votre navigateur vers une information Web concernant l’’objet "
"sélectionné"
msgid ""
@@ -26473,6 +28307,9 @@ msgstr "supprimer le chemin du contour"
msgid "Street name: "
msgstr "Nom de la rue : "
+msgid "Building: "
+msgstr "Bâtiment : "
+
msgid "Even/Odd"
msgstr "Pair/Impair"
@@ -26553,6 +28390,95 @@ msgstr "Traceur."
msgid "Tracer building"
msgstr "Traceur de bâtiment"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr "Paramètre :"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -26568,9 +28494,6 @@ msgstr "Exporter les signatures en fichier XML"
msgid "Save Signatures file"
msgstr "Enregistrer le fichier des signatures"
-msgid "Download OSM"
-msgstr "Télécharger OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr "Obtenir les objets référencés mais absent depuis le serveur."
@@ -26594,6 +28517,11 @@ msgstr "Télécharger les objets depuis le serveur"
msgid "Download signed data"
msgstr "Télécharger les données authentifiées"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Avertissement: Exception ignorée en raison de l’’annulation de la tâche. "
+"Exception: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -26753,7 +28681,7 @@ msgid ""
"You can not sign it, because the signature would lose the ID-Reference after "
"uploading it to the OSM-server."
msgstr ""
-"L’objet avec l’identifiant ''{0}'' ({1}) vient d’être créé.\n"
+"L’objet avec l’identifiant ’’{0}’’ ({1}) vient d’être créé.\n"
"Vous ne pouvez pas le signer car la signature perdra la référence "
"identifiant après son envoi au serveur OSM."
@@ -26763,9 +28691,6 @@ msgstr "Signature annulée !"
msgid "Please give a tolerance in meters"
msgstr "Veuillez indiquer une tolérance en mètres"
-msgid "Accuracy"
-msgstr "Précision"
-
msgid "Select as much as you like:"
msgstr "Sélectionnez autant que vous désirez :"
@@ -27499,20 +29424,20 @@ msgstr "Restaurer l’objet"
msgid "Undelete object by id"
msgstr "Restaurer l’objet par son identifiant"
-msgid "Select if the data should be added into a new layer"
-msgstr ""
-"Sélectionner si les données doivent être ajoutées dans un nouveau calque"
+msgid "Undelete Object"
+msgstr "Restaurer l’objet"
+
+msgid "Undelete object"
+msgstr "Restaurer l’objet"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr "Restaurer l’objet"
-
-msgid "Undelete object"
-msgstr "Restaurer l’objet"
+msgid "Select if the data should be added into a new layer"
+msgstr ""
+"Sélectionner si les données doivent être ajoutées dans un nouveau calque"
msgid "Start undeleting"
msgstr "Début de la restauration"
@@ -27520,18 +29445,6 @@ msgstr "Début de la restauration"
msgid "Close dialog and cancel"
msgstr "Fermer la boîte de dialogue et annuler"
-msgid "Will get {0}"
-msgstr "Va obtenir {0}"
-
-msgid "Looking for {0}"
-msgstr "Recherche de {0}"
-
-msgid "Found {0}"
-msgstr "{0} trouvé"
-
-msgid "More tools"
-msgstr "Plus d’outils"
-
msgid "Add nodes at intersections"
msgstr "Ajouter des nœuds aux intersections"
@@ -27560,7 +29473,7 @@ msgid "Extract node"
msgstr "Extraire un nœud"
msgid "Extracts node from a way"
-msgstr "Extraire un nœud d''un chemin"
+msgstr "Extraire un nœud d’’un chemin"
msgid ""
"This tool extracts node from its ways and requires single node to be "
@@ -27581,15 +29494,6 @@ msgstr ""
"Colle les appartenances à relations (avec leur rôle correspondant) des "
"objets du tampon vers le(s) objet(s) sélectionné(s)."
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr "Coller les attributs"
-
msgid "Split Object"
msgstr "Couper l’objet"
@@ -27735,18 +29639,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Configuration d’une adresse URL personnalisée"
-msgid "Key is too long:"
-msgstr "La clé est trop longue :"
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr "Valeur trop longue (maximum 255 charactères) :"
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Outil Lat Lon"
@@ -27864,7 +29756,7 @@ msgid ""
"memberships unless they belong to both ways."
msgstr ""
"Le chemin à remplacer ne peut pas avoir de nœuds ayant des propriétés ou des "
-"appartenances à une relation à moins qu''ils appartiennent aux deux chemins."
+"appartenances à une relation à moins qu’’ils appartiennent aux deux chemins."
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr ""
@@ -27892,26 +29784,26 @@ msgid "Select all connected ways"
msgstr "Sélectionner tous les chemins connectés"
msgid "Intersecting ways"
-msgstr "Chemins s''entrecoupant"
+msgstr "Chemins s’’entrecoupant"
msgid "Select intersecting ways"
-msgstr "Sélectionner les chemins s''entrecoupant"
+msgstr "Sélectionner les chemins s’’entrecoupant"
msgid "Please select some ways to find connected and intersecting ways!"
msgstr ""
"Veuillez sélectionner quelques chemins pour trouver des chemins connectés et "
-"s''entrecoupant !"
+"s’’entrecoupant !"
msgid "All intersecting ways"
-msgstr "Tous les chemins s''entrecoupant"
+msgstr "Tous les chemins s’’entrecoupant"
msgid "Select all intersecting ways"
-msgstr "Sélectionner tous les chemins s''entrecoupant"
+msgstr "Sélectionner tous les chemins s’’entrecoupant"
msgid "Please select some ways to find all connected and intersecting ways!"
msgstr ""
"Veuillez sélectionner quelques chemins pour trouver tous les chemins "
-"connectés et s''entrecoupant !"
+"connectés et s’’entrecoupant !"
msgid "Middle nodes"
msgstr "Nœuds du milieu"
@@ -27987,9 +29879,6 @@ msgstr "Désélectionner les nœuds"
msgid "Removes all nodes from selection"
msgstr "Retirer tous les nœuds de la sélection"
-msgid "Video"
-msgstr "Vidéo"
-
msgid "Import Video"
msgstr "Importer une vidéo"
@@ -28116,8 +30005,8 @@ msgstr "en boucle"
msgid "mute"
msgstr "muet"
-msgid "Scanned Map..."
-msgstr "Carte scannée"
+msgid "Walking Papers Scanned Map"
+msgstr "Carte des Walking Papers scannés"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28133,7 +30022,7 @@ msgstr ""
msgid "Could not read information from walking-papers.org the id \"{0}\""
msgstr ""
"Impossible de lire les informations depuis walking-papers.org pour "
-"l’identifiant ''{0}''"
+"l’identifiant ’’{0}’’"
msgid "Walking Papers: {0}"
msgstr "Walking Papers : {0}"
@@ -28141,9 +30030,6 @@ msgstr "Walking Papers : {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Calque Walking Papers ({0}) au zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Téléchargement du chemin"
@@ -28232,21 +30118,23 @@ msgid "Copy {0} template"
msgstr ""
msgid "Fetch Wikipedia articles with coordinates"
-msgstr ""
+msgstr "Récupérer les articles Wikipédia avec des coordonnées"
msgid ""
"Double click on item to search for object with article name (and center "
"coordinate)"
msgstr ""
+"Double-cliquez sur un item pour rechercher un objet avec le nom de "
+"l''article (et centrer les coordonnées)"
msgid "Available via WIWOSM server"
-msgstr ""
+msgstr "Disponible via le serveur WIWOSM"
msgid "Available in local dataset"
-msgstr ""
+msgstr "Disponible dans le jeu de données local"
msgid "Not linked yet"
-msgstr ""
+msgstr "Pas encore lié"
msgid "{0}.Wikipedia.org"
msgstr "{0}.Wikipedia.org"
@@ -28255,28 +30143,28 @@ msgid "{0}.Wikipedia.org: {1}"
msgstr "{0}.Wikipedia.org: {1}"
msgid "Fetches all coordinates from Wikipedia in the current view"
-msgstr ""
+msgstr "Récupère toutes les coordonnées de Wikipédia dans la vue courante"
msgid "coordinates"
-msgstr ""
+msgstr "coordonnées"
msgid "Category"
msgstr "Catégorie"
msgid "Fetches a list of all Wikipedia articles of a category"
-msgstr ""
+msgstr "Récupère une liste de tous les articles Wikipédia d''une catégorie"
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Entrer une catégorie Wikipédia"
msgid "Clipboard"
-msgstr ""
+msgstr "Presse-papiers"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Colle les articles Wikipédia depuis le presse-papiers système"
msgid "clipboard"
-msgstr ""
+msgstr "presse-papiers"
msgid "Open Article"
msgstr "Ouvrir l’article"
@@ -28286,14 +30174,11 @@ msgstr ""
"Ouvre l’article Wikipedia de l’élément sélectionné dans un navigateur"
msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Définit la langue par défaut pour les articles de Wikipédia"
msgid "Enter the Wikipedia language"
msgstr "Entrez la langue Wikipédia"
-msgid "Add Tag"
-msgstr "Ajouter un tag"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
@@ -28302,7 +30187,7 @@ msgstr ""
"sélectionnés"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr "L''Ultimate WMS Super-speed Turbo Challenge II"
+msgstr "L’’Ultimate WMS Super-speed Turbo Challenge II"
msgid "Go driving"
msgstr "En voiture !"
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index ed16f1d..5aeede4 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 13:37+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:42+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:42+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -52,6 +52,21 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"A apertura do enlace non está soportada na platarofma actual (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "A executar arranque da plataforma"
@@ -156,19 +171,14 @@ msgid "About JOSM..."
msgstr "Sobre JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"AVISO: formato inesperado do URL base da API. O redireccionamento á páxina "
-"de información ou de historial do obxecto OSM probabelmente fallará. O URL "
-"base da API é: «{0}»"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"AVISO: formato inesperado do URL base da API. O redireccionamento á paxina "
-"de usuario do usuario OSM probabelmente fallará. O URL base da API é: «{0}»"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -213,6 +223,9 @@ msgstr "Non hai capas escollidas"
msgid "Add imagery layer {0}"
msgstr "Engadir capa de imaxes {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -254,9 +267,6 @@ msgstr "Ferramenta: {0}"
msgid "Please select at least four nodes."
msgstr "Escolla polo menos catro nodos."
-msgid "Information"
-msgstr "Información"
-
msgid "Align Nodes in Line"
msgstr "Aliñar os nodos en fila"
@@ -281,6 +291,9 @@ msgstr "conflito"
msgid "download"
msgstr "descargar"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "anterior"
@@ -290,6 +303,9 @@ msgstr "seguinte"
msgid "Nothing selected to zoom to."
msgstr "Non se seleccionou nada sobre o que facer zoom."
+msgid "Information"
+msgstr "Información"
+
msgid "Zoom to {0}"
msgstr "Facer zoom a {0}"
@@ -346,11 +362,9 @@ msgstr ""
"inverter algunhas?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Non foi posíbel combinar as vías (Non puideron ser mesturadas nunha única "
-"serie de nodos)"
msgid "Combine {0} ways"
msgstr "Combinar {0} vías"
@@ -407,6 +421,12 @@ msgstr "Eliminar"
msgid "Delete selected objects."
msgstr "Eliminar os obxectos seleccionados."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distribuír nodos"
@@ -414,12 +434,25 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distribuír os nodos seleccionados de xeito equidistante ao longo dunha liña."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descargar de OSM..."
msgid "Download map data from the OSM server."
msgstr "Descargar datos do mapa do servidor OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acción require {0} peticións de<br>descarga individuais. "
+"Desexas<br>continuar?</html>"
+
+msgid "Download data"
+msgstr "Descargar data"
+
msgid "Download object..."
msgstr "Descargar obxecto..."
@@ -514,6 +547,9 @@ msgstr "Historial"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Amosa información sobre vias,nodos, ou relacións de OSM"
+msgid "Show history"
+msgstr "Amosar historia"
+
msgid "History (web)"
msgstr "Historial (web)"
@@ -630,11 +666,9 @@ msgid "Joined overlapping areas"
msgstr "Areas superpostas unidas"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Algunhas das vías foron parte da relación que foi modificada. Verifique que "
-"non se introduciron erros."
msgid "Fix tag conflicts"
msgstr "Arranxar conflitos de etiquetas"
@@ -785,8 +819,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Acoplar nodos no máis antigo"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -947,8 +981,8 @@ msgid "Download Data"
msgstr "Descargar datos"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -983,16 +1017,9 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizar / Desfacer"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalizar forma / Desfacer\n"
-"Escolla os nodos que foron movidos pola acción anterior a Ortogonalizar "
-"forma!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Defacer ortogonalizar forma"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1013,9 +1040,6 @@ msgstr "Ortogonalizar"
msgid "Usage"
msgstr "Uso"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Seleccionados elementos que non poden ser ortogonalizados"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1128,6 +1152,15 @@ msgstr "Renomear tamén o ficheiro"
msgid "Could not rename file ''{0}''"
msgstr "Non é posíbel renomear o ficheiro «{0}»"
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr "Invertir vía"
@@ -1180,9 +1213,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1246,6 +1276,9 @@ msgstr "Informe de estado"
msgid "Copy to clipboard and close"
msgstr "Copiar a porta papeis e pechar"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Pechar"
@@ -1325,18 +1358,14 @@ msgstr ""
"nodos no medio da vía.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html> Unha parte baseada na relación de membros foi copiada a todas as "
-"rutas.<br>Debería verificar esto e corrixilo cando sexa necesario.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Unha relación de membros foi copiada a todas as rutas..<br>Debería "
-"verificar esto e corrixilo cando sexa necesario.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Separar a vía {0} en {1} partes"
@@ -1432,6 +1461,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Desfacer"
@@ -1456,9 +1506,6 @@ msgstr "Actualizar datos"
msgid "Updates the objects in the active data layer from the server."
msgstr "Actualizar desde o servidor os obxectos na capa de datos activa."
-msgid "Download data"
-msgstr "Descargar data"
-
msgid "Update modified"
msgstr "Actualizar modificado"
@@ -1660,6 +1707,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avance máis lento"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Descargando datos GPS"
@@ -1669,6 +1719,18 @@ msgstr "Datos GPX descargados"
msgid "Markers from {0}"
msgstr "Marcas de {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "Descargar OSM"
+
msgid "Downloading data"
msgstr "Descargando datos"
@@ -1688,6 +1750,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "houbo {0} conflito durante a importacion"
+msgstr[1] "houbo {0} conflitos durante a importacion"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflito mentres se descargaba"
+msgstr[1] "Conflitos mentres se descargaba"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Cargando parientes do nodo {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Cargando parientes da via {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Cargando parientes da relación {2}"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Descarga {0} de {1} ({2} restantes)"
@@ -1743,25 +1830,6 @@ msgstr "Os seguintes erros ocurriron durante a descarga masiva: {0}"
msgid "Errors during download"
msgstr "Erros durante a descarga"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "houbo {0} conflito durante a importacion"
-msgstr[1] "houbo {0} conflitos durante a importacion"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflito mentres se descargaba"
-msgstr[1] "Conflitos mentres se descargaba"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Cargando parientes do nodo {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Cargando parientes da via {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Cargando parientes da relación {2}"
-
msgid "Error during download"
msgstr "Erro durante a descarga"
@@ -1908,6 +1976,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1932,8 +2003,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1949,6 +2020,9 @@ msgstr "Paralela"
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2373,6 +2447,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2537,14 +2614,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
-msgstr "Esperábase un ID primitivo"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "Esperabase un ID de un conxunto de cambios"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "Version esperada"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2556,6 +2633,9 @@ msgstr ""
"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou "
"relación"
+msgid "Primitive id expected"
+msgstr "Esperábase un ID primitivo"
+
msgid "Range of numbers expected"
msgstr "Rango de numeros esperado"
@@ -2574,11 +2654,8 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr "Falta un parámetro para NON"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Aviso: recortouse automaticamente o valor do atributo «{0}» no obxecto "
-"eliminado {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2668,6 +2745,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Engadido {0} obxecto"
msgstr[1] "Engadidos {0} obxectos"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Cambiar nodo {0}"
@@ -2704,10 +2784,10 @@ msgstr "Retirar «{0}» de {1} obxectos"
msgid "Set {0}={1} for {2} objects"
msgstr "Estabelecer {0} = {1} para {2} obxectos"
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2730,8 +2810,8 @@ msgid "Double conflict"
msgstr "Dobre conflito"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2842,6 +2922,9 @@ msgstr[1] "Pugados {0} obxectos"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resolver conflitos na lista de membros da relación {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotar {0} nodo"
@@ -2902,11 +2985,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos "
-"seus nodos son suxeridos para manter a consistencia dos datos."
msgid "Relation"
msgstr "Relación"
@@ -2935,11 +3016,11 @@ msgstr "Aplicar os cambios seleccionados"
msgid "Do not apply changes"
msgstr "Non aplicar cambios"
-msgid "Please select which property changes you want to apply."
-msgstr "Escolla que cambios de propiedade queres aplicar."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Propiedades de "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Papeis nas relacións que fan referencia a"
@@ -2961,6 +3042,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Non foi posíbel eliminar a copia de seguranza antiga {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
"Produciuse un erro creando a copia de seguranza da capa retirada: {0}"
@@ -2992,21 +3076,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Atencion: fallou ao gardar as preferencias para «{0}»"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Atención: Fallou ao iniciar as preferencias. O directorio preferido «{0}» "
-"non é un directorio."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3016,11 +3098,9 @@ msgstr ""
"«{0}» non é un directorio.<html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Atención: Fallou ao inicializar as preferencias. Erro ao crear o directorio "
-"de preferencias desaparecido {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3029,16 +3109,12 @@ msgstr ""
"<html>Atención: Fallou ao inicializar as preferencias.<br> Erro ao crear o "
"directorio de preferencias desaparecido {0}.</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Atención: Sobrescribindo o ficheiro de preferencias «{0}» co ficheiro de "
-"preferencias predeterminado"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3056,8 +3132,8 @@ msgstr ""
"predeterminado.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3087,12 +3163,11 @@ msgstr "Produciuse un fallou ao cargar o recurso «{0}» o erro é {1}"
msgid "UNKNOWN"
msgstr "DESCOÑECIDO"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Atención: non se atopa o ficheiro de revisión «/REVISION»"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Xa se rexistrou un conflito para a primitiva «{0}»"
@@ -3255,8 +3330,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3363,7 +3437,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3382,6 +3456,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3398,9 +3475,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3441,6 +3515,9 @@ msgstr "outra validación"
msgid "Running test {0}"
msgstr "Executando test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Enderezos"
@@ -3465,6 +3542,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3526,15 +3612,15 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Nodos duplicados"
msgid "This test checks that there are no nodes at the very same location."
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3602,6 +3688,24 @@ msgstr "Nodos de vía duplicados"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Comproba vías con nodos consecutivos idénticos."
+msgid "Highways"
+msgstr "Autovías"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolígono"
@@ -3671,6 +3775,12 @@ msgstr "Nodos co mesmo nome"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3728,15 +3838,15 @@ msgstr ""
msgid "Relation is empty"
msgstr "A relación esta baldeira"
+msgid "Role verification problem"
+msgstr "Problema de verificación de rol"
+
msgid "<empty>"
msgstr "<empty>"
msgid "Role {0} missing"
msgstr ""
-msgid "Role verification problem"
-msgstr "Problema de verificación de rol"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Número de {0} roles demasiado baixos ({1})"
@@ -3766,10 +3876,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
-msgstr "Comprobador de propiedades:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3909,7 +4019,7 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)."
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3984,6 +4094,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr "tipo natural {0}"
@@ -4014,9 +4127,6 @@ msgstr "construcción"
msgid "area"
msgstr "área"
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4041,10 +4151,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4107,27 +4217,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Erro: Liña «{0}» inesperada no ficheiro de marcador «{1}»"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erro: Dobre valor incorrecto «{0}» na liña «{1}» no ficheiro de marcadores "
-"«{2}»"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html> Non é posíbel ler os marcadores desde <br>\"{0}\"<br>O erro foi: "
-"{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Non mostrar esto outra vez(recordar escolla)"
@@ -4231,7 +4320,7 @@ msgstr "Amosar información de axuda"
msgid "Downloading \"Message of the day\""
msgstr "Descargando «Mensaxe do día»"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4442,9 +4531,24 @@ msgstr "Ver"
msgid "Tools"
msgstr "Ferramentas"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Selección"
+
msgid "Presets"
msgstr "Axustes prestablecidos"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4460,10 +4564,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Son"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4472,6 +4588,9 @@ msgstr "Agochar este botón"
msgid "Click the arrow at the bottom to show it again."
msgstr "Prema na frecha do fondo para amosalo outra vez."
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr "Mostrar ou agochar este botón conmutador"
@@ -4533,6 +4652,9 @@ msgstr "(sen obxecto)"
msgid "User:"
msgstr "Usuario:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "a capa non está na lista."
@@ -4560,22 +4682,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "falso: a propiedade está explícitamente desactivada"
-
-msgid "true: the property is explicitly switched on"
-msgstr "verdadeiro: a propiedade está explícitamente activada"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parcial: distintos obxectos seleccionados teñen valores diferentes, non "
-"cambiar"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-"non establecido: non estabelecer esta propiedade nos obxectos seleccionados"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4882,6 +4988,9 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Copiar a miña selección de nodos ao final da lista de nodos mesturada."
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -4889,6 +4998,9 @@ msgstr ""
"Copiar os meus elementos escollidos antes do primeiro elemento escollido na "
"lista de elementos mesturados"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -4896,15 +5008,24 @@ msgstr ""
"Copiar os meus elementos escollidos despois do primeiro elemento escollido "
"na lista de elementos mesturados"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "Copiar o seu elemento escollido na lista de elementos mesturados"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Copiar os seus elementos escollidos ao final da lista de elementos mesturados"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -4912,6 +5033,9 @@ msgstr ""
"Copiar os seus elementos escollidos antes do primeiro elemento escollido na "
"lista de elementos mesturados"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4928,8 +5052,8 @@ msgstr "Copiar todos os seus elementos ao destino"
msgid "Up"
msgstr "Arriba"
-msgid "Move up the selected elements by one position."
-msgstr "Mover arriba os elementos escollidos unha posición."
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Abaixo"
@@ -4984,16 +5108,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "A version de eles({0} entrada)"
msgstr[1] "A version de eles({0} entradas)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"O axustable {0} aínda non está rexistrado. Non é posíbel marcar a "
-"participación en axustes de sincronizados."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "O axustable {0} aínda non está rexistrado."
-
msgid "Node"
msgstr "Nodo"
@@ -5255,19 +5369,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Clave:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Introduza unha clave para a etiqueta, p.e. "
-"<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valor:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Introduza un valor para a etiqueta, p.e. <strong><tt>check "
-"members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5820,6 +5930,9 @@ msgstr "Amosar/Ocultar"
msgid "Information about layer"
msgstr "Información da capa"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Estilo de pintura do mapa"
@@ -5903,6 +6016,36 @@ msgstr ""
msgid "No"
msgstr "Non"
+msgid "Object type:"
+msgstr "Tipo de obxecto:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "mixto"
+
+msgid "Choose the OSM object type"
+msgstr "Escolle o tipo de obxecto OSM"
+
+msgid "Object ID:"
+msgstr "ID do Obxecto"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Introduza o ID do obxecto que debería ser descargado"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Os ID de obxectos poden separarse por comas ou espazos.<br/> Exemplos: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> o modo de mesturado, "
+"especifique obxectos desta forma: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relacións"
@@ -5924,9 +6067,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relacións: {0}"
-msgid "Selection"
-msgstr "Selección"
-
msgid "Open a selection list window."
msgstr "Abrir unha ventá de lista de selección."
@@ -5951,18 +6091,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Selección: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5981,6 +6109,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Facer click para minimizar/maximizar o contido do panel"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Autores"
@@ -5999,11 +6139,8 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr "Lanzar un navegador con información sobre este usuario"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Atención: só se mostrara información para o primeiro {0} de {1} usuarios "
-"escollidos"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6030,9 +6167,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr "Arranxar"
@@ -6182,9 +6316,6 @@ msgstr "Actualizar contido"
msgid "Update the changeset content from the OSM server"
msgstr "Actualizar o contido do conxunto de cambios desde o servidor de OSM"
-msgid "Show history"
-msgstr "Amosar historia"
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6498,11 +6629,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Aviso: valor inesperado para a preferencia «{0}», obtívose «{1}». "
-"Restaurando valor predeterminado."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6566,35 +6695,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta petición de conxunto de cambios non é válida"
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Propiedades/Relacións"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Propiedades dos obxectos seleccionados."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<diferente>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Membro de"
msgid "Position"
msgstr "Posición"
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Eliminar a clave seleccionada en todos os obxectos"
-msgid "Delete Properties"
-msgstr "Eliminar propiedades"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Cambiar relación"
@@ -6608,13 +6749,13 @@ msgstr "Eliminar realmente a selección da relación {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Engadir un novo par clave/valor para todos os obxectos"
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "Engadir Etiqueta"
msgid "Edit the value of the selected key for all objects"
msgstr "Editar o valor da clave seleccionada para todos os obxectos"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6693,12 +6834,6 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6728,9 +6863,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6768,7 +6909,7 @@ msgstr "A relación é eliminada"
msgid "Downloading relation {0}"
msgstr "Descargando relación {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6828,6 +6969,9 @@ msgstr "Retíraos, limpa a relación"
msgid "Ignore them, leave relation as is"
msgstr "Ignóraos, deixa a relación como está"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7096,6 +7240,27 @@ msgid "way is not connected to previous or next relation member"
msgstr ""
"a vía non está conectada nin ao seguinte nin anterior membro da relación"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html> Non é posíbel ler os marcadores desde <br>\"{0}\"<br>O erro foi: "
+"{1}</html>"
+
msgid "Bookmarks"
msgstr "Marcadores"
@@ -7164,9 +7329,6 @@ msgstr "Requírese un valor no rango [-90,90] para a latitude."
msgid "Value for longitude in range [-180,180] required."
msgstr "Requírese un valor no rango [-180,180] para a lonxitude."
-msgid "Paste URL from clipboard"
-msgstr "Pegar o URL desde o portapapéis"
-
msgid "Data Sources and Types:"
msgstr "Fontes de datos e tipos:"
@@ -7236,21 +7398,8 @@ msgstr ""
msgid "Download object"
msgstr "Descargar obxecto"
-msgid "Object type:"
-msgstr "Tipo de obxecto:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "mixto"
-
-msgid "Choose the OSM object type"
-msgstr "Escolle o tipo de obxecto OSM"
-
-msgid "Object ID:"
-msgstr "ID do Obxecto"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Introduza o ID do obxecto que debería ser descargado"
+msgid "Start downloading"
+msgstr "Comezar a descarga"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7260,26 +7409,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Os ID de obxectos poden separarse por comas ou espazos.<br/> Exemplos: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> o modo de mesturado, "
-"especifique obxectos desta forma: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Comezar a descarga"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr "Tipo de clase"
@@ -7377,7 +7509,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr "Ir a páxina de axuda de JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7486,6 +7618,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Información do conxunto de cambios"
@@ -7586,7 +7721,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7605,6 +7740,12 @@ msgstr "Proporciona un breve comentario para os cambios que vas a subir:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "id de conxunto de cambios:"
@@ -7671,8 +7812,7 @@ msgid "Closing changeset {0}"
msgstr "Pechando conxunto de cambios {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7747,8 +7887,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7762,8 +7902,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7978,12 +8117,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7998,6 +8131,22 @@ msgstr ""
"/>Se gasta un minuto agora para ecplicar o seu cambio, faralle a vida <br "
"/>mais facil a outros asignadores."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -8013,6 +8162,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Cancelar a a actualización e continuar editando"
@@ -8020,8 +8184,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -8136,9 +8300,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -8148,6 +8309,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8164,7 +8328,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr "Cancela a actualización"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8310,7 +8474,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8340,7 +8504,7 @@ msgstr "versión {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8456,6 +8620,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8493,6 +8660,9 @@ msgstr ""
msgid "Alpha channel"
msgstr "Canle alfa:"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8689,9 +8859,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Ler fotos..."
@@ -8710,6 +8877,9 @@ msgstr "Atopouse un ficheiro nulo no directorio {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Erro obtendo ficheiros do directorio {0}\n"
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Imaxes xeo-etiquetadas"
@@ -8767,6 +8937,12 @@ msgstr "Seguinte"
msgid "Show next Image"
msgstr "Mostrar a seguinte imaxe"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centrar vista"
@@ -8837,9 +9013,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8852,8 +9025,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Descargar de OSM ó longo deste camiño"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Descargar todo o que abarca:"
@@ -8879,15 +9055,17 @@ msgstr "só puntos de referencia"
msgid "track and waypoints"
msgstr "camiño e puntos de referencia"
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Descargar de OSM ó longo deste camiño"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>Esta acción require {0} peticións de<br>descarga individuais. "
-"Desexas<br>continuar?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9025,14 +9203,10 @@ msgstr "Houbo un erro tratando de amosar o URL desta marca."
msgid "(URL was: "
msgstr "(o URL era: "
-msgid "Error displaying URL"
-msgstr "Produciuse un erro amosando o URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -9047,7 +9221,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -9057,8 +9231,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9278,7 +9451,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9354,6 +9527,12 @@ msgstr ""
"Escoller para permitir JOSM o dereito a escribir nas túas preferencias no "
"servidor"
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "Obtendo Token de Acesso OAuth..."
@@ -9411,9 +9590,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr "Reiniciar"
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9686,6 +9862,9 @@ msgstr "Descargar complementos"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Control Remoto"
@@ -9814,6 +9993,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "Accións"
@@ -9856,6 +10041,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Validador de dados"
@@ -9906,6 +10094,27 @@ msgstr "Procura: "
msgid "Read from file"
msgstr ""
+msgid "Export selected items"
+msgstr ""
+
+msgid "JOSM custom settings files (*.xml)"
+msgstr ""
+
+msgid "Please select some preference keys not marked as default"
+msgstr ""
+
+msgid "Export preferences keys to JOSM customization file"
+msgstr ""
+
+msgid "What to do with preference lists when this file is to be imported?"
+msgstr ""
+
+msgid "Append preferences from file to existing values"
+msgstr ""
+
+msgid "Replace existing values"
+msgstr ""
+
msgid "Open JOSM customization file"
msgstr ""
@@ -9918,40 +10127,58 @@ msgid ""
"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Export selected items"
+msgid "shortcut"
msgstr ""
-msgid "Please select some preference keys not marked as default"
+msgid "color"
msgstr ""
-msgid "Export preferences keys to JOSM customization file"
+msgid "toolbar"
msgstr ""
-msgid "What to do with preference lists when this file is to be imported?"
+msgid "imagery"
msgstr ""
-msgid "Append preferences from file to existing values"
+msgid "Reset preferences"
msgstr ""
-msgid "Replace existing values"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Load profile"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Save {0} profile"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Current value is default."
+msgid "Choose profile file"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "Change list setting"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "Key: {0}"
+msgstr ""
+
+msgid "Change list of lists setting"
+msgstr ""
+
+msgid "add entry"
+msgstr ""
+
+msgid "Remove the selected entry"
+msgstr ""
+
+msgid "Change list of maps setting"
+msgstr ""
+
+msgid "Entry {0}"
msgstr ""
msgid "Select Setting Type:"
@@ -9972,25 +10199,19 @@ msgstr ""
msgid "Add setting"
msgstr ""
-msgid "Change list setting"
-msgstr ""
-
-msgid "Key: {0}"
-msgstr ""
-
-msgid "Change list of lists setting"
+msgid "Advanced Background: Changed"
msgstr ""
-msgid "add entry"
+msgid "Advanced Background: NonDefault"
msgstr ""
-msgid "Remove the selected entry"
+msgid "Current value is default."
msgstr ""
-msgid "Change list of maps setting"
+msgid "Default value is ''{0}''."
msgstr ""
-msgid "Entry {0}"
+msgid "Default value currently unknown (setting has not been used yet)."
msgstr ""
msgid "Change string setting"
@@ -10051,6 +10272,9 @@ msgstr "Debuxar nodos virtuais no modo de selección"
msgid "Draw inactive layers in other color"
msgstr "Debuxar as capas inactivas en outra cor"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10108,6 +10332,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10405,7 +10634,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10575,6 +10810,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Copia de seguranza"
@@ -10638,8 +10879,8 @@ msgstr "Preferencias do Mapa"
msgid "Settings for the map projection and data interpretation."
msgstr "Parámetros para a proxección do mapa e interpretación de datos."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10896,21 +11137,6 @@ msgstr "Swiss Grid (Suíza)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zona"
-
-msgid "North"
-msgstr "Norte"
-
-msgid "South"
-msgstr "Sur"
-
-msgid "Hemisphere"
-msgstr "Hemisferio"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -10932,6 +11158,21 @@ msgstr "UTM Francia (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM sistema xeodésico"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zona"
+
+msgid "North"
+msgstr "Norte"
+
+msgid "South"
+msgstr "Sur"
+
+msgid "Hemisphere"
+msgstr "Hemisferio"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Probando OSM API URL ''{0}''"
@@ -10982,8 +11223,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10992,20 +11233,25 @@ msgstr "Nome de usuario OSM:"
msgid "OSM password:"
msgstr "Contrasinal de OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -11088,16 +11334,10 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-msgid "disabled"
-msgstr "desactivado"
-
-msgid "no modifier"
-msgstr "sen modificador"
-
msgid "Shortcut Background: User"
msgstr ""
@@ -11139,32 +11379,37 @@ msgstr ""
msgid "Add a new tag"
msgstr "Engadir unha etiqueta"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Usar ó axuste prestabelecido «{0}» do grupo «{1}»"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Usar o axuste prestabelecido «{0}»"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Os elementos do tipo {0} están admitidos."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Cambiar {0} obxecto"
+msgstr[1] "Cambiar {0} obxectos"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Nada seleccionado!"
+
+msgid "Selection unsuitable!"
+msgstr "Selección non axeitada!"
+
+msgid "Apply Preset"
+msgstr "Aplicar axuste preestablecido"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "Máis información sobre desta característica"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11172,6 +11417,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Máis información sobre desta característica"
+
msgid "Available roles"
msgstr "Roles dispoñibles"
@@ -11187,59 +11435,61 @@ msgstr "elementos"
msgid "Optional Attributes:"
msgstr "Atributos Opcionais:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Usar ó axuste prestabelecido «{0}» do grupo «{1}»"
-
-msgid "Use preset ''{0}''"
-msgstr "Usar o axuste prestabelecido «{0}»"
-
-msgid "Unknown type: {0}"
-msgstr "Tipo descoñecido: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Error parsing {0}: "
-msgstr "Erro analizando {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Elements of type {0} are supported."
-msgstr "Os elementos do tipo {0} están admitidos."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Cambiar {0} obxecto"
-msgstr[1] "Cambiar {0} obxectos"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Nada seleccionado!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Selección non axeitada!"
+msgid "Unknown type: {0}"
+msgstr "Tipo descoñecido: {0}"
-msgid "Apply Preset"
-msgstr "Aplicar axuste preestablecido"
+msgid "Preset group {1} / {0}"
+msgstr ""
-msgid "New relation"
+msgid "Preset group {0}"
msgstr ""
-msgid "Change Properties"
-msgstr "Cambiar Propiedades"
+msgid "Roles cannot appear more than once"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "Erro analizando {0}: "
+
msgid "Search preset"
msgstr ""
@@ -11255,6 +11505,16 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"O axustable {0} aínda non está rexistrado. Non é posíbel marcar a "
+"participación en axustes de sincronizados."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "O axustable {0} aínda non está rexistrado."
+
msgid "All files (*.*)"
msgstr ""
@@ -11286,12 +11546,63 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Vía con ID externo «{0}» inclúe nodos que faltan con ID externa «{1}»"
+msgid "false: the property is explicitly switched off"
+msgstr "falso: a propiedade está explícitamente desactivada"
-msgid "Deleted node {0} is part of way {1}"
+msgid "true: the property is explicitly switched on"
+msgstr "verdadeiro: a propiedade está explícitamente activada"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"parcial: distintos obxectos seleccionados teñen valores diferentes, non "
+"cambiar"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+"non establecido: non estabelecer esta propiedade nos obxectos seleccionados"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Falta o atributo obrigatorio «{0}»."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"valor ilegal para o atributo obrigatorio «{0}» de tipo enteiro longo, obtido "
+"«{1}»"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"valor ilegal para o atributo obrigatorio «{0}» de tipo enteiro longo (>=0), "
+"obtido «{1}»"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr "Valor ilegal para o atributo «{0}» de lóxico. Obtívose «{1}»."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Valor ilegal para o atributo «{0}» de tipo OsmPrimitive. Obtívose «{1}»."
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Vía con ID externo «{0}» inclúe nodos que faltan con ID externa «{1}»"
+
+msgid "Deleted node {0} is part of way {1}"
msgstr "O nodo eliminado {0} é parte da vía {1}"
msgid ""
@@ -11321,7 +11632,7 @@ msgid "Contacting OSM Server..."
msgstr "Contactando co Servidor OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11361,28 +11672,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11482,6 +11791,9 @@ msgid "Parse error: invalid document structure for GPX document."
msgstr ""
"Erro de análise: estrutura de documento non válida para documento gpx"
+msgid "(at line {0}, column {1})"
+msgstr "(na liñá {0}, columna {1})"
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11497,12 +11809,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11581,8 +11901,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Importación NMEA satisfactoria"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Fallo de importación NMEA!"
@@ -11680,44 +12000,13 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Falta o atributo obrigatorio «{0}»."
-
msgid "Unsupported version: {0}"
msgstr "Versión non admitida: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"valor ilegal para o atributo obrigatorio «{0}» de tipo enteiro longo, obtido "
-"«{1}»"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"valor ilegal para o atributo obrigatorio «{0}» de tipo enteiro longo (>=0), "
-"obtido «{1}»"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr "Valor ilegal para o atributo «{0}» de lóxico. Obtívose «{1}»."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Valor ilegal para o atributo «{0}» de tipo OsmPrimitive. Obtívose «{1}»."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Atención: elemento de comezo «{0}» no conxunto de cambios na posición "
-"({1},{2}). Omitindo."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -11727,8 +12016,8 @@ msgstr ""
"«create», «modify», ou «delete»."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11756,11 +12045,8 @@ msgstr "Procesando a lista de conxuntos de cambio..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Atención: valor inesperado para a preferencia «{0}». Obtívose «{1}»."
-
-msgid "(at line {0}, column {1})"
-msgstr "(na liñá {0}, columna {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Ocurriu un erro mentres se gardaba.<br>O Erro é:<br>{0}</html>"
@@ -11772,9 +12058,6 @@ msgstr ""
"<html>Ocorreu un erro mentres se recuperaba unha copia de seguranza.<br>O "
"Erro é:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Non se puido respaldar o ficheiro. A excepción é: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Ficheiros do servidor OSM comprimidos con gzip"
@@ -11796,6 +12079,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11851,8 +12137,8 @@ msgstr ""
"Obtívose {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -12005,6 +12291,9 @@ msgstr "Gardar usuario e contrasinal (sen encriptar)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -12023,6 +12312,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -12047,7 +12345,13 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -12056,9 +12360,6 @@ msgstr "O control remoto foi preguntado para crear un novo nodo."
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr ""
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
@@ -12068,6 +12369,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12082,6 +12391,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12112,19 +12430,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12146,11 +12464,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -12220,18 +12550,14 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Atención: Non se pode descargar o complemento «{0}». A ligazón de descarga é "
-"descoñecida. Omitindo a descarga."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Atención: Non se pode descargar o complemento «{0}». A ligazón de descarga "
-"«{1}» non é un URL válido. Omitindo a descarga."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Produciuse un fallo ao crear o directorio do complemento «{0}»"
@@ -12398,13 +12724,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Produciuse un fallo na actualización do complemento"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
-"Atención: produciuse un fallo ao descargar a lista de información do "
-"complemento"
msgid "Disable plugin"
msgstr "Desactivar o complemento"
@@ -12418,26 +12742,22 @@ msgstr "Manter o complemento"
msgid "Click to keep the plugin ''{0}''"
msgstr "Prema para manter o complemento «{0}»"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
-"Atención: produciuse un fallo ao eliminar o complemento obsoleto «{0}»."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Atención: produciuse un fallo ao instalar o complemento «{0}» do ficheiro "
-"temporal descargado «{1}». O fallo produciuse ao renomear."
msgid "Click to disable the plugin ''{0}''"
msgstr "Prema para desactivar o complemento «{0}»"
@@ -12512,8 +12832,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr "Procesando o ficheiro «{0}»"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12528,9 +12847,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12858,17 +13192,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12879,9 +13207,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12913,9 +13284,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13240,6 +13625,11 @@ msgid "Saturation:"
msgstr "Saturación:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13322,6 +13712,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Atopa e arranxa direccións de rúas non válidas dun xeito cómodo."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13426,9 +13820,6 @@ msgstr "Non engade ningún xiro á esquerda para conxuntos de 4 ou 5 vías"
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13495,6 +13886,9 @@ msgstr ""
"Acceda a esta característica premendo o botón dereito do rato sobre a capa "
"da imaxe."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13523,9 +13917,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr "Complemento para desfacer conxuntos de cambios"
@@ -13561,9 +13952,6 @@ msgstr ""
"pode condicionarse ao tamaño da área máxima a retirar. Fai ademais unha "
"media dos nodos próximos."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Crear e editar cartas mariñas para OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13606,6 +13994,11 @@ msgstr ""
"Traza edificios a partir do mapa catastral checo. Require TracerServer (.NET "
"o Mono) para funcionar."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Engadido para asinar dixitalmente Datos de OSM"
@@ -13659,9 +14052,6 @@ msgstr ""
"Conduce un coche de carreiras desde o punto A ata o punto B, dexa os cactus "
"detrás."
-msgid "Highways"
-msgstr "Autovías"
-
msgid "Streets"
msgstr "Rúas"
@@ -13746,6 +14136,9 @@ msgstr "Terraplén"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Peaxe"
+
msgid "Motorway Link"
msgstr "Enlace de autopista"
@@ -13836,39 +14229,86 @@ msgstr "Rúa urbana"
msgid "Edit Residential Street"
msgstr "Editar rúa urbana"
-msgid "Living Street"
-msgstr "Rúa residencial"
+msgid "Bicycle Road"
+msgstr ""
-msgid "Edit Living Street"
-msgstr "Editar rúa residencial"
+msgid "Edit Bicycle Road"
+msgstr ""
-msgid "Pedestrian"
-msgstr "Calle peatonal"
+msgid "Highway type"
+msgstr "Tipo de carretera"
-msgid "Edit Pedestrian Street"
-msgstr "Editar una calle peatonal"
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
-msgid "Area"
-msgstr "Área"
+msgctxt "Highway"
+msgid "service"
+msgstr ""
-msgid "Service"
-msgstr "Servizo"
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
-msgid "Edit Serviceway"
-msgstr "Editar vía de servicio"
+msgctxt "Highway"
+msgid "path"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Tipo de vía de servicio"
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
-msgid "alley"
-msgstr "callejón"
+msgid "Vehicle access"
+msgstr ""
-msgid "driveway"
+msgid "yes"
+msgstr "si"
+
+msgid "no"
+msgstr "non"
+
+msgid "destination"
+msgstr "destino"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
+msgid "Living Street"
+msgstr "Rúa residencial"
+
+msgid "Edit Living Street"
+msgstr "Editar rúa residencial"
+
+msgid "Pedestrian"
+msgstr "Calle peatonal"
+
+msgid "Edit Pedestrian Street"
+msgstr "Editar una calle peatonal"
+
+msgid "Area"
+msgstr "Área"
+
+msgid "Service"
+msgstr "Servizo"
+
+msgid "Edit Service Way"
+msgstr ""
+
+msgid "Service way type"
+msgstr ""
+
+msgid "alley"
+msgstr "callejón"
+
+msgid "driveway"
msgstr "camiño de entrada(a unha casa , graraxe, finca ...)"
msgid "parking_aisle"
msgstr "corredor de aparcamento"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Corredor de aparcamento"
@@ -13896,18 +14336,12 @@ msgstr "rotonda"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "si"
-
msgid "Road Restrictions"
msgstr "Restricións de trafico"
msgid "Edit Road Restrictions"
msgstr "Editar restricións de tráfico"
-msgid "Toll"
-msgstr "Peaxe"
-
msgid "No exit (cul-de-sac)"
msgstr "Sen saída"
@@ -13917,9 +14351,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destino"
-
msgid "delivery"
msgstr "reparto de mercancías"
@@ -13929,15 +14360,15 @@ msgstr "permisivo"
msgid "private"
msgstr "privado"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "agrícola"
msgid "forestry"
msgstr "forestal"
-msgid "no"
-msgstr "non"
-
msgid "official"
msgstr "oficial"
@@ -13983,6 +14414,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Vehículos de servicio público (SP)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Velocidade mínima (km/h)"
@@ -14067,6 +14501,9 @@ msgstr "Editar ponte"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14171,20 +14608,29 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilidade"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "excelente"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "bon"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "intermedia"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "mala"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "pésima"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Sillas de rodas"
@@ -14201,10 +14647,10 @@ msgstr "Camiño de cabalos dedicado"
msgid "Edit Bridleway"
msgstr "Editar vía de cabalos"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -14240,7 +14686,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14309,12 +14755,18 @@ msgstr "Área de Descanso"
msgid "Edit Rest Area"
msgstr "Edita Área de Descanso"
-msgid "Emergency Phone"
-msgstr "Teléfono de emerxencia"
+msgid "Drinking Water"
+msgstr "Auga potable"
msgid "Traffic Signal"
msgstr "Semáforo"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Tipo de cruce peatonal"
@@ -14330,15 +14782,6 @@ msgstr "illa"
msgid "unmarked"
msgstr "sen marcar"
-msgid "Cross on horseback"
-msgstr "Cruce de cabalos"
-
-msgid "Cross by bicycle"
-msgstr "Cruce de bicicletas"
-
-msgid "Crossing attendant"
-msgstr "Guarda cruces"
-
msgid "Crossing type name (UK)"
msgstr "Tipo de nome de cruce (Reino Unido)"
@@ -14360,6 +14803,15 @@ msgstr "pegaso"
msgid "tiger"
msgstr "tigre"
+msgid "Crossing attendant"
+msgstr "Guarda cruces"
+
+msgid "Cross by bicycle"
+msgstr "Cruce de bicicletas"
+
+msgid "Cross on horseback"
+msgstr "Cruce de cabalos"
+
msgid "Stop"
msgstr "Deter"
@@ -14369,6 +14821,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rotonda"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Dirección"
@@ -14378,11 +14833,8 @@ msgstr "no sentido das agullas do reloxo"
msgid "Pedestrian Crossing"
msgstr "Cruce peatonal"
-msgid "Edit Crossing"
-msgstr "Editar cruce"
-
-msgid "Type name (UK)"
-msgstr "Tipo de nome (Reino Unido)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Calmado de tráfico"
@@ -14414,9 +14866,6 @@ msgstr "táboa"
msgid "Passing Place"
msgstr "Lugar de cruces frecuentes"
-msgid "Edit Passing Place"
-msgstr "Editar lugar de cruces frecuentes"
-
msgid "Turning Circle"
msgstr "Círculo de giro"
@@ -14450,20 +14899,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barreiras"
+msgid "Block"
+msgstr "Bloque"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Tráfico permitido:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
+
msgid "Bollard"
msgstr "Bolardo"
msgid "Edit Bollard"
msgstr "Editar un bolardo"
-msgid "Allowed traffic:"
-msgstr "Tráfico permitido:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plástico"
msgid "Cycle Barrier"
msgstr "Barreira para bicicletas"
-msgid "Block"
-msgstr "Bloque"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Barreira canadiense"
@@ -14474,6 +14947,9 @@ msgstr "Editar barreira canadiense"
msgid "Bus Trap"
msgstr "Trampa para coches"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Picos"
@@ -14495,44 +14971,88 @@ msgstr "Editar aduana"
msgid "Hedge"
msgstr "Seto"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Altura (en metros)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Valado"
+msgid "Edit Fence"
+msgstr ""
+
msgid "barbed_wire"
msgstr ""
-msgid "chain"
+msgid "chain_link"
msgstr ""
msgid "electric"
msgstr "electrico"
-msgid "hedge"
-msgstr ""
-
msgid "pole"
msgstr "poste"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Parede"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Muralla da cidade"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Muro de contención"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Acequia"
+msgstr ""
-msgid "Entrance"
-msgstr "Entrada"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Editar unha entrada"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Porta"
@@ -14565,12 +15085,27 @@ msgstr "Portilla xiratoria"
msgid "Edit Kissing Gate"
msgstr "Editar portilla xiratoria"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Escaleira de paso"
msgid "Edit Stile"
msgstr "Editar una escaleira de paso"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Torno"
@@ -14628,6 +15163,9 @@ msgstr "Desaugue"
msgid "Edit Drain"
msgstr "Editar canal de desaugue"
+msgid "Ditch"
+msgstr "Acequia"
+
msgid "Edit Ditch"
msgstr "Editar acequia"
@@ -14637,6 +15175,12 @@ msgstr "Arroio ou riachuelo"
msgid "Edit Stream"
msgstr "editar arroio ou riachuelo"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -14676,9 +15220,6 @@ msgstr "Editar unha presa"
msgid "Groyne"
msgstr "Rompeolas"
-msgid "Edit Groyne"
-msgstr "Editar rompeolas"
-
msgid "Breakwater"
msgstr ""
@@ -14712,6 +15253,21 @@ msgstr "Editar depósito de auga"
msgid "Edit Water"
msgstr "Editar auga"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Terra"
@@ -14793,20 +15349,25 @@ msgstr "Editar terminal de ferry"
msgid "Cargo"
msgstr "Cargo"
+msgctxt "cargo"
msgid "passengers"
-msgstr "pasaxeiros"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "vehículo"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicicleta"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "hgv"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "pasaxeiros;vehiculos"
+msgstr ""
msgid "Ferry Route"
msgstr "Ruta de ferry"
@@ -14877,7 +15438,10 @@ msgstr "zona militar"
msgid "tourism"
msgstr "turismo"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14901,11 +15465,14 @@ msgstr "liña_de_contacto"
msgid "rail"
msgstr "ferrocarril"
-msgid "Voltage"
-msgstr "Voltaxe"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frecuencia (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14916,9 +15483,6 @@ msgstr "Vía estreita"
msgid "Edit Narrow Gauge Rail"
msgstr "Editar vía estreita"
-msgid "Types"
-msgstr "Tipos"
-
msgid "Monorail"
msgstr "Monoraíl"
@@ -14961,18 +15525,56 @@ msgstr "Vía de tren en desuso"
msgid "Edit Disused Railway"
msgstr "Editar vía de tren en desuso"
-msgid "Optional Types"
-msgstr "Tipos opcionais"
-
msgid "Abandoned Rail"
msgstr "Vía de tren abandonada"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Paso a nivel"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Paso a nivel peatonal"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Tipo de paso"
@@ -15072,13 +15674,11 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Mercancías"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Editar mercancías"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -15088,13 +15688,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Editar Estación"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pilona"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Editar pilona"
+msgstr ""
msgid "Parking"
msgstr "Aparcamento"
@@ -15111,12 +15709,12 @@ msgstr "ao aire libre"
msgid "underground"
msgstr "subterráneo"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Acceso"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr "Aparcamento disuasorio (Park & Ride)"
@@ -15144,9 +15742,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Capacidade"
@@ -15162,20 +15757,36 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Horario de apertura"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Lu-Vie 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Martes-Domingo 08:00-15:00;Sabado 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr ""
@@ -15324,6 +15935,9 @@ msgstr "Estación de carga"
msgid "Edit Charging Station (for electric cars)"
msgstr "Editar estación de carga (para coches eléctricos)"
+msgid "Voltage"
+msgstr "Voltaxe"
+
msgid "Amperage"
msgstr "Amperaxe"
@@ -15345,6 +15959,12 @@ msgstr "Taller"
msgid "Edit Car Repair"
msgstr "Editar taller"
+msgid "Parts"
+msgstr "Partes"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Rodas"
@@ -15372,6 +15992,12 @@ msgstr "Alquiler"
msgid "Edit Car Rental"
msgstr "Editar alquiler de automóviles"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Compartindo"
@@ -15396,22 +16022,6 @@ msgstr "Servizos:"
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "si"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "marca"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "usado"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "non"
-
msgid "brand"
msgstr "marca"
@@ -15433,9 +16043,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Partes"
-
msgid "Clothes"
msgstr "Roupas"
@@ -15499,8 +16106,8 @@ msgstr "Editar alquiler de bicicletas"
msgid "Public Transport"
msgstr "Transporte público"
-msgid "Route"
-msgstr "Ruta"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Editar ruta"
@@ -15630,6 +16237,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15660,6 +16270,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banco"
@@ -15672,9 +16285,6 @@ msgstr "Cadeira de rodas"
msgid "limited"
msgstr "limitado"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15684,8 +16294,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Estación"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Editar Estación"
msgid "Building"
msgstr "Edificio"
@@ -15699,6 +16314,9 @@ msgstr "Editar boca de metro"
msgid "Ticket Machine"
msgstr "Máquina de tiquets"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Número de referencia"
@@ -15723,14 +16341,6 @@ msgstr "Tarxetas de afidelización ou de desconto"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Estación"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Editar Estación"
-
msgid "UIC-Reference"
msgstr "UIC-Referencia"
@@ -15779,8 +16389,8 @@ msgstr "Editar andén de autobús"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Editar parada de taxi"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Aeroporto"
@@ -15833,6 +16443,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Editar Terminal"
+msgid "Internet access"
+msgstr "Acceso a internet"
+
+msgid "wlan"
+msgstr "wlan"
+
+msgid "wired"
+msgstr "cableafo"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Acceso a internet gratuito"
+
msgctxt "airport"
msgid "Gate"
msgstr "Porta"
@@ -15855,21 +16480,6 @@ msgstr "Editar hotel"
msgid "Stars"
msgstr "Estrelas"
-msgid "Internet access"
-msgstr "Acceso a internet"
-
-msgid "wlan"
-msgstr "wlan"
-
-msgid "wired"
-msgstr "cableafo"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Acceso a internet gratuito"
-
msgid "Smoking"
msgstr "Fumadores"
@@ -16053,6 +16663,12 @@ msgstr "Club nocturno"
msgid "Edit Nightclub"
msgstr "Editar club nocturno"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turismo"
@@ -16074,9 +16690,15 @@ msgstr "Torre de vixía"
msgid "Information Office"
msgstr "Oficina de información"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Grado de detalle"
@@ -16089,6 +16711,9 @@ msgstr "rúa"
msgid "scheme"
msgstr "esquema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Mostrar área"
@@ -16128,6 +16753,9 @@ msgstr "...outro métodos de desprazamentos posibles"
msgid "Information Board"
msgstr "Panel informativo"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Tablón de anuncios"
@@ -16149,23 +16777,35 @@ msgstr "plantas"
msgid "Guidepost"
msgstr "Poste identificador"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Punto de información"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Descripción detallada"
msgid "Audioguide"
msgstr "Guia sonora"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Guia sonora a través de teléfono móvil?"
msgid "Phone number"
msgstr "Número de teléfono"
-msgid "Other Information Points"
-msgstr "Outros Puntos de Información"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Ocio"
@@ -16188,9 +16828,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "valado"
@@ -16215,8 +16852,17 @@ msgstr "sauna"
msgid "Edit Sauna"
msgstr "Editar Sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Zona de xogos"
@@ -16288,50 +16934,44 @@ msgstr "Gráficos"
msgid "Edit Artwork"
msgstr "Editar traballo artístico"
-msgid "Place of Worship"
-msgstr "Lugar de culto"
-
-msgid "Edit Place of Worship"
-msgstr "Editar lugar de culto"
-
-msgid "Religion"
-msgstr "Relixión"
+msgid "Recording Studio"
+msgstr "Estudio de grabación"
-msgid "bahai"
-msgstr "bahaísta"
+msgid "Edit Studio"
+msgstr "Editar Estudio"
-msgid "buddhist"
-msgstr "budista"
+msgid "audio"
+msgstr "son"
-msgid "christian"
-msgstr "cristian"
+msgid "video"
+msgstr "video"
-msgid "hindu"
-msgstr "hindú"
+msgid "Place of Worship"
+msgstr "Lugar de culto"
-msgid "jain"
-msgstr "jainista"
+msgid "Church"
+msgstr "Igrexa"
-msgid "jewish"
-msgstr "xudía"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "musulmá"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sijista"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "espiritualista"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoista"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarismo"
+msgid "church"
+msgstr ""
-msgid "zoroastrian"
-msgstr "zoroástrica"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Denominación"
@@ -16348,6 +16988,12 @@ msgstr "católico"
msgid "evangelical"
msgstr "evanxélico"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testigos de Xenoveva"
@@ -16360,6 +17006,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormón"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxo"
@@ -16375,79 +17024,182 @@ msgstr "protestante"
msgid "quaker"
msgstr "cuáquero"
-msgid "shia"
-msgstr "chiita"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "suní"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
-msgstr "Estudio de grabación"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Editar Estudio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
-msgid "audio"
-msgstr "son"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "Edificio público"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Editar edificio público"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Casa do Concello"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Editar Casa do Concello"
+msgid "shia"
+msgstr "chiita"
-msgid "Community Centre"
+msgid "sunni"
+msgstr "suní"
+
+msgid "Synagogue"
msgstr ""
-msgid "Embassy"
-msgstr "Embaixada"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Editar Embaixada"
+msgid "synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Xuzgado"
+msgid "conservative"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Editar xuzgado"
+msgid "reform"
+msgstr ""
-msgid "Prison"
-msgstr "Prisión"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Editar prisión"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Policía"
+msgid "theravada"
+msgstr ""
-msgid "Edit Police"
-msgstr "Editar policía"
+msgid "mahayana"
+msgstr ""
-msgid "Fire Station"
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Relixión"
+
+msgid "bahai"
+msgstr "bahaísta"
+
+msgid "jain"
+msgstr "jainista"
+
+msgid "sikh"
+msgstr "sijista"
+
+msgid "spiritualist"
+msgstr "espiritualista"
+
+msgid "taoist"
+msgstr "taoista"
+
+msgid "unitarian"
+msgstr "unitarismo"
+
+msgid "zoroastrian"
+msgstr "zoroástrica"
+
+msgid "Public Building"
+msgstr "Edificio público"
+
+msgid "Edit Public Building"
+msgstr "Editar edificio público"
+
+msgid "Town hall"
+msgstr "Casa do Concello"
+
+msgid "Edit Town hall"
+msgstr "Editar Casa do Concello"
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr "Embaixada"
+
+msgid "Edit Embassy"
+msgstr "Editar Embaixada"
+
+msgid "Courthouse"
+msgstr "Xuzgado"
+
+msgid "Edit Courthouse"
+msgstr "Editar xuzgado"
+
+msgid "Prison"
+msgstr "Prisión"
+
+msgid "Edit Prison"
+msgstr "Editar prisión"
+
+msgid "Police"
+msgstr "Policía"
+
+msgid "Edit Police"
+msgstr "Editar policía"
+
+msgid "Fire Station"
msgstr "Parque de bombeiros"
msgid "Edit Fire Station"
@@ -16495,6 +17247,12 @@ msgstr "Editar Autoescuela"
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Saúde"
@@ -16504,6 +17262,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Editar hospital"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Médicos"
@@ -16570,12 +17334,66 @@ msgstr "Veterinario"
msgid "Edit Veterinary"
msgstr "Editar veterinario"
-msgid "Note"
-msgstr "Nota"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "público"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Buzón de Correos"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Teléfono"
@@ -16585,6 +17403,30 @@ msgstr "Editar teléfono"
msgid "Telephone cards"
msgstr "Tarxetas telefónicas"
+msgid "Emergency Phone"
+msgstr "Teléfono de emerxencia"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Reloxo"
@@ -16594,31 +17436,37 @@ msgstr "Editar Reloxo"
msgid "Display"
msgstr "Pantalla"
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr "Asistencia técnica"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16646,8 +17494,8 @@ msgstr "Amosar humidade"
msgid "Recycling"
msgstr "Reciclaxe"
-msgid "Edit Recycling station"
-msgstr "Editar punto limpo"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Baterías"
@@ -16673,27 +17521,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Papeleiras"
-msgid "Edit Waste Basket"
-msgstr "Editar papeleiras"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Copia de seguranza"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
-msgid "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Numero de asentos"
@@ -16728,14 +17564,17 @@ msgstr "Editar apostadeiro de caza"
msgid "Height"
msgstr "Alto"
+msgctxt "height"
msgid "low"
-msgstr "baixa"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "media"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "total"
+msgstr ""
msgid "Hide"
msgstr "Agochar"
@@ -16743,11 +17582,11 @@ msgstr "Agochar"
msgid "Lock"
msgstr "Bloquear"
-msgid "Drinking Water"
-msgstr "Auga potable"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Editar auga potable"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Hidrante contra incendios"
@@ -16774,6 +17613,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16811,119 +17653,155 @@ msgstr "Estadio"
msgid "Edit Stadium"
msgstr "Editar estadio"
-msgid "select sport:"
-msgstr "escoller deporte:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "deporte"
+msgid "Sport"
+msgstr "Deportes"
+msgctxt "sport"
msgid "multi"
-msgstr "diversos"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "tiro con arco"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletismo"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "fútbol_americano"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "fútbol australiano"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "béisbol"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "baloncesto"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "bolos"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "fútbol_canadiense"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "piragua"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "escalada"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "Cricket con redes"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "ciclismo"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "carreira de cans"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "hípica"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "ximnasia"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hockey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "carreira de cabalos"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motor"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota vasca"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "raqueta"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "liga_rugby"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "rugby_union"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "tiro"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "monopatín"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "patinaxe"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "esquí"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "Fútbol"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "natación"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "tenis de mesa"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenis"
+msgstr ""
msgid "Sports Centre"
msgstr "Polideportivo"
@@ -16955,26 +17833,27 @@ msgstr "Mini golf"
msgid "Edit Miniature Golf"
msgstr "Editar mini golf"
-msgid "Sport"
-msgstr "Deportes"
-
msgid "Multi"
msgstr "Múltiple"
msgid "Edit Multi"
msgstr "Editar multi"
-msgid "type"
-msgstr "tipo"
-
+msgctxt "running"
msgid "pitch"
-msgstr "cancha de xogo"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "Polideportivo"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "Estadio"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16982,6 +17861,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "cancha de xogo"
+
+msgid "sports_centre"
+msgstr "Polideportivo"
+
+msgid "stadium"
+msgstr "Estadio"
+
msgid "10pin"
msgstr "Bowling"
@@ -17015,6 +17903,22 @@ msgstr "Editar piragüismo"
msgid "Edit Cycling"
msgstr "Editar ciclismo"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Carreiras de cans"
@@ -17027,11 +17931,36 @@ msgstr "Hípica"
msgid "Edit Equestrian"
msgstr "Editar hípica"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
-msgid "Horse Racing"
-msgstr "Carreira de cabalos"
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "lodazal"
+
+msgid "Horse Racing"
+msgstr "Carreira de cabalos"
msgid "Edit Horse Racing"
msgstr "Editar carreiras de caballos"
@@ -17046,7 +17975,7 @@ msgid "Skating"
msgstr "Patinaxe"
msgid "Edit Skating"
-msgstr "Editar patinaxe"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17090,36 +18019,54 @@ msgstr "parque de snowboard"
msgid "Difficulty"
msgstr "Dificultade"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "novato"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "fácil"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "avanzado"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "experto"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "fora da pista"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17162,19 +18109,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17313,6 +18256,18 @@ msgstr "Aeródromo de Aeromodelismo"
msgid "Edit Model Aerodrome"
msgstr "Editar Aeródromo de Aeromodelismo"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "Coches RC"
@@ -17325,60 +18280,134 @@ msgstr "Feito polo home"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "casa"
+msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Entrada"
+
+msgid "Edit Entrance"
+msgstr "Editar unha entrada"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Torre"
@@ -17394,9 +18423,6 @@ msgstr "comunicación"
msgid "observation"
msgstr "observación"
-msgid "Height (meters)"
-msgstr "Altura (en metros)"
-
msgid "Flagpole"
msgstr ""
@@ -17606,41 +18632,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
+
+msgid "Monitoring:"
+msgstr ""
+
+msgid "Weather"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Water level"
msgstr ""
-msgid "Measurement"
+msgid "Tide Level"
msgstr ""
-msgid "particulate_matter"
+msgid "Traffic"
msgstr ""
-msgid "seismic"
-msgstr "sísmico"
+msgid "Air Quality"
+msgstr ""
-msgid "water_level"
+msgid "Noise"
msgstr ""
-msgid "weather"
-msgstr "o tempo"
+msgid "GPS Signals"
+msgstr ""
-msgid "Recording"
-msgstr "Gravando"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "manually"
-msgstr "manualmente"
+msgid "Galileo Signals"
+msgstr ""
-msgid "automated"
-msgstr "automatico"
+msgid "Radiation"
+msgstr ""
-msgid "remote"
-msgstr "remota"
+msgid "Seismic Activity"
+msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17649,8 +18701,8 @@ msgstr "Vértice xeodésico"
msgid "Edit Survey Point"
msgstr "Editar vértice xeodésico"
-msgid "Surveillance"
-msgstr "Cámara de vixilancia"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Editar cámara de vixilancia"
@@ -17661,12 +18713,102 @@ msgstr "interiores"
msgid "outdoor"
msgstr "exteriores"
-msgid "public"
-msgstr "público"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "tenda"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "Potencia"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Xerador de enerxía"
@@ -17718,139 +18860,258 @@ msgstr "vento"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "fotovoltaico"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Central eléctrica"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Editar central eléctrica"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Subestación eléctrica"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Editar subestación eléctrica"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
-msgstr "Liña de referencia"
+msgid "solar photovoltaic"
+msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "solar thermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Torre de electricidade"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Editar torre de electricidade"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
-msgstr "Referencia da torre"
+msgid "steam_turbine"
+msgstr ""
-msgid "Pole"
-msgstr "Poste"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
-msgid "Edit Power Pole"
-msgstr "Editar poste eléctrico"
+msgid "stellarator"
+msgstr ""
-msgid "Pole reference"
-msgstr "Referencia de poste"
+msgid "nuclear fusion"
+msgstr ""
-msgid "Power Line"
-msgstr "Tendido eléctrico"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Editar tendido eléctrico"
+msgid "vertical_axis"
+msgstr ""
-msgid "Line type"
-msgstr "Tipo de liña"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
-msgctxt "Power Line"
-msgid "line"
-msgstr "liña"
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Subestación eléctrica"
+
+msgid "Edit Power Sub Station"
+msgstr "Editar subestación eléctrica"
+
+msgid "Line reference"
+msgstr "Liña de referencia"
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "baixa"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Torre de electricidade"
+
+msgid "Edit Power Tower"
+msgstr "Editar torre de electricidade"
+
+msgid "Tower reference"
+msgstr "Referencia da torre"
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr "Poste"
+
+msgid "Edit Power Pole"
+msgstr "Editar poste eléctrico"
+
+msgid "Pole reference"
+msgstr "Referencia de poste"
+
+msgid "Power Line"
+msgstr "Tendido eléctrico"
+
+msgid "Edit Power Line"
+msgstr "Editar tendido eléctrico"
+
+msgid "Line type"
+msgstr "Tipo de liña"
+
+msgid "line"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "liña de baixa tensión"
+msgstr ""
msgid "Amount of Cables"
msgstr "Cantidade de cables"
@@ -17957,11 +19218,11 @@ msgstr "Quiosco"
msgid "Edit Kiosk"
msgstr "Editar quiosco"
-msgid "Baker"
-msgstr "Panadeiro"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Editar panadeiro"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Carnicería"
@@ -17972,8 +19233,8 @@ msgstr "Editar carnicería"
msgid "Seafood"
msgstr "Pescado"
-msgid "Edit Seafood"
-msgstr "Editar Pescado"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Deli (Boa comida)"
@@ -17993,14 +19254,20 @@ msgstr "Mercado"
msgid "Edit Marketplace"
msgstr "Editar Mercado"
+msgid "Organic"
+msgstr "Orgánico"
+
msgid "Greengrocer"
msgstr "Verdurería"
msgid "Edit Greengrocer"
msgstr "Editar Verdurería"
-msgid "Organic"
-msgstr "Orgánico"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -18071,8 +19338,8 @@ msgstr ""
msgid "Fabric"
msgstr "Fabrica"
-msgid "Edit Fabric"
-msgstr "Editar Fabrica"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Electronica"
@@ -18092,14 +19359,14 @@ msgstr "Editar tenda de electrónica"
msgid "Mobile Phone"
msgstr "Telefonía Móbil"
-msgid "Edit Mobile Phone"
-msgstr "Editar Telefonía Móbil"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Aspiradora"
-msgid "Edit Vacuum Cleaner"
-msgstr "Editar Aspiradora"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hifi"
@@ -18107,9 +19374,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Editar tenda HIfi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Vídeo"
msgid "Edit Video Shop"
msgstr "Editar tenda de vídeos"
@@ -18135,6 +19401,12 @@ msgstr "Editar cambio de moeda"
msgid "Edit Automated Teller Machine"
msgstr "Editar Caixeiro"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Grandes Almacéns"
@@ -18171,11 +19443,32 @@ msgstr "Joyería"
msgid "Edit Jewelry"
msgstr "Editar Joyería"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "budista"
+
+msgid "christian"
+msgstr "cristian"
+
+msgid "hindu"
+msgstr "hindú"
+
+msgid "jewish"
+msgstr "xudía"
+
+msgid "muslim"
+msgstr "musulmá"
+
msgid "Erotic"
msgstr "Erotica"
-msgid "Edit Erotic"
-msgstr "Editar Erotica"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Floristería"
@@ -18204,8 +19497,8 @@ msgstr "Editar ferretería"
msgid "Paint"
msgstr "Pintura"
-msgid "Edit Paint"
-msgstr "Editar Pintura"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Mobles"
@@ -18216,20 +19509,20 @@ msgstr "Editar Moblería"
msgid "Kitchen"
msgstr "Cociña"
-msgid "Edit Kitchen"
-msgstr "Editar cociña"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Cortinas"
-msgid "Edit Curtain"
-msgstr "Editar Cortinas"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Marco"
-msgid "Edit Frames"
-msgstr "Editar Marcos"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Papelería"
@@ -18249,6 +19542,12 @@ msgstr "Librería"
msgid "Edit Book Store"
msgstr "Editar librería"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Axencia de viaxes"
@@ -18258,8 +19557,8 @@ msgstr "Editar axencia de viaxes"
msgid "Musical Instrument"
msgstr "Intrumentos Musicais"
-msgid "Edit Musical Instruments"
-msgstr "Editar Intrumentos Musicais"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Xoguetes"
@@ -18339,6 +19638,9 @@ msgstr "xoguetes"
msgid "vouchers"
msgstr "Bonos"
+msgid "Note"
+msgstr "Nota"
+
msgid "Geography"
msgstr "Xeografía"
@@ -18468,6 +19770,12 @@ msgstr "Pico"
msgid "Edit Peak"
msgstr "Editar pico"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glaciar"
@@ -18507,26 +19815,35 @@ msgstr "Árbore"
msgid "Edit Tree"
msgstr "Editar árbore"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Nome botánico"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Madeira"
msgid "Edit Wood"
msgstr "Editar bosque"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "conífera"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "decíduos"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "mixto"
msgid "Forest"
msgstr "Monte"
@@ -18534,15 +19851,6 @@ msgstr "Monte"
msgid "Edit Forest Landuse"
msgstr "Editar zona forestal"
-msgid "coniferous"
-msgstr "conífera"
-
-msgid "deciduous"
-msgstr "decíduos"
-
-msgid "mixed"
-msgstr "mixto"
-
msgid "Grassland"
msgstr ""
@@ -18618,6 +19926,12 @@ msgstr "Prado"
msgid "Edit Meadow Landuse"
msgstr "Editar o uso do prado"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Viñedo"
@@ -18672,8 +19986,8 @@ msgstr "Terra de recreo"
msgid "Edit Recreation Ground Landuse"
msgstr "Editar o uso da área de recreo"
-msgid "Residential area"
-msgstr "Área residencial"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Editar o uso da área residencial"
@@ -18684,6 +19998,9 @@ msgstr "Camposanto (para os cementerios próximos ás igrexas)"
msgid "Edit Graveyard"
msgstr "Editar camposanto"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemiterio"
@@ -18759,6 +20076,33 @@ msgstr "Editar o uso da área da canteira"
msgid "Annotation"
msgstr "Anotación"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Editar enderezos"
@@ -18777,30 +20121,6 @@ msgstr "Nome da cidade"
msgid "Country code"
msgstr "Código do país"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolar enderezos"
@@ -18819,6 +20139,18 @@ msgstr "pares"
msgid "alphabetic"
msgstr "alfabético"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18981,26 +20313,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "camiño"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "pé"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "senda"
+msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
-msgstr "desvío"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Descición de símbolo"
@@ -19047,21 +20408,24 @@ msgstr "próximo punto de parada"
msgid "backward halt point"
msgstr "anterior punto de parada"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr "membro"
-msgid "Associated street"
-msgstr "Rúa asociada"
+msgid "Associated Street"
+msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
msgstr ""
+msgid "house"
+msgstr "casa"
+
msgid "Street"
msgstr "Rúa"
@@ -19083,7 +20447,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19179,18 +20543,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "ponte"
msgid "deprecated"
msgstr "obsoleto"
+msgid "bicycle"
+msgstr "bicicleta"
+
+msgid "foot"
+msgstr "pé"
+
msgid "horse"
msgstr "cabalo"
@@ -19200,8 +20573,11 @@ msgstr "barreira"
msgid "motorroad"
msgstr "Autovía"
-msgid "highway_track"
-msgstr "Autopista"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "servizos"
@@ -19209,11 +20585,11 @@ msgstr "servizos"
msgid "ford"
msgstr "vado"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "Punto de acceso de emerxencias"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "ribeira"
@@ -19230,7 +20606,10 @@ msgstr "rápidos"
msgid "railwaypoint"
msgstr "Punto ferroviario de referencia"
-msgid "railyard"
+msgid "raildashed"
+msgstr ""
+
+msgid "railyard"
msgstr ""
msgid "otherrail"
@@ -19245,29 +20624,29 @@ msgstr "vía morta"
msgid "aeroway"
msgstr "aerovía"
-msgid "aeroway_dark"
-msgstr "pista (oscuro)"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "pista (claro)"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "pista fácil"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "pista intermedia"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "pista avanzada"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "pista para expertos"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "pista de estilo libre"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "pista para iniciados"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "enerxía"
@@ -19287,20 +20666,20 @@ msgstr "porto deportivo"
msgid "amenity"
msgstr "servizos"
-msgid "amenity_traffic"
-msgstr "tráfico de ocio"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "equipamento lumínico"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "auga (claro)"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "saúde"
-msgid "shop"
-msgstr "tenda"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotel"
@@ -19365,9 +20744,6 @@ msgstr "monte"
msgid "woodarea"
msgstr "área forestal"
-msgid "mud"
-msgstr "lodazal"
-
msgid "beach"
msgstr "praia"
@@ -19377,11 +20753,14 @@ msgstr "ruta"
msgid "boundary"
msgstr "fronteira"
+msgid "sport"
+msgstr "deporte"
+
msgid "place"
msgstr "lugar"
-msgid "tiger_data"
-msgstr "datos_TIGER"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "enderezo"
@@ -19395,9 +20774,6 @@ msgstr "Poboación/Cidade"
msgid "One Way"
msgstr "Sentido único"
-msgid "Church"
-msgstr "Igrexa"
-
msgid "Fuel Station"
msgstr "Gasolinera"
@@ -19425,6 +20801,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19470,10 +20849,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19485,7 +20894,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19503,7 +20912,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19620,19 +21029,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:building without building"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:ref without ref"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:population without population"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19651,13 +21171,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19666,23 +21222,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19693,142 +21258,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Ruas NRW Geofabrik.de de Renania del Norte-Westfalia"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19844,16 +21458,16 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italia"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicilia - Italia"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Italia"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
@@ -19867,46 +21481,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -19927,90 +21544,150 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OSM Export"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
msgstr ""
+msgid "Port:"
+msgstr "Porto:"
+
+msgid "refresh the port list"
+msgstr "Actualizar a lista de portos"
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Connection Error."
+msgstr "Erro de Conexión."
+
+msgid "configure the connected DG100"
+msgstr "Configurar o DG100 conectado"
+
+msgid "delete data after import"
+msgstr "eliminar datos despois de importar"
+
msgid "Columbus V-900 CSV Files"
msgstr "Ficheiros CSV de Columbus V-900"
@@ -20212,6 +21889,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20233,14 +21922,8 @@ msgstr ""
msgid "Time"
msgstr "Tempo"
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr "Automático"
-
-msgid "Fixed value"
-msgstr ""
+msgid "Tracks"
+msgstr "Camiños"
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -20502,9 +22185,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Actualizando propiedades de {0} obxeto"
@@ -20526,6 +22215,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Propriedades da Capa"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "Importar Imaxe"
@@ -20604,9 +22296,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20691,7 +22395,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20963,15 +22667,6 @@ msgstr "Numero de casa:"
msgid "Street Name:"
msgstr "Nome da Calle:"
-msgid "Increment"
-msgstr "Incremento"
-
-msgid "Decrement"
-msgstr "Decremento"
-
-msgid "Numbers:"
-msgstr "Números:"
-
msgid "Big buildings mode"
msgstr ""
@@ -21150,6 +22845,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21168,12 +22866,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "símbolo"
@@ -21311,6 +23003,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21330,6 +23025,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Engadir «source=...» aos elementos?"
@@ -21410,48 +23108,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr "Leste"
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21504,19 +23160,75 @@ msgstr "Engadir unha nova capa"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr ""
msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr "Leste"
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21542,7 +23254,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21594,7 +23309,7 @@ msgstr ""
msgid "Color Schemes"
msgstr "Esquemas de cores"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21639,6 +23354,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr "{0} nodos intermedios para descargar."
@@ -21711,6 +23429,71 @@ msgstr "Nova ferramenta..."
msgid "Install"
msgstr "Instalar"
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Só posición"
@@ -21747,30 +23530,12 @@ msgstr "Desactivar captura de datos se a velocidade cae por debaixo de"
msgid "Disable data logging if distance falls below"
msgstr "Desactivar captura de datos se a distancia cae por debaixo de"
-msgid "Unknown logFormat"
-msgstr "Formato de log descoñecido"
-
-msgid "Port:"
-msgstr "Porto:"
-
-msgid "refresh the port list"
-msgstr "Actualizar a lista de portos"
-
-msgid "Configure"
-msgstr "Configurar"
+msgid "Unknown logFormat"
+msgstr "Formato de log descoñecido"
msgid "Configure Device"
msgstr "Configurar o Dispositivo"
-msgid "Connection Error."
-msgstr "Erro de Conexión."
-
-msgid "configure the connected DG100"
-msgstr "Configurar o DG100 conectado"
-
-msgid "delete data after import"
-msgstr "eliminar datos despois de importar"
-
msgid "Importing data from device."
msgstr "Importar datos do dispositivo"
@@ -22170,6 +23935,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22417,12 +24185,6 @@ msgstr "Imaxes Importadas"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Ficheiros de imaxe (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr "Cargar conxunto de imaxes como unha nova capa"
-
msgid "Import vector graphics"
msgstr "Importar gráficos vectoriais"
@@ -22432,18 +24194,15 @@ msgstr "Escala:"
msgid "unit(s) = "
msgstr "unidade(s)= "
-msgid "Import..."
-msgstr "Importar..."
-
-msgid "Import vector graphics."
-msgstr "Importar gráficos vectoriais."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Debuxos SVG (*.svg)"
-
msgid "Importing..."
msgstr "Importando..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -22806,9 +24565,6 @@ msgstr "Auto-Centrar"
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -22863,9 +24619,34 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html> Unha parte baseada na relación de membros foi copiada a todas as "
+"rutas.<br>Debería verificar esto e corrixilo cando sexa necesario.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Unha relación de membros foi copiada a todas as rutas..<br>Debería "
+"verificar esto e corrixilo cando sexa necesario.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Introduza unha clave para a etiqueta, p.e. "
+"<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Introduza un valor para a etiqueta, p.e. <strong><tt>check "
+"members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr ""
@@ -22908,6 +24689,15 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
+msgid "Download from Overpass API ..."
+msgstr ""
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr ""
@@ -22920,15 +24710,6 @@ msgstr ""
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Convertir a un multipolígono"
-
-msgid "Convert to multipolygon."
-msgstr "Convertir a un multipolígono."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Unha das vias seleccionadas xa é parte de outro multipoligono."
-
msgid "About Plugin"
msgstr "Sobre o complemento"
@@ -23063,9 +24844,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -23090,12 +24868,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23244,6 +25031,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23260,6 +25050,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23496,14 +25297,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Produciuse un erro: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Non foi posíbel crear un novo fallo. Resultou {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"A cabeceira conten varios valores que non poden ser asignados nunha soa cadea"
-
msgid "Process queue"
msgstr "Procesar a cola"
@@ -23558,18 +25351,6 @@ msgstr ""
msgid "Close: "
msgstr "Pechar: "
-msgid "New issue"
-msgstr "Novo fallo"
-
-msgid "Create issue"
-msgstr "Crear fallo"
-
-msgid "Describe the problem precisely"
-msgstr "Describa o problema coa maior precisión"
-
-msgid "Create: "
-msgstr "Crear: "
-
msgid "Open in browser"
msgstr ""
@@ -23627,6 +25408,9 @@ msgstr "Executable de firefox"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23834,9 +25618,6 @@ msgstr "Importar un ficheiro PDF."
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr "Importar un ficheiro PDf"
-
msgid " {0} objects so far"
msgstr ""
@@ -23916,7 +25697,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -24070,6 +25869,9 @@ msgstr "Nada no portapapéis"
msgid "The clipboard data is not an image"
msgstr "Os datos do portapapéis non son os de unha imaxe"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -24091,6 +25893,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24384,9 +26189,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Camiños"
-
msgid "Tracks in this GPX file:"
msgstr "Camiños neste ficheiro GPX:"
@@ -24455,9 +26257,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24584,9 +26383,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24608,6 +26404,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24640,15 +26439,33 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Atención: elemento de comezo «{0}» no conxunto de cambios na posición "
+"({1},{2}). Omitindo."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Cambiar Propiedades"
+
msgid "Country preset:"
msgstr ""
@@ -24658,6 +26475,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24760,9 +26580,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Tipo de carretera"
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24878,6 +26695,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Non se puido respaldar o ficheiro. A excepción é: {0}"
+
msgid "Simplify Area"
msgstr ""
@@ -24938,19 +26758,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
-msgstr "Axuda en liña"
+msgid "SeaMap Editor"
+msgstr "Editor Seamap"
-msgid "Load"
-msgstr "Cargar"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "invisíbel"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor Seamap"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25088,6 +26908,9 @@ msgstr ""
msgid "Street name: "
msgstr "Nome da rúa: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Par/Impar"
@@ -25163,6 +26986,95 @@ msgstr "Trazador."
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -25178,9 +27090,6 @@ msgstr "Exportar firmas a XML..."
msgid "Save Signatures file"
msgstr "Gardar ficheiro de firmas"
-msgid "Download OSM"
-msgstr "Descargar OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25205,6 +27114,9 @@ msgstr "Cargar obxectos desde o servidor"
msgid "Download signed data"
msgstr "Descargar datos firmados"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25357,9 +27269,6 @@ msgstr "Asinado cancelado!"
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25996,19 +27905,19 @@ msgstr "Recuperar obxecto..."
msgid "Undelete object by id"
msgstr "Recuperar obxecto por id"
-msgid "Select if the data should be added into a new layer"
-msgstr "Escoller se os datos deben ser engadidos nunha nova capa"
+msgid "Undelete Object"
+msgstr "Recuperar Obxecto"
+
+msgid "Undelete object"
+msgstr "Recuperar Obxecto"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr "Recuperar Obxecto"
-
-msgid "Undelete object"
-msgstr "Recuperar Obxecto"
+msgid "Select if the data should be added into a new layer"
+msgstr "Escoller se os datos deben ser engadidos nunha nova capa"
msgid "Start undeleting"
msgstr "Comezar a recuperar"
@@ -26016,18 +27925,6 @@ msgstr "Comezar a recuperar"
msgid "Close dialog and cancel"
msgstr "Pecha o diálogo e cancela"
-msgid "Will get {0}"
-msgstr "Terase {0}"
-
-msgid "Looking for {0}"
-msgstr "Buscando {0}"
-
-msgid "Found {0}"
-msgstr "Atopado {0}"
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr "Engadir nodos nas interseccións"
@@ -26070,15 +27967,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -26200,18 +28088,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26389,9 +28265,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar Video"
@@ -26518,8 +28391,8 @@ msgstr "bucle"
msgid "mute"
msgstr "mutar"
-msgid "Scanned Map..."
-msgstr "Mapa escaneado..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26539,9 +28412,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Capa Walking Papers ({0}) in zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr ""
@@ -26674,9 +28544,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr "Engadir Etiqueta"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/he.po b/i18n/po/he.po
index ea1292f..4007248 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 13:38+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Hebrew <he at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:43+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:44+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,16 +165,14 @@ msgid "About JOSM..."
msgstr "אודות JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"אזהרה: פורמט URL בסיס לא צפוי של ה-API, סביר כי ההפניה מחדש לדפי המשתמש "
-"תיכשל. URL בסיס של ה-API הוא: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -203,6 +216,9 @@ msgstr "אין שכבות יעד"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -242,9 +258,6 @@ msgstr "כלי: {0}"
msgid "Please select at least four nodes."
msgstr "נא בחר לפחות ארבעה צמתים."
-msgid "Information"
-msgstr "מידע"
-
msgid "Align Nodes in Line"
msgstr "ישר את הצמתים בשורה"
@@ -269,6 +282,9 @@ msgstr "התנגשות"
msgid "download"
msgstr "הורד"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "הקודם"
@@ -278,6 +294,9 @@ msgstr "הבא"
msgid "Nothing selected to zoom to."
msgstr "לא נבחר פריט להתקרבות."
+msgid "Information"
+msgstr "מידע"
+
msgid "Zoom to {0}"
msgstr "התקרב אל {0}"
@@ -332,9 +351,9 @@ msgid ""
msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "שלב {0} דרכים"
@@ -390,18 +409,37 @@ msgstr "מחק"
msgid "Delete selected objects."
msgstr "מחק את הפריטים הנבחרים."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "פזר צמתים"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "פזר את הצמתים הנבחרים במרחקים שווים לאורך קו"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "הורד מ-OSM..."
msgid "Download map data from the OSM server."
msgstr "הורד נתוני מפה משרת ה-OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה "
+"רוצה<br>להמשיך?</html>"
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -496,6 +534,9 @@ msgstr "היסטוריה"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "הצג היסטורית מידע אודות דרכי, דמתי ויחוסי OSM"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -609,7 +650,7 @@ msgid "Joined overlapping areas"
msgstr "חבר אזורים חופפים"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -759,8 +800,8 @@ msgid "Merge nodes into the oldest one."
msgstr "מזג את הצמתים לישנים ביותר."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -917,8 +958,8 @@ msgid "Download Data"
msgstr "הורד מידע"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -945,12 +986,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -968,9 +1005,6 @@ msgstr "יישר"
msgid "Usage"
msgstr "שימוש"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1077,6 +1111,15 @@ msgstr "שנה גם את שם הקובץ"
msgid "Could not rename file ''{0}''"
msgstr "לא ניתן לשנות את שם הקובץ ''{0}''"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1128,9 +1171,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1192,6 +1232,9 @@ msgstr "דו\"ח מצב"
msgid "Copy to clipboard and close"
msgstr "העתק ללוח הגזירים וסגור"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "סגור"
@@ -1266,13 +1309,13 @@ msgid ""
msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1361,6 +1404,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "בטל"
@@ -1385,9 +1449,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1583,6 +1644,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "הרצה איטית יותר"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "מוריד נתוני GPS"
@@ -1592,6 +1656,18 @@ msgstr "הורדו נתוני GPX"
msgid "Markers from {0}"
msgstr "סמנים מהמיקום {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "מוריד נתונים"
@@ -1611,6 +1687,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "מוריד {0} מ-{1} (נותרו {2})"
@@ -1661,25 +1762,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1824,6 +1906,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1848,8 +1933,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1865,6 +1950,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2273,6 +2361,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2436,13 +2527,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2451,6 +2542,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2469,8 +2563,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2556,6 +2649,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2592,10 +2688,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2618,8 +2714,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2725,6 +2821,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2785,8 +2884,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2816,11 +2915,11 @@ msgstr "החל את השינויים שנבחרו"
msgid "Do not apply changes"
msgstr "אל תחל את השינויים"
-msgid "Please select which property changes you want to apply."
-msgstr "בחר אילו שינויי תכונות אתה רוצה להחיל."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "מאפיינים של "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr ""
@@ -2840,6 +2939,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2870,18 +2972,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2890,8 +2992,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2899,13 +3001,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2919,8 +3019,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2950,11 +3050,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "לא ידוע"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3107,8 +3206,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3215,7 +3313,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3234,6 +3332,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3250,9 +3351,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3293,6 +3391,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "כתובות"
@@ -3317,6 +3418,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3376,15 +3486,15 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "נקודות כפולות"
msgid "This test checks that there are no nodes at the very same location."
msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3452,6 +3562,24 @@ msgstr "נקודות דרך כפולות"
msgid "Checks for ways with identical consecutive nodes."
msgstr "מחפש דרכים עם נקודות עוקבות זהות."
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3521,6 +3649,12 @@ msgstr "נקודות עם אותו שם"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3578,13 +3712,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3616,11 +3750,11 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr "מבחן זה מחפש דרכים עם שמות דומים שעלולים לנבוע משגיאות כתיב."
-msgid "Properties checker :"
-msgstr "בודק תכונות:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "תוסף זה מחפש שגיאות במפתחות וערכים של תכונות."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr ""
@@ -3755,8 +3889,8 @@ msgstr "השתמש בברירת המחדל לקובץ בודק האיות"
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
-msgstr "תקן תכונות"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "לא יכול למצוא את סוג האלמנט"
@@ -3830,6 +3964,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr "מבחן זה בודק אם דרכים שאמורות ליהיות מעגליות אינן סגורות."
+msgid "Unclosed way"
+msgstr "דרך לא סגורה"
+
msgid "natural type {0}"
msgstr ""
@@ -3860,9 +3997,6 @@ msgstr "בניין"
msgid "area"
msgstr "שטח"
-msgid "Unclosed way"
-msgstr "דרך לא סגורה"
-
msgid "Unconnected ways"
msgstr ""
@@ -3887,10 +4021,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "מבחן זה מחפש נקודות ללא תוויות שאינן חלק מדרך."
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3953,23 +4087,6 @@ msgstr "קו חוף הפוך: האדמה לא בצד שמאל"
msgid "Reversed land: land not on left side"
msgstr "אדמה הפוכה: האדמה לא בצד שמאל"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4073,7 +4190,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr "מוריד את \"המסר היומי\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4275,9 +4392,24 @@ msgstr "תצוגה"
msgid "Tools"
msgstr "כלים"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "בחירה"
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4293,10 +4425,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "שמע"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4305,6 +4449,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4364,6 +4511,9 @@ msgstr "(אין עצם)"
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "השכבה אינה ברשימה."
@@ -4391,27 +4541,14 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
+msgid "{0} ({1} ms)"
msgstr ""
-msgid "true: the property is explicitly switched on"
+msgid ""
+"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
msgstr ""
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
-msgid "{0} ({1} ms)"
-msgstr ""
-
-msgid ""
-"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
-msgstr ""
-
-msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
+msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr ""
msgid "Details..."
@@ -4691,6 +4828,9 @@ msgstr "> תחתית"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "העתק את האלמנטים הנבחרים שלי לסוף רשימת האלמנטים הממוזגים"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -4698,6 +4838,9 @@ msgstr ""
"העתק את האלמנטים הנבחרים שלי לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
"הממוזגים"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -4705,14 +4848,23 @@ msgstr ""
"העתק את האלמנטים הנבחרים שלי אחרי האלמנט הנבחר הראשון ברשימת האלמנטים "
"הממוזגים"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "העתק את האלמנט הנבחר שלהם לתחילת רשימת האלמנטים הממוזגים"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -4720,6 +4872,9 @@ msgstr ""
"העתק את האלמנטים הנבחרים שלהם לפני האלמנט הנבחר הראשון ברשימת האלמנטים "
"הממוזגים"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4736,8 +4891,8 @@ msgstr ""
msgid "Up"
msgstr "מעלה"
-msgid "Move up the selected elements by one position."
-msgstr "העלה את האלמנט הנבחר מקום אחד"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "מטה"
@@ -4788,14 +4943,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "נקודה"
@@ -5045,14 +5192,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5573,6 +5720,9 @@ msgstr "הצג/הסתר"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5656,6 +5806,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "סוג עצם:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "בחר את סוג עצם ה-OSM"
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "יחסים"
@@ -5677,9 +5854,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "יחסים: {0}"
-msgid "Selection"
-msgstr "בחירה"
-
msgid "Open a selection list window."
msgstr "פתח חלון רשימת בחירה."
@@ -5704,18 +5878,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "בחירה: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5733,6 +5895,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "מחברים"
@@ -5750,8 +5924,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5777,9 +5950,6 @@ msgstr "פתח חלון תקינות נתונים."
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "התמקד בבעיה"
-
msgid "Fix"
msgstr "תקן"
@@ -5924,9 +6094,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6211,8 +6378,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6277,35 +6444,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "תכונות\\חברויות"
+msgid "Discardable key: selection Background"
+msgstr ""
+
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "תכונות לעצמים שנבחרו."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<שונה>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "חבר ב"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "תכונות: {0} \\ חברויות: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "תכונות \\ חברויות"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "מחק את המפתח הנבחר בכל הפריטים"
-msgid "Delete Properties"
-msgstr "מחק מאפיינים"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "שנה יחס"
@@ -6319,13 +6498,13 @@ msgstr "באמת מחק את הבחירה מהיחס {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6404,12 +6583,6 @@ msgstr[1] "שנה תכונות של עד {0} עצמים"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6439,9 +6612,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6479,7 +6658,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6539,6 +6718,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6794,6 +6976,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "סימניות"
@@ -6860,9 +7061,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6929,21 +7127,8 @@ msgstr ""
msgid "Download object"
msgstr "הורד עצם"
-msgid "Object type:"
-msgstr "סוג עצם:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "בחר את סוג עצם ה-OSM"
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr ""
+msgid "Start downloading"
+msgstr "התחל להוריד"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6953,23 +7138,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "התחל להוריד"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7066,7 +7237,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7165,6 +7336,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7252,7 +7426,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7271,6 +7445,12 @@ msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7337,8 +7517,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7413,8 +7592,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7428,8 +7607,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7644,12 +7822,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7658,6 +7830,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7673,6 +7861,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7680,8 +7883,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7793,9 +7996,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7805,6 +8005,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7821,7 +8024,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7967,7 +8170,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7997,7 +8200,7 @@ msgstr "גירסה {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8113,6 +8316,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8150,6 +8356,9 @@ msgstr "טען מחדש משטחים פגומים"
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8350,9 +8559,6 @@ msgstr "מחלץ מיקומי GPS מ-EXIF"
msgid "Starting directory scan"
msgstr "מתחיל סריקת ספרייה"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "קורא תמונות..."
@@ -8371,6 +8577,9 @@ msgstr "נמצא קובץ null בתיקייה {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "תמונות בעלות גאותגיות"
@@ -8428,6 +8637,12 @@ msgstr "הבאה"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "מרכז תצוגה"
@@ -8498,9 +8713,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8513,7 +8725,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8540,15 +8755,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה "
-"רוצה<br>להמשיך?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -8678,14 +8895,10 @@ msgstr "היתה שגיאה בניסיון להציג את הכתובת לסמן
msgid "(URL was: "
msgstr "(הכתובת היתה: "
-msgid "Error displaying URL"
-msgstr "שגיאה בהצגת URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8700,7 +8913,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8710,8 +8923,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8931,7 +9143,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8997,6 +9209,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9054,9 +9272,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9303,6 +9518,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "שלט רחוק"
@@ -9431,6 +9649,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9473,6 +9697,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "בודק תקינות נתונים"
@@ -9523,19 +9750,10 @@ msgstr "חפש: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
+msgid "Export selected items"
msgstr ""
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9553,40 +9771,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
+msgstr ""
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "shortcut"
msgstr ""
-msgid "Current value is default."
+msgid "color"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "toolbar"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "imagery"
msgstr ""
-msgid "Select Setting Type:"
+msgid "Reset preferences"
msgstr ""
-msgid "Simple"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List"
+msgid "Load profile"
msgstr ""
-msgid "List of lists"
+msgid "Save {0} profile"
msgstr ""
-msgid "List of maps"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Add setting"
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9610,6 +9837,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9666,6 +9926,9 @@ msgstr "צייר נקודות וירטואליות במצב הנבחר"
msgid "Draw inactive layers in other color"
msgstr "צייר שכבות לא פעילות בצבע שונה"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9719,6 +9982,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10000,7 +10268,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10169,6 +10443,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10232,7 +10512,7 @@ msgstr "הגדרות מפה"
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10490,40 +10770,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10576,8 +10856,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10586,20 +10866,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10681,14 +10966,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr "מנוטרל"
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10732,32 +11011,37 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "שנה עצם {0}"
+msgstr[1] "שנה {0} עצמים"
+
+msgid "Nothing selected!"
+msgstr "כלום לא נבחר!"
+
+msgid "Selection unsuitable!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Apply Preset"
msgstr ""
-msgid "More information about this feature"
-msgstr "עוד מידע על הכלי הזה"
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -10765,6 +11049,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "עוד מידע על הכלי הזה"
+
msgid "Available roles"
msgstr ""
@@ -10780,59 +11067,61 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "מאפייני רשות:"
-msgid "Use preset ''{0}'' of group ''{1}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Use preset ''{0}''"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Unknown type: {0}"
-msgstr "סוג לא ידוע: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
-msgstr "שגיאה בניתוח {0}: "
-
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "שנה עצם {0}"
-msgstr[1] "שנה {0} עצמים"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
-msgstr "כלום לא נבחר!"
+msgid "Unknown type: {0}"
+msgstr "סוג לא ידוע: {0}"
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
-msgstr "שנה תכונות"
-
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "שגיאה בניתוח {0}: "
+
msgid "Search preset"
msgstr ""
@@ -10848,6 +11137,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10877,6 +11174,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10907,7 +11247,7 @@ msgid "Contacting OSM Server..."
msgstr "מתחבר לשרת OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10947,28 +11287,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11065,6 +11403,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11080,12 +11421,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11164,8 +11513,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "יבוא NMEA הסתיים בהצלחה"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "יבוא NMEA נכשל!"
@@ -11263,35 +11612,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11301,8 +11626,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11329,10 +11654,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11343,9 +11665,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11367,6 +11686,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11416,8 +11738,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11560,6 +11882,9 @@ msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11578,6 +11903,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11602,16 +11936,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11623,6 +11960,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11637,6 +11982,15 @@ msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
msgid "Remote Control has been asked to load data from the API."
msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11667,19 +12021,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11701,11 +12055,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11775,13 +12141,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11924,10 +12290,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11942,22 +12308,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12026,8 +12391,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12042,9 +12406,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12366,17 +12745,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12387,9 +12760,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12421,9 +12837,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
msgstr ""
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12748,6 +13178,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12827,6 +13262,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12928,9 +13367,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12986,6 +13422,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13010,9 +13449,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13038,9 +13474,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13077,6 +13510,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13123,9 +13561,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr "רחובות"
@@ -13210,6 +13645,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "אגרה"
+
msgid "Motorway Link"
msgstr ""
@@ -13300,6 +13738,50 @@ msgstr "מגורים"
msgid "Edit Residential Street"
msgstr "ערוך רחוב מגורים"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "כן"
+
+msgid "no"
+msgstr "לא"
+
+msgid "destination"
+msgstr "יעד"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13318,10 +13800,10 @@ msgstr ""
msgid "Service"
msgstr "שירות"
-msgid "Edit Serviceway"
-msgstr "ערוך דרך שירות"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13333,6 +13815,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "מפרץ חנייה"
@@ -13360,18 +13845,12 @@ msgstr "כיכר"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "כן"
-
msgid "Road Restrictions"
msgstr "הגבלות דרך"
msgid "Edit Road Restrictions"
msgstr "ערוך הגבלות דרך"
-msgid "Toll"
-msgstr "אגרה"
-
msgid "No exit (cul-de-sac)"
msgstr "דרך ללא מוצא"
@@ -13381,9 +13860,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "יעד"
-
msgid "delivery"
msgstr ""
@@ -13393,15 +13869,15 @@ msgstr ""
msgid "private"
msgstr "פרטי"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "חקלאי"
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "לא"
-
msgid "official"
msgstr ""
@@ -13447,6 +13923,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "רכב ציבורי"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "מהירות מינימלית (קמ\"ש)"
@@ -13531,6 +14010,9 @@ msgstr "ערוך גשר"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13635,21 +14117,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13665,10 +14156,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13704,7 +14195,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13773,12 +14264,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "טלפון חירום"
+msgid "Drinking Water"
+msgstr "מי שתיה"
msgid "Traffic Signal"
msgstr "רמזור"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "סוג מעבר חציה"
@@ -13794,15 +14291,6 @@ msgstr "אי"
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13824,6 +14312,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "עצור"
@@ -13833,6 +14330,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13842,10 +14342,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr "מעבר חציה"
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13878,9 +14375,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13914,20 +14408,44 @@ msgstr ""
msgid "Barriers"
msgstr "מחסומים"
-msgid "Bollard"
-msgstr ""
+msgid "Block"
+msgstr "מחסום"
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr "תנועה מותרת:"
-msgid "Cycle Barrier"
+msgid "Material"
msgstr ""
-msgid "Block"
-msgstr "מחסום"
+msgid "stone"
+msgstr ""
+
+msgid "Bollard"
+msgstr ""
+
+msgid "Edit Bollard"
+msgstr ""
+
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "Cycle Barrier"
+msgstr ""
+
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr ""
@@ -13938,6 +14456,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "דוקרנים"
@@ -13959,19 +14480,34 @@ msgstr "ערוך ביקורת גבולות"
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13980,23 +14516,52 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "חומה"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "חומת עיר"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
-msgstr "כניסה"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "ערוך כניסה"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "שער"
@@ -14028,12 +14593,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14091,6 +14671,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14100,6 +14683,12 @@ msgstr "נחל"
msgid "Edit Stream"
msgstr "ערוך נחל"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "תעלה"
@@ -14139,9 +14728,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14175,6 +14761,21 @@ msgstr ""
msgid "Edit Water"
msgstr "ערוך מים"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "אדמה"
@@ -14256,18 +14857,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "אופניים"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14340,7 +14946,10 @@ msgstr "צבאי"
msgid "tourism"
msgstr "תיירות"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14364,10 +14973,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14379,9 +14991,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14424,18 +15033,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14535,11 +15182,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14551,11 +15196,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14574,12 +15217,12 @@ msgstr ""
msgid "underground"
msgstr ""
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "גישה"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14607,9 +15250,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14625,19 +15265,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "שעות פתיחה"
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14787,6 +15443,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14808,6 +15467,12 @@ msgstr "תיקונים"
msgid "Edit Car Repair"
msgstr "ערוך תיקוני רכבים"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14835,6 +15500,12 @@ msgstr "השכרה"
msgid "Edit Car Rental"
msgstr "ערוך השכרת רכב"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "שיתוף"
@@ -14859,22 +15530,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14896,9 +15551,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14962,7 +15614,7 @@ msgstr "ערוך השכרת אופניים"
msgid "Public Transport"
msgstr "תחבורה ציבורית"
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15093,6 +15745,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15123,6 +15778,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "ספסל"
@@ -15135,9 +15793,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15147,9 +15802,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "מבנה"
@@ -15162,6 +15822,9 @@ msgstr "ערוך כניסת רכבת תחתית"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15186,14 +15849,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15242,8 +15897,8 @@ msgstr ""
msgid "Taxi"
msgstr "מונית"
-msgid "Edit Taxi station"
-msgstr "ערוך תחנת מוניות"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "שדה תעופה"
@@ -15296,6 +15951,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "מסוף"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -15318,21 +15988,6 @@ msgstr ""
msgid "Stars"
msgstr ""
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "מסוף"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -15516,6 +16171,12 @@ msgstr "מועדון לילה"
msgid "Edit Nightclub"
msgstr "ערוך מועדון לילה"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "תיירות"
@@ -15537,9 +16198,15 @@ msgstr "מגדל תצפית"
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "מפה"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15552,6 +16219,9 @@ msgstr "רחוב"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15591,6 +16261,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15612,7 +16285,13 @@ msgstr ""
msgid "Guidepost"
msgstr ""
-msgid "Information Terminal"
+msgid "Edit Guidepost"
+msgstr ""
+
+msgid "Information Terminal"
+msgstr ""
+
+msgid "Edit Information Terminal"
msgstr ""
msgid "Closer description"
@@ -15621,13 +16300,19 @@ msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15651,9 +16336,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15678,7 +16360,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15751,49 +16442,43 @@ msgstr "יצירת אומנות"
msgid "Edit Artwork"
msgstr "ערוך יצירת אומנות"
-msgid "Place of Worship"
-msgstr "מקום תפילה"
-
-msgid "Edit Place of Worship"
-msgstr "ערוך מקום תפילה"
+msgid "Recording Studio"
+msgstr ""
-msgid "Religion"
-msgstr "דת"
+msgid "Edit Studio"
+msgstr ""
-msgid "bahai"
-msgstr "בהאי"
+msgid "audio"
+msgstr ""
-msgid "buddhist"
-msgstr "בודהיסט"
+msgid "video"
+msgstr ""
-msgid "christian"
-msgstr "נוצרי"
+msgid "Place of Worship"
+msgstr "מקום תפילה"
-msgid "hindu"
-msgstr "הינדי"
+msgid "Church"
+msgstr "כנסייה"
-msgid "jain"
+msgid "Edit Church"
msgstr ""
-msgid "jewish"
-msgstr "יהודי"
-
-msgid "muslim"
-msgstr "מוסלמי"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "סיקי"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "ספיריטואליסט"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "טאואיסט"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15811,6 +16496,12 @@ msgstr "קתולי"
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15823,6 +16514,9 @@ msgstr "מתודיסט"
msgid "mormon"
msgstr "מורמוני"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "אורתודוקסי"
@@ -15838,37 +16532,140 @@ msgstr "פרוטסטנטי"
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "שיעי"
msgid "sunni"
msgstr "סוני"
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "דת"
+
+msgid "bahai"
+msgstr "בהאי"
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr "סיקי"
+
+msgid "spiritualist"
+msgstr "ספיריטואליסט"
+
+msgid "taoist"
+msgstr "טאואיסט"
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15958,6 +16755,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "בריאות"
@@ -15967,6 +16770,12 @@ msgstr "בית חולים"
msgid "Edit Hospital"
msgstr "ערוך בית חולים"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "רופאים"
@@ -16033,12 +16842,66 @@ msgstr "וטרינרי"
msgid "Edit Veterinary"
msgstr "ערוך וטרינרי"
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr "תיבת דואר"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "טלפון"
@@ -16048,6 +16911,30 @@ msgstr "ערוך טלפון"
msgid "Telephone cards"
msgstr "כרטיסי טלפון"
+msgid "Emergency Phone"
+msgstr "טלפון חירום"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16057,31 +16944,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16109,8 +17002,8 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
-msgstr "ערוך תחנת מיחזור"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr ""
@@ -16136,27 +17029,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16191,12 +17072,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16206,11 +17090,11 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "מי שתיה"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "ערוך מי שתיה"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr ""
@@ -16237,6 +17121,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16274,119 +17161,155 @@ msgstr "איצטדיון"
msgid "Edit Stadium"
msgstr "ערוך איצטדיון"
-msgid "select sport:"
-msgstr "בחר ענף ספורט:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr "ספורט"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "קשתות"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "אתלטיקה"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "כדורגל אוסטרלי"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "כדור בסיס"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "כדורסל"
+msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "כדורת דשא"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "קנו"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "טיפוס"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "קריקט"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "מירוץ כלבים"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "גולף"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "התעמלות"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "הוקי"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "מירוץ סוסים"
+msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "סקייטבורד"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "סקייטים"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "סקי"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "כדורגל"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "שחייה"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "טניס שולחן"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "טניס"
+msgstr ""
msgid "Sports Centre"
msgstr "מרכז ספורט"
@@ -16418,26 +17341,27 @@ msgstr "מיני-גולף"
msgid "Edit Miniature Golf"
msgstr "ערוך מיני-גולף"
-msgid "Sport"
-msgstr "ספורט"
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "סוג"
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "מרכז ספורט"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "איצטדיון"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16445,6 +17369,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "מרכז ספורט"
+
+msgid "stadium"
+msgstr "איצטדיון"
+
msgid "10pin"
msgstr ""
@@ -16478,6 +17411,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr "ערוך רכיבה"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "מירוץ כלבים"
@@ -16490,9 +17439,34 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
msgstr ""
+msgid "mud"
+msgstr "בוץ"
+
msgid "Horse Racing"
msgstr "מירוץ סוסים"
@@ -16553,36 +17527,54 @@ msgstr "פארק שלג"
msgid "Difficulty"
msgstr "קושי"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "מתחילים"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "קל"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "מקצוענים"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16625,19 +17617,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16776,6 +17764,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16788,60 +17788,134 @@ msgstr "מעשה אדם"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "כניסה"
+
+msgid "Edit Entrance"
+msgstr "ערוך כניסה"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "מגדל"
@@ -16857,9 +17931,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17069,155 +18140,145 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
-msgstr ""
-
-msgid "Edit Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "particulate_matter"
+msgid "Monitoring:"
msgstr ""
-msgid "seismic"
+msgid "Weather"
msgstr ""
-msgid "water_level"
+msgid "Water level"
msgstr ""
-msgid "weather"
+msgid "Tide Level"
msgstr ""
-msgid "Recording"
+msgid "Traffic"
msgstr ""
-msgid "manually"
+msgid "Air Quality"
msgstr ""
-msgid "automated"
+msgid "Noise"
msgstr ""
-msgid "remote"
+msgid "GPS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr ""
-
-msgid "Survey Point"
+msgid "GLONASS Signals"
msgstr ""
-msgid "Edit Survey Point"
-msgstr ""
-
-msgid "Surveillance"
+msgid "Galileo Signals"
msgstr ""
-msgid "Edit Surveillance Camera"
+msgid "Radiation"
msgstr ""
-msgid "indoor"
+msgid "Seismic Activity"
msgstr ""
-msgid "outdoor"
+msgid "Recording:"
msgstr ""
-msgid "public"
+msgid "Automated"
msgstr ""
-msgid "Power"
+msgid "Manually"
msgstr ""
-msgid "Power Generator"
+msgid "Remote"
msgstr ""
-msgid "Edit Power Generator"
+msgid "Display:"
msgstr ""
-msgid "biofuel"
+msgid "Analog"
msgstr ""
-msgid "biogas"
+msgid "Digital"
msgstr ""
-msgid "biomass"
+msgid "Survey Point"
msgstr ""
-msgid "diesel"
+msgid "Edit Survey Point"
msgstr ""
-msgid "gasoline"
+msgid "Surveillance Camera"
msgstr ""
-msgid "geothermal"
+msgid "Edit Surveillance Camera"
msgstr ""
-msgid "hydro"
+msgid "indoor"
msgstr ""
-msgid "nuclear"
+msgid "outdoor"
msgstr ""
-msgid "osmotic"
+msgid "Zone"
msgstr ""
-msgid "solar"
+msgid "parking"
msgstr ""
-msgid "tidal"
+msgid "traffic"
msgstr ""
-msgid "waste"
-msgstr ""
+msgid "shop"
+msgstr "חנות"
-msgid "wave"
+msgid "bank"
msgstr ""
-msgid "wind"
+msgid "Camera"
msgstr ""
-msgid "Method"
+msgid "fixed"
msgstr ""
-msgid "anaerobic_digestion"
+msgid "panning"
msgstr ""
-msgid "combustion"
+msgid "dome"
msgstr ""
-msgid "dam"
+msgid "Mounted on"
msgstr ""
-msgid "fission"
+msgid "ceiling"
msgstr ""
-msgid "fusion"
+msgid "Direction in degrees"
msgstr ""
-msgid "gasification"
+msgid "Inclination in degrees"
msgstr ""
-msgid "photovoltaic"
+msgid "Height in meter (m)"
msgstr ""
-msgid "pumped-storage"
+msgid "Power"
msgstr ""
-msgid "pumping"
+msgid "Power Plant"
msgstr ""
-msgid "pyrolysis"
+msgid "Edit Power Plant"
msgstr ""
-msgid "run-of-the-river"
+msgid "Start date"
msgstr ""
-msgid "thermal"
+msgid "Output forms of energy"
msgstr ""
-msgid "Output forms of energy"
+msgid "(please add this information to the generators if possible)"
msgstr ""
msgid "electricity"
@@ -17256,88 +18317,333 @@ msgstr ""
msgid "vacuum"
msgstr ""
-msgid "battery charging"
+msgid "Power Generator"
msgstr ""
-msgid "Power Station"
-msgstr "תחנת כח"
+msgid "Edit Power Generator"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "ערוך תחנת כח"
+msgid "biofuel"
+msgstr ""
-msgid "Power Sub Station"
+msgid "biogas"
msgstr ""
-msgid "Edit Power Sub Station"
+msgid "biomass"
msgstr ""
-msgid "Line reference"
+msgid "diesel"
msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "gasoline"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "geothermal"
msgstr ""
-msgid "Power Tower"
-msgstr "עמוד חשמל"
+msgid "hydro"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "ערוך עמוד חשמל"
+msgid "nuclear"
+msgstr ""
-msgid "Tower reference"
+msgid "osmotic"
msgstr ""
-msgid "Pole"
+msgid "solar"
msgstr ""
-msgid "Edit Power Pole"
+msgid "tidal"
msgstr ""
-msgid "Pole reference"
+msgid "waste"
msgstr ""
-msgid "Power Line"
-msgstr "קו מתח"
+msgid "wave"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "ערוך קו מתח"
+msgid "wind"
+msgstr ""
-msgid "Line type"
+msgid "Method"
msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgctxt "generator method"
+msgid "anaerobic_digestion"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgctxt "generator method"
+msgid "barrage"
msgstr ""
-msgid "Amount of Cables"
+msgctxt "generator method"
+msgid "combustion"
msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
-msgid "single"
+msgctxt "generator method"
+msgid "fission"
msgstr ""
-msgid "double"
+msgctxt "generator method"
+msgid "fusion"
msgstr ""
-msgid "triple"
+msgctxt "generator method"
+msgid "gasification"
msgstr ""
-msgid "quad"
+msgid "biomass / waste"
msgstr ""
-msgid "Historic Places"
-msgstr "מקומות היסטורים"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
-msgid "Castle"
-msgstr "טירה"
+msgctxt "generator method"
+msgid "pyrolysis"
+msgstr ""
+
+msgctxt "generator method"
+msgid "run-of-the-river"
+msgstr ""
+
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
+msgid "thermal"
+msgstr ""
+
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
+
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
+
+msgid "Generator Type"
+msgstr ""
+
+msgid "combined_cycle"
+msgstr ""
+
+msgid "gas combustion"
+msgstr ""
+
+msgid "francis_turbine"
+msgstr ""
+
+msgid "gas_turbine"
+msgstr ""
+
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
+
+msgid "heat_pump"
+msgstr ""
+
+msgid "horizontal_axis"
+msgstr ""
+
+msgid "tidal steam / wind"
+msgstr ""
+
+msgid "kaplan_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr ""
+
+msgid "Edit Power Sub Station"
+msgstr ""
+
+msgid "Line reference"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "עמוד חשמל"
+
+msgid "Edit Power Tower"
+msgstr "ערוך עמוד חשמל"
+
+msgid "Tower reference"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr "קו מתח"
+
+msgid "Edit Power Line"
+msgstr "ערוך קו מתח"
+
+msgid "Line type"
+msgstr ""
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr ""
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+msgid "single"
+msgstr ""
+
+msgid "double"
+msgstr ""
+
+msgid "triple"
+msgstr ""
+
+msgid "quad"
+msgstr ""
+
+msgid "Historic Places"
+msgstr "מקומות היסטורים"
+
+msgid "Castle"
+msgstr "טירה"
msgid "Edit Castle"
msgstr "ערוך טירה"
@@ -17420,11 +18726,11 @@ msgstr "קיוסק"
msgid "Edit Kiosk"
msgstr "ערוך קיוסק"
-msgid "Baker"
-msgstr "מאפייה"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "ערוך מאפייה"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "קצבייה"
@@ -17435,7 +18741,7 @@ msgstr "ערוך קצבייה"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17456,13 +18762,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17534,7 +18846,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17555,13 +18867,13 @@ msgstr "ערוך חנות אלקטרוניקה"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17570,7 +18882,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17598,6 +18909,12 @@ msgstr "ערוך החלפת כסף"
msgid "Edit Automated Teller Machine"
msgstr "ערוך כספומט"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17634,10 +18951,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "בודהיסט"
+
+msgid "christian"
+msgstr "נוצרי"
+
+msgid "hindu"
+msgstr "הינדי"
+
+msgid "jewish"
+msgstr "יהודי"
+
+msgid "muslim"
+msgstr "מוסלמי"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17667,7 +19005,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17679,19 +19017,19 @@ msgstr "ערוך חנות רהיטים"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17712,6 +19050,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17721,7 +19065,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17802,6 +19146,9 @@ msgstr "צעצועים"
msgid "vouchers"
msgstr "שוברים"
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17931,6 +19278,12 @@ msgstr "פסגה"
msgid "Edit Peak"
msgstr "ערוך פסגה"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "קרחון"
@@ -17970,26 +19323,35 @@ msgstr "עץ"
msgid "Edit Tree"
msgstr "ערוך עץ"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "שם בוטני"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "חורש"
msgid "Edit Wood"
msgstr "ערוך חורש"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "מחטני"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "נשיר"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "מעורב"
msgid "Forest"
msgstr "יער"
@@ -17997,15 +19359,6 @@ msgstr "יער"
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr "מחטני"
-
-msgid "deciduous"
-msgstr "נשיר"
-
-msgid "mixed"
-msgstr "מעורב"
-
msgid "Grassland"
msgstr ""
@@ -18081,6 +19434,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "כרם"
@@ -18135,8 +19494,8 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
-msgstr "אזור מגורים"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr ""
@@ -18147,6 +19506,9 @@ msgstr "בית-קברות"
msgid "Edit Graveyard"
msgstr "ערוך בית-קברות"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "בית עלמין"
@@ -18222,6 +19584,33 @@ msgstr ""
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "ערוך כתובת"
@@ -18240,30 +19629,6 @@ msgstr "שם עיר"
msgid "Country code"
msgstr "קוד מדינה"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr ""
@@ -18282,6 +19647,18 @@ msgstr "זוגי"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18444,27 +19821,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "רגל"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18510,19 +19916,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18546,7 +19955,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18642,18 +20051,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "גשר"
msgid "deprecated"
msgstr "מיושן"
+msgid "bicycle"
+msgstr "אופניים"
+
+msgid "foot"
+msgstr "רגל"
+
msgid "horse"
msgstr "סוס"
@@ -18663,7 +20081,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18672,10 +20093,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18693,6 +20114,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18708,29 +20132,29 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
-msgstr "מסלול קל"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "מסלול בינוניים"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "מסלול מתקדמים"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
-msgstr "מסלול מתחילים"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "תחנת כח"
@@ -18750,20 +20174,20 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "בריאות"
-msgid "shop"
-msgstr "חנות"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "מלון"
@@ -18828,9 +20252,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "בוץ"
-
msgid "beach"
msgstr "חוף"
@@ -18840,10 +20261,13 @@ msgstr ""
msgid "boundary"
msgstr "גבול"
+msgid "sport"
+msgstr "ספורט"
+
msgid "place"
msgstr "מקום"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18858,9 +20282,6 @@ msgstr "כפר\\עיר"
msgid "One Way"
msgstr "חד סטרי"
-msgid "Church"
-msgstr "כנסייה"
-
msgid "Fuel Station"
msgstr "תחנת דלק"
@@ -18888,6 +20309,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18933,10 +20357,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18948,7 +20402,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18966,7 +20420,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19083,19 +20537,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "width without physical linear feature"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19114,13 +20679,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19129,19 +20730,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19156,142 +20766,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19330,46 +20989,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -19384,96 +21046,156 @@ msgstr ""
msgid "GRAFCAN - Canary Islands"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OSM Export"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
msgstr ""
+msgid "Port:"
+msgstr "פורט:"
+
+msgid "refresh the port list"
+msgstr "רענן את רשימת הפורטים"
+
+msgid "Configure"
+msgstr "קבע תצורה"
+
+msgid "Connection Error."
+msgstr "שגיאת התחברות."
+
+msgid "configure the connected DG100"
+msgstr "מגדיר את ה-DG100 המחובר"
+
+msgid "delete data after import"
+msgstr "מחק נתונים לאחר ייבוא"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19675,6 +21397,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19696,13 +21430,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19965,9 +21693,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19989,6 +21723,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20067,9 +21804,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20154,7 +21903,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20425,15 +22174,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20604,6 +22344,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20622,12 +22365,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20763,6 +22500,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20780,6 +22520,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20860,113 +22603,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
+msgstr "שנה מיקום"
+
+msgid "Set a new location for the next request"
+msgstr "קבע מיקום חדש לבקשה הבאה"
+
+msgid "Add a new municipality layer"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Commune"
msgstr ""
-msgid "East"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "I use the mouse"
+msgid "Departement"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Add new layer"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Refine georeferencing"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Reset cookie"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "(optional)"
+msgid "Save image as..."
msgstr ""
-msgid "Change location"
-msgstr "שנה מיקום"
+msgid "PNG files (*.png)"
+msgstr ""
-msgid "Set a new location for the next request"
-msgstr "קבע מיקום חדש לבקשה הבאה"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
-msgid "Add a new municipality layer"
+msgid "Export image (only raster images)"
msgstr ""
-msgid "Commune"
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image georeferencing"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Add new layer"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid "Enter cadastre east,north position"
msgstr ""
-msgid "Reset cookie"
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "East"
msgstr ""
-msgid "Save image as PNG"
+msgid "I use the mouse"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20992,7 +22749,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21042,7 +22802,7 @@ msgstr "מחק את הסכמה הנבחרת מהרשימה"
msgid "Color Schemes"
msgstr "סכמות צבעים"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21087,6 +22847,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21132,31 +22895,96 @@ msgstr ""
msgid "exttool:{0}"
msgstr ""
-msgid "External Tool: {0}"
+msgid "External Tool: {0}"
+msgstr ""
+
+msgid "Edit tool"
+msgstr ""
+
+msgid "Name:"
+msgstr ""
+
+msgid "CmdLine:"
+msgstr ""
+
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr "האם אתה בטוח?"
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
msgstr ""
-msgid "Edit tool"
+msgid "User {0} has left"
msgstr ""
-msgid "Name:"
+msgid "User {0} is mapping nearby"
msgstr ""
-msgid "CmdLine:"
+msgid "Users mapping nearby:"
msgstr ""
-msgid "External tools"
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
-msgstr "האם אתה בטוח?"
+msgid "Logout"
+msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21198,27 +23026,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr "פורט:"
-
-msgid "refresh the port list"
-msgstr "רענן את רשימת הפורטים"
-
-msgid "Configure"
-msgstr "קבע תצורה"
-
msgid "Configure Device"
msgstr "קבע תצורת מכשיר"
-msgid "Connection Error."
-msgstr "שגיאת התחברות."
-
-msgid "configure the connected DG100"
-msgstr "מגדיר את ה-DG100 המחובר"
-
-msgid "delete data after import"
-msgstr "מחק נתונים לאחר ייבוא"
-
msgid "Importing data from device."
msgstr "מייבא נתונים ממכשיר."
@@ -21614,6 +23424,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21861,12 +23674,6 @@ msgstr "תמונות מיובאות"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "קובצי תמונה (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "פתח תמונות עם ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "פתח סט תמונות כשכבה חדשה."
-
msgid "Import vector graphics"
msgstr ""
@@ -21876,16 +23683,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22251,9 +24055,6 @@ msgstr "מירכוז אוטומטי"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי באופן רצוף"
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22308,9 +24109,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22352,25 +24170,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22507,9 +24325,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22534,12 +24349,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22688,6 +24512,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22704,6 +24531,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22937,13 +24775,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "אירעה שגיאה: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "לא יכול ליצור תקלה חדשה. תוצאה: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22996,18 +24827,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "פריט חדש"
-
-msgid "Create issue"
-msgstr "צור פריט"
-
-msgid "Describe the problem precisely"
-msgstr "תאר את הבעיה בדיוק"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23066,6 +24885,9 @@ msgstr "קובץ הרצת פיירפוקס"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23273,9 +25095,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23355,7 +25174,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23509,6 +25346,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23530,6 +25370,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23823,9 +25666,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23894,9 +25734,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24023,9 +25860,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24047,6 +25881,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24079,15 +25916,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "שנה תכונות"
+
msgid "Country preset:"
msgstr ""
@@ -24097,6 +25950,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24199,9 +26055,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24317,6 +26170,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24377,19 +26233,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24527,6 +26383,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24602,6 +26461,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24617,9 +26565,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24641,6 +26586,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24793,9 +26741,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25421,7 +27366,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25429,10 +27377,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25441,18 +27386,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25495,15 +27428,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25625,18 +27549,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25814,9 +27726,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25943,7 +27852,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25963,9 +27872,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26098,9 +28004,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index e3dad24..3326ae0 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:44+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "जानकारी"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "जानकारी"
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr "मिटाएँ"
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "अज्ञात"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 4c09f6d..f105721 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-05 18:14+0000\n"
"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
"Language-Team: Croatian <hr at li.org>\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:57+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:58+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Otvaranje linka nije podržano na trenutnoj platformi (\"{0}\")"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -155,19 +170,14 @@ msgid "About JOSM..."
msgstr "O JOSM-u..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Upozorenje: Neočekivani format URL baze API-a. Preusmjeravanje na info ili "
-"povijest stranice za OSM objekte vjerojatno neće uspijeti. Osnovni URL za "
-"bazu API-a je:'' {0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"UPOZORENJE: neočekivani format API osnovnog URL-a. Preusmjeravanje na OSM "
-"korisničku stranicu hvjerojatno neće uspjeti.API osnovni URL je: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -214,6 +224,9 @@ msgstr "Nema ciljnog sloja"
msgid "Add imagery layer {0}"
msgstr "Dodaj slikovni sloj {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -255,9 +268,6 @@ msgstr "Alat: {0}"
msgid "Please select at least four nodes."
msgstr "Izaberite barem 4 točke"
-msgid "Information"
-msgstr "Informacije"
-
msgid "Align Nodes in Line"
msgstr "Poravnaj točke u liniju"
@@ -282,6 +292,9 @@ msgstr "Konflikt"
msgid "download"
msgstr "preuzimanje"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "prethodni"
@@ -291,6 +304,9 @@ msgstr "slijedeći"
msgid "Nothing selected to zoom to."
msgstr "Ništa nije izabrano za zoomiranje."
+msgid "Information"
+msgstr "Informacije"
+
msgid "Zoom to {0}"
msgstr "Zoomiraj do {0}"
@@ -347,9 +363,9 @@ msgstr ""
"smjer za neke od njih?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Ne mogu kombinirati puteve (Ne mogu se spojiti u jedan niz točaka)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "Kombiniraj {0} puteva"
@@ -404,18 +420,35 @@ msgstr "Obriši"
msgid "Delete selected objects."
msgstr "Obriši izabrane objekte."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distribuiraj točke"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribuiraj izabrane točke na jednake udaljenosti uz liniju."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Preuzimanje sa OSM..."
msgid "Download map data from the OSM server."
msgstr "Preuzmi karte sa OSM servera."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Preuzmi podatke"
+
msgid "Download object..."
msgstr "Preuzmi objekt..."
@@ -517,6 +550,9 @@ msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
"Prikaži povijesne informacije o OSM putevima, točkama ili relacijama."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "Povijest (web)"
@@ -640,11 +676,9 @@ msgid "Joined overlapping areas"
msgstr "Spojena preklapajuća područja"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Nekolkiko vaših puteva su djelovi relacija, koje su promijenjene. Molim "
-"verificirajte da to nepredstavlja neku pogrešku."
msgid "Fix tag conflicts"
msgstr "Popravi konflikte oznaka"
@@ -792,11 +826,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Spoji točke u najstariju"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Molim označi najmanje dvije točke za spojiti ili točku koja je blizu drugoj "
-"točci."
msgid "Abort Merging"
msgstr "Zaustavi spajanje"
@@ -972,11 +1004,9 @@ msgid "Download Data"
msgstr "Preuzimanje podataka"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Ne mogu otvoriti URL ''{0}'', jer nije dostupan odgovarajući zadatak "
-"za preuzimanje (download task) .</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1002,12 +1032,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -1028,9 +1054,6 @@ msgstr "Orthogonaliziraj"
msgid "Usage"
msgstr "Upotreba"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1147,6 +1170,15 @@ msgstr "Također preimenuj i datoteku"
msgid "Could not rename file ''{0}''"
msgstr "Nemogu preimenovati datoteku ''{0}''"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr "Suprotan smjer"
@@ -1199,9 +1231,6 @@ msgstr "Učitaj sesiju"
msgid "Load a session from file."
msgstr "Učitaj sesiju iz datoteke."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Datoteka sesije (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Otvori sesiju"
@@ -1267,6 +1296,9 @@ msgstr "Izvještaj o statusu"
msgid "Copy to clipboard and close"
msgstr "Kopiraj u međuspremnik (clipboard) i zatvori"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Zatvori"
@@ -1354,18 +1386,14 @@ msgstr ""
"sredini puta)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Relacija bazirana na ulozi je kopirana na sve nove puteve.<br>Trebali "
-"bi provjeriti ovo i ispraviti ako je potrebno.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Članstvo u relaciji je kopirano na sve nove puteve.<br>Trebali bi "
-"provjeriti ovo i ispraviti ako je potrebno.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Razdvoji put {0} u {1} dijelova"
@@ -1464,6 +1492,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Poništi"
@@ -1488,9 +1537,6 @@ msgstr "Ažuriraj podatke"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr "Preuzmi podatke"
-
msgid "Update modified"
msgstr "Ažuriraj promijenjeno"
@@ -1688,6 +1734,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Sporije naprijed"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Preuzimam GPS podatke"
@@ -1697,6 +1746,18 @@ msgstr "Preuzueti GPX podaci"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Preuzimam podatke"
@@ -1716,6 +1777,33 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Dogodio se {0} konflikt tijekom uvoza."
+msgstr[1] "Dogodilo se {0} konflikta tijekom uvoza."
+msgstr[2] "Dogodilo se {0} konflikta tijekom uvoza."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt tijekom preuzimanja"
+msgstr[1] "Konflikti tijekom preuzimanja"
+msgstr[2] "Konflikti tijekom preuzimanja"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Download {0} od {1} ({2} ostaje)"
@@ -1766,27 +1854,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Pogreške tijekom preuzimanja"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Dogodio se {0} konflikt tijekom uvoza."
-msgstr[1] "Dogodilo se {0} konflikta tijekom uvoza."
-msgstr[2] "Dogodilo se {0} konflikta tijekom uvoza."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt tijekom preuzimanja"
-msgstr[1] "Konflikti tijekom preuzimanja"
-msgstr[2] "Konflikti tijekom preuzimanja"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr "Greška tjekom preuzimanja"
@@ -1930,6 +1997,9 @@ msgstr "Poboljšaj točnost puta"
msgid "Improve Way Accuracy mode"
msgstr "Mod za povećanje točnosti puta"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1956,11 +2026,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Ne mogu dodati točku van Svijeta"
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Dodaj novu točku na put"
-msgstr[1] "Dodaj novu točku na {0} puta"
-msgstr[2] "Dodaj novu točku na {0} puteva"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr ""
@@ -1974,6 +2043,9 @@ msgstr "Paralelno"
msgid "Make parallel copies of ways"
msgstr "Napravi paralelne kopije puteva"
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2390,6 +2462,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "kombinatori"
@@ -2550,14 +2625,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
-msgstr "Očekivana verzija"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2565,6 +2640,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr "Očekivani raspon brojeva"
@@ -2583,11 +2661,8 @@ msgstr "Nedostaje parametar za XOR"
msgid "Missing operator for NOT"
msgstr "Nedostaje parametar za NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Upozorenje: automatski skračujem vrijednost tagu ''{0}'' na obrisanom "
-"objektu {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2675,6 +2750,9 @@ msgstr[0] "Dodan {0} objekt"
msgstr[1] "Dodani {0} objekta"
msgstr[2] "Dodani {0} objekta"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Promijeni točku {0}"
@@ -2711,11 +2789,11 @@ msgstr "Ukloni \"{0}\" za {1} objekte"
msgid "Set {0}={1} for {2} objects"
msgstr "Postavi {0}={1} za {2} objekta"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "izbrisana {0} svojstva za {1} objekta"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Postavi {0} svojstva za {1} objekta"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Zamijeni \"{0}\" sa \"{1}\" za"
@@ -2740,11 +2818,9 @@ msgid "Double conflict"
msgstr "Dupli konflikt"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Upozorenje: Sloj ''{0}'' više ne postoji. Nije moguće ukloniti konflikt za "
-"objekt ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Dodaj konflikt za ''{0}''"
@@ -2857,6 +2933,9 @@ msgstr[2] "Očišćeno {0} objekta"
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotiraj {0} točku"
@@ -2919,8 +2998,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2950,10 +3029,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2974,6 +3053,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -3004,18 +3086,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -3024,8 +3106,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -3033,13 +3115,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -3053,8 +3133,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3084,11 +3164,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "NEPOZNATO"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3244,8 +3323,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3352,7 +3430,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3371,6 +3449,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3387,9 +3468,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3428,6 +3506,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3452,6 +3533,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3511,13 +3601,13 @@ msgstr " ili "
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3587,6 +3677,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3656,6 +3764,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3713,13 +3827,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3751,10 +3865,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3888,7 +4002,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3963,6 +4077,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3993,9 +4110,6 @@ msgstr "zgrada"
msgid "area"
msgstr "površina"
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -4020,10 +4134,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -4086,23 +4200,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4206,7 +4303,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4402,9 +4499,24 @@ msgstr ""
msgid "Tools"
msgstr "Alati"
+msgid "More tools"
+msgstr "Više alata"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Odabir"
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4420,10 +4532,22 @@ msgstr "Uredi alatnu traku"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4432,6 +4556,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4491,6 +4618,9 @@ msgstr ""
msgid "User:"
msgstr "Korisnik:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4518,19 +4648,6 @@ msgstr "U pozadini"
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4818,29 +4935,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4855,7 +4990,7 @@ msgstr ""
msgid "Up"
msgstr "Gore"
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4907,14 +5042,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Točka"
@@ -5167,14 +5294,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr "Vrijednost:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5696,6 +5823,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5779,6 +5909,36 @@ msgstr ""
msgid "No"
msgstr "Ne"
+msgid "Object type:"
+msgstr "Tip objekta:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "pomiješano"
+
+msgid "Choose the OSM object type"
+msgstr "Odaberi tip OSM objekta"
+
+msgid "Object ID:"
+msgstr "ID objekta:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Unesi ID objekta koji se treba preuzeti"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"ID objekta može biti odvojen razmakom ili zarezom. <br/> Primjeri:. <b> <ul> "
+"<li> 1 2 5 </li> <li> 1,2,5 </li> </ul> <br/> </b> u kombiniranom režimu, "
+"specifični objekti kao što su ovi: <b> W123, N110, W12, R15 </b> <br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relacije"
@@ -5800,9 +5960,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relacije: {0}"
-msgid "Selection"
-msgstr "Odabir"
-
msgid "Open a selection list window."
msgstr ""
@@ -5827,18 +5984,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr "Uvijek sakriven"
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5855,6 +6000,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr ""
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr "Uvijek sakriven"
+
msgid "Authors"
msgstr "Autori"
@@ -5873,8 +6030,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5900,9 +6056,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Zumiraj na problem"
-
msgid "Fix"
msgstr ""
@@ -6047,9 +6200,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6334,8 +6484,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6400,34 +6550,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: foreground"
+msgstr ""
+
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr "Pozicija"
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6442,13 +6604,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6528,12 +6690,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr "Dodaj vrijednost?"
@@ -6563,9 +6719,15 @@ msgstr ""
msgid "Recently added tags"
msgstr "Nedavno dodani tagovi"
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr "Ponovno koristi ovaj tag"
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6604,7 +6766,7 @@ msgstr "Relacija je izbriana"
msgid "Downloading relation {0}"
msgstr "Preuzimam relaciju {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6665,6 +6827,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6920,6 +7085,25 @@ msgstr "put je spojen na slijedećeg člana relacije"
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6985,9 +7169,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -7054,21 +7235,8 @@ msgstr ""
msgid "Download object"
msgstr "Preuzmi objekt"
-msgid "Object type:"
-msgstr "Tip objekta:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "pomiješano"
-
-msgid "Choose the OSM object type"
-msgstr "Odaberi tip OSM objekta"
-
-msgid "Object ID:"
-msgstr "ID objekta:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Unesi ID objekta koji se treba preuzeti"
+msgid "Start downloading"
+msgstr "Započni preuzimanje"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7078,28 +7246,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Odaberite, ako članovi relacije također trebaju biti preuzeti"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"ID objekta može biti odvojen razmakom ili zarezom. <br/> Primjeri:. <b> <ul> "
-"<li> 1 2 5 </li> <li> 1,2,5 </li> </ul> <br/> </b> u kombiniranom režimu, "
-"specifični objekti kao što su ovi: <b> W123, N110, W12, R15 </b> <br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Započni preuzimanje"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Unesen pogrešan ID\n"
-"Ne mogu preuzeti objekt."
-
msgid "Class Type"
msgstr ""
@@ -7196,7 +7345,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7295,6 +7444,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7394,7 +7546,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7413,6 +7565,12 @@ msgstr "Dajte kratak komentar za promjene koje uploadirate:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7479,8 +7637,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7555,8 +7712,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7570,8 +7727,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7787,12 +7943,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7801,6 +7951,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7816,6 +7982,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7823,8 +8004,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7936,9 +8117,6 @@ msgstr "Relacija ''{0}'' je već izbrisana. Preskaćem objekt u uploadanju."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "Objekt ''{0}'' je već izbrisana. Preskaćem objekt u uploadanju."
-msgid "Warning: {0}"
-msgstr "Upozorenje: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Uploadam {0} objekt..."
@@ -7949,6 +8127,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7965,7 +8146,7 @@ msgstr "Označi objekte za uploadanje"
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8116,7 +8297,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8146,7 +8327,7 @@ msgstr "verzija {0}"
msgid "Merging layers"
msgstr "Spajam slojeve"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8263,6 +8444,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326 i Mercator projekcije su podržane"
@@ -8300,6 +8484,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8496,9 +8683,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8517,6 +8701,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8575,6 +8762,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8641,9 +8834,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8656,7 +8846,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8683,12 +8876,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8817,14 +9014,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8839,7 +9032,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8849,8 +9042,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9070,7 +9262,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9136,6 +9328,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9193,9 +9391,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9442,6 +9637,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9570,6 +9768,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9612,6 +9816,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9662,19 +9869,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
+msgid "Export selected items"
msgstr ""
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9692,40 +9890,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
+msgstr ""
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "shortcut"
msgstr ""
-msgid "Current value is default."
+msgid "color"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "toolbar"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "imagery"
msgstr ""
-msgid "Select Setting Type:"
+msgid "Reset preferences"
msgstr ""
-msgid "Simple"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List"
+msgid "Load profile"
msgstr ""
-msgid "List of lists"
+msgid "Save {0} profile"
msgstr ""
-msgid "List of maps"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Add setting"
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9749,6 +9956,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9805,6 +10045,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9858,6 +10101,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10139,7 +10387,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10308,6 +10562,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10371,7 +10631,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10629,40 +10889,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10715,8 +10975,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10725,20 +10985,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10820,14 +11085,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10871,31 +11130,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10904,6 +11168,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10919,57 +11186,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10987,6 +11256,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -11016,6 +11293,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11046,7 +11366,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11086,28 +11406,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11202,6 +11520,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11217,12 +11538,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11301,7 +11630,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11400,46 +11729,22 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11466,10 +11771,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11480,9 +11782,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11504,6 +11803,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11553,8 +11855,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11697,6 +11999,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11715,6 +12020,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11739,16 +12053,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11760,6 +12077,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11774,6 +12099,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11804,19 +12138,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11838,11 +12172,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Datoteka sesije (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11912,13 +12258,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12061,10 +12407,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12079,22 +12425,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12163,8 +12508,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12179,9 +12523,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12503,17 +12862,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12524,9 +12877,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12558,9 +12954,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12883,6 +13293,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12962,6 +13377,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13063,9 +13482,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13121,6 +13537,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13145,9 +13564,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13173,9 +13589,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13212,6 +13625,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13258,9 +13676,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13345,6 +13760,9 @@ msgstr "Nasip"
msgid "Lit"
msgstr "Rasvjeta"
+msgid "Toll"
+msgstr "Cestarina (Toll)"
+
msgid "Motorway Link"
msgstr "Spojna cesta autocesti"
@@ -13435,6 +13853,50 @@ msgstr "Ulica"
msgid "Edit Residential Street"
msgstr "Uredu ulicu"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Tip ceste"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "Da"
+
+msgid "no"
+msgstr "Ne"
+
+msgid "destination"
+msgstr "destinacija (odredište)"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Stambena zona"
@@ -13453,10 +13915,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13468,6 +13930,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13495,18 +13960,12 @@ msgstr "Kružni tok (rotor)"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "Da"
-
msgid "Road Restrictions"
msgstr "Cestovna ograničenja"
msgid "Edit Road Restrictions"
msgstr "Uredi cestovna ograničenja"
-msgid "Toll"
-msgstr "Cestarina (Toll)"
-
msgid "No exit (cul-de-sac)"
msgstr "Slijepa ulica"
@@ -13516,9 +13975,6 @@ msgstr ""
msgid "General Access"
msgstr "Opći pristup"
-msgid "destination"
-msgstr "destinacija (odredište)"
-
msgid "delivery"
msgstr "Dostava"
@@ -13528,15 +13984,15 @@ msgstr "dopustivo (pristanak vlasnika)"
msgid "private"
msgstr "privatno"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "Ne"
-
msgid "official"
msgstr "službeno"
@@ -13582,6 +14038,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. brzina (km/h)"
@@ -13666,6 +14125,9 @@ msgstr "Uredi most"
msgid "viaduct"
msgstr "vijadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13770,20 +14232,29 @@ msgstr ""
msgid "Visibility"
msgstr "Vidljivost"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "izvrsno"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "dobro"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "srednje dobro"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "loše"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "grozno"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Invalidska kolica"
@@ -13800,11 +14271,11 @@ msgstr "Staza isključivo za konje"
msgid "Edit Bridleway"
msgstr "Uredi stazu isključivo za konje"
-msgid "Cycle Lane"
-msgstr "Biciklistiška traka"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Uredi biciklističku traku"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Biciklistička staza"
@@ -13839,8 +14310,8 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
-msgstr "Uredi cestu"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Cesta"
@@ -13908,12 +14379,18 @@ msgstr "Odmaralište"
msgid "Edit Rest Area"
msgstr "Uredi odmaralište"
-msgid "Emergency Phone"
-msgstr "Telefon za hitne slučajeve"
+msgid "Drinking Water"
+msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Vrsta pješačkog peijelaza"
@@ -13929,15 +14406,6 @@ msgstr ""
msgid "unmarked"
msgstr "neoznačen"
-msgid "Cross on horseback"
-msgstr "Prolaz za jahače konja"
-
-msgid "Cross by bicycle"
-msgstr "Prolaz za bisikliste"
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13959,6 +14427,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr "Prolaz za bisikliste"
+
+msgid "Cross on horseback"
+msgstr "Prolaz za jahače konja"
+
msgid "Stop"
msgstr "Stop"
@@ -13968,6 +14445,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mali kružni tok (rotor)"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Smjer"
@@ -13977,10 +14457,7 @@ msgstr "u smjeru kazaljke na satu"
msgid "Pedestrian Crossing"
msgstr "Pješački prijelaz"
-msgid "Edit Crossing"
-msgstr "Uredi križanje"
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14013,9 +14490,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -14049,19 +14523,43 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Prepreke (Barriers)"
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr ""
-msgid "Cycle Barrier"
-msgstr "Biciklistička prepreka (Cycle Barrier)"
+msgid "Material"
+msgstr ""
-msgid "Block"
+msgid "stone"
+msgstr ""
+
+msgid "Bollard"
+msgstr ""
+
+msgid "Edit Bollard"
+msgstr ""
+
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "Cycle Barrier"
+msgstr "Biciklistička prepreka (Cycle Barrier)"
+
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -14073,6 +14571,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -14094,19 +14595,34 @@ msgstr ""
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14115,22 +14631,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14163,12 +14708,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14226,6 +14786,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14235,6 +14798,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14274,9 +14843,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14310,6 +14876,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14391,18 +14972,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14475,7 +15061,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14499,10 +15088,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14514,9 +15106,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14559,18 +15148,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14670,11 +15297,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14686,11 +15311,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14709,10 +15332,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14742,9 +15365,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14760,19 +15380,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14922,6 +15558,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14943,6 +15582,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14970,6 +15615,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14994,22 +15645,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15031,9 +15666,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -15097,7 +15729,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15228,6 +15860,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15258,6 +15893,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15270,9 +15908,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15282,9 +15917,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15297,6 +15937,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15321,14 +15964,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15377,7 +16012,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15431,41 +16066,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15651,6 +16286,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15672,9 +16313,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15687,6 +16334,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15726,6 +16376,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15747,22 +16400,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15786,9 +16451,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15813,19 +16475,28 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
msgstr ""
-msgid "Playground"
+msgid "Edit Horse riding"
msgstr ""
-msgid "Edit Playground"
+msgid "Brothel"
msgstr ""
-msgid "Picnic Site"
+msgid "Edit Brothel"
msgstr ""
-msgid "Edit Picnic Site"
+msgid "Playground"
+msgstr ""
+
+msgid "Edit Playground"
+msgstr ""
+
+msgid "Picnic Site"
+msgstr ""
+
+msgid "Edit Picnic Site"
msgstr ""
msgid "Fireplace"
@@ -15886,49 +16557,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15946,6 +16611,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15958,6 +16629,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15973,37 +16647,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -16093,6 +16870,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -16102,6 +16885,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -16168,12 +16957,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16183,6 +17026,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr "Telefon za hitne slučajeve"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16192,31 +17059,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16244,7 +17117,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16271,27 +17144,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16326,12 +17187,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16341,10 +17205,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16372,6 +17236,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16409,117 +17276,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16553,33 +17456,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16613,6 +17526,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16625,7 +17554,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16688,36 +17642,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16760,19 +17732,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16911,6 +17879,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16923,60 +17903,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16992,9 +18046,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17204,41 +18255,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17247,7 +18324,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17259,12 +18336,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17316,88 +18483,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17409,6 +18679,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17424,6 +18709,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17442,11 +18730,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17555,10 +18841,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17570,7 +18856,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17591,13 +18877,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17669,7 +18961,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17690,13 +18982,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17705,7 +18997,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17733,6 +19024,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17769,10 +19066,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17802,7 +19120,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17814,19 +19132,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17847,6 +19165,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17856,7 +19180,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17937,6 +19261,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -18066,6 +19393,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -18105,24 +19438,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -18132,15 +19474,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18216,6 +19549,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18270,7 +19609,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18282,6 +19621,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18357,46 +19699,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
msgstr ""
-msgid "RS"
+msgid "Street name"
msgstr ""
-msgid "US"
+msgid "City name"
+msgstr ""
+
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18417,6 +19762,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18579,27 +19936,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18645,19 +20031,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18681,7 +20070,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18777,18 +20166,27 @@ msgstr "putevi koji prolaze ispod mosta"
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr "putevi koji prolaze kroz tunel"
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "most"
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18798,7 +20196,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18807,10 +20208,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18828,6 +20229,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18843,28 +20247,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18885,19 +20289,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18963,9 +20367,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18975,10 +20376,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18993,9 +20397,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -19023,6 +20424,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19068,10 +20472,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19083,7 +20517,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19101,7 +20535,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19218,19 +20652,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "map_type without information=map"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19249,13 +20794,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19264,19 +20845,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19291,142 +20881,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19465,148 +21104,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19810,6 +21512,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19831,13 +21545,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20100,9 +21808,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20124,6 +21838,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20202,9 +21919,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20289,7 +22018,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20560,15 +22289,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20739,6 +22459,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20757,12 +22480,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20898,6 +22615,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20915,6 +22635,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20995,113 +22718,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
+msgstr "Dodaj novi sloj"
+
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Refine georeferencing"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Reset cookie"
msgstr ""
-msgid "(optional)"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Change location"
+msgid "Save image as..."
msgstr ""
-msgid "Set a new location for the next request"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Add a new municipality layer"
+msgid "GeoTiff files (*.tif)"
msgstr ""
-msgid "Commune"
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
-msgstr "Dodaj novi sloj"
+msgid "Image georeferencing"
+msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
msgstr ""
-msgid "Save image as PNG"
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21127,7 +22864,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21177,7 +22917,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21222,6 +22962,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21294,64 +23037,111 @@ msgstr ""
msgid "Install"
msgstr ""
-msgid "Position only"
+msgid "Public"
msgstr ""
-msgid "Position, Time, Date, Speed"
+msgid "Could not get server response, check logs"
msgstr ""
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Failed to login as {0}:"
msgstr ""
-msgid "A By Time"
+msgid "The server did not return user ID"
msgstr ""
-msgid "A By Distance"
+msgid "Failed to send message:"
msgstr ""
-msgid "B By Time"
+msgid "Failed to get messages as {0}:"
msgstr ""
-msgid "B By Distance"
+msgid "GeoChat"
msgstr ""
-msgid "C By Time"
+msgid "Open GeoChat panel"
msgstr ""
-msgid "C By Distance"
+msgid "Zoom in to see messages"
msgstr ""
-msgid "Data Logging Format"
+msgid "Login"
msgstr ""
-msgid "Disable data logging if speed falls below"
+msgid "Enable autologin"
msgstr ""
-msgid "Disable data logging if distance falls below"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
msgstr ""
-msgid "Unknown logFormat"
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
+msgid "Position only"
+msgstr ""
+
+msgid "Position, Time, Date, Speed"
+msgstr ""
+
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr ""
+
+msgid "A By Time"
+msgstr ""
+
+msgid "A By Distance"
+msgstr ""
+
+msgid "B By Time"
+msgstr ""
+
+msgid "B By Distance"
msgstr ""
-msgid "Port:"
+msgid "C By Time"
msgstr ""
-msgid "refresh the port list"
+msgid "C By Distance"
msgstr ""
-msgid "Configure"
+msgid "Data Logging Format"
msgstr ""
-msgid "Configure Device"
+msgid "Disable data logging if speed falls below"
msgstr ""
-msgid "Connection Error."
+msgid "Disable data logging if distance falls below"
msgstr ""
-msgid "configure the connected DG100"
+msgid "Unknown logFormat"
msgstr ""
-msgid "delete data after import"
+msgid "Configure Device"
msgstr ""
msgid "Importing data from device."
@@ -21749,6 +23539,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21996,12 +23789,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -22011,16 +23798,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22383,9 +24167,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22440,9 +24221,30 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Relacija bazirana na ulozi je kopirana na sve nove puteve.<br>Trebali "
+"bi provjeriti ovo i ispraviti ako je potrebno.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Članstvo u relaciji je kopirano na sve nove puteve.<br>Trebali bi "
+"provjeriti ovo i ispraviti ako je potrebno.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22484,25 +24286,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22639,9 +24441,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22666,12 +24465,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22820,6 +24628,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22836,6 +24647,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23069,13 +24891,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23128,18 +24943,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23197,6 +25000,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23404,9 +25210,6 @@ msgstr "Uvezi PDF dokument."
msgid "Import PDF"
msgstr "Uvezi PDF"
-msgid "Import PDf file"
-msgstr "Uvezi PDf dokument"
-
msgid " {0} objects so far"
msgstr ""
@@ -23486,8 +25289,26 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -23640,6 +25461,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23661,6 +25485,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23954,9 +25781,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24025,9 +25849,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24154,9 +25975,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "Ponovno pokreni JOSM"
-
msgid "Revert changeset fully"
msgstr ""
@@ -24178,6 +25996,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24210,15 +26031,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24228,6 +26065,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24330,9 +26170,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Tip ceste"
-
msgid "Speed (Km/h)"
msgstr "Brzina (Km/h)"
@@ -24448,6 +26285,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr "Pojednostavi područje"
@@ -24508,19 +26348,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
-msgstr "Učitaj"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "nevidljiv"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24658,6 +26498,9 @@ msgstr ""
msgid "Street name: "
msgstr "Ime ulice: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24733,6 +26576,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -24748,9 +26680,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24772,6 +26701,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24924,9 +26856,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25553,38 +27482,26 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
-msgstr "Označi ako podaci bi trebali biti dodani u novi sloj"
-
-msgid ""
-"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
-"w2''"
-msgstr ""
-
msgid "Undelete Object"
msgstr ""
msgid "Undelete object"
msgstr ""
-msgid "Start undeleting"
-msgstr ""
-
-msgid "Close dialog and cancel"
+msgid ""
+"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
+"w2''"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
+msgid "Select if the data should be added into a new layer"
+msgstr "Označi ako podaci bi trebali biti dodani u novi sloj"
-msgid "Looking for {0}"
+msgid "Start undeleting"
msgstr ""
-msgid "Found {0}"
+msgid "Close dialog and cancel"
msgstr ""
-msgid "More tools"
-msgstr "Više alata"
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25627,15 +27544,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25758,18 +27666,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25947,9 +27843,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26076,7 +27969,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -26096,9 +27989,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26231,9 +28121,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 08d5170..7b98151 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:43+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:43+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 0aaea76..ac79eb7 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 13:44+0000\n"
-"Last-Translator: Báthory Péter <bathory at index.hu>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-13 19:08+0000\n"
+"Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
"Language-Team: Hungarian <hu 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: 2013-04-05 04:44+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:45+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Háttérképek felhasználási feltételei"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "A link megnyitása nem támogatott a (''{0}'') platformon"
+msgid "ERROR: {0}"
+msgstr "HIBA: {0}"
+
+msgid "WARNING: {0}"
+msgstr "FIGYELMEZTETÉS: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Platform indítása"
@@ -153,20 +168,18 @@ msgid "About JOSM..."
msgstr "A JOSM névjegye..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"FIGYELEM: Az API alap URL formátuma szokatlan. Az átirányítás egy OSM "
-"objektum információs vagy történeti oldalára valószínűleg nem fog működni. "
-"Az API alap URL: {0}"
+"Nemvárt API alap URL formátum. Az átirányítás az OSM objektum információs "
+"vagy előzmény oldalára valószínűleg sikertelen lesz. API alap URL: \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"FIGYELMEZTETÉS: az API alap URL-je nem a várt formátumú. Az átirányítás az "
-"OSM-felhasználók adatlapjaira valószínűleg sikertelen lesz. Az API alap URL-"
-"je a következő: \"{0}\""
+"Nemvárt API alap URL formátum. Az átirányítás az OSM felhasználó adatlapjára "
+"valószínűleg sikertelen lesz. API alap URL: \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -213,6 +226,9 @@ msgstr "Nincs célréteg"
msgid "Add imagery layer {0}"
msgstr "Légifelvétel réteg hozzáadása: {0}"
+msgid "Select image format for WMS layer"
+msgstr "Válassz képformátumot a WMS réteghez"
+
msgid "Select WMS layers"
msgstr "Válassz WMS réteget"
@@ -253,9 +269,6 @@ msgstr "Eszköz: {0}"
msgid "Please select at least four nodes."
msgstr "Jelölj ki legalább négy pontot."
-msgid "Information"
-msgstr "Információ"
-
msgid "Align Nodes in Line"
msgstr "Pontok elrendezése egyenes mentén"
@@ -280,6 +293,9 @@ msgstr "ütközésre"
msgid "download"
msgstr "letöltésre"
+msgid "problem"
+msgstr "probléma"
+
msgid "previous"
msgstr "előző"
@@ -289,6 +305,9 @@ msgstr "következő"
msgid "Nothing selected to zoom to."
msgstr "Nincs kijelölve semmi, amire rá lehetne közelíteni."
+msgid "Information"
+msgstr "Információ"
+
msgid "Zoom to {0}"
msgstr "Közelítés {0}"
@@ -345,11 +364,10 @@ msgstr ""
"néhányat?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"A vonalakat nem lehet egyesíteni (Nem lehet egyesíteni azokat egyetlen "
-"pontláncolattá)"
+"Nem lehet a vonalakat egyesíteni<br>(Nem őket egy pontsorozattá olvasztani)"
msgid "Combine {0} ways"
msgstr "{0} vonal egyesítése"
@@ -406,18 +424,37 @@ msgstr "Törlés"
msgid "Delete selected objects."
msgstr "Kijelölt objektumok törlése."
+msgid "Toggle dialogs panel"
+msgstr "Párbeszédpanelek váltása"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Párbeszédpanelek váltása, térképnézet maximalizálása"
+
msgid "Distribute Nodes"
msgstr "Pontok szétosztása"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "A kijelölt pontok elhelyezése egyenlő távolságokra egy vonal mentén."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "{0} null-koordinátájú pont mellőzése"
+
msgid "Download from OSM..."
msgstr "Letöltés OSM-ről..."
msgid "Download map data from the OSM server."
msgstr "Térképadatok letöltése az OSM-szerverről."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>A művelet {0} egyedi letöltési kérést igényel.<br>Szeretnéd "
+"folytatni?</html>"
+
+msgid "Download data"
+msgstr "Adatok letöltése"
+
msgid "Download object..."
msgstr "Ojektumok letöltése ..."
@@ -518,6 +555,9 @@ msgstr ""
"Történeti információ megjelenítése OSM pontokról, vonalakról vagy "
"kapcsolatokról."
+msgid "Show history"
+msgstr "Előzmények megjelenítése"
+
msgid "History (web)"
msgstr "Előzmények (web)"
@@ -642,17 +682,17 @@ msgid "Joined overlapping areas"
msgstr "Csatlakoztatott átfedések"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Az utak kapcsolatokkal érintettek, amelyek módosultak. Ellenőrizd, hogy nem "
-"jöttek-e létre hibák."
+"Néhány vonal kapcsolat tagja volt, amik most módosultak.<br>Kérlek "
+"ellenőrizd, hogy ezzel nem keletkeztek hibák."
msgid "Fix tag conflicts"
msgstr "Címke-ütközések javítása"
msgid "Split ways into fragments"
-msgstr ""
+msgstr "Vonalak darabolása"
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgstr ""
@@ -816,11 +856,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Pontok beolvasztása a legrégebbibe."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Kérlek, válassz ki legalább két egyesítendő pontot, vagy egy pontot, ami "
-"közel van egy másikhoz"
+"Válassz legalább két egyesítendő pontot, vagy egy pontot, ami közel van egy "
+"másikhoz."
msgid "Abort Merging"
msgstr "Egyesítés megszakítása"
@@ -987,11 +1027,11 @@ msgid "Download Data"
msgstr "Adatok letöltése"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>''{0}'' URL nem megnyitható, mert a megfelelő letöltő folyamat nem "
-"elérhető.</html>"
+"URL megnyitása sikertelen: {0}<br>A következő letöltési feladatok az itt "
+"látható URL mintát fogadják el:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1023,16 +1063,11 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizálás /Visszavonás"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Alakzat ortogonalizálása / Visszavonás\n"
-"Jelölj ki pontokat, amelyek mozgatásra kerültek az előző alakzat-"
-"ortogonalizálási műveletben!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Alakzat ortogonalizálásának visszavonása"
+"Alakzat ortogonalizálása / Visszavonás<br>Válassz ki olyan pontokat, amiket "
+"az előző Alakzat ortogonalizálása művelet elmozdított!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1052,9 +1087,6 @@ msgstr "Ortogonalizálás"
msgid "Usage"
msgstr "Használat"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "A kiválasztott elemek nem ortogonalizálhatók"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1178,6 +1210,15 @@ msgstr "Fájl átnevezése szintén"
msgid "Could not rename file ''{0}''"
msgstr "Nem lehet átnevezni a(z) \"{0}\" fájlt"
+msgid "Restart"
+msgstr "Újraindítás"
+
+msgid "Restart the application."
+msgstr "Alkalmazás újraindítása."
+
+msgid "Click to restart later."
+msgstr "Újraindítás később."
+
msgid "Reverse way"
msgstr "Vonal megfordítása"
@@ -1230,9 +1271,6 @@ msgstr "Munkamenet betöltése"
msgid "Load a session from file."
msgstr "Munkamenet betöltése fájlból."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Munkamenet fájl (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Munkamenet megnyitása"
@@ -1298,6 +1336,9 @@ msgstr "Állapotjelentés"
msgid "Copy to clipboard and close"
msgstr "Másolás a vágólapra és bezárás"
+msgid "Report bug"
+msgstr "Hibajelentés"
+
msgid "Close"
msgstr "Bezárás"
@@ -1380,18 +1421,18 @@ msgstr ""
"vonalon belül.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Egy szerep alapú kapcsolat tagsága másolásra került az összes új "
-"vonalra<br>Ellenőrizd és javítsd, ha szükséges.</html>"
+"Egy szerep alapú kapcsolattagság át lett másolva az újonnan létrejött "
+"vonalakra.<br>Érdemes ellenőrizned, és javítanod, ha szükséges."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Egy kapcsolat tagsága másolásra került az összes új "
-"vonalra<br>Ellenőrizd és javítsd, ha szükséges.</html>"
+"Egy kapcsolattagság át lett másolva az újonnan létrejött "
+"vonalakra.<br>Érdemes ellenőrizned, és javítanod, ha szükséges."
msgid "Split way {0} into {1} parts"
msgstr "A(z) {0} vonal kettévágása {1} darabba"
@@ -1406,7 +1447,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Átállítja a(z) \"{0}\" globális beállítást."
msgid "Encourage/discourage upload"
-msgstr ""
+msgstr "Feltöltés támogatása/ellenzése"
msgid "UnGlue Ways"
msgstr "Vonalak szétválasztása"
@@ -1493,6 +1534,29 @@ msgstr ""
"Félkész objektumokat próbáltál szétválasztani.<br>Ez gondot okozhat, mert "
"nem látod a valódi objektumot.<br>Biztosan szétválasztod?"
+msgid "Disconnect Node from Way"
+msgstr "Pont leválasztása vonalról"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Pont leválasztása arról a vonalról, amihez jelenleg kapcsolódik"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Válassz ki legalább egy leválasztandó pontot."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "A kiválasztott pont nem választható le sehonnan."
+msgstr[1] "A kiválasztott pontok nem választhatóak le sehonnan."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"Az érintett vonal eltűnne, ha leválasztanád a kiválasztott pontot."
+msgstr[1] ""
+"Az érintett vonal eltűnne, ha leválasztanád a kiválasztott pontokat."
+
msgid "Undo"
msgstr "Visszavonás"
@@ -1517,9 +1581,6 @@ msgstr "Adatok frissítése"
msgid "Updates the objects in the active data layer from the server."
msgstr "Az aktív adatréteg objektumainak frissítése a szerverről."
-msgid "Download data"
-msgstr "Adatok letöltése"
-
msgid "Update modified"
msgstr "Mósosítások frissítése"
@@ -1725,6 +1786,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Lassabban előre"
+msgid "Download GPS"
+msgstr "GPS letöltése"
+
msgid "Downloading GPS data"
msgstr "GPS adatok letöltése"
@@ -1734,6 +1798,18 @@ msgstr "Letöltött GPX adatok"
msgid "Markers from {0}"
msgstr "Jelölők innen: {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Tömörített OSM Change letöltése"
+
+msgid "Download OSM Change"
+msgstr "OSM Change letöltése"
+
+msgid "Download Compressed OSM"
+msgstr "Tömörített OSM letöltése"
+
+msgid "Download OSM"
+msgstr "OSM letöltése"
+
msgid "Downloading data"
msgstr "Adatok letöltése"
@@ -1755,6 +1831,31 @@ msgstr "Parancs"
msgid "Request details: {0}"
msgstr "Kérés adatai: {0}"
+msgid "Download OSM URL"
+msgstr "OSM URL letöltése"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "{0} ütközés történt az importálás során."
+msgstr[1] "{0} ütközés történt az importálás során."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Ütközés letöltés közben"
+msgstr[1] "Ütközések letöltés közben"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) {2} pont szüleinek betöltése"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) {2} vonal szüleinek betöltése"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) {2} kapcsolat szüleinek betöltése"
+
+msgid "Download session"
+msgstr "Munkamenet letöltése"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "{0}. letöltése {1} közül. ({2} van hátra)"
@@ -1818,25 +1919,6 @@ msgstr "Az alábbi hibák történtek a tömeges letöltés közben: {0}"
msgid "Errors during download"
msgstr "Hibák letöltés közben"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "{0} ütközés történt az importálás során."
-msgstr[1] "{0} ütközés történt az importálás során."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Ütközés letöltés közben"
-msgstr[1] "Ütközések letöltés közben"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) {2} pont szüleinek betöltése"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) {2} vonal szüleinek betöltése"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) {2} kapcsolat szüleinek betöltése"
-
msgid "Error during download"
msgstr "Hiba a letöltés közben"
@@ -1869,7 +1951,7 @@ msgid "Backspace in Add mode"
msgstr "Backspace rajzolás módban"
msgid "helper line"
-msgstr ""
+msgstr "segédvonal"
msgid "Cannot add a node outside of the world."
msgstr "Nem lehet pontot hozzáadni a világon kívül."
@@ -1922,13 +2004,13 @@ msgid "draw angle snap highlight"
msgstr "rajzolási szög igazítás kiemelés"
msgid "Toggle snapping by {0}"
-msgstr ""
+msgstr "Illesztés váltása ezzel: {0}"
msgid "Show helper geometry"
-msgstr "Segéd mérő megjelenítése"
+msgstr "Segédvonal megjelenítése"
msgid "Snap to node projections"
-msgstr ""
+msgstr "Illesztés a pontok"
msgid "Disable"
msgstr "Kikapcsolás"
@@ -1985,6 +2067,9 @@ msgstr "Vonalpontosság növelő"
msgid "Improve Way Accuracy mode"
msgstr "Vonalpontosság növelő mód"
+msgid "improve way accuracy helper line"
+msgstr "vonalpontosságnövelő segédvonal"
+
msgid "Click on the way to start improving its shape."
msgstr "Kattints a vonalra az alak javításának megkezdéséhez"
@@ -2015,10 +2100,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Nem lehet pontot helyezni a világon kívülre."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "És új pont hozzáadása a vonalhoz"
-msgstr[1] "És új pont hozzáadása {0} vonalhoz"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Új pont hozzáadása vonalhoz"
+msgstr[1] "Új pont hozzáadása {0} vonalhoz"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Nem lehet törölni több objektumhoz is csatlakozó pontot"
@@ -2032,6 +2117,9 @@ msgstr "Párhuzamos"
msgid "Make parallel copies of ways"
msgstr "Párhuzamos vonalak készítése"
+msgid "make parallel helper line"
+msgstr "párhuzamos készítő segédvonal"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2494,6 +2582,9 @@ msgstr "''value'' bármelyik kulcsban"
msgid "matches if ''key'' exists"
msgstr "egyezik, ha ''key'' létezik"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr "egyezik, ha ''key'' nagyobb mint a ''value'' (illetve kisebb)"
+
msgid "combinators"
msgstr "kombinálók"
@@ -2531,7 +2622,7 @@ msgid "all closed ways"
msgstr "minden zárt vonal"
msgid "object without useful tags"
-msgstr ""
+msgstr "hasznos címke nélküli objektum"
msgid "metadata"
msgstr "metaadat"
@@ -2672,14 +2763,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Hiányzó <i>min</i>/<i>max</i> ''timestamp'' után"
-msgid "Primitive id expected"
-msgstr "Várt egyszerű azonosító"
+msgid "Range of primitive ids expected"
+msgstr "Elemazonosító tartományok szükségesek"
-msgid "Changeset id expected"
-msgstr "Várt módosításcsomag azonosító"
+msgid "Range of changeset ids expected"
+msgstr "Módosításcsomag-azonosító tartományok szükségesek"
-msgid "Version expected"
-msgstr "Várt verzió"
+msgid "Range of versions expected"
+msgstr "Verzió tartományok szükségesek"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2690,6 +2781,9 @@ msgstr ""
"Ismeretlen elemtípus: {0}. A megengedett értékek: node (pont), way (vonal), "
"relation (kapcsolat)"
+msgid "Primitive id expected"
+msgstr "Várt egyszerű azonosító"
+
msgid "Range of numbers expected"
msgstr "Várt számtartomány"
@@ -2708,10 +2802,8 @@ msgstr "XOR hiányzó paramétere"
msgid "Missing operator for NOT"
msgstr "NOT hiányzó paramétere"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
-"Figyelem: ''{0}'' címke értéke automatikusan csonkítva {1} törölt objektumon"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr "\"{0}\" címke értéke automatikusan csonkolva {1} törölt objektumon"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2807,6 +2899,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "{0} objektum hozzáadva"
msgstr[1] "{0} objektum hozzáadva"
+msgid "New way {0} has 0 nodes"
+msgstr "Új vonal {0} nulla pontot tartalmaz"
+
msgid "Change node {0}"
msgstr "{0} pont megváltoztatása"
@@ -2843,11 +2938,11 @@ msgstr "''{0}'' eltávolítása {1} objektumról"
msgid "Set {0}={1} for {2} objects"
msgstr "{0}={1} címke {2} objektumra"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Törölt {0} tulajdonság {1} objektumról"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "{0} címke törölve {1} objektumról."
-msgid "Set {0} properties for {1} objects"
-msgstr "{0} tulajdonság beállítása {1} objektumra"
+msgid "Set {0} tags for {1} objects"
+msgstr "{0} címke felvétele {1} objektumra"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "''{0}'' cserélése erre: ''{1}''"
@@ -2871,11 +2966,11 @@ msgid "Double conflict"
msgstr "Dupla ütközés"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Figyelem: ''{0}'' réteg többé nem elérhető. Nem távolítható el ''{1}'' "
-"objektum ütközése."
+"\"{0}\" réteg többé nem elérhető. Nem lehetséges megoldani \"{1}\" objektum "
+"ütközését."
msgid "Add conflict for ''{0}''"
msgstr "Ütközés hozzáadása ehhez: ''{0}''"
@@ -2988,6 +3083,9 @@ msgstr[1] "{0} objektum elfelejtése"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Ütközés feloldása a(z) {0} kapcsolat tagjai között"
+msgid "Removed nodes from {0}"
+msgstr "Pont eltávolítva innen: {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "{0} pont forgatása"
@@ -3054,11 +3152,11 @@ msgid "Reverse directional way."
msgstr "Irányított vonal megfordítása"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"A vonal megfordításakor – az eredeti jelentés megtartásához – a "
-"tulajdonságaira és a pontjaira a következő változtatások javasoltak."
+"A vonal megfordításakor az alábbi változtatásokat javasolt megtenni az "
+"adatok konzisztenciájának megőrzése érdekében."
msgid "Relation"
msgstr "Kapcsolat"
@@ -3087,11 +3185,11 @@ msgstr "Kijelölt változtatások alkalmazása"
msgid "Do not apply changes"
msgstr "Ne alkalmazd a változtatásokat"
-msgid "Please select which property changes you want to apply."
-msgstr "Válaszd ki, mely tulajdonságok változtatását szeretnéd alkalmazni."
+msgid "Please select which changes you want to apply."
+msgstr "Kérlek válaszd ki, melyik változtatásokat szeretnéd elfogadni."
-msgid "Properties of "
-msgstr "Tulajdonságok: "
+msgid "Tags of "
+msgstr "Címkéi "
msgid "Roles in relations referring to"
msgstr "A kapcsolat szerepei hivatkoznak erre:"
@@ -3111,6 +3209,9 @@ msgstr "IOHiba a fájl létrehozásakor, automatikus mentés kihagyva: {0}"
msgid "Unable to delete old backup file {0}"
msgstr "Nem törölhető a régi biztonsági mentés {0}"
+msgid "Your work has been saved automatically."
+msgstr "A munkád automatikusan el lett mentve."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Az eltávolított réteg biztonsági mentésekor hiba történt: {0}"
@@ -3144,22 +3245,21 @@ msgstr ""
"de ennek az alapértelmezett értéke pillanatnyilag ismeretlen.<br/> Kérlek "
"aktiváld a megfelelő funkciót manuálisan, majd próbáld újraimportálni."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr ""
-"Figyelmeztetés: Nem sikerült létrehozni a hiányzó cache könyvtárat: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Nem sikerült létrehozni a hiányző cache könyvtárat: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Nem sikerült létrehozni a hiányzó cache könyvtárat: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Figyelmeztetés: nem lehet megtartani a beállításokat ehhez: ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Figyelmeztetés: Nem sikerült inicializálni a beállításokat. A beállítás "
-"könyvtár ''{0}'' nem könyvtár."
+"Nem sikerült a beállításokat inicializálni. A beállítások könyvtára \"{0}\" "
+"nem egy könyvtár."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3169,31 +3269,28 @@ msgstr ""
"''{0}'' nem könyvtár.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Figyelmeztetés: Nem sikerült inicializálni a beállításokat. A hiányzó "
-"beállítások könyvtár nem hozható létre: {0}"
+"Nem sikerült inicializálni a beállításokat. A beállítások hiányzó könyvtára "
+"nem hozható létre: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr ""
-"<html>Nem sikerült inicializálni a beállításokat. A hiányzó beállítások "
-"könyvtár nem hozható létre: {0}</html>"
+"<html>Nem sikerült inicializálni a beállításokat. A beállítások hiányzó "
+"könyvtára nem hozható létre: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Információ: Hiányzó beállítás fájl ''{0}''. Alapértelmezett beállítás fájl "
-"létrehozása."
+"Hiányzik a beállítás fájl: \"{0}\". Alapértelmezett beállítás fájl "
+"létrehozása..."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Figyelmeztetés: A meglévő beállítás fájl \"{0}\" felülírásra kerül az "
-"alapértelmezett beállítás fájllal."
+"Meglévő \"{0}\" beállítás fájl lecserélése alapértelmezett beállítás fájllal."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3211,11 +3308,11 @@ msgstr ""
"beállítófájl.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Figyelmeztetés: a beállítások inicializálása nem sikerült. Nem sikerült a "
-"beállítás fájlt az alapértelmezettre visszaállítani: {0}"
+"Nem sikerült a beállításokat inicializálni. Nem sikerült a beállítás fájlt "
+"visszaállítani az alapértelmezettre: {0}"
msgid "Paint style {0}: {1}"
msgstr "Rajz stílus {0}: {1}"
@@ -3244,13 +3341,11 @@ msgstr "Nem sikerült betölteni ''{0}'' erőforrást, a hiba: {1}."
msgid "UNKNOWN"
msgstr "ISMERETLEN"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr ""
-"Figyelmeztetés: nem várt JOSM verziószám a verzió fájlban, érték: ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr "Váratlan JOSM verziószám a verziófájlban: \"{0}\""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Figyelmeztetés: a verzió fájl ''/REVISION'' hiányzik."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "A \"/REVISION\" verziófájl hiányzik."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Már van bejegyzett ütközés ''{0}'' elemre."
@@ -3413,11 +3508,10 @@ msgstr "''{0}'' azonosítójú elem nem összehasonlítható ''{1}'' elemmel."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "{0} paraméter nincs a 0..{1} tartományban. Kapott érték ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Hiba: nem lehet betölteni ''{0}'' térkép-megjelenítő osztályt. Az osztály "
-"nem található."
+"Nem sikerült betölteni a \"{0}\" térképrajzoló modult. Az osztály nem "
+"található."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3529,8 +3623,8 @@ msgstr "+nadgrids paraméter ''{0}'' rácseltolás fájlhoz nem támogatott"
msgid "Unkown datum identifier: ''{0}''"
msgstr "Ismeretlen dátumazonosító: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Dátum kötelező (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Dátum szükséges (+datum=*, +towgs84=* or +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3549,6 +3643,9 @@ msgstr "Ismeretlen vetületazonosító: ''{0}''"
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr "Nemvárt argumentumszám a ''+bounds'' paraméternél (4 kell legyen)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Ismeretlen paraméter: \"{0}\""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "A várt argumentumszám a paraméternél ''{0}''"
@@ -3566,9 +3663,6 @@ msgstr "Egyéni Vetület"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "Hiba: nem sikerült a bemenet megnyitása ''/data/{0}'' erőforráshoz."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3604,11 +3698,14 @@ msgid "validation warning"
msgstr "ellenőrzési figyelmeztetés"
msgid "validation other"
-msgstr ""
+msgstr "egyéb figyelmeztetés"
msgid "Running test {0}"
msgstr "Teszt futtatása: {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "\"{0}\" teszt befejezve {1} alatt"
+
msgid "Addresses"
msgstr "Lakcím"
@@ -3633,6 +3730,15 @@ msgstr "Többszörös utcanév a kapcsolatban"
msgid "House number too far from street"
msgstr "Házszám túl távol van az úttól"
+msgid "Barriers and entrances"
+msgstr "Akadályok és bejáratok"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Akadályok és bejáratok hibáinak keresése."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Bejárat nincs beállítva az akadályon"
+
msgid "Building inside building"
msgstr "Épületen belüli épület"
@@ -3694,15 +3800,15 @@ msgstr " vagy "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} elavult, használd helyette: {1}"
+msgid "{0} is unnecessary"
+msgstr "{0} szükségtelen"
+
msgid "Duplicated nodes"
msgstr "Kettőzött pontok"
msgid "This test checks that there are no nodes at the very same location."
msgstr "A teszt ellenőrzi, hogy van-e több pont ugyanazon a helyen"
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Kettőzött pont két bezáratlan vonalban"
-
msgid "Mixed type duplicated nodes"
msgstr "Vegyes típusú kettőzött pontok"
@@ -3774,6 +3880,24 @@ msgstr "Kettőzött útpontok"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Egymást követő azonos pontokat tartalmazó vonalak keresése"
+msgid "Highways"
+msgstr "Közutak"
+
+msgid "Performs semantic checks on highways."
+msgstr "Szemantikai ellernőrzés végrehajtása az autópályákon."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Hibás körforgalom (highway: {0}, e helyett: {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Hiányzik adat a gyalogos keresztezésről"
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipoligon"
@@ -3846,6 +3970,13 @@ msgstr "Azonos nevű pontok"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Ez a teszt azonos nevű pontokat keres (feltehetőleg duplikációk)"
+msgid "Opening hours syntax"
+msgstr "Nyitvatartás szintaxis"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+"Ellenőrzi, hogy a nyitvatartások helyes formátummal lettek-e megadva."
+
msgid "Overlapping Areas"
msgstr "Átfedésben lévő területek"
@@ -3906,15 +4037,15 @@ msgstr "Kapcsolat típusa ismeretlen"
msgid "Relation is empty"
msgstr "Üres kapcsolat"
+msgid "Role verification problem"
+msgstr "Szerep ellenőrzési probléma"
+
msgid "<empty>"
msgstr "<üres>"
msgid "Role {0} missing"
msgstr "Hiányzó {0} szerep"
-msgid "Role verification problem"
-msgstr "Szerep ellenőrzési probléma"
-
msgid "Number of {0} roles too low ({1})"
msgstr "{0} szerepek száma túl kevés ({1})"
@@ -3947,11 +4078,11 @@ msgstr ""
"Ez a teszt hasonló nevű vonalakat keres, ami feltehetőleg elütésből "
"származik."
-msgid "Properties checker :"
-msgstr "Tulajdonság ellenőrző:"
+msgid "Tag checker"
+msgstr "Címke ellenőrző"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Ez a bővítmény a kulcsok és értékek hibáit ellenőrzi."
+msgid "This test checks for errors in tag keys and values."
+msgstr "A címkék kulcsát és értékét vizsgálja"
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Érvénytelen címkeellenőrző sor - {0}: {1}"
@@ -4092,8 +4223,8 @@ msgstr "Alapértelmezett helyesírás-ellenőrző fájl használata."
msgid "Use the default spellcheck file (recommended)."
msgstr "Alapértelmezett helyesírás-ellenőrző fájl használata (ajánlott)."
-msgid "Fix properties"
-msgstr "Tulajdonságok javítása"
+msgid "Fix tags"
+msgstr "Fix címkék"
msgid "Could not find element type"
msgstr "Nem található az elem típusa"
@@ -4168,6 +4299,9 @@ msgid "This tests if ways which should be circular are closed."
msgstr ""
"Ellenőrzi, hogy az olyan vonalak, amiknek körvonalnak kell lenni, zártak-e."
+msgid "Unclosed way"
+msgstr "Bezáratlan vonal"
+
msgid "natural type {0}"
msgstr "természet típus {0}"
@@ -4198,9 +4332,6 @@ msgstr "épület"
msgid "area"
msgstr "terület"
-msgid "Unclosed way"
-msgstr "Bezáratlan vonal"
-
msgid "Unconnected ways"
msgstr "Összekapcsolatlan vonalak"
@@ -4228,12 +4359,12 @@ msgstr ""
"Ez a teszt olyan címkézetlen pontokat keres, amik nem részei egyetlen "
"vonalnak sem."
-msgid "No tags"
-msgstr "Címkézetlen"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nem csatlakozó pontok fizikai címke nélkül"
+msgid "No tags"
+msgstr "Címkézetlen"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "A címke \"fixme\"-t, vagy \"FIXME\"-t tartalmaz"
@@ -4294,26 +4425,6 @@ msgstr "Fordított partvonal: szárazföld nem a bal oldalon van"
msgid "Reversed land: land not on left side"
msgstr "Fordított szárzaföld: szárazföld nem a bal oldalon van"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Hibás argumentumszámú könyvjelző"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Nem sikerült olvasni a könyvjelző bejegyzést: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Hiba: Nem várt sor ''{0}'' a ''{1}'' könyvjelző fájlban"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Hiba: Illegális ''{0}'' dupla érték a(z) ''{2}'' könyvjelző fájl ''{1}'' "
-"sorában"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Nem olvashatók könyvjelzők innen:<br>''{0}''<br>Hiba: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Ne mutasd újra (emlékezz a választásomra)"
@@ -4417,8 +4528,8 @@ msgstr "Segítség megjelenítése"
msgid "Downloading \"Message of the day\""
msgstr "\"A nap üzenete\" letöltése"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Figyelmeztetés: MOTD olvasása sikertelen. A hiba: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "MOTD olvasása sikertelen. A kivétel: {0}"
msgid "Message of the day not available"
msgstr "A nap üzenete nem elérhető"
@@ -4629,9 +4740,24 @@ msgstr "Nézet"
msgid "Tools"
msgstr "Eszközök"
+msgid "More tools"
+msgstr "További eszközök"
+
+msgid "Data"
+msgstr "Adatok"
+
+msgid "Selection"
+msgstr "Kiválasztás"
+
msgid "Presets"
msgstr "Címkék"
+msgid "More..."
+msgstr "Továbbiak..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Ablakok"
@@ -4649,11 +4775,23 @@ msgstr ""
"Elrejti vagy megjeleníti a szerkesztő eszköztárat (tehát a bal oldali "
"ikonokat)"
+msgid "Preset preferences"
+msgstr "Címkekészlet beállítások"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr "Kattints a címkekészletek fül megnyitásához a beállításokban"
+
+msgid "Imagery preferences"
+msgstr "Légifelvételek beállításai"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Kattintásra megnyílik a légifelvételek fül a beállításokból"
+
msgid "Audio"
-msgstr "Hangfelvétel"
+msgstr "Hang"
-msgid "Hide edit toolbar"
-msgstr "Szerkesztő eszköztár elrejtése"
+msgid "Do not hide toolbar"
+msgstr "Ne rejtse el az eszköztárat"
msgid "Hide this button"
msgstr "Gomb elrejtése"
@@ -4661,6 +4799,9 @@ msgstr "Gomb elrejtése"
msgid "Click the arrow at the bottom to show it again."
msgstr "Újbóli megjelenítéshez kattints az alábbi nyílra"
+msgid "Hide edit toolbar"
+msgstr "Szerkesztő eszköztár elrejtése"
+
msgid "Hide or show this toggle button"
msgstr "Kapcsoló gomb megjelenítése/elrejtése"
@@ -4722,6 +4863,9 @@ msgstr "(nincs objektum)"
msgid "User:"
msgstr "Felhasználó:"
+msgid "Do not hide status bar"
+msgstr "Ne rejtse el az állapotsort"
+
msgid "Layer not in list."
msgstr "A réteg nincs a listában."
@@ -4749,22 +4893,6 @@ msgstr "Háttérben"
msgid "Click to run job in background"
msgstr "Kattints a művelet háttérben futtatásához"
-msgid "false: the property is explicitly switched off"
-msgstr "hamis: a tulajdonság explicite kikapcsolva"
-
-msgid "true: the property is explicitly switched on"
-msgstr "igaz: a tulajdonság explicite bekapcsolva"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"részleges: különböző kiválasztott objektumoknak különböző értékük van, ne "
-"változtasd"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-"beállítatlan: ne állítsd be ezt a tulajdonságot a kijelölt objektumokon"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -5075,6 +5203,9 @@ msgstr "> alja"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "A kiválasztott pontjaim másolása az összevont lista végére"
+msgid "> before"
+msgstr "> előtt"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5082,6 +5213,9 @@ msgstr ""
"A kiválasztott pontjaim másolása az összevont lista első kiválasztott eleme "
"elé"
+msgid "> after"
+msgstr "> után"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5089,14 +5223,23 @@ msgstr ""
"A kiválasztott pontjaim másolása az összevont lista első kiválasztott eleme "
"után"
+msgid "< top"
+msgstr "< fent"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "Az ő kiválasztott pontjainak másolása az összevont lista elejére"
+msgid "< bottom"
+msgstr "< lent"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "Az ő kiválasztott pontjainak másolása az összevont lista végére"
+msgid "< before"
+msgstr "< előtt"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5104,6 +5247,9 @@ msgstr ""
"Az ő kiválasztott pontjainak másolása az összevont lista első kiválasztott "
"eleme elé"
+msgid "< after"
+msgstr "< után"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5120,8 +5266,8 @@ msgstr "Összes elemének másolása a célba"
msgid "Up"
msgstr "Fel"
-msgid "Move up the selected elements by one position."
-msgstr "A kiválasztott elemek mozgatása egy hellyel feljebb."
+msgid "Move up the selected entries by one position."
+msgstr "A kiválasztott elemek eggyel feljebb mozgatása."
msgid "Down"
msgstr "Le"
@@ -5176,14 +5322,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Ő változata ({0} bejegyzés)"
msgstr[1] "Ő változata ({0} bejegyzés)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Pont"
@@ -5253,7 +5391,7 @@ msgid "<undefined>"
msgstr "<nincs megadva>"
msgid "The merged dataset will not include a tag with key {0}"
-msgstr "Az adathalmaza nem fogja tartalmazni {0} kulcsú címkét"
+msgstr "Az adathalmaza nem fogja tartalmazni a(z) {0} kulcsú címkét"
msgid "My dataset does not include a tag with key {0}"
msgstr "Az adathalmazom nem fogja tartalmazni {0} kulcsú címkét"
@@ -5374,6 +5512,7 @@ msgstr "''{0}'' kulcs és az összes értéke törölve lesz"
msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
msgstr ""
+"Minden \"{0}\" módon összekapcsolt érték alkalmazva lesz \"{1}\" kulcsra"
msgid "Tag collection does not include the selected value ''{0}''."
msgstr "A címkegyűjtemény nem tartalmazza a kiválasztott ''{0}'' értéket."
@@ -5455,18 +5594,18 @@ msgctxt "tag"
msgid "Key:"
msgstr "Kulcs:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Adj meg egy címke kulcsot, pl. <strong><tt>fixme</tt></strong></html>"
+"<html>Adj meg egy címkekulcsot, pl. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Érték:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Ajd meg egy címke értéket, pl. <strong><tt>tagok "
-"ellenőrizendők</tt></strong></html>"
+"<html>Adj meg egy címkeértéket, pl. <strong><tt>tagokat "
+"ellenőrizni</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -6046,6 +6185,9 @@ msgstr "Megjelenítés/Elrejtés"
msgid "Information about layer"
msgstr "Információk a rétegről"
+msgid "Map paint preferences"
+msgstr "Térképi megjelenítés beállításai"
+
msgid "Map Paint Styles"
msgstr "Térképrajz stílusok"
@@ -6129,14 +6271,46 @@ msgstr "A stílus pillanatnyilag aktív?"
msgid "No"
msgstr "Nem"
-msgid "Relations"
-msgstr "Kapcsolatok"
-
-msgid "Open a list of all relations."
-msgstr "Megnyitja az összes kapcsolat listáját"
+msgid "Object type:"
+msgstr "Objektum típus:"
-msgid "Relation list filter"
-msgstr "Kapcsolatlista szűrő"
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "Kevert"
+
+msgid "Choose the OSM object type"
+msgstr "Válassz OSM objektumtípust"
+
+msgid "Object ID:"
+msgstr "Objektum ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Add meg a letöltendő objektum azonosítóját"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Az objektumok azonosítóit vesszővel lehet elválasztani. <br/> Például: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Kevert módban a "
+"következőképp határozd meg az objektumokat:: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"Érvénytelen ID lista lett megadva\n"
+"Nem lehet folytatni."
+
+msgid "Relations"
+msgstr "Kapcsolatok"
+
+msgid "Open a list of all relations."
+msgstr "Megnyitja az összes kapcsolat listáját"
+
+msgid "Relation list filter"
+msgstr "Kapcsolatlista szűrő"
msgid "Create a new relation"
msgstr "Létrehoz egy új kapcsolatot"
@@ -6150,9 +6324,6 @@ msgstr "Kapcsolatok: {0}/{1}"
msgid "Relations: {0}"
msgstr "Kapcsolatok: {0}"
-msgid "Selection"
-msgstr "Kiválasztás"
-
msgid "Open a selection list window."
msgstr "A kiválsztott objektumok listájának megnyitása"
@@ -6172,23 +6343,11 @@ msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
msgstr "Kiv: Kapcs:{0} / Vonal:{1} / Pont:{2}"
msgid "Unselectable now"
-msgstr ""
+msgstr "Jelenleg nem választható"
msgid "Selection: {0}"
msgstr "Kiválasztva: {0}"
-msgid "Side buttons"
-msgstr "Oldalsó gombok"
-
-msgid "Always shown"
-msgstr "Mindig megjelenik"
-
-msgid "Dynamic"
-msgstr "Dinamikus"
-
-msgid "Always hidden"
-msgstr "Mindig rejtve"
-
msgid "Toggle dynamic buttons"
msgstr "Dinamikus gombok átkapcsolása"
@@ -6205,6 +6364,18 @@ msgstr "Panel bezárása. Újra megnyitni a bal oldali gombsorból tudod."
msgid "Click to minimize/maximize the panel content"
msgstr "Kattints a paneltartalom minimalizálásához/maximalizálásához"
+msgid "Side buttons"
+msgstr "Oldalsó gombok"
+
+msgid "Always shown"
+msgstr "Mindig megjelenik"
+
+msgid "Dynamic"
+msgstr "Dinamikus"
+
+msgid "Always hidden"
+msgstr "Mindig rejtve"
+
msgid "Authors"
msgstr "Szerkesztők"
@@ -6223,11 +6394,9 @@ msgstr "Felhasználó által beküldött objektumok kiválasztása"
msgid "Launches a browser with information about the user"
msgstr "A felhasználóról további információkat nyit meg a böngészőben"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Figyelmeztetés: {1} kiválasztott felhasználóból csak az első {0} fog "
-"megjelenni a böngészőben"
+"Infó böngésző nyitása csak az első {0} felhasználóhoz a(z) {1} kijelöltből"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6254,9 +6423,6 @@ msgstr "Hibakereső eszköz ablakának megnyitása"
msgid "Validation results"
msgstr "Hibakeresési eredmények"
-msgid "Zoom to problem"
-msgstr "Problémára közelítés"
-
msgid "Fix"
msgstr "Javítás"
@@ -6407,9 +6573,6 @@ msgstr "Tartalom frissítése"
msgid "Update the changeset content from the OSM server"
msgstr "Módosításcsomag-tartalom frissítése az OSM szerverről"
-msgid "Show history"
-msgstr "Előzmények megjelenítése"
-
msgid "Download and show the history of the selected objects"
msgstr "A kiválasztott objektum előzményeinek letöltése és megjelenítése"
@@ -6740,11 +6903,11 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>A jelenlegi térképnézet módosításcsomagjainak letöltése</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Figyelmeztetés: nem várt érték a ''{0}'' beállításban, kapott érték: "
-"''{1}''. Visszaállítás az alapértelmezett lekérdezésre."
+"Nemvárt érték \"{0}\" beállításhoz, \"{1}\" érkezett. Visszaállítás "
+"alapértelmezettre."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6815,35 +6978,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Ez a módosításcsomag-lekérdezés URL érvénytelen"
-msgid "Select objects for which to change properties."
-msgstr "Válaszd ki a megváltoztatandó tulajdonságú objektumokat"
+msgid "Discardable key: selection Foreground"
+msgstr "Eldobható kulcs: kiválasztás előtér"
-msgid "Properties/Memberships"
-msgstr "Tulajdonságok/Tagságok"
+msgid "Discardable key: selection Background"
+msgstr "Eldobható kulcs: kiválasztás háttér"
-msgid "Properties for selected objects."
-msgstr "A kiválasztott objektumok tulajdonságai."
+msgid "Discardable key: foreground"
+msgstr "Eldobható kulcs: előtér"
+
+msgid "Discardable key: background"
+msgstr "Eldobható kulcs: háttér"
msgid "<different>"
msgstr "<különböző>"
+msgid "Select objects for which to change tags."
+msgstr "Válassz objektumokat, amiknek megváltoztatnád a címkéit."
+
+msgid "Tags/Memberships"
+msgstr "Címkék/Tagságok"
+
+msgid "Tags for selected objects."
+msgstr "A kijelölt objektumok címkéi."
+
msgid "Member Of"
msgstr "Tagja"
msgid "Position"
msgstr "Pozíció"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Tulajdonságok: {0} / Tagságok: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Címke: {0} / Tagság: {1}"
-msgid "Properties / Memberships"
-msgstr "Tulajdonságok / Tagságok"
+msgid "Tags / Memberships"
+msgstr "Címkék / Tagságok"
msgid "Delete the selected key in all objects"
msgstr "A kiválasztott kulcs törlése az összes objektumból"
-msgid "Delete Properties"
-msgstr "Tulajdonságok törlése"
+msgid "Delete Tags"
+msgstr "Címkék törlése"
msgid "Change relation"
msgstr "Kapcsolat módosítása"
@@ -6857,14 +7032,14 @@ msgstr "Biztosan törlöd a kiválasztást a {0} kapcsolatból?"
msgid "Add a new key/value pair to all objects"
msgstr "Új kulcs/érték pár hozzáadása az objektumokhoz"
-msgid "Add Property"
-msgstr "Tulajdonság hozzáadása"
+msgid "Add Tag"
+msgstr "Új címke"
msgid "Edit the value of the selected key for all objects"
msgstr "A kijelölt kulcs értékének szereksztése az összes objektumban"
-msgid "Edit Properties"
-msgstr "Tulajdonságok szerkesztése"
+msgid "Edit Tags"
+msgstr "Címkék szerkesztése"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "OSM wiki súgó oldala a címkéhez (F1)"
@@ -6946,12 +7121,6 @@ msgstr[1] "{0} objektum tulajdonságainak megváltoztatása"
msgid "Use English language for tag by default"
msgstr "Alapértelmezetten angol nyelv használata a címkéhez"
-msgid "Paste tag"
-msgstr "Címke beillesztése"
-
-msgid "Paste value"
-msgstr "Érték beillesztése"
-
msgid "Add value?"
msgstr "Hozzáadod az értéket?"
@@ -6981,9 +7150,15 @@ msgstr "Kérlek 0 és {0} közti egész számot adj meg"
msgid "Recently added tags"
msgstr "Nemrég használt címkék"
+msgid "Choose recent tag {0}"
+msgstr "Korábbi {0} címke választása"
+
msgid "Use this tag again"
msgstr "Címke használata újból"
+msgid "Apply recent tag {0}"
+msgstr "Korábbi {0} címke alkalmazása"
+
msgid "The key ''{0}'' is already used"
msgstr "''{0}'' kulcs már használatban van"
@@ -7023,10 +7198,10 @@ msgstr "A kapcsölat törölve van"
msgid "Downloading relation {0}"
msgstr "{0} kapcsolat letöltése"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Figyelmeztetés: Kivétel mellőzése, mert a művelet meg lett szakítva. "
-"Kivétel: {0}"
+"Kivétel figyelmen kívül hagyása, mert a folyamat meg lett szakítva. Kivétel: "
+"{0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7089,6 +7264,10 @@ msgstr "Távolítsd el őket, kapcsolat tisztítása"
msgid "Ignore them, leave relation as is"
msgstr "Hagyd figyelmen kívül, a kapcsolat így marad"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Sajnálom, \"{0}\" gyorsbillentyű nem engedélyezhető a Kapcsolatszerkesztőben"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7379,6 +7558,28 @@ msgstr "vonal csatlakoztatva a következő kapcsolattaghoz"
msgid "way is not connected to previous or next relation member"
msgstr "vonal nincs csatlakoztatva az előző vagy következő kapcsolattaghoz"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Hibás argumentumszámú könyvjelző"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Nem sikerült olvasni a könyvjelző bejegyzést: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Nemvárt \"{0}\" sor a(z) \"{1}\" könyvjelző fájlban"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Szabálytalan double \"{0}\" érték a(z) \"{1}\" sorban, a(z) \"{2}\" "
+"könyvjelző fájlban"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Nem olvashatók könyvjelzők innen:<br>''{0}''<br>Hiba: {1}</html>"
+
msgid "Bookmarks"
msgstr "Könyvjelzők"
@@ -7449,9 +7650,6 @@ msgstr "A szélesség értéke [-90,90] tartományban kell legyen."
msgid "Value for longitude in range [-180,180] required."
msgstr "A hosszúság értéke [-180,180] tartományban kell legyen."
-msgid "Paste URL from clipboard"
-msgstr "URL beillesztése vágólapról"
-
msgid "Data Sources and Types:"
msgstr "Adatforrások és típusok:"
@@ -7530,21 +7728,8 @@ msgstr "Hivatkozók (szülő kapcsolatok) letöltése"
msgid "Download object"
msgstr "Objektum letöltése"
-msgid "Object type:"
-msgstr "Objektum típus:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "Kevert"
-
-msgid "Choose the OSM object type"
-msgstr "Válassz OSM objektumtípust"
-
-msgid "Object ID:"
-msgstr "Objektum ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Add meg a letöltendő objektum azonosítóját"
+msgid "Start downloading"
+msgstr "Letöltés megkezdése"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7556,28 +7741,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Jelöld ki, ha a kapcsolat tagjait is e kell tölteni"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Az objektumok azonosítóit vesszővel lehet elválasztani. <br/> Például: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Kevert módban a "
-"következőképp határozd meg az objektumokat:: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Hivatkozók (szülő kapcsolatok és utak) letöltése"
-msgid "Start downloading"
-msgstr "Letöltés megkezdése"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"A megadott ID lista érvénytelen\n"
-"Nem lehet objektumot letölteni."
-
msgid "Class Type"
msgstr "Kategória típus"
@@ -7692,8 +7858,8 @@ msgstr "Ugrás a következő oldalra"
msgid "Go to the JOSM help home page"
msgstr "Ugrás a JOSM súgó főoldalára"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Figyelmeztetés: rossz pozíció a HTML dokumentumban. Kivétel: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Hibás hely a HTML dokumentumban. Kivétel: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Nem sikerült megnyitni a súgóoldalt. A cél URL üres."
@@ -7805,6 +7971,9 @@ msgstr ""
"<html><strong>{0}</strong> változat ekkor készült: "
"<strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Módosításcsomag megjegyzése"
+
msgid "Changeset info"
msgstr "Módosításcsomag információi"
@@ -7917,8 +8086,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Az objektum még használatban van"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Figyelmeztetés: \"{0}\" hibafejléc nem egyezik egy várt mintával"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "{0} hibafejléc nem egyezik a várt mintával"
msgid "Upload"
msgstr "Feltöltés"
@@ -7940,6 +8109,12 @@ msgstr "Adj egy rövid magyarázatot a feltöltendő változtatásokhoz:"
msgid "Enter an upload comment"
msgstr "Adj meg egy feltöltési megjegyzést"
+msgid "Specify the data source for the changes:"
+msgstr "Add meg a módosítások adatforrását:"
+
+msgid "Enter a source"
+msgstr "Add meg a forrást:"
+
msgid "Changeset id:"
msgstr "Módosításcsomag azonosító:"
@@ -8010,11 +8185,10 @@ msgid "Closing changeset {0}"
msgstr "Módosításcsomag lezárása: {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Figyelmeztetés: nem sikerült a Hitelesítő Ablakot mindig-felülre állítani. "
-"Biztonsági kivételt okozott."
+"Nem sikerült a Hitelesítési Ablakot mindig felül állapotba állítani. "
+"Biztonsági kivétel történt."
msgid "Enter credentials for OSM API"
msgstr "OSM API hitelesítési adatok megadása"
@@ -8096,11 +8270,11 @@ msgid "Unpacking {0} into {1}"
msgstr "{0} kicsomagolása ide: {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Figyelmeztetés: ''{0}'' fájl letöltése sikertelen. ''{1}'' letöltési link "
-"nem egy érvényes URL. Letöltés átugrása."
+"\"{0}\" fájl nem letölthető. \"{1}\" letöltési link nem egy érvényes URL. "
+"Letöltés átugrása."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8116,11 +8290,9 @@ msgid "Missing user identity"
msgstr "Hiányzó felhasználói azonosító"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Figyelmeztetés: Nem sikerült a jelenlegi JOSM felhasználó adatainak "
-"lekérése. Kivétel: {0}"
+"Nem sikerült a jelenlegi JOSM felhasználó adatait lekérni. Kivétel: {0}"
msgid "Download objects"
msgstr "Objektumok letöltése"
@@ -8368,12 +8540,6 @@ msgstr "Megváltozott elemek feltöltése"
msgid "Please revise upload comment"
msgstr "Kérlek vizsgáld felül a feltöltési megjegyzést"
-msgid "Revise"
-msgstr "Felülvizsgálás"
-
-msgid "Continue as is"
-msgstr "Folytatás ahogy van"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8388,6 +8554,26 @@ msgstr ""
"/><br />Ha rászánsz egy kis időt a változtatásaid "
"elmagyarázására,<br>megkönnyíted más szerkesztők életét."
+msgid "Please specify a changeset source"
+msgstr "Töltsd ki a módosításcsomag forrását"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"Nem adtad meg a módosításaid forrását.<br />Ez technikailag megengedett, de "
+"a forrás megadásának célja az, <br /> hogy a többiekmegtudják, honnan "
+"származik az adat.<br /><br />Fordíts egy percet a módosításod leírására,<br "
+"/>ezzel megkönnyíted sok más térképező életét."
+
+msgid "Revise"
+msgstr "Felülvizsgálás"
+
+msgid "Continue as is"
+msgstr "Folytatás ahogy van"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "Visszatérés az előző ablakoz egy jobb megjegyzés megadásáért"
@@ -8403,6 +8589,25 @@ msgstr "Előbb ajd meg egy valós tömbméretet"
msgid "Illegal chunk size"
msgstr "érvénytelen tömbméret"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>Az alábbi módosításcsomag címke üres kulcs-érék párt "
+"tartalmaz:<br>{0}<br>Folytatod?</html>"
+msgstr[1] ""
+"<html>Az alábbi módosításcsomag címkék üres kulcs-érék párokat "
+"tartalmaznak:<br>{0}<br>Folytatod?</html>"
+
+msgid "Empty metadata"
+msgstr "Üres metaadat"
+
msgid "Cancel the upload and resume editing"
msgstr "Feltöltés megszakítása és szerkesztés folytatása"
@@ -8410,11 +8615,11 @@ msgid "Tags of changeset {0}"
msgstr "{0} módosításcsomag címkéi"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Figyelmeztetés: ''{0}'' objektum már törölve lett a szerveren. Objektum "
-"átugrása és feltöltés újrapróbálása."
+"\"{0}\" objektum már törölve lett a szerverről. Objektum átugrása és "
+"feltöltés újrapróbálása."
msgid "Preparing objects to upload ..."
msgstr "Objektumok előkészítése feltöltéshez ..."
@@ -8550,9 +8755,6 @@ msgstr "''{0}'' kapcsolat már törölve lett. Objektum átugrása feltöltésn
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "''{0}'' objektum már törölve lett. Objektum átugrása feltöltésnél."
-msgid "Warning: {0}"
-msgstr "Figyelmeztetés: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "{0} objektum feltöltése..."
@@ -8564,6 +8766,9 @@ msgstr ""
"Elkapott kivétel figyelmen kívül hagyása megszakított feltöltés miatt. A "
"kivétel : {0}"
+msgid "Upload successful!"
+msgstr "A feltöltés sikeres!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8584,10 +8789,8 @@ msgstr "Objektumok kijelölése feltöltésre"
msgid "Cancel uploading"
msgstr "Feltöltés megszakítása"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
-"Figyelmeztetés: nem várt érték ''{0}'' kulcshoz a beállításokban, kapott: "
-"''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr "Nemvárt érték \"{0}\" kulcshoz a beállításokban: \"{1}\""
msgid "Please select the upload strategy:"
msgstr "Kérlek válassz feltöltési startégiát:"
@@ -8739,7 +8942,7 @@ msgstr "Következő jelölő"
msgid "Jump to next marker"
msgstr "Ugrás a következő jelölőhöz"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Előző jelölő"
msgid "Jump to previous marker"
@@ -8772,8 +8975,8 @@ msgstr "{0} változat"
msgid "Merging layers"
msgstr "Rétegek egyesítése"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Figyelmeztetés: kevert 0.6 és 0.5 adateredmények 0.5 verzióban"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "0.6 és 0.5 adat eredmények vegyítése 0.5 verzióban"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8893,6 +9096,9 @@ msgstr "több részlet megjelenítéséhez növeld a nagyítást"
msgid "No tiles at this zoom level"
msgstr "Nincs csempe ezen a nagyítási szinten"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "TMS réteg ({0}), letöltés {1} zoomszinten"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326 és Mercator vetület támogatott"
@@ -8931,6 +9137,9 @@ msgstr "Hibás csempék újratöltése"
msgid "Alpha channel"
msgstr "Alfa csatorna"
+msgid "Automatically change resolution"
+msgstr "Automatikus felbontás váltás"
+
msgid "Set WMS Bookmark"
msgstr "WMS könyvjelző beállítása"
@@ -9143,9 +9352,6 @@ msgstr "GPS helyek kibontása az EXIF adatokból"
msgid "Starting directory scan"
msgstr "Könyvtárátvizsgálás indítása"
-msgid "One of the selected files was null"
-msgstr "Az egyik kiválasztott fájl üres volt"
-
msgid "Read photos..."
msgstr "Képek olvasása..."
@@ -9164,6 +9370,9 @@ msgstr "Nulla fájl található a(z) {0} könyvtárban\n"
msgid "Error while getting files from directory {0}\n"
msgstr "{0} könyvtár olvasása közben hiba történt\n"
+msgid "One of the selected files was null"
+msgstr "Az egyik kiválasztott fájl üres volt"
+
msgid "Geotagged Images"
msgstr "Geotagelt képek"
@@ -9223,6 +9432,12 @@ msgstr "Következő"
msgid "Show next Image"
msgstr "Mutasd a következő képet"
+msgid "Show first Image"
+msgstr "Első kép megjelenítése"
+
+msgid "Show last Image"
+msgstr "Utolsó kép megjelenítése"
+
msgid "Center view"
msgstr "Képhez ugrás (nézet közepére)"
@@ -9305,9 +9520,6 @@ msgstr ""
"<html>Feldolgozatlan GPS adatok térképadatként való feltöltése káros "
"lehet.<br>Ha nyomvonalat szeretnél feltölteni, itt teheted:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Nyomvonalrajzolás személyre szabása"
@@ -9320,8 +9532,11 @@ msgstr "Eddig"
msgid "No timestamp"
msgstr "Időbélyeg nélküli"
-msgid "Download from OSM along this track"
-msgstr "Letöltés OSM-ből e nyomvonal mentén"
+msgid "Select to download OSM data."
+msgstr "Jelöld be az OSM térképi adatok letöltéséhez."
+
+msgid "Select to download GPS traces."
+msgstr "Jelöld be a GPS nyomvonalak letöltéséhez."
msgid "Download everything within:"
msgstr "Minden letöltése ezen belül:"
@@ -9347,16 +9562,18 @@ msgstr "csak útpontok"
msgid "track and waypoints"
msgstr "nyomvonal és útpontok"
+msgid "Click to download"
+msgstr "Kattints a letöltéshez"
+
+msgid "Click to cancel"
+msgstr "Kattints a bezáráshoz"
+
+msgid "Download from OSM along this track"
+msgstr "Letöltés OSM-ből e nyomvonal mentén"
+
msgid "Calculating Download Area"
msgstr "Letöltési terület kiszámítása"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>A művelet {0} egyedi letöltési kérést igényel.<br>Szeretnéd "
-"folytatni?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Légifelvétel képszeletek előtöltése a nyomvonal mentén"
@@ -9398,16 +9615,21 @@ msgstr "Hangjelölők innen: {0}"
msgid "No GPX track available in layer to associate audio with."
msgstr ""
+"Nem érhető el az audiofelvételhez társítható GPX nyomvonal a rétegen."
msgid ""
"Some waypoints with timestamps from before the start of the track or after "
"the end were omitted or moved to the start."
msgstr ""
+"Néhány időbélyeggel rendelkező útpont a nyomvonal kezdete előttről vagy vége "
+"utánról el lett hagyva, vagy az elejére lett mozgatva."
msgid ""
"Some waypoints which were too far from the track to sensibly estimate their "
"time were omitted."
msgstr ""
+"Néhány útpont el lett hagyva, mert az időpontjuk ésszerű becsléshez túl "
+"messze voltak a nyomvonaltól."
msgid "Import images"
msgstr "Képek importálása"
@@ -9428,79 +9650,84 @@ msgid "Named Trackpoints from {0}"
msgstr "Elnevezett útpontok innen {0}"
msgid "gps marker"
-msgstr ""
+msgstr "gps jelölő"
msgid "marker"
msgid_plural "markers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "jelölő"
+msgstr[1] "jelölők"
msgid "{0} consists of {1} marker"
msgid_plural "{0} consists of {1} markers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} {1} jelölőből áll"
+msgstr[1] "{0} {1} jelölőből áll"
msgid "No existing audio markers in this layer to offset from."
-msgstr ""
+msgstr "Nincsenek audio jelölők a rétegen az eltoláshoz."
msgid "Show Text/Icons"
-msgstr ""
+msgstr "Szöveg/ikonok megjelenítése"
msgid "Toggle visible state of the marker text and icons."
-msgstr ""
+msgstr "A jelölő szövegének és ikonjának láthatóságát váltja."
msgid "Synchronize Audio"
-msgstr ""
+msgstr "Audio szinkronizálása"
msgid ""
"You need to pause audio at the moment when you hear your synchronization cue."
msgstr ""
+"Kattints a Szünetre abban a pillanatban, amint meghallod a szinkronizációs "
+"utasításodat."
msgid "Audio synchronized at point {0}."
-msgstr ""
+msgstr "Audio szinkronizálva ennél a pontnál: {0}."
msgid "Unable to synchronize in layer being played."
-msgstr ""
+msgstr "Nem lehet szinkronizálni a lejátszott rétegen."
msgid "Make Audio Marker at Play Head"
-msgstr ""
+msgstr "Audio Jelölő készítése a lejátszófejnél"
msgid ""
"You need to have paused audio at the point on the track where you want the "
"marker."
msgstr ""
+"Szüneteltetned kell az audio lejátszását a nyomvonal azon pontjánál, ahova "
+"jelölőt szeretnél rakni."
msgid ""
"You need to drag the play head near to the GPX track whose associated sound "
"track you were playing (after the first marker)."
msgstr ""
+"Mozgasd a lejátszófejet a GPX nyomvonal közelébe, amihez a lejátszandó "
+"hangfelvételt hozzárendelted (az első jelölő után)."
msgid ""
"You need to SHIFT-drag the play head onto an audio marker or onto the track "
"point where you want to synchronize."
msgstr ""
+"A Shift-et lenyomva mozgasd a lejátszófejet egy hangjelölőre, vagy egy "
+"útpontra, ahova szinkronizálni szeretnél."
msgid "Unable to create new audio marker."
-msgstr ""
+msgstr "Nem lehet új audio jelzőt készíteni."
msgid "There was an error while trying to display the URL for this marker"
-msgstr ""
+msgstr "Hiba történt, a jelölő URL-ének megjelenítése közben"
msgid "(URL was: "
-msgstr ""
-
-msgid "Error displaying URL"
-msgstr ""
+msgstr "(Az URL: "
msgid "Select the map painting styles"
msgstr "Térképrajz stílusának kiválasztása"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
+"Nem sikerült betölteni a térképstílusokat innen: \"{0}\". Kivétel: {1}"
msgid "loading style ''{0}''..."
-msgstr ""
+msgstr "stílus betöltése: ''{0}''..."
msgid ""
"There was an error when loading this style. Select ''Info'' from the right "
@@ -9509,76 +9736,85 @@ msgid_plural ""
"There were {0} errors when loading this style. Select ''Info'' from the "
"right click menu for details."
msgstr[0] ""
+"Egy hiba történt a stílus betöltésekor. További információkért kattints az "
+"\"Infó\" elemre a jobb egérgomb menüből."
msgstr[1] ""
+"{0} hiba történt a stílus betöltésekor. További információkért kattints az "
+"\"Infó\" elemre a jobb egérgomb menüből."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr ""
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr "Nem sikerült értelmezni a térképstílusokat itt: \"{0}\". Hiba: {1}"
msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Szabálytalan dash minta, az érték pozitív kell legyen"
msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
+msgstr "Szabálytalan dash minta, legalább egy érték > 0 kell legyen"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
+"Nem sikerült értelmezni a térképstílusokat itt: \"{0}\". Hiba: [{1}:{2}] {3}"
msgid "Access Token Key:"
-msgstr ""
+msgstr "Elérési token kulcs:"
msgid "Access Token Secret:"
-msgstr ""
+msgstr "Elérési token titok:"
msgid "Save Access Token in preferences"
-msgstr ""
+msgstr "A token mentése a beállításokba"
msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
+"<html>Válaszd ki a token mentéséhez a JOSM beállításaiba.<br>Kikapcsolásakor "
+"a token csak ebben a munkamenetben lesz érvényes.</html>"
msgid "Use default settings"
-msgstr ""
+msgstr "Alapbeállítások használata"
msgid "Consumer Key:"
-msgstr ""
+msgstr "Fogyasztói Kulcs:"
msgid "Consumer Secret:"
-msgstr ""
+msgstr "Fogyasztói Titok:"
msgid "Request Token URL:"
-msgstr ""
+msgstr "Kérelmi Token URL:"
msgid "Access Token URL:"
-msgstr ""
+msgstr "Elérési token URL:"
msgid "Authorize URL:"
-msgstr ""
+msgstr "Jóváhagyási URL:"
msgid "Click to reset the OAuth settings to default values"
-msgstr ""
+msgstr "Kattints az OAuth beállítások alapértékre visszaállításához"
msgid "Click to abort resetting to the OAuth default values"
msgstr ""
+"Kattints ha mégsem akarod alapértékre állítani az OAuth beállításokat"
msgid ""
"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
"current custom settings are not saved.</html>"
msgstr ""
+"<html>A JOSM alapértékre fogja visszaállítani az OAuth beállításokat.<br>A "
+"jelenlegi beállítások nem kerülnek mentésre.</html>"
msgid "Overwrite custom OAuth settings?"
-msgstr ""
+msgstr "Felülírod az egyedi OAuth beállításokat?"
msgid "Fully automatic"
-msgstr ""
+msgstr "Teljesen automatikus"
msgid "Semi-automatic"
-msgstr ""
+msgstr "Félautomatikus"
msgid "Manual"
-msgstr ""
+msgstr "Manuális"
msgid ""
"<html>Run a fully automatic procedure to get an access token from the OSM "
@@ -9586,6 +9822,10 @@ msgid ""
"fully<br>automatically authorizes the user and retrieves an Access "
"Token.</html>"
msgstr ""
+"<html>A teljesen automatikus módszerrel az OSM weblapról kapsz egy elérési "
+"tokent.<br>A JOSM a JOSM felhasználó nevében kapcsolódik a weblaphoz és "
+"teljesen<br>automatikusan azonosítja a felhasználót és fogad egy Elérési "
+"Tokent.</html>"
msgid ""
"<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -9594,11 +9834,18 @@ msgid ""
"external browser<br>to authenticate itself and to accept the request token "
"submitted by JOSM.</html>"
msgstr ""
+"<html>A félautomatikus módszerrel az OSM weblapról kapsz egy elérési "
+"tokent.<br>A JOSM egy szabványos OAuth kérést küld, hogy egy Kérelem Tokent "
+"és egy<br> Elérési Tokent kapjon. Átirányítja a felhasználót egy külső "
+"böngészőben,<br>hogy azonosítsa magát és fogadja el a JOSM által küldött "
+"kérelem tokent.</html>"
msgid ""
"<html>Enter an Access Token manually if it was generated and retrieved "
"outside<br>of JOSM.</html>"
msgstr ""
+"<html>Írd be az Elérési Tokent manuálisan, ha az a JOSM-on kívül lett "
+"létrehozva és fogadva.</html>"
msgid ""
"Please enter your OSM user name and password. The password will "
@@ -9606,71 +9853,83 @@ msgid ""
"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
"data upload requests don''t use your password any more."
msgstr ""
+"Írd be az OSM felhasználónevedet és jelszavadat. A jelszó "
+"<strong>nem</strong> kerül mentésre egyszerű szövegként a JOSM beállításaiba "
+"és <strong>mindössze</strong> egyszer lesz elküldve az OSM szervernek. A "
+"jövőbeni kérések már egyáltalán nem fogják a jelszót használni."
msgid "Username: "
-msgstr ""
+msgstr "Felhasználónév: "
msgid "Password: "
-msgstr ""
+msgstr "Jelszó: "
msgid ""
"<strong>Warning:</strong> JOSM does login <strong>once</strong> using a "
"secure connection."
msgstr ""
+"<strong>Figyelmeztetés:</strong> A JOSM <strong>egyszer</strong> be fog "
+"lépni biztonságos kapcsolaton."
msgid "Granted rights"
-msgstr ""
+msgstr "Engedélyezett jogok"
msgid "Advanced OAuth properties"
-msgstr ""
+msgstr "Haladó OAuth beállítások"
msgid "Accept Access Token"
-msgstr ""
+msgstr "Elérési Token elfogadása"
msgid ""
"<html>You have successfully retrieved an OAuth Access Token from the OSM "
"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
"in subsequent requests to gain access to the OSM API.</html>"
msgstr ""
+"<html>Sikeresen fogadtál egy OAuth Elérési Tokent az OSM weboldalról. "
+"Kattints <strong>{0}</strong>-ra hogy elfogadd ezt a tokent. A JOSM ezt "
+"fogja használni a jövőben az OSM API-ra való csatlakozáshoz."
msgid "Authorize now"
-msgstr ""
+msgstr "Elfogadás most"
msgid "Click to redirect you to the authorization form on the JOSM web site"
-msgstr ""
+msgstr "Kattints, hogy megjelenjen az OSM weboldal jóváhagyási űrlapja"
msgid "Back"
msgstr "Vissza"
msgid "Run the automatic authorization steps again"
-msgstr ""
+msgstr "Az automatikus lépések ismételt lefuttatása"
msgid "Test Access Token"
-msgstr ""
+msgstr "Az elérési token kipróbálása"
msgid "Please enter your OSM user name"
-msgstr ""
+msgstr "Írd be az OSM felhasználónevedet"
msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
+msgstr "A név nem lehet üres. Kérjük, írd be az OSM felhasználónevedet"
msgid "Please enter your OSM password"
-msgstr ""
+msgstr "Írd be az OSM jelszavadat"
msgid "The password cannot be empty. Please enter your OSM password"
-msgstr ""
+msgstr "A jelszó nem lehet üres. Kérjük, írd be az OSM jelszavadat"
msgid "Authorize JOSM to access the OSM API"
-msgstr ""
+msgstr "Az OSM API elérésnének jóváhagyása a JOSM számára"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
"OSM server failed.<br><br>Please try again or choose another kind of "
"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
msgstr ""
+"<html>Az OAuth Elérési Token automatikus fogadása az<br>OSM szerverről "
+"meghiúsult.<br><br>Próbáld meg újra vagy válassz másfajta azonosítási "
+"folyamatot,<br>pl. félautomatikus vagy manuális azonosítás.</html>"
msgid "OAuth authorization failed"
-msgstr ""
+msgstr "OAuth azonosítás sikertelen"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -9678,170 +9937,203 @@ msgid ""
"from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your "
"advanced setting and try again.</html>"
msgstr ""
+"<html>Az OAuth Elérési Token automatikus fogadása az<br>OSM szerverről "
+"meghiúsult mert a JOSM nem tudott összerakni<br>egy érvényes belépési URL-t "
+"az OAuth Azonosítási Végpont URL-ből \"{0}\".<br><br>Ellenőrizd a haladó "
+"beállításokat majd próbáld újra.</html>"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
"OSM server failed. JOSM failed to log into {0}<br>for user "
"{1}.<br><br>Please check username and password and try again.</html>"
msgstr ""
+"<html>Az OAuth Elérési Token automatikus fogadása az<br>OSM szerverről "
+"meghiúsult.<br> A JOSM nem tudott belépni a {0}<br>címen, \"{1}\" "
+"felhasználóval.<br><br>Ellenőrizd a felhasználónevet és a jelszót, majd "
+"próbáld újra.</html>"
msgid ""
"Please enter an OAuth Access Token which is authorized to access the OSM "
"server ''{0}''."
msgstr ""
+"Add meg az OAuth Elérési Tokent, melyet jóváhagytál az OSM szerver "
+"eléréséhez \"{0}''."
msgid "Access Token"
-msgstr ""
+msgstr "Elérési Token"
msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "Haladó OAuth paraméterek"
msgid "Enter the OAuth Access Token"
-msgstr ""
+msgstr "Írd be az OAuth Elérési Tokent"
msgid "Enter advanced OAuth properties"
-msgstr ""
+msgstr "Add meg a haladó OAuth beállításokat"
msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
+"<html><body>Add meg az OAuth elérési tokent, melyet jóváhagytál az OSM "
+"szerver eléréséhez \"{0}''.</body></html>"
msgid "Please enter an Access Token Key"
-msgstr ""
+msgstr "Írd be az Elérési Token Kulcsot."
msgid ""
"The Access Token Key must not be empty. Please enter an Access Token Key"
msgstr ""
+"Az Elérési Token Kulcs nem lehet üres. Kérjük, írd be az Elérési Token "
+"Kulcsot."
msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "Írd be az Elérési Token Titkot"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
"Secret"
msgstr ""
+"Az Elérési Token Titok nem lehet üres. Kérjük, írd be az Elérési Token "
+"Titkot."
msgid "Click to test the Access Token"
-msgstr ""
+msgstr "Kattints a token kipróbálásához."
msgid ""
"With OAuth you grant JOSM the right to upload map data and GPS tracks on "
"your behalf (<a href=\"{0}\">more info...</a>)."
msgstr ""
+"Az OAuthtal jogosultságot adsz a JOSM-nak, hogy térképi adatokat és GPS "
+"nyomvonalat töltsön fel a nevedben (<a href=\"{0}\">további "
+"információk...</a>)."
msgid "Please select an authorization procedure: "
-msgstr ""
+msgstr "Válassz egy azonosítási folyamatot: "
msgid "Get an Access Token for ''{0}''"
-msgstr ""
+msgstr "Elérési Token beszerzése: \"{0}\""
msgid "Close the dialog and cancel authorization"
-msgstr ""
+msgstr "Bezárja az ablakot az azonosítás megszakításával"
msgid "Close the dialog and accept the Access Token"
-msgstr ""
+msgstr "Bezárja az ablakot az Elérési Token elfogadásával"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr ""
+msgid "Failed to cancel running OAuth operation"
+msgstr "Nem sikerült megszakítani az OAuth műveletet"
msgid "Retrieving OAuth Request Token from ''{0}''"
-msgstr ""
+msgstr "Az OAuth Kérelmi Token fogadása innen: \"{0}\""
msgid "Retrieving OAuth Access Token from ''{0}''"
-msgstr ""
+msgstr "Az OAuth Elérési Token fogadása innen: \"{0}\""
msgid "OSM website did not return a session cookie in response to ''{0}'',"
msgstr ""
+"Az OSM weboldal nem küldött vissza munkafolyamat sütit erre a kérésre: "
+"\"{0}\"."
msgid ""
"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
msgstr ""
+"Nem sikerült a \"{0}\" felhasználó azonosítása a \"***\" jelszóval mint "
+"OAuth felhasználó"
msgid "Failed to authorize OAuth request ''{0}''"
-msgstr ""
+msgstr "Nem sikerült az OAuth kérés jóváhagyása: \"{0}\""
msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
+msgstr "Az OAuth Kérelem Token \"{0}\" jováhagyása az OSM weboldalon..."
msgid "Initializing a session at the OSM website..."
-msgstr ""
+msgstr "Munkafolyamat megnyitása az OSM weboldalon..."
msgid "Authenticating the session for user ''{0}''..."
-msgstr ""
+msgstr "A munkafolyamat azonosítása \"{0}\" felhasználóként..."
msgid "Authorizing request token ''{0}''..."
-msgstr ""
+msgstr "A kérelmi token \"{0}\" jóváhagyása..."
msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Kijelentkezés a munkafolyamatból \"{0}\"..."
msgid "Allow to upload map data"
-msgstr ""
+msgstr "Térképadatok feltöltésének engedélyezése"
msgid "Select to grant JOSM the right to upload map data on your behalf"
-msgstr ""
+msgstr "Válaszd ki, hogy a JOSM a nevedben térképi adatokat tölthessen fel"
msgid "Allow to upload GPS traces"
-msgstr ""
+msgstr "GPS nyomvonalak feltöltésének engedélyezése"
msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
-msgstr ""
+msgstr "Válaszd ki, hogy a JOSM a nevedben GPS nyomvonalakat tölthessen fel"
msgid "Allow to download your private GPS traces"
-msgstr ""
+msgstr "Saját GPS nyomvonalak letöltésének engedélyezése"
msgid ""
"Select to grant JOSM the right to download your private GPS traces into JOSM "
"layers"
msgstr ""
+"Válaszd ki, hogy a JOSM a saját GPS nyomvonalaidat JOSM rétegekre tölthesse "
+"le"
msgid "Allow to read your preferences"
-msgstr ""
+msgstr "Saját beállítások olvasásának engedélyezése"
msgid "Select to grant JOSM the right to read your server preferences"
-msgstr ""
+msgstr "Válaszd ki, hogy a JOSM olvashassa a beállításaidat a szerveren"
msgid "Allow to write your preferences"
-msgstr ""
+msgstr "Saját beállítások írásának engedélyezése"
msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
+msgstr "Válaszd ki, hogy a JOSM módossíthassa a beállításaidat a szerveren"
+
+msgid "Allow modifications of notes"
+msgstr "Jegyzetek módosításnak engedélyezése"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Válaszd ki, hogy a JOSM a nevedben a jegyzeteket módosítsa"
msgid "Retrieving OAuth Access Token..."
-msgstr ""
+msgstr "OAuth Elérési Token fogadása..."
msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
-msgstr ""
+msgstr "<html>Az OAuth Elérési Token fogadása nem sikerült ''{0}''.</html>"
msgid "Request Failed"
-msgstr ""
+msgstr "Kérelem sikertelen"
msgid "Retrieving OAuth Request Token..."
-msgstr ""
+msgstr "OAuth Kérelmi Token fogadása..."
msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr ""
+msgstr "<html>Az OAuth Kérelmi Token fogadása nem sikerült ''{0}''.</html>"
msgid "Display Advanced OAuth Parameters"
-msgstr ""
+msgstr "Haladó OAuth paraméterek megjelenítése"
msgid "Retrieve Request Token"
-msgstr ""
+msgstr "Kérelmi Token beszerzése"
msgid ""
"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
"Token from ''{1}''.</html>"
msgstr ""
+"<html>Kattints a <strong>{0}</strong> gombra, hogy az OAuth Kérelmi Token "
+"letöltéséhez: ''{1}''.</html>"
msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr ""
+msgstr "<html>1/3 lépés: OAuth Kérelmi Token beszerzése</html>"
msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr ""
+msgstr "<html>2/3 lépés: Elérési Token jóváhagyása és letöltése</html>"
msgid "Request Access Token"
-msgstr ""
+msgstr "Elérési Token beszerzése"
msgid ""
"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
@@ -9852,48 +10144,61 @@ msgid ""
"copy the following authorize URL and paste it into the address field of your "
"browser.</html>"
msgstr ""
+"<html>A JOSM sikeresen fogadta a Kérelmi Tokent. A JOSM most megnyitja a "
+"jóváhagyási oldalt egy külső böngészőben. Kérjük, lépj be az OSM "
+"felhasználóneveddel és jelszavaddal és kövesd a képernyőn megjelenő "
+"utasításokat a Kérelmi Token jóváhagyásához. Majd térj vissza ehhez az "
+"ablakhoz és kattints a <strong>{0}</strong> gombra.<br><br>Ha a böngésző nem "
+"nyílik meg, másold át ezt a jóváhagyási URL címet a böngésződbe.</html>"
msgid "Go back to step 1/3"
-msgstr ""
+msgstr "Vissza az 1/3-as lépéshez"
msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr ""
+msgstr "<html>3/3 lépés: Elérési Token fogadása sikerült</html>"
msgid ""
"<html>JOSM has successfully retrieved an Access Token. You can now accept "
"this token. JOSM will use it in the future for authentication and "
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-
-msgid "Restart"
-msgstr ""
+"<html>A JOSM sikeresen letöltötte az Elérési Tokent. Ezt most elfogadhatod. "
+"A JOSM ezt fogja használni a jövőben az azonosításhoz az OSM "
+"szerveren.<br><br>Az elérési token:</html>"
msgid "Click to retrieve a Request Token"
-msgstr ""
+msgstr "Kattints a Kérelmi Token fogadásához"
msgid "Retrieve Access Token"
-msgstr ""
+msgstr "Elérési Token fogadása"
msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "Kattints az Elérési Token fogadásához"
msgid "Testing OAuth Access Token"
-msgstr ""
+msgstr "Az OAuth Elérési Token kipróbálása"
msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
msgstr ""
+"A felhasználói adatok letöltése az \"{0}\" Elérési Token Kulccsal "
+"elutasításra került."
msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
msgstr ""
+"A felhasználói adatok letöltése az \"{0}\" Elérési Token Kulccsal "
+"megtagadásra került."
msgid ""
"<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
"''{3}''.</html>"
msgstr ""
+"<html>\"{0}\" Elérési Tokennek sikeresen elérhető az OSM szerver a \"{1}\" "
+"címen.<br>Az OSM szervert \"{2}\" felhasználóként, \"{3}\" azonosítóval "
+"érted el.</html>"
msgid "Success"
-msgstr ""
+msgstr "Sikerült"
msgid ""
"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
@@ -9901,9 +10206,12 @@ msgid ""
"not<br>be able to access any protected resource on this server using this "
"token.</html>"
msgstr ""
+"<html>Az OSM szerver elérése (\"{0}\") nem sikerült<br>a \"{1}\" Elérési "
+"Tokennel.<br>A szerver megtagadta a tokent mint nem jóváhagyott. Nem "
+"fogod<br>elérni a szerver védett funkcióit ezzel a tokennek.</html>"
msgid "Test failed"
-msgstr ""
+msgstr "Nem sikerült"
msgid ""
"<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
@@ -9912,9 +10220,14 @@ msgid ""
"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
"other protected resources.</html>"
msgstr ""
+"<html>A \"{1}\" Elérési Token ismert az OSM szerver számára "
+"(\"{0}\").<br>Habár, a felhasználói adatok letöltése ezzel a tokennel "
+"meghiúsult.<br>Attól függően, hogy milyen jogosultságokat biztosítottál "
+"ennek a tokennek, lehetséges lehet<br>térpép adatok vagy GPS nyomvonalak "
+"feltöltése és egyéb védett funkciók elérése.</html>"
msgid "Token allows restricted access"
-msgstr ""
+msgstr "A token korlátozott hozzáférést engedélyez"
msgid ""
"<html>Failed to retrieve information about the current user from the OSM "
@@ -9922,29 +10235,39 @@ msgid ""
"Access Token, but<br>rather a problem with the server configuration. "
"Carefully check the server<br>URL and your Internet connection.</html>"
msgstr ""
+"<html>Nem sikerült információkat letölteni az aktuális felhasználóról az OSM "
+"szerverről \"{0}\".<br>Ez valószínűleg nem az alkalmazott Elérési Token "
+"problémája, <br>hanem a szerverre vonatkozó hibás "
+"beállítások.<br>Figyelmesen olvasd át a szerver URL-jét és ellenőrizd az "
+"internet kapcsolatodat.</html>"
msgid ""
"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
"''{1}''.<br>The token ist probably invalid.</html>"
msgstr ""
+"<html>Nem sikerült aláírni a kérelmet az OSM szerverhez \"{0}\" a \"{1}\" "
+"tokennel.<br>Ez a token valószínűleg hibás.</html>"
msgid ""
"<html>The test failed because the server responded with an internal "
"error.<br>JOSM could not decide whether the token is valid. Please try again "
"later.</html>"
msgstr ""
+"<html>A kipróbálás nem sikerült, mert a szerver belső hibát jelzett.<br>A "
+"JOSM így nem tudja eldönteni, hogy ez a token érvényes-e. Próbáld meg "
+"később.</html>"
msgid "Retrieving user info..."
-msgstr ""
+msgstr "Felhasználói adatok fogadása..."
msgid "Audio Settings"
-msgstr ""
+msgstr "Audió beállítások"
msgid "Settings for the audio player and audio markers."
-msgstr ""
+msgstr "Hanglejátszó és hangjelzők beállításai."
msgid "Display the Audio menu."
-msgstr ""
+msgstr "Audio menü megjelenítése"
msgid "Label audio (and image and web) markers."
msgstr ""
@@ -9953,27 +10276,30 @@ msgid "Display live audio trace."
msgstr ""
msgid "Explicit waypoints with valid timestamps."
-msgstr ""
+msgstr "Explicit útpontok érvényes időbélyeggel."
msgid "Explicit waypoints with time estimated from track position."
-msgstr ""
+msgstr "Explicit útpontok a nyomvonal pozíciójából becsült idővel."
msgid "Named trackpoints."
-msgstr ""
+msgstr "Elnevezett útpontok."
msgid "Modified times (time stamps) of audio files."
msgstr ""
msgid "Start of track (will always do this if no other markers available)."
msgstr ""
+"Nyomvonal eleje (mindig ezt fogja csinálni, ha nincs elérhető jelölő)"
msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
+msgstr "Megjeleníti vagy elrejti az audio menüelemet a felső menüsorról."
msgid ""
"Display a moving icon representing the point on the synchronized track where "
"the audio currently playing was recorded."
msgstr ""
+"Megjelenít egy mozgó ikont, ami a szinkronizált nyomvonal azon pontját "
+"mutatja, ahol a pillanatnyilag lejátszott hang fel lett véve."
msgid ""
"Put text labels against audio (and image and web) markers as well as their "
@@ -9981,10 +10307,10 @@ msgid ""
msgstr ""
msgid "When importing audio, make markers from..."
-msgstr ""
+msgstr "Audio importálásakor készíts jelölőket innen..."
msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
+msgstr "Audio importálásakor alkalmazd a GPX réteg minden útpontjára."
msgid ""
"Automatically create audio markers from trackpoints (rather than explicit "
@@ -10000,15 +10326,16 @@ msgid ""
"The number of seconds to jump forward or back when the relevant button is "
"pressed"
msgstr ""
+"Az előre vagy hátra ugrás másodperceinek száma, amikor a gombot megnyomtad"
msgid "Forward/back time (seconds)"
-msgstr ""
+msgstr "Előre/hátra tekerés ideje (másodperc)"
msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
+msgstr "A gyorstekerésnél használt sebességszorzó"
msgid "Fast forward multiplier"
-msgstr ""
+msgstr "Gyorstekerés szorzója"
msgid ""
"Playback starts this number of seconds before (or after, if negative) the "
@@ -10019,10 +10346,10 @@ msgid "Lead-in time (seconds)"
msgstr ""
msgid "The ratio of voice recorder elapsed time to true elapsed time"
-msgstr ""
+msgstr "A hangrögzítő eltelt idejének aránya a valós eltelt időhöz"
msgid "Voice recorder calibration"
-msgstr ""
+msgstr "Hangrögzítő kalibráció"
msgid "Configure available plugins."
msgstr "Elérhető bővítmények konfigurálása."
@@ -10116,6 +10443,9 @@ msgstr "Bővítmények letöltése"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Egyes beállítások érvénybe lépéséhez újra kell indítanod a JOSM-ot."
+msgid "Would you like to restart now?"
+msgstr "Most újraindítod?"
+
msgid "Remote Control"
msgstr "Távirányító"
@@ -10248,6 +10578,12 @@ msgstr "Eltávolítás az eszköztárról"
msgid "Configure toolbar"
msgstr "Eszköztár beállítása"
+msgid "Edit shortcut"
+msgstr "Gyorsbillentyű szerkesztése"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Ne rejtse el az eszköztárat és a menüt"
+
msgid "Actions"
msgstr "Műveletek"
@@ -10290,6 +10626,9 @@ msgstr "Bejegyzett eszköztárművelet név nélkül: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "{0} bejegyzett eszköztárművelet felülírva: {1} lesz {2}"
+msgid "Toolbar: {0}"
+msgstr "Eszköztár: {0}"
+
msgid "Data validator"
msgstr "Adatellenőrző"
@@ -10343,24 +10682,12 @@ msgstr "Keresés: "
msgid "Read from file"
msgstr "Olvasás fájlból"
-msgid "Open JOSM customization file"
-msgstr "JOSM beállításfájl megnyitása"
-
-msgid "Import log"
-msgstr "Importálási napló"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Ez a fájlimport összefoglaló. <br/>Eldobhatod a beállítás változásokat "
-"a \"Mégsem\" gombra kattintva<br/>Néhány változtatás aktiválásához újra kell "
-"indítanod a JOSM-et.</html>"
-
msgid "Export selected items"
msgstr "Kijelöltek exportálása"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM beállítófájlok (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Kérlek válassz néhány beállítási kulcsot, amik nincsenek alapértelmezettnek "
@@ -10378,43 +10705,58 @@ msgstr "Beállítások hozzáfűzése a fájlból a meglévő értékekhez"
msgid "Replace existing values"
msgstr "Meglévő értékek lecserélése"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM beállítófájlok (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "JOSM beállításfájl megnyitása"
-msgid "Advanced Background: Changed"
-msgstr ""
+msgid "Import log"
+msgstr "Importálási napló"
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
+"<html>Ez a fájlimport összefoglaló. <br/>Eldobhatod a beállítás változásokat "
+"a \"Mégsem\" gombra kattintva<br/>Néhány változtatás aktiválásához újra kell "
+"indítanod a JOSM-et.</html>"
-msgid "Current value is default."
-msgstr "A jelenlegi érték az alapértelmezett."
+msgid "shortcut"
+msgstr "Gyorsbillentyű"
-msgid "Default value is ''{0}''."
-msgstr "Alapértelmezett érték: \"{0}\"."
+msgid "color"
+msgstr "szín"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Alapértelmezett érték pillanatnyilag ismeretlen (a beállítás most nincs "
-"használatban)."
+msgid "toolbar"
+msgstr "eszköztár"
-msgid "Select Setting Type:"
-msgstr "Válassz beállítás típust:"
+msgid "imagery"
+msgstr "Légifelvétel"
-msgid "Simple"
-msgstr "Egyszerű"
+msgid "Reset preferences"
+msgstr "Beállítások visszaállítása"
-msgid "List"
-msgstr "Lista"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Az összes beállítás alapértékre állítását kezdeményezted<br />Minden "
+"beállításod törlődni fog: Bővítmények, Légifelvétel források, Eszköztár "
+"gombok, Billentyűzet stb.<br />Biztos, hogy visszaállítod?"
-msgid "List of lists"
-msgstr "Listák listája"
+msgid "Load profile"
+msgstr "Profil betöltése"
-msgid "List of maps"
-msgstr "Térképek listája"
+msgid "Save {0} profile"
+msgstr "{0} profil mentése"
-msgid "Add setting"
-msgstr "Beállítás hozzáadása"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Ennek a profilnak minden beállítása az alapértelmezett érték, nincs mit "
+"menteni."
+
+msgid "Choose profile file"
+msgstr "Válassz profil fájlt"
msgid "Change list setting"
msgstr "Listabeállítások módosítása"
@@ -10437,6 +10779,41 @@ msgstr "Térképek listájának beállítása"
msgid "Entry {0}"
msgstr "Bejegyzés {0}"
+msgid "Select Setting Type:"
+msgstr "Válassz beállítás típust:"
+
+msgid "Simple"
+msgstr "Egyszerű"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "List of lists"
+msgstr "Listák listája"
+
+msgid "List of maps"
+msgstr "Térképek listája"
+
+msgid "Add setting"
+msgstr "Beállítás hozzáadása"
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "A jelenlegi érték az alapértelmezett."
+
+msgid "Default value is ''{0}''."
+msgstr "Alapértelmezett érték: \"{0}\"."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Alapértelmezett érték pillanatnyilag ismeretlen (a beállítás most nincs "
+"használatban)."
+
msgid "Change string setting"
msgstr "Karakterlánc beállítások módosítása"
@@ -10495,6 +10872,9 @@ msgstr "Virtuális pontok rajzolása kiválasztás módban"
msgid "Draw inactive layers in other color"
msgstr "Inaktív rétegek rajzolása más színnel"
+msgid "Display discardable keys"
+msgstr "Eldobhatónak ítélt kulcsok megjelenítése"
+
msgid "Highlight target ways and nodes"
msgstr "Cél pontok és vonalak kiemelése"
@@ -10555,6 +10935,13 @@ msgstr ""
"Ez a beállítás meggátolja a területek kitöltését, felülírva a kiválasztott "
"stílus rajzolását."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Az olyan kulcsok megjelenítése, amik érdektelennek lettek ítélve és csendben "
+"el lettek távolítva."
+
msgid "Options that affect drawing performance"
msgstr "Rajzolási teljesítményt befolyásoló beállítások"
@@ -10603,7 +10990,7 @@ msgid "Local files"
msgstr "Helyi fájlok"
msgid "Force lines if no segments imported"
-msgstr "Vonalak kényszerítés ha nincsenek importált szakaszok"
+msgstr "Vonalak kényszerítése, ha nincsenek importált szakaszok"
msgid "Draw large GPS points"
msgstr "Nagy GPS pontok rajzolása"
@@ -10645,7 +11032,7 @@ msgid "Dynamic color range based on data limits"
msgstr "Dinamikus színtartomány az adathatárok alapján"
msgid "Smooth GPX graphics (antialiasing)"
-msgstr ""
+msgstr "Sima GPX grafika (antialias)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -10715,6 +11102,8 @@ msgstr "GPX-vonal vastagsága"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgstr ""
+"Antialias alkalmazása a GPX fonalakra, egyenletesebb megjelenítést "
+"eredményezve."
msgid ""
"All points and track segments will have the same color. Can be customized in "
@@ -10803,58 +11192,70 @@ msgid "Add Imagery URL"
msgstr "Légifelvétel URL hozzáadása"
msgid "1. Enter URL"
-msgstr ""
+msgstr "1. URL megadása"
msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
"level: {1} or {2}<br>reversed zoom level: {3}"
msgstr ""
+"{0} lecserélve a csempe zoomszintjére. Támogatott még:<br>eltérés a "
+"zoomszinttől: {1} vagy {2}<br>fordított zoomszint: {3}"
msgid "{0} is replaced by X-coordinate of the tile"
-msgstr ""
+msgstr "{0} lecserélve a csempe X koordinátájára"
msgid "{0} is replaced by Y-coordinate of the tile"
-msgstr ""
+msgstr "{0} lecserélve a csempe Y koordinátájára"
msgid "{0} is replaced by {1} (Yahoo style Y coordinate)"
-msgstr ""
+msgstr "{0} lecserélve erre: {1} (Yahoo stílusú Y koordináta)"
msgid ""
"{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
"coordinate)"
msgstr ""
+"{0} lecserélve erre: {1} (OSGeo Tile Map Service Specification stílusú Y "
+"koordináta)"
msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
"e.g. {1}"
msgstr ""
+"{0} lecserélve a vesszővel elválasztott lista egy véletlenszerűen "
+"kiválasztott tagjára, pl. {1}"
msgid "2. Enter maximum zoom (optional)"
-msgstr ""
+msgstr "2. Maximum zoom megadás (opcionális)"
msgid "3. Verify generated TMS URL"
-msgstr ""
+msgstr "Generált TMS URL ellenőrzése"
msgid "4. Enter name for this layer"
-msgstr ""
+msgstr "Réteg elnevezése"
msgid "Store WMS endpoint only, select layers at usage"
-msgstr ""
+msgstr "Csak a WMS végpont tárolása, rétegválasztás használatkor"
msgid "Show bounds"
-msgstr ""
+msgstr "Határok megjelenítése"
msgid "1. Enter service URL"
-msgstr ""
+msgstr "1. Szolgáltatás URL megadása"
msgid "Get layers"
-msgstr ""
+msgstr "Rétegek lekérése"
msgid "2. Select layers"
-msgstr ""
+msgstr "2. Rétegek kiválasztása"
-msgid "3. Verify generated WMS URL"
-msgstr ""
+msgid "3. Select image format"
+msgstr "3. Képformátum kiválasztása"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Generált WMS URL ellenőrzése"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Réteg elnevezése"
msgid "Show Bounds"
msgstr "Határok megjelenítése"
@@ -10908,10 +11309,10 @@ msgid "Available default entries:"
msgstr "Elérhető alapértelmezett bejegyzések:"
msgid "Selected entries:"
-msgstr ""
+msgstr "Kiválasztott bejegyzések:"
msgid "Add a new {0} entry by entering the URL"
-msgstr ""
+msgstr "Új {0} bejegyzés készítése URL megadással"
msgid "Remove entry"
msgstr "Bejegyzés eltávolítása"
@@ -10984,7 +11385,7 @@ msgid "Downloader:"
msgstr "Letöltő:"
msgid "Simultaneous connections:"
-msgstr ""
+msgstr "Szimultán kapcsolatok:"
msgid "Overlap tiles"
msgstr "Csempék átfedése"
@@ -11032,6 +11433,12 @@ msgstr ""
"fájlt. A végéhez fűz egy \"~\" jelet és a mentéssel azonos könyvtárba "
"helyezi.)</i>"
+msgid "Notification at each save"
+msgstr "Figyelmeztetés minden mentésnél"
+
+msgid "When saving, display a small notification"
+msgstr "Mentésnél egy kis figyelmeztetés megjelenítése"
+
msgid "File backup"
msgstr "Biztonsági mentés"
@@ -11054,40 +11461,45 @@ msgid "New style entry:"
msgstr "Új stílusbejegyzés:"
msgid "Remove the selected styles from the list of active styles"
-msgstr ""
+msgstr "A kiválasztott stílus eltávolítása az aktív stílusok listájából"
msgid "Edit the filename or URL for the selected active style"
-msgstr ""
+msgstr "A kiválasztott aktív stílus fájlnevének vagy URL-jének szerkesztése"
msgid "Add the selected available styles to the list of active styles"
msgstr ""
+"A kiválasztott elérhető stílusok hozzáadása az aktív stílusok listájához"
msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
+msgstr "Az elérhető stílusok listájának frissítése innen: \"{0}\""
msgid "Loading style sources from ''{0}''"
-msgstr ""
+msgstr "Stílusforrás betöltése innen: \"{0}\""
msgid ""
"<html>Failed to load the list of style sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
+"<html>Stílusforrások betöltése sikertelen az alábbi "
+"helyről:<br>''{0}''.<br><br>Részletek (lefordítatlanul):<br>{1}</html>"
msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
msgstr ""
+"Figyelmeztetés: érvénytelen formátumú bejegyzés a stíluslistában \"{0}\". "
+"Kapott érték \"{1}\""
msgid "JOSM Internal Style"
-msgstr ""
+msgstr "JOSM beépített stílus"
msgid ""
"Internal style to be used as base for runtime switchable overlay styles"
msgstr ""
msgid "Potlatch 2"
-msgstr ""
+msgstr "Potlatch 2"
msgid "the main Potlatch 2 style"
-msgstr ""
+msgstr "a Potlatch 2 szerkesztőprogram fő stílusa"
msgid "Map Settings"
msgstr "Térképbeállítások"
@@ -11095,8 +11507,8 @@ msgstr "Térképbeállítások"
msgid "Settings for the map projection and data interpretation."
msgstr "Térképvetületek és adatéltelmezések beállításai."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Figyelem: Nem olvasható címkézési készlet forrás: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Nem olvasható címkekészlet forrás: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11140,7 +11552,7 @@ msgstr ""
"használni szeretnéd?<<br><br><table width=600>Hiba: {1}</table></html>"
msgid "Sort presets menu"
-msgstr ""
+msgstr "Címkék menü rendezése"
msgid "Tagging Presets"
msgstr "Címkézési készletek"
@@ -11183,6 +11595,8 @@ msgstr ""
msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
msgstr ""
+"Figyelmeztetés: érvénytelen formátumú bejegyzés a címkekészlet listában "
+"\"{0}\". Kapott érték: \"{1}\""
msgid "Internal Preset"
msgstr "Belső készlet"
@@ -11191,23 +11605,25 @@ msgid "The default preset for JOSM"
msgstr "A JOSM alapértelmezett készlete"
msgid "Plugin bundled with JOSM"
-msgstr ""
+msgstr "JOSM-be csomagolt bővítmény"
msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available plugins."
msgstr ""
+"Az elérhető bővítmények listájának letöltéséhez és megjelenítéséhez kérlek "
+"kattints a <strong>Lista letöltése</strong> gombra."
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} bővítményre szüksége van ennek a bővítménynek:"
+msgstr[1] "{0} bővítményre szüksége van ennek a {1} bővítménynek:"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: Verzió {1} (telepítve: {2})"
msgid " (requires: {0})"
-msgstr ""
+msgstr " (igényli: {0})"
msgid "Ask before updating"
msgstr "Kérdezz frissítés előtt"
@@ -11232,63 +11648,65 @@ msgid ""
"Please decide whether JOSM shall automatically update active plugins after a "
"certain period of time."
msgstr ""
+"Kérlek döntsd el, hogy a JOSM frissítse-e időnként automatikusan az aktív "
+"bővítményeket."
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "EPSG kód szerint"
msgid "Invalid projection configuration: {0}"
-msgstr ""
+msgstr "Érvénytelen vetület beállítás: {0}"
msgid "Projection configuration is valid."
-msgstr ""
+msgstr "A vetület beállítás érvényes."
msgid "Validate"
-msgstr "Ellőnőriz"
+msgstr "Érvényesít"
msgid "Parameter information..."
-msgstr ""
+msgstr "Paraméter információk…"
msgid "Parameter information"
-msgstr ""
+msgstr "Paraméter információk"
msgid "Projection name"
-msgstr ""
+msgstr "Vetületnév"
msgid "Supported values:"
-msgstr ""
+msgstr "Támogatott értékek:"
msgid "Projection parameters"
-msgstr ""
+msgstr "Vetület paraméterek"
msgid "False easting and false northing"
-msgstr ""
+msgstr "Hamis keleti és északi középpont"
msgid "Central meridian"
-msgstr ""
+msgstr "Centrálmeridián"
msgid "Scaling factor"
-msgstr ""
+msgstr "Méretezési tényező"
msgid "Ellipsoid name"
-msgstr ""
+msgstr "Ellipszoid név"
msgid "Ellipsoid parameters"
-msgstr ""
+msgstr "Ellipszoid paraméterek"
msgid "Datum name"
-msgstr ""
+msgstr "Dátum kód"
msgid "3 or 7 term datum transform parameters"
-msgstr ""
+msgstr "3 vagy 7 paraméteres dátumtranszformáció"
msgid "NTv2 grid file"
-msgstr ""
+msgstr "NTv2 rács fájl"
msgid "Built-in:"
-msgstr ""
+msgstr "Beépített:"
msgid "Projection bounds (in degrees)"
-msgstr ""
+msgstr "Vetület határok (fokban)"
msgid "Gauß-Krüger"
msgstr "Gauß-Krüger"
@@ -11297,7 +11715,7 @@ msgid "GK Zone"
msgstr "Gauß-Krüger zóna"
msgid "Gauß-Krüger Zone {0}"
-msgstr ""
+msgstr "Gauß-Krüger zónaszám {0}"
msgid "{0} ({1} to {2} degrees)"
msgstr "{0} ({1} -> {2} fokra)"
@@ -11306,7 +11724,7 @@ msgid "Lambert CC9 Zone (France)"
msgstr "Lambert CC9 zónás (francia)"
msgid "Lambert CC Zone"
-msgstr ""
+msgstr "Lambert CC zónás"
msgid "{0} (Corsica)"
msgstr "{0} (Korzika)"
@@ -11318,7 +11736,7 @@ msgid "WGS84 Geographic"
msgstr "WGS84 földrajzi"
msgid "Belgian Lambert 1972"
-msgstr ""
+msgstr "Belga Lambert 1972"
msgid "Belgian Lambert 2008"
msgstr "Belga Lambert 2008"
@@ -11336,7 +11754,7 @@ msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)"
msgstr "SWEREF99 13 30 / EPSG:3008 (svéd)"
msgid "Projection method"
-msgstr "Velületi módszer"
+msgstr "Velületi rendszer"
msgid "Projection code"
msgstr "Vetület kódja"
@@ -11345,7 +11763,7 @@ msgid "Display coordinates as"
msgstr "Koordináták megjelenítése mint"
msgid "System of measurement"
-msgstr "Mérési módszer"
+msgstr "Mérési rendszer"
msgid "Map Projection"
msgstr "Térképvetület"
@@ -11371,21 +11789,6 @@ msgstr "Svájci rács (Svjác)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (helyi korrekció nélkül)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM zóna"
-
-msgid "North"
-msgstr "Észak"
-
-msgid "South"
-msgstr "Déli"
-
-msgid "Hemisphere"
-msgstr "Félgömb"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11407,6 +11810,21 @@ msgstr "UTM France (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Geodéziai rendszer"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM zóna"
+
+msgid "North"
+msgstr "Északi"
+
+msgid "South"
+msgstr "Déli"
+
+msgid "Hemisphere"
+msgstr "Félgömb"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Tesztelés: OSM API URL ''{0}''"
@@ -11415,7 +11833,7 @@ msgid ""
"validate again.</html>"
msgstr ""
"<html>''{0}'' nem egy érvényes OSM API URL.<br>Kérlek ellenőrizd, jól van-e "
-"írva, majd próbáld újra..</html>"
+"írva, majd próbáld újra.</html>"
msgid "Invalid API URL"
msgstr "Érvénytelen API URL"
@@ -11424,26 +11842,38 @@ msgid ""
"<html>Failed to build URL ''{0}'' for validating the OSM API "
"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
+"<html>Nem sikerült ''{0}'' URL-t készíteni az OSM API szerver "
+"validálásához.<br>Kérlek ellenőrizd a ''{1}'' URL-t, majd érvényesíttesd "
+"újra.</html>"
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
"''{1}'' and your Internet connection and validate again.</html>"
msgstr ""
+"<html>Nem sikerült csatlakozni a ''{0}'' URL-hez.<br>Kérlek ellenőrizd a "
+"''{1}'' URL-t és az internetkapcsolatodat, majd érvényesíttesd újra.</html>"
msgid "Connection to API failed"
-msgstr ""
+msgstr "Kapcsolódás az API-hoz sikertelen"
msgid ""
"<html>Failed to retrieve a list of changesets from the OSM API server "
"at<br>''{1}''. The server responded with the return code {0} instead of "
"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
+"<html>Nem sikerült lekérni a módosításcsomagok egy listáját erről az OSM API "
+"szerverről<br>''{1}''. A szerver 200-as válaszkód helyett {0} kóddal "
+"válaszolt.<br>Kérlek ellenőrizd a ''{1}'' URL-t, majd érvényesíttesd "
+"újra.</html>"
msgid ""
"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
"spelling of ''{0}'' and validate again.</html>"
msgstr ""
+"<html>A \"{0}\" szerver nem küldött vissza érvényes választ.<br>Feltehetőleg "
+"''{0}'' nem egy OSM API szerver.<br>Kérlek ellenőrizd a ''{0}'' URL-t, majd "
+"érvényesíttesd újra.</html>"
msgid "Use Basic Authentication"
msgstr "Egyszerű hitelesítés használata"
@@ -11461,9 +11891,11 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Válaszd az OAuth hitelesítés használatához"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
+"Nem támogatott érték a(z) ''{0}'' beállításban, kapott: ''{1}''. ''Egyszerű "
+"hitelesítés'' lesz használva."
msgid "OSM username:"
msgstr "OSM felhasználónév:"
@@ -11471,21 +11903,26 @@ msgstr "OSM felhasználónév:"
msgid "OSM password:"
msgstr "OSM jelszó:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr ""
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr "Nem sikerült lekérni az OSM igazolásokat az igazoláskezelőtől."
msgid "Current credential manager is of type ''{0}''"
-msgstr ""
+msgstr "A jelenlegi igazoláskezelő ''{0}'' típusú"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr ""
+msgid "Failed to save OSM credentials to credential manager."
+msgstr "Nem sikerült elmenteni az OSM igazolásokat az igazoláskezelőbe."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
+msgid "Periodically check for new messages"
+msgstr "Új üzenetek lekérése rendszeres időközönként"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr ""
+msgid "Check interval (minutes):"
+msgstr "Ellenőrzés intervalluma (perc):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr "Nem sikerült lekérni az OAuth elérési tokent az igazoláskezelőtől."
+
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr "Nem sikerült elmenteni az OAuth elérési tokent az igazoláskezelőbe."
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11570,17 +12007,8 @@ msgid "Use a SOCKS proxy"
msgstr "SOCKS proxy használata"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-"Figyelem: A JOSM rendszerbeállítás szerinti proxyra lett állítva, de a Java "
-"Virtuális Gép nincs jól konfigurálva. Beállítások visszaállítva \"Nincs "
-"proxy\"-ra."
-
-msgid "disabled"
-msgstr "letiltva"
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -11624,31 +12052,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "{0} típus elemei támogatottak."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "{0} objektum módosítása"
+msgstr[1] "{0} objektum módosítása"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
+msgid "Nothing selected!"
+msgstr "Semmi sincs kiválasztva!"
-msgid "More information about this feature"
+msgid "Selection unsuitable!"
+msgstr "A kiválasztás alkalmatlan!"
+
+msgid "Apply Preset"
+msgstr "Címkék alkalmazása"
+
+msgid "New relation"
+msgstr "Új kapcsolat"
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -11657,6 +12090,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "További információk erről a tulajdonságról"
+
msgid "Available roles"
msgstr "Elérhető szerepek"
@@ -11664,23 +12100,57 @@ msgid "role"
msgstr "szerep"
msgid "count"
-msgstr ""
+msgstr "száma"
msgid "elements"
-msgstr ""
+msgstr "elemek"
msgid "Optional Attributes:"
+msgstr "Opcionális tulajdonságok:"
+
+msgid "Select auto-increment of {0} for this field"
+msgstr "Mező értékének automatikus növelése: {0}"
+
+msgid "Cancel auto-increment for this field"
+msgstr "Automaikus növelés törlése a mezőről"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Use preset ''{0}''"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
msgid "Unknown type: {0}"
msgstr ""
+msgid "Preset group {1} / {0}"
+msgstr "Készletcsoport {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "Készletcsoport {0}"
+
msgid "Roles cannot appear more than once"
msgstr ""
@@ -11690,41 +12160,9 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Nem olvasható címkekészlet forrás: {0}"
-
msgid "Error parsing {0}: "
msgstr "Értelmezési hiba {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "{0} típus elemei támogatottak."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "{0} objektum módosítása"
-msgstr[1] "{0} objektum módosítása"
-
-msgid "Nothing selected!"
-msgstr "Semmi sincs kiválasztva!"
-
-msgid "Selection unsuitable!"
-msgstr "A kiválasztás alkalmatlan!"
-
-msgid "Apply Preset"
-msgstr "Címkék alkalmazása"
-
-msgid "New relation"
-msgstr "Új kapcsolat"
-
-msgid "Change Properties"
-msgstr "Tulajdonságok megváltoztatása"
-
-msgid "Preset group {1} / {0}"
-msgstr "Készletcsoport {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "Készletcsoport {0}"
-
msgid "Search preset"
msgstr "Címkekészlet keresése"
@@ -11740,6 +12178,14 @@ msgstr "Csak az alkalmahatók megjelenítése"
msgid "Search in tags"
msgstr "Keresés címkék között"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -11771,6 +12217,52 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr "hamis: a tulajdonság explicite kikapcsolva"
+
+msgid "true: the property is explicitly switched on"
+msgstr "igaz: a tulajdonság explicite bekapcsolva"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"részleges: különböző kiválasztott objektumoknak különböző értékük van, ne "
+"változtasd"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+"beállítatlan: ne legyen beállítva ez a tulajdonság a kijelölt objektumokon"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11803,7 +12295,7 @@ msgid "Contacting OSM Server..."
msgstr "Kapcsolódás az OSM szerverhez..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11843,28 +12335,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11963,6 +12453,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11978,12 +12471,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -12062,7 +12563,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -12161,35 +12662,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -12199,8 +12676,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -12227,10 +12704,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -12241,9 +12715,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -12265,6 +12736,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12314,8 +12788,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -12458,6 +12932,9 @@ msgstr "Felhasználónév és jelszó mentése (tikosítatlanul)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -12476,6 +12953,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -12500,16 +12986,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -12521,6 +13010,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12535,6 +13032,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12565,19 +13071,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12599,11 +13105,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Munkamenet fájl (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -12658,59 +13176,63 @@ msgid "expected .jos file inside .joz archive"
msgstr ""
msgid "Skip download"
-msgstr ""
+msgstr "Letöltés kihagyása"
msgid "Download Plugin"
-msgstr ""
+msgstr "Bővítmény letöltése"
msgid "Skip Download"
-msgstr ""
+msgstr "Letöltés kihagyása"
msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
+msgstr "{1} bővítményhez {0} JOSM verzió szükséges"
msgid "Download skipped"
-msgstr ""
+msgstr "Letöltés kihagyva"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
-msgstr ""
+msgstr "''{0}'' bővítménykönyvtár létrehozása sikertelen."
msgid "Downloading Plugin {0}..."
-msgstr ""
+msgstr "Bővítmény letöltése: {0}…"
msgid "An error occurred in plugin {0}"
msgstr "A(z) {0} bővítményben hiba történt"
msgid "integrated into main program"
-msgstr ""
+msgstr "beépítve a főprogramba"
msgid "replaced by new {0} plugin"
-msgstr ""
+msgstr "lecserélve az új {0} bővítményre"
msgid "no longer required"
-msgstr ""
+msgstr "többé nem szükséges"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
+msgstr[0] "Az alábbi bővítmény többé nem szükséges, ezért deaktiválva lett:"
msgstr[1] ""
+"Az alábbi bővítmények többé nem szükségesek, ezért deaktiválva lettek:"
msgid ""
"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
"longer developed and very likely will produce errors.<br>It should be "
"disabled.<br>Delete from preferences?</html>"
msgstr ""
+"<html>A(z) \"{0}\" bővítmény betöltését kérted.<br>A bővítményt többé nem "
+"fejlesztik így nagyon valószínű, hogy hibásan fog működni.<br>Le kellene "
+"tiltani.<br>Törlöd a beállításokból?</html>"
msgid ""
"You updated your JOSM software.<br>To prevent problems the plugins should be "
@@ -12720,40 +13242,49 @@ msgstr ""
"bővítményeket is érdemes frissíteni.<br><br>Frissíted most a bővítményeket?"
msgid "Last plugin update more than {0} days ago."
-msgstr ""
+msgstr "A bővítmények utoljára több mint {0} napja voltak frissítve."
msgid "Click to update the activated plugins"
-msgstr ""
+msgstr "Az aktivált bővítmények frissítése"
msgid "Skip update"
-msgstr ""
+msgstr "Frissítés mellőzése"
msgid "Click to skip updating the activated plugins"
-msgstr ""
+msgstr "Aktivált bővítmények frissítése máskor"
msgid ""
"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
"disabled."
msgstr ""
+"Bővítményfrissítés átugrása JOSM frissítés után. Az indításkori automatikus "
+"frissítés letiltva."
msgid ""
"Skipping plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
+"Bővítményfrissítés átugrása letelt időintervallum után. Az indításkori "
+"automatikus frissítés letiltva."
msgid ""
"Running plugin update after JOSM upgrade. Automatic update at startup is "
"enabled."
msgstr ""
+"Bővítményfrissítés futtatása JOSM frissítés után. Az indításkori automatikus "
+"frissítés engedélyezve."
msgid ""
"Running plugin update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
+"Bővítményfrissítés futtatása letelt időintervallum után. Az indításkori "
+"automatikus frissítés letiltva."
msgid ""
"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
msgstr ""
+"Nemvárt ''{0}'' érték ''{1}'' beállításban. Feltételezett érték ''ask''."
msgid ""
"Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -12761,56 +13292,65 @@ msgid_plural ""
"Plugin {0} requires {1} plugins which were not found. The missing plugins "
"are:"
msgstr[0] ""
+"{0} bővítménynek szüksége van egy másik bővítményre, ami nem található. Az "
+"igényelt bővítmény:"
msgstr[1] ""
+"{0} bővítménynek szüksége van {1} másik bővítményre, amik nem találhatók. Az "
+"igényelt bővítmények:"
msgid ""
"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
msgstr ""
+"<html>{0} bővítménynek JOSM {1} verzióra van szüksége. A jelenlegi JOSM "
+"verzió: {2}.<br>A bővítmény használatához JOSM frissítésre lesz "
+"szükséged.</html>"
msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr ""
+msgstr "{0} bővítmény nem tölthető be. Törlöd a beállításokból?"
msgid "loading plugin ''{0}'' (version {1})"
-msgstr ""
+msgstr "''{0}'' bővítmény betöltése ({1} verzió)"
msgid ""
"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
"not found.<br>Delete from preferences?</html>"
msgstr ""
+"<html>{0} bővítmény betöltése nem sikerült, mert a bővítményben nem "
+"található<br>main class ''{1}''<br>Törlöd a beállításokból?</html>"
msgid "Loading plugins ..."
-msgstr "Bővítmények betöltése…"
+msgstr "Bővítmények betöltése …"
msgid "Checking plugin preconditions..."
-msgstr "Bővítmény előfeltételeinek ellenőrzése…"
+msgstr "Bővítmény előfeltételek ellenőrzése"
msgid "Loading plugin ''{0}''..."
-msgstr "Bővítmény betöltése: ''{0}''…"
+msgstr "Bővítmény betöltése: ''{0}''…"
msgid "JOSM could not find information about the following plugin:"
msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A JOSM nem talált információt az alábbi bővítményről:"
+msgstr[1] "A JOSM nem talált információt az alábbi bővítményekről:"
msgid "The plugin is not going to be loaded."
msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A bővítmény nem lesz betöltve."
+msgstr[1] "A bővítmények nem lesznek betöltve."
msgid "Determine plugins to load..."
-msgstr ""
+msgstr "Döntés a bővítmények betöltéséről…"
msgid "Removing deprecated plugins..."
-msgstr ""
+msgstr "Elavult bővítmények eltávolítása…"
msgid "Removing unmaintained plugins..."
-msgstr ""
+msgstr "Karbantartatlan bővítmények eltávolítása…"
msgid "Updating the following plugin has failed:"
msgid_plural "Updating the following plugins has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Az alábbi bővítmény frissítése sikertelen:"
+msgstr[1] "Az alábbi bővítmények frissítése sikertelen:"
msgid ""
"Please open the Preference Dialog after JOSM has started and try to update "
@@ -12819,159 +13359,186 @@ msgid_plural ""
"Please open the Preference Dialog after JOSM has started and try to update "
"them manually."
msgstr[0] ""
+"Kérlek nyisd meg a Beállításokat miután a JOSM elindult és próbáld kézzel "
+"frissíteni."
msgstr[1] ""
+"Kérlek nyisd meg a Beállításokat miután a JOSM elindult és próbáld kézzel "
+"frissíteni."
msgid "Plugin update failed"
-msgstr ""
+msgstr "Bővítmény frissítése sikertelen"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
-msgstr "Bövítmény kikapcsolása"
+msgstr "Bövítmény letiltása"
msgid "Click to delete the plugin ''{0}''"
-msgstr ""
+msgstr "Kattints a(z) ''{0}'' bővítmény törléséhez"
msgid "Keep plugin"
-msgstr ""
+msgstr "Bővítmény megtartása"
msgid "Click to keep the plugin ''{0}''"
-msgstr ""
+msgstr "Kattints a(z) ''{0}'' bővítmény megtartásához"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
-msgstr ""
+msgstr "Kattints a(z) ''{0}'' bővítméy letiltásához"
msgid ""
"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr ""
+msgstr "Váratlan kivétel történt, ami a(z) ''{0}'' bővítménytől származhat."
msgid "According to the information within the plugin, the author is {0}."
-msgstr ""
+msgstr "A bővítményben található információk alapján a szerző: {0}."
msgid ""
"Try updating to the newest version of this plugin before reporting a bug."
msgstr ""
+"Mielőtt jelentenéd a hibát, próbáld frissíteni a bővítményt a legújabb "
+"verzióra."
msgid "Should the plugin be disabled?"
-msgstr ""
+msgstr "Le legyen tiltva a bővítmény?"
msgid ""
"The plugin has been removed from the configuration. Please restart JOSM to "
"unload the plugin."
msgstr ""
+"A bővítmény el lett távolítva a konfigurációból. A bővítmény kikapcsolásához "
+"indítsd újra a JOSM-t."
msgid "Plugin information"
-msgstr ""
+msgstr "Bővítmény információ"
msgid "no description available"
-msgstr ""
+msgstr "nem érhető el leírás"
msgid ""
"Do not ask again and remember my decision (go to Preferences->Plugins to "
"change it later)"
msgstr ""
+"Emlékezz a döntésemre és ne kérdezd meg újra (a Beállítások -> "
+"Bővítményekben tudod később módosítani)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Érvénytelen jar fájl: ''{0}''"
msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "''{0}'' bővítmény nem tartalmaz Manifest fájlt."
msgid "Invalid URL ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Érvénytelen ''{0}'' URL a(z) {1} bővítményben"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Érvénytelen ''{0}'' bővítményleírás a(z) {1} bővítményben"
msgid "More info..."
-msgstr ""
+msgstr "További információ…"
msgid "<b>Plugin provided by an external source:</b> {0}"
-msgstr ""
+msgstr "<b>A bővítményt biztosító külső forrás:</b> {0}"
msgid "Failed to create plugin information from manifest for plugin ''{0}''"
msgstr ""
+"Nem sikerült bővítményinformációt készíteni a manifest fájlból a(z) ''{0}'' "
+"bővítményhez"
msgid "Illegal entry in plugin list."
-msgstr ""
+msgstr "Érvénytelen bejegyzés a bővítménylistában."
msgid "Reading local plugin information.."
-msgstr ""
+msgstr "Helyi bővítményinformációk olvasása…"
msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "Bővítmény site cache fájl feldolgozása…"
msgid "Processing file ''{0}''"
-msgstr ""
+msgstr "Fájl feldolgozása: ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "Bővítmény site cache ikon fájl feldolgozása…"
msgid "Processing plugin files..."
-msgstr ""
+msgstr "Bővítmény fájlok feldolgozása…"
msgid "Download plugin list..."
-msgstr ""
+msgstr "Bővítménylista letöltése…"
msgid "Downloading plugin list from ''{0}''"
+msgstr "Bővítménylista letöltése innen: ''{0}''"
+
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
msgstr ""
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "Bővítménylista írása helyi gyorsítótárba ''{0}''"
msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Bővítménylista elemzése ''{0}'' helyről"
msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
+"Bővítménylista dokumentum elemzése a(z) ''{0}'' helyről sikertelen. Hely "
+"kihagyása. Kivétel: {1}"
msgid "Processing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Bővítménylista feldolgozása ''{0}'' helyről"
msgid "This is after the end of the recording"
-msgstr ""
+msgstr "Ez a felvétel vége után van"
msgid "unspecified reason"
-msgstr ""
+msgstr "meghatározatlan ok"
msgid "Error playing sound"
msgstr "Hiba a hang lejátszása közben"
msgid "Unexpected Exception"
-msgstr ""
+msgstr "Nemvárt kivétel"
msgid "Do nothing"
msgstr "Nincs művelet"
@@ -12989,7 +13556,7 @@ msgstr ""
"weblapunkon."
msgid "Suppress further error dialogs for this session."
-msgstr ""
+msgstr "További párbeszédablakok elhagyása ebben a munkamenetben."
msgid ""
"You have encountered an error in JOSM. Before you file a bug report make "
@@ -13278,17 +13845,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13299,9 +13860,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -13335,9 +13939,23 @@ msgstr ""
"<html><p> Sajnálom, de nem lehetséges címkéket beilleszteni a vágólapról, "
"mert az nem tartalmaz JOSM objektumot vagy alkalmas szöveget. </p></html>"
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13660,6 +14278,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13739,6 +14362,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13840,9 +14467,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13898,6 +14522,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13922,9 +14549,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13950,9 +14574,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13989,6 +14610,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -14036,9 +14662,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Közutak"
-
msgid "Streets"
msgstr "Autóutak"
@@ -14123,6 +14746,9 @@ msgstr "Töltés"
msgid "Lit"
msgstr "Kivilágítás"
+msgid "Toll"
+msgstr "Fizetős"
+
msgid "Motorway Link"
msgstr "Autópályafelhajtó"
@@ -14213,6 +14839,50 @@ msgstr "Lakóút"
msgid "Edit Residential Street"
msgstr "Lakóút szerkesztése"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "igen"
+
+msgid "no"
+msgstr "nem"
+
+msgid "destination"
+msgstr "célforgalom"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Pihenőút"
@@ -14231,11 +14901,11 @@ msgstr "Terület"
msgid "Service"
msgstr "Szervizút"
-msgid "Edit Serviceway"
-msgstr "Szervizút szerkesztése"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Szervizút típusa"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "átjáró"
@@ -14246,6 +14916,9 @@ msgstr "kocsibehajtó"
msgid "parking_aisle"
msgstr "parkolóút"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "parkolóút"
@@ -14273,18 +14946,12 @@ msgstr "körforgalom"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "igen"
-
msgid "Road Restrictions"
msgstr "Behajtási korlátozások"
msgid "Edit Road Restrictions"
msgstr "Behajtási korlátozások szerkesztése"
-msgid "Toll"
-msgstr "Fizetős"
-
msgid "No exit (cul-de-sac)"
msgstr "Zsákutca"
@@ -14294,9 +14961,6 @@ msgstr "Közlekedési mód korlátozások"
msgid "General Access"
msgstr "Általános behajtás"
-msgid "destination"
-msgstr "célforgalom"
-
msgid "delivery"
msgstr "áruszállítás"
@@ -14306,15 +14970,15 @@ msgstr "engedélyköteles"
msgid "private"
msgstr "privát"
+msgid "customers"
+msgstr "vásárlók"
+
msgid "agricultural"
msgstr "mezőgazdasági"
msgid "forestry"
msgstr "erdőgazdasági"
-msgid "no"
-msgstr "nem"
-
msgid "official"
msgstr "hivatalos"
@@ -14360,6 +15024,9 @@ msgstr "Nagykihasználtságú jármű (hov)"
msgid "Public Service Vehicles (psv)"
msgstr "Közszolgáltatási járművek (tömegközl.)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. sebesség (km/h)"
@@ -14444,6 +15111,9 @@ msgstr "Híd szerkesztése"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "nyitható"
@@ -14555,20 +15225,29 @@ msgstr ""
msgid "Visibility"
msgstr "Láthatóság"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "kiváló"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "jó"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "közepes"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "rossz"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "szörnyű"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Kerekesszék"
@@ -14585,11 +15264,11 @@ msgstr "Kijelölt lovaglóút"
msgid "Edit Bridleway"
msgstr "Lovaglóút szerkesztése"
-msgid "Cycle Lane"
-msgstr "Kerékpársáv"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Kerékpársáv szerkesztése"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Kerékpárút"
@@ -14624,8 +15303,8 @@ msgstr "Kerékpárút jobb oldal"
msgid "Oneway (bicycle)"
msgstr "Egyirányú (kerékpár)"
-msgid "Edit Highway"
-msgstr "Közút szerkesztése"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Közút"
@@ -14693,12 +15372,18 @@ msgstr "Pihenőhely"
msgid "Edit Rest Area"
msgstr "Pihenőhely szerkesztése"
-msgid "Emergency Phone"
-msgstr "Segélykérő telefon"
+msgid "Drinking Water"
+msgstr "Ivóvíz"
msgid "Traffic Signal"
msgstr "Jelzőlámpa"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Gyalogátkelő típusa"
@@ -14714,15 +15399,6 @@ msgstr "járdasziget"
msgid "unmarked"
msgstr "jelöletlen"
-msgid "Cross on horseback"
-msgstr "Átkelés lóháton"
-
-msgid "Cross by bicycle"
-msgstr "Átkelés kerékpárral"
-
-msgid "Crossing attendant"
-msgstr "felügyelt"
-
msgid "Crossing type name (UK)"
msgstr "Átkelő típusa (UK)"
@@ -14744,6 +15420,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr "felügyelt"
+
+msgid "Cross by bicycle"
+msgstr "Átkelés kerékpárral"
+
+msgid "Cross on horseback"
+msgstr "Átkelés lóháton"
+
msgid "Stop"
msgstr "Stoptábla"
@@ -14753,6 +15438,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-körforgalom"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Irány"
@@ -14762,11 +15450,8 @@ msgstr "óramutatóval megegyező"
msgid "Pedestrian Crossing"
msgstr "Gyalogátkelő"
-msgid "Edit Crossing"
-msgstr "Átkelő szerkesztése"
-
-msgid "Type name (UK)"
-msgstr "Átkelő típusa (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Forgalomcsillapító"
@@ -14798,9 +15483,6 @@ msgstr "lapos fekvőrendőr"
msgid "Passing Place"
msgstr "Kitérő (útkiszélesedés)"
-msgid "Edit Passing Place"
-msgstr "Kitérő szerkesztése"
-
msgid "Turning Circle"
msgstr "Fordulóhely"
@@ -14834,20 +15516,44 @@ msgstr "Wikipédia"
msgid "Barriers"
msgstr "Akadályok"
+msgid "Block"
+msgstr "Kőtömb"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Engedélyezett forgalom:"
+
+msgid "Material"
+msgstr "Anyag"
+
+msgid "stone"
+msgstr "kő"
+
msgid "Bollard"
msgstr "Oszlop"
msgid "Edit Bollard"
msgstr "Oszlop szerkesztése"
-msgid "Allowed traffic:"
-msgstr "Engedélyezett forgalom:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "műanyag"
msgid "Cycle Barrier"
msgstr "Kerékpárakadály"
-msgid "Block"
-msgstr "Kőtömb"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Marharács"
@@ -14858,6 +15564,9 @@ msgstr "Marharács szerkesztése"
msgid "Bus Trap"
msgstr "Buszcsapda"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Egyirányúsító tüske"
@@ -14879,44 +15588,88 @@ msgstr "Határellenőrzés szerkesztése"
msgid "Hedge"
msgstr "Sövény"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Magasság (méter)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Kerítés"
+msgid "Edit Fence"
+msgstr ""
+
msgid "barbed_wire"
msgstr "szögesdrót"
-msgid "chain"
-msgstr "lánc"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "elektromos"
-msgid "hedge"
-msgstr "sövény"
-
msgid "pole"
msgstr "cölöp"
msgid "split_rail"
msgstr "hasított gerenda"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Fal"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Városfal"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Támfal"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Árok"
+msgstr ""
-msgid "Entrance"
-msgstr "Bejárat"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Bejárat szerkesztése"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Kapu"
@@ -14948,12 +15701,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Létra"
msgid "Edit Stile"
msgstr "Létra szerkesztése"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Forgókapu"
@@ -15011,6 +15779,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr "Árok"
+
msgid "Edit Ditch"
msgstr "Árok szerkesztése"
@@ -15020,6 +15791,12 @@ msgstr "Patak"
msgid "Edit Stream"
msgstr "Patak szerkesztése"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Csatorna"
@@ -15059,9 +15836,6 @@ msgstr "Duzzasztógát szerkesztése"
msgid "Groyne"
msgstr "Hullámtörő"
-msgid "Edit Groyne"
-msgstr "Hullámtörő szerkesztése"
-
msgid "Breakwater"
msgstr ""
@@ -15095,6 +15869,21 @@ msgstr "Fedett víztározó szerkesztése"
msgid "Edit Water"
msgstr "Vízfelület szerkesztése"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Szárazföld"
@@ -15176,20 +15965,25 @@ msgstr "Kompkikötő szerkesztése"
msgid "Cargo"
msgstr "Szállítmány"
+msgctxt "cargo"
msgid "passengers"
-msgstr "utasok"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "járművek"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "kerékpár"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "nehézgépjármű (hvg)"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "utasok;járművek"
+msgstr ""
msgid "Ferry Route"
msgstr "Kompútvonal"
@@ -15260,7 +16054,10 @@ msgstr "katonai terület"
msgid "tourism"
msgstr "turisztika"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15284,11 +16081,14 @@ msgstr "felsővezeték"
msgid "rail"
msgstr "sín"
-msgid "Voltage"
-msgstr "Feszültség"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frekvencia (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16,7"
@@ -15299,9 +16099,6 @@ msgstr "Keskeny nyomtávú vasút"
msgid "Edit Narrow Gauge Rail"
msgstr "Keskeny nyomtávú vasút szerkesztése"
-msgid "Types"
-msgstr "Típus"
-
msgid "Monorail"
msgstr "Egysínű vasút"
@@ -15344,18 +16141,56 @@ msgstr "Használaton kívüli vasútvonal"
msgid "Edit Disused Railway"
msgstr "Használaton kívüli vasútvonal szerkesztése"
-msgid "Optional Types"
-msgstr "Opcionális típus"
-
msgid "Abandoned Rail"
msgstr "Elhagyott vasútvonal"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Vasúti átjáró"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr "Őrzött"
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr "Akadály"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Vasúti gyalogátkelő"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Átkelő típusa"
@@ -15455,13 +16290,11 @@ msgstr "Szállítószalag"
msgid "Edit Magic Carpet"
msgstr "Szállítószalag szerkesztése"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Teherlift"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Teherlift szerkesztése"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -15471,13 +16304,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Felvonóállomás szerkesztése"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Oszlop"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Pilon szerkesztése"
+msgstr ""
msgid "Parking"
msgstr "Parkoló"
@@ -15494,12 +16325,12 @@ msgstr "felszíni"
msgid "underground"
msgstr "mélygarázs"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Hozzáférés"
-msgid "customers"
-msgstr "vásárlók"
-
msgid "Park and Ride"
msgstr "P+R"
@@ -15527,9 +16358,6 @@ msgstr "Parkolóhely"
msgid "Edit Parking space"
msgstr "Parkolóhely szerkesztése"
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Férőhely"
@@ -15545,20 +16373,36 @@ msgstr "Időkorlát (perc)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Őrzött"
-
msgid "Opening Hours"
msgstr "Nyitva tartás"
msgid "24/7"
msgstr "éjjel-nappali"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "H-P 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "K-V 08:00-15:00;Szo 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Parkoló bejárat"
@@ -15707,6 +16551,9 @@ msgstr "Elektromos töltőállomás"
msgid "Edit Charging Station (for electric cars)"
msgstr "Elektromos töltőállomás szerkesztése"
+msgid "Voltage"
+msgstr "Feszültség"
+
msgid "Amperage"
msgstr "Áramerősség"
@@ -15728,6 +16575,12 @@ msgstr "Szerviz"
msgid "Edit Car Repair"
msgstr "Autószerviz szerkesztése"
+msgid "Parts"
+msgstr "Alkatrészek"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Gumis"
@@ -15755,6 +16608,12 @@ msgstr "Kölcsönző"
msgid "Edit Car Rental"
msgstr "Kölcsönző szerkesztése"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "kizárólag"
+
msgid "Sharing"
msgstr "Megosztóhely"
@@ -15779,22 +16638,6 @@ msgstr "Szolgáltatások:"
msgid "Sale"
msgstr "Eladás"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "igen"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "márka"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "használt"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "nem"
-
msgid "brand"
msgstr "márka"
@@ -15816,9 +16659,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Alkatrészek"
-
msgid "Clothes"
msgstr "Ruhák"
@@ -15882,8 +16722,8 @@ msgstr "Kerékpárkölcsönző szerkesztése"
msgid "Public Transport"
msgstr "Tömegközlekedés"
-msgid "Route"
-msgstr "Útvonal"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Útvonal szerkesztése"
@@ -16013,6 +16853,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -16043,11 +16886,14 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Pad"
msgid "Shelter"
-msgstr "Fedett váró"
+msgstr "Esőbeálló"
msgid "Wheelchair"
msgstr "Kerekesszék"
@@ -16055,9 +16901,6 @@ msgstr "Kerekesszék"
msgid "limited"
msgstr "korlátozott"
-msgid "only"
-msgstr "kizárólag"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -16067,8 +16910,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Állomás"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Állomás szerkesztése"
msgid "Building"
msgstr "Épület"
@@ -16082,6 +16930,9 @@ msgstr "Metrólejárat szerkesztése"
msgid "Ticket Machine"
msgstr "Jegyautomata"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Azonosítószám"
@@ -16106,14 +16957,6 @@ msgstr "Fiók, vagy hűségkártya"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Állomás"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Állomás szerkesztése"
-
msgid "UIC-Reference"
msgstr "UIC-kód"
@@ -16162,8 +17005,8 @@ msgstr "Autóbuszperon szerkesztése"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Taxiállomás szerkesztése"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Repülőtér"
@@ -16216,6 +17059,21 @@ msgstr "Terminál"
msgid "Edit Terminal"
msgstr "Terminál szerkesztése"
+msgid "Internet access"
+msgstr "Internetelérés"
+
+msgid "wlan"
+msgstr "wifi"
+
+msgid "wired"
+msgstr "kábeles"
+
+msgid "terminal"
+msgstr "terminál"
+
+msgid "Internet access fee"
+msgstr "Internetelérés költsége"
+
msgctxt "airport"
msgid "Gate"
msgstr "Kapu"
@@ -16238,21 +17096,6 @@ msgstr "Hotel szerkesztése"
msgid "Stars"
msgstr "Csillagok"
-msgid "Internet access"
-msgstr "Internetelérés"
-
-msgid "wlan"
-msgstr "wifi"
-
-msgid "wired"
-msgstr "kábeles"
-
-msgid "terminal"
-msgstr "terminál"
-
-msgid "Internet access fee"
-msgstr "Internetelérés költsége"
-
msgid "Smoking"
msgstr "Dohányzás"
@@ -16410,7 +17253,7 @@ msgid "Edit Cafe"
msgstr "Kávézó szerkesztése"
msgid "ice_cream"
-msgstr "jégkérm"
+msgstr "jégkrém"
msgid "Pub"
msgstr "Kocsma"
@@ -16436,6 +17279,12 @@ msgstr "Éjszakai szórakozóhely"
msgid "Edit Nightclub"
msgstr "Éjszakai szórakozóhely szerkesztése"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turizmus"
@@ -16457,9 +17306,15 @@ msgstr "Kilátótorony"
msgid "Information Office"
msgstr "Információs iroda"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Térkép"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Kategória"
@@ -16472,6 +17327,9 @@ msgstr "utca"
msgid "scheme"
msgstr "vázlat"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Mutatott terület"
@@ -16511,6 +17369,9 @@ msgstr "... egyéb közlekedési módok lehetségesek"
msgid "Information Board"
msgstr "Információs tábla"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Tábla tartalma"
@@ -16532,23 +17393,35 @@ msgstr "növényvilág"
msgid "Guidepost"
msgstr "Útjelző"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Információs terminál"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Pontosabb leírás"
msgid "Audioguide"
msgstr "Hangos tárlatvezetés"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Tárlatvezetés mobiltelefonnal?"
msgid "Phone number"
msgstr "Telefonszám"
-msgid "Other Information Points"
-msgstr "Egyéb információs pont"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Szabadidő"
@@ -16571,9 +17444,6 @@ msgstr "Kutyafuttató"
msgid "Edit Dog Park"
msgstr "Kutyafuttató szerkesztése"
-msgid "Barrier"
-msgstr "Akadály"
-
msgid "fence"
msgstr "kerítés"
@@ -16598,8 +17468,17 @@ msgstr "Szauna"
msgid "Edit Sauna"
msgstr "Szauna szerkesztése"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "K-V 08:00-15:00; Szo 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Játszótér"
@@ -16671,50 +17550,44 @@ msgstr "Műalkotás"
msgid "Edit Artwork"
msgstr "Műalkotás szerkesztése"
-msgid "Place of Worship"
-msgstr "Vallási hely"
-
-msgid "Edit Place of Worship"
-msgstr "Vallási hely szerkesztése"
-
-msgid "Religion"
-msgstr "Vallás"
+msgid "Recording Studio"
+msgstr "Stúdió"
-msgid "bahai"
-msgstr "bahái"
+msgid "Edit Studio"
+msgstr "Stúdió szerkesztése"
-msgid "buddhist"
-msgstr "buddhista"
+msgid "audio"
+msgstr "hang"
-msgid "christian"
-msgstr "keresztény"
+msgid "video"
+msgstr "videó"
-msgid "hindu"
-msgstr "hindu"
+msgid "Place of Worship"
+msgstr "Vallási hely"
-msgid "jain"
-msgstr "dzsainista"
+msgid "Church"
+msgstr "Templom"
-msgid "jewish"
-msgstr "zsidó"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muzulmán"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "szikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualista"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoista"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitárius"
+msgid "church"
+msgstr "templom"
-msgid "zoroastrian"
-msgstr "zoroasztrista"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Felekezet"
@@ -16731,6 +17604,12 @@ msgstr "katolikus"
msgid "evangelical"
msgstr "evangéliumi keresztény"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehova tanúi"
@@ -16743,6 +17622,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodox"
@@ -16758,38 +17640,141 @@ msgstr "protestáns"
msgid "quaker"
msgstr "kvékersita"
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "Szolgáltatás ideje"
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "síita"
msgid "sunni"
msgstr "szunnita"
-msgid "Service Times"
-msgstr "Szolgáltatás ideje"
+msgid "Synagogue"
+msgstr ""
-msgid "Su 10:00"
-msgstr "V 10:00"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Su 10:30"
-msgstr "V 10:30"
+msgid "synagogue"
+msgstr ""
-msgid "Su 11:00"
-msgstr "V 11:00"
+msgid "conservative"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Nyitvatartás látogatóknak"
+msgid "reform"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Stúdió"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Stúdió szerkesztése"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "audio"
-msgstr "hang"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "videó"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Vallás"
+
+msgid "bahai"
+msgstr "bahái"
+
+msgid "jain"
+msgstr "dzsainista"
+
+msgid "sikh"
+msgstr "szikh"
+
+msgid "spiritualist"
+msgstr "spiritualista"
+
+msgid "taoist"
+msgstr "taoista"
+
+msgid "unitarian"
+msgstr "unitárius"
+
+msgid "zoroastrian"
+msgstr "zoroasztrista"
msgid "Public Building"
msgstr "Nyilvános épület"
@@ -16878,6 +17863,12 @@ msgstr "Autósiskola szerkesztése"
msgid "License Classes"
msgstr "Jogosítvány kategóriái"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Egészség"
@@ -16887,6 +17878,12 @@ msgstr "Kórház"
msgid "Edit Hospital"
msgstr "Kórház szerkesztése"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Orvosi rendelő"
@@ -16953,12 +17950,66 @@ msgstr "Állatorvos"
msgid "Edit Veterinary"
msgstr "Állatorvos szerkesztése"
-msgid "Note"
-msgstr "Megjegyzés"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "nyilvános"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Postaláda"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefon"
@@ -16968,6 +18019,30 @@ msgstr "Telefon szerkesztése"
msgid "Telephone cards"
msgstr "Telefonkártya"
+msgid "Emergency Phone"
+msgstr "Segélykérő telefon"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Óra"
@@ -16977,30 +18052,36 @@ msgstr "Óra szerkesztése"
msgid "Display"
msgstr "Kijelző"
-msgctxt "display"
msgid "analog"
-msgstr "analóg"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "digitális"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "napóra"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
-msgstr "egyedi"
+msgstr ""
msgid "Support"
msgstr "Tartó"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "falra szerelt"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "hirdetőtábla"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
msgid "Visibility/readability"
msgstr "Láthatóság/olvashatóság"
@@ -17029,8 +18110,8 @@ msgstr "Kijelzi a páratartalmat"
msgid "Recycling"
msgstr "Szelektív hulladékgyűjtő"
-msgid "Edit Recycling station"
-msgstr "Szelektív hulladékgyűjtő szerkesztése"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Akkumulátorok"
@@ -17056,35 +18137,23 @@ msgstr "hulladékudvar"
msgid "Waste Basket"
msgstr "Szemetes"
-msgid "Edit Waste Basket"
-msgstr "Szemetes szerkesztése"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Háttámla"
-msgid "Material"
-msgstr "Anyag"
-
-msgid "stone"
-msgstr "kő"
-
-msgid "plastic"
-msgstr "műanyag"
-
msgid "Amount of Seats"
msgstr "Helyek száma"
msgid "Edit Shelter"
-msgstr "Fedett váró szerkesztése"
+msgstr "Eslőbeálló szerkesztése"
msgid "Type of shelter"
-msgstr "Váró típusa"
+msgstr "Esőbeálló típusa"
msgctxt "shelter"
msgid "weather_shelter"
@@ -17092,7 +18161,7 @@ msgstr "esőház"
msgctxt "shelter"
msgid "public_transport"
-msgstr "tömegközlekedési"
+msgstr "tömegközlekedési váró"
msgctxt "shelter"
msgid "picnic_shelter"
@@ -17111,14 +18180,17 @@ msgstr "Vadászles szerkesztése"
msgid "Height"
msgstr "Magasság"
+msgctxt "height"
msgid "low"
-msgstr "alacsony"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "fél"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "teljes"
+msgstr ""
msgid "Hide"
msgstr "Rejtett"
@@ -17126,11 +18198,11 @@ msgstr "Rejtett"
msgid "Lock"
msgstr "Zárható"
-msgid "Drinking Water"
-msgstr "Ivóvíz"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Ivóvíz szerkesztése"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Tűzcsap"
@@ -17157,6 +18229,9 @@ msgstr "tó"
msgid "Diameter (in mm)"
msgstr "Átmérő (mm-ben)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "sáv"
@@ -17194,119 +18269,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Stadion szerkesztése"
-msgid "select sport:"
-msgstr "válassz sportot:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "többféle"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "íjászat"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atlétika"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "amerikai foci"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "ausztrál foci"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "kosárlabda"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "petanque"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "gyepteke (bowls)"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "kanadai foci"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kenu"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "falmászás"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "krikett"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "kerékpár"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "kutyaverseny"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "lovassport"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "torna"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "jégkorong"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "lóverseny"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motor"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "ütős"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "ligarögbi"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "uniós rögbi"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "lövés"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "gördeszka"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "korcsolya"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "sí"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "foci"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "úszás"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "asztalitenisz"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenisz"
+msgstr ""
msgid "Sports Centre"
msgstr "Sportközpont"
@@ -17338,26 +18449,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Minigolfpálya szerkesztése"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Többféle"
msgid "Edit Multi"
msgstr "Többféle sport szerkesztése"
-msgid "type"
-msgstr "típus"
-
+msgctxt "running"
msgid "pitch"
-msgstr "pálya"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sportközpont"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr "Teke"
@@ -17365,6 +18477,15 @@ msgstr "Teke"
msgid "Edit 9pin"
msgstr "Teke szerkesztése"
+msgid "pitch"
+msgstr "pálya"
+
+msgid "sports_centre"
+msgstr "sportközpont"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "Bowling"
@@ -17398,6 +18519,22 @@ msgstr "Kenuzás szerkesztése"
msgid "Edit Cycling"
msgstr "Kerékpározás szerkesztése"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Kutyaverseny"
@@ -17410,8 +18547,33 @@ msgstr "Lovaglás"
msgid "Edit Equestrian"
msgstr "Lovaglás szerkesztése"
-msgid "horse_riding"
-msgstr "lóverseny"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "mocsár"
msgid "Horse Racing"
msgstr "Lóverseny"
@@ -17429,7 +18591,7 @@ msgid "Skating"
msgstr "Korcsolyázás"
msgid "Edit Skating"
-msgstr "Korcsolyázás szerkesztése"
+msgstr ""
msgid "ice_rink"
msgstr "jégpálya"
@@ -17473,38 +18635,56 @@ msgstr "sípark"
msgid "Difficulty"
msgstr "Nehézség"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "tanuló"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "kezdő"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "haladó"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "profi"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "freeride"
+msgstr ""
msgid "Grooming"
msgstr "Karbantartás"
+msgctxt "piste:grooming"
msgid "classic"
-msgstr "klasszikus"
+msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "buckás"
+msgstr ""
+
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "klasszikus;sí-korcsolya"
+msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "kezeletlen"
+msgstr ""
msgid "Shooting"
msgstr "Lövészet"
@@ -17545,19 +18725,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17696,6 +18872,18 @@ msgstr "Modelrepülőtér"
msgid "Edit Model Aerodrome"
msgstr "Modelrepülőtér szerkesztése"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "Távirányítós autó"
@@ -17708,38 +18896,73 @@ msgstr "Építmények"
msgid "Edit Building"
msgstr "Épület szerkesztése"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "tető"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "garázs"
+msgstr ""
-msgid "church"
-msgstr "templom"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "iskola"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "hangár"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "kereskedelmi"
+msgstr ""
+msgctxt "building"
msgid "farm"
-msgstr "farm"
+msgstr ""
+msgctxt "building"
msgid "transportation"
-msgstr "szállítás"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "üvegház"
+msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "iroda"
+msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "egyetem"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr "Lakóépület"
@@ -17747,20 +18970,59 @@ msgstr "Lakóépület"
msgid "Edit Residential Building"
msgstr "Lakóépület szerkesztése"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "társasház"
+msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "ház"
+msgstr ""
+msgctxt "building"
msgid "hut"
-msgstr "kunyhó"
+msgstr ""
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
-msgstr "sorház"
+msgstr ""
+msgctxt "building"
msgid "detached"
-msgstr "családi ház"
+msgstr ""
+
+msgid "Entrance"
+msgstr "Bejárat"
+
+msgid "Edit Entrance"
+msgstr "Bejárat szerkesztése"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
msgid "Tower"
msgstr "Torony"
@@ -17777,9 +19039,6 @@ msgstr "telekommunikációs"
msgid "observation"
msgstr "megfigyelő"
-msgid "Height (meters)"
-msgstr "Magasság (méter)"
-
msgid "Flagpole"
msgstr "Zászlórúd"
@@ -17989,42 +19248,68 @@ msgstr "Üzemidő"
msgid "Mo-Fr 22:00-05:00"
msgstr "H-P 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Mérőállomás"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
+
+msgid "Monitoring:"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Mérőállomás szerkesztése"
+msgid "Weather"
+msgstr ""
-msgid "Measurement"
-msgstr "Mérés"
+msgid "Water level"
+msgstr ""
-msgid "particulate_matter"
-msgstr "részecske"
+msgid "Tide Level"
+msgstr ""
-msgid "seismic"
-msgstr "szeizmikus"
+msgid "Traffic"
+msgstr ""
-msgid "water_level"
-msgstr "vízszint"
+msgid "Air Quality"
+msgstr ""
-msgid "weather"
-msgstr "időjárás"
+msgid "Noise"
+msgstr ""
-msgid "Recording"
-msgstr "Rögzítés"
+msgid "GPS Signals"
+msgstr ""
+
+msgid "GLONASS Signals"
+msgstr ""
-msgid "manually"
-msgstr "kézzel"
+msgid "Galileo Signals"
+msgstr ""
-msgid "automated"
-msgstr "automata"
+msgid "Radiation"
+msgstr ""
-msgid "remote"
-msgstr "távvezérelt"
+msgid "Seismic Activity"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "nincs"
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Földmérési alappont"
@@ -18032,8 +19317,8 @@ msgstr "Földmérési alappont"
msgid "Edit Survey Point"
msgstr "Földmérési alappont szerkesztése"
-msgid "Surveillance"
-msgstr "Térfigyelés"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Térfigyelő kamera szerkesztése"
@@ -18044,47 +19329,137 @@ msgstr "beltéri"
msgid "outdoor"
msgstr "kültéri"
-msgid "public"
-msgstr "nyilvános"
+msgid "Zone"
+msgstr ""
-msgid "Power"
-msgstr "Energia"
+msgid "parking"
+msgstr ""
-msgid "Power Generator"
-msgstr "Generátor"
+msgid "traffic"
+msgstr ""
-msgid "Edit Power Generator"
-msgstr "Generátor szerkesztése"
+msgid "shop"
+msgstr "bolt"
-msgid "biofuel"
-msgstr "bioüzemanyag"
+msgid "bank"
+msgstr ""
-msgid "biogas"
-msgstr "biogáz"
+msgid "Camera"
+msgstr ""
-msgid "biomass"
-msgstr "biomassza"
+msgid "fixed"
+msgstr ""
-msgid "diesel"
-msgstr "dízel"
+msgid "panning"
+msgstr ""
-msgid "gasoline"
-msgstr "benzin"
+msgid "dome"
+msgstr ""
-msgid "geothermal"
-msgstr "geotermikus"
+msgid "Mounted on"
+msgstr ""
-msgid "hydro"
-msgstr "víz"
+msgid "ceiling"
+msgstr ""
-msgid "nuclear"
-msgstr "atomenergia"
+msgid "Direction in degrees"
+msgstr ""
-msgid "osmotic"
-msgstr "ozmotikus"
+msgid "Inclination in degrees"
+msgstr ""
-msgid "solar"
-msgstr "nap"
+msgid "Height in meter (m)"
+msgstr ""
+
+msgid "Power"
+msgstr "Energia"
+
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr "Kimenő energia"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "elektromos áram"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "forró víz"
+
+msgid "hot air"
+msgstr "forró levegő"
+
+msgid "cold water"
+msgstr "hideg víz"
+
+msgid "cold air"
+msgstr "hideg levegő"
+
+msgid "compressed air"
+msgstr "sűrített levegő"
+
+msgid "steam"
+msgstr "gőz"
+
+msgid "vacuum"
+msgstr "vákum"
+
+msgid "Power Generator"
+msgstr "Generátor"
+
+msgid "Edit Power Generator"
+msgstr "Generátor szerkesztése"
+
+msgid "biofuel"
+msgstr "bioüzemanyag"
+
+msgid "biogas"
+msgstr "biogáz"
+
+msgid "biomass"
+msgstr "biomassza"
+
+msgid "diesel"
+msgstr "dízel"
+
+msgid "gasoline"
+msgstr "benzin"
+
+msgid "geothermal"
+msgstr "geotermikus"
+
+msgid "hydro"
+msgstr "víz"
+
+msgid "nuclear"
+msgstr "atomenergia"
+
+msgid "osmotic"
+msgstr "ozmotikus"
+
+msgid "solar"
+msgstr "nap"
msgid "tidal"
msgstr "árapály"
@@ -18101,89 +19476,192 @@ msgstr "szél"
msgid "Method"
msgstr "Mód"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "oxigénmentes lebontás"
+msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "égés"
+msgstr ""
-msgid "dam"
-msgstr "gát"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "maghasadás"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "magfúzió"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
-msgstr "elgázosítás"
-
-msgid "photovoltaic"
-msgstr "fotovoltaikus"
+msgstr ""
-msgid "pumped-storage"
-msgstr "szivattyús-tározós"
+msgid "biomass / waste"
+msgstr ""
-msgid "pumping"
-msgstr "szivattyús"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "pirolízis"
+msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "folyóvizes"
+msgstr ""
+
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+msgctxt "generator method"
msgid "thermal"
-msgstr "hő"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "Kimenő energia"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "electricity"
-msgstr "elektromos áram"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "forró víz"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "forró levegő"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "hideg víz"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "hideg levegő"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "sűrített levegő"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "gőz"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vákum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
-msgid "battery charging"
-msgstr "akkumulátor töltés"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
-msgid "Power Station"
-msgstr "Áramelosztó-állomás"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Áramelosztó-állomás szerkesztése"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Áramelosztó-alállomás"
@@ -18194,6 +19672,21 @@ msgstr "Áramelosztó-alállomás szerkesztése"
msgid "Line reference"
msgstr "Vonal azonosító"
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "alacsony"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "Elosztó szekrény"
@@ -18209,6 +19702,9 @@ msgstr "Kábeltartó torony szerkesztése"
msgid "Tower reference"
msgstr "Torony azonosító"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Villanyoszlop"
@@ -18227,13 +19723,11 @@ msgstr "Távvezeték szerkesztése"
msgid "Line type"
msgstr "Vezeték típusa"
-msgctxt "Power Line"
msgid "line"
-msgstr "távvezeték"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "helyi vezeték"
+msgstr ""
msgid "Amount of Cables"
msgstr "Kábelek száma"
@@ -18340,11 +19834,11 @@ msgstr "Trafik"
msgid "Edit Kiosk"
msgstr "Trafik szerkesztése"
-msgid "Baker"
-msgstr "Pékség"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Pékség szerksztése"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Hentes"
@@ -18355,8 +19849,8 @@ msgstr "Hentes szerkesztése"
msgid "Seafood"
msgstr "Halárus"
-msgid "Edit Seafood"
-msgstr "Halárus szerkesztése"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Delikatesz bolt"
@@ -18376,14 +19870,20 @@ msgstr "Piac"
msgid "Edit Marketplace"
msgstr "Piac szerkesztése"
+msgid "Organic"
+msgstr "Biobolt"
+
msgid "Greengrocer"
msgstr "Zöldséges"
msgid "Edit Greengrocer"
msgstr "Zöldséges szerkesztése"
-msgid "Organic"
-msgstr "Biobolt"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr "Biobolt szerkesztése"
@@ -18454,8 +19954,8 @@ msgstr "Szabó szerkesztése"
msgid "Fabric"
msgstr "Méteráru"
-msgid "Edit Fabric"
-msgstr "Méterárubolt szerkesztése"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronika"
@@ -18475,14 +19975,14 @@ msgstr "Elektronikai bolt szerkesztése"
msgid "Mobile Phone"
msgstr "Mobiltelefon"
-msgid "Edit Mobile Phone"
-msgstr "Mobiltelefonbolt szerkesztése"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Porszívóbolt"
-msgid "Edit Vacuum Cleaner"
-msgstr "Porszívóbolt"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hi-fi bolt"
@@ -18490,9 +19990,8 @@ msgstr "Hi-fi bolt"
msgid "Edit Hifi Shop"
msgstr "Hi-fi bolt szerkesztése"
-msgctxt "shop"
msgid "Video"
-msgstr "Videokölcsönző"
+msgstr ""
msgid "Edit Video Shop"
msgstr "Videokölcsönző szerkesztése"
@@ -18518,6 +20017,12 @@ msgstr "Pénzváltó szerkesztése"
msgid "Edit Automated Teller Machine"
msgstr "Bankjegyautomata (ATM) szerkesztése"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Áruház"
@@ -18554,17 +20059,38 @@ msgstr "Ékszerész"
msgid "Edit Jewelry"
msgstr "Ékszerész szerkesztése"
-msgid "Erotic"
-msgstr "Szex shop"
-
-msgid "Edit Erotic"
-msgstr "Szex shop szerkesztése"
+msgid "Gift"
+msgstr ""
-msgid "Florist"
-msgstr "Virágüzlet"
+msgid "Edit Gift Shop"
+msgstr ""
-msgid "Edit Florist"
-msgstr "Virágüzlet szerkesztése"
+msgid "buddhist"
+msgstr "buddhista"
+
+msgid "christian"
+msgstr "keresztény"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "zsidó"
+
+msgid "muslim"
+msgstr "muzulmán"
+
+msgid "Erotic"
+msgstr "Szex shop"
+
+msgid "Edit Erotic Shop"
+msgstr ""
+
+msgid "Florist"
+msgstr "Virágüzlet"
+
+msgid "Edit Florist"
+msgstr "Virágüzlet szerkesztése"
msgid "Garden Centre"
msgstr "Kertészet"
@@ -18587,8 +20113,8 @@ msgstr "Háztartási bolt szerkesztése"
msgid "Paint"
msgstr "Festékbolt"
-msgid "Edit Paint"
-msgstr "Festékbolt szerkesztése"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Bútorbolt"
@@ -18599,20 +20125,20 @@ msgstr "Bútorbolt szerkesztése"
msgid "Kitchen"
msgstr "Konyhafelszerelés bolt"
-msgid "Edit Kitchen"
-msgstr "Konyhafelszerelés bolt szerkesztése"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Függönybolt"
-msgid "Edit Curtain"
-msgstr "Függönybolt szerkesztése"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Képkeret bolt"
-msgid "Edit Frames"
-msgstr "Képkeret bolt szerkesztése"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Irodaszer bolt"
@@ -18632,6 +20158,12 @@ msgstr "Könyvesbolt"
msgid "Edit Book Store"
msgstr "Könyvesbolt szerkesztése"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Utazási iroda"
@@ -18641,8 +20173,8 @@ msgstr "Utazási iroda szerkesztése"
msgid "Musical Instrument"
msgstr "Hangszerbolt"
-msgid "Edit Musical Instruments"
-msgstr "Hangszerbolt szerkesztése"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Játékbolt"
@@ -18722,6 +20254,9 @@ msgstr "játék"
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr "Megjegyzés"
+
msgid "Geography"
msgstr "Földrajz"
@@ -18851,6 +20386,12 @@ msgstr "Csúcs"
msgid "Edit Peak"
msgstr "Csúcs szerkesztése"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Gleccser"
@@ -18890,24 +20431,33 @@ msgstr "Fa"
msgid "Edit Tree"
msgstr "Fa szerkesztése"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botanikai név"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Őserdő"
msgid "Edit Wood"
msgstr "Természetes erdő szerkesztése"
-msgctxt "wood"
msgid "coniferous"
msgstr "tűlevelű"
-msgctxt "wood"
msgid "deciduous"
msgstr "lombhullató"
-msgctxt "wood"
msgid "mixed"
msgstr "vegyes"
@@ -18917,15 +20467,6 @@ msgstr "Ültetett erdő"
msgid "Edit Forest Landuse"
msgstr "Ültetett, kezelt erdő szerkesztése"
-msgid "coniferous"
-msgstr "tűlevelű"
-
-msgid "deciduous"
-msgstr "lombhullató"
-
-msgid "mixed"
-msgstr "vegyes"
-
msgid "Grassland"
msgstr ""
@@ -19001,6 +20542,12 @@ msgstr "Mező"
msgid "Edit Meadow Landuse"
msgstr "Mező szerkesztése"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Szőlőültetvény"
@@ -19055,8 +20602,8 @@ msgstr "Szabadidő park"
msgid "Edit Recreation Ground Landuse"
msgstr "Szabadidő park szerkesztése"
-msgid "Residential area"
-msgstr "Lakóövezet"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Lakóövezet szerkesztése"
@@ -19067,6 +20614,9 @@ msgstr "Sírkert"
msgid "Edit Graveyard"
msgstr "Sírkert szerkesztése"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Temető"
@@ -19142,6 +20692,33 @@ msgstr "Kőfejtő szerkesztése"
msgid "Annotation"
msgstr "Annotáció"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Lakcím szerkesztése"
@@ -19160,30 +20737,6 @@ msgstr "Városnév"
msgid "Country code"
msgstr "Országkód"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Lakcím-interpoláció"
@@ -19202,6 +20755,18 @@ msgstr "páros"
msgid "alphabetic"
msgstr "ábécé"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Kapcsolat (általános séma)"
@@ -19364,26 +20929,55 @@ msgstr "ahol a kényszerítés véget ér"
msgid "traffic light or barrier that stops you"
msgstr "jelzőlámpa, vagy akadály, ami megállít"
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "út"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "sí"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "gyalogos"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "túra"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "kerülőút"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Szimbólum leírása"
@@ -19430,20 +21024,23 @@ msgstr "előre megállóhely"
msgid "backward halt point"
msgstr "vissza megállóhely"
-msgid "Route network"
-msgstr "Úthálózat"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Úthálózat szerkesztése"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "tag"
-msgid "Associated street"
-msgstr "Kapcsolódó utca"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Kapcsolódó utca szerkesztése"
+msgid "house"
+msgstr "ház"
msgid "Street"
msgstr "Utca"
@@ -19466,8 +21063,8 @@ msgstr "az utcához tartozó egyéb dolgok"
msgid "Destination sign"
msgstr "Útjelző tábla"
-msgid "Edit Destination sign"
-msgstr "Útjelző tábla szerkesztése"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "A táblán jelzett célpont (táv nélkül)"
@@ -19562,18 +21159,27 @@ msgstr "Híd alatt átmenő vonalak"
msgid "way forming the outline footprint"
msgstr "a körvonalat formázó vonal"
-msgid "nodes forming the outline"
-msgstr "a körvonalat formázó pontok"
+msgid "edge ways parallel to ''across''"
+msgstr ""
msgid "ways passing through the tunnel"
msgstr "az alagúton áthaladó vonalak"
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "híd"
msgid "deprecated"
msgstr "elavult"
+msgid "bicycle"
+msgstr "kerékpár"
+
+msgid "foot"
+msgstr "gyalogos"
+
msgid "horse"
msgstr "ló"
@@ -19583,7 +21189,10 @@ msgstr "akadály"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -19592,10 +21201,10 @@ msgstr ""
msgid "ford"
msgstr "gázló"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19613,6 +21222,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19628,28 +21240,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -19670,20 +21282,20 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "egészség"
-msgid "shop"
-msgstr "bolt"
+msgid "office"
+msgstr "iroda"
msgid "hotel"
msgstr "szálloda"
@@ -19748,9 +21360,6 @@ msgstr "puszta"
msgid "woodarea"
msgstr "erdőterület"
-msgid "mud"
-msgstr "mocsár"
-
msgid "beach"
msgstr "part"
@@ -19760,10 +21369,13 @@ msgstr "útvonal"
msgid "boundary"
msgstr "határ"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "hely"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19778,9 +21390,6 @@ msgstr "Falu/Város"
msgid "One Way"
msgstr "Egyirányú"
-msgid "Church"
-msgstr "Templom"
-
msgid "Fuel Station"
msgstr "Benzinkút"
@@ -19808,6 +21417,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19853,10 +21465,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19868,7 +21510,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19886,7 +21528,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20003,282 +21645,351 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "width without physical linear feature"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "religion without denomination"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "unknown christian denomination"
+msgid "border_type without boundary"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "board_type without information=board"
msgstr ""
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
-
-msgid "OSM Inspector: Redaction Bot"
+msgid "map_type without information=map"
msgstr ""
-msgid "Yahoo Sat"
-msgstr "Yahoo műhold"
-
-msgid "Bing Sat"
-msgstr "Bing műhold"
-
-msgid "MapBox Satellite"
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open Aerial"
-
-msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgid "artwork_type without tourism=artwork"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik fekete-fehér)"
+msgid "castle_type without historic=castle"
+msgstr ""
-msgid "Skobbler"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap (kerékpár)"
+msgid "bunker_type without military=bunker"
+msgstr ""
-msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgid "source:addr without addr:*"
+msgstr ""
-msgid "Public Transport (ÖPNV)"
-msgstr "Tömegközlekedés (ÖPNV)"
+msgid "source:date without source"
+msgstr ""
-msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Német stílus)"
+msgid "source:name without name"
+msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
+msgid "source:maxspeed without maxspeed"
+msgstr ""
-msgid "Hike & Bike"
-msgstr "Hike & Bike (túra és kerékpár)"
+msgid "source:building without building"
+msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Szorb nyelvű)"
+msgid "source:ref without ref"
+msgstr ""
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Német nyelvű)"
+msgid "source:population without population"
+msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "source:geometry on a node"
msgstr ""
-msgid "Bavaria (2 m)"
-msgstr "Bajorország (2 m)"
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "source:postal_code without addr:postcode"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "source:ele without ele"
msgstr ""
-msgid "Geoimage.at MaxRes"
-msgstr "Geoimage.at MaxRes"
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "source:lit without lit"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
-msgstr "Tirol: DGM (Domborzatmodell)"
+msgid "source:hgv without hgv"
+msgstr ""
-msgid "Tiris: DOM (Surface model)"
-msgstr "Tirol: DOM (Felszínmodell)"
+msgid "source:outline on a node"
+msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Bécs: Mehrzweckkarte (univerzális)"
+msgid "source:highway without highway"
+msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Bécs: Beschriftungen (annotációk)"
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Vienna: Orthofoto (ortofotó)"
+msgid "source:surface without surface"
+msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "source:bridge without bridge"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "source:old_name without old_name"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "source:designation without designation"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "source:height without height"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "source:lanes without lanes"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "religion without denomination"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "unknown christian denomination"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "unknown muslim denomination"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "unknown jewish denomination"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Geobase Roads"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "Canvec"
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
msgstr ""
-msgid "MSR Maps Topo"
-msgstr "MSR Maps terep"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
-msgid "MSR Maps Urban"
-msgstr "MSR Maps település"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "unusual maxspeed format"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Cseh CUZK:KM"
+msgid "unusual frequency specification"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Cseh UHUL:ORTOFOTO"
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition történelmi"
+msgid "Landsat"
+msgstr ""
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Yahoo Sat"
+msgstr ""
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Bing Sat"
+msgstr ""
-msgid "Surrey Air Survey"
-msgstr "Surrey légi felmérés"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "MapBox Satellite"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "MapQuest Open Aerial"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "OpenStreetMap GPS Traces"
msgstr ""
-msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ír hadügymi egy-hüvelykes 1941-43 GSGS 4136"
+msgid "OpenStreetMap (Mapnik)"
+msgstr ""
-msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ír Bartholomew negyed-hüvelykes 1940"
+msgid "OpenStreetMap (Mapnik Black & White)"
+msgstr ""
-msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Ír EEA GMES Urban Atlas"
+msgid "skobbler"
+msgstr ""
-msgid "Ireland EEA CORINE 2006"
-msgstr "Ír EEA CORINE 2006"
+msgid "skobbler heatmap"
+msgstr ""
-msgid "Lodi - Italy"
-msgstr "Lodi - Olaszország"
+msgid "OpenCycleMap"
+msgstr ""
-msgid "Lombardia - Italy (CTR)"
-msgstr "Lombardia - Olaszország (CTR)"
+msgid "MapQuest OSM"
+msgstr ""
-msgid "Sicily - Italy"
-msgstr "Szicília - Olaszország"
+msgid "Public Transport (ÖPNV)"
+msgstr ""
-msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Olaszország"
+msgid "OpenStreetMap (German Style)"
+msgstr ""
-msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio+Umbria"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "USSR - Latvia"
-msgstr "SZU - Lettország"
+msgid "osmfr"
+msgstr ""
-msgid "50cm ortho - Latvia"
-msgstr "50cm ortofotó - Lettország"
+msgid "AGRI black-and-white 2.5m"
+msgstr ""
-msgid "20cm ortho - Coastline"
-msgstr "20cm ortofotó - Partvonal"
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
+msgid "basemap.at"
+msgstr ""
+
+msgid "Graz: Basiskarte (base map)"
+msgstr ""
+
+msgid "Tiris: DGM (Terrain model)"
+msgstr ""
+
+msgid "Tiris: DOM (Surface model)"
+msgstr ""
+
+msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgstr ""
+
+msgid "Vienna: Beschriftungen (annotations)"
+msgstr ""
+
+msgid "Vienna: Orthofoto (aerial image)"
+msgstr ""
+
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr ""
+
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr ""
+
+msgid "VoGIS: DGM (Terrain model)"
+msgstr ""
+
+msgid "VoGIS: DOM (Surface model)"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
+msgstr ""
+
+msgid "Czech CUZK:KM"
+msgstr ""
+
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+msgid "Fugro (Denmark)"
+msgstr ""
+
+msgid "Stevns (Denmark)"
+msgstr ""
+
+msgid "Vejmidte (Denmark)"
+msgstr ""
+
+msgid "Estonia Basemap (Maaamet)"
+msgstr ""
+
+msgid "Estonia Ortho (Maaamet)"
+msgstr ""
+
+msgid "Estonia Multi (Maaamet)"
+msgstr ""
msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr ""
msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgstr ""
msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgstr ""
msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgstr ""
msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgstr ""
+
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr ""
msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgstr ""
msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgstr ""
msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgstr ""
msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgstr ""
+
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
@@ -20290,108 +22001,307 @@ msgid "Tours - Orthophotos 2008-2010"
msgstr ""
msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthophotos 2008"
+msgstr ""
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
+msgstr ""
+
+msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr ""
+
+msgid "Ireland Bartholomew Quarter-Inch 1940"
+msgstr ""
+
+msgid "Ireland EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Ireland EEA CORINE 2006"
+msgstr ""
+
+msgid "Lodi - Italy"
+msgstr ""
+
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
+msgid "Sicily - Italy"
+msgstr ""
+
+msgid "PCN 2006 - Italy"
+msgstr ""
+
+msgid "PCN 2008 - IT Lazio+Umbria"
+msgstr ""
+
+msgid "USSR - Latvia"
+msgstr ""
+
+msgid "50cm ortho - Latvia"
+msgstr ""
+
+msgid "20cm ortho - Coastline"
+msgstr ""
+
+msgid "ORT10LT (Lithuania)"
+msgstr ""
+
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr ""
+
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr ""
+
+msgid "ScanEx IRS"
+msgstr ""
+
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
msgid "Catastro Spain"
-msgstr "Spanyol kataszteri"
+msgstr ""
msgid "PNOA Spain"
-msgstr "PNOA Spanyolország"
+msgstr ""
msgid "SIGPAC Spain"
-msgstr "SIGPAC Spanyolország"
+msgstr ""
msgid "GRAFCAN - Canary Islands"
-msgstr "GRAFCAN - Kanári-szigetek"
+msgstr ""
msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castile and León"
+msgstr ""
msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Baleár-szigetek"
+msgstr ""
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Észtország alaptérkép (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Észtország ortofotó (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
-msgid "Estonia Multi (Maaamet)"
-msgstr "Észtország Multi (Maaamet)"
+msgid "Stadtplan Zürich"
+msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Dánia)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dánia)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dánia)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Fülöp-szk. HiRes)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Kambodzsa, Laosz, Thaiföld, Vietnam kétnyelvű"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
+msgstr ""
+
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr ""
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
+msgid "OSM - Tiger Edited Map"
+msgstr ""
+
+msgid "MassGIS L3 Parcels"
+msgstr ""
+
+msgid "NC 2010 Orthoimagery"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk autós"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk túra"
+msgid "OS 1:25k historic (OSM)"
+msgstr ""
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk kerékpár"
+msgid "OS Scottish Popular historic"
+msgstr ""
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk sí"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Szlovákia kataszteri térkép (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Szlovákia kataszteri térkép (KaPor, 2011-05)"
+msgid "OSM Export"
+msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Szlovákia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
+msgstr ""
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Szlovákia EEA CORINE 2006"
+msgid "SUMO Export"
+msgstr ""
-msgid "Slovakia Historic Maps"
-msgstr "Szlovákia történelmi térképek"
+msgid "Export"
+msgstr ""
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI fekete-fehér 2.5m"
+msgid "Port:"
+msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -20595,6 +22505,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20616,13 +22538,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20885,9 +22801,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20909,6 +22831,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20987,9 +22912,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -21074,7 +23011,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -21337,73 +23274,64 @@ msgid "Browser not supported."
msgstr ""
msgid "Building address"
-msgstr ""
+msgstr "Épület címe"
msgid "House number:"
-msgstr ""
+msgstr "Házszám:"
msgid "Street Name:"
-msgstr ""
-
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
+msgstr "Utca:"
msgid "Big buildings mode"
-msgstr ""
+msgstr "Nagy épületek rajzolása"
msgid "Rotate crosshair"
-msgstr ""
+msgstr "Kereszt forgatása"
msgid "Advanced settings"
-msgstr ""
+msgstr "További beállítások"
msgid "Buildings tags:"
-msgstr ""
+msgstr "Épületek címkéi"
msgid "Cannot place building outside of the world."
-msgstr ""
+msgstr "Nem helyezhetsz épületet a világon kívülre."
msgid "Create building"
-msgstr ""
+msgstr "Épület rajzolása"
msgid "Set buildings size"
-msgstr ""
+msgstr "Épületek méretének beállítása"
msgid "Use Address dialog"
-msgstr ""
+msgstr "Kérdezze meg a címet"
msgid "Auto-select building"
-msgstr ""
+msgstr "Épület automatikus kiválasztása"
msgid "Use address nodes under buildings"
-msgstr ""
+msgstr "Használja az épület alatti házszámokat"
msgid "Buildings width:"
-msgstr ""
+msgstr "Épületek szélessége:"
msgid "Length step:"
-msgstr ""
+msgstr "Hosszúság lépésköze:"
msgid "Advanced..."
-msgstr ""
+msgstr "További beállítások..."
msgid "Draw buildings"
-msgstr ""
+msgstr "Épületek rajzolása"
msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "Mutass az épület egyik sarkára a rajzolás megkezdéséhez"
msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Mutass az épület másik végére"
msgid "Set width of the building"
-msgstr ""
+msgstr "Állítsd be az épület szélességét"
msgid "on polygon"
msgstr ""
@@ -21524,6 +23452,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21542,12 +23473,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21683,6 +23608,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21700,6 +23628,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -21780,113 +23711,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
-msgstr "Kelet"
+msgid "Add a new municipality layer"
+msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
msgstr ""
-msgid "Save image as PNG"
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "East"
+msgstr "Kelet"
+
+msgid "I use the mouse"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21912,7 +23857,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21962,7 +23910,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22007,6 +23955,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -22079,64 +24030,111 @@ msgstr ""
msgid "Install"
msgstr ""
-msgid "Position only"
+msgid "Public"
msgstr ""
-msgid "Position, Time, Date, Speed"
+msgid "Could not get server response, check logs"
msgstr ""
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Failed to login as {0}:"
msgstr ""
-msgid "A By Time"
+msgid "The server did not return user ID"
msgstr ""
-msgid "A By Distance"
+msgid "Failed to send message:"
msgstr ""
-msgid "B By Time"
+msgid "Failed to get messages as {0}:"
msgstr ""
-msgid "B By Distance"
+msgid "GeoChat"
msgstr ""
-msgid "C By Time"
+msgid "Open GeoChat panel"
msgstr ""
-msgid "C By Distance"
+msgid "Zoom in to see messages"
msgstr ""
-msgid "Data Logging Format"
+msgid "Login"
msgstr ""
-msgid "Disable data logging if speed falls below"
+msgid "Enable autologin"
msgstr ""
-msgid "Disable data logging if distance falls below"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
msgstr ""
-msgid "Unknown logFormat"
+msgid "User {0} has left"
msgstr ""
-msgid "Port:"
+msgid "User {0} is mapping nearby"
msgstr ""
-msgid "refresh the port list"
+msgid "Users mapping nearby:"
msgstr ""
-msgid "Configure"
+msgid "Private chat"
msgstr ""
-msgid "Configure Device"
+msgid "Close tab"
msgstr ""
-msgid "Connection Error."
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
+msgid "Position only"
+msgstr ""
+
+msgid "Position, Time, Date, Speed"
+msgstr ""
+
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr ""
+
+msgid "A By Time"
+msgstr ""
+
+msgid "A By Distance"
+msgstr ""
+
+msgid "B By Time"
+msgstr ""
+
+msgid "B By Distance"
+msgstr ""
+
+msgid "C By Time"
+msgstr ""
+
+msgid "C By Distance"
+msgstr ""
+
+msgid "Data Logging Format"
+msgstr ""
+
+msgid "Disable data logging if speed falls below"
+msgstr ""
+
+msgid "Disable data logging if distance falls below"
msgstr ""
-msgid "configure the connected DG100"
+msgid "Unknown logFormat"
msgstr ""
-msgid "delete data after import"
+msgid "Configure Device"
msgstr ""
msgid "Importing data from device."
@@ -22534,6 +24532,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22722,19 +24723,19 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Légifelvétel igazítása"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "A kiválasztott légifelvétel-réteg igazítása"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Kérlek válassz igazítandó légifelvétel réteget."
+msgstr ""
msgid "Start adjusting"
msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "Jelenleg nincs igazítható légifelvétel-réteg."
+msgstr ""
msgid "No layers to adjust"
msgstr ""
@@ -22781,12 +24782,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -22796,16 +24791,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -23168,9 +25160,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -23225,9 +25214,33 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Egy szerep alapú kapcsolat tagsága másolásra került az összes új "
+"vonalra<br>Ellenőrizd és javítsd, ha szükséges.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Egy kapcsolat tagsága másolásra került az összes új "
+"vonalra<br>Ellenőrizd és javítsd, ha szükséges.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Adj meg egy címke kulcsot, pl. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Ajd meg egy címke értéket, pl. <strong><tt>tagok "
+"ellenőrizendők</tt></strong></html>"
+
msgid "Michigan Left"
msgstr ""
@@ -23269,25 +25282,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -23424,9 +25437,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -23451,12 +25461,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23487,8 +25506,8 @@ msgid ""
"The following module has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} modules have been downloaded <strong>successfully</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Az alábbi modul <strong>sikeresen</strong> letöltve:"
+msgstr[1] "Az alábbi {0} modul <strong>sikeresen</strong> letöltve:"
msgid "Downloading the following module has <strong>failed</strong>:"
msgid_plural ""
@@ -23605,6 +25624,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23621,6 +25643,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23854,13 +25887,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23913,18 +25939,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23982,6 +25996,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24189,9 +26206,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -24271,7 +26285,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -24425,6 +26457,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -24446,6 +26481,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24739,9 +26777,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24810,9 +26845,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24939,9 +26971,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24963,6 +26992,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24995,15 +27027,31 @@ msgstr "Hiányzó elemek lekérése"
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Tulajdonságok megváltoztatása"
+
msgid "Country preset:"
msgstr ""
@@ -25013,6 +27061,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -25115,9 +27166,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -25219,7 +27267,7 @@ msgid "SDS tag prefix"
msgstr ""
msgid "Connection successful."
-msgstr ""
+msgstr "Kapcsolódás sikeres."
msgid "Cannot connect to SDS server: "
msgstr ""
@@ -25233,6 +27281,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -25293,19 +27344,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25443,6 +27494,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -25518,6 +27572,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -25533,9 +27676,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25557,6 +27697,11 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Figyelmeztetés: Kivétel mellőzése, mert a művelet meg lett szakítva. "
+"Kivétel: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25709,9 +27854,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26425,7 +28567,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -26433,10 +28578,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -26445,18 +28587,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr "További eszközök"
-
msgid "Add nodes at intersections"
msgstr "Pontok hozzáadása a metszéspontokon"
@@ -26499,15 +28629,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Objektum kettévágása"
@@ -26631,18 +28752,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26820,9 +28929,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26949,28 +29055,31 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
-msgstr ""
+msgid "Walking Papers Scanned Map"
+msgstr "Walking Papers szkennelt térkép"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
msgstr ""
+"Szkennelt és a walking-papers.org weboldalra feltöltött térképeket jelenít "
+"meg"
msgid ""
"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
msgstr ""
+"Írd be a walking-papers.org URL-t vagy ID-t (a \"?id=\" utáni rész az URL-"
+"ben)"
msgid "Could not read information from walking-papers.org the id \"{0}\""
msgstr ""
+"Nem sikerült az információk beszerzése a walking-papers.org-ról (id: "
+"\"{0}\")."
msgid "Walking Papers: {0}"
-msgstr ""
+msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
-msgstr ""
-
-msgid "Walking Papers"
-msgstr ""
+msgstr "Walking Papers réteg ({0}) nagyítás: {1}"
msgid "Way Download"
msgstr ""
@@ -27104,9 +29213,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 80b76fa..9e45146 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:33+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: hy\n"
msgid "Cancel"
@@ -53,6 +53,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -153,13 +168,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 4b9d9f2..638ad17 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:45+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:46+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Circa JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/id.po b/i18n/po/id.po
index 77e8418..2d9d170 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -2,23 +2,24 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 13:48+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-08-19 07:49+0000\n"
"Last-Translator: Adityo Dwijananto <adz.only at gmail.com>\n"
"Language-Team: Indonesian <id 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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 04:46+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:46+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: id\n"
+"X-Language: id_ID\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: pilihan ''{1}'' membingungkan"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr "{0}: pilihan ''--{1}'' tidak membutuhkan argumnen"
+msgstr "{0}: pilihan ''--{1}'' tidak membutuhkan argumen"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
msgstr "{0}: pilihan ''{1}{2}'' tidak membutuhkan argumen"
@@ -50,6 +51,21 @@ msgstr "Latar Belakang syarat penggunaan"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Membuka tautan tidak dapat dilakukan pada platform ini (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr "PERINGATAN: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Melaksanakan platform baru yang terkait"
@@ -57,7 +73,7 @@ msgid "Building main menu"
msgstr "Membangun menu utama"
msgid "Help"
-msgstr "Panduan"
+msgstr "Bantuan"
msgid "Initializing OSM API"
msgstr "Menginisialisasi OSM API"
@@ -78,7 +94,7 @@ msgid "Updating user interface"
msgstr "Memperbaharui tampilan pengguna"
msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Mengabaikan dokumen URL yang rusak: \"{0}\""
+msgstr "Mengabaikan file URL yang rusak: \"{0}\""
msgid "Warning"
msgstr "Peringatan"
@@ -130,7 +146,7 @@ msgid "Homepage"
msgstr "Halaman Depan"
msgid "Bug Reports"
-msgstr "Laporan Bug"
+msgstr "Laporan Kesalahan"
msgid "Info"
msgstr "Informasi"
@@ -154,19 +170,14 @@ msgid "About JOSM..."
msgstr "Tentang JOSM"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"PERINGATAN: Format tak terduga dari URL dasar API. Sambungan kembali ke "
-"informasi atau halaman riwayat untuk objek OSM mungkin akan gagal. URL basis "
-"API adalah: \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"PERINGATAN: Format tak terduga dari URL dasar API. Sambungan kembali ke "
-"halaman user untuk user OSM mungkin akan gagal. URL basis API adalah: \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -190,8 +201,8 @@ msgstr "Klik untuk membatalkan membuka dengan browser eksternal"
msgid "Please select at least one already uploaded node, way, or relation."
msgstr ""
-"Silahkan pilih paling tidak satu node, jalan, atau relasi yang telah "
-"diupload."
+"Silahkan pilih paling tidak satu node/titik, way/garis, atau relasi yang "
+"telah diupload."
msgid "Please select the target layer."
msgstr "Silhkan pilih layer target."
@@ -213,35 +224,38 @@ msgid "No target layers"
msgstr "Tidak ada layer target"
msgid "Add imagery layer {0}"
-msgstr "Tidak ada layer perbandingan {0}"
+msgstr "Menambahkan Layer Citra {0}"
+
+msgid "Select image format for WMS layer"
+msgstr "Pilih format gambar untuk layer WMS"
msgid "Select WMS layers"
-msgstr ""
+msgstr "Pilih layer WMS"
msgid "Add layers"
-msgstr ""
+msgstr "Tambahkan layer"
msgid "Invalid service URL."
-msgstr "Pelayanan URL tidak valid."
+msgstr "Layanan URL tidak valid"
msgid "WMS Error"
msgstr "Kesalahan pada WMS"
msgid "Could not retrieve WMS layer list."
-msgstr "Tidak dapat mendapatkan kembali daftar layer WMS."
+msgstr "Tidak dapat mendapatkan daftar layer WMS"
msgid "Could not parse WMS layer list."
msgstr "Tidak dapat memisahkan daftar layer WMS."
msgid "Add Node..."
-msgstr "Tambah Node..."
+msgstr "Tambahkan Node..."
msgid "Add a node by entering latitude / longitude or easting / northing."
msgstr ""
"Tambahkan node dengan memasukkan posisi lintang/bujur atau posisi timur/utara"
msgid "Edit: {0}"
-msgstr "Ubah {0}"
+msgstr "Ubah: {0}"
msgid "Align Nodes in Circle"
msgstr "Sejajarkan Node Membentuk Lingkaran"
@@ -250,14 +264,11 @@ msgid "Move the selected nodes into a circle."
msgstr "Pindahkan node yang dipilih ke dalam sebuah lingkaran"
msgid "Tool: {0}"
-msgstr "Alat {0}"
+msgstr "Alat: {0}"
msgid "Please select at least four nodes."
msgstr "Mohon pilih paling sedikit empat node."
-msgid "Information"
-msgstr "Keterangan"
-
msgid "Align Nodes in Line"
msgstr "Sejajarkan Node dalam garis"
@@ -265,25 +276,28 @@ msgid "Move the selected nodes in to a line."
msgstr "Pindahkan Node yang telah dipilih ke dalam sebuah garis."
msgid "Please select at least three nodes."
-msgstr "Silahkan pillih paling tidak tiga node."
+msgstr "Mohon pilih paling sedikit tiga node."
msgid "data"
-msgstr "Data"
+msgstr "data"
msgid "layer"
-msgstr "Layer"
+msgstr "layer"
msgid "selection"
-msgstr "Pilihan"
+msgstr "pilihan"
msgid "conflict"
-msgstr "Konflik"
+msgstr "konflik"
msgid "download"
-msgstr "Download"
+msgstr "download"
+
+msgid "problem"
+msgstr "masalah"
msgid "previous"
-msgstr "Sebelumnya"
+msgstr "sebelumnya"
msgid "next"
msgstr "Berikutnya"
@@ -291,11 +305,14 @@ msgstr "Berikutnya"
msgid "Nothing selected to zoom to."
msgstr "Belum ada yang dipilih untuk diperbesar."
+msgid "Information"
+msgstr "Keterangan"
+
msgid "Zoom to {0}"
msgstr "Perbesar hingga {0}"
msgid "Zoom the view to {0}."
-msgstr "Perbesar gambar hingga {0}"
+msgstr "Perbesar gambar hingga {0}."
msgid "View: {0}"
msgstr "Lihat: {0}"
@@ -313,7 +330,7 @@ msgid "Close open changesets"
msgstr "Tutup changesets yang terbuka"
msgid "Closes open changesets"
-msgstr "Tutup changeset yang sedang terbuka"
+msgstr "Menutup perubahan yang terbuka"
msgid "File: {0}"
msgstr "Berkas: {0}"
@@ -328,10 +345,10 @@ msgid "Downloading open changesets ..."
msgstr "Mendownload changeset terbuka ..."
msgid "Combine Way"
-msgstr "Menggabungkan Jalan"
+msgstr "Menggabungkan garis/way"
msgid "Combine several ways into one."
-msgstr "Gabungkan beberapa jalur menjadi satu."
+msgstr "Gabungkan beberapa way/garis menjadi satu."
msgid "Change directions?"
msgstr "Ubah arah?"
@@ -344,20 +361,18 @@ msgid ""
"reverse some of them?"
msgstr ""
"Jalan tidak dapat digabungkan pada arah saat ini. Apakah anda mau membalikan "
-"beberapa jalan?"
+"arah beberapa jalan?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Tidak dapat menggabungkan jalan (Jalan tidak dapat digabungkan dalam sebuah "
-"rangkaian node)"
msgid "Combine {0} ways"
msgstr "Gabungkan {0} way/garis"
msgid "Please select at least two ways to combine."
-msgstr "Mohon pilih paling tidak dua way/garis untuk digabungkan"
+msgstr "Mohon pilih paling sedikit dua way/garis untuk digabungkan"
msgid "Copy"
msgstr "Salin"
@@ -400,7 +415,7 @@ msgid "No data loaded."
msgstr "Tidak ada data yang dimuat."
msgid "You must select at least one way."
-msgstr "Anda harus memilih paling sedikit satu jalan"
+msgstr "Anda harus memilih paling sedikit satu way/garis"
msgid "Delete"
msgstr "Hapus"
@@ -408,20 +423,40 @@ msgstr "Hapus"
msgid "Delete selected objects."
msgstr "Hapus objek terpilih."
+msgid "Toggle dialogs panel"
+msgstr "Mengatur panel dialog"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Mengatur panel dialog, memaksimalkan tampilan peta"
+
msgid "Distribute Nodes"
-msgstr "Mendistribusikan Node"
+msgstr "Mendistribusikan Node/Titik"
msgid "Distribute the selected nodes to equal distances along a line."
-msgstr "Mendistribusikan node terpilih untuk menyamakan jarak sepajang garis"
+msgstr ""
+"Mendistribusikan node terpilih untuk menyamakan jarak sepanjang garis"
+
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Abaikan {0} titik-titik/nodes tanpa koordinat"
msgid "Download from OSM..."
-msgstr "Mendownload dari OSM..."
+msgstr "Download dari OSM..."
msgid "Download map data from the OSM server."
-msgstr "Mendownload data peta dari server OSM."
+msgstr "Download data peta dari server OSM."
+
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Tindakan ini akan membutuhkan {0} permintaan<br>download "
+"individu.Apakah Anda ingin<br>melanjutkan?</html>"
+
+msgid "Download data"
+msgstr "Download data"
msgid "Download object..."
-msgstr "Mendownload objek..."
+msgstr "Download objek..."
msgid "Download OSM object by ID."
msgstr "Mendownload objek OSM berdasarkan ID"
@@ -453,7 +488,7 @@ msgid_plural "{0} downloaded objects are deleted."
msgstr[0] "{0} objek yang sudah didownload telah dihapus."
msgid "Ok"
-msgstr "OK"
+msgstr "Ok"
msgid "Download parent ways/relations..."
msgstr "Download parent ways/relations..."
@@ -500,13 +535,13 @@ msgid "Export to GPX..."
msgstr "Mengekspor ke GPX..."
msgid "Export the data to GPX file."
-msgstr "Ekspor data ke dokumen GPX."
+msgstr "Ekspor data ke file GPX."
msgid "Nothing to export. Get some data first."
msgstr "Tidak ada yang dapat diekspor. Ambil beberapa data terlebih dahulu."
msgid "Export GPX file"
-msgstr "Ekspor dokumen GPX"
+msgstr "Ekspor file GPX"
msgid "History"
msgstr "Sejarah"
@@ -516,8 +551,11 @@ msgstr ""
"Tampilkan informasi riwayat tentang way/garis, node/titik, atau relasi dalam "
"OSM."
+msgid "Show history"
+msgstr "Tunjukkan riwayat"
+
msgid "History (web)"
-msgstr "Sejarah (web)"
+msgstr "Riwayat (web)"
msgid ""
"Display history information about OSM ways, nodes, or relations in web "
@@ -536,7 +574,7 @@ msgid "Adjust imagery offset"
msgstr "Atur offset citra"
msgid "OK"
-msgstr "OK"
+msgstr "Ok"
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
@@ -602,7 +640,7 @@ msgid "The selected way has nodes outside of the downloaded data region."
msgid_plural ""
"The selected ways have nodes outside of the downloaded data region."
msgstr[0] ""
-"Jalur yang terpilih mempunyai node diluar data region yang diunduh"
+"Jalur yang terpilih mempunyai node/titik diluar data region yang diunduh"
msgid "This can lead to nodes being deleted accidentally."
msgstr "Ini dapat menyebabkan node/titik terhapus secara tidak sengaja."
@@ -635,23 +673,22 @@ msgid "Delete relations"
msgstr "Hapus relasi"
msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr "Hapus jalan yang bukan bagian dari multipoligon yang berada di dalam"
+msgstr ""
+"Hapus way/garis yang bukan bagian dari multipoligon yang berada di dalam"
msgid "Joined overlapping areas"
msgstr "Menggabungkan area yang tumpang tindih"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Beberapa jalur merupakan bagian dari relasi yang telah dimodifikasi. Mohon "
-"verifikasi tidak ada kesalahan yang telah dikenalkan."
msgid "Fix tag conflicts"
msgstr "Perbaiki label yang konflik"
msgid "Split ways into fragments"
-msgstr "Pisahkan jalur kedalam beberapa bagian."
+msgstr "Pisahkan way/garis kedalam beberapa bagian."
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgstr ""
@@ -809,11 +846,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Gabungkan node/titik kedalam node/titik yang lama."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Mohon pilih paling tidak dua node untuk digabungkan atau sebuah node yang "
-"dekat dengan node lainnya."
msgid "Abort Merging"
msgstr "Batalkan Penggabungan"
@@ -977,11 +1012,11 @@ msgid "Download Data"
msgstr "Download Data"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Tidak dapat membuka URL ''{0}'' karena tidak ada task unduhan yang "
-"tersedia.</html>"
+"Tidak bisa membuka URL ''{0}''<br> Tugas download berikut menerima pola URL "
+"yang ditampilkan:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1014,16 +1049,9 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalisasi/Ulangi"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalisasi Bentuk/Ulangi\n"
-"Mohon pilih node yang akan dipindahkan dengan tindakan Ortogonalisasi Bentuk "
-"sebelumnya."
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Ulangi Ortogonalisasi Bentuk"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1044,9 +1072,6 @@ msgstr "Ortogonalisasi"
msgid "Usage"
msgstr "Penggunaan"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Elemenyang dipilih tidak dapat diorthogonalisasi"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1149,7 +1174,7 @@ msgid "Redo"
msgstr "Ulangi"
msgid "Redo the last undone action."
-msgstr "Ulangan tindakan yang sebelumnya dibatalkan."
+msgstr "Ulangi tindakan yang sebelumnya dibatalkan"
msgid "Redo ..."
msgstr "Mengulang"
@@ -1166,6 +1191,15 @@ msgstr "Beri nama ulang berkasnya pula"
msgid "Could not rename file ''{0}''"
msgstr "Tidak dapat mengubah nama berkas \"{0}\""
+msgid "Restart"
+msgstr "Mulai Ulang"
+
+msgid "Restart the application."
+msgstr "Memulai ulang aplikasi."
+
+msgid "Click to restart later."
+msgstr "Klik untuk memulai ulang nanti."
+
msgid "Reverse way"
msgstr "Membalikan Jalur"
@@ -1218,9 +1252,6 @@ msgstr "Memuat sesi"
msgid "Load a session from file."
msgstr "Memuat sesi dari file"
-msgid "Session file (*.jos, *.joz)"
-msgstr "File sesi (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Membuka sesi"
@@ -1286,6 +1317,9 @@ msgstr "Laporan Status"
msgid "Copy to clipboard and close"
msgstr "Salin ke clipboard dan tutup"
+msgid "Report bug"
+msgstr "Melaporkan bug"
+
msgid "Close"
msgstr "Tutup"
@@ -1324,7 +1358,7 @@ msgid_plural "Simplify Way (remove {0} nodes)"
msgstr[0] "Sederhanakan Jalur (hapus {0} node)"
msgid "Split Way"
-msgstr "Bagi Jalur"
+msgstr "Memisahkan Garis/Way"
msgid "Split a way at the selected node."
msgstr "Pisahkan sebuah jalur pada node terpilih"
@@ -1364,19 +1398,14 @@ msgstr ""
"tengah-tengah jalan.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Peranan berdasarkan relasi keanggotaan telah disalin pada seluruh "
-"jalur baru.<br> Anda harus melakukan verifikasi hal ini dan memperbaikinya "
-"jika diperlukan.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Relasi keanggotaan telah disalin pada seluruh jalur baru.<br> Anda "
-"harus melakukan verifikasi hal ini dan memperbaikinya jika diperlukan.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Pisahkan {0} jalur menjadi {1} bagian"
@@ -1394,7 +1423,7 @@ msgid "Encourage/discourage upload"
msgstr "Memicu/membatalkan memicu unggah"
msgid "UnGlue Ways"
-msgstr "Lepas Jalur"
+msgstr "Memisahkan titik/garis"
msgid "Duplicate nodes that are used by multiple ways."
msgstr "Duplikasi node yang sedang digunakan pada jalur ganda"
@@ -1480,6 +1509,27 @@ msgstr ""
"karena anda tidak dapat objek yang sebenarnya.<br>Apakah anda yakin tetap "
"ingin memisahkan?"
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Ulangi"
@@ -1504,9 +1554,6 @@ msgstr "Perbarui data"
msgid "Updates the objects in the active data layer from the server."
msgstr "Perbarui objek di dalam layer data yang aktif dari server."
-msgid "Download data"
-msgstr "Download data"
-
msgid "Update modified"
msgstr "Perbarui hasil modifikasi"
@@ -1546,9 +1593,8 @@ msgid ""
"<html>The data to be uploaded participates in unresolved conflicts of layer "
"''{0}''.<br>You have to resolve them first.</html>"
msgstr ""
-"<html>Data yang akan sedang diupload telah mengalami konflik pada layer "
-"\"{0}\" yang tidak dapat diselesaikan. <br> Anda harus dapat "
-"menyelesaikannya terlebih dahulu.</html>"
+"<html>Data yang akan diupload telah masih konflik pada layer \"{0}\" yang "
+"belum diselesaikan. <br> Anda harus menyelesaikannya terlebih dahulu.</html>"
msgid "Upload discouraged"
msgstr "Membatalkan upload"
@@ -1717,6 +1763,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Maju perlahan"
+msgid "Download GPS"
+msgstr "Download GPS"
+
msgid "Downloading GPS data"
msgstr "Mendownload data GPS"
@@ -1726,6 +1775,18 @@ msgstr "Mendownload Data GPX"
msgid "Markers from {0}"
msgstr "Penanda dari {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Download Perubahan OSM yang dikompresi"
+
+msgid "Download OSM Change"
+msgstr "Download Perubahan OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Download OSM yang dikompresi"
+
+msgid "Download OSM"
+msgstr "Unduh data OSM"
+
msgid "Downloading data"
msgstr "Mendownload data"
@@ -1742,9 +1803,32 @@ msgid "OSM Server URL:"
msgstr "URL Server OSM:"
msgid "Command"
-msgstr ""
+msgstr "Perintah"
msgid "Request details: {0}"
+msgstr "Meminta detail: {0}"
+
+msgid "Download OSM URL"
+msgstr "Download URL OSM"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Terjadi {0} konflik selama import."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflik ketika mendownload"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Memuat node parent {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Memuat jalur parent {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Memuat parent hubungan {2}"
+
+msgid "Download session"
msgstr ""
msgid "Download {0} of {1} ({2} left)"
@@ -1777,7 +1861,7 @@ msgid_plural ""
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
msgstr[0] ""
-"Terdapat {0} objek pada dataset lokal yang dimana mungkin telah dihapus pada "
+"Terdapat {0} objek pada dataset lokal yang mungkin telah dihapus pada "
"server.<br>Jika anda telah mencoba untuk menghapus atau memperbaharui objek "
"tersebut server akan memberitahukan bahwa akan terjadi konflik."
@@ -1789,7 +1873,7 @@ msgstr[0] ""
"Klik <strong>{0}</strong> untuk memeriksa status objek ini pada server."
msgid "Click <strong>{0}</strong> to ignore.</html>"
-msgstr "Klik <strong>{0}</strong> untuk mengabaikan</html>"
+msgstr "Klik <strong>{0}</strong> untuk mengabaikan.</html>"
msgid "Deleted or moved objects"
msgstr "Objek yang telah dihapus atau dipindahkan"
@@ -1800,23 +1884,6 @@ msgstr "Kesalahan berikut terjadi pada saat download masal: {0}"
msgid "Errors during download"
msgstr "Gangguan saat mendownload"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Terjadi {0} konflik selama import."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflik ketika mendownload"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Memuat node parent {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Memuat jalur parent {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Memuat parent hubungan {2}"
-
msgid "Error during download"
msgstr "Kesalahan pada saat download"
@@ -1850,7 +1917,7 @@ msgid "Backspace in Add mode"
msgstr "Backspace di mode add"
msgid "helper line"
-msgstr ""
+msgstr "garis bantu"
msgid "Cannot add a node outside of the world."
msgstr "Tidak dapat menambah node diluar dunia"
@@ -1955,7 +2022,7 @@ msgstr ""
"persegi baru, klik ganda untuk menambah sebuah node baru"
msgid "Extrude: main line"
-msgstr ""
+msgstr "Ekstrusi: jalur utama"
msgid "Extrude: helper line"
msgstr "Mengambil: Pembantu garis"
@@ -1969,6 +2036,9 @@ msgstr "Meningkatkan akurasi way/garis"
msgid "Improve Way Accuracy mode"
msgstr "Meningkatkan akurasi mode way/garis"
+msgid "improve way accuracy helper line"
+msgstr "memperbaiki cara akurasi garis bantu"
+
msgid "Click on the way to start improving its shape."
msgstr "Klik pada way/garis untuk memulai memperbaharui bentuk way/garis"
@@ -1999,9 +2069,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Tidak dapat menempatkan sebuah node/titik di luar permukaan bumi."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Tambhkan sebuah node/titik baru pada {0} way/garis"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Tidak dapat menghapus node/titik yang dirujuk oleh beragam objek"
@@ -2015,6 +2086,9 @@ msgstr "Paralel"
msgid "Make parallel copies of ways"
msgstr "Buat salinan jalur paralel"
+msgid "make parallel helper line"
+msgstr "membuat garis bantu paralel"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2198,7 +2272,7 @@ msgid "<equals>"
msgstr "<sama dengan>"
msgid "<key>"
-msgstr "<kunci>"
+msgstr "<key>"
msgid "<question mark>"
msgstr "<tanda tanya>"
@@ -2475,6 +2549,9 @@ msgstr "\"value\" dalam \"key\" apapun"
msgid "matches if ''key'' exists"
msgstr "Cocokkan jika \"key\" telah ada"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "pengkombinasi"
@@ -2512,7 +2589,7 @@ msgid "all closed ways"
msgstr "Semua way/garis yang tertutup"
msgid "object without useful tags"
-msgstr ""
+msgstr "objek tanpa tag berguna"
msgid "metadata"
msgstr "metadata"
@@ -2563,7 +2640,7 @@ msgid "all incomplete objects"
msgstr "Seluruh objek yang tidak lengkap"
msgid "related objects"
-msgstr ""
+msgstr "objek tekait"
msgid "all children of objects matching the expression"
msgstr "Seluruh anak dari objek yang cocok dengan ekspresi"
@@ -2572,10 +2649,10 @@ msgid "all parents of objects matching the expression"
msgstr "Seluruh objek utama yang cocok dengan ekspresi"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "anggota ke-n berhubungan dan/atau node ke-n dari jalan"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "setiap anggota ke-n berhubungan dan/atau setiap node ke-n dari jalan"
msgid "view"
msgstr "Tampilan"
@@ -2648,18 +2725,18 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Mengharapkan <i>min</i>/<i>max</i> setelah ''timestamp''"
-msgid "Primitive id expected"
-msgstr "ID primitif diharapkan"
+msgid "Range of primitive ids expected"
+msgstr "Jangkauan id primitif diperkirakan"
-msgid "Changeset id expected"
-msgstr "id changeset diharapkan"
+msgid "Range of changeset ids expected"
+msgstr "Jangkauan id changeset diperkirakan"
-msgid "Version expected"
-msgstr "Versi yang diharapkan"
+msgid "Range of versions expected"
+msgstr "Jangkauan versi diharapkan"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
-"Kunci tidak dapat dikosongkan ketika label operator sedang digunakan. Contoh "
+"Key tidak dapat dikosongkan ketika label operator sedang digunakan. Contoh "
"penggunaan: key=value"
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2667,6 +2744,9 @@ msgstr ""
"Tipe primitif tidak dapat diketahui: {0}. Nilai yang diperbolehkan adalah "
"node, jalur, atau hubungan"
+msgid "Primitive id expected"
+msgstr "ID primitif diharapkan"
+
msgid "Range of numbers expected"
msgstr "Jarak pada angka diharapkan"
@@ -2685,11 +2765,8 @@ msgstr "Parameter hilang untuk XOR"
msgid "Missing operator for NOT"
msgstr "Kehilangan operator untuk NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Peringatan: Nilai label \"{0}\" telah dipotong secara otomatis pada objek "
-"yang telah dihapus {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2716,7 +2793,7 @@ msgid "Removed obsolete tags"
msgstr "Menghapus tag yang sudah tidak digunakan"
msgid "Fix deprecated tags"
-msgstr ""
+msgstr "Memperbaiki tag usang"
msgid ""
"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -2784,6 +2861,9 @@ msgid "Added {0} object"
msgid_plural "Added {0} objects"
msgstr[0] "Menambahkan {0} objek"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Ubah node/titik {0}"
@@ -2820,11 +2900,11 @@ msgstr "Menghapus \"{0}\" untuk {1} objek"
msgid "Set {0}={1} for {2} objects"
msgstr "Set {0}={1} untuk {2} objek"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Menghapus {0} properti dari {1} objek"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Atur {0} properti dari {1} objek"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Gantikan \"{0}\" dengan \"{1}\" untuk"
@@ -2847,11 +2927,9 @@ msgid "Double conflict"
msgstr "Konflik ganda"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Peringatan : Layer ''{0}'' sudah tidak ada. Tidak dapat menghapus konflik "
-"untuk objek ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Tambah konflik untuk {0}"
@@ -2957,6 +3035,9 @@ msgstr[0] "Objek {0} diberikan"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Menyelesaikan konflik dalam anggota relasi {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Putar {0} node/titik"
@@ -3008,17 +3089,18 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
-msgstr[1] ""
+"<html>Anda ingin merubah arah way/garis ''{0}'',<br/> yang memiliki arti "
+"semantik dari tag yang ditentukan oleh arahnya:<br/>{1}Apa anda ingin untuk "
+"mengubah arah dari way/garis, juga dengan semantik dari way/garis "
+"tersebut?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Membalikan arah jalan."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Ketika membalikkan arah garis ini, perubahan untuk properti way/garis dan "
-"node/titiknya disarankan untuk menjaga konsistensi data."
msgid "Relation"
msgstr "Relasi"
@@ -3047,11 +3129,11 @@ msgstr "Terapkan perubahan yang dipilih"
msgid "Do not apply changes"
msgstr "Jangan terapkan perubahan"
-msgid "Please select which property changes you want to apply."
-msgstr "Harap pilih perubahan properti mana yang ingin anda terapkan."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Properti dari "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Peran dalam relasi yang merujuk kepada"
@@ -3073,6 +3155,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Tidak dapat menghapus berkas cadangan yang lama {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Terjadi kesalahan saat membuat cadangan dari layer yang dihapus: {0}"
@@ -3106,21 +3191,19 @@ msgstr ""
"tapi nilainya tidak diketahui saat ini.<br/> Tolong aktifkan fungsi "
"menyesuaikan secara manual dan coba untuk mengimpor.."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Peringatan: Gagal untuk membuat direktori cache yang hilang: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Gagal untuk membuat direktori cache yang hilang: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Peringatan: gagal mempertahankan pengaturan untuk ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Peringatan: Gagal untuk menginisialisasi pengaturan. Petunjuk pengaturan "
-"\"{0}\" bukan merupakan petunjuk"
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3130,11 +3213,9 @@ msgstr ""
"''{0}'' bukan merupakan petunjuk.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Peringatan: Gagal untuk menginisialisasi pengaturan. Gagal untuk membuat "
-"petunjuk pengaturan yang hilang: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3143,17 +3224,12 @@ msgstr ""
"<html>Gagal untuk menginisialisasi pengaturan.<br>Gagal untuk membuat "
"petunjuk pengaturan yang hilang: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Info: File pengaturan yang hilang \"{0}\". Membuat file pengaturan standar"
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Peringatan:Mengganti file pengaturan yang ada ''{0}'' dengan file pengaturan "
-"awal."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3170,11 +3246,9 @@ msgstr ""
"<br>{0}<br> dan buatlah file pengaturan awal yang baru.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Peringatan: Gagal untuk menginisialisasi pengaturan. Gagal untuk mengulang "
-"file pengaturan ke dalam pengaturan standar: {0}"
msgid "Paint style {0}: {1}"
msgstr "Gaya Gambar {0}: {1}"
@@ -3203,14 +3277,11 @@ msgstr "Gagal untuk mengupload sumber \"{0}\", kesalahan adalah {1}."
msgid "UNKNOWN"
msgstr "TIDAK DIKENAL"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Peringatan : Versi JOSM yang tidak diharapkan dalam file revisi, valuenya "
-"adalah \"{0}\""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Peringatan: File revisi \"/REVISION\" hilang"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Telah meregistrasi sebuah konflik untuk primitif \"{0}\"."
@@ -3379,11 +3450,8 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parameter {0} tidak didalam jangkauan 0..{1}. Memiliki ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Kesalahan: gagal untuk memuat kelas render peta \"{0}\". kelas tidak "
-"ditemukan"
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3495,8 +3563,8 @@ msgstr "File pergeseran grid ''{0}'' untuk pilihan +nadgrids tidak didukung."
msgid "Unkown datum identifier: ''{0}''"
msgstr "Identifikasi datum tidak diketahui: \"{0}\""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum membutuhkan (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr ""
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3517,6 +3585,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Tidak terduga dari jumlah pendapat untuk parameter ''+batas'' (harus 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Parameter tidak diketahui ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Diharapkan beberapa pendapat untuk parameter ''{0}''"
@@ -3536,9 +3607,6 @@ msgstr "Proyeksi pilihan anda sendiri"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "Kesalahan: Gagal untuk membuka input dari sumber \"/data/{0}\"."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3579,28 +3647,40 @@ msgstr "Validasi lainnya"
msgid "Running test {0}"
msgstr "Melakukan tes {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Alamat"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr ""
+msgstr "Cek kesalahan dalam alamat dan relasi jalan terkait."
msgid "Multiple associatedStreet relations"
-msgstr ""
+msgstr "Beberapa relasi jalan terkait"
msgid "House number without street"
-msgstr ""
+msgstr "Nomor rumah tanpa jalan"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Nomor rumah'' {0}'' digandakan"
msgid "Duplicate house numbers"
-msgstr ""
+msgstr "Gandakan nomor rumah"
msgid "Multiple street names in relation"
-msgstr ""
+msgstr "Beberapa nama jalan dalam relasi"
msgid "House number too far from street"
+msgstr "Nomor rumah terlalu jauh dari jalan"
+
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
msgstr ""
msgid "Building inside building"
@@ -3625,7 +3705,7 @@ msgid "Reversed coastline"
msgstr "Garis pantai yang berubah arah"
msgid "Crossing ways."
-msgstr ""
+msgstr "Melewati jalan."
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -3639,7 +3719,7 @@ msgid "Crossing buildings"
msgstr "Bangunan yang saling melintasi"
msgid "Crossing waterways"
-msgstr ""
+msgstr "Melewati sungai"
msgid "Crossing waterway/highway"
msgstr "Pertemuan sungai dengan jalan"
@@ -3665,15 +3745,15 @@ msgstr " atau "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} sudah usang, gunakan {1} daripada"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "node/titik yang terduplikasi"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Tes ini untuk mengetahui tidak ada node/titik di lokasi yang sama."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Node/titik yang terduplikasi di dua garis yang tidak tertutup"
-
msgid "Mixed type duplicated nodes"
msgstr "Campuran dari tipe node/titik yang terduplikasi"
@@ -3745,6 +3825,24 @@ msgstr "Duplikasi node/titik dari way/garis"
msgid "Checks for ways with identical consecutive nodes."
msgstr "memeriksa garis/way dengan urutan titik/node yang sama"
+msgid "Highways"
+msgstr "Jalan Raya"
+
+msgid "Performs semantic checks on highways."
+msgstr "Melakukan pemeriksaan semantik di jalan raya."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Jalan lingkaran salah (highway: {0} sebagai {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipoligon"
@@ -3819,6 +3917,12 @@ msgstr "node dengan nama yang sama"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Tes ini menemukan titik yang memiliki nama yang sama (mungkin ganda)"
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "Area yang bertampalan"
@@ -3826,7 +3930,7 @@ msgid "This test checks if areas overlap."
msgstr "Tes ini memeriksa jika area bertampalan"
msgid "Overlapping Water Areas"
-msgstr ""
+msgstr "Overlap Badan Air"
msgid "Overlapping ways"
msgstr "Way/garis yang bertampalan"
@@ -3880,15 +3984,15 @@ msgstr "Jenis hubungan tidak diketahui"
msgid "Relation is empty"
msgstr "Hubungan kosong"
+msgid "Role verification problem"
+msgstr "Peran verifikasi masalah"
+
msgid "<empty>"
msgstr "<kosong>"
msgid "Role {0} missing"
msgstr "Peran {0} menghilang"
-msgid "Role verification problem"
-msgstr "Peran verifikasi masalah"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Angka {0} perannya begitu rendah ({1})"
@@ -3921,11 +4025,11 @@ msgid ""
msgstr ""
"Tes ini memeriksa untuk garis dengan nama yang sama mungkin salah pengejaan"
-msgid "Properties checker :"
-msgstr "Properti pemeriksa"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Plugin ini emeriksa untuk kesalahan dalam kunci dan nilai properti"
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Garis tidak valid dalam pemeriksaan tag - {0}:{1}"
@@ -3944,7 +4048,7 @@ msgid "Suspicious tag/value combinations"
msgstr "Mencurigakan tag/nilai kombinasi"
msgid "Key ''{0}'' invalid."
-msgstr "Kunci \"{0}\" tidak valid"
+msgstr "Key ''{0}'' tidak valid."
msgid "Tag value contains character with code less than 0x20"
msgstr "Nilai tag/label mengandung karakter dengan kode kurang dari 0x20"
@@ -3956,13 +4060,13 @@ msgid "Tag value longer than allowed"
msgstr "Tag value lebih panjang dari yang diperbolehkan"
msgid "Tag key longer than allowed"
-msgstr "Kunci tag/label lebih lama diperbolehkan"
+msgstr "Tag key lebih panjang dari yang diperbolehkan"
msgid "Tags with empty values"
msgstr "Tag/label dengan nilai kosong"
msgid "Invalid property key"
-msgstr "Kunci properti tidak valid"
+msgstr "Properti key tidak valid"
msgid "Invalid white space in property key"
msgstr "spasi tidak valid pada kunci properti"
@@ -3974,13 +4078,13 @@ msgid "Property values contain HTML entity"
msgstr "Nilai properti mengandung HTML"
msgid "Key ''{0}'' not in presets."
-msgstr "Kunci \"{0}\" tidak pada preset"
+msgstr "Key \"{0}\" tidak ada pada preset"
msgid "Presets do not contain property key"
msgstr "Preset tidak mengandung kunci properti"
msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr "Nilai \"{0}\" untuk kunci \"{1}\" tidak pada preset"
+msgstr "Value ''{0}'' untuk key ''{1}'' tidak ada di preset"
msgid "Presets do not contain property value"
msgstr "Preset tidak berisi nilai properti"
@@ -4034,7 +4138,7 @@ msgid "Data sources"
msgstr "Sumber data"
msgid "Check property values."
-msgstr "Memeriksa nilai properti"
+msgstr "Periksa value properti"
msgid "Validate that property values are valid checking against presets."
msgstr "Validasi nilai properti valid diperiksa terhadap preset"
@@ -4064,8 +4168,8 @@ msgstr "Gunakan standar file cek ejaan"
msgid "Use the default spellcheck file (recommended)."
msgstr "Gunakan standar file cek ejaan (rekomendasi)"
-msgid "Fix properties"
-msgstr "Memperbaiki properti"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Tidak dapat menemukan tipe elemen"
@@ -4143,6 +4247,9 @@ msgstr ""
"Tes ini untuk melihat way/garis mana yang seharusnya berbentuk lingkaran "
"tertutup"
+msgid "Unclosed way"
+msgstr "Jalur belum tertutup"
+
msgid "natural type {0}"
msgstr "tipe natural {0}"
@@ -4173,9 +4280,6 @@ msgstr "bangunan"
msgid "area"
msgstr "area"
-msgid "Unclosed way"
-msgstr "Jalur belum tertutup"
-
msgid "Unconnected ways"
msgstr "way/garis yang tidak terhubung"
@@ -4203,12 +4307,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Tes ini memeriksa untuk titik tidak berlabel bukan bagian dari beberapa jalan"
-msgid "No tags"
-msgstr "Tidak ada tag"
-
msgid "Unconnected nodes without physical tags"
msgstr "Titik yang tidak terkoneksi tanpa tag fisik"
+msgid "No tags"
+msgstr "Tidak ada tag"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Apakah tag mengandung \"fixme\" atau \"FIXME\""
@@ -4269,28 +4373,6 @@ msgstr "Garis pantai terbalik: daratan tidak berada di sisi kiri"
msgid "Reversed land: land not on left side"
msgstr "Daratan terbalik: daratan tidak berada di sisi kiri"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Jumlah argumen untuk bookmark salah"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Terdapat kesalahan saat membaca penanda yang dimasukkan: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Kesalahan: garis yang tidak diharapkan ''{0}'' di file penanda ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Kesalahan: Value ganda yang tidak sah ''{0}'' pada garis ''{1}'' di file "
-"penanda ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Tidak dapat membaca penanda dari<br>''{0}''<br>Kesalahan adalah: "
-"{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Jangan tunjukkan lagi (ingat pilihan)"
@@ -4366,7 +4448,7 @@ msgid "Authentication Failed"
msgstr "Otentikasi Gagal"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr ""
+msgstr "Akses ke versi ''{0}'' dihapus dari {1} {2} dilarang"
msgid "Authorisation Failed"
msgstr "Otoritas gagal"
@@ -4392,8 +4474,8 @@ msgstr "Tunjukkan informasi bantuan"
msgid "Downloading \"Message of the day\""
msgstr "Download \"Pesan hari ini\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Peringatan: Gagal untuk membaca MOTD. Pengecualian: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr ""
msgid "Message of the day not available"
msgstr "Pesan hari tidak tersedia"
@@ -4405,7 +4487,7 @@ msgid "Imagery offset"
msgstr "Pergeseran citra"
msgid "Imagery"
-msgstr "Citra Stelit"
+msgstr "Citra Satelit"
msgctxt "layer"
msgid "Offset"
@@ -4605,9 +4687,24 @@ msgstr "Tampilan"
msgid "Tools"
msgstr "Alat"
+msgid "More tools"
+msgstr "Alat tambahan"
+
+msgid "Data"
+msgstr "Data"
+
+msgid "Selection"
+msgstr "Pilihan"
+
msgid "Presets"
msgstr "Presets"
+msgid "More..."
+msgstr "Selebihnya..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Jendela"
@@ -4623,18 +4720,33 @@ msgstr "Edit toolbar"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "Matikan visibilitas dari edit toolbar. (contoh tool vertikal)"
-msgid "Audio"
-msgstr "Suara"
+msgid "Preset preferences"
+msgstr ""
-msgid "Hide edit toolbar"
-msgstr "Sembunyikan edit toolbar"
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
-msgid "Hide this button"
-msgstr "Sembunyikan tombol ini"
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Do not hide toolbar"
+msgstr "Jangan menyembunyikan toolbar"
+
+msgid "Hide this button"
+msgstr "Sembunyikan tombol ini"
msgid "Click the arrow at the bottom to show it again."
msgstr "Klik tanda panah di bawah untuk memunculkannya kembali."
+msgid "Hide edit toolbar"
+msgstr "Sembunyikan edit toolbar"
+
msgid "Hide or show this toggle button"
msgstr "Sembunyikan atau tunjukan tombol toggle ini"
@@ -4696,6 +4808,9 @@ msgstr "(tidak ada objek)"
msgid "User:"
msgstr "Pengguna:"
+msgid "Do not hide status bar"
+msgstr "Jangan menyembunyikan status bar"
+
msgid "Layer not in list."
msgstr "Layer tidak terdapat dalam daftar"
@@ -4712,7 +4827,7 @@ msgid "Imperial"
msgstr "Imperial"
msgid "Nautical Mile"
-msgstr ""
+msgstr "Jarak lautan"
msgid "Click to cancel the current operation"
msgstr "Klikuntuk membatalkan operasi saat ini"
@@ -4723,21 +4838,6 @@ msgstr "Di latar belakang"
msgid "Click to run job in background"
msgstr "Klik untuk menjalankan pekerjaan di latar belakang"
-msgid "false: the property is explicitly switched off"
-msgstr "Salah: properti secara eksplisit dimatikan"
-
-msgid "true: the property is explicitly switched on"
-msgstr "Benar:properti secara eksplisit dihidupkan"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"Parsial: terdapat perbedaan pada objek yang dipilih memiliki perbedaan "
-"value, tidak berubah"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "uset: jangan atur properti ini pada objek yang dipilih"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -5012,7 +5112,7 @@ msgid "Compare "
msgstr "Bandingkan "
msgid "My version"
-msgstr "Versisaya"
+msgstr "Versi saya"
msgid "List of elements in my dataset, i.e. the local dataset"
msgstr "daftar elemen pada dataset saya, co: dataset lokal"
@@ -5047,6 +5147,9 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Salin elemen yang saya pilih ke akhir daftar elemen yang digabungkan."
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5054,6 +5157,9 @@ msgstr ""
"Salin elemen yang saya pilih sebelum awal dari daftar elemen yang "
"digabungkan."
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5061,16 +5167,25 @@ msgstr ""
"Salin elemen yang saya pilih setelah awal dari daftar elemen yang "
"digabungkan."
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Salin elemen yang mereka pilih ke awal dari daftar elemen yang digabungkan."
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Salin elemen yang mereka pilih ke akhir daftar elemen yang digabungkan."
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5078,6 +5193,9 @@ msgstr ""
"Salin elemen yang mereka pilih sebelum awal dari daftar elemen yang "
"digabungkan."
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5094,8 +5212,8 @@ msgstr "Salin semua elemen ke dalam target"
msgid "Up"
msgstr "Atas"
-msgid "Move up the selected elements by one position."
-msgstr "Pindahkan ke atas elemen yang terpilih dalam satu tempat/lokasi"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Bawah"
@@ -5147,16 +5265,6 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "Versi mereka ({0} entries)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Dapat menyesuaikan {0} belum teregistrasi. Tidak dapat mengatur partisipasi "
-"dalam penyesuaian sinkronisasi."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Dapat menyesuaikan {0} belum teregistrasi."
-
msgid "Node"
msgstr "Node"
@@ -5182,7 +5290,7 @@ msgid "Coordinates:"
msgstr "Koordinat:"
msgid "Deleted State:"
-msgstr "Menghapus state:"
+msgstr "Status Penghapusan:"
msgid "Referenced by:"
msgstr "referensi oleh"
@@ -5232,10 +5340,10 @@ msgid "My dataset does not include a tag with key {0}"
msgstr "Dataset saya tidak termasuk dalam tag key {0}"
msgid "Key"
-msgstr "Kunci"
+msgstr "Key"
msgid "Value"
-msgstr "Nilai"
+msgstr "Value"
msgid "Cannot apply undecided tag merge item."
msgstr "Tidak bisa menggunakan tag gabungan item yang belum pasti"
@@ -5330,7 +5438,7 @@ msgid "all"
msgstr "Seluruhnya"
msgid "Choose a value"
-msgstr "Pilih nilai"
+msgstr "Pilih value"
msgid "Please decide which values to keep"
msgstr "Mohon tentukan mana nilai yang akan disimpan"
@@ -5421,18 +5529,17 @@ msgstr ""
msgctxt "tag"
msgid "Key:"
-msgstr "Kunci:"
+msgstr "Key:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>Masukkan tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
msgid "Value:"
msgstr "Value"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Masukkan tag value, i.e. <strong><tt>check members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5542,12 +5649,14 @@ msgid ""
msgstr "Pilih objek pada bagian perintah ini (kecuali saat dihapus)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Pilih dan Perbesar"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Pilih objek-objek yang mengambil bagian dalam perintah ini (kecuali saat "
+"dihapus), kemudian perbesarlah"
msgid "Undo the selected and all later commands"
msgstr "Kembali ke belakang kepada perintah yang dipilih dan semua kemudian"
@@ -5575,7 +5684,7 @@ msgstr ""
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
-msgstr[0] "{0} konflik dihapus."
+msgstr[0] "Terdapat {0} konflik ditemukan."
msgid "Click to close this dialog and continue editing"
msgstr "Klik keluar dari kotak dialog dan mengedit selanjutnya"
@@ -6009,6 +6118,9 @@ msgstr "Tunjukkan/Sembunyikan"
msgid "Information about layer"
msgstr "Infomasi tentang layer"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Gaya Gambar Peta"
@@ -6047,10 +6159,10 @@ msgid "Save a copy of this Style to file and add it to the list"
msgstr "Simpan salinan dari mode file dan tambahkan ke daftar"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "File bentuk peta cat (*.mapcss, *.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "File bentuk peta cat (*.xml, *.zip)"
msgid "Reloading style sources"
msgstr "Memuat kembali sumber mode"
@@ -6091,6 +6203,36 @@ msgstr "Gaya sedang aktif saat ini?"
msgid "No"
msgstr "Tidak"
+msgid "Object type:"
+msgstr "Tipe objek:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "Campur"
+
+msgid "Choose the OSM object type"
+msgstr "Pilih tipe objek OSM"
+
+msgid "Object ID:"
+msgstr "ID Objek:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Masukan objek ID yang akan didownload"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"ID Objek dapat dipisahkan oleh koma atau spasi.<br/> Contoh: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> Pada mode campuran, spesifikasikan objek "
+"seperti ini: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relasi"
@@ -6098,7 +6240,7 @@ msgid "Open a list of all relations."
msgstr "Buka daftar dari semua relasi"
msgid "Relation list filter"
-msgstr ""
+msgstr "Filter daftar relasi"
msgid "Create a new relation"
msgstr "Buat relasi baru"
@@ -6107,14 +6249,11 @@ msgid "New"
msgstr "Baru"
msgid "Relations: {0}/{1}"
-msgstr ""
+msgstr "Relasi: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relasi: {0}"
-msgid "Selection"
-msgstr "Seleksi"
-
msgid "Open a selection list window."
msgstr "Buka jendela daftar pilihan"
@@ -6125,10 +6264,10 @@ msgid "Search for objects"
msgstr "Pencarian untuk objek"
msgid "Zoom to selection"
-msgstr "Perbesar pilihan"
+msgstr "Perbesar ke pilihan"
msgid "Zoom to selected element(s)"
-msgstr "Perbesar elemen yang dipilih"
+msgstr "Perbesar ke elemen yang dipilih"
msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
msgstr "Sel.: Rel.:{0} /Garis:{1} /Titik:{2}"
@@ -6139,23 +6278,11 @@ msgstr "Jangan dipilih sekarang"
msgid "Selection: {0}"
msgstr "Pilihan: {0}"
-msgid "Side buttons"
-msgstr "Tombol sebelah"
-
-msgid "Always shown"
-msgstr "Selalu dimuculkan"
-
-msgid "Dynamic"
-msgstr "Dinamis"
-
-msgid "Always hidden"
-msgstr "Selalu sembunyikan"
-
msgid "Toggle dynamic buttons"
msgstr "Beralih tombol dinamis"
msgid "Open preferences for this panel"
-msgstr ""
+msgstr "Buka pengaturan untuk panel ini"
msgid "Undock the panel"
msgstr "memindahkan panel"
@@ -6169,6 +6296,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Klik untuk ukuran minimal/maksimal pada panel isi"
+msgid "Side buttons"
+msgstr "Tombol sebelah"
+
+msgid "Always shown"
+msgstr "Selalu dimuculkan"
+
+msgid "Dynamic"
+msgstr "Dinamis"
+
+msgid "Always hidden"
+msgstr "Selalu sembunyikan"
+
msgid "Authors"
msgstr "Pembuat"
@@ -6185,11 +6324,8 @@ msgstr "Pilih objek yang diajukan oleh pengguna ini"
msgid "Launches a browser with information about the user"
msgstr "Luncurkan browser dengan informasi mengenai pengguna"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Peringatan: hanya meluncurkan browser info untuk pertama {0} dari {1} "
-"pengguna terpilih"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6216,9 +6352,6 @@ msgstr "Buka jendela validasi"
msgid "Validation results"
msgstr "Hasil validasi"
-msgid "Zoom to problem"
-msgstr "Perbesar ke masalah"
-
msgid "Fix"
msgstr "Perbaiki"
@@ -6367,9 +6500,6 @@ msgstr "Perbarui isi"
msgid "Update the changeset content from the OSM server"
msgstr "Perbarui konten perubahan set dari server OSM"
-msgid "Show history"
-msgstr "Tunjukkan riwayat"
-
msgid "Download and show the history of the selected objects"
msgstr "Download dan tunjukkan riwayat dari objek yang dipilih"
@@ -6695,11 +6825,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Unduh set perubahan dalam tampilan peta saat ini</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Peringatan: nilai tidak terduga untuk pengaturan \"{0}\", mendapat \"{1}\". "
-"Menyetel ulang standar query."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6768,35 +6896,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "URL set perubahan query tidak valid"
-msgid "Select objects for which to change properties."
-msgstr "Pilih objek untuk mengubah properti"
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Properti/keanggotaan"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Properti untuk objek yang dipilih"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<perbedaan>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Anggota Dari"
msgid "Position"
msgstr "Posisi"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Properti: {0} / Keanggotaan: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Properti/Keanggotaan"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Hapus key yang dipilih pada semua objek"
-msgid "Delete Properties"
-msgstr "Hapus properti"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Ubah relasi"
@@ -6810,14 +6950,14 @@ msgstr "Yakin hapus pilihan dari relasi {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Tambahkan pasangan key/value baru untuk semua objek"
-msgid "Add Property"
-msgstr "Tambah properti"
+msgid "Add Tag"
+msgstr "Tambahkan Tag (Label)"
msgid "Edit the value of the selected key for all objects"
msgstr "Edit value pada key yang dipilih untuk semua objek"
-msgid "Edit Properties"
-msgstr "Edit Properti"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Pergi ke wiki OSm untuk tag bantuan (F1)"
@@ -6826,31 +6966,31 @@ msgid "Launch browser with wiki help for selected object"
msgstr "Luncurkan browser dengan bantuan wiki untuk objek yang dipilih"
msgid "Paste Value"
-msgstr ""
+msgstr "Tempel Value"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "Paste value dari tag/label yang dipilih dari clipboard"
msgid "Copy Value"
-msgstr "salin nilai"
+msgstr "Salin Value"
msgid "Copy the value of the selected tag to clipboard"
msgstr "salin nilai dari tag yang dipilih pada data layer"
msgid "Copy Key/Value"
-msgstr "salin key/nilai"
+msgstr "Saliin Key/Value"
msgid "Copy the key and value of the selected tag to clipboard"
msgstr "salin key dan nilai dari tag yang dipilih pada data layer"
msgid "Copy all Keys/Values"
-msgstr "salin semua key/nilai"
+msgstr "Salin semua key/value"
msgid "Copy the key and value of the all tags to clipboard"
-msgstr "salin key dan nilai dari semua tag pada data layer"
+msgstr "Salin key dan value dari semua tag pada data layer"
msgid "Search Key/Value/Type"
-msgstr "cari key/nilai/tipe"
+msgstr "Cari Key/Value/Tipe"
msgid ""
"Search with the key and value of the selected tag, restrict to type (i.e., "
@@ -6860,7 +7000,7 @@ msgstr ""
"titik/garis/relasi)"
msgid "Search Key/Value"
-msgstr "pencarian key/nilai"
+msgstr "Mencari Key/Value"
msgid "Search with the key and value of the selected tag"
msgstr "pencarian key dan nilai dari tag yang dipilih"
@@ -6894,16 +7034,10 @@ msgid_plural "Change properties of up to {0} objects"
msgstr[0] "Ubah properti sebanyak {0} objek"
msgid "Use English language for tag by default"
-msgstr ""
-
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
+msgstr "Gunakan Bahasa Inggris untuk tag/label secara standar"
msgid "Add value?"
-msgstr "Tambahkan nilai?"
+msgstr "Tambahkan value?"
msgid "This will change up to {0} object."
msgid_plural "This will change up to {0} objects."
@@ -6913,26 +7047,32 @@ msgid "Please select a key"
msgstr "Silahkan pilih sebuah kunci"
msgid "Please select a value"
-msgstr "Silahkan pilih sebuah nilai"
+msgstr "Silahkan pilih sebuah value"
msgid "Set number of recently added tags"
-msgstr ""
+msgstr "Mengatur jumlah tag/label yang baru ditambahkan"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Ingat tag/label yang terakhir digunakan"
msgid "Please enter the number of recently added tags to display"
-msgstr ""
+msgstr "Masukkan jumlah tag baru yang ditambahkan untuk ditampilkan"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "Masukkan nomor bilangan bulat antara 0 dan {0}"
msgid "Recently added tags"
msgstr "Baru saja ditambahkan tag"
+msgid "Choose recent tag {0}"
+msgstr "Memilih tag {0} saat ini"
+
msgid "Use this tag again"
msgstr "Gunakan tag ini lagi"
+msgid "Apply recent tag {0}"
+msgstr "Menyetujui tag {0} saat ini"
+
msgid "The key ''{0}'' is already used"
msgstr "Key \"{0}\" yang sudah digunakan"
@@ -6971,10 +7111,8 @@ msgstr "Relasi dihapus"
msgid "Downloading relation {0}"
msgstr "Download Relasi {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Peringatan: Abaikan pengecualian karena task telah dibatalkan. Pengecualian: "
-"{0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7033,6 +7171,10 @@ msgstr "Hapus mereka, bersihkan dari relasi"
msgid "Ignore them, leave relation as is"
msgstr "Abaikan mereka, tinggalkan relasi"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Maaf, shortcut \"{0}\" tidak dapat diaktifkan dalam Hubungan dialog editor"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7262,10 +7404,10 @@ msgid "Select the next relation member which gives rise to a gap"
msgstr "memilih relasi member selanjutnya yang menimbulkan jarak"
msgid "Zoom to Gap"
-msgstr "perbesar jarak"
+msgstr "Perbesar ke jarak"
msgid "Zoom to the gap in the way sequence"
-msgstr "perbesar jarak pada rangkaian way/garis"
+msgstr "Perbesar ke jarak pada rangkaian way/garis"
msgid "Refers to"
msgstr "menunjukkan ke"
@@ -7315,6 +7457,27 @@ msgstr "way/garis terhubung dengan relasi member selanjutnya"
msgid "way is not connected to previous or next relation member"
msgstr "way/garis terhubung dengan relasi member sebelum atau selanjutnya"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Jumlah argumen untuk bookmark salah"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Terdapat kesalahan saat membaca penanda yang dimasukkan: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Tidak dapat membaca penanda dari<br>''{0}''<br>Kesalahan adalah: "
+"{1}</html>"
+
msgid "Bookmarks"
msgstr "Bookmark"
@@ -7386,9 +7549,6 @@ msgstr "Nilai dari lintang memiliki interval [-90,90] yang dibutuhkan"
msgid "Value for longitude in range [-180,180] required."
msgstr "Nilai dari bujur harus terletak pada interval [-180,180]"
-msgid "Paste URL from clipboard"
-msgstr "Tempel URL dari layar"
-
msgid "Data Sources and Types:"
msgstr "Sumber data dan jenis:"
@@ -7429,8 +7589,8 @@ msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
"map, wheel or +/- to zoom."
msgstr ""
-"Gunakan klik kiri dan seret ke area yang dipilih, panah atau tombol kanan "
-"mouse untuk menggulir peta, roda atau + / - untuk memperbesar."
+"Gunakan klik kiri dan geser ke area yang dipilih, panah atau tombol kanan "
+"mouse untuk mengarahkan peta, roda gulir atau + / - untuk memperbesar."
msgid "No area selected yet"
msgstr "Belum ada area yang terpilih"
@@ -7465,21 +7625,8 @@ msgstr "Download acuan (parent relations)"
msgid "Download object"
msgstr "Download objek"
-msgid "Object type:"
-msgstr "Tipe objek:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "Campur"
-
-msgid "Choose the OSM object type"
-msgstr "Pilih tipe objek OSM"
-
-msgid "Object ID:"
-msgstr "ID Objek:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Masukan objek ID yang akan didownload"
+msgid "Start downloading"
+msgstr "Memulai download"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7491,28 +7638,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Pilih jika anggota dari sebuah relasi seharusnya didownload"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"ID Objek dapat dipisahkan oleh koma atau spasi.<br/> Contoh: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> Pada mode campuran, spesifikasikan objek "
-"seperti ini: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Download referensi (parents relation and ways)"
-msgid "Start downloading"
-msgstr "Memulai download"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Spesifikasi Daftar ID tidak sah\n"
-"Tidak dapat mendownload objek."
-
msgid "Class Type"
msgstr "Tipe Kelas"
@@ -7627,8 +7755,8 @@ msgstr "Pergi ke halaman berikutnya"
msgid "Go to the JOSM help home page"
msgstr "Pergi ke halaman utama bantuan JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Peringatan: lokasi buruk pada dokumen HTLM. Pengecualian: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "Gagal untuk membuka halaman bantuan. URL yang dimasukkan kosong."
@@ -7737,6 +7865,9 @@ msgid ""
msgstr ""
"<html>Versi <strong>{0}</strong> dibuat di <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Info set perubahan"
@@ -7795,10 +7926,10 @@ msgstr ""
"<html>Mengupload <strong>gagal</strong> karena server telah memiliki versi "
"terbaru<br> dari node/titik, way/garis atau relasi anda.<br>Konflik "
"disebabkan oleh <strong>{0}</strong> dengan id "
-"<strong>{1}</strong>,<br>server memiliki versi {2}, versi anda adalah "
-"{3}.<br><br>Klik <strong>{4}</strong> untuk sinkronisasi hanya primiif "
-"konflik saja\\.<br>Klik <strong>{5}</strong> untuk sinkronisasi seluruh "
-"dataset loka dengan server.<br>Klik<strong>{6}</strong> untuk membatalkan "
+"<strong>{1}</strong>,<br>server memiliki versi {2}, versi anda adalah versi "
+"{3}.<br><br>Klik <strong>{4}</strong> untuk sinkronisasi hanya node/titik "
+"tersebut saja.<br>Klik <strong>{5}</strong> untuk sinkronisasi seluruh "
+"dataset lokal dengan server.<br>Klik <strong>{6}</strong> untuk membatalkan "
"dan melanjutkan editing.<br></html>"
msgid ""
@@ -7827,7 +7958,7 @@ msgid "Changeset closed"
msgstr "tutup set perubahan"
msgid "Prepare conflict resolution"
-msgstr "mempersiapkan resolusi konflik"
+msgstr "mempersiapkan penyelesaian konflik"
msgid "Click to download all referring objects for {0}"
msgstr "Klik untuk mendownload semua objek {0}"
@@ -7845,9 +7976,8 @@ msgstr ""
msgid "Object still in use"
msgstr "objek tetap digunakan"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Peringatan: kesalahan header \"{0}\" tidak sesuai dengan pola yang diharapkan"
msgid "Upload"
msgstr "Upload"
@@ -7868,6 +7998,12 @@ msgstr "Berikan komentar singkat untuk perubahan yang Anda unggah:"
msgid "Enter an upload comment"
msgstr "Masukan komentar unggah"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Id changeset:"
@@ -7936,11 +8072,8 @@ msgid "Closing changeset {0}"
msgstr "Penutupan set perubahan {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Peringatan: Gagal untuk menaruh Dialog credential untuk selalu berada di "
-"atas. Ambil pengecualian keamanan"
msgid "Enter credentials for OSM API"
msgstr "Masukkan tanda pengenal untuk OSM API"
@@ -8022,11 +8155,9 @@ msgid "Unpacking {0} into {1}"
msgstr "tidak dibungkus {0} kedalam {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Peringatan: Tidak dapat mendownload file ''{0}''. tautan download ''{1}'' "
-"bukan merupakan URL yang sah. melewatkan download."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8043,11 +8174,8 @@ msgid "Missing user identity"
msgstr "Kehilangan identitas user/pengguna"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Peringatan : Gagal untuk mengambil info pengguna untuk pengguna JOSM saat "
-"ini. Pengecualian adalah: {0}"
msgid "Download objects"
msgstr "Download objek"
@@ -8281,12 +8409,6 @@ msgstr "Upload primitif yang berubah"
msgid "Please revise upload comment"
msgstr "Silakan merevisi unggah komentar"
-msgid "Revise"
-msgstr "Revisi"
-
-msgid "Continue as is"
-msgstr "Lanjutkan saja sebagaimana adanya"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8302,6 +8424,22 @@ msgstr ""
"menjelaskan perubahan Anda, Itu akan membuat lebih mudah<br />bagi banyak "
"Pemeta yang lainnya."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Revisi"
+
+msgid "Continue as is"
+msgstr "Lanjutkan saja sebagaimana adanya"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Kembali ke dialog sebelumnya untuk memasukkan lebih dari komentar deskriptif"
@@ -8318,6 +8456,21 @@ msgstr "Silahkan masukkan potongan berlaku yang pertama"
msgid "Illegal chunk size"
msgstr "Ukuran potongan yang ilegal"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Batalkan unggah dan lanjutkan editing"
@@ -8325,11 +8478,9 @@ msgid "Tags of changeset {0}"
msgstr "Tag dari set perubahan {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Peringatan: objek ''{0}'' siap untuk dihapus pada server. Lewati objek dan "
-"mencoba kembali untuk mengupload."
msgid "Preparing objects to upload ..."
msgstr "mempersiapkan objek untuk mengupload ..."
@@ -8457,9 +8608,6 @@ msgstr "Relasi \"{0}\" sudah dihapus. Melewatkan objek pada unggahan"
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "Objek \"{0}\" sudah dihapus. Melewatkan objek pada unggahan"
-msgid "Warning: {0}"
-msgstr "Peringatan: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Mengupload {0} objek..."
@@ -8470,6 +8618,9 @@ msgstr ""
"Mengabaikan pengecualian tertangkap karena mengunggah dibatalkan. "
"Pengecualian: {0}"
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8490,10 +8641,8 @@ msgstr "Pilih objek untuk di upload"
msgid "Cancel uploading"
msgstr "Batalkan proses upload"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Peringatan:Tak terduga valaue untuk key \"{0}\" pada pengaturan, mendapatkan "
-"\"{1}\""
msgid "Please select the upload strategy:"
msgstr "Silahkan pilih strategi upload"
@@ -8637,8 +8786,8 @@ msgstr "Penanda selanjutnya"
msgid "Jump to next marker"
msgstr "Lompat ke penanda selanjutnya"
-msgid "Previos marker"
-msgstr "Penanda sebelumnya"
+msgid "Previous marker"
+msgstr ""
msgid "Jump to previous marker"
msgstr "Lompat ke penanda sebelumnya"
@@ -8670,8 +8819,8 @@ msgstr "versi {0}"
msgid "Merging layers"
msgstr "Gabungan layer"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Peringatan: gabungan 0.6 and 0.5 hasil data pada versi 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8699,7 +8848,7 @@ msgid "Dataset consistency test"
msgstr "Pengujian konsistensi dataset"
msgid "No problems found"
-msgstr "Tidak ditemukan masalah"
+msgstr "Masalah tidak ditemukan"
msgid "Following problems found:"
msgstr "Ditemukan masalah sebagai berikut:"
@@ -8746,7 +8895,7 @@ msgstr ""
"Ubah proyeksi atau hapus layer."
msgid "Auto Zoom"
-msgstr "Perbesar otomotasi"
+msgstr "Perbesar otomatis"
msgid "Auto load tiles"
msgstr "Memuat indeks otomatis"
@@ -8767,10 +8916,10 @@ msgid "Load All Error Tiles"
msgstr "Memuat semua kesalahan indeks"
msgid "Increase zoom"
-msgstr "Meningkatkan perbesar"
+msgstr "Meningkatkan perbesaran"
msgid "Decrease zoom"
-msgstr "Menurunkan perbesar"
+msgstr "Menurunkan perbesaran"
msgid "Snap to tile size"
msgstr "Mengambil ukuran indeks"
@@ -8790,6 +8939,9 @@ msgstr "meningkatkan tingkat zoom untuk melihat lebih detail"
msgid "No tiles at this zoom level"
msgstr "Tidak ada indeks pada tingkat perbesaran ini"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "Layer TMS ({0}), mendownload dengan perbesaran {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326 dan proyeksi Mercator mendukung"
@@ -8828,6 +8980,9 @@ msgstr "Memuat ulang indeks yang salah"
msgid "Alpha channel"
msgstr "Saluran Alpha"
+msgid "Automatically change resolution"
+msgstr "Ubah resolusi secara otomatis"
+
msgid "Set WMS Bookmark"
msgstr "Pengaturan bookmark WMS"
@@ -8835,7 +8990,7 @@ msgid "Automatic downloading"
msgstr "Download otomatis"
msgid "Zoom to native resolution"
-msgstr "memperbesar resolusi asal"
+msgstr "Memperbesar resolusi asal"
msgid "Supported projections are: {0}"
msgstr "mendukung proyeksi: {0}"
@@ -9037,9 +9192,6 @@ msgstr "Mengekstrak lokasi GPS dari EXIF"
msgid "Starting directory scan"
msgstr "Memulai scan direktori"
-msgid "One of the selected files was null"
-msgstr "Satu dari file yang dipilih kosong"
-
msgid "Read photos..."
msgstr "Membaca foto..."
@@ -9058,6 +9210,9 @@ msgstr "Ditemukan file kosong dalam direktori {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Kerusakan ketika mendapatkan file dari direktori {0}\n"
+msgid "One of the selected files was null"
+msgstr "Satu dari file yang dipilih kosong"
+
msgid "Geotagged Images"
msgstr "Citra Geotag"
@@ -9115,11 +9270,17 @@ msgstr "Berikutnya"
msgid "Show next Image"
msgstr "Tunjukkan gambar berikutnya"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Tampak tengah"
msgid "Zoom best fit and 1:1"
-msgstr "perbesaran terbaik yang sesuai 1 : 1"
+msgstr "Perbesaran terbaik yang sesuai 1 : 1"
msgid "Move dialog to the side pane"
msgstr "Pindahkan dialog ke panel samping"
@@ -9166,7 +9327,7 @@ msgid "Choose visible tracks"
msgstr "Pilih jalur yang terlihat"
msgid "Select by date"
-msgstr ""
+msgstr "Pilih berdasarkan tanggal"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -9197,23 +9358,23 @@ msgstr ""
"<html>uUpload data GPS yang belum diolah sebagai data peta dianggap "
"berbahaya.<br>Jika Anda ingin meng-upload track, lihat di sini:</ html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Mengcustom Gambar trek"
msgid "From"
-msgstr ""
+msgstr "Dari"
msgid "To"
-msgstr ""
+msgstr "Untuk"
msgid "No timestamp"
-msgstr ""
+msgstr "Tidak ada timestamp"
-msgid "Download from OSM along this track"
-msgstr "Download dari OSM sepanjang track ini"
+msgid "Select to download OSM data."
+msgstr "Pilih untuk mendownload data OSM."
+
+msgid "Select to download GPS traces."
+msgstr "pilih untuk mendownload trek GPS"
msgid "Download everything within:"
msgstr "Download semua sejauh:"
@@ -9239,16 +9400,18 @@ msgstr "waypoint saja"
msgid "track and waypoints"
msgstr "jalur dan titik"
+msgid "Click to download"
+msgstr "Klik untuk mendownload"
+
+msgid "Click to cancel"
+msgstr "Klik untuk membatalkan"
+
+msgid "Download from OSM along this track"
+msgstr "Download dari OSM sepanjang track ini"
+
msgid "Calculating Download Area"
msgstr "Kalkulasi Area yang diunduh"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Tindakan ini akan membutuhkan {0} permintaan<br>download "
-"individu.Apakah Anda ingin<br>melanjutkan?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Precache indeks citra di sepanjang jalur ini"
@@ -9380,7 +9543,7 @@ msgid ""
"You need to SHIFT-drag the play head onto an audio marker or onto the track "
"point where you want to synchronize."
msgstr ""
-"Anda perlu SHIFT-seret judul ke sebuah penanda audio atau ke titik trek di "
+"Anda perlu SHIFT-geser judul ke sebuah penanda audio atau ke titik trek di "
"mana Anda ingin melakukan sinkronisasi."
msgid "Unable to create new audio marker."
@@ -9392,16 +9555,11 @@ msgstr "Ada kesalahan ketika mencoba untuk menampilkan URL untuk penanda ini"
msgid "(URL was: "
msgstr "(URL adalah: "
-msgid "Error displaying URL"
-msgstr "kesalahan menampilkan URL"
-
msgid "Select the map painting styles"
msgstr "memilih model pewarnaan peta"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Peringatan: Gagal memuat model Mappaint dari \"{0}\". Pengecualian: {1}"
msgid "loading style ''{0}''..."
msgstr "Memual model \"{0}\"..."
@@ -9416,10 +9574,8 @@ msgstr[0] ""
"Disana terjadi kesalahan {0} ketika memuat model ini. Pilih \"Info\" dari "
"klik kanan menu untuk detail."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Peringatan: gagal untuk mengurai model Mappaint dari ''{0}''. Kesalahan "
-"adalah: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Pola dasbor ilegal, nilai-nilai harus positif"
@@ -9428,11 +9584,8 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Pola dasbor ilegal, setidaknya satu nilai harus > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Peringatan: gagal untuk mengurai gaya Mappaint dari ''{0}''. Kesalahan "
-"adalah: [{1}: {2}] {3}"
msgid "Access Token Key:"
msgstr "Akses Kunci Token:"
@@ -9696,8 +9849,8 @@ msgstr "Tutup dialog dan batalkan perizinan"
msgid "Close the dialog and accept the Access Token"
msgstr "Tutup dialog dan setujui Akses Token"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Peringatan: gagal untuk pembatalan menjalankan operasi OAuth"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Mengambil perimintaan Token OAuth dari \"{0}\""
@@ -9770,6 +9923,12 @@ msgstr "Mengizinkan untuk menulis pengaturan Anda"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Memilih untuk memberikan JOSm hak menulis server pengaturan Anda"
+msgid "Allow modifications of notes"
+msgstr "Memperbolehkan perubahan catatan"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "Mengambil Akses Token OAuth..."
@@ -9840,9 +9999,6 @@ msgstr ""
"menerima token ini. JOSM akan menggunakannya di masa depan untuk otentikasi "
"dan otorisasi ke server OSM <br> The akses token adalah: </html>"
-msgid "Restart"
-msgstr "Mulai Ulang"
-
msgid "Click to retrieve a Request Token"
msgstr "Klik untuk mengambil Permintaan Token"
@@ -9956,7 +10112,7 @@ msgid "Explicit waypoints with time estimated from track position."
msgstr "Waypoint eksplisit dengan waktu yang diperkirakan dari posisi track."
msgid "Named trackpoints."
-msgstr "bernama trackpoint"
+msgstr "Trackpoint yang sudah diberi nama"
msgid "Modified times (time stamps) of audio files."
msgstr "Modifikasi waktu (label waktu) dari file audio."
@@ -10129,6 +10285,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"Anda restart JOSM untuk beberapa efek dari pengaturan yang telah dimuat"
+msgid "Would you like to restart now?"
+msgstr "Apakah Anda ingin memulai ulang sekarang?"
+
msgid "Remote Control"
msgstr "Remote kontrol"
@@ -10201,7 +10360,7 @@ msgid "Version:"
msgstr "Versi:"
msgid "Minimum JOSM Version:"
-msgstr ""
+msgstr "Versi minimum JOSM:"
msgid "by {0}"
msgstr "oleh {0}"
@@ -10216,25 +10375,25 @@ msgid "active"
msgstr "aktif"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr ""
+msgstr "File bentuk peta cat (*.xml, *.mapcss, *.zip)"
msgid "Preset definition file (*.xml, *.zip)"
-msgstr ""
+msgstr "File definisi Preset"
msgid "Edit source entry:"
msgstr "mengedit sumber masukan:"
msgid "Entry ''{0}'' requires JOSM Version {1}. (Currently running: {2})"
-msgstr ""
+msgstr "Masuknya ''{0}'' membutuhkan JOSM Versi {1}. (Saat proses: {2})"
msgid "Continue anyway"
-msgstr ""
+msgstr "Tetap lanjutkan"
msgid "Ignore warning and install style anyway"
-msgstr ""
+msgstr "Abaikan peringatan dan tetap menginstal style"
msgid "Some entries have unmet dependencies:"
-msgstr ""
+msgstr "Beberapa entri memiliki dependensi yang belum terpenuhi:"
msgid "Reset"
msgstr "Reset"
@@ -10263,6 +10422,12 @@ msgstr "Hapus dari toolbar"
msgid "Configure toolbar"
msgstr "Konfigurasi toolbar"
+msgid "Edit shortcut"
+msgstr "Edit shortcut"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Jangan sembunyikan toolbar dan menu"
+
msgid "Actions"
msgstr "Tindakan"
@@ -10305,6 +10470,9 @@ msgstr "Terdaftar tindakan toolbar tanpa nama: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "Aksi toolbar terdaftar {0} bertampal: {1} mendapat {2}"
+msgid "Toolbar: {0}"
+msgstr "Toolbar: {0}"
+
msgid "Data validator"
msgstr "data validator"
@@ -10359,24 +10527,12 @@ msgstr "Cari: "
msgid "Read from file"
msgstr "membaca dari file"
-msgid "Open JOSM customization file"
-msgstr "Buka JOSM kostumisasi file"
-
-msgid "Import log"
-msgstr "Impor log"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Ini adalah berkas ringkasan import. <br/>Anda dapat menolak perubahan "
-"pengaturan dengan menekan \"Cancel\" pada kotak dialog pengaturan <br/>Untuk "
-"aktivasi beberapa perubahan restart JOSM Anda.</html>"
-
msgid "Export selected items"
msgstr "Ekspor item yang dipilih"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM pengaturan file (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Harap pilih tombol pengaturan beberapa tidak ditandai sebagai standar"
@@ -10395,41 +10551,57 @@ msgstr "Menambahkan pengaturan dari berkas ke nilai-nilai yang ada"
msgid "Replace existing values"
msgstr "Mengganti nilai yang ada"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM pengaturan file (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Buka JOSM kostumisasi file"
-msgid "Advanced Background: Changed"
-msgstr "Latar Belakang lanjutan: Diubah"
+msgid "Import log"
+msgstr "Impor log"
-msgid "Advanced Background: NonDefalut"
-msgstr "Latar belakang Lanjutan: Bukan pengaturan awal"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Ini adalah berkas ringkasan import. <br/>Anda dapat menolak perubahan "
+"pengaturan dengan menekan \"Cancel\" pada kotak dialog pengaturan <br/>Untuk "
+"aktivasi beberapa perubahan restart JOSM Anda.</html>"
-msgid "Current value is default."
-msgstr "Nilai saat ini adalah standar"
+msgid "shortcut"
+msgstr "shortcut"
-msgid "Default value is ''{0}''."
-msgstr "Nilai standar adalah \"{0}\""
+msgid "color"
+msgstr "warna"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Standar nilai saat ini belum diketahui (pengaturan belum digunakan)."
+msgid "toolbar"
+msgstr "toolbar"
-msgid "Select Setting Type:"
-msgstr "Pilih Jenis Pengaturan:"
+msgid "imagery"
+msgstr "citra"
-msgid "Simple"
-msgstr "Simpel"
+msgid "Reset preferences"
+msgstr "Atur ulang pengaturan"
-msgid "List"
-msgstr "Daftar"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Anda ingin menghapus semua pengaturan ke pengaturan awal<br />Semua "
+"pengaturan anda akan dihapus: plugin, citra, filter, tombol toolbar, "
+"keyboard, dll. <br />Apa anda yakin ingin melanjutkan?"
-msgid "List of lists"
-msgstr "Daftar dari daftar"
+msgid "Load profile"
+msgstr "Memuat profil"
-msgid "List of maps"
-msgstr "Daftar peta"
+msgid "Save {0} profile"
+msgstr "Menyimpan {0} profil"
-msgid "Add setting"
-msgstr "menambahkan pengaturan"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Semua pengaturan di grup ini adalah pengaturan awal, tidak ada yang disimpan"
+
+msgid "Choose profile file"
+msgstr "Pilih file profile"
msgid "Change list setting"
msgstr "Mengganti daftar pengaturan"
@@ -10452,11 +10624,44 @@ msgstr "mengubah daftar pengaturan peta"
msgid "Entry {0}"
msgstr "Entri {0}"
+msgid "Select Setting Type:"
+msgstr "Pilih Jenis Pengaturan:"
+
+msgid "Simple"
+msgstr "Simpel"
+
+msgid "List"
+msgstr "Daftar"
+
+msgid "List of lists"
+msgstr "Daftar dari daftar"
+
+msgid "List of maps"
+msgstr "Daftar peta"
+
+msgid "Add setting"
+msgstr "menambahkan pengaturan"
+
+msgid "Advanced Background: Changed"
+msgstr "Latar Belakang lanjutan: Diubah"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Nilai saat ini adalah standar"
+
+msgid "Default value is ''{0}''."
+msgstr "Nilai standar adalah \"{0}\""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Standar nilai saat ini belum diketahui (pengaturan belum digunakan)."
+
msgid "Change string setting"
msgstr "Ubah pengaturan string"
msgid "Value: "
-msgstr "Nilai: "
+msgstr "Value: "
msgid "Color"
msgstr "Warna"
@@ -10510,6 +10715,9 @@ msgstr "Gambar titik virtual pada pilihan cara"
msgid "Draw inactive layers in other color"
msgstr "Gambar layer yang telah aktif di warna lainnya"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "Sorot target garis dan titik"
@@ -10520,7 +10728,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "Grafik peta yang halus (antialiasing)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr ""
+msgstr "Grafik peta halus dalam mode wireframe (antialiasing)"
msgid "Draw only outlines of areas"
msgstr "Gambar hanya garis besar dari daerah"
@@ -10555,6 +10763,9 @@ msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
+"Menerapkan antialiasing ke dalam peta dalam mode wireframe yang menghasilkan "
+"tampilan yang lebih halus.\r\n"
+" mode wireframe antialiasing"
msgid "Hightlight target nodes and ways while drawing or selecting"
msgstr "Sorot target node/titik dan way/garis saat menggambar atau memilih"
@@ -10566,17 +10777,22 @@ msgstr ""
"Pilihan ini menekan pada pengisian area, mengesampingkan apa yang ditentukan "
"dalam gaya yang dipilih."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr "Opsi yang mempengaruhi kinerja gambar"
msgid "Segment drawing options"
-msgstr ""
+msgstr "Pilihan menggambar segmen"
msgid "Select and draw mode options"
-msgstr ""
+msgstr "Pilihan modus memilih dan menggambar"
msgid "Other options"
-msgstr ""
+msgstr "Pilihan lainnya"
msgid "OSM Data"
msgstr "Data OSM"
@@ -10656,7 +10872,7 @@ msgid "Dynamic color range based on data limits"
msgstr "Rentang warna yang dinamis berdasarkan data batas"
msgid "Smooth GPX graphics (antialiasing)"
-msgstr ""
+msgstr "Grafik GPX halus (antiliasing)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -10725,6 +10941,8 @@ msgstr "Menggambar lebar garis GPX"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgstr ""
+"Menerapkan antiliasing ke garis GPX yang menghasilkan tampilan yang lebih "
+"halus"
msgid ""
"All points and track segments will have the same color. Can be customized in "
@@ -10814,58 +11032,70 @@ msgid "Add Imagery URL"
msgstr "Menambahkan citra satelit URL"
msgid "1. Enter URL"
-msgstr ""
+msgstr "1. Masukkan URL"
msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
"level: {1} or {2}<br>reversed zoom level: {3}"
msgstr ""
+"{0} digantikan oleh tingkat perbesaran, juga didukung:<br>pergeseran ke "
+"tingkat pembesaran: {1} atau {2}<br>membalikkan tingkat perbesaran: {3}"
msgid "{0} is replaced by X-coordinate of the tile"
-msgstr ""
+msgstr "{0} digantikan oleh X-koordinat dari tile"
msgid "{0} is replaced by Y-coordinate of the tile"
-msgstr ""
+msgstr "{0} digantikan oleh Y-koordinat dari tile"
msgid "{0} is replaced by {1} (Yahoo style Y coordinate)"
-msgstr ""
+msgstr "{0} digantikan dengan {1} (Koordinat Y Yahoo Style)"
msgid ""
"{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
"coordinate)"
msgstr ""
+"{0} diubah dengan {1} (OSGeo Tile Map Service Spesifikasi bentuk koordinat Y)"
msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
"e.g. {1}"
msgstr ""
+"{0} digantikan oleh pemilihan yang acak dari pemberikan koma yang terpisah, "
+"contoh. {1}"
msgid "2. Enter maximum zoom (optional)"
-msgstr ""
+msgstr "2. Masukkan perbesaran maksimum (pilihan)"
msgid "3. Verify generated TMS URL"
-msgstr ""
+msgstr "3. Memeriksa TMS URL yang dihasilkan"
msgid "4. Enter name for this layer"
-msgstr ""
+msgstr "4. Masukkan nama untuk layer ini"
msgid "Store WMS endpoint only, select layers at usage"
msgstr ""
+"hanya memasukan titik akhir WMS saja, pilih layer yang sedang digunakan"
msgid "Show bounds"
-msgstr ""
+msgstr "Tampilkan batasan"
msgid "1. Enter service URL"
-msgstr ""
+msgstr "1. Masukkan layanan URL"
msgid "Get layers"
-msgstr ""
+msgstr "Dapatkan layer"
msgid "2. Select layers"
-msgstr ""
+msgstr "2. Pilih layes"
-msgid "3. Verify generated WMS URL"
-msgstr ""
+msgid "3. Select image format"
+msgstr "3. Pilih format gambar"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Memeriksa WMS URL yang dihasilkan"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Masukkan nama untuk layer ini"
msgid "Show Bounds"
msgstr "Tunjukkan batas"
@@ -10923,7 +11153,7 @@ msgid "Selected entries:"
msgstr "Entri yang dipilih"
msgid "Add a new {0} entry by entering the URL"
-msgstr ""
+msgstr "Tambahkan sebuah entri {0} baru dengan memasukkan URL"
msgid "Remove entry"
msgstr "Hapus entri"
@@ -10968,7 +11198,7 @@ msgid "Northing"
msgstr "Membuat ke arah utara"
msgid "Auto zoom by default: "
-msgstr "Perbesar automatis dengan default: "
+msgstr "Perbesar otomatis dengan default: "
msgid "Autoload tiles by default: "
msgstr "Memuat indeks secara otomatis dengan default: "
@@ -10977,7 +11207,7 @@ msgid "Min. zoom level: "
msgstr "Tingkat perbesaran minimall: "
msgid "Max. zoom level: "
-msgstr "Tingkat perbesaran maksimall: "
+msgstr "Tingkat perbesaran maksimal: "
msgid "Add to slippymap chooser: "
msgstr "Tambhakan ke slippymap pemilih: "
@@ -11043,6 +11273,12 @@ msgstr ""
"menambahkan ''~'' ke nama berkas dan menyimpannya di dalam folder yang "
"sama.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "File backup"
@@ -11112,8 +11348,8 @@ msgstr "Pengaturan Peta"
msgid "Settings for the map projection and data interpretation."
msgstr "Pengaturan untuk proyeksi peta dan interpretasi data."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Peringatan: Tidak dapat membaca sumber preset tagging: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Tidak bisa membaca sumber tagging preset: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11168,7 +11404,7 @@ msgid "Available presets:"
msgstr "Preset tersedia:"
msgid "Active presets:"
-msgstr "Aktif preset"
+msgstr "Preset yang aktif"
msgid "Add a new preset by entering filename or URL"
msgstr "Menambahkan preset baru dengan memasukkan nama berkas atau URL"
@@ -11255,7 +11491,7 @@ msgstr ""
"jangka waktu tertentu."
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "Oleh Kode (EPSG)"
msgid "Invalid projection configuration: {0}"
msgstr "konfigurasi proyeksi tidak valid: {0}"
@@ -11392,21 +11628,6 @@ msgstr "Grid Swiss (Switzerland)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (tanpa koreksi lokal)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zona UTM"
-
-msgid "North"
-msgstr "Utara"
-
-msgid "South"
-msgstr "Selatan"
-
-msgid "Hemisphere"
-msgstr "Belahan bumi"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11428,6 +11649,21 @@ msgstr "UTM Perancis (DOM)"
msgid "UTM Geodesic system"
msgstr "Sistem Geodetik UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zona UTM"
+
+msgid "North"
+msgstr "Utara"
+
+msgid "South"
+msgstr "Selatan"
+
+msgid "Hemisphere"
+msgstr "Belahan bumi"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Test OSM API URL ''{0}''"
@@ -11492,11 +11728,9 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Pilih untuk menggunakan OAuth sebagai mekanisme otentik"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Peringatan: Tidak mendukung nilai preferense ''{0}'', mendapat ''{1}''. "
-"Menggunakan metode autentik ''Dasar Autentik''."
msgid "OSM username:"
msgstr "Nama pengguna OSM:"
@@ -11504,26 +11738,26 @@ msgstr "Nama pengguna OSM:"
msgid "OSM password:"
msgstr "Kata sandi OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Peringatan: gagal untuk mengambil kredensial OSM dari kredensial manager"
msgid "Current credential manager is of type ''{0}''"
msgstr "Manajer credential saat adalah tipe ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Peringatan: gagal untuk menyimpan kredensial OSM kepada pengelola credential."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Peringatan: Gagal mengambil Token Akses OAuth dari manajer credential"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Peringatan: Gagal untuk menyimpan Akses Token OAuth untuk pengelola "
-"kredensial"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11613,18 +11847,9 @@ msgid "Use a SOCKS proxy"
msgstr "Gunakan proxi SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Peringatan: JOSM dikonfigurasi untuk menggunakan proxy dari pengaturan "
-"sistem, tetapi JVM tidak dikonfigurasi untuk mengambil mereka. Mengatur awal "
-"pengaturan ke \"No proxy\""
-
-msgid "disabled"
-msgstr "Dinonaktifkan"
-
-msgid "no modifier"
-msgstr "tidak ada modifier"
msgid "Shortcut Background: User"
msgstr "Jalan pintas background: Pengguna"
@@ -11666,44 +11891,45 @@ msgstr "Hapus pilihan dalam tabel tag"
msgid "Add a new tag"
msgstr "Tambahkan tag baru"
-msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgid "Paste tags from buffer"
+msgstr "Menyalin tag dari buffer"
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Gunakan preset ''{0}'' dari grup ''{1}''"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Gunakan preset ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Peringatan tagging preset \"{0}-{1}\": Abaikan ''{2}'' sebagai atribut "
-"''{3}'' elemen yang diberikan."
+msgid "Elements of type {0} are supported."
+msgstr "Elemen jenis {0} mendukung"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Penandaan preset rusak \"{0}-{1}\" - jumlah item dalam \"nilai display'' "
-"harus sama dengan \"nilai''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Ubah {0} objek"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Tagging preset rusak \"{0}-{1}\" - nomor item dalam ''short_descriptions'' "
-"harus sama seperti di dalam \"values\""
+msgid "Nothing selected!"
+msgstr "Tidak ada yang dipilih!"
-msgid "More information about this feature"
-msgstr "Informasi lebih tentang fitur ini"
+msgid "Selection unsuitable!"
+msgstr "Pilihan cocok!"
+
+msgid "Apply Preset"
+msgstr "Tambahkan Preset"
+
+msgid "New relation"
+msgstr "Relasi baru"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Tidak diketahui keperluan: {0}"
msgid "Illegal member expression: {0}"
-msgstr ""
+msgstr "ekspresi anggota ilegal: {0}"
+
+msgid "More information about this feature"
+msgstr "Informasi lebih tentang fitur ini"
msgid "Available roles"
msgstr "Peran yang tersedia"
@@ -11718,53 +11944,54 @@ msgid "elements"
msgstr "unsur"
msgid "Optional Attributes:"
-msgstr "Pilihan attribut"
+msgstr "Atribut Tambahan:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Gunakan preset ''{0}'' dari grup ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr "Pilih auto-increment dari {0} untuk bidang ini"
-msgid "Use preset ''{0}''"
-msgstr "Gunakan preset ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr "Batalkan auto-increment untuk bidang ini"
-msgid "Unknown type: {0}"
-msgstr "Tipe tidak diketahui : {0}"
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
+"Peringatan tagging preset \"{0}-{1}\": Abaikan ''{2}'' sebagai atribut "
+"''{3}'' elemen yang diberikan."
-msgid "Preset role element without parent"
-msgstr "Peran preset elemen tanpa induk"
-
-msgid "Preset sub element without parent"
-msgstr "Preset sub elemen tanpa induk"
-
-msgid "Could not read tagging preset source: {0}"
-msgstr "Tidak bisa membaca sumber tagging preset: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Kesalahan mengurai {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Elemen jenis {0} mendukung"
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Ubah {0} objek"
-
-msgid "Nothing selected!"
-msgstr "Tidak ada yang dipilih!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"tagging preset rusak \"{0}-{1}\" - metode Java yang diberikan dalam "
+"\"values_from\"J tidak \"{2}\""
-msgid "Selection unsuitable!"
-msgstr "Pilihan cocok!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"tagging preset rusak \"{0}-{1}\" - metode Java yang diberikan dalam "
+"''values_from'' dibuang {2} ({3})"
-msgid "Apply Preset"
-msgstr "Tambahkan Preset"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Penandaan preset rusak \"{0}-{1}\" - jumlah item dalam \"nilai display'' "
+"harus sama dengan \"nilai''"
-msgid "New relation"
-msgstr "Relasi baru"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Tagging preset rusak \"{0}-{1}\" - nomor item dalam ''short_descriptions'' "
+"harus sama seperti di dalam \"values\""
-msgid "Change Properties"
-msgstr "Ubah properti"
+msgid "Unknown type: {0}"
+msgstr "Tipe tidak diketahui : {0}"
msgid "Preset group {1} / {0}"
msgstr "Kelompok Preset {1}/{0}"
@@ -11772,6 +11999,18 @@ msgstr "Kelompok Preset {1}/{0}"
msgid "Preset group {0}"
msgstr "Kelompok Preset {0}"
+msgid "Roles cannot appear more than once"
+msgstr "Peran tidak dapat muncul lebih dari sekali"
+
+msgid "Preset role element without parent"
+msgstr "Peran preset elemen tanpa induk"
+
+msgid "Preset sub element without parent"
+msgstr "Preset sub elemen tanpa induk"
+
+msgid "Error parsing {0}: "
+msgstr "Kesalahan mengurai {0}: "
+
msgid "Search preset"
msgstr "Cari Preset"
@@ -11787,8 +12026,18 @@ msgstr "Tampilkan hanya berlaku pada pilihan"
msgid "Search in tags"
msgstr "Cari pada tag"
-msgid "All files (*.*)"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
msgstr ""
+"Dapat menyesuaikan {0} belum teregistrasi. Tidak dapat mengatur partisipasi "
+"dalam penyesuaian sinkronisasi."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Dapat menyesuaikan {0} belum teregistrasi."
+
+msgid "All files (*.*)"
+msgstr "Semua file (*.*)"
msgid "Min. latitude"
msgstr "Min. lintang"
@@ -11821,6 +12070,58 @@ msgid ""
msgstr ""
"Nilai saat ini ID OSM tidak valid. Silahkan masukkan nilai integer > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "Salah: properti secara eksplisit dimatikan"
+
+msgid "true: the property is explicitly switched on"
+msgstr "Benar:properti secara eksplisit dihidupkan"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"Parsial: terdapat perbedaan pada objek yang dipilih memiliki perbedaan "
+"value, tidak berubah"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "uset: jangan atur properti ini pada objek yang dipilih"
+
+msgid "Cut"
+msgstr "Memotong"
+
+msgid "Right click = copy to clipboard"
+msgstr "Klik kanan = salin ke clipboard"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Atribut wajib hilang \"{0}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Nilai ilegal untuk atribut wajib \"{0}\" dari tipe lama. Dapatkan \"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Nilai ilegal untuk atribut wajib \"{0}\" dari tipe lama (>=0). Dapatkan "
+"\"{1}\"."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Nilai ilegal untuk atribut wajib \"{0}\" dari tipe ganda. Dapatkan \"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Nilai ilegal untuk atribut wajib \"{0}\" tipe boolean. Mendapat \"{1}\""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Nilai ilegal dari atribut wajib ''{0}'' dari TipeOsmPrimitif. Mendapatkan "
+"\"{1}\"."
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11857,11 +12158,9 @@ msgid "Contacting OSM Server..."
msgstr "Menghubungkan server OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Peringatan: Ilegal nilai atribut \"{0}\" elemen \"{1}\" di kemampuan server. "
-"Mendapatkan \"{2}\""
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Gagal memisahkan tanggal \"{0}\" menjawab oleh server."
@@ -11906,39 +12205,27 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Pelabuhan ilegal nomor preferensi \"{0}\". Dapat {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Peringatan: nilai prefenrensi tidak terduga ''{0}'' ditemukan. mendapatkan "
-"''{1}''. Gunakan tanpa proxy."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Peringatan: Parameter tidak terduga untuk HTTP proxy. Mendapatkan host "
-"''{0}'' dan port ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Peringatan: parameter tak terduga untuk proxy SOCKS. Punya tuan rumah "
-"''{0}'' dan port ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Kesalahan: Koneksi proxy ''{0}'' untuk URI ''{1}'' gagal. Kecuali: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Peringatan: JVM tidak dikonfigurasi untuk pencarian proxy dari pengaturan "
-"sistem. Properti ''java.net.useSystemProxies''hilang pada waktu startup. "
-"Tidak akan menggunakan proxy."
msgid "Parsing response from server..."
msgstr "Memisahkan respon dari server..."
@@ -12041,6 +12328,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Parse kesalahan: struktur dokumen valid untuk dokumen GPX."
+msgid "(at line {0}, column {1})"
+msgstr "(di garis {0}, kolom {1})"
+
msgid "Unknown mode {0}."
msgstr "Mode tidak diketahui {0}."
@@ -12056,15 +12346,21 @@ msgstr "Mencari file citra"
msgid "No image files found."
msgstr "Tidak ada file citra yang ditemukan"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Gagal untuk membuka aliran input sumber daya ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Peringatan: gagal untuk membuka file dengan ekstensi ''{2}'' dan namepart "
-"\"{3}'' dalam file zip ''{0}''. Pengecualian adalah: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Gagal mengubah nama file {0} ke {1}."
@@ -12149,8 +12445,8 @@ msgstr "Kalimat yang tidak diketahui: {0}"
msgid "Zero coordinates: {0}"
msgstr "Koordinat nol: {0}"
-msgid "NMEA import success"
-msgstr "import NMEA sukses"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "import NMEA gagal"
@@ -12254,45 +12550,13 @@ msgstr "Tidak ada data ditemukan di dalam berkas ''{0}''."
msgid "Open OsmChange file"
msgstr "Buka berkas Perubahan Osm"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Atribut wajib hilang \"{0}\"."
-
msgid "Unsupported version: {0}"
msgstr "versi tidak mendukung: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Nilai ilegal untuk atribut wajib \"{0}\" dari tipe lama. Dapatkan \"{1}\"."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Nilai ilegal untuk atribut wajib \"{0}\" dari tipe lama (>=0). Dapatkan "
-"\"{1}\"."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Nilai ilegal untuk atribut wajib \"{0}\" dari tipe ganda. Dapatkan \"{1}\"."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Nilai ilegal dari atribut wajib ''{0}'' dari TipeOsmPrimitif. Mendapatkan "
-"\"{1}\"."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Peringatan: tidak mendukung start elemen ''{0}'' pada isi set perubahan "
-"posisi ({1},{2}). Dilewati."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12302,11 +12566,9 @@ msgstr ""
"dari ''buat'', ''modifikasi'', atau ''hapus''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Peringatan: tidak mendukung elemen akhir ''{0}'' pada isi set perubahan di "
-"posisi ({1},{2}). Dilewati."
msgid "Parsing changeset content ..."
msgstr "Mengurai konten changeset ..."
@@ -12334,12 +12596,8 @@ msgstr "Mengurai daftar changeset..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "Gagal menandai koneksi HTTP dengan header otentikasi OAuth"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
-"Peringatan: tak terduga nilai untuk pengaturan \"{0}\". Dapat \"{1}\"."
-
-msgid "(at line {0}, column {1})"
-msgstr "(di garis {0}, kolom {1})"
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
@@ -12352,9 +12610,6 @@ msgstr ""
"<html>kesalahan terjadi saat mengembalikan file cadangan.<br>Kesalahan "
"adalah:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Tidak dapat membuat cadangan file. Pengecualian adalah: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "file layanan OSM gzip telah dikompres"
@@ -12376,6 +12631,9 @@ msgstr "Tidak ada data yang ditemukan pada berkas \"{0}\"."
msgid "Open OSM file"
msgstr "Buka berkas OSM"
+msgid "Reading was canceled"
+msgstr "Pembacaan dibatalkan"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12433,11 +12691,9 @@ msgstr ""
"Illegal nilai atribut \"versi\" di OSM primitif dengan ID {0}. Memiliki {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"PERINGATAN: Normalisasi nilai atribut ''versi'' elemen {0} ke {2}, versi API "
-"adalah ''{3}''. Memiliki {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Tidak diketahui atau tidak mendukung versi API. Mendapatkan {0}."
@@ -12579,32 +12835,44 @@ msgstr ""
"akan disimpan dalam teks biasa dalam file preferensi JOSM. Selanjutnya, ia "
"ditransfer <strong>tanpa enkripsi</strong> dalam setiap permintaan yang "
"dikirimkan ke server OSM. <strong>Jangan gunakan password yang berharga "
-"</strong></p></ body></html>"
+"</strong></p></body></html>"
msgid "Save user and password (unencrypted)"
msgstr "Simpan user dan password (unencrypted)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<hapus dari objek {0}>"
+
+msgid "Old values of"
+msgstr "Value lama dari"
msgid "Add tags to selected objects"
msgstr "Menambahkan tag untuk objek yang dipilih"
msgid "Add selected tags"
-msgstr ""
+msgstr "Tambahkan tag/label terpilih"
msgid "Add all tags"
-msgstr ""
+msgstr "Tambahkan semua tag/label"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "Tambahkan tag yang telah diperiksa ke objek terpilih"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Shift+Enter: Tambahkan semua tag untuk objek-objek terpilih"
msgid "Assume"
msgstr "Menganggap"
+msgid "Existing values"
+msgstr "Value yang sudah ada"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Aktifkan kotak centang untuk menerima nilai"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Terima semua tag dari {0} untuk sesi ini"
+
msgid "Load data from API"
msgstr "Memuat data dari API"
@@ -12629,18 +12897,20 @@ msgstr "membuat objek baru"
msgid "Read protocol version"
msgstr "membaca versi protokol"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-"Peringatan: tidak bisa menggunakan remotekontrol server port {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "RemoteControl::Menerima koneksi dalam port {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Kendali Jarak jauh::Server berhenti."
msgid "Remote Control has been asked to create a new node."
msgstr "Remote kontrol meminta untuk membuat node/titik baru"
msgid "There is no layer opened to add node"
-msgstr ""
-
-msgid "Add way"
-msgstr "Menambahkan way/garis"
+msgstr "Tidak ada lapisan yang dibuka untuk menambahkan node/titik"
msgid "Remote Control has been asked to create a new way."
msgstr "Remote kontrol meminta untuk membuat way/garis baru"
@@ -12649,6 +12919,14 @@ msgid "Invalid coordinates: {0}"
msgstr "Invalid koordinat: {0}"
msgid "There is no layer opened to add way"
+msgstr "Tidak ada lapisan yang dibuka untuk menambahkan way/garis"
+
+msgid "Add way"
+msgstr "Menambahkan way/garis"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
msgstr ""
msgid ""
@@ -12667,6 +12945,15 @@ msgstr "Remote kontrol meminta untuk import data dari URL yang diikuti:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Remote kontrol meminta untuk memuat data dari API"
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12701,20 +12988,20 @@ msgstr "Data:"
msgid "local file"
msgstr "Berkas lokal"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Link ke berkas data OSM pada lokal penyimpanan Anda"
+msgid "Link to a GPX file on your local disk."
+msgstr ""
msgid "include"
msgstr "Termasuk"
-msgid "Include OSM data in the .joz session file."
-msgstr "Termasuk data OSM pada .joz berkas sesi."
+msgid "Include GPX data in the .joz session file."
+msgstr ""
msgid "No file association"
msgstr "Tidak ada berkas asosiasi"
-msgid "OSM data will be included in the session file."
-msgstr "Data OSM akan dimasukkan ke dalam berkas pembahasan."
+msgid "GPX data will be included in the session file."
+msgstr ""
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -12738,12 +13025,24 @@ msgstr "Layer mengandung data yang tidak tersimpan - simpan ke berkas."
msgid "Layer does not contain unsaved data."
msgstr "Layer tidak mengandung data yang tidak tersimpan."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Link ke berkas data OSM pada lokal penyimpanan Anda"
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Termasuk data OSM pada .joz berkas sesi."
+
+msgid "OSM data will be included in the session file."
+msgstr "Data OSM akan dimasukkan ke dalam berkas pembahasan."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
"Versi \"{0}\" meta data untuk layer data osm tidak mendukung. Diharapkan: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "File sesi (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Bukan untuk menempatkan berkas \"{0}\"."
@@ -12818,18 +13117,14 @@ msgid "Download skipped"
msgstr "Download dilewati"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Peringatan: Tidak bisa download plugin {0}. Download link tidak diketahui. "
-"Download dilewati."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Peringatan: Tidak bisa download plugin {0}. Download link ''{1}'' URL tidak "
-"valid. Download dilewati."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Gagal untuk membuat daftar plugin ''{0}''"
@@ -12948,7 +13243,7 @@ msgid "Loading plugins ..."
msgstr "Memuat plugin ..."
msgid "Checking plugin preconditions..."
-msgstr "Memerikasa prasyarat plugin..."
+msgstr "Memeriksa prasyarat plugin..."
msgid "Loading plugin ''{0}''..."
msgstr "Memuat plugin \"{0}\"..."
@@ -12987,11 +13282,11 @@ msgstr[0] ""
msgid "Plugin update failed"
msgstr "Update plugin gagal"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "Peringatan: gagal untuk download plugin dari daftar informasi"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Plugin tidak memungkinkan"
@@ -13005,27 +13300,22 @@ msgstr "Simpan plugin"
msgid "Click to keep the plugin ''{0}''"
msgstr "Klik untuk menyimpan plugin ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Peringatan: Gagal untuk menghapus plugin diluar tanggal ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Peringatan: gagal untuk menginstall plugin yang siap didownload ''{0}''. "
-"Lewati installasi. JOSM masih memuat versi plugin lama."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Peringatan: gagal untuk menginstall plugin ''{0}'' dari berkas download pada "
-"jangka tertentu ''{1}''. Gagal menamai kembali."
msgid "Click to disable the plugin ''{0}''"
msgstr "Klik menonaktifkan plugin ''{0}''"
@@ -13067,7 +13357,7 @@ msgstr ""
">Plugins untuk mengubahnya nanti)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "File jar tidak valid ''{0}''"
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "Berkas plugin \"{0}\" tidak termasuk Manifest."
@@ -13076,7 +13366,7 @@ msgid "Invalid URL ''{0}'' in plugin {1}"
msgstr "URL tidak valid \"{0}\" di plugin {1}"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "deskripsi plugin tidak valid ''{0}'' pada plugin {1}"
msgid "More info..."
msgstr "Info selengkapnya..."
@@ -13099,10 +13389,8 @@ msgstr "Pengolahan file situs Plugin cache..."
msgid "Processing file ''{0}''"
msgstr "Memproses file ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Peringatan: Gagal untuk menscan file ''{0}'' informasi plugin. Lewati."
msgid "Processing plugin site cache icon files..."
msgstr "Pengolahan ikon file plugin cache situs..."
@@ -13116,20 +13404,33 @@ msgstr "Download daftar plugin"
msgid "Downloading plugin list from ''{0}''"
msgstr "Mendownload daftar plugin dari ''{0}''"
-msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+msgid "Plugin list download error"
msgstr ""
-"Peringatan: gagal untuk membuat direktori plugin ''{0}''. Tidak bisa cache "
-"daftar plugin dari situs Plugin ''{1}''."
-msgid "Writing plugin list to local cache ''{0}''"
-msgstr "Menulis daftar plugin ke cache lokal ''{0}''"
+msgid "JOSM failed to download plugin list:"
+msgstr ""
-msgid "Parsing plugin list from site ''{0}''"
-msgstr "Mengurai daftar plugin dari situs \"{0}\""
+msgid "Details:"
+msgstr ""
-msgid ""
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
+msgid ""
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
+msgstr ""
+
+msgid "Writing plugin list to local cache ''{0}''"
+msgstr "Menulis daftar plugin ke cache lokal ''{0}''"
+
+msgid "Parsing plugin list from site ''{0}''"
+msgstr "Mengurai daftar plugin dari situs \"{0}\""
+
+msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
@@ -13373,7 +13674,7 @@ msgstr ""
"berikut:<br>''{0}''</html>"
msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr ""
+msgstr "<html>Otorisasi di server OSM gagal.<br></html>"
msgid ""
"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -13484,7 +13785,7 @@ msgid ""
msgstr ""
"Area yang Anda unduh terlalu besar atau permintaan Anda terlalu "
"luas.<br>Sebaiknya mengunduh area yang lebih kecil atau gunakan berkas "
-"export yang diberikan dar komunitas OSM."
+"export yang diberikan dari komunitas OSM."
msgid "<br>Error message(untranslated): {0}"
msgstr "<br>Kesalahan pesan(tidak diterjemahkan): {0}"
@@ -13535,22 +13836,12 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Gagal untuk menemukan gambar \"{0}\""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "Peringatan: Gagal menangani berkas zip \"{0}\". Pengecualian: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Peringatan: Gagal mengakses direktori \"{0}\" untuk alasan keamanan. "
-"Pengecualian: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Peringatan: Gagal memperoleh awalan bahasa wiki dari kode lokal JOSM "
-"\"{0}\". Menggunakan kode standar \"en\"."
msgid "{0}... [please type its number]"
msgstr "{0}... [Harap ketik nomornya]"
@@ -13562,9 +13853,52 @@ msgstr ""
"Gagal membuka URL. Saat ini tidak ada pengaturan platform. Harap mengatur "
"platform terlebih dahulu."
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -13574,30 +13908,46 @@ msgstr[0] ""
msgstr[1] ""
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "Key terlalu panjang (maksimal {0} karakter):"
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "Karakter mencurigakan dalam key:"
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "Value terlalu panjang (maksimal {0} karakter):"
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Apakah Anda ingin menempelkan tag ini?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Bersihkan penyangga"
msgid "Ignore warnings"
-msgstr ""
+msgstr "Abaikan peringatan"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
+"<html><p> Maaf, itu tidak mungkin untuk menyisipkan tag dari penyangga. Ini "
+"tidak ada dalam objek JOSM atau teks yang sesuai. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Klik kanan = salin ke clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -13942,9 +14292,16 @@ msgid "Saturation:"
msgstr "Kejenuhan Warna:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
+"Input Kelompok umum alamat interpolasi di dialog tunggal, serta pilihan "
+"secara otomatis menghasilkan simpul nomor rumah individu dari jalan."
msgid ""
"Makes a pair of selected way segments parallel by rotating one of them "
@@ -14037,6 +14394,12 @@ msgstr ""
"menemukan dan memperbaiki alamat jalan yang tidak valid pada way/garis"
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Bicara dengan pengguna mengedit peta di sekitarnya, diberitahu ketika "
+"seseorang datang mendekat."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14047,6 +14410,7 @@ msgstr ""
msgid ""
"Download GPS points from Globalsat dg100 data logger directly in JOSM."
msgstr ""
+"Download titik GPS dari Globalsat dg100 data logger langsung di JOSM."
msgid ""
"Analyse a set of GPS points to obtain its centre and direction of spread."
@@ -14073,12 +14437,14 @@ msgstr ""
"satu tombol."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-model citra satelit menyesuaikan mapmode"
+msgstr ""
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
"not in huge cache directories"
msgstr ""
+"Plugin percobaan ini memungkinkan JOSM untuk menyimpan tile cache dalam file "
+"basis data, tidak dalam direktori cache besar"
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14133,6 +14499,9 @@ msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Menyediakan perpustakaan Log4j untuk plugin JOSM lainnya. Tidak dimaksudkan "
+"untuk dipasang langsung oleh pengguna, melainkan sebagai dependensi untuk "
+"plugin lainnya."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
@@ -14161,9 +14530,6 @@ msgstr "Tidak menambahkan tikungan kiri untuk pengaturan 4 atau 5 garis"
msgid "Simplifies download from different read-only APIs."
msgstr "Menyederhanakan unduhan dari read-only API yang berbeda."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Hanya mengubah suatu area untuk suatu multipoligon."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Memungkinkan untuk atribut tag ke semua objek dalam setiap area yang dipilih "
@@ -14192,6 +14558,8 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
+"Dilarang menggunakan JOSM selamanya (PERINGATAN: plugin ini mencegah JOSM "
+"dari pemuatan dan sulit untuk disingkirkan)"
msgid "Convert data from Open Data portals to OSM layer"
msgstr "Konversi data dari portal Open Data ke layer OSM"
@@ -14218,6 +14586,8 @@ msgid ""
"Bring in errors from Osm Inspector and display it on the current JOSM "
"bounding box"
msgstr ""
+"Membawa kesalahan dari Pemeriksa Osm dan menampilkannya dalam kotak pembatas "
+"JOSM saat ini"
msgid "Import OSM data in PBF format"
msgstr "Import data OSM pada format PBF"
@@ -14230,6 +14600,9 @@ msgid ""
"right click menu of the image layer."
msgstr "Menulis info posisi gps"
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14256,9 +14629,6 @@ msgstr "Plugin menyederhanakan peta dan mengedit dari rute transportasi umum"
msgid "Relation and multipolygon creating and editing panel."
msgstr "membuat relasi dan multipoligon dan mengedit panel."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Menambahkan item Restart JOSM ke dalam menu Berkas"
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -14292,9 +14662,6 @@ msgstr ""
"dapat dibatasi dengan mengahpus ukuran area maksimum. Juga rata-rata titik "
"terdekat."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "membuat dan mengedit peta laut dari OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "mengedit fitur dari OpenSeaMap"
@@ -14330,6 +14697,9 @@ msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
"Activate by holding T and slip map with left mouse button"
msgstr ""
+"Menyediakan tombol pembantu memungkinkan untuk bekerja dengan tombol mouse "
+"tunggal (stylus). Aktifkan dengan menekan T dan menyelipkan peta dengan "
+"tombol kiri mouse"
msgid ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -14338,6 +14708,11 @@ msgstr ""
"Jejak bangunan dari peta kadastral Ceko. Membutuhkan TracerServer (.NET atau "
"Mono) untuk menjalankan."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin untuk tanda digital OSM-Data"
@@ -14387,7 +14762,7 @@ msgid "Select a sequence of non-branching connected ways"
msgstr "Pilih urutan bukan percabangan yang terhubung dengan garis"
msgid "Simplifys linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "Menyederhanakan tautan objek OSM ke artikel Wikipedia"
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -14396,9 +14771,6 @@ msgstr ""
"Mengendarai mobil balap dari titik A ke titik B di atas citra udara, "
"tinggalkan kaktus belakang."
-msgid "Highways"
-msgstr "Jalan Raya"
-
msgid "Streets"
msgstr "Jalan"
@@ -14483,6 +14855,9 @@ msgstr "Pematang"
msgid "Lit"
msgstr "Sulut"
+msgid "Toll"
+msgstr "Tol"
+
msgid "Motorway Link"
msgstr "Penghubung Jalan Tol"
@@ -14573,6 +14948,50 @@ msgstr "Permukiman"
msgid "Edit Residential Street"
msgstr "Edit Jalan Permukiman"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Jenis jalan"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "ya"
+
+msgid "no"
+msgstr "tidak"
+
+msgid "destination"
+msgstr "Tujuan"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Jalan Permukiman"
@@ -14591,11 +15010,11 @@ msgstr "Area"
msgid "Service"
msgstr "Pelayanan"
-msgid "Edit Serviceway"
-msgstr "Edit Jalur Pelayanan"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Tipe Jalur Pelayanan"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "gang"
@@ -14606,6 +15025,9 @@ msgstr "Jalan Masuk"
msgid "parking_aisle"
msgstr "tempat_parkir"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Tempat Parkir"
@@ -14633,18 +15055,12 @@ msgstr "bundaran"
msgid "jughandle"
msgstr "jughandle"
-msgid "yes"
-msgstr "ya"
-
msgid "Road Restrictions"
msgstr "Pelarangan Jalan"
msgid "Edit Road Restrictions"
msgstr "Edit Pelarangan Jalan"
-msgid "Toll"
-msgstr "Tol"
-
msgid "No exit (cul-de-sac)"
msgstr "Tidak ada jalan keluar"
@@ -14654,9 +15070,6 @@ msgstr "Pelarangan moda transportasi"
msgid "General Access"
msgstr "Akses Umum"
-msgid "destination"
-msgstr "Tujuan"
-
msgid "delivery"
msgstr "pengantaran"
@@ -14666,15 +15079,15 @@ msgstr "memperbolehkan"
msgid "private"
msgstr "pribadi"
+msgid "customers"
+msgstr "Pelanggan"
+
msgid "agricultural"
msgstr "agrikultural"
msgid "forestry"
msgstr "perhutanan"
-msgid "no"
-msgstr "tidak"
-
msgid "official"
msgstr "resmi"
@@ -14720,6 +15133,9 @@ msgstr "High-occupancy vehicles (hov)"
msgid "Public Service Vehicles (psv)"
msgstr "Kendaraan Umum (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Kecepatan minimum (km/h)"
@@ -14804,6 +15220,9 @@ msgstr "Edit Jembatan"
msgid "viaduct"
msgstr "jembatan di atas jalan"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "Ayunan"
@@ -14917,20 +15336,29 @@ msgstr ""
msgid "Visibility"
msgstr "Tingkat Penglihatan"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "Sempurna"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "Bagus"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "Tingkat Lanjut"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "Buruk"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "Sangat Buruk"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Kursi roda"
@@ -14947,11 +15375,11 @@ msgstr "Jalur untuk berkuda"
msgid "Edit Bridleway"
msgstr "Edit Bridleway"
-msgid "Cycle Lane"
-msgstr "Jalur melingkar"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Edit Jalur melingkar"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Jalan melingkar"
@@ -14963,16 +15391,16 @@ msgid "track"
msgstr "trek"
msgid "opposite_lane"
-msgstr ""
+msgstr "jalur_berlawanan"
msgid "opposite_track"
-msgstr ""
+msgstr "trek_berlawanan"
msgid "opposite"
msgstr "berlawanan"
msgid "share_busway"
-msgstr ""
+msgstr "berbagi_jalur bis"
msgid "shared_lane"
msgstr "shared_lane"
@@ -14986,8 +15414,8 @@ msgstr "Jalan melingkar kanan"
msgid "Oneway (bicycle)"
msgstr "Satu jalan (sepeda)"
-msgid "Edit Highway"
-msgstr "mengedit jalan"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Jalan"
@@ -15055,12 +15483,18 @@ msgstr "Tempat Istirahat"
msgid "Edit Rest Area"
msgstr "Edit Tempat Istirahat"
-msgid "Emergency Phone"
-msgstr "Telepon Darurat"
+msgid "Drinking Water"
+msgstr "Air Minum"
msgid "Traffic Signal"
msgstr "Lampu Lalu Lintas"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Tipe penyebrangan pedestrian"
@@ -15076,15 +15510,6 @@ msgstr "Pulau"
msgid "unmarked"
msgstr "Tidak ditandai"
-msgid "Cross on horseback"
-msgstr "Penyeberang dan horseback"
-
-msgid "Cross by bicycle"
-msgstr "Menyebrang dengan sepeda"
-
-msgid "Crossing attendant"
-msgstr "Petugas penyeberangan"
-
msgid "Crossing type name (UK)"
msgstr "Nama tipe penyeberangan"
@@ -15106,15 +15531,27 @@ msgstr "pegasus"
msgid "tiger"
msgstr "harimau"
+msgid "Crossing attendant"
+msgstr "Petugas penyeberangan"
+
+msgid "Cross by bicycle"
+msgstr "Menyebrang dengan sepeda"
+
+msgid "Cross on horseback"
+msgstr "Penyeberang dan horseback"
+
msgid "Stop"
msgstr "Berhenti"
msgid "Give way"
-msgstr ""
+msgstr "Beri way/garis"
msgid "Mini-roundabout"
msgstr "Bundaran kecil"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Arah"
@@ -15124,11 +15561,8 @@ msgstr "Serarah jarum jam"
msgid "Pedestrian Crossing"
msgstr "Penyebrangan Pedestrian"
-msgid "Edit Crossing"
-msgstr "Edit persimpangan"
-
-msgid "Type name (UK)"
-msgstr "Tipe nama (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Traffic Calming"
@@ -15152,7 +15586,7 @@ msgid "hump"
msgstr "Punuk"
msgid "rumble_strip"
-msgstr ""
+msgstr "potongan_bergemuruh"
msgid "table"
msgstr "tabel"
@@ -15160,9 +15594,6 @@ msgstr "tabel"
msgid "Passing Place"
msgstr "melewati tempat"
-msgid "Edit Passing Place"
-msgstr "edit melewati tempat"
-
msgid "Turning Circle"
msgstr "Menghidupkan Lingkaran"
@@ -15196,20 +15627,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Halangan"
+msgid "Block"
+msgstr "Blok"
+
+msgid "Edit Block"
+msgstr "Edit Blok"
+
+msgid "Allowed traffic:"
+msgstr "Diperbolehkan lalu lintas"
+
+msgid "Material"
+msgstr "Bahan"
+
+msgid "stone"
+msgstr "batu"
+
msgid "Bollard"
msgstr "Tonggak Penambat Kapal"
msgid "Edit Bollard"
msgstr "Edit Tonggak Penambat Kapal"
-msgid "Allowed traffic:"
-msgstr "Diperbolehkan lalu lintas"
+msgid "Bollard type"
+msgstr "tipe Bollard"
+
+msgid "rising"
+msgstr "meningkat"
+
+msgid "removable"
+msgstr "dapat dihapus"
+
+msgid "plastic"
+msgstr "plastik"
msgid "Cycle Barrier"
msgstr "Halangan Sepeda"
-msgid "Block"
-msgstr "Blok"
+msgid "Edit Cycle Barrier"
+msgstr "Edit Barrier Cycle"
msgid "Cattle Grid"
msgstr "Jaring Ternak"
@@ -15220,6 +15675,9 @@ msgstr "Edit Jaring Ternak"
msgid "Bus Trap"
msgstr "Pelat Metal"
+msgid "Edit Bus Trap"
+msgstr "Edit Bus Trap"
+
msgid "Spikes"
msgstr "Duri"
@@ -15241,44 +15699,88 @@ msgstr "Edit Kontrol Perbatasan"
msgid "Hedge"
msgstr "pembendung"
+msgid "Edit Hedge"
+msgstr "Edit Hedge"
+
+msgid "Height (meters)"
+msgstr "tinggi (meter)"
+
+msgid "Genus"
+msgstr "Genus"
+
+msgid "Species"
+msgstr "Spesies"
+
+msgid "Taxon"
+msgstr "Taxon"
+
msgid "Fence"
msgstr "pagar"
+msgid "Edit Fence"
+msgstr "Edit Fence"
+
msgid "barbed_wire"
msgstr "barbed_wire"
-msgid "chain"
-msgstr "rantai"
+msgid "chain_link"
+msgstr "chain_link"
msgid "electric"
msgstr "Listrik"
-msgid "hedge"
-msgstr "Membatasi"
-
msgid "pole"
msgstr "tiang"
msgid "split_rail"
msgstr "split_rail"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr "Pembatas Jalan"
+
+msgid "Edit Guard Rail"
+msgstr "Edit Pembatas Jalan"
+
msgid "Wall"
msgstr "Tembok"
+msgid "Edit Wall"
+msgstr "Edit Dinding Pembatas"
+
msgid "City Wall"
msgstr "Tembok Kota"
+msgid "Edit City Wall"
+msgstr "Edit Tembok Kota"
+
msgid "Retaining Wall"
msgstr "Tembok Pertahanan"
+msgid "Edit Retaining Wall"
+msgstr "Edit Dinding Penahan"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Parit"
-msgid "Entrance"
-msgstr "Pintu Masuk"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Edit Pintu Masuk"
+msgid "Kerb"
+msgstr "Separator"
+
+msgid "Edit Kerb"
+msgstr "Edit Separator"
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Gerbang"
@@ -15310,12 +15812,27 @@ msgstr "Gerbang yang bersinggungan"
msgid "Edit Kissing Gate"
msgstr "Mengedit Pagar yang bersinggungan"
+msgid "Chain"
+msgstr "Palang"
+
+msgid "Edit Chain"
+msgstr "Edit Palang"
+
msgid "Stile"
msgstr "tumpuan kaki untuk melintasi pagar;"
msgid "Edit Stile"
msgstr "Edit tumpuan kaki untuk melintasi pagar;"
+msgid "ladder"
+msgstr "Tangga"
+
+msgid "squeezer"
+msgstr "pemeras"
+
+msgid "stepover"
+msgstr "melangkahi"
+
msgid "Turnstile"
msgstr "Pintu putar"
@@ -15329,40 +15846,40 @@ msgid "Edit Sally Port"
msgstr "Sunting Sally Port"
msgid "Passageways"
-msgstr ""
+msgstr "Jalan terusan"
msgid "Edit Tunnel"
msgstr "Edit Terowongan"
msgid "Building Passage"
-msgstr ""
+msgstr "Lorong Bangunan"
msgid "Edit Building Passage"
-msgstr ""
+msgstr "Edit bagian bangunan"
msgid "Arcade"
-msgstr ""
+msgstr "Lorong dengan atap melengkung"
msgid "Edit Arcade"
-msgstr ""
+msgstr "Edit Lorong dengan atap melengkung"
msgid "Open on left side"
-msgstr ""
+msgstr "Buka sisi kiri"
msgid "Open on right side"
-msgstr ""
+msgstr "Buka pada sisi kanan"
msgid "Colonnade"
-msgstr ""
+msgstr "Barisan Tiang"
msgid "Edit Colonnade"
-msgstr ""
+msgstr "Edit Barisan Tiang"
msgid "Avalanche Protector"
-msgstr ""
+msgstr "Pelindung longsor"
msgid "Edit Avalanche Protector"
-msgstr ""
+msgstr "Edit pelindung longsor"
msgid "Water"
msgstr "Air"
@@ -15373,6 +15890,9 @@ msgstr "Saluran"
msgid "Edit Drain"
msgstr "Edit pipa saluran"
+msgid "Ditch"
+msgstr "Parit"
+
msgid "Edit Ditch"
msgstr "Edit selokan"
@@ -15382,6 +15902,12 @@ msgstr "Anak Sungai"
msgid "Edit Stream"
msgstr "Edit aliran air"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -15421,9 +15947,6 @@ msgstr "Edit Dam"
msgid "Groyne"
msgstr "Groyne"
-msgid "Edit Groyne"
-msgstr "Sunting Groyne"
-
msgid "Breakwater"
msgstr "Pemecah gelombang"
@@ -15431,10 +15954,10 @@ msgid "Edit Breakwater"
msgstr "Edit pemecah gelombang"
msgid "Culvert"
-msgstr ""
+msgstr "Saluran air"
msgid "Edit Culvert"
-msgstr ""
+msgstr "Edit Saluran Air"
msgid "Basin"
msgstr "Cekungan"
@@ -15457,6 +15980,21 @@ msgstr "Edit Ditutupi Waduk"
msgid "Edit Water"
msgstr "Edit Air"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Lahan"
@@ -15538,20 +16076,25 @@ msgstr "Edit Terminal Feri"
msgid "Cargo"
msgstr "Kargo"
+msgctxt "cargo"
msgid "passengers"
-msgstr "penumpang"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "kendaraan"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "sepeda"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "hgv"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "penumpang;kendaraan"
+msgstr ""
msgid "Ferry Route"
msgstr "Rute Feri"
@@ -15622,8 +16165,11 @@ msgstr "militer"
msgid "tourism"
msgstr "pariwisata"
-msgid "Service/Type"
-msgstr "Layanan/Tipe"
+msgid "freight"
+msgstr "Kargo"
+
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "halaman"
@@ -15646,11 +16192,14 @@ msgstr "contact_line"
msgid "rail"
msgstr "rel"
-msgid "Voltage"
-msgstr "Tegangan"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frekuensi (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15661,9 +16210,6 @@ msgstr "Narrow Gauge Rail"
msgid "Edit Narrow Gauge Rail"
msgstr "Edit Narrow Gauge Rail"
-msgid "Types"
-msgstr "Tipe"
-
msgid "Monorail"
msgstr "Monorel (Rel tunggal)"
@@ -15706,18 +16252,56 @@ msgstr "Rel yang tidak terpakai"
msgid "Edit Disused Railway"
msgstr "Edit Rel Kereta Api Bekas"
-msgid "Optional Types"
-msgstr "Tipe Opsional"
-
msgid "Abandoned Rail"
msgstr "Rel yang diabaikan"
+msgid "Edit Abandoned Railway"
+msgstr "Edit Jalur Kereta yang tidak terpakai"
+
msgid "Level Crossing"
msgstr "Lintasan"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr "Diawasi"
+
+msgid "Traffic lights"
+msgstr "Lampu lalu lintas"
+
+msgid "Sound signals"
+msgstr "Sinyal suara"
+
+msgid "Barrier"
+msgstr "Halangan"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Perlintasan"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Tipe Perlintasan"
@@ -15817,13 +16401,11 @@ msgstr "Magic Carpet"
msgid "Edit Magic Carpet"
msgstr "Edit Magic Carpet"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Barang"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Lift pengangkut barang"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -15833,13 +16415,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Edit Stasiun"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Tiang"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Edit tiang penyangga"
+msgstr ""
msgid "Parking"
msgstr "Tempat Parkir"
@@ -15856,12 +16436,12 @@ msgstr "Permukaan"
msgid "underground"
msgstr "Bawah Tanah"
+msgid "rooftop"
+msgstr "atap"
+
msgid "Access"
msgstr "Akses"
-msgid "customers"
-msgstr "Pelanggan"
-
msgid "Park and Ride"
msgstr "Parkir dan menumpang"
@@ -15889,9 +16469,6 @@ msgstr "Ruang parkir"
msgid "Edit Parking space"
msgstr "Edit ruang parkir"
-msgid "rooftop"
-msgstr "atap"
-
msgid "Capacity"
msgstr "Kapasitas"
@@ -15907,20 +16484,36 @@ msgstr "Batas waktu (menit)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Diawasi"
-
msgid "Opening Hours"
msgstr "Jam Buka"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Senin-Jumat 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Selasa-Minggu 08:00-15:00;Sabtu 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Parkir masuk"
@@ -16069,6 +16662,9 @@ msgstr "Stasiun Pengisian"
msgid "Edit Charging Station (for electric cars)"
msgstr "Edit Stasiun Pengisian (untuk mobil listrik)"
+msgid "Voltage"
+msgstr "Tegangan"
+
msgid "Amperage"
msgstr "Tegangan aliran listrik"
@@ -16090,6 +16686,12 @@ msgstr "Perbaikan"
msgid "Edit Car Repair"
msgstr "Edit Perbaikan Mobil"
+msgid "Parts"
+msgstr "Bagian"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Ban"
@@ -16117,6 +16719,12 @@ msgstr "Penyewaan"
msgid "Edit Car Rental"
msgstr "Edit Penyewaan Mobil"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "hanya"
+
msgid "Sharing"
msgstr "Berbagi"
@@ -16141,22 +16749,6 @@ msgstr "Layanan:"
msgid "Sale"
msgstr "Penjualan"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "ya"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "merek"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "bekas"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "tidak"
-
msgid "brand"
msgstr "merek"
@@ -16178,9 +16770,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Bagian"
-
msgid "Clothes"
msgstr "Pakaian"
@@ -16244,8 +16833,8 @@ msgstr "Edit penyewaan sepeda"
msgid "Public Transport"
msgstr "Transportasi Publik"
-msgid "Route"
-msgstr "Rute"
+msgid "Public transport route"
+msgstr "Rute transportasi umum"
msgid "Edit Route"
msgstr "Edit Rute"
@@ -16269,7 +16858,7 @@ msgid "bus"
msgstr "bus"
msgid "trolleybus"
-msgstr ""
+msgstr "trem bus"
msgid "aerialway"
msgstr "aerialway"
@@ -16284,13 +16873,13 @@ msgid "To (terminal stop)"
msgstr "Ke (pemberhentian terminal)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Melalui (berhenti tahap lanjutan)"
msgid "Network"
msgstr "jaringan"
msgid "Color (HTML name or hexadecimal code)"
-msgstr ""
+msgstr "Warna (nama HTML atau kode hexadesimal)"
msgctxt "color"
msgid "black"
@@ -16322,28 +16911,28 @@ msgstr "putih"
msgctxt "color"
msgid "#CD853F"
-msgstr ""
+msgstr "#CD853F"
msgid "route segment"
msgstr "segmen rute"
msgid "stop position"
-msgstr ""
+msgstr "Hentikan posisi"
msgid "stop position (exit only)"
-msgstr ""
+msgstr "Hentikan posisi (hanya keluar)"
msgid "stop position (entry only)"
-msgstr ""
+msgstr "Posisi berhenti (masuk)"
msgid "platform"
-msgstr ""
+msgstr "platform"
msgid "platform (exit only)"
-msgstr ""
+msgstr "platform (keluar)"
msgid "platform (entry only)"
-msgstr ""
+msgstr "platform (masuk)"
msgid "Route master"
msgstr "Rute master"
@@ -16355,54 +16944,60 @@ msgid "route variant/direction (at least 2)"
msgstr "variasi rute/arah (setidaknya 2)"
msgid "Stop Area"
-msgstr ""
+msgstr "Area pemberhentian"
msgid "Edit Stop Area"
-msgstr ""
+msgstr "Ubah area pemberhentian"
msgid "UIC reference"
-msgstr ""
+msgstr "referensi UIC"
msgid "UIC name"
-msgstr ""
+msgstr "nama UIC"
msgid "Stop Position"
-msgstr ""
+msgstr "Posisi berhenti"
msgid "Platform"
-msgstr ""
+msgstr "Platform"
msgid "Station or amenities"
+msgstr "Stasiun atau ameniti"
+
+msgid "Edit Stop Position"
msgstr ""
msgid "Bus"
-msgstr ""
+msgstr "Bis"
msgid "Bus stop (legacy)"
-msgstr ""
+msgstr "Pemberhentian Bus (peninggalan)"
msgid "Tram stop (legacy)"
-msgstr ""
+msgstr "Pemberhentian Tram (peninggalan)"
msgid "Train"
-msgstr ""
+msgstr "Kereta"
msgid "Railway station (legacy)"
-msgstr ""
+msgstr "Stasiun kereta (peninggalan)"
msgid "Railway halt (legacy)"
-msgstr ""
+msgstr "Pemberhentian kereta"
msgid "Trolleybus"
-msgstr ""
+msgstr "Trem Bus"
msgid "Share taxi"
-msgstr ""
+msgstr "Berbagi taksi"
msgid "Funicular"
-msgstr ""
+msgstr "Funicular"
msgid "Ferry"
+msgstr "Ferry"
+
+msgid "Edit Platform"
msgstr ""
msgid "Bench"
@@ -16417,20 +17012,22 @@ msgstr "Kursi dorong"
msgid "limited"
msgstr "terbatas"
-msgid "only"
-msgstr "hanya"
-
msgid "Highway platform (legacy)"
-msgstr ""
+msgstr "Pembatas Jalan Raya"
msgid "Railway platform (legacy)"
-msgstr ""
+msgstr "Pembatas Kereta"
msgid "funicular"
-msgstr ""
+msgstr "Kereta gunung"
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Stasiun"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edit Stasiun"
msgid "Building"
msgstr "Bangunan"
@@ -16444,6 +17041,9 @@ msgstr "Edit Pintu masuk kereta bawah tanah"
msgid "Ticket Machine"
msgstr "Mesin Tiket"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Nomor Referensi"
@@ -16466,15 +17066,7 @@ msgid "Account or loyalty cards"
msgstr "Akun atau kartu loyalitas"
msgid "Public Transport (legacy)"
-msgstr ""
-
-msgctxt "railway"
-msgid "Station"
-msgstr "Stasiun"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Edit Stasiun"
+msgstr "Transportasi Umum"
msgid "UIC-Reference"
msgstr "UIC-Reference"
@@ -16524,8 +17116,8 @@ msgstr "Edit Peron Bus"
msgid "Taxi"
msgstr "Taksi"
-msgid "Edit Taxi station"
-msgstr "Edit Pangkalan Taksi"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Bandara"
@@ -16578,6 +17170,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Edit Terminal"
+msgid "Internet access"
+msgstr "Akses Internet"
+
+msgid "wlan"
+msgstr "wlan"
+
+msgid "wired"
+msgstr "kabel"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Biaya akses internet"
+
msgctxt "airport"
msgid "Gate"
msgstr "Gerbang"
@@ -16600,21 +17207,6 @@ msgstr "Edit Hotel"
msgid "Stars"
msgstr "Bintang"
-msgid "Internet access"
-msgstr "Akses Internet"
-
-msgid "wlan"
-msgstr "wlan"
-
-msgid "wired"
-msgstr "kabel"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Biaya akses internet"
-
msgid "Smoking"
msgstr "Merokok"
@@ -16798,6 +17390,12 @@ msgstr "Klub Malam"
msgid "Edit Nightclub"
msgstr "Edit Klub Malam"
+msgid "Stripclub"
+msgstr "Stripclub"
+
+msgid "Edit Stripclub"
+msgstr "Edit Stripclub"
+
msgid "Tourism"
msgstr "Pariwisata"
@@ -16819,9 +17417,15 @@ msgstr "Menara Penglihatan"
msgid "Information Office"
msgstr "Kantor Informasi"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Peta"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Kelas Detil"
@@ -16834,6 +17438,9 @@ msgstr "jalan"
msgid "scheme"
msgstr "skema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Area yang ditunjukan"
@@ -16873,6 +17480,9 @@ msgstr "... mode transportasi lain kemungkinan"
msgid "Information Board"
msgstr "Papan Informasi"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Isi Papan"
@@ -16894,23 +17504,35 @@ msgstr "Tanaman"
msgid "Guidepost"
msgstr "Pos Panduan"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Terminal Informasi"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Deskripsi yang mendekati"
msgid "Audioguide"
msgstr "Panduan audio"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Panduan audio via telepon genggam?"
msgid "Phone number"
msgstr "Nomor Telepon"
-msgid "Other Information Points"
-msgstr "Informasi titik lainnya"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Kesenggangan"
@@ -16933,9 +17555,6 @@ msgstr "Taman Anjing"
msgid "Edit Dog Park"
msgstr "Edit Taman Anjing"
-msgid "Barrier"
-msgstr "Halangan"
-
msgid "fence"
msgstr "pagar"
@@ -16960,8 +17579,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Edit Sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Selasa-Minggu 08:00; Sabtu 08:00-12:00"
+msgid "Horse riding"
+msgstr "Berkuda"
+
+msgid "Edit Horse riding"
+msgstr "Ubah Berkuda"
+
+msgid "Brothel"
+msgstr "Rumah Bordil"
+
+msgid "Edit Brothel"
+msgstr "Edit Rumah Bordil"
msgid "Playground"
msgstr "Taman Bermain"
@@ -17033,50 +17661,44 @@ msgstr "Karya seni"
msgid "Edit Artwork"
msgstr "Edit Karya Seni"
-msgid "Place of Worship"
-msgstr "Tempat Beribadah"
+msgid "Recording Studio"
+msgstr "Studio Rekaman"
-msgid "Edit Place of Worship"
-msgstr "Edit Tempat Beribadah"
+msgid "Edit Studio"
+msgstr "Edit Studi"
-msgid "Religion"
-msgstr "Agama"
+msgid "audio"
+msgstr "suara"
-msgid "bahai"
-msgstr "bahai"
+msgid "video"
+msgstr "video"
-msgid "buddhist"
-msgstr "budha"
-
-msgid "christian"
-msgstr "kristen"
-
-msgid "hindu"
-msgstr "hindu"
+msgid "Place of Worship"
+msgstr "Tempat Beribadah"
-msgid "jain"
-msgstr "jain"
+msgid "Church"
+msgstr "Gereja"
-msgid "jewish"
-msgstr "yahudi"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muslim"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualis"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoist"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarian"
+msgid "church"
+msgstr "gereja"
-msgid "zoroastrian"
-msgstr "zoroastrian"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "denominasi"
@@ -17093,6 +17715,12 @@ msgstr "katolik"
msgid "evangelical"
msgstr "evangelikal"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "saksi_jehovah"
@@ -17105,6 +17733,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -17120,38 +17751,141 @@ msgstr "protestan"
msgid "quaker"
msgstr "quaker"
+msgid "roman_catholic"
+msgstr "katolik_roma"
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "Waktu layanan"
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "shia"
msgid "sunni"
msgstr "sunni"
-msgid "Service Times"
-msgstr "Waktu layanan"
+msgid "Synagogue"
+msgstr ""
-msgid "Su 10:00"
-msgstr "Su 10:00"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Su 10:30"
+msgid "synagogue"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Su 11:00"
+msgid "conservative"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Jam operasional untuk kunjungan"
+msgid "reform"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Studio Rekaman"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Edit Studi"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "audio"
-msgstr "suara"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Agama"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jain"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualis"
+
+msgid "taoist"
+msgstr "taoist"
+
+msgid "unitarian"
+msgstr "unitarian"
+
+msgid "zoroastrian"
+msgstr "zoroastrian"
msgid "Public Building"
msgstr "Bangunan Publik"
@@ -17240,6 +17974,12 @@ msgstr "Edit Sekolah Mengemudi"
msgid "License Classes"
msgstr "Kelas Lisensi"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Kesehatan"
@@ -17249,6 +17989,12 @@ msgstr "Rumah Sakit"
msgid "Edit Hospital"
msgstr "Edit Rumah Sakit"
+msgid "Clinic"
+msgstr "Klinik"
+
+msgid "Edit Clinic"
+msgstr "Edit Klinik"
+
msgid "Doctors"
msgstr "Dokter"
@@ -17268,10 +18014,10 @@ msgid "Edit Nursing Home"
msgstr "Edit Rumah Sakit Swasta"
msgid "Retirement Home"
-msgstr ""
+msgstr "Rumah Pensiunan"
msgid "Edit Retirement Home"
-msgstr ""
+msgstr "Edit Panti Jompo"
msgid "Pharmacy"
msgstr "Apotik"
@@ -17315,12 +18061,66 @@ msgstr "Dokter Hewan"
msgid "Edit Veterinary"
msgstr "Edit Dokter Hewan"
-msgid "Note"
-msgstr "Catatan"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "publik"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Kotak Pos"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telepon"
@@ -17330,6 +18130,30 @@ msgstr "EditTelepon"
msgid "Telephone cards"
msgstr "Kartu Telepon"
+msgid "Emergency Phone"
+msgstr "Telepon Darurat"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Jam"
@@ -17339,30 +18163,36 @@ msgstr "EditJam"
msgid "Display"
msgstr "Tampilan"
-msgctxt "display"
msgid "analog"
-msgstr "analog"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "Digital"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "digital"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
-msgstr "tak lazim"
+msgstr ""
msgid "Support"
msgstr "Dukungan"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "wall_mounted"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "Papan iklan"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
msgid "Visibility/readability"
msgstr "visibilitas/perhatian"
@@ -17391,8 +18221,8 @@ msgstr "Tunjukkan kelembaban"
msgid "Recycling"
msgstr "Daur Ulang"
-msgid "Edit Recycling station"
-msgstr "Edit stasiun daur ulang"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Baterai"
@@ -17418,27 +18248,15 @@ msgstr "pusat"
msgid "Waste Basket"
msgstr "Tempat Sampah"
-msgid "Edit Waste Basket"
-msgstr "Edit tempat sampah"
-
msgid "Waste Disposal"
msgstr "Pembuangan limbah"
-msgid "Edit Waste Disposal"
-msgstr "Edit Pembuangan Limbah"
+msgid "Edit Bench"
+msgstr ""
msgid "Backrest"
msgstr "Sandaran"
-msgid "Material"
-msgstr "Bahan"
-
-msgid "stone"
-msgstr "batu"
-
-msgid "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr "Banyaknya Kursi"
@@ -17473,14 +18291,17 @@ msgstr "Edit Tempat Berburu"
msgid "Height"
msgstr "Tinggi"
+msgctxt "height"
msgid "low"
-msgstr "rendah"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "setengah"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "penuh"
+msgstr ""
msgid "Hide"
msgstr "Sembunyikan"
@@ -17488,11 +18309,11 @@ msgstr "Sembunyikan"
msgid "Lock"
msgstr "Kunci"
-msgid "Drinking Water"
-msgstr "Air Minum"
+msgid "Edit Source of Potable Water"
+msgstr "Edit Sumber Air Minum"
-msgid "Edit Drinking Water"
-msgstr "Edit Air yang dapat diminum"
+msgid "Indoor"
+msgstr "Dalam ruangan"
msgid "Fire Hydrant"
msgstr "Hidran Kebakaran"
@@ -17519,6 +18340,9 @@ msgstr "kolam"
msgid "Diameter (in mm)"
msgstr "Diameter (dalam mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "jalur"
@@ -17556,125 +18380,161 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Edit Stadion"
-msgid "select sport:"
-msgstr "Pilih jenis olahraga:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "olahraga"
+msgid "Sport"
+msgstr "Olahraga"
+msgctxt "sport"
msgid "multi"
-msgstr "multi"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "panah"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletik"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "sepakbola_amerika"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "sepakbola_australia"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "bola basket"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "bowling"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "sepakbola_kanada"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kano"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "panjat tebing"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "kriket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "jaring_kriket"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "kroket"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "sepeda"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "balap_anjing"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "penunggang kuda"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "gaelic_games"
+msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gimnastik"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hoki"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "balap_kuda"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motor"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "raket"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "liga_rugbi"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "persatuan_rugbi"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "menembak"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "skating"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "ski"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "sepak bola"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "renang"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "tenis_meja"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenis"
+msgstr ""
msgid "Sports Centre"
msgstr "Pusat Olahraga"
msgid "Edit Sports Centre"
-msgstr "Edut Pusat Olahraga"
+msgstr "Edit Pusat Olahraga"
msgid "Pitch"
msgstr "lapangan"
@@ -17700,26 +18560,27 @@ msgstr "Miniatur Golf"
msgid "Edit Miniature Golf"
msgstr "Edit miniatur golf"
-msgid "Sport"
-msgstr "Olahraga"
-
msgid "Multi"
msgstr "Multi"
msgid "Edit Multi"
msgstr "Edit Multi"
-msgid "type"
-msgstr "tipe"
-
+msgctxt "running"
msgid "pitch"
-msgstr "lapangan"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "pusat_olahraga"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr "9pin"
@@ -17727,6 +18588,15 @@ msgstr "9pin"
msgid "Edit 9pin"
msgstr "Edit 9pin"
+msgid "pitch"
+msgstr "lapangan"
+
+msgid "sports_centre"
+msgstr "pusat_olahraga"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "10pin"
@@ -17760,6 +18630,22 @@ msgstr "Edit Kano"
msgid "Edit Cycling"
msgstr "Edit Sepeda"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Balap Anjing"
@@ -17772,8 +18658,33 @@ msgstr "Penunggang Kuda"
msgid "Edit Equestrian"
msgstr "Edit Penunggang Kuda"
-msgid "horse_riding"
-msgstr "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr "lapangan"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "pusat_olahraga"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "stadion"
+
+msgctxt "riding"
+msgid "track"
+msgstr "jalur"
+
+msgid "clay"
+msgstr "tanah liat"
+
+msgid "dirt"
+msgstr "lumpur"
+
+msgid "fine_gravel"
+msgstr "batu_kerikil"
+
+msgid "mud"
+msgstr "lumpur"
msgid "Horse Racing"
msgstr "Balap Kuda"
@@ -17791,7 +18702,7 @@ msgid "Skating"
msgstr "Skating"
msgid "Edit Skating"
-msgstr "Edit Skating"
+msgstr ""
msgid "ice_rink"
msgstr "ice_rink"
@@ -17835,38 +18746,56 @@ msgstr "taman_pertunjukkan"
msgid "Difficulty"
msgstr "Sulit"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "pemula"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "mudah"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "lanjutan"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "ahli"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "freeride"
+msgstr ""
msgid "Grooming"
msgstr "perawatan"
+msgctxt "piste:grooming"
msgid "classic"
-msgstr "klasik"
+msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "mogul"
+msgstr ""
+
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "classic;skating"
+msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "skuter"
+msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "backcountry"
+msgstr ""
msgid "Shooting"
msgstr "Menembak"
@@ -17907,21 +18836,17 @@ msgstr "Permainan Gael"
msgid "Edit Gaelic Games"
msgstr "Edit Permainan Gael"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr "Hurling"
+msgstr ""
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Sepak bola"
+msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
-msgstr "Camogie"
+msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
-msgstr "Rounders"
+msgstr ""
msgid "Rugby League"
msgstr "Liga Rugby"
@@ -18058,6 +18983,18 @@ msgstr "Model lapangan terbang"
msgid "Edit Model Aerodrome"
msgstr "Edit Model Aerodrome"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "mobil RC"
@@ -18070,38 +19007,73 @@ msgstr "Buatan Manusia"
msgid "Edit Building"
msgstr "edit bangunan"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "atap"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "garasi"
+msgstr ""
-msgid "church"
-msgstr "gereja"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
+msgctxt "building"
msgid "school"
-msgstr "Sekolah"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "bengkel pesawat terbang"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "komersial"
+msgstr ""
+msgctxt "building"
msgid "farm"
-msgstr "perkebunan"
+msgstr ""
+msgctxt "building"
msgid "transportation"
-msgstr "transportasi"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "rumah kaca"
+msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "kantor"
+msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "universitas"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr "Bangunan Permukiman"
@@ -18109,20 +19081,59 @@ msgstr "Bangunan Permukiman"
msgid "Edit Residential Building"
msgstr "Edit bangunan permukiman"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "apartemen"
+msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "rumah"
+msgstr ""
+msgctxt "building"
msgid "hut"
-msgstr "Pondok"
+msgstr ""
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
-msgstr "teras"
+msgstr ""
+msgctxt "building"
msgid "detached"
-msgstr "detached"
+msgstr ""
+
+msgid "Entrance"
+msgstr "Pintu Masuk"
+
+msgid "Edit Entrance"
+msgstr "Edit Pintu Masuk"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
msgid "Tower"
msgstr "Menara"
@@ -18139,9 +19150,6 @@ msgstr "komunikasi"
msgid "observation"
msgstr "pengamatan"
-msgid "Height (meters)"
-msgstr "tinggi (meter)"
-
msgid "Flagpole"
msgstr "Tiang Bendera"
@@ -18351,42 +19359,68 @@ msgstr "Waktu operasi"
msgid "Mo-Fr 22:00-05:00"
msgstr "Senin-Jumat 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Stasiun Pengukuran"
+msgid "Monitoring Station"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Edit Stasiun Pengukuran"
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Measurement"
-msgstr "Pengukuran"
+msgid "Monitoring:"
+msgstr ""
-msgid "particulate_matter"
-msgstr "particulate_matter"
+msgid "Weather"
+msgstr ""
-msgid "seismic"
-msgstr "seismik"
+msgid "Water level"
+msgstr ""
-msgid "water_level"
-msgstr "tingkat_air"
+msgid "Tide Level"
+msgstr ""
-msgid "weather"
-msgstr "cuaca"
+msgid "Traffic"
+msgstr ""
-msgid "Recording"
-msgstr "Recording"
+msgid "Air Quality"
+msgstr ""
-msgid "manually"
-msgstr "Manual"
+msgid "Noise"
+msgstr ""
-msgid "automated"
-msgstr "Otomatis"
+msgid "GPS Signals"
+msgstr ""
-msgid "remote"
-msgstr "remote"
+msgid "GLONASS Signals"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "tidak"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Titik Survey"
@@ -18394,8 +19428,8 @@ msgstr "Titik Survey"
msgid "Edit Survey Point"
msgstr "Edit Survey Point"
-msgid "Surveillance"
-msgstr "Surveillance"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Edit Surveillance Camera"
@@ -18406,52 +19440,142 @@ msgstr "indoor"
msgid "outdoor"
msgstr "diluar"
-msgid "public"
-msgstr "publik"
+msgid "Zone"
+msgstr ""
-msgid "Power"
-msgstr "Tenaga"
+msgid "parking"
+msgstr ""
-msgid "Power Generator"
-msgstr "Tenaga Generator"
+msgid "traffic"
+msgstr ""
-msgid "Edit Power Generator"
-msgstr "Edit Tenaga Generator"
+msgid "shop"
+msgstr "toko"
-msgid "biofuel"
-msgstr "biofuel"
+msgid "bank"
+msgstr ""
-msgid "biogas"
-msgstr "biogas"
+msgid "Camera"
+msgstr ""
-msgid "biomass"
-msgstr "biomassa"
+msgid "fixed"
+msgstr ""
-msgid "diesel"
-msgstr "Diesel"
+msgid "panning"
+msgstr ""
-msgid "gasoline"
-msgstr "Gasoline"
+msgid "dome"
+msgstr ""
-msgid "geothermal"
-msgstr "Geotermal"
+msgid "Mounted on"
+msgstr ""
-msgid "hydro"
-msgstr "hidro"
+msgid "ceiling"
+msgstr ""
-msgid "nuclear"
-msgstr "nuklir"
+msgid "Direction in degrees"
+msgstr ""
-msgid "osmotic"
-msgstr "osmotic"
+msgid "Inclination in degrees"
+msgstr ""
-msgid "solar"
-msgstr "matahari"
+msgid "Height in meter (m)"
+msgstr ""
-msgid "tidal"
-msgstr "tidal"
+msgid "Power"
+msgstr "Tenaga"
-msgid "waste"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr "Output forms of energy"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "elektrik"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "air panas"
+
+msgid "hot air"
+msgstr "udara panas"
+
+msgid "cold water"
+msgstr "air dingin"
+
+msgid "cold air"
+msgstr "udara dingin"
+
+msgid "compressed air"
+msgstr "udara dipadatkan"
+
+msgid "steam"
+msgstr "uap"
+
+msgid "vacuum"
+msgstr "vakum"
+
+msgid "Power Generator"
+msgstr "Tenaga Generator"
+
+msgid "Edit Power Generator"
+msgstr "Edit Tenaga Generator"
+
+msgid "biofuel"
+msgstr "biofuel"
+
+msgid "biogas"
+msgstr "biogas"
+
+msgid "biomass"
+msgstr "biomassa"
+
+msgid "diesel"
+msgstr "Diesel"
+
+msgid "gasoline"
+msgstr "Gasoline"
+
+msgid "geothermal"
+msgstr "Geotermal"
+
+msgid "hydro"
+msgstr "hidro"
+
+msgid "nuclear"
+msgstr "nuklir"
+
+msgid "osmotic"
+msgstr "osmotic"
+
+msgid "solar"
+msgstr "matahari"
+
+msgid "tidal"
+msgstr "tidal"
+
+msgid "waste"
msgstr "waste"
msgid "wave"
@@ -18463,89 +19587,192 @@ msgstr "angin"
msgid "Method"
msgstr "Metode"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "anaerobic_digestion"
+msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "pembakaran"
+msgstr ""
-msgid "dam"
-msgstr "bendungan"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "fisi"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "fusi"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
-msgstr "gasification"
-
-msgid "photovoltaic"
-msgstr "photovoltaic"
+msgstr ""
-msgid "pumped-storage"
-msgstr "pumped-storage"
+msgid "biomass / waste"
+msgstr ""
-msgid "pumping"
-msgstr "memompa"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "pyrolysis"
+msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "run-of-the-river"
+msgstr ""
+
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+msgctxt "generator method"
msgid "thermal"
-msgstr "termal"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "electricity"
-msgstr "elektrik"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "air panas"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "udara panas"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "air dingin"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "udara dingin"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "udara dipadatkan"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "uap"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vakum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
-msgid "battery charging"
-msgstr "pengisian baterai"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
-msgid "Power Station"
-msgstr "pembangkit tenaga listrik"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Edit Power Station"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Power Sub Station"
@@ -18556,6 +19783,21 @@ msgstr "Edit Power Sub Station"
msgid "Line reference"
msgstr "Line reference"
+msgid "high"
+msgstr "tinggi"
+
+msgid "medium"
+msgstr "sedang"
+
+msgid "low"
+msgstr "rendah"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "Cable Distribution Cabinet"
@@ -18563,7 +19805,7 @@ msgid "Edit Cable Distribution Cabinet"
msgstr "Edit Cable Distribution Cabinet"
msgid "Power Tower"
-msgstr "Power Tower"
+msgstr "Menara Listrik"
msgid "Edit Power Tower"
msgstr "Edit Power Tower"
@@ -18571,8 +19813,11 @@ msgstr "Edit Power Tower"
msgid "Tower reference"
msgstr "Tower reference"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
-msgstr "Pole"
+msgstr "Tiang"
msgid "Edit Power Pole"
msgstr "Edit Power Pole"
@@ -18581,7 +19826,7 @@ msgid "Pole reference"
msgstr "Kutub referensi"
msgid "Power Line"
-msgstr "Power Line"
+msgstr "Kabel Listrik"
msgid "Edit Power Line"
msgstr "Edit Power Line"
@@ -18589,13 +19834,11 @@ msgstr "Edit Power Line"
msgid "Line type"
msgstr "Line type"
-msgctxt "Power Line"
msgid "line"
-msgstr "line"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "minor_line"
+msgstr ""
msgid "Amount of Cables"
msgstr "Jumlah Kabel"
@@ -18702,11 +19945,11 @@ msgstr "Kios"
msgid "Edit Kiosk"
msgstr "EditKios"
-msgid "Baker"
-msgstr "Toko Roti"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Edit Toko Roti"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Pemotong Daging"
@@ -18717,8 +19960,8 @@ msgstr "Edit Pemotong Daging"
msgid "Seafood"
msgstr "Makanan Laut"
-msgid "Edit Seafood"
-msgstr "Edit Makanan Laut"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Deli (Fine Food)"
@@ -18738,14 +19981,20 @@ msgstr "Pasar"
msgid "Edit Marketplace"
msgstr "Mengedit Pasar"
+msgid "Organic"
+msgstr "Organik"
+
msgid "Greengrocer"
msgstr "Penjual sayur"
msgid "Edit Greengrocer"
msgstr "Edit penjual sayur"
-msgid "Organic"
-msgstr "Organik"
+msgid "Farm Stand"
+msgstr "Toko Sayuran"
+
+msgid "Edit Farm Stand"
+msgstr "Edit Toko Sayuran"
msgid "Edit Organic/Bio"
msgstr "Edit organik/bio"
@@ -18816,8 +20065,8 @@ msgstr "Edit Penjahit"
msgid "Fabric"
msgstr "Kain"
-msgid "Edit Fabric"
-msgstr "Edit Kain"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronik"
@@ -18837,14 +20086,14 @@ msgstr "Edit Toko Elektronik"
msgid "Mobile Phone"
msgstr "Telepon Genggam"
-msgid "Edit Mobile Phone"
-msgstr "Edit Telepon Genggam"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Penyedot Debu"
-msgid "Edit Vacuum Cleaner"
-msgstr "Edit penyedot debu"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hifi"
@@ -18852,7 +20101,6 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Edit Hifi Shop"
-msgctxt "shop"
msgid "Video"
msgstr "Video"
@@ -18880,6 +20128,12 @@ msgstr "Edit Money Exchange/Penukaran Uang"
msgid "Edit Automated Teller Machine"
msgstr "Edit Automated Teller Machine"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Department Store"
@@ -18916,20 +20170,41 @@ msgstr "Perhiasan"
msgid "Edit Jewelry"
msgstr "Edit Perhiasan"
-msgid "Erotic"
-msgstr "Erotic"
+msgid "Gift"
+msgstr ""
-msgid "Edit Erotic"
-msgstr "Edit Erotic"
+msgid "Edit Gift Shop"
+msgstr ""
-msgid "Florist"
-msgstr "penjual bunga"
+msgid "buddhist"
+msgstr "budha"
-msgid "Edit Florist"
-msgstr "edit penjual bunga"
+msgid "christian"
+msgstr "kristen"
-msgid "Garden Centre"
-msgstr "Taman Pusat"
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "yahudi"
+
+msgid "muslim"
+msgstr "muslim"
+
+msgid "Erotic"
+msgstr "Erotic"
+
+msgid "Edit Erotic Shop"
+msgstr ""
+
+msgid "Florist"
+msgstr "penjual bunga"
+
+msgid "Edit Florist"
+msgstr "edit penjual bunga"
+
+msgid "Garden Centre"
+msgstr "Taman Pusat"
msgid "Edit Garden Centre"
msgstr "Edit taman pusat"
@@ -18949,8 +20224,8 @@ msgstr "Toko Perangkat Keras"
msgid "Paint"
msgstr "Cat"
-msgid "Edit Paint"
-msgstr "Edit Cat"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Furniture"
@@ -18961,20 +20236,20 @@ msgstr "Edit Toko Furniture"
msgid "Kitchen"
msgstr "Dapur"
-msgid "Edit Kitchen"
-msgstr "Edit Dapur"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Gorden"
-msgid "Edit Curtain"
-msgstr "Edit Gorden"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Frame"
-msgid "Edit Frames"
-msgstr "Edit Frame"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "kertas surat"
@@ -18994,6 +20269,12 @@ msgstr "Toko Buku"
msgid "Edit Book Store"
msgstr "Edit Toko Buku"
+msgid "Newsagent''s shop"
+msgstr "Toko surat kabar"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Edit toko surat kabar"
+
msgid "Travel Agency"
msgstr "Biro Perjalanan"
@@ -19003,8 +20284,8 @@ msgstr "Edit Biro Perjalanan"
msgid "Musical Instrument"
msgstr "Instrumen Musik"
-msgid "Edit Musical Instruments"
-msgstr "Edit Instrumen Musik"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Mainan"
@@ -19084,6 +20365,9 @@ msgstr "mainan"
msgid "vouchers"
msgstr "voucher"
+msgid "Note"
+msgstr "Catatan"
+
msgid "Geography"
msgstr "Geografi"
@@ -19213,6 +20497,12 @@ msgstr "Puncak"
msgid "Edit Peak"
msgstr "Mengedit Puncak"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Gletser"
@@ -19252,24 +20542,33 @@ msgstr "Pohon"
msgid "Edit Tree"
msgstr "Edit Pohon"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Nama botani"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Hutan"
msgid "Edit Wood"
msgstr "Edit Hutan"
-msgctxt "wood"
msgid "coniferous"
msgstr "termasuk jenis pohon jarum"
-msgctxt "wood"
msgid "deciduous"
msgstr "gugur"
-msgctxt "wood"
msgid "mixed"
msgstr "campuran"
@@ -19279,38 +20578,29 @@ msgstr "Hutan"
msgid "Edit Forest Landuse"
msgstr "Edit Penggunaan Lahan Hutan"
-msgid "coniferous"
-msgstr "termasuk jenis pohon jarum"
-
-msgid "deciduous"
-msgstr "gugur"
-
-msgid "mixed"
-msgstr "campuran"
-
msgid "Grassland"
-msgstr ""
+msgstr "Padang Rumput"
msgid "Edit Grassland"
-msgstr ""
+msgstr "Edit Padang Rumput"
msgid "pampas"
-msgstr ""
+msgstr "Daratan berumput yang luas"
msgid "prairie"
-msgstr ""
+msgstr "prairie"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
-msgstr ""
+msgstr "savana"
msgid "steppe"
-msgstr ""
+msgstr "stepa"
msgid "veld"
-msgstr ""
+msgstr "padang rumput"
msgid "Nature Reserve"
msgstr "Hutan lindung"
@@ -19363,6 +20653,12 @@ msgstr "padang rumput"
msgid "Edit Meadow Landuse"
msgstr "edit padang rumput"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Perkebunan Anggur"
@@ -19417,8 +20713,8 @@ msgstr "Recreation Ground"
msgid "Edit Recreation Ground Landuse"
msgstr "Edit Recreation Ground Landuse"
-msgid "Residential area"
-msgstr "Area Permukiman"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Edit Landuse Permukiman"
@@ -19429,6 +20725,9 @@ msgstr "Pemakaman Kecil"
msgid "Edit Graveyard"
msgstr "Edit Pemakaman"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Pemakaman besar"
@@ -19504,6 +20803,33 @@ msgstr "Edit Penggunaan Lahan Pertambangan"
msgid "Annotation"
msgstr "Keterangan"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Edit Informasi Alamat"
@@ -19522,30 +20848,6 @@ msgstr "Nama Kota"
msgid "Country code"
msgstr "Kode Negara"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolasi Alamat"
@@ -19564,9 +20866,21 @@ msgstr "seragam"
msgid "alphabetic"
msgstr "Alfabetik"
-msgid "Contact (common schema)"
+msgid "Accuracy"
+msgstr "Akurasi"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
msgstr ""
+msgid "Contact (common schema)"
+msgstr "Hubungi (skema umum)"
+
msgid "Edit Contact information"
msgstr "Edit Informasi Kontak"
@@ -19634,10 +20948,10 @@ msgid "where to place the label"
msgstr "dimana untuk menempatkan label"
msgid "perimeter of the site"
-msgstr ""
+msgstr "batas pinggir situs"
msgid "entrances to the site, on the perimeter"
-msgstr ""
+msgstr "Masuk ke site, di perimeter"
msgid "members of site"
msgstr "member dari situs"
@@ -19728,26 +21042,55 @@ msgstr "dimana pelaksanaan berakhir"
msgid "traffic light or barrier that stops you"
msgstr "lampu lalu lintas atau penghalang tempat Anda berhenti"
-msgid "Route (legacy)"
+msgid "General route"
+msgstr "Rute umum"
+
+msgid "Edit general route"
+msgstr "Edit Rute umum"
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "jalan"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "pejalan kaki"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "hiking"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "jalan putar"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "deskripsi simbol"
@@ -19774,16 +21117,16 @@ msgid "backward segment"
msgstr "segmen mundur"
msgid "east segment (North America)"
-msgstr ""
+msgstr "bagian timur (Amerika Utara)"
msgid "north segment (North America)"
-msgstr ""
+msgstr "bagian utara (Amerika Utara)"
msgid "west segment (North America)"
-msgstr ""
+msgstr "bagian barat (Amerika Utara)"
msgid "south segment (North America)"
-msgstr ""
+msgstr "bagian selatan (Amerika Utara)"
msgid "halt point"
msgstr "titik henti"
@@ -19794,20 +21137,23 @@ msgstr "titik henti maju"
msgid "backward halt point"
msgstr "titik henti mundur"
-msgid "Route network"
-msgstr "rute jaringan"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Edit rute jaringan"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "anggota"
-msgid "Associated street"
-msgstr "Jalan berasosiasi"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Edit jalan berasosiasi"
+msgid "house"
+msgstr "rumah"
msgid "Street"
msgstr "Jalan"
@@ -19830,8 +21176,8 @@ msgstr "suatu relasi termasuk bagian dari jalan"
msgid "Destination sign"
msgstr "petunjuk tujuan"
-msgid "Edit Destination sign"
-msgstr "edit petunjuk tujuan"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "petunjuk tujuan ditulis (w/o jarak)"
@@ -19849,7 +21195,7 @@ msgid "Colour of text"
msgstr "warna dari teks"
msgid "Colour of border/arrow"
-msgstr ""
+msgstr "Warna dari garis pinggir/arah panah"
msgid "last way before junction"
msgstr "way/garis terakhir sebelum persimpangan jalan"
@@ -19870,7 +21216,7 @@ msgid "Edit Waterway"
msgstr "edit jalan aliran air"
msgid "Subtype of waterway (largest one of members)"
-msgstr ""
+msgstr "Sub tipe jalan air (salah satu anggota terbesar)"
msgid "river"
msgstr "sungai"
@@ -19891,19 +21237,19 @@ msgid "Name of river/sea/ocean"
msgstr "Nama dari sungai/laut/samudera"
msgid "Reference Sandre (FR)"
-msgstr ""
+msgstr "Reference Sandre (FR)"
msgid "Reference FGKZ (DE)"
-msgstr ""
+msgstr "Reference FGKZ (DE)"
msgid "Reference REGINE (NO)"
-msgstr ""
+msgstr "Reference REGINE (NO)"
msgid "Reference GNIS (USA)"
-msgstr ""
+msgstr "Reference GNIS (USA)"
msgid "Reference GNBC (CA)"
-msgstr ""
+msgstr "Reference GNBC (CA)"
msgid "waterways (no riverbank)"
msgstr "jalur air (tidak ada sungai)"
@@ -19918,18 +21264,21 @@ msgid "Length (meters)"
msgstr "panjang (meter)"
msgid "ways supported by (on top of) the bridge"
-msgstr ""
+msgstr "way/garis didukung oleh (diatas) jembatan"
msgid "ways passing under the bridge"
msgstr "way/garis yang melewati bawah jembatan"
msgid "way forming the outline footprint"
-msgstr ""
+msgstr "way/garis membentuk jejak garis"
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
+msgstr "way/garis melewati terowongan bawah tanah"
+
+msgid "edge ways parallel to ''through''"
msgstr ""
msgid "bridge"
@@ -19938,6 +21287,12 @@ msgstr "jembatan"
msgid "deprecated"
msgstr "usang"
+msgid "bicycle"
+msgstr "sepeda"
+
+msgid "foot"
+msgstr "pejalan kaki"
+
msgid "horse"
msgstr "kuda"
@@ -19947,8 +21302,11 @@ msgstr "halangan"
msgid "motorroad"
msgstr "jalan motor"
-msgid "highway_track"
-msgstr "trek_jalan raya"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "pelayanan"
@@ -19956,11 +21314,11 @@ msgstr "pelayanan"
msgid "ford"
msgstr "arungan"
-msgid "highway_platform"
-msgstr "serambi_jalan raya"
+msgid "highway.platform"
+msgstr ""
-msgid "emergency_access_point"
-msgstr "titik_akses_darurat"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "sungai"
@@ -19977,14 +21335,17 @@ msgstr "deras"
msgid "railwaypoint"
msgstr "titik jalur rel"
-msgid "railyard"
+msgid "raildashed"
msgstr ""
+msgid "railyard"
+msgstr "dipo kereta"
+
msgid "otherrail"
msgstr "rel lainnya"
msgid "railover"
-msgstr ""
+msgstr "railover"
msgid "oldrail"
msgstr "rel tua"
@@ -19992,28 +21353,28 @@ msgstr "rel tua"
msgid "aeroway"
msgstr "jalur aero"
-msgid "aeroway_dark"
-msgstr "jalur aero_gelap"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "jalur aero_terang"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -20034,20 +21395,20 @@ msgstr "marina"
msgid "amenity"
msgstr "amenitas"
-msgid "amenity_traffic"
-msgstr "amenitas_lalu lintas"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "amenitas_ringan"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "air_ringan"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "kesehatan"
-msgid "shop"
-msgstr "toko"
+msgid "office"
+msgstr "kantor"
msgid "hotel"
msgstr "hotel"
@@ -20112,9 +21473,6 @@ msgstr "padang rumput"
msgid "woodarea"
msgstr "area kayu"
-msgid "mud"
-msgstr "lumpur"
-
msgid "beach"
msgstr "pantai"
@@ -20124,11 +21482,14 @@ msgstr "rute"
msgid "boundary"
msgstr "batas"
+msgid "sport"
+msgstr "olahraga"
+
msgid "place"
msgstr "tempat"
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "alamat"
@@ -20142,9 +21503,6 @@ msgstr "Desa/Kota"
msgid "One Way"
msgstr "Satu Arah"
-msgid "Church"
-msgstr "Gereja"
-
msgid "Fuel Station"
msgstr "SPBU"
@@ -20161,169 +21519,202 @@ msgid "Test"
msgstr "Tes"
msgid "abbreviated street name"
-msgstr ""
+msgstr "mempersingkat nama jalan"
msgid "oneway tag on a node"
-msgstr ""
+msgstr "tag satu jalan pada sebuah node/titik"
msgid "bridge tag on a node"
-msgstr ""
+msgstr "tag jembatan pada sebuah node/titik"
msgid "wrong highway tag on a node"
+msgstr "tag jalan raya salah pada simpul"
+
+msgid "wrong crossing tag on a way"
msgstr ""
msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "jalan raya yang belum diberikan nama dan klasifikasi"
msgid "highway without a reference"
-msgstr ""
+msgstr "Jalan raya tanpa referensi"
msgid "temporary highway type"
-msgstr ""
+msgstr "jenis jalan raya yang temporer"
msgid "misspelled key name"
-msgstr ""
+msgstr "kesalahan eja nama kunci"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "jalan sepeda dengan tag sepeda"
msgid "footway with tag foot"
-msgstr ""
+msgstr "trotoar dengan tag pejalan kaki"
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "memisahkan jalan sepeda sebagai jalur di jalan sepeda"
msgid "barrier used on a way"
-msgstr ""
+msgstr "pembatas digunakan pada way/garis"
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "kecepatan maksimal digunakan untuk trotoar"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "tag layer dengan tanda +"
msgid "street name contains ss"
-msgstr ""
+msgstr "nama jalan berisi ss"
msgid "relation without type"
-msgstr ""
+msgstr "relasi tanpa tipe"
msgid "restaurant without name"
-msgstr ""
+msgstr "restauran tanpa nama"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "kombinasi tag yang tidak biasa (jalan raya & jalan air)"
msgid "unusual tag combination (highway & natural)"
+msgstr "kombinasi tag yang tidak biasa (jalan raya & alam)"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
msgstr ""
msgid "natural water used for swimming pool"
+msgstr "air alami yang digunakan untuk kolam renang"
+
+msgid "numerical key"
msgstr ""
-msgid "incline without highway"
+msgid "route_master relation without route_master=*"
msgstr ""
-msgid "junction without highway"
+msgid "power line without voltage"
msgstr ""
-msgid "lanes without highway"
+msgid "substation key without power=substation"
msgstr ""
-msgid "lcn without highway"
+msgid "transformer key without power"
msgstr ""
-msgid "lit without highway"
+msgid "missing substation=*"
msgstr ""
-msgid "living_street without highway"
+msgid "missing transformer=*"
msgstr ""
-msgid "maintenance without highway"
+msgid "incline without highway or railway"
msgstr ""
-msgid "median without highway"
+msgid "junction without highway"
+msgstr "Putaran tanpa jalan raya"
+
+msgid "lanes without highway"
+msgstr "jalur tanpa jalan raya"
+
+msgid "lcn without highway"
+msgstr "lcn tanpa jalan raya"
+
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
+msgid "living_street without highway"
+msgstr "jalan_komplek tanpa jalan raya"
+
+msgid "maintenance without highway"
+msgstr "pemeliharaan tanpa jalan raya"
+
+msgid "median without highway"
+msgstr "media tanpa jalan raya"
+
msgid "motorroad without highway"
-msgstr ""
+msgstr "jalan motor tanpa jalan raya"
msgid "ntd_id without highway"
-msgstr ""
+msgstr "ntd_id tanpa jalan raya"
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
-msgstr ""
+msgstr "sac_scale tanpa jalan raya"
msgid "segregated without highway"
-msgstr ""
+msgstr "jalan terpencil tanpa jalan raya"
msgid "sidewalk without highway"
-msgstr ""
+msgstr "trotoar tanpa jalan raya"
msgid "smoothness without highway"
-msgstr ""
+msgstr "jalan licin tanpa jalan raya"
msgid "snowplowing without highway"
-msgstr ""
+msgstr "gundukan salju tanpa jalan raya"
msgid "step_count without highway"
-msgstr ""
+msgstr "step_count tanpa jalan raya"
msgid "toll without highway"
-msgstr ""
+msgstr "jalan tol tanpa jalan raya"
msgid "tracktype without highway"
-msgstr ""
+msgstr "jenis trek tanpa jalan raya"
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "jarak pandang_jalur tanpa jalan raya"
msgid "trolley_wire without highway"
-msgstr ""
+msgstr "kabel_trolley tanpa jalan raya"
msgid "zip_left without highway"
-msgstr ""
+msgstr "kiri_zip tanpa jalan raya"
msgid "zip_right without highway"
-msgstr ""
+msgstr "kanan_zip tanpa jalan raya"
msgid "detail without railway"
-msgstr ""
+msgstr "detil tanpa jalan kereta"
msgid "eddy_current_brake without railway"
-msgstr ""
+msgstr "eddy_current_brake tanpa rel kereta"
msgid "electrified without railway"
-msgstr ""
+msgstr "electrified tanpa rel kereta"
msgid "etcs without railway"
-msgstr ""
+msgstr "etcs tanpa rel kereta"
msgid "gauge without railway"
-msgstr ""
+msgstr "jarak rel tanpa rel kereta"
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "grade_of_track tanpa rel kereta"
msgid "kursbuchstrecke without railway"
-msgstr ""
+msgstr "kursbuchstrecke without railway"
msgid "lzb without railway"
-msgstr ""
+msgstr "lzb tanpa rel"
msgid "old_railway_operator without railway"
-msgstr ""
+msgstr "operator_lama_rel tanpa rel"
msgid "operating_procedure without railway"
-msgstr ""
+msgstr "prosedur_operasi tanpa rel"
msgid "pzb without railway"
-msgstr ""
+msgstr "pzb tanpa rel"
msgid "radio without railway"
-msgstr ""
+msgstr "radio tanpa rel"
msgid "structure_gauge without railway"
msgstr ""
@@ -20332,140 +21723,286 @@ msgid "tilting_technologie without railway"
msgstr ""
msgid "track_class without railway"
-msgstr ""
+msgstr "kelas_truk tanpa rel kereta"
msgid "tracks without railway"
-msgstr ""
+msgstr "trek tanpa jalur kereta api"
msgid "traffic_mode without railway"
msgstr ""
msgid "usage without railway"
-msgstr ""
+msgstr "penggunaan tanpa jalan kereta"
msgid "workrules without railway"
-msgstr ""
+msgstr "peraturan kerja tanpa jalan kereta"
msgid "stream without waterway"
-msgstr ""
+msgstr "sungai tanpa jalur air"
msgid "intermittent without waterway"
-msgstr ""
+msgstr "terputus-putus tanpa jalur air"
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "kapal tanpa jalur air / natural=water"
msgid "length_unit without waterway"
-msgstr ""
+msgstr "panjang_unit tanpa jalur air"
msgid "llid without waterway"
-msgstr ""
+msgstr "llid tanpa jalur air"
msgid "canal without waterway"
-msgstr ""
+msgstr "kanal tanpa jalur air"
msgid "have_riverbank without waterway"
+msgstr "memiliki_endapan sungai tanpa jalur air"
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "width without physical linear feature"
+msgstr "lebar tanpa fitur linear fisik"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "border_type without boundary"
msgstr ""
-msgid "religion without denomination"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "unknown christian denomination"
+msgid "board_type without information=board"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
msgstr ""
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
+msgstr ""
+
+msgid "religion without denomination"
+msgstr "agama tanpa golongan agama"
+
+msgid "unknown christian denomination"
+msgstr "golongan agama kristen tidak diketahui"
+
+msgid "unknown muslim denomination"
+msgstr "golongan agama islam tidak diketahui"
+
+msgid "unknown jewish denomination"
+msgstr "golongan agama Yahudi tidak diketahui"
+
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"tidak ada wikipedia-language yang diberikan, gunakan "
+"\"wikipedia\"=\"language:page title\""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
msgstr ""
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr ""
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open Aerial"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Peta Hitam dan Putih)"
+msgstr ""
+
+msgid "skobbler"
+msgstr ""
-msgid "Skobbler"
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgstr ""
msgid "Public Transport (ÖPNV)"
-msgstr "Transportasi umum (ÖPNV)"
+msgstr ""
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Tipe Jerman)"
-
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
-
-msgid "Hike & Bike"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (bahasa Sorbian)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Bahasa Jerman)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "Peta OpenPT (overlay)"
-
-msgid "Bavaria (2 m)"
-msgstr "Bavaria (2 m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "osmfr"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
msgid "Geoimage.at MaxRes"
-msgstr "Geoimage.at MaxRes"
+msgstr ""
+
+msgid "basemap.at"
+msgstr ""
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -20485,97 +22022,158 @@ msgstr ""
msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Canvec"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Geobase Roads"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Canvec"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "MSR Maps Topo"
-msgstr "MSR Maps Topo"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr ""
-msgid "MSR Maps Urban"
-msgstr "MSR Maps Urban"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr ""
+
+msgid "Tours - Orthophotos 2008"
+msgstr ""
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -20591,16 +22189,16 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italy"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicily - Italy"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Italy"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
@@ -20614,158 +22212,221 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Catastro Spain"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "PNOA Spain"
-msgstr "PNOA Spain"
-
-msgid "SIGPAC Spain"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estonia Basemap (Maaamet)"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estonia Ortho (Maaamet)"
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Denmark)"
+msgid "MSR Maps Urban"
+msgstr ""
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
-msgid "ScanEx SPOT"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "OSM Export"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "2u"
+msgid "SUMO Export"
msgstr ""
+msgid "Export"
+msgstr "Export"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "perbaharui daftar port"
+
+msgid "Configure"
+msgstr "Konfigurasi"
+
+msgid "Connection Error."
+msgstr "Kesalahan sambungan"
+
+msgid "configure the connected DG100"
+msgstr "konfigurasi disambungkan DG100"
+
+msgid "delete data after import"
+msgstr "Hapus data setelah import"
+
msgid "Columbus V-900 CSV Files"
-msgstr ""
+msgstr "Columbus V-900 CSV Files"
msgid "Importing CSV file ''%s''..."
-msgstr ""
+msgstr "Mengimpor file CSV \"%s\"..."
msgid "Markers of "
-msgstr ""
+msgstr "Penanda dari "
msgid "Show summary after import"
msgstr "Tampilkan ringkasan setelah import"
@@ -20783,13 +22444,13 @@ msgid "Warn on conversion errors"
msgstr "Memperingatkan pada kesalahan konversi"
msgid "Error in line "
-msgstr ""
+msgstr "Kesalahan pada baris "
msgid "Missing audio file"
msgstr "Kehilangan berkas audio"
msgid "Commands"
-msgstr ""
+msgstr "Perintah"
msgid "Processing..."
msgstr "Memproses..."
@@ -20798,28 +22459,28 @@ msgid "Aborted"
msgstr "Gagal"
msgid "Error executing the script: "
-msgstr ""
+msgstr "Kesalahan saat menjalankan skrip: "
msgid "Command line"
-msgstr ""
+msgstr "Baris perintah"
msgid "Set input focus to the command line."
-msgstr ""
+msgstr "Atur input fokus pada baris perintah"
msgid "Point on the start"
-msgstr ""
+msgstr "Titik di awal"
msgid "Point on the end"
-msgstr ""
+msgstr "Titik di akhir"
msgid "Missing definition of new object with id {0}."
-msgstr ""
+msgstr "Kehilangan definisi dari objek baru dengan id {0}."
msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
-msgstr ""
+msgstr "Kehilangan atribut wajib ''{0}'' pada <anggota> dari relasi {1}."
msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr ""
+msgstr "Value ilegal untuk atrubut ''uid''. Ditemukan ''{0}''."
msgid "nodes"
msgstr "node"
@@ -20834,7 +22495,7 @@ msgid "OSM objects"
msgstr "Objek OSM"
msgid "Can not draw outside of the world."
-msgstr ""
+msgstr "Tidak dapat menggambar di luar dari dunia."
msgid "Create grid of ways"
msgstr "membuat grid dari way/garis"
@@ -20843,9 +22504,11 @@ msgid ""
"Forms a grid of ways in base to two existing that have various nodes and one "
"in common"
msgstr ""
+"Bentuk grid jalan pada dasarnya untuk dua yang ada yang memiliki berbagai "
+"simpul dan satu kesamaan"
msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Pilih dua garis yang memiliki sebuah node/titik yang sama"
msgid "Select two ways with alone a node in common"
msgstr "memilih dua way/garis dengan node/titik yang umum"
@@ -20882,7 +22545,7 @@ msgid "Filename"
msgstr "Nama File"
msgid "Private (only shared as anonymous, unordered points)"
-msgstr ""
+msgstr "Pribadi (hanya berbagi sebagai anonim, tidak mengatur titik)"
msgid "Public (shown in trace list and as anonymous, unordered points)"
msgstr ""
@@ -20890,11 +22553,14 @@ msgstr ""
msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
msgstr ""
+"Jalur (hanya berbagi sebagai anonim, mengatur titik dengan waktu pengambilan)"
msgid ""
"Identifiable (shown in trace list and as identifiable, ordered points with "
"timestamps)"
msgstr ""
+"Diidentifikasi (ditampilkan dalam daftar jejak dan seperti diidentifikasi, "
+"titik memerintahkan dengan cap waktu)"
msgid "Upload Trace"
msgstr "Upload jejak"
@@ -20915,7 +22581,7 @@ msgid "Please enter Description about your trace."
msgstr "Silahkan masukkan deskripsi mengenai jejak Anda."
msgid "Tags (comma delimited)"
-msgstr ""
+msgstr "Tag (dipisahkan koma)"
msgid "Please enter tags about your trace."
msgstr "Silahkan masukkan tag tentang jejak anda"
@@ -20962,6 +22628,18 @@ msgstr "Menunjukkan profil ketinggian"
msgid "Elevation Profile"
msgstr "profil ketinggian"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr "membuka jendela profil ketinggian"
@@ -20969,7 +22647,7 @@ msgid "Min"
msgstr "Min"
msgid "Avrg"
-msgstr ""
+msgstr "Rata-rata"
msgid "Max"
msgstr "Maks"
@@ -20983,14 +22661,8 @@ msgstr "Kenaikan"
msgid "Time"
msgstr "Waktu"
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr "Otomatis"
-
-msgid "Fixed value"
-msgstr "Nilai tetap"
+msgid "Tracks"
+msgstr "Trek"
msgid "Elevation profile for track ''{0}''."
msgstr "Profil ketinggian untuk jalur ''{0}''."
@@ -21005,13 +22677,13 @@ msgid "Can not save preferences"
msgstr "Tidak bisa menyimpan pengaturan"
msgid "FastDraw configuration"
-msgstr ""
+msgstr "konfigurasi menggambar cepat"
msgid "Epsilon multiplier"
-msgstr ""
+msgstr "Epsilon multiplier"
msgid "Starting Epsilon"
-msgstr ""
+msgstr "Memulai Epsilon"
msgid "Max points count per 1 km"
msgstr "titik maksimal dihitung per 1 km"
@@ -21020,34 +22692,34 @@ msgid "Enter key mode"
msgstr "Masukkan mode kunci"
msgid "Auto add tags"
-msgstr ""
+msgstr "Otomatis menambahkan tag"
msgid "Autosimplify"
-msgstr ""
+msgstr "Penyederhanaan Otomatis"
msgid "Simplify with initial epsilon"
-msgstr ""
+msgstr "Sederhanakan dengan awalan epsilon"
msgid "Save as is"
msgstr "Simpan sebagai"
msgid "Snap to nodes"
-msgstr ""
+msgstr "menempelkan node/titik"
msgid "Add fixed points on click"
msgstr "Menambahkan titik yang tetap dengan klik"
msgid "Add fixed points on spacebar"
-msgstr ""
+msgstr "menambah titik yang telah diperbaiki pada spacebar"
msgid "Draw closed polygons only"
-msgstr ""
+msgstr "Menggambar hanya poligon yang tertutup"
msgid "Try copying tags from properties table"
-msgstr ""
+msgstr "Coba menyalin tag dari tabel properties"
msgid "FastDraw settings"
-msgstr ""
+msgstr "Pengaturan Menggambar Cepat"
msgid "Save settings"
msgstr "Simpan pengaturan"
@@ -21070,13 +22742,13 @@ msgid "FastDrawing"
msgstr "menggambar cepat"
msgid "Fast drawing mode"
-msgstr ""
+msgstr "Mode menggambar cepat"
msgid "Please move the mouse to draw new way"
-msgstr ""
+msgstr "Mohon pindahkan mouse untuk menggambar jalan baru"
msgid "Are you sure you do not want to save the line containing {0} points?"
-msgstr ""
+msgstr "Apakah Anda yakin tidak ingin menyimpan baris yang berisi poin {0} ?"
msgid ""
"{0} m - length of the line\n"
@@ -21084,6 +22756,10 @@ msgid ""
"{2} points per km (maximum)\n"
"{3} points per km (average)"
msgstr ""
+"{0} m - panjang garis\n"
+"{1} node/titik\n"
+"{2} titik per km (maksimum)\n"
+"{3} titik per km (rata-rata)"
msgid "Line information"
msgstr "Informasi Garis"
@@ -21128,7 +22804,7 @@ msgid "Guess values for "
msgstr "Nilai dugaan untuk "
msgid "Address has no street"
-msgstr ""
+msgstr "Alamat tidak memiliki jalan"
msgid "Address has no valid street"
msgstr "Alamat memiliki jalan yang tidak valid"
@@ -21170,32 +22846,32 @@ msgid "Selected Addresses"
msgstr "Alamat dipilih"
msgid "Selected Street"
-msgstr ""
+msgstr "jalan yang dipilih"
msgid "(No data)"
-msgstr ""
+msgstr "(tidak ada data)"
msgid "Segments"
-msgstr ""
+msgstr "segmen"
msgid "Show incomplete addresses"
-msgstr ""
+msgstr "Tunjukkan alamat yang belum lengkap"
msgid "items"
-msgstr ""
+msgstr "item"
msgid "no items"
-msgstr ""
+msgstr "tidak ada item"
msgctxt "address"
msgid "City"
-msgstr ""
+msgstr "Kota"
msgid "Postcode"
-msgstr ""
+msgstr "Kode Pos"
msgid "Turns all guesses into the corresponding tag values."
-msgstr ""
+msgstr "Masukkan semua dugaan ke nilai tag yang sesuai"
msgid "Applied guessed values"
msgstr "nilai terduga diganti"
@@ -21238,9 +22914,11 @@ msgid ""
"Tries to guess address data by picking the name of the closest object with "
"according tag."
msgstr ""
+"Mencoba menebak data alamat dengan mengambil nama objek terdekat dengan tag "
+"yang sesuai."
msgid "Guessing address values"
-msgstr ""
+msgstr "Menduga nilai alamat"
msgid "Removes address related tags from the object."
msgstr "Menghapus tag relasi alamat dari objek"
@@ -21257,19 +22935,24 @@ msgstr "Memilih alamat yang tidak lengkap"
msgid "Selects all addresses with incomplete data."
msgstr "memilih semua alamat dengan data yang tidak lengkap"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
+msgstr "Editor Nomor Rumah"
+
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Memperbaharui properties hingga objek {0}"
msgid "Default image projection"
-msgstr ""
+msgstr "Pengaturan dasar proyeksi gambar"
msgid "JOSM''s current projection"
-msgstr ""
+msgstr "Proyeksi JOSM saat ini"
msgid ""
"No projection file (.prj) found.<br>You can choose the default image "
@@ -21277,39 +22960,46 @@ msgid ""
"image projection.<br>(It can be changed later from the right click menu of "
"the image layer.)"
msgstr ""
+"Tidak ditemukan file proyeksi (.prj).<br>Anda dapat memilih proyeksi gambar "
+"standar ({0}) atau proyeksi editor JOSM saat ini ({1}) sebagai proyeksi "
+"gambar yang original.<br>(Nantinya dapat diubah lagi melalui menu klik kanan "
+"pada layer gambarnya.)"
msgid "Layer Properties"
+msgstr "Layer Properties"
+
+msgid "Error while creating image layer: {0}"
msgstr ""
msgid "Import image"
-msgstr ""
+msgstr "Mengimpor gambar"
msgid "Import georeferenced image"
-msgstr ""
+msgstr "Impor gambar tergeoreferensi"
msgid "Error while creating image layer: "
msgstr "Kesalahan ketika membuat layer gambar: "
msgid "NanoLog"
-msgstr ""
+msgstr "NanoLog"
msgid "NanoLog of {0} entries"
-msgstr ""
+msgstr "NanoLog dari {0} masukan"
msgid "NanoLog of {0} lines, {1} of them with coordinates."
-msgstr ""
+msgstr "NanoLog dari {0} baris, {1} darinya dengan koordinat."
msgid "Open NanoLog panel"
-msgstr ""
+msgstr "Buka panel NanoLog"
msgid "Open NanoLog file..."
-msgstr ""
+msgstr "Buka file NanoLog..."
msgid "Edit opening hours"
msgstr "Edit jam buka"
msgid "Edit time-tag of selected element in a graphical interface"
-msgstr ""
+msgstr "Eidt waktu-tag yang dipilih elemen pada antar muka grafis"
msgid "edit existing tag"
msgstr "edit tag yang ada"
@@ -21318,13 +23008,13 @@ msgid "edit new tag"
msgstr "edit tag baru"
msgid "Display clock in 12h mode."
-msgstr ""
+msgstr "Tampilkan jam dengan modus 12 jam."
msgid "Choose key"
-msgstr ""
+msgstr "Pilih key"
msgid "apply {0}"
-msgstr ""
+msgstr "ganti {0}"
msgid "There is something wrong in the value near:"
msgstr "Ada sesuatu yang salah pada nilai terdekat:"
@@ -21342,31 +23032,43 @@ msgid "open end"
msgstr "Buka tutup"
msgid "Import Osm Inspector Bugs..."
-msgstr ""
+msgstr "Mengimpor Osm Pemeriksa Bugs..."
msgid "OsmInspector"
-msgstr ""
+msgstr "Osminspector"
msgid "Open OsmInspector"
-msgstr ""
+msgstr "Buka Osminspector"
msgid "OsmBugInfo"
-msgstr ""
+msgstr "InfoOSMBug"
msgid "Open a OSM Inspector selection list window."
-msgstr ""
+msgstr "Buka Pemeriksa OSM jendela daftar pilihan."
msgid "Current Selected Bug Info"
-msgstr ""
+msgstr "Info Bug yang terpilih"
+
+msgid "Prev OSMI bug"
+msgstr "Prev OSMI bug"
+
+msgid "Next OSMI bug"
+msgstr "Selanjutnya bug OSM"
msgid "Osm Inspector Bugs"
-msgstr ""
+msgstr "Osm inspector Bug"
+
+msgid "OSM Inspector Bugs"
+msgstr "Osm inspector Bug"
+
+msgid "Selected Bug Info"
+msgstr "Bug Info dipilih"
msgid "Handy Address Interpolation Functions"
-msgstr ""
+msgstr "Fungsi interpolasi Alamat Handy"
msgid "Define Address Interpolation"
-msgstr ""
+msgstr "Menentukan interpolasi alamat"
msgid "Odd"
msgstr "Ganjil"
@@ -21378,10 +23080,10 @@ msgid "Alphabetic"
msgstr "Alfabet"
msgid "Numeric"
-msgstr ""
+msgstr "Angka"
msgid "Actual"
-msgstr ""
+msgstr "Aktual"
msgid "Estimate"
msgstr "Estimasi"
@@ -21420,7 +23122,7 @@ msgid "City:"
msgstr "Kota:"
msgid "State:"
-msgstr ""
+msgstr "Negara Bagian:"
msgid "Post Code:"
msgstr "Kode Pos:"
@@ -21446,54 +23148,61 @@ msgstr "Diharapkan nomor aneh untuk alamat"
msgid "Expected even numbers for addresses"
msgstr "Diharapkan nomor baru untuk alamat"
-msgid "Expected valid number for address increment"
-msgstr "Diharapkan nomor valid untuk kenaikan alamat"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "Kode negara harus 2 huruf"
msgid "Please enter valid number for starting and ending address"
-msgstr ""
+msgstr "Mohon masukkan nomor yang valid untuk memulai dan mengakhiri alamat"
msgid "Alphabetic address must end with a letter"
-msgstr ""
+msgstr "Alamat alfabet harus diakhiri dengan huruf"
msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr ""
+msgstr "Memulai dan mengakhiri nomor menjadi sama untuk alamat alfabet"
msgid "Starting address letter must be less than ending address letter"
-msgstr ""
+msgstr "Memulai huruf alamat harus kurang dari akhir huruf alamat"
msgid "Please enter valid number for starting address"
-msgstr ""
+msgstr "Mohon masukkan momor yang valid untuk memulai alamat"
msgid "Please enter valid number for ending address"
-msgstr ""
+msgstr "Mohon masukkan nomor yang valid untuk mengakhiri alamat"
msgid "Starting address number must be less than ending address number"
-msgstr ""
+msgstr "Memulai nomor alamat harus kurang dari akhir nomor alamat"
msgid "Align Way Segments"
-msgstr ""
+msgstr "Sejajarkan Segmen Jalan"
msgid "Align Ways"
-msgstr ""
+msgstr "meluruskan jalan"
msgid ""
"Please select two segments that don''t share any nodes.\n"
"Alternatively put the pivot on their common node.\n"
msgstr ""
+"Tolong pilih 2 segmen yang tidak memiliki node/titik.\n"
+"Alternatifnya taruh acuan untuk node/titik.\n"
msgid ""
"Aligning would result nodes ''outside the world''.\n"
"Alignment not possible.\n"
msgstr ""
+"Meluruskan mungkin akan menghasilkan node/titik \"diluar batas\".\n"
+"Meluruskan tidak dimungkinkan.\n"
msgid ""
"There is at least a non-pivot endpoint of the alignee that joins more than "
"two way segments.\n"
"Preserved angles type alignment is not possible.\n"
msgstr ""
+"Disana setidaknya ada titik acuan akhir dari garis yang bergabung dalam "
+"lebih 2 segmen way/garis.\n"
+"Pelurusan jenis sudut tidak dimungkinkan\n"
msgid ""
"The alignment is not possible with maintaining the angles of the joint "
@@ -21505,9 +23214,11 @@ msgid ""
"An intersection point would fall outside its adjacent nodes.\n"
"This is an unsupported scenario.\n"
msgstr ""
+"Titik persimpangan akan jatuh diluar titik yang berdekatan.\n"
+"Ini merupakan skenario yang tidak dinginkan.\n"
msgid "Undocumented problem occured.\n"
-msgstr ""
+msgstr "Problem yang tidak terdokumentasikan muncul\n"
msgid "AlignWayS: Alignment not possible"
msgstr "AlignWayS: Penyelarasan tidak memungkinkan"
@@ -21555,16 +23266,16 @@ msgid "I''m ready!"
msgstr "Saya Siap!"
msgid "AlignWays Tips"
-msgstr ""
+msgstr "Tips AlignWays"
msgid "AlignWays: What''s New..."
-msgstr ""
+msgstr "AlignWays: Apa yang baru"
msgid "Align Ways mode"
-msgstr ""
+msgstr "Mode penyetaraan garis (align way)"
msgid "Parameter ''{0}'' must not be null"
-msgstr ""
+msgstr "Parameter ''{0}'' tidak harus null"
msgid ""
"Segment to be aligned cannot be the same with the reference segment.\n"
@@ -21572,7 +23283,7 @@ msgid ""
msgstr ""
msgid "AlignWayS message"
-msgstr ""
+msgstr "Pesan AlignWayS"
msgid ""
"Reference segment cannot be the same with the segment to be aligned.\n"
@@ -21580,10 +23291,10 @@ msgid ""
msgstr ""
msgid "Ctrl-Click: select reference way segment; Alt-click: Clear selection"
-msgstr ""
+msgstr "Ctrl-Click: pilih referensi segmen jalan; Alt-click: Hapus pilihan"
msgid ": Align segments; Alt-click: Clear selection"
-msgstr ""
+msgstr "Meluruskan segmen; Alt-click: Bersihkan Seleksi"
msgid ""
"Ctrl-click: select reference way segment; Click: select way segment to be "
@@ -21611,6 +23322,12 @@ msgid ""
"...or it rather should be called <br>\n"
"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
msgstr ""
+"Selamat datang ke</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...atau biasanya disebut dengan <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin..."
msgid ""
"<html>\n"
@@ -21624,6 +23341,16 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays akan "
+"selalu membantu anda untuk meluruskan dua way/garis segemen. Ini bisa "
+"dilakukan ketika anda sudah menggambarkan garis luar dari suatu bangunan dan "
+"ingin membuatnya sejajar dengan jalan.<br>\n"
+"<br>\n"
+"Beberapa tips mungkin membantu anda sebelum memulai:\n"
+"</p>\n"
+"</html>\n"
+"\n"
msgid ""
"<html>\n"
@@ -21638,6 +23365,16 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Pilih referensi segmen.</b> Anda dapat melakukan ini <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"dalam satu segmen. Sisanya akan sejajar dengan segmen yang pertama. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
msgid ""
"<html>\n"
@@ -21654,6 +23391,18 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+" <li><b>Pilih segmen yang diluruskan.</b> Anda dapat melakukan ini dengan "
+"sederhana <b><i><span style=\"color:green\">click</span></i></b>ing dalam "
+"segmen yang berbeda. \n"
+"Putaran tumpuan akan ditandai oleh pengaturan awal dalam pusat segmen.\n"
+" </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
msgid ""
"<html>\n"
@@ -21670,6 +23419,18 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+" <li>Pilihan <b>pilih putaran titik tumpuan</b>. Dengan tujuan "
+"mensejajarkan dengan referensi segmen, segemen yang diluruskan akan diputar "
+"disekitar titik ini. Anda dapat memilih dua sisi atau pusat dari segmen "
+"<b><i><span style=\"color:green\">click</span></i></b>yang dekat. \n"
+" </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
msgid ""
"<html>\n"
@@ -21685,6 +23446,18 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+" <li><b>Luruskan segmen.</b> Tekan <b><i><span "
+"style=\"color:green\">{0}</span></i></b>. Alternatifnya anda dapat menemukan "
+"perintah di <b>Tools</b>\n"
+" menu atau mungkin mau tempat di <b>toolbar</b>.\n"
+" </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
msgid ""
"<html>\n"
@@ -21696,6 +23469,14 @@ msgid ""
"</html>\n"
"\n"
msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Petunjuk terakhir:</b> ada sebuah jalan mudah untuk memulai pemilihan "
+"anda jika anda mau: <b><i><span style=\"color:green\">Alt-"
+"Click</span></i></b> di suatu tempat pada peta.\n"
+"</div>\n"
+"</html>\n"
+"\n"
msgid "Don''t show this again"
msgstr "Jangan tampilkan lagi ini"
@@ -21704,7 +23485,7 @@ msgid "What''s new..."
msgstr "Apa yang baru..."
msgid "Added <b>angle preserving</b> aligning mode"
-msgstr ""
+msgstr "Tambahkan <b>sudut</b> mode pelurusan"
msgid "Various improvements and bugfixes"
msgstr "Berbagai perbaikan dan perbaikan bug"
@@ -21721,23 +23502,14 @@ msgstr "Alamat Bangunan"
msgid "House number:"
msgstr "Nomor Rumah:"
-msgid "Street Name:"
-msgstr "Nama Jalan:"
-
-msgid "Increment"
-msgstr "Penambahan"
-
-msgid "Decrement"
-msgstr "Pengurangan"
-
-msgid "Numbers:"
-msgstr "Nomor:"
+msgid "Street Name:"
+msgstr "Nama Jalan:"
msgid "Big buildings mode"
msgstr "Mode bangunan besar"
msgid "Rotate crosshair"
-msgstr ""
+msgstr "Putar crosshair"
msgid "Advanced settings"
msgstr "Pengaturan lanjutan"
@@ -21770,7 +23542,7 @@ msgid "Length step:"
msgstr "Panjang langkah:"
msgid "Advanced..."
-msgstr ""
+msgstr "Mahir..."
msgid "Draw buildings"
msgstr "Gambar bangunan"
@@ -21807,6 +23579,9 @@ msgid ""
"Load cache first ?\n"
"(No = new cache)"
msgstr ""
+"Lokasi \"{0}\" ditemukan di memori sementara.\n"
+"muat memori sementara ?\n"
+"(No = new cache)"
msgid "Select Feuille"
msgstr "Pilih Feuille"
@@ -21815,6 +23590,8 @@ msgid ""
"Error loading file.\n"
"Probably an old version of the cache file."
msgstr ""
+"Kesalahan membuat file.\n"
+"Kemungkinan versi lama dari file memori sementara."
msgid "Lambert Zone {0} cache file (.{0})"
msgstr "Lambert Zone {0} cache file (.{0})"
@@ -21835,23 +23612,25 @@ msgid "Reunion RGR92 cache file (.UTM4)"
msgstr "Reunion RGR92 cache file (.UTM4)"
msgid "CadastreGrabber: Illegal url."
-msgstr ""
+msgstr "CadastreGrabber: Illegal url."
msgid ""
"Cannot open a new client session.\n"
"Server in maintenance or temporary overloaded."
msgstr ""
+"Tidak bisa membuka sesi klien baru.\n"
+"Server sedang dalam perbaikan atau melebihi kapasitas untuk sementara."
msgid ""
"Town/city {0} not found or not available\n"
"or action canceled"
-msgstr ""
+msgstr "Kota {0} tidak ditemukan atau tidak tersedia"
msgid "Choose from..."
msgstr "Pilih dari..."
msgid "Select commune"
-msgstr ""
+msgstr "Pilih kota"
msgid "Cadastre"
msgstr "Kadaster"
@@ -21871,6 +23650,9 @@ msgid ""
"configuration.\n"
"Layers ''Building'' and ''Parcel'' added by default."
msgstr ""
+"Diharapkan untuk mengaktifkan setidaknya dua WMS layer di pengaturan plugin "
+"cadastre-fr.\n"
+"Layer \"Building/Bangunan\" dan \"Parcel\" sudah ditambahkan sejak awal."
msgid ""
"Warning: failed to put option pane dialog always on top. Exception was: {0}"
@@ -21883,9 +23665,12 @@ msgid ""
"the current projection to one of the cadastre\n"
"projections and retry"
msgstr ""
+"tersedia kadaster plugin WMS, ubah \n"
+"proyeksi saat ini ke satu dari kadaster\n"
+"proyeksi dan coba lagi"
msgid "Change the current projection"
-msgstr ""
+msgstr "Ubah proyeksi saat ini"
msgid "Replace original background by JOSM background color."
msgstr "Mengganti latar belakang asli dengan warna latar belakang JOSM"
@@ -21905,6 +23690,9 @@ msgstr "Nonaktifkan memotong gambar selama georeferensi."
msgid "Use \"Tableau d''assemblage\""
msgstr "Gunakan \"Tableu d\"assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "Pilih layer WMS pertama di dalam daftar."
@@ -21913,7 +23701,7 @@ msgstr ""
"Jangan gunakan relasi untuk alamat (tetapi \"addr:street\" pada elemen)."
msgid "off"
-msgstr ""
+msgstr "mati"
msgid "25 m"
msgstr "25 m"
@@ -21924,12 +23712,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "tinggi"
-
-msgid "medium"
-msgstr "sedang"
-
msgid "symbol"
msgstr "simbol"
@@ -21955,7 +23737,7 @@ msgid "Max. cache size (in MB)"
msgstr "Max ukuran cache (dalam MB)"
msgid "French cadastre WMS"
-msgstr ""
+msgstr "WMS kadaster Prancis"
msgid ""
"A special handler of the French cadastre wms at "
@@ -21968,7 +23750,7 @@ msgid ""
msgstr ""
msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr ""
+msgstr "<html>Value dari key \"sumber\" ketika autosourcing tersedia</html>"
msgid ""
"Replace the original white background by the background color defined in "
@@ -21991,7 +23773,7 @@ msgid "Set WMS layers transparency. Right is opaque, left is transparent."
msgstr "Atur layer WMS transparansi. Kanan buram, kiri transparan."
msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr ""
+msgstr "Gambar kotak disekitar data yang akan didownload dari WMS server"
msgid "Image resolution:"
msgstr "Resolusi gambar"
@@ -22006,25 +23788,27 @@ msgid "Low resolution (600x400)"
msgstr "Resolusi rendah (600x400)"
msgid "Image filter interpolation:"
-msgstr ""
+msgstr "Gambar filter interpolasi:"
msgid "Nearest-Neighbor (fastest) [ Default ]"
-msgstr ""
+msgstr "Nearest-Neighbor (fastest) [ Default ]"
msgid "Bilinear (fast)"
-msgstr ""
+msgstr "Bilinear (cepat)"
msgid "Bicubic (slow)"
-msgstr ""
+msgstr "Bicubic (lambat)"
msgid "Vector images grab multiplier:"
-msgstr ""
+msgstr "Ambil gambar vektor pengganda:"
msgid "Grab one image full screen"
-msgstr ""
+msgstr "Ambil satu gambar layar penuh"
msgid "Grab smaller images (higher quality but use more memory)"
msgstr ""
+"Ambil gambar terkecil (kualitas tinggi tetapi menggunakan memori lebih "
+"banyak)"
msgid "Fixed size square (default is 100m)"
msgstr "Ukuran persegi tetap (pengaturan awal yaitu 100m)"
@@ -22033,22 +23817,22 @@ msgid "Fixed size (from 25 to 1000 meters)"
msgstr "Ukuran tetap (dari 25 ke 1000 meter)"
msgid "Layers:"
-msgstr ""
+msgstr "Layer:"
msgid "See, rivers, swimming pools."
-msgstr ""
+msgstr "Laut, sungai, kolam renang."
msgid "Buildings, covers, underground constructions."
-msgstr ""
+msgstr "Bangunan, mencakup, kontruksi bawah tanah."
msgid "Symbols like cristian cross."
-msgstr ""
+msgstr "Simbol seperti tanda silang kristen"
msgid "Parcels."
-msgstr ""
+msgstr "Parsel"
msgid "Parcels numbers, street names."
-msgstr ""
+msgstr "Nomor Parsel, nama jalan."
msgid "Address, houses numbers."
msgstr "Alamat, nomor rumah"
@@ -22057,23 +23841,26 @@ msgid "Locality, hamlet, place."
msgstr "Lokasi, dusun, tempat."
msgid "Cadastral sections and subsections."
-msgstr ""
+msgstr "Bagian kadastral dan sub bagian"
msgid "Municipality administrative borders."
msgstr "Batas administrasi kotamadya"
msgid "Raster images grab multiplier:"
-msgstr ""
+msgstr "Ambil gambar raster pengganda:"
msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
-msgid "Display crosspieces:"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
msgstr ""
+msgid "Display crosspieces:"
+msgstr "Tampilan crosspieces:"
+
msgid "Allows an automatic caching"
-msgstr ""
+msgstr "Memungkinkan caching otomatis"
msgid "Oldest files are automatically deleted when this size is exceeded"
msgstr "Berkas lama otomastis dihapus ketika kelebihan ukuran."
@@ -22082,15 +23869,20 @@ msgid ""
"Automatically selects the first WMS layer if multiple layers exist when "
"grabbing."
msgstr ""
+"Otomatis memilih layer WMS pertama jika layer multiple tersedia ketika "
+"bersamaa."
msgid "Enable this to use the tag \"add:street\" on nodes."
+msgstr "Perbolehkan untuk menambahkan tag \"add:street\" pada node/titik."
+
+msgid "Unexpected file extension. {0}"
msgstr ""
msgid "Add \"source=...\" to elements?"
-msgstr ""
+msgstr "Tambahkan \"sumber=...\" ke elemen?"
msgid "Downloading {0}"
-msgstr ""
+msgstr "Mendownload {0}"
msgid "Contacting WMS Server..."
msgstr "Memanggil server WMS..."
@@ -22102,6 +23894,8 @@ msgid ""
"To avoid cadastre WMS overload,\n"
"building import size is limited to 1 km2 max."
msgstr ""
+"Untuk mengindari kadaster WMS melebihi kapasitas,\n"
+"ukuran import bangunan dibatasi sampai 1 km2."
msgid "Please, enable auto-sourcing and check cadastre millesime."
msgstr ""
@@ -22131,83 +23925,45 @@ msgid ""
"This commune is not vectorized.\n"
"Please use the other menu entry to georeference a \"Plan image\""
msgstr ""
+"Kota ini belom tervektorisasi.\n"
+"Tolong gunakan menu input untuk georeferensikan \"Plan Image."
msgid "Extract commune boundary"
-msgstr ""
+msgstr "ekstrak batas kota"
msgid "Only on vectorized layers"
-msgstr ""
+msgstr "Hanya pada layer vektor"
msgid "Cancel current grab"
-msgstr ""
+msgstr "Batalkan pengambilan saat ini"
msgid "Cancel current grab (only vector images)"
-msgstr ""
+msgstr "Batalkan pengambilan saat ini (hanya gambar vektor)"
msgid "Cadastre grab"
-msgstr ""
+msgstr "klip kadaster"
msgid "Download Image from French Cadastre WMS"
msgstr "mengunduh gambar dari WMS kadaster Prancis"
msgid "Cadastre: {0}"
-msgstr ""
+msgstr "Kadaster: {0}"
msgid "Georeference an image"
-msgstr ""
+msgstr "Georefensi gambar"
msgid "Grab non-georeferenced image"
-msgstr ""
+msgstr "Ambil gambar yang tidak digeoreferensi"
msgid "Georeferencing interrupted"
-msgstr ""
+msgstr "georeferensi terganggu"
msgid ""
"This image contains georeference data.\n"
"Do you want to use them ?"
msgstr ""
-
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr "Gambar georeferensi"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr "Masukkan kadaster timur, posisi utara"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Peringatan: periksa arah utara !!)"
-
-msgid "East"
-msgstr "Timur"
-
-msgid "I use the mouse"
-msgstr "Saya gunakan mouse"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Pengaturan {0} koordinat Lambert"
+"Gambar ini mengandung data yang telah tergeoreferensi.\n"
+"Apakah Anda ingin menggunakannya?"
msgid "Load layer from cache"
msgstr "Memuat layer dari cache"
@@ -22216,7 +23972,7 @@ msgid "Load location from cache (only if cache is enabled)"
msgstr "Memuat lokasi dari cache (jika cache aktif)"
msgid "{0} not allowed with the current projection"
-msgstr ""
+msgstr "{0} tidak diizinkan menggunakan proyeksi saat ini"
msgid ""
"Cannot load cache {0} which is not compatible with current projection zone"
@@ -22231,10 +23987,10 @@ msgstr ""
"valid)"
msgid "The location {0} is already on screen. Cache not loaded."
-msgstr ""
+msgstr "Lokasi {0} siap pada layar. tidak memuat memori sementara."
msgid "(optional)"
-msgstr ""
+msgstr "Pilihan"
msgid "Change location"
msgstr "Ubah Lokasi"
@@ -22243,7 +23999,7 @@ msgid "Set a new location for the next request"
msgstr "Atur lokasi baru untuk permintaan selanjutnya"
msgid "Add a new municipality layer"
-msgstr ""
+msgstr "Tambahkan layer kotamadya"
msgid "Commune"
msgstr "kelompok"
@@ -22252,18 +24008,26 @@ msgid ""
"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
"known by www.cadastre.gouv.fr .</html>"
msgstr ""
+"<html>Masukkan kota atau nama desa.<br>Gunakan syntax dan tanda yang "
+"diketaui oleh www.cadastre.gov.fr.</html>"
msgid "Departement"
msgstr "Departemen"
msgid "<html>Departement number (optional)</html>"
-msgstr ""
+msgstr "<html>Nomor departemen (optional)</html>"
msgid "Add new layer"
msgstr "Tambah layer baru"
msgid "Open Cadastre Preferences"
-msgstr ""
+msgstr "Buka pengaturan kadaster"
+
+msgid "Refine georeferencing"
+msgstr "Persempit georeferensi"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Mengubah georeference (hanya gambar raster)"
msgid "Reset cookie"
msgstr "Atur ulang cookie"
@@ -22271,14 +24035,72 @@ msgstr "Atur ulang cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Dapatkan cookie baru (sesi habis)"
-msgid "Save image as PNG"
-msgstr "Simpan gambar PNG"
+msgid "Save image as..."
+msgstr "Simpan gambar sebagai..."
msgid "PNG files (*.png)"
msgstr "PNG files (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Eksport format PNG (hanya gambar raster)"
+msgid "GeoTiff files (*.tif)"
+msgstr "Fle GeoTiff (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Ekspor gambar (hanya gambar raster)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Klik sudut untuk memotong citra\n"
+"(dua titik dibutuhkan)"
+
+msgid "Image cropping"
+msgstr "Memotong gambar"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Klik titik perpotongan untuk georeferensi\n"
+"(dua titik dibutuhkan)"
+
+msgid "Image georeferencing"
+msgstr "Gambar georeferensi"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Apakah Anda ingin menunda yang akan komplit\n"
+"atau hanya mencoba "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Ooops. Saya gagal untuk menangkap semua koordinat\n"
+"terkoreksi. Mohon ulang kembali."
+
+msgid "Enter cadastre east,north position"
+msgstr "Masukkan kadaster timur, posisi utara"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Peringatan: periksa arah utara !!)"
+
+msgid "East"
+msgstr "Timur"
+
+msgid "I use the mouse"
+msgstr "Saya gunakan mouse"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Pengaturan {0} koordinat Lambert"
+
+msgid "Click second corner for image cropping"
+msgstr "Klik sudut kedua untuk pemotongan gambar"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Klik titik perpotongan kedua untuk georeferensi"
msgid "Adjust WMS"
msgstr "Mengatur WMS"
@@ -22290,6 +24112,8 @@ msgid ""
"More than one WMS layer present\n"
"Select one of them first, then retry"
msgstr ""
+"Lebih dari satu layer WSM sekarang\n"
+"Pilih salah satu lalu coba kembali"
msgid "Reset offset"
msgstr "Atur ulang offset"
@@ -22301,13 +24125,16 @@ msgid "WMS layer ({0}), {1} tile(s) loaded"
msgstr "layer WMS ({0}), {1} indeks(s) dimuat"
msgid "Is not vectorized."
+msgstr "Bukan vektorisasi"
+
+msgid "Bounding box: {0}"
msgstr ""
-msgid "Raster size: {0}"
-msgstr "Ukuran raster: {0}"
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
-msgstr ""
+msgstr "vektorisasi"
msgid "Commune bbox: {0}"
msgstr ""
@@ -22316,18 +24143,23 @@ msgid ""
"Unsupported cache file version; found {0}, expected {1}\n"
"Create a new one."
msgstr ""
+"versi file memori sementara yang tidak didukkung;menemukan {0}, diharapkan "
+"{1}\n"
+"Buat baru"
msgid "Cache Format Error"
msgstr "Kesalahan Format Cache"
msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
msgstr ""
+"Zona Lambert {0} dalam ruang penyimpanan sementara tidak kompatibel dengan "
+"zona lambert yang sekarang {1}"
msgid "Cache Lambert Zone Error"
-msgstr ""
+msgstr "Kesalahan ruang penyimpanan sementara zona lambert"
msgid "canvec tile helper"
-msgstr ""
+msgstr "pembantu tile canvec"
msgid "Use"
msgstr "Gunakan"
@@ -22336,7 +24168,7 @@ msgid "Please select a scheme to use."
msgstr "Silakan pilih skema untuk digunakan"
msgid "Color Scheme"
-msgstr ""
+msgstr "Skema Warna"
msgid "Please select the scheme to delete."
msgstr "Silakan pilih skema untuk menghapus"
@@ -22348,28 +24180,31 @@ msgid "Use the current colors as a new color scheme."
msgstr "Gunakan warna saat ini sebagai skema warna baru."
msgid "Delete the selected scheme from the list."
-msgstr ""
+msgstr "Hapus skema yang dipilih dari daftar"
msgid "Color Schemes"
-msgstr ""
+msgstr "Skema warna"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
-msgstr ""
+msgstr "Area terpisah"
msgid "Splits an area by an untagged way."
-msgstr ""
+msgstr "Pemisahan area dengan jalan tidak ditandai."
msgid ""
"The selected area cannot be splitted, because it is a member of some "
"relation.\n"
"Remove the area from the relation before splitting it."
msgstr ""
+"Area yang dipilih tidak dapat dipisahkan, karena itu anggota dari suatu "
+"relasi\n"
+"Hapus area dari relasi terlebih dahulu sebelum dipisahkan"
msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "file TangoGPS (*.log)"
msgid "Coordinates imported: "
msgstr "Import koordinat: "
@@ -22378,10 +24213,10 @@ msgid "Format errors: "
msgstr "kesalahan Format: "
msgid "TangoGPS import success"
-msgstr ""
+msgstr "TangoGPS import sukses"
msgid "TangoGPS import failure!"
-msgstr ""
+msgstr "TangoGPS import gagal!"
msgid "TCX Files (*.tcx)"
msgstr "Berkas TCX (*.tcx)"
@@ -22390,28 +24225,31 @@ msgid "Download along..."
msgstr "Unduh terlalu lama..."
msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "Download data OSM beserta garis/jalan yang dipilih."
msgid "Download Along"
msgstr "Unduh terlalu lama"
msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "Silahkan pilih 1 atau lebih cara untuk mendownload bersama"
+
+msgid "Download from OSM along selected ways"
+msgstr "Download dari OSM berserta jalan yang dipilih"
msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} titik intermediate untuk download."
msgid "between {0} {1} and {2} {3}"
-msgstr ""
+msgstr "diantara {0} {1} dan {2} {3}"
msgid " adding {0} {1}"
-msgstr ""
+msgstr " menambahkan {0} {1}"
msgid "Layer for editing GPX tracks"
-msgstr ""
+msgstr "Layer untuk mengubah trek GPX"
msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "Ubah ke layer GPX dengan tidak diketahui"
msgid "EditGpx"
msgstr "EditGpx"
@@ -22420,10 +24258,10 @@ msgid "edit gpx tracks"
msgstr "edit gpx tracks"
msgid "Import path from GPX layer"
-msgstr ""
+msgstr "Impor jaur dari layer GPX"
msgid "Drop existing path"
-msgstr ""
+msgstr "Jatuhkan jalur yang ada"
msgid "No GPX data layer found."
msgstr "Tidak ditemukan data layer GPX"
@@ -22432,16 +24270,19 @@ msgid "External tool error"
msgstr "Alat eksternal salah"
msgid "Error executing the script:"
-msgstr ""
+msgstr "Kesalahan saat menjalankan script:"
msgid ""
"Child script have returned invalid data.\n"
"\n"
"stderr contents:"
msgstr ""
+"Skrip telah mengembalikan data yang tidak valid.\n"
+"\n"
+"konten stderr:"
msgid "exttool:{0}"
-msgstr ""
+msgstr "exttool:{0}"
msgid "External Tool: {0}"
msgstr "Alat eksternal: {0}"
@@ -22453,7 +24294,7 @@ msgid "Name:"
msgstr "Nama:"
msgid "CmdLine:"
-msgstr ""
+msgstr "CmdLine:"
msgid "External tools"
msgstr "Alat eksternal"
@@ -22470,6 +24311,70 @@ msgstr "Alat baru..."
msgid "Install"
msgstr "Install"
+msgid "Public"
+msgstr "Publik"
+
+msgid "Could not get server response, check logs"
+msgstr "Tidak bisa mendapatkan respon dari server, periksa log"
+
+msgid "Failed to login as {0}:"
+msgstr "Gagal untuk login sebagai {0}:"
+
+msgid "The server did not return user ID"
+msgstr "Server tidak dapat kembali ke ID pengguna"
+
+msgid "Failed to send message:"
+msgstr "Gagal untuk mengirim pesan:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Gagal untuk mendapatkan pesan sebagai {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Buka panel GeoChat"
+
+msgid "Zoom in to see messages"
+msgstr "Perbesar untuk melihat pesan"
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Enable autologin"
+msgstr "tersedia login otomatis"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} pengguna"
+
+msgid "not logged in"
+msgstr "tidak login"
+
+msgid "User {0} has left"
+msgstr "Pengguna {0} telah meninggalkan"
+
+msgid "User {0} is mapping nearby"
+msgstr "Pengguna {0} adalah pemetaan terdekat"
+
+msgid "Users mapping nearby:"
+msgstr "Pengguna memetakan sekitarnya:"
+
+msgid "Private chat"
+msgstr "Chat pribadi"
+
+msgid "Close tab"
+msgstr "Tutup tab"
+
+msgid "Logout"
+msgstr "Keluar"
+
+msgid "Clear log"
+msgstr "Hapus catatan"
+
+msgid "Show users on map"
+msgstr "Tampilkan pengguna pada peta"
+
msgid "Position only"
msgstr "Hanya posisi"
@@ -22480,97 +24385,83 @@ msgid "Position, Time, Date, Speed, Altitude"
msgstr "Posisi, Waktu, Tanggal, Kecepatan, Ketinggian"
msgid "A By Time"
-msgstr ""
+msgstr "A menurut Waktu"
msgid "A By Distance"
-msgstr ""
+msgstr "A menurut Jarak"
msgid "B By Time"
-msgstr ""
+msgstr "B menurut Waktu"
msgid "B By Distance"
-msgstr ""
+msgstr "B menurut jarak"
msgid "C By Time"
-msgstr ""
+msgstr "C menurut Waktu"
msgid "C By Distance"
-msgstr ""
+msgstr "C dengan Jarak"
msgid "Data Logging Format"
-msgstr ""
+msgstr "Format data login"
msgid "Disable data logging if speed falls below"
-msgstr ""
+msgstr "Non aktifkan pencatatan data jika kecepatan turun"
msgid "Disable data logging if distance falls below"
-msgstr ""
+msgstr "Non aktifkan pencatatan data jika jarak turun"
msgid "Unknown logFormat"
msgstr "logFormat tidak diketahui"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "perbaharui daftar port"
-
-msgid "Configure"
-msgstr "Konfigurasi"
-
msgid "Configure Device"
msgstr "Alat konfigurasi"
-msgid "Connection Error."
-msgstr "Kesalahan sambungan"
-
-msgid "configure the connected DG100"
-msgstr "konfigurasi disambungkan DG100"
-
-msgid "delete data after import"
-msgstr "Hapus data setelah import"
-
msgid "Importing data from device."
msgstr "pengimporan data dari alat"
msgid "Importing data from DG100..."
-msgstr ""
+msgstr "Mengimpor data dari DG100..."
msgid "Error deleting data."
-msgstr ""
+msgstr "kesalahan menghapus data"
msgid "imported data from {0}"
-msgstr ""
+msgstr "diimpor data dari {0}"
msgid "No data found on device."
-msgstr ""
+msgstr "Tidak menemukan data pada mesin."
msgid "Connection failed."
-msgstr ""
+msgstr "Koneksi gagal."
msgid ""
"Cannot load library rxtxSerial. If you need support to install it try "
"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
"plugin/"
msgstr ""
+"Tidak dapat memuat perpustakaan rxtxSerial. Jika Anda membutuhkan dukungan "
+"untuk menginstalnya cobalah halaman utama Globalsat di http://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
msgid "Globalsat Import"
-msgstr ""
+msgstr "Import Globalstat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgstr ""
+msgstr "Import Data dari Globalsat Datalogger DG100 kedalam layer GPX."
msgid "Import"
-msgstr ""
+msgstr "import"
msgid "GPS Blams"
-msgstr ""
+msgstr "GPS Blams"
msgid "GPSBlam"
-msgstr ""
+msgstr "GPSBlam"
msgid "select gpx points and \"blam!\", find centre and direction of spread"
msgstr ""
+"Pilih poin gpx dan \"blam!\", temukan titik pusat dan arah persebaran"
msgid "Add EGPX layer"
msgstr "Menambahkan layer EGPX"
@@ -22579,105 +24470,107 @@ msgid "GPX Data"
msgstr "Data GPX"
msgid "Classes element below root child level"
-msgstr ""
+msgstr "elemen kelas dibawah tingkat anak akar"
msgid "Class element ({0}) outside classes element"
-msgstr ""
+msgstr "Kelas elemen ({0}) diluar kelas elemen"
msgid "Class element without name"
msgstr "Elemen kelas tanpa nama"
msgid "Tag element outside basetag and implication elements"
-msgstr ""
+msgstr "Elemen tag diluar tag dasar dan implikasi elemen"
msgid "Implications element below root child level"
-msgstr ""
+msgstr "Implikasi elemen dibawah tingkat anak akar"
msgid "Tag without key"
msgstr "Tag tanpa key"
msgid "Tag without value (key is {0})"
-msgstr ""
+msgstr "Tag tanpa value (key adalah {0})"
msgid "Closed classes while it was not open"
-msgstr ""
+msgstr "Kelas tertutup sementara tidak dapat terbuka"
msgid "Closed classes element before all class elements were closed"
-msgstr ""
+msgstr "elemen kelas tertutup sebelum semua elemen kelas tertutup"
msgid "Closed class element while none was open"
-msgstr ""
+msgstr "elemen kelas tertutup sementara tidak ada yang terbuka"
msgid "Closed basetags while it was not open"
-msgstr ""
+msgstr "menutup basetag ketika tidak mau terbuka"
msgid "Closed implications while it was not open"
-msgstr ""
+msgstr "Implikasi tertutup sementara itu tidak terbuka"
msgid "Tag element inside other tag element"
-msgstr ""
+msgstr "Elemen tag didalam elemen tag lainnya"
msgid "Invalid opening xml tag <{0}> in state {1}"
-msgstr ""
+msgstr "Pembukaan tidak valid tag xml <{0}> dalam keadaan {1}"
msgid "Condition isn''t finished at </condition> tag"
-msgstr ""
+msgstr "Kondisi belom terselesaikan di </condition> tag"
msgid "Closing tag element that was not open"
msgstr "Tutup tag elemen"
msgid "Invalid closing xml tag </{0}> in state {1}"
-msgstr ""
+msgstr "Pembukaan tidak valid tag xml <{0}> dalam keadaan {1}"
msgid "Some tags not been closed; now in state {0}"
-msgstr ""
+msgstr "Beberapa tag tidak ditutup, sekarang di state {0}"
msgid "Key element without attribute k"
msgstr "elemen key tanpa atribut k"
msgid "Condition is already finished at <{0}>"
-msgstr ""
+msgstr "Kondisi sudah terselesaikan pada <{0}>"
msgid "Unknown tag for condition: {0}"
msgstr "Tidak diketahui tag untuk kondisi: {0}"
msgid "Element must not have childs: {0}"
-msgstr ""
+msgstr "Elemen tidak harus memiliki relasi turunan: {0}"
msgid "Condition is already finished at </{0}>"
-msgstr ""
+msgstr "Kondisi sudah terselesaikan pada </{0}>"
msgid "<and> needs at least one child"
-msgstr ""
+msgstr "<dan> membutuhkan setidaknya satuan"
msgid "<or> needs at least one child"
msgstr ""
msgid "<not> needs at least one child"
-msgstr ""
+msgstr "<not> membutuhkan setidaknya satu relasi turunan"
msgid "Wrong closing tag {0} (</{1}> expected)"
-msgstr ""
+msgstr "Tag penutup salah {0} (</{1}> diharapkan)"
msgid "Condition {0} not yet finished"
-msgstr ""
+msgstr "Kondisi {0} belum diselesaikan"
msgid "Group not yet evaluated"
-msgstr ""
+msgstr "Kelompok belum dievaluasi"
msgid "Collection must contain at least one condition"
-msgstr ""
+msgstr "Koleksi harus berisi setidaknya satu kondisi"
msgid "No ruleset has been selected!"
-msgstr ""
+msgstr "Tidak ada aturan yang ditetapkan telah dipilih!"
msgid "No ruleset"
-msgstr ""
+msgstr "Tidak ada aturan yang ditetapkan"
msgid ""
"Syntax exception in access ruleset:\n"
"{0}"
msgstr ""
+"Pengecualian syntax di akses ruleset:\n"
+"{0}"
msgid ""
"File not found:\n"
@@ -22697,7 +24590,7 @@ msgid "File not found:\n"
msgstr "Berkas tidak ditemukan:\n"
msgid "Couldn''t find built-in ruleset {0}"
-msgstr ""
+msgstr "Tidak dapat menemukan set peraturan yang sudah terintergrasi {0}"
msgid "height (m)"
msgstr "tinggi (m)"
@@ -22715,114 +24608,118 @@ msgid "weight (t)"
msgstr "berat (t)"
msgid "axleload (t)"
-msgstr ""
+msgstr "axleload (t)"
msgid "Bookmark name"
msgstr "Nama bookmark"
msgid "Bookmark name already exists!"
-msgstr ""
+msgstr "Nama bookmark sudah ada!"
msgid "Bookmark name must not contain ''{0}''!"
-msgstr ""
+msgstr "Nama bookmark harus tidak mengandung \"{0}\""
msgid "Access class"
-msgstr ""
+msgstr "Kelas akses"
msgid "Access class must not contain ''{0}''!"
-msgstr ""
+msgstr "Kelas akses harus tidak mengandung \"{0}\""
msgid "Access types"
-msgstr ""
+msgstr "Tipe akses"
msgid "Vehicle properties"
-msgstr ""
+msgstr "Properti kendaraan"
msgid "Road requirements"
-msgstr ""
+msgstr "Kebutuhan jalan"
msgid "Max. incline up (%, pos.)"
-msgstr ""
+msgstr "Maksimal lereng naik(%, pos.)"
msgid "Maximum incline the vehicle can go up"
-msgstr ""
+msgstr "Maksimum lereng dimana kendaraan bisa menanjak keatas"
msgid "Max. incline down (%, pos.)"
-msgstr ""
+msgstr "Maksimal lereng turun"
msgid "Maximum incline the vehicle can go down"
-msgstr ""
+msgstr "Maksimul lereng dimana kendaraan bisa menurun"
msgid "Surface blacklist"
-msgstr ""
+msgstr "Daftar hitam permukaan"
msgid ""
"List of surfaces the vehicle cannot use, values are separated by semicolons "
"(;)"
msgstr ""
+"Daftar permukaan yang tidak bisa digunakan oleh mobil, nilai dipisah oleh "
+"titik koma (;)"
msgid "max. tracktype grade"
-msgstr ""
+msgstr "Maksimal jenis tipe trek"
msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
msgstr ""
+"Jenis tipe trek terburuk (1-5) yang kendaraan bisa gunakan, 0 untuk tidak "
+"ada."
msgid "Change bookmark"
-msgstr ""
+msgstr "Gantik bookmark"
msgid "Edit access parameters"
-msgstr ""
+msgstr "Mengubah parameter akses"
msgid "Graph View Dialog"
-msgstr ""
+msgstr "Dialog Graph View"
msgid "Open the dialog for graph view configuration."
-msgstr ""
+msgstr "Buka dialog untuk pengaturan graph view"
msgid "default"
-msgstr ""
+msgstr "standar"
msgid "end nodes"
-msgstr ""
+msgstr "titik akhir"
msgid "incline"
-msgstr ""
+msgstr "tanjakan"
msgid "Ruleset:"
-msgstr ""
+msgstr "Set pengaturan:"
msgid "Parameters:"
-msgstr ""
+msgstr "Parameter:"
msgid "Coloring:"
-msgstr ""
+msgstr "Pewarnaan:"
msgid "Create/update graph"
-msgstr ""
+msgstr "Membuat/memperbaharui grafik"
msgid "Graphview"
-msgstr ""
+msgstr "Graphview"
msgid "Settings for the Graphview plugin that visualizes routing graphs."
-msgstr ""
+msgstr "Pengaturan untuk plugin Graphview yang memvisualisasikan grafik rute"
msgid "Ruleset"
-msgstr ""
+msgstr "Set pengaturan"
msgid "Use built-in rulesets"
-msgstr ""
+msgstr "Menggunakan set peraturan yang sudah dipasang"
msgid "External ruleset directory:"
-msgstr ""
+msgstr "Direktori set peraturan luar:"
msgid "Select directory"
-msgstr ""
+msgstr "Pilih direktori"
msgid "Vehicle"
-msgstr ""
+msgstr "Kendaraan"
msgid "Create"
-msgstr ""
+msgstr "Buat"
msgid "Restore defaults"
msgstr "Kembalikan ke pengaturan awal"
@@ -22831,7 +24728,7 @@ msgid "Visualization"
msgstr "Visualisasi"
msgid "Draw directions separately"
-msgstr ""
+msgstr "Gambar arah terpisah"
msgid "Node color"
msgstr "warna node/titik"
@@ -22840,10 +24737,10 @@ msgid "Arrow color"
msgstr "Warna Panah"
msgid "Arrowhead fill color"
-msgstr ""
+msgstr "Warna ujung panah"
msgid "Arrowhead placement"
-msgstr ""
+msgstr "Peletakan ujung panah"
msgid "New bookmark"
msgstr "bookmark baru"
@@ -22858,6 +24755,8 @@ msgid ""
"Really restore default bookmarks?\n"
"All manually added or edited bookmarks will be lost!"
msgstr ""
+"Apakah anda ingin mengembalikan bookmarks awal?\n"
+"Semua bookmark yang ditambahkan manual atau diubah akan hilang!"
msgid "Bookmark reset"
msgstr "mengatur ulang bookmark"
@@ -22869,112 +24768,134 @@ msgid "Choose arrow color"
msgstr "memilih warna panah"
msgid "Choose arrowhead fill color"
-msgstr ""
+msgstr "Pilih warna ujung panah"
msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
+msgstr "Grafik rute dihitung oleh plugin GraphView"
msgid "GraphView layer is not mergable"
-msgstr ""
+msgstr "Layer GraphView tidak bisa digabung"
msgid "graphview default node"
-msgstr ""
+msgstr "titik standar graphview"
msgid "graphview default segment"
-msgstr ""
+msgstr "segmen standar graphview"
msgid "graphview arrowhead core"
-msgstr ""
+msgstr "pusat ujung panah graphview"
msgid ""
"Weights must be given as positive decimal numbers with unit \"t\" or without "
"unit."
msgstr ""
+"Berat harus dimasukkan sebagai angka desimal positif dengan satuan \"t\" "
+"atau tanpa satuan."
msgid ""
"Lengths must be given as positive decimal numbers with unit \"m\", \"km\", "
"\"mi\" or without unit.\n"
"Alternatively, the format FEET'' INCHES\" can be used."
msgstr ""
+"Jarak harus dimasukkan sebagai angka desimal positif dengan satuan \"m\", "
+"\"km\", \"mi\" atau tanpa unit.\n"
+"Sebagai alternatif, format FEET\" INCHI\" bisa digunakan."
msgid ""
"Speeds should be given as numbers without unit or as numbers followed by "
"\"mph\"."
msgstr ""
+"Kecepatan harus dimasukkan sebagai angka desimal positif tanpa satuan atau "
+"sebagai angka diikuti dengan \"mph\""
msgid ""
"Inclines must be given as positive decimal numbers with followed by \"%\"."
-msgstr ""
+msgstr "Lereng harus diberikan angka desimal positif diikuti dengan \"%\"."
msgid "Tracktype grades must be given as integers between 0 and 5."
-msgstr ""
+msgstr "Nilai jenis trek harus diberikan sebagai bilangan antara 0 dan 5."
msgid ""
"Surface values must not contain any of the following characters: '','', '' "
"'{' '', '' '}' '', ''='', ''|''"
msgstr ""
+"Nilai permukaan tidak harus berisi salah satu karakter berikut ini: '','', "
+"'' '{' '', '' '}' '', ''='', ''|''"
msgid "Imagery XML Files"
-msgstr ""
+msgstr "Berkas XML citra"
msgid "Save Imagery XML file"
-msgstr ""
+msgstr "Simpan file citra XML"
msgid "XML Imagery Bounds"
-msgstr ""
+msgstr "Batas Citra XML"
msgid "Generate Imagery XML bounds for the selection"
-msgstr ""
+msgstr "Menghasilkan batas citra XML untuk pilihan"
msgid "edit bounds for selected defaults"
-msgstr ""
+msgstr "edit batas untuk fitur yang dipilih"
+
+msgid "Download imagery XML bounds"
+msgstr "Download batas citra XML"
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
"Do you want to continue without validating the file ?"
msgstr ""
+"Validasi salah pada file {0}:\n"
+"{1}\n"
+"Apakah anda ingin meneruskan tanpa memvalidasi berkas tersebut?"
msgid "Open Imagery XML file"
msgstr "Buka citra satelit berkas XML"
msgid "Calibration Layer"
-msgstr ""
+msgstr "Layer Kalibrasi"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
msgstr ""
+"Kalibrasi geometri yang tidak digunakan lagi dari titik {0} menurut {1}"
msgid "A calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Kalibrasi geometri {0} titik menurut {1}"
msgid "Change Color"
-msgstr ""
+msgstr "Ubah warna"
msgid "Deprecate Offset"
-msgstr ""
+msgstr "Pergeseran yang sudah tidak digunakan"
msgid "Are you sure this imagery offset is wrong?"
-msgstr ""
+msgstr "Apakah anda yakin bahwa pergeseran citra ini salah?"
msgid "Are you sure this calibration geometry is aligned badly?"
-msgstr ""
+msgstr "Apakah anda yakin kalibrasi geometri ini diatur sangat buruk"
msgid "Warning: deprecation is basically irreversible!"
-msgstr ""
+msgstr "Peringatan:"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr ""
+"Untuk menyimpan pergeseran citra satelit anda harus mendaftar sebagai "
+"pengguna OSM."
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
msgstr ""
+"Tolong tuliskan alasan anda kenapa anda menandakan pergeseran citra satelit "
+"ini sebagai nilai yang sudah tidak digunakan."
msgid ""
"Please enter the reason why you mark this calibration geometry as deprecated"
msgstr ""
+"Tolong tuliskan alasan ada kenapa anda menandakan kalibrasi geometri ini "
+"sebagai nilai yang sudah tidak digunakan."
msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgstr "Memberitahukan server dari bantahan..."
msgid "Get Imagery Offset..."
msgstr "Mendapatkan pergeseran citra satelit..."
@@ -22985,24 +24906,26 @@ msgstr "mengunduh pergeseran untuk citra satelit dari server"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"Tidak ada data untuk area ini. Harap atur layer citra satelit dan unggah "
+"sebuah pergeseran (offset)"
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Memuat pegeseran citra satelit..."
msgid "Error processing XML response: {0}"
-msgstr ""
+msgstr "Kesalahan pengolahan XML respon: {0}"
msgid "Offset"
-msgstr ""
+msgstr "Pergeseran"
msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Database pergeseran citra"
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
@@ -23011,66 +24934,72 @@ msgid "km"
msgstr "km"
msgid "Calibration geometries"
-msgstr ""
+msgstr "Kalibrasi geometri"
msgid "Deprecated offsets"
-msgstr ""
+msgstr "Pergeseran yang sudah tidak digunakan"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
"OSM data in the area. Please check that the offset is still valid\n"
"by downloading GPS tracks and comparing them and OSM data to the imagery."
msgstr ""
+"Layer citra paling atas telah digeser agar sesuai dengan\n"
+"OSM data di area. Harap cek bahwa offset/pergeseran tersebut masih ada\n"
+"dengan mengunduh trek GPS dan membandingkan dengan data OSM dan citra satelit"
msgid ""
"A layer has been added with a calibration geometry. Hide data layers,\n"
"find the corresponding feature on the imagery layer and move it accordingly."
msgstr ""
+"Layer telah ditambahkan bersama kalibrasi geometri. Sembunyikan data layer\n"
+"temukan fitur korespondensi pada layer citra dan pindahkan sesuai yang "
+"diinginkan"
msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "Sudah tidak digunakan oleh {0} pada {1}"
msgid "Created by {0} on {1}"
-msgstr ""
+msgstr "Dibuat oleh {0} pada {1}"
msgid "Offset Information"
-msgstr ""
+msgstr "Informasi Offset"
msgid "Report this offset"
-msgstr ""
+msgstr "Laporan offset ini"
msgid "You are to notify moderators of this offset. Why?"
-msgstr ""
+msgstr "Anda akan memberitahu moderator mengenai pergeseran ini. Mengapa?"
msgid "Reporting the offset..."
-msgstr ""
+msgstr "Melaporkan offset..."
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "Sebuah citra offset {0}"
msgid "Imagery ID"
-msgstr ""
+msgstr "ID citra"
msgid "A calibration geometry of {0} nodes"
-msgstr ""
+msgstr "Sebuah kalibrasi geometri dari {0} titik"
msgid "Determined right here"
-msgstr ""
+msgstr "Ditentukan disini"
msgid "Determined {0} away"
-msgstr ""
+msgstr "Ditentukan {0} nanti"
msgid "Reason"
-msgstr ""
+msgstr "Alasan"
msgid "This entry has been reported."
-msgstr ""
+msgstr "Catatan ini telah dilaporkan"
msgid "Server has rejected the request"
-msgstr ""
+msgstr "Server telah menolak permohonan."
msgid "Unable to connect to the server"
-msgstr ""
+msgstr "Tidak dapat terkoneksi dengan server"
msgid "Store Imagery Offset..."
msgstr "Menyimpan Pergeseran Citra Satelit..."
@@ -23079,22 +25008,27 @@ msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
"server"
msgstr ""
+"Unduh pergeseran untuk citra (atau kalibrasi geometri objek) ke server"
msgid "Store calibration geometry"
-msgstr ""
+msgstr "Menyimpan geometri terkalibrasi"
msgid "Store imagery offset"
-msgstr ""
+msgstr "Menyimpan pergeseran citra"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
"intend to do?"
msgstr ""
+"Objek yang dipilih dapat digunakan sebagai geometri terkalibrasi. Apa yang "
+"ingin anda lakukan?"
msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
"this?"
msgstr ""
+"Layer citra paling atas tidak mengalami pergeseran. Apakah anda yakin untuk "
+"mengupload ini?"
msgid ""
"You are registering an imagery offset. Other users in this area will be able "
@@ -23102,6 +25036,9 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
+"Anda mendaftarkan pergeseran citra. Pengguna lain pada area ini akan bisa "
+"menggunakan untuk pemetaan. Harap pastikan posisi pergeseran sudah tepat dan "
+"jelaskan wilayah, agar offset ini bisa digunakan?"
msgid ""
"You are registering a calibration geometry. It should be the most precisely "
@@ -23109,30 +25046,34 @@ msgid ""
"clearly visible boundaries on various satellite imagery. Please describe "
"this object and its whereabouts."
msgstr ""
+"Anda mendaftarkan kalibrasi geometri. Hal itu seharusnya menjadi objek yang "
+"diletakkan secara akurat, dengan\n"
+"batas yang tampak jelas di beberapa citra satelit. Harap jelaskan objek ini "
+"dan dimana objek ini berada."
msgid "Uploading a new offset..."
-msgstr ""
+msgstr "Mengunggah pergeseran baru"
msgid "This string should be 3 to 200 letters long."
-msgstr ""
+msgstr "String harus terdeiri dari 3 sampai 200 huruf"
msgid "Adjust imagery"
-msgstr "Mengatur citra satelit"
+msgstr "Menyesuaikan citra"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Mengatur posisi dari layer citra satelit yang dipilih"
+msgstr "Menyesuaikan posisi dari layer citra yang terpilih"
msgid "Please select the imagery layer to adjust."
-msgstr "Silahkan memilih layer citra satelit untuk mengatur"
+msgstr "Tolong pilih layer citra untuk disesuaikan."
msgid "Start adjusting"
-msgstr "memulai pengaturan"
+msgstr "Memulai penyesuaian"
msgid "There are currently no imagery layer to adjust."
-msgstr ""
+msgstr "Saat ini tidak ada layer citra yang disesuaikan"
msgid "No layers to adjust"
-msgstr ""
+msgstr "Tidak ada layer yang disesuaikan"
msgid "Normal"
msgstr "Normal"
@@ -23168,7 +25109,7 @@ msgid "WayPoint Image"
msgstr "gambar titik"
msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "Menampilkan foto non-geotagged"
msgid "Imported Images"
msgstr "Gambar diimport"
@@ -23176,12 +25117,6 @@ msgstr "Gambar diimport"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "File gambar (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr "memuat pengaturan gambar di layer baru"
-
msgid "Import vector graphics"
msgstr "Import vektor grafik"
@@ -23191,17 +25126,14 @@ msgstr "Skala:"
msgid "unit(s) = "
msgstr "unit(s) = "
-msgid "Import..."
-msgstr "Import..."
+msgid "Importing..."
+msgstr "Mengimpor..."
-msgid "Import vector graphics."
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG Drawings (*.svg)"
-
-msgid "Importing..."
-msgstr "Mengimpor..."
+msgid "Please open or create data layer before importing"
+msgstr ""
msgid "InfoMode"
msgstr "InfoMode"
@@ -23213,6 +25145,8 @@ msgid ""
"Move the mouse to show trackpoint info for current layer. Hold shift to "
"highlight tracks"
msgstr ""
+"Gerakan mouse untuk menunjukkan info pointrek untuk layer saat ini. Tahan "
+"shift untuk menandai trek"
msgid "Delete this"
msgstr "Hapus ini"
@@ -23227,7 +25161,7 @@ msgid "Track name: "
msgstr "Nama jalur: "
msgid "Update IRS adjustment layer"
-msgstr ""
+msgstr "Memperbaharui layer pengaturan IRS"
msgid ""
"This option creates IRS adjustment layer and a little way inside it. You "
@@ -23235,144 +25169,152 @@ msgid ""
"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
"with [irs rectify] in subject."
msgstr ""
+"Opsi ini membuat layer pengaturan IRS dan sedikit garis didalamnya. Anda "
+"harus menyesuaikan peletakan layer WMS untuk pertama kali.\n"
+"Hasil layer akan disimpan sebagai .osm dan dikirimkan ke Komzpa "
+"(me at komzpa.net) dengan [irs rectify] sebagai subjek"
msgid "IRS Adjustment Layer"
-msgstr ""
+msgstr "Layer pengaturan IRS"
msgid "Channel-Digraph created from the active OSM-Layer"
-msgstr ""
+msgstr "Channel-Digraph dibuat dari layer OSM yang aktif"
msgid "Create Channel Digraph"
-msgstr ""
+msgstr "Membuat Channel Digraph"
msgid "this layer is no osm data layer"
msgstr "layer ini tidak berisi data layer osm"
msgid "Converting OSM graph into Channel Digraph"
-msgstr ""
+msgstr "Mengubah grafik OSM kedalam Channel Digraph"
msgid "filtering ways"
-msgstr ""
+msgstr "Menyaring garis/ways"
msgid "creating Channel-Digraph"
msgstr "membuat Channel-Digraph"
msgid "sealing Digraph"
-msgstr ""
+msgstr "menutup Digraph"
msgid "calculating Strong Connectedness"
-msgstr ""
+msgstr "menghitung hubungan terkuat"
msgid "creating DigraphLayer"
-msgstr ""
+msgstr "membuat DigraphLayer"
msgid "JunctionChecking"
-msgstr ""
+msgstr "JunctionChecking"
msgid "Open the junctionchecking window."
-msgstr ""
+msgstr "Membuka jendela pengecekan persimpangan"
msgid "junctions"
-msgstr ""
+msgstr "persimpangan"
msgid "Channel-Digraph creation"
-msgstr ""
+msgstr "Membuat channel-Digraph"
msgid "seal Channel Digraph"
-msgstr ""
+msgstr "menutup Channel Digraph"
msgid "calculate strong connected channels"
-msgstr ""
+msgstr "menghitung saluran terhubung terkuat"
msgid "Junctionchecking/junctions searching"
-msgstr ""
+msgstr "Junctionchecking/pengecekan persimpangan"
msgid "order of junction (n):"
-msgstr ""
+msgstr "Urutan dari persimpangan"
msgid "produce OSM-Relations: junction"
-msgstr ""
+msgstr "membuat relasi-OSM:persimpangan jalan"
msgid ""
"if enabled the plugin produces osm-relations from the junction subgraphs"
msgstr ""
+"jika mengaktifkan plugin prosedur relasi-osm dari persimpangan subgraph"
msgid "create the channel digraph"
-msgstr ""
+msgstr "Membuat saluran digraph"
msgid "Check "
-msgstr ""
+msgstr "Periksa "
msgid "check the subust for junction properties"
-msgstr ""
+msgstr "memeriksa subust untuk pengaturan yang menyimpang"
msgid "Search "
-msgstr ""
+msgstr "Telusuri "
msgid "search for junctions in the channel subset"
-msgstr ""
+msgstr "pencarian untuk persimpangan pada subset saluran"
msgid ""
"The marked channels contains a junctioncandidate (white). To test this "
"candidat mark these channel and press the \"Check\" button again."
msgstr ""
+"Saluran yang ditandai berisi sebuah perwakilan perismpangan (putih). untuk "
+"menguji tanda perwakilan ini saluran tersebut dan tekan tombol \"Periksa\" "
+"lagi."
msgid "The marked channels are a {0}-ways junction"
-msgstr ""
+msgstr "saluran tertandai adalah {0} persimpangan jalan"
msgid "The marked channels are not a junction:"
-msgstr ""
+msgstr "Saluran yang ditandai bukan saluran:"
msgid "construct channel digraph and search for junctions"
-msgstr ""
+msgstr "membangun saluran digraph dan cari untuk persimpangan"
msgid "Number of {0}-ways junctions found: {1}"
msgstr ""
msgid "generate all combinations from entrie/exit candidates"
-msgstr ""
+msgstr "menghasilkan semua kombinasi dari masukan/keluar kandidat"
msgid "Direction index ''{0}'' not found"
-msgstr ""
+msgstr "Indeks arah \"{0}\" tidak ditemukan"
msgid "The starting location was not within the bbox"
-msgstr ""
+msgstr "Memulai lokasi tidak dengan kotak"
msgid "Looking for shoreline..."
-msgstr ""
+msgstr "Mencari garis pantai"
msgid "{0} nodes so far..."
-msgstr ""
+msgstr "{0} titik sampai saat ini..."
msgid "Lake Walker."
-msgstr ""
+msgstr "Lake Walker."
msgid "Lake Walker"
-msgstr ""
+msgstr "Lake Walker"
msgid "Error creating cache directory: {0}"
-msgstr ""
+msgstr "Kesalahan dalam membuat direktori memori sementara: {0}"
msgid "Tracing"
msgstr ""
msgid "checking cache..."
-msgstr ""
+msgstr "cek memori sementara..."
msgid "Running vertex reduction..."
-msgstr ""
+msgstr "Menjalankan pengurangan vertex..."
msgid "Running Douglas-Peucker approximation..."
-msgstr ""
+msgstr "Menjalankan perkiraan Douglas-Peucker"
msgid "Removing duplicate nodes..."
-msgstr ""
+msgstr "Mengurangi titik/node yang terduplikasi"
msgid "Lakewalker trace"
-msgstr ""
+msgstr "Lakewalker trace"
msgid "An unknown error has occurred"
-msgstr ""
+msgstr "Kesalahan yang tidak diketahui telah terjadi"
msgid "east"
msgstr "timur"
@@ -23402,34 +25344,34 @@ msgid "coastline"
msgstr "garis pantai"
msgid "land"
-msgstr ""
+msgstr "lahan"
msgid "Maximum number of segments per way"
-msgstr ""
+msgstr "Nomor maksimal dari segmen per garis"
msgid "Maximum number of nodes in initial trace"
-msgstr ""
+msgstr "Maksimul angka dari titik/node di penggambaran awal"
msgid "Maximum gray value to count as water (0-255)"
-msgstr ""
+msgstr "Maksimum nilai abu-abu yang dihitung sebagai air (0-255)"
msgid "Line simplification accuracy (degrees)"
-msgstr ""
+msgstr "Akurasi simplifikasi garis (derajat)"
msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr ""
+msgstr "Resolusi dari kotak gambar Landsat (pixel per derajat)"
msgid "Size of Landsat tiles (pixels)"
-msgstr ""
+msgstr "Ukuran dari kotak gambar Landsat (pixel)"
msgid "Shift all traces to east (degrees)"
-msgstr ""
+msgstr "Memindahkan semua penggambaran ke timur (derajat)"
msgid "Shift all traces to north (degrees)"
-msgstr ""
+msgstr "Memindahkan semua penggambaran ke Utara (derajat)"
msgid "Direction to search for land"
-msgstr ""
+msgstr "Arah pencarian untuk lahan"
msgid "Tag ways as"
msgstr "Tag way/garis sebagai"
@@ -23441,40 +25383,51 @@ msgid "Maximum cache size (MB)"
msgstr "Maksimum ukuran cache (MB)"
msgid "Maximum cache age (days)"
-msgstr ""
+msgstr "Maksimum umur cache (hari)"
msgid "Source text"
msgstr "sumber teks"
msgid "Lakewalker Plugin Preferences"
-msgstr ""
+msgstr "Pengaturan plugin Lakewalker"
msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr ""
+msgstr "Sebuah plugin untuk menggambar badan sungai pada citra Landsat"
msgid ""
"Maximum number of segments allowed in each generated way. Default 250."
msgstr ""
+"Angka maksimum dari segmen yang diperbolehkan di setiap garis/way yang "
+"dibuat. Pengaturan awal adalah 250."
msgid ""
"Maximum number of nodes to generate before bailing out (before simplifying "
"lines). Default 50000."
msgstr ""
+"Angka maksimum dari titik yang dibuat sebelum diselesaikan (sebelum "
+"menyederhanakan garis). Pengaturan awal adalah 50000."
msgid ""
"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
"in the range 0-255. Default 90."
msgstr ""
+"Nilai abu-abu maksimum yang bisa diterima sebagai air (sesuai dengan data "
+"Landsat IR-1). Bisa dalam kisaran 0-255. Pengaturan awal adalah 90."
msgid ""
"Accuracy of Douglas-Peucker line simplification, measured in "
"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
"0.0003."
msgstr ""
+"Akurasi dari simplifikasi garis Douglas-Peucker, diukur didalam derajat. "
+"<br>Nilai kecil memberikan node/titik yang lebih dan garis yang lebih "
+"akurat. Pengaturan awal adalah 0.0003."
msgid ""
"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
msgstr ""
+"Resolusi dari gambar Landsat, diukur dalam pixel per derajat. Pengaturan "
+"awal adalah 4000."
msgid "Size of one landsat tile, measured in pixels. Default 2000."
msgstr ""
@@ -23482,33 +25435,44 @@ msgstr ""
msgid "Offset all points in East direction (degrees). Default 0."
msgstr ""
+"Pergeseran (offset) semua titik di arah Timur (derajat). Pengaturan awal "
+"adalah 0."
msgid "Offset all points in North direction (degrees). Default 0."
msgstr ""
+"Pergeseran (offset) semua titik di arah Utara (derajat). Pengaturan awal "
+"adalah 0."
msgid "Direction to search for land. Default east."
-msgstr ""
+msgstr "Arah pencarian untuk lahan. Pengaturan awal adalah Timur."
msgid "Tag ways as water, coastline, land or nothing. Default is water."
msgstr ""
+"Tag garis/way sebagai air, garis pantai, tanah atau tidak ada. Pengaturan "
+"awal adalah air."
msgid "Which WMS layer to use for tracing against. Default is IR1."
msgstr ""
+"Layer WMS digunakan untuk melacak lawan. Pengaturan standar adalah IR1."
msgid "Maximum size of each cache directory in bytes. Default is 300MB"
msgstr ""
+"Ukuran maksimal dari setiap direktori memori sementara dalam byte. Standar "
+"adalah 300MB"
msgid "Maximum age of each cached file in days. Default is 100"
msgstr ""
+"Umur maksimal dari setiap file memori sementara dalam hari. Standar adalah "
+"100"
msgid "Data source text. Default is Landsat."
-msgstr ""
+msgstr "Sumber data teks. Standar adalah Landsat."
msgid "Downloading image tile..."
-msgstr ""
+msgstr "Mendownload grid gambar..."
msgid "Could not acquire image"
-msgstr ""
+msgstr "Tidak bisa mendapatkan gambar"
msgid "Connection Failed"
msgstr "Koneksi gagal"
@@ -23547,34 +25511,32 @@ msgid "LiveGPS layer"
msgstr "Layer LiveGPS"
msgid "Capture GPS Track"
-msgstr ""
+msgstr "Mengambil trek GPS"
msgid "Connect to gpsd server and show current position in LiveGPS layer."
msgstr ""
+"Terhubung ke server gpsd dan tampilkan posisi saat ini di layer LiveGPS"
msgid "Center Once"
-msgstr ""
+msgstr "satu pusat"
msgid "Center the LiveGPS layer to current position."
-msgstr ""
+msgstr "Memusatkan layer LiveGPS ke posisi saat ini."
msgid "Auto-Center"
-msgstr ""
+msgstr "Pemusatan secara otomatis"
msgid "Continuously center the LiveGPS layer to current position."
-msgstr ""
-
-msgid "LiveGPS"
-msgstr "LiveGPS"
+msgstr "Secara berkelanjutan memusatkan layer LiveGPS ke posisi saat ini"
msgid "Open MapDust"
-msgstr ""
+msgstr "Membuka MapDust"
msgid "MapDust bug reports"
-msgstr ""
+msgstr "MapDust bug reports"
msgid "Activates the MapDust bug reporter plugin"
-msgstr ""
+msgstr "Mengaktifkan plugin MapDust bug reporter"
msgid "Missing input data"
msgstr "Input data hilang"
@@ -23587,12 +25549,13 @@ msgstr "Buka jendela pengukuran"
msgid "Reset current measurement results and delete measurement path."
msgstr ""
+"Mengulang kembali hasil pengukuran sekarang dan hapus jejak pengukuran"
msgid "Path Length"
-msgstr ""
+msgstr "Panjang jejak"
msgid "Selection Length"
-msgstr ""
+msgstr "Pemilihan panjang"
msgid "Selection Area"
msgstr "Pilih area"
@@ -23601,46 +25564,70 @@ msgid "Angle"
msgstr "Sudut"
msgid "Angle between two selected Nodes"
-msgstr ""
+msgstr "Sudut antara dua node yang terpilih"
msgid "Layer to make measurements"
-msgstr ""
+msgstr "Layer untuk membuat pengukuran"
msgid "measurement mode"
-msgstr ""
+msgstr "Mode pengukuran"
msgid "Measurements"
-msgstr ""
+msgstr "Pengukuran"
msgid "Merge overlap"
-msgstr ""
+msgstr "Menggabungkan yang bertumpang tindih"
msgid "Merge overlap of ways."
-msgstr ""
+msgstr "Menggabung garis/way yang bertumpang tindih"
msgid "Merge Overlap (combine)"
+msgstr "Menggabung yang bertumpang tindih (kombinasi)"
+
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Peranan berdasarkan relasi keanggotaan telah disalin pada seluruh "
+"jalur baru.<br> Anda harus melakukan verifikasi hal ini dan memperbaikinya "
+"jika diperlukan.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
msgstr ""
+"<html>Relasi keanggotaan telah disalin pada seluruh jalur baru.<br> Anda "
+"harus melakukan verifikasi hal ini dan memperbaikinya jika diperlukan.</html>"
msgid "Split way"
+msgstr "Memisahkan garis/way"
+
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Masukkan tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
msgstr ""
+"<html>Masukkan tag value, i.e. <strong><tt>check members</tt></strong></html>"
msgid "Michigan Left"
-msgstr ""
+msgstr "Michigan Left"
msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr ""
+msgstr "Menambahkan dilarang berbelok kiri untuk set dari 4 atau 5 garis/way"
msgid "Please select 4 or 5 ways to assign no left turns."
msgstr ""
+"Harap pilih 4 atau 5 garis/way untuk menentukaan bahwa tidak ada belok kiri"
msgid "Please select 4 ways that form a closed relation."
-msgstr ""
+msgstr "Harap pilih 4 garis/way dari relasi tertutup"
msgid "Unable to order the ways. Please verify their directions"
-msgstr ""
+msgstr "Tidak bisa mengatur garis/way. Harap verifikasi arah"
msgid "Create Michigan left turn restriction"
-msgstr ""
+msgstr "Buat larangan belok kiri Michigan"
msgid "Unable to find via nodes. Please check your selection"
msgstr ""
@@ -23654,7 +25641,7 @@ msgstr ""
"''[[network=VRR][ref=603|613]''"
msgid "Download from OSM mirror..."
-msgstr ""
+msgstr "Download dari mirror OSM"
msgid "This XAPI query seems to be invalid, please doublecheck"
msgstr "Query XAPI ini sepertinya tidak valid. harap diperiksa dua kali"
@@ -23668,6 +25655,15 @@ msgstr ""
msgid "XAPI query: "
msgstr "Query XAPI: "
+msgid "Download from Overpass API ..."
+msgstr "Download dari Overpass API ..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Download data peta dari server API Overpass."
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr "Pilih URL OSM mirror"
@@ -23678,24 +25674,13 @@ msgid "Base URL"
msgstr "URL dasar"
msgid "Enforce meta data"
-msgstr ""
-
-msgid "Convert to multipolygon"
-msgstr "Ubah ke multipoligon"
-
-msgid "Convert to multipolygon."
-msgstr "mengubah ke multipoligon"
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-"Satu dari ways/garis yang terpilih telah menjadi bagian dari multipoligon "
-"yang lain."
+msgstr "Memunculkan secara paksa meta data"
msgid "About Plugin"
msgstr "Tentang plugin"
msgid "Native password manager plugin"
-msgstr ""
+msgstr "Plugin pengaturan kata sandi bawaan"
msgid "No native password manager could be found!"
msgstr "Tidak ada pengaturan kata sandi bawaan yang dapat ditemukan!"
@@ -23704,6 +25689,8 @@ msgid ""
"Depending on your Operating System / Distribution, you may have to create a "
"default keyring / wallet first."
msgstr ""
+"Tergantung pada Sistem Operasi / Distribusi Anda, Anda mungkin harus membuat "
+"keyring standar / wallet terlebih dahulu."
msgid "No thanks, use JOSM''s plain text preferences storage"
msgstr ""
@@ -23759,7 +25746,7 @@ msgid "JOSM/OAuth/OSM API/Secret"
msgstr "JOSM/OAuth/OSM API/Rahasia"
msgid "Native Password Manager Plugin"
-msgstr ""
+msgstr "Plugin pengaturan kata sandi bawaan"
msgid "The username and password is protected by {0}."
msgstr "Nama pengguna dan kata sandi dilindungi oleh {0}."
@@ -23777,15 +25764,17 @@ msgid "proxy password"
msgstr "proxy kata sandi"
msgid "oauth key"
-msgstr ""
+msgstr "kunci otomatis"
msgid "oauth secret"
-msgstr ""
+msgstr "rahasia oauth"
msgid ""
"<br><strong>Warning:</strong> There may be sensitive data left in your "
"preference file. ({0})"
msgstr ""
+"<br><strong>Peringatan:</strong> Mungkin terdapat data sensitif tertinggal "
+"di berkas pengaturan. ({0})"
msgid "Save user and password ({0})"
msgstr "menyimpan nama pengguna dan kata sandi ({0})"
@@ -23797,18 +25786,19 @@ msgid "Use {0}"
msgstr "Gunakan {0}"
msgid "Encrypt data with Windows logon credentials"
-msgstr ""
+msgstr "Mengenkripsi data dengan kredensial logon Windows"
msgid "The native password manager plugin detected {0} on your system."
-msgstr ""
+msgstr "Plugin pengelola kata sandi bawaan terdeteksi {0} pada sistem Anda."
msgid "Days without mapping: {0}."
-msgstr ""
+msgstr "Hari tanpa pemetaan: {0}"
msgid ""
"(To miserably continue mapping, edit out no_more_mapping\n"
"from {0})"
msgstr ""
+"(Terlalu buruk untuk melanjutkan pemetaan, jangan edit lagi peta dari {0})"
msgid "Split by municipality"
msgstr "Memisahkan berdasarkan administrasi"
@@ -23826,10 +25816,7 @@ msgid "Split by neighbourhood"
msgstr "Memisahkan berdasarkan daerah sekitar"
msgid "Split this data by neighbourhood (admin_level=11)."
-msgstr ""
-
-msgid "Open Data"
-msgstr "Data Terbuka"
+msgstr "Membagi data ini dengan daerah sekitar (admin_level=11)."
msgid "CSV files"
msgstr "Berkas CSV"
@@ -23850,20 +25837,29 @@ msgid "KML/KMZ files"
msgstr "berkas KML/KMZ"
msgid "GML files"
-msgstr ""
+msgstr "Berkas GML"
msgid "Zip Files"
-msgstr ""
+msgstr "Berkas Zip"
+
+msgid "7Zip Files"
+msgstr "Berkas 7Zip"
msgid "OpenData XML files"
-msgstr ""
+msgstr "Buka data berkas XML"
+
+msgid "Download open data"
+msgstr "Download data terbuka"
msgid "License URL not available: {0}"
msgstr "Lisensi URL tidak tersedia: {0}"
-msgid "License Agreement"
+msgid "OpenData preferences"
msgstr ""
+msgid "License Agreement"
+msgstr "Lisensi persetujuan"
+
msgid "Accept"
msgstr "menerima"
@@ -23880,12 +25876,14 @@ msgid "I refuse these terms and conditions. Cancel download."
msgstr "Saya menolak segala syarat dan kondisi. Tunda download"
msgid "Module bundled with opendata plugin"
-msgstr ""
+msgstr "Modul dibundel dengan plugin opendata"
msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available modules."
msgstr ""
+"Klik pada <strong>Daftar download list</strong> untuk mendownload dan "
+"menampilkan daftar modul yang tersedia."
msgid ""
"The following module has been downloaded <strong>successfully</strong>:"
@@ -23901,7 +25899,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "Modules"
-msgstr ""
+msgstr "Modul-modul"
msgid "Accept the new module sites and close the dialog"
msgstr "Terima situs modul baru dan tutup dialog"
@@ -23929,10 +25927,10 @@ msgstr ""
"versi yang lebih baru."
msgid "Modules up to date"
-msgstr ""
+msgstr "Modul-modul sudah terbaharui"
msgid "Configure the list of sites where modules are downloaded from"
-msgstr ""
+msgstr "Konfigurasi daftar situs dari mana modul-modul tersebut diunduh"
msgid "Add Open Data Module description URL."
msgstr "Tambah penjelasan URL Modul Data Terbuka."
@@ -23944,19 +25942,19 @@ msgid "Open Data Module description URL"
msgstr "Penjelasan URL Modul Data Terbuka"
msgid "Download OSM data corresponding to the current data set."
-msgstr ""
+msgstr "Download data OSM sesuai dengan set data saat ini."
msgid "Diff"
-msgstr ""
+msgstr "Diff"
msgid "Perform diff between current data set and existing OSM data."
-msgstr ""
+msgstr "Lakukan perbedaan antara set data saat ini dan data OSM yang ada."
msgid "Open tools menu for this data."
msgstr "Buka menu tools untuk data ini."
msgid "Open the OpenData window."
-msgstr ""
+msgstr "Buka jendela OpenData"
msgid "Raw data"
msgstr "Data mentah"
@@ -23969,6 +25967,9 @@ msgid ""
"Terms and Conditions of Use of each portal<br/>before any upload of data "
"loaded by this plugin."
msgstr ""
+"Sebuah alat khusus untuk menghandle portal Open Data<br/><br/>Harap baca "
+"Syarat dan Ketentuan Penggunaan dari setiap portal<br/>sebelum setiap "
+"pengunggahan dari data dimuat pada plugin ini."
msgid "General settings"
msgstr "Pengaturan umum"
@@ -23981,10 +25982,10 @@ msgstr ""
"menggantinya dengan tags/label standar OSM)"
msgid "Overpass API server:"
-msgstr ""
+msgstr "Jembatan server API:"
msgid "Overpass API server used to download OSM data"
-msgstr ""
+msgstr "Jembatan server API digunakan untuk mendownload data OSM"
msgid "XAPI server:"
msgstr "Server XAPI:"
@@ -23992,6 +25993,8 @@ msgstr "Server XAPI:"
msgid ""
"XAPI server used to download OSM data when Overpass API is not available"
msgstr ""
+"server XAPI digunakan untuk download data OSM ketika Overpass API tidak "
+"tersedia"
msgid "Download modules"
msgstr "Unduh modul"
@@ -24015,6 +26018,9 @@ msgstr "Mengunduh data..."
msgid "File to load"
msgstr "Berkas yang akan dimuat"
+msgid "Reading 7Zip file..."
+msgstr "Membaca berkas 7Zipn"
+
msgid "Reading Zip file..."
msgstr "Membaca berkas Zip..."
@@ -24027,9 +26033,26 @@ msgid ""
"perform a non-precise transformation (<b>with location errors up to 1 "
"km</b>) ?<br/><br/>If so, <b>do NOT upload</b> such data to OSM !"
msgstr ""
+"JOSM tidak dapat menemukan transformasi matematik yang jelas antara \"{0}\" "
+"dan WGS83.<br /><br /> Apakah anda ingin mencoba metode <i>lenient</i>, yang "
+"akan menampilkan transformasi tidak akurat (<b>dengan lokasi eror sampai 1km "
+"</b>)?<br/> <br/> Jika iya, <b>JANGAN upload</> data ke dalam OSM!"
msgid "Try lenient method"
+msgstr "Coba metode lunak"
+
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
msgstr ""
+"Tidak bisa mendeteksi Sistem Referensi Koordinat.\n"
+"Apakah anda ingin kembali ke ESPG:4326 (WGS 84) ?"
+
+msgid "Warning: CRS not found"
+msgstr "Peringatan: CRS tidak ditemukan"
+
+msgid "Unable to detect CRS !"
+msgstr "Tidak bisa mendeteksi CRS !"
msgid "Unable to find a data store for file {0}"
msgstr "Tidak dapat menemukan simpanan data dari berkas {0}"
@@ -24042,6 +26065,8 @@ msgstr "Tidak ditemukan koordinat yang benar"
msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
msgstr ""
+"Berkas salah. Panjan yang salah pada garis {0}. Ekspetasi {1} kolom, "
+"mendapat {2}."
msgid "View OSM Wiki page"
msgstr "Lihat halaman Wiki OSM"
@@ -24050,16 +26075,17 @@ msgid "Launch browser to the OSM Wiki page of the selected data set"
msgstr "Jalankan browser ke halaman Wiki OSM dari kumpulan data yang dipilih"
msgid "View Local Portal page"
-msgstr ""
+msgstr "Lihat halaman Portal Lokal"
msgid "Launch browser to the local portal page of the selected data set"
-msgstr ""
+msgstr "Jalankan browser ke portal lokal dari kumpulan data yang dipilih"
msgid "View National Portal page"
-msgstr ""
+msgstr "Lihat halaman portal nasional"
msgid "Launch browser to the national portal page of the selected data set"
msgstr ""
+"Menjalankan browser ke halaman portal nasional dari dataset yang dipilih"
msgid "View License"
msgstr "Lihat Lisensi"
@@ -24068,10 +26094,11 @@ msgid "Launch browser to the license page of the selected data set"
msgstr "Jalankan browser ke halaman lisensi dari kumpulan data yang dipilih"
msgid "View License (summary)"
-msgstr ""
+msgstr "Lihat lisensi (ringkasan)"
msgid "Launch browser to the summary license page of the selected data set"
msgstr ""
+"Jalankan browser ke halaman ringkasan lisensi dari kumpulan data yang dipilih"
msgid "View the license of the selected data set"
msgstr "Lihat lisensi dari kumpulan data yang dipilih"
@@ -24080,11 +26107,15 @@ msgid ""
"Warning: Cannot download module ''{0}''. Its download link is not known. "
"Skipping download."
msgstr ""
+"Peringatan: Tidak dapat mengunduh modul ''{0}''. Tautan untuk mengunduh "
+"tersebut tidak diketahui. Lewati pengunduhan."
msgid ""
"Warning: Cannot download module ''{0}''. Its download link ''{1}'' is not a "
"valid URL. Skipping download."
msgstr ""
+"Peringatan: Tidak dapat mengunduh modul ''{0}''. Tautan ''{1}'' untuk "
+"mengunduh bukan URL yang benar . Lewati pengunduhan."
msgid "Downloading Module {0}..."
msgstr "Mengunduh modul {0}..."
@@ -24132,7 +26163,7 @@ msgid "Loading modules ..."
msgstr "Memuat modul ..."
msgid "Checking module preconditions..."
-msgstr ""
+msgstr "Memeriksa prasyarat modul..."
msgid "Loading module ''{0}''..."
msgstr "Memuat modul ''{0}''..."
@@ -24181,32 +26212,36 @@ msgid ""
"Warning: failed to install module ''{0}'' from temporary download file "
"''{1}''. Renaming failed."
msgstr ""
+"Peringatan: gagal untuk menginstall modul ''{0}'' dari file yang diunduh "
+"sementara ''{1}''. Penamaan kembali gagal."
msgid ""
"Do not ask again and remember my decision (go to Preferences->Modules to "
"change it later)"
msgstr ""
+"Jangan ditanya kembali dan ingat keputusan saya (pergi ke Pengaturan->Modul "
+"untuk merubahnya nanti)"
msgid "The module file ''{0}'' does not include a Manifest."
-msgstr ""
+msgstr "File modul ''{0}'' tidak termasuk ke Manifest."
msgid "Invalid URL ''{0}'' in module {1}"
msgstr "Invalid URL ''{0}'' pada modul {1}"
msgid "<b>Module provided by an external source:</b> {0}"
-msgstr ""
+msgstr "<b>Modul yang disediakan oleh sumber eksternal:</b> {0}"
msgid "Failed to create module information from manifest for module ''{0}''"
-msgstr ""
+msgstr "Gagal untuk membuat informasi modul yang jelas dari modul ''{0}''"
msgid "Illegal entry in module list."
-msgstr ""
+msgstr "Ilegal entri pada daftar modul."
msgid "Reading local module information.."
-msgstr ""
+msgstr "Membaca informasi modul lokal.."
msgid "Processing module site cache files..."
-msgstr ""
+msgstr "Memproses file modul situs sementara..."
msgid ""
"Warning: Failed to scan file ''{0}'' for module information. Skipping."
@@ -24215,7 +26250,7 @@ msgstr ""
"Lewati."
msgid "Processing module site cache icon files..."
-msgstr ""
+msgstr "Modul memproses situs memori sementara file icon..."
msgid "Processing module files..."
msgstr "memproses berkas modul"
@@ -24230,23 +26265,27 @@ msgid ""
"Warning: failed to create module directory ''{0}''. Cannot cache module list "
"from module site ''{1}''."
msgstr ""
+"Peringatan: gagal untuk membuat direktori modul ''{0}''. Tidak bisa daftar "
+"modul memori sementara dari situs modul ''{1}''."
msgid "Writing module list to local cache ''{0}''"
-msgstr ""
+msgstr "Menulis daftar modul ke lokal memori sementara ''{0}''"
msgid "Parsing module list from site ''{0}''"
-msgstr ""
+msgstr "Daftar modul pengurai dari situs \"{0}\""
msgid ""
"Failed to parse module list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
+"Gagal untuk mengurai daftar dokumen modul dari situs \"{0}\". Melewati "
+"situs. Pengecualan {1}"
msgid "Processing module list from site ''{0}''"
msgstr "Memproses daftar modul dari situs ''{0}''"
msgid "OpenStreetBugs download loop"
-msgstr ""
+msgstr "OpenStreetBugs download loop"
msgid "Displays OpenStreetBugs issues"
msgstr "Tampilkan isu OpenStreetBugs"
@@ -24278,15 +26317,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Kesalahan muncul: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Tidak dapat membuat bug baru. Hasil: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Header mengandung beberapa nilai dan tidak dapat dipetakan kedalam satu "
-"string"
-
msgid "Process queue"
msgstr "Antrian proses"
@@ -24343,20 +26373,8 @@ msgstr ""
msgid "Close: "
msgstr "Tutup: "
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr "Buat: "
-
msgid "Open in browser"
-msgstr ""
+msgstr "Buka di browser"
msgid "No item selected"
msgstr "Tidak ada item yang dipilih"
@@ -24368,13 +26386,13 @@ msgid "Please enter a user name"
msgstr "Harap masukkan nama pengguna"
msgid "Unknown issue state"
-msgstr ""
+msgstr "State masalah tidak diketahui"
msgid "Switch to online mode"
-msgstr ""
+msgstr "Beralih ke mode online"
msgid "Switch to offline mode"
-msgstr ""
+msgstr "Beralih ke mode offline"
msgid ""
"You have unsaved changes in your queue. Do you want to submit them now?"
@@ -24386,13 +26404,13 @@ msgid "OpenStreetBugs"
msgstr "OpenStreetBugs"
msgid "Open Visible..."
-msgstr ""
+msgstr "Buka yang terlihat..."
msgid "Open only files that are visible in current view."
msgstr "Membuka hanya berkas yang terlihat dalam tampilan saat ini."
msgid "No view open - cannot determine boundaries!"
-msgstr ""
+msgstr "Tidak ada tampilan yang terbuka - tidak dapat menentukan batasan!"
msgid "Unknown file extension: {0}"
msgstr "Ekstensi berkas tidak diketahui: {0}"
@@ -24416,11 +26434,14 @@ msgstr "Firefox executable"
msgid "OSM Server Files pbf compressed"
msgstr "Berkas server OSM pbf dikompresi"
+msgid "Download PBF"
+msgstr "Download PBF"
+
msgid "Invalid changeset id: {0}"
msgstr "Invalid id set perubahan: {0}"
msgid "Invalid timestamp: {0}"
-msgstr ""
+msgstr "Timestamp salah: {0}"
msgid "Invalid DenseNodes key/values table"
msgstr "Tabel kunci/nilai DenseNode tidak valid"
@@ -24447,7 +26468,7 @@ msgid "Finished"
msgstr "Sudah selesai"
msgid "Prefs"
-msgstr ""
+msgstr "Pengaturan"
msgid "Load file..."
msgstr "memuat berkas"
@@ -24600,7 +26621,7 @@ msgid "Building JOSM layer"
msgstr "Membuat layer JOSM"
msgid "Postprocessing layer"
-msgstr ""
+msgstr "Layer postproses"
msgid "Saving to file."
msgstr "Menyimpan ke berkas."
@@ -24623,9 +26644,6 @@ msgstr "Impor berkas PDF"
msgid "Import PDF"
msgstr "Impor PDF"
-msgid "Import PDf file"
-msgstr "Impor PDF"
-
msgid " {0} objects so far"
msgstr " {0} objek terlalu jauh"
@@ -24705,8 +26723,26 @@ msgstr "Tes gagal: Tdiak dapaat membaca mtime"
msgid "Test failed: Could not write mtime."
msgstr "Tes gagal: Tidak dapat menulis mtime"
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Apakah anda ingin menyimpan kalibrasi saat ini dari layer {0}?"
@@ -24730,10 +26766,10 @@ msgid "Reset Calibration"
msgstr "Pengalibrasian pengaturan ulang"
msgid "Reset calibration"
-msgstr ""
+msgstr "Mengatur ulang kalibrasi"
msgid "Calibration reset"
-msgstr ""
+msgstr "Mengulang kalibrasi"
msgid "Save Picture Calibration..."
msgstr "Simpan Kalibrasi Gambar..."
@@ -24777,7 +26813,7 @@ msgid "PicLayer rotate"
msgstr "PicLayer rotasi"
msgid "Rotated"
-msgstr ""
+msgstr "Diputar"
msgid "Drag to rotate the picture"
msgstr "Geser untuk memutar gambar"
@@ -24819,7 +26855,7 @@ msgid "Drag to shear the picture"
msgstr "Geser untuk memotong gambar"
msgid "PicLayer Move point"
-msgstr ""
+msgstr "Piclayer Titik gerak"
msgid "Point added/moved"
msgstr "Titik ditambahkan/digerakkan"
@@ -24837,10 +26873,10 @@ msgid "Remove point on the picture"
msgstr "Hapus titik dari gambar"
msgid "PicLayer Transform point"
-msgstr ""
+msgstr "Titik ubah PicLayer"
msgid "Point transformed"
-msgstr ""
+msgstr "poin ditransformasikan"
msgid "Transform point on the picture"
msgstr "Ubah titik pada gambar"
@@ -24863,6 +26899,9 @@ msgstr "Tidak ada di clipboard"
msgid "The clipboard data is not an image"
msgstr "Data clipboard bukan merupakan gambar"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Peringatan: Gagal menangani berkas zip \"{0}\". Pengecualian: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
"Berkas kalibrasi diasosiasikan ke dalam berkas gambar yang ditemukan\" {0}\n"
@@ -24887,6 +26926,9 @@ msgstr ""
"Juga, mulai dari sekarang, berkas kalibrasi akan selalu dimuat secara "
"otomatis"
+msgid "Download Osmosis poly"
+msgstr "Download Osmosis poly"
+
msgid "Reading polygon filter file..."
msgstr "Membaca berkas filter poligon"
@@ -24912,7 +26954,7 @@ msgid "{0} points were outside world bounds and were moved"
msgstr "{0} titik terdapat diluar batas dunia dan dipindahkan"
msgid "Osmosis polygon filter files"
-msgstr ""
+msgstr "Osmosis poligon file penyaringan"
msgid "Print..."
msgstr "Cetak..."
@@ -24951,7 +26993,7 @@ msgid "Zoom To Page"
msgstr "Perbesar ke halaman"
msgid "Zoom To Actual Size"
-msgstr "Perbesar ke ukuran aktual"
+msgstr "Perbesar ke Ukuran Aktual"
msgid "Print"
msgstr "Cetak"
@@ -25021,7 +27063,7 @@ msgid "The GTFS file was empty."
msgstr "Berkas GTFS telah kosong"
msgid "light_rail"
-msgstr ""
+msgstr "lampu_rel"
msgid "Create Stops from GTFS"
msgstr "Buat pemberhentian dari GTFS"
@@ -25048,13 +27090,13 @@ msgid "seconds"
msgstr "detik"
msgid "Move Threshold"
-msgstr ""
+msgstr "Ambang pergerakan"
msgid "meters"
msgstr "meter"
msgid "Suggest Stops"
-msgstr ""
+msgstr "Saran Pemberhentian"
msgid "Find"
msgstr "Cari"
@@ -25129,13 +27171,13 @@ msgid "Meta"
msgstr "Meta"
msgid "Existing route patterns:"
-msgstr ""
+msgstr "Pola rute yang ada:"
msgid "Reflect"
msgstr "memantulkan"
msgid "Required tags:"
-msgstr ""
+msgstr "Tag yang dibutuhkan:"
msgid "Common tags:"
msgstr "Tag yang umum digunakan:"
@@ -25150,7 +27192,7 @@ msgid "Name/Id"
msgstr "Nama/Id"
msgid "Ref"
-msgstr ""
+msgstr "Referensi"
msgid "Stops are possible on the"
msgstr "Pemberhentian dimungkinkan pada"
@@ -25182,9 +27224,6 @@ msgstr "File GPX tidak memiliki trek ataupun waypoint"
msgid "Create Stops from GPX"
msgstr "Membuat pemberhentian dari GPX"
-msgid "Tracks"
-msgstr "Trek"
-
msgid "Tracks in this GPX file:"
msgstr "Trek pada file GPX ini:"
@@ -25214,7 +27253,7 @@ msgid "Public Transport: Delete track stop"
msgstr "Transportasi Umum: Hapus trek berhenti"
msgid "Public Transport: Detach track stop list"
-msgstr ""
+msgstr "Transportasi Publik: Melepas daftar berhenti trek"
msgid "Public Transport: Edit track stop list"
msgstr "Transportasi umum: Edit daftar trek berhenti"
@@ -25255,9 +27294,6 @@ msgstr "Tentukan peran"
msgid "Change relation member roles to {0}"
msgstr "Ubah peran anggota relasi ke {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Ubah pengaturan pembuatan multipoligon"
-
msgid "Create administrative boundary relations"
msgstr "Membuat relasi batas administratif"
@@ -25271,7 +27307,7 @@ msgid "When moving tags, consider even non-repeating ones"
msgstr "Ketika mengganti tags, pertimbangkan yang tidak berulang"
msgid "Always split ways of neighbouring multipolygons"
-msgstr "Selalu memotong way/garis dari multipolygon yang berdekatan"
+msgstr "Selalu memisahkan garis/way dari multipolygon yang berdekatan"
msgid "Change role"
msgstr "Ubah peran"
@@ -25384,9 +27420,6 @@ msgstr "Node/titik tanpa peran \"label\" atau \"admin_centre\" ditemukan"
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Way/garis tanpa peran \"inner\" atau \"outer\" ditemukan"
-msgid "Restart JOSM"
-msgstr "Memulai kembali JOSM"
-
msgid "Revert changeset fully"
msgstr "Kembalikan changeset semuanya"
@@ -25404,9 +27437,12 @@ msgid "Revert"
msgstr "Kembali"
msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "Masukkan ID dari set perubahan yang harus dikembalikan"
msgid "Reverted changeset"
+msgstr "Perubahan yang telah dikembalikan"
+
+msgid "It is not allowed to revert changeset from {0}"
msgstr ""
msgid "Missing merge target for {0} with id {1}"
@@ -25416,7 +27452,7 @@ msgid "Objects history"
msgstr "Sejarah objek"
msgid "History reverter"
-msgstr ""
+msgstr "Sejarah kembali"
msgid "Preparing history data..."
msgstr "menyiapkan sejarah data"
@@ -25444,32 +27480,55 @@ msgstr "Mengambil primitif yang hilang"
msgid "Downloading changeset"
msgstr "Mengunduh set perubahan"
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr "Mengembalikan perubahan #{0}"
-msgid "Road Sign Plugin"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
+"Peringatan: tidak mendukung start elemen ''{0}'' pada isi set perubahan "
+"posisi ({1},{2}). Dilewati."
-msgid "signs"
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
+"Peringatan: tidak mendukung elemen akhir ''{0}'' pada isi set perubahan di "
+"posisi ({1},{2}). Dilewati."
+
+msgid "Road Sign Plugin"
+msgstr "Plugin Petanda Jalan"
+
+msgid "signs"
+msgstr "tanda"
+
+msgid "Change Properties"
+msgstr "Ubah properti"
msgid "Country preset:"
-msgstr ""
+msgstr "Preset negara:"
msgid "Show all signs"
-msgstr ""
+msgstr "Tampilkan semua tanda"
msgid "Show a selection of the most useful signs"
-msgstr ""
+msgstr "Tampilkan pilihan dari plugin yang paling berguna"
+
+msgid "Spain"
+msgstr "Spanyol"
msgid "Germany"
-msgstr ""
+msgstr "Jerman"
msgid "Poland"
-msgstr ""
+msgstr "Polandia"
msgid "Slovakia"
-msgstr ""
+msgstr "Slovakia"
msgid "Roadsign tagging"
msgstr "Pelabelan rambu lalu lintas"
@@ -25481,7 +27540,7 @@ msgid "Roadsigns plugin: open dialog"
msgstr "Plugin rambu lalu lintas: membuka dialog"
msgid "custom"
-msgstr ""
+msgstr "pilihan"
msgid "Could not read tagging preset source: ''{0}''"
msgstr "Tidak dapat membaca sumber tagging preset: \"{0}\""
@@ -25564,9 +27623,6 @@ msgstr "Pengaturan Plugin Rute"
msgid "Configure routing preferences."
msgstr "Atur Pengaturan Rute"
-msgid "Highway type"
-msgstr "Jenis jalan"
-
msgid "Speed (Km/h)"
msgstr "Kecepatan (Km/jam)"
@@ -25694,6 +27750,9 @@ msgstr "Siman informasi penyimpanan data terpisah saat ini kedalam berkas"
msgid "Save SDS file"
msgstr "Simpan file SDS"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Tidak dapat membuat cadangan file. Pengecualian adalah: {0}"
+
msgid "Simplify Area"
msgstr "Sederhanakan area"
@@ -25767,19 +27826,19 @@ msgstr "Faktor jarak"
msgid "Merge Nearby Nodes Threshold"
msgstr "Menggabungkan ambang batas Node/titik terdekat"
-msgid "Online Help"
-msgstr "Bantuan Online"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
-msgid "Load"
-msgstr "Memuat"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "Tak terlihat"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25924,6 +27983,9 @@ msgstr "Hapus outline way/garis"
msgid "Street name: "
msgstr "Nama jalan: "
+msgid "Building: "
+msgstr "Bangunan: "
+
msgid "Even/Odd"
msgstr "Ganjil/Genap"
@@ -25949,22 +28011,22 @@ msgid "{0} is not a number"
msgstr "{0} bukan sebuah angka"
msgid "Reverse a terrace"
-msgstr ""
+msgstr "Membalikkan teras"
msgid "Reverses house numbers on a terrace."
-msgstr ""
+msgstr "Membalikkan nomor rumah pada teras"
msgid "Reverse a Terrace"
-msgstr ""
+msgstr "Membalikan sebuah Teras"
msgid "Cannot reverse!"
-msgstr ""
+msgstr "Tidak bisa dibalik!"
msgid "Reverse Terrace"
-msgstr ""
+msgstr "Membalik Teras"
msgid "Terrace a building"
-msgstr ""
+msgstr "Menggambar bangunan"
msgid "Creates individual buildings from a long building."
msgstr "Buat bangunan individu dari sebuah bangunan yang panjang"
@@ -25977,9 +28039,12 @@ msgid ""
"select a street for the addr:street tag and a node to mark the start of "
"numbering.)"
msgstr ""
+"Pilih satu, garis tertutup dengan empat titik. (Secara opsional, anda juga "
+"dapat memilih jalan untuk tag addr:street dan titik untuk menandakan "
+"pemberian nomor dimulai.)"
msgid "Terrace"
-msgstr ""
+msgstr "Terrace"
msgid "Browse"
msgstr "Telusuri"
@@ -25991,12 +28056,101 @@ msgid "Merge objects nodes"
msgstr "Gabungkan objek node/titik"
msgid "Tracer"
-msgstr ""
+msgstr "Tracer"
msgid "Tracer."
-msgstr ""
+msgstr "Tracer."
msgid "Tracer building"
+msgstr "Tracer bangunan"
+
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
msgstr ""
msgid "GPG"
@@ -26006,16 +28160,13 @@ msgid "Export sigs..."
msgstr "Eksport sigs..."
msgid "Export all signatures to XML file."
-msgstr ""
+msgstr "Export semua tanda tangan ke file XML."
msgid "Export sigs to XML..."
-msgstr ""
+msgstr "Eksport tanda tangan ke XML..."
msgid "Save Signatures file"
-msgstr ""
-
-msgid "Download OSM"
-msgstr "Unduh data OSM"
+msgstr "Simpan File Tanda Tangan"
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
@@ -26026,7 +28177,7 @@ msgid "Download referenced osm objects..."
msgstr "Unduh referensi objek-objek OSM"
msgid "{0} Signatures loaded. All referenced OSM objects found."
-msgstr ""
+msgstr "{0} memuat tanda tangan. Semua referensi menemukan objek OSM."
msgid ""
"{0} of {1} OSM objects are referenced but not there.\n"
@@ -26039,12 +28190,19 @@ msgid "Load objects from server"
msgstr "Muat objek dari server"
msgid "Download signed data"
+msgstr "Download data yang telah masuk"
+
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
+"Peringatan: Abaikan pengecualian karena task telah dibatalkan. Pengecualian: "
+"{0}"
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
msgstr ""
+"Membuat Keypair baru.\n"
+"Mengumpulkan secara acak..."
msgid "UID"
msgstr "UID"
@@ -26056,31 +28214,33 @@ msgid "OSM-Info"
msgstr "info-OSM"
msgid "Signed"
-msgstr ""
+msgstr "Disetujui"
msgid "Unknown"
msgstr "Tidak dikenal"
msgid "Object signatures"
-msgstr ""
+msgstr "Objek penandatanganan"
msgid "Open object signing window."
-msgstr ""
+msgstr "Buka jendela objek yang akan masuk"
msgid "Check"
msgstr "Centang"
msgid "Check all available signatures for selected object."
-msgstr ""
+msgstr "Periksa semua penandatanganan yang tersedia untuk objek dipilih."
msgid "Sign"
msgstr "Tanda"
msgid "Digital sign selected Tags, if you believe they are correct."
msgstr ""
+"Tanda digital tag/label yang dipilih, jika Anda percaya bahwa tanda-tanda "
+"tersebut benar."
msgid "Show all available signatures for selected attribute."
-msgstr ""
+msgstr "Tunjukkan semua penandatanganan untuk atribut yang dipilih."
msgid "Show deleted tags and notes if they were signed before"
msgstr ""
@@ -26118,16 +28278,16 @@ msgid "Signed key value pair was: {0}={1}"
msgstr "Pasangan key value terdaftar: {0}={1}"
msgid "{0} Signatures found."
-msgstr ""
+msgstr "{0} Penandatanganan ditemukan."
msgid "Signature Info"
msgstr "Informasi penandatanganan"
msgid "Sorry, there are no Signatures for the selected Node."
-msgstr ""
+msgstr "Maaf, tidak ada penandatangan untuk titik/node yang dipilih"
msgid "No Signature found"
-msgstr ""
+msgstr "Tidak ada penandatanganan ditemukan"
msgid ""
"Selected node was:\n"
@@ -26153,10 +28313,10 @@ msgid "Selected WaySegment was:"
msgstr "Segmen way/garis yang dipilih adalah:"
msgid "Signature Files"
-msgstr ""
+msgstr "File penandatanganan"
msgid "OSM Signature Files"
-msgstr ""
+msgstr "File OSM penandatanganan"
msgid "Only digits allowed in osmid: ''{0}''."
msgstr "Hanya digit yang dibolekan di osmid: \"{0}\""
@@ -26168,19 +28328,19 @@ msgid "Prepare stuff..."
msgstr "Persiapkan barang"
msgid "Parsing Signature data..."
-msgstr ""
+msgstr "Mengurai data Signature..."
msgid "The Signature is broken!"
-msgstr ""
+msgstr "Penandatanganan mengalami kerusakan!"
msgid "Manipulation Warning"
msgstr "Manipulasi peringatan"
msgid "Select a signing key from your keyring-file:"
-msgstr ""
+msgstr "Pilih kunci penandatanganan dari file-keyring Anda:"
msgid "Don''t ask again for the key"
-msgstr ""
+msgstr "Jangan tanya lagi untuk key"
msgid "Use a random key from this list"
msgstr "Gunakan kunci secara acak dari daftar"
@@ -26189,7 +28349,7 @@ msgid "Create new Key"
msgstr "Buat kunci baru"
msgid "Select a Key to sign"
-msgstr ""
+msgstr "Pilih sebuah Key untuk masuk"
msgid ""
"The object with the ID \"{0}\" ({1}) is newly created.\n"
@@ -26206,9 +28366,6 @@ msgstr "Gagal masuk!"
msgid "Please give a tolerance in meters"
msgstr "Beri toleransi dalam meter"
-msgid "Accuracy"
-msgstr "Akurasi"
-
msgid "Select as much as you like:"
msgstr "Pilih sebanyak mungkin yang Anda inginkan:"
@@ -26219,7 +28376,7 @@ msgid "Aerial Photography"
msgstr "Foto udara"
msgid "Web Recherche"
-msgstr ""
+msgstr "Web Recherche"
msgid "Trusted persons told me"
msgstr "Orang terpercaya yang berkata kepada saya"
@@ -26234,7 +28391,7 @@ msgid "Primary user-ID: "
msgstr "ID pengguna utama: "
msgid "Key-ID: "
-msgstr "ID kunci "
+msgstr "Key-ID: "
msgid "Fingerprint: "
msgstr "Sidik jari "
@@ -26916,8 +29073,11 @@ msgstr "Batalkan menghapus objek"
msgid "Undelete object by id"
msgstr "Batalkan menghapus objek berdasarkan id"
-msgid "Select if the data should be added into a new layer"
-msgstr "Pilih jika data harus ditambahkan kedalam layer baru"
+msgid "Undelete Object"
+msgstr "Batalkan menghapus objek"
+
+msgid "Undelete object"
+msgstr "Batalkan menghapus objek"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -26926,11 +29086,8 @@ msgstr ""
"Masukkan tipe dan ID dari objeknya yang harus dibatalkan menghapusnya, e.g., "
"\"n1 w2\""
-msgid "Undelete Object"
-msgstr "Batalkan menghapus objek"
-
-msgid "Undelete object"
-msgstr "Batalkan menghapus objek"
+msgid "Select if the data should be added into a new layer"
+msgstr "Pilih jika data harus ditambahkan kedalam layer baru"
msgid "Start undeleting"
msgstr "Memulai batalkan menghapus"
@@ -26938,18 +29095,6 @@ msgstr "Memulai batalkan menghapus"
msgid "Close dialog and cancel"
msgstr "Tutup dialog dan batalkan"
-msgid "Will get {0}"
-msgstr "akan mendapat {0}"
-
-msgid "Looking for {0}"
-msgstr "mencari {0}"
-
-msgid "Found {0}"
-msgstr "Menemukan {0}"
-
-msgid "More tools"
-msgstr "Lebih banyak alat"
-
msgid "Add nodes at intersections"
msgstr "Tambah node/titik di persimpangan"
@@ -26998,15 +29143,6 @@ msgid ""
msgstr ""
"Tempel kelompok relasi dari objek di dalam buffer kedalam objek yang dipilih"
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Pisah objek"
@@ -27027,7 +29163,7 @@ msgid ""
"The selected way is not a split way, please select split points or split way "
"too."
msgstr ""
-"Way/garis yang dipilih bukan merupakan way/garis yang dipisah, harap pilih "
+"Garis/Way yang dipilih bukan merupakan garis/way yang dipisah, harap pilih "
"titik pemisah atau way/garis yang dipisah juga"
msgid "The selected nodes can not be consecutive nodes in the object."
@@ -27085,7 +29221,7 @@ msgid "Unglued Relations"
msgstr "Pisahkan Relasi"
msgid "Change relation member for {0} {1}"
-msgstr ""
+msgstr "Ubah anggota relasi untuk {0} {1}"
msgid "Circle arc"
msgstr "Garis lingkaran"
@@ -27143,18 +29279,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Konfigurasi URL anda sendiri"
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Alat lintang dan bujur"
@@ -27355,7 +29479,7 @@ msgid "Select last modified ways"
msgstr "Pilih way/garis yang terakhir di modifikasi"
msgid "Select Way Nodes"
-msgstr "Pilih node/titik dari way/garis"
+msgstr "Pilih titik dari garis"
msgid "Select all nodes of a selected way."
msgstr "Pilih semua node/titik dari garis yang dipilih"
@@ -27373,9 +29497,6 @@ msgstr "Membatalkan pilihan node/titik"
msgid "Removes all nodes from selection"
msgstr "Hilangkan semua titik dari semua objek yang terpilih"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Import Video"
@@ -27474,6 +29595,9 @@ msgid ""
"correctly installed on your system. Its architecture (32/64 bits) must also "
"be the same as the JRE that runs JOSM."
msgstr ""
+"VLC library tidak terinisialisasikan dengan benar. Harap cek VLC {0} sudah "
+"terinstal dengan benar pada sistem anda. Arsitektur (32/64bit) ini harus "
+"sama dengan JRE yang menjalankan JOSM."
msgid "Jump to"
msgstr "pergi ke"
@@ -27502,8 +29626,8 @@ msgstr "putaran"
msgid "mute"
msgstr "tanpa suara"
-msgid "Scanned Map..."
-msgstr "Peta yang telah discan"
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -27525,9 +29649,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers layer ({0}) dalam perbesaran {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Mengunduh way/garis"
@@ -27604,16 +29725,20 @@ msgid "Select non-branching sequences of ways"
msgstr "Pilih rangkaian way/garis yang tidak bercabang"
msgid "Add names from Wikipedia"
-msgstr ""
+msgstr "Menambahkan nama dari Wikipedia"
msgid ""
"Fetches interwiki links from Wikipedia in order to add several name tags"
msgstr ""
+"Mengambil tautan didalam wiki dari Wikipedia untuk menambahkan beberapa tag "
+"nama."
msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
"coordinates of the first selected node"
msgstr ""
+"Menyalin contoh {0} kedalam clipboard sistem yang sesuai dengan koordinat "
+"dari node yang terpilih pertama kali"
msgid "Copy {0} template"
msgstr "Salin template {0}"
@@ -27625,6 +29750,7 @@ msgid ""
"Double click on item to search for object with article name (and center "
"coordinate)"
msgstr ""
+"Klik dua kali pada item untuk mencari objek dengan nama(dan koordinat pusat)"
msgid "Available via WIWOSM server"
msgstr "Tersedia melalui server WIWOSM"
@@ -27645,7 +29771,7 @@ msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr "mengambil semua koordinat dari wikipedia dalam pandangan saat ini"
msgid "coordinates"
-msgstr ""
+msgstr "koordinat"
msgid "Category"
msgstr "Kategori"
@@ -27657,13 +29783,13 @@ msgid "Enter the Wikipedia category"
msgstr "Memasukkan kategori wikipedia"
msgid "Clipboard"
-msgstr ""
+msgstr "Clipboard"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Menempel artikel Wikipedia dari sistem clipboard"
msgid "clipboard"
-msgstr ""
+msgstr "clipboard"
msgid "Open Article"
msgstr "Artikel Terbuka"
@@ -27677,9 +29803,6 @@ msgstr "Menetapkan bahasa standar untuk artikel Wikipedia"
msgid "Enter the Wikipedia language"
msgstr "Masukkan bahasa Wikipedia"
-msgid "Add Tag"
-msgstr "Tambahkan Tag (Label)"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 517f3e8..f1d1ad6 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 13:49+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur at pjetur.net>\n"
"Language-Team: Icelandic <is at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:45+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:45+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Um JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -202,6 +217,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -241,9 +259,6 @@ msgstr "Tól: {0}"
msgid "Please select at least four nodes."
msgstr "Veldu minnst fjóra hnúta"
-msgid "Information"
-msgstr "Upplýsingar"
-
msgid "Align Nodes in Line"
msgstr "Raða hnútum í línu"
@@ -268,6 +283,9 @@ msgstr "árekstri"
msgid "download"
msgstr "sækja"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -277,6 +295,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr "Ekkert er valið til að þysja að."
+msgid "Information"
+msgstr "Upplýsingar"
+
msgid "Zoom to {0}"
msgstr "Þysja að {0}"
@@ -333,11 +354,9 @@ msgstr ""
"haldist sér. Vilt þú skipta um átt sumra þeirra?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Gat ekki sameinað vegi: Einhverjir þeirra voru aðskildir en til að hægt sé "
-"að sameina þá þurfa þeir að vera ein samfelld röð af hnútum"
msgid "Combine {0} ways"
msgstr "Sameina {0} vegi"
@@ -392,18 +411,35 @@ msgstr "Fjarlægja"
msgid "Delete selected objects."
msgstr "Eyða völdum hlutum."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Dreifa hnútum jafnt"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Dreifa völdum hnútum á jöfnu millibili á línu."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Sækja frá OSM..."
msgid "Download map data from the OSM server."
msgstr "Sækja kortagögn frá OSM miðlaranum."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Sækja gögn"
+
msgid "Download object..."
msgstr "Sækja hlut..."
@@ -498,6 +534,9 @@ msgstr "Breytingaskrá"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Sýna breytingarskrá þessa hluts á OpenStreetMap vefnum"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -611,7 +650,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -761,8 +800,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Sameina valda hnúta á staðsetningu þess elsta."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -919,8 +958,8 @@ msgid "Download Data"
msgstr "Sækja gögn"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -947,12 +986,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -970,9 +1005,6 @@ msgstr "Hornrétta"
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1079,6 +1111,15 @@ msgstr "Endurnefna skránna líka"
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1130,9 +1171,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1196,6 +1234,9 @@ msgstr "Stöðuskýrsla"
msgid "Copy to clipboard and close"
msgstr "Afrita á klemmuborðið og loka"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Loka"
@@ -1278,13 +1319,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1373,6 +1414,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Afturkalla"
@@ -1397,9 +1459,6 @@ msgstr "Uppfæra gögn"
msgid "Updates the objects in the active data layer from the server."
msgstr "Uppfærir hluti í núverandi lagi frá þjóninum."
-msgid "Download data"
-msgstr "Sækja gögn"
-
msgid "Update modified"
msgstr ""
@@ -1595,6 +1654,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Háspennustaur"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Sæki GPS gögn"
@@ -1604,6 +1666,18 @@ msgstr "Sótt GPX gögn"
msgid "Markers from {0}"
msgstr "Punktar frá {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "Sækja OSM"
+
msgid "Downloading data"
msgstr "Sæki gögn"
@@ -1623,6 +1697,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Misræmi þegar gögn voru sótt"
+msgstr[1] "Misræmi þegar gögn voru sótt"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Sæki {0} af {1} ({2} eftir)"
@@ -1673,25 +1772,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Villur þegar gögn voru sótt"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Misræmi þegar gögn voru sótt"
-msgstr[1] "Misræmi þegar gögn voru sótt"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr "Villa þegar gögn voru sótt"
@@ -1834,6 +1914,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1858,8 +1941,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1875,6 +1958,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2281,6 +2367,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2441,13 +2530,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2458,6 +2547,9 @@ msgstr ""
"Óþekkt gerð hlutar „{0}“. Þekktar gerðir eru node, way og relation fyrir "
"hnút, veg og vensl"
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2476,8 +2568,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2563,6 +2654,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Breytti hnút {0}"
@@ -2599,10 +2693,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2625,8 +2719,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2733,6 +2827,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Snúa {0} hnút"
@@ -2793,8 +2890,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2824,10 +2921,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr "Ekki vista breytingar"
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2848,6 +2945,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2878,18 +2978,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2898,8 +2998,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2907,13 +3007,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2927,8 +3025,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2958,11 +3056,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "ÓÞEKKT"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3115,8 +3212,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3223,7 +3319,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3242,6 +3338,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3258,9 +3357,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3299,6 +3395,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Heimilisfang"
@@ -3323,6 +3422,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3382,13 +3490,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3458,6 +3566,24 @@ msgstr "Hnútur endurtekinn í vegi"
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr "Vegir"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Marghyrningur"
@@ -3527,6 +3653,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3584,13 +3716,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3622,10 +3754,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3759,7 +3891,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3834,6 +3966,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3864,9 +3999,6 @@ msgstr "bygging"
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3891,10 +4023,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3957,23 +4089,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4077,7 +4192,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr "Sæki skilaboð dagsins"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4275,9 +4390,24 @@ msgstr "Sýn"
msgid "Tools"
msgstr "Tól"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Val"
+
msgid "Presets"
msgstr "Forstillingar"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4293,10 +4423,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Hljóð"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4305,6 +4447,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4364,6 +4509,9 @@ msgstr "(enginn hlutur)"
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4391,19 +4539,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "Villa: Slökkt er á eigindum"
-
-msgid "true: the property is explicitly switched on"
-msgstr "Í lagi: Kveikt er á eigindum"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "Ekki sett: Ekki setja þessi eigindi á valda hluta"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4691,29 +4826,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4728,7 +4881,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4780,14 +4933,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5037,14 +5182,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5565,6 +5710,9 @@ msgstr "Sýna/Fela"
msgid "Information about layer"
msgstr "Upplýsingar um lag"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Teiknistíll korts"
@@ -5648,6 +5796,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Sláið inn auðkenni hlutarins sem á að sækja"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Vensl"
@@ -5669,9 +5844,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Vensl: {0}"
-msgid "Selection"
-msgstr "Val"
-
msgid "Open a selection list window."
msgstr "Opna vallistann."
@@ -5696,18 +5868,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Val: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5726,6 +5886,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Smelltu til að minnka/hámarka innihald stikunnar"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Höfundar"
@@ -5743,8 +5915,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr "Sýna notandasíðu þessa notanda á openstreetmap.org"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5770,9 +5941,6 @@ msgstr "Opna athugunarglugga."
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Þysja að vandamálinu"
-
msgid "Fix"
msgstr "Laga"
@@ -5917,9 +6085,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr "Sækja og sýna sögu valinna hluta"
@@ -6206,8 +6371,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6272,35 +6437,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Eigindi"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Eigindi valdra hluta."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<mismunandi>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Stak í"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "{0} eigindi & {1} vensl"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Eigindi & vensl"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Eyða völdum lykil í öllum völdum hlutum"
-msgid "Delete Properties"
-msgstr "Eyða eigindum"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Breyta venslum"
@@ -6314,13 +6491,13 @@ msgstr "Eyða valinu úr venslunum {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Bæta nýjum eigindum við valda hluti"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6399,12 +6576,6 @@ msgstr[1] "Breyta eigindum allt að {0} hluta"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6434,9 +6605,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6474,7 +6651,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6534,6 +6711,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6789,6 +6969,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Bókamerki"
@@ -6857,9 +7056,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr "Gagnalindir:"
@@ -6929,21 +7125,8 @@ msgstr ""
msgid "Download object"
msgstr "Sækja hlut"
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Sláið inn auðkenni hlutarins sem á að sækja"
+msgid "Start downloading"
+msgstr "Byrja að sækja gögn"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6953,23 +7136,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Byrja að sækja gögn"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7066,7 +7235,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7165,6 +7334,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7252,7 +7424,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7271,6 +7443,12 @@ msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7340,8 +7518,7 @@ msgid "Closing changeset {0}"
msgstr "Loka breytingarsetti {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7416,8 +7593,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7431,8 +7608,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7647,12 +7823,6 @@ msgstr "Hlaða upp þessari breytingu"
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7661,6 +7831,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7676,6 +7862,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Hætta við að hala upp og halda áfrám að breyta"
@@ -7683,8 +7884,8 @@ msgid "Tags of changeset {0}"
msgstr "Tögg á breytingarsetti #{0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7796,9 +7997,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7808,6 +8006,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7828,7 +8029,7 @@ msgstr "Veldu hluti til að hlaða upp"
msgid "Cancel uploading"
msgstr "Hætta við að hlaða upp"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7974,7 +8175,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8004,7 +8205,7 @@ msgstr "útgáfa {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8118,6 +8319,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8155,6 +8359,9 @@ msgstr "Hlaða reiti sem innihalda villur"
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8351,9 +8558,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8372,6 +8576,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8429,6 +8636,12 @@ msgstr "Næsta"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8495,9 +8708,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8510,8 +8720,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Sækja frá OSM eftir þessari slóð"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Sækja allt innan:"
@@ -8537,14 +8750,18 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
-msgstr "Reikna stærð svæðis sóttra gagna"
+msgid "Click to download"
+msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
msgstr ""
+msgid "Download from OSM along this track"
+msgstr "Sækja frá OSM eftir þessari slóð"
+
+msgid "Calculating Download Area"
+msgstr "Reikna stærð svæðis sóttra gagna"
+
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -8671,14 +8888,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8693,7 +8906,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8703,8 +8916,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8924,7 +9136,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8990,6 +9202,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9047,9 +9265,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9299,6 +9514,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"Athugið að stundum þarf að endurræsa JOSM til að stillingar taki gildi."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9427,6 +9645,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9469,6 +9693,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9520,19 +9747,10 @@ msgstr "Leita: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9550,40 +9768,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9607,6 +9834,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9663,6 +9923,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9716,6 +9979,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10001,7 +10269,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10170,6 +10444,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10233,7 +10513,7 @@ msgstr "Kortastillingar"
msgid "Settings for the map projection and data interpretation."
msgstr "Stillingar tengdar kortavörpun og gagnatúlkun."
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10493,40 +10773,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10579,8 +10859,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10589,20 +10869,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10684,14 +10969,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10735,32 +11014,37 @@ msgstr "Eyða völdum hlutum úr listanum yfir tögg"
msgid "Add a new tag"
msgstr "Bæta við nýju taggi"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Nota forstillinguna „{0}“"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Breyta {0} hlut"
+msgstr[1] "Breyta {0} hlutum"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Ekkert er valið!"
+
+msgid "Selection unsuitable!"
+msgstr "Val óhæfilegt!"
+
+msgid "Apply Preset"
+msgstr "Vista forstillingu"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "Frekari upplýsingar um þessa forstillingu"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -10768,6 +11052,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Frekari upplýsingar um þessa forstillingu"
+
msgid "Available roles"
msgstr ""
@@ -10783,57 +11070,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Valfrjáls eigind:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
-
-msgid "Use preset ''{0}''"
-msgstr "Nota forstillinguna „{0}“"
-
-msgid "Unknown type: {0}"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Breyta {0} hlut"
-msgstr[1] "Breyta {0} hlutum"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Ekkert er valið!"
+msgid "Unknown type: {0}"
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Val óhæfilegt!"
+msgid "Preset group {1} / {0}"
+msgstr ""
-msgid "Apply Preset"
-msgstr "Vista forstillingu"
+msgid "Preset group {0}"
+msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
-msgstr "Breyta eigindum"
+msgid "Preset role element without parent"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10851,6 +11140,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10882,6 +11179,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr "Villa: Slökkt er á eigindum"
+
+msgid "true: the property is explicitly switched on"
+msgstr "Í lagi: Kveikt er á eigindum"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "Ekki sett: Ekki setja þessi eigindi á valda hluta"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10912,7 +11252,7 @@ msgid "Contacting OSM Server..."
msgstr "Hef samband við OpenStreetMap miðlara..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10952,28 +11292,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11068,6 +11406,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11083,12 +11424,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11167,7 +11516,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11266,35 +11615,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11304,8 +11629,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11332,10 +11657,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11346,9 +11668,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11370,6 +11689,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11419,8 +11741,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11564,6 +11886,9 @@ msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11582,6 +11907,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11606,16 +11940,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11627,6 +11964,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11641,6 +11986,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11671,19 +12025,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11705,11 +12059,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11779,18 +12145,14 @@ msgid "Download skipped"
msgstr "Ekki sótt"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Aðvörun: get ekki sótt íforrit \"{0}\". Slóð að íforriti er ekki þekkt. - "
-"Ekki sótt."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Aðvörun: get ekki sótt íforrit \"{0}\". Slóð að íforriti ''{1}'' er ekki "
-"gild slóð. - Ekki sótt."
msgid "Failed to create plugin directory ''{0}''"
msgstr ""
@@ -11933,11 +12295,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "Aðvörun: gat ekki sótt upplýsingar um íforrit"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Gera viðbótina óvirka"
@@ -11951,27 +12313,22 @@ msgstr "Halda viðbótinni"
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Aðvörun: gat ekki sett inn sótt íforrit \"{0}\". Sleppi uppsetningu. JOSM "
-"mun nota eldri útgáfu íforritsins"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Aðvörun: gat ekki sett inn íforrit \"{0}\" frá tímabundinni skrá ''{1}''. "
-"Gat ekki endurnefnt skrá."
msgid "Click to disable the plugin ''{0}''"
msgstr ""
@@ -12039,8 +12396,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12055,9 +12411,24 @@ msgstr "Sæki lista íforrita..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Sæki lista íforrita frá ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12381,17 +12752,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12402,9 +12767,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12436,9 +12844,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12761,6 +13183,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12840,6 +13267,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12942,9 +13373,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13000,6 +13428,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13024,9 +13455,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13052,9 +13480,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13091,6 +13516,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13137,9 +13567,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Vegir"
-
msgid "Streets"
msgstr "Stræti"
@@ -13224,6 +13651,9 @@ msgstr "Upphækkun"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Tollur"
+
msgid "Motorway Link"
msgstr "Tengibraut á hraðbraut"
@@ -13314,6 +13744,50 @@ msgstr "Íbúðargata"
msgid "Edit Residential Street"
msgstr "Breyti íbúðargötu"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "já"
+
+msgid "no"
+msgstr "nei"
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Vistgata"
@@ -13332,11 +13806,11 @@ msgstr ""
msgid "Service"
msgstr "Þjónustuvegur"
-msgid "Edit Serviceway"
-msgstr "Breyta þjónustuveg"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Gerð þjónustuvegs"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "port"
@@ -13347,6 +13821,9 @@ msgstr "heimreið"
msgid "parking_aisle"
msgstr "bílastæðavegur"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Bílastæðavegur"
@@ -13374,18 +13851,12 @@ msgstr "hringtorg"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "já"
-
msgid "Road Restrictions"
msgstr "Vegtakmarkanir"
msgid "Edit Road Restrictions"
msgstr "Breyti vegtakmörkunum"
-msgid "Toll"
-msgstr "Tollur"
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13395,9 +13866,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13407,15 +13875,15 @@ msgstr "leyfður"
msgid "private"
msgstr "einkavegur"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "í landbúnaðarskyni"
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "nei"
-
msgid "official"
msgstr ""
@@ -13461,6 +13929,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Lámarkshraði (km/klst)"
@@ -13545,6 +14016,9 @@ msgstr "Breyti brú"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13649,21 +14123,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13679,10 +14162,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr "Breyti reiðstíg"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13718,7 +14201,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13787,12 +14270,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Neyðarsími"
+msgid "Drinking Water"
+msgstr "Drykkjarvatn"
msgid "Traffic Signal"
msgstr "Umferðarljós"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13808,15 +14297,6 @@ msgstr "eyja"
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13838,6 +14318,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13847,6 +14336,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Smáhringtorg"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Átt"
@@ -13856,10 +14348,7 @@ msgstr "réttsælis"
msgid "Pedestrian Crossing"
msgstr "Gangbraut"
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13892,9 +14381,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Beygjuhringur"
@@ -13928,30 +14414,57 @@ msgstr ""
msgid "Barriers"
msgstr "Tálmar"
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr "Leyfileg umferð:"
-msgid "Cycle Barrier"
+msgid "Material"
msgstr ""
-msgid "Block"
+msgid "stone"
msgstr ""
-msgid "Cattle Grid"
-msgstr "Rimlahlið"
-
+msgid "Bollard"
+msgstr ""
+
+msgid "Edit Bollard"
+msgstr ""
+
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "Cycle Barrier"
+msgstr ""
+
+msgid "Edit Cycle Barrier"
+msgstr ""
+
+msgid "Cattle Grid"
+msgstr "Rimlahlið"
+
msgid "Edit Cattle Grid"
msgstr "Breyti rimlahliði"
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13973,19 +14486,34 @@ msgstr "Breyti landamæraeftirliti"
msgid "Hedge"
msgstr "Limgerði"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13994,23 +14522,52 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Borgarveggur"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
-msgstr "Inngangur"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Breyti inngang"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Hlið"
@@ -14042,12 +14599,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14105,6 +14677,9 @@ msgstr "Frárennsli"
msgid "Edit Drain"
msgstr "Breyti frárennsli"
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14114,6 +14689,12 @@ msgstr "Lækur"
msgid "Edit Stream"
msgstr "Breyti læk"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Skipaskurður"
@@ -14153,9 +14734,6 @@ msgstr "Breyti stíflu"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14189,6 +14767,21 @@ msgstr ""
msgid "Edit Water"
msgstr "Breyti vatni"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Land"
@@ -14270,18 +14863,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "hjól"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14354,7 +14952,10 @@ msgstr ""
msgid "tourism"
msgstr "ferðamennska"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14378,10 +14979,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
-msgstr "Volt"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14393,9 +14997,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14438,18 +15039,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14549,11 +15188,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14565,11 +15202,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14588,12 +15223,12 @@ msgstr "slitlag"
msgid "underground"
msgstr ""
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Aðgangur"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14621,9 +15256,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14639,19 +15271,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Opnunartími"
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14801,6 +15449,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Volt"
+
msgid "Amperage"
msgstr ""
@@ -14822,6 +15473,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14849,6 +15506,12 @@ msgstr "Leiga"
msgid "Edit Car Rental"
msgstr "Breyti bílaleigu"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14873,22 +15536,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14910,9 +15557,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Föt"
@@ -14976,7 +15620,7 @@ msgstr "Breyti hjólaleigu"
msgid "Public Transport"
msgstr "Almenningssamgöngur"
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15107,6 +15751,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15137,6 +15784,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Bekkur"
@@ -15149,9 +15799,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15161,9 +15808,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Bygging"
@@ -15176,6 +15828,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15200,14 +15855,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr "UIC-Tilvísun"
@@ -15256,8 +15903,8 @@ msgstr ""
msgid "Taxi"
msgstr "Leigubílastöð"
-msgid "Edit Taxi station"
-msgstr "Breyti leigubílastöð"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Flugvöllur"
@@ -15310,6 +15957,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr ""
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -15332,21 +15994,6 @@ msgstr "Breyti hóteli"
msgid "Stars"
msgstr "Stjörnur"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr ""
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -15530,6 +16177,12 @@ msgstr "Næturklúbbur"
msgid "Edit Nightclub"
msgstr "Breyti næturklúbb"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Ferðamennska"
@@ -15551,9 +16204,15 @@ msgstr ""
msgid "Information Office"
msgstr "Upplýsingamiðstöð"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Kort"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15566,6 +16225,9 @@ msgstr "stræti"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15605,6 +16267,9 @@ msgstr ""
msgid "Information Board"
msgstr "Fræðsluskilti"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15626,22 +16291,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15665,9 +16342,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15692,7 +16366,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15765,49 +16448,43 @@ msgstr "Listaverk"
msgid "Edit Artwork"
msgstr "Breyti listaverki"
-msgid "Place of Worship"
-msgstr "Helgistaður"
-
-msgid "Edit Place of Worship"
-msgstr "Breyti helgistað"
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
-msgstr ""
+msgid "Place of Worship"
+msgstr "Helgistaður"
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15825,6 +16502,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15837,6 +16520,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15852,37 +16538,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15972,6 +16761,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Heilsa"
@@ -15981,6 +16776,12 @@ msgstr "Spítali"
msgid "Edit Hospital"
msgstr "Breyti spítala"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Læknir"
@@ -16047,12 +16848,66 @@ msgstr "Dýralæknir"
msgid "Edit Veterinary"
msgstr "Breyti dýralækni"
-msgid "Note"
-msgstr "Athugasemd"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Póstkassi"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Almenningssími"
@@ -16062,6 +16917,30 @@ msgstr "Breyti almenningssíma"
msgid "Telephone cards"
msgstr "Símakort"
+msgid "Emergency Phone"
+msgstr "Neyðarsími"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16071,31 +16950,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16123,8 +17008,8 @@ msgstr ""
msgid "Recycling"
msgstr "Endurvinnsla"
-msgid "Edit Recycling station"
-msgstr "Breyti endurvinnslustöð"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Rafhlöður"
@@ -16150,27 +17035,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16205,12 +17078,15 @@ msgstr ""
msgid "Height"
msgstr "Hæð"
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16220,11 +17096,11 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Drykkjarvatn"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Breyti drykkjarvatni"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr ""
@@ -16251,6 +17127,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16288,117 +17167,153 @@ msgstr "Íþróttaleikvangur"
msgid "Edit Stadium"
msgstr "Breyti íþróttaleikvang"
-msgid "select sport:"
-msgstr "veldu íþrótt:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "íþrótt"
+msgid "Sport"
+msgstr "Íþróttir"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "bogfimi"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "ástralskur fótbolti"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "hafnabolti"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "körfubolti"
+msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "klifur"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hokkí"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "skotfimi"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "skautar"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "skíði"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "fótbolti"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "sund"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "borðtennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16432,34 +17347,44 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr "Íþróttir"
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "gerð"
-
+msgctxt "running"
msgid "pitch"
-msgstr "völlur"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "íþróttamiðstöð"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "íþróttaleikvangur"
+msgstr ""
-msgid "9pin"
+msgctxt "running"
+msgid "track"
msgstr ""
-msgid "Edit 9pin"
+msgid "9pin"
msgstr ""
-msgid "10pin"
+msgid "Edit 9pin"
+msgstr ""
+
+msgid "pitch"
+msgstr "völlur"
+
+msgid "sports_centre"
+msgstr "íþróttamiðstöð"
+
+msgid "stadium"
+msgstr "íþróttaleikvangur"
+
+msgid "10pin"
msgstr ""
msgid "Edit 10pin"
@@ -16492,6 +17417,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16504,9 +17445,34 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
msgstr ""
+msgid "mud"
+msgstr "leðja"
+
msgid "Horse Racing"
msgstr ""
@@ -16523,7 +17489,7 @@ msgid "Skating"
msgstr "Skautar"
msgid "Edit Skating"
-msgstr "Breyti skautum"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16567,36 +17533,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16639,19 +17623,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16790,6 +17770,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16802,60 +17794,134 @@ msgstr "Mannvirki"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Inngangur"
+
+msgid "Edit Entrance"
+msgstr "Breyti inngang"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Turn"
@@ -16871,9 +17937,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17083,157 +18146,147 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
msgstr ""
-msgid "Survey Point"
+msgid "Radiation"
msgstr ""
-msgid "Edit Survey Point"
+msgid "Seismic Activity"
msgstr ""
-msgid "Surveillance"
-msgstr "Eftirlitsmyndavél"
-
-msgid "Edit Surveillance Camera"
-msgstr "Breyti eftirlitsmyndavél"
-
-msgid "indoor"
+msgid "Recording:"
msgstr ""
-msgid "outdoor"
+msgid "Automated"
msgstr ""
-msgid "public"
+msgid "Manually"
msgstr ""
-msgid "Power"
+msgid "Remote"
msgstr ""
-msgid "Power Generator"
-msgstr "Rafall"
-
-msgid "Edit Power Generator"
-msgstr "Breyti rafli"
-
-msgid "biofuel"
+msgid "Display:"
msgstr ""
-msgid "biogas"
+msgid "Analog"
msgstr ""
-msgid "biomass"
+msgid "Digital"
msgstr ""
-msgid "diesel"
+msgid "Survey Point"
msgstr ""
-msgid "gasoline"
+msgid "Edit Survey Point"
msgstr ""
-msgid "geothermal"
+msgid "Surveillance Camera"
msgstr ""
-msgid "hydro"
-msgstr ""
+msgid "Edit Surveillance Camera"
+msgstr "Breyti eftirlitsmyndavél"
-msgid "nuclear"
+msgid "indoor"
msgstr ""
-msgid "osmotic"
+msgid "outdoor"
msgstr ""
-msgid "solar"
+msgid "Zone"
msgstr ""
-msgid "tidal"
+msgid "parking"
msgstr ""
-msgid "waste"
+msgid "traffic"
msgstr ""
-msgid "wave"
+msgid "shop"
msgstr ""
-msgid "wind"
+msgid "bank"
msgstr ""
-msgid "Method"
+msgid "Camera"
msgstr ""
-msgid "anaerobic_digestion"
+msgid "fixed"
msgstr ""
-msgid "combustion"
+msgid "panning"
msgstr ""
-msgid "dam"
+msgid "dome"
msgstr ""
-msgid "fission"
+msgid "Mounted on"
msgstr ""
-msgid "fusion"
+msgid "ceiling"
msgstr ""
-msgid "gasification"
+msgid "Direction in degrees"
msgstr ""
-msgid "photovoltaic"
+msgid "Inclination in degrees"
msgstr ""
-msgid "pumped-storage"
+msgid "Height in meter (m)"
msgstr ""
-msgid "pumping"
+msgid "Power"
msgstr ""
-msgid "pyrolysis"
+msgid "Power Plant"
msgstr ""
-msgid "run-of-the-river"
+msgid "Edit Power Plant"
msgstr ""
-msgid "thermal"
+msgid "Start date"
msgstr ""
msgid "Output forms of energy"
msgstr ""
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
msgid "electricity"
msgstr ""
@@ -17270,117 +18323,362 @@ msgstr ""
msgid "vacuum"
msgstr ""
-msgid "battery charging"
-msgstr ""
+msgid "Power Generator"
+msgstr "Rafall"
-msgid "Power Station"
-msgstr "Orkuver"
+msgid "Edit Power Generator"
+msgstr "Breyti rafli"
-msgid "Edit Power Station"
-msgstr "Breyti orkuveri"
+msgid "biofuel"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Spennustöð"
+msgid "biogas"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Breyti spennustöð"
+msgid "biomass"
+msgstr ""
-msgid "Line reference"
-msgstr "Tilvísunarnúmer línunnar"
+msgid "diesel"
+msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "gasoline"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "geothermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Háspennustaur"
+msgid "hydro"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Breyti háspennustaur"
+msgid "nuclear"
+msgstr ""
-msgid "Tower reference"
+msgid "osmotic"
msgstr ""
-msgid "Pole"
+msgid "solar"
msgstr ""
-msgid "Edit Power Pole"
+msgid "tidal"
msgstr ""
-msgid "Pole reference"
+msgid "waste"
msgstr ""
-msgid "Power Line"
-msgstr "Raflína"
+msgid "wave"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Breyti raflínu"
+msgid "wind"
+msgstr ""
-msgid "Line type"
+msgid "Method"
msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgctxt "generator method"
+msgid "anaerobic_digestion"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgctxt "generator method"
+msgid "barrage"
msgstr ""
-msgid "Amount of Cables"
+msgctxt "generator method"
+msgid "combustion"
msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
-msgid "single"
+msgctxt "generator method"
+msgid "fission"
msgstr ""
-msgid "double"
+msgctxt "generator method"
+msgid "fusion"
msgstr ""
-msgid "triple"
+msgctxt "generator method"
+msgid "gasification"
msgstr ""
-msgid "quad"
+msgid "biomass / waste"
msgstr ""
-msgid "Historic Places"
-msgstr "Sögustaðir"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
-msgid "Castle"
-msgstr "Kastali"
+msgctxt "generator method"
+msgid "pyrolysis"
+msgstr ""
-msgid "Edit Castle"
-msgstr "Breyti kastala"
+msgctxt "generator method"
+msgid "run-of-the-river"
+msgstr ""
-msgid "Ruins"
-msgstr "Rústir"
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
-msgid "Edit Ruins"
-msgstr "Breyti rústum"
+msgctxt "generator method"
+msgid "thermal"
+msgstr ""
-msgid "Archaeological Site"
-msgstr "Fornleifasvæði"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "Edit Archaeological Site"
-msgstr "Breyti fornleifasvæði"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "Battlefield"
-msgstr "Vígvöllur"
+msgid "Generator Type"
+msgstr ""
-msgid "Edit Battlefield"
-msgstr "Breyti vígvelli"
+msgid "combined_cycle"
+msgstr ""
-msgid "Palaeontological Site"
+msgid "gas combustion"
msgstr ""
-msgid "Edit Palaeontological Site"
+msgid "francis_turbine"
msgstr ""
-msgid "Monument"
+msgid "gas_turbine"
+msgstr ""
+
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
+
+msgid "heat_pump"
+msgstr ""
+
+msgid "horizontal_axis"
+msgstr ""
+
+msgid "tidal steam / wind"
+msgstr ""
+
+msgid "kaplan_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Spennustöð"
+
+msgid "Edit Power Sub Station"
+msgstr "Breyti spennustöð"
+
+msgid "Line reference"
+msgstr "Tilvísunarnúmer línunnar"
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Háspennustaur"
+
+msgid "Edit Power Tower"
+msgstr "Breyti háspennustaur"
+
+msgid "Tower reference"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr "Raflína"
+
+msgid "Edit Power Line"
+msgstr "Breyti raflínu"
+
+msgid "Line type"
+msgstr ""
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr ""
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+msgid "single"
+msgstr ""
+
+msgid "double"
+msgstr ""
+
+msgid "triple"
+msgstr ""
+
+msgid "quad"
+msgstr ""
+
+msgid "Historic Places"
+msgstr "Sögustaðir"
+
+msgid "Castle"
+msgstr "Kastali"
+
+msgid "Edit Castle"
+msgstr "Breyti kastala"
+
+msgid "Ruins"
+msgstr "Rústir"
+
+msgid "Edit Ruins"
+msgstr "Breyti rústum"
+
+msgid "Archaeological Site"
+msgstr "Fornleifasvæði"
+
+msgid "Edit Archaeological Site"
+msgstr "Breyti fornleifasvæði"
+
+msgid "Battlefield"
+msgstr "Vígvöllur"
+
+msgid "Edit Battlefield"
+msgstr "Breyti vígvelli"
+
+msgid "Palaeontological Site"
+msgstr ""
+
+msgid "Edit Palaeontological Site"
+msgstr ""
+
+msgid "Monument"
msgstr "Minnismerki"
msgid "Edit Monument"
@@ -17434,11 +18732,11 @@ msgstr "Sjoppa"
msgid "Edit Kiosk"
msgstr "Breyti sjoppu"
-msgid "Baker"
-msgstr "Bakarí"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Breyti bakaríi"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Slátrari"
@@ -17449,7 +18747,7 @@ msgstr "Breyti slátrara"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17470,14 +18768,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Lífræn búð"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Lífræn búð"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17548,7 +18852,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17569,13 +18873,13 @@ msgstr "Breyti raftækjabúð"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17584,7 +18888,6 @@ msgstr "Hljómtækjaverslun"
msgid "Edit Hifi Shop"
msgstr "Breyti hljómtækjaverslun"
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17612,6 +18915,12 @@ msgstr "Breyti gjaldeyrisskiptum"
msgid "Edit Automated Teller Machine"
msgstr "Breyti hraðbanka"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17648,10 +18957,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17681,7 +19011,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17693,19 +19023,19 @@ msgstr "Breyti húsgagnaverslun"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17726,6 +19056,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Ferðaskrifstofa"
@@ -17735,7 +19071,7 @@ msgstr "Breyti ferðaskrifstofu"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17816,6 +19152,9 @@ msgstr "dót"
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr "Athugasemd"
+
msgid "Geography"
msgstr "Landafræði"
@@ -17945,6 +19284,12 @@ msgstr "Tindur"
msgid "Edit Peak"
msgstr "Breyti tind"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Jökull"
@@ -17984,26 +19329,35 @@ msgstr "Tré"
msgid "Edit Tree"
msgstr "Breyti tré"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Fræðiheiti"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Skógur"
msgid "Edit Wood"
msgstr "Breyti skóg"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "barrskógur"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "laufskógur"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "blandaður"
msgid "Forest"
msgstr "Skógur (ræktaður)"
@@ -18011,17 +19365,8 @@ msgstr "Skógur (ræktaður)"
msgid "Edit Forest Landuse"
msgstr "Breyti ræktuðum skóg"
-msgid "coniferous"
-msgstr "barrskógur"
-
-msgid "deciduous"
-msgstr "laufskógur"
-
-msgid "mixed"
-msgstr "blandaður"
-
-msgid "Grassland"
-msgstr ""
+msgid "Grassland"
+msgstr ""
msgid "Edit Grassland"
msgstr ""
@@ -18095,6 +19440,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18149,8 +19500,8 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
-msgstr "Íbúðarsvæði"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Breyti íbúðarlandnýtingu"
@@ -18161,6 +19512,9 @@ msgstr "Grafreitur"
msgid "Edit Graveyard"
msgstr "Breyti grafreit"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18236,6 +19590,33 @@ msgstr ""
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Breyti heimilisfangi"
@@ -18254,46 +19635,34 @@ msgstr "Nafn bæjar"
msgid "Country code"
msgstr "Landskóði"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
+msgid "Address Interpolation"
msgstr ""
-msgid "IT"
+msgid "Edit Address Interpolation"
msgstr ""
-msgid "RS"
+msgid "Numbering scheme"
msgstr ""
-msgid "US"
+msgid "odd"
msgstr ""
-msgid "Address Interpolation"
+msgid "even"
msgstr ""
-msgid "Edit Address Interpolation"
+msgid "alphabetic"
msgstr ""
-msgid "Numbering scheme"
+msgid "Accuracy"
msgstr ""
-msgid "odd"
+msgid "actual"
msgstr ""
-msgid "even"
+msgid "estimate"
msgstr ""
-msgid "alphabetic"
+msgid "potential"
msgstr ""
msgid "Contact (common schema)"
@@ -18458,27 +19827,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "fótgangandi"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18524,19 +19922,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18560,7 +19961,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18656,18 +20057,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "brú"
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr "hjól"
+
+msgid "foot"
+msgstr "fótgangandi"
+
msgid "horse"
msgstr ""
@@ -18677,7 +20087,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18686,10 +20099,10 @@ msgstr "vegþjónustur"
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18707,6 +20120,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18722,28 +20138,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18764,19 +20180,19 @@ msgstr "smábátahöfn"
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18842,9 +20258,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "leðja"
-
msgid "beach"
msgstr "strönd"
@@ -18854,10 +20267,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr "íþrótt"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18872,9 +20288,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr "Eldsneytisstöð"
@@ -18902,6 +20315,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18947,10 +20363,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18962,7 +20408,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18980,7 +20426,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19097,19 +20543,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "board_type without information=board"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19128,13 +20685,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19143,19 +20736,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19170,142 +20772,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19344,148 +20995,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19689,6 +21403,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19710,13 +21436,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19979,9 +21699,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20003,6 +21729,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20081,9 +21810,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20168,7 +21909,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20439,15 +22180,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20618,6 +22350,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20636,12 +22371,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20777,6 +22506,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20794,6 +22526,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20874,113 +22609,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
msgstr ""
-msgid "Save image as PNG"
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21006,7 +22755,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21056,7 +22808,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21101,6 +22853,9 @@ msgstr "Sækja Meðfram"
msgid "Please select 1 or more ways to download along"
msgstr "Veldu einn eða fleiri vegi sen á að sækja gögn meðfram"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21149,28 +22904,93 @@ msgstr ""
msgid "External Tool: {0}"
msgstr ""
-msgid "Edit tool"
+msgid "Edit tool"
+msgstr ""
+
+msgid "Name:"
+msgstr ""
+
+msgid "CmdLine:"
+msgstr ""
+
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
msgstr ""
-msgid "Name:"
+msgid "User {0} is mapping nearby"
msgstr ""
-msgid "CmdLine:"
+msgid "Users mapping nearby:"
msgstr ""
-msgid "External tools"
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21212,27 +23032,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21628,6 +23430,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21875,12 +23680,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21890,16 +23689,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22262,9 +24058,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22319,9 +24112,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22363,25 +24173,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22518,9 +24328,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22545,12 +24352,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22699,6 +24515,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22715,6 +24534,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22948,13 +24778,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Villa kom upp: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23009,18 +24832,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "Ný padda"
-
-msgid "Create issue"
-msgstr "Búa til pöddu"
-
-msgid "Describe the problem precisely"
-msgstr "Lýstu vandamálinu nákvæmlega"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23078,6 +24889,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23285,9 +25099,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23367,7 +25178,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23521,6 +25350,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23542,6 +25374,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23835,9 +25670,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23906,9 +25738,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24035,9 +25864,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24059,6 +25885,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24091,15 +25920,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Breyta eigindum"
+
msgid "Country preset:"
msgstr ""
@@ -24109,6 +25954,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24211,9 +26059,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24329,6 +26174,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24389,19 +26237,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24539,6 +26387,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24614,6 +26465,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24629,9 +26569,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr "Sækja OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24653,6 +26590,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24805,9 +26745,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25433,7 +27370,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25441,10 +27381,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25453,18 +27390,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25507,15 +27432,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25637,18 +27553,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25826,9 +27730,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25955,7 +27856,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25975,9 +27876,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr "Sækja veg"
@@ -26110,9 +28008,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 6f04efe..8f88cdc 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm 20081003\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-04-02 07:12+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-17 07:01+0000\n"
"Last-Translator: Davide Prade <davide.prade at gmail.com>\n"
"Language-Team: Italian <talk-it at lists.openstreetmap.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: 2013-04-05 04:46+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:47+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: it\n"
msgid "Edit Motorway Link"
@@ -21,10 +21,10 @@ msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: l''opzione ''{1}'' è ambigua"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr "{0}: l''opzione ''--{1}'' non permette un argomento"
+msgstr "{0}: l''opzione ''--{1}'' non consente un argomento"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: l''opzione ''{1}{2}'' non permette un argomento"
+msgstr "{0}: l''opzione ''{1}{2}'' non consente un argomento"
msgid "{0}: option ''{1}'' requires an argument"
msgstr "{0}: l''opzione ''{1}'' richiede un argomento"
@@ -54,11 +54,26 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Apertura del collegamento non supportata sulla piattaforma corrente (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ERRORE: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ATTENZIONE: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr "Causa: "
+
msgid "Executing platform startup hook"
msgstr "Esecuzione del collegamento iniziale alla piattaforma"
msgid "Building main menu"
-msgstr "Costruzione del menu principale"
+msgstr "Creazione del menu principale"
msgid "Help"
msgstr "Aiuto"
@@ -73,7 +88,7 @@ msgid "Initializing validator"
msgstr "Inizializzazione del validatore"
msgid "Initializing map styles"
-msgstr "Inizializzazione degli stili di mappa"
+msgstr "Inizializzazione degli stili della mappa"
msgid "Loading imagery preferences"
msgstr "Caricamento delle preferenze delle immagini aeree"
@@ -114,10 +129,10 @@ msgid "Error"
msgstr "Errore"
msgid "About"
-msgstr "Informazioni su JOSM"
+msgstr "Informazioni"
msgid "Display the about screen."
-msgstr "Mostra le informazioni sul programma."
+msgstr "Mostra la schermata delle informazioni"
msgid "Java OpenStreetMap Editor"
msgstr "Java OpenStreetMap Editor"
@@ -129,7 +144,7 @@ msgid "Last change at {0}"
msgstr "Ultima modifica {0}"
msgid "Java Version {0}"
-msgstr "Java versione {0}"
+msgstr "Versione Java {0}"
msgid "Homepage"
msgstr "Pagina iniziale"
@@ -159,25 +174,25 @@ msgid "About JOSM..."
msgstr "Informazioni su JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ATTENZIONE: formato non previsto dell''indirizzo URL di base delle API. Il "
-"re-indirizzamento alla pagina di informazioni o dello storico per l''oggetto "
-"OSM probabilmente fallirà. L''indirizzo URL di base delle API è: ''{0}''"
+"Formato inatteso per l''URL delle API. La redirezione verso la pagina delle "
+"informazioni o dello storico per un oggetto OSM probabilmente fallirà. "
+"L''URL delle API è: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ATTENZIONE: formato URL base dell''API inatteso. Il reindirizzamento alla "
-"pagina utente OSM probabilmente fallirà. L''URL di base delle API è: \"{0}\""
+"Formato inatteso per l''URL delle API. La redirezione alla pagina utente OSM "
+"probabilmente fallirà. L''URL delle API è: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
msgstr ""
-"Si è in procinto di avviare {0} finestre del browser.<br>Questa operazione "
+"Si è in procinto di avviare {0} finestre del browser.<br>Quest''operazione "
"potrebbe riempire lo schermo con le finestre del browser<br>e metterci un "
"po'' di tempo."
@@ -185,13 +200,13 @@ msgid "Continue"
msgstr "Continua"
msgid "Click to continue and to open {0} browsers"
-msgstr "Click per continuare ed aprire {0} visualizzatori"
+msgstr "Clicca per continuare ed aprire {0} visualizzatori"
msgid "Cancel"
msgstr "Annulla"
msgid "Click to abort launching external browsers"
-msgstr "Click per annullare l''esecuzione dei visualizzatori esterni"
+msgstr "Clicca per annullare l''esecuzione dei visualizzatori esterni"
msgid "Please select at least one already uploaded node, way, or relation."
msgstr "Selezionare almeno un nodo, percorso o relazione già caricato."
@@ -217,6 +232,9 @@ msgstr "Nessun livello di riferimento"
msgid "Add imagery layer {0}"
msgstr "Aggiungi livello di immagini aeree {0}"
+msgid "Select image format for WMS layer"
+msgstr "Seleziona il formato immagine per il livello WMS"
+
msgid "Select WMS layers"
msgstr "Seleziona il livello WMS"
@@ -258,9 +276,6 @@ msgstr "Strumenti: {0}"
msgid "Please select at least four nodes."
msgstr "Selezionare almeno quattro nodi."
-msgid "Information"
-msgstr "Informazioni"
-
msgid "Align Nodes in Line"
msgstr "Disponi i nodi in linea"
@@ -283,7 +298,10 @@ msgid "conflict"
msgstr "conflitto"
msgid "download"
-msgstr "scarica"
+msgstr "scaricamento"
+
+msgid "problem"
+msgstr "problema"
msgid "previous"
msgstr "precedente"
@@ -294,6 +312,9 @@ msgstr "successivo"
msgid "Nothing selected to zoom to."
msgstr "Nessuna selezione su cui ingrandire la visuale"
+msgid "Information"
+msgstr "Informazioni"
+
msgid "Zoom to {0}"
msgstr "Ingrandisci visuale su {0}"
@@ -351,10 +372,10 @@ msgstr ""
"la direzione di qualcuno?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Impossibile unire i percorsi (non possono essere fuse in una singola stringa "
+"Impossibile unire i percorsi<br>(Non possono essere uniti in una unica serie "
"di nodi)"
msgid "Combine {0} ways"
@@ -404,7 +425,7 @@ msgid "No data loaded."
msgstr "Nessun dato caricato."
msgid "You must select at least one way."
-msgstr "E'' necessario selezionare almeno un percorso."
+msgstr "È necessario selezionare almeno un percorso."
msgid "Delete"
msgstr "Cancella"
@@ -412,18 +433,37 @@ msgstr "Cancella"
msgid "Delete selected objects."
msgstr "Cancella gli oggetti selezionati."
+msgid "Toggle dialogs panel"
+msgstr "Commuta pannello finestre"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Commuta pannello finestre, massimizza visualizzazione mappa"
+
msgid "Distribute Nodes"
msgstr "Disponi i nodi"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Disponi i nodi a distanze regolari lungo una linea"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignoro {0} nodi con coordinate nulle"
+
msgid "Download from OSM..."
msgstr "Scarica da OSM..."
msgid "Download map data from the OSM server."
msgstr "Scarica i dati della mappa dal server OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Quest''azione richiederà {0} richieste di scarico distinte.<br>Si "
+"vuole procedere?</html>"
+
+msgid "Download data"
+msgstr "Scarica dati"
+
msgid "Download object..."
msgstr "Scarica oggetto..."
@@ -523,10 +563,13 @@ msgstr "Cronologia"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
-"Visualizza le informazioni dello storico OSM su percorsi, nodi o relazioni."
+"Visualizza le informazioni della cronologia OSM su ways, nodi o relazioni."
+
+msgid "Show history"
+msgstr "Visualizza cronologia"
msgid "History (web)"
-msgstr "Storico (web)"
+msgstr "Cronologia (web)"
msgid ""
"Display history information about OSM ways, nodes, or relations in web "
@@ -555,8 +598,7 @@ msgid ""
msgstr ""
"Utilizza i tasti di direzione oppure trascina il livello delle immagini "
"aeree con il mouse per regolare lo scostamento.\n"
-"E'' possibile anche inserire uno scostamento est e nord nelle coordinate "
-"{0}.\n"
+"È possibile anche inserire uno scostamento est e nord nelle coordinate {0}.\n"
"Se si desidera salvare lo scostamento come un segnalibro, inserire il nome "
"del segnalibro qui sotto"
@@ -654,11 +696,11 @@ msgid "Joined overlapping areas"
msgstr "Le aree sovrapposte sono state unite"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Alcuni percorsi facevano parte di relazioni che sono state modificate. Per "
-"favore verifica che non siano stati introdotti errori."
+"Alcuni dei percorsi facevano parte di relazioni che sono state "
+"modificate.<br>Si prega di verificare che non siano stati introdotti errori."
msgid "Fix tag conflicts"
msgstr "Correggi i conflitti di etichette"
@@ -829,16 +871,17 @@ msgid "Merge nodes into the oldest one."
msgstr "Unisci i nuovi nodi in quello più vecchio."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Selezionare almeno due nodi da unire oppure un nodo vicino ad un altro nodo."
+"Si prega di selezionare almeno due nodi per unire oppure un nodo in "
+"prossimità di un altro nodo."
msgid "Abort Merging"
msgstr "Annulla unione"
msgid "Click to abort merging nodes"
-msgstr "Cliccare per annullare l''unione dei nodi"
+msgstr "Clicca per annullare l''unione dei nodi"
msgid ""
"Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
@@ -1000,11 +1043,11 @@ msgid "Download Data"
msgstr "Scarica dati"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Impossibile aprire l''indirizzo URL ''{0}''perché non è disponibile "
-"alcuna operazione idonea di scarico.</html>"
+"Impossibile aprire l''indirizzo URL ''{0}''<br>I seguenti scaricamenti "
+"accettano lo schema URL visualizzato:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1015,13 +1058,13 @@ msgid ""
msgstr ""
"<h3>Quando sono selezionati uno o più percorsi, la disposizione è resa in "
"modo che tutti gli angoli siano di 90 o 180 gradi.</h3>Si possono aggiungere "
-"due nodi alla selezione. Quindi la direzione è regolata mediante questi due "
+"due nodi alla selezione. Quindi la direzione è corretta mediante questi due "
"nodi di riferimento. (In seguito si potrà annullare lo spostamento per "
"determinati nodi:<br>selezionarli e premere la scorciatoia per Ortogonalizza "
"/ Annulla. La scorciatoia predefinita è Shift-Q.)"
msgid "Orthogonalize Shape"
-msgstr "Disponi ortogonalmente"
+msgstr "Ortogonalizza figura"
msgid "Move nodes so all angles are 90 or 180 degrees"
msgstr "Spostare i nodi per ottenere angoli di 90 o 180 gradi"
@@ -1036,16 +1079,11 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizza / Annulla"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalizza figura / Annulla\n"
-"Selezionare i nodi che sono stati spostati dalla precedente azione di "
-"ortogonalizzazione figura!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Annulla ortogonalizzazione figura"
+"Ortogonalizza figura / Annulla<br>Si prega di selezionare i nodi che sono "
+"stati spostati dalla precedente azione di ''Ortogonalizza figura''!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1065,9 +1103,6 @@ msgstr "Disponi ortogonalmente"
msgid "Usage"
msgstr "Utilizzo"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Gli elementi selezionati non possono essere ortogonalizzati"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1188,6 +1223,15 @@ msgstr "Rinomina anche il file"
msgid "Could not rename file ''{0}''"
msgstr "Impossibile rinominare il file ''{0}''"
+msgid "Restart"
+msgstr "Riavvia"
+
+msgid "Restart the application."
+msgstr "Riavvia l''applicazione."
+
+msgid "Click to restart later."
+msgstr "Clicca per riavviare in seguito."
+
msgid "Reverse way"
msgstr "Inverti percorso"
@@ -1240,9 +1284,6 @@ msgstr "Carica sessione"
msgid "Load a session from file."
msgstr "Carica una sessione da file."
-msgid "Session file (*.jos, *.joz)"
-msgstr "File sessione (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Apri sessione"
@@ -1310,6 +1351,9 @@ msgstr "Rapporto dello stato"
msgid "Copy to clipboard and close"
msgstr "Copia negli appunti e chiudi"
+msgid "Report bug"
+msgstr "Segnala bug"
+
msgid "Close"
msgstr "Chiudi"
@@ -1392,19 +1436,18 @@ msgstr ""
"(Suggerimento: seleziona i nodi in mezzo al percorso)."
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Una relazione di appartenenza basata su un ruolo è stata copiata su "
-"tutte le nuove strade<br>Verificare l''operazione e correggere dove "
-"necessario.</html>"
+"Una appartenenza ad una relazione in base al ruolo è stata copiata per tutti "
+"i nuovi percorsi.<br>Si prega di verificare e di correggere ove necessario."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Una relazione di appartenenza è stata copiata su tutte le nuove "
-"strade<br>Verificare l''operazione e correggere dove necessario.</html>"
+"Una appartenenza ad una relazione è stata copiata per tutti i nuovi "
+"percorsi.<br>Si prega di verificare e di correggere ove necessario."
msgid "Split way {0} into {1} parts"
msgstr "Dividi il percorso {0} in {1} parti"
@@ -1508,6 +1551,31 @@ msgstr ""
"perché non vedi l''oggetto reale.<br>Si desidera veramente procedere con la "
"separazione?"
+msgid "Disconnect Node from Way"
+msgstr "Disconnetti nodo da percorso"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Disconnetti nodi da un percorso a cui ora appartengono"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Selezionare almeno un nodo da disconnettere."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Il nodo selezionato non può essere disconnesso da alcunché."
+msgstr[1] "I nodi selezionati non possono essere disconnessi da alcunché."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"Il percorso interessato potrebbe scomparire dopo la disconnessione del nodo "
+"selezionato."
+msgstr[1] ""
+"Il percorso interessato potrebbe scomparire dopo la disconnessione dei nodi "
+"selezionati."
+
msgid "Undo"
msgstr "Annulla"
@@ -1532,9 +1600,6 @@ msgstr "Aggiorna dati"
msgid "Updates the objects in the active data layer from the server."
msgstr "Aggiorna gli oggetti nel livello dei dati attivo dal server."
-msgid "Download data"
-msgstr "Scarica dati"
-
msgid "Update modified"
msgstr "Aggiorna oggetti modificati"
@@ -1591,9 +1656,9 @@ msgid ""
msgstr ""
"Si stanno per caricare i dati dal livello ''{0}''.<br /><br />L''invio dei "
"dati da questo livello è <b>fortemente sconsigliato</b>. Se si continua<br "
-"/>potrebbe essere necessario annullare successivamente le proprie modifiche, "
-"oppure forzare altri utenti a farlo.<br /><br />Si è sicuri di voler "
-"continuare?"
+"/>potrebbe essere necessario ripristinare successivamente le proprie "
+"modifiche, oppure forzare altri utenti a farlo.<br /><br />Si è sicuri di "
+"voler continuare?"
msgid "Ignore this hint and upload anyway"
msgstr "Ignora questo suggerimento e carica ugualmente"
@@ -1758,6 +1823,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avanzamento lento"
+msgid "Download GPS"
+msgstr "Scarica GPS"
+
msgid "Downloading GPS data"
msgstr "Scaricamento dei dati GPS"
@@ -1765,7 +1833,19 @@ msgid "Downloaded GPX Data"
msgstr "Dati GPX scaricati"
msgid "Markers from {0}"
-msgstr "Marcatori da {0}"
+msgstr "Contrassegni da {0}"
+
+msgid "Download Compressed OSM Change"
+msgstr "Scarica modifica OSM compressa"
+
+msgid "Download OSM Change"
+msgstr "Scarica modifica OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Scarica OSM compresso"
+
+msgid "Download OSM"
+msgstr "Scarica OSM"
msgid "Downloading data"
msgstr "Scaricamento dei dati"
@@ -1787,6 +1867,31 @@ msgstr "Comando"
msgid "Request details: {0}"
msgstr "dettagli della richiesta: {0}"
+msgid "Download OSM URL"
+msgstr "Scarica indirizzo URL OSM"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Si è verificato {0} conflitto durante l’importazione"
+msgstr[1] "Ci sono stati {0} conflitti durante l’importazione"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflitto durante il download"
+msgstr[1] "Conflitti durante il download"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Caricamento degli elementi da cui dipende il nodo {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Caricamento degli elementi da cui dipende il percorso {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Caricamento degli elementi da cui dipende la relazione {2}"
+
+msgid "Download session"
+msgstr "Scarica sessione"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Scaricamento di {0} su {1} ({2} rimanenti)"
@@ -1800,14 +1905,14 @@ msgid ""
"Click to check whether objects in your local dataset are deleted on the "
"server"
msgstr ""
-"Cliccare per controllare se qualche oggetto nel proprio insieme di dati è "
+"Clicca per controllare se qualche oggetto nel proprio insieme di dati è "
"stato eliminato sul server"
msgid "Ignore"
msgstr "Ignora"
msgid "Click to abort and to resume editing"
-msgstr "Cliccare per annullare e per riprendere le modifiche"
+msgstr "Clicca per annullare e per riprendere le modifiche"
msgid ""
"There is {0} object in your local dataset which might be deleted on the "
@@ -1831,14 +1936,14 @@ msgid ""
msgid_plural ""
"Click <strong>{0}</strong> to check the state of these objects on the server."
msgstr[0] ""
-"Premi su <strong>{0}</strong> per controllare lo stato di questo oggetto sul "
-"server."
+"Clicca su <strong>{0}</strong> per controllare lo stato di questo oggetto "
+"sul server."
msgstr[1] ""
-"Premi su <strong>{0}</strong> per controllare lo stato di questi oggetti sul "
-"server."
+"Clicca su <strong>{0}</strong> per controllare lo stato di questi oggetti "
+"sul server."
msgid "Click <strong>{0}</strong> to ignore.</html>"
-msgstr "Premi su <strong>{0}</strong> per ignorare.</html>"
+msgstr "Clicca su <strong>{0}</strong> per ignorare.</html>"
msgid "Deleted or moved objects"
msgstr "Oggetti eliminati o spostati"
@@ -1850,25 +1955,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Errore durante lo scaricamento"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Si è verificato {0} conflitto durante l’importazione"
-msgstr[1] "Ci sono stati {0} conflitti durante l’importazione"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflitto durante il download"
-msgstr[1] "Conflitti durante il download"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Caricamento degli elementi da cui dipende il nodo {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Caricamento degli elementi da cui dipende il percorso {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Caricamento degli elementi da cui dipende la relazione {2}"
-
msgid "Error during download"
msgstr "Errore durante lo scaricamento"
@@ -1946,7 +2032,7 @@ msgid "Finish drawing."
msgstr "Termina tracciamento."
msgid "FIX"
-msgstr "FIX"
+msgstr "CORREZIONE"
msgid "draw angle snap"
msgstr "disegna angolo con scatto"
@@ -2021,8 +2107,11 @@ msgstr "Migliora l''accuratezza dei percorsi"
msgid "Improve Way Accuracy mode"
msgstr "Modalità di miglioramento dell''accuratezza dei percorsi"
+msgid "improve way accuracy helper line"
+msgstr "linea di supporto per miglioramento accuratezza percorso"
+
msgid "Click on the way to start improving its shape."
-msgstr "Cliccare sul percorso per iniziare a migliorare la sua accuratezza."
+msgstr "Clicca sul percorso per iniziare a migliorare la sua accuratezza."
msgid "Select a way that you want to make more accurate."
msgstr "Selezionare un percorso che si desidera rendere più accurato."
@@ -2031,30 +2120,30 @@ msgid ""
"Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
"delete."
msgstr ""
-"Cliccare per aggiungere un nuovo nodo. Rilasciare Ctrl per spostare i nodi "
+"Clicca per aggiungere un nuovo nodo. Rilasciare Ctrl per spostare i nodi "
"esistenti oppure tenere premuto Alt per eliminare."
msgid ""
"Click to delete the highlighted node. Release Alt to move existing nodes or "
"hold Ctrl to add new nodes."
msgstr ""
-"Cliccare per eliminare il nodo evidenziato. Rilasciare Alt per spostare i "
-"nodi esistenti oppure tenere premuto Ctrl per aggiungere nuovi nodi."
+"Clicca per eliminare il nodo evidenziato. Rilasciare Alt per spostare i nodi "
+"esistenti oppure tenere premuto Ctrl per aggiungere nuovi nodi."
msgid ""
"Click to move the highlighted node. Hold Ctrl to add new nodes, or Alt to "
"delete."
msgstr ""
-"Cliccare per spostare il nodo evidenziato. Tenere premuto Ctrl per "
-"aggiungere nuovi nodi, oppure Alt per eliminare."
+"Clicca per spostare il nodo evidenziato. Tenere premuto Ctrl per aggiungere "
+"nuovi nodi, oppure Alt per eliminare."
msgid "Cannot place a node outside of the world."
msgstr "Impossibile posizionare un nodo al di fuori dei confini della Terra."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Aggiungi e un nuovo nodo al percorso"
-msgstr[1] "Aggiungi e un nuovo nodo ai {0} percorsi"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Aggiungi un nuovo nodo al percorso"
+msgstr[1] "Aggiungi un nuovo nodo a {0} percorsi"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Impossibile eliminare il nodo a cui più oggetti fanno riferimento"
@@ -2068,6 +2157,9 @@ msgstr "Parallelo"
msgid "Make parallel copies of ways"
msgstr "Crea copie parallele dei percorsi"
+msgid "make parallel helper line"
+msgstr "linea di supporto parallelizzazione"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2430,14 +2522,13 @@ msgid ""
"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
msgstr ""
-"<b>timestamp:</b>data/ora - oggetti modificati per l''ultima volta in questa "
-"data/ora (2009-11-12T14:51:09Z, 2009-11-12 oppure T14:51 ...)"
+"<b>timestamp:</b>marca temporale - oggetti con quest''ultima marca temporale "
+"di modifica (2009-11-12T14:51:09Z, 2009-11-12 oppure T14:51 ...)"
msgid ""
"<b>timestamp:</b>min/max - objects with last modification within range"
msgstr ""
-"<b>timestamp:</b>min/max - oggetti modificati per l’ultima volta "
-"nell’intervallo"
+"<b>timestamp:</b>min/max - oggetti con l''ultima modifica nell’intervallo"
msgid ""
"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
@@ -2545,6 +2636,10 @@ msgstr "''value'' in qualsiasi chiave"
msgid "matches if ''key'' exists"
msgstr "corrisponde se esiste ''key''"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+"corrisponde se ''key'' è più grande di ''value'' (analogamente se minore)"
+
msgid "combinators"
msgstr "combinatori"
@@ -2600,7 +2695,7 @@ msgid "objects with given changeset ID"
msgstr "oggetti con l''identificativo del gruppo di modifiche specificato"
msgid "objects with last modification timestamp within range"
-msgstr "oggetti con l''ultimo istante di modifica compreso nell''intervallo"
+msgstr "oggetti con l''ultima marca temporale di modifica nell''intervallo"
msgid "properties"
msgstr "proprietà"
@@ -2722,14 +2817,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Atteso <i>min</i>/<i>max</i> dopo ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Era atteso un identificativo di primitiva"
+msgid "Range of primitive ids expected"
+msgstr "È atteso un intervallo di identificativi delle primitive"
-msgid "Changeset id expected"
-msgstr "Era atteso un identificativo del gruppo di modifiche"
+msgid "Range of changeset ids expected"
+msgstr "È atteso un intervallo di identificativi dei gruppi di modifiche"
-msgid "Version expected"
-msgstr "Era attesa una versione"
+msgid "Range of versions expected"
+msgstr "È atteso un intervallo di versioni"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2741,6 +2836,9 @@ msgstr ""
"Tipo di primitiva sconosciuta: {0}. I valori permessi sono: nodo, percorso o "
"relazione"
+msgid "Primitive id expected"
+msgstr "Era atteso un identificativo di primitiva"
+
msgid "Range of numbers expected"
msgstr "Atteso intervallo di numeri"
@@ -2759,11 +2857,10 @@ msgstr "Parametro mancante per XOR"
msgid "Missing operator for NOT"
msgstr "Operatore mancante per NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Attenzione: troncamento automatico del valore dell''etichetta ''''{0}'''' "
-"sull''oggetto eliminato {1}"
+"Troncamento automatico per il valore dell''etichetta ''{0}'' sull''oggetto "
+"eliminato {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2816,9 +2913,9 @@ msgid ""
"cancel this dialog, you can find the entries in the validator side panel to "
"inspect them."
msgstr ""
-"I seguenti sono io risultati della validazione automatica. Provare ad "
-"aggiustarli, ma siate attenti (non cancellare dati validi). Se non si è "
-"sicuri ignorateli.<br>Dopo aver chiuso questa finestra sarà possibile "
+"I seguenti sono i risultati della validazione automatica. Provare a "
+"correggerli, ma stando attenti (non cancellare dati validi). Se non si è "
+"sicuri ignorarli.<br>Dopo aver chiuso questa finestra sarà possibile "
"consultare i risultati nel pannello del validatore posizionato accanto."
msgid "Errors"
@@ -2859,6 +2956,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Aggiunto {0} oggetto"
msgstr[1] "Aggiunti {0} oggetti"
+msgid "New way {0} has 0 nodes"
+msgstr "Il nuovo percorso {0} possiede 0 nodi"
+
msgid "Change node {0}"
msgstr "Modifica nodo {0}"
@@ -2895,11 +2995,11 @@ msgstr "Rimuovi \"{0}\" per {1} oggetti"
msgid "Set {0}={1} for {2} objects"
msgstr "Imposta {0}={1} per {2} oggetti"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Eliminate {0} proprietà per {1} oggetti"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "Eliminate {0} etichette per {1} oggetti"
-msgid "Set {0} properties for {1} objects"
-msgstr "Impostate {0} proprietà per {1} oggetti"
+msgid "Set {0} tags for {1} objects"
+msgstr "Impostate {0} etichette per {1} oggetti"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Sostituisci \"{0}\" con \"{1}\" per"
@@ -2923,11 +3023,11 @@ msgid "Double conflict"
msgstr "Doppio conflitto"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Attenzione: Il livello ''{0}'' non esiste più. Impossibile eliminare il "
-"conflitto per l''oggetto ''{1}''."
+"Il livello ''{0}'' non esiste più. Impossibile rimuovere il conflitto per "
+"l''oggetto ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Aggiungi conflitto per ''{0}''"
@@ -2946,7 +3046,7 @@ msgstr "Impossibile risolvere il conflitto irrisolto"
msgid "At least one object to delete required, got empty collection"
msgstr ""
-"E'' richiesta l''eliminazione di almeno un oggetto, ottenuta una collezione "
+"È richiesta l''eliminazione di almeno un oggetto, ottenuta una collezione "
"vuota"
msgid "Delete node {0}"
@@ -3009,11 +3109,11 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
-"Si sta per eliminare {0} relazione: {1}<br/>Questa azione spesso non è "
+"Si sta per eliminare {0} relazione: {1}<br/>Quest''azione spesso non è "
"necessaria e non può essere annullata facilmente dopo aver caricato su "
"server.<br/>Si desidera veramente eliminare?"
msgstr[1] ""
-"Si stanno per eliminare {0} relazioni: {1}<br/>Questa azione spesso non è "
+"Si stanno per eliminare {0} relazioni: {1}<br/>Quest''azione spesso non è "
"necessaria e non può essere annullata facilmente dopo aver caricato su "
"server.<br/>Si desidera veramente eliminare?"
@@ -3045,6 +3145,9 @@ msgstr[1] "Epurati {0} oggetti"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
+msgid "Removed nodes from {0}"
+msgstr "Rimossi nodi da {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Ruota {0} nodo"
@@ -3113,12 +3216,11 @@ msgid "Reverse directional way."
msgstr "Inverti percorso direzionale."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Invertendo la direzione di questo percorso si consiglia di apportare i "
-"seguenti cambiamenti alle proprietà del percorso in modo da mantenere la "
-"consistenza dei dati."
+"Durante l''inversione di questo percorso vengono suggerite le seguenti "
+"modifiche in modo da mantenere la consistenza dei dati."
msgid "Relation"
msgstr "Relazione"
@@ -3147,11 +3249,11 @@ msgstr "Applica i cambiamenti selezionati"
msgid "Do not apply changes"
msgstr "Non applicare cambiamenti"
-msgid "Please select which property changes you want to apply."
-msgstr "Selezionare quali cambiamenti alle proprietà si vogliono applicare."
+msgid "Please select which changes you want to apply."
+msgstr "Si prega di selezionare quali modifiche si desidera applicare."
-msgid "Properties of "
-msgstr "Proprietà di "
+msgid "Tags of "
+msgstr "Etichette di "
msgid "Roles in relations referring to"
msgstr "Regole nelle relazioni a cui si riferiscono"
@@ -3170,11 +3272,14 @@ msgstr "Impossibile creare il file {0}, sarà utilizzato un altro nome"
msgid "IOError while creating file, autosave will be skipped: {0}"
msgstr ""
"Errore di IO durante la creazione del file, il salvataggio automatico sarà "
-"ignorato: {0}"
+"tralasciato: {0}"
msgid "Unable to delete old backup file {0}"
msgstr "Impossibile eliminare il vecchio file di backup {0}"
+msgid "Your work has been saved automatically."
+msgstr "Il proprio lavoro è stato salvato automaticamente."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Errore durante la creazione del backup del livello rimosso: {0}"
@@ -3209,23 +3314,22 @@ msgstr ""
"predefinito.<br/> Si prega di attivare manualmente la funzione "
"corrispondente e di importare nuovamente."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr ""
-"Attenzione: è fallita la creazione della cartella mancante della cache: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Fallita la creazione della cartella cache mancante: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
"<html>Fallita la creazione della cartella mancante della cache: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Fallita la persistenza delle preferenze su ''{0}''"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Attenzione: è fallita l''inizializzazione delle preferenze. La cartella "
-"delle preferenze ''{0}'' non è in realtà una cartella."
+"Fallita l''inizializzazione delle preferenze. La cartella delle preferenze "
+"''{0}'' non è una cartella."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3235,11 +3339,11 @@ msgstr ""
"preferenze ''{0}'' non è in realtà una cartella.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Attenzione: è fallita l''inizializzazione delle preferenze. Non è stato "
-"possibile creare la cartella delle preferenze mancante: {0}"
+"Fallita l''inizializzazione delle preferenze. Fallita la creazione della "
+"cartella delle preferenze mancante: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3248,18 +3352,16 @@ msgstr ""
"<html>Fallita l''inizializzazione delle preferenze.<br>Non è stato possibile "
"creare la cartella delle preferenze mancante: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Informazione: file delle preferenze ''{0}'' mancante. Creazione di un file "
-"delle preferenze predefinito."
+"File delle preferenze''{0}'' mancante. Creazione di un file predefinito "
+"delle preferenze."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Attenzione: sostituzione del file di preferenze esistente ''{0}'' con un "
-"file predefinito."
+"Sostituzione del file delle preferenze esistente ''{0}'' con un file "
+"predefinito delle preferenze."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3277,11 +3379,11 @@ msgstr ""
"predefinito.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Attenzione: è fallita l''inizializzazione delle preferenze. Impossibile "
-"ripristinare il file delle preferenze con i valori predefiniti: {0}"
+"Fallita l''inizializzazione delle preferenze. Fallito l''azzeramento del "
+"file delle preferenze ai valori predefiniti: {0}"
msgid "Paint style {0}: {1}"
msgstr "Stile di disegno {0}: {1}"
@@ -3312,14 +3414,12 @@ msgstr "Fallito il caricamento della risorsa ''''{0}'''', l''errore è {1}."
msgid "UNKNOWN"
msgstr "SCONOSCIUTO"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Attenzione: numero di versione JOSM non atteso nel file della revisione, il "
-"valore è ''{0}''"
+"Numero di versione JOSM inatteso nel file di revisione, il valore è ''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Attenzione: manca il file di revisione ''''/REVISION''''."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Il file di revisione ''/REVISION'' è mancante."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato"
@@ -3491,11 +3591,10 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Errore: fallito il caricamento della classe di generazione della mappa "
-"''{0}''. La classe non è stata trovata."
+"Fallito il caricamento della classe di generazione mappa ''{0}''. La classe "
+"non è stata trovata."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3580,7 +3679,7 @@ msgid "Unkown parameter: ''{0}''."
msgstr "Parametro sconosciuto: ''{0}''."
msgid "Value expected for parameter ''{0}''."
-msgstr "E'' atteso un valore per il parametro ''{0}''."
+msgstr "È atteso un valore per il parametro ''{0}''."
msgid "No value expected for parameter ''{0}''."
msgstr "Non è atteso alcun valore per il parametro ''{0}''."
@@ -3611,8 +3710,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Identificato del datum sconosciuto: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum richiesto (+datum=*, +towgs84=* oppure +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Datum richiesto (+datum=*, +towgs84=* o +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3624,7 +3723,7 @@ msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
msgstr "Impossibile ottenere il valore del parametro ''towgs84'' (''{0}'')"
msgid "Projection required (+proj=*)"
-msgstr "E'' richiesta la proiezione (+proj=*)"
+msgstr "È richiesta la proiezione (+proj=*)"
msgid "Unkown projection identifier: ''{0}''"
msgstr "Identificatore della proiezione sconosciuto: ''{0}''"
@@ -3633,6 +3732,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Numero di argomenti non atteso per il parametro ''+bounds'' (devono essere 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Parametro sconosciuto ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Numero di argomenti attesi per il parametro ''{0}''"
@@ -3653,11 +3755,6 @@ msgstr "Proiezione personalizzata"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Errore: fallita l''apertura del flusso di entrata per la risorsa "
-"''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3698,14 +3795,19 @@ msgstr "altra validazione"
msgid "Running test {0}"
msgstr "Esecuzione controllo {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Verifica ''{0}'' completata in {1}"
+
msgid "Addresses"
msgstr "Indirizzi"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr "Controlla gli errori negli indirizzi e nelle relazioni delle strade"
+msgstr ""
+"Controlla gli errori negli indirizzi e nelle relazioni di strada associata "
+"(associated street)"
msgid "Multiple associatedStreet relations"
-msgstr "Relazioni delle strade multiple"
+msgstr "Relazioni strada associata (associated street) multiple"
msgid "House number without street"
msgstr "Numeri civici non associati ad una strada"
@@ -3722,6 +3824,15 @@ msgstr "Nomi delle strade multipli nella relazione"
msgid "House number too far from street"
msgstr "Numero civico troppo lontano dalla strada"
+msgid "Barriers and entrances"
+msgstr "Barriere ed ingressi"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Ricerca errori in barriere ed ingressi."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Ingresso della barriera non impostato sulla barrier"
+
msgid "Building inside building"
msgstr "Edificio interno ad altro edificio"
@@ -3772,7 +3883,7 @@ msgid "Checks and corrects deprecated tags."
msgstr "Controlla e corregge le etichette deprecate."
msgid "Deprecation fix of {0}"
-msgstr "Aggiustamento di {0}"
+msgstr "Correzione deprecazione di {0}"
msgid "{0} is deprecated"
msgstr "{0} è deprecata"
@@ -3783,6 +3894,9 @@ msgstr " oppure "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} è deprecata, utilizzare invece {1}"
+msgid "{0} is unnecessary"
+msgstr "{0} non necessario"
+
msgid "Duplicated nodes"
msgstr "Nodi duplicati"
@@ -3790,9 +3904,6 @@ msgid "This test checks that there are no nodes at the very same location."
msgstr ""
"Questo controllo verifica che non ci siano due nodi nella stessa posizione."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Nodi duplicati in due percorsi non chiusi"
-
msgid "Mixed type duplicated nodes"
msgstr "Nodi duplicati di tipo misto"
@@ -3864,6 +3975,24 @@ msgstr "Nodi dei percorsi duplicati."
msgid "Checks for ways with identical consecutive nodes."
msgstr "Cerca i percorsi con nodi consecutivi identici."
+msgid "Highways"
+msgstr "Strade"
+
+msgid "Performs semantic checks on highways."
+msgstr "Compie dei controlli semantici sulle strade."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Rotatoria non corretta (strada: {0} al posto di {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Informazioni su attraversamento pedonale mancanti"
+
+msgid "Unknown country code: {0}"
+msgstr "Codice paese sconosciuto: {0}"
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr "Contesto source:maxspeed sconosciuto: {0}"
+
msgid "Multipolygon"
msgstr "Multi-poligono"
@@ -3940,6 +4069,14 @@ msgstr ""
"Questo controllo cerca i nodi che hanno lo stesso nome (potrebbero essere "
"duplicati)."
+msgid "Opening hours syntax"
+msgstr "Sintassi orari di apertura"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+"Questo controllo verifica l''utilizzo corretto della sintassi degli orari di "
+"apertura."
+
msgid "Overlapping Areas"
msgstr "Aree sovrapposte"
@@ -3993,7 +4130,7 @@ msgid "Relation checker"
msgstr "Controllo relazioni"
msgid "This plugin checks for errors in relations."
-msgstr "Questa estensione cerca gli errori nelle relazioni."
+msgstr "Quest''estensione cerca gli errori nelle relazioni."
msgid "Relation type is unknown"
msgstr "Tipo di relazione sconosciuto"
@@ -4001,15 +4138,15 @@ msgstr "Tipo di relazione sconosciuto"
msgid "Relation is empty"
msgstr "Relazione vuota"
+msgid "Role verification problem"
+msgstr "Problema nella verifica del ruolo"
+
msgid "<empty>"
msgstr "<vuoto>"
msgid "Role {0} missing"
msgstr "Ruolo {0} mancante"
-msgid "Role verification problem"
-msgstr "Problema nella verifica del ruolo"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Numero di ruoli {0} troppo basso ({1})"
@@ -4043,16 +4180,16 @@ msgstr ""
"Questo controllo verifica se esistono percorsi con nomi simili che possano "
"essere errori d''ortografia."
-msgid "Properties checker :"
-msgstr "Analizzatore delle proprietà :"
+msgid "Tag checker"
+msgstr "Controllo etichette"
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
-"Questa estensione controlla gli errori nelle chiavi e nei valori delle "
-"proprietà."
+"Questo controllo verifica la presenza di errori nelle chiavi e nei valori "
+"delle etichette."
msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Linea TagChecker non valida - {0}: {1}"
+msgstr "Linea controllo etichette non valida - {0}: {1}"
msgid "Invalid spellcheck line: {0}"
msgstr "Linea di correzione ortografica non valida: {0}"
@@ -4123,7 +4260,7 @@ msgstr ""
"parole."
msgid "Use complex property checker."
-msgstr "Usa un analizzatore delle proprietà complesso."
+msgstr "Usa un controllo delle proprietà complesso."
msgid "Validate property values and tags using complex rules."
msgstr ""
@@ -4133,7 +4270,7 @@ msgid "Add"
msgstr "Aggiungi"
msgid "TagChecker source"
-msgstr "Sorgente TagChecker"
+msgstr "Sorgente controllo etichette"
msgid "Please select the row to edit."
msgstr "Scegli la riga da modificare."
@@ -4197,8 +4334,8 @@ msgstr "Usa file di controllo ortografico predefinito."
msgid "Use the default spellcheck file (recommended)."
msgstr "Usa il file di controllo ortografico predefinito (consigliato)."
-msgid "Fix properties"
-msgstr "Correggi proprietà"
+msgid "Fix tags"
+msgstr "Correzione etichette"
msgid "Could not find element type"
msgstr "Impossibile trovare il tipo di elemento"
@@ -4234,7 +4371,7 @@ msgid "More than one \"to\" way found"
msgstr "Trovato più di un percorso \"to\""
msgid "More than one \"via\" node found"
-msgstr "E'' stato trovato più di un nodo \"via\""
+msgstr "È stato trovato più di un nodo \"via\""
msgid "Cannot mix node and way for role \"via\""
msgstr "Impossibile mescolare un nodo ed un percorso per il ruolo \"via\""
@@ -4275,6 +4412,9 @@ msgstr "Percorsi non chiusi"
msgid "This tests if ways which should be circular are closed."
msgstr "Controlla se i percorsi che dovrebbero essere circolari siano chiusi"
+msgid "Unclosed way"
+msgstr "Percorso non chiuso"
+
msgid "natural type {0}"
msgstr "elemento naturale tipo {0}"
@@ -4305,9 +4445,6 @@ msgstr "building"
msgid "area"
msgstr "area"
-msgid "Unclosed way"
-msgstr "Percorso non chiuso"
-
msgid "Unconnected ways"
msgstr "Percorsi non connessi"
@@ -4335,12 +4472,12 @@ msgstr ""
"Questo controllo cerca i nodi senza etichetta che non fanno parte di alcun "
"percorso."
-msgid "No tags"
-msgstr "Nessun tag"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nodi non connessi senza etichette fisiche"
+msgid "No tags"
+msgstr "Nessun tag"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Contiene una etichetta ''fixme'' o ''FIXME''"
@@ -4405,28 +4542,6 @@ msgstr "Linea di costa invertita: terraferma non sul lato sinistro"
msgid "Reversed land: land not on left side"
msgstr "Terraferma invertita: manca la terraferma sul lato sinistro"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Numero errato di argomenti per il segnalibro"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Errore nella lettura della voce del segnalibro: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-"Errore: linea ''''{0}'''' non prevista nel file di segnalibro ''''{1}''''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Errore: valore in doppia precisione ''''{0}'''' non valido alla linea "
-"''''{1}'''' nel file di segnalibro ''''{2}''''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Impossibile leggere i segnalibri da<br>''{0}''<br>Errore generato: "
-"{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Non visualizzare nuovamente (ricorda la scelta)"
@@ -4440,7 +4555,7 @@ msgid "House {0}"
msgstr "Casa {0}"
msgid "House number {0} at {1}"
-msgstr "Numero civico da {0} a {1}"
+msgstr "Numero civico {0} di {1}"
msgid "House number {0}"
msgstr "Numero civico {0}"
@@ -4449,7 +4564,7 @@ msgid "highway"
msgstr "strada"
msgid "railway"
-msgstr "Linea ferroviaria"
+msgstr "Ferrovia"
msgid "waterway"
msgstr "Corso d’acqua"
@@ -4504,7 +4619,7 @@ msgid "Authentication Failed"
msgstr "Autenticazione fallita"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr "E'' vietato l''accesso alla versione revisionata ''{0}'' di {1} {2}."
+msgstr "È vietato l''accesso alla versione revisionata ''{0}'' di {1} {2}."
msgid "Authorisation Failed"
msgstr "Autorizzazione fallita"
@@ -4530,14 +4645,14 @@ msgstr "Mostra informazioni di aiuto"
msgid "Downloading \"Message of the day\""
msgstr "Scaricamento del \"messaggio del giorno\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Attenzione: impossibile leggere MOTD. L''eccezione è stata: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Fallita la lettura di MOTD. L''eccezione è stata: {0}"
msgid "Message of the day not available"
msgstr "Il messaggio del giorno non è disponibile"
msgid "Click to close the dialog"
-msgstr "Cliccare per chiudere la finestra"
+msgstr "Clicca per chiudere la finestra"
msgid "Imagery offset"
msgstr "Scostamento delle immagini aeree"
@@ -4748,9 +4863,24 @@ msgstr "Visualizza"
msgid "Tools"
msgstr "Strumenti"
+msgid "More tools"
+msgstr "Ulteriori strumenti"
+
+msgid "Data"
+msgstr "Dati"
+
+msgid "Selection"
+msgstr "Selezione"
+
msgid "Presets"
msgstr "Preimpostazioni"
+msgid "More..."
+msgstr "Altro..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Finestre"
@@ -4768,17 +4898,33 @@ msgstr ""
"Commuta la visibilità della barra degli strumenti di modifica (es. lo "
"strumento verticale)"
+msgid "Preset preferences"
+msgstr "Preferenze preimpostazioni"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+"Cliccare per aprire la scheda delle etichette preimpostate nelle preferenze"
+
+msgid "Imagery preferences"
+msgstr "Preferenze immagini aeree"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Cliccare per aprire la scheda delle immagini aeree nelle preferenze"
+
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
-msgstr "Nascondi la barra degli strumenti di modifica"
+msgid "Do not hide toolbar"
+msgstr "Non nascondere la barra degli strumenti"
msgid "Hide this button"
msgstr "Nascondi questo tasto"
msgid "Click the arrow at the bottom to show it again."
-msgstr "Cliccare la freccia sottostante per visualizzarlo nuovamente."
+msgstr "Clicca la freccia sottostante per visualizzarlo nuovamente."
+
+msgid "Hide edit toolbar"
+msgstr "Nascondi la barra degli strumenti di modifica"
msgid "Hide or show this toggle button"
msgstr "Nascondi o visualizza questo tasto"
@@ -4832,9 +4978,8 @@ msgid ""
"Middle click again to cycle through.<br>Hold CTRL to select directly from "
"this list with the mouse.<hr>"
msgstr ""
-"Cliccare con il tasto centrale nuovamente per proseguire nel "
-"ciclo.<br>Tenere premuto CTRL per selezionare direttamente da questa lista "
-"con il mouse.<hr>"
+"Clicca con il tasto centrale nuovamente per proseguire nel ciclo.<br>Tenere "
+"premuto CTRL per selezionare direttamente da questa lista con il mouse.<hr>"
msgid "(no object)"
msgstr "(nessun oggetto)"
@@ -4842,6 +4987,9 @@ msgstr "(nessun oggetto)"
msgid "User:"
msgstr "Utente:"
+msgid "Do not hide status bar"
+msgstr "Non nascondere la barra di stato"
+
msgid "Layer not in list."
msgstr "livello non in lista."
@@ -4861,27 +5009,13 @@ msgid "Nautical Mile"
msgstr "Miglio Nautico"
msgid "Click to cancel the current operation"
-msgstr "Cliccare per annullare l''operazione corrente"
+msgstr "Clicca per annullare l''operazione corrente"
msgid "In background"
msgstr "In secondo piano"
msgid "Click to run job in background"
-msgstr "Cliccare per eseguire il processo in secondo piano"
-
-msgid "false: the property is explicitly switched off"
-msgstr "falso: la proprietà è esplicitamente disattivata"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: la proprietà è esplicitamente impostata attiva"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parziale: diversi oggetti selezionati hanno valori diversi, non cambiato"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "non settato: non settare questa proprietà sugli oggetti selezionati"
+msgstr "Clicca per eseguire il processo in secondo piano"
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4944,11 +5078,11 @@ msgstr "Ruolo"
msgid "Click to close the dialog and remove the object from the relations"
msgstr ""
-"Cliccare per chiudere la finestra ed eliminare l''oggetto dalle relazioni"
+"Clicca per chiudere la finestra ed eliminare l''oggetto dalle relazioni"
msgid "Click to close the dialog and to abort deleting the objects"
msgstr ""
-"Cliccare per chiudere la finestra ed annullare l''eliminazione degli oggetti"
+"Clicca per chiudere la finestra ed annullare l''eliminazione degli oggetti"
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -5204,6 +5338,9 @@ msgstr ""
"Copia gli elementi personali selezionati alla fine della lista degli "
"elementi uniti"
+msgid "> before"
+msgstr "> prima"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5211,6 +5348,9 @@ msgstr ""
"Copia gli elementi personali selezionati prima del primo elemento "
"selezionato nella lista degli elementi uniti"
+msgid "> after"
+msgstr "> dopo"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5218,17 +5358,26 @@ msgstr ""
"Copia gli elementi personali selezionati dopo il primo elemento selezionato "
"nella lista degli elementi uniti"
+msgid "< top"
+msgstr "< sopra"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Copia il loro elemento selezionato all''inizio della lista degli elementi "
"uniti"
+msgid "< bottom"
+msgstr "< sotto"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Copia i loro elementi selezionati alla fine della lista degli elementi uniti"
+msgid "< before"
+msgstr "< prima"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5236,6 +5385,9 @@ msgstr ""
"Copia i loro elementi selezionati prima del primo elemento selezionato nella "
"lista degli elementi uniti"
+msgid "< after"
+msgstr "< dopo"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5252,8 +5404,8 @@ msgstr "Copia tutti i loro elementi verso la destinazione"
msgid "Up"
msgstr "Su"
-msgid "Move up the selected elements by one position."
-msgstr "Sposta in su gli elementi selezionati di una posizione"
+msgid "Move up the selected entries by one position."
+msgstr "Sposta in alto le voci selezionate di una posizione."
msgid "Down"
msgstr "Giù"
@@ -5308,16 +5460,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Loro versione ({0} voce)"
msgstr[1] "Loro versione ({0} voci)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Variazione {0} non ancora registrata. Non è possibile impostare la "
-"partecipazione nella variazione sincronizzata."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Variazione {0} non ancora registrata."
-
msgid "Node"
msgstr "Nodo"
@@ -5495,7 +5637,7 @@ msgstr ""
"Si stanno per unire {0} oggetti, ma le seguenti etichette sono in "
"conflitto:<br/>{1}Se questi oggetti vengono uniti l''oggetto risultante "
"potrebbe contenere delle etichette non volute.<br/>Se si desidera continuare "
-"verrà proposta una finestra per la risoluzione delle etichette oggetto di "
+"verrà proposta una finestra per la correzione delle etichette oggetto di "
"conflitto.<br/><br/>Si desidera continuare?"
msgid "none"
@@ -5605,18 +5747,18 @@ msgctxt "tag"
msgid "Key:"
msgstr "Chiave:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Inserire una chiave per l''etichetta, es. "
+"<html>Inserire una chiave di etichetta, es. "
"<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valore:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Inserire un valore per l''etichetta, es. <strong><tt>controllare i "
+"<html>Inserire un valore di etichetta, es. <strong><tt>controllare i "
"membri</tt></strong></html>"
msgid ""
@@ -5773,11 +5915,11 @@ msgstr ""
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
-msgstr[0] "E'' stato individuato {0} conflitto."
+msgstr[0] "È stato individuato {0} conflitto."
msgstr[1] "Sono stati individuati {0} conflitti."
msgid "Click to close this dialog and continue editing"
-msgstr "Cliccare per chiudere questa finestra e continuare a modificare"
+msgstr "Clicca per chiudere questa finestra e continuare a modificare"
msgid "Conflicts detected"
msgstr "Rilevati conflitti"
@@ -5807,8 +5949,8 @@ msgid ""
msgstr ""
"<html> Non è stata completata la fusione delle differenze in questo "
"conflitto.<br>La risoluzione dei conflitti non sarà applicata finchè tutte "
-"le differenze<br> non saranno risolte.<br>Frare clic <strong>{0}</strong> "
-"per chiudere comunque.<strong>appena risolte le differenze non sarà "
+"le differenze<br> non saranno risolte.<br>Clicca <strong>{0}</strong> per "
+"chiudere comunque.<strong>appena risolte le differenze non sarà "
"applicata.</strong><br>Fare clic <strong>{1}</strong> per tornare alla "
"risoluzione dei conflitti.</html>"
@@ -5828,7 +5970,7 @@ msgid "Enable filter"
msgstr "Abilita filtro"
msgid "Multikey: {0}"
-msgstr "Multi-chiave: {0}"
+msgstr "Chiave multipla: {0}"
msgid "Hide filter"
msgstr "Nascondi filtro"
@@ -5916,7 +6058,7 @@ msgid "Display the history of all selected items."
msgstr "Visualizza la cronologia di tutti gli oggetti selezionati."
msgid "Object with history"
-msgstr "Oggetto con storico"
+msgstr "Oggetto con cronologia"
msgid "Reload"
msgstr "Ricarica"
@@ -5930,7 +6072,7 @@ msgid "Show"
msgstr "Visualizza"
msgid "Display the history of the selected objects."
-msgstr "Visualizza lo storico degli oggetti selezionati."
+msgstr "Visualizza la cronologia degli oggetti selezionati."
msgid "Advanced object info"
msgstr "Informazioni avanzate sull''oggetto"
@@ -6050,7 +6192,7 @@ msgid ""
msgstr ""
"\n"
"\n"
-"> ignoro \"{0}\" (non attivo)"
+"> tralascio \"{0}\" (non attivo)"
msgid ""
"\n"
@@ -6191,18 +6333,17 @@ msgid "Copy {1} of {0}"
msgstr "Copia {1} di {0}"
msgid "layer is currently visible (click to hide layer)"
-msgstr ""
-"il livello è attualmente visibile (cliccare per nascondere il livello)"
+msgstr "il livello è attualmente visibile (clicca per nascondere il livello)"
msgid "layer is currently hidden (click to show layer)"
msgstr ""
-"il livello è attualmente nascosto (cliccare per visualizzare il livello)"
+"il livello è attualmente nascosto (clicca per visualizzare il livello)"
msgid "this layer is the active layer"
msgstr "questo livello è quello attivo"
msgid "this layer is not currently active (click to activate)"
-msgstr "questo livello non è attualmente attivo (cliccare per attivare)"
+msgstr "questo livello non è attualmente attivo (clicca per attivare)"
msgid "Move the selected layer one row up."
msgstr "Sposta il livello selezionato in su."
@@ -6216,6 +6357,9 @@ msgstr "Mostra/Nascondi"
msgid "Information about layer"
msgstr "Informazioni sul livello"
+msgid "Map paint preferences"
+msgstr "Preferenze disegno mappa"
+
msgid "Map Paint Styles"
msgstr "Stili di disegno della mappa"
@@ -6301,13 +6445,46 @@ msgstr "Lo stile è attualmente attivo?"
msgid "No"
msgstr "No"
-msgid "Relations"
-msgstr "Relazioni"
+msgid "Object type:"
+msgstr "Tipo oggetto:"
-msgid "Open a list of all relations."
-msgstr "Apri una lista di tutte le relazioni"
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "misto"
-msgid "Relation list filter"
+msgid "Choose the OSM object type"
+msgstr "Scegli il tipo di oggetto OSM"
+
+msgid "Object ID:"
+msgstr "ID oggetto:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Inserire l''ID dell''oggetto che deve essere scaricato"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Gli ID degli oggetti possono essere separati da una virgola o da uno "
+"spazio.<br/> Esempi: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Nella "
+"modalità mista specificare gli oggetti in questo modo: <b>w123, n110, w12, "
+"r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"Specificato ID lista non valido\n"
+"Impossibile continuare."
+
+msgid "Relations"
+msgstr "Relazioni"
+
+msgid "Open a list of all relations."
+msgstr "Apri una lista di tutte le relazioni"
+
+msgid "Relation list filter"
msgstr "Elenco filtri relazioni"
msgid "Create a new relation"
@@ -6322,9 +6499,6 @@ msgstr "Relazioni: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relazioni: {0}"
-msgid "Selection"
-msgstr "Selezione"
-
msgid "Open a selection list window."
msgstr "Apri una finestra con la lista delle selezioni."
@@ -6349,18 +6523,6 @@ msgstr "Non selezionabile ora"
msgid "Selection: {0}"
msgstr "Selezione: {0}"
-msgid "Side buttons"
-msgstr "Pulsanti laterali"
-
-msgid "Always shown"
-msgstr "Sempre mostrato"
-
-msgid "Dynamic"
-msgstr "Dinamico"
-
-msgid "Always hidden"
-msgstr "Sempre nascosto"
-
msgid "Toggle dynamic buttons"
msgstr "Commuta i tasti dinamici"
@@ -6377,7 +6539,19 @@ msgstr ""
"degli strumenti a sinistra."
msgid "Click to minimize/maximize the panel content"
-msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello"
+msgstr "Clicca per minimizzare/massimizzare il contenuto del pannello"
+
+msgid "Side buttons"
+msgstr "Pulsanti laterali"
+
+msgid "Always shown"
+msgstr "Sempre mostrato"
+
+msgid "Dynamic"
+msgstr "Dinamico"
+
+msgid "Always hidden"
+msgstr "Sempre nascosto"
msgid "Authors"
msgstr "Autori"
@@ -6398,11 +6572,10 @@ msgstr "Seleziona gli oggetti inviati da questo utente"
msgid "Launches a browser with information about the user"
msgstr "Avvia un browser con le informazioni dell''utente"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Attenzione: avviati i browser delle informazioni per i primi {0} dei {1} "
-"utenti selezionati"
+"Avvio del browser delle informazioni solamente per {0} dei {1} utenti "
+"selezionati"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6429,9 +6602,6 @@ msgstr "Apre la finestra di verifica."
msgid "Validation results"
msgstr "Risultati della validazione"
-msgid "Zoom to problem"
-msgstr "Ingrandisci la visuale sul problema"
-
msgid "Fix"
msgstr "Correggi"
@@ -6583,11 +6753,8 @@ msgstr "Aggiorna contenuto"
msgid "Update the changeset content from the OSM server"
msgstr "Aggiorna dal server OSM il contenuto del gruppo di modifiche"
-msgid "Show history"
-msgstr "Visualizza storico"
-
msgid "Download and show the history of the selected objects"
-msgstr "Scarica e visualizza lo storico degli oggetti selezionati"
+msgstr "Scarica e visualizza la cronologia degli oggetti selezionati"
msgid "Select in layer"
msgstr "Seleziona nel livello"
@@ -6931,11 +7098,11 @@ msgstr ""
"<html>Scarica i gruppi di modifiche nella vista corrente della mappa</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Attenzione: valore inatteso per la preferenza ''''{0}'''', ottenuto "
-"''''{1}''''. Ritorno all''interrogazione predefinita."
+"Valore inatteso per la preferenza ''{0}'', ottenuto ''{1}''. Azzeramento con "
+"l''interrogazione predefinita."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -7012,35 +7179,47 @@ msgid "This changeset query URL is invalid"
msgstr ""
"L’indirizzo URL per l’interrogazione sui gruppi di modifiche non è valido"
-msgid "Select objects for which to change properties."
-msgstr "Seleziona gli oggetti per i quali modificare le proprietà."
+msgid "Discardable key: selection Foreground"
+msgstr "Chiave scartabile: selezione in primo piano"
-msgid "Properties/Memberships"
-msgstr "Proprietà/Appartenenze"
+msgid "Discardable key: selection Background"
+msgstr "Chiave scartabile: selezione sullo sfondo"
-msgid "Properties for selected objects."
-msgstr "Proprietà per gli oggetti selezionati."
+msgid "Discardable key: foreground"
+msgstr "Chiave scartabile: primo piano"
+
+msgid "Discardable key: background"
+msgstr "Chiave scartabile: sfondo"
msgid "<different>"
msgstr "<diverso>"
+msgid "Select objects for which to change tags."
+msgstr "Selezionare gli oggetti per i quali modificare le etichette."
+
+msgid "Tags/Memberships"
+msgstr "Etichette/Appartenenze"
+
+msgid "Tags for selected objects."
+msgstr "Etichette per gli oggetti selezionati."
+
msgid "Member Of"
msgstr "Membro di"
msgid "Position"
msgstr "Posizione"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Proprietà: {0} / Appartenenze: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Etichette: {0} / Appartenenze: {1}"
-msgid "Properties / Memberships"
-msgstr "Proprietà / Appartenenze"
+msgid "Tags / Memberships"
+msgstr "Etichette / Appartenenze"
msgid "Delete the selected key in all objects"
msgstr "Cancella la chiave selezionata in tutti gli oggetti"
-msgid "Delete Properties"
-msgstr "Elimina proprietà"
+msgid "Delete Tags"
+msgstr "Elimina etichette"
msgid "Change relation"
msgstr "Cambia relazione"
@@ -7054,14 +7233,14 @@ msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
-msgid "Add Property"
-msgstr "Aggiungi proprietà"
+msgid "Add Tag"
+msgstr "Aggiungi tag"
msgid "Edit the value of the selected key for all objects"
msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
-msgid "Edit Properties"
-msgstr "Modifica proprietà"
+msgid "Edit Tags"
+msgstr "Modifica etichette"
msgid "Go to OSM wiki for tag help (F1)"
msgstr ""
@@ -7145,12 +7324,6 @@ msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
msgid "Use English language for tag by default"
msgstr "Utilizza la lingua inglese per l''etichetta in modo predefinito"
-msgid "Paste tag"
-msgstr "Incolla etichetta"
-
-msgid "Paste value"
-msgstr "Incolla valore"
-
msgid "Add value?"
msgstr "Aggiungere il valore?"
@@ -7182,8 +7355,14 @@ msgstr "Si prega di inserire un numero compreso tra 0 e {0}"
msgid "Recently added tags"
msgstr "Etichette aggiunte recentemente"
+msgid "Choose recent tag {0}"
+msgstr "Scegli etichetta recente {0}"
+
msgid "Use this tag again"
-msgstr "Utilizza nuovamente questa etichetta"
+msgstr "Utilizza nuovamente quest''etichetta"
+
+msgid "Apply recent tag {0}"
+msgstr "Applica etichetta recente {0}"
msgid "The key ''{0}'' is already used"
msgstr "La chiave ''{0}'' è già stata utilizzata"
@@ -7226,10 +7405,8 @@ msgstr "La relazione è eliminata"
msgid "Downloading relation {0}"
msgstr "Scaricamento della relazione {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Attenzione: ignoro l''errore perché il processo è stato annullato. "
-"Eccezione: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Eccezione ignorata per annullamento del lavoro. Eccezione: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7295,6 +7472,11 @@ msgstr "Rimuovili, ripulisci la relazione"
msgid "Ignore them, leave relation as is"
msgstr "Ignorali, mantieni la relazione com’è"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Spiacenti, la scorciatoia \"{0}\" non può essere abilitata nella finestra di "
+"modifica delle relazioni"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7314,7 +7496,7 @@ msgid ""
msgstr ""
"<html>Si sta tentando di aggiungere una relazione a sé stessa.<br><br>Questo "
"crea dei riferimenti circolari e ne è scoraggiato l''utilizzo.<br>Relazione "
-"''''{0}'''' omessa.</html>"
+"''''{0}'''' tralasciata.</html>"
msgid ""
"Add all objects selected in the current dataset before the first member"
@@ -7405,13 +7587,13 @@ msgstr "Si, crea un conflitto e chiudi"
msgid "Click to create a conflict and close this relation editor"
msgstr ""
-"Cliccare per creare un conflitto e chiudere questo editor delle relazioni"
+"Clicca per creare un conflitto e chiudere questo editor delle relazioni"
msgid "No, continue editing"
msgstr "No, continua la modifica"
msgid "Click to return to the relation editor and to resume relation editing"
-msgstr "Cliccare per ritornare alla modifica della relazione"
+msgstr "Clicca per ritornare alla modifica della relazione"
msgid ""
"<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -7444,14 +7626,14 @@ msgstr "Si, salva le modifiche e chiudi"
msgid "Click to save the changes and close this relation editor"
msgstr ""
-"Premere per salvare le modifiche e chiudere questo editor delle relazioni"
+"Clicca per salvare le modifiche e chiudere questo editor delle relazioni"
msgid "No, discard the changes and close"
msgstr "No, abbandona le modifiche e chiudi"
msgid "Click to discard the changes and close this relation editor"
msgstr ""
-"Premere per abbandonare le modifiche e chiudere questo editor delle relazioni"
+"Clicca per abbandonare le modifiche e chiudere questo editor delle relazioni"
msgid "Cancel, continue editing"
msgstr "Annulla, continua le modifiche"
@@ -7589,6 +7771,29 @@ msgstr ""
"il percorso non è connesso al precedente o al successivo membro della "
"relazione"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Numero errato di argomenti per il segnalibro"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Errore nella lettura della voce del segnalibro: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Linea ''{0}'' inattesa nel file segnalibro ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Valore double non valido ''{0}'' alla riga ''{1}'' nel file segnalibro "
+"''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Impossibile leggere i segnalibri da<br>''{0}''<br>Errore generato: "
+"{1}</html>"
+
msgid "Bookmarks"
msgstr "Segnalibri"
@@ -7663,9 +7868,6 @@ msgid "Value for longitude in range [-180,180] required."
msgstr ""
"Per la longitudine è richiesto un valore nell''intervallo [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Incolla indirizzo URL dagli appunti"
-
msgid "Data Sources and Types:"
msgstr "Sorgenti dati e tipi:"
@@ -7727,10 +7929,10 @@ msgid "Download area ok, size probably acceptable to server"
msgstr "Area da scaricare corretta, sarà probabilmente accettata dal server"
msgid "Click to close the dialog and to abort downloading"
-msgstr "Cliccare per chiudere la finestra e per annullare lo scaricamento"
+msgstr "Clicca per chiudere la finestra e per annullare lo scaricamento"
msgid "Click to download the currently selected area"
-msgstr "Cliccare per scaricare l''area attualmente selezionata"
+msgstr "Clicca per scaricare l''area attualmente selezionata"
msgid "Please select a download area first."
msgstr "Selezionare prima un''area di scarico."
@@ -7750,21 +7952,8 @@ msgstr "Scarica oggetti collegati (relazioni padre)"
msgid "Download object"
msgstr "Scarica oggetto"
-msgid "Object type:"
-msgstr "Tipo oggetto:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "misto"
-
-msgid "Choose the OSM object type"
-msgstr "Scegli il tipo di oggetto OSM"
-
-msgid "Object ID:"
-msgstr "ID oggetto:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Inserire l''ID dell''oggetto che deve essere scaricato"
+msgid "Start downloading"
+msgstr "Inizio scaricamento"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7777,29 +7966,9 @@ msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
"Selezionare se devono essere scaricati anche i membri di una relazione"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Gli ID degli oggetti possono essere separati da una virgola o da uno "
-"spazio.<br/> Esempi: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Nella "
-"modalità mista specificare gli oggetti in questo modo: <b>w123, n110, w12, "
-"r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Scarica oggetti collegati (relazioni padre e percorsi)"
-msgid "Start downloading"
-msgstr "Inizio scaricamento"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"E'' stato specificato una lista di identificavi non valida\n"
-"Impossibile scaricare l''oggetto."
-
msgid "Class Type"
msgstr "Tipo classe"
@@ -7825,7 +7994,7 @@ msgid "Search ..."
msgstr "Cerca ..."
msgid "Click to start searching for places"
-msgstr "Cliccare per iniziare la ricerca delle località"
+msgstr "Clicca per iniziare la ricerca delle località"
msgid "Querying name server"
msgstr "Interrogazione del server dei nomi"
@@ -7913,9 +8082,8 @@ msgstr "Vai alla pagina successiva"
msgid "Go to the JOSM help home page"
msgstr "Vai alla pagina iniziale di aiuto a JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
-"Attenzione: posizione errata nel documento HTML. L''eccezione è stata: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Posizione non valida nel documento HTML. L''eccezione è stata: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr ""
@@ -7938,37 +8106,37 @@ msgid "Coordinates"
msgstr "Coordinate"
msgid "History for node {0}"
-msgstr "Storico per il nodo {0}"
+msgstr "Cronologia per il nodo {0}"
msgid "History for way {0}"
-msgstr "Storico per il percorso {0}"
+msgstr "Cronologia per la way {0}"
msgid "History for relation {0}"
-msgstr "Storico per la relazione {0}"
+msgstr "Cronologia per la relazione {0}"
msgid "Reload the history from the server"
-msgstr "Ricarica lo storico dal server"
+msgstr "Ricarica la cronologia dal server"
msgid "History not initialized yet. Failed to set reference primitive."
msgstr ""
-"Storico non ancora inizializzato. Fallita l''impostazione della primitiva di "
-"riferimento."
+"Cronologia non ancora inizializzata. Fallita l''impostazione della primitiva "
+"di riferimento."
msgid ""
"Failed to set reference. Reference ID {0} does not match history ID {1}."
msgstr ""
"Fallita l''impostazione del riferimento. Il riferimento con ID {0} non "
-"corrisponde allo storico con ID {1}."
+"corrisponde alla cronologia con ID {1}."
msgid ""
"Failed to set reference. Reference version {0} not available in history."
msgstr ""
"Fallita l''impostazione del riferimento. Il riferimento con versione {0} non "
-"è disponibile nello storico."
+"è disponibile nella cronologia."
msgid "History not initialized yet. Failed to set current primitive."
msgstr ""
-"storico non ancora inizializzato. E'' fallito il tentativo di impostare la "
+"Cronologia non ancora inizializzata. Fallito il tentativo di impostare la "
"primitiva corrente."
msgid ""
@@ -7976,19 +8144,19 @@ msgid ""
"history."
msgstr ""
"Fallita l''impostazione della primitiva corrente. La versione corrente {0} "
-"non è disponibile nello storico."
+"non è disponibile nella cronologia."
msgid "Load history"
-msgstr "Carica storico"
+msgstr "Carica cronologia"
msgid "Loading history for node {0}"
-msgstr "Caricamento dello storico per il nodo {0}"
+msgstr "Caricamento della cronologia per il nodo {0}"
msgid "Loading history for way {0}"
-msgstr "Caricamento dello storico per il percorso {0}"
+msgstr "Caricamento della cronologia per il percorso {0}"
msgid "Loading history for relation {0}"
-msgstr "Caricamento dello storico per la relazione {0}"
+msgstr "Caricamento della cronologia per la relazione {0}"
msgid "Node {0}"
msgstr "Nodo {0}"
@@ -8000,7 +8168,7 @@ msgid "Zoom to this node in the current data layer"
msgstr "Ingrandisci la visuale su questo nodo nel livello dei dati corrente"
msgid "Open a history browser with the history of this node"
-msgstr "Apri un navigatore dello storico con lo storico di questo nodo"
+msgstr "Apri una cronologia del browser con la cronologia di questo nodo"
msgid "Way {0}"
msgstr "Percorso {0}"
@@ -8028,6 +8196,9 @@ msgid ""
msgstr ""
"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Commento al gruppo di modifiche"
+
msgid "Changeset info"
msgstr "Informazioni sul gruppo di modifiche"
@@ -8125,26 +8296,24 @@ msgstr "Prepara la risoluzione dei conflitti"
msgid "Click to download all referring objects for {0}"
msgstr ""
-"Cliccare per scaricare tutti gli oggetti ai quali si fa riferimento per {0}"
+"Clicca per scaricare tutti gli oggetti ai quali si fa riferimento per {0}"
msgid "Click to cancel and to resume editing the map"
-msgstr "Cliccare per annullare e per ritornare alla modifica della mappa"
+msgstr "Clicca per annullare e per ritornare alla modifica della mappa"
msgid ""
"Click <strong>{0}</strong> to load them now.<br>If necessary JOSM will "
"create conflicts which you can resolve in the Conflict Resolution Dialog."
msgstr ""
-"Cliccare <strong>{0}</strong> per caricarli adesso.<br>Se necessario JOSM "
+"Clicca <strong>{0}</strong> per caricarli adesso.<br>Se necessario JOSM "
"creerà dei conflitti che si potranno risolvere nella finestra di risoluzione "
"dei conflitti."
msgid "Object still in use"
msgstr "Oggetto ancora in uso"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Attenzione: la testata dell''errore \"{0}\" non corrisponde ad alcun schema "
-"atteso"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "La testata d''errore \"{0}\" non corrisponde con uno schema atteso"
msgid "Upload"
msgstr "Carica"
@@ -8166,6 +8335,12 @@ msgstr "Crea un breve commento ai cambiamenti che sta caricando:"
msgid "Enter an upload comment"
msgstr "Inserire un commento al caricamento"
+msgid "Specify the data source for the changes:"
+msgstr "Specificare la sorgente dati per le modifiche:"
+
+msgid "Enter a source"
+msgstr "Inserire una sorgente"
+
msgid "Changeset id:"
msgstr "Identificativo del gruppo di modifiche:"
@@ -8237,11 +8412,10 @@ msgid "Closing changeset {0}"
msgstr "Chiusura del gruppo di modifiche {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Attenzione: errore nel posizionare la Dialog delle Credenziali sempre in "
-"primo piano. Intercettata una eccezione di sicurezza"
+"E'' fallito il tentativo di mettere sempre in primo piano la finestra delle "
+"credenziali. E'' stata rilevata una eccezione di sicurezza."
msgid "Enter credentials for OSM API"
msgstr "Immettere le credenziali per le API OSM"
@@ -8327,11 +8501,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Decompressione di {0} in {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Attenzione: impossibile scaricare il file ''{0}''. Il suo collegamento "
-"''{1}'' non è un indirizzo URL valido. Salto lo scaricamento."
+"Impossibile scaricare il file ''{0}''. Il suo collegamento ''{1}'' non è un "
+"URL valido. Scaricamento tralasciato."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8348,10 +8522,9 @@ msgid "Missing user identity"
msgstr "Identità utente mancante"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Attenzione: fallito il recupero delle informazioni per l''utente JOSM "
+"Fallito l''ottenimento delle informazioni utente per l''utente JOSM "
"corrente. L''eccezione è stata: {0}"
msgid "Download objects"
@@ -8370,14 +8543,14 @@ msgid ""
"Either edit the path manually in the text field or click the \"...\" button "
"to open a file chooser."
msgstr ""
-"Modificare il percorso manualmente nel campo testuale oppure cliccare il "
+"Modificare il percorso manualmente nel campo testuale oppure clicca il "
"pulsante \"...\" per aprire il selezionatore di file."
msgid "The bold text is the name of the layer."
msgstr "Il testo in grassetto è il nome del livello."
msgid "Click here to choose save path"
-msgstr "Cliccare qui per scegliere il percorso di salvataggio"
+msgstr "Clicca qui per scegliere il percorso di salvataggio"
msgid "Layer ''{0}'' is not backed by a file"
msgstr "Il livello ''''{0}'''' non è supportato da un file"
@@ -8387,7 +8560,7 @@ msgstr ""
"Il file ''''{0}'''' non è scrivibile. Specificare un altro nome di file."
msgid "Click cell to change the file path."
-msgstr "Cliccare sulla cella per modificare il percorso del file."
+msgstr "Clicca sulla cella per modificare il percorso del file."
msgid "Open Recent"
msgstr "Apri recente"
@@ -8511,7 +8684,7 @@ msgid_plural ""
"<html>Upload and/or save operations of {0} layers with modifications<br>were "
"canceled or have failed.</html>"
msgstr[0] ""
-"<html>E'' stata annullata o è fallita una operazione di caricamento e/o "
+"<html>È stata annullata o è fallita una operazione di caricamento e/o "
"salvataggio<br>di un livello contenente delle modifiche.</html>"
msgstr[1] ""
"<html>Sono state annullate o sono fallite le operazioni di caricamento e/o "
@@ -8602,12 +8775,6 @@ msgstr "Carica le primitive modificate"
msgid "Please revise upload comment"
msgstr "Si prega di rivedere il commento al caricamento"
-msgid "Revise"
-msgstr "Rivedi"
-
-msgid "Continue as is"
-msgstr "Utilizza così com''è"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8623,6 +8790,27 @@ msgstr ""
"descrivere le proprie modifiche, si renderà la vita<br />più facile agli "
"altri mappatori."
+msgid "Please specify a changeset source"
+msgstr "Si prega di specificare una sorgente del gruppo di modifiche"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"Non è stata specificata una sorgente per le proprie modifiche.<br />Questo è "
+"tecnicamente permesso, ma aiuta gli altri utenti <br />a conoscere "
+"l''origine dei dati.<br /><br />Se si dedica un minuto adesso per spiegare "
+"la propria modifica si renderà la vita<br />più facile a molti altri "
+"mappatori."
+
+msgid "Revise"
+msgstr "Rivedi"
+
+msgid "Continue as is"
+msgstr "Utilizza così com''è"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Ritorna alla finestra precedente per inserire un commento più significativo"
@@ -8639,6 +8827,25 @@ msgstr "Si prega di inserire prima una dimensione del raggruppamento valida"
msgid "Illegal chunk size"
msgstr "Dimensione del raggruppamento non valida"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>L''etichetta del seguente gruppo di modifiche contiene una "
+"chiave/valore vuoti:<br>{0}<br>Continuare?</html>"
+msgstr[1] ""
+"<html>Le etichette del seguente gruppo di modifiche contengono una "
+"chiave/valore vuoti:<br>{0}<br>Continuare?</html>"
+
+msgid "Empty metadata"
+msgstr "Metadati vuoti"
+
msgid "Cancel the upload and resume editing"
msgstr "Annulla il caricamento e ritorna alle modifiche"
@@ -8646,11 +8853,11 @@ msgid "Tags of changeset {0}"
msgstr "Etichette del gruppo di modifiche {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Attenzione: l''oggetto ''''{0}'''' risulta già eliminato sul server. Salto "
-"questo oggetto e riprovo a caricare."
+"L''oggetto ''{0}'' è stato già eliminato sul server. Tralascio questo "
+"oggetto e ritento il caricamento."
msgid "Preparing objects to upload ..."
msgstr "Preparazione degli oggetti da caricare ..."
@@ -8738,20 +8945,19 @@ msgstr "Continua il caricamento"
msgid "Click to continue uploading to additional new changesets"
msgstr ""
-"Cliccare per continuare il caricamento su nuovi gruppi di modifiche "
-"addizionali"
+"Clicca per continuare il caricamento su nuovi gruppi di modifiche addizionali"
msgid "Go back to Upload Dialog"
msgstr "Ritorna alla finestra di caricamento"
msgid "Click to return to the Upload Dialog"
-msgstr "Cliccare per ritornare alla finestra di caricamento"
+msgstr "Clicca per ritornare alla finestra di caricamento"
msgid "Abort"
msgstr "Interrompi"
msgid "Click to abort uploading"
-msgstr "Cliccare per interrompere il caricamento"
+msgstr "Clicca per interrompere il caricamento"
msgid ""
"The server reported that the current changeset was closed.<br>This is most "
@@ -8773,7 +8979,7 @@ msgid ""
"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
"map editing.<br>"
msgstr ""
-"Cliccare ''<strong>{0}</strong>'' per continuare il caricamento su nuovi "
+"Clicca ''<strong>{0}</strong>'' per continuare il caricamento su nuovi "
"gruppi di modifiche.<br>Cliccare ''<strong>{1}</strong>'' per ritornare alla "
"finestra di caricamento.<br>Cliccare ''<strong>{2}</strong>'' per annullare "
"il caricamento e ritornare alla modifica della mappa.<br>"
@@ -8783,23 +8989,21 @@ msgstr "Gruppo di modifiche pieno"
msgid "Node ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-"Il nodo ''{0}'' è stato già eliminato. Salto l''oggetto nel caricamento."
+"Il nodo ''{0}'' è stato già eliminato. Tralascio l''oggetto nel caricamento."
msgid "Way ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-"Il percorso ''{0}'' è stato già eliminato. Salto l''oggetto nel caricamento."
+"Il percorso ''{0}'' è stato già eliminato. Tralascio l''oggetto nel "
+"caricamento."
msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-"La relazione ''{0}'' è stata già eliminata. Salto l''oggetto nel caricamento."
+"La relazione ''{0}'' è stata già eliminata. Tralascio l''oggetto nel "
+"caricamento."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-"L''oggetto ''''{0}'''' è già eliminato. Salto l''oggetto durante il "
-"caricamento."
-
-msgid "Warning: {0}"
-msgstr "Attenzione: {0}"
+"L''oggetto ''''{0}'''' è già eliminato. Tralascio l''oggetto nel caricamento."
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
@@ -8812,6 +9016,9 @@ msgstr ""
"L''eccezione che è stata generata verrà ignorata perché il caricamento è "
"stato annullato. L''eccezione è: {0}"
+msgid "Upload successful!"
+msgstr "Caricamento riuscito!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8832,10 +9039,9 @@ msgstr "Seleziona gli oggetti da caricare"
msgid "Cancel uploading"
msgstr "Annulla il caricamento"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Attenzione: valore inaspettato per la chiave ''''{0}'''' nelle preferenze, "
-"ottenuto ''''{1}''''"
+"Valore inatteso per la chiave ''{0}'' nelle preferenze, ottenuto ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Si prega di selezionare la strategia di caricamento:"
@@ -8989,16 +9195,16 @@ msgid "ERROR"
msgstr "ERRORE"
msgid "Next marker"
-msgstr "Marcatore successivo"
+msgstr "Contrassegno successivo"
msgid "Jump to next marker"
-msgstr "Vai al prossimo marcatore"
+msgstr "Vai al contrassegno successivo"
-msgid "Previos marker"
-msgstr "Marcatore precedente"
+msgid "Previous marker"
+msgstr "Contrassegno precedente"
msgid "Jump to previous marker"
-msgstr "Vai al precedente marcatore"
+msgstr "Vai al contrassegno precedente"
msgid "All projections are supported"
msgstr "Sono supportate tutte le proiezioni"
@@ -9027,10 +9233,8 @@ msgstr "versione {0}"
msgid "Merging layers"
msgstr "Unione dei livelli"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Attenzione: l''uso contemporaneo di dati nelle versioni 0.5 e 0.6 risulterà "
-"nella versione 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Mescolando i dati 0.6 e 0.5 si ottiene la versione 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -9151,6 +9355,9 @@ msgstr "aumenta il livello di ingrandimento per vedere più dettagli"
msgid "No tiles at this zoom level"
msgstr "Nessun tassello in questo livello di ingrandimento"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "Livello TMS ({0}), scaricamento nell''ingrandimento {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "Sono supportate le proiezioni EPSG:4326 e di Mercatore"
@@ -9191,6 +9398,9 @@ msgstr "Ricarica i tasselli non corretti"
msgid "Alpha channel"
msgstr "Alpha channel"
+msgid "Automatically change resolution"
+msgstr "Cambia automaticamente risoluzione"
+
msgid "Set WMS Bookmark"
msgstr "Imposta segnalibro WMS"
@@ -9353,12 +9563,12 @@ msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
"adjust the sliders to manually match the photos."
msgstr ""
-"E'' stato generato un errore durante il tentativo di correlare le foto con "
-"il tracciato GPX. Si possono regolare le barre di scorrimento per correlare "
+"È stato generato un errore durante il tentativo di correlare le foto con il "
+"tracciato GPX. Si possono regolare le barre di scorrimento per correlare "
"manualmente le foto."
msgid "Matching photos to track failed"
-msgstr "E'' fallita la correlazione delle foto al tracciato"
+msgstr "È fallita la correlazione delle foto al tracciato"
msgid "Adjust timezone and offset"
msgstr "Regola fuso orario e scostamento"
@@ -9373,8 +9583,8 @@ msgid ""
"The selected GPX track does not contain timestamps. Please select another "
"one."
msgstr ""
-"Il tracciato GPX selezionato non contiene le marcature temporali. "
-"Selezionarne un altro."
+"Il tracciato GPX selezionato non contiene le marche temporali. Selezionarne "
+"un altro."
msgid "GPX Track has no time information"
msgstr "Il tracciato GPX non contiene alcuna informazione sull''ora"
@@ -9405,9 +9615,6 @@ msgstr "Estrazione delle localizzazioni GPS dagli EXIF"
msgid "Starting directory scan"
msgstr "Inizio analisi cartella"
-msgid "One of the selected files was null"
-msgstr "Uno dei file selezionati era nullo"
-
msgid "Read photos..."
msgstr "Lettura delle foto ..."
@@ -9426,6 +9633,9 @@ msgstr "Trovato un file nullo nella cartella {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n"
+msgid "One of the selected files was null"
+msgstr "Uno dei file selezionati era nullo"
+
msgid "Geotagged Images"
msgstr "Immagini georeferenziate"
@@ -9485,6 +9695,12 @@ msgstr "Successivo"
msgid "Show next Image"
msgstr "Visualizza l''immagine successiva"
+msgid "Show first Image"
+msgstr "Mostra prima immagine"
+
+msgid "Show last Image"
+msgstr "Mostra ultima immagine"
+
msgid "Center view"
msgstr "Centra la visualizzazione"
@@ -9543,11 +9759,11 @@ msgid ""
"range of tracks or use CTRL+Click to select specific ones. The map is "
"updated live in the background. Open the URLs by double clicking them.</html>"
msgstr ""
-"<html>Seleziona tutti i tracciati che si vogliono visualizzare. E'' "
-"possibile selezionare un intervallo di tracciati trascinando il mouse oppure "
-"premendo CTRL+Click per selezionare dei tracciati specifici. La mappa è "
-"aggiornata in tempo reale sullo sfondo. Facendo doppio click sui tracciati "
-"si aprono gli indirizzi URL .</html>"
+"<html>Seleziona tutti i tracciati che si vogliono visualizzare. È possibile "
+"selezionare un intervallo di tracciati trascinando il mouse oppure premendo "
+"CTRL+Click per selezionare dei tracciati specifici. La mappa è aggiornata in "
+"tempo reale sullo sfondo. Facendo doppio click sui tracciati si aprono gli "
+"indirizzi URL .</html>"
msgid "Set track visibility for {0}"
msgstr "Imposta la visibilità del tracciato per {0}"
@@ -9569,9 +9785,6 @@ msgstr ""
"cartografici è considerato dannoso.<br>Se si desidera caricare dei tracciati "
"vedere qui:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Personalizza l''aspetto del tracciato"
@@ -9582,10 +9795,13 @@ msgid "To"
msgstr "A"
msgid "No timestamp"
-msgstr "Nessuna marcatura temporale"
+msgstr "Nessuna marca temporale"
-msgid "Download from OSM along this track"
-msgstr "Scarica da OSM lungo questo tracciato"
+msgid "Select to download OSM data."
+msgstr "Selezionare per scaricare i dati OSM."
+
+msgid "Select to download GPS traces."
+msgstr "Selezionare per scaricare i tracciati GPS."
msgid "Download everything within:"
msgstr "Scarica tutto entro:"
@@ -9611,16 +9827,18 @@ msgstr "solo punti del percorso"
msgid "track and waypoints"
msgstr "tracciato e punti del percorso"
+msgid "Click to download"
+msgstr "Clicca per scaricare"
+
+msgid "Click to cancel"
+msgstr "Clicca per annullare"
+
+msgid "Download from OSM along this track"
+msgstr "Scarica da OSM lungo questo tracciato"
+
msgid "Calculating Download Area"
msgstr "Calcolo dell''area di scarico in corso"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Questa azione richiederà {0} richieste di scarico distinte.<br>Si "
-"vuole procedere?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr ""
"Memorizza preventivamente in cache i tasselli delle immagini aeree lungo "
@@ -9650,8 +9868,8 @@ msgid ""
"correlate them with audio data.</html>"
msgstr ""
"<html>Sono stati scaricati dal server i dati nel livello GPX "
-"''''{0}''''.<br>Siccome i suoi punti non includono una marcatura temporale "
-"non è possibile correlarli con la traccia audio.</html>"
+"''''{0}''''.<br>Siccome i suoi punti non includono una marca temporale non è "
+"possibile correlarli con la traccia audio.</html>"
msgid "Import not possible"
msgstr "Importazione non possibile"
@@ -9660,7 +9878,7 @@ msgid "Wave Audio files (*.wav)"
msgstr "Files audio Wave (*.wav)"
msgid "Audio markers from {0}"
-msgstr "Marcatori audio da {0}"
+msgstr "Contrassegni audio da {0}"
msgid "No GPX track available in layer to associate audio with."
msgstr "Nessuna traccia GPX da associare con l''audio."
@@ -9669,7 +9887,7 @@ msgid ""
"Some waypoints with timestamps from before the start of the track or after "
"the end were omitted or moved to the start."
msgstr ""
-"Alcuni punti del percorso con marcature temporali precedenti l''inizio o "
+"Alcuni punti del percorso con marche temporali precedenti l''inizio o "
"successivi alla fine del tracciato sono stati omessi o posizionati "
"all''inizio."
@@ -9689,36 +9907,36 @@ msgid ""
"correlate them with images.</html>"
msgstr ""
"<html>Sono stati scaricati dal server i dati nel livello GPX "
-"''''{0}''''.<br>Siccome i suoi punti non includono una marcatura temporale "
-"non è possibile correlarli con le immagini.</html>"
+"''''{0}''''.<br>Siccome i suoi punti non includono una marca temporale non è "
+"possibile correlarli con le immagini.</html>"
msgid "Markers From Named Points"
-msgstr "Crea marcatori dai punti con nome"
+msgstr "Crea contrassegni dai punti con nome"
msgid "Named Trackpoints from {0}"
msgstr "Nomina i punti del percorso da {0}"
msgid "gps marker"
-msgstr "segnaposto gps"
+msgstr "contrassegno gps"
msgid "marker"
msgid_plural "markers"
-msgstr[0] "marcatore"
-msgstr[1] "marcatori"
+msgstr[0] "contrassegno"
+msgstr[1] "contrassegni"
msgid "{0} consists of {1} marker"
msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} è composto da {1} marcatore"
-msgstr[1] "{0} è composto da {1} marcatori"
+msgstr[0] "{0} è composto da {1} contrassegno"
+msgstr[1] "{0} è composto da {1} contrassegni"
msgid "No existing audio markers in this layer to offset from."
-msgstr "Non ci sono marcatori audio in questo livello da compensare."
+msgstr "Non ci sono contrassegni audio in questo livello da compensare."
msgid "Show Text/Icons"
msgstr "Mostra Testo/Icone"
msgid "Toggle visible state of the marker text and icons."
-msgstr "Commuta la visualizzazione dei marcatori di testo ed icone"
+msgstr "Commuta la visualizzazione dei contrassegni di testo ed icone"
msgid "Synchronize Audio"
msgstr "Sincronizza l''audio"
@@ -9734,48 +9952,44 @@ msgid "Unable to synchronize in layer being played."
msgstr "Impossibile sincronizzare nel livello in esecuzione."
msgid "Make Audio Marker at Play Head"
-msgstr "Crea marcatore audio in prossimità della testina di riproduzione"
+msgstr "Crea contrassegno audio in prossimità della testina di riproduzione"
msgid ""
"You need to have paused audio at the point on the track where you want the "
"marker."
-msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore"
+msgstr "Premi pausa nel punto del tracciato dove vuoi il contrassegno"
msgid ""
"You need to drag the play head near to the GPX track whose associated sound "
"track you were playing (after the first marker)."
msgstr ""
-"E'' necessario spostare la testina di riproduzione in prossimità del "
-"tracciato GPX a cui è associata la traccia audio che si vuole riprodurre "
-"(dopo il primo marcatore)."
+"È necessario spostare la testina di riproduzione in prossimità del tracciato "
+"GPX a cui è associata la traccia audio che si vuole riprodurre (dopo il "
+"primo contrassegno)."
msgid ""
"You need to SHIFT-drag the play head onto an audio marker or onto the track "
"point where you want to synchronize."
msgstr ""
-"Trascina (premendo SHIFT) la testina di riproduzione sopra un marcatore "
+"Trascina (premendo SHIFT) la testina di riproduzione sopra un contrassegno "
"audio o sul tracciato da sincronizzare."
msgid "Unable to create new audio marker."
-msgstr "Impossibile creare un nuovo segnaposto Audio"
+msgstr "Impossibile creare un nuovo contrassegno audio"
msgid "There was an error while trying to display the URL for this marker"
-msgstr "Impossibile mostrare l''URL per questo marcatore"
+msgstr "Impossibile mostrare l''URL per questo contrassegno"
msgid "(URL was: "
msgstr "(URL: "
-msgid "Error displaying URL"
-msgstr "Impossibile visualizzare l''URL"
-
msgid "Select the map painting styles"
msgstr "Seleziona gli stili di disegno della mappa"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Attenzione: fallito il caricamento degli stili Mappaint da ''{0}''. "
-"L''eccezione è stata: {1}"
+"Fallito il caricamento degli stili Mappaint da ''{0}''. L''eccezione è "
+"stata: {1}"
msgid "loading style ''{0}''..."
msgstr "caricamento dello stile ''{0}'' in corso..."
@@ -9787,7 +10001,7 @@ msgid_plural ""
"There were {0} errors when loading this style. Select ''Info'' from the "
"right click menu for details."
msgstr[0] ""
-"E'' stato generato un errore durante il caricamento di questo stile. "
+"È stato generato un errore durante il caricamento di questo stile. "
"Selezionare ''Informazioni'' dal menu contestuale (tasto destro del mouse) "
"per i dettagli."
msgstr[1] ""
@@ -9795,10 +10009,9 @@ msgstr[1] ""
"Selezionare ''Informazioni'' dal menu contestuale (tasto destro del mouse) "
"per i dettagli."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Attenzione: fallita l''analisi degli stili Mappaint da ''{0}''. L''errore è "
-"stato: {1}"
+"Fallita l''analisi degli stili Mappaint da ''{0}''. L''errore è stato: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Stile di tratteggio non valido, i valori devono essere positivi"
@@ -9807,11 +10020,10 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Stile di tratteggio non valido, almeno un valore deve essere > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Attenzione: fallita l''analisi degli stili Mappaint da ''{0}''. L''errore è "
-"stato: [{1}:{2}] {3}"
+"Fallita l''analisi degli stili Mappaint da ''{0}''. L''errore è stato: "
+"[{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Chiave del token di accesso:"
@@ -9850,11 +10062,11 @@ msgstr "Indirizzo URL di autorizzazione:"
msgid "Click to reset the OAuth settings to default values"
msgstr ""
-"Cliccare per ripristinare i valori predefiniti delle impostazioni OAuth"
+"Clicca per ripristinare i valori predefiniti delle impostazioni OAuth"
msgid "Click to abort resetting to the OAuth default values"
msgstr ""
-"Cliccare per annullare il ripristino delle impostazioni OAuth con i valori "
+"Clicca per annullare il ripristino delle impostazioni OAuth con i valori "
"predefiniti"
msgid ""
@@ -9944,7 +10156,7 @@ msgid ""
"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
"in subsequent requests to gain access to the OSM API.</html>"
msgstr ""
-"<html>E'' stato ottenuto con successo un token di accesso OAuth dal sito web "
+"<html>È stato ottenuto con successo un token di accesso OAuth dal sito web "
"di OSM. Cliccare su <strong>{0}</strong> per accettare il token. JOSM lo "
"utilizzerà nelle successive richieste per acquisire l''accesso alle API di "
"OSM.</html>"
@@ -9954,8 +10166,8 @@ msgstr "Autorizza adesso"
msgid "Click to redirect you to the authorization form on the JOSM web site"
msgstr ""
-"Cliccare per essere rediretti alla maschera di autorizzazione sul sito web "
-"di JOSM"
+"Clicca per essere rediretti alla maschera di autorizzazione sul sito web di "
+"JOSM"
msgid "Back"
msgstr "Indietro"
@@ -9990,7 +10202,7 @@ msgid ""
"OSM server failed.<br><br>Please try again or choose another kind of "
"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
msgstr ""
-"<html>E'' fallito il processo automatico per l''ottenimento di un token di "
+"<html>È fallito il processo automatico per l''ottenimento di un token di "
"accesso OAuth<br>dal server OSM.<br><br>Si prega di provare nuovamente "
"oppure di selezionare un''altra tipologia di processo autorizzativo,<br>es. "
"autorizzazione semi-automatica o manuale.</html>"
@@ -10015,7 +10227,7 @@ msgid ""
"OSM server failed. JOSM failed to log into {0}<br>for user "
"{1}.<br><br>Please check username and password and try again.</html>"
msgstr ""
-"<html>E'' fallito il processo automatico per l''ottenimento di un token di "
+"<html>È fallito il processo automatico per l''ottenimento di un token di "
"accesso OAuth<br>dal server di OSM. JOSM non è riuscito ad accedere a "
"{0}<br>con l''utente {1}.<br><br>Si prega di controllare il nome utente e la "
"password e di riprovare.</html>"
@@ -10066,7 +10278,7 @@ msgstr ""
"inserire un codice segreto per il token di accesso"
msgid "Click to test the Access Token"
-msgstr "Cliccare per verificare il token di accesso"
+msgstr "Cliccarper verificare il token di accesso"
msgid ""
"With OAuth you grant JOSM the right to upload map data and GPS tracks on "
@@ -10088,9 +10300,8 @@ msgstr "Chiudi la finestra ed annulla l''autorizzazione"
msgid "Close the dialog and accept the Access Token"
msgstr "Chiudi la finestra ed accetta il token di accesso"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr ""
-"Attenzione: fallito l’annullamento dell’operazione OAuth in esecuzione"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Fallito l''annullamento dell''operazione OAuth in esecuzione"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Ottenimento del token di richiesta OAuth da ''''{0}''''"
@@ -10169,6 +10380,12 @@ msgstr ""
"Selezionare per permettere a JOSM di scrivere le preferenze personali del "
"server"
+msgid "Allow modifications of notes"
+msgstr "Permetti modifica delle note"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Selezionare per permette a JOSM di modificare le note per tuo conto"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Ottenimento del token di accesso OAuth..."
@@ -10242,29 +10459,26 @@ msgstr ""
"accettare questo token. JOSM lo utilizzerà in futuro per l''autenticazione e "
"l''autorizzazione sul server OSM.<br><br>Il token di accesso è: </html>"
-msgid "Restart"
-msgstr "Riavvia"
-
msgid "Click to retrieve a Request Token"
-msgstr "Cliccare per ottenere un token di richiesta"
+msgstr "Clicca per ottenere un token di richiesta"
msgid "Retrieve Access Token"
msgstr "Ottieni un token di accesso"
msgid "Click to retrieve an Access Token"
-msgstr "Cliccare per ottenere un token di accesso"
+msgstr "Clicca per ottenere un token di accesso"
msgid "Testing OAuth Access Token"
msgstr "Verifica del token di accesso OAuth"
msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
msgstr ""
-"E'' stato rifiutato l''ottenimento dei dettagli utente con chiave del token "
-"di accesso ''''{0}''''."
+"È stato rifiutato l''ottenimento dei dettagli utente con chiave del token di "
+"accesso ''''{0}''''."
msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
msgstr ""
-"E'' stato proibito il recupero delle informazioni utente con la chiave del "
+"È stato proibito il recupero delle informazioni utente con la chiave del "
"token di accesso ''{0}''."
msgid ""
@@ -10272,7 +10486,7 @@ msgid ""
"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
"''{3}''.</html>"
msgstr ""
-"<html>E'' stato utilizzato con successo il token di accesso ''{0}'' "
+"<html>È stato utilizzato con successo il token di accesso ''{0}'' "
"per<br>accedere al server OSM su ''{1}''.<br>Si sta accedendo al server OSM "
"come l''utente ''{2}'' con identificativo ''{3}''.</html>"
@@ -10285,10 +10499,10 @@ msgid ""
"not<br>be able to access any protected resource on this server using this "
"token.</html>"
msgstr ""
-"<html>E'' fallito l''accesso al server OSM ''{0}''<br>con il token di "
-"accesso ''{1}''.<br>Il server ha rifiutato il token di accesso come non "
-"autorizzato. Non si sarà<br>in grado di accedere ad alcuna risorsa protetta "
-"su questo server utilizzando questo token.</html>"
+"<html>È fallito l''accesso al server OSM ''{0}''<br>con il token di accesso "
+"''{1}''.<br>Il server ha rifiutato il token di accesso come non autorizzato. "
+"Non si sarà<br>in grado di accedere ad alcuna risorsa protetta su questo "
+"server utilizzando questo token.</html>"
msgid "Test failed"
msgstr "Test fallito"
@@ -10341,22 +10555,22 @@ msgid "Retrieving user info..."
msgstr "Ottenimento delle informazioni utente..."
msgid "Audio Settings"
-msgstr "Impostazione dell''audio"
+msgstr "Impostazioni audio"
msgid "Settings for the audio player and audio markers."
-msgstr "Impostazioni del riproduttore audio e del marcatore audio."
+msgstr "Impostazioni del riproduttore audio e del contrassegno audio."
msgid "Display the Audio menu."
msgstr "Mostra il menu audio."
msgid "Label audio (and image and web) markers."
-msgstr "Marcatore di etichetta audio (e immagine e web)."
+msgstr "Contrassegno di etichetta audio (e immagine e web)."
msgid "Display live audio trace."
msgstr "Mostra la traccia audio attiva."
msgid "Explicit waypoints with valid timestamps."
-msgstr "Punti del percorso espliciti con marcature temporali valide."
+msgstr "Punti del percorso espliciti con marcatori temporali validi."
msgid "Explicit waypoints with time estimated from track position."
msgstr ""
@@ -10372,7 +10586,7 @@ msgstr "Orari di modifica (marcatori temporali) dei file audio."
msgid "Start of track (will always do this if no other markers available)."
msgstr ""
"Inizio del tracciato (si dovrebbe sempre eseguire questo se non ci sono "
-"altri marcatori disponibili)."
+"altri contrassegni disponibili)."
msgid "Show or hide the audio menu entry on the main menu bar."
msgstr "Mostra o nascondi il menù audio nella barra del menù principale."
@@ -10390,28 +10604,28 @@ msgid ""
"button icons."
msgstr ""
"Inserisci il testo dell’etichetta (e dell’immagine e del web) rispetto al "
-"marcatore audio come icona del tasto."
+"contrassegno audio come icona del tasto."
msgid "When importing audio, make markers from..."
-msgstr "Quando importi l''audio, crea marcatori da ..."
+msgstr "Durante l''importazione dell''audio crea contrassegni da ..."
msgid "When importing audio, apply it to any waypoints in the GPX layer."
msgstr ""
-"Quando si importa l''audio, applicalo ad ogni punto del percorso nel livello "
-"GPX."
+"Durante l''importazione dell''audio applicalo ad ogni punto del percorso nel "
+"livello GPX."
msgid ""
"Automatically create audio markers from trackpoints (rather than explicit "
"waypoints) with names or descriptions."
msgstr ""
-"Crea automaticamente dei marcatori audio dai punti del tracciato (invece che "
-"dai punti del percorso espliciti) con i nomi o le descrizioni."
+"Crea automaticamente dei contrassegni audio dai punti del tracciato (invece "
+"che dai punti del percorso espliciti) con i nomi o le descrizioni."
msgid ""
"Create audio markers at the position on the track corresponding to the "
"modified time of each audio WAV file imported."
msgstr ""
-"Crea i marcatori audio nella posizione del tracciato corrispondente "
+"Crea i contrassegni audio nella posizione del tracciato corrispondente "
"all''orario di modifica di ogni file audio WAV importato."
msgid ""
@@ -10465,9 +10679,9 @@ msgid "Downloading the following plugin has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} plugins has <strong>failed</strong>:"
msgstr[0] ""
-"E’ <strong>fallito</strong> lo scaricamento della seguente estensione:"
+"È <strong>fallito</strong> lo scaricamento della seguente estensione:"
msgstr[1] ""
-"E’ <strong>fallito</strong> lo scaricamento delle seguenti {0} estensioni:"
+"È <strong>fallito</strong> lo scaricamento delle seguenti {0} estensioni:"
msgid "Search:"
msgstr "Cerca:"
@@ -10546,6 +10760,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"È necessario riavviare JOSM perché alcune impostazioni abbiano effetto."
+msgid "Would you like to restart now?"
+msgstr "Si desidera riavviare adesso?"
+
msgid "Remote Control"
msgstr "Controllo remoto"
@@ -10681,6 +10898,12 @@ msgstr "Rimuovi dalla barra degli strumenti"
msgid "Configure toolbar"
msgstr "Configura la barra degli strumenti"
+msgid "Edit shortcut"
+msgstr "Modifica scorciatoia"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Non nascondere la barra degli strumenti e il menu"
+
msgid "Actions"
msgstr "Azioni"
@@ -10725,6 +10948,9 @@ msgstr ""
"Registrata l''azione della barra degli strumenti {0} sovrascritta: {1} "
"ottiene {2}"
+msgid "Toolbar: {0}"
+msgstr "Barra degli strumenti: {0}"
+
msgid "Data validator"
msgstr "Validatore dati"
@@ -10780,25 +11006,12 @@ msgstr "Cerca: "
msgid "Read from file"
msgstr "Leggi da file"
-msgid "Open JOSM customization file"
-msgstr "Apri file di personalizzazione JOSM"
-
-msgid "Import log"
-msgstr "Importa registro"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Qui c''è il sommario dell''importazione del file. <br/>E'' possibile "
-"rifiutare i cambiamenti alle preferenze premendo \"Annulla\" nella finestra "
-"delle preferenze <br/>Per attivare alcuni cambiamenti potrebbe essere "
-"necessario riavviare JOSM.</html>"
-
msgid "Export selected items"
msgstr "Esporta elementi selezionati"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "File di impostazioni personali JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Si prega di selezionare alcune chiavi delle preferenze non marcate come "
@@ -10818,43 +11031,60 @@ msgstr "Aggiungi preferenze da file ai valori esistenti"
msgid "Replace existing values"
msgstr "Sostituisci valori esistenti"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "File di impostazioni personali JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Apri file di personalizzazione JOSM"
-msgid "Advanced Background: Changed"
-msgstr "Sfondo avanzato: modificato"
+msgid "Import log"
+msgstr "Importa registro"
-msgid "Advanced Background: NonDefalut"
-msgstr "Sfondo avanzato: non predefinito"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Qui c''è il sommario dell''importazione del file. <br/>È possibile "
+"rifiutare i cambiamenti alle preferenze premendo \"Annulla\" nella finestra "
+"delle preferenze <br/>Per attivare alcuni cambiamenti potrebbe essere "
+"necessario riavviare JOSM.</html>"
-msgid "Current value is default."
-msgstr "Il valore corrente è il predefinito."
+msgid "shortcut"
+msgstr "scorciatoia"
-msgid "Default value is ''{0}''."
-msgstr "Il valore predefinito è ''{0}''."
+msgid "color"
+msgstr "colore"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Il valore predefinito al momento è sconosciuto (l''impostazione non è stata "
-"ancora utilizzata)."
+msgid "toolbar"
+msgstr "barra degli strumenti"
-msgid "Select Setting Type:"
-msgstr "Seleziona il tipo di impostazione:"
+msgid "imagery"
+msgstr "immagini aeree"
-msgid "Simple"
-msgstr "Semplice"
+msgid "Reset preferences"
+msgstr "Reimposta preferenze"
-msgid "List"
-msgstr "Elenco"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Si sta per cancellare tutte le preferenze sostituendole con i loro valori "
+"predefiniti<br />Tutte le proprie impostazioni saranno eliminate: componenti "
+"aggiuntivi, immagini aeree, filtri, pulsanti della barra degli strumenti, "
+"tastiera, ecc. <br />Si è sicuri di voler continuare?"
-msgid "List of lists"
-msgstr "Lista di liste"
+msgid "Load profile"
+msgstr "Carica profilo"
-msgid "List of maps"
-msgstr "Lista di mappe"
+msgid "Save {0} profile"
+msgstr "Salva profilo {0}"
-msgid "Add setting"
-msgstr "Aggiungi impostazione"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Tutte le preferenze di questo gruppo sono quelle predefinite, niente da "
+"salvare"
+
+msgid "Choose profile file"
+msgstr "Scegliere il file del profilo"
msgid "Change list setting"
msgstr "Modifica l''impostazione della lista"
@@ -10877,6 +11107,41 @@ msgstr "Modifica l''impostazione della lista di mappe"
msgid "Entry {0}"
msgstr "Voce {0}"
+msgid "Select Setting Type:"
+msgstr "Seleziona il tipo di impostazione:"
+
+msgid "Simple"
+msgstr "Semplice"
+
+msgid "List"
+msgstr "Elenco"
+
+msgid "List of lists"
+msgstr "Lista di liste"
+
+msgid "List of maps"
+msgstr "Lista di mappe"
+
+msgid "Add setting"
+msgstr "Aggiungi impostazione"
+
+msgid "Advanced Background: Changed"
+msgstr "Sfondo avanzato: modificato"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Il valore corrente è il predefinito."
+
+msgid "Default value is ''{0}''."
+msgstr "Il valore predefinito è ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Il valore predefinito al momento è sconosciuto (l''impostazione non è stata "
+"ancora utilizzata)."
+
msgid "Change string setting"
msgstr "Modifica l''impostazione della stringa"
@@ -10935,11 +11200,14 @@ msgstr "Disegna dei nodi virtuali nella modalità selezione"
msgid "Draw inactive layers in other color"
msgstr "Disegna con altri colori i layer non attivi"
+msgid "Display discardable keys"
+msgstr "Visualizza chiavi scartabili"
+
msgid "Highlight target ways and nodes"
msgstr "Evidenzia percorsi e nodi di destinazione"
msgid "Draw rubber-band helper line"
-msgstr "Disegna la linea d’aiuto ad elastico"
+msgstr "Disegna la linea di supporto ad elastico"
msgid "Smooth map graphics (antialiasing)"
msgstr "Grafica della mappa migliorata (antialiasing)"
@@ -10999,9 +11267,16 @@ msgid ""
"This option suppresses the filling of areas, overriding anything specified "
"in the selected style."
msgstr ""
-"Questa opzione sopprime il riempimento delle aree, ignorando qualsiasi "
+"Quest''opzione elimina il riempimento delle aree, ignorando qualsiasi "
"impostazione presente nello stile selezionato."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Visualizza le chiavi che sono state ritenute poco interessanti al punto che "
+"possono essere rimosse in modo silente."
+
msgid "Options that affect drawing performance"
msgstr "Opzioni che influiscono sull''efficienza di disegno"
@@ -11084,7 +11359,7 @@ msgid "Foot"
msgstr "Pedone"
msgid "Create markers when reading GPX"
-msgstr "Crea marcatori durante la lettura GPX"
+msgstr "Crea contrassegni durante la lettura GPX"
msgid "Fast drawing (looks uglier)"
msgstr "Disegno veloce (appare più brutto)"
@@ -11099,7 +11374,7 @@ msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
"layer."
msgstr ""
-"Quando si apre un layer GPX crea automaticamente un marcatore sul livello "
+"Quando si apre un layer GPX crea automaticamente un contrassegno sul livello "
"per ogni punto del percorso."
msgid "Draw lines between raw GPS points"
@@ -11188,8 +11463,7 @@ msgstr ""
msgid "Colors points and track segments by its timestamp."
msgstr ""
-"Colora i punti ed i segmenti del tracciato in base alla sua marcatura "
-"temporale."
+"Colora i punti ed i segmenti del tracciato in base alla sua marca temporale."
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
@@ -11319,8 +11593,14 @@ msgstr "Ottieni livelli"
msgid "2. Select layers"
msgstr "Seleziona livelli"
-msgid "3. Verify generated WMS URL"
-msgstr "Verifica URL WMS generato"
+msgid "3. Select image format"
+msgstr "3. Seleziona formato immagine"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Verifica indirizzo URL del WMS"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Inserisci il nome per questo livello"
msgid "Show Bounds"
msgstr "Visualizza confini"
@@ -11504,6 +11784,12 @@ msgstr ""
"livelli dati. Aggiunge una ''~'' al nome del file e la salva nella stessa "
"cartella.)</i>"
+msgid "Notification at each save"
+msgstr "Notifica ad ogni salvataggio"
+
+msgid "When saving, display a small notification"
+msgstr "Durante il salvataggio visualizza una piccola notifica"
+
msgid "File backup"
msgstr "Copia di riserva del file"
@@ -11576,9 +11862,8 @@ msgid "Settings for the map projection and data interpretation."
msgstr ""
"Impostazioni per la proiezione della mappa e l''interpretazione dei dati."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
-"Attenzione: impossibile leggere la sorgente delle etichette preimpostate: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11695,7 +11980,7 @@ msgstr ""
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] "L''estensione {0} è ancora richiesta da questa estensione:"
+msgstr[0] "L''estensione {0} è ancora richiesta da questa''estensione:"
msgstr[1] "L''estensione {0} è ancora richiesta da queste {1} estensioni:"
msgid "{0}: Version {1} (local: {2})"
@@ -11870,21 +12155,6 @@ msgstr "Sistema di coordinate svizzero (Svizzera)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (senza alcuna correzione locale)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zona UTM"
-
-msgid "North"
-msgstr "Nord"
-
-msgid "South"
-msgstr "Sud"
-
-msgid "Hemisphere"
-msgstr "Emisfero"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadalupa Fort-Marigot 1949"
@@ -11906,6 +12176,21 @@ msgstr "UTM Francia (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Sistema Geodesic"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zona UTM"
+
+msgid "North"
+msgstr "Nord"
+
+msgid "South"
+msgstr "Sud"
+
+msgid "Hemisphere"
+msgstr "Emisfero"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Verifica dell''indirizzo URL delle API di OSM ''''{0}''''"
@@ -11954,7 +12239,7 @@ msgid ""
"spelling of ''{0}'' and validate again.</html>"
msgstr ""
"<html>Il server delle API di OSM su ''{0}'' non ha restituito una risposta "
-"valida.<br>E'' come se ''{0}'' non fosse un server delle API di OSM.<br>Si "
+"valida.<br>È come se ''{0}'' non fosse un server delle API di OSM.<br>Si "
"prega di controllare la digitazione di ''{0}'' e di validare "
"nuovamente.</html>"
@@ -11974,11 +12259,11 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Selezionare per utilizzare OAuth come meccanismo di autenticazione"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Attenzione: valore non supportato nella preferenza ''{0}'', ottenuto "
-"''{1}''. Utilizzo il metodo di autenticazione ''Basic Authentication''."
+"Valore non supportato nella preferenza ''{0}'', ottenuto ''{1}''. Utilizzo "
+"il metodo di autenticazione ''Basic Authentication''."
msgid "OSM username:"
msgstr "Nome utente OSM:"
@@ -11986,29 +12271,32 @@ msgstr "Nome utente OSM:"
msgid "OSM password:"
msgstr "Password OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Attenzione: fallito l’ottenimento delle credenziali OSM dal gestore delle "
-"credenziali."
+"Fallito l''ottenimento delle credenziali OSM dal gestore delle credenziali."
msgid "Current credential manager is of type ''{0}''"
msgstr "Il gestore delle credenziali corrente è di tipo ''''{0}''''"
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Attenzione: fallito il salvataggio delle credenziali OSM sul gestore delle "
-"credenziali."
+"Fallito il salvataggio delle credenziali OSM sul gestore delle credenziali."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Verificare periodicamente se ci sono nuovi messaggi"
+
+msgid "Check interval (minutes):"
+msgstr "Intervallo di controllo (minuti):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Attenzione: Fallito l’ottenimento del token di accesso OAuth dal gestore "
-"delle credenziali"
+"Fallito l''ottenimento del token di accesso OAuth dal gestore delle "
+"credenziali"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Attenzione: Fallita la memorizzazione del token di accesso OAuth sul gestore "
-"delle credenziali"
+"Fallita la memorizzazione del token di accesso OAuth nel gestore delle "
+"credenziali"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -12025,7 +12313,7 @@ msgid "Save to preferences"
msgstr "Salva sulle preferenze"
msgid "Click to step through the OAuth authorization process"
-msgstr "Cliccare per seguire i passaggi del processo di autorizzazione OAuth"
+msgstr "Clicca per seguire i passaggi del processo di autorizzazione OAuth"
msgid "New Access Token"
msgstr "Nuovo token di accesso"
@@ -12034,12 +12322,12 @@ msgid ""
"Click to step through the OAuth authorization process and generate a new "
"Access Token"
msgstr ""
-"Cliccare per seguire i passaggi del processo di autorizzazione OAuth e "
+"Clicca per seguire i passaggi del processo di autorizzazione OAuth e "
"generare un nuovo token di accesso"
msgid "Click test access to the OSM server with the current access token"
msgstr ""
-"Cliccare per verificare l’accesso al server OSM con il token di accesso "
+"Clicca per verificare l’accesso al server OSM con il token di accesso "
"corrente"
msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
@@ -12103,18 +12391,12 @@ msgid "Use a SOCKS proxy"
msgstr "Utilizza un proxy SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Attenzione: JOSM è configurato per utilizzare i proxy dalle impostazioni di "
-"sistema, ma la JVM non è configurata in modo da ottenerli. Reimposto le "
-"preferenze su ''No proxy''"
-
-msgid "disabled"
-msgstr "disattivato"
-
-msgid "no modifier"
-msgstr "Nessun modificatore"
+"JOSM è configurato per utilizzare i proxy dalle impostazioni di sistema, ma "
+"la JVM non è configurata per ottenerli. Reimposto le preferenze a ''Nessun "
+"proxy''"
msgid "Shortcut Background: User"
msgstr "Sfondo scorciatoia: utente"
@@ -12157,38 +12439,37 @@ msgstr "Elimina la selezione nella tabella delle etichette"
msgid "Add a new tag"
msgstr "Aggiungi una nuova etichetta"
-msgid "Select auto-increment of {0} for this field"
-msgstr "Seleziona l''incremento automatico di {0} per questo campo"
+msgid "Paste tags from buffer"
+msgstr "Incolla etichette dal buffer"
-msgid "Cancel auto-increment for this field"
-msgstr "Anulla l''incremento automatico per questa voce"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Usa la preimpostazione ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Attenzione nell''etichetta preimpostata \"{0}-{1}\": ignoro l''attributo "
-"''{2}'' come ''{3}'' elementi indicati."
+msgid "Elements of type {0} are supported."
+msgstr "Sono supportati elementi di tipo {0}."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Etichette preimpostate \"{0}-{1}\" non coerenti - il numero di elementi in "
-"''display_values'' deve essere lo stesso di ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Modifica {0} oggetto"
+msgstr[1] "Modifica {0} oggetti"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Etichette preimpostate \"{0}-{1}\" non coerenti - il numero di elmenti in "
-"''short_descriptions'' deve essere lo stesso di ''values''"
+msgid "Nothing selected!"
+msgstr "Non è stato selezionato niente!"
-msgid "More information about this feature"
-msgstr "Ulteriori informazioni su questa caratteristica"
+msgid "Selection unsuitable!"
+msgstr "Selezione non adatta!"
+
+msgid "Apply Preset"
+msgstr "Applica preimpostazione"
+
+msgid "New relation"
+msgstr "Nuova relazione"
+
+msgid "Change Tags"
+msgstr "Cambia etichette"
msgid "Unknown requisite: {0}"
msgstr "Requisito sconosciuto: {0}"
@@ -12196,6 +12477,9 @@ msgstr "Requisito sconosciuto: {0}"
msgid "Illegal member expression: {0}"
msgstr "Espessione non valida del mebro: {0}"
+msgid "More information about this feature"
+msgstr "Ulteriori informazioni su questa caratteristica"
+
msgid "Available roles"
msgstr "Ruoli disponibili"
@@ -12211,15 +12495,59 @@ msgstr "elementi"
msgid "Optional Attributes:"
msgstr "Attributi opzionali:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
+msgid "Select auto-increment of {0} for this field"
+msgstr "Seleziona l''incremento automatico di {0} per questo campo"
-msgid "Use preset ''{0}''"
-msgstr "Usa la preimpostazione ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr "Anulla l''incremento automatico per questa voce"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Attenzione nell''etichetta preimpostata \"{0}-{1}\": ignoro l''attributo "
+"''{2}'' come ''{3}'' elementi indicati."
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Etichette preimpostate \"{0}-{1}\" corrotte - Il metodo Java fornito in "
+"''values_from'' non è \"{2}\""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Etichette preimpostate \"{0}-{1}\" corrotte - Il metodo Java fornito in "
+"''values_from'' ha generato l''eccezione {2} ({3})"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Etichette preimpostate \"{0}-{1}\" non coerenti - il numero di elementi in "
+"''display_values'' deve essere lo stesso di ''values''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Etichette preimpostate \"{0}-{1}\" non coerenti - il numero di elmenti in "
+"''short_descriptions'' deve essere lo stesso di ''values''"
msgid "Unknown type: {0}"
msgstr "Tipo sconosciuto: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Gruppo preimpostato {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "Gruppo preimpostato {0}"
+
msgid "Roles cannot appear more than once"
msgstr "I ruoli non posso comparire più di una volta"
@@ -12229,41 +12557,9 @@ msgstr "Elemento ruolo preimpostato senza genitori"
msgid "Preset sub element without parent"
msgstr "Sotto-elemento preimpostato senza genitori"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
-
msgid "Error parsing {0}: "
msgstr "Impossibile leggere {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "Sono supportati elementi di tipo {0}."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Modifica {0} oggetto"
-msgstr[1] "Modifica {0} oggetti"
-
-msgid "Nothing selected!"
-msgstr "Non è stato selezionato niente!"
-
-msgid "Selection unsuitable!"
-msgstr "Selezione non adatta!"
-
-msgid "Apply Preset"
-msgstr "Applica preimpostazione"
-
-msgid "New relation"
-msgstr "Nuova relazione"
-
-msgid "Change Properties"
-msgstr "Modifica Proprietà"
-
-msgid "Preset group {1} / {0}"
-msgstr "Gruppo preimpostato {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "Gruppo preimpostato {0}"
-
msgid "Search preset"
msgstr "Ricerca preimpostazione"
@@ -12279,6 +12575,16 @@ msgstr "Visualizza solamente per la selezione"
msgid "Search in tags"
msgstr "Cerca nelle etichette"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Variazione {0} non ancora registrata. Non è possibile impostare la "
+"partecipazione nella variazione sincronizzata."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Variazione {0} non ancora registrata."
+
msgid "All files (*.*)"
msgstr "Tutti i file (*.*)"
@@ -12314,24 +12620,78 @@ msgstr ""
"Il valore corrente non è un ID OSM valido. Si prega di inserire un valore "
"intero > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "falso: la proprietà è esplicitamente disattivata"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true: la proprietà è esplicitamente impostata attiva"
+
msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+"partial: different selected objects have different values, do not change"
msgstr ""
-"Il percorso con ID esterno ''''{0}'''' include un nodo mancante con ID "
-"esterno ''''{1}''''."
+"parziale: diversi oggetti selezionati hanno valori diversi, non cambiato"
-msgid "Deleted node {0} is part of way {1}"
-msgstr "Il nodo eliminato {0} fa parte del percorso {1}"
+msgid "unset: do not set this property on the selected objects"
+msgstr "non settato: non settare questa proprietà sugli oggetti selezionati"
+
+msgid "Cut"
+msgstr "Taglia"
+
+msgid "Right click = copy to clipboard"
+msgstr "Click destro = copia negli appunti"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "attributo obbligatorio ''{0}'' mancante"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
msgstr ""
-"Il percorso {0} con {1} nodi ha dei nodi incompleti perché almeno un nodo "
-"non è presente nei dati caricati."
+"valore non valido per attributo obbligatorio ''{0}'' di tipo long, ricevuto "
+"''{1}''"
msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"valore non valido per attributo obbligatorio ''{0}'' di tipo long (>=0), "
+"ricevuto ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Valore non permesso per l''attributo ''{0}'' di tipo double. Ottenuto "
+"''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"valore non valido per attributo obbligatorio ''{0}'' di tipo booleano, "
+"ricevuto ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"valore non valido per attributo obbligatorio ''{0}'' di tipo "
+"OsmPrimitiveType, ricevuto ''{1}''"
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Il percorso con ID esterno ''''{0}'''' include un nodo mancante con ID "
+"esterno ''''{1}''''."
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Il nodo eliminato {0} fa parte del percorso {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"Il percorso {0} con {1} nodi ha dei nodi incompleti perché almeno un nodo "
+"non è presente nei dati caricati."
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
"external id ''{1}''."
msgstr ""
"La relazione con ID esterno ''''{0}'''' si riferisce alla primitiva mancante "
@@ -12350,11 +12710,11 @@ msgid "Contacting OSM Server..."
msgstr "Collegamento al server OSM in corso..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Attenzione: valore non valido per l''attributo ''{0}'' dell''elemento "
-"''{1}'' per le capacità del server. Ottenuto ''{2}''"
+"Valore non valido per l''attributo ''{0}'' dell''elemento ''{1}'' nelle "
+"capacità del server. Ottenuto ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Fallita l''analisi della data ''{0}'' restituita dal server."
@@ -12406,40 +12766,36 @@ msgstr ""
"Numero di porta non valido nella preferenza ''''{0}''''. Ottenuto {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Attenzione: è stato trovato un valore inaspettato per la preferenza "
-"''''{0}''''. Ottenuto ''{1}''. Non sarà utilizzato alcun proxy."
+"E'' stato trovato un valore inatteso per la preferenza ''{0}''. Ottenuto "
+"''{1}''. Non si utilizzarà alcun proxy."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Attenzione: parametri inaspettati per il proxy HTTP. Ottenuto l''host "
-"''''{0}'''' e la porta ''''{1}''''."
+"Parametri inattesi per il proxy HTTP. Ottenuto host ''{0}'' e porta ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Attenzione: parametri inaspettati per il proxy SOCKS. Ottenuto l''host "
-"''''{0}'''' e la porta ''''{1}''''."
+"Parametri inattesi per il proxy SOCKS. Ottenuto host ''{0}'' e porta ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Errore: connessione fallita verso il proxy ''''{0}'''' per l''URI "
-"''''{1}''''. L''eccezione è stata: {2}"
+"Fallita la connessione al proxy ''{0}'' per l''URI ''{1}''. L''eccezione è "
+"stata: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Attenzione: la JVM non è configurata per ottenere i proxy dalle impostazioni "
-"si sistema. Il parametro ''java.net.useSystemProxies'' non era presente "
-"all''avvio. Non verrà utilizzato alcun proxy."
+"La JVM non è configurata per ottenere i proxy dalle impostazioni di sistema. "
+"La proprietà ''java.net.useSystemProxies'' durante l'avvio era mancante. Non "
+"si utilizzarà un proxy."
msgid "Parsing response from server..."
msgstr "Analisi della risposta proveniente dal server..."
@@ -12529,20 +12885,23 @@ msgid ""
"Error occurred while parsing gpx data for layer ''{0}''. Only a part of the "
"file will be available."
msgstr ""
-"E'' stato generato un errore durante l''analisi dei dati gpx data per il "
+"È stato generato un errore durante l''analisi dei dati gpx data per il "
"livello ''{0}''. Sarà disponibile soltanto una parte del file."
msgid ""
"Error occurred while parsing gpx file ''{0}''. Only a part of the file will "
"be available."
msgstr ""
-"E'' stato generato un errore durante l''analisi del file gpx ''{0}''. Sarà "
+"È stato generato un errore durante l''analisi del file gpx ''{0}''. Sarà "
"disponibile soltanto una parte del file."
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
"Errore di scansione: struttura del documento non valida per un documento gpx"
+msgid "(at line {0}, column {1})"
+msgstr "(alla linea {0}, colonna {1})"
+
msgid "Unknown mode {0}."
msgstr "Modalità {0} sconosciuta."
@@ -12558,16 +12917,24 @@ msgstr "Ricerca dei file immagine"
msgid "No image files found."
msgstr "Non è stato trovato alcun file immagine."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Hai {0} messaggio non letto"
+msgstr[1] "Hai {0} messaggi non letti"
+
+msgid "Click here to see your inbox."
+msgstr "Clicca qui per vedere la tua casella"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
"Fallita l''apertura del flusso di ingresso per la risorsa ''''{0}''''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Attenzione: fallita l''apertura del file con estensione ''{2}'' e nome "
-"''{3}'' nel file zip ''{0}''. L''eccezione è stata: {1}"
+"Fallita l''apertura del file con estensione ''{2}'' e nome ''{3}'' nel file "
+"zip ''{0}''. L''eccezione è stata: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Fallita la rinominazione del file {0} in {1}."
@@ -12581,7 +12948,7 @@ msgid ""
"Unexpected response from HTTP server. Got {0} response without ''Location'' "
"header. Can''t redirect. Aborting."
msgstr ""
-"Risposta non prevista dal server HTTP. E'' stata ottenuta la risposta {0} "
+"Risposta non prevista dal server HTTP. È stata ottenuta la risposta {0} "
"senza la testata ''Location''. Impossibile reindirizzare. Annullo."
msgid "Too many redirects to the download URL detected. Aborting."
@@ -12637,7 +13004,7 @@ msgstr "Prelevamento della relazione con id {0} da ''''{1}''''"
msgid "Server replied with response code 404 for id {0}. Skipping."
msgstr ""
-"Il server ha risposto con il codice 404 per l''identificativo {0}. Saltato."
+"Il server ha risposto con il codice 404 per l''identificativo {0}. Tralascio."
msgid "NMEA-0183 Files"
msgstr "Files NMEA-0183"
@@ -12657,8 +13024,8 @@ msgstr "Sentenze non conosciute: {0}"
msgid "Zero coordinates: {0}"
msgstr "Coordinate a zero: {0}"
-msgid "NMEA import success"
-msgstr "NMEA importato con successo"
+msgid "NMEA import success:"
+msgstr "Importazione NMEA riuscita:"
msgid "NMEA import failure!"
msgstr "Importazione NMEA non riuscita!"
@@ -12678,7 +13045,7 @@ msgstr ""
msgid "Removed layer {0} because it is not allowed by the configured API."
msgstr ""
-"E'' stato rimosso il livello {0} perché non è permesso dalle API configurate."
+"È stato rimosso il livello {0} perché non è permesso dalle API configurate."
msgid "Unexpected format of ID replied by the server. Got ''{0}''."
msgstr ""
@@ -12771,63 +13138,29 @@ msgstr "Nessun dato trovato nel file {0}."
msgid "Open OsmChange file"
msgstr "Apri file OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "attributo obbligatorio ''{0}'' mancante"
-
msgid "Unsupported version: {0}"
msgstr "Versione non supportata: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo long, ricevuto "
-"''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo long (>=0), "
-"ricevuto ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Valore non permesso per l''attributo ''{0}'' di tipo double. Ottenuto "
-"''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo booleano, "
-"ricevuto ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo "
-"OsmPrimitiveType, ricevuto ''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Attenzione: elemento iniziale ''''{0}'''' non supportato nel contenuto del "
-"gruppo di modifiche alla posizione ({1},{2}). Ignorato."
+"Elemento iniziale ''{0}'' non supportato nel contenuto del gruppo di "
+"modifiche alla posizione ({1},{2}). Tralascio."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
"''create'', ''modify'', or ''delete''."
msgstr ""
-"Struttura del documento non valida. E’ stato trovato un nodo, percorso o "
+"Struttura del documento non valida. È stato trovato un nodo, percorso o "
"relazione al di fuori di un ''create'', ''modify'' o ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Attenzione: elemento finale ''''{0}'''' non supportato nel contenuto del "
-"gruppo di modifiche alla posizione ({1},{2}). Ignorato."
+"Elemento finale ''{0}'' non supportato nel contenuto del gruppo di modifiche "
+"alla posizione ({1},{2}). Tralascio."
msgid "Parsing changeset content ..."
msgstr "Analisi del contenuto del gruppo di modifiche ..."
@@ -12850,8 +13183,8 @@ msgstr "Attributo obbligatorio ''''{0}'''' mancante dell''elemento XML {1}."
msgid "Undefined element ''{0}'' found in input stream. Aborting."
msgstr ""
-"E'' stato trovato l''elemento ''''{0}'''' non definito nel flusso di "
-"ingresso. Annullo."
+"È stato trovato l''elemento ''''{0}'''' non definito nel flusso di ingresso. "
+"Annullo."
msgid "Parsing list of changesets..."
msgstr "Analisi della lista dei gruppi di modifiche..."
@@ -12861,35 +13194,26 @@ msgstr ""
"Fallita la firma di una connessione HTTP con una testata di autenticazione "
"OAuth"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-"Attenzione: valore non atteso per la preferenza ''''{0}''''. Ottenuto "
-"''''{1}''''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(alla linea {0}, colonna {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Valore inatteso per la preferenza ''{0}''. Ottenuto ''{1}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
-"<html>E'' stato generato un errore durante il salvataggio.<br>L''errore "
+"<html>È stato generato un errore durante il salvataggio.<br>L''errore "
"è:<br>{0}</html>"
msgid ""
"<html>An error occurred while restoring backup file.<br>Error "
"is:<br>{0}</html>"
msgstr ""
-"<html>E'' stato generato un errore durante il ripristino del file della "
-"copia di sicurezza.<br>L''errore è:<br>{0}</html>"
-
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-"Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}"
+"<html>È stato generato un errore durante il ripristino del file della copia "
+"di sicurezza.<br>L''errore è:<br>{0}</html>"
msgid "OSM Server Files gzip compressed"
msgstr "File compressi gzip del server OSM"
msgid "Parsing OSM history data ..."
-msgstr "Analisi dei dati dello storico OSM ..."
+msgstr "Analisi dei dati della cronologia OSM ..."
msgid "OSM Server Files"
msgstr "Server dei File di OSM"
@@ -12906,6 +13230,9 @@ msgstr "Nessun dato trovato nel file ''{0}''."
msgid "Open OSM file"
msgstr "Apri file OSM"
+msgid "Reading was canceled"
+msgstr "La lettura è stata annullata"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12954,8 +13281,8 @@ msgstr "Chiave o valore dell’attributo mancante nell’etichetta."
msgid "Undefined element ''{0}'' found in input stream. Skipping."
msgstr ""
-"E'' stato trovato l''elemento ''''{0}'''' non definito nel flusso di "
-"ingresso. Omesso."
+"È stato trovato l''elemento ''''{0}'''' non definito nel flusso di ingresso. "
+"Tralascio."
msgid "Illegal object with ID=0."
msgstr "Oggetto illegale con id=0"
@@ -12968,11 +13295,11 @@ msgstr ""
"ID {0}. Ottenuto {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"ATTENZIONE: Normalizzazione del valore dell''attributo ''''versione'''' "
-"dell''elemento {0} a {2}, la versione delle API è ''{3}''. Ottenuto {1}."
+"Normalizzazione del valore dell''attributo ''version'' dell''elemento {0} a "
+"{2}, la versione delle API è ''{3}''. Ottenuto {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Versione delle API sconosciuta o non supportata. Ottenuto {0}."
@@ -13042,13 +13369,13 @@ msgid "Downloading content for changeset {0} ..."
msgstr "Scaricamento del contenuto per il gruppo di modifiche {0} ..."
msgid "Downloading history..."
-msgstr "Scaricamento dello storico..."
+msgstr "Scaricamento della cronologia..."
msgid "Contacting Server..."
msgstr "Connessione al server in corso..."
msgid "Failed to open connection to API {0}."
-msgstr "E'' fallita l''apertura della connessione alle API {0}"
+msgstr "È fallita l''apertura della connessione alle API {0}"
msgid ""
"Could not connect to the OSM server. Please check your internet connection."
@@ -13105,8 +13432,7 @@ msgid "Uploading data ..."
msgstr "Caricamento dati ..."
msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
-"E'' stato trovato un identificativo 0 non atteso per una primitiva osm"
+msgstr "È stato trovato un identificativo 0 non atteso per una primitiva osm"
msgid "WMS Files (*.wms)"
msgstr "File WMS (*.wms)"
@@ -13129,6 +13455,9 @@ msgstr "Salva nome utente e password (non cifrata)"
msgid "<delete from {0} objects>"
msgstr "<elimina da {0} oggetti>"
+msgid "Old values of"
+msgstr "Vecchi valori di"
+
msgid "Add tags to selected objects"
msgstr "Aggiungi etichette agli oggetti selezionati"
@@ -13147,6 +13476,15 @@ msgstr "Shift+Invio: Aggiungi tutte le etichette agli oggetti selezionati"
msgid "Assume"
msgstr "Deduci"
+msgid "Existing values"
+msgstr "Valori esistenti"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Abilitare la casella di spunta per accettare il valore"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Accetta tutte le etichette da {0} per questa sessione"
+
msgid "Load data from API"
msgstr "Carica dati dalle API"
@@ -13171,24 +13509,25 @@ msgstr "Crea nuovi oggetti"
msgid "Read protocol version"
msgstr "Leggi la versione del protocollo"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-"Attenzione: impossibile eseguire il server di controllo remoto sulla porta "
-"{0}: {1}"
+"Impossibile avviare il server del controllo remoto sulla porta {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Controllo remoto::Accettazione connessioni sulla porta {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Controllo remoto::Server fermato."
msgid "Remote Control has been asked to create a new node."
-msgstr ""
-"E'' stata richiesta al controllo remoto la creazione di un nuovo nodo."
+msgstr "È stata richiesta al controllo remoto la creazione di un nuovo nodo."
msgid "There is no layer opened to add node"
msgstr "Non c''è alcun livello aperto per aggiungere il nodo"
-msgid "Add way"
-msgstr "Aggiungi percorso"
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
-"E'' stata richiesta al controllo remoto la creazione di un nuovo percorso."
+"È stata richiesta al controllo remoto la creazione di un nuovo percorso."
msgid "Invalid coordinates: {0}"
msgstr "Coordinate non valide: {0}"
@@ -13196,35 +13535,54 @@ msgstr "Coordinate non valide: {0}"
msgid "There is no layer opened to add way"
msgstr "Non c''è alcun livello aperto per aggiungere il percorso"
+msgid "Add way"
+msgstr "Aggiungi percorso"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+"È stato richiesto a controllo remoto di elencare le sue caratteristiche "
+"supportate. Questo permette ai siti web di stimare la versione JOSM in "
+"esecuzione"
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
msgstr ""
-"E'' stato richiesto al controllo controllo remoto il caricamento di un "
-"livello di immagini aeree dal seguente indirizzo URL:"
+"È stato richiesto al controllo controllo remoto il caricamento di un livello "
+"di immagini aeree dal seguente indirizzo URL:"
msgid "Remote imagery"
msgstr "Immagini aeree remote"
msgid "Remote Control has been asked to import data from the following URL:"
msgstr ""
-"E'' stata richiesta al controllo remoto l''importazione dei dati dal "
-"seguente indirizzo URL:"
+"È stata richiesta al controllo remoto l''importazione dei dati dal seguente "
+"indirizzo URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr ""
-"E'' stato richiesto al controllo remoto il caricamento dei dati dalle API."
+"È stato richiesto al controllo remoto il caricamento dei dati dalle API."
+
+msgid "The latitudes must be between {0} and {1}"
+msgstr "Le latitudini devono essere comprese fra {0} e {1}"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "Le longitudini devono essere comprese fra {0} e {1}"
+
+msgid "The minima must be less than the maxima"
+msgstr "Il minimo deve essere minore del massimo"
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
msgstr ""
-"E'' stato richiesto al controllo remoto il caricamento di oggetti "
-"(specificati con il loro id) dalle API."
+"È stato richiesto al controllo remoto il caricamento di oggetti (specificati "
+"con il loro id) dalle API."
msgid "Remote Control has been asked to open a local file."
-msgstr ""
-"E'' stata richiesta al controllo remoto l''apertura di un file locale."
+msgstr "È stata richiesta al controllo remoto l''apertura di un file locale."
msgid "Do you want to allow this?"
msgstr "Si vuole permettere questo?"
@@ -13236,7 +13594,7 @@ msgid ""
"Remote Control has been asked to report its protocol version. This enables "
"web sites to detect a running JOSM."
msgstr ""
-"E'' stato richiesto al controllo remoto di riferire la sua versione del "
+"È stato richiesto al controllo remoto di riferire la sua versione del "
"protocollo. Questo permette ai siti web di individuare un JOSM in esecuzione."
msgid ""
@@ -13252,20 +13610,20 @@ msgstr "Dati:"
msgid "local file"
msgstr "file locale"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Collega a un file dati OSM sul proprio disco locale."
+msgid "Link to a GPX file on your local disk."
+msgstr "Collegamento ad un file GPX sul proprio disco locale."
msgid "include"
msgstr "includi"
-msgid "Include OSM data in the .joz session file."
-msgstr "Includi i dati OSM nel file sessione .joz."
+msgid "Include GPX data in the .joz session file."
+msgstr "Includi dati GPX nel file di sessione .joz."
msgid "No file association"
msgstr "Nessuna associazione file"
-msgid "OSM data will be included in the session file."
-msgstr "I dati OSM saranno inclusi nel file sessione."
+msgid "GPX data will be included in the session file."
+msgstr "I dati GPX saranno inclusi nel file di sessione."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13290,6 +13648,15 @@ msgstr "Il livello contiene dati non salvati - salva su file."
msgid "Layer does not contain unsaved data."
msgstr "Il livello non contiene alcun dato non salvato."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Collega a un file dati OSM sul proprio disco locale."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Includi i dati OSM nel file sessione .joz."
+
+msgid "OSM data will be included in the session file."
+msgstr "I dati OSM saranno inclusi nel file sessione."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -13297,6 +13664,9 @@ msgstr ""
"Per il livello dati osm la versione ''{0}'' dei meta dati non è supportata. "
"Attesa: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "File sessione (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Impossibile trovare il file ''{0}''."
@@ -13341,7 +13711,7 @@ msgid ""
"Cannot load layer {0} because it depends on layer {1} which has been skipped."
msgstr ""
"Impossibile caricare il livello {0} perché dipende dal livello {1} che è "
-"stato saltato."
+"stato tralasciato."
msgid "Error loading layer"
msgstr "Errore nel caricamento del livello"
@@ -13352,39 +13722,39 @@ msgstr ""
"è:<br>{2}</html>"
msgid "Skip layer and continue"
-msgstr "Salta il livello e continua"
+msgstr "Tralascia il livello e continua"
msgid "expected .jos file inside .joz archive"
msgstr "era atteso un file .jos all''interno dell''archivio .joz"
msgid "Skip download"
-msgstr "Salta il download"
+msgstr "Tralascia lo scaricamento"
msgid "Download Plugin"
msgstr "Scarica estensione"
msgid "Skip Download"
-msgstr "Salta scaricamento"
+msgstr "Tralascia scaricamento"
msgid "JOSM version {0} required for plugin {1}."
msgstr "Per l''estensione {1} è richiesta la versione di JOSM {0}."
msgid "Download skipped"
-msgstr "Scaricamento non eseguito"
+msgstr "Scaricamento tralasciato"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Attenzione: impossibile scaricare l''estensione ''{0}''. Il suo collegamento "
-"per lo scarico non si conosce. Tralasciato lo scarico."
+"Impossibile scaricare l''estensione ''{0}''. Non si conosce il suo "
+"collegamento. Tralascio lo scaricamento."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Attenzione: impossibile scaricare l''estensione ''{0}''. Il suo collegamento "
-"per lo scarico ''{1}'' non è un indirizzo URL valido. Tralasciato lo scarico."
+"Impossibile scaricare l''estensione ''{0}''. Il suo collegamento ''{1}'' non "
+"è un URL valido. Tralascio lo scaricamento."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Fallita la creazione della cartella ''''{0}'''' per l''estensione"
@@ -13393,7 +13763,7 @@ msgid "Downloading Plugin {0}..."
msgstr "Scaricamento estensione {0}..."
msgid "An error occurred in plugin {0}"
-msgstr "E'' stato generato un errore dall''estensione {0}"
+msgstr "È stato generato un errore dall''estensione {0}"
msgid "integrated into main program"
msgstr "integrata nel programma principale"
@@ -13417,7 +13787,7 @@ msgid ""
"longer developed and very likely will produce errors.<br>It should be "
"disabled.<br>Delete from preferences?</html>"
msgstr ""
-"<html>E'' stato richiesto il caricamento dell''estensione \"{0}\".<br>Questa "
+"<html>È stato richiesto il caricamento dell''estensione \"{0}\".<br>Questa "
"estensione non è più sviluppata e molto probabilmente produrrà degli "
"errori.<br>Dovrebbe essere disabilitata.<br>Eliminarla dalle "
"preferenze?</html>"
@@ -13436,13 +13806,13 @@ msgstr ""
"giorni fa."
msgid "Click to update the activated plugins"
-msgstr "Cliccare per aggiornare le estensioni attivate"
+msgstr "Clicca per aggiornare le estensioni attivate"
msgid "Skip update"
-msgstr "Salta aggiornamento"
+msgstr "Tralascia aggiornamento"
msgid "Click to skip updating the activated plugins"
-msgstr "Cliccare per tralasciare l''aggiornamento delle estensioni attivate"
+msgstr "Clicca per tralasciare l''aggiornamento delle estensioni attivate"
msgid ""
"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
@@ -13547,7 +13917,7 @@ msgstr "Rimozione delle estensioni non più mantenute..."
msgid "Updating the following plugin has failed:"
msgid_plural "Updating the following plugins has failed:"
-msgstr[0] "E’ fallito l’aggiornamento della seguente estensione:"
+msgstr[0] "È fallito l’aggiornamento della seguente estensione:"
msgstr[1] "E’ fallito l’aggiornamento delle seguenti estensioni:"
msgid ""
@@ -13566,19 +13936,18 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Aggiornamento dell''estensione fallito"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Attenzione: impossibile trovare l''estensione {0}"
+msgid "Failed to find plugin {0}"
+msgstr "Fallita la ricerca dell''estensione {0}"
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
-"Attenzione: fallito lo scaricamento della lista di informazioni "
-"dell''estensione"
+"Fallito lo scaricamento della lista delle informazioni sulle estensioni"
msgid "Disable plugin"
msgstr "Disabilita estensione"
msgid "Click to delete the plugin ''{0}''"
-msgstr "Cliccare per eliminare l''estensione ''{0}''"
+msgstr "Clicca per eliminare l''estensione ''{0}''"
msgid "Keep plugin"
msgstr "Mantieni estensione"
@@ -13586,31 +13955,29 @@ msgstr "Mantieni estensione"
msgid "Click to keep the plugin ''{0}''"
msgstr "Cliccare per mantenere l''estensione ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
-"Attenzione: fallita l''eliminazione dell''estensione obsoleta ''''{0}''''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Fallita l''eliminazione del plugin obsoleto ''{0}''."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Attenzione: fallita l''installazione dell''estensione ''{0}'' già scaricata. "
-"Tralasciata l''installazione. JOSM continuerà a caricare la vecchia versione "
+"Fallita l''installazione dell''estensione già scaricata ''{0}''. Tralascio "
+"l''installazione. JOSM sta ancora caricando la vecchia versione "
"dell''estensione."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
-"Attenzione: è fallita l''installazione dell''estensione ''{0}'' dal file "
-"temporaneo scaricato ''{1}''. {2}"
+"Fallita l''installazione dell''estensione ''{0}'' dal file di scaricamento "
+"temporaneo ''{1}''. {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Attenzione: fallita l''installazione dell''estensione ''''{0}'''' dal file "
-"temporaneo ''''{1}''''. E'' fallito il cambio del nome."
+"Fallita l''installazione dell''estensione ''{0}'' dal file di scaricamento "
+"temporaneo ''{1}''. Rinomina fallita."
msgid "Click to disable the plugin ''{0}''"
msgstr "Cliccare per disabilitare l''estensione ''{0}''"
@@ -13618,7 +13985,7 @@ msgstr "Cliccare per disabilitare l''estensione ''{0}''"
msgid ""
"An unexpected exception occurred that may have come from the ''{0}'' plugin."
msgstr ""
-"E'' stata generata una eccezione inaspettata che probabilmente deriva "
+"È stata generata una eccezione inaspettata che probabilmente deriva "
"dall''estensione ''{0}''."
msgid "According to the information within the plugin, the author is {0}."
@@ -13627,7 +13994,7 @@ msgstr "Secondo le informazioni all''interno del plugin l''autore è {0}."
msgid ""
"Try updating to the newest version of this plugin before reporting a bug."
msgstr ""
-"Provare ad aggiornare questa estensione all''ultima versione prima di "
+"Provare ad aggiornare quest''estensione all''ultima versione prima di "
"comunicare un bug."
msgid "Should the plugin be disabled?"
@@ -13688,11 +14055,10 @@ msgstr "Elaborazione dei file di cache del sito dell''estensione..."
msgid "Processing file ''{0}''"
msgstr "Elaborazione del file ''''{0}''''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Attenzione: Fallita la ricerca delle informazioni sull''estensione nel file "
-"''''{0}''''. Saltato."
+"Fallita la scansione del file ''{0}'' per le informazioni dell''estensione. "
+"Tralascio."
msgid "Processing plugin site cache icon files..."
msgstr ""
@@ -13708,13 +14074,28 @@ msgstr "Scarica la lista delle estensioni..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Scaricamento della lista delle estensioni da ''''{0}''''"
+msgid "Plugin list download error"
+msgstr "Errore nello scaricamento della lista delle estensioni"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM non è riuscito a scaricare la lista delle estensioni:"
+
+msgid "Details:"
+msgstr "Dettagli:"
+
+msgid "Plugin icons download error"
+msgstr "Errore nello scaricamento delle icone delle estensioni"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM non è riuscito a scaricare le icone delle estensioni:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Attenzione: fallita la creazione della cartella delle estensioni "
-"''''{0}''''. Non è possibile memorizzare la lista delle estensioni dal sito "
-"''''{1}''''."
+"Fallita la creazione della cartella delle estensioni ''{0}''. Impossibile "
+"inserire nella cache la lista delle estensioni dal sito delle estensioni "
+"''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Scrittura della lista delle estensioni su cache locale ''''{0}''''"
@@ -13727,7 +14108,7 @@ msgid ""
"Exception was: {1}"
msgstr ""
"Fallita l''analisi della lista delle estensioni dal sito ''''{0}''''. Sito "
-"ignorato. L''eccezione è stata: {1}"
+"tralasciato. L''eccezione è stata: {1}"
msgid "Processing plugin list from site ''{0}''"
msgstr "Elaborazione della lista delle estensioni dal sito ''''{0}''''"
@@ -13755,8 +14136,8 @@ msgid ""
"are running the latest<br>version of JOSM, please consider being kind and "
"file a bug report."
msgstr ""
-"E'' stata generata una eccezione inaspettata.<br>Questo è sempre un errore "
-"di programmazione. Se si sta utilizzando l''ultima<br>versione di JOSM, si "
+"È stata generata una eccezione inaspettata.<br>Questo è sempre un errore di "
+"programmazione. Se si sta utilizzando l''ultima<br>versione di JOSM, si "
"prega gentilmente di effettuare una segnalazione per questo problema."
msgid "Suppress further error dialogs for this session."
@@ -13766,7 +14147,7 @@ msgid ""
"You have encountered an error in JOSM. Before you file a bug report make "
"sure you have updated to the latest version of JOSM here:"
msgstr ""
-"E'' stato riscontrato un errore in JOSM. Prima di procedere con la "
+"È stato riscontrato un errore in JOSM. Prima di procedere con la "
"segnalazione del problema, assicurarsi di aver aggiornato JOSM all''ultima "
"versione che si trova qui:"
@@ -13992,7 +14373,7 @@ msgid ""
"failed.<br>Please check the username and the password in the JOSM "
"preferences.</html>"
msgstr ""
-"<html>E'' fallita l''autenticazione al server OSM con il nome utente "
+"<html>È fallita l''autenticazione al server OSM con il nome utente "
"''''{0}''''.<br>Si prega di controllare il nome utente e la password nelle "
"preferenze di JOSM.</html>"
@@ -14001,7 +14382,7 @@ msgid ""
"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
"token.</html>"
msgstr ""
-"<html>E'' fallita l''autenticazione con il server OSM con il token OAuth "
+"<html>È fallita l''autenticazione con il server OSM con il token OAuth "
"''''{0}''''.<br>Si prega di aprire la finestra delle preferenze e di "
"ottenere un altro token OAuth.</html>"
@@ -14009,11 +14390,11 @@ msgid ""
"<html>Authorisation at the OSM server failed.<br>The server reported the "
"following error:<br>''{0}''</html>"
msgstr ""
-"<html>E'' fallita l''autorizzazione al server OSM.<br>Il server ha risposto "
+"<html>È fallita l''autorizzazione al server OSM.<br>Il server ha risposto "
"con il seguente errore:<br>''{0}''</html>"
msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr "<html>E'' fallita l''autorizzazione al server OSM.<br></html>"
+msgstr "<html>È fallita l''autorizzazione al server OSM.<br></html>"
msgid ""
"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -14021,7 +14402,7 @@ msgid ""
"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
"another OAuth token.</html>"
msgstr ""
-"<html>E'' faliita l''autorizzazione al server OSM con il token OAuth "
+"<html>È faliita l''autorizzazione al server OSM con il token OAuth "
"''''{0}''''.<br>Il token non è autorizzato ad accedere alla risorsa "
"protetta<br>''''{1}''''.<br>Si prega di aprire la finestra delle preferenze "
"ed ottenere un altro token OAuth.</html>"
@@ -14030,8 +14411,8 @@ msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
"later.</html>"
msgstr ""
-"<html>E'' scaduto il tempo per la comunicazione con il server OSM ''{0}''. "
-"Si prega di riprovare più tardi.</html>"
+"<html>È scaduto il tempo per la comunicazione con il server OSM ''{0}''. Si "
+"prega di riprovare più tardi.</html>"
msgid "no error message available"
msgstr "nessun messaggio di errore disponibile"
@@ -14042,7 +14423,7 @@ msgid ""
"message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
"(untranslated)</strong>: {2}</html>"
msgstr ""
-"<html>E'' fallita la comunicazione con il server OSM ''{0}''. Il server ha "
+"<html>È fallita la comunicazione con il server OSM ''{0}''. Il server ha "
"risposto<br>con l''errore seguente:<br><strong>Codice errore:<strong> "
"{1}<br><strong>Messaggio di errore (non tradotto)</strong>: {2}</html>"
@@ -14050,14 +14431,14 @@ msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
"already been closed."
msgstr ""
-"<html>E'' fallita la chiusura dell''insieme di modifiche "
+"<html>È fallita la chiusura dell''insieme di modifiche "
"<strong>{0}</strong><br>perché è stato già chiuso."
msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
"already been closed on {1}."
msgstr ""
-"<html>E'' fallita la chiusura dell''insieme di modifiche "
+"<html>È fallita la chiusura dell''insieme di modifiche "
"<strong>{0}</strong><br> perché è stato già chiuso il {1}."
msgid ""
@@ -14074,7 +14455,7 @@ msgid ""
"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
"already been closed on {1}."
msgstr ""
-"<html>E'' fallito il caricamento dell''insieme di modifiche "
+"<html>È fallito il caricamento dell''insieme di modifiche "
"<strong>{0}</strong><br>perché è stato già chiuso il {1}."
msgid ""
@@ -14099,16 +14480,15 @@ msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
"problem with transferring data.<br>Details (untranslated): {1}</html>"
msgstr ""
-"<html>E'' fallito il caricamento/scaricamento dei dati su/da<br>''{0}''<br>a "
+"<html>È fallito il caricamento/scaricamento dei dati su/da<br>''{0}''<br>a "
"causa di un problema di trasferimento.<br>Dettagli (non tradotti): {1}</html>"
msgid ""
"<html>Failed to download data. Its format is either unsupported, ill-formed, "
"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
msgstr ""
-"<html>E'' fallito lo scaricamento dei dati. Il loro formato non è "
-"supportato, è mal-formato, e/o inconsistente.<br><br>Dettagli (non "
-"tradotti): {0}</html>"
+"<html>È fallito lo scaricamento dei dati. Il loro formato non è supportato, "
+"è mal-formato, e/o inconsistente.<br><br>Dettagli (non tradotti): {0}</html>"
msgid ""
"<html>The OSM server<br>''{0}''<br>reported an internal server "
@@ -14184,24 +14564,14 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Impossibile trovare l''immagine ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Attenzione: fallita la gestione del file zip ''{0}''. L''eccezione è stata: "
-"{1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
-"Attenzione: è fallito l''accesso alla cartella ''{0}'' per ragioni di "
-"sicurezza. L''eccezione è stata: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Fallita la gestione del file zip ''{0}''. L''eccezione è stata: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Attenzione: fallita la derivazione del prefisso della lingua di riferimento "
-"dal codice JOSM ''{0}''. Utilizzo del codice predefinito ''en''."
+"Fallito l''accesso alla cartella ''{0}'' per ragioni di sicurezza. "
+"L''eccezione è stata: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [si prega di digitare il suo numero]"
@@ -14213,16 +14583,63 @@ msgstr ""
"Fallita l’apertura dell’indirizzo URL. Non è stata selezionata ancora alcuna "
"piattaforma. Si prega prima di selezionarne una."
+msgid "Opening URL: {0}"
+msgstr "URL in apertura: {0}"
+
+msgid "zoom"
+msgstr "ingrandimento"
+
+msgid "latitude"
+msgstr "latitudine"
+
+msgid "longitude"
+msgstr "longitudine"
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr "L''indirizzo URL non contiene {0}/{1}/{2}"
+
+msgid "URL does not contain valid {0}"
+msgstr "L''indirizzo URL non contiene un valido {0}"
+
msgid "reserved"
msgstr "riservato"
+msgid "Outdated Java version"
+msgstr "Versione Java obsoleta"
+
+msgid "Update Java"
+msgstr "Aggiornare Java"
+
+msgid "You are running version {0} of Java."
+msgstr "Si sta eseguendo la versione {0} di Java."
+
+msgid "February 2013"
+msgstr "Febbraio 2013"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+"Questa versione non è più supportata da {0} dal {1} e non è più consigliato "
+"il suo utilizzo."
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+"JOSM a breve non funzionerà più con questa versione; si consiglia vivamente "
+"di aggiornare a Java {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Si desidera aggiornare adesso ?"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Conflitto silente sulla scorciatoia: ''{0}'' spostato da ''{1}'' a ''{2}''."
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] "E'' stato trovato {0} etichetta nel buffer, ciò è sospetto!"
+msgstr[0] "È stato trovato {0} etichetta nel buffer, ciò è sospetto!"
msgstr[1] "Sono stati trovati {0} etichette nel buffer, ciò è sospetto!"
msgid "Key is too long (max {0} characters):"
@@ -14250,8 +14667,22 @@ msgstr ""
"<html><p> Spiacenti, non è possibile incollare le etichette dal buffer. Non "
"contiene alcun oggetto JOSM o testo adatto. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Click destro = copia negli appunti"
+msgid "ms"
+msgstr "ms"
+
+msgid "s"
+msgstr "s"
+
+msgid "min"
+msgstr "min"
+
+msgid "h"
+msgstr "h"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "giorno"
+msgstr[1] "giorni"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14369,7 +14800,7 @@ msgstr ""
"dati"
msgid "town"
-msgstr "città"
+msgstr "paese"
msgctxt "landuse"
msgid "forest"
@@ -14409,7 +14840,7 @@ msgstr "multi-poligono"
msgctxt "Relation type"
msgid "network"
-msgstr "rete (network)"
+msgstr "rete"
msgctxt "Relation type"
msgid "public_transport"
@@ -14441,11 +14872,11 @@ msgstr "località non abitata"
msgctxt "Place type"
msgid "village"
-msgstr "insediamento urbano (< 10.000 abitanti)"
+msgstr "frazione"
msgctxt "Place type"
msgid "town"
-msgstr "città (10.000-100.000 abitanti)"
+msgstr "paese"
msgctxt "Place type"
msgid "borough"
@@ -14601,6 +15032,13 @@ msgid "Saturation:"
msgstr "Saturazione:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Permette di modificare le informazioni sul traffico e di esportarle per il "
+"simulatore di mobilità urbana SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14677,7 +15115,7 @@ msgid ""
"This plugin directly upload GPS Traces from current active layer in JOSM to "
"openstreetmap.org."
msgstr ""
-"Questa estensione carica direttamente su openstreetmap.org i tracciati GPS "
+"Quest''estensione carica direttamente su openstreetmap.org i tracciati GPS "
"dal livello correntemente attivo in JOSM."
msgid "Downloads OSM data along a way"
@@ -14687,7 +15125,7 @@ msgid ""
"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
"very fast."
msgstr ""
-"Permette all’utente di rendere anonime le marcature temporali ed eliminare "
+"Permette all’utente di rendere anonime le marche temporali ed eliminare "
"velocemente parti di tracciati GPX di grandi dimensioni."
msgid "Shows the elevation profile and some statistical data of a GPX track."
@@ -14708,6 +15146,12 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Cerca e corregge in modo semplice gli indirizzi non validi."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Parla con gli utenti che stanno modificando la mappa nelle vicinanze, sii "
+"avvisato quando qualcuno si avvicina."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14749,7 +15193,7 @@ msgstr ""
"scostamenti delle immagini aeree con un pulsante."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Stile di aggiustamento delle immagini aeree WMSPlugin"
+msgstr "Modalità mappa regolazione mmagini aeree in stile WMSPlugin"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -14782,7 +15226,7 @@ msgstr ""
"corrente - al momento le informazioni sui punti del tracciato GPX"
msgid "A helper for IRS satellite adjustment."
-msgstr "Un assistente per la correzione satellitare IRS."
+msgstr "Un supporto per la regolazione satellitare IRS."
msgid ""
"Provides Java Topology Suite (JTS) library and related utilities. Not meant "
@@ -14846,16 +15290,13 @@ msgstr "Aggiunge divieti di svolta a sinistra per insiemi di 4 o 5 percorsi"
msgid "Simplifies download from different read-only APIs."
msgstr "Semplifica lo scaricamento da API in sola lettura differenti."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Converte semplicemente un''area in un multi-poligono."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Permette di attribuire in una sola volta le etichette a tutti gli oggetti "
"presenti in un''area selezionata"
msgid "NanoLog adjustment and browsing layer"
-msgstr "Livello NanoLog di aggiustamento e navigazione"
+msgstr "Livello NanoLog di regolazione e navigazione"
msgid ""
"Use your system''s password manager to store the API username and password. "
@@ -14869,8 +15310,8 @@ msgid ""
"tablet pens, when you have problems just clicking the tablet without the "
"mouse moving (general Java - tablet problem)."
msgstr ""
-"Simula un click quando si effettua un piccolo e breve trascinamento. E’ "
-"utile per le penne dei tablet, quando si hanno dei problemi semplicemente "
+"Simula un click quando si effettua un piccolo e breve trascinamento. È utile "
+"per le penne dei tablet, quando si hanno dei problemi semplicemente "
"cliccando il tablet senza lo spostamento del mouse (in generale un problema "
"Java - tablet)."
@@ -14878,7 +15319,7 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
-"Impedisce l''utilizzo di JOSM per sempre (ATTENZIONE: questa estensione "
+"Impedisce l''utilizzo di JOSM per sempre (ATTENZIONE: quest''estensione "
"impedisce a JOSM di essere avviato ed è difficile liberarsene)"
msgid "Convert data from Open Data portals to OSM layer"
@@ -14922,11 +15363,14 @@ msgstr ""
"Scrivi la posizione gps nella testata del file immagine. Esegui questo "
"comando tramite il menu del tasto destro sul livello dell''immagine."
+msgid "Make photos movable and position them on the map."
+msgstr "Rende le foto spostabili e le posiziona sulla mappa."
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
msgstr ""
-"Questa estensione permette di visualizzare una qualsiasi immagine come "
+"Quest''estensione permette di visualizzare una qualsiasi immagine come "
"sfondo dell''editor e allinearla con la mappa."
msgid "The great JGoodies Plastic Look and Feel."
@@ -14951,9 +15395,6 @@ msgid "Relation and multipolygon creating and editing panel."
msgstr ""
"Pannello di creazione e modifica della relazione e del multi-poligono."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Aggiunge la voce Riavvia JOSM al menu File."
-
msgid "Plugin for reverting changesets"
msgstr "Estensione per il ripristino dei gruppi di modifiche"
@@ -14989,14 +15430,12 @@ msgstr ""
"essere limitato dalla dimensione massima dell''area rimossa. Calcola anche "
"la media dei nodi vicini."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Crea e modifica mappe nautiche per OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Modifica caratteristiche per OpenSeaMap"
msgid "Allow adding markers/nodes on current gps positions."
-msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
+msgstr ""
+"Permetti l''aggiunta di contrassegni/nodi alle posizioni gps correnti."
msgid "The surveyor''s toolbox."
msgstr "Gli strumenti di surveyor."
@@ -15022,7 +15461,7 @@ msgstr ""
"indipendente."
msgid "Make terraced houses out of single blocks."
-msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
+msgstr "Genera delle case a schiera da singoli blocchi."
msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
@@ -15039,6 +15478,13 @@ msgstr ""
"Traccia gli edifici dalla mappa catastale della Repubblica Ceca. Necessita "
"di un TracerServer (.NET o Mono) in esecuzione."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+"Traccia gli edifici ed altre forme da una mappa. Necessita di Tracer2Server "
+"per la sua esecuzione."
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Estensione per firmare digitalmente i dati OSM"
@@ -15066,7 +15512,7 @@ msgid ""
"georeferenced video against a GPS track, to use it for identify visible "
"objects."
msgstr ""
-"(Questa estensione è al momento ancora in sviluppo!!!) Collega e sincronizza "
+"(Quest''estensione è al momento ancora in sviluppo!!!) Collega e sincronizza "
"un video georeferenziato con un tracciato GPS, per utilizzarlo "
"nell''identificazione di oggetti visibili."
@@ -15075,7 +15521,7 @@ msgid ""
"plugin is still under early development and may be buggy."
msgstr ""
"Supporta lo scaricamento delle mappe scansionate e tassellate da walking-"
-"papers.org. Questa estensione è ancora in fase di sviluppo e può contenere "
+"papers.org. Quest''estensione è ancora in fase di sviluppo e può contenere "
"qualche errore."
msgid "Easy downloading along a long set of interconnected ways"
@@ -15099,17 +15545,14 @@ msgstr ""
"Guida una macchina da corsa dal punto A al punto B al di sopra delle "
"immagini aeree, lasciando i cactus alle spalle."
-msgid "Highways"
-msgstr "Strade"
-
msgid "Streets"
msgstr "Strade"
msgid "Motorway"
-msgstr "Autostrada/tangenziale"
+msgstr "Autostrada"
msgid "Edit Motorway"
-msgstr "Modifica autostrada/tangenziale"
+msgstr "Modifica autostrada"
msgid "Reference"
msgstr "Riferimento"
@@ -15157,7 +15600,7 @@ msgid "compacted"
msgstr "compattato"
msgid "grass_paver"
-msgstr "erba"
+msgstr "pavimentazione mista erba-cemento"
msgid "grass"
msgstr "erba"
@@ -15186,23 +15629,26 @@ msgstr "Terrapieno"
msgid "Lit"
msgstr "Illuminazione stradale"
+msgid "Toll"
+msgstr "Pedaggio"
+
msgid "Motorway Link"
msgstr "Svincolo autostradale"
msgid "Trunk"
-msgstr "Trunk"
+msgstr "Superstrada"
msgid "Edit Trunk"
-msgstr "Modifica Trunk"
+msgstr "Modifica superstrada"
msgid "Motorroad"
-msgstr "Superstrada"
+msgstr "Riservata ai veicoli a motore"
msgid "Trunk Link"
-msgstr "Svincolo Trunk"
+msgstr "Svincolo superstrada"
msgid "Edit Trunk Link"
-msgstr "Modifica uno svincolo Trunk"
+msgstr "Modifica svincolo superstrada"
msgid "Primary"
msgstr "Primaria"
@@ -15211,7 +15657,7 @@ msgid "Edit Primary Road"
msgstr "Modifica strada primaria"
msgid "Incline"
-msgstr "Rampa"
+msgstr "Pendenza"
msgid "10%"
msgstr "10%"
@@ -15262,7 +15708,7 @@ msgid "Edit Unclassified Road"
msgstr "Modifica una strada non classificata"
msgid "Passing Places"
-msgstr "Slarghi per l''incrocio"
+msgstr "Slarghi per l''incrocio di veicoli"
msgid "Width (meters)"
msgstr "Larghezza (metri)"
@@ -15273,11 +15719,55 @@ msgstr "Residenziale"
msgid "Edit Residential Street"
msgstr "Modifica strada residenziale"
+msgid "Bicycle Road"
+msgstr "Strada ciclabile"
+
+msgid "Edit Bicycle Road"
+msgstr "Modifica strada ciclabile"
+
+msgid "Highway type"
+msgstr "Tipo strada"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "residenziale"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "strada di servizio"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "non classificata"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "percorso"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "pista ciclabile"
+
+msgid "Vehicle access"
+msgstr "Accesso veicoli"
+
+msgid "yes"
+msgstr "si"
+
+msgid "no"
+msgstr "no"
+
+msgid "destination"
+msgstr "destinazione"
+
+msgid "Oneway for bicycle"
+msgstr "Senso unico per biciclette"
+
msgid "Living Street"
-msgstr "Living Street"
+msgstr "Living street"
msgid "Edit Living Street"
-msgstr "Modifica Living Street"
+msgstr "Modifica living street"
msgid "Pedestrian"
msgstr "Pedonale"
@@ -15291,11 +15781,11 @@ msgstr "Area"
msgid "Service"
msgstr "Strada di servizio"
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr "Modifica strada di servizio"
-msgid "Serviceway type"
-msgstr "Tipo di strada di servizio"
+msgid "Service way type"
+msgstr "Tipo strada di servizio"
msgid "alley"
msgstr "vicolo"
@@ -15306,6 +15796,9 @@ msgstr "strada di servizio"
msgid "parking_aisle"
msgstr "corsia interna a parcheggio"
+msgid "drive-through"
+msgstr "attraversamento in auto (drive-through)"
+
msgid "Parking Aisle"
msgstr "Corsia interna a parcheggio"
@@ -15319,7 +15812,7 @@ msgid "Edit Road of unknown type"
msgstr "Modifica una Strada (tipo sconosciuto)"
msgid "Construction"
-msgstr "In Costruzione"
+msgstr "In costruzione"
msgid "Edit Highway Under Construction"
msgstr "Modifica una strada in costruzione"
@@ -15333,18 +15826,12 @@ msgstr "rotatoria"
msgid "jughandle"
msgstr "Svincolo a cappio (jughandle)"
-msgid "yes"
-msgstr "si"
-
msgid "Road Restrictions"
msgstr "Restrizioni e divieti"
msgid "Edit Road Restrictions"
msgstr "Modifica restrizioni e divieti"
-msgid "Toll"
-msgstr "Pedaggio"
-
msgid "No exit (cul-de-sac)"
msgstr "Senza uscita (cul-de-sac)"
@@ -15354,9 +15841,6 @@ msgstr "Divieti alla modalità di trasporto"
msgid "General Access"
msgstr "Accesso Generale"
-msgid "destination"
-msgstr "destinazione"
-
msgid "delivery"
msgstr "carico e scarico"
@@ -15366,15 +15850,15 @@ msgstr "permesso"
msgid "private"
msgstr "privato"
+msgid "customers"
+msgstr "clienti"
+
msgid "agricultural"
msgstr "Agricolo"
msgid "forestry"
msgstr "forestale"
-msgid "no"
-msgstr "no"
-
msgid "official"
msgstr "ufficiale"
@@ -15420,6 +15904,9 @@ msgstr "Veicoli per trasporti eccezionali"
msgid "Public Service Vehicles (psv)"
msgstr "Veicoli del servizio pubblico"
+msgid "Tourist buses"
+msgstr "Autobus turistici"
+
msgid "Min. speed (km/h)"
msgstr "Velocità minima (km/h)"
@@ -15457,13 +15944,13 @@ msgid "Edit Junction"
msgstr "Modifica un incrocio"
msgid "motorway"
-msgstr "autostrada/tangenziale"
+msgstr "autostrada"
msgid "motorway_link"
-msgstr "collegamento autostradale"
+msgstr "svincolo autostradale"
msgid "trunk"
-msgstr "trunk"
+msgstr "superstrada"
msgid "trunk_link"
msgstr "trunk_link"
@@ -15493,7 +15980,7 @@ msgid "service"
msgstr "strada di servizio"
msgid "bus_guideway"
-msgstr "autobus a guida vincolata"
+msgstr "bus_guideway"
msgid "construction"
msgstr "in costruzione"
@@ -15504,6 +15991,9 @@ msgstr "Modifica ponte"
msgid "viaduct"
msgstr "viadotto"
+msgid "suspension"
+msgstr "sospensione"
+
msgid "swing"
msgstr "girevole"
@@ -15520,13 +16010,13 @@ msgid "Ways"
msgstr "Percorsi"
msgid "Track"
-msgstr "Track"
+msgstr "Strada sterrata"
msgid "Edit Track"
-msgstr "Modifica Track"
+msgstr "Modifica strada sterrata"
msgid "Tracktype"
-msgstr "Tipo di traccia"
+msgstr "Tipo di strada sterrata"
msgid "grade1"
msgstr "grado1"
@@ -15550,10 +16040,10 @@ msgid "General access"
msgstr "Accesso Generale"
msgid "Path"
-msgstr "Percorso"
+msgstr "Sentiero"
msgid "Edit Path"
-msgstr "Modifica percorso"
+msgstr "Modifica sentiero"
msgid "SAC Scale"
msgstr "Scala escursionistica SAC"
@@ -15624,20 +16114,29 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilità"
+msgctxt "trail_visibility"
msgid "excellent"
msgstr "eccellente"
+msgctxt "trail_visibility"
msgid "good"
msgstr "buona"
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "intermedio"
+msgstr "discreta"
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "cattiva"
+msgstr "scarsa"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "orribile"
+msgstr "pessima"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "no"
msgid "Wheelchairs"
msgstr "Sedie a rotelle"
@@ -15654,10 +16153,10 @@ msgstr "Percorso dedicato all''equitazione"
msgid "Edit Bridleway"
msgstr "Modifica un percorso per equitazione"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr "Corsia ciclabile"
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr "Modifica corsia ciclabile"
msgid "Cycleway"
@@ -15682,7 +16181,7 @@ msgid "share_busway"
msgstr "corsia autobus condivisa"
msgid "shared_lane"
-msgstr "corsia condivisa"
+msgstr "corsia ciclabile condivisa"
msgid "Cycleway left"
msgstr "Pista ciclabile sinistra"
@@ -15693,8 +16192,8 @@ msgstr "Pista ciclabile destra"
msgid "Oneway (bicycle)"
msgstr "Senso unico (biciclette)"
-msgid "Edit Highway"
-msgstr "Modifica strada"
+msgid "Edit Highway Attributes:"
+msgstr "Modifica attributi della strada:"
msgid "Highway"
msgstr "Strada"
@@ -15715,19 +16214,19 @@ msgid "Combined Foot- and Cycleway"
msgstr "Pista combinata pedonale e ciclabile"
msgid "Dedicated Footway"
-msgstr "Marciapiede Dedicato"
+msgstr "Marciapiede dedicato"
msgid "Edit Footway"
-msgstr "Modifica Footway"
+msgstr "Modifica un marciapiede"
msgid "Steps"
-msgstr "Rampa di scale"
+msgstr "Scalinata"
msgid "Edit Flight of Steps"
-msgstr "Modifica una rampa di scale"
+msgstr "Modifica una scalinata"
msgid "Amount of Steps"
-msgstr "Quantità di gradini"
+msgstr "Numero di gradini"
msgid "Waypoints"
msgstr "Punti del percorso"
@@ -15736,7 +16235,7 @@ msgid "Motorway Junction"
msgstr "Uscita autostradale"
msgid "Edit Motorway Junction"
-msgstr "Modifica un''uscita autostradale"
+msgstr "Modifica uscita autostradale"
msgid "Number"
msgstr "Numero"
@@ -15762,12 +16261,18 @@ msgstr "Area di sosta"
msgid "Edit Rest Area"
msgstr "Modifica area di sosta"
-msgid "Emergency Phone"
-msgstr "Telefono di emergenza"
+msgid "Drinking Water"
+msgstr "Acqua potabile"
msgid "Traffic Signal"
msgstr "Semaforo"
+msgid "Edit Traffic Signal"
+msgstr "Modifica semaforo"
+
+msgid "Optional crossing attributes:"
+msgstr "Attributi di attraversamento opzionali:"
+
msgid "Pedestrian crossing type"
msgstr "Tipo di attraversamento pedonale"
@@ -15783,15 +16288,6 @@ msgstr "isola"
msgid "unmarked"
msgstr "non marcato"
-msgid "Cross on horseback"
-msgstr "Attraversamento a cavallo"
-
-msgid "Cross by bicycle"
-msgstr "Attraversamento ciclabile"
-
-msgid "Crossing attendant"
-msgstr "Attraversamento controllato"
-
msgid "Crossing type name (UK)"
msgstr "Nome del tipo di attraversamento (UK)"
@@ -15813,6 +16309,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Attraversamento controllato"
+
+msgid "Cross by bicycle"
+msgstr "Attraversamento ciclabile"
+
+msgid "Cross on horseback"
+msgstr "Attraversamento a cavallo"
+
msgid "Stop"
msgstr "Stop"
@@ -15822,6 +16327,9 @@ msgstr "Dare precedenza"
msgid "Mini-roundabout"
msgstr "Mini-rotatoria"
+msgid "Edit Mini-Roundabout"
+msgstr "Modifica mini-rotatoria"
+
msgid "Direction"
msgstr "Direzione"
@@ -15831,17 +16339,14 @@ msgstr "senso orario"
msgid "Pedestrian Crossing"
msgstr "Attraversamento pedonale"
-msgid "Edit Crossing"
+msgid "Edit Pedestrian Crossing"
msgstr "Modifica attraversamento pedonale"
-msgid "Type name (UK)"
-msgstr "Nome del tipo (UK)"
-
msgid "Traffic Calming"
-msgstr "Rallentatore del traffico"
+msgstr "Dissuasore di velocità"
msgid "Edit Traffic Calming"
-msgstr "Modifica rallentatore del traffico"
+msgstr "Modifica un dissuasore di velocità"
msgid "bump"
msgstr "dosso"
@@ -15865,10 +16370,7 @@ msgid "table"
msgstr "dosso piatto"
msgid "Passing Place"
-msgstr "Slargo per l''incrocio"
-
-msgid "Edit Passing Place"
-msgstr "Modifica slargo per l''incrocio"
+msgstr "Slargo per l''incrocio di veicoli"
msgid "Turning Circle"
msgstr "Slargo per inversione di marcia"
@@ -15883,7 +16385,7 @@ msgid "Second Name"
msgstr "Secondo nome"
msgid "Speed Camera"
-msgstr "Rilevatore di velocità"
+msgstr "Autovelox"
msgid "Grit Bin"
msgstr "Cassone di sabbia"
@@ -15903,20 +16405,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barriere"
+msgid "Block"
+msgstr "Blocco"
+
+msgid "Edit Block"
+msgstr "Modifica blocco"
+
+msgid "Allowed traffic:"
+msgstr "Traffico permesso:"
+
+msgid "Material"
+msgstr "Materiale"
+
+msgid "stone"
+msgstr "pietra"
+
msgid "Bollard"
msgstr "Colonnina"
msgid "Edit Bollard"
msgstr "Modifica colonnina"
-msgid "Allowed traffic:"
-msgstr "Traffico permesso:"
+msgid "Bollard type"
+msgstr "Tipo di colonnina"
+
+msgid "rising"
+msgstr "a scomparsa"
+
+msgid "removable"
+msgstr "rimovibile"
+
+msgid "plastic"
+msgstr "plastica"
msgid "Cycle Barrier"
msgstr "Barriera per biciclette"
-msgid "Block"
-msgstr "Blocco"
+msgid "Edit Cycle Barrier"
+msgstr "Modifica barriera per biciclette"
msgid "Cattle Grid"
msgstr "Griglia"
@@ -15927,6 +16453,9 @@ msgstr "Modifica griglia"
msgid "Bus Trap"
msgstr "Trappola bus"
+msgid "Edit Bus Trap"
+msgstr "Modifica trappola bus"
+
msgid "Spikes"
msgstr "Spunzoni"
@@ -15934,10 +16463,10 @@ msgid "Edit Spikes"
msgstr "Modifica spunzoni"
msgid "Toll Booth"
-msgstr "Casello (per pedaggio)"
+msgstr "Casello autostradale"
msgid "Edit Toll Booth"
-msgstr "Modifica casello (per pedaggio)"
+msgstr "Modifica casello autostradale"
msgid "Border Control"
msgstr "Dogana"
@@ -15948,44 +16477,88 @@ msgstr "Modifica dogana"
msgid "Hedge"
msgstr "Siepe"
+msgid "Edit Hedge"
+msgstr "Modifica siepe"
+
+msgid "Height (meters)"
+msgstr "Altezza (metri)"
+
+msgid "Genus"
+msgstr "Genere"
+
+msgid "Species"
+msgstr "Specie"
+
+msgid "Taxon"
+msgstr "Unità tassonomica"
+
msgid "Fence"
msgstr "Recinto"
+msgid "Edit Fence"
+msgstr "Modifica recinto"
+
msgid "barbed_wire"
msgstr "filo spinato"
-msgid "chain"
+msgid "chain_link"
msgstr "rete"
msgid "electric"
msgstr "elettrico"
-msgid "hedge"
-msgstr "siepe"
-
msgid "pole"
msgstr "palo"
msgid "split_rail"
msgstr "staccionata"
+msgid "wire"
+msgstr "filo metallico"
+
+msgid "Guard Rail"
+msgstr "Barriera di contenimento (guard rail)"
+
+msgid "Edit Guard Rail"
+msgstr "Modifica barriera di contenimento (guard rail)"
+
msgid "Wall"
msgstr "Muro"
+msgid "Edit Wall"
+msgstr "Modifica muro"
+
msgid "City Wall"
msgstr "Cinta muraria"
+msgid "Edit City Wall"
+msgstr "Modifica cinta muraria"
+
msgid "Retaining Wall"
msgstr "Muro di contenimento"
+msgid "Edit Retaining Wall"
+msgstr "Modifica muro di contenimento"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Fosso"
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Modifica fosso"
+
+msgid "Kerb"
+msgstr "Cordolo"
+
+msgid "Edit Kerb"
+msgstr "Modifica cordolo"
+
+msgid "Entrance (barrier opening)"
msgstr "Punto di accesso"
-msgid "Edit Entrance"
-msgstr "Modifica punto di accesso"
+msgid "Edit Entrance (barrier opening)"
+msgstr "Modifica un punto di accesso"
msgid "Gate"
msgstr "Cancello"
@@ -15994,10 +16567,10 @@ msgid "Edit Gate"
msgstr "Modifica cancello"
msgid "Lift Gate"
-msgstr "Cancello a sollevamento"
+msgstr "Barriera a sollevamento"
msgid "Edit Lift Gate"
-msgstr "Modifica cancello a sollevamento"
+msgstr "Modifica barriera a sollevamento"
msgid "Hampshire Gate"
msgstr "Cancello di filo spinato"
@@ -16017,12 +16590,27 @@ msgstr "Kissing Gate"
msgid "Edit Kissing Gate"
msgstr "Modifica un Kissing Gate"
+msgid "Chain"
+msgstr "Rete"
+
+msgid "Edit Chain"
+msgstr "Modifica rete"
+
msgid "Stile"
msgstr "Scaletta"
msgid "Edit Stile"
msgstr "Modifica scaletta"
+msgid "ladder"
+msgstr "scala"
+
+msgid "squeezer"
+msgstr "strettoia"
+
+msgid "stepover"
+msgstr "scavalco"
+
msgid "Turnstile"
msgstr "Tornello"
@@ -16080,6 +16668,9 @@ msgstr "Canale di scolo"
msgid "Edit Drain"
msgstr "Modifica canale di scolo"
+msgid "Ditch"
+msgstr "Fosso"
+
msgid "Edit Ditch"
msgstr "Modifica fosso"
@@ -16089,6 +16680,12 @@ msgstr "Torrente"
msgid "Edit Stream"
msgstr "Modifica un torrente"
+msgid "Wadi"
+msgstr "Uadi"
+
+msgid "Edit Wadi"
+msgstr "Modifica uadi"
+
msgid "Canal"
msgstr "Canale"
@@ -16128,9 +16725,6 @@ msgstr "Modifica una diga"
msgid "Groyne"
msgstr "Frangiflutti"
-msgid "Edit Groyne"
-msgstr "Modifica frangiflutti"
-
msgid "Breakwater"
msgstr "Frangifrutti"
@@ -16164,6 +16758,21 @@ msgstr "Modifica bacino coperto"
msgid "Edit Water"
msgstr "Modifica acqua"
+msgid "Water Body"
+msgstr "Specchio d''acqua"
+
+msgid "lake"
+msgstr "lago"
+
+msgid "lagoon"
+msgstr "laguna"
+
+msgid "pond"
+msgstr "stagno"
+
+msgid "reservoir"
+msgstr "riserva"
+
msgid "Land"
msgstr "Terraferma"
@@ -16245,18 +16854,23 @@ msgstr "Modifica terminal traghetti"
msgid "Cargo"
msgstr "Trasporto"
+msgctxt "cargo"
msgid "passengers"
msgstr "passeggeri"
+msgctxt "cargo"
msgid "vehicle"
msgstr "veicoli"
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicicletta"
+msgstr "biciclette"
+msgctxt "cargo"
msgid "hgv"
msgstr "veicoli per merci pesanti"
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr "passeggeri;veicoli"
@@ -16329,8 +16943,11 @@ msgstr "militare"
msgid "tourism"
msgstr "turismo"
-msgid "Service/Type"
-msgstr "Servizio/Tipo"
+msgid "freight"
+msgstr "merci"
+
+msgid "Service type"
+msgstr "Tipo servizio"
msgid "yard"
msgstr "deposito locomotive"
@@ -16353,11 +16970,14 @@ msgstr "linea aerea"
msgid "rail"
msgstr "terza rotaia"
-msgid "Voltage"
-msgstr "Tensione"
+msgid "Voltage in Volts (V)"
+msgstr "Tensione in Volt (V)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frequenza in Hertz (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Frequenza (Hz)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -16368,9 +16988,6 @@ msgstr "Ferrovia a scartamento ridotto"
msgid "Edit Narrow Gauge Rail"
msgstr "Modifica una ferrovia a scartamento ridotto"
-msgid "Types"
-msgstr "Tipi"
-
msgid "Monorail"
msgstr "Monorotaia"
@@ -16413,20 +17030,58 @@ msgstr "Ferrovia in disuso"
msgid "Edit Disused Railway"
msgstr "Modifica una ferrovia in disuso"
-msgid "Optional Types"
-msgstr "Tipi opzionali"
-
msgid "Abandoned Rail"
msgstr "Ferrovia abbandonata"
+msgid "Edit Abandoned Railway"
+msgstr "Modifica ferrovia abbandonata"
+
msgid "Level Crossing"
msgstr "Passaggio a livello"
+msgid "Edit Level Crossing"
+msgstr "Modifica passaggio a livello"
+
+msgid "Supervised"
+msgstr "Custodito"
+
+msgid "Traffic lights"
+msgstr "Semafori"
+
+msgid "Sound signals"
+msgstr "Segnali sonori"
+
+msgid "Barrier"
+msgstr "Barriera"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "sì"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "no"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "parziale"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "completo"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "doppio"
+
msgid "Crossing"
-msgstr "Attraversamento"
+msgstr "Attraversamento pedonale"
+
+msgid "Edit Crossing"
+msgstr "Modifica attraversamento pedonale"
msgid "Crossing type"
-msgstr "Tipo di attraversamento"
+msgstr "Tipo di attraversamento pedonale"
msgid "Turntable"
msgstr "Piattaforma ferroviaria girevole"
@@ -16524,13 +17179,11 @@ msgstr "Tappeto mobile"
msgid "Edit Magic Carpet"
msgstr "Modifica tappeto mobile"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Teleferica"
+msgstr "Teleferica merci"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Modifica teleferica"
+msgstr "Modifica teleferica merci"
msgctxt "aerialway"
msgid "Station"
@@ -16540,11 +17193,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Modifica stazione"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Pilone"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Modifica pilone"
@@ -16563,12 +17214,12 @@ msgstr "superficie"
msgid "underground"
msgstr "sotterraneo"
+msgid "rooftop"
+msgstr "sul tetto"
+
msgid "Access"
msgstr "Permesso di accesso"
-msgid "customers"
-msgstr "clienti"
-
msgid "Park and Ride"
msgstr "Parcheggio di interscambio"
@@ -16596,9 +17247,6 @@ msgstr "Posto auto"
msgid "Edit Parking space"
msgstr "Modifica posto auto"
-msgid "rooftop"
-msgstr "sul tetto"
-
msgid "Capacity"
msgstr "Capacità"
@@ -16614,20 +17262,38 @@ msgstr "Limite di tempo (minuti)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Custodito"
-
msgid "Opening Hours"
msgstr "Orario di apertura"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Lu-Ve 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
+
+msgid "Sa-Su 00:00-24:00"
+msgstr "Sab-Dom 00:00-24:00"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Ma-Do 08:00-15:00;Sa 08:00-12:00"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "Lu-Ve 08:30-20:00; Sa,Do 08:00-15:00; Festività chiuso"
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "Lu-Ve 08:30-20:00,Ma-Do 08:00-15:00; Sa 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"Lu-Do 08:00-18:00; Apr 10-15 chiuso; Giu 08:00-14:00; Ago chiuso; Dic 25 "
+"chiuso"
+
+msgid "sunrise-sunset"
+msgstr "alba-tramonto"
+
+msgid "Su 10:00+"
+msgstr "Do 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "settimana 1-53/2 Ve 09:00-12:00; settimana 2-52/2 Me 09:00-12:00"
msgid "Parking entrance"
msgstr "Entrata parcheggio"
@@ -16776,6 +17442,9 @@ msgstr "Stazione di ricarica"
msgid "Edit Charging Station (for electric cars)"
msgstr "Modifica stazione di ricarica (per automobili elettriche)"
+msgid "Voltage"
+msgstr "Tensione"
+
msgid "Amperage"
msgstr "Amperaggio"
@@ -16797,6 +17466,12 @@ msgstr "Autofficina"
msgid "Edit Car Repair"
msgstr "Modifica autofficina"
+msgid "Parts"
+msgstr "Autoricambi"
+
+msgid "Edit Car Parts"
+msgstr "Modifica autoricambi"
+
msgid "Tyres"
msgstr "Pneumatici"
@@ -16824,6 +17499,12 @@ msgstr "Noleggio"
msgid "Edit Car Rental"
msgstr "Modifica noleggio automobili"
+msgid "Second hand"
+msgstr "Usate"
+
+msgid "only"
+msgstr "solo"
+
msgid "Sharing"
msgstr "Condivisione"
@@ -16848,22 +17529,6 @@ msgstr "Servizi:"
msgid "Sale"
msgstr "Vendita"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "si"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "casa produttrice"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "usato"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "no"
-
msgid "brand"
msgstr "casa produttrice"
@@ -16885,9 +17550,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Componenti"
-
msgid "Clothes"
msgstr "Abbigliamento"
@@ -16931,7 +17593,7 @@ msgid "Second-hand bicycles are sold"
msgstr "Vendita biciclette usate"
msgid "Bicycles are repaired"
-msgstr "Riparazione biciclette"
+msgstr "Ciclofficina"
msgid "Bicycles are rented"
msgstr "Noleggio biciclette"
@@ -16948,13 +17610,13 @@ msgid "Bicycles are washed (for a fee)"
msgstr "Lavaggio biciclette (a pagamento)"
msgid "Edit Bicycle Rental"
-msgstr "Modifica stazione del bike sharing"
+msgstr "Modifica noleggio biciclette"
msgid "Public Transport"
msgstr "Trasporto pubblico"
-msgid "Route"
-msgstr "Itinerario"
+msgid "Public transport route"
+msgstr "Itinerario trasporto pubblico"
msgid "Edit Route"
msgstr "Modifica un itinerario"
@@ -17037,22 +17699,22 @@ msgid "route segment"
msgstr "segmento di itinerario"
msgid "stop position"
-msgstr "stop position"
+msgstr "punto di fermata"
msgid "stop position (exit only)"
-msgstr "stop position (solo uscita)"
+msgstr "punto di fermata (solo uscita)"
msgid "stop position (entry only)"
-msgstr "stop position (solo entrata)"
+msgstr "punto di fermata (solo entrata)"
msgid "platform"
-msgstr "platform"
+msgstr "banchina"
msgid "platform (exit only)"
-msgstr "platform (solo uscita)"
+msgstr "banchina (solo uscita)"
msgid "platform (entry only)"
-msgstr "platform (solo entrata)"
+msgstr "banchina (solo entrata)"
msgid "Route master"
msgstr "Route master"
@@ -17076,31 +17738,34 @@ msgid "UIC name"
msgstr "nome UIC"
msgid "Stop Position"
-msgstr "Stop Position"
+msgstr "Punto di fermata"
msgid "Platform"
-msgstr "Platform"
+msgstr "Banchina"
msgid "Station or amenities"
msgstr "Stazione o strutture di servizio"
+msgid "Edit Stop Position"
+msgstr "Modifica punto di fermata"
+
msgid "Bus"
msgstr "Bus"
msgid "Bus stop (legacy)"
-msgstr "Fermata dell''autobus (eredità)"
+msgstr "Fermata dell'autobus (ereditato)"
msgid "Tram stop (legacy)"
-msgstr "Fermata del tram (eredità)"
+msgstr "Fermata del tram (ereditato)"
msgid "Train"
msgstr "Treno"
msgid "Railway station (legacy)"
-msgstr "Stazione ferroviaria (eredità)"
+msgstr "Stazione ferroviaria (ereditato)"
msgid "Railway halt (legacy)"
-msgstr "Fermata ferroviaria (eredità)"
+msgstr "Fermata ferroviaria (ereditato)"
msgid "Trolleybus"
msgstr "Filobus"
@@ -17114,6 +17779,9 @@ msgstr "Funicolare"
msgid "Ferry"
msgstr "Traghetto"
+msgid "Edit Platform"
+msgstr "Modifica banchina"
+
msgid "Bench"
msgstr "Panchina"
@@ -17126,21 +17794,23 @@ msgstr "Sedia a rotelle"
msgid "limited"
msgstr "limitato"
-msgid "only"
-msgstr "solo"
-
msgid "Highway platform (legacy)"
-msgstr "Banchina stradale (antiquato)"
+msgstr "Banchina stradale (ereditato)"
msgid "Railway platform (legacy)"
-msgstr "Banchina ferroviaria (antiquato)"
+msgstr "Banchina ferroviaria (ereditato)"
msgid "funicular"
msgstr "funicolare"
+msgctxt "railway"
msgid "Station"
msgstr "Stazione"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Modifica stazione"
+
msgid "Building"
msgstr "Palazzo"
@@ -17151,7 +17821,10 @@ msgid "Edit Subway Entrance"
msgstr "Modifica ingresso metropolitana"
msgid "Ticket Machine"
-msgstr "Distributore automatico titoli di viaggio"
+msgstr "Biglietteria automatica"
+
+msgid "Edit Ticket Machine"
+msgstr "Modifica biglietteria automatica"
msgid "Reference Number"
msgstr "Numero di riferimento"
@@ -17175,15 +17848,7 @@ msgid "Account or loyalty cards"
msgstr "Conto o carta fedeltà"
msgid "Public Transport (legacy)"
-msgstr "Trasporto pubblico (eredità)"
-
-msgctxt "railway"
-msgid "Station"
-msgstr "Stazione"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Modifica stazione"
+msgstr "Trasporto pubblico (ereditato)"
msgid "UIC-Reference"
msgstr "Riferimento UIC"
@@ -17192,7 +17857,7 @@ msgid "Railway Halt"
msgstr "Fermata ferroviaria"
msgid "Edit Halt"
-msgstr "Modifica stazione non presidiata"
+msgstr "Modifica fermata ferroviaria"
msgid "Tram Stop"
msgstr "Fermata del tram"
@@ -17201,10 +17866,10 @@ msgid "Edit Tram Stop"
msgstr "Modifica fermata del tram"
msgid "Railway Platform"
-msgstr "Piattaforma ferroviaria"
+msgstr "Banchina ferroviaria"
msgid "Edit Railway Platform"
-msgstr "Modifica una piattaforma ferroviaria"
+msgstr "Modifica banchina ferroviaria"
msgid "Reference (track number)"
msgstr "Riferimento (numero del tracciato)"
@@ -17216,25 +17881,25 @@ msgid "Edit Bus Station"
msgstr "Modifica una stazione degli autobus"
msgid "Bus Stop"
-msgstr "Fermata dell''autobus"
+msgstr "Fermata dell'autobus"
msgid "Edit Bus Stop"
-msgstr "Modifica fermata dell''autobus"
+msgstr "Modifica fermata dell'autobus"
msgid "Tactile Paving"
msgstr "Pavimentazione tattile"
msgid "Bus Platform"
-msgstr "Piattaforma fermata bus"
+msgstr "Banchina autobus"
msgid "Edit Bus Platform"
-msgstr "Modifica una piattaforma degli autobus"
+msgstr "Modifica banchina autobus"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Stazione dei taxi"
+msgid "Edit Taxi Station"
+msgstr "Modifica stazione taxi"
msgid "Airport"
msgstr "Aeroporto"
@@ -17287,6 +17952,21 @@ msgstr "Terminale"
msgid "Edit Terminal"
msgstr "Modifica terminal aeroportuale"
+msgid "Internet access"
+msgstr "Accesso ad Internet"
+
+msgid "wlan"
+msgstr "wlan"
+
+msgid "wired"
+msgstr "via cavo"
+
+msgid "terminal"
+msgstr "terminal aeroportuale"
+
+msgid "Internet access fee"
+msgstr "Tariffa di accesso ad Internet"
+
msgctxt "airport"
msgid "Gate"
msgstr "Uscita"
@@ -17295,7 +17975,7 @@ msgid "Edit Terminal Gate"
msgstr "Modifica varco terminal aeroportuale"
msgid "Facilities"
-msgstr "Strutture"
+msgstr "Servizi"
msgid "Accommodation"
msgstr "Accoglienza"
@@ -17309,21 +17989,6 @@ msgstr "Modifica hotel"
msgid "Stars"
msgstr "Stelle"
-msgid "Internet access"
-msgstr "Accesso ad Internet"
-
-msgid "wlan"
-msgstr "wlan"
-
-msgid "wired"
-msgstr "via cavo"
-
-msgid "terminal"
-msgstr "terminal aeroportuale"
-
-msgid "Internet access fee"
-msgstr "Tariffa di accesso ad Internet"
-
msgid "Smoking"
msgstr "Zona fumatori"
@@ -17507,6 +18172,12 @@ msgstr "Club notturno"
msgid "Edit Nightclub"
msgstr "Modifica club notturno"
+msgid "Stripclub"
+msgstr "Locale di spogliarello"
+
+msgid "Edit Stripclub"
+msgstr "Modifica locale di spogliarello"
+
msgid "Tourism"
msgstr "Turismo"
@@ -17528,9 +18199,15 @@ msgstr "Torre di avvistamento"
msgid "Information Office"
msgstr "Ufficio informazioni"
+msgid "Edit Information Office"
+msgstr "Modifica ufficio informazioni"
+
msgid "Map"
msgstr "Mappa"
+msgid "Edit Information Map"
+msgstr "Modifica mappa informativa"
+
msgid "Detail Grade"
msgstr "Grado di dettaglio"
@@ -17543,6 +18220,9 @@ msgstr "strada"
msgid "scheme"
msgstr "schema"
+msgid "toposcope"
+msgstr "Tavola orientamento"
+
msgid "Shown Area"
msgstr "Area visualizzata"
@@ -17582,6 +18262,9 @@ msgstr "... altre modalità di trasporto possibili"
msgid "Information Board"
msgstr "Tabellone informativo"
+msgid "Edit Information Board"
+msgstr "Modifica tabellone informativo"
+
msgid "Board Content"
msgstr "Contenuto del cartello"
@@ -17603,23 +18286,35 @@ msgstr "piantine"
msgid "Guidepost"
msgstr "Indicatore stradale"
+msgid "Edit Guidepost"
+msgstr "Modifica indicatore stradale"
+
msgid "Information Terminal"
msgstr "Terminale informazioni"
+msgid "Edit Information Terminal"
+msgstr "Modifica terminale informazioni"
+
msgid "Closer description"
msgstr "Descrizione dettagliata"
msgid "Audioguide"
msgstr "Audio-guida"
+msgid "Edit Audioguide"
+msgstr "Modifica audio-guida"
+
msgid "Audioguide via mobile phone?"
msgstr "Audio-guida tramite cellulare?"
msgid "Phone number"
msgstr "Numero di telefono"
-msgid "Other Information Points"
-msgstr "Altri punti informativi"
+msgid "Other Information Point"
+msgstr "Altro punto informativo"
+
+msgid "Edit Information Point"
+msgstr "Modifica altro punto informativo"
msgid "Leisure"
msgstr "Svago"
@@ -17642,11 +18337,8 @@ msgstr "Area per cani"
msgid "Edit Dog Park"
msgstr "Modifica area per cani"
-msgid "Barrier"
-msgstr "Barriera"
-
msgid "fence"
-msgstr "recinzione"
+msgstr "recinto"
msgid "wall"
msgstr "muro"
@@ -17669,8 +18361,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Modifica sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr "Equitazione"
+
+msgid "Edit Horse riding"
+msgstr "Modifica equitazione"
+
+msgid "Brothel"
+msgstr "Bordello"
+
+msgid "Edit Brothel"
+msgstr "Modifica bordello"
msgid "Playground"
msgstr "Parco giochi"
@@ -17742,125 +18443,233 @@ msgstr "Opera d''arte"
msgid "Edit Artwork"
msgstr "Modifica opera d''arte"
-msgid "Place of Worship"
-msgstr "Luogo di culto"
+msgid "Recording Studio"
+msgstr "Studio di registrazione"
-msgid "Edit Place of Worship"
-msgstr "Modifica Luogo di culto"
+msgid "Edit Studio"
+msgstr "Modifica studio di registrazione"
-msgid "Religion"
-msgstr "Religione"
+msgid "audio"
+msgstr "audio"
-msgid "bahai"
-msgstr "Bahaista"
+msgid "video"
+msgstr "video"
-msgid "buddhist"
-msgstr "Buddista"
-
-msgid "christian"
-msgstr "Cristiana"
-
-msgid "hindu"
-msgstr "Induista"
+msgid "Place of Worship"
+msgstr "Luogo di culto"
-msgid "jain"
-msgstr "Giainista"
+msgid "Church"
+msgstr "Chiesa"
-msgid "jewish"
-msgstr "Ebraica"
+msgid "Edit Church"
+msgstr "Modifica chiesa"
-msgid "muslim"
-msgstr "Mussulmana"
+msgid "Building type"
+msgstr "Tipo di edificio"
-msgid "sikh"
-msgstr "Sikh"
+msgid "basilica"
+msgstr "basilica"
-msgid "spiritualist"
-msgstr "Spiritualista"
+msgid "cathedral"
+msgstr "cattedrale"
-msgid "taoist"
-msgstr "Taoista"
+msgid "chapel"
+msgstr "cappella"
-msgid "unitarian"
-msgstr "Unitariana"
+msgid "church"
+msgstr "chiesa"
-msgid "zoroastrian"
-msgstr "Zoroastrista"
+msgid "temple"
+msgstr "tempio"
msgid "Denomination"
msgstr "Denominazione"
msgid "anglican"
-msgstr "Anglicana"
+msgstr "anglicana"
msgid "baptist"
-msgstr "Battista"
+msgstr "battista"
msgid "catholic"
-msgstr "Cattolica"
+msgstr "cattolica"
msgid "evangelical"
-msgstr "Evangelica"
+msgstr "evangelica"
+
+msgid "greek_catholic"
+msgstr "greco-cattolica"
+
+msgid "greek_orthodox"
+msgstr "greca ortodossa"
msgid "jehovahs_witness"
msgstr "Testimoni di Geova"
msgid "lutheran"
-msgstr "Luterana"
+msgstr "luterana"
msgid "methodist"
-msgstr "Metodista"
+msgstr "metodista"
msgid "mormon"
-msgstr "Mormone"
+msgstr "mormone"
+
+msgid "new_apostolic"
+msgstr "neo-apostolica"
msgid "orthodox"
-msgstr "Ortodossa"
+msgstr "ortodossa"
msgid "pentecostal"
-msgstr "Pentecostale"
+msgstr "pentecostale"
msgid "presbyterian"
-msgstr "Prebiteriana"
+msgstr "presbiteriana"
msgid "protestant"
-msgstr "Protestante"
+msgstr "protestante"
msgid "quaker"
-msgstr "Quacchera"
+msgstr "quacchera"
-msgid "shia"
-msgstr "Sciita"
+msgid "roman_catholic"
+msgstr "romana cattolica"
-msgid "sunni"
-msgstr "Sunnita"
+msgid "russian_orthodox"
+msgstr "russa ortodossa"
+
+msgid "seventh_day_adventist"
+msgstr "avventista del settimo giorno"
msgid "Service Times"
msgstr "Orari celebrazioni"
-msgid "Su 10:00"
-msgstr "Do 10:00"
+msgid "18:00"
+msgstr "18:00"
-msgid "Su 10:30"
-msgstr "Do 10:30"
+msgid "sunset,sunrise"
+msgstr "alba,tramonto"
-msgid "Su 11:00"
-msgstr "Do 11:00"
+msgid "Su 9:30,11:00"
+msgstr "Do 9:30,11:00"
-msgid "Opening Hours for visiting"
-msgstr "Orari di apertura per visite"
+msgid "Sa,Su,PH 9:00"
+msgstr "Sa,Do,Festività 9:00"
-msgid "Recording Studio"
-msgstr "Studio di registrazione"
+msgid "Sa 18:00; Su 10:45"
+msgstr "Sa 18:00; Do 10:45"
-msgid "Edit Studio"
-msgstr "Modifica studio di registrazione"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"Ve 08:00-18:00; Apr 10-15 chiuso; Giu 07:00-20:00; Ago chiuso; Dic 24 08:00-"
+"24:00"
-msgid "audio"
-msgstr "audio"
+msgid "Sa 10:00+"
+msgstr "Sa 10:00+"
-msgid "video"
-msgstr "video"
+msgid "Mosque"
+msgstr "Moschea"
+
+msgid "Edit Mosque"
+msgstr "Modifica moschea"
+
+msgid "mosque"
+msgstr "moschea"
+
+msgid "ibadi"
+msgstr "ibadita"
+
+msgid "shia"
+msgstr "sciita"
+
+msgid "sunni"
+msgstr "sunnita"
+
+msgid "Synagogue"
+msgstr "Sinagoga"
+
+msgid "Edit Synagogue"
+msgstr "Modifica sinagoga"
+
+msgid "synagogue"
+msgstr "sinagoga"
+
+msgid "conservative"
+msgstr "conservativa"
+
+msgid "reform"
+msgstr "riformata"
+
+msgid "Buddhist Temple"
+msgstr "Tempio buddista"
+
+msgid "Edit Buddhist Temple"
+msgstr "Modifica tempio buddista"
+
+msgid "theravada"
+msgstr "theravada"
+
+msgid "mahayana"
+msgstr "mahayana"
+
+msgid "vajrayana"
+msgstr "vajrayana"
+
+msgid "Hindu Temple"
+msgstr "Tempio induista"
+
+msgid "Edit Hindu Temple"
+msgstr "Modifica tempio induista"
+
+msgid "vaishnavism"
+msgstr "vaishnavista"
+
+msgid "shaivism"
+msgstr "shivaista"
+
+msgid "shaktism"
+msgstr "shaktista"
+
+msgid "smartism"
+msgstr "smartista"
+
+msgid "Shinto Shrine"
+msgstr "Santuario shintoista"
+
+msgid "Edit Shinto Shrine"
+msgstr "Modifica santuario shintoista"
+
+msgid "Other Place of Worship"
+msgstr "Altro luogo di culto"
+
+msgid "Edit other Place of Worship"
+msgstr "Modifica altro luogo di culto"
+
+msgid "Religion"
+msgstr "Religione"
+
+msgid "bahai"
+msgstr "bahaista"
+
+msgid "jain"
+msgstr "giainista"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualista"
+
+msgid "taoist"
+msgstr "taoista"
+
+msgid "unitarian"
+msgstr "unitariana"
+
+msgid "zoroastrian"
+msgstr "zoroastrista"
msgid "Public Building"
msgstr "Edificio pubblico"
@@ -17949,6 +18758,12 @@ msgstr "Modifica autoscuola"
msgid "License Classes"
msgstr "Categorie di patente"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Salute"
@@ -17958,6 +18773,12 @@ msgstr "Ospedale"
msgid "Edit Hospital"
msgstr "Modifica Ospedale"
+msgid "Clinic"
+msgstr "Ambulatorio medico"
+
+msgid "Edit Clinic"
+msgstr "Modifica ambulatorio medico"
+
msgid "Doctors"
msgstr "Ambulatorio"
@@ -17986,7 +18807,7 @@ msgid "Pharmacy"
msgstr "Farmacia"
msgid "Edit Pharmacy"
-msgstr "Modifica Farmacia"
+msgstr "Modifica farmacia"
msgid "Dispensing"
msgstr "Vendita medicinali con obbligo di prescrizione"
@@ -18024,12 +18845,66 @@ msgstr "Veterinario"
msgid "Edit Veterinary"
msgstr "Modifica veterinario"
-msgid "Note"
-msgstr "Nota"
+msgid "Edit Toilets"
+msgstr "Modifica bagni pubblici"
+
+msgid "Access rights"
+msgstr "Diritti di accesso"
+
+msgid "public"
+msgstr "pubblico"
+
+msgid "seasonal"
+msgstr "stagionale"
+
+msgid "flush"
+msgstr "sciacquone"
+
+msgid "pitlatrine"
+msgstr "latrina a fossa"
+
+msgid "chemical"
+msgstr "chimico"
+
+msgid "bucket"
+msgstr "secchio"
+
+msgid "Usage Position"
+msgstr "Posizione di utilizzo"
+
+msgid "seated"
+msgstr "seduta"
+
+msgid "seated;urinal"
+msgstr "seduta;orinatoio"
+
+msgid "squat"
+msgstr "accovacciata"
+
+msgid "urinal"
+msgstr "orinatoio"
msgid "Post Box"
msgstr "Cassetta Postale"
+msgid "Edit Postbox"
+msgstr "Modifica cassetta delle lettere"
+
+msgid "Collection times"
+msgstr "Orari di raccolta"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "Lu-Ve 15:00,17:45,19:00,23:00; Sa 15:10; Do 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "Lu-Ve 09:00-12:00,17:15; Sa 14:00; Do,Festività chiuso"
+
+msgid "Drive through"
+msgstr "Attraversamento in auto (drive-through)"
+
msgid "Telephone"
msgstr "Telefono"
@@ -18039,6 +18914,30 @@ msgstr "Modifica Telefono"
msgid "Telephone cards"
msgstr "Carte telefoniche"
+msgid "Emergency Phone"
+msgstr "Telefono di emergenza"
+
+msgid "Internet Access"
+msgstr "Accesso internet"
+
+msgid "Edit Internet Access"
+msgstr "Modifica accesso internet"
+
+msgid "Automated Defibrillator"
+msgstr "Defibrillatore automatico"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Modifica defibrillatore automatico esterno"
+
+msgid "Located inside a building?"
+msgstr "Presente all''interno di un edificio?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Data ultimo controllo (YYYY-MM-DD)"
+
+msgid "Last check note"
+msgstr "Nota ultimo controllo"
+
msgid "Clock"
msgstr "Orologio"
@@ -18048,30 +18947,36 @@ msgstr "Modifica orologio"
msgid "Display"
msgstr "Schermo"
-msgctxt "display"
msgid "analog"
msgstr "analogico"
-msgctxt "display"
msgid "digital"
msgstr "digitale"
-msgctxt "display"
msgid "sundial"
msgstr "meridiana"
-msgctxt "display"
msgid "unorthodox"
msgstr "anticonvenzionale"
msgid "Support"
msgstr "Supporto"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "palo"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "a muro"
+msgstr "murale"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "tabellone"
+msgstr "cartellone"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "a terra"
msgid "Visibility/readability"
msgstr "Visibilità/leggibilità"
@@ -18100,8 +19005,8 @@ msgstr "Visualizza l''umidità"
msgid "Recycling"
msgstr "Riciclaggio"
-msgid "Edit Recycling station"
-msgstr "Modifica Stazione di riciclaggio"
+msgid "Edit Recycling Station"
+msgstr "Modifica stazione di riciclaggio"
msgid "Batteries"
msgstr "Batterie"
@@ -18127,27 +19032,15 @@ msgstr "centro"
msgid "Waste Basket"
msgstr "Cestino della spazzatura"
-msgid "Edit Waste Basket"
-msgstr "Modifica cestino della spazzatura"
-
msgid "Waste Disposal"
msgstr "Raccolta dei rifiuti"
-msgid "Edit Waste Disposal"
-msgstr "Modifica raccolta dei rifiuti"
+msgid "Edit Bench"
+msgstr "Modifica panchina"
msgid "Backrest"
msgstr "Schienale"
-msgid "Material"
-msgstr "Materiale"
-
-msgid "stone"
-msgstr "pietra"
-
-msgid "plastic"
-msgstr "plastica"
-
msgid "Amount of Seats"
msgstr "Quantità di posti"
@@ -18163,7 +19056,7 @@ msgstr "riparo da maltempo"
msgctxt "shelter"
msgid "public_transport"
-msgstr "trasporto pubblico"
+msgstr "trasporto pubblico (public_transport)"
msgctxt "shelter"
msgid "picnic_shelter"
@@ -18182,14 +19075,17 @@ msgstr "Modifica una postazione di caccia"
msgid "Height"
msgstr "Modifica Albero"
+msgctxt "height"
msgid "low"
-msgstr "basso"
+msgstr "bassa"
+msgctxt "height"
msgid "half"
-msgstr "mezzo"
+msgstr "piccola"
+msgctxt "height"
msgid "full"
-msgstr "completo"
+msgstr "alta"
msgid "Hide"
msgstr "Nascondi"
@@ -18197,11 +19093,11 @@ msgstr "Nascondi"
msgid "Lock"
msgstr "Blocco"
-msgid "Drinking Water"
-msgstr "Acqua potabile"
+msgid "Edit Source of Potable Water"
+msgstr "Modifica sorgente di acqua potabile"
-msgid "Edit Drinking Water"
-msgstr "Modifica acqua potabile"
+msgid "Indoor"
+msgstr "Interno"
msgid "Fire Hydrant"
msgstr "Pompa antincendio"
@@ -18228,6 +19124,9 @@ msgstr "non pressurizzato"
msgid "Diameter (in mm)"
msgstr "Diametro (in mm)"
+msgid "Hydrant Position"
+msgstr "Posizione idrante"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "corsia"
@@ -18265,117 +19164,153 @@ msgstr "Stadio"
msgid "Edit Stadium"
msgstr "Modifica stadio"
-msgid "select sport:"
-msgstr "seleziona uno sport:"
+msgid "Select sport:"
+msgstr "Seleziona sport:"
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Discipline sportive"
+msgctxt "sport"
msgid "multi"
-msgstr "polivalente"
+msgstr "struttura polivalente"
+msgctxt "sport"
msgid "archery"
msgstr "tiro con l''arco"
+msgctxt "sport"
msgid "athletics"
msgstr "atletica"
+msgctxt "sport"
msgid "american_football"
msgstr "football americano"
+msgctxt "sport"
msgid "australian_football"
-msgstr "football_australiano"
+msgstr "football australiano"
+msgctxt "sport"
msgid "baseball"
msgstr "baseball"
+msgctxt "sport"
msgid "basketball"
msgstr "pallacanestro"
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr "bocce"
+msgctxt "sport"
msgid "bowls"
-msgstr "boccie"
+msgstr "bocce su prato"
+msgctxt "sport"
msgid "canadian_football"
msgstr "calcio canadese"
+msgctxt "sport"
msgid "canoe"
msgstr "canoa"
+msgctxt "sport"
msgid "climbing"
msgstr "arrampicata"
+msgctxt "sport"
msgid "cricket"
msgstr "cricket"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "reti_cricket"
+msgstr "reti da cricket"
+msgctxt "sport"
msgid "croquet"
msgstr "croquet"
+msgctxt "sport"
msgid "cycling"
msgstr "ciclismo"
+msgctxt "sport"
msgid "dog_racing"
-msgstr "cinodromo"
+msgstr "corse dei cani"
+msgctxt "sport"
msgid "equestrian"
-msgstr "sport equestri"
+msgstr "equitazione"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "gaelic_games"
+msgstr "sport gaelici"
+msgctxt "sport"
msgid "golf"
msgstr "golf"
+msgctxt "sport"
msgid "gymnastics"
msgstr "ginnastica"
+msgctxt "sport"
msgid "hockey"
msgstr "hockey"
+msgctxt "sport"
msgid "horse_racing"
msgstr "ippodromo"
+msgctxt "sport"
msgid "motor"
msgstr "autodromo"
+msgctxt "sport"
msgid "pelota"
msgstr "pelota"
+msgctxt "sport"
msgid "racquet"
-msgstr "racchette"
+msgstr "racquet"
+msgctxt "sport"
msgid "rugby_league"
-msgstr "rugby a 13"
+msgstr "rugby a 13 (rugby league)"
+msgctxt "sport"
msgid "rugby_union"
-msgstr "rugby a 15"
+msgstr "rugby a 15 (rugby union)"
+msgctxt "sport"
msgid "shooting"
-msgstr "poligono_di_tiro"
+msgstr "poligono di tiro"
+msgctxt "sport"
msgid "skateboard"
msgstr "skateboard"
+msgctxt "sport"
msgid "skating"
msgstr "pattinaggio"
+msgctxt "sport"
msgid "skiing"
-msgstr "comprensorio_sciistico"
+msgstr "sci"
+msgctxt "sport"
msgid "soccer"
msgstr "calcio"
+msgctxt "sport"
msgid "swimming"
-msgstr "piscina"
+msgstr "nuoto"
+msgctxt "sport"
msgid "table_tennis"
-msgstr "ping_pong"
+msgstr "tennis da tavolo"
+msgctxt "sport"
msgid "tennis"
msgstr "tennis"
@@ -18409,33 +19344,43 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Modifica minigolf"
-msgid "Sport"
-msgstr "Discipline sportive"
-
msgid "Multi"
msgstr "Struttura polivalente"
msgid "Edit Multi"
msgstr "Modifica struttura polivalente"
-msgid "type"
-msgstr "tipo"
-
+msgctxt "running"
msgid "pitch"
msgstr "campo sportivo"
+msgctxt "running"
msgid "sports_centre"
msgstr "centro sportivo"
+msgctxt "running"
msgid "stadium"
msgstr "stadio"
+msgctxt "running"
+msgid "track"
+msgstr "tracciato"
+
msgid "9pin"
msgstr "Bowling a 9 birilli"
msgid "Edit 9pin"
msgstr "Modifica bowling a 9 birilli"
+msgid "pitch"
+msgstr "campo sportivo"
+
+msgid "sports_centre"
+msgstr "centro sportivo"
+
+msgid "stadium"
+msgstr "stadio"
+
msgid "10pin"
msgstr "Bowling"
@@ -18469,6 +19414,22 @@ msgstr "Modifca canoa"
msgid "Edit Cycling"
msgstr "Modifica ciclismo"
+msgctxt "racing"
+msgid "pitch"
+msgstr "campo sportivo"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "centro sportivo"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "stadio"
+
+msgctxt "racing"
+msgid "track"
+msgstr "tracciato"
+
msgid "Dog Racing"
msgstr "Corse dei cani"
@@ -18479,10 +19440,35 @@ msgid "Equestrian"
msgstr "Equitazione"
msgid "Edit Equestrian"
-msgstr "Modificare Equitazione"
+msgstr "Modifica equitazione"
+
+msgctxt "riding"
+msgid "pitch"
+msgstr "campo sportivo"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "centro sportivo"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "stadio"
+
+msgctxt "riding"
+msgid "track"
+msgstr "tracciato"
+
+msgid "clay"
+msgstr "argilla"
-msgid "horse_riding"
-msgstr "ippica"
+msgid "dirt"
+msgstr "terra"
+
+msgid "fine_gravel"
+msgstr "ghiaia fine"
+
+msgid "mud"
+msgstr "zona fangosa (sabbie mobili)"
msgid "Horse Racing"
msgstr "Ippodromo"
@@ -18494,13 +19480,13 @@ msgid "Gymnastics"
msgstr "Ginnastica"
msgid "Edit Gymnastics"
-msgstr "Modificare Ginnastica"
+msgstr "Modifica ginnastica"
msgid "Skating"
msgstr "Pattinaggio"
msgid "Edit Skating"
-msgstr "Modificare Pattinaggio"
+msgstr "Modifica pattinaggio"
msgid "ice_rink"
msgstr "pista di ghiaccio"
@@ -18509,13 +19495,13 @@ msgid "Skateboard"
msgstr "Skateboard"
msgid "Edit Skateboard"
-msgstr "Modificare Skateboard"
+msgstr "Modifica skateboard"
msgid "Swimming"
-msgstr "Piscina"
+msgstr "Nuoto"
msgid "Edit Swimming"
-msgstr "Modificare Nuoto"
+msgstr "Modifica nuoto"
msgid "swimming_pool"
msgstr "piscina"
@@ -18524,7 +19510,7 @@ msgid "water_park"
msgstr "parco acquatico"
msgid "Edit Skiing"
-msgstr "Modificare Sci"
+msgstr "Modifica sci"
msgid "Piste type"
msgstr "Tipo di pista"
@@ -18544,38 +19530,56 @@ msgstr "snow_park"
msgid "Difficulty"
msgstr "Difficoltà"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "principante"
+msgstr "principiante (<30 gradi - verde)"
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "facile"
+msgstr "facile (30-35 gradi - blu)"
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "intermedia (35-40 gradi - rossa)"
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "avanzato"
+msgstr "avanzata (40-45 gradi - nera)"
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "esperto"
+msgstr "esperto (45-50 gradi - arancione)"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "freeride"
+msgstr "libera (50-55 gradi - gialla)"
msgid "Grooming"
msgstr "Battitura"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "classica"
+msgctxt "piste:grooming"
msgid "mogul"
msgstr "gobbe (freestyle)"
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "pattinaggio"
+
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "classica;free style/pattinaggio"
+msgstr "classica;pattinaggio"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "classica piccola"
+msgstr "motoslitta"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "non battuta"
+msgstr "fuori pista"
msgid "Shooting"
msgstr "Poligono di tiro"
@@ -18590,7 +19594,7 @@ msgid "Soccer"
msgstr "Calcio"
msgid "Edit Soccer"
-msgstr "Modifica Calcio"
+msgstr "Modifica calcio"
msgid "Australian Football"
msgstr "Football australiano"
@@ -18605,10 +19609,10 @@ msgid "Edit American Football"
msgstr "Modifica football americano"
msgid "Canadian Football"
-msgstr "Calcio canadese"
+msgstr "Football canadese"
msgid "Edit Canadian Football"
-msgstr "Modifica calcio canadese"
+msgstr "Modifica football canadese"
msgid "Gaelic Games"
msgstr "Sport gaelici"
@@ -18616,19 +19620,15 @@ msgstr "Sport gaelici"
msgid "Edit Gaelic Games"
msgstr "Modifica sport gaelici"
-msgctxt "gaelic game"
msgid "Hurling"
msgstr "Hurling"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Calcio"
+msgstr "Football"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "Rounders"
@@ -18654,7 +19654,7 @@ msgid "Basketball"
msgstr "Pallacanestro"
msgid "Edit Basketball"
-msgstr "Modifica Pallacanestro"
+msgstr "Modifica pallacanestro"
msgid "Volleyball"
msgstr "Pallavolo"
@@ -18675,7 +19675,7 @@ msgid "Edit Golf"
msgstr "Modifica Golf"
msgid "golf_course"
-msgstr "campo_da_golf"
+msgstr "campo da golf"
msgid "Boule"
msgstr "Boule (sport popolare in Francia)"
@@ -18684,22 +19684,22 @@ msgid "Edit Boule"
msgstr "Modifica boule (sport popolare in Francia)"
msgid "Bowls"
-msgstr "Bocce"
+msgstr "Bocce su prato"
msgid "Edit Bowls"
-msgstr "Modifica Bocce"
+msgstr "Modifica bocce su prato"
msgid "Cricket"
msgstr "Cricket"
msgid "Edit Cricket"
-msgstr "Modifica Cricket"
+msgstr "Modifica cricket"
msgid "Cricket Nets"
-msgstr "Reti per Cricket"
+msgstr "Reti da cricket"
msgid "Edit Cricket Nets"
-msgstr "Modifica Reti per Cricket"
+msgstr "Modifica reti da cricket"
msgid "Croquet"
msgstr "Croquet"
@@ -18711,13 +19711,13 @@ msgid "Hockey"
msgstr "Hockey"
msgid "Edit Hockey"
-msgstr "Modifica Hockey"
+msgstr "Modifica hockey"
msgid "Pelota"
msgstr "Pelota"
msgid "Edit Pelota"
-msgstr "Modifica Pelota"
+msgstr "Modifica pelota"
msgid "Racquet"
msgstr "Racquet"
@@ -18729,13 +19729,13 @@ msgid "Table Tennis"
msgstr "Tennis da tavolo"
msgid "Edit Table Tennis"
-msgstr "Modifica Tenniis da tavolo"
+msgstr "Modifica tennis da tavolo"
msgid "Tennis"
msgstr "Tennis"
msgid "Edit Tennis"
-msgstr "Modifica Tennis"
+msgstr "Modifica tennis"
msgid "Motorsport"
msgstr "Sport motoristico"
@@ -18767,6 +19767,18 @@ msgstr "Aerodromo per modellini"
msgid "Edit Model Aerodrome"
msgstr "Modifica aerodromo per modellini"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "campo sportivo"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "centro sportivo"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "tracciato"
+
msgid "RC Car"
msgstr "Automobili radiocomandate"
@@ -18779,59 +19791,133 @@ msgstr "Artificiale"
msgid "Edit Building"
msgstr "Modifica edificio"
+msgctxt "building"
+msgid "yes"
+msgstr "sì"
+
+msgctxt "building"
msgid "roof"
-msgstr "copertura"
+msgstr "tetto"
+msgctxt "building"
msgid "garage"
-msgstr "garage"
+msgstr "box per auto"
-msgid "church"
-msgstr "chiesa"
+msgctxt "building"
+msgid "garages"
+msgstr "box per auto multipli"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industriale"
+msgctxt "building"
msgid "school"
msgstr "scuola"
+msgctxt "building"
msgid "hangar"
-msgstr "hangar"
+msgstr "Capannone"
+msgctxt "building"
msgid "commercial"
msgstr "commerciale"
+msgctxt "building"
msgid "farm"
-msgstr "fattoria"
+msgstr "agricolo"
+msgctxt "building"
msgid "transportation"
msgstr "trasporti"
+msgctxt "building"
msgid "greenhouse"
msgstr "serra"
+msgctxt "building"
msgid "office"
msgstr "ufficio"
+msgctxt "building"
msgid "university"
msgstr "università"
+msgctxt "building"
+msgid "hospital"
+msgstr "ospedale"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "magazzino"
+
+msgctxt "building"
+msgid "retail"
+msgstr "vendita al dettaglio"
+
+msgctxt "building"
+msgid "shed"
+msgstr "rimessa"
+
msgid "Residential Building"
msgstr "Edificio residenziale"
msgid "Edit Residential Building"
msgstr "Modifica edificio residenziale"
+msgctxt "building"
+msgid "residential"
+msgstr "residenziale"
+
+msgctxt "building"
msgid "apartments"
msgstr "appartamenti"
+msgctxt "building"
msgid "house"
-msgstr "edificio"
+msgstr "casa"
+msgctxt "building"
msgid "hut"
-msgstr "edificio primitivo"
+msgstr "rifugio"
+msgctxt "building"
+msgid "dormitory"
+msgstr "dormitorio"
+
+msgctxt "building"
msgid "terrace"
-msgstr "casette a schiera"
+msgstr "case a schiera"
+msgctxt "building"
msgid "detached"
-msgstr "casa unifamiliare indipendente"
+msgstr "distaccato"
+
+msgid "Entrance"
+msgstr "Punto di accesso"
+
+msgid "Edit Entrance"
+msgstr "Modifica punto di accesso"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "sì"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "principale"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "servizio"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "uscita"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "emergenza"
msgid "Tower"
msgstr "Torre"
@@ -18848,9 +19934,6 @@ msgstr "telecomunicazioni"
msgid "observation"
msgstr "osservazione"
-msgid "Height (meters)"
-msgstr "Altezza (metri)"
-
msgid "Flagpole"
msgstr "Pennone"
@@ -19060,67 +20143,184 @@ msgstr "Orario di accensione"
msgid "Mo-Fr 22:00-05:00"
msgstr "Lu-Ve 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Stazione di misurazione"
+msgid "Monitoring Station"
+msgstr "Stazione di monitoraggio"
-msgid "Edit Measurement Station"
-msgstr "Modifica stazione di misurazione"
+msgid "Edit Monitoring Station"
+msgstr "Modifica stazione di monitoraggio"
-msgid "Measurement"
-msgstr "Misurazione"
+msgid "Monitoring:"
+msgstr "Monitoraggio:"
-msgid "particulate_matter"
-msgstr "particolato"
+msgid "Weather"
+msgstr "Meteo"
-msgid "seismic"
-msgstr "sismica"
+msgid "Water level"
+msgstr "Livello dell''acqua"
-msgid "water_level"
-msgstr "livello delle acque"
+msgid "Tide Level"
+msgstr "Livello di marea"
-msgid "weather"
-msgstr "meteo"
+msgid "Traffic"
+msgstr "Traffico"
-msgid "Recording"
-msgstr "Registrazione"
+msgid "Air Quality"
+msgstr "Qualità dell''aria"
-msgid "manually"
-msgstr "manuale"
+msgid "Noise"
+msgstr "Rumore"
-msgid "automated"
-msgstr "automatica"
+msgid "GPS Signals"
+msgstr "Segnali GPS"
-msgid "remote"
-msgstr "remota"
+msgid "GLONASS Signals"
+msgstr "Segnali GLONASS"
-msgctxt "display"
-msgid "no"
-msgstr "no"
+msgid "Galileo Signals"
+msgstr "Segnali Galileo"
-msgid "Survey Point"
-msgstr "Punto geodetico o altra stazione fissa"
+msgid "Radiation"
+msgstr "Radiazioni"
-msgid "Edit Survey Point"
-msgstr "Modifica punto geodetico o altra stazione fissa"
+msgid "Seismic Activity"
+msgstr "Attività sismiche"
-msgid "Surveillance"
-msgstr "Telecamera di sorveglianza"
+msgid "Recording:"
+msgstr "Registrazione:"
-msgid "Edit Surveillance Camera"
-msgstr "Modifica telecamera di sorveglianza"
+msgid "Automated"
+msgstr "Automatica"
-msgid "indoor"
-msgstr "interno"
+msgid "Manually"
+msgstr "Manuale"
+
+msgid "Remote"
+msgstr "Remota"
+
+msgid "Display:"
+msgstr "Visualizzazione:"
+
+msgid "Analog"
+msgstr "Analogica"
+
+msgid "Digital"
+msgstr "Digitale"
+
+msgid "Survey Point"
+msgstr "Punto geodetico o altra stazione fissa"
+
+msgid "Edit Survey Point"
+msgstr "Modifica punto geodetico o altra stazione fissa"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Modifica telecamera di sorveglianza"
+
+msgid "indoor"
+msgstr "interno"
msgid "outdoor"
msgstr "esterno"
-msgid "public"
-msgstr "pubblico"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "negozio"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Altezza in metri (m)"
msgid "Power"
msgstr "Elettricità"
+msgid "Power Plant"
+msgstr "Centrale elettrica"
+
+msgid "Edit Power Plant"
+msgstr "Modifica centrale elettrica"
+
+msgid "Start date"
+msgstr "Data di inizio"
+
+msgid "Output forms of energy"
+msgstr "Forme di uscita dell’energia"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+"(si prega di aggiungere queste informazioni per i generatori, se possibile)"
+
+msgid "electricity"
+msgstr "elettricità"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "acqua calda"
+
+msgid "hot air"
+msgstr "aria calda"
+
+msgid "cold water"
+msgstr "acqua fredda"
+
+msgid "cold air"
+msgstr "aria fredda"
+
+msgid "compressed air"
+msgstr "aria compressa"
+
+msgid "steam"
+msgstr "vapore"
+
+msgid "vacuum"
+msgstr "vuoto"
+
msgid "Power Generator"
msgstr "Centrale elettrica"
@@ -19172,89 +20372,193 @@ msgstr "eolica"
msgid "Method"
msgstr "Metodo"
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr "digestione anaerobica"
+msgctxt "generator method"
+msgid "barrage"
+msgstr "sbarramento"
+
+msgctxt "generator method"
msgid "combustion"
msgstr "combustione"
-msgid "dam"
-msgstr "diga"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "bio / carbone / gasolio / gas / benzina / petrolio / rifiuti"
+msgctxt "generator method"
msgid "fission"
msgstr "fissione"
+msgctxt "generator method"
msgid "fusion"
msgstr "fusione"
+msgctxt "generator method"
msgid "gasification"
msgstr "gassificazione"
+msgid "biomass / waste"
+msgstr "biomasse / rifiuti"
+
+msgctxt "generator method"
msgid "photovoltaic"
msgstr "fotovoltaico"
-msgid "pumped-storage"
-msgstr "idroelettrico con accumulazione"
-
-msgid "pumping"
-msgstr "pompaggio"
-
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "pirolisi"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "flusso fluviale"
+msgstr "a filo d''acqua"
+
+msgctxt "generator method"
+msgid "stream"
+msgstr "torrente"
+msgctxt "generator method"
msgid "thermal"
-msgstr "termica"
+msgstr "termico"
-msgid "Output forms of energy"
-msgstr "Forme di uscita dell’energia"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "stoccaggio acqua pompata"
-msgid "electricity"
-msgstr "elettricità"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "stoccaggio acqua"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Tipo di generatore"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr "ciclo combinato"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "gas di combustione"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "turbina Francis"
-msgid "hot water"
-msgstr "acqua calda"
+msgid "gas_turbine"
+msgstr "turbina a gas"
-msgid "hot air"
-msgstr "aria calda"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "biogas, biomasse, gas, combustione rifiuti"
-msgid "cold water"
-msgstr "acqua fredda"
+msgid "heat_pump"
+msgstr "pompa di calore"
-msgid "cold air"
-msgstr "aria fredda"
+msgid "horizontal_axis"
+msgstr "horizontal_axis"
-msgid "compressed air"
-msgstr "aria compressa"
+msgid "tidal steam / wind"
+msgstr "flusso di marea / vento"
-msgid "steam"
-msgstr "vapore"
+msgid "kaplan_turbine"
+msgstr "turbina Kaplan"
-msgid "vacuum"
-msgstr "vuoto"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "a filo d''acqua / stoccaggio acqua / sbarramento marea"
+
+msgid "pelton_turbine"
+msgstr "turbina Pelton"
-msgid "battery charging"
-msgstr "ricarica batterie"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "a filo d''acqua / stoccaggio acqua"
-msgid "Power Station"
-msgstr "Stazione elettrica"
+msgid "reciprocating_engine"
+msgstr "motore a pistoni"
-msgid "Edit Power Station"
-msgstr "Modifica stazione elettrica"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "biocombustibile, biogas, diesel, gas, benzina"
+
+msgid "solar_photovoltaic_panel"
+msgstr "pannello solare fotovoltaico"
+
+msgid "solar photovoltaic"
+msgstr "solare fotovoltaico"
+
+msgid "solar_thermal_collector"
+msgstr "collettore solare termico"
+
+msgid "solar thermal"
+msgstr "solare termico"
+
+msgid "steam_generator"
+msgstr "a vapore"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "bio, carbone, gasolio, gas, benzina, petrolio, combustione rifiuti"
+
+msgid "steam_turbine"
+msgstr "turbina a vapore"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"geotermico / solare termico / bio, carbone, petrolio, combustione rifiuti"
+
+msgid "stellarator"
+msgstr "stellarator"
+
+msgid "nuclear fusion"
+msgstr "fusione nucleare"
+
+msgid "tokamak"
+msgstr "tokamak"
+
+msgid "vertical_axis"
+msgstr "vertical_axis"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Reattore nucleare ad acqua bollente 1 (BWR-1)"
+
+msgid "nuclear fission"
+msgstr "fissione nucleare"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Reattore nucleare ad acqua bollente 2 (BWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Reattore nucleare ad acqua bollente 3 (BWR-3)"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Reattore nucleare ad acqua bollente 4 (BWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Reattore nucleare ad acqua bollente 5 (BWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Reattore nucleare ad acqua bollente 6 (BWR-6)"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "CANada Deuterium Uranium reactor (CANDU)"
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "China Pressurized Reactor (CPR-1000)"
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr "European Pressurized Reactor (EPR)"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Fusione a confinamento inerziale (IFC)"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Reattore nucleare ad acqua pressurizzata (PWR)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reattore Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reattore Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Reattore Vodo-Vodyanoi Energetichesky (VVER)"
+
+msgid "Output forms of energy:"
+msgstr "Forme di energia in uscita:"
msgid "Power Sub Station"
msgstr "Sottostazione elettrica"
@@ -19265,6 +20569,21 @@ msgstr "Modifica sottostazione elettrica"
msgid "Line reference"
msgstr "Riferimento elettrodotto"
+msgid "high"
+msgstr "alto"
+
+msgid "medium"
+msgstr "medio"
+
+msgid "low"
+msgstr "basso"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "Armadio di derivazione"
@@ -19275,16 +20594,19 @@ msgid "Power Tower"
msgstr "Pilone (elettricità)"
msgid "Edit Power Tower"
-msgstr "Modifica pilone (elettricità)"
+msgstr "Pilone elettricità"
msgid "Tower reference"
msgstr "Riferimento torre"
+msgid "steel"
+msgstr "acciaio"
+
msgid "Pole"
msgstr "Palo"
msgid "Edit Power Pole"
-msgstr "Modifica palo (elettricità)"
+msgstr "Modifica Pilone elettricità"
msgid "Pole reference"
msgstr "Riferimento palo"
@@ -19298,13 +20620,11 @@ msgstr "Modifica elettrodotto"
msgid "Line type"
msgstr "Tipo di linea"
-msgctxt "Power Line"
msgid "line"
-msgstr "elettrodotto"
+msgstr "linea aerea"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "elettrodotto secondario"
+msgstr "linea aerea secondaria"
msgid "Amount of Cables"
msgstr "Quantità di cavi"
@@ -19382,10 +20702,10 @@ msgid "Edit Wayside Shrine"
msgstr "Modifica edicola votiva"
msgid "Boundary Stone"
-msgstr "Pietra limite"
+msgstr "Perimetro di pietra"
msgid "Edit Boundary Stone"
-msgstr "Modifica pietra limite"
+msgstr "Modifica perimetro di pietra"
msgid "Shops"
msgstr "Negozi"
@@ -19411,10 +20731,10 @@ msgstr "Chiosco"
msgid "Edit Kiosk"
msgstr "Modifica chiosco"
-msgid "Baker"
+msgid "Bakery"
msgstr "Panificio"
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr "Modifica Panificio"
msgid "Butcher"
@@ -19426,8 +20746,8 @@ msgstr "Modifica Macellaio"
msgid "Seafood"
msgstr "Pescheria"
-msgid "Edit Seafood"
-msgstr "Modifica pescheria"
+msgid "Edit Seafood Shop"
+msgstr "Modifica Pescheria"
msgid "Deli (Fine Food)"
msgstr "Cibi e bevande pregiate"
@@ -19447,14 +20767,20 @@ msgstr "Mercato"
msgid "Edit Marketplace"
msgstr "Modifica mercato"
+msgid "Organic"
+msgstr "Prodotti biologici"
+
msgid "Greengrocer"
msgstr "Fruttivendolo"
msgid "Edit Greengrocer"
msgstr "Modifica fruttivendolo"
-msgid "Organic"
-msgstr "Prodotti biologici"
+msgid "Farm Stand"
+msgstr "Vendita diretta prodotti agricoli"
+
+msgid "Edit Farm Stand"
+msgstr "Modifica vendita diretta prodotti agricoli"
msgid "Edit Organic/Bio"
msgstr "Modifica prodotti biologici"
@@ -19525,7 +20851,7 @@ msgstr "Modifica sarto"
msgid "Fabric"
msgstr "Merceria"
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr "Modifica merceria"
msgid "Electronic"
@@ -19546,14 +20872,14 @@ msgstr "Modifica negozio di elettronica"
msgid "Mobile Phone"
msgstr "Telefoni cellulari"
-msgid "Edit Mobile Phone"
-msgstr "Modifica telefoni cellulari"
+msgid "Edit Mobile Phone Shop"
+msgstr "Modifica Negozio Telefonia Mobile"
msgid "Vacuum Cleaner"
msgstr "Aspirapolveri"
-msgid "Edit Vacuum Cleaner"
-msgstr "Modifica aspirapolveri"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Modifica negozio di aspirapolveri"
msgid "Hifi"
msgstr "Hi-Fi"
@@ -19561,9 +20887,8 @@ msgstr "Hi-Fi"
msgid "Edit Hifi Shop"
msgstr "Modifica negozio di Hi-Fi"
-msgctxt "shop"
msgid "Video"
-msgstr "Videoteca"
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Modifica videoteca"
@@ -19589,6 +20914,12 @@ msgstr "Modifica cambiavalute"
msgid "Edit Automated Teller Machine"
msgstr "Modifica bancomat"
+msgid "Pawnbroker"
+msgstr "Banco dei pegni"
+
+msgid "Edit Pawnbroker"
+msgstr "Modifica banco dei pegni"
+
msgid "Department Store"
msgstr "Grande magazzino"
@@ -19625,11 +20956,32 @@ msgstr "Gioielleria"
msgid "Edit Jewelry"
msgstr "Modifica gioielleria"
+msgid "Gift"
+msgstr "Articoli regalo"
+
+msgid "Edit Gift Shop"
+msgstr "Modifica negozio di articoli regalo"
+
+msgid "buddhist"
+msgstr "buddista"
+
+msgid "christian"
+msgstr "cristiana"
+
+msgid "hindu"
+msgstr "induista"
+
+msgid "jewish"
+msgstr "ebraica"
+
+msgid "muslim"
+msgstr "mussulmana"
+
msgid "Erotic"
msgstr "Sexy shop"
-msgid "Edit Erotic"
-msgstr "Modifica sexy shop"
+msgid "Edit Erotic Shop"
+msgstr "Modifica SexyShop"
msgid "Florist"
msgstr "Fiorista"
@@ -19658,8 +21010,8 @@ msgstr "Modifica Negozio di Ferramenta"
msgid "Paint"
msgstr "Vernici"
-msgid "Edit Paint"
-msgstr "Modifica vernici"
+msgid "Edit Paint Shop"
+msgstr "Modifica negozio di vernici"
msgid "Furniture"
msgstr "Mobilia"
@@ -19670,20 +21022,20 @@ msgstr "Modifica Negozio di Mobilia"
msgid "Kitchen"
msgstr "Cucine"
-msgid "Edit Kitchen"
-msgstr "Modifica cucine"
+msgid "Edit Kitchen Store"
+msgstr "Modifica negozio di cucine"
msgid "Curtain"
msgstr "Tende"
-msgid "Edit Curtain"
-msgstr "Modifica tende"
+msgid "Edit Curtain Shop"
+msgstr "Modifica negozio di tende"
msgid "Frame"
msgstr "Cornici"
-msgid "Edit Frames"
-msgstr "Modifica cornici"
+msgid "Edit Frames Shop"
+msgstr "Modifica negozio di cornici"
msgid "Stationery"
msgstr "Cartoleria"
@@ -19703,6 +21055,12 @@ msgstr "Libreria"
msgid "Edit Book Store"
msgstr "Modifica libreria"
+msgid "Newsagent''s shop"
+msgstr "Edicola"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Modifica edicola"
+
msgid "Travel Agency"
msgstr "Agenzia di viaggi"
@@ -19712,8 +21070,8 @@ msgstr "Modifica agenzia di viaggi"
msgid "Musical Instrument"
msgstr "Strumenti musicali"
-msgid "Edit Musical Instruments"
-msgstr "Modifica strumenti musicali"
+msgid "Edit Musical Instruments Shop"
+msgstr "Modifica Negozio di Strumenti Musicali"
msgid "Toys"
msgstr "Giocattoli"
@@ -19734,7 +21092,7 @@ msgid "Edit Vending machine"
msgstr "Modifica Distributore automatico"
msgid "Vending products"
-msgstr "Distributore automatico"
+msgstr "Prodotti distribuiti"
msgid "animal_food"
msgstr "cibo per animali"
@@ -19793,6 +21151,9 @@ msgstr "giocattoli"
msgid "vouchers"
msgstr "buoni"
+msgid "Note"
+msgstr "Nota"
+
msgid "Geography"
msgstr "Geografia"
@@ -19922,6 +21283,12 @@ msgstr "Picco montuoso"
msgid "Edit Peak"
msgstr "Modifica picco montuoso"
+msgid "Saddle"
+msgstr "Sella montana"
+
+msgid "Edit Saddle"
+msgstr "Modifica sella montana"
+
msgid "Glacier"
msgstr "Ghiacciaio"
@@ -19961,26 +21328,35 @@ msgstr "Albero"
msgid "Edit Tree"
msgstr "Modifica albero singolo"
+msgid "broad_leaved"
+msgstr "latifoglia"
+
+msgid "conifer"
+msgstr "conifera"
+
+msgid "palm"
+msgstr "palma"
+
msgid "Botanical Name"
msgstr "Nome Botanico"
+msgid "Tree Row"
+msgstr "Fila di alberi"
+
msgid "Wood"
msgstr "Bosco"
msgid "Edit Wood"
msgstr "Modifica bosco"
-msgctxt "wood"
msgid "coniferous"
-msgstr "conifere"
+msgstr "Conifere"
-msgctxt "wood"
msgid "deciduous"
msgstr "deciduo (caducifoglie)"
-msgctxt "wood"
msgid "mixed"
-msgstr "misto"
+msgstr "Mista"
msgid "Forest"
msgstr "Foresta"
@@ -19988,15 +21364,6 @@ msgstr "Foresta"
msgid "Edit Forest Landuse"
msgstr "Modifica area di foresta"
-msgid "coniferous"
-msgstr "Conifere"
-
-msgid "deciduous"
-msgstr "deciduo (caducifoglie)"
-
-msgid "mixed"
-msgstr "Mista"
-
msgid "Grassland"
msgstr "Prateria naurale"
@@ -20072,6 +21439,12 @@ msgstr "Prato"
msgid "Edit Meadow Landuse"
msgstr "Modifica area a prato"
+msgid "Orchard"
+msgstr "Frutteto"
+
+msgid "Edit Orchard Landuse"
+msgstr "Modifica frutteto"
+
msgid "Vineyard"
msgstr "Vigna"
@@ -20127,29 +21500,32 @@ msgstr "Area di svago"
msgid "Edit Recreation Ground Landuse"
msgstr "Modifica area di svago"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Area residenziale"
msgid "Edit Residential Landuse"
msgstr "Modifica area residenziale"
msgid "Graveyard"
-msgstr "Cimitero"
+msgstr "Camposanto (cimitero annesso)"
msgid "Edit Graveyard"
-msgstr "Modifica cimitero"
+msgstr "Modifica camposanto (cimitero annesso)"
+
+msgid "shinto"
+msgstr "shintoista"
msgid "Cemetery"
msgstr "Cimitero"
msgid "Edit Cemetery Landuse"
-msgstr "Modifica area di cimitero (esteso)"
+msgstr "Modifica cimitero"
msgid "Retail"
-msgstr "Commerciale (negozi)"
+msgstr "Vendita al dettaglio"
msgid "Edit Retail Landuse"
-msgstr "Modifica area commerciale (negozi)"
+msgstr "Modifica vendita al dettaglio"
msgid "Commercial"
msgstr "Commerciale (uffici)"
@@ -20164,10 +21540,10 @@ msgid "Edit Industrial Landuse"
msgstr "Modifica area industriale"
msgid "Garages"
-msgstr "Box per auto"
+msgstr "Box per auto multipli"
msgid "Edit Garages"
-msgstr "Modifica box per auto"
+msgstr "Modifica box per auto multipli"
msgid "Railway land"
msgstr "Deposito materiale ferroviario"
@@ -20214,6 +21590,33 @@ msgstr "Modifica area di cava/miniera"
msgid "Annotation"
msgstr "Annotazione"
+msgid "Edit Name Information"
+msgstr "Modifica informazioni sul nome"
+
+msgid "Alternative name"
+msgstr "Nome alternativo"
+
+msgid "Historical name"
+msgstr "Nome storico"
+
+msgid "Local name"
+msgstr "Nome locale"
+
+msgid "Regional name"
+msgstr "Nome regionale"
+
+msgid "National name"
+msgstr "Nome nazionale"
+
+msgid "International name"
+msgstr "Nome internazionale"
+
+msgid "Official name"
+msgstr "Nome ufficiale completo"
+
+msgid "Common name abbreviation"
+msgstr "Abbreviazione comune del nome"
+
msgid "Edit Address Information"
msgstr "Modifica dati indirizzo"
@@ -20232,30 +21635,6 @@ msgstr "Nome città"
msgid "Country code"
msgstr "Codice nazione"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolazione indirizzo"
@@ -20274,6 +21653,18 @@ msgstr "pari"
msgid "alphabetic"
msgstr "alfabetico"
+msgid "Accuracy"
+msgstr "Precisione"
+
+msgid "actual"
+msgstr "effettivo"
+
+msgid "estimate"
+msgstr "stimato"
+
+msgid "potential"
+msgstr "potenziale"
+
msgid "Contact (common schema)"
msgstr "Contatto (schema comune)"
@@ -20436,27 +21827,56 @@ msgstr "dove il controllo finisce"
msgid "traffic light or barrier that stops you"
msgstr "semaforo o barriera che obbliga a fermarsi"
-msgid "Route (legacy)"
-msgstr "Itinerario (eredità)"
+msgid "General route"
+msgstr "Percorso generico"
+
+msgid "Edit general route"
+msgstr "Modifica percorso generico"
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr "bicicletta"
-msgid "Edit Route (legacy)"
-msgstr "Modifica itinerario (eredità)"
+msgctxt "route type"
+msgid "bus"
+msgstr "autobus"
+msgctxt "route type"
msgid "road"
msgstr "strada"
+msgctxt "route type"
+msgid "ferry"
+msgstr "traghetto"
+
+msgctxt "route type"
msgid "ski"
-msgstr "sci"
+msgstr "pista da sci"
+msgctxt "route type"
msgid "foot"
-msgstr "pedone"
+msgstr "pedonale"
+msgctxt "route type"
msgid "hiking"
msgstr "escursionismo"
+msgctxt "route type"
+msgid "tram"
+msgstr "tram"
+
+msgctxt "route type"
msgid "detour"
msgstr "deviazione"
+msgctxt "route type"
+msgid "railway"
+msgstr "ferrovia"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "metropolitana"
+
msgid "Symbol description"
msgstr "Descrizione del simbolo"
@@ -20502,20 +21922,23 @@ msgstr "punto di fermata diretto"
msgid "backward halt point"
msgstr "punto di fermata opposto"
-msgid "Route network"
-msgstr "Rete di itinerari"
+msgid "Route Network"
+msgstr "Rete stradale"
-msgid "Edit route network"
-msgstr "Modifica rete di itinerari"
+msgid "Edit Route Network"
+msgstr "Modifica rete stradale"
msgid "member"
msgstr "membro"
-msgid "Associated street"
-msgstr "Strada associata"
+msgid "Associated Street"
+msgstr "Strada associata (associated street)"
+
+msgid "Edit Associated Street"
+msgstr "Modifica strada associata (associated street)"
-msgid "Edit associated street"
-msgstr "Modifica strada associata"
+msgid "house"
+msgstr "edificio"
msgid "Street"
msgstr "Strada"
@@ -20538,7 +21961,7 @@ msgstr "altro relativo alla strada"
msgid "Destination sign"
msgstr "Segnale di indicazione"
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr "Modifica segnale di indicazione"
msgid "Destination written on sign (w/o distance)"
@@ -20634,18 +22057,27 @@ msgstr "percorsi che passano sotto il ponte"
msgid "way forming the outline footprint"
msgstr "percorsi che formano l''impronta del perimetro"
-msgid "nodes forming the outline"
-msgstr "nodi che formano il perimetro"
+msgid "edge ways parallel to ''across''"
+msgstr "percorsi affiancati paralleli a ''across''"
msgid "ways passing through the tunnel"
msgstr "percorsi che passano attraverso la galleria"
+msgid "edge ways parallel to ''through''"
+msgstr "percorsi affiancati paralleli a ''through''"
+
msgid "bridge"
msgstr "ponte"
msgid "deprecated"
msgstr "deprecato"
+msgid "bicycle"
+msgstr "bicicletta"
+
+msgid "foot"
+msgstr "pedone"
+
msgid "horse"
msgstr "cavallo"
@@ -20653,10 +22085,13 @@ msgid "barrier"
msgstr "barriera"
msgid "motorroad"
-msgstr "superstrada"
+msgstr "strada riservata ai veicoli a motore"
+
+msgid "highway.track"
+msgstr "tracciato"
-msgid "highway_track"
-msgstr "tracciato stradale"
+msgid "livingdashed"
+msgstr "living tratteggiata"
msgid "services"
msgstr "area di servizio"
@@ -20664,11 +22099,11 @@ msgstr "area di servizio"
msgid "ford"
msgstr "guado"
-msgid "highway_platform"
-msgstr "banchina"
+msgid "highway.platform"
+msgstr "banchina stradale"
-msgid "emergency_access_point"
-msgstr "punto di accesso di emergenza"
+msgid "emergency.access.point"
+msgstr "colonnina SOS"
msgid "riverbank"
msgstr "argine"
@@ -20685,11 +22120,14 @@ msgstr "rapide"
msgid "railwaypoint"
msgstr "punto ferroviario"
+msgid "raildashed"
+msgstr "ferrovia tratteggiata"
+
msgid "railyard"
msgstr "deposito locomotive"
msgid "otherrail"
-msgstr "altro ferrovia"
+msgstr "altra ferrovia"
msgid "railover"
msgstr "ferrovia (sopra)"
@@ -20700,29 +22138,29 @@ msgstr "vecchia ferrovia"
msgid "aeroway"
msgstr "aeroporto"
-msgid "aeroway_dark"
-msgstr "aeroporto (scuro)"
+msgid "aeroway.dark"
+msgstr "aeroporto scuro"
-msgid "aeroway_light"
-msgstr "aeroporto (chiaro)"
+msgid "aeroway.light"
+msgstr "aeroporto chiaro"
-msgid "piste_easy"
-msgstr "pista_facile"
+msgid "piste.easy"
+msgstr "pista facile"
-msgid "piste_intermediate"
-msgstr "pista_intermedia"
+msgid "piste.intermediate"
+msgstr "pista intermedia"
-msgid "piste_advanced"
-msgstr "pista_avanzata"
+msgid "piste.advanced"
+msgstr "pista avanzata"
-msgid "piste_expert"
+msgid "piste.expert"
msgstr "pista esperto"
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr "pista libera"
-msgid "piste_novice"
-msgstr "pista_principiante"
+msgid "piste.novice"
+msgstr "pista principiante"
msgid "power"
msgstr "elettricità"
@@ -20742,20 +22180,20 @@ msgstr "porto turistico"
msgid "amenity"
msgstr "struttura di servizio"
-msgid "amenity_traffic"
-msgstr "servizio al traffico"
+msgid "amenity.traffic"
+msgstr "struttura di servizio - traffico"
-msgid "amenity_light"
-msgstr "struttura di servizio (chiaro)"
+msgid "amenity.light"
+msgstr "struttura di servizio - chiaro"
-msgid "light_water"
-msgstr "acqua (chiaro)"
+msgid "light.water"
+msgstr "acqua - chiaro"
msgid "health"
msgstr "salute"
-msgid "shop"
-msgstr "negozio"
+msgid "office"
+msgstr "ufficio"
msgid "hotel"
msgstr "hotel"
@@ -20779,13 +22217,13 @@ msgid "forest"
msgstr "foresta"
msgid "garages"
-msgstr "box per auto"
+msgstr "box per auto multipli"
msgid "farmyard"
msgstr "aia"
msgid "retail"
-msgstr "area commerciale (negozi)"
+msgstr "vendita al dettaglio"
msgid "brownfield"
msgstr "ridestinazione d''uso"
@@ -20820,9 +22258,6 @@ msgstr "brughiera"
msgid "woodarea"
msgstr "area boschiva non gestita"
-msgid "mud"
-msgstr "zona fangosa (sabbie mobili)"
-
msgid "beach"
msgstr "spiaggia"
@@ -20832,10 +22267,13 @@ msgstr "itinerario"
msgid "boundary"
msgstr "confine"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "luogo"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr "dati tiger"
msgid "address"
@@ -20850,9 +22288,6 @@ msgstr "Insediamento urbano"
msgid "One Way"
msgstr "Senso unico"
-msgid "Church"
-msgstr "Chiesa"
-
msgid "Fuel Station"
msgstr "Stazione di rifornimento"
@@ -20880,6 +22315,9 @@ msgstr "etichetta bridge su un nodo"
msgid "wrong highway tag on a node"
msgstr "etichetta highway errata su un nodo"
+msgid "wrong crossing tag on a way"
+msgstr "etichetta crossing errata su un percorso"
+
msgid "Unnamed unclassified highway"
msgstr "Strada non classificata senza nome"
@@ -20896,7 +22334,7 @@ msgid "cycleway with tag bicycle"
msgstr "cycleway con etichetta bicycle"
msgid "footway with tag foot"
-msgstr "footway con etichetta foot"
+msgstr "marciapiede con tag foot"
msgid "separate cycleway as lane on a cycleway"
msgstr "cycleway distinta come una corsia su una cycleway"
@@ -20905,7 +22343,7 @@ msgid "barrier used on a way"
msgstr "barrier utilizzata su un percorso"
msgid "maxspeed used for footway"
-msgstr "maxspeed utilizzata per una footway"
+msgstr "maxspeed utilizzato per un marciapiede"
msgid "layer tag with + sign"
msgstr "etichetta di livello con simbolo +"
@@ -20925,11 +22363,41 @@ msgstr "combinazione di etichette insolita (highway & waterway)"
msgid "unusual tag combination (highway & natural)"
msgstr "combinazione di etichette insolita (highway & natural)"
+msgid "unusual tag combination (landuse & building)"
+msgstr "combinazione di etichette insolita (landuse & building)"
+
+msgid "unnecessary access key"
+msgstr "chiave di accesso non necessaria"
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "motor_vehicle=yes non necessaria"
+
msgid "natural water used for swimming pool"
-msgstr "natural water utilizzata per swimming pool"
+msgstr "acqua naturale utilizzata per piscina"
+
+msgid "numerical key"
+msgstr "tasto numerico"
+
+msgid "route_master relation without route_master=*"
+msgstr "relazione route_master senza route_master=*"
+
+msgid "power line without voltage"
+msgstr "power line senza voltage"
+
+msgid "substation key without power=substation"
+msgstr "chiave substation senza power=substation"
-msgid "incline without highway"
-msgstr "incline senza highway"
+msgid "transformer key without power"
+msgstr "chiave transformer senza power"
+
+msgid "missing substation=*"
+msgstr "substation=* mancante"
+
+msgid "missing transformer=*"
+msgstr "transformer=* mancante"
+
+msgid "incline without highway or railway"
+msgstr "incline senza highway o railway"
msgid "junction without highway"
msgstr "junction senza highway"
@@ -20940,8 +22408,8 @@ msgstr "lanes senza highway"
msgid "lcn without highway"
msgstr "lcn senza highway"
-msgid "lit without highway"
-msgstr "lit senza highway"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "lit senza highway/railway/piste/parking/platform"
msgid "living_street without highway"
msgstr "living_street senza highway"
@@ -20953,13 +22421,13 @@ msgid "median without highway"
msgstr "median senza highway"
msgid "motorroad without highway"
-msgstr "motorroad senza highway"
+msgstr "strada riservata ai veicoli a motore senza highway"
msgid "ntd_id without highway"
msgstr "ntd_id senza highway"
-msgid "oneway without highway"
-msgstr "oneway senza highway"
+msgid "oneway without highway or railway"
+msgstr "oneway senza highway o railway"
msgid "sac_scale without highway"
msgstr "sac_scale senza highway"
@@ -21075,20 +22543,131 @@ msgstr "canal senza waterway"
msgid "have_riverbank without waterway"
msgstr "have_riverbank senza waterway"
-msgid "tunnel without highway/railway/waterway"
-msgstr "tunnel senza highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "tunnel senza highway/railway/waterway/platform/pipeline"
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridge senza highway/railway/waterway/platform/piste/pipeline"
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psv senza highway/railway/waterway/parking"
+
+msgid "width without physical linear feature"
+msgstr "width senza una caratteristica lineare fisica"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "maxspeed senza highway/railway/traffic_sign/enforcement"
+
+msgid "fence_type without barrier=fence"
+msgstr "fence_type senza barrier=fence"
+
+msgid "border_type without boundary"
+msgstr "border_type senza boundary"
-msgid "bridge without highway/railway/waterway"
-msgstr "bridge senza highway/railway/waterway"
+msgid "recycling_type without amenity=recycling"
+msgstr "recycling_type senza amenity=recycling"
-msgid "psv without highway/railway/waterway"
-msgstr "psv senza highway/railway/waterway"
+msgid "board_type without information=board"
+msgstr "board_type senza information=board"
-msgid "width without highway/railway/waterway/aeroway"
-msgstr "width senza highway/railway/waterway/aeroway"
+msgid "shelter_type without amenity=shelter"
+msgstr "shelter_type senza amenity=shelter"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "maxspeed senza highway/railway/traffic_sign"
+msgid "lamp_type without highway=street_lamp"
+msgstr "lamp_type senza highway=street_lamp"
+
+msgid "map_type without information=map"
+msgstr "map_type senza information=map"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "site_type senza historic=archaeological_site"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "artwork_type senza tourism=artwork"
+
+msgid "castle_type without historic=castle"
+msgstr "castle_type senza historic=castle"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "reservoir_type senza landuse/water=reservoir"
+
+msgid "bunker_type without military=bunker"
+msgstr "bunker_type senza military=bunker"
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
+msgstr ""
msgid "religion without denomination"
msgstr "religion senza denomination"
@@ -21108,35 +22687,91 @@ msgstr ""
"wikipedia-language non fornita, utilizzare ''wikipedia''=''language:page "
"title''"
-msgid "unkown language prefix in wikipedia tag"
-msgstr "prefisso linguistico sconosciuto nell''etichetta wikipedia"
+msgid "unknown language prefix in wikipedia tag"
+msgstr "prefisso linguistico sconosciuto nella etichetta wikipedia"
+
+msgid "layer should be between -5 and 5"
+msgstr "il livello dovrebbe essere compreso tra -5 e 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+"il livello dovrebbe essere espresso con numeri aventi incrementi opzionali "
+"di .5"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"altezza: è predefinito in metri; il separatore è il punto; se c''è l''unità, "
+"inserire uno spazio e successivamente l''unità"
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"altezza massima: è predefinito in metri; il separatore è il punto; se c''è "
+"l''unità, inserire uno spazio e successivamente l''unità"
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"larghezza: è predefinito in metri; il separatore è il punto; se c''è "
+"l''unità, inserire uno spazio e successivamente l''unità"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"larghezza massima: è predefinito in metri; il separatore è il punto; se c''è "
+"l''unità, inserire uno spazio e successivamente l''unità"
+
+msgid "unusual maxspeed format"
+msgstr "formato insolito velocità massima"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+"la tensione dovrebbe essere espressa in volt senza unità/delimitatori/spazi"
+
+msgid "unusual frequency specification"
+msgstr "specifica inusuale frequenza"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "scartamento ferroviario inusuale; utilizzare mm senza separatore"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "pendenza inusuale; utilizzare percentule/gradi oppure up/down"
msgid "Landsat"
msgstr "Landsat"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "OSM Inspector: Redaction Bot"
-
msgid "Yahoo Sat"
msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (OpenStreetMap umanitario)"
+
msgid "MapBox Satellite"
-msgstr "Satellite MapBox"
+msgstr "MapBox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr "Tracciati GPS OpenStreetMap"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik bianco & nero)"
+msgstr "OpenStreetMap (Mapnik bianco e nero)"
+
+msgid "skobbler"
+msgstr "skobbler"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler heatmap"
+msgstr "skobbler Heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -21145,46 +22780,34 @@ msgid "MapQuest OSM"
msgstr "MapQuest OSM"
msgid "Public Transport (ÖPNV)"
-msgstr "Trasporto pubblico (ÖPNV)"
+msgstr "Trasporti Pubblici (ÖPNV)"
msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (stile tedesco)"
-msgid "Streets NRW Geofabrik.de"
-msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia"
-
-msgid "Hike & Bike"
-msgstr "Hike & Bike"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (lingua soraba)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (lingua tedesca)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "Mappa OpenPT (sovrapposizione)"
-
-msgid "Bavaria (2 m)"
-msgstr "Baviera (2 m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambogia, Laos, Thailandia, Vietnam bilingue"
-msgid "Hamburg (40 cm)"
-msgstr "Amburgo (40 cm)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (DK5)"
-msgstr "Amburgo (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI bianco e nero 2.5m"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (mappa base)"
msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris: DGM (modello di terreno)"
+msgstr "Tiris: DGM (modello terreno)"
msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris: DOM (modello di superficie)"
+msgstr "Tiris: DOM (modello superficie)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr "Vienna: Mehrzweckkarte (uso generale)"
@@ -21193,112 +22816,177 @@ msgid "Vienna: Beschriftungen (annotations)"
msgstr "Vienna: Beschriftungen (annotazioni)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Vienna: Orto-foto (immagini aeree)"
+msgstr "Vienna: Ortofoto (immagini aeree)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Canton Argovia 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Ortofoto della città di Uster 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Stadtplan Zürich"
-msgstr "Mappa della città di Zurigo"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (modello terreno)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Canton Soletta 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (modello superfice)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Canton Soletta 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Idrografia Geobase"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Canton Soletta Infrarosso 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Strade Geobase"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Canton Ginevra 5cm (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Canton di Neocastello 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr "Mosaico Columbia Britannica"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Canton Giura 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr "Ceco CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Canton Friburgo 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Ceco UHUL:ORTOFOTO"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Città di Berna 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Danimarca)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Ortofoto Yverdon-les-Bains 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Danimarca)"
-msgid "Geobase Hydrography"
-msgstr "Idrografia Geobase"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Danimarca)"
-msgid "Geobase Roads"
-msgstr "Strade Geobase"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Basemap (Maaamet) Estonia"
-msgid "Canvec"
-msgstr "Canvec"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Orto (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr "British Columbia Mosaic"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr "MSR Maps Topo"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgid "MSR Maps Urban"
-msgstr "MSR Maps Urban"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "USGS Scanned Topographic Maps"
-msgstr "Mappe topografiche scansionate USGS"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "USGS Large Scale Imagery"
-msgstr "Immagini aeree su larga scala USGS"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "Sovrapposizione strade OSM US TIGER 2012"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
-msgid "7th Series (OS7)"
-msgstr "7a Serie (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historic"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - ortofoto 2000"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - ortofoto 2010-2012"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - sentieri"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - ortofoto 2012 - 20 cm"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-inch Scozia 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Tolosa - Orthophotoplan 2011"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Serie 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Tolosa - Orthophotoplan 2007"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Serie 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - ortofoto 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - ortofoto 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Ortofoto 1999 - "
+"1 m"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Strade NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (lingua soraba)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (lingua tedesca)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Amburgo (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Amburgo (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Baviera (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stoccarda (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Foto aeree Erlangen 2013 (6,25 cm)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Foto aeree Erlangen 2011 (5,0 cm)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+"Vecchia mappa di Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+"Vecchia mappa di Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haiti)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr "Irlanda Britannica War Office Un pollice 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ireland Bartholomew Quarter-Inch 1940"
+msgstr "Irlanda Bartholomew Un quarto di pollice 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Atlante urbano EEA GMES dell''Irlanda"
+msgstr "Irlanda EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr "EEA CORINE 2006 Irlanda"
+msgstr "Irlanda EEA CORINE 2006"
msgid "Lodi - Italy"
msgstr "Lodi - Italia"
@@ -21313,58 +23001,61 @@ msgid "PCN 2006 - Italy"
msgstr "PCN 2006 - Italia"
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio+Umbria"
+msgstr "PCN 2008 - IT Lazio e Umbria"
msgid "USSR - Latvia"
-msgstr "URSS - Lettonia"
+msgstr "USSR - Lettonia"
msgid "50cm ortho - Latvia"
-msgstr "orto-foto 50cm - Lettonia"
+msgstr "50cm orto - Lettonia"
msgid "20cm ortho - Coastline"
-msgstr "orto-foto 20cm - Linea di costa"
+msgstr "20cm orto - Linea costa"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Alvernia 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lituania)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger Delta Ott 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
+
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Car"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Cyclo"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Ortofoto 2000"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Sci"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - Ortofoto 2010-2012"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentieri"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Copy text \t Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr "Tolosa - Orthophotoplan 2011"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slovacchia EEA GMES Urban Atlas"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Tolosa - Orthophotoplan 2007"
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slovacchia EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Ortofoto 2008-2010"
+msgid "Slovakia Historic Maps"
+msgstr "Mappe storiche Slovacchia"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Ortofoto 2008"
+msgid "South Africa CD:NGI Aerial"
+msgstr "Sudafrica CD:NGI Aerial"
msgid "Catastro Spain"
msgstr "Catasto Spagna"
@@ -21379,94 +23070,154 @@ msgid "GRAFCAN - Canary Islands"
msgstr "GRAFCAN - Isole Canarie"
msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castiglia e León"
+msgstr "Copy text \t ITACyL - Castile and León"
msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Isole Baleari"
-
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estonia Basemap (Maaamet)"
+msgstr "IDEIB - Isole Balerari"
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estonia Ortho (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stadt Uster Orthophoto 2008 10cm"
-msgid "ORT10LT (Lithuania)"
-msgstr "ORT10LT (Lituania)"
+msgid "Stadtplan Zürich"
+msgstr "Stadtplan Zurigo"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Danimarca)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Danimarca)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danimarca)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Provincia di Pangasinan/Bulacan (Filippine HiRes)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Cantone di Ginevra 5cm (SITG 2011)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton du Jura 50cm (RCJU 1998)"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambogia, Laos, Thailandia, Vietnam bilingue"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Cantone di Friburgo 50cm (2005)"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr "Delta del Niger Ottobre 2012 Landsat"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stadt Bern 10cm/25cm (2008)"
-msgid "South Africa CD:NGI Aerial"
-msgstr "Sud Africa CD:NGI Aerial"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Automobile"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Ortofoto 2010 HD 5cm/pi"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Escursionismo"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Ortofoto 2012"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Bicicletta"
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Ortofoto 2012"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Sci"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Losanna - Ortofoto tecniche 2012"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Mappa catastale della Slovacchia (KaPor, 2010-04)"
+msgid "MSR Maps Topo"
+msgstr "MSR Maps Topo"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Mappa catastale della Slovacchia (KaPor, 2011-05)"
+msgid "MSR Maps Urban"
+msgstr "MSR Mappe Urbane"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovacchia EEA GMES Urban Atlas"
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Mappe topografiche scansionate"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovacchia EEA CORINE 2006"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Immagini larga scala"
-msgid "Slovakia Historic Maps"
-msgstr "Mappe storiche della Slovacchia"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "Copy text \t OSM US TIGER 2012 Overlay strade"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI bianco e nero 2.5m"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Strade TIGER nuove & disallineate (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Mappa modificata da Tiger"
+msgstr "OSM - Mappa Tiger modificata"
+
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcelle"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ucraina - Ortofoto 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7° serie (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr "OS Nuova edizione storica popolare"
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
+
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
+
+msgid "Surrey Air Survey"
+msgstr "Surrey Sorvolo aereo"
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6 pollici Scozia 1842-82"
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1° serie 1937-61"
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch 7° serie 1955-61"
msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k storico (OSM)"
+msgstr "Copy text \t OS 1:25k storica (OSM)"
msgid "OS Scottish Popular historic"
-msgstr "OS Storico popolare scozzese"
+msgstr "OS Scottish Popular historic"
-msgid "Stuttgart (Luftbild)"
-msgstr "Stoccarda (vista aerea)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Mezzo pollice, 1897-1907"
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "Piani di città OS, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "Esportazione OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Esporta i dati del traffico su un file di rete SUMO"
+
+msgid "SUMO Export"
+msgstr "Esportazione SUMO"
+
+msgid "Export"
+msgstr "Esporta"
+
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "refresh the port list"
+msgstr "aggiorna l''elenco delle porte"
+
+msgid "Configure"
+msgstr "Configura"
+
+msgid "Connection Error."
+msgstr "Errore di connessione."
+
+msgid "configure the connected DG100"
+msgstr "configura il DG100 collegato"
-msgid "2u"
-msgstr "2u"
+msgid "delete data after import"
+msgstr "elimina i dati dopo l''importazione"
msgid "Columbus V-900 CSV Files"
msgstr "File CSV Columbus V-900"
@@ -21475,7 +23226,7 @@ msgid "Importing CSV file ''%s''..."
msgstr "Importazione del file CSV ''%s''..."
msgid "Markers of "
-msgstr "Marcatori di "
+msgstr "Contrassegni di "
msgid "Show summary after import"
msgstr "Visualizza riepilogo dopo l''importazione"
@@ -21576,7 +23327,7 @@ msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
"available."
msgstr ""
-"E'' stato generato un errore durante l''analisi del file gpx {0}. Sarà "
+"È stato generato un errore durante l''analisi del file gpx {0}. Sarà "
"disponibile soltanto una parte del file."
msgid "Invalid URL {0}"
@@ -21605,7 +23356,7 @@ msgstr ""
msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
msgstr ""
-"Tracciabile (condiviso solo come punti anonimi, ordinati con marcature "
+"Tracciabile (condiviso solo come punti anonimi, ordinati con marche "
"temporali)"
msgid ""
@@ -21613,7 +23364,7 @@ msgid ""
"timestamps)"
msgstr ""
"Identificabile (mostrato nella lista dei tracciati e come punti "
-"identificabili, ordinati con marcature temporali)"
+"identificabili, ordinati con marche temporali)"
msgid "Upload Trace"
msgstr "Carica tracciato"
@@ -21683,6 +23434,18 @@ msgstr "Visualizza il profilo altimetrico"
msgid "Elevation Profile"
msgstr "Profilo altimetrico"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Livello griglia altitudine (sperimentale!)"
+
+msgid "Shows elevation grid layer"
+msgstr "Visualizza livello griglia altitudine"
+
+msgid "Elevation Grid"
+msgstr "Gliglia altitudine"
+
+msgid "No SRTM data"
+msgstr "Nessun dato SRTM"
+
msgid "Open the elevation profile window."
msgstr "Apri la finestra del profilo altimetrico."
@@ -21704,14 +23467,8 @@ msgstr "Aumento"
msgid "Time"
msgstr "Tempo"
-msgid "Geoid"
-msgstr "Geoide"
-
-msgid "Automatic"
-msgstr "Automatico"
-
-msgid "Fixed value"
-msgstr "Valore corretto"
+msgid "Tracks"
+msgstr "Tracciati"
msgid "Elevation profile for track ''{0}''."
msgstr "Profilo altimetrico per il tracciato ''{0}''."
@@ -21986,9 +23743,15 @@ msgstr "Seleziona indirizzi incompleti"
msgid "Selects all addresses with incomplete data."
msgstr "Seleziona tutti gli indirizzi con dati incompleti."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Utilizzare l''etichetta 'addr:street' oppure 'addr:place'"
+
msgid "House Number Editor"
msgstr "Editor numeri civici"
+msgid "House number increment:"
+msgstr "Incremento numero civico:"
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Aggiorna le proprietà di {0} oggetto"
@@ -22006,7 +23769,7 @@ msgid ""
"image projection.<br>(It can be changed later from the right click menu of "
"the image layer.)"
msgstr ""
-"Non è stato trovato alcun file di proiezione (.prj).<br>E'' possibile "
+"Non è stato trovato alcun file di proiezione (.prj).<br>È possibile "
"scegliere la proiezione predefinita dell''immagine ({0}) oppure la "
"proiezione corrente di JOSM ({1}) come proiezione originale "
"dell''immagine.<br>(Può essere cambiata successivamente cliccando con il "
@@ -22015,6 +23778,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Proprietà del livello"
+msgid "Error while creating image layer: {0}"
+msgstr "Errore durante la creazione del livello immagine: {0}"
+
msgid "Import image"
msgstr "Importa immagine"
@@ -22063,7 +23829,7 @@ msgid "apply {0}"
msgstr "applica {0}"
msgid "There is something wrong in the value near:"
-msgstr "E'' presente qualche errore nel valore vicino a:"
+msgstr "È presente qualche errore nel valore vicino a:"
msgid "Info: {0}"
msgstr "Informazioni: {0}"
@@ -22095,9 +23861,21 @@ msgstr "Apri una finestra di selezione OSM Inspector."
msgid "Current Selected Bug Info"
msgstr "Informazioni bug correntemente selezionate"
+msgid "Prev OSMI bug"
+msgstr "Bug OSMI precedente"
+
+msgid "Next OSMI bug"
+msgstr "Bug OSMI successivo"
+
msgid "Osm Inspector Bugs"
msgstr "Bug Osm Inspector"
+msgid "OSM Inspector Bugs"
+msgstr "Bug OSM Inspector"
+
+msgid "Selected Bug Info"
+msgstr "Informazioni bug selezionato"
+
msgid "Handy Address Interpolation Functions"
msgstr "Funzioni facilitate per l''interpolazione di indirizzo"
@@ -22185,8 +23963,8 @@ msgstr "Erano attesi numeri dispari per gli indirizzi"
msgid "Expected even numbers for addresses"
msgstr "Erano attesi numeri pari per gli indirizzi"
-msgid "Expected valid number for address increment"
-msgstr "Era atteso un numero valido per l''incremento dell''indirizzo"
+msgid "Expected valid number for increment"
+msgstr "E'' atteso un numero valido per l''incremento"
msgid "Country code must be 2 letters"
msgstr "Il codice della nazione deve essere composto da 2 lettere"
@@ -22517,7 +24295,7 @@ msgstr ""
" <li><b>Allinea i segmenti.</b> Premere <b><i><span "
"style=\"color:green\">{0}</span></i></b>. In alternativa ci sarà il comando "
"sotto il menu <b>Strumenti</b>\n"
-" oppure potrebbe essere necessario posizionare questa azione sulla <b>barra "
+" oppure potrebbe essere necessario posizionare quest''azione sulla <b>barra "
"degli strumenti</b>.\n"
" </li>\n"
"</ul>\n"
@@ -22571,15 +24349,6 @@ msgstr "Numero civico:"
msgid "Street Name:"
msgstr "Nome della strada:"
-msgid "Increment"
-msgstr "Incrementa"
-
-msgid "Decrement"
-msgstr "Decrementa"
-
-msgid "Numbers:"
-msgstr "Numeri:"
-
msgid "Big buildings mode"
msgstr "Modalità grandi edifici"
@@ -22615,7 +24384,7 @@ msgid "Buildings width:"
msgstr "Larghezza edifici:"
msgid "Length step:"
-msgstr "Passo di lunghezza:"
+msgstr "Lunghezza del passo:"
msgid "Advanced..."
msgstr "Avanzate..."
@@ -22775,6 +24544,9 @@ msgstr "Disabilita il ritaglio dell’immagine durante la georeferenziazione."
msgid "Use \"Tableau d''assemblage\""
msgstr "Utilizza \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr "Sostituisci la tonalità di grigi solo dal colore bianco"
+
msgid "Select first WMS layer in list."
msgstr "Seleziona il primo livello WMS della lista."
@@ -22795,12 +24567,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alto"
-
-msgid "medium"
-msgstr "medio"
-
msgid "symbol"
msgstr "simbolo"
@@ -22843,8 +24609,8 @@ msgstr ""
"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
"l\"> "
"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>prima di effettuare qualsiasi caricamento di dati creati da questa "
-"estensione."
+"<BR>prima di effettuare qualsiasi caricamento di dati creati da "
+"quest''estensione."
msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
msgstr ""
@@ -22955,6 +24721,11 @@ msgstr ""
"Aggiungi il \"Tableau(x) d''assemblage\" nella lista dei fogli catastali da "
"trascinare."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Sostituisci la scala di grigi dal colore bianco (file più piccoli e poco "
+"utilizzo della memoria)"
+
msgid "Display crosspieces:"
msgstr "Mostra trasversali:"
@@ -22977,6 +24748,9 @@ msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
"Seleziona questo per utilizzare l''etichetta \"add:street\" sui nodi."
+msgid "Unexpected file extension. {0}"
+msgstr "Estensione del file inaspettata. {0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "Aggiungere \"source=...\" agli elementi?"
@@ -23064,57 +24838,9 @@ msgid ""
"This image contains georeference data.\n"
"Do you want to use them ?"
msgstr ""
-"Questa immagine contiene dei dati di georeferenziazione.\n"
+"Quest''immagine contiene dei dati di georeferenziazione.\n"
"Si desidera utilizzarli?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Cliccare il primo angolo per il ritaglio dell''immagine\n"
-"(richiesti due punti)"
-
-msgid "Image cropping"
-msgstr "Ritaglio immagine"
-
-msgid "Click second corner for image cropping"
-msgstr "Cliccare il secondo angolo per il ritaglio dell''immagine"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Cliccare la prima traversa di Lambert per la georeferenziazione\n"
-"(richiesti due punti)"
-
-msgid "Image georeferencing"
-msgstr "Georeferenziazione immagine"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Cliccare la seconda traversa di Lambert per la georeferenziazione"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Si desidera annullare completamente\n"
-"o riprovare "
-
-msgid "Enter cadastre east,north position"
-msgstr "Inserire la posizione est,nord del catasto"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Attenzione: controllare la direzione nord mediante la freccia !!)"
-
-msgid "East"
-msgstr "Est"
-
-msgid "I use the mouse"
-msgstr "Utilizzo il mouse"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Imposta {0} coordinate di Lambert"
-
msgid "Load layer from cache"
msgstr "Carica livello da cache"
@@ -23133,8 +24859,8 @@ msgstr ""
msgid ""
"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-"Il file selezionato {0} non è un file di cache proveniente da questa "
-"estensione JOSM (estensione del file non valida)"
+"Il file selezionato {0} non è un file di cache proveniente da "
+"quest''estensione JOSM (estensione del file non valida)"
msgid "The location {0} is already on screen. Cache not loaded."
msgstr "La posizione {0} è già sullo schermo. Cache non caricata."
@@ -23173,34 +24899,98 @@ msgstr "Aggiungi un nuovo livello"
msgid "Open Cadastre Preferences"
msgstr "Preferenze Open Cadastre"
+msgid "Refine georeferencing"
+msgstr "Affina georeferenziazione"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Migliora georeferenziazione (solo immagini raster)"
+
msgid "Reset cookie"
msgstr "Reimposta il cookie"
-msgid "Get a new cookie (session timeout)"
-msgstr "Ottieni un nuovo cookie (sessione scaduta)"
+msgid "Get a new cookie (session timeout)"
+msgstr "Ottieni un nuovo cookie (sessione scaduta)"
+
+msgid "Save image as..."
+msgstr "Salva immagine come..."
+
+msgid "PNG files (*.png)"
+msgstr "File PNG (*.png)"
+
+msgid "GeoTiff files (*.tif)"
+msgstr "File GeoTiff (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Esporta immagine (solo immagini raster)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Cliccare il primo angolo per il ritaglio dell''immagine\n"
+"(richiesti due punti)"
+
+msgid "Image cropping"
+msgstr "Ritaglio immagine"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Cliccare la prima traversa di Lambert per la georeferenziazione\n"
+"(richiesti due punti)"
+
+msgid "Image georeferencing"
+msgstr "Georeferenziazione immagine"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Si desidera annullare completamente\n"
+"o riprovare "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Ooops. Non sono riuscito ad ottenere tutte le coordinate\n"
+"correttamente. Ti prego di riprovare."
+
+msgid "Enter cadastre east,north position"
+msgstr "Inserire la posizione est,nord del catasto"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Attenzione: controllare la direzione nord mediante la freccia !!)"
+
+msgid "East"
+msgstr "Est"
-msgid "Save image as PNG"
-msgstr "Salva immagine in formato PNG"
+msgid "I use the mouse"
+msgstr "Utilizzo il mouse"
-msgid "PNG files (*.png)"
-msgstr "File PNG (*.png)"
+msgid "Set {0} Lambert coordinates"
+msgstr "Imposta {0} coordinate di Lambert"
+
+msgid "Click second corner for image cropping"
+msgstr "Clicca il secondo angolo per il ritaglio dell''immagine"
-msgid "Export as PNG format (only raster images)"
-msgstr "Esporta in formato PNG (solo immagini raster)"
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Clicca la seconda traversa di Lambert per la georeferenziazione"
msgid "Adjust WMS"
msgstr "Regola WMS"
msgid "Adjust the position of the WMS layer (saved for raster images only)"
msgstr ""
-"Aggiusta la posizione del livello WMS (salvata soltanto per le immagini non "
+"Regola la posizione del livello WMS (salvata soltanto per le immagini non "
"vettoriali)"
msgid ""
"More than one WMS layer present\n"
"Select one of them first, then retry"
msgstr ""
-"E'' presente più di un livello WMS\n"
+"È presente più di un livello WMS\n"
"Selezionare prima uno di questi, e poi riprovare"
msgid "Reset offset"
@@ -23215,11 +25005,14 @@ msgstr "Livello WMS ({0}), {1} tasselli caricati"
msgid "Is not vectorized."
msgstr "Non è vettorializzato"
-msgid "Raster size: {0}"
-msgstr "Dimensioni raster: {0}"
+msgid "Bounding box: {0}"
+msgstr "Rettangolo di selezione: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Dimensioni immagine (px): {0}/{1}"
msgid "Is vectorized."
-msgstr "E'' stato vettorializzato"
+msgstr "È stato vettorializzato"
msgid "Commune bbox: {0}"
msgstr "Riquadro del comune: {0}"
@@ -23243,7 +25036,7 @@ msgid "Cache Lambert Zone Error"
msgstr "Errore nella zona di Lambert della cache"
msgid "canvec tile helper"
-msgstr "utilità per i tasselli canvec"
+msgstr "supporto per i tasselli canvec"
msgid "Use"
msgstr "Usa"
@@ -23269,7 +25062,7 @@ msgstr "Elimina lo schema selezionato nella lista."
msgid "Color Schemes"
msgstr "Schemi di colore"
-msgid "Adress"
+msgid "Address"
msgstr "Indirizzo"
msgid "Split area"
@@ -23312,11 +25105,14 @@ msgid "Download OSM data along the selected ways."
msgstr "Scarica i dati OSM lungo i percorsi selezionati."
msgid "Download Along"
-msgstr "Scarica Lungo"
+msgstr "Scarica lungo"
msgid "Please select 1 or more ways to download along"
msgstr "Selezionare 1 o più percorsi"
+msgid "Download from OSM along selected ways"
+msgstr "Scarica da OSM lungo i percorsi selezionati"
+
msgid "{0} intermediate nodes to download."
msgstr "Da scaricare {0} nodi intermedi."
@@ -23392,6 +25188,71 @@ msgstr "Nuovo strumento..."
msgid "Install"
msgstr "Installa"
+msgid "Public"
+msgstr "Pubblico"
+
+msgid "Could not get server response, check logs"
+msgstr "Impossibile ottenere una risposta dal server, controllare i registri"
+
+msgid "Failed to login as {0}:"
+msgstr "Fallito l''accesso come {0}:"
+
+msgid "The server did not return user ID"
+msgstr "Il server non ha restituito l''ID utente"
+
+msgid "Failed to send message:"
+msgstr "Fallita la spedizione del messaggio:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Fallito il reperimento dei messaggi come {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Apri il pannello GeoChat"
+
+msgid "Zoom in to see messages"
+msgstr "Ingrandisci la visuale per vedere i messaggi"
+
+msgid "Login"
+msgstr "Accedi"
+
+msgid "Enable autologin"
+msgstr "Abilita accesso automatico"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} utente"
+msgstr[1] "{0} utenti"
+
+msgid "not logged in"
+msgstr "non connesso"
+
+msgid "User {0} has left"
+msgstr "L''utente {0} si è allontanato"
+
+msgid "User {0} is mapping nearby"
+msgstr "L''utente {0} sta mappando nelle vicinanze"
+
+msgid "Users mapping nearby:"
+msgstr "Utenti che mappano nelle vicinanze:"
+
+msgid "Private chat"
+msgstr "Chat privata"
+
+msgid "Close tab"
+msgstr "Chiudi scheda"
+
+msgid "Logout"
+msgstr "Esci"
+
+msgid "Clear log"
+msgstr "Azzera registro"
+
+msgid "Show users on map"
+msgstr "Visualizza utenti sulla mappa"
+
msgid "Position only"
msgstr "Solo posizione"
@@ -23431,27 +25292,9 @@ msgstr "Disabilita il log dei dati se la distanza è minore"
msgid "Unknown logFormat"
msgstr "Formato del log sconosciuto"
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "refresh the port list"
-msgstr "aggiorna l''elenco delle porte"
-
-msgid "Configure"
-msgstr "Configura"
-
msgid "Configure Device"
msgstr "Configura dispositivo"
-msgid "Connection Error."
-msgstr "Errore di connessione."
-
-msgid "configure the connected DG100"
-msgstr "configura il DG100 collegato"
-
-msgid "delete data after import"
-msgstr "elimina i dati dopo l''importazione"
-
msgid "Importing data from device."
msgstr "Importazione dei dati dal dispositivo."
@@ -23883,6 +25726,9 @@ msgstr "Genera confini del file XML delle immagini aeree per la selezione"
msgid "edit bounds for selected defaults"
msgstr "modifica i confini per i predefiniti selezionati"
+msgid "Download imagery XML bounds"
+msgstr "Scarica confini XML delle immagini aeree"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23948,7 +25794,7 @@ msgstr "Scarica gli scostamenti per le immagini aeree correnti da un server"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
-"Nessun dato per questa regione. Si prega di sistemare il livello delle "
+"Nessun dato per questa regione. Si prega di regolare il livello delle "
"immagini aeree e di caricare uno scostamento."
msgid "Loading imagery offsets..."
@@ -23997,8 +25843,8 @@ msgid ""
"A layer has been added with a calibration geometry. Hide data layers,\n"
"find the corresponding feature on the imagery layer and move it accordingly."
msgstr ""
-"E'' stato aggiunto un livello con una geometria di calibrazione. Nascondere "
-"i livelli dei dati,\n"
+"È stato aggiunto un livello con una geometria di calibrazione. Nascondere i "
+"livelli dei dati,\n"
"trovare la caratteristica corrispondente sul livello delle immagini aeree e "
"spostarlo di conseguenza."
@@ -24106,19 +25952,19 @@ msgid "This string should be 3 to 200 letters long."
msgstr "Questa stringa dovrebbe essere lunga dalle 3 alle 200 lettere."
msgid "Adjust imagery"
-msgstr "Regola immagini aeree"
+msgstr "Regolazione immagini aeree"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Regola la posizione del livello delle immagini aeree selezionato"
+msgstr "Regola la posizione del livello di immagini aeree selezionato"
msgid "Please select the imagery layer to adjust."
msgstr "Si prega di selezionare il livello delle immagini aeree da regolare."
msgid "Start adjusting"
-msgstr "Inizia la regolazione"
+msgstr "Inizia regolazione"
msgid "There are currently no imagery layer to adjust."
-msgstr "Al momento non c''è alcun livello di immagini aeree da regolare."
+msgstr "Non c''è al momento alcun livello di immagini aeree da regolare."
msgid "No layers to adjust"
msgstr "Nessun livello da regolare"
@@ -24165,12 +26011,6 @@ msgstr "Immagini importate"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "File immagine (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Apri immagini con ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Carica le immagini come un nuovo livello."
-
msgid "Import vector graphics"
msgstr "Importa immagini vettoriali"
@@ -24180,18 +26020,15 @@ msgstr "Scala:"
msgid "unit(s) = "
msgstr "unità = "
-msgid "Import..."
-msgstr "Importa..."
-
-msgid "Import vector graphics."
-msgstr "Importa immagini vettoriali."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Immagini SVG (*.svg)"
-
msgid "Importing..."
msgstr "Importazione in corso..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "File SVG [estensione ImportVec] (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Si prega di aprire o creare un livello dati prima dell''importazione"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -24218,7 +26055,7 @@ msgid "Track name: "
msgstr "Nome del tracciato: "
msgid "Update IRS adjustment layer"
-msgstr "Aggiorna livello di aggiustamento IRS"
+msgstr "Aggiorna livello di regolazione IRS"
msgid ""
"This option creates IRS adjustment layer and a little way inside it. You "
@@ -24226,13 +26063,13 @@ msgid ""
"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
"with [irs rectify] in subject."
msgstr ""
-"Questa opzione crea il livello di correzione IRS ed alcune altre cose al suo "
-"interno. Prima bisogna correggere la posizione del livello WMs.\n"
+"Quest''opzione crea il livello di regolazione IRS ed alcune altre cose al "
+"suo interno. Prima bisogna regolare la posizione del livello WMs.\n"
"Il livello risultante deve essere salvato come .osm ed inviato a Komzpa "
"(me at komzpa.net) con [irs rectify] come oggetto."
msgid "IRS Adjustment Layer"
-msgstr "Livello di correzione IRS"
+msgstr "Livello di regolazione IRS"
msgid "Channel-Digraph created from the active OSM-Layer"
msgstr "Digrafo dei canali creato dal livello OSM attivo"
@@ -24372,7 +26209,7 @@ msgid "Lakewalker trace"
msgstr "Traccia Lakewalker"
msgid "An unknown error has occurred"
-msgstr "E'' stato generato un errore sconosciuto"
+msgstr "È stato generato un errore sconosciuto"
msgid "east"
msgstr "est"
@@ -24581,9 +26418,6 @@ msgstr "Centratura automatica"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centra continuamente il livello LiveGPS sulla posizione corrente."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Apri MapDust"
@@ -24640,9 +26474,35 @@ msgstr "Unisci le sovrapposizioni dei percorsi."
msgid "Merge Overlap (combine)"
msgstr "Unisci sovrapposizioni (combina)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Una relazione di appartenenza basata su un ruolo è stata copiata su "
+"tutte le nuove strade<br>Verificare l''operazione e correggere dove "
+"necessario.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Una relazione di appartenenza è stata copiata su tutte le nuove "
+"strade<br>Verificare l''operazione e correggere dove necessario.</html>"
+
msgid "Split way"
msgstr "Dividi percorso"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Inserire una chiave per l''etichetta, es. "
+"<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Inserire un valore per l''etichetta, es. <strong><tt>controllare i "
+"membri</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Divieto di svolta a sinistra Michigan"
@@ -24679,7 +26539,7 @@ msgstr "Scarica da copia OSM..."
msgid "This XAPI query seems to be invalid, please doublecheck"
msgstr ""
-"Questa interrogazione XAPI sembra non essere valida, si prega di verificarla"
+"Quest''interrogazione XAPI sembra non essere valida, si prega di verificarla"
msgid "Object type: "
msgstr "Tipo di oggetto: "
@@ -24690,6 +26550,15 @@ msgstr "Tipo di oggetto OSM da scaricare (''*'' significa qualsiasi)"
msgid "XAPI query: "
msgstr "Interrogazione XAPI: "
+msgid "Download from Overpass API ..."
+msgstr "Scarica dalle API di Overpass ..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Scarica i dati della mappa dal server delle API di Overpass."
+
+msgid "Overpass query: "
+msgstr "Interrogazione Overpass: "
+
msgid "Select OSM mirror URL"
msgstr "Selezionare l''indirizzo URL della copia di OSM"
@@ -24702,16 +26571,6 @@ msgstr "URL di base"
msgid "Enforce meta data"
msgstr "Rafforza metadati"
-msgid "Convert to multipolygon"
-msgstr "Converti in multi-poligono"
-
-msgid "Convert to multipolygon."
-msgstr "Converti in multi-poligono."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-"Uno dei percorsi selezionati appartiene già ad un altro multi-poligono."
-
msgid "About Plugin"
msgstr "Informazioni sull''estensione"
@@ -24827,8 +26686,7 @@ msgstr "Cifra i dati con le credenziali di accesso di Windows"
msgid "The native password manager plugin detected {0} on your system."
msgstr ""
-"E'' stato individuato sul proprio sistema il gestore nativo delle password "
-"{0}."
+"È stato individuato sul proprio sistema il gestore nativo delle password {0}."
msgid "Days without mapping: {0}."
msgstr "Giorni senza mappatura: {0}"
@@ -24858,9 +26716,6 @@ msgstr "Suddividi per quartiere"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Suddividi questi dati per quartiere (admin_level=11)."
-msgid "Open Data"
-msgstr "Open Data"
-
msgid "CSV files"
msgstr "File CSV"
@@ -24885,12 +26740,21 @@ msgstr "File GML"
msgid "Zip Files"
msgstr "File Zip"
+msgid "7Zip Files"
+msgstr "File 7Zip"
+
msgid "OpenData XML files"
msgstr "File XML OpenData"
+msgid "Download open data"
+msgstr "Scarica dati liberi"
+
msgid "License URL not available: {0}"
msgstr "Indirizzo URL della licenza non disponibile: {0}"
+msgid "OpenData preferences"
+msgstr "Preferenze OpenData"
+
msgid "License Agreement"
msgstr "Accordo di licenza"
@@ -24916,7 +26780,7 @@ msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available modules."
msgstr ""
-"Si prega di premere su <strong>Scarica lista</strong> per scaricare e "
+"Si prega di cliccare su <strong>Scarica lista</strong> per scaricare e "
"visualizzare una lista dei moduli disponibili."
msgid ""
@@ -25007,7 +26871,7 @@ msgid ""
msgstr ""
"Un gestore speciale di vari portali Open Data<br/><br/>Si prega di leggere i "
"termini e le condizioni di utilizzo di ciascun portale<br/>prima di "
-"pubblicare i dati caricati da questa estensione."
+"pubblicare i dati caricati da quest''estensione."
msgid "General settings"
msgstr "Impostazioni generali"
@@ -25056,6 +26920,9 @@ msgstr "Scaricamento dei dati..."
msgid "File to load"
msgstr "File da caricare"
+msgid "Reading 7Zip file..."
+msgstr "Lettura file 7Zip..."
+
msgid "Reading Zip file..."
msgstr "Lettura file Zip..."
@@ -25076,6 +26943,19 @@ msgstr ""
msgid "Try lenient method"
msgstr "Prova metodo non esatto"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"Impossibile determinare il sistema di riferimento delle coordinate.\n"
+"Si desidera ritornare al sistema ESPG:4326 (WGS 84) ?"
+
+msgid "Warning: CRS not found"
+msgstr "Attenzione: sistema di riferimento delle coordinate non trovato"
+
+msgid "Unable to detect CRS !"
+msgstr "Impossibile determinare il sistema di riferimento delle coordinate !"
+
msgid "Unable to find a data store for file {0}"
msgstr "Impossibile trovare un data store per il file {0}"
@@ -25137,35 +27017,35 @@ msgid ""
"Skipping download."
msgstr ""
"Attenzione: impossibile scaricare il modulo ''{0}''. Il suo indirizzo è "
-"sconosciuto. Salto lo scaricamento."
+"sconosciuto. Tralascio lo scaricamento."
msgid ""
"Warning: Cannot download module ''{0}''. Its download link ''{1}'' is not a "
"valid URL. Skipping download."
msgstr ""
"Attenzione: impossibile scaricare il modulo ''{0}''. Il suo indirizzo URL "
-"''{1}'' non è valido. Salto lo scaricamento."
+"''{1}'' non è valido. Tralascio lo scaricamento."
msgid "Downloading Module {0}..."
msgstr "Scaricamento del modulo {0}..."
msgid "An error occurred in module {0}"
-msgstr "E'' stato generato un errore nel modulo {0}"
+msgstr "È stato generato un errore nel modulo {0}"
msgid "Last module update more than {0} days ago."
msgstr "L''ultimo aggiornamento del modulo risale a più di {0} giorni fa."
msgid "Click to update the activated modules"
-msgstr "Cliccare per aggiornare i moduli attivati"
+msgstr "Clicca per aggiornare i moduli attivati"
msgid "Click to skip updating the activated modules"
-msgstr "Cliccare per saltare l''aggiornamento dei moduli attivati"
+msgstr "Clicca per tralasciare l''aggiornamento dei moduli attivati"
msgid ""
"Skipping module update after elapsed update interval. Automatic update at "
"startup is disabled."
msgstr ""
-"Salto l''aggiornamento dei moduli dopo che è trascorso l''intervallo di "
+"Tralascio l''aggiornamento dei moduli dopo che è trascorso l''intervallo di "
"aggiornamento. L''aggiornamento automatico all''avvio è disabilitato."
msgid ""
@@ -25226,13 +27106,13 @@ msgid "Disable module"
msgstr "Disabilita modulo"
msgid "Click to delete the module ''{0}''"
-msgstr "Cliccare per eliminare il modulo ''{0}''"
+msgstr "Clicca per eliminare il modulo ''{0}''"
msgid "Keep module"
msgstr "Mantieni modulo"
msgid "Click to keep the module ''{0}''"
-msgstr "Cliccare per mantenere il modulo ''{0}''"
+msgstr "Clicca per mantenere il modulo ''{0}''"
msgid "Warning: failed to delete outdated module ''{0}''."
msgstr "Attenzione: è fallita l''eliminazione del modulo antiquato ''{0}''."
@@ -25242,15 +27122,15 @@ msgid ""
"installation. JOSM is still going to load the old module version."
msgstr ""
"Attenzione: è fallita l''installazione del modulo ''{0}'' già scaricato. "
-"Salto l''installazione. JOSM continuerà a caricare la vecchia versione del "
-"modulo."
+"Tralascio l''installazione. JOSM continuerà a caricare la vecchia versione "
+"del modulo."
msgid ""
"Warning: failed to install module ''{0}'' from temporary download file "
"''{1}''. Renaming failed."
msgstr ""
"Attenzione: è fallita l''installazione del modulo ''{0}'' dal file "
-"temporaneo ''{1}''. E'' fallita la rinominazione."
+"temporaneo ''{1}''. È fallita la rinominazione."
msgid ""
"Do not ask again and remember my decision (go to Preferences->Modules to "
@@ -25270,8 +27150,8 @@ msgstr "<b>Modulo fornito da una sorgente esterna:</b> {0}"
msgid "Failed to create module information from manifest for module ''{0}''"
msgstr ""
-"E'' fallita la creazione delle informazioni sul modulo a partire dal "
-"manifest per il modulo ''{0}''"
+"È fallita la creazione delle informazioni sul modulo a partire dal manifest "
+"per il modulo ''{0}''"
msgid "Illegal entry in module list."
msgstr "Voce non valida nella lista dei moduli."
@@ -25286,7 +27166,7 @@ msgid ""
"Warning: Failed to scan file ''{0}'' for module information. Skipping."
msgstr ""
"Attenzione: è fallita l''analisi del file ''{0}'' per le informazioni del "
-"modulo. Salto."
+"modulo. Tralascio."
msgid "Processing module site cache icon files..."
msgstr "Elaborazione dei file di cache dell''icona sul sito del modulo..."
@@ -25317,8 +27197,8 @@ msgid ""
"Failed to parse module list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
-"E'' fallita l''analisi del documento sulla lista dei moduli dal sito "
-"''{0}''. Salto il sito. L''eccezione è stata: {1}"
+"È fallita l''analisi del documento sulla lista dei moduli dal sito ''{0}''. "
+"Tralascio il sito. L''eccezione è stata: {1}"
msgid "Processing module list from site ''{0}''"
msgstr "Elaborazione della lista dei moduli dal sito ''{0}''"
@@ -25335,36 +27215,26 @@ msgid ""
"new server? (Strongly recommended)</html>"
msgstr ""
"<html>L''estensione openstreetbugs sta utilizzando il vecchio server "
-"appspot.com.<br>E'' disponibile un nuovo server su schokokeks.org.<br>Si "
-"vuole migrare al nuovo server? (Fortemente consigliato)</html>"
+"appspot.com.<br>È disponibile un nuovo server su schokokeks.org.<br>Si vuole "
+"migrare al nuovo server? (Fortemente consigliato)</html>"
msgid "Switch to new openstreetbugs server?"
msgstr "Migrare sul nuovo server openstreetbugs?"
msgid "Unknown Host: %s - Possibly there is no connection to the Internet."
msgstr ""
-"Host sconosciuto: %s - E'' possibile che non ci sia una connessione a "
-"Internet."
+"Host sconosciuto: %s - È possibile che non ci sia una connessione a Internet."
msgid ""
"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
"upload this data. Maybe you have selected the wrong layer?"
msgstr ""
"<html>I dati selezionati contengono riferimenti provenienti da "
-"OpenStreetBugs.<br>Non si possono caricare questi dati. E'' possibile che "
-"sia stato selezionato un livello sbagliato?"
+"OpenStreetBugs.<br>Non si possono caricare questi dati. È possibile che sia "
+"stato selezionato un livello sbagliato?"
msgid "An error occurred: {0}"
-msgstr "E'' stato generato un errore: {0}"
-
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Impossibile creare una nuova segnalazione. Risultato: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"L''intestazione contiene troppi valori e non è possibile mapparla su una "
-"singola stringa"
+msgstr "È stato generato un errore: {0}"
msgid "Process queue"
msgstr "Elabora coda"
@@ -25422,18 +27292,6 @@ msgstr ""
msgid "Close: "
msgstr "Chiudi: "
-msgid "New issue"
-msgstr "Nuova segnalazione"
-
-msgid "Create issue"
-msgstr "Crea segnalazione"
-
-msgid "Describe the problem precisely"
-msgstr "Descrivere il problema in modo preciso"
-
-msgid "Create: "
-msgstr "Crea: "
-
msgid "Open in browser"
msgstr "Apri nel browser"
@@ -25495,11 +27353,14 @@ msgstr "Eseguibile di Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "File Server OSM compressi pbf"
+msgid "Download PBF"
+msgstr "Scarica PBF"
+
msgid "Invalid changeset id: {0}"
msgstr "ID non valido per il gruppo di modifiche: {0}"
msgid "Invalid timestamp: {0}"
-msgstr "Marcatura temporale non valida: {0}"
+msgstr "Marca temporale non valida: {0}"
msgid "Invalid DenseNodes key/values table"
msgstr "Tabella chiave/valori DenseNodes non valida"
@@ -25571,7 +27432,7 @@ msgid "Single segments"
msgstr "Segmenti singoli"
msgid "Orthogonal shapes"
-msgstr "Forme ortogonali"
+msgstr "Figure ortogonali"
msgid "Import settings"
msgstr "Importa le impostazioni"
@@ -25703,9 +27564,6 @@ msgstr "Importa file PDF."
msgid "Import PDF"
msgstr "Importa PDF"
-msgid "Import PDf file"
-msgstr "Importa file PDF"
-
msgid " {0} objects so far"
msgstr " {0} oggetti mancanti"
@@ -25789,8 +27647,27 @@ msgstr "Test fallito: impossibile leggere mtime."
msgid "Test failed: Could not write mtime."
msgstr "Test fallito: impossibile scrivere mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr "Regola foto"
+
+msgid "Move and position photos"
+msgstr "Sposta e posiziona foto"
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+"Cliccare e trascinare la foto oppure shift+click per posizionare la foto."
+
+msgid "Please load some photos."
+msgstr "Si prega di caricare alcune foto."
+
+msgid "Toggle the image thumbnail preview"
+msgstr "Commuta l''anteprima dell''immagine"
+
+msgid "New layer for untagged images"
+msgstr "Nuovo livello per immagini non etichettate"
+
+msgid "Untagged Images"
+msgstr "Immagini non etichettate"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Si desidera salvare la calibrazione corrente del livello {0}?"
@@ -25947,9 +27824,14 @@ msgstr "Niente negli appunti"
msgid "The clipboard data is not an image"
msgstr "I dati contenuti negli appunti non sono un''immagine"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Attenzione: fallita la gestione del file zip ''{0}''. L''eccezione è stata: "
+"{1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
-"E'' stato trovato un file di calibrazione associato all''immagine: {0}\n"
+"È stato trovato un file di calibrazione associato all''immagine: {0}\n"
msgid ""
"Set \"{0}\" to yes/no/ask in the preferences\n"
@@ -25973,6 +27855,9 @@ msgstr ""
"Inoltre, d''ora in poi, il file di calibrazione sarà sempre caricato "
"automaticamente."
+msgid "Download Osmosis poly"
+msgstr "Scarica poligoni Osmosis"
+
msgid "Reading polygon filter file..."
msgstr "Lettura del file di filtro poligono in corso..."
@@ -26074,7 +27959,7 @@ msgid "Public Transport: Catch GTFS stops"
msgstr "Trasporto pubblico: Cattura fermate GTFS"
msgid "skipped"
-msgstr "saltato"
+msgstr "tralasciato"
msgid "Public Transport: Disable GTFS"
msgstr "Trasporto pubblico: Disabilita GTFS"
@@ -26092,7 +27977,7 @@ msgid "File \"{0}\" does not exist"
msgstr "il file \"{0}\" non esiste"
msgid "IOException \"{0}\" occurred"
-msgstr "E''stata generata una eccezione IO \"{0}\""
+msgstr "È stata generata una eccezione IO \"{0}\""
msgid ""
"There exists no dataset. Try to download data from the server or open an OSM "
@@ -26159,7 +28044,7 @@ msgid "Enable"
msgstr "Abilita"
msgid "Can''t parse a time from this string."
-msgstr "Impossibile interpretare un''ora da questa stringa"
+msgstr "Impossibile interpretare un orario da questa stringa"
msgid "Invalid value"
msgstr "Valore non valido"
@@ -26252,7 +28137,7 @@ msgid "Maximum distance from route"
msgstr "Distanza massima dall''itinerario"
msgid "Public Transport: Change stop type"
-msgstr "Trasporto pubblico: Modifica il tipo di fermata"
+msgstr "Trasporto pubblico: modifica tipo fermata"
msgid "Create Stops from GPX ..."
msgstr "Crea fermate da GPX ..."
@@ -26269,9 +28154,6 @@ msgstr "Il file GPX non contiene alcun tracciato o punto del percorso."
msgid "Create Stops from GPX"
msgstr "Crea fermate da GPX"
-msgid "Tracks"
-msgstr "Tracciati"
-
msgid "Tracks in this GPX file:"
msgstr "Tracciati presenti in questo file GPX:"
@@ -26295,7 +28177,7 @@ msgid "unnamed"
msgstr "Senza nome"
msgid "Public Transport: Add track stop"
-msgstr "Trasporto pubblico: Aggiungi fermata"
+msgstr "Trasporto pubblico: aggiungi fermata"
msgid "Public Transport: Delete track stop"
msgstr "Trasporto pubblico: elimina fermata"
@@ -26342,9 +28224,6 @@ msgstr "Specifica il ruolo"
msgid "Change relation member roles to {0}"
msgstr "Cambia i ruoli del membro della relazione a {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Cambia le impostazioni di creazione del multi-poligono"
-
msgid "Create administrative boundary relations"
msgstr "Crea relazioni del il confine amministrativo"
@@ -26467,7 +28346,7 @@ msgid "Relation has streets with different names"
msgstr "La relazione contiene delle strade con nomi differenti"
msgid "fix associatedStreet relation"
-msgstr "correggi la relazione associatedStreet"
+msgstr "correggi la relazione strada associata (associated street)"
msgid "Relation without ''subarea'' role found"
msgstr "Trovata relazione senza il ruolo ''subarea''"
@@ -26478,9 +28357,6 @@ msgstr "Trovato nodo senza il ruolo ''label'' o ''admin_centre''"
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Trovato percorso senza il ruolo ''inner'' o ''outer''"
-msgid "Restart JOSM"
-msgstr "Riavvia JOSM"
-
msgid "Revert changeset fully"
msgstr "Ripristinare completamente il gruppo di modifiche"
@@ -26502,21 +28378,24 @@ msgstr "Inserisci l''ID del gruppo di modifiche che deve essere ripristinato"
msgid "Reverted changeset"
msgstr "Gruppo di modifiche ripristinato"
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "Non è permesso il ripristino del gruppo di modifiche da {0}"
+
msgid "Missing merge target for {0} with id {1}"
msgstr "Destinazione dell''unione mancante per {0} con id {1}"
msgid "Objects history"
-msgstr "Storico degli oggetti"
+msgstr "Cronologia degli oggetti"
msgid "History reverter"
-msgstr "Ripristino storico modifiche"
+msgstr "Ripristina cronologia modifiche"
msgid "Preparing history data..."
-msgstr "Preparazione dei dati dello storico..."
+msgstr "Preparazione dei dati della cronologia..."
msgid "Remote Control has been asked to revert a changeset."
msgstr ""
-"E'' stato richiesto al controllo remoto il ripristino di un gruppo di "
+"È stato richiesto al controllo remoto il ripristino di un gruppo di "
"modifiche."
msgid "Reverting..."
@@ -26528,7 +28407,7 @@ msgid ""
msgstr ""
"Questo gruppo di modifiche contiene degli oggetti che non sono presenti "
"nell''insieme di dati corrente.\n"
-"E'' necessario scaricarli prima del ripristino. Si desidera continuare?"
+"È necessario scaricarli prima del ripristino. Si desidera continuare?"
msgid "Confirm"
msgstr "Conferma"
@@ -26539,15 +28418,35 @@ msgstr "Prelevamento delle primitive mancanti"
msgid "Downloading changeset"
msgstr "Scaricamento del gruppo di modifiche"
+msgid "See {0}"
+msgstr "Vedere {0}"
+
msgid "Revert changeset #{0}"
msgstr "Ripristino del gruppo di modifiche #{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Attenzione: elemento iniziale ''''{0}'''' non supportato nel contenuto del "
+"gruppo di modifiche alla posizione ({1},{2}). Tralascio."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Attenzione: elemento finale ''''{0}'''' non supportato nel contenuto del "
+"gruppo di modifiche alla posizione ({1},{2}). Tralascio."
+
msgid "Road Sign Plugin"
-msgstr "Plugin segnali stradali"
+msgstr "Estensione segnali stradali"
msgid "signs"
msgstr "Segnali"
+msgid "Change Properties"
+msgstr "Modifica Proprietà"
+
msgid "Country preset:"
msgstr "Preimpostazioni paese:"
@@ -26557,6 +28456,9 @@ msgstr "Visualizza tutti i segnali"
msgid "Show a selection of the most useful signs"
msgstr "Visualizza una selezione dei segnali più utili"
+msgid "Spain"
+msgstr "Spagna"
+
msgid "Germany"
msgstr "Germania"
@@ -26567,13 +28469,13 @@ msgid "Slovakia"
msgstr "Slovacchia"
msgid "Roadsign tagging"
-msgstr "Tag segnale stradale"
+msgstr "Etichetta segnale stradale"
msgid "Add tags by clicking on road signs"
-msgstr "Aggiungi il tag cliccando sul segnale stradale"
+msgstr "Aggiungi le etichette cliccando sul segnale stradale"
msgid "Roadsigns plugin: open dialog"
-msgstr "Plugin segnali stradali : apri finestra"
+msgstr "Estensione segnali stradali: apri finestra"
msgid "custom"
msgstr "personalizzato"
@@ -26621,13 +28523,13 @@ msgid "Routing"
msgstr "Navigazione"
msgid "Click to add destination."
-msgstr "Cliccare per aggiungere una destinazione"
+msgstr "Clicca per aggiungere una destinazione"
msgid "Click and drag to move destination"
-msgstr "Cliccare e trascinare per muovere la destinazione"
+msgstr "Clicca e trascina per muovere la destinazione"
msgid "Click to remove destination"
-msgstr "Cliccare per rimuovere la destinazione"
+msgstr "Clicca per rimuovere la destinazione"
msgid "Open a list of routing nodes"
msgstr "Apri un elenco dei nodi dell''itinerario"
@@ -26662,9 +28564,6 @@ msgstr "Preferenze dell''estensione di navigazione"
msgid "Configure routing preferences."
msgstr "Imposta le preferenze di navigazione"
-msgid "Highway type"
-msgstr "Tipo strada"
-
msgid "Speed (Km/h)"
msgstr "Velocità (Km/h)"
@@ -26744,14 +28643,14 @@ msgid ""
"The user name at the SDS server. You need to create an account with the SDS "
"admin first."
msgstr ""
-"Il nome utente del server SDS. E'' necessario prima farsi creare un profilo "
+"Il nome utente del server SDS. È necessario prima farsi creare un profilo "
"dall''amministratore SDS."
msgid ""
"The password at the SDS server. You need to create an account with the SDS "
"admin first."
msgstr ""
-"La password del server SDS. E'' necessario prima farsi creare un profilo "
+"La password del server SDS. È necessario prima farsi creare un profilo "
"dall''amministratore SDS."
msgid ""
@@ -26793,6 +28692,10 @@ msgstr ""
msgid "Save SDS file"
msgstr "Salva file SDS"
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+"Impossibile fare una copia di sicurezza del file. L''eccezione è: {0}"
+
msgid "Simplify Area"
msgstr "Semplifica Area"
@@ -26868,20 +28771,20 @@ msgstr "Fattore di distanza"
msgid "Merge Nearby Nodes Threshold"
msgstr "Limite di unione di nodi limitrofi"
-msgid "Online Help"
-msgstr "Guida online"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
-msgid "Load"
-msgstr "Carica"
+msgid "No object selected"
+msgstr "Nessun oggetto selezionato"
-msgid "invisible"
-msgstr "invisibile"
+msgid "Seamark Inspector"
+msgstr "Seamark Inspector"
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "Select only one object"
+msgstr "Seleziona solo un oggetto"
-msgid "Export"
-msgstr "Esporta"
+msgid "Select a map object"
+msgstr "Seleziona un oggetto della mappa"
msgid "AutoSave LiveData"
msgstr "Salvataggio automatico LiveData"
@@ -26998,7 +28901,7 @@ msgid "Enter housenumbers or amount of segments"
msgstr "Inserire i numeri civici o il numero di segmenti"
msgid "Terrace a house"
-msgstr "Crea un complesso da un edificio"
+msgstr "Crea case a schiera"
msgid "Interpolation"
msgstr "Interpolazione"
@@ -27007,7 +28910,7 @@ msgid "Lowest Number"
msgstr "Numero più basso"
msgid "Lowest housenumber of the terraced house"
-msgstr "Numero civico più basso di un complesso di edifici"
+msgstr "Numero civico più basso delle case a schiera"
msgid "Highest Number"
msgstr "Numero più alto"
@@ -27016,10 +28919,11 @@ msgid "List of Numbers"
msgstr "Lista dei numeri"
msgid "add to existing associatedStreet relation"
-msgstr "aggiungi alla relazione esistente associatedStreet"
+msgstr ""
+"aggiungi alla relazione strada associata (associated street) esistente"
msgid "create an associatedStreet relation"
-msgstr "crea una relazione associatedStreet"
+msgstr "crea una relazione strada associata (associated street)"
msgid "delete outline way"
msgstr "elimina il percorso di contorno"
@@ -27027,6 +28931,9 @@ msgstr "elimina il percorso di contorno"
msgid "Street name: "
msgstr "Nome della strada: "
+msgid "Building: "
+msgstr "Edificio: "
+
msgid "Even/Odd"
msgstr "Pari/dispari"
@@ -27053,22 +28960,22 @@ msgid "{0} is not a number"
msgstr "{0} non è un numero"
msgid "Reverse a terrace"
-msgstr "Inverti un complesso"
+msgstr "Inverti case a schiera"
msgid "Reverses house numbers on a terrace."
-msgstr "Inverte i numeri civici di un complesso."
+msgstr "Inverte i numeri civici delle case a schiera."
msgid "Reverse a Terrace"
-msgstr "Inverti un complesso"
+msgstr "Inverti case a schiera"
msgid "Cannot reverse!"
msgstr "Impossibile invertire!"
msgid "Reverse Terrace"
-msgstr "Inverti complesso"
+msgstr "Inverti case a schiera"
msgid "Terrace a building"
-msgstr "Crea complesso da singolo edificio"
+msgstr "Crea case a schiera da edificio"
msgid "Creates individual buildings from a long building."
msgstr "Crea edifici singoli da un edificio lungo"
@@ -27086,7 +28993,7 @@ msgstr ""
"addr:street ed un nodo per definire l’inizio della numerazione.)"
msgid "Terrace"
-msgstr "Complesso"
+msgstr "Case a schiera"
msgid "Browse"
msgstr "Esplora"
@@ -27098,13 +29005,110 @@ msgid "Merge objects nodes"
msgstr "Unisci i nodi degli oggetti"
msgid "Tracer"
-msgstr "Tracciante"
+msgstr "Tracer"
msgid "Tracer."
-msgstr "Tracciante."
+msgstr "Tracer."
msgid "Tracer building"
-msgstr "Edificio tracciante"
+msgstr "Edificio tracer"
+
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2."
+
+msgid "Change tag {0} to {1}"
+msgstr "Modifica etichetta {0} in {1}"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"La versione di Tracer2Server non è compatibile con questa estensione. Si "
+"prega di scaricare la versione {0} da\n"
+"{1}."
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+"E'' disponibile una nuova versione di Tracer2Server. Per risultati migliori "
+"si prega di aggiornare alla versione {0}."
+
+msgid "No set of parameter is active!"
+msgstr "Nessun insieme di parametri attivo!"
+
+msgid "Select parameter"
+msgstr "Seleziona parametro"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: aggiungi un percorso con {0} punti"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: modifica percorso in {0} punti"
+
+msgid "Tracer2 error"
+msgstr "Errore Tracer2"
+
+msgid "Parameter for server request"
+msgstr "Parametro per richiesta server"
+
+msgid "Tile size:"
+msgstr "Dimensioni tassello:"
+
+msgid "Resolution:"
+msgstr "Risoluzione:"
+
+msgid "Mode:"
+msgstr "Modalità:"
+
+msgid "Threshold:"
+msgstr "Soglia:"
+
+msgid "Points per circle:"
+msgstr "Punti per cerchio:"
+
+msgid "Tag:"
+msgstr "Etichetta:"
+
+msgid "Preferred values:"
+msgstr "Valori preferiti:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "Eliminare il parametro \"{0}\"?"
+
+msgid "Add new"
+msgstr "Aggiungi nuovo"
+
+msgid "Add predefined"
+msgstr "Aggiungi predefinito"
+
+msgid "Select predefined parameter"
+msgstr "Seleziona parametro predefinito"
+
+msgid "Modify list of parameter for server request."
+msgstr "Modifica lista parametri per richieste server"
+
+msgid "Parameter:"
+msgstr "Parametro:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+"Tracer2Server non è in esecuzione. Si prega di avviare il server.\n"
+"Se non si possiede il server si prega di scaricarlo da\n"
+"{0}."
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "Tracer2Server non ha trovato niente."
+
+msgid "Tracer2Server has detected an error."
+msgstr "Tracer2Server ha individuato un errore."
msgid "GPG"
msgstr "GPG"
@@ -27121,9 +29125,6 @@ msgstr "Esporta firme in XML..."
msgid "Save Signatures file"
msgstr "Salva il file delle firme"
-msgid "Download OSM"
-msgstr "Scarica OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -27150,6 +29151,11 @@ msgstr "Carica oggetti dal server"
msgid "Download signed data"
msgstr "Scarica i dati firmati"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Attenzione: ignoro l''errore perché il processo è stato annullato. "
+"Eccezione: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -27318,9 +29324,6 @@ msgstr "Firma annullata!"
msgid "Please give a tolerance in meters"
msgstr "Si prega di fornire una tolleranza in metri"
-msgid "Accuracy"
-msgstr "Precisione"
-
msgid "Select as much as you like:"
msgstr "Selezionane quanti vuoi:"
@@ -27398,7 +29401,7 @@ msgid ""
"<html>An error occurred while constructing the model. Please run the "
"validator to make sure the data is consistent.<br><br>Error: {0}</html>"
msgstr ""
-"<html>E'' stato generato un errore durante la costruzione del modello. Si "
+"<html>È stato generato un errore durante la costruzione del modello. Si "
"prega di eseguire il validatore per essere sicuri che i dati siano "
"consistenti.<br><br>Errore: {0}</html>"
@@ -27419,13 +29422,13 @@ msgid "Edit turn lanes"
msgstr "Modifica corsie di svolta"
msgid "Quick-Fix"
-msgstr "Aggiustamento veloce"
+msgstr "Correzione veloce"
msgid "Revalidate all turnlanes-relations."
msgstr "Ri-valida tutte le relazioni sulle corsie di svolta."
msgid "Automatically fixes the issue."
-msgstr "Aggiusta automaticamente i problemi."
+msgstr "Corregge automaticamente i problemi."
msgid "Selects the offending relation."
msgstr "Seleziona la relazione affetta dal problema."
@@ -27546,8 +29549,8 @@ msgid_plural ""
"There are still {0} errors and/or warnings identified for this turn "
"restriction. You are recommended to resolve these issues first."
msgstr[0] ""
-"E'' rimasto ancora un errore o avvertimento non risolto per questo divieto "
-"di svolta. Si consiglia di risolvere prima questo problema."
+"È rimasto ancora un errore o avvertimento non risolto per questo divieto di "
+"svolta. Si consiglia di risolvere prima questo problema."
msgstr[1] ""
"Sono rimasti ancora {0} errori e/o avvertimenti per questo divieto di "
"svolta. Si consiglia di risolvere prima questi problemi."
@@ -27741,8 +29744,8 @@ msgid ""
"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
"''via''."
msgstr ""
-"E'' fallito l''ottenimento dell''oggetto OSM con id {0} dall''insieme di "
-"dati {1}. Impossibile aggiungerlo come ''via''."
+"È fallito l''ottenimento dell''oggetto OSM con id {0} dall''insieme di dati "
+"{1}. Impossibile aggiungerlo come ''via''."
msgctxt "turnrestrictions"
msgid "From:"
@@ -27868,7 +29871,7 @@ msgid "Removes the member with role ''to''"
msgstr "Rimuove il membro con ruolo ''to''"
msgid "Fix in editor"
-msgstr "Risolvi nell''editor"
+msgstr "Correggi nell''editor"
msgid ""
"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
@@ -28044,7 +30047,7 @@ msgstr ""
"name\">{0}</span> con ruolo <tt>{1}</tt>."
msgid "A way is required instead."
-msgstr "E'' richiesto invece un percorso."
+msgstr "È richiesto invece un percorso."
msgid "Delete the member from the turn restriction"
msgstr "Elimina il membro dal divieto di svolta"
@@ -28058,8 +30061,11 @@ msgstr "Ripristina oggetto..."
msgid "Undelete object by id"
msgstr "Ripristina oggetto da identificativo"
-msgid "Select if the data should be added into a new layer"
-msgstr "Selezionare se i dati devono essere aggiunti in un nuovo livello"
+msgid "Undelete Object"
+msgstr "Ripristina Oggetto"
+
+msgid "Undelete object"
+msgstr "Ripristina oggetto"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -28068,11 +30074,8 @@ msgstr ""
"Inserire il tipo e l''ID degli oggetti che dovrebbero essere ripristinati, "
"es. ''n1 w2''"
-msgid "Undelete Object"
-msgstr "Ripristina Oggetto"
-
-msgid "Undelete object"
-msgstr "Ripristina oggetto"
+msgid "Select if the data should be added into a new layer"
+msgstr "Selezionare se i dati devono essere aggiunti in un nuovo livello"
msgid "Start undeleting"
msgstr "Inizio ripristino"
@@ -28080,18 +30083,6 @@ msgstr "Inizio ripristino"
msgid "Close dialog and cancel"
msgstr "Chiudi la finestra ed annulla"
-msgid "Will get {0}"
-msgstr "Otterrà {0}"
-
-msgid "Looking for {0}"
-msgstr "Ricerca di {0}"
-
-msgid "Found {0}"
-msgstr "Trovati {0}"
-
-msgid "More tools"
-msgstr "Ulteriori strumenti"
-
msgid "Add nodes at intersections"
msgstr "Aggiungi nodi in corrispondenza delle intersezioni"
@@ -28140,16 +30131,6 @@ msgstr ""
"Copia l''appartenenza alle relazioni dagli oggetti presenti negli appunti "
"sugli oggetti selezionati"
-msgid "Paste tags [testing]"
-msgstr "Incolla etichette [test]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-"Applica le etichette analizzate dal buffer a tutti gli elementi selezionati."
-
-msgid "Paste tags"
-msgstr "Incolla etichette"
-
msgid "Split Object"
msgstr "Dividi oggetto"
@@ -28189,7 +30170,7 @@ msgid ""
"participating in this operation."
msgstr ""
"Ci sono più percorsi contenenti uno dei nodi di divisione. Selezionare i "
-"percorsi che concorrono in questa operazione."
+"percorsi che concorrono in quest''operazione."
msgid "Symmetry"
msgstr "Simmetria"
@@ -28284,24 +30265,12 @@ msgstr ""
"l''identificativo dell''elemento<br/> <b>{#type}</b> è sostituito "
"con \"node\",\"way\" o \"relation\" <br/> <b>{#lat} , "
"{#lon}</b> è sostituito con la latitudine/longitudine del centro "
-"della mappa <br/> E'' possibile caricare manualmente le impostazioni dal "
-"file <b>customurl.txt</b> nella cartella di JOSM"
+"della mappa <br/> È possibile caricare manualmente le impostazioni dal file "
+"<b>customurl.txt</b> nella cartella di JOSM"
msgid "Custom URL configuration"
msgstr "Configurazione dell''indirizzo URL personalizzato"
-msgid "Key is too long:"
-msgstr "La chiave è troppo lunga:"
-
-msgid "Suspiciouns characters in tag:"
-msgstr "Caratteri sospetti nella etichetta:"
-
-msgid "Value too long (max 255 characters):"
-msgstr "Valore troppo lungo (max 255 caratteri):"
-
-msgid "Ingore warnings"
-msgstr "Ignora avvertimenti"
-
msgid "Lat Lon tool"
msgstr "Strumento Lat Lon"
@@ -28409,8 +30378,8 @@ msgstr ""
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr ""
-"E'' stato superato il limite di iterazioni per il metodo robusto, utilizzo "
-"il metodo più semplice."
+"È stato superato il limite di iterazioni per il metodo robusto, utilizzo il "
+"metodo più semplice."
msgid "Replace geometry for way {0}"
msgstr "Sostituisci dimensioni e posizione del percorso {0}"
@@ -28521,7 +30490,7 @@ msgstr "Ripristina selezione"
msgid "Reselect last added object or selection form history"
msgstr ""
-"Ri-seleziona l’ultimo oggetto aggiunto oppure selezionalo dalla cronologia"
+"Riseleziona l’ultimo oggetto aggiunto oppure selezionalo dalla cronologia"
msgid "Unselect nodes"
msgstr "Deseleziona nodi"
@@ -28529,9 +30498,6 @@ msgstr "Deseleziona nodi"
msgid "Removes all nodes from selection"
msgstr "Rimuove tutti i nodi dalla selezione"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Importa video"
@@ -28661,8 +30627,8 @@ msgstr "ripeti"
msgid "mute"
msgstr "muto"
-msgid "Scanned Map..."
-msgstr "Mappa scannerizzata..."
+msgid "Walking Papers Scanned Map"
+msgstr "Mappa scansionata Walking Papers"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28686,9 +30652,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Livello Walking Papers ({0}) con ingrandimento {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Scaricamento percorsi"
@@ -28727,7 +30690,7 @@ msgid ""
"''{1}''<br>Merge the duplicate node onto the currently selected node and "
"continue way downloading?</html>"
msgstr ""
-"<html>Non ci sono altri percorsi connessi da scaricare.<br>E'' stato trovato "
+"<html>Non ci sono altri percorsi connessi da scaricare.<br>È stato trovato "
"un probabile nodo duplicato per il nodo attualmente selezionato.<br><br>Il "
"nodo attualmente selezionato è ''''{0}''''<br>Il probabile nodo duplicato è "
"''''{1}''''<br>Unire il nodo duplicato al nodo attualmente selezionato e "
@@ -28753,7 +30716,7 @@ msgstr "Ricerca punto del percorso"
msgid "Search after waypoint. Click and move the map view to the waypoint."
msgstr ""
-"Ricerca punto del percorso successivo. Cliccare e muovere la mappa in "
+"Ricerca punto del percorso successivo. Clicca e muovi la mappa in "
"corrispondenza del punto del percorso."
msgid "Way Select"
@@ -28827,7 +30790,7 @@ msgid "Clipboard"
msgstr "Appunti"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr "Incolla gli articoli Wikipedia dagli appunti di sistema"
+msgstr "Incolla gli articoli di Wikipedia dagli appunti di sistema"
msgid "clipboard"
msgstr "appunti"
@@ -28844,18 +30807,15 @@ msgstr "Imposta la lingua predefinita per gli articoli di Wikipedia"
msgid "Enter the Wikipedia language"
msgstr "Inserire la lingua di Wikipedia"
-msgid "Add Tag"
-msgstr "Aggiungi etichetta"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
-"Aggiunge una etichetta ''wikipedia'' contenente il riferimento all''articolo "
-"relativo agli oggetti selezionati"
+"Aggiunge un tag ''wikipedia'' corrispondente a questo articolo per gli "
+"oggetti selezionati"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr "L''ultimo WMS Super-speed Turbo Challenge II"
+msgstr "The Ultimate WMS Super-speed Turbo Challenge II"
msgid "Go driving"
msgstr "Inizia a guidare"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 5f735ac..9dce55d 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-04-04 11:23+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-19 02:59+0000\n"
"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
"Language-Team: Japanese <tr at openstreetmap.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 04:47+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-20 04:33+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -36,22 +36,37 @@ msgid "{0}: unrecognized option ''{1}{2}''"
msgstr "{0}: 不明なオプション ''{1}{2}''"
msgid "{0}: illegal option -- {1}"
-msgstr "{0}: 不正なオプション -- {1}"
+msgstr "{0}: 誤ったオプション -- {1}"
msgid "{0}: invalid option -- {1}"
-msgstr "{0}: 不正なオプション -- {1}"
+msgstr "{0}: 無効なオプション -- {1}"
msgid "{0}: option requires an argument -- {1}"
msgstr "{0}: オプションは引数を必要とします -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr "パラメーター ''has_arg'' には {0} の値を指定できません"
+msgstr "パラメーター''has_arg''に{0}の値は無効です"
msgid "Background Terms of Use"
msgstr "背景利用規約"
msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "リンクを開くことは、現在のプラットフォームではサポートされていません(''{0}'')"
+msgstr "リンクを開く操作は、このプラットフォームには対応していません(''{0}'')"
+
+msgid "ERROR: {0}"
+msgstr "エラー: {0}"
+
+msgid "WARNING: {0}"
+msgstr "警告: {0}"
+
+msgid "INFO: {0}"
+msgstr "情報: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "デバッグ: {0}"
+
+msgid "Cause: "
+msgstr "原因: "
msgid "Executing platform startup hook"
msgstr "プラットフォームスタートアップフックを実行中"
@@ -72,7 +87,7 @@ msgid "Initializing validator"
msgstr "妥当性検査を初期化中"
msgid "Initializing map styles"
-msgstr "マップスタイルを初期化中"
+msgstr "地図スタイルを初期化中"
msgid "Loading imagery preferences"
msgstr "画像設定を読み込み中"
@@ -90,7 +105,7 @@ msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
msgstr "パラメーター \"downloadgps\" がファイル名もしくはURLとして有効ではありません"
msgid "Ignoring malformed URL: \"{0}\""
-msgstr "不正な形式のURLの \"{0}\" を無視します。"
+msgstr "不正な形式のURL \"{0}\" を無視します。"
msgid ""
"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
@@ -117,7 +132,7 @@ msgid "Display the about screen."
msgstr "バージョン情報画面を表示します。"
msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap エディター"
+msgstr "Java OpenStreetMap Editor"
msgid "Version {0}"
msgstr "バージョン {0}"
@@ -156,18 +171,16 @@ msgid "About JOSM..."
msgstr "JOSM について..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"警告: APIのベースURLの形式が不正です。OSMオブジェクト情報・履歴ページへのリダイレクトはおそらく失敗します。APIのベースURLが "
-"''{0}'' になっています。"
+"APIのベースURLの形式が不正です。OSMオブジェクト情報・履歴ページへのリダイレクトはおそらく失敗します。APIのベースURLは''{0}''です。"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"警告: APIのベースURLの形式が不正です。OSMユーザーのページへのリダイレクトはおそらく失敗します。APIのベースURLが ''{0}'' "
-"になっています。"
+"APIベースURLの書式が不正です。OSMユーザーのユーザーページへのリダイレクトはおそらく失敗します。APIベースURLは''{0}''です。"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -211,6 +224,9 @@ msgstr "対象のレイヤーがありません。"
msgid "Add imagery layer {0}"
msgstr "画像レイヤー {0} を追加"
+msgid "Select image format for WMS layer"
+msgstr "WMSレイヤーの画像形式を選択してください"
+
msgid "Select WMS layers"
msgstr "WMSレイヤーを選択"
@@ -250,9 +266,6 @@ msgstr "ツール: {0}"
msgid "Please select at least four nodes."
msgstr "少なくとも４つのノードを選択してください。"
-msgid "Information"
-msgstr "情報"
-
msgid "Align Nodes in Line"
msgstr "ノードを一直線に配列"
@@ -277,6 +290,9 @@ msgstr "競合"
msgid "download"
msgstr "ダウンロード"
+msgid "problem"
+msgstr "問題"
+
msgid "previous"
msgstr "前"
@@ -286,6 +302,9 @@ msgstr "次"
msgid "Nothing selected to zoom to."
msgstr "ズームする対象が選択されていません。"
+msgid "Information"
+msgstr "情報"
+
msgid "Zoom to {0}"
msgstr "{0}へズーム"
@@ -340,9 +359,9 @@ msgid ""
msgstr "ウェイは現在の方向で結合できません。一方の方向にそろえますか？"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "ウェイを結合できません（これらをノードの一列として統合することができません）"
+msgstr "ウェイを結合できませんでした<br>（一連のノードの並びとしてマージできませんでした）"
msgid "Combine {0} ways"
msgstr "{0}本のウェイを結合"
@@ -397,18 +416,35 @@ msgstr "削除"
msgid "Delete selected objects."
msgstr "選択したオブジェクトを削除します"
+msgid "Toggle dialogs panel"
+msgstr "ダイアログパネルの表示/非表示"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "ダイアログパネルの表示/非表示を切り替え、地図ビューを最大化"
+
msgid "Distribute Nodes"
msgstr "ノードを等間隔に配置"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "直線に沿って、選択したノードを等間隔に配置します。"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "座標を持たない{0}件のノードを無視"
+
msgid "Download from OSM..."
msgstr "OSMからダウンロード..."
msgid "Download map data from the OSM server."
msgstr "地図データをOSMサーバーからダウンロードします。"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr "<html>この操作には、{0}回の独立したダウンロードリクエストを<br>必要とします。続けますか？</html>"
+
+msgid "Download data"
+msgstr "データのダウンロード"
+
msgid "Download object..."
msgstr "オブジェクトをダウンロード..."
@@ -421,24 +457,23 @@ msgstr[0] "オブジェクトがダウンロードできません"
msgid "One object could not be downloaded.<br>"
msgid_plural "{0} objects could not be downloaded.<br>"
-msgstr[0] "{0}個のオブジェクトがダウンロードできません。<br>"
+msgstr[0] "{0}件のオブジェクトがダウンロードできませんでした。<br>"
msgid ""
"The server replied with response code 404.<br>This usually means, the server "
"does not know an object with the requested id."
-msgstr ""
-"サーバーは応答コード404を返しました。<br>これは通常サーバーに、要求されたidのオブジェクトについて存在しないということを意味します。"
+msgstr "サーバーは応答コード404を返しました。<br>これは通常、リクエストされたIDのオブジェクトがサーバーにないことを意味します。"
msgid "missing objects:"
msgstr "不明なオブジェクト:"
msgid "Object deleted"
msgid_plural "Objects deleted"
-msgstr[0] "オブジェクトは削除されました"
+msgstr[0] "オブジェクトが削除されました"
msgid "One downloaded object is deleted."
msgid_plural "{0} downloaded objects are deleted."
-msgstr[0] "{0}個のダウンロードされたオブジェクトは削除されました。"
+msgstr[0] "ダウンロードされたオブジェクト{0}件が削除されました。"
msgid "Ok"
msgstr "OK"
@@ -500,6 +535,9 @@ msgstr "履歴"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "OSMのウェイ、ノード、リレーションについての履歴情報を表示"
+msgid "Show history"
+msgstr "履歴を表示"
+
msgid "History (web)"
msgstr "履歴(web)"
@@ -575,7 +613,7 @@ msgstr "結合するエリアの確認"
msgid "The selected way has nodes outside of the downloaded data region."
msgid_plural ""
"The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "選択したウェイにはダウンロードされたデータ領域の外にノードがあります。"
+msgstr[0] "選択したウェイにはダウンロードしたデータ領域の外にノードがあります。"
msgid "This can lead to nodes being deleted accidentally."
msgstr "これにより思わぬノードが削除されることがあります。"
@@ -614,9 +652,9 @@ msgid "Joined overlapping areas"
msgstr "重複するエリアを結合"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
-msgstr "修正したリレーションにいくつかのウェイが含まれています。エラーが出ないことを確認してください。"
+msgstr "変更されたリレーションに一部のウェイが所属しています。<br>エラーが発生していないか確認してください。"
msgid "Fix tag conflicts"
msgstr "タグの競合を修正"
@@ -644,7 +682,7 @@ msgid "Removed Element from Relations"
msgstr "リレーションから要素を削除"
msgid "Remove tags from inner ways"
-msgstr "内部のウェイからタグを削除"
+msgstr "内部ウェイからタグを削除"
msgid "Join Areas Function"
msgstr "エリア結合機能"
@@ -769,9 +807,9 @@ msgid "Merge nodes into the oldest one."
msgstr "一番古いものにノードをマージします。"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
-msgstr "マージする二つ以上のノードを選択するか、マージ先の近くのノードを選択してください。"
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
+msgstr "マージするノードを2つ以上選択するか、他のノードの近くにある1つのノードを選択するかしてください。"
msgid "Abort Merging"
msgstr "マージを中断"
@@ -842,13 +880,13 @@ msgid "Move Node..."
msgstr "ノードを移動..."
msgid "Edit latitude and longitude of a node."
-msgstr "ノードの緯度経度の編集。"
+msgstr "ノードの緯度経度を編集します。"
msgid "New Layer"
msgstr "新規レイヤー"
msgid "Create a new map layer."
-msgstr "新しいマップレイヤーを作成"
+msgstr "新しい地図レイヤーを作成"
msgid "URL Files"
msgstr "URLファイル"
@@ -864,7 +902,7 @@ msgstr "ファイルを開いています"
msgid "Cannot open {0} file with the file importer ''{1}''."
msgid_plural "Cannot open {0} files with the file importer ''{1}''."
-msgstr[0] "''{1}'' ファイルインポーターを使用して {0} ファイルを開けません。"
+msgstr[0] "ファイルインポーター''{1}''では{0}件のファイルを開けません。"
msgid ""
"Cannot open {0} file because file does not exist or no suitable file "
@@ -872,7 +910,7 @@ msgid ""
msgid_plural ""
"Cannot open {0} files because files do not exist or no suitable file "
"importer is available."
-msgstr[0] "ファイルが存在しないか、適切なファイルインポーターがないため、{0}ファイルを開けません。"
+msgstr[0] "ファイルが存在しないか、適切なファイルインポーターがないため、{0}件のファイルを開けません。"
msgid "no importer"
msgstr "インポーターがありません"
@@ -927,9 +965,9 @@ msgid "Download Data"
msgstr "データをダウンロード"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
-msgstr "<html>適切なダウンロードタスクが有効でないため、URL ''{0}'' をオープンできません。</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
+msgstr "URL ''{0}'' を開けません。<br>次のダウンロードタスクがこのURLパターンを使用しています。<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -940,16 +978,16 @@ msgid ""
msgstr ""
"<h3>いくつかのウェイが選択されている場合、図形の交点の角度が90度ないしは180度になるように調整されます。</h3>選択に2つのノードを追加できます"
"。そして、その２つのノードを基準に方向が修正されます。（その後、そのノードの移動を取り消しできます。<br>ノードを選択して、「図形の直交化 / "
-"元に戻す」のショートカットを押してください。デフォルトはShift+Qです。）"
+"元に戻す」のショートカットを押してください。既定ではShift+Qです。）"
msgid "Orthogonalize Shape"
-msgstr "図形を直交化"
+msgstr "図形の直交化"
msgid "Move nodes so all angles are 90 or 180 degrees"
msgstr "全ての角度が90または180度になるようにノードを移動"
msgid "Orthogonalize Shape / Undo"
-msgstr "図形を直交化 / 元に戻す"
+msgstr "図形の直交化 / 元に戻す"
msgid "Undo orthogonalization for certain nodes"
msgstr "選択したノードの直交化を元に戻す"
@@ -958,15 +996,9 @@ msgid "Orthogonalize / Undo"
msgstr "直交化 / 元に戻す"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-"図形の直交化 / 元に戻す\n"
-"前回の図形の直交化操作で移動したノードを選択してください。"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "直交化された図形を元に戻す"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
+msgstr "図形の直交化 / 元に戻す<br>前回の図形の直交化の操作で移動したノードを選択してください。"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -986,9 +1018,6 @@ msgstr "直交化"
msgid "Usage"
msgstr "使用法"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "選択した要素は直交化できません"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1004,10 +1033,10 @@ msgid "Paste contents of paste buffer."
msgstr "貼り付けバッファの内容を貼り付け"
msgid "Delete incomplete members?"
-msgstr "不完全な数字を削除？"
+msgstr "不完全なメンバーを削除しますか？"
msgid "Paste without incomplete members"
-msgstr "不完全な数字なしで貼り付け"
+msgstr "不完全なメンバー以外を貼り付け"
msgid ""
"The copied data contains incomplete objects. When pasting the incomplete "
@@ -1020,15 +1049,15 @@ msgid "Paste Tags"
msgstr "タグの貼り付け"
msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。"
+msgstr "貼り付けバッファの中身に対するタグを、選択したすべての項目に適用します。"
msgid "Pasting {0} tag"
msgid_plural "Pasting {0} tags"
-msgstr[0] "{0}個のタグを追加しています"
+msgstr[0] "{0}件のタグを貼り付け"
msgid "to {0} object"
msgid_plural "to {0} objects"
-msgstr[0] "{0}個のオブジェクトへ"
+msgstr[0] "{0}件のオブジェクトへ"
msgid "Preferences..."
msgstr "設定..."
@@ -1096,6 +1125,15 @@ msgstr "ファイル名も変更する"
msgid "Could not rename file ''{0}''"
msgstr "ファイル ''{0}'' をリネームできません"
+msgid "Restart"
+msgstr "再起動"
+
+msgid "Restart the application."
+msgstr "アプリケーションを再起動します。"
+
+msgid "Click to restart later."
+msgstr "後で再起動するにはクリックしてください。"
+
msgid "Reverse way"
msgstr "ウェイを反転"
@@ -1146,9 +1184,6 @@ msgstr "セッションを読み込む"
msgid "Load a session from file."
msgstr "ファイルからセッションを読みます。"
-msgid "Session file (*.jos, *.joz)"
-msgstr "セッションファイル (*.jos,*.joz)"
-
msgid "Open session"
msgstr "セッションを開く"
@@ -1210,6 +1245,9 @@ msgstr "動作ログ"
msgid "Copy to clipboard and close"
msgstr "クリップボードにコピーして閉じる"
+msgid "Report bug"
+msgstr "バグを報告"
+
msgid "Close"
msgstr "閉じる"
@@ -1257,11 +1295,11 @@ msgid ""
msgstr "現在の選択は分割に使えません - ノードが選択されていません。"
msgid "The selected nodes do not share the same way."
-msgstr "選択したノードは同じウェイで共有されていません。"
+msgstr "選択されたノードは同じウェイで共有されていません。"
msgid "The selected node is not in the middle of any way."
msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。"
+msgstr[0] "選択されたノードはウェイの中間ではありません。"
msgid ""
"There is more than one way using the node you selected. Please select the "
@@ -1280,16 +1318,14 @@ msgid ""
msgstr "ウェイは選択したノードで分割できません（ヒント:ウェイの真ん中のノードを選択する）"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-"<html>リレーションのメンバーであるロールは、全ての新しいウェイにコピーされました。<br>これらを確認して必要なら訂正してください。</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
+msgstr "リレーションの所属に基づくロールがすべての新しいウェイにコピーされました。<br>必要に応じて確認や修正をしてください。"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-"<html>リレーションのメンバーは全ての新しいウェイにコピーされました。<br>これらを確認して必要なら訂正してください。</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
+msgstr "リレーションの所属がすべての新しいウェイにコピーされました。<br>必要に応じて確認や修正をしてください。"
msgid "Split way {0} into {1} parts"
msgstr "ウェイ {0} を{1}個に分割"
@@ -1359,7 +1395,7 @@ msgid "Unglued Node"
msgstr "ノードを引き離す"
msgid "Dupe into {0} nodes"
-msgstr "{0}ノードを複製"
+msgstr "{0}個のノードを複製"
msgid "Dupe {0} node into {1} nodes"
msgid_plural "Dupe {0} nodes into {1} nodes"
@@ -1384,6 +1420,25 @@ msgstr ""
"完全でないオブジェクトを引き離そうとしています。<br>実際のオブジェクトが見えていないので、問題が発生する可能性があります。<br>本当に引き離しますか"
"？"
+msgid "Disconnect Node from Way"
+msgstr "ウェイからノードを切り離す"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "ノードを現在所属しているウェイから切り離す"
+
+msgid "Select at least one node to be disconnected."
+msgstr "切り離すノードを1個以上選択してください。"
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "選択されたノードはどこからも切り離せません。"
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] "影響を受けるウェイは選択されたノードが切り離された後に非表示になります。"
+
msgid "Undo"
msgstr "取り消し"
@@ -1408,9 +1463,6 @@ msgstr "データを更新"
msgid "Updates the objects in the active data layer from the server."
msgstr "サーバーから有効なデータレイヤーのオブジェクトを更新"
-msgid "Download data"
-msgstr "データのダウンロード"
-
msgid "Update modified"
msgstr "編集を更新"
@@ -1496,7 +1548,7 @@ msgid "Validating"
msgstr "検証中"
msgid "Test {0}/{1}: Starting {2}"
-msgstr "テスト {0}/{1}: {2} 開始"
+msgstr "{0}/{1}: {2}のテストを開始"
msgid "Updating ignored errors ..."
msgstr "無視されたエラーを更新中 ..."
@@ -1505,25 +1557,25 @@ msgid "Viewport Following"
msgstr "ビューポート追随"
msgid "Enable/disable automatic moving of the map view to last placed node"
-msgstr "最後に追加したノードに合わせてマップ表示を自動的に移動する機能の切り替え"
+msgstr "最後に追加したノードに合わせて地図表示を自動的に移動する機能の切り替え"
msgid "Toggle Viewport Following"
msgstr "ビューポート追随の切り替え"
msgid "Wireframe View"
-msgstr "ワイヤー・フレーム表示"
+msgstr "ワイヤーフレーム表示"
msgid "Enable/disable rendering the map as wireframe only"
-msgstr "ワイヤーフレームだけのマップ描画を有効化／無効化"
+msgstr "ワイヤーフレームによる地図描画を有効化／無効化"
msgid "Toggle Wireframe view"
-msgstr "ワイヤー・フレーム表示切り替え"
+msgstr "ワイヤーフレーム表示切り替え"
msgid "Zoom In"
msgstr "拡大"
msgid "Zoom In (Keypad)"
-msgstr "ズームイン(キーバッド)"
+msgstr "ズームイン（キーバッド）"
msgid "Zoom Out"
msgstr "ズームアウト"
@@ -1610,6 +1662,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "ゆっくり進む"
+msgid "Download GPS"
+msgstr "GPSをダウンロード"
+
msgid "Downloading GPS data"
msgstr "GPSデータをダウンロード中"
@@ -1619,6 +1674,18 @@ msgstr "ダウンロードしたGPXデータ"
msgid "Markers from {0}"
msgstr "{0} のマーカー"
+msgid "Download Compressed OSM Change"
+msgstr "OSMの変更を圧縮形式でダウンロード"
+
+msgid "Download OSM Change"
+msgstr "OSMの変更をダウンロード"
+
+msgid "Download Compressed OSM"
+msgstr "OSMを圧縮形式でダウンロード"
+
+msgid "Download OSM"
+msgstr "OSMをダウンロード"
+
msgid "Downloading data"
msgstr "データをダウンロード中"
@@ -1638,6 +1705,29 @@ msgstr "コマンド"
msgid "Request details: {0}"
msgstr "リクエストの詳細: {0}"
+msgid "Download OSM URL"
+msgstr "OSMのURLをダウンロード"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "インポート中に{0}件の競合がありました。"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "ダウンロード中に競合"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) ノード {2} の親をロード中"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) ウェイ {2} の親をロード中"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) リレーション {2} の親をロード中"
+
+msgid "Download session"
+msgstr "ダウンロードセッション"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "ダウンロード {1}のうち{0} (残り {2})"
@@ -1667,7 +1757,7 @@ msgid_plural ""
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
msgstr[0] ""
-"ローカルデータセット中の{0}個のオブジェクトがサーバー上で削除されているかもしれません。<br>このサーバーでそれを削除したり更新したりすると、競合が表"
+"ローカルデータセット中の{0}件のオブジェクトがサーバー上で削除されているかもしれません。<br>このサーバーでそれを削除したり更新したりすると、競合が表"
"示されることになります。"
msgid ""
@@ -1688,23 +1778,6 @@ msgstr "一括ダウンロード中に次のエラーが発生: {0}"
msgid "Errors during download"
msgstr "ダウンロード中にエラー"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "インポート中に {0} の競合がありました。"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "ダウンロード中に競合"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) ノード {2} の親をロード中"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) ウェイ {2} の親をロード中"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) リレーション {2} の親をロード中"
-
msgid "Error during download"
msgstr "ダウンロード中にエラー"
@@ -1764,7 +1837,7 @@ msgstr "カーソルの下のノードを選択"
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
-msgstr[0] "新規ノードを{0}個のウェイに追加します。"
+msgstr[0] "{0}本のウェイに新規ノードを追加します。"
msgid "Start new way from last node."
msgstr "新規ウェイを最後に操作したノードから開始"
@@ -1848,6 +1921,9 @@ msgstr "ウェイの精度を改善"
msgid "Improve Way Accuracy mode"
msgstr "ウェイ精度改善モード"
+msgid "improve way accuracy helper line"
+msgstr "ウェイの正確さを高める補助線"
+
msgid "Click on the way to start improving its shape."
msgstr "ウェイをクリックしてその形状の改善を開始します。"
@@ -1872,8 +1948,8 @@ msgstr "クリックで選択されたノードを移動。Ctrlを押しなが
msgid "Cannot place a node outside of the world."
msgstr "世界地図の範囲外にノードは置けません"
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] "{0}本のウェイに新しいノードを追加"
msgid "Cannot delete node that is referenced by multiple objects"
@@ -1888,6 +1964,9 @@ msgstr "平行線"
msgid "Make parallel copies of ways"
msgstr "並行するウェイのコピーを作成"
+msgid "make parallel helper line"
+msgstr "平行補助線を作成"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -1980,17 +2059,17 @@ msgid "Add all objects selected in the current dataset after the last member"
msgstr "選択されたすべてのオブジェクトを、現在のデータセットの最後のメンバーの後に追加"
msgid "Add selection to relation"
-msgstr "選択したものをリレーションに追加"
+msgstr "選択をリレーションに追加"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] "選択したものを{0}件のリレーションに追加"
+msgstr[0] "選択を{0}件のリレーションに追加"
msgid "Delete the selected relation"
-msgstr "選択したリレーションを削除"
+msgstr "選択されたリレーションを削除"
msgid "Download all members of the selected relations"
-msgstr "選択済リレーションの全メンバーをダウンロード"
+msgstr "選択されたリレーションの全メンバーをダウンロード"
msgid "Download members"
msgstr "メンバーをダウンロード"
@@ -2137,7 +2216,7 @@ msgstr ""
" {0}"
msgid "Invalid search expression"
-msgstr "不正な検索拡張"
+msgstr "検索条件が無効です"
msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
msgstr "<b>Baker Street</b> - ''Baker'' と ''Street'' をキー名に含む"
@@ -2158,15 +2237,15 @@ msgid ""
"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
msgstr ""
-"<b>key=*</b> - キー ''key'' は任意の値に一致。 <b>*=value</b>, <b>key=</b>, <b>*=*</b>, "
-"<b>*=</b>も試してほしい。"
+"<b>key=*</b> - 任意の値を持つキー ''key'' に一致。 "
+"<b>*=value</b>、<b>key=</b>、<b>*=*</b>、<b>*=</b>も利用可"
msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>key:</b> - キー''key'' は任意の値"
+msgstr "<b>key:</b> - 任意の値を持つキー''key'' に一致"
msgid ""
"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
-msgstr "<b>key?</b> - キー ''key'' は ''yes'', ''true'', ''1'' か ''on'' に一致"
+msgstr "<b>key?</b> - ''yes''、''true''、''1''、''on'' のいずれかの値を持つキー ''key'' に一致"
msgid "Special targets"
msgstr "特別なターゲット"
@@ -2189,36 +2268,36 @@ msgstr "<b>id:</b>... - 指定されたIDを持つオブジェクト（新規オ
msgid ""
"<b>version:</b>... - objects with given version (0 objects without an "
"assigned version)"
-msgstr "<b>version:</b>... - 指定されたバージョンのオブジェクト（バージョンが割り当てられていないオブジェクトならば0）"
+msgstr "<b>version:</b>... - 指定されたバージョンのオブジェクト（バージョンが割り当てられていないオブジェクトは0）"
msgid ""
"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
"assigned changeset)"
-msgstr "<b>changeset:</b>... - 指定された変更セットIDのオブジェクト（変更セットに割り当てられていないオブジェクトは0）"
+msgstr "<b>changeset:</b>... - 指定された変更セットIDのオブジェクト（変更セットが割り当てられていないオブジェクトは0）"
msgid ""
"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
msgstr ""
"<b>nodes:</b>... - 指定された数のノードを持つオブジェクト（<b>nodes:</b>count、<b>nodes:</b>min-"
-"max、<b>nodes:</b>min- または<b>nodes:</b>-max）"
+"max、<b>nodes:</b>min-、<b>nodes:</b>-max）"
msgid ""
"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
msgstr ""
"<b>tags:</b>... - 指定された数のタグを持つオブジェクト（<b>tags:</b>count、<b>tags:</b>min-"
-"max、<b>tags:</b>min- または <b>tags:</b>-max）"
+"max、<b>tags:</b>min-、<b>tags:</b>-max）"
msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b>... - リレーションの中の指定されたロールを持つオブジェクト"
+msgstr "<b>role:</b>... - リレーション中で指定されたロールを持つオブジェクト"
msgid ""
"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
msgstr ""
"<b>timestamp:</b>timestamp - 最終更新が指定されたタイムスタンプのオブジェクト（2009-11-"
-"12T14:51:09Z、2009-11-12 または T14:51 ...）"
+"12T14:51:09Z、2009-11-12、T14:51 ...）"
msgid ""
"<b>timestamp:</b>min/max - objects with last modification within range"
@@ -2235,10 +2314,10 @@ msgid "<b>modified</b> - all changed objects"
msgstr "<b>modified</b> - 変更されたオブジェクトすべて"
msgid "<b>selected</b> - all selected objects"
-msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
+msgstr "<b>selected</b> - 選択されたオブジェクトすべて"
msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b>- すべての不完全なオブジェクト"
+msgstr "<b>incomplete</b> - すべての不完全なオブジェクト"
msgid "<b>untagged</b> - all untagged objects"
msgstr "<b>untagged</b> - タグの無いオブジェクト全て"
@@ -2258,12 +2337,12 @@ msgid ""
"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
"members) in downloaded area"
msgstr ""
-"<b>(all)indownloadedarea</b> - ダウンロード範囲内のオブジェクト〈とウェイのノード、リレーションのメンバーすべて）"
+"<b>(all)indownloadedarea</b> - ダウンロード範囲内のオブジェクト（とウェイのノード、リレーションのメンバーすべて）"
msgid ""
"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
"current view"
-msgstr "<b>(all)inview</b> - 現在のビュー内のオブジェクト〈とウェイのノード、リレーションのメンバーすべて）"
+msgstr "<b>(all)inview</b> - 現在のビュー内のオブジェクト（とウェイのノード、リレーションのメンバーすべて）"
msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
@@ -2317,6 +2396,9 @@ msgstr "''value'' の値を持つ任意のキー"
msgid "matches if ''key'' exists"
msgstr "''key''が存在すればマッチ"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr "''key''が''value''より大きければマッチ（簡単に言えば、未満）"
+
msgid "combinators"
msgstr "演算子"
@@ -2483,16 +2565,16 @@ msgstr ""
"{1}"
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
-msgstr "「timestamp」の後に<i>min</i>/<i>max</i>が必要です"
+msgstr "''timestamp''の後に<i>min</i>/<i>max</i>が必要です"
-msgid "Primitive id expected"
-msgstr "プリミティブIDを期待"
+msgid "Range of primitive ids expected"
+msgstr "プリミティブIDの範囲の指定が必要です"
-msgid "Changeset id expected"
-msgstr "変更セットIDを期待"
+msgid "Range of changeset ids expected"
+msgstr "変更セットIDの範囲の指定が必要です"
-msgid "Version expected"
-msgstr "バージョンを期待"
+msgid "Range of versions expected"
+msgstr "バージョンの範囲の指定が必要です"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr "タグオペレーターを使っている時は、キーは空ではいけません。例えば、こうしてください: key=value"
@@ -2500,11 +2582,14 @@ msgstr "タグオペレーターを使っている時は、キーは空ではい
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr "プリミティブの種類が不明です: {0}. 許される値は、\"node\", \"way\" そして \"relation\"です。"
+msgid "Primitive id expected"
+msgstr "プリミティブIDが必要です"
+
msgid "Range of numbers expected"
-msgstr "予期される数字の範囲"
+msgstr "数値の範囲が必要です"
msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "予期しないトークンです。{0}を期待してましたが、{1}を受け取りました。"
+msgstr "予期しないトークンです。{0}が必要な場所に{1}がありました。"
msgid "Unexpected token: {0}"
msgstr "予想外のトークン: {0}"
@@ -2518,9 +2603,8 @@ msgstr "XORのパラメーターがありません"
msgid "Missing operator for NOT"
msgstr "NOTに対する演算子が見つかりません"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr "警告: 削除されたオブジェクト {1} のタグ ''{0}'' を自動的に切り捨てています"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr "削除されたオブジェクト {1} のタグ ''{0}'' の値は自動的に削除されます"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2531,7 +2615,7 @@ msgid "Precondition Violation"
msgstr "前提条件違反"
msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "ウェイ {1} のうち{0}ノードが、最大許容数を越えました。最大許容数は {2} です。"
+msgstr "ウェイ{1}に{0}件のノードがあり、最大数を超えています。ノードの最大数は{2}件です。"
msgid "API Capabilities Violation"
msgstr "API機能違反"
@@ -2606,7 +2690,10 @@ msgstr "リレーション {0} を追加"
msgid "Added {0} object"
msgid_plural "Added {0} objects"
-msgstr[0] "{0} 個のオブジェクトを追加しました"
+msgstr[0] "{0}件のオブジェクトを追加しました"
+
+msgid "New way {0} has 0 nodes"
+msgstr "新しいウェイ{0}にノードがありません"
msgid "Change node {0}"
msgstr "ノード {0} を変更"
@@ -2642,13 +2729,13 @@ msgid "Remove \"{0}\" for {1} objects"
msgstr "{1}オブジェクトの \"{0}\"を削除"
msgid "Set {0}={1} for {2} objects"
-msgstr "{2}個のオブジェクトに{0}={1}を設定"
+msgstr "{2}件のオブジェクトに{0}={1}を設定"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "{0} プロパティを {1} オブジェクトから削除しました"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "{1}件のオブジェクトから{0}件のタグを削除しました"
-msgid "Set {0} properties for {1} objects"
-msgstr "{0} プロパティを {1} オブジェクトに設定しました。"
+msgid "Set {0} tags for {1} objects"
+msgstr "{1}件のオブジェクトに{0}件のタグを設定しました"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "\"{0}\" を \"{1}\" で置き換える。"
@@ -2671,16 +2758,16 @@ msgid "Double conflict"
msgstr "二重の競合"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
-msgstr "警告: レイヤー ''{0}'' は既に存在していません。オブジェクト ''{1}''に対する競合は取り除くことができません。"
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
+msgstr "レイヤー ''{0}'' が既に存在しません。オブジェクト ''{1}'' の競合を削除できません。"
msgid "Add conflict for ''{0}''"
msgstr "''{0}'' に競合を追加"
msgid ""
"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
+msgstr "コマンド ''{0}'' はレイヤー {1} がすでに存在しないので取り消せません"
msgid "Resolve conflicts in coordinates in {0}"
msgstr "{0} 内の座標の競合を解決"
@@ -2702,19 +2789,19 @@ msgstr "リレーション {0} を削除"
msgid "Delete {0} object"
msgid_plural "Delete {0} objects"
-msgstr[0] "{0} 個のオブジェクトを削除"
+msgstr[0] "{0}件のオブジェクトを削除"
msgid "Delete {0} node"
msgid_plural "Delete {0} nodes"
-msgstr[0] "{0} 個のノードを削除"
+msgstr[0] "{0}個のノードを削除"
msgid "Delete {0} way"
msgid_plural "Delete {0} ways"
-msgstr[0] "{0} 個のウェイを削除"
+msgstr[0] "{0}本のウェイを削除"
msgid "Delete {0} relation"
msgid_plural "Delete {0} relations"
-msgstr[0] "{0} 個のリレーションを削除"
+msgstr[0] "{0}件のリレーションを削除"
msgid "Deleted ''{0}''"
msgstr "''{0}''を削除"
@@ -2746,42 +2833,45 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
-"あなたは次の{0}個のリレーションを削除しようとしています。{1}<br/>この操作はあまり必要ではなく、サーバーにアップロード後は簡単に元に戻せません。"
-"<br/>本当に削除しますか？"
+"あなたは次のリレーション{0}件を削除しようとしています。{1}<br/>この操作はあまり必要ではなく、サーバーにアップロード後は簡単に元に戻せません。<"
+"br/>本当に削除しますか？"
msgid "Delete relation?"
-msgstr "リレーションを削除?"
+msgstr "リレーションを削除しますか?"
msgid "Resolve conflicts in deleted state in {0}"
msgstr "{0} 内の削除済み状態の競合を解決"
msgid "Set the ''modified'' flag for node {0}"
-msgstr "ノード{0}に''修正中''フラグを設定します。"
+msgstr "ノード{0}に''修正済み''フラグを設定します。"
msgid "Set the ''modified'' flag for way {0}"
-msgstr "ウェイ{0}に''修正中''フラグを設定します。"
+msgstr "ウェイ{0}に''修正済み''フラグを設定します。"
msgid "Set the ''modified'' flag for relation {0}"
-msgstr "リレーション {0} に ''修正中'' フラグを設定します。"
+msgstr "リレーション{0}に''修正済み''フラグを設定します。"
msgid "Move {0} node"
msgid_plural "Move {0} nodes"
-msgstr[0] "{0} 個のノードを移動"
+msgstr[0] "{0}個のノードを移動"
msgid "Purged {0} object"
msgid_plural "Purged {0} objects"
-msgstr[0] "{0}オブジェクトの削除"
+msgstr[0] "{0}件のオブジェクトの削除"
msgid "Resolve conflicts in member list of relation {0}"
-msgstr "リレーション {0} のメンバーリスト内の競合を解決"
+msgstr "リレーション{0}のメンバーリスト内の競合を解決"
+
+msgid "Removed nodes from {0}"
+msgstr "{0}からノードを削除"
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} 個のノードを回転"
+msgstr[0] "{0}個のノードを回転"
msgid "Scale {0} node"
msgid_plural "Scale {0} nodes"
-msgstr[0] "{0}ノードを拡大縮小"
+msgstr[0] "{0}個のノードを拡大縮小"
msgid "Sequence: {0}"
msgstr "一連の操作: {0}"
@@ -2797,7 +2887,7 @@ msgstr "リレーション {1} で{0}件のタグの競合を解決"
msgid "Transform {0} node"
msgid_plural "Transform {0} nodes"
-msgstr[0] "{0} 件のノードを変換"
+msgstr[0] "{0}個のノードを変換"
msgid "Resolve version conflict for node {0}"
msgstr "ノード {0} のバージョンの競合を解決"
@@ -2833,9 +2923,9 @@ msgid "Reverse directional way."
msgstr "ウェイの方向を反転します。"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr "このウェイを反転する場合は、データの一貫性を保つため、ウェイとそのノードのプロパティを次のように変更するようお勧めします。"
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
+msgstr "このウェイを反転させると、データの一貫性を維持するために次の変更が提案されます。"
msgid "Relation"
msgstr "リレーション"
@@ -2864,14 +2954,14 @@ msgstr "選択した変更を適用します"
msgid "Do not apply changes"
msgstr "変更を適用しません"
-msgid "Please select which property changes you want to apply."
-msgstr "適用したいプロパティの変更を選択してください。"
+msgid "Please select which changes you want to apply."
+msgstr "適用したい変更を選択して下さい。"
-msgid "Properties of "
-msgstr "プロパティ "
+msgid "Tags of "
+msgstr "タグ: "
msgid "Roles in relations referring to"
-msgstr "次を参照するリレーション中のロール"
+msgstr "リレーション内でのロール"
msgid "Automatic tag correction"
msgstr "自動タグ修正"
@@ -2888,6 +2978,9 @@ msgstr "ファイル作成中にIOエラーが発生、自動保存はスキッ
msgid "Unable to delete old backup file {0}"
msgstr "古いバックアップファイル{0}が削除できません。"
+msgid "Your work has been saved automatically."
+msgstr "作業内容が自動的に保存されました。"
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "次の削除済みレイヤーのバックアップ作成中にエラー: {0}"
@@ -2895,10 +2988,10 @@ msgid "Restoring files"
msgstr "ファイルをレストア中"
msgid "Illegal latitude value ''{0}''"
-msgstr "不正な緯度の値 ''{0}''"
+msgstr "誤った緯度の値 ''{0}''"
msgid "Illegal longitude value ''{0}''"
-msgstr "不正な経度の値 ''{0}''"
+msgstr "誤った経度の値 ''{0}''"
msgid "Question"
msgstr "質問"
@@ -2920,19 +3013,19 @@ msgstr ""
"<html>設定ファイルから<b>{0}</b>の設定項目を追加しようとしていますが、<br/>現時点で既定値が分かりません。<br/>関係する機能を有効"
"にしてからもう一度インポートをしてください。"
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "警告: キャッシュディレクトリの作成に失敗しました: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "キャッシュディレクトリ{0}の作成に失敗しました"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>存在しないキャッシュディレクトリ: {0} の作成に失敗</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "警告: プリセットの設定を ''{0}''とするのに失敗しました。"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "設定を''{0}''に保存できませんでした"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
-msgstr "警告: 設定の初期化に失敗しました。設定ディレクトリ ''{0}'' はディレクトリではありません。"
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
+msgstr "設定の初期化に失敗しました。設定ディレクトリ''{0}''がディレクトリではありません。"
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -2940,23 +3033,21 @@ msgid ""
msgstr "<html>設定の初期化に失敗しました。<br>設定ディレクトリ ''{0}'' はディレクトリではありません。</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
-msgstr "警告: 設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
+msgstr "設定の初期化に失敗しました。設定ディレクトリ {0} の作成に失敗しました。"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr "<html>設定の初期化に失敗しました。<br>作成に失敗した設定ディレクトリ: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
-msgstr "情報: 設定ファイル \"{0}\" がありません。既定値の設定ファイルを作成します。"
+msgid "Missing preference file ''{0}''. Creating a default preference file."
+msgstr "設定ファイル ''{0}'' が見つかりません。既定値の設定ファイルを作成します。"
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
-msgstr "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
+"Replacing existing preference file ''{0}'' with default preference file."
+msgstr "既存の設定ファイル ''{0}'' を既定の設定ファイルで置き換えます。"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -2971,9 +3062,9 @@ msgstr ""
"l>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
-msgstr "警告:設定(プリファレンス)の初期化に失敗。プリファレンスファイルを既定値にリセット失敗:{0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
+msgstr "設定の初期化に失敗しました。設定ファイル {0} を既定値にリセットできませんでした。"
msgid "Paint style {0}: {1}"
msgstr "描画スタイル {0}:{1}"
@@ -3002,12 +3093,11 @@ msgstr "リソース''{0}'' のロードに失敗、エラーコード: {1}。"
msgid "UNKNOWN"
msgstr "不明"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr "警告: リビジョンファイルに予期しないJOSMバージョン番号（''{0}''）があります"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr "リビジョンファイルに予期しないJOSMバージョン番号（''{0}''）があります"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "警告: リビジョンファイル ''/REVISION'' がありません。"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "''/REVISION''で指定されたリビジョンファイルが見つかりません。"
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "プリミティブ ''{0}'' には既に競合が登録されています"
@@ -3047,10 +3137,10 @@ msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr "投影法 ''{0}'' が見つかりません。ブックマーク ''{1}'' は利用できません。"
msgid "ID > 0 expected. Got {0}."
-msgstr "ID > 0 である必要があります。 {0} を受け取りました"
+msgstr "IDは0より大きくなければなりませんが、{0}でした。"
msgid "Version > 0 expected. Got {0}."
-msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
+msgstr "バージョン番号は0より大きくなければなりませんが、{0}でした。"
msgid ""
"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
@@ -3069,8 +3159,8 @@ msgid ""
"Please report this at http://josm.openstreetmap.de/. This is not a critical "
"error, it should be safe to continue in your work."
msgstr ""
-"データセット内に [{0} {1}] の線分があるはずなのに見つかりません。これを http://josm.openstreetmap.de/ "
-"に報告してください。これは致命的なエラーではなく、安全に作業を続けられます。"
+"データセット内に[{0} {1}]の線分があるはずなのに見つかりません。http://josm.openstreetmap.de/ "
+"に報告してください。致命的なエラーではなく、安全に作業を続けられます。"
msgid "Missing merge target for way with id {0}"
msgstr "ID {0} のウェイの結合対象が見つかりません"
@@ -3158,44 +3248,43 @@ msgstr "ID ''{0}'' のプリミティブとID ''{1}'' のプリミティブを
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "パラメーター {0} が 0..{1} の範囲外である {2} になっています。"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
-msgstr "エラー: マップレンダラークラス ''{0}''のロードに失敗。クラスが見つかりません。"
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
+msgstr "地図描画クラス ''{0}'' の読み込みに失敗しました。クラスが見つかりませんでした。"
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
-msgstr "レンダラークラス ''{0}''を有効化できません、クラスが見つかりません。"
+msgstr "地図描画クラス ''{0}''を有効化できません、クラスが見つかりません。"
msgid "Activating the standard map renderer instead."
-msgstr "代わりに標準マップレンダラーを有効化しています。"
+msgstr "代わりに標準の地図レンダラーを有効化しています。"
msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
"''{1}''."
-msgstr "マップレンダラークラス ''{0}''を有効化できません、 ''{1}''のサブクラスではありません。"
+msgstr "''{1}''のサブクラスではないため、地図描画クラス''{0}''を有効化できません。"
msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t registered as "
"map renderer."
-msgstr "マップレンダラークラス ''{0}''を有効化できません、マップレンダラーとして登録されていません。"
+msgstr "地図レンダラ―として登録されていないため、地図描画クラス''{0}''を有効化できません。"
msgid "Wireframe Map Renderer"
-msgstr "ワイヤーフレームマップレンダラー"
+msgstr "ワイヤーフレーム地図レンダラー"
msgid "Renders the map as simple wire frame."
-msgstr "マップをシンプルなワイヤーフレームとしてレンダリングします。"
+msgstr "地図をシンプルなワイヤーフレームとしてレンダリングします。"
msgid "Styled Map Renderer"
-msgstr "スタイル付きマップレンダラー"
+msgstr "スタイル付き地図レンダラー"
msgid "Renders the map using style rules in a set of style sheets."
-msgstr "スタイルシートのセット内のスタイルルールを使用してマップをレンダリングします。"
+msgstr "スタイルシートのセット内のスタイルルールを使用して地図をレンダリングします。"
msgid "inactive"
-msgstr "停止中"
+msgstr "非アクティブ"
msgid "selected"
-msgstr "選択済の"
+msgstr "選択済み"
msgid "Relation: selected"
msgstr "リレーション: 選択済み"
@@ -3237,10 +3326,10 @@ msgid "Unkown parameter: ''{0}''."
msgstr "''{0}''は不明なパラメーターです。"
msgid "Value expected for parameter ''{0}''."
-msgstr "パラメーター ''{0}'' には値が必要です。"
+msgstr "パラメーター''{0}''には値が必要です。"
msgid "No value expected for parameter ''{0}''."
-msgstr "パラメーター ''{0}'' には値が不要です。"
+msgstr "パラメーター''{0}''には値を付けるべきではありません。"
msgid "Unexpected parameter format (''{0}'')"
msgstr "パラメーターの書式が違います（''{0}''）"
@@ -3266,12 +3355,12 @@ msgstr "+nadgrids オプションに指定されたグリッドシフトファ
msgid "Unkown datum identifier: ''{0}''"
msgstr "データのID ''{0}'' が見つかりません"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "測地法を指定してください（+datum=*、+towgs84=*、+nadgirds=*など）"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "測地法を指定してください（+datum=*、+towgs84=*、+nadgrids=*など）"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
-msgstr "''towgs84'' パラメータ用の引数の個数が不正です(3から7でなければなりません)"
+msgstr "''towgs84''パラメーターの引数の個数が正しくありません（3から7でなければなりません）"
msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
msgstr "パラメーター ''towgs84'' の値 ''{0}'' が解釈できません"
@@ -3283,7 +3372,10 @@ msgid "Unkown projection identifier: ''{0}''"
msgstr "投影法の識別子 ''{0}'' は不明です"
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
-msgstr "''+bounds''パラメーターの引数の数が不正です（4つでなければなりません）"
+msgstr "''+bounds''パラメーターの引数の個数が正しくありません（4でなければなりません）"
+
+msgid "Unknown parameter ''{0}''"
+msgstr "''{0}'' は不明なパラメーターです"
msgid "Expected number argument for parameter ''{0}''"
msgstr "パラメーター ''{0}'' には数値の引数が必要です"
@@ -3301,9 +3393,6 @@ msgstr "独自の投影法"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "エラー: リソース ''/data/{0}'' の入力ストリームをオープンできませんでした。"
-
msgid "WGS84"
msgstr "WGS84"
@@ -3333,16 +3422,19 @@ msgstr ""
"{1}"
msgid "validation error"
-msgstr "妥当性検査エラー"
+msgstr "妥当性検査（エラー）"
msgid "validation warning"
-msgstr "妥当性検査の警告"
+msgstr "妥当性検査（警告）"
msgid "validation other"
-msgstr "その他を検証"
+msgstr "妥当性検査（その他）"
msgid "Running test {0}"
-msgstr "テスト {0} 実行中"
+msgstr "{0}のテストを実行中"
+
+msgid "Test ''{0}'' completed in {1}"
+msgstr "{1}で''{0}''のテストが完了しました"
msgid "Addresses"
msgstr "住所"
@@ -3357,7 +3449,7 @@ msgid "House number without street"
msgstr "通り名のない住居番号がある"
msgid "House number ''{0}'' duplicated"
-msgstr "家屋番号 ''{0}'' が重複しています"
+msgstr "住居番号''{0}''が重複しています"
msgid "Duplicate house numbers"
msgstr "住居番号が重複している"
@@ -3368,6 +3460,15 @@ msgstr "リレーションに複数の通り名がある"
msgid "House number too far from street"
msgstr "住居番号が通りから遠すぎる"
+msgid "Barriers and entrances"
+msgstr "柵と入口"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "柵と入口のエラーをチェックする。"
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "柵の入口が柵の上に設定されていない"
+
msgid "Building inside building"
msgstr "建物の内側にある建物"
@@ -3427,15 +3528,15 @@ msgstr " あるいは "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0}は推奨されていません。かわりに{1}を使用してください"
+msgid "{0} is unnecessary"
+msgstr "{0}は不要です"
+
msgid "Duplicated nodes"
msgstr "重複したノード"
msgid "This test checks that there are no nodes at the very same location."
msgstr "このテストは全く同じ位置にノードがないことをチェックします。"
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "2つのクローズしていないウェイ中でノードが重複"
-
msgid "Mixed type duplicated nodes"
msgstr "混合タイプの重複ノード"
@@ -3489,7 +3590,7 @@ msgstr "重複したウェイ"
msgid ""
"This test checks that there are no ways with same node coordinates and "
"optionally also same tags."
-msgstr "この検査は、同じノード座標を持ち、オプションで同じタグも持つウェイがないかどうかを調べます。"
+msgstr "このテストは同じノード座標を持ち、オプションで同じタグも持つウェイがないかどうかをチェックします。"
msgid "Ways with same position"
msgstr "同じ位置を持つウェイ"
@@ -3503,6 +3604,24 @@ msgstr "重複したウェイのノード"
msgid "Checks for ways with identical consecutive nodes."
msgstr "全く同じ連続するノードを持つウェイをチェック"
+msgid "Highways"
+msgstr "道路"
+
+msgid "Performs semantic checks on highways."
+msgstr "道路の意味上のチェックを行います。"
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "ロータリー交差点が無効です（highway: {1} の代わりに {0}）"
+
+msgid "Missing pedestrian crossing information"
+msgstr "横断歩道情報がない"
+
+msgid "Unknown country code: {0}"
+msgstr "国コード{0}が不明です"
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr "source:maxspeedのコンテキスト{0}が不明です"
+
msgid "Multipolygon"
msgstr "マルチポリゴン"
@@ -3522,7 +3641,7 @@ msgid "No style in multipolygon relation"
msgstr "マルチポリゴンのリレーションにスタイルがありません"
msgid "Style for inner way equals multipolygon"
-msgstr "インナーウェイのスタイルはマルチポリゴンと同じです"
+msgstr "内部ウェイのスタイルがマルチポリゴンと同じです"
msgid "Style for outer way mismatches"
msgstr "アウターウェイのスタイルがアンマッチです"
@@ -3531,7 +3650,7 @@ msgid "Multipolygon is not closed"
msgstr "マルチポリゴンが閉じられていません"
msgid "Multipolygon inner way is outside"
-msgstr "マルチポリゴンのインナーウェイが外側です"
+msgstr "マルチポリゴンの内部ウェイが外側にあります"
msgid "Intersection between multipolygon ways"
msgstr "マルチポリゴンウェイ間の交差"
@@ -3574,6 +3693,12 @@ msgstr "同じ名前のノード"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "このテストは同じ名前のノードを探します（重複の可能性）。"
+msgid "Opening hours syntax"
+msgstr "営業時間の書式"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr "このテストは営業時間の使い方が正しいかをチェックします。"
+
msgid "Overlapping Areas"
msgstr "エリアの重複"
@@ -3589,7 +3714,7 @@ msgstr "重なったウェイ"
msgid ""
"This test checks that a connection between two nodes is not used by more "
"than one way."
-msgstr "このテストはふたつのノード間の接続がひとつ以上のウェイで使用されていないかチェックします。"
+msgstr "このテストは2個のノード間の接続が2本以上のウェイで使用されていないかをチェックします。"
msgid "Areas share segment"
msgstr "一部を共有しているエリア"
@@ -3631,15 +3756,15 @@ msgstr "リレーション種別が不明です"
msgid "Relation is empty"
msgstr "リレーションは空です"
+msgid "Role verification problem"
+msgstr "ロール検証に問題"
+
msgid "<empty>"
msgstr "<empty>"
msgid "Role {0} missing"
msgstr "ロール{0} がありません"
-msgid "Role verification problem"
-msgstr "ロール検証に問題"
-
msgid "Number of {0} roles too low ({1})"
msgstr "{0} ロールの数（{1}）が少なすぎます"
@@ -3647,7 +3772,7 @@ msgid "Number of {0} roles too high ({1})"
msgstr "{0} ロールの数（{1}）が多すぎます"
msgid "Member for role {0} of wrong type"
-msgstr "ロール {0} に誤った種別のメンバーがあります"
+msgstr "誤った種別のロール{0}のメンバーがあります"
msgid "Role {0} unknown"
msgstr "ロール {0} は不明です"
@@ -3660,7 +3785,7 @@ msgstr "自身で交差するウェイ"
msgid ""
"This test checks for ways that contain some of their nodes more than once."
-msgstr "この検査は、同じノードを複数回使用するウェイをチェックします。"
+msgstr "このテストは、同じノードを複数回使用するウェイをチェックします。"
msgid "Similarly named ways"
msgstr "同じような名前のウェイ"
@@ -3669,17 +3794,17 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
-msgid "Properties checker :"
-msgstr "プロパティチェッカー:"
+msgid "Tag checker"
+msgstr "タグチェッカー"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
+msgid "This test checks for errors in tag keys and values."
+msgstr "このテストはタグのキーと値にあるエラーをチェックします。"
msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "タグチェッカーライン - {0}: {1} が不正です。"
+msgstr "タグチェッカーの{1}行目が無効です。{0}"
msgid "Invalid spellcheck line: {0}"
-msgstr "スペルチェック行 {0}が不正です"
+msgstr "スペルチェックの{0}行目が無効です。"
msgid ""
"Could not access data file(s):\n"
@@ -3692,7 +3817,7 @@ msgid "Suspicious tag/value combinations"
msgstr "疑わしいタグ／値の組み合わせです"
msgid "Key ''{0}'' invalid."
-msgstr "キー ''{0}''は不正です。"
+msgstr "キー''{0}''は無効です。"
msgid "Tag value contains character with code less than 0x20"
msgstr "タグ値に0x20より小さいコードのキャラクタが含まれています"
@@ -3710,10 +3835,10 @@ msgid "Tags with empty values"
msgstr "値のないタグ"
msgid "Invalid property key"
-msgstr "プロパティキーが不正です"
+msgstr "プロパティキーが無効です"
msgid "Invalid white space in property key"
-msgstr "プロパティのキーとして、不正なスペースが入っています。"
+msgstr "プロパティキーの空白は無効です"
msgid "Property values start or end with white space"
msgstr "値で、空白文字を最初か最後にあるプロパティ"
@@ -3811,23 +3936,23 @@ msgstr "既定のスペルチェックファイルを使用"
msgid "Use the default spellcheck file (recommended)."
msgstr "既定のスペルチェックファイルを使用します（推奨）。"
-msgid "Fix properties"
-msgstr "プロパティを修正"
+msgid "Fix tags"
+msgstr "タグの修正"
msgid "Could not find element type"
msgstr "要素種別を見つけられませんでした。"
msgid "Incorrect number of parameters"
-msgstr "パラメータの数が不正"
+msgstr "パラメータの数が正しくありません"
msgid "Could not find warning level"
msgstr "警告レベルを見つけられませんでした"
msgid "Illegal expression ''{0}''"
-msgstr "不正な表現 ''{0}''"
+msgstr "誤った表現 ''{0}''"
msgid "Illegal regular expression ''{0}''"
-msgstr "不正な正規表現: ''{0}''"
+msgstr "誤った正規表現: ''{0}''"
msgid "Turnrestrictions"
msgstr "進行方向制限"
@@ -3884,7 +4009,10 @@ msgid "Unclosed Ways"
msgstr "閉じていないウェイ"
msgid "This tests if ways which should be circular are closed."
-msgstr "これは循環しているべきウェイが閉じられているかチェックします。"
+msgstr "これは循環であるべきウェイが閉じているかチェックします。"
+
+msgid "Unclosed way"
+msgstr "閉じていないウェイ"
msgid "natural type {0}"
msgstr "自然の種別 {0}"
@@ -3916,14 +4044,11 @@ msgstr "建物"
msgid "area"
msgstr "領域"
-msgid "Unclosed way"
-msgstr "閉じていないウェイ"
-
msgid "Unconnected ways"
msgstr "接続されていないウェイ"
msgid "This test checks if a way has an endpoint very near to another way."
-msgstr "このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェックしています。"
+msgstr "このテストはウェイの端点が別のウェイのすぐ近くにないかをチェックします。"
msgid "Way end node near other highway"
msgstr "他の道路の近くにあるウェイの終端ノード"
@@ -3943,12 +4068,12 @@ msgstr "タグ付けも接続もされていないノード"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
-msgid "No tags"
-msgstr "タグ無し"
-
msgid "Unconnected nodes without physical tags"
msgstr "物理的なタグの無い未接続ノード"
+msgid "No tags"
+msgstr "タグ無し"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "''fixme'' や ''FIXME''を含むタグがあります"
@@ -4009,23 +4134,6 @@ msgstr "海岸線の反転: 陸地が左側にありません。"
msgid "Reversed land: land not on left side"
msgstr "陸地の反転: 陸地は左側にない"
-msgid "Wrong number of arguments for bookmark"
-msgstr "ブックマークに対する引数の数が不正です"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "ブックマークエントリ %s の読み取りに失敗しました"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "エラー: ブックマークファイル''{1}'' に予期せぬ行 ''{0}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr "エラー: ブックマークファイル ''{2}'' 内の行 ''{1}'' に不正なダブル値 ''{0}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "次回から表示しない"
@@ -4058,11 +4166,11 @@ msgstr "土地利用"
msgid "{0} node"
msgid_plural "{0} nodes"
-msgstr[0] "{0} 個のノード"
+msgstr[0] "{0}個のノード"
msgid "{0} member"
msgid_plural "{0} members"
-msgstr[0] "{0} 個のメンバー"
+msgstr[0] "{0}件のメンバー"
msgid "public transport"
msgstr "公共交通"
@@ -4089,7 +4197,7 @@ msgid "Internal Server Error"
msgstr "サーバーの内部エラー"
msgid "Bad Request"
-msgstr "不正な要求"
+msgstr "不正なリクエスト"
msgid "Not Found"
msgstr "見つかりません"
@@ -4127,8 +4235,8 @@ msgstr "ヘルプ情報を表示"
msgid "Downloading \"Message of the day\""
msgstr "\"今日のメッセージ\"をダウンロード"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "警告: MOTDの読み出しに失敗しました。{0}の例外が発生しました。"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "MOTDの読み取りに失敗しました。例外は {0} です。"
msgid "Message of the day not available"
msgstr "今日のメッセージはありません"
@@ -4211,7 +4319,7 @@ msgid "Standard unix geometry argument"
msgstr "標準のunix配置引数"
msgid "Download the bounding box"
-msgstr "境界囲みをダウンロード"
+msgstr "指定範囲をダウンロード"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
msgstr "URLで場所をダウンロード（lat=x&lon=y&zoom=zを付加）"
@@ -4220,7 +4328,7 @@ msgid "Open a file (any file type that can be opened with File/Open)"
msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）"
msgid "Download the bounding box as raw GPS"
-msgstr "囲み枠をGPS軌跡としてダウンロード"
+msgstr "指定範囲を生のGPSとしてダウンロード"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
msgstr "URL（lat=x&lon=y&zoom=zの形式）で場所を指定して生のGPSデータをダウンロード"
@@ -4276,10 +4384,10 @@ msgid "Make sure you load some data if you use --selection."
msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。"
msgid "Initializing"
-msgstr "初期化"
+msgstr "初期化中"
msgid "Updating plugins"
-msgstr "プラグインを更新"
+msgstr "プラグインを更新中"
msgid "Installing updated plugins"
msgstr "更新されたプラグインをインストール中"
@@ -4288,13 +4396,13 @@ msgid "Loading early plugins"
msgstr "早期読み込みプラグインのロード中"
msgid "Setting defaults"
-msgstr "デフォルト設定"
+msgstr "デフォルト値を設定中"
msgid "Creating main GUI"
-msgstr "メインGUIを作成します。"
+msgstr "メインGUIを作成中"
msgid "Loading plugins"
-msgstr "プラグインのロード"
+msgstr "プラグインのロード中"
msgid "Unsaved osm data"
msgstr "未保存のOSMデータ"
@@ -4307,7 +4415,7 @@ msgstr "破棄"
msgid "JOSM found {0} unsaved osm data layer. "
msgid_plural "JOSM found {0} unsaved osm data layers. "
-msgstr[0] "まだ保存していないデータレイヤー{0}があります。 "
+msgstr[0] "まだ保存していないデータレイヤーが{0}枚あります。 "
msgid ""
"It looks like JOSM crashed last time. Would you like to restore the data?"
@@ -4325,9 +4433,24 @@ msgstr "表示"
msgid "Tools"
msgstr "ツール"
+msgid "More tools"
+msgstr "その他のツール"
+
+msgid "Data"
+msgstr "データ"
+
+msgid "Selection"
+msgstr "選択"
+
msgid "Presets"
msgstr "プリセット"
+msgid "More..."
+msgstr "その他..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "ウィンドウ"
@@ -4343,11 +4466,23 @@ msgstr "編集ツールバー"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "編集ツールバーの表示切替(例: 垂直方向のツール)"
+msgid "Preset preferences"
+msgstr "プリセット設定"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr "クリックすると設定のタグ付けプリセットタブを開きます"
+
+msgid "Imagery preferences"
+msgstr "画像設定"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "クリックすると設定の画像タブを開きます"
+
msgid "Audio"
msgstr "音声"
-msgid "Hide edit toolbar"
-msgstr "編集ツールバーを隠す"
+msgid "Do not hide toolbar"
+msgstr "ツールバーを非表示にしない"
msgid "Hide this button"
msgstr "このボタンを隠す"
@@ -4355,6 +4490,9 @@ msgstr "このボタンを隠す"
msgid "Click the arrow at the bottom to show it again."
msgstr "下部の矢印をクリックして再表示。"
+msgid "Hide edit toolbar"
+msgstr "編集ツールバーを隠す"
+
msgid "Hide or show this toggle button"
msgstr "表示非表示をこのトグルボタンで指定"
@@ -4362,7 +4500,7 @@ msgid "Move right"
msgstr "右へ移動"
msgid "Map: {0}"
-msgstr "マップ: {0}"
+msgstr "地図: {0}"
msgid "Move left"
msgstr "左へ移動"
@@ -4414,6 +4552,9 @@ msgstr "(オブジェクトなし)"
msgid "User:"
msgstr "ユーザー:"
+msgid "Do not hide status bar"
+msgstr "ステータスバーを非表示にしない"
+
msgid "Layer not in list."
msgstr "レイヤーがリストにありません。"
@@ -4441,19 +4582,6 @@ msgstr "バックグラウンドで処理"
msgid "Click to run job in background"
msgstr "バックグラウンドでジョブを動かすためにクリック"
-msgid "false: the property is explicitly switched off"
-msgstr "偽: 明示的に設定がスイッチオフになっています。"
-
-msgid "true: the property is explicitly switched on"
-msgstr "真: 明示的に設定値がスイッチオンになっています。"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "部分: 違う選択オブジェクトが違う値を有しており、変更しません。"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "変更なし: この設定値を選択したオブジェクトに対して更新しませんでした。"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4474,26 +4602,26 @@ msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
"relation</strong>.</html>"
msgstr ""
-"<html><strong>1 オブジェクト</strong> を<strong>1 リレーション</strong> "
+"<html><strong>1件のオブジェクト</strong>を<strong>1件のリレーション</strong> "
"から削除して良いか確認してください。</html>"
msgid ""
"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
"relations</strong>.</html>"
msgstr ""
-"<html><strong>1 オブジェクト</strong> を<strong>{0} リレーション</strong> "
+"<html><strong>1件のオブジェクト</strong>を<strong>{0}件のリレーション</strong> "
"から削除して良いか確認してください。</html>"
msgid ""
"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
"relations</strong>.</html>"
msgstr ""
-"<html><strong>{0} オブジェクト</strong> を<strong>{1} リレーション</strong> "
+"<html><strong>{0}件のオブジェクト</strong>を<strong>{1}件のリレーション</strong> "
"から削除して良いか確認してください。</html>"
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
-msgstr[0] "{0} 個のオブジェクトを削除中"
+msgstr[0] "{0}件のオブジェクトを削除中"
msgid "Delete objects"
msgstr "オブジェクトを削除"
@@ -4747,29 +4875,47 @@ msgstr "> 最後"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "選択した要素を結合された要素リストの最後にコピー"
+msgid "> before"
+msgstr "> 前へ"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr "選択した要素を、結合された要素リストから選択している最初の要素の前にコピー"
+msgid "> after"
+msgstr "> 後へ"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr "選択した要素を、結合された要素リストから選択している最初の要素の後にコピー"
+msgid "< top"
+msgstr "< 先頭へ"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "相手の選択した要素を、結合された要素リストの先頭にコピー"
+msgid "< bottom"
+msgstr "< 末尾へ"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "相手の選択した要素を、結合された要素リストの最後にコピー"
+msgid "< before"
+msgstr "< 前へ"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー"
+msgid "< after"
+msgstr "< 後へ"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4784,14 +4930,14 @@ msgstr "すべての要素を対象にコピーする"
msgid "Up"
msgstr "上"
-msgid "Move up the selected elements by one position."
-msgstr "同じ位置で選択した要素を上に移動"
+msgid "Move up the selected entries by one position."
+msgstr "選択した項目を1つ上に移動"
msgid "Down"
msgstr "下"
msgid "Move down the selected entries by one position."
-msgstr "同じ位置で選択したエントリを下に移動"
+msgstr "選択した項目を1つ下に移動"
msgid "Remove"
msgstr "削除"
@@ -4823,23 +4969,15 @@ msgstr "<html><strong>{0}</strong> をクリックして自分と相手のエン
msgid "My version ({0} entry)"
msgid_plural "My version ({0} entries)"
-msgstr[0] "自分のバージョン ({0} エントリ)"
+msgstr[0] "自分のバージョン（{0}項目）"
msgid "Merged version ({0} entry)"
msgid_plural "Merged version ({0} entries)"
-msgstr[0] "結合したバージョン ({0} エントリ)"
+msgstr[0] "結合したバージョン（{0}項目）"
msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
-msgstr[0] "相手のバージョン ({0} エントリ)"
-
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。"
-
-msgid "Adjustable {0} not registered yet."
-msgstr "調整可能な {0} はまだ登録されていませんでした。"
+msgstr[0] "相手のバージョン（{0}項目）"
msgid "Node"
msgstr "ノード"
@@ -4973,7 +5111,7 @@ msgid_plural ""
"are shown a dialog to decide how to adapt the relations.<br/><br/>Do you "
"want to continue?"
msgstr[0] ""
-"あなたは{0}個のリレーション、{2}の一部である{1}個のオブジェクトを結合しようとしています。<br/>これらのオブジェクトを結合すると、リレーション"
+"あなたは{0}件のリレーション、{2}の一部である{1}件のオブジェクトを結合しようとしています。<br/>これらのオブジェクトを結合すると、リレーション"
"を壊す可能性があります。<br/>自信がない場合は、この操作をキャンセルしてください。<br/>継続する場合は、次のダイアログでどのようにリレーションを適"
"応させるかを決定してください。<br/><br/>継続しますか？"
@@ -4992,7 +5130,7 @@ msgid ""
"may have unwanted tags.<br/>If you want to continue, you are shown a dialog "
"to fix the conflicting tags.<br/><br/>Do you want to continue?"
msgstr ""
-"あなたは{0}個のオブジェクトを結合しようとしていますが、{1}のタグが競合して使用されています。<br/>オブジェクトを結合させると、結果のオブジェクト"
+"あなたは{0}件のオブジェクトを結合しようとしていますが、{1}のタグが競合して使用されています。<br/>オブジェクトを結合させると、結果のオブジェクト"
"は予期しないタグになる可能性があります。<br/>継続する場合は、次のダイアログで競合するタグを修正してください。<br/><br/>継続しますか？"
msgid "none"
@@ -5045,15 +5183,15 @@ msgstr "先: ..."
msgid "{0} tag"
msgid_plural "{0} tags"
-msgstr[0] "{0} タグ"
+msgstr[0] "{0}件のタグ"
msgid "{0} way"
msgid_plural "{0} ways"
-msgstr[0] "{0} 本のウェイ"
+msgstr[0] "{0}本のウェイ"
msgid "{0} relation"
msgid_plural "{0} relations"
-msgstr[0] "{0} 件のリレーション"
+msgstr[0] "{0}件のリレーション"
msgid "Position {0} is out of range. Current number of members is {1}."
msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}"
@@ -5091,15 +5229,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "キー:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr "<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "値:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
-msgstr "<html>タグの値を入力してください、例）<strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
+msgstr "<html>タグ値を入力してください、例）<strong><tt>check members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5187,10 +5325,10 @@ msgid "Opens the Changeset Manager window for the selected changesets"
msgstr "変更セットマネージャを開く"
msgid "Command Stack"
-msgstr "指示の集積"
+msgstr "コマンドスタック"
msgid "Open a list of all commands (undo buffer)."
-msgstr "全指示のリストを開く（取り消しバッファ）"
+msgstr "全コマンドのリスト（取り消しバッファ）を開く"
msgid "Toggle: {0}"
msgstr "{0}の表示/非表示"
@@ -5227,11 +5365,11 @@ msgstr "上記リストの全てのアイテムを結合するダイアログを
msgid ""
"Set the selected elements on the map to the selected items in the list above."
-msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。"
+msgstr "地図上の選択した要素を、上記リストの選択したアイテムに設定します。"
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
-msgstr[0] "検出された競合が {0} 個あります"
+msgstr[0] "検出された競合が{0}件あります"
msgid "Click to close this dialog and continue editing"
msgstr "クリックしてこのダイアログを閉じ、編集を続ける"
@@ -5402,13 +5540,13 @@ msgid "Way: "
msgstr "ウェイ: "
msgid "Relation: "
-msgstr "リレーション： "
+msgstr "リレーション: "
msgid "deleted-on-server"
msgstr "サーバー上で削除"
msgid "modified"
-msgstr "変更されました"
+msgstr "変更あり"
msgid "filtered/hidden"
msgstr "フィルター/非表示"
@@ -5448,7 +5586,7 @@ msgstr "タグ: "
msgid "{0} Member: "
msgid_plural "{0} Members: "
-msgstr[0] "{0} メンバー: "
+msgstr[0] "{0}件のメンバー: "
msgid " as \"{0}\""
msgstr " ロール \"{0}\""
@@ -5594,13 +5732,13 @@ msgid "Open a list of all loaded layers."
msgstr "レイヤーの一覧"
msgid "Delete the selected layers."
-msgstr "選択したレイヤーを削除"
+msgstr "選択したレイヤーを削除します。"
msgid "Show/hide"
msgstr "表示/隠す"
msgid "Toggle visible state of the selected layer."
-msgstr "選択したレイヤーの表示状態を切り替え"
+msgstr "選択したレイヤーの表示・非表示を切り替えます。"
msgid "Show/hide layer"
msgstr "レイヤー表示/非表示"
@@ -5615,7 +5753,7 @@ msgid "Activate"
msgstr "有効化"
msgid "Activate the selected layer"
-msgstr "選択されたレイヤーを有効化"
+msgstr "選択されたレイヤーを有効化します"
msgid "Activate layer"
msgstr "アクティブレイヤー"
@@ -5645,7 +5783,7 @@ msgid "this layer is not currently active (click to activate)"
msgstr "このレイヤーは現在アクティブではありません（クリックしてアクティブに）"
msgid "Move the selected layer one row up."
-msgstr "選択したレイヤーを一つ上に上げます。"
+msgstr "選択したレイヤーを一つ上に移動します。"
msgid "Move the selected layer one row down."
msgstr "選択したレイヤーを一つ下に移動します。"
@@ -5656,6 +5794,9 @@ msgstr "表示/非表示"
msgid "Information about layer"
msgstr "レイヤーについての情報"
+msgid "Map paint preferences"
+msgstr "地図描画設定"
+
msgid "Map Paint Styles"
msgstr "地図描画スタイル"
@@ -5712,7 +5853,7 @@ msgid "Map Style info"
msgstr "マップスタイル情報"
msgid "Source"
-msgstr "情報ソース"
+msgstr "ソース"
msgid "Title:"
msgstr "タイトル:"
@@ -5738,6 +5879,38 @@ msgstr "このスタイルを利用中？"
msgid "No"
msgstr "いいえ"
+msgid "Object type:"
+msgstr "オブジェクト種別:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "混合"
+
+msgid "Choose the OSM object type"
+msgstr "OSMオブジェクト種別を選択"
+
+msgid "Object ID:"
+msgstr "オブジェクトID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "ダウンロードするオブジェクトのIDを入力"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"オブジェクトIDはカンマまたはスペースで区切ることができます。<br/> 例: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> ミックスモード時は次のようにオブジェクトを指定します: <b>w123, "
+"n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"無効なIDの一覧が指定されました\n"
+"継続できません。"
+
msgid "Relations"
msgstr "リレーション"
@@ -5759,9 +5932,6 @@ msgstr "リレーション: {0}/{1}"
msgid "Relations: {0}"
msgstr "リレーション: {0}"
-msgid "Selection"
-msgstr "選択"
-
msgid "Open a selection list window."
msgstr "選択リストウィンドウを開きます。"
@@ -5786,23 +5956,11 @@ msgstr "選択できません"
msgid "Selection: {0}"
msgstr "選択: {0}"
-msgid "Side buttons"
-msgstr "サイドボタン"
+msgid "Toggle dynamic buttons"
+msgstr "動的ボタンのトグル"
-msgid "Always shown"
-msgstr "常に表示"
-
-msgid "Dynamic"
-msgstr "動的"
-
-msgid "Always hidden"
-msgstr "常に非表示"
-
-msgid "Toggle dynamic buttons"
-msgstr "動的ボタンのトグル"
-
-msgid "Open preferences for this panel"
-msgstr "このパネルの設定を開く"
+msgid "Open preferences for this panel"
+msgstr "このパネルの設定を開く"
msgid "Undock the panel"
msgstr "パネルの取り外し"
@@ -5814,15 +5972,27 @@ msgstr "このパネルを閉じます。左側のツールバーのボタンを
msgid "Click to minimize/maximize the panel content"
msgstr "クリックすることでパネルの内容を最小化/最大化"
+msgid "Side buttons"
+msgstr "サイドボタン"
+
+msgid "Always shown"
+msgstr "常に表示"
+
+msgid "Dynamic"
+msgstr "動的"
+
+msgid "Always hidden"
+msgstr "常に非表示"
+
msgid "Authors"
-msgstr "作者"
+msgstr "編集者"
msgid "Open a list of people working on the selected objects."
msgstr "選択したオブジェクトで作業した人たちのリストを開く"
msgid "{0} Author"
msgid_plural "{0} Authors"
-msgstr[0] "{0}人の作者"
+msgstr[0] "{0}人の編集者"
msgid "Select objects submitted by this user"
msgstr "このユーザーが登録したオブジェクトを選択"
@@ -5830,9 +6000,8 @@ msgstr "このユーザーが登録したオブジェクトを選択"
msgid "Launches a browser with information about the user"
msgstr "ユーザーについての情報付きでブラウザーを起動"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr "警告: 選択されたユーザー {1} のうち、最初の {0} だけに情報ブラウザーを起動します"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
+msgstr "選択された{1}人のうち最初の{0}人分のみ情報ブラウザーを起動しています"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -5857,9 +6026,6 @@ msgstr "妥当性検査ウィンドウを開きます。"
msgid "Validation results"
msgstr "検証結果"
-msgid "Zoom to problem"
-msgstr "問題へズーム"
-
msgid "Fix"
msgstr "修正"
@@ -5888,7 +6054,7 @@ msgid "Fixing errors ..."
msgstr "エラー修正中 ..."
msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr "({0}/{1}) 修正中: ''{2}''"
+msgstr "''{2}''を修正中（{0}/{1}）"
msgid "Updating map ..."
msgstr "地図を更新中 ..."
@@ -6006,9 +6172,6 @@ msgstr "内容を更新"
msgid "Update the changeset content from the OSM server"
msgstr "変更セットの内容をOSMサーバーのものに更新"
-msgid "Show history"
-msgstr "履歴を表示"
-
msgid "Download and show the history of the selected objects"
msgstr "選択されたオブジェクトの履歴をダウンロードして表示"
@@ -6131,7 +6294,7 @@ msgid ""
msgstr "変更セットの作成もしくは保存日時によって選択"
msgid "Select only changesets related to a specific bounding box"
-msgstr "指定した境界囲みに関連する変更セットだけを選択"
+msgstr "指定した矩形範囲に関連する変更セットのみを選択"
msgid "Query open changesets only"
msgstr "開いている変更セットだけを問い合わせる"
@@ -6177,13 +6340,13 @@ msgid "Please enter a valid user ID"
msgstr "有効なユーザーIDを入力してください"
msgid "Invalid user ID"
-msgstr "ユーザー ID が間違っています"
+msgstr "ユーザーIDが無効です"
msgid "Please enter a non-empty user name"
msgstr "ユーザー名には空白以外を指定してください"
msgid "Invalid user name"
-msgstr "ユーザー名が不正です"
+msgstr "ユーザー名が無効です"
msgid "Date: "
msgstr "日付: "
@@ -6222,15 +6385,15 @@ msgstr "不正な日付や時刻の値です"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
-msgstr "特定の指定された範囲での変更セット検索は制限できません。入力が不正です。"
+msgstr "矩形範囲を指定した変更セットの検索ができません。入力値が不正です。"
msgid ""
"<html>Please enter valid longitude/latitude values to restrict<br>the "
"changeset query to a specific bounding box.</html>"
-msgstr "<html>特定の範囲の変更セット検索の際には、<br>正しい緯度・経度を入力してください。</html>"
+msgstr "<html>矩形範囲を指定して変更セットを検索するには、<br>正しい緯度・経度を入力してください。</html>"
msgid "Invalid bounding box"
-msgstr "不正な境界囲みです"
+msgstr "不正な矩形範囲指定"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
@@ -6300,12 +6463,12 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>現在のマップビュー内の変更セットをダウンロード</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
-msgstr "警告: 設定 ''{0}''に予期しない値''{1}''が指定されました。既定のクエリーに戻します。"
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
+msgstr "''{0}''の設定値が想定外の値で''{1}''になっています。デフォルト値が使用されます。"
msgid "Cannot create changeset query for open changesets of anonymous user"
-msgstr "匿名ユーザーで変更セット開始要求が作成できません"
+msgstr "匿名ユーザーで変更セット開始リクエストが作成できません"
msgid "Basic"
msgstr "基本"
@@ -6364,37 +6527,49 @@ msgid ""
msgstr "変更セットクエリは現状では常に ''{0}'' に投稿されます。以下のURLに含まれるホスト、ポート、パスは無視されます。"
msgid "This changeset query URL is invalid"
-msgstr "不正な変更セットクエリURLです"
+msgstr "この変更セットクエリURLは不正です"
-msgid "Select objects for which to change properties."
-msgstr "プロパティを変更したいオブジェクトを選択します。"
+msgid "Discardable key: selection Foreground"
+msgstr "削除可能なキー: 選択の前景色"
-msgid "Properties/Memberships"
-msgstr "プロパティ/メンバー"
+msgid "Discardable key: selection Background"
+msgstr "削除可能なキー: 選択の背景色"
-msgid "Properties for selected objects."
-msgstr "選択したオブジェクトのプロパティ"
+msgid "Discardable key: foreground"
+msgstr "削除可能なキー: 前景色"
+
+msgid "Discardable key: background"
+msgstr "削除可能なキー: 背景色"
msgid "<different>"
msgstr "<差異あり>"
+msgid "Select objects for which to change tags."
+msgstr "タグを変更するオブジェクトを選択してください。"
+
+msgid "Tags/Memberships"
+msgstr "タグ／所属"
+
+msgid "Tags for selected objects."
+msgstr "選択されたオブジェクトのタグです。"
+
msgid "Member Of"
msgstr "メンバー"
msgid "Position"
msgstr "位置"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "プロパティ: {0} / メンバー: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "タグ: {0}件／所属: {1}件"
-msgid "Properties / Memberships"
-msgstr "プロパティ/メンバー"
+msgid "Tags / Memberships"
+msgstr "タグ／所属"
msgid "Delete the selected key in all objects"
msgstr "すべてのオブジェクトの選択したキーの削除"
-msgid "Delete Properties"
-msgstr "プロパティの削除"
+msgid "Delete Tags"
+msgstr "タグを削除"
msgid "Change relation"
msgstr "リレーションの変更"
@@ -6408,17 +6583,17 @@ msgstr "本当にリレーション{0}から選択分を削除しますか？"
msgid "Add a new key/value pair to all objects"
msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
-msgid "Add Property"
-msgstr "プロパティの追加"
+msgid "Add Tag"
+msgstr "タグを追加"
msgid "Edit the value of the selected key for all objects"
msgstr "すべてのオブジェクトの選択したキーの値の編集"
-msgid "Edit Properties"
-msgstr "プロパティの編集"
+msgid "Edit Tags"
+msgstr "タグを編集"
msgid "Go to OSM wiki for tag help (F1)"
-msgstr "タグのヘルプについて、OSM wiki を表示します(F1)"
+msgstr "タグのヘルプのためにOSM wikiを表示（F1）"
msgid "Launch browser with wiki help for selected object"
msgstr "選択されたオブジェクトのためのwikiヘルプのためにブラウザーを起動"
@@ -6467,7 +6642,7 @@ msgstr[0] "値を変更しますか？"
msgid "This will change {0} object."
msgid_plural "This will change up to {0} objects."
-msgstr[0] "これにより {0} オブジェクトが変更されます"
+msgstr[0] "最大{0}件のオブジェクトが変更されます"
msgid "An empty value deletes the tag."
msgstr "空の値でタグを削除します。"
@@ -6487,23 +6662,17 @@ msgstr ""
msgid "Change properties of up to {0} object"
msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "{0}個のオブジェクトのプロパティーの変更"
+msgstr[0] "{0}件のオブジェクトのプロパティ変更"
msgid "Use English language for tag by default"
msgstr "デフォルトではタグに英語を使用してください"
-msgid "Paste tag"
-msgstr "タグを貼り付け"
-
-msgid "Paste value"
-msgstr "値を貼り付け"
-
msgid "Add value?"
msgstr "値を追加しますか？"
msgid "This will change up to {0} object."
msgid_plural "This will change up to {0} objects."
-msgstr[0] "これにより、{0}個のオブジェクトが変更されます。"
+msgstr[0] "最大{0}件のオブジェクトが変更されます。"
msgid "Please select a key"
msgstr "キーを選択してください"
@@ -6526,9 +6695,15 @@ msgstr "0から{0}までの間の整数を入力してください"
msgid "Recently added tags"
msgstr "最近追加したタグ"
+msgid "Choose recent tag {0}"
+msgstr "最近のタグ {0} を選択"
+
msgid "Use this tag again"
msgstr "このタグを再使用"
+msgid "Apply recent tag {0}"
+msgstr "最近のタグ {0} を適用"
+
msgid "The key ''{0}'' is already used"
msgstr "''{0}''キーはすでに使われています"
@@ -6565,20 +6740,20 @@ msgstr "リレーションは削除されました"
msgid "Downloading relation {0}"
msgstr "リレーション {0} をダウンロード中"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr "警告:タスクがキャンセルされたため、例外は無視されました。例外は:{0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "タスクがキャンセルされたので例外を無視します。例外: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
-msgstr[0] "{0}個の不完全なオブジェクトをダウンロード中"
+msgstr[0] "{0}件の不完全なオブジェクトをダウンロード中"
msgid "Downloading {0} incomplete child of relation ''{1}''"
msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "リレーション ''{1}'' に含まれる {0} 個のオブジェクトをダウンロード中"
+msgstr[0] "リレーション''{1}''に含まれる{0}件のオブジェクトをダウンロード中"
msgid "Downloading {0} incomplete child of {1} parent relations"
msgid_plural "Downloading {0} incomplete children of {1} parent relations"
-msgstr[0] "{1}個の親リレーションに属する{0}個の不完全な子リレーションをダウンロード中"
+msgstr[0] "{1}件の親リレーションに属する{0}件の不完全な子リレーションをダウンロード中"
msgid "Download relations"
msgstr "リレーションをダウンロード"
@@ -6605,7 +6780,7 @@ msgid "New Relation"
msgstr "新しいリレーション"
msgid "Focus Relation Editor with relation ''{0}'' in layer ''{1}''"
-msgstr "レイヤー''{1}''中のリレーション''{0}''をリレーションエディターに表示"
+msgstr "レイヤー''{1}''中のリレーション''{0}''をリレーション編集画面に表示"
msgid "Relation Editor: {0}"
msgstr "リレーション編集画面: {0}"
@@ -6624,6 +6799,9 @@ msgstr "削除し、リレーションをクリーンナップ"
msgid "Ignore them, leave relation as is"
msgstr "無視し、リレーションはそのまま"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr "恐れ入りますが、ショートカット \"{0}\" はリレーション編集ダイアログでは有効になりません。"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6666,7 +6844,7 @@ msgstr "現在選択中のオブジェクトを参照しているリレーショ
msgid ""
"Select relation members which refer to {0} objects in the current selection"
-msgstr "選択中の{0}個のオブジェクトを参照しているリレーションのメンバーを選択"
+msgstr "選択中の{0}件のオブジェクトを参照しているリレーションのメンバーを選択"
msgid "Select objects for selected relation members"
msgstr "選択中のリレーションメンバーのオブジェクトを選択"
@@ -6755,13 +6933,13 @@ msgid "Yes, save the changes and close"
msgstr "はい、変更を保存してクローズ"
msgid "Click to save the changes and close this relation editor"
-msgstr "変更を保存してリレーションエディターを閉じるときはクリックしてください"
+msgstr "変更を保存してリレーション編集画面を閉じるときはクリックしてください"
msgid "No, discard the changes and close"
msgstr "いいえ、変更を破棄して閉じます"
msgid "Click to discard the changes and close this relation editor"
-msgstr "変更を破棄してこのリレーションエディターを閉じる場合はクリックしてください"
+msgstr "変更を破棄してこのリレーション編集画面を閉じる場合はクリックしてください"
msgid "Cancel, continue editing"
msgstr "キャンセル、編集を継続"
@@ -6797,7 +6975,7 @@ msgstr "ロールを適用"
msgid "You are setting an empty role on {0} object."
msgid_plural "You are setting an empty role on {0} objects."
-msgstr[0] "{0}個のオブジェクトに空のロールを設定しようとしています。"
+msgstr[0] "{0}件のオブジェクトに空のロールを設定しようとしています。"
msgid "This is equal to deleting the roles of these objects."
msgstr "これはオブジェクトからロールを削除することと同じことです。"
@@ -6888,6 +7066,25 @@ msgstr "ウェイは次のリレーションメンバーに接続されていま
msgid "way is not connected to previous or next relation member"
msgstr "ウェイは前や後のリレーションメンバーに接続されていません"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "ブックマークに対する引数の数が誤っています"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "ブックマークエントリ %s の読み取りに失敗しました"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "ブックマークファイル ''{1}'' に想定外の行 ''{0}'' があります"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr "ブックマークファイル ''{2}'' の行 ''{1}'' に不正な double 値 ''{0}'' があります"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
+
msgid "Bookmarks"
msgstr "ブックマーク"
@@ -6942,19 +7139,16 @@ msgid ""
msgstr "www.openstreetmap.orgのURL（ダウンロードしたい範囲を表示してパーマリンクを貼付けてください）"
msgid "Bounding Box"
-msgstr "境界囲み"
+msgstr "矩形範囲指定"
msgid "The string ''{0}'' is not a valid double value."
-msgstr "文字列 ''{0}'' は正しいダブル値ではありません。"
+msgstr "文字列 ''{0}'' は正しいdouble値ではありません。"
msgid "Value for latitude in range [-90,90] required."
-msgstr "緯度の値は、[-90,90]の範囲にある必要があります。"
+msgstr "緯度の値は[-90,90]の範囲でなければなりません。"
msgid "Value for longitude in range [-180,180] required."
-msgstr "経度の値は[-180,180]の範囲で必須です。"
-
-msgid "Paste URL from clipboard"
-msgstr "クリップボードからURLを貼り付け"
+msgstr "経度の値は[-180,180]の範囲でなければなりません。"
msgid "Data Sources and Types:"
msgstr "データのソースと種別:"
@@ -6963,22 +7157,23 @@ msgid "OpenStreetMap data"
msgstr "OpenStreetMapデータ"
msgid "Select to download OSM data in the selected download area."
-msgstr "選択されたダウンロードエリア内のOSMデータを選択してダウンロード。"
+msgstr "選択すると指定されたダウンロード領域内のOSMデータをダウンロードします。"
msgid "Raw GPS data"
msgstr "生のGPSデータ"
msgid "Select to download GPS traces in the selected download area."
-msgstr "選択されたダウンロードエリア内のGPSトレースを選択してダウンロード。"
+msgstr "選択すると指定されたダウンロード領域内のGPSトレースをダウンロードします。"
msgid "Download as new layer"
-msgstr "新しいレイヤーとしてダウンロードする"
+msgstr "新しいレイヤーとしてダウンロード"
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
-"<html>選択して新しいデータレイヤーにデータをダウンロード。<br>選択解除して現在の有効なデータレイヤーにダウンロード。</html>"
+"<html>選択すると新しいデータレイヤーにデータをダウンロードします。<br>選択解除すると現在のアクティブなデータレイヤーにダウンロードします。</h"
+"tml>"
msgid "Open this dialog on startup"
msgstr "起動時にこのダイアログを開く"
@@ -6993,25 +7188,25 @@ msgstr ""
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
"map, wheel or +/- to zoom."
-msgstr "左クリック＆ドラッグでエリアを選択、矢印キーと右ドラッグで地図のスクロール、ホイールと+/-キーでズーム。"
+msgstr "左クリック＆ドラッグで領域を選択、矢印キーと右ドラッグで地図のスクロール、ホイールと+/-キーでズーム。"
msgid "No area selected yet"
msgstr "まだエリアが選択されていません"
msgid "Download area too large; will probably be rejected by server"
-msgstr "ダウンロードするエリアが広すぎます; サーバーから拒否されるでしょう"
+msgstr "ダウンロード領域が広すぎます。サーバーから拒否されるでしょう"
msgid "Download area ok, size probably acceptable to server"
msgstr "ダウンロード領域はOKです。指定のサイズはサーバーに受け入れられるでしょう"
msgid "Click to close the dialog and to abort downloading"
-msgstr "クリックしてダイアログを閉じ、ダウンロードを中断"
+msgstr "クリックするとダイアログを閉じてダウンロードを中止"
msgid "Click to download the currently selected area"
-msgstr "クリックして、現在選択されている領域をダウンロード"
+msgstr "クリックすると現在選択されている領域をダウンロード"
msgid "Please select a download area first."
-msgstr "最初にダウンロードエリアを選択してください。"
+msgstr "最初にダウンロード領域を選択してください。"
msgid ""
"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is "
@@ -7027,21 +7222,8 @@ msgstr "参照元（親リレーション）をダウンロード"
msgid "Download object"
msgstr "オブジェクトをダウンロード"
-msgid "Object type:"
-msgstr "オブジェクト種別:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "混合"
-
-msgid "Choose the OSM object type"
-msgstr "OSMオブジェクト種別を選択"
-
-msgid "Object ID:"
-msgstr "オブジェクトID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "ダウンロードするオブジェクトのIDを入力"
+msgid "Start downloading"
+msgstr "ダウンロードを開始"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7051,28 +7233,9 @@ msgstr "このオブジェクトを参照しているもの（親リレーショ
msgid "Select if the members of a relation should be downloaded as well"
msgstr "リレーションのメンバーを一緒にダウンロードする場合は選択してください"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"オブジェクトIDはカンマまたはスペースで区切ることができます。<br/> 例: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> ミックスモード時は次のようにオブジェクトを指定します: <b>w123, "
-"n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "参照元（親リレーションやウェイ）をダウンロード"
-msgid "Start downloading"
-msgstr "ダウンロードを開始"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"不適切なIDリストが指定されました\n"
-"オブジェクトをダウンロードできません。"
-
msgid "Class Type"
msgstr "クラス種別"
@@ -7119,9 +7282,7 @@ msgid "JOSM Help Browser"
msgstr "JOSM ヘルプブラウザー"
msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-"Copy text \t\r\n"
-"CSS ファイル''help-browser.css'' が読み込めません。例外コード: {0}"
+msgstr "CSS ファイル''help-browser.css'' が読み込めません。例外コード: {0}"
msgid ""
"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
@@ -7183,8 +7344,8 @@ msgstr "次のページへ"
msgid "Go to the JOSM help home page"
msgstr "JOSM ヘルプホームページへ"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "警告: HTML文書に悪いロケーションが指定されています。例外は{0}です。"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "HTMLドキュメント中の場所が不正です。例外の内容: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "ヘルプページのオープンに失敗。ターゲットURLが空です。"
@@ -7282,6 +7443,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "変更セットのコメント"
+
msgid "Changeset info"
msgstr "変更セット情報"
@@ -7384,8 +7548,8 @@ msgstr ""
msgid "Object still in use"
msgstr "オブジェクトはまだ使われています"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "エラーヘッダー \"{0}\" が想定パターンと一致しません"
msgid "Upload"
msgstr "アップロード"
@@ -7405,6 +7569,12 @@ msgstr "アップロードする変更の概略コメントを入力してくだ
msgid "Enter an upload comment"
msgstr "アップロード時のコメントを入力"
+msgid "Specify the data source for the changes:"
+msgstr "変更の元となるデータのソースを指定してください。"
+
+msgid "Enter a source"
+msgstr "ソースを入力してください"
+
msgid "Changeset id:"
msgstr "変更セットID:"
@@ -7471,9 +7641,8 @@ msgid "Closing changeset {0}"
msgstr "変更セット {0} を閉じています"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
-msgstr "警告: 信用証明ダイアログを常時トップに配置するのに失敗。セキュリティ例外を捕捉しました。"
+"Failed to put Credential Dialog always on top. Caught security exception."
+msgstr "認証ダイアログを常に前面に設定できませんでした。セキュリティ例外が発生しました。"
msgid "Enter credentials for OSM API"
msgstr "OSM API用の認証を入力"
@@ -7547,11 +7716,10 @@ msgid "Unpacking {0} into {1}"
msgstr "{0}を{1}に展開中"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"警告: ファイル ''{0}'' をダウンロードできません。ダウンロードのリンク ''{1}'' "
-"が有効なURLではありません。ダウンロードをスキップします。"
+"ファイル''{0}''をダウンロードできません。ダウンロードリンク''{1}''が有効なURLではありません。ダウンロードをスキップします。"
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -7565,9 +7733,8 @@ msgid "Missing user identity"
msgstr "ユーザー認証に失敗しました"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
-msgstr "警告: 現在のJOSMユーザーのユーザー情報参照に失敗。例外コード: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
+msgstr "現在のJOSMユーザー情報の取得に失敗しました。例外: {0}"
msgid "Download objects"
msgstr "オブジェクトをダウンロード"
@@ -7617,10 +7784,10 @@ msgid "Saving layer to ''{0}'' ..."
msgstr "レイヤーを ''{0}'' に保存中..."
msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr "未保存の変更 - 終了前に保存/アップロード？"
+msgstr "保存されていない変更があります - 終了前に保存/アップロードしますか？"
msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr "未保存の変更 - 削除前に保存/アップロード？"
+msgstr "未保存の変更 - 削除前に保存/アップロードしますか？"
msgid "Uploading and saving modified layers ..."
msgstr "修正されたレイヤーをアップロード、保存中 ..."
@@ -7632,7 +7799,7 @@ msgid_plural ""
"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
"discard the modifications.<br>Layers with conflicts:</html>"
msgstr[0] ""
-"<html>{0} レイヤーに未解決の競合があります。<br>最初に解決するか修正を破棄してください。<br>競合のあるレイヤー:</html>"
+"<html>{0} レイヤーに未解決の競合があります。<br>先に解決するか、修正を破棄するかしてください。<br>競合のあるレイヤー:</html>"
msgid "Unsaved data and conflicts"
msgstr "保存されていないデータと競合"
@@ -7661,9 +7828,8 @@ msgid_plural ""
"written.<br>Either select another file for each of them or discard the "
"changes.<br>Layers with non-writable files:</html>"
msgstr[0] ""
-"<html>{0} "
-"個のレイヤーを保存する必要がありますが、<br>対応するファイルに書き込めません。<br>他のファイルを選択するか、変更を破棄してください。<br>ファイ"
-"ル書き込みできないレイヤー:</html>"
+"<html>{0}枚のレイヤーを保存する必要がありますが、<br>対応するファイルに書き込めません。<br>他のファイルを選択するか、変更を破棄してくださ"
+"い。<br>ファイル書き込みできないレイヤー:</html>"
msgid "Unsaved data non-writable files"
msgstr "書き込み不可なファイルのためデータは保存されませんでした"
@@ -7784,12 +7950,6 @@ msgstr "変更されたプリミティブをアップロード"
msgid "Please revise upload comment"
msgstr "アップロードコメントを修正してください"
-msgid "Revise"
-msgstr "修正"
-
-msgid "Continue as is"
-msgstr "そのまま続行"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7797,10 +7957,29 @@ msgid ""
"/>to understand what is going on!<br /><br />If you spend a minute now to "
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-"あなたが投稿したアップロードコメントは、<i>空白</i> か <i>とても短い</i> です。<br /><br "
+"あなたが投稿したアップロードコメントは、<i>空白</i>か<i>とても短い</i>です。<br /><br "
"/>これは技術的には問題ありませんが、何が行われたかを理解するために、意味のある変更セットのコメントに頼っている、<br "
"/>この領域を監視している多くのユーザーのことを考えてみてください。<br "
-"/>あなたが行った変更について説明するためにもう少し時間を使っていただければ、他の多くのマッパーが<br />もう少し楽になるでしょう。"
+"/>あなたが行った変更について説明することにもう少し時間を割いて下されば、他の多くのマッパーが<br />もう少し快適になるでしょう。"
+
+msgid "Please specify a changeset source"
+msgstr "変更セットのソースを指定してください"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"あなたは変更を反映するソースを明記していません。<br />これは技術的には問題ありませんが、これは他の人がデータの出典を理解する<br "
+"/>上で役立つ情報です。<br /><br />あなたが行った変更について説明することにもう少し時間を割いて下されば、他の多くのマッパーが<br "
+"/>もう少し快適になるでしょう。"
+
+msgid "Revise"
+msgstr "修正"
+
+msgid "Continue as is"
+msgstr "そのまま続行"
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "前のダイアログに戻ってもっと内容が分かりやすいコメントを入力する"
@@ -7817,6 +7996,20 @@ msgstr "最初に正しいチャンクサイズを入力してください"
msgid "Illegal chunk size"
msgstr "不正なチャンクサイズ"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] "<html>変更セットのタグに空のキー／値が存在します。<br>{0}<br>継続しますか？</html>"
+
+msgid "Empty metadata"
+msgstr "メタデータが空欄です"
+
msgid "Cancel the upload and resume editing"
msgstr "アップロードをキャンセルして編集に戻る"
@@ -7824,9 +8017,9 @@ msgid "Tags of changeset {0}"
msgstr "変更セット {0} のタグ"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
-msgstr "警告 : オブジェクト ''{0}'' はサーバーから既に削除されています。このオブジェクトをスキップしてもう一度アップロードします。"
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
+msgstr "オブジェクト''{0}''が既にサーバー上で削除されています。このオブジェクトをスキップしてアップロードを再試行します。"
msgid "Preparing objects to upload ..."
msgstr "アップロードのためにオブジェクトを準備中..."
@@ -7854,7 +8047,7 @@ msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
msgstr[0] ""
-"<strong>{0}個のオブジェクト</strong>を<strong>1つの変更セット</strong>としてアップロードします"
+"<strong>{0}件のオブジェクト</strong>を<strong>1件の変更セット</strong>としてアップロードします"
msgid ""
"Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using "
@@ -7863,14 +8056,14 @@ msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>1 request</strong>"
msgstr[0] ""
-"<strong>{0}個のオブジェクト</strong>を<strong>1つの変更セット</strong>として<strong>1 "
-"回のリクエスト</strong>でアップロードします"
+"<strong>{0}件のオブジェクト</strong>を<strong>1件の変更セット</strong>として<strong>1回のリクエスト</st"
+"rong>でアップロードします"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>{1} requests</strong>"
msgstr ""
-"<strong>{0}個のオブジェクト</strong>を<strong>1つの変更セット</strong>として<strong>{1}回のリクエスト</"
+"<strong>{0}件のオブジェクト</strong>を<strong>1件の変更セット</strong>として<strong>{1}回のリクエスト</"
"strong>でアップロードします"
msgid "advanced configuration"
@@ -7881,15 +8074,15 @@ msgid ""
"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
"proceed with <strong>multiple changesets</strong>"
msgstr ""
-"オブジェクト数（{0}個）がサーバー ''{2}'' "
-"での上限（{1}個）に達しました。<strong>複数の変更セット</strong>を処理する方法を<a href=\"urn:advanced-"
+"オブジェクト数（{0}件）がサーバー ''{2}'' "
+"での上限（{1}件）に達しました。<strong>複数の変更セット</strong>を処理する方法を<a href=\"urn:advanced-"
"configuration\">設定</a>してください。"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>multiple "
"changesets</strong> using <strong>{1} requests</strong>"
msgstr ""
-"<strong>{0}個のオブジェクト</strong>を<strong>複数の変更セット</strong>として<strong>{1}回のリクエスト</"
+"<strong>{0}件のオブジェクト</strong>を<strong>複数の変更セット</strong>として<strong>{1}回のリクエスト</"
"strong>でアップロードします"
msgid "Uploading data for layer ''{0}''"
@@ -7923,7 +8116,7 @@ msgstr ""
msgid "There is {0} object left to upload."
msgid_plural "There are {0} objects left to upload."
-msgstr[0] "アップロードするオブジェクトが {0} 件残っています。"
+msgstr[0] "アップロードするオブジェクトが{0}件残っています。"
msgid ""
"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
@@ -7950,26 +8143,27 @@ msgstr "リレーション''{0}''はすでに削除されています。除外
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "オブジェクト ''{0}'' は既に削除されています。アップロード中のオブジェクトをスキップします。"
-msgid "Warning: {0}"
-msgstr "警告: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
-msgstr[0] "{0}個のオブジェクトをアップロード中..."
+msgstr[0] "{0}件のオブジェクトをアップロード中..."
msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr "アップロードがキャンセルされたため捕捉した例外を無視します。例外: {0}"
+msgid "Upload successful!"
+msgstr "アップロードに成功しました。"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
-msgstr "<html><strong>現在の選択から</strong>修正されたオブジェクトをマークしてサーバーにアップロード。</html>"
+msgstr ""
+"<html>サーバーにアップロードする変更されたオブジェクトを<strong>現在選択しているものから</strong>マークしてください。</html>"
msgid ""
"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
"server.</html>"
-msgstr "<html><strong>ローカルで削除されたオブジェクト</strong>をマークしてサーバーから削除。</html>"
+msgstr "<html>サーバーから削除する<strong>ローカルで削除されたオブジェクト</strong>をマークしてください。</html>"
msgid "Select objects to upload"
msgstr "アップロードするオブジェクトを選択"
@@ -7977,14 +8171,14 @@ msgstr "アップロードするオブジェクトを選択"
msgid "Cancel uploading"
msgstr "アップロードをキャンセル"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr "警告：設定のキー''{0}''に予期しない値 ''{1}''を受け取りました。"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr "キー''{0}''に想定外の値''{1}''が設定されています"
msgid "Please select the upload strategy:"
msgstr "アップロード方式を選択してください:"
msgid "Upload data in one request"
-msgstr "1リクエストでデータをアップロード"
+msgstr "1回のリクエストでデータをアップロード"
msgid "Upload data in chunks of objects. Chunk size: "
msgstr "オブジェクトをいくつかの塊にして、データをアップロードします。チャンクサイズ： "
@@ -7997,7 +8191,7 @@ msgid ""
"upload {0} objects. Which strategy do you want to use?</html>"
msgstr ""
"<html> "
-"{0}個のオブジェクトをアップロードするには、<strong>複数の変更セット</strong>が必要です。どんな方法をとりますか？</html>"
+"{0}件のオブジェクトをアップロードするには、<strong>複数の変更セット</strong>が必要です。どんな方法をとりますか？</html>"
msgid "Fill up one changeset and return to the Upload Dialog"
msgstr "1つの変更セットにまとめて、アップロード画面に戻る。"
@@ -8006,24 +8200,24 @@ msgid "Open and use as many new changesets as necessary"
msgstr "新しい変更セットを必要なだけ開いて使用する"
msgid "Upload in one request not possible (too many objects to upload)"
-msgstr "一回の要求でアップロードすることはできません（アップロードするオブジェクトが多すぎる）"
+msgstr "1回のリクエストでアップロードすることはできません（アップロードするオブジェクトが多すぎる）"
msgid ""
"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
"size {1} on server ''{2}'' is exceeded.</html>"
msgstr ""
-"<html> {0} 個のオブジェクトが1つの要求でアップロードできません。<br> これは、サーバー ''{2}'' の最大変更セットサイズである "
-"{1} を超えているためです。</html>"
+"<html>{0}件のオブジェクトを1回のリクエストでアップロードできません。<br>サーバー''{2}''の変更セットの上限{1}件を超えています。</"
+"html>"
msgid "(1 request)"
-msgstr "(1 リクエスト)"
+msgstr "(1回のリクエスト)"
msgid "(# requests unknown)"
-msgstr "(# 不明なリクエスト)"
+msgstr "(リクエスト回数不明)"
msgid "({0} request)"
msgid_plural "({0} requests)"
-msgstr[0] "({0} リクエスト)"
+msgstr[0] "({0}回のリクエスト)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
msgstr "不正なチャンクサイズ <= 0。1より大きい整数を入力してください"
@@ -8048,15 +8242,15 @@ msgstr "削除するオブジェクト:"
msgid "{0} object to add:"
msgid_plural "{0} objects to add:"
-msgstr[0] "追加するオブジェクトの個数: {0}"
+msgstr[0] "追加するオブジェクト{0}件:"
msgid "{0} object to modify:"
msgid_plural "{0} objects to modify:"
-msgstr[0] "変更するオブジェクトの個数: {0}"
+msgstr[0] "変更するオブジェクト{0}件:"
msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
-msgstr[0] "削除するオブジェクトの個数: {0}"
+msgstr[0] "削除するオブジェクト{0}件:"
msgid "Customize Color"
msgstr "配色のカスタマイズ"
@@ -8071,11 +8265,11 @@ msgid "Name: {0}"
msgstr "名前: {0}"
msgid "Description: {0}"
-msgstr "記述: {0}"
+msgstr "説明: {0}"
msgid "{0} track"
msgid_plural "{0} tracks"
-msgstr[0] "{0} トラック"
+msgstr[0] "{0}本のトラック"
msgid "Description"
msgstr "説明"
@@ -8091,18 +8285,18 @@ msgstr "長さ: {0}"
msgid "{0} route, "
msgid_plural "{0} routes, "
-msgstr[0] "{0}ルート, "
+msgstr[0] "{0}本のルート、 "
msgid "{0} waypoint"
msgid_plural "{0} waypoints"
-msgstr[0] "{0} ウェイポイント"
+msgstr[0] "{0}件のウェイポイント"
msgid "gps point"
msgstr "GPSポイント"
msgid "{0} track, "
msgid_plural "{0} tracks, "
-msgstr[0] "{0} トラック "
+msgstr[0] "{0}本のトラック、 "
msgid "Save GPX file"
msgstr "GPXファイルの保存"
@@ -8119,7 +8313,7 @@ msgstr "次のマーカー"
msgid "Jump to next marker"
msgstr "次のマーカーにジャンプ"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "前のマーカー"
msgid "Jump to previous marker"
@@ -8152,12 +8346,12 @@ msgstr "バージョン {0}"
msgid "Merging layers"
msgstr "レイヤーを併合"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "バージョン0.6と0.5のデータを0.5に混合します"
msgid "{0} deleted"
msgid_plural "{0} deleted"
-msgstr[0] "{0} を削除しました"
+msgstr[0] "{0}件を削除しました"
msgid "{0} consists of:"
msgstr "{0} の構成は次の通りです。"
@@ -8270,6 +8464,9 @@ msgstr "ズームレベルを上げて詳細を見る"
msgid "No tiles at this zoom level"
msgstr "このズームレベルではタイルがありません"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "TMSレイヤー（{0}）、ズーム{1}をダウンロード中"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326とメルカトル図法はサポートされています"
@@ -8289,14 +8486,14 @@ msgid "WMS layer ({0}), automatically downloading in zoom {1}"
msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
+msgstr "WMS レイヤー ({0}), 倍率 {1} でダウンロード"
msgid "Download visible tiles"
msgstr "見えるタイルのダウンロード"
msgid ""
"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
+msgstr "リクエストされた範囲は大きすぎます。もう少し倍率を拡大するか、解像度を変更してください。"
msgid "Change resolution"
msgstr "解像度の変更"
@@ -8307,6 +8504,9 @@ msgstr "誤ったタイルのリロード"
msgid "Alpha channel"
msgstr "アルファチャンネル"
+msgid "Automatically change resolution"
+msgstr "自動的に解像度を変更"
+
msgid "Set WMS Bookmark"
msgstr "WMSブックマークをセット"
@@ -8320,7 +8520,7 @@ msgid "Supported projections are: {0}"
msgstr "サポートしている投映法は {0} です。"
msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
+msgstr "WMSファイルのバージョンが未サポートです。{1}でなければなりませんが、{0}でした。"
msgid "Save WMS file"
msgstr "WMSファイルを保存"
@@ -8426,7 +8626,7 @@ msgid "Correlate"
msgstr "関連付け"
msgid "Invalid timezone"
-msgstr "不正なタイムゾーン"
+msgstr "タイムゾーンが無効です"
msgid "Invalid offset"
msgstr "不正なオフセット"
@@ -8443,7 +8643,7 @@ msgstr "gpx が選択されていません"
msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
msgid_plural ""
"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
-msgstr[0] "<html><b>{1}</b> 枚中 <b>{0}</b> 枚の写真がGPXトラックに一致しました。</html>"
+msgstr[0] "<html><b>{1}</b>枚中 <b>{0}</b>枚の写真がGPXトラックに一致しました。</html>"
msgid "Timezone: {0}"
msgstr "タイムゾーン: {0}"
@@ -8456,7 +8656,7 @@ msgstr "秒: {0}"
msgid "(Time difference of {0} day)"
msgid_plural "Time difference of {0} days"
-msgstr[0] "{0} 日の時差"
+msgstr[0] "{0}日の時差"
msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
@@ -8509,20 +8709,17 @@ msgstr "EXIFからGPS位置を取得"
msgid "Starting directory scan"
msgstr "ディレクトリ走査の開始"
-msgid "One of the selected files was null"
-msgstr "選択されたファイルのひとつがヌルでした"
-
msgid "Read photos..."
msgstr "写真を取り込む"
msgid "Reading {0}..."
-msgstr "{0}を読み込んでいます ..."
+msgstr "{0}を読み込み中..."
msgid "Unable to get canonical path for directory {0}\n"
msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
msgid "Scanning directory {0}"
-msgstr "ディレクトリ {0} を走査"
+msgstr "ディレクトリ {0} を走査中"
msgid "Found null file in directory {0}\n"
msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
@@ -8530,16 +8727,19 @@ msgstr "ディレクトリ {0}に中身のないファイルが見つかりま
msgid "Error while getting files from directory {0}\n"
msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
+msgid "One of the selected files was null"
+msgstr "選択されたファイルのひとつがヌルでした"
+
msgid "Geotagged Images"
msgstr "ジオタグのついた画像"
msgid "{0} image loaded."
msgid_plural "{0} images loaded."
-msgstr[0] "{0} の画像がロードされました。"
+msgstr[0] "{0}件の画像がロードされました。"
msgid "{0} was found to be GPS tagged."
msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "GPSタグが必要なものが {0}見つかりました。"
+msgstr[0] "GPSタグが必要なものが{0}件見つかりました。"
msgid "Delete image file from disk"
msgstr "ディスクから画像ファイルを削除"
@@ -8585,6 +8785,12 @@ msgstr "次へ"
msgid "Show next Image"
msgstr "次の画像を表示"
+msgid "Show first Image"
+msgstr "最初の画像を表示"
+
+msgid "Show last Image"
+msgstr "最後の画像を表示"
+
msgid "Center view"
msgstr "中央表示"
@@ -8599,14 +8805,14 @@ msgid ""
"Altitude: {0} m"
msgstr ""
"\n"
-"高度: {0} m"
+"高度: {0}m"
msgid ""
"\n"
"{0} km/h"
msgstr ""
"\n"
-"{0} km/h"
+"{0}km/h"
msgid ""
"\n"
@@ -8665,9 +8871,6 @@ msgstr ""
"<html>処理していない GPS "
"データを地図データとしてアップロードする行為は有害なことです。<br>トレースデータをアップする場合は、次の場所から行ってください。</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "トラック描画をカスタマイズ"
@@ -8680,8 +8883,11 @@ msgstr "終了日時"
msgid "No timestamp"
msgstr "タイムスタンプなし"
-msgid "Download from OSM along this track"
-msgstr "このトラックに沿ってOSMからダウンロード"
+msgid "Select to download OSM data."
+msgstr "ダウンロードするOSMデータを選択してください。"
+
+msgid "Select to download GPS traces."
+msgstr "ダウンロードするGPSトレースを選択してください。"
msgid "Download everything within:"
msgstr "次の範囲内の全てをダウンロード:"
@@ -8707,14 +8913,18 @@ msgstr "ウェイポイントのみ"
msgid "track and waypoints"
msgstr "トラックおよびウェイポイント"
+msgid "Click to download"
+msgstr "クリックでダウンロード"
+
+msgid "Click to cancel"
+msgstr "クリックでキャンセル"
+
+msgid "Download from OSM along this track"
+msgstr "このトラックに沿ってOSMからダウンロード"
+
msgid "Calculating Download Area"
msgstr "ダウンロード領域を計算"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr "<html>この操作には、{0}件の独立したダウンロード要求を<br>必要とします。続けますか？</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "このトラック沿いの画像タイルを先行キャッシュ"
@@ -8792,7 +9002,7 @@ msgstr[0] "マーカー"
msgid "{0} consists of {1} marker"
msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0}は、{1}マーカーからなる"
+msgstr[0] "{0}は{1}件のマーカーからなる"
msgid "No existing audio markers in this layer to offset from."
msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。"
@@ -8843,15 +9053,11 @@ msgstr "このマーカーのURLを表示するときにエラーが発生しま
msgid "(URL was: "
msgstr "(URLは： "
-msgid "Error displaying URL"
-msgstr "URL を表示する際にエラー"
-
msgid "Select the map painting styles"
msgstr "地図の描画スタイルを選択してください"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "警告： Mappaintスタイルを''{0}''から読み込めません。発生した例外は {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "''{0}''から地図描画スタイルの読み込みに失敗しました。例外: {1}"
msgid "loading style ''{0}''..."
msgstr "スタイル ''{0}'' を読み込み中..."
@@ -8864,8 +9070,8 @@ msgid_plural ""
"right click menu for details."
msgstr[0] "このスタイルを読み込むのに{0}件のエラーがありました。詳細は右クリックメニューから''情報''を選択してください。"
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr "警告: ''{0}''からの地図描画スタイルの解釈に失敗しました。エラー内容: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr "''{0}''から地図描画スタイルの解析に失敗しました。エラー: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "不正なマイナス符号、値は正でないといけません。"
@@ -8874,24 +9080,24 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "不正なマイナス符号。少なくとも1つは正の値にしてください。"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
-msgstr "警告: ''{0}''からの地図描画スタイルの解釈に失敗しました。エラー内容: [{1}:{2}] {3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
+msgstr "''{0}''から地図描画スタイルの解析に失敗しました。エラー: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "アクセストークンキー:"
msgid "Access Token Secret:"
-msgstr "トークンシークレットへのアクセス:"
+msgstr "アクセストークン秘密鍵:"
msgid "Save Access Token in preferences"
-msgstr "設定でトークンアクセスを保存"
+msgstr "設定でアクセストークンを保存"
msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
"to use the Access Token in this JOSM session only.</html>"
msgstr ""
-"<html>選択してJOSMプリファレンスのアクセストークンを保存。<br>選択解除してこのJOSMセッションのアクセストークンだけを使用。</html>"
+"<html>選択するとJOSM設定にアクセストークンを保存します。<br>選択解除するとこのJOSMセッションにだけアクセストークンを使用します</htm"
+"l>"
msgid "Use default settings"
msgstr "デフォルト設定を使用"
@@ -8900,7 +9106,7 @@ msgid "Consumer Key:"
msgstr "コンシューマキー:"
msgid "Consumer Secret:"
-msgstr "秘密の消費者コード"
+msgstr "コンシューマー秘密鍵:"
msgid "Request Token URL:"
msgstr "リクエストトークンURL:"
@@ -8940,8 +9146,8 @@ msgid ""
"fully<br>automatically authorizes the user and retrieves an Access "
"Token.</html>"
msgstr ""
-"<html>全自動の手順を実行してOSMウェブサイトからアクセストークンを取得してください。<br>JOSMはJOSMユーザーに代わってOSMウェブサイト"
-"にアクセスし、<br>ユーザーを全自動で認証し、アクセストークンを参照します。</html>"
+"<html>全自動でOSMウェブサイトからアクセストークンを取得します。<br>JOSMがJOSMユーザーに代わってOSMウェブサイトにアクセスし、<br"
+">ユーザーを全自動で認証し、アクセストークンを取得します。</html>"
msgid ""
"<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -8950,14 +9156,14 @@ msgid ""
"external browser<br>to authenticate itself and to accept the request token "
"submitted by JOSM.</html>"
msgstr ""
-"<html>半自動の手順を実行してOSMウェブサイトからアクセストークンを取得してください。<br>JOSMは標準的なOAuth要求を出してリクエストトー"
-"クンとアクセストークンを取得します。<br>そしてユーザーを、外部ブラウザー内のOSMウェブサイトへ切り替えて<br>その認証を行い、JOSMが出したリク"
-"エストトークンを受け取ります。</html>"
+"<html>半自動でOSMウェブサイトからアクセストークンを取得します。<br>JOSMは標準的なOAuthリクエストを発行して、リクエストトークンと<b"
+"r>アクセストークンを取得します。そしてJOSMを認証させJOSMが発行した<br>リクエストトークンを受け入れるために、外部ブラウザーでOSMウェブサイ"
+"ト<br>を表示します。</html>"
msgid ""
"<html>Enter an Access Token manually if it was generated and retrieved "
"outside<br>of JOSM.</html>"
-msgstr "<html>JOSM外部で作成・参照されたアクセストークンは手動で入力してください。</html>"
+msgstr "<html>JOSM外部で作成・取得されたアクセストークンを手入力します。</html>"
msgid ""
"Please enter your OSM user name and password. The password will "
@@ -8987,15 +9193,15 @@ msgid "Advanced OAuth properties"
msgstr "OAuthの高度な設定"
msgid "Accept Access Token"
-msgstr "アクセストークンを受入れる"
+msgstr "アクセストークンを受け入れる"
msgid ""
"<html>You have successfully retrieved an OAuth Access Token from the OSM "
"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
"in subsequent requests to gain access to the OSM API.</html>"
msgstr ""
-"<html>OSMウェブサイトからのOAuthアクセストークン参照に成功しました。<strong>{0}</strong> "
-"をクリックしてトークンを受け入れてください。JOSM はこれを使って引き続きOSM APIへのアクセス取得要求を行います。</html>"
+"<html>OSMウェブサイトからのAuthアクセストークンの取得に成功しました。トークンを受け入れるには<strong>{0}</strong>をクリッ"
+"クしてください。引き続き、これを使用してJOSMがOSM APIへのアクセス権を取得します。</html>"
msgid "Authorize now"
msgstr "今すぐ認証"
@@ -9032,8 +9238,8 @@ msgid ""
"OSM server failed.<br><br>Please try again or choose another kind of "
"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
msgstr ""
-"<html>OSMサーバーからOAuthアクセストークンを参照する自動処理が<br>失敗しました。<br><br>やり直すか、手の認証処理(例:半自動認証"
-"や手動認証)<br>を選択してください。</html>"
+"<html>OSMサーバーからOAuthアクセストークンを取得する自動手続きが失敗しました。<br><br>やり直すか、他の認証手続き（例:半自動認証や手"
+"動認証）を選択してください。</html>"
msgid "OAuth authorization failed"
msgstr "OAuth認証に失敗しました"
@@ -9044,21 +9250,21 @@ msgid ""
"from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your "
"advanced setting and try again.</html>"
msgstr ""
-"<html>OAuth認証末端URL''{0}''からJOSMが有効なログインURLを作成できなかったため、OSMサーバーからOAuthのアクセストークン"
-"を受け取る自動処理に失敗しました。<br><br>拡張設定を確認して再度試してください。</html>"
+"<html>OAuth認証の末端URL''{0}''からJOSMが有効なログインURLを作成できなかったため、OSMサーバーからOAuthのアクセストーク"
+"ンを受け取る自動手続きに失敗しました。<br><br>拡張設定を確認してやり直してください。</html>"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
"OSM server failed. JOSM failed to log into {0}<br>for user "
"{1}.<br><br>Please check username and password and try again.</html>"
msgstr ""
-"<html>OSMサーバーからのOAuthアクセストークン参照の自動手続きが<br>失敗しました。JOSM はユーザー {1} としての {0} "
-"へのログインに失敗しました。<br><br>ユーザー名とパスワードをチェックしてやり直してください。</html>"
+"<html>OSMサーバーからのOAuthアクセストークンを取得する自動手続きに<br>失敗しました。JOSMはユーザー{1}として{0}へのログインに失"
+"敗しました。<br><br>ユーザー名とパスワードをチェックしてやり直してください。</html>"
msgid ""
"Please enter an OAuth Access Token which is authorized to access the OSM "
"server ''{0}''."
-msgstr "OSMのサーバー ''{0}'' に認証されている OAuth 接続トークンを入力してください。"
+msgstr "OSMサーバー''{0}''に認証されているOAuthアクセストークンを入力してください。"
msgid "Access Token"
msgstr "アクセストークン"
@@ -9067,31 +9273,31 @@ msgid "Advanced OAuth parameters"
msgstr "OAuthの追加パラメーター"
msgid "Enter the OAuth Access Token"
-msgstr "OAuth アクセストークンを入力してください"
+msgstr "OAuthのアクセストークンを入力してください"
msgid "Enter advanced OAuth properties"
-msgstr "高度なOAuthプロパティを入力"
+msgstr "高度なOAuthプロパティを入力してください"
msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
-"<html><body>OSMサーバー ''{0}'' で認証されているOAuthアクセストークンを入力してください。</body></html>"
+"<html><body>OSMサーバー''{0}''で認証されたOAuthアクセストークンを入力してください。</body></html>"
msgid "Please enter an Access Token Key"
msgstr "アクセストークンキーを入力してください"
msgid ""
"The Access Token Key must not be empty. Please enter an Access Token Key"
-msgstr "アクセストークンキーは空白にできません。アクセストークンキーを入力してください。"
+msgstr "アクセストークンキーは空欄にできません。アクセストークンキーを入力してください。"
msgid "Please enter an Access Token Secret"
-msgstr "アクセストークン秘密コードを入力してください"
+msgstr "アクセストークン秘密鍵を入力してください"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
"Secret"
-msgstr "アクセストークン秘密コードは入力必須です。アクセストークン秘密コードを入力してください。"
+msgstr "アクセストークン秘密鍵は空欄にできません。アクセストークン秘密鍵を入力してください。"
msgid "Click to test the Access Token"
msgstr "クリックしてアクセストークンをテスト"
@@ -9113,16 +9319,16 @@ msgid "Close the dialog and cancel authorization"
msgstr "ダイアログを閉じて認証をキャンセル"
msgid "Close the dialog and accept the Access Token"
-msgstr "ダイアログを閉じてアクセストークンを受入れ"
+msgstr "ダイアログを閉じてアクセストークンを受け入れる"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "警告: OAuth操作実行のキャンセルに失敗"
+msgid "Failed to cancel running OAuth operation"
+msgstr "実行中のOAuth操作のキャンセルに失敗しました"
msgid "Retrieving OAuth Request Token from ''{0}''"
-msgstr "注意: ''{0}'' からのOAuth接続トークンです"
+msgstr "''{0}''からOAuthリクエストトークンを取得中"
msgid "Retrieving OAuth Access Token from ''{0}''"
-msgstr "''{0}'' よりOAuthアクセストークン参照中"
+msgstr "''{0}''からOAuthアクセストークンを取得中"
msgid "OSM website did not return a session cookie in response to ''{0}'',"
msgstr "OSMウェブサイトから''{0}'' の応答としてセッションクッキーが返ってきませんでした"
@@ -9135,7 +9341,7 @@ msgid "Failed to authorize OAuth request ''{0}''"
msgstr "OAuthリクエスト''{0}'' の認証に失敗"
msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr "OSMウェブサイトでOAuth リクエストトークン ''{0}''を認証中"
+msgstr "OSMウェブサイトでOAuthリクエストトークン''{0}''を認証中..."
msgid "Initializing a session at the OSM website..."
msgstr "OSMウェブサイトのセッションを初期化中..."
@@ -9144,7 +9350,7 @@ msgid "Authenticating the session for user ''{0}''..."
msgstr "ユーザー''{0}'' 用のセッションを認証中..."
msgid "Authorizing request token ''{0}''..."
-msgstr "リクエストトークン''{0}'' を認証中..."
+msgstr "リクエストトークン''{0}''を認証中..."
msgid "Logging out session ''{0}''..."
msgstr "セッション''{0}'' をログアウト中..."
@@ -9181,38 +9387,44 @@ msgstr "あなたのプリファレンスへの書き込みを許可"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "選択してJOSMにあなたのサーバープリファレンスに書き込む権限を付与"
+msgid "Allow modifications of notes"
+msgstr "備考の編集を許可"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "JOSMにあなたに代わって備考を変更する権利を選択"
+
msgid "Retrieving OAuth Access Token..."
-msgstr "OAuthアクセストークン参照中..."
+msgstr "OAuthアクセストークンを取得中..."
msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
-msgstr "<html>''{0}'' からの OAuth アクセストークン参照に失敗。</html>"
+msgstr "<html>''{0}''からのOAuthアクセストークン取得に失敗しました。</html>"
msgid "Request Failed"
msgstr "リクエスト失敗"
msgid "Retrieving OAuth Request Token..."
-msgstr "OAuthリクエストトークン参照中..."
+msgstr "OAuthリクエストトークン取得中..."
msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr "<html>''{0}'' からの OAuth リクエストトークン参照に失敗。</html>"
+msgstr "<html>''{0}''からのOAuthリクエストトークン取得に失敗しました。</html>"
msgid "Display Advanced OAuth Parameters"
msgstr "高度なOAuthパラメータを表示"
msgid "Retrieve Request Token"
-msgstr "リクエストトークンを参照"
+msgstr "リクエストトークンを取得"
msgid ""
"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
"Token from ''{1}''.</html>"
msgstr ""
-"<html><strong>{0}</strong>をクリックして ''{1}''からのリクエストトークンを参照してください。</html>"
+"<html>''{1}''からOAuthリクエストトークンを取得するには<strong>{0}</strong>をクリックしてください。</html>"
msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr "<html>ステップ 1/3: OAuth リクエストトークンを参照</html>"
+msgstr "<html>ステップ 1/3: OAuthリクエストトークンを取得</html>"
msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr "<html>ステップ 2/3: アクセストークンを認証及び参照</html>"
+msgstr "<html>ステップ 2/3: アクセストークンを認証及び取得</html>"
msgid "Request Access Token"
msgstr "アクセストークンをリクエスト"
@@ -9226,44 +9438,41 @@ msgid ""
"copy the following authorize URL and paste it into the address field of your "
"browser.</html>"
msgstr ""
-"<html>JOSMは要求トークンの受け取りに成功しました。JOSMは外部ブラウザーで認証ページを起動します。あなたのOSMのユーザー名とパスワードでログ"
-"インし、指示に従って要求トークンを認証してください。それからこのダイアログに戻り、<strong>{0}</strong>をクリックしてください。<br>"
-"<br>もし外部ブラウザーの起動に失敗した場合は、次の認証URLをブラウザーのアドレス欄にコピー＆ペーストしてください。</html>"
+"<html>JOSMはリクエストトークンの取得に成功しました。JOSMは外部ブラウザーで認証ページを起動します。あなたのOSMのユーザー名とパスワードでロ"
+"グインし、指示に従ってリクエストトークンを認証してください。それからこのダイアログに戻り、<strong>{0}</strong>をクリックしてください。"
+"<br><br>もし外部ブラウザーの起動に失敗した場合は、次の認証URLをブラウザーのアドレス欄にコピー＆ペーストしてください。</html>"
msgid "Go back to step 1/3"
msgstr "ステップ 1/3 に戻る"
msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr "<html>ステップ 3/3: アクセストークン参照に成功</html>"
+msgstr "<html>ステップ 3/3: アクセストークン取得に成功</html>"
msgid ""
"<html>JOSM has successfully retrieved an Access Token. You can now accept "
"this token. JOSM will use it in the future for authentication and "
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-"<html>アクセストークンの受信に成功しました。このトークンをacceptしてください。以後JOSMがOSMサーバーでの認証にこのトークンを利用できるよ"
-"うになります。<br><br>アクセストークンは以下の通りです: </html>"
-
-msgid "Restart"
-msgstr "再起動"
+"<html>アクセストークンの取得に成功しました。これでこのトークンを受け入れることができます。今後、JOSMはOSMサーバーでの認証にこのトークンを使用"
+"するようになります。<br><br>アクセストークンは以下の通りです。</html>"
msgid "Click to retrieve a Request Token"
-msgstr "クリックしてリクエストトークンを参照"
+msgstr "クリックしてリクエストトークンを取得"
msgid "Retrieve Access Token"
-msgstr "アクセストークンを参照"
+msgstr "アクセストークンを取得"
msgid "Click to retrieve an Access Token"
-msgstr "クリックしてアクセストークンを参照"
+msgstr "クリックしてアクセストークンを取得"
msgid "Testing OAuth Access Token"
msgstr "OAuthアクセストークンをテスト中"
msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
-msgstr "アクセストークンキー ''{0}'' でのユーザー詳細の参照は拒否されました。"
+msgstr "アクセストークンキー''{0}''でのユーザー詳細情報の取得が拒否されました。"
msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
-msgstr "アクセストークンキー ''{0}'' でのユーザー詳細の参照は禁止されています。"
+msgstr "アクセストークンキー''{0}''にはユーザー詳細情報の参照権限がありません。"
msgid ""
"<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
@@ -9309,16 +9518,14 @@ msgid ""
"Access Token, but<br>rather a problem with the server configuration. "
"Carefully check the server<br>URL and your Internet connection.</html>"
msgstr ""
-"<html>現在のユーザーについてOSMサーバー "
-"''{0}''からの情報参照に失敗。<br>これはおそらくテスト済みアクセストークンによる問題というより、<br>サーバー構成の問題です。注意してサーバー"
-"<br>URL とあなたのインターネット接続をチェックしてください。</html>"
+"<html>OSMサーバー''{0}''から現在のユーザーについての情報の参照に失敗しました。<br>これはおそらくテスト済みアクセストークンによる問題と"
+"いうより、<br>サーバー構成の問題です。注意してサーバー<br>URL とあなたのインターネット接続をチェックしてください。</html>"
msgid ""
"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
"''{1}''.<br>The token ist probably invalid.</html>"
msgstr ""
-"<html>トークン ''{1}''でOSMサーバー ''{0}'' "
-"へのリクエストへのサインに失敗しました。<br>おそらくトークンが不正です。</html>"
+"<html>トークン''{1}''でOSMサーバー''{0}''に接続できませんでした。<br>おそらくトークンが無効です。</html>"
msgid ""
"<html>The test failed because the server responded with an internal "
@@ -9425,12 +9632,12 @@ msgid ""
"The following plugin has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} plugins have been downloaded <strong>successfully</strong>:"
-msgstr[0] "次の{0} 件のプラグインのダウンロードに<strong>成功</strong>:"
+msgstr[0] "次の{0}件のプラグインのダウンロードに<strong>成功</strong>:"
msgid "Downloading the following plugin has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] "次の{0} 件のプラグインのダウンロードに<strong>失敗</strong>:"
+msgstr[0] "次の{0}件のプラグインのダウンロードに<strong>失敗</strong>:"
msgid "Search:"
msgstr "検索:"
@@ -9506,6 +9713,9 @@ msgstr "プラグインをダウンロード"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
+msgid "Would you like to restart now?"
+msgstr "すぐに再起動しますか？"
+
msgid "Remote Control"
msgstr "リモート制御"
@@ -9636,6 +9846,12 @@ msgstr "ツールバーから削除"
msgid "Configure toolbar"
msgstr "ツールバーを設定"
+msgid "Edit shortcut"
+msgstr "ショートカットの編集"
+
+msgid "Do not hide toolbar and menu"
+msgstr "ツールバーとメニューを非表示にしない"
+
msgid "Actions"
msgstr "アクション"
@@ -9678,6 +9894,9 @@ msgstr "名前のない登録済みのツールバーのアクション: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "Registered toolbar action {0} overwritten: {1} gets {2}"
+msgid "Toolbar: {0}"
+msgstr "ツールバー: {0}"
+
msgid "Data validator"
msgstr "データの妥当性検査"
@@ -9728,23 +9947,12 @@ msgstr "検索: "
msgid "Read from file"
msgstr "ファイルから読み込み"
-msgid "Open JOSM customization file"
-msgstr "JOSMカスタマイズファイルを開く"
-
-msgid "Import log"
-msgstr "ログのインポート"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>ファイルインポートの概要です。<br/>設定ダイアログの［キャンセル］を押すと、設定の変更を拒否できます。<br/>設定によってはJOSMを再"
-"起動する必要がある場合があります。</html>"
-
msgid "Export selected items"
msgstr "選択された項目をエクスポート"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM カスタム設定ファイル (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr "デフォルトの値になっていないキーを選択してください"
@@ -9760,41 +9968,54 @@ msgstr "ファイルの設定値を既存の値に追加"
msgid "Replace existing values"
msgstr "既存の値を置換"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM カスタム設定ファイル (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "JOSMカスタマイズファイルを開く"
-msgid "Advanced Background: Changed"
-msgstr "高度な設定の背景色: 変更済み"
+msgid "Import log"
+msgstr "ログのインポート"
-msgid "Advanced Background: NonDefalut"
-msgstr "高度な設定の背景色: 非デフォルト"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>ファイルインポートの概要です。<br/>設定ダイアログの［キャンセル］を押すと、設定の変更を拒否できます。<br/>設定によってはJOSMを再"
+"起動する必要がある場合があります。</html>"
-msgid "Current value is default."
-msgstr "現在の値は既定値です。"
+msgid "shortcut"
+msgstr "ショートカット"
-msgid "Default value is ''{0}''."
-msgstr "''{0}'' は既定値です。"
+msgid "color"
+msgstr "色"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "既定値が現在は不明です（設定が使われたことがありません）。"
+msgid "toolbar"
+msgstr "ツールバー"
-msgid "Select Setting Type:"
-msgstr "設定タイプを選択してください"
+msgid "imagery"
+msgstr "画像"
-msgid "Simple"
-msgstr "シンプル"
+msgid "Reset preferences"
+msgstr "設定値を初期化"
-msgid "List"
-msgstr "リスト"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"全ての設定値をデフォルト値に戻そうとしています<br "
+"/>プラグイン、画像、フィルター、ツールバーボタン、キーボードなどの全ての設定が削除されます。<br />本当に実行しますか？"
-msgid "List of lists"
-msgstr "リストの一覧"
+msgid "Load profile"
+msgstr "プロファイルを開く"
-msgid "List of maps"
-msgstr "地図の一覧"
+msgid "Save {0} profile"
+msgstr "{0}のプロファイルを保存"
-msgid "Add setting"
-msgstr "設定を追加"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr "このグループに関する設定項目はすべてデフォルトですので、保存する必要はありません"
+
+msgid "Choose profile file"
+msgstr "プロファイルのファイルを選択してください"
msgid "Change list setting"
msgstr "リストの設定を変更"
@@ -9817,6 +10038,39 @@ msgstr "地図の一覧の設定を変更"
msgid "Entry {0}"
msgstr "エントリ {0}"
+msgid "Select Setting Type:"
+msgstr "設定タイプを選択してください"
+
+msgid "Simple"
+msgstr "シンプル"
+
+msgid "List"
+msgstr "リスト"
+
+msgid "List of lists"
+msgstr "リストの一覧"
+
+msgid "List of maps"
+msgstr "地図の一覧"
+
+msgid "Add setting"
+msgstr "設定を追加"
+
+msgid "Advanced Background: Changed"
+msgstr "高度な設定の背景色: 変更済み"
+
+msgid "Advanced Background: NonDefault"
+msgstr "高度な設定の背景色: 初期値ではない"
+
+msgid "Current value is default."
+msgstr "現在の値は既定値です。"
+
+msgid "Default value is ''{0}''."
+msgstr "''{0}'' は既定値です。"
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "既定値が現在は不明です（設定が使われたことがありません）。"
+
msgid "Change string setting"
msgstr "文字列の設定を変更"
@@ -9873,6 +10127,9 @@ msgstr "選択モードで仮想ノードを表示する"
msgid "Draw inactive layers in other color"
msgstr "アクティブなレイヤー以外は別の色で表示する"
+msgid "Display discardable keys"
+msgstr "削除されるキーを表示"
+
msgid "Highlight target ways and nodes"
msgstr "選択中のウェイやノードを強調表示"
@@ -9926,6 +10183,11 @@ msgid ""
"in the selected style."
msgstr "このオプションは、選択されたスタイルの設定を無視して、エリアの塗りつぶしを停止させます。"
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr "ポイントに対して無意味だとして暗黙に削除される予定のキーを表示します。"
+
msgid "Options that affect drawing performance"
msgstr "描画パフォーマンス関連オプション"
@@ -10209,8 +10471,14 @@ msgstr "レイヤーを取得"
msgid "2. Select layers"
msgstr "2. レイヤーを選択します"
-msgid "3. Verify generated WMS URL"
-msgstr "3. 作成されたWMSのURLを検査します"
+msgid "3. Select image format"
+msgstr "3. 画像形式の選択"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. 作成されたWMSのURLを確認"
+
+msgid "5. Enter name for this layer"
+msgstr "5. このレイヤーの名前を入力"
msgid "Show Bounds"
msgstr "境界を表示"
@@ -10384,6 +10652,12 @@ msgstr ""
"<i>(JOSMはデータレイヤーを保存する際にバックアップファイルを保持できます。 "
"ファイル名の最後に''~''を付加して同じフォルダに保存します。)</i>"
+msgid "Notification at each save"
+msgstr "保存するごとに通知"
+
+msgid "When saving, display a small notification"
+msgstr "保存するとき、小さい通知を表示します"
+
msgid "File backup"
msgstr "ファイルバックアップ"
@@ -10448,8 +10722,8 @@ msgstr "マップ設定"
msgid "Settings for the map projection and data interpretation."
msgstr "地図投影法とデータ解釈の設定"
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "警告: タグ付けプリセットソースを読み込めません :{0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "タグ付けプリセットのソース {0} を読み込めません。"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10549,7 +10823,7 @@ msgstr ""
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] "{0} プラグインは次の {1} 個のプラグインから必要とされています。"
+msgstr[0] "{0}プラグインは次の{1}件のプラグインから必要とされています。"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: バージョン {1} (ローカル: {2})"
@@ -10717,21 +10991,6 @@ msgstr "スイスグリッド (スイス)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 （ローカル補正なし）</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTMゾーン"
-
-msgid "North"
-msgstr "北緯"
-
-msgid "South"
-msgstr "南"
-
-msgid "Hemisphere"
-msgstr "半球"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -10753,6 +11012,21 @@ msgstr "UTM France (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM測地システム"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTMゾーン"
+
+msgid "North"
+msgstr "北緯"
+
+msgid "South"
+msgstr "南"
+
+msgid "Hemisphere"
+msgstr "半球"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "OSM API URL ''{0}'' をテスト中"
@@ -10811,9 +11085,9 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "OAuthを使用する"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
-msgstr "警告: ''{0}'' にサポートしていない値 ''{1}'' が設定されています。認証方法は ''Basic認証'' です。"
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
+msgstr "設定項目''{0}''がサポート外の値''{1}''です。認証方法に''Basic認証''を使用します。"
msgid "OSM username:"
msgstr "OSM ユーザー名:"
@@ -10821,30 +11095,35 @@ msgstr "OSM ユーザー名:"
msgid "OSM password:"
msgstr "OSM パスワード:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "警告: 認証証明マネージャからのOSM認証証明参照に失敗。"
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr "認証マネージャーからOSM証明書の受け取りに失敗しました。"
msgid "Current credential manager is of type ''{0}''"
msgstr "現在の認証マネージャーは ''{0}'' の一種です"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "警告: 認証証明マネージャへOSM認証証明の保存に失敗。"
+msgid "Failed to save OSM credentials to credential manager."
+msgstr "OSM証明書の認証マネージャーへの保存に失敗しました。"
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr "警告: 認証証明マネージャからのOAuthトークン参照に失敗。"
+msgid "Periodically check for new messages"
+msgstr "定期的に新しいメッセージを確認"
+
+msgid "Check interval (minutes):"
+msgstr "確認間隔（分）:"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr "警告: 認証証明マネージャへのOAuthトークンの保管に失敗。"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr "認証マネージャーからOAuthアクセストークンの取得に失敗しました"
+
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr "OAuthアクセストークンの認証マネージャーへの保存に失敗しました"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
"Please authorize first."
-msgstr "あなたにはOAuth を使用しているOSMサーバーにアクセスするためのアクセストークンがまだありません。最初に認証してください。"
+msgstr "OAuthを使用しているOSMサーバーへのアクセス権を持ったアクセストークンがまだありません。最初に認証を受けてください。"
msgid ""
"You already have an Access Token to access the OSM server using OAuth."
-msgstr "あなたにはOAuth を使用しているOSMサーバーにアクセスするためのアクセストークンが既にあります。"
+msgstr "OAuthを使用しているOSMサーバーへのアクセス権を持ったアクセストークンが既にあります。"
msgid "Save to preferences"
msgstr "プリファレンスに保存"
@@ -10858,10 +11137,10 @@ msgstr "新しいアクセストークン"
msgid ""
"Click to step through the OAuth authorization process and generate a new "
"Access Token"
-msgstr "クリックしてOAuth 認証プロセスを一歩進み、新しいアクセストークンを作成"
+msgstr "OAuth認証手続きを進めて新しいアクセストークンを作成するにはクリックしてください"
msgid "Click test access to the OSM server with the current access token"
-msgstr "クリックして、現在のアクセストークンでOSMサーバーにアクセスできるかをテストします"
+msgstr "現在のアクセストークンでOSMサーバーにアクセスできるかをテストするにはクリックしてください"
msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
msgstr "<html>デフォルトOSM サーバーURLを使用 (<strong>{0}</strong>)</html>"
@@ -10918,15 +11197,11 @@ msgid "Use a SOCKS proxy"
msgstr "SOCKS プロキシを使用"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr "警告: JOSM はプロキシを参照するように設定されていますが、JVMはプロキシを参照するように設定されていません。"
-
-msgid "disabled"
-msgstr "無効"
-
-msgid "no modifier"
-msgstr "修飾なし"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+"JOSMはシステム設定からプロキシを使用するように設定されていますが、JVMがそれを受け付けるように設定されていません。設定を''プロキシなし''にリセッ"
+"トします"
msgid "Shortcut Background: User"
msgstr "ショートカット: ユーザーの背景色"
@@ -10960,7 +11235,7 @@ msgstr "複数個"
msgid "Remove old keys from up to {0} object"
msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "{0} オブジェクトまで古いキーを削除"
+msgstr[0] "最大{0}件のオブジェクトから古いキーを削除"
msgid "Delete the selection in the tag table"
msgstr "タグテーブルの選択を削除"
@@ -10968,36 +11243,36 @@ msgstr "タグテーブルの選択を削除"
msgid "Add a new tag"
msgstr "新しいタグを追加"
-msgid "Select auto-increment of {0} for this field"
-msgstr "この欄に{0}の自動インクリメントを選択"
+msgid "Paste tags from buffer"
+msgstr "タグをバッファから貼り付け"
-msgid "Cancel auto-increment for this field"
-msgstr "この欄の自動インクリメントを取り消し"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "グループ ''{1}''のプリセット''{0}''を使います"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "プリセット ''{0}''を使います"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr "\"{0}-{1}\" プリセットのタグ付けの警告: ''{3}'' 要素が指定されたので ''{2}'' 属性が無視されました。"
+msgid "Elements of type {0} are supported."
+msgstr "タイプ{0}の要素がサポートされます"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"\"{0}-{1}\" プリセットのタグ付けが壊れています - ''display_values'' で指定された項目数は ''values'' "
-"と同じである必要があります"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "{0}件のオブジェクトを変更"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"\"{0}-{1}\" プリセットのタグ付けが壊れています - ''short_descriptions'' の中の項目数は ''values'' "
-"と同じである必要があります"
+msgid "Nothing selected!"
+msgstr "何も選択されていません！"
-msgid "More information about this feature"
-msgstr "この地物・機能の詳細情報"
+msgid "Selection unsuitable!"
+msgstr "選択が適切ではありません！"
+
+msgid "Apply Preset"
+msgstr "プリセットの適用"
+
+msgid "New relation"
+msgstr "新しいリレーション"
+
+msgid "Change Tags"
+msgstr "タグの変更"
msgid "Unknown requisite: {0}"
msgstr "不明な必要条件: {0}"
@@ -11005,6 +11280,9 @@ msgstr "不明な必要条件: {0}"
msgid "Illegal member expression: {0}"
msgstr "メンバーの式が不正です: {0}"
+msgid "More information about this feature"
+msgstr "この地物・機能の詳細情報"
+
msgid "Available roles"
msgstr "利用可能なロール"
@@ -11020,15 +11298,57 @@ msgstr "エレメント"
msgid "Optional Attributes:"
msgstr "オプションの属性:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "グループ ''{1}''のプリセット''{0}''を使います"
+msgid "Select auto-increment of {0} for this field"
+msgstr "この欄に{0}の自動インクリメントを選択"
-msgid "Use preset ''{0}''"
-msgstr "プリセット ''{0}''を使います"
+msgid "Cancel auto-increment for this field"
+msgstr "この欄の自動インクリメントを取り消し"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr "\"{0}-{1}\" プリセットのタグ付けの警告: ''{3}'' 要素が指定されたので ''{2}'' 属性が無視されました。"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"プリセット \"{0}-{1}\" のタグ付けが壊れています - "
+"''values_from''で指定されたJavaメソッドが\"{2}\"の形式ではありません"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"プリセット \"{0}-{1}\" のタグ付けが壊れています - "
+"''values_from''で指定されたJavaのメソッドから{2}例外（{3}）が発生しました"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"\"{0}-{1}\" プリセットのタグ付けが壊れています - ''display_values'' で指定された項目数は ''values'' "
+"と同じである必要があります"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"\"{0}-{1}\" プリセットのタグ付けが壊れています - ''short_descriptions'' の中の項目数は ''values'' "
+"と同じである必要があります"
msgid "Unknown type: {0}"
msgstr "不明なタイプ: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "プリセットグループ {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "プリセットグループ {0}"
+
msgid "Roles cannot appear more than once"
msgstr "ロールは2つ以上つけることはできません"
@@ -11038,40 +11358,9 @@ msgstr "親の無いロール要素をプリセット"
msgid "Preset sub element without parent"
msgstr "親の無いサブ要素をプリセット"
-msgid "Could not read tagging preset source: {0}"
-msgstr "タグ付けプリセットのソース {0} を読み込めません。"
-
msgid "Error parsing {0}: "
msgstr "走査時にエラー: {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "タイプ{0}の要素がサポートされます"
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "{0}個のオブジェクトを変更"
-
-msgid "Nothing selected!"
-msgstr "何も選択されていません！"
-
-msgid "Selection unsuitable!"
-msgstr "選択が適切ではありません！"
-
-msgid "Apply Preset"
-msgstr "プリセットの適用"
-
-msgid "New relation"
-msgstr "新しいリレーション"
-
-msgid "Change Properties"
-msgstr "プロパティの変更"
-
-msgid "Preset group {1} / {0}"
-msgstr "プリセットグループ {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "プリセットグループ {0}"
-
msgid "Search preset"
msgstr "プリセットを検索"
@@ -11087,6 +11376,14 @@ msgstr "選択範囲に適用可能なもののみ表示"
msgid "Search in tags"
msgstr "タグ内検索"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。"
+
+msgid "Adjustable {0} not registered yet."
+msgstr "調整可能な {0} はまだ登録されていませんでした。"
+
msgid "All files (*.*)"
msgstr "すべてのファイル (*.*)"
@@ -11105,7 +11402,7 @@ msgstr "最大経度"
msgid ""
"URL from www.openstreetmap.org (you can paste a download URL here to specify "
"a bounding box)"
-msgstr "www.openstreetmap.org のURL(ここにダウンロードURLを貼り付けてbboxを指定できます)"
+msgstr "www.openstreetmap.org のURL(ここにダウンロードURLを貼り付けて矩形範囲を指定できます)"
msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
@@ -11116,6 +11413,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr "現在の値は正しいOSMのIDではありません。ゼロより大きい整数値を入力してください。"
+msgid "false: the property is explicitly switched off"
+msgstr "偽：設定値を明確にオフに設定します"
+
+msgid "true: the property is explicitly switched on"
+msgstr "真：設定値を明確にオンに設定します"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "部分：選択されたオブジェクトによって異なる値が設定されており、変更しません"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "変更なし：選択したオブジェクトに対して設定値を更新しません"
+
+msgid "Cut"
+msgstr "切り取り"
+
+msgid "Right click = copy to clipboard"
+msgstr "右クリック = クリップボードへコピー"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "必須の属性 ''{0}'' がありません"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr "long 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr "long 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr "double型の属性 ''{0}'' の値が不正です。''{1}'' が指定されています。"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr "boolean 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr "外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
@@ -11146,9 +11486,9 @@ msgid "Contacting OSM Server..."
msgstr "OSMサーバーに接続中..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
-msgstr "警告: サーバー能力にある ''{1}'' 要素の ''{0}'' 属性の値が不正です。 ''{2}'' になっています。"
+msgstr "サーバー能力において要素''{1}''の属性''{0}''に不正な値''{2}''が設定されています"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "サーバーから返されたデータ ''{0}'' が解析できません"
@@ -11186,31 +11526,29 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "プリファレンス ''{0}'' に不正なポート番号。入力値 ''{1}''。"
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
-msgstr "警告: 環境設定 ''{0}'' が異常な値になっています。プロキシを使用しないときには ''{1}'' を設定してください。"
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
+msgstr "設定値''{0}''の値が想定外です。''{1}''になっています。プロキシを使用しない設定とします。"
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
-msgstr "警告: HTTPプロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' に設定されています。"
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
+msgstr "HTTPプロキシの引数が想定外です。ホスト''{0}''のポート''{1}''になっています。"
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
-msgstr "警告: SOCKS プロキシに異常な値が設定されてます。ホスト: ''{0}'' ポート:''{1}'' に設定されています。"
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
+msgstr "SOCKSプロキシの引数が想定外です。ホスト''{0}''のポート''{1}''になっています。"
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr "エラー: プロキシ ''{0}'' URI:''{1}'' への接続に失敗しました。例外内容: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+msgstr "URI''{1}''に接続する際にプロキシ''{0}''への接続に失敗しました。例外: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"警告:JVMはシステムの設定からプロキシを得るように設定されていません。プロパティ\r\n"
-"''java.net.useSystemProxies''は起動時に見つかりませんでした。プロキシを使用しません。"
+"JVMがシステム設定のプロキシを利用するように設定されていません。起動時に''java.net.useSystemProxies''プロパティが見つかりま"
+"せんでした。プロキシを使用しない設定とします。"
msgid "Parsing response from server..."
msgstr "サーバーからの応答をパース中..."
@@ -11306,6 +11644,9 @@ msgstr "gpxファイル''{0}''を評価中にエラーが発生しました。
msgid "Parse error: invalid document structure for GPX document."
msgstr "パースエラー: GPXファイルのドキュメント構造が不適切です"
+msgid "(at line {0}, column {1})"
+msgstr "(場所: 行 {0}, カラム {1})"
+
msgid "Unknown mode {0}."
msgstr "不明なモード {0}。"
@@ -11321,15 +11662,20 @@ msgstr "画像ファイルを検索中"
msgid "No image files found."
msgstr "画像ファイルが見つかりません。"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "{0}件の未読メッセージがあります。"
+
+msgid "Click here to see your inbox."
+msgstr "受信トレイを表示するにはここをクリックしてください。"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "リソース ''{0}'' 用の入力ストリームのオープンに失敗しました"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"警告:Zipファイル''{0}''中の名前部分が''{3}'' で拡張子が''{2}''のファイルをオープンするのに失敗しました。例外コードは {1} "
-"です。"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
+msgstr "zipファイル''{0}''内にある名前''{3}''、拡張子''{2}''のファイルが開けません。例外: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "ファイル{0}の名前を{1}に変更できませんでした。"
@@ -11367,7 +11713,7 @@ msgstr "''{0}'' からリレーションのパッケージを取得中"
msgid "Downloading {0} object from ''{1}''"
msgid_plural "Downloading {0} objects from ''{1}''"
-msgstr[0] "''{1}'' から {0} 個のオブジェクトをダウンロード中"
+msgstr[0] "''{1}'' から{0}件のオブジェクトをダウンロード中"
msgid ""
"Server replied with response code 404, retrying with an individual request "
@@ -11407,8 +11753,8 @@ msgstr "不明なセンテンス: {0}"
msgid "Zero coordinates: {0}"
msgstr "値のない座標: {0}"
-msgid "NMEA import success"
-msgstr "NMEAのインポートに成功しました。"
+msgid "NMEA import success:"
+msgstr "NMEAのインポートに成功しました:"
msgid "NMEA import failure!"
msgstr "NMEAのインポートに失敗しました。"
@@ -11441,7 +11787,7 @@ msgid "Successfully opened changeset {0}"
msgstr "変更セット {0} を開きました"
msgid "Changeset ID > 0 expected. Got {0}."
-msgstr "変更セットIDは0より大きくなければなりません。入力値: {0}"
+msgstr "変更セットIDは0より大きくなければなりません。{0}になっています。"
msgid "Updating changeset..."
msgstr "変更セットを更新中..."
@@ -11456,7 +11802,7 @@ msgid "No changeset present for diff upload."
msgstr "diffアップロードのための変更セットを用意できませんでした。"
msgid "Preparing upload request..."
-msgstr "アップロード要求を準備中..."
+msgstr "アップロードリクエストを準備中..."
msgid "Waiting 10 seconds ... "
msgstr "10秒待機中 ... "
@@ -11506,37 +11852,13 @@ msgstr "ファイル{0}中にデータが見つかりません。"
msgid "Open OsmChange file"
msgstr "OsmChangeファイルを開く"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "必須の属性 ''{0}'' がありません"
-
msgid "Unsupported version: {0}"
msgstr "サポートされないバージョン: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr "long 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr "long 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr "double型の属性 ''{0}'' の値が不正です。''{1}'' が指定されています。"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr "boolean 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr "OsmPrimitiveType 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
-msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない開始エレメント ''{0}'' があります。スキップします。"
+msgstr "変更セット内の位置({1},{2})で要素''{0}''の開始はサポートされていません。スキップします。"
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -11546,9 +11868,9 @@ msgstr ""
"ではない箇所に記述されています。"
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない終了エレメント ''{0}'' があります。スキップします。"
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
+msgstr "変更セット内の位置({1},{2})で要素''{0}''の終了はサポートされていません。スキップします。"
msgid "Parsing changeset content ..."
msgstr "変更セットコンテンツをパース中 ..."
@@ -11574,11 +11896,8 @@ msgstr "変更セットのリストを解析中..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "OAuth認証ヘッダでのHTTP接続のサインに失敗"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "警告: 環境設定 ''{0}'' に予期せぬ値 ''{1}'' が指定されています。"
-
-msgid "(at line {0}, column {1})"
-msgstr "(場所: 行 {0}, カラム {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "設定項目''{0}''が想定外の値です。''{1}''になっています。"
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>保存中にエラー発生。<br>エラー: <br>{0}</html>"
@@ -11588,9 +11907,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr "<html>バックアップファイルのレストア中にエラー発生。<br>エラー: <br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "ファイルをバックアップできません。例外: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "gzip圧縮したOSMファイル"
@@ -11612,6 +11928,9 @@ msgstr "ファイル''{0}''中にデータが見つかりません。"
msgid "Open OSM file"
msgstr "OSMファイルをオープン"
+msgid "Reading was canceled"
+msgstr "読み込みがキャンセルされました"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11664,9 +11983,9 @@ msgid ""
msgstr "ID {0} のOSM プリミティブの ''version'' 属性に不正な値。入力値: {1}"
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
-msgstr "要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは ''{3}''。入力値: {1}。"
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
+msgstr "{0}要素の''version''属性の値{1}を{2}に正規化します。APIバージョンは''{3}''です。"
msgid "Unknown or unsupported API version. Got {0}."
msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
@@ -11707,23 +12026,23 @@ msgid "Downloading referring ways ..."
msgstr "参照ウェイをダウンロード中"
msgid "Downloading referring relations ..."
-msgstr "参照リレーションをダウンロード中"
+msgstr "参照リレーションをダウンロード中..."
msgid "Reading changesets..."
-msgstr "変更セットを読み込んでいます..."
+msgstr "変更セットを読み込み中..."
msgid "Downloading changesets ..."
msgstr "変更セットをダウンロード中 ..."
msgid "Reading changeset {0} ..."
-msgstr "変更セット {0} を読み込んでいます ..."
+msgstr "変更セット{0}を読み込み中..."
msgid "Downloading changeset {0} ..."
-msgstr "変更セット {0} をダウンロード中 ..."
+msgstr "変更セット{0}をダウンロード中..."
msgid "Downloading {0} changeset ..."
msgid_plural "Downloading {0} changesets ..."
-msgstr[0] "{0} 個の変更セットをダウンロード中"
+msgstr[0] "{0}件の変更セットをダウンロード中..."
msgid "({0}/{1}) Downloading changeset {2} ..."
msgstr "({0}/{1}) 変更セット {2} をダウンロード中 ..."
@@ -11742,7 +12061,7 @@ msgstr "API {0} への接続に失敗しました"
msgid ""
"Could not connect to the OSM server. Please check your internet connection."
-msgstr "osmサーバーに接続できません。インターネット接続 をチェックしてください。"
+msgstr "osmサーバーに接続できません。インターネット接続をチェックしてください。"
msgid "Reading error text failed."
msgstr "エラーテキストの読み出しに失敗。"
@@ -11782,7 +12101,7 @@ msgstr "データ塊のアップロード開始..."
msgid "({0}/{1}) Uploading {2} object..."
msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) {2} オブジェクトのアップロード..."
+msgstr[0] "({0}/{1}) {2}件のオブジェクトのアップロード中..."
msgid "Uploading data ..."
msgstr "データアップロード中 ..."
@@ -11808,7 +12127,10 @@ msgid "Save user and password (unencrypted)"
msgstr "ユーザーとパスワードを保存します(暗号化されません)"
msgid "<delete from {0} objects>"
-msgstr "<{0}個のオブジェクトから削除>"
+msgstr "<{0}件のオブジェクトから削除>"
+
+msgid "Old values of"
+msgstr "以前の値:"
msgid "Add tags to selected objects"
msgstr "選択されたオブジェクトにタグを追加"
@@ -11828,6 +12150,15 @@ msgstr "Shift+Enter: 選択されたオブジェクトにすべてのタグを
msgid "Assume"
msgstr "適用"
+msgid "Existing values"
+msgstr "既存の値"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "値を反映するにはチェックボックスを有効にしてください"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "このセッションで{0}からすべてのタグを受け付ける"
+
msgid "Load data from API"
msgstr "APIからのデータ読み込み"
@@ -11852,8 +12183,14 @@ msgstr "新しいオブジェクトの作成"
msgid "Read protocol version"
msgstr "プロトコルバージョンの読み取り"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
-msgstr "警告: ポート {0} でリモートコントロールサーバーを開始できません: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr "リモート制御サーバーがポート{0}で開始できません。{1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "リモートコントロール::ポート{0}で接続を受け付けています"
+
+msgid "RemoteControl::Server stopped."
+msgstr "リモートコントロール::サーバーが停止しました。"
msgid "Remote Control has been asked to create a new node."
msgstr "リモート制御により、新しいノードを作成するよう指示されました。"
@@ -11861,9 +12198,6 @@ msgstr "リモート制御により、新しいノードを作成するよう指
msgid "There is no layer opened to add node"
msgstr "ノードを追加するレイヤーが開かれていません"
-msgid "Add way"
-msgstr "ウェイ追加"
-
msgid "Remote Control has been asked to create a new way."
msgstr "リモート制御により、新しいウェイを作成するよう指示されました。"
@@ -11873,8 +12207,18 @@ msgstr "不正な座標: {0}"
msgid "There is no layer opened to add way"
msgstr "ウェイを追加するレイヤーが開かれていません"
+msgid "Add way"
+msgstr "ウェイ追加"
+
msgid ""
-"Remote Control has been asked to load an imagery layer from the following "
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+"リモート制御により、サポートしている機能を報告するようリクエストされました。これにより、動作中のJOSMのバージョンをウェブサイトから推測することができま"
+"す。"
+
+msgid ""
+"Remote Control has been asked to load an imagery layer from the following "
"URL:"
msgstr "リモート制御により、次のURLから画像レイヤーを読み込むよう指示されました:"
@@ -11887,6 +12231,15 @@ msgstr "リモート制御により、次のURLからデータをインポート
msgid "Remote Control has been asked to load data from the API."
msgstr "リモート制御により、APIを使用してデータを読み込むよう指示されました。"
+msgid "The latitudes must be between {0} and {1}"
+msgstr "緯度は{0}～{1}の範囲でなければなりません。"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "経度は{0}～{1}の範囲でなければなりません。"
+
+msgid "The minima must be less than the maxima"
+msgstr "最小値は最大値より小さくなければなりません。"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11917,20 +12270,20 @@ msgstr "データ:"
msgid "local file"
msgstr "ローカルファイル"
-msgid "Link to a OSM data file on your local disk."
-msgstr "ローカルディスク上のOSMデータファイルにリンク"
+msgid "Link to a GPX file on your local disk."
+msgstr "ローカルディスクにあるGPXファイルにリンクします。"
msgid "include"
msgstr "埋め込む"
-msgid "Include OSM data in the .joz session file."
-msgstr ".jozセッションファイル中にOSMデータをインクルード"
+msgid "Include GPX data in the .joz session file."
+msgstr ".jozセッションファイルに含まれるGPXデータを含める。"
msgid "No file association"
msgstr "ファイルの関連付けがありません"
-msgid "OSM data will be included in the session file."
-msgstr "OSMデータはセッションファイルに含められます。"
+msgid "GPX data will be included in the session file."
+msgstr "セッションファイル中にGPXデータを含めます。"
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -11951,11 +12304,23 @@ msgstr "レイヤーに保存されていないデータが含まれています
msgid "Layer does not contain unsaved data."
msgstr "レイヤーには保存されていないデータがありません。"
+msgid "Link to a OSM data file on your local disk."
+msgstr "ローカルディスク上のOSMデータファイルにリンク"
+
+msgid "Include OSM data in the .joz session file."
+msgstr ".jozセッションファイル中にOSMデータをインクルード"
+
+msgid "OSM data will be included in the session file."
+msgstr "OSMデータはセッションファイルに含められます。"
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr "OSMデータレイヤーのメタデータのバージョン ''{0}'' はサポートされていません。0.1である必要があります。"
+msgid "Session file (*.jos, *.joz)"
+msgstr "セッションファイル (*.jos,*.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "''{0}'' ファイルが見つかりません。"
@@ -12025,15 +12390,15 @@ msgid "Download skipped"
msgstr "ダウンロードはスキップされました"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
-msgstr "警告: プラグイン''{0}''がダウンロードできません。ダウンロードリンクが不明です。ダウンロードをスキップします。"
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
+msgstr "プラグイン''{0}''をダウンロードできません。ダウンロードリンクがリンク切れです。ダウンロードをスキップします。"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"警告: プラグイン''{0}''をダウンロードできません。ダウンロードリンク''{1}''は、不正なURLです。ダウンロードスキップします。"
+"''{0}''プラグインをダウンロードできません。ダウンロードリンク''{1}''が有効なURLではありません。ダウンロードをスキップします。"
msgid "Failed to create plugin directory ''{0}''"
msgstr "プラグインディレクトリ''{0}''の作成に失敗しました。"
@@ -12056,7 +12421,7 @@ msgstr "もはや必要ではありません"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] "次のプラグインは現在では不要になっていますので無効化しました:"
+msgstr[0] "次のプラグインは不要になったので無効化しました。"
msgid ""
"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -12113,7 +12478,7 @@ msgid ""
msgid_plural ""
"Plugin {0} requires {1} plugins which were not found. The missing plugins "
"are:"
-msgstr[0] "プラグイン{0}が要求する{1}個のプラグインが見つかりません。見つからないプラグインは:"
+msgstr[0] "プラグイン{0}が要求する{1}件のプラグインが見つかりません。見つからないプラグインは:"
msgid ""
"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
@@ -12146,7 +12511,7 @@ msgstr "プラグイン ''{0}''の読み込み..."
msgid "JOSM could not find information about the following plugin:"
msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] "JOSMは次のプラグインの情報を見つけられません:"
+msgstr[0] "JOSMが次のプラグインの情報を見つけられませんでした。"
msgid "The plugin is not going to be loaded."
msgid_plural "The plugins are not going to be loaded."
@@ -12176,11 +12541,11 @@ msgstr[0] "JOSMが開始してからプリファレンスダイアログを開
msgid "Plugin update failed"
msgstr "プラグインの更新に失敗しました"
-msgid "Warning: failed to find plugin {0}"
-msgstr "警告: {0} プラグインが見つかりませんでした"
+msgid "Failed to find plugin {0}"
+msgstr "{0}プラグインの検索に失敗しました"
-msgid "Warning: failed to download plugin information list"
-msgstr "警告: プラグイン情報リストのダウンロードに失敗"
+msgid "Failed to download plugin information list"
+msgstr "プラグイン情報一覧のダウンロードに失敗しました"
msgid "Disable plugin"
msgstr "このプラグインを使用不可にする"
@@ -12194,25 +12559,23 @@ msgstr "プラグインを継続"
msgid "Click to keep the plugin ''{0}''"
msgstr "クリックしてプラグイン ''{0}'' を保持"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "警告: 期限切れプラグイン ''{0}'' の削除に失敗。"
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "期限切れのプラグイン''{0}''の削除に失敗しました。"
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"警告: ダウンロード済みのプラグイン ''{0}'' "
-"のインストールに失敗。インストールをスキップします。JOSMは古いプラグインのバージョンをロードします。"
+"ダウンロード済みのプラグイン''{0}''のインストールに失敗しました。インストールをスキップします。JOSMは古いバージョンをダウンロードします。"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
-msgstr "警告: ダウンロード一時ファイル ''{1}'' からプラグイン ''{0}'' のインストールに失敗しました。{2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr "一時的なダウンロードファイル''{1}''から''{0}''プラグインのインストールに失敗しました。{2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
-msgstr "警告: 一時ダウンロードファイル ''{1}'' からのプラグイン ''{0}'' のインストールに失敗。リネームに失敗。"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
+msgstr "一時的なダウンロードファイル''{1}''から''{0}''プラグインのインストールに失敗しました。ファイル名の変更に失敗しました。"
msgid "Click to disable the plugin ''{0}''"
msgstr "クリックしてプラグイン ''{0}'' を無効化"
@@ -12280,9 +12643,8 @@ msgstr "プラグインのサイトキャッシュファイルを処理中..."
msgid "Processing file ''{0}''"
msgstr "ファイル ''{0}''の処理中"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
-msgstr "警告: プラグイン情報取得のためのファイル ''{0}'' のスキャンに失敗。スキップします。"
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
+msgstr "プラグイン情報のファイル''{0}''が見つかりませんでした。スキップします。"
msgid "Processing plugin site cache icon files..."
msgstr "プラグインのサイトキャッシュアイコンファイルを処理中..."
@@ -12296,11 +12658,25 @@ msgstr "プラグインリストをダウンロード..."
msgid "Downloading plugin list from ''{0}''"
msgstr "''{0}'' からプラグインリストをダウンロード中"
+msgid "Plugin list download error"
+msgstr "プラグイン一覧ダウンロードエラー"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSMがプラグイン一覧のダウンロードに失敗しました。"
+
+msgid "Details:"
+msgstr "詳細:"
+
+msgid "Plugin icons download error"
+msgstr "プラグインアイコンダウンロードエラー"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSMがプラグインアイコンのダウンロードに失敗しました。"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
-msgstr ""
-"警告: プラグインディレクトリ ''{0}'' の作成に失敗。プラグインサイト ''{1}'' からのプラグインリストをキャッシュできません。"
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
+msgstr "プラグインディレクトリ''{0}''の作成に失敗しました。プラグインサイト''{1}''からのプラグイン一覧がキャッシュできません。"
msgid "Writing plugin list to local cache ''{0}''"
msgstr "ローカルキャッシュ ''{0}'' にプラグインリストを書き込み中"
@@ -12397,8 +12773,8 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>ノード {0}</strong>の削除に<strong>失敗しました</strong>。 ノード {1} "
-"にまだ参照されています。<br>ノードをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>ノード{0}</strong>の削除に<strong>失敗しました</strong>。{1}件のノードから参照されています。<br>ノード"
+"をロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -12409,8 +12785,8 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>ノード {0}</strong>の削除に<strong>失敗しました</strong>。 ウェイ {1} "
-"にまだ参照されています。<br>ウェイをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>ノード{0}</strong>の削除に<strong>失敗しました</strong>。{1}本のウェイから参照されています。<br>ウェイ"
+"をロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -12421,8 +12797,8 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the node, and upload again."
msgstr[0] ""
-"<strong>ノード {0}</strong>の削除に<strong>失敗しました</strong>。 リレーション {1} "
-"にまだ参照されています。<br>リレーションをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>ノード{0}</strong>の削除に<strong>失敗しました</strong>。{1}件のリレーションから参照されています。<br>"
+"リレーションをロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -12433,8 +12809,8 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the way, and upload again."
msgstr[0] ""
-"<strong>ウェイ {0}</strong>の削除に<strong>失敗しました</strong>。 ノード {1} "
-"にまだ参照されています。<br>ノードをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>ウェイ{0}</strong>の削除に<strong>失敗しました</strong>。{1}本のノードから参照されています。<br>ノード"
+"をロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -12445,8 +12821,8 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the way, and upload again."
msgstr[0] ""
-"<strong>ウェイ {0}</strong>の削除に<strong>失敗しました</strong>。 ウェイ {1} "
-"にまだ参照されています。<br>ウェイをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>ウェイ{0}</strong>の削除に<strong>失敗しました</strong>。 "
+"{1}本のウェイから参照されています。<br>ウェイをロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -12457,8 +12833,8 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the way, and upload again."
msgstr[0] ""
-"<strong>ウェイ {0}</strong>の削除に<strong>失敗しました</strong>。 リレーション {1} "
-"にまだ参照されています。<br>リレーションをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>ウェイ{0}</strong>の削除に<strong>失敗しました</strong>。 "
+"{1}件のリレーションから参照されています。<br>リレーションをロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -12469,8 +12845,8 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
-"<strong>リレーション {0}</strong>の削除に<strong>失敗しました</strong>。 ノード {1} "
-"にまだ参照されています。<br>ノードをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>リレーション{0}</strong>の削除に<strong>失敗しました</strong>。{1}個のノードから参照されています。<br>"
+"ノードをロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -12481,8 +12857,8 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the relation, and upload again."
msgstr[0] ""
-"<strong>リレーション {0}</strong>の削除に<strong>失敗しました</strong>。 ウェイ {1} "
-"にまだ参照されています。<br>ウェイをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>リレーション{0}</strong>の削除に<strong>失敗しました</strong>。{1}本のウェイから参照されています。<br>"
+"ウェイをロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -12493,8 +12869,8 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the relation, and upload again."
msgstr[0] ""
-"<strong>リレーション {0}</strong>の削除に<strong>失敗しました</strong>。 リレーション {1} "
-"にまだ参照されています。<br>リレーションをロードし、参照を削除して、アップロードを再試行してください。"
+"<strong>リレーション{0}</strong>の削除に<strong>失敗しました</strong>。{1}件のリレーションから参照されています。<"
+"br>リレーションをロードし、参照を削除して、アップロードを再試行してください。"
msgid ""
"<html>Uploading to the server <strong>failed</strong> because your "
@@ -12517,8 +12893,8 @@ msgid ""
"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
"token.</html>"
msgstr ""
-"<html>OSMサーバーへの OAuth トークン ''{0}'' での認証に失敗しました。<br>環境設定での "
-"OAuthトークンを再取得してください。</html>"
+"<html>OAuthトークン''{0}''を使用してOSMサーバーでの認証に失敗しました。<br>環境設定でOAuthトークンを再取得してください。</"
+"html>"
msgid ""
"<html>Authorisation at the OSM server failed.<br>The server reported the "
@@ -12534,8 +12910,8 @@ msgid ""
"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
"another OAuth token.</html>"
msgstr ""
-"<html>OAuthトークン ''{0}'' はOSMサーバーにて認証が失敗しました。<br>保護されたリソース ''{1}'' "
-"に<br>アクセスすることが認められていません。<br>設定画面を開き、別のOAuthトークンに訂正してください。</html>"
+"<html>OAuthトークン''{0}''を使用してOSMサーバーでの認証に失敗しました。<br>保護されたリソース''{1}''に<br>アクセスする"
+"ことが認められていません。<br>設定画面を開き、別のOAuthトークンに訂正してください。</html>"
msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
@@ -12620,8 +12996,8 @@ msgid ""
"large.<br>Either request a smaller area or use an export file provided by "
"the OSM community."
msgstr ""
-"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。<br>もっと小さいエリアでリクエストするか、OSM "
-"コミュニティから提供されたエクスポートファイルを使用してください。"
+"ダウンロードしようとしたエリアが大きすぎるか、リクエストが大きすぎます。<br>もっと小さいエリアでリクエストするか、OSMコミュニティから提供されたエク"
+"スポートファイルを使用してください。"
msgid "<br>Error message(untranslated): {0}"
msgstr "<br>エラーメッセージ(未訳): {0}"
@@ -12666,18 +13042,12 @@ msgstr "Fatal: 画像 ''{0}'' の配置に失敗しました。これは深刻
msgid "Failed to locate image ''{0}''"
msgstr "イメージ ''{0}'' が見つかりません"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "警告: zipファイル ''{0}'' のハンドルに失敗。例外コード: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr "警告: セキュリティ上の理由によりディレクトリ ''{0}'' へのアクセスに失敗。例外コード: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "zipファイル''{0}''の扱いに失敗しました。例外: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
-msgstr "警告: JOSMの言語コード ''{0}''から、wiki言語設定の導出に失敗しました。既定の''en''を使用します。"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
+msgstr "セキュリティのため''{0}''ディレクトリへのアクセスに失敗しました。例外: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [番号を入力してください]"
@@ -12687,9 +13057,52 @@ msgid ""
"platform first."
msgstr "URLのオープンに失敗。現在プラットフォームセットがありません。最初にプラットフォームをセットしてください。"
+msgid "Opening URL: {0}"
+msgstr "URL {0} を開きます"
+
+msgid "zoom"
+msgstr "ズーム"
+
+msgid "latitude"
+msgstr "緯度"
+
+msgid "longitude"
+msgstr "経度"
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr "URLが{0}/{1}/{2}を含んでいません"
+
+msgid "URL does not contain valid {0}"
+msgstr "URLが有効な{0}を含んでいません"
+
msgid "reserved"
msgstr "予約"
+msgid "Outdated Java version"
+msgstr "Javaのバージョンが期限切れ"
+
+msgid "Update Java"
+msgstr "Javaを更新"
+
+msgid "You are running version {0} of Java."
+msgstr "あなたはJavaバージョン{0}を使用しています。"
+
+msgid "February 2013"
+msgstr "2013年2月"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr "このバージョンは{1}以降{0}がサポートしておらず、使用を推奨できません。"
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr "JOSMは間もなくこのバージョンでは動作しなくなります。Java{0}にアップデートすることを強くお勧めします。"
+
+msgid "Would you like to update now ?"
+msgstr "今すぐ更新しますか？"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "暗黙のショートカットが競合しました。 ''{1}'' によって ''{0}'' は ''{2}'' に変更されました。"
@@ -12722,8 +13135,21 @@ msgstr ""
"<html><p>申し訳ありませんが、バッファからタグを貼り付けることができません。JOSMオブジェクトが含まれていないか、合う文字列がありません。</p"
"></html>"
-msgid "Right click = copy to clipboard"
-msgstr "右クリック = クリップボードへコピー"
+msgid "ms"
+msgstr "ミリ秒"
+
+msgid "s"
+msgstr "秒"
+
+msgid "min"
+msgstr "分"
+
+msgid "h"
+msgstr "時間"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "日"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -12794,7 +13220,7 @@ msgid ""
"You requested too many nodes (limit is 50,000). Either request a smaller "
"area, or use planet.osm"
msgstr ""
-"あまりにたくさんのノードを要求しました（制限は50,000です)。 より小さなエリアで要求し直すか、planet.osmを使用してください。"
+"リクエストしたノード数が多すぎます（上限は50,000個です)。 より小さなエリアでリクエストし直すか、planet.osmを使用してください。"
msgid "Database offline for maintenance"
msgstr "データベースはメンテナンスのためにオフラインになっています。"
@@ -12805,7 +13231,8 @@ msgstr "ダウンロードしたデータが大きすぎました。しばらく
msgid ""
"The maximum bbox size is 0.25, and your request was too large. Either "
"request a smaller area, or use planet.osm"
-msgstr "bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求するか、planet.osm を使用して下さい。"
+msgstr ""
+"bbox の最大は 0.25です。リクエストされた範囲は大きすぎます。より小さい範囲をリクエストするか、planet.osmを使用して下さい。"
msgid "JOSM-Trac login at josm.openstreetmap.de"
msgstr "josm.openstreetmap.de での JOSM-Tracログイン"
@@ -12844,7 +13271,7 @@ msgstr "通り名住居表示"
msgctxt "Relation type"
msgid "boundary"
-msgstr "行政区画"
+msgstr "行政境界"
msgctxt "Relation type"
msgid "enforcement"
@@ -13052,6 +13479,11 @@ msgid "Saturation:"
msgstr "彩度:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr "交通情報を編集可能にし、道路交通シミュレーションソフトSUMOにエクスポートします。"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr "単一のダイアログでグループの共通の住所を補完入力します。オプションで自動的にウェイから独立した住居番号を作成します。"
@@ -13123,7 +13555,7 @@ msgid "Shows the elevation profile and some statistical data of a GPX track."
msgstr "高度プロファイルやGPXトラックの統計データをいくつかを表示します。"
msgid "Handling of French EPCIs (boundary=local_authority)"
-msgstr "フランスの EPCI を扱います（boundary=local_authority）。"
+msgstr "フランスの EPCI を扱う（boundary=local_authority）"
msgid "Use external scripts in JOSM"
msgstr "JOSM中での外部スクリプトの使用"
@@ -13132,7 +13564,11 @@ msgid "Fast drawing ways by mouse"
msgstr "マウスによるウェイ高速描画"
msgid "Finds and fixes invalid street addresses in a comfortable way."
-msgstr "不正な住所を楽に検索し修正します。"
+msgstr "無効な住所を楽に検索し修正します。"
+
+msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr "付近の地図を編集しているユーザーと会話しましょう。誰かが近くに来ると通知されます。"
msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
@@ -13166,7 +13602,7 @@ msgid ""
msgstr "画像オフセットのデータベース: 画像オフセットをボタン1つで共有・取得"
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSプラグインのように画像をマップモードに調整します"
+msgstr "WMSプラグイン形式画像調整地図モード"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -13193,7 +13629,7 @@ msgid ""
msgstr "現在のレイヤーのオブジェクトに関する拡張情報のポップアップ - 現在は GPX 測位点の情報"
msgid "A helper for IRS satellite adjustment."
-msgstr "IRS 衛星の位置合わせの補助。"
+msgstr "IRS 衛星の位置合わせの補助ツールです。"
msgid ""
"Provides Java Topology Suite (JTS) library and related utilities. Not meant "
@@ -13245,9 +13681,6 @@ msgstr "4 または5のウェイのセットに左折禁止を追加"
msgid "Simplifies download from different read-only APIs."
msgstr "異なる読込専用APIからの簡素化されたダウンロード"
-msgid "Simply convert an area to a multipolygon."
-msgstr "エリアをマルチポリゴンに単純に変換"
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr "選択された領域のすべてのオブジェクトに、一度に属性タグを設定できるようにします"
@@ -13294,7 +13727,7 @@ msgstr "現在表示されているスクリーンを、きれいなSVG画像と
msgid ""
"Bring in errors from Osm Inspector and display it on the current JOSM "
"bounding box"
-msgstr "OSM Inspector からエラーを取得し、現在の JOSM の作業枠に表示します"
+msgstr "OSM Inspectorからエラーを取得し、現在のJOSMの矩形範囲に表示します"
msgid "Import OSM data in PBF format"
msgstr "OSMデータをPBF形式でインポート"
@@ -13307,6 +13740,9 @@ msgid ""
"right click menu of the image layer."
msgstr "GPS位置情報を画像ファイルヘッダに書き込みます。このフィーチャは画像レイヤーの右クリックメニューから起動します。"
+msgid "Make photos movable and position them on the map."
+msgstr "画像を移動可能にして地図上に配置できるようにします。"
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13331,9 +13767,6 @@ msgstr "このプラグインは公共交通ルートのマッピングと編集
msgid "Relation and multipolygon creating and editing panel."
msgstr "リレーションとマルチポリゴンを作成し編集するパネル。"
-msgid "Adds Restart JOSM item to File menu."
-msgstr "ファイルメニューにJOSMを再起動する項目を追加します。"
-
msgid "Plugin for reverting changesets"
msgstr "変更セットを元に戻すプラグイン"
@@ -13363,9 +13796,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr "極端な鈍角上のノードを取り除いてエリアを簡素化します。これは最大の削除エリアサイズで制限できます。近傍ノードの平均化も行います。"
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "openSeaMap用の海図を作成・編集"
-
msgid "Edit features for OpenSeaMap"
msgstr "OpenSeaMapの編集機能"
@@ -13405,6 +13835,11 @@ msgid ""
"to be running."
msgstr "チェコ共和国のcadastralマップから建物をトレース。動作させる為にはトレースサーバー(.NETまたはMono)が必要。"
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr "地図から建物やその他のシェイプをトレースします。Tracer2Serverが動作中である必要があります。"
+
msgid "Plugin to digital sign OSM-Data"
msgstr "OSMデータに電子署名をするプラグイン"
@@ -13457,9 +13892,6 @@ msgid ""
"behind."
msgstr "A地点からB地点までイメージ上でレースカーを運転します。"
-msgid "Highways"
-msgstr "道路"
-
msgid "Streets"
msgstr "ストリート"
@@ -13470,7 +13902,7 @@ msgid "Edit Motorway"
msgstr "自動車専用道路の編集"
msgid "Reference"
-msgstr "道路番号"
+msgstr "参照番号"
msgid "Lanes"
msgstr "車線数"
@@ -13497,7 +13929,7 @@ msgid "metal"
msgstr "金属"
msgid "wood"
-msgstr "木"
+msgstr "木材"
msgid "paving_stones"
msgstr "石畳"
@@ -13544,6 +13976,9 @@ msgstr "土手"
msgid "Lit"
msgstr "照明"
+msgid "Toll"
+msgstr "料金"
+
msgid "Motorway Link"
msgstr "自動車専用道路の連絡路"
@@ -13634,6 +14069,50 @@ msgstr "居住区域内道路"
msgid "Edit Residential Street"
msgstr "居住区域内道路の編集"
+msgid "Bicycle Road"
+msgstr "自転車道"
+
+msgid "Edit Bicycle Road"
+msgstr "自転車道の編集"
+
+msgid "Highway type"
+msgstr "道路の種別"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "居住区域内道路"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "敷地内道路"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "一般道（2車線未満）"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "小道"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "自転車道"
+
+msgid "Vehicle access"
+msgstr "自動車の通行"
+
+msgid "yes"
+msgstr "はい"
+
+msgid "no"
+msgstr "いいえ"
+
+msgid "destination"
+msgstr "利用者のみ"
+
+msgid "Oneway for bicycle"
+msgstr "自転車の一方通行"
+
msgid "Living Street"
msgstr "生活道路"
@@ -13652,11 +14131,11 @@ msgstr "エリア"
msgid "Service"
msgstr "敷地内道路"
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr "敷地内道路の編集"
-msgid "Serviceway type"
-msgstr "敷地内道路のタイプ"
+msgid "Service way type"
+msgstr "敷地内道路の種別"
msgid "alley"
msgstr "裏通り・路地"
@@ -13667,6 +14146,9 @@ msgstr "進入路"
msgid "parking_aisle"
msgstr "駐車場の通路"
+msgid "drive-through"
+msgstr "ドライブスルー"
+
msgid "Parking Aisle"
msgstr "駐車場の通路"
@@ -13694,18 +14176,12 @@ msgstr "ロータリー交差点"
msgid "jughandle"
msgstr "右折連絡路"
-msgid "yes"
-msgstr "はい"
-
msgid "Road Restrictions"
msgstr "通行制限"
msgid "Edit Road Restrictions"
msgstr "通行制限の編集"
-msgid "Toll"
-msgstr "料金"
-
msgid "No exit (cul-de-sac)"
msgstr "行き止まり(cul-de-sac)"
@@ -13715,9 +14191,6 @@ msgstr "通行制限"
msgid "General Access"
msgstr "一般通行"
-msgid "destination"
-msgstr "目的地"
-
msgid "delivery"
msgstr "配達目的"
@@ -13727,15 +14200,15 @@ msgstr "許可が必要"
msgid "private"
msgstr "私用"
+msgid "customers"
+msgstr "来客用"
+
msgid "agricultural"
msgstr "農業用"
msgid "forestry"
msgstr "林業用途"
-msgid "no"
-msgstr "いいえ"
-
msgid "official"
msgstr "公務"
@@ -13781,6 +14254,9 @@ msgstr "大型トラック (hov)"
msgid "Public Service Vehicles (psv)"
msgstr "公共交通機関(psv)"
+msgid "Tourist buses"
+msgstr "観光バス"
+
msgid "Min. speed (km/h)"
msgstr "最低速度（km/h)"
@@ -13851,7 +14327,7 @@ msgid "living_street"
msgstr "生活道路"
msgid "service"
-msgstr "サービス"
+msgstr "敷地内道路"
msgid "bus_guideway"
msgstr "バスガイドウェイ"
@@ -13865,6 +14341,9 @@ msgstr "橋の編集"
msgid "viaduct"
msgstr "高架橋"
+msgid "suspension"
+msgstr "つり橋"
+
msgid "swing"
msgstr "旋回橋"
@@ -13969,20 +14448,29 @@ msgstr "グレード2以下の岩登りがある。露出して不安定な険
msgid "Visibility"
msgstr "可視性"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "良好"
+msgstr "完全"
+msgctxt "trail_visibility"
msgid "good"
-msgstr "良い"
+msgstr "良好"
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr "中間"
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "悪い"
+msgstr "劣悪"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "あまり見えない"
+msgstr "困難"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "不可視"
msgid "Wheelchairs"
msgstr "車いす"
@@ -13999,11 +14487,11 @@ msgstr "馬道"
msgid "Edit Bridleway"
msgstr "馬道の編集"
-msgid "Cycle Lane"
-msgstr "自転車レーン"
+msgid "Cycle Lane/Track"
+msgstr "自転車専用通行帯"
-msgid "Edit Cycle Lane"
-msgstr "自転車レーンの編集"
+msgid "Edit Cycle Lane or Track"
+msgstr "自転車専用通行帯の編集"
msgid "Cycleway"
msgstr "自転車用道路"
@@ -14038,8 +14526,8 @@ msgstr "右側の自転車レーン"
msgid "Oneway (bicycle)"
msgstr "一方通行(自転車)"
-msgid "Edit Highway"
-msgstr "道路を編集"
+msgid "Edit Highway Attributes:"
+msgstr "道路属性の編集:"
msgid "Highway"
msgstr "道路"
@@ -14084,7 +14572,7 @@ msgid "Edit Motorway Junction"
msgstr "自動車道のIC/JCTの編集"
msgid "Number"
-msgstr "数"
+msgstr "番号"
msgid "Exit to"
msgstr "出口方面"
@@ -14107,12 +14595,18 @@ msgstr "パーキングエリア"
msgid "Edit Rest Area"
msgstr "パーキングエリアの編集"
-msgid "Emergency Phone"
-msgstr "緊急電話"
+msgid "Drinking Water"
+msgstr "飲料水"
msgid "Traffic Signal"
msgstr "信号機"
+msgid "Edit Traffic Signal"
+msgstr "信号を編集"
+
+msgid "Optional crossing attributes:"
+msgstr "その他の交差点の属性:"
+
msgid "Pedestrian crossing type"
msgstr "横断歩道タイプ"
@@ -14128,15 +14622,6 @@ msgstr "途中に島あり"
msgid "unmarked"
msgstr "マークなし"
-msgid "Cross on horseback"
-msgstr "馬用横断道"
-
-msgid "Cross by bicycle"
-msgstr "自転車用横断歩道"
-
-msgid "Crossing attendant"
-msgstr "有人"
-
msgid "Crossing type name (UK)"
msgstr "横断歩道タイプ名(UK)"
@@ -14158,6 +14643,15 @@ msgstr "ペガサス柄横断歩道（ＵＫ）"
msgid "tiger"
msgstr "虎縞柄横断歩道（ＵＫ）"
+msgid "Crossing attendant"
+msgstr "有人"
+
+msgid "Cross by bicycle"
+msgstr "自転車用横断歩道"
+
+msgid "Cross on horseback"
+msgstr "馬用横断道"
+
msgid "Stop"
msgstr "停止"
@@ -14167,6 +14661,9 @@ msgstr "徐行"
msgid "Mini-roundabout"
msgstr "小さなロータリー"
+msgid "Edit Mini-Roundabout"
+msgstr "小さなロータリーを編集"
+
msgid "Direction"
msgstr "方向"
@@ -14176,12 +14673,9 @@ msgstr "時計回り"
msgid "Pedestrian Crossing"
msgstr "横断歩道"
-msgid "Edit Crossing"
+msgid "Edit Pedestrian Crossing"
msgstr "横断歩道の編集"
-msgid "Type name (UK)"
-msgstr "タイプ名(UK)"
-
msgid "Traffic Calming"
msgstr "交通静穏化"
@@ -14212,17 +14706,14 @@ msgstr "スピードテーブル"
msgid "Passing Place"
msgstr "対向車待機所"
-msgid "Edit Passing Place"
-msgstr "対向車待機所を編集"
-
msgid "Turning Circle"
msgstr "転回場"
msgid "City Limit"
-msgstr "市境界標識"
+msgstr "市町村境界標識"
msgid "Edit City Limit Sign"
-msgstr "市境界標識の編集"
+msgstr "市町村境界標識の編集"
msgid "Second Name"
msgstr "二つ目の名前"
@@ -14246,7 +14737,22 @@ msgid "Wikipedia"
msgstr "Wikipedia"
msgid "Barriers"
-msgstr "ゲート等"
+msgstr "柵"
+
+msgid "Block"
+msgstr "ブロック"
+
+msgid "Edit Block"
+msgstr "ブロックの編集"
+
+msgid "Allowed traffic:"
+msgstr "許可された通行:"
+
+msgid "Material"
+msgstr "素材"
+
+msgid "stone"
+msgstr "石"
msgid "Bollard"
msgstr "車止め杭"
@@ -14254,14 +14760,23 @@ msgstr "車止め杭"
msgid "Edit Bollard"
msgstr "車止め杭の編集"
-msgid "Allowed traffic:"
-msgstr "許可された通行:"
+msgid "Bollard type"
+msgstr "車止め杭の種別"
+
+msgid "rising"
+msgstr "ライジングボラード"
+
+msgid "removable"
+msgstr "削除可能"
+
+msgid "plastic"
+msgstr "プラスチック"
msgid "Cycle Barrier"
msgstr "自転車止め"
-msgid "Block"
-msgstr "ブロック"
+msgid "Edit Cycle Barrier"
+msgstr "自転車止め"
msgid "Cattle Grid"
msgstr "家畜脱出防止溝"
@@ -14272,6 +14787,9 @@ msgstr "家畜脱出防止溝の編集"
msgid "Bus Trap"
msgstr "バストラップ"
+msgid "Edit Bus Trap"
+msgstr "バストラップの編集"
+
msgid "Spikes"
msgstr "車止めのとげ"
@@ -14293,44 +14811,88 @@ msgstr "国境検査所の編集"
msgid "Hedge"
msgstr "生け垣"
+msgid "Edit Hedge"
+msgstr "生け垣の編集"
+
+msgid "Height (meters)"
+msgstr "高さ（m）"
+
+msgid "Genus"
+msgstr "属"
+
+msgid "Species"
+msgstr "種"
+
+msgid "Taxon"
+msgstr "群"
+
msgid "Fence"
msgstr "フェンス"
+msgid "Edit Fence"
+msgstr "フェンスの編集"
+
msgid "barbed_wire"
msgstr "鉄条網"
-msgid "chain"
+msgid "chain_link"
msgstr "金網"
msgid "electric"
msgstr "電気"
-msgid "hedge"
-msgstr "生垣"
-
msgid "pole"
msgstr "柱"
msgid "split_rail"
msgstr "柵"
+msgid "wire"
+msgstr "ワイヤー"
+
+msgid "Guard Rail"
+msgstr "ガードレール"
+
+msgid "Edit Guard Rail"
+msgstr "ガードレール"
+
msgid "Wall"
msgstr "壁"
+msgid "Edit Wall"
+msgstr "壁の編集"
+
msgid "City Wall"
-msgstr "城壁"
+msgstr "市壁"
+
+msgid "Edit City Wall"
+msgstr "市壁の編集"
msgid "Retaining Wall"
msgstr "擁壁"
+msgid "Edit Retaining Wall"
+msgstr "擁壁の編集"
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "排水路"
+msgstr "堀"
-msgid "Entrance"
-msgstr "入口"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "排水路の編集"
-msgid "Edit Entrance"
-msgstr "入口の編集"
+msgid "Kerb"
+msgstr "縁石"
+
+msgid "Edit Kerb"
+msgstr "縁石の編集"
+
+msgid "Entrance (barrier opening)"
+msgstr "入口（柵の開口部）"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "入口（柵の開口部）の編集"
msgid "Gate"
msgstr "ゲート"
@@ -14362,12 +14924,27 @@ msgstr "幅の狭いゲート"
msgid "Edit Kissing Gate"
msgstr "幅の狭いゲートの編集"
+msgid "Chain"
+msgstr "チェーン"
+
+msgid "Edit Chain"
+msgstr "チェーンの編集"
+
msgid "Stile"
msgstr "踏み段"
msgid "Edit Stile"
msgstr "踏み段の編集"
+msgid "ladder"
+msgstr "梯子"
+
+msgid "squeezer"
+msgstr "隙間"
+
+msgid "stepover"
+msgstr "階段"
+
msgid "Turnstile"
msgstr "回転式木戸"
@@ -14425,6 +15002,9 @@ msgstr "放水路"
msgid "Edit Drain"
msgstr "放水路の編集"
+msgid "Ditch"
+msgstr "排水路"
+
msgid "Edit Ditch"
msgstr "排水路の編集"
@@ -14434,6 +15014,12 @@ msgstr "小川"
msgid "Edit Stream"
msgstr "小川の編集"
+msgid "Wadi"
+msgstr "涸れ川"
+
+msgid "Edit Wadi"
+msgstr "涸れ川の編集"
+
msgid "Canal"
msgstr "運河"
@@ -14473,9 +15059,6 @@ msgstr "ダムの編集"
msgid "Groyne"
msgstr "防砂堤"
-msgid "Edit Groyne"
-msgstr "防砂堤を編集"
-
msgid "Breakwater"
msgstr "防波堤"
@@ -14509,6 +15092,21 @@ msgstr "蓋付き貯水池の編集"
msgid "Edit Water"
msgstr "水域の編集"
+msgid "Water Body"
+msgstr "水域の本体"
+
+msgid "lake"
+msgstr "湖"
+
+msgid "lagoon"
+msgstr "潟湖"
+
+msgid "pond"
+msgstr "池"
+
+msgid "reservoir"
+msgstr "貯水池"
+
msgid "Land"
msgstr "陸地"
@@ -14588,22 +15186,27 @@ msgid "Edit Ferry Terminal"
msgstr "フェリーターミナルの編集"
msgid "Cargo"
-msgstr "荷物"
+msgstr "積載"
+msgctxt "cargo"
msgid "passengers"
-msgstr "旅行者"
+msgstr "乗客"
+msgctxt "cargo"
msgid "vehicle"
-msgstr "車両"
+msgstr "自動車"
+msgctxt "cargo"
msgid "bicycle"
msgstr "自転車"
+msgctxt "cargo"
msgid "hgv"
msgstr "中大型貨物車"
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "旅行者;車両"
+msgstr "乗客;自動車"
msgid "Ferry Route"
msgstr "フェリー航路"
@@ -14674,17 +15277,20 @@ msgstr "軍用"
msgid "tourism"
msgstr "観光"
-msgid "Service/Type"
+msgid "freight"
+msgstr "貨物"
+
+msgid "Service type"
msgstr "線路の種別"
msgid "yard"
msgstr "ヤード"
msgid "siding"
-msgstr "待避線"
+msgstr "側線"
msgid "spur"
-msgstr "分岐線"
+msgstr "引き込み線"
msgid "Gauge (mm)"
msgstr "軌間(mm)"
@@ -14698,11 +15304,14 @@ msgstr "架線"
msgid "rail"
msgstr "線路"
-msgid "Voltage"
-msgstr "電圧"
+msgid "Voltage in Volts (V)"
+msgstr "電圧（V）"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "周波数（Hz）"
-msgid "Frequency (Hz)"
-msgstr "周波数 (Hz)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -14713,9 +15322,6 @@ msgstr "トロッコ線路（狭軌）"
msgid "Edit Narrow Gauge Rail"
msgstr "トロッコ線路（狭軌）の編集"
-msgid "Types"
-msgstr "タイプ"
-
msgid "Monorail"
msgstr "モノレール"
@@ -14758,32 +15364,70 @@ msgstr "使われていない線路"
msgid "Edit Disused Railway"
msgstr "使われていない線路の編集"
-msgid "Optional Types"
-msgstr "追加のタイプ"
-
msgid "Abandoned Rail"
msgstr "廃棄された線路"
+msgid "Edit Abandoned Railway"
+msgstr "廃線を編集"
+
msgid "Level Crossing"
msgstr "踏切"
-msgid "Crossing"
-msgstr "歩行者用踏切"
+msgid "Edit Level Crossing"
+msgstr "踏切の編集"
-msgid "Crossing type"
-msgstr "踏切のタイプ"
+msgid "Supervised"
+msgstr "監視員の有無"
-msgid "Turntable"
-msgstr "転車台（ターンテーブル）"
+msgid "Traffic lights"
+msgstr "信号"
-msgid "Buffer Stop"
-msgstr "車止め"
+msgid "Sound signals"
+msgstr "音の鳴る信号"
-msgid "Aerialway"
-msgstr "リフト"
+msgid "Barrier"
+msgstr "柵"
-msgid "Chair Lift"
-msgstr "いすリフト"
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "あり"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "なし"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "半分"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "完全"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "半幅二本"
+
+msgid "Crossing"
+msgstr "歩行者用踏切"
+
+msgid "Edit Crossing"
+msgstr "歩道用踏切の編集"
+
+msgid "Crossing type"
+msgstr "踏切のタイプ"
+
+msgid "Turntable"
+msgstr "転車台（ターンテーブル）"
+
+msgid "Buffer Stop"
+msgstr "車止め"
+
+msgid "Aerialway"
+msgstr "索道"
+
+msgid "Chair Lift"
+msgstr "いすリフト"
msgid "Edit Chair Lift"
msgstr "いすリフトの編集"
@@ -14869,13 +15513,11 @@ msgstr "マジックカーペット"
msgid "Edit Magic Carpet"
msgstr "マジックカーペットの編集"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "貨物索道"
+msgstr "貨物用索道"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "貨物索道の編集"
+msgstr "貨物用索道の編集"
msgctxt "aerialway"
msgid "Station"
@@ -14885,13 +15527,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "駅の編集"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "支柱"
+msgstr "索道用支柱"
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "支柱の編集"
+msgstr "索道用支柱の編集"
msgid "Parking"
msgstr "駐車場・駐輪場"
@@ -14903,17 +15543,17 @@ msgid "multi-storey"
msgstr "多階の建物"
msgid "surface"
-msgstr "表面"
+msgstr "平面"
msgid "underground"
msgstr "地下"
+msgid "rooftop"
+msgstr "屋上"
+
msgid "Access"
msgstr "アクセス"
-msgid "customers"
-msgstr "お客様用"
-
msgid "Park and Ride"
msgstr "パークアンドライド"
@@ -14941,9 +15581,6 @@ msgstr "駐車区画"
msgid "Edit Parking space"
msgstr "駐車区画の編集"
-msgid "rooftop"
-msgstr "屋上"
-
msgid "Capacity"
msgstr "収容台数"
@@ -14954,25 +15591,42 @@ msgid "Covered (with roof)"
msgstr "屋根付き"
msgid "Time Limit (minutes)"
-msgstr "時間制限(分単位)"
+msgstr "制限時間（分）"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "監視員の有無"
-
msgid "Opening Hours"
msgstr "営業時間"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
+
+msgid "Sa-Su 00:00-24:00"
+msgstr "Sa-Su 00:00-24:00"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+
+msgid "sunrise-sunset"
+msgstr "sunrise-sunset"
+
+msgid "Su 10:00+"
+msgstr "Su 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgid "Parking entrance"
msgstr "駐車場の入口"
@@ -15121,6 +15775,9 @@ msgstr "充電ステーション"
msgid "Edit Charging Station (for electric cars)"
msgstr "充電ステーションの編集(電気自動車用)"
+msgid "Voltage"
+msgstr "電圧"
+
msgid "Amperage"
msgstr "電流"
@@ -15142,6 +15799,12 @@ msgstr "修理"
msgid "Edit Car Repair"
msgstr "自動車修理工場の編集"
+msgid "Parts"
+msgstr "部品"
+
+msgid "Edit Car Parts"
+msgstr "自動車部品店の編集"
+
msgid "Tyres"
msgstr "タイヤ店"
@@ -15169,6 +15832,12 @@ msgstr "レンタル"
msgid "Edit Car Rental"
msgstr "レンタカーの編集"
+msgid "Second hand"
+msgstr "中古品（セコハン）"
+
+msgid "only"
+msgstr "限定"
+
msgid "Sharing"
msgstr "カーシェアリング"
@@ -15193,22 +15862,6 @@ msgstr "サービス:"
msgid "Sale"
msgstr "販売"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "はい"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "ブランド(メーカー)"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "中古"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "いいえ"
-
msgid "brand"
msgstr "ブランド(メーカー)"
@@ -15230,9 +15883,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "部品"
-
msgid "Clothes"
msgstr "衣料品店"
@@ -15296,8 +15946,8 @@ msgstr "自転車レンタルの編集"
msgid "Public Transport"
msgstr "公共交通"
-msgid "Route"
-msgstr "ルート"
+msgid "Public transport route"
+msgstr "公共交通ルート"
msgid "Edit Route"
msgstr "ルート編集"
@@ -15324,7 +15974,7 @@ msgid "trolleybus"
msgstr "トロリーバス"
msgid "aerialway"
-msgstr "リフト"
+msgstr "索道"
msgid "ferry"
msgstr "フェリー"
@@ -15380,13 +16030,13 @@ msgid "route segment"
msgstr "ルート区間"
msgid "stop position"
-msgstr "停留所"
+msgstr "停止位置"
msgid "stop position (exit only)"
-msgstr "停留所（降車のみ）"
+msgstr "停止位置（降車線用）"
msgid "stop position (entry only)"
-msgstr "停留所（乗車のみ）"
+msgstr "停止位置（乗車線用）"
msgid "platform"
msgstr "プラットホーム"
@@ -15407,10 +16057,10 @@ msgid "route variant/direction (at least 2)"
msgstr "別ルート/方向（2本以上）"
msgid "Stop Area"
-msgstr "停留所"
+msgstr "停車場"
msgid "Edit Stop Area"
-msgstr "停留所の編集"
+msgstr "停車場"
msgid "UIC reference"
msgstr "UIC番号"
@@ -15419,7 +16069,7 @@ msgid "UIC name"
msgstr "UIC名"
msgid "Stop Position"
-msgstr "停留所"
+msgstr "停止位置"
msgid "Platform"
msgstr "プラットホーム"
@@ -15427,6 +16077,9 @@ msgstr "プラットホーム"
msgid "Station or amenities"
msgstr "駅や設備"
+msgid "Edit Stop Position"
+msgstr "停止位置の編集"
+
msgid "Bus"
msgstr "バス"
@@ -15457,6 +16110,9 @@ msgstr "ケーブルカー"
msgid "Ferry"
msgstr "フェリー"
+msgid "Edit Platform"
+msgstr "プラットフォームの編集"
+
msgid "Bench"
msgstr "ベンチ"
@@ -15469,9 +16125,6 @@ msgstr "車いす"
msgid "limited"
msgstr "制限"
-msgid "only"
-msgstr "限定"
-
msgid "Highway platform (legacy)"
msgstr "道路上のプラットフォーム（旧）"
@@ -15481,9 +16134,14 @@ msgstr "鉄道のプラットホーム（旧）"
msgid "funicular"
msgstr "ケーブルカー"
+msgctxt "railway"
msgid "Station"
msgstr "駅"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "駅の編集"
+
msgid "Building"
msgstr "建物"
@@ -15496,11 +16154,14 @@ msgstr "地下鉄入口の編集"
msgid "Ticket Machine"
msgstr "券売機"
+msgid "Edit Ticket Machine"
+msgstr "券売機の編集"
+
msgid "Reference Number"
msgstr "参照番号"
msgid "Coins"
-msgstr "コイン"
+msgstr "硬貨"
msgid "Notes"
msgstr "備考"
@@ -15515,19 +16176,11 @@ msgid "Credit cards"
msgstr "クレジットカード"
msgid "Account or loyalty cards"
-msgstr "決済または会員用カード"
+msgstr "会員カード"
msgid "Public Transport (legacy)"
msgstr "公共交通（旧）"
-msgctxt "railway"
-msgid "Station"
-msgstr "駅"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "駅の編集"
-
msgid "UIC-Reference"
msgstr "UIC-Reference"
@@ -15576,7 +16229,7 @@ msgstr "バス乗り場の編集"
msgid "Taxi"
msgstr "タクシー"
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr "タクシー乗り場の編集"
msgid "Airport"
@@ -15630,6 +16283,21 @@ msgstr "ターミナル"
msgid "Edit Terminal"
msgstr "ターミナルの編集"
+msgid "Internet access"
+msgstr "インターネットアクセス"
+
+msgid "wlan"
+msgstr "無線LAN"
+
+msgid "wired"
+msgstr "有線LAN"
+
+msgid "terminal"
+msgstr "駅"
+
+msgid "Internet access fee"
+msgstr "インターネットアクセス費用"
+
msgctxt "airport"
msgid "Gate"
msgstr "ゲート"
@@ -15652,21 +16320,6 @@ msgstr "ホテルの編集"
msgid "Stars"
msgstr "星の数"
-msgid "Internet access"
-msgstr "インターネットアクセス"
-
-msgid "wlan"
-msgstr "無線LAN"
-
-msgid "wired"
-msgstr "有線LAN"
-
-msgid "terminal"
-msgstr "駅"
-
-msgid "Internet access fee"
-msgstr "インターネットアクセス費用"
-
msgid "Smoking"
msgstr "喫煙"
@@ -15850,6 +16503,12 @@ msgstr "ナイトクラブ"
msgid "Edit Nightclub"
msgstr "ナイトクラブの編集"
+msgid "Stripclub"
+msgstr "ストリップクラブ"
+
+msgid "Edit Stripclub"
+msgstr "ストリップクラブの編集"
+
msgid "Tourism"
msgstr "旅行"
@@ -15871,9 +16530,15 @@ msgstr "展望塔"
msgid "Information Office"
msgstr "案内所"
+msgid "Edit Information Office"
+msgstr "案内所の編集"
+
msgid "Map"
msgstr "マップ"
+msgid "Edit Information Map"
+msgstr "案内地図の編集"
+
msgid "Detail Grade"
msgstr "詳細なグレード"
@@ -15886,6 +16551,9 @@ msgstr "ストリート"
msgid "scheme"
msgstr "スキーム"
+msgid "toposcope"
+msgstr "頂上標"
+
msgid "Shown Area"
msgstr "表示されたエリア"
@@ -15925,6 +16593,9 @@ msgstr "... 他の可能な輸送モード"
msgid "Information Board"
msgstr "情報板"
+msgid "Edit Information Board"
+msgstr "案内板の編集"
+
msgid "Board Content"
msgstr "掲示板の内容"
@@ -15946,24 +16617,36 @@ msgstr "植物"
msgid "Guidepost"
msgstr "道しるべ"
+msgid "Edit Guidepost"
+msgstr "道しるべの編集"
+
msgid "Information Terminal"
msgstr "情報端末"
+msgid "Edit Information Terminal"
+msgstr "情報端末の編集"
+
msgid "Closer description"
msgstr "詳細な説明"
msgid "Audioguide"
msgstr "音声ガイド"
+msgid "Edit Audioguide"
+msgstr "音声ガイドの編集"
+
msgid "Audioguide via mobile phone?"
msgstr "携帯電話による音声ガイド"
msgid "Phone number"
msgstr "電話番号"
-msgid "Other Information Points"
+msgid "Other Information Point"
msgstr "その他の情報ポイント"
+msgid "Edit Information Point"
+msgstr "情報ポイントの編集"
+
msgid "Leisure"
msgstr "レジャー"
@@ -15985,9 +16668,6 @@ msgstr "ドッグパーク"
msgid "Edit Dog Park"
msgstr "ドッグパークの編集"
-msgid "Barrier"
-msgstr "柵"
-
msgid "fence"
msgstr "フェンス"
@@ -16012,8 +16692,17 @@ msgstr "サウナ"
msgid "Edit Sauna"
msgstr "サウナの編集"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr "乗馬場"
+
+msgid "Edit Horse riding"
+msgstr "乗馬場の編集"
+
+msgid "Brothel"
+msgstr "売春宿"
+
+msgid "Edit Brothel"
+msgstr "売春宿の編集"
msgid "Playground"
msgstr "児童公園"
@@ -16085,50 +16774,44 @@ msgstr "芸術作品"
msgid "Edit Artwork"
msgstr "芸術作品の編集"
-msgid "Place of Worship"
-msgstr "礼拝所"
-
-msgid "Edit Place of Worship"
-msgstr "礼拝所の編集"
-
-msgid "Religion"
-msgstr "宗教"
+msgid "Recording Studio"
+msgstr "録音スタジオ"
-msgid "bahai"
-msgstr "バハーイ教"
+msgid "Edit Studio"
+msgstr "スタジオの編集"
-msgid "buddhist"
-msgstr "仏教"
+msgid "audio"
+msgstr "オーディオ"
-msgid "christian"
-msgstr "キリスト教"
+msgid "video"
+msgstr "ビデオ"
-msgid "hindu"
-msgstr "ヒンズー教"
+msgid "Place of Worship"
+msgstr "礼拝所"
-msgid "jain"
-msgstr "ジャイナ教"
+msgid "Church"
+msgstr "教会"
-msgid "jewish"
-msgstr "ユダヤ教"
+msgid "Edit Church"
+msgstr "教会の編集"
-msgid "muslim"
-msgstr "ムスリム"
+msgid "Building type"
+msgstr "建物の種類"
-msgid "sikh"
-msgstr "シーク教"
+msgid "basilica"
+msgstr "バシリカ聖堂"
-msgid "spiritualist"
-msgstr "降霊術士、イタコ"
+msgid "cathedral"
+msgstr "大聖堂"
-msgid "taoist"
-msgstr "道教"
+msgid "chapel"
+msgstr "礼拝堂"
-msgid "unitarian"
-msgstr "ユニテリアン"
+msgid "church"
+msgstr "教会"
-msgid "zoroastrian"
-msgstr "ゾロアスター教"
+msgid "temple"
+msgstr "寺院"
msgid "Denomination"
msgstr "宗派"
@@ -16145,8 +16828,14 @@ msgstr "カトリック"
msgid "evangelical"
msgstr "福音派"
+msgid "greek_catholic"
+msgstr "ギリシャカトリック"
+
+msgid "greek_orthodox"
+msgstr "ギリシャ正教会"
+
msgid "jehovahs_witness"
-msgstr "ものみの塔、エホバの証人"
+msgstr "エホバの証人"
msgid "lutheran"
msgstr "ルター派"
@@ -16157,6 +16846,9 @@ msgstr "メソジスト派"
msgid "mormon"
msgstr "モルモン"
+msgid "new_apostolic"
+msgstr "新使徒教会"
+
msgid "orthodox"
msgstr "ギリシャ正教系"
@@ -16172,101 +16864,205 @@ msgstr "プロテスタント"
msgid "quaker"
msgstr "クエーカー教徒"
-msgid "shia"
-msgstr "シーア派"
+msgid "roman_catholic"
+msgstr "ローマカトリック"
-msgid "sunni"
-msgstr "スンニ派"
+msgid "russian_orthodox"
+msgstr "ロシア正教会"
+
+msgid "seventh_day_adventist"
+msgstr "安息日再臨派教会"
msgid "Service Times"
-msgstr "営業時間"
+msgstr "参拝時間"
-msgid "Su 10:00"
-msgstr "日 10:00"
+msgid "18:00"
+msgstr "18:00"
-msgid "Su 10:30"
-msgstr "日 10:30"
+msgid "sunset,sunrise"
+msgstr "sunset,sunrise"
-msgid "Su 11:00"
-msgstr "日 11:00"
+msgid "Su 9:30,11:00"
+msgstr "Su 9:30,11:00"
-msgid "Opening Hours for visiting"
-msgstr "拝観時間"
+msgid "Sa,Su,PH 9:00"
+msgstr "Sa,Su,PH 9:00"
-msgid "Recording Studio"
-msgstr "録音スタジオ"
+msgid "Sa 18:00; Su 10:45"
+msgstr "Sa 18:00; Su 10:45"
-msgid "Edit Studio"
-msgstr "スタジオの編集"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
-msgid "audio"
-msgstr "オーディオ"
+msgid "Sa 10:00+"
+msgstr "Sa 10:00+"
-msgid "video"
-msgstr "ビデオ"
+msgid "Mosque"
+msgstr "モスク"
-msgid "Public Building"
-msgstr "公共施設"
+msgid "Edit Mosque"
+msgstr "モスクの編集"
-msgid "Edit Public Building"
-msgstr "公共施設の編集"
+msgid "mosque"
+msgstr "モスク"
-msgid "Town hall"
-msgstr "役場"
+msgid "ibadi"
+msgstr "イバード派"
-msgid "Edit Town hall"
-msgstr "役場の編集"
+msgid "shia"
+msgstr "シーア派"
-msgid "Community Centre"
-msgstr "公民館"
+msgid "sunni"
+msgstr "スンニ派"
-msgid "Embassy"
-msgstr "大使館"
+msgid "Synagogue"
+msgstr "シナゴーグ"
-msgid "Edit Embassy"
-msgstr "大使館の編集"
+msgid "Edit Synagogue"
+msgstr "シナゴーグの編集"
-msgid "Courthouse"
-msgstr "裁判所"
+msgid "synagogue"
+msgstr "シナゴーグ"
-msgid "Edit Courthouse"
-msgstr "裁判所の編集"
+msgid "conservative"
+msgstr "保守派"
-msgid "Prison"
-msgstr "刑務所"
+msgid "reform"
+msgstr "改革派"
-msgid "Edit Prison"
-msgstr "刑務所の編集"
+msgid "Buddhist Temple"
+msgstr "仏教寺院"
-msgid "Police"
-msgstr "警察"
+msgid "Edit Buddhist Temple"
+msgstr "仏教寺院の編集"
-msgid "Edit Police"
-msgstr "警察署・交番の編集"
+msgid "theravada"
+msgstr "上座部仏教"
-msgid "Fire Station"
-msgstr "消防署"
+msgid "mahayana"
+msgstr "大乗仏教"
-msgid "Edit Fire Station"
-msgstr "消防署の編集"
+msgid "vajrayana"
+msgstr "密教"
-msgid "Post Office"
-msgstr "郵便局"
+msgid "Hindu Temple"
+msgstr "ヒンドゥー教寺院"
-msgid "Edit Post Office"
-msgstr "郵便局の編集"
+msgid "Edit Hindu Temple"
+msgstr "ヒンドゥー教寺院の編集"
-msgid "Education"
-msgstr "教育"
+msgid "vaishnavism"
+msgstr "ヴィシュヌ教"
-msgid "Kindergarten"
-msgstr "幼稚園"
+msgid "shaivism"
+msgstr "シヴァ教"
-msgid "Edit Kindergarten"
-msgstr "幼稚園の編集"
+msgid "shaktism"
+msgstr "シャクティ派"
-msgid "School"
-msgstr "学校"
+msgid "smartism"
+msgstr "正統派"
+
+msgid "Shinto Shrine"
+msgstr "神社"
+
+msgid "Edit Shinto Shrine"
+msgstr "神社の編集"
+
+msgid "Other Place of Worship"
+msgstr "その他の礼拝所"
+
+msgid "Edit other Place of Worship"
+msgstr "その他の礼拝所の編集"
+
+msgid "Religion"
+msgstr "宗教"
+
+msgid "bahai"
+msgstr "バハーイ教"
+
+msgid "jain"
+msgstr "ジャイナ教"
+
+msgid "sikh"
+msgstr "シーク教"
+
+msgid "spiritualist"
+msgstr "降霊術士、イタコ"
+
+msgid "taoist"
+msgstr "道教"
+
+msgid "unitarian"
+msgstr "ユニテリアン"
+
+msgid "zoroastrian"
+msgstr "ゾロアスター教"
+
+msgid "Public Building"
+msgstr "公共施設"
+
+msgid "Edit Public Building"
+msgstr "公共施設の編集"
+
+msgid "Town hall"
+msgstr "役場"
+
+msgid "Edit Town hall"
+msgstr "役場の編集"
+
+msgid "Community Centre"
+msgstr "公民館"
+
+msgid "Embassy"
+msgstr "大使館"
+
+msgid "Edit Embassy"
+msgstr "大使館の編集"
+
+msgid "Courthouse"
+msgstr "裁判所"
+
+msgid "Edit Courthouse"
+msgstr "裁判所の編集"
+
+msgid "Prison"
+msgstr "刑務所"
+
+msgid "Edit Prison"
+msgstr "刑務所の編集"
+
+msgid "Police"
+msgstr "警察"
+
+msgid "Edit Police"
+msgstr "警察署・交番の編集"
+
+msgid "Fire Station"
+msgstr "消防署"
+
+msgid "Edit Fire Station"
+msgstr "消防署の編集"
+
+msgid "Post Office"
+msgstr "郵便局"
+
+msgid "Edit Post Office"
+msgstr "郵便局の編集"
+
+msgid "Education"
+msgstr "教育"
+
+msgid "Kindergarten"
+msgstr "幼稚園"
+
+msgid "Edit Kindergarten"
+msgstr "幼稚園の編集"
+
+msgid "School"
+msgstr "学校"
msgid "Edit School"
msgstr "学校の編集"
@@ -16292,6 +17088,12 @@ msgstr "自動車学校の編集"
msgid "License Classes"
msgstr "免許の種類"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "健康"
@@ -16301,6 +17103,12 @@ msgstr "病院"
msgid "Edit Hospital"
msgstr "病院の編集"
+msgid "Clinic"
+msgstr "クリニック"
+
+msgid "Edit Clinic"
+msgstr "クリニックの編集"
+
msgid "Doctors"
msgstr "医院"
@@ -16367,12 +17175,66 @@ msgstr "動物病院"
msgid "Edit Veterinary"
msgstr "動物病院の編集"
-msgid "Note"
-msgstr "備考"
+msgid "Edit Toilets"
+msgstr "トイレの編集"
+
+msgid "Access rights"
+msgstr "利用者"
+
+msgid "public"
+msgstr "公開"
+
+msgid "seasonal"
+msgstr "季節限定"
+
+msgid "flush"
+msgstr "水洗"
+
+msgid "pitlatrine"
+msgstr "汲み取り式"
+
+msgid "chemical"
+msgstr "薬品処理"
+
+msgid "bucket"
+msgstr "バケツ式"
+
+msgid "Usage Position"
+msgstr "便器の種類"
+
+msgid "seated"
+msgstr "洋式"
+
+msgid "seated;urinal"
+msgstr "洋式＋小便器"
+
+msgid "squat"
+msgstr "和式"
+
+msgid "urinal"
+msgstr "小便器"
msgid "Post Box"
msgstr "郵便ポスト"
+msgid "Edit Postbox"
+msgstr "郵便ポストの編集"
+
+msgid "Collection times"
+msgstr "収集時刻"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+
+msgid "Drive through"
+msgstr "ドライブスルー"
+
msgid "Telephone"
msgstr "電話"
@@ -16382,6 +17244,30 @@ msgstr "電話を編集"
msgid "Telephone cards"
msgstr "テレフォンカード"
+msgid "Emergency Phone"
+msgstr "緊急電話"
+
+msgid "Internet Access"
+msgstr "インターネットアクセス"
+
+msgid "Edit Internet Access"
+msgstr "インターネットアクセスの編集"
+
+msgid "Automated Defibrillator"
+msgstr "AED（自動体外式除細動器）"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "AEDの編集"
+
+msgid "Located inside a building?"
+msgstr "建物内"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "最終検査日（YYYY-MM-DD）"
+
+msgid "Last check note"
+msgstr "最終検査時のメモ"
+
msgid "Clock"
msgstr "時計"
@@ -16391,30 +17277,36 @@ msgstr "時計の編集"
msgid "Display"
msgstr "画面"
-msgctxt "display"
msgid "analog"
msgstr "アナログ"
-msgctxt "display"
msgid "digital"
msgstr "デジタル"
-msgctxt "display"
msgid "sundial"
msgstr "日時計"
-msgctxt "display"
msgid "unorthodox"
msgstr "特殊"
msgid "Support"
msgstr "設置方法"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "支柱"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "壁面に設置"
+msgstr "壁掛け"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "広告板"
+msgstr "音楽時計"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "地面上"
msgid "Visibility/readability"
msgstr "可視性/視認性"
@@ -16441,10 +17333,10 @@ msgid "Shows humidity"
msgstr "湿度の表示"
msgid "Recycling"
-msgstr "リサイクル"
+msgstr "資源回収場所"
-msgid "Edit Recycling station"
-msgstr "リサイクルステーションの編集"
+msgid "Edit Recycling Station"
+msgstr "資源回収場所の編集"
msgid "Batteries"
msgstr "バッテリー"
@@ -16470,27 +17362,15 @@ msgstr "処理場"
msgid "Waste Basket"
msgstr "ゴミ箱"
-msgid "Edit Waste Basket"
-msgstr "ゴミ箱を編集"
-
msgid "Waste Disposal"
msgstr "ゴミ集積所"
-msgid "Edit Waste Disposal"
-msgstr "ゴミ集積所の編集"
+msgid "Edit Bench"
+msgstr "ベンチの編集"
msgid "Backrest"
msgstr "背もたれ"
-msgid "Material"
-msgstr "素材"
-
-msgid "stone"
-msgstr "石"
-
-msgid "plastic"
-msgstr "プラスチック"
-
msgid "Amount of Seats"
msgstr "席の数"
@@ -16525,14 +17405,17 @@ msgstr "ハンティングスタンドの編集"
msgid "Height"
msgstr "高さ"
+msgctxt "height"
msgid "low"
-msgstr "低い"
+msgstr "低"
+msgctxt "height"
msgid "half"
-msgstr "半分"
+msgstr "中"
+msgctxt "height"
msgid "full"
-msgstr "完全"
+msgstr "高"
msgid "Hide"
msgstr "隠す"
@@ -16540,11 +17423,11 @@ msgstr "隠す"
msgid "Lock"
msgstr "ロック"
-msgid "Drinking Water"
-msgstr "飲料水"
+msgid "Edit Source of Potable Water"
+msgstr "飲料水供給所"
-msgid "Edit Drinking Water"
-msgstr "飲料水の編集"
+msgid "Indoor"
+msgstr "室内"
msgid "Fire Hydrant"
msgstr "消火栓"
@@ -16571,6 +17454,9 @@ msgstr "ため池"
msgid "Diameter (in mm)"
msgstr "直径(mm単位)"
+msgid "Hydrant Position"
+msgstr "消火栓の位置"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "レーン"
@@ -16608,117 +17494,153 @@ msgstr "スタジアム"
msgid "Edit Stadium"
msgstr "スタジアムの編集"
-msgid "select sport:"
-msgstr "スポーツ選択:"
+msgid "Select sport:"
+msgstr "スポーツを選択:"
-msgid "sport"
+msgid "Sport"
msgstr "スポーツ"
+msgctxt "sport"
msgid "multi"
-msgstr "多目的"
+msgstr "多種目"
+msgctxt "sport"
msgid "archery"
-msgstr "アーチェリー"
+msgstr "弓道・アーチェリー"
+msgctxt "sport"
msgid "athletics"
-msgstr "アスレチック"
+msgstr "陸上競技"
+msgctxt "sport"
msgid "american_football"
msgstr "アメリカンフットボール"
+msgctxt "sport"
msgid "australian_football"
-msgstr "オーストラリアフットボール"
+msgstr "オーストラリアンフットボール"
+msgctxt "sport"
msgid "baseball"
msgstr "野球"
+msgctxt "sport"
msgid "basketball"
msgstr "バスケットボール"
+msgctxt "sport"
msgid "boules"
-msgstr "ペタンク"
+msgstr "ブールズ"
+msgctxt "sport"
msgid "bowls"
-msgstr "ボーリング"
+msgstr "ローンボウルズ"
+msgctxt "sport"
msgid "canadian_football"
msgstr "カナディアンフットボール"
+msgctxt "sport"
msgid "canoe"
msgstr "カヌー"
+msgctxt "sport"
msgid "climbing"
-msgstr "登山"
+msgstr "クライミング"
+msgctxt "sport"
msgid "cricket"
msgstr "クリケット"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "クリケットネット"
+msgstr "クリケットネッツ"
+msgctxt "sport"
msgid "croquet"
-msgstr "クローク"
+msgstr "ゲートボール"
+msgctxt "sport"
msgid "cycling"
msgstr "サイクリング"
+msgctxt "sport"
msgid "dog_racing"
msgstr "ドッグレース"
+msgctxt "sport"
msgid "equestrian"
-msgstr "乗馬"
+msgstr "馬術"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "ゲーリック・ゲームズ"
+msgstr "ゲーリック・ゲーム"
+msgctxt "sport"
msgid "golf"
msgstr "ゴルフ"
+msgctxt "sport"
msgid "gymnastics"
-msgstr "体操"
+msgstr "体操競技"
+msgctxt "sport"
msgid "hockey"
msgstr "ホッケー"
+msgctxt "sport"
msgid "horse_racing"
msgstr "競馬"
+msgctxt "sport"
msgid "motor"
msgstr "モータースポーツ"
+msgctxt "sport"
msgid "pelota"
msgstr "ペロタ"
+msgctxt "sport"
msgid "racquet"
-msgstr "ラケットボール"
+msgstr "ラケット"
+msgctxt "sport"
msgid "rugby_league"
-msgstr "ラグビーリーグ"
+msgstr "リーグラグビー"
+msgctxt "sport"
msgid "rugby_union"
-msgstr "(通常の)ラグビー"
+msgstr "ラグビー"
+msgctxt "sport"
msgid "shooting"
msgstr "射撃"
+msgctxt "sport"
msgid "skateboard"
msgstr "スケートボード"
+msgctxt "sport"
msgid "skating"
msgstr "スケート"
+msgctxt "sport"
msgid "skiing"
msgstr "スキー"
+msgctxt "sport"
msgid "soccer"
msgstr "サッカー"
+msgctxt "sport"
msgid "swimming"
msgstr "水泳"
+msgctxt "sport"
msgid "table_tennis"
msgstr "卓球"
+msgctxt "sport"
msgid "tennis"
msgstr "テニス"
@@ -16729,10 +17651,10 @@ msgid "Edit Sports Centre"
msgstr "スポーツセンターの編集"
msgid "Pitch"
-msgstr "運動場"
+msgstr "競技場"
msgid "Edit Pitch"
-msgstr "運動場の編集"
+msgstr "競技場の編集"
msgid "Racetrack"
msgstr "競技トラック"
@@ -16752,33 +17674,43 @@ msgstr "ミニチュアゴルフ"
msgid "Edit Miniature Golf"
msgstr "ミニチュアゴルフの編集"
-msgid "Sport"
-msgstr "スポーツ"
-
msgid "Multi"
msgstr "多目的"
msgid "Edit Multi"
msgstr "Multiの編集"
-msgid "type"
-msgstr "タイプ"
-
+msgctxt "running"
msgid "pitch"
msgstr "運動場"
+msgctxt "running"
msgid "sports_centre"
msgstr "スポーツセンター"
+msgctxt "running"
msgid "stadium"
msgstr "スタジアム"
+msgctxt "running"
+msgid "track"
+msgstr "トラック"
+
msgid "9pin"
msgstr "ボウリング場（9ピン）"
msgid "Edit 9pin"
msgstr "ボウリング場（9ピン）の編集"
+msgid "pitch"
+msgstr "競技場"
+
+msgid "sports_centre"
+msgstr "スポーツセンター"
+
+msgid "stadium"
+msgstr "スタジアム"
+
msgid "10pin"
msgstr "ボーリング場"
@@ -16812,11 +17744,27 @@ msgstr "競艇場の編集"
msgid "Edit Cycling"
msgstr "サイクリングの編集"
+msgctxt "racing"
+msgid "pitch"
+msgstr "競技場"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "スポーツセンター"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "スタジアム"
+
+msgctxt "racing"
+msgid "track"
+msgstr "トラック"
+
msgid "Dog Racing"
msgstr "ドッグレース"
msgid "Edit Dog Racing"
-msgstr "ドックレースの編集"
+msgstr "ドッグレースの編集"
msgid "Equestrian"
msgstr "乗馬"
@@ -16824,8 +17772,33 @@ msgstr "乗馬"
msgid "Edit Equestrian"
msgstr "乗馬の編集"
-msgid "horse_riding"
-msgstr "乗馬"
+msgctxt "riding"
+msgid "pitch"
+msgstr "競技場"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "スポーツセンター"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "スタジアム"
+
+msgctxt "riding"
+msgid "track"
+msgstr "トラック"
+
+msgid "clay"
+msgstr "粘土"
+
+msgid "dirt"
+msgstr "土"
+
+msgid "fine_gravel"
+msgstr "砂利"
+
+msgid "mud"
+msgstr "泥"
msgid "Horse Racing"
msgstr "競馬"
@@ -16873,7 +17846,7 @@ msgid "Piste type"
msgstr "ゲレンデのタイプ"
msgid "downhill"
-msgstr "ダウンヒル"
+msgstr "滑降"
msgid "nordic"
msgstr "ノルディックスキー"
@@ -16887,38 +17860,56 @@ msgstr "スノーパーク"
msgid "Difficulty"
msgstr "難易度"
+msgctxt "piste:difficulty"
msgid "novice"
msgstr "初心者"
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "初球"
+msgstr "初級"
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "中級"
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "高度"
+msgstr "上級"
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "エキスパート"
+msgstr "達人"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "ただ乗り"
+msgstr "フリーライド"
msgid "Grooming"
msgstr "整備状況"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "クラシック"
+msgctxt "piste:grooming"
msgid "mogul"
msgstr "モーグル"
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "フリー"
+
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "クラシック＋スケート"
+msgstr "クラシック;フリー"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "スクーター"
+msgstr "そり"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "バックカントリー"
+msgstr "山スキー"
msgid "Shooting"
msgstr "射撃"
@@ -16959,19 +17950,15 @@ msgstr "ゲーリックゲーム"
msgid "Edit Gaelic Games"
msgstr "ゲーリックゲームの編集"
-msgctxt "gaelic game"
msgid "Hurling"
msgstr "ハーリング"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "サッカー"
+msgstr "ゲーリックフットボール"
-msgctxt "gaelic game"
msgid "Camogie"
-msgstr "カモージー"
+msgstr "カモジー"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "ラウンダーズ"
@@ -17110,6 +18097,18 @@ msgstr "模型飛行機場"
msgid "Edit Model Aerodrome"
msgstr "模型飛行機場の編集"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "競技場"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "スポーツセンター"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "トラック"
+
msgid "RC Car"
msgstr "ラジコンカー"
@@ -17122,60 +18121,134 @@ msgstr "人工物"
msgid "Edit Building"
msgstr "建物の編集"
+msgctxt "building"
+msgid "yes"
+msgstr "あり"
+
+msgctxt "building"
msgid "roof"
msgstr "屋根"
+msgctxt "building"
msgid "garage"
msgstr "車庫"
-msgid "church"
-msgstr "教会"
+msgctxt "building"
+msgid "garages"
+msgstr "車庫"
+msgctxt "building"
+msgid "industrial"
+msgstr "工場"
+
+msgctxt "building"
msgid "school"
msgstr "学校"
+msgctxt "building"
msgid "hangar"
-msgstr "倉庫"
+msgstr "格納庫"
+msgctxt "building"
msgid "commercial"
-msgstr "商業施設"
+msgstr "店舗"
+msgctxt "building"
msgid "farm"
-msgstr "農家"
+msgstr "農業用"
+msgctxt "building"
msgid "transportation"
-msgstr "交通施設"
+msgstr "交通センター"
+msgctxt "building"
msgid "greenhouse"
msgstr "温室"
+msgctxt "building"
msgid "office"
msgstr "オフィス"
+msgctxt "building"
msgid "university"
msgstr "大学"
+msgctxt "building"
+msgid "hospital"
+msgstr "病院"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "倉庫"
+
+msgctxt "building"
+msgid "retail"
+msgstr "店舗"
+
+msgctxt "building"
+msgid "shed"
+msgstr "格納庫"
+
msgid "Residential Building"
msgstr "住宅"
msgid "Edit Residential Building"
msgstr "住宅の編集"
+msgctxt "building"
+msgid "residential"
+msgstr "住宅"
+
+msgctxt "building"
msgid "apartments"
-msgstr "アパート,マンション"
+msgstr "アパート"
+msgctxt "building"
msgid "house"
-msgstr "住宅"
+msgstr "一戸建て"
+msgctxt "building"
msgid "hut"
-msgstr "(ほったて)小屋"
+msgstr "小屋"
-msgid "terrace"
-msgstr "テラス"
+msgctxt "building"
+msgid "dormitory"
+msgstr "寮"
+msgctxt "building"
+msgid "terrace"
+msgstr "テラスハウス"
+
+msgctxt "building"
msgid "detached"
msgstr "一戸建て"
+msgid "Entrance"
+msgstr "入口"
+
+msgid "Edit Entrance"
+msgstr "入口の編集"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "あり"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "玄関"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "通用口"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "出口"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "非常口"
+
msgid "Tower"
msgstr "タワー"
@@ -17191,9 +18264,6 @@ msgstr "通信用"
msgid "observation"
msgstr "観察"
-msgid "Height (meters)"
-msgstr "高さ（m）"
-
msgid "Flagpole"
msgstr "旗竿"
@@ -17403,72 +18473,188 @@ msgstr "営業時間"
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
-msgid "Measurement Station"
-msgstr "測量所"
+msgid "Monitoring Station"
+msgstr "観測所"
-msgid "Edit Measurement Station"
-msgstr "測量所を編集"
+msgid "Edit Monitoring Station"
+msgstr "観測所の編集"
-msgid "Measurement"
-msgstr "測定"
-
-msgid "particulate_matter"
-msgstr "粒子状物質"
+msgid "Monitoring:"
+msgstr "観測対象:"
-msgid "seismic"
-msgstr "地震"
+msgid "Weather"
+msgstr "気象"
-msgid "water_level"
+msgid "Water level"
msgstr "水位"
-msgid "weather"
-msgstr "気象"
+msgid "Tide Level"
+msgstr "潮位"
-msgid "Recording"
-msgstr "レコーディング"
+msgid "Traffic"
+msgstr "交通"
-msgid "manually"
-msgstr "手動"
+msgid "Air Quality"
+msgstr "大気"
+
+msgid "Noise"
+msgstr "騒音"
+
+msgid "GPS Signals"
+msgstr "GPS信号"
+
+msgid "GLONASS Signals"
+msgstr "GLONASS信号"
+
+msgid "Galileo Signals"
+msgstr "Galileo信号"
+
+msgid "Radiation"
+msgstr "放射線"
+
+msgid "Seismic Activity"
+msgstr "地震波"
+
+msgid "Recording:"
+msgstr "記録方式:"
-msgid "automated"
+msgid "Automated"
msgstr "自動"
-msgid "remote"
-msgstr "遠隔"
+msgid "Manually"
+msgstr "手動"
-msgctxt "display"
-msgid "no"
-msgstr "no"
+msgid "Remote"
+msgstr "遠隔操作"
+
+msgid "Display:"
+msgstr "表示方法:"
+
+msgid "Analog"
+msgstr "アナログ"
+
+msgid "Digital"
+msgstr "デジタル"
msgid "Survey Point"
msgstr "調査ポイント"
msgid "Edit Survey Point"
-msgstr "測点の編集"
+msgstr "調査ポイントの編集"
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr "監視カメラ"
msgid "Edit Surveillance Camera"
msgstr "監視カメラの編集"
msgid "indoor"
-msgstr "インドア"
+msgstr "室内"
msgid "outdoor"
-msgstr "アウトドア"
+msgstr "屋外"
-msgid "public"
-msgstr "公開"
+msgid "Zone"
+msgstr "対象"
+
+msgid "parking"
+msgstr "駐車場"
+
+msgid "traffic"
+msgstr "交通"
+
+msgid "shop"
+msgstr "店舗"
+
+msgid "bank"
+msgstr "銀行"
+
+msgid "Camera"
+msgstr "カメラ"
+
+msgid "fixed"
+msgstr "固定"
+
+msgid "panning"
+msgstr "首振り"
+
+msgid "dome"
+msgstr "ドーム型"
+
+msgid "Mounted on"
+msgstr "設置場所"
+
+msgid "ceiling"
+msgstr "天井"
+
+msgid "Direction in degrees"
+msgstr "方向（角度）"
+
+msgid "Inclination in degrees"
+msgstr "傾き（角度）"
+
+msgid "Height in meter (m)"
+msgstr "高さ（m）"
msgid "Power"
msgstr "電力関係"
+msgid "Power Plant"
+msgstr "発電所"
+
+msgid "Edit Power Plant"
+msgstr "発電所の編集"
+
+msgid "Start date"
+msgstr "運用開始日"
+
+msgid "Output forms of energy"
+msgstr "エネルギーの出力形式"
+
+msgid "(please add this information to the generators if possible)"
+msgstr "（可能であれば発電機にこの情報を追加してください）"
+
+msgid "electricity"
+msgstr "電力"
+
+msgid "2 W"
+msgstr "2W"
+
+msgid "3 kW"
+msgstr "3kW"
+
+msgid "5 MW"
+msgstr "5000KW"
+
+msgid "7 GW"
+msgstr "700万KW"
+
+msgid "hot water"
+msgstr "温水"
+
+msgid "hot air"
+msgstr "熱風"
+
+msgid "cold water"
+msgstr "冷水"
+
+msgid "cold air"
+msgstr "冷風"
+
+msgid "compressed air"
+msgstr "圧縮空気"
+
+msgid "steam"
+msgstr "蒸気"
+
+msgid "vacuum"
+msgstr "真空"
+
msgid "Power Generator"
-msgstr "エネルギー施設"
+msgstr "発電機"
msgid "Edit Power Generator"
-msgstr "エネルギー施設の編集"
+msgstr "発電機の編集"
msgid "biofuel"
msgstr "バイオ燃料"
@@ -17515,89 +18701,192 @@ msgstr "風"
msgid "Method"
msgstr "方式"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "微生物による分解"
+msgstr "嫌気性消化"
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr "ダム・堰"
+msgctxt "generator method"
msgid "combustion"
-msgstr "火力発電"
+msgstr "火力"
-msgid "dam"
-msgstr "ダム"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "生物 / 石炭 / ディーゼル / ガス / ガソリン / 石油 / 可燃ごみ"
+msgctxt "generator method"
msgid "fission"
-msgstr "原子力（核分裂）"
+msgstr "原子力"
+msgctxt "generator method"
msgid "fusion"
msgstr "核融合"
+msgctxt "generator method"
msgid "gasification"
msgstr "ガス化"
-msgid "photovoltaic"
-msgstr "太陽光発電"
-
-msgid "pumped-storage"
-msgstr "揚水発電"
+msgid "biomass / waste"
+msgstr "バイオマス / 生ごみ"
-msgid "pumping"
-msgstr "地熱"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "太陽光"
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "高温分解"
+msgstr "熱分解"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "小水力"
+msgstr "河川の流れ"
+msgctxt "generator method"
+msgid "stream"
+msgstr "潮流"
+
+msgctxt "generator method"
msgid "thermal"
msgstr "太陽熱"
-msgid "Output forms of energy"
-msgstr "エネルギーの出力形式"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "揚水"
-msgid "electricity"
-msgstr "電力"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "水力"
-msgid "2 W"
-msgstr "2W"
+msgid "Generator Type"
+msgstr "発電機の種類"
-msgid "3 kW"
-msgstr "3kW"
+msgid "combined_cycle"
+msgstr "コンバインドサイクル"
-msgid "5 MW"
-msgstr "5000KW"
+msgid "gas combustion"
+msgstr "ガス火力"
-msgid "7 GW"
-msgstr "700万KW"
+msgid "francis_turbine"
+msgstr "フランシス水車"
-msgid "hot water"
-msgstr "温水"
+msgid "gas_turbine"
+msgstr "ガスタービン"
-msgid "hot air"
-msgstr "熱風"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "バイオガス、バイオマス、ガス、可燃ごみ火力"
-msgid "cold water"
-msgstr "冷水"
+msgid "heat_pump"
+msgstr "ヒートポンプ"
-msgid "cold air"
-msgstr "冷風"
+msgid "horizontal_axis"
+msgstr "水平方向"
-msgid "compressed air"
-msgstr "圧縮空気"
+msgid "tidal steam / wind"
+msgstr "潮力 / 風力"
-msgid "steam"
-msgstr "蒸気"
+msgid "kaplan_turbine"
+msgstr "カプラン水車"
-msgid "vacuum"
-msgstr "真空"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "小水力/水力/潮力発電用ダム"
+
+msgid "pelton_turbine"
+msgstr "ペルトン水車"
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "小水力/水力"
+
+msgid "reciprocating_engine"
+msgstr "エンジン"
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "バイオ燃料、バイオガス、ディーゼル、ガス、ガソリン"
+
+msgid "solar_photovoltaic_panel"
+msgstr "太陽光パネル"
+
+msgid "solar photovoltaic"
+msgstr "太陽光発電"
+
+msgid "solar_thermal_collector"
+msgstr "集光型太陽熱発電"
+
+msgid "solar thermal"
+msgstr "太陽熱発電"
+
+msgid "steam_generator"
+msgstr "水蒸気発生方式"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "生物、石炭、ディーゼル、ガス、ガソリン、石油、可燃ごみの燃焼"
+
+msgid "steam_turbine"
+msgstr "蒸気タービン"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr "地熱/太陽熱/生物、石炭、石油、可燃ごみの燃焼"
+
+msgid "stellarator"
+msgstr "ヘリカル型"
+
+msgid "nuclear fusion"
+msgstr "原子力"
+
+msgid "tokamak"
+msgstr "トカマク型"
+
+msgid "vertical_axis"
+msgstr "垂直方向"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "沸騰水型原子炉第1世代（BWR-1）"
+
+msgid "nuclear fission"
+msgstr "原子力"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "沸騰水型原子炉第2世代（BWR-2）"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "沸騰水型原子炉第3世代（BWR-3）"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "沸騰水型原子炉第4世代（BWR-4）"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "沸騰水型原子炉第5世代（BWR-5）"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "沸騰水型原子炉第6世代（BWR-6）"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "CANDU炉"
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "中国式加圧水型軽水炉（CPR-1000）"
-msgid "battery charging"
-msgstr "バッテリーの充電"
+msgid "European Pressurized Reactor (EPR)"
+msgstr "欧州加圧水型炉（EPR）"
-msgid "Power Station"
-msgstr "Power Station"
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "慣性閉じ込め核融合（ICF）"
-msgid "Edit Power Station"
-msgstr "Power Stationの編集"
+msgid "Pressurized water reactor (PWR)"
+msgstr "加圧水型原子炉（PWR）"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "軽水冷却黒鉛減速炉1000型（RBMK-1000）"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "軽水冷却黒鉛減速炉1500型（RBMK-1500）"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "ロシア型加圧水型原子炉（VVER）"
+
+msgid "Output forms of energy:"
+msgstr "エネルギーの出力形式:"
msgid "Power Sub Station"
msgstr "変電所"
@@ -17608,6 +18897,21 @@ msgstr "変電所の編集"
msgid "Line reference"
msgstr "ライン番号"
+msgid "high"
+msgstr "高"
+
+msgid "medium"
+msgstr "中"
+
+msgid "low"
+msgstr "低い"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "配電箱"
@@ -17623,6 +18927,9 @@ msgstr "送電塔の編集"
msgid "Tower reference"
msgstr "塔の参照番号"
+msgid "steel"
+msgstr "鉄塔"
+
msgid "Pole"
msgstr "電柱"
@@ -17641,13 +18948,11 @@ msgstr "送電線の編集"
msgid "Line type"
msgstr "線の種類"
-msgctxt "Power Line"
msgid "line"
-msgstr "線"
+msgstr "送電線"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "細い線"
+msgstr "配電線"
msgid "Amount of Cables"
msgstr "電線の電流量"
@@ -17656,16 +18961,16 @@ msgid "Number of wires (better: conductors) per power cable"
msgstr "電力線束のうち良導体の線の数"
msgid "single"
-msgstr "1"
+msgstr "1本"
msgid "double"
-msgstr "2"
+msgstr "2本"
msgid "triple"
-msgstr "3"
+msgstr "3本"
msgid "quad"
-msgstr "4"
+msgstr "4本"
msgid "Historic Places"
msgstr "史跡"
@@ -17728,7 +19033,7 @@ msgid "Boundary Stone"
msgstr "境界石"
msgid "Edit Boundary Stone"
-msgstr "境界石を編集"
+msgstr "境界石の編集"
msgid "Shops"
msgstr "店舗"
@@ -17754,10 +19059,10 @@ msgstr "キオスク"
msgid "Edit Kiosk"
msgstr "キオスクの編集"
-msgid "Baker"
+msgid "Bakery"
msgstr "パン屋"
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr "パン屋の編集"
msgid "Butcher"
@@ -17769,7 +19074,7 @@ msgstr "精肉店の編集"
msgid "Seafood"
msgstr "水産物店"
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr "水産物店の編集"
msgid "Deli (Fine Food)"
@@ -17790,14 +19095,20 @@ msgstr "市場"
msgid "Edit Marketplace"
msgstr "市場の編集"
+msgid "Organic"
+msgstr "自然素材"
+
msgid "Greengrocer"
msgstr "八百屋"
msgid "Edit Greengrocer"
msgstr "八百屋の編集"
-msgid "Organic"
-msgstr "自然食品店"
+msgid "Farm Stand"
+msgstr "農産物直売所"
+
+msgid "Edit Farm Stand"
+msgstr "農産物直売所の編集"
msgid "Edit Organic/Bio"
msgstr "自然食品店の編集"
@@ -17824,7 +19135,7 @@ msgid "Edit Beverages Shop"
msgstr "飲料店の編集"
msgid "Edit Clothes Shop"
-msgstr "洋服店の編集"
+msgstr "衣料品店の編集"
msgid "Boutique"
msgstr "ブティック"
@@ -17866,13 +19177,13 @@ msgid "Edit Tailor"
msgstr "仕立て屋を編集"
msgid "Fabric"
-msgstr "手芸用品"
+msgstr "布地店"
-msgid "Edit Fabric"
-msgstr "手芸用品の編集"
+msgid "Edit Fabric Shop"
+msgstr "布地店の編集"
msgid "Electronic"
-msgstr "電器関係"
+msgstr "電器店"
msgid "Computer"
msgstr "コンピュータ店"
@@ -17889,27 +19200,26 @@ msgstr "家電店の編集"
msgid "Mobile Phone"
msgstr "携帯電話店"
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr "携帯電話店の編集"
msgid "Vacuum Cleaner"
msgstr "掃除機店"
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr "掃除機店の編集"
msgid "Hifi"
-msgstr "オーディオショップ"
+msgstr "オーディオ店"
msgid "Edit Hifi Shop"
-msgstr "オーディオショップの編集"
+msgstr "オーディオ店の編集"
-msgctxt "shop"
msgid "Video"
-msgstr "ビデオショップ"
+msgstr "ビデオ店"
msgid "Edit Video Shop"
-msgstr "ビデオショップの編集"
+msgstr "ビデオ店の編集"
msgid "Cash"
msgstr "お金"
@@ -17932,6 +19242,12 @@ msgstr "両替の編集"
msgid "Edit Automated Teller Machine"
msgstr "ATMの編集"
+msgid "Pawnbroker"
+msgstr "質屋"
+
+msgid "Edit Pawnbroker"
+msgstr "質屋の編集"
+
msgid "Department Store"
msgstr "百貨店"
@@ -17951,10 +19267,10 @@ msgid "Edit Chemist"
msgstr "薬局の編集"
msgid "Hairdresser"
-msgstr "理髪店・美容院"
+msgstr "理美容店"
msgid "Edit Hairdresser"
-msgstr "理髪店・美容院の編集"
+msgstr "理美容店の編集"
msgid "Optician"
msgstr "眼鏡店"
@@ -17968,11 +19284,32 @@ msgstr "宝石店"
msgid "Edit Jewelry"
msgstr "宝石店の編集"
+msgid "Gift"
+msgstr "ギフト店"
+
+msgid "Edit Gift Shop"
+msgstr "ギフト店"
+
+msgid "buddhist"
+msgstr "仏教"
+
+msgid "christian"
+msgstr "キリスト教"
+
+msgid "hindu"
+msgstr "ヒンズー教"
+
+msgid "jewish"
+msgstr "ユダヤ教"
+
+msgid "muslim"
+msgstr "イスラム教"
+
msgid "Erotic"
-msgstr "アダルトショップ"
+msgstr "成人娯楽店"
-msgid "Edit Erotic"
-msgstr "アダルトショップの編集"
+msgid "Edit Erotic Shop"
+msgstr "成人娯楽店の編集"
msgid "Florist"
msgstr "生花店"
@@ -18001,7 +19338,7 @@ msgstr "金物屋の編集"
msgid "Paint"
msgstr "画材店"
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr "画材店の編集"
msgid "Furniture"
@@ -18013,19 +19350,19 @@ msgstr "家具店の編集"
msgid "Kitchen"
msgstr "キッチン販売店"
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr "キッチン販売店の編集"
msgid "Curtain"
-msgstr "カーテン"
+msgstr "カーテン店"
-msgid "Edit Curtain"
-msgstr "カーテンの編集"
+msgid "Edit Curtain Shop"
+msgstr "カーテン店の編集"
msgid "Frame"
msgstr "額縁店"
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr "額縁店の編集"
msgid "Stationery"
@@ -18041,10 +19378,16 @@ msgid "Edit Copyshop"
msgstr "コピー店の編集"
msgid "Book Store"
-msgstr "本屋"
+msgstr "書店"
msgid "Edit Book Store"
-msgstr "本屋を編集"
+msgstr "書店を編集"
+
+msgid "Newsagent''s shop"
+msgstr "新聞・雑誌販売店"
+
+msgid "Edit Newsagent''s shop"
+msgstr "新聞・雑誌販売店の編集"
msgid "Travel Agency"
msgstr "旅行代理店"
@@ -18055,7 +19398,7 @@ msgstr "旅行代理店の編集"
msgid "Musical Instrument"
msgstr "楽器店"
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr "楽器店の編集"
msgid "Toys"
@@ -18136,6 +19479,9 @@ msgstr "おもちゃ"
msgid "vouchers"
msgstr "商品券"
+msgid "Note"
+msgstr "備考"
+
msgid "Geography"
msgstr "地理"
@@ -18265,6 +19611,12 @@ msgstr "山頂"
msgid "Edit Peak"
msgstr "山頂の編集"
+msgid "Saddle"
+msgstr "鞍部"
+
+msgid "Edit Saddle"
+msgstr "鞍部の編集"
+
msgid "Glacier"
msgstr "氷河"
@@ -18304,26 +19656,35 @@ msgstr "樹木・林"
msgid "Edit Tree"
msgstr "樹木・林の編集"
+msgid "broad_leaved"
+msgstr "広葉樹"
+
+msgid "conifer"
+msgstr "針葉樹"
+
+msgid "palm"
+msgstr "ヤシ"
+
msgid "Botanical Name"
msgstr "植物の名前"
+msgid "Tree Row"
+msgstr "並木"
+
msgid "Wood"
msgstr "自然林"
msgid "Edit Wood"
msgstr "自然林の編集"
-msgctxt "wood"
msgid "coniferous"
-msgstr "針葉樹"
+msgstr "針葉樹林"
-msgctxt "wood"
msgid "deciduous"
-msgstr "広葉樹"
+msgstr "広葉樹林"
-msgctxt "wood"
msgid "mixed"
-msgstr "混合林"
+msgstr "雑木林"
msgid "Forest"
msgstr "人工林"
@@ -18331,15 +19692,6 @@ msgstr "人工林"
msgid "Edit Forest Landuse"
msgstr "人工林の編集"
-msgid "coniferous"
-msgstr "針葉樹林"
-
-msgid "deciduous"
-msgstr "広葉樹林"
-
-msgid "mixed"
-msgstr "雑木林"
-
msgid "Grassland"
msgstr "草地"
@@ -18415,6 +19767,12 @@ msgstr "牧草地"
msgid "Edit Meadow Landuse"
msgstr "牧草地の編集"
+msgid "Orchard"
+msgstr "果樹園"
+
+msgid "Edit Orchard Landuse"
+msgstr "果樹園の編集"
+
msgid "Vineyard"
msgstr "ぶどう園"
@@ -18469,7 +19827,7 @@ msgstr "レクレーション広場"
msgid "Edit Recreation Ground Landuse"
msgstr "レクレーション広場の編集"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "住宅地"
msgid "Edit Residential Landuse"
@@ -18481,6 +19839,9 @@ msgstr "（教会・寺院にある）墓所"
msgid "Edit Graveyard"
msgstr "墓所の編集"
+msgid "shinto"
+msgstr "神道"
+
msgid "Cemetery"
msgstr "霊園"
@@ -18556,6 +19917,33 @@ msgstr "採石場の編集"
msgid "Annotation"
msgstr "注釈"
+msgid "Edit Name Information"
+msgstr "名前情報の編集"
+
+msgid "Alternative name"
+msgstr "別名"
+
+msgid "Historical name"
+msgstr "歴史的な名称"
+
+msgid "Local name"
+msgstr "地元の名称"
+
+msgid "Regional name"
+msgstr "地域での名称"
+
+msgid "National name"
+msgstr "国内での名称"
+
+msgid "International name"
+msgstr "国際名称"
+
+msgid "Official name"
+msgstr "公式名称"
+
+msgid "Common name abbreviation"
+msgstr "略号"
+
msgid "Edit Address Information"
msgstr "住所の編集"
@@ -18574,30 +19962,6 @@ msgstr "市町村名"
msgid "Country code"
msgstr "国コード"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "住所の補間"
@@ -18616,6 +19980,18 @@ msgstr "偶数"
msgid "alphabetic"
msgstr "アルファベット順"
+msgid "Accuracy"
+msgstr "精度"
+
+msgid "actual"
+msgstr "確実"
+
+msgid "estimate"
+msgstr "大体"
+
+msgid "potential"
+msgstr "恐らく"
+
msgid "Contact (common schema)"
msgstr "連絡先（一般の書式）"
@@ -18692,7 +20068,7 @@ msgid "entrances to the site, on the perimeter"
msgstr "境界上のサイト入口"
msgid "members of site"
-msgstr "サイトのメンバ"
+msgstr "サイトのメンバー"
msgid "Turn restriction"
msgstr "進行方向制限"
@@ -18776,29 +20152,58 @@ msgid "where enforcement ends"
msgstr "取締り終了位置"
msgid "traffic light or barrier that stops you"
-msgstr "検問場所"
+msgstr "停止信号または柵"
+
+msgid "General route"
+msgstr "一般ルート"
-msgid "Route (legacy)"
-msgstr "ルート（旧）"
+msgid "Edit general route"
+msgstr "一般ルートの編集"
-msgid "Edit Route (legacy)"
-msgstr "ルート（旧）の編集"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "自転車"
+msgctxt "route type"
+msgid "bus"
+msgstr "バス"
+
+msgctxt "route type"
msgid "road"
-msgstr "道"
+msgstr "道路"
+msgctxt "route type"
+msgid "ferry"
+msgstr "フェリー"
+
+msgctxt "route type"
msgid "ski"
msgstr "スキー"
+msgctxt "route type"
msgid "foot"
msgstr "徒歩"
+msgctxt "route type"
msgid "hiking"
msgstr "ハイキング"
+msgctxt "route type"
+msgid "tram"
+msgstr "路面電車"
+
+msgctxt "route type"
msgid "detour"
msgstr "迂回路"
+msgctxt "route type"
+msgid "railway"
+msgstr "鉄道"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "地下鉄"
+
msgid "Symbol description"
msgstr "シンボルの説明"
@@ -18809,7 +20214,7 @@ msgid "proposed"
msgstr "案"
msgid "alternate"
-msgstr "代替路"
+msgstr "迂回路"
msgid "temporary"
msgstr "一時的"
@@ -18836,37 +20241,40 @@ msgid "south segment (North America)"
msgstr "南部区間（北米）"
msgid "halt point"
-msgstr "停留所"
+msgstr "停止位置"
msgid "forward halt point"
-msgstr "下りの停留所"
+msgstr "下りの停止位置"
msgid "backward halt point"
-msgstr "上りの停留所"
+msgstr "上りの停止位置"
-msgid "Route network"
-msgstr "交通ネットワーク"
+msgid "Route Network"
+msgstr "道路網"
-msgid "Edit route network"
-msgstr "交通ネットワークの編集"
+msgid "Edit Route Network"
+msgstr "道路網の編集"
msgid "member"
-msgstr "メンバ"
+msgstr "メンバー"
-msgid "Associated street"
+msgid "Associated Street"
msgstr "通り名住居表示"
-msgid "Edit associated street"
-msgstr "通り名住居表示を編集"
+msgid "Edit Associated Street"
+msgstr "通り名住居表示の編集"
+
+msgid "house"
+msgstr "住宅"
msgid "Street"
-msgstr "ストリート"
+msgstr "通り"
msgid "Edit Street"
msgstr "通りを編集"
msgid "ways being part of street"
-msgstr "通りの一部となるウェイ"
+msgstr "通りを構成するウェイ"
msgid "addresses belonging to the street"
msgstr "通りに所属する住所"
@@ -18878,16 +20286,16 @@ msgid "anything related to the street"
msgstr "通りに関連するもの"
msgid "Destination sign"
-msgstr "案内標示"
+msgstr "案内標識"
-msgid "Edit Destination sign"
-msgstr "案内標示"
+msgid "Edit Destination Sign"
+msgstr "案内標識の編集"
msgid "Destination written on sign (w/o distance)"
-msgstr "標識に書かれた目的地（距離を除く）"
+msgstr "案内標識の行き先（距離なし）"
msgid "Distance (km)"
-msgstr "距離(km)"
+msgstr "距離（km）"
msgid "Time (hh:mm, for trekking)"
msgstr "所要時間（hh:mm、歩行用）"
@@ -18917,7 +20325,7 @@ msgid "Waterway"
msgstr "水路"
msgid "Edit Waterway"
-msgstr "水域の編集"
+msgstr "水路の編集"
msgid "Subtype of waterway (largest one of members)"
msgstr "水域の種類（メンバーで最も大きいもの）"
@@ -18962,7 +20370,7 @@ msgid "branch waterways (no riverbank)"
msgstr "支流（川岸なし）"
msgid "spring of waterway"
-msgstr "源流"
+msgstr "源泉"
msgid "Length (meters)"
msgstr "長さ（m）"
@@ -18971,46 +20379,58 @@ msgid "ways supported by (on top of) the bridge"
msgstr "橋の表面のウェイ"
msgid "ways passing under the bridge"
-msgstr "橋の内部を通るウェイ"
+msgstr "橋の下を通るウェイ"
msgid "way forming the outline footprint"
msgstr "外形を表すウェイ"
-msgid "nodes forming the outline"
-msgstr "外形を表すノード"
+msgid "edge ways parallel to ''across''"
+msgstr "''across''に並行する境界のウェイ"
msgid "ways passing through the tunnel"
msgstr "トンネルを通るウェイ"
+msgid "edge ways parallel to ''through''"
+msgstr "''through''に並行する境界のウェイ"
+
msgid "bridge"
msgstr "橋"
msgid "deprecated"
-msgstr "破棄された"
+msgstr "廃止"
+
+msgid "bicycle"
+msgstr "自転車"
+
+msgid "foot"
+msgstr "徒歩"
msgid "horse"
msgstr "馬"
msgid "barrier"
-msgstr "バリア"
+msgstr "柵"
msgid "motorroad"
msgstr "車道"
-msgid "highway_track"
-msgstr "車線"
+msgid "highway.track"
+msgstr "道路（トラック）"
+
+msgid "livingdashed"
+msgstr "生活道路（破線）"
msgid "services"
-msgstr "敷地内道路"
+msgstr "サービスエリア"
msgid "ford"
msgstr "浅瀬（洗い越し）"
-msgid "highway_platform"
-msgstr "道路上のプラットフォーム"
+msgid "highway.platform"
+msgstr "道路（プラットフォーム）"
-msgid "emergency_access_point"
-msgstr "緊急アクセスポイント"
+msgid "emergency.access.point"
+msgstr "緊急避難所"
msgid "riverbank"
msgstr "川岸"
@@ -19022,49 +20442,52 @@ msgid "manmade"
msgstr "人工物"
msgid "rapids"
-msgstr "rapids"
+msgstr "瀬"
msgid "railwaypoint"
msgstr "鉄道ポイント"
+msgid "raildashed"
+msgstr "鉄道破線"
+
msgid "railyard"
-msgstr "ヤード"
+msgstr "鉄道ヤード"
msgid "otherrail"
-msgstr "その他の軌道"
+msgstr "路面電車"
msgid "railover"
-msgstr "高架鉄道"
+msgstr "路上軌道"
msgid "oldrail"
-msgstr "古い軌道"
+msgstr "古い鉄道"
msgid "aeroway"
msgstr "空路"
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr "空路（暗色）"
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr "空路（明色）"
-msgid "piste_easy"
-msgstr "初球者スキーコース"
+msgid "piste.easy"
+msgstr "ゲレンデ（初級）"
-msgid "piste_intermediate"
-msgstr "中級者スキーコース"
+msgid "piste.intermediate"
+msgstr "ゲレンデ（中級）"
-msgid "piste_advanced"
-msgstr "上級者スキーコース"
+msgid "piste.advanced"
+msgstr "ゲレンデ（上級）"
-msgid "piste_expert"
-msgstr "熟練者用のゲレンデ"
+msgid "piste.expert"
+msgstr "ゲレンデ（名人級）"
-msgid "piste_freeride"
-msgstr "フリースタイルのゲレンデ"
+msgid "piste.freeride"
+msgstr "ゲレンデ（フリーライド）"
-msgid "piste_novice"
-msgstr "初心者スキーゲレンデ"
+msgid "piste.novice"
+msgstr "ゲレンデ（初心者）"
msgid "power"
msgstr "電力"
@@ -19082,22 +20505,22 @@ msgid "marina"
msgstr "マリーナ"
msgid "amenity"
-msgstr "アメニティ"
+msgstr "飲食店"
-msgid "amenity_traffic"
-msgstr "アメニティ_交通"
+msgid "amenity.traffic"
+msgstr "交通施設"
-msgid "amenity_light"
-msgstr "アメニティ_信号"
+msgid "amenity.light"
+msgstr "施設（明色）"
-msgid "light_water"
-msgstr "信号_水域"
+msgid "light.water"
+msgstr "水飲み場"
msgid "health"
msgstr "健康"
-msgid "shop"
-msgstr "店"
+msgid "office"
+msgstr "オフィス"
msgid "hotel"
msgstr "ホテル"
@@ -19115,7 +20538,7 @@ msgid "landfill"
msgstr "埋め立て地"
msgid "basin"
-msgstr "水たまり、窪地"
+msgstr "水場"
msgid "forest"
msgstr "人工林"
@@ -19162,9 +20585,6 @@ msgstr "荒地"
msgid "woodarea"
msgstr "自然林エリア"
-msgid "mud"
-msgstr "泥"
-
msgid "beach"
msgstr "砂浜"
@@ -19174,11 +20594,14 @@ msgstr "ルート"
msgid "boundary"
msgstr "行政区境"
+msgid "sport"
+msgstr "スポーツ"
+
msgid "place"
msgstr "場所"
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr "TIGERデータ"
msgid "address"
msgstr "住所"
@@ -19192,9 +20615,6 @@ msgstr "村・市"
msgid "One Way"
msgstr "一方通行"
-msgid "Church"
-msgstr "教会"
-
msgid "Fuel Station"
msgstr "ガソリンスタンド"
@@ -19214,64 +20634,97 @@ msgid "abbreviated street name"
msgstr "通り名が略称になっている"
msgid "oneway tag on a node"
-msgstr "ノードにonewayタグがある"
+msgstr "onewayタグがあるノード"
msgid "bridge tag on a node"
-msgstr "ノードにbridgeタグがある"
+msgstr "bridgeタグがあるノード"
msgid "wrong highway tag on a node"
-msgstr "ノードに不正なhighwayタグがある"
+msgstr "誤ったhighwayタグがあるノード"
+
+msgid "wrong crossing tag on a way"
+msgstr "誤ったcrossingタグがあるウェイ"
msgid "Unnamed unclassified highway"
-msgstr "一般道(2車線未満)に名前がない"
+msgstr "名前のない一般道(2車線未満)の道路"
msgid "highway without a reference"
-msgstr "highwayに参照番号がない"
+msgstr "参照番号がない道路"
msgid "temporary highway type"
-msgstr "一時的なhighwayの種別"
+msgstr "道路の種別が未確定"
msgid "misspelled key name"
msgstr "キー名のスペルが誤っている"
msgid "cycleway with tag bicycle"
-msgstr "自転車用道路にbicycleタグがある"
+msgstr "bicycleタグがある自転車用道路"
msgid "footway with tag foot"
-msgstr "歩道にfootタグがある"
+msgstr "footタグがある歩道"
msgid "separate cycleway as lane on a cycleway"
-msgstr "自転車用道路に分離型の自転車レーンがある"
+msgstr "分離型の自転車レーンがある自転車用道路"
msgid "barrier used on a way"
-msgstr "ウェイにbarrierが使用されている"
+msgstr "barrierがウェイに使われている"
msgid "maxspeed used for footway"
-msgstr "歩道にmaxspeedが使用されている"
+msgstr "maxspeedが歩道に使われている"
msgid "layer tag with + sign"
-msgstr "レイヤータグに+記号がある"
+msgstr "layerタグに+記号がある"
msgid "street name contains ss"
-msgstr "通り名にssが含まれている"
+msgstr "ssが含まれている通り名"
msgid "relation without type"
-msgstr "リレーションに種別がない"
+msgstr "種別がないリレーション"
msgid "restaurant without name"
-msgstr "レストランに名前がない"
+msgstr "名前がないレストラン"
msgid "unusual tag combination (highway & waterway)"
-msgstr "ありえないタグの組み合わせ（highwayとwaterway）"
+msgstr "タグの組み合わせが普通ではない（highwayとwaterway）"
msgid "unusual tag combination (highway & natural)"
-msgstr "ありえないタグの組み合わせ（highwayとnatural）"
+msgstr "タグの組み合わせが普通ではない（highwayとnatural）"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr "タグの組み合わせが普通ではない（landuseとbuilding）"
+
+msgid "unnecessary access key"
+msgstr "不必要なaccessキー"
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "不必要なmotor_vehicle=yes"
msgid "natural water used for swimming pool"
-msgstr "水泳プールにnatural=waterが使われている"
+msgstr "natural=waterが水泳プールに使われている"
+
+msgid "numerical key"
+msgstr "テンキー"
-msgid "incline without highway"
-msgstr "道路でないのにinclineがある"
+msgid "route_master relation without route_master=*"
+msgstr "route_master=*がないroute_masterリレーション"
+
+msgid "power line without voltage"
+msgstr "voltageがない電力線"
+
+msgid "substation key without power=substation"
+msgstr "power=substationがないsubstationキー"
+
+msgid "transformer key without power"
+msgstr "powerがないtransformerキー"
+
+msgid "missing substation=*"
+msgstr "substation=*がない"
+
+msgid "missing transformer=*"
+msgstr "transformer=*がない"
+
+msgid "incline without highway or railway"
+msgstr "道路または鉄道ではないのにinclineがある"
msgid "junction without highway"
msgstr "道路でないのにjunctionがある"
@@ -19282,8 +20735,8 @@ msgstr "道路でないのにlanesがある"
msgid "lcn without highway"
msgstr "道路でないのにlcnがある"
-msgid "lit without highway"
-msgstr "道路でないのにlitがある"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "litがあるが道路/鉄道/ゲレンデ/駐車場/プラットフォームではない"
msgid "living_street without highway"
msgstr "道路でないのにliving_streetがある"
@@ -19300,8 +20753,8 @@ msgstr "道路でないのにmotorroadがある"
msgid "ntd_id without highway"
msgstr "道路でないのにntd_idがある"
-msgid "oneway without highway"
-msgstr "道路でないのにonewayがある"
+msgid "oneway without highway or railway"
+msgstr "道路や鉄道ではないのにonewayがある"
msgid "sac_scale without highway"
msgstr "道路でないのにsac_scaleがある"
@@ -19328,7 +20781,7 @@ msgid "tracktype without highway"
msgstr "道路ではないのにtracktypeがある"
msgid "trail_visibility without highway"
-msgstr "道路ではないのにtrack_visibilityがある"
+msgstr "道路ではないのにtrail_visibilityがある"
msgid "trolley_wire without highway"
msgstr "道路ではないのにtrolley_wireがある"
@@ -19352,7 +20805,7 @@ msgid "etcs without railway"
msgstr "線路ではないのにetcsがある"
msgid "gauge without railway"
-msgstr "線路ではないのにguageがある"
+msgstr "線路ではないのにgaugeがある"
msgid "grade_of_track without railway"
msgstr "線路ではないのにgrade_of_trackがある"
@@ -19376,7 +20829,7 @@ msgid "radio without railway"
msgstr "線路ではないのにradioがある"
msgid "structure_gauge without railway"
-msgstr "線路ではないのにstracture_guageがある"
+msgstr "線路ではないのにstructure_gaugeがある"
msgid "tilting_technologie without railway"
msgstr "線路ではないのにtilting_technologieがある"
@@ -19417,20 +20870,131 @@ msgstr "水路ではないのにcanalがある"
msgid "have_riverbank without waterway"
msgstr "水路ではないのにhave_riverbankがある"
-msgid "tunnel without highway/railway/waterway"
-msgstr "道路/線路/水路ではないのにtunnelがある"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "tunnelがあるが道路/鉄道/水路/プラットフォーム/パイプラインではない"
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridgeがあるが道路/鉄道/水路/プラットフォーム/ゲレンデ/パイプラインではない"
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psvがあるが道路/鉄道/水路/駐車場ではない"
+
+msgid "width without physical linear feature"
+msgstr "widthがあるが物理的に線形の地物ではない"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "maxspeedがあるが道路/線路/標識/交通取締りではない"
+
+msgid "fence_type without barrier=fence"
+msgstr "barrier=fenceでないのにfence_typeが設定されている"
+
+msgid "border_type without boundary"
+msgstr "boundaryがないのにborder_typeがある"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "amenity=recyclingがないのにrecycling_typeがある"
+
+msgid "board_type without information=board"
+msgstr "information=boardがないのにboard_typeがある"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "amenity=shelterがないのにshelter_typeがある"
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "highway=street_lampがないのにlamp_typeがある"
+
+msgid "map_type without information=map"
+msgstr "information=mapがないのにmap_typeがある"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "historic=archaeological_siteがないのにsite_typeがある"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "tourism=artworkがないのにartwork_typeがある"
+
+msgid "castle_type without historic=castle"
+msgstr "historic=castleがないのにcastle_typeがある"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "landuse/water=reservoirがないのにreservoir_typeがある"
+
+msgid "bunker_type without military=bunker"
+msgstr "military=bunkerがないのにbunker_typeがある"
+
+msgid "source:addr without addr:*"
+msgstr "addr:*がないのにsource:addrがある"
+
+msgid "source:date without source"
+msgstr "sourceがないのにsource:dateがある"
+
+msgid "source:name without name"
+msgstr "nameがないのにsource:nameがある"
+
+msgid "source:maxspeed without maxspeed"
+msgstr "maxspeedがないのにsource:maxspeedがある"
+
+msgid "source:building without building"
+msgstr "buildingがないのにsource:buildingがある"
+
+msgid "source:ref without ref"
+msgstr "refがないのにsource:refがある"
+
+msgid "source:population without population"
+msgstr "populationがないのにsource:populationがある"
+
+msgid "source:geometry on a node"
+msgstr "ノード上にsource:geometryがある"
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr "addr:postcodeがないのにsource:[addr:]postcodeがある"
+
+msgid "source:postal_code without addr:postcode"
+msgstr "addr:postcodeがないのにsource:postal_codeがある"
+
+msgid "source:ele without ele"
+msgstr "eleがないのにsource:eleがある"
-msgid "bridge without highway/railway/waterway"
-msgstr "道路/線路/水路ではないのにbridgeがある"
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "ref:INSEEがないのにsource:ref:INSEEがある"
-msgid "psv without highway/railway/waterway"
-msgstr "道路/線路/水路ではないのにpsvがある"
+msgid "source:lit without lit"
+msgstr "litがないのにsource:litがある"
-msgid "width without highway/railway/waterway/aeroway"
-msgstr "道路/線路/水路/索道ではないのにwidthがある"
+msgid "source:hgv without hgv"
+msgstr "hgvがないのにsource:hgvがある"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "道路/鉄道/信号ではないのにmaxspeedがある"
+msgid "source:outline on a node"
+msgstr "source:ourlineがノード上にある"
+
+msgid "source:highway without highway"
+msgstr "highwayがないのにsource:highwayがある"
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr "maxaxleloadがないのにsource:maxaxleloadがある"
+
+msgid "source:surface without surface"
+msgstr "surfaceがないのにsource:surfaceがある"
+
+msgid "source:bridge without bridge"
+msgstr "bridgeがないのにsource:bridgeがある"
+
+msgid "source:old_name without old_name"
+msgstr "old_nameがないのにsource:old_nameがある"
+
+msgid "source:bicycle without bicycle"
+msgstr "bicycleがないのにsource:bicycleがある"
+
+msgid "source:designation without designation"
+msgstr "designationがないのにsource:designationがある"
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr "addr:housenumberがないのにsource:[addr:]housenumberがある"
+
+msgid "source:height without height"
+msgstr "heightがないのにsource:heightがある"
+
+msgid "source:lanes without lanes"
+msgstr "lanesがないのにsource:lanesがある"
msgid "religion without denomination"
msgstr "宗教に宗派がない"
@@ -19448,35 +21012,80 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr "Wikipediaの言語がない、\"wikipedia\"=\"language:page title\"を使用のこと"
-msgid "unkown language prefix in wikipedia tag"
-msgstr "wikipediaタグに不明な言語プリフィックスがついている"
+msgid "unknown language prefix in wikipedia tag"
+msgstr "wikipediaタグの言語名が不明"
-msgid "Landsat"
-msgstr "ランドサット"
+msgid "layer should be between -5 and 5"
+msgstr "layerは-5～5の範囲でなければならない"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr "levelは0.5単位の数値でなければならない"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr "高さ: デフォルトはメートル; ピリオド区切り; 単位をつける場合は空白に続ける"
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr "最大高: デフォルトはメートル; ピリオド区切り; 単位をつける場合は空白に続ける"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "OSM Inspector: 編集ボット"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr "幅: デフォルトはメートル; ピリオド区切り; 単位をつける場合は空白に続ける"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr "最大幅: デフォルトはメートル; ピリオド区切り; 単位をつける場合は空白に続ける"
+
+msgid "unusual maxspeed format"
+msgstr "最高速度の書式が普通ではない"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr "電圧はボルトで単位・区切り文字・空白を入れないでください"
+
+msgid "unusual frequency specification"
+msgstr "周波数の指定が普通ではない"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "軌間の書式が普通ではない（区切り文字なしでmmで指定）"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "勾配の書式が普通ではない（パーセント/角度またはup/downで指定）"
+
+msgid "Landsat"
+msgstr "Landsat"
msgid "Yahoo Sat"
-msgstr "Yahoo衛星写真"
+msgstr "Yahoo Sat"
msgid "Bing Sat"
-msgstr "Bing衛星写真"
+msgstr "Bing Sat"
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
msgid "MapBox Satellite"
-msgstr "MapBox衛星画像"
+msgstr "MapBox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPSトレース"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik 白黒)"
+msgstr "OpenStreetMap (Mapnik Black & White)"
+
+msgid "skobbler"
+msgstr "skobbler"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -19485,238 +21094,294 @@ msgid "MapQuest OSM"
msgstr "MapQuest OSM"
msgid "Public Transport (ÖPNV)"
-msgstr "公共交通 (ÖPNV)"
+msgstr "Public Transport (ÖPNV)"
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (ドイツ形式)"
+msgstr "OpenStreetMap (German Style)"
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Hike & Bike"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (ソルビア語)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (ドイツ語)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "OpenPT地図（オーバーレイ）"
-
-msgid "Bavaria (2 m)"
-msgstr "Bavaria (2 m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "Hamburg (40 cm)"
-msgstr "Hamburg (40 cm)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (DK5)"
-msgstr "ハンブルク (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI black-and-white 2.5m"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
-msgstr "Graz: Basiskarte (ベース地図)"
+msgstr "Graz: Basiskarte (base map)"
msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris: DGM (地勢図)"
+msgstr "Tiris: DGM (Terrain model)"
msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris: DOM (平面図)"
+msgstr "Tiris: DOM (Surface model)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Vienna: Mehrzweckkarte (一般用途)"
+msgstr "Vienna: Mehrzweckkarte (general purpose)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr "ウィーン: Beschriftungen (注釈)"
+msgstr "Vienna: Beschriftungen (annotations)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "ウィーン: Orthofoto (航空写真)"
+msgstr "Vienna: Orthofoto (aerial image)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "アールガウ州 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "ウスター市航空写真 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Stadtplan Zürich"
-msgstr "チューリッヒ地図"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terrain model)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "ゾロトゥルン州 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Surface model)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "ゾロトゥルン州 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrography"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "ゾロトゥルン州赤外線 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Geobase Roads"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "ジュネーヴ州 5cm (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "ヌーシャテル州 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "ジュラ州 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "フリブール州 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "ベルン市 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Denmark)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / イヴェルドン・レ・バン平面図 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Denmark)"
-msgid "Geobase Hydrography"
-msgstr "Geobase 水域"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Denmark)"
-msgid "Geobase Roads"
-msgstr "Geobase 道路"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estonia Basemap (Maaamet)"
-msgid "Canvec"
-msgstr "Canvec"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortho (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr "ブリティッシュコロンビア・モザイク"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr "MSR 地形図"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgid "MSR Maps Urban"
-msgstr "MSR 都市地図"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "USGS Scanned Topographic Maps"
-msgstr "USGS スキャン地形図"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "USGS Large Scale Imagery"
-msgstr "USGS 大縮尺画像"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "OSM US TIGER 2012 道路オーバーレイ"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "Czech CUZK:KM"
-msgstr "チェコ CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "チェコ UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
-msgid "7th Series (OS7)"
-msgstr "7番目のシリーズ (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historic"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Orthophotos 2000"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6インチ スコットランド 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Orthophotoplan 2011"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 第1シリーズ 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Orthophotoplan 2007"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1インチ 第7シリーズ 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Orthophotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthophotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Streets NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Sorbian Language)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (German Language)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Bavaria (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Erlangen 2013 Luftbild (6,25 cm)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Erlangen 2011 Luftbild (5,0 cm)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haiti)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "アイルランド British War Office 1インチ 1941-43 GSGS 4136"
+msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "アイルランド Bartholomew Quarter-Inch 1940"
+msgstr "Ireland Bartholomew Quarter-Inch 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "アイルランド EEA GMES Urban Atlas"
+msgstr "Ireland EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr "アイルランド EEA CORINE 2006"
+msgstr "Ireland EEA CORINE 2006"
msgid "Lodi - Italy"
-msgstr "Lodi - イタリア"
+msgstr "Lodi - Italy"
msgid "Lombardia - Italy (CTR)"
-msgstr "Lombardia - イタリア (CTR)"
+msgstr "Lombardia - Italy (CTR)"
msgid "Sicily - Italy"
-msgstr "Sicily - イタリア"
+msgstr "Sicily - Italy"
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - イタリア"
+msgstr "PCN 2006 - Italy"
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr "USSR - ラトビア"
+msgstr "USSR - Latvia"
msgid "50cm ortho - Latvia"
-msgstr "50cm 平面図 - ラトビア"
+msgstr "50cm ortho - Latvia"
msgid "20cm ortho - Coastline"
-msgstr "20cm 精度 - 海岸線"
+msgstr "20cm ortho - Coastline"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - オーヴェルニュ 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lithuania)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - ムーラン 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger Delta Oct 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - モンリュソン 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - ヴィシー 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
+
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - ル・ピュイ＝アン＝ヴレ 2010 - 15 cm"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Car"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Cyclo"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - 航空写真 2000"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Ski"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - 航空写真 2010-2012"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr "Toulouse - 平面航空写真 2011"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slovakia EEA GMES Urban Atlas"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Toulouse - 平面航空写真 2007"
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slovakia EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - 航空写真 2008-2010"
+msgid "Slovakia Historic Maps"
+msgstr "Slovakia Historic Maps"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - 航空写真 2008"
+msgid "South Africa CD:NGI Aerial"
+msgstr "South Africa CD:NGI Aerial"
msgid "Catastro Spain"
-msgstr "土地台帳 スペイン"
+msgstr "Catastro Spain"
msgid "PNOA Spain"
-msgstr "PNOA スペイン"
+msgstr "PNOA Spain"
msgid "SIGPAC Spain"
-msgstr "SIGPAC スペイン"
+msgstr "SIGPAC Spain"
msgid "GRAFCAN - Canary Islands"
-msgstr "GRAFCAN - カナリア諸島"
+msgstr "GRAFCAN - Canary Islands"
msgid "ITACyL - Castile and León"
msgstr "ITACyL - Castile and León"
@@ -19724,77 +21389,107 @@ msgstr "ITACyL - Castile and León"
msgid "IDEIB - Balearic Islands"
msgstr "IDEIB - Balearic Islands"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "エストニア基本地図 (Maaamet)"
-
-msgid "Estonia Ortho (Maaamet)"
-msgstr "エストニア平面図 (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
-msgid "Estonia Multi (Maaamet)"
-msgstr "エストニア多目的 (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stadt Uster Orthophoto 2008 10cm"
-msgid "ORT10LT (Lithuania)"
-msgstr "ORT10LT（リトアニア）"
+msgid "Stadtplan Zürich"
+msgstr "Stadtplan Zürich"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (デンマーク)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (デンマーク)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (デンマーク)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "パンガシナン/ブラカン州（フィリピン高解像度）"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Canton de Génève 5cm (SITG 2011)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton du Jura 50cm (RCJU 1998)"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "カンボジア、ラオス、タイ、ベトナム バイリンガル"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Canton de Fribourg 50cm (2005)"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr "ニジェールデルタ 2012年10月 ランドサット"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stadt Bern 10cm/25cm (2008)"
-msgid "South Africa CD:NGI Aerial"
-msgstr "南アフリカ CD:NGI Aerial"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk 自動車"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk ハイキング"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Orthophoto 2012"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk 自転車"
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthophoto 2012"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk スキー"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Orthophoto technique 2012"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "MSR Maps Topo"
+msgstr "MSR Maps Topo"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "MSR Maps Urban"
+msgstr "MSR Maps Urban"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "スロバキア EEA GMES 都市地図"
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Scanned Topographic Maps"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "スロバキア EEA CORINE 2006"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Large Scale Imagery"
-msgid "Slovakia Historic Maps"
-msgstr "スロバキア歴史地図"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Roads Overlay"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI black-and-white 2.5m"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Tiger編集地図"
+msgstr "OSM - Tiger Edited Map"
+
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ukraine - Orthophotomaps 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr "OS New Popular Edition historic"
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
+
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
+
+msgid "Surrey Air Survey"
+msgstr "Surrey Air Survey"
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-inch Scotland 1842-82"
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
msgid "OS 1:25k historic (OSM)"
msgstr "OS 1:25k historic (OSM)"
@@ -19802,11 +21497,41 @@ msgstr "OS 1:25k historic (OSM)"
msgid "OS Scottish Popular historic"
msgstr "OS Scottish Popular historic"
-msgid "Stuttgart (Luftbild)"
-msgstr "Stuttgart (Luftbild)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "OS Town Plans, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "OSMエクスポート"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "交通データをSUMOネットワークファイルにエクスポートします。"
+
+msgid "SUMO Export"
+msgstr "SUMOエクスポート"
+
+msgid "Export"
+msgstr "エクスポート"
+
+msgid "Port:"
+msgstr "ポート:"
+
+msgid "refresh the port list"
+msgstr "ポートのリストを更新する。"
+
+msgid "Configure"
+msgstr "設定"
+
+msgid "Connection Error."
+msgstr "接続エラー"
-msgid "2u"
-msgstr "2u"
+msgid "configure the connected DG100"
+msgstr "接続されたDG100の設定"
+
+msgid "delete data after import"
+msgstr "インポート後データを削除"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSVファイル"
@@ -19936,12 +21661,12 @@ msgid "Public (shown in trace list and as anonymous, unordered points)"
msgstr "公開（トレース一覧に匿名で表示、点は順不同）"
msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
-msgstr "追跡可能 (匿名、点は順序通りでタイムスタンプ付き)"
+msgstr "追跡可能 (匿名で共有、点はタイムスタンプ付き)"
msgid ""
"Identifiable (shown in trace list and as identifiable, ordered points with "
"timestamps)"
-msgstr "識別可能（トレース一覧に識別可能な状態で表示。点は順序通りでタイムスタンプ付き）"
+msgstr "識別可能（トレース一覧にユーザーID付きで表示、点はタイムスタンプ付き）"
msgid "Upload Trace"
msgstr "トレースのアップロード"
@@ -20009,6 +21734,18 @@ msgstr "高度プロファイルを表示"
msgid "Elevation Profile"
msgstr "高度プロファイル"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "高度グリッドレイヤー（試験中！）"
+
+msgid "Shows elevation grid layer"
+msgstr "高度グリッドレイヤーを表示"
+
+msgid "Elevation Grid"
+msgstr "高度グリッド"
+
+msgid "No SRTM data"
+msgstr "SRTMデータがありません"
+
msgid "Open the elevation profile window."
msgstr "高度プロファイルウィンドウを開きます。"
@@ -20030,14 +21767,8 @@ msgstr "高低移動"
msgid "Time"
msgstr "時間"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "自動"
-
-msgid "Fixed value"
-msgstr "固定値"
+msgid "Tracks"
+msgstr "トラック"
msgid "Elevation profile for track ''{0}''."
msgstr "トラック ''{0}'' の高度プロファイルです。"
@@ -20122,7 +21853,7 @@ msgid "Please move the mouse to draw new way"
msgstr "新しいウェイを描画するにはマウスを動かしてください"
msgid "Are you sure you do not want to save the line containing {0} points?"
-msgstr "{0} 個の点を含む線を保存しなくてよろしいですか？"
+msgstr "{0}個の点を含む線を保存しなくてよろしいですか？"
msgid ""
"{0} m - length of the line\n"
@@ -20305,12 +22036,18 @@ msgstr "不完全な住所を選択"
msgid "Selects all addresses with incomplete data."
msgstr "不完全なデータの住所をすべて選択します。"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "''addr:street''または''addr:place''を使用してください"
+
msgid "House Number Editor"
-msgstr "番地エディター"
+msgstr "住居番号編集画面"
+
+msgid "House number increment:"
+msgstr "住居番号の増分:"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "{0} オブジェクトまでのプロパティを更新しています"
+msgstr[0] "最大{0}件のオブジェクトのプロパティを更新しています"
msgid "Default image projection"
msgstr "既定のイメージ投影法"
@@ -20330,6 +22067,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "レイヤーのプロパティ"
+msgid "Error while creating image layer: {0}"
+msgstr "画像レイヤーの作成中にエラーが発生しました。{0}"
+
msgid "Import image"
msgstr "イメージをインポート"
@@ -20408,9 +22148,21 @@ msgstr "OSM Inspector の選択リストウィンドウを開く"
msgid "Current Selected Bug Info"
msgstr "選択中のバグ情報"
+msgid "Prev OSMI bug"
+msgstr "前のOSMIのバグ"
+
+msgid "Next OSMI bug"
+msgstr "次のOSMIのバグ"
+
msgid "Osm Inspector Bugs"
msgstr "OSM Inspector のバグ"
+msgid "OSM Inspector Bugs"
+msgstr "OSM Inspector Bugs"
+
+msgid "Selected Bug Info"
+msgstr "選択されたバグ情報"
+
msgid "Handy Address Interpolation Functions"
msgstr "ハンディアドレス補間機能"
@@ -20460,10 +22212,10 @@ msgid "Accuracy:"
msgstr "精度:"
msgid "Convert way to individual house numbers."
-msgstr "ウェイを個々の番地に変換する"
+msgstr "ウェイを個々の住居番号に変換する"
msgid "Will associate {0} additional house number nodes"
-msgstr "{0} 付加番地に関連付ける"
+msgstr "{0}件の追加の住居番号ノードに関連付ける"
msgid "City:"
msgstr "市区:"
@@ -20495,8 +22247,8 @@ msgstr "奇数番号のアドレスが期待されている"
msgid "Expected even numbers for addresses"
msgstr "偶数番号のアドレスが期待されている"
-msgid "Expected valid number for address increment"
-msgstr "アドレス増分に対して期待される適切な数値"
+msgid "Expected valid number for increment"
+msgstr "増分には有効な数値が必要です"
msgid "Country code must be 2 letters"
msgstr "国コードは2文字でなければなりません"
@@ -20842,19 +22594,10 @@ msgid "Building address"
msgstr "建物の住所"
msgid "House number:"
-msgstr "家番号:"
+msgstr "住居番号:"
msgid "Street Name:"
-msgstr "通りの名前"
-
-msgid "Increment"
-msgstr "増加"
-
-msgid "Decrement"
-msgstr "減少"
-
-msgid "Numbers:"
-msgstr "数値:"
+msgstr "通り名:"
msgid "Big buildings mode"
msgstr "巨大建物モード"
@@ -21043,6 +22786,9 @@ msgstr "地理参照中にイメージ切り抜きを無効化"
msgid "Use \"Tableau d''assemblage\""
msgstr "「Tableau d''assemblage」を使う"
+msgid "Replace grey shades by white color only"
+msgstr "灰色の影を白のみに置き換える"
+
msgid "Select first WMS layer in list."
msgstr "リスト中の最初のWMSレイヤーを選択。"
@@ -21061,12 +22807,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "高"
-
-msgid "medium"
-msgstr "中"
-
msgid "symbol"
msgstr "シンボル"
@@ -21208,6 +22948,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr "土地台帳リスト中の \"Tableau(x) d''assemblage\" をグラブに追加"
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr "グレーを白に置換する（ファイルとメモリの容量を削減）。"
+
msgid "Display crosspieces:"
msgstr "水平線を表示:"
@@ -21225,6 +22968,9 @@ msgstr "選択する時に複数のレイヤーが存在する場合、自動的
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "ノードに \"add:street\" タグの使用を許可する"
+msgid "Unexpected file extension. {0}"
+msgstr "想定外のファイル拡張子です。{0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "\"source=...\" を要素に追加しますか？"
@@ -21313,54 +23059,6 @@ msgstr ""
"この画像はジオ参照データを含んでいます。\n"
"これらを使用しますか？"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"イメージを切り抜く最初の角をクリック \n"
-"(二箇所必要)"
-
-msgid "Image cropping"
-msgstr "イメージ切り抜き"
-
-msgid "Click second corner for image cropping"
-msgstr "切り抜くイメージの二番目の角をクリック"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"最初の地理参照用ランベルトcrosspiece をクリック\n"
-"（2つのポイントが必要）"
-
-msgid "Image georeferencing"
-msgstr "地理参照画像"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "２番目の地理参照用ランベルトcrosspiece をクリック"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"完全にキャンセルしますか\n"
-"それとも単にやり直しますか "
-
-msgid "Enter cadastre east,north position"
-msgstr "cadastre の東、北の位置を入力"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(警告: 矢印のある北を確認！)"
-
-msgid "East"
-msgstr "東経"
-
-msgid "I use the mouse"
-msgstr "マウスを使います"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "{0} ランベルト座標にセット"
-
msgid "Load layer from cache"
msgstr "キャッシュからレイヤーをロード"
@@ -21397,38 +23095,102 @@ msgid "Commune"
msgstr "コミューン"
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
+msgstr ""
+"<html>町、村または市区の名前を入力してください。<br>文法や句読点はwww.cadastre.gouv.fr "
+"に従ってください。(フランス語の場合)</html>"
+
+msgid "Departement"
+msgstr "県"
+
+msgid "<html>Departement number (optional)</html>"
+msgstr "<html>県番号（オプション）</html>"
+
+msgid "Add new layer"
+msgstr "新規レイヤーを作成"
+
+msgid "Open Cadastre Preferences"
+msgstr "Open Cadastre 設定"
+
+msgid "Refine georeferencing"
+msgstr "下絵を純化する"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "下絵を強化する（ラスタ画像のみ）"
+
+msgid "Reset cookie"
+msgstr "クッキーのリセット"
+
+msgid "Get a new cookie (session timeout)"
+msgstr "新しい cookie を入手してください(セッションがタイムアウトしました)"
+
+msgid "Save image as..."
+msgstr "名前を付けて画像を保存..."
+
+msgid "PNG files (*.png)"
+msgstr "PNG ファイル (*.png)"
+
+msgid "GeoTiff files (*.tif)"
+msgstr "GeoTiff ファイル (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "画像をエクスポート（ラスタ画像のみ）"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"イメージを切り抜く最初の角をクリック \n"
+"(二箇所必要)"
+
+msgid "Image cropping"
+msgstr "イメージ切り抜き"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"最初の地理参照用ランベルトcrosspiece をクリック\n"
+"（2つのポイントが必要）"
+
+msgid "Image georeferencing"
+msgstr "地理参照画像"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"完全にキャンセルしますか\n"
+"それとも単にやり直しますか "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-"<html>町、村または市区の名前を入力してください。<br>文法や句読点はwww.cadastre.gouv.fr "
-"に従ってください。(フランス語の場合)</html>"
-
-msgid "Departement"
-msgstr "県"
+"失敗です。すべての座標が正しく取得\n"
+"できませんでした。再試行してください。"
-msgid "<html>Departement number (optional)</html>"
-msgstr "<html>県番号（オプション）</html>"
-
-msgid "Add new layer"
-msgstr "新規レイヤーを作成"
+msgid "Enter cadastre east,north position"
+msgstr "cadastre の東、北の位置を入力"
-msgid "Open Cadastre Preferences"
-msgstr "Open Cadastre 設定"
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(警告: 矢印のある北を確認！)"
-msgid "Reset cookie"
-msgstr "クッキーのリセット"
+msgid "East"
+msgstr "東経"
-msgid "Get a new cookie (session timeout)"
-msgstr "新しい cookie を入手してください(セッションがタイムアウトしました)"
+msgid "I use the mouse"
+msgstr "マウスを使います"
-msgid "Save image as PNG"
-msgstr "イメージをPNGとして保存"
+msgid "Set {0} Lambert coordinates"
+msgstr "{0} ランベルト座標にセット"
-msgid "PNG files (*.png)"
-msgstr "PNG ファイル (*.png)"
+msgid "Click second corner for image cropping"
+msgstr "切り抜くイメージの二番目の角をクリック"
-msgid "Export as PNG format (only raster images)"
-msgstr "PNG 形式でエクスポート(ラスター画像のみ)"
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "２番目の地理参照用ランベルトcrosspiece をクリック"
msgid "Adjust WMS"
msgstr "WMSの調整"
@@ -21455,8 +23217,11 @@ msgstr "WMSレイヤー ({0}), {1}枚のタイルを読み込みました"
msgid "Is not vectorized."
msgstr "ベクターではありません。"
-msgid "Raster size: {0}"
-msgstr "ラスターサイズ: {0}"
+msgid "Bounding box: {0}"
+msgstr "矩形範囲: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "画像サイズ（px）: {0}/{1}"
msgid "Is vectorized."
msgstr "ベクタライズされました。"
@@ -21505,7 +23270,7 @@ msgstr "選択した配色を一覧から削除する。"
msgid "Color Schemes"
msgstr "配色"
-msgid "Adress"
+msgid "Address"
msgstr "住所"
msgid "Split area"
@@ -21552,6 +23317,9 @@ msgstr "ウェイに沿ってダウンロード"
msgid "Please select 1 or more ways to download along"
msgstr "ダウンロードする1つ以上のウェイを選択してください"
+msgid "Download from OSM along selected ways"
+msgstr "選択されたウェイ沿いにOSMからダウンロード"
+
msgid "{0} intermediate nodes to download."
msgstr "{0}個の中間ノードをダウンロードします。"
@@ -21627,6 +23395,70 @@ msgstr "新しいツール...."
msgid "Install"
msgstr "インストール"
+msgid "Public"
+msgstr "公開"
+
+msgid "Could not get server response, check logs"
+msgstr "サーバーの反応がありません。ログをチェックしてください"
+
+msgid "Failed to login as {0}:"
+msgstr "{0}としてログインに失敗しました:"
+
+msgid "The server did not return user ID"
+msgstr "サーバーからユーザーIDが返りませんでした"
+
+msgid "Failed to send message:"
+msgstr "メッセージの送信に失敗しました:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "{0}としてメッセージの取得に失敗しました:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "GeoChatパネルを開く"
+
+msgid "Zoom in to see messages"
+msgstr "メッセージを見るためにズームイン"
+
+msgid "Login"
+msgstr "ログイン"
+
+msgid "Enable autologin"
+msgstr "自動ログインを有効化"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0}人"
+
+msgid "not logged in"
+msgstr "ログインしていません"
+
+msgid "User {0} has left"
+msgstr "{0}さんが脱退しました"
+
+msgid "User {0} is mapping nearby"
+msgstr "{0}さんが近くをマッピングしています"
+
+msgid "Users mapping nearby:"
+msgstr "付近をマッピングしているユーザー:"
+
+msgid "Private chat"
+msgstr "プライベートチャット"
+
+msgid "Close tab"
+msgstr "タブを閉じる"
+
+msgid "Logout"
+msgstr "ログアウト"
+
+msgid "Clear log"
+msgstr "ログのクリア"
+
+msgid "Show users on map"
+msgstr "地図上のユーザーを表示"
+
msgid "Position only"
msgstr "位置のみ"
@@ -21666,27 +23498,9 @@ msgstr "距離が次以下になったらデータ取得をやめる:"
msgid "Unknown logFormat"
msgstr "データ記録フォーマットが不明です"
-msgid "Port:"
-msgstr "ポート:"
-
-msgid "refresh the port list"
-msgstr "ポートのリストを更新する。"
-
-msgid "Configure"
-msgstr "設定"
-
msgid "Configure Device"
msgstr "デバイスの設定"
-msgid "Connection Error."
-msgstr "接続エラー"
-
-msgid "configure the connected DG100"
-msgstr "接続されたDG100の設定"
-
-msgid "delete data after import"
-msgstr "インポート後データを削除"
-
msgid "Importing data from device."
msgstr "デバイスからデータをインポート"
@@ -22095,6 +23909,9 @@ msgstr "選択用のイメージXML境界を作成"
msgid "edit bounds for selected defaults"
msgstr "選択された既定の境界を編集"
+msgid "Download imagery XML bounds"
+msgstr "XML境界線で画像をダウンロード"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22123,7 +23940,7 @@ msgid "Deprecate Offset"
msgstr "オフセットを非推奨にする"
msgid "Are you sure this imagery offset is wrong?"
-msgstr "本当にこの画像オフセットが間違っていると思いますか？"
+msgstr "本当にこの画像オフセットが誤っていると思いますか？"
msgid "Are you sure this calibration geometry is aligned badly?"
msgstr "本当にこの位置合わせ座標は間違っていると思いますか？"
@@ -22149,7 +23966,7 @@ msgid "Get Imagery Offset..."
msgstr "画像オフセットを取得..."
msgid "Download offsets for current imagery from a server"
-msgstr "現在のイメージのオフセットをサーバーからダウンロード"
+msgstr "現在の画像用のオフセットをサーバーからダウンロード"
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
@@ -22165,7 +23982,7 @@ msgid "Offset"
msgstr "オフセット"
msgid "Imagery Offset Database"
-msgstr "画像オフセットのデータベース"
+msgstr "画像オフセットデータベース"
msgid "mm"
msgstr "mm"
@@ -22202,10 +24019,10 @@ msgstr ""
"画像レイヤー上の一致する地物を探し、相当の位置に移動してください。"
msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "{0}さんが{1}に非推奨化"
msgid "Created by {0} on {1}"
-msgstr "{0}さんによって{1}に作成"
+msgstr "{0}さんが{1}に作成"
msgid "Offset Information"
msgstr "オフセット情報"
@@ -22229,10 +24046,10 @@ msgid "A calibration geometry of {0} nodes"
msgstr "{0}ノードの位置合わせ座標"
msgid "Determined right here"
-msgstr ""
+msgstr "ちょうどこの位置で指定"
msgid "Determined {0} away"
-msgstr ""
+msgstr "{0}離れた位置で指定"
msgid "Reason"
msgstr "理由"
@@ -22285,7 +24102,7 @@ msgid ""
"clearly visible boundaries on various satellite imagery. Please describe "
"this object and its whereabouts."
msgstr ""
-"位置合わせ座標を登録しようとしています。様々な衛星画像でクリアに見える範囲で、もっとも正確な位置のオブジェクトを指定する必要があります。このオブj家宇都が"
+"位置合わせ座標を登録しようとしています。様々な衛星画像でクリアに見える範囲で、もっとも正確な位置のオブジェクトを指定する必要があります。このオブジェクトが"
"どこなのかを指定してください。"
msgid "Uploading a new offset..."
@@ -22298,16 +24115,16 @@ msgid "Adjust imagery"
msgstr "画像を調整"
msgid "Adjust the position of the selected imagery layer"
-msgstr "選択した画像レイヤーの位置を調整"
+msgstr "選択された画像レイヤーの位置を調整します"
msgid "Please select the imagery layer to adjust."
-msgstr "調整する画像レイヤーを選んでください。"
+msgstr "調整する画像レイヤーを選択してください。"
msgid "Start adjusting"
msgstr "調整開始"
msgid "There are currently no imagery layer to adjust."
-msgstr "現在は調整する画像レイヤーがありません。"
+msgstr "現在、調整する画像レイヤーがありません。"
msgid "No layers to adjust"
msgstr "調整するレイヤーがありません"
@@ -22354,12 +24171,6 @@ msgstr "インポートした画像"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "画像ファイル (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "画像をImageWayPointで開く"
-
-msgid "Load set of images as a new layer."
-msgstr "新規レイヤーとして画像セットを読み込む."
-
msgid "Import vector graphics"
msgstr "ベクターグラフィックスをインポート"
@@ -22369,18 +24180,15 @@ msgstr "スケール:"
msgid "unit(s) = "
msgstr "単位= "
-msgid "Import..."
-msgstr "インポート..."
-
-msgid "Import vector graphics."
-msgstr "ベクターグラフィックスをインポート"
-
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG描画 (*.svg)"
-
msgid "Importing..."
msgstr "インポート中..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "SVGファイル［ImportVecプラグイン］ (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "インポート前にデータレイヤーを開くか新規作成するかしてください"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -22745,9 +24553,6 @@ msgstr "自動中心設定"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "現在の位置にLiveGPSレイヤーを引き続き中央寄せする。"
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "MapDustを開く"
@@ -22802,9 +24607,27 @@ msgstr "ウェイの重複をマージします。"
msgid "Merge Overlap (combine)"
msgstr "重複をマージ（結合）"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>リレーションの所属に基づくロールがすべての新しいウェイにコピーされました。<br>必要に応じて確認や修正をしてください。</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr "<html>リレーションの所属がすべての新しいウェイにコピーされました。<br>必要に応じて確認や修正をしてください。</html>"
+
msgid "Split way"
msgstr "ウェイを分割"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>タグキーを入力してください、例）<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr "<html>タグの値を入力してください、例）<strong><tt>check members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "ミシガン左折"
@@ -22848,6 +24671,15 @@ msgstr "ダウンロードするオブジェクト種別（''*'' ですべて）
msgid "XAPI query: "
msgstr "XAPIクエリ: "
+msgid "Download from Overpass API ..."
+msgstr "Overpass APIからダウンロード..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Overpass API サーバーから地図データをダウンロードします。"
+
+msgid "Overpass query: "
+msgstr "Overpassのクエリー: "
+
msgid "Select OSM mirror URL"
msgstr "OSMミラーURLを選択"
@@ -22860,15 +24692,6 @@ msgstr "ベース URL"
msgid "Enforce meta data"
msgstr "メタデータにする"
-msgid "Convert to multipolygon"
-msgstr "マルチポリゴンに変換"
-
-msgid "Convert to multipolygon."
-msgstr "マルチポリゴンに変換。"
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "選択されたウェイのひとつは既に別のマルチポリゴンの一部です。"
-
msgid "About Plugin"
msgstr "プラグイン情報"
@@ -22955,7 +24778,7 @@ msgid "oauth key"
msgstr "oauthのキー"
msgid "oauth secret"
-msgstr "oauthの秘密コード"
+msgstr "oauthの秘密鍵"
msgid ""
"<br><strong>Warning:</strong> There may be sensitive data left in your "
@@ -23005,9 +24828,6 @@ msgstr "neighbourhoodで分割"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "このデータをneighbourhood（管理レベル=11）で分割します。"
-msgid "Open Data"
-msgstr "Open Data"
-
msgid "CSV files"
msgstr "CSVファイル"
@@ -23032,12 +24852,21 @@ msgstr "GMLファイル"
msgid "Zip Files"
msgstr "Zipファイル"
+msgid "7Zip Files"
+msgstr "7Zipファイル"
+
msgid "OpenData XML files"
msgstr "OpenData XMLファイル"
+msgid "Download open data"
+msgstr "オープンデータをダウンロード"
+
msgid "License URL not available: {0}"
msgstr "ライセンスのURLが利用できません: {0}"
+msgid "OpenData preferences"
+msgstr "OpenData設定"
+
msgid "License Agreement"
msgstr "ライセンス契約書"
@@ -23068,12 +24897,12 @@ msgid ""
"The following module has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} modules have been downloaded <strong>successfully</strong>:"
-msgstr[0] "次の{0}モジュールのダウンロードに<strong>成功しました</strong>。"
+msgstr[0] "次のモジュール{0}件のダウンロードに<strong>成功しました</strong>。"
msgid "Downloading the following module has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} modules has <strong>failed</strong>:"
-msgstr[0] "次の{0}モジュールのダウンロードが<strong>失敗しました</strong>。"
+msgstr[0] "次のモジュール{0}件のダウンロードに<strong>失敗しました</strong>。"
msgid "Modules"
msgstr "モジュール"
@@ -23142,7 +24971,7 @@ msgid ""
"Terms and Conditions of Use of each portal<br/>before any upload of data "
"loaded by this plugin."
msgstr ""
-"様々なOpenDataポータルの特別なハンドラ―です<br/><br/>このプラグインでロードしたデータをアップロードする前に<br/>各ポータルの利用規"
+"様々なOpenDataポータルの特別なハンドラーです<br/><br/>このプラグインでロードしたデータをアップロードする前に<br/>各ポータルの利用規"
"約をお読みください。"
msgid "General settings"
@@ -23186,6 +25015,9 @@ msgstr "データのダウンロード中..."
msgid "File to load"
msgstr "読み込むファイル"
+msgid "Reading 7Zip file..."
+msgstr "7Zipファイルを読み込み中..."
+
msgid "Reading Zip file..."
msgstr "ZIPファイルを読み込み中..."
@@ -23205,6 +25037,19 @@ msgstr ""
msgid "Try lenient method"
msgstr "lenient法を試す"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"座標参照系が検出できませんでした。\n"
+"ESPG:4326（WGS 84）に切り替えますか？"
+
+msgid "Warning: CRS not found"
+msgstr "警告: 座標参照系が見つかりません"
+
+msgid "Unable to detect CRS !"
+msgstr "座標参照系を検出できません。"
+
msgid "Unable to find a data store for file {0}"
msgstr "{0}ファイルのデータストアが見つかりませんでした"
@@ -23441,19 +25286,12 @@ msgid ""
"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
"upload this data. Maybe you have selected the wrong layer?"
msgstr ""
-"<html>選択されたデータはOpenStreetBugs "
-"のデータを含んでいます。<br>このデータはアップロードできません。違うレイヤーを選択したようですね？"
+"<html>選択されたデータはOpenStreetBugsのデータを含んでいます。<br>このデータはアップロードできません。誤ったレイヤーを選択していま"
+"せんか？"
msgid "An error occurred: {0}"
msgstr "エラーが発生しました: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "新しいバグを作成できませんでした。結果: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr "ヘッダが複数の値を含んでいるため、一つのストリングに描画することができません。"
-
msgid "Process queue"
msgstr "処理キュー"
@@ -23506,18 +25344,6 @@ msgstr "<html>この件を本当に''完了''としてマークしますか？<b
msgid "Close: "
msgstr "クローズ: "
-msgid "New issue"
-msgstr "新規問題点"
-
-msgid "Create issue"
-msgstr "問題の作成"
-
-msgid "Describe the problem precisely"
-msgstr "問題を詳細に記述してください"
-
-msgid "Create: "
-msgstr "作成: "
-
msgid "Open in browser"
msgstr "ブラウザーで開く"
@@ -23575,6 +25401,9 @@ msgstr "Firefoxの実行ファイル"
msgid "OSM Server Files pbf compressed"
msgstr "OSMサーバー用pbf圧縮ファイル"
+msgid "Download PBF"
+msgstr "PBFをダウンロード"
+
msgid "Invalid changeset id: {0}"
msgstr "不正な変更セットID: {0}"
@@ -23782,9 +25611,6 @@ msgstr "PDFファイルをインポートします。"
msgid "Import PDF"
msgstr "PDFをインポート"
-msgid "Import PDf file"
-msgstr "PDFファイルをインポート"
-
msgid " {0} objects so far"
msgstr " 現在{0}オブジェクト"
@@ -23864,8 +25690,26 @@ msgstr "テスト失敗: mtimeを読み込めませんでした。"
msgid "Test failed: Could not write mtime."
msgstr "テスト失敗: mtimeを書き込めませんでした。"
-msgid "PicLayer"
-msgstr "写真レイヤー"
+msgid "Adjust photos"
+msgstr "写真を位置合わせする"
+
+msgid "Move and position photos"
+msgstr "移動して写真を配置する"
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr "写真をクリックしてドラッグ、、Shift+クリックで写真を配置。"
+
+msgid "Please load some photos."
+msgstr "写真をロードしてください。"
+
+msgid "Toggle the image thumbnail preview"
+msgstr "プレビュー用のサムネイル画像の表示/非表示"
+
+msgid "New layer for untagged images"
+msgstr "タグ付けされていない画像の新しいレイヤー"
+
+msgid "Untagged Images"
+msgstr "タグ付けされていない画像"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "レイヤー {0} の現在の位置調整を保存しますか？"
@@ -24020,6 +25864,9 @@ msgstr "クリップボードは空です"
msgid "The clipboard data is not an image"
msgstr "クリップボードのデータは画像ではありません"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "警告: zipファイル ''{0}'' のハンドルに失敗。例外コード: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "画像ファイルに関連付けられた位置合わせファイルが見つかりました: {0}\n"
@@ -24043,6 +25890,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr "また、今後、位置合わせファイルは常に自動的に読み込まれます。"
+msgid "Download Osmosis poly"
+msgstr "Osmosis polyをダウンロード"
+
msgid "Reading polygon filter file..."
msgstr "ポリゴンフィルターファイルを読み込み中..."
@@ -24062,7 +25912,7 @@ msgid "Unable to parse {0} as a number"
msgstr "{0} を数値として解釈できません"
msgid "Invalid coordinates were found: {0}, {1}"
-msgstr "不正な座標が見つかりました: {0}, {1}"
+msgstr "無効な座標が見つかりました: {0}, {1}"
msgid "{0} points were outside world bounds and were moved"
msgstr "{0}個の範囲外にあった点が移動されました"
@@ -24336,9 +26186,6 @@ msgstr "GPXファイルにトラックやウェイポイントがありません
msgid "Create Stops from GPX"
msgstr "GPXから停留所を作成"
-msgid "Tracks"
-msgstr "トラック"
-
msgid "Tracks in this GPX file:"
msgstr "トラックが含まれるGPXファイル:"
@@ -24407,9 +26254,6 @@ msgstr "ロールを指定"
msgid "Change relation member roles to {0}"
msgstr "リレーションメンバーのロールを{0}に変更"
-msgid "Change multipolygon creation settings"
-msgstr "マルチポリゴン作成設定を変更"
-
msgid "Create administrative boundary relations"
msgstr "行政境界リレーションを作成"
@@ -24480,7 +26324,7 @@ msgid "Duplicate relation"
msgstr "リレーションの複製"
msgid "Open relation editor for the chosen relation"
-msgstr "選択されたリレーションでリレーションエディターを開く"
+msgstr "選択されたリレーションでリレーション編集画面を開く"
msgid "Find a relation"
msgstr "リレーションを検索"
@@ -24536,9 +26380,6 @@ msgstr "ロールが ''label'' または ''admin_centre'' ではないノード
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "ロールが ''inner'' または ''outer'' ではないウェイが見つかりました"
-msgid "Restart JOSM"
-msgstr "JOSMを再起動してください"
-
msgid "Revert changeset fully"
msgstr "変更セット全体を戻す"
@@ -24560,6 +26401,9 @@ msgstr "取り消したい変更セットのIDを入力してください"
msgid "Reverted changeset"
msgstr "変更セットを元に戻しました"
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "{0}からの変更セットの取消が許可されていません"
+
msgid "Missing merge target for {0} with id {1}"
msgstr "ID {1} のマージ先 {0} が見つかりません"
@@ -24594,15 +26438,31 @@ msgstr "消えたプリミティブを探しています"
msgid "Downloading changeset"
msgstr "変更セットをダウンロード中"
+msgid "See {0}"
+msgstr "{0}をご覧ください"
+
msgid "Revert changeset #{0}"
msgstr "変更セット #{0} を取り消します"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない開始エレメント ''{0}'' があります。スキップします。"
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr "警告: 変更セットコンテンツ中 ({1},{2}) の位置にサポートされない終了エレメント ''{0}'' があります。スキップします。"
+
msgid "Road Sign Plugin"
msgstr "Road Sign プラグイン"
msgid "signs"
msgstr "標識"
+msgid "Change Properties"
+msgstr "プロパティの変更"
+
msgid "Country preset:"
msgstr "国のプリセット:"
@@ -24612,6 +26472,9 @@ msgstr "すべての標識を表示"
msgid "Show a selection of the most useful signs"
msgstr "よく使用する標識を選択して表示"
+msgid "Spain"
+msgstr "スペイン"
+
msgid "Germany"
msgstr "ドイツ"
@@ -24714,9 +26577,6 @@ msgstr "ルーティング プラグインの設定"
msgid "Configure routing preferences."
msgstr "ルーティング設定情報の構成"
-msgid "Highway type"
-msgstr "ハイウェイ タイプ"
-
msgid "Speed (Km/h)"
msgstr "速度 (Km/h)"
@@ -24834,6 +26694,9 @@ msgstr "現在のSDS情報をファイルに保存"
msgid "Save SDS file"
msgstr "SDSファイルを保存"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "ファイルをバックアップできません。例外: {0}"
+
msgid "Simplify Area"
msgstr "エリアを簡素化"
@@ -24900,20 +26763,20 @@ msgstr "距離の係数"
msgid "Merge Nearby Nodes Threshold"
msgstr "近接するノードを結合する閾値"
-msgid "Online Help"
-msgstr "オンラインヘルプ"
+msgid "SeaMap Editor"
+msgstr "SeaMapエディタ"
-msgid "Load"
-msgstr "ロード"
+msgid "No object selected"
+msgstr "オブジェクトが選択されていません"
-msgid "invisible"
-msgstr "非表示"
+msgid "Seamark Inspector"
+msgstr "Seamark Inspector"
-msgid "SeaMap Editor"
-msgstr "SeaMapエディタ"
+msgid "Select only one object"
+msgstr "オブジェクトを1つだけ選択してください"
-msgid "Export"
-msgstr "エクスポート"
+msgid "Select a map object"
+msgstr "地図上のオブジェクトを選択してください"
msgid "AutoSave LiveData"
msgstr "LiveDataの自動保存"
@@ -25050,6 +26913,9 @@ msgstr "輪郭のウェイを削除"
msgid "Street name: "
msgstr "通り名: "
+msgid "Building: "
+msgstr "建物: "
+
msgid "Even/Odd"
msgstr "偶数/奇数"
@@ -25060,10 +26926,10 @@ msgid "Highest number"
msgstr "最も大きな住居番号"
msgid "Lowest housenumber cannot be higher than highest housenumber"
-msgstr "家屋番号の最小値は最大値よりも大きくできません"
+msgstr "住居番号の最小値は最大値よりも大きくできません"
msgid "Housenumbers do not match odd/even setting"
-msgstr "家屋番号が奇数・偶数の設定に違反しています"
+msgstr "住居番号が奇数・偶数の設定に違反しています"
msgid "Segment must be a number greater 1"
msgstr "区間は1より大きい数値でなければなりません"
@@ -25096,7 +26962,7 @@ msgid "Creates individual buildings from a long building."
msgstr "長い建物から個別の建物を生成"
msgid "Invalid selection"
-msgstr "不正な選択"
+msgstr "選択が無効です"
msgid ""
"Select a single, closed way of at least four nodes. (Optionally you can also "
@@ -25127,6 +26993,100 @@ msgstr "Tracer"
msgid "Tracer building"
msgstr "Tracerの建物"
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2"
+
+msgid "Change tag {0} to {1}"
+msgstr "タグ{0}を{1}に変更"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"Tracer2Serverのバージョンがこのプラグインと互換性がありません。バージョン{0}を次の場所からダウンロードしてください。\n"
+"{1}"
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr "Trace2Serverの新しいバージョンが利用可能です。良い結果を出すためにもバージョン{0}にアップグレードしてください。"
+
+msgid "No set of parameter is active!"
+msgstr "有効なパラメーターのセットがありません。"
+
+msgid "Select parameter"
+msgstr "パラメーターを選択"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: {0}個の点を持ったウェイを追加しました"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: ウェイの点を{0}個に変更しました。"
+
+msgid "Tracer2 error"
+msgstr "Tracer2エラー"
+
+msgid "Parameter for server request"
+msgstr "サーバーリクエストのパラメーター"
+
+msgid "Tile size:"
+msgstr "タイルサイズ:"
+
+msgid "Resolution:"
+msgstr "解像度:"
+
+msgid "Mode:"
+msgstr "モード:"
+
+msgid "Threshold:"
+msgstr "しきい値:"
+
+msgid "Points per circle:"
+msgstr "円を描く時の点の数:"
+
+msgid "Tag:"
+msgstr "タグ:"
+
+msgid "Preferred values:"
+msgstr "推奨値:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "パラメーター\"{0}\"を削除しますか？"
+
+msgid "Add new"
+msgstr "新規追加"
+
+msgid "Add predefined"
+msgstr "既定値を追加"
+
+msgid "Select predefined parameter"
+msgstr "既定のパラメーターを選択"
+
+msgid "Modify list of parameter for server request."
+msgstr "サーバーリクエストのパラメーターの一覧を変更してください。"
+
+msgid "Parameter:"
+msgstr "パラメーター:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+"Tracer2Serverが動作していません。サーバーを起動してください。\n"
+"サーバーをお持ちでないならば、以下からダウンロードしてください。\n"
+"{0}"
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "Tracer2Serverが見つかりませんでした。"
+
+msgid "Tracer2Server has detected an error."
+msgstr "Tracer2Serverがエラーを検出しました。"
+
msgid "GPG"
msgstr "GPG"
@@ -25142,9 +27102,6 @@ msgstr "署名をXMLにエクスポート..."
msgid "Save Signatures file"
msgstr "署名ファイルを保存"
-msgid "Download OSM"
-msgstr "OSMをダウンロード"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr "OSMサーバーから参照されていて現在存在していないOSMオブジェクトをすべて取得します。"
@@ -25168,6 +27125,9 @@ msgstr "サーバーからオブジェクトをロード"
msgid "Download signed data"
msgstr "サイン付きデータをダウンロード"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr "警告:タスクがキャンセルされたため、例外は無視されました。例外は:{0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25212,7 +27172,7 @@ msgid "Show all available signatures for selected attribute."
msgstr "選択された属性のすべての有効な署名を表示します。"
msgid "Show deleted tags and notes if they were signed before"
-msgstr "署名されたことがある削除されたタグやノートを表示"
+msgstr "以前に署名されていた削除されたタグや備考を表示"
msgid ""
"Use default (and maybe existing) GnuPG directory ({0}) to store new keys and "
@@ -25328,9 +27288,6 @@ msgstr "署名はキャンセルされました"
msgid "Please give a tolerance in meters"
msgstr "メートル単位で誤差を入力してください。"
-msgid "Accuracy"
-msgstr "精度"
-
msgid "Select as much as you like:"
msgstr "お好きなように選択してください:"
@@ -25535,7 +27492,7 @@ msgid ""
msgid_plural ""
"There are still {0} errors and/or warnings identified for this turn "
"restriction. You are recommended to resolve these issues first."
-msgstr[0] "この進行方向制限に未解決のエラーまたは警告が {0} 件あります。まずこの問題を解決することをお勧めします。"
+msgstr[0] "この進行方向制限に未解決のエラーまたは警告が{0}件あります。まずこの問題を解決することをお勧めします。"
msgid "Do you want to save anyway?"
msgstr "強制保存しますか？"
@@ -25561,7 +27518,7 @@ msgid ""
msgid_plural ""
"This turn restriction refers to {0} objects which were deleted outside of "
"this turn restriction editor:"
-msgstr[0] "この進行方向制限は、進行方向制限エディター外で削除された {0} 件のオブジェクトを参照しています。"
+msgstr[0] "この進行方向制限は、進行方向制限編集画面外で削除された{0}件のオブジェクトを参照しています。"
msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
@@ -25578,18 +27535,18 @@ msgid "Deleted members in turn restriction"
msgstr "進行方向制限中の削除済みメンバー"
msgid "Create a conflict and close this turn restriction editor"
-msgstr "競合を作成し、この進行方向制限エディターを閉じる"
+msgstr "競合を作成し、この進行方向制限編集画面を閉じる"
msgid "Return to the turn restriction editor and resume editing"
-msgstr "進行方向制限エディターに戻り編集を再開"
+msgstr "進行方向制限編集画面に戻り編集を再開"
msgid ""
"<html>This turn restriction has been changed outside of the editor.<br>You "
"cannot apply your changes and continue editing.<br><br>Do you want to create "
"a conflict and close the editor?</html>"
msgstr ""
-"<html>この進行方向制限はエディターの外部で変更されています。<br>変更を適用して編集を続けることはできません。<br><br>競合を作成してエディ"
-"ターを閉じますか？</html>"
+"<html>この進行方向制限は編集画面の外部で変更されています。<br>変更を適用して編集を続けることはできません。<br><br>競合を作成して編集画面"
+"を閉じますか？</html>"
msgid "Already participating in a conflict"
msgstr "既に競合に参加しています"
@@ -25605,11 +27562,11 @@ msgstr "この進行方向制限が属するレイヤーをアクティブにし
msgid "{0} warning"
msgid_plural "{0} warnings"
-msgstr[0] "{0} の警告"
+msgstr[0] "{0}件の警告"
msgid "{0} error"
msgid_plural "{0} errors"
-msgstr[0] "{0} のエラー"
+msgstr[0] "{0}件のエラー"
msgid "no issues"
msgstr "問題はありません"
@@ -25633,7 +27590,7 @@ msgid "Create new turn restriction"
msgstr "新しい進行方向制限を作成"
msgid "Launch the turn restriction editor to create a new turn restriction"
-msgstr "進行方向制限エディターを起動して新しい進行方向制限を作成"
+msgstr "進行方向制限編集画面を起動して新しい進行方向制限を作成"
msgid "No Right Turn"
msgstr "右折禁止"
@@ -25740,7 +27697,7 @@ msgid "Display and manage turn restrictions in the current data set"
msgstr "現在のデータセット中の進行方向制限を表示して管理"
msgid "Open an editor for the selected turn restriction"
-msgstr "選択された進行方向制限をエディターで開く"
+msgstr "選択された進行方向制限を編集画面で開く"
msgid "Delete the selected turn restriction"
msgstr "選択中の進行方向制限を削除"
@@ -25989,19 +27946,19 @@ msgstr "オブジェクト削除を取り消す..."
msgid "Undelete object by id"
msgstr "ＩＤでオブジェクトの削除を取り消し"
-msgid "Select if the data should be added into a new layer"
-msgstr "新しいレイヤーに追加するデータがあれば選択"
+msgid "Undelete Object"
+msgstr "オブジェクトの削除を取り消し"
+
+msgid "Undelete object"
+msgstr "オブジェクトの削除を取り消す"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr "削除を取り消したいオブジェクトの種別とIDを入力してください。例: ''n1 w2''"
-msgid "Undelete Object"
-msgstr "オブジェクトの削除を取り消し"
-
-msgid "Undelete object"
-msgstr "オブジェクトの削除を取り消す"
+msgid "Select if the data should be added into a new layer"
+msgstr "新しいレイヤーに追加するデータがあれば選択"
msgid "Start undeleting"
msgstr "削除の取り消しを開始"
@@ -26009,18 +27966,6 @@ msgstr "削除の取り消しを開始"
msgid "Close dialog and cancel"
msgstr "ダイアログを閉じてキャンセル"
-msgid "Will get {0}"
-msgstr "{0}を取得します"
-
-msgid "Looking for {0}"
-msgstr "{0}を検索中"
-
-msgid "Found {0}"
-msgstr "{0}が見つかった"
-
-msgid "More tools"
-msgstr "その他のツール"
-
msgid "Add nodes at intersections"
msgstr "交差点にノードを追加"
@@ -26061,16 +28006,7 @@ msgstr "リレーションを貼り付け"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
-msgstr "選択されたオブジェクトに蓄積されたオブジェクトからリレーションのメンバーを貼り付けます"
-
-msgid "Paste tags [testing]"
-msgstr "タグの貼り付け [テスト中]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr "選択されたすべての項目から解釈されたタグを貼り付けます。"
-
-msgid "Paste tags"
-msgstr "タグを貼り付け"
+msgstr "選択されたオブジェクトに蓄積されたオブジェクトからリレーションの所属を貼り付けます"
msgid "Split Object"
msgstr "オブジェクトを分割"
@@ -26193,23 +28129,11 @@ msgstr ""
"<b>{#id}</b>はその要素のIDに置き換えられます<br/> "
"<b>{#type}</b>は\"node\"、\"way\"、\"relation\"のどれかに置き換えられます<br/> "
"<b>{#lat} , {#lon}</b>は地図の中心の緯度／経度に置き換えられます <br/> "
-"JOSMのフォルダーにある <b>customurl.txt</b> ふぁりうから、手動で設定を読み込むことができます"
+"JOSMのフォルダーにある <b>customurl.txt</b> ファイルから、手動で設定を読み込むことができます"
msgid "Custom URL configuration"
msgstr "カスタムURL設定"
-msgid "Key is too long:"
-msgstr "キーが長すぎます。"
-
-msgid "Suspiciouns characters in tag:"
-msgstr "タグ中に疑わしい文字があります。"
-
-msgid "Value too long (max 255 characters):"
-msgstr "値が長すぎます（255文字以下）。"
-
-msgid "Ingore warnings"
-msgstr "警告を無視"
-
msgid "Lat Lon tool"
msgstr "座標ツール"
@@ -26294,8 +28218,7 @@ msgid ""
"The way to be replaced cannot have any nodes with properties or relation "
"memberships unless they belong to both ways."
msgstr ""
-"置き換えるウェイは、プロパティを持ったノードを含んでいたり、リレーションのメンバーになっていたりすることはできません（両方のウェイに所属している場合を除く"
-"）。"
+"置き換えるウェイは、プロパティを持ったノードを含んでいたり、リレーションに所属していたりすることはできません（両方のウェイに所属している場合を除く）。"
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr "冗長なメソッドの繰り返し回数の限界を超えました。メソッドを単純化してください。"
@@ -26406,9 +28329,6 @@ msgstr "ノードの選択を解除"
msgid "Removes all nodes from selection"
msgstr "選択したものからすべてのノードを選択解除"
-msgid "Video"
-msgstr "ビデオ"
-
msgid "Import Video"
msgstr "ビデオをインポート"
@@ -26538,8 +28458,8 @@ msgstr "ループ"
msgid "mute"
msgstr "ミュート"
-msgid "Scanned Map..."
-msgstr "スキャンされた地図..."
+msgid "Walking Papers Scanned Map"
+msgstr "Walking Papers Scanned Map"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26556,16 +28476,13 @@ msgid "Walking Papers: {0}"
msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
-msgstr "ズーム{1}でのウォーキングペーパーレイヤー{0}"
-
-msgid "Walking Papers"
-msgstr "Walking Papers"
+msgstr "ズーム{1}のWalking Papersレイヤー{0}"
msgid "Way Download"
msgstr "ウェイのダウンロード"
msgid "Download map data on the end of selected way"
-msgstr "選択されたウェイの最後にマップデータをダウンロード"
+msgstr "選択されたウェイの最後に地図データをダウンロード"
msgid ""
"<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -26698,9 +28615,6 @@ msgstr "Wikipediaの記事について既定の言語を設定する"
msgid "Enter the Wikipedia language"
msgstr "Wikipediaの言語を入力"
-msgid "Add Tag"
-msgstr "タグを追加"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 5d7b68c..604cafa 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:41+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:41+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "გასახსნელ ლინკს ამ პლატფორმაზე არ აქვს მხარდაჭერა (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "JOSM-ის შესახებ"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -201,6 +216,9 @@ msgstr "არაა სამიზნე ფენები"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -241,9 +259,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr "გთხოვ მონიშნე ოთხი წერტილი მაინც"
-msgid "Information"
-msgstr "ინფორმაცია"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -268,6 +283,9 @@ msgstr "კონფლიქტი"
msgid "download"
msgstr "ჩამოტვირთე"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "წინა"
@@ -277,6 +295,9 @@ msgstr "შემდეგი"
msgid "Nothing selected to zoom to."
msgstr "მიახლოვებისთვის არაფერი არ არის მონიშნული"
+msgid "Information"
+msgstr "ინფორმაცია"
+
msgid "Zoom to {0}"
msgstr "მიაახლოვე {0}"
@@ -331,10 +352,9 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"ვერ მოხერხდა გზების შეერთება (ისინი ვერ შეერთდა წერტილების ერთ წყებად)"
msgid "Combine {0} ways"
msgstr "შეაერთე {0} გზა"
@@ -391,18 +411,35 @@ msgstr "წაშალე"
msgid "Delete selected objects."
msgstr "წაშალე მონიშნული ობიექტები"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "გაანაწილე მონიშნული წერტილები თანაბარ დაშორებაზე ხაზის გასწვრივ."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "გადმოწერე OSM-დან"
msgid "Download map data from the OSM server."
msgstr "გადმოწერე რუკის მონაცემები OSM სერვერიდან."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "გადმოწერე ობიექტი."
@@ -497,6 +534,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -610,7 +650,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -760,8 +800,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -918,8 +958,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -946,12 +986,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -969,9 +1005,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1078,6 +1111,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1128,9 +1170,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1192,6 +1231,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1266,13 +1308,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1361,6 +1403,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1385,9 +1448,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1583,6 +1643,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1592,6 +1655,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1611,6 +1686,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1661,25 +1761,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1822,6 +1903,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1846,8 +1930,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1863,6 +1947,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2269,6 +2356,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2429,13 +2519,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2444,6 +2534,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2462,8 +2555,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2549,6 +2641,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2585,10 +2680,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2611,8 +2706,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2716,6 +2811,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2776,8 +2874,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2807,10 +2905,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2831,6 +2929,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2861,18 +2962,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2881,8 +2982,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2890,13 +2991,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2910,8 +3009,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2941,11 +3040,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "უცნიბი"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3098,8 +3196,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3206,7 +3303,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3225,6 +3322,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3241,9 +3341,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3282,6 +3379,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3306,6 +3406,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3365,13 +3474,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3441,6 +3550,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3510,6 +3637,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3567,13 +3700,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3605,10 +3738,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3742,7 +3875,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3817,6 +3950,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3847,9 +3983,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3874,10 +4007,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3940,23 +4073,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4060,7 +4176,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4256,9 +4372,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4274,10 +4405,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4286,6 +4429,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4345,6 +4491,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4372,19 +4521,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4672,29 +4808,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4709,7 +4863,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4761,14 +4915,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5018,14 +5164,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5546,6 +5692,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5629,6 +5778,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "ობიექტის ტიპი:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "აირჩიე OSM-ის ობიექტის ტიპი."
+
+msgid "Object ID:"
+msgstr "ობიექტის საიდენტიფიკაციო ნომერი:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "შეიყვანე ობიექტის ნომერი, რომელიც უნდა იქნას გადმოქაჩული"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5650,9 +5826,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5677,32 +5850,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5722,8 +5895,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5749,9 +5921,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5896,9 +6065,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6183,8 +6349,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6249,34 +6415,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6291,13 +6469,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6376,12 +6554,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6411,9 +6583,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6451,7 +6629,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6511,6 +6689,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6766,6 +6947,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6831,9 +7031,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6900,21 +7097,8 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr "ობიექტის ტიპი:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "აირჩიე OSM-ის ობიექტის ტიპი."
-
-msgid "Object ID:"
-msgstr "ობიექტის საიდენტიფიკაციო ნომერი:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "შეიყვანე ობიექტის ნომერი, რომელიც უნდა იქნას გადმოქაჩული"
+msgid "Start downloading"
+msgstr "დაიწყე გადმოქაჩვა."
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6924,23 +7108,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "დაიწყე გადმოქაჩვა."
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7037,7 +7207,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7136,6 +7306,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7223,7 +7396,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7242,6 +7415,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7308,8 +7487,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7384,8 +7562,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7399,8 +7577,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7615,12 +7792,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7629,6 +7800,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7644,6 +7831,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7651,8 +7853,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7764,9 +7966,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7776,6 +7975,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7792,7 +7994,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7938,7 +8140,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7968,7 +8170,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8082,6 +8284,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8119,6 +8324,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8315,9 +8523,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8336,6 +8541,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8393,6 +8601,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8459,9 +8673,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8474,7 +8685,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8501,12 +8715,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8635,14 +8853,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8657,7 +8871,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8667,8 +8881,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8888,7 +9101,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8954,6 +9167,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9011,9 +9230,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9260,6 +9476,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9388,6 +9607,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9430,6 +9655,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9480,19 +9708,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9510,40 +9729,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9567,6 +9795,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9623,6 +9884,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9676,6 +9940,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9957,7 +10226,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10126,6 +10401,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10189,7 +10470,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10447,40 +10728,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10533,8 +10814,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10543,20 +10824,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10638,14 +10924,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10689,31 +10969,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10722,6 +11007,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10737,57 +11025,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10805,6 +11095,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10834,6 +11132,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10864,7 +11205,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10904,28 +11245,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11020,6 +11359,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11035,12 +11377,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11119,7 +11469,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11218,35 +11568,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11256,8 +11582,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11284,10 +11610,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11298,9 +11621,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11322,6 +11642,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11371,8 +11694,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11515,6 +11838,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11533,6 +11859,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11557,16 +11892,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11578,6 +11916,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11592,6 +11938,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11622,19 +11977,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11656,11 +12011,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11730,13 +12097,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11879,10 +12246,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11897,22 +12264,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11981,8 +12347,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11997,9 +12362,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12321,17 +12701,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12342,9 +12716,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12376,9 +12793,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12701,6 +13132,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12780,6 +13216,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12881,9 +13321,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12939,6 +13376,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12963,9 +13403,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12991,9 +13428,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13030,6 +13464,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13076,9 +13515,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13163,6 +13599,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13253,6 +13692,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13271,10 +13754,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13286,6 +13769,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13313,18 +13799,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13334,9 +13814,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13346,13 +13823,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13400,6 +13877,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13484,6 +13964,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13588,21 +14071,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13618,10 +14110,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13657,7 +14149,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13726,12 +14218,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13747,15 +14245,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13777,6 +14266,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13786,6 +14284,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13795,10 +14296,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13831,9 +14329,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13867,19 +14362,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13891,6 +14410,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13912,52 +14434,96 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
msgstr ""
msgid "Edit Lift Gate"
@@ -13981,12 +14547,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14044,6 +14625,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14053,6 +14637,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14092,9 +14682,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14128,6 +14715,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14209,18 +14811,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14293,7 +14900,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14317,10 +14927,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14332,9 +14945,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14377,18 +14987,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14488,11 +15136,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14504,11 +15150,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14527,10 +15171,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14560,9 +15204,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14578,19 +15219,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14740,6 +15397,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14761,6 +15421,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14788,6 +15454,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14812,22 +15484,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14849,9 +15505,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14915,7 +15568,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15046,6 +15699,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15076,6 +15732,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15088,9 +15747,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15100,9 +15756,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15115,6 +15776,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15139,14 +15803,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15195,7 +15851,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15249,41 +15905,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15469,6 +16125,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15490,9 +16152,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15505,6 +16173,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15544,6 +16215,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15565,22 +16239,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15604,9 +16290,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15631,7 +16314,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15704,52 +16396,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15764,6 +16450,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15776,6 +16468,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15791,37 +16486,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15911,6 +16709,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15920,6 +16724,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15986,12 +16796,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16001,6 +16865,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16010,31 +16898,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16062,7 +16956,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16089,27 +16983,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16144,12 +17026,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16159,10 +17044,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16190,6 +17075,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16227,117 +17115,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16371,33 +17295,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16431,6 +17365,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16443,7 +17393,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16506,36 +17481,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16578,19 +17571,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16729,6 +17718,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16741,60 +17742,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16810,9 +17885,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17022,41 +18094,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17065,7 +18163,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17077,12 +18175,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17134,88 +18322,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17227,6 +18518,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17242,6 +18548,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17260,11 +18569,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17373,10 +18680,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17388,7 +18695,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17409,13 +18716,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17487,7 +18800,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17508,13 +18821,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17523,7 +18836,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17551,6 +18863,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17587,40 +18905,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17632,19 +18971,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17665,6 +19004,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17674,7 +19019,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17755,6 +19100,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17884,6 +19232,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17923,24 +19277,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17950,15 +19313,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18034,6 +19388,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18088,7 +19448,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18100,6 +19460,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18175,46 +19538,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18235,6 +19601,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18397,27 +19775,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18463,19 +19870,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18499,7 +19909,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18595,18 +20005,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18616,7 +20035,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18625,10 +20047,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18646,6 +20068,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18661,28 +20086,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18703,19 +20128,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18781,9 +20206,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18793,10 +20215,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18811,9 +20236,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18841,6 +20263,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18886,10 +20311,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18901,7 +20356,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18919,7 +20374,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19036,19 +20491,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19067,13 +20633,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19082,19 +20684,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19109,142 +20720,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19283,148 +20943,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19628,6 +21351,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19649,13 +21384,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19918,9 +21647,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19942,6 +21677,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20020,9 +21758,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20107,7 +21857,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20378,15 +22128,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20557,6 +22298,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20575,12 +22319,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20716,6 +22454,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20733,6 +22474,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20813,113 +22557,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20945,7 +22703,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20995,7 +22756,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21040,6 +22801,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21097,19 +22861,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21151,27 +22980,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21567,6 +23378,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21814,12 +23628,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21829,16 +23637,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22201,9 +24006,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22258,9 +24060,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22302,25 +24121,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22457,9 +24276,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22484,12 +24300,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22638,6 +24463,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22654,6 +24482,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22887,13 +24726,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22946,18 +24778,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23015,6 +24835,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23222,9 +25045,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23304,7 +25124,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23458,6 +25296,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23479,6 +25320,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23772,9 +25616,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23843,9 +25684,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23972,9 +25810,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23996,6 +25831,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24028,15 +25866,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24046,6 +25900,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24148,9 +26005,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24266,6 +26120,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24326,19 +26183,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24476,6 +26333,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24551,6 +26411,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24566,9 +26515,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24590,6 +26536,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24742,9 +26691,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25370,7 +27316,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25378,10 +27327,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25390,18 +27336,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25444,15 +27378,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25574,18 +27499,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25763,9 +27676,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25892,7 +27802,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25912,9 +27822,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26047,9 +27954,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 0992b8d..04b875b 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-09-14 03:43+0000\n"
"Last-Translator: វ័ណថារិទ្ធ <vantharith.oum at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:47+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:48+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "លក្ខខណ្ឌក្នុងការប្រើប្រា
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -154,18 +169,14 @@ msgid "About JOSM..."
msgstr "អំពី JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ព្រមាន៖ unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ព្រមាន៖ unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -207,6 +218,9 @@ msgstr "គ្មានស្រទាប់គោលដៅ"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -246,9 +260,6 @@ msgstr "ឧបករ ៖ {0}"
msgid "Please select at least four nodes."
msgstr "សូមជ្រើសរើសយ៉ាងហោចណាស់ ថ្នាំងចំនួន ៤"
-msgid "Information"
-msgstr "ពត៌មាន"
-
msgid "Align Nodes in Line"
msgstr "តម្រង់ថ្នាំងជាបន្ទាត់ខ្សែ"
@@ -273,6 +284,9 @@ msgstr "ជំលោះ"
msgid "download"
msgstr "ទាញយក"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -282,6 +296,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr "មិនមានអ្វីត្រូវបានជ្រើសរើសដើម្បីពង្រីកចូលទៅ។"
+msgid "Information"
+msgstr "ពត៌មាន"
+
msgid "Zoom to {0}"
msgstr "ពង្រីកចូលទៅ {0}"
@@ -338,9 +355,9 @@ msgstr ""
"តើអ្នកចង់បញ្ច្រាស់ផ្លូវខ្លះៗដែរឬទេ?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "មិនអាចរូមបញ្ចូលផ្លូវ (ផ្លូវមិនអាចរូមបញ្ចូលនៅក្នុងខ្សែតែមួយនៃ node)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "រូមបញ្ចូល {0} ផ្លូវ"
@@ -395,6 +412,12 @@ msgstr "លុបចោល"
msgid "Delete selected objects."
msgstr "លុបចោលវត្ថុដែលបានជ្រើសរើស"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "ចែកចាយថ្នាំង"
@@ -402,12 +425,23 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"ចែកចាយថ្នាំងដែលជ្រើសរើសអោយមានចំងាយស្មើគ្នាតាមបណ្តាយបន្ទាត់ខ្សែ។"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "ទាញយកពី OSM..."
msgid "Download map data from the OSM server."
msgstr "ទាញយកទិន្នន័យផែនទីពីម៉ាស៊ីនបម្រើ OSM ។"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -502,6 +536,9 @@ msgstr "ប្រវត្តិ"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -615,7 +652,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -765,8 +802,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -923,8 +960,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -951,12 +988,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -974,9 +1007,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1083,6 +1113,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1133,9 +1172,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1197,6 +1233,9 @@ msgstr "របាយការណ៍ស្ថានភាព"
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "បិទ"
@@ -1271,13 +1310,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1366,6 +1405,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "មិនធ្វើវិញ"
@@ -1390,9 +1450,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1588,6 +1645,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1597,6 +1657,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1616,6 +1688,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1666,25 +1763,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1827,6 +1905,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1851,8 +1932,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1868,6 +1949,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2274,6 +2358,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2434,13 +2521,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2449,6 +2536,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2467,8 +2557,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2554,6 +2643,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2590,10 +2682,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2615,8 +2707,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2720,6 +2812,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2780,8 +2875,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2811,11 +2906,11 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
-msgstr "លក្ខណៈសម្បត្តិនៃ "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr ""
@@ -2835,6 +2930,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2865,18 +2963,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2885,8 +2983,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2894,13 +2992,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2914,8 +3010,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2945,11 +3041,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "មិនស្គាល់"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3100,8 +3195,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3208,7 +3302,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3227,6 +3321,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3243,9 +3340,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3284,6 +3378,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3308,6 +3405,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3367,13 +3473,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3443,6 +3549,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3512,6 +3636,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3569,13 +3699,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3607,10 +3737,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3744,7 +3874,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3819,6 +3949,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3849,9 +3982,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3876,10 +4006,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3942,23 +4072,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4061,7 +4174,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4257,9 +4370,24 @@ msgstr "មើល"
msgid "Tools"
msgstr "ឧបករណ៍"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "ជម្រើស"
+
msgid "Presets"
msgstr "ការកំណត់ជាមុន"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4275,10 +4403,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "សំលេង"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4287,6 +4427,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4346,6 +4489,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4373,19 +4519,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4673,29 +4806,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
-msgid ""
+msgid "> before"
+msgstr ""
+
+msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4710,7 +4861,7 @@ msgstr ""
msgid "Up"
msgstr "ឡើងលើ"
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4762,14 +4913,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5019,14 +5162,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5547,6 +5690,9 @@ msgstr "បង្ហាញ/លាក់"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5630,6 +5776,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "ទំនាក់ទំនង"
@@ -5651,9 +5824,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr "ជម្រើស"
-
msgid "Open a selection list window."
msgstr ""
@@ -5678,32 +5848,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5723,8 +5893,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5750,9 +5919,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5897,9 +6063,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6184,8 +6347,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6250,34 +6413,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: foreground"
+msgstr ""
+
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6292,13 +6467,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "បន្ថែមស្លាក"
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6377,12 +6552,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6412,9 +6581,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6452,7 +6627,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6512,6 +6687,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6767,6 +6945,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "កំណត់ចំណាំ Bookmark"
@@ -6832,9 +7029,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6901,20 +7095,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6925,23 +7106,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7038,7 +7205,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7137,6 +7304,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7224,7 +7394,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7243,6 +7413,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7309,8 +7485,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7385,8 +7560,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7400,8 +7575,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7616,12 +7790,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7630,6 +7798,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7645,6 +7829,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7652,8 +7851,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7765,9 +7964,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7777,6 +7973,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7793,7 +7992,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7939,7 +8138,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7969,7 +8168,7 @@ msgstr "កំណែ {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8083,6 +8282,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8120,6 +8322,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8316,9 +8521,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8337,6 +8539,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8394,6 +8599,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8460,9 +8671,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8475,7 +8683,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8502,12 +8713,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8636,14 +8851,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8658,7 +8869,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8668,8 +8879,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8889,7 +9099,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8955,6 +9165,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9012,9 +9228,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9261,6 +9474,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9389,6 +9605,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9431,6 +9653,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9481,19 +9706,10 @@ msgstr "ស្វែងរក៖ "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9511,40 +9727,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9568,6 +9793,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9624,6 +9882,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9677,6 +9938,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9958,7 +10224,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10127,6 +10399,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10190,7 +10468,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10448,40 +10726,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10534,8 +10812,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10544,20 +10822,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10639,14 +10922,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10690,31 +10967,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10723,6 +11005,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10738,57 +11023,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10806,6 +11093,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10835,6 +11130,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10865,7 +11203,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10905,28 +11243,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11021,6 +11357,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11036,12 +11375,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11120,7 +11467,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11219,35 +11566,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11257,8 +11580,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11285,10 +11608,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11299,9 +11619,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11323,6 +11640,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11372,8 +11692,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11516,6 +11836,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11534,6 +11857,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11558,16 +11890,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11579,6 +11914,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11593,6 +11936,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11623,19 +11975,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11657,11 +12009,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11731,13 +12095,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11880,10 +12244,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11898,22 +12262,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11982,8 +12345,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11998,9 +12360,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12322,17 +12699,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12343,9 +12714,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12377,9 +12791,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12702,6 +13130,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12781,6 +13214,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12882,9 +13319,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12940,6 +13374,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12964,9 +13401,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12992,9 +13426,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13031,6 +13462,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13077,9 +13513,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13164,6 +13597,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13254,6 +13690,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "បាទ/ចាស"
+
+msgid "no"
+msgstr "ទេ"
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13272,10 +13752,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13287,6 +13767,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13314,18 +13797,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "បាទ/ចាស"
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13335,9 +13812,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13347,15 +13821,15 @@ msgstr ""
msgid "private"
msgstr ""
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ទេ"
-
msgid "official"
msgstr ""
@@ -13401,6 +13875,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13485,6 +13962,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13589,21 +14069,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13619,10 +14108,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13658,7 +14147,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13727,12 +14216,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13748,15 +14243,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13778,6 +14264,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13787,6 +14282,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13796,10 +14294,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13832,9 +14327,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13868,19 +14360,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13892,6 +14408,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13913,46 +14432,90 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
msgstr ""
msgid "Edit Gate"
@@ -13982,12 +14545,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14045,6 +14623,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14054,6 +14635,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14093,9 +14680,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14129,6 +14713,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14210,18 +14809,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14294,7 +14898,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14318,10 +14925,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14333,9 +14943,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14378,18 +14985,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14489,11 +15134,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14505,11 +15148,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14528,10 +15169,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14561,9 +15202,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14579,19 +15217,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14741,6 +15395,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14762,6 +15419,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14789,6 +15452,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14813,22 +15482,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14850,9 +15503,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14916,7 +15566,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15047,6 +15697,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15077,6 +15730,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15089,9 +15745,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15101,9 +15754,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15116,6 +15774,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15140,14 +15801,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15196,7 +15849,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15250,41 +15903,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15470,6 +16123,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15491,9 +16150,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15506,6 +16171,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15545,6 +16213,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15566,22 +16237,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15605,9 +16288,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15632,7 +16312,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15705,64 +16394,64 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
+msgid "Denomination"
msgstr ""
-msgid "zoroastrian"
+msgid "anglican"
msgstr ""
-msgid "Denomination"
+msgid "baptist"
msgstr ""
-msgid "anglican"
+msgid "catholic"
msgstr ""
-msgid "baptist"
+msgid "evangelical"
msgstr ""
-msgid "catholic"
+msgid "greek_catholic"
msgstr ""
-msgid "evangelical"
+msgid "greek_orthodox"
msgstr ""
msgid "jehovahs_witness"
@@ -15777,6 +16466,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15792,37 +16484,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15912,6 +16707,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15921,6 +16722,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15987,12 +16794,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16002,6 +16863,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16011,31 +16896,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16063,7 +16954,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16090,27 +16981,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16145,12 +17024,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16160,10 +17042,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16191,6 +17073,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16228,117 +17113,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16372,33 +17293,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "ប្រភេទ"
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16432,6 +17363,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16444,7 +17391,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16507,36 +17479,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16579,19 +17569,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16730,6 +17716,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16742,60 +17740,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
msgstr ""
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
-msgid "apartments"
+msgctxt "building"
+msgid "retail"
msgstr ""
-msgid "house"
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
+msgid "apartments"
+msgstr ""
+
+msgctxt "building"
+msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16811,9 +17883,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17023,41 +18092,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17066,7 +18161,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17078,12 +18173,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17135,88 +18320,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
msgstr ""
-msgid "battery charging"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Power Station"
+msgid "Boiling Water Reactor 3 (BWR-3)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17228,6 +18516,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17243,6 +18546,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17261,11 +18567,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17374,10 +18678,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17389,7 +18693,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17410,13 +18714,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17488,7 +18798,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17509,13 +18819,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17524,7 +18834,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17552,6 +18861,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17588,40 +18903,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
+msgstr ""
+
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17633,19 +18969,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17666,6 +19002,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17675,7 +19017,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17756,6 +19098,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17885,6 +19230,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17924,24 +19275,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17951,15 +19311,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18035,6 +19386,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18089,7 +19446,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18101,6 +19458,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18176,46 +19536,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18236,6 +19599,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18398,27 +19773,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18464,19 +19868,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18500,7 +19907,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18596,18 +20003,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18617,7 +20033,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18626,10 +20045,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18647,6 +20066,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18662,28 +20084,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18704,19 +20126,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18782,9 +20204,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18794,10 +20213,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18812,9 +20234,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18842,6 +20261,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18887,10 +20309,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18902,7 +20354,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18920,7 +20372,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19037,19 +20489,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "map_type without information=map"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19068,13 +20631,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19083,19 +20682,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19110,142 +20718,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19284,148 +20941,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19629,6 +21349,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19650,13 +21382,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19919,9 +21645,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19943,6 +21675,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20021,9 +21756,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20108,7 +21855,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20379,15 +22126,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20558,6 +22296,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20576,12 +22317,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20717,6 +22452,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20734,6 +22472,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20814,113 +22555,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20946,7 +22701,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20996,7 +22754,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21041,6 +22799,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21098,19 +22859,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21152,27 +22978,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21568,6 +23376,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21815,12 +23626,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21830,16 +23635,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22202,9 +24004,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22259,9 +24058,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22303,25 +24119,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22458,9 +24274,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22485,12 +24298,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22639,6 +24461,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22655,6 +24480,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22888,13 +24724,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22947,18 +24776,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23016,6 +24833,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23223,9 +25043,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23305,7 +25122,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23459,6 +25294,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23480,6 +25318,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23773,9 +25614,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23844,9 +25682,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23973,9 +25808,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23997,6 +25829,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24029,15 +25864,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24047,6 +25898,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24149,9 +26003,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24267,6 +26118,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24327,19 +26181,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24477,6 +26331,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24552,6 +26409,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24567,9 +26513,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24591,6 +26534,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24743,9 +26689,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25371,7 +27314,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25379,10 +27325,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25391,18 +27334,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25445,15 +27376,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25575,18 +27497,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25764,9 +27674,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25893,7 +27800,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25913,9 +27820,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26048,9 +27952,6 @@ msgstr "កំណត់ភាសាដើមសម្រាប់អត្ថប
msgid "Enter the Wikipedia language"
msgstr "វាយបញ្ជុលភាសាវិគីភីឌា"
-msgid "Add Tag"
-msgstr "បន្ថែមស្លាក"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index 81c7006..7c5936d 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-04-22 04:06+0000\n"
"Last-Translator: kladess <kladess at gmail.com>\n"
"Language-Team: Korean <ko at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:48+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "이용 약관 배경"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "현재 플랫폼(\"{0}\")에서 링크를 여는것을 지원하지 않습니다."
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -153,13 +168,13 @@ msgid "About JOSM..."
msgstr "정보"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -202,6 +217,9 @@ msgstr "대상 레이어가 없음"
msgid "Add imagery layer {0}"
msgstr "영상 레이어 {0} 추가"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -241,9 +259,6 @@ msgstr "도구: {0}"
msgid "Please select at least four nodes."
msgstr "최소한 4개의 Node를 선택하세요"
-msgid "Information"
-msgstr "정보"
-
msgid "Align Nodes in Line"
msgstr "Node를 선에 정렬"
@@ -268,6 +283,9 @@ msgstr "모순"
msgid "download"
msgstr "다운로드"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "이전"
@@ -277,6 +295,9 @@ msgstr "다음"
msgid "Nothing selected to zoom to."
msgstr "줌을 위한 선택이 없습니다."
+msgid "Information"
+msgstr "정보"
+
msgid "Zoom to {0}"
msgstr "{0}으로 줌"
@@ -331,9 +352,9 @@ msgid ""
msgstr "way는 현재 길방향으로 결합될 수 없습니다. way의 길방향을 뒤집겠습니까?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "way를 결합할 수 없습니다 (node 집합으로 합칠 수 없습니다)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "{0} Way를 결합"
@@ -388,18 +409,35 @@ msgstr "삭제"
msgid "Delete selected objects."
msgstr "선택된 객체를 삭제합니다"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Node 분산 배치"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "선택된 Node를 일직선상의 동일 거리에 분산 배치합니다"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSM에서 다운로드..."
msgid "Download map data from the OSM server."
msgstr "OSM 서버로 부터 지도 정보 다운로드."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "오브젝트 다운로드..."
@@ -490,6 +528,9 @@ msgstr "이력"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "OSM 도로, 노드, 또는 릴레이션에 대한 이력 정보 표시"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "이력(웹)"
@@ -602,7 +643,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -752,8 +793,8 @@ msgid "Merge nodes into the oldest one."
msgstr "예전 것에 Node를 합병"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -910,8 +951,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -938,12 +979,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -961,9 +998,6 @@ msgstr "직각화"
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1069,6 +1103,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr "''{0}'' 파일 이름을 바꿀 수 없습니다"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1119,9 +1162,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1183,6 +1223,9 @@ msgstr "상태 리포트"
msgid "Copy to clipboard and close"
msgstr "클립보드로 복사하고 닫기"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "닫기"
@@ -1255,13 +1298,13 @@ msgid ""
msgstr "선택된 node에서 way를 나눌 수 없습니다 (힌트: way의 중간에 있는 node를 선택하세요)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1350,6 +1393,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "실행 취소"
@@ -1374,9 +1438,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1572,6 +1633,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "GPS 정보 다운로드"
@@ -1581,6 +1645,18 @@ msgstr "다운로드된 GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "다운로드 데이터"
@@ -1600,6 +1676,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "다운로드 {0}/{1} ({2} 남음)"
@@ -1650,25 +1751,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1810,6 +1892,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1834,8 +1919,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1851,6 +1936,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2257,6 +2345,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2419,13 +2510,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2434,6 +2525,9 @@ msgstr "tag 연산자가 사용될 때 key는 비워둘 수 없습니다. 예: k
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr "알려지지 않은 요소 타잎: {0}. node, way, relation만 사용할 수 있음."
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2452,8 +2546,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2539,6 +2632,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "node {0} 변경"
@@ -2575,10 +2671,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2600,8 +2696,8 @@ msgid "Double conflict"
msgstr "이중 충돌"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2700,6 +2796,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr "relation {0}의 맴버 리스트에서 충돌 해결"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "{0} node를 회전"
@@ -2759,8 +2858,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2790,11 +2889,11 @@ msgstr "선택된 변경 적용"
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
-msgstr "속성: "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr ""
@@ -2814,6 +2913,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2844,18 +2946,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2864,8 +2966,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2873,13 +2975,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2893,8 +2993,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2924,11 +3024,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "알 수 없음"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3079,8 +3178,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3187,7 +3285,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3206,6 +3304,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3222,9 +3323,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3263,6 +3361,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3287,6 +3388,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3346,13 +3456,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3422,6 +3532,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3491,6 +3619,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3548,13 +3682,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3586,10 +3720,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3723,7 +3857,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3798,6 +3932,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3828,9 +3965,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3855,10 +3989,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3921,23 +4055,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4041,7 +4158,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4237,9 +4354,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "선택"
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4255,10 +4387,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4267,6 +4411,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4326,6 +4473,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4353,19 +4503,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4653,29 +4790,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
-msgid ""
+msgid "> before"
+msgstr ""
+
+msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4690,7 +4845,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4742,14 +4897,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -4999,14 +5146,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5527,6 +5674,9 @@ msgstr "보이기/숨기기"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5610,6 +5760,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "오브젝트 형식:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "혼합"
+
+msgid "Choose the OSM object type"
+msgstr "OSM 오브젝트 형식을 선택하세요."
+
+msgid "Object ID:"
+msgstr "오브젝트 ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "다운로드 해야 할 오브젝트 ID를 입력하세요"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5631,9 +5808,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr "선택"
-
msgid "Open a selection list window."
msgstr ""
@@ -5658,32 +5832,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5703,8 +5877,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5730,9 +5903,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5877,9 +6047,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6164,8 +6331,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6230,34 +6397,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: foreground"
+msgstr ""
+
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr "<차이점>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr "모든 대상에서 선택된 key 지우기"
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6272,13 +6451,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "태그 추가"
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6357,12 +6536,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6392,9 +6565,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6432,7 +6611,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6492,6 +6671,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6747,6 +6929,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "책갈피"
@@ -6812,9 +7013,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6881,21 +7079,8 @@ msgstr "다운로드 참조자 (부모 관계)"
msgid "Download object"
msgstr "오브젝트 다운로드"
-msgid "Object type:"
-msgstr "오브젝트 형식:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "혼합"
-
-msgid "Choose the OSM object type"
-msgstr "OSM 오브젝트 형식을 선택하세요."
-
-msgid "Object ID:"
-msgstr "오브젝트 ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "다운로드 해야 할 오브젝트 ID를 입력하세요"
+msgid "Start downloading"
+msgstr "다운로드 시작"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6905,23 +7090,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "다운로드 시작"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7018,7 +7189,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7117,6 +7288,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7212,7 +7386,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7231,6 +7405,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7297,8 +7477,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7373,8 +7552,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7388,8 +7567,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7604,12 +7782,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7618,6 +7790,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7633,6 +7821,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7640,8 +7843,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7753,9 +7956,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7765,6 +7965,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7781,7 +7984,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7927,7 +8130,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7957,7 +8160,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8071,6 +8274,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8108,6 +8314,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8304,9 +8513,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8325,6 +8531,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8382,6 +8591,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8448,9 +8663,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8463,7 +8675,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8490,12 +8705,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8624,14 +8843,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8646,7 +8861,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8656,8 +8871,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8877,7 +9091,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8943,6 +9157,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9000,9 +9220,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9249,6 +9466,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9377,6 +9597,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9419,6 +9645,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9469,19 +9698,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9499,40 +9719,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9556,6 +9785,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9612,6 +9874,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9665,6 +9930,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9946,7 +10216,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10115,6 +10391,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10178,7 +10460,7 @@ msgstr "지도 설정"
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10436,40 +10718,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10522,8 +10804,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10532,20 +10814,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10627,14 +10914,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10678,31 +10959,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10711,6 +10997,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10726,57 +11015,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10794,6 +11085,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10823,6 +11122,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10853,7 +11195,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10893,28 +11235,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11009,6 +11349,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11024,12 +11367,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11108,7 +11459,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11207,35 +11558,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11245,8 +11572,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11273,13 +11600,10 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
-msgid "(at line {0}, column {1})"
-msgstr ""
-
-msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
msgid ""
@@ -11287,9 +11611,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11311,6 +11632,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11360,8 +11684,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11504,6 +11828,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11522,6 +11849,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11546,16 +11882,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11567,6 +11906,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11581,6 +11928,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11611,19 +11967,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11645,11 +12001,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11719,13 +12087,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11868,10 +12236,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11886,22 +12254,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11970,8 +12337,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11986,9 +12352,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12310,17 +12691,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12331,9 +12706,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12365,9 +12783,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12690,6 +13122,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12769,6 +13206,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12870,9 +13311,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12928,6 +13366,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12952,9 +13393,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12980,9 +13418,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13019,6 +13454,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13065,9 +13505,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13152,6 +13589,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13242,6 +13682,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13260,10 +13744,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13275,6 +13759,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13302,18 +13789,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13323,9 +13804,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13335,13 +13813,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13389,6 +13867,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13473,6 +13954,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13577,21 +14061,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13607,10 +14100,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13646,7 +14139,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13715,12 +14208,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13736,15 +14235,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13766,6 +14256,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13775,6 +14274,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13784,10 +14286,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13820,9 +14319,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13856,19 +14352,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13880,6 +14400,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13901,43 +14424,87 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -13970,12 +14537,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14033,6 +14615,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14042,6 +14627,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14081,9 +14672,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14117,6 +14705,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14198,18 +14801,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14282,7 +14890,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14306,10 +14917,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14321,9 +14935,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14366,18 +14977,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14477,11 +15126,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14493,11 +15140,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14516,10 +15161,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14549,9 +15194,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14567,19 +15209,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14729,6 +15387,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14750,6 +15411,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14777,6 +15444,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14801,22 +15474,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14838,9 +15495,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14904,7 +15558,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15035,6 +15689,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15065,6 +15722,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15077,9 +15737,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15089,9 +15746,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15104,6 +15766,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15128,14 +15793,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15184,7 +15841,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15238,41 +15895,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15458,6 +16115,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15479,9 +16142,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15494,6 +16163,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15533,6 +16205,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15554,22 +16229,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15593,9 +16280,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15620,7 +16304,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15693,52 +16386,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15753,6 +16440,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15765,6 +16458,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15780,37 +16476,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15900,6 +16699,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15909,6 +16714,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15975,12 +16786,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15990,6 +16855,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -15999,31 +16888,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16051,7 +16946,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16078,27 +16973,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16133,12 +17016,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16148,10 +17034,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16179,6 +17065,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16216,117 +17105,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16360,33 +17285,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16420,6 +17355,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16432,7 +17383,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16495,36 +17471,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16567,19 +17561,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16718,6 +17708,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16730,60 +17732,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16799,9 +17875,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17011,41 +18084,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17054,7 +18153,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17066,12 +18165,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17123,88 +18312,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17216,6 +18508,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17231,6 +18538,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17249,11 +18559,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17362,10 +18670,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17377,7 +18685,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17398,13 +18706,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17476,7 +18790,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17497,13 +18811,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17512,7 +18826,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17540,6 +18853,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17576,40 +18895,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17621,19 +18961,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17654,6 +18994,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17663,7 +19009,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17744,6 +19090,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17873,6 +19222,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17912,24 +19267,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17939,15 +19303,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18023,6 +19378,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18077,7 +19438,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18089,6 +19450,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18164,46 +19528,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18224,6 +19591,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18386,27 +19765,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18452,19 +19860,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18488,7 +19899,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18584,18 +19995,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18605,7 +20025,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18614,10 +20037,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18635,6 +20058,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18650,28 +20076,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18692,19 +20118,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18770,9 +20196,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18782,10 +20205,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18800,9 +20226,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18830,6 +20253,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18875,10 +20301,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18890,7 +20346,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18908,7 +20364,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19025,19 +20481,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19056,13 +20623,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19071,19 +20674,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19098,142 +20710,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19272,148 +20933,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19617,6 +21341,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19638,13 +21374,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19907,9 +21637,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19931,6 +21667,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20009,9 +21748,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20096,7 +21847,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20367,15 +22118,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20546,6 +22288,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20564,12 +22309,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20705,6 +22444,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20722,6 +22464,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20802,113 +22547,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20934,7 +22693,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20984,7 +22746,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21029,6 +22791,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21086,19 +22851,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21140,27 +22970,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21556,6 +23368,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21803,12 +23618,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21818,16 +23627,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22190,9 +23996,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22247,9 +24050,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22291,25 +24111,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22446,9 +24266,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22473,12 +24290,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22627,6 +24453,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22643,6 +24472,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22876,13 +24716,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22935,18 +24768,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23004,6 +24825,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23211,9 +25035,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23293,7 +25114,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23447,6 +25286,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23468,6 +25310,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23761,9 +25606,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23832,9 +25674,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23961,9 +25800,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23985,6 +25821,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24017,15 +25856,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24035,6 +25890,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24137,9 +25995,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24255,6 +26110,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24315,19 +26173,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24465,6 +26323,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24540,6 +26401,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24555,9 +26505,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24579,6 +26526,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24731,9 +26681,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25359,7 +27306,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25367,10 +27317,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25379,18 +27326,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25433,15 +27368,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25562,18 +27488,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25751,9 +27665,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25880,7 +27791,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25900,9 +27811,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26035,9 +27943,6 @@ msgstr "위키백과 문서를 위한 기본 언어 설정"
msgid "Enter the Wikipedia language"
msgstr "위키백과 언어 입력"
-msgid "Add Tag"
-msgstr "태그 추가"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 6dee922..67da2f5 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
-"Last-Translator: Chynggyz Jumaliev <translatorky at lavabit.com>\n"
+"Last-Translator: ballpen <Unknown>\n"
"Language-Team: Kirghiz <ky 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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 04:48+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:48+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -49,6 +49,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -149,13 +164,13 @@ msgid "About JOSM..."
msgstr "JOSM жөнүндө..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -198,6 +213,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -237,9 +255,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -264,6 +279,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -273,6 +291,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -327,7 +348,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -384,18 +405,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -490,6 +528,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -603,7 +644,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -753,8 +794,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -911,8 +952,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -939,12 +980,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -962,9 +999,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1071,6 +1105,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1121,9 +1164,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1185,6 +1225,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1259,13 +1302,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1354,6 +1397,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1378,9 +1442,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1576,6 +1637,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1585,6 +1649,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1604,6 +1680,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1654,25 +1755,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1815,6 +1897,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1839,8 +1924,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1856,6 +1941,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2262,6 +2350,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2422,13 +2513,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2437,6 +2528,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2455,8 +2549,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2542,6 +2635,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2578,10 +2674,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2604,8 +2700,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2709,6 +2805,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2769,8 +2868,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2800,10 +2899,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2824,6 +2923,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2854,18 +2956,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2874,8 +2976,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2883,13 +2985,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2903,8 +3003,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2934,11 +3034,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3091,8 +3190,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3199,7 +3297,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3218,6 +3316,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3234,9 +3335,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3275,6 +3373,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3299,6 +3400,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3358,13 +3468,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3434,6 +3544,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3503,6 +3631,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3560,13 +3694,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3598,10 +3732,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3735,7 +3869,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3810,6 +3944,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3840,9 +3977,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3867,10 +4001,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3933,23 +4067,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4053,7 +4170,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4249,9 +4366,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4267,10 +4399,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4279,6 +4423,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4338,6 +4485,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4365,19 +4515,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4665,29 +4802,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4702,7 +4857,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4754,14 +4909,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5011,14 +5158,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5539,6 +5686,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5622,6 +5772,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5643,9 +5820,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5670,32 +5844,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5715,8 +5889,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5742,9 +5915,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5889,9 +6059,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6176,8 +6343,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6242,34 +6409,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6284,13 +6463,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6369,12 +6548,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6404,9 +6577,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6444,7 +6623,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6504,6 +6683,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6759,6 +6941,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6824,9 +7025,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6893,20 +7091,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6917,23 +7102,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7030,7 +7201,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7129,6 +7300,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7216,7 +7390,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7235,6 +7409,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7301,8 +7481,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7377,8 +7556,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7392,8 +7571,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7608,12 +7786,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7622,6 +7794,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7637,6 +7825,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7644,8 +7847,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7757,9 +7960,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7769,6 +7969,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7785,7 +7988,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7931,7 +8134,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7961,7 +8164,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8075,6 +8278,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8112,6 +8318,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8308,9 +8517,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8329,6 +8535,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8386,6 +8595,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8452,9 +8667,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8467,7 +8679,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8494,12 +8709,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8628,14 +8847,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8650,7 +8865,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8660,8 +8875,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8881,7 +9095,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8947,6 +9161,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9004,9 +9224,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9253,6 +9470,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9381,6 +9601,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9423,6 +9649,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9473,19 +9702,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9503,40 +9723,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9560,6 +9789,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9616,6 +9878,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9669,6 +9934,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9950,7 +10220,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10119,6 +10395,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10182,7 +10464,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10440,40 +10722,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10526,8 +10808,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10536,20 +10818,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10631,14 +10918,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10682,31 +10963,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10715,6 +11001,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10730,57 +11019,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10798,6 +11089,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10827,6 +11126,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10857,7 +11199,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10897,28 +11239,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11013,6 +11353,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11028,12 +11371,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11112,7 +11463,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11211,35 +11562,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11249,8 +11576,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11277,10 +11604,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11291,9 +11615,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11315,6 +11636,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11364,8 +11688,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11508,6 +11832,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11526,6 +11853,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11550,16 +11886,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11571,6 +11910,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11585,6 +11932,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11615,19 +11971,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11649,11 +12005,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11723,13 +12091,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11872,10 +12240,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11890,22 +12258,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11974,8 +12341,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11990,9 +12356,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12314,17 +12695,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12335,9 +12710,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12369,9 +12787,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12694,6 +13126,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12773,6 +13210,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12874,9 +13315,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12932,6 +13370,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12956,9 +13397,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12984,9 +13422,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13023,6 +13458,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13069,9 +13509,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13156,6 +13593,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13246,6 +13686,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13264,10 +13748,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13279,6 +13763,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13306,18 +13793,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13327,9 +13808,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13339,13 +13817,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13393,6 +13871,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13477,6 +13958,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13581,21 +14065,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13611,10 +14104,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13650,7 +14143,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13719,12 +14212,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13740,15 +14239,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13770,6 +14260,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13779,6 +14278,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13788,10 +14290,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13824,9 +14323,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13860,19 +14356,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13884,6 +14404,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13905,55 +14428,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13974,12 +14541,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14037,6 +14619,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14046,6 +14631,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14085,9 +14676,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14121,6 +14709,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14202,18 +14805,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14286,7 +14894,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14310,10 +14921,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14325,9 +14939,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14370,18 +14981,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14481,11 +15130,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14497,11 +15144,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14520,10 +15165,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14553,9 +15198,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14571,19 +15213,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14733,6 +15391,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14754,6 +15415,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14781,6 +15448,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14805,22 +15478,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14842,9 +15499,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14908,7 +15562,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15039,6 +15693,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15069,6 +15726,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15081,9 +15741,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15093,9 +15750,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15108,6 +15770,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15132,14 +15797,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15188,7 +15845,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15242,41 +15899,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15462,6 +16119,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15483,9 +16146,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15498,6 +16167,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15537,6 +16209,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15558,22 +16233,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15597,9 +16284,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15624,7 +16308,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15697,52 +16390,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15757,6 +16444,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15769,6 +16462,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15784,37 +16480,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15904,6 +16703,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15913,6 +16718,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15979,12 +16790,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15994,6 +16859,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16003,31 +16892,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16055,7 +16950,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16082,27 +16977,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16137,12 +17020,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16152,10 +17038,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16183,6 +17069,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16220,117 +17109,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16364,33 +17289,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16424,6 +17359,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16436,7 +17387,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16499,36 +17475,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16571,19 +17565,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16722,6 +17712,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16734,60 +17736,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16803,9 +17879,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17015,41 +18088,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17058,7 +18157,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17070,12 +18169,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17127,88 +18316,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17220,6 +18512,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17235,6 +18542,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17253,11 +18563,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17366,10 +18674,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17381,7 +18689,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17402,13 +18710,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17480,7 +18794,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17501,13 +18815,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17516,7 +18830,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17544,6 +18857,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17580,40 +18899,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17625,19 +18965,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17658,6 +18998,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17667,7 +19013,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17748,6 +19094,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17877,6 +19226,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17916,24 +19271,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17943,15 +19307,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18027,6 +19382,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18081,7 +19442,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18093,6 +19454,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18168,46 +19532,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18228,6 +19595,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18390,27 +19769,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18456,19 +19864,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18492,7 +19903,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18588,18 +19999,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18609,7 +20029,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18618,10 +20041,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18639,6 +20062,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18654,28 +20080,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18696,19 +20122,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18774,9 +20200,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18786,10 +20209,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18804,9 +20230,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18834,6 +20257,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18879,10 +20305,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18894,7 +20350,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18912,7 +20368,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19029,19 +20485,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19060,13 +20627,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19075,19 +20678,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19102,142 +20714,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19276,148 +20937,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19621,6 +21345,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19642,13 +21378,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19911,9 +21641,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19935,6 +21671,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20013,9 +21752,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20100,7 +21851,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20371,15 +22122,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20550,6 +22292,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20568,12 +22313,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20709,6 +22448,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20726,6 +22468,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20806,113 +22551,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20938,7 +22697,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20988,7 +22750,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21033,6 +22795,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21090,19 +22855,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21144,27 +22974,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21560,6 +23372,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21807,12 +23622,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21822,16 +23631,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22194,9 +24000,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22251,9 +24054,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22295,25 +24115,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22450,9 +24270,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22477,12 +24294,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22631,6 +24457,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22647,6 +24476,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22880,13 +24720,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22939,18 +24772,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23008,6 +24829,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23215,9 +25039,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23297,7 +25118,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23451,6 +25290,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23472,6 +25314,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23765,9 +25610,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23836,9 +25678,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23965,9 +25804,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23989,6 +25825,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24021,15 +25860,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24039,6 +25894,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24141,9 +25999,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24259,6 +26114,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24319,19 +26177,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24469,6 +26327,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24544,6 +26405,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24559,9 +26509,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24583,6 +26530,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24735,9 +26685,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25363,7 +27310,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25371,10 +27321,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25383,18 +27330,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25437,15 +27372,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25567,18 +27493,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25756,9 +27670,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25885,7 +27796,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25905,9 +27816,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26040,9 +27948,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index fb7204e..6f49d6e 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:49+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:49+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,16 +165,14 @@ msgid "About JOSM..."
msgstr "ກ່ຽວກັບ JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ຄຳເຕືອນ: ຮູບແບບບໍ່ຖືກຕ້ອງຂອງ API ຕາມ URL. ການຫັນທິດໄປທິ່ໜ້າຂອງຜູ້ໃຊ້ເອງ "
-"ສຳລັບ OSM ຜູ້ໃຊ້ ອາດຈະບໍ່ປະຕິບັດໄດ້.API ຕາມ URL ແມ່ນ: \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -201,6 +214,9 @@ msgstr "ບໍ່ມີບັນດາຊັ້ນເປົ້າໝາຍ"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -240,9 +256,6 @@ msgstr "ອຸປະກອນ:{0}"
msgid "Please select at least four nodes."
msgstr "ກະລຸນາເລືອກ4ຂໍ້ເປັນຢ່າງຕ່ຳ"
-msgid "Information"
-msgstr "ຂໍ້ມູນ"
-
msgid "Align Nodes in Line"
msgstr "ຈັດແຖວເປັນເສັ້ນ"
@@ -267,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -276,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "ຂໍ້ມູນ"
+
msgid "Zoom to {0}"
msgstr ""
@@ -330,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -387,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -493,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -606,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -756,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -914,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -942,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -965,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1074,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1124,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1188,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1262,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1357,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1381,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1579,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1588,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1607,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1657,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1818,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1842,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1859,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2265,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2425,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2440,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2458,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2545,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2581,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2607,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2712,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2772,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2803,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2827,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2857,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2877,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2886,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2906,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2937,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "ທີ່ບໍ່ມີການບັນທຶກ"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3094,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3202,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3221,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3237,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3278,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3302,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3361,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3437,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3506,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3563,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3601,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3738,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3813,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3843,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3870,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3936,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4056,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4252,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4270,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4282,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4341,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4368,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4668,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4705,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4757,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5014,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5542,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5625,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5646,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5673,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5718,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5745,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5892,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6179,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6245,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6287,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6372,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6407,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6447,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6507,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6762,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6827,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6896,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6920,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7033,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7132,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7219,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7238,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7304,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7380,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7395,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7611,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7625,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7640,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7647,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7760,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7772,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7788,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7934,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7964,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8078,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8115,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8311,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8332,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8389,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8455,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8470,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8497,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8631,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8653,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8663,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8884,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8950,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9007,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9256,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9384,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9426,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9476,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9506,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9563,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9619,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9672,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9953,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10122,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10185,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10443,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10529,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10539,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10634,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10685,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10718,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10733,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10801,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10830,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10860,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10900,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11016,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11031,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11115,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11214,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11252,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11280,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11294,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11318,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11367,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11511,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11529,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11553,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11574,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11588,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11618,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11652,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11726,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11875,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11893,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11977,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11993,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12317,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12338,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12372,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12697,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12776,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12877,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12935,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12959,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12987,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13026,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13072,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13159,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13249,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13267,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13282,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13309,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13330,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13342,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13396,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13480,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13584,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13614,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13653,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13722,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13743,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13773,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13782,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13791,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13827,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13863,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13887,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13908,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13977,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14040,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14049,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14088,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14124,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14205,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14289,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14313,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14328,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14373,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14484,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14500,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14523,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14556,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14574,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14736,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14757,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14784,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14808,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14845,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14911,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15042,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15072,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15084,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15096,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15111,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15135,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15191,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15245,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15465,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15486,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15501,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15540,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15561,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15600,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15627,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15700,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15760,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15772,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15787,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15907,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15916,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15982,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15997,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16006,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16058,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16085,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16140,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16155,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16186,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16223,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16367,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16427,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16439,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16502,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16574,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16725,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16737,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16806,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17018,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17061,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17073,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17130,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17223,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17238,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17256,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17369,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17384,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17405,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17483,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17504,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17519,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17547,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17583,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17628,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17661,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17670,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17751,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17880,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17919,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17946,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18030,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18084,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18096,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18171,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18231,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18393,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18459,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18495,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18591,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18612,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18621,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18642,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18657,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18699,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18777,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18789,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18807,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18837,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18882,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18897,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18915,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19032,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19063,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19078,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19105,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19279,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19624,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19645,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19914,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19938,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20016,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20103,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20374,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20553,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20571,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20712,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20729,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20809,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20941,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20991,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21036,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21093,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21147,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21563,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21810,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21825,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22197,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22254,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22298,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22453,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22480,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22634,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22650,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22883,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22942,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23011,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23218,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23300,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23454,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23475,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23768,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23839,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23968,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23992,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24024,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24042,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24144,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24262,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24322,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24472,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24547,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24562,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24586,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24738,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25366,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25374,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25386,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25440,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25570,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25759,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25888,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25908,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26043,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index c19de8c..ca8ac02 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 13:13+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-05-18 06:41+0000\n"
"Last-Translator: Mantas Kriaučiūnas <mantas at akl.lt>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:50+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:50+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr "Fono naudojimo sąlygos"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Atveriama nuorada dabartinėje platformoje nepalaikoma (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Vykdomas platformos paleidimas"
@@ -154,13 +169,13 @@ msgid "About JOSM..."
msgstr "Apie JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -203,6 +218,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr "Pridėti vaizdo sluoksnį {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -243,9 +261,6 @@ msgstr "Įrankai: {0}"
msgid "Please select at least four nodes."
msgstr "Parinkite bent keturis taškus"
-msgid "Information"
-msgstr "Informacija"
-
msgid "Align Nodes in Line"
msgstr "Išdėstyti Taškus į Tiesę"
@@ -270,6 +285,9 @@ msgstr "prieštaravimas"
msgid "download"
msgstr "parsiųsti"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "ankstesnis"
@@ -279,6 +297,9 @@ msgstr "kitas"
msgid "Nothing selected to zoom to."
msgstr "Neparinkta ką priartinti."
+msgid "Information"
+msgstr "Informacija"
+
msgid "Zoom to {0}"
msgstr "Priartinti {0}"
@@ -335,9 +356,9 @@ msgstr ""
"kryptį pakeisti?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Negalima sujungti kelių (Kelių neįmanoma sulieti taškų į vieną eilę)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "Sujungti {0} kelius"
@@ -393,18 +414,35 @@ msgstr "Ištrinti"
msgid "Delete selected objects."
msgstr "Ištrinti parinktus objektus."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Paskirstyti Taškus"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Paskirstyti parinktus taškus vienodais atstumais tiesiojoje."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Atsisiųsti iš OSM..."
msgid "Download map data from the OSM server."
msgstr "Atsisiųsti žemėlapio duomenis iš OSM serverio."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Parsiųsti duomenis"
+
msgid "Download object..."
msgstr "Parsisti objektą..."
@@ -500,6 +538,9 @@ msgstr "Istorija"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Parodyti OSM kelių, taškų arba ryšių detalę istoriją."
+msgid "Show history"
+msgstr "Roditį istoriją"
+
msgid "History (web)"
msgstr "Istorija (Internete)"
@@ -613,7 +654,7 @@ msgid "Joined overlapping areas"
msgstr "Sujungti persidengiančias sritis"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -763,8 +804,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Sulieti taškus į seniausią tašką."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -922,8 +963,8 @@ msgid "Download Data"
msgstr "Parsiųstį Duomenis"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -950,12 +991,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -973,9 +1010,6 @@ msgstr ""
msgid "Usage"
msgstr "Panaudojimas"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1082,6 +1116,15 @@ msgstr "Failą taip pat pervadinti"
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr "Paleisti iš naujo"
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1134,9 +1177,6 @@ msgstr "Įkelti Sesiją"
msgid "Load a session from file."
msgstr "Įkelti sesiją iš failo."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Sesijos failas (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Atverti sesiją"
@@ -1174,7 +1214,7 @@ msgid "Save Session"
msgstr "Išsaugoti Sesiją"
msgid "Save As"
-msgstr "Išsaugoti Kaip"
+msgstr "Įrašyti kaip"
msgid "Layers"
msgstr "Sluoksniai"
@@ -1200,6 +1240,9 @@ msgstr "Būsenos suvestinė"
msgid "Copy to clipboard and close"
msgstr "Kopijuoti į iškarpinę ir uždaryti"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Užverti"
@@ -1286,13 +1329,13 @@ msgstr ""
"taškus kelio vidurį.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1389,6 +1432,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Atšaukti"
@@ -1413,9 +1477,6 @@ msgstr "Atnaujinti duomenis"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr "Parsiųsti duomenis"
-
msgid "Update modified"
msgstr ""
@@ -1611,6 +1672,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Atsiunčiami GPS duomenys"
@@ -1620,6 +1684,18 @@ msgstr "Atsiuntė GPX duomenis"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Atsiunčiami duomenys"
@@ -1639,6 +1715,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Atsiunčiama {0} iš {1} ({2} liko)"
@@ -1689,25 +1790,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1851,6 +1933,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1875,8 +1960,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1892,6 +1977,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2299,6 +2387,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2459,13 +2550,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2474,6 +2565,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2492,8 +2586,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2579,6 +2672,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2615,10 +2711,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2641,8 +2737,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2746,6 +2842,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2806,8 +2905,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2837,10 +2936,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2861,6 +2960,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2891,18 +2993,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2911,8 +3013,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2920,13 +3022,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2940,8 +3040,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2971,11 +3071,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "NEŽINOMAS"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3131,8 +3230,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3239,7 +3337,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3258,6 +3356,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3274,9 +3375,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3315,6 +3413,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3339,6 +3440,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3398,13 +3508,13 @@ msgstr " arba "
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3474,6 +3584,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr "Keliai"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3543,6 +3671,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3600,15 +3734,15 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
+msgid "Role verification problem"
+msgstr ""
+
msgid "<empty>"
msgstr "<tuščias>"
msgid "Role {0} missing"
msgstr ""
-msgid "Role verification problem"
-msgstr ""
-
msgid "Number of {0} roles too low ({1})"
msgstr ""
@@ -3638,10 +3772,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3775,7 +3909,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3850,6 +3984,9 @@ msgstr "Atviri Keliai"
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr "Atviras kelias"
+
msgid "natural type {0}"
msgstr ""
@@ -3880,9 +4017,6 @@ msgstr "pastatas"
msgid "area"
msgstr "plotas"
-msgid "Unclosed way"
-msgstr "Atviras kelias"
-
msgid "Unconnected ways"
msgstr "Nesujungti keliai"
@@ -3907,12 +4041,12 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
-msgstr "Be žymių"
-
msgid "Unconnected nodes without physical tags"
msgstr ""
+msgid "No tags"
+msgstr "Be žymių"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr ""
@@ -3973,23 +4107,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4094,7 +4211,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4290,9 +4407,24 @@ msgstr "Rodyti"
msgid "Tools"
msgstr "Įrankiai"
+msgid "More tools"
+msgstr "Daugiau įrankių"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Parinktys"
+
msgid "Presets"
msgstr "Ruošiniai"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr "Langai"
@@ -4308,10 +4440,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4320,6 +4464,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4379,6 +4526,9 @@ msgstr ""
msgid "User:"
msgstr "Vartotojas:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4406,19 +4556,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4706,29 +4843,47 @@ msgstr "> apačia"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4743,7 +4898,7 @@ msgstr ""
msgid "Up"
msgstr "Aukštyn"
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4795,14 +4950,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Taškas"
@@ -5052,14 +5199,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5580,6 +5727,9 @@ msgstr "Rodyti/Paslėpti"
msgid "Information about layer"
msgstr "Sluoksnio informacija"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Žemėlapio atvaizdavimo stiliai"
@@ -5663,6 +5813,33 @@ msgstr ""
msgid "No"
msgstr "Ne"
+msgid "Object type:"
+msgstr "Objekto tipas:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "įvairus"
+
+msgid "Choose the OSM object type"
+msgstr "Pasirinkite OSM objekto tipą"
+
+msgid "Object ID:"
+msgstr "Objekto ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Įveskite objekto ID, kuris bus parsiųstas"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Ryšiai"
@@ -5684,9 +5861,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Ryšiai: {0}"
-msgid "Selection"
-msgstr "Parinktys"
-
msgid "Open a selection list window."
msgstr ""
@@ -5711,32 +5885,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5756,8 +5930,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5783,9 +5956,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr "Pataisyti"
@@ -5931,9 +6101,6 @@ msgstr "Atnaujinamas turinys"
msgid "Update the changeset content from the OSM server"
msgstr "Atnaujinti pakeitimo turinį iš OSM serverio"
-msgid "Show history"
-msgstr "Roditį istoriją"
-
msgid "Download and show the history of the selected objects"
msgstr "Parsiųsti ir parodyti parinktų objektų istoriją"
@@ -6218,8 +6385,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6284,34 +6451,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6326,13 +6505,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "Pridėti žymę"
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6411,12 +6590,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6446,9 +6619,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6486,7 +6665,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6546,6 +6725,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6801,6 +6983,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Žymekliai"
@@ -6866,9 +7067,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6935,21 +7133,8 @@ msgstr ""
msgid "Download object"
msgstr "Parsiūsti objektai"
-msgid "Object type:"
-msgstr "Objekto tipas:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "įvairus"
-
-msgid "Choose the OSM object type"
-msgstr "Pasirinkite OSM objekto tipą"
-
-msgid "Object ID:"
-msgstr "Objekto ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Įveskite objekto ID, kuris bus parsiųstas"
+msgid "Start downloading"
+msgstr "Pradėti parsiuntimą"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6959,23 +7144,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Pradėti parsiuntimą"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7072,7 +7243,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7171,6 +7342,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7258,7 +7432,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7277,6 +7451,12 @@ msgstr "Trumpas aprašymas jūsų išsiunčiamiems pakeitimams:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Pakeitimo id:"
@@ -7343,8 +7523,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7419,8 +7598,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7434,8 +7613,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7650,12 +7828,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7664,6 +7836,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7679,6 +7867,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7686,8 +7889,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7799,9 +8002,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7811,6 +8011,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7827,7 +8030,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7973,7 +8176,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8003,7 +8206,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8119,6 +8322,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8156,6 +8362,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8352,9 +8561,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8373,6 +8579,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8430,6 +8639,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8496,9 +8711,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8511,7 +8723,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8538,12 +8753,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8672,14 +8891,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8694,7 +8909,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8704,8 +8919,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8925,7 +9139,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8991,6 +9205,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9048,9 +9268,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr "Paleisti iš naujo"
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9297,6 +9514,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9425,6 +9645,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "Veiksmai"
@@ -9467,6 +9693,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9517,19 +9746,10 @@ msgstr "Ieškoti: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9547,40 +9767,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9604,6 +9833,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9660,6 +9922,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9713,6 +9978,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9994,7 +10264,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10163,6 +10439,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10226,7 +10508,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10484,21 +10766,6 @@ msgstr "Swiss Grid (Šveicarija)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr ""
-
-msgid "North"
-msgstr "Šiaurė"
-
-msgid "South"
-msgstr "Peitūs"
-
-msgid "Hemisphere"
-msgstr ""
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
@@ -10520,6 +10787,21 @@ msgstr "UTM Prancūzija (DOM)"
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr ""
+
+msgid "North"
+msgstr "Šiaurė"
+
+msgid "South"
+msgstr "Peitūs"
+
+msgid "Hemisphere"
+msgstr ""
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -10570,8 +10852,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10580,20 +10862,25 @@ msgstr "OSM vartotojo vardas:"
msgid "OSM password:"
msgstr "OSM slaptažodis"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10675,14 +10962,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10726,31 +11007,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10759,6 +11045,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10774,57 +11063,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
-msgstr ""
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10842,6 +11133,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10871,6 +11170,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10901,7 +11243,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10941,28 +11283,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11058,6 +11398,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11073,12 +11416,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11157,8 +11508,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Pavyko įkelti NMEA"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr ""
@@ -11256,55 +11607,31 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
+msgid "Unsupported version: {0}"
msgstr ""
-msgid "Unsupported version: {0}"
+msgid ""
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgid "Parsing changeset content ..."
msgstr ""
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
msgstr ""
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid "Parsing changeset content ..."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
msgstr ""
msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
@@ -11322,10 +11649,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11336,9 +11660,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11360,6 +11681,9 @@ msgstr ""
msgid "Open OSM file"
msgstr "Atverti OSM failą"
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11409,8 +11733,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11553,6 +11877,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11571,6 +11898,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11595,16 +11931,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11616,6 +11955,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11630,6 +11977,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11660,19 +12016,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11694,11 +12050,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Sesijos failas (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11768,13 +12136,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11917,10 +12285,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11935,22 +12303,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12019,8 +12386,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12035,9 +12401,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12359,17 +12740,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12380,9 +12755,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12414,9 +12832,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12739,6 +13171,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12818,6 +13255,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12919,9 +13360,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12977,6 +13415,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13001,9 +13442,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13029,9 +13467,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13068,6 +13503,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13114,9 +13554,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Keliai"
-
msgid "Streets"
msgstr "Gatvės"
@@ -13201,6 +13638,9 @@ msgstr "Pylimas"
msgid "Lit"
msgstr "Apšviesta"
+msgid "Toll"
+msgstr "Mokestis"
+
msgid "Motorway Link"
msgstr "Automagistralė/Greitkelio Rampa"
@@ -13291,6 +13731,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Greitkelio tipas"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "taip"
+
+msgid "no"
+msgstr "ne"
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13309,10 +13793,10 @@ msgstr "Sritis"
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13324,6 +13808,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13351,18 +13838,12 @@ msgstr "žiedas"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "taip"
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr "Mokestis"
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13372,9 +13853,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13384,15 +13862,15 @@ msgstr ""
msgid "private"
msgstr "privatus"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "ne"
-
msgid "official"
msgstr ""
@@ -13438,6 +13916,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Ribotas Mažiausias greitis (km/h)"
@@ -13522,6 +14003,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13626,20 +14110,29 @@ msgstr ""
msgid "Visibility"
msgstr "Matomumas"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "labai geras"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "geras"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "vidutidnis"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "blogas"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "labai blogas"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Vežimėlis"
@@ -13656,10 +14149,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13695,7 +14188,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13764,12 +14257,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr ""
+msgid "Drinking Water"
+msgstr "Geriamas Vanduo"
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13785,15 +14284,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13815,6 +14305,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13824,6 +14323,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13833,10 +14335,7 @@ msgstr "pagal laikrodžio rodyklę"
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13869,9 +14368,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13905,19 +14401,43 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr ""
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr ""
-msgid "Cycle Barrier"
-msgstr ""
+msgid "Material"
+msgstr "Medžiaga"
-msgid "Block"
+msgid "stone"
+msgstr "akmuo"
+
+msgid "Bollard"
+msgstr ""
+
+msgid "Edit Bollard"
+msgstr ""
+
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plastmasė"
+
+msgid "Cycle Barrier"
+msgstr ""
+
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13929,6 +14449,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13950,19 +14473,34 @@ msgstr ""
msgid "Hedge"
msgstr "Gyvatvorė"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Tvora"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13971,23 +14509,52 @@ msgstr "stulpas"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Siena"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Miesto Siena"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Griovys"
+msgstr ""
-msgid "Entrance"
-msgstr "Įėjimas"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Keisti Įėjimą"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Vartai"
@@ -14019,12 +14586,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14082,6 +14664,9 @@ msgstr "Drenažas"
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr "Griovys"
+
msgid "Edit Ditch"
msgstr ""
@@ -14091,6 +14676,12 @@ msgstr "Upelis"
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanalas"
@@ -14130,9 +14721,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14166,6 +14754,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Sausuma"
@@ -14247,18 +14850,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
-msgstr "keleiviai"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "automobiliai"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "dviračiai"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "sunkvežimiai"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14331,7 +14939,10 @@ msgstr "karinis"
msgid "tourism"
msgstr "turistinis"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14355,11 +14966,14 @@ msgstr ""
msgid "rail"
msgstr "bėgiai"
-msgid "Voltage"
-msgstr "Įtampa"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Dažnis (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14370,9 +14984,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14415,18 +15026,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
-msgstr ""
-
msgid "Abandoned Rail"
msgstr "Apleistas Geležinkelis"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Pervaža"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Perėja"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14526,11 +15175,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14542,11 +15189,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14565,10 +15210,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
-msgstr ""
+msgid "rooftop"
+msgstr "ant stogo"
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14598,9 +15243,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr "ant stogo"
-
msgid "Capacity"
msgstr "Vietų skaičius"
@@ -14616,20 +15258,36 @@ msgstr ""
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Darbo valandos"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Stovėjimo aikštelės įvažiavimas"
@@ -14778,6 +15436,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Įtampa"
+
msgid "Amperage"
msgstr "Srovė"
@@ -14799,6 +15460,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr "Dalys"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14826,6 +15493,12 @@ msgstr "Nuoma"
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14850,22 +15523,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "taip"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "ne"
-
msgid "brand"
msgstr ""
@@ -14887,9 +15544,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Dalys"
-
msgid "Clothes"
msgstr "Drabužiai"
@@ -14953,7 +15607,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15084,6 +15738,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15114,6 +15771,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Suolelis"
@@ -15126,9 +15786,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15138,7 +15795,12 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
+msgstr "Stotis"
+
+msgctxt "railway"
+msgid "Edit Station"
msgstr ""
msgid "Building"
@@ -15153,6 +15815,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15177,14 +15842,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Stotis"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15233,7 +15890,7 @@ msgstr ""
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15287,6 +15944,21 @@ msgstr "Terminalas"
msgid "Edit Terminal"
msgstr "Keisti Terminalą"
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr "belaidis"
+
+msgid "wired"
+msgstr "laidinis"
+
+msgid "terminal"
+msgstr ""
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr "Vartai"
@@ -15309,21 +15981,6 @@ msgstr ""
msgid "Stars"
msgstr ""
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr "belaidis"
-
-msgid "wired"
-msgstr "laidinis"
-
-msgid "terminal"
-msgstr ""
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr "Rūkantiems"
@@ -15507,13 +16164,19 @@ msgstr "Naktinis klubas"
msgid "Edit Nightclub"
msgstr ""
-msgid "Tourism"
+msgid "Stripclub"
msgstr ""
-msgid "Attraction"
+msgid "Edit Stripclub"
msgstr ""
-msgid "Edit Attraction"
+msgid "Tourism"
+msgstr ""
+
+msgid "Attraction"
+msgstr ""
+
+msgid "Edit Attraction"
msgstr ""
msgid "Viewpoint"
@@ -15528,9 +16191,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Žemėlapis"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15543,6 +16212,9 @@ msgstr "gatvė"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15582,6 +16254,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15603,22 +16278,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15642,9 +16329,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "tvora"
@@ -15669,7 +16353,16 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15742,49 +16435,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
-msgstr "Religija"
+msgid "Recording Studio"
+msgstr "Įrašų studija"
-msgid "bahai"
-msgstr ""
+msgid "Edit Studio"
+msgstr "Keisti Studiją"
-msgid "buddhist"
-msgstr ""
+msgid "audio"
+msgstr "garsas"
-msgid "christian"
-msgstr ""
+msgid "video"
+msgstr "vaizdas"
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
-msgstr ""
+msgid "church"
+msgstr "bažnyčia"
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15802,6 +16489,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15814,6 +16507,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15829,38 +16525,141 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Darbo valandos"
+msgid "reform"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Įrašų studija"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Keisti Studiją"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "audio"
-msgstr "garsas"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "vaizdas"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religija"
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
+msgstr ""
msgid "Public Building"
msgstr "Viešas Pastatas"
@@ -15949,6 +16748,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15958,6 +16763,12 @@ msgstr "Ligoninė"
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Gyditojai"
@@ -16024,12 +16835,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefonas"
@@ -16039,6 +16904,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Laikrodis"
@@ -16048,31 +16937,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
-msgstr "analoginis"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "skaitmeninis"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "saulės"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16100,7 +16995,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16127,27 +17022,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Šiukšliadėžė"
-msgid "Edit Waste Basket"
-msgstr "Keisti Šiukšliadėžė"
-
msgid "Waste Disposal"
msgstr "Atliekų Surinkimas"
-msgid "Edit Waste Disposal"
-msgstr "Keisti Atliekų Surinkimą"
+msgid "Edit Bench"
+msgstr ""
msgid "Backrest"
msgstr "Atluošas"
-msgid "Material"
-msgstr "Medžiaga"
-
-msgid "stone"
-msgstr "akmuo"
-
-msgid "plastic"
-msgstr "plastmasė"
-
msgid "Amount of Seats"
msgstr ""
@@ -16182,12 +17065,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16197,10 +17083,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Geriamas Vanduo"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16228,6 +17114,9 @@ msgstr "baseinas"
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16265,119 +17154,155 @@ msgstr "Stadionas"
msgid "Edit Stadium"
msgstr "Keiti Stadioną"
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
-msgstr ""
+msgid "Sport"
+msgstr "Sportas"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "fotbolas"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "plaukiojimas"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "stalo_tenisas"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenisas"
+msgstr ""
msgid "Sports Centre"
msgstr "Sporto Centras"
@@ -16409,26 +17334,27 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr "Sportas"
-
msgid "Multi"
msgstr "Daugiafunkcis"
msgid "Edit Multi"
msgstr "Keisti Daugiafunkcį"
-msgid "type"
-msgstr "tipas"
-
+msgctxt "running"
msgid "pitch"
-msgstr "aikštelė"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sporto_centras"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadionas"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16436,6 +17362,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "aikštelė"
+
+msgid "sports_centre"
+msgstr "sporto_centras"
+
+msgid "stadium"
+msgstr "stadionas"
+
msgid "10pin"
msgstr ""
@@ -16469,6 +17404,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16481,7 +17432,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16544,36 +17520,54 @@ msgstr ""
msgid "Difficulty"
msgstr "Sunkumas"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "naujokams"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "lengvas"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "pažengusiems"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "profesonalams"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16616,19 +17610,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16767,6 +17757,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "RC Mašina"
@@ -16779,38 +17781,73 @@ msgstr ""
msgid "Edit Building"
msgstr "Keisti Pastatą"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "stogas"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "gražas"
+msgstr ""
-msgid "church"
-msgstr "bažnyčia"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "mokykla"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "angaras"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "komercija"
+msgstr ""
+msgctxt "building"
msgid "farm"
-msgstr "ferma"
+msgstr ""
+msgctxt "building"
msgid "transportation"
-msgstr "transportas"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "šiltnamis"
+msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "biuras"
+msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "universitetas"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr "Gyvenamasisi Pastatas"
@@ -16818,21 +17855,60 @@ msgstr "Gyvenamasisi Pastatas"
msgid "Edit Residential Building"
msgstr "Keisti Gyvenamajį Pastatą"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "daugiabutis"
+msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "namas"
+msgstr ""
+msgctxt "building"
msgid "hut"
-msgstr "lūšna"
+msgstr ""
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Įėjimas"
+
+msgid "Edit Entrance"
+msgstr "Keisti Įėjimą"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Bokštas"
@@ -16848,9 +17924,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17060,155 +18133,145 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
-msgstr ""
-
-msgid "Edit Measurement Station"
-msgstr ""
-
-msgid "Measurement"
-msgstr ""
-
-msgid "particulate_matter"
+msgid "Monitoring Station"
msgstr ""
-msgid "seismic"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "water_level"
+msgid "Monitoring:"
msgstr ""
-msgid "weather"
+msgid "Weather"
msgstr ""
-msgid "Recording"
+msgid "Water level"
msgstr ""
-msgid "manually"
+msgid "Tide Level"
msgstr ""
-msgid "automated"
+msgid "Traffic"
msgstr ""
-msgid "remote"
+msgid "Air Quality"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Noise"
msgstr ""
-msgid "Survey Point"
+msgid "GPS Signals"
msgstr ""
-msgid "Edit Survey Point"
+msgid "GLONASS Signals"
msgstr ""
-msgid "Surveillance"
+msgid "Galileo Signals"
msgstr ""
-msgid "Edit Surveillance Camera"
+msgid "Radiation"
msgstr ""
-msgid "indoor"
+msgid "Seismic Activity"
msgstr ""
-msgid "outdoor"
+msgid "Recording:"
msgstr ""
-msgid "public"
+msgid "Automated"
msgstr ""
-msgid "Power"
+msgid "Manually"
msgstr ""
-msgid "Power Generator"
+msgid "Remote"
msgstr ""
-msgid "Edit Power Generator"
+msgid "Display:"
msgstr ""
-msgid "biofuel"
+msgid "Analog"
msgstr ""
-msgid "biogas"
+msgid "Digital"
msgstr ""
-msgid "biomass"
+msgid "Survey Point"
msgstr ""
-msgid "diesel"
+msgid "Edit Survey Point"
msgstr ""
-msgid "gasoline"
+msgid "Surveillance Camera"
msgstr ""
-msgid "geothermal"
+msgid "Edit Surveillance Camera"
msgstr ""
-msgid "hydro"
+msgid "indoor"
msgstr ""
-msgid "nuclear"
+msgid "outdoor"
msgstr ""
-msgid "osmotic"
+msgid "Zone"
msgstr ""
-msgid "solar"
+msgid "parking"
msgstr ""
-msgid "tidal"
+msgid "traffic"
msgstr ""
-msgid "waste"
-msgstr ""
+msgid "shop"
+msgstr "parduotuvė"
-msgid "wave"
+msgid "bank"
msgstr ""
-msgid "wind"
+msgid "Camera"
msgstr ""
-msgid "Method"
+msgid "fixed"
msgstr ""
-msgid "anaerobic_digestion"
+msgid "panning"
msgstr ""
-msgid "combustion"
+msgid "dome"
msgstr ""
-msgid "dam"
+msgid "Mounted on"
msgstr ""
-msgid "fission"
+msgid "ceiling"
msgstr ""
-msgid "fusion"
+msgid "Direction in degrees"
msgstr ""
-msgid "gasification"
+msgid "Inclination in degrees"
msgstr ""
-msgid "photovoltaic"
+msgid "Height in meter (m)"
msgstr ""
-msgid "pumped-storage"
+msgid "Power"
msgstr ""
-msgid "pumping"
+msgid "Power Plant"
msgstr ""
-msgid "pyrolysis"
+msgid "Edit Power Plant"
msgstr ""
-msgid "run-of-the-river"
+msgid "Start date"
msgstr ""
-msgid "thermal"
+msgid "Output forms of energy"
msgstr ""
-msgid "Output forms of energy"
+msgid "(please add this information to the generators if possible)"
msgstr ""
msgid "electricity"
@@ -17247,94 +18310,339 @@ msgstr "grai"
msgid "vacuum"
msgstr "vakuumas"
-msgid "battery charging"
+msgid "Power Generator"
msgstr ""
-msgid "Power Station"
+msgid "Edit Power Generator"
msgstr ""
-msgid "Edit Power Station"
+msgid "biofuel"
msgstr ""
-msgid "Power Sub Station"
+msgid "biogas"
msgstr ""
-msgid "Edit Power Sub Station"
+msgid "biomass"
msgstr ""
-msgid "Line reference"
+msgid "diesel"
msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "gasoline"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "geothermal"
msgstr ""
-msgid "Power Tower"
+msgid "hydro"
msgstr ""
-msgid "Edit Power Tower"
+msgid "nuclear"
msgstr ""
-msgid "Tower reference"
+msgid "osmotic"
msgstr ""
-msgid "Pole"
+msgid "solar"
msgstr ""
-msgid "Edit Power Pole"
+msgid "tidal"
msgstr ""
-msgid "Pole reference"
+msgid "waste"
msgstr ""
-msgid "Power Line"
+msgid "wave"
msgstr ""
-msgid "Edit Power Line"
+msgid "wind"
msgstr ""
-msgid "Line type"
+msgid "Method"
msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgctxt "generator method"
+msgid "anaerobic_digestion"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgctxt "generator method"
+msgid "barrage"
msgstr ""
-msgid "Amount of Cables"
+msgctxt "generator method"
+msgid "combustion"
msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
-msgid "single"
-msgstr "vienguba"
+msgctxt "generator method"
+msgid "fission"
+msgstr ""
-msgid "double"
-msgstr "dviguba"
+msgctxt "generator method"
+msgid "fusion"
+msgstr ""
-msgid "triple"
-msgstr "triguba"
+msgctxt "generator method"
+msgid "gasification"
+msgstr ""
-msgid "quad"
-msgstr "keturguba"
+msgid "biomass / waste"
+msgstr ""
-msgid "Historic Places"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
-msgid "Castle"
-msgstr "Pilis"
+msgctxt "generator method"
+msgid "pyrolysis"
+msgstr ""
-msgid "Edit Castle"
+msgctxt "generator method"
+msgid "run-of-the-river"
msgstr ""
-msgid "Ruins"
-msgstr "Griuvėsiai"
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
+msgid "thermal"
+msgstr ""
+
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
+
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
+
+msgid "Generator Type"
+msgstr ""
+
+msgid "combined_cycle"
+msgstr ""
+
+msgid "gas combustion"
+msgstr ""
+
+msgid "francis_turbine"
+msgstr ""
+
+msgid "gas_turbine"
+msgstr ""
+
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
+
+msgid "heat_pump"
+msgstr ""
+
+msgid "horizontal_axis"
+msgstr ""
+
+msgid "tidal steam / wind"
+msgstr ""
+
+msgid "kaplan_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr ""
+
+msgid "Edit Power Sub Station"
+msgstr ""
+
+msgid "Line reference"
+msgstr ""
+
+msgid "high"
+msgstr "aukštis"
+
+msgid "medium"
+msgstr "vidutinis"
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr ""
+
+msgid "Edit Power Tower"
+msgstr ""
+
+msgid "Tower reference"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr ""
+
+msgid "Edit Power Line"
+msgstr ""
+
+msgid "Line type"
+msgstr ""
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr ""
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+msgid "single"
+msgstr "vienguba"
+
+msgid "double"
+msgstr "dviguba"
+
+msgid "triple"
+msgstr "triguba"
+
+msgid "quad"
+msgstr "keturguba"
+
+msgid "Historic Places"
+msgstr ""
+
+msgid "Castle"
+msgstr "Pilis"
+
+msgid "Edit Castle"
+msgstr ""
+
+msgid "Ruins"
+msgstr "Griuvėsiai"
msgid "Edit Ruins"
msgstr ""
@@ -17411,11 +18719,11 @@ msgstr "Kioskas"
msgid "Edit Kiosk"
msgstr "Keisti Kioską"
-msgid "Baker"
-msgstr "Kepėjas"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Keisti Kepėją"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Mėsininkas"
@@ -17426,8 +18734,8 @@ msgstr "Keisti Mėsininką"
msgid "Seafood"
msgstr "Jūrų gėrybės"
-msgid "Edit Seafood"
-msgstr "Keisti Jūrų gėrybes"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr ""
@@ -17447,13 +18755,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17525,7 +18839,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17546,13 +18860,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17561,9 +18875,8 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Video"
msgid "Edit Video Shop"
msgstr ""
@@ -17589,6 +18902,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17625,10 +18944,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17658,7 +18998,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17670,19 +19010,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17703,6 +19043,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17712,7 +19058,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17793,6 +19139,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17922,6 +19271,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17961,24 +19316,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17988,15 +19352,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18072,6 +19427,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18126,7 +19487,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18138,6 +19499,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18213,47 +19577,50 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
-msgstr "AT"
+msgid "International name"
+msgstr ""
-msgid "CH"
-msgstr "CH"
+msgid "Official name"
+msgstr ""
-msgid "DE"
-msgstr "DE"
+msgid "Common name abbreviation"
+msgstr ""
-msgid "FR"
-msgstr "FR"
+msgid "Edit Address Information"
+msgstr ""
-msgid "GB"
-msgstr "GB"
+msgid "House number"
+msgstr ""
+
+msgid "House name"
+msgstr ""
-msgid "IT"
-msgstr "IT"
+msgid "Street name"
+msgstr ""
-msgid "RS"
-msgstr "RS"
+msgid "City name"
+msgstr ""
-msgid "US"
-msgstr "US"
+msgid "Country code"
+msgstr ""
msgid "Address Interpolation"
msgstr ""
@@ -18273,6 +19640,18 @@ msgstr "lyginis"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18435,27 +19814,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "pėstiesiems"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18501,21 +19909,24 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
msgstr ""
+msgid "house"
+msgstr "namas"
+
msgid "Street"
msgstr ""
@@ -18537,7 +19948,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18633,18 +20044,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "tiltas"
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr "dviračiai"
+
+msgid "foot"
+msgstr "pėstiesiems"
+
msgid "horse"
msgstr "arkliu"
@@ -18654,7 +20074,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18663,10 +20086,10 @@ msgstr ""
msgid "ford"
msgstr "brasta"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18684,6 +20107,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18699,28 +20125,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18741,20 +20167,20 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
-msgstr "parduotuvė"
+msgid "office"
+msgstr "biuras"
msgid "hotel"
msgstr "viešbutis"
@@ -18819,9 +20245,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr "papludimys"
@@ -18831,11 +20254,14 @@ msgstr ""
msgid "boundary"
msgstr "riba"
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "adresas"
@@ -18849,9 +20275,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18879,6 +20302,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18924,10 +20350,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18939,7 +20395,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18957,7 +20413,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19074,19 +20530,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:highway without highway"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:maxaxleload without maxaxleload"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:surface without surface"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19105,41 +20672,86 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgstr ""
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr ""
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open Aerial"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Black & White)"
+msgstr ""
+
+msgid "skobbler"
+msgstr ""
-msgid "Skobbler"
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -19147,230 +20759,282 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
-msgstr "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
+msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
+msgstr ""
-msgid "Stadtplan Zürich"
-msgstr "Stadtplan Zürich"
+msgid "Canvec"
+msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
+msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
+msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
+msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
+msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
+msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
+msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
+msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
+msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
-msgstr "Geobase Keliai"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr ""
-msgid "Canvec"
-msgstr "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr ""
-msgid "British Columbia Mosaic"
-msgstr "Britų Kolumbijos Mozaika"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr ""
-msgid "MSR Maps Topo"
-msgstr "MSR Topo Žemėlapiai"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr ""
-msgid "MSR Maps Urban"
-msgstr "MSR Miesto Žemėlapiai"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-colių Škotija 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-colio 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
+msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr ""
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ireland Bartholomew Quarter-Inch 1940"
+msgstr ""
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Ireland EEA GMES Urban Atlas"
+msgstr ""
msgid "Ireland EEA CORINE 2006"
-msgstr "Ireland EEA CORINE 2006"
+msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Italija"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
-msgstr "Lombardia - Italija (CTR)"
+msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicilija - Italija"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Italija"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio+Umbria"
+msgstr ""
msgid "USSR - Latvia"
-msgstr "USSR - Latvija"
+msgstr ""
msgid "50cm ortho - Latvia"
-msgstr "50cm ortho - Latvija"
+msgstr ""
msgid "20cm ortho - Coastline"
-msgstr "20cm ortho - Pakrantė"
+msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr ""
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
msgid "Catastro Spain"
-msgstr "Catastro Ispanija"
+msgstr ""
msgid "PNOA Spain"
-msgstr "PNOA Ispanija"
+msgstr ""
msgid "SIGPAC Spain"
-msgstr "SIGPAC Ispanija"
+msgstr ""
msgid "GRAFCAN - Canary Islands"
msgstr ""
@@ -19378,91 +21042,151 @@ msgstr ""
msgid "ITACyL - Castile and León"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estijos Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr ""
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estijos Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estijos Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
+msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Danija)"
+msgid "NC 2010 Orthoimagery"
+msgstr ""
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Danija)"
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Danija)"
+msgid "7th Series (OS7)"
+msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Filipinai aukštos kokybės)"
+msgid "OS New Popular Edition historic"
+msgstr ""
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "OS OpenData StreetView"
+msgstr ""
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "OS OpenData Locator"
+msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Kambodža, Laosas, Tailandas, Vietnamas dvikalbis"
+msgid "Surrey Air Survey"
+msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
-msgstr "Pietų Afrika CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
+msgstr ""
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
+msgstr ""
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
+msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakija EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
+msgstr ""
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakija EEA CORINE 2006"
+msgid "SUMO Export"
+msgstr ""
-msgid "Slovakia Historic Maps"
-msgstr "Slovakijis Istoriniai Žemėlapiai"
+msgid "Export"
+msgstr ""
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI baltai juodas 2.5m"
+msgid "Port:"
+msgstr ""
-msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Keistas Tiger Žemėlapis"
+msgid "refresh the port list"
+msgstr ""
-msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k istorinis (OSM)"
+msgid "Configure"
+msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19666,6 +21390,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19687,13 +21423,7 @@ msgstr ""
msgid "Time"
msgstr "Laikas"
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19958,9 +21688,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19982,6 +21718,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "Importuoti paveikslėlį"
@@ -20060,9 +21799,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20147,7 +21898,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20418,15 +22169,6 @@ msgstr "Namo numeris:"
msgid "Street Name:"
msgstr "Gatvės Pavadinimas:"
-msgid "Increment"
-msgstr "Didėjimo tvarka"
-
-msgid "Decrement"
-msgstr "Mažėjimo tvarka"
-
-msgid "Numbers:"
-msgstr "Numeriai:"
-
msgid "Big buildings mode"
msgstr "Didelių pastatų režimas"
@@ -20597,6 +22339,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20615,12 +22360,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "aukštis"
-
-msgid "medium"
-msgstr "vidutinis"
-
msgid "symbol"
msgstr "simbolis"
@@ -20756,6 +22495,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20773,6 +22515,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20853,48 +22598,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr "Rytai"
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -20947,19 +22650,75 @@ msgstr "Pridėti naują sluoksnį"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr ""
msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr "PNG failai (*.png)"
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr "Rytai"
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20985,7 +22744,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21035,8 +22797,8 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
-msgstr "Adresas"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr ""
@@ -21080,6 +22842,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21146,10 +22911,75 @@ msgstr ""
msgid "Are you sure?"
msgstr ""
-msgid "New tool..."
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21191,27 +23021,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21607,6 +23419,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21854,12 +23669,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21869,16 +23678,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22241,9 +24047,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22298,9 +24101,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22342,25 +24162,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22497,9 +24317,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr "Atverti Duomenis"
-
msgid "CSV files"
msgstr "CSV failai"
@@ -22524,12 +24341,21 @@ msgstr "GML failai"
msgid "Zip Files"
msgstr "Zip Failai"
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr "OpenData XML failai"
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr "Licencijos URL negalimas: {0}"
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr "Licencijos Sutartis"
@@ -22678,6 +24504,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22694,6 +24523,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22927,13 +24767,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22986,18 +24819,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23055,6 +24876,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23262,9 +25086,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23344,8 +25165,26 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
-msgstr "Paveikslėlio Sluoksnis"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -23498,6 +25337,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23519,6 +25361,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23812,9 +25657,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23883,9 +25725,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24012,9 +25851,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24036,6 +25872,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24068,15 +25907,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr "Kelio Ženklų Priedas"
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24086,6 +25941,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24188,9 +26046,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Greitkelio tipas"
-
msgid "Speed (Km/h)"
msgstr "Greitis (Km/h)"
@@ -24306,6 +26161,9 @@ msgstr ""
msgid "Save SDS file"
msgstr "Išsaugoti SDS failą"
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr "Supaprastinti Sritį"
@@ -24366,19 +26224,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
-msgstr "nematomas"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24516,6 +26374,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24591,6 +26452,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -24606,9 +26556,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24630,6 +26577,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24782,9 +26732,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25413,37 +27360,25 @@ msgstr "Atkurti objektą..."
msgid "Undelete object by id"
msgstr "Atkurti objektą pagal id"
-msgid "Select if the data should be added into a new layer"
-msgstr ""
-
-msgid ""
-"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
-"w2''"
-msgstr ""
-
msgid "Undelete Object"
msgstr "Atkurti objetą"
msgid "Undelete object"
msgstr "Atkuriti objektą"
-msgid "Start undeleting"
+msgid ""
+"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
+"w2''"
msgstr ""
-msgid "Close dialog and cancel"
+msgid "Select if the data should be added into a new layer"
msgstr ""
-msgid "Will get {0}"
+msgid "Start undeleting"
msgstr ""
-msgid "Looking for {0}"
-msgstr "Ieškoti {0}"
-
-msgid "Found {0}"
-msgstr "Rasta {0}"
-
-msgid "More tools"
-msgstr "Daugiau įrankių"
+msgid "Close dialog and cancel"
+msgstr ""
msgid "Add nodes at intersections"
msgstr "Pridėti taškus susikirtimuose"
@@ -25487,15 +27422,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Perskirti Objektą"
@@ -25618,18 +27544,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25807,9 +27721,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Įkelti Video"
@@ -25936,7 +27847,7 @@ msgstr "ciklas"
msgid "mute"
msgstr "nutylditi"
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25956,9 +27867,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26091,9 +27999,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr "Įveskite Wikipedia kalbą"
-msgid "Add Tag"
-msgstr "Pridėti žymę"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 9f0f2a9..c559e00 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:49+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:50+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -154,18 +169,14 @@ msgid "About JOSM..."
msgstr "Par JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"UZMANĪBU: neparedzēts bāzes URL API formāts. Pārsūtīšana uz info vai "
-"vēstures lapu par OSM objektu noteikti neizdosies. API bāzes URL ir: \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"BRĪDINĀJUMS: negaidīts API bāzes adreses formāts. Novirzīšana uz OSM "
-"lietotāja personālo lapu nav iespējama. API bāzes adrese ir: \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -210,6 +221,9 @@ msgstr "Nav mērķa slāņu"
msgid "Add imagery layer {0}"
msgstr "Pievienot attēla slāni {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -249,9 +263,6 @@ msgstr "Instruments: {0}"
msgid "Please select at least four nodes."
msgstr "Lūdzu iezīmējiet vismaz četrus mezglus."
-msgid "Information"
-msgstr "Informācija"
-
msgid "Align Nodes in Line"
msgstr "Izvietot mezglus pa līniju"
@@ -276,6 +287,9 @@ msgstr "konflikts"
msgid "download"
msgstr "lejuplādēt"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "iepriekšējais"
@@ -285,6 +299,9 @@ msgstr "nākamais"
msgid "Nothing selected to zoom to."
msgstr "Nav iezīmēts mērogošanas objekts."
+msgid "Information"
+msgstr "Informācija"
+
msgid "Zoom to {0}"
msgstr "Mērogot uz {0}"
@@ -341,9 +358,9 @@ msgstr ""
"tiem?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Nevaru kombinēt ceļus (Tos nevar savienot vienotā mezglu rindā)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "Kombinēt {0} ceļus"
@@ -400,18 +417,35 @@ msgstr "Dzēst"
msgid "Delete selected objects."
msgstr "Dzēst iezīmētos objektus."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Sadalīt mezglus"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Sadalīt iezīmētos mezglus vienmērīgos attālumos gar līniju."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Lejupielādēt no OSM..."
msgid "Download map data from the OSM server."
msgstr "Lejupielādēt kartes datus no OSM servera."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "Lejupielādēt objektu..."
@@ -505,6 +539,9 @@ msgstr "Vēsture"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Attēlot vēsturisko informāciju par OSM ceļiem, mezgliem un saiknēm."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -624,7 +661,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -774,8 +811,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Apievienot punktus vienā (vecākajā)"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -932,8 +969,8 @@ msgid "Download Data"
msgstr "Lejupielādēt datus"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -960,12 +997,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -983,9 +1016,6 @@ msgstr ""
msgid "Usage"
msgstr "Pielietojums"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1092,6 +1122,15 @@ msgstr "Pārsaukt arī failu"
msgid "Could not rename file ''{0}''"
msgstr "Nevarēja pārsaukt failu ''{0}''"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1142,9 +1181,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1206,6 +1242,9 @@ msgstr "Statusa atskaite"
msgid "Copy to clipboard and close"
msgstr "Kopēt starpliktuvē un aizvērt"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Aizvērt"
@@ -1280,13 +1319,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1375,6 +1414,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Atsaukt"
@@ -1399,9 +1459,6 @@ msgstr "Atjaunot datus"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1597,6 +1654,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1606,6 +1666,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1625,6 +1697,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1675,25 +1772,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1836,6 +1914,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1860,8 +1941,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1877,6 +1958,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2283,6 +2367,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2443,13 +2530,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2458,6 +2545,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2476,8 +2566,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2563,6 +2652,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2599,10 +2691,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2625,8 +2717,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2730,6 +2822,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2790,8 +2885,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2821,10 +2916,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2845,6 +2940,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2875,18 +2973,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2895,8 +2993,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2904,13 +3002,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2924,8 +3020,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2955,11 +3051,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "NEZINĀMS"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3112,8 +3207,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3220,7 +3314,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3239,6 +3333,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3255,9 +3352,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3296,6 +3390,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3320,6 +3417,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3379,13 +3485,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3455,6 +3561,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3524,6 +3648,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3581,13 +3711,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3619,10 +3749,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3756,7 +3886,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3831,6 +3961,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3861,9 +3994,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3888,10 +4018,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3954,23 +4084,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4074,7 +4187,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4270,9 +4383,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4288,10 +4416,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4300,6 +4440,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4359,6 +4502,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4386,19 +4532,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4686,29 +4819,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4723,7 +4874,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4775,14 +4926,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5032,14 +5175,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5560,6 +5703,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5643,6 +5789,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Objekta tips"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "jaukts"
+
+msgid "Choose the OSM object type"
+msgstr "Izvēlietie OSM objekta tipu"
+
+msgid "Object ID:"
+msgstr "Objekta ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Ievadiet lejupielādējamā objekta ID"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5664,9 +5837,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5691,32 +5861,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5736,8 +5906,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5763,9 +5932,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5910,9 +6076,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6197,8 +6360,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6263,34 +6426,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6305,13 +6480,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6390,12 +6565,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6425,9 +6594,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6465,7 +6640,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6525,6 +6700,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6780,6 +6958,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6845,9 +7042,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6914,21 +7108,8 @@ msgstr ""
msgid "Download object"
msgstr "Lejupielādēt objektu"
-msgid "Object type:"
-msgstr "Objekta tips"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "jaukts"
-
-msgid "Choose the OSM object type"
-msgstr "Izvēlietie OSM objekta tipu"
-
-msgid "Object ID:"
-msgstr "Objekta ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Ievadiet lejupielādējamā objekta ID"
+msgid "Start downloading"
+msgstr "Sākt lejupielādi"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6938,23 +7119,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Sākt lejupielādi"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7051,7 +7218,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7150,6 +7317,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7237,7 +7407,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7256,6 +7426,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7322,8 +7498,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7398,8 +7573,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7413,8 +7588,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7629,12 +7803,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7643,6 +7811,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7658,6 +7842,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7665,8 +7864,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7778,9 +7977,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7790,6 +7986,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7806,7 +8005,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7952,7 +8151,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7982,7 +8181,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8096,6 +8295,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8133,6 +8335,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8329,9 +8534,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8350,6 +8552,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8407,6 +8612,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8473,9 +8684,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8488,7 +8696,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8515,12 +8726,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8649,14 +8864,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8671,7 +8882,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8681,8 +8892,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8902,7 +9112,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8968,6 +9178,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9025,9 +9241,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9274,6 +9487,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9402,6 +9618,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9444,6 +9666,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9494,19 +9719,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9524,40 +9740,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9581,6 +9806,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9637,6 +9895,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9690,6 +9951,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9971,7 +10237,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10140,6 +10412,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10203,7 +10481,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10461,40 +10739,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10547,8 +10825,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10557,20 +10835,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10652,14 +10935,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10703,31 +10980,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10736,6 +11018,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10751,57 +11036,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10819,6 +11106,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10848,6 +11143,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10878,7 +11216,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10918,28 +11256,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11038,6 +11374,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11053,12 +11392,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11137,7 +11484,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11236,35 +11583,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11274,8 +11597,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11302,10 +11625,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11316,9 +11636,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11340,7 +11657,10 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
-msgid ""
+msgid "Reading was canceled"
+msgstr ""
+
+msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
msgstr ""
@@ -11389,8 +11709,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11533,6 +11853,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11551,6 +11874,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11575,16 +11907,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11596,6 +11931,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11610,6 +11953,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11640,19 +11992,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11674,11 +12026,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11748,13 +12112,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11897,10 +12261,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11915,22 +12279,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11999,8 +12362,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12015,9 +12377,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12339,17 +12716,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12360,9 +12731,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12394,9 +12808,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
msgstr ""
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12719,6 +13147,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12798,6 +13231,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12899,9 +13336,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12957,6 +13391,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12981,9 +13418,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13009,9 +13443,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13048,6 +13479,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13094,9 +13530,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13181,6 +13614,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13271,6 +13707,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13289,10 +13769,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13304,6 +13784,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13331,18 +13814,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13352,9 +13829,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13364,13 +13838,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13418,6 +13892,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13502,6 +13979,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13606,21 +14086,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13636,10 +14125,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13675,7 +14164,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13744,12 +14233,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13765,15 +14260,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13795,6 +14281,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13804,6 +14299,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13813,10 +14311,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13849,9 +14344,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13885,19 +14377,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13909,6 +14425,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13930,49 +14449,93 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
msgstr ""
msgid "Lift Gate"
@@ -13999,12 +14562,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14062,6 +14640,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14071,6 +14652,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14110,9 +14697,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14146,6 +14730,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14227,18 +14826,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14311,7 +14915,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14335,10 +14942,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14350,9 +14960,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14395,18 +15002,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14506,11 +15151,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14522,11 +15165,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14545,10 +15186,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14578,9 +15219,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14596,19 +15234,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14758,6 +15412,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14779,6 +15436,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14806,6 +15469,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14830,22 +15499,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14867,9 +15520,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14933,7 +15583,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15064,6 +15714,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15094,6 +15747,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15106,9 +15762,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15118,9 +15771,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15133,6 +15791,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15157,14 +15818,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15213,7 +15866,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15267,41 +15920,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15487,6 +16140,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15508,9 +16167,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15523,6 +16188,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15562,6 +16230,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15583,22 +16254,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15622,9 +16305,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15649,7 +16329,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15722,52 +16411,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15782,6 +16465,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15794,6 +16483,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15809,37 +16501,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15929,6 +16724,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15938,6 +16739,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -16004,12 +16811,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16019,6 +16880,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16028,31 +16913,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16080,7 +16971,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16107,27 +16998,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16162,12 +17041,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16177,10 +17059,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16208,6 +17090,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16245,117 +17130,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16389,33 +17310,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16449,6 +17380,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16461,7 +17408,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16524,36 +17496,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16596,19 +17586,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16747,6 +17733,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16759,60 +17757,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
-msgid "apartments"
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
+msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16828,9 +17900,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17040,41 +18109,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17083,7 +18178,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17095,12 +18190,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17152,88 +18337,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
msgstr ""
-msgid "battery charging"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Power Station"
+msgid "Boiling Water Reactor 3 (BWR-3)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17245,6 +18533,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17260,6 +18563,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17278,11 +18584,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17391,10 +18695,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17406,7 +18710,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17427,13 +18731,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17505,7 +18815,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17526,13 +18836,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17541,7 +18851,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17569,6 +18878,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17605,40 +18920,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
+msgstr ""
+
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17650,19 +18986,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17683,6 +19019,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17692,7 +19034,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17773,6 +19115,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17902,6 +19247,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17941,24 +19292,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17968,15 +19328,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18052,6 +19403,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18106,7 +19463,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18118,6 +19475,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18193,46 +19553,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18253,6 +19616,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18415,27 +19790,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18481,19 +19885,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18517,7 +19924,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18613,18 +20020,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18634,7 +20050,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18643,10 +20062,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18664,6 +20083,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18679,28 +20101,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18721,19 +20143,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18799,9 +20221,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18811,10 +20230,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18829,9 +20251,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18859,6 +20278,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18904,10 +20326,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18919,7 +20371,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18937,7 +20389,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19054,19 +20506,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:designation without designation"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19085,13 +20648,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19100,19 +20699,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19127,142 +20735,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Čehu UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19301,148 +20958,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19646,6 +21366,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19667,13 +21399,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19936,9 +21662,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19960,6 +21692,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20038,9 +21773,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20125,7 +21872,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20396,15 +22143,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20575,6 +22313,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20593,12 +22334,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20734,6 +22469,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20751,6 +22489,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20831,113 +22572,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20963,7 +22718,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21013,7 +22771,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21058,6 +22816,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21115,19 +22876,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21169,27 +22995,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21585,6 +23393,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21832,12 +23643,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21847,16 +23652,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22219,9 +24021,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22276,9 +24075,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22320,25 +24136,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22475,9 +24291,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22502,12 +24315,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22656,6 +24478,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22672,6 +24497,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22905,13 +24741,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22964,18 +24793,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23033,6 +24850,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23240,9 +25060,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23322,7 +25139,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23476,6 +25311,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23497,6 +25335,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23790,9 +25631,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23861,9 +25699,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23990,9 +25825,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24014,6 +25846,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24046,15 +25881,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24064,6 +25915,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24166,9 +26020,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24284,6 +26135,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24344,19 +26198,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24494,6 +26348,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24569,6 +26426,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24584,9 +26530,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24608,6 +26551,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24760,9 +26706,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25388,7 +27331,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25396,10 +27342,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25408,18 +27351,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25462,15 +27393,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25592,18 +27514,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25781,9 +27691,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25910,7 +27817,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25930,9 +27837,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26065,9 +27969,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 6398173..4054604 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -2,125 +2,144 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2009-09-22 23:25+0000\n"
-"Last-Translator: goran.cvetkovski <goran.cvetkovski at gmail.com>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
"MIME-Version: 1.0\n"
"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: 2013-04-05 04:50+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:51+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: можноста ''{1}'' е недоволно јасна"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: можноста ''--{1}'' не допушта аргумент"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: можноста ''{1}{2}'' не допушта аргумент"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr ""
+msgstr "{0}: можноста ''{1}'' бара аргумент"
msgid "{0}: unrecognized option ''--{1}''"
-msgstr ""
+msgstr "{0}: не ја препознавам можноста ''--{1}''"
msgid "{0}: unrecognized option ''{1}{2}''"
-msgstr ""
+msgstr "{0}: не ја препознавам можноста ''{1}{2}''"
msgid "{0}: illegal option -- {1}"
-msgstr ""
+msgstr "{0}: недозволена можност -- {1}"
msgid "{0}: invalid option -- {1}"
-msgstr ""
+msgstr "{0}: неважечка можност -- {1}"
msgid "{0}: option requires an argument -- {1}"
-msgstr ""
+msgstr "{0}: можноста бара аргумент -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr ""
+msgstr "Неважечка вредност {0} за параметарот ''has_arg''"
msgid "Background Terms of Use"
-msgstr ""
+msgstr "Услови на употреба на позадината"
msgid "Opening link not supported on current platform (''{0}'')"
+msgstr "Отворањето на врски не е поддржано во тековната подлога (''{0}'')"
+
+msgid "ERROR: {0}"
msgstr ""
-msgid "Executing platform startup hook"
+msgid "WARNING: {0}"
+msgstr "ПРЕДУПРЕДУВАЊЕ: {0}"
+
+msgid "INFO: {0}"
+msgstr "ИНФО: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "ПОШТЕЊЕ: {0}"
+
+msgid "Cause: "
msgstr ""
+msgid "Executing platform startup hook"
+msgstr "Ја извршувам на подготвителната постапка"
+
msgid "Building main menu"
-msgstr ""
+msgstr "Создавам главно мени"
msgid "Help"
msgstr "Помош"
msgid "Initializing OSM API"
-msgstr ""
+msgstr "Го покревам прилогот на OSM"
msgid "Initializing presets"
-msgstr ""
+msgstr "Го покревам зададеното"
msgid "Initializing validator"
-msgstr ""
+msgstr "Го покревам проверувачот"
msgid "Initializing map styles"
-msgstr ""
+msgstr "Ги покревам картографските стилови"
msgid "Loading imagery preferences"
-msgstr ""
+msgstr "Ги покревам нагодувањата за подлогата"
msgid "Updating user interface"
-msgstr ""
+msgstr "Го подновувам корисничкиот посредник"
msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Игнорирање на неправилен линк до датотека: \"{0}\""
+msgstr "Ја занемарувам неправилната податотечна URL-адреса : „{0}“"
msgid "Warning"
msgstr "Предупредување"
msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
msgstr ""
+"Параметарот „downloadgps“ не прифаќа имиња и URL-адреси на податотеки"
msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Игнорирање на неправилен линк: \"{0}\""
+msgstr "Ја занемарувам неправилната URL-адреса: „{0}“"
msgid ""
"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
"version of JOSM.</li></ul>More Info:"
msgstr ""
+"<h2>JOSM бара да имате Java од верзијата 6.</h2>Пронајдена верзија: "
+"{0}.<br>Можете да <ul><li>ја надградите Java (JRE) или да</li><li>користите "
+"постара верзија на JOSM (за Java 5).</li></ul>More Info:"
msgid "Exit JOSM"
-msgstr ""
+msgstr "Излези од JOSM"
msgid "Continue, try anyway"
-msgstr ""
+msgstr "Продолжи. Сепак обиди се"
msgid "Error"
msgstr "Грешка"
msgid "About"
-msgstr "За"
+msgstr "За нас"
msgid "Display the about screen."
-msgstr "Покажи екран со информации за програмата."
+msgstr "Прикажи го екранот со информации за програмата."
msgid "Java OpenStreetMap Editor"
-msgstr "Java OpenStreetMap Уредник"
+msgstr "Java-уредник на OpenStreetMap"
msgid "Version {0}"
msgstr "Верзија {0}"
msgid "Last change at {0}"
-msgstr "Последни промени во {0}"
+msgstr "Последната промена е извршена во {0}"
msgid "Java Version {0}"
-msgstr "Java Верзија {0}"
+msgstr "Java — верзија {0}"
msgid "Homepage"
msgstr "Домашна страница"
@@ -141,62 +160,61 @@ msgid "Contribution"
msgstr "Придонес"
msgid "License"
-msgstr "Лиценца"
+msgstr "Дозвола"
msgid "Plugins"
-msgstr "Додатоци"
+msgstr "Приклучоци"
msgid "About JOSM..."
msgstr "За JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ВНИМАНИЕ: неочекуван формат на API базниот URL. Пренасочувањето кон "
-"корисничка страна за ОСМ корисник најверојатно ќе биде неуспешно. API "
-"базниот URL е: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
"screen with browser windows<br>and take some time to finish."
msgstr ""
+"На пат сте да пуштите {0} прозорци во прелистувачот.<br>Ова може да ви "
+"направи метеж на екранот<br>и да го забави отворањето."
msgid "Continue"
-msgstr ""
+msgstr "Продолжи"
msgid "Click to continue and to open {0} browsers"
-msgstr ""
+msgstr "Стиснете за да продолжите и да отворите {0} прелистувачи"
msgid "Cancel"
msgstr "Откажи"
msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Стиснете за да го откажете пуштањето на надворешни прелистувачи"
msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Ве молам изберете барем една веќе подигната точка, пат или релација."
+msgstr "Изберете барем една веќе подигната точка, пат или релација."
msgid "Please select the target layer."
-msgstr "Ве молам одберете целен слој."
+msgstr "Изберете го целниот слој."
msgid "Select target layer"
-msgstr "Одберете целен слој"
+msgstr "Изберете целен слој"
msgid "Merge"
-msgstr "Соедини"
+msgstr "Спој"
msgid ""
"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
"to.</html>"
msgstr ""
-"<html>Нема слоеви на кои основниот слој <br>''{0}''<br>може да биде "
-"соединет.</html>"
+"<html>Нема слоеви со кои би се соединил<br>основниот слој<br>''{0}'' "
+".</html>"
msgid "No target layers"
msgstr "Нема целни слоеви"
@@ -204,6 +222,9 @@ msgstr "Нема целни слоеви"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -243,9 +264,6 @@ msgstr "Алатка: {0}"
msgid "Please select at least four nodes."
msgstr "Ве молам одберете барем четири точки."
-msgid "Information"
-msgstr "Информација"
-
msgid "Align Nodes in Line"
msgstr "Порамни ги точките во линија"
@@ -270,6 +288,9 @@ msgstr "конфликт"
msgid "download"
msgstr "превземање"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -279,6 +300,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr "Ништо не е означено за зголемување."
+msgid "Information"
+msgstr "Информација"
+
msgid "Zoom to {0}"
msgstr "Зголеми до {0}"
@@ -333,7 +357,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -390,18 +414,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -496,6 +537,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -609,7 +653,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -759,8 +803,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -917,8 +961,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -945,12 +989,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -968,9 +1008,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1077,6 +1114,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1127,9 +1173,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1191,6 +1234,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1265,13 +1311,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1360,6 +1406,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1384,9 +1451,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1582,6 +1646,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1591,6 +1658,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1610,6 +1689,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1660,25 +1764,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1821,6 +1906,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1845,8 +1933,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1862,6 +1950,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2268,6 +2359,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2428,13 +2522,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2443,6 +2537,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2461,8 +2558,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2548,6 +2644,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2584,10 +2683,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2610,8 +2709,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2715,6 +2814,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2775,8 +2877,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2806,10 +2908,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2830,6 +2932,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2860,18 +2965,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2880,8 +2985,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2889,13 +2994,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2909,8 +3012,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2940,11 +3043,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "НЕПОЗНАТО"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3097,8 +3199,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3205,7 +3306,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3224,6 +3325,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3240,9 +3344,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3281,6 +3382,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3305,6 +3409,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3364,13 +3477,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3440,6 +3553,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3509,6 +3640,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3566,13 +3703,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3604,10 +3741,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3741,7 +3878,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3816,6 +3953,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3846,9 +3986,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3873,10 +4010,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3939,23 +4076,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4059,7 +4179,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4255,9 +4375,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4273,28 +4408,43 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
-msgid "Audio"
+msgid "Preset preferences"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Click to open the tagging presets tab in the preferences"
msgstr ""
-msgid "Hide this button"
+msgid "Imagery preferences"
msgstr ""
-msgid "Click the arrow at the bottom to show it again."
+msgid "Click to open the imagery tab in the preferences"
msgstr ""
-msgid "Hide or show this toggle button"
+msgid "Audio"
msgstr ""
-msgid "Move right"
+msgid "Do not hide toolbar"
msgstr ""
-msgid "Map: {0}"
+msgid "Hide this button"
msgstr ""
-msgid "Move left"
+msgid "Click the arrow at the bottom to show it again."
+msgstr ""
+
+msgid "Hide edit toolbar"
+msgstr ""
+
+msgid "Hide or show this toggle button"
+msgstr ""
+
+msgid "Move right"
+msgstr ""
+
+msgid "Map: {0}"
+msgstr ""
+
+msgid "Move left"
msgstr ""
msgid "Move up"
@@ -4344,6 +4494,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4371,19 +4524,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4671,29 +4811,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4708,7 +4866,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4760,14 +4918,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5017,14 +5167,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5545,6 +5695,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5628,6 +5781,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5649,9 +5829,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5676,32 +5853,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5721,8 +5898,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5748,9 +5924,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5895,9 +6068,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6182,8 +6352,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6248,34 +6418,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6290,13 +6472,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6375,12 +6557,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6410,9 +6586,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6450,7 +6632,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6510,6 +6692,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6765,6 +6950,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6830,9 +7034,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6899,20 +7100,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6923,23 +7111,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7036,7 +7210,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7135,6 +7309,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7222,7 +7399,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7241,6 +7418,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7307,8 +7490,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7383,8 +7565,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7398,8 +7580,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7614,12 +7795,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7628,6 +7803,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7643,6 +7834,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7650,8 +7856,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7763,9 +7969,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7775,6 +7978,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7791,7 +7997,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7937,7 +8143,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7967,7 +8173,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8081,6 +8287,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8118,6 +8327,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8314,9 +8526,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8335,6 +8544,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8392,6 +8604,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8458,9 +8676,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8473,7 +8688,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8500,12 +8718,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8634,14 +8856,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8656,7 +8874,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8666,8 +8884,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8887,7 +9104,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8953,6 +9170,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9010,9 +9233,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9259,6 +9479,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9387,7 +9610,13 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
-msgid "Actions"
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
+msgid "Actions"
msgstr ""
msgid "Toolbar customization"
@@ -9429,6 +9658,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9479,19 +9711,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9509,40 +9732,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9566,6 +9798,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9622,6 +9887,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9675,6 +9943,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9956,7 +10229,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10125,6 +10404,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10188,7 +10473,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10447,40 +10732,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10533,8 +10818,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10543,20 +10828,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10638,14 +10928,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10689,31 +10973,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10722,6 +11011,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10737,57 +11029,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10805,6 +11099,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10834,6 +11136,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10864,7 +11209,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10904,28 +11249,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11020,6 +11363,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11035,12 +11381,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11119,7 +11473,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11218,35 +11572,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11256,8 +11586,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11284,10 +11614,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11298,9 +11625,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11322,6 +11646,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11371,8 +11698,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11515,6 +11842,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11533,6 +11863,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11557,16 +11896,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11578,6 +11920,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11592,6 +11942,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11622,19 +11981,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11656,11 +12015,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11730,13 +12101,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11879,10 +12250,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11897,22 +12268,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11981,8 +12351,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11997,9 +12366,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12321,17 +12705,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12342,9 +12720,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12376,9 +12797,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12701,6 +13136,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12780,6 +13220,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12881,9 +13325,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12939,6 +13380,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12963,9 +13407,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12991,9 +13432,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13030,6 +13468,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13076,9 +13519,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13163,6 +13603,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13253,6 +13696,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13271,10 +13758,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13286,6 +13773,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13313,18 +13803,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13334,9 +13818,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13346,13 +13827,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13400,6 +13881,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13484,6 +13968,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13588,21 +14075,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13618,10 +14114,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13657,7 +14153,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13726,12 +14222,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13747,15 +14249,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13777,6 +14270,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13786,6 +14288,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13795,10 +14300,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13831,9 +14333,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13867,31 +14366,58 @@ msgstr ""
msgid "Barriers"
msgstr ""
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr ""
-msgid "Cycle Barrier"
+msgid "Material"
msgstr ""
-msgid "Block"
+msgid "stone"
msgstr ""
-msgid "Cattle Grid"
+msgid "Bollard"
msgstr ""
-msgid "Edit Cattle Grid"
+msgid "Edit Bollard"
msgstr ""
-msgid "Bus Trap"
+msgid "Bollard type"
msgstr ""
-msgid "Spikes"
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "Cycle Barrier"
+msgstr ""
+
+msgid "Edit Cycle Barrier"
+msgstr ""
+
+msgid "Cattle Grid"
+msgstr ""
+
+msgid "Edit Cattle Grid"
+msgstr ""
+
+msgid "Bus Trap"
+msgstr ""
+
+msgid "Edit Bus Trap"
+msgstr ""
+
+msgid "Spikes"
msgstr ""
msgid "Edit Spikes"
@@ -13912,19 +14438,34 @@ msgstr ""
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13933,22 +14474,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -13981,12 +14551,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14044,6 +14629,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14053,6 +14641,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14092,9 +14686,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14128,6 +14719,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14209,18 +14815,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14293,7 +14904,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14317,10 +14931,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14332,9 +14949,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14377,18 +14991,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14488,11 +15140,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14504,11 +15154,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14527,10 +15175,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14560,9 +15208,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14578,19 +15223,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14740,6 +15401,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14761,6 +15425,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14788,6 +15458,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14812,22 +15488,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14849,9 +15509,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14915,7 +15572,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15046,6 +15703,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15076,6 +15736,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15088,9 +15751,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15100,9 +15760,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15115,6 +15780,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15139,14 +15807,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15195,7 +15855,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15249,41 +15909,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15469,6 +16129,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15490,9 +16156,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15505,6 +16177,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15544,6 +16219,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15565,22 +16243,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15604,9 +16294,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15631,16 +16318,25 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
msgstr ""
-msgid "Playground"
+msgid "Edit Horse riding"
msgstr ""
-msgid "Edit Playground"
+msgid "Brothel"
msgstr ""
-msgid "Picnic Site"
+msgid "Edit Brothel"
+msgstr ""
+
+msgid "Playground"
+msgstr ""
+
+msgid "Edit Playground"
+msgstr ""
+
+msgid "Picnic Site"
msgstr ""
msgid "Edit Picnic Site"
@@ -15704,49 +16400,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15764,6 +16454,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15776,6 +16472,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15791,37 +16490,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15911,6 +16713,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15920,6 +16728,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15986,12 +16800,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16001,6 +16869,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16010,31 +16902,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16062,7 +16960,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16089,27 +16987,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16144,12 +17030,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16159,10 +17048,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16190,6 +17079,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16227,117 +17119,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16371,33 +17299,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16431,6 +17369,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16443,7 +17397,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16506,36 +17485,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16578,19 +17575,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16729,6 +17722,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16741,60 +17746,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16810,9 +17889,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17022,41 +18098,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17065,7 +18167,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17077,12 +18179,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17134,88 +18326,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17227,6 +18522,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17242,6 +18552,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17260,11 +18573,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17373,10 +18684,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17388,7 +18699,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17409,13 +18720,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17487,7 +18804,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17508,13 +18825,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17523,7 +18840,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17551,6 +18867,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17587,10 +18909,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17620,7 +18963,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17632,19 +18975,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17665,6 +19008,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17674,7 +19023,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17755,6 +19104,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17884,6 +19236,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17923,24 +19281,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17950,15 +19317,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18034,6 +19392,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18088,7 +19452,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18100,6 +19464,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18175,46 +19542,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
+msgstr ""
+
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18235,6 +19605,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18397,27 +19779,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18463,19 +19874,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18499,7 +19913,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18595,18 +20009,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18616,7 +20039,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18625,10 +20051,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18646,6 +20072,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18661,28 +20090,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18703,19 +20132,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18781,9 +20210,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18793,10 +20219,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18811,9 +20240,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18841,6 +20267,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18886,10 +20315,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18901,7 +20360,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18919,7 +20378,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19036,19 +20495,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:old_name without old_name"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:designation without designation"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19067,13 +20637,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19082,19 +20688,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19109,142 +20724,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19283,148 +20947,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19628,6 +21355,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19649,13 +21388,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19918,9 +21651,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19942,6 +21681,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20020,9 +21762,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20107,7 +21861,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20378,15 +22132,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20557,6 +22302,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20575,12 +22323,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20716,6 +22458,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20733,6 +22478,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20813,113 +22561,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20945,7 +22707,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20995,7 +22760,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21040,6 +22805,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21097,19 +22865,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21151,27 +22984,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21567,6 +23382,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21814,12 +23632,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21829,16 +23641,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22201,9 +24010,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22258,9 +24064,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22302,25 +24125,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22457,9 +24280,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22484,12 +24304,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22638,6 +24467,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22654,6 +24486,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22887,13 +24730,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22946,18 +24782,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23015,6 +24839,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23222,9 +25049,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23304,7 +25128,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23458,6 +25300,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23479,6 +25324,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23772,9 +25620,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23843,9 +25688,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23972,9 +25814,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23996,6 +25835,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24028,15 +25870,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24046,6 +25904,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24148,9 +26009,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24266,6 +26124,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24326,19 +26187,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24476,6 +26337,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24551,6 +26415,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24566,9 +26519,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24590,6 +26540,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24742,9 +26695,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25370,7 +27320,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25378,10 +27331,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25390,18 +27340,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25444,15 +27382,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25574,18 +27503,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25763,9 +27680,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25892,7 +27806,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25912,9 +27826,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26047,9 +27958,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index 514f2ef..05daf29 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:50+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:51+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Tentang JOSM"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr "muat turun"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "TIDAK DIKETAHUI"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,49 +16391,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
-msgstr ""
+msgid "Church"
+msgstr "Gereja"
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
-msgstr ""
-
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr "Jalan Sehala"
-msgid "Church"
-msgstr "Gereja"
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 8bae2c0..2dca417 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 13:29+0000\n"
"Last-Translator: Stian Ellingsen <stiell at gmail.com>\n"
"Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:52+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:53+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Om JOSM"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -203,6 +218,9 @@ msgstr "Ikke noe lag som mål"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -242,9 +260,6 @@ msgstr "Verktøy: {0}"
msgid "Please select at least four nodes."
msgstr "Velg minst fire noder."
-msgid "Information"
-msgstr "Informasjon"
-
msgid "Align Nodes in Line"
msgstr "Juster nodene til en linje"
@@ -269,6 +284,9 @@ msgstr "konflikt"
msgid "download"
msgstr "last ned"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "forrige"
@@ -278,6 +296,9 @@ msgstr "neste"
msgid "Nothing selected to zoom to."
msgstr "Inet utvalg å vise."
+msgid "Information"
+msgstr "Informasjon"
+
msgid "Zoom to {0}"
msgstr "Gå til {0}"
@@ -334,9 +355,9 @@ msgstr ""
"retningen på noen av linjene?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "Sammenføy {0} linjer"
@@ -393,18 +414,37 @@ msgstr "Slett"
msgid "Delete selected objects."
msgstr "Slett valgte objekter."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Jevn fordeling av noder"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Fordel valgte noder med lik avstand etter en linje."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Last ned fra OSM …"
msgid "Download map data from the OSM server."
msgstr "Last ned kartdata fra OSM-tjeneren."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
+"Ønsker du<br>å fortsette?</html>"
+
+msgid "Download data"
+msgstr "Last ned data"
+
msgid "Download object..."
msgstr "Last ned objekt..."
@@ -499,6 +539,9 @@ msgstr "Historikk"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Vis historikk for OSMs noder, linjer eller relasjoner."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -612,11 +655,9 @@ msgid "Joined overlapping areas"
msgstr "Slo sammen overlappende områder"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Noen linjer er medlem i relasjoner som er endret. Sjekk at ingen feil har "
-"oppstått."
msgid "Fix tag conflicts"
msgstr "Reparer konflikter i egenskaper."
@@ -764,8 +805,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Samle noder i den eldste"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -922,8 +963,8 @@ msgid "Download Data"
msgstr "Laster ned data"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -950,12 +991,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -973,9 +1010,6 @@ msgstr "Vinkle (90)"
msgid "Usage"
msgstr "Bruk"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1082,6 +1116,15 @@ msgstr "Gi nytt navn på fil også"
msgid "Could not rename file ''{0}''"
msgstr "Kunne ikke endre filnavn \"{0}\""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1133,9 +1176,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1197,6 +1237,9 @@ msgstr "Statusrapport"
msgid "Copy to clipboard and close"
msgstr "Kopier til utklippstavlen og lukk"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Lukk"
@@ -1275,13 +1318,13 @@ msgstr ""
"linjen.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1374,6 +1417,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Angre"
@@ -1398,9 +1462,6 @@ msgstr "Oppdater data"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr "Last ned data"
-
msgid "Update modified"
msgstr ""
@@ -1596,6 +1657,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Spill av sakte"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Laster ned GPS-data"
@@ -1605,6 +1669,18 @@ msgstr "Laster ned GPX-data"
msgid "Markers from {0}"
msgstr "Markører fra {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Laster ned data"
@@ -1624,6 +1700,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt under nedlastingen"
+msgstr[1] "Konflikter under nedlastingen"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Last ned {0} av {1} ({2} gjenstår)"
@@ -1674,25 +1775,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt under nedlastingen"
-msgstr[1] "Konflikter under nedlastingen"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1837,6 +1919,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1861,8 +1946,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1878,6 +1963,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2293,6 +2381,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2456,13 +2547,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2472,6 +2563,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2490,8 +2584,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2578,6 +2671,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "La til {0} objekt"
msgstr[1] "La til {0} objekter"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Endre node {0}"
@@ -2614,10 +2710,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2640,8 +2736,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2750,6 +2846,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Løs medlemskonflikter i relasjon {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2810,11 +2909,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Når du snur reningen på denne linjen blir følgende egenskaper endret for å "
-"opprettholde dataintegritet."
msgid "Relation"
msgstr "Relasjon"
@@ -2843,11 +2940,11 @@ msgstr "Bruk valgte endringer"
msgid "Do not apply changes"
msgstr "Ikke bruk endringer"
-msgid "Please select which property changes you want to apply."
-msgstr "Velg hvilke endringer som skal brukes."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Egenskaper for "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Roller i relasjoner som viser til"
@@ -2867,6 +2964,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2897,18 +2997,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2917,8 +3017,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2926,13 +3026,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2946,8 +3044,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2977,11 +3075,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "Ukjent"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3134,8 +3231,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3242,7 +3338,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3261,6 +3357,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3277,9 +3376,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3320,6 +3416,9 @@ msgstr "gyldighetssjekk – annet"
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresser"
@@ -3344,6 +3443,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3403,15 +3511,15 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Dobbelt-Noder"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3479,6 +3587,24 @@ msgstr "Doble linjenoder"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Sjekker om linjer har identiske etterfølgende Noder."
+msgid "Highways"
+msgstr "Ferdselsveier"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolygon"
@@ -3548,6 +3674,12 @@ msgstr "Noder med samme navn"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Denne testen finner Noder som har samme navn (kan være dubletter)"
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3607,13 +3739,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3646,11 +3778,11 @@ msgid ""
msgstr ""
"Denne test sjekker linjer med liknende navn, som kan bety feilstaving."
-msgid "Properties checker :"
-msgstr "Egenskapskontroll"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Denne programutvidelsen kontrollerer egenskapers nøkler og verdier."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Ugyldig egenskapskontroll-linje – {0}: {1}"
@@ -3788,8 +3920,8 @@ msgstr "Bruk standard fil for stavekontroll."
msgid "Use the default spellcheck file (recommended)."
msgstr "Brug standard fil for stavekontroll (anbefales)."
-msgid "Fix properties"
-msgstr "Korriger egenskaper"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Kunne ikke finne element-typen"
@@ -3863,6 +3995,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr "Kontrollerer om sirkulære linjer er lukket."
+msgid "Unclosed way"
+msgstr "Ikke lukket linje"
+
msgid "natural type {0}"
msgstr "natur-type {0}"
@@ -3893,9 +4028,6 @@ msgstr "bygning"
msgid "area"
msgstr "område"
-msgid "Unclosed way"
-msgstr "Ikke lukket linje"
-
msgid "Unconnected ways"
msgstr ""
@@ -3921,10 +4053,10 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Sjekker for noder uten egenskaper som heller ikke tilhører noen linje."
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3988,23 +4120,6 @@ msgstr "Feil retning på Kystlinje: Land er ikke på venstre side"
msgid "Reversed land: land not on left side"
msgstr "Feil retning på Landlinje: Land er ikke på venstre side"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4108,7 +4223,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr "Laster ned \"Dagens melding\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4312,9 +4427,24 @@ msgstr "Vis"
msgid "Tools"
msgstr "Verktøy"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Utvalg"
+
msgid "Presets"
msgstr "Objektmaler"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4330,10 +4460,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Audio"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4342,6 +4484,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4401,6 +4546,9 @@ msgstr "(intet objekt)"
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "Laget er ikke i lista."
@@ -4428,22 +4576,8 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "false: egenskapen er slått av med vilje"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: egenskapen er slått på med vilje"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"partial: de valgte objektene har forskjellige verdier, ikke gjør endringer"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "unset: ikke sett egenskap på valgte objekter"
-
-msgid "{0} ({1} ms)"
-msgstr ""
+msgid "{0} ({1} ms)"
+msgstr ""
msgid ""
"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
@@ -4737,6 +4871,9 @@ msgstr ""
"Kopier valgte lokale elementer til slutten av lista over sammenslåtte "
"elementer"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -4744,6 +4881,9 @@ msgstr ""
"Kopier valgte lokale elementer til plassen før første valgte element i lista "
"over sammenslåtte elementer"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -4751,18 +4891,27 @@ msgstr ""
"Kopier valgte lokale elementer til plassen etter første valgte element i "
"lista over sammenslåtte elementer"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Kopier valgte elementer på tjeneren til starten av lista over sammenslåtte "
"elementer"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Kopier valgte elementer på tjeneren til slutten av lista over sammenslåtte "
"elementer"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -4770,6 +4919,9 @@ msgstr ""
"Kopier valgte elementer på tjeneren til plassen før første valgte element i "
"lista over sammenslåtte elementer"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4786,8 +4938,8 @@ msgstr ""
msgid "Up"
msgstr "Opp"
-msgid "Move up the selected elements by one position."
-msgstr "Flytt valgte elementer opp én plass"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Ned"
@@ -4842,14 +4994,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Tjenerens versjon ({0} oppføring)"
msgstr[1] "Tjenerens versjon ({0} oppføringer)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Node"
@@ -5103,14 +5247,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5631,6 +5775,9 @@ msgstr "Vis/Skjul"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Map Pain stiler"
@@ -5714,6 +5861,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Objekttype:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "Velg OSM-objekt-type"
+
+msgid "Object ID:"
+msgstr "Objekt ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relasjoner"
@@ -5735,9 +5909,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relasjoner: {0}"
-msgid "Selection"
-msgstr "Utvalg"
-
msgid "Open a selection list window."
msgstr "Åpne vindu med en utvalgsliste"
@@ -5762,18 +5933,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Utvalg: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5790,6 +5949,18 @@ msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
msgid "Click to minimize/maximize the panel content"
msgstr "Klikk for at minimere/maksimere panelet"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Opphavsmenn"
@@ -5807,8 +5978,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5834,9 +6004,6 @@ msgstr "Åpne valideringsvindu"
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Zoom til problem"
-
msgid "Fix"
msgstr "Korriger"
@@ -5981,9 +6148,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6268,8 +6432,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6334,35 +6498,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Egenskaper/medlemsskaper"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Egenskaper for valgte objekt."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<different>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Medlem av"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Egenskaper: {0} / Medlemskap: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Egenskaper / Medlemskap"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Fjern den valgte nøkkel i alle objekt"
-msgid "Delete Properties"
-msgstr "DSlett egenskaper"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Skift relasjon"
@@ -6376,13 +6552,13 @@ msgstr "Vil du slette utvalget fra relasjon {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Rett verdien for den valgte nøkkel for alle objekter"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6461,12 +6637,6 @@ msgstr[1] "Endre egenskap på inntil {0} objekt"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6496,9 +6666,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6536,7 +6712,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6596,6 +6772,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6851,6 +7030,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Bokmerker"
@@ -6918,9 +7116,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6988,21 +7183,8 @@ msgstr ""
msgid "Download object"
msgstr "Last ned objekt"
-msgid "Object type:"
-msgstr "Objekttype:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "Velg OSM-objekt-type"
-
-msgid "Object ID:"
-msgstr "Objekt ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr ""
+msgid "Start downloading"
+msgstr "Start nedlasting"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7012,23 +7194,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Start nedlasting"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7125,7 +7293,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7230,6 +7398,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7329,7 +7500,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7348,6 +7519,12 @@ msgstr "Gi en kort kommentar for endringene du laster opp:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7414,8 +7591,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7490,8 +7666,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7505,8 +7681,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7721,12 +7896,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7735,6 +7904,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7750,6 +7935,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7757,8 +7957,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7870,9 +8070,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7882,6 +8079,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7898,7 +8098,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8044,7 +8244,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8074,8 +8274,8 @@ msgstr "versjon {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8190,6 +8390,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8227,6 +8430,9 @@ msgstr "Last ned kartbilder med feil på nytt"
msgid "Alpha channel"
msgstr "Alpha channel"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8433,9 +8639,6 @@ msgstr "Leser GPS posisjoner fra EXIF"
msgid "Starting directory scan"
msgstr "Starter scanning av mapper"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Les bilder"
@@ -8454,6 +8657,9 @@ msgstr "Fant tom fil i mappa {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Feil ved lesing av fil i mappa {0}\n"
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Geotaggede bilder"
@@ -8511,6 +8717,12 @@ msgstr "Neste"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Midtstill kartbilde"
@@ -8581,9 +8793,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8596,8 +8805,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Last ned fra OSM langs dette spor"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Last ned alt innenfor:"
@@ -8623,15 +8835,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Last ned fra OSM langs dette spor"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
-"Ønsker du<br>å fortsette?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -8767,14 +8981,10 @@ msgstr "Der opstod en feil i forsøket på å vise URL’en for denne markøren"
msgid "(URL was: "
msgstr "(URL var: "
-msgid "Error displaying URL"
-msgstr "Feil ved visning av URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8789,7 +8999,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8799,8 +9009,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9020,7 +9229,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9086,6 +9295,12 @@ msgstr "Tillat endring av dine innstillinger"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9143,9 +9358,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9404,6 +9616,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Remote Control"
@@ -9532,6 +9747,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9574,6 +9795,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Data-validator"
@@ -9626,19 +9850,10 @@ msgstr "Søk: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
+msgid "Export selected items"
msgstr ""
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9656,40 +9871,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
+msgstr ""
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "shortcut"
msgstr ""
-msgid "Current value is default."
+msgid "color"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "toolbar"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "imagery"
msgstr ""
-msgid "Select Setting Type:"
+msgid "Reset preferences"
msgstr ""
-msgid "Simple"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List"
+msgid "Load profile"
msgstr ""
-msgid "List of lists"
+msgid "Save {0} profile"
msgstr ""
-msgid "List of maps"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Add setting"
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9713,6 +9937,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9770,6 +10027,9 @@ msgstr "Tegn virtuelle noder i utvalg-tilstand"
msgid "Draw inactive layers in other color"
msgstr "Tegn inaktive lag i annen farge"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9823,6 +10083,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10113,7 +10378,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10282,6 +10553,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10345,8 +10622,8 @@ msgstr "Innstillinger for kart"
msgid "Settings for the map projection and data interpretation."
msgstr "Innstilinger for kartprojeksjon og datafortolkning"
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10603,40 +10880,40 @@ msgstr "Swiss Grid (Sveits)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10689,8 +10966,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10699,20 +10976,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10794,16 +11076,10 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-msgid "disabled"
-msgstr "deaktivert"
-
-msgid "no modifier"
-msgstr "ingen kombinasjon"
-
msgid "Shortcut Background: User"
msgstr ""
@@ -10845,32 +11121,37 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Bruk objektmal «{0}»"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Element type {0} kan brukes."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Endre {0} objekt"
+msgstr[1] "Endre {0} objekt"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Intet er valgt!"
+
+msgid "Selection unsuitable!"
+msgstr "Utvalget passer ikke formålet!"
+
+msgid "Apply Preset"
+msgstr "Bruk Objektmal"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "Mer informasjon om denne funksjonen"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -10878,6 +11159,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Mer informasjon om denne funksjonen"
+
msgid "Available roles"
msgstr ""
@@ -10893,59 +11177,61 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Valgfrie attributter:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
-
-msgid "Use preset ''{0}''"
-msgstr "Bruk objektmal «{0}»"
-
-msgid "Unknown type: {0}"
-msgstr "Ukjent type: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Error parsing {0}: "
-msgstr "Feil ved lesing av {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Elements of type {0} are supported."
-msgstr "Element type {0} kan brukes."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Endre {0} objekt"
-msgstr[1] "Endre {0} objekt"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Intet er valgt!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Utvalget passer ikke formålet!"
+msgid "Unknown type: {0}"
+msgstr "Ukjent type: {0}"
-msgid "Apply Preset"
-msgstr "Bruk Objektmal"
+msgid "Preset group {1} / {0}"
+msgstr ""
-msgid "New relation"
+msgid "Preset group {0}"
msgstr ""
-msgid "Change Properties"
-msgstr "Endre egenskaper"
+msgid "Roles cannot appear more than once"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "Feil ved lesing av {0}: "
+
msgid "Search preset"
msgstr ""
@@ -10961,6 +11247,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10990,38 +11284,89 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
+msgid "false: the property is explicitly switched off"
+msgstr "false: egenskapen er slått av med vilje"
-msgid "Deleted node {0} is part of way {1}"
-msgstr "Slettet node {0} er del av linje {1}"
+msgid "true: the property is explicitly switched on"
+msgstr "true: egenskapen er slått på med vilje"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"partial: different selected objects have different values, do not change"
msgstr ""
+"partial: de valgte objektene har forskjellige verdier, ikke gjør endringer"
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
-msgstr ""
+msgid "unset: do not set this property on the selected objects"
+msgstr "unset: ikke sett egenskap på valgte objekter"
-msgid "Deleted member {0} is used by relation {1}"
+msgid "Cut"
msgstr ""
-msgid "All Formats"
-msgstr "Alle formater"
-
-msgid "Downloading points {0} to {1}..."
-msgstr "Laster ned punkt {0} til {1}..."
+msgid "Right click = copy to clipboard"
+msgstr ""
-msgid "Contacting OSM Server..."
-msgstr "Kontakter OSM-tjeneren …"
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "obligatorisk attributt «{0}» mangler"
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «long» – leste «{1}»"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «long» (>= 0) – leste "
+"«{1}»"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste "
+"«{1}»"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – "
+"leste «{1}»"
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Linje med ekstern ID «{0}» inkluderer manglende node med ekstern ID «{1}»."
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Slettet node {0} er del av linje {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+
+msgid "Deleted member {0} is used by relation {1}"
+msgstr ""
+
+msgid "All Formats"
+msgstr "Alle formater"
+
+msgid "Downloading points {0} to {1}..."
+msgstr "Laster ned punkt {0} til {1}..."
+
+msgid "Contacting OSM Server..."
+msgstr "Kontakter OSM-tjeneren …"
+
+msgid ""
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11061,28 +11406,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11181,6 +11524,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11196,12 +11542,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11280,8 +11634,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "NMEA data er lest inn"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Feil ved import av NMEA data!"
@@ -11379,42 +11733,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "obligatorisk attributt «{0}» mangler"
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «long» – leste «{1}»"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «long» (>= 0) – leste "
-"«{1}»"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «boolean» – leste "
-"«{1}»"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – "
-"leste «{1}»"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11426,8 +11749,8 @@ msgstr ""
"«modify» eller «delete»."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11454,10 +11777,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11468,9 +11788,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM-tjenerfiler gzip-komprimert"
@@ -11492,6 +11809,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11541,8 +11861,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11686,6 +12006,9 @@ msgstr "Lagre bruker og passord (ukryptert)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11704,6 +12027,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11728,16 +12060,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11749,6 +12084,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11763,6 +12106,15 @@ msgstr "Remote Control har bedt om data fra denne URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Remote Control er bedt om å laste data fra API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11793,19 +12145,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11827,11 +12179,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11901,13 +12265,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12050,10 +12414,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12068,22 +12432,21 @@ msgstr "Behold programtillegg"
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12156,8 +12519,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12172,9 +12534,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12498,17 +12875,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12519,9 +12890,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12553,9 +12967,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
msgstr ""
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12882,6 +13310,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12964,6 +13397,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13073,9 +13510,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13134,6 +13568,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13160,9 +13597,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13190,9 +13624,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13232,6 +13663,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13278,9 +13714,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Ferdselsveier"
-
msgid "Streets"
msgstr "Veier"
@@ -13365,6 +13798,9 @@ msgstr "Øy"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Avgift"
+
msgid "Motorway Link"
msgstr "Av-/påkjørsel for motorvei"
@@ -13455,29 +13891,73 @@ msgstr "Boligfeltvei"
msgid "Edit Residential Street"
msgstr "Rediger boligfeltvei"
-msgid "Living Street"
-msgstr "Gatetun"
+msgid "Bicycle Road"
+msgstr ""
-msgid "Edit Living Street"
-msgstr "Rediger gatetun"
+msgid "Edit Bicycle Road"
+msgstr ""
-msgid "Pedestrian"
-msgstr "Gågate"
+msgid "Highway type"
+msgstr "Type ferdselsvei"
-msgid "Edit Pedestrian Street"
-msgstr "Rediger gågate"
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
-msgid "Area"
-msgstr "Område"
+msgctxt "Highway"
+msgid "service"
+msgstr ""
-msgid "Service"
-msgstr "Adkomstvei"
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
-msgid "Edit Serviceway"
-msgstr "Rediger adkomstvei"
+msgctxt "Highway"
+msgid "path"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Type adkomstvei"
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "ja"
+
+msgid "no"
+msgstr "nei"
+
+msgid "destination"
+msgstr "destinasjon"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
+msgid "Living Street"
+msgstr "Gatetun"
+
+msgid "Edit Living Street"
+msgstr "Rediger gatetun"
+
+msgid "Pedestrian"
+msgstr "Gågate"
+
+msgid "Edit Pedestrian Street"
+msgstr "Rediger gågate"
+
+msgid "Area"
+msgstr "Område"
+
+msgid "Service"
+msgstr "Adkomstvei"
+
+msgid "Edit Service Way"
+msgstr ""
+
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "Smug"
@@ -13488,6 +13968,9 @@ msgstr "Oppkjørsel"
msgid "parking_aisle"
msgstr "parking_aisle"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parkeringsvei"
@@ -13515,18 +13998,12 @@ msgstr "rundkjøring"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "ja"
-
msgid "Road Restrictions"
msgstr "Restriksjoner"
msgid "Edit Road Restrictions"
msgstr "Rediger restriksjoner"
-msgid "Toll"
-msgstr "Avgift"
-
msgid "No exit (cul-de-sac)"
msgstr "Ingen gjennomkjøring"
@@ -13536,9 +14013,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "destinasjon"
-
msgid "delivery"
msgstr "leveranse"
@@ -13548,15 +14022,15 @@ msgstr "permissive"
msgid "private"
msgstr "privat"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "Skog- og Landbruk"
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "nei"
-
msgid "official"
msgstr ""
@@ -13602,6 +14076,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Offentlig transport"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Minste fart (km/t)"
@@ -13686,6 +14163,9 @@ msgstr "Rediger bro"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13790,21 +14270,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "middels"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13820,10 +14309,10 @@ msgstr "Dedikert ridevei"
msgid "Edit Bridleway"
msgstr "Rediger ridevei"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13859,7 +14348,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13928,12 +14417,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Nødtelefon"
+msgid "Drinking Water"
+msgstr "Drikkevann"
msgid "Traffic Signal"
msgstr "Trafikklys"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Type gangfelt"
@@ -13949,15 +14444,6 @@ msgstr "trafikkøy"
msgid "unmarked"
msgstr "umerket"
-msgid "Cross on horseback"
-msgstr "Kryssende ridevei"
-
-msgid "Cross by bicycle"
-msgstr "Kryssende sykkelvei"
-
-msgid "Crossing attendant"
-msgstr "Betjent fotgjengerfelt"
-
msgid "Crossing type name (UK)"
msgstr "Crossing type name (UK)"
@@ -13979,6 +14465,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Betjent fotgjengerfelt"
+
+msgid "Cross by bicycle"
+msgstr "Kryssende sykkelvei"
+
+msgid "Cross on horseback"
+msgstr "Kryssende ridevei"
+
msgid "Stop"
msgstr "Full stopp"
@@ -13988,6 +14483,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rundkjøring"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Retning"
@@ -13997,11 +14495,8 @@ msgstr "med_klokka"
msgid "Pedestrian Crossing"
msgstr "Fotgjengerfelt"
-msgid "Edit Crossing"
-msgstr "Rediger fotgjengerfelt"
-
-msgid "Type name (UK)"
-msgstr "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Fartsdemping"
@@ -14033,9 +14528,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Passeringspunkt"
-msgid "Edit Passing Place"
-msgstr "Rediger passeringspunkt"
-
msgid "Turning Circle"
msgstr "Vendesirkel"
@@ -14069,20 +14561,44 @@ msgstr ""
msgid "Barriers"
msgstr "Stengsel"
+msgid "Block"
+msgstr "Steinblokk"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Tillatt trafikk:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "stein"
+
msgid "Bollard"
msgstr "Sperresøyle"
msgid "Edit Bollard"
msgstr "Rediger sperresøyle"
-msgid "Allowed traffic:"
-msgstr "Tillatt trafikk:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plast"
msgid "Cycle Barrier"
msgstr "Halvbommer"
-msgid "Block"
-msgstr "Steinblokk"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Ferist"
@@ -14093,6 +14609,9 @@ msgstr "Rediger ferist"
msgid "Bus Trap"
msgstr "Bussluse"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Pigghinder"
@@ -14114,19 +14633,34 @@ msgstr "Rediger tollstasjon"
msgid "Hedge"
msgstr "Hekk"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Høyde (meter)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Gjerde"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14135,23 +14669,52 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Mur"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Bymur"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Støttemur"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Dike"
+msgstr ""
-msgid "Entrance"
-msgstr "Inngang"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Rediger inngang"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Port"
@@ -14183,12 +14746,27 @@ msgstr "Fotgjengerport"
msgid "Edit Kissing Gate"
msgstr "Rediger fotgjengerport"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Gjerdetrapp"
msgid "Edit Stile"
msgstr "Rediger gjerdetrapp"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Rotasjonsport"
@@ -14246,6 +14824,9 @@ msgstr "Drenering"
msgid "Edit Drain"
msgstr "Rediger drenering"
+msgid "Ditch"
+msgstr "Dike"
+
msgid "Edit Ditch"
msgstr "Rediger dike"
@@ -14255,6 +14836,12 @@ msgstr "Bekk"
msgid "Edit Stream"
msgstr "Rediger bekk"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14294,9 +14881,6 @@ msgstr "Rediger demning"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14330,6 +14914,21 @@ msgstr "Rediger tildekt drikkevannskilde"
msgid "Edit Water"
msgstr "Rediger vann"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Land"
@@ -14411,18 +15010,23 @@ msgstr "Rediger fergeleie"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "sykkel"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14495,7 +15099,10 @@ msgstr "militært"
msgid "tourism"
msgstr "turisme"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14519,10 +15126,13 @@ msgstr ""
msgid "rail"
msgstr "jernbane"
-msgid "Voltage"
-msgstr "Spenning"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14534,9 +15144,6 @@ msgstr "Smal jernbane"
msgid "Edit Narrow Gauge Rail"
msgstr "Rediger smal jernbane"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Monorail"
@@ -14579,18 +15186,56 @@ msgstr "Nedlagt jernbane"
msgid "Edit Disused Railway"
msgstr "Rediger nedlagt jernbane"
-msgid "Optional Types"
-msgstr "Alternative typer"
-
msgid "Abandoned Rail"
msgstr "Revet jernbane"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Planovergang"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Fotgjengerfelt"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Type fotgjengerfelt"
@@ -14690,11 +15335,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14706,13 +15349,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Rediger stasjon"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Stolpe"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Rediger stolpe"
+msgstr ""
msgid "Parking"
msgstr "Parkering"
@@ -14729,12 +15370,12 @@ msgstr "Overflateparkering"
msgid "underground"
msgstr "P-kjeller"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Adkomst"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14762,9 +15403,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "Kapasitet"
@@ -14780,25 +15418,41 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Åpningstider"
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Sa-Su 00:00-24:00"
msgstr ""
-msgid "Parking entrance"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
msgstr ""
-msgid "Edit Parking entrance"
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
+
+msgid "Parking entrance"
+msgstr ""
+
+msgid "Edit Parking entrance"
msgstr ""
msgid "Fuel"
@@ -14942,6 +15596,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Spenning"
+
msgid "Amperage"
msgstr ""
@@ -14963,6 +15620,12 @@ msgstr "Verksted"
msgid "Edit Car Repair"
msgstr "Rediger verksted"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14990,6 +15653,12 @@ msgstr "Utleie"
msgid "Edit Car Rental"
msgstr "Rediger bilutleie"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Bildeling"
@@ -15014,22 +15683,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15051,9 +15704,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Klær"
@@ -15117,8 +15767,8 @@ msgstr "Rediger sykkelutleie"
msgid "Public Transport"
msgstr "Offentlig transport"
-msgid "Route"
-msgstr "Rute"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Rediger rute"
@@ -15248,6 +15898,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15278,6 +15931,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Benk"
@@ -15290,9 +15946,6 @@ msgstr "Rullestol"
msgid "limited"
msgstr "begrenset"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15302,8 +15955,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Stasjon"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Rediger stasjon"
msgid "Building"
msgstr "Bygning"
@@ -15317,6 +15975,9 @@ msgstr "Rediger T-baneinngang"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15341,14 +16002,6 @@ msgstr "kundekort"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Stasjon"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Rediger stasjon"
-
msgid "UIC-Reference"
msgstr "Internasjonal UIC-jernbanekode"
@@ -15397,8 +16050,8 @@ msgstr "Rediger bussplattform"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Rediger taxi-stasjon"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Flyplass"
@@ -15451,6 +16104,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Rediger terminal"
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "stasjon"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -15473,21 +16141,6 @@ msgstr "Rediger hotell"
msgid "Stars"
msgstr "Stjerner"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "stasjon"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -15671,6 +16324,12 @@ msgstr "Nattklubb"
msgid "Edit Nightclub"
msgstr "Rediger nattklubb"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turisme"
@@ -15692,9 +16351,15 @@ msgstr "Utsiktstårn"
msgid "Information Office"
msgstr "Turistinformasjon"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Kart"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Karttype"
@@ -15707,6 +16372,9 @@ msgstr "Gater"
msgid "scheme"
msgstr "Diagram"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Synlig område"
@@ -15746,6 +16414,9 @@ msgstr "… andre typer transport mulig"
msgid "Information Board"
msgstr "Informasjonstavle"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Tavleinnhold"
@@ -15767,23 +16438,35 @@ msgstr "Planter"
msgid "Guidepost"
msgstr "Veiviser"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Informasjonsterminal"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Nærmere beskrivelse"
msgid "Audioguide"
msgstr "Lydomviser"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Lydomvisning via mobiltelefon"
msgid "Phone number"
msgstr "Telefonnummer"
-msgid "Other Information Points"
-msgstr "Annen informasjon"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Fritid"
@@ -15806,9 +16489,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15833,7 +16513,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15906,50 +16595,44 @@ msgstr "Kunstverk"
msgid "Edit Artwork"
msgstr "Rediger kunstverk"
-msgid "Place of Worship"
-msgstr "Tilbedelsessted"
-
-msgid "Edit Place of Worship"
-msgstr "Rediger tilbedelsessted"
-
-msgid "Religion"
-msgstr "Religion"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "buddhist"
+msgid "audio"
+msgstr ""
-msgid "christian"
-msgstr "kristen"
+msgid "video"
+msgstr ""
-msgid "hindu"
-msgstr "hindu"
+msgid "Place of Worship"
+msgstr "Tilbedelsessted"
-msgid "jain"
-msgstr "jain"
+msgid "Church"
+msgstr "Kirke"
-msgid "jewish"
-msgstr "jødisk"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muslim"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualist"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoist"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarisk"
+msgid "church"
+msgstr ""
-msgid "zoroastrian"
-msgstr "zoroastrisk"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Trosretniing"
@@ -15966,6 +16649,12 @@ msgstr "katolsk"
msgid "evangelical"
msgstr "evangelisk"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "Jehovas vitner"
@@ -15978,6 +16667,9 @@ msgstr "metodist"
msgid "mormon"
msgstr "mormoner"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoks"
@@ -15993,98 +16685,201 @@ msgstr "protestant"
msgid "quaker"
msgstr "quaker"
-msgid "shia"
-msgstr "shia"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "sunni"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
+msgid "Sa 18:00; Su 10:45"
msgstr ""
-msgid "Edit Studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
msgstr ""
-msgid "audio"
+msgid "Sa 10:00+"
msgstr ""
-msgid "video"
+msgid "Mosque"
msgstr ""
-msgid "Public Building"
-msgstr "Offentlig bygning"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Rediger offentlig bygning"
+msgid "mosque"
+msgstr ""
-msgid "Town hall"
-msgstr "Rådhus"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Rediger rådhus"
+msgid "shia"
+msgstr "shia"
-msgid "Community Centre"
+msgid "sunni"
+msgstr "sunni"
+
+msgid "Synagogue"
msgstr ""
-msgid "Embassy"
-msgstr "Ambassade"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Rediger ambassade"
+msgid "synagogue"
+msgstr ""
-msgid "Courthouse"
-msgstr "Domstol"
+msgid "conservative"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Rediger domstol"
+msgid "reform"
+msgstr ""
-msgid "Prison"
-msgstr "Fengsel"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Rediger fengsel"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Politi"
+msgid "theravada"
+msgstr ""
-msgid "Edit Police"
-msgstr "Rediger politi"
+msgid "mahayana"
+msgstr ""
-msgid "Fire Station"
-msgstr "Brannstasjon"
+msgid "vajrayana"
+msgstr ""
-msgid "Edit Fire Station"
-msgstr "Rediger brannstasjon"
+msgid "Hindu Temple"
+msgstr ""
-msgid "Post Office"
-msgstr "Postkontor"
+msgid "Edit Hindu Temple"
+msgstr ""
-msgid "Edit Post Office"
-msgstr "Rediger postkontor"
+msgid "vaishnavism"
+msgstr ""
-msgid "Education"
+msgid "shaivism"
msgstr ""
-msgid "Kindergarten"
-msgstr "Barnehage"
+msgid "shaktism"
+msgstr ""
-msgid "Edit Kindergarten"
-msgstr "Rediger barnehage"
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religion"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jain"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualist"
+
+msgid "taoist"
+msgstr "taoist"
+
+msgid "unitarian"
+msgstr "unitarisk"
+
+msgid "zoroastrian"
+msgstr "zoroastrisk"
+
+msgid "Public Building"
+msgstr "Offentlig bygning"
+
+msgid "Edit Public Building"
+msgstr "Rediger offentlig bygning"
+
+msgid "Town hall"
+msgstr "Rådhus"
+
+msgid "Edit Town hall"
+msgstr "Rediger rådhus"
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr "Ambassade"
+
+msgid "Edit Embassy"
+msgstr "Rediger ambassade"
+
+msgid "Courthouse"
+msgstr "Domstol"
+
+msgid "Edit Courthouse"
+msgstr "Rediger domstol"
+
+msgid "Prison"
+msgstr "Fengsel"
+
+msgid "Edit Prison"
+msgstr "Rediger fengsel"
+
+msgid "Police"
+msgstr "Politi"
+
+msgid "Edit Police"
+msgstr "Rediger politi"
+
+msgid "Fire Station"
+msgstr "Brannstasjon"
+
+msgid "Edit Fire Station"
+msgstr "Rediger brannstasjon"
+
+msgid "Post Office"
+msgstr "Postkontor"
+
+msgid "Edit Post Office"
+msgstr "Rediger postkontor"
+
+msgid "Education"
+msgstr ""
+
+msgid "Kindergarten"
+msgstr "Barnehage"
+
+msgid "Edit Kindergarten"
+msgstr "Rediger barnehage"
msgid "School"
msgstr "Skole"
@@ -16113,6 +16908,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Helse"
@@ -16122,6 +16923,12 @@ msgstr "Sykehus"
msgid "Edit Hospital"
msgstr "Rediger sykehus"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Lege"
@@ -16188,12 +16995,66 @@ msgstr "Veterinær"
msgid "Edit Veterinary"
msgstr "Rediger veterinær"
-msgid "Note"
-msgstr "Kommentar"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Postkasse"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefon"
@@ -16203,6 +17064,30 @@ msgstr "Rediger telefon"
msgid "Telephone cards"
msgstr "Telefonkort"
+msgid "Emergency Phone"
+msgstr "Nødtelefon"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16212,31 +17097,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16264,8 +17155,8 @@ msgstr ""
msgid "Recycling"
msgstr "Returstasjon"
-msgid "Edit Recycling station"
-msgstr "Rediger returstasjon"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batterier"
@@ -16291,27 +17182,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Søppeldunk"
-msgid "Edit Waste Basket"
-msgstr "Rediger søppeldunk"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Ryggstø"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "stein"
-
-msgid "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Antall seter"
@@ -16346,14 +17225,17 @@ msgstr "Rediger jaktpost"
msgid "Height"
msgstr "Høyde"
+msgctxt "height"
msgid "low"
-msgstr "lav"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "halv"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "full"
+msgstr ""
msgid "Hide"
msgstr "Skjul"
@@ -16361,11 +17243,11 @@ msgstr "Skjul"
msgid "Lock"
msgstr "Lås"
-msgid "Drinking Water"
-msgstr "Drikkevann"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Rediger drikkevann"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Hydrant"
@@ -16392,6 +17274,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16429,119 +17314,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Rediger stadion"
-msgid "select sport:"
-msgstr "velg sport:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "flerbruk"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "bueskyting"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "turn"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "australsk fotball"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basketball"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boules"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "bowls"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kano"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "klatring"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "cricketnett"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "krocket"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "sykling"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "hundeløp"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "ridning"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gymnastikk"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "ishockey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "hesteløp"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motorsport"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "racquet"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "skyting"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "skøyter"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "ski"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "fotball"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "svømming"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "bordtennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Sportssenter"
@@ -16573,26 +17494,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Rediger minigolf"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Flerbruk"
msgid "Edit Multi"
msgstr "Rediger flerbruk"
-msgid "type"
-msgstr "type"
-
+msgctxt "running"
msgid "pitch"
-msgstr "bane"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sportssenter"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16600,6 +17522,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "bane"
+
+msgid "sports_centre"
+msgstr "sportssenter"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "bowling"
@@ -16633,6 +17564,22 @@ msgstr "Rediger kano"
msgid "Edit Cycling"
msgstr "Rediger sykling"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Hundeløp"
@@ -16645,9 +17592,34 @@ msgstr "Ridning"
msgid "Edit Equestrian"
msgstr "Rediger ridning"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "søle"
+
msgid "Horse Racing"
msgstr "Hesteløp"
@@ -16664,7 +17636,7 @@ msgid "Skating"
msgstr "Skøyter"
msgid "Edit Skating"
-msgstr "Rediger skøyter"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16708,36 +17680,54 @@ msgstr "snøpark"
msgid "Difficulty"
msgstr "Vanskelighetsgrad"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "begynner"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "enkel"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "vanskelig"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "ekspert"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "fristil"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16780,19 +17770,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16931,6 +17917,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16943,60 +17941,134 @@ msgstr "Menneskeskapt"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Inngang"
+
+msgid "Edit Entrance"
+msgstr "Rediger inngang"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Tårn"
@@ -17012,9 +18084,6 @@ msgstr "kommunikasjon"
msgid "observation"
msgstr "observasjon"
-msgid "Height (meters)"
-msgstr "Høyde (meter)"
-
msgid "Flagpole"
msgstr ""
@@ -17224,41 +18293,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17267,8 +18362,8 @@ msgstr "Trigonometrisk punkt"
msgid "Edit Survey Point"
msgstr "Rediger trigonometrisk punkt"
-msgid "Surveillance"
-msgstr "Overvåkingskamera"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Rediger overvåkingskamera"
@@ -17279,12 +18374,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "butikk"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Kraftverk"
@@ -17336,172 +18521,291 @@ msgstr "vind"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "solcelle"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Kraftstasjon"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Rediger kraftstasjon"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Transformatorstasjon"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Rediger transformatorstasjon"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
-msgstr "Linjenummer"
+msgid "solar photovoltaic"
+msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "solar thermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Kraftmast"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Rediger kraftmast"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
+msgid "steam_turbine"
msgstr ""
-msgid "Pole"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
msgstr ""
-msgid "Edit Power Pole"
+msgid "stellarator"
msgstr ""
-msgid "Pole reference"
+msgid "nuclear fusion"
msgstr ""
-msgid "Power Line"
-msgstr "Kraftlinje"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Rediger kraftlinje"
+msgid "vertical_axis"
+msgstr ""
-msgid "Line type"
+msgid "Boiling Water Reactor 1 (BWR-1)"
msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgid "nuclear fission"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "Amount of Cables"
+msgid "Boiling Water Reactor 3 (BWR-3)"
msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
+msgid "Boiling Water Reactor 4 (BWR-4)"
msgstr ""
-msgid "single"
+msgid "Boiling Water Reactor 5 (BWR-5)"
msgstr ""
-msgid "double"
+msgid "Boiling Water Reactor 6 (BWR-6)"
msgstr ""
-msgid "triple"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
msgstr ""
-msgid "quad"
+msgid "China Pressurized Reactor (CPR-1000)"
msgstr ""
-msgid "Historic Places"
-msgstr "Historiske steder"
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
-msgid "Castle"
-msgstr "Slott"
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
-msgid "Edit Castle"
-msgstr "Rediger slott"
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
-msgid "Ruins"
-msgstr "Ruiner"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
-msgid "Edit Ruins"
-msgstr "Rediger ruiner"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Transformatorstasjon"
+
+msgid "Edit Power Sub Station"
+msgstr "Rediger transformatorstasjon"
+
+msgid "Line reference"
+msgstr "Linjenummer"
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "lav"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Kraftmast"
+
+msgid "Edit Power Tower"
+msgstr "Rediger kraftmast"
+
+msgid "Tower reference"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr "Kraftlinje"
+
+msgid "Edit Power Line"
+msgstr "Rediger kraftlinje"
+
+msgid "Line type"
+msgstr ""
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr ""
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+msgid "single"
+msgstr ""
+
+msgid "double"
+msgstr ""
+
+msgid "triple"
+msgstr ""
+
+msgid "quad"
+msgstr ""
+
+msgid "Historic Places"
+msgstr "Historiske steder"
+
+msgid "Castle"
+msgstr "Slott"
+
+msgid "Edit Castle"
+msgstr "Rediger slott"
+
+msgid "Ruins"
+msgstr "Ruiner"
+
+msgid "Edit Ruins"
+msgstr "Rediger ruiner"
msgid "Archaeological Site"
msgstr "Arkeologisk plass"
@@ -17575,11 +18879,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Rediger kiosk"
-msgid "Baker"
-msgstr "Baker"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Rediger baker"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Slakter"
@@ -17590,7 +18894,7 @@ msgstr "Rediger slakter"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17611,14 +18915,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Økologisk"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Økologisk"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17689,7 +18999,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17710,13 +19020,13 @@ msgstr "Rediger elektronikk"
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17725,9 +19035,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Rediger hifi"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Rediger video"
@@ -17753,6 +19062,12 @@ msgstr "Rediger vekslingssted"
msgid "Edit Automated Teller Machine"
msgstr "Rediger minibank"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17789,10 +19104,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "buddhist"
+
+msgid "christian"
+msgstr "kristen"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "jødisk"
+
+msgid "muslim"
+msgstr "muslim"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17822,7 +19158,7 @@ msgstr "Rediger jernvarehandel"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17834,19 +19170,19 @@ msgstr "Rediger møbler"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17867,6 +19203,12 @@ msgstr "Bokhandel"
msgid "Edit Book Store"
msgstr "Rediger bokhandel"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Reisebyrå"
@@ -17876,7 +19218,7 @@ msgstr "Rediger reisebyrå"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17957,6 +19299,9 @@ msgstr "leker"
msgid "vouchers"
msgstr "kuponger"
+msgid "Note"
+msgstr "Kommentar"
+
msgid "Geography"
msgstr "Geografi"
@@ -18086,6 +19431,12 @@ msgstr "Fjelltopp"
msgid "Edit Peak"
msgstr "Rediger fjelltopp"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Isbre"
@@ -18125,26 +19476,35 @@ msgstr "Tre"
msgid "Edit Tree"
msgstr "Rediger tre"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botanisk navn"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Skogsområde"
msgid "Edit Wood"
msgstr "Rediger skogsområde"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "barskog"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "løvskog"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "blandingsskog"
msgid "Forest"
msgstr "Skog"
@@ -18152,15 +19512,6 @@ msgstr "Skog"
msgid "Edit Forest Landuse"
msgstr "Rediger skog"
-msgid "coniferous"
-msgstr "barskog"
-
-msgid "deciduous"
-msgstr "løvskog"
-
-msgid "mixed"
-msgstr "blandingsskog"
-
msgid "Grassland"
msgstr ""
@@ -18236,6 +19587,12 @@ msgstr "Eng"
msgid "Edit Meadow Landuse"
msgstr "Rediger eng"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vingård"
@@ -18290,8 +19647,8 @@ msgstr "Friluftsområde"
msgid "Edit Recreation Ground Landuse"
msgstr "Rediger friluftsområde"
-msgid "Residential area"
-msgstr "Boligområde"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Rediger boligområde"
@@ -18302,6 +19659,9 @@ msgstr "Gravlund"
msgid "Edit Graveyard"
msgstr "Rediger gravlund"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Kirkegård"
@@ -18377,6 +19737,33 @@ msgstr "Rediger steinbrudd"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Rediger adresseinformasjon"
@@ -18395,30 +19782,6 @@ msgstr "By/sted"
msgid "Country code"
msgstr "Landskode"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "Interpoler adresser"
@@ -18437,6 +19800,18 @@ msgstr "partall"
msgid "alphabetic"
msgstr "alfabetisk"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18599,26 +19974,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "vei"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "ski"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "fotgjenger"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "tur"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "omkjøring"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Symbolforklaring"
@@ -18665,19 +20069,22 @@ msgstr "neste stoppunkt"
msgid "backward halt point"
msgstr "forrige stoppunkt"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18701,7 +20108,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18797,18 +20204,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "bro"
msgid "deprecated"
msgstr "avleggs"
+msgid "bicycle"
+msgstr "sykkel"
+
+msgid "foot"
+msgstr "fotgjenger"
+
msgid "horse"
msgstr "hest"
@@ -18818,20 +20234,23 @@ msgstr "hinder"
msgid "motorroad"
msgstr "motortrafikkvei"
-msgid "highway_track"
-msgstr "traktorvei"
+msgid "highway.track"
+msgstr ""
-msgid "services"
+msgid "livingdashed"
+msgstr ""
+
+msgid "services"
msgstr "service"
msgid "ford"
msgstr "vadested"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "redningsmøtepunkt"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "elvebredd"
@@ -18848,6 +20267,9 @@ msgstr "stryk"
msgid "railwaypoint"
msgstr "jernbanepunkt"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18863,29 +20285,29 @@ msgstr "nedlagt bane"
msgid "aeroway"
msgstr "luftfart"
-msgid "aeroway_dark"
-msgstr "luftfart, mørk"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "luftfart, lys"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "nedfart enkel"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "nedfart middels"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "nedfart avansert"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "nedfart ekspert"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "nedfart friløp"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "nedfart nybegynner"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "kraft"
@@ -18905,20 +20327,20 @@ msgstr "marina"
msgid "amenity"
msgstr "fasilitet"
-msgid "amenity_traffic"
-msgstr "fasilitet – trafikk"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "fasilitet – lys"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "små vannsteder"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "helse"
-msgid "shop"
-msgstr "butikk"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotell"
@@ -18983,9 +20405,6 @@ msgstr "beiteområde"
msgid "woodarea"
msgstr "skogsområde"
-msgid "mud"
-msgstr "søle"
-
msgid "beach"
msgstr "strand"
@@ -18995,11 +20414,14 @@ msgstr "rute"
msgid "boundary"
msgstr "grense"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "sted"
-msgid "tiger_data"
-msgstr "tiger-data"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "adresse"
@@ -19013,9 +20435,6 @@ msgstr "Sted/by"
msgid "One Way"
msgstr "Enveiskjøring"
-msgid "Church"
-msgstr "Kirke"
-
msgid "Fuel Station"
msgstr "Bensinstasjon"
@@ -19043,6 +20462,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19088,10 +20510,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19103,7 +20555,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19121,7 +20573,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19238,19 +20690,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:building without building"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:ref without ref"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19269,13 +20832,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19284,23 +20883,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19311,142 +20919,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Gater NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Tsjekkisk CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Tsjekkisk UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19462,13 +21119,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi, Italia"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicilia, Italia"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -19485,46 +21142,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -19545,89 +21205,149 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx IRS"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OSM Export"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "SUMO Export"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "Export"
msgstr ""
-msgid "2u"
-msgstr ""
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "Oppdater liste over Porter"
+
+msgid "Configure"
+msgstr "Konfigurer"
+
+msgid "Connection Error."
+msgstr "Feil i forbindelsen"
+
+msgid "configure the connected DG100"
+msgstr "konfigurer DG100 som er tilkoblet"
+
+msgid "delete data after import"
+msgstr "slett data etter import"
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19832,6 +21552,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19853,13 +21585,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20122,9 +21848,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Oppdaterer egenskaper på inntil {0} objekt"
@@ -20146,6 +21878,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20224,9 +21959,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20311,7 +22058,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20582,15 +22329,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20761,6 +22499,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20779,12 +22520,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20931,6 +22666,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20949,6 +22687,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Legg inn kilde ( source=...) på element?"
@@ -21031,48 +22772,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr ""
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21127,19 +22826,75 @@ msgstr "Legg til nytt lag"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Nullstill cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Be om ny cookie (Internett sesjon nedkobling)"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21167,7 +22922,10 @@ msgstr "WMS lag ({0}), {1} kartutsnitt er lastet"
msgid "Is not vectorized."
msgstr "Er ikke vektorisert"
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21220,7 +22978,7 @@ msgstr "Fjern valgte palett fra lista."
msgid "Color Schemes"
msgstr "Farge Palett"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21265,6 +23023,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21307,34 +23068,99 @@ msgid ""
"stderr contents:"
msgstr ""
-msgid "exttool:{0}"
+msgid "exttool:{0}"
+msgstr ""
+
+msgid "External Tool: {0}"
+msgstr ""
+
+msgid "Edit tool"
+msgstr ""
+
+msgid "Name:"
+msgstr ""
+
+msgid "CmdLine:"
+msgstr ""
+
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
msgstr ""
-msgid "External Tool: {0}"
+msgid "User {0} has left"
msgstr ""
-msgid "Edit tool"
+msgid "User {0} is mapping nearby"
msgstr ""
-msgid "Name:"
+msgid "Users mapping nearby:"
msgstr ""
-msgid "CmdLine:"
+msgid "Private chat"
msgstr ""
-msgid "External tools"
+msgid "Close tab"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Logout"
msgstr ""
-msgid "Are you sure?"
-msgstr "Er du sikker?"
-
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21376,27 +23202,9 @@ msgstr "Slå av Data logg hvis avstand er mindre enn"
msgid "Unknown logFormat"
msgstr "Ukjent Logg format"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "Oppdater liste over Porter"
-
-msgid "Configure"
-msgstr "Konfigurer"
-
msgid "Configure Device"
msgstr "Konfigurer enhet"
-msgid "Connection Error."
-msgstr "Feil i forbindelsen"
-
-msgid "configure the connected DG100"
-msgstr "konfigurer DG100 som er tilkoblet"
-
-msgid "delete data after import"
-msgstr "slett data etter import"
-
msgid "Importing data from device."
msgstr "Importerer data fra enhet"
@@ -21795,6 +23603,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22042,12 +23853,6 @@ msgstr "Importerte bilder"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Bildefiler (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Åpne bilder med ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Last inn bildesett som et nyt lag."
-
msgid "Import vector graphics"
msgstr ""
@@ -22057,16 +23862,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22439,9 +24241,6 @@ msgstr "Auto-sentrer"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Sentrer LiveGPS-laget løpende til den nåværende posisjon."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -22496,9 +24295,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22540,26 +24356,26 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "En av de valgte linjene er allerede del av en annen multipolygon."
+msgid "Enforce meta data"
+msgstr ""
msgid "About Plugin"
msgstr ""
@@ -22695,9 +24511,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22722,12 +24535,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22876,6 +24698,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22892,6 +24717,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23130,13 +24966,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "En feil oppstod: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Kunne ikke oprette ny feilrapport. Resultat: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr "Header inneholder flere verdier og kan ikke kobles til enkelt streng"
-
msgid "Process queue"
msgstr ""
@@ -23193,18 +25022,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "Ny feilrapport"
-
-msgid "Create issue"
-msgstr "Oprett feilrapport"
-
-msgid "Describe the problem precisely"
-msgstr "Beskriv problemet nøyaktig"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23263,6 +25080,9 @@ msgstr "Firefox-programfil"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23470,9 +25290,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23552,7 +25369,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23706,6 +25541,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23727,6 +25565,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24020,9 +25861,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24091,9 +25929,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24220,9 +26055,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24244,6 +26076,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24276,15 +26111,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Endre egenskaper"
+
msgid "Country preset:"
msgstr ""
@@ -24294,6 +26145,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24396,9 +26250,6 @@ msgstr "Innstillinger for Ruteplanlegger"
msgid "Configure routing preferences."
msgstr "Oppsett for Ruteplanlegger"
-msgid "Highway type"
-msgstr "Type ferdselsvei"
-
msgid "Speed (Km/h)"
msgstr "Fart (km/t)"
@@ -24514,6 +26365,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24574,19 +26428,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24728,6 +26582,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24803,6 +26660,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24818,9 +26764,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24842,6 +26785,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24994,9 +26940,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25624,7 +27567,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25632,10 +27578,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25644,18 +27587,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25698,15 +27629,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25828,18 +27750,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26017,9 +27927,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -26146,7 +28053,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -26166,9 +28073,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26301,9 +28205,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 03c663e..2a34254 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:51+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:52+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr "Löschen"
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2604,8 +2700,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2709,6 +2805,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2769,8 +2868,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2800,10 +2899,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2824,6 +2923,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2854,18 +2956,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2874,8 +2976,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2883,13 +2985,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2903,8 +3003,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2934,11 +3034,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3091,8 +3190,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3199,7 +3297,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3218,6 +3316,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3234,9 +3335,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3275,6 +3373,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3299,6 +3400,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3358,13 +3468,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3434,6 +3544,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3503,6 +3631,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3560,13 +3694,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3598,10 +3732,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3735,7 +3869,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3810,6 +3944,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3840,9 +3977,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3867,10 +4001,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3933,23 +4067,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4053,7 +4170,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4249,9 +4366,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4267,10 +4399,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4279,6 +4423,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4338,6 +4485,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4365,19 +4515,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4665,29 +4802,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4702,7 +4857,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4754,14 +4909,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5011,14 +5158,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5539,6 +5686,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5622,6 +5772,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5643,9 +5820,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5670,32 +5844,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5715,8 +5889,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5742,9 +5915,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5889,9 +6059,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6176,8 +6343,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6242,34 +6409,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6284,13 +6463,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6369,12 +6548,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6404,9 +6577,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6444,7 +6623,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6504,6 +6683,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6759,6 +6941,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6824,9 +7025,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6893,20 +7091,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6917,23 +7102,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7030,7 +7201,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7129,6 +7300,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7216,7 +7390,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7235,6 +7409,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7301,8 +7481,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7377,8 +7556,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7392,8 +7571,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7608,12 +7786,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7622,6 +7794,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7637,6 +7825,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7644,8 +7847,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7757,9 +7960,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7769,6 +7969,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7785,7 +7988,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7931,7 +8134,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7961,7 +8164,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8075,6 +8278,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8112,6 +8318,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8308,9 +8517,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8329,6 +8535,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8386,6 +8595,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8452,9 +8667,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8467,7 +8679,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8494,12 +8709,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8628,14 +8847,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8650,7 +8865,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8660,8 +8875,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8881,7 +9095,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8947,6 +9161,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9004,9 +9224,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9253,6 +9470,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9381,6 +9601,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9423,6 +9649,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9473,19 +9702,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9503,40 +9723,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9560,6 +9789,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9616,6 +9878,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9669,6 +9934,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9950,7 +10220,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10119,6 +10395,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10182,7 +10464,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10440,40 +10722,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10526,8 +10808,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10536,20 +10818,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10631,14 +10918,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10682,31 +10963,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10715,6 +11001,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10730,57 +11019,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10798,6 +11089,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10827,6 +11126,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10857,7 +11199,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10897,28 +11239,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11013,6 +11353,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11028,12 +11371,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11112,7 +11463,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11211,35 +11562,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11249,8 +11576,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11277,10 +11604,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11291,9 +11615,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11315,6 +11636,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11364,8 +11688,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11508,6 +11832,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11526,6 +11853,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11550,16 +11886,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11571,6 +11910,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11585,6 +11932,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11615,19 +11971,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11649,11 +12005,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11723,13 +12091,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11872,10 +12240,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11890,22 +12258,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11974,8 +12341,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11990,9 +12356,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12314,17 +12695,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12335,9 +12710,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12369,9 +12787,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12694,6 +13126,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12773,6 +13210,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12874,9 +13315,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12932,6 +13370,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12956,9 +13397,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12984,9 +13422,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13023,6 +13458,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13069,9 +13509,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13156,6 +13593,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13246,6 +13686,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13264,10 +13748,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13279,6 +13763,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13306,18 +13793,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13327,9 +13808,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13339,13 +13817,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13393,6 +13871,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13477,6 +13958,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13581,21 +14065,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13611,10 +14104,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13650,7 +14143,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13719,12 +14212,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13740,15 +14239,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13770,6 +14260,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13779,6 +14278,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13788,10 +14290,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13824,9 +14323,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13860,19 +14356,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13884,6 +14404,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13905,55 +14428,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13974,12 +14541,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14037,6 +14619,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14046,6 +14631,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14085,9 +14676,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14121,6 +14709,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Land"
@@ -14202,18 +14805,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14286,7 +14894,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14310,10 +14921,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14325,9 +14939,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14370,18 +14981,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14481,11 +15130,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14497,11 +15144,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14520,10 +15165,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14553,9 +15198,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14571,19 +15213,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14733,6 +15391,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14754,6 +15415,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14781,6 +15448,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14805,22 +15478,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14842,9 +15499,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14908,7 +15562,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15039,6 +15693,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15069,6 +15726,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15081,9 +15741,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15093,9 +15750,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15108,6 +15770,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15132,14 +15797,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15188,7 +15845,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15242,41 +15899,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15462,6 +16119,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15483,9 +16146,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15498,6 +16167,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15537,6 +16209,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15558,22 +16233,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15597,9 +16284,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15624,7 +16308,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15697,52 +16390,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15757,6 +16444,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15769,6 +16462,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15784,37 +16480,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15904,6 +16703,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Sundheit"
@@ -15913,6 +16718,12 @@ msgstr "Krankenhuus"
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Dokter"
@@ -15979,12 +16790,66 @@ msgstr "Tierarz"
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15994,6 +16859,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16003,31 +16892,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16055,7 +16950,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16082,27 +16977,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16137,12 +17020,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16152,10 +17038,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16183,6 +17069,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16220,117 +17109,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16364,33 +17289,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16424,6 +17359,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16436,7 +17387,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16499,36 +17475,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16571,19 +17565,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16722,6 +17712,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16734,60 +17736,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16803,9 +17879,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17015,41 +18088,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17058,7 +18157,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17070,12 +18169,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17127,88 +18316,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17220,6 +18512,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17235,6 +18542,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17253,11 +18563,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17366,10 +18674,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17381,7 +18689,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17402,13 +18710,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17480,7 +18794,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17501,13 +18815,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17516,7 +18830,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17544,6 +18857,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17580,40 +18899,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17625,19 +18965,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17658,6 +18998,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17667,7 +19013,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17748,6 +19094,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17877,6 +19226,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17916,24 +19271,33 @@ msgstr "Boom"
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Holt"
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17943,15 +19307,6 @@ msgstr "Woold"
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18027,6 +19382,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18081,7 +19442,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18093,6 +19454,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18168,46 +19532,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18228,6 +19595,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18390,27 +19769,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18456,19 +19864,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18492,7 +19903,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18588,18 +19999,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18609,7 +20029,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18618,10 +20041,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18639,6 +20062,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18654,28 +20080,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18696,19 +20122,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18774,9 +20200,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18786,10 +20209,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18804,9 +20230,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18834,6 +20257,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18879,10 +20305,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18894,7 +20350,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18912,7 +20368,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19029,19 +20485,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19060,13 +20627,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19075,19 +20678,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19102,142 +20714,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19276,148 +20937,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19621,6 +21345,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19642,13 +21378,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19911,9 +21641,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19935,6 +21671,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20013,9 +21752,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20100,7 +21851,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20371,15 +22122,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20550,6 +22292,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20568,12 +22313,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20709,6 +22448,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20726,6 +22468,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20806,113 +22551,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20938,7 +22697,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20988,7 +22750,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21033,6 +22795,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21090,19 +22855,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21144,27 +22974,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21560,6 +23372,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21807,12 +23622,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21822,16 +23631,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22194,9 +24000,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22251,9 +24054,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22295,25 +24115,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22450,9 +24270,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22477,12 +24294,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22631,6 +24457,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22647,6 +24476,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22880,13 +24720,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22939,18 +24772,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23008,6 +24829,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23215,9 +25039,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23297,7 +25118,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23451,6 +25290,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23472,6 +25314,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23765,9 +25610,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23836,9 +25678,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23965,9 +25804,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23989,6 +25825,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24021,15 +25860,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24039,6 +25894,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24141,9 +25999,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24259,6 +26114,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24319,19 +26177,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24469,6 +26327,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24544,6 +26405,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24559,9 +26509,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24583,6 +26530,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24735,9 +26685,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25363,7 +27310,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25371,10 +27321,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25383,18 +27330,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25437,15 +27372,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25567,18 +27493,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25756,9 +27670,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25885,7 +27796,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25905,9 +27816,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26040,9 +27948,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index 310d6a4..034edfd 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-04-02 15:25+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-14 14:04+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: 2013-04-05 04:38+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:39+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Openen van koppeling niet ondersteund op het huidige platform (\"{0}\")"
+msgid "ERROR: {0}"
+msgstr "FOUT: {0}"
+
+msgid "WARNING: {0}"
+msgstr "WAARSCHUWING: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUGGEN: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Platform-opstarthook uitvoeren"
@@ -156,20 +171,19 @@ msgid "About JOSM..."
msgstr "Over JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WAARSCHUWING: onverwachte indeling van API basis-URL. Doorsturen naar de "
-"informatie- of geschiedenispagina voor een OSM-object zal waarschijnlijk "
-"mislukken. API basis-URL is: ''{0}''"
+"Onverwachte indeling van de API basis-URL. Doorsturen naar pagina voor "
+"informatie of geschiedenis zal waarschijnlijk mislukken. API basis-URL is: "
+"''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"WAARSCHUWING: onverwachte indeling van API basis-URL. Doorsturen naar "
-"gebruikerspagina voor OSM-gebruiker zal waarschijnlijk mislukken. API basis-"
-"URL is: ''{0}''"
+"Onverwachte indeling van de API basis-URL. Doorsturen naar gebruikerspagina "
+"voor OSM-gebruiker zal waarschijnlijk mislukken. API basis-URL is: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -215,6 +229,9 @@ msgstr "Geen doellagen"
msgid "Add imagery layer {0}"
msgstr "Afbeeldingslaag {0} toevoegen"
+msgid "Select image format for WMS layer"
+msgstr "Kies een afbeelding voor de WMS laag"
+
msgid "Select WMS layers"
msgstr "WMS-lagen selecteren"
@@ -256,9 +273,6 @@ msgstr "Gereedschap: {0}"
msgid "Please select at least four nodes."
msgstr "Selecteer ten minste vier knopen."
-msgid "Information"
-msgstr "Informatie"
-
msgid "Align Nodes in Line"
msgstr "Knopen uitlijnen"
@@ -283,6 +297,9 @@ msgstr "conflict"
msgid "download"
msgstr "downloaden"
+msgid "problem"
+msgstr "probleem"
+
msgid "previous"
msgstr "vorige"
@@ -292,6 +309,9 @@ msgstr "volgende"
msgid "Nothing selected to zoom to."
msgstr "Geen selectie om op in te zoomen."
+msgid "Information"
+msgstr "Informatie"
+
msgid "Zoom to {0}"
msgstr "Inzoomen op {0}"
@@ -349,11 +369,11 @@ msgstr ""
"er enkele van omkeren?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Deze wegen kunnen niet gecombineerd worden (Ze kunnen niet worden "
-"samengevoegd tot een enkele reeks knopen)"
+"Kon wegen niet combineren<br>(Zij konden niet worden samengevoegd tot één "
+"enkele reeks van knopen)"
msgid "Combine {0} ways"
msgstr "{0} wegen combineren"
@@ -371,7 +391,7 @@ msgid "Please select something to copy."
msgstr "Selecteer iets om te kopiëren"
msgid "Copy Coordinates"
-msgstr "Coördinaten kopiëren"
+msgstr "Coördinaten kopiëren"
msgid "Copy coordinates of selected nodes to clipboard."
msgstr ""
@@ -411,18 +431,37 @@ msgstr "Verwijderen"
msgid "Delete selected objects."
msgstr "Geselecteerde objecten verwijderen."
+msgid "Toggle dialogs panel"
+msgstr "paneel Schakelvensters"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "paneel Schakelvensters , kaartweergave maximaliseren"
+
msgid "Distribute Nodes"
msgstr "Knopen gelijkmatig verdelen"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Verdeel de geselecteerde knopen op gelijke afstanden langs een lijn."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "{0} nodes zonder coordinaten worden genegeerd"
+
msgid "Download from OSM..."
msgstr "Downloaden vanuit OSM..."
msgid "Download map data from the OSM server."
msgstr "Kaartgegevens downloaden van de server van OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Deze actie vereist {0} individuele<br>verzoeken om te downloaden. Wilt "
+"u<br>doorgaan?</html>"
+
+msgid "Download data"
+msgstr "Ophalen gegevens"
+
msgid "Download object..."
msgstr "Object downloaden..."
@@ -463,7 +502,7 @@ msgid "Ok"
msgstr "OK"
msgid "Download parent ways/relations..."
-msgstr "Downloaden bovenliggende wegen/relaties..."
+msgstr "Downloaden ouderwegen/relaties..."
msgid "Download objects referring to one of the selected objects"
msgstr ""
@@ -525,6 +564,9 @@ msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
"Toon informatie over de geschiedenis van wegen, knopen of relaties in OSM."
+msgid "Show history"
+msgstr "Geschiedenis tonen"
+
msgid "History (web)"
msgstr "Geschiedenis (web)"
@@ -538,10 +580,10 @@ msgid "New offset"
msgstr "Nieuwe verschuiving"
msgid "Adjust the position of this imagery layer"
-msgstr "De positie van deze achtergrondafbeelding/luchtfoto aanpassen"
+msgstr "De positie van deze afbeeldingslaag aanpassen"
msgid "Adjust imagery offset"
-msgstr "Verschuiving van deze achtergrondafbeelding/luchtfoto aanpassen"
+msgstr "Verschuiving van deze afbeeldingslaag aanpassen"
msgid "OK"
msgstr "OK"
@@ -552,8 +594,8 @@ msgid ""
"You can also enter east and north offset in the {0} coordinates.\n"
"If you want to save the offset as bookmark, enter the bookmark name below"
msgstr ""
-"Gebruik de pijltjestoetsen of sleep de achtergrondafbeelding/luchtfoto met "
-"de muis om de verschuiving aan te passen.\n"
+"Gebruik de pijltjestoetsen of sleep de afbeeldingslaag met de muis om de "
+"verschuiving aan te passen.\n"
"U kunt ook de oostelijke en noordelijke verschuiving in de {0} coördinaten "
"opgeven.\n"
"Als u de verschuiving wilt opslaan als een bladwijzer, voer dan hieronder "
@@ -654,11 +696,11 @@ msgid "Joined overlapping areas"
msgstr "Overlappende gebieden samengevoegd"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Enkele wegen waren deel van relaties die zijn aangepast. Controleer of er "
-"geen fouten werden geïntroduceerd."
+"Sommige wegen maakten deel uit van relaties die zijn "
+"aangepast.<br>Controleer of er geen fouten werden geïntroduceerd."
msgid "Fix tag conflicts"
msgstr "Los tagconflicten op"
@@ -829,11 +871,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Knopen met de oudste samenvoegen."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Selecteer ten minste twee knopen om samen te voegen of een knoop die dicht "
-"bij een andere knoop ligt."
+"Selecteer tenminste twee knopen om samen te voegen of één knoop die dicht "
+"bij een andere ligt."
msgid "Abort Merging"
msgstr "Stop samenvoegen"
@@ -935,7 +977,7 @@ msgstr[0] ""
"Kan {0} bestand niet openen met toepassing voor importeren van bestanden "
"''{1}''."
msgstr[1] ""
-"Kan {0} bestanden niet openen met toepassing voor importeren van bestanden "
+"Kan {0} bestanden niet openen met programma voor importeren van bestanden "
"''{1}''."
msgid ""
@@ -946,13 +988,13 @@ msgid_plural ""
"importer is available."
msgstr[0] ""
"Kan {0} bestand niet openen, omdat het bestand niet bestaat of er is geen "
-"geschikte bestandsimporteerder beschikbaar."
+"geschikt programma voor het importeren van het bestand beschikbaar."
msgstr[1] ""
"Kan {0} bestanden niet openen, omdat de bestanden niet bestaan of er zijn "
-"geen geschikte bestandsimporteerders beschikbaar."
+"geen geschikte programma''s voor het importeren van het bestand beschikbaar."
msgid "no importer"
-msgstr "geen importeerprogramma"
+msgstr "geen programma voor importeren"
msgid "does not exist"
msgstr "bestaat niet"
@@ -1005,11 +1047,11 @@ msgid "Download Data"
msgstr "Download gegevens"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Kan URL ''{0}'' niet openen omdat er geen toepasselijke downloadtaak "
-"beschikbaar is.</html>"
+"Kan URL ''{0}'' niet openen<br>De volgende taken voor downloaden accepteren "
+"de weergegeven patronen voor de URL:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1042,16 +1084,11 @@ msgid "Orthogonalize / Undo"
msgstr "Loodrecht maken / Ongedaan maken"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Vorm loodrecht maken / Ongedaan maken\n"
-"Selecteer knopen die tijdens de vorige actie Loodrecht maken werden "
-"verplaatst!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Ongedaan maken Vorm loodrecht maken"
+"Vorm loodrecht maken / Ongedaan maken<br>Selecteer knopen die werden "
+"verplaatst door de vorige actie Vorm loodrecht maken!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1071,9 +1108,6 @@ msgstr "Loodrecht maken"
msgid "Usage"
msgstr "Gebruik"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Geselecteerde elementen kunnen niet loodrecht worden gemaakt."
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1194,6 +1228,15 @@ msgstr "Ook het bestand hernoemen"
msgid "Could not rename file ''{0}''"
msgstr "Kon bestand ''{0}'' niet hernoemen"
+msgid "Restart"
+msgstr "Opnieuw starten"
+
+msgid "Restart the application."
+msgstr "Start de toepassing opnieuw"
+
+msgid "Click to restart later."
+msgstr "Klik hier om later opnieuw te starten."
+
msgid "Reverse way"
msgstr "Weg omkeren"
@@ -1222,7 +1265,7 @@ msgid "No Exporter found! Nothing saved."
msgstr "Geen toepassing voor exporteren gevonden! Niets opgeslagen."
msgid "File exists. Overwrite?"
-msgstr "Bestand bestaat. Overschrijven?"
+msgstr "Het bestand bestaat reeds. Overschrijven?"
msgid "Save As..."
msgstr "Opslaan als..."
@@ -1246,9 +1289,6 @@ msgstr "Sessie laden"
msgid "Load a session from file."
msgstr "Een sessie uit een bestand laden."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Sessiebestand (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Sessie openen"
@@ -1314,6 +1354,9 @@ msgstr "Statusrapport"
msgid "Copy to clipboard and close"
msgstr "Naar klembord kopiëren en sluiten"
+msgid "Report bug"
+msgstr "Probleem rapporteren"
+
msgid "Close"
msgstr "Sluiten"
@@ -1399,18 +1442,18 @@ msgstr ""
"selecteer knopen in het midden van de weg.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Een lid met een op een rol gebaseerde relatie is gekopieerd naar alle "
-"nieuwe wegen.<br>U zou dit moeten nakijken en indien nodig corrigeren.</html>"
+"Een op een rol gebaseerd lid van de relatie werd gekopieerd naar alle nieuwe "
+"wegen.<br>U zou dit moeten verifiëren en corrigeren indien nodig."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>En lid van een relatie waarvan is gekopieerd naar alle nieuwe "
-"wegen.<br>U zou dit moeten nakijken en indien nodig corrigeren.</html>"
+"Een lid van de relatie werd gekopieerd naar alle nieuwe wegen.<br>U zou dit "
+"moeten verifiëren en corrigeren indien nodig."
msgid "Split way {0} into {1} parts"
msgstr "Weg {0} in {1} delen splitsen"
@@ -1514,6 +1557,31 @@ msgstr ""
"veroorzaken, omdat je niet het echte object ziet.<br>Wil je het echt "
"losmaken?"
+msgid "Disconnect Node from Way"
+msgstr "Ontkoppel knoop van weg"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Ontkoppel knopen van wegen waartoe zij momenteel behoren"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Selecteer tenminste één knoop die moet worden ontkoppelt."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Geselecteerde knoop kan nergens van worden ontkoppelt."
+msgstr[1] "Geselecteerde knopen kunnen nergens van worden ontkoppelt."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+"De betrokken weg zou verdwijnen na het ontkoppelen van de geselecteerde "
+"knoop."
+msgstr[1] ""
+"De betrokken wegen zouden verdwijnen na het ontkoppelen van de geselecteerde "
+"knopen"
+
msgid "Undo"
msgstr "Ongedaan maken"
@@ -1538,11 +1606,8 @@ msgstr "Gegevens bijwerken"
msgid "Updates the objects in the active data layer from the server."
msgstr "Werkt de objecten in de actieve gegevenslaag bij vanaf de server."
-msgid "Download data"
-msgstr "Ophalen gegevens"
-
msgid "Update modified"
-msgstr "Gewijzigde bijwerken"
+msgstr "Wijzigingen bijwerken"
msgid ""
"Updates the currently modified objects from the server (re-downloads data)"
@@ -1755,6 +1820,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Langzaam vooruit"
+msgid "Download GPS"
+msgstr "GPS downloaden"
+
msgid "Downloading GPS data"
msgstr "GPS-gegevens worden gedownload"
@@ -1764,13 +1832,24 @@ msgstr "Gedownloade GPX-gegevens"
msgid "Markers from {0}"
msgstr "Markeringen van {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Gecomprimeerde wijziging van OSM downloaden"
+
+msgid "Download OSM Change"
+msgstr "Wjziging van OSM downloaden"
+
+msgid "Download Compressed OSM"
+msgstr "Gecomprimeerde OSM downloaden"
+
+msgid "Download OSM"
+msgstr "OSM downloaden"
+
msgid "Downloading data"
msgstr "Gegevens worden gedownload"
msgid ""
"Ignoring exception because download has been canceled. Exception was: {0}"
-msgstr ""
-"Uitzondering negeren omdat downloaden is geannuleerd. Uitzondering was: {0}"
+msgstr "Exceptie negeren omdat downloaden is geannuleerd. Exceptie was: {0}"
msgid "No data found in this area."
msgstr "Geen gegevens in dit gebied gevonden."
@@ -1782,7 +1861,32 @@ msgid "Command"
msgstr "Opdracht"
msgid "Request details: {0}"
-msgstr "Details verzoek: {0}"
+msgstr "Details van verzoek: {0}"
+
+msgid "Download OSM URL"
+msgstr "URL van OSM downloaden"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Er was {0} conflict tijdens het importeren."
+msgstr[1] "Er waren {0} conflicten tijdens het importeren."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflict tijdens het downloaden"
+msgstr[1] "Conflicten tijdens het downloaden"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Laden van ouders van knoop {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Laden van ouders van weg {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Laden van ouders van relatie {2}"
+
+msgid "Download session"
+msgstr "Sessie downloaden"
msgid "Download {0} of {1} ({2} left)"
msgstr "Downloaden {0} van {1} ({2} te gaan)"
@@ -1848,25 +1952,6 @@ msgstr "De volgende fouten traden op gedurende bulk downloaden: {0}"
msgid "Errors during download"
msgstr "Fouten tijdens downloaden"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Er was {0} conflict tijdens het importeren."
-msgstr[1] "Er waren {0} conflicten tijdens het importeren."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflict tijdens het downloaden"
-msgstr[1] "Conflicten tijdens het downloaden"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Laden van ouders van knoop {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Laden van ouders van weg {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Laden van ouders van relatie {2}"
-
msgid "Error during download"
msgstr "Fout tijdens het downloaden"
@@ -2017,6 +2102,9 @@ msgstr "Weg nauwkeurigheid verbeteren"
msgid "Improve Way Accuracy mode"
msgstr "modus Weg nauwkeurigheid verbeteren"
+msgid "improve way accuracy helper line"
+msgstr "hulplijn voor nauwkeurigheid weg verbeteren"
+
msgid "Click on the way to start improving its shape."
msgstr "Klik op de weg om te beginnen om de vorm ervan te verbeteren."
@@ -2047,10 +2135,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Kan geen knoop buiten de wereld plaatsen."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Voeg een nieuwe knoop toe aan weg"
-msgstr[1] "Voeg een nieuwe knoop toe aan {0} wegen"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Voeg een nieuwe knoop aan weg toe"
+msgstr[1] "Voeg een nieuwe knoop aan {0} wegen toe"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr ""
@@ -2065,6 +2153,9 @@ msgstr "Parallel"
msgid "Make parallel copies of ways"
msgstr "Maak parallelle kopieën van wegen"
+msgid "make parallel helper line"
+msgstr "maak een parallelle hulplijn"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2373,7 +2464,7 @@ msgstr ""
"<b>relation</b>)"
msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>... - objecten verander door gebruiker"
+msgstr "<b>user:</b>... - objecten veranderd door gebruiker"
msgid "<b>user:anonymous</b> - objects changed by anonymous users"
msgstr "<b>user:anonymous</b>\t- objecten veranderd door anonieme gebruikers"
@@ -2399,8 +2490,9 @@ msgid ""
"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
msgstr ""
-"<b>nodes:</b>... - objecten met opegeven aantal knopen (<b>nodes:</b>aantal, "
-"<b>nodes:</b>min-max, <b>nodes:</b>min- of <b>nodes:</b>-max)"
+"<b>nodes:</b>... - objecten met opgegeven aantal knopen "
+"(<b>nodes:</b>aantal, <b>nodes:</b>min-max, <b>nodes:</b>min- of "
+"<b>nodes:</b>-max)"
msgid ""
"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
@@ -2529,6 +2621,10 @@ msgstr "''value'' in elke sleutel"
msgid "matches if ''key'' exists"
msgstr "komt overeen als ''key'' bestaat"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+"komt overeen als ''key'' groter is dan ''value'' (vergelijkbaar, kleiner dan)"
+
msgid "combinators"
msgstr "combinatoren"
@@ -2703,14 +2799,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Verwachtte <i>min</i>/<i>max</i> na ''tijdstempel''"
-msgid "Primitive id expected"
-msgstr "ID van basistype werd verwacht"
+msgid "Range of primitive ids expected"
+msgstr "Bereik van ID''s voor primitieven verwacht"
-msgid "Changeset id expected"
-msgstr "ID van wijzigingenset werd verwacht"
+msgid "Range of changeset ids expected"
+msgstr "Bereik van ID''s voor wijzigingen verwacht"
-msgid "Version expected"
-msgstr "Versie werd verwacht"
+msgid "Range of versions expected"
+msgstr "Bereik van versies verwacht"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2721,6 +2817,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Onbekende primitief: {0}. Toegestane waarden zijn knoop, weg of relatie"
+msgid "Primitive id expected"
+msgstr "ID van basistype werd verwacht"
+
msgid "Range of numbers expected"
msgstr "Een bereik van getallen werd verwacht"
@@ -2739,11 +2838,9 @@ msgstr "Ontbrekende parameter voor XOR"
msgid "Missing operator for NOT"
msgstr "Operator voor NIET ontbreekt"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Waarschuwing: automatisch afbreken van waarde van tag \"{0}\" van verwijderd "
-"object {1}"
+"Breek automatisch de waarde van de tag ''{0}'' af voor verwijderde object {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2838,6 +2935,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "{0} object toegevoegd"
msgstr[1] "{0} objecten toegevoegd"
+msgid "New way {0} has 0 nodes"
+msgstr "Nieuwe weg {0} heeft 0 knopens"
+
msgid "Change node {0}"
msgstr "Knoop {0} wijzigen"
@@ -2874,11 +2974,11 @@ msgstr "Verwijder \"{0}\" voor {1} objecten"
msgid "Set {0}={1} for {2} objects"
msgstr "Stel {0}={1} in voor {2} objecten"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Verwijderde {0} eigenschappen voor {1} objecten"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "{0} tags verwijderd voor {1} objecten"
-msgid "Set {0} properties for {1} objects"
-msgstr "Stelde {0} eigenschappen voor {1} objecten in"
+msgid "Set {0} tags for {1} objects"
+msgstr "{0} tags ingesteld vofor {1} objecten"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Vervang \"{0}\" door \"{1}\" voor"
@@ -2903,11 +3003,11 @@ msgid "Double conflict"
msgstr "Dubbel conflict"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Waarschuwing: Laag ''{0}'' bestaat niet meer. Kan het conflict voor object "
-"''{1}'' niet verwijderen."
+"Laag ''{0}'' bestaat niet meer. Kan geen conflict verwijderen voor object "
+"''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Conflict toevoegen voor \"{0}\""
@@ -3023,6 +3123,9 @@ msgstr[1] "{0} objecten afgevoerd"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Los conflicten op in ledenlijst van relatie {0}"
+msgid "Removed nodes from {0}"
+msgstr "Verwijderde knopen van {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Roteer {0} knoop"
@@ -3079,22 +3182,21 @@ msgid_plural ""
msgstr[0] ""
"<html>U gaat de weg ''{0}'' omkeren,<br/> terwijl de semantische betekenis "
"van de tag ''{1}'' is gedefinieerd door zijn richting.<br/>Wilt u werkelijk "
-"de richting van de weg veranderen en dus de semnatische betekenis?</html>"
+"de richting van de weg veranderen en dus de semantische betekenis?</html>"
msgstr[1] ""
"<html>U gaat de weg ''{0}'' omkeren,<br/> terwijl de semantische betekenis "
"van de tags wordt gedefinieerd door zijn richting:<br/>{1} Wilt u werkelijk "
-"de richting van de weg veranderen en dus de semnatische betekenis?</html>"
+"de richting van de weg veranderen en dus de semantische betekenis?</html>"
msgid "Reverse directional way."
msgstr "Omkeren wegrichting"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Bij het omkeren van de rijrichting worden de volgende wijzigingen in "
-"eigenschappen van de weg en zijn knopen voorgesteld om de gegevens "
-"consistent te houden."
+"Bij het omdraaien van deze weg worden de volgende wijzigingen voorgesteld om "
+"consistentie in de gegevens te behouden."
msgid "Relation"
msgstr "Relatie"
@@ -3123,11 +3225,11 @@ msgstr "Geselecteerde wijzigingen toepassen"
msgid "Do not apply changes"
msgstr "Wijzigingen niet toepassen"
-msgid "Please select which property changes you want to apply."
-msgstr "Selecteer welke wijzigingen in eigenschappen u wilt toepassen."
+msgid "Please select which changes you want to apply."
+msgstr "Selecteer welke wijzigingen u wilt toepassen."
-msgid "Properties of "
-msgstr "Eigenschappen van "
+msgid "Tags of "
+msgstr "Tags van "
msgid "Roles in relations referring to"
msgstr "Rollen in relaties verwijzen naar"
@@ -3153,6 +3255,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Het voormalige back-upbestand {0} kan niet worden verwijderd"
+msgid "Your work has been saved automatically."
+msgstr "Uw werk is automatisch opgeslagen."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Fout bij het aanmaken van een back-up van de verwijderde laag; {0}"
@@ -3187,22 +3292,21 @@ msgstr ""
"bekend.<br/> Activeer alstublieft de overeenkomende functie handmatig en "
"probeer opnieuw te importeren."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Waarschuwing: Maken van ontbrekende cachemap: {0} mislukt"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Maken van ontbrekende cache-map: {0} mislukt"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Maken van ontbrekende cachemap: {0} mislukt</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
-"Waarschuwing: Niet mogelijk om de voorkeuren te behouden voor ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Behouden van voorkeuren voor ''{0}'' mislukt"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Waarschuwing: Niet mogelijk om de voorkeuren te initialiseren. Map voor "
-"voorkeuren ''{0}'' is geen map."
+"Initialiseren van voorkeuren mislukt. Map voor voorkeuren ''{0}'' is geen "
+"map."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3212,11 +3316,11 @@ msgstr ""
"voorkeuren ''{0}'' is geen map.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Waarschuwing: Niet mogelijk om de voorkeuren te initialiseren. Niet mogelijk "
-"om de ontbrekende map voor voorkeuren: {0} te maken"
+"Initialiseren van voorkeuren mislukt. Maken van ontbrekende map voor "
+"voorkeuren {0} mislukt."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3225,18 +3329,16 @@ msgstr ""
"<html>Het was niet mogelijk om de voorkeuren te initialiseren<br>Niet "
"mogelijk om de ontbrekende map voor voorkeuren: {0} te maken.</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Info: Ontbrekend bestand voor voorkeuren ''{0}''. Er wordt standaard bestand "
-"voor voorkeuren aangemaakt."
+"Ontbrekend bestand voor voorkeuren ''{0}''. Maken van een standaard bestand "
+"voor voorkeuren."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Waarschuwing: Het bestaande bestand voor voorkeuren \"{0}\" zal worden "
-"vervangen door een standaard ebstand voor voorkeuren."
+"Vervangen van bestaand bestand voor voorkeuren ''{0}'' door standaard "
+"bestand voor voorkeuren."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3254,11 +3356,11 @@ msgstr ""
"voor voorkeuren wordt aangemaakt.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Waarschuwing: Niet mogelijk om de voorkeuren te initialiseren. Niet mogelijk "
-"om bestand met voorkeuren te herstellen naar standaard : {0}"
+"Initialiseren van voorkeuren mislukt. Herstellen van bestand voor voorkeuren "
+"naar standaard: {0} mislukt"
msgid "Paint style {0}: {1}"
msgstr "Tekenstijl {0}: {1}"
@@ -3289,14 +3391,12 @@ msgstr "Resource ''{0}'' kon niet worden geladen, fout is {1}."
msgid "UNKNOWN"
msgstr "ONBEKEND"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Waarschuwing: onverwacht versienummer voor JOSM in revisiebestand, waarde is "
-"''{0}''"
+"Onverwacht versienummer voor JOSM in revisie-bestand, waarde is ''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Waarschuwing: het revisiebestand ''/REVISION'' ontbreekt."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Het revisie-bestand ''/REVISION'' ontbreekt."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Er werd al een conflict geregistreerd voor primitief ''{0}''."
@@ -3347,7 +3447,7 @@ msgid ""
"{0}"
msgstr ""
"Kan geen wijzigingenset-Id > 0 aan een nieuw primitief toewijzen. De waarde "
-"van wijzigingenset-Id is {0}"
+"van wijzigingenset-ID is {0}"
msgid "A primitive with ID = 0 cannot be invisible."
msgstr "Een primitief met ID = 0 kan niet onzichtbaar zijn."
@@ -3467,10 +3567,9 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parameter {0} niet in bereik 0..{1}. Kreeg ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Fout: Kan kaartweergaveklasse \"{0}\" niet laden. De klasse werd niet "
+"Laden van de kaartrender klasse ''{0}'' mislukt. De klasse werd niet "
"gevonden."
msgid ""
@@ -3583,7 +3682,7 @@ msgstr "Grid shift file ''{0}'' voor optie +nadgrids niet ondersteund."
msgid "Unkown datum identifier: ''{0}''"
msgstr "Onbekende ID voor datum: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr "Datum vereist (+datum=*, +towgs84=* of +nadgrids=*)"
msgid ""
@@ -3604,6 +3703,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Onverwacht aantal argumenten voor parameter ''+bounds'' (moet 4 zijn)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Onbekende parameter ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Verwacht aantal argumenten voor parameter ''{0}''"
@@ -3623,9 +3725,6 @@ msgstr "Aangepaste projectie"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "Fout: kon geen invoerstroom openen voor ''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3666,11 +3765,14 @@ msgstr "andere bij valideren"
msgid "Running test {0}"
msgstr "Uitvoeren test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Test ''{0}'' voltooid in {1}"
+
msgid "Addresses"
msgstr "Adressen"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr "Controleert op fouten in adressen en associatedStreet-relaties"
+msgstr "Controleert op fouten in adressen en relaties met associatedStreet."
msgid "Multiple associatedStreet relations"
msgstr "Meerdere relaties associatedStreet"
@@ -3690,6 +3792,15 @@ msgstr "Meerdere straatnamen in relatie"
msgid "House number too far from street"
msgstr "Huisnummer ligt te ver van de straat"
+msgid "Barriers and entrances"
+msgstr "Barrières en ingangen"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Controleert op fouten in barrières en ingangen."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Ingang van barrière niet ingesteld op barrière"
+
msgid "Building inside building"
msgstr "Gebouw binnen gebouw"
@@ -3749,7 +3860,10 @@ msgid " or "
msgstr " of "
msgid "{0} is deprecated, use {1} instead"
-msgstr "{0} is gedeprecieerd, gebruik {1} in plaats hiervan"
+msgstr "{0} is vervallen, gebruik {1} in plaats hiervan"
+
+msgid "{0} is unnecessary"
+msgstr "{0} is niet nodig"
msgid "Duplicated nodes"
msgstr "Gedupliceerde knopen"
@@ -3758,9 +3872,6 @@ msgid "This test checks that there are no nodes at the very same location."
msgstr ""
"Deze test controleert of er geen knopen op precies dezelfde locatie zijn."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Gedupliceerde knopen in twee niet-gesloten wegen"
-
msgid "Mixed type duplicated nodes"
msgstr "Gedupliceerde knopen van gemengd type"
@@ -3832,6 +3943,24 @@ msgstr "Gedupliceerde wegknopen"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Controleert op wegen met identieke, opeenvolgende knopen."
+msgid "Highways"
+msgstr "Wegen"
+
+msgid "Performs semantic checks on highways."
+msgstr "Voert semantische controles uit op highways."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Onjuiste rotonde (highway: {0} in plaats van {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Ontbrekende informatie voor voetgangersoversteekplaats"
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolygoon"
@@ -3906,6 +4035,13 @@ msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
"Deze test zoekt knopen met dezelfde naam (kunnen gedupliceerde zijn)."
+msgid "Opening hours syntax"
+msgstr "Syntaxis voor openingstijden"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+"Deze test controleert het juiste gebruik van de syntaxis voor openingstijden."
+
msgid "Overlapping Areas"
msgstr "Overlappende gebieden"
@@ -3959,7 +4095,7 @@ msgid "Relation checker"
msgstr "Controle voor relaties"
msgid "This plugin checks for errors in relations."
-msgstr "Deze plugin zoekt naar fouten in relaties."
+msgstr "Deze plug-in zoekt naar fouten in relaties."
msgid "Relation type is unknown"
msgstr "Relatietype is onbekend"
@@ -3967,15 +4103,15 @@ msgstr "Relatietype is onbekend"
msgid "Relation is empty"
msgstr "Lege relatie"
+msgid "Role verification problem"
+msgstr "Probleem bij verificatie van rol"
+
msgid "<empty>"
msgstr "<leeg>"
msgid "Role {0} missing"
msgstr "Rol {0} ontbreekt"
-msgid "Role verification problem"
-msgstr "Probleem bij verificatie van rol"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Het aantal {0} rollen is te laag ({1})"
@@ -4009,12 +4145,11 @@ msgstr ""
"Deze test controleert op wegen met gelijke namen die mogelijk verkeerd "
"gespeld zijn."
-msgid "Properties checker :"
-msgstr "Controle voor eigenschappen:"
+msgid "Tag checker"
+msgstr "Tagcontrole"
-msgid "This plugin checks for errors in property keys and values."
-msgstr ""
-"Deze plugin controleert op fouten in sleutels en waarden van eigenschappen."
+msgid "This test checks for errors in tag keys and values."
+msgstr "Deze test controleert op fouten in sleutels en waarden van tags."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Ongeldige regel controle op tags - {0}: {1}"
@@ -4075,7 +4210,7 @@ msgid "Presets do not contain property value"
msgstr "Voorkeuzen bevatten geen waarde voor eigenschap"
msgid "FIXMES"
-msgstr "HERSTEL-MIJ’S"
+msgstr "HERSTEL-MIJ''S"
msgid "Check property keys."
msgstr "Controle op sleutels van eigenschap."
@@ -4132,7 +4267,7 @@ msgid "Validate that property values are valid checking against presets."
msgstr "Valideer waarden van eigenschap door te controleren met voorkeuzen"
msgid "Check for FIXMES."
-msgstr "Controleer op HERSTEL-MIJ’S."
+msgstr "Controleer op HERSTEL-MIJ''S."
msgid "Looks for nodes or ways with FIXME in any property value."
msgstr ""
@@ -4156,8 +4291,8 @@ msgstr "Standaard bestand spellingscontrole gebruiken."
msgid "Use the default spellcheck file (recommended)."
msgstr "Het standaard bestand spellingscontrole gebruiken (aanbevolen)."
-msgid "Fix properties"
-msgstr "Eigenschappen herstellen"
+msgid "Fix tags"
+msgstr "Tags repareren"
msgid "Could not find element type"
msgstr "Kan elementtype niet vinden"
@@ -4233,6 +4368,9 @@ msgstr "Niet-gesloten wegen"
msgid "This tests if ways which should be circular are closed."
msgstr "Dit test of wegen die een cirkel zouden moeten vormen gesloten zijn."
+msgid "Unclosed way"
+msgstr "Niet-gesloten weg"
+
msgid "natural type {0}"
msgstr "soort natuur {0}"
@@ -4263,9 +4401,6 @@ msgstr "gebouw"
msgid "area"
msgstr "gebied"
-msgid "Unclosed way"
-msgstr "Niet-gesloten weg"
-
msgid "Unconnected ways"
msgstr "Niet-verbonden wegen"
@@ -4294,12 +4429,12 @@ msgstr ""
"De test controleert op knopen zonder tag die geen deel uitmaken van enige "
"weg."
-msgid "No tags"
-msgstr "Geen tags"
-
msgid "Unconnected nodes without physical tags"
msgstr "Niet-verbonden knopen zonder fysieke tags"
+msgid "No tags"
+msgstr "Geen tags"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Bevat tag met als waarde ''fixme'' of ''FIXME''"
@@ -4360,26 +4495,6 @@ msgstr "Omgekeerde kustlijn: land niet aan linker zijde"
msgid "Reversed land: land not on left side"
msgstr "Omgekeerde land: land niet aan linker zijde"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Fout aantal argumenten voor bladwijzer"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Fout bij het inlezen van bladwijzer: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Fout: Onverwachte lijn ''{0}'' in bladwijzerbestand ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Fout: Ongeldige dubbele waarde''{0}'' op lijn ''{1}'' in bladwijzerbestand "
-"''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Kon bladwijzers niet lezen van<br>''{0}''<br>Fout was: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Niet opnieuw tonen (keuze onthouden)"
@@ -4430,13 +4545,13 @@ msgid "Precondition violation"
msgstr "Overtreding van voorwaarde"
msgid "Security exception"
-msgstr "Beveiligingsuitzondering"
+msgstr "Beveiligingsexceptie"
msgid "Network exception"
-msgstr "Netwerkuitzondering"
+msgstr "Netwerkexceptie"
msgid "IO Exception"
-msgstr "Invoer/uitvoer-uitzondering"
+msgstr "Invoer/uitvoer-exceptie"
msgid "Illegal Data"
msgstr "Ongeldige gegevens"
@@ -4483,8 +4598,8 @@ msgstr "Toon Help-informatie"
msgid "Downloading \"Message of the day\""
msgstr "\"Melding van de dag\" downloaden"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Waarschuwing: mislukt om MOTD te lezen. Uitzondering was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Lezen van MOTD mislukt. Exceptie was: {0}"
msgid "Message of the day not available"
msgstr "Melding van de dag niet beschikbaar"
@@ -4493,7 +4608,7 @@ msgid "Click to close the dialog"
msgstr "Klik om het dialoogvenster te sluiten"
msgid "Imagery offset"
-msgstr "Verschuiving van achtergrondafbeelding/luchtfoto"
+msgstr "Verschuiving van afbeeldingslaag"
msgid "Imagery"
msgstr "Afbeeldingen"
@@ -4698,9 +4813,24 @@ msgstr "Beeld"
msgid "Tools"
msgstr "Gereedschappen"
+msgid "More tools"
+msgstr "Meer programma''s"
+
+msgid "Data"
+msgstr "Gegevens"
+
+msgid "Selection"
+msgstr "Selectie"
+
msgid "Presets"
msgstr "Voorkeuze"
+msgid "More..."
+msgstr "Meer ..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Vensters"
@@ -4718,11 +4848,23 @@ msgstr ""
"Schakelt met de zichtbaarheid van de werkbalk Bewerken (d.i., het verticale "
"gereedschap)"
+msgid "Preset preferences"
+msgstr "Voorkeuren voor vorkeuzen"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr "Klik om de tab Voorkeuzen te openen in de voorkeuren"
+
+msgid "Imagery preferences"
+msgstr "Voorkeuren voor afbeeldingen"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Klik om de tab Afbeeldingen te openen in de voorkeuren"
+
msgid "Audio"
msgstr "Geluid"
-msgid "Hide edit toolbar"
-msgstr "Werkbalk Bewerken verbergen"
+msgid "Do not hide toolbar"
+msgstr "Werkbalk niet verbergen"
msgid "Hide this button"
msgstr "Verberg deze knop"
@@ -4730,6 +4872,9 @@ msgstr "Verberg deze knop"
msgid "Click the arrow at the bottom to show it again."
msgstr "Klik op de pijl onderaan om het opnieuw te tonen."
+msgid "Hide edit toolbar"
+msgstr "Werkbalk Bewerken verbergen"
+
msgid "Hide or show this toggle button"
msgstr "Deze wisselknop verbergen of tonen"
@@ -4791,6 +4936,9 @@ msgstr "(geen object)"
msgid "User:"
msgstr "Gebruikersnaam:"
+msgid "Do not hide status bar"
+msgstr "Statusbalk niet verbergen"
+
msgid "Layer not in list."
msgstr "Laag niet in lijst."
@@ -4818,22 +4966,6 @@ msgstr "Op achtergrond"
msgid "Click to run job in background"
msgstr "Klikken om de taak op de achtergrond uit te voeren"
-msgid "false: the property is explicitly switched off"
-msgstr "onwaar: de eigenschap is expliciet uitgeschakeld"
-
-msgid "true: the property is explicitly switched on"
-msgstr "waar: de eigenschap is expliciet ingeschakeld"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"gedeeltelijk: verschillende geselecteerde objecten hebben verschillende "
-"waarden, niet veranderen"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-"niet ingesteld: deze eigenschap niet voor de geselecteerde objecten instellen"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -5154,6 +5286,9 @@ msgstr ""
"Kopieer mijn geselecteerde elementen naar het einde van de lijst met "
"samengevoegde elementen"
+msgid "> before"
+msgstr "> vóór"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5161,6 +5296,9 @@ msgstr ""
"Kopieer mijn geselecteerde elementen vóór het eerste geselecteerde element "
"in de lijst van samengevoegde elementen."
+msgid "> after"
+msgstr "> na"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5168,18 +5306,27 @@ msgstr ""
"Kopieer mijn geselecteerde elementen na het eerste geselecteerde element in "
"de lijst van samengevoegde elementen."
+msgid "< top"
+msgstr "< boven"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Kopieer hun geselecteerde elementen naar het begin van de lijst met "
"samengevoegde elementen."
+msgid "< bottom"
+msgstr "< onder"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Kopieer hun geselecteerde elementen naar het einde van de lijst met "
"samengevoegde elementen."
+msgid "< before"
+msgstr "< vóór"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5187,6 +5334,9 @@ msgstr ""
"Kopieer hun geselecteerde elementen vóór het eerste geselecteerde element in "
"de lijst met samengevoegde elementen."
+msgid "< after"
+msgstr "< na"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5203,8 +5353,8 @@ msgstr "Kopieer al hun elementen naar het doel"
msgid "Up"
msgstr "Omhoog"
-msgid "Move up the selected elements by one position."
-msgstr "Geselecteerde elementen één positie omhoog schuiven"
+msgid "Move up the selected entries by one position."
+msgstr "Verplaats de geselecteerde items één plaats omhoog."
msgid "Down"
msgstr "Omlaag"
@@ -5261,16 +5411,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Hun versie ({0} items)"
msgstr[1] "Hun versie ({0} items)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Veranderlijke {0} is nog niet geregistreerd. Kan deelnemen in "
-"gesynchroniseerde aanpassingen niet instellen."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Veranderlijke {0} is nog niet geregistreerd."
-
msgid "Node"
msgstr "Knoop"
@@ -5553,18 +5693,19 @@ msgctxt "tag"
msgid "Key:"
msgstr "Toets:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Geef een sleutel op, d.i. <strong><tt>fixme</tt></strong></html>"
+"<html>Voer een sleutel voor een tag in, bijv. "
+"<strong><tt>repareermij</tt></strong></html>"
msgid "Value:"
msgstr "Waarde:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Geef een waarde op voor een tag, d.i <strong><tt>kijk leden "
-"na</tt></strong></html>"
+"<html>Voer een waarde voor een tag in, bijv. <strong><tt>controleer "
+"leden</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -6069,7 +6210,7 @@ msgstr ""
"deg 11' 47.60\" E</li></ul>"
msgid "Projected coordinates:"
-msgstr "Geprojecteerde coördinaten:"
+msgstr "Geprojecteerde coördinaten:"
msgid ""
"Enter easting and northing (x and y) separated by space, comma or semicolon."
@@ -6158,6 +6299,9 @@ msgstr "Tonen/Verbergen"
msgid "Information about layer"
msgstr "Informatie over laag"
+msgid "Map paint preferences"
+msgstr "Voorkeuren voor kaarttekenstijlen"
+
msgid "Map Paint Styles"
msgstr "Kaarttekenstijlen"
@@ -6242,14 +6386,46 @@ msgstr "Is stijl op dit moment actief?"
msgid "No"
msgstr "Neen"
-msgid "Relations"
-msgstr "Relaties"
+msgid "Object type:"
+msgstr "Objecttype:"
-msgid "Open a list of all relations."
-msgstr "Open een lijst met alle relaties."
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "gemengd"
-msgid "Relation list filter"
-msgstr "Filter relatielijst"
+msgid "Choose the OSM object type"
+msgstr "Kies het type van het OSM-object"
+
+msgid "Object ID:"
+msgstr "Object-ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Voer het ID van het te downloaden object in"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Object-ID''s kunnen gescheiden worden door een komma of spatie. <br /> "
+"Bijvoorbeeld: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Specificeer, "
+"in gemengde modus, objecten als volgt: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"Ongeldige lijst met ID's gespecificeerd\n"
+"Kan niet doorgaan."
+
+msgid "Relations"
+msgstr "Relaties"
+
+msgid "Open a list of all relations."
+msgstr "Open een lijst met alle relaties."
+
+msgid "Relation list filter"
+msgstr "Filter relatielijst"
msgid "Create a new relation"
msgstr "Een nieuwe relatie maken"
@@ -6263,9 +6439,6 @@ msgstr "Relaties: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relaties: {0}"
-msgid "Selection"
-msgstr "Selectie"
-
msgid "Open a selection list window."
msgstr "Open een venster voor een selectielijst."
@@ -6290,18 +6463,6 @@ msgstr "Nu niet te selecteren"
msgid "Selection: {0}"
msgstr "Selectie: {0}"
-msgid "Side buttons"
-msgstr "Knoppen zijkant"
-
-msgid "Always shown"
-msgstr "Altijd weergeven"
-
-msgid "Dynamic"
-msgstr "Dynamisch"
-
-msgid "Always hidden"
-msgstr "Altijd verborgen"
-
msgid "Toggle dynamic buttons"
msgstr "Schakelen met dynamische knoppen"
@@ -6320,6 +6481,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Klik om de vensterinhoud te verkleinen/vergroten"
+msgid "Side buttons"
+msgstr "Knoppen zijkant"
+
+msgid "Always shown"
+msgstr "Altijd weergeven"
+
+msgid "Dynamic"
+msgstr "Dynamisch"
+
+msgid "Always hidden"
+msgstr "Altijd verborgen"
+
msgid "Authors"
msgstr "Auteurs"
@@ -6337,11 +6510,10 @@ msgstr "Door deze gebruiker aangeleverde objecten selecteren"
msgid "Launches a browser with information about the user"
msgstr "Toont informatie over deze gebruiker in een browservenster"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Waarschuwing: er wordt slechts een infovenster voor de eerste {0} van {1} "
-"geselecteerde gebruikers geopend"
+"Alleen info-browsers gestart voor de eerste {0} van {1} geselecteerde "
+"gebruikers"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6368,9 +6540,6 @@ msgstr "Open het scherm voor valideren."
msgid "Validation results"
msgstr "Resultaten van valideren"
-msgid "Zoom to problem"
-msgstr "Op probleem inzoomen"
-
msgid "Fix"
msgstr "Herstellen"
@@ -6526,9 +6695,6 @@ msgstr "Inhoud bijwerken"
msgid "Update the changeset content from the OSM server"
msgstr "Inhoud van wijzigingenset bijwerken vanaf de server van OSM"
-msgid "Show history"
-msgstr "Geschiedenis tonen"
-
msgid "Download and show the history of the selected objects"
msgstr ""
"De geschiedenis van de geselecteerde objecten downloaden en weergeven."
@@ -6877,11 +7043,11 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Wijzigingensets in de huidige kaartweergave downloaden</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Waarschuwing: onverwachte waarde voor voorkeur ''{0}'', kreeg ''{1}''. "
-"Teruggezet naar standaard zoekopdracht."
+"Onverwachte waarde voor voorkeur ''{0}'', kreeg ''{1}''. Teruggezet naar "
+"standaardquery."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6953,35 +7119,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Deze URL voor de zoekopdracht voor wijzigingenset is ongeldig"
-msgid "Select objects for which to change properties."
-msgstr "Selecteer objecten waarvoor eigenschappen gewijzigd moeten worden."
+msgid "Discardable key: selection Foreground"
+msgstr "Te missen sleutel: selectie Voorgrond"
-msgid "Properties/Memberships"
-msgstr "Eigenschappen/Lidmaatschappen"
+msgid "Discardable key: selection Background"
+msgstr "Te missen sleutel: selectie Achtergrond"
-msgid "Properties for selected objects."
-msgstr "Eigenschappen voor geselecteerde objecten."
+msgid "Discardable key: foreground"
+msgstr "Te missen sleutel: voorgrond"
+
+msgid "Discardable key: background"
+msgstr "Te missen sleutel: achtergrond"
msgid "<different>"
msgstr "<verschillend>"
+msgid "Select objects for which to change tags."
+msgstr "Selecteer de objecten waarvan de tags gewijzigd moeten worden."
+
+msgid "Tags/Memberships"
+msgstr "Tags/Leden"
+
+msgid "Tags for selected objects."
+msgstr "Tags voor geselecteerde objecten."
+
msgid "Member Of"
msgstr "Lid van"
msgid "Position"
msgstr "Positie"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Eigenschappen: {0} / Leden: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Tags: {0} / Leden: {1}"
-msgid "Properties / Memberships"
-msgstr "Eigenschappen / Leden"
+msgid "Tags / Memberships"
+msgstr "Tags / Leden"
msgid "Delete the selected key in all objects"
msgstr "Verwijder de geselecteerde sleutel uit alle objecten"
-msgid "Delete Properties"
-msgstr "Eigenschappen verwijderen"
+msgid "Delete Tags"
+msgstr "Tags verwijderen"
msgid "Change relation"
msgstr "Relatie wijzigen"
@@ -6995,14 +7173,14 @@ msgstr "Selectie uit relatie {0} zeker verwijderen?"
msgid "Add a new key/value pair to all objects"
msgstr "Voeg een nieuwe sleutel/waarde aan alle objecten toe"
-msgid "Add Property"
-msgstr "Eigenschap toevoegen"
+msgid "Add Tag"
+msgstr "Tag toevoegen"
msgid "Edit the value of the selected key for all objects"
msgstr "Bewerk de waarde van de geselecteerde sleutel voor alle objecten"
-msgid "Edit Properties"
-msgstr "Eigenschappen bewerken"
+msgid "Edit Tags"
+msgstr "Tags bewerken"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Ga naar de wiki van OSM voor hulp over tags (F1)"
@@ -7085,12 +7263,6 @@ msgstr[1] "Eigenschappen van maximaal {0} objecten aanpassen"
msgid "Use English language for tag by default"
msgstr "Gebruik standaard de Engelse taal voor de tag"
-msgid "Paste tag"
-msgstr "Tag plakken"
-
-msgid "Paste value"
-msgstr "Waarde plakken"
-
msgid "Add value?"
msgstr "Waarde toevoegen?"
@@ -7121,9 +7293,15 @@ msgstr "Voer een geheel getal in tussen 0 en {0}"
msgid "Recently added tags"
msgstr "Recent toegevoegde tags"
+msgid "Choose recent tag {0}"
+msgstr "Kies recente tag {0}"
+
msgid "Use this tag again"
msgstr "Gebruik deze tag opnieuw"
+msgid "Apply recent tag {0}"
+msgstr "Pas recente tag {0} toe"
+
msgid "The key ''{0}'' is already used"
msgstr "De sleutel ''{0}'' is al in gebruik"
@@ -7165,10 +7343,8 @@ msgstr "Relatie is verwijderd"
msgid "Downloading relation {0}"
msgstr "Downloaden van relatie {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Waarschuwing: Uitzondering negeren omdat taak is geannuleerd.. Uitzondering: "
-"{0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Exceptie genegeerd omdat de taak werd geannuleerd. Exceptie: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7232,6 +7408,11 @@ msgstr "Verwijder ze, relatie opschonen"
msgid "Ignore them, leave relation as is"
msgstr "Negeer ze, behoud relatie zoals ze is"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Sorry, sneltoets \"{0}\" kan niet worden ingeschakeld in het dialoogvenster "
+"Relatiebewerker"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7387,7 +7568,7 @@ msgstr "Nee, verwerp de wijzigingen en sluit af"
msgid "Click to discard the changes and close this relation editor"
msgstr ""
-"Klik om de wijzigingen te verwerpen en deze rekatiebewerker af te sluiten"
+"Klik om de wijzigingen te verwerpen en deze relatiebewerker af te sluiten"
msgid "Cancel, continue editing"
msgstr "Annuleren, ga door met bewerken"
@@ -7522,6 +7703,28 @@ msgstr "weg is verbonden met volgend lid van de relatie"
msgid "way is not connected to previous or next relation member"
msgstr "weg is niet verbonden met vorig of volgend lid van de relatie"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Fout aantal argumenten voor bladwijzer"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Fout bij het inlezen van bladwijzer: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Onverwachte regel ''{0}'' in bestand voor bladwijzers ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Ongeldige dubbele waarde ''{0}'' op regel ''{1}'' in bestand voor "
+"bladwijzers ''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Kon bladwijzers niet lezen van<br>''{0}''<br>Fout was: {1}</html>"
+
msgid "Bookmarks"
msgstr "Bladwijzers"
@@ -7595,9 +7798,6 @@ msgstr "Waarde voor breedtegraad in bereik [-90,90] vereist."
msgid "Value for longitude in range [-180,180] required."
msgstr "Waarde voor lengtegraad in bereik [-180,180] vereist."
-msgid "Paste URL from clipboard"
-msgstr "URL-adres vanaf klembord plakken"
-
msgid "Data Sources and Types:"
msgstr "Gegevensbronnen en types:"
@@ -7681,21 +7881,8 @@ msgstr "Download verwijzers (ouderrelaties)"
msgid "Download object"
msgstr "Object downloaden"
-msgid "Object type:"
-msgstr "Objecttype:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "gemengd"
-
-msgid "Choose the OSM object type"
-msgstr "Kies het type van het OSM-object"
-
-msgid "Object ID:"
-msgstr "Object-ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Voer het ID van het te downloaden object in"
+msgid "Start downloading"
+msgstr "Downloaden starten"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7708,28 +7895,9 @@ msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
"Selecteer dit als de leden van een relatie ook moeten worden gedownload"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Object-ID''s kunnen gescheiden worden door een komma of spatie. <br /> "
-"Bijvoorbeeld: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Specificeer, "
-"in gemengde modus, objecten als volgt: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Download verwijzers (ouderrelaties en -wegen)"
-msgid "Start downloading"
-msgstr "Downloaden starten"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Ongeldige ID-lijst gespecificeerd\n"
-"Kan object niet downloaden."
-
msgid "Class Type"
msgstr "Klassetype"
@@ -7749,7 +7917,7 @@ msgid "Areas around places"
msgstr "Gebieden rond plaatsen"
msgid "Null pointer exception, possibly some missing tags."
-msgstr "Null pointer-uitzondering, mogelijk ontbreken er enkele tags."
+msgstr "Null pointer-exceptie, mogelijk ontbreken er enkele tags."
msgid "Search ..."
msgstr "Zoeken ..."
@@ -7777,8 +7945,7 @@ msgstr "JOSM Help-browser"
msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
msgstr ""
-"CSS-bestand ''help-browser.css'' kon niet worden ingelezen. Uitzondering is: "
-"{0}"
+"CSS-bestand ''help-browser.css'' kon niet worden ingelezen. Exceptie is: {0}"
msgid ""
"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
@@ -7845,9 +8012,8 @@ msgstr "Vooruit naar de volgende pagina"
msgid "Go to the JOSM help home page"
msgstr "Naar de thuispagina van JOSM Help gaan."
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
-"Waarschuwing: slechte locatie in HTML-document. Uitzondering was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Slechte locatie in HTML-document. Exceptie was: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Kan de pagina voor Help niet openen. De URL voor het doel is leeg."
@@ -7955,6 +8121,9 @@ msgid ""
msgstr ""
"<html>Versie <strong>{0}</strong> gemaakt op <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Opmerking wijzigingenset"
+
msgid "Changeset info"
msgstr "Wijzigingenset info"
@@ -8064,9 +8233,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Object nog in gebruik"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Waarschuwing: fout kop \"{0}\" komt niet overeen met een verwacht patroon"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "Fout koptekst \"{0}\" kwam niet overeen met een verwacht patroon"
msgid "Upload"
msgstr "Uploaden"
@@ -8088,6 +8256,12 @@ msgstr "Beschrijf kort de veranderingen die je upload:"
msgid "Enter an upload comment"
msgstr "Een opmerking bij uploaden invoeren"
+msgid "Specify the data source for the changes:"
+msgstr "Specificeer de gegevensbron voor de wijzigingen:"
+
+msgid "Enter a source"
+msgstr "Voer een bron in"
+
msgid "Changeset id:"
msgstr "Wijzigingenset-ID:"
@@ -8156,11 +8330,10 @@ msgid "Closing changeset {0}"
msgstr "Wijzigingenset aan het sluiten {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Waarschuwing: op voorgrond houden van dialoogvenster Persoonlijke gegevens "
-"mislukt. Beveiligingsuitzondering ontvangen."
+"Op voorgrond zetten van dialoogvenster Invoer mislukt. Kreeg een "
+"beveiligings-exceptie."
msgid "Enter credentials for OSM API"
msgstr "Voer persoonlijke gegevens in voor OSM API"
@@ -8242,11 +8415,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Uitpakken {0} in {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Waarschuwing: Kan bestand ''{0}'' niet downloaden. De koppeling om vanaf te "
-"downloaden ''{1}'' is geen geldige URL. Downloaden wordt overgeslagen."
+"Kan bestand ''{0}'' niet downloaden. De koppeling voor downloaden ''{1}'' is "
+"geen geldige URL. Downloaden overgeslagen."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8263,11 +8436,10 @@ msgid "Missing user identity"
msgstr "Ontbrekende identiteit van de gebruiker"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Waarschuwing: Ophalen van gebruikersinformatie over de huidige gebruiker van "
-"JOSM mislukt. Uitzondering was: {0}"
+"Ophalen van gebruikersinformatie voor huidige gebruiker van JOSM mislukt. "
+"Exceptie was: {0}"
msgid "Download objects"
msgstr "Downloaden van objecten"
@@ -8522,12 +8694,6 @@ msgstr "Upload de gewijzigde primitieven"
msgid "Please revise upload comment"
msgstr "Herstel de opmerking bij uploaden"
-msgid "Revise"
-msgstr "Herstel"
-
-msgid "Continue as is"
-msgstr "Doorgaan zoals het is"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8542,6 +8708,27 @@ msgstr ""
"/><br />Als u nu een minuutje spendeert aan het uitleggen van uw wijziging, "
"zult u het leven<br />van vele andere mappers een stuk eenvoudiger maken."
+msgid "Please specify a changeset source"
+msgstr "Specificeer een bron voor de wijzigingenset"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"U specificeerde geen bron voor uw wijzigingen.<br />Dit is technisch "
+"toegestaan, maar het helpt andere gebruikers <br />om de herkomst van de "
+"gegevens te begrijpen.<br /><br />Als u nu een minuut de tijd neemt om uw "
+"wijziging uit te leggen, maakt u het leven<br />van vele andere mappers een "
+"stuk eenvoudiger."
+
+msgid "Revise"
+msgstr "Herstel"
+
+msgid "Continue as is"
+msgstr "Doorgaan zoals het is"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Terug naar het vorige dialoogvenster om een meer beschrijvende opmerking in "
@@ -8559,6 +8746,25 @@ msgstr "Voer eerst een geldige grootte voor het gedeelte"
msgid "Illegal chunk size"
msgstr "Ongeldige grootte voor gedeelte"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>De volgende tag voor wijzigingenset bevat een lege "
+"sleutel/waarde:<br>{0}<br>Doorgaan?</html>"
+msgstr[1] ""
+"<html>De volgende tags voor wijzigingenset bevatten een lege "
+"sleutel/waarde:<br>{0}<br>Doorgaan?</html>"
+
+msgid "Empty metadata"
+msgstr "Lege metadata"
+
msgid "Cancel the upload and resume editing"
msgstr "Annuleer het uploaden en hervat het bewerken"
@@ -8566,11 +8772,11 @@ msgid "Tags of changeset {0}"
msgstr "Tags van wijzigingenset {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Waarschuwing: object ''{0}'' is al verwijderd van de server. Sla dit object "
-"over en probeer opnieuw te uploaden."
+"Object ''{0}'' is al verwijderd van de server. Dit object overgeslagen en "
+"probeer opnieuw te uploaden."
msgid "Preparing objects to upload ..."
msgstr "Voorbereiden van objecten om te uploaden ..."
@@ -8711,9 +8917,6 @@ msgstr "Relatie ''{0}'' is al verwijderd. Object overslaan in upload."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "Object ''{0}'' is al verwijderd. Object overslaan in upload."
-msgid "Warning: {0}"
-msgstr "Waarschuwing: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Uploaden van {0} object..."
@@ -8722,8 +8925,11 @@ msgstr[1] "Uploaden van {0} objecten..."
msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
-"Negeren van de opgetreden uitzondering omdat het uploaden is geannuleerd. "
-"Uitzondering is: {0}"
+"Negeren van de opgetreden exceptie omdat het uploaden is geannuleerd. "
+"Exceptie is: {0}"
+
+msgid "Upload successful!"
+msgstr "Uploaden gelukt!"
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
@@ -8745,10 +8951,8 @@ msgstr "Selecteer objecten om te uploaden"
msgid "Cancel uploading"
msgstr "Uploaden annuleren"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
-"Waarschuwing: onverwachte waarde voor sleutel ''{0}'' in voorkeuren, kreeg "
-"''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr "Onverwachte waarde voor sleutel ''{0}'' in voorkeuren, kreeg ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Selecteer de strategie voor het uploaden:"
@@ -8890,7 +9094,7 @@ msgid "Save GPX file"
msgstr "GPX-bestand opslaan"
msgid "Imagery fade"
-msgstr "Luchtfoto vervagen"
+msgstr "Afbeelding vervagen"
msgid "ERROR"
msgstr "FOUT"
@@ -8901,7 +9105,7 @@ msgstr "Volgende markering"
msgid "Jump to next marker"
msgstr "Spring naar volgende markering"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Vorige markering"
msgid "Jump to previous marker"
@@ -8934,8 +9138,8 @@ msgstr "versie {0}"
msgid "Merging layers"
msgstr "Lagen samenvoegen"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Waarschuwing: mixen van 0.6 en 0.5 gegevensresultaten in versie 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Mixen van gegevens 0.6 en 0.5 resulteert in versie 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -9056,6 +9260,9 @@ msgstr "vergoot het zoomniveau om meer detail te zien"
msgid "No tiles at this zoom level"
msgstr "Geen tegels op dit zoomniveau"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "TMS-laag ({0}), downloaden met zoom {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG:4326- en Mercator-projectie worden ondersteund"
@@ -9094,6 +9301,9 @@ msgstr "Foutieve tegels herladen"
msgid "Alpha channel"
msgstr "Alfa-kanaal"
+msgid "Automatically change resolution"
+msgstr "Automatisch resolutie wijzigen"
+
msgid "Set WMS Bookmark"
msgstr "Stel WMS-bladwijzer in"
@@ -9195,7 +9405,7 @@ msgid "Override position for: "
msgstr "Overschrijf positie voor: "
msgid "Images with geo location in exif data ({0}/{1})"
-msgstr "Afbeeldingen met geolokatie in EXIF-gegevens({0}/{1})"
+msgstr "Afbeeldingen met geolocatie in EXIF-gegevens({0}/{1})"
msgid "Images that are already tagged ({0}/{1})"
msgstr "Afbeeldingen die reeds een tag kregen ({0}/{1})"
@@ -9236,7 +9446,7 @@ msgid_plural ""
msgstr[0] ""
"<html>Koppelde <b>{0}</b> van <b>{1}</b> foto aan GPX-spoor.</html>"
msgstr[1] ""
-"<html>Koppelde <b>{0}</b> van <b>{1}</b> foto’s aan GPX-spoor.</html>"
+"<html>Koppelde <b>{0}</b> van <b>{1}</b> foto''s aan GPX-spoor.</html>"
msgid "Timezone: {0}"
msgstr "Tijdzone: {0}"
@@ -9257,8 +9467,7 @@ msgid ""
"adjust the sliders to manually match the photos."
msgstr ""
"Er trad een fout op bij het proberen te koppelen van de foto''s aan het GPX-"
-"spoor. U kunt de schuifbalken handmatig aanpassen om de foto''s handmatig te "
-"matchen."
+"spoor. U kunt de schuifbalken aanpassen om de foto''s handmatig te matchen."
msgid "Matching photos to track failed"
msgstr "Koppelen van foto''s aan spoor is mislukt"
@@ -9307,9 +9516,6 @@ msgstr "GPS-locaties uit EXIF halen"
msgid "Starting directory scan"
msgstr "Scan van mappen starten"
-msgid "One of the selected files was null"
-msgstr "Een van de geselecteerde bestanden was leeg (null)"
-
msgid "Read photos..."
msgstr "Foto''s lezen..."
@@ -9328,6 +9534,9 @@ msgstr "Leeg bestand in {0} gevonden\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Bestanden uit map {0} halen is mislukt\n"
+msgid "One of the selected files was null"
+msgstr "Een van de geselecteerde bestanden was leeg (null)"
+
msgid "Geotagged Images"
msgstr "Afbeeldingen met geo-tags"
@@ -9387,6 +9596,12 @@ msgstr "Volgende"
msgid "Show next Image"
msgstr "Toon volgende afbeelding"
+msgid "Show first Image"
+msgstr "Geef eerste afbeelding weer"
+
+msgid "Show last Image"
+msgstr "Geef laatste afbeelding weer"
+
msgid "Center view"
msgstr "Beeld centreren"
@@ -9470,9 +9685,6 @@ msgstr ""
"schadelijk beschouwd.<br>Als je sporen (traces) wilt uploaden, zie "
"hier:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Tekenen van spoor aanpassen"
@@ -9485,8 +9697,11 @@ msgstr "t/m"
msgid "No timestamp"
msgstr "Geen tijdstempel"
-msgid "Download from OSM along this track"
-msgstr "Uit OSM downloaden langs dit spoor"
+msgid "Select to download OSM data."
+msgstr "Selecteren om gegevens van OSM te downloaden."
+
+msgid "Select to download GPS traces."
+msgstr "Selecteren om GPS-sporen te downloaden."
msgid "Download everything within:"
msgstr "Alles downloaden binnen:"
@@ -9512,16 +9727,18 @@ msgstr "alleen wegpunten"
msgid "track and waypoints"
msgstr "spoor en wegpunten"
+msgid "Click to download"
+msgstr "Klik om te downloaden"
+
+msgid "Click to cancel"
+msgstr "Klik om te annuleren"
+
+msgid "Download from OSM along this track"
+msgstr "Uit OSM downloaden langs dit spoor"
+
msgid "Calculating Download Area"
msgstr "Te downloaden gebied berekenen"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Deze actie vereist {0} individuele<br>verzoeken om te downloaden. Wilt "
-"u<br>doorgaan?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Bereid afbeeldingen langs dit spoor voor"
@@ -9668,17 +9885,11 @@ msgstr "Fout tijdens het tonen van de URL voor deze markering"
msgid "(URL was: "
msgstr "(URL was: "
-msgid "Error displaying URL"
-msgstr "Fout bij tonen URL"
-
msgid "Select the map painting styles"
msgstr "Selecteer de maptekenstijlen"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Waarschuwing: Laden kaarttekenstijlen mislukt vanaf ''{0}''. Uitzondering "
-"was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Laden van Kaarttekenstijlen vanaf ''{0}'' mislukt. Exceptie was: {1}"
msgid "loading style ''{0}''..."
msgstr "stijl laden ''{0}''..."
@@ -9696,10 +9907,9 @@ msgstr[1] ""
"Er traden {0} fouten op bij het laden van deze stijl. Selecteer ''Info'' uit "
"het rechtsklik-menu voor details."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Waarschuwing: Parsen van kaarttekenstijlen mislukt vanaf ''{0}''. Fout was: "
-"{1}"
+"Parsen van Kaarttekenstijlen vanaf ''{0}'' mislukt. Exceptie was: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Ongeldig patroon van streepjes, waarden moeten positief zijn"
@@ -9708,11 +9918,9 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Ongeldig patroon van streepjes, ten minste één waarde moet > 0 zijn"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Waarschuwing: Parsen van kaarttekenstijlen mislukt vanaf ''{0}''. Fout was: "
-"[{1}:{2}] {3}"
+"Parsen van Kaarttekenstijlen vanaf ''{0}'' mislukt. Fout was: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Sleutel voor Toegangstoken:"
@@ -9989,9 +10197,8 @@ msgstr "Sluit het dialoogvenster en annuleer het autoriseren"
msgid "Close the dialog and accept the Access Token"
msgstr "Sluit het dialoogvenster en accepteer het Toegangstoken"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr ""
-"Waarschuwing: annuleren van het uitvoeren van de bewerking van OAuth mislukt"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Annuleren van uitgevoerde bewerking van OAuth mislukt"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Verkrijgen van Verzoektoken van OAuth vanaf ''{0}''"
@@ -10069,6 +10276,13 @@ msgstr ""
"Selecteer dit om JOSM het recht te geven om uw voorkeuren voor de server weg "
"te schrijven"
+msgid "Allow modifications of notes"
+msgstr "Wijzigingen van opmerkingen toestaan"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+"Selecteren om JOSM het recht te geven om opmerkingen in uw naam aan te passen"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Verkrijgen van Toegangstoken van OAuth..."
@@ -10141,9 +10355,6 @@ msgstr ""
"accepteren. JOSM zal het in de toekomst gebruiken voor het authentiseren en "
"autoriseren bij de server van OSM.<br><br>Het toegangstoken is: </html>"
-msgid "Restart"
-msgstr "Opnieuw starten"
-
msgid "Click to retrieve a Request Token"
msgstr "Klik om een Verzoektoken te verkrijgen"
@@ -10442,6 +10653,9 @@ msgstr "Download plug-ins"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "U moet JOSM opnieuw starten om sommige instellingen te activeren."
+msgid "Would you like to restart now?"
+msgstr "Wilt u nu opnieuw opstarten?"
+
msgid "Remote Control"
msgstr "Afstandsbediening"
@@ -10576,6 +10790,12 @@ msgstr "Verwijderen van werkbalk"
msgid "Configure toolbar"
msgstr "Werkbalk configureren"
+msgid "Edit shortcut"
+msgstr "Sneltoets bewerken"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Werkbalk en menu niet verbergen"
+
msgid "Actions"
msgstr "Acties"
@@ -10618,6 +10838,9 @@ msgstr "Geregistreerde werkbalk-actie zonder naam: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "Geregistreerde werkbalk-actie {0} overschreven: {1} krijgt {2}"
+msgid "Toolbar: {0}"
+msgstr "Werkbalk: {0}"
+
msgid "Data validator"
msgstr "Gegevensvalidator"
@@ -10671,25 +10894,12 @@ msgstr "Zoeken: "
msgid "Read from file"
msgstr "Lezen vanuit bestand"
-msgid "Open JOSM customization file"
-msgstr "Open JOSM-bestand voor aanpassingen"
-
-msgid "Import log"
-msgstr "Log voor importeren"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Hier is de samenvatting van het importeren van het bestand. <br/>U "
-"kunt wijzigingen van voorkeuren verwerpen door op \"Annuleren\" te drukken "
-"in het dialoogvenster Voorkeuren. <br/>Herstarten van JOSM kan nodig zijn om "
-"enkele wijzigingen te activeren.</html>"
-
msgid "Export selected items"
msgstr "Exporteer geselecteerde items"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM-bestanden voor aangepaste instellingen (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Selecteer enkele sleutels voor voorkeuren die niet als standaard zijn "
@@ -10710,41 +10920,58 @@ msgstr "Pas voorkeuren uit het bestand toe op bestaande waarden"
msgid "Replace existing values"
msgstr "Vervang bestaande waarden"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM-bestanden voor aangepaste instellingen (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Open JOSM-bestand voor aanpassingen"
-msgid "Advanced Background: Changed"
-msgstr "Uitgebreide achtergrond: Gewijzigd"
+msgid "Import log"
+msgstr "Log voor importeren"
-msgid "Advanced Background: NonDefalut"
-msgstr "Uitgebreide achtergrond: Niet standaard"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Hier is de samenvatting van het importeren van het bestand. <br/>U "
+"kunt wijzigingen van voorkeuren verwerpen door op \"Annuleren\" te drukken "
+"in het dialoogvenster Voorkeuren. <br/>Herstarten van JOSM kan nodig zijn om "
+"enkele wijzigingen te activeren.</html>"
-msgid "Current value is default."
-msgstr "Huidige waarde is standaard."
+msgid "shortcut"
+msgstr "sneltoets"
-msgid "Default value is ''{0}''."
-msgstr "Standaardwaarde is ''{0}''."
+msgid "color"
+msgstr "kleur"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)."
+msgid "toolbar"
+msgstr "werkbalk"
-msgid "Select Setting Type:"
-msgstr "Selecteer type voor instelling:"
+msgid "imagery"
+msgstr "afbeeldingen"
-msgid "Simple"
-msgstr "Eenvoudig"
+msgid "Reset preferences"
+msgstr "Voorkeuren herstellen"
-msgid "List"
-msgstr "Lijst"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"U staat op het punt om alle voorkeuren terug te zetten naar hun standaard "
+"waarden<br />Al uw instellingen zullen verloren gaan: plug-ins, "
+"afbeeldingen, filters, knoppen voor werkbalken, toetsenbord, etc. <br />Weet "
+"u zeker dat u wilt doorgaan?"
-msgid "List of lists"
-msgstr "Lijst van lijsten"
+msgid "Load profile"
+msgstr "Profiel laden"
-msgid "List of maps"
-msgstr "Lijst van kaarten"
+msgid "Save {0} profile"
+msgstr "Sla profiel {0} op"
-msgid "Add setting"
-msgstr "Instelling toevoegen"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr "Alle voorkeuren van deze groep zijn standaard, niets om op te slaan"
+
+msgid "Choose profile file"
+msgstr "Kies bestand van profiel"
msgid "Change list setting"
msgstr "Wijzig instelling van lijst"
@@ -10767,6 +10994,39 @@ msgstr "Wijzig instelling lijst van kaarten"
msgid "Entry {0}"
msgstr "Item {0}"
+msgid "Select Setting Type:"
+msgstr "Selecteer type voor instelling:"
+
+msgid "Simple"
+msgstr "Eenvoudig"
+
+msgid "List"
+msgstr "Lijst"
+
+msgid "List of lists"
+msgstr "Lijst van lijsten"
+
+msgid "List of maps"
+msgstr "Lijst van kaarten"
+
+msgid "Add setting"
+msgstr "Instelling toevoegen"
+
+msgid "Advanced Background: Changed"
+msgstr "Uitgebreide achtergrond: Gewijzigd"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Huidige waarde is standaard."
+
+msgid "Default value is ''{0}''."
+msgstr "Standaardwaarde is ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Standaardwaarde is onbekend (instelling is nog niet gebruikt)."
+
msgid "Change string setting"
msgstr "Wijzig instelling tekenreeks"
@@ -10824,6 +11084,9 @@ msgstr "Teken virtuele knopen in modus Selectie"
msgid "Draw inactive layers in other color"
msgstr "Teken inactieve lagen in andere kleur"
+msgid "Display discardable keys"
+msgstr "Geef de te missen sleutels weer"
+
msgid "Highlight target ways and nodes"
msgstr "Accentueer doelwegen en -knopen"
@@ -10886,6 +11149,13 @@ msgstr ""
"Deze optie onderdrukt het vullen van gebieden, overschrijft daarmee alles "
"wat gespecificeerd is in de geselecteerde stijl."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Geef de sleutels weer die dusdanig oninteressant zijn geworden dat zij "
+"geruisloos kunnen worden verwijderd."
+
msgid "Options that affect drawing performance"
msgstr "Opties die de uitvoering van het tekenen beïnvloeden"
@@ -11126,7 +11396,7 @@ msgstr "Wijzigen van modus niet vereisen (werkstroom in stijl van Potlatch)"
msgid ""
"Display buttons in right side menus only when mouse is inside the element"
msgstr ""
-"Toon de knoppen in de menu''s aan de rechterzijkant alleen als de muis "
+"Toon de knoppen in de menu''s aan de rechter zijkant alleen als de muis "
"binnen het element is"
msgid "Look and Feel"
@@ -11153,20 +11423,20 @@ msgstr ""
"{2}<br>tegengestelde zoomniveau: {3}"
msgid "{0} is replaced by X-coordinate of the tile"
-msgstr "{0} is vervangen door de X-coördinaat van de tegel"
+msgstr "{0} is vervangen door de X-coördinaat van de tegel"
msgid "{0} is replaced by Y-coordinate of the tile"
-msgstr "{0} is vervangen door de Y-coördinaat van de tegel"
+msgstr "{0} is vervangen door de Y-coördinaat van de tegel"
msgid "{0} is replaced by {1} (Yahoo style Y coordinate)"
-msgstr "{0} is vervangen door {1} ( Y-coördinaat Yahoo-stijl)"
+msgstr "{0} is vervangen door {1} ( Y-coördinaat Yahoo-stijl)"
msgid ""
"{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
"coordinate)"
msgstr ""
-"{0} is vervangen door {1} (Y-coördinaat OSGeo Tile Map Service "
-"Specification-stijl)"
+"{0} is vervangen door {1} (Y-coördinaat OSGeo Tile Map Service Specification-"
+"stijl)"
msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
@@ -11199,8 +11469,14 @@ msgstr "Lagen ophalen"
msgid "2. Select layers"
msgstr "2. Lagen selecteren"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Verifiëren van gegenereerde URL voor WMS"
+msgid "3. Select image format"
+msgstr "3. Kies een afbeeldingsformaat"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Bevestig de aangemaakte WMS URL"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Kies een naam voor deze laag"
msgid "Show Bounds"
msgstr "Grenzen weergeven"
@@ -11209,7 +11485,7 @@ msgid "No bounding box was found for this layer."
msgstr "Er werd geen omvattend gebied gevonden voor deze laag."
msgid "imagery fade"
-msgstr "Luchtfoto vervagen"
+msgstr "Afbeelding vervagen"
msgid "Fade Color: "
msgstr "Kleur voor vervagen: "
@@ -11227,11 +11503,11 @@ msgid "Sharpen (requires layer re-add): "
msgstr "Verscherpen (vereist opnieuw toevoegen laag): "
msgid "Imagery Preferences"
-msgstr "Voorkeuren voor achtergrondafbeeldingen/luchtfoto''s"
+msgstr "Voorkeuren voor afbeeldingslaag"
msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr ""
-"Lijst van lagen van afbeeldingen die zichtbaar zijn in menu Luchtfotografie "
+"Lijst van lagen van afbeeldingen die zichtbaar zijn in menu Afbeeldingen "
"aanpassen"
msgid "Common Settings"
@@ -11361,7 +11637,7 @@ msgid ""
"tries to recover the unsaved changes on next start.)</i>"
msgstr ""
"<i>(Automatisch opslaan slaat gewijzigde gegevenslagen op met periodieke "
-"intervallen. De backups worden opgeslagen in de voorkeursmap van JOSM. In "
+"intervallen. De back-ups worden opgeslagen in de voorkeursmap van JOSM. In "
"het geval van een crash probeert JOSM de niet-opgeslagen wijzigingen te "
"herstellen bij de volgende keer opstarten.)</i>"
@@ -11378,6 +11654,12 @@ msgstr ""
"<i>(JOSM kan een back-upbestand behouden bij het opslaan van gegevenslagen. "
"Het voegt ''~'' toe aan de bestandsnaam en slaat het op in dezelfde map.)</i>"
+msgid "Notification at each save"
+msgstr "Notificatie bij elke opslag"
+
+msgid "When saving, display a small notification"
+msgstr "Geef bij het opslaan een kleine notificatie weer"
+
msgid "File backup"
msgstr "Bestand back-up"
@@ -11450,10 +11732,8 @@ msgid "Settings for the map projection and data interpretation."
msgstr ""
"Instellingen voor projectie van kaarten en interpretatie van gegevens."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
-"Waarschuwing: Lezen niet mogelijk van de vooraf ingestelde bron voor taggen: "
-"{0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Kan vooraf ingestelde bron voor taggen niet lezen: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11737,22 +12017,7 @@ msgid "Swiss Grid (Switzerland)"
msgstr "Zwitsers raster (Zwitserland)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
-msgstr "<i>CH1903 / LV03 (zonder lokalr correcties)</i>"
-
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM-zone"
-
-msgid "North"
-msgstr "Noorden"
-
-msgid "South"
-msgstr "Zuiden"
-
-msgid "Hemisphere"
-msgstr "Halfrond"
+msgstr "<i>CH1903 / LV03 (zonder lokale correcties)</i>"
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11775,6 +12040,21 @@ msgstr "UTM Frankrijk (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Geodesisch systeem"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM-zone"
+
+msgid "North"
+msgstr "Noorden"
+
+msgid "South"
+msgstr "Zuiden"
+
+msgid "Hemisphere"
+msgstr "Halfrond"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Testen van OSM API URL ''{0}''"
@@ -11782,7 +12062,7 @@ msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
-"<html>''{0}'' is ngeen geldige OSM API URL.<br>Controleer de spelling en "
+"<html>''{0}'' is geen geldige OSM API URL.<br>Controleer de spelling en "
"valideer opnieuw.</html>"
msgid "Invalid API URL"
@@ -11821,7 +12101,7 @@ msgid ""
"spelling of ''{0}'' and validate again.</html>"
msgstr ""
"<html>De server van OSM API op ''{0}'' gaf geen geldig antwoord "
-"retour.<br>Het is aannemelijk dat ''{0}'' geen server voor OSM API "
+"terug.<br>Het is aannemelijk dat ''{0}'' geen server voor OSM API "
"is.<br>Controleer de spelling van ''{0}'' en valideer opnieuw.</html>"
msgid "Use Basic Authentication"
@@ -11840,11 +12120,11 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Selecteren om OAuth te gebruiken als mechanisme voor authenticatie"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Waarschuwing: Niet ondersteunde waarde in voorkeur ''{0}'', kreeg {1}''. "
-"Gebruik de authenticatie-methode ''Basis-authenticatie''."
+"Niet ondersteunde waarde in voorkeur ''{0}'', kreeg ''{1}''. Gebruik "
+"authenticatiemethode ''Basic Authentication''."
msgid "OSM username:"
msgstr "OSM gebruikersnaam:"
@@ -11852,29 +12132,31 @@ msgstr "OSM gebruikersnaam:"
msgid "OSM password:"
msgstr "OSM wachtwoord"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Waarschuwing: verkrijgen van de beveiligde gegevens van OSM vanuit het "
-"beheer van die gegevens mislukt."
+"Ophalen van inloggegevens voor OSM vanaf beheerder van inloggegevens mislukt."
msgid "Current credential manager is of type ''{0}''"
msgstr "Huidig beheer voor beveiligde gegevens is van het type ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Waarschuwing: opslaan van de beveiligde gegevens voor OSM naar beheer van "
-"die gegevens is mislukt."
+"Opslaan van inloggegevens voor OSM naar beheerder van inloggegevens mislukt."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Controleer periodiek op nieuwe berichten"
+
+msgid "Check interval (minutes):"
+msgstr "Interval voor controle (minuten):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Waarschuwing: verkrijgen van het Toegangstoken voor OAuth vanuit beheer "
-"beveiligde gegevens is mislukt"
+"Ophalen van toegangstoken voor OAuth vanaf beheerder van inloggegevens "
+"mislukt"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Waarschuwing: opslaan van Toegangstoken voor OAuth in beheer van beveiligde "
-"gegevens is mislukt"
+"Opslaan van toegangstoken voor OAuth naar beheerder van inloggegevens mislukt"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11967,18 +12249,12 @@ msgid "Use a SOCKS proxy"
msgstr "Gebruik een SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Waarschuwing: JOSM is geconfigureerd om proxies te gebruiken vanuit de "
-"systeeminstellingen, maar de JVM is niet geconfigureerd om die te "
-"verkrijgen. herstellen van voorkeuren naar ''Geen proxy''"
-
-msgid "disabled"
-msgstr "uitgeschakeld"
-
-msgid "no modifier"
-msgstr "geen toets voor aanpassen"
+"JOSM is geconfigureerd om proxyservers vanuit de systeeminstellingen te "
+"gebruiken, maar de JVM is niet geconfigureerd om ze te op te halen. "
+"Voorkeuren teruggezet naar ''Geen proxy''"
msgid "Shortcut Background: User"
msgstr "Sneltoets achtergrond: Gebruiker"
@@ -12021,38 +12297,37 @@ msgstr "Verwijder de selectie in de tabel met tags"
msgid "Add a new tag"
msgstr "Voeg een nieuw tag toe"
-msgid "Select auto-increment of {0} for this field"
-msgstr "Selecteer automatisch verhogen van {0} voor dit veld"
+msgid "Paste tags from buffer"
+msgstr "Plak tags uit buffer"
-msgid "Cancel auto-increment for this field"
-msgstr "Annuleer automatisch verhogen voor dit veld"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Voorkeuze ''{0}'' gebruiken"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Waarschuwing in voorkeuze taggen \"{0}-{1}\": Negeert attribuut ''{2}'' als "
-"''{3}'' elementen zijn opgegeven."
+msgid "Elements of type {0} are supported."
+msgstr "Elementen van type {0} worden ondersteund."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Gebroken voorkeur voor taggen \"{0}-{1}\" - aantal items in "
-"''display_values'' moet hetzelfde zijn als in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Wijzig {0} object"
+msgstr[1] "Wijzig {0} objecten"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Gebroken voorkeur voor taggen \"{0}-{1}\" - aantal items in "
-"''short_descriptions'' moet hetzelfde zijn als in ''values''"
+msgid "Nothing selected!"
+msgstr "Niets geselecteerd!"
-msgid "More information about this feature"
-msgstr "Meer informatie over deze functionaliteit"
+msgid "Selection unsuitable!"
+msgstr "Selectie is ongeschikt!"
+
+msgid "Apply Preset"
+msgstr "Voorkeuze toepassen"
+
+msgid "New relation"
+msgstr "Nieuwe relatie"
+
+msgid "Change Tags"
+msgstr "Tags wijzigen"
msgid "Unknown requisite: {0}"
msgstr "Onbekend vereiste: {0}"
@@ -12060,6 +12335,9 @@ msgstr "Onbekend vereiste: {0}"
msgid "Illegal member expression: {0}"
msgstr "Ongeldige uitdrukking voor lid: {0}"
+msgid "More information about this feature"
+msgstr "Meer informatie over deze functionaliteit"
+
msgid "Available roles"
msgstr "Beschikbare rollen"
@@ -12075,17 +12353,61 @@ msgstr "elementen"
msgid "Optional Attributes:"
msgstr "Optionele attributen:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
+msgid "Select auto-increment of {0} for this field"
+msgstr "Selecteer automatisch verhogen van {0} voor dit veld"
-msgid "Use preset ''{0}''"
-msgstr "Voorkeuze ''{0}'' gebruiken"
+msgid "Cancel auto-increment for this field"
+msgstr "Annuleer automatisch verhogen voor dit veld"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Waarschuwing in voorkeuze taggen \"{0}-{1}\": Negeert attribuut ''{2}'' als "
+"''{3}'' elementen zijn opgegeven."
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Verbroken voorkeur voor taggen \"{0}-{1}\" - Java methode opgegeven in "
+"''values_from'' is niet \"{2}\""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Verbroken voorkeur voor taggen \"{0}-{1}\" - Java methode opgegeven in "
+"''values_from'' gaf terug {2} ({3})"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Gebroken voorkeur voor taggen \"{0}-{1}\" - aantal items in "
+"''display_values'' moet hetzelfde zijn als in ''values''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Gebroken voorkeur voor taggen \"{0}-{1}\" - aantal items in "
+"''short_descriptions'' moet hetzelfde zijn als in ''values''"
msgid "Unknown type: {0}"
msgstr "Onbekend type: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Voorkeuze groep {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "Voorkeuze groep {0}"
+
msgid "Roles cannot appear more than once"
-msgstr "Rollen kunnen slechts één keer worden weergegeven"
+msgstr "Rollen kunnen slechts één keer worden weergegeven"
msgid "Preset role element without parent"
msgstr "Voorkeuze rol element zonder ouder"
@@ -12093,41 +12415,9 @@ msgstr "Voorkeuze rol element zonder ouder"
msgid "Preset sub element without parent"
msgstr "Voorkeuze sub-element zonder ouder"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Kan vooraf ingestelde bron voor taggen niet lezen: {0}"
-
msgid "Error parsing {0}: "
msgstr "Fout bij parsen van {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "Elementen van type {0} worden ondersteund."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Wijzig {0} object"
-msgstr[1] "Wijzig {0} objecten"
-
-msgid "Nothing selected!"
-msgstr "Niets geselecteerd!"
-
-msgid "Selection unsuitable!"
-msgstr "Selectie is ongeschikt!"
-
-msgid "Apply Preset"
-msgstr "Voorkeuze toepassen"
-
-msgid "New relation"
-msgstr "Nieuwe relatie"
-
-msgid "Change Properties"
-msgstr "Eigenschappen veranderen"
-
-msgid "Preset group {1} / {0}"
-msgstr "Voorkeuze groep {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "Voorkeuze groep {0}"
-
msgid "Search preset"
msgstr "Voorkeuze zoeken"
@@ -12143,6 +12433,16 @@ msgstr "Alleen die geselecteerd kunnen worden weergeven"
msgid "Search in tags"
msgstr "In tags zoeken"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Veranderlijke {0} is nog niet geregistreerd. Kan deelnemen in "
+"gesynchroniseerde aanpassingen niet instellen."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Veranderlijke {0} is nog niet geregistreerd."
+
msgid "All files (*.*)"
msgstr "Alle bestanden (*.*)"
@@ -12177,46 +12477,101 @@ msgid ""
msgstr ""
"De huidige waarde is geen geldige ID voor OSM. Voer een geheel getal > 0 in"
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Weg met externe ID ''{0}'' bevat ontbrekende knoop met externe ID ''{1}''."
+msgid "false: the property is explicitly switched off"
+msgstr "onwaar: de eigenschap is expliciet uitgeschakeld"
-msgid "Deleted node {0} is part of way {1}"
-msgstr "Verwijderde knoop {0} is deel van weg {1}"
+msgid "true: the property is explicitly switched on"
+msgstr "waar: de eigenschap is expliciet ingeschakeld"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"partial: different selected objects have different values, do not change"
msgstr ""
-"Weg {0} met {1} knopen heeft incomplete knopen omdat ten minste één knoop "
-"ontbreekt in de geladen gegevens."
+"gedeeltelijk: verschillende geselecteerde objecten hebben verschillende "
+"waarden, niet veranderen"
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
+msgid "unset: do not set this property on the selected objects"
msgstr ""
-"Relatie met externe ID ''{0}'' verwijst naar een ontbrekende primitief met "
-"externe ID ''{1}''."
+"niet ingesteld: deze eigenschap niet voor de geselecteerde objecten instellen"
-msgid "Deleted member {0} is used by relation {1}"
-msgstr "Verwijderd lid {0} wordt gebruikt door relatie {1}"
+msgid "Cut"
+msgstr "Knippen"
-msgid "All Formats"
-msgstr "Alle indelingen"
+msgid "Right click = copy to clipboard"
+msgstr "Klik met rechts = kopieer naar klembord"
-msgid "Downloading points {0} to {1}..."
-msgstr "Downloaden van punten {0} tot en met {1}..."
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Ontbrekend verplicht attribuut ''{0}''."
-msgid "Contacting OSM Server..."
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type long. Kreeg "
+"''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type long (>=0). "
+"Kreeg ''{1}''."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Ongeldige waarde voor attribuut ''{0}'' van het type double. Kreeg ''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type boolean. "
+"Kreeg ''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type "
+"OsmPrimitiveType. Kreeg ''{1}''."
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Weg met externe ID ''{0}'' bevat ontbrekende knoop met externe ID ''{1}''."
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Verwijderde knoop {0} is deel van weg {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"Weg {0} met {1} knopen heeft incomplete knopen omdat ten minste één knoop "
+"ontbreekt in de geladen gegevens."
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+"Relatie met externe ID ''{0}'' verwijst naar een ontbrekende primitief met "
+"externe ID ''{1}''."
+
+msgid "Deleted member {0} is used by relation {1}"
+msgstr "Verwijderd lid {0} wordt gebruikt door relatie {1}"
+
+msgid "All Formats"
+msgstr "Alle indelingen"
+
+msgid "Downloading points {0} to {1}..."
+msgstr "Downloaden van punten {0} tot en met {1}..."
+
+msgid "Contacting OSM Server..."
msgstr "Verbinden met server van OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Waarschuwing: ongeldige waarde van attribuut ''{0}'' van element ''{1}'' in "
-"mogelijkheden voor de server. Kreeg ''{2}''"
+"Ongeldige waarde van attribuut ''{0}'' van element ''{1}'' in "
+"servermogelijkheden. Kreeg ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Parsen van datum ''{0}'', antwoord van server, mislukt."
@@ -12263,40 +12618,35 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Ongeldig poortnummer in voorkeur ''{0}''. Kreeg {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Waarschuwing: onverwachte waarde voor voorkeur ''{0}'' gevonden. Kreeg "
-"''{1}''. Zal geen proxy gebruiken."
+"Onverwachte waarde voor voorkeur ''{0}'' gevonden. Kreeg ''{1}''. Zal geen "
+"proxy gebruiken."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Waarschuwing: Onverwachte parameters voor HTTP proxy. Kreeg host ''{0}'' en "
-"poort ''{1}''."
+"Onverwachte parameters voor HTTP-proxy. Kreeg host ''{0}'' en poort ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Waarschuwing: Onverwachte parameters voor SOCKS proxy. Kreeg host ''{0}'' en "
-"poort ''{1}''."
+"Onverwachte parameters voor SOCKS-proxy. Kreeg host ''{0}'' en poort ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Fout: Verbinding naar proxy ''{0}'' voor URI ''{1}'' mislukt. Uitzondering "
-"was: {2}"
+"Verbinding naar proxy ''{0}'' voor URI ''{1}'' mislukt. Exceptie was: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Waarschuwing: de JVM is niet geconfigureerd om proxies op te zoeken vanuit "
-"de systeeminstellingen. De eigenschap ''java.net.useSystemProxies'' ontbrak "
-"op het moment van opstarten. Zal geen proxy gebruiken."
+"De JVM is niet geconfigureerd om proxyservers op te zoeken in de "
+"systeeminstellingen. De eigenschap ''java.net.useSystemProxies'' ontbrak bij "
+"het opstarten. Zal geen proxy gebruiken."
msgid "Parsing response from server..."
msgstr "Antwoord van server parsen..."
@@ -12398,6 +12748,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Fout bij parsen: documentstructuur voor GPX-document is ongeldig"
+msgid "(at line {0}, column {1})"
+msgstr "(op regel {0}, kolom {1})"
+
msgid "Unknown mode {0}."
msgstr "Onbekende modus {0}."
@@ -12413,15 +12766,23 @@ msgstr "Zoeken naar afbeeldingsbestanden"
msgid "No image files found."
msgstr "Geen afbeeldingsbestanden gevonden."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "U heeft {0} niet gelezen bericht."
+msgstr[1] "U heeft {0} niet gelezen berichten."
+
+msgid "Click here to see your inbox."
+msgstr "Klik hier om uw postvak IN te bekijken."
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Openenen van invoerstroom voor bron ''{0}'' mislukt"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Waarschuwing: openen van bestand met de extensie ''{2}'' en deel van naam "
-"''{3}'' in zip-bestand ''{0}'' mislukt. Uitzondering was: {1}"
+"Openen van bestand met extensie ''{2}'' en deel van naam ''{3}'' in zip-"
+"bestand ''{0}'' mislukt. Exceptie was: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Hernoemen van bestand {0} naar {1} mislukt."
@@ -12507,8 +12868,8 @@ msgstr "Onbekende zinnen: {0}"
msgid "Zero coordinates: {0}"
msgstr "Nul-coördinaten: {0}"
-msgid "NMEA import success"
-msgstr "Importeren van NMEA gelukt"
+msgid "NMEA import success:"
+msgstr "NMEA importeren gelukt:"
msgid "NMEA import failure!"
msgstr "Importeren van NMEA mislukt!"
@@ -12616,48 +12977,15 @@ msgstr "Geen gegevens gevonden in bestand {0}."
msgid "Open OsmChange file"
msgstr "Open een OsmChange-bestand"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Ontbrekend verplicht attribuut ''{0}''."
-
msgid "Unsupported version: {0}"
msgstr "Niet ondersteunde versie: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type long. Kreeg "
-"''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type long (>=0). "
-"Kreeg ''{1}''."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Ongeldige waarde voor attribuut ''{0}'' van het type double. Kreeg ''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type boolean. "
-"Kreeg ''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Ongeldige waarde voor verplicht attribuut ''{0}'' van het type "
-"OsmPrimitiveType. Kreeg ''{1}''."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Waarschuwing: niet ondersteund startelement ''{0}'' in inhoud van "
-"wijzigingenset op positie ({1},{2}). Overslaan."
+"Niet-ondersteund startelement ''{0}'' in inhoud van wijzigingenset op "
+"positie ({1},{2}). Overgeslagen."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12667,11 +12995,11 @@ msgstr ""
"''maken'', ''aanpassen'', of ''verwijderen''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Waarschuwing: niet ondersteund eindelement ''{0}'' in inhoud wijzigingenset "
-"op positie ({1},{2}). Overslaan."
+"Niet-ondersteund eindelement ''{0}'' in inhoud van wijzigingenset op positie "
+"({1},{2}). Overgeslagen."
msgid "Parsing changeset content ..."
msgstr "Parsen van inhoud wijzigingenset ..."
@@ -12700,12 +13028,8 @@ msgstr ""
"Ondertekenen van een HTTP-verbinding met een kop van OAuth Authentication "
"mislukt"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-"Waarschuwing: onverwachte waarde voor voorkeur ''{0}''. Kreeg ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(op regel {0}, kolom {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Onverwachte waarde voor voorkeur ''{0}''. Kreeg ''{1}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Er trad een fout op bij het opslaan.<br>Fout is:<br>{0}</html>"
@@ -12717,9 +13041,6 @@ msgstr ""
"<html>Er trad een fout op bij het terugzetten van het back-"
"upbestand.<br>Fout is:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Kon geen back-up maken van het bestand. Uitzondering is: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM Server-bestanden gzip gecomprimeerd"
@@ -12741,6 +13062,9 @@ msgstr "Geen gegevens gevonden in bestand \"{0}\"."
msgid "Open OSM file"
msgstr "Open OSM-bestand"
+msgid "Reading was canceled"
+msgstr "Lezen werd geannuleerd"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12798,11 +13122,11 @@ msgstr ""
"Kreeg {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"WAARSCHUWING: Normaliseren van waarde van attribuut ''version'' van element "
-"{0} naar {2}, versie van API is ''{3}''. Kreeg {1}."
+"Normaliseren van waarde van attribuut ''version'' van element {0} naar {2}, "
+"versie van API is ''{3}''. Kreeg {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Onbekende of niet ondersteunde versie van de API. Kreeg {0}."
@@ -12954,6 +13278,9 @@ msgstr "Gebruikersnaam en wachtwoord opslaan (niet versleuteld)"
msgid "<delete from {0} objects>"
msgstr "<verwijderen uit {0} objecten>"
+msgid "Old values of"
+msgstr "Oude waarden van"
+
msgid "Add tags to selected objects"
msgstr "Voeg tags toe aan geselecteerde objecten"
@@ -12972,6 +13299,15 @@ msgstr "Shift+Enter: Voeg alle tags toe aan de geselecteerde objecten"
msgid "Assume"
msgstr "Veronderstelling"
+msgid "Existing values"
+msgstr "Bestaande waarden"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Schakel het keuzevak in om de waarde te accepteren"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Accepteer alle tags van {0} voor deze sessie"
+
msgid "Load data from API"
msgstr "Laad gegevens vanaf API"
@@ -12996,10 +13332,14 @@ msgstr "Nieuwe objecten maken"
msgid "Read protocol version"
msgstr "Lees protocolversie"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
-msgstr ""
-"Waarschuwing: Kan de server voor de afstandbediening niet starten op poort "
-"{0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr "Kan geen server voor afstandsbediening starten op poort {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Afstandsbediening::Accepteren van verbindingen op poort {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Afstandsbediening::Server gestopt."
msgid "Remote Control has been asked to create a new node."
msgstr "Afstandsbediening is gevraagd om een nieuwe knoop te maken."
@@ -13007,9 +13347,6 @@ msgstr "Afstandsbediening is gevraagd om een nieuwe knoop te maken."
msgid "There is no layer opened to add node"
msgstr "Er is geen laag geopend om de knoop aan toe te voegen"
-msgid "Add way"
-msgstr "Weg toevoegen"
-
msgid "Remote Control has been asked to create a new way."
msgstr "Afstandsbediening is gevraagd om een nieuwe weg te maken."
@@ -13019,6 +13356,17 @@ msgstr "Ongeldige coördinaten: {0}"
msgid "There is no layer opened to add way"
msgstr "Er is geen laag geopend om de weg aan toe te voegen"
+msgid "Add way"
+msgstr "Weg toevoegen"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+"Afstandsbediening is gevraagd zijn ondersteunde mogelijkheden te "
+"rapporteren. Dit stelt websites in staat een uitgevoerde versie van JOSM "
+"vast te stellen"
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -13036,6 +13384,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden."
+msgid "The latitudes must be between {0} and {1}"
+msgstr "De latituden moeten liggen tussen {0} en {1}"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "De longituden moeten liggen tussen {0} en {1}"
+
+msgid "The minima must be less than the maxima"
+msgstr "De minima moeten kleiner zijn dan de maxima"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -13072,20 +13429,20 @@ msgstr "Gegevens:"
msgid "local file"
msgstr "Lokaal bestand"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Koppeling naar een gegevensbestand van OSM op uw lokale schijf."
+msgid "Link to a GPX file on your local disk."
+msgstr "Kopeling naar een GPX-bestand op uw lokale schijf."
msgid "include"
msgstr "inclusief"
-msgid "Include OSM data in the .joz session file."
-msgstr "Neem OSM-gegevens op in het bestand van de sessie (.joz)."
+msgid "Include GPX data in the .joz session file."
+msgstr "Neem GPX-gegevens op in het .joz sessiebestand."
msgid "No file association"
msgstr "Geen bestandsassociatie"
-msgid "OSM data will be included in the session file."
-msgstr "OSM-gegevens zullen worden opgenomen in het bestand van de sessie."
+msgid "GPX data will be included in the session file."
+msgstr "GPX-gegevens zullen worden opgenomen in het sessiebestand."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13110,6 +13467,15 @@ msgstr "Laag bevat niet-opgeslagen gegevens - sla in bestand op."
msgid "Layer does not contain unsaved data."
msgstr "Laag bevat geen niet-opgeslagen gegevens."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Koppeling naar een gegevensbestand van OSM op uw lokale schijf."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Neem OSM-gegevens op in het bestand van de sessie (.joz)."
+
+msgid "OSM data will be included in the session file."
+msgstr "OSM-gegevens zullen worden opgenomen in het bestand van de sessie."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -13117,6 +13483,9 @@ msgstr ""
"Versie ''{0}'' van metagegevens voor gegevenslaag van OSM wordt niet "
"ondersteund. Verwacht: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Sessiebestand (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Niet in staat om bestand ''{0}'' te vinden."
@@ -13191,18 +13560,18 @@ msgid "Download skipped"
msgstr "Download overgeslagen"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Waarschuwing: Kan plug-in ''{0}'' niet downloaden. De koppeling om vanaf te "
-"downloaden is onbekend. Downloaden wordt overgeslagen."
+"Kan plugin ''{0}'' niet downloaden. De koppeling voor het downloaden is niet "
+"bekend. Downloaden overgeslagen."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Waarschuwing: Kan plug-in ''{0}'' niet downloaden. De koppeling om vanaf te "
-"downloaden ''{1}'' is geen geldige URL. Downloaden wordt overgeslagen."
+"Kan plug-in ''{0}'' niet downloaden. De koppeling voor downloaden ''{1}'' is "
+"geen geldige URL. Downloaden overgeslagen."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Maken van de plug-in map ''{0}'' mislukt"
@@ -13373,11 +13742,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Bijwerken van plug-in mislukt"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Waarschuwing: kon plugin {0} niet vinden"
+msgid "Failed to find plugin {0}"
+msgstr "Vinden van plug-in {0} mislukt"
-msgid "Warning: failed to download plugin information list"
-msgstr "Waarschuwing: downloaden van informatielijst van plug-in mislukt"
+msgid "Failed to download plugin information list"
+msgstr "Downloaden van informatielijst voor plug-in mislukt"
msgid "Disable plugin"
msgstr "Plug-in uitschakelen"
@@ -13391,30 +13760,28 @@ msgstr "Plug-in behouden"
msgid "Click to keep the plugin ''{0}''"
msgstr "Klik om de plug-in ''{0}'' te behouden"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Waarschuwing: verwijderen van de gedateerde plug-in ''{0}'' mislukt."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Verwijderden van verouderde plug-in ''{0}'' mislukt."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Waarschuwing: installeren van de reeds gedownloade plug-in ''{0}'' mislukt. "
-"Installatie wordt overgeslagen. JOSM laadt nog steeds de oude versie van de "
-"plug-in."
+"Installeren van reeds gedownloade plug-in ''{0}'' mislukt. Installatie "
+"overgeslagen. JOSM zal nog steeds de oude versie van de plug-in laden."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
-"Waarschuwing: mislukt om de plugin ''{0}'' te installeren vanuit het "
-"tijdelijk downloadbestand ''{1}''. {2}"
+"Installeren plug-in ''{0}'' uit tijdelijk gedownload bestand ''{1}'' "
+"mislukt. {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Waarschuwing: installeren van plug-in ''{0}'' vanuit het tijdelijke "
-"gedownloade bestand ''{1}'' mislukt. Hernoemen mislukt."
+"Installeren plug-in ''{0}'' uit tijdelijk gedownload bestand ''{1}'' "
+"mislukt. Hernoemen mislukt."
msgid "Click to disable the plugin ''{0}''"
msgstr "Klik om de plug-in ''{0}'' uit te schakelen"
@@ -13422,8 +13789,8 @@ msgstr "Klik om de plug-in ''{0}'' uit te schakelen"
msgid ""
"An unexpected exception occurred that may have come from the ''{0}'' plugin."
msgstr ""
-"Er trad een onverwachte uitzondering op die mogelijk afkomstig van de plug-"
-"in \"{0}\"."
+"Er trad een onverwachte exceptie op die mogelijk afkomstig van de plug-in "
+"\"{0}\"."
msgid "According to the information within the plugin, the author is {0}."
msgstr "Volgens de informatie in de plug-in, is de auteur {0}."
@@ -13492,11 +13859,10 @@ msgstr "Verwerken van bestanden in cache voor site van plug-in..."
msgid "Processing file ''{0}''"
msgstr "Verwerken van bestand ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Waarschuwing: scannen van bestand ''{0}'' voor informatie over plug-in "
-"mislukt. Overslaan."
+"Scannen van bestand ''{0}'' voor informatie over plug-in mislukt. "
+"Overgeslagen."
msgid "Processing plugin site cache icon files..."
msgstr ""
@@ -13511,12 +13877,27 @@ msgstr "Downloaden van lijst voor plug-in..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Downloaden van lijst voor plug-in vanaf ''{0}''"
+msgid "Plugin list download error"
+msgstr "Plug-inlijst fout bij downloaden"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM kon de plug-inlijst niet downloaden:"
+
+msgid "Details:"
+msgstr "Details:"
+
+msgid "Plugin icons download error"
+msgstr "Fout bij downloaden pictogrammen voor plug-in"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM kon de pictogrammen voor plug-in niet downloaden:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Waarschuwing: maken van map voor plug-in ''{0}'' mislukt. Kan geen lijst "
-"voor plug-in opslaan vanaf de site voor plug-in ''{1}''."
+"maken van map voor plug-in ''{0}'' mislukt. Kon plug-inlijst vanaf site voor "
+"plug-in ''{1}'' niet cachen."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Schrijven van lijst voor plug-in naar locale cache ''{0}''"
@@ -13529,7 +13910,7 @@ msgid ""
"Exception was: {1}"
msgstr ""
"Parsen van document voor lijst voor plug-in vanaf site ''{0}'' mislukt Site "
-"wordt overgeslagen. Uitzondering was: {1}"
+"wordt overgeslagen. Exceptie was: {1}"
msgid "Processing plugin list from site ''{0}''"
msgstr "Verwerking van lijst voor plug-in vanaf site ''{0}''"
@@ -13557,7 +13938,7 @@ msgid ""
"are running the latest<br>version of JOSM, please consider being kind and "
"file a bug report."
msgstr ""
-"Er trad een onverwachte uitzondering op.<br>Dit is altijd een fout in de "
+"Er trad een onverwachte exceptie op.<br>Dit is altijd een fout in de "
"codering. Indien u de laatste versie gebruikt van<br>JOSM, overweeg dan om "
"aardig te zijn en een foutenrapport in te dienen."
@@ -13977,24 +14358,13 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Lokaliseren van afbeelding ''{0}'' mislukt"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Waarschuwing: afhandelen van zip-bestand ''{0}'' mislukt. Uitzondering was: "
-"{1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
-"Waarschuwing: toegang tot map ''{0}'' mislukt wegens veiligheidsredenen. "
-"Uitzondering was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Afhandelen van zip-bestand ''{0}'' mislukt. Exceptie was: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Waarschuwing: voorvoegsel voor wiki-taal afleiden vanuit de locale code "
-"''{0}'' van JOSM mislukt. Gebruiken van standaardcode ''en''."
+"Toegang tot map ''{0}'' mislukt om beveiligingsredenen. Exceptie was: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [typ het nummer]"
@@ -14006,9 +14376,56 @@ msgstr ""
"Het openen van de URL is mislukt Er is momenteel geen platform ingesteld. "
"Stel eerst een platform in."
+msgid "Opening URL: {0}"
+msgstr "Openings-URL: {0}"
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr "gereserveerd"
+msgid "Outdated Java version"
+msgstr "Verouderde Java-versie"
+
+msgid "Update Java"
+msgstr "Java bijwerken"
+
+msgid "You are running version {0} of Java."
+msgstr "U voert versie {0} van Java uit."
+
+msgid "February 2013"
+msgstr "februari 2013"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+"Deze versie wordt niet langer ondersteund door {0} sinds {1} en wordt niet "
+"aanbevolen voor gebruik."
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+"JOSM zal het werken met deze versie snel beëindigen; wij adviseren u sterk "
+"om bij te werken naar Java {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Wilt u nu bijwerken?"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Stil conflict in sneltoetsen: ''{0}'' verplaatst door ''{1}'' naar ''{2}''."
@@ -14040,11 +14457,25 @@ msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-"<html><p> Sorry, het is niet mogelijk om tags vanuit de buffer te plakken. "
-"Die bevat geen object van JOSM of gepaste tekst. </p></html>"
+"<html><p> Sorry, het is niet mogelijk om tags uit de buffer te plakken. Het "
+"bevat geen JOSM-object of geschikte tekst. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Klik met rechts = kopieer naar klembord"
+msgid "ms"
+msgstr "ms"
+
+msgid "s"
+msgstr "s"
+
+msgid "min"
+msgstr "min"
+
+msgid "h"
+msgstr "u"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dag"
+msgstr[1] "dagen"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14065,7 +14496,7 @@ msgid ""
"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
"{2}. Cannot restore window geometry from preferences."
msgstr ""
-"Veld ''{1}'' parsen mislukt in voorkeur met toets ''{0}''. Uitzondering was: "
+"Veld ''{1}'' parsen mislukt in voorkeur met toets ''{0}''. Exceptie was: "
"{2}. Kan geen geometrie voor het venster herstellen vanuit de voorkeuren."
msgid ""
@@ -14390,6 +14821,13 @@ msgid "Saturation:"
msgstr "Verzadiging:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Maakt bewerken verkeersinformatie mogelijk en exporteert het naar de "
+"stedelijke mobiliteitssimulator SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14425,11 +14863,11 @@ msgid ""
"white background with matching colors for better visibility in bright "
"sunlight. See dialog in display preferences."
msgstr ""
-"Stelt de gebruiker in staat verschillende kleurenschema's te maken en daar "
-"tussen te schakelen. Wijzig gewoon de kleuren en maak een nieuw schema. "
-"gebruikt om te schakelen tussen een witte achtergrond en overeenkomende "
-"kleuren voor betere zicht in helder zonlicht. Bekijk het dialoogvenster in "
-"voorkeuren weergave."
+"Maakt het de gebruiker mogelijk om verschillende kleurenschema''s te maken "
+"en daar tussen te schakelen. Wijzig eenvoudigweg de kleuren en maak een "
+"nieuw schema. Gebruikt om te schakelen naar een witte achtergrond met "
+"overeenkomende kleuren voor betere zichtbaarheid in helder zonlicht. Bekijk "
+"het dialoogvenster in de voorkeuren voor de weergave."
msgid ""
"Imports proprietary CSV files of the Columbus/Visiontac V-900 GPS logger "
@@ -14497,6 +14935,12 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Zoekt en repareert ongeldige adressen op een comfortabele manier."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Spreek met gebruikers de de kaart dichtbij bewerken, krijg bericht als "
+"iemand dichtbij komt."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14634,9 +15078,6 @@ msgstr "Voegt Niet linksaf slaan toe voor sets van 4 of 5 wegen"
msgid "Simplifies download from different read-only APIs."
msgstr "Vereenvoudigt downloaden vanaf verschillende alleen-lezen API''s."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Eenvoudig converteren van een gebied naar een multipolygoon."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Maakt het mogelijk om in één keer tags voor attributen toe te wijzen aan "
@@ -14711,6 +15152,9 @@ msgstr ""
"afbeeldingsbestand. Voer deze mogelijkheid uit via het rechtsklik-menu van "
"de afbeeldingslaag."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14739,9 +15183,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Venster voor bewerken en maken van relatie en multipolygoon."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Voegt item JOSM herstarten toe aan menu Bestand."
-
msgid "Plugin for reverting changesets"
msgstr "Plug-in voor het omdraaien van wijzigingensets"
@@ -14776,9 +15217,6 @@ msgstr ""
"Dit kan worden beperkt door de grootte van het te verwijderen gebied te "
"maximaliseren. Ook gemiddelde nabij knopen."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Maken en bewerken van zeekaarten voor OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Mogelijkheden om te bewerken voor OpenSeaMap"
@@ -14818,9 +15256,9 @@ msgid ""
"Provides helper buttons to allow working with single button mouse (stylus). "
"Activate by holding T and slip map with left mouse button"
msgstr ""
-"Verschaft hulpknoppen om werken met één muiksnop mogelijk te maken (stylus). "
-"Activeren door T ingedrukt te houden en de kaart te slepen met de linker "
-"muisknop"
+"Verschaft hulpknoppen om werken met één enkele muisknop mogelijk te maken "
+"(stylus). Activeren door T ingedrukt te houden en de kaart met de linker "
+"muisknop te verschuiven"
msgid ""
"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -14829,6 +15267,13 @@ msgstr ""
"Traceert gebouwen vanaf de Tsjechische kadastrale kaart. Heeft TracerServer "
"(.NET of Mono) nodig om te kunnen worden uitgevoerd."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+"Spoort gebouwen en andere vormen op een kaart op. Tracer2Server moet "
+"uitgevoerd worden."
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Plug-in om gegevens voor OSM digitaal te ondertekenen"
@@ -14892,9 +15337,6 @@ msgstr ""
"Stuur een racewagen van punt A naar punt B over luchtfoto''s, stof "
"achterlatend."
-msgid "Highways"
-msgstr "Wegen"
-
msgid "Streets"
msgstr "Straten"
@@ -14979,6 +15421,9 @@ msgstr "Verhoging"
msgid "Lit"
msgstr "Verlicht"
+msgid "Toll"
+msgstr "Tol"
+
msgid "Motorway Link"
msgstr "Af-/Oprit autosnelweg"
@@ -15069,6 +15514,50 @@ msgstr "Straat"
msgid "Edit Residential Street"
msgstr "Een straat bewerken"
+msgid "Bicycle Road"
+msgstr "Fietspad"
+
+msgid "Edit Bicycle Road"
+msgstr "Bewerken Fietspad"
+
+msgid "Highway type"
+msgstr "Type weg"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "woongebied"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "toegangsweg"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "niet geclassificeerd"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "pad"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "fietsstrook"
+
+msgid "Vehicle access"
+msgstr "Toegangsrechten"
+
+msgid "yes"
+msgstr "ja"
+
+msgid "no"
+msgstr "nee"
+
+msgid "destination"
+msgstr "bestemmingsverkeer"
+
+msgid "Oneway for bicycle"
+msgstr "Eénrichting voor fietsers"
+
msgid "Living Street"
msgstr "Woonerf"
@@ -15087,11 +15576,11 @@ msgstr "Gebied"
msgid "Service"
msgstr "Toegangsweg"
-msgid "Edit Serviceway"
-msgstr "Een toegangsweg bewerken"
+msgid "Edit Service Way"
+msgstr "Bewerken Toegangsweg"
-msgid "Serviceway type"
-msgstr "Type dienstweg"
+msgid "Service way type"
+msgstr "Type toegangsweg"
msgid "alley"
msgstr "brandgang"
@@ -15102,6 +15591,9 @@ msgstr "oprit"
msgid "parking_aisle"
msgstr "Weg op parkeerplaats"
+msgid "drive-through"
+msgstr "doorgang"
+
msgid "Parking Aisle"
msgstr "Weg op parkeerplaats"
@@ -15129,18 +15621,12 @@ msgstr "rotonde"
msgid "jughandle"
msgstr "afrit"
-msgid "yes"
-msgstr "ja"
-
msgid "Road Restrictions"
msgstr "Toegangsbeperkingen"
msgid "Edit Road Restrictions"
msgstr "Toegangsbeperkingen bewerken"
-msgid "Toll"
-msgstr "Tol"
-
msgid "No exit (cul-de-sac)"
msgstr "Doodlopende weg"
@@ -15150,9 +15636,6 @@ msgstr "Toegangsbeperkingen"
msgid "General Access"
msgstr "Algemene toegang"
-msgid "destination"
-msgstr "bestemmingsverkeer"
-
msgid "delivery"
msgstr "afleveren goederen"
@@ -15162,15 +15645,15 @@ msgstr "met vergunning"
msgid "private"
msgstr "privé"
+msgid "customers"
+msgstr "klanten"
+
msgid "agricultural"
msgstr "landbouwverkeer"
msgid "forestry"
msgstr "verkeer bosbouw"
-msgid "no"
-msgstr "nee"
-
msgid "official"
msgstr "officieel"
@@ -15216,6 +15699,9 @@ msgstr "Spitsstrook"
msgid "Public Service Vehicles (psv)"
msgstr "Openbaar vervoer"
+msgid "Tourist buses"
+msgstr "Toeristenbussen"
+
msgid "Min. speed (km/h)"
msgstr "Min. snelheid (km/u)"
@@ -15300,6 +15786,9 @@ msgstr "Een brug bewerken"
msgid "viaduct"
msgstr "viaduct"
+msgid "suspension"
+msgstr "overspanning"
+
msgid "swing"
msgstr "hangbrug"
@@ -15417,20 +15906,29 @@ msgstr ""
msgid "Visibility"
msgstr "Zichtbaarheid"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "uitstekend"
+msgstr "voortreffelijk"
+msgctxt "trail_visibility"
msgid "good"
msgstr "goed"
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr "gemiddeld"
+msgctxt "trail_visibility"
msgid "bad"
msgstr "slecht"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "verschrikkelijk"
+msgstr "uitermate slecht"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "geen"
msgid "Wheelchairs"
msgstr "Rolstoelen"
@@ -15447,11 +15945,11 @@ msgstr "Voorbestemd ruiterpad"
msgid "Edit Bridleway"
msgstr "Ruiterpad bewerken"
-msgid "Cycle Lane"
-msgstr "Fietsstrook"
+msgid "Cycle Lane/Track"
+msgstr "Fietsstrook/-pad"
-msgid "Edit Cycle Lane"
-msgstr "Fietsstrook bewerken"
+msgid "Edit Cycle Lane or Track"
+msgstr "Bewerken Fietsstrook/-pad"
msgid "Cycleway"
msgstr "Fietspad"
@@ -15484,10 +15982,10 @@ msgid "Cycleway right"
msgstr "Fietspad rechts"
msgid "Oneway (bicycle)"
-msgstr "Eénrichting (fiets)"
+msgstr "Eénrichting (fiets)"
-msgid "Edit Highway"
-msgstr "Highway bewerken"
+msgid "Edit Highway Attributes:"
+msgstr "Bewerken Attributen Highway:"
msgid "Highway"
msgstr "Highway"
@@ -15555,12 +16053,18 @@ msgstr "Rustplaats"
msgid "Edit Rest Area"
msgstr "Bewerken rustplaats"
-msgid "Emergency Phone"
-msgstr "Praatpaal"
+msgid "Drinking Water"
+msgstr "Drinkwater"
msgid "Traffic Signal"
msgstr "Verkeerslicht"
+msgid "Edit Traffic Signal"
+msgstr "Bewerken verkeerslichten"
+
+msgid "Optional crossing attributes:"
+msgstr "Optionele attributen kruisingen:"
+
msgid "Pedestrian crossing type"
msgstr "Type voetgangersoversteekplaats"
@@ -15576,15 +16080,6 @@ msgstr "eiland"
msgid "unmarked"
msgstr "niet gemarkeerd"
-msgid "Cross on horseback"
-msgstr "Als ruiter oversteken"
-
-msgid "Cross by bicycle"
-msgstr "Op de fiets oversteken"
-
-msgid "Crossing attendant"
-msgstr "Klaar-over"
-
msgid "Crossing type name (UK)"
msgstr "Type naam oversteekplaats (UK)"
@@ -15606,6 +16101,15 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr "Klaar-over"
+
+msgid "Cross by bicycle"
+msgstr "Op de fiets oversteken"
+
+msgid "Cross on horseback"
+msgstr "Als ruiter oversteken"
+
msgid "Stop"
msgstr "Stop"
@@ -15615,6 +16119,9 @@ msgstr "Voorrang verlenen"
msgid "Mini-roundabout"
msgstr "Mini-rotonde"
+msgid "Edit Mini-Roundabout"
+msgstr "Bewerken: Minirotonde"
+
msgid "Direction"
msgstr "Richting"
@@ -15624,11 +16131,8 @@ msgstr "met de klok mee"
msgid "Pedestrian Crossing"
msgstr "Voetgangersoversteekplaats"
-msgid "Edit Crossing"
-msgstr "Bewerken oversteekplaats"
-
-msgid "Type name (UK)"
-msgstr "Type naam (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Bewerken voetgangersoversteekplaats"
msgid "Traffic Calming"
msgstr "Verkeersremmers"
@@ -15660,9 +16164,6 @@ msgstr "verkeersplateau"
msgid "Passing Place"
msgstr "Passeerstrook"
-msgid "Edit Passing Place"
-msgstr "Passeerstrook bewerken"
-
msgid "Turning Circle"
msgstr "Draaicirkel"
@@ -15696,20 +16197,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Barrières"
+msgid "Block"
+msgstr "Blok"
+
+msgid "Edit Block"
+msgstr "Blok bewerken"
+
+msgid "Allowed traffic:"
+msgstr "Toegestaan verkeer:"
+
+msgid "Material"
+msgstr "Materiaal"
+
+msgid "stone"
+msgstr "steen"
+
msgid "Bollard"
msgstr "Verkeerspaal"
msgid "Edit Bollard"
msgstr "Verkeerspaal bewerken"
-msgid "Allowed traffic:"
-msgstr "Toegestaan verkeer:"
+msgid "Bollard type"
+msgstr "type Bollard"
+
+msgid "rising"
+msgstr "stijgend"
+
+msgid "removable"
+msgstr "verwijderbaar"
+
+msgid "plastic"
+msgstr "plastiek"
msgid "Cycle Barrier"
msgstr "Fietshekje"
-msgid "Block"
-msgstr "Blok"
+msgid "Edit Cycle Barrier"
+msgstr "Fietsbarrière bewerken"
msgid "Cattle Grid"
msgstr "Wildrooster"
@@ -15720,6 +16245,9 @@ msgstr "Wildrooster bewerken"
msgid "Bus Trap"
msgstr "Bussluis"
+msgid "Edit Bus Trap"
+msgstr "Bussluis bewerken"
+
msgid "Spikes"
msgstr "Pennen"
@@ -15741,44 +16269,88 @@ msgstr "Grenspost bewerken"
msgid "Hedge"
msgstr "Haag"
+msgid "Edit Hedge"
+msgstr "Haag bewerken"
+
+msgid "Height (meters)"
+msgstr "Hoogte (meters)"
+
+msgid "Genus"
+msgstr "Genre"
+
+msgid "Species"
+msgstr "Soort"
+
+msgid "Taxon"
+msgstr "Taxus"
+
msgid "Fence"
msgstr "Hek"
+msgid "Edit Fence"
+msgstr "Hek bewerken"
+
msgid "barbed_wire"
msgstr "prikkeldraad"
-msgid "chain"
+msgid "chain_link"
msgstr "ketting"
msgid "electric"
msgstr "elektrisch"
-msgid "hedge"
-msgstr "heg"
-
msgid "pole"
msgstr "paal"
msgid "split_rail"
msgstr "boomstammen"
+msgid "wire"
+msgstr "draad"
+
+msgid "Guard Rail"
+msgstr "Vangrail"
+
+msgid "Edit Guard Rail"
+msgstr "Vangrail bewerken"
+
msgid "Wall"
msgstr "Muur"
+msgid "Edit Wall"
+msgstr "Wal bewerken"
+
msgid "City Wall"
msgstr "Stadsmuur"
+msgid "Edit City Wall"
+msgstr "Stadswal bewerken"
+
msgid "Retaining Wall"
msgstr "Keermuur"
+msgid "Edit Retaining Wall"
+msgstr "Keermuur bewerken"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Gracht"
-msgid "Entrance"
-msgstr "Doorgang"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Bewerken Gracht"
-msgid "Edit Entrance"
-msgstr "Doorgang bewerken"
+msgid "Kerb"
+msgstr "Berm"
+
+msgid "Edit Kerb"
+msgstr "Berm bewerken"
+
+msgid "Entrance (barrier opening)"
+msgstr "Ingang (barrière-opening)"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Bewerken Ingang (barrière-opening)"
msgid "Gate"
msgstr "Gate"
@@ -15810,12 +16382,27 @@ msgstr "Voetgangershek"
msgid "Edit Kissing Gate"
msgstr "Voetgangershek bewerken"
+msgid "Chain"
+msgstr "Ketting"
+
+msgid "Edit Chain"
+msgstr "Ketting bewerken"
+
msgid "Stile"
msgstr "Overstaphek"
msgid "Edit Stile"
msgstr "Overstaphek bewerken"
+msgid "ladder"
+msgstr "ladder"
+
+msgid "squeezer"
+msgstr "versmalling"
+
+msgid "stepover"
+msgstr "overstap"
+
msgid "Turnstile"
msgstr "Draaipoortje"
@@ -15873,6 +16460,9 @@ msgstr "Greppel"
msgid "Edit Drain"
msgstr "Greppel bewerken"
+msgid "Ditch"
+msgstr "Gracht"
+
msgid "Edit Ditch"
msgstr "Gracht bewerken"
@@ -15882,6 +16472,12 @@ msgstr "Beek"
msgid "Edit Stream"
msgstr "Beek bewerken"
+msgid "Wadi"
+msgstr "Wadi"
+
+msgid "Edit Wadi"
+msgstr "Bewerken Wadi"
+
msgid "Canal"
msgstr "Kanaal"
@@ -15921,9 +16517,6 @@ msgstr "Dam bewerken"
msgid "Groyne"
msgstr "Strekdam"
-msgid "Edit Groyne"
-msgstr "Strekdam bewerken"
-
msgid "Breakwater"
msgstr "Golfbreker"
@@ -15957,6 +16550,21 @@ msgstr "Ondergronds reservoir bewerken"
msgid "Edit Water"
msgstr "Water bewerken"
+msgid "Water Body"
+msgstr "Water"
+
+msgid "lake"
+msgstr "meer"
+
+msgid "lagoon"
+msgstr "lagune"
+
+msgid "pond"
+msgstr "vijver"
+
+msgid "reservoir"
+msgstr "reservoir"
+
msgid "Land"
msgstr "Land"
@@ -16038,20 +16646,25 @@ msgstr "Veerbootterminal bewerken"
msgid "Cargo"
msgstr "Lading"
+msgctxt "cargo"
msgid "passengers"
msgstr "passagiers"
+msgctxt "cargo"
msgid "vehicle"
-msgstr "voertuigen"
+msgstr "voertuig"
+msgctxt "cargo"
msgid "bicycle"
msgstr "fiets"
+msgctxt "cargo"
msgid "hgv"
-msgstr "zwaar vervoer"
+msgstr "zwaar vrachtverkeer"
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "pasagiers;voertuigen"
+msgstr "passagiers;voertuig"
msgid "Ferry Route"
msgstr "Route veerpont"
@@ -16122,8 +16735,11 @@ msgstr "militair gebruik"
msgid "tourism"
msgstr "toerisme"
-msgid "Service/Type"
-msgstr "Service/Type"
+msgid "freight"
+msgstr "Vracht"
+
+msgid "Service type"
+msgstr "Type Service"
msgid "yard"
msgstr "tuin"
@@ -16146,11 +16762,14 @@ msgstr "bovenleiding"
msgid "rail"
msgstr "spoor"
-msgid "Voltage"
-msgstr "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr "Voltage in Volt (V)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Frequentie in Hertz (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Frequentie (Hz)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16,7"
@@ -16161,9 +16780,6 @@ msgstr "Smalspoor"
msgid "Edit Narrow Gauge Rail"
msgstr "Smalspoor bewerken"
-msgid "Types"
-msgstr "Types"
-
msgid "Monorail"
msgstr "Monorail"
@@ -16206,18 +16822,56 @@ msgstr "Ongebruikt spoor"
msgid "Edit Disused Railway"
msgstr "Ongebruikt spoor bewerken"
-msgid "Optional Types"
-msgstr "Optionele typen"
-
msgid "Abandoned Rail"
msgstr "Oud ongebruikt spoor"
+msgid "Edit Abandoned Railway"
+msgstr "Spoorweg buiten gebruik bewerken"
+
msgid "Level Crossing"
msgstr "Bewaakte spoorwegovergang"
+msgid "Edit Level Crossing"
+msgstr "Bewerken Spoorwegovergang"
+
+msgid "Supervised"
+msgstr "Toezicht"
+
+msgid "Traffic lights"
+msgstr "Verkeerslichten"
+
+msgid "Sound signals"
+msgstr "Signalering (acoustisch)"
+
+msgid "Barrier"
+msgstr "Barrière"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "ja"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "nee"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "helft"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "volledig"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "dubbele_helft"
+
msgid "Crossing"
msgstr "Onbewaakte spoorwegovergang"
+msgid "Edit Crossing"
+msgstr "Bewerken Voetgangersoversteekplaats"
+
msgid "Crossing type"
msgstr "Type oversteekplaats"
@@ -16317,13 +16971,11 @@ msgstr "Vliegend tapijt"
msgid "Edit Magic Carpet"
msgstr "Vliegend tapijt bewerken"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Goederen"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Goederen bewerken"
+msgstr "Bewerken Goederen"
msgctxt "aerialway"
msgid "Station"
@@ -16333,13 +16985,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Station bewerken"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Kabelmast"
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Kabelmast bewerken"
+msgstr "Bewerken Kabelmast"
msgid "Parking"
msgstr "Parkeerplaats"
@@ -16356,12 +17006,12 @@ msgstr "oppervlak"
msgid "underground"
msgstr "ondergronds"
+msgid "rooftop"
+msgstr "dak"
+
msgid "Access"
msgstr "Toegang"
-msgid "customers"
-msgstr "klanten"
-
msgid "Park and Ride"
msgstr "PR (Parkeer en Reis)"
@@ -16389,9 +17039,6 @@ msgstr "Parkeerplaats"
msgid "Edit Parking space"
msgstr "Parkeerplaats bewerken"
-msgid "rooftop"
-msgstr "dak"
-
msgid "Capacity"
msgstr "Capaciteit"
@@ -16407,20 +17054,38 @@ msgstr "Tijdslimiet (minuten)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Toezicht"
-
msgid "Opening Hours"
msgstr "Openingstijden"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Ma-Vr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
+
+msgid "Sa-Su 00:00-24:00"
+msgstr "za-zo 00:00-24:00"
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "ma-vr 08:30-20:00; za,zo 08:00-15:00; feestdagen gesl."
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "ma-vr 08:30-20:00,di-zo 08:00-15:00; za 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"ma-zo 08:00-18:00; 10-15 apr. gesl. ; juni 08:00-14:00; aug gesl.; 25 dec. "
+"gesl."
+
+msgid "sunrise-sunset"
+msgstr "zonsopkomst - zonsondergang"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Di-Zo 08:00-15:00;Za 08:00-12:00"
+msgid "Su 10:00+"
+msgstr "zo 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "week 1-53/2 vr 09:00-12:00; week 2-52/2 wo 09:00-12:00"
msgid "Parking entrance"
msgstr "Ingang parkeren"
@@ -16569,6 +17234,9 @@ msgstr "Oplaadstation"
msgid "Edit Charging Station (for electric cars)"
msgstr "Oplaadstation (voor elektrische auto''s) bewerken"
+msgid "Voltage"
+msgstr "Voltage"
+
msgid "Amperage"
msgstr "Laadstroom"
@@ -16582,7 +17250,7 @@ msgid "Car Dealer"
msgstr "Autodealer"
msgid "Edit Car Shop"
-msgstr "Winkel met autoonderdelen bewerken"
+msgstr "Winkel met auto-onderdelen bewerken"
msgid "Repair"
msgstr "Garage"
@@ -16590,6 +17258,12 @@ msgstr "Garage"
msgid "Edit Car Repair"
msgstr "Autogarage bewerken"
+msgid "Parts"
+msgstr "Onderdelen"
+
+msgid "Edit Car Parts"
+msgstr "Bewerken Winkel voor auto-onderdelen"
+
msgid "Tyres"
msgstr "Banden"
@@ -16617,6 +17291,12 @@ msgstr "Verhuur"
msgid "Edit Car Rental"
msgstr "Autoverhuur bewerken"
+msgid "Second hand"
+msgstr "Tweedehands"
+
+msgid "only"
+msgstr "alleen"
+
msgid "Sharing"
msgstr "Auto delen"
@@ -16641,22 +17321,6 @@ msgstr "Diensten:"
msgid "Sale"
msgstr "Verkoop"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "ja"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "merk"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "tweedehands"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "nee"
-
msgid "brand"
msgstr "merk"
@@ -16678,9 +17342,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Onderdelen"
-
msgid "Clothes"
msgstr "Kleding"
@@ -16745,8 +17406,8 @@ msgstr "Fietsverhuur bewerken"
msgid "Public Transport"
msgstr "Openbaar vervoer"
-msgid "Route"
-msgstr "Route"
+msgid "Public transport route"
+msgstr "Route openbaar vervoer"
msgid "Edit Route"
msgstr "Route bewerken"
@@ -16876,6 +17537,9 @@ msgstr "Perron"
msgid "Station or amenities"
msgstr "Station of faciliteiten"
+msgid "Edit Stop Position"
+msgstr "Bewerken Halteplaats"
+
msgid "Bus"
msgstr "Bus"
@@ -16906,6 +17570,9 @@ msgstr "Kabelbaan"
msgid "Ferry"
msgstr "Veerboot"
+msgid "Edit Platform"
+msgstr "Bewerken Platform"
+
msgid "Bench"
msgstr "Bank"
@@ -16918,9 +17585,6 @@ msgstr "Rolstoel"
msgid "limited"
msgstr "beperkt"
-msgid "only"
-msgstr "alleen"
-
msgid "Highway platform (legacy)"
msgstr "Hoofdperron (oud)"
@@ -16930,9 +17594,14 @@ msgstr "Spoorwegperron (oud)"
msgid "funicular"
msgstr "kabelbaan"
+msgctxt "railway"
msgid "Station"
msgstr "Station"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Station bewerken"
+
msgid "Building"
msgstr "Gebouw"
@@ -16945,6 +17614,9 @@ msgstr "In-/uitgang metro bewerken"
msgid "Ticket Machine"
msgstr "Kaartjesautomaat"
+msgid "Edit Ticket Machine"
+msgstr "Bewerken Kaartautomaat"
+
msgid "Reference Number"
msgstr "Referentienummer"
@@ -16969,14 +17641,6 @@ msgstr "Klantenkaarten"
msgid "Public Transport (legacy)"
msgstr "Openbaar vervoer (oud)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Station"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Station bewerken"
-
msgid "UIC-Reference"
msgstr "UIC-referentie (vervallen)"
@@ -17025,8 +17689,8 @@ msgstr "Busperron bewerken"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Taxistandplaats bewerken"
+msgid "Edit Taxi Station"
+msgstr "Bewerken Taxistandplaats"
msgid "Airport"
msgstr "Luchthaven"
@@ -17079,6 +17743,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Terminal bewerken"
+msgid "Internet access"
+msgstr "Internettoegang"
+
+msgid "wlan"
+msgstr "wlan"
+
+msgid "wired"
+msgstr "bekabeld"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Kosten internettoegang"
+
msgctxt "airport"
msgid "Gate"
msgstr "Gate"
@@ -17101,21 +17780,6 @@ msgstr "Hotel bewerken"
msgid "Stars"
msgstr "Sterren"
-msgid "Internet access"
-msgstr "Internettoegang"
-
-msgid "wlan"
-msgstr "wlan"
-
-msgid "wired"
-msgstr "bekabeld"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Kosten internettoegang"
-
msgid "Smoking"
msgstr "Roken"
@@ -17299,6 +17963,12 @@ msgstr "Nachtclub"
msgid "Edit Nightclub"
msgstr "Nachtclub bewerken"
+msgid "Stripclub"
+msgstr "Stripclub"
+
+msgid "Edit Stripclub"
+msgstr "Stripclub bewerken"
+
msgid "Tourism"
msgstr "Toerisme"
@@ -17320,9 +17990,15 @@ msgstr "Uitkijktoren"
msgid "Information Office"
msgstr "Informatiekantoor"
+msgid "Edit Information Office"
+msgstr "Bewerken Informatie (kantoor)"
+
msgid "Map"
msgstr "Kaart"
+msgid "Edit Information Map"
+msgstr "Bewerken Informatie (kaart)"
+
msgid "Detail Grade"
msgstr "Detailniveau"
@@ -17335,6 +18011,9 @@ msgstr "straat"
msgid "scheme"
msgstr "schema"
+msgid "toposcope"
+msgstr "markering"
+
msgid "Shown Area"
msgstr "Weergegeven gebied"
@@ -17374,6 +18053,9 @@ msgstr "... ander mogelijk vervoer"
msgid "Information Board"
msgstr "Informatiebord"
+msgid "Edit Information Board"
+msgstr "Bewerken Informatie (bord)"
+
msgid "Board Content"
msgstr "Inhoud bord"
@@ -17395,23 +18077,35 @@ msgstr "beplanting"
msgid "Guidepost"
msgstr "Wegwijzer"
+msgid "Edit Guidepost"
+msgstr "Bewerken Informatiepunt"
+
msgid "Information Terminal"
msgstr "Informatiekiosk"
+msgid "Edit Information Terminal"
+msgstr "Bewerken Informatie (hal)"
+
msgid "Closer description"
msgstr "Uitgebreide beschrijving"
msgid "Audioguide"
msgstr "Audiogids"
+msgid "Edit Audioguide"
+msgstr "Bewerken Audiogids"
+
msgid "Audioguide via mobile phone?"
msgstr "Audiogids via mobiele telefoon?"
msgid "Phone number"
msgstr "Telefoonnummer"
-msgid "Other Information Points"
-msgstr "Andere informatiepunten"
+msgid "Other Information Point"
+msgstr "Ander informatiepunt"
+
+msgid "Edit Information Point"
+msgstr "Bewerken Ander informatiepunt"
msgid "Leisure"
msgstr "Vrije tijd"
@@ -17434,9 +18128,6 @@ msgstr "Hondenuitlaatgebied"
msgid "Edit Dog Park"
msgstr "Hondenuitlaatgebied bewerken"
-msgid "Barrier"
-msgstr "Barrière"
-
msgid "fence"
msgstr "omheining"
@@ -17461,8 +18152,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Sauna bewerken"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Di-Zo 08:00-15:00; Za 08:00-12:00"
+msgid "Horse riding"
+msgstr "Paardrijden"
+
+msgid "Edit Horse riding"
+msgstr "Paardrijden bewerken"
+
+msgid "Brothel"
+msgstr "Bordeel"
+
+msgid "Edit Brothel"
+msgstr "Bordeel bewerken"
msgid "Playground"
msgstr "Speelveld"
@@ -17499,7 +18199,7 @@ msgid "Edit Fishing"
msgstr "Visstek bewerken"
msgid "Private Swimming Pool"
-msgstr "Privézwembad"
+msgstr "Privézwembad"
msgid "Culture"
msgstr "Cultuur"
@@ -17534,50 +18234,44 @@ msgstr "Kunstwerk"
msgid "Edit Artwork"
msgstr "Kunstwerk bewerken"
-msgid "Place of Worship"
-msgstr "Religieus gebouw"
-
-msgid "Edit Place of Worship"
-msgstr "Religieus gebouw bewerken"
-
-msgid "Religion"
-msgstr "Religie"
+msgid "Recording Studio"
+msgstr "Opnamestudio"
-msgid "bahai"
-msgstr "Bahai"
+msgid "Edit Studio"
+msgstr "Opnamestudio bewerken"
-msgid "buddhist"
-msgstr "Boeddhisme"
+msgid "audio"
+msgstr "audio"
-msgid "christian"
-msgstr "Christelijk"
+msgid "video"
+msgstr "video"
-msgid "hindu"
-msgstr "Hindoestaans"
+msgid "Place of Worship"
+msgstr "Religieus gebouw"
-msgid "jain"
-msgstr "Jain"
+msgid "Church"
+msgstr "Kerk"
-msgid "jewish"
-msgstr "Joods"
+msgid "Edit Church"
+msgstr "Kerk bewerken"
-msgid "muslim"
-msgstr "Moslim"
+msgid "Building type"
+msgstr "Type gebouw"
-msgid "sikh"
-msgstr "Sikh"
+msgid "basilica"
+msgstr "basiliek"
-msgid "spiritualist"
-msgstr "Spiritualist"
+msgid "cathedral"
+msgstr "kathedraal"
-msgid "taoist"
-msgstr "Taoist"
+msgid "chapel"
+msgstr "kapel"
-msgid "unitarian"
-msgstr "Unitariaan"
+msgid "church"
+msgstr "kerk"
-msgid "zoroastrian"
-msgstr "Zoroastriaan"
+msgid "temple"
+msgstr "tempel"
msgid "Denomination"
msgstr "Subgroep"
@@ -17594,8 +18288,14 @@ msgstr "Katholiek"
msgid "evangelical"
msgstr "Evangelist"
+msgid "greek_catholic"
+msgstr "grieks_katholiek"
+
+msgid "greek_orthodox"
+msgstr "grieks_orthodox"
+
msgid "jehovahs_witness"
-msgstr "Jehova’s getuigen"
+msgstr "Jehova''s getuigen"
msgid "lutheran"
msgstr "Luthers"
@@ -17606,6 +18306,9 @@ msgstr "Methodist"
msgid "mormon"
msgstr "Mormoon"
+msgid "new_apostolic"
+msgstr "nieuw_apostolisch"
+
msgid "orthodox"
msgstr "Orthodox"
@@ -17621,38 +18324,143 @@ msgstr "Protestant"
msgid "quaker"
msgstr "Quaker"
+msgid "roman_catholic"
+msgstr "rooms_katholiek"
+
+msgid "russian_orthodox"
+msgstr "russisch_orthodox"
+
+msgid "seventh_day_adventist"
+msgstr "zevende_dag_adventisten"
+
+msgid "Service Times"
+msgstr "Tijden diensten"
+
+msgid "18:00"
+msgstr "18:00"
+
+msgid "sunset,sunrise"
+msgstr "zonsopkomst, zonsondergang"
+
+msgid "Su 9:30,11:00"
+msgstr "zo 9:30,11:00"
+
+msgid "Sa,Su,PH 9:00"
+msgstr "za,zo, feestdagen 9:00"
+
+msgid "Sa 18:00; Su 10:45"
+msgstr "za 18:00; zo 10:45"
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"vr 08:00-18:00; 10-15 apr. gesl.; juni 07:00-20:00; aug gesl.; 24 dec 08:00-"
+"24:00"
+
+msgid "Sa 10:00+"
+msgstr "za 10:00+"
+
+msgid "Mosque"
+msgstr "Moskee"
+
+msgid "Edit Mosque"
+msgstr "Moskee bewerken"
+
+msgid "mosque"
+msgstr "moskee"
+
+msgid "ibadi"
+msgstr "ibadi"
+
msgid "shia"
msgstr "Sjiiet"
msgid "sunni"
msgstr "Soenniet"
-msgid "Service Times"
-msgstr "Tijden diensten"
+msgid "Synagogue"
+msgstr "Synagoge"
-msgid "Su 10:00"
-msgstr "Zo 10:00"
+msgid "Edit Synagogue"
+msgstr "Synagoge bewerken"
-msgid "Su 10:30"
-msgstr "Zo 10:30"
+msgid "synagogue"
+msgstr "synagoge"
-msgid "Su 11:00"
-msgstr "Zo 11:00"
+msgid "conservative"
+msgstr "conservatief"
-msgid "Opening Hours for visiting"
-msgstr "Openingstijden (bezoek)"
+msgid "reform"
+msgstr "fereformeerd"
-msgid "Recording Studio"
-msgstr "Opnamestudio"
+msgid "Buddhist Temple"
+msgstr "Boeddhistische tempel"
-msgid "Edit Studio"
-msgstr "Opnamestudio bewerken"
+msgid "Edit Buddhist Temple"
+msgstr "Boeddhistische tempel bewerken"
-msgid "audio"
-msgstr "audio"
+msgid "theravada"
+msgstr "theravada"
-msgid "video"
-msgstr "video"
+msgid "mahayana"
+msgstr "mahayana"
+
+msgid "vajrayana"
+msgstr "vajrayana"
+
+msgid "Hindu Temple"
+msgstr "Hindoetempel"
+
+msgid "Edit Hindu Temple"
+msgstr "Hindoetemperl bewerken"
+
+msgid "vaishnavism"
+msgstr "vaishnavisme"
+
+msgid "shaivism"
+msgstr "shaivisme"
+
+msgid "shaktism"
+msgstr "shaktisme"
+
+msgid "smartism"
+msgstr "smartisme"
+
+msgid "Shinto Shrine"
+msgstr "Shintoschrijn"
+
+msgid "Edit Shinto Shrine"
+msgstr "Shintoschrijn bewerken"
+
+msgid "Other Place of Worship"
+msgstr "Andere kerkelijke plaats"
+
+msgid "Edit other Place of Worship"
+msgstr "Andere kerkelijke plaats bewerken"
+
+msgid "Religion"
+msgstr "Religie"
+
+msgid "bahai"
+msgstr "Bahai"
+
+msgid "jain"
+msgstr "Jain"
+
+msgid "sikh"
+msgstr "Sikh"
+
+msgid "spiritualist"
+msgstr "Spiritualist"
+
+msgid "taoist"
+msgstr "Taoist"
+
+msgid "unitarian"
+msgstr "Unitariaan"
+
+msgid "zoroastrian"
+msgstr "Zoroastriaan"
msgid "Public Building"
msgstr "Openbaar gebouw"
@@ -17741,6 +18549,12 @@ msgstr "Rijschool bewerken"
msgid "License Classes"
msgstr "Soorten rijbewijzen"
+msgid "A;A1;B;BE;C"
+msgstr "A; A1; A2; AM;B;BE;B+ (code 96);C;C1;CE;C1E;D;D1;D1E;DE"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Gezondheid"
@@ -17750,6 +18564,12 @@ msgstr "Ziekenhuis"
msgid "Edit Hospital"
msgstr "Ziekenhuis bewerken"
+msgid "Clinic"
+msgstr "Kliniek"
+
+msgid "Edit Clinic"
+msgstr "kliniek bewerken"
+
msgid "Doctors"
msgstr "Dokterspraktijk"
@@ -17816,12 +18636,66 @@ msgstr "Dierenarts"
msgid "Edit Veterinary"
msgstr "Dierenarts bewerken"
-msgid "Note"
-msgstr "Opmerking"
+msgid "Edit Toilets"
+msgstr "Bewerken Toiletten"
+
+msgid "Access rights"
+msgstr "Toegangsrechten"
+
+msgid "public"
+msgstr "openbaar"
+
+msgid "seasonal"
+msgstr "seizoengebonden"
+
+msgid "flush"
+msgstr "spoelen"
+
+msgid "pitlatrine"
+msgstr "latrine (gat)"
+
+msgid "chemical"
+msgstr "chemisch"
+
+msgid "bucket"
+msgstr "emmer"
+
+msgid "Usage Position"
+msgstr "Positie voor gebruik"
+
+msgid "seated"
+msgstr "zittend"
+
+msgid "seated;urinal"
+msgstr "zittend;urinoir"
+
+msgid "squat"
+msgstr "Frans toilet"
+
+msgid "urinal"
+msgstr "urinoir"
msgid "Post Box"
msgstr "Brievenbus"
+msgid "Edit Postbox"
+msgstr "Bewerken Brievenbus"
+
+msgid "Collection times"
+msgstr "Tijden legen"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "ma-vr 15:00,17:45,19:00,23:00; za 15:10; zo 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "ma-vr 09:00-12:00,17:15; za 14:00; zo en feestdagen gesl."
+
+msgid "Drive through"
+msgstr "Overdekt"
+
msgid "Telephone"
msgstr "Telefoon"
@@ -17831,6 +18705,30 @@ msgstr "Telefoon bewerken"
msgid "Telephone cards"
msgstr "Telefoonkaarten"
+msgid "Emergency Phone"
+msgstr "Praatpaal"
+
+msgid "Internet Access"
+msgstr "Internettoegang"
+
+msgid "Edit Internet Access"
+msgstr "Internettoegang bewerken"
+
+msgid "Automated Defibrillator"
+msgstr "Automatische defibrillator"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Bewerken Automatische externe defibrillator"
+
+msgid "Located inside a building?"
+msgstr "Binnen een gebouw geplaatst?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Laatste controledatum (JJJJ-MM-DD)"
+
+msgid "Last check note"
+msgstr "Laatste controle - opmerking"
+
msgid "Clock"
msgstr "Klok"
@@ -17840,31 +18738,37 @@ msgstr "Klok bewerken"
msgid "Display"
msgstr "Scherm"
-msgctxt "display"
msgid "analog"
msgstr "analoog"
-msgctxt "display"
msgid "digital"
msgstr "digitaal"
-msgctxt "display"
msgid "sundial"
msgstr "zonnewijzer"
-msgctxt "display"
msgid "unorthodox"
-msgstr "ongewoon"
+msgstr "onorthodox"
msgid "Support"
msgstr "Draagsteun"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "paal"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "wandsteun"
+msgstr "aan muur bevestigd"
+msgctxt "mounting/support"
msgid "billboard"
msgstr "reclamebord"
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "grond"
+
msgid "Visibility/readability"
msgstr "Zichtbaarheid/leesbaarheid"
@@ -17892,8 +18796,8 @@ msgstr "Toont luchtvochtigheid"
msgid "Recycling"
msgstr "Inzamelpunt recyclen"
-msgid "Edit Recycling station"
-msgstr "Inzamelpunt recyclen bewerken"
+msgid "Edit Recycling Station"
+msgstr "Bewerken Recycling inzamelpunt"
msgid "Batteries"
msgstr "Batterijen"
@@ -17919,27 +18823,15 @@ msgstr "centraal"
msgid "Waste Basket"
msgstr "Vuilnisbak"
-msgid "Edit Waste Basket"
-msgstr "Vuilnisbak bewerken"
-
msgid "Waste Disposal"
msgstr "Afvalcontainer"
-msgid "Edit Waste Disposal"
-msgstr "Afvalcontainer bewerken"
+msgid "Edit Bench"
+msgstr "Bewerken Bank"
msgid "Backrest"
msgstr "Ruggensteun"
-msgid "Material"
-msgstr "Materiaal"
-
-msgid "stone"
-msgstr "steen"
-
-msgid "plastic"
-msgstr "plastiek"
-
msgid "Amount of Seats"
msgstr "Aantal zitplaatsen"
@@ -17974,14 +18866,17 @@ msgstr "Jachthut bewerken"
msgid "Height"
msgstr "Hoogte"
+msgctxt "height"
msgid "low"
msgstr "laag"
+msgctxt "height"
msgid "half"
-msgstr "half"
+msgstr "helft"
+msgctxt "height"
msgid "full"
-msgstr "hoog"
+msgstr "volledig"
msgid "Hide"
msgstr "Verborgen"
@@ -17989,11 +18884,11 @@ msgstr "Verborgen"
msgid "Lock"
msgstr "Afgesloten"
-msgid "Drinking Water"
-msgstr "Drinkwater"
+msgid "Edit Source of Potable Water"
+msgstr "Bewerken Bron van water om mee te nemen"
-msgid "Edit Drinking Water"
-msgstr "Drinkwater bewerken"
+msgid "Indoor"
+msgstr "Inpandig"
msgid "Fire Hydrant"
msgstr "Brandkraan"
@@ -18020,6 +18915,9 @@ msgstr "vijver"
msgid "Diameter (in mm)"
msgstr "Diameter (in mm)"
+msgid "Hydrant Position"
+msgstr "Positie hydrant"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "rijstrook"
@@ -18057,119 +18955,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Stadion bewerken"
-msgid "select sport:"
-msgstr "sport selecteren:"
+msgid "Select sport:"
+msgstr "Selecteer sport:"
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "Meervoudig"
+msgstr "multi"
+msgctxt "sport"
msgid "archery"
-msgstr "Boogschieten"
+msgstr "boogschieten"
+msgctxt "sport"
msgid "athletics"
-msgstr "Atletiek"
+msgstr "atletiek"
+msgctxt "sport"
msgid "american_football"
-msgstr "Amerikaans voetbal"
+msgstr "American football"
+msgctxt "sport"
msgid "australian_football"
-msgstr "Australisch voetbal"
+msgstr "Australian football"
+msgctxt "sport"
msgid "baseball"
-msgstr "Honkbal"
+msgstr "basebal"
+msgctxt "sport"
msgid "basketball"
-msgstr "Basketbal"
+msgstr "basketbal"
+msgctxt "sport"
msgid "boules"
-msgstr "Jeu de boules"
+msgstr "jeu de boules"
+msgctxt "sport"
msgid "bowls"
-msgstr "Bowling"
+msgstr "bowlen"
+msgctxt "sport"
msgid "canadian_football"
-msgstr "Canadees voetbal"
+msgstr "Canadian football"
+msgctxt "sport"
msgid "canoe"
-msgstr "Kanoën"
+msgstr "kanoën"
+msgctxt "sport"
msgid "climbing"
-msgstr "Klimmen"
+msgstr "klimmen"
+msgctxt "sport"
msgid "cricket"
-msgstr "Cricket"
+msgstr "cricket"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "cricket oefenbaan"
+msgstr "cricket netten"
+msgctxt "sport"
msgid "croquet"
-msgstr "Croquet"
+msgstr "croquet"
+msgctxt "sport"
msgid "cycling"
-msgstr "Fietsen"
+msgstr "fietsen"
+msgctxt "sport"
msgid "dog_racing"
-msgstr "Hondenrennen"
+msgstr "hondenrennen"
+msgctxt "sport"
msgid "equestrian"
-msgstr "Paardrijden"
+msgstr "paardensport"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "Ierse_spelen"
+msgstr "Schotse spelen"
+msgctxt "sport"
msgid "golf"
-msgstr "Golf"
+msgstr "golf"
+msgctxt "sport"
msgid "gymnastics"
-msgstr "Turnen"
+msgstr "gymnastiek"
+msgctxt "sport"
msgid "hockey"
-msgstr "Hockey"
+msgstr "hockey"
+msgctxt "sport"
msgid "horse_racing"
-msgstr "Paardenrennen"
+msgstr "paardenrennen"
+msgctxt "sport"
msgid "motor"
-msgstr "Motorsport"
+msgstr "motorsport"
+msgctxt "sport"
msgid "pelota"
-msgstr "Pelota"
+msgstr "pelote"
+msgctxt "sport"
msgid "racquet"
-msgstr "Badminton"
+msgstr "racquetbal"
+msgctxt "sport"
msgid "rugby_league"
-msgstr "rugby League"
+msgstr "rugby (league)"
+msgctxt "sport"
msgid "rugby_union"
-msgstr "rugby Union"
+msgstr "rugby (union)"
+msgctxt "sport"
msgid "shooting"
-msgstr "Schieten"
+msgstr "schietsport"
+msgctxt "sport"
msgid "skateboard"
-msgstr "Skateboarden"
+msgstr "skateboarden"
+msgctxt "sport"
msgid "skating"
-msgstr "Schaatsen"
+msgstr "schaatsen"
+msgctxt "sport"
msgid "skiing"
-msgstr "Skiën"
+msgstr "skiën"
+msgctxt "sport"
msgid "soccer"
-msgstr "Voetbal"
+msgstr "voetbal"
+msgctxt "sport"
msgid "swimming"
-msgstr "Zwemmen"
+msgstr "zwemmen"
+msgctxt "sport"
msgid "table_tennis"
-msgstr "Tafeltennis"
+msgstr "tafeltennis"
+msgctxt "sport"
msgid "tennis"
-msgstr "Tennis"
+msgstr "tennis"
msgid "Sports Centre"
msgstr "Sportcentrum"
@@ -18201,26 +19135,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Minigolf bewerken"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Meervoudige sporten"
msgid "Edit Multi"
msgstr "Meervoudige sporten bewerken"
-msgid "type"
-msgstr "soort"
-
+msgctxt "running"
msgid "pitch"
-msgstr "Sportveld"
+msgstr "sportveld"
+msgctxt "running"
msgid "sports_centre"
-msgstr "Sportcentrum"
+msgstr "sport_centrum"
+msgctxt "running"
msgid "stadium"
-msgstr "Stadion"
+msgstr "stadion"
+
+msgctxt "running"
+msgid "track"
+msgstr "baan"
msgid "9pin"
msgstr "9pin"
@@ -18228,6 +19163,15 @@ msgstr "9pin"
msgid "Edit 9pin"
msgstr "9pin bewerken"
+msgid "pitch"
+msgstr "Sportveld"
+
+msgid "sports_centre"
+msgstr "Sportcentrum"
+
+msgid "stadium"
+msgstr "Stadion"
+
msgid "10pin"
msgstr "bowlen"
@@ -18261,6 +19205,22 @@ msgstr "Kanoën bewerken"
msgid "Edit Cycling"
msgstr "Wielrennen bewerken"
+msgctxt "racing"
+msgid "pitch"
+msgstr "sportveld"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "sport_centrum"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "stadion"
+
+msgctxt "racing"
+msgid "track"
+msgstr "baan"
+
msgid "Dog Racing"
msgstr "Hondenrennen"
@@ -18273,8 +19233,33 @@ msgstr "Paardrijden"
msgid "Edit Equestrian"
msgstr "Paardrijden bewerken"
-msgid "horse_riding"
-msgstr "paardrijden"
+msgctxt "riding"
+msgid "pitch"
+msgstr "Sportveld"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "Sportcentrum"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "Stadion"
+
+msgctxt "riding"
+msgid "track"
+msgstr "baan"
+
+msgid "clay"
+msgstr "klei"
+
+msgid "dirt"
+msgstr "aarde"
+
+msgid "fine_gravel"
+msgstr "fijne_gravel"
+
+msgid "mud"
+msgstr "slikgronden"
msgid "Horse Racing"
msgstr "Paardenrennen"
@@ -18292,7 +19277,7 @@ msgid "Skating"
msgstr "Schaatsen"
msgid "Edit Skating"
-msgstr "Schaatsen bewerken"
+msgstr "Bewerken Schaatsen"
msgid "ice_rink"
msgstr "schaatsbaan"
@@ -18336,38 +19321,56 @@ msgstr "sneeuw_park"
msgid "Difficulty"
msgstr "Moeilijkheidsgraad"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "beginner"
+msgstr "nieuwelingen"
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "eenvoudig"
+msgstr "gemakkelijk"
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "gemiddeld"
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "gevorderd"
+msgstr "gevorderden"
+msgctxt "piste:difficulty"
msgid "expert"
msgstr "expert"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "vrij skiën"
+msgstr "vrij"
msgid "Grooming"
msgstr "Sneeuw verzorging"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "klassiek"
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "buckels"
+msgstr "Buckel"
+
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "schaatsen"
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr "klassiek;schaatsen"
+msgctxt "piste:grooming"
msgid "scooter"
msgstr "scooter"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "achterland"
+msgstr "ruw terrein"
msgid "Shooting"
msgstr "Schieten"
@@ -18408,19 +19411,15 @@ msgstr "Ierse spelen"
msgid "Edit Gaelic Games"
msgstr "Ierse spelen bewerken"
-msgctxt "gaelic game"
msgid "Hurling"
msgstr "Hurling"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Voetbal"
+msgstr "Football"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
msgstr "Rounders"
@@ -18559,11 +19558,23 @@ msgstr "Modelvliegtuigen"
msgid "Edit Model Aerodrome"
msgstr "Modelvliegtuigen bewerken"
-msgid "RC Car"
-msgstr "Op afstand bestuurbare auto’s"
-
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "baan"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "sport_centrum"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "baan"
+
+msgid "RC Car"
+msgstr "Op afstand bestuurbare auto''s"
+
msgid "Edit RC Car"
-msgstr "Op afstand bestuurbare auto’s bewerken"
+msgstr "Op afstand bestuurbare auto''s bewerken"
msgid "Man Made"
msgstr "Bouwwerken"
@@ -18571,59 +19582,133 @@ msgstr "Bouwwerken"
msgid "Edit Building"
msgstr "Gebouw bewerken"
+msgctxt "building"
+msgid "yes"
+msgstr "ja"
+
+msgctxt "building"
msgid "roof"
msgstr "dak"
+msgctxt "building"
msgid "garage"
msgstr "garage"
-msgid "church"
-msgstr "kerk"
+msgctxt "building"
+msgid "garages"
+msgstr "garages"
+msgctxt "building"
+msgid "industrial"
+msgstr "industrieel"
+
+msgctxt "building"
msgid "school"
msgstr "school"
+msgctxt "building"
msgid "hangar"
msgstr "hangar"
+msgctxt "building"
msgid "commercial"
-msgstr "kantoren"
+msgstr "zakelijk"
+msgctxt "building"
msgid "farm"
-msgstr "boerderij"
+msgstr "land-/tuinbouw"
+msgctxt "building"
msgid "transportation"
msgstr "transport"
+msgctxt "building"
msgid "greenhouse"
msgstr "kas"
+msgctxt "building"
msgid "office"
msgstr "kantoor"
+msgctxt "building"
msgid "university"
msgstr "universiteit"
+msgctxt "building"
+msgid "hospital"
+msgstr "ziekenhuis"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "opslagplaats"
+
+msgctxt "building"
+msgid "retail"
+msgstr "winkelcentrum"
+
+msgctxt "building"
+msgid "shed"
+msgstr "schuur"
+
msgid "Residential Building"
msgstr "Woongebouw"
msgid "Edit Residential Building"
msgstr "Woongebouw bewerken"
+msgctxt "building"
+msgid "residential"
+msgstr "woongebied"
+
+msgctxt "building"
msgid "apartments"
msgstr "appartementen"
+msgctxt "building"
msgid "house"
msgstr "huis"
+msgctxt "building"
msgid "hut"
msgstr "hut"
+msgctxt "building"
+msgid "dormitory"
+msgstr "slaapzaal"
+
+msgctxt "building"
msgid "terrace"
-msgstr "rijtjeshuizen"
+msgstr "rijtjeswoningen"
+msgctxt "building"
msgid "detached"
-msgstr "aaneengesloten"
+msgstr "vrijstaand"
+
+msgid "Entrance"
+msgstr "Doorgang"
+
+msgid "Edit Entrance"
+msgstr "Doorgang bewerken"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "ja"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "hoofd"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "dienst"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "uitgang"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "nooduitgang"
msgid "Tower"
msgstr "Toren"
@@ -18640,9 +19725,6 @@ msgstr "communicatie"
msgid "observation"
msgstr "observatie"
-msgid "Height (meters)"
-msgstr "Hoogte (meters)"
-
msgid "Flagpole"
msgstr "Vlaggenmast"
@@ -18852,42 +19934,68 @@ msgstr "Brandtijden"
msgid "Mo-Fr 22:00-05:00"
msgstr "Ma-Vr 22:00-05:00"
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr "Meetstation"
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr "Meetstation bewerken"
-msgid "Measurement"
-msgstr "Meting"
+msgid "Monitoring:"
+msgstr "Meten:"
-msgid "particulate_matter"
-msgstr "fijnstof"
+msgid "Weather"
+msgstr "Weer"
-msgid "seismic"
-msgstr "aardbevingen"
+msgid "Water level"
+msgstr "Waterniveau"
-msgid "water_level"
-msgstr "waterniveau"
+msgid "Tide Level"
+msgstr "Getijdennniveau"
-msgid "weather"
-msgstr "weer"
+msgid "Traffic"
+msgstr "Verkeer"
-msgid "Recording"
-msgstr "Opnemen"
+msgid "Air Quality"
+msgstr "Luchtkwaliteit"
-msgid "manually"
-msgstr "handmatig"
+msgid "Noise"
+msgstr "Geluid"
-msgid "automated"
-msgstr "automatisch"
+msgid "GPS Signals"
+msgstr "GPS-signalen"
-msgid "remote"
-msgstr "van op afstand"
+msgid "GLONASS Signals"
+msgstr "GLONASS-signalen"
-msgctxt "display"
-msgid "no"
-msgstr "nee"
+msgid "Galileo Signals"
+msgstr "Galileo-signalen"
+
+msgid "Radiation"
+msgstr "Straling"
+
+msgid "Seismic Activity"
+msgstr "Seismische activiteit"
+
+msgid "Recording:"
+msgstr "Opnemen:"
+
+msgid "Automated"
+msgstr "Geautomatiseerd"
+
+msgid "Manually"
+msgstr "Handmatig"
+
+msgid "Remote"
+msgstr "Op afstand"
+
+msgid "Display:"
+msgstr "Weergave:"
+
+msgid "Analog"
+msgstr "Analoog"
+
+msgid "Digital"
+msgstr "Digitaal"
msgid "Survey Point"
msgstr "Uitkijkpunt"
@@ -18895,8 +20003,8 @@ msgstr "Uitkijkpunt"
msgid "Edit Survey Point"
msgstr "Uitkijkpunt bewerken"
-msgid "Surveillance"
-msgstr "Bewakingscamera"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Bewakingscamera bewerken"
@@ -18907,12 +20015,102 @@ msgstr "binnenshuis"
msgid "outdoor"
msgstr "buiten"
-msgid "public"
-msgstr "openbaar"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "winkel"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Hoogte in meters (m)"
msgid "Power"
msgstr "Energie"
+msgid "Power Plant"
+msgstr "Electriciteitscentrale"
+
+msgid "Edit Power Plant"
+msgstr "Bewerken: Electriciteitscentrale"
+
+msgid "Start date"
+msgstr "Begindatum"
+
+msgid "Output forms of energy"
+msgstr "Uitvoervormen van energie"
+
+msgid "(please add this information to the generators if possible)"
+msgstr "(voeg deze informatie, indien mogelijk, svp toe aan de generatoren)"
+
+msgid "electricity"
+msgstr "electriciteit"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "heet water"
+
+msgid "hot air"
+msgstr "hete lucht"
+
+msgid "cold water"
+msgstr "koud water"
+
+msgid "cold air"
+msgstr "koude lucht"
+
+msgid "compressed air"
+msgstr "samengeperste lucht"
+
+msgid "steam"
+msgstr "stoom"
+
+msgid "vacuum"
+msgstr "vacuüm"
+
msgid "Power Generator"
msgstr "Energievoorziening"
@@ -18964,89 +20162,192 @@ msgstr "wind"
msgid "Method"
msgstr "Methode"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "anaerobische_vertering"
+msgstr "anaerobische_verwerking"
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr "getijden"
+msgctxt "generator method"
msgid "combustion"
msgstr "verbranding"
-msgid "dam"
-msgstr "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "bio / kolen / diesel / gas / gasolie / olie / afval"
+msgctxt "generator method"
msgid "fission"
msgstr "splitsing"
+msgctxt "generator method"
msgid "fusion"
msgstr "fusie"
+msgctxt "generator method"
msgid "gasification"
-msgstr "vergassen"
+msgstr "vergassing"
+msgid "biomass / waste"
+msgstr "biomassa / afval"
+
+msgctxt "generator method"
msgid "photovoltaic"
msgstr "fotovoltaïsch"
-msgid "pumped-storage"
-msgstr "opslagpompen"
-
-msgid "pumping"
-msgstr "pompen"
-
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "verbranding"
+msgstr "pyrolyse"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "waterstroom"
+msgstr "waterkracht"
+msgctxt "generator method"
+msgid "stream"
+msgstr "elektriciteit"
+
+msgctxt "generator method"
msgid "thermal"
msgstr "thermisch"
-msgid "Output forms of energy"
-msgstr "Uitvoervormen van energie"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "water-opgepompte-opslag"
-msgid "electricity"
-msgstr "electriciteit"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "water-opslag"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Type generator"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr "gecombineerde cyclus"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "vergassing"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "Francisturbine"
-msgid "hot water"
-msgstr "heet water"
+msgid "gas_turbine"
+msgstr "gasturbine"
-msgid "hot air"
-msgstr "hete lucht"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "biogas, biomassa, gas, afvalverbranding"
-msgid "cold water"
-msgstr "koud water"
+msgid "heat_pump"
+msgstr "warmtepomp"
-msgid "cold air"
-msgstr "koude lucht"
+msgid "horizontal_axis"
+msgstr "horizontale as"
-msgid "compressed air"
-msgstr "samengeperste lucht"
+msgid "tidal steam / wind"
+msgstr "getjdenstroom / wind"
-msgid "steam"
-msgstr "stoom"
+msgid "kaplan_turbine"
+msgstr "Kaplanturbine"
-msgid "vacuum"
-msgstr "vacuüm"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "hygro stroming / hydro wateropslag / getijdenbarrière"
+
+msgid "pelton_turbine"
+msgstr "Peltonturbine"
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "hygro stroming / hydro wateropslag"
+
+msgid "reciprocating_engine"
+msgstr "zuigermotor"
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "biobrandtsof, biogas, diesel, gas, gasolie"
+
+msgid "solar_photovoltaic_panel"
+msgstr "zonnepaneel"
+
+msgid "solar photovoltaic"
+msgstr "fotovoltaïsch"
+
+msgid "solar_thermal_collector"
+msgstr "thermocollector"
+
+msgid "solar thermal"
+msgstr "thermisch"
+
+msgid "steam_generator"
+msgstr "stoomgenerator"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "bio, kolen, diesel, gas, gasolie, olie, afvalverbranding"
+
+msgid "steam_turbine"
+msgstr "stoomturbine"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr "geothermisch / solar-thermisch / bio, kolen, olie, afvalverbranding"
+
+msgid "stellarator"
+msgstr "stellarator"
+
+msgid "nuclear fusion"
+msgstr "nucleaire fusie"
+
+msgid "tokamak"
+msgstr "tokamak"
+
+msgid "vertical_axis"
+msgstr "verticale as"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Boiling Water Reactor 1 (BWR-1)"
+
+msgid "nuclear fission"
+msgstr "nucleaire splitsing"
-msgid "battery charging"
-msgstr "opladen van batterijen"
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Boiling Water Reactor 2 (BWR-2)"
-msgid "Power Station"
-msgstr "Verdeelstation"
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Boiling Water Reactor 3 (BWR-3)"
-msgid "Edit Power Station"
-msgstr "Verdeelstation bewerken"
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Boiling Water Reactor 4 (BWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Boiling Water Reactor 5 (BWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Boiling Water Reactor 6 (BWR-6)"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "CANada Deuterium Uranium reactor (CANDU)"
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "China Pressurized Reactor (CPR-1000)"
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr "European Pressurized Reactor (EPR)"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Inertial Confinement Fusion (ICF)"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Pressurized water reactor (PWR)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+
+msgid "Output forms of energy:"
+msgstr "Uitvoer vormen van energie:"
msgid "Power Sub Station"
msgstr "Transformatorstation"
@@ -19057,6 +20358,21 @@ msgstr "Transformatorstation bewerken"
msgid "Line reference"
msgstr "Lijnreferentie"
+msgid "high"
+msgstr "hoog"
+
+msgid "medium"
+msgstr "medium"
+
+msgid "low"
+msgstr "laag"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "Verdeelkast"
@@ -19072,6 +20388,9 @@ msgstr "Hoogspanningsmast bewerken"
msgid "Tower reference"
msgstr "Referentie toren"
+msgid "steel"
+msgstr "staal"
+
msgid "Pole"
msgstr "Electriciteitsmast"
@@ -19090,13 +20409,11 @@ msgstr "Hoogspanningskabels bewerken"
msgid "Line type"
msgstr "Type lijn"
-msgctxt "Power Line"
msgid "line"
-msgstr "lijn"
+msgstr "kabel"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "ondergeschikte_lijn"
+msgstr "sub_kabel"
msgid "Amount of Cables"
msgstr "Aantal kabels"
@@ -19203,11 +20520,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Kiosk bewerken"
-msgid "Baker"
-msgstr "Bakker"
+msgid "Bakery"
+msgstr "Bakkerij"
-msgid "Edit Baker"
-msgstr "Bakker bewerken"
+msgid "Edit Bakery"
+msgstr "Bakkerij bewerken"
msgid "Butcher"
msgstr "Slager"
@@ -19218,8 +20535,8 @@ msgstr "Slager bewerken"
msgid "Seafood"
msgstr "Viswinkel"
-msgid "Edit Seafood"
-msgstr "Viswinkel bewerken"
+msgid "Edit Seafood Shop"
+msgstr "Winkel zeebanket bewerken"
msgid "Deli (Fine Food)"
msgstr "Delicatessen (fijne kost)"
@@ -19239,14 +20556,20 @@ msgstr "Markt"
msgid "Edit Marketplace"
msgstr "Markt bewerken"
+msgid "Organic"
+msgstr "Biologische winkel"
+
msgid "Greengrocer"
msgstr "Groentewinkel"
msgid "Edit Greengrocer"
msgstr "Groentewinkel bewerken"
-msgid "Organic"
-msgstr "Biologische winkel"
+msgid "Farm Stand"
+msgstr "Boerderijstalletje"
+
+msgid "Edit Farm Stand"
+msgstr "Bewerken Boerderijstalletje"
msgid "Edit Organic/Bio"
msgstr "Organisch/Bio bewerken"
@@ -19317,8 +20640,8 @@ msgstr "Kleermaker bewerken"
msgid "Fabric"
msgstr "Stoffen"
-msgid "Edit Fabric"
-msgstr "Stoffen bewerken"
+msgid "Edit Fabric Shop"
+msgstr "Stoffenwinkel bewerken"
msgid "Electronic"
msgstr "Elektronica"
@@ -19338,14 +20661,14 @@ msgstr "Elektronicawinkel bewerken"
msgid "Mobile Phone"
msgstr "Mobiele telefoons"
-msgid "Edit Mobile Phone"
-msgstr "Mobiele telefoons bewerken"
+msgid "Edit Mobile Phone Shop"
+msgstr "Winkel mobiele telefoons bewerken"
msgid "Vacuum Cleaner"
msgstr "Stofzuigers"
-msgid "Edit Vacuum Cleaner"
-msgstr "Stofzuiger bewerken"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Winkel stofzuigers bewerken"
msgid "Hifi"
msgstr "Hifi"
@@ -19353,7 +20676,6 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Hifi-winkel bewerken"
-msgctxt "shop"
msgid "Video"
msgstr "Videotheek"
@@ -19381,6 +20703,12 @@ msgstr "Geldwisselkantoor bewerken"
msgid "Edit Automated Teller Machine"
msgstr "Geldautomaat bewerken"
+msgid "Pawnbroker"
+msgstr "Belening"
+
+msgid "Edit Pawnbroker"
+msgstr "Bewerken Belening"
+
msgid "Department Store"
msgstr "Warenhuis"
@@ -19417,11 +20745,32 @@ msgstr "Juwelier"
msgid "Edit Jewelry"
msgstr "Juwelier bewerken"
+msgid "Gift"
+msgstr "Cadeau"
+
+msgid "Edit Gift Shop"
+msgstr "Bewerken Cadeauwinkel"
+
+msgid "buddhist"
+msgstr "Boeddhisme"
+
+msgid "christian"
+msgstr "Christelijk"
+
+msgid "hindu"
+msgstr "Hindoestaans"
+
+msgid "jewish"
+msgstr "Joods"
+
+msgid "muslim"
+msgstr "Moslim"
+
msgid "Erotic"
msgstr "Seksshop"
-msgid "Edit Erotic"
-msgstr "Seksshop bewerken"
+msgid "Edit Erotic Shop"
+msgstr "Erotische winkel bewerken"
msgid "Florist"
msgstr "Bloemist"
@@ -19450,7 +20799,7 @@ msgstr "Bouwmarkt bewerken"
msgid "Paint"
msgstr "Verfwinkel"
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr "Verfwinkel bewerken"
msgid "Furniture"
@@ -19462,20 +20811,20 @@ msgstr "Woonwarenhuis bewerken"
msgid "Kitchen"
msgstr "Keukenzaak"
-msgid "Edit Kitchen"
-msgstr "Keukenzaak bewerken"
+msgid "Edit Kitchen Store"
+msgstr "Keukenwinkel bewerken"
msgid "Curtain"
msgstr "Gordijnenwinkel"
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr "Gordijnenwinkel bewerken"
msgid "Frame"
msgstr "Lijstenwinkel"
-msgid "Edit Frames"
-msgstr "Lijstenwinkel bewerken Frames"
+msgid "Edit Frames Shop"
+msgstr "Lijstenwinkel bewerken"
msgid "Stationery"
msgstr "Kantoorboekhandel"
@@ -19495,6 +20844,12 @@ msgstr "Boekhandel"
msgid "Edit Book Store"
msgstr "Boekhandel bewerken"
+msgid "Newsagent''s shop"
+msgstr "Krantenkisok"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Krantenkisok bewerken"
+
msgid "Travel Agency"
msgstr "Reisagentschap"
@@ -19504,8 +20859,8 @@ msgstr "Reisagentschap bewerken"
msgid "Musical Instrument"
msgstr "Muziekinstrumenten"
-msgid "Edit Musical Instruments"
-msgstr "Muziekinstrumenten bewerken"
+msgid "Edit Musical Instruments Shop"
+msgstr "Winkel muziekinstrumenten bewerken"
msgid "Toys"
msgstr "Speelgoed"
@@ -19585,6 +20940,9 @@ msgstr "speelgoed"
msgid "vouchers"
msgstr "tegoedbonnen"
+msgid "Note"
+msgstr "Opmerking"
+
msgid "Geography"
msgstr "Geografie"
@@ -19714,6 +21072,12 @@ msgstr "Bergtop"
msgid "Edit Peak"
msgstr "Bergtop bewerken"
+msgid "Saddle"
+msgstr "Zadel"
+
+msgid "Edit Saddle"
+msgstr "Zadel bewerken"
+
msgid "Glacier"
msgstr "Gletsjer"
@@ -19753,24 +21117,33 @@ msgstr "Boom"
msgid "Edit Tree"
msgstr "Boom bewerken"
+msgid "broad_leaved"
+msgstr "breed gebladerte"
+
+msgid "conifer"
+msgstr "conifeer"
+
+msgid "palm"
+msgstr "palm"
+
msgid "Botanical Name"
msgstr "Botanische naam"
+msgid "Tree Row"
+msgstr "Bomenrij"
+
msgid "Wood"
msgstr "Oerbos"
msgid "Edit Wood"
msgstr "Oerbos bewerken"
-msgctxt "wood"
msgid "coniferous"
msgstr "naaldbomen"
-msgctxt "wood"
msgid "deciduous"
msgstr "loofbomen"
-msgctxt "wood"
msgid "mixed"
msgstr "gemengd"
@@ -19780,17 +21153,8 @@ msgstr "Bosbouw"
msgid "Edit Forest Landuse"
msgstr "Bosbouw bewerken"
-msgid "coniferous"
-msgstr "naaldbomen"
-
-msgid "deciduous"
-msgstr "loofbomen"
-
-msgid "mixed"
-msgstr "gemengd"
-
-msgid "Grassland"
-msgstr "Grasland"
+msgid "Grassland"
+msgstr "Grasland"
msgid "Edit Grassland"
msgstr "Grasland bewerken"
@@ -19864,6 +21228,12 @@ msgstr "Weide"
msgid "Edit Meadow Landuse"
msgstr "Weideland bewerken"
+msgid "Orchard"
+msgstr "Boomgaard"
+
+msgid "Edit Orchard Landuse"
+msgstr "Bewerken: Boomgaard landgebruik"
+
msgid "Vineyard"
msgstr "Wijngaard"
@@ -19918,7 +21288,7 @@ msgstr "Recreatiegebied"
msgid "Edit Recreation Ground Landuse"
msgstr "Recreatiegebied bewerken"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Woongebied"
msgid "Edit Residential Landuse"
@@ -19930,6 +21300,9 @@ msgstr "Begraafplaats"
msgid "Edit Graveyard"
msgstr "Begraafplaats bewerken"
+msgid "shinto"
+msgstr "shinto"
+
msgid "Cemetery"
msgstr "Begraafplaats"
@@ -20005,6 +21378,33 @@ msgstr "Mijnbouw bewerken"
msgid "Annotation"
msgstr "Aantekening"
+msgid "Edit Name Information"
+msgstr "Naaminformatie bbewerken"
+
+msgid "Alternative name"
+msgstr "Alternatieve naam"
+
+msgid "Historical name"
+msgstr "Historische naam"
+
+msgid "Local name"
+msgstr "Plaatselijke naam"
+
+msgid "Regional name"
+msgstr "Ragionale naam"
+
+msgid "National name"
+msgstr "Nationale naam"
+
+msgid "International name"
+msgstr "Internationale naam"
+
+msgid "Official name"
+msgstr "Officiële naam"
+
+msgid "Common name abbreviation"
+msgstr "Afkorting algemene naam"
+
msgid "Edit Address Information"
msgstr "Adresinformatie bewerken"
@@ -20023,30 +21423,6 @@ msgstr "Naam stad"
msgid "Country code"
msgstr "Landcode"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Adresinterpolatie"
@@ -20065,6 +21441,18 @@ msgstr "even"
msgid "alphabetic"
msgstr "alfabetisch"
+msgid "Accuracy"
+msgstr "Nauwkeurigheid"
+
+msgid "actual"
+msgstr "actueel"
+
+msgid "estimate"
+msgstr "schatting"
+
+msgid "potential"
+msgstr "potentieel"
+
msgid "Contact (common schema)"
msgstr "Contact (algemeen schema)"
@@ -20227,27 +21615,56 @@ msgstr "waar handhaving eindigt"
msgid "traffic light or barrier that stops you"
msgstr "verkeerslicht of barrière die u stopt"
-msgid "Route (legacy)"
-msgstr "Route (oud)"
+msgid "General route"
+msgstr "Algemene route"
+
+msgid "Edit general route"
+msgstr "Algemene route bewerken"
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr "fiets"
-msgid "Edit Route (legacy)"
-msgstr "Route (oud) bewerken"
+msgctxt "route type"
+msgid "bus"
+msgstr "bus"
+msgctxt "route type"
msgid "road"
-msgstr "straat"
+msgstr "wegen"
+msgctxt "route type"
+msgid "ferry"
+msgstr "veer"
+
+msgctxt "route type"
msgid "ski"
msgstr "ski"
+msgctxt "route type"
msgid "foot"
msgstr "voet"
+msgctxt "route type"
msgid "hiking"
-msgstr "wandeltocht"
+msgstr "wandelen"
+msgctxt "route type"
+msgid "tram"
+msgstr "tram"
+
+msgctxt "route type"
msgid "detour"
msgstr "omleiding"
+msgctxt "route type"
+msgid "railway"
+msgstr "spoorweg"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "metro"
+
msgid "Symbol description"
msgstr "Beschrijving symbool"
@@ -20293,20 +21710,23 @@ msgstr "halte voorwaarts"
msgid "backward halt point"
msgstr "halte achterwaarts"
-msgid "Route network"
-msgstr "Routenetwerk"
+msgid "Route Network"
+msgstr "Route Netwerk"
-msgid "Edit route network"
-msgstr "Routenetwerk bewerken"
+msgid "Edit Route Network"
+msgstr "Bewerken Route Netwerk"
msgid "member"
msgstr "lid"
-msgid "Associated street"
-msgstr "Samenhangende straat"
+msgid "Associated Street"
+msgstr "Associated Street"
+
+msgid "Edit Associated Street"
+msgstr "Bewerken Associated Street"
-msgid "Edit associated street"
-msgstr "Samenhangende straat bewerken"
+msgid "house"
+msgstr "huis"
msgid "Street"
msgstr "Straat"
@@ -20329,8 +21749,8 @@ msgstr "alees wat is gerelateerd aan de straat"
msgid "Destination sign"
msgstr "Teken voor bestemming"
-msgid "Edit Destination sign"
-msgstr "Teken voor bestemming bewerken"
+msgid "Edit Destination Sign"
+msgstr "Bewerken Teken bestemming"
msgid "Destination written on sign (w/o distance)"
msgstr "Bestemming vermeld op teken (zonder afstand)"
@@ -20425,18 +21845,27 @@ msgstr "wegen die onder de brug doorlopen"
msgid "way forming the outline footprint"
msgstr "weg gevormd door de afdruk van de omtrek"
-msgid "nodes forming the outline"
-msgstr "knopen die de omtrek vormen"
+msgid "edge ways parallel to ''across''"
+msgstr "rand wegen parallel aan ''across''"
msgid "ways passing through the tunnel"
msgstr "wegen die door de tunnel lopen"
+msgid "edge ways parallel to ''through''"
+msgstr "rand wegen parallel aan ''through''"
+
msgid "bridge"
msgstr "brug"
msgid "deprecated"
msgstr "vervallen"
+msgid "bicycle"
+msgstr "fiets"
+
+msgid "foot"
+msgstr "voet"
+
msgid "horse"
msgstr "paard"
@@ -20446,8 +21875,11 @@ msgstr "barrière"
msgid "motorroad"
msgstr "autoweg"
-msgid "highway_track"
-msgstr "snelweg_route"
+msgid "highway.track"
+msgstr "kleur_verharding"
+
+msgid "livingdashed"
+msgstr "leefstreepjes"
msgid "services"
msgstr "diensten"
@@ -20455,11 +21887,11 @@ msgstr "diensten"
msgid "ford"
msgstr "doorwaadbare plek"
-msgid "highway_platform"
-msgstr "highway_platform"
+msgid "highway.platform"
+msgstr "highway.platform"
-msgid "emergency_access_point"
-msgstr "Toegangsweg noodhulp"
+msgid "emergency.access.point"
+msgstr "Hulpdiensten toegangsweg"
msgid "riverbank"
msgstr "rivieroever"
@@ -20476,6 +21908,9 @@ msgstr "stroomversnelling"
msgid "railwaypoint"
msgstr "spoorwegpunt"
+msgid "raildashed"
+msgstr "spoorstreepjes"
+
msgid "railyard"
msgstr "rangeerterrein"
@@ -20491,29 +21926,29 @@ msgstr "oud spoor"
msgid "aeroway"
msgstr "luchtverbinding"
-msgid "aeroway_dark"
-msgstr "luchtverbinding_donker"
+msgid "aeroway.dark"
+msgstr "donker"
-msgid "aeroway_light"
-msgstr "luchtverbinding_licht"
+msgid "aeroway.light"
+msgstr "licht"
-msgid "piste_easy"
-msgstr "piste_eenvoudig"
+msgid "piste.easy"
+msgstr "gemakkelijk"
-msgid "piste_intermediate"
-msgstr "piste_middelmatig"
+msgid "piste.intermediate"
+msgstr "gemiddeld"
-msgid "piste_advanced"
-msgstr "piste_gevorderden"
+msgid "piste.advanced"
+msgstr "gevorderd"
-msgid "piste_expert"
-msgstr "piste_expert"
+msgid "piste.expert"
+msgstr "expert"
-msgid "piste_freeride"
-msgstr "piste_vrij skiën"
+msgid "piste.freeride"
+msgstr "vrij"
-msgid "piste_novice"
-msgstr "piste_beginner"
+msgid "piste.novice"
+msgstr "beginners"
msgid "power"
msgstr "elektriciteit"
@@ -20533,20 +21968,20 @@ msgstr "jachthaven"
msgid "amenity"
msgstr "voorziening"
-msgid "amenity_traffic"
-msgstr "voorziening_verkeer"
+msgid "amenity.traffic"
+msgstr "verkeersbenodigdheden"
-msgid "amenity_light"
-msgstr "voorziening_licht"
+msgid "amenity.light"
+msgstr "lichtbenodigdheden"
-msgid "light_water"
-msgstr "licht_water"
+msgid "light.water"
+msgstr "verlichting in water"
msgid "health"
msgstr "gezondheid"
-msgid "shop"
-msgstr "winkel"
+msgid "office"
+msgstr "kantoor"
msgid "hotel"
msgstr "hotel"
@@ -20611,9 +22046,6 @@ msgstr "heide"
msgid "woodarea"
msgstr "houtland"
-msgid "mud"
-msgstr "slikgronden"
-
msgid "beach"
msgstr "strand"
@@ -20623,11 +22055,14 @@ msgstr "route"
msgid "boundary"
msgstr "grens"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "plaats"
-msgid "tiger_data"
-msgstr "tiger_data"
+msgid "tiger.data"
+msgstr "gegevens Tiger"
msgid "address"
msgstr "adres"
@@ -20641,9 +22076,6 @@ msgstr "Dorp/stad"
msgid "One Way"
msgstr "Eénrichting"
-msgid "Church"
-msgstr "Kerk"
-
msgid "Fuel Station"
msgstr "Tankstation"
@@ -20663,269 +22095,471 @@ msgid "abbreviated street name"
msgstr "afgekorte straatnaam"
msgid "oneway tag on a node"
-msgstr "tag voor éénrichtingsverkeer op een knoop"
+msgstr "éénrichting-tag op een knoop"
msgid "bridge tag on a node"
-msgstr "tag brug op een knoop"
+msgstr "brugtag op een knoop"
msgid "wrong highway tag on a node"
-msgstr "verkeerde tag highway op een knoop"
+msgstr "verkeerde snelwegtag op een knoop"
+
+msgid "wrong crossing tag on a way"
+msgstr "verkeerde tag kruising op weg"
msgid "Unnamed unclassified highway"
-msgstr "Niet benoemde, niet geklassificeerde highway"
+msgstr "Naamloze niet-geclassificeerde snelweg"
msgid "highway without a reference"
-msgstr "highway zonder een verwijzing"
+msgstr "snelweg zonder een referentie"
msgid "temporary highway type"
-msgstr "tijdelijk type highway"
+msgstr "type tijdelijke snelweg"
msgid "misspelled key name"
-msgstr ""
+msgstr "verkeerd gespelde naam van sleutel"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "fietspad met fietstag"
msgid "footway with tag foot"
-msgstr "voetpad met tag foot"
+msgstr "voetpad met voettag"
msgid "separate cycleway as lane on a cycleway"
-msgstr "afzonderlijk fietspad als strook op een fietspad"
+msgstr "maak fietspad als strook op een fietspad"
msgid "barrier used on a way"
-msgstr "barrière gebruikt op een weg"
+msgstr "blokkade gebruikt op een weg"
msgid "maxspeed used for footway"
-msgstr "maxspeed gebruikt voor voetpad"
+msgstr "max. snelheid voor een voetpad"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "laagtag met een + teken"
msgid "street name contains ss"
-msgstr ""
+msgstr "straatnaam bevat ss"
msgid "relation without type"
-msgstr ""
+msgstr "relatie zonder type"
msgid "restaurant without name"
-msgstr ""
+msgstr "restaurant zonder naam"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "ongewone tagcombinatie (snelweg & waterweg)"
msgid "unusual tag combination (highway & natural)"
-msgstr ""
+msgstr "ongewone tagcombinatie (snelweg & natuur)"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr "ongebruikelijke tagcombinatie (landuse & building)"
+
+msgid "unnecessary access key"
+msgstr "onnodige toegangssleutel"
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "onnodige motor_vehicle=yes"
msgid "natural water used for swimming pool"
-msgstr ""
+msgstr "natuurlijk water gebruikt als zwembad"
-msgid "incline without highway"
-msgstr ""
+msgid "numerical key"
+msgstr "numerieke toets"
+
+msgid "route_master relation without route_master=*"
+msgstr "route_master relatie zonder route_master=*"
+
+msgid "power line without voltage"
+msgstr "elektriciteitskabel zonder voltage"
+
+msgid "substation key without power=substation"
+msgstr "sleutel substation zonder power=substation"
+
+msgid "transformer key without power"
+msgstr "sleutel transformer zonder power"
+
+msgid "missing substation=*"
+msgstr "ontbrekend substation=*"
+
+msgid "missing transformer=*"
+msgstr "ontbrekend transformer=*"
+
+msgid "incline without highway or railway"
+msgstr "incline zonder highway of railway"
msgid "junction without highway"
-msgstr ""
+msgstr "kruising zonder weg"
msgid "lanes without highway"
-msgstr "lanes zonder highway"
+msgstr "rijstroken zonder weg"
msgid "lcn without highway"
-msgstr "lcn zonder highway"
+msgstr "lcn zonder weg"
-msgid "lit without highway"
-msgstr "lit zonder highway"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "lit zonder highway/railway/piste/parking/platform"
msgid "living_street without highway"
-msgstr "living_street zonder highway"
+msgstr "woon_straat zonder weg"
msgid "maintenance without highway"
-msgstr "maintenance zonder highway"
+msgstr "onderhoud zonder weg"
msgid "median without highway"
-msgstr "median zonder highway"
+msgstr "mediaan zonder weg"
msgid "motorroad without highway"
-msgstr "motorroad zonder highway"
+msgstr "motorweg zonder weg"
msgid "ntd_id without highway"
-msgstr "ntd_id zonder highway"
+msgstr "ntd_id zonder weg"
-msgid "oneway without highway"
-msgstr "oneway zonder highway"
+msgid "oneway without highway or railway"
+msgstr "oneway zonder highway of railway"
msgid "sac_scale without highway"
-msgstr "sac_scale zonder highway"
+msgstr "sac_scale zonder weg"
msgid "segregated without highway"
-msgstr "segregated zonder highway"
+msgstr "afgescheiden zonder weg"
msgid "sidewalk without highway"
-msgstr "sidewalk zonder highway"
+msgstr "trottoir zonder weg"
msgid "smoothness without highway"
-msgstr "smoothness zonder highway"
+msgstr "glad zonder weg"
msgid "snowplowing without highway"
-msgstr "snowplowing zonder highway"
+msgstr "sneeuwploeg zonder weg"
msgid "step_count without highway"
-msgstr "step_count zonder highway"
+msgstr "stap_tellen zonder weg"
msgid "toll without highway"
-msgstr "toll zonder highway"
+msgstr "tol zonder weg"
msgid "tracktype without highway"
-msgstr "tracktype zonder highway"
+msgstr "type spoor zonder weg"
msgid "trail_visibility without highway"
-msgstr "trail_visibility zonder highway"
+msgstr "spoor_zichtbaarheid zonder weg"
msgid "trolley_wire without highway"
-msgstr "trolley_wire zonder highway"
+msgstr "trolley_draad zonder weg"
msgid "zip_left without highway"
-msgstr "zip_left zonder highway"
+msgstr "zip_links zonder weg"
msgid "zip_right without highway"
-msgstr "zip_right zonder highway"
+msgstr "zip_rechts zonder weg"
msgid "detail without railway"
-msgstr "detail zonder railway"
+msgstr "detail zonder spoorweg"
msgid "eddy_current_brake without railway"
-msgstr "eddy_current_brake zonder railway"
+msgstr "eddy_current_brake zonder spoorweg"
msgid "electrified without railway"
-msgstr "electrified zonder railway"
+msgstr "elektrisch zonder spoorweg"
msgid "etcs without railway"
-msgstr "etcs zonder railway"
+msgstr "etcs zonder spoorweg"
msgid "gauge without railway"
-msgstr "gauge zonder railway"
+msgstr "meter zonder spoorweg"
msgid "grade_of_track without railway"
-msgstr "grade_of_track zonder railway"
+msgstr "graad_spoor zonder spoorweg"
msgid "kursbuchstrecke without railway"
-msgstr "kursbuchstrecke zonder railway"
+msgstr "kursbuchstrecke zonder spoorweg"
msgid "lzb without railway"
-msgstr "lzb zonder railway"
+msgstr "lzb zonder spoorweg"
msgid "old_railway_operator without railway"
-msgstr "old_railway_operator zonder railway"
+msgstr "old_railway_operator zonder spoorweg"
msgid "operating_procedure without railway"
-msgstr "operating_procedure zonder railway"
+msgstr "werk_procedure zonder spoorweg"
msgid "pzb without railway"
-msgstr "pzb zonder railway"
+msgstr "pzb zonder spoorweg"
msgid "radio without railway"
-msgstr "radio zonder railway"
+msgstr "radio zonder spoorweg"
msgid "structure_gauge without railway"
-msgstr "structure_gauge zonder railway"
+msgstr "structuur_meter zonder spoorweg"
msgid "tilting_technologie without railway"
-msgstr "tilting_technologie zonder railway"
+msgstr "tilting_technologie zonder spoorweg"
msgid "track_class without railway"
-msgstr "track_class zonder railway"
+msgstr "spoor_klasse zonder spoorweg"
msgid "tracks without railway"
-msgstr "tracks zonder railway"
+msgstr "sporen zonder spoorweg"
msgid "traffic_mode without railway"
-msgstr "traffic_mode zonder railway"
+msgstr "verkeers_modus zonder spoorweg"
msgid "usage without railway"
-msgstr "usage zonder railway"
+msgstr "gebruik zonder spoorweg"
msgid "workrules without railway"
-msgstr "workrules zonder railway"
+msgstr "werkregels zonder spoorweg"
msgid "stream without waterway"
-msgstr "stream zonder waterway"
+msgstr "stroom zonder spoorweg"
msgid "intermittent without waterway"
-msgstr "intermittent zonder waterway"
+msgstr "onderbroken zonder waterweg"
msgid "boat without waterway / natural=water"
-msgstr "boat zonder waterway / natural=water"
+msgstr "boot zonder waterweg / natural=water"
msgid "length_unit without waterway"
-msgstr "length_unit zonder waterway"
+msgstr "lengte_eenheid zonder waterweg"
msgid "llid without waterway"
-msgstr "llid zonder waterway"
+msgstr "llid zonder waterweg"
msgid "canal without waterway"
-msgstr "canal zonder waterway"
+msgstr "kanaal zonder waterweg"
msgid "have_riverbank without waterway"
-msgstr "have_riverbank zonder waterway"
+msgstr "heeft_rivieroever zonder waterweg"
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "tunnel zonder highway/railway/waterway/platform/pipeline"
-msgid "tunnel without highway/railway/waterway"
-msgstr "tunnel zonder highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridge zonder highway/railway/waterway/platform/piste/pipeline"
-msgid "bridge without highway/railway/waterway"
-msgstr "bridge zonder highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psv zonder highway/railway/waterway/parking"
-msgid "psv without highway/railway/waterway"
-msgstr "psv zonder highway/railway/waterway"
+msgid "width without physical linear feature"
+msgstr "breedte zonder fysiek lineair item"
-msgid "width without highway/railway/waterway/aeroway"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "maxspeed zonder highway/railway/traffic_sign/enforcement"
+
+msgid "fence_type without barrier=fence"
+msgstr "type afrastering zonder barrier=fence"
+
+msgid "border_type without boundary"
+msgstr "type begrenzing zonder boundary"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "type recycling zonder amenity=recycling"
+
+msgid "board_type without information=board"
+msgstr "type bord zonder information=board"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "type schuilplaats zonder amenity=shelter"
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "type lamp zonder highway=street_lamp"
+
+msgid "map_type without information=map"
+msgstr "type kaart zonder information=map"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "type plaats zonder historic=archaeological_site"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "type kunstwerk zonder tourism=artwork"
+
+msgid "castle_type without historic=castle"
+msgstr "type kasteel zonder historic=castle"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "type reservoir zonder landuse/water=reservoir"
+
+msgid "bunker_type without military=bunker"
+msgstr "type bunker zonder military=bunker"
+
+msgid "source:addr without addr:*"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:date without source"
msgstr ""
-msgid "religion without denomination"
+msgid "source:name without name"
msgstr ""
-msgid "unknown christian denomination"
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "source:building without building"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
+msgid "religion without denomination"
+msgstr "religie zonder nadere omschrijving"
+
+msgid "unknown christian denomination"
+msgstr "onbekende christelijke omschrijving"
+
+msgid "unknown muslim denomination"
+msgstr "onbekende moslim omschrijving"
+
+msgid "unknown jewish denomination"
+msgstr "onbekende joodse omschrijving"
+
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"geen taal voor wikipedia opgegeven, gebruik ''wikipedia''=''language:page "
+"title''"
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr "onbekend voorvoegsel voor taal in tag wikipedia"
+
+msgid "layer should be between -5 and 5"
+msgstr "laag zou moeten liggen tussen -5 en 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr "niveau zou getal moeten zijn met optioneel verhogingen met .5"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"hoogte: meters is standaard; punt is scheidingsteken; indien eenheden, "
+"plaats spatie dan de eenheid"
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"maxheight: meters is standaard; punt is scheidingsteken; indien eenheden, "
+"plaats spatie, dan eenheid"
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"width: meters is standaard; punt is scheidingsteken; indien eenheden, plaats "
+"spatie, dan eenheid"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"maxwidth: meters is standaard; punt is scheidingsteken; indien eenheden, "
+"plaats spatie, dan eenheid"
-msgid "unkown language prefix in wikipedia tag"
+msgid "unusual maxspeed format"
+msgstr "ongebruikelijke indeling maxspeed"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
+"voltage zou in volts moeten zijn zonder eenheden/scheidingsteken/spaties"
+
+msgid "unusual frequency specification"
+msgstr "ongebruikelijke specificatie frequency"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "ongebruikelijke spoorbreedte; gebruik mm zonder scheidngsteken"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+"ongebruikelijke stijging; gebruik percentage/graden of naar boven/naar "
+"beneden"
msgid "Landsat"
msgstr "Landsat"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "OSM Inspector: Redactiebot"
-
msgid "Yahoo Sat"
msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
+
msgid "MapBox Satellite"
msgstr "MapBox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS-sporen"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Zwart-Wit)"
+msgstr "OpenStreetMap (Mapnik zwart/wit)"
+
+msgid "skobbler"
+msgstr "skobbler"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -20934,38 +22568,26 @@ msgid "MapQuest OSM"
msgstr "MapQuest OSM"
msgid "Public Transport (ÖPNV)"
-msgstr "Openbaar Vervoer (ÖPNV)"
+msgstr "Public Transport (ÖPNV)"
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Duitse Stijl)"
-
-msgid "Streets NRW Geofabrik.de"
-msgstr "Straten NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Hike & Bike"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbisch)"
+msgstr "OpenStreetMap (Duitse stijl)"
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Duitstalig)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "OpenPT Map (overtrek)"
-
-msgid "Bavaria (2 m)"
-msgstr "Beieren 92m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodja, Laos, Thailand, Vietnam tweetalig"
-msgid "Hamburg (40 cm)"
-msgstr "Hamburg (40 cm)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (DK5)"
-msgstr "Hamburg (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI zwart/wit 2.5m"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Graz: Basiskarte (basiskaart)"
@@ -20976,121 +22598,187 @@ msgid "Tiris: DOM (Surface model)"
msgstr "Tiris: DOM (Oppervlaktemodel)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Wenen: Mehrzweckkarte (algemeen doel)"
+msgstr "Vienna: Mehrzweckkarte (algemene doeleinden)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Wenen: Beschriftungen (aantekeningen)"
+msgstr "Vienna: Beschriftungen (opmerkingen)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Wenen: Orthofoto (luchtfoto)"
+msgstr "Vienna: Orthofoto (luchtfoto)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Kanton Aargau 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Stadt Uster Orthophoto 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Stadtplan Zürich"
-msgstr "Plattegrond Zürich"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terreinmodel)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Oppervlaktemodel)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrografie"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Geobase wegen"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Kanton Génève 5cm (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Kanton Neuchâtel 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Canton du Jura 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Canton de Fribourg 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Denemarken)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Denemarken)"
-msgid "Geobase Hydrography"
-msgstr "Geobase Hydrography"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Denemarken)"
-msgid "Geobase Roads"
-msgstr "Geobase Roads"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estonia Basemap (Maaamet)"
-msgid "Canvec"
-msgstr "Canvec"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortho (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr "British Columbia-mozaïek"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr "MSR Maps Topo"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgid "MSR Maps Urban"
-msgstr "MSR Maps Urban"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "USGS Scanned Topographic Maps"
-msgstr "USGS Scanned Topographic Maps"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "USGS Large Scale Imagery"
-msgstr "USGS Large Scale Imagery"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "OSM US TIGER 2012 Wegenlaag"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "Czech CUZK:KM"
-msgstr "Tsjechisch CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Tsjechisch UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historisch"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Orthophotos 2000"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-inch Scotland 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Orthophotoplan 2011"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Orthophotoplan 2007"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Orthophotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthophotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Straten NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Servisch)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (Duits)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Beieren (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Erlangen 2013 Luchtfoto (6,25 cm)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Erlangen 2011 Luchtfoto (5,0 cm)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+"Oude kaart van Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Oude kaart van Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Physical DE:Harz - Overlay voor Bing (Bijv. dekking tussen. 20 en 50 procent "
+"gebruiken)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haiti)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ierland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ierland Bartholomew Quarter-Inch 1940"
+msgstr "Ireland Bartholomew Quarter-Inch 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Ierland EEA GMES Stadsatlas"
+msgstr "Ireland EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr "Ierland EEA Corine 2006"
+msgstr "Ireland EEA CORINE 2006"
msgid "Lodi - Italy"
-msgstr "Lodi - Italië"
+msgstr "Lodi - Italy"
msgid "Lombardia - Italy (CTR)"
msgstr "Lombardije - Italië (CTR)"
@@ -21099,10 +22787,10 @@ msgid "Sicily - Italy"
msgstr "Sicilië - Italië"
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Italë"
+msgstr "PCN 2006 - Italië"
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio + Umbria"
+msgstr "PCN 2008 - IT Lazio+Umbrië"
msgid "USSR - Latvia"
msgstr "USSR - Letland"
@@ -21111,151 +22799,214 @@ msgid "50cm ortho - Latvia"
msgstr "50cm ortho - Letland"
msgid "20cm ortho - Coastline"
-msgstr "20cm ortho - Kustlijn"
+msgstr "20cm ortho - Coastline"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Litouwen)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger-delta Oct 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinán/Bulacan (Phillipijnen HiRes)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Auto"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Fietsen"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Skiën"
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenië (KaPor, 2010-04)"
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katastrálna mapa Slovenië (KaPor, 2011-05)"
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slowaakse EEA GMES Urban Atlas"
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slowaakse EEA CORINE 2006"
+
+msgid "Slovakia Historic Maps"
+msgstr "Slowaakse Historische kaarten"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "Zuid-Afrika CD:NGI Aerial"
+
+msgid "Catastro Spain"
+msgstr "Catastro Spanje"
+
+msgid "PNOA Spain"
+msgstr "PNOA Spanje"
+
+msgid "SIGPAC Spain"
+msgstr "SIGPAC Spanje"
+
+msgid "GRAFCAN - Canary Islands"
+msgstr "GRAFCAN - Canarische eilanden"
+
+msgid "ITACyL - Castile and León"
+msgstr "ITACyL - Castile en León"
+
+msgid "IDEIB - Balearic Islands"
+msgstr "IDEIB - Balearen"
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stad Uster Orthophoto 2008 10cm"
+
+msgid "Stadtplan Zürich"
+msgstr "Stadskaart Zürich"
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Canton de Génève 5cm (SITG 2011)"
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton du Jura 50cm (RCJU 1998)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr ""
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Canton de Fribourg 50cm (2005)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Toulouse - Orthophotoplan 2007"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stad Bern 10cm/25cm (2008)"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Orthophotos 2008-2010"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthofoto’s 2008"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgid "Catastro Spain"
-msgstr "Catastro Spain"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Orthophoto 2012"
-msgid "PNOA Spain"
-msgstr "PNOA Spanje"
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthophoto 2012"
-msgid "SIGPAC Spain"
-msgstr "SIGPAC Spanje"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Orthophoto technique 2012"
-msgid "GRAFCAN - Canary Islands"
-msgstr "GRAFCAN - Canarische Eilanden"
+msgid "MSR Maps Topo"
+msgstr "MSR Maps Topo"
-msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castile en León"
+msgid "MSR Maps Urban"
+msgstr "MSR Maps Urban"
-msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Balearen"
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Gescande topografische kaarten"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estse Basiskaart (Maaamet)"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Large Scale Imagery"
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estse Ortho (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Wegen overlay"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estse Multi (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Nieuwe & foutief uitgelijnde TIGER Roads (TIGER 2013)"
-msgid "ORT10LT (Lithuania)"
-msgstr "ORT10LT (Lithuania)"
+msgid "OSM - Tiger Edited Map"
+msgstr "OSM - Tiger Edited Map"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Denemarken)"
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denemarken)"
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Oekraine - Orthophotomaps 2012"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Filipijnen HiRes)"
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "OS New Popular Edition historic"
+msgstr "OS New Popular Edition historic"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodja, Laos, Thailand, Vietnam tweetalig"
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr "Niger Delta Oct 2012 Landsat"
+msgid "Surrey Air Survey"
+msgstr "Surrey Air Survey"
-msgid "South Africa CD:NGI Aerial"
-msgstr "South Africa CD:NGI Aerial"
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-inch Schotland 1842-82"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Auto"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Trekken"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Fiets"
+msgid "OS 1:25k historic (OSM)"
+msgstr "OS 1:25k historisch (OSM)"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Ski"
+msgid "OS Scottish Popular historic"
+msgstr "OS Scottish Popular historic"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Kadastrale kaart Slovenië (KaPor, 2010-04)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Kadastrale kaart Slovenië (KaPor, 2011-05)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "OS Town Plans, Cupar 1854 (NLS)"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slowakije EEA GMES Urban Atlas"
+msgid "OSM Export"
+msgstr "OSM exporteren"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slowakije EEA CORINE 2006"
+msgid "Export traffic data to SUMO network file."
+msgstr "Exporteer verkeersgegevens naar SUMO netwerkbestand."
-msgid "Slovakia Historic Maps"
-msgstr "Slowakije Historische kaarten"
+msgid "SUMO Export"
+msgstr "SUMO exporteren"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI zwart-wit 2.5m"
+msgid "Export"
+msgstr "Exporteren"
-msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Tiger Edited kaart"
+msgid "Port:"
+msgstr "Poort:"
-msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k historisch (OSM)"
+msgid "refresh the port list"
+msgstr "Lijst met poorten vernieuwen"
-msgid "OS Scottish Popular historic"
-msgstr "OS Schots Populair historisch"
+msgid "Configure"
+msgstr "Configureren"
-msgid "Stuttgart (Luftbild)"
-msgstr "Stuttgart (luchtfoto)"
+msgid "Connection Error."
+msgstr "Verbindingsfout."
-msgid "2u"
-msgstr "2u"
+msgid "configure the connected DG100"
+msgstr "De verbonden DG100 configureren"
+
+msgid "delete data after import"
+msgstr "gegevens na importeren verwijderen"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV-bestanden"
@@ -21469,6 +23220,18 @@ msgstr "Geeft hoogteprofiel weer"
msgid "Elevation Profile"
msgstr "Hoogteprofiel"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Hoogte-rasterlaag (experimenteel)"
+
+msgid "Shows elevation grid layer"
+msgstr "Hoogte-rasterlaag weergeven"
+
+msgid "Elevation Grid"
+msgstr "Hoogteraster"
+
+msgid "No SRTM data"
+msgstr "Geen gegevens SRTM"
+
msgid "Open the elevation profile window."
msgstr "Open het venster voor het Hoogteprofiel."
@@ -21490,14 +23253,8 @@ msgstr "Winst"
msgid "Time"
msgstr "Tijd"
-msgid "Geoid"
-msgstr "Geoïde"
-
-msgid "Automatic"
-msgstr "Automatisch"
-
-msgid "Fixed value"
-msgstr "Vaste waarde"
+msgid "Tracks"
+msgstr "Sporen"
msgid "Elevation profile for track ''{0}''."
msgstr "Hoogteprofiel voor spoor ''{0}''."
@@ -21551,7 +23308,7 @@ msgid "Draw closed polygons only"
msgstr "Teken alleen gesloten polygonen"
msgid "Try copying tags from properties table"
-msgstr "Probeer tags te kopiëren vanuit de tabel met eigenschappen"
+msgstr "Probeer tags te kopiëren vanuit de tabel met eigenschappen"
msgid "FastDraw settings"
msgstr "Instellingen FastDraw"
@@ -21570,7 +23327,7 @@ msgid ""
"Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click "
"to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"
msgstr ""
-"Klik of Klik&Sleep om door te gana, Ctrl-klik om vaste knoop toe te voegen, "
+"Klik of Klik&Sleep om door te gaan, Ctrl-klik om vaste knoop toe te voegen, "
"Shift-klik om te verwijderen, Enter om te vereenvoudigen of op te slaan, "
"Ctrl-Shift-klik om nieuwe lijn te beginnen"
@@ -21772,9 +23529,15 @@ msgstr "Selecteer incomplete adressen"
msgid "Selects all addresses with incomplete data."
msgstr "Selecteert alle adressen met incomplete gegevens."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Gebruik tag 'addr:street' of 'addr:place'"
+
msgid "House Number Editor"
msgstr "Huisnummers bewerken"
+msgid "House number increment:"
+msgstr "Verhoging huisnummers:"
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Eigenschappen van maximaal {0} object bijwerken"
@@ -21800,6 +23563,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Eigenschappen voor laag"
+msgid "Error while creating image layer: {0}"
+msgstr "Fout tijdens maken van laag voor afbeelding: {0}"
+
msgid "Import image"
msgstr "Afbeelding importeren"
@@ -21879,9 +23645,21 @@ msgstr "Open een venster met een selectielijst voor OSM Inspector."
msgid "Current Selected Bug Info"
msgstr "Huidige geselecteerde Bug Info"
+msgid "Prev OSMI bug"
+msgstr "Vorige bug OSMI"
+
+msgid "Next OSMI bug"
+msgstr "Volgende bug OSM"
+
msgid "Osm Inspector Bugs"
msgstr "Osm Inspector Bugs"
+msgid "OSM Inspector Bugs"
+msgstr "OSM Inspector Bugs"
+
+msgid "Selected Bug Info"
+msgstr "Geselecteerde Bug Info"
+
msgid "Handy Address Interpolation Functions"
msgstr "Handige functies voor Adres-interpolatie"
@@ -21968,8 +23746,8 @@ msgstr "Verwachtte oneven nummers voor adressen"
msgid "Expected even numbers for addresses"
msgstr "Verwachtte even nummers voor adressen"
-msgid "Expected valid number for address increment"
-msgstr "Verwachtte geldig nummer voor verhogen van adres"
+msgid "Expected valid number for increment"
+msgstr "Verwacht geldig nummer voor verhogoing"
msgid "Country code must be 2 letters"
msgstr "Landcode moet 2 letters zijn"
@@ -22349,15 +24127,6 @@ msgstr "Huisnummer:"
msgid "Street Name:"
msgstr "Straatnaam:"
-msgid "Increment"
-msgstr "Verhogen"
-
-msgid "Decrement"
-msgstr "Verlagen"
-
-msgid "Numbers:"
-msgstr "Nummers:"
-
msgid "Big buildings mode"
msgstr "Modus grote gebouwen"
@@ -22498,7 +24267,7 @@ msgid ""
"The new grabbing key is F10, but you can change the key\n"
"in the shortcut settings if you want."
msgstr ""
-"Plugin cadastre-fr gebruikt de sneltoets F11 om te pakken,\n"
+"Plug-in cadastre-fr gebruikt de sneltoets F11 om te pakken,\n"
"wat nu is toegewezen aan de schakelaar voor volledig scherm.\n"
"De nieuwe toets om te pakken is F10, maar u kunt de toets in de instellingen "
"voor de sneltoetsen wijzigen zoals u dat wilt."
@@ -22516,7 +24285,7 @@ msgid ""
"Warning: failed to put option pane dialog always on top. Exception was: {0}"
msgstr ""
"Waarschuwing: dialoogvenster Opties altijd vooraan plaatsen is mislukt. "
-"Uitzondering was: {0}"
+"Exceptie was: {0}"
msgid ""
"To enable the cadastre WMS plugin, change\n"
@@ -22548,6 +24317,9 @@ msgstr "Schakel bijsnijden van afbeeldingen uit tijdens geo-verwijzingen."
msgid "Use \"Tableau d''assemblage\""
msgstr "Gebruik van \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr "Vervang alleen grijze schaduwen door witte kleur"
+
msgid "Select first WMS layer in list."
msgstr "Selecteer de eerste WMS-laag uit de lijst."
@@ -22567,12 +24339,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "hoog"
-
-msgid "medium"
-msgstr "medium"
-
msgid "symbol"
msgstr "symbool"
@@ -22727,6 +24493,11 @@ msgstr ""
"Voeg het \"Tableau(x) d''assemblage\" toe aan de lijst van kadastrale bladen "
"om op te halen."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Vervang grijswaarden door witte kleur (kleinere bestanden en minder "
+"geheugengebruik)."
+
msgid "Display crosspieces:"
msgstr "Hulplijnen weergeven:"
@@ -22748,6 +24519,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Schakel dit in om de tag \"add:street\" voor knopen te gebruiken."
+msgid "Unexpected file extension. {0}"
+msgstr "Onverwachte bestandsextensie. {0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "Voeg \"source=...\" toe aan elementen?"
@@ -22837,51 +24611,6 @@ msgstr ""
"Deze afbeelding bevat gegevens over geo-verwijzingen\n"
"Wilt u die gebruiken ?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Klik op de eerste hoek om de afbeelding bij te snijden (twee punten vereist)"
-
-msgid "Image cropping"
-msgstr "Afbeelding bijsnijden"
-
-msgid "Click second corner for image cropping"
-msgstr "Klik op de tweede hoek voor het bijsnijden van de afbeelding"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Klik op de eerste hulplijn voor Lambert voor geo-verwijzingen (twee punten "
-"vereist"
-
-msgid "Image georeferencing"
-msgstr "Geo-verwijzingen voor afbeelding"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Klik op de tweede hulplijn voor Lambert voor geo-verwijzingen"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr "Wilt u volledig annuleren of slechts opnieuw proberen "
-
-msgid "Enter cadastre east,north position"
-msgstr "Voer de kadastrale oost,noord-positie in"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Waarschuwing: controleer noord met de pijl !!)"
-
-msgid "East"
-msgstr "Oost"
-
-msgid "I use the mouse"
-msgstr "Ik gebruik de muis"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Stel {0} Lambert-coördinaten in"
-
msgid "Load layer from cache"
msgstr "Laag laden vanuit cache"
@@ -22940,20 +24669,80 @@ msgstr "Voegt nieuwe laag toe"
msgid "Open Cadastre Preferences"
msgstr "Open de voorkeuren voor Cadastre"
+msgid "Refine georeferencing"
+msgstr "Geoverwijzingen verfijnen"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Geoverwijzingen verbeteren (alleen rasterafbeeldingen)"
+
msgid "Reset cookie"
msgstr "Cookie herstellen"
msgid "Get a new cookie (session timeout)"
msgstr "Een nieuwe cookie verkrijgen (sessie verlopen)"
-msgid "Save image as PNG"
-msgstr "Afbeelding opslaan als PNG"
+msgid "Save image as..."
+msgstr "Afbeelding opslaan als..."
msgid "PNG files (*.png)"
msgstr "PNG-bestanden (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Exporteren als PNG-indeling (alleen rasterafbeeldingen)"
+msgid "GeoTiff files (*.tif)"
+msgstr "GeoTiff-bestanden (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Afbeelding exporteren (alleen rasterafbeeldingen)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Klik op de eerste hoek om de afbeelding bij te snijden (twee punten vereist)"
+
+msgid "Image cropping"
+msgstr "Afbeelding bijsnijden"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Klik op de eerste hulplijn voor Lambert voor geo-verwijzingen (twee punten "
+"vereist"
+
+msgid "Image georeferencing"
+msgstr "Geo-verwijzingen voor afbeelding"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr "Wilt u volledig annuleren of slechts opnieuw proberen "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Ooops. alle coördinaten juist weergeven is mislukt. probeer het nog eens."
+
+msgid "Enter cadastre east,north position"
+msgstr "Voer de kadastrale oost,noord-positie in"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Waarschuwing: controleer noord met de pijl !!)"
+
+msgid "East"
+msgstr "Oost"
+
+msgid "I use the mouse"
+msgstr "Ik gebruik de muis"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Stel {0} Lambert-coördinaten in"
+
+msgid "Click second corner for image cropping"
+msgstr "Klik op de tweede hoek voor het bijsnijden van de afbeelding"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Klik op de tweede hulplijn voor Lambert voor geo-verwijzingen"
msgid "Adjust WMS"
msgstr "WMS aanpassen"
@@ -22982,8 +24771,11 @@ msgstr "WMS-laag ({0}), {1} tegel(s) geladen"
msgid "Is not vectorized."
msgstr "Is niet in vectoren gemaakt."
-msgid "Raster size: {0}"
-msgstr "Rastergrootte: {0}"
+msgid "Bounding box: {0}"
+msgstr "Begrenzingsvak: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Afbeeldingsgrootte (px): {0}/{1}"
msgid "Is vectorized."
msgstr "Is gemaakt in vectoren."
@@ -23035,7 +24827,7 @@ msgstr "Verwijder het geselecteerde schema uit de lijst."
msgid "Color Schemes"
msgstr "Kleurenschema''s"
-msgid "Adress"
+msgid "Address"
msgstr "Adres"
msgid "Split area"
@@ -23083,6 +24875,9 @@ msgstr "Downloaden langs"
msgid "Please select 1 or more ways to download along"
msgstr "Selecteer 1 of meer wegen om langs te downloaden"
+msgid "Download from OSM along selected ways"
+msgstr "Downloaden vanaf OSM langs geselecteerde wegen"
+
msgid "{0} intermediate nodes to download."
msgstr "{0} tussenliggende knopen te downloaden."
@@ -23143,20 +24938,85 @@ msgstr "Naam:"
msgid "CmdLine:"
msgstr "OpdrRegel:"
-msgid "External tools"
-msgstr "Externe programma’s"
+msgid "External tools"
+msgstr "Externe programma''s"
+
+msgid "Delete tool \"{0}\"?"
+msgstr "Verwijder programma \"{0}\"?"
+
+msgid "Are you sure?"
+msgstr "Weet je het zeker?"
+
+msgid "New tool..."
+msgstr "Nieuw programma..."
+
+msgid "Install"
+msgstr "Installeren"
+
+msgid "Public"
+msgstr "Openbaar"
+
+msgid "Could not get server response, check logs"
+msgstr "Kon geen antwoord van server krijgen, controleer logs"
+
+msgid "Failed to login as {0}:"
+msgstr "Mislukt om in te loggen als {0}:"
+
+msgid "The server did not return user ID"
+msgstr "De server gaf geen ID voor de gebruiker terug"
+
+msgid "Failed to send message:"
+msgstr "Bericht verzenden mislukt:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Mislukt om bericht te ontvangen als {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Open paneel voor GeoChat"
+
+msgid "Zoom in to see messages"
+msgstr "Zoom in om berichten te zien"
+
+msgid "Login"
+msgstr "Inloggen"
+
+msgid "Enable autologin"
+msgstr "Automatisch inloggen inschakelen"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} gebruiker"
+msgstr[1] "{0} gebruikers"
+
+msgid "not logged in"
+msgstr "niet ingelogd"
+
+msgid "User {0} has left"
+msgstr "Gebruiker {0} is weggegaan"
+
+msgid "User {0} is mapping nearby"
+msgstr "Gebruiker {0} bewerkt kaart dichtbij"
+
+msgid "Users mapping nearby:"
+msgstr "Gebruikers die kaart dichtbij bewerken:"
-msgid "Delete tool \"{0}\"?"
-msgstr "Verwijder programma \"{0}\"?"
+msgid "Private chat"
+msgstr "Privé chatten"
-msgid "Are you sure?"
-msgstr "Weet je het zeker?"
+msgid "Close tab"
+msgstr "Tabblad sluiten"
-msgid "New tool..."
-msgstr "Nieuw programma..."
+msgid "Logout"
+msgstr "Uitloggen"
-msgid "Install"
-msgstr "Installeren"
+msgid "Clear log"
+msgstr "Log wissen"
+
+msgid "Show users on map"
+msgstr "Gebruikers op kaart weergeven"
msgid "Position only"
msgstr "Alleen positie"
@@ -23197,27 +25057,9 @@ msgstr "Loggen van gegevens uitschakelen als afstand kleiner wordt dan"
msgid "Unknown logFormat"
msgstr "Onbekende indeling log"
-msgid "Port:"
-msgstr "Poort:"
-
-msgid "refresh the port list"
-msgstr "Lijst met poorten vernieuwen"
-
-msgid "Configure"
-msgstr "Configureren"
-
msgid "Configure Device"
msgstr "Apparaat configureren"
-msgid "Connection Error."
-msgstr "Verbindingsfout."
-
-msgid "configure the connected DG100"
-msgstr "De verbonden DG100 configureren"
-
-msgid "delete data after import"
-msgstr "gegevens na importeren verwijderen"
-
msgid "Importing data from device."
msgstr "Gegevens vanaf apparaat importeren."
@@ -23242,7 +25084,7 @@ msgid ""
"plugin/"
msgstr ""
"Kan bibliotheek rxtxSerial niet laden. Als u ondersteuning nodig hebt om het "
-"te installeren probeer danb de homepage van Globalsat op http://www.raphael-"
+"te installeren probeer dan de homepage van Globalsat op http://www.raphael-"
"mack.de/josm-globalsat-gpx-import-plugin/"
msgid "Globalsat Import"
@@ -23372,7 +25214,7 @@ msgid ""
"Syntax exception in access ruleset:\n"
"{0}"
msgstr ""
-"Uitzondering in syntaxis voor toegang verzameling regels:\n"
+"Exceptie in syntaxis voor toegang verzameling regels:\n"
"{0}"
msgid ""
@@ -23457,7 +25299,7 @@ msgid ""
"(;)"
msgstr ""
"Lijst van oppervlakten die het voertuig niet kan gebruiken, waarden worden "
-"gescheiden door punt-komma’s (;)"
+"gescheiden door punt-komma''s (;)"
msgid "max. tracktype grade"
msgstr "max. graad type weg"
@@ -23646,6 +25488,9 @@ msgstr "Genereer XML-afbeeldingsgrenzen voor de selectie"
msgid "edit bounds for selected defaults"
msgstr "bewerk grenzen voor geselecteerde standaarden"
+msgid "Download imagery XML bounds"
+msgstr "Afbeeldings-XML begrenzingen downloaden"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23685,17 +25530,23 @@ msgstr "Waarschuwing: vervallen verklaring is nagenoeg onomkeerbaar!"
msgid "To store imagery offsets you must be a registered OSM user."
msgstr ""
+"U moet een geregistreerde gebruiker van OSM zi9n om verschuivingen voor "
+"afbeeldingen op te slaan."
msgid ""
"Please enter the reason why you mark this imagery offset as deprecated"
msgstr ""
+"Voer de reden in waarom u de verschuiving voor deze afbeelding als vervallen "
+"markeert"
msgid ""
"Please enter the reason why you mark this calibration geometry as deprecated"
msgstr ""
+"Voer de reden in waarom u de geometrische calibratie voor deze afbeelding "
+"als vervallen markeert"
msgid "Notifying the server of the deprecation..."
-msgstr ""
+msgstr "De server in kennis stellen van de vervallenverklaring..."
msgid "Get Imagery Offset..."
msgstr "Verschuivingen afbeeldingen ophalen..."
@@ -23707,24 +25558,26 @@ msgstr ""
msgid ""
"No data for this region. Please adjust imagery layer and upload an offset."
msgstr ""
+"Geen gegevens voor deze regio. Pas de afbeeldingslaag aan en upload een "
+"verschuiving."
msgid "Loading imagery offsets..."
-msgstr ""
+msgstr "Verschuivngen voor afbeeldingen laden..."
msgid "Error processing XML response: {0}"
-msgstr ""
+msgstr "Fout tijdens verwerken van XML-antwoord: {0}"
msgid "Offset"
-msgstr ""
+msgstr "Verschuiving"
msgid "Imagery Offset Database"
-msgstr ""
+msgstr "Database verschuivingen afbeeldingen"
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
@@ -23733,66 +25586,76 @@ msgid "km"
msgstr "km"
msgid "Calibration geometries"
-msgstr ""
+msgstr "Geometrische calibratie"
msgid "Deprecated offsets"
-msgstr ""
+msgstr "Vervallen verschuvingen"
msgid ""
"The topmost imagery layer has been shifted to presumably match\n"
"OSM data in the area. Please check that the offset is still valid\n"
"by downloading GPS tracks and comparing them and OSM data to the imagery."
msgstr ""
+"De bovenste laag is opgeschoven om meest waarschijnlijk overeen te komen met "
+"de gegevens van\n"
+"OSM in het gebied. Controleer of de verschuiving nog steeds geldig is\n"
+"door GPS-sporen te downloaden en die te vergelijken met gegevens van OSM "
+"voor de afbeelding."
msgid ""
"A layer has been added with a calibration geometry. Hide data layers,\n"
"find the corresponding feature on the imagery layer and move it accordingly."
msgstr ""
+"Een laag met een geometrische calibratie is toegevoegd. Verberg "
+"gegevenslagen,\n"
+"zoek het overeenkomende item op de afbeeldingslaag en verplaats het "
+"overeenkomstig."
msgid "Deprecated by {0} on {1}"
-msgstr ""
+msgstr "Vervallen verklaard door {0} op {1}"
msgid "Created by {0} on {1}"
-msgstr ""
+msgstr "Gemaakt door {0} op {1}"
msgid "Offset Information"
-msgstr ""
+msgstr "Informatie over verschuiving"
msgid "Report this offset"
-msgstr ""
+msgstr "Rapporteer deze verschuiving"
msgid "You are to notify moderators of this offset. Why?"
msgstr ""
+"U moet de moderators van deze verschuiving in kennis stellen. Waarom?"
msgid "Reporting the offset..."
-msgstr ""
+msgstr "Rapporteren van de verschuiving..."
msgid "An imagery offset of {0}"
-msgstr ""
+msgstr "Een verschuiving in de afbeelding van {0}"
msgid "Imagery ID"
-msgstr ""
+msgstr "ID van de afbeelding"
msgid "A calibration geometry of {0} nodes"
-msgstr ""
+msgstr "Een geometrische calibratie van {0} knopen"
msgid "Determined right here"
-msgstr ""
+msgstr "Direct hier vastgesteld"
msgid "Determined {0} away"
-msgstr ""
+msgstr "Vastgesteld {0} weg"
msgid "Reason"
-msgstr ""
+msgstr "Reden"
msgid "This entry has been reported."
-msgstr ""
+msgstr "Dit item is gerapporteerd."
msgid "Server has rejected the request"
-msgstr ""
+msgstr "Server heeft het verzoek geweigerd"
msgid "Unable to connect to the server"
-msgstr ""
+msgstr "Onmogelijk om verbinding te maken met de server"
msgid "Store Imagery Offset..."
msgstr "Verschuivingen afbeeldingen opslaan..."
@@ -23801,22 +25664,28 @@ msgid ""
"Upload an offset for current imagery (or calibration object geometry) to a "
"server"
msgstr ""
+"Upload een verschuiving voor de huidige afbeelding (of object geometrische "
+"calibratie) naar een server"
msgid "Store calibration geometry"
-msgstr ""
+msgstr "Geometrische calibratie opslaan"
msgid "Store imagery offset"
-msgstr ""
+msgstr "Verschuiving voor afbeelding opslaan"
msgid ""
"The selected object can be used as a calibration geometry. What do you "
"intend to do?"
msgstr ""
+"Het geselecteerde object kan worden gebruikt als een geometrische "
+"calibratie. Wat wilt u er mee doen?"
msgid ""
"The topmost imagery layer has no offset. Are you sure you want to upload "
"this?"
msgstr ""
+"De bovenste afbeeldingslaag heeft geen verschuiving. Weet u zeker dat u dit "
+"wilt uploaden?"
msgid ""
"You are registering an imagery offset. Other users in this area will be able "
@@ -23824,6 +25693,10 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
+"U gaat een verschuiving in de afbeelding registreren. Andere gebruikers in "
+"dit gebied zullen die kunnen gebruiken bij het maken van hun kaarten.\n"
+"Zorg er voor dat het zo nauwkeurig mogelijk is en beschrijf de regio waarop "
+"deze verschuiving van toepassing is."
msgid ""
"You are registering a calibration geometry. It should be the most precisely "
@@ -23831,12 +25704,17 @@ msgid ""
"clearly visible boundaries on various satellite imagery. Please describe "
"this object and its whereabouts."
msgstr ""
+"U gaat een geometrische calibratie registreren. Het zou het meest nauwkeurig "
+"gepositioneerde object moeten zijn, met\n"
+"duidelijk zichtbare begrenzingen op verschillende satellietbeelden. "
+"Beschrijf dit object en zijn directe omgeving."
msgid "Uploading a new offset..."
-msgstr ""
+msgstr "Uploaden van nieuwe verschuiving..."
msgid "This string should be 3 to 200 letters long."
msgstr ""
+"Deze tekenreeks zou tussen 3 tot en met 200 letters lang moeten zijn."
msgid "Adjust imagery"
msgstr "Afbeelding aanpassen"
@@ -23890,7 +25768,7 @@ msgid "WayPoint Image"
msgstr "Afbeelding wegpunt"
msgid "Display non-geotagged photos"
-msgstr "Foto’s zonder geo-tags weergeven"
+msgstr "Foto''s zonder geo-tags weergeven"
msgid "Imported Images"
msgstr "Geïmporteerde afbeeldingen"
@@ -23898,12 +25776,6 @@ msgstr "Geïmporteerde afbeeldingen"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Afbeeldingsbestanden (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Afbeeldingen openen met ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Verzameling afbeeldingen laden als een nieuwe laag."
-
msgid "Import vector graphics"
msgstr "Vectorafbeeldingen importeren"
@@ -23913,18 +25785,15 @@ msgstr "Schaal:"
msgid "unit(s) = "
msgstr "eenhe(i)d(en) = "
-msgid "Import..."
-msgstr "Importeren..."
-
-msgid "Import vector graphics."
-msgstr "Vectorafbeeldingen importeren."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG-tekeningen (*.svg)"
-
msgid "Importing..."
msgstr "Aan het importeren..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "SVG-bestanden [ImportVec plugin] (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Open of maak een gegevenslaag vóór het importeren"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -24309,9 +26178,6 @@ msgstr "Automatisch centeren"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "De LiveGPS-laag continu op de huidige locatie centeren."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "MapDust openen"
@@ -24366,9 +26232,33 @@ msgstr "Overlappende wegen samenvoegen."
msgid "Merge Overlap (combine)"
msgstr "Overlapping samenvoegen (combineren)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Een lid met een op een rol gebaseerde relatie is gekopieerd naar alle "
+"nieuwe wegen.<br>U zou dit moeten nakijken en indien nodig corrigeren.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>En lid van een relatie waarvan is gekopieerd naar alle nieuwe "
+"wegen.<br>U zou dit moeten nakijken en indien nodig corrigeren.</html>"
+
msgid "Split way"
msgstr "Weg splitsen"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Geef een sleutel op, d.i. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Geef een waarde op voor een tag, d.i <strong><tt>kijk leden "
+"na</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Michigan links"
@@ -24412,6 +26302,15 @@ msgstr "OSM-objecttype om te downloaden (''*'' staat voor elke)"
msgid "XAPI query: "
msgstr "XAPI-query: "
+msgid "Download from Overpass API ..."
+msgstr "Downloaden vanaf Overpass API ..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Download kaartgegevens vanaf server van Overpass API."
+
+msgid "Overpass query: "
+msgstr "Overpass query: "
+
msgid "Select OSM mirror URL"
msgstr "Selecteer URL van mirror van OSM"
@@ -24424,16 +26323,6 @@ msgstr "Basis URL"
msgid "Enforce meta data"
msgstr "Metadata forceren"
-msgid "Convert to multipolygon"
-msgstr "Converteer naar multipolygoon"
-
-msgid "Convert to multipolygon."
-msgstr "Converteer naar multipolygoon."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-"Eén van de geselecteerde wegen is al een deel van een andere multipolygoon."
-
msgid "About Plugin"
msgstr "Over Plug-in"
@@ -24580,9 +26469,6 @@ msgstr "Splits op buurt"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Splits deze gegevens op buurt (admin_level=11)."
-msgid "Open Data"
-msgstr "Open Data"
-
msgid "CSV files"
msgstr "CSV-bestanden"
@@ -24607,12 +26493,21 @@ msgstr "GML-bestanden"
msgid "Zip Files"
msgstr "Zip-bestanden"
+msgid "7Zip Files"
+msgstr "7Zip-bestanden"
+
msgid "OpenData XML files"
msgstr "OpenData XML-bestanden"
+msgid "Download open data"
+msgstr "Download open gegevens"
+
msgid "License URL not available: {0}"
msgstr "URL voor licentie niet beschikbaar: {0}"
+msgid "OpenData preferences"
+msgstr "voorkeuren OpenData"
+
msgid "License Agreement"
msgstr "Licentie-overeenkomst"
@@ -24632,7 +26527,7 @@ msgid "I refuse these terms and conditions. Cancel download."
msgstr "Ik verwerp deze bepalingen en voorwaarden. Downloaden annuleren."
msgid "Module bundled with opendata plugin"
-msgstr "Module gebundeld met plugin opendata"
+msgstr "Module gebundeld met plug-in opendata"
msgid ""
"Please click on <strong>Download list</strong> to download and display a "
@@ -24729,7 +26624,7 @@ msgid ""
msgstr ""
"Een speciale afhandeling voor verschillende portalen van Open "
"Data<br/><br/>Lees de Terms and Conditions of Use voor elk "
-"portaal<br/>vóórdat gegevens worden geüpload met behulp van deze plugin."
+"portaal<br/>vóórdat gegevens worden geüpload met behulp van deze plug-in."
msgid "General settings"
msgstr "Algemene instellingen"
@@ -24778,6 +26673,9 @@ msgstr "Gegevens downloaden..."
msgid "File to load"
msgstr "bestand om te laden"
+msgid "Reading 7Zip file..."
+msgstr "Lezen van 7Zip-bestand..."
+
msgid "Reading Zip file..."
msgstr "Zip-bestand lezen..."
@@ -24799,6 +26697,19 @@ msgstr ""
msgid "Try lenient method"
msgstr "Probeer meer tolerante methode"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"Niet in staat om Coordinate Reference System te detecteren.\n"
+"Wilt u terugvallen op ESPG:4326 (WGS 84) ?"
+
+msgid "Warning: CRS not found"
+msgstr "Waarschuwing: CRS niet gevonden"
+
+msgid "Unable to detect CRS !"
+msgstr "Niet in staat CRS te detecteren !"
+
msgid "Unable to find a data store for file {0}"
msgstr "Kan geen opslagplaats vinden voor bestand {0}"
@@ -24995,7 +26906,7 @@ msgid "Illegal entry in module list."
msgstr "Ongeldig item in lijst voor module."
msgid "Reading local module information.."
-msgstr "Lezen van informatie voor locale module.."
+msgstr "Lezen van informatie voor lokale module.."
msgid "Processing module site cache files..."
msgstr "Verwerken van bestanden in cache voor site van module..."
@@ -25027,7 +26938,7 @@ msgstr ""
"module opslaan vanaf de site voor module ''{1}''."
msgid "Writing module list to local cache ''{0}''"
-msgstr "Schrijven van lijst voor module naar locale cache ''{0}''"
+msgstr "Schrijven van lijst voor module naar lokale cache ''{0}''"
msgid "Parsing module list from site ''{0}''"
msgstr "Parsen van lijst voor module vanaf site ''{0}''"
@@ -25037,7 +26948,7 @@ msgid ""
"Exception was: {1}"
msgstr ""
"Parsen van document voor lijst voor module vanaf site ''{0}'' mislukt Site "
-"wordt overgeslagen. Uitzondering was: {1}"
+"wordt overgeslagen. Exceptie was: {1}"
msgid "Processing module list from site ''{0}''"
msgstr "Parsen van lijst voor module vanaf site ''{0}''"
@@ -25075,14 +26986,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Er trad een fout op: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Kon geen nieuwe bug maken. Resultaat: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Kop bevat meerdere waarden en kan niet in één enkele string worden geplaatst"
-
msgid "Process queue"
msgstr "Wachtrij om te verwerken"
@@ -25140,18 +27043,6 @@ msgstr ""
msgid "Close: "
msgstr "Sluiten: "
-msgid "New issue"
-msgstr "Nieuw probleem"
-
-msgid "Create issue"
-msgstr "Probleem aanmaken"
-
-msgid "Describe the problem precisely"
-msgstr "Geef een nauwkeurige omschrijving van het probleem"
-
-msgid "Create: "
-msgstr "Maken: "
-
msgid "Open in browser"
msgstr "Openen in browser"
@@ -25213,6 +27104,9 @@ msgstr "uitvoerbestand Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "OSM-serverbestanden (PBF-gecomprimeerd)"
+msgid "Download PBF"
+msgstr "Downloaden van PBF"
+
msgid "Invalid changeset id: {0}"
msgstr "Ongeldige wijzigingenset-ID: {0}"
@@ -25422,9 +27316,6 @@ msgstr "PDF-bestand importeren."
msgid "Import PDF"
msgstr "PDF importeren"
-msgid "Import PDf file"
-msgstr "PDF-bestand importeren"
-
msgid " {0} objects so far"
msgstr " {0} objecten tot nu toe"
@@ -25479,7 +27370,7 @@ msgid "Could not write mtime."
msgstr "Kon geen mtime schrijven."
msgid "File could not be deleted!"
-msgstr "Bestand kon niet wordne verwijderd!"
+msgstr "Bestand kon niet worden verwijderd!"
msgid "Could not rename file!"
msgstr "Kon bestand niet hernoemen!"
@@ -25506,8 +27397,26 @@ msgstr "Test mislukt: Kon geen mtime lezen."
msgid "Test failed: Could not write mtime."
msgstr "Test mislukt: Kon geen mtime schrijven."
-msgid "PicLayer"
-msgstr "Afbeeldingslaag"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Wilt u de huidige kalibratie van laag {0} opslaan?"
@@ -25665,6 +27574,10 @@ msgstr "Niets op het klembord"
msgid "The clipboard data is not an image"
msgstr "De gegevens op het klembord is geen afbeelding"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Waarschuwing: afhandelen van zip-bestand ''{0}'' mislukt. Exceptie was: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
"Een bestand om te kalibreren, gekoppeld aan het afbeeldingsbestand, werd "
@@ -25692,6 +27605,9 @@ msgstr ""
"Ook zullen, vanaf nu, bestand om te kalibreren altijd automatisch worden "
"geladen."
+msgid "Download Osmosis poly"
+msgstr "Downloaden van Osmosis poly"
+
msgid "Reading polygon filter file..."
msgstr "Lezen van polygoon filterbestand..."
@@ -25811,7 +27727,7 @@ msgid "File \"{0}\" does not exist"
msgstr "Bestand \"{0}\" bestaat niet"
msgid "IOException \"{0}\" occurred"
-msgstr "IOUitzondering \"{0}\" opgetreden"
+msgstr "IO-exceptie \"{0}\" opgetreden"
msgid ""
"There exists no dataset. Try to download data from the server or open an OSM "
@@ -25988,9 +27904,6 @@ msgstr "Het GPX-bestand bevat geen sporen of wegpunten."
msgid "Create Stops from GPX"
msgstr "Maak haltes vanuit GPX"
-msgid "Tracks"
-msgstr "Sporen"
-
msgid "Tracks in this GPX file:"
msgstr "Sporen in dit GPX-bestand:"
@@ -26062,9 +27975,6 @@ msgstr "Specificeer rol"
msgid "Change relation member roles to {0}"
msgstr "Wijzig rollen van leden relatie naar {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Wijzig instellingen van het maken van de multipolygoon"
-
msgid "Create administrative boundary relations"
msgstr "Maak relaties voor administratieve grenzen"
@@ -26194,9 +28104,6 @@ msgstr "Node zonder de rollen ''label'' of ''admin_centre'' gevonden"
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Weg zonder de rollen ''inner'' of ''outer'' gevonden"
-msgid "Restart JOSM"
-msgstr "JOSM opnieuw starten"
-
msgid "Revert changeset fully"
msgstr "Draai de wijzigingenset volledig terug"
@@ -26214,10 +28121,15 @@ msgstr "Terugdraaien"
msgid "Enter the ID of the changeset that should be reverted"
msgstr ""
+"Voer de ID in van de wijzigingenset die zou moeten worden teruggedraaid"
msgid "Reverted changeset"
msgstr "Teruggedraaide wijzigingenset"
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+"Het is niet toegestaan om de wijzigingenset terug te draaien vanaf {0}"
+
msgid "Missing merge target for {0} with id {1}"
msgstr "Ontbrekend doel om samen te voegen voor {0} met ID {1}"
@@ -26254,15 +28166,35 @@ msgstr "Ophalen ontbrekende primitieven"
msgid "Downloading changeset"
msgstr "Wijzigingenset downloaden"
+msgid "See {0}"
+msgstr "Bekijk {0}"
+
msgid "Revert changeset #{0}"
msgstr "Draai wijzigingenset #{0} terug"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Waarschuwing: niet ondersteund startelement ''{0}'' in inhoud van "
+"wijzigingenset op positie ({1},{2}). Overslaan."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Waarschuwing: niet ondersteund eindelement ''{0}'' in inhoud wijzigingenset "
+"op positie ({1},{2}). Overslaan."
+
msgid "Road Sign Plugin"
msgstr "Plug-in Road Sign"
msgid "signs"
msgstr "tekens"
+msgid "Change Properties"
+msgstr "Eigenschappen veranderen"
+
msgid "Country preset:"
msgstr "Vooringesteld land:"
@@ -26272,6 +28204,9 @@ msgstr "Geef alle tekens weer"
msgid "Show a selection of the most useful signs"
msgstr "Geef een selectie van de meest gebruikte tekens weer"
+msgid "Spain"
+msgstr "Spanje"
+
msgid "Germany"
msgstr "Duitsland"
@@ -26374,9 +28309,6 @@ msgstr "Voorkeuren plug-in Routeren"
msgid "Configure routing preferences."
msgstr "Configureer de voorkeuren voor routeren."
-msgid "Highway type"
-msgstr "Type weg"
-
msgid "Speed (Km/h)"
msgstr "Snelheid (km/u)"
@@ -26505,6 +28437,9 @@ msgstr ""
msgid "Save SDS file"
msgstr "Sla het SDS-bestand op"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Kon geen back-up maken van het bestand. Exceptie is: {0}"
+
msgid "Simplify Area"
msgstr "Gebied vereenvoudigen"
@@ -26580,20 +28515,20 @@ msgstr "Factor afstand"
msgid "Merge Nearby Nodes Threshold"
msgstr "Drempel voor samenvoegen dicht bij elkaar gelegen knopen"
-msgid "Online Help"
-msgstr "Online Help"
+msgid "SeaMap Editor"
+msgstr "Bewerken SeaMap"
-msgid "Load"
-msgstr "Laden"
+msgid "No object selected"
+msgstr "Geen object geselecteerd"
-msgid "invisible"
-msgstr "onzichtbaar"
+msgid "Seamark Inspector"
+msgstr "Seamark Inspector"
-msgid "SeaMap Editor"
-msgstr "Bewerken SeaMap"
+msgid "Select only one object"
+msgstr "Selecteer slechts één object"
-msgid "Export"
-msgstr "Exporteren"
+msgid "Select a map object"
+msgstr "Selecteer een kaartobject"
msgid "AutoSave LiveData"
msgstr "LiveData automatisch opslaan"
@@ -26736,6 +28671,9 @@ msgstr "verwijder contour weg"
msgid "Street name: "
msgstr "Straatnaam: "
+msgid "Building: "
+msgstr "Gebouw: "
+
msgid "Even/Odd"
msgstr "Even/Oneven"
@@ -26814,6 +28752,103 @@ msgstr "Traceren."
msgid "Tracer building"
msgstr "Gebouw traceren"
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2."
+
+msgid "Change tag {0} to {1}"
+msgstr "Wijzig tag {0} naar {1}"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"De versie van Tracer2Server is niet compatibel met deze plugin. Download "
+"versie {0} vanaf\n"
+"{1}."
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+"Nieuwe versie van Tracer2Server is beschikbaar. Werk voor de beste "
+"resultaten bij naar versie {0}."
+
+msgid "No set of parameter is active!"
+msgstr "Er is geen set parameters actief!"
+
+msgid "Select parameter"
+msgstr "Selecteer parameter"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: voeg een weg toe met {0} punten"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: pas weg aan tot {0} punten"
+
+msgid "Tracer2 error"
+msgstr "Tracer2-fout"
+
+msgid "Parameter for server request"
+msgstr "Verzoekt parameter voor server"
+
+msgid "Tile size:"
+msgstr "Tegelgrootte:"
+
+msgid "Resolution:"
+msgstr "Resolutie:"
+
+msgid "Mode:"
+msgstr "Modus:"
+
+msgid "Threshold:"
+msgstr "Drempelwaarde:"
+
+msgid "Points per circle:"
+msgstr "Punten per cirkel:"
+
+msgid "Tag:"
+msgstr "Tag:"
+
+msgid "Preferred values:"
+msgstr "Voorkeurswaarden:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "Verwijderen parameter \"{0}\"?"
+
+msgid "Add new"
+msgstr "Nieuwe toevoegen"
+
+msgid "Add predefined"
+msgstr "Vooraf gedefinieerde toevoegen"
+
+msgid "Select predefined parameter"
+msgstr "Selecteer vooraf gedefinieerde parameter"
+
+msgid "Modify list of parameter for server request."
+msgstr "Pas de lijst met parameters voor serververzoek aan."
+
+msgid "Parameter:"
+msgstr "Parameter:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+"Tracer2Server wordt niet uitgevoerd. Start de server.\n"
+"Indien u de server niet heeft, download die vanaf\n"
+"{0}."
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "Tracer2Server heeft niets gevonden."
+
+msgid "Tracer2Server has detected an error."
+msgstr "Tracer2Server heeft een fout ontdekt."
+
msgid "GPG"
msgstr "GPG"
@@ -26829,9 +28864,6 @@ msgstr "Exporteer handtekeningen naar XML..."
msgid "Save Signatures file"
msgstr "Sla bestand met handtekeningen op"
-msgid "Download OSM"
-msgstr "OSM downloaden"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -26859,6 +28891,11 @@ msgstr "Laad objecten vanaf server"
msgid "Download signed data"
msgstr "Downloaden van ondertekende gegevens"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Waarschuwing: Exceptie wordt genegeerd omdat taak is geannuleerd.. Exceptie: "
+"{0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -27031,9 +29068,6 @@ msgstr "Ondertekening geannuleerd!"
msgid "Please give a tolerance in meters"
msgstr "Geef een tolerantie op in meters"
-msgid "Accuracy"
-msgstr "Nauwkeurigheid"
-
msgid "Select as much as you like:"
msgstr "Selecteer zoveel als u wilt:"
@@ -27427,19 +29461,19 @@ msgid "Bicycles"
msgstr "Fietsen"
msgid "Use standard exceptions"
-msgstr "Standaard uitzonderingen gebruiken"
+msgstr "Standaard excepties gebruiken"
msgid "Use non-standard exceptions"
-msgstr "Niet-standaard uitzonderingen gebruiken"
+msgstr "Niet-standaard excepties gebruiken"
msgid "Remove the currently selected vias"
-msgstr "De huidige geselecteerde via’s verwijderen"
+msgstr "De huidige geselecteerde via''s verwijderen"
msgid "Move the selected vias down by one position"
-msgstr "De geselecteerde via’s down één positie naar beneden verplaatsen"
+msgstr "De geselecteerde via''s één positie naar beneden verplaatsen"
msgid "Move the selected vias up by one position"
-msgstr "De geselecteerde via’s down één positie naar boven verplaatsen"
+msgstr "De geselecteerde via''s één positie naar boven verplaatsen"
msgid "Copy the selected vias to the clipboard"
msgstr "De geselecteerde via''s naar het klembord kopiëren"
@@ -27589,7 +29623,7 @@ msgid ""
"only. Please select one in the Basic editor."
msgstr ""
"Deze beperking Afslaan gebruikt een niet-standaard beperkingstype "
-"<tt>{0}</tt> vpor de tagsleutel <tt>restriction</tt>. Het wordt aanbevolen "
+"<tt>{0}</tt> voor de tagsleutel <tt>restriction</tt>. Het wordt aanbevolen "
"om alleen standaard waarden te gebruiken. Selecteer er een in de bewerker "
"Basis."
@@ -27607,7 +29641,7 @@ msgstr ""
"De <strong>from</strong>-weg <span class=\"object-name\">{0}</span> en de "
"<strong>to</strong>-weg <span class=\"object-name\">{1}</span> snijden "
"elkaar bij de knoop <span class=\"object-name\">{2}</span>, maar deze knoop "
-"is geen <strong>via</strong>-object.<br>Het wrdt aanbevolen om het in te "
+"is geen <strong>via</strong>-object.<br>Het wordt aanbevolen om het in te "
"stellen als uniek <strong>via</strong>-object."
msgid "Set via-Object"
@@ -27693,7 +29727,7 @@ msgstr ""
msgid "Go to Basic Editor and select standard vehicle type based exceptions"
msgstr ""
-"Ga naar de bewerker Basis en selecteer uitzonderingen die zijn gebaseerd op "
+"Ga naar de bewerker Basis en selecteer excepties die zijn gebaseerd op "
"standaard voertuigtypen"
msgid "The required tag <tt>{0}={1}</tt> is missing."
@@ -27760,10 +29794,11 @@ msgstr "Object terughalen..."
msgid "Undelete object by id"
msgstr "Object terughalen op ID"
-msgid "Select if the data should be added into a new layer"
-msgstr ""
-"Selecteren als de gegevens zouden moeten worden toegevoegd aan een nieuwe "
-"laag"
+msgid "Undelete Object"
+msgstr "Object terughalen"
+
+msgid "Undelete object"
+msgstr "Object terughalen"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -27772,11 +29807,10 @@ msgstr ""
"Voer het type en ID in van de objecten waarvan het verwijderen ongedaan zou "
"moeten worden gemaakt, bijv., ''n1 w2''"
-msgid "Undelete Object"
-msgstr "Object terughalen"
-
-msgid "Undelete object"
-msgstr "Object terughalen"
+msgid "Select if the data should be added into a new layer"
+msgstr ""
+"Selecteren als de gegevens zouden moeten worden toegevoegd aan een nieuwe "
+"laag"
msgid "Start undeleting"
msgstr "Beginnen met terughalen"
@@ -27784,18 +29818,6 @@ msgstr "Beginnen met terughalen"
msgid "Close dialog and cancel"
msgstr "Dialoogvenster sluiten en annuleren"
-msgid "Will get {0}"
-msgstr "Zal krijgen {0}"
-
-msgid "Looking for {0}"
-msgstr "Zoeken naar {0}"
-
-msgid "Found {0}"
-msgstr "Gevonden {0}"
-
-msgid "More tools"
-msgstr "Meer programma''s"
-
msgid "Add nodes at intersections"
msgstr "Knopen bij kruisingen toevoegen"
@@ -27842,16 +29864,6 @@ msgstr ""
"Plak het lidmaatschap van de relaties van objecten in de buffer op "
"geselecteerde object(en)"
-msgid "Paste tags [testing]"
-msgstr "Tags plakken [testen]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-"Pas tags toe, die zijn geparsed vanuit buffer, op alle geselecteerde items.."
-
-msgid "Paste tags"
-msgstr "Tags plakken"
-
msgid "Split Object"
msgstr "Object splitsen"
@@ -27990,18 +30002,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Configuratie van aangepaste URL"
-msgid "Key is too long:"
-msgstr "Sleutel is te lang:"
-
-msgid "Suspiciouns characters in tag:"
-msgstr "verdachte tekens in tag:"
-
-msgid "Value too long (max 255 characters):"
-msgstr "Waarde te lang (max. 255 tekens):"
-
-msgid "Ingore warnings"
-msgstr "Negeer waarschuwingen"
-
msgid "Lat Lon tool"
msgstr "Gereedschap Lat Lon"
@@ -28195,10 +30195,10 @@ msgid "Select highway for the name/ref given"
msgstr "Selecteer highway voor de gegeven name/ref"
msgid "Please select one or two ways for this action"
-msgstr "Selecteer één of twee wegen voor deze actie"
+msgstr "Selecteer één of twee wegen voor deze actie"
msgid "Select last modified nodes"
-msgstr "Selecteer de laatste aangepaste knpen"
+msgstr "Selecteer de laatste aangepaste knopen"
msgid "Select last modified ways"
msgstr "Selecteer de laatste aangepaste wegen"
@@ -28222,9 +30222,6 @@ msgstr "Selectie van knopen opheffen"
msgid "Removes all nodes from selection"
msgstr "Alle knopen uit selectie verwijderen"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr "Video importeren"
@@ -28354,8 +30351,8 @@ msgstr "herhalen"
msgid "mute"
msgstr "stil"
-msgid "Scanned Map..."
-msgstr "Gescande kaart..."
+msgid "Walking Papers Scanned Map"
+msgstr "Walking Papers gescande kaart"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28379,9 +30376,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers-laag ({0}) in zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Download weg"
@@ -28535,9 +30529,6 @@ msgstr "Stelt de standaardtaal in voor de artikelen van Wikipedia"
msgid "Enter the Wikipedia language"
msgstr "Voer de taal van Wikipedia in"
-msgid "Add Tag"
-msgstr "Tag toevoegen"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index e821e45..e23c865 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:51+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:52+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Om JOSM"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr "Verktøy: {0}"
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr "Juster nodene til ein linje"
@@ -265,6 +280,9 @@ msgstr "konflikt"
msgid "download"
msgstr "last ned"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr "Gå til {0}"
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr "Slett"
msgid "Delete selected objects."
msgstr "Slett dei valde objekta."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "Ukjend"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index ae7a8a8..a303195 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:52+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:53+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Tèrmes d''utilizacion en rèire plan"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -151,16 +166,14 @@ msgid "About JOSM..."
msgstr "A prepaus de JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Atencion : lo format URL de l’API es inesperat. La redireccion cap a la "
-"pagina OSM utilizaire fracassarà probablament. L’URL es : ''{0}'"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -204,6 +217,9 @@ msgstr "Pas de calc de destinacion"
msgid "Add imagery layer {0}"
msgstr "Apondre lo calc d’imatjariá {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -243,9 +259,6 @@ msgstr "Esplech : {0}"
msgid "Please select at least four nodes."
msgstr "Seleccionatz al mens quatre nosèls."
-msgid "Information"
-msgstr "Informacion"
-
msgid "Align Nodes in Line"
msgstr "Alinhar los nosèls"
@@ -270,6 +283,9 @@ msgstr "lo conflicte"
msgid "download"
msgstr "telecargament"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "precedent"
@@ -279,6 +295,9 @@ msgstr "seguent"
msgid "Nothing selected to zoom to."
msgstr "Res de pas seleccionat sul qual zoomar."
+msgid "Information"
+msgstr "Informacion"
+
msgid "Zoom to {0}"
msgstr "Zoom sus {0}"
@@ -335,11 +354,9 @@ msgstr ""
"direccion. Ne retornar cèrtas ?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Impossible de fusionar las vias (Pòdon pas èsser fusionadas en una sola "
-"cadena de nosèls)"
msgid "Combine {0} ways"
msgstr "Fusionar {0} vias"
@@ -396,18 +413,35 @@ msgstr "Suprimir"
msgid "Delete selected objects."
msgstr "Suprimir los objèctes seleccionats"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distribuir los nosèls"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Telecargar dempuèi OSM…"
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Telecargar las donadas."
+
msgid "Download object..."
msgstr "Telecargar un objècte..."
@@ -502,6 +536,9 @@ msgstr "Istoric"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Afichar l'istoric dels camins, nosèls o relacions"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "Istoric (web)"
@@ -615,7 +652,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -765,8 +802,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -923,8 +960,8 @@ msgid "Download Data"
msgstr "Telecargar de donadas"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -951,12 +988,8 @@ msgid "Orthogonalize / Undo"
msgstr "Mesa en forma ortogonala"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -974,9 +1007,6 @@ msgstr "Ortogonalizar"
msgid "Usage"
msgstr "Utilizacion"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1083,6 +1113,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1133,9 +1172,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1197,6 +1233,9 @@ msgstr "Rapòrt d’estat"
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Tampar"
@@ -1271,13 +1310,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1366,6 +1405,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Anullar"
@@ -1390,9 +1450,6 @@ msgstr "Actualizar las donadas"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr "Telecargar las donadas."
-
msgid "Update modified"
msgstr "Mesa a jorn de las modificacions"
@@ -1588,6 +1645,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avançar pus lentament"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Telecargament de las donadas GPS"
@@ -1597,6 +1657,18 @@ msgstr "Donadas GPX telecargadas"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Telecargament de las donadas"
@@ -1616,6 +1688,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Telecargament de {0} de {1} ({2} restant(s))"
@@ -1666,25 +1763,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1827,6 +1905,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1851,8 +1932,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1868,6 +1949,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2274,6 +2358,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2434,14 +2521,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
-msgstr "Version esperada"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2449,6 +2536,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2467,8 +2557,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2554,6 +2643,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2590,10 +2682,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2616,8 +2708,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2721,6 +2813,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2781,8 +2876,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2812,11 +2907,11 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
-msgstr "Atributs de "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr ""
@@ -2836,6 +2931,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2866,18 +2964,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2886,8 +2984,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2895,13 +2993,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2915,8 +3011,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2946,11 +3042,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "DESCONEGUT"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3103,8 +3198,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3211,7 +3305,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3230,6 +3324,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3246,9 +3343,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3287,6 +3381,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3311,6 +3408,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3370,13 +3476,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3446,6 +3552,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3515,6 +3639,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3572,13 +3702,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3610,10 +3740,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3747,7 +3877,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3822,6 +3952,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3852,9 +3985,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3879,10 +4009,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3945,23 +4075,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4065,7 +4178,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4261,9 +4374,24 @@ msgstr "Afichar"
msgid "Tools"
msgstr "Espleches"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Seleccion"
+
msgid "Presets"
msgstr "Prereglatges"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4279,10 +4407,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Àudio"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4291,6 +4431,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4350,6 +4493,9 @@ msgstr ""
msgid "User:"
msgstr "Utilizaire :"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4377,19 +4523,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4677,29 +4810,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
-msgid ""
+msgid "> before"
+msgstr ""
+
+msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4714,7 +4865,7 @@ msgstr ""
msgid "Up"
msgstr "Montar"
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4766,14 +4917,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5023,14 +5166,14 @@ msgctxt "tag"
msgid "Key:"
msgstr "Clau :"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr "Valor :"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5551,6 +5694,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5634,6 +5780,33 @@ msgstr ""
msgid "No"
msgstr "Non"
+msgid "Object type:"
+msgstr "Tipe d’objècte :"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "mixte"
+
+msgid "Choose the OSM object type"
+msgstr "Seleccionar lo tipe d'objècte OSM"
+
+msgid "Object ID:"
+msgstr "ID de l'objècte :"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relacions"
@@ -5655,9 +5828,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relacions : {0}"
-msgid "Selection"
-msgstr "Seleccion"
-
msgid "Open a selection list window."
msgstr ""
@@ -5682,32 +5852,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Seleccion : {0}"
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5727,8 +5897,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5754,9 +5923,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5901,9 +6067,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6188,8 +6351,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6254,34 +6417,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: foreground"
+msgstr ""
+
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr "<diferent>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Membre de"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6296,13 +6471,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6381,12 +6556,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6416,9 +6585,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6456,7 +6631,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6516,6 +6691,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6771,6 +6949,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Marcapaginas"
@@ -6836,9 +7033,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6905,21 +7099,8 @@ msgstr ""
msgid "Download object"
msgstr "Telecargar l'objècte"
-msgid "Object type:"
-msgstr "Tipe d’objècte :"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "mixte"
-
-msgid "Choose the OSM object type"
-msgstr "Seleccionar lo tipe d'objècte OSM"
-
-msgid "Object ID:"
-msgstr "ID de l'objècte :"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr ""
+msgid "Start downloading"
+msgstr "Aviar lo telecargament"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6929,23 +7110,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Aviar lo telecargament"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7042,7 +7209,7 @@ msgstr "Anar a la pagina seguenta"
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7141,6 +7308,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7228,7 +7398,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7247,6 +7417,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7313,8 +7489,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7389,8 +7564,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7404,8 +7579,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7620,12 +7794,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7634,6 +7802,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7649,6 +7833,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7656,8 +7855,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7769,9 +7968,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7781,6 +7977,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7797,7 +7996,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7943,7 +8142,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7973,7 +8172,7 @@ msgstr "version {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8087,6 +8286,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8124,6 +8326,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8320,9 +8525,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8341,6 +8543,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8398,6 +8603,12 @@ msgstr "Seguent"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8468,9 +8679,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8483,7 +8691,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8510,12 +8721,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8644,14 +8859,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8666,7 +8877,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8676,8 +8887,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8897,7 +9107,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8963,6 +9173,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9020,9 +9236,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9269,6 +9482,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9397,6 +9613,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9439,6 +9661,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9489,19 +9714,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9519,40 +9735,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9576,6 +9801,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9632,6 +9890,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9685,6 +9946,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9966,7 +10232,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10135,6 +10407,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10198,7 +10476,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10456,40 +10734,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "North"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "South"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "Hemisphere"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10542,8 +10820,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10552,20 +10830,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10647,14 +10930,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10698,31 +10975,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10731,6 +11013,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10746,57 +11031,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10814,6 +11101,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10843,6 +11138,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10873,7 +11211,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10913,28 +11251,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11029,6 +11365,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11044,12 +11383,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11128,7 +11475,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11227,35 +11574,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11265,8 +11588,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11293,10 +11616,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11307,9 +11627,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11331,6 +11648,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11380,8 +11700,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11524,6 +11844,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11542,6 +11865,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11566,16 +11898,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11587,6 +11922,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11601,6 +11944,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11631,19 +11983,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11665,11 +12017,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11739,13 +12103,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11888,10 +12252,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11906,22 +12270,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11990,8 +12353,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12006,9 +12368,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12330,17 +12707,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12351,9 +12722,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12385,9 +12799,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12710,6 +13138,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12789,6 +13222,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12890,9 +13327,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12948,6 +13382,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12972,9 +13409,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13000,9 +13434,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13039,6 +13470,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13085,9 +13521,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13172,6 +13605,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13262,6 +13698,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13280,10 +13760,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13295,6 +13775,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13322,18 +13805,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13343,9 +13820,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13355,13 +13829,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13409,6 +13883,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13493,6 +13970,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13597,21 +14077,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13627,10 +14116,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13666,7 +14155,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13735,12 +14224,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13756,15 +14251,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13786,6 +14272,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13795,6 +14290,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13804,10 +14302,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13840,9 +14335,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13876,19 +14368,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13900,6 +14416,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13921,43 +14440,87 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -13990,12 +14553,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14053,6 +14631,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14062,6 +14643,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14101,9 +14688,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14137,6 +14721,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14218,18 +14817,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14302,7 +14906,10 @@ msgstr "terrenh militar"
msgid "tourism"
msgstr "torisme"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14326,10 +14933,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14341,9 +14951,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14386,18 +14993,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14497,11 +15142,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14513,11 +15156,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14536,10 +15177,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14569,9 +15210,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14587,19 +15225,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14749,6 +15403,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14770,6 +15427,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14797,6 +15460,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14821,22 +15490,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14858,9 +15511,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14924,7 +15574,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15055,6 +15705,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15085,6 +15738,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15097,9 +15753,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15109,9 +15762,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15124,6 +15782,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15148,14 +15809,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15204,7 +15857,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15258,41 +15911,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
-msgstr ""
+msgid "terminal"
+msgstr "aerogara"
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
-msgstr "aerogara"
+msgid "Edit Hotel"
+msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15478,6 +16131,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15499,9 +16158,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15514,6 +16179,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15553,6 +16221,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15574,22 +16245,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15613,9 +16296,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15640,7 +16320,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15713,49 +16402,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
+msgstr "Glèisa"
+
+msgid "Edit Church"
msgstr ""
-msgid "hindu"
+msgid "Building type"
msgstr ""
-msgid "jain"
+msgid "basilica"
msgstr ""
-msgid "jewish"
+msgid "cathedral"
msgstr ""
-msgid "muslim"
+msgid "chapel"
msgstr ""
-msgid "sikh"
-msgstr ""
-
-msgid "spiritualist"
-msgstr ""
-
-msgid "taoist"
-msgstr ""
-
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15773,6 +16456,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15785,6 +16474,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15800,37 +16492,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15920,6 +16715,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15929,6 +16730,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15995,12 +16802,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16010,6 +16871,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16019,31 +16904,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16071,7 +16962,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16098,27 +16989,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16153,12 +17032,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16168,10 +17050,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16199,6 +17081,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16236,117 +17121,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16380,33 +17301,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16440,6 +17371,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16452,9 +17399,34 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
msgstr ""
+msgid "mud"
+msgstr "terrenh fangós"
+
msgid "Horse Racing"
msgstr ""
@@ -16515,36 +17487,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16587,19 +17577,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16738,6 +17724,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16750,60 +17748,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16819,9 +17891,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17031,41 +18100,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17074,7 +18169,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17086,12 +18181,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "botiga"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17143,88 +18328,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17236,6 +18524,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17251,6 +18554,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17269,11 +18575,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17382,10 +18686,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17397,7 +18701,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17418,13 +18722,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17496,7 +18806,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17517,13 +18827,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17532,7 +18842,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17560,6 +18869,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17596,40 +18911,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
+msgstr ""
+
+msgid "Edit Florist"
+msgstr ""
+
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17641,19 +18977,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17674,6 +19010,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17683,7 +19025,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17764,6 +19106,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17893,6 +19238,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17932,24 +19283,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17959,15 +19319,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18043,6 +19394,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18097,7 +19454,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18109,6 +19466,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18184,46 +19544,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
msgstr ""
-msgid "RS"
+msgid "Street name"
msgstr ""
-msgid "US"
+msgid "City name"
+msgstr ""
+
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18244,6 +19607,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18406,27 +19781,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18472,19 +19876,22 @@ msgstr "punt d’arrèst seguent"
msgid "backward halt point"
msgstr "punt d’arrèst precedent"
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18508,7 +19915,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18604,18 +20011,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "pont"
msgid "deprecated"
msgstr "depreciat"
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr "camin equèstre"
@@ -18625,8 +20041,11 @@ msgstr "barrièra"
msgid "motorroad"
msgstr "rota amb accès reglamentat"
-msgid "highway_track"
-msgstr "pista"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr ""
@@ -18634,11 +20053,11 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "punt d’accès d’urgéncia"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr ""
@@ -18655,6 +20074,9 @@ msgstr "rapids"
msgid "railwaypoint"
msgstr "gara / arrèst ferroviari"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18670,29 +20092,29 @@ msgstr "linha ferroviària toristica"
msgid "aeroway"
msgstr "aeropòrt"
-msgid "aeroway_dark"
-msgstr "Elipòrt"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "airal de parcatge per avions"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "pista d'esquí blava"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "pista d'esquí roja"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "pista d'esquí negra"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "pista d'esquí iranja"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "pista d'esquí fòra pista"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "pista d'esquí verda"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "alimentacion electrica"
@@ -18712,20 +20134,20 @@ msgstr "pòrt"
msgid "amenity"
msgstr "equipament"
-msgid "amenity_traffic"
-msgstr "equipament de circulacion"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "balisa luminosa"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "font / aiga potabla"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "santat"
-msgid "shop"
-msgstr "botiga"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "ostalariá"
@@ -18790,9 +20212,6 @@ msgstr "lana"
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "terrenh fangós"
-
msgid "beach"
msgstr "plaja"
@@ -18802,11 +20221,14 @@ msgstr "itinerari"
msgid "boundary"
msgstr "frontièra"
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr "luòc"
-msgid "tiger_data"
-msgstr "donadas TIGER"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr ""
@@ -18820,9 +20242,6 @@ msgstr "Vilatge / Vila"
msgid "One Way"
msgstr "Sens unic"
-msgid "Church"
-msgstr "Glèisa"
-
msgid "Fuel Station"
msgstr ""
@@ -18850,6 +20269,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18895,10 +20317,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18910,7 +20362,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18928,7 +20380,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19045,19 +20497,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:designation without designation"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:height without height"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19076,13 +20639,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19091,23 +20690,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -19118,142 +20726,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "CUZK:KM - Republica chèca"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "UHUL:ORTOFOTO - Republica chèca"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19269,13 +20926,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Itàlia"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicília - Itàlia"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -19292,148 +20949,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19637,6 +21357,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19658,13 +21390,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19927,9 +21653,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19951,6 +21683,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20029,9 +21764,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20116,7 +21863,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20387,15 +22134,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20566,6 +22304,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20584,12 +22325,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20725,6 +22460,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20742,6 +22480,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20822,113 +22563,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20954,7 +22709,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21004,7 +22762,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21049,6 +22807,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21106,19 +22867,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21160,27 +22986,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21576,6 +23384,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21823,12 +23634,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21838,16 +23643,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22210,9 +24012,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22267,9 +24066,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22311,25 +24127,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22466,9 +24282,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22493,12 +24306,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22647,6 +24469,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22663,6 +24488,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22896,13 +24732,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22955,18 +24784,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23024,6 +24841,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23231,9 +25051,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23313,7 +25130,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23467,6 +25302,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23488,6 +25326,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23781,9 +25622,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23852,9 +25690,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23981,9 +25816,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24005,6 +25837,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24037,15 +25872,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24055,6 +25906,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24157,9 +26011,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24275,6 +26126,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24335,19 +26189,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24485,6 +26339,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24560,6 +26417,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24575,9 +26521,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24599,6 +26542,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24751,9 +26697,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25379,7 +27322,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25387,10 +27333,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25399,18 +27342,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25453,15 +27384,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25583,18 +27505,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25772,9 +27682,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25901,7 +27808,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25921,9 +27828,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26056,9 +27960,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index 040c8dd..76abfbc 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:53+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:54+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index b01eb4e..e1b32fb 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -2,17 +2,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 12:57+0000\n"
-"Last-Translator: firebwoy <ras19 at o2.pl>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-16 20:08+0000\n"
+"Last-Translator: Paweł Pyrczak <Unknown>\n"
"Language-Team: Polish <josm-lang-pl at googlegroups.com>\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: 2013-04-05 04:54+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:55+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"X-Poedit-Country: POLAND\n"
"Language: pl\n"
"X-Poedit-Language: Polish\n"
@@ -35,7 +35,7 @@ msgid "Bridge"
msgstr "Most"
msgid "Cutting"
-msgstr "wykop"
+msgstr "Wykop"
msgid "Lit"
msgstr "Oświetlenie"
@@ -83,9 +83,24 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Połączenie do otworzenia nie jest obsługiwane na tej platformie (\"{0}\")"
-msgid "Executing platform startup hook"
+msgid "ERROR: {0}"
+msgstr "BŁĄD: {0}"
+
+msgid "WARNING: {0}"
+msgstr "OSTRZEŻENIE: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
msgstr ""
+msgid "Executing platform startup hook"
+msgstr "Zakotwiczanie platformy startowej"
+
msgid "Building main menu"
msgstr "Budowanie menu głównego"
@@ -186,19 +201,14 @@ msgid "About JOSM..."
msgstr "O JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"UWAGA: nieznany format adresu URL API. Przekierowanie do strony z informacją "
-"lub historią OSM prawdopodobnie zakończy się niepowodzeniem. Adres URL API "
-"to: \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"UWAGA: nieznany format adresu URL API. Przekierowanie do strony użytkownika "
-"OSM prawdopodobnie zakończy się niepowodzeniem. Adres URL API to: \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -220,7 +230,7 @@ msgid "Click to abort launching external browsers"
msgstr "Kliknij aby anulować uruchomienie zewnetrznych przeglądarek"
msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "Proszę wybrać conajmniej jeden węzeł, drogę lub relację"
+msgstr "Proszę wybrać co najmniej jeden węzeł, drogę lub relację"
msgid "Please select the target layer."
msgstr "Wybierz warstwę docelową"
@@ -244,6 +254,9 @@ msgstr "Brak warstw docelowych."
msgid "Add imagery layer {0}"
msgstr "Dodaj warstwę zdjęć {0}"
+msgid "Select image format for WMS layer"
+msgstr "Wybierz format obrazu dla warsty WMS"
+
msgid "Select WMS layers"
msgstr "Wybierz warstwy WMS"
@@ -283,9 +296,6 @@ msgstr "Narzędzie: {0}"
msgid "Please select at least four nodes."
msgstr "Wybierz co najmniej cztery węzły."
-msgid "Information"
-msgstr "Informacje"
-
msgid "Align Nodes in Line"
msgstr "Wyrównaj węzły wzdłuż prostej"
@@ -310,6 +320,9 @@ msgstr "konflikt"
msgid "download"
msgstr "pobrany obszar"
+msgid "problem"
+msgstr "problem"
+
msgid "previous"
msgstr "poprzedni"
@@ -319,6 +332,9 @@ msgstr "następny"
msgid "Nothing selected to zoom to."
msgstr "Brak zaznaczenia, które można pokazać"
+msgid "Information"
+msgstr "Informacje"
+
msgid "Zoom to {0}"
msgstr "Pokaż {0}"
@@ -375,11 +391,10 @@ msgstr ""
"zmienić kierunek niektórych dróg?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Połączenie dróg jest niemożliwe (Drogi nie mogą był złączone w jeden ciąg "
-"węzłów)"
+"Nie można połączyć dróg<br>(Nie mogą zostać połączone w jeden ciąg węzłów)"
msgid "Combine {0} ways"
msgstr "Połącz {0} dróg"
@@ -436,6 +451,12 @@ msgstr "Usuń"
msgid "Delete selected objects."
msgstr "Usuwa wybrane obiekty"
+msgid "Toggle dialogs panel"
+msgstr "Przełącz panel dialogowy"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Przełącz panel dialogowy, maksymalizuj widok mapy"
+
msgid "Distribute Nodes"
msgstr "Rozmieść węzły"
@@ -444,12 +465,25 @@ msgstr ""
"Rozmieszcza wybrane węzły tak by znajdowały się w równych odległościach na "
"jednej linii."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Zignorowane punkty {0} bez współrzędnych"
+
msgid "Download from OSM..."
msgstr "Pobierz z OSM..."
msgid "Download map data from the OSM server."
msgstr "Pobiera dane mapy z serwera OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy "
+"kontynuować?</html>"
+
+msgid "Download data"
+msgstr "Pobiera dane"
+
msgid "Download object..."
msgstr "Pobierz obiekt…"
@@ -550,6 +584,9 @@ msgstr "Historia"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Wyświetl historyczne informacjie o drogach, węzłach i relacjach OSM."
+msgid "Show history"
+msgstr "Pokaż historię"
+
msgid "History (web)"
msgstr "Historia (strona www)"
@@ -669,11 +706,11 @@ msgid "Joined overlapping areas"
msgstr "Połączono nakładające się na siebie obszary"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Niektóre z dróg są częściami relacji które zostały zmodyfikowane. Proszę "
-"sprawdzić czy wprowadzone zmiany nie spowodowały błędów."
+"Niektóre drogi są częścią relacji, która została zmieniona.<br>Sprawdź, czy "
+"nie ma błędów."
msgid "Fix tag conflicts"
msgstr "Popraw konflikty tagów"
@@ -816,6 +853,12 @@ msgid ""
"one by one, by using ''<i>Merge selection</i>''.<br /><br />Are you sure you "
"want to continue?"
msgstr ""
+"Chcesz połączyć warstwy ''{0}'' i ''{1}''.<br /><br />Mają one różną "
+"politykę wrzucania na serwer i nie powinny być łączone<br />Połączenie ich "
+"wymusi surowe zasady dla ''{1}''.<br /><br /><b>Nie jest to polecana droga "
+"łączenia takich danych</b>.<br />Powinieneś zamiast tego sprawdzić i każdy "
+"element, jeden po drugim, używając ''<i>Łączenia wybranych</i>''.<br /><br "
+"/>Jesteś pewny że chcesz kontynuować?"
msgid "Ignore this hint and merge anyway"
msgstr "Ignoruj wskazówkę i scal"
@@ -827,11 +870,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Scala wybrane węzły z najstarszym."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Do połączenia wybierz albo co najmniej dwa węzły, albo węzeł położony blisko "
-"innego węzła."
+"Wybierz przynajmniej dwa punkty do połączenia lub jeden punkty który leży "
+"blisko innego."
msgid "Abort Merging"
msgstr "Anuluj scalanie"
@@ -854,7 +897,7 @@ msgid "Merge the currently selected objects into another layer"
msgstr "Łączy aktualnie wybrane obiekty w nową warstę."
msgid "Merging too many objects with different upload policies"
-msgstr ""
+msgstr "Łączenie zbyt wielu obiektów z różnymi warunkami udostępniania"
msgid ""
"You are about to merge more than 1 object between layers ''{0}'' and "
@@ -862,6 +905,10 @@ msgid ""
"data</b>.<br />You should instead check and merge each object, <b>one by "
"one</b>.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Próbujesz połączyć więcej niż jeden element pomiędzy warstwami ''{0}'' i "
+"''{1}''.<br /><br /><b>Nie jest to polecana metoda łączenia tego typu "
+"danych.</b>.<br />Zamiast tego powinieneś sprawdzić i połączyć każdy element "
+"pojedyńczo, <b>jeden po drugim</b>.<br /><br />Chcesz kontynuować?"
msgid "Mirror"
msgstr "Odbicie lustrzane"
@@ -997,11 +1044,9 @@ msgid "Download Data"
msgstr "Pobierz dane"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Nie można otworzyć adresu URL ''{0}'' ze względu na brak dostępności "
-"pasującego zadania.</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1032,16 +1077,9 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizuj / cofnij"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Cofnięcie ortogonaliizacji kształtu\n"
-"Wybierz węzły, które zostały przesunięte w wyniku uprzedniej ortogonalizacji "
-"kształtu."
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Cofanie ortogonalizacji kształtu"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1061,9 +1099,6 @@ msgstr "Korekta prostopadłości"
msgid "Usage"
msgstr "Użycie"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Wybrane elementy nie moga być poddane ortogonalizacji"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1100,7 +1135,7 @@ msgid "Paste Tags"
msgstr "Wklej znaczniki"
msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr ""
+msgstr "Przypisz tagi ze schowka do zaznaczonych elementów"
msgid "Pasting {0} tag"
msgid_plural "Pasting {0} tags"
@@ -1184,6 +1219,15 @@ msgstr "zmień także nazwę pliku"
msgid "Could not rename file ''{0}''"
msgstr "Nie mogłem przemianować pliku ''{0}''"
+msgid "Restart"
+msgstr "Uruchom ponownie"
+
+msgid "Restart the application."
+msgstr "Zrestartuj aplikcję."
+
+msgid "Click to restart later."
+msgstr "Kliknij, aby zrestartować później."
+
msgid "Reverse way"
msgstr "Odwróć kierunek drogi"
@@ -1234,9 +1278,6 @@ msgstr "Wczytaj Sesję"
msgid "Load a session from file."
msgstr "Wczytaj sesję z pliku."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Plik sesji (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Otwórz sesję"
@@ -1301,6 +1342,9 @@ msgstr "Raport konfiguracji"
msgid "Copy to clipboard and close"
msgstr "Skopiuj do schowka i zamknij"
+msgid "Report bug"
+msgstr "Zgłoś błąd"
+
msgid "Close"
msgstr "Zamknij"
@@ -1343,10 +1387,10 @@ msgstr[1] "Uprość drogę (usuń {0} węzeły)"
msgstr[2] "Uprość drogę (usuń {0} węzłów)"
msgid "Split Way"
-msgstr "Rozdziel drogę"
+msgstr "Przetnij drogę"
msgid "Split a way at the selected node."
-msgstr "Rozdziela drogę w zaznaczonym węźle."
+msgstr "Przecina drogę w zaznaczonym węźle"
msgid ""
"The current selection cannot be used for splitting - no node is selected."
@@ -1384,18 +1428,14 @@ msgstr ""
"węzły w środku drogi.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Rola z członka relacji została skopiowana na nowe linie. <br>Sprawdź "
-"poprawność i popraw jeśli to konieczne.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Przynależność do relacji została skopiowana do wszystkich nowych "
-"dróg.<br>Sprawdź i popraw jeśli potrzeba.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Rozdziel drogę {0} na {1} części"
@@ -1500,6 +1540,28 @@ msgstr ""
"problem, bo obiekty te nie są teraz widoczne w ich prawidłowej "
"formie.<br>Czy napewno chcesz rozdzielić?"
+msgid "Disconnect Node from Way"
+msgstr "Odłącz punkt od drogi"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Odłącz punkty od drogi do której należą"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Wybierz przynajmniej jeden węzeł do rozłączenia"
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Wybrany węzeł nie może być odłączony od czegokolwiek."
+msgstr[1] "Wybrane węzły nie mogą być odłączone od czegokolwiek."
+msgstr[2] "Wybrane węzły nie mogą być odłączone od czegokolwiek."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Cofnij"
@@ -1524,9 +1586,6 @@ msgstr "Aktualizuj dane"
msgid "Updates the objects in the active data layer from the server."
msgstr "Pobiera z serwera najnowszą wersję obiektów na aktywnej warstwie."
-msgid "Download data"
-msgstr "Pobiera dane"
-
msgid "Update modified"
msgstr "Pobierz zmiany"
@@ -1569,7 +1628,7 @@ msgstr ""
"''{0}''.<br>Najpierw musisz go rozstrzygnąć.</html>"
msgid "Upload discouraged"
-msgstr ""
+msgstr "Wysyłanie odradzane"
msgid ""
"You are about to upload data from the layer ''{0}''.<br /><br />Sending data "
@@ -1577,6 +1636,10 @@ msgid ""
"require you subsequently have to revert your changes, or force other "
"contributors to.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Zamierzasz przesłać dane z warstwy ''{0}''.<br /><br />Przesyłanie danych z "
+"tej warstwy jest <b>odradzane</b>. Jeśli kontynuujesz <br />być może będzie "
+"to wymagało wycofania twoich zmian.<br /><br />Jesteś pewien, że chcesz "
+"kontynuować?"
msgid "Ignore this hint and upload anyway"
msgstr "Ignoruje tę wskazówkę i rozpoczyna wysyłanie"
@@ -1600,7 +1663,7 @@ msgid "Reading parents of ''{0}''"
msgstr "Doczytuję rodziców \"{0}\""
msgid "Checking for deleted parents in the local dataset"
-msgstr "Poszukuję usuniętych rodziców w lokalnych danych."
+msgstr "Sprawdzanie usuniętych rodziców w lokalnych danych."
msgid "Validation"
msgstr "Sprawdź"
@@ -1625,7 +1688,7 @@ msgstr ""
"Włącz/wyłącz automatyczne przesuwanie mapy do ostatnio położonego węzła."
msgid "Toggle Viewport Following"
-msgstr ""
+msgstr "Przełącz śledzenie widoku"
msgid "Wireframe View"
msgstr "Widok szkieletowy"
@@ -1729,6 +1792,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Zmniejsza prędkość odtwarzania."
+msgid "Download GPS"
+msgstr "Pobiera GPS"
+
msgid "Downloading GPS data"
msgstr "Pobieranie danych GPS"
@@ -1738,6 +1804,18 @@ msgstr "Pobrane dane GPX"
msgid "Markers from {0}"
msgstr "Znaczniki z {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Pobiera skompresowane zmiany OSM"
+
+msgid "Download OSM Change"
+msgstr "Pobiera zmiany OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Pobiera skompresowany OSM"
+
+msgid "Download OSM"
+msgstr "Pobiera OSM"
+
msgid "Downloading data"
msgstr "Pobieranie danych"
@@ -1753,10 +1831,37 @@ msgid "OSM Server URL:"
msgstr "URL serwera OSM:"
msgid "Command"
-msgstr ""
+msgstr "Komenda"
msgid "Request details: {0}"
-msgstr ""
+msgstr "Szczegóły żądania: {0}"
+
+msgid "Download OSM URL"
+msgstr "Pobiera OSM URL"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Wystąpił {0} konflikt w trakcie wysyłania."
+msgstr[1] "Wystąpiły {0} konflikty w trakcie wysyłania."
+msgstr[2] "Wystąpiło {0} konfliktów w trakcie wysyłania."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt podczas pobierania"
+msgstr[1] "Konflikty podczas pobierania"
+msgstr[2] "Konflikty podczas pobierania"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) ładuję rodzica węzła {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Ładuję rodzica drogi {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) ładuję rodzica relacji {2}"
+
+msgid "Download session"
+msgstr "Pobierz sesję"
msgid "Download {0} of {1} ({2} left)"
msgstr "Pobieranie {0} z {1} (pozostało: {2})"
@@ -1771,7 +1876,7 @@ msgid ""
"Click to check whether objects in your local dataset are deleted on the "
"server"
msgstr ""
-"Kliknij aby sprawdzić czy obiekty w lokalnym zestawie danych zostały "
+"Kliknij, by sprawdzić czy obiekty w lokalnym zestawie danych zostały "
"usunięte z serwera"
msgid "Ignore"
@@ -1790,6 +1895,13 @@ msgid_plural ""
"report a conflict."
msgstr[0] ""
msgstr[1] ""
+"Istnieją {0} obiekty w twoim lokalnym zestawie zmian, które zostały usunięte "
+"z serwera.<br>Jeśli spróbujesz później je usunąć lub zaktualizować to serwer "
+"zgłosi konflikt."
+msgstr[2] ""
+"Istnieje {0} obiektów w twoim lokalnym zestawie zmian, które zostały "
+"usunięte z serwera.<br>Jeśli spróbujesz później je usunąć lub zaktualizować "
+"to serwer zgłosi konflikt."
msgid ""
"Click <strong>{0}</strong> to check the state of this object on the server."
@@ -1814,27 +1926,6 @@ msgstr "Podczas masowego pobierania wystąpiły następujące błędy: {0}"
msgid "Errors during download"
msgstr "Błędy w czasie pobierania"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Wystąpił {0} konflikt w trakcie importu."
-msgstr[1] "Wystąpiły {0} konflikty w trakcie importu."
-msgstr[2] "Wystąpiło {0} konfliktów w trakcie importu."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt podczas pobierania"
-msgstr[1] "Konflikty podczas pobierania"
-msgstr[2] "Konflikty podczas pobierania"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) ładuję rodzica węzła {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Ładuję rodzica drogi {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) ładuję rodzica relacji {2}"
-
msgid "Error during download"
msgstr "Błąd podczas pobierania"
@@ -1867,7 +1958,7 @@ msgid "Backspace in Add mode"
msgstr ""
msgid "helper line"
-msgstr ""
+msgstr "linia pomocnicza"
msgid "Cannot add a node outside of the world."
msgstr "Nie można dodać węzła poza granicami świata."
@@ -1915,7 +2006,7 @@ msgid "FIX"
msgstr "Napraw"
msgid "draw angle snap"
-msgstr ""
+msgstr "przystawka rysowania kąta"
msgid "draw angle snap highlight"
msgstr ""
@@ -1927,7 +2018,7 @@ msgid "Show helper geometry"
msgstr "Włącz pomocną geometrię"
msgid "Snap to node projections"
-msgstr ""
+msgstr "Przyciąganie do węzłów projekcji"
msgid "Disable"
msgstr "Zablokuj"
@@ -1969,10 +2060,10 @@ msgstr ""
"prostokąt. Podwójny klik dodaje nowy węzeł."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Wytłocz: linia główna"
msgid "Extrude: helper line"
-msgstr ""
+msgstr "Wytłocz: linia pomocnicza"
msgid "Extrude Way"
msgstr "Wytłocz drogę"
@@ -1983,6 +2074,9 @@ msgstr "Popraw dokładność drogi"
msgid "Improve Way Accuracy mode"
msgstr "Tryb poprawiania dokładności drogi"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr "Kliknij drogę by zacząć poprawiać jej kształt."
@@ -2000,17 +2094,21 @@ msgid ""
"Click to delete the highlighted node. Release Alt to move existing nodes or "
"hold Ctrl to add new nodes."
msgstr ""
+"Kliknij, aby usunąć podświetlony węzeł. Zwolnij Alt, aby przesunąć "
+"istniejące węzły lub przytrzymaj Ctrl, aby dodać nowe."
msgid ""
"Click to move the highlighted node. Hold Ctrl to add new nodes, or Alt to "
"delete."
msgstr ""
+"Kliknij, aby przesunąć podświetlony węzeł. Przytrzymaj Ctrl, aby dodać nowy "
+"węzeł, Alt aby usunąć."
msgid "Cannot place a node outside of the world."
msgstr "Nie mogę umieścić węzła poza obszarem świata."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] "Dodaj nowy węzeł do drogi"
msgstr[1] "Dodaj nowy węzeł do {0} dróg"
msgstr[2] "Dodaj nowy węzeł do {0} dróg"
@@ -2027,10 +2125,15 @@ msgstr "Rysuj równolegle"
msgid "Make parallel copies of ways"
msgstr "Tworzenie równoległych kopii drogi"
+msgid "make parallel helper line"
+msgstr "tworzy równoległą linię pomocniczą"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
msgstr ""
+"Wybierz drogę jak w trybie wyboru. Przeciągnij wybraną drogę lub drogi by "
+"utworzyć równoległą kopię (Alt przełącza zachowywanie tagów)"
msgid "Hold Ctrl to toggle snapping"
msgstr "Przytrzymaj Ctrl by włączyć przeciąganie"
@@ -2039,6 +2142,8 @@ msgid ""
"ParallelWayAction\n"
"The ways selected must form a simple branchless path"
msgstr ""
+"ParallelWayAction\n"
+"Wybrane drogi muszą tworzyć pojedynczą ścieżkę bez rozgałęzień"
msgid "Make parallel way error"
msgstr "Błąd tworzenia linii równoległej"
@@ -2192,13 +2297,13 @@ msgid "<or>"
msgstr "<lub>"
msgid "<xor>"
-msgstr ""
+msgstr "<xor>"
msgid "<left parent>"
-msgstr ""
+msgstr "<lewy rodzic>"
msgid "<right parent>"
-msgstr ""
+msgstr "<prawy rodzic>"
msgid "<colon>"
msgstr "<dwukropek>"
@@ -2225,7 +2330,7 @@ msgid "{0}: "
msgstr "{0}: "
msgid "Filter string:"
-msgstr ""
+msgstr "Filtr:"
msgid "Search string:"
msgstr "Wyszukanie:"
@@ -2473,20 +2578,23 @@ msgstr "\"wartość\" w dowolnym kluczu"
msgid "matches if ''key'' exists"
msgstr "pasuje jeśli \"klucz\" istnieje"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "kombinacje"
msgid "logical and (both expressions have to be satisfied)"
-msgstr ""
+msgstr "koniunkcja (oba wyrażenia muszą być spełnione)"
msgid "logical or (at least one expression has to be satisfied)"
-msgstr ""
+msgstr "alternatywa (przynajmniej jedno wyrażenie jest spełnione)"
msgid "logical not"
msgstr "znak zaprzeczenia"
msgid "use parenthesis to group expressions"
-msgstr ""
+msgstr "użyj nawiasów do zgrupowania wyrażeń"
msgid ""
"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
@@ -2507,7 +2615,7 @@ msgid "all closed ways"
msgstr "wszystkie zamknięte drogi"
msgid "object without useful tags"
-msgstr ""
+msgstr "obiekt bez użytecznych tagów"
msgid "metadata"
msgstr "metadane"
@@ -2608,19 +2716,19 @@ msgstr "Znaleziono {0} pasujących."
msgctxt "search"
msgid "CS"
-msgstr ""
+msgstr "wielkość liter istotna"
msgctxt "search"
msgid "CI"
-msgstr ""
+msgstr "wielkość liter nieistotna"
msgctxt "search"
msgid "RX"
-msgstr ""
+msgstr "RX"
msgctxt "search"
msgid "A"
-msgstr ""
+msgstr "A"
msgid ""
"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
@@ -2644,14 +2752,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
-msgstr "Oczekiwano id elementu"
+msgid "Range of primitive ids expected"
+msgstr "Oczekiwany zakres identyfikatorów elementów"
-msgid "Changeset id expected"
-msgstr "Spodziewane: ID grupy zmian"
+msgid "Range of changeset ids expected"
+msgstr "Oczekiwany zakres identyfikatorów zestawów zmian"
-msgid "Version expected"
-msgstr "Spodziewane: wersja"
+msgid "Range of versions expected"
+msgstr "Oczekiwany zakres wersji"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2662,6 +2770,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Nieznany typ elementu: {0}. Dozwolone wartości to węzeł, droga lub relacja"
+msgid "Primitive id expected"
+msgstr "Oczekiwano id elementu"
+
msgid "Range of numbers expected"
msgstr "Spodziewane: zakres liczbowy"
@@ -2680,11 +2791,8 @@ msgstr "Brakujący parametr dla XOR"
msgid "Missing operator for NOT"
msgstr "Brak parametru dla NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Ostrzeżenie: automatyczne obcięcie wartości tagu \"{0}\" na usuniętym "
-"obiekcie {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2709,7 +2817,7 @@ msgid "Removed obsolete tags"
msgstr "Usunięte przestarzałe tagi"
msgid "Fix deprecated tags"
-msgstr ""
+msgstr "Napraw nieaktualne tagi"
msgid ""
"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -2779,6 +2887,9 @@ msgstr[0] "Dodano {0} obiekt"
msgstr[1] "Dodano {0} obiekty"
msgstr[2] "Dodano {0} obiektów"
+msgid "New way {0} has 0 nodes"
+msgstr "Nowa droga {0} zawiera 0 węzłów"
+
msgid "Change node {0}"
msgstr "Zmień węzeł {0}"
@@ -2815,11 +2926,11 @@ msgstr "Usunięto \"{0}\" w {1} obiektach"
msgid "Set {0}={1} for {2} objects"
msgstr "Ustawiono {0}={1} dla {2} obiektów"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Usunięto {0} właściwości dla {1} obiektów"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "Usunięto {0} tagów dla {1} obiektów"
-msgid "Set {0} properties for {1} objects"
-msgstr "Ustawiono {0} właściwości dla {1} obiektówt"
+msgid "Set {0} tags for {1} objects"
+msgstr "Ustawiono {0} tagów dla {1} obiektów"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Zamień \"{0}\" na \"{1}\" dla"
@@ -2844,11 +2955,11 @@ msgid "Double conflict"
msgstr "Podwójny konflikt"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Ostrzeżenie: Warstwa ''{0}'' już nie istnieje. Nie można usunąć konfliktu z "
-"obiektu ''{1}''."
+"Warstwa ''{0}'' już nie istnieje. Nie można usunąć konfliktu dla obiektu "
+"''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Dodaj konflikt do obiektu \"{0}\""
@@ -2862,10 +2973,11 @@ msgid "Resolve conflicts in coordinates in {0}"
msgstr "Rozwiaż konflikt we współżednych w {0}"
msgid "Cannot resolve undecided conflict."
-msgstr ""
+msgstr "Nie można rozwiązać niezdecydowanego konfliktu."
msgid "At least one object to delete required, got empty collection"
msgstr ""
+"Pzynajmniej jeden obiekt potrzebny, aby usunąć, otrzymano puste zaznaczenie"
msgid "Delete node {0}"
msgstr "Usunięto węzeł {0}"
@@ -2931,7 +3043,17 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
+"Zamierzasz usunąć {0} relację: {1}<br/>Jest to bardzo rzadko wymagana "
+"czynność i nie będzie możliwości jej łatwego cofnięcia po wysłaniu zmian na "
+"serwer.<br/>Czy na pewno chcesz usunąć ?"
msgstr[1] ""
+"Zamierzasz usunąć {0} relacje: {1}<br/>Jest to bardzo rzadko wymagana "
+"czynność i nie będzie możliwości jej łatwego cofnięcia po wysłaniu zmian na "
+"serwer.<br/>Czy na pewno chcesz usunąć ?"
+msgstr[2] ""
+"Zamierzasz usunąć {0} relacji: {1}<br/>Jest to bardzo rzadko wymagana "
+"czynność i nie będzie możliwości jej łatwego cofnięcia po wysłaniu zmian na "
+"serwer.<br/>Czy na pewno chcesz usunąć ?"
msgid "Delete relation?"
msgstr "Usunąć relację?"
@@ -2963,6 +3085,9 @@ msgstr[2] "Usunięto {0} obiektów"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Rozwiąż konflikt w liscie członków relacji {0}"
+msgid "Removed nodes from {0}"
+msgstr "Usunięto węzły z {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Obrócono {0} węzeł"
@@ -3023,14 +3148,14 @@ msgstr[0] ""
msgstr[1] ""
msgid "Reverse directional way."
-msgstr ""
+msgstr "Odwróć drogę kierunkową."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Podczas odwracania kierunku drogi następujące właściwości drogi oraz jej "
-"węzłów powinny zostać uwzględniony aby zachować spójność."
+"Odwracając tę drogę, następujące zmiany są sugerowane w celu zachowania "
+"spójności danych."
msgid "Relation"
msgstr "Relacja"
@@ -3059,11 +3184,11 @@ msgstr "Zastosuj wybrane zmiany"
msgid "Do not apply changes"
msgstr "Porzuć zmiany"
-msgid "Please select which property changes you want to apply."
-msgstr "Wybierz, które właściwości chcesz zmienić."
+msgid "Please select which changes you want to apply."
+msgstr "Wybierz zmiany do zastosowania."
-msgid "Properties of "
-msgstr "Właściwości "
+msgid "Tags of "
+msgstr "Tagi "
msgid "Roles in relations referring to"
msgstr "Role w relacjach odnoszących się do"
@@ -3084,6 +3209,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Nie można usunąć poprzedniego pliku backup {0}"
+msgid "Your work has been saved automatically."
+msgstr "Twoja praca została zapisana automatycznie."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Błąd podczas tworzenia kopii zapasowej usuwanej warstwy: {0}"
@@ -3114,21 +3242,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Ostrzeżenie: Nie udało się utworzyć brakującego folderu cache: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Nie udało się utworzyć brakującego katalogu podręcznego: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Nie udało się utworzyć brakującego folderu cache: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Ostrzeżenie: nie udało się zachować preferencji na \"{0}\""
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Ostrzeżenie: Nie można zainicjować ustawień. Folder ustawień ''{0}'' nie "
-"jest folderem."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3138,11 +3264,9 @@ msgstr ""
"folderem.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Ostrzeżenie: Nie można zainicjować ustawień. Nie udało się utworzyć "
-"brakującego katalogu ustawień: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3151,18 +3275,15 @@ msgstr ""
"<html>Nie można zainicjować ustawień. <br>Nie udało się utworzyć brakującego "
"katalogu ustawień: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Informacja: Brakujący plik właściwości \"{0}\". Tworzenie domyślnego pliku "
-"własciwości."
+"Brak pliku z ustawieniami ''{0}''. Tworzenie pliku z ustawieniami domyślnymi."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Ostrzeżenie: Zamiana istniejącego pliku ustawień \"{0}\" na plik ustawień "
-"domyślnych."
+"Zamiana istniejącego pliku z ustawieniami ''{0}'' na plik z ustawieniami "
+"domyślnymi."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3179,11 +3300,9 @@ msgstr ""
"<br> {0} <br> i tworzenia nowego pliku ustawień domyślnych.</ html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Ostrzeżenie: Nie udała się inicjalizacja preferencji. Nie udał się reset "
-"pliku preferencji do ustawień domyślnych: {0}"
msgid "Paint style {0}: {1}"
msgstr "Styl rysowania {0}: {1}"
@@ -3212,13 +3331,12 @@ msgstr "Nie udało się załadować zasobu ''{0}'', błąd: {1}."
msgid "UNKNOWN"
msgstr "NIEZNANA"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Ostrzeżenie: nieoczekiwany numer wersji JOSM w pliku wersji, wartość: \"{0}\""
+"Nieoczekiwany numer wersji JOSM w pliku wersji, wartość wynosi \"{0}\""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Ostrzeżenie: brakuje pliku wersji ''/REVISION''."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Brak pliku wersji ''/REVISION''."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Konflikt dla elementu ''{0}'' jest juz zarejestrowany."
@@ -3371,7 +3489,7 @@ msgid "Nodes in way must be in the same dataset"
msgstr "Węzły w drodze muszą być w tym samym zestawie"
msgid "Deleted node referenced by {0}"
-msgstr ""
+msgstr "Usunięty węzeł używany przez {0}"
msgid "Complete node {0} with null coordinates in way {1}"
msgstr "Uzupełnij węzeł {0} z pustymi współrzędnymi na drodze {1}"
@@ -3383,11 +3501,8 @@ msgstr "Nie można porównać elementu z ID ''{0}'' do elementu z ID ''{1}''."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parametr {0} nie jest w zakresie 0..{1}. Obecnie \"{2}\"."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Błąd: niepowodzenie ładowania klasy rendera mapy \"{0}\". Klasa nie zastała "
-"znaleziona."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3451,7 +3566,7 @@ msgid "highlight"
msgstr "wyróżnienie"
msgid "highlight wireframe"
-msgstr ""
+msgstr "podświetl szkielet"
msgid "untagged"
msgstr "nieotagowany"
@@ -3498,7 +3613,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3510,35 +3625,35 @@ msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
msgstr ""
msgid "Projection required (+proj=*)"
-msgstr ""
+msgstr "Wymagana projekcja (+proj=*)"
msgid "Unkown projection identifier: ''{0}''"
-msgstr ""
+msgstr "Nieznany identyfikator projekcji: ''{0}''"
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Nieoczekiwana liczba argumentów dla parametru \"+bounds\" (musi być 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Nieznany parametr {0}"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Oczekiwana liczba argumentów dla parametru \"{0}\""
msgid "Unable to parse value ''{1}'' of parameter ''{0}'' as number."
-msgstr ""
+msgstr "Błąd analizowania wartości \"{1}\" parametru \"{0}\" jako liczby."
msgid ""
"Unable to parse value ''{1}'' of parameter ''{0}'' as coordinate value."
msgstr ""
+"Błąd analizowania wartości \"{1}\" parametru \"{0}\" jako współrzędne."
msgid "Custom Projection"
-msgstr ""
+msgstr "Własna projekcja"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Błąd: nie udało się otworzyć strumienia wejściowego dla zasobu \"/data/{0}\"."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3579,6 +3694,9 @@ msgstr "pozostałe informacje z sprawdzania poprawności"
msgid "Running test {0}"
msgstr "Wykonywanie testu {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresy"
@@ -3586,28 +3704,37 @@ msgid "Checks for errors in addresses and associatedStreet relations."
msgstr "Sprawdza błędy w adresach i relacjach skojarzonych ulic."
msgid "Multiple associatedStreet relations"
-msgstr ""
+msgstr "Wielokrotne relacje associatedStreet"
msgid "House number without street"
msgstr "Numer domu bez nazwy ulicy"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Numer domu ''{0}'' zduplikowany"
msgid "Duplicate house numbers"
-msgstr ""
+msgstr "Zduplikowane numery domów"
msgid "Multiple street names in relation"
-msgstr ""
+msgstr "Wiele nazw ulic w relacji"
msgid "House number too far from street"
msgstr "Numer domu zbyt daleko od ulicy"
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr "Budynek wewnątrz budynku."
msgid "Checks for building areas inside of buildings."
-msgstr ""
+msgstr "Sprawdza obszary budynków wewnątrz innych budynków"
msgid "Coastlines"
msgstr "Linie brzegowe"
@@ -3650,7 +3777,7 @@ msgid "Deprecated Tags"
msgstr "Przestarzałe tagi"
msgid "Checks and corrects deprecated tags."
-msgstr ""
+msgstr "Sprawdza i naprawia nieaktualne tagi."
msgid "Deprecation fix of {0}"
msgstr "Poprawiam nieaktualność (użycie przestarzałych oznaczeń) {0}"
@@ -3664,15 +3791,15 @@ msgstr " lub "
msgid "{0} is deprecated, use {1} instead"
msgstr "użycie {0} nie jest zalecane, użyj {1}"
+msgid "{0} is unnecessary"
+msgstr ""
+
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ę."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Powielone węzły w dwóch niezamkniętych drogach"
-
msgid "Mixed type duplicated nodes"
msgstr "Powielone węzły różnego rodzaju"
@@ -3744,6 +3871,24 @@ msgstr "Powielone węzły drogi"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Sprawdza drogi z identycznymi, kolejnymi węzłami."
+msgid "Highways"
+msgstr "Drogi"
+
+msgid "Performs semantic checks on highways."
+msgstr "Przeprowadza semantyczne kontrole dróg."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Niepoprawne rondo (droga: {0} zamiast {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Wielokąt"
@@ -3763,7 +3908,7 @@ msgid "No style in multipolygon relation"
msgstr "Brak stylu dla relacji multipolygonu"
msgid "Style for inner way equals multipolygon"
-msgstr ""
+msgstr "Styl drogi wewnętrznej dorównuje wielokątowi"
msgid "Style for outer way mismatches"
msgstr "Niezgodność stylu zewnętrznych dróg"
@@ -3814,6 +3959,12 @@ msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
"Ten test znajduje węzły o takiej samej nazwie (name) (mogą być to duplikaty)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "Nakładające się obszary."
@@ -3874,15 +4025,15 @@ msgstr "Nieustalony rodzaj relacji"
msgid "Relation is empty"
msgstr "Pusta relacja"
+msgid "Role verification problem"
+msgstr "Problem z weryfikacją roli"
+
msgid "<empty>"
msgstr "<pusta>"
msgid "Role {0} missing"
msgstr "Brakująca rola {0}"
-msgid "Role verification problem"
-msgstr "Problem z weryfikacją roli"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Za mała ilość ról {0} ({1})"
@@ -3914,11 +4065,11 @@ msgid ""
msgstr ""
"Ten test wyszukuje drogi o podobnych nazwach - podejrzenie błędu w nazwie."
-msgid "Properties checker :"
-msgstr "Kontroler poprawności właściwości:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Ta wtyczka sprawdza poprawność kluczy i wartości."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Nieprawidłowa linia w tagchecker - {0}: {1}"
@@ -4037,10 +4188,10 @@ msgid "Looks for nodes or ways with FIXME in any property value."
msgstr "Wyszukaj węzły i drogi z \"FIXME\" w dowolnej właściwości."
msgid "Use default data file."
-msgstr "Użyj domyślny plik danych."
+msgstr "Use default data file."
msgid "Use the default data file (recommended)."
-msgstr "Użyj domyślny plik danych (zalecane)."
+msgstr "Use the default data file (recommended)."
msgid "Use default tag ignore file."
msgstr "Użyj domyślny plik pomijanych tagów."
@@ -4054,8 +4205,8 @@ msgstr "Użyj domyślny plik słownika poprawności."
msgid "Use the default spellcheck file (recommended)."
msgstr "Użyj domyślny plik słownika poprawności (zalecane)."
-msgid "Fix properties"
-msgstr "Popraw właściwości"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Nie znaleziono typu elementu"
@@ -4129,6 +4280,9 @@ msgstr "Niezamknięte drogi"
msgid "This tests if ways which should be circular are closed."
msgstr "Sprawdza, czy drogi, które powinny być okrężne są zamknięte."
+msgid "Unclosed way"
+msgstr "Niezamknięta droga"
+
msgid "natural type {0}"
msgstr "typ naturalny {0}"
@@ -4159,9 +4313,6 @@ msgstr "budynek"
msgid "area"
msgstr "obszar"
-msgid "Unclosed way"
-msgstr "Niezamknięta droga"
-
msgid "Unconnected ways"
msgstr "Niepołączone drogi"
@@ -4188,12 +4339,12 @@ msgstr "Nieoznaczone i niepołączone drogi"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "Ten test znajduje węzły bez tagu i poza drogą."
-msgid "No tags"
-msgstr "Bez tagów"
-
msgid "Unconnected nodes without physical tags"
msgstr "Niepołączone węzły bez tagów"
+msgid "No tags"
+msgstr "Bez tagów"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Posiada tagi zawierające ''fixme'' lub ''FIXME''"
@@ -4256,26 +4407,6 @@ msgstr "Odwrócona linia wybrzeża: ląd nie znajduje się po lewej stronie"
msgid "Reversed land: land not on left side"
msgstr "Odwrócona linia lądu: ląd nie znajduje się po lewej stronie"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Zła ilość argumentów dla zakładki"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Błąd podczas czytania zakładki: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Błąd: Nieoczekiwana linia \"{0}\" w pliku zakładki \"{1}\""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Błąd: Niewłaściwa wartość liczbowa (typ double) \"{0}\" w linii \"{1}\" w "
-"pliku zakładki \"{2}\""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Nie można odczytać zakładek z<br>''{0}''<br>Wystąpił błąd: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Nie pokazuj ponownie (zapamiętaj wybór)"
@@ -4361,10 +4492,10 @@ msgid "Authorisation Failed"
msgstr "Autoryzacja nie powiodła się"
msgid "Client Time Out"
-msgstr ""
+msgstr "Czas oczekiwania"
msgid "Bandwidth Limit Exceeded"
-msgstr ""
+msgstr "Przekroczono limit przepustowości"
msgid "Communication with OSM server failed"
msgstr "Połączenie z serwerem OSM nie powiodło się"
@@ -4381,7 +4512,7 @@ msgstr "Pokazuje informację pomocy"
msgid "Downloading \"Message of the day\""
msgstr "Pobieranie wiadomości dnia"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4467,19 +4598,19 @@ msgid "Download the bounding box"
msgstr "Pobierze dane wskazane prostokątem."
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
-msgstr ""
+msgstr "Pobierz lokalizację jako adres URL (lat=x&lon=y&zoom=z)"
msgid "Open a file (any file type that can be opened with File/Open)"
msgstr "Otwórz plik (każdy typ jaki może być otwarty poprzez Plik/Otwórz)"
msgid "Download the bounding box as raw GPS"
-msgstr ""
+msgstr "Pobierz obszar jako surowy GPS"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
msgstr ""
msgid "Select with the given search"
-msgstr ""
+msgstr "Wybierz z danego wyszukiwania"
msgid "Launch in maximized mode"
msgstr "Uruchamia w trybie pełnoekranowym"
@@ -4488,10 +4619,10 @@ msgid "Reset the preferences to default"
msgstr "Przywraca domyślne ustawienia"
msgid "Changes preferences according to the XML file"
-msgstr ""
+msgstr "Zmienia preferencje zgodnie z plikiem XML"
msgid "Set preference key to value"
-msgstr ""
+msgstr "Ustaw wartość dla klucza preferencji"
msgid "Set the language"
msgstr "Określa język"
@@ -4585,9 +4716,24 @@ msgstr "Widok"
msgid "Tools"
msgstr "Narzędzia"
+msgid "More tools"
+msgstr "Więcej narzędzi"
+
+msgid "Data"
+msgstr "Dane"
+
+msgid "Selection"
+msgstr "Zaznaczenie"
+
msgid "Presets"
msgstr "Szablony"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr "Okna"
@@ -4603,11 +4749,23 @@ msgstr "Pasek narzędzi"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "Włącza/wyłącza boczny pasek narzędzi"
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Dźwięk"
-msgid "Hide edit toolbar"
-msgstr "Schowaj pasek narzędzi"
+msgid "Do not hide toolbar"
+msgstr "Nie ukrywaj paska narzędzi"
msgid "Hide this button"
msgstr "Ukryj ten przycisk."
@@ -4615,6 +4773,9 @@ msgstr "Ukryj ten przycisk."
msgid "Click the arrow at the bottom to show it again."
msgstr "Kliknij na dole aby pokazać to ponownie."
+msgid "Hide edit toolbar"
+msgstr "Schowaj pasek narzędzi"
+
msgid "Hide or show this toggle button"
msgstr "Ukryj albo pokaż ten przycisk wyboru"
@@ -4676,6 +4837,9 @@ msgstr "(brak obiektu)"
msgid "User:"
msgstr "Użytkownik:"
+msgid "Do not hide status bar"
+msgstr "Nie ukrywaj paska statusu"
+
msgid "Layer not in list."
msgstr "warstwa nie jest na liście."
@@ -4692,7 +4856,7 @@ msgid "Imperial"
msgstr "imperialny"
msgid "Nautical Mile"
-msgstr ""
+msgstr "mila morska"
msgid "Click to cancel the current operation"
msgstr "Kliknij aby przerwać trwającą operację"
@@ -4703,20 +4867,6 @@ msgstr "W tle"
msgid "Click to run job in background"
msgstr "Kilknij aby uruchomić pracę w tle"
-msgid "false: the property is explicitly switched off"
-msgstr "fałsz: ten opcja jest zawsze wyłączona"
-
-msgid "true: the property is explicitly switched on"
-msgstr "prawda: ta opcja jest zawsze włączona"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"częściowe: różne zaznaczone obiekty mają różne wartości - nie zmienia"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "nieustawione: nie zmieniaj tego atrybutu dla zaznaczonych obiektów"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4860,10 +5010,10 @@ msgid "Conflict foreground: keep"
msgstr ""
msgid "Conflict background: empty row"
-msgstr ""
+msgstr "Konflikt tła: pusty wiersz"
msgid "Conflict background: frozen"
-msgstr ""
+msgstr "Konfilkt tła: zamrożone"
msgid "Conflict background: in comparison"
msgstr ""
@@ -4872,10 +5022,10 @@ msgid "Conflict foreground: in comparison"
msgstr ""
msgid "Conflict background"
-msgstr ""
+msgstr "Konflikt tła"
msgid "Conflict foreground"
-msgstr ""
+msgstr "Konflikt pierwszego planu"
msgid "Conflict background: not in opposite"
msgstr ""
@@ -4911,20 +5061,22 @@ msgid "Members"
msgstr "Członkowie"
msgid "No pending tag conflicts to be resolved"
-msgstr ""
+msgstr "Brak oczekujących konflitów do rozwiązania"
msgid "Tags({0} conflict)"
msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tagi({0} konflikt)"
+msgstr[1] "Tagi({0} konflikty)"
+msgstr[2] "Tagi({0} konfliktów)"
msgid "{0} pending tag conflict to be resolved"
msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
+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"
msgid "Nodes(resolved)"
-msgstr ""
+msgstr "Węzły(rozwiązane)"
msgid ""
"Merged node list frozen. No pending conflicts in the node list of this way"
@@ -4934,10 +5086,10 @@ msgid "Nodes(with conflicts)"
msgstr "Węzły (z konfliktami)"
msgid "Pending conflicts in the node list of this way"
-msgstr ""
+msgstr "Oczekujące konflikty na liście wezłów tej drogi"
msgid "Members(resolved)"
-msgstr ""
+msgstr "Członkowie (rozwiązane)"
msgid ""
"Merged member list frozen. No pending conflicts in the member list of this "
@@ -4948,7 +5100,7 @@ msgid "Members(with conflicts)"
msgstr "Członkowie (z konfliktami)"
msgid "Pending conflicts in the member list of this relation"
-msgstr ""
+msgstr "Oczekujące konflikty na liście członków tej relacji"
msgid "No pending property conflicts"
msgstr ""
@@ -5014,12 +5166,15 @@ msgid "> top"
msgstr "> góra"
msgid "Copy my selected nodes to the start of the merged node list"
-msgstr ""
+msgstr "Kopiuj zaznaczone węzły na start połączonej list wezłów"
msgid "> bottom"
msgstr "> dół"
msgid "Copy my selected elements to the end of the list of merged elements."
+msgstr "Kopiuj zaznaczone elementy na koniec scalonej listy elementów."
+
+msgid "> before"
msgstr ""
msgid ""
@@ -5027,24 +5182,39 @@ msgid ""
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5059,8 +5229,8 @@ msgstr "Kopiuj wszystkie ich elementy do celu"
msgid "Up"
msgstr "W górę"
-msgid "Move up the selected elements by one position."
-msgstr "Przesuwa wybrane elementu do góry o jedną pozycję."
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "W dół"
@@ -5118,14 +5288,6 @@ msgstr[0] "Ich wersja ({0} pozycja)"
msgstr[1] "Ich wersja ({0} pozycje)"
msgstr[2] "Ich wersja ({0} pozycji)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Węzeł"
@@ -5216,10 +5378,10 @@ msgid "Keep the selected key/value pairs from the server dataset"
msgstr "Zachowaj wybrane pary klucz/wartość z wersji na serwerze"
msgid "Undecide"
-msgstr ""
+msgstr "Brak decyzji"
msgid "Mark the selected tags as undecided"
-msgstr ""
+msgstr "Zaznacz wybrane tagi jako niezdecydowne"
msgid "Their dataset does not include a tag with key {0}"
msgstr "Ich zestaw nie zawiera tagu z kluczem {0}"
@@ -5301,7 +5463,7 @@ msgid "Tag collection does not include the selected value ''{0}''."
msgstr ""
msgid "Not decided yet."
-msgstr ""
+msgstr "Jeszcze nie rozstrzygnięte."
msgid "Tags from nodes"
msgstr "Tagi z węzłów"
@@ -5367,7 +5529,7 @@ msgid "Enter a role for all relation memberships"
msgstr "Wprowadź rolę dla wszystkich członków relacji"
msgid "Tag modified relations with "
-msgstr ""
+msgstr "Otaguj zmodyfikowane relacje z "
msgid ""
"<html>Select to enable entering a tag which will be applied<br>to all "
@@ -5378,18 +5540,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Klucz:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Wprowadź klucz dla tagu np. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Wartość:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Wprowadź wartość dla tagu np. <strong><tt>sprawdź członków "
-"relacji</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5487,7 +5646,7 @@ msgid ""
msgstr "Zaznacza obiekty które brały udział w poleceniu (poza usuniętymi)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Wybierz i powiększ"
msgid ""
"Selects the objects that take part in this command (unless currently "
@@ -5692,10 +5851,10 @@ msgid "Relation: "
msgstr "Relacja: "
msgid "deleted-on-server"
-msgstr ""
+msgstr "usunięto na serwerze"
msgid "modified"
-msgstr ""
+msgstr "zmodyfikowany"
msgid "filtered/hidden"
msgstr "filtrowany/ukryty"
@@ -5735,8 +5894,9 @@ msgstr "Tagi: "
msgid "{0} Member: "
msgid_plural "{0} Members: "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Członek: "
+msgstr[1] "{0} Członkowie: "
+msgstr[2] "{0} Członków: "
msgid " as \"{0}\""
msgstr " jako \"{0}\""
@@ -5754,7 +5914,7 @@ msgid "Coordinates: "
msgstr "Współrzędne: "
msgid "Coordinates (projected): "
-msgstr ""
+msgstr "Współrzędne (w projekcji): "
msgid "Part of: "
msgstr "Część: "
@@ -5783,6 +5943,9 @@ msgid ""
"\n"
"> skipping \"{0}\" (not active)"
msgstr ""
+"\n"
+"\n"
+"> pomijanie \"{0}\" (nieaktywne)"
msgid ""
"\n"
@@ -5835,7 +5998,7 @@ msgid ""
msgstr ""
msgid "Projected coordinates:"
-msgstr ""
+msgstr "Wyświetlane współrzędne:"
msgid ""
"Enter easting and northing (x and y) separated by space, comma or semicolon."
@@ -5844,10 +6007,10 @@ msgstr ""
"średnikiem."
msgid "Lat/Lon"
-msgstr ""
+msgstr "Szer/Dł"
msgid "East/North"
-msgstr ""
+msgstr "Północny-wschód"
msgid "Please enter a GPS coordinates"
msgstr "Podaj współrzędne GPS"
@@ -5924,6 +6087,9 @@ msgstr "Pokaż/Ukryj"
msgid "Information about layer"
msgstr "Informacje o warstwie"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Style rysowania map"
@@ -5935,8 +6101,9 @@ msgstr ""
msgid "Reloading {0} map style."
msgid_plural "Reloading {0} map styles."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Przeładowywanie {0} stylu mapy."
+msgstr[1] "Przeładowywanie {0} stylów mapy."
+msgstr[2] "Przeładowywanie {0} stylów mapy."
msgid "On/Off"
msgstr "Włączone/Wyłączone"
@@ -6007,6 +6174,36 @@ msgstr "Czy styl jest obecnie aktywny?"
msgid "No"
msgstr "Nie"
+msgid "Object type:"
+msgstr "Typ obiektu:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "różne"
+
+msgid "Choose the OSM object type"
+msgstr "Wynierz typ obiektu OSM"
+
+msgid "Object ID:"
+msgstr "ID obiektu:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Wprowadź ID obiektu który ma zostać pobrany"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"ID obiektów może być rozdzielone przecinkiem lub spacją<br/>Na przykład: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> W przypadku różnych typów "
+"obiektów określ typ w ten sposób: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relacje"
@@ -6028,9 +6225,6 @@ msgstr "Relacje: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relacje: {0}"
-msgid "Selection"
-msgstr "Zaznaczenie"
-
msgid "Open a selection list window."
msgstr "Otwiera okno z listą zaznaczonych obiektów."
@@ -6055,18 +6249,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Zaznaczenie: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr "Zawsze wyświetlane"
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr "Zawsze ukryte"
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -6084,6 +6266,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panelu"
+msgid "Side buttons"
+msgstr "Przyciski boczne"
+
+msgid "Always shown"
+msgstr "Zawsze wyświetlane"
+
+msgid "Dynamic"
+msgstr "Dynamiczny"
+
+msgid "Always hidden"
+msgstr "Zawsze ukryte"
+
msgid "Authors"
msgstr "Autorzy"
@@ -6102,8 +6296,7 @@ msgstr "Wybierz obiekty podane przez tego użytkownika"
msgid "Launches a browser with information about the user"
msgstr "Przechodzi do strony www z informacjami o tym użytkowniku."
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -6112,7 +6305,7 @@ msgid ""
msgstr ""
msgid "Missing encoding"
-msgstr ""
+msgstr "Brakujące kodowanie"
msgid "Author"
msgstr "Autor"
@@ -6129,9 +6322,6 @@ msgstr "Otwiera okno z informacją o rezultatach sprawdzania poprawności"
msgid "Validation results"
msgstr "Sprawdzanie poprawności"
-msgid "Zoom to problem"
-msgstr "Pokaż problem"
-
msgid "Fix"
msgstr "Napraw"
@@ -6281,9 +6471,6 @@ msgstr "Aktualizuj zawartość"
msgid "Update the changeset content from the OSM server"
msgstr "Aktualizuje zawartość zestawu zmian z serwera OSM"
-msgid "Show history"
-msgstr "Pokaż historię"
-
msgid "Download and show the history of the selected objects"
msgstr "Pobiera i pokazuje historię wybranych obiektów"
@@ -6452,6 +6639,8 @@ msgid ""
"Only changesets owned by myself (disabled. JOSM is currently run by an "
"anonymous user)"
msgstr ""
+"Tylko zmiany wprowadzone przeze mnie (wyłączone. JOSM jest aktualnie "
+"uruchomiony przez anonimowego użytkownika)"
msgid ""
"Cannot restrict changeset query to the current user because the current user "
@@ -6528,6 +6717,8 @@ msgstr ""
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
+"Wprowadzona wartość nie jest prawidłowym ID użytkownika. Proszę wprowadzić "
+"liczbę całkowitą > 0"
msgid "Please enter an integer value > 0"
msgstr "Proszę wprowadzić liczbę całkowitą >0"
@@ -6536,6 +6727,8 @@ msgid ""
"<html>The current value is not a valid user name.<br>Please enter an non-"
"empty user name.</html>"
msgstr ""
+"<html>Wprowadzona wartość nie jest prawidłową nazwą użytkownika.<br>Proszę "
+"wprowadzić nie-pustą nazwę użytkownika.</html>"
msgid "Please enter an non-empty user name"
msgstr "Wprowadź poprawną nazwę użytkownika"
@@ -6544,11 +6737,17 @@ msgid ""
"Please enter a date in the usual format for your locale.<br>Example: "
"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
+"Proszę wprowadzić datę w formacie używanym w Twoich ustawieniach "
+"lokalnych.<br>Przykład: {0}<br>Przykład: {1}<br>Przykład: {2}<br>Przykład: "
+"{3}<br>"
msgid ""
"Please enter a valid time in the usual format for your locale.<br>Example: "
"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
msgstr ""
+"Proszę wprowadzić prawidłowy czas w formacie używanym w Twoich ustawieniach "
+"lokalnych.<br>Przykład: {0}<br>Przykład: {1}<br>Przykład: {2}<br>Przykład: "
+"{3}<br>"
msgid "Download my changesets only"
msgstr "Pobierz tylko moje zestawy zmian"
@@ -6593,8 +6792,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Pobierz zestawy zmian w obecnym widoku mapy</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6659,35 +6858,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
-msgstr "Zaznacz obiekty aby zobaczyć właściwości"
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Właściwości/członkostwo"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Otwiera właściwości zaznaczonego obiektu"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<różne>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr "Tagi dla zaznaczonych obiektów."
+
msgid "Member Of"
msgstr "Członek"
msgid "Position"
msgstr "Pozycja"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Właściwości: {0} / członkostwo: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Właściwości / członkostwo"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Usuń wybrany klucz ze wszystkich obiektów."
-msgid "Delete Properties"
-msgstr "Usuń właściwość"
+msgid "Delete Tags"
+msgstr "Usuń Tagi"
msgid "Change relation"
msgstr "Zmień relację"
@@ -6701,14 +6912,14 @@ msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
-msgid "Add Property"
-msgstr "Dodaj właściwość"
+msgid "Add Tag"
+msgstr "Dodaj tag"
msgid "Edit the value of the selected key for all objects"
msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
-msgid "Edit Properties"
-msgstr "Edytuj Właściwości"
+msgid "Edit Tags"
+msgstr "Edytuj Tagi"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Przejdź do wiki OSM by uzyskać pomoc na temat tagu (F1)"
@@ -6717,10 +6928,10 @@ msgid "Launch browser with wiki help for selected object"
msgstr "Uruchom przeglądarkę ze stroną objaśnienia wybranego obiektu"
msgid "Paste Value"
-msgstr ""
+msgstr "Wklej wartość ze schowka"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "Wklej wartość wybranego tagu ze schowka"
msgid "Copy Value"
msgstr "Kopiuj Wartość"
@@ -6791,13 +7002,7 @@ msgstr[1] "Zmiana właściwości {0} obiektów."
msgstr[2] "Zmiana właściwości {0} obiektów."
msgid "Use English language for tag by default"
-msgstr ""
-
-msgid "Paste tag"
-msgstr "Wklej tag"
-
-msgid "Paste value"
-msgstr "Wklej wartość"
+msgstr "Używaj domyślnie języka angielskiego dla tagów"
msgid "Add value?"
msgstr "Czy dodać wartość?"
@@ -6818,7 +7023,7 @@ msgid "Set number of recently added tags"
msgstr "Ustal liczbę ostatnio dodanych tagów"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Zapamiętaj ostatnio używane tagi"
msgid "Please enter the number of recently added tags to display"
msgstr "Podaj liczbę wyświetlanych ostatnio dodanych tagów"
@@ -6829,9 +7034,15 @@ msgstr "Podaj liczbę całkowitą od 0 do {0}"
msgid "Recently added tags"
msgstr "Ostatnio dodane tagi"
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr "Użyj tego tagu ponownie"
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr "Klucz \"{0}\" jest już używany"
@@ -6863,6 +7074,8 @@ msgid ""
"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
"loaded</html>"
msgstr ""
+"<html>Relacja dziecka<br>{0}<br>jest usunięta na serwerze i nie może zostać "
+"załadowana</html>"
msgid "Relation is deleted"
msgstr "Relacja jest usunięta"
@@ -6870,9 +7083,8 @@ msgstr "Relacja jest usunięta"
msgid "Downloading relation {0}"
msgstr "Pobieranie relacji {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Uwaga: Ignoruję wyjątek ponieważ zadanie zostało anulowane. Wyjątek: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -6882,8 +7094,9 @@ msgstr[2] "Pobieranie {0} niekompletnych obiektów"
msgid "Downloading {0} incomplete child of relation ''{1}''"
msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pobieranie {0} niekompletnego chłonka relacji ''{1}''"
+msgstr[1] "Pobieranie {0} niekompletnych członków relacji ''{1}''"
+msgstr[2] "Pobieranie {0} niekompletnych członków relacji ''{1}''"
msgid "Downloading {0} incomplete child of {1} parent relations"
msgid_plural "Downloading {0} incomplete children of {1} parent relations"
@@ -6935,6 +7148,9 @@ msgstr "Usuń je, wyczyść relację"
msgid "Ignore them, leave relation as is"
msgstr "Ignoruj je, pozostaw relację niezmienioną"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7003,25 +7219,25 @@ msgid "Reverse the order of the relation members"
msgstr "Odwróć kolejność członków relacji"
msgid "Reverse"
-msgstr ""
+msgstr "Odwróć"
msgid "Move the currently selected members up"
msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
msgid "Relation Editor: Move Up"
-msgstr ""
+msgstr "Edytor relacji: Przenieś w górę"
msgid "Move the currently selected members down"
msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
msgid "Relation Editor: Move Down"
-msgstr ""
+msgstr "Edytor relacji: Przenieś w dół"
msgid "Remove the currently selected members from this relation"
msgstr "Usuwa zaznaczonych członków tej relacji"
msgid "Relation Editor: Remove"
-msgstr ""
+msgstr "Edytor relacji: Usuń"
msgid "Delete the currently edited relation"
msgstr "Usuwa obecnie edytowaną relację"
@@ -7031,6 +7247,8 @@ msgid ""
"relation editor\n"
"was open. They have been removed from the relation members list."
msgstr ""
+"Jeden lub więcej członków zostało usuniętych z relacji kiedy edytor\n"
+"relacji był otwarty. Zostaną one usunięte z listy członków."
msgid "Yes, create a conflict and close"
msgstr "Tak, utwórz konflikt i zamknij"
@@ -7049,11 +7267,16 @@ msgid ""
"apply your changes and continue editing.<br><br>Do you want to create a "
"conflict and close the editor?</html>"
msgstr ""
+"<html>Ta relacja została zmieniona poza edytorem.<br>Nie możesz zatwierdzić "
+"zmian i kontynuować edycji.<br><br>Czy chcesz utworzyć konflikt i zamknąć "
+"edytor?</html>"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
msgstr ""
+"<html>Warstwa ''{0}'' posiada konflikt z obiektem<br>''{1}''.<br>Proszę go "
+"najpierw rozwiązać i spróbować ponownie.</html>"
msgid "Apply the current updates"
msgstr "Zastosuj zmiany"
@@ -7204,6 +7427,26 @@ msgstr "droga jest połączona z kolejnym członkiem relacji"
msgid "way is not connected to previous or next relation member"
msgstr "droga nie jest połączona ani z poprzednim ani z następnym członkiem"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Zła ilość argumentów dla zakładki"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Błąd podczas czytania zakładki: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Nie można odczytać zakładek z<br>''{0}''<br>Wystąpił błąd: {1}</html>"
+
msgid "Bookmarks"
msgstr "Zakładki"
@@ -7274,9 +7517,6 @@ msgstr "Wartości szerokości geograficznej musza być z zakresu [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "Wartości długości geograficznej musza być z zakresu [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Wklej URL ze schowka"
-
msgid "Data Sources and Types:"
msgstr "Źródło i typ danych:"
@@ -7309,6 +7549,9 @@ msgid ""
"<html>Autostart ''Download from OSM'' dialog every time JOSM is "
"started.<br>You can open it manually from File menu or toolbar.</html>"
msgstr ""
+"<html>Uruchom automatycznie okno ''Pobierz dane z OSM' przy starcie "
+"JOSM.<br>Możesz otworzyć okno pobierania ręcznie z menu Plik, albo paska "
+"narzędziowego.</html>"
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -7350,21 +7593,8 @@ msgstr "Załaduj obiekty z odnośnikami do tego obiektu"
msgid "Download object"
msgstr "Pobierz obiekt"
-msgid "Object type:"
-msgstr "Typ obiektu:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "różne"
-
-msgid "Choose the OSM object type"
-msgstr "Wynierz typ obiektu OSM"
-
-msgid "Object ID:"
-msgstr "ID obiektu:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Wprowadź ID obiektu który ma zostać pobrany"
+msgid "Start downloading"
+msgstr "Rozpocznij pobieranie"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7376,29 +7606,10 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Wybierz czy pobrać również obiekty należące do relacji"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"ID obiektów może być rozdzielone przecinkiem lub spacją<br/>Na przykład: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> W przypadku różnych typów "
-"obiektów określ typ w ten sposób: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
"Załaduj obiekty z odniesieniami do tego obiektu (np. relacje i drogi)"
-msgid "Start downloading"
-msgstr "Rozpocznij pobieranie"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Niepoprawnie określony ID listy.\n"
-"Nie można pobrać obiektu."
-
msgid "Class Type"
msgstr "Typ Klasy"
@@ -7498,11 +7709,13 @@ msgstr "Przechodzi do następnej strony"
msgid "Go to the JOSM help home page"
msgstr "Idź do strony domowej pomocy JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr ""
+"Otwieranie strony pomocy zakończyło się niepowodzeniem. Docelowy adres jest "
+"pusty."
msgid "Failed to open help page"
msgstr "Nie udało się otworzyć strony pomocy"
@@ -7601,6 +7814,9 @@ msgid ""
msgstr ""
"<html>Wersja <strong>{0}</strong> stworzone na <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informacje o zestawie zmian"
@@ -7614,10 +7830,10 @@ msgid "Ver"
msgstr ""
msgid "A"
-msgstr ""
+msgstr "A"
msgid "B"
-msgstr ""
+msgstr "B"
msgid "Date"
msgstr "Data"
@@ -7695,7 +7911,7 @@ msgid "Prepare conflict resolution"
msgstr "Przygotuj rozwiązanie konfliktu"
msgid "Click to download all referring objects for {0}"
-msgstr ""
+msgstr "Kliknij aby pobrać wszystkie obiekty nawiązujące do {0}"
msgid "Click to cancel and to resume editing the map"
msgstr "Kliknij aby przerwać i powrócić do edycji mapy"
@@ -7708,9 +7924,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Obiekt nadal w użyciu"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Ostrzeżenie: nagłówek błędu \"{0}\" nie pasował do oczekiwanego wzoru."
msgid "Upload"
msgstr "Wyślij"
@@ -7731,6 +7946,12 @@ msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:"
msgid "Enter an upload comment"
msgstr "Wprowadź komentarz przesyłania"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Numer zestawu zmian:"
@@ -7799,18 +8020,17 @@ msgid "Closing changeset {0}"
msgstr "Zamykam zestaw zmian {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
-msgstr ""
+msgstr "Wprowadź referencje dla OSM API"
msgid "Enter credentials for host"
-msgstr ""
+msgstr "Wprowadź referencje dla hosta"
msgid "Enter credentials for HTTP proxy"
-msgstr ""
+msgstr "Wprowadź referencje dla proxy HTTP"
msgid "Please enter the user name of your OSM account"
msgstr "Proszę wprowadź nazwę użytkownika swojego konta OSM"
@@ -7838,22 +8058,29 @@ msgid ""
"Authenticating at the host ''{0}'' failed. Please enter a valid username and "
"a valid password."
msgstr ""
+"Uwierzytelnienie z hostem \"{0}\" nieudane. Proszę wprowadzić prawidłową "
+"nazwę użytkownika i hasło."
msgid "Please enter the user name for authenticating at your proxy server"
msgstr ""
+"Proszę wprowadzić nazwę użytkownika w celu uwierzytelnienia z serwerem proxy."
msgid "Please enter the password for authenticating at your proxy server"
-msgstr ""
+msgstr "Proszę wprowadzić hasło w celu uwierzytelnienia z serwerem proxy."
msgid ""
"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
"username and a valid password."
msgstr ""
+"Uwierzytelnienie z proxy HTTP \"{0}\" nie powiodło się. Proszę wprowadzić "
+"prawidłową nazwę użytkownika i hasło."
msgid ""
"Warning: depending on the authentication method the proxy server uses the "
"password may be transferred unencrypted."
msgstr ""
+"Uwaga: w zależności jakiej metody uwierzytelniania używa serwera proxy, "
+"hasło może zostać wysłane niezaszyfrowane."
msgid "Authenticate"
msgstr "Uwierzytelnij"
@@ -7877,8 +8104,8 @@ msgid "Unpacking {0} into {1}"
msgstr "Wypakowywanie {0} do {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7896,11 +8123,8 @@ msgid "Missing user identity"
msgstr "Brak tożsamości użytkownika"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Ostrzeżenie: Nie udało się pobrać danych o bieżącym użytkowniku JOSM. "
-"Otrzymany wyjątek: {0}"
msgid "Download objects"
msgstr "Pobrane obiekty"
@@ -7968,7 +8192,14 @@ msgid_plural ""
"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
"discard the modifications.<br>Layers with conflicts:</html>"
msgstr[0] ""
+"<html>{0} warstwa ma nierozwiązane konflikty.<br>Należy je albo rozwiązać, "
+"albo anulować modyfikacje.<br>Warstwa z konfliktami:</html>"
msgstr[1] ""
+"<html>{0} warstwy mają nierozwiązane konflikty.<br>Należy je albo rozwiązać, "
+"albo anulować modyfikacje.<br>Warstwy z konfliktami:</html>"
+msgstr[2] ""
+"<html>{0} warstw ma nierozwiązane konflikty.<br>Należy je albo rozwiązać, "
+"albo anulować modyfikacje.<br>Warstwy z konfliktami:</html>"
msgid "Unsaved data and conflicts"
msgstr "Niezapisane dane i konflikty"
@@ -8055,7 +8286,7 @@ msgid "should be uploaded"
msgstr "powinna zostać przesłana"
msgid "should be saved"
-msgstr ""
+msgstr "powinno być zapisane"
msgid ""
"Layer ''{0}'' has modifications which should be uploaded to the server."
@@ -8130,12 +8361,6 @@ msgstr "Wyślij zmienione elementy"
msgid "Please revise upload comment"
msgstr "Popraw opis zmian"
-msgid "Revise"
-msgstr "Popraw"
-
-msgid "Continue as is"
-msgstr "Kontynuuj jak jest"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8150,6 +8375,22 @@ msgstr ""
"spędzisz teraz minutę, by wyjaśnić swoją zmianę, możesz uczynić życie<br "
"/>wielu innych użytkowników znacznie prostszym."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Popraw"
+
+msgid "Continue as is"
+msgstr "Kontynuuj jak jest"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "Powraca do poprzedniego okna w celu poprawy opisu zmian"
@@ -8165,6 +8406,21 @@ msgstr "Proszę wprowadź najpierw poprawną wielkość fragmentu."
msgid "Illegal chunk size"
msgstr "Nieprawidłowa wielkość fragmentu"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Anuluj przesyłanie i kontynuuj edytowanie"
@@ -8172,11 +8428,11 @@ msgid "Tags of changeset {0}"
msgstr "Znaczniki zestawu zmian {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Ostrzeżenie: obiekt ''{0}'' jest już skasowany na serwerze. Pomijam ten "
-"obiekt i ponawiam wysyłkę."
+"Obiekt ''{0}'' został już wcześniej usunięty na serwerze. Pomijanie tego "
+"obiektu i ponowienie próby wysyłania."
msgid "Preparing objects to upload ..."
msgstr "Przygotowuję obiekty do wysyłki..."
@@ -8304,10 +8560,10 @@ msgid "Changeset is full"
msgstr "Zestaw zmian jest pełny"
msgid "Node ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Węzeł \"{0}\" jest obecnie usunięty. Pomijanie obiektu."
msgid "Way ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "Droga \"{0}\" jest obecnie usunięty. Pomijanie obiektu."
msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
msgstr "Relacja ''{0}''została już usunięta. Pomijanie wysyłania obiektu."
@@ -8316,9 +8572,6 @@ msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
"Obiekt ''{0}'' jest już skasowany i będzie pominięty przy wysyłaniu zmian."
-msgid "Warning: {0}"
-msgstr "Ostrzeżenie: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Przesyłanie {0} obieku..."
@@ -8331,6 +8584,9 @@ msgstr ""
"Ignoruje przechwycony wyjątek ponieważ wysyłka została anulowana. Wyjątek "
"to: {0}"
+msgid "Upload successful!"
+msgstr "Wysyłanie zakończone sukcesem"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8351,10 +8607,8 @@ msgstr "Wybierz obiekty do wysyłki"
msgid "Cancel uploading"
msgstr "Anuluj przesyłanie"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Ostrzeżenie: w zapisie preferencji znaleziono klucz ''{0}'' z nieoczekiwaną "
-"wartością ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Wybierz metodę przesyłania:"
@@ -8516,8 +8770,8 @@ msgstr "Następny znacznik"
msgid "Jump to next marker"
msgstr "Przeskocz do następnego znacznika"
-msgid "Previos marker"
-msgstr "Poprzedni znacznik"
+msgid "Previous marker"
+msgstr ""
msgid "Jump to previous marker"
msgstr "Przeskocz do poprzedniego znacznika"
@@ -8549,13 +8803,14 @@ msgstr "wersja {0}"
msgid "Merging layers"
msgstr "Łączenie warstw"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} usunięty"
+msgstr[1] "{0} usunięte"
+msgstr[2] "{0} usuniętych"
msgid "{0} consists of:"
msgstr "Obiekty na warstwie {0}:"
@@ -8613,6 +8868,9 @@ msgid ""
"{0} is not a valid TMS argument. Please check this server URL:\n"
"{1}"
msgstr ""
+"{0} nie jest prawidłowym argumentem TMS. Proszę sprawdzić adres URL "
+"serwera:\n"
+"{1}"
msgid ""
"TMS layers do not support the projection {0}.\n"
@@ -8624,10 +8882,10 @@ msgstr ""
"Zmień odwzorowanie albo usuń tą warstwę."
msgid "Auto Zoom"
-msgstr ""
+msgstr "Automatyczne powiększenie"
msgid "Auto load tiles"
-msgstr "Automatyczne ładowanie kafelek"
+msgstr "Automatyczne ładowanie kafelków"
msgid "Show Errors"
msgstr "Pokaż Błędy"
@@ -8651,7 +8909,7 @@ msgid "Decrease zoom"
msgstr "Zmniejsz"
msgid "Snap to tile size"
-msgstr "Dopasuj do wielkości kafelek"
+msgstr "Dopasuj do wielkości kafelków"
msgid "Flush Tile Cache"
msgstr "Wyczyść cache kafelków"
@@ -8660,7 +8918,7 @@ msgid "zoom in to load any tiles"
msgstr "przybliż by załadować kafelki"
msgid "zoom in to load more tiles"
-msgstr "przybliż by załadować więcej kafelek"
+msgstr "przybliż by załadować więcej kafelków"
msgid "increase zoom level to see more detail"
msgstr "przybliż by zobaczyć więcej detali"
@@ -8668,6 +8926,9 @@ msgstr "przybliż by zobaczyć więcej detali"
msgid "No tiles at this zoom level"
msgstr "Brak kafelków na tym poziomie przybliżenia"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "Warstwa TMS ({0}), pobieranie w powiększeniu {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "Odwzorowania EPSG:4326 i Mercator są obsługiwane"
@@ -8705,6 +8966,9 @@ msgstr "Wczytaj ponownie błędne kafle"
msgid "Alpha channel"
msgstr "Kanał alfa"
+msgid "Automatically change resolution"
+msgstr "Automatyczna zmiana rozdzielczości"
+
msgid "Set WMS Bookmark"
msgstr "Ustaw zakładkę WMS"
@@ -8724,13 +8988,13 @@ msgid "Save WMS file"
msgstr "Zapisz plik WMS"
msgid "Correlate to GPX"
-msgstr ""
+msgstr "Koreluj do GPX"
msgid "GPX Files (*.gpx *.gpx.gz)"
msgstr "Pliki GPX (*.gpx *.gpx.gz)"
msgid "File {0} is loaded yet under the name \"{1}\""
-msgstr ""
+msgstr "Plik {0} jest załadowany pod nazwą \"{1}\""
msgid "Error while parsing {0}"
msgstr "Błąd podczas przetwarzania {0}"
@@ -8772,7 +9036,7 @@ msgid ""
"Error while parsing the date.\n"
"Please use the requested format"
msgstr ""
-"Błąd w trakcie przetwarzania daty.\n"
+"Błąd podczas przetwarzania daty.\n"
"Proszę użyć wybranego formatu."
msgid "Invalid date"
@@ -8839,7 +9103,7 @@ msgid "No images could be matched!"
msgstr "Nie można było dopasować żadnego zdjęcia!"
msgid "No gpx selected"
-msgstr ""
+msgstr "Brak zaznaczenia gpx"
msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
msgid_plural ""
@@ -8862,8 +9126,9 @@ msgstr "Sekundy: {0}"
msgid "(Time difference of {0} day)"
msgid_plural "Time difference of {0} days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(Różnica czasu {0} dzień)"
+msgstr[1] "Różnica czasu {0} dni"
+msgstr[2] "Różnica czasu {0} dni"
msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
@@ -8902,6 +9167,8 @@ msgid ""
"Error while parsing timezone.\n"
"Expected format: {0}"
msgstr ""
+"Błąd parsowania strefy czasowej.\n"
+"Spodziewany format: {0}"
msgid ""
"Error while parsing offset.\n"
@@ -8914,9 +9181,6 @@ msgstr "Pobieranie lokalizacji GPS z EXIF"
msgid "Starting directory scan"
msgstr "Rozpoczynanie skanowania katalogu"
-msgid "One of the selected files was null"
-msgstr "Jeden ze wskazanych plików był pusty."
-
msgid "Read photos..."
msgstr "Czytanie zdjęć..."
@@ -8935,6 +9199,9 @@ msgstr "Znaleziono pusty plik w katalogu {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
+msgid "One of the selected files was null"
+msgstr "Jeden ze wskazanych plików był pusty."
+
msgid "Geotagged Images"
msgstr "Geolokalizowane obrazy"
@@ -8996,6 +9263,12 @@ msgstr "Następny"
msgid "Show next Image"
msgstr "Pokaż następne zdjęcie"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Wyśrodkuj widok"
@@ -9030,11 +9303,15 @@ msgid ""
"\n"
"EXIF time: {0}"
msgstr ""
+"\n"
+"Czas EXIF: {0}"
msgid ""
"\n"
"GPS time: {0}"
msgstr ""
+"\n"
+"Czas GPS: {0}"
msgid "JPEG images (*.jpg)"
msgstr "Pliki JPEG (*.jpg)"
@@ -9043,7 +9320,7 @@ msgid "Choose visible tracks"
msgstr "Wybierz widoczne ścieżki"
msgid "Select by date"
-msgstr ""
+msgstr "Wybierz po dacie"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -9074,23 +9351,23 @@ msgstr ""
"<html>Wysyłanie nieprzetworzonych danych GPS jako mapy jest uznawane za "
"szkodliwe.<br>Jeśli chcesz wysłać ślady, zobacz tutaj:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Dostosuj rysowanie ścieżki"
msgid "From"
-msgstr ""
+msgstr "Z"
msgid "To"
-msgstr ""
+msgstr "Do"
msgid "No timestamp"
+msgstr "Brak znacznika czasu"
+
+msgid "Select to download OSM data."
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Pobierz wszystko pomiędzy:"
@@ -9116,15 +9393,17 @@ msgstr "tylko punkty"
msgid "track and waypoints"
msgstr "ścieżka i punkty"
-msgid "Calculating Download Area"
-msgstr "Przeliczam pobierany obszar"
+msgid "Click to download"
+msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
msgstr ""
-"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy "
-"kontynuować?</html>"
+
+msgid "Download from OSM along this track"
+msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
+
+msgid "Calculating Download Area"
+msgstr "Przeliczam pobierany obszar"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9267,17 +9546,11 @@ msgstr ""
msgid "(URL was: "
msgstr "(Adres URL był: "
-msgid "Error displaying URL"
-msgstr "Błąd podczas wyświetlania adresu"
-
msgid "Select the map painting styles"
-msgstr ""
+msgstr "Wybierz style rysowania mapy"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Ostrzeżenie: załadowanie stylu Mappaint z ''{0}'' nie powiodło się. Wyjątek: "
-"{1}"
msgid "loading style ''{0}''..."
msgstr "wczytywanie stylu ''{0}''..."
@@ -9291,7 +9564,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -9301,8 +9574,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9555,8 +9827,8 @@ msgstr "Zamknij okno i anuluj uwierzytelnianie"
msgid "Close the dialog and accept the Access Token"
msgstr "Zamknij okno i zaakceptuj Klucz Dostępu"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Ostrzeżenie: nie udało się anulować trwającej operacji OAuth"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Pobieranie Żetonu Żądania OAuth z ''{0}''"
@@ -9627,6 +9899,12 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
"Zaznacz by nadac JOSM prawo do wysyłania twoich preferencji witryny OSM"
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "Pobieranie Klucza Dostępu OAuth"
@@ -9698,9 +9976,6 @@ msgstr ""
"JOSM będzie używał go w przyszłości w celu uwierzytelnienia i uzyskania praw "
"do serwera OSM.<br><br>Klucz dostępu: </html>"
-msgid "Restart"
-msgstr "Uruchom ponownie"
-
msgid "Click to retrieve a Request Token"
msgstr "Kliknij by pobrać Żeton Żądania"
@@ -9768,7 +10043,7 @@ msgid ""
msgstr ""
msgid "Retrieving user info..."
-msgstr ""
+msgstr "Pobieranie informacji użytkownika..."
msgid "Audio Settings"
msgstr "Ustawienia audio"
@@ -9959,6 +10234,9 @@ msgstr ""
"Należy ponownie uruchomić program JOSM, aby niektóre ustawienia stały się "
"aktywne."
+msgid "Would you like to restart now?"
+msgstr "Czy chcesz zrestartować teraz?"
+
msgid "Remote Control"
msgstr "Zdalne sterowanie"
@@ -10093,6 +10371,12 @@ msgstr "Usuń z paska narzędzi"
msgid "Configure toolbar"
msgstr "Konfiguruj pasek narzędzi"
+msgid "Edit shortcut"
+msgstr "Edytuj skrót"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Nie ukrywaj paska narzędzi i menu"
+
msgid "Actions"
msgstr "Działania"
@@ -10135,6 +10419,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr "Pasek narzędzi: {0}"
+
msgid "Data validator"
msgstr "Weryfikacja danych"
@@ -10158,10 +10445,10 @@ msgid "Use the error layer to display problematic elements."
msgstr "Używa warstwę z błędami aby wyświetlić problemowe elementy."
msgid "Show informational level."
-msgstr ""
+msgstr "Pokaż poziom informowania."
msgid "Show the informational tests."
-msgstr ""
+msgstr "Pokaż testy informacyjne."
msgid "Show informational level on upload."
msgstr ""
@@ -10186,23 +10473,14 @@ msgid "Search: "
msgstr "Szukaj: "
msgid "Read from file"
-msgstr ""
-
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
+msgstr "Czytaj z pliku"
msgid "Export selected items"
msgstr "Eksportuj zaznaczone obiekty"
+msgid "JOSM custom settings files (*.xml)"
+msgstr ""
+
msgid "Please select some preference keys not marked as default"
msgstr ""
@@ -10218,50 +10496,59 @@ msgstr ""
msgid "Replace existing values"
msgstr "Zamień istniejące wartości"
-msgid "JOSM custom settings files (*.xml)"
-msgstr ""
+msgid "Open JOSM customization file"
+msgstr "Otwórz plik dostosowywania JOSM"
-msgid "Advanced Background: Changed"
+msgid "Import log"
+msgstr "Importuj log"
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "shortcut"
msgstr ""
-msgid "Current value is default."
-msgstr "Obecna wartość jest domyślna"
+msgid "color"
+msgstr "kolor"
-msgid "Default value is ''{0}''."
-msgstr "Domyśłna wartość to ''{0}''."
+msgid "toolbar"
+msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Domyślna wartość obecnie nie znana (funkcja jeszcze nie używana)."
+msgid "imagery"
+msgstr ""
-msgid "Select Setting Type:"
+msgid "Reset preferences"
msgstr ""
-msgid "Simple"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List"
+msgid "Load profile"
msgstr ""
-msgid "List of lists"
+msgid "Save {0} profile"
msgstr ""
-msgid "List of maps"
-msgstr "Spis map"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
-msgid "Add setting"
-msgstr "Dodaj ustawienie"
+msgid "Choose profile file"
+msgstr ""
msgid "Change list setting"
-msgstr ""
+msgstr "Zmień ustawienia listy"
msgid "Key: {0}"
msgstr "Klucz: {0}"
msgid "Change list of lists setting"
-msgstr ""
+msgstr "Zmień ustawienia listy list"
msgid "add entry"
msgstr "dodaj wpis"
@@ -10270,14 +10557,47 @@ msgid "Remove the selected entry"
msgstr "Usuwa wybraną pozycję"
msgid "Change list of maps setting"
-msgstr ""
+msgstr "Zmień ustawienia listy map"
msgid "Entry {0}"
msgstr "Wpis {0}"
-msgid "Change string setting"
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr "Prosty"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "List of lists"
+msgstr "Lista list"
+
+msgid "List of maps"
+msgstr "Spis map"
+
+msgid "Add setting"
+msgstr "Dodaj ustawienie"
+
+msgid "Advanced Background: Changed"
msgstr ""
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Obecna wartość jest domyślna"
+
+msgid "Default value is ''{0}''."
+msgstr "Domyśłna wartość to ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Domyślna wartość obecnie nie znana (funkcja jeszcze nie używana)."
+
+msgid "Change string setting"
+msgstr "Zmień ustawienia ciągu"
+
msgid "Value: "
msgstr "Wartość: "
@@ -10331,8 +10651,11 @@ msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
msgid "Draw inactive layers in other color"
msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
+msgid "Display discardable keys"
+msgstr "Pokaż przestarzałe tagi"
+
msgid "Highlight target ways and nodes"
-msgstr ""
+msgstr "Podświetl docelowe drogi i węzły"
msgid "Draw rubber-band helper line"
msgstr "Pokazuj linię pomocniczą za kursorem"
@@ -10341,7 +10664,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr ""
+msgstr "Wygładzaj rysowaną mapę w widoku szkieletowym (antyaliasing)"
msgid "Draw only outlines of areas"
msgstr "Rysuj tylko kontury obszarów"
@@ -10353,7 +10676,7 @@ msgid "Draw direction hints for way segments."
msgstr "Rysuje strzałki kierunkowe dla segmentów drogi."
msgid "Draw arrows in the direction of oneways and other directed features."
-msgstr ""
+msgstr "Rysuj strzałki zgodnie z kierunkiem dróg."
msgid "Draw the order numbers of all segments within their way."
msgstr "Rysuje kolejne numery wszystkich segmentów drogi."
@@ -10377,23 +10700,29 @@ msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
+"Stosuje antyaliasing dla mapy w widoku szkieletowym dając gładszy wygląd"
msgid "Hightlight target nodes and ways while drawing or selecting"
-msgstr ""
+msgstr "Podświetl docelowe węzły i drogi podczas rysowania i zaznaczania"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
"in the selected style."
msgstr ""
-msgid "Options that affect drawing performance"
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
msgstr ""
+msgid "Options that affect drawing performance"
+msgstr "Ustawienia wpływające na wydajność rysowania"
+
msgid "Segment drawing options"
msgstr ""
msgid "Select and draw mode options"
-msgstr ""
+msgstr "Ustawienia trybu zaznacz i rysuj"
msgid "Other options"
msgstr "Pozostałe opcje"
@@ -10416,13 +10745,13 @@ msgid "Everything"
msgstr "Wszystko"
msgid "Name or offset"
-msgstr ""
+msgstr "Nazwa lub przesunięcie"
msgid "None"
msgstr "żadne"
msgid "Custom"
-msgstr ""
+msgstr "Własne"
msgid "Use global settings"
msgstr "Użyj globalnych ustawień"
@@ -10479,7 +10808,7 @@ msgid "Dynamic color range based on data limits"
msgstr ""
msgid "Smooth GPX graphics (antialiasing)"
-msgstr ""
+msgstr "Wygładzaj linie GPX (antyaliasing)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -10548,7 +10877,7 @@ msgstr "Szerokość rysowania linii GPX"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
-msgstr ""
+msgstr "Stosuje antyaliasing dla linii GPX dając gładszy wygląd"
msgid ""
"All points and track segments will have the same color. Can be customized in "
@@ -10644,25 +10973,32 @@ msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
"level: {1} or {2}<br>reversed zoom level: {3}"
msgstr ""
+"{0} jest zamieniane na poziom powiększenia kafelka, również "
+"obsługiwane:<br>offset dla poziomu powiększenia: {1} or {2}<br>odwrócony "
+"poziom powiększenia: {3}"
msgid "{0} is replaced by X-coordinate of the tile"
-msgstr ""
+msgstr "{0} jest zamienianie na koordynat X dla kafelka"
msgid "{0} is replaced by Y-coordinate of the tile"
-msgstr ""
+msgstr "{0} jest zamieniany na koordynat Y dla kafelka"
msgid "{0} is replaced by {1} (Yahoo style Y coordinate)"
-msgstr ""
+msgstr "{0} jest zamieniany na {1} (Styl Yahoo podawania koordynatu Y)"
msgid ""
"{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
"coordinate)"
msgstr ""
+"{0} jest zamieniany na {1} (Styl OSGeo Tile Map Service Specification "
+"podawania koordynatu Y)"
msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
"e.g. {1}"
msgstr ""
+"{0} jest zamieniany na losowo wybraną wartość z listy parametrów "
+"oddzielonych przecinkami , np {1}"
msgid "2. Enter maximum zoom (optional)"
msgstr "2. Podaj maksymalne przybliżenie (opcjonalnie)"
@@ -10680,7 +11016,7 @@ msgid "Show bounds"
msgstr "Pokaż granice"
msgid "1. Enter service URL"
-msgstr ""
+msgstr "1. Wprowadź adres usługi"
msgid "Get layers"
msgstr "Pobierz warstwy"
@@ -10688,9 +11024,15 @@ msgstr "Pobierz warstwy"
msgid "2. Select layers"
msgstr "2. Zaznacz warstwy"
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
msgstr ""
+msgid "4. Verify generated WMS URL"
+msgstr "4. Sprawdź wygenerowany adres URL dla WMS"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Wprowadź nazwę dla tej warstwy"
+
msgid "Show Bounds"
msgstr "Pokaż obszar"
@@ -10737,7 +11079,7 @@ msgid "Offset bookmarks"
msgstr "Zakładki przesunięcia"
msgid "Imagery Background: Default"
-msgstr ""
+msgstr "Podkład: domyślny"
msgid "Available default entries:"
msgstr "Wpisy dostępne domyślnie:"
@@ -10746,7 +11088,7 @@ msgid "Selected entries:"
msgstr "Wybrane wpisy:"
msgid "Add a new {0} entry by entering the URL"
-msgstr ""
+msgstr "Dodaj nowy {0} wpis wprowadzając adres URL"
msgid "Remove entry"
msgstr "Usuń wpis"
@@ -10794,7 +11136,7 @@ msgid "Auto zoom by default: "
msgstr "Domyślny zoom automatyczny: "
msgid "Autoload tiles by default: "
-msgstr "Domyślne ładowanie kafelek: "
+msgstr "Domyślne ładowanie kafelków: "
msgid "Min. zoom level: "
msgstr "Minimalny poziom przybliżenia: "
@@ -10806,7 +11148,7 @@ msgid "Add to slippymap chooser: "
msgstr ""
msgid "Tile cache directory: "
-msgstr "Katalog cache kafelek: "
+msgstr "Katalog cache kafelków: "
msgid ""
"That layer does not support any of JOSM''s projections,\n"
@@ -10866,6 +11208,12 @@ msgstr ""
"<i>(JOSM może zatrzymać kopie zapasowe przy zapisywaniu warstw danych. Do "
"nazwy piku dodaje ''~'' i zapisuje w tym samym folderze.)</i>"
+msgid "Notification at each save"
+msgstr "Powiadomienie przy każdym zapisie"
+
+msgid "When saving, display a small notification"
+msgstr "Podczas zapisywania pokaż niewielkie powiadomienie"
+
msgid "File backup"
msgstr "Plik kopii zapasowej"
@@ -10934,8 +11282,8 @@ msgstr "Ustawienia mapy"
msgid "Settings for the map projection and data interpretation."
msgstr "Ustawienia odwzorowania kartograficznego oraz interpretacji danych."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Ostrzeżenie: Nie mogłem odczytać źródła szablonu tagowania: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Nie mogłem odczytać źródła szablonu tagowania: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11041,8 +11389,9 @@ msgstr ""
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Plugin {0} jest wciąż wymagany przez ten plugin:"
+msgstr[1] "Plugin {0} jest wciąż wymagany przez te {1} pluginy:"
+msgstr[2] "Plugin {0} jest wciąż wymagany przez te {1} pluginów:"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: Wersja {1} (lokalna: {2})"
@@ -11078,10 +11427,10 @@ msgid "By Code (EPSG)"
msgstr "Po kodzie (EPSG)"
msgid "Invalid projection configuration: {0}"
-msgstr ""
+msgstr "Błędna konfiguracja projekcji: {0}"
msgid "Projection configuration is valid."
-msgstr ""
+msgstr "Konfiguracja projekcji jest prawidłowa."
msgid "Validate"
msgstr "Zweryfikuj"
@@ -11096,10 +11445,10 @@ msgid "Projection name"
msgstr "Nazwa projekcji"
msgid "Supported values:"
-msgstr ""
+msgstr "Obsługiwane wartości:"
msgid "Projection parameters"
-msgstr ""
+msgstr "Parametry projekcji"
msgid "False easting and false northing"
msgstr ""
@@ -11213,21 +11562,6 @@ msgstr "Siatka szwajcarska (stosowana w Szwajcarii)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Strefa UTM"
-
-msgid "North"
-msgstr "Północ"
-
-msgid "South"
-msgstr "Południe"
-
-msgid "Hemisphere"
-msgstr "Półkula"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Gwadelupa Fort-Marigot 1949"
@@ -11249,16 +11583,33 @@ msgstr ""
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Strefa UTM"
+
+msgid "North"
+msgstr "Północ"
+
+msgid "South"
+msgstr "Południe"
+
+msgid "Hemisphere"
+msgstr "Półkula"
+
msgid "Testing OSM API URL ''{0}''"
-msgstr ""
+msgstr "Testowanie adresu URL dla API OSM \"{0}\""
msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
+"<html>''{0}'' nie jest prawidłowym adresem URL z API OSM.<br>Proszę "
+"sprawdzić literówki i spróbować ponownie.</html>"
msgid "Invalid API URL"
-msgstr ""
+msgstr "Nieprawidłowy adres URL API"
msgid ""
"<html>Failed to build URL ''{0}'' for validating the OSM API "
@@ -11301,8 +11652,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Wybierz aby używać mechanizmu uwierzytelniania OAuth"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11311,20 +11662,25 @@ msgstr "Nazwa użytkownika OSM:"
msgid "OSM password:"
msgstr "Hasło OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Okresowo sprawdzaj czy są nowe wiadomości"
+
+msgid "Check interval (minutes):"
+msgstr "Sprawdzaj co (w minutach):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -11367,9 +11723,10 @@ msgstr "Sprawdzanie nie udało się. Wydaje się, że URL do API jest błędny."
msgid "OSM API URL must not be empty. Please enter the OSM API URL."
msgstr ""
+"Adres URL API OSM nie może być pusty. Proszę wprowadzić adres URL API OSM"
msgid "The current value is not a valid URL"
-msgstr ""
+msgstr "Aktualna wartość nie jest prawidłowym adresem URL"
msgid "Please enter the OSM API URL."
msgstr "Podaj OSM API URL."
@@ -11410,15 +11767,12 @@ msgid "Use a SOCKS proxy"
msgstr "Używaj SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-
-msgid "disabled"
-msgstr "zablokowane"
-
-msgid "no modifier"
-msgstr "brak modyfikatora"
+"JOSM jest skonfigurowane tak, aby używać proxy z ustawień systemowych, "
+"jednakże JVM nie jest skonfigurowane aby je pobrać. Resetowanie ustawień do "
+"\"Bez serwera proxy\""
msgid "Shortcut Background: User"
msgstr ""
@@ -11461,32 +11815,38 @@ msgstr "Usuwa zaaznaczenie w tabeli tagów"
msgid "Add a new tag"
msgstr "Dodaje nowy tag"
-msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgid "Paste tags from buffer"
+msgstr "Wklej tagi ze schowka"
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Używa szablon \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Elementy typu {0} nie są wspierane."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Zmień {0} obiekt"
+msgstr[1] "Zmień {0} obiekty"
+msgstr[2] "Zmień {0} obiektów"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
+msgid "Nothing selected!"
+msgstr "Nic nie wybrano!"
-msgid "More information about this feature"
-msgstr "Więcej informacji na temat tej funkcji"
+msgid "Selection unsuitable!"
+msgstr "Nieodpowiednie zaznaczenie."
+
+msgid "Apply Preset"
+msgstr "Zastosuj szablon"
+
+msgid "New relation"
+msgstr "Nowa relacja"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11494,6 +11854,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Więcej informacji na temat tej funkcji"
+
msgid "Available roles"
msgstr "Dostępne role"
@@ -11509,53 +11872,42 @@ msgstr "elementy"
msgid "Optional Attributes:"
msgstr "Dodatkowe atrybuty:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
+msgid "Select auto-increment of {0} for this field"
+msgstr ""
-msgid "Use preset ''{0}''"
-msgstr "Używa szablon \"{0}\""
+msgid "Cancel auto-increment for this field"
+msgstr ""
-msgid "Unknown type: {0}"
-msgstr "Nieznany typ: {0}"
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Nie mogłem odczytać źródła szablonu tagowania: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Błąd podczas przetwarzania {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Elementy typu {0} nie są wspierane."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Zmień {0} obiekt"
-msgstr[1] "Zmień {0} obiekty"
-msgstr[2] "Zmień {0} obiektów"
-
-msgid "Nothing selected!"
-msgstr "Nic nie wybrano!"
-
-msgid "Selection unsuitable!"
-msgstr "Nieodpowiednie zaznaczenie."
-
-msgid "Apply Preset"
-msgstr "Zastosuj szablon"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "New relation"
-msgstr "Nowa relacja"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Change Properties"
-msgstr "Zmień właściwości"
+msgid "Unknown type: {0}"
+msgstr "Nieznany typ: {0}"
msgid "Preset group {1} / {0}"
msgstr "Grupa szablonów {1} / {0}"
@@ -11563,6 +11915,18 @@ msgstr "Grupa szablonów {1} / {0}"
msgid "Preset group {0}"
msgstr "Grupa szablonów {0}"
+msgid "Roles cannot appear more than once"
+msgstr ""
+
+msgid "Preset role element without parent"
+msgstr ""
+
+msgid "Preset sub element without parent"
+msgstr ""
+
+msgid "Error parsing {0}: "
+msgstr "Błąd podczas przetwarzania {0}: "
+
msgid "Search preset"
msgstr "Znajdź szablon"
@@ -11578,6 +11942,14 @@ msgstr "Pokaż tylko odpowiednie do zaznaczenia"
msgid "Search in tags"
msgstr "Szukaj w tagach"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr "Wszystkie pliki (*.*)"
@@ -11608,6 +11980,54 @@ msgstr ""
msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+"Wprowadzona wartość nie jest prawidłowym ID OSM. Proszę wprowadzić liczbę "
+"całkowitą > 0"
+
+msgid "false: the property is explicitly switched off"
+msgstr "fałsz: ten opcja jest zawsze wyłączona"
+
+msgid "true: the property is explicitly switched on"
+msgstr "prawda: ta opcja jest zawsze włączona"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"częściowe: różne zaznaczone obiekty mają różne wartości - nie zmienia"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "nieustawione: nie zmieniaj tego atrybutu dla zaznaczonych obiektów"
+
+msgid "Cut"
+msgstr "Wytnij"
+
+msgid "Right click = copy to clipboard"
+msgstr "Prawy przycisk myszy = kopiuj do schowka"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Brakuje wymaganego atrybutu ''{0}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Niewłaściwa wartość wymaganego atrybutu ''{0}'' typu OsmPrimitiveType. Jest "
+"''{1}''."
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
@@ -11641,7 +12061,7 @@ msgid "Contacting OSM Server..."
msgstr "Łączenie z serwerem OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11681,29 +12101,30 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
+"JVM nie jest skonfigurowany aby pobierać ustawienia proxy z ustawień "
+"systemowych. Parametr ''java.net.useSystemProxies'' nie został wprowadzony "
+"podczas uruchamiania. Proxy nie będzie użyte."
msgid "Parsing response from server..."
msgstr "Przetwarzanie odpowiedzi z serwera..."
@@ -11801,6 +12222,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
+msgid "(at line {0}, column {1})"
+msgstr "(w linii {0}, kolumnie {1})"
+
msgid "Unknown mode {0}."
msgstr "Nieznany tryb {0}"
@@ -11816,12 +12240,21 @@ msgstr ""
msgid "No image files found."
msgstr "Nie znaleziono plików obrazu."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Masz {0} nieprzeczytaną wiadomość."
+msgstr[1] "Liczba nieprzeczytanych wiadomości: {0}"
+msgstr[2] "Liczba nieprzeczytanych wiadomości: {0}"
+
+msgid "Click here to see your inbox."
+msgstr "Kliknij tutaj, by przejść do swojej skrzynki odbiorczej"
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11903,8 +12336,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Import NMEA zakończony powodzeniem"
+msgid "NMEA import success:"
+msgstr "Import NMEA zakończony powodzeniem:"
msgid "NMEA import failure!"
msgstr "Import NMEA zakończony niepowodzeniem!"
@@ -12005,37 +12438,11 @@ msgstr "Nie znaleziono danych w pliku {0}."
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Brakuje wymaganego atrybutu ''{0}''."
-
msgid "Unsupported version: {0}"
msgstr "Nie wspierana wersja: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Niewłaściwa wartość wymaganego atrybutu ''{0}'' typu OsmPrimitiveType. Jest "
-"''{1}''."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -12043,10 +12450,12 @@ msgid ""
"Illegal document structure. Found node, way, or relation outside of "
"''create'', ''modify'', or ''delete''."
msgstr ""
+"Błędna struktura dokumentu. Znaleziono punkt, drogę lub relację poza "
+"\"create\", \"modify lub \"delete\"."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -12073,12 +12482,9 @@ msgstr "Przetwarzam listę zestawów zmian..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
-msgid "(at line {0}, column {1})"
-msgstr "(w linii {0}, kolumnie {1})"
-
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Podczas zapisywania wystąpił błąd.<br>Błąd:<br>{0}</html>"
@@ -12089,9 +12495,6 @@ msgstr ""
"<html>Podczas przywracania kopii bezpieczeństwa wystąpił "
"błąd.<br>Błąd:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nie można wykonać kopii bezpieczeństwa pliku. Wyjątek: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -12113,13 +12516,16 @@ msgstr "Nie znaleziono danych w pliku ''{0}''."
msgid "Open OSM file"
msgstr "Otwórz plik OSM"
+msgid "Reading was canceled"
+msgstr "Anulowano wczytywanie"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
msgstr ""
msgid "Deleted way {0} contains nodes"
-msgstr ""
+msgstr "Usunięta droga {0} zawiera węzły"
msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
msgstr ""
@@ -12163,12 +12569,12 @@ msgstr ""
"Niewłaściwa wartość atrybutu ''version'' na elemencie z ID {0}. Jest {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
-msgstr ""
+msgstr "Nieznana lub nie obsługiwana wersja API. Otrzymano: {0}."
msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
msgstr "Brakujący atrybut ''version'' na elemencie z ID {0}."
@@ -12315,6 +12721,9 @@ msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr "Dodaj znaczniki do wybranych obiektów"
@@ -12333,6 +12742,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr "Wczytaj dane z API"
@@ -12357,7 +12775,13 @@ msgstr "Utwórz nowe obiekty"
msgid "Read protocol version"
msgstr "Odczytaj wersję protokołu"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -12366,9 +12790,6 @@ msgstr ""
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr "Dodaj drogę"
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
@@ -12378,6 +12799,14 @@ msgstr "Nieprawidłowe współrzędne: {0}"
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr "Dodaj drogę"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12392,6 +12821,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12417,24 +12855,24 @@ msgid ""
msgstr ""
msgid "Data:"
-msgstr ""
+msgstr "Dane:"
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12456,11 +12894,23 @@ msgstr "Warstwa zawiera niezapisane dane - zapisz do pliku."
msgid "Layer does not contain unsaved data."
msgstr "Warstwa nie zawiera niezapisanych danych."
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Plik sesji (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Nie można zlokalizować pliku ''{0}''."
@@ -12530,13 +12980,13 @@ msgid "Download skipped"
msgstr "Pobieranie pominięte"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12664,8 +13114,9 @@ msgstr[2] "JOSM nie mógł odnaleźć informacji o następujących wtyczkach:"
msgid "The plugin is not going to be loaded."
msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Plugin nie będzie załadowany"
+msgstr[1] "Pluginy nie będą załadowane"
+msgstr[2] "Pluginy nie będą załadowane"
msgid "Determine plugins to load..."
msgstr ""
@@ -12692,12 +13143,12 @@ msgstr[0] ""
msgstr[1] ""
msgid "Plugin update failed"
-msgstr ""
+msgstr "Aktualizacja Pluginu zakończona niepowodzeniem"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12712,22 +13163,21 @@ msgstr "Zachowaj wtyczkę"
msgid "Click to keep the plugin ''{0}''"
msgstr "Kliknij aby zachować wtyczkę \"{0}\""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12772,7 +13222,7 @@ msgstr ""
"Opcje>Wtyczki)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Błędny plik jar \"{0}\""
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr ""
@@ -12804,8 +13254,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr "Przetwarzanie pliku ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12820,9 +13269,24 @@ msgstr "Pobieranie listy wtyczek..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Pobieranie listy wtyczek z \"{0}\""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr "Szczegóły:"
+
+msgid "Plugin icons download error"
+msgstr "Błąd pobierania ikon Pluginów"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -13053,6 +13517,8 @@ msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
"later.</html>"
msgstr ""
+"<html>Przekroczono dopuszczalny czas komunikacji z serwerem OSM ''{0}''. "
+"Proszę spróbować później.</html>"
msgid "no error message available"
msgstr ""
@@ -13082,7 +13548,7 @@ msgstr ""
"(nieprzetłumaczona):<br>{0}</html>"
msgid "<html>The server reported that it has detected a conflict."
-msgstr ""
+msgstr "<html>Serwer zwrócił informację że został wykryty konflikt."
msgid ""
"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
@@ -13118,6 +13584,9 @@ msgid ""
"<html>The OSM server<br>''{0}''<br>reported an internal server "
"error.<br>This is most likely a temporary problem. Please try again later."
msgstr ""
+"<html>Serwer OSM<br>''{0}''<br>zwrócił informację o wewnętrznym błędzie "
+"serwera.<br>Prawdopodobnie to tymczasowy problem z serwerem. Proszę "
+"spróbować ponownie później."
msgid "The OSM server ''{0}'' reported a bad request.<br>"
msgstr "Serwer OSM ''{0}'' zgłosił błędne żądanie.<br>"
@@ -13166,17 +13635,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13187,9 +13650,54 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr "Nieaktualna wersja Java"
+
+msgid "Update Java"
+msgstr "Aktualizuj Java"
+
+msgid "You are running version {0} of Java."
+msgstr "Używasz wersję {0} Java"
+
+msgid "February 2013"
+msgstr "Luty 2013"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+"JOSM niedługo przestanie pracować na tej wersji; wysoce zalecana jest "
+"aktualizacja do Java {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Czy chcesz teraz zaktualizować ?"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -13199,13 +13707,13 @@ msgstr[0] ""
msgstr[1] ""
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "Klucz jest zbyt długi (max {0} znaków):"
msgid "Suspicious characters in key:"
msgstr ""
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "Wartość jest zbyt długa (max {0} znaków):"
msgid "Do you want to paste these tags?"
msgstr "Czy chcesz wkleić te tagi?"
@@ -13214,16 +13722,31 @@ msgid "Clear buffer"
msgstr ""
msgid "Ignore warnings"
-msgstr ""
+msgstr "Ignoruj ostrzeżenia"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
msgstr ""
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dzień"
+msgstr[1] "dni"
+msgstr[2] "dni"
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13289,6 +13812,8 @@ msgid ""
"You requested too many nodes (limit is 50,000). Either request a smaller "
"area, or use planet.osm"
msgstr ""
+"Zażądałeś zbyt wiele węzłów (limit to 50,000). Zaznacz mniejszy teren, albo "
+"użyj planet.osm"
msgid "Database offline for maintenance"
msgstr "Baza danych offline w celach konserwacyjnych"
@@ -13334,7 +13859,7 @@ msgstr "Zarośla"
msgctxt "Relation type"
msgid "associatedStreet"
-msgstr ""
+msgstr "skojarzone ulice"
msgctxt "Relation type"
msgid "boundary"
@@ -13342,7 +13867,7 @@ msgstr "granica"
msgctxt "Relation type"
msgid "enforcement"
-msgstr ""
+msgstr "kontrola"
msgctxt "Relation type"
msgid "line"
@@ -13382,7 +13907,7 @@ msgstr "miasto"
msgctxt "Place type"
msgid "locality"
-msgstr ""
+msgstr "okolica"
msgctxt "Place type"
msgid "village"
@@ -13546,6 +14071,11 @@ msgid "Saturation:"
msgstr "Nasycenie:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13584,7 +14114,7 @@ msgid ""
msgstr ""
msgid "Create a grid of ways."
-msgstr ""
+msgstr "Twórz siatki dróg."
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
@@ -13629,6 +14159,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "W wygodny sposób znajduje i naprawia nieprawidłowe adresy."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13698,7 +14232,7 @@ msgid ""
msgstr ""
msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "Pomaga w wektoryzacji obrazów WMS."
msgid ""
"Support live GPS input (moving dot) through a connection to gpsd server."
@@ -13710,6 +14244,9 @@ msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
"directly by users, but rather as a dependency for other plugins."
msgstr ""
+"Dostarcza bibliotekę Log4j dla innych pluginów JOSM. Nie ma potrzeby "
+"instalacji bezpośrednio przez użytkownika, jedynie jako zależność dla innych "
+"pluginów."
msgid ""
"The MapDust Plug-In shows the MapDust bug reports on the map. You can "
@@ -13732,9 +14269,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr "Prosta konwersja obszaru na wielokąt złożony."
-
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 "
@@ -13747,6 +14281,8 @@ msgid ""
"Use your system''s password manager to store the API username and password. "
"(KWallet and gnome-keyring are supported.)"
msgstr ""
+"Użyj systemowego menadżera haseł do przechowywania nazwy użytkownika i hasła "
+"dostępu do API. ( Obsługiwane menadżery to KWallet i gnome-keyring)"
msgid ""
"Simulates a click when you do a small and short drag. This is useful for "
@@ -13796,6 +14332,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13822,9 +14361,6 @@ msgstr "Ta wtyczka upraszcza mapowanie i edycję tras transportu publicznego."
msgid "Relation and multipolygon creating and editing panel."
msgstr "Panel edycji i tworzenia relacjii i multipolygonów"
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr "Wtyczka umożliwiająca odwracanie opublikowanych zmian."
@@ -13843,16 +14379,13 @@ msgid "Provides routing capabilities."
msgstr ""
msgid "Loads data from SDS"
-msgstr ""
+msgstr "Wczytuje dane z SDS"
msgid ""
"Simplify area by removing nodes on very obtuse angles. This can be "
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13889,6 +14422,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13932,16 +14470,13 @@ msgid "Select a sequence of non-branching connected ways"
msgstr ""
msgid "Simplifys linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "Upraszcza łączenie obiektów OSM z artykułami z Wikipedii"
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Drogi"
-
msgid "Streets"
msgstr "Sieć drogowa"
@@ -13997,13 +14532,16 @@ msgid "ground"
msgstr "grunt"
msgid "Oneway"
-msgstr "jednokierunkowa"
+msgstr "Jednokierunkowa"
msgid "Tunnel"
msgstr "Tunel"
msgid "Embankment"
-msgstr "nasyp"
+msgstr "Nasyp"
+
+msgid "Toll"
+msgstr "bramka (opłata)"
msgid "Motorway Link"
msgstr "Autostrada - dojazd"
@@ -14042,7 +14580,7 @@ msgid "-10°"
msgstr "-10°"
msgid "Primary Link"
-msgstr "Droga krajowa - dojazd"
+msgstr "Droga krajowa - łącznik"
msgid "Edit Primary Link"
msgstr "Edycja dojazdu do drogi krajowej"
@@ -14054,25 +14592,25 @@ msgid "Edit Secondary Road"
msgstr "Edycja drogi wojewódzkiej"
msgid "Secondary Link"
-msgstr "Droga wojewódzka - dojazd"
+msgstr "Droga wojewódzka - łącznik"
msgid "Edit Secondary Link"
msgstr "Edycja dojazdu do drogi wojewódzkiej"
msgid "Tertiary"
-msgstr "Droga powiatowa"
+msgstr "Droga trzeciorzędna"
msgid "Edit Tertiary Road"
msgstr "Edycja drogi powiatowej"
msgid "Tertiary Link"
-msgstr "Droga powiatowa - dojazd"
+msgstr "Droga trzeciorzędna - łącznik"
msgid "Edit Tertiary Link"
-msgstr "Edycja dojazdu do drogi powiatowej"
+msgstr "Edycja dojazdu do drogi trzeciorzędnej"
msgid "Unclassified"
-msgstr "Droga gminna"
+msgstr "Droga czwartorzędna"
msgid "Edit Unclassified Road"
msgstr "Edycja drogi gminnej lub innej drogi publicznej"
@@ -14089,6 +14627,50 @@ msgstr "Droga lokalna"
msgid "Edit Residential Street"
msgstr "Edycja drogi lokalnej / ulicy"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Typ drogi"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "tak"
+
+msgid "no"
+msgstr "nie"
+
+msgid "destination"
+msgstr "dojazd do posesji"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Strefa zamieszkania"
@@ -14107,11 +14689,11 @@ msgstr "obszar"
msgid "Service"
msgstr "Droga serwisowa"
-msgid "Edit Serviceway"
-msgstr "Edycja drogi serwisowej"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Rodzaj"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "alejka"
@@ -14122,6 +14704,9 @@ msgstr "podjazd"
msgid "parking_aisle"
msgstr "uliczka parkingowa"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Uliczka parkingowa"
@@ -14149,18 +14734,12 @@ msgstr "rondo"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "tak"
-
msgid "Road Restrictions"
msgstr "Ograniczenia na drodze"
msgid "Edit Road Restrictions"
msgstr "Edycja ograniczeń na drodze"
-msgid "Toll"
-msgstr "bramka (opłata)"
-
msgid "No exit (cul-de-sac)"
msgstr "ślepa ulica"
@@ -14170,9 +14749,6 @@ msgstr "Ograniczenia w ruchu"
msgid "General Access"
msgstr "Dostęp dla wszystkich typów"
-msgid "destination"
-msgstr "dojazd do posesji"
-
msgid "delivery"
msgstr "dla dostaw"
@@ -14182,15 +14758,15 @@ msgstr "dopuszczalny"
msgid "private"
msgstr "droga prywatna"
+msgid "customers"
+msgstr "klienci"
+
msgid "agricultural"
msgstr "dla rolnictwa"
msgid "forestry"
msgstr "leśna"
-msgid "no"
-msgstr "nie"
-
msgid "official"
msgstr "oficjalnie"
@@ -14207,7 +14783,7 @@ msgid "All vehicles"
msgstr "Wszystkie typy pojazdów"
msgid "Motor vehicles"
-msgstr "Pojazdy z silnikiem"
+msgstr "Pojazdy silnikowe"
msgid "Motorcycle"
msgstr "Motocykle"
@@ -14236,6 +14812,9 @@ msgstr "Pojazdy z wieloma pasażerami"
msgid "Public Service Vehicles (psv)"
msgstr "Transport publiczny"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. prędkość (km/h)"
@@ -14294,10 +14873,10 @@ msgid "secondary"
msgstr "droga wojewódzka"
msgid "tertiary"
-msgstr "droga powiatowa"
+msgstr "droga trzeciorzędna"
msgid "unclassified"
-msgstr "droga gminna"
+msgstr "droga czwartorzędna"
msgid "residential"
msgstr "zabudowa"
@@ -14320,6 +14899,9 @@ msgstr "Edycja mostu"
msgid "viaduct"
msgstr "Wiadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14424,20 +15006,29 @@ msgstr ""
msgid "Visibility"
msgstr "Widoczność"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "doskonała"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "dobra"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "średnia"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "zła"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "tragiczna"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Wózki inwalidzkie"
@@ -14454,11 +15045,11 @@ msgstr "Ścieżka do jazdy konnej"
msgid "Edit Bridleway"
msgstr "Edycja ścieżki do jazdy konnej"
-msgid "Cycle Lane"
-msgstr "Pas dla rowerzystów"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Edycja pasa dla rowerzystów"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Ścieżka rowerowa"
@@ -14493,8 +15084,8 @@ msgstr "Ścieżka rowerowa (po prawej)"
msgid "Oneway (bicycle)"
msgstr "Jednokierunkowa (dla rowerów)"
-msgid "Edit Highway"
-msgstr "Edytuj drogę"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Droga"
@@ -14533,10 +15124,10 @@ msgid "Waypoints"
msgstr "Punkty drogowe"
msgid "Motorway Junction"
-msgstr "Skrzyżowanie autostrad"
+msgstr "Węzeł autostradowy"
msgid "Edit Motorway Junction"
-msgstr "Edycja skrzyżowania autostrad"
+msgstr "Edycja węzła autostradowego"
msgid "Number"
msgstr "Numer"
@@ -14562,12 +15153,18 @@ msgstr "Miejsce odpoczynku"
msgid "Edit Rest Area"
msgstr "Edycja miejsca odpoczynku"
-msgid "Emergency Phone"
-msgstr "Telefon alarmowy"
+msgid "Drinking Water"
+msgstr "Woda do picia"
msgid "Traffic Signal"
msgstr "Sygnalizacja świetlna"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Typ przejścia dla pieszych"
@@ -14583,15 +15180,6 @@ msgstr "wysepka"
msgid "unmarked"
msgstr "nieoznakowane"
-msgid "Cross on horseback"
-msgstr "Przejazd na koniu"
-
-msgid "Cross by bicycle"
-msgstr "Przejazd na rowerze"
-
-msgid "Crossing attendant"
-msgstr "opiekun na przejściu dla pieszych"
-
msgid "Crossing type name (UK)"
msgstr "Rodzaj przejścia dla pieszych (UK)"
@@ -14613,6 +15201,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr "opiekun na przejściu dla pieszych"
+
+msgid "Cross by bicycle"
+msgstr "Przejazd na rowerze"
+
+msgid "Cross on horseback"
+msgstr "Przejazd na koniu"
+
msgid "Stop"
msgstr "Znak stop"
@@ -14622,6 +15219,9 @@ msgstr "Ustąpienie pierwszeństwa"
msgid "Mini-roundabout"
msgstr "Minirondo"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Kierunek"
@@ -14631,10 +15231,7 @@ msgstr "zgodnie z ruchem wskazówek zegara"
msgid "Pedestrian Crossing"
msgstr "Przejście dla pieszych"
-msgid "Edit Crossing"
-msgstr "Edycja przejścia dla pieszych"
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14644,32 +15241,29 @@ msgid "Edit Traffic Calming"
msgstr "Edycja środka uspokojenia ruchu"
msgid "bump"
-msgstr "próg zwalniający"
+msgstr "krótki próg zwalniający"
msgid "chicane"
msgstr "szykana"
msgid "choker"
-msgstr ""
+msgstr "zwężenie"
msgid "cushion"
msgstr "próg wyspowy"
msgid "hump"
-msgstr ""
+msgstr "długi próg zwalniający"
msgid "rumble_strip"
-msgstr ""
+msgstr "dudniące paski"
msgid "table"
-msgstr ""
+msgstr "podest"
msgid "Passing Place"
msgstr "Zatoka"
-msgid "Edit Passing Place"
-msgstr "Edycja zatoki"
-
msgid "Turning Circle"
msgstr "Miejsce do zawracania"
@@ -14703,20 +15297,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Przeszkody"
+msgid "Block"
+msgstr "Betonowy blok"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Dozwolony ruch:"
+
+msgid "Material"
+msgstr "Materiał"
+
+msgid "stone"
+msgstr "kamień"
+
msgid "Bollard"
msgstr "Słupek drogowy"
msgid "Edit Bollard"
msgstr "Edycja słupka drogowego"
-msgid "Allowed traffic:"
-msgstr "Dozwolony ruch:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plastik"
msgid "Cycle Barrier"
msgstr "Przegroda dla rowerzystów"
-msgid "Block"
-msgstr "Betonowy blok"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Przeszkoda dla bydła"
@@ -14727,6 +15345,9 @@ msgstr "Edycja przeszkody dla bydła"
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Kolczatka"
@@ -14748,44 +15369,88 @@ msgstr "Edycja przejścia granicznego"
msgid "Hedge"
msgstr "Żywopłot"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Wysokość (metry)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Ogrodzenie"
+msgid "Edit Fence"
+msgstr ""
+
msgid "barbed_wire"
msgstr "drut kolczasty"
-msgid "chain"
-msgstr "łańcuch"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "energia elektryczna"
-msgid "hedge"
-msgstr "żywopłot"
-
msgid "pole"
msgstr "słup"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Mur"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Mury miejskie"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Mur oporowy"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Rów"
-msgid "Entrance"
-msgstr "Wejście"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Edytuj rów"
-msgid "Edit Entrance"
-msgstr "Edycja wejścia"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Brama"
@@ -14817,12 +15482,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Przełaz"
msgid "Edit Stile"
msgstr "Edycja przełazu"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Kołowrotek"
@@ -14836,16 +15516,16 @@ msgid "Edit Sally Port"
msgstr "Edycja bramy warownej"
msgid "Passageways"
-msgstr ""
+msgstr "Przejścia"
msgid "Edit Tunnel"
msgstr "Edycja tunelu"
msgid "Building Passage"
-msgstr ""
+msgstr "Przejście w budynku"
msgid "Edit Building Passage"
-msgstr ""
+msgstr "Edytuj przejście w budynku"
msgid "Arcade"
msgstr ""
@@ -14880,8 +15560,11 @@ msgstr "Odpływ"
msgid "Edit Drain"
msgstr "Edycja odpływu"
-msgid "Edit Ditch"
-msgstr "Edytuj rów"
+msgid "Ditch"
+msgstr "Rów"
+
+msgid "Edit Ditch"
+msgstr "Edytuj rów"
msgid "Stream"
msgstr "Strumień"
@@ -14889,6 +15572,12 @@ msgstr "Strumień"
msgid "Edit Stream"
msgstr "Edycja strumienia"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanał"
@@ -14928,9 +15617,6 @@ msgstr "Edycja tamy"
msgid "Groyne"
msgstr "Ostroga regulacyjna"
-msgid "Edit Groyne"
-msgstr "Edycja ostrogi regulacyjnej"
-
msgid "Breakwater"
msgstr "Falochron"
@@ -14964,6 +15650,21 @@ msgstr "Edycja zakrytego sztucznego jeziora"
msgid "Edit Water"
msgstr "Edycja zbiornika wodnego"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Ląd (wyspa)"
@@ -15045,20 +15746,25 @@ msgstr "Edycja terminalu promowego"
msgid "Cargo"
msgstr "Ładunek"
+msgctxt "cargo"
msgid "passengers"
-msgstr "pasażerowie"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "pojazdy"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "rowery"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "samochody ciężarowe"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "pasażerowie; pojazdy"
+msgstr ""
msgid "Ferry Route"
msgstr "Trasa promu"
@@ -15129,8 +15835,11 @@ msgstr "wojsko"
msgid "tourism"
msgstr "turystyka"
-msgid "Service/Type"
-msgstr "Typ"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "dworzec przetokowy"
@@ -15153,11 +15862,14 @@ msgstr "sieć trakcyjna"
msgid "rail"
msgstr "kolej"
-msgid "Voltage"
-msgstr "Napięcie"
+msgid "Voltage in Volts (V)"
+msgstr "Napięcie w Voltach (V)"
-msgid "Frequency (Hz)"
-msgstr "Częstotliwość (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr "Częstotliwość w Hertzach (Hz)"
+
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -15168,9 +15880,6 @@ msgstr "Kolej wąskotorowa"
msgid "Edit Narrow Gauge Rail"
msgstr "Edycja toru kolei wąskotorowej"
-msgid "Types"
-msgstr "Rodzaj"
-
msgid "Monorail"
msgstr "Tor jednoszynowy"
@@ -15213,18 +15922,56 @@ msgstr "Nieużywany tor"
msgid "Edit Disused Railway"
msgstr "Edycja opuszczonych torów"
-msgid "Optional Types"
-msgstr "Rodzaj (opcjonalne)"
-
msgid "Abandoned Rail"
msgstr "Rozebrany tor"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Przejazd kolejowy"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr "Strzeżony"
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Przejście przez tory"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Rodzaj przejazdu"
@@ -15324,11 +16071,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15340,13 +16085,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Edycja stacji"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pylon"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Edycja pylonu"
+msgstr ""
msgid "Parking"
msgstr "Parking"
@@ -15363,12 +16106,12 @@ msgstr "terenowy"
msgid "underground"
msgstr "podziemny"
+msgid "rooftop"
+msgstr "na dachu"
+
msgid "Access"
msgstr "Dostęp do drogi"
-msgid "customers"
-msgstr "klienci"
-
msgid "Park and Ride"
msgstr "Parkuj i Jedź"
@@ -15396,9 +16139,6 @@ msgstr "Miejsce parkingowe"
msgid "Edit Parking space"
msgstr "Edycja miejsca parkinkowego"
-msgid "rooftop"
-msgstr "na dachu"
-
msgid "Capacity"
msgstr "Pojemność"
@@ -15414,20 +16154,36 @@ msgstr "Limit czasu (minuty)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Strzeżony"
-
msgid "Opening Hours"
msgstr "Godziny otwarcia"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Pon-Pt 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Wt-N 08:00-15:00;So 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Wjazd na parking"
@@ -15576,6 +16332,9 @@ msgstr "Stacja ładowania"
msgid "Edit Charging Station (for electric cars)"
msgstr "Edycja stacji ładowania (dla aut z elektrycznym napędem)"
+msgid "Voltage"
+msgstr "Napięcie"
+
msgid "Amperage"
msgstr "Natężenie"
@@ -15597,6 +16356,12 @@ msgstr "Warsztat samochodowy"
msgid "Edit Car Repair"
msgstr "Edycja warsztatu samochodowego"
+msgid "Parts"
+msgstr "Części"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Sklep z oponami"
@@ -15624,6 +16389,12 @@ msgstr "Wypożyczalnia"
msgid "Edit Car Rental"
msgstr "Edycja wypożyczalni samochodów"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Punkt carsharingu"
@@ -15648,22 +16419,6 @@ msgstr "Usługi:"
msgid "Sale"
msgstr "Sprzedaż"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "tak"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "markowe"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "używane"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "nie"
-
msgid "brand"
msgstr "marka"
@@ -15685,9 +16440,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Części"
-
msgid "Clothes"
msgstr "Odzież"
@@ -15740,7 +16492,7 @@ msgid "Free bicycle pump"
msgstr "Darmowe pompowanie rowerów"
msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
-msgstr ""
+msgstr "Narzędzia do własnej naprawy (może być pomoc innych)"
msgid "Bicycles are washed (for a fee)"
msgstr "mycie rowerów (za opłatą)"
@@ -15751,8 +16503,8 @@ msgstr "Edycja wypożyczalni rowerów"
msgid "Public Transport"
msgstr "Transport publiczny"
-msgid "Route"
-msgstr "Trasa"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Edytuj trasę"
@@ -15868,10 +16620,10 @@ msgid "Edit Stop Area"
msgstr "Edytowanie obszaru zatrzymania"
msgid "UIC reference"
-msgstr ""
+msgstr "Numer UIC"
msgid "UIC name"
-msgstr ""
+msgstr "Nazwa UIC"
msgid "Stop Position"
msgstr "Miejsce zatrzymania"
@@ -15882,6 +16634,9 @@ msgstr "Miejsce oczekiwania"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "Autobus"
@@ -15912,6 +16667,9 @@ msgstr ""
msgid "Ferry"
msgstr "Prom"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Ławka"
@@ -15924,9 +16682,6 @@ msgstr "Dla niepełnosprawnych"
msgid "limited"
msgstr "limitowane"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15936,8 +16691,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr "Stacja/dworzec/port"
+msgstr "Stacja kolejowa"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Edycja stacji kolejowej"
msgid "Building"
msgstr "Budynek"
@@ -15951,6 +16711,9 @@ msgstr "Edycja wejścia do metra"
msgid "Ticket Machine"
msgstr "Automat biletowy"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Numer identyfikacyjny"
@@ -15975,14 +16738,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr "Transport publiczny (przestarzałe)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Stacja kolejowa"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Edycja stacji kolejowej"
-
msgid "UIC-Reference"
msgstr "Numer UIC"
@@ -16031,8 +16786,8 @@ msgstr "Edycja peronu autobusowego"
msgid "Taxi"
msgstr "Postój taksówek"
-msgid "Edit Taxi station"
-msgstr "Edycja postoju taksówek"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Lotnisko"
@@ -16085,6 +16840,21 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Edycja terminalu"
+msgid "Internet access"
+msgstr "Dostęp do internetu"
+
+msgid "wlan"
+msgstr "bezprzewodowy"
+
+msgid "wired"
+msgstr "przewodowy"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Opłata za internet"
+
msgctxt "airport"
msgid "Gate"
msgstr "Brama"
@@ -16107,21 +16877,6 @@ msgstr "Edycja hotelu"
msgid "Stars"
msgstr "Gwiazdki"
-msgid "Internet access"
-msgstr "Dostęp do internetu"
-
-msgid "wlan"
-msgstr "bezprzewodowy"
-
-msgid "wired"
-msgstr "przewodowy"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Opłata za internet"
-
msgid "Smoking"
msgstr "Palenie"
@@ -16305,6 +17060,12 @@ msgstr "Klub nocny"
msgid "Edit Nightclub"
msgstr "Edycja klubu nocnego"
+msgid "Stripclub"
+msgstr "Klub ze stripteasem"
+
+msgid "Edit Stripclub"
+msgstr "Edycja klubu ze stripteasem"
+
msgid "Tourism"
msgstr "Turystyka"
@@ -16326,9 +17087,15 @@ msgstr "Wieża widokowa"
msgid "Information Office"
msgstr "Informacja turystyczna"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Szczegółowość"
@@ -16341,6 +17108,9 @@ msgstr "ulice"
msgid "scheme"
msgstr "schemat"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Obszar"
@@ -16380,6 +17150,9 @@ msgstr "...możliwe inne rodzaje transportu"
msgid "Information Board"
msgstr "Tablica informacyjna"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Zawartość"
@@ -16401,23 +17174,35 @@ msgstr "tablica botaniczna"
msgid "Guidepost"
msgstr "Drogowskaz"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Terminal informacyjny"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Opis"
msgid "Audioguide"
msgstr "Audioprzewodnik"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Audioprzewodnik dostępny przez telefon?"
msgid "Phone number"
msgstr "Numer telefonu"
-msgid "Other Information Points"
-msgstr "Inny punkt informacyjny"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Rozrywka"
@@ -16440,9 +17225,6 @@ msgstr "Wybieg dla psów"
msgid "Edit Dog Park"
msgstr "Edycja wybiegu dla psów"
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "ogrodzenie"
@@ -16467,8 +17249,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Edycja sauny"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Wt-Nd 08:00-15:00; So 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr "Dom publiczny"
+
+msgid "Edit Brothel"
+msgstr "Edycja domu publicznego"
msgid "Playground"
msgstr "Plac zabaw"
@@ -16540,50 +17331,44 @@ msgstr "Sztuka"
msgid "Edit Artwork"
msgstr "Edycja obiektu sztuki"
-msgid "Place of Worship"
-msgstr "Miejsce kultu religijnego"
+msgid "Recording Studio"
+msgstr "Studio nagrań"
-msgid "Edit Place of Worship"
-msgstr "Edycja miejsca kultu religijnego"
+msgid "Edit Studio"
+msgstr "Edycja studia nagrań"
-msgid "Religion"
-msgstr "Religia"
+msgid "audio"
+msgstr "audio"
-msgid "bahai"
-msgstr "bahaizm"
+msgid "video"
+msgstr "video"
-msgid "buddhist"
-msgstr "buddyzm"
+msgid "Place of Worship"
+msgstr "Miejsce kultu religijnego"
-msgid "christian"
-msgstr "chrześcijaństwo"
+msgid "Church"
+msgstr "Kościół"
-msgid "hindu"
-msgstr "hinduizm"
+msgid "Edit Church"
+msgstr ""
-msgid "jain"
-msgstr "dżinizm"
+msgid "Building type"
+msgstr ""
-msgid "jewish"
-msgstr "judaizm"
+msgid "basilica"
+msgstr ""
-msgid "muslim"
-msgstr "islam"
+msgid "cathedral"
+msgstr ""
-msgid "sikh"
-msgstr "sikhizm"
+msgid "chapel"
+msgstr ""
-msgid "spiritualist"
-msgstr "spirytualizm"
+msgid "church"
+msgstr "kościół"
-msgid "taoist"
-msgstr "taoizm"
-
-msgid "unitarian"
-msgstr "unitarianizm"
-
-msgid "zoroastrian"
-msgstr "zaratusztrianizm"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Wyznanie"
@@ -16595,11 +17380,17 @@ msgid "baptist"
msgstr "baptyści"
msgid "catholic"
-msgstr "kościół katolicki"
+msgstr "katolickie"
msgid "evangelical"
msgstr "ewangelikalizm"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "świadkowie Jehowy"
@@ -16612,6 +17403,9 @@ msgstr "metodyści"
msgid "mormon"
msgstr "mormoni"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "kościół prawosławny"
@@ -16627,38 +17421,141 @@ msgstr "protestanci"
msgid "quaker"
msgstr "kwakrzy"
+msgid "roman_catholic"
+msgstr "rzymskokatolickie"
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "Godziny nabożeństw"
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr "Meczet"
+
+msgid "Edit Mosque"
+msgstr "Edycja Meczetu"
+
+msgid "mosque"
+msgstr "meczet"
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "szyici"
msgid "sunni"
msgstr "sunnici"
-msgid "Service Times"
-msgstr "Godziny nabożeństw"
+msgid "Synagogue"
+msgstr "Synagoga"
-msgid "Su 10:00"
-msgstr "Nd 10:00"
+msgid "Edit Synagogue"
+msgstr "Edycja Synagogi"
-msgid "Su 10:30"
-msgstr "Nd 10:30"
+msgid "synagogue"
+msgstr "synagoga"
-msgid "Su 11:00"
-msgstr "Nd 11:00"
+msgid "conservative"
+msgstr "ortodoksyjna"
-msgid "Opening Hours for visiting"
-msgstr "Godziny otwarcia"
+msgid "reform"
+msgstr "reformowana"
-msgid "Recording Studio"
-msgstr "Studio nagrań"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Edycja studia nagrań"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "audio"
-msgstr "audio"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religia"
+
+msgid "bahai"
+msgstr "bahaizm"
+
+msgid "jain"
+msgstr "dżinizm"
+
+msgid "sikh"
+msgstr "sikhizm"
+
+msgid "spiritualist"
+msgstr "spirytualizm"
+
+msgid "taoist"
+msgstr "taoizm"
+
+msgid "unitarian"
+msgstr "unitarianizm"
+
+msgid "zoroastrian"
+msgstr "zaratusztrianizm"
msgid "Public Building"
msgstr "Budynek użyteczności publicznej"
@@ -16747,6 +17644,12 @@ msgstr "Edycja szkoły jazdy"
msgid "License Classes"
msgstr "Kategorie prawa jazdy"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Zdrowie"
@@ -16756,6 +17659,12 @@ msgstr "Szpital"
msgid "Edit Hospital"
msgstr "Edycja szpitala"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Lekarz"
@@ -16787,7 +17696,7 @@ msgid "Edit Pharmacy"
msgstr "Edycja apteki"
msgid "Dispensing"
-msgstr "realizacja recept"
+msgstr "Realizacja recept"
msgid "Hearing Aids"
msgstr "Aparaty słuchowe"
@@ -16822,12 +17731,66 @@ msgstr "Weterynarz"
msgid "Edit Veterinary"
msgstr "Edycja lecznicy weterynaryjnej"
-msgid "Note"
-msgstr "Uwagi"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "publiczny"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Skrzynka pocztowa"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefon"
@@ -16837,6 +17800,30 @@ msgstr "Edycja telefonu"
msgid "Telephone cards"
msgstr "na karty telefoniczne"
+msgid "Emergency Phone"
+msgstr "Telefon alarmowy"
+
+msgid "Internet Access"
+msgstr "Punkt dostępu do Internetu"
+
+msgid "Edit Internet Access"
+msgstr "Edytuj punkt dostępu do Internetu"
+
+msgid "Automated Defibrillator"
+msgstr "Defibrylator"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Edycja defibrylatora"
+
+msgid "Located inside a building?"
+msgstr "Wewnątrz budynku"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Zegar"
@@ -16846,31 +17833,37 @@ msgstr "Edycja zegaru"
msgid "Display"
msgstr "Wyświetlacz"
-msgctxt "display"
msgid "analog"
msgstr "analogowy"
-msgctxt "display"
msgid "digital"
msgstr "cyfrowy"
-msgctxt "display"
msgid "sundial"
msgstr "słoneczny"
-msgctxt "display"
msgid "unorthodox"
msgstr "niekonwencjonalny"
msgid "Support"
-msgstr ""
+msgstr "Podpora"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "słup"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "ścienny"
+msgstr "ściana"
+msgctxt "mounting/support"
msgid "billboard"
msgstr "billboard"
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "grunt"
+
msgid "Visibility/readability"
msgstr "Widoczność (czytelność)"
@@ -16896,25 +17889,25 @@ msgid "Shows humidity"
msgstr "Pokazuje wilgotność"
msgid "Recycling"
-msgstr "Zbiórka odpadów"
+msgstr "Punkt zbiórki odpadów"
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr "Edycja punktu zbiórki odpadów"
msgid "Batteries"
-msgstr "baterie"
+msgstr "Baterie"
msgid "Cans"
-msgstr "puszki"
+msgstr "Puszki"
msgid "Glass"
-msgstr "szkło"
+msgstr "Szkło"
msgid "Paper"
-msgstr "papier"
+msgstr "Papier"
msgid "Scrap Metal"
-msgstr "złom"
+msgstr "Złom"
msgid "container"
msgstr "pojemnik"
@@ -16925,27 +17918,15 @@ msgstr "ośrodek"
msgid "Waste Basket"
msgstr "Kosz na śmieci"
-msgid "Edit Waste Basket"
-msgstr "Edycja kosza na śmieci"
-
msgid "Waste Disposal"
msgstr "Kontener na śmieci"
-msgid "Edit Waste Disposal"
-msgstr "Edycja kontenera na śmieci"
+msgid "Edit Bench"
+msgstr "Edycja ławki"
msgid "Backrest"
msgstr "Oparcie"
-msgid "Material"
-msgstr "Materiał"
-
-msgid "stone"
-msgstr "kamień"
-
-msgid "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr "Pojemność"
@@ -16957,15 +17938,15 @@ msgstr "Rodzaj schronienia"
msgctxt "shelter"
msgid "weather_shelter"
-msgstr ""
+msgstr "przeciwpogodowy"
msgctxt "shelter"
msgid "public_transport"
-msgstr "transport publiczny"
+msgstr "wiata przystankowa"
msgctxt "shelter"
msgid "picnic_shelter"
-msgstr ""
+msgstr "piknikowa"
msgctxt "shelter"
msgid "wildlife_hide"
@@ -16980,14 +17961,17 @@ msgstr "Edycja ambony strzelniczej"
msgid "Height"
msgstr "Wysokość"
+msgctxt "height"
msgid "low"
-msgstr "niska"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "połowiczna"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "pełna"
+msgstr ""
msgid "Hide"
msgstr "Ukryj"
@@ -16995,11 +17979,11 @@ msgstr "Ukryj"
msgid "Lock"
msgstr "Zablokuj"
-msgid "Drinking Water"
-msgstr "Woda do picia"
+msgid "Edit Source of Potable Water"
+msgstr "Edycja wody do picia"
-msgid "Edit Drinking Water"
-msgstr "Edycja punktu z wodą pitną"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Hydrant"
@@ -17021,11 +18005,14 @@ msgstr "ścienny"
msgctxt "pipeline"
msgid "pond"
-msgstr ""
+msgstr "z jeziora (suchy)"
msgid "Diameter (in mm)"
msgstr "Średnica (w mm)"
+msgid "Hydrant Position"
+msgstr "Położenie"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "jezdnia"
@@ -17046,10 +18033,10 @@ msgid "Pressure (in bar)"
msgstr "Ciśnienie (w barach)"
msgid "suction"
-msgstr ""
+msgstr "ssanie"
msgid "Count"
-msgstr ""
+msgstr "Liczba"
msgid "Sports"
msgstr "Sport"
@@ -17063,119 +18050,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Edycja stadionu"
-msgid "select sport:"
-msgstr "wybierz sport:"
+msgid "Select sport:"
+msgstr "Wybierz sport:"
-msgid "sport"
+msgid "Sport"
msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "różne sporty"
+msgstr "wielofunkcyjne"
+msgctxt "sport"
msgid "archery"
msgstr "łucznictwo"
+msgctxt "sport"
msgid "athletics"
msgstr "lekkoatletyka"
+msgctxt "sport"
msgid "american_football"
msgstr "futbol amerykański"
+msgctxt "sport"
msgid "australian_football"
-msgstr "futbol australijski"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "Koszykówka"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "bule"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "gra w kule"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "futbol kanadyjki"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kajakarstwo"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "wspinaczka"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "krykiet"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "krykiet"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "krokiet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "kolarstwo"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "wyścigi psów"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "jazda konna"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gimnastyka"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hokej"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "wyścigi konne"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "sporty motorowe"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "sport rakietowy"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "rugby_league"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "rugby_union"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "strzelectwo"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "jazda na deskorolce"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "łyżwiarstwo"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "narciarstwo"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "piłka nożna"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "pływanie"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "tenis stołowy"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenis"
+msgstr ""
msgid "Sports Centre"
msgstr "Centrum sportowe"
@@ -17207,33 +18230,43 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Edycja minigolfa"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Różne sporty"
msgid "Edit Multi"
msgstr "Edycja różnych sportów"
-msgid "type"
-msgstr "rodzaj"
-
+msgctxt "running"
msgid "pitch"
msgstr "boisko"
+msgctxt "running"
msgid "sports_centre"
msgstr "centrum sportowe"
+msgctxt "running"
msgid "stadium"
msgstr "stadion"
+msgctxt "running"
+msgid "track"
+msgstr "tor"
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "boisko"
+
+msgid "sports_centre"
+msgstr "centrum sportowe"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr "Kręgle"
@@ -17267,6 +18300,22 @@ msgstr "Edycja kajakarstwa"
msgid "Edit Cycling"
msgstr "Edycja jazdy na rowerze"
+msgctxt "racing"
+msgid "pitch"
+msgstr "boisko"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "centrum sportowe"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "stadion"
+
+msgctxt "racing"
+msgid "track"
+msgstr "tor"
+
msgid "Dog Racing"
msgstr "Wyścigi psów"
@@ -17279,8 +18328,33 @@ msgstr "Jeździectwo"
msgid "Edit Equestrian"
msgstr "Edycja jeździectwa"
-msgid "horse_riding"
-msgstr "jazda konno"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "Błoto"
msgid "Horse Racing"
msgstr "Wyścigi konne"
@@ -17298,7 +18372,7 @@ msgid "Skating"
msgstr "Łyżwiarstwo"
msgid "Edit Skating"
-msgstr "Edycja łyżwiarstwa"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -17342,36 +18416,54 @@ msgstr ""
msgid "Difficulty"
msgstr "Poziom trudności"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "dla początkujących"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "łatwa"
+msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "zaawansowana"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "dla ekspertów"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17414,19 +18506,15 @@ msgstr "Gry gaelickie"
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Piłka nożna"
+msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17565,6 +18653,18 @@ msgstr "Lotnisko dla modeli"
msgid "Edit Model Aerodrome"
msgstr "Edycja lotniska dla modeli"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "Zdalnie sterowane samochody"
@@ -17577,59 +18677,133 @@ msgstr "Obiekty sztuczne"
msgid "Edit Building"
msgstr "Edycja budynku"
+msgctxt "building"
+msgid "yes"
+msgstr "tak"
+
+msgctxt "building"
msgid "roof"
-msgstr "zadaszony"
+msgstr "zadaszenie"
+msgctxt "building"
msgid "garage"
msgstr "garaż"
-msgid "church"
-msgstr "kościół"
+msgctxt "building"
+msgid "garages"
+msgstr "garaże"
+msgctxt "building"
+msgid "industrial"
+msgstr "budynek przemsylowy"
+
+msgctxt "building"
msgid "school"
msgstr "szkoła"
+msgctxt "building"
msgid "hangar"
msgstr "hangar"
+msgctxt "building"
msgid "commercial"
-msgstr "działalność komercyjna"
+msgstr "biura i usługi"
+msgctxt "building"
msgid "farm"
-msgstr "ferma"
+msgstr "budynek na farmie"
+msgctxt "building"
msgid "transportation"
-msgstr "transport"
+msgstr "budynek transportu i łączności"
+msgctxt "building"
msgid "greenhouse"
msgstr "szklarnia"
+msgctxt "building"
msgid "office"
msgstr "biurowiec"
+msgctxt "building"
msgid "university"
msgstr "uniwersytet"
+msgctxt "building"
+msgid "hospital"
+msgstr "szpital"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "magazyn"
+
+msgctxt "building"
+msgid "retail"
+msgstr "budynek handlu"
+
+msgctxt "building"
+msgid "shed"
+msgstr "szopa"
+
msgid "Residential Building"
msgstr "Budynek mieszkalny"
msgid "Edit Residential Building"
msgstr "Edycja budynku mieszkalnego"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "wielorodzinny"
+msgstr "apartament"
+msgctxt "building"
msgid "house"
msgstr "dom"
+msgctxt "building"
msgid "hut"
msgstr "chata"
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
-msgstr "szeregowiec"
+msgstr "szeregówka"
+msgctxt "building"
msgid "detached"
-msgstr "dom jednorodzinny"
+msgstr "jednorodzinny"
+
+msgid "Entrance"
+msgstr "Wejście"
+
+msgid "Edit Entrance"
+msgstr "Edycja wejścia"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "tak"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "główne"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "serwisowe"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "wyjście"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "awaryjne"
msgid "Tower"
msgstr "Wieża"
@@ -17646,9 +18820,6 @@ msgstr "komunikacyjna"
msgid "observation"
msgstr "obserwacyjna"
-msgid "Height (meters)"
-msgstr "Wysokość (metry)"
-
msgid "Flagpole"
msgstr "Maszt (dla flagi)"
@@ -17683,7 +18854,7 @@ msgid "Edit Pipeline"
msgstr "Edycja rurociągu"
msgid "water"
-msgstr "woda"
+msgstr "wodny"
msgid "gas"
msgstr "gazowy"
@@ -17702,11 +18873,11 @@ msgstr "Położenie"
msgctxt "pipeline"
msgid "underwater"
-msgstr "podwodą"
+msgstr "podwodny"
msgctxt "pipeline"
msgid "overground"
-msgstr "nad ziemią"
+msgstr "naziemny"
msgid "Crane"
msgstr "Dźwig"
@@ -17858,72 +19029,188 @@ msgstr "Czas działania"
msgid "Mo-Fr 22:00-05:00"
msgstr "Pon-Pt 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Stacja pomiaru"
+msgid "Monitoring Station"
+msgstr "Stacja pomiarowa"
-msgid "Edit Measurement Station"
-msgstr "Edycja stacji pomiaru"
+msgid "Edit Monitoring Station"
+msgstr "Edycja stacji pomiarowej"
-msgid "Measurement"
-msgstr "Pomiar"
+msgid "Monitoring:"
+msgstr "Monitoring"
-msgid "particulate_matter"
-msgstr "pyłu"
+msgid "Weather"
+msgstr "Pogoda"
-msgid "seismic"
-msgstr "sejsmiczny"
+msgid "Water level"
+msgstr "Poziom wody"
-msgid "water_level"
-msgstr "poziom wody"
+msgid "Tide Level"
+msgstr "Pływy"
-msgid "weather"
-msgstr "pogoda"
+msgid "Traffic"
+msgstr "Ruch uliczny"
-msgid "Recording"
-msgstr "Zapisywanie"
+msgid "Air Quality"
+msgstr "Jakość powietrza"
-msgid "manually"
-msgstr "ręcznie"
+msgid "Noise"
+msgstr "Głośność"
-msgid "automated"
-msgstr "automatycznie"
+msgid "GPS Signals"
+msgstr "Sygnały GPS"
-msgid "remote"
-msgstr "zdalnie"
+msgid "GLONASS Signals"
+msgstr "Sygnały GLONASS"
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr "Sygnały Galileo"
+
+msgid "Radiation"
+msgstr "Promieniowanie"
+
+msgid "Seismic Activity"
+msgstr "Aktywność sejsmiczna"
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
+
+msgid "Survey Point"
+msgstr "Punkt geodezyjny"
+
+msgid "Edit Survey Point"
+msgstr "Edycja punktu geodezyjnego"
+
+msgid "Surveillance Camera"
+msgstr ""
+
+msgid "Edit Surveillance Camera"
+msgstr "Edycja kamery do monitoringu"
+
+msgid "indoor"
+msgstr "wewnętrzny"
+
+msgid "outdoor"
+msgstr "zewnętrzny"
+
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "sklep"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
msgstr ""
-msgid "Survey Point"
-msgstr "Punkt geodezyjny"
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Wysokość (m)"
+
+msgid "Power"
+msgstr "Energetyka"
+
+msgid "Power Plant"
+msgstr "Elektrownia"
+
+msgid "Edit Power Plant"
+msgstr "Edycja elektrowni"
+
+msgid "Start date"
+msgstr "Data uruchomienia"
+
+msgid "Output forms of energy"
+msgstr "Nośniki energii"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "energia elektryczna"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
-msgid "Edit Survey Point"
-msgstr "Edycja punktu geodezyjnego"
+msgid "hot water"
+msgstr "gorąca woda"
-msgid "Surveillance"
-msgstr "Monitoring"
+msgid "hot air"
+msgstr "gorące powietrze"
-msgid "Edit Surveillance Camera"
-msgstr "Edycja kamery do monitoringu"
+msgid "cold water"
+msgstr "zimna woda"
-msgid "indoor"
-msgstr "wewnętrzny"
+msgid "cold air"
+msgstr "zimne powietrze"
-msgid "outdoor"
-msgstr "zewnętrzny"
+msgid "compressed air"
+msgstr "sprężone powietrze"
-msgid "public"
-msgstr "publiczny"
+msgid "steam"
+msgstr "para wodna"
-msgid "Power"
-msgstr "Energetyka"
+msgid "vacuum"
+msgstr "próżnia"
msgid "Power Generator"
-msgstr "Elektrownia"
+msgstr "Generator elektryczny"
msgid "Edit Power Generator"
-msgstr "Edycja elektowni"
+msgstr "Edycja generatora elektrycznego"
msgid "biofuel"
msgstr "biopaliwo"
@@ -17959,7 +19246,7 @@ msgid "tidal"
msgstr ""
msgid "waste"
-msgstr ""
+msgstr "spalarnia"
msgid "wave"
msgstr ""
@@ -17970,89 +19257,192 @@ msgstr "wiatrowa"
msgid "Method"
msgstr "Metoda"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "fermentacja beztlenowa"
+msgstr ""
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+msgctxt "generator method"
msgid "combustion"
-msgstr "spalanie"
+msgstr ""
-msgid "dam"
-msgstr "tama z turbiną wodną"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "rozszczepienie jądra atomowego"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "fuzja jądrowa"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
-msgstr "gazyfikacja"
-
-msgid "photovoltaic"
-msgstr "fotowoltaiczna"
+msgstr ""
-msgid "pumped-storage"
-msgstr "elektrownia szczytowo-pompowa"
+msgid "biomass / waste"
+msgstr ""
-msgid "pumping"
-msgstr "pompowanie (np. woda geotermalna)"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "pyroliza"
+msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "turbina wodna (bez spiętrzenia wody)"
+msgstr ""
+
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+msgctxt "generator method"
msgid "thermal"
-msgstr "termiczna (np. kolektory słoneczne)"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "Nośniki energii"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "electricity"
-msgstr "energia elektryczna"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "gorąca woda"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "gorące powietrze"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "zimna woda"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "zimne powietrze"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "sprężone powietrze"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "para wodna"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "próżnia"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr "fuzja jądrowa"
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr "rozszczepienie jadra atomowego"
-msgid "battery charging"
-msgstr "ładowanie akumulatora"
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
-msgid "Power Station"
-msgstr "Rozdzielnia elektryczna"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Edycja rozdzielni elektrycznej"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Stacja transformatorowa"
@@ -18063,6 +19453,21 @@ msgstr "Edycja stacji transformatorowej"
msgid "Line reference"
msgstr "Oznaczenie linii"
+msgid "high"
+msgstr "wysoki"
+
+msgid "medium"
+msgstr "średni"
+
+msgid "low"
+msgstr "niski"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "Rozdzielcza skrzynka elektryczna"
@@ -18078,6 +19483,9 @@ msgstr "Edycja słupa wysokiego napięcia"
msgid "Tower reference"
msgstr "Numer referencyjny"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Słup"
@@ -18096,13 +19504,11 @@ msgstr "Edycja linii elektrycznej"
msgid "Line type"
msgstr "Rodzaj linii"
-msgctxt "Power Line"
msgid "line"
-msgstr "wysokie napięcie"
+msgstr "linia"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "średnie napięcie"
+msgstr "linia drugorzędna"
msgid "Amount of Cables"
msgstr "Liczba kabli"
@@ -18209,14 +19615,14 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Edycja kiosku"
-msgid "Baker"
+msgid "Bakery"
msgstr "Piekarnia"
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr "Edycja piekarni"
msgid "Butcher"
-msgstr "Rzeźnik"
+msgstr "Sklep mięsny"
msgid "Edit Butcher"
msgstr "Edycja sklepu mięsnego"
@@ -18224,7 +19630,7 @@ msgstr "Edycja sklepu mięsnego"
msgid "Seafood"
msgstr "Sklep rybny"
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr "Edycja sklepu rybnego"
msgid "Deli (Fine Food)"
@@ -18245,26 +19651,32 @@ msgstr "Plac targowy"
msgid "Edit Marketplace"
msgstr "Edycja placu targowego"
+msgid "Organic"
+msgstr "Naturalna żywność"
+
msgid "Greengrocer"
msgstr "Sklep warzywny"
msgid "Edit Greengrocer"
msgstr "Edycja sklepu warzywnego"
-msgid "Organic"
-msgstr "Naturalna żywność"
+msgid "Farm Stand"
+msgstr "Stoisko gospodarstwa rolnego"
+
+msgid "Edit Farm Stand"
+msgstr "Edycja stoiska gospodarstwa rolnego"
msgid "Edit Organic/Bio"
-msgstr ""
+msgstr "Edycja sklepu z naturalną żywnością"
msgid "Organic/Bio"
-msgstr ""
+msgstr "Naturalna żywność"
msgid "Fair Trade"
msgstr "Sprawiedliwy handel"
msgid "Edit Fair Trade"
-msgstr "Modyfikuj sprawiedliwy handel"
+msgstr "Edytuj sprawiedliwy handel"
msgid "Alcohol"
msgstr "Sklep monopolowy"
@@ -18323,8 +19735,8 @@ msgstr "Edycja krawca"
msgid "Fabric"
msgstr "Tkaniny"
-msgid "Edit Fabric"
-msgstr "Edycja sklepu z tkaninami"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronika"
@@ -18344,14 +19756,14 @@ msgstr "Edycja sklepu elektronicznego"
msgid "Mobile Phone"
msgstr "Sklep z telefonami komórkowymi"
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr "Edycja sklepu z telefonami komórkowymi"
msgid "Vacuum Cleaner"
msgstr "Sklep z odkurzaczami"
-msgid "Edit Vacuum Cleaner"
-msgstr "Edycja sklepu z odkurzaczami"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Sklep ze sprzętem hi-fi"
@@ -18359,9 +19771,8 @@ msgstr "Sklep ze sprzętem hi-fi"
msgid "Edit Hifi Shop"
msgstr "Edycja sklepu ze sprzętem hi-fi"
-msgctxt "shop"
msgid "Video"
-msgstr "Wypożyczalnia wideo"
+msgstr "Wideo"
msgid "Edit Video Shop"
msgstr "Edycja wypożyczalni wideo"
@@ -18387,6 +19798,12 @@ msgstr "Edycja kantoru"
msgid "Edit Automated Teller Machine"
msgstr "Edycja bankomatu"
+msgid "Pawnbroker"
+msgstr "Lombard"
+
+msgid "Edit Pawnbroker"
+msgstr "Edycja lombardu"
+
msgid "Department Store"
msgstr "Dom towarowy"
@@ -18423,11 +19840,32 @@ msgstr "Jubiler"
msgid "Edit Jewelry"
msgstr "Edycja jubilera"
+msgid "Gift"
+msgstr "Prezent/Podarunek"
+
+msgid "Edit Gift Shop"
+msgstr "Edycja sklepu z prezentami/podarunkami"
+
+msgid "buddhist"
+msgstr "buddyzm"
+
+msgid "christian"
+msgstr "chrześcijaństwo"
+
+msgid "hindu"
+msgstr "hinduizm"
+
+msgid "jewish"
+msgstr "judaizm"
+
+msgid "muslim"
+msgstr "islam"
+
msgid "Erotic"
msgstr "Artykuły erotyczne"
-msgid "Edit Erotic"
-msgstr "Edycja klepu z artykułami erotycznymi"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Kwiaciarnia"
@@ -18456,8 +19894,8 @@ msgstr "Edycja sklepu z narzędziami"
msgid "Paint"
msgstr "Sklep z farbami"
-msgid "Edit Paint"
-msgstr "Edycja sklepu z farbami"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Sklep meblowy"
@@ -18468,26 +19906,26 @@ msgstr "Edycja sklepu meblowego"
msgid "Kitchen"
msgstr "Akcesoria kuchenne"
-msgid "Edit Kitchen"
-msgstr "Edycja sklepu z akcesoriami kuchennymi"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Sklep z zasłonami"
-msgid "Edit Curtain"
-msgstr "Edycja sklepu z zasłonami, firankami"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Sklep z ramami do obrazów"
-msgid "Edit Frames"
-msgstr "Edycja sklepu z ramami do obrazów, zdjęć"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
-msgstr "Sklep z artykułami biurowymi"
+msgstr "Sklep papierniczy"
msgid "Edit Stationery Shop"
-msgstr "Edycja sklepu z artykułami biurowymi"
+msgstr "Edycja sklepu papierniczego"
msgid "Copyshop"
msgstr "Punkt ksero"
@@ -18501,6 +19939,12 @@ msgstr "Księgarnia"
msgid "Edit Book Store"
msgstr "Edycja księgarni"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Biuro podróży"
@@ -18510,8 +19954,8 @@ msgstr "Edycja biura podróży"
msgid "Musical Instrument"
msgstr "Sklep muzyczny"
-msgid "Edit Musical Instruments"
-msgstr "Edycja sklepu z instrumentami"
+msgid "Edit Musical Instruments Shop"
+msgstr "Edycja sklepu muzycznego"
msgid "Toys"
msgstr "Sklep z zabawkami"
@@ -18591,6 +20035,9 @@ msgstr "zabawki"
msgid "vouchers"
msgstr "vouchery"
+msgid "Note"
+msgstr "Uwagi"
+
msgid "Geography"
msgstr "Geografia"
@@ -18720,6 +20167,12 @@ msgstr "Wzgórze"
msgid "Edit Peak"
msgstr "Edycja wzgórza"
+msgid "Saddle"
+msgstr "Przełęcz"
+
+msgid "Edit Saddle"
+msgstr "Edycja przełęczy"
+
msgid "Glacier"
msgstr "Lodowiec"
@@ -18759,24 +20212,33 @@ msgstr "Drzewo"
msgid "Edit Tree"
msgstr "Edycja drzewa"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Nazwa systematyczna"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Las pierwotny"
msgid "Edit Wood"
msgstr "Edycja lasu pierwotnego"
-msgctxt "wood"
msgid "coniferous"
msgstr "iglasty"
-msgctxt "wood"
msgid "deciduous"
-msgstr "liścisty"
+msgstr "liściasty"
-msgctxt "wood"
msgid "mixed"
msgstr "mieszany"
@@ -18786,15 +20248,6 @@ msgstr "Las"
msgid "Edit Forest Landuse"
msgstr "Edycja lasu"
-msgid "coniferous"
-msgstr "iglasty"
-
-msgid "deciduous"
-msgstr "liściasty"
-
-msgid "mixed"
-msgstr "mieszany"
-
msgid "Grassland"
msgstr ""
@@ -18870,6 +20323,12 @@ msgstr "Łąka"
msgid "Edit Meadow Landuse"
msgstr "Edycja łąki"
+msgid "Orchard"
+msgstr "Sad"
+
+msgid "Edit Orchard Landuse"
+msgstr "Edycja zagospodarowania terenu jako sad"
+
msgid "Vineyard"
msgstr "Winnica"
@@ -18924,8 +20383,8 @@ msgstr "Teren rekreacyjny"
msgid "Edit Recreation Ground Landuse"
msgstr "Edycja terenu rekreacyjnego"
-msgid "Residential area"
-msgstr "Zabudowa mieszkaniowa"
+msgid "Residential Area"
+msgstr "Zabudowa mieszkalna"
msgid "Edit Residential Landuse"
msgstr "Edycja zabudowy mieszkaniowej"
@@ -18936,6 +20395,9 @@ msgstr "Cmentarz przykościelny"
msgid "Edit Graveyard"
msgstr "Edycja cmentarza przykościelnego"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cmentarz"
@@ -19011,47 +20473,50 @@ msgstr "Edycja komieniołomu"
msgid "Annotation"
msgstr "Adnotacja"
-msgid "Edit Address Information"
-msgstr "Edycja informacji o adresach"
+msgid "Edit Name Information"
+msgstr ""
-msgid "House number"
-msgstr "Numer domu"
+msgid "Alternative name"
+msgstr "Alternatywna nazwa"
-msgid "House name"
-msgstr "Nazwa domu"
+msgid "Historical name"
+msgstr "Nazwa historyczna"
-msgid "Street name"
-msgstr "Nazwa ulicy"
+msgid "Local name"
+msgstr "Lokalna nazwa"
-msgid "City name"
-msgstr "Nazwa miejscowości"
+msgid "Regional name"
+msgstr "Nazwa regionalna"
-msgid "Country code"
-msgstr "Kod kraju"
+msgid "National name"
+msgstr ""
-msgid "AT"
-msgstr "AT"
+msgid "International name"
+msgstr "Międzynarodowa nazwa"
-msgid "CH"
-msgstr "CH"
+msgid "Official name"
+msgstr "Oficjalna nazwa"
-msgid "DE"
-msgstr "DE"
+msgid "Common name abbreviation"
+msgstr "Najpopularniejsze odmiany nazwy"
-msgid "FR"
-msgstr "FR"
+msgid "Edit Address Information"
+msgstr "Edycja informacji o adresach"
+
+msgid "House number"
+msgstr "Numer domu"
-msgid "GB"
-msgstr "GB"
+msgid "House name"
+msgstr "Nazwa domu"
-msgid "IT"
-msgstr "IT"
+msgid "Street name"
+msgstr "Nazwa ulicy"
-msgid "RS"
-msgstr ""
+msgid "City name"
+msgstr "Nazwa miejscowości"
-msgid "US"
-msgstr "US"
+msgid "Country code"
+msgstr "Kod kraju"
msgid "Address Interpolation"
msgstr "Interpolacja adresów"
@@ -19071,6 +20536,18 @@ msgstr "parzyste"
msgid "alphabetic"
msgstr "alfabetycznie"
+msgid "Accuracy"
+msgstr "Dokładność"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Kontakt (powszechny schemat)"
@@ -19233,26 +20710,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr "sygnalizacja świetlna lub inna bariera"
-msgid "Route (legacy)"
-msgstr "Trasa (przestarzałe)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
-msgid "Edit Route (legacy)"
-msgstr "Edycja trasy (przestarzałe)"
+msgctxt "route type"
+msgid "bus"
+msgstr "autobus"
+msgctxt "route type"
msgid "road"
-msgstr "droga"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr "prom"
+msgctxt "route type"
msgid "ski"
-msgstr "narciarska"
+msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr "piesza"
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
-msgstr "objazd"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Opis symboli"
@@ -19299,20 +20805,23 @@ msgstr "punkt zatrzymania na odcinku docelowym"
msgid "backward halt point"
msgstr "punkt zatrzymania na odcinku powrotnym"
-msgid "Route network"
-msgstr "Sieć trasy"
+msgid "Route Network"
+msgstr "Sieć Połączeń"
-msgid "Edit route network"
-msgstr "Edycja sieci trasy"
+msgid "Edit Route Network"
+msgstr "Edycja Sieci Połączeń"
msgid "member"
msgstr "członek"
-msgid "Associated street"
-msgstr "Skojarzone ulice"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Edycja skojarzonych ulic"
+msgid "house"
+msgstr "dom"
msgid "Street"
msgstr "Ulica"
@@ -19335,8 +20844,8 @@ msgstr ""
msgid "Destination sign"
msgstr "Drogowskaz"
-msgid "Edit Destination sign"
-msgstr "Edycja drogowskazu"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "Cel podróży na znaku (bez odległości)"
@@ -19431,18 +20940,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "most"
msgid "deprecated"
msgstr "przestarzały"
+msgid "bicycle"
+msgstr "rowery"
+
+msgid "foot"
+msgstr "piesza"
+
msgid "horse"
msgstr "jazda konna"
@@ -19452,8 +20970,11 @@ msgstr "bariera"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "droga gruntowa"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "serwis"
@@ -19461,10 +20982,10 @@ msgstr "serwis"
msgid "ford"
msgstr "bród"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19482,6 +21003,9 @@ msgstr "bystrze"
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19497,28 +21021,28 @@ msgstr "stare szyny kolejowe"
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -19539,20 +21063,20 @@ msgstr "marina"
msgid "amenity"
msgstr "udogodnienie"
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "zdrowie"
-msgid "shop"
-msgstr "sklep"
+msgid "office"
+msgstr "biurowiec"
msgid "hotel"
msgstr "hotel"
@@ -19588,7 +21112,7 @@ msgid "brownfield"
msgstr "teren poprzemysłowy"
msgid "greenfield"
-msgstr "Teren nie zabudowany"
+msgstr "Teren niezabudowany"
msgid "railland"
msgstr "Teren kolejowy"
@@ -19617,9 +21141,6 @@ msgstr "wrzosowisko"
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "Błoto"
-
msgid "beach"
msgstr "Plaża"
@@ -19629,10 +21150,13 @@ msgstr "droga"
msgid "boundary"
msgstr "granica"
+msgid "sport"
+msgstr "Sport"
+
msgid "place"
msgstr "Miejsce"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19647,9 +21171,6 @@ msgstr "Miasto"
msgid "One Way"
msgstr "Jednokierunkowa"
-msgid "Church"
-msgstr "Kościół"
-
msgid "Fuel Station"
msgstr "Stacja benzynwa"
@@ -19672,11 +21193,14 @@ msgid "oneway tag on a node"
msgstr ""
msgid "bridge tag on a node"
-msgstr ""
+msgstr "tag bridge użyty na węźle"
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19702,7 +21226,7 @@ msgid "barrier used on a way"
msgstr ""
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "maxspeed użyte dla footway"
msgid "layer tag with + sign"
msgstr ""
@@ -19714,7 +21238,7 @@ msgid "relation without type"
msgstr ""
msgid "restaurant without name"
-msgstr ""
+msgstr "restauracja bez wpisanej nazwy"
msgid "unusual tag combination (highway & waterway)"
msgstr ""
@@ -19722,10 +21246,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19737,7 +21291,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19755,7 +21309,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19872,19 +21426,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:addr without addr:*"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:date without source"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:name without name"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19902,21 +21567,61 @@ msgstr ""
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"nie wprowadzono języka wikipedii, użyj \"wikipedia\"=\"język:tytuł strony\""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr "wprowadzona warstwa powinna być pomiędzy -5 a 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
-msgstr "Satelita Yahoo"
+msgstr ""
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr ""
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
msgid "MapBox Satellite"
msgstr ""
@@ -19924,20 +21629,26 @@ msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -19945,142 +21656,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Ulice NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
+msgstr ""
+
+msgid "Geoimage.at MaxRes"
+msgstr ""
+
+msgid "basemap.at"
+msgstr ""
+
+msgid "Graz: Basiskarte (base map)"
+msgstr ""
+
+msgid "Tiris: DGM (Terrain model)"
+msgstr ""
+
+msgid "Tiris: DOM (Surface model)"
+msgstr ""
+
+msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgstr ""
+
+msgid "Vienna: Beschriftungen (annotations)"
+msgstr ""
+
+msgid "Vienna: Orthofoto (aerial image)"
+msgstr ""
+
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr ""
+
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr ""
+
+msgid "VoGIS: DGM (Terrain model)"
+msgstr ""
+
+msgid "VoGIS: DOM (Surface model)"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "Geobase Hydrography"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "Geobase Roads"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "Canvec"
+msgid "Hike & Bike"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "OpenStreetMap (Sorbian Language)"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "OpenStreetMap (German Language)"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "OpenPT Map (overlay)"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Hamburg (40 cm)"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Hamburg (DK5)"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Bavaria (2 m)"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "Czechy CUZK:KM"
-
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czechy UHUL:ORTOFOTO"
+msgid "Stuttgart (Luftbild)"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Physical DE - Physische Karte (Naturräume)"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -20096,16 +21856,16 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Włochy"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sycylia - Włochy"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Włochy"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
@@ -20119,46 +21879,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -20179,76 +21942,106 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "MassGIS L3 Parcels"
+msgstr ""
+
+msgid "NC 2010 Orthoimagery"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
+
+msgid "Surrey Air Survey"
+msgstr ""
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr ""
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr ""
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
msgid "OS 1:25k historic (OSM)"
@@ -20257,12 +22050,42 @@ msgstr ""
msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
+
+msgid "OSM Export"
+msgstr ""
+
+msgid "Export traffic data to SUMO network file."
+msgstr ""
+
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
+msgstr ""
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "odśwież listę portów"
+
+msgid "Configure"
+msgstr "Konfiguruj"
+
+msgid "Connection Error."
+msgstr "Błąd połączenia."
+
+msgid "configure the connected DG100"
msgstr ""
+msgid "delete data after import"
+msgstr "usuń dane po imporcie"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20464,6 +22287,18 @@ msgstr "Pokazuje profil wysokości"
msgid "Elevation Profile"
msgstr "Profil Wysokości"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr "Otwórz okno z profilem wysokości"
@@ -20485,13 +22320,7 @@ msgstr ""
msgid "Time"
msgstr "Czas"
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20758,7 +22587,13 @@ msgstr "Zaznacz niekompletne adresy"
msgid "Selects all addresses with incomplete data."
msgstr "Zaznacza wszystkie adresy z niekompletnymi danymi."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Użyj tagu 'addr:street' albo 'addr:place'"
+
msgid "House Number Editor"
+msgstr "Edytor numerów domów"
+
+msgid "House number increment:"
msgstr ""
msgid "Updating properties of up to {0} object"
@@ -20786,6 +22621,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Właściwości warstwy"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "Importuj obraz"
@@ -20864,9 +22702,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20951,7 +22801,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -21222,15 +23072,6 @@ msgstr "Numer budynku:"
msgid "Street Name:"
msgstr "Nazwa ulicy:"
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -21253,16 +23094,16 @@ msgid "Set buildings size"
msgstr "Ustaw wielkość budynków"
msgid "Use Address dialog"
-msgstr ""
+msgstr "Używaj okna wprowadzania adresu"
msgid "Auto-select building"
-msgstr ""
+msgstr "Automatycznie zaznaczaj budynek"
msgid "Use address nodes under buildings"
-msgstr ""
+msgstr "Używaj węzłów adresowych pod budynkami"
msgid "Buildings width:"
-msgstr "Szekokość:"
+msgstr "Szerokość:"
msgid "Length step:"
msgstr ""
@@ -21401,6 +23242,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21411,28 +23255,22 @@ msgid "off"
msgstr ""
msgid "25 m"
-msgstr ""
-
-msgid "50 m"
-msgstr ""
-
-msgid "100 m"
-msgstr ""
-
-msgid "high"
-msgstr ""
+msgstr "25 m"
-msgid "medium"
-msgstr ""
+msgid "50 m"
+msgstr "50 m"
+
+msgid "100 m"
+msgstr "100 m"
msgid "symbol"
msgstr ""
msgid "parcel"
-msgstr ""
+msgstr "działka"
msgid "parcel number"
-msgstr ""
+msgstr "numer działki"
msgid "locality"
msgstr "okolica"
@@ -21503,10 +23341,10 @@ msgid "Nearest-Neighbor (fastest) [ Default ]"
msgstr ""
msgid "Bilinear (fast)"
-msgstr ""
+msgstr "Bilinear (szybki)"
msgid "Bicubic (slow)"
-msgstr ""
+msgstr "Bicubic (wolny)"
msgid "Vector images grab multiplier:"
msgstr ""
@@ -21560,6 +23398,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21577,6 +23418,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Dodać \"source=...\" do elementów?"
@@ -21587,7 +23431,7 @@ msgid "Contacting WMS Server..."
msgstr "Łączenie z serwerem WMS..."
msgid "Create buildings"
-msgstr ""
+msgstr "Tworzenie budynków"
msgid ""
"To avoid cadastre WMS overload,\n"
@@ -21656,48 +23500,8 @@ msgid ""
"This image contains georeference data.\n"
"Do you want to use them ?"
msgstr ""
-
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Ostrzeżenie: zweryfikuj północ ze strzałką !!)"
-
-msgid "East"
-msgstr "Wschód"
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
+"Ten obraz zawiera georeferencjonowane dane.\n"
+"Czy chcesz ich użyć ?"
msgid "Load layer from cache"
msgstr ""
@@ -21751,20 +23555,78 @@ msgstr "Dodaj nową warstwę"
msgid "Open Cadastre Preferences"
msgstr ""
-msgid "Reset cookie"
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
msgstr ""
+msgid "Reset cookie"
+msgstr "Resetuj ciasteczka"
+
msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Save image as PNG"
-msgstr "Zapisz obraz jako PNG"
+msgid "Save image as..."
+msgstr ""
msgid "PNG files (*.png)"
msgstr "pliki PNG (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Eksportuj jako format PNG (tylko obrazy rastrowe)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Czy chcesz anulować całkowicie\n"
+"czy powtórzyć? "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Ostrzeżenie: zweryfikuj północ ze strzałką !!)"
+
+msgid "East"
+msgstr "Wschód"
+
+msgid "I use the mouse"
+msgstr "Używam myszki"
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
msgid "Adjust WMS"
msgstr "Dopasuj WMS"
@@ -21784,13 +23646,16 @@ msgid "Reset offset (only vector images)"
msgstr "Reset przesunięcia (tylko obrazy wektorowe)"
msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
+msgstr "warstwa WMS ({0}), {1} kafelków wczytano"
msgid "Is not vectorized."
msgstr "Nie jest zwektoryzowane."
-msgid "Raster size: {0}"
-msgstr "Rozmiar rastra: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Jest zwektoryzowane."
@@ -21831,7 +23696,7 @@ msgid "Use the selected scheme from the list."
msgstr ""
msgid "Use the current colors as a new color scheme."
-msgstr ""
+msgstr "Uzyj obecnych kolorów jako nowy schemat kolorów."
msgid "Delete the selected scheme from the list."
msgstr "Usuń zaznaczony schemat z listy."
@@ -21839,7 +23704,7 @@ msgstr "Usuń zaznaczony schemat z listy."
msgid "Color Schemes"
msgstr "Schematy kolorów"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21884,6 +23749,9 @@ msgstr "Pobierz wzdłuż"
msgid "Please select 1 or more ways to download along"
msgstr "Zaznacz jedną lub więcej dróg, aby pobrać dane"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21956,6 +23824,72 @@ msgstr "Nowe narzędzie..."
msgid "Install"
msgstr "Zainstaluj"
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr "Zaloguj"
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} użytkownik"
+msgstr[1] "{0} użytkownicy"
+msgstr[2] "{0} użytkowników"
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr "Wyloguj"
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr "Pokaż użytkowników na mapie"
+
msgid "Position only"
msgstr "Tylko pozycja"
@@ -21995,27 +23929,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "odśwież listę portów"
-
-msgid "Configure"
-msgstr "Konfiguruj"
-
msgid "Configure Device"
msgstr "Konfiguruj urządzenie"
-msgid "Connection Error."
-msgstr "Błąd połączenia."
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -22291,7 +24207,7 @@ msgid "Settings for the Graphview plugin that visualizes routing graphs."
msgstr ""
msgid "Ruleset"
-msgstr ""
+msgstr "Zestawy reguł"
msgid "Use built-in rulesets"
msgstr ""
@@ -22352,7 +24268,7 @@ msgid "Choose node color"
msgstr "Wybierz kolor węzła"
msgid "Choose arrow color"
-msgstr ""
+msgstr "Wybierz kolor strzałki"
msgid "Choose arrowhead fill color"
msgstr ""
@@ -22415,6 +24331,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22434,7 +24353,7 @@ msgid "A calibration geometry of {0} nodes by {1}"
msgstr ""
msgid "Change Color"
-msgstr ""
+msgstr "Zmień kolor"
msgid "Deprecate Offset"
msgstr ""
@@ -22603,22 +24522,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Dopasuj warstwę obrazu"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "Dopasuj położenie wybranej warstwy obrazu"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Wybierz warstwę obrazu do dopasowania"
+msgstr ""
msgid "Start adjusting"
-msgstr "Rozpocznij dostosowanie"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "Warstwa obrazu do dopasowania nie została wybrana."
+msgstr ""
msgid "No layers to adjust"
-msgstr "Brak warstw do dostosowania"
+msgstr ""
msgid "Normal"
msgstr "Normalna"
@@ -22662,12 +24581,6 @@ msgstr "Wczytane obrazy"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Pliki graficzne (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr "Wczytaj zestaw obrazów jako nową warstwę."
-
msgid "Import vector graphics"
msgstr "Importuje grafikę wektorową"
@@ -22677,18 +24590,15 @@ msgstr "Skala:"
msgid "unit(s) = "
msgstr "jednostka(i) = "
-msgid "Import..."
-msgstr "Importuj..."
-
-msgid "Import vector graphics."
-msgstr "Importuj grafikę wektorową"
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Rysunek SVG (*.svg)"
-
msgid "Importing..."
msgstr "Importowanie..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -22828,7 +24738,7 @@ msgid "Looking for shoreline..."
msgstr ""
msgid "{0} nodes so far..."
-msgstr ""
+msgstr "{0} węzłów jak dotąd..."
msgid "Lake Walker."
msgstr ""
@@ -22992,7 +24902,7 @@ msgid "Data source text. Default is Landsat."
msgstr ""
msgid "Downloading image tile..."
-msgstr ""
+msgstr "Pobieranie kafelka obrazu..."
msgid "Could not acquire image"
msgstr ""
@@ -23051,9 +24961,6 @@ msgstr "Centruj ciągle"
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -23108,9 +25015,33 @@ msgstr "Scala nakładające się fragmenty drogi."
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Rola z członka relacji została skopiowana na nowe linie. <br>Sprawdź "
+"poprawność i popraw jeśli to konieczne.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Przynależność do relacji została skopiowana do wszystkich nowych "
+"dróg.<br>Sprawdź i popraw jeśli potrzeba.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Wprowadź klucz dla tagu np. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Wprowadź wartość dla tagu np. <strong><tt>sprawdź członków "
+"relacji</tt></strong></html>"
+
msgid "Michigan Left"
msgstr ""
@@ -23152,25 +25083,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Przekształć w multipoligon"
+msgid "Select OSM mirror URL to download from."
+msgstr ""
-msgid "Convert to multipolygon."
-msgstr "Przekształć w multipoligon."
+msgid "Base URL"
+msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -23199,7 +25130,7 @@ msgid "Transfer to password manager and remove from preference file"
msgstr ""
msgid "No, just keep it"
-msgstr ""
+msgstr "Nie, zatrzymaj"
msgid "Close the dialog and discard all changes"
msgstr ""
@@ -23253,7 +25184,7 @@ msgid "proxy username"
msgstr ""
msgid "proxy password"
-msgstr ""
+msgstr "hasło proxy"
msgid "oauth key"
msgstr ""
@@ -23282,7 +25213,7 @@ msgid "The native password manager plugin detected {0} on your system."
msgstr ""
msgid "Days without mapping: {0}."
-msgstr ""
+msgstr "Dni bez mapowania: {0}."
msgid ""
"(To miserably continue mapping, edit out no_more_mapping\n"
@@ -23307,9 +25238,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr "Pliki CSV"
@@ -23334,12 +25262,21 @@ msgstr "Pliki GML"
msgid "Zip Files"
msgstr "Pliki Zip"
+msgid "7Zip Files"
+msgstr "Pliki 7Zip"
+
msgid "OpenData XML files"
msgstr "Pliki OpenData XML"
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr "Umowa licencyjna"
@@ -23353,7 +25290,7 @@ msgid "I understand and accept these terms and conditions"
msgstr "Zrozumiałem i akceptuję powyższe zasady i warunki"
msgid "View the full text of this license"
-msgstr ""
+msgstr "Zobacz pełny tekst licencji"
msgid "I refuse these terms and conditions. Cancel download."
msgstr "Odrzucam powyższe zasady i warunki. Anuluj pobieranie."
@@ -23490,6 +25427,9 @@ msgstr "Pobieranie danych..."
msgid "File to load"
msgstr "Plik do wczytania"
+msgid "Reading 7Zip file..."
+msgstr "Czytanie pliku 7Zip..."
+
msgid "Reading Zip file..."
msgstr "Czytanie pliku Zip..."
@@ -23506,6 +25446,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr "Ostrzeżenie: Nie znaleziono CRS"
+
+msgid "Unable to detect CRS !"
+msgstr "Nie można wykryć CRS"
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23610,8 +25561,9 @@ msgstr "ładowanie modułu ''{0}''..."
msgid "JOSM could not find information about the following module:"
msgid_plural "JOSM could not find information about the following modules:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM nie mógł odnaleźć informacji na temat tego modułu:"
+msgstr[1] "JOSM nie mógł odnaleźć informacji na temat tych modułów:"
+msgstr[2] "JOSM nie mógł odnaleźć informacji na temat tych modułów:"
msgid "The module is not going to be loaded."
msgid_plural "The modules are not going to be loaded."
@@ -23743,15 +25695,8 @@ msgstr ""
"<html>Zaznaczona warstwa zawiera dane z OpenStreetBugs.<br>Nie można "
"przesłać tych danych. Może zaznaczona została zła warstwa?"
-msgid "An error occurred: {0}"
-msgstr "Wystąpił błąd: {0}"
-
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Nie można było utworzyć nowego problemu. Wynik: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
+msgid "An error occurred: {0}"
+msgstr "Wystąpił błąd: {0}"
msgid "Process queue"
msgstr ""
@@ -23807,18 +25752,6 @@ msgstr ""
msgid "Close: "
msgstr "Zamknij: "
-msgid "New issue"
-msgstr "Nowy problem"
-
-msgid "Create issue"
-msgstr "Utwórz nowy problem"
-
-msgid "Describe the problem precisely"
-msgstr "Dokładnie opisz problem"
-
-msgid "Create: "
-msgstr "Utwórz: "
-
msgid "Open in browser"
msgstr "Otwórz w przeglądarce"
@@ -23879,6 +25812,9 @@ msgstr "Ścieżka do programu Firefox"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24086,11 +26022,8 @@ msgstr "Importuje plik PDF."
msgid "Import PDF"
msgstr "Import PDF"
-msgid "Import PDf file"
-msgstr "Import pliku PDF."
-
msgid " {0} objects so far"
-msgstr ""
+msgstr " {0} obiektów do tej pory"
msgid "Parsing PDF"
msgstr ""
@@ -24168,8 +26101,26 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Czy chcesz zapisać aktualną kalibrację warstwy {0}?"
@@ -24211,7 +26162,7 @@ msgid "New picture layer from clipboard"
msgstr "Nowa warstwa ze schowka"
msgid "Supported image files, *.zip, *.kml"
-msgstr ""
+msgstr "Obsługiwane formaty obrazów, *.zip, *.kml"
msgid "New picture layer from file..."
msgstr "Nowa warstwa z pliku"
@@ -24322,6 +26273,9 @@ msgstr "Schowek jest pusty"
msgid "The clipboard data is not an image"
msgstr "Dane w schowku nie są obrazem"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "Plik kalibracji przypisany do obrazu został znaleziony: {0}\n"
@@ -24331,7 +26285,7 @@ msgid ""
msgstr ""
msgid "Do you want to apply it ?"
-msgstr ""
+msgstr "Czy chcesz zastosować?"
msgid "Load calibration file ?"
msgstr "Wczytać plik kalibracji?"
@@ -24343,6 +26297,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24371,7 +26328,7 @@ msgid "Osmosis polygon filter files"
msgstr ""
msgid "Print..."
-msgstr ""
+msgstr "Drukuj..."
msgid "Print the map"
msgstr "Drukuj mapę"
@@ -24425,7 +26382,7 @@ msgid "Proj4J: {0} selected"
msgstr ""
msgid "Selected: {0}"
-msgstr ""
+msgstr "Zaznaczono: {0}"
msgid "Proj4J Plugin"
msgstr ""
@@ -24449,10 +26406,10 @@ msgid "Public Transport: Disable GTFS"
msgstr ""
msgid "Create Stops from GTFS ..."
-msgstr ""
+msgstr "Utwórz przystanki z GTFS ..."
msgid "Create Stops from a GTFS file"
-msgstr ""
+msgstr "Utwórz przystanki z pliku GTFS"
msgid "Select GTFS file (stops.txt)"
msgstr ""
@@ -24478,7 +26435,7 @@ msgid "light_rail"
msgstr ""
msgid "Create Stops from GTFS"
-msgstr ""
+msgstr "Utwórz przystanki z GTFS"
msgid "GTFS-Stops"
msgstr ""
@@ -24490,7 +26447,7 @@ msgid "Time on your GPS device"
msgstr ""
msgid "HH:MM:SS.sss"
-msgstr ""
+msgstr "HH:MM:SS.sss"
msgid "Time on your stopwatch"
msgstr ""
@@ -24622,25 +26579,22 @@ msgid "Public Transport: Change stop type"
msgstr ""
msgid "Create Stops from GPX ..."
-msgstr ""
+msgstr "Utwórz przystanki z GPX ..."
msgid "Create Stops from a GPX file"
-msgstr ""
+msgstr "Utwórz przystanki z pliku GPX"
msgid "Select GPX file"
-msgstr ""
+msgstr "Wybierz plik GPX"
msgid "The GPX file contained no tracks or waypoints."
-msgstr ""
+msgstr "Plik GPX nie zawiera żadnych tras ani punktów orientacyjnych"
msgid "Create Stops from GPX"
-msgstr ""
-
-msgid "Tracks"
-msgstr ""
+msgstr "Utwórz przystanki z GPX"
msgid "Tracks in this GPX file:"
-msgstr ""
+msgstr "Ślady w tym pakiecie GPX:"
msgid "Detach"
msgstr ""
@@ -24707,9 +26661,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr "Zmień ustawienia do tworzenia relacji multipolygon"
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24836,9 +26787,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr "Wycofaj zestaw zmian w całości"
@@ -24860,6 +26808,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24892,14 +26843,30 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
-msgstr ""
+msgstr "znaki"
+
+msgid "Change Properties"
+msgstr "Zmień właściwości"
msgid "Country preset:"
msgstr ""
@@ -24910,6 +26877,9 @@ msgstr "Pokaż wszystkie znaki"
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr "Niemcy"
@@ -24983,7 +26953,7 @@ msgid "Open a list of routing nodes"
msgstr ""
msgid "Add routing layer"
-msgstr ""
+msgstr "Dodaj warstwę trasy"
msgid "Criteria"
msgstr "Kryteria"
@@ -25012,9 +26982,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Typ drogi"
-
msgid "Speed (Km/h)"
msgstr "Prędkość (km/h)"
@@ -25034,6 +27001,9 @@ msgid ""
"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
"is stored in plain text in the JOSM preferences file. </p></body></html>"
msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Ostrzeżenie:</strong> Hasło "
+"jest przechowywane jako zwykły tekst w pliku ustawień JOSM. "
+"</p></body></html>"
msgid "Enter credentials for Separate Data Store API"
msgstr ""
@@ -25053,7 +27023,7 @@ msgid "SDS data file"
msgstr ""
msgid "Load..."
-msgstr ""
+msgstr "Wczytaj..."
msgid "Load separate data store data from a file."
msgstr ""
@@ -25116,13 +27086,13 @@ msgid "SDS tag prefix"
msgstr ""
msgid "Connection successful."
-msgstr ""
+msgstr "Połączono."
msgid "Cannot connect to SDS server: "
msgstr ""
msgid "Save..."
-msgstr ""
+msgstr "Zapisz..."
msgid "Save the current separate data store information to a file."
msgstr ""
@@ -25130,6 +27100,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Nie można wykonać kopii bezpieczeństwa pliku. Wyjątek: {0}"
+
msgid "Simplify Area"
msgstr "Uprość obszar"
@@ -25190,19 +27163,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25340,6 +27313,9 @@ msgstr ""
msgid "Street name: "
msgstr "Nazwa ulicy: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -25415,6 +27391,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr "Wielkość kafelka:"
+
+msgid "Resolution:"
+msgstr "Rozdzielczość:"
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -25430,9 +27495,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25454,6 +27516,10 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Uwaga: Ignoruję wyjątek ponieważ zadanie zostało anulowane. Wyjątek: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25606,9 +27672,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "Dokładność"
-
msgid "Select as much as you like:"
msgstr "Zaznacz tyle ile chcesz:"
@@ -26285,38 +28348,26 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
-msgstr "Zaznacz jeśli dane powinny być dodane do nowej warstwy"
-
-msgid ""
-"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
-"w2''"
-msgstr ""
-
msgid "Undelete Object"
msgstr ""
msgid "Undelete object"
msgstr ""
-msgid "Start undeleting"
-msgstr ""
-
-msgid "Close dialog and cancel"
+msgid ""
+"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
+"w2''"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
+msgid "Select if the data should be added into a new layer"
+msgstr "Zaznacz jeśli dane powinny być dodane do nowej warstwy"
-msgid "Looking for {0}"
+msgid "Start undeleting"
msgstr ""
-msgid "Found {0}"
+msgid "Close dialog and cancel"
msgstr ""
-msgid "More tools"
-msgstr "Więcej narzędzi"
-
msgid "Add nodes at intersections"
msgstr "Dodaj węzły na skrzyżowaniach"
@@ -26359,15 +28410,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr "Wklej znaczniki [testowe]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr "Wklej znaczniki"
-
msgid "Split Object"
msgstr "Rozdziel obiekt"
@@ -26466,10 +28508,10 @@ msgid "Opens specified URL browser"
msgstr ""
msgid "Utilsplugin2 settings [TESTING]"
-msgstr ""
+msgstr "Ustawienia Utilsplugin2 [TESTOWE]"
msgid "Here you can change some preferences of Utilsplugin2 functions"
-msgstr ""
+msgstr "Tu można zmienić niektóre ustawienia funkcji Utilsplugin2"
msgid "Save to file"
msgstr "Zapisz do pliku"
@@ -26490,18 +28532,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr "Klucz jest za długi:"
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr "Ignoruj ostrzeżenia"
-
msgid "Lat Lon tool"
msgstr ""
@@ -26549,7 +28579,7 @@ msgid ""
msgstr ""
msgid "Node belongs to way(s), cannot replace."
-msgstr ""
+msgstr "Węzeł należy do drogi, nie można zamienić."
msgid "Replace geometry for node {0}"
msgstr ""
@@ -26589,25 +28619,25 @@ msgid "Adjacent ways will be selected. Nodes will be deselected."
msgstr "Sąsiednie drogi zostaną zaznaczone. Węzły zostaną odznaczone."
msgid "All connected ways"
-msgstr ""
+msgstr "Wszystkie połączone drogi"
msgid "Select all connected ways"
-msgstr ""
+msgstr "Zaznacz wszystkie połączone drogi"
msgid "Intersecting ways"
-msgstr ""
+msgstr "Przecinające się drogi"
msgid "Select intersecting ways"
-msgstr ""
+msgstr "Zaznacza przecinające się drogi"
msgid "Please select some ways to find connected and intersecting ways!"
msgstr ""
msgid "All intersecting ways"
-msgstr ""
+msgstr "Wszystkie przecinające się drogi"
msgid "Select all intersecting ways"
-msgstr ""
+msgstr "Zaznacza wszystkie przecinające się drogi"
msgid "Please select some ways to find all connected and intersecting ways!"
msgstr ""
@@ -26649,31 +28679,32 @@ msgid ""
msgstr ""
msgid "Select Highway"
-msgstr ""
+msgstr "Zaznacz całą drogę (Highway)"
msgid "Select highway for the name/ref given"
msgstr ""
+"Zaznacza całą drogę (highway) na podstawie tych samych tagów name/ref"
msgid "Please select one or two ways for this action"
-msgstr ""
+msgstr "Proszę wybrać jedną lub dwie drogi dla tej akcji"
msgid "Select last modified nodes"
msgstr "Zaznacz ostatnio zmodyfikowane węzły"
msgid "Select last modified ways"
-msgstr ""
+msgstr "Wybierz ostatnio zmodyfikowane drogi"
msgid "Select Way Nodes"
msgstr "Zaznacz węzły drogi"
msgid "Select all nodes of a selected way."
-msgstr ""
+msgstr "Zaznacz wszystkie węzły wybranej drogi."
msgid "Undo selection"
msgstr "Cofnij zaznaczenie"
msgid "Reselect last added object or selection form history"
-msgstr ""
+msgstr "Wybierz ponownie ostatnio dodane elementy lub zaznaczenia z historii"
msgid "Unselect nodes"
msgstr "Odznacz węzły"
@@ -26681,9 +28712,6 @@ msgstr "Odznacz węzły"
msgid "Removes all nodes from selection"
msgstr "Usuwa wszystkie węzły z zaznaczenia"
-msgid "Video"
-msgstr "Wideo"
-
msgid "Import Video"
msgstr "Importuj wideo"
@@ -26754,90 +28782,92 @@ msgid "Show subtitles in video"
msgstr "Pokazuje napisy wideo"
msgid "Jump length"
-msgstr ""
+msgstr "Długość przeskoku"
msgid "Set the length of a jump"
-msgstr ""
+msgstr "Ustaw długość przeskoku"
msgid "Jump in video for x ms"
msgstr ""
msgid "Loop length"
-msgstr ""
+msgstr "Długość pętli"
msgid "Set the length around a looppoint"
msgstr ""
msgid "no deinterlacing"
-msgstr ""
+msgstr "bez usuwania przeplotu"
msgid "deinterlacing using line doubling"
-msgstr ""
+msgstr "usuwanie przeplotu z wykorzystaniem powielania linii"
msgid "deinterlacing using linear interpolation"
-msgstr ""
+msgstr "usuwanie przeplotu z wykorzystaniem liniowej interpolacji"
msgid ""
"VLC library is not correctly initialized. Please check that VLC {0} is "
"correctly installed on your system. Its architecture (32/64 bits) must also "
"be the same as the JRE that runs JOSM."
msgstr ""
+"Biblioteka VLC {0} nie została poprawnie zainicjowana. Proszę sprawdzić czy "
+"została ona poprawnie zainstalowana i czy architektura (32/64 bity) jest "
+"taka sama jak dla JRE z którego jest uruchomiony JOSM."
msgid "Jump to"
-msgstr ""
+msgstr "Przejdź do"
msgid "Jump to GPS time"
-msgstr ""
+msgstr "Skocz do czasu GPS"
msgid "Shows current position in the video"
-msgstr ""
+msgstr "Pokaż aktualną pozycję w filmie"
msgid "Sync"
-msgstr ""
+msgstr "Synchronizacja"
msgid "Unable to find JNA Java library!"
-msgstr ""
+msgstr "Nie mogę znaleźć biblioteki JNA od Javy!"
msgid "Unable to find native libvlc library!"
-msgstr ""
+msgstr "Nie mogę znaleźć biblioteki libvlc!"
msgid "play"
-msgstr ""
+msgstr "odtwarzaj"
msgid "loop"
msgstr "pętla"
msgid "mute"
-msgstr ""
+msgstr "wycisz"
-msgid "Scanned Map..."
-msgstr "Zeskanowana mapa..."
+msgid "Walking Papers Scanned Map"
+msgstr "Skanowane mapy Walking Papers"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
msgstr ""
+"Pokaż mapę która została wcześniej zeskanowana i wgrana na walking-papers.org"
msgid ""
"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
-msgstr "Podaj adres lub ID mapy z walking-papers.org"
+msgstr ""
+"Podaj adres lub ID (fragment po ?id=w adresie URL) mapy z walking-papers.org"
msgid "Could not read information from walking-papers.org the id \"{0}\""
-msgstr ""
+msgstr "Nie mogę przeczytać informacji z walking-papers.org o id \"{0}\""
msgid "Walking Papers: {0}"
-msgstr ""
+msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
-msgstr ""
-
-msgid "Walking Papers"
-msgstr ""
+msgstr "Walking Papers warstwa ({0}) w powiększeniu {1}"
msgid "Way Download"
-msgstr ""
+msgstr "Pobierz na końcu..."
msgid "Download map data on the end of selected way"
-msgstr ""
+msgstr "Pobierz dane mapy z końca wybranej drogi"
msgid ""
"<html>Neither a node nor a way with an endpoint outside of the<br>current "
@@ -26847,9 +28877,10 @@ msgstr ""
msgid "<html>Could not find a unique node to start downloading from.</html>"
msgstr ""
+"<html>Nie można znaleźć unikalnego węzła aby, rozpocząć pobieranie.</html>"
msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr ""
+msgstr "<html>Brak dróg połączonych z węzłem ''{0}''. Anulowanie.</html>"
msgid ""
"Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t "
@@ -26868,35 +28899,38 @@ msgid "Merge duplicate node?"
msgstr "Połączyć zduplikowany węzeł?"
msgid "<html>No more connected ways to download.</html>"
-msgstr ""
+msgstr "<html>Nie ma więcej połączonych dróg do pobrania.</html>"
msgid "Node ''{0}'' is a junction with more than 2 connected ways."
msgstr ""
+"Węzeł ''{0}'' jest skrzyżowaniem z więcej niż dwiema połączonymi drogami."
msgid "Enter search expression here.."
-msgstr ""
+msgstr "Wprowadź frazę do znalezienia..."
msgid "Select waypoint to move map"
-msgstr ""
+msgstr "Zaznacz punkt aby przesunąć mapę"
msgid "Waypoint search"
-msgstr ""
+msgstr "Wyszukiwanie punktu orientacyjnego"
msgid "Search after waypoint. Click and move the map view to the waypoint."
msgstr ""
+"Wyszukiwanie po punkcie orientacyjnym. Kliknij i przesuń widok mapy do tego "
+"punktu."
msgid "Way Select"
-msgstr ""
+msgstr "Wybór drogi"
msgid "Select non-branching sequences of ways"
-msgstr ""
+msgstr "Wybierz nierozgałęziającą się sekwencję dróg"
msgid "Add names from Wikipedia"
msgstr "Dodaj nazwy z Wikipedii"
msgid ""
"Fetches interwiki links from Wikipedia in order to add several name tags"
-msgstr ""
+msgstr "Pobiera z Wikipedii linki interwiki w celu dodanie kilku tagów"
msgid ""
"Copies the {0} template to the system clipboard instantiated with the "
@@ -26904,10 +28938,10 @@ msgid ""
msgstr ""
msgid "Copy {0} template"
-msgstr ""
+msgstr "Kopiuj {0} szablon"
msgid "Fetch Wikipedia articles with coordinates"
-msgstr ""
+msgstr "Połącz artykuły z Wikipedi ze współrzędnymi"
msgid ""
"Double click on item to search for object with article name (and center "
@@ -26915,69 +28949,69 @@ msgid ""
msgstr ""
msgid "Available via WIWOSM server"
-msgstr ""
+msgstr "Dostępne przez serwer WIWOSM"
msgid "Available in local dataset"
-msgstr ""
+msgstr "Dostępne w lokalnym zestawie danych"
msgid "Not linked yet"
-msgstr ""
+msgstr "Jeszcze nie połączone"
msgid "{0}.Wikipedia.org"
-msgstr ""
+msgstr "{0}.Wikipedia.org"
msgid "{0}.Wikipedia.org: {1}"
-msgstr ""
+msgstr "{0}.Wikipedia.org: {1}"
msgid "Fetches all coordinates from Wikipedia in the current view"
-msgstr ""
+msgstr "Pobiera wszystkie współrzędne z Wikipedii dla aktualnego widoku"
msgid "coordinates"
-msgstr ""
+msgstr "współrzędne"
msgid "Category"
-msgstr ""
+msgstr "Kategoria"
msgid "Fetches a list of all Wikipedia articles of a category"
-msgstr ""
+msgstr "Pobiera listę wszystkich artykułów Wikipedii z kategorii"
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Wprowadź kategorię Wikipedii"
msgid "Clipboard"
msgstr "Schowek"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Wkleja artykuły zamieszczone w Wikipedii ze schowka systemowego"
msgid "clipboard"
-msgstr ""
+msgstr "schowek"
msgid "Open Article"
-msgstr ""
+msgstr "Otwórz artykuł"
msgid "Opens the Wikipedia article of the selected item in a browser"
msgstr ""
+"Otwiera artykuł Wikipedii dla zaznaczonego obiektu w przeglądarce "
+"internetowej"
msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Ustawia domyślny język dla artykułów Wikipedii"
msgid "Enter the Wikipedia language"
-msgstr ""
-
-msgid "Add Tag"
-msgstr "Dodaj tag"
+msgstr "Wprowadź język wikipedii"
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
+"Dodaje tag \"wikipedia\" powiązany z tym artykułem do zaznaczonych obiektów"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr ""
+msgstr "The Ultimate WMS Super-speed Turbo Challenge II"
msgid "Go driving"
-msgstr ""
+msgstr "Idź jeździć"
msgid "Drive a race car on this layer"
-msgstr ""
+msgstr "Jeździj wyścigówką po tej warstwie"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index fd0437b..18ae553 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 12:58+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-09-19 15:02+0000\n"
+"Last-Translator: RPome <Unknown>\n"
"Language-Team: Portuguese <pt 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: 2013-04-05 04:54+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:55+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Condições de Utilização da Imagem de Fundo"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "A abertura do link não é suportada pela plataforma atual (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr "AVISO: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "A executar arranque da plataforma"
@@ -153,20 +168,14 @@ msgid "About JOSM..."
msgstr "Sobre o JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"AVISO: formato inesperado do URL base da API. Redirecionamento para as "
-"páginas de informação ou histórico do objeto OSM irá provavelmente falhar. "
-"URL base da API é: \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Aviso: formato inesperado da URL base da API. O redirecionamento para a "
-"página do utilizador do OSM vai provavelmente falhar. A URL base da API é: "
-"\"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -213,6 +222,9 @@ msgstr "Sem camadas de destino"
msgid "Add imagery layer {0}"
msgstr "Adicionar camada de imagem de fundo {0}"
+msgid "Select image format for WMS layer"
+msgstr "Selecione o formato de imagem para a camada WMS"
+
msgid "Select WMS layers"
msgstr "Selecione as camadas WMS"
@@ -254,9 +266,6 @@ msgstr "Ferramenta: {0}"
msgid "Please select at least four nodes."
msgstr "Por favor, selecione no mínimo 4 nós."
-msgid "Information"
-msgstr "Informação"
-
msgid "Align Nodes in Line"
msgstr "Alinhar Nós em Linha"
@@ -281,6 +290,9 @@ msgstr "conflito"
msgid "download"
msgstr "descarregar"
+msgid "problem"
+msgstr "problema"
+
msgid "previous"
msgstr "anterior"
@@ -290,6 +302,9 @@ msgstr "seguinte"
msgid "Nothing selected to zoom to."
msgstr "Nada selecionado para enquadrar."
+msgid "Information"
+msgstr "Informação"
+
msgid "Zoom to {0}"
msgstr "Enquadrar {0}"
@@ -347,11 +362,9 @@ msgstr ""
"sentido?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Não foi possível combinar as linhas. Verifique se os nós que as ligam estão "
-"fundidos num só nó ou se uma das linhas não tem segmentos sobrepostos."
msgid "Combine {0} ways"
msgstr "Combinar {0} linhas"
@@ -410,18 +423,37 @@ msgstr "Eliminar"
msgid "Delete selected objects."
msgstr "Elimina os objetos selecionados."
+msgid "Toggle dialogs panel"
+msgstr "Mostra os painéis laterais"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Mostra os painéis laterais. maximizando a área visível"
+
msgid "Distribute Nodes"
msgstr "Distribuir Nós a Distâncias Iguais"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribui os nós selecionados a distâncias iguais ao longo da linha."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descarregar do OpenStreetMap..."
msgid "Download map data from the OSM server."
msgstr "Descarrega mapas dos servidores do OpenStreetMap."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta ação irá necessitar de {0} pedidos individuais.<br>Quer "
+"continuar?</html>"
+
+msgid "Download data"
+msgstr "Descarregar dados"
+
msgid "Download object..."
msgstr "Descarregar objeto..."
@@ -520,6 +552,9 @@ msgstr "Histórico"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Mostrar informações de histórico sobre linhas, nós ou relações."
+msgid "Show history"
+msgstr "Mostrar histórico"
+
msgid "History (web)"
msgstr "Histórico (web)"
@@ -632,7 +667,7 @@ msgid "Added node on all intersections"
msgstr "Nós adicionados em todas as interseções"
msgid "Assemble new polygons"
-msgstr ""
+msgstr "Criar novos polígonos"
msgid "Delete relations"
msgstr "Eliminar relações"
@@ -644,11 +679,9 @@ msgid "Joined overlapping areas"
msgstr "Áreas sobrepostas fundidas numa só"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Algumas das linhas faziam parte de relações que foram alteradas. Por favor "
-"verifique se não foram criados erros."
msgid "Fix tag conflicts"
msgstr "Corrigir conflitos de etiquetas"
@@ -818,10 +851,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Fundir os nós no mais antigo"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Por favor selecione pelo menos dois nós a fundir ou um nó perto de outro."
+"Por favor selecione pelo menos 2 nós para fundir ou um nó próximo de outro "
+"nó."
msgid "Abort Merging"
msgstr "Abortar Fusão"
@@ -993,11 +1027,9 @@ msgid "Download Data"
msgstr "Descarregar Dados"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Não foi possível abrir o endereço ''{0}'' porque não há nenhuma tarefa "
-"de descarregamento apropriada disponível.</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1028,16 +1060,9 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizar / Desfazer"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalizar Linha / Desfazer\n"
-"Por favor selecione os nós que foram deslocados na ação anterior de "
-"Ortogonalizar Linha!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Desfazer Ortogonalizar Linha"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1057,9 +1082,6 @@ msgstr "Ortogonalizar"
msgid "Usage"
msgstr "Utilização"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Os elementos selecionados não podem ser ortogonalizados"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1185,6 +1207,15 @@ msgstr "Alterar também o nome do ficheiro"
msgid "Could not rename file ''{0}''"
msgstr "Não foi possível alterar o nome do ficheiro \"{0}\""
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgid "Restart the application."
+msgstr "Reiniciar a aplicação."
+
+msgid "Click to restart later."
+msgstr "Clique para reiniciar mais tarde."
+
msgid "Reverse way"
msgstr "Inverter linha"
@@ -1237,9 +1268,6 @@ msgstr "Carregar Sessão"
msgid "Load a session from file."
msgstr "Carrega uma sessão de um ficheiro."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Ficheiro de sessão (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Abrir sessão"
@@ -1306,6 +1334,9 @@ msgstr "Relatório de Estado"
msgid "Copy to clipboard and close"
msgstr "Copiar para memória e fechar"
+msgid "Report bug"
+msgstr "Reportar erro"
+
msgid "Close"
msgstr "Fechar"
@@ -1389,18 +1420,14 @@ msgstr ""
"meio da linha.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Foram copiados funções de relações para todas as novas linhas.<br>Deve "
-"verificar isto e corrigir se for necessário.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Foram copiados membros de relações para todas as novas linhas.<br>Deve "
-"verificar isto e corrigir se for necessário.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Dividir linha {0} em {1} partes"
@@ -1502,6 +1529,27 @@ msgstr ""
"porque não está a ver os objetos reais.<br>Mesmo assim quer desligar os "
"objetos?"
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Desfazer"
@@ -1528,9 +1576,6 @@ msgstr ""
"Atualiza os objetos da camada ativa que foram entretanto alterados no "
"OpenStreetMap por outras pessoas para verificar se existem conflitos."
-msgid "Download data"
-msgstr "Descarregar dados"
-
msgid "Update modified"
msgstr "Atualizar apenas o que alterei"
@@ -1749,6 +1794,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avançar mais lentamente"
+msgid "Download GPS"
+msgstr "Descarregar dados GPS"
+
msgid "Downloading GPS data"
msgstr "A descarregar dados do GPS"
@@ -1758,6 +1806,18 @@ msgstr "Dados GPX descarregados"
msgid "Markers from {0}"
msgstr "Marcas de {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "Descarregar do OSM"
+
msgid "Downloading data"
msgstr "A descarregar dados"
@@ -1778,6 +1838,31 @@ msgstr "Comando"
msgid "Request details: {0}"
msgstr "Detalhes do pedido: {0}"
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Ocorreu {0} conflito ao importar."
+msgstr[1] "Ocorreram {0} conflitos ao importar."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflito ao descarregar"
+msgstr[1] "Conflitos ao descarregar"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) A carregar pais do nó {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) A carregar pais da linha {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) A carregar pais da relação {2}"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Descarregando {0} de {1} (Faltam {2})"
@@ -1839,25 +1924,6 @@ msgstr "Ocorreram os seguintes erros durante o descarregamento maciço: {0}"
msgid "Errors during download"
msgstr "Erros ao descarregar"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Ocorreu {0} conflito ao importar."
-msgstr[1] "Ocorreram {0} conflitos ao importar."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflito ao descarregar"
-msgstr[1] "Conflitos ao descarregar"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) A carregar pais do nó {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) A carregar pais da linha {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) A carregar pais da relação {2}"
-
msgid "Error during download"
msgstr "Erro ao descarregar"
@@ -1890,7 +1956,7 @@ msgid "Backspace in Add mode"
msgstr "Tecla de apagar (<--- backspace) no Modo Adicionar"
msgid "helper line"
-msgstr ""
+msgstr "linha de ajuda"
msgid "Cannot add a node outside of the world."
msgstr "Não é possível adicionar um nó fora do mundo."
@@ -2010,6 +2076,9 @@ msgstr "Melhorar Precisão da Linha"
msgid "Improve Way Accuracy mode"
msgstr "Modo de Melhorar a precisão da linha"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr "Clique na linha para melhorar a precisão dela."
@@ -2040,10 +2109,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Não é possível colocar um nó fora do mundo."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Adicionado um nó à linha"
-msgstr[1] "Adicionado um nó a {0} linhas"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Não é possível eliminar um nó dependente de vários objetos"
@@ -2057,6 +2126,9 @@ msgstr "Paralela"
msgid "Make parallel copies of ways"
msgstr "Faz cópias paralelas de linhas"
+msgid "make parallel helper line"
+msgstr "Criar linha de ajuda paralela"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2519,6 +2591,9 @@ msgstr "''valor'' em qualquer chave"
msgid "matches if ''key'' exists"
msgstr "corresponde caso ''chave'' exista"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "combinadores"
@@ -2556,7 +2631,7 @@ msgid "all closed ways"
msgstr "todas as linhas fechadas"
msgid "object without useful tags"
-msgstr ""
+msgstr "objeto sem etiquetas úteis"
msgid "metadata"
msgstr "metadados"
@@ -2692,14 +2767,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Esperado <i>min</i>/<i>max</i> após ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Esperado identificador do objeto"
+msgid "Range of primitive ids expected"
+msgstr "Esperado um intervalo de identificadores de objetos"
-msgid "Changeset id expected"
-msgstr "Esperado o Identificador (ID) do objeto"
+msgid "Range of changeset ids expected"
+msgstr "Esperado um intervalo de identificadores de conjuntos de alterações"
-msgid "Version expected"
-msgstr "Esperada a versão"
+msgid "Range of versions expected"
+msgstr "Esperado um intervalo de identificadores de versões"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2711,6 +2786,9 @@ msgstr ""
"Tipo de objeto desconhecido: {0}. Os valores permitidos são nó, linha ou "
"relação"
+msgid "Primitive id expected"
+msgstr "Esperado identificador do objeto"
+
msgid "Range of numbers expected"
msgstr "Esperado um intervalo de números"
@@ -2729,11 +2807,8 @@ msgstr "Parâmetro em falta para XOR"
msgid "Missing operator for NOT"
msgstr "Falta um parâmetro em NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Aviso: foi truncado automaticamente o valor da etiqueta ''{0}'' no objeto "
-"eliminado {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2828,6 +2903,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Adicionado {0} objeto"
msgstr[1] "Adicionados {0} objetos"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Alterar nó {0}"
@@ -2864,11 +2942,11 @@ msgstr "Remover \"{0}\" de {1} objetos"
msgid "Set {0}={1} for {2} objects"
msgstr "Etiquetar {0}={1} em {2} objetos"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Eliminadas {0} propriedades em {1} objetos"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "Atribuídas {0} propriedades em {1} objetos"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Substituir \"{0}\" por \"{1}\" em"
@@ -2892,11 +2970,9 @@ msgid "Double conflict"
msgstr "Conflito duplo"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Aviso: A camada ''{0}'' já não existe. Não é possível remover o conflito do "
-"objeto ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Adicionar conflito para \"{0}\""
@@ -3013,6 +3089,9 @@ msgstr[1] "{0} objetos limpos"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resolver conflitos na lista de membros da relação {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rodar {0} nó"
@@ -3067,17 +3146,21 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
+"<html>Você irá inverter o caminho ''{0}'',<br/> cujo significado semântico "
+"de sua tag ''{1}'' é definida pela direção.<br/>Você realmente quer inverter "
+"a direção do caminho e seu significado semântico?</html>"
msgstr[1] ""
+"<html>Você irá inverter o caminho ''{0}'',<br/> cujo significado semântico "
+"de suas tags são definidas pela direção.<br/>{1} Você realmente quer "
+"inverter a direção do caminho e seu significado semântico?</html>"
msgid "Reverse directional way."
msgstr "Inverter linha direcional."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Uma das linhas selecionadas contém dados que serão alterados ao inverter o "
-"sentido da linha. Confirme se quer alterar ou não a recomendação seguinte."
msgid "Relation"
msgstr "Relação"
@@ -3106,11 +3189,11 @@ msgstr "Aplicar as alterações selecionadas"
msgid "Do not apply changes"
msgstr "Não aplicar alterações"
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor selecione as alterações das propriedades que quer aplicar."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Propriedades de "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Funções nas relações referentes a"
@@ -3135,6 +3218,9 @@ msgid "Unable to delete old backup file {0}"
msgstr ""
"Não foi possível eliminar o ficheiro da cópia de segurança antigo {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
"Ocorreu um erro ao criar a cópia de segurança da camada eliminada: {0}"
@@ -3169,21 +3255,19 @@ msgstr ""
"<b>{0}</b>,<br/> mas o seu valor padrão é desconhecido neste momento.<br/> "
"Por favor ative manualmente a função correspondente e tente importar de novo."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Aviso: Não foi possível criar a pasta que falta da cache: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Não foi possível criar a pasta que falta da cache: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Aviso: não foi possível forçar as preferências para ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Aviso: A inicialização das preferências falhou. O diretório das preferências "
-"''{0}'' não é um diretório."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3193,11 +3277,9 @@ msgstr ""
"preferências ''{0}'' não é um diretório</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Aviso: a inicialização das preferências falhou. Não foi possível criar a "
-"pasta das preferências em falta: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3206,18 +3288,12 @@ msgstr ""
"<html>Aviso: a inicialização das preferências falhou.<br>Não foi possível "
"criar a pasta das preferências em falta: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Informação: Não foi encontrado o ficheiro das preferências ''{0}''. A criar "
-"um ficheiro de preferências padrão."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Aviso: A substituir o ficheiro de preferências existente ''{0}'' pelo "
-"ficheiro de preferências original."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3235,11 +3311,9 @@ msgstr ""
"um novo ficheiro de preferências.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Aviso: Não foi possível inicializar as preferências. Não foi possível "
-"restaurar o ficheiro de preferências de origem: {0}"
msgid "Paint style {0}: {1}"
msgstr "Estilo de pintura {0}: {1}"
@@ -3269,12 +3343,11 @@ msgstr "Falhou o carregamento do recurso ''{0}'', o erro é {1}."
msgid "UNKNOWN"
msgstr "DESCONHECIDO"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr "Aviso: número de versão do JOSM inesperado. O valor é ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Aviso: o ficheiro de revisão ''/REVISION'' não foi encontrado."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Já foi registado o conflito para o objeto ''{0}''."
@@ -3445,11 +3518,8 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "O parâmetro {0} não está no intervalo 0..{1}. Obteve-se ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Erro: falhou o carregamento da classe de visualização de mapas ''{0}''. A "
-"classe não foi encontrada."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3563,8 +3633,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "Identificador de datum desconhecido: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Datum necessário (+datum=*, +towgs84=* ou +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr ""
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3585,6 +3655,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Número inesperado de argumentos para o parâmetro ''+bounds'' (tem de ser 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Pârametro desconhecido ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Número de argumentos esperados para o parâmetro ''{0}''"
@@ -3604,11 +3677,6 @@ msgstr "Projeção Personalizada"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-"Erro: ocorreu um erro na abertura de um fluxo de entrada do recurso "
-"''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3649,6 +3717,9 @@ msgstr "validação - outros"
msgid "Running test {0}"
msgstr "A executar o teste {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Endereços"
@@ -3675,6 +3746,15 @@ msgstr "Vários nomes de estradas na relação"
msgid "House number too far from street"
msgstr "Número de porta demasiado longe da estrada."
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr "Edifício dentro de edifício"
@@ -3736,15 +3816,15 @@ msgstr " ou "
msgid "{0} is deprecated, use {1} instead"
msgstr "''{0}'' está em desuso, substituir por ''{1}''"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Nós duplicados"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Verifica se existem nós na mesma localização"
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Nós duplicados em linhas por fechar"
-
msgid "Mixed type duplicated nodes"
msgstr "Vários tipos de nós duplicados"
@@ -3816,6 +3896,24 @@ msgstr "Nós em linhas duplicados"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Verifica se existem linhas com nós consecutivos idênticos."
+msgid "Highways"
+msgstr "Vias"
+
+msgid "Performs semantic checks on highways."
+msgstr "Faz a validação semântica das vias."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Rotunda incorreta (estrada: {0} em vez de {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multi-polígono"
@@ -3829,7 +3927,7 @@ msgid "No outer way for multipolygon"
msgstr "Multi-polígono sem linha exterior definida na relação"
msgid "No style for multipolygon"
-msgstr ""
+msgstr "Sem estilo para multi-polígono"
msgid "No style in multipolygon relation"
msgstr "Multi-polígono sem nenhuma etiqueta física"
@@ -3838,7 +3936,7 @@ msgid "Style for inner way equals multipolygon"
msgstr "Tipo de linha interna igual à externa do multi-polígono"
msgid "Style for outer way mismatches"
-msgstr ""
+msgstr "Estilo para as vias exteriores não conferem"
msgid "Multipolygon is not closed"
msgstr "O multi-polígono não está fechado"
@@ -3893,6 +3991,12 @@ msgstr "Nós com o mesmo nome"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Verifica se existem nós com o mesmo nome (podem ser duplicados)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "Áreas sobrepostas"
@@ -3954,15 +4058,15 @@ msgstr "O tipo de relação é desconhecido"
msgid "Relation is empty"
msgstr "A relação está vazia"
+msgid "Role verification problem"
+msgstr "Problema na verificação da função"
+
msgid "<empty>"
msgstr "<vazio>"
msgid "Role {0} missing"
msgstr "Falta a função {0}"
-msgid "Role verification problem"
-msgstr "Problema na verificação da função"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Número de {0} funções insuficiente ({1})"
@@ -3995,12 +4099,11 @@ msgstr ""
"Este teste verifica se existem linhas com nomes parecidos, mas não iguais, "
"que podem ser enganos de digitação"
-msgid "Properties checker :"
-msgstr "Verificador de etiquetas:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
-"Este módulo verifica se existem erros nas chaves e valores das etiquetas."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Linha do teste de etiquetas inválida - {0}: {1}"
@@ -4147,8 +4250,8 @@ msgstr "Usar ficheiro original de verificação ortográfica."
msgid "Use the default spellcheck file (recommended)."
msgstr "Usa o ficheiro original de verificação ortográfica (recomendado)."
-msgid "Fix properties"
-msgstr "Corrigir propriedades"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Não foi possível encontrar o tipo de elemento"
@@ -4232,6 +4335,9 @@ msgstr ""
"Isto verifica se existem linhas que deviam ser fechadas mas não estão (como "
"áreas)"
+msgid "Unclosed way"
+msgstr "Linha por fechar"
+
msgid "natural type {0}"
msgstr "tipo natural {0}"
@@ -4262,9 +4368,6 @@ msgstr "edifício"
msgid "area"
msgstr "área"
-msgid "Unclosed way"
-msgstr "Linha por fechar"
-
msgid "Unconnected ways"
msgstr "Linhas não ligadas"
@@ -4293,12 +4396,12 @@ msgstr ""
"Isto verifica se existem nós sem etiquetas que não façam parte de nenhuma "
"linha"
-msgid "No tags"
-msgstr "Sem etiquetas"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nós isolados sem nenhuma etiqueta física"
+msgid "No tags"
+msgstr "Sem etiquetas"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Tem a etiqueta ''fixme'' ou ''FIXME'' (corrijam-me)"
@@ -4366,26 +4469,6 @@ msgid "Reversed land: land not on left side"
msgstr ""
"Linha terrestre no sentido inverso: a terra não está no lado esquerdo"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Número incorreto de argumentos para o favorito"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Ocorreu um erro ao ler a entrada de favoritos: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Erro: Linha ''{0}'' inesperado no ficheiro de favoritos ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erro: valor duplo ''{0}'' incorreto na linha ''{1}'' no ficheiro de "
-"favoritos ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Não foi possível ler os favoritos de<br>''{0}''<br>Erro: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Não mostrar de novo este aviso"
@@ -4489,8 +4572,8 @@ msgstr "Mostrar informação de ajuda"
msgid "Downloading \"Message of the day\""
msgstr "A descarregar a \"Mensagem do dia\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Aviso: não foi possível ler a Mensagem do Dia. Exceção: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr ""
msgid "Message of the day not available"
msgstr "A mensagem do dia não está disponível"
@@ -4703,11 +4786,26 @@ msgstr "Ver"
msgid "Tools"
msgstr "Ferramentas"
+msgid "More tools"
+msgstr "Mais Ferramentas"
+
+msgid "Data"
+msgstr "Dados"
+
+msgid "Selection"
+msgstr "Seleção"
+
msgid "Presets"
msgstr "Modelos de Etiquetas"
+msgid "More..."
+msgstr "Mais..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
-msgstr "Janelas"
+msgstr "Painéis"
msgid "Menu: {0}"
msgstr "Menu: {0}"
@@ -4723,11 +4821,23 @@ msgstr ""
"Mostra ou esconde a barra de ferramentas de edição (barra vertical do lado "
"esquerdo)"
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Áudio"
-msgid "Hide edit toolbar"
-msgstr "Esconder barra de ferramentas de edição"
+msgid "Do not hide toolbar"
+msgstr "Não esconder a barra de ferramentas"
msgid "Hide this button"
msgstr "Esconder este botão"
@@ -4735,6 +4845,9 @@ msgstr "Esconder este botão"
msgid "Click the arrow at the bottom to show it again."
msgstr "Clique na seta do fundo para mostrar de novo."
+msgid "Hide edit toolbar"
+msgstr "Esconder barra de ferramentas de edição"
+
msgid "Hide or show this toggle button"
msgstr "Mostrar ou esconder este botão de alternar"
@@ -4796,6 +4909,9 @@ msgstr "(nenhum objeto)"
msgid "User:"
msgstr "Utilizador:"
+msgid "Do not hide status bar"
+msgstr "Não esconder a barra de estado"
+
msgid "Layer not in list."
msgstr "A camada não existe na lista."
@@ -4823,23 +4939,8 @@ msgstr "Em segundo plano"
msgid "Click to run job in background"
msgstr "Clique para fazer a tarefa em segundo plano"
-msgid "false: the property is explicitly switched off"
-msgstr "falso: a propriedade não está definida"
-
-msgid "true: the property is explicitly switched on"
-msgstr "verdadeiro: a propriedade está atribuída"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parcial: objetos diferentes selecionados com propriedades diferentes, não "
-"alterar"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "não definido: não atribuir esta propriedade nos objetos selecionados"
-
-msgid "{0} ({1} ms)"
-msgstr "{0} ({1} ms)"
+msgid "{0} ({1} ms)"
+msgstr "{0} ({1} ms)"
msgid ""
"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
@@ -4848,7 +4949,7 @@ msgstr ""
"alinhamento utilizando trilhos GPS!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgid "Details..."
msgstr "Detalhes..."
@@ -5149,6 +5250,9 @@ msgstr "> abaixo"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "Copiar os meus elementos selecionados para o fim da lista de fusão."
+msgid "> before"
+msgstr "> depois"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5156,6 +5260,9 @@ msgstr ""
"Copiar os meus elementos selecionados antes do primeiro elemento selecionado "
"na lista de fusão."
+msgid "> after"
+msgstr "> antes"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5163,18 +5270,27 @@ msgstr ""
"Copiar os meus elementos selecionados após o primeiro elemento selecionado "
"na lista de fusão."
+msgid "< top"
+msgstr "< cima"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Copiar os elementos da versão no servidor selecionados para o início da "
"lista de fusão."
+msgid "< bottom"
+msgstr "< baixo"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Copiar os elementos da versão no servidor selecionados para o fim da lista "
"de fusão."
+msgid "< before"
+msgstr "< antes"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5182,6 +5298,9 @@ msgstr ""
"Copiar os elementos da versão no servidor selecionados antes do primeiro "
"elemento selecionado na lista de fusão."
+msgid "< after"
+msgstr "< após"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5198,8 +5317,8 @@ msgstr "Copiar todos os elementos deles para o alvo"
msgid "Up"
msgstr "Subir"
-msgid "Move up the selected elements by one position."
-msgstr "Mover uma posição acima os elementos selecionados"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Descer"
@@ -5250,19 +5369,13 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Versão no servidor ({0} entrada)"
msgstr[1] "Versão no servidor ({0} entradas)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Nó"
msgid "Merged nodes not frozen yet. Cannot build resolution command."
msgstr ""
+"Nós mesclados ainda não congelados. Não é possível construir comando de "
+"resolução"
msgid "Properties in my dataset, i.e. the local dataset"
msgstr "Propriedades na minha versão"
@@ -5318,6 +5431,8 @@ msgstr "Objeto"
msgid "Merged nodes not frozen yet. Cannot build resolution command"
msgstr ""
+"nós combinados não congelados ainda. Não é possível construir comando de "
+"resolução"
msgid "<undefined>"
msgstr "<nenhum>"
@@ -5527,19 +5642,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Chave:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Introduza uma chave de etiqueta, por exemplo "
-"<strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valor:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Introduza o valor da etiqueta, por exemplo <strong><tt>verificar "
-"membros, check members</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5655,12 +5766,14 @@ msgstr ""
"sido eliminados)"
msgid "Select and zoom"
-msgstr ""
+msgstr "Selecionar e enquadrar"
msgid ""
"Selects the objects that take part in this command (unless currently "
"deleted), then and zooms to it"
msgstr ""
+"Seleciona os objetos que fazem parte deste comando (caso não tenham sido "
+"eliminados) e enquadra-os na vista"
msgid "Undo the selected and all later commands"
msgstr "Desfazer o comando selecionado e posteriores"
@@ -5923,7 +6036,7 @@ msgid "Bounding box: "
msgstr "Caixa de limites: "
msgid "Bounding box (projected): "
-msgstr ""
+msgstr "Caixa de limites (projetada): "
msgid "Coordinates: "
msgstr "Coordenadas: "
@@ -6127,6 +6240,9 @@ msgstr "Mostrar/Esconder"
msgid "Information about layer"
msgstr "Informação sobre a camada"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Estilos de Visualização do Mapa"
@@ -6210,6 +6326,38 @@ msgstr "O estilo está ativado?"
msgid "No"
msgstr "Não"
+msgid "Object type:"
+msgstr "Tipo de objeto:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "misto"
+
+msgid "Choose the OSM object type"
+msgstr "Escolha o tipo de objeto"
+
+msgid "Object ID:"
+msgstr "Identificador do objeto:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Introduza o identificador (ID) do objeto a ser descarregado"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Os identificadores (ID) dos objetos podem ser separados por vírgula ou "
+"espaço. Exemplos: <b><ul><li>6388 2012174 "
+"1518474</li><li>6388,2012174,1518474</li></ul><br/></b> No modo ''misto'' "
+"especifique os objetos da seguinte forma: <b>w123, n110, w12, "
+"r15</b><br/>(letras em inglês: w para linha; n para nó; r para relação<br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relações"
@@ -6233,11 +6381,8 @@ msgstr "Relações: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relações: {0}"
-msgid "Selection"
-msgstr "Seleção"
-
msgid "Open a selection list window."
-msgstr "Abrir uma janela com a lista de seleção"
+msgstr "Mostrar painel de objetos selecionados"
msgid "Current Selection"
msgstr "Seleção Atual"
@@ -6260,18 +6405,6 @@ msgstr "Não é selecionável neste momento"
msgid "Selection: {0}"
msgstr "Seleção: {0}"
-msgid "Side buttons"
-msgstr "Botões do fundo do painel"
-
-msgid "Always shown"
-msgstr "Mostrado sempre"
-
-msgid "Dynamic"
-msgstr "Dinâmico"
-
-msgid "Always hidden"
-msgstr "Ocultado sempre"
-
msgid "Toggle dynamic buttons"
msgstr "Mostrar sempre/mostrar automático dos botões do fundo deste painel"
@@ -6284,11 +6417,23 @@ msgstr ""
msgid ""
"Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr "Fechar este painel. Pode abri-lo de novo no menu Janelas."
+msgstr "Fechar este painel. Pode abri-lo de novo no menu Painéis."
msgid "Click to minimize/maximize the panel content"
msgstr "Clique para minimizar/maximizar o painel"
+msgid "Side buttons"
+msgstr "Botões do fundo do painel"
+
+msgid "Always shown"
+msgstr "Mostrado sempre"
+
+msgid "Dynamic"
+msgstr "Dinâmico"
+
+msgid "Always hidden"
+msgstr "Ocultado sempre"
+
msgid "Authors"
msgstr "Autores"
@@ -6308,11 +6453,8 @@ msgstr "Selecionar objetos criados ou alterados por este autor"
msgid "Launches a browser with information about the user"
msgstr "Abre no navegador da internet a página com informação do autor"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Aviso: a abrir janelas com informação apenas dos primeiros {0} de {1} "
-"autores selecionados"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6339,9 +6481,6 @@ msgstr "Mostra o painel de Validação para verificar se existem erros."
msgid "Validation results"
msgstr "Resultados da validação"
-msgid "Zoom to problem"
-msgstr "Enquadrar problema"
-
msgid "Fix"
msgstr "Corrigir"
@@ -6497,9 +6636,6 @@ msgstr "Atualizar conteúdo"
msgid "Update the changeset content from the OSM server"
msgstr "Atualiza o conteúdo do conjunto de alterações do servidor OSM"
-msgid "Show history"
-msgstr "Mostrar histórico"
-
msgid "Download and show the history of the selected objects"
msgstr "Descarrega e mostra o histórico os objetos selecionados"
@@ -6845,11 +6981,9 @@ msgstr ""
"mapa</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Aviso: valor inesperado na preferência ''{0}'', foi obtido ''{1}''. A "
-"recolocar o pedido pré-determinado."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6921,35 +7055,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Este endereço web do pedido de conjunto de alterações não é válido"
-msgid "Select objects for which to change properties."
-msgstr "Selecione os objetos nos quais quer alterar as etiquetas."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Etiquetas/Membro de relações"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Etiquetas dos objetos selecionados"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<diferente>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Membro das relações"
msgid "Position"
msgstr "Posição"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Etiquetas: {0} / Membro de relações: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Etiquetas / Membro das relações"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Eliminar as etiquetas selecionadas em todos os objetos selecionados"
-msgid "Delete Properties"
-msgstr "Eliminar Etiquetas"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Alterar relação"
@@ -6963,14 +7109,14 @@ msgstr "Quer mesmo retirar os membros selecionados da relação {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Adiciona uma nova etiqueta em todos os objetos selecionados"
-msgid "Add Property"
+msgid "Add Tag"
msgstr "Adicionar Etiqueta"
msgid "Edit the value of the selected key for all objects"
msgstr "Editar o valor da chave selecionada para todos os objetos"
-msgid "Edit Properties"
-msgstr "Editar Etiquetas"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Ver a página de ajuda sobre a etiqueta (F1)"
@@ -7057,12 +7203,6 @@ msgstr[1] "Alterar etiquetas de {0} objetos"
msgid "Use English language for tag by default"
msgstr "Usar por defeito a língua inglesa em etiquetas"
-msgid "Paste tag"
-msgstr "Colar etiqueta"
-
-msgid "Paste value"
-msgstr "Colar valor"
-
msgid "Add value?"
msgstr "Adicionar valor?"
@@ -7081,20 +7221,26 @@ msgid "Set number of recently added tags"
msgstr "Definir o número de etiquetas adicionadas recentemente"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Memorizar últimas etiquetas utilizadas"
msgid "Please enter the number of recently added tags to display"
msgstr "Introduza o número de etiquetas recentes a mostrar"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "Por favor introduza um número inteiro entre 0 e {0}"
msgid "Recently added tags"
msgstr "Etiquetas adicionadas recentemente"
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr "Utilizar novamente esta etiqueta"
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr "A chave ''{0}'' já está a ser utilizada"
@@ -7134,8 +7280,8 @@ msgstr "A relação foi eliminada"
msgid "Downloading relation {0}"
msgstr "A descarregar relação {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr "Aviso: a ignorar exceção porque a tarefa foi cancelada. Exceção: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7197,6 +7343,11 @@ msgstr "Removê-las, limpando a relação"
msgid "Ignore them, leave relation as is"
msgstr "Ignorá-las e deixar a relação como está"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Desculpe, atalho \"{0}\" não pode ser habilitado na caixa de diálogo do "
+"editor de Relação"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7479,6 +7630,26 @@ msgstr "a linha está ligada ao membro seguinte"
msgid "way is not connected to previous or next relation member"
msgstr "a linha não está ligada ao membro seguinte nem anterior"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Número incorreto de argumentos para o favorito"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Ocorreu um erro ao ler a entrada de favoritos: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Não foi possível ler os favoritos de<br>''{0}''<br>Erro: {1}</html>"
+
msgid "Bookmarks"
msgstr "Favoritos"
@@ -7553,9 +7724,6 @@ msgstr "O valor de latitude tem de ser no intervalo [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "O valor de longitude tem de ser no intervalo [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Colar URL da área de transferências"
-
msgid "Data Sources and Types:"
msgstr "Fonte e tipo de dados:"
@@ -7641,21 +7809,8 @@ msgstr "Descarregar referentes (relações-pai)"
msgid "Download object"
msgstr "Descarregar objeto"
-msgid "Object type:"
-msgstr "Tipo de objeto:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "misto"
-
-msgid "Choose the OSM object type"
-msgstr "Escolha o tipo de objeto"
-
-msgid "Object ID:"
-msgstr "Identificador do objeto:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Introduza o identificador (ID) do objeto a ser descarregado"
+msgid "Start downloading"
+msgstr "Começar a descarregar"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7667,30 +7822,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Selecione se os membros da relação devem ser também descarregados"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Os identificadores (ID) dos objetos podem ser separados por vírgula ou "
-"espaço. Exemplos: <b><ul><li>6388 2012174 "
-"1518474</li><li>6388,2012174,1518474</li></ul><br/></b> No modo ''misto'' "
-"especifique os objetos da seguinte forma: <b>w123, n110, w12, "
-"r15</b><br/>(letras em inglês: w para linha; n para nó; r para relação<br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Descarregar referentes (relações pai e linhas)"
-msgid "Start downloading"
-msgstr "Começar a descarregar"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Identificador da lista especificada inválida\n"
-"Não é possível descarregar o objeto."
-
msgid "Class Type"
msgstr "Sub-tipo"
@@ -7710,7 +7844,7 @@ msgid "Areas around places"
msgstr "Locais"
msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
+msgstr "Erro Null pointer exception provavelmente por faltarem tags."
msgid "Search ..."
msgstr "Pesquisar"
@@ -7803,8 +7937,8 @@ msgstr "Ir para a página seguinte"
msgid "Go to the JOSM help home page"
msgstr "Ir para a página inicial de ajuda do JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Aviso: localização incorreta no documento HTML. A exceção foi: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr ""
@@ -7916,6 +8050,9 @@ msgid ""
msgstr ""
"<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informação do conjunto de alterações"
@@ -8029,9 +8166,8 @@ msgstr ""
msgid "Object still in use"
msgstr "o objeto ainda está a ser utilizado"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Aviso: o cabeçalho de erro \"{0}\" não corresponde a nenhum padrão esperado"
msgid "Upload"
msgstr "Enviar"
@@ -8053,6 +8189,12 @@ msgstr "Forneça por favor um comentário breve sobre as alterações que fez:"
msgid "Enter an upload comment"
msgstr "Introduza um comentário das alterações"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Identificador do Conj. Alterações:"
@@ -8124,11 +8266,8 @@ msgid "Closing changeset {0}"
msgstr "A fechar o conjunto de alterações {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Aviso: não foi possível colocar a Janela de Credenciais sempre em cima. Foi "
-"apanhada uma exceção de segurança."
msgid "Enter credentials for OSM API"
msgstr "Introduza as credenciais para a API OSM"
@@ -8212,11 +8351,9 @@ msgid "Unpacking {0} into {1}"
msgstr "A desempacotar {0} em {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Aviso: Não foi possível descarregar o ficheiro ''{0}''. O Endereço ''{1}'' "
-"não é válido. A ignorar o descarregamento."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8233,11 +8370,8 @@ msgid "Missing user identity"
msgstr "Falta a identidade do utilizador"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Aviso: Não foi possível obter a informação de utilizador do utilizador do "
-"JOSM atual. A exceção foi: {0}"
msgid "Download objects"
msgstr "Descarregar objetos"
@@ -8489,12 +8623,6 @@ msgstr "Enviar os objetos alterados"
msgid "Please revise upload comment"
msgstr "Por favor reveja o comentário da edição"
-msgid "Revise"
-msgstr "Rever"
-
-msgid "Continue as is"
-msgstr "Continuar como está"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8509,6 +8637,22 @@ msgstr ""
"perder uns segundos agora a explicar o que alterou tornará a vida mais "
"fácil<br />a outros editores."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Rever"
+
+msgid "Continue as is"
+msgstr "Continuar como está"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Voltar à janela anterior para introduzir um comentário sobre a edição"
@@ -8525,6 +8669,21 @@ msgstr "Por favor introduza primeiro um número de pacotes válido"
msgid "Illegal chunk size"
msgstr "Número de pacotes inválido"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Cancelar o envio e continuar a editar"
@@ -8532,11 +8691,9 @@ msgid "Tags of changeset {0}"
msgstr "Etiquetas do conj. alt. {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Aviso: o objeto ''{0}'' já foi eliminado no servidor do OSM. A ignorar este "
-"objeto e tentar enviar novamente."
msgid "Preparing objects to upload ..."
msgstr "A preparar os objetos a enviar ..."
@@ -8673,9 +8830,6 @@ msgstr "A relação ''{0}'' já foi eliminada. A ignorar o objeto no envio."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "O objeto ''{0}'' já foi eliminado. A ignorar o objeto no envio."
-msgid "Warning: {0}"
-msgstr "Aviso: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "A enviar {0} objeto..."
@@ -8685,6 +8839,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr "A ignorar exceção porque o envio foi cancelado. Exceção: {0}"
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8705,10 +8862,8 @@ msgstr "Selecione os objetos a enviar"
msgid "Cancel uploading"
msgstr "Cancelar envio"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Aviso: valor inesperado para a chave ''{0}'' nas preferências. Obteve-se "
-"''{1}''"
msgid "Please select the upload strategy:"
msgstr "Escolha a forma como quer enviar os dados:"
@@ -8858,8 +9013,8 @@ msgstr "Marcador seguinte"
msgid "Jump to next marker"
msgstr "Ir para o marcador seguinte"
-msgid "Previos marker"
-msgstr "Marcador anterior"
+msgid "Previous marker"
+msgstr ""
msgid "Jump to previous marker"
msgstr "Saltar para o marcador anterior"
@@ -8891,8 +9046,8 @@ msgstr "versão {0}"
msgid "Merging layers"
msgstr "A fundir camadas"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Aviso: misturando dados 0.6 e 0.5 resulta na versão 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -9013,6 +9168,9 @@ msgstr "aproxime o enquadramento para ver mais detalhes"
msgid "No tiles at this zoom level"
msgstr "Sem telas a este nível"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "Camda TMS ({0}), a descarregar no nível de zoom {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "São suportadas as projeções EPSG:4326 e Mercator"
@@ -9052,6 +9210,9 @@ msgstr "Tornar a carregar telas com erros"
msgid "Alpha channel"
msgstr "Canal Alfa"
+msgid "Automatically change resolution"
+msgstr "Alterar automaticamente a resolução"
+
msgid "Set WMS Bookmark"
msgstr "Criar favorito da imagem de fundo WMS"
@@ -9268,9 +9429,6 @@ msgstr "A extrair localizações GPS do EXIF"
msgid "Starting directory scan"
msgstr "A começar a examinar o diretório"
-msgid "One of the selected files was null"
-msgstr "Um dos ficheiros selecionados não contém dados"
-
msgid "Read photos..."
msgstr "Ler fotografias..."
@@ -9289,6 +9447,9 @@ msgstr "Foi encontrado um ficheiro sem dados na pasta {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Ocorreu um erro ao obter os ficheiros no diretório {0}\n"
+msgid "One of the selected files was null"
+msgstr "Um dos ficheiros selecionados não contém dados"
+
msgid "Geotagged Images"
msgstr "Imagens Geo-posicionadas"
@@ -9348,6 +9509,12 @@ msgstr "Seguinte"
msgid "Show next Image"
msgstr "Mostrar imagem seguinte"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centrar vista"
@@ -9430,9 +9597,6 @@ msgstr ""
"<html>O envio de dados GPS não trabalhados como dados de mapa é considerado "
"prejudicial.<br>Se pretende enviar trilhos GPS, consulte a página:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Alterar visualização do trilho GPS"
@@ -9445,8 +9609,11 @@ msgstr "Até"
msgid "No timestamp"
msgstr "Sem marca de tempo"
-msgid "Download from OSM along this track"
-msgstr "Descarregar do OpenStreetMap ao longo deste trilho GPS"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Descarregar tudo num raio de:"
@@ -9472,16 +9639,18 @@ msgstr "apenas pontos"
msgid "track and waypoints"
msgstr "trilho e pontos"
+msgid "Click to download"
+msgstr ""
+
+msgid "Click to cancel"
+msgstr "Clique para cancelar."
+
+msgid "Download from OSM along this track"
+msgstr "Descarregar do OpenStreetMap ao longo deste trilho GPS"
+
msgid "Calculating Download Area"
msgstr "A Calcular Área de Descarregamento"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Esta ação irá necessitar de {0} pedidos individuais.<br>Quer "
-"continuar?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Carregar previamente imagens de fundo ao longo deste trilho"
@@ -9623,17 +9792,11 @@ msgstr "Ocorreu um erro ao tentar mostrar o URL deste marcador"
msgid "(URL was: "
msgstr "(o URL era: "
-msgid "Error displaying URL"
-msgstr "Erro ao mostrar o URL"
-
msgid "Select the map painting styles"
msgstr "Selecione os estilos de visualização do mapa"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Aviso: ocorreu um erro ao obter estilos de visualização de mapa de ''{0}''. "
-"O erro é: {1}"
msgid "loading style ''{0}''..."
msgstr "a carregar estilo ''{0}''..."
@@ -9653,10 +9816,8 @@ msgstr[1] ""
"\"info\" no menu que aparece ao clicar com o botão direito do rato sobre o "
"estilo."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Aviso: ocorreu um erro ao processar os estilos de visualização de mapa de "
-"''{0}''. O erro é: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Padrão de tracejado inválido. Os valores têm de ser positivos."
@@ -9666,11 +9827,8 @@ msgstr ""
"Padrão de tracejado não válido. Pelo menos um dos valores tem de ser > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Aviso: ocorreu um erro ao processar os estilos de visualização de mapa de "
-"''{0}''. O erro é: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Token de Acesso:"
@@ -9940,8 +10098,8 @@ msgstr "Fechar a janela e cancelar a autorização"
msgid "Close the dialog and accept the Access Token"
msgstr "Fechar a janela e aceitar o Token de Acesso"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Aviso: não foi possível cancelar a operação OAuth"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "A obter o Token de Pedido OAuth de ''{0}''"
@@ -10016,6 +10174,12 @@ msgstr ""
"Selecione para permitir que o JOSM possa gravar alterações nas preferências "
"da conta de utilizador no OSM"
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "A obter a Token de Acesso OAuth...."
@@ -10086,9 +10250,6 @@ msgstr ""
"Token. De futuro, o JOSM utilizará o Token para autenticação e autorização "
"no servidor do OpenStreetMap.<br><br>O Token de Acesso é: </html>"
-msgid "Restart"
-msgstr "Reiniciar"
-
msgid "Click to retrieve a Request Token"
msgstr "Clique para obter um Token de Pedido"
@@ -10370,7 +10531,7 @@ msgid "Expert mode"
msgstr "Modo avançado"
msgid "Close the preferences dialog and discard preference updates"
-msgstr "Fechar a janela de preferências e deitar fora as alterações"
+msgstr "Fechar a janela de preferências e não gravar as alterações"
msgid "Save the preferences and close the dialog"
msgstr "Gravar as preferências e fechar a janela"
@@ -10382,6 +10543,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"É necessário reiniciar o JOSM para poder utilizar as novas definições."
+msgid "Would you like to restart now?"
+msgstr "Quer reiniciar agora?"
+
msgid "Remote Control"
msgstr "Controlo Remoto"
@@ -10473,7 +10637,7 @@ msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
msgstr "Ficheiro de estilo de mapa (*.xml, *.mapcss, *.zip)"
msgid "Preset definition file (*.xml, *.zip)"
-msgstr ""
+msgstr "Ficheiro com as definições (*.xml, *.zip)"
msgid "Edit source entry:"
msgstr "Editar fonte:"
@@ -10517,6 +10681,12 @@ msgstr "Remover da barra de ferramentas"
msgid "Configure toolbar"
msgstr "Configurar barra de ferramentas"
+msgid "Edit shortcut"
+msgstr "Editar atalho"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Não esconder a barra de ferramentas nem o menu"
+
msgid "Actions"
msgstr "Ações"
@@ -10561,6 +10731,9 @@ msgstr "Ação da barra de ferramentas registada sem nome: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr "Barra de ferramentas: {0}"
+
msgid "Data validator"
msgstr "Verificador de dados"
@@ -10622,25 +10795,12 @@ msgstr "Pesquisar: "
msgid "Read from file"
msgstr "Importar de 1 ficheiro"
-msgid "Open JOSM customization file"
-msgstr "Abrir ficheiro de personalização JOSM"
-
-msgid "Import log"
-msgstr "Importar registo"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Aqui está o sumário da importação do ficheiro. <br/>Pode rejeitar as "
-"alterações às preferências clicando no botão \"Cancelar\" na janela das "
-"preferências após fechar esta janela. <br/>Pode ser necessário reiniciar o "
-"JOSM para ativar algumas alterações.</html>"
-
msgid "Export selected items"
msgstr "Exportar itens selecionados"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Ficheiros de configurações personalizadas JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Por favor selecione algumas preferências que tenham sido alteradas dos "
@@ -10660,43 +10820,54 @@ msgstr ""
msgid "Replace existing values"
msgstr "Substituir valores existentes"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Ficheiros de configurações personalizadas JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Abrir ficheiro de personalização JOSM"
-msgid "Advanced Background: Changed"
-msgstr "Fundo Avançado: Alterado"
+msgid "Import log"
+msgstr "Importar registo"
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Aqui está o sumário da importação do ficheiro. <br/>Pode rejeitar as "
+"alterações às preferências clicando no botão \"Cancelar\" na janela das "
+"preferências após fechar esta janela. <br/>Pode ser necessário reiniciar o "
+"JOSM para ativar algumas alterações.</html>"
-msgid "Advanced Background: NonDefalut"
-msgstr "Fundo Avançado: NãoPadrão"
+msgid "shortcut"
+msgstr "atalho"
-msgid "Current value is default."
-msgstr "O valor atual é o valor de origem."
+msgid "color"
+msgstr ""
-msgid "Default value is ''{0}''."
-msgstr "Valor padrão é ''{0}''."
+msgid "toolbar"
+msgstr "barra de ferramentas"
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "imagery"
msgstr ""
-"Valor padrão desconhecido neste momento (a preferência ainda não foi "
-"utilizada)."
-msgid "Select Setting Type:"
-msgstr "Selecione o Tipo de Preferência:"
+msgid "Reset preferences"
+msgstr "Restaurar preferências"
-msgid "Simple"
-msgstr "Simples"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
-msgid "List"
-msgstr "Lista"
+msgid "Load profile"
+msgstr "Carregar perfil"
-msgid "List of lists"
-msgstr "Lista de listas"
+msgid "Save {0} profile"
+msgstr "Salvar {0} perfil"
-msgid "List of maps"
-msgstr "Lista de mapas"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
-msgid "Add setting"
-msgstr "Adicionar preferência"
+msgid "Choose profile file"
+msgstr ""
msgid "Change list setting"
msgstr "Alterar preferência de lista"
@@ -10719,6 +10890,41 @@ msgstr "Alterar preferência de lista de mapas"
msgid "Entry {0}"
msgstr "Entrada {0}"
+msgid "Select Setting Type:"
+msgstr "Selecione o Tipo de Preferência:"
+
+msgid "Simple"
+msgstr "Simples"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "List of lists"
+msgstr "Lista de listas"
+
+msgid "List of maps"
+msgstr "Lista de mapas"
+
+msgid "Add setting"
+msgstr "Adicionar preferência"
+
+msgid "Advanced Background: Changed"
+msgstr "Fundo Avançado: Alterado"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "O valor atual é o valor de origem."
+
+msgid "Default value is ''{0}''."
+msgstr "Valor padrão é ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Valor padrão desconhecido neste momento (a preferência ainda não foi "
+"utilizada)."
+
msgid "Change string setting"
msgstr "Alterar preferência de expressão"
@@ -10776,6 +10982,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr "Mostrar camadas inativas noutra cor"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "Destacar linhas e nós alvo ao selecionar ou desenhar"
@@ -10847,6 +11056,11 @@ msgstr ""
"As áreas não serão preenchidas com cores, mesmo que esteja definido no "
"estilo de visualização de mapas."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr "Opções que influenciam a performance"
@@ -11167,8 +11381,14 @@ msgstr "Obter camadas"
msgid "2. Select layers"
msgstr "2. Selecionar camadas"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Verificar o URL do WMS gerado"
+msgid "3. Select image format"
+msgstr "Selecione o formato de imagem"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Verifique o URL gerado para o WMS"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Indique o nome para esta camada"
msgid "Show Bounds"
msgstr "Mostrar limites"
@@ -11350,6 +11570,12 @@ msgstr ""
"adicionando ''~'' no final do nome do ficheiro e gravando na mesma "
"pasta.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Cópias de segurança"
@@ -11417,8 +11643,8 @@ msgstr "Definições de Mapas"
msgid "Settings for the map projection and data interpretation."
msgstr "Definições da projeção do mapa e interpretação de dados."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Aviso: Não foi possível ler a fonte de modelos de etiquetas: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Não foi possível ler a fonte do modelo de etiquetas: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11610,7 +11836,7 @@ msgid "Datum name"
msgstr "Nome do datum"
msgid "3 or 7 term datum transform parameters"
-msgstr ""
+msgstr "3 ou 7 parâmetros para a transformação do datum"
msgid "NTv2 grid file"
msgstr "Ficheiro de grelha NTv2"
@@ -11702,21 +11928,6 @@ msgstr "Grelha Sueca (Suíça)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (sem correções locais)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zona UTM"
-
-msgid "North"
-msgstr "Norte"
-
-msgid "South"
-msgstr "Sul"
-
-msgid "Hemisphere"
-msgstr "Hemisfério"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Fort-Marigot Guadalupe 1949"
@@ -11738,6 +11949,21 @@ msgstr "UTM França (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Sistema geodésico"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zona UTM"
+
+msgid "North"
+msgstr "Norte"
+
+msgid "South"
+msgstr "Sul"
+
+msgid "Hemisphere"
+msgstr "Hemisfério"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "A testar o endereço da API OSM ''{0}''"
@@ -11805,11 +12031,9 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Selecione para usar o mecanismo de autenticação OAuth"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Aviso: valor na preferência ''{0}'' não suportado, obteve-se ''{1}''. A usar "
-"o método de autenticação ''Autenticação Básica''."
msgid "OSM username:"
msgstr "Nome de utilizador OSM:"
@@ -11817,27 +12041,26 @@ msgstr "Nome de utilizador OSM:"
msgid "OSM password:"
msgstr "Palavra-passe OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Aviso: não foi possível obter as credenciais OSM do gestor de credenciais."
msgid "Current credential manager is of type ''{0}''"
msgstr "O gestor de credenciais atual é do tipo ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Aviso: não foi possível gravar as credenciais OSM no gestor de credenciais."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-"Aviso: Não foi possível obter o Token de Acesso OAuth do gestor de "
-"credenciais"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Aviso: Não foi possível gravar o Token de Acesso OAuth no gestor de "
-"credenciais"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11930,17 +12153,8 @@ msgid "Use a SOCKS proxy"
msgstr "Utilizar um proxy SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-"Aviso: o JOSM está configurado para usar o proxy com as configurações do "
-"sistema, mas o JVM não está configurado para obtê-las. A alterar a "
-"configuração para ''Sem proxy''"
-
-msgid "disabled"
-msgstr "desativar"
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -11986,38 +12200,37 @@ msgstr ""
msgid "Add a new tag"
msgstr "Adicionar uma etiqueta nova"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Utilizar modelo ''{0}'' do grupo ''{1}''"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Utilizar modelo ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Aviso sobre os modelos de etiquetas \"{0}-{1}\": A ignorar o atributo "
-"''{2}'' conforme ''{3}'' elementos indicados."
+msgid "Elements of type {0} are supported."
+msgstr "São suportados os elementos do tipo {0}"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Modelo de etiquetas com erros \"{0}-{1}\" - o número de itens em "
-"''display_values'' tem de ser igual ao número de ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Alterar {0} objeto"
+msgstr[1] "Alterar {0} objetos"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Modelo de etiquetas com erros \"{0}-{1}\" - o número de itens em "
-"''short_descriptions'' tem de ser igual ao número de ''values''"
+msgid "Nothing selected!"
+msgstr "Nada selecionado!"
-msgid "More information about this feature"
-msgstr "Mais informação sobre esta funcionalidade"
+msgid "Selection unsuitable!"
+msgstr "Seleção inadequada a este modelo de etiqueta!"
+
+msgid "Apply Preset"
+msgstr "Aplicar Etiquetas"
+
+msgid "New relation"
+msgstr "Criar relação"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Requisito desconhecido: {0}"
@@ -12025,6 +12238,9 @@ msgstr "Requisito desconhecido: {0}"
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Mais informação sobre esta funcionalidade"
+
msgid "Available roles"
msgstr "Funções disponíveis"
@@ -12040,52 +12256,48 @@ msgstr "elementos"
msgid "Optional Attributes:"
msgstr "Atributos Opcionais:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Utilizar modelo ''{0}'' do grupo ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr ""
-msgid "Use preset ''{0}''"
-msgstr "Utilizar modelo ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr ""
-msgid "Unknown type: {0}"
-msgstr "Tipo desconhecido: {0}"
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Roles cannot appear more than once"
-msgstr "As funções não podem aparecer mais do que uma vez"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Aviso sobre os modelos de etiquetas \"{0}-{1}\": A ignorar o atributo "
+"''{2}'' conforme ''{3}'' elementos indicados."
-msgid "Preset role element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Não foi possível ler a fonte do modelo de etiquetas: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Modelo de etiquetas com erros \"{0}-{1}\" - o número de itens em "
+"''display_values'' tem de ser igual ao número de ''values''"
-msgid "Error parsing {0}: "
-msgstr "Erro ao processar {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Modelo de etiquetas com erros \"{0}-{1}\" - o número de itens em "
+"''short_descriptions'' tem de ser igual ao número de ''values''"
-msgid "Elements of type {0} are supported."
-msgstr "São suportados os elementos do tipo {0}"
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Alterar {0} objeto"
-msgstr[1] "Alterar {0} objetos"
-
-msgid "Nothing selected!"
-msgstr "Nada selecionado!"
-
-msgid "Selection unsuitable!"
-msgstr "Seleção inadequada a este modelo de etiqueta!"
-
-msgid "Apply Preset"
-msgstr "Aplicar Etiquetas"
-
-msgid "New relation"
-msgstr "Criar relação"
-
-msgid "Change Properties"
-msgstr "Alterar Propriedades"
+msgid "Unknown type: {0}"
+msgstr "Tipo desconhecido: {0}"
msgid "Preset group {1} / {0}"
msgstr "Grupo de modelos {1} / {0}"
@@ -12093,11 +12305,23 @@ msgstr "Grupo de modelos {1} / {0}"
msgid "Preset group {0}"
msgstr "Grupo de modelos {0}"
+msgid "Roles cannot appear more than once"
+msgstr "As funções não podem aparecer mais do que uma vez"
+
+msgid "Preset role element without parent"
+msgstr "Elemento de função predefinido sem pai"
+
+msgid "Preset sub element without parent"
+msgstr "Elemento secundário predefinido sem pai"
+
+msgid "Error parsing {0}: "
+msgstr "Erro ao processar {0}: "
+
msgid "Search preset"
msgstr "Procurar modelo"
msgid "Show preset search dialog"
-msgstr "Mostra a janela de procura de modelos"
+msgstr "Mostra a janela de procura de modelos de etiquetas"
msgid "Search presets"
msgstr "Procurar modelo de etiquetas"
@@ -12108,6 +12332,16 @@ msgstr "Mostrar apenas etiquetas aplicáveis aos objetos selecionados"
msgid "Search in tags"
msgstr "Procurar nas etiquetas em inglês"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Ajustável {0} não registrado ainda. Não foi possível configurar participação "
+"no ajuste sincronizado."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Ajustável {0} não registrado ainda."
+
msgid "All files (*.*)"
msgstr "Todos os ficheiros (*.*)"
@@ -12143,6 +12377,59 @@ msgstr ""
"O valor atual não é um identificador de objeto do OpenStreetMap válido. Por "
"favor introduza um número inteiro > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "falso: a propriedade não está definida"
+
+msgid "true: the property is explicitly switched on"
+msgstr "verdadeiro: a propriedade está atribuída"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"parcial: objetos diferentes selecionados com propriedades diferentes, não "
+"alterar"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "não definido: não atribuir esta propriedade nos objetos selecionados"
+
+msgid "Cut"
+msgstr "Cortar"
+
+msgid "Right click = copy to clipboard"
+msgstr "Clique com o botão direito do rato = copiar endereço web"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Falta o atributo obrigatório ''{0}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"O valor do atributo obrigatório ''{0}'' de tipo longo está errado. "
+"Atualmente é ''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"O valor do atributo obrigatório ''{0}'' de tipo longo (>=0) está errado. "
+"Atualmente é ''{1}''."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Valor incorreto do atributo obrigatório ''{0}'' do tipo booleano. Obteve-se "
+"''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Valor incorreto do atributo obrigatório ''{0}'' do tipo OsmPrimitiveType. "
+"Obteve-se ''{1}''."
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -12179,11 +12466,9 @@ msgid "Contacting OSM Server..."
msgstr "A contactar o servidor OpenStreetMap..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Aviso: valor incorreto do atributo ''{0}'' do elemento ''{1}'' nas "
-"capacidades do servidor. Obteve-se ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Não foi possível processar a data ''{0}'' fornecida pelo servidor."
@@ -12230,40 +12515,27 @@ msgstr ""
"Formato de número de porta ilegal nas preferências ''{0}''. Obteve-se {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Aviso: foi encontrado um valor inesperado na preferência ''{0}''. Obteve-se "
-"''{1}''. Não será utilizado o proxy."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Aviso: Parâmetros para o proxy HTTP inesperados. Obteve-se o servidor "
-"''{0}'' e a porta ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Aviso: Parâmetros para o proxy SOCKS inesperados. Obteve-se o servidor "
-"''{0}'' e a porta ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Erro: Falhou a ligação com o proxy ''{0}'' para o URI ''{1}''. A exceção "
-"foi: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Aviso: a Máquina Virtual Java (JVM) não está configurada para procurar por "
-"proxies nas definições do sistema operativo. Faltou a propriedade "
-"''java.net.useSystemProxies'' ao arrancar. Não será utilizado o proxy."
msgid "Parsing response from server..."
msgstr "A analisar a resposta do servidor..."
@@ -12366,6 +12638,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Erro de processamento: estrutura de documento GPX inválida"
+msgid "(at line {0}, column {1})"
+msgstr "(na linha {0}, coluna {1})"
+
msgid "Unknown mode {0}."
msgstr "Modo desconhecido: {0}."
@@ -12381,15 +12656,21 @@ msgstr "A procurar por ficheiros de imagem"
msgid "No image files found."
msgstr "Nenhum ficheiro de imagem encontrado."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Não foi possível abrir a entrada de dados do recurso ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Aviso: não foi possível abrir o ficheiro com a extensão ''{2}'' e o nome "
-"''{3}'' no ficheiro ZIP ''{0}''. Exceção: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Não foi possível alterar o nome do ficheiro de {0} para {1}."
@@ -12480,8 +12761,8 @@ msgstr "Expressões desconhecidas: {0}"
msgid "Zero coordinates: {0}"
msgstr "Coordenadas nulas: {0}"
-msgid "NMEA import success"
-msgstr "Importação NMEA bem sucedida"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Falhou a importação de ficheiro NMEA-0183!"
@@ -12588,47 +12869,13 @@ msgstr "Nenhuns dados encontrados no ficheiro {0}."
msgid "Open OsmChange file"
msgstr "Abrir ficheiro OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Falta o atributo obrigatório ''{0}''."
-
msgid "Unsupported version: {0}"
msgstr "Versão não suportada: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"O valor do atributo obrigatório ''{0}'' de tipo longo está errado. "
-"Atualmente é ''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"O valor do atributo obrigatório ''{0}'' de tipo longo (>=0) está errado. "
-"Atualmente é ''{1}''."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Valor incorreto do atributo obrigatório ''{0}'' do tipo booleano. Obteve-se "
-"''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Valor incorreto do atributo obrigatório ''{0}'' do tipo OsmPrimitiveType. "
-"Obteve-se ''{1}''."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Aviso: elemento de início ''{0}'' não suportado existente no conjunto de "
-"alterações na posição ({1},{2}). A ignorar."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12638,11 +12885,9 @@ msgstr ""
"''create'' (criar), ''modify'' (modificar), ou ''delete'' (eliminar)."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Aviso: elemento final ''{0}'' não suportado existente no conjunto de "
-"alterações na posição ({1},{2}). A ignorar."
msgid "Parsing changeset content ..."
msgstr "A processar o conteúdo do conjunto de alterações"
@@ -12670,11 +12915,8 @@ msgstr "A processar a lista de conjuntos de alterações..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "A autenticação da ligação HTTP com uma assinatura de OAuth falhou"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Aviso: valor inesperado na preferência ''{0}''. Obteve-se ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(na linha {0}, coluna {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Ocorreu um erro ao gravar.<br>O erro é:<br>{0}</html>"
@@ -12686,9 +12928,6 @@ msgstr ""
"<html>Ocorreu um erro ao restaurar a cópia de "
"segurança.<br>Erro:<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Não foi possessível fazer a cópia de seguranças. Exceção: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Ficheiros de Servidor OSM comprimidos em gzip"
@@ -12710,6 +12949,9 @@ msgstr "Nenhuns dados encontrados no ficheiro ''{0}''."
msgid "Open OSM file"
msgstr "Abrir ficheiro OSM"
+msgid "Reading was canceled"
+msgstr "A leitura foi cancelada"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12768,11 +13010,9 @@ msgstr ""
"Obteve-se {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"Aviso: O atributo de normalização ''version'' do elemento {0} a {2}, a "
-"versão API é ''{3}''. Atualmente é {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Versão API desconhecida ou não suportada. Obteve-se {0}."
@@ -12924,26 +13164,38 @@ msgid "Save user and password (unencrypted)"
msgstr "Gravar nome de utilizador e palavra-passe (sem encriptação)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<eliminar de {0} objetos>"
+
+msgid "Old values of"
+msgstr "Valores anteriores de"
msgid "Add tags to selected objects"
msgstr "Adicionar etiquetas aos objetos selecionados"
msgid "Add selected tags"
-msgstr ""
+msgstr "Adicionar etiquetas selecionadas"
msgid "Add all tags"
-msgstr ""
+msgstr "Adicionar todas as etiquetas"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "Adicionar etiquetas selecionadas aos objetos selecionados"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "SHIFT+ENTER: Adicionar todas as etiquetas aos objetos selecionados"
msgid "Assume"
+msgstr "Aceitar"
+
+msgid "Existing values"
+msgstr "Valores existentes"
+
+msgid "Enable the checkbox to accept the value"
msgstr ""
+msgid "Accept all tags from {0} for this session"
+msgstr "Aceitar todas as etiquetas de {0} nesta sessão"
+
msgid "Load data from API"
msgstr "Carregar dados da API"
@@ -12968,19 +13220,20 @@ msgstr "Criar objetos"
msgid "Read protocol version"
msgstr "Ler a versão do protocolo"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-"Aviso: não foi possível iniciar o servidor de Controlo Remoto na porta {0}: "
-"{1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "ControloRemoto::Aceitando ligações na porta {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "ControloRemoto::Servidor parado."
msgid "Remote Control has been asked to create a new node."
msgstr "Foi pedido ao Controlo Remoto para criar um nó."
msgid "There is no layer opened to add node"
-msgstr ""
-
-msgid "Add way"
-msgstr "Adicionar linha"
+msgstr "Não existe uma camada aberta onde adicionar o nó"
msgid "Remote Control has been asked to create a new way."
msgstr "Foi pedido ao Controlo Remoto para criar uma linha."
@@ -12989,6 +13242,14 @@ msgid "Invalid coordinates: {0}"
msgstr "Coordenadas inválidas: {0}"
msgid "There is no layer opened to add way"
+msgstr "Não existe uma camada aberta onde adicionar a linha"
+
+msgid "Add way"
+msgstr "Adicionar linha"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
msgstr ""
msgid ""
@@ -13007,6 +13268,15 @@ msgstr "Foi pedido ao Controlo Remoto para importar dados do endereço:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Foi pedido ao Controlo Remoto para carregar dados da API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -13041,20 +13311,20 @@ msgstr "Dados:"
msgid "local file"
msgstr "ficheiro local"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Link para um ficheiro de dados OSM no seu disco local."
+msgid "Link to a GPX file on your local disk."
+msgstr ""
msgid "include"
msgstr "incluir"
-msgid "Include OSM data in the .joz session file."
-msgstr "Incluir dados OSM no ficheiro de sessão .joz"
+msgid "Include GPX data in the .joz session file."
+msgstr ""
msgid "No file association"
msgstr "Sem associação de ficheiros"
-msgid "OSM data will be included in the session file."
-msgstr "Os dados OSM serão incluídos no ficheiro de sessão."
+msgid "GPX data will be included in the session file."
+msgstr ""
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13075,6 +13345,15 @@ msgstr "A camada contém dados por gravar - gravar num ficheiro."
msgid "Layer does not contain unsaved data."
msgstr "A camada não contém dados por gravar."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Link para um ficheiro de dados OSM no seu disco local."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Incluir dados OSM no ficheiro de sessão .joz"
+
+msgid "OSM data will be included in the session file."
+msgstr "Os dados OSM serão incluídos no ficheiro de sessão."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -13082,6 +13361,9 @@ msgstr ""
"A versão ''{0}'' de dados meta para a camada OSM não é suportada. Esperado: "
"0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Ficheiro de sessão (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Não foi possível localizar o ficheiro ''{0}''."
@@ -13159,18 +13441,14 @@ msgid "Download skipped"
msgstr "Descarregamento ignorado"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Aviso: não foi possível descarregar o módulo ''{0}'' porque o endereço dele "
-"não é conhecido. A ignorar descarregamento."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Aviso: não foi possível descarregar o módulo ''{0}'' porque o endereço "
-"''{1}'' não é válido. A ignorar descarregamento."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Não foi possível criar a pasta de módulos ''{0}''"
@@ -13336,12 +13614,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Não foi possível atualizar o módulo"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Aviso: não foi possível encontrar o módulo {0}"
+msgid "Failed to find plugin {0}"
+msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
-"Aviso: não foi possível descarregar a lista de informações dos módulos"
msgid "Disable plugin"
msgstr "Desativar módulo"
@@ -13355,27 +13632,22 @@ msgstr "Manter módulo"
msgid "Click to keep the plugin ''{0}''"
msgstr "Clique para manter o módulo ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Aviso: Não foi possível eliminar o módulo desatualizado ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Aviso: não foi possível instalar o módulo ''{0}'' já descarregado. A ignorar "
-"a instalação. O JOSM irá carregar a versão anterior do módulo."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Aviso: não foi possível instalar o módulo ''{0}'' no ficheiro temporário "
-"descarregado ''{1}''. Falhou a alteração do nome."
msgid "Click to disable the plugin ''{0}''"
msgstr "Clique para desativar o módulo ''{0}''"
@@ -13417,7 +13689,7 @@ msgstr ""
"Editar>Preferências>Módulos para alterar isto depois)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Ficheiro jar inválido ''{0}''"
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "O ficheiro ''{0}'' do módulo não inclui um Manifesto."
@@ -13451,11 +13723,8 @@ msgstr "A processar os ficheiros na cache do site de módulos..."
msgid "Processing file ''{0}''"
msgstr "A processar o ficheiro ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Aviso: Não foi possível obter informações sobre o módulo no ficheiro "
-"''{0}''. A ignorar."
msgid "Processing plugin site cache icon files..."
msgstr "A processar os ficheiros de ícones na cache do site de módulos..."
@@ -13469,19 +13738,32 @@ msgstr "Descarregar lista de módulos..."
msgid "Downloading plugin list from ''{0}''"
msgstr "A descarregar a lista de módulos de ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Aviso: não foi possível criar a pasta de módulos ''{0}''. Não é possível "
-"guardar na cache a lista de módulos ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr ""
"A gravar a lista de módulos na pasta de ficheiros temporários ''{0}''"
msgid "Parsing plugin list from site ''{0}''"
-msgstr "A analisar lista de módulos de ''{0}''"
+msgstr "Analisar lista de módulos ''{0}''"
msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
@@ -13932,23 +14214,12 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Não foi possível localizar a imagem ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Aviso: não foi possível manipular o ficheiro ZIP ''{0}''. Exceção: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
-"Aviso: não foi possível aceder ao diretório ''{0}'' por razões de segurança. "
-"Exceção: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Aviso: não foi possível obter o prefixo de idioma wiki do código de idioma "
-"do JOSM ''{0}''. A usar o código de origem ''en''."
msgid "{0}... [please type its number]"
msgstr "{0}... [por favor digite o seu número]"
@@ -13960,9 +14231,52 @@ msgstr ""
"Não foi possível abrir o endereço web. Não está definida nenhuma plataforma "
"neste momento. Por favor defina primeiro uma plataforma."
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr "reservado"
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Conflito silencioso de atalho de teclado: ''{0}'' alterado de ''{1}'' para "
@@ -13974,22 +14288,22 @@ msgstr[0] ""
msgstr[1] ""
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "Chave demasiado longa (máximo {0} caracteres):"
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "Caractere suspeito na chave:"
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "Valor demasiado longo (máximo {0} caracteres):"
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Quer colar estas etiquetas?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Limpar memória"
msgid "Ignore warnings"
-msgstr ""
+msgstr "Ignorar avisos"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
@@ -13998,10 +14312,24 @@ msgstr ""
"<html><p> Desculpe, mas não é possível colar etiquetas da memória porque não "
"contém nenhum elemento do JOSM ou texto adequado. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Clique com o botão direito do rato = copiar endereço web"
+msgid "ms"
+msgstr ""
-msgid ""
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
msgstr ""
@@ -14346,6 +14674,11 @@ msgid "Saturation:"
msgstr "Saturação:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14442,6 +14775,12 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Procura e corrige endereços inválidos de forma fácil."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Converse com outras pessoas que estejam a editar nas redondezas do local que "
+"está a editar (necessário que usem o JOSM e este módulo)."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14477,7 +14816,7 @@ msgstr ""
"alinhamentos com um simples botão."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Modo do mapa de alinhamento de imagem de fundo WMSPlugin-style"
+msgstr ""
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -14567,9 +14906,6 @@ msgstr ""
"Simplifica o descarregamento de diferentes APIs de leitura, através de "
"servidores espelhos do OpenStreetMap (com conteúdo duplicado do OSM)."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Converte uma área num polígono."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Permite atribuir etiquetas a todos os objetos em qualquer área selecionada "
@@ -14656,6 +14992,9 @@ msgstr ""
"esta funcionalidade no menu de contexto que aparece clicando com o botão "
"direito do rato na camada da imagem."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14687,9 +15026,6 @@ msgstr "Simplifica o mapeamento e edição de rotas de transportes públicos."
msgid "Relation and multipolygon creating and editing panel."
msgstr "Painel de criação de relações e multi-polígonos."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Adiciona ''Reiniciar o JOSM'' no menu ''Ficheiro''"
-
msgid "Plugin for reverting changesets"
msgstr "Módulo para reverter conjuntos de alterações"
@@ -14730,9 +15066,6 @@ msgstr ""
"Simplifica linhas/áreas removendo nós em ângulos obtusos. Pode-se configurar "
"várias opções na aba do módulo após a instalação nas preferências."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Criar e alterar cartas marítimas para o OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Editar funcionalidades para o OpenSeaMap"
@@ -14792,6 +15125,11 @@ msgstr ""
"Traça edifícios do mapa cadastral Checo. É necessário que esteja a correr o "
"TracerServer (.NET ou Mono)."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Módulo para assinar digitalmente dados do OpenStreetMap"
@@ -14859,7 +15197,7 @@ msgstr ""
"outras linhas"
msgid "Simplifys linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "Facilita a ligação de objetos do mapa a páginas da Wikipédia."
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -14874,9 +15212,6 @@ msgstr ""
"ESC. É criada automaticamente uma camada ''Car GPS trace'' com o percurso em "
"GPX."
-msgid "Highways"
-msgstr "Vias"
-
msgid "Streets"
msgstr "Estradas"
@@ -14961,6 +15296,9 @@ msgstr "Elevação feita no terreno"
msgid "Lit"
msgstr "Com iluminação"
+msgid "Toll"
+msgstr "Com Portagem Física ou Eletrónica (Via Verde e Ex-SCUT)"
+
msgid "Motorway Link"
msgstr "Ligação a Auto-Estrada"
@@ -15051,6 +15389,50 @@ msgstr "Rua Residencial"
msgid "Edit Residential Street"
msgstr "Editar Rua Residencial"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Tipo de estrada"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "sim"
+
+msgid "no"
+msgstr "não"
+
+msgid "destination"
+msgstr "destino"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Living Street (não existem em Portugal)"
@@ -15058,7 +15440,7 @@ msgid "Edit Living Street"
msgstr "Editar Living Street (não existem em Portugal)"
msgid "Pedestrian"
-msgstr "Pedonal"
+msgstr "Rua Pedonal"
msgid "Edit Pedestrian Street"
msgstr "Editar Rua Pedonal"
@@ -15069,14 +15451,14 @@ msgstr "É uma área e não uma linha"
msgid "Service"
msgstr "Estrada de Serviço (residência/loja/indústria)"
-msgid "Edit Serviceway"
-msgstr "Editar Estrada de Serviço (residência/loja/indústria)"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Tipo de serviço"
+msgid "Service way type"
+msgstr ""
msgid "alley"
-msgstr ""
+msgstr "rua de traseiras"
msgid "driveway"
msgstr "acesso a residência / loja / serviço"
@@ -15084,6 +15466,9 @@ msgstr "acesso a residência / loja / serviço"
msgid "parking_aisle"
msgstr "estrada apenas para estacionar"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Estrada de Parque de Estacionamento"
@@ -15111,18 +15496,12 @@ msgstr "rotunda"
msgid "jughandle"
msgstr "jughandle (não usado em Portugal)"
-msgid "yes"
-msgstr "sim"
-
msgid "Road Restrictions"
msgstr "Restrições de Circulação"
msgid "Edit Road Restrictions"
msgstr "Editar Restrições de Circulação"
-msgid "Toll"
-msgstr "Com Portagem Física ou Eletrónica (Via Verde e Ex-SCUT)"
-
msgid "No exit (cul-de-sac)"
msgstr "Sem saída"
@@ -15132,9 +15511,6 @@ msgstr "Restrições de transporte"
msgid "General Access"
msgstr "Acesso"
-msgid "destination"
-msgstr "destino"
-
msgid "delivery"
msgstr "apenas para entregas de mercadoria"
@@ -15144,15 +15520,15 @@ msgstr "permitido pelo proprietário"
msgid "private"
msgstr "privado"
+msgid "customers"
+msgstr "clientes"
+
msgid "agricultural"
msgstr "apenas tráfego agrícola"
msgid "forestry"
msgstr "apenas tráfego florestal"
-msgid "no"
-msgstr "não"
-
msgid "official"
msgstr "oficial (c/sinal de tipo de acessos autorizados)"
@@ -15198,6 +15574,9 @@ msgstr "Veículos de alta ocupação (carpool)"
msgid "Public Service Vehicles (psv)"
msgstr "Transporte Público de Passageiros"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Velocidade mínima (km/h)"
@@ -15282,6 +15661,9 @@ msgstr "Editar Ponte"
msgid "viaduct"
msgstr "viaduto"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "giratória"
@@ -15392,20 +15774,29 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilidade do caminho"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "excelente"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "boa"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "intermédia"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "má"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "horrível"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Cadeiras de rodas"
@@ -15422,11 +15813,11 @@ msgstr "Caminho exclusivo para cavalos"
msgid "Edit Bridleway"
msgstr "Editar Caminho exclusivo para cavalos"
-msgid "Cycle Lane"
-msgstr "Faixa para Bicicletas"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Editar Faixa para Bicicletas"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Ciclovia"
@@ -15463,8 +15854,8 @@ msgstr "Ciclovia direita"
msgid "Oneway (bicycle)"
msgstr "Sentido único (bicicleta)"
-msgid "Edit Highway"
-msgstr "Editar estrada"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "Estrada"
@@ -15532,12 +15923,18 @@ msgstr "Área de Descanso (sem posto combustível, nem loja...)"
msgid "Edit Rest Area"
msgstr "Área de Descanso (sem posto combustível, nem loja...)"
-msgid "Emergency Phone"
-msgstr "Telefone de Emergência"
+msgid "Drinking Water"
+msgstr "Água Potável (bebedouro, fonte...)"
msgid "Traffic Signal"
msgstr "Semáforo"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Tipo de Passagem de Peões"
@@ -15553,15 +15950,6 @@ msgstr "ilha de refúgio para peões no meio da via"
msgid "unmarked"
msgstr "sem marcas no piso nem semáforos"
-msgid "Cross on horseback"
-msgstr "Atravessamento permitido a cavalo"
-
-msgid "Cross by bicycle"
-msgstr "Atravessamento permitido com bicicleta"
-
-msgid "Crossing attendant"
-msgstr "Com sinaleiro de passagem de peões (raro)"
-
msgid "Crossing type name (UK)"
msgstr "Sub-tipo de passagem"
@@ -15583,6 +15971,15 @@ msgstr "pegasus (não usada em Portugal)"
msgid "tiger"
msgstr "tiger (não usada em Portugal)"
+msgid "Crossing attendant"
+msgstr "Com sinaleiro de passagem de peões (raro)"
+
+msgid "Cross by bicycle"
+msgstr "Atravessamento permitido com bicicleta"
+
+msgid "Cross on horseback"
+msgstr "Atravessamento permitido a cavalo"
+
msgid "Stop"
msgstr "Stop"
@@ -15592,6 +15989,9 @@ msgstr "Cedência de passagem"
msgid "Mini-roundabout"
msgstr "Mini-rotunda (raríssimo)"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Sentido do trânsito"
@@ -15601,11 +16001,8 @@ msgstr "dos ponteiros do relógio"
msgid "Pedestrian Crossing"
msgstr "Passagem de Peões (normalmente c/ passadeira)"
-msgid "Edit Crossing"
-msgstr "Editar Passagem de Peões (normalmente c/ passadeira)"
-
-msgid "Type name (UK)"
-msgstr "Sub-tipo de passagem"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "Redutor de Velocidade (lombas...)"
@@ -15637,9 +16034,6 @@ msgstr "lomba comprida (+3m; plana no meio; normalmente passadeira)"
msgid "Passing Place"
msgstr "Lugar de Passagem (em vias estreitas de 1 só faixa)"
-msgid "Edit Passing Place"
-msgstr "Editar Lugar de Passagem (em vias estreitas de 1 só faixa)"
-
msgid "Turning Circle"
msgstr "Círculo de Viragem"
@@ -15673,30 +16067,57 @@ msgstr "Wikipédia"
msgid "Barriers"
msgstr "Barreiras"
+msgid "Block"
+msgstr "Bloco (cimento / pedra)"
+
+msgid "Edit Block"
+msgstr "Editar Bloco (cimento / pedra)"
+
+msgid "Allowed traffic:"
+msgstr "Trânsito permitido:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "pedra"
+
msgid "Bollard"
msgstr "Pilar"
msgid "Edit Bollard"
msgstr "Editar Pilar"
-msgid "Allowed traffic:"
-msgstr "Trânsito permitido:"
+msgid "Bollard type"
+msgstr "Tipo de barreira"
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr "removível"
+
+msgid "plastic"
+msgstr "plástico"
msgid "Cycle Barrier"
msgstr "Chicana Pedestre"
-msgid "Block"
-msgstr "Bloco (cimento / pedra)"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
-msgstr ""
+msgstr "Grelha Anti-Gado"
msgid "Edit Cattle Grid"
-msgstr ""
+msgstr "Editar Grelha Anti-Gado"
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Espigões (controlo militar/policial)"
@@ -15718,44 +16139,88 @@ msgstr "Editar Posto Alfandegário"
msgid "Hedge"
msgstr "Sebe"
+msgid "Edit Hedge"
+msgstr "Editar Sebe"
+
+msgid "Height (meters)"
+msgstr "Altura (metros)"
+
+msgid "Genus"
+msgstr "Género"
+
+msgid "Species"
+msgstr "Espécie"
+
+msgid "Taxon"
+msgstr "Táxon"
+
msgid "Fence"
msgstr "Vedação"
+msgid "Edit Fence"
+msgstr "Editar Vedação"
+
msgid "barbed_wire"
msgstr "arame farpado"
-msgid "chain"
-msgstr "rede"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "eletrificada"
-msgid "hedge"
-msgstr "sebe"
-
msgid "pole"
-msgstr ""
+msgstr "poste"
msgid "split_rail"
msgstr "toros de madeira cortados"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr "Railes de proteção da via"
+
+msgid "Edit Guard Rail"
+msgstr "Editar Railes de proteção da via"
+
msgid "Wall"
msgstr "Muro"
+msgid "Edit Wall"
+msgstr "Editar Muro"
+
msgid "City Wall"
msgstr "Muralha de cidade"
+msgid "Edit City Wall"
+msgstr "Editar Muralha de Cidade"
+
msgid "Retaining Wall"
msgstr "Muro de Contenção"
+msgid "Edit Retaining Wall"
+msgstr "Editar Muro de Contenção"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Fosso / Vala / Trincheira"
-msgid "Entrance"
-msgstr "Entrada"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Editar Entrada"
+msgid "Kerb"
+msgstr "Lancil (passeio desnivelado sem rampa)"
+
+msgid "Edit Kerb"
+msgstr "Editar Lancil"
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Cancela / Portão"
@@ -15776,21 +16241,36 @@ msgid "Edit Hampshire Gate"
msgstr ""
msgid "Bump Gate"
-msgstr ""
+msgstr "Portão de colisão"
msgid "Edit Bump Gate"
-msgstr ""
+msgstr "Editar portão de colisão"
msgid "Kissing Gate"
-msgstr ""
+msgstr "Cancela de Encosto Anti-Gado"
msgid "Edit Kissing Gate"
-msgstr ""
+msgstr "Editar Cancela de Encosto Anti-Gado"
+
+msgid "Chain"
+msgstr "Corrente Metálica"
+
+msgid "Edit Chain"
+msgstr "Editar Corrente Metálica"
msgid "Stile"
-msgstr ""
+msgstr "Escadas de Passagem Anti-Gado"
msgid "Edit Stile"
+msgstr "Editar Escadas de Passagem Anti-Gado"
+
+msgid "ladder"
+msgstr "escada"
+
+msgid "squeezer"
+msgstr "estreitamento"
+
+msgid "stepover"
msgstr ""
msgid "Turnstile"
@@ -15806,40 +16286,40 @@ msgid "Edit Sally Port"
msgstr "Editar Porta Falsa (em castelos e fortificações)"
msgid "Passageways"
-msgstr ""
+msgstr "Pontos de passagem"
msgid "Edit Tunnel"
msgstr "Editar Túnel"
msgid "Building Passage"
-msgstr ""
+msgstr "Passagem em edifício (túnel)"
msgid "Edit Building Passage"
-msgstr ""
+msgstr "Editar Passagem em edifício (túnel)"
msgid "Arcade"
-msgstr ""
+msgstr "Arcada"
msgid "Edit Arcade"
-msgstr ""
+msgstr "Editar Arcada"
msgid "Open on left side"
-msgstr ""
+msgstr "Aberto no lado esquerdo"
msgid "Open on right side"
-msgstr ""
+msgstr "Aberto no lado direito"
msgid "Colonnade"
-msgstr ""
+msgstr "Colunata"
msgid "Edit Colonnade"
-msgstr ""
+msgstr "Editar Colunata"
msgid "Avalanche Protector"
-msgstr ""
+msgstr "Proteção de avalanches"
msgid "Edit Avalanche Protector"
-msgstr ""
+msgstr "Editar Proteção de avalanches"
msgid "Water"
msgstr "Água"
@@ -15850,6 +16330,9 @@ msgstr "Vala de Drenagem"
msgid "Edit Drain"
msgstr "Editar Vala de Drenagem"
+msgid "Ditch"
+msgstr "Fosso / Vala / Trincheira"
+
msgid "Edit Ditch"
msgstr "Editar Fosso / Vala / Trincheira"
@@ -15859,6 +16342,12 @@ msgstr "Ribeiro"
msgid "Edit Stream"
msgstr "Editar Ribeiro"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Canal"
@@ -15898,9 +16387,6 @@ msgstr "Editar Barragem"
msgid "Groyne"
msgstr "Espigão marítimo"
-msgid "Edit Groyne"
-msgstr "Editar Espigão marítimo"
-
msgid "Breakwater"
msgstr "Quebra-mar / molhe"
@@ -15908,10 +16394,10 @@ msgid "Edit Breakwater"
msgstr "Editar Quebra-mar / molhe"
msgid "Culvert"
-msgstr "Tudo de drenagem"
+msgstr "Tubo de drenagem"
msgid "Edit Culvert"
-msgstr "Editar Tudo de drenagem"
+msgstr "Editar Tubo de drenagem"
msgid "Basin"
msgstr "Bacia hidrográfica"
@@ -15934,6 +16420,21 @@ msgstr "Editar Reservatório Coberto"
msgid "Edit Water"
msgstr "Editar Água"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Terra"
@@ -15974,7 +16475,7 @@ msgid "saltmarsh"
msgstr "marisma salina"
msgid "tidalflat"
-msgstr ""
+msgstr "planície de maré"
msgid "mangrove"
msgstr "mangal / manguezal"
@@ -16015,20 +16516,25 @@ msgstr "Editar Terminal de Ferry"
msgid "Cargo"
msgstr "Carga"
+msgctxt "cargo"
msgid "passengers"
-msgstr "passageiros"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "veículos"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicicletas"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "camiões"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "passageiros e veículos"
+msgstr ""
msgid "Ferry Route"
msgstr "Rota de Ferry"
@@ -16099,8 +16605,11 @@ msgstr "militar"
msgid "tourism"
msgstr "turismo"
-msgid "Service/Type"
-msgstr "Serviço/Tipo"
+msgid "freight"
+msgstr "carga"
+
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "pátio de manobras ferroviárias"
@@ -16123,11 +16632,14 @@ msgstr "linha de contacto aérea (por catenárias)"
msgid "rail"
msgstr "carril"
-msgid "Voltage"
-msgstr "Voltagem (em volts)"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frequência (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -16138,9 +16650,6 @@ msgstr "Carril Bitola Estreita"
msgid "Edit Narrow Gauge Rail"
msgstr "Editar Carril Bitola Estreita"
-msgid "Types"
-msgstr "Tipos"
-
msgid "Monorail"
msgstr "Monocarril"
@@ -16183,20 +16692,58 @@ msgstr "Ferrovia Não Usada"
msgid "Edit Disused Railway"
msgstr "Editar Ferrovia Não Usada"
-msgid "Optional Types"
-msgstr "Tipos Opcionais"
-
msgid "Abandoned Rail"
msgstr "Ferrovia Abandonada (carris removidos)"
+msgid "Edit Abandoned Railway"
+msgstr "Editar Ferrovia Abandonada"
+
msgid "Level Crossing"
msgstr "Passagem de Nível Ferroviária"
-msgid "Crossing"
-msgstr "Passagem de Peões"
+msgid "Edit Level Crossing"
+msgstr ""
-msgid "Crossing type"
-msgstr "Tipo de passagem de peões"
+msgid "Supervised"
+msgstr "Vigiado"
+
+msgid "Traffic lights"
+msgstr "Semáforo"
+
+msgid "Sound signals"
+msgstr "Sinal sonoro"
+
+msgid "Barrier"
+msgstr "Barreira"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
+msgid "Crossing"
+msgstr "Passagem de Peões"
+
+msgid "Edit Crossing"
+msgstr ""
+
+msgid "Crossing type"
+msgstr "Tipo de passagem de peões"
msgid "Turntable"
msgstr "Rotunda ferroviária"
@@ -16294,13 +16841,11 @@ msgstr "Tapete Rolante"
msgid "Edit Magic Carpet"
msgstr "Editar Tapete Rolante"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Teleférico de Mercadorias"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Editar Teleférico de Mercadorias"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -16310,13 +16855,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Editar Estação"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Torre de Suporte"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Editar Torre de Suporte"
+msgstr ""
msgid "Parking"
msgstr "Parque de Estacionamento"
@@ -16333,12 +16876,12 @@ msgstr "à superfície"
msgid "underground"
msgstr "subterrâneo"
+msgid "rooftop"
+msgstr "telhado"
+
msgid "Access"
msgstr "Acesso"
-msgid "customers"
-msgstr "clientes"
-
msgid "Park and Ride"
msgstr "Estacionamento de Intercâmbio"
@@ -16366,9 +16909,6 @@ msgstr "Lugar de Estacionamento (1 veículo)"
msgid "Edit Parking space"
msgstr "Editar Lugar de Estacionamento (1 veículo)"
-msgid "rooftop"
-msgstr "telhado"
-
msgid "Capacity"
msgstr "Capacidade"
@@ -16384,20 +16924,36 @@ msgstr "Limite de Tempo (minutos)"
msgid "30+"
msgstr "+30"
-msgid "Supervised"
-msgstr "Vigiado"
-
msgid "Opening Hours"
msgstr "Horário de Abertura"
msgid "24/7"
msgstr "sempre aberto (24h por dia)"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Segunda a Sexta-feira 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Terça-Dom 8h-15h; Sáb 8h-12h"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "Entrada Parq. Est. (subterrâneo/vários pisos)"
@@ -16546,6 +17102,9 @@ msgstr "Posto de Abastecimento de Eletricidade"
msgid "Edit Charging Station (for electric cars)"
msgstr "Editar Posto de Abastecimento de Eletricidade"
+msgid "Voltage"
+msgstr "Voltagem (em volts)"
+
msgid "Amperage"
msgstr "Amperagem"
@@ -16567,6 +17126,12 @@ msgstr "Oficina"
msgid "Edit Car Repair"
msgstr "Editar Oficina de Veículos"
+msgid "Parts"
+msgstr "Peças"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Pneus"
@@ -16594,6 +17159,12 @@ msgstr "Aluguer"
msgid "Edit Car Rental"
msgstr "Editar Aluguer de Veículos"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "apenas tem destes produtos"
+
msgid "Sharing"
msgstr "Partilha de Veículos"
@@ -16618,22 +17189,6 @@ msgstr "Serviços:"
msgid "Sale"
msgstr "Venda"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "sim"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "marca"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "usados"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "não"
-
msgid "brand"
msgstr "marca"
@@ -16655,9 +17210,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Peças"
-
msgid "Clothes"
msgstr "Roupas"
@@ -16665,7 +17217,7 @@ msgid "Edit Bicycle Parking"
msgstr "Editar Estacionamento de Bicicletas"
msgid "anchors"
-msgstr ""
+msgstr "escoras"
msgid "ground_slots"
msgstr ""
@@ -16721,8 +17273,8 @@ msgstr "Editar Utilização Gratuita de Bicicletas"
msgid "Public Transport"
msgstr "Transporte Público"
-msgid "Route"
-msgstr "Rota"
+msgid "Public transport route"
+msgstr "Rota de transporte público"
msgid "Edit Route"
msgstr "Editar Rota"
@@ -16761,7 +17313,7 @@ msgid "To (terminal stop)"
msgstr "Para (última paragem)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Paragens (intermédias)"
msgid "Network"
msgstr "Rede de Rota"
@@ -16805,13 +17357,13 @@ msgid "route segment"
msgstr "segmento de rota"
msgid "stop position"
-msgstr ""
+msgstr "paragem"
msgid "stop position (exit only)"
-msgstr ""
+msgstr "paragem (apenas saída pass.)"
msgid "stop position (entry only)"
-msgstr ""
+msgstr "paragem (apenas entrada p.)"
msgid "platform"
msgstr "plataforma"
@@ -16844,16 +17396,19 @@ msgid "UIC name"
msgstr "Nome UIC"
msgid "Stop Position"
-msgstr ""
+msgstr "Paragem"
msgid "Platform"
msgstr "Plataforma"
msgid "Station or amenities"
+msgstr "Estação ou infraestruturas"
+
+msgid "Edit Stop Position"
msgstr ""
msgid "Bus"
-msgstr ""
+msgstr "Autocarro"
msgid "Bus stop (legacy)"
msgstr "Paragem de autocarro (em desuso)"
@@ -16882,6 +17437,9 @@ msgstr "Funicular"
msgid "Ferry"
msgstr "Ferry"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banco"
@@ -16894,9 +17452,6 @@ msgstr "Cadeiras de Rodas"
msgid "limited"
msgstr "limitado/parcial"
-msgid "only"
-msgstr "apenas tem destes produtos"
-
msgid "Highway platform (legacy)"
msgstr "Plataforma rodoviária (em desuso)"
@@ -16906,8 +17461,13 @@ msgstr "Plataforma ferroviária (em desuso)"
msgid "funicular"
msgstr "funicular"
+msgctxt "railway"
msgid "Station"
-msgstr "Estação"
+msgstr "Estação Ferroviária"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Editar Estação Ferroviária"
msgid "Building"
msgstr "Edifício"
@@ -16921,6 +17481,9 @@ msgstr "Editar Entrada para Metropolitano Subterrâneo"
msgid "Ticket Machine"
msgstr "Máquina de Bilhetes"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Número de Referência"
@@ -16945,14 +17508,6 @@ msgstr "Cartão de fidelidade (para obter pontos, p.ex.)"
msgid "Public Transport (legacy)"
msgstr "Transporte público (em desuso)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Estação Ferroviária"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Editar Estação Ferroviária"
-
msgid "UIC-Reference"
msgstr "Referência UIC"
@@ -17001,8 +17556,8 @@ msgstr "Editar Plataforma Rodoviária"
msgid "Taxi"
msgstr "Táxi"
-msgid "Edit Taxi station"
-msgstr "Editar Praça de Táxis"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Avião"
@@ -17055,6 +17610,21 @@ msgstr "Terminal de Passageiros"
msgid "Edit Terminal"
msgstr "Editar Terminal de Passageiros"
+msgid "Internet access"
+msgstr "Acesso à Internet"
+
+msgid "wlan"
+msgstr "sem fios (wi-fi)"
+
+msgid "wired"
+msgstr "com fios"
+
+msgid "terminal"
+msgstr "terminal de acesso à internet"
+
+msgid "Internet access fee"
+msgstr "taxa de utilização internet"
+
msgctxt "airport"
msgid "Gate"
msgstr "Porta de embarque / desembarque"
@@ -17077,21 +17647,6 @@ msgstr "Editar Hotel"
msgid "Stars"
msgstr "Estrelas"
-msgid "Internet access"
-msgstr "Acesso à Internet"
-
-msgid "wlan"
-msgstr "sem fios (wi-fi)"
-
-msgid "wired"
-msgstr "com fios"
-
-msgid "terminal"
-msgstr "terminal de acesso à internet"
-
-msgid "Internet access fee"
-msgstr "taxa de utilização internet"
-
msgid "Smoking"
msgstr "Fumadores"
@@ -17275,6 +17830,12 @@ msgstr "Discoteca"
msgid "Edit Nightclub"
msgstr "Editar Discoteca"
+msgid "Stripclub"
+msgstr "Clube de striptease"
+
+msgid "Edit Stripclub"
+msgstr "Editar Clube de striptease"
+
msgid "Tourism"
msgstr "Turismo"
@@ -17296,9 +17857,15 @@ msgstr "Torre de Vigia"
msgid "Information Office"
msgstr "Posto de Informações"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Nível de Detalhe"
@@ -17311,6 +17878,9 @@ msgstr "estradas"
msgid "scheme"
msgstr "esquemático (apresenta só o mais importante)"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Área Mostrada"
@@ -17350,6 +17920,9 @@ msgstr "... entre outros meios de transporte"
msgid "Information Board"
msgstr "Placar de Informação"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Informação Mostrada"
@@ -17371,23 +17944,35 @@ msgstr "plantas"
msgid "Guidepost"
msgstr "Poste com Direções"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Terminal de Informação Eletrónico"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Descrição curta"
msgid "Audioguide"
msgstr "Guia de Áudio"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "Guia de Áudio via telemóvel?"
msgid "Phone number"
msgstr "Número de telefone"
-msgid "Other Information Points"
-msgstr "Outros Pontos de Informação"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Lazer"
@@ -17410,9 +17995,6 @@ msgstr "Parque para Cães"
msgid "Edit Dog Park"
msgstr "Editar Parque para Cães"
-msgid "Barrier"
-msgstr "Barreira"
-
msgid "fence"
msgstr "vedação"
@@ -17437,8 +18019,17 @@ msgstr "Sauna"
msgid "Edit Sauna"
msgstr "Editar Sauna"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Terça-Dom 8h-15h; Sáb 8h-12h"
+msgid "Horse riding"
+msgstr "Corridas de cavalos"
+
+msgid "Edit Horse riding"
+msgstr "Editar Corridas de cavalos"
+
+msgid "Brothel"
+msgstr "Bordel"
+
+msgid "Edit Brothel"
+msgstr "Editar Bordel"
msgid "Playground"
msgstr "Parque Infantil"
@@ -17510,50 +18101,44 @@ msgstr "Obra de Arte (ao ar livre)"
msgid "Edit Artwork"
msgstr "Editar Obra de Arte (ao ar livre)"
-msgid "Place of Worship"
-msgstr "Local de Oração"
-
-msgid "Edit Place of Worship"
-msgstr "Editar Local de Oração"
-
-msgid "Religion"
-msgstr "Religião"
+msgid "Recording Studio"
+msgstr "Estúdio de Gravação"
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr "Editar Estúdio de Gravação"
-msgid "buddhist"
-msgstr "budista"
+msgid "audio"
+msgstr "áudio"
-msgid "christian"
-msgstr "cristã"
+msgid "video"
+msgstr "vídeo"
-msgid "hindu"
-msgstr "hindu"
+msgid "Place of Worship"
+msgstr "Local de Oração"
-msgid "jain"
-msgstr "jainismo"
+msgid "Church"
+msgstr "Igreja"
-msgid "jewish"
-msgstr "judaica"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muçulmana"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "siquismo"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "espiritualismo"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoísmo"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarismo"
+msgid "church"
+msgstr "igreja"
-msgid "zoroastrian"
-msgstr "zoroastrismo"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Comunidade religiosa"
@@ -17570,6 +18155,12 @@ msgstr "católica"
msgid "evangelical"
msgstr "evangélica"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testemunhas de jeová"
@@ -17582,6 +18173,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mórmon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxa"
@@ -17597,38 +18191,141 @@ msgstr "protestante"
msgid "quaker"
msgstr "quaker"
-msgid "shia"
-msgstr "xiismo"
+msgid "roman_catholic"
+msgstr "Católica Romana"
-msgid "sunni"
-msgstr "sunismo"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr "Horário de Missas"
-msgid "Su 10:00"
-msgstr "Domingo 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Domingo 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Domingo 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Horário de abertura para visitas"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Estúdio de Gravação"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "Editar Estúdio de Gravação"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
-msgid "audio"
-msgstr "áudio"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "vídeo"
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "xiismo"
+
+msgid "sunni"
+msgstr "sunismo"
+
+msgid "Synagogue"
+msgstr ""
+
+msgid "Edit Synagogue"
+msgstr ""
+
+msgid "synagogue"
+msgstr ""
+
+msgid "conservative"
+msgstr ""
+
+msgid "reform"
+msgstr ""
+
+msgid "Buddhist Temple"
+msgstr ""
+
+msgid "Edit Buddhist Temple"
+msgstr ""
+
+msgid "theravada"
+msgstr ""
+
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religião"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jainismo"
+
+msgid "sikh"
+msgstr "siquismo"
+
+msgid "spiritualist"
+msgstr "espiritualismo"
+
+msgid "taoist"
+msgstr "taoísmo"
+
+msgid "unitarian"
+msgstr "unitarismo"
+
+msgid "zoroastrian"
+msgstr "zoroastrismo"
msgid "Public Building"
msgstr "Edifício Público"
@@ -17717,6 +18414,12 @@ msgstr "Editar Escola de Condução"
msgid "License Classes"
msgstr "Aulas para Categorias de Veículos (p.ex. A1, B, D...)"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Saúde"
@@ -17726,6 +18429,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Editar Hospital"
+msgid "Clinic"
+msgstr "Clínica"
+
+msgid "Edit Clinic"
+msgstr "Editar Clínica"
+
msgid "Doctors"
msgstr "Médico"
@@ -17792,12 +18501,66 @@ msgstr "Veterinário"
msgid "Edit Veterinary"
msgstr "Editar Veterinário"
-msgid "Note"
-msgstr "Observação a outros editores"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "locais públicos (vigiado pela polícia)"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Marco / caixa de correio"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefone"
@@ -17807,6 +18570,30 @@ msgstr "Editar Telefone"
msgid "Telephone cards"
msgstr "Cartões de chamadas telefónicas"
+msgid "Emergency Phone"
+msgstr "Telefone de Emergência"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Relógio"
@@ -17816,31 +18603,37 @@ msgstr "Editar Relógio"
msgid "Display"
msgstr "Mostrador"
-msgctxt "display"
msgid "analog"
-msgstr "analógico"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "digital"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "relógio_de_sol"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
-msgstr "invulgar"
+msgstr ""
msgid "Support"
msgstr "Estrutura de Suporte"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "parede"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr "Visibilidade/legibilidade"
@@ -17868,8 +18661,8 @@ msgstr "Mostra a humidade"
msgid "Recycling"
msgstr "Reciclagem (ecoponto ou ecocentro)"
-msgid "Edit Recycling station"
-msgstr "Editar Reciclagem (ecoponto ou ecocentro)"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Baterias (pilhão)"
@@ -17895,27 +18688,15 @@ msgstr "ecocentro (para objetos volumosos como frigoríficos, sofás...)"
msgid "Waste Basket"
msgstr "Caixote do Lixo (pequeno)"
-msgid "Edit Waste Basket"
-msgstr "Editar Caixote do Lixo (pequeno)"
-
msgid "Waste Disposal"
msgstr "Contentor de Lixo"
-msgid "Edit Waste Disposal"
-msgstr "Editar Contentor de Lixo"
+msgid "Edit Bench"
+msgstr ""
msgid "Backrest"
msgstr "Encosto"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "pedra"
-
-msgid "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Número de Assentos"
@@ -17950,14 +18731,17 @@ msgstr "Editar Plataforma de Caça"
msgid "Height"
msgstr "Altura (metros)"
+msgctxt "height"
msgid "low"
-msgstr "baixo"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "médio"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "alto"
+msgstr ""
msgid "Hide"
msgstr "Escondido"
@@ -17965,11 +18749,11 @@ msgstr "Escondido"
msgid "Lock"
msgstr "Trancado"
-msgid "Drinking Water"
-msgstr "Água Potável (bebedouro, fonte...)"
+msgid "Edit Source of Potable Water"
+msgstr "Editar fonte de Água potável"
-msgid "Edit Drinking Water"
-msgstr "Editar Água Potável (bebedouro, fonte...)"
+msgid "Indoor"
+msgstr "Interno"
msgid "Fire Hydrant"
msgstr "Boca de Incêncio"
@@ -17996,6 +18780,9 @@ msgstr "reservatório / lago (necessita de motor)"
msgid "Diameter (in mm)"
msgstr "Diâmetro (em mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "faixa de rodagem"
@@ -18033,119 +18820,155 @@ msgstr "Estádio"
msgid "Edit Stadium"
msgstr "Editar Estádio"
-msgid "select sport:"
-msgstr "selecione o desporto:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "desporto"
+msgid "Sport"
+msgstr "Desporto"
+msgctxt "sport"
msgid "multi"
-msgstr "vários desportos"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "tiro com arco e flecha"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletismo"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "futebol americano"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "futebol australiano"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "basebol"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basquetebol"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "jogos de bolas metálicas (boules)"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "bowls"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "futebol canadiano"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "canoagem"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "escalada"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "críquete"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "críquete com redes (para treinar)"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "ciclismo"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "corridas de cães"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "equestre"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "jogos gaélicos"
+msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golfe"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "ginástica"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hóquei"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "corridas de cavalos"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motorizado"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota basca"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "raquetes (péla)"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "râguebi de 13 (rugby league)"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "râguebi de 15 (rugby union)"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "tiro"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skate"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "patinagem no gelo"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "esqui"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "futebol"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "natação"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "pingue pongue / ténis de mesa"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "ténis"
+msgstr ""
msgid "Sports Centre"
msgstr "Centro Desportivo"
@@ -18177,26 +19000,27 @@ msgstr "Golfe em Miniatura"
msgid "Edit Miniature Golf"
msgstr "Editar Golfe em Miniatura"
-msgid "Sport"
-msgstr "Desporto"
-
msgid "Multi"
msgstr "Vários desportos"
msgid "Edit Multi"
msgstr "Editar Vários desportos"
-msgid "type"
-msgstr "tipo"
-
+msgctxt "running"
msgid "pitch"
-msgstr "campo"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "centro desportivo"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "estádio"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr "Bowling de 9 pinos"
@@ -18204,6 +19028,15 @@ msgstr "Bowling de 9 pinos"
msgid "Edit 9pin"
msgstr "Editar Bowling de 9 pinos"
+msgid "pitch"
+msgstr "campo"
+
+msgid "sports_centre"
+msgstr "centro desportivo"
+
+msgid "stadium"
+msgstr "estádio"
+
msgid "10pin"
msgstr "Bowling (comum de 10 pinos)"
@@ -18237,6 +19070,22 @@ msgstr "Editar Canoagem"
msgid "Edit Cycling"
msgstr "Ciclismo"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Corridas de Cães"
@@ -18249,13 +19098,38 @@ msgstr "Equestre"
msgid "Edit Equestrian"
msgstr "Editar Equestre"
-msgid "horse_riding"
-msgstr "corridas de cavalos"
+msgctxt "riding"
+msgid "pitch"
+msgstr "campo"
-msgid "Horse Racing"
-msgstr "Corridas de Cavalos"
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "centro desportivo"
-msgid "Edit Horse Racing"
+msgctxt "riding"
+msgid "stadium"
+msgstr "hipódromo"
+
+msgctxt "riding"
+msgid "track"
+msgstr "pista"
+
+msgid "clay"
+msgstr "argila"
+
+msgid "dirt"
+msgstr "terra"
+
+msgid "fine_gravel"
+msgstr "gravilha"
+
+msgid "mud"
+msgstr "lamaçal"
+
+msgid "Horse Racing"
+msgstr "Corridas de Cavalos"
+
+msgid "Edit Horse Racing"
msgstr "Editar Corridas de Cavalos"
msgid "Gymnastics"
@@ -18268,7 +19142,7 @@ msgid "Skating"
msgstr "Patinagem no Gelo"
msgid "Edit Skating"
-msgstr "Editar Patinagem no Gelo"
+msgstr ""
msgid "ice_rink"
msgstr "curling bávaro"
@@ -18312,36 +19186,54 @@ msgstr "pista de gelo (em centros comerciais, etc.)"
msgid "Difficulty"
msgstr "Grau de Dificuldate"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "iniciados"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "fácil"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "avançado"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "peritos"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "fora de pista"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -18384,21 +19276,17 @@ msgstr "Jogos Gaélicos"
msgid "Edit Gaelic Games"
msgstr "Editar Jogos Gaélicos"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr "Hurling"
+msgstr ""
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Futebol gaélico"
+msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
-msgstr "Camogie"
+msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
-msgstr "Rounders"
+msgstr ""
msgid "Rugby League"
msgstr "Râguebi de 13 (Rugby League)"
@@ -18535,6 +19423,18 @@ msgstr "Aeródromo para Aeromodelismo"
msgid "Edit Model Aerodrome"
msgstr "Editar Aeródromo para Aeromodelismo"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "Pista Para Carros Telecomandados"
@@ -18547,38 +19447,73 @@ msgstr "Construção"
msgid "Edit Building"
msgstr "Editar Edifício"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "cobertura (p.ex.postos de combustível, coberturas estacionamento)"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "garagem"
+msgstr ""
-msgid "church"
-msgstr "igreja"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "escola"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "hangar"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "comercial"
+msgstr ""
+msgctxt "building"
msgid "farm"
-msgstr "quinta"
+msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "estufa"
+msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "escritório"
+msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "universidade"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr "Edifício Residencial"
@@ -18586,20 +19521,59 @@ msgstr "Edifício Residencial"
msgid "Edit Residential Building"
msgstr "Editar Edifício Residencial"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "apartamentos"
+msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "casa"
+msgstr ""
+msgctxt "building"
msgid "hut"
-msgstr "cabana"
+msgstr ""
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
-msgstr "terrace (vários edifícios contíguos em fileira)"
+msgstr ""
+msgctxt "building"
msgid "detached"
-msgstr "separado dos outros edifícios"
+msgstr ""
+
+msgid "Entrance"
+msgstr "Entrada"
+
+msgid "Edit Entrance"
+msgstr "Editar Entrada"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
msgid "Tower"
msgstr "Torre"
@@ -18616,9 +19590,6 @@ msgstr "comunicações"
msgid "observation"
msgstr "observação"
-msgid "Height (meters)"
-msgstr "Altura (metros)"
-
msgid "Flagpole"
msgstr "Mastro de Bandeira"
@@ -18828,42 +19799,68 @@ msgstr "Intervalos em que está ligado"
msgid "Mo-Fr 22:00-05:00"
msgstr "Segunda a Sexta 22:00 às 05:00"
-msgid "Measurement Station"
-msgstr "Estação de Medição (meteorológica, sísmica, nível da água...)"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
+
+msgid "Monitoring:"
+msgstr ""
+
+msgid "Weather"
+msgstr ""
+
+msgid "Water level"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Editar Estação de Medição (meteorológica, sísmica, nível da água...)"
+msgid "Tide Level"
+msgstr ""
-msgid "Measurement"
-msgstr "Tipo de Medição"
+msgid "Traffic"
+msgstr ""
-msgid "particulate_matter"
+msgid "Air Quality"
msgstr ""
-msgid "seismic"
-msgstr "sísmica"
+msgid "Noise"
+msgstr ""
-msgid "water_level"
-msgstr "nível da água"
+msgid "GPS Signals"
+msgstr ""
-msgid "weather"
-msgstr "tempo"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "Recording"
-msgstr "Gravação"
+msgid "Galileo Signals"
+msgstr ""
-msgid "manually"
-msgstr "manual"
+msgid "Radiation"
+msgstr ""
-msgid "automated"
-msgstr "automatizada"
+msgid "Seismic Activity"
+msgstr ""
-msgid "remote"
-msgstr "remota"
+msgid "Recording:"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "não"
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Vértice Geodésico"
@@ -18871,8 +19868,8 @@ msgstr "Vértice Geodésico"
msgid "Edit Survey Point"
msgstr "Editar Vértice Geodésico"
-msgid "Surveillance"
-msgstr "Câmaras de Vigilância"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Editar Câmaras de Vigilância"
@@ -18883,12 +19880,102 @@ msgstr "interior de edifícios privados/empresas"
msgid "outdoor"
msgstr "exterior de edifícios privados/empresas"
-msgid "public"
-msgstr "locais públicos (vigiado pela polícia)"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "lojas"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "Energia"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr "Formas de energia gerada"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "eletricidade"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "água quente"
+
+msgid "hot air"
+msgstr "ar quente"
+
+msgid "cold water"
+msgstr "água fria"
+
+msgid "cold air"
+msgstr "ar frio"
+
+msgid "compressed air"
+msgstr "ar comprimido"
+
+msgid "steam"
+msgstr "vapor"
+
+msgid "vacuum"
+msgstr "vácuo"
+
msgid "Power Generator"
msgstr "Central de Geração de Energia (genérico)"
@@ -18940,89 +20027,192 @@ msgstr "vento"
msgid "Method"
msgstr "Método"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "metanização"
+msgstr ""
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+msgctxt "generator method"
msgid "combustion"
-msgstr "combustão"
+msgstr ""
-msgid "dam"
-msgstr "barragem"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "fisão"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "fusão"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
-msgstr "gasificação"
-
-msgid "photovoltaic"
-msgstr "fotovoltaico"
+msgstr ""
-msgid "pumped-storage"
-msgstr "hidroelétrica reversível (2 reservatórios)"
+msgid "biomass / waste"
+msgstr ""
-msgid "pumping"
-msgstr "bombagem (por ex. geotérmica)"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "pirólise"
+msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "térmica"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "Formas de energia gerada"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "electricity"
-msgstr "eletricidade"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "água quente"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "ar quente"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "água fria"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "ar frio"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "ar comprimido"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "vapor"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vácuo"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
-msgid "battery charging"
-msgstr "Carregamento de baterias"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
-msgid "Power Station"
-msgstr "Estação de Energia (evitar usar)"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Editar Estação de Energia (evitar usar)"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Subestação de Eletricidade (distribuição)"
@@ -19033,6 +20223,21 @@ msgstr "Editar Subestação de Eletricidade (distribuição)"
msgid "Line reference"
msgstr "Referência da Linha"
+msgid "high"
+msgstr "alto"
+
+msgid "medium"
+msgstr "médio"
+
+msgid "low"
+msgstr "baixo"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "Armário de Distribuição de Eletricidade"
@@ -19048,6 +20253,9 @@ msgstr "Editar Torre de Alta Tensão"
msgid "Tower reference"
msgstr "Referência da torre"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Poste"
@@ -19066,13 +20274,11 @@ msgstr "Editar Linha de Transmissão"
msgid "Line type"
msgstr "Tipo de linha"
-msgctxt "Power Line"
msgid "line"
-msgstr "linha"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "linha menor (em postes)"
+msgstr ""
msgid "Amount of Cables"
msgstr "Número de Cabos"
@@ -19179,11 +20385,11 @@ msgstr "Quiosque"
msgid "Edit Kiosk"
msgstr "Editar Quiosque"
-msgid "Baker"
-msgstr "Padaria"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Editar Padaria"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Talho"
@@ -19194,8 +20400,8 @@ msgstr "Editar Talho"
msgid "Seafood"
msgstr "Peixaria"
-msgid "Edit Seafood"
-msgstr "Editar Peixaria"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "Loja de Gourmet"
@@ -19215,14 +20421,20 @@ msgstr "Mercado / Feira"
msgid "Edit Marketplace"
msgstr "Editar Mercado / Feira"
+msgid "Organic"
+msgstr "Orgânica / Biológica"
+
msgid "Greengrocer"
msgstr "Loja de Frutas e Verduras"
msgid "Edit Greengrocer"
msgstr "Editar Loja de Frutas e Verduras"
-msgid "Organic"
-msgstr "Orgânica / Biológica"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr "Editar Quitanda/Venda"
msgid "Edit Organic/Bio"
msgstr "Editar Orgânica / Biológica"
@@ -19293,8 +20505,8 @@ msgstr "Editar Alfaiate"
msgid "Fabric"
msgstr "Tecidos"
-msgid "Edit Fabric"
-msgstr "Editar Tecidos"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Eletrónica"
@@ -19314,14 +20526,14 @@ msgstr "Editar Eletrónica de Consumo"
msgid "Mobile Phone"
msgstr "Telemóveis"
-msgid "Edit Mobile Phone"
-msgstr "Editar Loja de Telemóveis"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Aspiradores"
-msgid "Edit Vacuum Cleaner"
-msgstr "Editar Aspiradores"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Alta Fidelidade"
@@ -19329,9 +20541,8 @@ msgstr "Alta Fidelidade"
msgid "Edit Hifi Shop"
msgstr "Editar Loja de Alta Fidelidade"
-msgctxt "shop"
msgid "Video"
-msgstr "Videoclube"
+msgstr "Vídeo"
msgid "Edit Video Shop"
msgstr "Editar Videoclube"
@@ -19357,6 +20568,12 @@ msgstr "Editar Angência de Câmbio"
msgid "Edit Automated Teller Machine"
msgstr "Editar Caixa Multibanco"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Grande Armazém"
@@ -19393,11 +20610,32 @@ msgstr "Ouriversaria"
msgid "Edit Jewelry"
msgstr "Editar Ouriversaria"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "budista"
+
+msgid "christian"
+msgstr "cristã"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "judaica"
+
+msgid "muslim"
+msgstr "muçulmana"
+
msgid "Erotic"
msgstr "Sex Shop"
-msgid "Edit Erotic"
-msgstr "Editar Sex Shop"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Florista"
@@ -19426,8 +20664,8 @@ msgstr "Editar Loja de Ferragens"
msgid "Paint"
msgstr "Tintas"
-msgid "Edit Paint"
-msgstr "Editar Loja de Tintas"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Mobiliário"
@@ -19438,20 +20676,20 @@ msgstr "Editar Loja de Mobiliário"
msgid "Kitchen"
msgstr "Loja de Cozinhas"
-msgid "Edit Kitchen"
-msgstr "Editar Loja de Cozinhas"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Loja de Cortinados"
-msgid "Edit Curtain"
-msgstr "Editar Loja de Cortinados"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Molduras"
-msgid "Edit Frames"
-msgstr "Editar Loja de Molduras"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Papelaria"
@@ -19471,6 +20709,12 @@ msgstr "Livraria"
msgid "Edit Book Store"
msgstr "Editar Livraria"
+msgid "Newsagent''s shop"
+msgstr "Loja de jornais e revistas"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Editar Loja de jornais e revistas"
+
msgid "Travel Agency"
msgstr "Agência de Viagens"
@@ -19480,8 +20724,8 @@ msgstr "Editar Agência de Viagens"
msgid "Musical Instrument"
msgstr "Instrumentos Musicais"
-msgid "Edit Musical Instruments"
-msgstr "Loja de Instrumentos Musicais"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Brinquedos"
@@ -19535,7 +20779,7 @@ msgid "photos"
msgstr "fotografias"
msgid "public_transport_plans"
-msgstr ""
+msgstr "mapas de transporte público"
msgid "public_transport_tickets"
msgstr "bilhetes de transporte público"
@@ -19559,7 +20803,10 @@ msgid "toys"
msgstr "brinquedos"
msgid "vouchers"
-msgstr ""
+msgstr "vales"
+
+msgid "Note"
+msgstr "Observação a outros editores"
msgid "Geography"
msgstr "Geografia"
@@ -19690,6 +20937,12 @@ msgstr "Cume"
msgid "Edit Peak"
msgstr "Editar Cume"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glaciar"
@@ -19729,24 +20982,33 @@ msgstr "Árvore"
msgid "Edit Tree"
msgstr "Editar Árvore"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Nome Botânico"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Bosque"
msgid "Edit Wood"
msgstr "Editar Bosque"
-msgctxt "wood"
msgid "coniferous"
msgstr "coníferas (frutos em forma cónica, por ex. pinhas)"
-msgctxt "wood"
msgid "deciduous"
msgstr "caducifólias (caem todas as folhas)"
-msgctxt "wood"
msgid "mixed"
msgstr "várias"
@@ -19756,38 +21018,29 @@ msgstr "Floresta"
msgid "Edit Forest Landuse"
msgstr "Editar Floresta"
-msgid "coniferous"
-msgstr "coníferas (frutos em forma cónica, por ex. pinhas)"
-
-msgid "deciduous"
-msgstr "caducifólias (caem todas as folhas)"
-
-msgid "mixed"
-msgstr "várias"
-
msgid "Grassland"
-msgstr ""
+msgstr "Pradaria"
msgid "Edit Grassland"
-msgstr ""
+msgstr "Editar Pradaria"
msgid "pampas"
-msgstr ""
+msgstr "pampas"
msgid "prairie"
-msgstr ""
+msgstr "pradaria"
msgid "puszta"
-msgstr ""
+msgstr "puszta"
msgid "savanna"
-msgstr ""
+msgstr "savana"
msgid "steppe"
-msgstr ""
+msgstr "estepe"
msgid "veld"
-msgstr ""
+msgstr "savana"
msgid "Nature Reserve"
msgstr "Reserva Natural"
@@ -19840,6 +21093,12 @@ msgstr "Prado"
msgid "Edit Meadow Landuse"
msgstr "Editar Prado"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinha"
@@ -19894,8 +21153,8 @@ msgstr "Parque Recreativo (para atividades desportivas)"
msgid "Edit Recreation Ground Landuse"
msgstr "Editar Parque Recreativo (para atividades desportivas)"
-msgid "Residential area"
-msgstr "Área Residencial"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Editar Área Residencial"
@@ -19906,6 +21165,9 @@ msgstr "Sepulturas (uso raro e fora de cemitérios)"
msgid "Edit Graveyard"
msgstr "Editar Sepulturas (uso raro e fora de cemitérios)"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemitério"
@@ -19981,6 +21243,33 @@ msgstr "Editar Pedreira"
msgid "Annotation"
msgstr "Endereços e contactos"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Editar Informação dos Endereços"
@@ -19999,30 +21288,6 @@ msgstr "Nome da localidade"
msgid "Country code"
msgstr "Código do país"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolação dos Endereços"
@@ -20041,6 +21306,18 @@ msgstr "par"
msgid "alphabetic"
msgstr "alfabético"
+msgid "Accuracy"
+msgstr "Precisão"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "Contacto (sistema comum)"
@@ -20203,26 +21480,55 @@ msgstr "onde a obrigatoriedade termina"
msgid "traffic light or barrier that stops you"
msgstr "semáforo ou barreira que obriga a parar"
-msgid "Route (legacy)"
-msgstr "Rota (em desuso)"
+msgid "General route"
+msgstr "Rota"
+
+msgid "Edit general route"
+msgstr "Editar Rota"
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
-msgid "Edit Route (legacy)"
-msgstr "Editar Rota (em desuso)"
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "estrada"
+msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
-msgstr "esqui"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "pedestre"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "caminhada"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "desvio"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Descrição do símbolo"
@@ -20249,16 +21555,16 @@ msgid "backward segment"
msgstr "segmento para trás"
msgid "east segment (North America)"
-msgstr ""
+msgstr "segmento este (América do Norte)"
msgid "north segment (North America)"
-msgstr ""
+msgstr "segmento norte (América do Norte)"
msgid "west segment (North America)"
-msgstr ""
+msgstr "segmento oeste (América do Norte)"
msgid "south segment (North America)"
-msgstr ""
+msgstr "segmento sul (América do Norte)"
msgid "halt point"
msgstr "paragem"
@@ -20269,20 +21575,23 @@ msgstr "paragem no sentido para a frente"
msgid "backward halt point"
msgstr "paragem no sentido inverso"
-msgid "Route network"
-msgstr "Rede de rotas"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Editar rede de rotas"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "membro"
-msgid "Associated street"
-msgstr "Estrada associada"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "Editar Estrada associada"
+msgid "house"
+msgstr "casa"
msgid "Street"
msgstr "Rua"
@@ -20305,8 +21614,8 @@ msgstr "outras coisas que pertencem à rua"
msgid "Destination sign"
msgstr "Sinal de destino"
-msgid "Edit Destination sign"
-msgstr "Editar Sinal de destino"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "Destino indicado no sinal (apenas nome, sem distância)"
@@ -20401,18 +21710,27 @@ msgstr "via(s) que passam por baixo da ponte"
msgid "way forming the outline footprint"
msgstr "linha exterior da ponte/túnel se for+larga que a via (ou irregular)"
-msgid "nodes forming the outline"
-msgstr "nós que formam a linha exterior da ponte ou túnel"
+msgid "edge ways parallel to ''across''"
+msgstr ""
msgid "ways passing through the tunnel"
msgstr "vias que passam pelo túnel"
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "ponte"
msgid "deprecated"
msgstr "não utilizado"
+msgid "bicycle"
+msgstr "bicicletas"
+
+msgid "foot"
+msgstr "pedestre"
+
msgid "horse"
msgstr "cavalo"
@@ -20422,8 +21740,11 @@ msgstr "barreira"
msgid "motorroad"
msgstr "apenas veículos motorizados"
-msgid "highway_track"
-msgstr "carreiro florestal ou agrícola"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "serviços"
@@ -20431,11 +21752,11 @@ msgstr "serviços"
msgid "ford"
msgstr "passagem em curso de água baixo"
-msgid "highway_platform"
-msgstr "plataforma paragem autocarros"
+msgid "highway.platform"
+msgstr ""
-msgid "emergency_access_point"
-msgstr "ponto de emergência (não existe em Portugal)"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "margem de rio"
@@ -20452,6 +21773,9 @@ msgstr "rápidos"
msgid "railwaypoint"
msgstr "ponto na ferrovia"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "pátio de manobras ferroviárias"
@@ -20467,29 +21791,29 @@ msgstr "carris não usados ou retirados da via"
msgid "aeroway"
msgstr "via aérea"
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
-msgstr "pista esqui fácil"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "pista esqui intermédia"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "pista esqui avançada"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "pista esqui profissionais"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "pista esqui fora de pista"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "pista esqui iniciados"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "energia"
@@ -20509,20 +21833,20 @@ msgstr "marina"
msgid "amenity"
msgstr "estruturas de serviços (amenity)"
-msgid "amenity_traffic"
-msgstr "tráfego em estruturas de serviços"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
-msgstr "água_potável"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "saúde"
-msgid "shop"
-msgstr "lojas"
+msgid "office"
+msgstr "escritório"
msgid "hotel"
msgstr "hotel"
@@ -20587,9 +21911,6 @@ msgstr "charneca / mato de vegetação rasteira"
msgid "woodarea"
msgstr "bosque"
-msgid "mud"
-msgstr "lamaçal"
-
msgid "beach"
msgstr "praia"
@@ -20599,11 +21920,14 @@ msgstr "rota"
msgid "boundary"
msgstr "fronteira"
+msgid "sport"
+msgstr "desporto"
+
msgid "place"
msgstr "local"
-msgid "tiger_data"
-msgstr "dados tiger (E.U.A.)"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "endereço"
@@ -20617,9 +21941,6 @@ msgstr "Aldeia / Cidade"
msgid "One Way"
msgstr "Sentido Único"
-msgid "Church"
-msgstr "Igreja"
-
msgid "Fuel Station"
msgstr "Posto de Combustível"
@@ -20639,82 +21960,118 @@ msgid "abbreviated street name"
msgstr ""
msgid "oneway tag on a node"
-msgstr ""
+msgstr "etiqueta de sentido único (oneway) num nó"
msgid "bridge tag on a node"
-msgstr ""
+msgstr "etiqueta de ponte (bridge) num nó"
msgid "wrong highway tag on a node"
+msgstr "etiqueta errada de estrada num nó"
+
+msgid "wrong crossing tag on a way"
msgstr ""
msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "estrada sem classificação oficial que não tem nome"
msgid "highway without a reference"
-msgstr ""
+msgstr "estrada sem etiqueta de referência (ref)"
msgid "temporary highway type"
-msgstr ""
+msgstr "tipo de estrada temporária (etiqueta road)"
msgid "misspelled key name"
-msgstr ""
+msgstr "nome da chave com erros"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "ciclovia com etiqueta bicicleta (bicycle)"
msgid "footway with tag foot"
-msgstr ""
+msgstr "via pedonal com etiqueta pedonal (foot)"
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "faixa (lane) separada numa via para ciclistas"
msgid "barrier used on a way"
-msgstr ""
+msgstr "barreira (barrier) utilizada numa estrada"
msgid "maxspeed used for footway"
-msgstr ""
+msgstr "velocidade máxima (maxspeed) utilizada numa via pedestre"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "etiqueta de nível (layer) com o sinal +"
msgid "street name contains ss"
-msgstr ""
+msgstr "nome da rua contém ss"
msgid "relation without type"
-msgstr ""
+msgstr "relação sem a etiqueta \"type\" (tipo de relação)"
msgid "restaurant without name"
-msgstr ""
+msgstr "restaurante sem nome"
msgid "unusual tag combination (highway & waterway)"
msgstr ""
+"combinação de etiquetas incomum (highway e waterway) (estrada e curso de "
+"água)"
msgid "unusual tag combination (highway & natural)"
msgstr ""
+"combinação de etiquetas incomum (highway e natural) (estrada e natural)"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
msgid "natural water used for swimming pool"
+msgstr "etiqueta de água utilizada em piscina"
+
+msgid "numerical key"
msgstr ""
-msgid "incline without highway"
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
msgstr ""
msgid "lanes without highway"
-msgstr ""
+msgstr "lanes (faixa de rodagem) sem etiqueta highway (via)"
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
-msgstr ""
+msgstr "living_street sem etiqueta highway (via)"
msgid "maintenance without highway"
-msgstr ""
+msgstr "maintenance (manutenção) sem etiqueta highway (estrada)"
msgid "median without highway"
msgstr ""
@@ -20725,17 +22082,17 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
-msgstr ""
+msgstr "sac_scale (escala SAC) highway (via)"
msgid "segregated without highway"
-msgstr ""
+msgstr "segregated (segregada) sem etiqueta highway (estrada)"
msgid "sidewalk without highway"
-msgstr ""
+msgstr "sidewalk (passeio) sem etiqueta highway (via)"
msgid "smoothness without highway"
msgstr ""
@@ -20744,7 +22101,7 @@ msgid "snowplowing without highway"
msgstr ""
msgid "step_count without highway"
-msgstr ""
+msgstr "step_count (numero de degraus) sem etiqueta highway (via)"
msgid "toll without highway"
msgstr ""
@@ -20753,7 +22110,7 @@ msgid "tracktype without highway"
msgstr ""
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "trail_visibility (visibilidade do trilho) sem etiqueta highway (via)"
msgid "trolley_wire without highway"
msgstr ""
@@ -20777,7 +22134,7 @@ msgid "etcs without railway"
msgstr ""
msgid "gauge without railway"
-msgstr ""
+msgstr "gauge (bitola) sem etiqueta railway (ferrovia)"
msgid "grade_of_track without railway"
msgstr ""
@@ -20816,13 +22173,13 @@ msgid "traffic_mode without railway"
msgstr ""
msgid "usage without railway"
-msgstr ""
+msgstr "usage (utilização) sem etiqueta railway (ferrovia)"
msgid "workrules without railway"
msgstr ""
msgid "stream without waterway"
-msgstr ""
+msgstr "stream (ribeiro) sem etiqueta waterway (curso de água)"
msgid "intermittent without waterway"
msgstr ""
@@ -20837,404 +22194,670 @@ msgid "llid without waterway"
msgstr ""
msgid "canal without waterway"
-msgstr ""
+msgstr "canal sem etiqueta waterway (curso de água)"
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "width without physical linear feature"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "religion without denomination"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "unknown christian denomination"
+msgid "border_type without boundary"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
msgstr ""
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
+msgstr ""
+
+msgid "religion without denomination"
+msgstr "religion religião sem etiqueta denomination (denominação religiosa)"
+
+msgid "unknown christian denomination"
+msgstr "denomination (denominação religiosa) desconhecida"
+
+msgid "unknown muslim denomination"
+msgstr "denominação religiosa muçulmana desconhecida"
+
+msgid "unknown jewish denomination"
+msgstr "denominação religiosa judaica desconhecida"
+
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"sem indicação da língua na Wikipédia, usar ''wikipedia''=''língua:página''"
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgstr ""
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr ""
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
-msgstr "MapQuest Open Aerial"
+msgstr ""
+
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Preto e Branco)"
+msgstr ""
+
+msgid "skobbler"
+msgstr ""
-msgid "Skobbler"
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgstr ""
msgid "Public Transport (ÖPNV)"
-msgstr "Transportes Públicos (ÖPNV)"
+msgstr ""
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (Estilo Alemão)"
-
-msgid "Streets NRW Geofabrik.de"
-msgstr "Geofabrik.de - Renânia do Norte-Vestefália (Alemanha)"
-
-msgid "Hike & Bike"
-msgstr "Caminhada e Bicicleta"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Idioma Sórbio)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Idioma Alemão)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "Mapa OpenPT Map (sobreposição)"
+msgstr ""
-msgid "Bavaria (2 m)"
-msgstr "Baviera (2 m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hamburg (40 cm)"
-msgstr "Hamburgo (40 cm)"
+msgid "osmfr"
+msgstr ""
-msgid "Hamburg (DK5)"
-msgstr "Hamburgo (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr ""
msgid "Geoimage.at MaxRes"
-msgstr "Geoimage.at MaxRes"
+msgstr ""
+
+msgid "basemap.at"
+msgstr ""
msgid "Graz: Basiskarte (base map)"
msgstr ""
msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris : DGM (modelo de terreno)"
+msgstr ""
msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris: DOM (modelo de superfície)"
+msgstr ""
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Viena: Mehrzweckkarte (uso geral)"
+msgstr ""
msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Viena: Beschriftungen (anotações)"
+msgstr ""
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Viena: Ortofoto (imagem aérea)"
+msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Suíça - Cantão de Argóvia - 25cm (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Suíça - Cantão de Soleura - 12.5cm (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Suíça - Cantão de Soleura - 12.5cm (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Suíça - Cantão de Soleura - Infrarot 12.5cm (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Suíça - Cantão de Genebra - 5cm (SITG 2011)"
+msgid "Canvec"
+msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Suíça - Cantão de Neuchâtel - 50cm (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Suíça - Cantão de Jura - 50cm (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Suíça - Cantão de Friburgo - 50cm (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Alemanha - Berna (cidade) - 10cm/25cm (2008)"
+msgid "Fugro (Denmark)"
+msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "Suiça - Yverdon-les-Bains - HEIG-VD / Ortofoto 25cm (2007)"
+msgid "Stevns (Denmark)"
+msgstr ""
-msgid "Geobase Hydrography"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Geobase Roads"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Canvec"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "MSR Maps Topo"
-msgstr "Microsoft Research - Cartas Topográficas (EUA)"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr ""
-msgid "MSR Maps Urban"
-msgstr "Microsoft Research - Ortocartografia urbana (EUA)"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "ČÚZK - KM (República Checa)"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "ÚHÚL - Ortofoto (República Checa)"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "Ordnance Survey - 7th series (Reino Unido)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr ""
-msgid "OS New Popular Edition historic"
-msgstr "Reino Unido - Ordnance Survey New Popular Edition (histórico)"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr ""
-msgid "OS OpenData StreetView"
-msgstr "Reino Unido - Ordnance Survey OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "OS OpenData Locator"
-msgstr "Reino Unido - Ordnance Survey OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "Surrey Air Survey"
-msgstr "Surrey - Air Survey (Reino Unido)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-"Reino Unido - National Library of Scotland - OS 6-inch Scotland 1842-82"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-"Reino Unido - National Library of Scotland - OS 1:25k 1st Series 1937-61"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr ""
+
+msgid "Tours - Orthophotos 2008"
+msgstr ""
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
-"Reino Unido - National Library of Scotland - OS 1-inch 7th Series 1955-61"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Irlanda - Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr ""
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Irlanda - Ireland Bartholomew Quarter-Inch 1940"
+msgstr ""
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Irlanda - Ireland EEA GMES Urban Atlas"
+msgstr ""
msgid "Ireland EEA CORINE 2006"
-msgstr "Irlanda EEA CORINE 2006"
+msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Itália"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
-msgstr "Lombardia - Itália (CTR)"
+msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicília - Itália"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - Itália"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - Itália - Lácio+Úmbria"
+msgstr ""
msgid "USSR - Latvia"
-msgstr "USSR - Letónia"
+msgstr ""
msgid "50cm ortho - Latvia"
-msgstr "50cm orto - Letónia"
+msgstr ""
msgid "20cm ortho - Coastline"
-msgstr "20cm orto - linha Costeira"
+msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvérnia 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr ""
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Ortofotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Ortofotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
msgid "Catastro Spain"
-msgstr "Catastro Espanha"
+msgstr ""
msgid "PNOA Spain"
-msgstr "PNOA Espanha"
+msgstr ""
msgid "SIGPAC Spain"
-msgstr "SIGPAC Espanha"
+msgstr ""
msgid "GRAFCAN - Canary Islands"
-msgstr "GRAFCAN - Ilhas Canárias"
+msgstr ""
msgid "ITACyL - Castile and León"
-msgstr "ITACyL - Castela e Leão"
+msgstr ""
msgid "IDEIB - Balearic Islands"
-msgstr "IDEIB - Ilhas Baleares"
+msgstr ""
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estónia - Mapa base (Maa-amet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estónia - orto (Maa-amet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estónia - Multi (Maa-amet)"
+msgid "Stadtplan Zürich"
+msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Dinamarca)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Dinamarca)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Dinamarca)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Filipinas - Alta Resolução)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
+msgstr ""
+
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr ""
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
+msgid "OSM - Tiger Edited Map"
+msgstr ""
+
+msgid "MassGIS L3 Parcels"
+msgstr ""
+
+msgid "NC 2010 Orthoimagery"
+msgstr ""
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr ""
+
+msgid "7th Series (OS7)"
+msgstr ""
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr ""
+
+msgid "OS OpenData Locator"
+msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Camboja, Laos, Tailândia, Vietname bilingue"
+msgid "Surrey Air Survey"
+msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Carro"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr ""
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Caminhada"
+msgid "OS 1:25k historic (OSM)"
+msgstr ""
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Bicicleta"
+msgid "OS Scottish Popular historic"
+msgstr ""
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Esqui"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Mapa Cadastral Eslováquia (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Mapa Cadastral Eslováquia (KaPor, 2011-05)"
+msgid "OSM Export"
+msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Eslováquia EEA GMES Atlas Urbano"
+msgid "Export traffic data to SUMO network file."
+msgstr ""
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Eslováquia EEA CORINE 2006"
+msgid "SUMO Export"
+msgstr ""
-msgid "Slovakia Historic Maps"
-msgstr "Eslováquia Mapas Históricos"
+msgid "Export"
+msgstr "Exportar"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI preto-e-branco 2.5m"
+msgid "Port:"
+msgstr "Porta:"
-msgid "OSM - Tiger Edited Map"
-msgstr ""
+msgid "refresh the port list"
+msgstr "atualizar a lista de porta"
-msgid "OS 1:25k historic (OSM)"
-msgstr ""
+msgid "Configure"
+msgstr "Configurar"
-msgid "OS Scottish Popular historic"
-msgstr ""
+msgid "Connection Error."
+msgstr "Erro de Ligação."
-msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgid "configure the connected DG100"
+msgstr "configurar o DG100 ligado"
-msgid "2u"
-msgstr ""
+msgid "delete data after import"
+msgstr "eliminar dados após importar"
msgid "Columbus V-900 CSV Files"
msgstr "Ficheiros CSV Columbus V-900 - Visiontac VGPS-900"
@@ -21448,8 +23071,20 @@ msgstr "Mostra os contornos de elevação"
msgid "Elevation Profile"
msgstr "Contornos de Elevação"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
-msgstr "Abre a janela de contornos de elevação."
+msgstr "Abre o painel de contornos de elevação."
msgid "Min"
msgstr "Mín"
@@ -21469,14 +23104,8 @@ msgstr "Ganho"
msgid "Time"
msgstr "Tempo"
-msgid "Geoid"
-msgstr "Geoide"
-
-msgid "Automatic"
-msgstr "Automático"
-
-msgid "Fixed value"
-msgstr "Valor fixo"
+msgid "Tracks"
+msgstr "Trilhos GPS"
msgid "Elevation profile for track ''{0}''."
msgstr "Contorno de elevação para o trilho ''{0}''."
@@ -21506,7 +23135,7 @@ msgid "Enter key mode"
msgstr "Efeito ao teclar Enter"
msgid "Auto add tags"
-msgstr ""
+msgstr "Adicionar etiquetas automaticamente"
msgid "Autosimplify"
msgstr "Simplificar linha automaticamente"
@@ -21529,7 +23158,7 @@ msgstr ""
"espaço"
msgid "Draw closed polygons only"
-msgstr ""
+msgstr "Desenhar apenas polígonos fechados"
msgid "Try copying tags from properties table"
msgstr ""
@@ -21601,7 +23230,7 @@ msgid "Fix addresses"
msgstr "Corrigir endereços"
msgid "Show dialog with incomplete addresses"
-msgstr "Mostra uma janela com endereços incompletos"
+msgstr "Mostra um painel com endereços incompletos"
msgid "Include objects used for guesses"
msgstr "Incluir objetos utilizados a adivinhar endereços"
@@ -21683,7 +23312,7 @@ msgstr "sem itens"
msgctxt "address"
msgid "City"
-msgstr ""
+msgstr "Cidade"
msgid "Postcode"
msgstr "Código Postal"
@@ -21753,9 +23382,15 @@ msgstr "Selecionar endereços incompletos"
msgid "Selects all addresses with incomplete data."
msgstr "Selecionar todos os endereços com dados incompletos"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr "Editor de Número de Porta"
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "A atualizar as propriedades de {0} objeto"
@@ -21781,6 +23416,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Propriedades da Camada"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "Importar Imagem"
@@ -21850,7 +23488,7 @@ msgid "OsmInspector"
msgstr ""
msgid "Open OsmInspector"
-msgstr ""
+msgstr "Abrir OsmInspector"
msgid "OsmBugInfo"
msgstr ""
@@ -21861,9 +23499,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr "Funções práticas para endereços com números de porta interpolados"
@@ -21952,8 +23602,8 @@ msgstr "Números ímpares esperados para os endereços"
msgid "Expected even numbers for addresses"
msgstr "Números pares esperados para os endereços"
-msgid "Expected valid number for address increment"
-msgstr "O incremento não é um número válido"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "O código de país deve ser de 2 letras"
@@ -22330,15 +23980,6 @@ msgstr "Número de porta:"
msgid "Street Name:"
msgstr "Nome da Rua:"
-msgid "Increment"
-msgstr "Aumentar"
-
-msgid "Decrement"
-msgstr "Diminuir"
-
-msgid "Numbers:"
-msgstr "Nº porta edifício seguinte"
-
msgid "Big buildings mode"
msgstr "Modo de edifícios grandes"
@@ -22531,6 +24172,9 @@ msgstr "Desativar recorte de imagem durante a geo-referneciação."
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "Selecione a primeira camada WMS na lista."
@@ -22550,12 +24194,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "alto"
-
-msgid "medium"
-msgstr "médio"
-
msgid "symbol"
msgstr "símbolo"
@@ -22707,6 +24345,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr "Mostrar cruzes:"
@@ -22728,6 +24369,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Ativar isto para usar a etiqueta \"add:street\" em nós."
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Adicionar \"source=...\" aos objetos?"
@@ -22816,54 +24460,6 @@ msgstr ""
"Esta imagem contém dados geo-referenciados.\n"
"Quer usá-los ?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Clique no primeiro canto para o recortar a imagem\n"
-"(2 pontos necessários)"
-
-msgid "Image cropping"
-msgstr "Recorte de imagem"
-
-msgid "Click second corner for image cropping"
-msgstr "Clique no segundo canto para recortar a imagem"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Clique na primeira cruz Lambert para geo-referenciar\n"
-"(são necessários 2 pontos)"
-
-msgid "Image georeferencing"
-msgstr "Geo-referenciação de imagem"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Clique na segunda cruz Lambert para geo-referenciar"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Quer cancelar por completo\n"
-"ou apenas tentar "
-
-msgid "Enter cadastre east,north position"
-msgstr "Introduza a posição do cadastro este,norte"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Aviso: verifique o norte com a seta !!)"
-
-msgid "East"
-msgstr "Este"
-
-msgid "I use the mouse"
-msgstr "Eu uso o rato"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Estabelecer {0} coordenadas Lambert"
-
msgid "Load layer from cache"
msgstr "Carregar camada da cache"
@@ -22922,20 +24518,82 @@ msgstr "Adicionar camada nova"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Limpar cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Obter um cookie novo (limite de tempo da sessão excedido)"
-msgid "Save image as PNG"
-msgstr "Gravar imagem como PNG"
+msgid "Save image as..."
+msgstr "Salvar imagem como..."
msgid "PNG files (*.png)"
msgstr "Ficheiros PNG (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Exportar no formato PNG (apenas imagens raster/píxeis)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Clique no primeiro canto para o recortar a imagem\n"
+"(2 pontos necessários)"
+
+msgid "Image cropping"
+msgstr "Recorte de imagem"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Clique na primeira cruz Lambert para geo-referenciar\n"
+"(são necessários 2 pontos)"
+
+msgid "Image georeferencing"
+msgstr "Geo-referenciação de imagem"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Quer cancelar por completo\n"
+"ou apenas tentar "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr "Introduza a posição do cadastro este,norte"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Aviso: verifique o norte com a seta !!)"
+
+msgid "East"
+msgstr "Este"
+
+msgid "I use the mouse"
+msgstr "Eu uso o rato"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Estabelecer {0} coordenadas Lambert"
+
+msgid "Click second corner for image cropping"
+msgstr "Clique no segundo canto para recortar a imagem"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Clique na segunda cruz Lambert para geo-referenciar"
msgid "Adjust WMS"
msgstr "Alinhar WMS"
@@ -22964,8 +24622,11 @@ msgstr "Camada WMS ({0}), {1} tela(s) carregada"
msgid "Is not vectorized."
msgstr "Não está vetorizada"
-msgid "Raster size: {0}"
-msgstr "Tamanho raster: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Está vetorizada."
@@ -23018,8 +24679,8 @@ msgstr "Eliminar o esquema de cores da lista."
msgid "Color Schemes"
msgstr "Esquema de Cores"
-msgid "Adress"
-msgstr "Endereço"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr "Dividir área"
@@ -23065,6 +24726,9 @@ msgstr "Descarregar ao longo das linhas selecionadas"
msgid "Please select 1 or more ways to download along"
msgstr "Por favor selecione 1 ou mais linhas para descarregar os dados"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr "{0} nós intermédios para descarregar."
@@ -23140,6 +24804,71 @@ msgstr "Nova ferramenta..."
msgid "Install"
msgstr "Instalar"
+msgid "Public"
+msgstr "Público"
+
+msgid "Could not get server response, check logs"
+msgstr "Não foi possível obter reposta do servidor. Verifique os relatórios"
+
+msgid "Failed to login as {0}:"
+msgstr "Não foi possível autenticar como {0}:"
+
+msgid "The server did not return user ID"
+msgstr "O servidor não retornou o Identificador de utilizador (ID)"
+
+msgid "Failed to send message:"
+msgstr "Não foi possível enviar a mensagem:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Não foi possível obter as mensagens como {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Aprir o painel GeoChat"
+
+msgid "Zoom in to see messages"
+msgstr "Aproxime o enquadramento para ver mensagens"
+
+msgid "Login"
+msgstr "Iniciar sessão"
+
+msgid "Enable autologin"
+msgstr "Ativar innício de sessão automático"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} utilizador"
+msgstr[1] "{0} utilizadores"
+
+msgid "not logged in"
+msgstr "sem sessão iniciada"
+
+msgid "User {0} has left"
+msgstr "O utilizador {0} saiu"
+
+msgid "User {0} is mapping nearby"
+msgstr "O Utilizador {0} está a editar perto"
+
+msgid "Users mapping nearby:"
+msgstr "Utilizadores a editarem perto:"
+
+msgid "Private chat"
+msgstr "Conversação privada"
+
+msgid "Close tab"
+msgstr "Fechar aba"
+
+msgid "Logout"
+msgstr "Terminar sessão"
+
+msgid "Clear log"
+msgstr "Limpar registo"
+
+msgid "Show users on map"
+msgstr "Mostrar utilizadores no mapa"
+
msgid "Position only"
msgstr "Apenas posição"
@@ -23179,27 +24908,9 @@ msgstr "Desativar registo dos dados se a distãncia for inferior a"
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "refresh the port list"
-msgstr "atualizar a lista de porta"
-
-msgid "Configure"
-msgstr "Configurar"
-
msgid "Configure Device"
msgstr "Configurar Dispositivo"
-msgid "Connection Error."
-msgstr "Erro de Ligação."
-
-msgid "configure the connected DG100"
-msgstr "configurar o DG100 ligado"
-
-msgid "delete data after import"
-msgstr "eliminar dados após importar"
-
msgid "Importing data from device."
msgstr "A importar dados do dispositivo."
@@ -23626,6 +25337,9 @@ msgstr "Gerar os limites da imagem de fundo XML para a seleção"
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23639,7 +25353,7 @@ msgid "Open Imagery XML file"
msgstr "Abrir um ficheiro de imagem de fundo XML"
msgid "Calibration Layer"
-msgstr ""
+msgstr "Camada de Calibração"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
msgstr ""
@@ -23648,7 +25362,7 @@ msgid "A calibration geometry of {0} nodes by {1}"
msgstr ""
msgid "Change Color"
-msgstr ""
+msgstr "Alterar Cor"
msgid "Deprecate Offset"
msgstr ""
@@ -23699,10 +25413,10 @@ msgid "Imagery Offset Database"
msgstr ""
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
@@ -23761,16 +25475,16 @@ msgid "Determined {0} away"
msgstr ""
msgid "Reason"
-msgstr ""
+msgstr "Motivo"
msgid "This entry has been reported."
msgstr ""
msgid "Server has rejected the request"
-msgstr ""
+msgstr "O servidor rejeitou o pedido"
msgid "Unable to connect to the server"
-msgstr ""
+msgstr "Não foi possível ligar ao servidor"
msgid "Store Imagery Offset..."
msgstr "Guardar Alinhamento..."
@@ -23817,22 +25531,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Alinhar imagem de fundo"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajustar a posição da imagem de fundo selecionada"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Por favor, escolha a camada de imagem de fundo a alinhar."
+msgstr ""
msgid "Start adjusting"
-msgstr "Começar a ajustar"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "De momento não há nenhuma camada de imagem de fundo para alinhar."
+msgstr ""
msgid "No layers to adjust"
-msgstr "Nenhuma camada para ajustar"
+msgstr ""
msgid "Normal"
msgstr "Normal"
@@ -23876,12 +25590,6 @@ msgstr "Imagens Importadas"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Ficheiros de imagens (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Abrir imagens com Imagem do ponto do trilho GPS"
-
-msgid "Load set of images as a new layer."
-msgstr "Carregar conjunto de imagens numa nova camada"
-
msgid "Import vector graphics"
msgstr "Importar gráficos vetoriais"
@@ -23891,18 +25599,15 @@ msgstr "Escala:"
msgid "unit(s) = "
msgstr "unidade(s) = "
-msgid "Import..."
-msgstr "Importar..."
-
-msgid "Import vector graphics."
-msgstr "Importar gráficos vetoriais."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Desenhos SVG (*.svg)"
-
msgid "Importing..."
msgstr "A importar..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -24286,9 +25991,6 @@ msgstr "Centrar Automaticamente"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrar continuadamente a camada LiveGPS na posição atual"
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Abrir MapDust"
@@ -24344,9 +26046,34 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr "Fundir Sobreposições (combinar)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Foram copiados funções de relações para todas as novas linhas.<br>Deve "
+"verificar isto e corrigir se for necessário.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Foram copiados membros de relações para todas as novas linhas.<br>Deve "
+"verificar isto e corrigir se for necessário.</html>"
+
msgid "Split way"
msgstr "Separar linha"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Introduza uma chave de etiqueta, por exemplo "
+"<strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Introduza o valor da etiqueta, por exemplo <strong><tt>verificar "
+"membros, check members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Esquerda Michigan"
@@ -24392,6 +26119,15 @@ msgstr "Tipo de objeto OSM para descarregar (''*'' para todos)"
msgid "XAPI query: "
msgstr "Pedido XAPI: "
+msgid "Download from Overpass API ..."
+msgstr ""
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr "Escolha o endereço web do servidor espelho do OpenStreetMap"
@@ -24406,15 +26142,6 @@ msgstr "URL de Base"
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Converter em multi-polígono"
-
-msgid "Convert to multipolygon."
-msgstr "Converter em multi-polígono."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Uma das linhas selecionadas já faz parte de um multi-polígono."
-
msgid "About Plugin"
msgstr "Sobre o Módulo"
@@ -24452,7 +26179,7 @@ msgid "No, just keep it"
msgstr "Não, apenas manter"
msgid "Close the dialog and discard all changes"
-msgstr "Fechar a janela e deitar fora todas as alterações"
+msgstr "Fechar a janela e não fazer as alterações"
msgid "Proceed and go to the next page"
msgstr "Continuar e ir para a próxima página"
@@ -24561,9 +26288,6 @@ msgstr "Dividir por bairro"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Dividir estes dados por bairros (admin_level=11)."
-msgid "Open Data"
-msgstr "Dados Abertos"
-
msgid "CSV files"
msgstr "Ficheiros CSV"
@@ -24588,12 +26312,21 @@ msgstr "Ficheiros GML"
msgid "Zip Files"
msgstr "Ficheiros ZIP"
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr "Ficheiros OpenData XML"
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr "URL da licença não disponível: {0}"
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr "Acordo de Licenciamento"
@@ -24762,6 +26495,9 @@ msgstr "A descarregar os dados"
msgid "File to load"
msgstr "Ficheiro a carregar"
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr "A ler o ficheiro ZIP..."
@@ -24782,6 +26518,17 @@ msgstr ""
msgid "Try lenient method"
msgstr "Tentar método não exato"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -25059,13 +26806,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Ocorreu um erro: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Não foi possível criar um novo problema. Resultado: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr "Enviar alterações"
@@ -25124,18 +26864,6 @@ msgstr ""
msgid "Close: "
msgstr "Fechar: "
-msgid "New issue"
-msgstr "Novo problema"
-
-msgid "Create issue"
-msgstr "Reportar problema"
-
-msgid "Describe the problem precisely"
-msgstr "Descreva de forma clara o problema"
-
-msgid "Create: "
-msgstr "Criar: "
-
msgid "Open in browser"
msgstr "Abrir no navegador"
@@ -25197,6 +26925,9 @@ msgstr "Diretório onde está o Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "Ficheiros de Servidor OSM comprimidos em pbf"
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr "Identificador de conjunto de alterações inválido: {0}"
@@ -25404,9 +27135,6 @@ msgstr "Importa um ficheiro PDF."
msgid "Import PDF"
msgstr "Importar PDF"
-msgid "Import PDf file"
-msgstr "Importar ficheiro PDF"
-
msgid " {0} objects so far"
msgstr " {0} objetos até agora"
@@ -25489,8 +27217,26 @@ msgid "Test failed: Could not write mtime."
msgstr ""
"O teste falhou: não foi possível gravar a hora de modificação (mtime)."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Quer gravar a calibração atual da camada {0}?"
@@ -25647,6 +27393,10 @@ msgstr "Nada na área de transferência"
msgid "The clipboard data is not an image"
msgstr "Os dados na área de transferência não são uma imagem"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Aviso: não foi possível manipular o ficheiro ZIP ''{0}''. Exceção: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
"Foi encontrado um ficheiro de calibração associado ao ficheiro de imagem: "
@@ -25674,6 +27424,9 @@ msgstr ""
"Além disso, a partir de agora, todos os ficheiros de calibração serão "
"carregados automaticamente."
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -25971,9 +27724,6 @@ msgstr "O ficheiro GPX não contém trilhos nem pontos GPS."
msgid "Create Stops from GPX"
msgstr "Criar Paragens de GPX"
-msgid "Tracks"
-msgstr "Trilhos GPS"
-
msgid "Tracks in this GPX file:"
msgstr "Trilhos GPS no ficheiro GPX;"
@@ -26044,9 +27794,6 @@ msgstr "Especificar função"
msgid "Change relation member roles to {0}"
msgstr "Alterar funções dos membros da relação para {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Alterar definições de criação de multi-polígonos"
-
msgid "Create administrative boundary relations"
msgstr "Criar relações de fronteiras administrativas"
@@ -26180,9 +27927,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Linha sem a função ''inner'' (dentro) ou ''outer'' (fora)"
-msgid "Restart JOSM"
-msgstr "Reiniciar o JOSM"
-
msgid "Revert changeset fully"
msgstr "Reverter completamente o conjunto de alterações"
@@ -26202,6 +27946,9 @@ msgid "Enter the ID of the changeset that should be reverted"
msgstr ""
msgid "Reverted changeset"
+msgstr "Conjunto de alterações revertido"
+
+msgid "It is not allowed to revert changeset from {0}"
msgstr ""
msgid "Missing merge target for {0} with id {1}"
@@ -26240,15 +27987,35 @@ msgstr "A obter os objetos em falta"
msgid "Downloading changeset"
msgstr "A descarregar o conjunto de alterações"
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr "Reverter conjunto de alterações #{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Aviso: elemento de início ''{0}'' não suportado existente no conjunto de "
+"alterações na posição ({1},{2}). A ignorar."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Aviso: elemento final ''{0}'' não suportado existente no conjunto de "
+"alterações na posição ({1},{2}). A ignorar."
+
msgid "Road Sign Plugin"
msgstr "Módulo Sinais de Trânsito"
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Alterar Propriedades"
+
msgid "Country preset:"
msgstr ""
@@ -26258,14 +28025,17 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr "Espanha"
+
msgid "Germany"
-msgstr ""
+msgstr "Alemanha"
msgid "Poland"
-msgstr ""
+msgstr "Polónia"
msgid "Slovakia"
-msgstr ""
+msgstr "Eslováquia"
msgid "Roadsign tagging"
msgstr "Etiquetar com o módulo Sinais de Trânsito"
@@ -26277,7 +28047,7 @@ msgid "Roadsigns plugin: open dialog"
msgstr "Módulo Roadsigns: abrir janela do módulo"
msgid "custom"
-msgstr ""
+msgstr "personalizado"
msgid "Could not read tagging preset source: ''{0}''"
msgstr ""
@@ -26364,9 +28134,6 @@ msgstr "Preferências do módulo Rota"
msgid "Configure routing preferences."
msgstr "Configurar velocidades máximas por tipo de estrada do módulo Rota."
-msgid "Highway type"
-msgstr "Tipo de estrada"
-
msgid "Speed (Km/h)"
msgstr "Velocidade máxima (km/h)"
@@ -26496,6 +28263,9 @@ msgstr "Gravar a informação Separate Data Store atual para um ficheiro."
msgid "Save SDS file"
msgstr "Gravar ficheiro Separate Data Store"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Não foi possessível fazer a cópia de seguranças. Exceção: {0}"
+
msgid "Simplify Area"
msgstr "Simplificar Área"
@@ -26571,19 +28341,19 @@ msgstr "Fator de Distância"
msgid "Merge Nearby Nodes Threshold"
msgstr "Limiar de Fusão de Nós Adjacentes"
-msgid "Online Help"
-msgstr "Ajuda na Internet"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
-msgid "Load"
-msgstr "Carregar"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "invisível"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -26730,6 +28500,9 @@ msgstr "eliminar linha de contorno inicial"
msgid "Street name: "
msgstr "Nome da rua: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Par / Ímpar"
@@ -26811,6 +28584,95 @@ msgstr "Traçar."
msgid "Tracer building"
msgstr "Traçar edifício"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -26826,9 +28688,6 @@ msgstr "Exportar assinaturas em XML..."
msgid "Save Signatures file"
msgstr "Gravar Ficheiro de Assinaturas"
-msgid "Download OSM"
-msgstr "Descarregar do OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -26856,6 +28715,9 @@ msgstr "Carregar objetos do servidor"
msgid "Download signed data"
msgstr "Descarregar dados assinados"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Aviso: a ignorar exceção porque a tarefa foi cancelada. Exceção: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -27026,9 +28888,6 @@ msgstr "Assinatura cancelada!"
msgid "Please give a tolerance in meters"
msgstr "Por favor indique a tolerância em metros"
-msgid "Accuracy"
-msgstr "Precisão"
-
msgid "Select as much as you like:"
msgstr "Selecione os que desejar:"
@@ -27755,8 +29614,11 @@ msgid "Undelete object by id"
msgstr ""
"Recuperar um objeto eliminado no OpenStreetMap através do seu identificador"
-msgid "Select if the data should be added into a new layer"
-msgstr "Selecione se os dados devem ser adicionados numa nova camada"
+msgid "Undelete Object"
+msgstr "Recuperar Objeto Eliminado"
+
+msgid "Undelete object"
+msgstr "Recuperar objeto eliminado"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -27766,11 +29628,8 @@ msgstr ""
"objetos eliminados que pretende recuperar, por exemplo ''n344483 w841 "
"r14974''"
-msgid "Undelete Object"
-msgstr "Recuperar Objeto Eliminado"
-
-msgid "Undelete object"
-msgstr "Recuperar objeto eliminado"
+msgid "Select if the data should be added into a new layer"
+msgstr "Selecione se os dados devem ser adicionados numa nova camada"
msgid "Start undeleting"
msgstr ""
@@ -27779,18 +29638,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr "Cancelar a recuperação de objeto eliminado"
-msgid "Will get {0}"
-msgstr "Irá obter-se {0}"
-
-msgid "Looking for {0}"
-msgstr "A procurar por {0}"
-
-msgid "Found {0}"
-msgstr "Encontrou-se {0}"
-
-msgid "More tools"
-msgstr "Mais Ferramentas"
-
msgid "Add nodes at intersections"
msgstr "Adicionar nós nas intersecções"
@@ -27839,15 +29686,6 @@ msgstr ""
"Colar membros da relação dos objetos da área de transferência nos objetos "
"selecionados"
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Dividir Área em 2 Áreas"
@@ -27991,18 +29829,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Configuração do endereço web personalizado"
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Adicionar nós pelas coordenadas"
@@ -28234,9 +30060,6 @@ msgstr "Desselecionar nós"
msgid "Removes all nodes from selection"
msgstr "Remove da seleção os nós"
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar Vídeo"
@@ -28363,8 +30186,8 @@ msgstr "repetir"
msgid "mute"
msgstr "silenciar"
-msgid "Scanned Map..."
-msgstr "Mapa digitalizado..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28389,9 +30212,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Camada Walking Papers ({0}) no enquadramento {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Descarregar Nó Final da Estrada"
@@ -28513,7 +30333,7 @@ msgstr ""
"visualização do JOSM"
msgid "coordinates"
-msgstr ""
+msgstr "coordenadas"
msgid "Category"
msgstr "Categoria"
@@ -28546,9 +30366,6 @@ msgstr "Permite alterar o idioma da Wikipédia a ser pesquisada"
msgid "Enter the Wikipedia language"
msgstr "Introduza o código do idioma da Wikipédia a pesquisar"
-msgid "Add Tag"
-msgstr "Adicionar Etiqueta"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 3caa66e..8e62e6d 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 12:58+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-10-11 12:18+0000\n"
+"Last-Translator: Linhares <linharesxt at gmail.com>\n"
"Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.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: 2013-04-05 05:04+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:05+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -45,11 +45,26 @@ msgid "Invalid value {0} for parameter ''has_arg''"
msgstr "Valor {0} inválido para o parâmetro ''has_arg''"
msgid "Background Terms of Use"
-msgstr "Termos de Uso do Background"
+msgstr "Termos de Uso do Plano de Fundo"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Sem suporte para abertura de link na plataforma atual (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr "AVISO: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Executando o gancho de inicialização da plataforma"
@@ -155,20 +170,14 @@ msgid "About JOSM..."
msgstr "Sobre o JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Aviso: formato não esperado da API base da URL. Redirecionando a informação "
-"ou o histórico para a pagina do objeto OSM, provavelmente pode falhar. API "
-"URL base é:\"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Aviso: formato inesperado da URL base da API. Redireccionar para a página do "
-"usuário para o seu OSM vai, provavelmente, falhar. A URL base da API é: "
-"\"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -215,6 +224,9 @@ msgstr "Sem camadas destino"
msgid "Add imagery layer {0}"
msgstr "adicionar camada de imagem {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr "Selecionar camadas WMS"
@@ -254,9 +266,6 @@ msgstr "Ferramenta: {0}"
msgid "Please select at least four nodes."
msgstr "Por favor, selecione no mínimo 4 nós."
-msgid "Information"
-msgstr "Informação"
-
msgid "Align Nodes in Line"
msgstr "Alinhar Nós em linha"
@@ -281,6 +290,9 @@ msgstr "conflito"
msgid "download"
msgstr "baixar"
+msgid "problem"
+msgstr "problema"
+
msgid "previous"
msgstr "anterior"
@@ -290,6 +302,9 @@ msgstr "próxima"
msgid "Nothing selected to zoom to."
msgstr "Não há nada selecionado para se aproximar."
+msgid "Information"
+msgstr "Informação"
+
msgid "Zoom to {0}"
msgstr "Aproximar para {0}"
@@ -346,11 +361,11 @@ msgstr ""
"algum destes?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"No foi possível combinar os caminhos (Eles podem não estar unidos em um "
-"único conjunto de nós)"
+"Não foi possível combinar as linhas<br>(Eles não puderam ser mesclados em "
+"uma única seqüência de nós)"
msgid "Combine {0} ways"
msgstr "Combinar {0} caminhos"
@@ -407,18 +422,37 @@ msgstr "Excluir"
msgid "Delete selected objects."
msgstr "Excluir os objetos selecionados."
+msgid "Toggle dialogs panel"
+msgstr "Mostrar/esconder o painel de diálogos"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Mostrar/esconder o painel de diálogos. Expande o mapa"
+
msgid "Distribute Nodes"
msgstr "Distribuir nós"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribuir nós selecionados equidistantemente sobre uma linha."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Igonrando {0} nós com coordenadas nulas"
+
msgid "Download from OSM..."
msgstr "Baixar do OSM..."
msgid "Download map data from the OSM server."
msgstr "Baixar mapa do servidor OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html> Esta ação irá requerir {0} pedidos<br>individuais para baixar. Você "
+"deseja </br> continuar? </html>"
+
+msgid "Download data"
+msgstr "Dados baixados"
+
msgid "Download object..."
msgstr "Baixar objeto..."
@@ -517,6 +551,9 @@ msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
"Mostrar informações de histórico sobre caminhos, nós ou relações do OSM."
+msgid "Show history"
+msgstr "Exibir histórico"
+
msgid "History (web)"
msgstr "Histórico (web)"
@@ -644,11 +681,11 @@ msgid "Joined overlapping areas"
msgstr "Fundir áreas sobrepostas"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Algumas dos caminhos são parte de relações que foram modificadas. Por favor, "
-"verifique se não foram introduzidos erros."
+"Algumas das linhas eram parte da relação que foi modificada.<br>Por favor, "
+"certifique-se de que nenhum erro foi introduzido."
msgid "Fix tag conflicts"
msgstr "Consertar conflito de etiquetas"
@@ -816,10 +853,10 @@ msgid "Merge nodes into the oldest one."
msgstr "Unir nós no mais antigo"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Por favor selecione ao menos dois nós para mesclar ou um nó que esteja "
+"Por favor selecione pelo menos dois nós para mesclar ou um nó que esteja "
"próximo de outro nó."
msgid "Abort Merging"
@@ -990,11 +1027,9 @@ msgid "Download Data"
msgstr "Baixar dados"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Não é possível abrir o URL ''{0}'' pois nenhuma tarefa de download "
-"está disponível.</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1026,16 +1061,9 @@ msgid "Orthogonalize / Undo"
msgstr "Ortogonalizar / Desfazer"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ortogonalizar Forma / Desfazer\n"
-"Por favor selecione os nós que foram movidos pela última chamada à função "
-"Ortogonalizar Forma!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Desfazer Ortogonalizar Forma"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1055,9 +1083,6 @@ msgstr "Ortogonalizar"
msgid "Usage"
msgstr "Utilização"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Os Elementos selecionados não podem ser ortogonalizados"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1179,6 +1204,15 @@ msgstr "Também renomear o arquivo"
msgid "Could not rename file ''{0}''"
msgstr "Não foi possível renomear arquivo ''{0}''"
+msgid "Restart"
+msgstr "Reiniciar"
+
+msgid "Restart the application."
+msgstr "Reiniciar o aplicativo."
+
+msgid "Click to restart later."
+msgstr "Clique para reiniciar mais tarde."
+
msgid "Reverse way"
msgstr "Caminho reverso"
@@ -1231,9 +1265,6 @@ msgstr "Carregar Sessão"
msgid "Load a session from file."
msgstr "Carrega uma sessão salva num arquivo."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Arquivo de sessão (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Abrir sessão"
@@ -1300,6 +1331,9 @@ msgstr "Relatório Atual"
msgid "Copy to clipboard and close"
msgstr "Copiar para área de transferência e fechar"
+msgid "Report bug"
+msgstr "Relatar erro"
+
msgid "Close"
msgstr "Fechar"
@@ -1382,18 +1416,14 @@ msgstr ""
"no meio do caminho.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Um papel baseado na composição da relação foi copiado para todos os "
-"caminhos novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Uma composição de relação foi copiada para todos os caminhos "
-"novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Dividir caminho {0} em {1} partes"
@@ -1494,6 +1524,27 @@ msgstr ""
"problemas porque você não está vendo o objeto real.<br>Você tem certeza que "
"quer desgrudar?"
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Desfazer"
@@ -1518,9 +1569,6 @@ msgstr "Atualizar dados"
msgid "Updates the objects in the active data layer from the server."
msgstr "Atualiza a partir do servidor os objetos na camada de dados ativa"
-msgid "Download data"
-msgstr "Dados baixados"
-
msgid "Update modified"
msgstr "Atualização modificada"
@@ -1731,6 +1779,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Avanço Lento"
+msgid "Download GPS"
+msgstr "Baixar GPS"
+
msgid "Downloading GPS data"
msgstr "Baixando dados do GPS"
@@ -1740,6 +1791,18 @@ msgstr "Dados GPX baixados"
msgid "Markers from {0}"
msgstr "Marcadores de {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Baixando dados"
@@ -1754,9 +1817,34 @@ msgid "OSM Server URL:"
msgstr "URL do servidor OSM:"
msgid "Command"
-msgstr ""
+msgstr "Comando"
msgid "Request details: {0}"
+msgstr "Detalhes do request: {0}"
+
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Houve {0} conflito durante a importação."
+msgstr[1] "Houve {0} conflitos durante a importação."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Conflito durante o download"
+msgstr[1] "Conflitos durante o download"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Carregando pais do nó {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Carregando pais do caminho {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Carregando pais da relação {2}"
+
+msgid "Download session"
msgstr ""
msgid "Download {0} of {1} ({2} left)"
@@ -1820,25 +1908,6 @@ msgstr ""
msgid "Errors during download"
msgstr "Erros durante a obtenção de dados"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Houve {0} conflito durante a importação."
-msgstr[1] "Houve {0} conflitos durante a importação."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Conflito durante o download"
-msgstr[1] "Conflitos durante o download"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Carregando pais do nó {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Carregando pais do caminho {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Carregando pais da relação {2}"
-
msgid "Error during download"
msgstr "Erro durante o download"
@@ -1871,7 +1940,7 @@ msgid "Backspace in Add mode"
msgstr "Backspace no modo de Adição"
msgid "helper line"
-msgstr ""
+msgstr "linha de ajuda"
msgid "Cannot add a node outside of the world."
msgstr "Não é possível adicionar nó fora do planeta."
@@ -1974,7 +2043,7 @@ msgstr ""
"adicionar um novo nó."
msgid "Extrude: main line"
-msgstr ""
+msgstr "Extrudar: linha principal"
msgid "Extrude: helper line"
msgstr "Retirar: linha de ajuda"
@@ -1988,6 +2057,9 @@ msgstr "Melhorar a Precisão da Via"
msgid "Improve Way Accuracy mode"
msgstr "Modo de Melhoria da Precisão de Vias"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr "Clicar na via para iniciar a melhoria de sua forma."
@@ -2018,10 +2090,10 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Não é possível colocar um nó fora do mundo."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Adicionar um novo nó à via"
-msgstr[1] "Adicionar um novo nó a {0} vias"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr ""
@@ -2036,6 +2108,9 @@ msgstr "Paralelo"
msgid "Make parallel copies of ways"
msgstr "Fazer cópias paralelas de vias"
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2134,14 +2209,16 @@ msgstr ""
msgid "Add all objects selected in the current dataset after the last member"
msgstr ""
+"Adicionar todos objetos selecionados no conjunto de dados atual depois do "
+"último membro"
msgid "Add selection to relation"
-msgstr ""
+msgstr "Adicionar seleção à relação"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Adicionar seleção à {0} relação"
+msgstr[1] "Adicionar seleção às {0} relações"
msgid "Delete the selected relation"
msgstr "Excluir a relação selecionada"
@@ -2174,7 +2251,7 @@ msgid "Select relation in relation list."
msgstr "Selecionar uma relação na lista de relações"
msgid "Add the members of all selected relations to current selection"
-msgstr ""
+msgstr "Adiciona os membros de todas relações selecionadas à seleção atual"
msgid "Select the members of all selected relations"
msgstr "Selecionar os membros de todas as relações selecionadas"
@@ -2186,13 +2263,13 @@ msgid "Select members"
msgstr "Selecionar membros"
msgid "Add the selected relations to the current selection"
-msgstr ""
+msgstr "Adiciona as relações selecionadas à seleção atual"
msgid "Set the current selection to the list of selected relations"
msgstr "Ajuste a seleção atual para a lista de relações selecionadas"
msgid "Select relation (add)"
-msgstr ""
+msgstr "Selecionar relação (adicionar)"
msgid "Select relation"
msgstr "Selecionar relação"
@@ -2356,6 +2433,8 @@ msgid ""
"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
"assigned changeset)"
msgstr ""
+"<b>changeset:</b>... - objetos com o determinado changeset ID (0 objetos sem "
+"associação com um changeset)"
msgid ""
"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
@@ -2449,16 +2528,16 @@ msgid "Baker Street"
msgstr ""
msgid "''Baker'' and ''Street'' in any key"
-msgstr ""
+msgstr "''Baker'' e ''Street'' em qualquer chave"
msgid "\"Baker Street\""
msgstr ""
msgid "''Baker Street'' in any key"
-msgstr ""
+msgstr "''Baker'' e ''Street'' em qualquer chave"
msgid "basics"
-msgstr ""
+msgstr "fundamentos"
msgid "''valuefragment'' anywhere in ''key''"
msgstr ""
@@ -2467,31 +2546,34 @@ msgid "''valuefragment'' nowhere in ''key''"
msgstr ""
msgid "''key'' with exactly ''value''"
-msgstr ""
+msgstr "''chave'' com exato ''valor''"
msgid "''key'' with any value"
-msgstr ""
+msgstr "''chave'' com qualquer ''valor''"
msgid "''value'' in any key"
-msgstr ""
+msgstr "\"valor\" em qualquer chave"
msgid "matches if ''key'' exists"
+msgstr "combina se a \"chave\" existe"
+
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
msgstr ""
msgid "combinators"
-msgstr ""
+msgstr "elementos de combinação"
msgid "logical and (both expressions have to be satisfied)"
-msgstr ""
+msgstr "E lógico (ambas expressões devem ser satisfeitas)"
msgid "logical or (at least one expression has to be satisfied)"
-msgstr ""
+msgstr "OU lógico (pelo menos uma expressão deve ser satisfeita)"
msgid "logical not"
-msgstr ""
+msgstr "NÃO lógico"
msgid "use parenthesis to group expressions"
-msgstr ""
+msgstr "use parênteses para agrupar expressões"
msgid ""
"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
@@ -2500,76 +2582,76 @@ msgid ""
msgstr ""
msgid "objects"
-msgstr ""
+msgstr "objetos"
msgid "all ways"
-msgstr ""
+msgstr "todos os caminhos"
msgid "all relations"
-msgstr ""
+msgstr "todas as relações"
msgid "all closed ways"
-msgstr ""
+msgstr "todos os caminhos fechados"
msgid "object without useful tags"
-msgstr ""
+msgstr "objeto sem tags úteis"
msgid "metadata"
-msgstr ""
+msgstr "metadado"
msgid "objects changed by user"
-msgstr ""
+msgstr "objetos modificados por usuário"
msgid "objects with given ID"
-msgstr ""
+msgstr "objetos com determinado ID"
msgid "objects with given version"
-msgstr ""
+msgstr "objetos com determinada versão"
msgid "objects with given changeset ID"
-msgstr ""
+msgstr "objetos com determinado ID de changeset"
msgid "objects with last modification timestamp within range"
msgstr ""
msgid "properties"
-msgstr ""
+msgstr "propriedades"
msgid "objects with at least 20 nodes"
-msgstr ""
+msgstr "objetos com pelo menos 20 nós"
msgid "objects having 5 to 10 tags"
-msgstr ""
+msgstr "objetos com 5 a 10 tags"
msgid "objects with given role in a relation"
-msgstr ""
+msgstr "objetos com determinado papel numa relação"
msgid "closed ways with an area of 100 m²"
-msgstr ""
+msgstr "caminhos fechados com uma área de 100 m²"
msgid "state"
-msgstr ""
+msgstr "estado"
msgid "all modified objects"
-msgstr ""
+msgstr "todos os objetos modificados"
msgid "all new objects"
-msgstr ""
+msgstr "todos os objetos novos"
msgid "all selected objects"
-msgstr ""
+msgstr "todos os objetos selecionados"
msgid "all incomplete objects"
-msgstr ""
+msgstr "todos os objetos incompletos"
msgid "related objects"
-msgstr ""
+msgstr "objetos relacionados"
msgid "all children of objects matching the expression"
-msgstr ""
+msgstr "todos os filhos de objetos que combinam com a expressão"
msgid "all parents of objects matching the expression"
-msgstr ""
+msgstr "todos os pais de objetos que combinam com a expressão"
msgid "n-th member of relation and/or n-th node of way"
msgstr ""
@@ -2578,19 +2660,21 @@ msgid "every n-th member of relation and/or every n-th node of way"
msgstr ""
msgid "view"
-msgstr ""
+msgstr "visão"
msgid "objects in current view"
-msgstr ""
+msgstr "objetos na visão atual"
msgid "objects (and all its way nodes / relation members) in current view"
msgstr ""
msgid "objects in downloaded area"
-msgstr ""
+msgstr "objetos na área descarregada"
msgid "objects (and all its way nodes / relation members) in downloaded area"
msgstr ""
+"objetos (e todos os nós dos caminhos / membros da relação) na área "
+"descarregada"
msgid "No match found for ''{0}''"
msgstr "Não há valores coincidentes para ''{0}''"
@@ -2643,16 +2727,16 @@ msgstr ""
"{1}"
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
-msgstr ""
+msgstr "Esperando <i>min</i>/<i>max</i> depois de ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Id de primitiva esperado"
+msgid "Range of primitive ids expected"
+msgstr "Variação de ids primitivos esperada"
-msgid "Changeset id expected"
-msgstr "Id de changeset esperado"
+msgid "Range of changeset ids expected"
+msgstr "Variação de ids de changeset esperada"
-msgid "Version expected"
-msgstr "Versão esperada"
+msgid "Range of versions expected"
+msgstr "Variação de versões esperada"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2664,6 +2748,9 @@ msgstr ""
"Tipo de primitiva desconhecida: {0}. Os valores permitidos são node, way ou "
"relation (nó, caminho ou relação)."
+msgid "Primitive id expected"
+msgstr "Id de primitiva esperado"
+
msgid "Range of numbers expected"
msgstr "Intevalo de números esperado"
@@ -2677,16 +2764,13 @@ msgid "Missing parameter for OR"
msgstr "Parâmetro faltando para OR"
msgid "Missing parameter for XOR"
-msgstr ""
+msgstr "Faltando parâmetro para XOR"
msgid "Missing operator for NOT"
msgstr "Operador faltando para NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Aviso: truncando automaticamente valor da etiqueta \"{0}\" no objeto apagado "
-"{1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2709,10 +2793,10 @@ msgid "Cyclic dependency between relations:"
msgstr "Dependência cíclica entre as relações:"
msgid "Removed obsolete tags"
-msgstr ""
+msgstr "Tags obsoletas removidas"
msgid "Fix deprecated tags"
-msgstr ""
+msgstr "Corrigir tags obsoletas"
msgid ""
"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
@@ -2738,6 +2822,10 @@ msgid ""
"cancel this dialog, you can find the entries in the validator side panel to "
"inspect them."
msgstr ""
+"Os seguintes são resultados de validação automática. Tente corrigi-los, mas "
+"seja cauteloso (não destrua dados válidos). Quando estiver em dúvida, ignore-"
+"os.<br>Quando você cancelar este diálogo, você poderá encontrar as entradas "
+"no painel lateral do validador e poderá inspecioná-las."
msgid "Errors"
msgstr "Erros"
@@ -2777,6 +2865,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "{0} objeto adicionado"
msgstr[1] "{0} objetos adicionados"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Alterar nó {0}"
@@ -2813,10 +2904,10 @@ msgstr "Remover \"{0}\" para {1} objetos"
msgid "Set {0}={1} for {2} objects"
msgstr "Alterou {0} = {1} para {2} objetos"
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2841,11 +2932,9 @@ msgid "Double conflict"
msgstr "Conflito duplo"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Aviso: Layer\"{0}\" não existe mais. Não pode remover o conflito do "
-"objeto\"{1}\""
msgid "Add conflict for ''{0}''"
msgstr "Adicionar conflito para \"{0}\""
@@ -2926,10 +3015,16 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
+"Você está próximo de deletar {0} relação: {1}<br/>Esta etapa é raramente "
+"necessária e não pode ser desfeita facilmente depois de ser atualizada para "
+"o servidor:<br/>Você realmente quer deletá-la?"
msgstr[1] ""
+"Você está próximo de deletar {0} relações: {1}<br/>Esta etapa é raramente "
+"necessária e não pode ser desfeita facilmente depois de ser atualizada para "
+"o servidor:<br/>Você realmente quer deletá-las?"
msgid "Delete relation?"
-msgstr ""
+msgstr "Deletar relação?"
msgid "Resolve conflicts in deleted state in {0}"
msgstr "Resolver conflitos em estado de exclusão em {0}"
@@ -2956,6 +3051,9 @@ msgstr[1] "{0} objetos eliminados"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Resolver conflitos na lista de membros da relação {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "rodar {0} nó"
@@ -2967,7 +3065,7 @@ msgstr[0] "Escalar {0} nó"
msgstr[1] "Escalar {0} nós"
msgid "Sequence: {0}"
-msgstr ""
+msgstr "Sequência: {0}"
msgid "Resolve {0} tag conflicts in node {1}"
msgstr "Resolver {0} conflitos do rotulo no nó {1}"
@@ -3010,17 +3108,21 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
+"<html>Você irá inverter o caminho ''{0}'',<br/> cujo significado semântico "
+"de sua tag ''{1}'' é definida pela direção.<br/>Você realmente quer inverter "
+"a direção do caminho e seu significado semântico?</html>"
msgstr[1] ""
+"<html>Você irá inverter o caminho ''{0}'',<br/> cujo significado semântico "
+"de suas tags são definidas pela direção.<br/>{1} Você realmente quer "
+"inverter a direção do caminho e seu significado semântico?</html>"
msgid "Reverse directional way."
-msgstr ""
+msgstr "Reverter caminho direcional"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Ao reverter este caminho, as seguintes alterações nas propriedades dele e em "
-"seus nós são sugeridas para manter a consistência dos dados."
msgid "Relation"
msgstr "Relação"
@@ -3049,11 +3151,11 @@ msgstr "Aplicar alterações selecionadas"
msgid "Do not apply changes"
msgstr "Não aplicar alterações"
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor, selecione quais alterações de propriedades quer aplicar."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Propriedades de "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Regras em relações referentes a"
@@ -3078,6 +3180,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Não foi possível remover o arquivo de segurança antigo {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Erro ao criar o backup da camada removida: {0}"
@@ -3091,16 +3196,16 @@ msgid "Illegal longitude value ''{0}''"
msgstr "Valor de longitude ilegal \"{0}\""
msgid "Question"
-msgstr ""
+msgstr "Pergunta"
msgid "Message"
-msgstr ""
+msgstr "Mensagem"
msgid "Enter text"
-msgstr ""
+msgstr "Digite o texto"
msgid "Installing plugins"
-msgstr ""
+msgstr "Instalando plugins"
msgid ""
"<html>Settings file asks to append preferences to <b>{0}</b>,<br/> but its "
@@ -3108,21 +3213,20 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
+"<html>Aviso: Falha ao criar o diretório de cache que faltava: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Aviso: falha ao persistir preferências para \"{0}\"."
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Aviso: Falhou a inicialização das preferências. A directória da preferência "
-"\"{0}\" não é uma directória."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3132,11 +3236,9 @@ msgstr ""
"preferência \"{0}\" não é uma directória.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Aviso: Falhou a inicialização das preferências. Falhou a criação devido a "
-"falta da directória da preferência: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3145,16 +3247,12 @@ msgstr ""
"<html>Aviso: Falhou a inicialização das preferências.<br>Falhou a criação "
"devido a falta da directória da preferência: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Aviso: A substituir o ficheiro de preferências existente \"{0} com o "
-"ficheiro de preferência base."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3172,8 +3270,8 @@ msgstr ""
"preferências base.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3204,14 +3302,11 @@ msgstr "Falhou em carregar o recurso \"{0}\". Erro é {1}."
msgid "UNKNOWN"
msgstr "DESCONHECIDO"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Aviso: número de versão do JOSM inesperado no arquivo de revisão. O valor é "
-"\"{0}\""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Aviso: o arquivo de revisão \"/REVISION\" está faltando"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "já registrado um conflito para a primitiva \"{0}\""
@@ -3285,6 +3380,8 @@ msgid ""
"Object of type {0} with id {1} was marked to be deleted, but it''s missing "
"in the source dataset"
msgstr ""
+"Objeto do tipo {0} com id {1} foi marcado para ser apagado, mas está "
+"faltando no conjunto de dados fonte"
msgid "Missing merge target for node with id {0}"
msgstr "Faltando alvo de mescla para nó com id {0}"
@@ -3352,7 +3449,7 @@ msgstr ""
"valores múltiplos."
msgid "<anonymous>"
-msgstr ""
+msgstr "<anônimo>"
msgid "Cannot add node {0} to incomplete way {1}."
msgstr "Não é possível adicionar nó {0} no caminho incompleto {1}."
@@ -3375,16 +3472,17 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
msgstr ""
+"Não é possível ativar o renderizador de mapa classe \"{0}\", porque a classe "
+"não foi encontrada."
msgid "Activating the standard map renderer instead."
-msgstr ""
+msgstr "Ativando o renderizador padrão ao invés."
msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
@@ -3451,16 +3549,16 @@ msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
msgstr ""
msgid "Unkown parameter: ''{0}''."
-msgstr ""
+msgstr "Parâmetro desconhecido: ''{0}''."
msgid "Value expected for parameter ''{0}''."
-msgstr ""
+msgstr "Valor esperado para o parâmetro ''{0}''."
msgid "No value expected for parameter ''{0}''."
-msgstr ""
+msgstr "Nenhum valor esperado para o parâmetro ''{0}''."
msgid "Unexpected parameter format (''{0}'')"
-msgstr ""
+msgstr "Formato de parâmetro inesperado (''{0}'')"
msgid "Value ''{0}'' for option +init not supported."
msgstr ""
@@ -3483,7 +3581,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3502,6 +3600,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3518,9 +3619,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3561,6 +3659,9 @@ msgstr "validar outro"
msgid "Running test {0}"
msgstr "Executando teste {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Endereços"
@@ -3571,18 +3672,27 @@ msgid "Multiple associatedStreet relations"
msgstr ""
msgid "House number without street"
-msgstr ""
+msgstr "Número de casa sem rua"
msgid "House number ''{0}'' duplicated"
-msgstr ""
+msgstr "Número de casa ''{0}'' está duplicado"
msgid "Duplicate house numbers"
-msgstr ""
+msgstr "Números de casas duplicados"
msgid "Multiple street names in relation"
-msgstr ""
+msgstr "Multiplos nomes de ruas na relação"
msgid "House number too far from street"
+msgstr "Numero da casa muito longe da rua"
+
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
msgstr ""
msgid "Building inside building"
@@ -3592,7 +3702,7 @@ msgid "Checks for building areas inside of buildings."
msgstr ""
msgid "Coastlines"
-msgstr ""
+msgstr "Linha costeira"
msgid "This test checks that coastlines are correct."
msgstr "Este teste verifica se linhas costeiras estão corretas."
@@ -3607,7 +3717,7 @@ msgid "Reversed coastline"
msgstr "Linha costeira invertida"
msgid "Crossing ways."
-msgstr ""
+msgstr "Vias que se cruzam."
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -3632,18 +3742,21 @@ msgid "Deprecated Tags"
msgstr ""
msgid "Checks and corrects deprecated tags."
-msgstr ""
+msgstr "Verifica e corrige tags desaprovadas."
msgid "Deprecation fix of {0}"
msgstr ""
msgid "{0} is deprecated"
-msgstr ""
+msgstr "{0} está obsoleta"
msgid " or "
msgstr ""
msgid "{0} is deprecated, use {1} instead"
+msgstr "{0} está obsoleta, use {1} ao invés"
+
+msgid "{0} is unnecessary"
msgstr ""
msgid "Duplicated nodes"
@@ -3652,9 +3765,6 @@ msgstr "Nós duplicados"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Este teste verifica se não há nós na mesma posição."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Nós duplicados em dois caminhos não fechados"
-
msgid "Mixed type duplicated nodes"
msgstr "Tipo combinado de nós duplicados"
@@ -3724,11 +3834,29 @@ msgstr "Nós de via duplicados"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Verificar vias para nós consecutivos idênticos."
+msgid "Highways"
+msgstr "Estradas"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolígono"
msgid "This test checks if multipolygons are valid."
-msgstr ""
+msgstr "Este teste verifica se os multipolígonos são válidos."
msgid "Area style way is not closed"
msgstr "O estilo de caminho da área não está fechado"
@@ -3794,6 +3922,12 @@ msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
"Este teste verifica os nós que têm o mesmo nome (podem ser duplicados)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3832,14 +3966,14 @@ msgid "Overlapping railways"
msgstr "Ferrovias Sobrepostas"
msgid "Power lines"
-msgstr ""
+msgstr "Linhas de Energia"
msgid ""
"Checks for nodes in power lines that do not have a power=tower/pole tag."
msgstr ""
msgid "Missing power tower/pole within power line"
-msgstr ""
+msgstr "Falta torre de energia/poste dentro da linha de energia"
msgid "Relation checker"
msgstr ""
@@ -3853,15 +3987,15 @@ msgstr "Tipo de relação é desconhecida"
msgid "Relation is empty"
msgstr "Relação está vazio"
+msgid "Role verification problem"
+msgstr "Problema de verificação de função"
+
msgid "<empty>"
msgstr "<vazio>"
msgid "Role {0} missing"
msgstr "Regra {0} faltando"
-msgid "Role verification problem"
-msgstr "Problema de verificação de função"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Número de {0} funções muito baixo ({1})"
@@ -3894,11 +4028,11 @@ msgstr ""
"Este teste verifica por vias com nomes similares que podem estar escrito "
"errados."
-msgid "Properties checker :"
-msgstr "Validador de propriedades :"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Este plug-in verifica por erros nas chaves de propriedade e valores."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Linha de verificação de etiqueta inválida - {0}: {1}"
@@ -4040,8 +4174,8 @@ msgstr "Usa o arquivo de verificação ortográfica padrão."
msgid "Use the default spellcheck file (recommended)."
msgstr "Usa o arquivo de verificação ortográfica padrão (recomendado)."
-msgid "Fix properties"
-msgstr "Consertar propriedades"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Não foi possível encontrar tipo de elemento"
@@ -4116,6 +4250,9 @@ msgid "This tests if ways which should be circular are closed."
msgstr ""
"Este teste verifica se as vias que podem ser circulares estão fechadas."
+msgid "Unclosed way"
+msgstr "Via fechada"
+
msgid "natural type {0}"
msgstr "tipo natural {0}"
@@ -4146,9 +4283,6 @@ msgstr "prédio"
msgid "area"
msgstr "área"
-msgid "Unclosed way"
-msgstr "Via fechada"
-
msgid "Unconnected ways"
msgstr ""
@@ -4175,12 +4309,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Este teste verifica por nós sem etiquetas que não são parte de uma via."
-msgid "No tags"
-msgstr "Sem etiquetas"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nós desconectados sem etiquetas físicas"
+msgid "No tags"
+msgstr "Sem etiquetas"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Possui uma etiqueta contendo ''fixme'' ou ''FIXME''"
@@ -4242,26 +4376,6 @@ msgstr "Linha costeira invertida: sem terra do lado esquerdo"
msgid "Reversed land: land not on left side"
msgstr "Terra invertida: sem terra do lado esquerdo"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Número de argumentos para marcador errado"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Erro lendo entrada do marcador: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Erro: Linha ''{0}'' inesperada em arquivo de bookmarks ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erro: Valor double ilegal ''{0}'' na linha ''{1}'' do arquivo de bookmark "
-"''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Não mostrar novamente (lembrar escolha)"
@@ -4365,7 +4479,7 @@ msgstr "Mostrar informação de ajuda"
msgid "Downloading \"Message of the day\""
msgstr "Baixando \"Mensagem do Dia\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4578,9 +4692,24 @@ msgstr "Vista"
msgid "Tools"
msgstr "Ferramentas"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Seleção"
+
msgid "Presets"
msgstr "Predefinições"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr "Janelas"
@@ -4596,10 +4725,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Áudio"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4608,6 +4749,9 @@ msgstr "Esconder este botão"
msgid "Click the arrow at the bottom to show it again."
msgstr "Clique na seta abaixo para exibir novamente."
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr "Ocultar e exibir este botão de alternância"
@@ -4669,6 +4813,9 @@ msgstr "(nenhum objeto)"
msgid "User:"
msgstr "Usuário:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "camada não está na lista."
@@ -4696,21 +4843,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "false: a propriedade é explicitamente desabilitada"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: a propriedade é explicitamente habilitada"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parcial: objetos diferentes selecionados possuem valores diferentes, não "
-"altere"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "não-definido: não defina esta propriedade nos objetos selecionados"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -5014,6 +5146,9 @@ msgstr ""
"Copiar meus elementos selecionados para o fim da lista de elementos "
"combinados"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5021,6 +5156,9 @@ msgstr ""
"Copiar meus elementos selecionados antes do primeiro elemento selecionado na "
"lista de elementos combinados"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5028,18 +5166,27 @@ msgstr ""
"Copiar meus elementos selecionados depois do primeiro elemento selecionado "
"na lista de elementos combinados"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Copiar os elementos selecionados deles para o começo da lista de elementos "
"combinados"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Copiar os elementos selecionados deles para o fim da lista de elementos "
"combinados"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5047,6 +5194,9 @@ msgstr ""
"Copiar os elementos selecionados deles antes do primeiro elemento "
"selecionado na lista de elementos combinados"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5063,8 +5213,8 @@ msgstr "Copie todos estes elementos para o alvo"
msgid "Up"
msgstr "Acima"
-msgid "Move up the selected elements by one position."
-msgstr "Move uma posição acima os elementos selecionados"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Abaixo"
@@ -5119,16 +5269,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] "Sua versão ({0} entrada)"
msgstr[1] "Sua versão ({0} entradas)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Ajustável {0} não registrado ainda. Não foi possível configurar participação "
-"no ajuste sincronizado."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Ajustável {0} não registrado ainda."
-
msgid "Node"
msgstr "Nó"
@@ -5387,18 +5527,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "Chave:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Digite a chave da tag, ex.: <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Valor:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Digite o valor da tag, ex.: <strong><tt>verifique os "
-"membros</tt></strong></html>"
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5951,6 +6088,9 @@ msgstr "Mostrar/Ocultar"
msgid "Information about layer"
msgstr "Informação sobre camada"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Estilo de pintura do mapa"
@@ -6034,6 +6174,36 @@ msgstr ""
msgid "No"
msgstr "Não"
+msgid "Object type:"
+msgstr "Tipo de objeto:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "misturado"
+
+msgid "Choose the OSM object type"
+msgstr "Escolha o tipo de objeto OSM"
+
+msgid "Object ID:"
+msgstr "ID do objeto:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Entre com o ID do objeto que deve ser baixado"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"IDs de objeto podem ser separados por vírgula ou espaço <br/> Exemplos: <b> "
+"<li> 1 2 5 </ li> <li> 1,2,5 </ li> </ ul> <br /> </ b> No modo misto, "
+"especificar os objetos como este: <b> W123, N110, w12, r15 </ b> <br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relações"
@@ -6055,9 +6225,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relações: {0}"
-msgid "Selection"
-msgstr "Seleção"
-
msgid "Open a selection list window."
msgstr "Abrir uma janela de seleção."
@@ -6082,18 +6249,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Seleção: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -6111,6 +6266,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Clique para minimizar/maximizar o conteúdo do painel"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Autores"
@@ -6128,11 +6295,8 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr "Abre um navegador com informações sobre o usuário"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Aviso: serão abertos navegadores para os {0} primeiros usuários "
-"selecionados, de um total de {1}"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6159,9 +6323,6 @@ msgstr "Abrir a janela de validação."
msgid "Validation results"
msgstr "Resultados da validação"
-msgid "Zoom to problem"
-msgstr "Zoom no problema"
-
msgid "Fix"
msgstr "Corrigir"
@@ -6315,9 +6476,6 @@ msgstr "Atualizar conteúdo"
msgid "Update the changeset content from the OSM server"
msgstr "Atualiza o conteúdo do changeset a partir do servidor do OSM"
-msgid "Show history"
-msgstr "Exibir histórico"
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6655,11 +6813,9 @@ msgstr ""
"mapa</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Aviso: valor inválido para a preferência \"{0}\": \"{1}\". Retornando a "
-"busca padrão."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6729,35 +6885,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Esta URL de pesquisa de conjunto de modificações é inválido"
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Propriedades/Associações"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Propriedades dos objetos selecionados."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<diferente>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Membro de"
msgid "Position"
msgstr "Posição"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Propriedades: {0} / Membros: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Propriedades / Associações"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Excluir a chave selecionada em todos objetos"
-msgid "Delete Properties"
-msgstr "Excluir Propriedades"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Modificar relação"
@@ -6771,13 +6939,13 @@ msgstr "Confirmar a exclusão da relação {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Adicionar um novo par chave/valor para todos objetos"
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "Adicionar Etiqueta"
msgid "Edit the value of the selected key for all objects"
msgstr "Editar o valor da chave selecionada para todos objetos"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6856,12 +7024,6 @@ msgstr[1] "Modificar propriedades de até {0} objetos"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr "Adicionar valor?"
@@ -6891,9 +7053,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6931,7 +7099,7 @@ msgstr "Relação está apagada"
msgid "Downloading relation {0}"
msgstr "Baixando relação {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6994,6 +7162,9 @@ msgstr "Apagá-los, limpar relação"
msgid "Ignore them, leave relation as is"
msgstr "Ignorá-los, deixar relação como está"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7262,6 +7433,26 @@ msgid "way is not connected to previous or next relation member"
msgstr ""
"o caminho não está conectado ao membro anterior ou posterior da relação"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Número de argumentos para marcador errado"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Erro lendo entrada do marcador: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
+
msgid "Bookmarks"
msgstr "Favoritos"
@@ -7333,9 +7524,6 @@ msgstr "Requerido valor de latitude no intervalo [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "Requerido valor de longitude no intervalo [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Colar URL da área de transferência"
-
msgid "Data Sources and Types:"
msgstr "Tipos e fontes de dados:"
@@ -7408,21 +7596,8 @@ msgstr "Baixar referentes (relações mães)"
msgid "Download object"
msgstr "Baixar objeto"
-msgid "Object type:"
-msgstr "Tipo de objeto:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "misturado"
-
-msgid "Choose the OSM object type"
-msgstr "Escolha o tipo de objeto OSM"
-
-msgid "Object ID:"
-msgstr "ID do objeto:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Entre com o ID do objeto que deve ser baixado"
+msgid "Start downloading"
+msgstr "Começar o download"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7434,28 +7609,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Selecione se os integrantes de uma relação devem ser baixados também"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"IDs de objeto podem ser separados por vírgula ou espaço <br/> Exemplos: <b> "
-"<li> 1 2 5 </ li> <li> 1,2,5 </ li> </ ul> <br /> </ b> No modo misto, "
-"especificar os objetos como este: <b> W123, N110, w12, r15 </ b> <br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Baixar referentes (relações e caminhos pais)"
-msgid "Start downloading"
-msgstr "Começar o download"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Lista de ID inválida\n"
-"Não é possível baixar o objeto."
-
msgid "Class Type"
msgstr "Tipo de Classe"
@@ -7560,8 +7716,8 @@ msgstr "Ir para próxima página"
msgid "Go to the JOSM help home page"
msgstr "Ir para página inicial da ajuda do JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Aviso: localização ruim no documento HTML. A exceção foi: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "Falha ao abrir página de ajuda. O URL de destino está vazio."
@@ -7668,6 +7824,9 @@ msgid ""
msgstr ""
"<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "Informações do changeset"
@@ -7773,9 +7932,8 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
-"Aviso: o cabeçalho de erro {0} não é compatível com o padrão esperado"
msgid "Upload"
msgstr "Enviar"
@@ -7793,8 +7951,14 @@ msgstr "Faça um comentário breve sobre as mudanças que está enviando:"
msgid "Enter an upload comment"
msgstr "Escreva um comentário de envio"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
-msgstr "ID do chengeset:"
+msgstr "Id do conjunto de mudanças:"
msgid "Created at:"
msgstr "Criado em:"
@@ -7865,11 +8029,8 @@ msgid "Closing changeset {0}"
msgstr "Fechar changeset {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Aviso: falha ao colocar a janela de Credenciais no topo das outras janelas. "
-"Foi capturada uma exceção de segurança."
msgid "Enter credentials for OSM API"
msgstr "Informe as credenciais da API do OSM"
@@ -7950,8 +8111,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7969,11 +8130,8 @@ msgid "Missing user identity"
msgstr "Faltando identidade de usuário"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Aviso: Falha ao buscar informações sobre o usuário JOSM atual. A exceção "
-"foi: {0}"
msgid "Download objects"
msgstr ""
@@ -8212,12 +8370,6 @@ msgstr "Enviar primitivas modificadas"
msgid "Please revise upload comment"
msgstr "Por favor, revise o comentário de envio"
-msgid "Revise"
-msgstr "Revisar"
-
-msgid "Continue as is"
-msgstr "Continuar como está"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8232,6 +8384,22 @@ msgstr ""
"/><br />Se você puder gastar um minuto explicando suas alterações, fará a "
"vida dos <br />outros mapeadores mais fácil."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "Revisar"
+
+msgid "Continue as is"
+msgstr "Continuar como está"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Retornar ao diálogo anterior para escrever um comentário mais descritivo"
@@ -8248,6 +8416,21 @@ msgstr "Por favor, entre com valor válido para tamanho de pedaço de arquivo"
msgid "Illegal chunk size"
msgstr "Tamanho do bloco é ilegal"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Cancelar o upload e continuar a editar"
@@ -8255,11 +8438,9 @@ msgid "Tags of changeset {0}"
msgstr "Etiquetas do conjunto de modificações {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e "
-"tentando novamente o envio de dados."
msgid "Preparing objects to upload ..."
msgstr ""
@@ -8397,9 +8578,6 @@ msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
"Objeto \"{0}\" já foi apagado. Ignorando esse objeto no envio de dados."
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Enviando {0} objeto..."
@@ -8411,6 +8589,9 @@ msgstr ""
"Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é "
"{0}"
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8431,9 +8612,8 @@ msgstr "Selecionar objetos para enviar"
msgid "Cancel uploading"
msgstr "Cancelar envio"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Aviso: valor inesperado para chave ''{0}'' em preferências, obtido ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Por favor, selecione a estratégia de envio:"
@@ -8587,7 +8767,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8617,8 +8797,8 @@ msgstr "versão {0}"
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8733,6 +8913,9 @@ msgstr "aumentar nível de zoom para ver mais detalhes"
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8772,6 +8955,9 @@ msgstr "Recarregar imagens erradas"
msgid "Alpha channel"
msgstr "Canal alfa"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr "Adicionar marcador para esta camada WMS"
@@ -8985,9 +9171,6 @@ msgstr "Extrair coordenadas GPS do EXIF"
msgid "Starting directory scan"
msgstr "Iniciando varredura de diretório"
-msgid "One of the selected files was null"
-msgstr "Um dos arquivos selecionados foi nulo"
-
msgid "Read photos..."
msgstr "Ler fotos..."
@@ -9007,6 +9190,9 @@ msgstr "Arquivo nulo encontrado no diretório {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Erro ao obter os arquivos do diretório {0}\n"
+msgid "One of the selected files was null"
+msgstr "Um dos arquivos selecionados foi nulo"
+
msgid "Geotagged Images"
msgstr "Imagens Geotagueadas"
@@ -9066,6 +9252,12 @@ msgstr "Próximo"
msgid "Show next Image"
msgstr "Mostrar a próxima imagem"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centralizar vista"
@@ -9141,9 +9333,6 @@ msgstr ""
"considerado prejudicial.<br>Se você deseja carregar traços, dê uma olhada "
"aqui:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces (EN)"
-
msgid "Customize track drawing"
msgstr ""
@@ -9156,8 +9345,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Descarregar do OSM ao largo desta via"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Descargar tudo entre:"
@@ -9183,15 +9375,17 @@ msgstr "somente pontos"
msgid "track and waypoints"
msgstr "trilhas e pontos"
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Descarregar do OSM ao largo desta via"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html> Esta ação irá requerir {0} pedidos<br>individuais para baixar. Você "
-"deseja </br> continuar? </html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9333,15 +9527,11 @@ msgstr "Houve um erro na tentativa de mostrar a URL deste marcador"
msgid "(URL was: "
msgstr "(A URL era: "
-msgid "Error displaying URL"
-msgstr "Erro exibindo a URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Aviso: falha ao ler estilos Mappaint de ''{0}''. A exceção foi: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
msgid "loading style ''{0}''..."
msgstr ""
@@ -9355,9 +9545,8 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Aviso: falhou ao analisar os estilos Mappaint do \"{0}\". O erro foi: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Padrão de traço ilegal, os valores devem ser positivos"
@@ -9366,11 +9555,8 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "Padrão de traço ilegal, pelo menos um valor deve ser > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Aviso: falhou ao analisar os estilos Mappaint do \"{0}\". O erro foi: "
-"[{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Chave do Token de Acesso>"
@@ -9634,8 +9820,8 @@ msgstr "Feche o diálogo e cancele a autorização"
msgid "Close the dialog and accept the Access Token"
msgstr "Feche o diálogo e aceite o Token de Acesso"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Aviso: falha ao cancelar a operação OAuth em execução"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Obtendo um Token de Requisição do OAuth de ''{0}''"
@@ -9710,6 +9896,12 @@ msgstr ""
"Selecione para dar ao JSOM o direito de escrever suas preferências do "
"servidor"
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "Obtendo Token de Acesso OAuth..."
@@ -9780,9 +9972,6 @@ msgstr ""
"este token. O JOSM irá usá-lo no futuro para autenticação e autorização no "
"servidor do OSM.<br><br>O token de acesso é: </html>"
-msgid "Restart"
-msgstr "Reiniciar"
-
msgid "Click to retrieve a Request Token"
msgstr "Clique pare receber um token de requisição"
@@ -10064,6 +10253,9 @@ msgstr "Baixar plugins"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Você precicar reiniciar JOSM para aplicar mudanças."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Controle Remoto"
@@ -10192,6 +10384,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "Ações"
@@ -10234,6 +10432,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Validador de dados"
@@ -10286,6 +10487,27 @@ msgstr "Pesquisar: "
msgid "Read from file"
msgstr ""
+msgid "Export selected items"
+msgstr ""
+
+msgid "JOSM custom settings files (*.xml)"
+msgstr ""
+
+msgid "Please select some preference keys not marked as default"
+msgstr ""
+
+msgid "Export preferences keys to JOSM customization file"
+msgstr ""
+
+msgid "What to do with preference lists when this file is to be imported?"
+msgstr ""
+
+msgid "Append preferences from file to existing values"
+msgstr ""
+
+msgid "Replace existing values"
+msgstr ""
+
msgid "Open JOSM customization file"
msgstr ""
@@ -10298,40 +10520,58 @@ msgid ""
"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Export selected items"
+msgid "shortcut"
msgstr ""
-msgid "Please select some preference keys not marked as default"
+msgid "color"
msgstr ""
-msgid "Export preferences keys to JOSM customization file"
+msgid "toolbar"
msgstr ""
-msgid "What to do with preference lists when this file is to be imported?"
+msgid "imagery"
msgstr ""
-msgid "Append preferences from file to existing values"
+msgid "Reset preferences"
msgstr ""
-msgid "Replace existing values"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Load profile"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Save {0} profile"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Current value is default."
+msgid "Choose profile file"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "Change list setting"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "Key: {0}"
+msgstr ""
+
+msgid "Change list of lists setting"
+msgstr ""
+
+msgid "add entry"
+msgstr ""
+
+msgid "Remove the selected entry"
+msgstr ""
+
+msgid "Change list of maps setting"
+msgstr ""
+
+msgid "Entry {0}"
msgstr ""
msgid "Select Setting Type:"
@@ -10352,25 +10592,19 @@ msgstr ""
msgid "Add setting"
msgstr ""
-msgid "Change list setting"
-msgstr ""
-
-msgid "Key: {0}"
-msgstr ""
-
-msgid "Change list of lists setting"
+msgid "Advanced Background: Changed"
msgstr ""
-msgid "add entry"
+msgid "Advanced Background: NonDefault"
msgstr ""
-msgid "Remove the selected entry"
+msgid "Current value is default."
msgstr ""
-msgid "Change list of maps setting"
+msgid "Default value is ''{0}''."
msgstr ""
-msgid "Entry {0}"
+msgid "Default value currently unknown (setting has not been used yet)."
msgstr ""
msgid "Change string setting"
@@ -10431,6 +10665,9 @@ msgstr "Desenhar nós virtuais no modo escollhido"
msgid "Draw inactive layers in other color"
msgstr "Desenhar camadas inativas em cor diferente"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10489,6 +10726,11 @@ msgstr ""
"Esta opção suprime o recheio da áreas, tapando tudo que foi especificado no "
"estilo selecionado."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10786,7 +11028,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10961,6 +11209,12 @@ msgstr ""
"<i>(O JOSM pode manter um arquivo de backup ao salvar dados da camada. Ele "
"adiciona ''~'' ao nome do arquivo e salva-o na mesma pasta.)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Backup de arquivo"
@@ -11030,8 +11284,8 @@ msgstr "Configurações do Mapa"
msgid "Settings for the map projection and data interpretation."
msgstr "Configurações para projeção do mapa e interpretação dos dados."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11305,21 +11559,6 @@ msgstr "Grade Suíça"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Zona UTM"
-
-msgid "North"
-msgstr "Norte"
-
-msgid "South"
-msgstr "Sul"
-
-msgid "Hemisphere"
-msgstr "Hemisfério"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11341,6 +11580,21 @@ msgstr "UTM França (DOM)"
msgid "UTM Geodesic system"
msgstr "Sistema Geodésico UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Zona UTM"
+
+msgid "North"
+msgstr "Norte"
+
+msgid "South"
+msgstr "Sul"
+
+msgid "Hemisphere"
+msgstr "Hemisfério"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Testando URL de API do OSM \"{0}\""
@@ -11408,8 +11662,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Selecione para usar o OAuth como seu mecanismo de autenticação"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -11418,28 +11672,26 @@ msgstr "Nome de usuário OSM:"
msgid "OSM password:"
msgstr "Senha do OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Aviso: falhou ao recuperar as credenciais do OSM do gerenciador de "
-"credenciais."
msgid "Current credential manager is of type ''{0}''"
msgstr "O gerenciador de credenciais é do tipo \"{0}\""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Aviso: falhou ao salvar as credenciais do OSM para o gerenciador de creden."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
msgstr ""
-"Aviso: falhou ao recuperar o token de acesso OAuth do gerenciador de "
-"credenciais"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Aviso: falhou ao armazenar o token de acesso OAuth para o gerenciador de "
-"credenciais"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11530,18 +11782,9 @@ msgid "Use a SOCKS proxy"
msgstr "Use um proxy SOCKS"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Aviso> O JOSM é configurado para usar proxies das configurações do sistema, "
-"mas a JVM não está configurada para coletar estas configurações. Reiniciando "
-"as preferências para \"Sem Proxy\""
-
-msgid "disabled"
-msgstr "desabilitado"
-
-msgid "no modifier"
-msgstr "sem modificador"
msgid "Shortcut Background: User"
msgstr ""
@@ -11584,32 +11827,37 @@ msgstr "Apagar a seleção na tabela de tags"
msgid "Add a new tag"
msgstr "Adicionar nova tag"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Usar preferencia ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Elementos do tipo {0} são suportados."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Modificar objeto {0}"
+msgstr[1] "Modificar objetos {0}"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
+msgid "Nothing selected!"
+msgstr "Nada selecionado!"
-msgid "More information about this feature"
-msgstr "Mais informações sobre esta característica"
+msgid "Selection unsuitable!"
+msgstr "Seleção inadequada!"
+
+msgid "Apply Preset"
+msgstr "Aplicar Preferência"
+
+msgid "New relation"
+msgstr "Nova relação"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "Requisito desconhecido: {0}"
@@ -11617,6 +11865,9 @@ msgstr "Requisito desconhecido: {0}"
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Mais informações sobre esta característica"
+
msgid "Available roles"
msgstr ""
@@ -11632,52 +11883,42 @@ msgstr "elementos"
msgid "Optional Attributes:"
msgstr "Atributos opcionais:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
-
-msgid "Use preset ''{0}''"
-msgstr "Usar preferencia ''{0}''"
-
-msgid "Unknown type: {0}"
-msgstr "Tipo desconhecido: {0}"
-
-msgid "Roles cannot appear more than once"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset sub element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "Erro analisando {0}: "
-
-msgid "Elements of type {0} are supported."
-msgstr "Elementos do tipo {0} são suportados."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Modificar objeto {0}"
-msgstr[1] "Modificar objetos {0}"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Nothing selected!"
-msgstr "Nada selecionado!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Selection unsuitable!"
-msgstr "Seleção inadequada!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Apply Preset"
-msgstr "Aplicar Preferência"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "New relation"
-msgstr "Nova relação"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Change Properties"
-msgstr "Alterar propriedades"
+msgid "Unknown type: {0}"
+msgstr "Tipo desconhecido: {0}"
msgid "Preset group {1} / {0}"
msgstr "Grupo de pré-definições {1} / {0}"
@@ -11685,6 +11926,18 @@ msgstr "Grupo de pré-definições {1} / {0}"
msgid "Preset group {0}"
msgstr "Grupo de pré-definições {0}"
+msgid "Roles cannot appear more than once"
+msgstr ""
+
+msgid "Preset role element without parent"
+msgstr ""
+
+msgid "Preset sub element without parent"
+msgstr ""
+
+msgid "Error parsing {0}: "
+msgstr "Erro analisando {0}: "
+
msgid "Search preset"
msgstr "Buscar predefinição"
@@ -11700,6 +11953,16 @@ msgstr "Exibir somente aplicável para seleção"
msgid "Search in tags"
msgstr "Procurar nas etiquetas"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Ajustável {0} não registrado ainda. Não foi possível configurar participação "
+"no ajuste sincronizado."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Ajustável {0} não registrado ainda."
+
msgid "All files (*.*)"
msgstr ""
@@ -11734,6 +11997,58 @@ msgid ""
msgstr ""
"O valor atual não é um ID do OSM válido. Por gentileza digite um inteiro > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "false: a propriedade é explicitamente desabilitada"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true: a propriedade é explicitamente habilitada"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"parcial: objetos diferentes selecionados possuem valores diferentes, não "
+"altere"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "não-definido: não defina esta propriedade nos objetos selecionados"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Faltando atributo mandatório ''{0}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Valor ilegal para atributo mandatório ''{0}'' do tipo long. Obtido ''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Valor ilegal para atributo mandatório ''{0}'' do tipo long (>=0). Obtido "
+"''{1}''."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Valor ilegal para atributo mandatório ''{0}'' do tipo boolean. Obtido "
+"''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Valor ilegal para atributo mandatório ''{0}'' do tipo OsmPrimitiveType. "
+"Obtido ''{1}''."
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11764,11 +12079,9 @@ msgid "Contacting OSM Server..."
msgstr "Acessando Servidor OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Aviso: valor ilegal do atributo \"{0}\" do elemento \"{1}\" na capacidade do "
-"servidor. Obtido \"{2}\""
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Falhou ao analisar data \"{0}\" respondido pelo servidor."
@@ -11808,33 +12121,27 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Número de porta ilegal nas preferências \"{0}\". Obtido {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Erro: A conexão ao proxy ''{0}'' pela URI ''{1}'' falhou. A exceção foi: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Aviso: a JVM não está configurada para procurar por proxies nas "
-"configurações do sistema. A propriedade ''java.net.useSystemProxies'' não "
-"foi encontrada na inicialização. Não será possível usar um proxy."
msgid "Parsing response from server..."
msgstr ""
@@ -11932,6 +12239,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Erro de interpretação: estrutura inválida para documento gpx"
+msgid "(at line {0}, column {1})"
+msgstr "(na linha{0}, coluna {1})"
+
msgid "Unknown mode {0}."
msgstr "O modo {0} é desconhecido."
@@ -11947,15 +12257,21 @@ msgstr "Procurando por arquivos de imagem"
msgid "No image files found."
msgstr "Nenhum arquivo de imagem encontrado."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Aviso: falha ao abrir arquivo com extensão \"{2}\" e nome \"{3}\" no arquivo "
-"zip \"{0}\". A exceção foi: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr ""
@@ -12034,8 +12350,8 @@ msgstr "Sentenças desconhecidas: {0}"
msgid "Zero coordinates: {0}"
msgstr "Zero coordenadas: {0}"
-msgid "NMEA import success"
-msgstr "importação NMEA bem sucedida"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "falha na importação NMEA"
@@ -12135,42 +12451,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Faltando atributo mandatório ''{0}''."
-
msgid "Unsupported version: {0}"
msgstr "Versão não suportada: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Valor ilegal para atributo mandatório ''{0}'' do tipo long. Obtido ''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Valor ilegal para atributo mandatório ''{0}'' do tipo long (>=0). Obtido "
-"''{1}''."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Valor ilegal para atributo mandatório ''{0}'' do tipo boolean. Obtido "
-"''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Valor ilegal para atributo mandatório ''{0}'' do tipo OsmPrimitiveType. "
-"Obtido ''{1}''."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -12180,8 +12465,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -12208,12 +12493,9 @@ msgstr "Analisando lista de conjuntos de modificações..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
-msgid "(at line {0}, column {1})"
-msgstr "(na linha{0}, coluna {1})"
-
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
@@ -12222,9 +12504,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Não foi possível criar cópia de segurança. A exceção foi: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -12246,6 +12525,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12295,8 +12577,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -12447,6 +12729,9 @@ msgstr "Salvar usuário e senha (sem encriptação)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -12465,6 +12750,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr "Carregar dados da API"
@@ -12489,7 +12783,13 @@ msgstr "Criar novos objetos"
msgid "Read protocol version"
msgstr "Versão do protocolo de leitura"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -12498,9 +12798,6 @@ msgstr "Controle remoto informou da criação de um novo nó."
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr ""
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
@@ -12510,6 +12807,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12526,6 +12831,15 @@ msgstr "Controle remoto informou da importação de dados da seguinte URL:"
msgid "Remote Control has been asked to load data from the API."
msgstr "Controle remoto informou do carregamento de dados da API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12556,19 +12870,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12590,11 +12904,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Arquivo de sessão (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -12664,18 +12990,14 @@ msgid "Download skipped"
msgstr "Baixar pulados"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Aviso: Não é possível baixar o plugin \"{0}\". O link de download não é "
-"conhecido. Pulando download."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Aviso: Não é possível baixar o plugin \"{0}\". O link de download \"{1}\" "
-"não é uma URL válida. Pulando download."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Falhou ao criar diretório de plugin \"{0}\""
@@ -12827,11 +13149,11 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Atualização de plugin falhou"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "Aviso: falhou ao baixar lista de informações de plugins"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "Desabilitar plugin"
@@ -12845,24 +13167,21 @@ msgstr "Manter plugin"
msgid "Click to keep the plugin ''{0}''"
msgstr "Clique para apagar o plugin \"{0}\""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Aviso: falhou ao apagar plugin desatualizado \"{0}."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Aviso: falhou ao instalar plugin já baixado \"{0}\". Pulando instalação. O "
-"JOSM ainda está carregando a versão antiga do plugin."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12937,8 +13256,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12953,9 +13271,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr "Baixando lista de plugins a partir de \"{0}\""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -13291,17 +13624,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "Aviso: falha ao manipular arquivo zip ''{0}''. A exceção foi: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -13312,9 +13639,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -13346,9 +13716,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -13456,7 +13840,7 @@ msgstr ""
msgctxt "landuse"
msgid "residential"
-msgstr ""
+msgstr "residencial"
msgctxt "natural"
msgid "scrub"
@@ -13676,6 +14060,11 @@ msgid "Saturation:"
msgstr "Saturação:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13762,6 +14151,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13865,9 +14258,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13925,6 +14315,9 @@ msgstr ""
"Escreva informações de posicionamento GPS no cabeçalho do arquivo de imagem. "
"Pode-se executar esta funcionalidade no menu de contexto da camada de imagem."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13951,9 +14344,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13979,9 +14369,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -14018,6 +14405,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -14066,9 +14458,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Estradas"
-
msgid "Streets"
msgstr "Ruas"
@@ -14153,6 +14542,9 @@ msgstr "Barragem"
msgid "Lit"
msgstr "Iluminado"
+msgid "Toll"
+msgstr "Pedágio"
+
msgid "Motorway Link"
msgstr "Ligação para auto-estrada"
@@ -14243,6 +14635,50 @@ msgstr "Residencial"
msgid "Edit Residential Street"
msgstr "Editar Rua Residencial"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Tipo de estrada"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "sim"
+
+msgid "no"
+msgstr "não"
+
+msgid "destination"
+msgstr "Destino"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Rua para pedestres"
@@ -14261,11 +14697,11 @@ msgstr "Área"
msgid "Service"
msgstr "Serviço"
-msgid "Edit Serviceway"
-msgstr "Editar Rua de Serviço"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Tipo de Rua de Serviço"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr ""
@@ -14274,6 +14710,9 @@ msgid "driveway"
msgstr ""
msgid "parking_aisle"
+msgstr "corredor_de_estacionamento"
+
+msgid "drive-through"
msgstr ""
msgid "Parking Aisle"
@@ -14303,18 +14742,12 @@ msgstr "rotatória"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "sim"
-
msgid "Road Restrictions"
msgstr "Restrições da Via"
msgid "Edit Road Restrictions"
msgstr "Editar Restrições da Via"
-msgid "Toll"
-msgstr "Pedágio"
-
msgid "No exit (cul-de-sac)"
msgstr "Sem saída"
@@ -14324,9 +14757,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "Destino"
-
msgid "delivery"
msgstr ""
@@ -14336,15 +14766,15 @@ msgstr "permitido"
msgid "private"
msgstr "privado"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr ""
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "não"
-
msgid "official"
msgstr ""
@@ -14390,6 +14820,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Veículos de Serviço Público"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Velocidade mínima (km/h)"
@@ -14454,7 +14887,7 @@ msgid "unclassified"
msgstr "sem classificação"
msgid "residential"
-msgstr ""
+msgstr "residenncial"
msgid "living_street"
msgstr ""
@@ -14474,6 +14907,9 @@ msgstr "Editar Ponte"
msgid "viaduct"
msgstr "viaduto"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14578,21 +15014,30 @@ msgstr ""
msgid "Visibility"
msgstr "Visibilidade"
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -14608,11 +15053,11 @@ msgstr "Caminho exclusivo para cavalos"
msgid "Edit Bridleway"
msgstr "Editar caminho exclusivo para cavalos"
-msgid "Cycle Lane"
-msgstr "Ciclovia"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "Editar ciclovia"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "Ciclovia"
@@ -14647,7 +15092,7 @@ msgstr "Ciclovia na direita"
msgid "Oneway (bicycle)"
msgstr "Mão única (bicicleta)"
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14716,12 +15161,18 @@ msgstr "Área de Descanso"
msgid "Edit Rest Area"
msgstr "Editar Área de Descanso"
-msgid "Emergency Phone"
-msgstr "Telefone de Emergência"
+msgid "Drinking Water"
+msgstr "Bebedouro"
msgid "Traffic Signal"
msgstr "Sinal de Trânsito"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Tipo de cruzamento de pedestres"
@@ -14737,15 +15188,6 @@ msgstr "ilha"
msgid "unmarked"
msgstr "sem faixa"
-msgid "Cross on horseback"
-msgstr "Travessia à cavalo"
-
-msgid "Cross by bicycle"
-msgstr "Travessia de bicicleta"
-
-msgid "Crossing attendant"
-msgstr "Guarda de trânsito"
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -14767,6 +15209,15 @@ msgstr "pégasus"
msgid "tiger"
msgstr "tigre"
+msgid "Crossing attendant"
+msgstr "Guarda de trânsito"
+
+msgid "Cross by bicycle"
+msgstr "Travessia de bicicleta"
+
+msgid "Cross on horseback"
+msgstr "Travessia à cavalo"
+
msgid "Stop"
msgstr "Pare"
@@ -14776,6 +15227,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "Mini-rotatória"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Direção"
@@ -14785,10 +15239,7 @@ msgstr "sentido horário"
msgid "Pedestrian Crossing"
msgstr "Faixa de Pedestres"
-msgid "Edit Crossing"
-msgstr "Editar Faixa de Pedestres"
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -14821,9 +15272,6 @@ msgstr "Lombada muito longa"
msgid "Passing Place"
msgstr "Local de ultrapassagem"
-msgid "Edit Passing Place"
-msgstr "Editar local de ultrapassagem"
-
msgid "Turning Circle"
msgstr "Círculo de retorno"
@@ -14857,30 +15305,57 @@ msgstr ""
msgid "Barriers"
msgstr "Barreiras"
+msgid "Block"
+msgstr "Bloco"
+
+msgid "Edit Block"
+msgstr "Editar Bloco"
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr "rocha"
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
-msgstr ""
+msgstr "Editar Pilar"
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr "Tipo de Pilar"
+
+msgid "rising"
msgstr ""
+msgid "removable"
+msgstr "removível"
+
+msgid "plastic"
+msgstr "plástico"
+
msgid "Cycle Barrier"
msgstr "Barreira para bicicletas"
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
-msgstr ""
+msgstr "mata-burro"
msgid "Edit Cattle Grid"
-msgstr ""
+msgstr "Editar Mata-burro"
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -14902,19 +15377,34 @@ msgstr "Editar Alfândega"
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Altura (metros)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Cerca"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14923,23 +15413,52 @@ msgstr "polo"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Muro"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Muro da Cidade"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Canal Artificial"
+msgstr ""
-msgid "Entrance"
-msgstr "Entrada"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Editar Entrada"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr ""
@@ -14971,12 +15490,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -15029,10 +15563,13 @@ msgid "Water"
msgstr "Água"
msgid "Drain"
-msgstr ""
+msgstr "Dreno/Ralo"
msgid "Edit Drain"
-msgstr ""
+msgstr "Editar Dreno/Ralo"
+
+msgid "Ditch"
+msgstr "Canal Artificial"
msgid "Edit Ditch"
msgstr "Editar Canal Artificial"
@@ -15043,6 +15580,12 @@ msgstr "Córrego"
msgid "Edit Stream"
msgstr "Editar Córrego"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -15082,9 +15625,6 @@ msgstr "Editar Barragem"
msgid "Groyne"
msgstr "Quebra-mar"
-msgid "Edit Groyne"
-msgstr "Editar Quebra-mar"
-
msgid "Breakwater"
msgstr ""
@@ -15092,10 +15632,10 @@ msgid "Edit Breakwater"
msgstr ""
msgid "Culvert"
-msgstr ""
+msgstr "Bueiro"
msgid "Edit Culvert"
-msgstr ""
+msgstr "Editar Bueiro"
msgid "Basin"
msgstr "Bacia"
@@ -15118,6 +15658,21 @@ msgstr ""
msgid "Edit Water"
msgstr "Editar Água"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -15164,28 +15719,28 @@ msgid "mangrove"
msgstr ""
msgid "Mud"
-msgstr ""
+msgstr "Lama"
msgid "Edit Mud"
-msgstr ""
+msgstr "Editar Lama"
msgid "Beach"
-msgstr ""
+msgstr "Praia"
msgid "Edit Beach"
-msgstr ""
+msgstr "Editar Praia"
msgid "Bay"
-msgstr ""
+msgstr "Baía"
msgid "Edit Bay"
-msgstr ""
+msgstr "Editar Baía"
msgid "Cliff"
-msgstr ""
+msgstr "Penhasco"
msgid "Edit Cliff"
-msgstr ""
+msgstr "Editar Penhasco"
msgid "Shipping"
msgstr ""
@@ -15199,18 +15754,23 @@ msgstr "Editar Terminal de Barca"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicicleta"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -15260,7 +15820,7 @@ msgid "Transport"
msgstr "Transporte"
msgid "Railway"
-msgstr "Trilhos"
+msgstr "Ferrovia"
msgid "Rail"
msgstr "Trilhos"
@@ -15283,7 +15843,10 @@ msgstr "exército"
msgid "tourism"
msgstr "turismo"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -15307,26 +15870,26 @@ msgstr ""
msgid "rail"
msgstr "trilho"
-msgid "Voltage"
-msgstr "Voltagem"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frequencia (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
msgid "Narrow Gauge Rail"
-msgstr ""
+msgstr "Bitola Estreita"
msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-msgid "Types"
-msgstr ""
+msgstr "Editar Bitola Estreita"
msgid "Monorail"
-msgstr "Mono-trilho"
+msgstr "Monotrilho"
msgid "Edit Monorail"
msgstr "Editar Mono-trilho"
@@ -15362,21 +15925,59 @@ msgid "Edit Bus Guideway"
msgstr ""
msgid "Disused Rail"
-msgstr ""
+msgstr "Ferrovia em Desuso"
msgid "Edit Disused Railway"
msgstr "Editar Ferrovia em Desuso"
-msgid "Optional Types"
-msgstr ""
-
msgid "Abandoned Rail"
-msgstr ""
+msgstr "Ferrovia Abandonada"
+
+msgid "Edit Abandoned Railway"
+msgstr "Editar Ferrovia Abandonada"
msgid "Level Crossing"
msgstr ""
-msgid "Crossing"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
+msgid "Crossing"
+msgstr ""
+
+msgid "Edit Crossing"
msgstr ""
msgid "Crossing type"
@@ -15478,11 +16079,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -15494,11 +16093,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -15509,20 +16106,20 @@ msgid "Edit Parking"
msgstr "Editar Estacionamento"
msgid "multi-storey"
-msgstr ""
+msgstr "com vários andares"
msgid "surface"
msgstr ""
msgid "underground"
+msgstr "subterrâneo"
+
+msgid "rooftop"
msgstr ""
msgid "Access"
msgstr "Acesso"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -15545,13 +16142,10 @@ msgid "See the Wiki for other capacity:[types]=*."
msgstr ""
msgid "Parking space"
-msgstr ""
+msgstr "Vaga de Estacionamento"
msgid "Edit Parking space"
-msgstr ""
-
-msgid "rooftop"
-msgstr ""
+msgstr "Editar Vaga de Estacionamento"
msgid "Capacity"
msgstr "Capacidade"
@@ -15568,27 +16162,43 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Horário de Funcionamento"
msgid "24/7"
-msgstr "24/7"
+msgstr "24 Horas"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Seg-Sex 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Sa-Su 00:00-24:00"
msgstr ""
-msgid "Parking entrance"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
msgstr ""
-msgid "Edit Parking entrance"
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
msgstr ""
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
+
+msgid "Parking entrance"
+msgstr "Entrada do estacionamento"
+
+msgid "Edit Parking entrance"
+msgstr "Editar Entrada do Estacionamento"
+
msgid "Fuel"
msgstr "Posto de Gasolina"
@@ -15665,7 +16275,7 @@ msgid "Independent"
msgstr ""
msgid "With shop"
-msgstr ""
+msgstr "Com Loja"
msgid "convenience"
msgstr ""
@@ -15730,6 +16340,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltagem"
+
msgid "Amperage"
msgstr ""
@@ -15743,7 +16356,7 @@ msgid "Car Dealer"
msgstr "Concessionária"
msgid "Edit Car Shop"
-msgstr "Editar Loja de Carros"
+msgstr ""
msgid "Repair"
msgstr "Oficina"
@@ -15751,12 +16364,18 @@ msgstr "Oficina"
msgid "Edit Car Repair"
msgstr "Editar Oficina"
-msgid "Tyres"
+msgid "Parts"
msgstr ""
-msgid "Edit Tyres"
+msgid "Edit Car Parts"
msgstr ""
+msgid "Tyres"
+msgstr "Borracharia"
+
+msgid "Edit Tyres"
+msgstr "Editar Borracharia"
+
msgid "Contact:"
msgstr ""
@@ -15770,7 +16389,7 @@ msgid "Website"
msgstr ""
msgid "Email Address"
-msgstr ""
+msgstr "Endereço de E-mail"
msgid "Rental"
msgstr "Aluguel"
@@ -15778,6 +16397,12 @@ msgstr "Aluguel"
msgid "Edit Car Rental"
msgstr "Editar Aluguel de Carros"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Compartilhamento"
@@ -15802,22 +16427,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15839,9 +16448,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Roupas"
@@ -15905,8 +16511,8 @@ msgstr "Editar Aluguel de Bicicletas"
msgid "Public Transport"
msgstr "Transporte Público"
-msgid "Route"
-msgstr "Rota"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Editar Rota"
@@ -16036,6 +16642,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -16049,7 +16658,7 @@ msgid "Train"
msgstr ""
msgid "Railway station (legacy)"
-msgstr ""
+msgstr "Estação Ferroviária"
msgid "Railway halt (legacy)"
msgstr ""
@@ -16066,6 +16675,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Banco"
@@ -16078,21 +16690,23 @@ msgstr "Cadeira de Rodas"
msgid "limited"
msgstr "limitado"
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
msgid "Railway platform (legacy)"
-msgstr ""
+msgstr "Plataforma Ferroviária"
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Edificação"
@@ -16105,6 +16719,9 @@ msgstr "Editar Entrada do Metrô"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -16129,14 +16746,6 @@ msgstr "Cartões de fidelidade"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -16185,17 +16794,17 @@ msgstr "Editar Plataforma de Ônibus"
msgid "Taxi"
msgstr "Táxi"
-msgid "Edit Taxi station"
-msgstr "Editar Ponto de Táxi"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Aeroporto"
msgid "Airport Ground"
-msgstr ""
+msgstr "Terreno do Aeroporto"
msgid "Edit Airport Ground"
-msgstr ""
+msgstr "Editar Terreno do Aeroporto"
msgid "IATA"
msgstr "IATA"
@@ -16204,10 +16813,10 @@ msgid "ICAO"
msgstr "ICAO"
msgid "Runway"
-msgstr ""
+msgstr "Pista"
msgid "Edit Runway"
-msgstr ""
+msgstr "Editar Pista"
msgid "Taxiway"
msgstr ""
@@ -16216,10 +16825,10 @@ msgid "Edit Taxiway"
msgstr ""
msgid "Helipad"
-msgstr ""
+msgstr "Heliponto"
msgid "Edit Helipad"
-msgstr ""
+msgstr "Editar Heliponto"
msgid "Apron"
msgstr ""
@@ -16239,9 +16848,24 @@ msgstr "Terminal"
msgid "Edit Terminal"
msgstr "Editar Terminal"
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Taxa de Acesso a Internet"
+
msgctxt "airport"
msgid "Gate"
-msgstr ""
+msgstr "Portão"
msgid "Edit Terminal Gate"
msgstr ""
@@ -16261,32 +16885,17 @@ msgstr "Editar Hotel"
msgid "Stars"
msgstr ""
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
msgid "dedicated"
-msgstr ""
+msgstr "exclusivo"
msgid "separated"
-msgstr ""
+msgstr "separado"
msgid "isolated"
-msgstr ""
+msgstr "isolado"
msgid "Motel"
msgstr "Motor Hotel"
@@ -16397,7 +17006,7 @@ msgid "japanese"
msgstr "japonesa"
msgid "french"
-msgstr ""
+msgstr "francesa"
msgid "sandwich"
msgstr ""
@@ -16421,10 +17030,10 @@ msgid "chicken"
msgstr ""
msgid "Food Court"
-msgstr ""
+msgstr "Praça de Alimentação"
msgid "Edit Food Court"
-msgstr ""
+msgstr "Editar Praça de Alimentação"
msgid "Cafe"
msgstr "Café"
@@ -16433,7 +17042,7 @@ msgid "Edit Cafe"
msgstr "Editar Café"
msgid "ice_cream"
-msgstr ""
+msgstr "sorvete"
msgid "Pub"
msgstr "Bar/Pub"
@@ -16459,6 +17068,12 @@ msgstr "Boate"
msgid "Edit Nightclub"
msgstr "Editar Boate"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turismo"
@@ -16480,9 +17095,15 @@ msgstr ""
msgid "Information Office"
msgstr "Centro de Informações Turísticas"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -16495,6 +17116,9 @@ msgstr "estrada"
msgid "scheme"
msgstr "esquema"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -16534,6 +17158,9 @@ msgstr "... outros modos de transporte possíveis"
msgid "Information Board"
msgstr "Quadro de Informações"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -16555,23 +17182,35 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
-msgstr "Outros Pontos de Informação"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "Lazer"
@@ -16594,9 +17233,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "cerca"
@@ -16621,8 +17257,17 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Ter-Dom 08:00-15:00; Sáb 08:00-12:00"
+msgid "Horse riding"
+msgstr "Equitação"
+
+msgid "Edit Horse riding"
+msgstr "Editar Equitação"
+
+msgid "Brothel"
+msgstr "Bordel"
+
+msgid "Edit Brothel"
+msgstr "Editar Bordel"
msgid "Playground"
msgstr "Parquinho"
@@ -16659,7 +17304,7 @@ msgid "Edit Fishing"
msgstr "Editar Pescaria"
msgid "Private Swimming Pool"
-msgstr ""
+msgstr "Piscina Particular"
msgid "Culture"
msgstr ""
@@ -16694,50 +17339,44 @@ msgstr "Arte"
msgid "Edit Artwork"
msgstr "Editar Arte"
-msgid "Place of Worship"
-msgstr "Lugar de Adoração"
-
-msgid "Edit Place of Worship"
-msgstr "Editar Lugar de Adoração"
-
-msgid "Religion"
-msgstr "Religião"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "budismo"
+msgid "audio"
+msgstr ""
-msgid "christian"
-msgstr "cristianismo"
+msgid "video"
+msgstr ""
-msgid "hindu"
-msgstr "hinduísmo"
+msgid "Place of Worship"
+msgstr "Lugar de Adoração"
-msgid "jain"
-msgstr "jainismo"
+msgid "Church"
+msgstr "Igreja"
-msgid "jewish"
-msgstr "judaísmo"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "muçulmano"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikhismo"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "espiritismo"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoísmo"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "unitarianismo"
+msgid "church"
+msgstr "igreja"
-msgid "zoroastrian"
-msgstr "zoroastrianismo"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "Denominação"
@@ -16754,6 +17393,12 @@ msgstr "católica"
msgid "evangelical"
msgstr "evangélica"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "testemunha de jeová"
@@ -16766,6 +17411,9 @@ msgstr "metodista"
msgid "mormon"
msgstr "mórmon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxa"
@@ -16781,39 +17429,142 @@ msgstr "protestante"
msgid "quaker"
msgstr "quaker"
-msgid "shia"
-msgstr "xiismo"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "sunismo"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
+msgid "Sa 18:00; Su 10:45"
msgstr ""
-msgid "Edit Studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
msgstr ""
-msgid "audio"
+msgid "Sa 10:00+"
msgstr ""
-msgid "video"
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "xiismo"
+
+msgid "sunni"
+msgstr "sunismo"
+
+msgid "Synagogue"
+msgstr ""
+
+msgid "Edit Synagogue"
+msgstr ""
+
+msgid "synagogue"
+msgstr ""
+
+msgid "conservative"
+msgstr ""
+
+msgid "reform"
+msgstr ""
+
+msgid "Buddhist Temple"
+msgstr ""
+
+msgid "Edit Buddhist Temple"
+msgstr ""
+
+msgid "theravada"
+msgstr ""
+
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
msgstr ""
+msgid "Religion"
+msgstr "Religião"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jainismo"
+
+msgid "sikh"
+msgstr "sikhismo"
+
+msgid "spiritualist"
+msgstr "espiritismo"
+
+msgid "taoist"
+msgstr "taoísmo"
+
+msgid "unitarian"
+msgstr "unitarianismo"
+
+msgid "zoroastrian"
+msgstr "zoroastrianismo"
+
msgid "Public Building"
msgstr "Prédio Público"
@@ -16901,6 +17652,12 @@ msgstr "Editar Autoescola"
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Saúde"
@@ -16910,6 +17667,12 @@ msgstr "Hospital"
msgid "Edit Hospital"
msgstr "Editar Hospital"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Médicos"
@@ -16976,12 +17739,66 @@ msgstr "Veterinária"
msgid "Edit Veterinary"
msgstr "Editar Veterinária"
-msgid "Note"
-msgstr "Nota"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "público"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Caixa de Correio"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefone"
@@ -16991,6 +17808,30 @@ msgstr "Editar Telefone"
msgid "Telephone cards"
msgstr "Cartão Telefônico"
+msgid "Emergency Phone"
+msgstr "Telefone de Emergência"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Relógio"
@@ -17000,31 +17841,37 @@ msgstr "Editar Relógio"
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -17052,8 +17899,8 @@ msgstr ""
msgid "Recycling"
msgstr "Reciclagem"
-msgid "Edit Recycling station"
-msgstr "Editar Centro de Reciclagem"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Baterias"
@@ -17079,27 +17926,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Cesta de Lixo"
-msgid "Edit Waste Basket"
-msgstr "Editar Cesta de Lixo"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr "rocha"
-
-msgid "plastic"
-msgstr "plástico"
-
msgid "Amount of Seats"
msgstr "Número de Assentos"
@@ -17134,14 +17969,17 @@ msgstr "Editar estande de caça"
msgid "Height"
msgstr "Altura"
+msgctxt "height"
msgid "low"
-msgstr "baixa"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "metade"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "cheio"
+msgstr ""
msgid "Hide"
msgstr "Ocutar"
@@ -17149,11 +17987,11 @@ msgstr "Ocutar"
msgid "Lock"
msgstr "Bloquear"
-msgid "Drinking Water"
-msgstr "Bebedouro"
+msgid "Edit Source of Potable Water"
+msgstr "Editar Fonte da Água Potável"
-msgid "Edit Drinking Water"
-msgstr "Editar Bebedouro"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Hidrante"
@@ -17163,7 +18001,7 @@ msgstr "Editar Hidrante"
msgctxt "pipeline"
msgid "underground"
-msgstr ""
+msgstr "subterrâneo"
msgctxt "pipeline"
msgid "pillar"
@@ -17180,13 +18018,16 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
msgctxt "hydrant position"
msgid "parking_lot"
-msgstr ""
+msgstr "estacionamento"
msgctxt "hydrant position"
msgid "sidewalk"
@@ -17217,119 +18058,155 @@ msgstr "Estádio"
msgid "Edit Stadium"
msgstr "Editar Estádio"
-msgid "select sport:"
-msgstr "selecionar esporte:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "esporte"
+msgid "Sport"
+msgstr "Esporte"
+msgctxt "sport"
msgid "multi"
-msgstr "multi"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "arco e flecha"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletismo"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "futebol australiano"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basquete"
+msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "boliche"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "canoagem"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "escalada"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "críquete"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "ciclismo"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "corrida de cachorros"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golfe"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "ginástica olímpica"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hóquei"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "corrida de cavalos"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "automobilismo"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "tiro"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "esqui"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "futebol"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "natação"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "tênis de mesa"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tênis"
+msgstr ""
msgid "Sports Centre"
msgstr "Centro de Esportes"
@@ -17361,26 +18238,27 @@ msgstr "Mini-Golfe"
msgid "Edit Miniature Golf"
msgstr "Editar Mini-Golfe"
-msgid "Sport"
-msgstr "Esporte"
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "tipo"
-
+msgctxt "running"
msgid "pitch"
-msgstr "campo"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "estádio"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -17388,6 +18266,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "campo"
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr "estádio"
+
msgid "10pin"
msgstr ""
@@ -17421,56 +18308,97 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
-msgid "Dog Racing"
+msgctxt "racing"
+msgid "pitch"
msgstr ""
-msgid "Edit Dog Racing"
+msgctxt "racing"
+msgid "sports_centre"
msgstr ""
-msgid "Equestrian"
+msgctxt "racing"
+msgid "stadium"
msgstr ""
-msgid "Edit Equestrian"
+msgctxt "racing"
+msgid "track"
msgstr ""
-msgid "horse_riding"
+msgid "Dog Racing"
msgstr ""
-msgid "Horse Racing"
+msgid "Edit Dog Racing"
msgstr ""
-msgid "Edit Horse Racing"
+msgid "Equestrian"
msgstr ""
-msgid "Gymnastics"
+msgid "Edit Equestrian"
msgstr ""
-msgid "Edit Gymnastics"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
-msgid "Skating"
+msgctxt "riding"
+msgid "sports_centre"
msgstr ""
-msgid "Edit Skating"
+msgctxt "riding"
+msgid "stadium"
msgstr ""
-msgid "ice_rink"
+msgctxt "riding"
+msgid "track"
msgstr ""
-msgid "Skateboard"
+msgid "clay"
msgstr ""
-msgid "Edit Skateboard"
+msgid "dirt"
msgstr ""
-msgid "Swimming"
+msgid "fine_gravel"
msgstr ""
-msgid "Edit Swimming"
-msgstr ""
+msgid "mud"
+msgstr "lama"
-msgid "swimming_pool"
-msgstr ""
+msgid "Horse Racing"
+msgstr "Corrida de cavalo"
+
+msgid "Edit Horse Racing"
+msgstr "Editar Corrida de Cavalo"
+
+msgid "Gymnastics"
+msgstr ""
+
+msgid "Edit Gymnastics"
+msgstr ""
+
+msgid "Skating"
+msgstr ""
+
+msgid "Edit Skating"
+msgstr ""
+
+msgid "ice_rink"
+msgstr ""
+
+msgid "Skateboard"
+msgstr ""
+
+msgid "Edit Skateboard"
+msgstr ""
+
+msgid "Swimming"
+msgstr "Natação"
+
+msgid "Edit Swimming"
+msgstr "Editar Natação"
+
+msgid "swimming_pool"
+msgstr "piscina olímpica"
msgid "water_park"
msgstr ""
@@ -17496,44 +18424,62 @@ msgstr ""
msgid "Difficulty"
msgstr "Dificuldade"
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
msgid "Shooting"
-msgstr ""
+msgstr "Clube de Tiro"
msgid "Edit Shooting"
-msgstr ""
+msgstr "Editar Clube de Tiro"
msgid "Sport (Ball)"
msgstr "Esporte com Bola"
@@ -17568,19 +18514,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17609,16 +18551,16 @@ msgid "Edit Basketball"
msgstr "Editar Basquetebol"
msgid "Volleyball"
-msgstr ""
+msgstr "Voleibol"
msgid "Edit Volleyball"
-msgstr ""
+msgstr "Editar Voleibol"
msgid "Beachvolleyball"
-msgstr ""
+msgstr "Vôlei de Praia"
msgid "Edit Beachvolleyball"
-msgstr ""
+msgstr "Editar Vôlei de Praia"
msgid "Golf"
msgstr "Golfe"
@@ -17636,10 +18578,10 @@ msgid "Edit Boule"
msgstr ""
msgid "Bowls"
-msgstr ""
+msgstr "Boliche"
msgid "Edit Bowls"
-msgstr ""
+msgstr "Editar Boliche"
msgid "Cricket"
msgstr "Críquete"
@@ -17719,6 +18661,18 @@ msgstr "Pista para Aeromodelo"
msgid "Edit Model Aerodrome"
msgstr "Editar Pista para Aeromodelo"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -17731,60 +18685,134 @@ msgstr "Construção humana"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
msgstr ""
+msgid "Residential Building"
+msgstr "Edifício Residencial"
+
msgid "Edit Residential Building"
+msgstr "Editar Edifício Residencial"
+
+msgctxt "building"
+msgid "residential"
msgstr ""
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Entrada"
+
+msgid "Edit Entrance"
+msgstr "Editar Entrada"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Torre"
@@ -17800,9 +18828,6 @@ msgstr "comunicação"
msgid "observation"
msgstr "observação"
-msgid "Height (meters)"
-msgstr "Altura (metros)"
-
msgid "Flagpole"
msgstr ""
@@ -17813,10 +18838,10 @@ msgid "Edit Works"
msgstr "Editar Fábrica"
msgid "Chimney"
-msgstr ""
+msgstr "Chaminé"
msgid "Edit Chimney"
-msgstr ""
+msgstr "Editar Chaminé"
msgid "Windmill"
msgstr "Moinho de Vento"
@@ -17849,14 +18874,14 @@ msgid "oil"
msgstr "petróleo"
msgid "sewage"
-msgstr ""
+msgstr "esgoto"
msgid "Location"
msgstr "Localidade"
msgctxt "pipeline"
msgid "underwater"
-msgstr ""
+msgstr "subaquático"
msgctxt "pipeline"
msgid "overground"
@@ -17986,10 +19011,10 @@ msgid "Edit Fountain"
msgstr "Editar Chafariz"
msgid "Water Well"
-msgstr ""
+msgstr "Poço Artesiano"
msgid "Edit Water Well"
-msgstr ""
+msgstr "Editar Poço Artesiano"
msgid "Lighthouse"
msgstr "Farol"
@@ -18012,41 +19037,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -18055,8 +19106,8 @@ msgstr "Vértice Geodésico"
msgid "Edit Survey Point"
msgstr "Editar Vértice Geodésico"
-msgid "Surveillance"
-msgstr "Câmera de Vigilância"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Editar Câmera de Vigilância"
@@ -18067,12 +19118,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
-msgstr "público"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "loja"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Gerador de Energia"
@@ -18124,137 +19265,256 @@ msgstr "eólica"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
-msgstr "barragem"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "carvão"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "Estação de Energia"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Editar Estação de Energia"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
-msgstr "Subestação de Energia"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Edit Power Sub Station"
-msgstr "Editar Subestação de Energia"
+msgid "solar_photovoltaic_panel"
+msgstr ""
-msgid "Line reference"
+msgid "solar photovoltaic"
msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "solar thermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Torre de Energia"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Editar Torre de Energia"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
+msgid "steam_turbine"
msgstr ""
-msgid "Pole"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
msgstr ""
-msgid "Edit Power Pole"
+msgid "stellarator"
msgstr ""
-msgid "Pole reference"
+msgid "nuclear fusion"
msgstr ""
-msgid "Power Line"
-msgstr "Linha de transmissão"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "Editar Linha de Transmissão"
+msgid "vertical_axis"
+msgstr ""
-msgid "Line type"
-msgstr "Tipo de Linha de Transmissão"
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr "Subestação de Energia"
+
+msgid "Edit Power Sub Station"
+msgstr "Editar Subestação de Energia"
+
+msgid "Line reference"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "baixa"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Torre de Energia"
+
+msgid "Edit Power Tower"
+msgstr "Editar Torre de Energia"
+
+msgid "Tower reference"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr "Linha de transmissão"
+
+msgid "Edit Power Line"
+msgstr "Editar Linha de Transmissão"
+
+msgid "Line type"
+msgstr "Tipo de Linha de Transmissão"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -18343,7 +19603,7 @@ msgid "Shops"
msgstr "Lojas"
msgid "Food"
-msgstr ""
+msgstr "Alimentos"
msgid "Supermarket"
msgstr "Supermercado"
@@ -18363,11 +19623,11 @@ msgstr "Quiosque"
msgid "Edit Kiosk"
msgstr "Editar Quiosque"
-msgid "Baker"
-msgstr "Padaria"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Editar Padaria"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Açougue"
@@ -18376,9 +19636,9 @@ msgid "Edit Butcher"
msgstr "Editar Açougue"
msgid "Seafood"
-msgstr ""
+msgstr "Frutos do Mar"
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -18399,14 +19659,20 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr "Orgânicos"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Orgânicos"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -18424,7 +19690,7 @@ msgid "Alcohol"
msgstr "Álcool"
msgid "Edit Alcohol Shop"
-msgstr "Editar"
+msgstr "Editar Adega"
msgid "Beverages"
msgstr "Bebidas"
@@ -18477,11 +19743,11 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
-msgstr ""
+msgstr "Eletrônica"
msgid "Computer"
msgstr "Computador"
@@ -18496,15 +19762,15 @@ msgid "Edit Electronics Shop"
msgstr "Editar Loja de Eletrônicos"
msgid "Mobile Phone"
-msgstr ""
+msgstr "Celular"
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -18513,9 +19779,8 @@ msgstr "Equipamentos de Áudio"
msgid "Edit Hifi Shop"
msgstr "Editar Loja de Equipamentos de Áudio"
-msgctxt "shop"
msgid "Video"
-msgstr "Locadora de Vídeo"
+msgstr "Vídeo"
msgid "Edit Video Shop"
msgstr "Editar Locadora de Vídeo"
@@ -18541,12 +19806,18 @@ msgstr "Editar Loja de Câmbio"
msgid "Edit Automated Teller Machine"
msgstr "Editar Caixa Eletrônico"
-msgid "Department Store"
+msgid "Pawnbroker"
msgstr ""
-msgid "Edit Department Store"
+msgid "Edit Pawnbroker"
msgstr ""
+msgid "Department Store"
+msgstr "Loja de Departamentos"
+
+msgid "Edit Department Store"
+msgstr "Editar Loja de Departamentos"
+
msgid "Mall"
msgstr ""
@@ -18575,12 +19846,33 @@ msgid "Jewelry"
msgstr ""
msgid "Edit Jewelry"
+msgstr "Editar Joalheria"
+
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
msgstr ""
+msgid "buddhist"
+msgstr "budismo"
+
+msgid "christian"
+msgstr "cristianismo"
+
+msgid "hindu"
+msgstr "hinduísmo"
+
+msgid "jewish"
+msgstr "judaísmo"
+
+msgid "muslim"
+msgstr "muçulmano"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -18590,10 +19882,10 @@ msgid "Edit Florist"
msgstr "Editar Floricultura"
msgid "Garden Centre"
-msgstr "Loja de Plantas"
+msgstr "Floricultura"
msgid "Edit Garden Centre"
-msgstr "Editar Loja de Plantas"
+msgstr "Editar Floricultura"
msgid "Do-it-yourself-store"
msgstr "Loja de Ferragens"
@@ -18610,7 +19902,7 @@ msgstr "Editar Loja de Utilidades Domésticas"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -18622,19 +19914,19 @@ msgstr "Editar Loja de Móveis"
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -18655,6 +19947,12 @@ msgstr "Livraria"
msgid "Edit Book Store"
msgstr "Editar Livraria"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Agência de Viagem"
@@ -18664,7 +19962,7 @@ msgstr "Editar Agência de Viagem"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -18745,6 +20043,9 @@ msgstr "brinquedos"
msgid "vouchers"
msgstr "vales"
+msgid "Note"
+msgstr "Nota"
+
msgid "Geography"
msgstr "Geografia"
@@ -18857,10 +20158,10 @@ msgid "Edit Isolated Dwelling"
msgstr ""
msgid "Neighbourhood"
-msgstr ""
+msgstr "Vizinhança"
msgid "Edit Neighbourhood"
-msgstr ""
+msgstr "Editar Vizinhança"
msgid "Locality"
msgstr "Localidade"
@@ -18874,6 +20175,12 @@ msgstr "Pico"
msgid "Edit Peak"
msgstr "Editar Pico"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Geleira"
@@ -18913,26 +20220,35 @@ msgstr "Árvore"
msgid "Edit Tree"
msgstr "Editar Árvore"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Nome Botânico"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Mata"
msgid "Edit Wood"
msgstr "Editar Mata"
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "decídua"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "misturado"
msgid "Forest"
msgstr "Floresta"
@@ -18940,20 +20256,11 @@ msgstr "Floresta"
msgid "Edit Forest Landuse"
msgstr "Editar zona Florestal"
-msgid "coniferous"
-msgstr "conífera"
-
-msgid "deciduous"
-msgstr "decídua"
-
-msgid "mixed"
-msgstr "misturado"
-
msgid "Grassland"
msgstr ""
msgid "Edit Grassland"
-msgstr ""
+msgstr "Gramado"
msgid "pampas"
msgstr ""
@@ -18980,10 +20287,10 @@ msgid "Edit Nature Reserve"
msgstr "Editar Reserva Natural"
msgid "Scree"
-msgstr ""
+msgstr "Cascalho"
msgid "Edit Scree"
-msgstr ""
+msgstr "Editar Cascalho"
msgid "Fell"
msgstr ""
@@ -19024,6 +20331,12 @@ msgstr "Prados"
msgid "Edit Meadow Landuse"
msgstr "Editar Zona de prados"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinhedo"
@@ -19078,8 +20391,8 @@ msgstr "Área de recreação"
msgid "Edit Recreation Ground Landuse"
msgstr "Editar Área de recreação"
-msgid "Residential area"
-msgstr "Área residencial"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Editar zona Residencial"
@@ -19090,6 +20403,9 @@ msgstr "Cemitério Paroquial"
msgid "Edit Graveyard"
msgstr "Editar Cemitério Paroquial"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Cemitério"
@@ -19165,6 +20481,33 @@ msgstr ""
msgid "Annotation"
msgstr "Anotação"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Editar Informações de Endereço"
@@ -19183,30 +20526,6 @@ msgstr "Cidade"
msgid "Country code"
msgstr "Código do país"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolação de Endereços"
@@ -19225,6 +20544,18 @@ msgstr "números pares"
msgid "alphabetic"
msgstr "alfabético"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -19387,26 +20718,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "estrada"
+msgstr ""
+
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+msgctxt "route type"
msgid "ski"
-msgstr "Esqui"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "a pé"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "caminhada"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "desvio"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "Descrição de símbolo"
@@ -19453,19 +20813,22 @@ msgstr "ponto de parada em frente"
msgid "backward halt point"
msgstr "ponto de parada atrás"
-msgid "Route network"
-msgstr "Rede de rotas"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Editar rede de rotas"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -19489,7 +20852,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19541,7 +20904,7 @@ msgid "canal"
msgstr ""
msgid "drain"
-msgstr ""
+msgstr "dreno/ralo"
msgid "ditch"
msgstr "canal artificial"
@@ -19585,18 +20948,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "ponte"
msgid "deprecated"
msgstr "depreciado"
+msgid "bicycle"
+msgstr "bicicleta"
+
+msgid "foot"
+msgstr "a pé"
+
msgid "horse"
msgstr "cavalo"
@@ -19606,8 +20978,11 @@ msgstr "obstáculo"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "trilha_autoestrada"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "serviços"
@@ -19615,10 +20990,10 @@ msgstr "serviços"
msgid "ford"
msgstr "travessia de rio"
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19636,9 +21011,12 @@ msgstr ""
msgid "railwaypoint"
msgstr "ponto de ferrovia"
-msgid "railyard"
+msgid "raildashed"
msgstr ""
+msgid "railyard"
+msgstr "pátio ferroviário"
+
msgid "otherrail"
msgstr ""
@@ -19651,29 +21029,29 @@ msgstr ""
msgid "aeroway"
msgstr "aerovia"
-msgid "aeroway_dark"
-msgstr "aerovia_escuro"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "aerovia_claro"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "pista_fácil"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "pista_intermediária"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "pista_avançada"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
-msgstr "pista_livre"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "pista_novatos"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "energia"
@@ -19693,20 +21071,20 @@ msgstr "marina"
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "saúde"
-msgid "shop"
-msgstr "loja"
+msgid "office"
+msgstr "escritório"
msgid "hotel"
msgstr "hotel"
@@ -19730,7 +21108,7 @@ msgid "forest"
msgstr "floresta"
msgid "garages"
-msgstr ""
+msgstr "garagens"
msgid "farmyard"
msgstr "fazenda"
@@ -19771,9 +21149,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "lama"
-
msgid "beach"
msgstr "praia"
@@ -19783,10 +21158,13 @@ msgstr "rota"
msgid "boundary"
msgstr "limite"
+msgid "sport"
+msgstr "esporte"
+
msgid "place"
msgstr "lugar"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19801,9 +21179,6 @@ msgstr "Vilarejo/Cidade"
msgid "One Way"
msgstr "Mão única"
-msgid "Church"
-msgstr "Igreja"
-
msgid "Fuel Station"
msgstr "Posto de Gasolina"
@@ -19831,6 +21206,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19876,10 +21254,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19891,7 +21299,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19909,7 +21317,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -20026,19 +21434,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:geometry on a node"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:postal_code without addr:postcode"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -20051,19 +21570,55 @@ msgid "unknown muslim denomination"
msgstr ""
msgid "unknown jewish denomination"
-msgstr ""
+msgstr "denominação judaica desconhecida"
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -20072,23 +21627,32 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
msgstr ""
@@ -20099,142 +21663,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -20250,13 +21863,13 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "Lodi - Itália"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicília - Itália"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -20273,46 +21886,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -20333,90 +21949,150 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OSM Export"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
msgstr ""
+msgid "Port:"
+msgstr "Porta:"
+
+msgid "refresh the port list"
+msgstr "atualizar a lista de portas"
+
+msgid "Configure"
+msgstr "Configurar"
+
+msgid "Connection Error."
+msgstr "Erro de conexão."
+
+msgid "configure the connected DG100"
+msgstr "configurar o DG100 conectado"
+
+msgid "delete data after import"
+msgstr "apagar dados depois de importar"
+
msgid "Columbus V-900 CSV Files"
msgstr "Arquivos CSV Columbus V-900"
@@ -20623,6 +22299,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20644,14 +22332,8 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
-msgstr ""
+msgid "Tracks"
+msgstr "Trilhas"
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -20915,9 +22597,15 @@ msgstr "Selecione um endereço incompletos"
msgid "Selects all addresses with incomplete data."
msgstr "Selecionar todos os endereços com dados incompletos."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Atualizando propriedades de {0} objeto"
@@ -20939,6 +22627,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Propriedades da camada"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "Importar imagem"
@@ -21018,9 +22709,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -21105,8 +22808,8 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
-msgstr "Número válido esperado para incrementar endereço"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "O código da cidade deve ter 2 letras"
@@ -21378,15 +23081,6 @@ msgstr "Número da casa:"
msgid "Street Name:"
msgstr "Nome da Rua:"
-msgid "Increment"
-msgstr "Incremento"
-
-msgid "Decrement"
-msgstr "Decremento"
-
-msgid "Numbers:"
-msgstr "Números:"
-
msgid "Big buildings mode"
msgstr ""
@@ -21559,6 +23253,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "Selecionar a primeira camada WMS da lista."
@@ -21577,12 +23274,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "símbolo"
@@ -21730,6 +23421,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21749,6 +23443,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Habilite isso para usar a etiqueta\"\"add:street\" nos nós."
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Adicionar \"source=...\" para elementos?"
@@ -21831,48 +23528,6 @@ msgstr ""
"Esta imagem contém dados georeferenciados.\n"
"Você quer usá-los?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr "Recortar imagem"
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr "Georreferenciamento da imagem"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr "Leste"
-
-msgid "I use the mouse"
-msgstr "Eu uso o mouse"
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21925,19 +23580,75 @@ msgstr "Adicionar nova camada"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr ""
msgid "Get a new cookie (session timeout)"
msgstr "Obtenha um novo cookie (a sessão expirou)"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr "Arquivos PNG (*.png)"
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr "Recortar imagem"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr "Georreferenciamento da imagem"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr "Leste"
+
+msgid "I use the mouse"
+msgstr "Eu uso o mouse"
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21965,7 +23676,10 @@ msgstr "Camada WMS ({0}), {1} imagem(ns) carregadas"
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -22015,7 +23729,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -22060,6 +23774,9 @@ msgstr "Baixar Junto"
msgid "Please select 1 or more ways to download along"
msgstr "Por favor, selecione 1 ou mais vias para baixar junto"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr "{0} nós intermediários para baixar."
@@ -22135,6 +23852,71 @@ msgstr "Nova ferramenta..."
msgid "Install"
msgstr "Instalar"
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Somente posição"
@@ -22174,27 +23956,9 @@ msgstr "Desabilitar registo de dados se a distância for baixa"
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "refresh the port list"
-msgstr "atualizar a lista de portas"
-
-msgid "Configure"
-msgstr "Configurar"
-
msgid "Configure Device"
msgstr "Configurar o Aparelho"
-msgid "Connection Error."
-msgstr "Erro de conexão."
-
-msgid "configure the connected DG100"
-msgstr "configurar o DG100 conectado"
-
-msgid "delete data after import"
-msgstr "apagar dados depois de importar"
-
msgid "Importing data from device."
msgstr "Importando dados do dispositivo."
@@ -22593,6 +24357,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22781,19 +24548,19 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Ajustar imagens"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajusta a posição da camada de imagem selecionada"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Por favor selecione a camada de imagem a ajustar"
+msgstr ""
msgid "Start adjusting"
msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "Atualmente não há nenhuma camada de imagem para ajustar."
+msgstr ""
msgid "No layers to adjust"
msgstr ""
@@ -22840,12 +24607,6 @@ msgstr "Imagens importadas"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Arquivo de imagens (*.jpg *.jpeg *.png *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr "Carregar grupo de imagens como nova camada."
-
msgid "Import vector graphics"
msgstr ""
@@ -22855,16 +24616,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -23227,9 +24985,6 @@ msgstr "Centralizar automaticamente"
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -23284,9 +25039,33 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Um papel baseado na composição da relação foi copiado para todos os "
+"caminhos novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Uma composição de relação foi copiada para todos os caminhos "
+"novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Digite a chave da tag, ex.: <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Digite o valor da tag, ex.: <strong><tt>verifique os "
+"membros</tt></strong></html>"
+
msgid "Michigan Left"
msgstr ""
@@ -23328,25 +25107,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -23483,9 +25262,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -23510,12 +25286,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23664,6 +25449,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23680,6 +25468,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23904,6 +25703,8 @@ msgstr ""
msgid "Unknown Host: %s - Possibly there is no connection to the Internet."
msgstr ""
+"Servidor desconhecido: %s - Possivelmente não há nenhuma conexão com a "
+"Internet."
msgid ""
"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
@@ -23913,13 +25714,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Um erro ocorreu: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23972,18 +25766,6 @@ msgstr ""
msgid "Close: "
msgstr "Fechado: "
-msgid "New issue"
-msgstr "Nova issue"
-
-msgid "Create issue"
-msgstr "Criar issue"
-
-msgid "Describe the problem precisely"
-msgstr "Descreva o problema precisamente"
-
-msgid "Create: "
-msgstr "Criar: "
-
msgid "Open in browser"
msgstr ""
@@ -24044,6 +25826,9 @@ msgstr "Executável do Firefox"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24251,9 +26036,6 @@ msgstr "Importar arquivo PDF·"
msgid "Import PDF"
msgstr "Importar PDF"
-msgid "Import PDf file"
-msgstr "Importar arquivo PDF"
-
msgid " {0} objects so far"
msgstr " {0} objetos muito longe"
@@ -24334,8 +26116,26 @@ msgstr "Teste falhou: Não é possível ler mtime."
msgid "Test failed: Could not write mtime."
msgstr "Teste falhou: Não é possível gravar mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -24488,6 +26288,9 @@ msgstr "Nada na área de transferência"
msgid "The clipboard data is not an image"
msgstr "Os dados da área de transferência não é são de imagem"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Aviso: falha ao manipular arquivo zip ''{0}''. A exceção foi: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -24509,6 +26312,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24802,9 +26608,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Trilhas"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24873,9 +26676,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -25002,9 +26802,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "Reiniciar JOSM"
-
msgid "Revert changeset fully"
msgstr "Reverter todo o Conjunto de Mudanças"
@@ -25026,6 +26823,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr "Faltando alvo de mesclagem para {0} com id {1}"
@@ -25058,15 +26858,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr "Plug-in de aviso de estrada"
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Alterar propriedades"
+
msgid "Country preset:"
msgstr ""
@@ -25076,6 +26892,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -25178,9 +26997,6 @@ msgstr "Preferências do plugin de rota"
msgid "Configure routing preferences."
msgstr "Configurar preferências de rota."
-msgid "Highway type"
-msgstr "Tipo de estrada"
-
msgid "Speed (Km/h)"
msgstr "Velocidade (km/h)"
@@ -25296,6 +27112,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Não foi possível criar cópia de segurança. A exceção foi: {0}"
+
msgid "Simplify Area"
msgstr "Área simplificada"
@@ -25356,19 +27175,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
-msgstr "Ajuda Online"
+msgid "SeaMap Editor"
+msgstr "Editor SeaMap"
-msgid "Load"
-msgstr "Carregar"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "invisível"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "Editor SeaMap"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -25507,6 +27326,9 @@ msgstr ""
msgid "Street name: "
msgstr "Nome da rua: "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Par/Ímpar"
@@ -25584,6 +27406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -25599,9 +27510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25623,6 +27531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25775,9 +27686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26428,19 +28336,19 @@ msgstr "Retornar objetos apagados..."
msgid "Undelete object by id"
msgstr "Retornar objetos apagados por id"
-msgid "Select if the data should be added into a new layer"
-msgstr "Indique se os dados devem ser adicionados em uma nova camada"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
+msgstr ""
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
-msgstr ""
+msgid "Select if the data should be added into a new layer"
+msgstr "Indique se os dados devem ser adicionados em uma nova camada"
msgid "Start undeleting"
msgstr ""
@@ -26448,18 +28356,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr "Fechar diálogo e cancelar"
-msgid "Will get {0}"
-msgstr "Irá obter {0}"
-
-msgid "Looking for {0}"
-msgstr "Procurando por {0}"
-
-msgid "Found {0}"
-msgstr "Encontrado {0}"
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr "Adicionar nós nas interseções"
@@ -26503,15 +28399,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Dividir objeto"
@@ -26633,18 +28520,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26822,9 +28697,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "Vídeo"
-
msgid "Import Video"
msgstr "Importar vídeo"
@@ -26951,8 +28823,8 @@ msgstr "loop"
msgid "mute"
msgstr "mudo"
-msgid "Scanned Map..."
-msgstr "Mapa escaneado..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26974,9 +28846,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Camada Walking Papers ({0}) no zoom {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Baixar via"
@@ -27077,10 +28946,10 @@ msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr ""
msgid "coordinates"
-msgstr ""
+msgstr "coordenadas"
msgid "Category"
-msgstr ""
+msgstr "Categoria"
msgid "Fetches a list of all Wikipedia articles of a category"
msgstr ""
@@ -27095,7 +28964,7 @@ msgid "Pastes Wikipedia articles from the system clipboard"
msgstr ""
msgid "clipboard"
-msgstr ""
+msgstr "área de transferência"
msgid "Open Article"
msgstr ""
@@ -27109,9 +28978,6 @@ msgstr "Define o idioma padrão para os artigos da Wikipedia"
msgid "Enter the Wikipedia language"
msgstr "Informe o idioma da Wikipédia"
-msgid "Add Tag"
-msgstr "Adicionar Etiqueta"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index 44720d1..bf258f3 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:55+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:56+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 2afcd88..4ff89b5 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-10-03 22:38+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:55+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:56+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -54,6 +54,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -158,16 +173,13 @@ msgid "About JOSM..."
msgstr "Despre JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"AVERTISMENT: format neasteptat de URL-ul de bază API. Redirectare la pagina "
-"de informatii sau istoric pentru obiectul OSM probabil va esua URL-ul API de "
-"bază este: \"{0}\""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -212,6 +224,9 @@ msgstr "Niciun strat țintă"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -251,9 +266,6 @@ msgstr "Unealtă: {0}"
msgid "Please select at least four nodes."
msgstr "Vă rog selectaţi cel puţin patru noduri."
-msgid "Information"
-msgstr "Informații"
-
msgid "Align Nodes in Line"
msgstr "Aliniază Nodurile în Linie"
@@ -278,6 +290,9 @@ msgstr "conflict"
msgid "download"
msgstr "descărcare"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "precedent"
@@ -287,6 +302,9 @@ msgstr "următorul"
msgid "Nothing selected to zoom to."
msgstr "Nimic selectat pentru a transfoca"
+msgid "Information"
+msgstr "Informații"
+
msgid "Zoom to {0}"
msgstr "Apropie la {0}"
@@ -343,7 +361,7 @@ msgstr ""
"din ele?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -402,6 +420,12 @@ msgstr "Șterge"
msgid "Delete selected objects."
msgstr "Șterge obiectele selectate."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Distribuie noduri"
@@ -409,12 +433,23 @@ msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
"Distributi nodurile selectate pentru distante egale de-a lungul unei linii."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Descarc datele OSM..."
msgid "Download map data from the OSM server."
msgstr "Descarcă hărţi de la serverul OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr "Descarcă obiect..."
@@ -509,6 +544,9 @@ msgstr "Istoric"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -622,7 +660,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -772,8 +810,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -932,8 +970,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -960,12 +998,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -983,9 +1017,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1092,6 +1123,15 @@ msgstr "Şi redenumeşte şi fişierul"
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1142,9 +1182,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1206,6 +1243,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1280,13 +1320,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1375,6 +1415,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Anulează"
@@ -1399,9 +1460,6 @@ msgstr "Actualizează datele"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1597,6 +1655,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Descarc date GPS"
@@ -1606,6 +1667,18 @@ msgstr "Descarcă date GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Descarc date"
@@ -1625,6 +1698,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1675,25 +1773,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1836,6 +1915,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1860,8 +1942,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1877,6 +1959,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2283,6 +2368,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2443,13 +2531,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2458,6 +2546,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2476,8 +2567,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2563,6 +2653,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2599,10 +2692,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2626,8 +2719,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2732,6 +2825,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2792,8 +2888,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2823,10 +2919,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2847,6 +2943,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2877,18 +2976,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2897,8 +2996,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2906,13 +3005,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2926,8 +3023,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2957,11 +3054,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "NECUNOSCUT"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3116,8 +3212,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3224,7 +3319,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3243,6 +3338,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3259,9 +3357,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3300,6 +3395,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3324,6 +3422,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3383,13 +3490,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3459,6 +3566,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3528,6 +3653,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3585,13 +3716,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3623,10 +3754,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3760,7 +3891,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3835,6 +3966,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3865,9 +3999,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3892,10 +4023,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3958,23 +4089,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4078,7 +4192,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4274,9 +4388,24 @@ msgstr "Vizualizare"
msgid "Tools"
msgstr "Unelte"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Selecţie"
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4292,10 +4421,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4304,6 +4445,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4363,6 +4507,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "stratul nu este în listă."
@@ -4390,19 +4537,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4690,29 +4824,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4727,7 +4879,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4779,14 +4931,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5036,14 +5180,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5568,6 +5712,9 @@ msgstr "Arată/Ascunde"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5651,6 +5798,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Tip obiect:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "Alegeţi tipul de obiect OSM"
+
+msgid "Object ID:"
+msgstr "ID-ul obiectului:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Introduceți ID-ul obiectului care ar trebui să fie descărcat"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5672,9 +5846,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr "Selecţie"
-
msgid "Open a selection list window."
msgstr "Deschide o fereastra cu o listă de selecţie."
@@ -5699,32 +5870,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5744,8 +5915,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5771,9 +5941,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5918,9 +6085,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6205,8 +6369,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6271,34 +6435,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr "<diferit>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Şterge cheia selectată din toate obiectele"
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6313,13 +6489,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "Editează valoarea cheii selectata pentru toate obiectele"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6398,12 +6574,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6433,9 +6603,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6473,7 +6649,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6533,6 +6709,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6788,6 +6967,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Semne de carte"
@@ -6853,9 +7051,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6922,21 +7117,8 @@ msgstr ""
msgid "Download object"
msgstr "Descărcaţi obiect"
-msgid "Object type:"
-msgstr "Tip obiect:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "Alegeţi tipul de obiect OSM"
-
-msgid "Object ID:"
-msgstr "ID-ul obiectului:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Introduceți ID-ul obiectului care ar trebui să fie descărcat"
+msgid "Start downloading"
+msgstr "Începe descărcarea"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6946,23 +7128,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Începe descărcarea"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7059,7 +7227,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7158,6 +7326,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7245,7 +7416,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7264,6 +7435,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7330,8 +7507,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7406,8 +7582,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7421,8 +7597,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7637,12 +7812,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7651,6 +7820,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7666,6 +7851,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7673,11 +7873,9 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Atenție: obiectul „{0}” este deja șters de pe server. Se omite acest obiect "
-"și se reîncearcă o reîncărcare."
msgid "Preparing objects to upload ..."
msgstr ""
@@ -7788,9 +7986,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7800,6 +7995,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7816,7 +8014,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7962,7 +8160,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7992,7 +8190,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8108,6 +8306,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8145,6 +8346,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8341,9 +8545,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8362,6 +8563,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Imagini geoetichetate"
@@ -8419,6 +8623,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8485,9 +8695,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8500,7 +8707,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8527,12 +8737,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8661,14 +8875,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8683,7 +8893,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8693,8 +8903,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8914,7 +9123,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8980,6 +9189,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9037,9 +9252,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9286,6 +9498,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9414,6 +9629,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9456,6 +9677,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9506,19 +9730,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9536,40 +9751,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9593,6 +9817,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9651,6 +9908,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9704,6 +9964,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9987,7 +10252,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10156,6 +10427,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10219,7 +10496,7 @@ msgstr "Opţiuni hartă"
msgid "Settings for the map projection and data interpretation."
msgstr "Opţiuni pentru proiecţia hărţii şi interpretarea datelor."
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10477,40 +10754,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10563,8 +10840,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10573,20 +10850,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10668,14 +10950,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10719,31 +10995,37 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Schimb {0} obiect"
+msgstr[1] "Schimb {0} obiecte"
+msgstr[2] "Schimb {0} de obiecte"
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10752,6 +11034,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10767,60 +11052,61 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Use preset ''{0}''"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "{0}:"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Error parsing {0}: "
-msgstr "Eroare la prelucrarea {0}: "
-
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Schimb {0} obiect"
-msgstr[1] "Schimb {0} obiecte"
-msgstr[2] "Schimb {0} de obiecte"
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
-msgstr "Modificare proprietăţi"
-
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "Eroare la prelucrarea {0}: "
+
msgid "Search preset"
msgstr ""
@@ -10836,6 +11122,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10865,6 +11159,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10895,7 +11232,7 @@ msgid "Contacting OSM Server..."
msgstr "Se contactează Serverul OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10935,28 +11272,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11051,6 +11386,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11066,12 +11404,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11150,7 +11496,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11249,35 +11595,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11287,8 +11609,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11315,10 +11637,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11329,9 +11648,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11353,6 +11669,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11402,8 +11721,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11546,6 +11865,9 @@ msgstr "Salvează nume utilizator şi parolă (necriptate)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11564,6 +11886,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11588,16 +11919,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11609,6 +11943,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11623,6 +11965,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11653,19 +12004,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11687,11 +12038,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11761,13 +12124,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11910,10 +12273,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11928,22 +12291,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12012,8 +12374,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12028,9 +12389,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12352,17 +12728,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12373,9 +12743,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12407,9 +12820,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12732,6 +13159,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12811,6 +13243,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12912,9 +13348,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12970,6 +13403,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12994,9 +13430,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13022,9 +13455,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13061,6 +13491,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13107,9 +13542,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13194,6 +13626,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13284,6 +13719,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13302,10 +13781,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13317,6 +13796,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13344,18 +13826,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13365,9 +13841,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13377,13 +13850,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13431,6 +13904,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13515,6 +13991,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13619,21 +14098,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13649,10 +14137,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13688,7 +14176,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13757,12 +14245,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13778,15 +14272,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13808,6 +14293,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13817,6 +14311,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13826,10 +14323,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13862,9 +14356,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13898,19 +14389,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13922,6 +14437,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13943,43 +14461,87 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14012,12 +14574,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14075,6 +14652,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14084,6 +14664,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14123,9 +14709,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14159,6 +14742,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14240,18 +14838,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14324,7 +14927,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14348,10 +14954,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14363,9 +14972,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14408,18 +15014,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14519,11 +15163,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14535,11 +15177,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14558,10 +15198,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14591,9 +15231,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14609,19 +15246,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14771,6 +15424,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14792,6 +15448,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14819,6 +15481,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14843,22 +15511,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14880,9 +15532,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14946,7 +15595,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15077,6 +15726,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15107,6 +15759,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15119,9 +15774,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15131,9 +15783,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15146,6 +15803,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15170,14 +15830,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15226,7 +15878,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15280,41 +15932,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15500,6 +16152,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15521,9 +16179,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15536,6 +16200,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15575,6 +16242,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15596,22 +16266,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15635,9 +16317,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15662,7 +16341,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15735,52 +16423,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15795,6 +16477,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15807,6 +16495,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15822,37 +16513,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15942,6 +16736,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15951,6 +16751,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -16017,12 +16823,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16032,6 +16892,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16041,31 +16925,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16093,7 +16983,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16120,27 +17010,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16175,12 +17053,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16190,10 +17071,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16221,6 +17102,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16258,117 +17142,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16402,33 +17322,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16462,6 +17392,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16474,7 +17420,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16537,36 +17508,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16609,19 +17598,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16760,6 +17745,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16772,60 +17769,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16841,9 +17912,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17053,41 +18121,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17096,7 +18190,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17108,12 +18202,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17165,88 +18349,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17258,6 +18545,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17273,6 +18575,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17291,11 +18596,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17404,10 +18707,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17419,7 +18722,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17440,13 +18743,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17518,7 +18827,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17539,13 +18848,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17554,7 +18863,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17582,6 +18890,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17618,40 +18932,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17663,19 +18998,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17696,6 +19031,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17705,7 +19046,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17786,6 +19127,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17915,6 +19259,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17954,24 +19304,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17981,15 +19340,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18065,6 +19415,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18119,7 +19475,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18131,6 +19487,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18206,46 +19565,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18266,6 +19628,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18428,27 +19802,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18494,19 +19897,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18530,7 +19936,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18626,18 +20032,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18647,7 +20062,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18656,10 +20074,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18677,6 +20095,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18692,28 +20113,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18734,19 +20155,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18812,9 +20233,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18824,10 +20242,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18842,9 +20263,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18872,6 +20290,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18917,10 +20338,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18932,7 +20383,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18950,7 +20401,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19067,19 +20518,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19098,13 +20660,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19113,19 +20711,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19140,142 +20747,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19314,148 +20970,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19659,6 +21378,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19680,13 +21411,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19949,9 +21674,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19973,6 +21704,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20051,9 +21785,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20138,7 +21884,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20409,15 +22155,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20588,6 +22325,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20606,12 +22346,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20747,6 +22481,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20764,6 +22501,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20844,113 +22584,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20976,7 +22730,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21026,7 +22783,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21071,6 +22828,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21128,19 +22888,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21182,27 +23007,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21598,6 +23405,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21845,12 +23655,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21860,16 +23664,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22232,9 +24033,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22289,9 +24087,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22333,25 +24148,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22488,9 +24303,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22515,12 +24327,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22669,6 +24490,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22685,6 +24509,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22918,13 +24753,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22977,18 +24805,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23046,6 +24862,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23253,9 +25072,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23335,7 +25151,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23489,6 +25323,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23510,6 +25347,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23803,9 +25643,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23874,9 +25711,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24003,9 +25837,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24027,6 +25858,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24059,15 +25893,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Modificare proprietăţi"
+
msgid "Country preset:"
msgstr ""
@@ -24077,6 +25927,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24179,9 +26032,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24297,6 +26147,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24357,19 +26210,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24507,6 +26360,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24582,6 +26438,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24597,9 +26542,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24621,6 +26563,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24773,9 +26718,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25401,7 +27343,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25409,10 +27354,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25421,18 +27363,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25475,15 +27405,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25605,18 +27526,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25794,9 +27703,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25923,7 +27829,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25943,9 +27849,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26078,9 +27981,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index 3e1e187..7946783 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -2,17 +2,17 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 13:04+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-19 17:04+0000\n"
+"Last-Translator: Aleksey Kabanov <Unknown>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\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%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: 2013-04-05 04:56+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-20 04:34+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ru_RU\n"
msgid "Use Basic Authentication"
@@ -63,6 +63,21 @@ msgstr "Условия использования подложки"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Переход по ссылке не поддерживается на данной платформе (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ОШИБКА: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: {0}"
+
+msgid "INFO: {0}"
+msgstr "ИНФОРМАЦИЯ: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "ОТЛАДКА: {0}"
+
+msgid "Cause: "
+msgstr "Причина: "
+
msgid "Executing platform startup hook"
msgstr "Исполнение стартовых процедур"
@@ -168,20 +183,19 @@ msgid "About JOSM..."
msgstr "О программе JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: неподдерживаемый формат базового URL для API. Показ страниц "
-"информации или истории OSM-объектов, возможно, работать не будет. Базовый "
-"URL для API: ''{0}''"
+"Непредвиденный формат базового URL API. Перенаправление на страницу "
+"информации или истории для объекта OSM, вероятно, завершится ошибкой. "
+"Базовый URL API: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: неожиданный формат базового URL для API. Показ персональной "
-"страницы OSM-пользователя, возможно, работать не будет. Базовый URL для API: "
-"''{0}''"
+"Непредвиденный формат базового URL API. Перенаправление на страницу "
+"пользователя OSM, вероятно, завершится ошибкой. Базовый URL API: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -229,6 +243,9 @@ msgstr "Не выбран слой"
msgid "Add imagery layer {0}"
msgstr "Добавить слой снимка {0}"
+msgid "Select image format for WMS layer"
+msgstr "Выберите формат изображения для WMS слоя"
+
msgid "Select WMS layers"
msgstr "Выбрать WMS слои"
@@ -269,9 +286,6 @@ msgstr "Инструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Выделите не менее четырёх точек."
-msgid "Information"
-msgstr "Информация"
-
msgid "Align Nodes in Line"
msgstr "Выстроить точки в линию"
@@ -297,6 +311,9 @@ msgstr "конфликта"
msgid "download"
msgstr "скачанного"
+msgid "problem"
+msgstr "проблемы"
+
msgid "previous"
msgstr "предыдущего"
@@ -306,6 +323,9 @@ msgstr "следующего"
msgid "Nothing selected to zoom to."
msgstr "Ничего не выделено для масштабирования."
+msgid "Information"
+msgstr "Информация"
+
msgid "Zoom to {0}"
msgstr "Масштабировать до {0}"
@@ -362,11 +382,10 @@ msgstr ""
"некоторых из них?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Не удаётся объединить линии: они не могут быть представлены одной "
-"последовательностью точек."
+"Невозможно объединить линии<br>(Их нельзя соединить в один ряд точек)"
msgid "Combine {0} ways"
msgstr "Объединить {0} линии"
@@ -422,18 +441,37 @@ msgstr "Удалить"
msgid "Delete selected objects."
msgstr "Удалить выделенные объекты."
+msgid "Toggle dialogs panel"
+msgstr "Показать/скрыть панели"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Скрыть диалоговые панели и панели инструментов"
+
msgid "Distribute Nodes"
msgstr "Распределить точки"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Расположить выделенные точки на равных расстояниях вдоль линии."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Пропущено {0} точек с нулевыми координатами"
+
msgid "Download from OSM..."
msgstr "Скачать с OSM..."
msgid "Download map data from the OSM server."
msgstr "Скачать картографические данные с сервера OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
+"Продолжить?</html>"
+
+msgid "Download data"
+msgstr "Скачать данные"
+
msgid "Download object..."
msgstr "Скачать объект..."
@@ -534,6 +572,9 @@ msgstr "Журнал"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Показать историю линий, точек или отношений OSM."
+msgid "Show history"
+msgstr "Показать историю"
+
msgid "History (web)"
msgstr "История (на сайте OSM)"
@@ -656,11 +697,11 @@ msgid "Joined overlapping areas"
msgstr "Объединить наложенные полигоны"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Некоторые из этих линий являются частью отношений, которые были изменены. "
-"Пожалуйста, проверьте, не появились ли ошибки."
+"Некоторые из линий являлись частью отношений, которые были "
+"изменены.<br>Пожалуйста, проверьте, не возникли ли ошибки."
msgid "Fix tag conflicts"
msgstr "Уладить конфликты тегов"
@@ -831,11 +872,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Объединить точки в одну (более старую)"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Пожалуйста, выберите как минимум 2 точки или точку, близко расположенную к "
-"другой."
+"Выберите по меньшей мере две точки для объединения или одну точку, "
+"расположенную рядом с другой точкой."
msgid "Abort Merging"
msgstr "Прервать объединение"
@@ -1012,11 +1053,11 @@ msgid "Download Data"
msgstr "Скачать данные"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Невозможно открыть URL ''{0}'' так как недоступна подходящая задача "
-"скачивания.</html>"
+"Не удалось открыть URL ''{0}''<br>Следующие задания загрузки принимают "
+"показанные шаблоны URL:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1048,16 +1089,11 @@ msgid "Orthogonalize / Undo"
msgstr "Ортогонализировать/Отменить"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Ортогонализировать форму / Отменить\n"
-"Пожалуйста, выделите точки, которые были передвинуты предыдущим действием "
-"Ортогонализирования формы!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Отменить ортогонализирование формы"
+"Сделать углы прямыми / Отменить<br>Выберите точки, перемещённые предыдущим "
+"действием «Сделать углы прямыми»!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1078,9 +1114,6 @@ msgstr "Сделать углы прямыми"
msgid "Usage"
msgstr "Использование"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Выделенные элементы невозможно ортогонализировать"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1200,6 +1233,15 @@ msgstr "файл тоже переименовать"
msgid "Could not rename file ''{0}''"
msgstr "Невозможно переименовать файл ''{0}''"
+msgid "Restart"
+msgstr "Перезапустить"
+
+msgid "Restart the application."
+msgstr "Перезапустить приложение."
+
+msgid "Click to restart later."
+msgstr "Щёлкните, чтобы перезапустить позже."
+
msgid "Reverse way"
msgstr "Развернуть линию"
@@ -1252,9 +1294,6 @@ msgstr "Загрузить сеанс"
msgid "Load a session from file."
msgstr "Загрузить сеанс из файла."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Файл сеанса (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Открыть сеанс"
@@ -1320,6 +1359,9 @@ msgstr "Отчёт о состоянии"
msgid "Copy to clipboard and close"
msgstr "Скопировать в буфер и закрыть"
+msgid "Report bug"
+msgstr "Сообщить об ошибке"
+
msgid "Close"
msgstr "Закрыть"
@@ -1406,19 +1448,18 @@ msgstr ""
"линии)."
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Роль, основанная на участии в отношениях, была скопирована во все "
-"новые линии.<br>Результат необходимо проверить и исправить, если "
-"потребуется.</html>"
+"Участие в отношении, основанном на ролях, скопировано во все новые "
+"линии.<br>Проверьте его и, при необходимости, исправьте."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Участник отношения был скопирован во все новые линии.<br>Результат "
-"необходимо проверить и исправить, если потребуется.</html>"
+"Участие в отношении скопировано во все новые линии.<br>Проверьте его и, при "
+"необходимости, исправьте."
msgid "Split way {0} into {1} parts"
msgstr "Разделить линию {0} на {1} части"
@@ -1520,6 +1561,29 @@ msgstr ""
"поскольку вы видите не весь объект.<br>Вы действительно хотите разъединить "
"их?"
+msgid "Disconnect Node from Way"
+msgstr "Отсоединить точку от линии"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Отсоединить точки от линии, к которой они принадлежат"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Выберите хотя бы одну точку для отсоединения"
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Выделенную точку нельзя от чего-либо отсоединить."
+msgstr[1] "Выделенные точки нельзя от чего-либо отсоединить."
+msgstr[2] "Выделенные точки нельзя от чего-либо отсоединить."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] "Затронутая линия исчезнет после отсоединения выделенной точки."
+msgstr[1] "Затронутая линия исчезнет после отсоединения выделенных точек."
+msgstr[2] "Затронутая линия исчезнет после отсоединения выделенных точек."
+
msgid "Undo"
msgstr "Отмена"
@@ -1544,9 +1608,6 @@ msgstr "Обновить данные"
msgid "Updates the objects in the active data layer from the server."
msgstr "Обновляет объекты в активном слое данных, скачивая их с сервера."
-msgid "Download data"
-msgstr "Скачать данные"
-
msgid "Update modified"
msgstr "Обновить изменённое"
@@ -1752,6 +1813,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Играть медленнее."
+msgid "Download GPS"
+msgstr "Скачать GPS данные"
+
msgid "Downloading GPS data"
msgstr "Скачивание данных GPS"
@@ -1761,6 +1825,18 @@ msgstr "Скачанные GPX данные"
msgid "Markers from {0}"
msgstr "Маркеры из {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Скачать сжатые OSM изменения"
+
+msgid "Download OSM Change"
+msgstr "Скачать изменения данных OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Скачать сжатые OSM данные"
+
+msgid "Download OSM"
+msgstr "Скачать OSM"
+
msgid "Downloading data"
msgstr "Скачивание данных"
@@ -1780,6 +1856,33 @@ msgstr "Команда"
msgid "Request details: {0}"
msgstr "Параметры запроса: {0}"
+msgid "Download OSM URL"
+msgstr "Скачать данные OSM (URL)"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Произошёл {0} конфликт во время импорта."
+msgstr[1] "Произошло {0} конфликта во время импорта."
+msgstr[2] "Произошло {0} конфликтов во время импорта."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Конфликт во время скачивания с сервера"
+msgstr[1] "Конфликта во время скачивания с сервера"
+msgstr[2] "Конфликтов во время скачивания с сервера"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Загрузка родителей точки {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Загрузка родителей линии {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Загрузка родителей отношения {2}"
+
+msgid "Download session"
+msgstr "Загрузить сеанс"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Скачивание {0} из {1} ({2} осталось)"
@@ -1846,27 +1949,6 @@ msgstr "Во время массового скачивания произошл
msgid "Errors during download"
msgstr "Ошибки при скачивании с сервера"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Произошёл {0} конфликт во время импорта."
-msgstr[1] "Произошло {0} конфликта во время импорта."
-msgstr[2] "Произошло {0} конфликтов во время импорта."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Конфликт во время скачивания с сервера"
-msgstr[1] "Конфликта во время скачивания с сервера"
-msgstr[2] "Конфликтов во время скачивания с сервера"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Загрузка родителей точки {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Загрузка родителей линии {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Загрузка родителей отношения {2}"
-
msgid "Error during download"
msgstr "Ошибка во время скачивания с сервера"
@@ -2019,6 +2101,9 @@ msgstr "Улучшение точности линии"
msgid "Improve Way Accuracy mode"
msgstr "Режим улучшения точности линии"
+msgid "improve way accuracy helper line"
+msgstr "вспомогательная линия режима улучшения точности линий"
+
msgid "Click on the way to start improving its shape."
msgstr "Нажмите на линию, чтобы начать улучшать её форму."
@@ -2049,8 +2134,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Не удается поместить точку за пределами мира"
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] "Добавить новую точку к линии"
msgstr[1] "Добавить новую точку к {0} линиям"
msgstr[2] "Добавить новую точку к {0} линиям"
@@ -2067,6 +2152,9 @@ msgstr "Параллельно"
msgid "Make parallel copies of ways"
msgstr "Создавать параллельные копии линий"
+msgid "make parallel helper line"
+msgstr "вспомогательная линия создания параллельных линий"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2215,10 +2303,10 @@ msgid "Select the members of all selected relations"
msgstr "Выделите участников всех выбранных отношений"
msgid "Select members (add)"
-msgstr "Выбрать участников (добавить)"
+msgstr "Выделить участников (добавить)"
msgid "Select members"
-msgstr "Выбрать участников"
+msgstr "Выделить участников"
msgid "Add the selected relations to the current selection"
msgstr "Добавить выбранные отношения к текущему выбору"
@@ -2525,6 +2613,11 @@ msgstr "есть значение ''value'' у любого тега"
msgid "matches if ''key'' exists"
msgstr "тег ''key'' существует"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+"соответствует, если ''key'' больше, чем ''value'' (аналогично для знака "
+"\"<\")"
+
msgid "combinators"
msgstr "комбинаторы"
@@ -2695,14 +2788,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Ожидается <i>min</i>/<i>max</i> после ''штампа времени''"
-msgid "Primitive id expected"
-msgstr "Ожидался id элемента"
+msgid "Range of primitive ids expected"
+msgstr "Ожидается диапазон ID объектов"
-msgid "Changeset id expected"
-msgstr "Ожидался ID пакета правок"
+msgid "Range of changeset ids expected"
+msgstr "Ожидается диапазон ID пакетов правок"
-msgid "Version expected"
-msgstr "Ожидаемая версия"
+msgid "Range of versions expected"
+msgstr "Ожидается диапазон версий"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2714,6 +2807,9 @@ msgstr ""
"Неизвестный тип элемента: {0}. Разрешенные значения: точка, линия или "
"отношение"
+msgid "Primitive id expected"
+msgstr "Ожидался id элемента"
+
msgid "Range of numbers expected"
msgstr "Ожидалась последовательность чисел"
@@ -2732,11 +2828,9 @@ msgstr "Отсутствуют параметры для XOR"
msgid "Missing operator for NOT"
msgstr "Пропущен оператор для NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
-"Предупреждение: автоматическое усечение значение тега ''{0}'' на удалённом "
-"объекте {1}"
+"Автоматически отбрасывать значение тега ''{0}'' на удалённом объекте {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2833,6 +2927,9 @@ msgstr[0] "Добавлен {0} объект"
msgstr[1] "Добавлено {0} объекта"
msgstr[2] "Добавлено {0} объектов"
+msgid "New way {0} has 0 nodes"
+msgstr "Новая линия {0} содержит 0 точек"
+
msgid "Change node {0}"
msgstr "Изменить точку {0}"
@@ -2869,11 +2966,11 @@ msgstr "Удалить \"{0}\" для {1} объектов"
msgid "Set {0}={1} for {2} objects"
msgstr "Установить {0}={1} для {2} объектов"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Удалено {0} свойств для {1} объектов"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "Удалено {0} тегов для {1} объектов"
-msgid "Set {0} properties for {1} objects"
-msgstr "Установлено {0} свойств для {1} объектов"
+msgid "Set {0} tags for {1} objects"
+msgstr "Установить {0} тегов для {1} объектов"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Заменить \"{0}\" на \"{1}\" для"
@@ -2898,11 +2995,11 @@ msgid "Double conflict"
msgstr "Двойной конфликт"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Предупреждение: Слой ''{0}'' больше не существует. Невозможно удалить "
-"конфликт для объекта ''{1}''."
+"Слой ''{0}'' больше не существует. Невозможно удалить конфликт для объекта "
+"''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Добавить конфликт для элемента ''{0}''"
@@ -3029,6 +3126,9 @@ msgstr[2] "Очищено {0} объектов"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Уладить конфликты в списке участников отношения {0}"
+msgid "Removed nodes from {0}"
+msgstr "Удалены точки из {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Повернуть {0} точку"
@@ -3102,11 +3202,11 @@ msgid "Reverse directional way."
msgstr "Развернуть направленную линию"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"При изменении направления линии, предлагается исправить следующие параметры "
-"для поддержания целостности данных"
+"При смене направления линии предлагаются следующие изменения для обеспечения "
+"согласованности данных."
msgid "Relation"
msgstr "Отношение"
@@ -3135,11 +3235,11 @@ msgstr "Применить выбранные изменения"
msgid "Do not apply changes"
msgstr "Не применять изменения"
-msgid "Please select which property changes you want to apply."
-msgstr "Пожалуйста, выберите, какие параметры нужно изменить."
+msgid "Please select which changes you want to apply."
+msgstr "Выберите изменения, которые вы хотите применить."
-msgid "Properties of "
-msgstr "Параметры "
+msgid "Tags of "
+msgstr "Теги "
msgid "Roles in relations referring to"
msgstr "Роли в отношениях, относящихся к"
@@ -3160,6 +3260,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Невозможно удалить старый бэкап файл {0}"
+msgid "Your work has been saved automatically."
+msgstr "Результаты вашей работы были сохранены автоматически."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Ошибка! Во время создания резервной копии был удалён слой: {0}"
@@ -3193,21 +3296,21 @@ msgstr ""
"значение по умолчанию в данный момент неизвестно.<br/> Пожалуйста, "
"активируйте соответствующую функцию вручную и повторите импорт."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Предупреждение: Не удалось создать каталог для временных данных: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Не удалось создать отсутствующий каталог кэша: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Невозможно создать каталог для временных данных: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Предупреждение: Не удается сохранить настройки в ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Не удалось сохранить настройки в ''{0}''"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Предупреждение: Ошибка инициализации настроек. Каталог настроек ''{0}'' не "
-"является каталогом."
+"Не удалось инициализировать настройки. Каталог настроек ''{0}'' не является "
+"каталогом."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3217,11 +3320,11 @@ msgstr ""
"каталогом.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Предупреждение: Ошибка инициализации настроек. Не удается создать "
-"отсутствующий каталог настроек: {0}"
+"Не удалось инициализировать настройки. Не удалось создать отсутствующий "
+"каталог настроек: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3230,18 +3333,14 @@ msgstr ""
"<html>Ошибка инициализации настроек.<br>Не удается создать отсутствующий "
"каталог настроек: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Информация: отсутствует файл настроек ''{0}''. Создаётся файл настроек по "
-"умолчанию."
+"Отсутствует файл настроек ''{0}''. Создание файла настроек по умолчанию."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Предупреждение: Существующий файл настроек ''{0}'' будет заменен на файл "
-"настроек по умолчанию."
+"Замена существующего файла настроек ''{0}'' файлом настроек по умолчанию."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3258,10 +3357,10 @@ msgstr ""
"резервный<br>{0}<br> а новый будет создан с настройками по умолчанию.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Предупреждение: Ошибка инициализации настроек. Не удалось сбросить на файл "
+"Не удалось инициализировать настройки. Не удалось выполнить сброс к файлу "
"настроек по умолчанию: {0}"
msgid "Paint style {0}: {1}"
@@ -3291,13 +3390,12 @@ msgstr "Сбой загрузки ресурса ''{0}'', ошибка {1}."
msgid "UNKNOWN"
msgstr "НЕИЗВЕСТНО"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-"Предупреждение: неверный номер версии JOSM в файле редакции, значение \"{0}\""
+"Непредвиденный номер версии JOSM в файле ревизий, значение равно ''{0}''"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Предупреждение: файл изменений ''/REVISION'' отсутствует."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Файл ревизий ''/REVISION'' отсутствует."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Конфликт уже зарегистрирован для элемента ''{0}''"
@@ -3465,9 +3563,9 @@ msgstr "Невозможно сравнить элемент с ID ''{0}'' и
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
-msgstr "Ошибка: Не удалось загрузить рендер ''{0}''. Класс не найден."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
+msgstr ""
+"Не удалось загрузить класс отрисовщика карты ''{0}''. Класс не найден."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3577,8 +3675,8 @@ msgstr "Файл сдвига сетки «{0}» для опции +nadgrids н
msgid "Unkown datum identifier: ''{0}''"
msgstr "Неизвестный идентификатор датума: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Требуется датум (+datum=*, +towgs84=* или +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Требуется датум (+datum=*, +towgs84=* or +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3598,6 +3696,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Непредвиденное количество аргументов для параметра «+bounds» (должно быть 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Неизвестный параметр ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Ожидался числовой аргумент для параметра «{0}»"
@@ -3615,9 +3716,6 @@ msgstr "Пользовательская проекция"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "Ошибка: невозможно открыть входящий поток для ресурса ''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3658,6 +3756,9 @@ msgstr "другое при проверке"
msgid "Running test {0}"
msgstr "Запуск теста {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Тест ''{0}'' завершен за {1}"
+
msgid "Addresses"
msgstr "Адреса"
@@ -3682,6 +3783,15 @@ msgstr "Несколько названий улиц в отношении"
msgid "House number too far from street"
msgstr "Номер дома слишком далеко от улицы"
+msgid "Barriers and entrances"
+msgstr "Преграды и проходы"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Проверка ошибок в преградах и проходах."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Для преграды не указан проход"
+
msgid "Building inside building"
msgstr "Здание внутри другого здания"
@@ -3744,15 +3854,15 @@ msgstr " или "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} устарел, используйте вместо него {1}"
+msgid "{0} is unnecessary"
+msgstr "{0} не требуется"
+
msgid "Duplicated nodes"
msgstr "Дублированные точки"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Этот тест проверяет, чтобы не было наложенных точек."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Дублирование точек в двух незамкнутых линиях"
-
msgid "Mixed type duplicated nodes"
msgstr "Продублированные точки смешанного типа"
@@ -3824,6 +3934,24 @@ msgstr "Дублирующиеся точки на линии"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Проверяет линии на наличие одинаковых последовательных точек"
+msgid "Highways"
+msgstr "Дороги"
+
+msgid "Performs semantic checks on highways."
+msgstr "Семантическая проверка тегов на дорогах"
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Некорректное круговое движение (дорога: {0} вместо {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Отсутствует информация о пешеходном переходе"
+
+msgid "Unknown country code: {0}"
+msgstr "Неизвестный код страны: {0}"
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr "Неизвестный контекст source:maxspeed: {0}"
+
msgid "Multipolygon"
msgstr "Мультиполигон"
@@ -3898,6 +4026,12 @@ msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
"Этот тест ищет точки с одинаковыми названиями (возможно, это дубликаты)."
+msgid "Opening hours syntax"
+msgstr "Синтаксис часов работы"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr "Этот тест проверяет правильность синтаксиса часов работы."
+
msgid "Overlapping Areas"
msgstr "Перекрывающиеся полигоны"
@@ -3956,15 +4090,15 @@ msgstr "Неизвестный тип отношения"
msgid "Relation is empty"
msgstr "Пустое отношение"
+msgid "Role verification problem"
+msgstr "Проблема проверки роли"
+
msgid "<empty>"
msgstr "<пусто>"
msgid "Role {0} missing"
msgstr "Отсутствует роль {0}"
-msgid "Role verification problem"
-msgstr "Проблема проверки роли"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Количество ролей {0} слишком маленькое ({1})"
@@ -3996,11 +4130,11 @@ msgid ""
msgstr ""
"Этот тест ищет линии с похожими названиями. Возможно, это вызвано опечатками."
-msgid "Properties checker :"
-msgstr "Проверка параметров:"
+msgid "Tag checker"
+msgstr "Проверка тегов"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Этот модуль ищет ошибки в названиях ключей и в их значениях."
+msgid "This test checks for errors in tag keys and values."
+msgstr "Данный тест проверяет ошибки в ключах тегов и их значениях."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Неправильная линия анализатора тегов - {0}: {1}"
@@ -4142,8 +4276,8 @@ msgstr ""
"Использовать установленный по умолчанию файл проверки правописания "
"(рекомендуется)"
-msgid "Fix properties"
-msgstr "Исправить параметры"
+msgid "Fix tags"
+msgstr "Исправить теги"
msgid "Could not find element type"
msgstr "Не удалось найти тип элемента"
@@ -4219,6 +4353,9 @@ msgstr "Незамкнутые линии"
msgid "This tests if ways which should be circular are closed."
msgstr "Этот тест ищет разомкнутые линии, которые должны быть замкнутыми."
+msgid "Unclosed way"
+msgstr "Незамкнутая линия"
+
msgid "natural type {0}"
msgstr "естественного типа {0}"
@@ -4249,9 +4386,6 @@ msgstr "здание"
msgid "area"
msgstr "полигон"
-msgid "Unclosed way"
-msgstr "Незамкнутая линия"
-
msgid "Unconnected ways"
msgstr "Несоединённые линии"
@@ -4278,12 +4412,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий."
-msgid "No tags"
-msgstr "Без тегов"
-
msgid "Unconnected nodes without physical tags"
msgstr "Несоединённые точки без тегов"
+msgid "No tags"
+msgstr "Без тегов"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Имеются тег, содержащий ''fixme'' или ''FIXME''"
@@ -4346,26 +4480,6 @@ msgstr "Неверное направление береговой линии:
msgid "Reversed land: land not on left side"
msgstr "Неверное направление линии суши: земля не слева"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Неверное количество аргументов для закладки"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Ошибка чтения записи в закладке: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Ошибка: Неожиданная строка ''{0}'' в файле закладок ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Ошибка: Неверное двойное значение ''{0}'' в строке ''{1}'' в файле закладок "
-"''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Невозможно прочесть закладки с <br>''{0}''<br>Текст ошибки: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Не показывать снова (запомнить выбор)"
@@ -4471,8 +4585,8 @@ msgstr "Показать справочную информацию"
msgid "Downloading \"Message of the day\""
msgstr "Скачивается \"Сообщение дня\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Предупреждение: Не удалось прочесть Сообщение дня. Ошибка: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Не удалось прочитать сообщение дня (MOTD). Ошибка: {0}"
msgid "Message of the day not available"
msgstr "Сообщение дня недоступно"
@@ -4686,9 +4800,24 @@ msgstr "Вид"
msgid "Tools"
msgstr "Инструменты"
+msgid "More tools"
+msgstr "Ещё инструменты"
+
+msgid "Data"
+msgstr "Данные"
+
+msgid "Selection"
+msgstr "Выделение"
+
msgid "Presets"
msgstr "Заготовки"
+msgid "More..."
+msgstr "Ещё..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Панели"
@@ -4706,11 +4835,23 @@ msgstr ""
"Переключает видимость панели инструментов редактирования (т.е. вертикальной "
"панели)"
+msgid "Preset preferences"
+msgstr "Настройки заготовок"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr "Щёлкните, чтобы открыть вкладку заготовок тегов в настройках"
+
+msgid "Imagery preferences"
+msgstr "Настройки снимков"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Щёлкните, чтобы открыть вкладку снимков в настройках"
+
msgid "Audio"
msgstr "Аудио"
-msgid "Hide edit toolbar"
-msgstr "Скрыть панель инструментов редактирования"
+msgid "Do not hide toolbar"
+msgstr "Не скрывать панели инструментов"
msgid "Hide this button"
msgstr "Скрыть эту кнопку"
@@ -4718,6 +4859,9 @@ msgstr "Скрыть эту кнопку"
msgid "Click the arrow at the bottom to show it again."
msgstr "Нажать стрелку внизу, чтобы показать снова."
+msgid "Hide edit toolbar"
+msgstr "Скрыть панель инструментов редактирования"
+
msgid "Hide or show this toggle button"
msgstr "Скрыть или показать кнопку переключения"
@@ -4779,6 +4923,9 @@ msgstr "(нет объекта)"
msgid "User:"
msgstr "Пользователь:"
+msgid "Do not hide status bar"
+msgstr "Не скрывать строку состояния"
+
msgid "Layer not in list."
msgstr "слоя нет в списке."
@@ -4806,19 +4953,6 @@ msgstr "В фоне"
msgid "Click to run job in background"
msgstr "Нажмите, для запуска задачи в фоновом режиме"
-msgid "false: the property is explicitly switched off"
-msgstr "false: параметр явно выключен"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: параметр явно включён"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "частично: выделенные объекты имеют различные значения, не изменяйте"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "unset: не устанавливать этот параметр у выделенных объектов"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} мс)"
@@ -5132,6 +5266,9 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Скопировать выделенные элементы в конец списка объединённых элементов"
+msgid "> before"
+msgstr "> перед"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5139,6 +5276,9 @@ msgstr ""
"Скопировать выделенные элементы перед первым выделенным элементом в списке "
"объединённых элементов"
+msgid "> after"
+msgstr "> после"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5146,16 +5286,25 @@ msgstr ""
"Скопировать мои выделенные элементы после первого выделенного элемента в "
"списке объединённых элементов"
+msgid "< top"
+msgstr "< вверх"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Скопировать их выделенные элементы в начало списка объединённых элементов"
+msgid "< bottom"
+msgstr "< вниз"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Скопировать их выделенные элементы в конец списка объединённых элементов"
+msgid "< before"
+msgstr "< перед"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5163,6 +5312,9 @@ msgstr ""
"Скопировать их выделенные элементы перед первым выделенным элементом в "
"списке объединённых элементов"
+msgid "< after"
+msgstr "< после"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5179,8 +5331,8 @@ msgstr "Скопировать все чужие элементы в место
msgid "Up"
msgstr "Вверх"
-msgid "Move up the selected elements by one position."
-msgstr "Поднять выделенные элементы на одну позицию"
+msgid "Move up the selected entries by one position."
+msgstr "Переместить выделенные записи вверх на одну позицию."
msgid "Down"
msgstr "Вниз"
@@ -5238,16 +5390,6 @@ msgstr[0] "Их версия ({0} запись)"
msgstr[1] "Их версия ({0} записей)"
msgstr[2] "Их версия ({0} записей)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Регулируемый {0} ещё не зарегистрирован. Невозможно установить участие в "
-"синхронизированных регулировках."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Регулируемый {0} ещё не зарегистрирован."
-
msgid "Node"
msgstr "Точка"
@@ -5526,7 +5668,7 @@ msgctxt "tag"
msgid "Key:"
msgstr "Ключ:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
"<html>Введите ключ тега, например: <strong><tt>fixme</tt></strong></html>"
@@ -5534,7 +5676,7 @@ msgid "Value:"
msgstr "Значение:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
"<html>Введите значение тега, например: <strong><tt>check "
"members</tt></strong></html>"
@@ -6118,6 +6260,9 @@ msgstr "Показать/скрыть"
msgid "Information about layer"
msgstr "Информация о слое"
+msgid "Map paint preferences"
+msgstr "Настройки отрисовки карты"
+
msgid "Map Paint Styles"
msgstr "Стили отрисовки карты"
@@ -6202,20 +6347,52 @@ msgstr "Стиль активен сейчас?"
msgid "No"
msgstr "Нет"
-msgid "Relations"
-msgstr "Отношения"
-
-msgid "Open a list of all relations."
-msgstr "Показать список всех отношений."
+msgid "Object type:"
+msgstr "Тип объекта:"
-msgid "Relation list filter"
-msgstr "Фильтр списка отношений"
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "смешанный"
-msgid "Create a new relation"
-msgstr "Создать новое отношение"
+msgid "Choose the OSM object type"
+msgstr "Выберите тип объекта OSM"
-msgid "New"
-msgstr "Создать"
+msgid "Object ID:"
+msgstr "ID объекта:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Введите ID объекта, который должен быть скачан с сервера"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Идентификаторы объектов могут быть разделены запятыми или пробелами.<br/> "
+"Примеры: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> В смешанном "
+"режиме указывайте объекты так: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"Указан неверный список ID\n"
+"Продолжить невозможно."
+
+msgid "Relations"
+msgstr "Отношения"
+
+msgid "Open a list of all relations."
+msgstr "Показать список всех отношений."
+
+msgid "Relation list filter"
+msgstr "Фильтр списка отношений"
+
+msgid "Create a new relation"
+msgstr "Создать новое отношение"
+
+msgid "New"
+msgstr "Создать"
msgid "Relations: {0}/{1}"
msgstr "Отношения: {0}/{1}"
@@ -6223,9 +6400,6 @@ msgstr "Отношения: {0}/{1}"
msgid "Relations: {0}"
msgstr "Отношения: {0}"
-msgid "Selection"
-msgstr "Выделение"
-
msgid "Open a selection list window."
msgstr "Показать окно со списком выделенных объектов."
@@ -6250,18 +6424,6 @@ msgstr "Нельзя выбрать в данный момент"
msgid "Selection: {0}"
msgstr "Выбор: {0}"
-msgid "Side buttons"
-msgstr "Боковые кнопки"
-
-msgid "Always shown"
-msgstr "Всегда показывать"
-
-msgid "Dynamic"
-msgstr "Показывать динамически"
-
-msgid "Always hidden"
-msgstr "Всегда скрывать"
-
msgid "Toggle dynamic buttons"
msgstr "Переключатель динамических кнопок"
@@ -6280,6 +6442,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Нажмите, чтобы свернуть/развернуть содержимое панели"
+msgid "Side buttons"
+msgstr "Боковые кнопки"
+
+msgid "Always shown"
+msgstr "Всегда показывать"
+
+msgid "Dynamic"
+msgstr "Показывать динамически"
+
+msgid "Always hidden"
+msgstr "Всегда скрывать"
+
msgid "Authors"
msgstr "Авторы"
@@ -6293,15 +6467,14 @@ msgstr[1] "{0} Автора"
msgstr[2] "{0} Авторов"
msgid "Select objects submitted by this user"
-msgstr "Выбрать объекты, созданные этим пользователем"
+msgstr "Выделить объекты, созданные этим пользователем"
msgid "Launches a browser with information about the user"
msgstr "Открыть в браузере информацию о пользователе"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Внимание: открываются страницы информации о первых {0} из {1} выделенных "
+"Запуск браузеров с информацией только для первых {0} из {1} выбранных "
"пользователей"
msgid ""
@@ -6329,9 +6502,6 @@ msgstr "Открыть окно проверки"
msgid "Validation results"
msgstr "Результаты проверки"
-msgid "Zoom to problem"
-msgstr "Приблизиться к проблеме"
-
msgid "Fix"
msgstr "Исправить"
@@ -6480,9 +6650,6 @@ msgstr "Обновить содержимое"
msgid "Update the changeset content from the OSM server"
msgstr "Обновить содержимое пакета правок с сервера OSM"
-msgid "Show history"
-msgstr "Показать историю"
-
msgid "Download and show the history of the selected objects"
msgstr "Загрузить и показать историю выбранных объектов"
@@ -6815,11 +6982,11 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Скачать с сервера пакеты правок в текущий вид карты</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Предупреждение: неожиданное значение для настройки ''{0}'', получено "
-"''{1}''. Сброс к запросу по умолчанию."
+"Непредвиденное значение настройки ''{0}'', равное ''{1}''. Возврат к запросу "
+"по умолчанию."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6888,35 +7055,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Неправильный URL запроса пакета правок"
-msgid "Select objects for which to change properties."
-msgstr "Выберите объекты, для которых нужно изменить свойства."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Свойства/Отношения"
+msgid "Discardable key: foreground"
+msgstr "Удаляемый ключ: foreground"
-msgid "Properties for selected objects."
-msgstr "Свойства выделенных объектов."
+msgid "Discardable key: background"
+msgstr "Удаляемый ключ: background"
msgid "<different>"
msgstr "<различные>"
+msgid "Select objects for which to change tags."
+msgstr "Выберите объекты для изменения тегов."
+
+msgid "Tags/Memberships"
+msgstr "Теги/Участие"
+
+msgid "Tags for selected objects."
+msgstr "Теги для выделенных объектов."
+
msgid "Member Of"
msgstr "Участник"
msgid "Position"
msgstr "Расположение"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Свойств: {0} / Отношений: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Теги: {0} / Участие: {1}"
-msgid "Properties / Memberships"
-msgstr "Свойства/Отношения"
+msgid "Tags / Memberships"
+msgstr "Теги / Участие"
msgid "Delete the selected key in all objects"
msgstr "Удалить выделенный ключ из всех объектов"
-msgid "Delete Properties"
-msgstr "Удалить параметры"
+msgid "Delete Tags"
+msgstr "Удалить теги"
msgid "Change relation"
msgstr "Изменить отношение"
@@ -6930,14 +7109,14 @@ msgstr "Вы действительно хотите удалить отмече
msgid "Add a new key/value pair to all objects"
msgstr "Добавить новую пару ключ/значение для всех объектов"
-msgid "Add Property"
-msgstr "Добавить свойство"
+msgid "Add Tag"
+msgstr "Добавить тег"
msgid "Edit the value of the selected key for all objects"
msgstr "Изменить значение выбранного ключа для всех объектов"
-msgid "Edit Properties"
-msgstr "Редактировать свойства"
+msgid "Edit Tags"
+msgstr "Редактировать теги"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Открыть описание тега в OSM wiki (F1)"
@@ -7022,12 +7201,6 @@ msgstr[2] "Изменить параметры {0} объектов"
msgid "Use English language for tag by default"
msgstr "Использовать английский язык для тега по умолчанию"
-msgid "Paste tag"
-msgstr "Вставить тег"
-
-msgid "Paste value"
-msgstr "Вставить значение"
-
msgid "Add value?"
msgstr "Добавить значение?"
@@ -7059,9 +7232,15 @@ msgstr "Пожалуйста, введите целое число от 0 до {
msgid "Recently added tags"
msgstr "Недавно добавленные теги"
+msgid "Choose recent tag {0}"
+msgstr "Выбрать недавний тег {0}"
+
msgid "Use this tag again"
msgstr "Использовать этот тег снова"
+msgid "Apply recent tag {0}"
+msgstr "Применить недавний тег {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "Ключ «{0}» уже используется"
@@ -7104,9 +7283,9 @@ msgstr "Отношение удалено"
msgid "Downloading relation {0}"
msgstr "Скачивание отношения {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
-"Внимание: Ошибка проигнорирована, поскольку задача была отменена. Ошибка: {0}"
+"Исключение игнорируется, так как задача была отменена. Исключение: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7174,6 +7353,10 @@ msgstr "Удалить их, почистить отношение"
msgid "Ignore them, leave relation as is"
msgstr "Игнорировать их, оставить отношение как есть"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Извините, горячая клавиша \"{0}\" не доступна в окне редактора отношений"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7228,7 +7411,7 @@ msgstr ""
"Выбрать участников, которые ссылаются на объекты ({0}) в текущем выделении"
msgid "Select objects for selected relation members"
-msgstr "Выбрать объекты для выбранных участников отношения"
+msgstr "Выделить объекты для выбранных участников отношения"
msgid "Sort the relation members"
msgstr "Сортировать участников отношений"
@@ -7460,6 +7643,27 @@ msgid "way is not connected to previous or next relation member"
msgstr ""
"линия не соединена ни с предыдущим, ни со следующим участником отношения"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Неверное количество аргументов для закладки"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Ошибка чтения записи в закладке: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Непредвиденная строка ''{0}'' в файле закладок ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Недопустимое двойное значение ''{0}'' в строке ''{1}'' файла закладок ''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Невозможно прочесть закладки с <br>''{0}''<br>Текст ошибки: {1}</html>"
+
msgid "Bookmarks"
msgstr "Закладки"
@@ -7533,9 +7737,6 @@ msgstr "Значение широты должно быть в пределах
msgid "Value for longitude in range [-180,180] required."
msgstr "Значение долготы должно быть в пределах [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Вставьте ссылку из буфера"
-
msgid "Data Sources and Types:"
msgstr "Источники и типы данных:"
@@ -7615,21 +7816,8 @@ msgstr "Скачать ссылающихся на объект (родител
msgid "Download object"
msgstr "Скачать объект"
-msgid "Object type:"
-msgstr "Тип объекта:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "смешанный"
-
-msgid "Choose the OSM object type"
-msgstr "Выберите тип объекта OSM"
-
-msgid "Object ID:"
-msgstr "ID объекта:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Введите ID объекта, который должен быть скачан с сервера"
+msgid "Start downloading"
+msgstr "Начать скачивание"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7641,28 +7829,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Отметьте, если должны быть скачаны и участники отношения"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Идентификаторы объектов могут быть разделены запятыми или пробелами.<br/> "
-"Примеры: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> В смешанном "
-"режиме указывайте объекты так: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Скачать ссылающиеся объекты (родительские отношения и линии)"
-msgid "Start downloading"
-msgstr "Начать скачивание"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Неправильный список идентификаторов.\n"
-"Невозможно скачать объект."
-
msgid "Class Type"
msgstr "Тип класса"
@@ -7776,9 +7945,8 @@ msgstr "Перейти на следующую страницу"
msgid "Go to the JOSM help home page"
msgstr "Перейти на начальную страницу справки JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
-"Предупреждение: плохое расположение в документе HTML. Текст ошибки: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Неверное расположение в HTML документе. Ошибка: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Не удалось открыть справочную страницу. Ссылка пуста."
@@ -7885,6 +8053,9 @@ msgid ""
msgstr ""
"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Комментарий к пакету правок"
+
msgid "Changeset info"
msgstr "Информация о пакете правок"
@@ -7996,10 +8167,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Объект еще используется"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Предупреждение: ошибка в заголовке \"{0}\" не соответствует ожидаемому "
-"образцу"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "Заголовок ошибки \"{0}\" не соответствует ожидавшемуся шаблону"
msgid "Upload"
msgstr "Передать на сервер"
@@ -8021,6 +8190,12 @@ msgstr "Прокомментируйте данные, передаваемые
msgid "Enter an upload comment"
msgstr "Введите комментарий для передачи на сервер"
+msgid "Specify the data source for the changes:"
+msgstr "Укажите источник данных для правок:"
+
+msgid "Enter a source"
+msgstr "Введите источник"
+
msgid "Changeset id:"
msgstr "ID пакета правок:"
@@ -8092,11 +8267,10 @@ msgid "Closing changeset {0}"
msgstr "Закрытие пакета правок {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Предупреждение: Не удалось удержать диалог учётных данных всегда поверх "
-"окон. Обнаружена ошибка безопасности."
+"Не удаётся разместить диалог учётных данных всегда поверх других окон. "
+"Ошибка безопасности."
msgid "Enter credentials for OSM API"
msgstr "Введите учётные данные для OSM API"
@@ -8181,11 +8355,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Распаковка {0} в {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Предупреждение: Невозможно скачать файл «{0}». Ссылка для его скачивания "
-"«{1}» не является допустимым URL. Скачивание пропущено."
+"Не удалось загрузить файл ''{0}''. Ссылка ''{1}'' не является действующим "
+"URL. Пропуск загрузки."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8201,11 +8375,9 @@ msgid "Missing user identity"
msgstr "Отсутствие подлинности пользователя"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Предупреждение: Не удалось получить информацию о пользователе для текущего "
-"пользователя JOSM. Текст ошибки: {0}"
+"Не удалось получить информацию о текущем пользователе JOSM. Ошибка: {0}"
msgid "Download objects"
msgstr "Загрузить объекты"
@@ -8471,12 +8643,6 @@ msgstr "Передать на сервер изменённые элементы
msgid "Please revise upload comment"
msgstr "Проверьте комментарий к передаче"
-msgid "Revise"
-msgstr "Проверить"
-
-msgid "Continue as is"
-msgstr "Продолжить как есть"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8491,6 +8657,26 @@ msgstr ""
"объяснение сделанных вами изменений —<br />Вы облегчите работу другим "
"участникам проекта."
+msgid "Please specify a changeset source"
+msgstr "Укажите источник данных для пакета правок"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"Вы не указали источник информации для ваших правок.<br />Это допустимо, но "
+"указание источника поможет другим пользователям <br />понять происхождение "
+"данных.<br /><br />Затратив минуту на пояснение к сделанным вами правкам,<br "
+"/>вы облегчите труд другим картографам."
+
+msgid "Revise"
+msgstr "Проверить"
+
+msgid "Continue as is"
+msgstr "Продолжить как есть"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Вернуться в предыдущий диалог, чтобы добавить более развёрнутый комментарий"
@@ -8507,6 +8693,28 @@ msgstr "Пожалуйста, сначала введите допустимый
msgid "Illegal chunk size"
msgstr "Неправильный размер части"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>Следующий тег пакета изменений содержит пустой "
+"ключ/значение:<br>{0}<br>Продолжить?</html>"
+msgstr[1] ""
+"<html>Следующие теги пакета изменений содержат пустой "
+"ключ/значение:<br>{0}<br>Продолжить?</html>"
+msgstr[2] ""
+"<html>Следующие теги пакета изменений содержат пустой "
+"ключ/значение:<br>{0}<br>Продолжить?</html>"
+
+msgid "Empty metadata"
+msgstr "Пустые метаданные"
+
msgid "Cancel the upload and resume editing"
msgstr "Отменить передачу на сервер и продолжить редактирование"
@@ -8514,11 +8722,11 @@ msgid "Tags of changeset {0}"
msgstr "Теги пакета правок {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Предупреждение: объект ''{0}'' уже удалён на сервере. Данные будут переданы "
-"снова на сервер, но без этого объекта."
+"Объект ''{0}'' уже удалён с сервера. Пропуск этого объекта и повторная "
+"попытка передачи."
msgid "Preparing objects to upload ..."
msgstr "Подготовка объектов для передачи..."
@@ -8669,9 +8877,6 @@ msgstr ""
"Объект ''{0}'' уже удалён. Объект будет пропущен при передаче данных на "
"сервер."
-msgid "Warning: {0}"
-msgstr "Предупреждение: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Передача на сервер {0} объекта..."
@@ -8684,6 +8889,9 @@ msgstr ""
"Игнорирование выявленной ошибки, так как передача на сервер отменена. "
"Ошибка: {0}"
+msgid "Upload successful!"
+msgstr "Загрузка выполнена успешно!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8704,10 +8912,9 @@ msgstr "Выбор объектов для передачи на сервер"
msgid "Cancel uploading"
msgstr "Отменить передачу на сервер"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Предупреждение: неожиданное значение ключа ''{0}'' в настройках, получено "
-"''{1}''"
+"Непредвиденное значение для ключа ''{0}'' в настройках, получено ''{1}''"
msgid "Please select the upload strategy:"
msgstr "Пожалуйста, выберите стратегию передачи на сервер:"
@@ -8867,7 +9074,7 @@ msgstr "Следующий маркер"
msgid "Jump to next marker"
msgstr "К следующему маркеру"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Предыдущий маркер"
msgid "Jump to previous marker"
@@ -8900,10 +9107,8 @@ msgstr "версия {0}"
msgid "Merging layers"
msgstr "Объединение слоёв"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Внимание: совместное использование данных версий 0.6 и 0.5. Всё станет "
-"версии 0.5."
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Смешивание данных из версий 0.6 и 0.5 даст в результате версию 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -9024,6 +9229,9 @@ msgstr "увеличьте масштаб для лучшей детализац
msgid "No tiles at this zoom level"
msgstr "Нет квадратов на данном масштабе"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "TMS-слой ({0}), загрузка в масштабе {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "Поддерживаются EPSG:4326 и проекция Меркатора"
@@ -9063,6 +9271,9 @@ msgstr "Загрузить заново ошибочные квадраты ка
msgid "Alpha channel"
msgstr "Альфа канал"
+msgid "Automatically change resolution"
+msgstr "Автоматически изменить разрешение"
+
msgid "Set WMS Bookmark"
msgstr "Установить закладку WMS"
@@ -9279,9 +9490,6 @@ msgstr "Извлечение GPS координат из EXIF"
msgid "Starting directory scan"
msgstr "Запуск сканирования каталога"
-msgid "One of the selected files was null"
-msgstr "Один из выделенных файлов пуст"
-
msgid "Read photos..."
msgstr "Прочитать фотографии..."
@@ -9300,6 +9508,9 @@ msgstr "Найден пустой файл в каталоге {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Ошибка чтения файлов в каталоге {0}\n"
+msgid "One of the selected files was null"
+msgstr "Один из выделенных файлов пуст"
+
msgid "Geotagged Images"
msgstr "Изображения с данными о местоположении"
@@ -9361,6 +9572,12 @@ msgstr "Следующее"
msgid "Show next Image"
msgstr "Показать следующее изображение"
+msgid "Show first Image"
+msgstr "Показать первое изображение"
+
+msgid "Show last Image"
+msgstr "Показать последнее изображение"
+
msgid "Center view"
msgstr "Центрировать вид"
@@ -9444,9 +9661,6 @@ msgstr ""
"считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с "
"этим:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Настроить отрисовку трека"
@@ -9459,8 +9673,11 @@ msgstr "До"
msgid "No timestamp"
msgstr "Нет метки времени"
-msgid "Download from OSM along this track"
-msgstr "Скачать с OSM данные вдоль этого трека"
+msgid "Select to download OSM data."
+msgstr "Выберите для загрузки данных OSM."
+
+msgid "Select to download GPS traces."
+msgstr "Выберите для загрузки треков GPS."
msgid "Download everything within:"
msgstr "Скачать всё в пределах:"
@@ -9486,16 +9703,18 @@ msgstr "только путевые точки"
msgid "track and waypoints"
msgstr "треки и путевые точки"
+msgid "Click to download"
+msgstr "Щёлкните для загрузки"
+
+msgid "Click to cancel"
+msgstr "Щёлкните, чтобы отменить"
+
+msgid "Download from OSM along this track"
+msgstr "Скачать с OSM данные вдоль этого трека"
+
msgid "Calculating Download Area"
msgstr "Расчет загружаемой области"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
-"Продолжить?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Предкэшировать квадраты снимка около трека"
@@ -9643,17 +9862,11 @@ msgstr "Произошла ошибка при попытке показать U
msgid "(URL was: "
msgstr "(по ссылке: "
-msgid "Error displaying URL"
-msgstr "Невозможно отобразить URL"
-
msgid "Select the map painting styles"
msgstr "Выберите стили отрисовки карты"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
-"Предупреждение: Не удалось загрузить стили Mappaint из ''{0}''. Текст "
-"ошибки: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Не удалось загрузить стили Mappaint из ''{0}''. Ошибка: {1}"
msgid "loading style ''{0}''..."
msgstr "загрузка стиля ''{0}''..."
@@ -9674,9 +9887,8 @@ msgstr[2] ""
"Произошло {0} ошибок при загрузке стиля. Подробности смотрите в пункте "
"\"Информация\" из контекстного меню."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr ""
-"Предупреждение: Невозможно разобрать стили Mappaint из ''{0}''. Ошибки: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr "Не удалось выполнить разбор стилей Mappaint из ''{0}''. Ошибка: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr ""
@@ -9688,11 +9900,9 @@ msgstr ""
"быть > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Предупреждение: Невозможно разобрать стили Mappaint из ''{0}''. Ошибки: "
-"[{1}:{2}] {3}"
+"Не удалось выполнить разбор стилей Mappaint из ''{0}''. Ошибка: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Ключ маркера доступа:"
@@ -9959,8 +10169,8 @@ msgstr "Закрыть диалог и отменить авторизацию"
msgid "Close the dialog and accept the Access Token"
msgstr "Закрыть диалог и принять маркер доступа"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Предупреждение: Не удалось отменить запущенную операции OAuth"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Не удалось отменить выполняющуюся операцию OAuth"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Получение маркера запроса OAuth от ''{0}''"
@@ -10032,6 +10242,12 @@ msgstr "Разрешить запись своих настроек"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "Выберите, чтобы позволить JOSM записывать ваши настройки сервера"
+msgid "Allow modifications of notes"
+msgstr "Разрешить изменение примечаний"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Выберите, чтобы разрешить JOSM изменять примечания от вашего имени"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Получение маркера доступа OAuth..."
@@ -10101,9 +10317,6 @@ msgstr ""
"маркер. JOSM будет использовать его для аутентификации и авторизации на "
"сервере OSM.<br><br>Маркер доступа: </html>"
-msgid "Restart"
-msgstr "Перезапустить"
-
msgid "Click to retrieve a Request Token"
msgstr "Нажмите, чтобы получить маркер запроса"
@@ -10400,6 +10613,9 @@ msgstr "Скачать модули"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
+msgid "Would you like to restart now?"
+msgstr "Перезапустить сейчас?"
+
msgid "Remote Control"
msgstr "Удалённое управление"
@@ -10533,6 +10749,12 @@ msgstr "Удалить с панели инструментов"
msgid "Configure toolbar"
msgstr "Настроить панель инструментов"
+msgid "Edit shortcut"
+msgstr "Свойства горячей клавиши"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Не скрывать панель инструментов и меню"
+
msgid "Actions"
msgstr "Действия"
@@ -10576,6 +10798,9 @@ msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
"Зарегистрированное действие на панели {0} перезаписано: {1} получены {2}"
+msgid "Toolbar: {0}"
+msgstr "Панель инструментов: {0}"
+
msgid "Data validator"
msgstr "Проверка данных"
@@ -10628,24 +10853,12 @@ msgstr "Поиск: "
msgid "Read from file"
msgstr "Загрузить из файла..."
-msgid "Open JOSM customization file"
-msgstr "Открыть файл настроек JOSM"
-
-msgid "Import log"
-msgstr "Журнал импорта"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Здесь вкратце результаты импорта настроек из файла. <br/>Вы можете "
-"отказаться от этих изменений, нажав \"Отмена\" в окне настроек.<br/>Для "
-"активации некоторых настроек может потребоваться перезапуск JOSM .</html>"
-
msgid "Export selected items"
msgstr "Сохранить в файл..."
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Файлы пользовательских настроек JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Выберите несколько настроек, значения которых отличаются от значений по "
@@ -10664,43 +10877,56 @@ msgstr "Добавить настройки из файла"
msgid "Replace existing values"
msgstr "Заменить настройками из файла"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Файлы пользовательских настроек JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Открыть файл настроек JOSM"
-msgid "Advanced Background: Changed"
-msgstr "Расширенные настройки: Изменено"
+msgid "Import log"
+msgstr "Журнал импорта"
-msgid "Advanced Background: NonDefalut"
-msgstr "Расширенные настройки: Не по умолчанию"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Здесь вкратце результаты импорта настроек из файла. <br/>Вы можете "
+"отказаться от этих изменений, нажав \"Отмена\" в окне настроек.<br/>Для "
+"активации некоторых настроек может потребоваться перезапуск JOSM .</html>"
-msgid "Current value is default."
-msgstr "Текущее значение является значением по умолчанию."
+msgid "shortcut"
+msgstr "горячая клавиша"
-msgid "Default value is ''{0}''."
-msgstr "Значение по умолчанию: ''{0}''."
+msgid "color"
+msgstr "цвет"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Значение по умолчанию неизвестно (настройка еще никогда не была "
-"использована)."
+msgid "toolbar"
+msgstr "панель инструментов"
-msgid "Select Setting Type:"
-msgstr "Выберите тип параметра:"
+msgid "imagery"
+msgstr "снимки"
-msgid "Simple"
-msgstr "Простой"
+msgid "Reset preferences"
+msgstr "Сбросить настройки"
-msgid "List"
-msgstr "Список"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Вы собираетесь сбросить все настройки к значениям по умолчанию<br />Будут "
+"удалены все ваши настройки: модулей, снимков, фильтров, кнопок панели "
+"инструментов, клавиатуры и др. <br />Вы действительно хотите продолжить?"
-msgid "List of lists"
-msgstr "Список списков"
+msgid "Load profile"
+msgstr "Загрузить профиль"
-msgid "List of maps"
-msgstr "Список карт"
+msgid "Save {0} profile"
+msgstr "Сохранить {0} профиль"
-msgid "Add setting"
-msgstr "Добавить параметр"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr "Все настройки этой группы стандартные, сохранять нечего"
+
+msgid "Choose profile file"
+msgstr "Выберите файл профиля"
msgid "Change list setting"
msgstr "Изменить параметры списка"
@@ -10723,6 +10949,41 @@ msgstr "Изменить параметры списка карт"
msgid "Entry {0}"
msgstr "Запись {0}"
+msgid "Select Setting Type:"
+msgstr "Выберите тип параметра:"
+
+msgid "Simple"
+msgstr "Простой"
+
+msgid "List"
+msgstr "Список"
+
+msgid "List of lists"
+msgstr "Список списков"
+
+msgid "List of maps"
+msgstr "Список карт"
+
+msgid "Add setting"
+msgstr "Добавить параметр"
+
+msgid "Advanced Background: Changed"
+msgstr "Расширенные настройки: Изменено"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Текущее значение является значением по умолчанию."
+
+msgid "Default value is ''{0}''."
+msgstr "Значение по умолчанию: ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Значение по умолчанию неизвестно (настройка еще никогда не была "
+"использована)."
+
msgid "Change string setting"
msgstr "Изменить параметры строки"
@@ -10779,6 +11040,9 @@ msgstr "Отображать виртуальные точки в режиме
msgid "Draw inactive layers in other color"
msgstr "Отображать неактивные слои другим цветом"
+msgid "Display discardable keys"
+msgstr "Показывать удаляемые ключи"
+
msgid "Highlight target ways and nodes"
msgstr "Выделите целевые линии и точки"
@@ -10837,6 +11101,13 @@ msgid ""
msgstr ""
"Эта опция блокирует заполнение областей, несмотря на выбранный стиль."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Показывать ключи, которые не представляют интереса и могут быть молча "
+"удалены."
+
msgid "Options that affect drawing performance"
msgstr "Настройки, влияющие на скорость отображения"
@@ -11140,8 +11411,14 @@ msgstr "Получить слои"
msgid "2. Select layers"
msgstr "2. Выберите слои"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Проверьте созданный URL для WMS"
+msgid "3. Select image format"
+msgstr "3. Выберите формат изображения"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Проверьте созданный WMS URL"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Введите название слоя"
msgid "Show Bounds"
msgstr "Показать границы"
@@ -11319,6 +11596,12 @@ msgstr ""
"При этом к имени файла добавляется суффикс ''~'' и он сохраняется в той же "
"папке.)</i>"
+msgid "Notification at each save"
+msgstr "Уведомление при каждом сохранении"
+
+msgid "When saving, display a small notification"
+msgstr "При сохранении показывать маленькое уведомление"
+
msgid "File backup"
msgstr "Резервное копирование"
@@ -11386,8 +11669,8 @@ msgstr "Настройки карты"
msgid "Settings for the map projection and data interpretation."
msgstr "Параметры проекции карты и отображения данных"
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Внимание: Невозможно прочитать источник заготовок тегов: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Не удалось прочитать источник заготовок тегов: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11669,21 +11952,6 @@ msgstr "Швейцарская проекция"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (без локальных коррекций)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Зона UTM"
-
-msgid "North"
-msgstr "Север"
-
-msgid "South"
-msgstr "Юг"
-
-msgid "Hemisphere"
-msgstr "Полушарий"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11705,6 +11973,21 @@ msgstr "Франция UTM (DOM)"
msgid "UTM Geodesic system"
msgstr "Система координат UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Зона UTM"
+
+msgid "North"
+msgstr "Север"
+
+msgid "South"
+msgstr "Юг"
+
+msgid "Hemisphere"
+msgstr "Полушарий"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Тестирование URL OSM API ''{0}''"
@@ -11763,35 +12046,32 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Использовать алгоритм OAuth (для аутентификации)"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Предупреждение: Неподдерживаемое значение в настройке «{0}», получено «{1}». "
-"Используется метод аутентификации пользователя «Обычная аутентификация»."
+"Не поддерживаемое значение в настройке ''{0}'', равное ''{1}''. Используется "
+"метод ''Обычная аутентификация''."
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr ""
-"Предупреждение: Не удалось получить учётные данные OSM от Менеджера учётных "
-"данных."
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr "Не удалось получить учётные данные OSM из менеджера учётных данных."
msgid "Current credential manager is of type ''{0}''"
msgstr "Текущий менеджер учётных данных имеет тип ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr ""
-"Предупреждение: Не удалось сохранить учётные данные OSM в Менеджере учётных "
-"данных."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr "Не удалось сохранить учётные данные OSM в менеджере учётных данных."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
-"Предупреждение: Не удалось получить маркер доступа OAuth от Менеджера "
-"учётных данных"
+msgid "Periodically check for new messages"
+msgstr "Периодически проверять наличие новых сообщений"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr ""
-"Предупреждение: Не удалось сохранить маркер доступа OAuth в Менеджере "
-"учётных данных"
+msgid "Check interval (minutes):"
+msgstr "Интервал проверки (минуты):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr "Не удалось получить токен доступа OAuth из менеджера учётных данных"
+
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr "Не удалось сохранить токен доступа OAuth в менеджере учётных данных"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11883,19 +12163,11 @@ msgid "Use a SOCKS proxy"
msgstr "Использовать SOCKS прокси-сервер"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Внимание: JOSM настроен на использование прокси-сервера, однако Ваша Java-"
-"машина не сконфигурирована для этого должным образом. Установите параметр "
-"\"Нет прокси\" (JOSM: Настройки->Параметры соединения->Настройки прокси-"
-"сервера)"
-
-msgid "disabled"
-msgstr "отключено"
-
-msgid "no modifier"
-msgstr "нет модификатора"
+"JOSM настроен на использование прокси из стандартных системных настроек, но "
+"JVM не настроена на их получение. Сброс к значению ''Нет прокси''"
msgid "Shortcut Background: User"
msgstr "Горячие клавиши: пользовательское"
@@ -11939,38 +12211,38 @@ msgstr "Удалить отмеченное в таблице тегов"
msgid "Add a new tag"
msgstr "Добавить новый тег"
-msgid "Select auto-increment of {0} for this field"
-msgstr "Выберите автоприращение {0} для этого поля"
+msgid "Paste tags from buffer"
+msgstr "Вставить теги из буфера"
-msgid "Cancel auto-increment for this field"
-msgstr "Отменить автоприращение для этого поля"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Использовать заготовку ''{0}'' из группы ''{1}''"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Использовать заготовку ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Предупреждение: Заготовка тегов \"{0}-{1}\": Игнорируем атрибут ''{2}'' в "
-"элементах ''{3}''."
+msgid "Elements of type {0} are supported."
+msgstr "Поддерживается элемент типа {0}."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Испорченная заготовка тегов \"{0}-{1}\" - количество элементов в "
-"''display_values'' должно быть такое же, как и в ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Изменяем {0} объект"
+msgstr[1] "Изменяем {0} объекта"
+msgstr[2] "Изменяем {0} объектов"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Испорченная заготовка тегов \"{0}-{1}\" - количество элементов в "
-"''short_descriptions'' должно быть таким же, как и в ''values''"
+msgid "Nothing selected!"
+msgstr "Ничего не выделено!"
-msgid "More information about this feature"
-msgstr "Подробнее"
+msgid "Selection unsuitable!"
+msgstr "Выбраны неподходящие объекты!"
+
+msgid "Apply Preset"
+msgstr "Применить заготовку"
+
+msgid "New relation"
+msgstr "Новое отношение"
+
+msgid "Change Tags"
+msgstr "Изменить теги"
msgid "Unknown requisite: {0}"
msgstr "Неизвестный запрос: {0}"
@@ -11978,6 +12250,9 @@ msgstr "Неизвестный запрос: {0}"
msgid "Illegal member expression: {0}"
msgstr "Недопустимое выражение в {0}"
+msgid "More information about this feature"
+msgstr "Подробнее"
+
msgid "Available roles"
msgstr "Доступные роли"
@@ -11993,15 +12268,59 @@ msgstr "элементы"
msgid "Optional Attributes:"
msgstr "Дополнительные атрибуты:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Использовать заготовку ''{0}'' из группы ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr "Выберите автоприращение {0} для этого поля"
-msgid "Use preset ''{0}''"
-msgstr "Использовать заготовку ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr "Отменить автоприращение для этого поля"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Предупреждение: Заготовка тегов \"{0}-{1}\": Игнорируем атрибут ''{2}'' в "
+"элементах ''{3}''."
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Поврежденная заготовка тегов \"{0}-{1}\" - Java метод заданный в "
+"''values_from'' не \"{2}\""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Поврежденная заготовка тегов \"{0}-{1}\" - Java метод заданный в "
+"''values_from'' переместил {2} ({3})"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Испорченная заготовка тегов \"{0}-{1}\" - количество элементов в "
+"''display_values'' должно быть такое же, как и в ''values''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Испорченная заготовка тегов \"{0}-{1}\" - количество элементов в "
+"''short_descriptions'' должно быть таким же, как и в ''values''"
msgid "Unknown type: {0}"
msgstr "Неизвестный тип: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Группа заготовок {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "Группа заготовок {0}"
+
msgid "Roles cannot appear more than once"
msgstr "Роли не могут появляться более одного раза"
@@ -12011,42 +12330,9 @@ msgstr "Заготовка элемента роли без родителей"
msgid "Preset sub element without parent"
msgstr "Заготовка вложенного элемента без родителей"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Не удалось прочитать источник заготовок тегов: {0}"
-
msgid "Error parsing {0}: "
msgstr "Ошибка при разборе {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "Поддерживается элемент типа {0}."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Изменяем {0} объект"
-msgstr[1] "Изменяем {0} объекта"
-msgstr[2] "Изменяем {0} объектов"
-
-msgid "Nothing selected!"
-msgstr "Ничего не выделено!"
-
-msgid "Selection unsuitable!"
-msgstr "Выбраны неподходящие объекты!"
-
-msgid "Apply Preset"
-msgstr "Применить заготовку"
-
-msgid "New relation"
-msgstr "Новое отношение"
-
-msgid "Change Properties"
-msgstr "Изменить параметры"
-
-msgid "Preset group {1} / {0}"
-msgstr "Группа заготовок {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "Группа заготовок {0}"
-
msgid "Search preset"
msgstr "Найти заготовку..."
@@ -12062,6 +12348,16 @@ msgstr "Показывать только подходящие к выделен
msgid "Search in tags"
msgstr "Поиск в тегах"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Регулируемый {0} ещё не зарегистрирован. Невозможно установить участие в "
+"синхронизированных регулировках."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Регулируемый {0} ещё не зарегистрирован."
+
msgid "All files (*.*)"
msgstr "Все файлы (*.*)"
@@ -12097,30 +12393,82 @@ msgstr ""
"Текущее значение не является допустимым OSM ID. Пожалуйста, введите целое "
"число> 0"
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''."
+msgid "false: the property is explicitly switched off"
+msgstr "false: параметр явно выключен"
-msgid "Deleted node {0} is part of way {1}"
-msgstr "Удалённая точка {0} это часть линии {1}"
+msgid "true: the property is explicitly switched on"
+msgstr "true: параметр явно включён"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
-msgstr ""
-"Линия {0} с {1} точками содержит незавершённые точки, потому что, по крайней "
-"мере, одна точка отсутствовала в данных, загруженных с сервера."
+"partial: different selected objects have different values, do not change"
+msgstr "частично: выделенные объекты имеют различные значения, не изменяйте"
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
-msgstr ""
-"Отношение с внешним id ''{0}'' обращается к отсутствующему элементу с "
-"внешним id ''{1}''."
+msgid "unset: do not set this property on the selected objects"
+msgstr "unset: не устанавливать этот параметр у выделенных объектов"
-msgid "Deleted member {0} is used by relation {1}"
-msgstr "Удалённый дочерний элемент {0} входит в отношение {1}"
+msgid "Cut"
+msgstr "Вырезать"
+
+msgid "Right click = copy to clipboard"
+msgstr "Щелчок правой кнопкой = копировать в буфер обмена"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "обязательный атрибут ''{0}'' отсутствует"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа long, текущее значение "
+"''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее "
+"значение ''{1}''"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Недопустимое значение для атрибута «{0}» типа double. Получено «{1}»."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа boolean, текущее "
+"значение ''{1}''"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, "
+"текущее значение ''{1}''"
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''."
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Удалённая точка {0} это часть линии {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"Линия {0} с {1} точками содержит незавершённые точки, потому что, по крайней "
+"мере, одна точка отсутствовала в данных, загруженных с сервера."
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+"Отношение с внешним id ''{0}'' обращается к отсутствующему элементу с "
+"внешним id ''{1}''."
+
+msgid "Deleted member {0} is used by relation {1}"
+msgstr "Удалённый дочерний элемент {0} входит в отношение {1}"
msgid "All Formats"
msgstr "Все форматы"
@@ -12132,11 +12480,11 @@ msgid "Contacting OSM Server..."
msgstr "Подключение к серверу OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Предупреждение: неверное значение атрибута ''{0}'' элемента ''{1}'' в "
-"настройках возможностей сервера. Получено ''{2}''"
+"Недопустимое значение атрибута ''{0}'' элемента ''{1}'' в возможностях "
+"сервера, равное ''{2}''"
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''."
@@ -12180,40 +12528,36 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Неправильный номер порта в настройке ''{0}''. Получено {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Предупреждение: найдено неожиданное значение для настройки ''{0}''. Получено "
-"''{1}''. Прокси не будет использоваться."
+"Непредвиденное значение параметра ''{0}'', равное ''{1}''. Прокси "
+"использоваться не будет."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Предупреждение: Неожиданные параметры для прокси HTTP. Получен хост ''{0}'' "
-"и порт ''{1}''."
+"Непредвиденные параметры для HTTP-прокси. Указан хост ''{0}'' и порт ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Предупреждение: Неожиданные параметры для прокси SOCKS. Получен хост ''{0}'' "
-"и порт ''{1}''."
+"Непредвиденные параметры для SOCKS-прокси. Указан хост ''{0}'' и порт "
+"''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Ошибка: Соединение к прокси ''{0}'' по URI ''{1}'' не удалось. Текст ошибки: "
-"{2}"
+"Сбой подключения к прокси-серверу ''{0}'' для URI ''{1}''. Ошибка: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Предупреждение: JVM не настроена на использование системных настроек прокси-"
-"сервера. Свойство ''java.net.useSystemProxies'' отсутствовало в момент "
-"загрузки. Прокси не будет использоваться."
+"JVM не настроена для поиска прокси из системных настроек. Свойство "
+"''java.net.useSystemProxies'' отсутствовало во время запуска. Прокси не "
+"будет использоваться."
msgid "Parsing response from server..."
msgstr "Разбор ответа сервера..."
@@ -12315,6 +12659,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Ошибка разбора: неправильная структура документа gpx"
+msgid "(at line {0}, column {1})"
+msgstr "(строка {0}, столбец {1})"
+
msgid "Unknown mode {0}."
msgstr "Неизвестный режим {0}."
@@ -12330,15 +12677,24 @@ msgstr "Поиск файлов изображений"
msgid "No image files found."
msgstr "Файлы изображений не найдены"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "У вас {0} непрочтённое сообщение."
+msgstr[1] "У вас {0} непрочтённых сообщения."
+msgstr[2] "У вас {0} непрочтённых сообщений."
+
+msgid "Click here to see your inbox."
+msgstr "Щёлкните здесь для просмотра входящих сообщений."
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Невозможно открыть входящий поток для ресурса ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Предупреждение: Не удалось открыть файл с расширением ''{2}'' и именем "
-"''{3}'' в файле архива zip ''{0}''. Сообщение об ошибке: {1}"
+"Не удалось открыть файл с расширением ''{2}'' и именем ''{3}'' в zip-файле "
+"''{0}''. Возникло исключение: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Сбой переименования файла {0} в {1}."
@@ -12425,8 +12781,8 @@ msgstr "Неизвестное выражение: {0}"
msgid "Zero coordinates: {0}"
msgstr "Нулевых координат: {0}"
-msgid "NMEA import success"
-msgstr "Импорт NMEA успешно завершён"
+msgid "NMEA import success:"
+msgstr "Успешный импорт NMEA данных:"
msgid "NMEA import failure!"
msgstr "Сбой при импорте NMEA!"
@@ -12533,48 +12889,15 @@ msgstr "Не найдены данные в файле {0}."
msgid "Open OsmChange file"
msgstr "Открыть файл OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "обязательный атрибут ''{0}'' отсутствует"
-
msgid "Unsupported version: {0}"
msgstr "Неподдерживаемая версия: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа long, текущее значение "
-"''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа long (>=0), текущее "
-"значение ''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-"Недопустимое значение для атрибута «{0}» типа double. Получено «{1}»."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа boolean, текущее "
-"значение ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа OsmPrimitiveType, "
-"текущее значение ''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Предупреждение: неподдерживаемый начальный элемент ''{0}'' в содержимом "
-"пакета правок в позиции ({1},{2}). Пропущено."
+"Не поддерживаемый начальный элемент ''{0}'' в содержимом пакета изменений в "
+"позиции ({1},{2}). Пропуск."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12584,11 +12907,11 @@ msgstr ""
"пределами ''create'', ''modify'', или ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Предупреждение: Неподдерживаемый конечный элемент ''{0}'' в содержимом "
-"пакета правок в позиции ({1},{2}). Пропущено."
+"Не поддерживаемый конечный элемент ''{0}'' в содержимом пакета изменений в "
+"позиции ({1},{2}). Пропуск."
msgid "Parsing changeset content ..."
msgstr "Разбор содержимого пакета правок ..."
@@ -12617,12 +12940,8 @@ msgstr ""
"Не удалось подписать соединение HTTP, используя заголовок аутентификации "
"OAuth"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-"Предупреждение: неожиданное значение настройки ''{0}''. Получено ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(строка {0}, столбец {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Непредвиденное значение параметра ''{0}'', равное ''{1}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Произошла ошибка при сохранении.<br>Ошибка: <br>{0}</html>"
@@ -12634,9 +12953,6 @@ msgstr ""
"<html>Произошла ошибка при восстановлении резервной копии файла.<br>Ошибка: "
"<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Ошибка создания резервного файла. Текст ошибки: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Файлы сервера OSM сжаты с помощью gzip"
@@ -12658,6 +12974,9 @@ msgstr "Нет данных в файле ''{0}''."
msgid "Open OSM file"
msgstr "Открыть файл OSM"
+msgid "Reading was canceled"
+msgstr "Чтение было отменено"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12715,11 +13034,11 @@ msgstr ""
"{1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: Исправление значения атрибута ''version'' для элемента {0} "
-"на {2}, версия API: ''{3}''. Получено {1}."
+"Приведение значения атрибута ''version'' элемента {0} к норме: {2}, Версия "
+"API: ''{3}''. Текущее значение: {1}."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Неизвестная или неподдерживаемая версия API. Получено {0}."
@@ -12875,6 +13194,9 @@ msgstr "Сохранить имя пользователя и пароль (не
msgid "<delete from {0} objects>"
msgstr "<удалить из {0} объектов>"
+msgid "Old values of"
+msgstr "Старые значения"
+
msgid "Add tags to selected objects"
msgstr "Добавить теги к выделенным объектам"
@@ -12893,6 +13215,15 @@ msgstr "Shift+Enter: добавить все теги к выделенным о
msgid "Assume"
msgstr "Присвоить"
+msgid "Existing values"
+msgstr "Существующие значения"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Поставьте флажок чтобы применить значение"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Принять все теги {0} для этой сессии"
+
msgid "Load data from API"
msgstr "Загрузить данные API"
@@ -12917,10 +13248,15 @@ msgstr "Создать новые объекты"
msgid "Read protocol version"
msgstr "Считать версию протокола"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-"Предупреждение: Не удаётся запустить сервер Удалённого управления через порт "
-"{0}: {1}"
+"Не удалось запустить сервер дистанционного управления на порту {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Удалённое управление::Приём подключений на порт {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Удалённое управление::Сервер остановлен."
msgid "Remote Control has been asked to create a new node."
msgstr "Удалённое управление было запросило создание новой точки."
@@ -12928,9 +13264,6 @@ msgstr "Удалённое управление было запросило со
msgid "There is no layer opened to add node"
msgstr "Нет открытого слоя для добавления точки"
-msgid "Add way"
-msgstr "Добавить линию"
-
msgid "Remote Control has been asked to create a new way."
msgstr "Удалённое управление было запросило создание новой линии."
@@ -12940,6 +13273,16 @@ msgstr "Неправильные координаты: {0}"
msgid "There is no layer opened to add way"
msgstr "Нет открытого слоя для добавления линии"
+msgid "Add way"
+msgstr "Добавить линию"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+"Удалённое управление получило запрос о поддерживаемых им функциях. Это "
+"позволяет веб-сайтам узнать о том, какая версия JOSM запущена."
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12954,6 +13297,15 @@ msgstr "Удалённое управление запросило импорт
msgid "Remote Control has been asked to load data from the API."
msgstr "Удалённое управление запросило загрузку данных из API."
+msgid "The latitudes must be between {0} and {1}"
+msgstr "Широта должна быть между {0} и {1}"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "Долгота должна быть между {0} и {1}"
+
+msgid "The minima must be less than the maxima"
+msgstr "Минимум должен быть меньше максимума"
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12989,20 +13341,20 @@ msgstr "Данные:"
msgid "local file"
msgstr "локальный файл"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Ссылка на OSM-файл на локальном диске"
+msgid "Link to a GPX file on your local disk."
+msgstr "Ссылка на GPX-файл на вашем локальном диске."
msgid "include"
msgstr "включить"
-msgid "Include OSM data in the .joz session file."
-msgstr "Включить данные OSM в файл сеанса .joz."
+msgid "Include GPX data in the .joz session file."
+msgstr "Включить данные GPX в файл сеанса .joz."
msgid "No file association"
msgstr "Тип файла не зарегистрирован"
-msgid "OSM data will be included in the session file."
-msgstr "Данные OSM будут включены в файл сеанса."
+msgid "GPX data will be included in the session file."
+msgstr "Данные GPX будут включены в файл сеанса."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -13025,12 +13377,24 @@ msgstr "Слой содержит несохранённые данные - со
msgid "Layer does not contain unsaved data."
msgstr "Слой не содержит несохранённых данных."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Ссылка на OSM-файл на локальном диске"
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Включить данные OSM в файл сеанса .joz."
+
+msgid "OSM data will be included in the session file."
+msgstr "Данные OSM будут включены в файл сеанса."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
"Версия «{0}» метаданных для слоя данных OSM не поддерживается. Ожидалась: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Файл сеанса (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Не удалось найти файл ''{0}''."
@@ -13106,18 +13470,18 @@ msgid "Download skipped"
msgstr "Скачивание пропущено"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Предупреждение: Невозможно скачать с сервера модуль ''{0}''. Неизвестна "
-"ссылка для его скачивания. Скачивание пропущено."
+"Не удалось загрузить модуль ''{0}''. Адрес для его загрузки неизвестен. "
+"Пропуск загрузки."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Предупреждение: Невозможно скачать модуль ''{0}''. Ссылка для его скачивания "
-"''{1}'' не является верной ссылкой. Скачивание пропущено."
+"Не удалось загрузить модуль ''{0}''. Ссылка ''{1}'' не является действующим "
+"URL. Пропуск загрузки."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Не удалось создать каталог модуля ''{0}''"
@@ -13293,12 +13657,11 @@ msgstr[2] ""
msgid "Plugin update failed"
msgstr "Обновление модуля не удалось"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Предупреждение: не удалось найти модуль {0}"
+msgid "Failed to find plugin {0}"
+msgstr "Не удалось найти модуль {0}"
-msgid "Warning: failed to download plugin information list"
-msgstr ""
-"Предупреждение: Не удалось скачать с сервера список информации модуля"
+msgid "Failed to download plugin information list"
+msgstr "Не удалось загрузить список информации о модулях"
msgid "Disable plugin"
msgstr "Отключить модуль"
@@ -13312,29 +13675,28 @@ msgstr "Оставить модуль"
msgid "Click to keep the plugin ''{0}''"
msgstr "Нажмите, чтобы сохранить модуль ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Предупреждение: не удалось удалить устаревший модуль ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Не удалось удалить устаревший модуль ''{0}''."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Предупреждение: Ошибка установки уже скачанного с сервера модуля ''{0}''. "
-"Установка пропущена. JOSM ещё может загрузить старую версию модуля."
+"Не удалось установить загруженный модуль ''{0}''. Пропуск установки. JOSM "
+"загрузит старую версию модуля."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
-"Внимание: не удалось установить модуль ''{0}'' из временного файла загрузки "
-"''{1}''. {2}"
+"Не удалось установить модуль ''{0}'' из временного файла загрузки ''{1}''. "
+"{2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Предупреждение: Не удалось установить модуль ''{0}'' из временно "
-"загруженного файла ''{1}''. Переименование не удалось."
+"Не удалось установить модуль ''{0}'' из временного файла загрузки ''{1}''. "
+"Ошибка переименования."
msgid "Click to disable the plugin ''{0}''"
msgstr "Нажмите, чтобы отменить модуль ''{0}''"
@@ -13408,11 +13770,9 @@ msgstr "Модуль обработки файлов кэша сайта..."
msgid "Processing file ''{0}''"
msgstr "Обработка файла ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Предупреждение: Не удалось просканировать файл ''{0}'' на информацию о "
-"модуле. Пропущено."
+"Не удалось просканировать файл ''{0}'' на информацию о модулях. Пропуск."
msgid "Processing plugin site cache icon files..."
msgstr "Обработка файлов пиктограмм из кэша сайта модулей..."
@@ -13426,12 +13786,27 @@ msgstr "Скачивание с сервера списка модулей..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Скачивание списка модулей с ''{0}''"
+msgid "Plugin list download error"
+msgstr "Ошибка загрузки списка модулей"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM не удалось загрузить список модулей:"
+
+msgid "Details:"
+msgstr "Подробности:"
+
+msgid "Plugin icons download error"
+msgstr "Ошибка загрузки значков модулей"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM не удалось загрузить значки модулей:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Предупреждение: Не удалось создать каталог модуля ''{0}''. Невозможно "
-"записать в кэш список модулей с сайта модулей ''{1}''."
+"Не удалось создать каталог модулей ''{0}''. Ошибка при кэшировании списка "
+"модулей с сайта ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Запись списка модулей в локальный кэш ''{0}''"
@@ -13916,23 +14291,13 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Не удалось найти изображение «{0}»"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Предупреждение: Не удалось обработать файл .zip {0}''. Текст ошибки: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
-"Предупреждение: Ошибка доступа к каталогу ''{0}'' по причине защиты. Текст "
-"ошибки: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Не удалось обработать zip-файл ''{0}''. Возникло исключение: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Предупреждение: Не удалось извлечь префикс языка вики из локального кода "
-"JOSM ''{0}''. Используется код по умолчанию ''en''."
+"Нет доступа к каталогу ''{0}'' по соображениям безопасности. Ошибка: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [пожалуйста, введите его номер]"
@@ -13944,9 +14309,56 @@ msgstr ""
"Не удалось открыть URL. Сейчас не установлена платформа. Пожалуйста, "
"установите тип платформы сначала."
+msgid "Opening URL: {0}"
+msgstr "Открытие URL: {0}"
+
+msgid "zoom"
+msgstr "масштаба"
+
+msgid "latitude"
+msgstr "широты"
+
+msgid "longitude"
+msgstr "долготы"
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr "URL не содержит {0}/{1}/{2}"
+
+msgid "URL does not contain valid {0}"
+msgstr "URL не содержит верного значения {0}"
+
msgid "reserved"
msgstr "зарезервировано"
+msgid "Outdated Java version"
+msgstr "Устаревшая версия Java"
+
+msgid "Update Java"
+msgstr "Обновить Java"
+
+msgid "You are running version {0} of Java."
+msgstr "У вас версия Java {0}."
+
+msgid "February 2013"
+msgstr "февраля 2013 г."
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+"Эта версия больше не поддерживается {0} с {1} и не рекомендуется для "
+"использования."
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+"JOSM скоро перестанет работать с этой версией. Мы настоятельно рекомендуем "
+"выполнить обновление до Java {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Хотите выполнить обновление сейчас?"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Автоустранён конфликт Горячих клавиш: ''{0}'' переназначено с ''{1}'' на "
@@ -13983,8 +14395,23 @@ msgstr ""
"<html><p> Невозможно вставить теги из буфера обмена. Он не содержит объектов "
"JOSM или подходящего текста. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Щелчок правой кнопкой = копировать в буфер обмена"
+msgid "ms"
+msgstr "мс"
+
+msgid "s"
+msgstr "с"
+
+msgid "min"
+msgstr "мин"
+
+msgid "h"
+msgstr "ч"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "день"
+msgstr[1] "дня"
+msgstr[2] "дней"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14330,6 +14757,13 @@ msgid "Saturation:"
msgstr "Насыщенность:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Позволяет редактировать информацию о трафике и экспортировать её в симулятор "
+"городского дорожного движения SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14428,6 +14862,12 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Поиск и исправление неверной нумерации домов удобным образом."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Пообщаться с пользователями, редактирующими карту поблизости, получать "
+"уведомления, когда кто-нибудь окажется рядом."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14465,7 +14905,7 @@ msgstr ""
"кнопки"
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Картографический режим регулирования подложки стиля-WMSPlugin"
+msgstr "Старый режим выранивания подложки (как в бывшем WMSPlugin)"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -14559,9 +14999,6 @@ msgstr "Добавляет запрет поворота налево для н
msgid "Simplifies download from different read-only APIs."
msgstr "Упрощает загрузку из различных API только для чтения."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Простое преобразование полигона в мультиполигон."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Позволяет назначить теги для всех объектов внутри выделенной области за "
@@ -14583,7 +15020,7 @@ msgid ""
"mouse moving (general Java - tablet problem)."
msgstr ""
"Имитирует щелчок, когда вы делаете нажатие и недалеко перетаскиваете. Это "
-"полезно для ручки планшета. Когда у Вас есть проблемы, то просто щёлкните "
+"полезно для ручки планшета. Когда у вас есть проблемы, то просто щёлкните "
"ручкой планшета, без перемещения мыши (основная Java-планшет проблема)."
msgid ""
@@ -14631,6 +15068,9 @@ msgstr ""
"Запись позиции gps в заголовок файла изображения. Включите эту возможность в "
"контекстном меню слоя изображения."
+msgid "Make photos movable and position them on the map."
+msgstr "Делает фотографии перемещаемыми и размещает их на карте."
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14659,9 +15099,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Панель создания и правки мультиполигонов и других отношений"
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Добавляет пункт Перезапустить JOSM в меню Файл"
-
msgid "Plugin for reverting changesets"
msgstr "Модуль для отката пакетов правок"
@@ -14695,9 +15132,6 @@ msgstr ""
"может быть ограничено указанием максимального размера удаляемого фрагмента. "
"Также удаляет близкорасположенные точки."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Создание и правка карт морей для OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Изменений свойств редактирования OpenSeaMap"
@@ -14744,6 +15178,13 @@ msgstr ""
"Нанесение зданий из карты Чешского кадастра. Для запуска необходим "
"TracerServer (.NET или Mono)."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+"Нанесение зданий и других объектов с чешской кадастровой карты. Для работы "
+"необходим Tracer2Server."
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Модуль для цифровой подписи данных OSM"
@@ -14802,9 +15243,6 @@ msgstr ""
"оставляя за ним как-бы-GPS-след и сбивая по пути кактусы. (не загружайте на "
"сервер полученный трек!)"
-msgid "Highways"
-msgstr "Дороги"
-
msgid "Streets"
msgstr "Улицы"
@@ -14889,6 +15327,9 @@ msgstr "Насыпь"
msgid "Lit"
msgstr "Освещённая"
+msgid "Toll"
+msgstr "Платная"
+
msgid "Motorway Link"
msgstr "Съезд с автомагистрали"
@@ -14979,6 +15420,50 @@ msgstr "Местного значения"
msgid "Edit Residential Street"
msgstr "Свойства местной улицы"
+msgid "Bicycle Road"
+msgstr "Велосипедная дорога"
+
+msgid "Edit Bicycle Road"
+msgstr "Свойства велосипедной дороги"
+
+msgid "Highway type"
+msgstr "Тип автомобильной дороги"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "местного значения"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "служебный"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "не классифицировано"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "тропа"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "велосипедная дорожка"
+
+msgid "Vehicle access"
+msgstr "Доступ автотранспорта"
+
+msgid "yes"
+msgstr "да"
+
+msgid "no"
+msgstr "нет"
+
+msgid "destination"
+msgstr "резиденты"
+
+msgid "Oneway for bicycle"
+msgstr "Односторонняя для велосипедов"
+
msgid "Living Street"
msgstr "Жилая улица"
@@ -14997,10 +15482,10 @@ msgstr "Полигон"
msgid "Service"
msgstr "Служебная"
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr "Свойства служебного проезда"
-msgid "Serviceway type"
+msgid "Service way type"
msgstr "Тип служебного проезда"
msgid "alley"
@@ -15012,6 +15497,9 @@ msgstr "подъездная дорожка"
msgid "parking_aisle"
msgstr "парковочный проезд"
+msgid "drive-through"
+msgstr "обслуживание в авто"
+
msgid "Parking Aisle"
msgstr "Проезд на парковке"
@@ -15039,18 +15527,12 @@ msgstr "Круг"
msgid "jughandle"
msgstr "Кувшин ручной"
-msgid "yes"
-msgstr "да"
-
msgid "Road Restrictions"
msgstr "Дорожные ограничения"
msgid "Edit Road Restrictions"
msgstr "Правка дорожных ограничений"
-msgid "Toll"
-msgstr "Платная"
-
msgid "No exit (cul-de-sac)"
msgstr "Тупик"
@@ -15060,9 +15542,6 @@ msgstr "Ограничения режима передвижения"
msgid "General Access"
msgstr "Доступ для всех"
-msgid "destination"
-msgstr "резиденты"
-
msgid "delivery"
msgstr "доставка"
@@ -15072,15 +15551,15 @@ msgstr "разрешено владельцем"
msgid "private"
msgstr "по пропускам"
+msgid "customers"
+msgstr "клиенты"
+
msgid "agricultural"
msgstr "сельскохозяйственное"
msgid "forestry"
msgstr "лесничество"
-msgid "no"
-msgstr "нет"
-
msgid "official"
msgstr "официальное"
@@ -15126,6 +15605,9 @@ msgstr "ТС с пассажирами (hov)"
msgid "Public Service Vehicles (psv)"
msgstr "Общественный транспорт"
+msgid "Tourist buses"
+msgstr "Туристические автобусы"
+
msgid "Min. speed (km/h)"
msgstr "Мин. скорость (в км/ч)"
@@ -15210,8 +15692,11 @@ msgstr "Свойства моста"
msgid "viaduct"
msgstr "виадук"
+msgid "suspension"
+msgstr "подвесной"
+
msgid "swing"
-msgstr "перепад"
+msgstr "поворотный мост"
msgid "aqueduct"
msgstr "акведук"
@@ -15327,20 +15812,29 @@ msgstr ""
msgid "Visibility"
msgstr "Видимость"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "превосходное"
+msgstr "отличная"
+msgctxt "trail_visibility"
msgid "good"
-msgstr "хорошее"
+msgstr "хорошая"
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "средний"
+msgstr "средняя"
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "плохое"
+msgstr "плохая"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "ужасное"
+msgstr "ужасная"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "нет"
msgid "Wheelchairs"
msgstr "Инвалидные коляски"
@@ -15357,11 +15851,11 @@ msgstr "Дорога для верховой езды"
msgid "Edit Bridleway"
msgstr "Свойства дороги для верховой езды"
-msgid "Cycle Lane"
-msgstr "Велосипедная полоса"
+msgid "Cycle Lane/Track"
+msgstr "Велосипедная полоса/дорожка"
-msgid "Edit Cycle Lane"
-msgstr "Свойства велополосы"
+msgid "Edit Cycle Lane or Track"
+msgstr "Свойства велосипедной полосы или дорожки"
msgid "Cycleway"
msgstr "Велодорожка"
@@ -15396,8 +15890,8 @@ msgstr "Велодорожка справа"
msgid "Oneway (bicycle)"
msgstr "одностороннее движение (велосипедов)"
-msgid "Edit Highway"
-msgstr "Свойства дороги"
+msgid "Edit Highway Attributes:"
+msgstr "Свойства дороги:"
msgid "Highway"
msgstr "Дорога"
@@ -15465,12 +15959,18 @@ msgstr "Место для отдыха"
msgid "Edit Rest Area"
msgstr "Свойства Места для отдыха"
-msgid "Emergency Phone"
-msgstr "Телефон экстренного вызова"
+msgid "Drinking Water"
+msgstr "Питьевая вода"
msgid "Traffic Signal"
msgstr "Светофор"
+msgid "Edit Traffic Signal"
+msgstr "Свойства светофора"
+
+msgid "Optional crossing attributes:"
+msgstr "Необязательные атрибуты перехода:"
+
msgid "Pedestrian crossing type"
msgstr "Тип пешеходного перехода"
@@ -15486,15 +15986,6 @@ msgstr "остров"
msgid "unmarked"
msgstr "необозначенный"
-msgid "Cross on horseback"
-msgstr "Разрешён переезд на лошади"
-
-msgid "Cross by bicycle"
-msgstr "Разрешён переезд на велосипеде"
-
-msgid "Crossing attendant"
-msgstr "Под наблюдением постового"
-
msgid "Crossing type name (UK)"
msgstr "Название перехода (Великобритания)"
@@ -15516,6 +16007,15 @@ msgstr "pegasus (для верховой езды)"
msgid "tiger"
msgstr "tiger (нерегулируемый вело-пешеходный)"
+msgid "Crossing attendant"
+msgstr "Под наблюдением постового"
+
+msgid "Cross by bicycle"
+msgstr "Разрешён переезд на велосипеде"
+
+msgid "Cross on horseback"
+msgstr "Разрешён переезд на лошади"
+
msgid "Stop"
msgstr "Стоп"
@@ -15525,6 +16025,9 @@ msgstr "Уступите дорогу"
msgid "Mini-roundabout"
msgstr "Мини-круг"
+msgid "Edit Mini-Roundabout"
+msgstr "Свойства мини-круга"
+
msgid "Direction"
msgstr "Направление"
@@ -15534,11 +16037,8 @@ msgstr "по часовой стрелке"
msgid "Pedestrian Crossing"
msgstr "Пешеходный переход"
-msgid "Edit Crossing"
-msgstr "Свойства перекрёстка"
-
-msgid "Type name (UK)"
-msgstr "Имя типа (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Свойства пешеходного перехода"
msgid "Traffic Calming"
msgstr "Приспособление для ограничения скорости"
@@ -15570,9 +16070,6 @@ msgstr "стол"
msgid "Passing Place"
msgstr "Место разъезда"
-msgid "Edit Passing Place"
-msgstr "Свойства места разъезда"
-
msgid "Turning Circle"
msgstr "Разворотный круг"
@@ -15606,20 +16103,44 @@ msgstr "Википедия"
msgid "Barriers"
msgstr "Преграды"
+msgid "Block"
+msgstr "Бетонный блок"
+
+msgid "Edit Block"
+msgstr "Свойства бетонного блока"
+
+msgid "Allowed traffic:"
+msgstr "Разрешено движение:"
+
+msgid "Material"
+msgstr "Материал"
+
+msgid "stone"
+msgstr "камень"
+
msgid "Bollard"
msgstr "Столбик"
msgid "Edit Bollard"
msgstr "Свойства столбика"
-msgid "Allowed traffic:"
-msgstr "Разрешено движение:"
+msgid "Bollard type"
+msgstr "Тип столбика"
+
+msgid "rising"
+msgstr "поднимающийся"
+
+msgid "removable"
+msgstr "удаляемый"
+
+msgid "plastic"
+msgstr "пластик"
msgid "Cycle Barrier"
msgstr "Преграда для велосипедов"
-msgid "Block"
-msgstr "Бетонный блок"
+msgid "Edit Cycle Barrier"
+msgstr "Свойства преграды для велосипедов"
msgid "Cattle Grid"
msgstr "Лежачая решётка (против скота)"
@@ -15630,6 +16151,9 @@ msgstr "Свойства лежачей решётки"
msgid "Bus Trap"
msgstr "Проезд для автобусов"
+msgid "Edit Bus Trap"
+msgstr "Свойства проезда для автобусов"
+
msgid "Spikes"
msgstr "Шипы"
@@ -15651,44 +16175,88 @@ msgstr "Свойства пограничного контроля"
msgid "Hedge"
msgstr "Живая изгородь"
+msgid "Edit Hedge"
+msgstr "Свойства живой изгороди"
+
+msgid "Height (meters)"
+msgstr "Высота (в метрах)"
+
+msgid "Genus"
+msgstr "Род"
+
+msgid "Species"
+msgstr "Вид"
+
+msgid "Taxon"
+msgstr "Таксон"
+
msgid "Fence"
msgstr "Забор"
+msgid "Edit Fence"
+msgstr "Свойства забора"
+
msgid "barbed_wire"
msgstr "колючая проволока"
-msgid "chain"
+msgid "chain_link"
msgstr "сетка Рабица"
msgid "electric"
msgstr "электричество"
-msgid "hedge"
-msgstr "живая изгородь"
-
msgid "pole"
msgstr "столб"
msgid "split_rail"
msgstr "штакетник"
+msgid "wire"
+msgstr "проволока"
+
+msgid "Guard Rail"
+msgstr "Дорожное ограждение"
+
+msgid "Edit Guard Rail"
+msgstr "Свойства дорожного ограждения"
+
msgid "Wall"
msgstr "Стена"
+msgid "Edit Wall"
+msgstr "Свойства стены"
+
msgid "City Wall"
msgstr "Городская стена"
+msgid "Edit City Wall"
+msgstr "Свойства городской стены"
+
msgid "Retaining Wall"
msgstr "Подпорная стена"
+msgid "Edit Retaining Wall"
+msgstr "Свойства подпорной стены"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Канава"
-msgid "Entrance"
-msgstr "проход"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Свойства канавы"
-msgid "Edit Entrance"
-msgstr "Свойства прохода"
+msgid "Kerb"
+msgstr "Бордюр"
+
+msgid "Edit Kerb"
+msgstr "Свойства бордюра"
+
+msgid "Entrance (barrier opening)"
+msgstr "Проход или проезд (проём в преграде)"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Свойства прохода или проезда (проёма в преграде)"
msgid "Gate"
msgstr "ворота / дверь"
@@ -15720,12 +16288,27 @@ msgstr "Узкая калитка"
msgid "Edit Kissing Gate"
msgstr "Свойства узкой калитки"
+msgid "Chain"
+msgstr "Цепь"
+
+msgid "Edit Chain"
+msgstr "Свойства цепи"
+
msgid "Stile"
msgstr "Ступени через ограду"
msgid "Edit Stile"
msgstr "Свойства ступеней через ограду"
+msgid "ladder"
+msgstr "лестница"
+
+msgid "squeezer"
+msgstr "узкий проход"
+
+msgid "stepover"
+msgstr "перелаз"
+
msgid "Turnstile"
msgstr "Турникет"
@@ -15783,6 +16366,9 @@ msgstr "Дренажный канал"
msgid "Edit Drain"
msgstr "Свойства дренажного канала"
+msgid "Ditch"
+msgstr "Канава"
+
msgid "Edit Ditch"
msgstr "Свойства канавы"
@@ -15792,6 +16378,12 @@ msgstr "Ручей"
msgid "Edit Stream"
msgstr "Свойства ручья"
+msgid "Wadi"
+msgstr "Сухое русло"
+
+msgid "Edit Wadi"
+msgstr "Свойства сухого русла"
+
msgid "Canal"
msgstr "Канал"
@@ -15831,9 +16423,6 @@ msgstr "Свойства дамбы"
msgid "Groyne"
msgstr "Буна"
-msgid "Edit Groyne"
-msgstr "Свойства буны"
-
msgid "Breakwater"
msgstr "Волнорез"
@@ -15867,6 +16456,21 @@ msgstr "Свойства крытого резервуара"
msgid "Edit Water"
msgstr "Свойства водоёма"
+msgid "Water Body"
+msgstr "Водоём"
+
+msgid "lake"
+msgstr "озеро"
+
+msgid "lagoon"
+msgstr "лагуна"
+
+msgid "pond"
+msgstr "пруд"
+
+msgid "reservoir"
+msgstr "водохранилище"
+
msgid "Land"
msgstr "Суша"
@@ -15948,18 +16552,23 @@ msgstr "Свойства причала"
msgid "Cargo"
msgstr "Что перевозит"
+msgctxt "cargo"
msgid "passengers"
msgstr "пассажиры"
+msgctxt "cargo"
msgid "vehicle"
msgstr "транспорт"
+msgctxt "cargo"
msgid "bicycle"
-msgstr "велосипедный"
+msgstr "велосипеды"
+msgctxt "cargo"
msgid "hgv"
-msgstr "тяжелые грузовики"
+msgstr "тяжёлый транспорт"
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr "пассажиры;транспорт"
@@ -16032,8 +16641,11 @@ msgstr "военный"
msgid "tourism"
msgstr "туристический"
-msgid "Service/Type"
-msgstr "Служебная/тип"
+msgid "freight"
+msgstr "грузовой"
+
+msgid "Service type"
+msgstr "Тип служебного пути"
msgid "yard"
msgstr "депо"
@@ -16056,11 +16668,14 @@ msgstr "контактный_провод"
msgid "rail"
msgstr "рельс"
-msgid "Voltage"
-msgstr "Напряжение"
+msgid "Voltage in Volts (V)"
+msgstr "Напряжение в вольтах (В)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Частота в герцах (Гц)"
-msgid "Frequency (Hz)"
-msgstr "Частота (Гц)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -16071,9 +16686,6 @@ msgstr "Узкоколейка"
msgid "Edit Narrow Gauge Rail"
msgstr "Свойства узкоколейки"
-msgid "Types"
-msgstr "Типы"
-
msgid "Monorail"
msgstr "Монорельс"
@@ -16116,18 +16728,56 @@ msgstr "Неиспользуемые пути"
msgid "Edit Disused Railway"
msgstr "Свойства неиспользуемых путей"
-msgid "Optional Types"
-msgstr "Необязательные типы"
-
msgid "Abandoned Rail"
msgstr "Разобранные пути"
+msgid "Edit Abandoned Railway"
+msgstr "Свойства разобранных путей"
+
msgid "Level Crossing"
msgstr "Железнодорожный переезд"
+msgid "Edit Level Crossing"
+msgstr "Свойства железнодорожного переезда"
+
+msgid "Supervised"
+msgstr "Охраняемая"
+
+msgid "Traffic lights"
+msgstr "Светофор"
+
+msgid "Sound signals"
+msgstr "Звуковые сигналы"
+
+msgid "Barrier"
+msgstr "Ограждение"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "да"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "нет"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "половинное"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "полное"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "двойное половинное"
+
msgid "Crossing"
msgstr "Переход через рельсовые пути"
+msgid "Edit Crossing"
+msgstr "Свойства перехода"
+
msgid "Crossing type"
msgstr "Тип перехода"
@@ -16227,11 +16877,9 @@ msgstr "Ленточный подъёмник"
msgid "Edit Magic Carpet"
msgstr "Свойства ленточного подъёмника"
-msgctxt "aerialway"
msgid "Goods"
msgstr "Грузовая"
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr "Свойства грузовой канатной дороги"
@@ -16243,11 +16891,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Свойства станции"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Опора"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Свойства опоры"
@@ -16266,12 +16912,12 @@ msgstr "наземная"
msgid "underground"
msgstr "подземная"
+msgid "rooftop"
+msgstr "крыша"
+
msgid "Access"
msgstr "Доступ"
-msgid "customers"
-msgstr "клиенты"
-
msgid "Park and Ride"
msgstr "Перехватывающая парковка"
@@ -16299,9 +16945,6 @@ msgstr "Парковочное место"
msgid "Edit Parking space"
msgstr "Свойства парковочного места"
-msgid "rooftop"
-msgstr "крыша"
-
msgid "Capacity"
msgstr "Вместимость"
@@ -16317,20 +16960,37 @@ msgstr "Лимит времени (минут)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Охраняемая"
-
msgid "Opening Hours"
msgstr "Часы работы"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
+
+msgid "Sa-Su 00:00-24:00"
+msgstr "Sa-Su 00:00-24:00"
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+
+msgid "sunrise-sunset"
+msgstr "с восхода до заката"
+
+msgid "Su 10:00+"
+msgstr "Su 10:00+"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgid "Parking entrance"
msgstr "Въезд на парковку"
@@ -16479,6 +17139,9 @@ msgstr "Станция зарядки"
msgid "Edit Charging Station (for electric cars)"
msgstr "Свойства станции зарядки электромобилей"
+msgid "Voltage"
+msgstr "Напряжение"
+
msgid "Amperage"
msgstr "Сила тока"
@@ -16500,6 +17163,12 @@ msgstr "Автомастерская"
msgid "Edit Car Repair"
msgstr "Свойства автомастерской"
+msgid "Parts"
+msgstr "Запчасти"
+
+msgid "Edit Car Parts"
+msgstr "Свойства магазина запчастей"
+
msgid "Tyres"
msgstr "Магазин автошин"
@@ -16527,6 +17196,12 @@ msgstr "Прокат"
msgid "Edit Car Rental"
msgstr "Свойства проката автомобилей"
+msgid "Second hand"
+msgstr "Подержанные"
+
+msgid "only"
+msgstr "только"
+
msgid "Sharing"
msgstr "Кратковременный прокат"
@@ -16551,22 +17226,6 @@ msgstr "Услуги:"
msgid "Sale"
msgstr "Точка продаж"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "да"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "марка"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "бывшие в употреблении"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "нет"
-
msgid "brand"
msgstr "марка"
@@ -16588,9 +17247,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Запчасти"
-
msgid "Clothes"
msgstr "Одежда"
@@ -16656,8 +17312,8 @@ msgstr "Свойства велопроката"
msgid "Public Transport"
msgstr "Общественный транспорт"
-msgid "Route"
-msgstr "Маршрут"
+msgid "Public transport route"
+msgstr "Маршрут общественного транспорта"
msgid "Edit Route"
msgstr "Свойства маршрута"
@@ -16787,6 +17443,9 @@ msgstr "Платформа"
msgid "Station or amenities"
msgstr "Станция или услуги"
+msgid "Edit Stop Position"
+msgstr "Свойства места остановки"
+
msgid "Bus"
msgstr "Автобус"
@@ -16817,6 +17476,9 @@ msgstr "Фуникулёр"
msgid "Ferry"
msgstr "Паром"
+msgid "Edit Platform"
+msgstr "Свойства платформы"
+
msgid "Bench"
msgstr "Скамейка"
@@ -16829,9 +17491,6 @@ msgstr "Инвалидное кресло"
msgid "limited"
msgstr "ограничено"
-msgid "only"
-msgstr "только"
-
msgid "Highway platform (legacy)"
msgstr "Остановка общественного транспорта (устар.)"
@@ -16841,9 +17500,14 @@ msgstr "Железнодорожная платформа (устаревший
msgid "funicular"
msgstr "фуникулёр"
+msgctxt "railway"
msgid "Station"
msgstr "Станция"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Свойства станции"
+
msgid "Building"
msgstr "Здание"
@@ -16856,6 +17520,9 @@ msgstr "Свойства входа в метро"
msgid "Ticket Machine"
msgstr "Автомат для покупки билетов"
+msgid "Edit Ticket Machine"
+msgstr "Свойства автомата для покупки билетов"
+
msgid "Reference Number"
msgstr "Номер для обращения"
@@ -16880,14 +17547,6 @@ msgstr "накопительные, дисконтные карты"
msgid "Public Transport (legacy)"
msgstr "Общественный транспорт (устаревший формат)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Станция"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Свойства станции"
-
msgid "UIC-Reference"
msgstr "код UIC"
@@ -16936,7 +17595,7 @@ msgstr "Свойства автобусной платформы"
msgid "Taxi"
msgstr "Такси"
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr "Свойства стоянки такси"
msgid "Airport"
@@ -16990,6 +17649,21 @@ msgstr "Терминал"
msgid "Edit Terminal"
msgstr "Свойства терминала"
+msgid "Internet access"
+msgstr "Точка доступа в интернет"
+
+msgid "wlan"
+msgstr "беспроводная сеть"
+
+msgid "wired"
+msgstr "проводной доступ в сеть"
+
+msgid "terminal"
+msgstr "пассажирский терминал"
+
+msgid "Internet access fee"
+msgstr "Платный доступ в интернет"
+
msgctxt "airport"
msgid "Gate"
msgstr "Выход на посадку"
@@ -17012,21 +17686,6 @@ msgstr "Свойства гостиницы"
msgid "Stars"
msgstr "Звёзды"
-msgid "Internet access"
-msgstr "Точка доступа в интернет"
-
-msgid "wlan"
-msgstr "беспроводная сеть"
-
-msgid "wired"
-msgstr "проводной доступ в сеть"
-
-msgid "terminal"
-msgstr "пассажирский терминал"
-
-msgid "Internet access fee"
-msgstr "Платный доступ в интернет"
-
msgid "Smoking"
msgstr "С местами для курения"
@@ -17210,6 +17869,12 @@ msgstr "Ночной клуб"
msgid "Edit Nightclub"
msgstr "Свойства ночного клуба"
+msgid "Stripclub"
+msgstr "Стриптиз-клуб"
+
+msgid "Edit Stripclub"
+msgstr "Свойства стриптиз-клуба"
+
msgid "Tourism"
msgstr "Туризм"
@@ -17231,9 +17896,15 @@ msgstr "Наблюдательная вышка"
msgid "Information Office"
msgstr "Справочное бюро"
+msgid "Edit Information Office"
+msgstr "Свойства справочного бюро"
+
msgid "Map"
msgstr "Карта"
+msgid "Edit Information Map"
+msgstr "Свойства информационной карты"
+
msgid "Detail Grade"
msgstr "Тип карты"
@@ -17246,6 +17917,9 @@ msgstr "карта улиц"
msgid "scheme"
msgstr "план-схема"
+msgid "toposcope"
+msgstr "топоскоп"
+
msgid "Shown Area"
msgstr "Показанная область"
@@ -17285,6 +17959,9 @@ msgstr "...другие возможные способы передвижени
msgid "Information Board"
msgstr "Информационный стенд"
+msgid "Edit Information Board"
+msgstr "Свойства информационного стенда"
+
msgid "Board Content"
msgstr "Содержимое указателя"
@@ -17306,23 +17983,35 @@ msgstr "растения"
msgid "Guidepost"
msgstr "Указатель направлений"
+msgid "Edit Guidepost"
+msgstr "Свойства указателя направлений"
+
msgid "Information Terminal"
msgstr "Информационная стойка"
+msgid "Edit Information Terminal"
+msgstr "Свойства информационной стойки"
+
msgid "Closer description"
msgstr "Подробное описание"
msgid "Audioguide"
msgstr "Аудиогид"
+msgid "Edit Audioguide"
+msgstr "Свойства аудиогида"
+
msgid "Audioguide via mobile phone?"
msgstr "Аудиогид через мобильный телефон?"
msgid "Phone number"
msgstr "Номер телефона"
-msgid "Other Information Points"
-msgstr "Другие справочные бюро"
+msgid "Other Information Point"
+msgstr "Другая информационная точка"
+
+msgid "Edit Information Point"
+msgstr "Свойства информационной точки"
msgid "Leisure"
msgstr "Досуг"
@@ -17345,9 +18034,6 @@ msgstr "Площадка для выгула собак"
msgid "Edit Dog Park"
msgstr "Свойства площадки для выгула собак"
-msgid "Barrier"
-msgstr "Ограждение"
-
msgid "fence"
msgstr "забор"
@@ -17372,8 +18058,17 @@ msgstr "Сауна"
msgid "Edit Sauna"
msgstr "Свойства сауны"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr "Верховая езда"
+
+msgid "Edit Horse riding"
+msgstr "Свойства верховой езды"
+
+msgid "Brothel"
+msgstr "Бордель"
+
+msgid "Edit Brothel"
+msgstr "Свойства борделя"
msgid "Playground"
msgstr "Игровая площадка"
@@ -17445,50 +18140,44 @@ msgstr "Произведения искусства"
msgid "Edit Artwork"
msgstr "Свойства произведений искусств"
-msgid "Place of Worship"
-msgstr "Культовое место"
+msgid "Recording Studio"
+msgstr "Студия звукозаписи"
-msgid "Edit Place of Worship"
-msgstr "Свойства культового места"
+msgid "Edit Studio"
+msgstr "Свойства студии звукозаписи"
-msgid "Religion"
-msgstr "Религия"
+msgid "audio"
+msgstr "аудио"
-msgid "bahai"
-msgstr "бахаи"
-
-msgid "buddhist"
-msgstr "буддизм"
-
-msgid "christian"
-msgstr "христианство"
+msgid "video"
+msgstr "видео"
-msgid "hindu"
-msgstr "индуизм"
+msgid "Place of Worship"
+msgstr "Культовое место"
-msgid "jain"
-msgstr "джайнизм"
+msgid "Church"
+msgstr "Церковь"
-msgid "jewish"
-msgstr "иудаизм"
+msgid "Edit Church"
+msgstr "Свойства церкви"
-msgid "muslim"
-msgstr "ислам"
+msgid "Building type"
+msgstr "Тип здания"
-msgid "sikh"
-msgstr "сикхизм"
+msgid "basilica"
+msgstr "базилика"
-msgid "spiritualist"
-msgstr "спиритуализм"
+msgid "cathedral"
+msgstr "собор"
-msgid "taoist"
-msgstr "даосизм"
+msgid "chapel"
+msgstr "часовня"
-msgid "unitarian"
-msgstr "унитарианство"
+msgid "church"
+msgstr "церковь"
-msgid "zoroastrian"
-msgstr "зороастризм"
+msgid "temple"
+msgstr "храм"
msgid "Denomination"
msgstr "Конфессия"
@@ -17505,6 +18194,12 @@ msgstr "католики"
msgid "evangelical"
msgstr "евангелисты"
+msgid "greek_catholic"
+msgstr "восточнокатолическая"
+
+msgid "greek_orthodox"
+msgstr "греческое православие"
+
msgid "jehovahs_witness"
msgstr "свидетели Иеговы"
@@ -17517,6 +18212,9 @@ msgstr "методисты"
msgid "mormon"
msgstr "мормоны"
+msgid "new_apostolic"
+msgstr "новоапостольская церковь"
+
msgid "orthodox"
msgstr "православные"
@@ -17532,38 +18230,142 @@ msgstr "протестанты"
msgid "quaker"
msgstr "квакеры"
+msgid "roman_catholic"
+msgstr "римско-католическая"
+
+msgid "russian_orthodox"
+msgstr "русское православие"
+
+msgid "seventh_day_adventist"
+msgstr "адвентисты седьмого дня"
+
+msgid "Service Times"
+msgstr "Часы служб"
+
+msgid "18:00"
+msgstr "18:00"
+
+msgid "sunset,sunrise"
+msgstr "закат,восход"
+
+msgid "Su 9:30,11:00"
+msgstr "Вс 9:30,11:00"
+
+msgid "Sa,Su,PH 9:00"
+msgstr "Сб, Вс, праздничные дни 9:00"
+
+msgid "Sa 18:00; Su 10:45"
+msgstr "Sa 18:00; Su 10:45"
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+
+msgid "Sa 10:00+"
+msgstr "Сб 10:00+"
+
+msgid "Mosque"
+msgstr "Мечеть"
+
+msgid "Edit Mosque"
+msgstr "Свойства мечети"
+
+msgid "mosque"
+msgstr "мечеть"
+
+msgid "ibadi"
+msgstr "ибадиты"
+
msgid "shia"
msgstr "шииты"
msgid "sunni"
msgstr "сунниты"
-msgid "Service Times"
-msgstr "Часы служб"
+msgid "Synagogue"
+msgstr "Синагога"
-msgid "Su 10:00"
-msgstr "Su 10:00"
+msgid "Edit Synagogue"
+msgstr "Свойства синагоги"
-msgid "Su 10:30"
-msgstr "Su 10:30"
+msgid "synagogue"
+msgstr "синагога"
-msgid "Su 11:00"
-msgstr "Su 11:00"
+msgid "conservative"
+msgstr "консервативный"
-msgid "Opening Hours for visiting"
-msgstr "Часы посещений"
+msgid "reform"
+msgstr "реформистский"
-msgid "Recording Studio"
-msgstr "Студия звукозаписи"
+msgid "Buddhist Temple"
+msgstr "Буддистский храм"
-msgid "Edit Studio"
-msgstr "Свойства студии звукозаписи"
+msgid "Edit Buddhist Temple"
+msgstr "Свойства буддистского храма"
-msgid "audio"
-msgstr "аудио"
+msgid "theravada"
+msgstr "тхеравада"
-msgid "video"
-msgstr "видео"
+msgid "mahayana"
+msgstr "махаяна"
+
+msgid "vajrayana"
+msgstr "ваджраяна"
+
+msgid "Hindu Temple"
+msgstr "Индуистский храм"
+
+msgid "Edit Hindu Temple"
+msgstr "Свойства индуистского храма"
+
+msgid "vaishnavism"
+msgstr "вайшнавизм"
+
+msgid "shaivism"
+msgstr "шиваизм"
+
+msgid "shaktism"
+msgstr "шактизм"
+
+msgid "smartism"
+msgstr "смартизм"
+
+msgid "Shinto Shrine"
+msgstr "Святилище синто"
+
+msgid "Edit Shinto Shrine"
+msgstr "Свойства святилища синто"
+
+msgid "Other Place of Worship"
+msgstr "Другое культовое место"
+
+msgid "Edit other Place of Worship"
+msgstr "Свойства другого культового места"
+
+msgid "Religion"
+msgstr "Религия"
+
+msgid "bahai"
+msgstr "бахаи"
+
+msgid "jain"
+msgstr "джайнизм"
+
+msgid "sikh"
+msgstr "сикхизм"
+
+msgid "spiritualist"
+msgstr "спиритуализм"
+
+msgid "taoist"
+msgstr "даосизм"
+
+msgid "unitarian"
+msgstr "унитарианство"
+
+msgid "zoroastrian"
+msgstr "зороастризм"
msgid "Public Building"
msgstr "Общественное здание"
@@ -17652,6 +18454,12 @@ msgstr "Свойства Автошколы"
msgid "License Classes"
msgstr "Категории"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Здравоохранение"
@@ -17661,6 +18469,12 @@ msgstr "Больница"
msgid "Edit Hospital"
msgstr "Свойства больницы"
+msgid "Clinic"
+msgstr "Клиника"
+
+msgid "Edit Clinic"
+msgstr "Свойства клиники"
+
msgid "Doctors"
msgstr "Врач"
@@ -17727,12 +18541,66 @@ msgstr "Ветеринария"
msgid "Edit Veterinary"
msgstr "Свойства ветеринарии"
-msgid "Note"
-msgstr "Примечание"
+msgid "Edit Toilets"
+msgstr "Свойства туалета"
+
+msgid "Access rights"
+msgstr "Права доступа"
+
+msgid "public"
+msgstr "общедоступное"
+
+msgid "seasonal"
+msgstr "в зависимости от сезона"
+
+msgid "flush"
+msgstr "смывной"
+
+msgid "pitlatrine"
+msgstr "ямный туалет"
+
+msgid "chemical"
+msgstr "химический"
+
+msgid "bucket"
+msgstr "ведро"
+
+msgid "Usage Position"
+msgstr "Положение"
+
+msgid "seated"
+msgstr "сидячее"
+
+msgid "seated;urinal"
+msgstr "сидячее;писуар"
+
+msgid "squat"
+msgstr "напольный унитаз"
+
+msgid "urinal"
+msgstr "писуар"
msgid "Post Box"
msgstr "Почтовый ящик"
+msgid "Edit Postbox"
+msgstr "Свойства почтового ящика"
+
+msgid "Collection times"
+msgstr "Время выемки писем"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+
+msgid "Drive through"
+msgstr "Доступен не выходя из автомобиля"
+
msgid "Telephone"
msgstr "Телефон"
@@ -17742,6 +18610,30 @@ msgstr "Свойства телефона"
msgid "Telephone cards"
msgstr "Телефонные карты"
+msgid "Emergency Phone"
+msgstr "Телефон экстренного вызова"
+
+msgid "Internet Access"
+msgstr "Доступ в интернет"
+
+msgid "Edit Internet Access"
+msgstr "Свойства доступа в интернет"
+
+msgid "Automated Defibrillator"
+msgstr "Автоматизированный дефибриллятор"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Свойства автоматизированного дефибрилятора"
+
+msgid "Located inside a building?"
+msgstr "Расположен внутри здания?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Дата последней проверки (ГГГГ-ММ-ДД)"
+
+msgid "Last check note"
+msgstr "Замечания последней проверки"
+
msgid "Clock"
msgstr "Часы"
@@ -17751,30 +18643,36 @@ msgstr "Свойства часов"
msgid "Display"
msgstr "Дисплей"
-msgctxt "display"
msgid "analog"
-msgstr "стрелочные"
+msgstr "стрелочный"
-msgctxt "display"
msgid "digital"
-msgstr "цифровые"
+msgstr "цифровой"
-msgctxt "display"
msgid "sundial"
-msgstr "солнечные"
+msgstr "солнечные часы"
-msgctxt "display"
msgid "unorthodox"
-msgstr "нестандартные"
+msgstr "нестандартный"
msgid "Support"
msgstr "Крепление"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "на столбе"
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "настенное"
+msgstr "на стене"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "рекламный щит"
+msgstr "на рекламном щите"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "наземные"
msgid "Visibility/readability"
msgstr "Контрастность/четкость"
@@ -17803,7 +18701,7 @@ msgstr "Показывают влажность"
msgid "Recycling"
msgstr "Пункт приёма утильсырья"
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr "Свойства пункта приёма утильсырья"
msgid "Batteries"
@@ -17830,27 +18728,15 @@ msgstr "организация"
msgid "Waste Basket"
msgstr "Урна для мусора"
-msgid "Edit Waste Basket"
-msgstr "Свойства урны для мусора"
-
msgid "Waste Disposal"
msgstr "Мусорный контейнер"
-msgid "Edit Waste Disposal"
-msgstr "Свойства мусорного контейнера"
+msgid "Edit Bench"
+msgstr "Свойства скамейки"
msgid "Backrest"
msgstr "Спинка"
-msgid "Material"
-msgstr "Материал"
-
-msgid "stone"
-msgstr "камень"
-
-msgid "plastic"
-msgstr "пластик"
-
msgid "Amount of Seats"
msgstr "Количество мест"
@@ -17885,12 +18771,15 @@ msgstr "Свойства охотничьей вышки"
msgid "Height"
msgstr "Высота"
+msgctxt "height"
msgid "low"
msgstr "низкая"
+msgctxt "height"
msgid "half"
msgstr "половинная"
+msgctxt "height"
msgid "full"
msgstr "полная"
@@ -17900,11 +18789,11 @@ msgstr "Скрытая"
msgid "Lock"
msgstr "Запирается"
-msgid "Drinking Water"
-msgstr "Питьевая вода"
+msgid "Edit Source of Potable Water"
+msgstr "Свойства источника питьевой воды"
-msgid "Edit Drinking Water"
-msgstr "Свойства питьевой воды"
+msgid "Indoor"
+msgstr "В помещении"
msgid "Fire Hydrant"
msgstr "Пожарный кран"
@@ -17931,6 +18820,9 @@ msgstr "у водоёма"
msgid "Diameter (in mm)"
msgstr "Диаметр (в мм)"
+msgid "Hydrant Position"
+msgstr "Расположение"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "переулок"
@@ -17968,117 +18860,153 @@ msgstr "Стадион"
msgid "Edit Stadium"
msgstr "Свойства стадиона"
-msgid "select sport:"
-msgstr "вид спорта:"
+msgid "Select sport:"
+msgstr "Выберите спорт:"
-msgid "sport"
-msgstr "спорт"
+msgid "Sport"
+msgstr "Спорт"
+msgctxt "sport"
msgid "multi"
msgstr "несколько"
+msgctxt "sport"
msgid "archery"
msgstr "стрельба из лука"
+msgctxt "sport"
msgid "athletics"
msgstr "атлетика"
+msgctxt "sport"
msgid "american_football"
-msgstr "американский_футбол"
+msgstr "американский футбол"
+msgctxt "sport"
msgid "australian_football"
msgstr "австралийский футбол"
+msgctxt "sport"
msgid "baseball"
msgstr "бейсбол"
+msgctxt "sport"
msgid "basketball"
msgstr "баскетбол"
+msgctxt "sport"
msgid "boules"
-msgstr "бочче"
+msgstr "бул"
+msgctxt "sport"
msgid "bowls"
msgstr "боулз"
+msgctxt "sport"
msgid "canadian_football"
-msgstr "канадский_футбол"
+msgstr "канадский футбол"
+msgctxt "sport"
msgid "canoe"
-msgstr "гребля на каноэ/каяке"
+msgstr "байдарки и каяки"
+msgctxt "sport"
msgid "climbing"
msgstr "скалолазание"
+msgctxt "sport"
msgid "cricket"
msgstr "крикет"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "тренировочные сетки для крикета"
+msgstr "сетки для тренировок по крикету"
+msgctxt "sport"
msgid "croquet"
msgstr "крокет"
+msgctxt "sport"
msgid "cycling"
msgstr "велоспорт"
+msgctxt "sport"
msgid "dog_racing"
msgstr "собачьи бега"
+msgctxt "sport"
msgid "equestrian"
-msgstr "конный спорт"
+msgstr "верховая езда"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "гаэльские игры"
+msgstr "гэльские игры"
+msgctxt "sport"
msgid "golf"
msgstr "гольф"
+msgctxt "sport"
msgid "gymnastics"
msgstr "гимнастика"
+msgctxt "sport"
msgid "hockey"
msgstr "хоккей"
+msgctxt "sport"
msgid "horse_racing"
-msgstr "лошадиные бега"
+msgstr "скачки на лошадях"
+msgctxt "sport"
msgid "motor"
-msgstr "моторный спорт"
+msgstr "автомотоспорт"
+msgctxt "sport"
msgid "pelota"
msgstr "пелота"
+msgctxt "sport"
msgid "racquet"
-msgstr "ракетбол"
+msgstr "игры с ракетками"
+msgctxt "sport"
msgid "rugby_league"
-msgstr "лига_регби"
+msgstr "регби-лиг (регби-13)"
+msgctxt "sport"
msgid "rugby_union"
-msgstr "объединение_регби"
+msgstr "регби-юнион (регби-15)"
+msgctxt "sport"
msgid "shooting"
msgstr "стрельба"
+msgctxt "sport"
msgid "skateboard"
msgstr "скейтборд"
+msgctxt "sport"
msgid "skating"
-msgstr "фигурное катание"
+msgstr "коньки"
+msgctxt "sport"
msgid "skiing"
-msgstr "лыжный спорт"
+msgstr "лыжи"
+msgctxt "sport"
msgid "soccer"
msgstr "футбол"
+msgctxt "sport"
msgid "swimming"
msgstr "плавание"
+msgctxt "sport"
msgid "table_tennis"
msgstr "настольный теннис"
+msgctxt "sport"
msgid "tennis"
msgstr "теннис"
@@ -18112,33 +19040,43 @@ msgstr "Поле для минигольфа"
msgid "Edit Miniature Golf"
msgstr "Свойства поля для минигольфа"
-msgid "Sport"
-msgstr "Спорт"
-
msgid "Multi"
msgstr "Многоборье"
msgid "Edit Multi"
msgstr "Править Многоборье"
-msgid "type"
-msgstr "вид"
-
+msgctxt "running"
msgid "pitch"
msgstr "спортивное поле"
+msgctxt "running"
msgid "sports_centre"
msgstr "спортивный центр"
+msgctxt "running"
msgid "stadium"
msgstr "стадион"
+msgctxt "running"
+msgid "track"
+msgstr "дорожка"
+
msgid "9pin"
msgstr "Боулинг (9-кегельный)"
msgid "Edit 9pin"
msgstr "Свойства боулинга"
+msgid "pitch"
+msgstr "спортивное поле"
+
+msgid "sports_centre"
+msgstr "спортивный центр"
+
+msgid "stadium"
+msgstr "стадион"
+
msgid "10pin"
msgstr "Боулинг (10-кегельный)"
@@ -18172,6 +19110,22 @@ msgstr "Свойства Гребли на каноэ/каяке"
msgid "Edit Cycling"
msgstr "Свойства велоспорта"
+msgctxt "racing"
+msgid "pitch"
+msgstr "спортивное поле"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "спортивный центр"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "стадион"
+
+msgctxt "racing"
+msgid "track"
+msgstr "трек"
+
msgid "Dog Racing"
msgstr "Собачьи бега"
@@ -18184,8 +19138,33 @@ msgstr "Конный спорт"
msgid "Edit Equestrian"
msgstr "Править конный спорт"
-msgid "horse_riding"
-msgstr "верховая езда"
+msgctxt "riding"
+msgid "pitch"
+msgstr "спортивное поле"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "спортивный центр"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "стадион"
+
+msgctxt "riding"
+msgid "track"
+msgstr "трек"
+
+msgid "clay"
+msgstr "глина"
+
+msgid "dirt"
+msgstr "грунт"
+
+msgid "fine_gravel"
+msgstr "мелкий гравий"
+
+msgid "mud"
+msgstr "грязь"
msgid "Horse Racing"
msgstr "Лошадиные бега"
@@ -18247,38 +19226,56 @@ msgstr "снежный парк"
msgid "Difficulty"
msgstr "Сложность"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "начальный"
+msgstr "для новичков"
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "лёгкий"
+msgstr "простая"
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "средняя"
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "сложный"
+msgstr "усложнённая"
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "очень сложный"
+msgstr "для экспертов"
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr "фрирайд"
msgid "Grooming"
msgstr "Подготовка"
+msgctxt "piste:grooming"
msgid "classic"
-msgstr "классика"
+msgstr "для классического хода"
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "могул"
+msgstr "для могула"
+
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "для конькового хода"
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "классика;свободный стиль"
+msgstr "для классического и конькового хода"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "скутер"
+msgstr "проложена снегоходом"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "бэккантри"
+msgstr "без подготовки"
msgid "Shooting"
msgstr "Стрельба"
@@ -18319,21 +19316,17 @@ msgstr "Гэльские игры"
msgid "Edit Gaelic Games"
msgstr "Свойства гаэльских игр"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr "Ирландский хоккей на траве (хёрлинг)"
+msgstr "Хёрлинг"
-msgctxt "gaelic game"
msgid "Football"
msgstr "Футбол"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Камоги"
-msgctxt "gaelic game"
msgid "Rounders"
-msgstr "Английская лапта (раундерс)"
+msgstr "Английская лапта"
msgid "Rugby League"
msgstr "Лига регби"
@@ -18470,6 +19463,18 @@ msgstr "Авиамодельный спорт"
msgid "Edit Model Aerodrome"
msgstr "Свойства объекта авиамодельного спорта"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "спортивное поле"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "спортивный центр"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "дорожка"
+
msgid "RC Car"
msgstr "Машинка на дистанционном управлении"
@@ -18482,78 +19487,149 @@ msgstr "Рукотворное"
msgid "Edit Building"
msgstr "Свойства здания"
+msgctxt "building"
+msgid "yes"
+msgstr "да"
+
+msgctxt "building"
msgid "roof"
-msgstr "крыша"
+msgstr "крыша или навес"
+msgctxt "building"
msgid "garage"
msgstr "гараж"
-msgid "church"
-msgstr "церковь"
+msgctxt "building"
+msgid "garages"
+msgstr "гаражи"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "промышленное"
+msgctxt "building"
msgid "school"
msgstr "школа"
+msgctxt "building"
msgid "hangar"
msgstr "ангар"
+msgctxt "building"
msgid "commercial"
-msgstr "коммерческое"
+msgstr "место деловой активности"
+msgctxt "building"
msgid "farm"
msgstr "ферма"
+msgctxt "building"
msgid "transportation"
-msgstr "транспорт"
+msgstr "грузоперевозки"
+msgctxt "building"
msgid "greenhouse"
msgstr "теплица"
+msgctxt "building"
msgid "office"
msgstr "офис"
+msgctxt "building"
msgid "university"
msgstr "университет"
+msgctxt "building"
+msgid "hospital"
+msgstr "больница"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "склад"
+
+msgctxt "building"
+msgid "retail"
+msgstr "розничная торговля"
+
+msgctxt "building"
+msgid "shed"
+msgstr "сарай"
+
msgid "Residential Building"
msgstr "Жилое здание"
msgid "Edit Residential Building"
msgstr "Свойства жилого здания"
+msgctxt "building"
+msgid "residential"
+msgstr "жилое"
+
+msgctxt "building"
msgid "apartments"
msgstr "многоквартирный жилой дом"
+msgctxt "building"
msgid "house"
-msgstr "дом"
+msgstr "индивидуальный жилой дом"
+msgctxt "building"
msgid "hut"
msgstr "хижина"
+msgctxt "building"
+msgid "dormitory"
+msgstr "общежитие"
+
+msgctxt "building"
msgid "terrace"
-msgstr "терраса"
+msgstr "ряд стандартных домиков"
+msgctxt "building"
msgid "detached"
-msgstr "отдельно стоящее"
+msgstr "отдельно стоящий дом"
-msgid "Tower"
-msgstr "Башня"
+msgid "Entrance"
+msgstr "проход"
-msgid "Edit Tower"
-msgstr "Свойства башни"
+msgid "Edit Entrance"
+msgstr "Свойства прохода"
-msgid "Tower type"
-msgstr "Назначение башни"
+msgctxt "entrance"
+msgid "yes"
+msgstr "да"
-msgid "communication"
+msgctxt "entrance"
+msgid "main"
+msgstr "главный"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "служебный"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "выход"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "аварийный выход"
+
+msgid "Tower"
+msgstr "Башня"
+
+msgid "Edit Tower"
+msgstr "Свойства башни"
+
+msgid "Tower type"
+msgstr "Назначение башни"
+
+msgid "communication"
msgstr "связная"
msgid "observation"
msgstr "наблюдательная"
-msgid "Height (meters)"
-msgstr "Высота (в метрах)"
-
msgid "Flagpole"
msgstr "Флагшток"
@@ -18763,42 +19839,68 @@ msgstr "Время работы"
msgid "Mo-Fr 22:00-05:00"
msgstr "Mo-Fr 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Измерительный пункт"
+msgid "Monitoring Station"
+msgstr "Станция наблюдения"
-msgid "Edit Measurement Station"
-msgstr "Свойства измерительного пункта"
+msgid "Edit Monitoring Station"
+msgstr "Свойства станции наблюдения"
-msgid "Measurement"
-msgstr "Измеряемые параметры"
+msgid "Monitoring:"
+msgstr "Наблюдение за:"
-msgid "particulate_matter"
-msgstr "загрязнение воздуха"
+msgid "Weather"
+msgstr "Погодой"
-msgid "seismic"
-msgstr "сейсмика"
+msgid "Water level"
+msgstr "Уровнем воды"
-msgid "water_level"
-msgstr "уровень воды"
+msgid "Tide Level"
+msgstr "Уровнем прилива"
-msgid "weather"
-msgstr "погода"
+msgid "Traffic"
+msgstr "Дорожным движением"
-msgid "Recording"
-msgstr "Регистрация данных"
+msgid "Air Quality"
+msgstr "Чистотой воздуха"
-msgid "manually"
-msgstr "вручную"
+msgid "Noise"
+msgstr "Шумом"
-msgid "automated"
-msgstr "автоматически"
+msgid "GPS Signals"
+msgstr "Сигналами GPS"
-msgid "remote"
-msgstr "удалённо"
+msgid "GLONASS Signals"
+msgstr "Сигналами GLONASS"
-msgctxt "display"
-msgid "no"
-msgstr "нет"
+msgid "Galileo Signals"
+msgstr "Сигналами Galileo"
+
+msgid "Radiation"
+msgstr "Радиацией"
+
+msgid "Seismic Activity"
+msgstr "Сейсмической активностью"
+
+msgid "Recording:"
+msgstr "Запись::"
+
+msgid "Automated"
+msgstr "Автоматическая"
+
+msgid "Manually"
+msgstr "Вручную"
+
+msgid "Remote"
+msgstr "Дистанционная"
+
+msgid "Display:"
+msgstr "Интерфейс:"
+
+msgid "Analog"
+msgstr "Аналоговый"
+
+msgid "Digital"
+msgstr "Цифровой"
msgid "Survey Point"
msgstr "Геодезический пункт"
@@ -18806,8 +19908,8 @@ msgstr "Геодезический пункт"
msgid "Edit Survey Point"
msgstr "Свойства геодезического пункта"
-msgid "Surveillance"
-msgstr "Камера наблюдения"
+msgid "Surveillance Camera"
+msgstr "Камера видеонаблюдения"
msgid "Edit Surveillance Camera"
msgstr "Свойства камеры наблюдения"
@@ -18818,12 +19920,102 @@ msgstr "внутренняя"
msgid "outdoor"
msgstr "внешняя"
-msgid "public"
-msgstr "общедоступное"
+msgid "Zone"
+msgstr "Область наблюдения"
+
+msgid "parking"
+msgstr "парковка"
+
+msgid "traffic"
+msgstr "дорожное движение"
+
+msgid "shop"
+msgstr "магазин"
+
+msgid "bank"
+msgstr "банк"
+
+msgid "Camera"
+msgstr "Камера"
+
+msgid "fixed"
+msgstr "неподвижная"
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr "купольная"
+
+msgid "Mounted on"
+msgstr "Установлена на"
+
+msgid "ceiling"
+msgstr "потолок"
+
+msgid "Direction in degrees"
+msgstr "Направление в градусах"
+
+msgid "Inclination in degrees"
+msgstr "Наклон в градусах"
+
+msgid "Height in meter (m)"
+msgstr "Высота в метрах (м)"
msgid "Power"
msgstr "Электроэнергия"
+msgid "Power Plant"
+msgstr "Энергостанция"
+
+msgid "Edit Power Plant"
+msgstr "Свойства энергостанции"
+
+msgid "Start date"
+msgstr "Дата запуска"
+
+msgid "Output forms of energy"
+msgstr "Вид генерируемой энергии"
+
+msgid "(please add this information to the generators if possible)"
+msgstr "(пожалуйста, добавьте эту информацию для генераторов, если возможно)"
+
+msgid "electricity"
+msgstr "электричество"
+
+msgid "2 W"
+msgstr "2 Вт"
+
+msgid "3 kW"
+msgstr "3 кВт"
+
+msgid "5 MW"
+msgstr "5 МВт"
+
+msgid "7 GW"
+msgstr "7 ГВт"
+
+msgid "hot water"
+msgstr "горячая вода"
+
+msgid "hot air"
+msgstr "горячий воздух"
+
+msgid "cold water"
+msgstr "холодная вода"
+
+msgid "cold air"
+msgstr "холодный воздух"
+
+msgid "compressed air"
+msgstr "сжатый воздух"
+
+msgid "steam"
+msgstr "пар"
+
+msgid "vacuum"
+msgstr "вакуум"
+
msgid "Power Generator"
msgstr "Электростанция"
@@ -18875,99 +20067,219 @@ msgstr "ветряная"
msgid "Method"
msgstr "Способ"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "анаэробное_сбраживание"
+msgstr "анаэробное сбраживание"
+msgctxt "generator method"
+msgid "barrage"
+msgstr "плотина"
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "сжигание"
+msgstr "сгорание"
-msgid "dam"
-msgstr "дамба"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "биотопливо / уголь / дизтопливо / газ / бензин / масло / отходы"
+msgctxt "generator method"
msgid "fission"
-msgstr "деление"
+msgstr "деление ядер"
+msgctxt "generator method"
msgid "fusion"
-msgstr "термоядерное слияние"
+msgstr "синтез"
+msgctxt "generator method"
msgid "gasification"
-msgstr "газификация"
-
-msgid "photovoltaic"
-msgstr "солнечная"
+msgstr "преобразование в газ"
-msgid "pumped-storage"
-msgstr "гидроаккумуляция"
+msgid "biomass / waste"
+msgstr "биомасса / отходы"
-msgid "pumping"
-msgstr "геотермальные воды"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "фотогальваническое преобразование"
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "пиролиз"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "ГЭС без резервуара"
+msgstr "течение реки"
+
+msgctxt "generator method"
+msgid "stream"
+msgstr "водный поток"
+msgctxt "generator method"
msgid "thermal"
-msgstr "тепловая"
+msgstr "термальный"
-msgid "Output forms of energy"
-msgstr "Вид генерируемой энергии"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "водохранилище, наполняемое насосом"
-msgid "electricity"
-msgstr "электричество"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "водохранилище"
-msgid "2 W"
-msgstr "2 Вт"
+msgid "Generator Type"
+msgstr "Тип генератора"
-msgid "3 kW"
-msgstr "3 кВт"
+msgid "combined_cycle"
+msgstr "паро-газовый цикл"
-msgid "5 MW"
-msgstr "5 МВт"
+msgid "gas combustion"
+msgstr "сгорание газа"
-msgid "7 GW"
-msgstr "7 ГВт"
+msgid "francis_turbine"
+msgstr "турбина Френсиса"
-msgid "hot water"
-msgstr "горячая вода"
+msgid "gas_turbine"
+msgstr "газовая турбина"
-msgid "hot air"
-msgstr "горячий воздух"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "биогаз, биомасса, газ, сгорание отходов"
-msgid "cold water"
-msgstr "холодная вода"
+msgid "heat_pump"
+msgstr "тепловой насос"
-msgid "cold air"
-msgstr "холодный воздух"
+msgid "horizontal_axis"
+msgstr "горизонтальная ось"
-msgid "compressed air"
-msgstr "сжатый воздух"
+msgid "tidal steam / wind"
+msgstr "приливное течение / ветер"
-msgid "steam"
-msgstr "пар"
+msgid "kaplan_turbine"
+msgstr "турбина Каплана"
-msgid "vacuum"
-msgstr "вакуум"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "течение реки / водохранилище / приливная плотина"
+
+msgid "pelton_turbine"
+msgstr "турбина Пелтона"
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "течение реки / водохранилище"
+
+msgid "reciprocating_engine"
+msgstr "поршневой двигатель"
-msgid "battery charging"
-msgstr "подзарядка аккумуляторов"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "биотопливо, биогаз, дизтопливо, газ, бензин"
-msgid "Power Station"
-msgstr "Электроподстанция"
+msgid "solar_photovoltaic_panel"
+msgstr "солнечная фотоэлектрическая панель"
-msgid "Edit Power Station"
-msgstr "Свойства электроподстанции"
+msgid "solar photovoltaic"
+msgstr "солнечный фотогальванический"
+
+msgid "solar_thermal_collector"
+msgstr "солнечный коллектор"
+
+msgid "solar thermal"
+msgstr "тепловая энергия солнца"
+
+msgid "steam_generator"
+msgstr "парогенератор"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "био, уголь, дизтопливо, газ, бензин, масло, сжигание отходов"
+
+msgid "steam_turbine"
+msgstr "паровая турбина"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"геотермальная / солнечная энергия / биотопливо, уголь, масло, сжигание "
+"отходов"
+
+msgid "stellarator"
+msgstr "стелларатор"
+
+msgid "nuclear fusion"
+msgstr "ядерный синтез"
+
+msgid "tokamak"
+msgstr "токамак"
+
+msgid "vertical_axis"
+msgstr "вертикальная ось"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Кипящий водо-водяной реактор 1 (BWR-1)"
+
+msgid "nuclear fission"
+msgstr "деление ядер"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Кипящий водо-водяной реактор 2 (BWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Кипящий водо-водяной реактор 3 (BWR-3)"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Кипящий водо-водяной реактор 4 (BWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Кипящий водо-водяной реактор 5 (BWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Кипящий водо-водяной реактор 6 (BWR-6)"
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Реактор CANDU (CANada Deuterium Uranium)"
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "Китайский водо-водяной ядерный реактор (CPR-1000)"
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Европейский водо-водяной ядерный реактор (EPR)"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Инерциальный управляемый термоядерный синтез (ICF)"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Водо-водяной ядерный реактор (PWR)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Реактор большой мощности канальный 1000 (RBMK-1000)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Реактор большой мощности канальный 1500 (RBMK-1500)"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Водо-водяной энергетический реактор (VVER)"
+
+msgid "Output forms of energy:"
+msgstr "Выходные формы энергии:"
msgid "Power Sub Station"
-msgstr "Трансформаторная будка"
+msgstr "Подстанция"
msgid "Edit Power Sub Station"
-msgstr "Свойства трансформаторной будки"
+msgstr "Свойства подстанции"
msgid "Line reference"
msgstr "Табличка на линии электропередач"
+msgid "high"
+msgstr "высокое"
+
+msgid "medium"
+msgstr "среднее"
+
+msgid "low"
+msgstr "низкая"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "Распределительный шкаф"
@@ -18983,6 +20295,9 @@ msgstr "Свойства опоры ЛЭП"
msgid "Tower reference"
msgstr "Номер вышки"
+msgid "steel"
+msgstr "сталь"
+
msgid "Pole"
msgstr "Столб"
@@ -19001,13 +20316,11 @@ msgstr "Свойства линии электропередач"
msgid "Line type"
msgstr "Тип линии"
-msgctxt "Power Line"
msgid "line"
-msgstr "высоковольтная"
+msgstr "линия"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "среднего/низкого напряжения"
+msgstr "низковольтные"
msgid "Amount of Cables"
msgstr "Количество токонесущих кабелей (без грозозащитных)"
@@ -19114,11 +20427,11 @@ msgstr "Киоск"
msgid "Edit Kiosk"
msgstr "Свойства киоска"
-msgid "Baker"
+msgid "Bakery"
msgstr "Булочная"
-msgid "Edit Baker"
-msgstr "Свойства булочной"
+msgid "Edit Bakery"
+msgstr "Свойства пекарни"
msgid "Butcher"
msgstr "Мясная лавка"
@@ -19129,8 +20442,8 @@ msgstr "Свойства мясной лавки"
msgid "Seafood"
msgstr "Морепродукты"
-msgid "Edit Seafood"
-msgstr "Свойства морепродуктов"
+msgid "Edit Seafood Shop"
+msgstr "Свойства магазина морепродуктов"
msgid "Deli (Fine Food)"
msgstr "Деликатесы"
@@ -19150,14 +20463,20 @@ msgstr "Рынок"
msgid "Edit Marketplace"
msgstr "Свойства рынка"
+msgid "Organic"
+msgstr "Натуральные продукты"
+
msgid "Greengrocer"
msgstr "Продавец фруктов или овощей"
msgid "Edit Greengrocer"
msgstr "Свойства продавца фруктов или овощей"
-msgid "Organic"
-msgstr "Натуральные продукты"
+msgid "Farm Stand"
+msgstr "Фермерский магазин"
+
+msgid "Edit Farm Stand"
+msgstr "Свойства фермерского магазина"
msgid "Edit Organic/Bio"
msgstr "Свойства магазина натуральных продуктов"
@@ -19228,7 +20547,7 @@ msgstr "Свойства портного"
msgid "Fabric"
msgstr "Ткани"
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr "Свойства магазина тканей"
msgid "Electronic"
@@ -19249,14 +20568,14 @@ msgstr "Свойства магазина бытовой электроники"
msgid "Mobile Phone"
msgstr "Мобильный телефон"
-msgid "Edit Mobile Phone"
-msgstr "Свойства мобильного телефона"
+msgid "Edit Mobile Phone Shop"
+msgstr "Свойства магазина мобильных телефонов"
msgid "Vacuum Cleaner"
msgstr "Пылесос"
-msgid "Edit Vacuum Cleaner"
-msgstr "Свойства пылесоса"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Свойства магазина пылесосов"
msgid "Hifi"
msgstr "Звуковая аппаратура"
@@ -19264,7 +20583,6 @@ msgstr "Звуковая аппаратура"
msgid "Edit Hifi Shop"
msgstr "Свойства магазина звуковой аппаратуры"
-msgctxt "shop"
msgid "Video"
msgstr "Видео"
@@ -19292,6 +20610,12 @@ msgstr "Свойства пункта обмена валют"
msgid "Edit Automated Teller Machine"
msgstr "Свойства банкомата"
+msgid "Pawnbroker"
+msgstr "Ломбард"
+
+msgid "Edit Pawnbroker"
+msgstr "Свойства ломбарда"
+
msgid "Department Store"
msgstr "Универмаг"
@@ -19328,10 +20652,31 @@ msgstr "Ювелирные изделия"
msgid "Edit Jewelry"
msgstr "Свойства ювелирных изделий"
+msgid "Gift"
+msgstr "Сувенирный магазин"
+
+msgid "Edit Gift Shop"
+msgstr "Свойства сувенирного магазина"
+
+msgid "buddhist"
+msgstr "буддизм"
+
+msgid "christian"
+msgstr "христианство"
+
+msgid "hindu"
+msgstr "индуизм"
+
+msgid "jewish"
+msgstr "иудаизм"
+
+msgid "muslim"
+msgstr "ислам"
+
msgid "Erotic"
msgstr "Секс-шоп"
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr "Свойства секс-шопа"
msgid "Florist"
@@ -19361,8 +20706,8 @@ msgstr "Свойства хозяйственного магазина"
msgid "Paint"
msgstr "Краски"
-msgid "Edit Paint"
-msgstr "Свойства красок"
+msgid "Edit Paint Shop"
+msgstr "Свойства магазина красок"
msgid "Furniture"
msgstr "Мебельный"
@@ -19373,20 +20718,20 @@ msgstr "Свойства мебельного магазина"
msgid "Kitchen"
msgstr "Кухня"
-msgid "Edit Kitchen"
-msgstr "Свойства кухни"
+msgid "Edit Kitchen Store"
+msgstr "Свойства магазина кухонной мебели и аксессуаров"
msgid "Curtain"
msgstr "Шторы"
-msgid "Edit Curtain"
-msgstr "Свойства магазина штор"
+msgid "Edit Curtain Shop"
+msgstr "Свойства магазина по продаже штор"
msgid "Frame"
msgstr "Рамки"
-msgid "Edit Frames"
-msgstr "Свойства рамок"
+msgid "Edit Frames Shop"
+msgstr "Свойства магазина рам для картин и фотографий"
msgid "Stationery"
msgstr "Канцтовары"
@@ -19406,6 +20751,12 @@ msgstr "Книжный магазин"
msgid "Edit Book Store"
msgstr "Свойства книжного магазина"
+msgid "Newsagent''s shop"
+msgstr "Магазин печатных изданий"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Свойства магазина печатных изданий"
+
msgid "Travel Agency"
msgstr "Туристическое агентство"
@@ -19415,8 +20766,8 @@ msgstr "Свойства туристического агентства"
msgid "Musical Instrument"
msgstr "Музыкальные инструменты"
-msgid "Edit Musical Instruments"
-msgstr "Свойства музыкальных инструментов"
+msgid "Edit Musical Instruments Shop"
+msgstr "Свойства магазина музыкальных инструментов"
msgid "Toys"
msgstr "Игрушки"
@@ -19496,6 +20847,9 @@ msgstr "игрушки"
msgid "vouchers"
msgstr "ваучеры"
+msgid "Note"
+msgstr "Примечание"
+
msgid "Geography"
msgstr "География"
@@ -19625,6 +20979,12 @@ msgstr "Вершина"
msgid "Edit Peak"
msgstr "Свойства вершины"
+msgid "Saddle"
+msgstr "Перевал"
+
+msgid "Edit Saddle"
+msgstr "Свойства горного перевала"
+
msgid "Glacier"
msgstr "Ледник"
@@ -19664,26 +21024,35 @@ msgstr "Дерево"
msgid "Edit Tree"
msgstr "Свойства дерева"
+msgid "broad_leaved"
+msgstr "широколиственное"
+
+msgid "conifer"
+msgstr "хвойное"
+
+msgid "palm"
+msgstr "пальма"
+
msgid "Botanical Name"
msgstr "Научное название"
+msgid "Tree Row"
+msgstr "Линия деревьев"
+
msgid "Wood"
msgstr "Лес"
msgid "Edit Wood"
msgstr "Свойства леса"
-msgctxt "wood"
msgid "coniferous"
-msgstr "хвойный"
+msgstr "Хвойный"
-msgctxt "wood"
msgid "deciduous"
-msgstr "лиственный"
+msgstr "Лиственный"
-msgctxt "wood"
msgid "mixed"
-msgstr "смешанный"
+msgstr "Смешанный"
msgid "Forest"
msgstr "Лесопосадки"
@@ -19691,15 +21060,6 @@ msgstr "Лесопосадки"
msgid "Edit Forest Landuse"
msgstr "Свойства лесопосадок"
-msgid "coniferous"
-msgstr "Хвойный"
-
-msgid "deciduous"
-msgstr "Лиственный"
-
-msgid "mixed"
-msgstr "Смешанный"
-
msgid "Grassland"
msgstr "Луг"
@@ -19775,6 +21135,12 @@ msgstr "Сенокосный луг"
msgid "Edit Meadow Landuse"
msgstr "Свойства сенокосного луга"
+msgid "Orchard"
+msgstr "Фруктовый сад"
+
+msgid "Edit Orchard Landuse"
+msgstr "Свойства фруктового сада"
+
msgid "Vineyard"
msgstr "Виноградники"
@@ -19829,7 +21195,7 @@ msgstr "Игровая площадка"
msgid "Edit Recreation Ground Landuse"
msgstr "Свойства игровой площадки"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Жилая зона"
msgid "Edit Residential Landuse"
@@ -19841,6 +21207,9 @@ msgstr "Погост"
msgid "Edit Graveyard"
msgstr "Свойства погоста"
+msgid "shinto"
+msgstr "синтоизм"
+
msgid "Cemetery"
msgstr "Кладбище"
@@ -19916,6 +21285,33 @@ msgstr "Свойства карьера"
msgid "Annotation"
msgstr "Аннотация"
+msgid "Edit Name Information"
+msgstr "Свойства информации о названии"
+
+msgid "Alternative name"
+msgstr "Альтернативное название"
+
+msgid "Historical name"
+msgstr "Историческое название"
+
+msgid "Local name"
+msgstr "Местное название"
+
+msgid "Regional name"
+msgstr "Региональное название"
+
+msgid "National name"
+msgstr "Национальное название"
+
+msgid "International name"
+msgstr "Международное название"
+
+msgid "Official name"
+msgstr "Официальное название"
+
+msgid "Common name abbreviation"
+msgstr "Аббревиатура"
+
msgid "Edit Address Information"
msgstr "Правка адресов"
@@ -19934,30 +21330,6 @@ msgstr "Город"
msgid "Country code"
msgstr "Код страны"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Интерполяция адресов"
@@ -19976,6 +21348,18 @@ msgstr "чётные"
msgid "alphabetic"
msgstr "алфавитный"
+msgid "Accuracy"
+msgstr "Точность"
+
+msgid "actual"
+msgstr "фактическая"
+
+msgid "estimate"
+msgstr "приблизительная"
+
+msgid "potential"
+msgstr "возможная"
+
msgid "Contact (common schema)"
msgstr "Контакт (обычная схема)"
@@ -20138,27 +21522,56 @@ msgstr "конец ограничения"
msgid "traffic light or barrier that stops you"
msgstr "светофор или препятствие, останавливающее Вас"
-msgid "Route (legacy)"
-msgstr "Маршрут (устаревший формат)"
+msgid "General route"
+msgstr "Маршрут"
+
+msgid "Edit general route"
+msgstr "Свойства маршрута"
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr "велосипедный"
-msgid "Edit Route (legacy)"
-msgstr "Свойства маршрута (устаревший формат)"
+msgctxt "route type"
+msgid "bus"
+msgstr "автобусный"
+msgctxt "route type"
msgid "road"
-msgstr "трасса"
+msgstr "дорога"
+
+msgctxt "route type"
+msgid "ferry"
+msgstr "паромный"
+msgctxt "route type"
msgid "ski"
msgstr "лыжный"
+msgctxt "route type"
msgid "foot"
msgstr "пеший"
+msgctxt "route type"
msgid "hiking"
-msgstr "туристический"
+msgstr "пеший туристический"
+msgctxt "route type"
+msgid "tram"
+msgstr "трамвайный"
+
+msgctxt "route type"
msgid "detour"
msgstr "объездной"
+msgctxt "route type"
+msgid "railway"
+msgstr "железнодорожный"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "метро"
+
msgid "Symbol description"
msgstr "Описание знака"
@@ -20204,20 +21617,23 @@ msgstr "конечная вперёд"
msgid "backward halt point"
msgstr "конечная назад"
-msgid "Route network"
-msgstr "Маршрут сети"
+msgid "Route Network"
+msgstr "Сеть маршрутов"
-msgid "Edit route network"
-msgstr "Свойства маршрута сети"
+msgid "Edit Route Network"
+msgstr "Свойства сети маршрутов"
msgid "member"
msgstr "участник"
-msgid "Associated street"
-msgstr "Связанная улица"
+msgid "Associated Street"
+msgstr "Ассоциированная улица"
+
+msgid "Edit Associated Street"
+msgstr "Свойства ассоциированной улицы"
-msgid "Edit associated street"
-msgstr "Свойства связанной улицы"
+msgid "house"
+msgstr "дом"
msgid "Street"
msgstr "Улица"
@@ -20240,7 +21656,7 @@ msgstr "что-либо, связанное с улицей"
msgid "Destination sign"
msgstr "Указатель направления"
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr "Свойства указателя направления"
msgid "Destination written on sign (w/o distance)"
@@ -20336,18 +21752,27 @@ msgstr "линии, проходящие под мостом"
msgid "way forming the outline footprint"
msgstr "линия, формирующая контур"
-msgid "nodes forming the outline"
-msgstr "точки, формирующие контур"
+msgid "edge ways parallel to ''across''"
+msgstr "краевые линии, параллельные ''across''"
msgid "ways passing through the tunnel"
msgstr "линии, проходящие через туннель"
+msgid "edge ways parallel to ''through''"
+msgstr "краевые линии, параллельные ''through''"
+
msgid "bridge"
msgstr "мост"
msgid "deprecated"
msgstr "устаревший"
+msgid "bicycle"
+msgstr "велосипедный"
+
+msgid "foot"
+msgstr "пеший"
+
msgid "horse"
msgstr "лошадь"
@@ -20357,8 +21782,11 @@ msgstr "ограждение"
msgid "motorroad"
msgstr "дорога для легковых автомобилей"
-msgid "highway_track"
-msgstr "Полевая/лесная дорога"
+msgid "highway.track"
+msgstr "полевая/лесная дорога"
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "услуги"
@@ -20366,11 +21794,11 @@ msgstr "услуги"
msgid "ford"
msgstr "брод"
-msgid "highway_platform"
-msgstr "highway_platform"
+msgid "highway.platform"
+msgstr ""
-msgid "emergency_access_point"
-msgstr "точка_экстренной_помощи"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "берег реки"
@@ -20387,6 +21815,9 @@ msgstr "Водные пороги"
msgid "railwaypoint"
msgstr "ж/д путевая точка"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "сортировочная станция"
@@ -20402,29 +21833,29 @@ msgstr "Старая жд дорога"
msgid "aeroway"
msgstr "воздушная трасса"
-msgid "aeroway_dark"
-msgstr "тёмная воздушная трасса"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "светлая воздушная трасса"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "простая лыжня"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "нормальная лыжня"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "усложнённая лыжня"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "очень сложная лыжня"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "лыжня произвольного стиля"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "новичковая лыжня"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "энергия"
@@ -20444,20 +21875,20 @@ msgstr "гавань"
msgid "amenity"
msgstr "инфраструктура"
-msgid "amenity_traffic"
-msgstr "режим_работы"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "инфраструктура_светлый"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "светлая_вода"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "здоровье"
-msgid "shop"
-msgstr "магазин"
+msgid "office"
+msgstr "офис"
msgid "hotel"
msgstr "отель"
@@ -20522,9 +21953,6 @@ msgstr "пустошь"
msgid "woodarea"
msgstr "лес"
-msgid "mud"
-msgstr "грязь"
-
msgid "beach"
msgstr "пляж"
@@ -20534,11 +21962,14 @@ msgstr "маршрут"
msgid "boundary"
msgstr "граница"
+msgid "sport"
+msgstr "спорт"
+
msgid "place"
msgstr "место"
-msgid "tiger_data"
-msgstr "данные TIGER"
+msgid "tiger.data"
+msgstr ""
msgid "address"
msgstr "адрес"
@@ -20552,9 +21983,6 @@ msgstr "Город/Село"
msgid "One Way"
msgstr "Односторонняя"
-msgid "Church"
-msgstr "Церковь"
-
msgid "Fuel Station"
msgstr "Заправочная станция"
@@ -20571,7 +21999,7 @@ msgid "Test"
msgstr "Тест"
msgid "abbreviated street name"
-msgstr ""
+msgstr "сокращённое обозначение улицы"
msgid "oneway tag on a node"
msgstr "тег oneway на точке"
@@ -20582,6 +22010,9 @@ msgstr "тег bridge на точке"
msgid "wrong highway tag on a node"
msgstr "неправильный тег highway на точке"
+msgid "wrong crossing tag on a way"
+msgstr "ошибочно указан тег crossing на линии"
+
msgid "Unnamed unclassified highway"
msgstr "Безымянная дорога с тегом unclassified"
@@ -20601,7 +22032,7 @@ msgid "footway with tag foot"
msgstr "тег footway с тегом foot"
msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "отдельная велодорожка, как полоса на велодорожке"
msgid "barrier used on a way"
msgstr "тег barrier использован для линии"
@@ -20627,11 +22058,41 @@ msgstr "необычная комбинация тегов (highway и waterway)
msgid "unusual tag combination (highway & natural)"
msgstr "необычная комбинация тегов (highway и natural)"
+msgid "unusual tag combination (landuse & building)"
+msgstr "необычная комбинация тегов (landuse и building)"
+
+msgid "unnecessary access key"
+msgstr "ненужный ключ access"
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "ненужный ключ motor_vehicle=yes"
+
msgid "natural water used for swimming pool"
msgstr "тег natural water добавлен для плавательного бассейна"
-msgid "incline without highway"
-msgstr "тег incline без тега highway"
+msgid "numerical key"
+msgstr "числовой ключ"
+
+msgid "route_master relation without route_master=*"
+msgstr "отношение route_master без route_master=*"
+
+msgid "power line without voltage"
+msgstr "линия электропередачи без тега voltage"
+
+msgid "substation key without power=substation"
+msgstr "ключ substation без power=substation"
+
+msgid "transformer key without power"
+msgstr "ключ transformer без power"
+
+msgid "missing substation=*"
+msgstr "отсутствует substation=*"
+
+msgid "missing transformer=*"
+msgstr "отсутствует transformer=*"
+
+msgid "incline without highway or railway"
+msgstr "incline без highway или railway"
msgid "junction without highway"
msgstr "тег junction без тега highway"
@@ -20642,8 +22103,8 @@ msgstr "тег lanes без тега highway"
msgid "lcn without highway"
msgstr "тег lcn без тега highway"
-msgid "lit without highway"
-msgstr "тег lit без тега highway"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "lit без highway/railway/piste/parking/platform"
msgid "living_street without highway"
msgstr "тег living_street без тега highway"
@@ -20660,8 +22121,8 @@ msgstr "тег motorroad без тега highway"
msgid "ntd_id without highway"
msgstr "тег ntd_id без тега highway"
-msgid "oneway without highway"
-msgstr "тег oneway без тега highway"
+msgid "oneway without highway or railway"
+msgstr "oneway без highway или railway"
msgid "sac_scale without highway"
msgstr "тег sac_scale без тега highway"
@@ -20777,20 +22238,131 @@ msgstr "тег canal без тега waterway"
msgid "have_riverbank without waterway"
msgstr "тег have_riverbank без тега waterway"
-msgid "tunnel without highway/railway/waterway"
-msgstr "тег tunnel без тега highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "tunnel без highway/railway/waterway/platform/pipeline"
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "bridge без highway/railway/waterway/platform/piste/pipeline"
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr "psv без highway/railway/waterway/parking"
+
+msgid "width without physical linear feature"
+msgstr "ширина без физической линейной величины"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "maxspeed без highway/railway/traffic_sign/enforcement"
+
+msgid "fence_type without barrier=fence"
+msgstr "fence_type без barrier=fence"
+
+msgid "border_type without boundary"
+msgstr "border_type без boundary"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "recycling_type без amenity=recycling"
+
+msgid "board_type without information=board"
+msgstr "board_type без information=board"
+
+msgid "shelter_type without amenity=shelter"
+msgstr "shelter_type без amenity=shelter"
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "lamp_type без highway=street_lamp"
+
+msgid "map_type without information=map"
+msgstr "map_type без information=map"
+
+msgid "site_type without historic=archaeological_site"
+msgstr "site_type без historic=archaeological_site"
-msgid "bridge without highway/railway/waterway"
-msgstr "тег bridge без тега highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
+msgstr "artwork_type без tourism=artwork"
-msgid "psv without highway/railway/waterway"
-msgstr "тег psv без тега highway/railway/waterway"
+msgid "castle_type without historic=castle"
+msgstr "castle_type без historic=castle"
-msgid "width without highway/railway/waterway/aeroway"
-msgstr "тег width без тега highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "reservoir_type без landuse/water=reservoir"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "тег maxspeed без тега highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr "bunker_type без military=bunker"
+
+msgid "source:addr without addr:*"
+msgstr "source:addr без addr:*"
+
+msgid "source:date without source"
+msgstr "source:date без source"
+
+msgid "source:name without name"
+msgstr "source:name без name"
+
+msgid "source:maxspeed without maxspeed"
+msgstr "source:maxspeed без maxspeed"
+
+msgid "source:building without building"
+msgstr "source:building без building"
+
+msgid "source:ref without ref"
+msgstr "source:ref без ref"
+
+msgid "source:population without population"
+msgstr "source:population без population"
+
+msgid "source:geometry on a node"
+msgstr "source:geometry на точке"
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr "source:[addr:]postcode без addr:postcode"
+
+msgid "source:postal_code without addr:postcode"
+msgstr "source:postal_code без addr:postcode"
+
+msgid "source:ele without ele"
+msgstr "source:ele без ele"
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "source:ref:INSEE без ref:INSEE"
+
+msgid "source:lit without lit"
+msgstr "source:lit без lit"
+
+msgid "source:hgv without hgv"
+msgstr "source:hgv без hgv"
+
+msgid "source:outline on a node"
+msgstr "source:outline на точке"
+
+msgid "source:highway without highway"
+msgstr "source:highway без highway"
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr "source:maxaxleload без maxaxleload"
+
+msgid "source:surface without surface"
+msgstr "source:surface без surface"
+
+msgid "source:bridge without bridge"
+msgstr "source:bridge без bridge"
+
+msgid "source:old_name without old_name"
+msgstr "source:old_name без old_name"
+
+msgid "source:bicycle without bicycle"
+msgstr "source:bicycle без bicycle"
+
+msgid "source:designation without designation"
+msgstr "source:designation без designation"
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr "source:[addr:]housenumber без addr:housenumber"
+
+msgid "source:height without height"
+msgstr "source:height без height"
+
+msgid "source:lanes without lanes"
+msgstr "source:lanes без lanes"
msgid "religion without denomination"
msgstr "тег religion без тега denomination"
@@ -20810,20 +22382,67 @@ msgstr ""
"не указан язык Википедии, используйте ''wikipedia''=''язык:заголовок "
"страницы''"
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr "неизвестный префикс языка в теге wikipedia"
+msgid "layer should be between -5 and 5"
+msgstr "уровень должен быть от -5 до 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr "level должен быть числом с приращением 0.5"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"height: по умолчанию в метрах; разделитель - точка; единицы измерения "
+"отделяются пробелом"
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"maxheight: по умолчанию в метрах; разделитель - точка; единицы измерения "
+"отделяются пробелом"
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"width: по умолчанию в метрах; разделитель - точка; единицы измерения "
+"отделяются пробелом"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"maxwidth: по умолчанию в метрах; разделитель - точка; единицы измерения "
+"отделяются пробелом"
+
+msgid "unusual maxspeed format"
+msgstr "необычный формат maxspeed"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr "напряжение должно быть в вольтах без единиц/разделителей/пробелов"
+
+msgid "unusual frequency specification"
+msgstr "необычное обозначение частоты"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "необычная ширина колеи; используйте мм без разделителя"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "необычный уклон; используйте проценты/градусы или up/down"
+
msgid "Landsat"
msgstr "Landsat"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "OSM Inspector: Redaction Bot"
-
msgid "Yahoo Sat"
msgstr "Yahoo Sat"
msgid "Bing Sat"
-msgstr "Bing Sat"
+msgstr "Спутниковые снимки Bing"
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
msgid "MapBox Satellite"
msgstr "Спутниковые снимки MapBox"
@@ -20831,14 +22450,20 @@ msgstr "Спутниковые снимки MapBox"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr "GPS-треки OpenStreetMap"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (черно-белый Mapnik)"
+msgstr "OpenStreetMap (Mapnik чёрно-белый)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "Тепловая карта skobbler"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -20850,88 +22475,52 @@ msgid "Public Transport (ÖPNV)"
msgstr "Общественный транспорт (ÖPNV)"
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (стиль Германии)"
-
-msgid "Streets NRW Geofabrik.de"
-msgstr "Улицы NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Пеший и велотуризм"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Сорбский язык)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Немецкий язык)"
+msgstr "OpenStreetMap (Немецкий стиль)"
-msgid "OpenPT Map (overlay)"
-msgstr "Карта OpenPT (наложение)"
-
-msgid "Bavaria (2 m)"
-msgstr "Бавария (2 м)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Камбоджа, Лаос, Таиланд, Вьетнам двуязычная"
-msgid "Hamburg (40 cm)"
-msgstr "Гамбург (40 см)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (DK5)"
-msgstr "Гамбург (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI чёрно-белая 2.5 м"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
msgstr "Грац: базовая карта"
msgid "Tiris: DGM (Terrain model)"
-msgstr "Tiris: DGM (Модель рельефа)"
+msgstr "Tiris: DGM (модель рельефа)"
msgid "Tiris: DOM (Surface model)"
-msgstr "Tiris: DOM (Модель поверхности)"
+msgstr "Tiris: DOM (модель поверхности)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Вена: Универсальные карты (общего назначения)"
+msgstr "Вена: многоцелевая карта (общего назначения)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Вена: метки (аннотация)"
+msgstr "Вена: Beschriftungen (примечания)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Вена: ортогональные фотоснимки"
+msgstr "Вена: ортофото (аэрофотоснимок)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Кантон Аргау 25 см (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Полноцветное изображение 2012 (12 см)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Ортофото города Устер 2008 10 см"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: План зонирования"
-msgid "Stadtplan Zürich"
-msgstr "Цюрих — план города"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Модель рельефа)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Кантон Золотурн 12.5 см (SOGIS 2007)"
-
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Кантон Золотурн 12.5 см (SOGIS 2011)"
-
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Кантон Золотурн, инфракрасная съёмка 12.5 см (SOGIS 2011)"
-
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Кантон Женева 5 см (SITG 2011)"
-
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Кантон Невшатель 50 см (SITN 2006)"
-
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Кантон Юра 50 см (RCJU 1998)"
-
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Кантон Фрибур 50 см (2005)"
-
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Город Берн 10 см/25 см (2008)"
-
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Ортофото Ивердон-Ле-Бен 25 см (2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Модель поверхности)"
msgid "Geobase Hydrography"
msgstr "Geobase (гидрография)"
@@ -20945,65 +22534,152 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "Мозаика Британской Колумбии"
-msgid "MSR Maps Topo"
-msgstr "MSR Maps Topo"
+msgid "Czech CUZK:KM"
+msgstr "Чехия CUZK:KM"
-msgid "MSR Maps Urban"
-msgstr "MSR Maps Urban"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Чехия UHUL:ORTOFOTO"
-msgid "USGS Scanned Topographic Maps"
-msgstr "Отсканированные топографические карты USGS"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Дания)"
-msgid "USGS Large Scale Imagery"
-msgstr "USGS снимок крупного масштаба"
+msgid "Stevns (Denmark)"
+msgstr "Стевнс (Дания)"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "Слой дорог OSM US TIGER 2012"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Дания)"
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Эстония, базовая карта (Maaamet)"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Эстония, ортофото (Maaamet)"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Эстония Multi (Maaamet)"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historic"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Овернь 2009/2010 - 30 см"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Мулен 2009 - 15 см"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Монлюсон 2009 - 15 см"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Виши 2009 - 15 см"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-inch Scotland 1842-82"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Ле-Пюи 2010 - 15 см"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Приморские Альпы 2009 - 40 см"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Брест 2010 - 10 см"
+
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Морбиан 2010"
+
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - ортофото 2000"
+
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - ортофото 2010-2012"
+
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Дороги"
+
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Атлантическая Луара - ортофото 2012 - 20 см"
+
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Тулуза - Ортофотоплан 2011"
+
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Тулуза - Ортофотоплан 2007"
+
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Тур - Ортофото 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Тур - Ортофото 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr "Веркор - заповедник горного массива Веркор - ортофото 1999 - 1 м"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Улицы Северного Рейна-Вестфалии от Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (лужицкий язык)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (немецкий язык)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "Карта OpenPT (наложение)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Гамбург (40 см)"
+
+msgid "Hamburg (DK5)"
+msgstr "Гамбург (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Бавария (2 м)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Штутгарт (аэрофото)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Эрланген - аэрофотосъёмка 2013 (6,25 см)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Эрланген - аэрофотосъёмка 2011 (5,0 см)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr "Старая карта Цвенкау - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Старая карта Пегау - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - физическая карта (природные зоны)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE:Гарц - физическая карта (природные зоны)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Physical DE:Гарц - оверлей для Bing (например, с непрозрачностью от 20 до 50 "
+"%)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Гаити)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr "Ирландия, British War Office, однодюймовая 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ireland Bartholomew Quarter-Inch 1940"
+msgstr "Ирландия, изд. Bartholomew, четвертьдюймовая, 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Городской атлас Ирландии EEA GMES"
+msgstr "Ирландия EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr "Ireland EEA CORINE 2006"
+msgstr "Ирландия EEA CORINE 2006"
msgid "Lodi - Italy"
-msgstr "Lodi - Италия"
+msgstr "Лоди - Италия"
msgid "Lombardia - Italy (CTR)"
msgstr "Ломбардия - Италия (CTR)"
@@ -21012,67 +22688,70 @@ msgid "Sicily - Italy"
msgstr "Сицилия - Италия"
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 — Италия"
+msgstr "PCN 2006 - Италия"
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - IT Lazio+Umbria"
+msgstr "PCN 2008 - IT Лацио+Умбрия"
msgid "USSR - Latvia"
-msgstr "СССР — Латвия"
+msgstr "СССР - Латвия"
msgid "50cm ortho - Latvia"
-msgstr "Латвия 50см орто"
+msgstr "50 см ортоснимок - Латвия"
msgid "20cm ortho - Coastline"
-msgstr "Береговая линия 20см"
+msgstr "20 см ортоснимок - береговая линия"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Литва)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Мулен 2009 - 15 см"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Дельта Нигера Окт. 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Монлюсон 2009 - 15 см"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Пангасинан/Булакан (Филиппины HiRes)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Виши 2009 - 15 см"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Ле-Пюи 2010 - 15 см"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Брест 2010 - 10 см"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk автомобильная"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Морбиан 2010"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk пешеходная"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk велосипедная"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - ортофото 2010-2012"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk лыжные трассы"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Кадастровая карта Словакии (KaPor, 2010-04)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr "Тулуза - Ортофотоплан 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Кадастровая карта Словакии (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Тулуза - Ортофотоплан 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Словакия EEA GMES Urban Atlas"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Тур - Ортофото 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Словакия EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr "Исторические карты Словакии"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "Южная Африка CD:NGI аэросъёмка"
msgid "Catastro Spain"
-msgstr "Кадастр Испании"
+msgstr "Кадастровая карта Испании"
msgid "PNOA Spain"
-msgstr "PNOA Spain"
+msgstr "PNOA Испания"
msgid "SIGPAC Spain"
msgstr "SIGPAC Испания"
@@ -21086,89 +22765,149 @@ msgstr "ITACyL - Кастилия и Леон"
msgid "IDEIB - Balearic Islands"
msgstr "IDEIB - Балеарские острова"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estonia Basemap (Maaamet)"
-
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estonia Ortho (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Кантон Аргау 25 см (AGIS 2011)"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Город Устер, ортоснимок 2008 10 см"
-msgid "ORT10LT (Lithuania)"
-msgstr "ORT10LT (Литва)"
+msgid "Stadtplan Zürich"
+msgstr "Цюрих - план города"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Кантон Золотурн 12.5 см (SOGIS 2007)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Дания)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Кантон Золотурн 12.5 см (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Дания)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Кантон Золотурн, инфракрасная съёмка 12.5 см (SOGIS 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Кантон Женева 5 см (SITG 2011)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Кантон Невшатель 50 см (SITN 2006)"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Кантон Юра 50 см (RCJU 1998)"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Камбоджа, Лаос, Таиланд, Вьетнам двуязычная"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Кантон Фрибур 50 см (2005)"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr "Дельта Нигера, Окт. 2012 Landsat"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Город Берн 10 см/25 см (2008)"
-msgid "South Africa CD:NGI Aerial"
-msgstr "Аэрофотосъёмка Южной Африки CD:NGI"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Ортофото Ивердон-Ле-Бен 25 см (2007)"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk — автомобильная"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ньон - Ортофото 2010 HD 5см/пикс"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk — пешеходная"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - ортофото 2012"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk — велосипедная"
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Ортофото2012"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk— лыжные трассы"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Лозанна - Техническое ортофото 2012"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Кадастровая карта Словакии (KaPor, 2010-04)"
+msgid "MSR Maps Topo"
+msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Кадастровая карта Словакии (KaPor, 2011-05)"
+msgid "MSR Maps Urban"
+msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Словакия — EEA GMES Urban Atlas"
+msgid "USGS Scanned Topographic Maps"
+msgstr "Сканированные топографические карты USGS"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Словакия — EEA CORINE 2006"
+msgid "USGS Large Scale Imagery"
+msgstr "Крупномасштабные снимки USGS"
-msgid "Slovakia Historic Maps"
-msgstr "Исторические карты Словакии"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "Оверлей дорог OSM US TIGER 2012"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI чёрно-белая 2.5 м"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Новые и смещённые дороги TIGER (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
-msgstr "OSM — карты TIGER"
+msgstr ""
+
+msgid "MassGIS L3 Parcels"
+msgstr ""
+
+msgid "NC 2010 Orthoimagery"
+msgstr "Северная Каролина 2010 (ортофото)"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Украина - Ортофотокарты 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7-ой серии (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr ""
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
+
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
+
+msgid "Surrey Air Survey"
+msgstr "Суррей, аэросъёмка"
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS - 6-дюймовая карта Шотландии 1842-82"
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25000 1-й выпуск 1937-61"
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-дюймовая 7-й выпуск 1955-61"
msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25000 историческая (OSM)"
+msgstr ""
msgid "OS Scottish Popular historic"
-msgstr "OS Scottish Popular historic"
+msgstr ""
-msgid "Stuttgart (Luftbild)"
-msgstr "Штутгарт (Аэрофото)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - изд. Bartholomew, полудюймовая, 1897-1907"
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "Планы городов OS, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "Экспорт OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Экспортировать данные о трафике в network-файл симулятора SUMO."
+
+msgid "SUMO Export"
+msgstr "Экспорт в SUMO"
+
+msgid "Export"
+msgstr "Экспорт"
+
+msgid "Port:"
+msgstr "Порт:"
+
+msgid "refresh the port list"
+msgstr "обновить список портов"
+
+msgid "Configure"
+msgstr "Настройка"
+
+msgid "Connection Error."
+msgstr "Ошибка соединения."
+
+msgid "configure the connected DG100"
+msgstr "настроить подключенный DG100"
-msgid "2u"
-msgstr "2u"
+msgid "delete data after import"
+msgstr "удалить данные после импорта"
msgid "Columbus V-900 CSV Files"
msgstr "Файлы Columbus V-900 CSV"
@@ -21382,6 +23121,18 @@ msgstr "Показывает профиль высоты"
msgid "Elevation Profile"
msgstr "Профиль высоты"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Слой сетки высот (экспериментальный!)"
+
+msgid "Shows elevation grid layer"
+msgstr "Показать слой сетки высот"
+
+msgid "Elevation Grid"
+msgstr "Сетка высот"
+
+msgid "No SRTM data"
+msgstr "Нет данных SRTM"
+
msgid "Open the elevation profile window."
msgstr "Открыть окно профилей высоты"
@@ -21403,14 +23154,8 @@ msgstr "Увеличение"
msgid "Time"
msgstr "Время"
-msgid "Geoid"
-msgstr "Геоид"
-
-msgid "Automatic"
-msgstr "Автоматически"
-
-msgid "Fixed value"
-msgstr "Фиксированное значение"
+msgid "Tracks"
+msgstr "Треки"
msgid "Elevation profile for track ''{0}''."
msgstr "Профиль высот для трека ''{0}''."
@@ -21685,9 +23430,15 @@ msgstr "Выделить неполные адреса"
msgid "Selects all addresses with incomplete data."
msgstr "Выделить все адреса с неполными данными."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Использовать тег 'addr:street' или 'addr:place'"
+
msgid "House Number Editor"
msgstr "Редактор номеров зданий"
+msgid "House number increment:"
+msgstr "Приращение номера дома:"
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Обновление свойств {0} объекта"
@@ -21713,6 +23464,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Свойства слоя"
+msgid "Error while creating image layer: {0}"
+msgstr "Ошибка при создании слоя изображения: {0}"
+
msgid "Import image"
msgstr "Импортировать изображение"
@@ -21792,9 +23546,21 @@ msgstr "Открыть окно выбора из OSM Inspector."
msgid "Current Selected Bug Info"
msgstr "Информация о выбранной ошибке"
+msgid "Prev OSMI bug"
+msgstr "Пред. ошибка OSMI"
+
+msgid "Next OSMI bug"
+msgstr "След. ошибка OSMI"
+
msgid "Osm Inspector Bugs"
msgstr "Ошибки из Osm Inspector"
+msgid "OSM Inspector Bugs"
+msgstr "Ошибки OSM инспектора"
+
+msgid "Selected Bug Info"
+msgstr "Информация о выделенной ошибке"
+
msgid "Handy Address Interpolation Functions"
msgstr "Функции средства интерполяции адресов"
@@ -21880,8 +23646,8 @@ msgstr "Заявлены нечётные номера домов"
msgid "Expected even numbers for addresses"
msgstr "Заявлены чётные номера домов"
-msgid "Expected valid number for address increment"
-msgstr "Ожидаемое верное значение наращивания адреса"
+msgid "Expected valid number for increment"
+msgstr "Укажите верное числовое значение приращения"
msgid "Country code must be 2 letters"
msgstr "Код страны должен состоять из 2 букв"
@@ -22251,15 +24017,6 @@ msgstr "Номер дома:"
msgid "Street Name:"
msgstr "Улица:"
-msgid "Increment"
-msgstr "Увеличивать"
-
-msgid "Decrement"
-msgstr "Уменьшать"
-
-msgid "Numbers:"
-msgstr "Номера:"
-
msgid "Big buildings mode"
msgstr "Режим больших зданий"
@@ -22451,6 +24208,9 @@ msgstr "Отменить обрезку изображения во время
msgid "Use \"Tableau d''assemblage\""
msgstr "Использовать \"Tableau d''assemblage\""
+msgid "Replace grey shades by white color only"
+msgstr "Заменить оттенки серого только белым цветом"
+
msgid "Select first WMS layer in list."
msgstr "Сначала выберите слой WMS в списке."
@@ -22471,12 +24231,6 @@ msgstr "50 м"
msgid "100 m"
msgstr "100 м"
-msgid "high"
-msgstr "высокое"
-
-msgid "medium"
-msgstr "среднее"
-
msgid "symbol"
msgstr "символ"
@@ -22625,6 +24379,11 @@ msgstr ""
"Добавить \"Tableau(x) d''assemblage\" в список кадастровых листов для "
"захвата."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Заменить оттенки серого белым цветом (уменьшает размер файла и используемой "
+"памяти)."
+
msgid "Display crosspieces:"
msgstr "Показать перекрестья:"
@@ -22645,6 +24404,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Позволить при этом использовать тег \"add:street\" на точках."
+msgid "Unexpected file extension. {0}"
+msgstr "Непредвиденное расширение файла. {0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "Добавить \"source=...\" к элементам?"
@@ -22733,54 +24495,6 @@ msgstr ""
"Это изображение содержит данные геоссылок.\n"
"Вы хотите воспользоваться ими?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Отметьте первый угол для обрезки изображения\n"
-"(Требуется отметить две точки)"
-
-msgid "Image cropping"
-msgstr "Обрезать изображение"
-
-msgid "Click second corner for image cropping"
-msgstr "Отметьте второй угол для обрезки изображения"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Отметьте первую поперечину Lambert для геопривязки\n"
-"(Всего нужно две точки)"
-
-msgid "Image georeferencing"
-msgstr "Геопривязка изображения"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Отметьте вторую поперечину Lambert для геопривязки"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Вы хотите отменить полностью\n"
-"или только попытаться снова "
-
-msgid "Enter cadastre east,north position"
-msgstr "Ввести кадастровую позицию восток, север"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Предупреждение: проверьте направление на север с помощью стрелки!!)"
-
-msgid "East"
-msgstr "Восток"
-
-msgid "I use the mouse"
-msgstr "Я использую мышь"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Установить {0} Lambert координаты"
-
msgid "Load layer from cache"
msgstr "Загрузить слой из кэша"
@@ -22834,23 +24548,87 @@ msgstr "<html>Номер департамента (не обязательно)<
msgid "Add new layer"
msgstr "Добавить новый слой"
-msgid "Open Cadastre Preferences"
-msgstr "Настройки Open Cadastre"
+msgid "Open Cadastre Preferences"
+msgstr "Настройки Open Cadastre"
+
+msgid "Refine georeferencing"
+msgstr "Уточнить привязку"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Улучшение привязки (только растровые изображения)"
+
+msgid "Reset cookie"
+msgstr "Сбросить куки"
+
+msgid "Get a new cookie (session timeout)"
+msgstr "Получить новые кукисы (тайм-аут сеанса)"
+
+msgid "Save image as..."
+msgstr "Сохранить изображение как..."
+
+msgid "PNG files (*.png)"
+msgstr "Файлы PNG (*.png)"
+
+msgid "GeoTiff files (*.tif)"
+msgstr "Файлы GeoTiff (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Экспортировать изображение (только растровые изображения)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Отметьте первый угол для обрезки изображения\n"
+"(Требуется отметить две точки)"
+
+msgid "Image cropping"
+msgstr "Обрезать изображение"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Отметьте первую поперечину Lambert для геопривязки\n"
+"(Всего нужно две точки)"
+
+msgid "Image georeferencing"
+msgstr "Геопривязка изображения"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Вы хотите отменить полностью\n"
+"или только попытаться снова "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Ой! Не удалось правильно получить все\n"
+"координаты. Пожалуйста, попробуйте снова."
+
+msgid "Enter cadastre east,north position"
+msgstr "Ввести кадастровую позицию восток, север"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Предупреждение: проверьте направление на север с помощью стрелки!!)"
-msgid "Reset cookie"
-msgstr "Сбросить куки"
+msgid "East"
+msgstr "Восток"
-msgid "Get a new cookie (session timeout)"
-msgstr "Получить новые кукисы (тайм-аут сеанса)"
+msgid "I use the mouse"
+msgstr "Я использую мышь"
-msgid "Save image as PNG"
-msgstr "Сохранить изображение в формате PNG"
+msgid "Set {0} Lambert coordinates"
+msgstr "Установить {0} Lambert координаты"
-msgid "PNG files (*.png)"
-msgstr "Файлы PNG (*.png)"
+msgid "Click second corner for image cropping"
+msgstr "Отметьте второй угол для обрезки изображения"
-msgid "Export as PNG format (only raster images)"
-msgstr "Экспортировать в формате PNG (только растровые изображения)"
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Отметьте вторую поперечину Lambert для геопривязки"
msgid "Adjust WMS"
msgstr "Подстроить WMS"
@@ -22878,8 +24656,11 @@ msgstr "слой WMS ({0}), квадратов загружено: {1}"
msgid "Is not vectorized."
msgstr "Не векторизованы."
-msgid "Raster size: {0}"
-msgstr "Размер растра: {0}"
+msgid "Bounding box: {0}"
+msgstr "Рамка: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Размер изображения (пикс.): {0}/{1}"
msgid "Is vectorized."
msgstr "Векторизован."
@@ -22930,8 +24711,8 @@ msgstr "Удалить выбранную тему из списка."
msgid "Color Schemes"
msgstr "Цветовые схемы"
-msgid "Adress"
-msgstr "CzechAddress"
+msgid "Address"
+msgstr "Адрес"
msgid "Split area"
msgstr "Разделить область"
@@ -22979,6 +24760,9 @@ msgid "Please select 1 or more ways to download along"
msgstr ""
"Выделите одну или несколько линий, вдоль которых необходимо скачать данные"
+msgid "Download from OSM along selected ways"
+msgstr "Скачать данные из OSM вдоль выделенных линий"
+
msgid "{0} intermediate nodes to download."
msgstr "{0} промежуточных точек для загрузки."
@@ -23053,6 +24837,72 @@ msgstr "Новый инструмент..."
msgid "Install"
msgstr "Установить"
+msgid "Public"
+msgstr "Общий"
+
+msgid "Could not get server response, check logs"
+msgstr "Не удалось получить ответ сервера, проверьте журналы"
+
+msgid "Failed to login as {0}:"
+msgstr "Не удалось войти как {0}:"
+
+msgid "The server did not return user ID"
+msgstr "Сервер не возвратил ID пользователя"
+
+msgid "Failed to send message:"
+msgstr "Не удалось отправить сообщение:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Ошибка получения сообщений для {0}:"
+
+msgid "GeoChat"
+msgstr "GeoChat"
+
+msgid "Open GeoChat panel"
+msgstr "Открыть панель GeoChat"
+
+msgid "Zoom in to see messages"
+msgstr "Приблизьте, чтобы увидеть сообщения"
+
+msgid "Login"
+msgstr "Войти"
+
+msgid "Enable autologin"
+msgstr "Входить автоматически"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} человек"
+msgstr[1] "{0} человека"
+msgstr[2] "{0} человек"
+
+msgid "not logged in"
+msgstr "регистрация"
+
+msgid "User {0} has left"
+msgstr "Пользователь {0} отключился"
+
+msgid "User {0} is mapping nearby"
+msgstr "Пользователь {0} рисует карту рядом"
+
+msgid "Users mapping nearby:"
+msgstr "Пользователи, рисующие карту рядом:"
+
+msgid "Private chat"
+msgstr "Приватный чат"
+
+msgid "Close tab"
+msgstr "Закрыть вкладку"
+
+msgid "Logout"
+msgstr "Выйти"
+
+msgid "Clear log"
+msgstr "Очистить журнал"
+
+msgid "Show users on map"
+msgstr "Показать пользователей на карте"
+
msgid "Position only"
msgstr "Только положение"
@@ -23093,27 +24943,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr "Неизвестный формат протоколирования"
-msgid "Port:"
-msgstr "Порт:"
-
-msgid "refresh the port list"
-msgstr "обновить список портов"
-
-msgid "Configure"
-msgstr "Настройка"
-
msgid "Configure Device"
msgstr "Конфигурация устройства"
-msgid "Connection Error."
-msgstr "Ошибка соединения."
-
-msgid "configure the connected DG100"
-msgstr "настроить подключенный DG100"
-
-msgid "delete data after import"
-msgstr "удалить данные после импорта"
-
msgid "Importing data from device."
msgstr "Импортирование данных с устройства."
@@ -23539,6 +25371,9 @@ msgstr "Создать XML границы снимков по выделению
msgid "edit bounds for selected defaults"
msgstr "изменить границы для выбранных настроек по умолчанию"
+msgid "Download imagery XML bounds"
+msgstr "Загрузить границы снимков в формате XML"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23749,19 +25584,19 @@ msgid "This string should be 3 to 200 letters long."
msgstr "Эта строка должна быть длиной от 3 до 200 знаков."
msgid "Adjust imagery"
-msgstr "Выровнять снимок"
+msgstr "Выравнивание подложки"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Выровнять позицию выбранного слоя снимка"
+msgstr "Настроить смещение выбранного слоя снимков"
msgid "Please select the imagery layer to adjust."
-msgstr "Пожалуйста, выберите слой со снимком для выравнивания."
+msgstr "Пожалуйста, выберите слой со снимками для выравнивания"
msgid "Start adjusting"
-msgstr "Начало выравнивания"
+msgstr "Начать выравнивание"
msgid "There are currently no imagery layer to adjust."
-msgstr "Нет снимка для выравнивания."
+msgstr "Нет доступных слоёв со снимками для выравнивания"
msgid "No layers to adjust"
msgstr "Нет слоёв для выравнивания"
@@ -23808,12 +25643,6 @@ msgstr "Импортированные изображения"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Файлы изображений (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Открыть изображения в ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Загрузить набор изображений на новый слой."
-
msgid "Import vector graphics"
msgstr "Импорт векторной графики"
@@ -23823,18 +25652,15 @@ msgstr "Масштаб:"
msgid "unit(s) = "
msgstr "единицы = "
-msgid "Import..."
-msgstr "Импортировать..."
-
-msgid "Import vector graphics."
-msgstr "Импортировать векторную графику"
-
-msgid "SVG Drawings (*.svg)"
-msgstr "Рисунки SVG (*.svg)"
-
msgid "Importing..."
msgstr "Импортирование..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "SVG файлы [модуль ImportVec] (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Откройте или создайте слой данных перед импортом"
+
msgid "InfoMode"
msgstr "InfoMode"
@@ -24220,9 +26046,6 @@ msgstr "Авто-центрирование"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Непрерывно центрировать слой LiveGPS на текущей позиции."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Открыть MapDust"
@@ -24277,9 +26100,34 @@ msgstr "Слить перекрывающиеся линии"
msgid "Merge Overlap (combine)"
msgstr "Слить нахлест (объединить)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Роль, основанная на участии в отношениях, была скопирована во все "
+"новые линии.<br>Результат необходимо проверить и исправить, если "
+"потребуется.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Участник отношения был скопирован во все новые линии.<br>Результат "
+"необходимо проверить и исправить, если потребуется.</html>"
+
msgid "Split way"
msgstr "Разделить линию"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Введите ключ тега, например: <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Введите значение тега, например: <strong><tt>check "
+"members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Левый Мичиганский поворот"
@@ -24325,6 +26173,15 @@ msgstr "Тип объекта OSM для скачивания («*» — люб
msgid "XAPI query: "
msgstr "Запрос XAPI: "
+msgid "Download from Overpass API ..."
+msgstr "Загрузить с Overpass API ..."
+
+msgid "Download map data from Overpass API server."
+msgstr "Загрузить картографические данные с сервера Overpass API."
+
+msgid "Overpass query: "
+msgstr "Запрос к Overpass: "
+
msgid "Select OSM mirror URL"
msgstr "Выберите адрес зеркала OSM"
@@ -24337,15 +26194,6 @@ msgstr "Основной адрес"
msgid "Enforce meta data"
msgstr "Запрашивать метаданные"
-msgid "Convert to multipolygon"
-msgstr "Преобразовать в мультиполигон"
-
-msgid "Convert to multipolygon."
-msgstr "Преобразовать в мультиполигон."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Одна из выделенных линий уже является частью другого мультиполигона."
-
msgid "About Plugin"
msgstr "О модуле"
@@ -24488,9 +26336,6 @@ msgstr "Разбить по окрестности"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Разбить данные по окрестности (admin_level=11)."
-msgid "Open Data"
-msgstr "Open Data"
-
msgid "CSV files"
msgstr "Файлы CSV"
@@ -24515,12 +26360,21 @@ msgstr "Файлы GML"
msgid "Zip Files"
msgstr "Zip-файлы"
+msgid "7Zip Files"
+msgstr "Файлы 7Zip"
+
msgid "OpenData XML files"
msgstr "Файлы OpenData XML"
+msgid "Download open data"
+msgstr "Загрузить ОткрытыеДанные"
+
msgid "License URL not available: {0}"
msgstr "URL лицензии не доступен: {0}"
+msgid "OpenData preferences"
+msgstr "Свойства ОткрытыеДанные"
+
msgid "License Agreement"
msgstr "Лицензионное соглашение"
@@ -24682,6 +26536,9 @@ msgstr "Скачивание данных..."
msgid "File to load"
msgstr "Файл для загрузки"
+msgid "Reading 7Zip file..."
+msgstr "Чтение файла 7Zip..."
+
msgid "Reading Zip file..."
msgstr "Чтение ZIP-архива..."
@@ -24702,6 +26559,19 @@ msgstr ""
msgid "Try lenient method"
msgstr "Попробовать нестрогий метод"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"Не удалось определить систему координат.\n"
+"Вы хотите возвратиться к EPSG:4326 (WGS 84)?"
+
+msgid "Warning: CRS not found"
+msgstr "Предупреждение: СК не обнаружена"
+
+msgid "Unable to detect CRS !"
+msgstr "Не удалось определить СК!"
+
msgid "Unable to find a data store for file {0}"
msgstr "Не удалось найти хранилище данных для файла {0}"
@@ -24972,15 +26842,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Произошла ошибка: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Невозможно создать баг. Результат: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Заголовок содержит несколько значений, и не может быть представлен одной "
-"строкой."
-
msgid "Process queue"
msgstr "Обработать очередь"
@@ -25036,18 +26897,6 @@ msgstr ""
msgid "Close: "
msgstr "Закрыть: "
-msgid "New issue"
-msgstr "Новая проблема"
-
-msgid "Create issue"
-msgstr "Указать новую проблему"
-
-msgid "Describe the problem precisely"
-msgstr "Опишите проблему как можно подробнее"
-
-msgid "Create: "
-msgstr "Создать: "
-
msgid "Open in browser"
msgstr "Открыть в браузере"
@@ -25109,6 +26958,9 @@ msgstr "исполняемый файл Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "Сжатые pbf файлы OSM сервера"
+msgid "Download PBF"
+msgstr "Скачать PBF"
+
msgid "Invalid changeset id: {0}"
msgstr "Неверный id пакета правок: {0}"
@@ -25320,9 +27172,6 @@ msgstr "Импорт PDF файлов."
msgid "Import PDF"
msgstr "Импорт PDF"
-msgid "Import PDf file"
-msgstr "Импорт PDF файлов"
-
msgid " {0} objects so far"
msgstr " {0} объект(ов) осталось"
@@ -25404,8 +27253,26 @@ msgstr "Тест не прошёл: Невозможно прочитать mtim
msgid "Test failed: Could not write mtime."
msgstr "Тест не прошёл: Невозможно записать mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr "Регулирование фотографии"
+
+msgid "Move and position photos"
+msgstr "Перемещение фотографии"
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr "Тащить фотографию или Shift+клик для установки позиции."
+
+msgid "Please load some photos."
+msgstr "Позалуйста загрузите несколько фотографий."
+
+msgid "Toggle the image thumbnail preview"
+msgstr "Переключить на предварительный показ"
+
+msgid "New layer for untagged images"
+msgstr "Новый слой для не отмеченного изображения"
+
+msgid "Untagged Images"
+msgstr "Не отмеченные изображения"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Вы хотите сохранить калибровку слоя {0}?"
@@ -25562,6 +27429,10 @@ msgstr "В буфере обмена ничего нет"
msgid "The clipboard data is not an image"
msgstr "Данные буфера обмена не являются изображением"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Предупреждение: Не удалось обработать файл .zip {0}''. Текст ошибки: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr "Найден файл калибровки, связанный с изображением: {0}\n"
@@ -25586,6 +27457,9 @@ msgid ""
msgstr ""
"С данного момента калибровочные файлы будут загружаться автоматически."
+msgid "Download Osmosis poly"
+msgstr "Скачать Osmosis poly"
+
msgid "Reading polygon filter file..."
msgstr "Чтение polygon filter file"
@@ -25881,9 +27755,6 @@ msgstr "GPX файл не содержит треков или путевых т
msgid "Create Stops from GPX"
msgstr "Создать остановки из GPX"
-msgid "Tracks"
-msgstr "Треки"
-
msgid "Tracks in this GPX file:"
msgstr "Маршруты в GPX файле:"
@@ -25955,9 +27826,6 @@ msgstr "Укажите роль"
msgid "Change relation member roles to {0}"
msgstr "Изменить роли участников отношения на {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Настройки создания мультиполигонов"
-
msgid "Create administrative boundary relations"
msgstr "Создать отношение с административными границами"
@@ -26084,9 +27952,6 @@ msgstr "Найдена точка без роли ''label'' или ''admin_centr
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Найдена линия без роли ''inner'' или ''outer''"
-msgid "Restart JOSM"
-msgstr "Перезапустить JOSM"
-
msgid "Revert changeset fully"
msgstr "Полностью откатить пакет правок"
@@ -26108,6 +27973,9 @@ msgstr "Введите ID пакета правок, который должен
msgid "Reverted changeset"
msgstr "Отменённый пакет правок"
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "Нелья откатить пакет правок из {0}"
+
msgid "Missing merge target for {0} with id {1}"
msgstr "Отсутствует результат объединения для {0} с id {1}"
@@ -26143,15 +28011,35 @@ msgstr "Скачивание отсутствующих элементов"
msgid "Downloading changeset"
msgstr "Скачивание пакета правок"
+msgid "See {0}"
+msgstr "Смотрите {0}"
+
msgid "Revert changeset #{0}"
msgstr "Откатить пакет правок №{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Предупреждение: неподдерживаемый начальный элемент ''{0}'' в содержимом "
+"пакета правок в позиции ({1},{2}). Пропущено."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Предупреждение: Неподдерживаемый конечный элемент ''{0}'' в содержимом "
+"пакета правок в позиции ({1},{2}). Пропущено."
+
msgid "Road Sign Plugin"
msgstr "RoadSigns Plugin"
msgid "signs"
msgstr "Знаки"
+msgid "Change Properties"
+msgstr "Изменить параметры"
+
msgid "Country preset:"
msgstr "Страна:"
@@ -26161,6 +28049,9 @@ msgstr "Показать все знаки"
msgid "Show a selection of the most useful signs"
msgstr "Показывать выборку самых полезных знаков"
+msgid "Spain"
+msgstr "Испания"
+
msgid "Germany"
msgstr "Германия"
@@ -26263,9 +28154,6 @@ msgstr "Настройки модуля маршрутизации"
msgid "Configure routing preferences."
msgstr "Задать настройки маршрутизации."
-msgid "Highway type"
-msgstr "Тип автомобильной дороги"
-
msgid "Speed (Km/h)"
msgstr "Скорость (км/ч)"
@@ -26391,6 +28279,9 @@ msgstr "Сохранить текущую информацию SDS в файл"
msgid "Save SDS file"
msgstr "Сохранить SDS-файл"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Ошибка создания резервного файла. Текст ошибки: {0}"
+
msgid "Simplify Area"
msgstr "Упростить полигон"
@@ -26463,20 +28354,20 @@ msgstr "Коэффициент расстояния"
msgid "Merge Nearby Nodes Threshold"
msgstr "Порог близости точек (м)"
-msgid "Online Help"
-msgstr "Помощь онлайн"
+msgid "SeaMap Editor"
+msgstr "Редактор карт морей (SeaMap)"
-msgid "Load"
-msgstr "Загрузить"
+msgid "No object selected"
+msgstr "Нет выбранных объектов"
-msgid "invisible"
-msgstr "невидимый"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "Редактор карт морей (SeaMap)"
+msgid "Select only one object"
+msgstr "Выберите только один объект"
-msgid "Export"
-msgstr "Экспорт"
+msgid "Select a map object"
+msgstr "Выберите объект карты"
msgid "AutoSave LiveData"
msgstr "Автосохранение данных позиционирования"
@@ -26617,6 +28508,9 @@ msgstr "удалить линию контура"
msgid "Street name: "
msgstr "Название улицы: "
+msgid "Building: "
+msgstr "Здание: "
+
msgid "Even/Odd"
msgstr "Четные/Нечётные"
@@ -26695,6 +28589,102 @@ msgstr "Трассировщик."
msgid "Tracer building"
msgstr "Построитель здания"
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2."
+
+msgid "Change tag {0} to {1}"
+msgstr "Изменить тег {0} на {1}"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"Версия Tracer2Server не совместима с этим модулем. Загрузите версию {0} с\n"
+"{1}."
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+"Доступна новая версия Tracer2Server. Для наилучших результатов обновитесь до "
+"версии {0}."
+
+msgid "No set of parameter is active!"
+msgstr "Нет активного набора параметров!"
+
+msgid "Select parameter"
+msgstr "Выберите параметр"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: добавить линию из {0} точек"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: изменить линию из {0} точек"
+
+msgid "Tracer2 error"
+msgstr "Ошибка Tracer2"
+
+msgid "Parameter for server request"
+msgstr "Параметры запроса к серверу"
+
+msgid "Tile size:"
+msgstr "Размер квадрата:"
+
+msgid "Resolution:"
+msgstr "Разрешение:"
+
+msgid "Mode:"
+msgstr "Режим:"
+
+msgid "Threshold:"
+msgstr "Порог:"
+
+msgid "Points per circle:"
+msgstr "Точек на круг:"
+
+msgid "Tag:"
+msgstr "Тег:"
+
+msgid "Preferred values:"
+msgstr "Предпочтительные значения:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "Удалить параметр \"{0}\"?"
+
+msgid "Add new"
+msgstr "Добавить новый"
+
+msgid "Add predefined"
+msgstr "Добавить предопределённый"
+
+msgid "Select predefined parameter"
+msgstr "Выберите предопределённый параметр"
+
+msgid "Modify list of parameter for server request."
+msgstr "Изменить список параметров запроса к серверу."
+
+msgid "Parameter:"
+msgstr "Параметр:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+"Tracer2Server не запущен. Пожалуйста, запустите сервер.\n"
+"Если у вас нет сервера, загрузите его с\n"
+"{0}."
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "Tracer2Server ничего не нашел."
+
+msgid "Tracer2Server has detected an error."
+msgstr "Tracer2Server обнаружил ошибку."
+
msgid "GPG"
msgstr "GPG"
@@ -26710,9 +28700,6 @@ msgstr "Экспортировать подписи в XML..."
msgid "Save Signatures file"
msgstr "Сохранить файл подписей"
-msgid "Download OSM"
-msgstr "Скачать OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr "Получить все упомянутые, но отсутствующие OSM объекты с OSM сервера."
@@ -26736,6 +28723,10 @@ msgstr "Скачать объекты с сервера"
msgid "Download signed data"
msgstr "Скачать подписанные данные"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Внимание: Ошибка проигнорирована, поскольку задача была отменена. Ошибка: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -26902,9 +28893,6 @@ msgstr "Подписание отменено!"
msgid "Please give a tolerance in meters"
msgstr "Пожалуйста, укажите допуск в метрах"
-msgid "Accuracy"
-msgstr "Точность"
-
msgid "Select as much as you like:"
msgstr "Выберите столько, сколько нужно:"
@@ -27639,8 +29627,11 @@ msgstr "Восстановить объект..."
msgid "Undelete object by id"
msgstr "Восстановить объект по id"
-msgid "Select if the data should be added into a new layer"
-msgstr "Выделите, если данные должны быть добавлены в новый слой"
+msgid "Undelete Object"
+msgstr "Восстановить объект"
+
+msgid "Undelete object"
+msgstr "Восстановить объект"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -27649,11 +29640,8 @@ msgstr ""
"Введите тип и идентификатор удалённых объектов, которые нужно восстановить, "
"например, «n1 w2»"
-msgid "Undelete Object"
-msgstr "Восстановить объект"
-
-msgid "Undelete object"
-msgstr "Восстановить объект"
+msgid "Select if the data should be added into a new layer"
+msgstr "Выделите, если данные должны быть добавлены в новый слой"
msgid "Start undeleting"
msgstr "Начать восстановление"
@@ -27661,18 +29649,6 @@ msgstr "Начать восстановление"
msgid "Close dialog and cancel"
msgstr "Закрыть диалог и отменить"
-msgid "Will get {0}"
-msgstr "Ожидается получить {0}"
-
-msgid "Looking for {0}"
-msgstr "Поиск для {0}"
-
-msgid "Found {0}"
-msgstr "Найдено {0}"
-
-msgid "More tools"
-msgstr "Ещё инструменты"
-
msgid "Add nodes at intersections"
msgstr "Добавить точки на перекрестки"
@@ -27720,15 +29696,6 @@ msgstr ""
"Поместить выделенные объекты в те же отношения, что содержат объекты в "
"буфере обмена"
-msgid "Paste tags [testing]"
-msgstr "Вставить теги [тестирование]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr "Применить теги из буфера ко всем выделенным объектам."
-
-msgid "Paste tags"
-msgstr "Вставить теги"
-
msgid "Split Object"
msgstr "Разделить объекты"
@@ -27867,18 +29834,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Настройка пользовательского URL"
-msgid "Key is too long:"
-msgstr "Слишком длинный ключ:"
-
-msgid "Suspiciouns characters in tag:"
-msgstr "Подозрительные символы в теге:"
-
-msgid "Value too long (max 255 characters):"
-msgstr "Слишком длинное значение (максимум 255 символов):"
-
-msgid "Ingore warnings"
-msgstr "Игнорировать предупреждения"
-
msgid "Lat Lon tool"
msgstr "Создать по координатам..."
@@ -28096,9 +30051,6 @@ msgstr "Снять выделение с точек"
msgid "Removes all nodes from selection"
msgstr "Убрать точки из выделения"
-msgid "Video"
-msgstr "Видео"
-
msgid "Import Video"
msgstr "Импортировать видео"
@@ -28228,8 +30180,8 @@ msgstr "циклически"
msgid "mute"
msgstr "отключить звук"
-msgid "Scanned Map..."
-msgstr "Сканированная карта..."
+msgid "Walking Papers Scanned Map"
+msgstr "Сканированная карта с Walking-Papers.org"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28251,9 +30203,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Слой ({0}) Walking Papers в масштабе {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Скачать линию"
@@ -28404,9 +30353,6 @@ msgstr "Выбрать язык по умолчанию для статей Ви
msgid "Enter the Wikipedia language"
msgstr "Введите язык Википедии"
-msgid "Add Tag"
-msgstr "Добавить тег"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index a830486..59510f0 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -2,35 +2,35 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 13:05+0000\n"
-"Last-Translator: Vlado <babicvm at szm.sk>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-16 22:12+0000\n"
+"Last-Translator: aceman <aceman at inmail.sk>\n"
"Language-Team: Slovak <>\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) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 04:57+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:58+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr "{0}: voľba ''{1}'' nie je jednoznačná"
+msgstr "{0}: voľba \"{1}\" nie je jednoznačná"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr "{0}: voľba ''--{1}'' neumožňuje tvrdenie"
+msgstr "{0}: voľba \"--{1}\" neumožňuje parameter"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: voľba ''{1}{2}'' neumožňuje tvrdenie"
+msgstr "{0}: voľba \"{1}{2}\" neumožňuje parameter"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr "{0}: voľba ''{1}'' vyžaduje argument"
+msgstr "{0}: voľba \"{1}\" vyžaduje parameter"
msgid "{0}: unrecognized option ''--{1}''"
-msgstr "{0}: nerozpoznaná voľba ''--{1}''"
+msgstr "{0}: nerozpoznaná voľba \"--{1}\""
msgid "{0}: unrecognized option ''{1}{2}''"
-msgstr "{0}: nerozpoznaná voľba ''{1}{2}''"
+msgstr "{0}: nerozpoznaná voľba \"{1}{2}\""
msgid "{0}: illegal option -- {1}"
msgstr "{0}: ilegálna voľba -- {1}"
@@ -39,16 +39,31 @@ msgid "{0}: invalid option -- {1}"
msgstr "{0}: neplatná voľba -- {1}"
msgid "{0}: option requires an argument -- {1}"
-msgstr "{0}: voľba vyžaduje argument -- {1}"
+msgstr "{0}: voľba vyžaduje parameter -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr "Neplatná hodnota {0} pre parameter ''has_arg''"
+msgstr "Neplatná hodnota {0} pre parameter \"has_arg\""
msgid "Background Terms of Use"
msgstr "Podmienky použitia pozadia"
msgid "Opening link not supported on current platform (''{0}'')"
-msgstr "Otvorenie odkazu nie je aktuálnou platformou podporované (''{0}'')"
+msgstr "Otvorenie odkazu nie je aktuálnou platformou podporované (\"{0}\")"
+
+msgid "ERROR: {0}"
+msgstr "CHYBA: {0}"
+
+msgid "WARNING: {0}"
+msgstr "VAROVANIE: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "LADENIE: {0}"
+
+msgid "Cause: "
+msgstr "Príčina: "
msgid "Executing platform startup hook"
msgstr "Spúšťam platformu"
@@ -104,7 +119,7 @@ msgid "Exit JOSM"
msgstr "Ukončiť JOSM"
msgid "Continue, try anyway"
-msgstr "Pokračovať, skúsiť znovu"
+msgstr "Pokračovať, skúsiť aj tak"
msgid "Error"
msgstr "Chyba"
@@ -155,19 +170,19 @@ msgid "About JOSM..."
msgstr "O programe JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Varovanie: Neočakávaný formát URL základne API. Presmerovanie na info alebo "
-"históriu stránky pre objekt OSM pravdepodobne zlyhá. Základné URL pre "
-"základňu API je: ''{0}''"
+"Neočakávaný formát základného URL pre API. Presmerovanie na info alebo "
+"históriu stránky pre objekt OSM pravdepodobne zlyhá. Základné URL pre API "
+"je: \"{0}"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"VAROVANIE: neočakávaný formát API základnej URL. Presmerovanie na stránku "
-"používateľa OSM pravdepodobne zlyhá. API URL je: ''{0}''"
+"Neočakávaný formát základného URL pre API. Presmerovanie na stránku "
+"používateľa OSM pravdepodobne zlyhá. Základné URL pre API je: \"{0}\""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -205,7 +220,7 @@ msgid ""
"<html>There are no layers the source layer<br>''{0}''<br>could be merged "
"to.</html>"
msgstr ""
-"<html>Nie sú vrstvy kam by zdrojová vrstva<br>''{0}''<br>mohla byť "
+"<html>Nie sú vrstvy kam by zdrojová vrstva<br>\"{0}\"<br>mohla byť "
"zlúčená.</html>"
msgid "No target layers"
@@ -214,6 +229,9 @@ msgstr "Žiadne cieľové vrstvy"
msgid "Add imagery layer {0}"
msgstr "Pridať vrstvu mapového podkladu {0}"
+msgid "Select image format for WMS layer"
+msgstr "Zvoľte formát obrázkov pre vrstvu WMS"
+
msgid "Select WMS layers"
msgstr "Vyberte WMS vrstvy"
@@ -247,22 +265,19 @@ msgid "Align Nodes in Circle"
msgstr "Zarovnať body do kruhu"
msgid "Move the selected nodes into a circle."
-msgstr "Presunúť označené body do kruhu"
+msgstr "Presunúť označené body do kruhu."
msgid "Tool: {0}"
msgstr "Nástroj: {0}"
msgid "Please select at least four nodes."
-msgstr "Vyberte minimálne 4 body"
-
-msgid "Information"
-msgstr "Informácia"
+msgstr "Vyberte minimálne 4 body."
msgid "Align Nodes in Line"
msgstr "Zarovnať body na priamku"
msgid "Move the selected nodes in to a line."
-msgstr "Presunúť označené body na priamku"
+msgstr "Presunúť označené body na priamku."
msgid "Please select at least three nodes."
msgstr "Vyberte prosím aspoň 3 body."
@@ -282,6 +297,9 @@ msgstr "konflikt"
msgid "download"
msgstr "stiahnuté"
+msgid "problem"
+msgstr "problém"
+
msgid "previous"
msgstr "predchádzajúce"
@@ -289,7 +307,10 @@ msgid "next"
msgstr "nasledujúce"
msgid "Nothing selected to zoom to."
-msgstr "Nie je zvolené nič, čo by se mohlo priblížiť."
+msgstr "Nie je zvolené nič, čo by sa mohlo priblížiť."
+
+msgid "Information"
+msgstr "Informácia"
msgid "Zoom to {0}"
msgstr "Priblížiť na {0}"
@@ -325,7 +346,7 @@ msgid "No open changesets"
msgstr "Neotvorené súbory zmien"
msgid "Downloading open changesets ..."
-msgstr "Sťahujem otvorené súbory zmien"
+msgstr "Sťahujem otvorené súbory zmien ..."
msgid "Combine Way"
msgstr "Spojiť cesty"
@@ -344,27 +365,28 @@ msgid ""
"reverse some of them?"
msgstr ""
"Cesty nemôžu byť spojené, pretože nemajú jednotný smer. Chcete otočiť smer "
-"ciest?"
+"niektorých ciest?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)"
+msgstr ""
+"Nepodarilo sa spojiť cesty<br>(Nemohli byť spojené do jediného reťazca bodov)"
msgid "Combine {0} ways"
-msgstr "Spojiť {0} cesty"
+msgstr "Spojiť {0} cesty (ciest)"
msgid "Please select at least two ways to combine."
-msgstr "Prosím, vyberte aspoň dve cesty pre spojenie."
+msgstr "Prosím vyberte aspoň dve cesty pre spojenie."
msgid "Copy"
msgstr "Skopírovať"
msgid "Copy selected objects to paste buffer."
-msgstr "Vybrať označené objekty pre vloženie."
+msgstr "Kopírovať vybrané body do zásobníka."
msgid "Please select something to copy."
-msgstr "Prosím zvoľ niečo pre kopírovanie"
+msgstr "Prosím zvoľte niečo pre kopírovanie"
msgid "Copy Coordinates"
msgstr "Skopírovať súradnice"
@@ -406,18 +428,37 @@ msgstr "Odstrániť"
msgid "Delete selected objects."
msgstr "Zmazať zvolené objekty."
+msgid "Toggle dialogs panel"
+msgstr "Prepnúť lištu s panelmi"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Prepnúť lištu s panelmi, maximalizovať miesto na mapu"
+
msgid "Distribute Nodes"
msgstr "Rozložiť body rovnomerne"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Rozložiť zvolené body v rovnakej vzdialenosti od seba pozdĺž trasy."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignoruje sa {0} bodov s prázdnymi súradnicami"
+
msgid "Download from OSM..."
msgstr "Stiahnuť z OSM..."
msgid "Download map data from the OSM server."
msgstr "Stiahnutie mapových údajov z OSM servera."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí "
+"dát.<br>Chcete pokračovať?</html>"
+
+msgid "Download data"
+msgstr "Stiahnuť dáta"
+
msgid "Download object..."
msgstr "Stiahnuť objekt..."
@@ -426,21 +467,21 @@ msgstr "Stiahnuť OSM objekt s ID."
msgid "Object could not be downloaded"
msgid_plural "Some objects could not be downloaded"
-msgstr[0] "Objekt nie je možné stiahnuť"
-msgstr[1] "Objektov nie je možné stiahnuť"
+msgstr[0] "Niekoľko objektov nie je možné stiahnuť"
+msgstr[1] "Objekt nie je možné stiahnuť"
msgstr[2] "Objekty nie je možné stiahnuť"
msgid "One object could not be downloaded.<br>"
msgid_plural "{0} objects could not be downloaded.<br>"
-msgstr[0] "Jeden objekt nemohol byť stiahnutý.<br>"
-msgstr[1] "{0} objektov nebolo možné stiahnuť.<br>"
+msgstr[0] "{0} objektov nebolo možné stiahnuť.<br>"
+msgstr[1] "{0} objekt nemohol byť stiahnutý.<br>"
msgstr[2] "{0} objekty nebolo možné stiahnuť.<br>"
msgid ""
"The server replied with response code 404.<br>This usually means, the server "
"does not know an object with the requested id."
msgstr ""
-"Server odpovedal s kódom 404.<br>To obvykle znamená, že server nepozná "
+"Server odpovedal s kódom 404.<br>To obyčajne znamená, že server nepozná "
"objekt s požadovaným id."
msgid "missing objects:"
@@ -448,14 +489,14 @@ msgstr "chýbajúce objekty:"
msgid "Object deleted"
msgid_plural "Objects deleted"
-msgstr[0] "Objekt bol vymazaný"
-msgstr[1] "Objektov bolo vymazaných"
+msgstr[0] "Objektov bolo vymazaných"
+msgstr[1] "Objekt bol vymazaný"
msgstr[2] "Objekty boli vymazané"
msgid "One downloaded object is deleted."
msgid_plural "{0} downloaded objects are deleted."
-msgstr[0] "Jeden sťahovaný objekt je vymazaný."
-msgstr[1] "{0} sťahovaných objektov je vymazaných."
+msgstr[0] "{0} sťahovaných objektov je vymazaných."
+msgstr[1] "{0} sťahovaný objekt je vymazaný."
msgstr[2] "{0} sťahované objekty sú vymazané."
msgid "Ok"
@@ -518,6 +559,9 @@ msgstr "História"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Zobraziť históriu o OSM cestách, bodoch, alebo relácií."
+msgid "Show history"
+msgstr "Zobraz históriu"
+
msgid "History (web)"
msgstr "História (web)"
@@ -599,9 +643,9 @@ msgstr "Potvrdenie zlúčenia oblasti"
msgid "The selected way has nodes outside of the downloaded data region."
msgid_plural ""
"The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "Vybratá cesta obsahuje body mimo stiahnutej oblasti údajov."
-msgstr[1] "Vybraté trasy obsahujú body mimo stiahnutej oblasti údajov."
-msgstr[2] "Vybraté trasy obsahujú body mimo stiahnutej oblasti údajov."
+msgstr[0] "Vybrané cesty obsahujú body mimo stiahnutej oblasti údajov."
+msgstr[1] "Vybraná cesta obsahuje body mimo stiahnutej oblasti údajov."
+msgstr[2] "Vybrané cesty obsahujú body mimo stiahnutej oblasti údajov."
msgid "This can lead to nodes being deleted accidentally."
msgstr "To môže spôsobiť nechcené vymazanie bodov."
@@ -634,23 +678,23 @@ msgid "Delete relations"
msgstr "Zmazať relácie"
msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr "Vymazať cesty, ktoré nie sú vnútornou časťou multipolygónu"
+msgstr "Vymazať cesty, ktoré nie sú vnútornou časťou multipolygónu"
msgid "Joined overlapping areas"
msgstr "Spojené prekrývajúce sa plochy"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Niektoré z ciest mali časť vzťahov (relations), ktoré boli zmenené. Prosím "
-"overte či to nepredstavuje nejakú chybu."
+"Niektoré cesty boli súčasťou relácií, ktoré sa zmenili.<br>Prosím "
+"skontrolujte, či nevznikli žiadne chyby."
msgid "Fix tag conflicts"
msgstr "Oprava konfliktu (rozporu) značiek"
msgid "Split ways into fragments"
-msgstr "Rozdelenie cesty do fragmentov"
+msgstr "Rozdelenie cesty na fragmenty"
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
msgstr ""
@@ -683,13 +727,13 @@ msgid "Remove tags from inner ways"
msgstr "Vymazať značky z vnútorných ciest"
msgid "Join Areas Function"
-msgstr "Funkcie Spojenia Plôch (Join Areas Function)"
+msgstr "Funkcia spojenia plôch"
msgid "Join Node to Way"
msgstr "Vložiť bod do cesty"
msgid "Include a node into the nearest way segments"
-msgstr "Zahrnúť bod do najbližšieho segmentu cesty"
+msgstr "Zahrnúť bod do najbližšieho segmentu cesty"
msgid "Join Node and Line"
msgstr "Spojiť body a línie"
@@ -791,7 +835,7 @@ msgid ""
"one by one, by using ''<i>Merge selection</i>''.<br /><br />Are you sure you "
"want to continue?"
msgstr ""
-"Chystáte sa zlúčiť dáta medzi vrstvami ''{0}'' a ''{1}''.<br /><br />Tieto "
+"Chystáte sa zlúčiť dáta medzi vrstvami \"{0}\" a \"{1}\".<br /><br />Tieto "
"vrstvy majú odlišné nahrávacie stratégie a nemali by byť zlúčené tak ako "
"sú.<br />Ich zlúčenie bude mať za následok vynútenie striktnejšej stratégie "
"(neodporúčané nahratie) pre ''{1}''.<br /><br /><b>Toto nie je odporúčaný "
@@ -809,23 +853,22 @@ msgid "Merge nodes into the oldest one."
msgstr "Zlúčiť body do najstaršieho bodu"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Vyberte prosím aspoň dva body na zlúčenie, alebo bod, ktorý je blízko iného "
-"bodu."
+"Prosím vyberte aspoň dva body na spojenie alebo bod blízko iného bodu."
msgid "Abort Merging"
-msgstr "Zrušiť spojovanie"
+msgstr "Zrušiť spojenie"
msgid "Click to abort merging nodes"
-msgstr "Kliknúť pre zrušenie spojovania bodov"
+msgstr "Kliknúť pre zrušenie spojenia bodov"
msgid ""
"Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
msgstr ""
-"Nedajú sa zlúčiť uzly: Mala by byť zmazaná cesta {0}, ktorá je stále "
-"používaná {1}"
+"Nedajú sa zlúčiť body: Musela by byť zmazaná cesta {0}, ktorú stále používa "
+"{1}"
msgid "Merge {0} nodes"
msgstr "Zlúčiť {0} body"
@@ -845,7 +888,7 @@ msgid ""
"data</b>.<br />You should instead check and merge each object, <b>one by "
"one</b>.<br /><br />Are you sure you want to continue?"
msgstr ""
-"Chystáte sa zlúčiť viac ako 1 objekt medzi vrstvami ''{0}'' a ''{1}''.<br "
+"Chystáte sa zlúčiť viac ako 1 objekt medzi vrstvami \"{0}\" a \"{1}\".<br "
"/><br /><b>Toto nie je odporúčaný spôsob ako zlučovať dáta</b>.<br />Miesto "
"toho by ste mali skontrolovať a zlúčiť každý objekt, <b>jeden po "
"druhom</b>.<br /><br />Naozaj chcete pokračovať?"
@@ -878,7 +921,7 @@ msgid "Move {0}"
msgstr "Presunúť {0}"
msgid "Moves Objects {0}"
-msgstr "Presunutie objektov {0}"
+msgstr "Presunie objekty {0}"
msgid "Cannot move objects outside of the world."
msgstr "Nemôžem presúvať objekty mimo svet."
@@ -909,9 +952,9 @@ msgstr "Otváranie súborov"
msgid "Cannot open {0} file with the file importer ''{1}''."
msgid_plural "Cannot open {0} files with the file importer ''{1}''."
-msgstr[0] "Nemožno otvoriť súbor {0} importérom súborov ''{1}''."
-msgstr[1] "Nemožno otvoriť súbory {0} importérom súborov ''{1}''."
-msgstr[2] "Nemožno otvoriť súbory {0} importérom súborov ''{1}''."
+msgstr[0] "Nemožno otvoriť {0} súborov importérom súborov \"{1}\"."
+msgstr[1] "Nemožno otvoriť {0} súbor importérom súborov \"{1}\"."
+msgstr[2] "Nemožno otvoriť {0} súbory importérom súborov \"{1}\"."
msgid ""
"Cannot open {0} file because file does not exist or no suitable file "
@@ -920,14 +963,14 @@ msgid_plural ""
"Cannot open {0} files because files do not exist or no suitable file "
"importer is available."
msgstr[0] ""
-"Nedá sa otvoriť súbor {0}, pretože súbor neexistuje alebo nie je k "
+"Nedá sa otvoriť {0} súborov, pretože súbory neexistujú alebo nie je k "
"dispozícií vhodný importér."
msgstr[1] ""
-"Nedá sa otvoriť {0} súborov, pretože súbory neexistujú ani žiadne vhodné "
-"súbory nie je k dispozícii."
+"Nedá sa otvoriť {0} súbor, pretože súbor neexistuje alebo nie je k "
+"dispozícií vhodný importér."
msgstr[2] ""
-"Nedajú sa otvoriť {0} súbory, pretože súbory neexistujú ani žiadne vhodné "
-"súbory nie je k dispozícii."
+"Nedajú sa otvoriť {0} súbory, pretože súbory neexistujú alebo nie je k "
+"dispozícií vhodný importér."
msgid "no importer"
msgstr "žiadny importér"
@@ -944,9 +987,9 @@ msgstr "Otvoriť súbor"
msgid "Opening {0} file..."
msgid_plural "Opening {0} files..."
-msgstr[0] "Otváranie súboru {0}..."
-msgstr[1] "Otváranie súborov {0}..."
-msgstr[2] "Otváranie súborov {0}..."
+msgstr[0] "Otváranie {0} súborov..."
+msgstr[1] "Otváranie {0} súboru..."
+msgstr[2] "Otváranie {0} súborov..."
msgid "Opening file ''{0}'' ..."
msgstr "Otváranie súboru ''{0}'' ..."
@@ -985,11 +1028,11 @@ msgid "Download Data"
msgstr "Sťahovanie dát"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html> Nemožno otvoriť URL''{0}'', pretože žiadne vhodné úlohy pre "
-"sťahovanie nie sú k dispozícii. </html>"
+"Nepodarilo sa otvoriť URL ''{0}''<br>Nasledujúce úlohy sťahovania akceptujú "
+"tieto tvary URL:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1005,7 +1048,7 @@ msgstr ""
"Obnovenie (undo). Prednastavené je Shift+Q.)"
msgid "Orthogonalize Shape"
-msgstr "Pravouhlý tvar"
+msgstr "Vytvoriť pravouhlý tvar"
msgid "Move nodes so all angles are 90 or 180 degrees"
msgstr "Presunúť body tak, aby mali všetky uhly 90 alebo 180 stupňov"
@@ -1020,16 +1063,11 @@ msgid "Orthogonalize / Undo"
msgstr "Pravouhlosť / Obnovenie (undo)"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Pravouhlý tvar / Obnovenie (undo)\n"
-"Prosím vyberte body, ktoré boli posunuté predchádzajúcou funkciou pre "
-"pravouhlosť!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Obnovenie (undo) pravouhlého tvaru"
+"Pravouhlý tvar / Obnovenie<br>Prosím vyberte body, ktoré boli presunuté "
+"predchádzajúcou operáciou \"Pravouhlý tvar\"!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1049,9 +1087,6 @@ msgstr "Pravouhlosť"
msgid "Usage"
msgstr "Využitie"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Vybrané prvky nemôžu byť zpravouhlené"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1066,7 +1101,7 @@ msgid "Paste"
msgstr "Vložiť"
msgid "Paste contents of paste buffer."
-msgstr "Vložiť zo schránky"
+msgstr "Vložiť obsah zásobníka."
msgid "Delete incomplete members?"
msgstr "Vymazať nekompletné členy?"
@@ -1096,8 +1131,8 @@ msgstr[2] "Vkladanie {0} značiek"
msgid "to {0} object"
msgid_plural "to {0} objects"
-msgstr[0] "do {0} objektu"
-msgstr[1] "do {0} objektov"
+msgstr[0] "do {0} objektov"
+msgstr[1] "do {0} objektu"
msgstr[2] "do {0} objektov"
msgid "Preferences..."
@@ -1110,30 +1145,31 @@ msgid "Preferences"
msgstr "Nastavenia"
msgid "Purge..."
-msgstr "Čistím(purge)..."
+msgstr "Zabudnúť..."
msgid "Forget objects but do not delete them on server when uploading."
-msgstr "Zabudnuté objekty, avšak nebudú zmazane na serveri po nahrávaní."
+msgstr ""
+"Zabudnúť objekty, ktoré však nebudú zmazané na serveri pri nahrávaní."
msgid "Purge"
-msgstr "Vyčistiť"
+msgstr "Zabudnúť"
msgid "Confirm Purging"
-msgstr "Potvrdiť vymazanie"
+msgstr "Potvrdiť zabudnutie"
msgid ""
"This operation makes JOSM forget the selected objects.<br> They will be "
"removed from the layer, but <i>not</i> deleted<br> on the server when "
"uploading."
msgstr ""
-"Táto operácia je pre JOSM zabudnuté vybrané objekty. <br> Budú odstránené z "
-"vrstvy, ale <i>nebudú</i>vymazané<br> na serveri pri nahrávaní."
+"Táto operácia nechá JOSM zabudnúť vybrané objekty.<br> Budú odstránené z "
+"vrstvy, ale <i>nebudú</i> vymazané<br> na serveri pri nahrávaní."
msgid ""
"The following dependent objects will be purged<br> in addition to the "
"selected objects:"
msgstr ""
-"Nasledujúce závislé objekty budú vyčistené <br> okrem vybraných objektov:"
+"Nasledujúce závislé objekty budú zabudnuté<br> spolu s vybranými objektmi:"
msgid "Add to selection"
msgstr "Pridať k výberu"
@@ -1142,12 +1178,11 @@ msgid ""
"Some of the objects are modified.<br> Proceed, if these changes should be "
"discarded.</html>"
msgstr ""
-"Niektoré objekty sú upravené.<br>Pokračovať, ak tieto zmeny budú zrušené. "
-"\r\n"
-"</html>"
+"Niektoré objekty sú upravené.<br> Pokračujte, ak tieto zmeny majú byť "
+"zrušené.</html>"
msgid "Clear Undo/Redo buffer"
-msgstr "Prázdna Undo/Redo pamäť"
+msgstr "Vyprázdniť pamäť pre navrátenie akcie"
msgid "Redo"
msgstr "Opakovať"
@@ -1170,6 +1205,15 @@ msgstr "Tiež premenovať súbor"
msgid "Could not rename file ''{0}''"
msgstr "Nemôžem premenovať súbor ''{0}''"
+msgid "Restart"
+msgstr "Reštartovať"
+
+msgid "Restart the application."
+msgstr "Reštartovať aplikáciu"
+
+msgid "Click to restart later."
+msgstr "Kliknite ak chcete reštartovať neskôr."
+
msgid "Reverse way"
msgstr "Otočiť smer cesty"
@@ -1195,7 +1239,7 @@ msgid "File {0} exists. Overwrite?"
msgstr "Súbor {0} existuje. Prepísať ho?"
msgid "No Exporter found! Nothing saved."
-msgstr "Žiadny exportér nenájdený! Nič zachránené.."
+msgstr "Žiadny exportér nenájdený! Nič nebolo uložené."
msgid "File exists. Overwrite?"
msgstr "Súbor už existuje. Prepísať?"
@@ -1222,9 +1266,6 @@ msgstr "Nahrať sedenie"
msgid "Load a session from file."
msgstr "Nahrať sedenie zo súboru."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Súbor sedenia (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Otvoriť sedenie"
@@ -1233,7 +1274,7 @@ msgstr "Načítava sa sedenie ''{0}''"
msgid "<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>"
msgstr ""
-"<html>Nedá sa načítať súbor sedenia ''{0}''.<br>Chyby je:<br>{1}</html>"
+"<html>Nedá sa načítať súbor sedenia ''{0}''.<br>Chyba je:<br>{1}</html>"
msgid "Data Error"
msgstr "Dátová chyba"
@@ -1282,7 +1323,7 @@ msgstr ""
"hláseniu chyby"
msgid "Help: {0}"
-msgstr "Pomoc: {0}"
+msgstr "Nápoveda: {0}"
msgid "Status Report"
msgstr "Správa o stave"
@@ -1290,6 +1331,9 @@ msgstr "Správa o stave"
msgid "Copy to clipboard and close"
msgstr "Kopírovať do schránky a zavrieť"
+msgid "Report bug"
+msgstr "Nahlásiť chybu"
+
msgid "Close"
msgstr "Zavrieť"
@@ -1300,34 +1344,35 @@ msgid "Delete unnecessary nodes from a way."
msgstr "Zmazať nepotrebné body z cesty."
msgid "Please select at least one way to simplify."
-msgstr "Vyberte aspoň jednu cestu k zjednodušeniu."
+msgstr "Vyberte aspoň jednu cestu na zjednodušenie."
msgid "Yes"
msgstr "Áno"
msgid "Simplify all selected ways"
-msgstr "Zjednodušiť všetky vybraté cesty"
+msgstr "Zjednodušiť všetky vybrané cesty"
msgid "Cancel operation"
-msgstr "Zušiť operáciu"
+msgstr "Zrušiť operáciu"
msgid ""
"The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr "Výber obsahuje {0} cesty. Naozaj ich chcete všetky zjednodušiť?"
+msgstr ""
+"Výber obsahuje {0} cesty (ciest). Naozaj ich chcete všetky zjednodušiť?"
msgid "Simplify ways?"
msgstr "Zjednodušiť cesty?"
msgid "Simplify {0} way"
msgid_plural "Simplify {0} ways"
-msgstr[0] "Zjednodušiť {0} cestu"
-msgstr[1] "Zjednodušiť {0} cesty"
-msgstr[2] "Zjednodušiť {0} ciest"
+msgstr[0] "Zjednodušiť {0} ciest"
+msgstr[1] "Zjednodušiť {0} cestu"
+msgstr[2] "Zjednodušiť {0} cesty"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "Zjednodušenie cesty (odstránenie {0} bodu)"
-msgstr[1] "Zjednodušenie cesty (odstránenie {0} bodov)"
+msgstr[0] "Zjednodušenie cesty (odstránenie {0} bodov)"
+msgstr[1] "Zjednodušenie cesty (odstránenie {0} bodu)"
msgstr[2] "Zjednodušenie cesty (odstránenie {0} bodov)"
msgid "Split Way"
@@ -1346,8 +1391,8 @@ msgstr "Zvolené body nezdieľajú rovnakú cestu."
msgid "The selected node is not in the middle of any way."
msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "Vybratý bod nie je v strede cesty."
-msgstr[1] "Vybraté body nie sú v strede cesty."
+msgstr[0] "Vybraté body nie sú v strede cesty."
+msgstr[1] "Vybratý bod nie je v strede cesty."
msgstr[2] "Vybraté body nie sú v strede cesty."
msgid ""
@@ -1357,10 +1402,10 @@ msgid_plural ""
"There is more than one way using the nodes you selected. Please select the "
"way also."
msgstr[0] ""
-"Je tam viac ako jedna cesta používajúca bod, ktorý ste vybrali. Prosím "
+"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím "
"vyberte tiež cestu."
msgstr[1] ""
-"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím "
+"Je tam viac ako jedna cesta používajúca bod, ktorý ste vybrali. Prosím "
"vyberte tiež cestu."
msgstr[2] ""
"Je tam viac ako jedna cesta používajúca body, ktoré ste vybrali. Prosím "
@@ -1377,22 +1422,21 @@ msgstr ""
"cesty.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Funkcia umiestnená v relačnom člene bola skopírovaná do všetkých "
-"nových ciest.<br>Mali by ste toto potvrdiť a opraviť to ak je to "
-"potrebné.</html>"
+"Členstvo v relácii, založené na roli, bolo skopírované do všetkých nových "
+"ciest.<br>Mali by ste to skontrolovať a v prípade potreby opraviť."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Vzťah relácie bol skopírovaný do všetkých nových ciest.<br>Mali by ste "
-"toto overiť a opraviť ak je to nutné.</html>"
+"Členstvo v relácii bolo skopírované do všetkých nových ciest.<br>Mali by ste "
+"to skontrolovať a v prípade potreby opraviť."
msgid "Split way {0} into {1} parts"
-msgstr "Rozdeliť cestu {0} do {1} častí"
+msgstr "Rozdeliť cestu {0} na {1} častí"
msgid "Toggle GPX Lines"
msgstr "Zapnúť GPX čiary"
@@ -1468,9 +1512,9 @@ msgstr "Duplikovať do {0} bodov"
msgid "Dupe {0} node into {1} nodes"
msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Zdvojený {0} bod v {1} bode"
-msgstr[1] "Zdvojené {0} bodes v {1} bode"
-msgstr[2] "Zdvojené {0} bodes v {1} bode"
+msgstr[0] "Duplikovať {0} bodov do {1} bodov"
+msgstr[1] "Duplikovať {0} bod do {1} bodov"
+msgstr[2] "Duplikovať {0} body do {1} bodov"
msgid "Unglue confirmation"
msgstr "Potvrdiť odlepenie"
@@ -1480,16 +1524,39 @@ msgid ""
"downloaded.<br>This can cause problems because other objects (that you do "
"not see) might use them.<br>Do you really want to unglue?"
msgstr ""
-"Chystáte sa pohnúť body mimo oblasť, ktorú si stiahli. <br> To môže spôsobiť "
-"problémy, pretože ostatné objekty (ktoré nevidíte) ich môžu používať. <br> "
-"Naozaj chcete, s nimi hýbať?"
+"Chystáte sa pohnúť body mimo oblasť, ktorú si stiahli.<br>To môže spôsobiť "
+"problémy, pretože ostatné objekty (ktoré nevidíte) ich môžu "
+"používať.<br>Naozaj chcete, s nimi hýbať?"
msgid ""
"You are about to unglue incomplete objects.<br>This will cause problems "
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
-"Chystáte sa pohnúť neúplné objekty. <br> To spôsobí problémy, pretože nie je "
-"vidieť skutočný objekt. <br> Naozaj chcete, s ním hýbať?"
+"Chystáte sa pohnúť neúplné objekty.<br>To spôsobí problémy, pretože nie je "
+"vidieť skutočný objekt.<br>Naozaj chcete, s ním hýbať?"
+
+msgid "Disconnect Node from Way"
+msgstr "Odpojiť bod z cesty"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Odpojiť body od cesty, ktorej patria"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Vyberte aspoň jeden bod na odpojenie."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Vybrané body nemôžu byť od ničoho odpojené."
+msgstr[1] "Vybraný bod nemôže byť od ničoho odpojený."
+msgstr[2] "Vybrané body nemôžu byť od ničoho odpojené."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] "Dotknutá cesta by po odpojení vybraných bodov zmizla."
+msgstr[1] "Dotknutá cesta by po odpojení vybraného bodu zmizla."
+msgstr[2] "Dotknutá cesta by po odpojení vybraných bodov zmizla."
msgid "Undo"
msgstr "Späť"
@@ -1515,9 +1582,6 @@ msgstr "Aktualizácia dát"
msgid "Updates the objects in the active data layer from the server."
msgstr "Aktualizácia objektov v aktívnej dátovej vrstve zo servera."
-msgid "Download data"
-msgstr "Stiahnuť dáta"
-
msgid "Update modified"
msgstr "Aktualizovať zmenené"
@@ -1588,13 +1652,13 @@ msgid "Upload all changes in the current selection to the OSM server."
msgstr "Nahrať všetky zmeny v aktuálnom výbere na OSM server."
msgid "Checking parents for deleted objects"
-msgstr "Kontrola rodičovských pre zmazané objekty"
+msgstr "Kontrola rodičov pre zmazané objekty"
msgid "Reading parents of ''{0}''"
-msgstr "Čítanie rodičovských z ''{0}''"
+msgstr "Čítanie rodičov ''{0}''"
msgid "Checking for deleted parents in the local dataset"
-msgstr "Kontrola pre zmazané rodičovské v lokálnej dátovej sade"
+msgstr "Kontrola zmazaných rodičov v lokálnej dátovej sade"
msgid "Validation"
msgstr "Overiť"
@@ -1647,7 +1711,7 @@ msgid "Zoom to"
msgstr "Zväčšiť na"
msgid "Zoom to the object the first selected member refers to"
-msgstr "Priblížiť na objekt prvého vybratého člena odkazujúceho na"
+msgstr "Priblížiť na objekt, na ktorý odkazuje prvý vybraný člen"
msgid "Zooming disabled because layer of this relation is not active"
msgstr "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna"
@@ -1656,13 +1720,13 @@ msgid "Zooming disabled because there is no selected member"
msgstr "Zväčšovanie je vypnuté pretože nie je vybratý člen"
msgid "Zoom to the first selected node"
-msgstr "Priblížiť na prvý vybraný uzol"
+msgstr "Priblížiť na prvý vybraný bod"
msgid "Zooming disabled because layer of this way is not active"
msgstr "Približovanie je zakázané, pretože vrstva tejto cesty nie je aktívna"
msgid "Zooming disabled because there is no selected node"
-msgstr "Približovanie je zakázané, pretože nie je vybraný žiadny uzol"
+msgstr "Približovanie je zakázané, pretože nie je vybraný žiadny bod"
msgctxt "audio"
msgid "Back"
@@ -1722,6 +1786,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Spomalené prehrávanie"
+msgid "Download GPS"
+msgstr "Stiahnuť GPS"
+
msgid "Downloading GPS data"
msgstr "Sťahujem GPS dáta"
@@ -1731,6 +1798,18 @@ msgstr "Stiahnuté GPX dáta"
msgid "Markers from {0}"
msgstr "Značky z {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Stiahnuť komprimovanú OSM zmenu"
+
+msgid "Download OSM Change"
+msgstr "Stiahnuť OSM zmenu"
+
+msgid "Download Compressed OSM"
+msgstr "Stiahnuť komprimované OSM"
+
+msgid "Download OSM"
+msgstr "Stiahnuť OSM"
+
msgid "Downloading data"
msgstr "Sťahovanie dát"
@@ -1751,6 +1830,33 @@ msgstr "Príkaz"
msgid "Request details: {0}"
msgstr "Požadované detaily: {0}"
+msgid "Download OSM URL"
+msgstr "Stiahnuť OSM URL"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Počas importu bolo {0} konfliktov"
+msgstr[1] "Počas importu bol {0} konflikt"
+msgstr[2] "Počas importu boli {0} konflikty"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konfliktov počas sťahovania"
+msgstr[1] "Konflikt počas sťahovania"
+msgstr[2] "Konflikty počas sťahovania"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Nahrávam rodičov bodu {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Nahrávam rodičov cesty {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Nahrávam rodičov relácie {2}"
+
+msgid "Download session"
+msgstr "Sťahovanie"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Stiahnuté {0} z {1} (zostáva stiahnuť {2})"
@@ -1782,15 +1888,15 @@ msgid_plural ""
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
msgstr[0] ""
-"Vo Vašej lokálnej dátovej sade je {0} objekt, ktorý môže byť zmazaný na "
-"serveri.<br>Ak sa neskôr pokúsite o jeho zmazanie alebo aktualizáciu, server "
+"Vo Vašej lokálnej dátovej sade je {0} objektov, ktoré môžu byť zmazané na "
+"serveri.<br>Ak sa neskôr pokúsite o ich zmazanie alebo aktualizáciu, server "
"pravdepodobne nahlási konflikt."
msgstr[1] ""
-"Vo Vašej lokálnej dátovej sade sú {0} objekty, ktoré môžu byť zmazané na "
-"serveri.<br>Ak sa neskôr pokúsite o ich zmazanie alebo aktualizáciu, server "
+"Vo Vašej lokálnej dátovej sade je {0} objekt, ktorý môže byť zmazaný na "
+"serveri.<br>Ak sa neskôr pokúsite o jeho zmazanie alebo aktualizáciu, server "
"pravdepodobne nahlási konflikt."
msgstr[2] ""
-"Vo Vašej lokálnej dátovej sade je {0} objektov, ktoré môžu byť zmazané na "
+"Vo Vašej lokálnej dátovej sade sú {0} objekty, ktoré môžu byť zmazané na "
"serveri.<br>Ak sa neskôr pokúsite o ich zmazanie alebo aktualizáciu, server "
"pravdepodobne nahlási konflikt."
@@ -1799,11 +1905,11 @@ msgid ""
msgid_plural ""
"Click <strong>{0}</strong> to check the state of these objects on the server."
msgstr[0] ""
-"Kliknite na tlačidlo <strong>{0}</strong> ak chcete skontrolovať stav tohto "
-"objektu na serveri."
-msgstr[1] ""
"Kliknite na tlačidlo <strong>{0}</strong> ak chcete skontrolovať stav týchto "
"objektov na serveri."
+msgstr[1] ""
+"Kliknite na tlačidlo <strong>{0}</strong> ak chcete skontrolovať stav tohto "
+"objektu na serveri."
msgstr[2] ""
"Kliknite na tlačidlo <strong>{0}</strong> ak chcete skontrolovať stav týchto "
"objektov na serveri."
@@ -1820,27 +1926,6 @@ msgstr "Nasledujúce chyby nastali počas hromadného sťahovania: {0}"
msgid "Errors during download"
msgstr "Chyby počas sťahovania"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Počas importu bol {0} konflikt"
-msgstr[1] "Počas importu boli {0} konflikty"
-msgstr[2] "Počas importu bolo {0} konfliktov"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt počas sťahovania"
-msgstr[1] "Konflikty počas sťahovania"
-msgstr[2] "Konfliktov počas sťahovania"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Nahrávam rodičovské z bodov {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Nahrávam rodičovské z cesty {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Nahrávam rodičovské z relácie {2}"
-
msgid "Error during download"
msgstr "Chyba počas sťahovania"
@@ -1873,7 +1958,7 @@ msgid "Backspace in Add mode"
msgstr "Backspace v pridávacom režime"
msgid "helper line"
-msgstr ""
+msgstr "pomocná čiara"
msgid "Cannot add a node outside of the world."
msgstr "Nemôžem pridať body ležiace mimo svet."
@@ -1902,7 +1987,7 @@ msgstr "Zvoliť bod pod kurzorom."
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
msgstr[0] "Vložiť nový bod do {0} ciest."
-msgstr[1] "Vložiť nový bod do cesty."
+msgstr[1] "Vložiť nový bod do {0} cesty."
msgstr[2] "Vložiť nový bod do {0} ciest."
msgid "Start new way from last node."
@@ -1954,7 +2039,7 @@ msgid "Switch angle snapping mode while drawing"
msgstr "Zapnúť/vypnúť zameriavanie uhlov počas kreslenia"
msgid "Extrude"
-msgstr "Vyťiahnuť (extrude)"
+msgstr "Vytiahnuť (extrude)"
msgid "Create areas"
msgstr "Vytvoriť plochy"
@@ -1982,7 +2067,7 @@ msgid "Extrude: helper line"
msgstr "Vytiahnuť: linku pomoci"
msgid "Extrude Way"
-msgstr "Vyťiahnuť cestu"
+msgstr "Vytiahnuť cestu"
msgid "Improve Way Accuracy"
msgstr "Zvýšiť presnosť ciest"
@@ -1990,6 +2075,9 @@ msgstr "Zvýšiť presnosť ciest"
msgid "Improve Way Accuracy mode"
msgstr "Režim zvýšenia presnosti ciest"
+msgid "improve way accuracy helper line"
+msgstr "pomocná čiara pre zvýšenie presnosti cesty"
+
msgid "Click on the way to start improving its shape."
msgstr "Kliknite na cestu, pre začatie vylepšovania jej tvaru."
@@ -2000,37 +2088,37 @@ msgid ""
"Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
"delete."
msgstr ""
-"Kliknite na pridanie nového uzla. Uvoľnite Ctrl na premiestnenie "
-"existujúcich uzlov alebo držte Alt na vymazávanie."
+"Kliknite na pridanie nového bodu. Uvoľnite Ctrl na premiestnenie "
+"existujúcich bodov alebo držte Alt na vymazávanie."
msgid ""
"Click to delete the highlighted node. Release Alt to move existing nodes or "
"hold Ctrl to add new nodes."
msgstr ""
-"Kliknite na vymazanie zvýrazneného uzla. Uvoľnite Alt na premiestnenie "
-"existujúcich uzlov alebo držte Ctrl na pridanie nových uzlov."
+"Kliknite na vymazanie zvýrazneného bodu. Uvoľnite Alt na premiestnenie "
+"existujúcich bodov alebo držte Ctrl na pridanie nových bodov."
msgid ""
"Click to move the highlighted node. Hold Ctrl to add new nodes, or Alt to "
"delete."
msgstr ""
-"Kliknite na premiestnenie zvýrazneného uzla. Držte Ctrl na pridanie nových "
-"uzlov, alebo Alt na vymazanie."
+"Kliknite na premiestnenie zvýrazneného bodu. Držte Ctrl na pridanie nových "
+"bodov, alebo Alt na vymazanie."
msgid "Cannot place a node outside of the world."
-msgstr "Nedá sa umiestniť uzol mimo sveta."
+msgstr "Nedá sa umiestniť bod mimo sveta."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Pridať nový uzol do cesty"
-msgstr[1] "Pridať nový uzol do {0} ciest"
-msgstr[2] "Pridať nový uzol do {0} ciest"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] "Pridať nový bod do {0} ciest"
+msgstr[1] "Pridať nový bod do {0} cesty"
+msgstr[2] "Pridať nový bod do {0} ciest"
msgid "Cannot delete node that is referenced by multiple objects"
-msgstr "Nedá sa zmazať uzol, ktorý je odkazovaný na viaceré objekty"
+msgstr "Nedá sa zmazať bod, ktorý je odkazovaný z viacerých objektov"
msgid "Cannot delete node that has tags"
-msgstr "Nedá sa zmazať uzol, ktorý obsahuje tagy"
+msgstr "Nedá sa zmazať bod, ktorý obsahuje značky"
msgid "Parallel"
msgstr "Rovnobežne"
@@ -2038,12 +2126,15 @@ msgstr "Rovnobežne"
msgid "Make parallel copies of ways"
msgstr "Vytvoriť paralelné kópie ciest"
+msgid "make parallel helper line"
+msgstr "vytvoriť paralelnú pomocnú čiaru"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
msgstr ""
"Vyberte spôsobom ako v Režime výberu. Ťahajte vybrané cesty, alebo jednu "
-"cestu pre vytvorenie rovnobežnej kópie (Alt zapína zachovanie tagu )"
+"cestu pre vytvorenie rovnobežnej kópie (Alt zapína zachovanie značky)"
msgid "Hold Ctrl to toggle snapping"
msgstr "Podržte Ctrl pre prepínanie prichytávania"
@@ -2069,7 +2160,7 @@ msgstr ""
"záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode."
msgid "Select"
-msgstr "Výber"
+msgstr "Vybrať"
msgid "Select, move, scale and rotate objects"
msgstr "Vybrať, presúvať, mierka a otočenie objektov"
@@ -2081,7 +2172,7 @@ msgid "Move them"
msgstr "Posunúť ich"
msgid "Undo move"
-msgstr "Krok späť posun"
+msgstr "Odvolať posun"
msgid ""
"You moved more than {0} elements. Moving a large number of elements is often "
@@ -2116,7 +2207,7 @@ msgstr ""
msgid "Add and move a virtual new node to way"
msgid_plural "Add and move a virtual new node to {0} ways"
msgstr[0] "Pridať a posunúť virtuálny nový bod do {0} ciest"
-msgstr[1] "Pridať a posunúť virtuálny nový bod do cesty"
+msgstr[1] "Pridať a posunúť virtuálny nový bod do {0} cesty"
msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest"
msgid "Zoom"
@@ -2141,12 +2232,12 @@ msgstr "Pridať výber do relácie"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] "Pridať výber {0} do relácie"
-msgstr[1] "Pridať výber {0} do relácií"
-msgstr[2] "Pridať výber {0} do relácií"
+msgstr[0] "Pridať výber do {0} relácií"
+msgstr[1] "Pridať výber do {0} relácie"
+msgstr[2] "Pridať výber do {0} relácií"
msgid "Delete the selected relation"
-msgstr "Zmazať vybraté relácie"
+msgstr "Zmazať vybrané relácie"
msgid "Download all members of the selected relations"
msgstr "Stiahnutie všetkých členov z vybraných relácií"
@@ -2176,16 +2267,16 @@ msgid "Select relation in relation list."
msgstr "Vybrať reláciu v obsahu relácií."
msgid "Add the members of all selected relations to current selection"
-msgstr "Pridajte členy všetkých vybraných relácií k súčasnému výberu"
+msgstr "Pridať členy všetkých vybraných relácií k súčasnému výberu"
msgid "Select the members of all selected relations"
-msgstr "Výber členov zo všetkých vybraných relácií"
+msgstr "Vybrať členov zo všetkých vybraných relácií"
msgid "Select members (add)"
-msgstr "Vybrať členy(pridať)"
+msgstr "Vybrať členov (pridať)"
msgid "Select members"
-msgstr "Výber členov"
+msgstr "Vybrať členov"
msgid "Add the selected relations to the current selection"
msgstr "Pridať vybranú reláciu k aktuálnemu výberu"
@@ -2194,7 +2285,7 @@ msgid "Set the current selection to the list of selected relations"
msgstr "Pridať aktuálny výber do zoznamu vybratých relácií"
msgid "Select relation (add)"
-msgstr "Vyberte reláciu (pridať)"
+msgstr "Vybrať reláciu (pridať)"
msgid "Select relation"
msgstr "Vybrať reláciu"
@@ -2299,35 +2390,35 @@ msgid "Invalid search expression"
msgstr "Chybný vyhľadávaný výraz"
msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key"
-msgstr "<b> Baker Street </b> - ''Baker'' a ''Street'' vo všetkých kľúčoch"
+msgstr "<b>Hlavná ulica</b> - \"Hlavná\" a \"ulica\" v niektorom kľúči"
msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key"
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' vo všetkých kľúčoch"
+msgstr "<b>\"Hlavná ulica\"</b> - reťazec \"Hlavná ulica\" v niektorom kľúči"
msgid "<b>key:Bak</b> - ''Bak'' anywhere in the key ''key''"
-msgstr "<b>key:Bak</b> - ''Bak'' kdekoľvek v kľúči ''key''"
+msgstr "<b>kľúč:Hlav</b> - \"Hlav\" kdekoľvek v kľúči \"kľúč\""
msgid "<b>-key:Bak</b> - ''Bak'' nowhere in the key ''key''"
-msgstr "<b>-key:Bak</b> - ''Bak'' nikde v kľúči ''key''"
+msgstr "<b>-kľúč:Hlav</b> - \"Hlav\" nikde v kľúči \"kľúč\""
msgid "<b>key=value</b> - key ''key'' with value exactly ''value''"
-msgstr "<b>kľúč=hodnota</b> - kľúč ''key'' presne s hodnotou ''hodnota''"
+msgstr "<b>kľúč=hodnota</b> - kľúč \"kľúč\" presne s hodnotou \"hodnota\""
msgid ""
"<b>key=*</b> - key ''key'' with any value. Try also <b>*=value</b>, "
"<b>key=</b>, <b>*=*</b>, <b>*=</b>"
msgstr ""
-"<b>kľúč=* </b> - kľúč ''key'' so žiadnu hodnotou. Skúste tiež <b>*= hodnota "
-"</b>, <b> kľúč =</b>, <b> *=*</b>, <b> *= </b>"
+"<b>kľúč=*</b> - kľúč \"kľúč\" s akoukoľvek hodnotou. Skúste tiež "
+"<b>*=hodnota</b>, <b>kľúč =</b>, <b>*=*</b>, <b>*=</b>"
msgid "<b>key:</b> - key ''key'' set to any value"
-msgstr "<b>kľúč:</b>- kľúč ''key'' je nastavený na hodnotu"
+msgstr "<b>kľúč:</b>- kľúč \"kľúč\" s akoukoľvek hodnotou"
msgid ""
"<b>key?</b> - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"
msgstr ""
-"<b>kľúč?</b> - kľúč ''key'' s hodnotou ''ano'',''pravda'', '' 1'', alebo "
-"''na''"
+"<b>kľúč?</b> - kľúč \"kľúč\" s hodnotou \"yes\" (ano), \"true\" (pravda), "
+"\"1\", alebo \"on\" (zapnuté)"
msgid "Special targets"
msgstr "Špecifické ciele"
@@ -2336,56 +2427,56 @@ msgid ""
"<b>type:</b>... - objects with corresponding type (<b>node</b>, <b>way</b>, "
"<b>relation</b>)"
msgstr ""
-"<b>type:</b> ... - objekty so zodpovedajúceho typu (<b>node (bod)</b>, "
-"<b>way (cesta)</b>, <b>relation (relácia)</b>)"
+"<b>type:</b>... - objekty zodpovedajúceho typu (<b>node</b> (bod), "
+"<b>way</b> (cesta), <b>relation</b> (relácia))"
msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b> ... - objekty, ktoré menil užívateľ"
+msgstr "<b>user:</b>... - objekty, ktoré zmenil používateľ"
msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> ... - objekty, ktoré menil anonymný užívateľ"
+msgstr "<b>user:anonymous</b> - objekty, ktoré zmenil anonymný používateľ"
msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
-msgstr "<b> id:</b> ... - objekty s daným ID (0 pre nové objekty)"
+msgstr "<b>id:</b>... - objekty s daným ID (0 pre nové objekty)"
msgid ""
"<b>version:</b>... - objects with given version (0 objects without an "
"assigned version)"
msgstr ""
-"<b>version:</b> ... - objekty s danou verziou (0 objekty bez pridelenej "
+"<b>version:</b>... - objekty s danou verziou (0 objekty bez pridelenej "
"verzie)"
msgid ""
"<b>changeset:</b>... - objects with given changeset ID (0 objects without an "
"assigned changeset)"
msgstr ""
-"<b>changeset:</b> ... - objekty s daným id súboru zmien (0 objekty bez "
-"označenia súboru zmien)"
+"<b>changeset:</b>... - objekty s daným id súboru zmien (0 objekty bez "
+"priradeného súboru zmien)"
msgid ""
"<b>nodes:</b>... - objects with given number of nodes (<b>nodes:</b>count, "
"<b>nodes:</b>min-max, <b>nodes:</b>min- or <b>nodes:</b>-max)"
msgstr ""
-"<b>nodes:</b> ... - objekty s daným počtom bodov (<b>nodes:</b> počet, "
+"<b>nodes:</b>... - objekty s daným počtom bodov (<b>nodes:</b> počet, "
"<b>nodes:</b>min-max, <b>nodes:</b>min- alebo <b> nodes:</b>-max)"
msgid ""
"<b>tags:</b>... - objects with given number of tags (<b>tags:</b>count, "
"<b>tags:</b>min-max, <b>tags:</b>min- or <b>tags:</b>-max)"
msgstr ""
-"<b>tags:</b> ... - objekty s daným počtom značiek "
+"<b>tags:</b>... - objekty s daným počtom značiek "
"(<b>tags:</b>počet,<b>tags:</b>min-max,<b>tags:</b>min- alebo <b> tags:</b>-"
"max)"
msgid "<b>role:</b>... - objects with given role in a relation"
-msgstr "<b>role:</b> ... - objekty s danou úlohu v relácii"
+msgstr "<b>role:</b>... - objekty s danou úlohu v relácii"
msgid ""
"<b>timestamp:</b>timestamp - objects with this last modification timestamp "
"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"
msgstr ""
-"<b>timestamp:</b>časová_značka - objekty s poslednou úpravou v čase "
-"časová_značka (2009-11-12T14:51:09Z, 2009-11-12 alebo T14:51 ...)"
+"<b>timestamp:</b>časová značka - objekty s poslednou úpravou v čase \"časová "
+"značka\" (2009-11-12T14:51:09Z, 2009-11-12 alebo T14:51 ...)"
msgid ""
"<b>timestamp:</b>min/max - objects with last modification within range"
@@ -2395,7 +2486,7 @@ msgid ""
"<b>areasize:</b>... - closed ways with given area in m² (<b>areasize:</b>min-"
"max or <b>areasize:</b>max)"
msgstr ""
-"<b>areasize:</b> ... - uzatvorené cesty v danej oblasti v m² "
+"<b>areasize:</b>... - uzavreté cesty s danou plochou v m² "
"(<b>areasize:</b>min-max alebo <b>areasize:</b> max)"
msgid "<b>modified</b> - all changed objects"
@@ -2408,48 +2499,48 @@ msgid "<b>incomplete</b> - all incomplete objects"
msgstr "<b>incomplete</b> - všetky nekompletné objekty"
msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - všetky neoznačené objekty"
+msgstr "<b>untagged</b> - všetky objekty bez značiek"
msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
msgstr ""
-"<b>uzavretý</b> - všetky uzavreté cesty (body nie sú považované za uzavreté)"
+"<b>closed</b> - všetky uzavreté cesty (body nie sú považované za uzavreté)"
msgid ""
"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr "<b>dieťa <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
+msgstr "<b>child <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
msgid ""
"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
msgstr ""
-"<b>rodič <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
+"<b>parent <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
msgid ""
"<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation "
"members) in downloaded area"
msgstr ""
-"<b>(všetky)indownloadedarea</b> - objekty(a všetky ich body ciest / členy "
-"relácií) sa v oblasti stiahli"
+"<b>(all)indownloadedarea</b> - objekty (a všetky ich body ciest / členy "
+"relácií) sa v stiahnutej oblasti"
msgid ""
"<b>(all)inview</b> - objects (and all its way nodes / relation members) in "
"current view"
msgstr ""
-"<b>(všetky)inview </b> - objekty (a všetky ich body ciest / členy relácií), "
-"v aktuálnom zobrazení"
+"<b>(all)inview</b> - objekty (a všetky ich body ciest / členy relácií), v "
+"aktuálnom zobrazení"
msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Použite <b>|</b> alebo <b>OR</b> pri kombinácii s logickým \"alebo\""
+msgstr "Použite <b>|</b> alebo <b>OR</b> pre spojenie logickým \"alebo\""
msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
msgstr ""
-"Použite <b>\"</b> operátor citovania (e.g. ak kľúč obsahuje <b>:</b>)"
+"Použite <b>\"</b> operátor citovania (napr. ak kľúč obsahuje <b>:</b>)"
msgid ""
"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
msgstr ""
-"Vo vnútri reťazcov <b>\"</b> a <b>\\</b> znaky musí predchádzať <b>\\</b> "
-"(e.g. <b>\\\"</b> and <b>\\\\</b>)."
+"Vo vnútri reťazcov v úvodzovkách musí znaky <b>\"</b> a <b>\\</b> "
+"predchádzať <b>\\</b> (napr. <b>\\\"</b> and <b>\\\\</b>)."
msgid "Use <b>(</b> and <b>)</b> to group expressions"
msgstr "Použite <b>(</b> a <b>)</b> k zoskupeniu výrazov"
@@ -2461,13 +2552,13 @@ msgid "Baker Street"
msgstr "Hlavná ulica"
msgid "''Baker'' and ''Street'' in any key"
-msgstr "''Baker'' a ''Street'' v akomkoľvek kľúči"
+msgstr "\"Hlavná\" a \"ulica\" v akomkoľvek kľúči"
msgid "\"Baker Street\""
msgstr "\"Hlavná ulica\""
msgid "''Baker Street'' in any key"
-msgstr "''Baker Street'' v akomkoľvek kľúči"
+msgstr "\"Hlavná ulica\" v akomkoľvek kľúči"
msgid "basics"
msgstr "základy"
@@ -2488,31 +2579,34 @@ msgid "''value'' in any key"
msgstr "\"hodnota\" v akomkoľvek kľúči"
msgid "matches if ''key'' exists"
-msgstr "porovnaj, ak ''kľúč'' existuje"
+msgstr "ak \"kľúč\" existuje"
+
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr "ak \"kľúč\" je väčší ako \"hodnota\" (podobne s \"menší než\")"
msgid "combinators"
msgstr "kombinátory"
msgid "logical and (both expressions have to be satisfied)"
-msgstr "logické a (oba výrazy majú byť splnené)"
+msgstr "logické \"a\" (oba výrazy musia byť splnené)"
msgid "logical or (at least one expression has to be satisfied)"
-msgstr "logické alebo (aspoň jeden výraz, musí byť splnený)"
+msgstr "logické \"alebo\" (aspoň jeden výraz musí byť splnený)"
msgid "logical not"
msgstr "logická negácia"
msgid "use parenthesis to group expressions"
-msgstr "použiť zátvorky pre skupiny výrazov"
+msgstr "použiť zátvorky pre zoskupenie výrazov"
msgid ""
"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
"characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and "
"<b>\\\\</b>)."
msgstr ""
-"uviesť operátori.<br>V rámci reťazca v úvodzovkách <b>\"</b> a <b>\\</b> "
-"znaky musia byť sprevádzané pomocou predchádzajúceho <b>\\</b> (e.g. <b>\\"
-"\"</b> a <b>\\\\</b>)."
+"deaktivovať operátory.<br>V rámci reťazcov v úvodzovkách musia byť znaky "
+"<b>\"</b> a <b>\\</b> sprevádzané pomocou predchádzajúceho <b>\\</b> (napr. "
+"<b>\\\"</b> a <b>\\\\</b>)."
msgid "objects"
msgstr "objekty"
@@ -2527,13 +2621,13 @@ msgid "all closed ways"
msgstr "všetky uzavreté cesty"
msgid "object without useful tags"
-msgstr ""
+msgstr "objekt bez užitočných značiek"
msgid "metadata"
msgstr "metadáta"
msgid "objects changed by user"
-msgstr "objekty zmenené užívateľom"
+msgstr "objekty zmenené používateľom"
msgid "objects with given ID"
msgstr "objekty so daným ID"
@@ -2545,22 +2639,22 @@ msgid "objects with given changeset ID"
msgstr "objekty s daným ID zmenového súboru"
msgid "objects with last modification timestamp within range"
-msgstr "objekty s časovou značkou v rozsahu poslednej zmeny"
+msgstr "objekty s časom poslednej zmeny v rozsahu"
msgid "properties"
msgstr "vlastnosti"
msgid "objects with at least 20 nodes"
-msgstr "objekty s aspoň 20 uzlami"
+msgstr "objekty s aspoň 20 bodmi"
msgid "objects having 5 to 10 tags"
-msgstr "objekty obsahujúce 5 až 10 tagov"
+msgstr "objekty obsahujúce 5 až 10 značiek"
msgid "objects with given role in a relation"
msgstr "objekty s danou rolou v relácii"
msgid "closed ways with an area of 100 m²"
-msgstr "uzavreté cesty v oblasti 100 m²"
+msgstr "uzavreté cesty s plochou 100 m²"
msgid "state"
msgstr "stav"
@@ -2581,7 +2675,7 @@ msgid "related objects"
msgstr "súvisiace objekty"
msgid "all children of objects matching the expression"
-msgstr "všetci potomkovia objektov zhodujúcich sa s výrazom"
+msgstr "všetky deti objektov zhodujúcich sa s výrazom"
msgid "all parents of objects matching the expression"
msgstr "všetci rodičia objektov zhodujúcich sa s výrazom"
@@ -2593,21 +2687,21 @@ msgid "every n-th member of relation and/or every n-th node of way"
msgstr "každý n-tý člen relácie a/alebo každý n-tý bod cesty"
msgid "view"
-msgstr "zobraziť"
+msgstr "zobrazenie"
msgid "objects in current view"
msgstr "objekty v aktuálnom zobrazení"
msgid "objects (and all its way nodes / relation members) in current view"
msgstr ""
-"objekty (a všetky ich uzly ciest / členy relácií) v aktuálnom zobrazení"
+"objekty (a všetky ich body ciest / členy relácií) v aktuálnom zobrazení"
msgid "objects in downloaded area"
msgstr "objekty v stiahnutej oblasti"
msgid "objects (and all its way nodes / relation members) in downloaded area"
msgstr ""
-"objekty (a všetky ich uzly ciest / členy relácií) v stiahnutej oblasti"
+"objekty (a všetky ich body ciest / členovia relácií) v stiahnutej oblasti"
msgid "No match found for ''{0}''"
msgstr "Neboli nájdené záznamy pre \"{0}\""
@@ -2619,10 +2713,10 @@ msgid "Nothing removed from selection by searching for ''{0}''"
msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\""
msgid "Nothing found in selection by searching for ''{0}''"
-msgstr "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''"
+msgstr "Nič sa nenašlo vo výbere vyhľadávania pre \"{0}\""
msgid "Found {0} matches"
-msgstr "Najdených {0} zodpovedajúcich výrazov"
+msgstr "Nájdených {0} zodpovedajúcich objektov"
msgctxt "search"
msgid "CS"
@@ -2661,14 +2755,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Očakávam <i>min</i>/<i>max</i> po \"timestamp\""
-msgid "Primitive id expected"
-msgstr "Očakávané ID pôvodných"
+msgid "Range of primitive ids expected"
+msgstr "Očakáva sa rozsah identifikátorov (ID) základných objektov"
-msgid "Changeset id expected"
-msgstr "Očakávané ID zmenového súboru"
+msgid "Range of changeset ids expected"
+msgstr "Očakáva sa rozsah identifikátorov (ID) súborov zmien."
-msgid "Version expected"
-msgstr "Očakávaná verzia"
+msgid "Range of versions expected"
+msgstr "Očakáva sa rozsah verzií"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2677,16 +2771,20 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
-"Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie"
+"Neznámy základný typ: {0}. Povolené hodnoty sú \"node\" (bod), \"way\" "
+"(cesta), \"relation\" (relácia)"
+
+msgid "Primitive id expected"
+msgstr "Očakávané ID základného objektu"
msgid "Range of numbers expected"
msgstr "Očakávaný rozsah čísel"
msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Neočakávaný symbol. Očakávaný {0}, vytvorený {1}"
+msgstr "Neočakávaný symbol. Očakávaný {0}, nájdený {1}"
msgid "Unexpected token: {0}"
-msgstr "Neočakávaná značka: {0}"
+msgstr "Neočakávaný symbol: {0}"
msgid "Missing parameter for OR"
msgstr "Chýbajúci parameter pre OR"
@@ -2695,23 +2793,20 @@ msgid "Missing parameter for XOR"
msgstr "Chýbajúci parameter pre XOR"
msgid "Missing operator for NOT"
-msgstr "Chýbajúci operator pre NOT"
+msgstr "Chýbajúci operátor pre NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
-"Varovanie: automaticky skracujem hodnotu tagu ''{0}'' pri vymazaných "
-"objektoch {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr "Skracujem hodnotu značky \"{0}\" na vymazanom objekte {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
"length {2}. Values length is {3}."
msgstr ""
-"Dĺžka s hodnotou pre tag ''{0}'' pri objekte {1} prekonala max. povolenú "
+"Dĺžka hodnoty pre značku ''{0}'' pri objekte {1} prekonala max. povolenú "
"dĺžku {2}. Dĺžka hodnoty je {3}."
msgid "Precondition Violation"
-msgstr "Predpoklad Porušenia"
+msgstr "Nesplnený predpoklad"
msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}"
@@ -2723,25 +2818,25 @@ msgid "Cyclic dependency between relations:"
msgstr "Cyklická závislosť medzi reláciami:"
msgid "Removed obsolete tags"
-msgstr "Odobraté zastarané tagy"
+msgstr "Odobraté zastarané značky"
msgid "Fix deprecated tags"
-msgstr "Opraviť zastarané tagy"
+msgstr "Opraviť zastarané značky"
msgid ""
"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
"cannot upload them. Please edit the relations and remove the cyclic "
"dependency.</html>"
msgstr ""
-"<html>{0} relácie sa cyklujú(build a cycle) pretože odkazujú na nejaké "
-"iné.<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte cyklické "
-"závislosti.</html>"
+"<html>{0} relácií sa cyklí (build a cycle) pretože na seba navzájom "
+"odkazujú.<br>JOSM ich nemôže nahrať. Prosím upravte relácie a odstráňte "
+"cyklické závislosti.</html>"
msgid "Relation ..."
msgstr "Relácia ..."
msgid "... refers to relation"
-msgstr "... odkazy na relácie"
+msgstr "... odkazuje na relácie"
msgid "Cycling dependencies"
msgstr "Cyklické závislosti"
@@ -2752,22 +2847,21 @@ msgid ""
"cancel this dialog, you can find the entries in the validator side panel to "
"inspect them."
msgstr ""
-"Toto sú výsledky automatickej validácie. Pokúste sa ich opraviť, ale "
-"opatrne, nezničte dáta. Pokiaľ máte pochybnosť, ignorujte ich.<br>\r\n"
-"Ak tento dialóg zrušíte, môžete tieto položky nájsť v bočnom panely "
-"validátora."
+"Toto sú výsledky automatickej validácie. Pokúste sa ich opraviť, ale opatrne "
+"- nezničte dáta. Pokiaľ máte pochybnosť, ignorujte ich.<br>Ak tento dialóg "
+"zrušíte, môžete tieto položky nájsť v bočnom paneli validátora."
msgid "Errors"
msgstr "Chyby"
msgid "Usually this should be fixed."
-msgstr "Obvykle by to malo byť opravené."
+msgstr "Obyčajne by mali byť opravené."
msgid "Warnings"
msgstr "Varovania"
msgid "Fix these when possible."
-msgstr "Opravte toto, pokiaľ je to možné."
+msgstr "Opravte tieto, pokiaľ je to možné."
msgid "Other"
msgstr "Iné"
@@ -2776,7 +2870,7 @@ msgid "Informational warnings, expect many false entries."
msgstr "Informačné varovanie, očakáva sa mnoho neplatných záznamov."
msgid "Suspicious data found. Upload anyway?"
-msgstr "Nájdené podozrivé dáta. Ak tak odoslať?"
+msgstr "Nájdené podozrivé dáta. Aj tak odoslať?"
msgid "Continue upload"
msgstr "Pokračovať v nahrávaní"
@@ -2792,9 +2886,12 @@ msgstr "Pridať reláciu {0}"
msgid "Added {0} object"
msgid_plural "Added {0} objects"
-msgstr[0] "Očakávaný {0} objekt"
-msgstr[1] "Očakávané {0} objekty"
-msgstr[2] "Očakávaných {0} objektov"
+msgstr[0] "Pridaných {0} objektov"
+msgstr[1] "Pridaný {0} objekt"
+msgstr[2] "Pridané {0} objekty"
+
+msgid "New way {0} has 0 nodes"
+msgstr "Nová cesta {0} má 0 bodov"
msgid "Change node {0}"
msgstr "Zmeniť bod {0}"
@@ -2806,49 +2903,49 @@ msgid "Change relation {0}"
msgstr "Zmeniť reláciu {0}"
msgid "Changed nodes of {0}"
-msgstr "Zmenené body z {0}"
+msgstr "Zmenili sa body {0}"
msgid "Remove \"{0}\" for node ''{1}''"
-msgstr "Presunúť \"{0}\" pre bod ''{1}''"
+msgstr "Odstrániť \"{0}\" z bodu ''{1}''"
msgid "Remove \"{0}\" for way ''{1}''"
-msgstr "Presunúť \"{0}\" pre cestu ''{1}''"
+msgstr "Odstrániť \"{0}\" z cesty ''{1}''"
msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "Remove \"{0}\" for reláciu ''{1}''"
+msgstr "Odstrániť \"{0}\" z relácie ''{1}''"
msgid "Set {0}={1} for node ''{2}''"
-msgstr "Nastavenie {0}={1} pre bod ''{2}''"
+msgstr "Nastaviť {0}={1} pre bod ''{2}''"
msgid "Set {0}={1} for way ''{2}''"
-msgstr "Nastavenie {0}={1} pre cestu ''{2}''"
+msgstr "Nastaviť {0}={1} pre cestu ''{2}''"
msgid "Set {0}={1} for relation ''{2}''"
-msgstr "Nastavenie {0}={1} pre reláciu ''{2}''"
+msgstr "Nastaviť {0}={1} pre reláciu ''{2}''"
msgid "Remove \"{0}\" for {1} objects"
-msgstr "Odstrániť \"{0}\" pre {1} objektov"
+msgstr "Odstrániť \"{0}\" z {1} objektov"
msgid "Set {0}={1} for {2} objects"
-msgstr "Nastaviť {0}={1} pre {2} objekty"
+msgstr "Nastaviť {0}={1} pre {2} objektov"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Odstránené {0} vlastnosti {1} objektov"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "Vymazať {0} značiek z {1} objektov"
-msgid "Set {0} properties for {1} objects"
-msgstr "Nastaviť {0} vlastnosti {1} objektov"
+msgid "Set {0} tags for {1} objects"
+msgstr "Nastaviť {0} značiek pre {1} objektov"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Nahradiť \"{0}\" za \"{1}\" pre"
msgid "object"
msgid_plural "objects"
-msgstr[0] "objekt"
-msgstr[1] "objekty"
-msgstr[2] "objektov"
+msgstr[0] "objektov"
+msgstr[1] "objekt"
+msgstr[2] "objekty"
msgid "Change relation member role for {0} {1}"
-msgstr "Zmena funkcie relačného člena pre {0} {1}"
+msgstr "Zmena funkcie člena relácie pre {0} {1}"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
@@ -2861,25 +2958,23 @@ msgid "Double conflict"
msgstr "Dvojitý konflikt"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Upozornenie: Vrstva ''{0}'' už neexistuje. Nemožno odstrániť konflikt na "
-"objekte ''{1}''."
+"Vrstva \"{0}\" už neexistuje. Nemôžem odstrániť konflikt pre objekt \"{1}\"."
msgid "Add conflict for ''{0}''"
-msgstr "Pridať konflikt pre ''{0}''"
+msgstr "Pridať konflikt pre \"{0}\""
msgid ""
"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-"Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
+msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" už neexistuje"
msgid "Resolve conflicts in coordinates in {0}"
msgstr "Vyriešte rozpor v súradniciach v {0}"
msgid "Cannot resolve undecided conflict."
-msgstr "nemôžem vyriešiť nerozhodnutý konflikt"
+msgstr "Nemôžem vyriešiť nerozhodnutý konflikt."
msgid "At least one object to delete required, got empty collection"
msgstr ""
@@ -2896,30 +2991,30 @@ msgstr "Vymazať reláciu {0}"
msgid "Delete {0} object"
msgid_plural "Delete {0} objects"
-msgstr[0] "Zmazať {0} objekty"
+msgstr[0] "Zmazať {0} objektov"
msgstr[1] "Zmazať {0} objekt"
-msgstr[2] "Zmazať {0} objektov"
+msgstr[2] "Zmazať {0} objekty"
msgid "Delete {0} node"
msgid_plural "Delete {0} nodes"
-msgstr[0] "Zmazať {0} body"
+msgstr[0] "Zmazať {0} bodov"
msgstr[1] "Zmazať {0} bod"
-msgstr[2] "Zmazať {0} bodov"
+msgstr[2] "Zmazať {0} body"
msgid "Delete {0} way"
msgid_plural "Delete {0} ways"
-msgstr[0] "Zmazať {0} cesty"
+msgstr[0] "Zmazať {0} ciest"
msgstr[1] "Zmazať {0} cestu"
-msgstr[2] "Zmazať {0} ciest"
+msgstr[2] "Zmazať {0} cesty"
msgid "Delete {0} relation"
msgid_plural "Delete {0} relations"
-msgstr[0] "Zmazať {0} relácie"
+msgstr[0] "Zmazať {0} relácií"
msgstr[1] "Zmazať {0} reláciu"
-msgstr[2] "Zmazať {0} relácií"
+msgstr[2] "Zmazať {0} relácie"
msgid "Deleted ''{0}''"
-msgstr "Vymazať ''{0}''"
+msgstr "Vymazané ''{0}''"
msgid "Delete confirmation"
msgstr "Potvrdiť odstránenie"
@@ -2949,15 +3044,15 @@ msgid_plural ""
"and cannot be undone easily after being uploaded to the server.<br/>Do you "
"really want to delete?"
msgstr[0] ""
-"Chystáte sa zmazať {0} reláciu: {1}<br/>Tento krok je málokedy potrebný a po "
+"Chystáte sa zmazať {0} relácií: {1}<br/>Tento krok je málokedy potrebný a po "
"nahratí na server sa nedá tak ľahko navrátiť.<br/>Naozaj chcete pokračovať "
"so zmazaním?"
msgstr[1] ""
-"Chystáte sa zmazať {0} relácie: {1}<br/>Tento krok je málokedy potrebný a po "
+"Chystáte sa zmazať {0} reláciu: {1}<br/>Tento krok je málokedy potrebný a po "
"nahratí na server sa nedá tak ľahko navrátiť.<br/>Naozaj chcete pokračovať "
"so zmazaním?"
msgstr[2] ""
-"Chystáte sa zmazať {0} relácií: {1}<br/>Tento krok je málokedy potrebný a po "
+"Chystáte sa zmazať {0} relácie: {1}<br/>Tento krok je málokedy potrebný a po "
"nahratí na server sa nedá tak ľahko navrátiť.<br/>Naozaj chcete pokračovať "
"so zmazaním?"
@@ -2968,13 +3063,13 @@ msgid "Resolve conflicts in deleted state in {0}"
msgstr "Vyriešte konflikty v zmazaných (state) v {0}"
msgid "Set the ''modified'' flag for node {0}"
-msgstr "Nastavte ''zmenené'' ''modified'' indikátor pre bod {0}"
+msgstr "Nastavte indikátor \"zmenené\" (modified\") pre bod {0}"
msgid "Set the ''modified'' flag for way {0}"
-msgstr "Nastavte ''zmenené'' ''modified'' indikátor pre cestu {0}"
+msgstr "Nastavte indikátor \"zmenené\" (modified\") pre cestu {0}"
msgid "Set the ''modified'' flag for relation {0}"
-msgstr "Nastavte ''zmenené'' ''modified'' indikátor pre reláciu {0}"
+msgstr "Nastavte indikátor \"zmenené\" (modified\") pre reláciu {0}"
msgid "Move {0} node"
msgid_plural "Move {0} nodes"
@@ -2984,12 +3079,15 @@ msgstr[2] "Posun {0} bodov"
msgid "Purged {0} object"
msgid_plural "Purged {0} objects"
-msgstr[0] "Očistený {0} objekt"
-msgstr[1] "Očistené {0} objekty"
-msgstr[2] "Očistených {0} objektov"
+msgstr[0] "{0} objektov zabudnutých"
+msgstr[1] "{0} objekt zabudnutý"
+msgstr[2] "{0} objekty zabudnuté"
msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Rozhodnutie konfliktov v member list of relation {0}"
+msgstr "Rozhodnutie konfliktov v zozname členov relácie {0}"
+
+msgid "Removed nodes from {0}"
+msgstr "Odstránené body z {0}"
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
@@ -2999,30 +3097,30 @@ msgstr[2] "Otáčanie {0} bodov"
msgid "Scale {0} node"
msgid_plural "Scale {0} nodes"
-msgstr[0] "Mierka {0} bod"
-msgstr[1] "Mierka {0} bodov"
+msgstr[0] "Mierka {0} bodov"
+msgstr[1] "Mierka {0} bodu"
msgstr[2] "Mierka {0} body"
msgid "Sequence: {0}"
msgstr "Poradie: {0}"
msgid "Resolve {0} tag conflicts in node {1}"
-msgstr "Vyriešiť {0} konfliktné značky v bode {1}"
+msgstr "Vyriešiť {0} konfliktných značiek v bode {1}"
msgid "Resolve {0} tag conflicts in way {1}"
-msgstr "Vyriešiť {0} konfliktné značky v ceste {1}"
+msgstr "Vyriešiť {0} konfliktných značiek v ceste {1}"
msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "Vyriešiť {0} konfliktné značky v relácii {1}"
+msgstr "Vyriešiť {0} konfliktných značiek v relácii {1}"
msgid "Transform {0} node"
msgid_plural "Transform {0} nodes"
-msgstr[0] "Transformácia {0} bodu"
-msgstr[1] "Transformácia {0} bodov"
+msgstr[0] "Transformácia {0} bodov"
+msgstr[1] "Transformácia {0} bodu"
msgstr[2] "Transformácia {0} bodov"
msgid "Resolve version conflict for node {0}"
-msgstr "Vyriešiť konflikt verzií pre body {0}"
+msgstr "Vyriešiť konflikt verzií pre bod {0}"
msgid "Resolve version conflict for way {0}"
msgstr "Vyriešiť konflikt verzie pre cestu {0}"
@@ -3031,7 +3129,7 @@ msgid "Resolve version conflict for relation {0}"
msgstr "Vyriešiť konflikt verzie pre reláciu {0}"
msgid "Resolve conflicts in node list of way {0}"
-msgstr "Vyriešte konflikty v zozname bodov cesty {0}"
+msgstr "Vyriešiť konflikty v zozname bodov cesty {0}"
msgid "Main dataset does not include node {0}"
msgstr "Hlavná dátová sada neobsahuje bod {0}"
@@ -3048,30 +3146,30 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
-"<html>Chystáte sa otočiť smer cesty ''{0}'',<br/>, ktorej významový zmysel "
-"tagu ''{1}'' je definovaný jej smerom.<br/> Naozaj chcete zmeniť smer cesty "
-"a tým aj jej významový zmysel?</html>"
+"<html>Chystáte sa otočiť smer cesty ''{0}'',<br/> u ktorej významový zmysel "
+"jej značiek je definovaný jej smerom: ''{1}''<br/> Naozaj chcete zmeniť smer "
+"cesty a tým aj jej významový zmysel?</html>"
msgstr[1] ""
-"<html>Chystáte sa otočiť smer ciest ''{0}'',<br/>, ktorých významový zmysel "
-"tagov ''{1}'' je definovaný ich smerom.<br/> Naozaj chcete zmeniť smer ciest "
-"a tým aj ich významový zmysel?</html>"
+"<html>Chystáte sa otočiť smer cesty ''{0}'',<br/> ktorej významový zmysel "
+"značky ''{1}'' je definovaný jej smerom.<br/> Naozaj chcete zmeniť smer "
+"cesty a tým aj jej významový zmysel?</html>"
msgstr[2] ""
-"<html>Chystáte sa otočiť smer ciest ''{0}'',<br/>, ktorých významový zmysel "
-"tagov ''{1}'' je definovaný ich smerom.<br/> Naozaj chcete zmeniť smer ciest "
-"a tým aj ich významový zmysel?</html>"
+"<html>Chystáte sa otočiť smer cesty ''{0}'',<br/> u ktorej významový zmysel "
+"jej značiek je definovaný jej smerom: ''{1}''<br/> Naozaj chcete zmeniť smer "
+"cesty a tým aj jej významový zmysel?</html>"
msgid "Reverse directional way."
-msgstr "Opačne smerovaná cesta."
+msgstr "Otočiť smerovanú cestu."
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Keď otáčate túto cestu, nasledujúce zmeny vo vlastnostiach cesty a jej bodov "
-"sú navrhované v takom poradí aby zachovali konzistenciu dát."
+"Pri otáčaní tejto cesty sú navrhované nasledovné zmeny na zachovanie "
+"konzistencie dát."
msgid "Relation"
-msgstr "Vzťah (relation)"
+msgstr "Relácia (vzťah)"
msgid "Old role"
msgstr "Stará funkcia"
@@ -3095,19 +3193,19 @@ msgid "Apply selected changes"
msgstr "Použiť zvolené zmeny"
msgid "Do not apply changes"
-msgstr "Neurobiť zmeny"
+msgstr "Nevykonať zmeny"
-msgid "Please select which property changes you want to apply."
-msgstr "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť."
+msgid "Please select which changes you want to apply."
+msgstr "Prosím vyberte, ktoré zmeny chcete použiť."
-msgid "Properties of "
-msgstr "Vlastnosti "
+msgid "Tags of "
+msgstr "Značky "
msgid "Roles in relations referring to"
-msgstr "Funkcie vo vzťahoch (relations) odkazujú na"
+msgstr "Funkcie v reláciách odkazujú na"
msgid "Automatic tag correction"
-msgstr "Automatická úprava značiek (tag)"
+msgstr "Automatická oprava značiek"
msgid "Unable to create directory {0}, autosave will be disabled"
msgstr "Nemožno vytvoriť adresár {0}, automatické ukladanie bude vypnuté"
@@ -3122,6 +3220,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Nemožno zmazať starý záložný súbor {0}"
+msgid "Your work has been saved automatically."
+msgstr "Vaša práva bola automaticky uložená."
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Chyba pri vytváraní zálohy z odstránenej vrstvy: {0}"
@@ -3155,21 +3256,21 @@ msgstr ""
"jeho východisková hodnota je v tomto okamihu neznáma.<br/> Aktivujte si "
"prosím zodpovedajúcu funkciu ručne a skúste to znova importovať."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Upozornenie: Nepodarilo sa vytvoriť chýbajúci cache adresár: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Nepodarilo sa vytvoriť chýbajúci cache adresár: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Nepodarilo sa vytvoriť chýbajúci adresár zásobníka: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Nepodarilo sa uložiť preferencie do \"{0}\""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"VAROVANIE: Neúspešná inicializácia preferencií. Adresár preferencií ''{0}'' "
-"nie je adresár."
+"Neúspešná inicializácia preferencií. Adresár preferencií \"{0}\" nie je "
+"adresárom."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3179,11 +3280,11 @@ msgstr ""
"nie je adresár.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"VAROVANIE: Neúspešná inicializácia preferencií. Neúspešné vytváranie "
-"chýbajúceho adresára preferencií: {0}"
+"Neúspešná inicializácia preferencií. Nepodarilo sa vytvoriť chýbajúci "
+"adresár preferencií: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3192,17 +3293,15 @@ msgstr ""
"<html>Neúspešná inicializácia preferencií.<br>Neúspešné vytváranie "
"chýbajúceho adresára preferencií: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Info: Chýba súbor predvolieb ''{0}''. Vytvára sa štandardný súbor predvolieb."
+"Chýba súbor preferencií \"{0}\". Vytvorí sa východzí súbor preferencií."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"VAROVANIE: Nahrádzanie existujúceho súboru preferencií ''{0}'' s východzím "
-"súborom preferencií."
+"Nahrádzanie existujúceho súboru preferencií \"{0}\" východzím súborom "
+"preferencií."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3216,14 +3315,14 @@ msgid ""
"<br>{0}<br> and creating a new default preference file.</html>"
msgstr ""
"<html>Súbor preferencií mal chyby.<br> Vytváranie zo zálohy staršieho súboru "
-" <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
+"<br>{0}<br> a vytváranie nového východzieho súboru.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Upozornenie: Nepodarilo sa inicializovať preferencie. Nepodarilo sa nastaviť "
-" štandardný súbor preferencií: {0}"
+"Neúspešná inicializácia preferencií. Chyba pri resetovaní súboru preferencií "
+"do východzieho: {0}"
msgid "Paint style {0}: {1}"
msgstr "Farebný štýl {0}: {1}"
@@ -3253,17 +3352,14 @@ msgstr "Neúspešné nahratie zdroja ''{0}'', chyba je {1}."
msgid "UNKNOWN"
msgstr "NEZNÁMA"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr ""
-"Upozornenie: neočakávané číslo verzie JOSM v zmenovom súboru, hodnota je "
-"''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr "Neočakávaná verzia JOSM v súbore revízií, hodnota je \"{0}\""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Varovanie: opravný súbor ''/REVISION'' chýba."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Súbor revízií \"/REVISION\" chýba."
msgid "Already registered a conflict for primitive ''{0}''."
-msgstr "práve zapísaný má konflikt s pôvodným ''{0}''"
+msgstr "So základným objektom \"{0}\" už existuje konflikt."
msgid "Decimal Degrees"
msgstr "Stupne"
@@ -3300,25 +3396,26 @@ msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr "Projekcia ''{0}'' nie je nájdená, záložka ''{1}'' nie je použiteľná"
msgid "ID > 0 expected. Got {0}."
-msgstr "ID > 0 očakávané. Got {0}"
+msgstr "Očakávané ID > 0. Obdržaná hodnota však bola {0}."
msgid "Version > 0 expected. Got {0}."
-msgstr "verzia > 0 očakávaná. Got {0}"
+msgstr "Očakávané verzia > 0. Obdržaná hodnota však bola {0}."
msgid ""
"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
"{0}"
msgstr ""
-"Nemôžem priradiť Id zmenového súboru > pre nové pôvodné. Hodnota Id "
-"zmenového súboru je {0}"
+"Nemôžem priradiť Id zmenového súboru > 0 novému základnému objektu. Hodnota "
+"Id zmenového súboru je {0}"
msgid "A primitive with ID = 0 cannot be invisible."
-msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
+msgstr "Základný objekt ID = 0 nemôže byť neviditeľný."
msgid ""
"Unable to add primitive {0} to the dataset because it is already included"
msgstr ""
-"Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
+"Nie je možné pridať základný objekt {0} do dátovej sady, pretože je už "
+"zahrnutý"
msgid ""
"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
@@ -3367,34 +3464,35 @@ msgid ""
"Cannot merge because either of the participating primitives is new and the "
"other is not"
msgstr ""
-"Nie je možné spojiť, pretože jeden zo zúčastnených pôvodných je nový a "
-"ostatné nie sú"
+"Nie je možné spojiť, pretože jeden zo zúčastnených základných objektov je "
+"nový a ostatné nie sú"
msgid ""
"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
msgstr ""
-"Nemožno zlúčiť pôvodné s rozdielnymi id. Toto id je {0}, druhé je {1}"
+"Nemožno zlúčiť základné objekty s rozdielnymi id. Toto id je {0}, druhé je "
+"{1}"
msgid "node"
msgid_plural "nodes"
-msgstr[0] "bod"
-msgstr[1] "body"
-msgstr[2] "bodov"
+msgstr[0] "bodov"
+msgstr[1] "bod"
+msgstr[2] "body"
msgid "way"
msgid_plural "ways"
-msgstr[0] "cestu"
-msgstr[1] "cesty"
-msgstr[2] "ciest"
+msgstr[0] "ciest"
+msgstr[1] "cesta"
+msgstr[2] "cesty"
msgid "relation"
msgid_plural "relations"
-msgstr[0] "vzťah (relation)"
-msgstr[1] "vzťahy (relations)"
-msgstr[2] "vzťahov (relations)"
+msgstr[0] "vzťahov (relations)"
+msgstr[1] "vzťah (relation)"
+msgstr[2] "vzťahy (relations)"
msgid "closedway"
-msgstr "uzavratá cesta"
+msgstr "uzavretá cesta"
msgid "multipolygon"
msgstr "multipolygón"
@@ -3403,8 +3501,8 @@ msgid ""
"Tag collection cannot be applied to a primitive because there are keys with "
"multiple values."
msgstr ""
-"kolekcia značiek nemôže byť použitápre pôvodné pretože sú tam kľúče s "
-"viacnásobnými hodnotami"
+"Kolekcia značiek nemôže byť použitá na základný objekt, pretože sú tam kľúče "
+"s viacnásobnými hodnotami."
msgid "<anonymous>"
msgstr "<anonymné>"
@@ -3413,26 +3511,27 @@ msgid "Cannot add node {0} to incomplete way {1}."
msgstr "nemôžem pridať bod {0} do nedokončenej cesty {1}"
msgid "Nodes in way must be in the same dataset"
-msgstr "Uzly v ceste musia byť v tej istej dátovej sade"
+msgstr "Body v ceste musia byť v tej istej dátovej sade"
msgid "Deleted node referenced by {0}"
-msgstr "Zmazaný uzol odkazovaný na {0}"
+msgstr "Zmazaný bod odkazovaný z {0}"
msgid "Complete node {0} with null coordinates in way {1}"
msgstr "Kompletný bod {0} s neplatnými súradnicami v ceste {1}"
msgid ""
"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr "Nemôžem porovnať pôvodné s ID ''{0}'' s pôvodným s ID ''{1}''."
+msgstr ""
+"Nemôžem porovnať základný objekt s ID ''{0}'' so základným objektom s ID "
+"''{1}''."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
+msgstr "Parameter {0} nie je v rozsahu 0..{1}. Obdržaná hodnota je \"{2}\"."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Chyba: Nepodarilo sa načítať vykresľovaciu triedu mapy ''{0}''. Trieda "
-"nebola nájdená."
+"Nepodarilo sa načítať vykresľovaciu triedu mapy \"{0}\". Trieda nebola "
+"nájdená."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3454,7 +3553,7 @@ msgid ""
"Can''t activate map renderer class ''{0}'', because it isn''t registered as "
"map renderer."
msgstr ""
-"Nemožno aktivovať vykresľovaciu triedu máp ''{0}'', pretože nie je zapísaná "
+"Nemožno aktivovať vykresľovaciu triedu máp ''{0}'', pretože nie je zapísaná "
"ako vykresľovač máp."
msgid "Wireframe Map Renderer"
@@ -3476,13 +3575,13 @@ msgid "selected"
msgstr "zvolené"
msgid "Relation: selected"
-msgstr "Relácia: Vybratá"
+msgstr "Relácia: vybraná"
msgid "Node: standard"
msgstr "Bod: štandardný"
msgid "Node: connection"
-msgstr "Bod: Pripojený"
+msgstr "Bod: spojenie ciest"
msgid "Node: tagged"
msgstr "Bod: označkovaný"
@@ -3524,7 +3623,7 @@ msgid "Unexpected parameter format (''{0}'')"
msgstr "Neočakávaný formát parametra (''{0}'')"
msgid "Value ''{0}'' for option +init not supported."
-msgstr "Hodnota ''{0}'' pre možnosť + init nie je podporovaný."
+msgstr "Hodnota ''{0}'' pre možnosť +init nie je podporovaná."
msgid ": "
msgstr ": "
@@ -3536,33 +3635,36 @@ msgid "Combination of ellipsoid parameters is not supported."
msgstr "Kombinácia parametrov elipsoidu nie je podporovaná."
msgid "Ellipsoid required (+ellps=* or +a=*, +b=*)"
-msgstr "Elipsoid vyžaduje (+ ellps = * alebo + = *, + b = *)"
+msgstr "Elipsoid sa vyžaduje (+ellps=* alebo +a=*, +b=*)"
msgid "Grid shift file ''{0}'' for option +nadgrids not supported."
-msgstr ""
+msgstr "Súbor posunu mriežky \"{0}\" nie je pre voľbu +nadgrids podporovaná."
msgid "Unkown datum identifier: ''{0}''"
-msgstr "Neznámy identifikátor dátumu: ''{0}''"
+msgstr "Neznámy identifikátor hodnoty: \"{0}\""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Dátum požaduje (+dátum=*, +towgs84 =* alebo +nadgirds =*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Vyžaduje sa hodnota (+datum=*, +towgs84 =* alebo +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
msgstr "Neočakávaný počet parametrov pre \"towgs84\" (musí byť 3 alebo 7)"
msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
-msgstr "Nemožno analyzovať hodnotu parametra ''towgs84'' (''{0}'')"
+msgstr "Nemožno analyzovať hodnotu parametra \"towgs84\" (\"{0}\")"
msgid "Projection required (+proj=*)"
-msgstr "Projekcia požaduje (+proj =*)"
+msgstr "Projekcia požadovaná (+proj=*)"
msgid "Unkown projection identifier: ''{0}''"
-msgstr "Neznámy identifikátor projekcie: ''{0}''"
+msgstr "Neznámy identifikátor projekcie: \"{0}\""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr "Neočakávaný počet parametrov pre ''+bounds'' (musia byť 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Neznámy parameter ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Predpokladaný počet argumentov pre parameter ''{0}''"
@@ -3580,14 +3682,11 @@ msgstr "Vlastná projekcia"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "Chyba: nepodarilo sa otvoriť vstupný tok zdroja ''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
msgid "Parameter ''{0}'' required."
-msgstr "Vyžadovaný parameter ''{0}'' ."
+msgstr "Vyžadovaný parameter ''{0}''."
msgid "Lambert Conformal Conic"
msgstr "Lambert Conformal Conic"
@@ -3623,14 +3722,17 @@ msgstr "ostatné overovania"
msgid "Running test {0}"
msgstr "Spúšťam test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Test \"{0}\" dokončený za {1}"
+
msgid "Addresses"
msgstr "Adresy"
msgid "Checks for errors in addresses and associatedStreet relations."
-msgstr ""
+msgstr "Kontroluje chyby v adresách a reláciách \"associatedStreet\"."
msgid "Multiple associatedStreet relations"
-msgstr ""
+msgstr "Viaceré relácie associatedStreet"
msgid "House number without street"
msgstr "Číslo domu bez ulice"
@@ -3645,7 +3747,16 @@ msgid "Multiple street names in relation"
msgstr "Viacnásobný počet názvu ulice v relácii"
msgid "House number too far from street"
-msgstr "Dom číslo je príliš ďaleko od ulice"
+msgstr "Číslo domu je príliš ďaleko od ulice"
+
+msgid "Barriers and entrances"
+msgstr "Prekážky a vchody"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Skontroluje chyby v prekážkach a vchodoch."
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Vchod/vstup cez prekážku nie je nastavený na prekážke"
msgid "Building inside building"
msgstr "Budova v budove"
@@ -3669,13 +3780,13 @@ msgid "Reversed coastline"
msgstr "Obrátená pobrežná čiara"
msgid "Crossing ways."
-msgstr "Križovatka ciest."
+msgstr "Križovanie ciest."
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
"the same layer, but are not connected by a node."
msgstr ""
-"Tento test kontroluje či dve cesty, železnice, vodné cesty, alebo budovy sa "
+"Tento test kontroluje či dve cesty, železnice, vodné cesty alebo budovy sa "
"križujú v rovnakej vrstve, ale sa nepretínajú v spoločnom bode."
msgid "Crossing buildings"
@@ -3685,19 +3796,19 @@ msgid "Crossing waterways"
msgstr "Križovanie vodných ciest"
msgid "Crossing waterway/highway"
-msgstr "Križujúce sa waterway/highway"
+msgstr "Kríženie vodnej cesty s pozemnou cestou"
msgid "Crossing ways"
msgstr "Zkrížené cesty"
msgid "Deprecated Tags"
-msgstr "Zastaralé tagy"
+msgstr "Zastaralé značky"
msgid "Checks and corrects deprecated tags."
-msgstr "Skontroluje a opraví zastaralé tagy."
+msgstr "Skontroluje a opraví zastaralé značky."
msgid "Deprecation fix of {0}"
-msgstr "Oprava zastaralých z {0}"
+msgstr "Oprava zastaralých {0}"
msgid "{0} is deprecated"
msgstr "{0} je zastaralý"
@@ -3708,20 +3819,20 @@ msgstr " alebo "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} je zastaralý, použite {1}"
+msgid "{0} is unnecessary"
+msgstr "{0} je nepotrebný"
+
msgid "Duplicated nodes"
msgstr "Duplicitné body"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Zdvojené body vo dvoch neuzatvorených cestách"
-
msgid "Mixed type duplicated nodes"
msgstr "Zmiešaný typ duplicitných bodov"
msgid "Highway duplicated nodes"
-msgstr "Duplicitné body na diaľnici"
+msgstr "Duplicitné body na komunikácii"
msgid "Railway duplicated nodes"
msgstr "Duplicitné body na železnici"
@@ -3736,7 +3847,7 @@ msgid "Power duplicated nodes"
msgstr "Duplicitné body na elektrickom vedení"
msgid "Natural duplicated nodes"
-msgstr "Duplicitné body na prírodných ..."
+msgstr "Duplicitné body na prírodných útvaroch"
msgid "Building duplicated nodes"
msgstr "Duplicitné body na budovách"
@@ -3757,7 +3868,7 @@ msgid ""
"This test checks that there are no relations with same tags and same members "
"with same roles."
msgstr ""
-"Tento test kontroluje, či neexistujú žiadne relácie s rovnakými tagmi a s "
+"Tento test kontroluje, či neexistujú žiadne relácie s rovnakými značkami a s "
"rovnakým členom s rovnakou úlohou."
msgid "Relations with same members"
@@ -3774,7 +3885,7 @@ msgid ""
"optionally also same tags."
msgstr ""
"Tento test kontroluje, že neexistujú žiadne cesty s bodmi s rovnakými "
-"súradnicami a tiež rovnakými hodnotami."
+"súradnicami a tiež rovnakými značkami."
msgid "Ways with same position"
msgstr "Cesty s rovnakou polohou"
@@ -3788,17 +3899,35 @@ msgstr "Duplicitné body v ceste"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Skontroluje cesty či neobsahujú identické body za sebou."
+msgid "Highways"
+msgstr "Pozemné komunikácie"
+
+msgid "Performs semantic checks on highways."
+msgstr "Vykoná kontroly zmyslu na cestách."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Chybný kruhový objazd (highway: {0} namiesto {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Chýbajú informácie o priechode pre chodcov"
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
-msgstr "multipolygón"
+msgstr "Multipolygón"
msgid "This test checks if multipolygons are valid."
msgstr "Tento test skontroluje, či je multipolygón platný."
msgid "Area style way is not closed"
-msgstr "Oblasť štýlu cesty nie je uzavretá"
+msgstr "Cesta reprezentujúca oblasť nie je uzavretá"
msgid "No outer way for multipolygon"
-msgstr "Chýba vonkajšia cesta multipolygónu"
+msgstr "Chýba vonkajšia cesta multipolygónu (s rolou \"outer\")"
msgid "No style for multipolygon"
msgstr "Žiadny štýl pre multipolygón"
@@ -3807,10 +3936,10 @@ msgid "No style in multipolygon relation"
msgstr "Nie je žiaden štýl v multipolygónovej relácii"
msgid "Style for inner way equals multipolygon"
-msgstr "Štýl pre vnútornú cestu multipolygónu"
+msgstr "Štýl pre vnútornú cestu multipolygónu je rovnaký ako v multipolygóne"
msgid "Style for outer way mismatches"
-msgstr "Štýl pre vonkajšiu cestu multipolygónu"
+msgstr "Štýl pre vonkajšiu cestu sa líši"
msgid "Multipolygon is not closed"
msgstr "Multipolygón nie je uzavretý"
@@ -3825,34 +3954,34 @@ msgid "No useful role for multipolygon member"
msgstr "Žiadna platná funkcia pre člena multipolygónu"
msgid "Non-Way in multipolygon"
-msgstr "Multipolygón neobsahuje žiadnu cestu"
+msgstr "V multipolygóne je člen, ktorý nie je cestou"
msgid "Missing name:* translation"
-msgstr "Chýbajúce meno:* preklad"
+msgstr "Chýbajúci preklad name:*"
msgid ""
"This test finds multilingual objects whose ''name'' attribute is not equal "
"to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
"e.g., Italia - Italien - Italy."
msgstr ""
-"Tento test zistí, viacjazyčné objekty, ktorých ''meno''atribút nie je "
-"rovnaký ''meno: *''atribút, nie zložený ''meno: *''atribúty, napríklad, "
-"Italia - Italien - Italy."
+"Tento test nájde viacjazyčné objekty, ktorých atribút \"name\" (meno) nie je "
+"rovnaký ako niektorý z atribútov \"name:*\" a nie je zložený z atribútov "
+"\"name:*\", napríklad Italia - Italien - Italy."
msgid "A name:* translation is missing."
-msgstr "Meno:* preklad je chýbajúci."
+msgstr "Chýba preklad \"name:*\"."
msgid "A name is missing, even though name:* exists."
msgstr "Chýba ''name'', napriek tomu, že ''name:*'' existuje."
msgid "Nodes duplicating way tags"
-msgstr "Body duplikujúce tagy cesty"
+msgstr "Body duplikujúce značky cesty"
msgid "Checks for nodes that have the same tags as their parent way."
-msgstr "Hľadá body, ktoré majú rovnaké tagy ako cesta ktorej sú súčasťou."
+msgstr "Hľadá body, ktoré majú rovnaké značky ako cesta, ktorej sú súčasťou."
msgid "Nodes duplicating parent way tags"
-msgstr "Body duplikujúce tagy cesty ktorej sú súčasťou"
+msgstr "Body duplikujúce značky cesty, ktorej sú súčasťou"
msgid "Nodes with same name"
msgstr "Body s rovnakými názvami"
@@ -3862,8 +3991,14 @@ msgstr ""
"Tento test slúži na vyhľadanie bodov s rovnakými názvami (môžu to byť "
"duplicity)."
+msgid "Opening hours syntax"
+msgstr "Zápis otváracích hodín"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr "Tento test kontroluje správny zápis otváracích hodín."
+
msgid "Overlapping Areas"
-msgstr "Prekrývajúce sa Oblasti"
+msgstr "Prekrývajúce sa oblasti"
msgid "This test checks if areas overlap."
msgstr "Tento test skontroluje, či sa oblasti neprekrývajú."
@@ -3885,13 +4020,13 @@ msgid "Areas share segment"
msgstr "Oblasti majú spoločný úsek cesty."
msgid "Highways share segment with area"
-msgstr "Hlavné cesty obsahujú oblasti"
+msgstr "Hlavné cesty majú spoločný úsek s oblasťou"
msgid "Railways share segment with area"
-msgstr "Železnice obsahujú oblasti"
+msgstr "Železnice majú spoločný úsek s oblasťou"
msgid "Ways share segment with area"
-msgstr "Cesty obsahujú oblasti"
+msgstr "Cesty majú spoločný úsek s oblasťou"
msgid "Overlapping highways"
msgstr "Prekrývajúce sa komunikácie"
@@ -3905,7 +4040,7 @@ msgstr "Elektrické vedenia"
msgid ""
"Checks for nodes in power lines that do not have a power=tower/pole tag."
msgstr ""
-"Hľadá body na elektrických vedenia, ktoré nemajú tag power=tower/pole."
+"Hľadá body na elektrických vedeniach, ktoré nemajú značku power=tower/pole."
msgid "Missing power tower/pole within power line"
msgstr "Chýbajúci power=tower/pole na elektrickom vedení"
@@ -3922,26 +4057,26 @@ msgstr "Neznámy typ relácie"
msgid "Relation is empty"
msgstr "Relácia je prázdna"
+msgid "Role verification problem"
+msgstr "Problém s overením úlohy"
+
msgid "<empty>"
msgstr "<prázdny>"
msgid "Role {0} missing"
-msgstr "Úloha {0} chýba"
-
-msgid "Role verification problem"
-msgstr "Problém s overením úlohy"
+msgstr "Úloha \"{0}\" chýba"
msgid "Number of {0} roles too low ({1})"
-msgstr "Počet {0} úloh príliš nízky ({1})"
+msgstr "Počet úloh \"{0}\" je príliš nízky ({1})"
msgid "Number of {0} roles too high ({1})"
-msgstr "Počet {0} úloh príliš vysoký ({1})"
+msgstr "Počet úloh \"{0}\" je príliš vysoký ({1})"
msgid "Member for role {0} of wrong type"
-msgstr "Člen pre úlohu {0} je chybného typu"
+msgstr "Člen pre úlohu \"{0}\" je chybného typu"
msgid "Role {0} unknown"
-msgstr "Neznáma úloha {0}"
+msgstr "Neznáma úloha \"{0}\""
msgid "Empty role found"
msgstr "Nájdená prázdna úloha"
@@ -3962,17 +4097,17 @@ msgid ""
msgstr ""
"Tento test kontroluje cesty na podobnosť mien, keď môže ísť o preklep."
-msgid "Properties checker :"
-msgstr "Kontrola vlastností :"
+msgid "Tag checker"
+msgstr "Kontrola značiek"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Tento plugin kontroluje chyby kľúčov a ich hodnôt."
+msgid "This test checks for errors in tag keys and values."
+msgstr "Tento plugin kontroluje chyby kľúčov značiek a ich hodnôt."
msgid "Invalid tagchecker line - {0}: {1}"
-msgstr "Neplatný tagchecker line - {0}: {1}"
+msgstr "Neplatný riadok tagchecker - {0}: {1}"
msgid "Invalid spellcheck line: {0}"
-msgstr "Neplatný spellcheck line: {0}"
+msgstr "Neplatný riadok spellcheck: {0}"
msgid ""
"Could not access data file(s):\n"
@@ -3982,22 +4117,22 @@ msgstr ""
"{0}"
msgid "Suspicious tag/value combinations"
-msgstr "Podozrivá kombinácia tag/hodnota"
+msgstr "Podozrivé kombinácie značka/hodnota"
msgid "Key ''{0}'' invalid."
msgstr "Klúč ''{0}'' je neplatný."
msgid "Tag value contains character with code less than 0x20"
-msgstr "Hodnota tagu obsahuje znak s kódom menším ako 0x20"
+msgstr "Hodnota značky obsahuje znak s kódom menším ako 0x20"
msgid "Tag key contains character with code less than 0x20"
msgstr "Hodnota kľúča obsahuje znak s kódom menším ako 0x20"
msgid "Tag value longer than allowed"
-msgstr "Hodnota tagu je dlhšia, než je povolené"
+msgstr "Hodnota značky je dlhšia, než je povolené"
msgid "Tag key longer than allowed"
-msgstr "Kľúč tagu je dlhší ako je povolené"
+msgstr "Kľúč značky je dlhší než je povolené"
msgid "Tags with empty values"
msgstr "Klúče s prázdnými hodnotami"
@@ -4009,22 +4144,22 @@ msgid "Invalid white space in property key"
msgstr "Neplatná medzera vo vlastnosti klúča"
msgid "Property values start or end with white space"
-msgstr "Hodnota začíná alebo končí medzerou"
+msgstr "Hodnoty začínajú alebo končia medzerou"
msgid "Property values contain HTML entity"
-msgstr "Hodnota obsahuje HTML entitu"
+msgstr "Hodnotu obsahujú HTML entitu"
msgid "Key ''{0}'' not in presets."
msgstr "Kľúč ''{0}'' sa nenachádza v zozname predvolených hodnôt."
msgid "Presets do not contain property key"
-msgstr "Predvoľba neobsahuje vlastnosti kľúča"
+msgstr "Predvoľby neobsahujú kľúč"
msgid "Value ''{0}'' for key ''{1}'' not in presets."
msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je v predvolenom zozname."
msgid "Presets do not contain property value"
-msgstr "Predvoľba neobsahuje vlastnost hodnoty"
+msgstr "Predvoľby neobsahujú hodnotu vlastnosti"
msgid "FIXMES"
msgstr "FIXME"
@@ -4081,7 +4216,7 @@ msgid "Validate that property values are valid checking against presets."
msgstr "Porovnáva platnosť hodnôt vlastností oproti prednastaveným hodnotám."
msgid "Check for FIXMES."
-msgstr "Kontrola pre FIXMES."
+msgstr "Kontrola FIXMES."
msgid "Looks for nodes or ways with FIXME in any property value."
msgstr "Vyhľadá body, alebo cesty s FIXME v hodnotách vlastností."
@@ -4093,10 +4228,10 @@ msgid "Use the default data file (recommended)."
msgstr "Použiť predvolený dátový súbor (doporučené)."
msgid "Use default tag ignore file."
-msgstr "Použite predvolený tag ignorujúci súbor."
+msgstr "Použiť predvolený súbor pre ignorované značky."
msgid "Use the default tag ignore file (recommended)."
-msgstr "Použite predvolený súbor pre ignorované značky (doporučené)."
+msgstr "Použiť predvolený súbor pre ignorované značky (doporučené)."
msgid "Use default spellcheck file."
msgstr "Použiť predvolený súbor pre spellcheck (preklepy)."
@@ -4104,8 +4239,8 @@ msgstr "Použiť predvolený súbor pre spellcheck (preklepy)."
msgid "Use the default spellcheck file (recommended)."
msgstr "Použiť predvolený súbor pre spellcheck (doporučené)."
-msgid "Fix properties"
-msgstr "Oprava vlastností"
+msgid "Fix tags"
+msgstr "Oprava značiek"
msgid "Could not find element type"
msgstr "Nemôžem nájsť typ elementu"
@@ -4135,10 +4270,10 @@ msgid "Unknown member type"
msgstr "Neznámy typ člena"
msgid "More than one \"from\" way found"
-msgstr "Najdených viac ako jedna cesta \"z\""
+msgstr "Nájdená viac ako jedna cesta \"z\""
msgid "More than one \"to\" way found"
-msgstr "Najdených viac ako jedna cesta \"na\""
+msgstr "Nájdená viac ako jedna cesta \"na\""
msgid "More than one \"via\" node found"
msgstr "Viac ako jeden \"cez\" nájdený bod"
@@ -4147,10 +4282,10 @@ msgid "Cannot mix node and way for role \"via\""
msgstr "Nemožno miešať bod, a líniu pre úlohu \"cez\""
msgid "No \"from\" way found"
-msgstr "Žiadna \"z\" najdená cesta"
+msgstr "Nenájdená cesta \"z (from)\""
msgid "No \"to\" way found"
-msgstr "Žiadna \"na\" najdená cesta"
+msgstr "Nenájdená cesta \"na (to)\""
msgid "No \"via\" node or way found"
msgstr "Nenajdený \"cez\", bod alebo cesta"
@@ -4181,6 +4316,9 @@ msgstr ""
"Tento test kontroluje, či cesty, ktoré by mali byť uzavreté sú skutočne "
"uzavreté."
+msgid "Unclosed way"
+msgstr "Neuzavretá cesta"
+
msgid "natural type {0}"
msgstr "prírodné (natural) {0}"
@@ -4188,7 +4326,7 @@ msgid "landuse type {0}"
msgstr "využitie oblasti (landuse) {0}"
msgid "amenities type {0}"
-msgstr "zaujímavosti (amenity) {0}"
+msgstr "občianska vybavenosť (amenity) {0}"
msgid "sport type {0}"
msgstr "športové {0}"
@@ -4211,9 +4349,6 @@ msgstr "budova"
msgid "area"
msgstr "oblasť (plocha)"
-msgid "Unclosed way"
-msgstr "Neuzavretá cesta"
-
msgid "Unconnected ways"
msgstr "Nepripojené cesty"
@@ -4230,23 +4365,23 @@ msgid "Way node near other way"
msgstr "Bod cesty je blízko inej cesty"
msgid "Connected way end node near other way"
-msgstr "Spojený koncový bod cesty je blízko inej cesty"
+msgstr "Koncový bod spojenej cesty je blízko inej cesty"
msgid "Untagged and unconnected nodes"
-msgstr "Neotagované a nepripojené uzly"
+msgstr "Neoznačkované a nepripojené body"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Tento test hľadá body bez značiek, ktoré nie sú súčasťou žiadnej cesty."
-msgid "No tags"
-msgstr "Žiadne značky"
-
msgid "Unconnected nodes without physical tags"
msgstr "Nespojené body, bez fyzických značiek"
+msgid "No tags"
+msgstr "Žiadne značky"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
-msgstr "Má tag obsahujúci ''fixme'' alebo ''FIXME''"
+msgstr "Má značku obsahujúcu ''fixme'' alebo ''FIXME''"
msgid "Has key ''note'' or ''comment'' or ''description''"
msgstr "Má kľúč ''note'', ''comment'' alebo ''description''"
@@ -4261,23 +4396,22 @@ msgid "Has key ''source''"
msgstr "Má kľúč ''source''"
msgid "Untagged, empty and one node ways"
-msgstr "Neotagované, prázdne a cesty s jedným uzlom"
+msgstr "Neoznačkované, prázdne a cesty s jedným bodom"
msgid "This test checks for untagged, empty and one node ways."
-msgstr ""
-"Tento test hľadá neotagované (neoznačené), prázdne a jednobodové cesty."
+msgstr "Tento test hľadá neoznačkované, prázdne a jednobodové cesty."
msgid "Unnamed ways"
msgstr "Nepomenované cesty"
msgid "Unnamed junction"
-msgstr "Nepomenované spojenie"
+msgstr "Nepomenovaná križovatka"
msgid "Untagged ways (commented)"
msgstr "Neoznačkovaná cesta (komentované)"
msgid "Untagged ways"
-msgstr "Neotagované (neoznačené) cesty"
+msgstr "Neoznačkované cesty"
msgid "Empty ways"
msgstr "Prázdne cesty"
@@ -4292,7 +4426,7 @@ msgid "Checks for ways connected to areas."
msgstr "Skontroluje cesty pripojené k oblastiam."
msgid "Way terminates on Area"
-msgstr "Cesta konči na oblasti"
+msgstr "Cesta končí na oblasti"
msgid "Wrongly Ordered Ways"
msgstr "Nesprávne zoradené cesty"
@@ -4306,25 +4440,6 @@ msgstr "Obrátené pobrežie: zem nie je na ľavej strane"
msgid "Reversed land: land not on left side"
msgstr "Obrátená zem: zem nie je na ľavej strane"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Nesprávny počet argumentov pre záložky"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Chyba pri čítaní položky záložky:%s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Chyba: Nedovolená zdvojená hodnota ''{0}'' v riadku ''{1}'' v súbore "
-"záložiek ''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>Nemôžem čítať záložky z<br>''{0}''<br>Chyba bola: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Znovu nezobrazovať (zapamätanie voľby)"
@@ -4338,13 +4453,13 @@ msgid "House {0}"
msgstr "Dom {0}"
msgid "House number {0} at {1}"
-msgstr "Číslo domu {0} v {1}"
+msgstr "Číslo domu {0} na {1}"
msgid "House number {0}"
msgstr "Číslo domu {0}"
msgid "highway"
-msgstr "komunikácie"
+msgstr "komunikácia"
msgid "railway"
msgstr "železnica"
@@ -4357,13 +4472,13 @@ msgstr "využitie oblasti (landuse)"
msgid "{0} node"
msgid_plural "{0} nodes"
-msgstr[0] "{0} bod"
-msgstr[1] "{0} body"
-msgstr[2] "{0} bodov"
+msgstr[0] "{0} bodov"
+msgstr[1] "{0} bod"
+msgstr[2] "{0} body"
msgid "{0} member"
msgid_plural "{0} members"
-msgstr[0] "{0} člen"
+msgstr[0] "{0} členov"
msgstr[1] "{0} člen"
msgstr[2] "{0} členy"
@@ -4383,7 +4498,7 @@ msgid "Network exception"
msgstr "Sieťová výnimka"
msgid "IO Exception"
-msgstr "IO Výnimka"
+msgstr "V/V Výnimka (I/O)"
msgid "Illegal Data"
msgstr "Chybné dáta"
@@ -4404,7 +4519,7 @@ msgid "Authentication Failed"
msgstr "Autentifikácia zlyhala"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr "Prístup k redigované verzii ''{0}'' z {1} {2} je zakázaný."
+msgstr "Prístup k redigovanej verzii ''{0}'' z {1} {2} je zakázaný."
msgid "Authorisation Failed"
msgstr "Autentifikácia zlyhala"
@@ -4425,13 +4540,13 @@ msgid "Unknown host"
msgstr "Neznámy hostiteľ"
msgid "Show help information"
-msgstr "Zobraziť informácie o pomoci"
+msgstr "Zobraziť pomocné informácie"
msgid "Downloading \"Message of the day\""
msgstr "Sťahujem \"Správu dňa\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Upozornenie: Nepodarilo sa čítať MOTD. Výnimka bola: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Nepodarilo sa načítať správu dňa. Výnimka bola: {0}"
msgid "Message of the day not available"
msgstr "Správu dňa nie je možné zobraziť"
@@ -4451,7 +4566,8 @@ msgstr "Posun"
msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
msgstr ""
-"Očakávaná neprázdna hodnota pre parameter ''{0}'', dostal som ''{1}''"
+"Očakávaná neprázdna hodnota pre parameter \"{0}\", obdržaná hodnota je "
+"\"{1}\""
msgid "Upload Preferences"
msgstr "Nahrať nastavenie"
@@ -4463,7 +4579,7 @@ msgid "string"
msgstr "reťazec"
msgid "Name of the user."
-msgstr "Meno užívateľa."
+msgstr "Meno používateľa."
msgid "OSM Password."
msgstr "OSM heslo."
@@ -4485,8 +4601,8 @@ msgid ""
"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
"lat=y&lon=x&zoom=z or a filename"
msgstr ""
-"Sťahovať všetko ako raw gps. Možno v tvare x1,y1,x2,y2 alebo URL "
-"obsahujúcom šírka=y&dĺžka=x&zoom=z alebo ešte ešte názov súboru"
+"Sťahovať všetko ako raw gps. Možno v tvare x1,y1,x2,y2 alebo URL obsahujúcom "
+"šírka=y&dĺžka=x&zoom=z alebo ešte názov súboru"
msgid ""
"Add each to the initial selection. Can be a google-like search string or an "
@@ -4518,25 +4634,23 @@ msgid "Show this help"
msgstr "Zobrazí túto nápovedu"
msgid "Standard unix geometry argument"
-msgstr "Štandardný unix geometry argument"
+msgstr "Štandardný UNIXový parameter pre geometriou"
msgid "Download the bounding box"
-msgstr "Stiahnuť ohraničujúcí box"
+msgstr "Stiahnuť ohraničujúci rámec"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
msgstr "Stiahnite si umiestnenie na adrese URL (s lat=x&lon=y&zoom=z)"
msgid "Open a file (any file type that can be opened with File/Open)"
-msgstr ""
-"Otvoriť súbor (niektoré typy súborov môžu byť otvorené s Súbor/Otvoriť)"
+msgstr "Otvoriť súbor (všetky typy súborov otvoriteľné cez Súbor/Otvoriť)"
msgid "Download the bounding box as raw GPS"
-msgstr "Stiahnite si podľa ohraničujúcejho rámčeka ako surové GPS"
+msgstr "Stiahnuť ohraničujúci rámec ako surové GPS"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
msgstr ""
-"Stiahnite si umiestnenie na adrese URL (s lat = x & lon = y & snímke = z) "
-"ako surové GPS"
+"Stiahnuť umiestnenie na adrese URL (s lat=x&lon=y&zoom=z) ako surové GPS"
msgid "Select with the given search"
msgstr "Výber s určeným hľadaním"
@@ -4560,13 +4674,14 @@ msgid "Displays the JOSM version and exits"
msgstr "Zobrazí JOSM verziu a skončí"
msgid "options provided as Java system properties"
-msgstr "možnosti poskytnutia ako Java system properties"
+msgstr ""
+"voľby poskytované ako systémové vlastnosti Java (Java system properties)"
msgid "/PATH/TO/JOSM/FOLDER/ "
-msgstr "/CESTA/K/JOSM/ZLOŽKE/ "
+msgstr "/CESTA/K/JOSM/PRIEČINKU/ "
msgid "Change the folder for all user settings"
-msgstr "Zmena adresára pre všetký nastavenia užívateľa"
+msgstr "Zmena adresára pre všetky nastavenia používateľa"
msgid ""
"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4576,7 +4691,7 @@ msgid ""
msgstr ""
"poznámka: Pre niektoré úlohy, JOSM potrebuje a veľa pamäte. Môže to byť "
"nevyhnutné pre pridanie nasledujúcich\n"
-" možností Jávy pre upresnenie maximálnej veľkosti pridelenej pamäte v "
+" možností Javy pre upresnenie maximálnej veľkosti pridelenej pamäte v "
"megabytes"
msgid "examples"
@@ -4624,13 +4739,13 @@ msgstr "Zahodiť"
msgid "JOSM found {0} unsaved osm data layer. "
msgid_plural "JOSM found {0} unsaved osm data layers. "
-msgstr[0] "JOSM našiel {0} neuloženú OSM dátovú vrstvu. "
-msgstr[1] "JOSM našiel {0} neuložené OSM dátové vrstvy. "
-msgstr[2] "JOSM našiel {0} neuložených OSM dátových vrstiev. "
+msgstr[0] "JOSM našiel {0} neuložených OSM dátových vrstiev. "
+msgstr[1] "JOSM našiel {0} neuloženú OSM dátovú vrstvu. "
+msgstr[2] "JOSM našiel {0} neuložené OSM dátové vrstvy. "
msgid ""
"It looks like JOSM crashed last time. Would you like to restore the data?"
-msgstr "Vyzerá to, že JOSM naposledy havaroval.Chcete obnoviť dáta?"
+msgstr "Vyzerá to, že JOSM naposledy havaroval. Chcete obnoviť dáta?"
msgid "File"
msgstr "Súbor"
@@ -4644,9 +4759,24 @@ msgstr "Zobraziť"
msgid "Tools"
msgstr "Nástroje"
+msgid "More tools"
+msgstr "Viac nástrojov"
+
+msgid "Data"
+msgstr "Údaje"
+
+msgid "Selection"
+msgstr "Výber"
+
msgid "Presets"
msgstr "Predvoľby"
+msgid "More..."
+msgstr "Ďalšie..."
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Okná"
@@ -4662,11 +4792,23 @@ msgstr "Editačná nástrojová lišta"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "Mení viditeľnosť editačnej nástrojovej lišty (vertikálny panel)"
+msgid "Preset preferences"
+msgstr "Nastavenia predvolieb"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr "Kliknite pre otvorenie karty nastavení predvolieb odnačovania"
+
+msgid "Imagery preferences"
+msgstr "Nastavenia mapových podkladov"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Kliknite pre zobrazenie karty s nastaveniami pre mapové podklady"
+
msgid "Audio"
msgstr "Zvuk"
-msgid "Hide edit toolbar"
-msgstr "Skryť editačnú nástrojovú lištu"
+msgid "Do not hide toolbar"
+msgstr "Neskrývať nástrojovú lištu"
msgid "Hide this button"
msgstr "Skryť toto tlačítko"
@@ -4674,6 +4816,9 @@ msgstr "Skryť toto tlačítko"
msgid "Click the arrow at the bottom to show it again."
msgstr "Kliknutie na šípku v dolnej časti ho znova zobrazí."
+msgid "Hide edit toolbar"
+msgstr "Skryť editačnú nástrojovú lištu"
+
msgid "Hide or show this toggle button"
msgstr "Skryť alebo zobraziť toto prepínacie tlačidlo"
@@ -4735,11 +4880,14 @@ msgstr "(žiadny objekt)"
msgid "User:"
msgstr "Používateľ:"
+msgid "Do not hide status bar"
+msgstr "Neskrývať stavový riadok"
+
msgid "Layer not in list."
msgstr "Vrstva nie je v zozname."
msgid "Layer ''{0}'' must be in list of layers"
-msgstr "Vrstva ''{0}'' musí byť v zozname vrstiev"
+msgstr "Vrstva ''{0}'' musí byť v zozname vrstiev"
msgid "Metric"
msgstr "Metrická"
@@ -4762,19 +4910,6 @@ msgstr "Na pozadí"
msgid "Click to run job in background"
msgstr "Kliknite na spustenie úlohy na pozadí"
-msgid "false: the property is explicitly switched off"
-msgstr "chyba: vlastníctvo je jasne(výslovne) deaktivované"
-
-msgid "true: the property is explicitly switched on"
-msgstr "pravda: vlastníctvo je jasne(výslovne) aktivované"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "partial: vybraté objekty majú rôzne hodnoty, do not change"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "unset: táto vlastnosť sa nedá nastaviť na vybraté objekty."
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} ms)"
@@ -4816,9 +4951,9 @@ msgstr ""
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
-msgstr[0] "Vymazávam {0} objekt"
-msgstr[1] "Vymazávam {0} objekty"
-msgstr[2] "Vymazávam {0} objektov"
+msgstr[0] "Vymazávam {0} objektov"
+msgstr[1] "Vymazávam {0} objekt"
+msgstr[2] "Vymazávam {0} objekty"
msgid "Delete objects"
msgstr "Zmazať objekty"
@@ -4833,7 +4968,7 @@ msgid "Pos."
msgstr "Pos."
msgid "Role"
-msgstr "Úloha"
+msgstr "Funkcia"
msgid "Click to close the dialog and remove the object from the relations"
msgstr "Kliknutie zavrie dialóg a odstráni objekt z relácií"
@@ -4863,9 +4998,10 @@ msgid ""
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
-"<html>Alternatívne môžete zadať adresu <strong>dlaždice</strong>pre jednu "
-"dlaždicu vo formáte<i>zoomlevel/x/y</i>, tj <i> 15/256/223</i>. Adresy "
-"dlaždíc vo formáte <i>zoom,x,y</i> alebo <i>zoom;x;y</i> tiež platí.</html>"
+"<html>Alternatívne môžete zadať <strong>adresu dlaždice</strong> pre jednu "
+"dlaždicu vo formáte<i>úroveň priblíženia/x/y</i>, napr. <i>15/256/223</i>. "
+"Adresy dlaždíc vo formáte <i>priblíženie,x,y</i> alebo "
+"<i>priblíženie;x;y</i> sú tiež platné.</html>"
msgid "Tile address:"
msgstr "Adresa dlaždice:"
@@ -4953,7 +5089,7 @@ msgid "Their with Merged"
msgstr "Ich so zlúčeným"
msgid "Role {0} is not participating in compare pair {1}."
-msgstr "funkcia {0} sa nenachádza v porovnávanej dvojici {1}"
+msgstr "Rola {0} sa nenachádza v porovnávanej dvojici {1}"
msgid "Properties"
msgstr "Vlastnosti"
@@ -4968,19 +5104,19 @@ msgid "Members"
msgstr "Členovia"
msgid "No pending tag conflicts to be resolved"
-msgstr "Žiadny konflikt tagov na vyriešenie"
+msgstr "Žiadny konflikt značkiek na vyriešenie"
msgid "Tags({0} conflict)"
msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Značky({0} konflikt)"
-msgstr[1] "Značky({0} konflikty)"
-msgstr[2] "Značky({0} konfliktov)"
+msgstr[0] "Značky({0} konfliktov)"
+msgstr[1] "Značky({0} konflikt)"
+msgstr[2] "Značky({0} konflikty)"
msgid "{0} pending tag conflict to be resolved"
msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} nevyriešený konflikt značky na rozhodnutie"
-msgstr[1] "{0} nevyriešené konflikty značiek na rozhodnutie"
-msgstr[2] "{0} nevyriešených konfliktov značiek na rozhodnutie"
+msgstr[0] "{0} nevyriešených konfliktov značiek na rozhodnutie"
+msgstr[1] "{0} nevyriešený konflikt značky na rozhodnutie"
+msgstr[2] "{0} nevyriešené konflikty značiek na rozhodnutie"
msgid "Nodes(resolved)"
msgstr "Body(vyriešené)"
@@ -5039,13 +5175,13 @@ msgid "Merging deleted objects failed"
msgstr "Zlúčenie zmazaných objektov zlyhalo"
msgid "List in role {0} is currently not participating in a compare pair."
-msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici"
+msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici."
msgid "Unexpected value of parameter ''index''. Got {0}."
-msgstr "neočakávaná hodnota parametra\"index\". Got {0}"
+msgstr "Neočakávaná hodnota parametra \"index\". Obdržaná hodnota je {0}."
msgid "Item {0} not found in list."
-msgstr "položka {0} sa v zozname nenachádza"
+msgstr "Položka {0} sa v zozname nenachádza."
msgid "lock scrolling"
msgstr "zablokovať rolovanie"
@@ -5057,7 +5193,7 @@ msgid "My version"
msgstr "Moja verzia"
msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr "Zoznam elementov v mojej dátovej sade, i.e. miestna dátová sada"
+msgstr "Zoznam elementov v mojej dátovej sade, t.j. miestna dátová sada"
msgid "Merged version"
msgstr "Spojovaná verzia"
@@ -5073,21 +5209,24 @@ msgid "Their version"
msgstr "Ich verzia"
msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr "Zoznam elementov v ich dátovej sade, i.e. v dátovej sade servera"
+msgstr "Zoznam elementov v ich dátovej sade, t.j. v dátovej sade servera"
msgid "> top"
-msgstr "> hore"
+msgstr "> navrch"
msgid "Copy my selected nodes to the start of the merged node list"
msgstr "Skopírovať moje vybrané body na začiatok zoznamu pre spojované body"
msgid "> bottom"
-msgstr "> dole"
+msgstr "> naspodok"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Skopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy"
+msgid "> before"
+msgstr "> pred"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5095,6 +5234,9 @@ msgstr ""
"Skopírovať moje vybrané elementy pred prvý vybraný element v zozname pre "
"spojované elementy"
+msgid "> after"
+msgstr "> za"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5102,16 +5244,25 @@ msgstr ""
"Skopírovať moje vybrané elementy za prvý vybraný element v zozname pre "
"spojované elementy"
+msgid "< top"
+msgstr "< navrch"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Skopírovať ich vybrané elementy na začiatok zoznamu pre spojované elementy"
+msgid "< bottom"
+msgstr "< naspodok"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy"
+msgid "< before"
+msgstr "< pred"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5119,6 +5270,9 @@ msgstr ""
"Kopírovať ich vybrané elementy pred prvý vybraný element v zozname pre "
"spojované elementy"
+msgid "< after"
+msgstr "< za"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5130,89 +5284,79 @@ msgid "Copy all my elements to the target"
msgstr "Kopírovať všetky moje prvky do cieľa"
msgid "Copy all their elements to the target"
-msgstr "Kopírovať všetky ich (their) prvky do cieľa"
+msgstr "Kopírovať všetky ich prvky do cieľa"
msgid "Up"
-msgstr "Hore"
+msgstr "Nahor"
-msgid "Move up the selected elements by one position."
-msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou"
+msgid "Move up the selected entries by one position."
+msgstr "Posunúť vybrané položky nahor o jednu pozíciu."
msgid "Down"
-msgstr "Dole"
+msgstr "Nadol"
msgid "Move down the selected entries by one position."
-msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou"
+msgstr "Posunúť vybrané položky nadol o jednu pozíciu."
msgid "Remove"
msgstr "Odstrániť"
msgid "Remove the selected entries from the list of merged elements."
-msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
+msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov."
msgid "Freeze"
msgstr "Blokovať"
msgid "Freeze the current list of merged elements."
-msgstr "Blokovať aktuálny zoznam spojovaných elementov"
+msgstr "Blokovať aktuálny zoznam spojovaných elementov."
msgid "Unfreeze"
msgstr "Odblokovať"
msgid "Unfreeze the list of merged elements and start merging."
-msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie"
+msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie."
msgid ""
"<html>Click <strong>{0}</strong> to start merging my and their "
"entries.</html>"
msgstr ""
-"<html>Klik <strong>{0}</strong>pre začiatok spojovania mojich a ich "
-"položiek</html>"
+"<html>Kliknite <strong>{0}</strong> pre začiatok spojovania mojich a ich "
+"položiek.</html>"
msgid ""
"<html>Click <strong>{0}</strong> to finish merging my and their "
"entries.</html>"
msgstr ""
-"<html>Klik <strong>{0}</strong>pre koniec spojovania mojich a ich "
-"položiek</html>"
+"<html>Kliknite <strong>{0}</strong> pre koniec spojovania mojich a ich "
+"položiek.</html>"
msgid "My version ({0} entry)"
msgid_plural "My version ({0} entries)"
-msgstr[0] "Moja verzia ({0} vstupy)"
-msgstr[1] "Moja verzia ({0} vstup)"
-msgstr[2] "Moja verzia ({0} vstupov)"
+msgstr[0] "Moja verzia ({0} položiek)"
+msgstr[1] "Moja verzia ({0} položka)"
+msgstr[2] "Moja verzia ({0} položky)"
msgid "Merged version ({0} entry)"
msgid_plural "Merged version ({0} entries)"
-msgstr[0] "Spojovaná verzia ({0} vstupy)"
-msgstr[1] "Spojovaná verzia ({0} vstup)"
-msgstr[2] "Spojovaná verzia ({0} vstupov)"
+msgstr[0] "Spojovaná verzia ({0} položiek)"
+msgstr[1] "Spojovaná verzia ({0} položka)"
+msgstr[2] "Spojovaná verzia ({0} položky)"
msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
-msgstr[0] "Ich verzia ({0} vstupy)"
-msgstr[1] "Ich verzia ({0} vstup)"
-msgstr[2] "Ich verzia ({0} vstupov)"
+msgstr[0] "Ich verzia ({0} položiek)"
+msgstr[1] "Ich verzia ({0} položka)"
+msgstr[2] "Ich verzia ({0} položky)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
+msgid "Node"
+msgstr "Bod"
+
+msgid "Merged nodes not frozen yet. Cannot build resolution command."
msgstr ""
-"Nastaviteľný {0} ešte neregistrovaný. Nemôžem nastaviť spoluúčasť v "
-"nastavení synchronizácie."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Nastaviteľný {0} ešte neregistrovaný."
-
-msgid "Node"
-msgstr "Bod"
-
-msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr ""
-"Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
+"Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel."
msgid "Properties in my dataset, i.e. the local dataset"
-msgstr "Vlastnosti v mojej dátovej sade, i.e. lokálna dátová sada"
+msgstr "Vlastnosti v mojej dátovej sade, t.j. lokálna dátová sada"
msgid ""
"Properties in the merged element. They will replace properties in my "
@@ -5222,7 +5366,7 @@ msgstr ""
"elementoch, keď rozhodnutie o spojenie bude aplikované."
msgid "Properties in their dataset, i.e. the server dataset"
-msgstr "Vlastnosti v ich dátovej sade, i.e. serverova dátova sada"
+msgstr "Vlastnosti v ich dátovej sade, t.j. dátová sada na serveri"
msgid "Coordinates:"
msgstr "Súradnice:"
@@ -5261,7 +5405,7 @@ msgid "Undecide conflict between deleted state"
msgstr "Nevyriešené konflikty medzi vymazávaným stavom"
msgid "Primitive"
-msgstr "Pôvodný"
+msgstr "Základný objekt"
msgid "Merged nodes not frozen yet. Cannot build resolution command"
msgstr ""
@@ -5277,16 +5421,16 @@ msgid "My dataset does not include a tag with key {0}"
msgstr "Moja dátová sada nebude obsahovať značky s kľúčom {0}"
msgid "Key"
-msgstr "Kĺúč"
+msgstr "Kľúč"
msgid "Value"
msgstr "Hodnota"
msgid "Cannot apply undecided tag merge item."
-msgstr "nie je možné použiť neistú značku pri spojovaní prvkov"
+msgstr "Nie je možné použiť nerozhodnutú značku pri spojovaní prvkov."
msgid "My version (local dataset)"
-msgstr "Moja verzia (miestna(local) dátova sada)"
+msgstr "Moja verzia (miestna(local) dátová sada)"
msgid "Their version (server dataset)"
msgstr "Ich(their) verzia (serverová dátová sada)"
@@ -5307,13 +5451,13 @@ msgid "Their dataset does not include a tag with key {0}"
msgstr "Ich(their) dátová sada neobsahuje značku s kľúčom {0}"
msgid "Conflicts when combining primitives"
-msgstr "Konflikty pri spojovaní pôvodných"
+msgstr "Konflikty pri spájaní základných objektov"
msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr "Konflikty pri spojovaní ciest - spojovaná cesta je ''{0}''"
+msgstr "Konflikty pri spájaní ciest - spájaná cesta je ''{0}''"
msgid "Conflicts when merging nodes - target node is ''{0}''"
-msgstr "Konflikty pri spájaní bodov - cieľový bod je ''{0}''"
+msgstr "Konflikty pri zlučovaní bodov - cieľový bod je ''{0}''"
msgid "No conflicts to resolve"
msgstr "Žiadne konflikty na rozhodnutie"
@@ -5341,15 +5485,15 @@ msgid_plural ""
"want to continue?"
msgstr[0] ""
"Chystáte sa spojiť {1} objektov, ktoré sú súčasťou {0} "
-"relácie:<br/>{2}Spojenie týchto objektov môže poškodiť túto reláciu. Ak si "
+"relácií:<br/>{2}Spojenie týchto objektov môže poškodiť tieto relácie. Ak si "
"nie ste istý, prosím, zrušte túto operáciu.<br/>Ak budete pokračovať, "
-"zobrazí sa Vám okno na rozhodnutie, ako prispôsobiť reláciu.<br/><br/>Chcete "
+"zobrazí sa Vám okno na rozhodnutie, ako prispôsobiť relácie.<br/><br/>Chcete "
"pokračovať?"
msgstr[1] ""
"Chystáte sa spojiť {1} objektov, ktoré sú súčasťou {0} "
-"relácií:<br/>{2}Spojenie týchto objektov môže poškodiť tieto relácie. Ak si "
+"relácie:<br/>{2}Spojenie týchto objektov môže poškodiť túto reláciu. Ak si "
"nie ste istý, prosím, zrušte túto operáciu.<br/>Ak budete pokračovať, "
-"zobrazí sa Vám okno na rozhodnutie, ako prispôsobiť relácie.<br/><br/>Chcete "
+"zobrazí sa Vám okno na rozhodnutie, ako prispôsobiť reláciu.<br/><br/>Chcete "
"pokračovať?"
msgstr[2] ""
"Chystáte sa spojiť {1} objektov, ktoré sú súčasťou {0} "
@@ -5373,10 +5517,10 @@ msgid ""
"may have unwanted tags.<br/>If you want to continue, you are shown a dialog "
"to fix the conflicting tags.<br/><br/>Do you want to continue?"
msgstr ""
-"Chystáte sa spojiť {0} objektov, ale nasledovné tagy sú "
+"Chystáte sa spojiť {0} objektov, ale nasledovné značky sú "
"konfliktné:<br/>{1}Ak tieto objekty budú spojené, výsledný objekt môže "
-"obsahovať nechcené tagy.<br/>Ak budete pokračovať, zobrazí sa Vám okno na "
-"opravu konfliktných tagov.<br/><br/>Chcete pokračovať?"
+"obsahovať nechcené značky.<br/>Ak budete pokračovať, zobrazí sa Vám okno na "
+"opravu konfliktných značiek.<br/><br/>Chcete pokračovať?"
msgid "none"
msgstr "žiadny"
@@ -5391,19 +5535,19 @@ msgid "Please decide which values to keep"
msgstr "Prosím rozhodnite ktoré hodnoty ponechať"
msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr "Hodnota ''{0}'' je použitá pre kľúč ''{1}''"
+msgstr "Hodnota ''{0}'' bude použitá pre kľúč ''{1}''"
msgid "The key ''{0}'' and all its values are going to be removed"
-msgstr "Kľúč ''{0}'' a všetky jej hodnoty budú odstránené"
+msgstr "Kľúč ''{0}'' a všetky jeho hodnoty budú odstránené"
msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
-msgstr "Všetky hodnoty spojené ako ''{0}'' sú použité pre kľúč ''{1}''"
+msgstr "Všetky hodnoty spojené ako ''{0}'' budú použité pre kľúč ''{1}''"
msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "zbierka značiek neobsahuje vybrané hodnoty ''{0}''"
+msgstr "Zbierka značiek neobsahuje vybrané hodnoty ''{0}''."
msgid "Not decided yet."
-msgstr "Ešte nerozhodnuté"
+msgstr "Ešte nerozhodnuté."
msgid "Tags from nodes"
msgstr "Značky z bodov"
@@ -5428,9 +5572,9 @@ msgstr "Do ..."
msgid "{0} tag"
msgid_plural "{0} tags"
-msgstr[0] "{0} tag"
-msgstr[1] "{0} tagov"
-msgstr[2] "{0} tagy"
+msgstr[0] "{0} značiek"
+msgstr[1] "{0} značka"
+msgstr[2] "{0} značky"
msgid "{0} way"
msgid_plural "{0} ways"
@@ -5440,12 +5584,12 @@ msgstr[2] "{0} cesty"
msgid "{0} relation"
msgid_plural "{0} relations"
-msgstr[0] "{0} relácia"
-msgstr[1] "{0} relácie"
-msgstr[2] "{0} relácií"
+msgstr[0] "{0} relácií"
+msgstr[1] "{0} relácia"
+msgstr[2] "{0} relácie"
msgid "Position {0} is out of range. Current number of members is {1}."
-msgstr "pozícia {0} je mimo rozsah. aktuálne číslo z členov: {1}"
+msgstr "Pozícia {0} je mimo rozsah. Aktuálny počet členov je {1}"
msgid "Remove this relation member from the relation"
msgstr "Odstrániť tohoto člena relácie z relácie"
@@ -5469,30 +5613,29 @@ msgid "Enter a role for all relation memberships"
msgstr "Vložiť úlohu pre všetkých členov relácie"
msgid "Tag modified relations with "
-msgstr "Tagom zmenená relácia s "
+msgstr "Označiť zmenené relácie s "
msgid ""
"<html>Select to enable entering a tag which will be applied<br>to all "
"modified relations.</html>"
msgstr ""
-"<html>Výber umožní zanesenie značky, ktorá bude používaná<br>do všetkých "
+"<html>Výber umožní zanesenie značky, ktorá bude použitá<br>do všetkých "
"zmenených relácií.</html>"
msgctxt "tag"
msgid "Key:"
-msgstr "Klúč:"
+msgstr "Kľúč:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
-"<html>Vložte kľúč značky, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr "Vložte kľúč značky, napr. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Hodnota:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Vložte hodnotu značky, i.e. <strong><tt>kontrola "
+"<html>Vložte hodnotu značky, napr. <strong><tt>kontrola "
"členov</tt></strong></html>"
msgid ""
@@ -5503,7 +5646,7 @@ msgid ""
"ways that are members of the same relation: the combined way will take the "
"place of the original way in the relation.</html>"
msgstr ""
-"<html> Spojené cesty sú členmi v jednej, alebo vo viacerých reláciách. "
+"<html>Spojené cesty sú členmi v jednej, alebo vo viacerých reláciách. "
"Prosím, rozhodnite či chcete aby <strong>zostalo</strong> členstvo pre "
"spojenú cestu, alebo či chcete aby bolo <strong>odstránené</strong>.<br> "
"Štandardné nastavenie je <strong>ponechať</strong> prvú cestu a "
@@ -5518,10 +5661,10 @@ msgid ""
"other nodes that are members of the same relation: the target node will take "
"the place of the original node in the relation.</html>"
msgstr ""
-"<html> Zlúčené body sú členmi v jednej, alebo vo viacerých reláciách. "
-"Prosím, rozhodnite či chcete aby <strong>zostalo</strong> členstvo pre "
-"výsledný bod, alebo či chcete aby bolo <strong>odstránené</strong>.<br> "
-"Štandardné nastavenie je <strong>ponechať</strong> prvý bod a "
+"<html>Zlúčené body sú členmi v jednej alebo viacerých reláciách. Prosím, "
+"rozhodnite či chcete aby <strong>zostalo</strong> členstvo pre výsledný bod, "
+"alebo či chcete aby bolo <strong>odstránené</strong>.<br>Štandardné "
+"nastavenie je <strong>ponechať</strong> prvý bod a "
"<strong>odstrániť</strong> ostatné body, aby členy boli z rovnakej relácie: "
"výsledný bod zaujme miesto po pôvodnom bode v relácii.</html>"
@@ -5529,18 +5672,18 @@ msgid "Apply this role to all members"
msgstr "Použiť túto úlohu pre všetkých členov"
msgid "Orig. Way"
-msgstr "Orig. Cesta"
+msgstr "Orig. cesta"
msgid "Decision"
msgstr "Rozhodnutie"
msgid "<html>Please select the values to keep for the following tags.</html>"
msgstr ""
-"<html>Prosím, vyberte ktoré hodnoty ponechať pre nasledujúce "
-"značky(tagy).</html>"
+"<html>Prosím, vyberte ktoré hodnoty ponechať pre nasledujúce značky "
+"(tagy).</html>"
msgid "Show tags with conflicts only"
-msgstr "Zobraziť iba značky(tagy) s konfliktami"
+msgstr "Zobraziť iba značky (tagy) s konfliktmi"
msgid "Show tags with multiple values only"
msgstr "Zobraziť iba značky s rôznymi hodnotami"
@@ -5593,7 +5736,7 @@ msgstr "Zásobník príkazov"
msgid "Open a list of all commands (undo buffer)."
msgstr ""
-"Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))"
+"Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))."
msgid "Toggle: {0}"
msgstr "Prepnúť: {0}"
@@ -5631,23 +5774,23 @@ msgstr "Vyriešiť"
msgid "Open a merge dialog of all selected items in the list above."
msgstr ""
-"Otvoriť dialógové okno pre spojenie(merge) všetkých vybraných bodov (items) "
-"v obsahu na vrchu."
+"Otvoriť dialógové okno pre spojenie(merge) všetkých vybraných položiek v "
+"zozname hore."
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
-"Nastaviť vybrané elementy(prvky) na mape, podľa vybratých prvkov v obsahu na "
-"vrchu."
+"Nastaviť vybrané elementy(prvky) na mape, podľa vybratých prvkov v zozname "
+"hore."
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
-msgstr[0] "Bol tam zistený {0} konflikt."
-msgstr[1] "Boli tam zistené {0} konflikty."
-msgstr[2] "Bolo tam zistených {0} konfliktov."
+msgstr[0] "Bolo zistených {0} konfliktov."
+msgstr[1] "Bol zistený {0} konflikt."
+msgstr[2] "Boli zistené {0} konflikty."
msgid "Click to close this dialog and continue editing"
-msgstr "Kliknutím zavriete tento dialóga pokračujete v editovaní"
+msgstr "Kliknutím zavriete tento dialóg a pokračujete v editovaní"
msgid "Conflicts detected"
msgstr "Objavené konflikty"
@@ -5698,7 +5841,7 @@ msgid "Enable filter"
msgstr "Zapnúť filter"
msgid "Multikey: {0}"
-msgstr ""
+msgstr "Kombinácia kláves: {0}"
msgid "Hide filter"
msgstr "Skryť filter"
@@ -5822,7 +5965,7 @@ msgid "Relation: "
msgstr "Relácia: "
msgid "deleted-on-server"
-msgstr "zmazané-na-servery"
+msgstr "zmazané-na-serveri"
msgid "modified"
msgstr "upravené"
@@ -5858,15 +6001,15 @@ msgid "Version: "
msgstr "Verzia: "
msgid "In changeset: "
-msgstr "Vo zmenovom súbore: "
+msgstr "V zmenovom súbore: "
msgid "Tags: "
-msgstr "Tagy: "
+msgstr "Značky: "
msgid "{0} Member: "
msgid_plural "{0} Members: "
-msgstr[0] "{0} Člen: "
-msgstr[1] "{0} Členov: "
+msgstr[0] "{0} Členov: "
+msgstr[1] "{0} Člen: "
msgstr[2] "{0} Členy: "
msgid " as \"{0}\""
@@ -5910,7 +6053,7 @@ msgid ""
"Range:{0}"
msgstr ""
"\n"
-"Rozsah: {0}"
+"Rozsah:{0}"
msgid ""
"\n"
@@ -5942,7 +6085,7 @@ msgstr ""
"Upozornenie: Dva vybrané objekty majú rovnaké, ale nie sú totožné formáty."
msgid "xml"
-msgstr "v"
+msgstr "xml"
msgid "mapcss"
msgstr "mapcss"
@@ -5971,17 +6114,18 @@ msgid ""
"24.5</li><li>-49 29.4 N -19 24.5 W</li></ul><li>48 deg 42' 52.13\" N, 21 "
"deg 11' 47.60\" E</li></ul>"
msgstr ""
-"Zadajte súradnice nového bodu.<br/> Môžete oddeliť zemepisnú dĺžku a šírk "
+"Zadajte súradnice nového bodu.<br/> Môžete oddeliť zemepisnú dĺžku a šírku "
"medzerou, čiarkou, alebo bodkočiarkou.<br/> Použite kladné čísla, alebo "
-"znaky N, E na označenie zemepisných strán sever a východ .<br/>Pre svetové "
+"znaky N, E na označenie svetových strán sever a východ .<br/>Pre svetové "
"strany juh a západ, môžete použiť buď záporné čísla alebo znaky S, "
"W<br/>Súradnice môžu byť v jednom z troch "
-"formátov:<ul><li><i>degrees</i><tt>°</tt></li><li><i>degrees</i><tt>°"
-"</tt> <i>minutes</i><tt>'</tt></li><li><i>degrees</i><tt>°</tt> "
-"<i>minutes</i><tt>'</tt> <i>seconds</i><tt>"</tt></li></ul>Symbols "
-"<tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, "
-"<tt>″</tt> are optional.<br/><br/>Some examples:<ul><li>49.29918° "
-"19.24788°</li><li>N 49.29918 E 19.24788</li><li>W 49°29.918' S "
+"formátov:<ul><li><i>stupne</i><tt>°</tt></li><li><i>stupne</i><tt>°</"
+"tt> <i>minúty</i><tt>'</tt></li><li><i>stupne</i><tt>°</tt> "
+"<i>minúty</i><tt>'</tt> "
+"<i>sekundy</i><tt>"</tt></li></ul>Symboly<tt>°</tt>, <tt>'</tt>, "
+"<tt>′</tt>, <tt>"</tt>, <tt>″</tt> sú "
+"nepovinné.<br/><br/>Príklady:<ul><li>49.29918° 19.24788°</li><li>N "
+"49.29918 E 19.24788</li><li>W 49°29.918' S "
"19°24.788'</li><li>N 49°29'04" E "
"19°24'43"</li><li>49.29918 N, 19.24788 "
"E</li><li>49°29'21" N 19°24'38" E</li><li>49 29 "
@@ -6007,7 +6151,7 @@ msgid "East/North"
msgstr "Východ/Sever"
msgid "Please enter a GPS coordinates"
-msgstr "Prosím, zadajte súradnice GPS"
+msgstr "Prosím zadajte súradnice GPS"
msgid "Please enter a Easting and Northing"
msgstr "Zadajte prosím Easting a Northing"
@@ -6081,6 +6225,9 @@ msgstr "Zobraziť/Skryť"
msgid "Information about layer"
msgstr "Informácie o vrstve"
+msgid "Map paint preferences"
+msgstr "Nastavenia farebných štýlov"
+
msgid "Map Paint Styles"
msgstr "Farebné štýly mapy"
@@ -6092,9 +6239,9 @@ msgstr "MapPaint"
msgid "Reloading {0} map style."
msgid_plural "Reloading {0} map styles."
-msgstr[0] "Obnovujem {0} formát mapy."
-msgstr[1] "Obnovujem {0} formáty mapy."
-msgstr[2] "Obnovujem {0} formátov mapy."
+msgstr[0] "Obnovujem {0} formátov mapy."
+msgstr[1] "Obnovujem {0} formát mapy."
+msgstr[2] "Obnovujem {0} formáty mapy."
msgid "On/Off"
msgstr "Zap/Vyp"
@@ -6121,10 +6268,10 @@ msgid "Save a copy of this Style to file and add it to the list"
msgstr "Uložiť kópiu tohto štýlu do súboru a pridať ho do zoznamu"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "Súbor farebného štýlu mapy (*.mapcss, *.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "Súbor farebného štýlu mapy (*.xml, *.zip)"
msgid "Reloading style sources"
msgstr "Načítať štýly zdroja"
@@ -6165,6 +6312,38 @@ msgstr "Štýl je v súčasnosti aktívny"
msgid "No"
msgstr "Nie"
+msgid "Object type:"
+msgstr "Objekt podľa typu:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "zmiešaný"
+
+msgid "Choose the OSM object type"
+msgstr "Vyberte typ objektu OSM"
+
+msgid "Object ID:"
+msgstr "Objekt podľa ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Vložiť ID objektu, ktorý má byť stiahnutý"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"ID objektu môže byť oddelené medzerou alebo čiarkou.<br/> Príklady: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> V kombinovanom režime, "
+"špecifické objekty ako sú tieto: <b>W123, N110, W12, R15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"Neplatný zoznam ID\n"
+"Nemôžem pokračovať."
+
msgid "Relations"
msgstr "Relácie"
@@ -6186,9 +6365,6 @@ msgstr "Relácie: {0}/{1}"
msgid "Relations: {0}"
msgstr "Relácie: {0}"
-msgid "Selection"
-msgstr "Výber"
-
msgid "Open a selection list window."
msgstr "Otvoriť výber obsahu okien."
@@ -6205,7 +6381,7 @@ msgid "Zoom to selected element(s)"
msgstr "Priblížiť na vybraté elementy"
msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr "Výber: Rel.:{0} / Cesty:{1} / Uzly:{2}"
+msgstr "Výber: Rel.:{0} / Cesty:{1} / Body:{2}"
msgid "Unselectable now"
msgstr "Teraz sa nedá zvoliť"
@@ -6213,18 +6389,6 @@ msgstr "Teraz sa nedá zvoliť"
msgid "Selection: {0}"
msgstr "Výber: {0}"
-msgid "Side buttons"
-msgstr "Bočné tlačidlá"
-
-msgid "Always shown"
-msgstr "Vždy zobraziť"
-
-msgid "Dynamic"
-msgstr "Dynamicky"
-
-msgid "Always hidden"
-msgstr "Vždy schovať"
-
msgid "Toggle dynamic buttons"
msgstr "Prepnúť dynamické tlačidlá"
@@ -6243,39 +6407,50 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu"
+msgid "Side buttons"
+msgstr "Bočné tlačidlá"
+
+msgid "Always shown"
+msgstr "Vždy zobraziť"
+
+msgid "Dynamic"
+msgstr "Dynamicky"
+
+msgid "Always hidden"
+msgstr "Vždy schovať"
+
msgid "Authors"
msgstr "Autori (spracovatelia)"
msgid "Open a list of people working on the selected objects."
-msgstr "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte"
+msgstr "Otvoriť zoznam ľudí, ktorí pracujú na zvolenom objekte."
msgid "{0} Author"
msgid_plural "{0} Authors"
-msgstr[0] "{0} Author"
-msgstr[1] "{0} Authorov"
-msgstr[2] "{0} Authori"
+msgstr[0] "{0} autorov"
+msgstr[1] "{0} autor"
+msgstr[2] "{0} autori"
msgid "Select objects submitted by this user"
-msgstr "Výber objektov predložených týmto užívateľom"
+msgstr "Výber objektov predložených týmto používateľom"
msgid "Launches a browser with information about the user"
-msgstr "Uvedený prehliadač s informáciou o používateľovi"
+msgstr "Spustí prehliadač s informáciami o používateľovi"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Varovanie: iba pre uvedené info prehliadača pre prvého {0} z {1} vybraných "
+"Spustí sa prehliadač informácií iba pre prvých {0} z {1} vybraných "
"používateľov"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
"this system.</html>"
msgstr ""
-"<html>Neúspešné vytvorenie URL pretože šifrovanie ''{0}''<br>chýbalo na "
-"tomto systéme.</html>"
+"<html>Neúspešné vytvorenie URL pretože kódovanie ''{0}''<br>chýbalo na tomto "
+"systéme.</html>"
msgid "Missing encoding"
-msgstr "Chýbajúce šifrovanie"
+msgstr "Chýbajúce kódovanie"
msgid "Author"
msgstr "Autor"
@@ -6292,17 +6467,14 @@ msgstr "Otvoriť okno pre overovanie."
msgid "Validation results"
msgstr "Výsledky overovania"
-msgid "Zoom to problem"
-msgstr "Priblížiť na problém"
-
msgid "Fix"
msgstr "Opraviť"
msgid "Fix the selected issue."
-msgstr "Opraviť vybratý problém"
+msgstr "Opraviť vybraný problém."
msgid "Ignore the selected issue next time."
-msgstr "Nabudúce ignorovať vybratý problém."
+msgstr "Nabudúce ignorovať vybraný problém."
msgid "Whole group"
msgstr "Celá skupina"
@@ -6317,7 +6489,7 @@ msgid "Ignore whole group or individual elements?"
msgstr "Ignorovať celú skupinu, alebo jednotlivé prvky?"
msgid "Ignoring elements"
-msgstr "Ignorujem prvky(elements)"
+msgstr "Ignorujem prvky"
msgid "Fixing errors ..."
msgstr "Opravujem chyby..."
@@ -6388,9 +6560,9 @@ msgid ""
"download<br>your changesets from the OSM server unless you enter your OSM "
"user name<br>in the JOSM preferences.</html>"
msgstr ""
-"<html>JOSM je aktuálne spustený pod anonymným užívateľom. Preto nemôžem "
-"stiahnuť<br>vaše zmenové súbory z OSM servera iba ak zadáte užívateľské meno "
-"pre OSM<br>v JOSM nastaveniach.</html>"
+"<html>JOSM je aktuálne spustený pod anonymným používateľom. Preto nemôžem "
+"stiahnuť<br>vaše zmenové súbory z OSM servera iba ak zadáte používateľské "
+"meno pre OSM<br>v JOSM nastaveniach.</html>"
msgctxt "changeset.upload-comment"
msgid "empty"
@@ -6417,7 +6589,7 @@ msgid "Open"
msgstr "Otvoriť"
msgid "User"
-msgstr "Užívateľ"
+msgstr "Používateľ"
msgid "Created at"
msgstr "Vytvorený v"
@@ -6446,9 +6618,6 @@ msgstr "Aktualizovať obsah"
msgid "Update the changeset content from the OSM server"
msgstr "Aktualizovať obsah zmenového súboru z OSM servera"
-msgid "Show history"
-msgstr "Zobraz históriu"
-
msgid "Download and show the history of the selected objects"
msgstr "Stiahnite si a zobrazte históriu vybraných objektov"
@@ -6456,7 +6625,7 @@ msgid "Select in layer"
msgstr "Vybrať vrstvu"
msgid "Select the corresponding primitives in the current data layer"
-msgstr "Vybrať zodpovedajúce pôvodné v aktuálnej dátovej vrstve"
+msgstr "Vybrať zodpovedajúce základné objektu v aktuálnej dátovej vrstve"
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
@@ -6465,11 +6634,11 @@ msgid_plural ""
"<html>None of the selected objects is available in the current<br>edit layer "
"''{0}''.</html>"
msgstr[0] ""
-"<html>Vybratý objekt nie je dostupný v súčasnej<br>upravovanej vrstve "
-"''{0}''.</html>"
-msgstr[1] ""
"<html>Žiadne z vybratých objektov nie sú dostupné v súčasnej<br>upravovanej "
"vrstve ''{0}''.</html>"
+msgstr[1] ""
+"<html>Vybratý objekt nie je dostupný v súčasnej<br>upravovanej vrstve "
+"''{0}''.</html>"
msgstr[2] ""
"<html>Žiadne z vybratých objektov nie sú dostupné v súčasnej<br>upravovanej "
"vrstve ''{0}''.</html>"
@@ -6537,7 +6706,8 @@ msgid ""
"Select the primitives in the content of this changeset in the current data "
"layer"
msgstr ""
-"Vyberte pôvodné v obsahu tohoto zmenového súboru v aktuálnej dátovej vrstve"
+"Vyberte základné objektu v obsahu tohoto zmenového súboru v aktuálnej "
+"dátovej vrstve"
msgid ""
"<html>None of the objects in the content of changeset {0} is available in "
@@ -6578,7 +6748,7 @@ msgstr ""
"súboru"
msgid "Select changesets owned by specific users"
-msgstr "Vybrať zmenové súbory vytvorené konkrétnymi užívateľmi"
+msgstr "Vybrať zmenové súbory vytvorené konkrétnymi používateľmi"
msgid "Select changesets depending on whether they are open or closed"
msgstr "Vybrať zmenové súbory, závislé na tom či sú otvorené, alebo zavreté"
@@ -6601,53 +6771,54 @@ msgid "Query both open and closed changesets"
msgstr "Požiadať oboje otvoriť a zatvoriť zmenové súbory"
msgid "User ID:"
-msgstr "ID užívateľa:"
+msgstr "ID používateľa:"
msgid "User name:"
-msgstr "Užívateľské meno:"
+msgstr "Používateľské meno:"
msgid "Only changesets owned by myself"
msgstr "Iba moje zmenové súbory"
msgid "Only changesets owned by the user with the following user ID"
-msgstr "Iba zmenové súbory vyhotovené užívateľom s nasledujúcim ID užívateľa"
+msgstr ""
+"Iba zmenové súbory vyhotovené používateľom s nasledujúcim ID používateľa"
msgid "Only changesets owned by the user with the following user name"
msgstr ""
-"Iba zmenové súbory vyhotovené užívateľom s nasledujúcim menom užívateľa"
+"Iba zmenové súbory vyhotovené používateľom s nasledujúcim menom používateľa"
msgid ""
"Only changesets owned by myself (disabled. JOSM is currently run by an "
"anonymous user)"
msgstr ""
"Iba zmenové súbory vo svojom vlastníctve (blokované. JOSM v súčasnej dobe "
-"prevádzkuje anonymný užívateľ)"
+"prevádzkuje anonymný používateľ)"
msgid ""
"Cannot restrict changeset query to the current user because the current user "
"is anonymous"
msgstr ""
-"Nemožno obmedziť požiadavku zmenového súboru pre aktuálneho užívateľa, "
-"pretože aktuálny užívateľ je anonymný"
+"Nemožno obmedziť požiadavku zmenového súboru pre aktuálneho používateľa, "
+"pretože aktuálny používateľ je anonymný"
msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Aktuálna hodnota ''{0}'' pre užívateľské ID je neplatná"
+msgstr "Aktuálna hodnota ''{0}'' pre používateľské ID je neplatná"
msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-"Nemožno omedziť požiadavku na zmenový súbor na nemo užívateľa ''{0}''"
+"Nemožno omedziť požiadavku na zmenový súbor na nemo používateľa ''{0}''"
msgid "Please enter a valid user ID"
-msgstr "Prosím vložte platné ID užívateľa"
+msgstr "Prosím vložte platné ID používateľa"
msgid "Invalid user ID"
-msgstr "Neplatné ID užívateľa"
+msgstr "Neplatné ID používateľa"
msgid "Please enter a non-empty user name"
-msgstr "Prosím vložte (nie prázdne) meno užívateľa"
+msgstr "Prosím vložte (nie prázdne) meno používateľa"
msgid "Invalid user name"
-msgstr "Neplatné užívateľské meno"
+msgstr "Neplatné používateľské meno"
msgid "Date: "
msgstr "Dátum: "
@@ -6693,14 +6864,15 @@ msgid ""
"invalid."
msgstr ""
"Nemožno obmedziť požiadavku pre zmenový súbor na špecifický ohraničujúci "
-"rámec. Vstup je platný."
+"rámec. Vstup je neplatný."
msgid ""
"<html>Please enter valid longitude/latitude values to restrict<br>the "
"changeset query to a specific bounding box.</html>"
msgstr ""
-"<html>Prosím vložte platnú hodnotu limity zemepisnej dĺžky/šírky "
-"<br>požiadavky pre zmenový súbor na špecifický ohraničujúci rámec.</html>"
+"<html>Prosím vložte platné hodnoty zemepisnej dĺžky/šírky na "
+"obmedzenie<br>požiadavky na zmenový súbor na špecifický ohraničujúci "
+"rámec.</html>"
msgid "Invalid bounding box"
msgstr "Chybný ohraničujúci rámec"
@@ -6708,7 +6880,7 @@ msgstr "Chybný ohraničujúci rámec"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-"Aktuálna hodnota nie je platné ID užívateľa. Prosím vložte celé číslo > 0"
+"Aktuálna hodnota nie je platné ID používateľa. Prosím vložte celé číslo > 0"
msgid "Please enter an integer value > 0"
msgstr "Prosím vložte ako hodnotu celé číslo > 0"
@@ -6717,11 +6889,11 @@ msgid ""
"<html>The current value is not a valid user name.<br>Please enter an non-"
"empty user name.</html>"
msgstr ""
-"<html>Aktuálna hodnota nie je platné meno užívateľa.<br>Prosím vložte (nie "
-"prázdne) meno užívateľa.</html>"
+"<html>Aktuálna hodnota nie je platné meno používateľa.<br>Prosím vložte (nie "
+"prázdne) meno používateľa.</html>"
msgid "Please enter an non-empty user name"
-msgstr "Prosím vložte (nie prázdne) meno užívateľa"
+msgstr "Prosím vložte (nie prázdne) meno používateľa"
msgid ""
"Please enter a date in the usual format for your locale.<br>Example: "
@@ -6765,8 +6937,8 @@ msgid ""
"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
"user name in the preferences first.</em></html>"
msgstr ""
-"<html>Stiahnuť moje otvorené zmenové súbory<br><em>Vypnutý. Prosím vložte "
-"najskôr vaše OSM užívateľské meno do nastavení.</em></html>"
+"<html>Stiahnuť moje otvorené zmenové súbory<br><em>Vypnuté. Prosím vložte "
+"najskôr vaše OSM používateľské meno do nastavení.</em></html>"
msgid "<html>Download my open changesets</html>"
msgstr "<html>Stiahnuť moje otvorené zmenové súbory</html>"
@@ -6782,14 +6954,16 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Stiahnuť zmenové súbory v súčasnom zobrazení mapy</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Varovanie: neočakávané hodnota pre preferencie ''{0}'', dostal som ''{1}''. "
-"Resetovanie pre východziu hodnotu."
+"Neočakávaná hodnota pre nastavenie \"{0}\", obdržaná hodnota je \"{1}\". "
+"Použije sa predvolený dotaz."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
+"Nemôžem vytvoriť dotaz na sadu zmien pre otvorené sady zmien anonymného "
+"používateľa"
msgid "Basic"
msgstr "Základný"
@@ -6828,7 +7002,7 @@ msgid "Querying and downloading changesets"
msgstr "Žiadanie a sťahovanie zmenových súborov"
msgid "Determine user id for current user..."
-msgstr "Zisťovanie id pre aktuálneho užívateľa..."
+msgstr "Zisťovanie ID pre aktuálneho používateľa..."
msgid "Query and download changesets ..."
msgstr "Požiadavka a sťahovanie zmenových súborov ..."
@@ -6853,41 +7027,53 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Táto požiadavka URL na zmenové súbory je chybná"
-msgid "Select objects for which to change properties."
-msgstr "Vyberte objekty, pre ktoré chcete zmeniť vlastnosti."
+msgid "Discardable key: selection Foreground"
+msgstr "Zbytočný kľúč: popredie výberu"
+
+msgid "Discardable key: selection Background"
+msgstr "Zbytočný kľúč: pozadie výberu"
-msgid "Properties/Memberships"
-msgstr "Vlastnosti/Členstvá"
+msgid "Discardable key: foreground"
+msgstr "Zbytočný kľúč: popredie"
-msgid "Properties for selected objects."
-msgstr "Vlastnosti pre zvolené objekty"
+msgid "Discardable key: background"
+msgstr "Zbytočný kľúč: pozadie"
msgid "<different>"
msgstr "<rôzne>"
+msgid "Select objects for which to change tags."
+msgstr "Vyberte objekty, pre ktoré chcete zmeniť značky."
+
+msgid "Tags/Memberships"
+msgstr "Značky/Členstvá"
+
+msgid "Tags for selected objects."
+msgstr "Značky pre zvolené objekty."
+
msgid "Member Of"
msgstr "Člen"
msgid "Position"
msgstr "Poloha"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Vlastnosti: {0} / Členstvá: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Značky: {0} / Členstvá: {1}"
-msgid "Properties / Memberships"
-msgstr "Vlastnosti / Členstvá"
+msgid "Tags / Memberships"
+msgstr "Značky / Členstvá"
msgid "Delete the selected key in all objects"
msgstr "Zmaže zvolený klúč vo všetkých objektoch"
-msgid "Delete Properties"
-msgstr "Zmazať vlastnosti"
+msgid "Delete Tags"
+msgstr "Vymazať značky"
msgid "Change relation"
msgstr "Zmeniť reláciu"
msgid "Delete from relation"
-msgstr "Zmazať z relácie (zo vzťahu"
+msgstr "Vymazať z relácie"
msgid "Really delete selection from relation {0}?"
msgstr "Naozaj zmazať výber z relacie {0}?"
@@ -6895,17 +7081,17 @@ msgstr "Naozaj zmazať výber z relacie {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
-msgid "Add Property"
-msgstr "Pridať Vlastnosť"
+msgid "Add Tag"
+msgstr "Pridať značku"
msgid "Edit the value of the selected key for all objects"
msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
-msgid "Edit Properties"
-msgstr "Upraviť Vlastnosti"
+msgid "Edit Tags"
+msgstr "Upraviť značky"
msgid "Go to OSM wiki for tag help (F1)"
-msgstr "Prejsť na OSM wiki pre pomoc s tagmi (F1)"
+msgstr "Prejsť na OSM wiki pre pomoc so značkami (F1)"
msgid "Launch browser with wiki help for selected object"
msgstr "Spustiť prehliadač s wiki nápovedu pre vybraný objekt"
@@ -6914,25 +7100,25 @@ msgid "Paste Value"
msgstr "Vložiť Hodnoty"
msgid "Paste the value of the selected tag from clipboard"
-msgstr "Vložiť hodnoty vybraného tagu zo schránky"
+msgstr "Vložiť hodnoty vybranej značky zo schránky"
msgid "Copy Value"
msgstr "Kopírovať Hodnoty"
msgid "Copy the value of the selected tag to clipboard"
-msgstr "Skopírovať hodnotu vybraného tagu do schránky"
+msgstr "Skopírovať hodnotu vybranej značky do schránky"
msgid "Copy Key/Value"
msgstr "Kopírovať Kľúč/Hodnotu"
msgid "Copy the key and value of the selected tag to clipboard"
-msgstr "Skopírovať kľúče a hodnoty vybraných tagov do schránky"
+msgstr "Skopírovať kľúče a hodnoty vybraných značiek do schránky"
msgid "Copy all Keys/Values"
-msgstr "Kopírovaťvšetky Kľúče/Hodnoty"
+msgstr "Kopírovať všetky Kľúče/Hodnoty"
msgid "Copy the key and value of the all tags to clipboard"
-msgstr "Skopírovať kľúče a hodnoty všetkých tagov do schránky"
+msgstr "Skopírovať kľúče a hodnoty všetkých značiek do schránky"
msgid "Search Key/Value/Type"
msgstr "Hľadať kľúč/Hodnotu/Typ"
@@ -6941,32 +7127,32 @@ msgid ""
"Search with the key and value of the selected tag, restrict to type (i.e., "
"node/way/relation)"
msgstr ""
-"Hľadať kľúče a hodnoty podľa zvoleného tagu(značky), obmedziť sa na typ (tj, "
-"bod/línia/relácia)"
+"Hľadať kľúče a hodnoty podľa zvolenj značky, obmedziť sa na typ (t.j. "
+"bod/cesta/relácia)"
msgid "Search Key/Value"
msgstr "Hľadať Kľúč/Hodnota"
msgid "Search with the key and value of the selected tag"
-msgstr "Hľadať podľa kľúča a hodnoty vybranej značky(tagu)"
+msgstr "Hľadať podľa kľúča a hodnoty vybranej značky (tagu)"
msgid "Change value?"
msgid_plural "Change values?"
-msgstr[0] "Zmeniť hodnotu?"
-msgstr[1] "Zmeniť hodnôt?"
+msgstr[0] "Zmeniť hodnoty?"
+msgstr[1] "Zmeniť hodnotu?"
msgstr[2] "Zmeniť hodnoty?"
msgid "This will change {0} object."
msgid_plural "This will change up to {0} objects."
-msgstr[0] "Toto chce zmeniť {0} objekt."
-msgstr[1] "Toto chce zmeniť {0} objektov."
-msgstr[2] "Toto chce zmeniť {0} objektov."
+msgstr[0] "Toto zmení {0} objektov."
+msgstr[1] "Toto zmení {0} objekt."
+msgstr[2] "Toto zmení {0} objekty."
msgid "An empty value deletes the tag."
-msgstr "Prázdna hodnota vymaže tag."
+msgstr "Prázdna hodnota vymaže značku."
msgid "Overwrite key"
-msgstr "Prepísať kľúč(key)"
+msgstr "Prepísať kľúč (key)"
msgid "Replace"
msgstr "Nahradiť"
@@ -6980,18 +7166,12 @@ msgstr ""
msgid "Change properties of up to {0} object"
msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Zmeniť vlastnosti až {0} objektu."
-msgstr[1] "Zmeniť vlastnosti až {0} objektov."
+msgstr[0] "Zmeniť vlastnosti až {0} objektov."
+msgstr[1] "Zmeniť vlastnosti až {0} objektu."
msgstr[2] "Zmeniť vlastnosti až {0} objektov."
msgid "Use English language for tag by default"
-msgstr "Použite anglický jazyk pre tag v predvolenom nastavení"
-
-msgid "Paste tag"
-msgstr "Vložiť tag"
-
-msgid "Paste value"
-msgstr "Vložiť hodnotu"
+msgstr "Použite anglický jazyk pre značku v predvolenom nastavení"
msgid "Add value?"
msgstr "Pridať hodnotu?"
@@ -7009,13 +7189,13 @@ msgid "Please select a value"
msgstr "Vyberte prosím hodnotu"
msgid "Set number of recently added tags"
-msgstr "Nastavte počet novo pridaných tagov"
+msgstr "Nastavte počet novo pridaných značiek"
msgid "Remember last used tags"
-msgstr ""
+msgstr "Zapamätať naposledy použité značky"
msgid "Please enter the number of recently added tags to display"
-msgstr "Zadajte prosím počet nedávno pridaných tagov pre zobrazenie"
+msgstr "Zadajte prosím počet nedávno pridaných značiek pre zobrazenie"
msgid "Please enter integer number between 0 and {0}"
msgstr "Zadajte prosím celé číslo medzi 0 a {0}"
@@ -7023,14 +7203,20 @@ msgstr "Zadajte prosím celé číslo medzi 0 a {0}"
msgid "Recently added tags"
msgstr "Nedávno pridané značky"
+msgid "Choose recent tag {0}"
+msgstr "Vybrať nedávnu značku {0}"
+
msgid "Use this tag again"
msgstr "Použite túto značku znova"
+msgid "Apply recent tag {0}"
+msgstr "Použiť nedávnu značku {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "Kľúč ''{0}'' je už používaný"
msgid "Edit the relation the currently selected relation member refers to."
-msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
+msgstr "Upraviť reláciu, na ktorú odkazuje aktuálne vybraný člen relácie."
msgid "Download all child relations (recursively)"
msgstr "Nahrať všetky deti relácií (rekurzívne)"
@@ -7049,9 +7235,9 @@ msgstr "Stiahnuť členov relácie"
msgid "Conflict in data"
msgid_plural "Conflicts in data"
-msgstr[0] "Konflikt v dátach"
-msgstr[1] "Konflikty v dátach"
-msgstr[2] "Konfliktov v dátach"
+msgstr[0] "Konflikty v dátach"
+msgstr[1] "Konflikt v dátach"
+msgstr[2] "Konflikty v dátach"
msgid ""
"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
@@ -7066,27 +7252,27 @@ msgstr "Relácia je zmazaná"
msgid "Downloading relation {0}"
msgstr "Nahrávam reláciu {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Upozornenie: Ignorujem výnimku, pretože úloha bola zrušená. Výnimka: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Ignorujem výnimku, pretože úloha bola zrušená. Výnimka: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
-msgstr[0] "Sťahovanie {0} neúplného objektu"
-msgstr[1] "Sťahovanie {0} neúplných objektov"
+msgstr[0] "Sťahovanie {0} neúplných objektov"
+msgstr[1] "Sťahovanie {0} neúplného objektu"
msgstr[2] "Sťahovanie {0} neúplných objektov"
msgid "Downloading {0} incomplete child of relation ''{1}''"
msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "Sťahovanie {0} neúplného dieťaťa(child) relácie ''{1}''"
-msgstr[1] "Sťahovanie {0} neúplných detí(child) relácie ''{1}''"
+msgstr[0] "Sťahovanie {0} neúplných detí(child) relácie ''{1}''"
+msgstr[1] "Sťahovanie {0} neúplného dieťaťa(child) relácie ''{1}''"
msgstr[2] "Sťahovanie {0} neúplných detí(child) relácie ''{1}''"
msgid "Downloading {0} incomplete child of {1} parent relations"
msgid_plural "Downloading {0} incomplete children of {1} parent relations"
-msgstr[0] "Sťahovanie {0} neúplnej odvodenej z {1} rodičovskej relácie"
-msgstr[1] "Sťahovanie {0} neúplných odvodenýchj z {1} rodičovských relácií"
-msgstr[2] "Sťahovanie {0} neúplných odvodenýchj z {1} rodičovských relácií"
+msgstr[0] "Sťahovanie {0} neúplných detí(child) z {1} rodičovských relácií"
+msgstr[1] ""
+"Sťahovanie {0} neúplného dieťaťa(child) z {1} rodičovských relácií"
+msgstr[2] "Sťahovanie {0} neúplných detí(child) z {1} rodičovských relácií"
msgid "Download relations"
msgstr "Sťahovanie relácií"
@@ -7123,23 +7309,26 @@ msgid ""
"relation itself.<br>This creates circular dependencies and is "
"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
msgstr ""
-"<html>Je tam aspoň jeden člen odkazujúci na túto reláciu<br>na vlastnú "
-"reláciu.<br>Táto vytvorená kruhová závislosť and is discouraged.<br>Ako "
-"chcete pokračovať s kruhovou závislosťou?</html>"
+"<html>Existuje aspoň jeden člen v tejto relácii odkazujúci<br>na túto "
+"reláciu.<br>Toto by vytvorilo kruhovú závislosť a preto sa "
+"neodporúča.<br>Ako chcete pokračovať s kruhovou závislosťou?</html>"
msgid "Remove them, clean up relation"
-msgstr "Odstraňte ich, vyčistite reláciu"
+msgstr "Odstrániť ich, vyčistiť reláciu"
msgid "Ignore them, leave relation as is"
-msgstr "Ignorujte ich, nechajte reláciu tak ako je"
+msgstr "Ignorovať ich, nechať reláciu tak ako je"
+
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr "Je mi ľúto, skratka \"{0}\" nemôže byť povolená v editore relácií"
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
"member?</html>"
msgstr ""
-"<html>Táto relácia už má jeden, alebo viac členov s odkazom<br>na "
-"objekt''{0}''<br>Naozaj chcete pridať ďalšie členy relácie? </html>"
+"<html>Táto relácia už má jeden alebo viac členov s odkazom<br>na objekt "
+"\"{0}\"<br><br>Naozaj chcete pridať ďalšie členy relácie?</html>"
msgid "Multiple members referring to same object."
msgstr "Niekoľko členov odkazuje na rovnaký objekt."
@@ -7149,8 +7338,8 @@ msgid ""
"circular references and is therefore discouraged.<br>Skipping relation "
"''{0}''.</html>"
msgstr ""
-"<html>Skúšate sa pridať reláciu do vlastných.<br><br>Tieto vytvorené kruhové "
-"odkazy a je preto znechutený.<br>Vynechanie relácie ''{0}''.</html>"
+"<html>Pokúšate sa pridať reláciu samu do seba.<br><br>Toto vytvorí kruhový "
+"odkaz a preto sa neodporúča.<br>Vynechávam reláciu \"{0}\".</html>"
msgid ""
"Add all objects selected in the current dataset before the first member"
@@ -7221,7 +7410,7 @@ msgid "Relation Editor: Remove"
msgstr "Editor Relácií: Odstrániť"
msgid "Delete the currently edited relation"
-msgstr "Vymazať práve vydanú reláciu"
+msgstr "Vymazať práve zobrazenú reláciu"
msgid ""
"One or more members of this new relation have been deleted while the "
@@ -7230,7 +7419,7 @@ msgid ""
msgstr ""
"Jeden alebo viac členov z tejto novej relácie boli vymazané zatiaľ čo editor "
"relácie\n"
-"bol otvorený. Mali by byť odstránené z obsahu členov relácie."
+"bol otvorený. Mali by byť odstránené zo zoznamu členov relácie."
msgid "Yes, create a conflict and close"
msgstr "Áno, vyriešiť konflikt a zavrieť"
@@ -7258,11 +7447,11 @@ msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
"resolve this conflict first, then try again.</html>"
msgstr ""
-"<html>Vrstva ''{0}'' už má konflikt na objekte <br>''{1}''.< br> Prosím "
-"vyriešte najskôr tento konflikt, potom to skúste znova. </html>"
+"<html>Vrstva ''{0}'' už má konflikt na objekte <br>''{1}''.<br> Prosím "
+"vyriešte najskôr tento konflikt, potom to skúste znova.</html>"
msgid "Apply the current updates"
-msgstr "Použiť súčasnú aktuálizáciu"
+msgstr "Použiť súčasnú aktualizáciu"
msgid "Apply the updates and close the dialog"
msgstr "Použiť aktualizácie a zavrieť dialógové okno"
@@ -7288,7 +7477,7 @@ msgstr "Zrušiť, pokračovať v úpravách"
msgid ""
"<html>The relation has been changed.<br><br>Do you want to save your "
"changes?</html>"
-msgstr "<html>Relácia bola zmenená.<br><br>Chcete uložiť zmeny? </html>"
+msgstr "<html>Relácia bola zmenená.<br><br>Chcete uložiť zmeny?</html>"
msgid "Unsaved changes"
msgstr "Neuložené zmeny"
@@ -7316,8 +7505,8 @@ msgstr "Použiť Funkciu"
msgid "You are setting an empty role on {0} object."
msgid_plural "You are setting an empty role on {0} objects."
-msgstr[0] "Nastavili ste prázdnu úlohu na {0} objekte."
-msgstr[1] "Nastavili ste prázdnu úlohu na {0} objektoch."
+msgstr[0] "Nastavili ste prázdnu úlohu na {0} objektoch."
+msgstr[1] "Nastavili ste prázdnu úlohu na {0} objekte."
msgstr[2] "Nastavili ste prázdnu úlohu na {0} objektoch."
msgid "This is equal to deleting the roles of these objects."
@@ -7336,7 +7525,7 @@ msgid "Confirm empty role"
msgstr "Potvrdiť prázdnu funkciu"
msgid "Edit the relation the currently selected relation member refers to"
-msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
+msgstr "Upraviť reláciu, na ktorú odkazuje aktuálne vybraný člen relácie"
msgid ""
"Members from paste buffer cannot be added because they are not included in "
@@ -7364,7 +7553,7 @@ msgid "Zoom to the gap in the way sequence"
msgstr "Priblížiť na medzeru v časti cesty"
msgid "Refers to"
-msgstr "Odkazovať na"
+msgstr "Odkazuje na"
msgid "Download referring relations"
msgstr "Sťahovanie týkajúcich sa relácií"
@@ -7412,6 +7601,27 @@ msgid "way is not connected to previous or next relation member"
msgstr ""
"cesta nie je pripojená do predchádzajúceho alebo nasledujúceho člena relácie"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Nesprávny počet argumentov pre záložky"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Chyba pri čítaní položky záložky:%s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Neočakávaný riadok \"{0}\" v súbore záložiek \"{1}\""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Nedovolená zdvojená hodnota \"{0}\" v riadku \"{1}\" v súbore záložiek "
+"\"{2}\""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>Nemôžem čítať záložky z<br>''{0}''<br>Chyba bola: {1}</html>"
+
msgid "Bookmarks"
msgstr "Záložky"
@@ -7423,7 +7633,7 @@ msgid ""
"maxlat): </html>"
msgstr ""
"<html><strong>Aktuálne sťahovaná oblasť</strong> (minlon, minlat, maxlon, "
-"maxlat): </html>"
+"maxlat):</html>"
msgid "Create bookmark"
msgstr "Vytvoriť záložku"
@@ -7450,16 +7660,16 @@ msgid "Rename the currently selected bookmark"
msgstr "Premenovať vybratú záložku"
msgid "min lat"
-msgstr "min šírka"
+msgstr "min. šírka"
msgid "min lon"
-msgstr "min dĺžka"
+msgstr "min. dĺžka"
msgid "max lat"
-msgstr "max šírka"
+msgstr "max. šírka"
msgid "max lon"
-msgstr "max dĺžka"
+msgstr "max. dĺžka"
msgid "Clear textarea"
msgstr "Vymazať textarea"
@@ -7472,7 +7682,7 @@ msgstr ""
"oblasti)"
msgid "Bounding Box"
-msgstr "Ohraničujúcí box"
+msgstr "Ohraničujúci rámec"
msgid "The string ''{0}'' is not a valid double value."
msgstr "Reťazec ''{0}'' nie je platný, zdvojená hodnota."
@@ -7483,9 +7693,6 @@ msgstr "Hodnota pre zemepisnú šírku v rozsahu [-90,90] povinná."
msgid "Value for longitude in range [-180,180] required."
msgstr "Hodnota pre zemepisnú dížku v rozsahu [-180,180] povinná."
-msgid "Paste URL from clipboard"
-msgstr "Vložiť URL zo schránky"
-
msgid "Data Sources and Types:"
msgstr "Zdroje dát a Typy:"
@@ -7553,9 +7760,9 @@ msgid ""
"enabled.<br>Please choose to either download OSM data, or GPX data, or "
"both.</html>"
msgstr ""
-"<html> Žiaden<strong> {0} </strong>, a ani <strong> {1} </strong>nie je "
-"povolený. <br> Vyberte buď stiahnuť OSM dáta, alebo GPX dáta, alebo oboje. "
-"</html>"
+"<html>Žiaden<strong>{0}</strong> ani <strong>{1}</strong> nie je "
+"povolený.<br>Vyberte buď stiahnuť OSM dáta, alebo GPX dáta, alebo "
+"oboje.</html>"
msgid "Download referrers (parent relations)"
msgstr "Stiahnuť odkazy (pôvodné relácie)"
@@ -7563,21 +7770,8 @@ msgstr "Stiahnuť odkazy (pôvodné relácie)"
msgid "Download object"
msgstr "Stiahnuť objekt"
-msgid "Object type:"
-msgstr "Objekt podľa typu:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "zmiešaný"
-
-msgid "Choose the OSM object type"
-msgstr "Vyberte typ objektu OSM"
-
-msgid "Object ID:"
-msgstr "Objekt podľa ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Vložiť ID objektu, ktorý má byť stiahnutý"
+msgid "Start downloading"
+msgstr "Začať sťahovanie"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7589,28 +7783,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Zvoľte, ak by mali byť tiež stiahnuté členy relácie"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"ID objektu môže byť oddelené medzerou alebo čiarkou. <br/> Príklady:. <b> "
-"<ul> <li> 1 2 5 </li> <li> 1,2,5 </li> </ul> <br/> </b> v kombinovanom "
-"režime, špecifické objekty ako sú tieto: <b> W123, N110, W12, R15 </b> <br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Stiahnuť odkazy (pôvodnej relácie a cesty)"
-msgid "Start downloading"
-msgstr "Začať sťahovanie"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Neplatné ID určeného zoznamu\n"
-"Nedá sa stiahnuť objekt."
-
msgid "Class Type"
msgstr "Typ triedy"
@@ -7648,13 +7823,13 @@ msgid "Type"
msgstr "Typ"
msgid "Slippy map"
-msgstr "Slippy map"
+msgstr "Posúvacia mapa"
msgid "Tile Numbers"
msgstr "Čísla dlaždíc"
msgid "JOSM Help Browser"
-msgstr "JOSM Help Browser"
+msgstr "Prehliadač nápovedy JOSM"
msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
msgstr "Neúspešné načítanie CSS súboru ''help-browser.css''. Výnimka je: {0}"
@@ -7668,13 +7843,13 @@ msgid ""
"your local language ({1})</a> and the <a href=\"{3}\">help topic in "
"English</a>.</p></html>"
msgstr ""
-"<html> <p class=\"warning-header\">Obsah pomocníka k téme pomoci chýba </p> "
-"<p class=\"warning-body\"> Obsah pomocníka pre tému pomocníka <strong> {0} "
-"</strong> nie je k dispozícii. Chýba ako vo vašom jazyku ({1}) tak aj v "
-"anglickom jazyku.<br><br>Pomôžte zlepšiť JOSM systém nápovedy a vyplniť "
-"chýbajúce informácie. Môžete tak upraviť <a href=\"{2}\"> tému pomocníka vo "
-"vašom jazyku ({1})</a> a <a href=\"{3}\"> tému pomocníka v angličtine "
-"</a>.</p> </html>"
+"<html><p class=\"warning-header\">Obsah pomocníka k téme pomoci chýba</p><p "
+"class=\"warning-body\">Obsah pomocníka pre tému pomocníka "
+"<strong>{0}</strong> nie je k dispozícii. Chýba ako vo vašom jazyku ({1}) "
+"tak aj v anglickom jazyku.<br><br>Pomôžte zlepšiť JOSM systém nápovedy a "
+"vyplniť chýbajúce informácie. Môžete tak upraviť <a href=\"{2}\"> tému "
+"pomocníka vo vašom jazyku ({1})</a> a <a href=\"{3}\">tému pomocníka v "
+"angličtine</a>.</p></html>"
msgid ""
"<html><p class=\"error-header\">Error when retrieving help information</p><p "
@@ -7682,7 +7857,7 @@ msgid ""
"could not be loaded. The error message is "
"(untranslated):<br><tt>{1}</tt></p></html>"
msgstr ""
-"<html><p class=\"error-header\">Nastala chyba pri získavaní informácií "
+"<html><p class=\"error-header\">Nastala chyba pri získavaní informácií "
"pomoci</p><p class=\"error-body\">Obsah pre tému pomoci <strong>{0}</strong> "
"nemohol byť nahratý. Chybová správa je "
"(nepreložená):<br><tt>{1}</tt></p></html>"
@@ -7721,10 +7896,10 @@ msgid "Go to the next page"
msgstr "Prejsť na nasledujúcu stránku"
msgid "Go to the JOSM help home page"
-msgstr "Choďte na JOSM domácu stránku pomoci"
+msgstr "Choďte na domácu stránku nápovedy JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Varovanie: zlé umiestnenie v HTML dokumente. Výnimka bola: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Chybné umiestnenie v HTML dokumente. Výnimka bola: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Neúspešné otvorenie stránky s pomocou. Cieľová URL je prázdna."
@@ -7758,7 +7933,8 @@ msgstr "Načítať históriu zo serveru"
msgid "History not initialized yet. Failed to set reference primitive."
msgstr ""
-"priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
+"História nie je zatiaľ inicializovaná. Neporadilo sa nastaviť odkaz na "
+"základný objekt."
msgid ""
"Failed to set reference. Reference ID {0} does not match history ID {1}."
@@ -7770,13 +7946,15 @@ msgid ""
msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
msgid "History not initialized yet. Failed to set current primitive."
-msgstr "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných."
+msgstr ""
+"História nie je ešte inicializovaná. Nepodarilo sa nastaviť základný objekt."
msgid ""
"Failed to set current primitive. Current version {0} not available in "
"history."
msgstr ""
-"chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
+"Nepodarilo sa nastaviť základný objekt. Aktuálna verzia {0} nie je platná v "
+"priebehu histórie."
msgid "Load history"
msgstr "Nahrať priebeh"
@@ -7828,6 +8006,9 @@ msgid ""
msgstr ""
"<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Komentár k súboru zmien"
+
msgid "Changeset info"
msgstr "Info súboru zmien"
@@ -7852,15 +8033,15 @@ msgstr "Dátum"
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
msgstr ""
-"Neúspešné nahratie pôvodných s id {0} pretože aktuálna dátová vrstva je "
-"prázdna"
+"Nepodarilo sa aktualizovať základný objekt s id {0} pretože aktuálna dátová "
+"vrstva je prázdna"
msgid ""
"Failed to update primitive with id {0} because current edit layer does not "
"include such a primitive"
msgstr ""
-"Neúspešné nahratie pôvodných s id {0} pretože aktuálne upravovaná vrstva "
-"neobsahuje takéto pôvodné"
+"Nepodarilo sa aktualizovať základný objekt s id {0} pretože aktuálne "
+"upravovaná vrstva neobsahuje takýto objekt"
msgid "Synchronize node {0} only"
msgstr "Synchronizovať iba {0} bod"
@@ -7885,12 +8066,13 @@ msgid ""
"editing.<br></html>"
msgstr ""
"<html>Aktualizácia <strong>neúspešná</strong> pretože server ná novú verziu "
-"jednu z<br>vaších bodov, ciest, alebo relácií.<br>Konflikt je zapríčinený "
-"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu "
-"{2},vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu "
-"iba sporných pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu "
-"celej lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
-"zrušenie a pokračovanie v editácii.<br></html>"
+"niektorého z<br>vašich bodov, ciest alebo relácií.<br>Konflikt je "
+"zapríčinený <strong>{0}</strong> s id <strong>{1}</strong>,<br>server má "
+"verziu {2}, Vaša verzia je {3}.<br><br>Kliknite <strong>{4}</strong> pre "
+"synchronizáciu iba sporných základných objektov.<br>Kliknite "
+"<strong>{5}</strong> pre synchronizáciu celej lokálnej dátovej sady so "
+"serverom.<br>Kliknite <strong>{6}</strong> pre zrušenie a pokračovanie v "
+"editácii.<br></html>"
msgid ""
"<html>Uploading <strong>failed</strong> because the server has a newer "
@@ -7900,9 +8082,9 @@ msgid ""
"editing.<br></html>"
msgstr ""
"<html>Nahrávanie <strong>neúspešné</strong> pretože server má novú verziu "
-"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click "
-"<strong>{0}</strong>pre synchronizáciu celej lokálnej dátovej sady so "
-"serverom.<br>Click <strong>{1}</strong> pre zrušenie a pokračovanie v "
+"niektorého z <br>Vašich bodov, ciest alebo relácií.<br><br>Kliknite "
+"<strong>{0}</strong> pre synchronizáciu celej lokálnej dátovej sady so "
+"serverom.<br>Kliknite <strong>{1}</strong> pre zrušenie a pokračovanie v "
"editácii.<br></html>"
msgid ""
@@ -7911,8 +8093,8 @@ msgid ""
"again with a new or an existing open changeset.</html>"
msgstr ""
"<html>Nahrávanie <strong>neúspešné</strong> pretože ste použili<br>zmenový "
-"súbor {0} ktorý už bol zavretý v {1}.<br>Prosím nahrať znova s novým, alebo "
-"existujúcim zmenovým súborom.</html>"
+"súbor {0}, ktorý už bol zavretý v {1}.<br>Prosím nahrajte znova s novým, "
+"alebo existujúcim otvoreným zmenovým súborom.</html>"
msgid "Changeset closed"
msgstr "Zmenový súbor zavretý"
@@ -7936,9 +8118,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Objekt sa stále používa"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "Chybová hlavička \"{0}\" nesúhlasí s očakávaným vzorom"
msgid "Upload"
msgstr "Nahrať"
@@ -7955,11 +8136,17 @@ msgstr ""
"na ľavej strane.</html>"
msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Doplniť krátky komentár k nahrávaným zmenám"
+msgstr "Doplniť krátky komentár k nahrávaným zmenám:"
msgid "Enter an upload comment"
msgstr "Zadajte nejaký komentár"
+msgid "Specify the data source for the changes:"
+msgstr "Zadajte zdroj zmien v dátach:"
+
+msgid "Enter a source"
+msgstr "Zadajte zdroj"
+
msgid "Changeset id:"
msgstr "Zmenový súbor id:"
@@ -7976,8 +8163,8 @@ msgid ""
"Please decide what changeset the data is uploaded to and whether to close "
"the changeset after the next upload."
msgstr ""
-"Prosím rozhodnite, aké dáta zmenového súboru sú nahraté a či zavrieť "
-"zmenový súbor po ďalšom nahratí."
+"Prosím rozhodnite, aké dáta zmenového súboru sú nahraté a či zavrieť zmenový "
+"súbor po ďalšom nahratí."
msgid "Upload to a new changeset"
msgstr "Nahrať do nového zmenového súboru"
@@ -8028,20 +8215,19 @@ msgid "Closing changeset {0}"
msgstr "zatváranie zmenového súboru {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Varovanie: neúspešné zapnutie Credential Dialog-u vždy hore. Zachytená "
+"Nepodarilo sa umiestniť prihlasovacie okno navrch. Bola zachytená "
"bezpečnostná výnimka."
msgid "Enter credentials for OSM API"
-msgstr "Vložiť credentials pre OSM API"
+msgstr "Vložiť prihlasovacie údaje pre OSM API"
msgid "Enter credentials for host"
msgstr "Zadajte prihlasovacie údaje pre hostiteľa"
msgid "Enter credentials for HTTP proxy"
-msgstr "Vložiť poverenia pre HTTP proxy server"
+msgstr "Vložiť prihlasovacie údaje pre HTTP proxy server"
msgid "Please enter the user name of your OSM account"
msgstr "Prosím vložte uživateľské meno vášho OSM konta"
@@ -8053,14 +8239,14 @@ msgid ""
"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
"and a valid password."
msgstr ""
-"Overenie v OSM API ''{0}'' neúspešné. Prosím vložte platné užívateľské meno "
-"a platné heslo."
+"Overenie v OSM API ''{0}'' neúspešné. Prosím vložte platné používateľské "
+"meno a platné heslo."
msgid "Warning: The password is transferred unencrypted."
msgstr "Upozornenie: Heslo sa posiela nešifrované."
msgid "Please enter the user name of your account"
-msgstr "Prosím, zadajte užívateľské meno pre Váš účet"
+msgstr "Prosím, zadajte používateľské meno pre Váš účet"
msgid "Please enter the password of your account"
msgstr "Prosím, zadajte heslo pre Váš účet"
@@ -8070,10 +8256,10 @@ msgid ""
"a valid password."
msgstr ""
"Overovanie na hostiteľovi ''{0}'' zlyhalo. Prosím, zadajte platné "
-"užívateľské meno a platné heslo."
+"používateľské meno a platné heslo."
msgid "Please enter the user name for authenticating at your proxy server"
-msgstr "Prosím vložte užívateľské meno pre overenie vo vašom proxy serveri"
+msgstr "Prosím vložte používateľské meno pre overenie vo Vašom proxy serveri"
msgid "Please enter the password for authenticating at your proxy server"
msgstr "Prosím vložte heslo pre overenie vo vašom proxy serveri"
@@ -8083,7 +8269,7 @@ msgid ""
"username and a valid password."
msgstr ""
"Overovanie na HTTP proxy serveri ''{0}'' neúspešné. Prosím vložte platné "
-"užívateľské meno a platné heslo."
+"používateľské meno a platné heslo."
msgid ""
"Warning: depending on the authentication method the proxy server uses the "
@@ -8096,7 +8282,7 @@ msgid "Authenticate"
msgstr "Overenie totožnosti"
msgid "Authenticate with the supplied username and password"
-msgstr "Overenie s dodaním užívateľského mena a hesla"
+msgstr "Overenie s dodaním používateľského mena a hesla"
msgid "Cancel authentication"
msgstr "Zrušiť overenie"
@@ -8114,11 +8300,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Rozbaľuje sa {0} do {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Upozornenie: Nemožno stiahnuť súbor ''{0}''. Jeho odkaz na stiahnutie "
-"''{1}'' nie je platná URL adresa. Preskočenie sťahovania."
+"Nemožno stiahnuť súbor \"{0}\". Jeho odkaz na stiahnutie \"{1}\" nie je "
+"platná URL adresa. Sťahovanie sa preskočí."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8128,17 +8314,16 @@ msgid ""
msgstr ""
"Nemôžem získať zoznam vašich otvorených zmenových súborov pretože<br>JOSM "
"nepoznám vašu totožnosť.<br>Zvolili ste si pracovať anonymne, alebo ste "
-"neoprávnili<br>poznať totožnosť užívateľa, ktorý pracuje vo vašom záujme."
+"neoprávnili<br>poznať totožnosť používateľa, ktorý pracuje vo Vašom záujme."
msgid "Missing user identity"
-msgstr "Chýba totožnosť užívateľa"
+msgstr "Chýba totožnosť používateľa"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Varovanie: Neúspešné získanie informácií o užívateľovi pre aktuálneho "
-"užívateľa JOSMu. Výnimka bola: {0}"
+"Nepodarilo sa získať informácie o používateľovi pre aktuálneho používateľa "
+"JOSMu. Výnimka bola: {0}"
msgid "Download objects"
msgstr "Stiahnuť objekty"
@@ -8160,7 +8345,7 @@ msgstr ""
"tlačidlo pre otvorenie vyhľadávania súboru."
msgid "The bold text is the name of the layer."
-msgstr "Hrubým textom je meno vrstvy."
+msgstr "Hrubým textom je meno vrstvy."
msgid "Click here to choose save path"
msgstr "Kliknite sem na výber cesty uloženia"
@@ -8205,14 +8390,14 @@ msgid_plural ""
"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
"discard the modifications.<br>Layers with conflicts:</html>"
msgstr[0] ""
-"<html>{0} vrstvy majú nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
+"<html>{0} vrstiev má nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
"zrušte zmeny.<br>Vrstvy s konfliktami:</html>"
msgstr[1] ""
"<html>{0} vrstva má nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
"zrušte zmeny.<br>Vrstva s konfliktami:</html>"
msgstr[2] ""
-"<html>{0} vrstiev má nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
-"zrušte zmeny.<br>Vrstiev s konfliktami:</html>"
+"<html>{0} vrstvy majú nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
+"zrušte zmeny.<br>Vrstvy s konfliktami:</html>"
msgid "Unsaved data and conflicts"
msgstr "Neuložené dáta a konflikty"
@@ -8225,15 +8410,15 @@ msgid_plural ""
"file for each of them or discard the changes.<br>Layers without a "
"file:</html>"
msgstr[0] ""
-"<html>{0} vrstvy sa musia uložiť, pretože nemajú pričlenené "
+"<html>{0} vrstiev sa musí uložiť, pretože nemajú pričlenené "
"súbory.<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte "
"zmeny.<br>Vrstvy bez súborov:</html>"
msgstr[1] ""
-"<html>{0} vrstva sa musí uložiť, pretože nemá pričlenený súbor.<br>Najskôr "
+"<html>{0} vrstva sa musí uložiť, pretože nemá pričlenený súbor.<br>Najskôr "
"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.<br>Vrstva bez "
"súboru:</html>"
msgstr[2] ""
-"<html>{0} vrstiev sa musí uložiť, pretože nemajú pričlenené "
+"<html>{0} vrstvy sa musia uložiť, pretože nemajú pričlenené "
"súbory.<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte "
"zmeny.<br>Vrstvy bez súborov:</html>"
@@ -8249,15 +8434,15 @@ msgid_plural ""
"written.<br>Either select another file for each of them or discard the "
"changes.<br>Layers with non-writable files:</html>"
msgstr[0] ""
-"<html>{0}vrstva potrebuje uložiť, pretože má pričlenený súbor<br>ktorý "
-"nemôže byť uložený.<br>Vyberte iný súbor pre túto vrstvu, alebo zahoďte "
-"zmeny.<br>Vrstva s nezapisovateľným súborom:</html>"
-msgstr[1] ""
-"<html>{0}vrstvy potrebujú uložiť, pretože majú pričlenené súbory<br>ktoré "
+"<html>{0} vrstiev potrebuje uložiť, pretože majú pričlenené súbory<br>ktoré "
"nemôžu byť uložené.<br>Vyberte iné súbory pre tieto vrstvy, alebo zahoďte "
"zmeny.<br>Vrstvy s nezapisovateľnými súbormi:</html>"
+msgstr[1] ""
+"<html>{0} vrstva potrebuje uložiť, pretože má pričlenený súbor<br>ktorý "
+"nemôže byť uložený.<br>Vyberte iný súbor pre túto vrstvu, alebo zahoďte "
+"zmeny.<br>Vrstva s nezapisovateľným súborom:</html>"
msgstr[2] ""
-"<html>{0}vrstvy potrebujú uložiť, pretože majú pričlenené súbory<br>ktoré "
+"<html>{0} vrstvy potrebujú uložiť, pretože majú pričlenené súbory<br>ktoré "
"nemôžu byť uložené.<br>Vyberte iné súbory pre tieto vrstvy, alebo zahoďte "
"zmeny.<br>Vrstvy s nezapisovateľnými súbormi:</html>"
@@ -8303,13 +8488,13 @@ msgid_plural ""
"<html>Upload and/or save operations of {0} layers with modifications<br>were "
"canceled or have failed.</html>"
msgstr[0] ""
-"<html> Nahrávanie a/alebo ukladanie z jednej vrstvy, s úpravami<br>bolo "
+"<html>Nahrávanie a/alebo ukladanie z {0} vrstiev, s úpravami<br>bolo "
"zrušené, alebo zlyhalo.</html>"
msgstr[1] ""
-"<html> Nahrávanie a/alebo ukladanie z {0} vrstiev, s úpravami<br>bolo "
-"zrušené, alebo zlyhalo.</html>"
+"<html>Nahrávanie a/alebo ukladanie z {0} vrstvy, s úpravami<br>bolo zrušené, "
+"alebo zlyhalo.</html>"
msgstr[2] ""
-"<html> Nahrávanie a/alebo ukladanie z {0} vrstiev, s úpravami<br>bolo "
+"<html>Nahrávanie a/alebo ukladanie z {0} vrstiev, s úpravami<br>bolo "
"zrušené, alebo zlyhalo.</html>"
msgid "Incomplete upload and/or save"
@@ -8326,7 +8511,7 @@ msgid ""
msgstr "Vrstva ''{0}'' má zmeny, ktoré by mali byť nahraté na server."
msgid "Layer ''{0}'' has modifications which are discouraged to be uploaded."
-msgstr ""
+msgstr "Vrstva ''{0}'' obsahuje zmeny, ktoré sa neodporúča nahrať."
msgid "Layer ''{0}'' has no modifications to be uploaded."
msgstr "Vrstva ''{0}'' nemá žiadne zmeny na nahratie."
@@ -8388,17 +8573,11 @@ msgid "Upload Changes"
msgstr "Nahrať zmeny"
msgid "Upload the changed primitives"
-msgstr "Nahrať zmenené pôvodné"
+msgstr "Nahrať zmenený základný objekt"
msgid "Please revise upload comment"
msgstr "Prosím opravte komentár"
-msgid "Revise"
-msgstr "Kontrola"
-
-msgid "Continue as is"
-msgstr "Pokračovať, ako je"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8407,11 +8586,31 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
"Váš komentár pre nahrávanie je <i>prázdny</i>, alebo <i>veľmi krátky</i>.<br "
-"/> <br /> Toto je technicky povolené, ale domnievame sa, že veľa užívateľov, "
-"ktorí si <br /> sledujú zmeny v ich oblasti závisí na zmysluplných "
-"komentároch zmenových súborov <br /> ,aby pochopili, čo sa deje! <br /> <br "
-"/> Ak obetujete minútu navyše teraz vysvetlením vašich zmien, urobíte život "
-"<br /> jednoduchším pre mnoho iných používateľov."
+"/><br />Toto je technicky povolené, ale domnievame sa, že veľa "
+"používateľov,<br />ktorí si sledujú zmeny v ich oblasti závisí na "
+"zmysluplných komentároch zmenových súborov,<br />aby pochopili, čo sa "
+"deje!<br /><br />Ak obetujete minútu navyše teraz vysvetlením vašich "
+"zmien,<br />urobíte život jednoduchším pre mnoho iných používateľov."
+
+msgid "Please specify a changeset source"
+msgstr "Prosím zadajte zdroj súboru zmien"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"Nezadali ste zdroj vašich zmien.<br />To je síce technicky povolené, avšak "
+"zadanie by pomohlo iným používateľom<br />porozumieť pôvodu údajov.<br /><br "
+"/>Ak obetujete minútu navyše teraz vysvetlením vašich zmien,<br />urobíte "
+"život jednoduchším pre mnoho iných používateľov."
+
+msgid "Revise"
+msgstr "Kontrola"
+
+msgid "Continue as is"
+msgstr "Pokračovať, ako je"
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "Návrat na predchádzajúci dialóg pre zadanie podrobnejšieho komentára"
@@ -8428,6 +8627,28 @@ msgstr "Prosím najskôr vložte platnú veľkosť"
msgid "Illegal chunk size"
msgstr "Nedovolená veľkosť"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>Nasledujúce značky v súbore zmien obsahuje prázdny kľúč alebo "
+"hodnotu:<br>{0}<br>Pokračovať?</html>"
+msgstr[1] ""
+"<html>Nasledujúca značka v súbore zmien obsahuje prázdny kľúč alebo "
+"hodnotu:<br>{0}<br>Pokračovať?</html>"
+msgstr[2] ""
+"<html>Nasledujúce značky v súbore zmien obsahuje prázdny kľúč alebo "
+"hodnotu:<br>{0}<br>Pokračovať?</html>"
+
+msgid "Empty metadata"
+msgstr "Prázdne metadáta"
+
msgid "Cancel the upload and resume editing"
msgstr "Zrušiť nahrávanie a pokračovať v editácii"
@@ -8435,11 +8656,11 @@ msgid "Tags of changeset {0}"
msgstr "Značky zo súboru zmien {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Upozornenie: objekt ''{0}'' je už na serveri zmazaný. Vynechávam tento "
-"objekt a opakujem nahrávanie."
+"Objekt \"{0}\" je už na serveri vymazaný. Objekt sa preskočí a odoslanie "
+"vykoná znova."
msgid "Preparing objects to upload ..."
msgstr "Príprava objektov na nahrávanie ..."
@@ -8456,11 +8677,10 @@ msgstr ""
msgid ""
"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr "Zmenový súbor bude <strong>zavretý</strong> po tomto nahratí"
+msgstr "Zmenový súbor bude <strong>uzavretý</strong> po tomto nahratí"
msgid "The changeset is <strong>left open</strong> after this upload"
-msgstr ""
-"Zmenový súbor je <strong>stále otvorený(left open)</strong> po tomto nahratí"
+msgstr "Zmenový súbor je <strong>stále otvorený</strong> po tomto nahratí"
msgid "configure changeset"
msgstr "konfiguravať zmenový súbor"
@@ -8469,10 +8689,10 @@ msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
msgstr[0] ""
-"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového "
+"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
"súboru</strong>"
msgstr[1] ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
+"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového "
"súboru</strong>"
msgstr[2] ""
"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
@@ -8485,10 +8705,10 @@ msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>1 request</strong>"
msgstr[0] ""
-"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového "
+"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
"súboru</strong> použitím <strong>1 požiadavky</strong>"
msgstr[1] ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
+"Nahrávanie <strong>{0} objektu</strong> do <strong>1 zmenového "
"súboru</strong> použitím <strong>1 požiadavky</strong>"
msgstr[2] ""
"Nahrávanie <strong>{0} objektov</strong> do <strong>1 zmenového "
@@ -8509,17 +8729,17 @@ msgid ""
"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
"proceed with <strong>multiple changesets</strong>"
msgstr ""
-"{0} objekty prektočili max. povolených {1} objektov v zmenovom súbore na "
-"server ''{2}''. Prosím <a href=\"urn:advanced-"
-"configuration\">konfigurujte</a> ako postupovať s <strong>viacnásobnými "
+"{0} objekty prekročili max. povolených {1} objektov v zmenovom súbore na "
+"server \"{2}\". Prosím <a href=\"urn:advanced-"
+"configuration\">konfigurujte</a> ako postupovať s <strong>viacerými "
"zmenovými súbormi</strong>"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>multiple "
"changesets</strong> using <strong>{1} requests</strong>"
msgstr ""
-"Nahrávanie <strong>{0} objektov</strong> do <strong>viacnásobných zmenových "
-"súborov</strong> použitím <strong>{1} požoadavky</strong>"
+"Nahrávanie <strong>{0} objektov</strong> do <strong>viacerých zmenových "
+"súborov</strong> použitím <strong>{1} požiadaviek</strong>"
msgid "Uploading data for layer ''{0}''"
msgstr "Náhrávanie dát na server z vrstvy ''{0}''"
@@ -8549,14 +8769,14 @@ msgid ""
"on the server ''{1}''."
msgstr ""
"Server nahlásil, že aktuálny zmenový súbor bol zavretý.<br>Toto je veľmi "
-"pravdepodobné, pretože veľkosť zmenového súboru prekročila max. "
-"veľkosť<br>z {0} objektov na server ''{1}''."
+"pravdepodobné, pretože veľkosť zmenového súboru prekročila max. veľkosť<br>z "
+"{0} objektov na server ''{1}''."
msgid "There is {0} object left to upload."
msgid_plural "There are {0} objects left to upload."
-msgstr[0] "Nachádza sa tam {0} objekt na nahratie.."
-msgstr[1] "Nachádzajú sa tam {0} objekty na nahratie.."
-msgstr[2] "Nachádza sa tam {0} objektov na nahratie.."
+msgstr[0] "Nachádza sa tam {0} objektov na nahratie."
+msgstr[1] "Nachádza sa tam {0} objekt na nahratie."
+msgstr[2] "Nachádzajú sa tam {0} objekty na nahratie."
msgid ""
"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
@@ -8584,9 +8804,6 @@ msgstr "Relácia ''{0}'' je už odstránená. Preskakujem objekt v nahrávaní."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní."
-msgid "Warning: {0}"
-msgstr "Varovanie: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Nahrávanie {0} objektov ..."
@@ -8598,6 +8815,9 @@ msgid ""
msgstr ""
"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
+msgid "Upload successful!"
+msgstr "Odoslanie úspešné!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8618,9 +8838,9 @@ msgstr "Vyberte objekty na nahratie"
msgid "Cancel uploading"
msgstr "Prerušiť nahrávanie"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
-"Varovanie: nečakaná hodnota kľúča ''{0}'' v preferenciách, dostal som ''{1}''"
+"Neočakávaná hodnota pre kľúč \"{0}\" v nastavení, obdržaná hodnota je \"{1}\""
msgid "Please select the upload strategy:"
msgstr "Prosím vyberte stratégiu nahrávania:"
@@ -8638,14 +8858,14 @@ msgid ""
"<html>There are <strong>multiple changesets</strong> necessary in order to "
"upload {0} objects. Which strategy do you want to use?</html>"
msgstr ""
-"<html>Sú tam <strong>viacnásobné zmenové súbory</strong> je potrebné určiť "
-"poradie nahrávania {0} objektov.Ktorú stratégiu chcete použiť?</html>"
+"<html>Je potrebné použiť <strong>viaceré zmenové súbory</strong> pre "
+"nahratie {0} objektov. Ktorú stratégiu chcete použiť?</html>"
msgid "Fill up one changeset and return to the Upload Dialog"
msgstr "Naplniť jeden zmenový súbor a vrátiť sa do dialógu nahrávania"
msgid "Open and use as many new changesets as necessary"
-msgstr "Je nutné otvoriť a používať viac nových zmenových súborov"
+msgstr "Použiť toľko nových zmenových súborov, koľko je potrebné"
msgid "Upload in one request not possible (too many objects to upload)"
msgstr ""
@@ -8666,9 +8886,9 @@ msgstr "(# požiadavky neznáme)"
msgid "({0} request)"
msgid_plural "({0} requests)"
-msgstr[0] "({0} požiadavka)"
-msgstr[1] "({0} požiadavky)"
-msgstr[2] "({0} požiadaviek)"
+msgstr[0] "({0} požiadaviek)"
+msgstr[1] "({0} požiadavka)"
+msgstr[2] "({0} požiadavky)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
msgstr "Nepovolená veľkosť <= 0. Prosím vložte celé číslo > 1"
@@ -8696,7 +8916,7 @@ msgstr "Odstránené objekty:"
msgid "{0} object to add:"
msgid_plural "{0} objects to add:"
msgstr[0] "{0} pridaných objektov:"
-msgstr[1] "{0} pridaný objek:"
+msgstr[1] "{0} pridaný objekt:"
msgstr[2] "{0} pridané objekty:"
msgid "{0} object to modify:"
@@ -8708,8 +8928,8 @@ msgstr[2] "{0} upravené objekty:"
msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
msgstr[0] "{0} zmazaných objektov:"
-msgstr[1] "{0} zmazané objekty:"
-msgstr[2] "{0} zmazaných objektov:"
+msgstr[1] "{0} zmazaný objekt:"
+msgstr[2] "{0} zmazané objekty:"
msgid "Customize Color"
msgstr "Prispôsobiť farbu"
@@ -8728,9 +8948,9 @@ msgstr "Popis: {0}"
msgid "{0} track"
msgid_plural "{0} tracks"
-msgstr[0] "{0} stopa(track)"
-msgstr[1] "{0} stopy(track)"
-msgstr[2] "{0} stôp(track)"
+msgstr[0] "{0} stôp(track)"
+msgstr[1] "{0} stopa(track)"
+msgstr[2] "{0} stopy(track)"
msgid "Description"
msgstr "Popis"
@@ -8746,24 +8966,24 @@ msgstr "Dĺžka: {0}"
msgid "{0} route, "
msgid_plural "{0} routes, "
-msgstr[0] "{0} trasa, "
-msgstr[1] "{0} trasy, "
-msgstr[2] "{0} trás, "
+msgstr[0] "{0} trás, "
+msgstr[1] "{0} trasa, "
+msgstr[2] "{0} trasy, "
msgid "{0} waypoint"
msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint (bod cesty)"
-msgstr[1] "{0} waypointy (body cesty)"
-msgstr[2] "{0} waypointov (bodov cesty)"
+msgstr[0] "{0} waypointov (bodov cesty)"
+msgstr[1] "{0} waypoint (bod cesty)"
+msgstr[2] "{0} waypointy (body cesty)"
msgid "gps point"
msgstr "gps poloha bodu"
msgid "{0} track, "
msgid_plural "{0} tracks, "
-msgstr[0] "{0} stopa(track), "
-msgstr[1] "{0} stopy(track), "
-msgstr[2] "{0} stôp(track), "
+msgstr[0] "{0} stôp(track), "
+msgstr[1] "{0} stopa(track), "
+msgstr[2] "{0} stopy(track), "
msgid "Save GPX file"
msgstr "Uložiť GPX súbor"
@@ -8780,7 +9000,7 @@ msgstr "Nasledujúca značka"
msgid "Jump to next marker"
msgstr "Prejsť na ďalšiu značku(marker)"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Predchádzajúca značka"
msgid "Jump to previous marker"
@@ -8813,14 +9033,14 @@ msgstr "verzia {0}"
msgid "Merging layers"
msgstr "Zlučujú sa vrstvy"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "POmiešané dátové výsledky verzií 0.6 a 0.5 vo verzii 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
-msgstr[0] "{0} vymazaný"
-msgstr[1] "{0} vymazané"
-msgstr[2] "{0} vymazaných"
+msgstr[0] "{0} vymazaných"
+msgstr[1] "{0} vymazaný"
+msgstr[2] "{0} vymazané"
msgid "{0} consists of:"
msgstr "{0} se skladá z:"
@@ -8832,7 +9052,7 @@ msgid "API version: {0}"
msgstr "Verzia API: {0}"
msgid "Upload is discouraged"
-msgstr ""
+msgstr "Nahratie sa neoporúča"
msgid "Convert to GPX layer"
msgstr "Previesť do GPX vrstvy"
@@ -8888,7 +9108,7 @@ msgid ""
msgstr ""
"TMS vrstvy nepodporujú projekcie {0}.\n"
"{1}\n"
-"Zmeniť projekciu, alebo odstrániť vrstvu."
+"Zmeniť projekciu, alebo odstrániť vrstvu."
msgid "Auto Zoom"
msgstr "Auto Zoom"
@@ -8935,6 +9155,9 @@ msgstr "zvýšiť úroveň zväčšenia pre viditeľnosť viacej detailov"
msgid "No tiles at this zoom level"
msgstr "Žiadne dlaždice na tejto úrovni priblíženia"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "TMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "EPSG: 4326 a Mercator projekcie sú podporované"
@@ -8962,7 +9185,8 @@ msgstr "Stiahnuť viditeľné dlaždice"
msgid ""
"The requested area is too big. Please zoom in a little, or change resolution"
msgstr ""
-"Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
+"Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmeňte "
+"rozlíšenie."
msgid "Change resolution"
msgstr "Zmena rozlíšenia"
@@ -8973,6 +9197,9 @@ msgstr "Nahrať poškodené dlaždice"
msgid "Alpha channel"
msgstr "Alfa kanál"
+msgid "Automatically change resolution"
+msgstr "Automaticky zmeniť rozlíšenie"
+
msgid "Set WMS Bookmark"
msgstr "Nastaviť WMS Záložku"
@@ -9113,11 +9340,11 @@ msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
msgid_plural ""
"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
msgstr[0] ""
-"<html>Vyrovnaná <b>{0}</b> z <b>{1}</b> fotografia do GPX stopy.</html>"
+"<html>Vyrovnané <b>{0}</b> z <b>{1}</b> fotografií do GPX stopy.</html>"
msgstr[1] ""
"<html>Vyrovnané <b>{0}</b> z <b>{1}</b> fotografie do GPX stopy.</html>"
msgstr[2] ""
-"<html>Vyrovnané <b>{0}</b> z <b>{1}</b> fotografie do GPX stopy.</html>"
+"<html>Vyrovnané <b>{0}</b> z <b>{1}</b> fotografií do GPX stopy.</html>"
msgid "Timezone: {0}"
msgstr "Časové pásmo: {0}"
@@ -9130,9 +9357,9 @@ msgstr "Sekúnd: {0}"
msgid "(Time difference of {0} day)"
msgid_plural "Time difference of {0} days"
-msgstr[0] "(Časová odchýlka z {0} dňa)"
-msgstr[1] "Časová odchýlka z {0} dní"
-msgstr[2] "Časová odchýlka z {0} dní"
+msgstr[0] "Časová odchýlka {0} dní"
+msgstr[1] "(Časová odchýlka {0} deň)"
+msgstr[2] "Časová odchýlka {0} dni"
msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
@@ -9188,9 +9415,6 @@ msgstr "Získavam GPS polohu z EXIF"
msgid "Starting directory scan"
msgstr "Začínam prehľadávať adresár"
-msgid "One of the selected files was null"
-msgstr "Niektorý z vybratých súborov bol prázdny"
-
msgid "Read photos..."
msgstr "Čítať fotky..."
@@ -9209,20 +9433,23 @@ msgstr "Nájdený prázdny súbor v adresári {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Chyba pri získavaní súború z adresára {0}\n"
+msgid "One of the selected files was null"
+msgstr "Niektorý z vybratých súborov bol prázdny"
+
msgid "Geotagged Images"
msgstr "Obrázky s GPS súradnicami"
msgid "{0} image loaded."
msgid_plural "{0} images loaded."
-msgstr[0] "{0} načítaný obrázok ."
-msgstr[1] "{0} načítané obrázky."
-msgstr[2] "{0} načítaných obrázkov."
+msgstr[0] "{0} načítaných obrázkov."
+msgstr[1] "{0} načítaný obrázok."
+msgstr[2] "{0} načítané obrázky."
msgid "{0} was found to be GPS tagged."
msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} bola založená GPS značka."
-msgstr[1] "{0} boli založené GPS značky."
-msgstr[2] "{0} boli založené GPS značky."
+msgstr[0] "{0} bolo založených s GPS značkou."
+msgstr[1] "{0} bol založený s GPS značkou."
+msgstr[2] "{0} boli založené s GPS značkou."
msgid "Delete image file from disk"
msgstr "Vymazať súbor s obrázkom z disku"
@@ -9270,6 +9497,12 @@ msgstr "Nasledujúci"
msgid "Show next Image"
msgstr "Zobraziť nasledujúci obrázok"
+msgid "Show first Image"
+msgstr "Zobraziť prvý obrázok"
+
+msgid "Show last Image"
+msgstr "Zobraziť posledný obrázok"
+
msgid "Center view"
msgstr "Stredový pohľad"
@@ -9352,9 +9585,6 @@ msgstr ""
"<html>Nahrať nespracované GPS dáta do mapy nie je dobrý nápad. <br>Ak chcete "
"nahrať stopy, pozrite sem:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Prispôsobenie kreslenia stôp"
@@ -9367,11 +9597,14 @@ msgstr "Pre"
msgid "No timestamp"
msgstr "Bez časovej značky"
-msgid "Download from OSM along this track"
-msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
+msgid "Select to download OSM data."
+msgstr "Zvoľte pre stiahnutie dát OSM."
+
+msgid "Select to download GPS traces."
+msgstr "Zvoľte pre stiahnutie stopy GPS."
msgid "Download everything within:"
-msgstr "Stiahnuť všetko vo vnútry:"
+msgstr "Stiahnuť všetko vovnútri:"
msgid "{0} meters"
msgstr "{0} metrov"
@@ -9394,16 +9627,18 @@ msgstr "iba waypointy"
msgid "track and waypoints"
msgstr "stopy a waypointy"
+msgid "Click to download"
+msgstr "Kliknite pre stiahnutie"
+
+msgid "Click to cancel"
+msgstr "Kliknite pre zrušenie"
+
+msgid "Download from OSM along this track"
+msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
+
msgid "Calculating Download Area"
msgstr "Výpočet oblasti na stiahnutie"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí "
-"dát.<br>Chcete pokračovať?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Prednačítať mapové podklady pozdĺž tejto stopy"
@@ -9481,14 +9716,14 @@ msgstr "gps značka"
msgid "marker"
msgid_plural "markers"
-msgstr[0] "značka"
-msgstr[1] "značky"
-msgstr[2] "značiek"
+msgstr[0] "značiek"
+msgstr[1] "značka"
+msgstr[2] "značky"
msgid "{0} consists of {1} marker"
msgid_plural "{0} consists of {1} markers"
-msgstr[0] "{0} pozostáva z {1} značky"
-msgstr[1] "{0} pozostáva z {1} značiek"
+msgstr[0] "{0} pozostáva z {1} značiek"
+msgstr[1] "{0} pozostáva z {1} značky"
msgstr[2] "{0} pozostáva z {1} značiek"
msgid "No existing audio markers in this layer to offset from."
@@ -9550,17 +9785,12 @@ msgstr ""
msgid "(URL was: "
msgstr "(URL bolo: "
-msgid "Error displaying URL"
-msgstr "Chyba zobrazovania URL"
-
msgid "Select the map painting styles"
msgstr "Vybrať štýl kreslenia mapy"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Upozornenie: Nepodarilo sa načítať Mappaint štýly od ''{0}''. Výnimka bola: "
-"{1}"
+"Nepodarilo sa načítať štýl kreslenia mapy z \"{0}\". Výnimka bola: {1}"
msgid "loading style ''{0}''..."
msgstr "nahrávam štýl ''{0}''..."
@@ -9572,19 +9802,18 @@ msgid_plural ""
"There were {0} errors when loading this style. Select ''Info'' from the "
"right click menu for details."
msgstr[0] ""
-"Došlo k chybe pri načítaní tohto štýlu. Vyberte ''Info'' pre podrobnosti, "
-"kliknutím pravého tlačítka na myši ."
-msgstr[1] ""
"Došlo k {0} chybám pri načítaní tohto štýlu. Vyberte ''Info'' pre "
-"podrobnosti, kliknutím pravého tlačítka na myši ."
+"podrobnosti, kliknutím pravého tlačítka na myši."
+msgstr[1] ""
+"Došlo k {0} chybe pri načítaní tohto štýlu. Vyberte ''Info'' pre "
+"podrobnosti, kliknutím pravého tlačítka na myši."
msgstr[2] ""
"Došlo k {0} chybám pri načítaní tohto štýlu. Vyberte ''Info'' pre "
-"podrobnosti, kliknutím pravého tlačítka na myši ."
+"podrobnosti, kliknutím pravého tlačítka na myši."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
-"Upozornenie: nepodarilo sa spracovať Mappaint štýly z ''{0}''. Chyba bola: "
-"{1}"
+"Nepodarilo sa prečítať štýl kreslenia mapy z \"{0}\". Chyba bola: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Nesprávna kresba prerušovanej čiary, hodnoty musia byť kladné"
@@ -9594,17 +9823,16 @@ msgstr ""
"Nesprávna kresba prerušovanej čiary, aspoň jedna hodnota musí byť > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Upozornenie: nepodarilo sa spracovať Mappaint štýly z ''{0}''. Chyba bola: "
-"[{1}:{2}] {3}"
+"Nepodarilo sa prečítať štýl kreslenia mapy z \"{0}\". Chyba bola: [{1}:{2}] "
+"{3}"
msgid "Access Token Key:"
msgstr "Kľúč autorizačného prístupu:"
msgid "Access Token Secret:"
-msgstr "Skrytý autorizačný prístup:"
+msgstr "Heslo autorizačného prístupu:"
msgid "Save Access Token in preferences"
msgstr "Uložiť autorizačný prístup v nastaveniach"
@@ -9621,10 +9849,10 @@ msgid "Use default settings"
msgstr "Použiť štandardné nastavenia"
msgid "Consumer Key:"
-msgstr "Užívateľský kľúč:"
+msgstr "Používateľský kľúč:"
msgid "Consumer Secret:"
-msgstr "Skrytý užívateľ:"
+msgstr "Používateľské heslo:"
msgid "Request Token URL:"
msgstr "URL požiadavky prístupu:"
@@ -9645,11 +9873,11 @@ msgid ""
"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
"current custom settings are not saved.</html>"
msgstr ""
-"<html> JOSM sa chystá obnoviť OAuth nastavenia na predvolené hodnoty. <br> "
-"Aktuálne vlastné nastavenia sa neukladajú. </ html>"
+"<html> JOSM sa chystá obnoviť OAuth nastavenia na predvolené "
+"hodnoty.<br>Aktuálne vlastné nastavenia sa neukladajú.</html>"
msgid "Overwrite custom OAuth settings?"
-msgstr "Prepísať užívateľské nastavenia OAuth?"
+msgstr "Prepísať používateľské nastavenia OAuth?"
msgid "Fully automatic"
msgstr "Úplne automatický"
@@ -9666,10 +9894,10 @@ msgid ""
"fully<br>automatically authorizes the user and retrieves an Access "
"Token.</html>"
msgstr ""
-"<html> Spustiť plne automatický postup na získanie autorizačného prístupu z "
-"webových stránok OSM. <br> JOSM pristupuje na OSM webové stránky s menom "
-"užívateľa JOSM, plne <br> automaticky oprávňuje užívateľa a získa "
-"autorizovaný prístup. </ html >"
+"<html>Spustiť plne automatický postup na získanie autorizačného prístupu z "
+"webových stránok OSM.<br>JOSM pristupuje na OSM webové stránky s menom "
+"používateľa JOSM, plne<br>automaticky oprávňuje používateľa a získa "
+"autorizačný prístup.</html>"
msgid ""
"<html>Run a semi-automatic procedure to get an access token from the OSM "
@@ -9678,18 +9906,18 @@ msgid ""
"external browser<br>to authenticate itself and to accept the request token "
"submitted by JOSM.</html>"
msgstr ""
-"<html> Beh polo-automatického postupu získať autorizovaný prístup z webových "
-"stránok OSM. <br> JOSM podá štandardné OAuth žiadosti o získanie povolenia "
-"prístupu cez <br> autorizovaný prístup. Užívateľ zašle na webové stránky OSM "
-"v externom prehliadači <br> overí sám a prijme žiadosť pre prístup "
-"predloženú programom JOSM. </ Html>"
+"<html>Beh polo-automatického postupu získať autorizačný prístup z webových "
+"stránok OSM.<br>JOSM podá štandardné OAuth žiadosti o získanie povolenia "
+"prístupu cez<br>autorizačný prístup. Používateľ zašle na webové stránky OSM "
+"v externom prehliadači<br>overí sám a prijme žiadosť pre prístup predloženú "
+"programom JOSM.</html>"
msgid ""
"<html>Enter an Access Token manually if it was generated and retrieved "
"outside<br>of JOSM.</html>"
msgstr ""
-"<html> Zadajte autorizačný prístup ručne, ak bol vygenerovaný a získaný "
-"externe <br> na JOSM. </ html>"
+"<html>Zadajte autorizačný prístup ručne, ak bol vygenerovaný a získaný "
+"externe<br>na JOSM.</html>"
msgid ""
"Please enter your OSM user name and password. The password will "
@@ -9697,13 +9925,13 @@ msgid ""
"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
"data upload requests don''t use your password any more."
msgstr ""
-"Prosím, zadajte svoje OSM užívateľské meno a heslo. Heslo <strong> "
-"nemôže</strong> byť uložené vo formáte obyčajného textu v JOSM preferenciách "
-"a bude predložené na OSM server<strong>iba raz</strong>. Pre nasledujúce "
-"nahratie údajov už viac heslo nebude potrebné."
+"Prosím, zadajte svoje OSM používateľské meno a heslo. Heslo "
+"<strong>nebude</strong> uložené vo formáte obyčajného textu v JOSM "
+"preferenciách a bude predložené na OSM server<strong>iba raz</strong>. Pre "
+"nasledujúce nahratie údajov už viac heslo nebude potrebné."
msgid "Username: "
-msgstr "Meno užívateľa: "
+msgstr "Meno používateľa: "
msgid "Password: "
msgstr "Heslo: "
@@ -9712,7 +9940,7 @@ msgid ""
"<strong>Warning:</strong> JOSM does login <strong>once</strong> using a "
"secure connection."
msgstr ""
-"<strong> Upozornenie: </strong> JOSM sa prihlásil <strong>iba jeden "
+"<strong>Upozornenie:</strong> JOSM sa prihlási <strong>iba jeden "
"raz</strong> pomocou zabezpečeného pripojenia."
msgid "Granted rights"
@@ -9729,9 +9957,9 @@ msgid ""
"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
"in subsequent requests to gain access to the OSM API.</html>"
msgstr ""
-"<html> Úspešne ste získal OAuth autorizačný prístup z webových stránok OSM. "
-"Kliknite na <strong> {0} </ strong> prijatý prístup. JOSM sa bude používať "
-"pri následných žiadostiach získať prístup k OSM API. </ Html>"
+"<html>Úspešne ste získal OAuth autorizačný prístup z webových stránok OSM. "
+"Kliknite na <strong>{0}</strong> prijatý prístup. JOSM sa bude používať pri "
+"následných žiadostiach získať prístup k OSM API.</html>"
msgid "Authorize now"
msgstr "Povoliť teraz"
@@ -9750,11 +9978,12 @@ msgid "Test Access Token"
msgstr "Test autorizačného prístupu"
msgid "Please enter your OSM user name"
-msgstr "Prosím vložte vaše OSM užívateľské meno"
+msgstr "Prosím vložte vaše OSM po užívateľské meno"
msgid "The user name cannot be empty. Please enter your OSM user name"
msgstr ""
-"Meno užívateľ nemôže byť prázdne. Prosím vložte vaše OSM užívateľské meno"
+"Meno používateľa nemôže byť prázdne. Prosím vložte vaše OSM používateľské "
+"meno"
msgid "Please enter your OSM password"
msgstr "Prosím vložte vaše OSM heslo"
@@ -9797,14 +10026,14 @@ msgid ""
msgstr ""
"<html>Automatický proces pre získanie OAuth autorizačného prístupu<br>z OSM "
"servera prebehol neúspešne. JOSM neúspešne vstúpil do záznamu {0}<br>pre "
-"užívateľa {1}.<br><br>Skontrolujte meno a heslo užívateľa a skúste "
+"používateľa {1}.<br><br>Skontrolujte meno a heslo používateľa a skúste "
"znovu.</html>"
msgid ""
"Please enter an OAuth Access Token which is authorized to access the OSM "
"server ''{0}''."
msgstr ""
-"Zadajte prosím OAuth autorizovaný prístup, ktorý je oprávnený k prístupu k "
+"Zadajte prosím OAuth autorizačný prístup, ktorý je oprávnený k prístupu k "
"serveru OSM ''{0}''."
msgid "Access Token"
@@ -9823,8 +10052,8 @@ msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
-"<html> <body> Zadajte prosím OAuth autorizačný prístup, ktorý je oprávnený k "
-"prístupu k serveru OSM ''{0}''.</ body> </ html>"
+"<html><body>Zadajte prosím OAuth autorizačný prístup, ktorý je oprávnený k "
+"prístupu k serveru OSM ''{0}''.</body></html>"
msgid "Please enter an Access Token Key"
msgstr "Prosím, zadajte Kľúč autorizačného prístupu"
@@ -9836,14 +10065,14 @@ msgstr ""
"autorizačného prístupu"
msgid "Please enter an Access Token Secret"
-msgstr "Prosím, zadajte Skrytý autorizačný prístup"
+msgstr "Prosím, zadajte Heslo autorizačného prístupu"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
"Secret"
msgstr ""
-"Skrytý autorizačný prístup nesmie byť prázdny. Prosím, zadajte skrytý "
-"autorizačný prístup"
+"Heslo autorizačného prístupu nesmie byť prázdne. Prosím, zadajte heslo "
+"autorizačného prístupu"
msgid "Click to test the Access Token"
msgstr "Kliknite na Autorizačný prístup"
@@ -9853,13 +10082,13 @@ msgid ""
"your behalf (<a href=\"{0}\">more info...</a>)."
msgstr ""
"S OAuth dávate programu JOSM právo vkladať dáta máp a GPS stopy na váš účet "
-"(<a href=\"{0}\"> viac info ...</ a>)."
+"(<a href=\"{0}\"> viac info ...</a>)."
msgid "Please select an authorization procedure: "
msgstr "Prosím, vyberte autorizačnú procedúru: "
msgid "Get an Access Token for ''{0}''"
-msgstr "Získať autorizovaný prístup pre ''{0}''"
+msgstr "Získať autorizačný prístup pre ''{0}''"
msgid "Close the dialog and cancel authorization"
msgstr "Zatvorte dialóg a zrušiť povolenie"
@@ -9867,14 +10096,14 @@ msgstr "Zatvorte dialóg a zrušiť povolenie"
msgid "Close the dialog and accept the Access Token"
msgstr "Zatvorte dialóg a prijmite autorizačný prístup"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Varovanie: Nepodarilo sa zrušiť bežiacu OAuth operáciu"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Nepodarilo sa zrušiť bežiacu OAuth operáciu"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Získavam OAuth žiadosť prístupu z ''{0}''"
msgid "Retrieving OAuth Access Token from ''{0}''"
-msgstr "Získavam OAuth autorizovaný prístup z ''{0}''"
+msgstr "Získavam OAuth autorizačný prístup z ''{0}''"
msgid "OSM website did not return a session cookie in response to ''{0}'',"
msgstr "OSM stránka nevrátila session cookie v reakcii na ''{0}'',"
@@ -9882,7 +10111,7 @@ msgstr "OSM stránka nevrátila session cookie v reakcii na ''{0}'',"
msgid ""
"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
msgstr ""
-"Nepodarilo sa overiť užívateľa ''{0}'' s heslom''***'' ako užívateľa OAuth"
+"Nepodarilo sa overiť používateľa ''{0}'' s heslom''***'' ako užívateľa OAuth"
msgid "Failed to authorize OAuth request ''{0}''"
msgstr "Nepodarilo sa povoliť OAuth žiadosť ''{0}''"
@@ -9894,7 +10123,7 @@ msgid "Initializing a session at the OSM website..."
msgstr "Inicializojem sedenie na internetovej stránke OSM ..."
msgid "Authenticating the session for user ''{0}''..."
-msgstr "Overovanie sedenia pre užívateľa ''{0}'' ..."
+msgstr "Overovanie sedenia pre používateľa ''{0}'' ..."
msgid "Authorizing request token ''{0}''..."
msgstr "Povoľujem žiadosť prístupu ''{0}''..."
@@ -9938,12 +10167,18 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
"Zvoľte udelenie programu JOSM právo zapisovať vaše nastavenia servera"
-msgid "Retrieving OAuth Access Token..."
+msgid "Allow modifications of notes"
+msgstr "Povoliť zmeny poznámok (notes)"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Povolenie umožní JOSM meniť poznámky podľa Vašich pokynov"
+
+msgid "Retrieving OAuth Access Token..."
msgstr "Získavam OAuth autorizačný prístup ..."
msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
msgstr ""
-"<html> Získavanie OAuth autorizovaného prístupu z ''{0}'' zlyhalo. </ html>"
+"<html>Získavanie OAuth autorizačnýho prístupu z ''{0}'' zlyhalo.</html>"
msgid "Request Failed"
msgstr "Požiadavka neúspešná"
@@ -9952,8 +10187,7 @@ msgid "Retrieving OAuth Request Token..."
msgstr "Získavam OAuth žiadosť prístupu ..."
msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr ""
-"<html> Získavanie OAuth žiadosti prístupu z ''{0}'' zlyhalo. </ html>"
+msgstr "<html>Získavanie OAuth žiadosti prístupu z ''{0}'' zlyhalo.</html>"
msgid "Display Advanced OAuth Parameters"
msgstr "Zobraziť pokročilé parametre OAuth"
@@ -9965,14 +10199,14 @@ msgid ""
"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
"Token from ''{1}''.</html>"
msgstr ""
-"<html> Kliknite prosím na <strong>{0} </ strong> načítať OAuth žiadosť "
-"prístupu z ''{1}''.</ html>"
+"<html>Kliknite prosím na <strong>{0}</strong> načítať OAuth žiadosť prístupu "
+"z ''{1}''.</html>"
msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr "<html> Krok 1 / 3: Nahrať OAuth žiadosť prístupu </ html>"
+msgstr "<html>Krok 1 / 3: Nahrať OAuth žiadosť prístupu</html>"
msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr "<html> Krok 2 / 3: povoliť a získať autorizačný prístup </ html>"
+msgstr "<html>Krok 2 / 3: povoliť a získať autorizačný prístup</html>"
msgid "Request Access Token"
msgstr "Požiadať o autorizačný prístup"
@@ -9986,30 +10220,28 @@ msgid ""
"copy the following authorize URL and paste it into the address field of your "
"browser.</html>"
msgstr ""
-"<html> JOSM úspešne získal žiadosť prístupu. JOSM teraz spúšťa registračnú "
-"stránku v externom prehliadači. Prosím, prihláste sa svojím OSM užívateľským "
-"meno a heslom a postupujte podľa pokynov ako povoliť žiadosť prístupu. Potom "
-"sa prepnite späť do dialógu a kliknite na <strong> {0} </ strong> <br> Ak "
-"spustenie externého prehliadača sa nedarí, môžete skopírovať nasledujúcu "
-"povoľovaciu URL a vložte ju do adresného riadku prehliadača. < / html>"
+"<html>JOSM úspešne získal žiadosť prístupu. JOSM teraz spúšťa registračnú "
+"stránku v externom prehliadači. Prosím, prihláste sa svojím OSM "
+"používateľským meno a heslom a postupujte podľa pokynov ako povoliť žiadosť "
+"prístupu. Potom sa prepnite späť do dialógu a kliknite na "
+"<strong>{0}</strong><br><br>Ak spustenie externého prehliadača sa nedarí, "
+"môžete skopírovať nasledujúcu povoľovaciu URL a vložte ju do adresného "
+"riadku prehliadača.</html>"
msgid "Go back to step 1/3"
-msgstr "Vráťte sa na krok 1/3"
+msgstr "Vráťte sa na krok 1 / 3"
msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr "<html> Krok 3 / 3: Úspešne získaný autorizačný prístup </ html>"
+msgstr "<html>Krok 3 / 3: Úspešne získaný autorizačný prístup</html>"
msgid ""
"<html>JOSM has successfully retrieved an Access Token. You can now accept "
"this token. JOSM will use it in the future for authentication and "
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-"<html> JOSM úspešne získal autorizačný prístup. Teraz môžete prijať tento "
+"<html>JOSM úspešne získal autorizačný prístup. Teraz môžete prijať tento "
"prístup. JOSM ho bude používať v budúcnosti pre autentifikáciu a autorizáciu "
-"na server OSM. <br> Autorizačný prístup je: </ html>"
-
-msgid "Restart"
-msgstr "Reštartovať"
+"na server OSM.<br>Autorizačný prístup je:</html>"
msgid "Click to retrieve a Request Token"
msgstr "Kliknite na tlačidlo pre načítanie žiadosti o prístup"
@@ -10025,12 +10257,12 @@ msgstr "Testovanie OAuth autorizačného prístupu"
msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
msgstr ""
-"Získavam detaily užívateľa s kľúčom autorizačného prístupu''{0}'', ktorý bol "
-"zamietnutý."
+"Získavam detaily používateľa s kľúčom autorizačného prístupu''{0}'', ktorý "
+"bol zamietnutý."
msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
msgstr ""
-"Získavam detaily užívateľa s kľúčom autorizačného prístupu''{0}'', bol "
+"Získavam detaily používateľa s kľúčom autorizačného prístupu''{0}'', bol "
"zakázaný."
msgid ""
@@ -10038,9 +10270,9 @@ msgid ""
"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
"''{3}''.</html>"
msgstr ""
-"<html> Úspešne použitý autorizačný prístup ''{0}'' pre <br> prístup OSM "
-"server na ''{1}'' .< br> Pristupujete na OSM server ako užívateľ ''{2}'' s "
-"id ''{3}''.</ html>"
+"<html>Úspešne použitý autorizačný prístup ''{0}'' pre<br>prístup OSM server "
+"na ''{1}'' .<br>Pristupujete na OSM server ako používateľ ''{2}'' s id "
+"''{3}''.</html>"
msgid "Success"
msgstr "Hotovo"
@@ -10051,6 +10283,9 @@ msgid ""
"not<br>be able to access any protected resource on this server using this "
"token.</html>"
msgstr ""
+"<html>Nepodaril sa prístup na OSM server ''{0}''<br>s autorizačným prístupom "
+"''{1}''.<br>Server zamietol autorizačný prístup ako neautorizovaný. Nebudete "
+"môcť<br>pristupovať k žiadnemu chránenému obsahu na tomto serveri.</html>"
msgid "Test failed"
msgstr "Test neúspešný"
@@ -10062,11 +10297,11 @@ msgid ""
"nevertheless use it<br>to upload data, upload GPS traces, and/or access "
"other protected resources.</html>"
msgstr ""
-"<html> Autorizovaný prístup ''{1}'' je známy, pre server OSM ''{0}''.< br> "
-"Aj keď sa test pre načítanie užívateľských údajov pre tento prístup "
-"nepodaril. <br> V závislosti na tom, sú poskytnuté iba niektoré práva na "
-"tento prístup, môžete napriek tomu použiť <br> vkladať dáta, nahrávať GPS "
-"stopy, a / alebo získať prístup k ďalším chráneným zdrojom. </ html>"
+"<html>Autorizačný prístup ''{1}'' je serveru OSM ''{0}'' známy.<br>Napriek "
+"tomu sa test načítania používateľských údajov pre tento prístup "
+"nepodaril.<br>V závislosti na tom, aké sú poskytnuté práva na tento prístup, "
+"môžete ho použiť<br>na vkladanie dát, nahrávanie GPS stopy, a / alebo získať "
+"prístup k ďalším chráneným zdrojom.</html>"
msgid "Token allows restricted access"
msgstr "Prístup umožňuje iba obmedzený prístup"
@@ -10077,29 +10312,29 @@ msgid ""
"Access Token, but<br>rather a problem with the server configuration. "
"Carefully check the server<br>URL and your Internet connection.</html>"
msgstr ""
-"<html> Nepodarilo sa získať informácie o aktuálnom užívateľovi z OSM "
-"servera ''{0}''.< br> To asi nie je problém spôsobený testovaním "
-"autorizačného prístupu, ale <br> skôr problém s konfiguráciou servera . "
-"Starostlivo prejdite server <br> URL a vaše pripojenie k internetu. </ Html>"
+"<html>Nepodarilo sa získať informácie o aktuálnom používateľovi z OSM "
+"servera ''{0}''.<br> To asi nie je problém spôsobený testovaním "
+"autorizačného prístupu, ale<br>skôr problém s konfiguráciou servera. "
+"Starostlivo skontrolujte URL servera<br> a vaše pripojenie k "
+"internetu.</html>"
msgid ""
"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
"''{1}''.<br>The token ist probably invalid.</html>"
msgstr ""
-"<html> Nepodarilo sa podpísať žiadosť pre OSMserver ''{0}'' s prístupom "
-"''{1}''.< br> Prístup je pravdepodobne neplatný. </ html>"
+"<html>Nepodarilo sa podpísať žiadosť pre OSMserver ''{0}'' s prístupom "
+"''{1}''.<br>Prístup je pravdepodobne neplatný.</html>"
msgid ""
"<html>The test failed because the server responded with an internal "
"error.<br>JOSM could not decide whether the token is valid. Please try again "
"later.</html>"
msgstr ""
-"<html> Test sa nepodaril, pretože server odpovedal s internou chybou. <br> "
-"JOSM nemohol rozhodnúť, či prístup je platný. Skúste to znova neskôr. </ "
-"Html>"
+"<html>Test sa nepodaril, pretože server odpovedal s internou chybou.<br>JOSM "
+"nemohol rozhodnúť, či prístup je platný. Skúste to znova neskôr.</html>"
msgid "Retrieving user info..."
-msgstr "Získavam informácie o užívateľovi ..."
+msgstr "Získavam informácie o používateľovi ..."
msgid "Audio Settings"
msgstr "Nastavenia zvuku"
@@ -10207,17 +10442,18 @@ msgid ""
"The following plugin has been downloaded <strong>successfully</strong>:"
msgid_plural ""
"The following {0} plugins have been downloaded <strong>successfully</strong>:"
-msgstr[0] "Nasledujúci plugin bol <strong>úspešne</strong> stiahnutý:"
-msgstr[1] "Nasledujúce {0} pluginy boli <strong>úspešne</strong> stiahnuté:"
-msgstr[2] ""
+msgstr[0] ""
"Nasledujúcich {0} pluginov bolo <strong>úspešne</strong> stiahnutých:"
+msgstr[1] "Nasledujúci {0} plugin bol <strong>úspešne</strong> stiahnutý:"
+msgstr[2] "Nasledujúce {0} pluginy boli <strong>úspešne</strong> stiahnuté:"
msgid "Downloading the following plugin has <strong>failed</strong>:"
msgid_plural ""
"Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] "Sťahovanie nasledujúceho pluginu bolo <strong>neúspešné</strong>:"
-msgstr[1] ""
+msgstr[0] ""
"Sťahovanie nasledujúcich {0} pluginov bolo <strong>neúspešné</strong>:"
+msgstr[1] ""
+"Sťahovanie nasledujúceho {0} pluginu bolo <strong>neúspešné</strong>:"
msgstr[2] ""
"Sťahovanie nasledujúcich {0} pluginov bolo <strong>neúspešné</strong>:"
@@ -10231,7 +10467,7 @@ msgid "Plugin update policy"
msgstr "Metóda aktualizácie pluginov"
msgid "Accept the new plugin sites and close the dialog"
-msgstr "Súhlasiť s novým umiestnením pluginu a zavrieť dialóg"
+msgstr "Súhlasiť s novým umiestnením pluginu a zavrieť dialóg"
msgid "Configure Plugin Sites"
msgstr "Konfigurovať umiestnenie pluginov"
@@ -10297,6 +10533,9 @@ msgstr "Stiahnuť pluginy"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM."
+msgid "Would you like to restart now?"
+msgstr "Prajete si teraz reštartovať?"
+
msgid "Remote Control"
msgstr "Vzdialené ovládanie"
@@ -10320,7 +10559,7 @@ msgid ""
"not configurable because it is referenced by external applications talking "
"to JOSM."
msgstr ""
-"JOSM načúva na localhost <b>porte 8111</b>. <br> Tento port nie je "
+"JOSM načúva na localhost <b>porte 8111</b>.<br>Tento port nie je "
"konfigurovateľný, pretože naň spoliehajú externé aplikácie používajúce JOSM."
msgid "Enable remote control"
@@ -10428,6 +10667,12 @@ msgstr "Odstrániť z panela nástrojov"
msgid "Configure toolbar"
msgstr "Konfigurácia panela nástrojov"
+msgid "Edit shortcut"
+msgstr "Upraviť skratku"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Neskrývať nástroje a menu"
+
msgid "Actions"
msgstr "Akcie"
@@ -10462,14 +10707,16 @@ msgid "Strange toolbar value: {0}"
msgstr "Podivná hodnota panela nástrojov: {0}"
msgid "Toolbar action {0} overwritten: {1} gets {2}"
-msgstr "Akcia panela nástrojov {0} prepísaná: {1} dostaneme {2}"
+msgstr "Akcia panela nástrojov {0} prepísaná: {1} dostaneme {2}"
msgid "Registered toolbar action without name: {0}"
msgstr "Registrovaná akcia panela nástrojov bez mena: {0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
-msgstr ""
-"Registrovaná akcia panela nástrojov {0} prepísaná: {1} dostaneme {2}"
+msgstr "Registrovaná akcia panela nástrojov {0} prepísaná: {1} dostaneme {2}"
+
+msgid "Toolbar: {0}"
+msgstr "Nástrojová lišta: {0}"
msgid "Data validator"
msgstr "Overovanie dát"
@@ -10478,7 +10725,7 @@ msgid ""
"An OSM data validator that checks for common errors made by users and editor "
"programs."
msgstr ""
-"Kontrolór OSM údajov, hľadajúci najčastejšie chyby urobené užívateľmi a "
+"Kontrolór OSM údajov, hľadajúci najčastejšie chyby urobené používateľmi a "
"programami."
msgid "Use ignore list."
@@ -10486,7 +10733,7 @@ msgstr "Použiť zoznam nekontrolovaných chýb."
msgid "Use the ignore list to suppress warnings."
msgstr ""
-"Použiť zoznam nekontrolovaných chýb, pre zastavenie(schovanie) upozornení "
+"Použiť zoznam nekontrolovaných chýb, pre zastavenie (schovanie) upozornení "
"(varovaní)."
msgid "Use error layer."
@@ -10496,13 +10743,13 @@ msgid "Use the error layer to display problematic elements."
msgstr "Použitie vrstvy chýb pre zobrazenie problematických elementov."
msgid "Show informational level."
-msgstr "Zobraziť informačnú úroveň."
+msgstr "Zobraziť hlásenia informačnej úrovne."
msgid "Show the informational tests."
-msgstr "Zobraziť informačnú úroveň."
+msgstr "Zobraziť hlásenia informačných testov."
msgid "Show informational level on upload."
-msgstr "Zobraziť informačnú úroveň(level) pri nahrávaní."
+msgstr "Zobraziť hlásenia informačnej úrovne pri nahrávaní."
msgid "Show the informational tests in the upload check windows."
msgstr "Zobraziť informačné testy v nahrávacom kontrolnom okne"
@@ -10523,26 +10770,14 @@ msgid "Search: "
msgstr "Hľadať: "
msgid "Read from file"
-msgstr "Čítaťe zo súboru"
-
-msgid "Open JOSM customization file"
-msgstr "Otvoriť súbor pre prispôsobenie JOSMu"
-
-msgid "Import log"
-msgstr "Importovať log"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Tu je zhrnutie importovaného súboru. <br/>Môžete odmietnuť predvoľby "
-"zmeny stlačením tlačidla \"Cancel\" v dialógu predvolieb <br/> Ak chcete "
-"aktivovať niektoré zmeny, môže byť potrebný reštart JOSMu.</html>"
+msgstr "Čítať zo súboru"
msgid "Export selected items"
msgstr "Exportovať vybrané položky"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Vlastné nastavenia súborov JOSMu (*. Xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr ""
"Prosím vyberte niektoré kľúče predvolieb, nie sú označené ako predvolené"
@@ -10560,41 +10795,58 @@ msgstr "Pripojiť preferencie zo súboru do existujúcich hodnôt"
msgid "Replace existing values"
msgstr "Nahradiť existujúce hodnoty"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Vlastné nastavenia súborov JOSMu (*. Xml)"
+msgid "Open JOSM customization file"
+msgstr "Otvoriť súbor pre prispôsobenie JOSMu"
-msgid "Advanced Background: Changed"
-msgstr ""
+msgid "Import log"
+msgstr "Importovať log"
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
+"<html>Tu je zhrnutie importovaného súboru. <br/>Môžete odmietnuť predvoľby "
+"zmeny stlačením tlačidla \"Cancel\" v dialógu predvolieb <br/> Ak chcete "
+"aktivovať niektoré zmeny, môže byť potrebný reštart JOSMu.</html>"
-msgid "Current value is default."
-msgstr "Aktuálna hodnota je predvolená."
+msgid "shortcut"
+msgstr "skratka"
-msgid "Default value is ''{0}''."
-msgstr "Predvolená hodnota je ''{0}''."
+msgid "color"
+msgstr "farba"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Predvolená hodnota nie je známa (nastavenie nebolo doteraz použité)."
+msgid "toolbar"
+msgstr "nástrojová lišta"
-msgid "Select Setting Type:"
-msgstr "Vyberte typ nastavenia:"
+msgid "imagery"
+msgstr "mapový podklad"
-msgid "Simple"
-msgstr "Jednoduchý"
+msgid "Reset preferences"
+msgstr "Vynulovať (resetovať) nastavenia"
-msgid "List"
-msgstr "Zoznam"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Chystáte sa vymazať všetky nastavenia na ich východzie hodnoty<br />Všetky "
+"Vaše nastavenia budú vymazané: pluginy, podklady, filtre, nástroje na lište, "
+"klávesové skratky, atď. <br />Naozaj chcete pokračovať?"
-msgid "List of lists"
-msgstr "Zoznam zoznamov"
+msgid "Load profile"
+msgstr "Načítať profil"
-msgid "List of maps"
-msgstr "Zoznam máp"
+msgid "Save {0} profile"
+msgstr "Uložiť profil skupiny nastavení \"{0}\""
-msgid "Add setting"
-msgstr "Pridať nastavenie"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+"Všetky nastavenia v tejto skupine sú na východzích hodnotách, nie je čo "
+"uložiť"
+
+msgid "Choose profile file"
+msgstr "Zvoľte súbor s profilom"
msgid "Change list setting"
msgstr "Zmeniť nastavenie zoznamu"
@@ -10617,6 +10869,39 @@ msgstr "Zmeniť zoznam mapových nastavení"
msgid "Entry {0}"
msgstr "Záznam {0}"
+msgid "Select Setting Type:"
+msgstr "Vyberte typ nastavenia:"
+
+msgid "Simple"
+msgstr "Jednoduchý"
+
+msgid "List"
+msgstr "Zoznam"
+
+msgid "List of lists"
+msgstr "Zoznam zoznamov"
+
+msgid "List of maps"
+msgstr "Zoznam máp"
+
+msgid "Add setting"
+msgstr "Pridať nastavenie"
+
+msgid "Advanced Background: Changed"
+msgstr "Pokročilé pozadie: Zmenené"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Aktuálna hodnota je predvolená."
+
+msgid "Default value is ''{0}''."
+msgstr "Predvolená hodnota je ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Predvolená hodnota nie je známa (nastavenie nebolo doteraz použité)."
+
msgid "Change string setting"
msgstr "Zmeniť nastavenie reťazca"
@@ -10659,22 +10944,25 @@ msgid "Only on the head of a way."
msgstr "Iba na začiatku cesty."
msgid "Draw oneway arrows."
-msgstr "Kresliť šípky pre jednosmerné línie ."
+msgstr "Kresliť šípky pre jednosmerné línie ."
msgid "Draw segment order numbers"
msgstr "Vykresliť segmenty s poradovými číslami"
msgid "Draw boundaries of downloaded data"
-msgstr "Vykresliť ohraničujúci box stiahnutých dát"
+msgstr "Vykresliť ohraničujúci rámec stiahnutých dát"
msgid "Draw virtual nodes in select mode"
-msgstr "Vykresľovať virtuálne body v mode výberu"
+msgstr "Vykresliť virtuálne body v mode výberu"
msgid "Draw inactive layers in other color"
-msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
+msgstr "Vykresliť neaktívne vrstvy v iných farbách"
+
+msgid "Display discardable keys"
+msgstr "Zobrazovať zbytočné kľúče"
msgid "Highlight target ways and nodes"
-msgstr "Zvýrazniť cieľové cesty a uzly"
+msgstr "Zvýrazniť cieľové cesty a body"
msgid "Draw rubber-band helper line"
msgstr "Kresliť rubber-band pomocnú čiaru"
@@ -10683,7 +10971,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "Vyhladené mapy (antialiasing)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr ""
+msgstr "Vyhladiť mapy v režime drôtového modelu (antialiasing)"
msgid "Draw only outlines of areas"
msgstr "Kresliť iba obrysy plôch"
@@ -10720,9 +11008,11 @@ msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
msgstr ""
+"Aplikovať vyhladzovanie (antialiasing) v režime drôtového modelu pre "
+"jemnejšie zobrazenie."
msgid "Hightlight target nodes and ways while drawing or selecting"
-msgstr "Zvýrazniť cieľové uzly a cesty počas kreslenia alebo výberu"
+msgstr "Zvýrazniť cieľové body a cesty počas kreslenia alebo výberu"
msgid ""
"This option suppresses the filling of areas, overriding anything specified "
@@ -10731,14 +11021,21 @@ msgstr ""
"Táto možnosť potlačí vypĺňanie oblastí, prevažujúce čokoľvek uvedené vo "
"vybranom štýle."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Zobraziť kľúče, ktoré sú považované za tak nepodstatné, že môžu byť "
+"automaticky odstránené."
+
msgid "Options that affect drawing performance"
msgstr "Možnosti, ktoré ovplyvnia výkonnosť kreslenia"
msgid "Segment drawing options"
-msgstr ""
+msgstr "Možnosti kreslenia segmentov"
msgid "Select and draw mode options"
-msgstr ""
+msgstr "Možnosti výberu a kreslenia"
msgid "Other options"
msgstr "Ďalšie voľby"
@@ -10821,7 +11118,7 @@ msgid "Dynamic color range based on data limits"
msgstr "Dynamický rozsah farieb na dátové limity"
msgid "Smooth GPX graphics (antialiasing)"
-msgstr ""
+msgstr "Vyhladiť GPX grafiku (antialiasing)"
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -10889,13 +11186,14 @@ msgstr "Kresliaca šírka čiar GPX"
msgid ""
"Apply antialiasing to the GPX lines resulting in a smoother appearance."
msgstr ""
+"Aplikovať vyhladzovanie (antialiasing) na čiary GPX pre jemnejšie zobrazenie."
msgid ""
"All points and track segments will have the same color. Can be customized in "
"Layer Manager."
msgstr ""
"Všetky body a traťové segmenty budú mať tú istú farbu. Môžete ju prispôsobiť "
-"v manažéri vrstiev."
+"v manažéri vrstiev."
msgid "Colors points and track segments by velocity."
msgstr "Farby bodov traťových segmentov podľa rýchlosti."
@@ -10966,7 +11264,7 @@ msgstr ""
"Zobraziť tlačidla v pravej časti menu iba vtedy, keď je myš vo vnútri prvku"
msgid "Look and Feel"
-msgstr "Vzhľad a chovanie"
+msgstr "Vzhľad a správanie"
msgid "Language"
msgstr "Jazyk"
@@ -10984,25 +11282,30 @@ msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
"level: {1} or {2}<br>reversed zoom level: {3}"
msgstr ""
+"{0} je nahradené úrovňou priblíženia; tiež je podporované:<br>rozdiel oproti "
+"úrovni priblíženia: {1} alebo {2}<br>obrátená úroveň priblíženia: {3}"
msgid "{0} is replaced by X-coordinate of the tile"
-msgstr ""
+msgstr "{0} je nahradené súradnicou X dlaždice"
msgid "{0} is replaced by Y-coordinate of the tile"
-msgstr ""
+msgstr "{0} je nahradené súradnicou Y dlaždice"
msgid "{0} is replaced by {1} (Yahoo style Y coordinate)"
-msgstr ""
+msgstr "{0} je nahradené {1} (štýl Y súradníc Yahoo)"
msgid ""
"{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
"coordinate)"
msgstr ""
+"{0} je nahradené {1} (štýl Y súradníc OSGeo Tile Map Service Specification)"
msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
"e.g. {1}"
msgstr ""
+"{0} je nahradené náhodným výberom z daného zoznamu oddeleného čiarkou, napr. "
+"{1}"
msgid "2. Enter maximum zoom (optional)"
msgstr "2. Zadajte maximálny zoom (voliteľné)"
@@ -11014,7 +11317,7 @@ msgid "4. Enter name for this layer"
msgstr "4. Zadajte názov pre túto vrstvu"
msgid "Store WMS endpoint only, select layers at usage"
-msgstr ""
+msgstr "Uložiť iba koncové body WMS, vrstvy zvolíte až pri použití"
msgid "Show bounds"
msgstr "Zobraziť hranice"
@@ -11023,13 +11326,19 @@ msgid "1. Enter service URL"
msgstr "1. Zadajte adresu URL služby"
msgid "Get layers"
-msgstr ""
+msgstr "Získať vrstvy"
msgid "2. Select layers"
-msgstr ""
+msgstr "2. Vyberte vrstvy"
-msgid "3. Verify generated WMS URL"
-msgstr ""
+msgid "3. Select image format"
+msgstr "3. Vyberte formát obrázka"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Overte vytvorený WMS URL"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Zadajte názov pre túto vrstvu"
msgid "Show Bounds"
msgstr "Zobraziť hranice"
@@ -11086,7 +11395,7 @@ msgid "Selected entries:"
msgstr "Vybrané položky:"
msgid "Add a new {0} entry by entering the URL"
-msgstr ""
+msgstr "Pridať novú položku {0} zadaním URL"
msgid "Remove entry"
msgstr "Odstrániť položku"
@@ -11143,7 +11452,7 @@ msgid "Max. zoom level: "
msgstr "Max. úroveň priblíženia: "
msgid "Add to slippymap chooser: "
-msgstr "Pridať do výberu slippymap: "
+msgstr "Pridať do výberu posúvacej mapy: "
msgid "Tile cache directory: "
msgstr "Vyrovnávacia pamäť dlaždíc adresára: "
@@ -11159,7 +11468,7 @@ msgid "Downloader:"
msgstr "Stahovač:"
msgid "Simultaneous connections:"
-msgstr ""
+msgstr "Súbežné pripojenia:"
msgid "Overlap tiles"
msgstr "Prekryť štvorce (tiles)"
@@ -11205,6 +11514,12 @@ msgstr ""
"<i>(JOSM môže zachovať záložný súbor pri ukladaní dátovej vrstvy. Pripojí "
"''~'' k názvu súboru a uloží ho v rovnakom priečinku.)</i>"
+msgid "Notification at each save"
+msgstr "Oznámenie pri každom uložení"
+
+msgid "When saving, display a small notification"
+msgstr "Zobraziť malé oznámenie pri ukladaní"
+
msgid "File backup"
msgstr "Zálohovať súbor"
@@ -11250,7 +11565,8 @@ msgstr ""
msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
msgstr ""
-"Varovanie: neplatný formát počtu v štýle obsahu ''{0}''. Dostal som ''{1}''"
+"Varovanie: neplatný formát počtu v štýle obsahu \"{0}\". Obdržaná hodnota je "
+"\"{1}\""
msgid "JOSM Internal Style"
msgstr "Interný štýl JOSMu"
@@ -11272,8 +11588,8 @@ msgstr "Nastavenie mapy"
msgid "Settings for the map projection and data interpretation."
msgstr "Nastavenie projekcie mapy a interpretácie dát."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Varovanie: Nemožno čítať zdroj predvolieb označovania: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11352,13 +11668,13 @@ msgid ""
"<html>Failed to load the list of preset sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
-"<html>Nepodarilo sa načítať zoznam prednastavených zdrojov z<br>''{0}''.<br> "
-"<br> Detaily (nepreložené):<br> {1} </html>"
+"<html>Nepodarilo sa načítať zoznam prednastavených zdrojov z "
+"<br>''{0}''.<br><br>Detaily (nepreložené):<br>{1}</html>"
msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
msgstr ""
-"Varovanie: Nedovolený formát zápisu do prednastaveného zoznamu ''{0}''. Máte "
-"''{1}''"
+"Varovanie: nepovolený formát zápisu v zozname predvoliem \"{0}\". Obdržaná "
+"hodnota je \"{1}\""
msgid "Internal Preset"
msgstr "Vnútorné Prednastavenie"
@@ -11378,8 +11694,9 @@ msgstr ""
msgid "Plugin {0} is still required by this plugin:"
msgid_plural "Plugin {0} is still required by these {1} plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Plugin {0} je stále používaný týmito {1} pluginmi:"
+msgstr[1] "Plugin {0} je stále používaný týmto {1} pluginom:"
+msgstr[2] "Plugin {0} je stále používaný týmito {1} pluginmi:"
msgid "{0}: Version {1} (local: {2})"
msgstr "{0}: Verzia {1} (súčasná: {2})"
@@ -11414,31 +11731,31 @@ msgstr ""
"určitej dobe."
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "Podľa kódu (EPSG)"
msgid "Invalid projection configuration: {0}"
msgstr "Neplatná konfigurácia projekcie : {0}"
msgid "Projection configuration is valid."
-msgstr "Konfigurácia projekcie je platná."
+msgstr "Konfigurácia projekcie je platná."
msgid "Validate"
msgstr "Overiť"
msgid "Parameter information..."
-msgstr ""
+msgstr "Informácie o parametroch..."
msgid "Parameter information"
-msgstr ""
+msgstr "Informácie o parametroch"
msgid "Projection name"
-msgstr ""
+msgstr "Názov projekcie"
msgid "Supported values:"
msgstr "Podporované hodnoty:"
msgid "Projection parameters"
-msgstr ""
+msgstr "Parametre projekcie"
msgid "False easting and false northing"
msgstr "Zlé smerovanie na východ a sever"
@@ -11450,25 +11767,25 @@ msgid "Scaling factor"
msgstr "Koeficient zväčšenia"
msgid "Ellipsoid name"
-msgstr ""
+msgstr "Názov elipsoidu"
msgid "Ellipsoid parameters"
-msgstr ""
+msgstr "Parametre elipsoidu"
msgid "Datum name"
-msgstr ""
+msgstr "Názov údaju"
msgid "3 or 7 term datum transform parameters"
-msgstr ""
+msgstr "Transformačné parametre pre 3- alebo 7-výrazový údaj"
msgid "NTv2 grid file"
-msgstr ""
+msgstr "Súbor mriežky NTv2"
msgid "Built-in:"
-msgstr ""
+msgstr "Zabudované:"
msgid "Projection bounds (in degrees)"
-msgstr ""
+msgstr "Hranice projekcie (v stupňoch)"
msgid "Gauß-Krüger"
msgstr "Gauß-Krüger"
@@ -11551,21 +11868,6 @@ msgstr "Swiss Grid (Švajčiarsko)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (bez lokálnych opráv)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zone"
-
-msgid "North"
-msgstr "Sever"
-
-msgid "South"
-msgstr "Juh"
-
-msgid "Hemisphere"
-msgstr "Pologuľa(hemisféra)"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -11587,6 +11889,21 @@ msgstr "UTM France (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM Geodesic system"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zone"
+
+msgid "North"
+msgstr "Sever"
+
+msgid "South"
+msgstr "Juh"
+
+msgid "Hemisphere"
+msgstr "Pologuľa(hemisféra)"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Testovanie OSM API URL ''{0}''"
@@ -11604,8 +11921,8 @@ msgid ""
"<html>Failed to build URL ''{0}'' for validating the OSM API "
"server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
-"<html> Nepodarilo sa doplniť URL ''{0}'' pre overenie OSM API servera. <br> "
-"Skontrolujte prosím váš text ''{1}'' a overte znova. </ html>"
+"<html>Nepodarilo sa doplniť URL ''{0}'' pre overenie OSM API "
+"servera.<br>Skontrolujte prosím váš text ''{1}'' a overte znova.</html>"
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
@@ -11641,7 +11958,7 @@ msgstr "Použiť základné overenie totožnosti"
msgid ""
"Select to use HTTP basic authentication with your OSM username and password"
msgstr ""
-"Vybrať pre použitie HTTP základné overenie totožnosti s vašim užívateľským "
+"Vybrať pre použitie HTTP základné overenie totožnosti s Vašim používateľským "
"menom a heslom"
msgid "Use OAuth"
@@ -11651,49 +11968,57 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Vybrať pre použitie OAuth ako mechanizmus na overenie totožnosti"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
+"Nepodporovaná hodnota v nastavení \"{0}\", obdržaná hodnota je \"{1}\". "
+"Použije sa \"Základné overenie totožnosti\"."
msgid "OSM username:"
-msgstr "OSM užívateľské meno:"
+msgstr "OSM používateľské meno:"
msgid "OSM password:"
msgstr "OSM heslo:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
-"Varovanie: Nepodarilo sa získať OSM poverenie od poverovacieho správcu."
+"Nepodarilo sa získať prihlasovacie údaje pre OSM zo správcu prihlasovacích "
+"údajov."
msgid "Current credential manager is of type ''{0}''"
-msgstr "Aktuálny správca poverenia je typu ''{0}''"
+msgstr "Aktuálny správca prihlasovacích údajov je typu ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-"Varovanie: Nepodarilo sa uložiť OSM poverenie pre poverovacieho správcu."
+"Nepodarilo sa uložiť prihlasovacie údaje pre OSM do správcu prihlasovacích "
+"údajov."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr "Pravidelne kontrolovať nové správy"
+
+msgid "Check interval (minutes):"
+msgstr "Interval kontroly (minúty):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-"Varovanie: Nepodarilo sa získať OAuth autorizovaný prístup z poverovacieho "
-"správcu"
+"Nepodarilo sa získať OAuth autorizačný prístup zo správcu prihlasovacích "
+"údajov"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
-"Varovanie: Nepodarilo sa uložiť OAuth autorizovaný prístup pre poverovacieho "
-"správcu"
+"Nepodarilo sa uložiť OAuth autorizačný prístup do správcu prihlasovacích "
+"údajov"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
"Please authorize first."
msgstr ""
-"Nemáte ešte autorizovaný prístup pre prístup k OSM serveru pomocou OAuth. "
-"Prosím najskôr povoliť."
+"Nemáte ešte autorizačný prístup pre prístup k OSM serveru pomocou OAuth. "
+"Prosím najskôr sa autorizujte."
msgid ""
"You already have an Access Token to access the OSM server using OAuth."
-msgstr ""
-"Už máte autorizovaný prístup pre prístup k OSM serveru pomocou OAuth."
+msgstr "Už máte autorizačný prístup pre prístup k OSM serveru pomocou OAuth."
msgid "Save to preferences"
msgstr "Uložiť do nastavení"
@@ -11717,7 +12042,7 @@ msgstr ""
msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
msgstr ""
-"<html> Použiť predvolené URL OSM servera (<strong>{0}</strong>) </html>"
+"<html> Použiť predvolené URL OSM servera (<strong>{0}</strong>)</html>"
msgid "Test the API URL"
msgstr "Test URL API:"
@@ -11747,7 +12072,7 @@ msgstr "Port:"
msgid ""
"Please enter a username and a password if your proxy requires authentication."
msgstr ""
-"Zadajte prosím užívateľské meno a heslo, ak váš proxy server vyžaduje "
+"Zadajte prosím používateľské meno a heslo, ak váš proxy server vyžaduje "
"autentifikáciu."
msgid "Password:"
@@ -11764,7 +12089,7 @@ msgid ""
"Djava.net.useSystemProxies=true</tt> to enable)"
msgstr ""
"Použite štandardné nastavenia systému (vypnuté. Štart JOSM s <tt>-"
-"Djava.net.useSystemProxies = true </ tt>, pre zapnutie)"
+"Djava.net.useSystemProxies = true</tt>, pre zapnutie)"
msgid "Manually configure a HTTP proxy"
msgstr "Manuálne nastavenie HTTP proxy servera"
@@ -11773,24 +12098,17 @@ msgid "Use a SOCKS proxy"
msgstr "Použiť SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Upozornenie: JOSM je nakonfigurovaný pre použitie proxy servera z nastavenia "
-"systému, ale JVM nie je nakonfigurovaný tak, aby ho získaval. Resetujte "
-"nastavenia pre ''Bez proxy servera''"
-
-msgid "disabled"
-msgstr "vypnuté"
-
-msgid "no modifier"
-msgstr "bez modifikácie"
+"JOSM je nastavený na používanie proxy z nastavenia systému, avšak JVM nie je "
+"nastavená na ich prevzatie. Nastavenie sa resetuje na \"Bez proxy servera\""
msgid "Shortcut Background: User"
-msgstr ""
+msgstr "Pozadie skratky: Používateľ"
msgid "Shortcut Background: Modified"
-msgstr ""
+msgstr "Pozadie skratky: Zmenené"
msgid "Use default"
msgstr "Použíť východzie"
@@ -11828,42 +12146,47 @@ msgstr "Zmazať výber v tabuľke značiek"
msgid "Add a new tag"
msgstr "Pridať novú značku"
-msgid "Select auto-increment of {0} for this field"
-msgstr ""
+msgid "Paste tags from buffer"
+msgstr "Vložiť značky zo zásobníka"
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Použiť prednastavenie \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Elementy typu(druhu) {0} sú podporované."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Poškodené prednastavenie tagovania \"{0}-{1}\" - počet položiek v "
-"''display_values'' musí byť rovnaký ako vo ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Zmeniť {0} objektov"
+msgstr[1] "Zmeniť {0} objekt"
+msgstr[2] "Zmeniť {0} objekty"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Poškodené prednastavenie tagovania \"{0}-{1}\" - počet položiek v "
-"''short_descriptions'' musí byť rovnaký ako vo ''values''"
+msgid "Nothing selected!"
+msgstr "Nič nie je vybraté!"
-msgid "More information about this feature"
-msgstr "Viac informácii o tejto vlastnosti"
+msgid "Selection unsuitable!"
+msgstr "Nevhodný výber!"
+
+msgid "Apply Preset"
+msgstr "Použiť predvolené"
+
+msgid "New relation"
+msgstr "Nová relácia"
+
+msgid "Change Tags"
+msgstr "Upraviť značky"
msgid "Unknown requisite: {0}"
msgstr "Neznámy žiadaný: {0}"
msgid "Illegal member expression: {0}"
-msgstr ""
+msgstr "Nepovolený členský výraz: {0}"
+
+msgid "More information about this feature"
+msgstr "Viac informácií o tejto vlastnosti"
msgid "Available roles"
msgstr "Dostupné úlohy"
@@ -11880,53 +12203,52 @@ msgstr "prvky"
msgid "Optional Attributes:"
msgstr "Voliteľné atribúty:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
+msgid "Select auto-increment of {0} for this field"
+msgstr "Zvoliť automatické zvyšovanie {0} pre toto pole"
-msgid "Use preset ''{0}''"
-msgstr "Použiť prednastavenie \"{0}\""
+msgid "Cancel auto-increment for this field"
+msgstr "Zrušiť automatické zvyšovanie pre toto pole"
-msgid "Unknown type: {0}"
-msgstr "Neznány type (druh): {0}"
+msgid "{0}:"
+msgstr "{0}:"
-msgid "Roles cannot appear more than once"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
+"Varovanie v prednastavení tagovania \"{0}-{1}\": Ignoruje sa atribút ''{2}'' "
+"pretože boli zadané elementy ''{3}''"
-msgid "Preset role element without parent"
-msgstr "Prednastavené úlohy prvkom, bez materských"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Chybné prednastavenie tagovania \"{0}-{1}\" - Java metóda zadaná v "
+"''values_from'' nie je \"{2}\""
-msgid "Preset sub element without parent"
-msgstr "Prednastavený sub prvok bez materských"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Chybné prednastavenie tagovania \"{0}-{1}\" - Java metóda zadaná v "
+"''values_from'' vrátila výnimku {2} ({3})"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Poškodené prednastavenie tagovania \"{0}-{1}\" - počet položiek v "
+"''display_values'' musí byť rovnaký ako vo ''values''"
-msgid "Error parsing {0}: "
-msgstr "Chyba rozkladania(parsovania) {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Poškodené prednastavenie tagovania \"{0}-{1}\" - počet položiek v "
+"''short_descriptions'' musí byť rovnaký ako vo ''values''"
-msgid "Elements of type {0} are supported."
-msgstr "Elementy typu(druhu) {0} sú podporované."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Zmeniť {0} objekty"
-msgstr[1] "Zmeniť {0} objekt"
-msgstr[2] "Zmeniť {0} objektov"
-
-msgid "Nothing selected!"
-msgstr "Nič nie je vybraté!"
-
-msgid "Selection unsuitable!"
-msgstr "Nevhodný výber!"
-
-msgid "Apply Preset"
-msgstr "Použiť predvolené"
-
-msgid "New relation"
-msgstr "Nová relácia"
-
-msgid "Change Properties"
-msgstr "Zmeniť vlastnosti"
+msgid "Unknown type: {0}"
+msgstr "Neznány type (druh): {0}"
msgid "Preset group {1} / {0}"
msgstr "Prednastavená skupina {1} / {0}"
@@ -11934,11 +12256,23 @@ msgstr "Prednastavená skupina {1} / {0}"
msgid "Preset group {0}"
msgstr "Prednastavená skupina {0}"
+msgid "Roles cannot appear more than once"
+msgstr "Role sa nesmú vyskytovať viackrát"
+
+msgid "Preset role element without parent"
+msgstr "Prednastavené úlohy prvkom, bez materských"
+
+msgid "Preset sub element without parent"
+msgstr "Prednastavený sub prvok bez materských"
+
+msgid "Error parsing {0}: "
+msgstr "Chyba rozkladania(parsovania) {0}: "
+
msgid "Search preset"
msgstr "Hľadať prednastavenia"
msgid "Show preset search dialog"
-msgstr "Zobraziť vyhľadávací dialóg prednastavení"
+msgstr "Zobraziť vyhľadávací dialóg prednastavení"
msgid "Search presets"
msgstr "Hľadať prednastavenia"
@@ -11949,6 +12283,16 @@ msgstr "Zobraziť iba použiteľné pre výber"
msgid "Search in tags"
msgstr "Hľadať v značkách"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Nastaviteľný {0} ešte neregistrovaný. Nemôžem nastaviť spoluúčasť v "
+"nastavení synchronizácie."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Nastaviteľný {0} ešte neregistrovaný."
+
msgid "All files (*.*)"
msgstr "Všetky súbory (*.*)"
@@ -11982,6 +12326,60 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr "Súčasná hodnota nie je platná OSM ID. Zadajte prosím celé číslo > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "nepravda (false): vlastnosť je jasne (výslovne) deaktivovaná"
+
+msgid "true: the property is explicitly switched on"
+msgstr "pravda (true): vlastnosť je jasne (výslovne) aktivovaná"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+"čiastočné (partial): vybrané objekty majú rôzne hodnoty, ktoré nebudú zmenené"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "nenastavené (unset): nenastaviť túto vlastnosť na vybrané objekty"
+
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+msgid "Right click = copy to clipboard"
+msgstr "Pravý klik = skopírovať do schránky"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Chýbajúce povinné vlastnosti ''{0}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Nepovolená hodnota pre povinný atribút \"{0}\" typu \"long\". Obdržaná "
+"hodnota je \"{1}\""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Nepovolená hodnota pre povinný atribút \"{0}\" typu \"long\" (>=0). Obdržaná "
+"hodnota je \"{1}\""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Chybná hodnota v atribúte \"{0}\" typu \"double\". Obdržaná hodnota je "
+"\"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Nedovolená hodnota pre povinný atribút \"{0}\" typu \"boolean\". Obdržaná "
+"hodnota je \"{1}\"."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Nedovolená hodnota pre povinný atribút \"{0}\" typu \"OsmPrimitiveType\". "
+"Obdržaná hodnota je \"{1}\"."
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11994,15 +12392,15 @@ msgid ""
"Way {0} with {1} nodes has incomplete nodes because at least one node was "
"missing in the loaded data."
msgstr ""
-"Cesta {0} s {1} bodmi neobsahuje všetky body, pretože aspoň jeden bod "
-"chýbal v nahratých dátach."
+"Cesta {0} s {1} bodmi neobsahuje všetky body, pretože aspoň jeden bod chýbal "
+"v nahratých dátach."
msgid ""
"Relation with external id ''{0}'' refers to a missing primitive with "
"external id ''{1}''."
msgstr ""
-"Relácia s externou id ''{0}'' odkazuje na chýbajúce pôvodné s externou id "
-"''{1}''."
+"Relácia s externým id ''{0}'' odkazuje na chýbajúci základný objekt s "
+"externou id ''{1}''."
msgid "Deleted member {0} is used by relation {1}"
msgstr "Vymazaný člen {0} je použitý v relácii {1}"
@@ -12017,32 +12415,34 @@ msgid "Contacting OSM Server..."
msgstr "Pripája sa na OSM Server..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Upozornenie: Neplatná hodnota atribútu ''{0}'' z elementu ''{1}'' v "
-"schopnosti servera. Dostal som ''{2}''"
+"Nepovolená hodnota atribútu \"{0}\" prvku \"{1}\" v schopnostiach servera. "
+"Obdržaná hodnota je \"{2}\""
msgid "Failed to parse date ''{0}'' replied by server."
-msgstr "Neúspešné rozloženie údajov ''{0}'' odpovedal server."
+msgstr "Nerozumiem dátumu \"{0}\" v odpovedi servera."
msgid ""
"Unexpected format of error header for conflict in changeset update. Got "
"''{0}''"
msgstr ""
"Nečakaný chybný formát záhlavia pre konflikt v aktualizácii súboru zmien. "
-"Dostal som ''{0}''"
+"Obdržaná hodnota je ''{0}''"
msgid "Illegal longitude value for parameter ''{0}'', got {1}"
-msgstr "Neplatná hodnota parametra zem. dĺžky ''{0}'', dostal som {1}"
+msgstr ""
+"Neplatná hodnota parametra zem. dĺžky \"{0}\", obdržaná hodnota je {1}"
msgid "Illegal latitude value for parameter ''{0}'', got {1}"
-msgstr "Neplatná hodnota parametra zem. šírky ''{0}'', dostal som {1}"
+msgstr ""
+"Neplatná hodnota parametra zem. šírky \"{0}\", obdržaná hodnota je {1}"
msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
msgstr ""
-"Neočakávaná hodnota pre ''{0}'' v URL požiadavke zmevého súboru, dostal "
-"som{1}"
+"Neočakávaná hodnota pre \"{0}\" v URL požiadavke zmenového súboru, obdržaná "
+"hodnota je {1}"
msgid ""
"Cannot create a changeset query including both the query parameters ''uid'' "
@@ -12053,55 +12453,55 @@ msgstr ""
msgid "Unsupported parameter ''{0}'' in changeset query string"
msgstr ""
-"Nepodporovaný parameter ''{0}'' v reťazci požiadavky zmenového súboru"
+"Nepodporovaný parameter ''{0}'' v reťazci požiadavky zmenového súboru"
msgid ""
"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
-msgstr "Neočakávaný formát pre číslo portu v nastavení ''{0}''. Mám ''{1}''."
+msgstr ""
+"Neočakávaný formát pre číslo portu v nastavení \"{0}\". Obdržaná hodnota je "
+"\"{1}\"."
msgid "The proxy will not be used."
msgstr "Proxy server nebude použitý."
msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr "Chybné číslo portu v nastavení ''{0}''. Mám {1}."
+msgstr "Chybné číslo portu v nastavení \"{0}\". Obdržaná hodnota je {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Varovanie: Našla sa neočakávaná hodnota nastavenia ''{0}'' . Mám ''{1}''. "
-"Bude použité bez proxy servera."
+"Neočakávaná hodnota nastavenia \"{0}\". Obdržaná hodnota je \"{1}\". Proxy "
+"server nebude použitý."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Varovanie: Neočakávaný parametre pre HTTP proxy server. Mám hostiteľa "
-"''{0}'' a port ''{1}''."
+"Neočakávaný parameter pre HTTP proxy. Obdržaná hodnota servera je \"{0}\" a "
+"portu \"{1}\"."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Varovanie: Neočakávaný parameter pre SOCKS proxy. Dostal som hostiteľa "
-"''{0}'' a port ''{1}''."
+"Neočakávaný parameter pre SOCKS proxy. Obdržaná hodnota servera je \"{0}\" a "
+"portu \"{1}\"."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Chyba: Pripojenie k proxy ''{0}'' pre URI ''{1}'' zlyhalo. Výnimka bola: {2}"
+"Pripojenie na proxy server \"{0}\" pre URI \"{1}\" sa nepodarilo. Výnimka "
+"bola: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Upozornenie: JVM nie je nakonfigurovaný tak, aby vyhľadával nastavenia "
-"systému proxy servera. Vlastnosť ''java.net.useSystemProxies'' chýbala pri "
-"štarte. Nebude použitý proxy server."
+"JVM nie je nastavená na prevzatie proxy z nastavení systému. Vlastnosť "
+"''java.net.useSystemProxies'' pri štarte chýbala. Proxy nebude použitý."
msgid "Parsing response from server..."
-msgstr "Spracovávam odpoveď servera ..."
+msgstr "Spracovávam odpoveď servera ..."
msgid "Unexpected XML element with name ''{0}''"
msgstr "Neočakávaný XML element s názvom ''{0}''"
@@ -12116,10 +12516,10 @@ msgid "Could not import files."
msgstr "Nemôžem importovať súbory."
msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
-msgstr "<html> Nemôžem čítať súbor ''{0}''.< br> Chyba je: <br> {1}</ html>"
+msgstr "<html>Nemôžem čítať súbor ''{0}''.<br>Chyba je:<br>{1}</html>"
msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
-msgstr "<html> Nemôžem čítať. <br> Chyba je: <br> {0} </ html>"
+msgstr "<html>Nemôžem čítať.<br>Chyba je:<br>{0}</html>"
msgid "Invalid bz2 file."
msgstr "Poškodený bz2 súbor."
@@ -12200,6 +12600,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
+msgid "(at line {0}, column {1})"
+msgstr "(na riadku {0}, stĺpec {1})"
+
msgid "Unknown mode {0}."
msgstr "Neznámy mód {0}."
@@ -12215,15 +12618,24 @@ msgstr "Hľadanie obrázkov"
msgid "No image files found."
msgstr "Nenajdené žiadne obrázky."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Máte {0} neprečítaných správ."
+msgstr[1] "Máte {0} neprečítanú správu."
+msgstr[2] "Máte {0} neprečítané správy."
+
+msgid "Click here to see your inbox."
+msgstr "Kliknite sem pre zobrazenie prijatých správ."
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Nepodarilo sa otvoriť vstupný tok pre zdroj ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Upozornenie: Nepodarilo sa otvoriť súbor s príponou ''{2}'' a súbor ''{3}'' "
-"v zip súbore ''{0}''. Výnimka bola: {1}"
+"Nepodarilo sa otvoriť súbor s príponou \"{2}\" a názvom \"{3}\" v zip súbore "
+"\"{0}\". Výnimka bola: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Nepodarilo sa premenovať súbor {0} na {1}."
@@ -12236,8 +12648,8 @@ msgid ""
"Unexpected response from HTTP server. Got {0} response without ''Location'' "
"header. Can''t redirect. Aborting."
msgstr ""
-"Neočakávaná odpoveď servera HTTP. Máte {0} miesto odpovedi ''Poloha'' v "
-"záhlaví. Nemôžem presmerovať. Prerušujem."
+"Neočakávaná odpoveď servera HTTP. Obdržaná hodnota odpovede {0} bez hlavičky "
+"''Location''. Nemôžem presmerovať. Prerušujem."
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
@@ -12245,7 +12657,7 @@ msgstr ""
"Prerušujem."
msgid "Download redirected to ''{0}''"
-msgstr "Stiahnuť presmerovaný na ''{0}''"
+msgstr "Stiahovanie presmerované na ''{0}''"
msgid "Failed to read from ''{0}''. Server responded with status code {1}."
msgstr ""
@@ -12254,29 +12666,29 @@ msgstr ""
msgid ""
"No primitive with id {0} in local dataset. Cannot infer primitive type."
msgstr ""
-"Žiadne pôvodné s id {0} v miestnom dátovom súbore. Nemožno vyvodzovať "
-"pôvodné typ."
+"Žiadnu základný objekt s ID {0} v lokálnom dátovom súbore. Nemožno vyvodiť "
+"typ objektu."
msgid "Fetching a package of nodes from ''{0}''"
-msgstr "Priniesť(Fetching) balíček bodov z {0}"
+msgstr "Sťahuje sa balíček bodov z ''{0}''"
msgid "Fetching a package of ways from ''{0}''"
-msgstr "Priniesť(Fetching) balíček ciest z {0}"
+msgstr "Sťahuje sa balíček ciest z ''{0}''"
msgid "Fetching a package of relations from ''{0}''"
-msgstr "Priniesť(Fetching) balíček relácií z {0}"
+msgstr "Sťahuje sa balíček relácií z ''{0}''"
msgid "Downloading {0} object from ''{1}''"
msgid_plural "Downloading {0} objects from ''{1}''"
-msgstr[0] "Sťahovanie {0} objektu z ''{1}''"
-msgstr[1] "Sťahovanie {0} objektov z ''{1}''"
+msgstr[0] "Sťahovanie {0} objektov z ''{1}''"
+msgstr[1] "Sťahovanie {0} objektu z ''{1}''"
msgstr[2] "Sťahovanie {0} objektov z ''{1}''"
msgid ""
"Server replied with response code 404, retrying with an individual request "
"for each object."
msgstr ""
-"Server odpovedal s kódom odozvy 404, skúšam to znovu s individuálnou "
+"Server odpovedal s kódom odozvy 404, skúšam to znovu s individuálnou "
"žiadosťou pre každý objekt."
msgid "Downloading OSM data..."
@@ -12313,8 +12725,8 @@ msgstr "Neznáme vety: {0}"
msgid "Zero coordinates: {0}"
msgstr "Nulové súradnice: {0}"
-msgid "NMEA import success"
-msgstr "NMEA import úspešný"
+msgid "NMEA import success:"
+msgstr "NMEA import úspešný:"
msgid "NMEA import failure!"
msgstr "NMEA import zlyhal!"
@@ -12338,13 +12750,14 @@ msgstr ""
"Odstránená vrstva {0}, pretože to nie je povolený nakonfigurovaný API."
msgid "Unexpected format of ID replied by the server. Got ''{0}''."
-msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''"
+msgstr ""
+"Neočakávaný formát ID v odpovedi zo servera. Obdržaná hodnota je \"{0}\"."
msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
-"neočakávaný formát novej verzie zo zmenených pôvodných ''{0}'', dostáva "
-"''{1}''"
+"Neočakávaný formát novej verzie nového základného objektu \"{0}\". Obdržaná "
+"hodnota je \"{1}\"."
msgid "Creating changeset..."
msgstr "Vytváranie súboru zmien..."
@@ -12353,7 +12766,7 @@ msgid "Successfully opened changeset {0}"
msgstr "Úspešne otvorený súbor zmien {0}"
msgid "Changeset ID > 0 expected. Got {0}."
-msgstr "Zmenový súbor id > 0 očekávaný. Got {0}"
+msgstr "Očakávané ID zmenového súboru > 0. Obdržaná hodnota však bola {0}."
msgid "Updating changeset..."
msgstr "Aktualizácia súboru zmien..."
@@ -12374,7 +12787,7 @@ msgid "Waiting 10 seconds ... "
msgstr "Čakanie 10 sekúnd ... "
msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr "Začiatok opakovania {0} z {1} v {2} sekunde ..."
+msgstr "Opakovanie {0} z {1} začne o {2} sekúnd ..."
msgid "OK - trying again."
msgstr "OK - skúšam znovu."
@@ -12389,7 +12802,9 @@ msgid "ID of current changeset > 0 required. Current ID is {0}."
msgstr "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}."
msgid "Open changeset expected. Got closed changeset with id {0}."
-msgstr "Otvoriť očakávaný zmenový súbor. Got zavretý zmenový súbor s id {0}"
+msgstr ""
+"Očakával sa otvorený zmenový súbor. Obdržaný bol však uzavretý zmenový súbor "
+"s ID {0}."
msgid "(Code={0})"
msgstr "(Kód={0})"
@@ -12414,50 +12829,20 @@ msgid "File ''{0}'' does not exist."
msgstr "Súbor \"{0}\" neexistuje"
msgid "No data found in file {0}."
-msgstr "V súbore neboli nájdené žiadne dáta {0}."
+msgstr "V súbore neboli nájdené žiadne dáta {0}."
msgid "Open OsmChange file"
msgstr "Otvoriť súbor OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Chýbajúce povinné vlastnosti ''{0}''."
-
msgid "Unsupported version: {0}"
msgstr "Nepodporovaná verzia: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"nedovolená hodnota pre povinný atribút ''{0}'' typu long , dostáva ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"nedovolená hodnota pre povinný atribút ''{0}'' typu long (>=0), dostáva "
-"''{1}''"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"nedovolená hodnota pre povinný atribút ''{0}'' typu boolean, dostáva ''{1}''"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"nedovolená hodnota pre povinný atribút ''{0}'' typu OsmPrimitiveType, "
-"dostáva ''{1}''"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Upozornenie: Nepodporovaný začiatočný prvok ''{0}'' v obsahu zmenového "
-"súboru na pozícii ({1},{2}). Vynechávam."
+"Nepodporovaný začiatočný prvok \"{0}\" v obsahu zmenového súboru na pozícii "
+"({1},{2}). Vynechávam."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12467,23 +12852,25 @@ msgstr ""
"''vytvoriť'','' zmeniť'', alebo odstrániť''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Upozornenie: Nepodporovaný koncový prvok ''{0}'' v obsahu zmenového súboru "
-"na pozícii ({1},{2}). Vynechávam."
+"Nepodporovaný koncový prvok \"{0}\" v obsahu zmenového súboru na pozícii "
+"({1},{2}). Vynechávam."
msgid "Parsing changeset content ..."
msgstr "Rozkladanie obsahu zmenového súboru ..."
msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr "chybné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
+msgstr "Neplatná hodnota pre vlastnosť \"{0}\". Obdržaná hodnota je \"{1}\"."
msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr "Chybná číselná hodnota atribútu ''{0}''. Mám ''{1}''."
+msgstr ""
+"Chybná číselná hodnota atribútu \"{0}\". Obdržaná hodnota je \"{1}\"."
msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "chybné booleovské hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
+msgstr ""
+"Chybná logická hodnota pre vlastnosť \"{0}\". Obdržaná hodnota je \"{1}\"."
msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
msgstr "Chýbajúca povinná vlastnosť ''{0}'' z XML prvku {1}."
@@ -12498,11 +12885,9 @@ msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
"Nepodarilo sa podpísať HTTP spojenie s hlavičkou OAuth autentifikácie"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "Varovanie: Neočakávaná hodnota preferencie ''{0}''. Mám ''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(v rade {0}, stĺpec {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Unexpected value for preference \"{0}\". Obdržaná hodnota je \"{1}\"."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr ""
@@ -12515,9 +12900,6 @@ msgstr ""
"<html>Nejaká chyba nastala počas obnovy záložného súboru.<br>Chyba je: "
"<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Nemôžem zálohovať súbor. Výnimka je: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Súbory servera skomprimované v gzip"
@@ -12539,12 +12921,15 @@ msgstr "Nenašli sa žiadne dáta v súbore ''{0}''."
msgid "Open OSM file"
msgstr "Otvoriť OSM súbor"
+msgid "Reading was canceled"
+msgstr "Čítanie bolo zrušené"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
msgstr ""
-"Chýbajú povinné atribúty pre element''hranice''. Máte minlon =''{0}'',minlat "
-"=''{1}'',maxlon =''{3}'',maxlat =''{4}'', pôvod =''{5}''."
+"Chýbajú povinné atribúty pre element''hranice''. Obdržané hodnoty sú minlon "
+"=''{0}'',minlat =''{1}'',maxlon =''{3}'',maxlat =''{4}'', pôvod =''{5}''."
msgid "Deleted way {0} contains nodes"
msgstr "Vymazaná cesta {0} obsahuje body"
@@ -12553,7 +12938,8 @@ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
msgstr "Chýba povinná vlastnosť ''{0}'' na <nd> z cesty {1}"
msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
-msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Got {0}"
+msgstr ""
+"Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Obdržaná hodnota je {0}."
msgid "Deleted relation {0} contains members"
msgstr "Zmazaná relácia {0} obsahuje členy"
@@ -12564,7 +12950,8 @@ msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
msgid ""
"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
msgstr ""
-"Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
+"Neplatná hodnota pre vlastnosť \"ref\" pre člena v relácii {0}. Obdržaná "
+"hodnota je {1}"
msgid "Missing attribute ''type'' on member {0} in relation {1}."
msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
@@ -12572,13 +12959,14 @@ msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
msgid ""
"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
msgstr ""
-"Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}."
+"Neplatná hodnota vre vlastnosť \"type\" pre člena {0} v relácii {1}. "
+"Obdržaná hodnota je {2}."
msgid "Incomplete <member> specification with ref=0"
msgstr "Nekompletné <member> špecifikácie s ref=0"
msgid "Missing key or value attribute in tag."
-msgstr "Chýbajúce kľúče alebo hodnoty atribútu v tagu."
+msgstr "Chýbajúci kľúč alebo hodnota v značke."
msgid "Undefined element ''{0}'' found in input stream. Skipping."
msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam."
@@ -12590,36 +12978,39 @@ msgid ""
"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
"{1}."
msgstr ""
-"Neplatná hodnota pre vlastnosť ''verzia'' na OSM pôvodné s id {0}. Got {1}"
+"Neplatná hodnota pre vlastnosť \"version\" (verzia) na OSM základnom objekte "
+"s ID {0}. Obdržaná hodnota je {1}"
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"VAROVANIE: Normalizačná hodnota vlastnosti ''verzia'' prvkut {0} na {2}, API "
-"verzia je ''{3}''. Got {1}."
+"Normalizujem hodnotu atribútu \"version\" prvku {0} na {2}, verzia API je "
+"\"{3}\". Obdržaná hodnota je {1}."
msgid "Unknown or unsupported API version. Got {0}."
-msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}"
+msgstr "Neznáma, alebo nepodporovaná verzia API. Obdržaná hodnota je {0}."
msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}"
+msgstr ""
+"Chýba vlastnosť \"version\" (verzia) na OSM základnom objekte s ID {0}"
msgid ""
"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
"Resetting to 0."
msgstr ""
-"Chybné hodnoty atribútu ''changeset'' pre nový objekt {1}. Dostal som {0}. "
-"Resetujem na 0."
+"Chybné hodnoty atribútu \"changeset\" pre nový objekt {1}. Obdržaná hodnota "
+"je {0}. Resetujem na 0."
msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr "Chybné hodnoty atributu ''changeset''. Mám {0}."
+msgstr "Chybné hodnoty atribútu \"changeset\". Obdržaná hodnota je {0}."
msgid "Missing required attribute ''{0}''."
-msgstr "Chýba povinná vlastnosť ''{0}''."
+msgstr "Chýba povinná vlastnosť \"{0}\"."
msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
-msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
+msgstr ""
+"Neplatná dlhá hodnota pre vlastnosť \"{0}\". Obdržaná hodnota je \"{1}\""
msgid "Prepare OSM data..."
msgstr "Pripravujem OSM údaje..."
@@ -12656,9 +13047,9 @@ msgstr "Sťahujem zmenový súbor {0} ..."
msgid "Downloading {0} changeset ..."
msgid_plural "Downloading {0} changesets ..."
-msgstr[0] "Sťahujem {0} zmenový súbor ..."
-msgstr[1] "Sťahujem {0} zmenové súbory ..."
-msgstr[2] "Sťahujem {0} zmenových súborov ..."
+msgstr[0] "Sťahujem {0} zmenových súborov ..."
+msgstr[1] "Sťahujem {0} zmenový súbor ..."
+msgstr[2] "Sťahujem {0} zmenové súbory ..."
msgid "({0}/{1}) Downloading changeset {2} ..."
msgstr "({0}/{1}) Sťahujem zmenový subor {2} ..."
@@ -12682,23 +13073,25 @@ msgstr ""
"internetu."
msgid "Reading error text failed."
-msgstr ""
+msgstr "Čítanie textu chyby zlyhalo."
msgid "XML tag <user> is missing."
-msgstr "XML tag <user> chýba"
+msgstr "XML tag <user> chýba."
msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
msgstr "Chýbajúca vlastnosť ''{0}'' na XML značke(tag) ''{1}''"
msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
msgstr ""
-"Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}"
+"Neplatná hodnota pre vlastnosť \"{0}\" na XML značke (tagu) \"{1}\". "
+"Obdržaná hodnota je {2}."
msgid "Reading user info ..."
-msgstr "Čítam užívateľské info ..."
+msgstr "Čítam používateľské info ..."
msgid "Starting to upload with one request per primitive ..."
-msgstr "Zahajujem nahrávanie so žiadosťou na pôvodné ..."
+msgstr ""
+"Zahajujem nahrávanie s jednou žiadosťou pre každý základný objekt ..."
msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
msgstr "{0}% ({1}/{2}), {3} odchádza. Nahrávaný bod ''{4}'' (id: {5})"
@@ -12713,22 +13106,22 @@ msgid "Starting to upload in one request ..."
msgstr "Začínam nahrávať požiadavku ..."
msgid "Value >0 expected for parameter ''{0}'', got {1}"
-msgstr "Hodnota >0 očakávaná pre parameter ''{0}'', dostal som {1}"
+msgstr "Hodnota >0 očakávaná pre parameter \"{0}\", obdržaná hodnota je {1}"
msgid "Starting to upload in chunks..."
msgstr "Začínam presúvanie v kusoch ..."
msgid "({0}/{1}) Uploading {2} object..."
msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) Nahrávaný {2} objekt ..."
-msgstr[1] "({0}/{1}) Nahrávané {2} objekty ..."
-msgstr[2] "({0}/{1}) Nahrávaných {2} objektov ..."
+msgstr[0] "({0}/{1}) Nahrávaných {2} objektov ..."
+msgstr[1] "({0}/{1}) Nahrávaný {2} objekt ..."
+msgstr[2] "({0}/{1}) Nahrávané {2} objekty ..."
msgid "Uploading data ..."
msgstr "Nahrávam dáta ..."
msgid "Unexpected id 0 for osm primitive found"
-msgstr "Najdené neočakávané id 0 pre OSM pôvodné"
+msgstr "Najdené neočakávané id 0 pre OSM základný objekt"
msgid "WMS Files (*.wms)"
msgstr "WMS Súbory (*.wms)"
@@ -12739,35 +13132,47 @@ msgid ""
"transferred <strong>unencrypted</strong> in every request sent to the OSM "
"server. <strong>Do not use a valuable password.</strong></p></body></html>"
msgstr ""
-"<html> <body> <p class=\"warning-body\"> <strong>Upozornenie: </strong> "
-"Heslo je uložené vo formáte obyčajného textu v JOSM súbore nastavení. Okrem "
-"toho sa prevádza <strong>nešifrované</strong> v každej žiadosti zaslanej na "
-"server OSM. <strong> Nepoužívajte cenné hesla. </strong></p></body></html>"
+"<html> <body> <p class=\"warning-body\"> <strong>Upozornenie:</strong> Heslo "
+"je uložené vo formáte obyčajného textu v JOSM súbore nastavení. Okrem toho "
+"sa prevádza <strong>nešifrované</strong> v každej žiadosti zaslanej na "
+"server OSM. <strong>Nepoužívajte cenné heslo.</strong></p></body></html>"
msgid "Save user and password (unencrypted)"
msgstr "Uložiť meno a heslo (nešifrovane)"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<vymazať z {0} objektov>"
+
+msgid "Old values of"
+msgstr "Staré hodnoty"
msgid "Add tags to selected objects"
-msgstr "Pridať tagy do vybraných objektov"
+msgstr "Pridať značky do vybraných objektov"
msgid "Add selected tags"
-msgstr "Pridať vybrané tagy"
+msgstr "Pridať vybrané značky"
msgid "Add all tags"
-msgstr "Pridať všetky tagy"
+msgstr "Pridať všetky značky"
msgid "Add checked tags to selected objects"
-msgstr "Pridať zaškrtnuté tagy do vybraných objektov"
+msgstr "Pridať zaškrtnuté značky do vybraných objektov"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr "Shift+Enter: Pridať všetky tagy do vybraných objektov"
+msgstr "Shift+Enter: Pridať všetky značky do vybraných objektov"
msgid "Assume"
msgstr "Prevziať"
+msgid "Existing values"
+msgstr "Súčasné hodnoty"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Hodnotu prijmete zaškrtnutím políčka"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Prijať všetky značky z {0} pre toto sedenie"
+
msgid "Load data from API"
msgstr "Načítať dáta z API"
@@ -12792,20 +13197,24 @@ msgstr "Vytvoriť nové objekty"
msgid "Read protocol version"
msgstr "Prečítať si protokol verzie"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
+"Nepodarilo sa spustiť server pre diaľkové ovládanie na porte {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "Diaľkové ovládanie::Prijímam priojenia na porte {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "Diaľkové ovládanie::Server zastavený."
msgid "Remote Control has been asked to create a new node."
-msgstr "Vzdialená Správa s spýtala na vytvorenie nového bodu."
+msgstr "Diaľkové ovládanie bolo požiadané o vytvorenie nového bodu."
msgid "There is no layer opened to add node"
msgstr "Pre pridanie bodu nie je otvorená žiadna vrstva"
-msgid "Add way"
-msgstr "Pridať cestu"
-
msgid "Remote Control has been asked to create a new way."
-msgstr ""
+msgstr "Diaľkové ovládanie bolo požiadané o vytvorenie novej cesty."
msgid "Invalid coordinates: {0}"
msgstr "Neplatné súradnice: {0}"
@@ -12813,29 +13222,49 @@ msgstr "Neplatné súradnice: {0}"
msgid "There is no layer opened to add way"
msgstr "Pre pridanie cesty nie je otvorená žiadna vrstva"
+msgid "Add way"
+msgstr "Pridať cestu"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+"Diaľkové ovládanie bolo požiadané o nahlásenie podporovaných funkcií. To "
+"umožňuje webovej stránke odhadnúť verziu bežiaceho JOSM"
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
msgstr ""
-"Diaľkové ovládanie požiadalo, o načítanie vrstvy mapových podkladov z "
+"Diaľkové ovládanie bolo požiadané o načítanie vrstvy mapových podkladov z "
"nasledujúcej adresy:"
msgid "Remote imagery"
msgstr "Diaľkové mapové podklady"
msgid "Remote Control has been asked to import data from the following URL:"
-msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:"
+msgstr "Diaľkové ovládanie bolo požiadané o import dát z nasledujúcej URL:"
msgid "Remote Control has been asked to load data from the API."
-msgstr "Vzdialená kontrola požiadala o načítanie dát z API."
+msgstr "Diaľkové ovládanie bolo požiadané o načítanie dát z API."
+
+msgid "The latitudes must be between {0} and {1}"
+msgstr "Zemepisná šírka musí byť medzi {0} a {1}"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "Zemepisná dĺžka musí byť medzi {0} a {1}"
+
+msgid "The minima must be less than the maxima"
+msgstr "Minimá musia byť menšie ako maximá"
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
msgstr ""
+"Diaľkové ovládanie bolo požiadané o načítanie objektov (podľa ich ID) z API."
msgid "Remote Control has been asked to open a local file."
-msgstr ""
+msgstr "Diaľkové ovládanie bolo požiadané o otvorenie lokálneho súboru."
msgid "Do you want to allow this?"
msgstr "Chcete toto povoliť?"
@@ -12847,13 +13276,14 @@ msgid ""
"Remote Control has been asked to report its protocol version. This enables "
"web sites to detect a running JOSM."
msgstr ""
-"Diaľkový ovládač bol požiadaný, aby hlásil verziu protokolu. To umožňuje "
+"Diaľkové ovládanie bolo požiadané o nahlásenie verziu protokolu. To umožňuje "
"webovej stránke zistiť či beží JOSM."
msgid ""
"Version ''{0}'' of meta data for geoimage layer is not supported. Expected: "
"0.1"
msgstr ""
+"Verzia ''{0}'' metadát vrstvy geoimage nie je podporovaná. Očakávaná: 0.1"
msgid "Data:"
msgstr "Dáta:"
@@ -12861,25 +13291,25 @@ msgstr "Dáta:"
msgid "local file"
msgstr "lokálny súbor"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Odkaz na súbor OSM dát na Vašom lokálnom disku."
+msgid "Link to a GPX file on your local disk."
+msgstr "Odkaz na súbor GPX na lokálnom disku."
msgid "include"
msgstr "zahrnúť"
-msgid "Include OSM data in the .joz session file."
-msgstr "Zahrnúť OSM dáta do .joz súboru sedenia."
+msgid "Include GPX data in the .joz session file."
+msgstr "Vložiť súbor GPX do súboru sedenia .joz."
msgid "No file association"
msgstr "Žiadna asociácia súboru"
-msgid "OSM data will be included in the session file."
-msgstr "OSM dáta budú zahrnuté v súbore sedenia."
+msgid "GPX data will be included in the session file."
+msgstr "Dáta GPX budú vložené do súboru sedenia."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
"0.1"
-msgstr ""
+msgstr "Verzia ''{0}'' metadát vrstvy gpx nie je podporovaná. Očakávaná: 0.1"
msgid "File name expected for layer no. {0}"
msgstr "Názov súboru očakávaný pre vrstvu č. {0}"
@@ -12888,6 +13318,8 @@ msgid ""
"Version ''{0}'' of meta data for imagery layer is not supported. Expected: "
"0.1"
msgstr ""
+"Verzia ''{0}'' metadát vrstvy mapových podkladov nie je podporovaná. "
+"Očakávaná: 0.1"
msgid "Layer contains unsaved data - save to file."
msgstr "Vrstva obsahuje neuložené dáta - uložiť do súboru."
@@ -12895,6 +13327,15 @@ msgstr "Vrstva obsahuje neuložené dáta - uložiť do súboru."
msgid "Layer does not contain unsaved data."
msgstr "Vrstva neobsahuje neuložené dáta."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Odkaz na súbor OSM dát na Vašom lokálnom disku."
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Zahrnúť OSM dáta do .joz súboru sedenia."
+
+msgid "OSM data will be included in the session file."
+msgstr "OSM dáta budú zahrnuté v súbore sedenia."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
@@ -12902,35 +13343,38 @@ msgstr ""
"Verzia ''{0}'' metaúdajov pre vrstvu OSM dát nie je podporovaná. Očakávala "
"sa: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Súbor sedenia (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
-msgstr "Nedá sa lokalizovať súbor ''{0}''."
+msgstr "Nedá sa lokalizovať súbor ''{0}''."
msgid "Unsupported scheme ''{0}'' in URI ''{1}''."
msgstr "Nepodporovaný režim ''{0}'' in URI ''{1}''."
msgid "Unexpected root element ''{0}'' in session file"
-msgstr ""
+msgstr "Neočakávaný koreňový element ''{0}'' v súbore sedenia"
msgid "Version ''{0}'' of session file is not supported. Expected: 0.1"
msgstr "Verzia ''{0}''súboru sedenia nie je podporovaná. Očakávala sa: 0.1"
msgid "missing mandatory attribute ''index'' for element ''layer''"
-msgstr ""
+msgstr "chýba povinný atribút ''index'' pre element ''layer''"
msgid "unexpected format of attribute ''index'' for element ''layer''"
-msgstr ""
+msgstr "neočakávaný formát atribútu ''index'' pre element ''layer''"
msgid "attribute ''index'' ({0}) for element ''layer'' must be unique"
-msgstr ""
+msgstr "atribút ''index'' ({0}) pre element ''layer'' musí byť jedinečný"
msgid "missing layer with index {0}"
msgstr "chýba vrstva s indexom {0}"
msgid "missing mandatory attribute ''name'' for element ''layer''"
-msgstr ""
+msgstr "chýba povinný atribút ''name'' pre element ''layer''"
msgid "missing mandatory attribute ''type'' for element ''layer''"
-msgstr ""
+msgstr "chýba povinný atribút ''type'' pre element ''layer''"
msgid "Unable to load layer"
msgstr "Nemožno načítať vrstvu"
@@ -12938,10 +13382,13 @@ msgstr "Nemožno načítať vrstvu"
msgid ""
"Cannot load layer of type ''{0}'' because no suitable importer was found."
msgstr ""
+"Nedá sa načítať vrstva typu \"{0}\" pretože sa nenašiel vhodný importér."
msgid ""
"Cannot load layer {0} because it depends on layer {1} which has been skipped."
msgstr ""
+"Nedá sa načítať vrstva {0} pretože závisí na vrstve {1}, ktorá však bola "
+"vynechaná."
msgid "Error loading layer"
msgstr "Chyba počas načítavania vrstvy"
@@ -12971,18 +13418,18 @@ msgid "Download skipped"
msgstr "Sťahovanie je zrušené"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Upozornenie: Nemôžem stiahnuť plugin ''{0}''. Jeho odkaz na stiahnutie nie "
-"je známy. Vynechávam zo sťahovania."
+"Nemôžem stiahnuť plugin \"{0}\". Jeho odkaz na stiahnutie nie je známy. "
+"Vynechávam zo sťahovania."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Upozornenie: Nemôžem stiahnuť plugin ''{0}''. Jeho odkaz na stiahnutie "
-"''{1}'' nie je platná URL. Vynechávam zo sťahovania."
+"Nemôžem stiahnuť plugin \"{0}\". Jeho odkaz na stiahnutie \"{1}\" nie je "
+"platná URL. Vynechávam zo sťahovania."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Nepodarilo sa vytvoriť adresár pluginov ''{0}''"
@@ -12997,18 +13444,17 @@ msgid "integrated into main program"
msgstr "integrovaný do hlavného programu"
msgid "replaced by new {0} plugin"
-msgstr "nahradené novým {0} pluginom"
+msgstr "nahradený novým pluginom {0}"
msgid "no longer required"
-msgstr ""
+msgstr "už nie je potrebný"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] "Nasledujúci plugin už nie je potrebný, a má byť deaktivovaný:"
-msgstr[1] "Nasledujúce pluginy už nie sú potrebné, a majú byť deaktivované:"
-msgstr[2] ""
-"Nasledujúcich pluginov už nie je potrebných, a majú byť deaktivované:"
+msgstr[0] "Nasledujúce pluginy už nie sú potrebné a boli deaktivované:"
+msgstr[1] "Nasledujúci plugin už nie je potrebný a bol deaktivovaný:"
+msgstr[2] "Nasledujúce pluginy už nie sú potrebné a boli deaktivované:"
msgid ""
"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -13016,15 +13462,15 @@ msgid ""
"disabled.<br>Delete from preferences?</html>"
msgstr ""
"<html>Počet {0} pluginov bolo požadovaných.<br>Tento plugin nie je naďalej "
-"vyvíjaný a veľmi pravdepodobne bude spôsobovať chyby.<br>Mal by byť "
+"vyvíjaný a veľmi pravdepodobne bude spôsobovať chyby.<br>Mal by byť "
"vyradený.<br>Zmazať z nastavení?</html>"
msgid ""
"You updated your JOSM software.<br>To prevent problems the plugins should be "
"updated as well.<br><br>Update plugins now?"
msgstr ""
-"Aktualizovali ste JOSM. <br> Aby nevznikli problémy s pluginmi, odporúčame "
-"ich tiež aktualizovať. <br> Aktualizovať pluginy teraz?"
+"Aktualizovali ste JOSM.<br>Aby nevznikli problémy s pluginmi, odporúčame ich "
+"tiež aktualizovať.<br>Aktualizovať pluginy teraz?"
msgid "Last plugin update more than {0} days ago."
msgstr "Pluginy boli naposledy aktualizované pred {0} dňami."
@@ -13069,8 +13515,8 @@ msgstr ""
msgid ""
"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
msgstr ""
-"Neočakávaná hodnota ''{0}'' pre preferencie ''{1}''. Za predpokladu, že "
-"hodnota ''ask''."
+"Neočakávaná hodnota ''{0}'' pre nastavenie ''{1}''. Bude sa predpoklať "
+"hodnota ''ask'' (spýtať sa)."
msgid ""
"Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13078,18 +13524,18 @@ msgid_plural ""
"Plugin {0} requires {1} plugins which were not found. The missing plugins "
"are:"
msgstr[0] ""
-"Plugin {0} vyžaduje plugin, ktorý nebol nájdený. Chýbajúci plugin je:"
+"Plugin {0} vyžaduje {1} pluginov, ktoré sa nenašli. Chýbajúce pluginy sú:"
msgstr[1] ""
-"Plugin {0} vyžaduje {1} pluginy, ktoré sa nenašli. Chýbajúce pluginy sú:"
+"Plugin {0} vyžaduje {1} plugin, ktorý nebol nájdený. Chýbajúci plugin je:"
msgstr[2] ""
-"Plugin {0} vyžaduje {1} pluginov, ktoré sa nenašli. Chýbajúce pluginy sú:"
+"Plugin {0} vyžaduje {1} pluginy, ktoré sa nenašli. Chýbajúce pluginy sú:"
msgid ""
"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
msgstr ""
-"<html> Plugin {0} vyžaduje verziu JOSM {1}. Súčasná verzia JOSM je {2}. <br> "
-"Musíte aktualizovať JOSM, aby využil tento plugin. </ Html>"
+"<html>Plugin {0} vyžaduje verziu JOSM {1}. Súčasná verzia JOSM je "
+"{2}.<br>Musíte aktualizovať JOSM, aby ste mohli použiť tento plugin.</html>"
msgid "Could not load plugin {0}. Delete from preferences?"
msgstr "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?"
@@ -13115,14 +13561,14 @@ msgstr "Nahrávam pluginy ''{0}''..."
msgid "JOSM could not find information about the following plugin:"
msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] "JOSM nemohol nájsť informácie o nasledujúcom plugine:"
-msgstr[1] "JOSM nemohol nájsť informácie o nasledujúcich pluginoch:"
+msgstr[0] "JOSM nemohol nájsť informácie o nasledujúcich pluginoch:"
+msgstr[1] "JOSM nemohol nájsť informácie o nasledujúcom plugine:"
msgstr[2] "JOSM nemohol nájsť informácie o nasledujúcich pluginoch:"
msgid "The plugin is not going to be loaded."
msgid_plural "The plugins are not going to be loaded."
-msgstr[0] "Plugin nebude nahratý."
-msgstr[1] "Pluginy nebudú nahraté."
+msgstr[0] "Pluginy nebudú nahraté."
+msgstr[1] "Plugin nebude nahratý."
msgstr[2] "Pluginy nebudú nahraté."
msgid "Determine plugins to load..."
@@ -13136,8 +13582,8 @@ msgstr "Odstraňujem neudržiavané pluginy ..."
msgid "Updating the following plugin has failed:"
msgid_plural "Updating the following plugins has failed:"
-msgstr[0] "Aktualizácia tohoto pluginu zlyhala:"
-msgstr[1] "Aktualizácia týchto pluginov zlyhala:"
+msgstr[0] "Aktualizácia týchto pluginov zlyhala:"
+msgstr[1] "Aktualizácia tohoto pluginu zlyhala:"
msgstr[2] "Aktualizácia týchto pluginov zlyhala:"
msgid ""
@@ -13147,10 +13593,10 @@ msgid_plural ""
"Please open the Preference Dialog after JOSM has started and try to update "
"them manually."
msgstr[0] ""
-"Prosím, otvorte Nastavenia po štarte programu JOSM a pokúste sa ho "
+"Prosím, otvorte Nastavenia po štarte programu JOSM a pokúste sa ich "
"aktualizovať ručne."
msgstr[1] ""
-"Prosím, otvorte Nastavenia po štarte programu JOSM a pokúste sa ich "
+"Prosím, otvorte Nastavenia po štarte programu JOSM a pokúste sa ho "
"aktualizovať ručne."
msgstr[2] ""
"Prosím, otvorte Nastavenia po štarte programu JOSM a pokúste sa ich "
@@ -13159,11 +13605,11 @@ msgstr[2] ""
msgid "Plugin update failed"
msgstr "Aktualizácia pluginu zlyhala"
-msgid "Warning: failed to find plugin {0}"
-msgstr ""
+msgid "Failed to find plugin {0}"
+msgstr "Nepodarilo sa nájsť plugin {0}"
-msgid "Warning: failed to download plugin information list"
-msgstr "Varovanie: Nepodarilo sa stiahnuť informáčný zoznam pluginov"
+msgid "Failed to download plugin information list"
+msgstr "Nepodarilo sa stiahnuť zoznam informácií o pluginoch"
msgid "Disable plugin"
msgstr "Vypnúť doplnok"
@@ -13177,27 +13623,28 @@ msgstr "Zachovať plugin"
msgid "Click to keep the plugin ''{0}''"
msgstr "Kliknite pre zachovanie pluginu ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Varovanie: Nepodarilo sa odstránenie zastaraných pluginov ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Nepodarilo sa odstránenie zastaraných pluginov \"{0}\"."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Varovanie: Nepodarilo sa nainštalovať už stiahnutý plugin ''{0}''. "
-"Vynechávam inštaláciu. JOSM stále používa starú verziu pluginu."
+"Nepodarilo sa nainštalovať už stiahnutý plugin \"{0}\". Vynechávam "
+"inštaláciu. JOSM bude ďalej používať starú verziu pluginu."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
+"Nepodarilo sa nainštalovať plugin \"{0}\" z dočasne stiahnutého súboru "
+"\"{1}\". {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Varovanie: Nepodarilo sa nainštalovať plugin ''{0}'' z dočasne stiahnutého "
-"súboru ''{1}''. Premenovanie zlyhalo."
+"Nepodarilo sa nainštalovať plugin \"{0}\" z dočasne stiahnutého súboru "
+"\"{1}\". Premenovanie zlyhalo."
msgid "Click to disable the plugin ''{0}''"
msgstr "Kliknite na tlačidlo vypnúť plugin ''{0}''"
@@ -13239,7 +13686,7 @@ msgstr ""
"Pluginy ak to budete chcieť neskôr zmeniť)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "Chybný jar súbor \"{0}\""
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "Súbor pluginu ''{0}'' nezahŕňa Manifest."
@@ -13248,7 +13695,7 @@ msgid "Invalid URL ''{0}'' in plugin {1}"
msgstr "Neplatná adresa URL ''{0}'' v plugine {1}"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "Chybný popis \"{0}\" v plugine {1}"
msgid "More info..."
msgstr "Viac informácií..."
@@ -13267,51 +13714,64 @@ msgid "Reading local plugin information.."
msgstr "Čítam miestne informácie o pluginoch ..."
msgid "Processing plugin site cache files..."
-msgstr "Spracovávam cache súbory stránky s pluginov ..."
+msgstr "Spracovávam cache súbory stránky pluginov..."
msgid "Processing file ''{0}''"
msgstr "Spracovanie súboru ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Upozornenie: Nepodaril sa scan súboru ''{0}'' pre informácie o pluginoch. "
-"Vynechávam."
+"V súbore \"{0}\" sa nepodarilo nájsť informácie o pluginoch. Vynechávam."
msgid "Processing plugin site cache icon files..."
-msgstr ""
+msgstr "Spracovávam cache súbory ikon stránok pluginov..."
msgid "Processing plugin files..."
-msgstr "Spracovávam sobory pluginov ..."
+msgstr "Spracovávam súbory pluginov ..."
msgid "Download plugin list..."
-msgstr "Stiahujem zoznam pluginov ..."
+msgstr "Sťahujem zoznam pluginov ..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Sťahujem zoznam pluginov z ''{0}''"
+msgid "Plugin list download error"
+msgstr "Chyba pri sťahovaní zoznamu pluginov"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM nemohol stiahnuť zoznam pluginov:"
+
+msgid "Details:"
+msgstr "Detaily:"
+
+msgid "Plugin icons download error"
+msgstr "Chyba pri sťahovaní ikon pluginov"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM nemohol stiahnuť ikony pluginov:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Varovanie: nepodarilo sa vytvoriť adresár pluginu ''{0}''. Nemožno stiahnuť "
-"obsah pluginu z webu pluginu ''{1}''."
+"Nepodarilo sa vytvoriť adresár pluginu \"{0}\". Nemožno uložiť zoznam "
+"pluginov z webu pluginov \"{1}\"."
msgid "Writing plugin list to local cache ''{0}''"
-msgstr "Zapisujem obsah pluginu do miestnej cache ''{0}''"
+msgstr "Zapisujem zoznam pluginov do miestnej cache \"{0}\""
msgid "Parsing plugin list from site ''{0}''"
-msgstr "Rozkladanie obsahu pluginu z webu ''{0}''"
+msgstr "Analyzovanie zoznamu pluginu z webu \"{0}\""
msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
msgstr ""
-"Nemožno rozložiť dokument zoznamu pluginov z umiestnenia ''{0}''. "
+"Nemožno analyzovať dokument zoznamu pluginov z umiestnenia \"{0}\" "
"Vynechávam. Výnimka bola: {1}"
msgid "Processing plugin list from site ''{0}''"
-msgstr "Spracovanie zoznamu pluginu z umiestnenia ''{0}''"
+msgstr "Spracovanie zoznamu pluginu z umiestnenia \"{0}\""
msgid "This is after the end of the recording"
msgstr "Toto je až za koncom nahrávky"
@@ -13336,9 +13796,8 @@ msgid ""
"are running the latest<br>version of JOSM, please consider being kind and "
"file a bug report."
msgstr ""
-"Došlo k neočakávanej výnimke. <br> Toto je vždy chyba kódovania. Ak "
-"používate najnovšiu verziu JOSM <br>, zvážte prosím a vyplnte hlásenie o "
-"chybe."
+"Došlo k neočakávanej výnimke.<br>Toto je vždy chyba kódovania. Ak používate "
+"najnovšiu verziu JOSM <br>, zvážte prosím a vyplnte hlásenie o chybe."
msgid "Suppress further error dialogs for this session."
msgstr "Potlačiť ďalšie chybové hlášky počas tohto sedenia."
@@ -13392,10 +13851,10 @@ msgid ""
"configured.<br>Please open the Preferences Dialog and generate or enter an "
"Access Token.</html>"
msgstr ""
-"<html> Nepodarilo sa overiť na serveri OSM ''{0}''.< br> Používate OAuth na "
-"overenie, ale v súčasnej dobe neexistuje žiadny <br>nakonfigurovaný OAuth "
-"autorizovaný prístup. <br> Prosím, otvorte dialógové okno nastavení a "
-"vytvorte, alebo zadajte autorizovaný prístup. </ html>"
+"<html>Nepodarilo sa overiť na serveri OSM ''{0}''.<br>Používate OAuth na "
+"overenie, ale v súčasnej dobe neexistuje žiadny<br>nakonfigurovaný OAuth "
+"autorizačný prístup.<br>Prosím, otvorte dialógové okno nastavení a vytvorte "
+"alebo zadajte autorizačný prístup.</html>"
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -13406,7 +13865,17 @@ msgid_plural ""
"referred to by nodes {1}.<br>Please load the nodes, remove the reference to "
"the node, and upload again."
msgstr[0] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgstr[1] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
+msgstr[2] ""
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -13417,17 +13886,17 @@ msgid_plural ""
"referred to by ways {1}.<br>Please load the ways, remove the reference to "
"the node, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>uzla {0}</strong>. Je stále "
-"odkazovaný na cestu {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie "
-"na uzol a nahrajte dáta znovu."
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>uzla {0}</strong>. Je stále "
-"odkazovaný na cesty {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie "
-"na uzol a nahrajte dáta znovu."
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z cesty {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>uzla {0}</strong>. Je stále "
-"odkazovaný na cesty {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie "
-"na uzol a nahrajte dáta znovu."
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"bod a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>node {0}</strong>. It is still "
@@ -13438,17 +13907,17 @@ msgid_plural ""
"referred to by relations {1}.<br>Please load the relations, remove the "
"reference to the node, and upload again."
msgstr[0] ""
-"<strong>Zlyhalo</strong> mazanie <strong>uzla {0}</strong>. Je stále "
-"odkazovaný na reláciu {1}.<br>Prosím, načítajte reláciu, odstráňte "
-"odkazovanie na uzol a nahrajte dáta znovu."
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na bod a nahrajte dáta znovu."
msgstr[1] ""
-"<strong>Zlyhalo</strong> mazanie <strong>uzla {0}</strong>. Je stále "
-"odkazovaný na relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na uzol a nahrajte dáta znovu."
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na bod a nahrajte dáta znovu."
msgstr[2] ""
-"<strong>Zlyhalo</strong> mazanie <strong>uzla {0}</strong>. Je stále "
-"odkazovaný na relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
-"odkazovanie na uzol a nahrajte dáta znovu."
+"<strong>Zlyhalo</strong> mazanie <strong>bodu {0}</strong>. Je stále "
+"odkazovaný z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovanie na bod a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -13460,15 +13929,15 @@ msgid_plural ""
"the way, and upload again."
msgstr[0] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na uzol {1}.<br>Prosím, načítajte uzol, odstráňte odkazovanie na "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
"cestu a nahrajte dáta znovu."
msgstr[1] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na uzly {1}.<br>Prosím, načítajte uzly, odstráňte odkazovanie na "
+"odkazovaná z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
"cestu a nahrajte dáta znovu."
msgstr[2] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na uzly {1}.<br>Prosím, načítajte uzly, odstráňte odkazovanie na "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
"cestu a nahrajte dáta znovu."
msgid ""
@@ -13481,16 +13950,16 @@ msgid_plural ""
"the way, and upload again."
msgstr[0] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na cestu {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie "
-"na cestu a nahrajte dáta znovu."
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
msgstr[1] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na cesty {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie "
-"na cestu a nahrajte dáta znovu."
+"odkazovaná z cesty {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
msgstr[2] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na cesty {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie "
-"na cestu a nahrajte dáta znovu."
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"cestu a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>way {0}</strong>. It is still "
@@ -13502,15 +13971,15 @@ msgid_plural ""
"reference to the way, and upload again."
msgstr[0] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na reláciu {1}.<br>Prosím, načítajte reláciu, odstráňte "
+"odkazovaná z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
"odkazovanie na cestu a nahrajte dáta znovu."
msgstr[1] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte reláciu, odstráňte "
"odkazovanie na cestu a nahrajte dáta znovu."
msgstr[2] ""
"<strong>Zlyhalo</strong> mazanie <strong>cesty {0}</strong>. Je stále "
-"odkazovaná na relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovaná z relácií {1}.<br>Prosím, načítajte relácie, odstráňte "
"odkazovanie na cestu a nahrajte dáta znovu."
msgid ""
@@ -13523,15 +13992,15 @@ msgid_plural ""
"the relation, and upload again."
msgstr[0] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na uzol {1}.<br>Prosím, načítajte uzol, odstráňte odkazovanie na "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte body, odstráňte odkazovanie na "
"reláciu a nahrajte dáta znovu."
msgstr[1] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na uzol {1}.<br>Prosím, načítajte uzly, odstráňte odkazovanie na "
+"odkazovaná z bodu {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
"reláciu a nahrajte dáta znovu."
msgstr[2] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na uzol {1}.<br>Prosím, načítajte uzly, odstráňte odkazovanie na "
+"odkazovaná z bodov {1}.<br>Prosím, načítajte bod, odstráňte odkazovanie na "
"reláciu a nahrajte dáta znovu."
msgid ""
@@ -13544,16 +14013,16 @@ msgid_plural ""
"the relation, and upload again."
msgstr[0] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na cestu {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie "
-"na reláciu a nahrajte dáta znovu."
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
msgstr[1] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na cesty {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie "
-"na reláciu a nahrajte dáta znovu."
+"odkazovaná z cestu {1}.<br>Prosím, načítajte cestu, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
msgstr[2] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na cesty {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie "
-"na reláciu a nahrajte dáta znovu."
+"odkazovaná z ciest {1}.<br>Prosím, načítajte cesty, odstráňte odkazovanie na "
+"reláciu a nahrajte dáta znovu."
msgid ""
"<strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still "
@@ -13565,15 +14034,15 @@ msgid_plural ""
"reference to the relation, and upload again."
msgstr[0] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na reláciu {1}.<br>Prosím, načítajte reláciu, odstráňte "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
"odkazovanie na reláciu a nahrajte dáta znovu."
msgstr[1] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte reláciu, odstráňte "
"odkazovanie na reláciu a nahrajte dáta znovu."
msgstr[2] ""
"<strong>Zlyhalo</strong> mazanie <strong>relácie {0}</strong>. Je stále "
-"odkazovaná na relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
+"odkazovaná z relácie {1}.<br>Prosím, načítajte relácie, odstráňte "
"odkazovanie na reláciu a nahrajte dáta znovu."
msgid ""
@@ -13590,17 +14059,17 @@ msgid ""
"failed.<br>Please check the username and the password in the JOSM "
"preferences.</html>"
msgstr ""
-"<html>Overenie na OSM serveri s používateľským menom ''{0}'' zlyhalo. <br> "
-"Skontrolujte prosím užívateľské meno a heslo v nastaveniach programu JOSM . "
-"</ html>"
+"<html>Overenie na OSM serveri s používateľským menom ''{0}'' "
+"zlyhalo.<br>Skontrolujte prosím používateľské meno a heslo v nastaveniach "
+"programu JOSM .</html>"
msgid ""
"<html>Authentication at the OSM server with the OAuth token ''{0}'' "
"failed.<br>Please launch the preferences dialog and retrieve another OAuth "
"token.</html>"
msgstr ""
-"<html>Overenie na OSM serveri s OAuth prístupom ''{0}'' zlyhal. <br> Prosím "
-"otvorte dialóg nastavení a získajte ďalší OAuth prístup. </ html>"
+"<html>Overenie na OSM serveri s OAuth prístupom ''{0}'' zlyhal.<br>Prosím "
+"otvorte dialóg nastavení a získajte ďalší OAuth prístup.</html>"
msgid ""
"<html>Authorisation at the OSM server failed.<br>The server reported the "
@@ -13610,7 +14079,7 @@ msgstr ""
"chybu:<br>''{0}''</html>"
msgid "<html>Authorisation at the OSM server failed.<br></html>"
-msgstr ""
+msgstr "<html>Overenie na serveri OSM zlyhalo.<br></html>"
msgid ""
"<html>Authorisation at the OSM server with the OAuth token ''{0}'' "
@@ -13618,16 +14087,16 @@ msgid ""
"resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve "
"another OAuth token.</html>"
msgstr ""
-"<html>Overenie na serveri OSM s OAuth prístupom ''{0}'' zlyhalo. <br>Pre "
-"overenie nie je povolený prístup k chránenému zdroju <br>''{1}''.< br> "
-"Prosím otvorte dialóg nastavení a získajte ďalší OAuth prístup. </ html>"
+"<html>Overenie na serveri OSM s OAuth prístupom ''{0}'' zlyhalo.<br>Pre "
+"overenie nie je povolený prístup k chránenému zdroju <br>''{1}''.<br>Prosím "
+"otvorte dialóg nastavení a získajte ďalší OAuth prístup.</html>"
msgid ""
"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
"later.</html>"
msgstr ""
"<html>Spojenie s OSM serverom ''{0}'' vypršalo. Prosím, skúste to znova "
-"neskôr.</ Html>"
+"neskôr.</Html>"
msgid "no error message available"
msgstr "žiadne chybové hlásenie k dispozícii"
@@ -13638,10 +14107,10 @@ msgid ""
"message:<br><strong>Error code:<strong> {1}<br><strong>Error message "
"(untranslated)</strong>: {2}</html>"
msgstr ""
-"<html>Spojenie s OSM serverom ''{0}'' zlyhalo. Server odpovedal <br> "
-"nasledujúcim kódom chyby a nasledujúcim chybovým hlásením: <br> <strong> Kód "
-"chyby: <strong> {1} <br> <strong> Chybové hlásenie (nepreložené) </ strong>: "
-"{2} </ HTML>"
+"<html>Spojenie s OSM serverom ''{0}'' zlyhalo. Server "
+"odpovedal<br>nasledujúcim kódom chyby a nasledujúcim chybovým "
+"hlásením:<br><strong> Kód chyby: <strong> {1}<br><strong>Chybové hlásenie "
+"(nepreložené)</strong>: {2}</HTML>"
msgid ""
"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
@@ -13694,13 +14163,16 @@ msgid ""
"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
"problem with transferring data.<br>Details (untranslated): {1}</html>"
msgstr ""
+"<html>Nepodarilo sa nahrať údaje na alebo stiahnuť údaje "
+"z<br>\"{0}\"<br>kvôli problému s prenosom údajov.<br>Podrobnosti "
+"(nepreložené): {1}</html>"
msgid ""
"<html>Failed to download data. Its format is either unsupported, ill-formed, "
"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
msgstr ""
"<html>Nepodarilo sa stiahnuť dáta. Ich formát je buď nepodporovaný, chybný, "
-"a / alebo nekonzistentný. <br> <br> Detaily (nepreložené): {0} </ html>"
+"a / alebo nekonzistentný.<br><br>Detaily (nepreložené): {0}</html>"
msgid ""
"<html>The OSM server<br>''{0}''<br>reported an internal server "
@@ -13722,7 +14194,7 @@ msgstr ""
"súbor poskytnutý OSM komunitou."
msgid "<br>Error message(untranslated): {0}"
-msgstr "<br>Chybná správa(nepreložený): {0}"
+msgstr "<br>Chybná správa (nepreložená): {0}"
msgid ""
"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
@@ -13740,6 +14212,9 @@ msgid ""
"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
"preferences and your internet connection."
msgstr ""
+"<html>Zlyhalo otvorenie pripojenia na vzdialený server<br>''{0}''.<br>Server "
+"s názvom ''{1}'' sa nepodarilo nájsť. <br>Prosím skontrolujte API URL vo "
+"Vašich nastaveniach a Vaše internetové pripojenie."
msgid ""
"<html>The server reports that an object is deleted.<br><strong>Uploading "
@@ -13748,9 +14223,9 @@ msgid ""
"object.<br><br>The error message is:<br>{0}</html>"
msgstr ""
"<html>Server hlási, že objekt je zmazaný.<br><strong>Nahrávanie je "
-"neúspešné</strong> Ak ste sa snažili nahrať, alebo vymazať tento objekt.<br> "
-"<strong>Nahrávanie neúspešné</strong> ak ste sa snažili nahrať tento "
-"objekt.<br><br>Chybová správa je:<br>{0}</html>"
+"neúspešné</strong>, ak ste sa snažili nahrať, alebo vymazať tento "
+"objekt.<br> <strong>Nahrávanie je neúspešné</strong>, ak ste sa snažili "
+"nahrať tento objekt.<br><br>Chybová správa je:<br>{0}</html>"
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {1}."
@@ -13765,23 +14240,14 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Zlyhala lokalizácia obrázku ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-"Varovanie: Nepodarilo sa spracovať zip súbor ''{0}''. Výnimka bola: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
-"Varovanie: Nepodarilo sa pristúpiť k adresáru ''{0}'' z bezpečnostných "
-"dôvodov. Výnimka bola: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Nepodarilo sa spracovať zip súbor \"{0}\". Výnimka bola: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Varovanie: neúspešne odvodený wiki jazyk z JOSM miestneho kódu ''{0}''. "
-"Použitý východzí kód ''en''."
+"Nepodarilo sa pristúpiť k adresáru \"{0}\" z bezpečnostných dôvodov. Výnimka "
+"bola: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}... [prosím, zadajte svoje číslo]"
@@ -13793,31 +14259,79 @@ msgstr ""
"Nepodarilo sa otvoriť URL. V súčasnej dobe neexistuje nastavenie platformy. "
"Prosím nastavte najskôr platformu."
+msgid "Opening URL: {0}"
+msgstr "Otvára sa URL: {0}"
+
+msgid "zoom"
+msgstr "priblíženie"
+
+msgid "latitude"
+msgstr "zemepisná šírka"
+
+msgid "longitude"
+msgstr "zemepisná dĺžka"
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr "URL neobsahuje {0}/{1}/{2}"
+
+msgid "URL does not contain valid {0}"
+msgstr "URL neobsahuje platné {0}"
+
msgid "reserved"
msgstr "rezervované"
-msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+msgid "Outdated Java version"
+msgstr "Zastaralá verzia Java"
+
+msgid "Update Java"
+msgstr "Aktualizujte Java"
+
+msgid "You are running version {0} of Java."
+msgstr "Používate Java verziu {0}."
+
+msgid "February 2013"
+msgstr "februára 2013"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+"Táto verzia Javy už nie je podporovaná firmou {0} od {1} a neodporúča sa ju "
+"používať."
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
msgstr ""
+"JOSM čoskoro prestane fungovať s touro verziou. Odporúčame aktualizovať na "
+"Java {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Prajete si aktualizovať teraz?"
+
+msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
+msgstr "Konflikt skratiek: \"{0}\" presunuté cez \"{1}\" na \"{2}\"."
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "V zásobníku sa našlo {0} značiek, čo je nezvyčajné!"
+msgstr[1] "V zásobníku sa našla {0} značka, čo je nezvyčajné!"
+msgstr[2] "V zásobníku sa našli {0} značky, čo je nezvyčajné!"
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "Kľúč je príliš dlhý (maximum {0} znakov):"
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "V kľúči sú použité podozrivé znaky:"
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "Hodnota je príliš dlhá (maximum {0} znakov):"
msgid "Do you want to paste these tags?"
-msgstr ""
+msgstr "Chcete vložiť tieto značky?"
msgid "Clear buffer"
-msgstr ""
+msgstr "Vymazať zásobník"
msgid "Ignore warnings"
msgstr "Ignorovať varovanie"
@@ -13826,11 +14340,26 @@ msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-"<html><p> Prepáčte, ale nie je možné vložiť tagy z vyrovnávacej pamäte. "
-"Neobsahujú žiadne objekty JOSM , alebo vhodné texty. </p></html>"
+"<html><p> Prepáčte, ale nie je možné vložiť značky z vyrovnávacej pamäte. "
+"Neobsahujú žiadne objekty JOSM, alebo vhodné texty. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Pravý klik = skopírovať do schránky"
+msgid "ms"
+msgstr "ms"
+
+msgid "s"
+msgstr "s"
+
+msgid "min"
+msgstr "min"
+
+msgid "h"
+msgstr "h"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dní"
+msgstr[1] "deň"
+msgstr[2] "dni"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -13843,8 +14372,8 @@ msgid ""
"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
"{2}. Cannot restore window geometry from preferences."
msgstr ""
-"nastavenie s kľúčom ''{0}'' nemôžem dodať vnútornú hodnotu pre ''{1}''. "
-"Dodaná {2}. Nemôžem obnoviť geometriu okna z nastavení."
+"Nastavenie s kľúčom \"{0}\" neuvádza hodnotu typu \"int\" pre ''{1}''. "
+"Obdržaná hodnota je {2}. Nemôžem obnoviť geometriu okna z nastavení."
msgid ""
"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
@@ -13861,7 +14390,7 @@ msgstr ""
"nastavení."
msgid "Ignoring malformed geometry: {0}"
-msgstr ""
+msgstr "Ignorujem geometriu chybného tvaru: {0}"
msgid "Failed to load XML schema."
msgstr "Nepodarilo sa načítať XML schémy."
@@ -13955,11 +14484,11 @@ msgstr "poľnohospodárska pôda"
msgctxt "landuse"
msgid "residential"
-msgstr "obytná (osídlená)"
+msgstr "obytná (osídlená) zóna"
msgctxt "natural"
msgid "scrub"
-msgstr "kosodrevina"
+msgstr "krovie"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -13967,15 +14496,15 @@ msgstr ""
msgctxt "Relation type"
msgid "boundary"
-msgstr "hranica (boundary)"
+msgstr "hranica (územie)"
msgctxt "Relation type"
msgid "enforcement"
-msgstr "vynútenia"
+msgstr "vynútenie"
msgctxt "Relation type"
msgid "line"
-msgstr "čiara"
+msgstr "elektrické vedenie"
msgctxt "Relation type"
msgid "multipolygon"
@@ -13987,11 +14516,11 @@ msgstr "sieť"
msgctxt "Relation type"
msgid "public_transport"
-msgstr "MHD"
+msgstr "hromadná doprava"
msgctxt "Relation type"
msgid "restriction"
-msgstr "obmedzenie"
+msgstr "dopravné obmedzenie"
msgctxt "Relation type"
msgid "route"
@@ -13999,7 +14528,7 @@ msgstr "trasa (route)"
msgctxt "Relation type"
msgid "site"
-msgstr "miesto (blízke okolie)"
+msgstr "areál/miesto (blízke okolie)"
msgctxt "Relation type"
msgid "waterway"
@@ -14007,11 +14536,11 @@ msgstr "vodný tok"
msgctxt "Place type"
msgid "city"
-msgstr "mesto (city)"
+msgstr "veľkomesto (city)"
msgctxt "Place type"
msgid "locality"
-msgstr "lokalita"
+msgstr "oblasť (neobývaná lokalita)"
msgctxt "Place type"
msgid "village"
@@ -14023,19 +14552,19 @@ msgstr "mesto"
msgctxt "Place type"
msgid "borough"
-msgstr "okres"
+msgstr "mestský obvod"
msgctxt "Place type"
msgid "municipality"
-msgstr "mestská samospráva"
+msgstr "obce so spojenou administratívou"
msgctxt "Place type"
msgid "island"
-msgstr "ostrovček"
+msgstr "ostrov"
msgctxt "Place type"
msgid "county"
-msgstr "kraj"
+msgstr "okres"
msgctxt "Place type"
msgid "hamlet"
@@ -14043,7 +14572,7 @@ msgstr "osada"
msgctxt "Place type"
msgid "suburb"
-msgstr "predmestie"
+msgstr "mestská štvrť"
msgid "All Files"
msgstr "Všetky súbory"
@@ -14082,7 +14611,7 @@ msgid "File Name:"
msgstr "Názov Súboru:"
msgid "FileChooser help."
-msgstr ""
+msgstr "Nápoveda k výberu súborov."
msgid "Files"
msgstr "Súbory"
@@ -14133,7 +14662,7 @@ msgid "Save in:"
msgstr "Uložiť do:"
msgid "Save In:"
-msgstr "Uložiť:"
+msgstr "Uložiť do:"
msgid "Save selected file."
msgstr "Uložiť vybraný súbor."
@@ -14175,11 +14704,18 @@ msgid "Saturation:"
msgstr "Sýtosť farby:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Umožňuje upravovať informácie o premávke a exportovať do simulátora mestskej "
+"mobility SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
"Skupina spoločných vstupov pre Interpoláciu adries v jednom dialógu, rovnako "
-"ako možnosť automaticky generovať jednotlivé číslo domu bodov z línie."
+"ako možnosť automaticky generovať jednotlivé číslo domu bodov z línie."
msgid ""
"Makes a pair of selected way segments parallel by rotating one of them "
@@ -14225,8 +14761,7 @@ msgstr "Vytvára cestnú sieť"
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
-msgstr ""
-"Vytvorenie a správa adresných bodov a budov vrámci Českej Republiky."
+msgstr "Vytvorenie a správa adresných bodov a budov vrámci Českej Republiky."
msgid "Allows to import various file formats into JOSM directly."
msgstr "Dovoľuje import rôzdnych formátov súborov priamo do JOSMu."
@@ -14264,7 +14799,13 @@ msgid "Fast drawing ways by mouse"
msgstr "Rýchle kreslenie línií pomocou myši"
msgid "Finds and fixes invalid street addresses in a comfortable way."
-msgstr "Vyhľadáva a opravuje neplatné uličné adresy pohodlným spôsobom."
+msgstr "Vyhľadáva a opravuje neplatné uličné adresy pohodlným spôsobom."
+
+msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Porozprávajte sa s používateľmi, ktorí upravujú mapu vo Vašej blízkosti a "
+"buďte informovaní keď sa niekto priblíži."
msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
@@ -14273,7 +14814,7 @@ msgstr ""
msgid ""
"Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr "Sťahuje GPS body z Globalsat DG100 datalogger-a priamo do JOSM."
+msgstr "Sťahuje GPS body z Globalsat DG100 datalogger-a priamo do JOSM."
msgid ""
"Analyse a set of GPS points to obtain its centre and direction of spread."
@@ -14283,7 +14824,7 @@ msgid "Allows to filter out unnecessary GPS tracks"
msgstr "Umožňuje odfiltrovať nepotrebné GPS stopy"
msgid "Visualizes routing information as a routing graph."
-msgstr "Vizualizuje \"routing information\" ako routovací graf."
+msgstr "Vizualizuje graf možností navigovania (routing information)."
msgid "Simple tool to tag house numbers."
msgstr "Jednoduchý nástroj na označenie čísla domov."
@@ -14295,14 +14836,18 @@ msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
msgstr ""
+"Databáza posunov mapových podkladov: zdieľajte a získajte ponusy mapových "
+"podkladov jediným tlačidlom."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-nastavenie štýlu snímok mapmode"
+msgstr ""
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
"not in huge cache directories"
msgstr ""
+"Tento expoerimentálny doplnok umožňuje JOSM-u ukladať dlaždice do "
+"databázových súborov namiesto veľkých priečinkov"
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -14378,9 +14923,6 @@ msgstr "Pridanie zákazu zabočenia vľavo pre sadu zo 4 alebo 5 ciest"
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr "Jednoducho previesť oblasť na multipolygon."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Umožňuje doplniť atribúty značiek do všetkých objektov v akejkoľvek zvolenej "
@@ -14393,7 +14935,7 @@ msgid ""
"Use your system''s password manager to store the API username and password. "
"(KWallet and gnome-keyring are supported.)"
msgstr ""
-"Použite systémového správcu hesiel pre uloženie užívateľského mena a hesla "
+"Použite systémového správcu hesiel pre uloženie používateľského mena a hesla "
"API. (KWallet a gnome-keyring sú podporované)."
msgid ""
@@ -14409,15 +14951,17 @@ msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
"and is hard to rid of)"
msgstr ""
+"Navždy znemožní používať JOSM (VAROVANIE: tento plugin znemožní spustenie "
+"JOSM a je ťažké sa ho zbaviť)"
msgid "Convert data from Open Data portals to OSM layer"
msgstr ""
msgid "extended options for editing opening_hours"
-msgstr "rozšírené možnosti pre editáciu otváracie hodiny (opening_hours)"
+msgstr "rozšírené možnosti pre úpravu otváracích hodín (opening_hours)"
msgid "Imports issues from OpenStreetBugs"
-msgstr "Importuje vydania z OpenStreetBugs"
+msgstr "Importuje nahlásené chyby z OpenStreetBugs"
msgid ""
"Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14448,6 +14992,9 @@ msgstr ""
"Napíšte GPS pozíciu do hlavičky súboru obrázka. Spustite túto funkciu z "
"menu, kliknite pravým tlačidlom na obrázok vrstvy."
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14469,13 +15016,10 @@ msgstr "pridanie projekcií z Proj4J"
msgid ""
"This plugin simplifies the mapping and editing of public transport routes."
-msgstr "Tento plugin zjednodušuje mapovanie a úpravy tratí verejnej dopravy."
+msgstr "Tento plugin zjednodušuje mapovanie a úpravy trás hromadnej dopravy."
msgid "Relation and multipolygon creating and editing panel."
-msgstr "Relácia a multipolygon vytvára a edituje panel."
-
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Pridá položku Reštart JOSMu menu Súbor."
+msgstr "Panel na vytváranie a úpravu relácií a multipolygónov."
msgid "Plugin for reverting changesets"
msgstr "Plugin pre obnovu súborov zmien"
@@ -14493,7 +15037,7 @@ msgid ""
"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
"defined in routes.xml file in plugin directory"
msgstr ""
-"Vykresluje cesty (autobusy, turistika, cyklistika). Cesty musia byť "
+"Vykresľuje trasy (autobusy, turistika, cyklistika). Typy trás musia byť "
"definované v súbore routes.xml v adresári pluginov."
msgid "Provides routing capabilities."
@@ -14510,9 +15054,6 @@ msgstr ""
"obmedzené maximálnou veľkosťou odstránenej oblasti. Tiež priemerným počtom "
"okolitých bodov."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Vytvárať a upravovať námorné mapy pre OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -14530,7 +15071,7 @@ msgstr ""
"je napríklad Wikipedia"
msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr "Určuje dialóg pre editáciu značiek v tabuľkovej mriežke."
+msgstr "Pridáva dialóg pre editáciu značiek v tabuľkovej mriežke."
msgid ""
"Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14556,6 +15097,11 @@ msgstr ""
"Kreslenie stavieb z Českej katastrálnej mapy. Vyžaduje spustený TracerServer "
"(. NET alebo Mono)."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Plugin na digitálne podpísanie OSM dát"
@@ -14601,7 +15147,7 @@ msgid "Select a sequence of non-branching connected ways"
msgstr "Vyberte poradie nerozvetvených spojených ciest"
msgid "Simplifys linking OSM objects to Wikipedia articles"
-msgstr ""
+msgstr "Zjednoduší prepojenie OSM objektov na články na Wikipedii"
msgid ""
"Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -14609,9 +15155,6 @@ msgid ""
msgstr ""
"Riaďte pretekárske auto z bodu A do bodu B nad leteckým mapovým podkladom."
-msgid "Highways"
-msgstr "Pozemné komunikácie"
-
msgid "Streets"
msgstr "Hlavné komunikácie"
@@ -14634,10 +15177,10 @@ msgid "Surface"
msgstr "Povrch"
msgid "paved"
-msgstr "spevnený"
+msgstr "spevnený (paved)"
msgid "unpaved"
-msgstr "nespevnený"
+msgstr "nespevnený (unpaved)"
msgid "asphalt"
msgstr "asfalt"
@@ -14646,22 +15189,22 @@ msgid "concrete"
msgstr "betón (concrete)"
msgid "metal"
-msgstr "kov"
+msgstr "kov (metal)"
msgid "wood"
msgstr "drevo (wood)"
msgid "paving_stones"
-msgstr "dlažobné kamene"
+msgstr "dlažobné tvárnice (betónové)"
msgid "cobblestone"
-msgstr "dlažbová kocka (cobblestone)"
+msgstr "okrúhle dlažobné kamene (cobblestone)"
msgid "gravel"
msgstr "štrk (gravel)"
msgid "pebblestone"
-msgstr "riečne kamene"
+msgstr "riečne kamene (pebblestone)"
msgid "compacted"
msgstr "zhutnená (valcovaná)"
@@ -14688,7 +15231,7 @@ msgid "Tunnel"
msgstr "Tunel"
msgid "Cutting"
-msgstr "Výkop"
+msgstr "Výkop (cesta zarezaná do zeme)"
msgid "Embankment"
msgstr "Násyp"
@@ -14696,6 +15239,9 @@ msgstr "Násyp"
msgid "Lit"
msgstr "Pouličné osvetlenie"
+msgid "Toll"
+msgstr "Mýto (Toll)"
+
msgid "Motorway Link"
msgstr "Diaľničná prípojka"
@@ -14703,19 +15249,19 @@ msgid "Edit Motorway Link"
msgstr "Upraviť diaľničnú prípojku"
msgid "Trunk"
-msgstr "Cesta pre motorové vozidlá"
+msgstr "Rýchlostná cesta (Cesta pre motorové vozidlá)"
msgid "Edit Trunk"
-msgstr "Upraviť cestu pre motorové vozidlá"
+msgstr "Upraviť rýchlostnú cestu"
msgid "Motorroad"
-msgstr "Cesta pre motorové vozidlá"
+msgstr "Iná rýchlostná cesta (v SR sa nepoužíva)"
msgid "Trunk Link"
-msgstr "Prípojka cesty pre motorové vozidla"
+msgstr "Prípojka rýchlostnej cesty"
msgid "Edit Trunk Link"
-msgstr "Upraviť prípojku cesty pre motorové vozidla"
+msgstr "Upraviť prípojku rýchlostnej cesty"
msgid "Primary"
msgstr "Cesta I. triedy"
@@ -14751,10 +15297,10 @@ msgid "Edit Secondary Road"
msgstr "Upraviť cestu II. triedy"
msgid "Secondary Link"
-msgstr ""
+msgstr "Prípojka cesty II. triedy"
msgid "Edit Secondary Link"
-msgstr ""
+msgstr "Upraviť prípojku cesty II. triedy"
msgid "Tertiary"
msgstr "Cesta III. triedy"
@@ -14763,16 +15309,16 @@ msgid "Edit Tertiary Road"
msgstr "Upraviť cestu III. triedy"
msgid "Tertiary Link"
-msgstr ""
+msgstr "Prípojka cesty III. triedy"
msgid "Edit Tertiary Link"
-msgstr ""
+msgstr "Upraviť prípojku cesty III. triedy"
msgid "Unclassified"
msgstr "Miestna cesta neklasifikovaná (Unclassified)"
msgid "Edit Unclassified Road"
-msgstr "Upraviť Neklasifikovanú cestu"
+msgstr "Upraviť neklasifikovanú cestu"
msgid "Passing Places"
msgstr "Parkoviská umožňujúce predbehnutie širokého vozidla"
@@ -14786,11 +15332,55 @@ msgstr "Ulica (miestna komunikácia)"
msgid "Edit Residential Street"
msgstr "Upraviť ulicu"
+msgid "Bicycle Road"
+msgstr "Vyhradená cesta pre cyklistov"
+
+msgid "Edit Bicycle Road"
+msgstr "Upraviť vyhradenú cestu pre cyklistov"
+
+msgid "Highway type"
+msgstr "Typ komunikácie"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "ulica"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "obslužná cesta"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "neklasifikovaná"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "chodníček"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "cesta pre cyklistov"
+
+msgid "Vehicle access"
+msgstr "Prístup vozidiel"
+
+msgid "yes"
+msgstr "áno"
+
+msgid "no"
+msgstr "nie"
+
+msgid "destination"
+msgstr "návštevníci cieľa (destination)"
+
+msgid "Oneway for bicycle"
+msgstr "Jednosmerná pre cyklistov"
+
msgid "Living Street"
msgstr "Obytná zóna"
msgid "Edit Living Street"
-msgstr "Upraviť Obytnú zónu"
+msgstr "Upraviť obytnú zónu"
msgid "Pedestrian"
msgstr "Pešia zóna"
@@ -14804,11 +15394,11 @@ msgstr "Oblasť"
msgid "Service"
msgstr "Obslužná cesta (service)"
-msgid "Edit Serviceway"
-msgstr "Upraviť obslužnú cestu (service)"
+msgid "Edit Service Way"
+msgstr "Upraviť obslužnú cestu"
-msgid "Serviceway type"
-msgstr "Typ obslužnej cesty (service)"
+msgid "Service way type"
+msgstr "Typ obslužnej cesty"
msgid "alley"
msgstr "ulička (bočná ulica)"
@@ -14817,13 +15407,16 @@ msgid "driveway"
msgstr "príjazdová cesta"
msgid "parking_aisle"
-msgstr "parkovacia ulička (parking_aisle)"
+msgstr "parkovacia ulička"
+
+msgid "drive-through"
+msgstr "prejazd"
msgid "Parking Aisle"
-msgstr "Parkovacia ulička (parking Aisle)"
+msgstr "Parkovacia ulička"
msgid "Edit Parking Aisle"
-msgstr "Upraviť parkovaciu uličku (parking Aisle)"
+msgstr "Upraviť parkovaciu uličku"
msgid "Road (Unknown Type)"
msgstr "Cesta (neznámy typ)"
@@ -14832,7 +15425,7 @@ msgid "Edit Road of unknown type"
msgstr "Upraviť cestu neznámeho typu"
msgid "Construction"
-msgstr "Stavba"
+msgstr "Cesta vo výstavbe"
msgid "Edit Highway Under Construction"
msgstr "Upraviť komunikáciu vo výstavbe"
@@ -14844,10 +15437,7 @@ msgid "roundabout"
msgstr "kruhový objazd (roundabout)"
msgid "jughandle"
-msgstr ""
-
-msgid "yes"
-msgstr "áno"
+msgstr "prípojka"
msgid "Road Restrictions"
msgstr "Cestné obmedzenie"
@@ -14855,44 +15445,38 @@ msgstr "Cestné obmedzenie"
msgid "Edit Road Restrictions"
msgstr "Upraviť cestné obmedzenie"
-msgid "Toll"
-msgstr "Mýto (Toll)"
-
msgid "No exit (cul-de-sac)"
msgstr "Slepá ulica"
msgid "Transport mode restrictions"
-msgstr ""
+msgstr "Obmedzenia spôsobu prepravy"
msgid "General Access"
msgstr "Všeobecný prístup"
-msgid "destination"
-msgstr "miesto určenia (cieľ)"
-
msgid "delivery"
-msgstr "zásobovanie"
+msgstr "zásobovanie (delivery)"
msgid "permissive"
-msgstr "permissive (súhlas vlastníka pozemku)"
+msgstr "permissive (súhlas vlastníka pozemku zatiaľ existuje)"
msgid "private"
-msgstr "private (len pre vlastníka)"
+msgstr "súkromné (len so súhlasom vlastníka)"
+
+msgid "customers"
+msgstr "zákazníci"
msgid "agricultural"
-msgstr "farmársky (agricultural)"
+msgstr "farmárstvo (agricultural)"
msgid "forestry"
msgstr "lestníctvo"
-msgid "no"
-msgstr "nie"
-
msgid "official"
-msgstr "oficiálny"
+msgstr "oficiálne určené"
msgid "designated"
-msgstr "určený"
+msgstr "určený pre tento typ vozidiel (designated)"
msgid "Horse"
msgstr "Kôň"
@@ -14916,7 +15500,7 @@ msgid "Light Commercial Vehicles (goods)"
msgstr "Malé nákladné vozidlá do 3,5t (goods)"
msgid "Heavy Goods Vehicles (hgv)"
-msgstr "Nákladné vozidlá (hgv)"
+msgstr "Nákladné vozidlá nad 3,5t (hgv)"
msgid "Vehicles per use"
msgstr "Vozidlá podľa určenia"
@@ -14928,10 +15512,13 @@ msgid "Emergency vehicles"
msgstr "Záchranné vozidlá"
msgid "High-occupancy vehicles (hov)"
-msgstr ""
+msgstr "Vozidlá vysoko obsadené (hov)"
msgid "Public Service Vehicles (psv)"
-msgstr "Dopravná obsluha"
+msgstr "Dopravná obsluha (bus+taxi) (psv)"
+
+msgid "Tourist buses"
+msgstr "Turistické autobusy"
msgid "Min. speed (km/h)"
msgstr "Min. rýchlosť (km/h)"
@@ -14976,10 +15563,10 @@ msgid "motorway_link"
msgstr "diaľničná prípojka"
msgid "trunk"
-msgstr "cesta pre motorové vozidlá (trunk)"
+msgstr "rýchlostná cesta (trunk)"
msgid "trunk_link"
-msgstr "prípojka cesty pre motorové vozidlá"
+msgstr "prípojka rýchlostnej cesty"
msgid "primary"
msgstr "cesta prvej triedy"
@@ -14997,28 +15584,31 @@ msgid "unclassified"
msgstr "cesta bez klasifikácie (unclassified)"
msgid "residential"
-msgstr "obytná (osídlená)"
+msgstr "ulica"
msgid "living_street"
msgstr "obytná zóna"
msgid "service"
-msgstr "obslužná (service)"
+msgstr "obslužná cesta"
msgid "bus_guideway"
-msgstr "autobusová linka"
+msgstr "vodiaca stopa pre autobus"
msgid "construction"
-msgstr "konštrukcia"
+msgstr "cesta vo výstavbe"
msgid "Edit Bridge"
-msgstr "Editácia mosta"
+msgstr "Upraviť most"
msgid "viaduct"
msgstr "viadukt (nadjazd)"
+msgid "suspension"
+msgstr "visutý"
+
msgid "swing"
-msgstr ""
+msgstr "otočný"
msgid "aqueduct"
msgstr "akvadukt"
@@ -15036,7 +15626,7 @@ msgid "Track"
msgstr "Poľná cesta (Track)"
msgid "Edit Track"
-msgstr "Upraviť Stopu (Track)"
+msgstr "Upraviť poľnú cestu (track)"
msgid "Tracktype"
msgstr "Typ stopy"
@@ -15063,13 +15653,13 @@ msgid "General access"
msgstr "Všeobecný prístup"
msgid "Path"
-msgstr "Cesta (chodník)"
+msgstr "Chodníček (mimo mesta, nižšej kvality)"
msgid "Edit Path"
-msgstr "Upraviť cestu (chodník)"
+msgstr "Upraviť chodníček (nižšej kvality, nie pre autá)"
msgid "SAC Scale"
-msgstr "SAC Scale"
+msgstr "SAC Stupnica"
msgid "T1 - hiking trail"
msgstr "T1 - turistická trasa"
@@ -15119,7 +15709,7 @@ msgid ""
"jagged rocks, few dangerous glacier and snow"
msgstr ""
"lezenie v druhom stupni obtiažnosti. Exponované, náročné terény, zubaté "
-"skaly, málo nebezpečný ľadovec a sneh"
+"skaly, málo nebezpečný ľadovec a sneh"
msgid "T6 - hazardous alpine trail with climbing"
msgstr "T6 - nebezpečné alpské chodníky s lezením"
@@ -15134,20 +15724,29 @@ msgstr ""
msgid "Visibility"
msgstr "Viditeľnosť"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "vynikajúce"
+msgstr "vynikajúca"
+msgctxt "trail_visibility"
msgid "good"
-msgstr "dobré"
+msgstr "dobrá"
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "stredne pokročilý (intermediate)"
+msgstr "stredná"
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "zlé"
+msgstr "zlá"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "hrozné"
+msgstr "hrozná"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "žiadna"
msgid "Wheelchairs"
msgstr "Vozíky"
@@ -15164,35 +15763,35 @@ msgstr "Vyhradená cesta pre kone"
msgid "Edit Bridleway"
msgstr "Upraviť cestu pre kone"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr "Pruh pre cyklistov"
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr "Upraviť pruh pre cyklistov"
msgid "Cycleway"
msgstr "Cesta pre cyklistov"
msgid "lane"
-msgstr "prúd"
+msgstr "jazdný pruh"
msgid "track"
-msgstr "stopa"
+msgstr "stopa (dráha)"
msgid "opposite_lane"
-msgstr ""
+msgstr "protismerný pruh"
msgid "opposite_track"
-msgstr ""
+msgstr "protismerná cesta"
msgid "opposite"
-msgstr ""
+msgstr "protismerná"
msgid "share_busway"
-msgstr ""
+msgstr "cesta zdieľaná s autobusom"
msgid "shared_lane"
-msgstr ""
+msgstr "zdieľaný pruh"
msgid "Cycleway left"
msgstr "Chodník pre cyklistov vľavo"
@@ -15203,8 +15802,8 @@ msgstr "Chodník pre cyklistov vpravo"
msgid "Oneway (bicycle)"
msgstr "Jednosmerná (bicykel)"
-msgid "Edit Highway"
-msgstr "Upraviť hlavnú cestu"
+msgid "Edit Highway Attributes:"
+msgstr "Upraviť vlastnosti komunikácie:"
msgid "Highway"
msgstr "Hlavná cesta"
@@ -15225,7 +15824,7 @@ msgid "Combined Foot- and Cycleway"
msgstr "Kombinovaný chodník a cesta pre cyklistov"
msgid "Dedicated Footway"
-msgstr "Vyhradený chodník pre peších"
+msgstr "Vyhradený chodník pre peších (kvalitný mestský)"
msgid "Edit Footway"
msgstr "Upraviť chodník"
@@ -15234,7 +15833,7 @@ msgid "Steps"
msgstr "Schody"
msgid "Edit Flight of Steps"
-msgstr "Upraviť únikové schody"
+msgstr "Upraviť rad schodov"
msgid "Amount of Steps"
msgstr "Počet schodov"
@@ -15261,7 +15860,7 @@ msgid "Edit Service Station"
msgstr "Upraviť servisnú stanicu (autoservis)"
msgid "Operator"
-msgstr "Operátor"
+msgstr "Prevádzkovateľ (Operátor)"
msgid "Toilets"
msgstr "Toalety"
@@ -15272,14 +15871,20 @@ msgstr "Odpočívadlo"
msgid "Edit Rest Area"
msgstr "Upraviť odpočívadlo"
-msgid "Emergency Phone"
-msgstr "Núdzový telefón"
+msgid "Drinking Water"
+msgstr "Pitná voda"
msgid "Traffic Signal"
msgstr "Semafor"
+msgid "Edit Traffic Signal"
+msgstr "Upraviť semafor"
+
+msgid "Optional crossing attributes:"
+msgstr "Voliteľné atribúty priechodu pre chodcov:"
+
msgid "Pedestrian crossing type"
-msgstr "Typ prechodu pre chodcov"
+msgstr "Typ priechodu pre chodcov"
msgid "uncontrolled"
msgstr "neriadený"
@@ -15293,36 +15898,36 @@ msgstr "ostrovček"
msgid "unmarked"
msgstr "neoznačený"
-msgid "Cross on horseback"
-msgstr "Prechod pre jazdcov na koňoch"
-
-msgid "Cross by bicycle"
-msgstr "Prechod pre cyklistov"
-
-msgid "Crossing attendant"
-msgstr "Prechod cez cestu s obsluhou"
-
msgid "Crossing type name (UK)"
-msgstr "Typy prechodov pre chodcov (UK viď. en.wikipedia.org)"
+msgstr "Typ priechodu pre chodcov (UK viď. en.wikipedia.org)"
msgid "zebra"
-msgstr "prechod pre chodcov (zebra)"
+msgstr "priechod pre chodcov (zebra)"
msgid "pelican"
-msgstr "prechod pre chodcov (len čiarkované okraje)"
+msgstr "priechod pre chodcov (len čiarkované okraje)"
msgid "toucan"
-msgstr "toucan (prechod pre chodcov a cyklistov, len čiarkované okraje)"
+msgstr "toucan (priechod pre chodcov a cyklistov, len čiarkované okraje)"
msgid "puffin"
-msgstr "puffin (prechod pre chodcov a cyklistov, len čiarkované okraje)"
+msgstr "puffin (priechod pre chodcov a cyklistov, len čiarkované okraje)"
msgid "pegasus"
msgstr ""
-"pegasus (prechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)"
+"pegasus (priechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)"
msgid "tiger"
-msgstr "tiger (prechod pre chodcov a cyklistov žlté pruhy)"
+msgstr "tiger (priechod pre chodcov a cyklistov žlté pruhy)"
+
+msgid "Crossing attendant"
+msgstr "Priechod cez cestu s obsluhou"
+
+msgid "Cross by bicycle"
+msgstr "Priechod pre cyklistov"
+
+msgid "Cross on horseback"
+msgstr "Priechod pre jazdcov na koňoch"
msgid "Stop"
msgstr "Zastaviť (stop)"
@@ -15333,6 +15938,9 @@ msgstr "Odpočívadlo"
msgid "Mini-roundabout"
msgstr "Malý kruhový objazd"
+msgid "Edit Mini-Roundabout"
+msgstr "Upraviť malý kruhový objazd"
+
msgid "Direction"
msgstr "Smer"
@@ -15340,13 +15948,10 @@ msgid "clockwise"
msgstr "v smere hodinových ručičiek (pravotočivý)"
msgid "Pedestrian Crossing"
-msgstr "Prechod pre chodcov"
-
-msgid "Edit Crossing"
-msgstr "Upraviť križovanie"
+msgstr "Priechod pre chodcov"
-msgid "Type name (UK)"
-msgstr "Typ mena (UK)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Upraviť priechod pre chodcov"
msgid "Traffic Calming"
msgstr "Spomaľovací retardér"
@@ -15364,13 +15969,13 @@ msgid "choker"
msgstr "zúženie ulice"
msgid "cushion"
-msgstr ""
+msgstr "retardér s medzerami (cushion)"
msgid "hump"
-msgstr ""
+msgstr "dlhší retardér (hump)"
msgid "rumble_strip"
-msgstr ""
+msgstr "zvukový retardér (rumble_strip)"
msgid "table"
msgstr "veľký retardér (table)"
@@ -15378,11 +15983,8 @@ msgstr "veľký retardér (table)"
msgid "Passing Place"
msgstr "Parkovisko umožňujúce predbehnutie širokého vozidla"
-msgid "Edit Passing Place"
-msgstr "Upraviť parkovisko umožňujúce predbehnutie širokého vozidla"
-
msgid "Turning Circle"
-msgstr "Obratisko (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
+msgstr "Obratisko (zaokrúhlený koniec cesty pre ľahšie otáčanie sa áut)"
msgid "City Limit"
msgstr "Hranica mesta/obce"
@@ -15412,7 +16014,22 @@ msgid "Wikipedia"
msgstr "Wikipédia"
msgid "Barriers"
-msgstr "Prekážka (Barriers)"
+msgstr "Prekážky (Barriers)"
+
+msgid "Block"
+msgstr "Balvan (Block)"
+
+msgid "Edit Block"
+msgstr "Upraviť balvan"
+
+msgid "Allowed traffic:"
+msgstr "Povolená prevádzka:"
+
+msgid "Material"
+msgstr "Materiál"
+
+msgid "stone"
+msgstr "kameň"
msgid "Bollard"
msgstr "Stĺpik"
@@ -15420,33 +16037,44 @@ msgstr "Stĺpik"
msgid "Edit Bollard"
msgstr "Upraviť stĺpik"
-msgid "Allowed traffic:"
-msgstr "Povolená prevádzka:"
+msgid "Bollard type"
+msgstr "Typ stĺpika"
+
+msgid "rising"
+msgstr "vysúvateľný"
+
+msgid "removable"
+msgstr "odstrániteľný"
+
+msgid "plastic"
+msgstr "plast"
msgid "Cycle Barrier"
-msgstr "Cyklo prekážka (Cycle Barrier)"
+msgstr "Cyklo-prekážka (Cycle Barrier)"
-msgid "Block"
-msgstr "Balvan (Block)"
+msgid "Edit Cycle Barrier"
+msgstr "Upraviť cyklo-prekážku"
msgid "Cattle Grid"
msgstr ""
"Mreža cez cestu, ako zábrana pre dobytok, priechodná pre autá (Cattle grid)"
msgid "Edit Cattle Grid"
-msgstr ""
-"Upraviť cattle grid (mreža cez cestu, ako zábrana pre dobytok, ale "
-"priechodná pre autá)"
+msgstr "Upraviť mrežu cez cestu"
msgid "Bus Trap"
msgstr ""
-"Rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov (Bus trap)"
+"Zariadenie na ceste zabraňujúce vjazdu vozidiel okrem autobusov (Bus trap)"
+
+msgid "Edit Bus Trap"
+msgstr ""
+"Upraviť zariadenie na ceste zabraňujúce vjazdu vozidiel okrem autobusov"
msgid "Spikes"
msgstr "Špičky (hroty)"
msgid "Edit Spikes"
-msgstr "Upraviť Hroty"
+msgstr "Upraviť hroty"
msgid "Toll Booth"
msgstr "Mýtna búdka"
@@ -15463,44 +16091,88 @@ msgstr "Upraviť hraničnú kontrolu"
msgid "Hedge"
msgstr "Živý plot (Hedge)"
+msgid "Edit Hedge"
+msgstr "Upraviť živý plot"
+
+msgid "Height (meters)"
+msgstr "Výška (metre)"
+
+msgid "Genus"
+msgstr "Rod (Genus)"
+
+msgid "Species"
+msgstr "Druh (Species)"
+
+msgid "Taxon"
+msgstr "Taxón"
+
msgid "Fence"
msgstr "Plot"
+msgid "Edit Fence"
+msgstr "Upraviť plot"
+
msgid "barbed_wire"
msgstr "ostnatý drôt"
-msgid "chain"
-msgstr "reťaz"
+msgid "chain_link"
+msgstr "drôtené pletivo"
msgid "electric"
msgstr "elektrický"
-msgid "hedge"
-msgstr "Živý plot (hedge)"
-
msgid "pole"
-msgstr "stožiar (pole)"
+msgstr "stĺpy"
msgid "split_rail"
-msgstr "rozchod železnice"
+msgstr "hranaté brvná (split_rail)"
+
+msgid "wire"
+msgstr "drôt"
+
+msgid "Guard Rail"
+msgstr "Zvodidlá"
+
+msgid "Edit Guard Rail"
+msgstr "Upraviť zvodidlá"
msgid "Wall"
msgstr "Múr"
+msgid "Edit Wall"
+msgstr "Upraviť múr"
+
msgid "City Wall"
msgstr "Mestské hradby"
+msgid "Edit City Wall"
+msgstr "Upraviť mestské hradby"
+
msgid "Retaining Wall"
msgstr "Oporný múr"
+msgid "Edit Retaining Wall"
+msgstr "Upraviť oporný múr"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Priekopa (ditch)"
-msgid "Entrance"
-msgstr "Vstup"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Upraviť priekopu"
-msgid "Edit Entrance"
-msgstr "Upraviť vstup"
+msgid "Kerb"
+msgstr "Obrubník"
+
+msgid "Edit Kerb"
+msgstr "Upraviť obrubník"
+
+msgid "Entrance (barrier opening)"
+msgstr "Vstup (otvor v prekážke)"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Upraviť vstup (otvor v prekážke)"
msgid "Gate"
msgstr "Brána"
@@ -15512,37 +16184,52 @@ msgid "Lift Gate"
msgstr "Závora (Lift Gate)"
msgid "Edit Lift Gate"
-msgstr "Upraviť závoru (Lift Gate)"
+msgstr "Upraviť závoru"
msgid "Hampshire Gate"
msgstr "Brána pre zvieratá (Hampshire)"
msgid "Edit Hampshire Gate"
-msgstr "Upraviť bránu pre zvieratá (hampshire)"
+msgstr "Upraviť bránu pre zvieratá"
msgid "Bump Gate"
-msgstr "Brána pre otváranie predkom auta (bump)"
+msgstr "Brána pre otváranie predkom auta (Bump)"
msgid "Edit Bump Gate"
-msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
+msgstr "Upraviť bránu pre otváranie predkom auta"
msgid "Kissing Gate"
-msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
+msgstr "Zložitejšia brána proti dobytku (kissing gate)"
msgid "Edit Kissing Gate"
-msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
+msgstr "Upraviť zložitejšiu bránu proti dobytku"
+
+msgid "Chain"
+msgstr "Reťaz"
+
+msgid "Edit Chain"
+msgstr "Upraviť reťaz"
msgid "Stile"
-msgstr "Schodíky cez plot"
+msgstr "Priechod cez prekážku"
msgid "Edit Stile"
-msgstr "Upraviť schodíky cez plot"
+msgstr "Upraviť priechod cez prekážku"
+
+msgid "ladder"
+msgstr "rebrík"
+
+msgid "squeezer"
+msgstr "štrbina"
+
+msgid "stepover"
+msgstr "schody"
msgid "Turnstile"
msgstr "Turniket"
msgid "Edit Turnstile"
-msgstr "Upraviť Turniket"
+msgstr "Upraviť turniket"
msgid "Sally Port"
msgstr ""
@@ -15554,10 +16241,10 @@ msgstr ""
"bránou)"
msgid "Passageways"
-msgstr "Chodby(pasáž)"
+msgstr "Chodby (pasáže)"
msgid "Edit Tunnel"
-msgstr "Upraviť Tunel"
+msgstr "Upraviť tunel"
msgid "Building Passage"
msgstr "Pasáž pod budovou"
@@ -15569,22 +16256,22 @@ msgid "Arcade"
msgstr "Pasáž"
msgid "Edit Arcade"
-msgstr "Editovať Pasáž"
+msgstr "Upraviť pasáž"
msgid "Open on left side"
-msgstr "Otvoriť na ľavej strane"
+msgstr "Otvorená na ľavej strane"
msgid "Open on right side"
-msgstr "Otvoriť na pravej strane"
+msgstr "Otvorená na pravej strane"
msgid "Colonnade"
msgstr "Kolonáda"
msgid "Edit Colonnade"
-msgstr "Upraviť Kolonádu"
+msgstr "Upraviť kolonádu"
msgid "Avalanche Protector"
-msgstr "Lavínová ochrana"
+msgstr "Lavínová ochrana (strecha)"
msgid "Edit Avalanche Protector"
msgstr "Upraviť lavínovú ochranu"
@@ -15598,6 +16285,9 @@ msgstr "Odvodňovací kanál, odtok (drain)"
msgid "Edit Drain"
msgstr "Upraviť odvodňovací kanál, odtok"
+msgid "Ditch"
+msgstr "Priekopa (ditch)"
+
msgid "Edit Ditch"
msgstr "Upraviť priekopu"
@@ -15607,6 +16297,12 @@ msgstr "Potok (stream)"
msgid "Edit Stream"
msgstr "Upraviť potok"
+msgid "Wadi"
+msgstr "Nepravidelný tok (sezónne vysychajúci)"
+
+msgid "Edit Wadi"
+msgstr "Upraviť nepravidelný tok"
+
msgid "Canal"
msgstr "Prieplav (canal)"
@@ -15646,26 +16342,23 @@ msgstr "Upraviť priehradu, nádrž"
msgid "Groyne"
msgstr "Vlnolam"
-msgid "Edit Groyne"
-msgstr "Upraviť vlnolam"
-
msgid "Breakwater"
msgstr "Vlnolam"
msgid "Edit Breakwater"
-msgstr "Upraviť Vlnolam"
+msgstr "Upraviť vlnolam"
msgid "Culvert"
msgstr "Priepust"
msgid "Edit Culvert"
-msgstr "Upraviť Priepust"
+msgstr "Upraviť priepust"
msgid "Basin"
-msgstr "Basin (Kotvisko pre lode)"
+msgstr "Nádrž na dažďovú vodu"
msgid "Edit Basin Landuse"
-msgstr "Upraviť Basin (Kotvisko pre lode)"
+msgstr "Upraviť nádrž na dažďovú vodu"
msgid "Reservoir"
msgstr "Nádrž"
@@ -15682,11 +16375,26 @@ msgstr "Upraviť krytú nádrž"
msgid "Edit Water"
msgstr "Upraviť vodu"
+msgid "Water Body"
+msgstr "Vodná plocha"
+
+msgid "lake"
+msgstr "jazero"
+
+msgid "lagoon"
+msgstr "lagúna"
+
+msgid "pond"
+msgstr "rybník"
+
+msgid "reservoir"
+msgstr "nádrž"
+
msgid "Land"
msgstr "Zem (Pevnina)"
msgid "Edit Land"
-msgstr "Upraviť Zem (Pevnina)"
+msgstr "Upraviť zem (pevnina)"
msgid "Coastline"
msgstr "Pobrežie"
@@ -15763,20 +16471,25 @@ msgstr "Upraviť prístavisko prievozu, trajektu"
msgid "Cargo"
msgstr "Náklad"
+msgctxt "cargo"
msgid "passengers"
-msgstr "pasažieri"
+msgstr "cestujúci"
+msgctxt "cargo"
msgid "vehicle"
msgstr "vozidlá"
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bicykel"
+msgstr "bicykle"
+msgctxt "cargo"
msgid "hgv"
-msgstr "nákladné vozidlá"
+msgstr "nákladné autá"
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "pasažieri;vozidlá"
+msgstr "cestujúci+vozidlá"
msgid "Ferry Route"
msgstr "Prievoz, trajekt"
@@ -15788,7 +16501,7 @@ msgid "Marina"
msgstr "Prístav (Marina)"
msgid "Edit Marina"
-msgstr "Upraviť Prístav (Marina)"
+msgstr "Upraviť prístav (Marina)"
msgid "Pier"
msgstr "Mólo"
@@ -15839,7 +16552,7 @@ msgid "branch"
msgstr "vetva"
msgid "industrial"
-msgstr "závody"
+msgstr "priemysel"
msgid "military"
msgstr "armáda"
@@ -15847,8 +16560,11 @@ msgstr "armáda"
msgid "tourism"
msgstr "cestovanie"
-msgid "Service/Type"
-msgstr ""
+msgid "freight"
+msgstr "náklad"
+
+msgid "Service type"
+msgstr "Využitie"
msgid "yard"
msgstr "železničná vlečka v závode"
@@ -15860,25 +16576,28 @@ msgid "spur"
msgstr "železničná vlečka"
msgid "Gauge (mm)"
-msgstr "rozmer (mm)"
+msgstr "Rozchod (mm)"
msgid "Electrified"
msgstr "Elektrifikovaný"
msgid "contact_line"
-msgstr "električkové_vedenie"
+msgstr "električkové vedenie"
msgid "rail"
msgstr "koľajnica (rail)"
-msgid "Voltage"
-msgstr "Napätie"
+msgid "Voltage in Volts (V)"
+msgstr "Napätie v Voltoch (V)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Kmitočet v Hertzoch (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Kmitočet (Hz)"
+msgid "16.67"
+msgstr "16,67"
msgid "16.7"
-msgstr "16.7"
+msgstr "16,7"
msgid "Narrow Gauge Rail"
msgstr "Úzkorozchodná železnica"
@@ -15886,9 +16605,6 @@ msgstr "Úzkorozchodná železnica"
msgid "Edit Narrow Gauge Rail"
msgstr "Upraviť úzkorozchodnú železnicu"
-msgid "Types"
-msgstr "Typy"
-
msgid "Monorail"
msgstr "Jednokoľajka, vysutá dráha"
@@ -15920,10 +16636,10 @@ msgid "Edit Tram"
msgstr "Upraviť električku"
msgid "Bus Guideway"
-msgstr "Autobusová linka"
+msgstr "Vodiaca dráha pre autobus"
msgid "Edit Bus Guideway"
-msgstr "Upraviť autobusovú linku"
+msgstr "Upraviť vodiaca dráha pre autobus"
msgid "Disused Rail"
msgstr "Nepoužívaná železnica"
@@ -15931,20 +16647,58 @@ msgstr "Nepoužívaná železnica"
msgid "Edit Disused Railway"
msgstr "Upraviť nepoužívanú železnicu"
-msgid "Optional Types"
-msgstr "Voliteľné typy"
-
msgid "Abandoned Rail"
msgstr "Opustená železnica"
+msgid "Edit Abandoned Railway"
+msgstr "Upraviť opustenú železnicu"
+
msgid "Level Crossing"
-msgstr "Železničné priecestie"
+msgstr "Železničné priecestie (pre autá)"
+
+msgid "Edit Level Crossing"
+msgstr "Upraviť železničné priecestie"
+
+msgid "Supervised"
+msgstr "Strážené"
+
+msgid "Traffic lights"
+msgstr "Semafor"
+
+msgid "Sound signals"
+msgstr "Zvukový signál"
+
+msgid "Barrier"
+msgstr "Zábrana"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "áno"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "nie"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "polovičná"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "úplná"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "polovičná dvojitá"
msgid "Crossing"
-msgstr "Peší prechod cez železnicu"
+msgstr "Peší priechod cez železnicu"
+
+msgid "Edit Crossing"
+msgstr "Upraviť priechod cez železnicu"
msgid "Crossing type"
-msgstr "Typy prechodov cez cestu"
+msgstr "Typ priechodu"
msgid "Turntable"
msgstr "Točňa"
@@ -15974,10 +16728,10 @@ msgid "Typical journey time in minutes"
msgstr "Typický čas trasy v minútach"
msgid "Has bubble?"
-msgstr ""
+msgstr "Má kryt?"
msgid "Has heating?"
-msgstr "Má vyhreivanie?"
+msgstr "Má vyhrievanie?"
msgid "Drag Lift"
msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)"
@@ -15999,7 +16753,7 @@ msgid "Gondola"
msgstr "Gondola"
msgid "Edit Gondola"
-msgstr "Upraviť Gondolu"
+msgstr "Upraviť gondolu"
msgid "Number of people per gondola"
msgstr "Počet ľudí v gondole"
@@ -16026,44 +16780,40 @@ msgid "Edit J-bar Lift"
msgstr "Upraviť vlek s jednomiestnou kotvou"
msgid "Platter Lift"
-msgstr "Vlek Poma(disk)"
+msgstr "Vlek Poma (disk)"
msgid "Edit Platter Lift"
-msgstr "Upraviť vlek Pomu(disk)"
+msgstr "Upraviť vlek Pomu (disk)"
msgid "Rope Tow"
-msgstr "Vlek Lanový"
+msgstr "Vlek lanový"
msgid "Edit Rope Tow"
msgstr "Upraviť lanový vlek"
msgid "Magic Carpet"
-msgstr ""
+msgstr "Posuvný pás"
msgid "Edit Magic Carpet"
-msgstr ""
+msgstr "Upraviť posuvný pás"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Tovar"
+msgstr "Nákladná"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Upraviť tovar"
+msgstr "Upraviť nákladnú lanovku"
msgctxt "aerialway"
msgid "Station"
-msgstr "Stanica"
+msgstr "Stanica lanovky"
msgctxt "aerialway"
msgid "Edit Station"
-msgstr "Upraviť stanicu"
+msgstr "Upraviť stanicu lanovky"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Stožiar"
+msgstr "Stožiar (pylón)"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Upraviť stožiar"
@@ -16074,20 +16824,20 @@ msgid "Edit Parking"
msgstr "Upraviť parkovisko"
msgid "multi-storey"
-msgstr "mnohoposchodový"
+msgstr "viacposchodové"
msgid "surface"
-msgstr "povrch"
+msgstr "povrchové"
msgid "underground"
-msgstr "podzemie"
+msgstr "podzemné"
+
+msgid "rooftop"
+msgstr "zastrešené"
msgid "Access"
msgstr "Prístup"
-msgid "customers"
-msgstr "zákazníci"
-
msgid "Park and Ride"
msgstr "P+R parkovisko"
@@ -16115,9 +16865,6 @@ msgstr "Parkovacie miesto"
msgid "Edit Parking space"
msgstr "Upraviť parkovacie miesto"
-msgid "rooftop"
-msgstr "zastrešené"
-
msgid "Capacity"
msgstr "Kapacita"
@@ -16133,26 +16880,43 @@ msgstr "časový limit (min)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Strážené"
-
msgid "Opening Hours"
msgstr "Otváracia doba"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
+
+msgid "Sa-Su 00:00-24:00"
+msgstr "Sa-Su 00:00-24:00"
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+
+msgid "sunrise-sunset"
+msgstr "sunrise-sunset (východ-západ slnka)"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr "Su 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgid "Parking entrance"
msgstr "Vstup na parkovisko"
msgid "Edit Parking entrance"
-msgstr "Upraviť Vstup na parkovisko"
+msgstr "Upraviť vstup na parkovisko"
msgid "Fuel"
msgstr "Čerpacia stanica"
@@ -16236,10 +17000,10 @@ msgid "convenience"
msgstr "príslušenstvo"
msgid "kiosk"
-msgstr ""
+msgstr "stánok (trafika)"
msgid "Fuel types:"
-msgstr "Typy palív"
+msgstr "Typy palív:"
msgid "Diesel"
msgstr "Nafta"
@@ -16248,7 +17012,7 @@ msgid "Bio Diesel"
msgstr "Bio nafta"
msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
+msgstr "Nafta (zo skvapalneného plynu - najkvalitnejšia, syntetická)"
msgid "Diesel for Heavy Good Vehicles"
msgstr "Nafta pre ťažké nákladné automobily"
@@ -16272,10 +17036,10 @@ msgid "Octane 100"
msgstr "100 oktánový"
msgid "E10 (10% Ethanol mix)"
-msgstr "E10 (10% Ethanol mix)"
+msgstr "E10 (10% Etanol mix)"
msgid "E85 (85% Ethanol mix)"
-msgstr "E85 (85% Ethanol mix)"
+msgstr "E85 (85% Etanol mix)"
msgid "LPG (Liquefied petroleum gas)"
msgstr "LPG (Skvapalnený ropný plyn)"
@@ -16295,6 +17059,9 @@ msgstr "Nabíjacia stanica (pre elektromobily)"
msgid "Edit Charging Station (for electric cars)"
msgstr "Upraviť nabíjaciu stanicu"
+msgid "Voltage"
+msgstr "Napätie"
+
msgid "Amperage"
msgstr "Prúd (A)"
@@ -16302,7 +17069,7 @@ msgid "Wash"
msgstr "Umývačka"
msgid "Edit Car Wash"
-msgstr "Upraviť umývačku aut"
+msgstr "Upraviť umývačku áut"
msgid "Car Dealer"
msgstr "Predajca automobilov"
@@ -16316,6 +17083,12 @@ msgstr "Servis"
msgid "Edit Car Repair"
msgstr "Upraviť autoservis"
+msgid "Parts"
+msgstr "Náhradné diely"
+
+msgid "Edit Car Parts"
+msgstr "Upraviť obchod s náhradnými dielmi"
+
msgid "Tyres"
msgstr "Pneumatiky"
@@ -16343,6 +17116,12 @@ msgstr "Požičovňa"
msgid "Edit Car Rental"
msgstr "Upraviť autopožičovňu"
+msgid "Second hand"
+msgstr "použitý tovar (second hand)"
+
+msgid "only"
+msgstr "výhradne"
+
msgid "Sharing"
msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -16350,13 +17129,13 @@ msgid "Edit Car Sharing"
msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
msgid "Edit Motorcycle Parking"
-msgstr "Upraviť Parkovisko pre motocykle"
+msgstr "Upraviť parkovisko pre motocykle"
msgid "Motorcycle Dealer"
msgstr "Predajca motocyklov"
msgid "Edit Shop Motorcycle"
-msgstr "Upraviť Motocyklový obchod"
+msgstr "Upraviť motocyklový obchod"
msgid "independent"
msgstr "Rôzne"
@@ -16367,22 +17146,6 @@ msgstr "Služby:"
msgid "Sale"
msgstr "Predaj"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "áno"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "značka"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "použité"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "nie"
-
msgid "brand"
msgstr "značka"
@@ -16404,9 +17167,6 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Náhradné diely"
-
msgid "Clothes"
msgstr "Oblečenie"
@@ -16417,10 +17177,10 @@ msgid "anchors"
msgstr "držiaky"
msgid "ground_slots"
-msgstr ""
+msgstr "zárezy v zemi"
msgid "informal"
-msgstr "každodenný"
+msgstr "neoficiálny"
msgid "lockers"
msgstr "skrinky"
@@ -16429,10 +17189,10 @@ msgid "shed"
msgstr "prístrešok"
msgid "stands"
-msgstr "stojan"
+msgstr "stojany"
msgid "wall_loops"
-msgstr "držiak"
+msgstr "držiaky na kolesá"
msgid "Covered"
msgstr "Kryté"
@@ -16470,14 +17230,14 @@ msgstr "Upraviť požičovňu bicyklov"
msgid "Public Transport"
msgstr "Hromadná doprava"
-msgid "Route"
-msgstr "Cesta (Route)"
+msgid "Public transport route"
+msgstr "Trasa hromadnej dopravy"
msgid "Edit Route"
-msgstr "Upraviť Cestu (Route)"
+msgstr "Upraviť trasu (route)"
msgid "Route type"
-msgstr "Typ Cesty (Route)"
+msgstr "Typ trasy (route)"
msgid "train"
msgstr "vlak"
@@ -16486,7 +17246,7 @@ msgid "subway"
msgstr "metro (subway)"
msgid "monorail"
-msgstr "jednokoľajnicové visutá dráha"
+msgstr "jednokoľajová visutá dráha (monorail)"
msgid "tram"
msgstr "električka"
@@ -16498,7 +17258,7 @@ msgid "trolleybus"
msgstr "trolejbus"
msgid "aerialway"
-msgstr "Visuté cesty/Lanovky"
+msgstr "visutá cesta/lanovka"
msgid "ferry"
msgstr "trajekt (prievoz)"
@@ -16510,7 +17270,7 @@ msgid "To (terminal stop)"
msgstr "Do (posledná zastávka)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "Cez (zastávka)"
msgid "Network"
msgstr "Sieť"
@@ -16551,7 +17311,7 @@ msgid "#CD853F"
msgstr "#CD853F"
msgid "route segment"
-msgstr "cestný úsek"
+msgstr "úsek trasy"
msgid "stop position"
msgstr "poloha zastávky"
@@ -16572,58 +17332,61 @@ msgid "platform (entry only)"
msgstr "nástupište (iba nástupy)"
msgid "Route master"
-msgstr ""
+msgstr "Sada trás (route master)"
msgid "Edit Route master"
-msgstr ""
+msgstr "Upraviť sadu trás"
msgid "route variant/direction (at least 2)"
-msgstr ""
+msgstr "varianta trasy/smer (minimálne dve)"
msgid "Stop Area"
-msgstr ""
+msgstr "Oblasť zastávky"
msgid "Edit Stop Area"
-msgstr ""
+msgstr "Upraviť oblasť zastávky"
msgid "UIC reference"
-msgstr ""
+msgstr "UIC číslo"
msgid "UIC name"
-msgstr ""
+msgstr "UIC názov"
msgid "Stop Position"
-msgstr "Poloha Zastávky"
+msgstr "Miesto zastavenia"
msgid "Platform"
msgstr "Nástupište"
msgid "Station or amenities"
-msgstr ""
+msgstr "Stanica alebo vybavenosť"
+
+msgid "Edit Stop Position"
+msgstr "Upraviť miesto zastavenia"
msgid "Bus"
msgstr "Autobus"
msgid "Bus stop (legacy)"
-msgstr ""
+msgstr "Autobusová zastávka (zastaralé)"
msgid "Tram stop (legacy)"
-msgstr ""
+msgstr "Električková zastávka (zastaralé)"
msgid "Train"
msgstr "Vlak"
msgid "Railway station (legacy)"
-msgstr ""
+msgstr "Železničná stanica (zastaralé)"
msgid "Railway halt (legacy)"
-msgstr ""
+msgstr "Železničná zastávka (zastaralé)"
msgid "Trolleybus"
msgstr "Trolejbus"
msgid "Share taxi"
-msgstr ""
+msgstr "Zdieľané taxi"
msgid "Funicular"
msgstr "Lanovka"
@@ -16631,6 +17394,9 @@ msgstr "Lanovka"
msgid "Ferry"
msgstr "Trajekt"
+msgid "Edit Platform"
+msgstr "Upraviť nástupište"
+
msgid "Bench"
msgstr "Lavička"
@@ -16643,20 +17409,22 @@ msgstr "Invalidný vozík"
msgid "limited"
msgstr "omedzený"
-msgid "only"
-msgstr "iba"
-
msgid "Highway platform (legacy)"
-msgstr ""
+msgstr "Cestné nástupište (zastaralé)"
msgid "Railway platform (legacy)"
-msgstr ""
+msgstr "Železničné nástupište (zastaralé)"
msgid "funicular"
msgstr "lanovka"
+msgctxt "railway"
msgid "Station"
-msgstr "Stanica"
+msgstr "Železničná stanica"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Upraviť železničnú stanicu"
msgid "Building"
msgstr "Budova"
@@ -16670,6 +17438,9 @@ msgstr "Upraviť vchod do metra"
msgid "Ticket Machine"
msgstr "Automat na lístky"
+msgid "Edit Ticket Machine"
+msgstr "Upraviť automat na lístky"
+
msgid "Reference Number"
msgstr "Referenčné číslo"
@@ -16692,18 +17463,10 @@ msgid "Account or loyalty cards"
msgstr "Prístupové alebo vernostné karty"
msgid "Public Transport (legacy)"
-msgstr ""
-
-msgctxt "railway"
-msgid "Station"
-msgstr "Železničná stanica"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Upraviť železničnú stanicu"
+msgstr "Hromadná doprava (zastaralé)"
msgid "UIC-Reference"
-msgstr "UIC-Reference"
+msgstr "UIC-Číslo"
msgid "Railway Halt"
msgstr "Železničná zastávka"
@@ -16739,7 +17502,7 @@ msgid "Edit Bus Stop"
msgstr "Upraviť autobusovú zastávku"
msgid "Tactile Paving"
-msgstr "Hmatové Dlažby"
+msgstr "Dlažba pre nevidiacich"
msgid "Bus Platform"
msgstr "Autobusové nástupište"
@@ -16750,17 +17513,17 @@ msgstr "Upraviť autobusové nástupište"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Upraviť stanicu taxíkov"
+msgid "Edit Taxi Station"
+msgstr "Upraviť stanovište taxíkov"
msgid "Airport"
msgstr "Letisko"
msgid "Airport Ground"
-msgstr "Letisko, pozemné"
+msgstr "Územie letiska"
msgid "Edit Airport Ground"
-msgstr "Upraviť pozemné letisko"
+msgstr "Upraviť územie letiska"
msgid "IATA"
msgstr "IATA"
@@ -16804,12 +17567,27 @@ msgstr "Terminál"
msgid "Edit Terminal"
msgstr "Upraviť terminál"
+msgid "Internet access"
+msgstr "Prístup na internet"
+
+msgid "wlan"
+msgstr "wifi"
+
+msgid "wired"
+msgstr "káblový"
+
+msgid "terminal"
+msgstr "terminál"
+
+msgid "Internet access fee"
+msgstr "Poplatok za prístup na internet"
+
msgctxt "airport"
msgid "Gate"
msgstr "Brána"
msgid "Edit Terminal Gate"
-msgstr "Upraviť terminál"
+msgstr "Upraviť bránu k lietadlám (Gate)"
msgid "Facilities"
msgstr "Občianska vybavenosť"
@@ -16826,21 +17604,6 @@ msgstr "Upraviť hotel"
msgid "Stars"
msgstr "Hviezdičkový"
-msgid "Internet access"
-msgstr "Prístup na internet"
-
-msgid "wlan"
-msgstr "wifi"
-
-msgid "wired"
-msgstr "káblový"
-
-msgid "terminal"
-msgstr "terminál"
-
-msgid "Internet access fee"
-msgstr "Poplatok za prístup na internet"
-
msgid "Smoking"
msgstr "Pre fajčiarov"
@@ -16902,7 +17665,7 @@ msgid "Tents allowed"
msgstr "Povolenie pre stany"
msgid "Camping Site"
-msgstr "Stanový tábor"
+msgstr "Stanový tábor (kemp)"
msgid "Edit Camping Site"
msgstr "Upraviť stanový tábor"
@@ -16929,7 +17692,7 @@ msgid "pizza"
msgstr "pizza"
msgid "burger"
-msgstr "hamburger"
+msgstr "hamburgery"
msgid "greek"
msgstr "grécka"
@@ -16941,7 +17704,7 @@ msgid "indian"
msgstr "indická"
msgid "regional"
-msgstr "regionálna"
+msgstr "regionálna (domáca)"
msgid "kebab"
msgstr "kebab"
@@ -16965,7 +17728,7 @@ msgid "french"
msgstr "francúzska"
msgid "sandwich"
-msgstr "sendvič"
+msgstr "sendviče"
msgid "sushi"
msgstr "sushi"
@@ -16974,22 +17737,22 @@ msgid "Microbrewery"
msgstr "Minipivovar"
msgid "Fast Food"
-msgstr "Rýchle občerstvenie"
+msgstr "Rýchle občerstvenie (fast food)"
msgid "Edit Fast Food Restaurant"
msgstr "Upraviť reštauráciu rýchleho občerstvenia"
msgid "fish_and_chips"
-msgstr ""
+msgstr "ryba a hranolky (UK)"
msgid "chicken"
msgstr "kura"
msgid "Food Court"
-msgstr ""
+msgstr "Jedálenská zóna"
msgid "Edit Food Court"
-msgstr ""
+msgstr "Upraviť jedálenskú zonu"
msgid "Cafe"
msgstr "Kaviareň"
@@ -17024,6 +17787,12 @@ msgstr "Nočný klub"
msgid "Edit Nightclub"
msgstr "Upraviť nočný klub"
+msgid "Stripclub"
+msgstr "Striptízový klub"
+
+msgid "Edit Stripclub"
+msgstr "Upraviť striptízový klub"
+
msgid "Tourism"
msgstr "Turistika"
@@ -17040,14 +17809,20 @@ msgid "Edit Viewpoint"
msgstr "Upraviť výhliadku"
msgid "Look-Out Tower"
-msgstr "Výhliadková veža"
+msgstr "Vyhliadková veža"
msgid "Information Office"
msgstr "Informačná kancelária"
+msgid "Edit Information Office"
+msgstr "Upraviť informačnú kanceláriu"
+
msgid "Map"
msgstr "Mapa"
+msgid "Edit Information Map"
+msgstr "Upraviť informačnú mapu"
+
msgid "Detail Grade"
msgstr "Úroveň detailu"
@@ -17060,11 +17835,14 @@ msgstr "pouličná sieť"
msgid "scheme"
msgstr "prehľadová (orientačná)"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Zobrazená oblasť"
msgid "site"
-msgstr "miesto (blízke okolie)"
+msgstr "miesto/areál (blízke okolie)"
msgid "city"
msgstr "mesto (city)"
@@ -17076,7 +17854,7 @@ msgid "Closer Description"
msgstr "Bližší popis"
msgid "Routes shown for:"
-msgstr "Zobrazené cesty sú pre:"
+msgstr "Zobrazené trasy sú pre:"
msgid "Hiking"
msgstr "Turistika"
@@ -17099,8 +17877,11 @@ msgstr "... iný druh prepravy"
msgid "Information Board"
msgstr "Informačná tabuľa"
+msgid "Edit Information Board"
+msgstr "Upraviť informačnú tabuľu"
+
msgid "Board Content"
-msgstr "Informačný panel s radami (board content)"
+msgstr "Informácie na tabuli"
msgid "notice"
msgstr "upozornenie"
@@ -17112,31 +17893,43 @@ msgid "nature"
msgstr "príroda"
msgid "wildlife"
-msgstr "divoká príroda"
+msgstr "živočíšstvo"
msgid "plants"
-msgstr "závod"
+msgstr "rastlinstvo"
msgid "Guidepost"
msgstr "Rázcestník (ukazovateľ smeru)"
+msgid "Edit Guidepost"
+msgstr "Upraviť rázcestník"
+
msgid "Information Terminal"
msgstr "Informačný terminál"
+msgid "Edit Information Terminal"
+msgstr "Upraviť informačný terminál"
+
msgid "Closer description"
msgstr "Bližší popis"
msgid "Audioguide"
msgstr "Audiosprievodca"
+msgid "Edit Audioguide"
+msgstr "Upraviť audiosprievodcu"
+
msgid "Audioguide via mobile phone?"
msgstr "Audiosprievodca cez mobilný telefón?"
msgid "Phone number"
msgstr "Číslo telefónu"
-msgid "Other Information Points"
-msgstr "Ostatné (iné) informačné body (miesta)"
+msgid "Other Information Point"
+msgstr "Iný informačný bod"
+
+msgid "Edit Information Point"
+msgstr "Upraviť infromačný bod"
msgid "Leisure"
msgstr "Voľný čas"
@@ -17159,9 +17952,6 @@ msgstr "Cvičisko pre psov"
msgid "Edit Dog Park"
msgstr "Upraviť cvičisko pre psov"
-msgid "Barrier"
-msgstr "Zábrana"
-
msgid "fence"
msgstr "plot"
@@ -17172,7 +17962,7 @@ msgid "Theme Park"
msgstr "Zábavný park"
msgid "Edit Theme Park"
-msgstr "Edit Theme Park"
+msgstr "Upraviť zábavný park"
msgid "Water Park"
msgstr "Vodný zábavný park"
@@ -17184,19 +17974,28 @@ msgid "Sauna"
msgstr "Sauna"
msgid "Edit Sauna"
-msgstr "Upraviť Saunu"
+msgstr "Upraviť saunu"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
+msgid "Horse riding"
+msgstr "Jazdenie na koni"
+
+msgid "Edit Horse riding"
+msgstr "Upraviť jazdenie na koni"
+
+msgid "Brothel"
+msgstr "Nevestinec"
+
+msgid "Edit Brothel"
+msgstr "Upraviť nevestinec"
msgid "Playground"
-msgstr "Ihrisko"
+msgstr "Detské ihrisko"
msgid "Edit Playground"
-msgstr "Upraviť ihrisko"
+msgstr "Upraviť detské ihrisko"
msgid "Picnic Site"
-msgstr "Výletné miesto"
+msgstr "Výletné miesto (piknik)"
msgid "Edit Picnic Site"
msgstr "Upraviť výletné miesto"
@@ -17208,7 +18007,7 @@ msgid "Public Grill"
msgstr "Verejný gril"
msgid "Edit Public Grill"
-msgstr ""
+msgstr "Upraviť verejný gril"
msgctxt "grill"
msgid "Fuel"
@@ -17248,10 +18047,10 @@ msgid "Edit Library"
msgstr "Upraviť knižnicu"
msgid "Arts Centre"
-msgstr "Kultúrne stredisko"
+msgstr "Stredisko umenia"
msgid "Edit Arts Centre"
-msgstr "Upraviť kultúrne stredisko"
+msgstr "Upraviť stredisko umienia"
msgid "Artwork"
msgstr "Umelecké dielo"
@@ -17259,50 +18058,44 @@ msgstr "Umelecké dielo"
msgid "Edit Artwork"
msgstr "Upraviť umelecké dielo"
-msgid "Place of Worship"
-msgstr "Kostol"
-
-msgid "Edit Place of Worship"
-msgstr "Upraviť kostol"
-
-msgid "Religion"
-msgstr "Náboženstvo"
+msgid "Recording Studio"
+msgstr "Nahrávacie štúdio"
-msgid "bahai"
-msgstr "baháisti"
+msgid "Edit Studio"
+msgstr "Upraviť nahrávacie štúdio"
-msgid "buddhist"
-msgstr "budhisti"
+msgid "audio"
+msgstr "hudba (audio)"
-msgid "christian"
-msgstr "kresťania"
+msgid "video"
+msgstr "filmy (video)"
-msgid "hindu"
-msgstr "hinduisti"
+msgid "Place of Worship"
+msgstr "Náboženské miesto (chrám)"
-msgid "jain"
-msgstr "džinisti"
+msgid "Church"
+msgstr "Kostol"
-msgid "jewish"
-msgstr "judaisti"
+msgid "Edit Church"
+msgstr "Upraviť kostol"
-msgid "muslim"
-msgstr "moslimovia"
+msgid "Building type"
+msgstr "Typ budovy"
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr "bazilika"
-msgid "spiritualist"
-msgstr "spiritualisti"
+msgid "cathedral"
+msgstr "katedrála"
-msgid "taoist"
-msgstr "taoisti"
+msgid "chapel"
+msgstr "kaplnka"
-msgid "unitarian"
-msgstr "unitársky"
+msgid "church"
+msgstr "kostol"
-msgid "zoroastrian"
-msgstr "zoroastrian"
+msgid "temple"
+msgstr "chrám"
msgid "Denomination"
msgstr "Vyznanie (cirkevné)"
@@ -17319,65 +18112,178 @@ msgstr "katolícka"
msgid "evangelical"
msgstr "evanjelikánska"
+msgid "greek_catholic"
+msgstr "grékokatolícka"
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
-msgstr "svedkovia jehovovi"
+msgstr "svedkovia Jehovovi"
msgid "lutheran"
-msgstr "lutheránska"
+msgstr "luteránska"
msgid "methodist"
-msgstr "methodistická"
+msgstr "metodistická"
msgid "mormon"
msgstr "mormónska"
+msgid "new_apostolic"
+msgstr "novoapoštolská"
+
msgid "orthodox"
-msgstr "orthodoxná"
+msgstr "ortodoxná"
msgid "pentecostal"
msgstr "pentecostal"
msgid "presbyterian"
-msgstr "presbiteriánska"
+msgstr "presbyteriánska"
msgid "protestant"
-msgstr "protestanská"
+msgstr "protestantská"
msgid "quaker"
msgstr "quakerská"
+msgid "roman_catholic"
+msgstr "rímskokatolícka"
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "Čas služieb"
+
+msgid "18:00"
+msgstr "18:00"
+
+msgid "sunset,sunrise"
+msgstr "sunset,sunrise (západ, východ slnka)"
+
+msgid "Su 9:30,11:00"
+msgstr "Su 9:30,11:00"
+
+msgid "Sa,Su,PH 9:00"
+msgstr "Sa,Su,PH 9:00"
+
+msgid "Sa 18:00; Su 10:45"
+msgstr "Sa 18:00; Su 10:45"
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+
+msgid "Sa 10:00+"
+msgstr "Sa 10:00+"
+
+msgid "Mosque"
+msgstr "Mešita"
+
+msgid "Edit Mosque"
+msgstr "Upraviť mešitu"
+
+msgid "mosque"
+msgstr "mešita"
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "šiítska"
msgid "sunni"
msgstr "sunnitská"
-msgid "Service Times"
-msgstr "Čas služieb"
+msgid "Synagogue"
+msgstr "Synagóga"
-msgid "Su 10:00"
-msgstr "Ne 10:00"
+msgid "Edit Synagogue"
+msgstr "Upraviť synagógu"
-msgid "Su 10:30"
-msgstr "Ne 10:30"
+msgid "synagogue"
+msgstr "synagóga"
-msgid "Su 11:00"
-msgstr "Ne 11:00"
+msgid "conservative"
+msgstr "konzervatívna"
-msgid "Opening Hours for visiting"
-msgstr "Otváracie hodiny"
+msgid "reform"
+msgstr "reformovaná"
-msgid "Recording Studio"
-msgstr "Nahrávacie štúdio"
+msgid "Buddhist Temple"
+msgstr "Budhistický chrám"
-msgid "Edit Studio"
-msgstr "Upraviť Ateliér"
+msgid "Edit Buddhist Temple"
+msgstr "Upraviť budhistický chrám"
-msgid "audio"
-msgstr "hudba"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "filmy"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr "Hinduistický chrám"
+
+msgid "Edit Hindu Temple"
+msgstr "Upraviť hinduistický chrám"
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr "Šintoistická svätyňa"
+
+msgid "Edit Shinto Shrine"
+msgstr "Upraviť šintoistická svätyňu"
+
+msgid "Other Place of Worship"
+msgstr "Iné náboženské miesto"
+
+msgid "Edit other Place of Worship"
+msgstr "Upraviť iné náboženské miesto"
+
+msgid "Religion"
+msgstr "Náboženstvo"
+
+msgid "bahai"
+msgstr "baháisti"
+
+msgid "jain"
+msgstr "džinisti"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualisti"
+
+msgid "taoist"
+msgstr "taoisti"
+
+msgid "unitarian"
+msgstr "unitárski"
+
+msgid "zoroastrian"
+msgstr "zoroastrian"
msgid "Public Building"
msgstr "Verejná budova"
@@ -17410,7 +18316,7 @@ msgid "Prison"
msgstr "Väzenie"
msgid "Edit Prison"
-msgstr "Upraviť súd"
+msgstr "Upraviť väzenie"
msgid "Police"
msgstr "Polícia"
@@ -17440,16 +18346,16 @@ msgid "Edit Kindergarten"
msgstr "Upraviť škôlku"
msgid "School"
-msgstr "Škola"
+msgstr "Základná škola"
msgid "Edit School"
-msgstr "Upraviť školu"
+msgstr "Upraviť základnú školu"
msgid "University"
-msgstr "Univerzita"
+msgstr "Univerzita (Vysoká škola)"
msgid "Edit University"
-msgstr "Upraviť Univerzitu"
+msgstr "Upraviť univerzitu"
msgid "College"
msgstr "Stredná škola"
@@ -17466,6 +18372,12 @@ msgstr "Upraviť autoškolu"
msgid "License Classes"
msgstr "Skupiny"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Zdravie"
@@ -17475,6 +18387,12 @@ msgstr "Nemocnica"
msgid "Edit Hospital"
msgstr "Upraviť nemocnicu"
+msgid "Clinic"
+msgstr "Klinika"
+
+msgid "Edit Clinic"
+msgstr "Upraviť kliniku"
+
msgid "Doctors"
msgstr "Lekári"
@@ -17488,16 +18406,16 @@ msgid "Edit Dentist"
msgstr "Upraviť zubného lekára"
msgid "Nursing Home"
-msgstr "Sanatórium"
+msgstr "Sanatórium s opaterou"
msgid "Edit Nursing Home"
-msgstr "Upraviť Sanatórium"
+msgstr "Upraviť sanatórium"
msgid "Retirement Home"
msgstr "Domov dôchodcov"
msgid "Edit Retirement Home"
-msgstr "Upraviť Domov dôchodcov"
+msgstr "Upraviť domov dôchodcov"
msgid "Pharmacy"
msgstr "Lekáreň"
@@ -17506,13 +18424,13 @@ msgid "Edit Pharmacy"
msgstr "Upraviť lekáreň"
msgid "Dispensing"
-msgstr "Výdaj na recepty"
+msgstr "Výdaj na recept"
msgid "Hearing Aids"
msgstr "Sluchové pomôcky"
msgid "Edit Hearing Aids"
-msgstr ""
+msgstr "Upraviť sluchové pomôcky"
msgid "Baby Hatch"
msgstr "Hniezdo záchrany"
@@ -17521,10 +18439,10 @@ msgid "Edit Baby Hatch"
msgstr "Upraviť hniezdo záchrany"
msgid "Emergency Access Point"
-msgstr "Pohotovosť (Záchranná služba)"
+msgstr "Bod pre príchod záchrannej služby"
msgid "Edit Emergency Access Point"
-msgstr "Upraviť pohotovosť (záchrannú službu)"
+msgstr "Upraviť bod pre príchod záchrannej služby"
msgid "Point Number"
msgstr "Číslo bodu"
@@ -17541,12 +18459,66 @@ msgstr "Veterinár"
msgid "Edit Veterinary"
msgstr "Upraviť veterinárnu ambulanciu"
-msgid "Note"
-msgstr "Poznámka"
+msgid "Edit Toilets"
+msgstr "Upraviť toalety"
+
+msgid "Access rights"
+msgstr "Oprávnenie prístupu"
+
+msgid "public"
+msgstr "verejné"
+
+msgid "seasonal"
+msgstr "sezónne"
+
+msgid "flush"
+msgstr "splachovacie"
+
+msgid "pitlatrine"
+msgstr "latrína (diera v zemi)"
+
+msgid "chemical"
+msgstr "chemické"
+
+msgid "bucket"
+msgstr "do nádoby"
+
+msgid "Usage Position"
+msgstr "Spôsob použitia"
+
+msgid "seated"
+msgstr "sedenie"
+
+msgid "seated;urinal"
+msgstr "sedenie+pisoár"
+
+msgid "squat"
+msgstr "čupenie"
+
+msgid "urinal"
+msgstr "pisoár"
msgid "Post Box"
msgstr "Poštová schránka"
+msgid "Edit Postbox"
+msgstr "Upraviť poštovú schránku"
+
+msgid "Collection times"
+msgstr "Čas výberu pošty"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+
+msgid "Drive through"
+msgstr "Prejazd"
+
msgid "Telephone"
msgstr "Telefón"
@@ -17556,48 +18528,78 @@ msgstr "Upraviť telefón"
msgid "Telephone cards"
msgstr "Telefónne karty"
+msgid "Emergency Phone"
+msgstr "Núdzový telefón"
+
+msgid "Internet Access"
+msgstr "Prístup na Internet"
+
+msgid "Edit Internet Access"
+msgstr "Upraviť prístup na Internet"
+
+msgid "Automated Defibrillator"
+msgstr "Automatický defibrilátor"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Upraviť automatický defibrilátor"
+
+msgid "Located inside a building?"
+msgstr "Umiestnený vnútri budovy"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Dátum poslednej kontroly"
+
+msgid "Last check note"
+msgstr "Poznámka z poslednej kontroly"
+
msgid "Clock"
msgstr "Hodiny"
msgid "Edit Clock"
-msgstr ""
+msgstr "Upraviť hodiny"
msgid "Display"
-msgstr "Zobraziť"
+msgstr "Zobrazenie"
-msgctxt "display"
msgid "analog"
msgstr "analógové"
-msgctxt "display"
msgid "digital"
msgstr "digitálne"
-msgctxt "display"
msgid "sundial"
-msgstr "slenečné"
+msgstr "slnečné"
-msgctxt "display"
msgid "unorthodox"
-msgstr "neortodoxný"
+msgstr "nezvyčajné"
msgid "Support"
-msgstr "Umiestnenie"
+msgstr "Upevnenie"
-msgid "wall_mounted"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "stĺp"
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
msgstr "na stene"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "billboard"
+msgstr "na bilboarde"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "na zemi"
msgid "Visibility/readability"
msgstr "Viditeľnosť/čitateľnosť"
msgid "house (up to 5m)"
-msgstr "dom (viac ako 5 m)"
+msgstr "dom (do 5 m)"
msgid "street (up to 20m)"
-msgstr "ulica (viac ako 20 m)"
+msgstr "ulica (do 20 m)"
msgid "area (more than 20m)"
msgstr "oblasť (viac ako 20 m)"
@@ -17609,7 +18611,7 @@ msgid "Shows temperature"
msgstr "Zobrazuje teplotu"
msgid "Shows barometric pressure"
-msgstr "Zobrazuje tlak"
+msgstr "Zobrazuje atmosférický tlak"
msgid "Shows humidity"
msgstr "Zobrazuje vlhkosť"
@@ -17617,8 +18619,8 @@ msgstr "Zobrazuje vlhkosť"
msgid "Recycling"
msgstr "Recyklácia"
-msgid "Edit Recycling station"
-msgstr "Upraviť recykláciu (zber)"
+msgid "Edit Recycling Station"
+msgstr "Upraviť recyklačnú stanicu"
msgid "Batteries"
msgstr "Batérie"
@@ -17644,27 +18646,15 @@ msgstr "stredisko"
msgid "Waste Basket"
msgstr "Odpadkový kôš"
-msgid "Edit Waste Basket"
-msgstr "Upraviť odpadkový kôš"
-
msgid "Waste Disposal"
-msgstr "Odpadkový kôš"
+msgstr "Zhromaždisko odpadu (napr. kontajner)"
-msgid "Edit Waste Disposal"
-msgstr "Upraviť Nakladanie s odpadmi"
+msgid "Edit Bench"
+msgstr "Upraviť lavičku"
msgid "Backrest"
msgstr "Operadlo chrbta (Backrest)"
-msgid "Material"
-msgstr "Materiál"
-
-msgid "stone"
-msgstr "kameň"
-
-msgid "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Počet sedadiel"
@@ -17676,19 +18666,19 @@ msgstr "Typ prístrešku"
msgctxt "shelter"
msgid "weather_shelter"
-msgstr "Prístrešok proti zlému počasiu"
+msgstr "prístrešok proti zlému počasiu"
msgctxt "shelter"
msgid "public_transport"
-msgstr "Verejná doprava"
+msgstr "hromadná doprava"
msgctxt "shelter"
msgid "picnic_shelter"
-msgstr "Prístrešok pre pikniky"
+msgstr "prístrešok pre pikniky"
msgctxt "shelter"
msgid "wildlife_hide"
-msgstr "Posed v prírode"
+msgstr "skrýša na pozorovanie zveri"
msgid "Hunting Stand"
msgstr "Poľovnícky posed"
@@ -17699,32 +18689,35 @@ msgstr "Upraviť poľovnícky posed"
msgid "Height"
msgstr "Výška"
+msgctxt "height"
msgid "low"
-msgstr "nízky"
+msgstr "nízka"
+msgctxt "height"
msgid "half"
-msgstr "polovičný"
+msgstr "polovičná"
+msgctxt "height"
msgid "full"
-msgstr "úplný"
+msgstr "plná"
msgid "Hide"
-msgstr "Skryť"
+msgstr "Skrýša"
msgid "Lock"
-msgstr "Zamknúť"
+msgstr "Zámok"
-msgid "Drinking Water"
-msgstr "Pitná voda"
+msgid "Edit Source of Potable Water"
+msgstr "Upraviť zdroj pitnej vody"
-msgid "Edit Drinking Water"
-msgstr "Upraviť pitnú vodu"
+msgid "Indoor"
+msgstr "V budove"
msgid "Fire Hydrant"
-msgstr "Hydrant"
+msgstr "Požiarny hydrant"
msgid "Edit Fire Hydrant"
-msgstr "Upraviť hydrant"
+msgstr "Upraviť požiarny hydrant"
msgctxt "pipeline"
msgid "underground"
@@ -17745,9 +18738,12 @@ msgstr "nádrž"
msgid "Diameter (in mm)"
msgstr "Priemer (v mm)"
+msgid "Hydrant Position"
+msgstr "Umiestnenie"
+
msgctxt "hydrant position"
msgid "lane"
-msgstr "ochranné okolie"
+msgstr "jazdný pruh"
msgctxt "hydrant position"
msgid "parking_lot"
@@ -17765,7 +18761,7 @@ msgid "Pressure (in bar)"
msgstr "Tlak (v baroch)"
msgid "suction"
-msgstr ""
+msgstr "bez tlaku"
msgid "Count"
msgstr "Počet"
@@ -17782,121 +18778,157 @@ msgstr "Štadión"
msgid "Edit Stadium"
msgstr "Upraviť štadión"
-msgid "select sport:"
-msgstr "vyberte šport:"
+msgid "Select sport:"
+msgstr "Vyberte šport:"
-msgid "sport"
-msgstr "šport"
+msgid "Sport"
+msgstr "Šport"
+msgctxt "sport"
msgid "multi"
-msgstr "multi"
+msgstr "rôzne športy"
+msgctxt "sport"
msgid "archery"
msgstr "lukostreľba"
+msgctxt "sport"
msgid "athletics"
msgstr "atletika"
+msgctxt "sport"
msgid "american_football"
msgstr "americký futbal"
+msgctxt "sport"
msgid "australian_football"
msgstr "austrálsky futbal"
+msgctxt "sport"
msgid "baseball"
msgstr "baseball"
+msgctxt "sport"
msgid "basketball"
msgstr "basketbal"
+msgctxt "sport"
msgid "boules"
msgstr "boules (spoločný názov pre hry hrajúce sa s kovovými guľami)"
+msgctxt "sport"
msgid "bowls"
msgstr ""
"bowls (gúľanie šišatej gule po umelej, alebo prírodnej tráve k malej guľke)"
+msgctxt "sport"
msgid "canadian_football"
msgstr "kanadský futbal"
+msgctxt "sport"
msgid "canoe"
-msgstr "kanoe"
+msgstr "kanoistika"
+msgctxt "sport"
msgid "climbing"
msgstr "lezenie"
+msgctxt "sport"
msgid "cricket"
msgstr "kriket"
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
"kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
+msgctxt "sport"
msgid "croquet"
msgstr ""
-"croquet (drevenou paličkou-kladovom sa búcha do gule cez obruče vložené do "
+"croquet (drevenou paličkou-kladivom sa búcha do gule cez obruče vložené do "
"trávnika)"
+msgctxt "sport"
msgid "cycling"
-msgstr "bicyklovanie"
+msgstr "cyklistika"
+msgctxt "sport"
msgid "dog_racing"
-msgstr "závody chrtov"
+msgstr "preteky chrtov"
+msgctxt "sport"
msgid "equestrian"
msgstr "jazdectvo"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr ""
+msgstr "galské hry"
+msgctxt "sport"
msgid "golf"
msgstr "golf"
+msgctxt "sport"
msgid "gymnastics"
msgstr "gymnastika"
+msgctxt "sport"
msgid "hockey"
msgstr "hokej"
+msgctxt "sport"
msgid "horse_racing"
msgstr "konské dostihy"
+msgctxt "sport"
msgid "motor"
-msgstr "automobilový"
+msgstr "motošport"
+msgctxt "sport"
msgid "pelota"
msgstr "pelota"
+msgctxt "sport"
msgid "racquet"
msgstr "racquetbal (podobné ako squash, iné pravidlá)"
+msgctxt "sport"
msgid "rugby_league"
-msgstr ""
+msgstr "ragbyová liga"
+msgctxt "sport"
msgid "rugby_union"
-msgstr ""
+msgstr "ragbyová únia"
+msgctxt "sport"
msgid "shooting"
msgstr "streľba"
+msgctxt "sport"
msgid "skateboard"
msgstr "skateboard"
+msgctxt "sport"
msgid "skating"
msgstr "korčuľovanie"
+msgctxt "sport"
msgid "skiing"
msgstr "lyžovanie"
+msgctxt "sport"
msgid "soccer"
-msgstr "futbal (soccer)"
+msgstr "futbal"
+msgctxt "sport"
msgid "swimming"
msgstr "plávanie"
+msgctxt "sport"
msgid "table_tennis"
msgstr "stolný tenis"
+msgctxt "sport"
msgid "tennis"
msgstr "tenis"
@@ -17907,16 +18939,16 @@ msgid "Edit Sports Centre"
msgstr "Upraviť športové centrum"
msgid "Pitch"
-msgstr "Hracia plocha, ihrisko"
+msgstr "Hracia plocha (ihrisko)"
msgid "Edit Pitch"
-msgstr "Upraviť hraciu plochu, ihrisko"
+msgstr "Upraviť hraciu plochu"
msgid "Racetrack"
-msgstr "Dostihová dráha"
+msgstr "Pretekárska dráha"
msgid "Edit Racetrack"
-msgstr "Upraviť dostihovú dráhu"
+msgstr "Upraviť pretekársku dráhu"
msgid "Golf Course"
msgstr "Golfové ihrisko"
@@ -17930,32 +18962,42 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Upraviť minigolf"
-msgid "Sport"
-msgstr "Šport"
-
msgid "Multi"
-msgstr "Multi"
+msgstr "Rôzne športy"
msgid "Edit Multi"
-msgstr "Upraviť Multi"
-
-msgid "type"
-msgstr "typ"
+msgstr "Upraviť rôzne športy"
+msgctxt "running"
msgid "pitch"
-msgstr "hracia plocha, ihrisko"
+msgstr "hracia plocha (ihrisko)"
+msgctxt "running"
msgid "sports_centre"
msgstr "športové centrum"
+msgctxt "running"
msgid "stadium"
msgstr "štadión"
+msgctxt "running"
+msgid "track"
+msgstr "dráha (trať)"
+
msgid "9pin"
-msgstr ""
+msgstr "9-kuželkový bowling"
msgid "Edit 9pin"
-msgstr ""
+msgstr "Upraviť 9-kuželkový bowling"
+
+msgid "pitch"
+msgstr "hracia plocha (ihrisko)"
+
+msgid "sports_centre"
+msgstr "športové centrum"
+
+msgid "stadium"
+msgstr "štadión"
msgid "10pin"
msgstr "10pin (Kolok na hru s desiatimi kolkami)"
@@ -17990,6 +19032,22 @@ msgstr "Upraviť kanoistiku"
msgid "Edit Cycling"
msgstr "Upraviť cyklistiku"
+msgctxt "racing"
+msgid "pitch"
+msgstr "pretekárska plocha"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "športové centrum"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "štadión"
+
+msgctxt "racing"
+msgid "track"
+msgstr "dráha (trať)"
+
msgid "Dog Racing"
msgstr "Preteky chrtov"
@@ -18002,8 +19060,33 @@ msgstr "Jazdectvo"
msgid "Edit Equestrian"
msgstr "Upraviť jazdectvo"
-msgid "horse_riding"
-msgstr "jazda na koni"
+msgctxt "riding"
+msgid "pitch"
+msgstr "ihrisko"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "konské športovisko"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "štadión"
+
+msgctxt "riding"
+msgid "track"
+msgstr "dráha"
+
+msgid "clay"
+msgstr "hlina"
+
+msgid "dirt"
+msgstr "blato"
+
+msgid "fine_gravel"
+msgstr "jemný štrk"
+
+msgid "mud"
+msgstr "blato (mud)"
msgid "Horse Racing"
msgstr "Konské dostihy"
@@ -18021,16 +19104,16 @@ msgid "Skating"
msgstr "Korčuľovanie"
msgid "Edit Skating"
-msgstr "Upraviť korčuľovanie"
+msgstr "Upraviť miesto na korčuľovanie"
msgid "ice_rink"
-msgstr "zimný štadión"
+msgstr "zimný štadión (klzisko)"
msgid "Skateboard"
msgstr "Skateboard"
msgid "Edit Skateboard"
-msgstr "Upraviť Skateboard"
+msgstr "Upraviť skateboardové športovisko"
msgid "Swimming"
msgstr "Plávanie"
@@ -18051,13 +19134,13 @@ msgid "Piste type"
msgstr "Typ lyžiarskej dráhy"
msgid "downhill"
-msgstr "zjazdárska"
+msgstr "zjazdárska (downhill)"
msgid "nordic"
-msgstr "beh nalyžiach hore kopcom (nordic)"
+msgstr "beh na lyžiach (nordic)"
msgid "skitour"
-msgstr ""
+msgstr "lyžiarsky okruh (nordic+downhill)"
msgid "snow_park"
msgstr "park zimných športov"
@@ -18065,38 +19148,56 @@ msgstr "park zimných športov"
msgid "Difficulty"
msgstr "Obtiažnosť"
+msgctxt "piste:difficulty"
msgid "novice"
msgstr "pre začiatočníkov"
+msgctxt "piste:difficulty"
msgid "easy"
msgstr "ľahká"
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "stredne pokročilí"
+
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "pokročilý (advanced)"
+msgstr "pokročilí"
+msgctxt "piste:difficulty"
msgid "expert"
msgstr "pre skúsených"
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
+msgstr "voľný zjazd"
msgid "Grooming"
-msgstr "Bez dozoru"
+msgstr "Úprava trate"
+msgctxt "piste:grooming"
msgid "classic"
-msgstr "klasický"
+msgstr "klasická"
+msgctxt "piste:grooming"
msgid "mogul"
-msgstr "jazda v bubnoch (moguls)"
+msgstr "jazda v bubnoch (mogul)"
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "korčuľovanie na lyžiach"
+
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr ""
+msgstr "klasická+korčuľovanie na lyžiach"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr ""
+msgstr "snežným skútrom"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "backcountry"
+msgstr "cez krajinu (backcountry)"
msgid "Shooting"
msgstr "Streľba"
@@ -18117,13 +19218,13 @@ msgid "Australian Football"
msgstr "Austrálsky futbal"
msgid "Edit Australian Football"
-msgstr "Upraviť Austrálsky futbal"
+msgstr "Upraviť austrálsky futbal"
msgid "American Football"
msgstr "Americký futbal"
msgid "Edit American Football"
-msgstr "Upraviť Americký futbal"
+msgstr "Upraviť americký futbal"
msgid "Canadian Football"
msgstr "Kanadský futbal"
@@ -18132,35 +19233,31 @@ msgid "Edit Canadian Football"
msgstr "Upraviť kanadský futbal"
msgid "Gaelic Games"
-msgstr ""
+msgstr "Galské hry"
msgid "Edit Gaelic Games"
-msgstr ""
+msgstr "Upraviť galské hry"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr ""
+msgstr "Hurling"
-msgctxt "gaelic game"
msgid "Football"
-msgstr "Americký futbal"
+msgstr "Galský futbal"
-msgctxt "gaelic game"
msgid "Camogie"
-msgstr ""
+msgstr "Camogie"
-msgctxt "gaelic game"
msgid "Rounders"
-msgstr ""
+msgstr "Rounders"
msgid "Rugby League"
-msgstr "Ragbyová liga"
+msgstr "Ragbyová liga (1. varianta ragby)"
msgid "Edit Rugby League"
-msgstr "Upraviť Ragbyovú ligu"
+msgstr "Upraviť ragbyovú ligu"
msgid "Rugby Union"
-msgstr "Ragbyová Únia"
+msgstr "Ragbyová Únia (2. varianta ragby)"
msgid "Edit Rugby Union"
msgstr "Upraviť ragbyovú úniu"
@@ -18181,13 +19278,13 @@ msgid "Volleyball"
msgstr "Volejbal"
msgid "Edit Volleyball"
-msgstr "Upraviť Volejbal"
+msgstr "Upraviť volejbal"
msgid "Beachvolleyball"
msgstr "Plážový volejbal"
msgid "Edit Beachvolleyball"
-msgstr "Upraviť Plážový volejbal"
+msgstr "Upraviť plážový volejbal"
msgid "Golf"
msgstr "Golf"
@@ -18238,7 +19335,7 @@ msgid "Pelota"
msgstr "Pelota"
msgid "Edit Pelota"
-msgstr "Upraviť polotu"
+msgstr "Upraviť pelotu"
msgid "Racquet"
msgstr "Racquetbal"
@@ -18262,31 +19359,43 @@ msgid "Motorsport"
msgstr "Motošport"
msgid "Edit Motorsport"
-msgstr "Upraviť Motošport"
+msgstr "Upraviť motošport"
msgid "Karting"
msgstr "Motokáry"
msgid "Edit Karting"
-msgstr "Upraviť Motokáry"
+msgstr "Upraviť motokáry"
msgid "Motocross"
msgstr "Motokros"
msgid "Edit Motocross"
-msgstr "Upraviť Motokros"
+msgstr "Upraviť motokros"
msgid "Safety Training"
-msgstr ""
+msgstr "Bezpečnostný výcvik"
msgid "Edit Safety Training"
-msgstr ""
+msgstr "Upraviť bezpečnostný výcvik"
msgid "Model Aerodrome"
msgstr "Letisko pre modelárov"
msgid "Edit Model Aerodrome"
-msgstr "Upraviť Letisko pre modelárov"
+msgstr "Upraviť letisko pre modelárov"
+
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "ihrisko"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "športové centrum"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "dráha (trať)"
msgid "RC Car"
msgstr "RC Autá"
@@ -18298,61 +19407,135 @@ msgid "Man Made"
msgstr "Človekom vytvorené (Man made)"
msgid "Edit Building"
-msgstr "Upraviť Budovy"
+msgstr "Upraviť budovu"
+
+msgctxt "building"
+msgid "yes"
+msgstr "áno"
+msgctxt "building"
msgid "roof"
msgstr "strecha"
+msgctxt "building"
msgid "garage"
msgstr "garáž"
-msgid "church"
-msgstr "kostol"
+msgctxt "building"
+msgid "garages"
+msgstr "garáže"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "priemyselná"
+msgctxt "building"
msgid "school"
msgstr "škola"
+msgctxt "building"
msgid "hangar"
msgstr "hangár"
+msgctxt "building"
msgid "commercial"
-msgstr "obchodné"
+msgstr "obchodná"
+msgctxt "building"
msgid "farm"
msgstr "farma"
+msgctxt "building"
msgid "transportation"
-msgstr "doprava"
+msgstr "dopravná"
+msgctxt "building"
msgid "greenhouse"
msgstr "skleník"
+msgctxt "building"
msgid "office"
-msgstr "úrad"
+msgstr "úrad/kancelárie"
+msgctxt "building"
msgid "university"
msgstr "univerzita"
+msgctxt "building"
+msgid "hospital"
+msgstr "nemocnica"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "sklad"
+
+msgctxt "building"
+msgid "retail"
+msgstr "maloobchody"
+
+msgctxt "building"
+msgid "shed"
+msgstr "stodola"
+
msgid "Residential Building"
msgstr "Bytový dom"
msgid "Edit Residential Building"
-msgstr "Upraviť Bytový dom"
+msgstr "Upraviť bytový dom"
+msgctxt "building"
+msgid "residential"
+msgstr "obytná"
+
+msgctxt "building"
msgid "apartments"
-msgstr "apartmány"
+msgstr "apartmány (byty)"
+msgctxt "building"
msgid "house"
-msgstr "dom"
+msgstr "rodinný dom"
+msgctxt "building"
msgid "hut"
-msgstr "chata"
+msgstr "chatka"
+
+msgctxt "building"
+msgid "dormitory"
+msgstr "internát"
+msgctxt "building"
msgid "terrace"
msgstr "radová zástavba"
+msgctxt "building"
msgid "detached"
-msgstr "samota"
+msgstr "dom na samote"
+
+msgid "Entrance"
+msgstr "Vchod"
+
+msgid "Edit Entrance"
+msgstr "Upraviť vchod"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "áno"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "hlavný"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "služobný (pre personál)"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "len východ"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "núdzový"
msgid "Tower"
msgstr "Veža"
@@ -18369,9 +19552,6 @@ msgstr "telekomunikačná"
msgid "observation"
msgstr "pozorovateľňa"
-msgid "Height (meters)"
-msgstr "Výška (metre)"
-
msgid "Flagpole"
msgstr "Vlajkový stožiar"
@@ -18394,7 +19574,7 @@ msgid "Edit Windmill"
msgstr "Upraviť veterný mlyn"
msgid "Gasometer"
-msgstr "Plynojem (Gasometer)"
+msgstr "Plynojem (gasometer)"
msgid "Edit Gasometer"
msgstr "Upraviť plynojem (gasometer)"
@@ -18409,16 +19589,16 @@ msgid "water"
msgstr "voda"
msgid "gas"
-msgstr "plynová"
+msgstr "plyn"
msgid "heat"
-msgstr "teplo(heat)"
+msgstr "teplo (heat)"
msgid "oil"
-msgstr "ropa(oil)"
+msgstr "ropa (oil)"
msgid "sewage"
-msgstr "splašky(sewage)"
+msgstr "splašky (sewage)"
msgid "Location"
msgstr "Umiestnenie"
@@ -18429,7 +19609,7 @@ msgstr "pod hladinou"
msgctxt "pipeline"
msgid "overground"
-msgstr "pod zemou"
+msgstr "nad zemou"
msgid "Crane"
msgstr "Žeriav"
@@ -18456,7 +19636,7 @@ msgid "Depth in meters"
msgstr "Hĺbka v metroch"
msgid "Resource"
-msgstr "Prostriedok"
+msgstr "Nerastná surovina"
msgid "aggregate"
msgstr "agregát"
@@ -18492,7 +19672,7 @@ msgid "nickel"
msgstr "nikel"
msgid "rutile"
-msgstr "kysličník titaničitý (rutil)"
+msgstr "rutil (oxid titaničitý)"
msgid "salt"
msgstr "soľ"
@@ -18510,7 +19690,7 @@ msgid "zircon"
msgstr "zirkón"
msgid "Visible Headframe"
-msgstr ""
+msgstr "Viditeľný výťah"
msgid "Disused"
msgstr "Nepoužívaný"
@@ -18534,7 +19714,7 @@ msgid "Water Works"
msgstr "Vodáreň"
msgid "Edit Water Works"
-msgstr "Upraviť Vodáreň"
+msgstr "Upraviť vodáreň"
msgid "Wastewater Plant"
msgstr "Čistička odpadových vôd"
@@ -18546,7 +19726,7 @@ msgid "Watermill"
msgstr "Vodný mlyn"
msgid "Edit Watermill"
-msgstr "Upraviť Vodný mlyn"
+msgstr "Upraviť vodný mlyn"
msgid "Fountain"
msgstr "Fontána"
@@ -18558,7 +19738,7 @@ msgid "Water Well"
msgstr "Studňa"
msgid "Edit Water Well"
-msgstr "Upraviť Studňu"
+msgstr "Upraviť studňu"
msgid "Lighthouse"
msgstr "Maják"
@@ -18581,51 +19761,77 @@ msgstr "Prevádzková doba"
msgid "Mo-Fr 22:00-05:00"
msgstr "Po-Pi 22:00-05:00"
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr "Meracia stanica"
-msgid "Edit Measurement Station"
-msgstr "Upraviť Meraciu stanicu"
+msgid "Edit Monitoring Station"
+msgstr "Upraviť meraciu stanicu"
-msgid "Measurement"
-msgstr "Miery"
+msgid "Monitoring:"
+msgstr "Meraná veličina:"
-msgid "particulate_matter"
-msgstr "častice"
+msgid "Weather"
+msgstr "Počasie"
-msgid "seismic"
-msgstr "seizmický"
+msgid "Water level"
+msgstr "Vodná hladina"
-msgid "water_level"
-msgstr "hladiny vody"
+msgid "Tide Level"
+msgstr "Výška prílivu"
-msgid "weather"
-msgstr "počasie"
+msgid "Traffic"
+msgstr "Premávka"
-msgid "Recording"
-msgstr "Nahrávanie"
+msgid "Air Quality"
+msgstr "Kvalita ovzdušia"
-msgid "manually"
-msgstr "ručne"
+msgid "Noise"
+msgstr "Hluk"
-msgid "automated"
-msgstr "automatizované"
+msgid "GPS Signals"
+msgstr "GPS signál"
-msgid "remote"
-msgstr "diaľkový"
+msgid "GLONASS Signals"
+msgstr "GLONASS signál"
-msgctxt "display"
-msgid "no"
-msgstr "nie"
+msgid "Galileo Signals"
+msgstr "Galileo signál"
+
+msgid "Radiation"
+msgstr "Rádioaktivita"
+
+msgid "Seismic Activity"
+msgstr "Seizmická aktivita"
+
+msgid "Recording:"
+msgstr "Zaznamenávanie"
+
+msgid "Automated"
+msgstr "Automatické"
+
+msgid "Manually"
+msgstr "Manuálne"
+
+msgid "Remote"
+msgstr "Na diaľku"
+
+msgid "Display:"
+msgstr "Zobrazovanie:"
+
+msgid "Analog"
+msgstr "Analógové"
+
+msgid "Digital"
+msgstr "Digitálne"
msgid "Survey Point"
-msgstr "Meračský bod"
+msgstr "Meračský bod (zememeranie/nivelácia)"
msgid "Edit Survey Point"
msgstr "Upraviť meračský bod"
-msgid "Surveillance"
-msgstr "Pozorovanie (ostraha)"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Upraviť pozorovaciu kameru"
@@ -18636,17 +19842,107 @@ msgstr "vnútorný"
msgid "outdoor"
msgstr "vonkajší"
-msgid "public"
-msgstr "verejný"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "obchod"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Výška v metroch (m)"
msgid "Power"
msgstr "Energia"
+msgid "Power Plant"
+msgstr "Elektráreň"
+
+msgid "Edit Power Plant"
+msgstr "Upraviť elektráreň"
+
+msgid "Start date"
+msgstr "Dátum dokončenia stavby"
+
+msgid "Output forms of energy"
+msgstr "Výstupné formy energie"
+
+msgid "(please add this information to the generators if possible)"
+msgstr "(prosím doplňte tieto informácie o generátoroch ak je to možné)"
+
+msgid "electricity"
+msgstr "elektrina"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "horúca voda"
+
+msgid "hot air"
+msgstr "horúci vzduch"
+
+msgid "cold water"
+msgstr "studená voda"
+
+msgid "cold air"
+msgstr "studený vzduch"
+
+msgid "compressed air"
+msgstr "stlačený vzduch"
+
+msgid "steam"
+msgstr "para"
+
+msgid "vacuum"
+msgstr "vákuum"
+
msgid "Power Generator"
-msgstr "Elektráreň (spôsob výroby)"
+msgstr "Generátor (výroba energie)"
msgid "Edit Power Generator"
-msgstr "Upraviť elektráreň (spôsob výroby)"
+msgstr "Upraviť generátor"
msgid "biofuel"
msgstr "biopalivo"
@@ -18664,133 +19960,251 @@ msgid "gasoline"
msgstr "benzín"
msgid "geothermal"
-msgstr "geotermálna"
+msgstr "geotermálna energia"
msgid "hydro"
-msgstr "vodná"
+msgstr "voda"
msgid "nuclear"
-msgstr "jadrová"
+msgstr "atómové jadro"
msgid "osmotic"
-msgstr "osmotický"
+msgstr "osmóza"
msgid "solar"
-msgstr "solárna"
+msgstr "slnečné žiarenie"
msgid "tidal"
-msgstr "prílivová"
+msgstr "príliv"
msgid "waste"
msgstr "odpad"
msgid "wave"
-msgstr "vlna"
+msgstr "vlny"
msgid "wind"
-msgstr "veterná"
+msgstr "vietor"
msgid "Method"
-msgstr "Metóda"
+msgstr "Metóda (spôsob výroby)"
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr "anaeróbne vyhnívanie"
+msgctxt "generator method"
+msgid "barrage"
+msgstr "rozdiel hladín"
+
+msgctxt "generator method"
msgid "combustion"
msgstr "spaľovanie"
-msgid "dam"
-msgstr "priehrada"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "bio / uhlie / nafta / plyn / benzín / ropa / odpad"
+msgctxt "generator method"
msgid "fission"
msgstr "štiepenie"
+msgctxt "generator method"
msgid "fusion"
-msgstr "fúzia"
+msgstr "fúzia (zlučovanie atómov)"
+msgctxt "generator method"
msgid "gasification"
msgstr "splyňovanie"
-msgid "photovoltaic"
-msgstr "fotovoltanická (slnečná články)"
-
-msgid "pumped-storage"
-msgstr "prečerpávacia"
+msgid "biomass / waste"
+msgstr "biomasa / odpad"
-msgid "pumping"
-msgstr "čerpacia"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "fotovoltaická (solárne články)"
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "tepelný rozklad"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "vodná"
+msgstr "tok rieky"
+
+msgctxt "generator method"
+msgid "stream"
+msgstr "prúd (morský)"
+msgctxt "generator method"
msgid "thermal"
msgstr "termálna"
-msgid "Output forms of energy"
-msgstr ""
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "voda prečerpávaná medzi nádržami"
-msgid "electricity"
-msgstr "elektrina"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "vodná nádrž"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Typ generátora"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr "kombinovaný cyklus"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "spaľovanie plynu"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "Francisova turbína"
-msgid "hot water"
-msgstr "horúca voda"
+msgid "gas_turbine"
+msgstr "plynová turbína"
-msgid "hot air"
-msgstr "horúci vzduch"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "spaľovanie bioplynu, biomasy, plynu, odpadu"
-msgid "cold water"
-msgstr "studená voda"
+msgid "heat_pump"
+msgstr "tepelné čerpadlo"
-msgid "cold air"
-msgstr "studený vzduch"
+msgid "horizontal_axis"
+msgstr "vodorovná os"
-msgid "compressed air"
-msgstr "stlačený vzduch"
+msgid "tidal steam / wind"
+msgstr "prílivový prúd / vietor"
-msgid "steam"
-msgstr "para"
+msgid "kaplan_turbine"
+msgstr "Kaplanova turbína"
-msgid "vacuum"
-msgstr "vysávač"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "riečny tok / vodná nádrž / rozdiel vodných hladín pri prílive"
-msgid "battery charging"
-msgstr "nabíjanie batérie"
+msgid "pelton_turbine"
+msgstr "Peltonova turbína"
-msgid "Power Station"
-msgstr "Transformátorová stanica"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "riečny tok / vodná nádrž"
-msgid "Edit Power Station"
-msgstr "Upraviť trafostanicu"
+msgid "reciprocating_engine"
+msgstr "Piestový motor"
-msgid "Power Sub Station"
-msgstr "Malý transformátor"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "biopalivo, bioplyn, nafta, plyn, benzín"
-msgid "Edit Power Sub Station"
-msgstr "Upraviť malý transformátor"
+msgid "solar_photovoltaic_panel"
+msgstr "solárny fotovoltaický panel"
-msgid "Line reference"
-msgstr "Odkazová linka"
+msgid "solar photovoltaic"
+msgstr "solárny fotovoltaický"
-msgid "Cable Distribution Cabinet"
-msgstr "Káblová rozvodná skriňa"
+msgid "solar_thermal_collector"
+msgstr "solárny tepelný kolektor"
-msgid "Edit Cable Distribution Cabinet"
-msgstr "Upraviť Káblová rozvodná skriňa"
+msgid "solar thermal"
+msgstr "solárny tepelný"
+
+msgid "steam_generator"
+msgstr "parný generátor"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr "spaľovanie bio, uhlia, nafty, plynu, benzínu, ropy, odpadu"
+
+msgid "steam_turbine"
+msgstr "parná turbína"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr "geotermálny / solárny tepelný / spaľovanie bio, uhlia, ropy, odpadu"
+
+msgid "stellarator"
+msgstr "Stelarator"
+
+msgid "nuclear fusion"
+msgstr "jadrová fúzia"
+
+msgid "tokamak"
+msgstr "Tokamak"
+
+msgid "vertical_axis"
+msgstr "zvislá os"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr "jadrové štiepenie"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr "Výstupné formy energie:"
+
+msgid "Power Sub Station"
+msgstr "Malý transformátor"
+
+msgid "Edit Power Sub Station"
+msgstr "Upraviť malý transformátor"
+
+msgid "Line reference"
+msgstr "Označenie vedenia"
+
+msgid "high"
+msgstr "vysoké"
+
+msgid "medium"
+msgstr "stredné"
+
+msgid "low"
+msgstr "nízke"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
+msgid "Cable Distribution Cabinet"
+msgstr "Káblová rozvodná skriňa"
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr "Upraviť káblovú rozvodnú skriňa"
msgid "Power Tower"
msgstr "Elektrický stožiar (vysoké napätie)"
@@ -18799,16 +20213,19 @@ msgid "Edit Power Tower"
msgstr "Upraviť elektrický stožiar"
msgid "Tower reference"
-msgstr "Nastavenie veže"
+msgstr "Označenie veže"
+
+msgid "steel"
+msgstr "oceľ"
msgid "Pole"
-msgstr "El. stĺp (pole)"
+msgstr "Elektrický stĺp"
msgid "Edit Power Pole"
-msgstr "Upraviť el. stĺp"
+msgstr "Upraviť elektrický stĺp"
msgid "Pole reference"
-msgstr ""
+msgstr "Označenie stĺpa"
msgid "Power Line"
msgstr "Elektrické vedenie"
@@ -18819,31 +20236,29 @@ msgstr "Upraviť elektrické vedenie"
msgid "Line type"
msgstr "Typ vedenia"
-msgctxt "Power Line"
msgid "line"
-msgstr "vedenie"
+msgstr "vedenie vysokého napätia (>20kV)"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr ""
+msgstr "vedenie nízkeho napätia (<20kV)"
msgid "Amount of Cables"
msgstr "Počet káblov"
msgid "Number of wires (better: conductors) per power cable"
-msgstr "Počet vodičov (lepší: vodič) pre napájacie káble"
+msgstr "Počet drôtov (vodičov) v kábli"
msgid "single"
-msgstr "jedno"
+msgstr "jeden"
msgid "double"
-msgstr "dvojité"
+msgstr "dvojitý"
msgid "triple"
-msgstr "trojité"
+msgstr "trojitý"
msgid "quad"
-msgstr "štvorité"
+msgstr "štvoritý"
msgid "Historic Places"
msgstr "Historické miesta"
@@ -18873,10 +20288,10 @@ msgid "Edit Battlefield"
msgstr "Upraviť bojisko"
msgid "Palaeontological Site"
-msgstr "Palaeontological Areál"
+msgstr "Paleontologické nálezisko"
msgid "Edit Palaeontological Site"
-msgstr "Upraviť Palaeontological Areál"
+msgstr "Upraviť paleontologické nálezisko"
msgid "Monument"
msgstr "Pamätihodnosť, pamätník"
@@ -18900,7 +20315,7 @@ msgid "Wayside Shrine"
msgstr "Božia muka"
msgid "Edit Wayside Shrine"
-msgstr "Upraviť božiu muku"
+msgstr "Upraviť Božiu muku"
msgid "Boundary Stone"
msgstr "Hraničné kamene"
@@ -18921,22 +20336,22 @@ msgid "Edit Supermarket"
msgstr "Upraviť supermarket"
msgid "Convenience Store"
-msgstr "Obchod s polotovarmi"
+msgstr "Obchod s tovarom dennej potreby"
msgid "Edit Convenience Store"
-msgstr "Upraviť obchod s polotovarmi"
+msgstr "Upraviť obchod s tovarom dennej potreby"
msgid "Kiosk"
-msgstr "Stánok"
+msgstr "Stánok (Trafika)"
msgid "Edit Kiosk"
msgstr "Upraviť stánok"
-msgid "Baker"
-msgstr "Chlieb a pečivo"
+msgid "Bakery"
+msgstr "Pekár"
-msgid "Edit Baker"
-msgstr "Upraviť chlieb a pečivo"
+msgid "Edit Bakery"
+msgstr "Upraviť pekára"
msgid "Butcher"
msgstr "Mäsiareň"
@@ -18945,22 +20360,22 @@ msgid "Edit Butcher"
msgstr "Upraviť mäsiarstvo"
msgid "Seafood"
-msgstr "Morské jedlá"
+msgstr "Morské špeciality"
-msgid "Edit Seafood"
-msgstr ""
+msgid "Edit Seafood Shop"
+msgstr "Upraviť obchod s morskými špecialitami"
msgid "Deli (Fine Food)"
msgstr "Špeciality"
msgid "Edit Deli (Fine Food)"
-msgstr ""
+msgstr "Upraviť špeciality"
msgid "Confectionery"
msgstr "Cukrovinky"
msgid "Edit Confectionery"
-msgstr "Upraviť Cukrovinky"
+msgstr "Upraviť cukrovinky"
msgid "Marketplace"
msgstr "Trhovisko"
@@ -18968,44 +20383,50 @@ msgstr "Trhovisko"
msgid "Edit Marketplace"
msgstr "Upraviť trhovisko"
+msgid "Organic"
+msgstr "Biopotraviny"
+
msgid "Greengrocer"
msgstr "Ovocie a zelenina"
msgid "Edit Greengrocer"
-msgstr "Upraviť Ovocie a zeleninu"
+msgstr "Upraviť obchod s ovocím a zeleninou"
-msgid "Organic"
-msgstr "Biopotraviny"
+msgid "Farm Stand"
+msgstr "Stánok farmy"
+
+msgid "Edit Farm Stand"
+msgstr "Upraviť stánok farmy"
msgid "Edit Organic/Bio"
-msgstr ""
+msgstr "Upraviť bio produkty"
msgid "Organic/Bio"
-msgstr ""
+msgstr "Bio produkty"
msgid "Fair Trade"
-msgstr ""
+msgstr "Spravodlivý obchod (Fair Trade)"
msgid "Edit Fair Trade"
-msgstr ""
+msgstr "Upraviť spravodlivý obchod"
msgid "Alcohol"
msgstr "Alkohol"
msgid "Edit Alcohol Shop"
-msgstr "Upraviť Obchod s alkoholickými nápojmi"
+msgstr "Upraviť obchod s alkoholickými nápojmi"
msgid "Beverages"
msgstr "Nápoje"
msgid "Edit Beverages Shop"
-msgstr "Upraviť Obchod s nápojmi."
+msgstr "Upraviť obchod s nápojmi"
msgid "Edit Clothes Shop"
msgstr "Upraviť obchod s odevmi"
msgid "Boutique"
-msgstr "butik"
+msgstr "Butik"
msgid "Edit Boutique"
msgstr "Upraviť butik"
@@ -19020,7 +20441,7 @@ msgid "Outdoor"
msgstr "Turistický (Outdoor)"
msgid "Edit Outdoor Shop"
-msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
+msgstr "Upraviť obchod s turistickým (outdoor) tovarom"
msgid "Edit Sports Shop"
msgstr "Upraviť športový obchod"
@@ -19038,22 +20459,22 @@ msgid "Edit Laundry"
msgstr "Upraviť práčovňu"
msgid "Tailor"
-msgstr "Krajčír"
+msgstr "Krajčírstvo"
msgid "Edit Tailor"
-msgstr "Upraviť Krajčíra"
+msgstr "Upraviť krajčírstvo"
msgid "Fabric"
-msgstr "Tkanina"
+msgstr "Látky"
-msgid "Edit Fabric"
-msgstr "Upraviť Tkaninu"
+msgid "Edit Fabric Shop"
+msgstr "Upraviť obchod s látkami"
msgid "Electronic"
msgstr "Elektronika"
msgid "Computer"
-msgstr "Počítač"
+msgstr "Počítače"
msgid "Edit Computer Shop"
msgstr "Upraviť počítačový obchod"
@@ -19067,14 +20488,14 @@ msgstr "Upraviť obchod s elektronikou"
msgid "Mobile Phone"
msgstr "Mobilný telefón"
-msgid "Edit Mobile Phone"
-msgstr "Upraviť Mobilný telefón"
+msgid "Edit Mobile Phone Shop"
+msgstr "Upraviť obchod s mobilnými telefónmi"
msgid "Vacuum Cleaner"
msgstr "Vysávač"
-msgid "Edit Vacuum Cleaner"
-msgstr "Upraviť Vysávač"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Upraviť obchod s vysávačmi"
msgid "Hifi"
msgstr "Hifi"
@@ -19082,9 +20503,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Upraviť obchod s Hifi elektronikou"
-msgctxt "shop"
msgid "Video"
-msgstr "Obchod s DVD"
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Upraviť obchod s DVD"
@@ -19110,17 +20530,23 @@ msgstr "Upraviť zmenáreň"
msgid "Edit Automated Teller Machine"
msgstr "Upraviť bankomat"
+msgid "Pawnbroker"
+msgstr "Záložňa"
+
+msgid "Edit Pawnbroker"
+msgstr "Upraviť záložňu"
+
msgid "Department Store"
msgstr "Obchodný dom"
msgid "Edit Department Store"
-msgstr "Upraviť Obchodný dom"
+msgstr "Upraviť obchodný dom"
msgid "Mall"
msgstr "Obchodné centrum"
msgid "Edit Mall"
-msgstr "Upraviť Obchodné centrum"
+msgstr "Upraviť obchodné centrum"
msgid "Chemist"
msgstr "Drogéria"
@@ -19146,10 +20572,31 @@ msgstr "Klenotníctvo"
msgid "Edit Jewelry"
msgstr "Upraviť klenotníctvo"
+msgid "Gift"
+msgstr "Darčeky/Suveníry"
+
+msgid "Edit Gift Shop"
+msgstr "Upraviť obchod s darčekmi"
+
+msgid "buddhist"
+msgstr "budhisti"
+
+msgid "christian"
+msgstr "kresťania"
+
+msgid "hindu"
+msgstr "hinduisti"
+
+msgid "jewish"
+msgstr "judaisti"
+
+msgid "muslim"
+msgstr "moslimovia"
+
msgid "Erotic"
msgstr "Sexshop"
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr "Upraviť sexshop"
msgid "Florist"
@@ -19179,8 +20626,8 @@ msgstr "Upraviť železiarstvo"
msgid "Paint"
msgstr "Farbivá"
-msgid "Edit Paint"
-msgstr "Upraviť Farbivá"
+msgid "Edit Paint Shop"
+msgstr "Upraviť obchod s farbivami"
msgid "Furniture"
msgstr "Nábytok"
@@ -19191,20 +20638,20 @@ msgstr "Upraviť obchod s nábytkom"
msgid "Kitchen"
msgstr "Kuchynské štúdio"
-msgid "Edit Kitchen"
-msgstr "Upraviť Kuchynské štúdio"
+msgid "Edit Kitchen Store"
+msgstr "Upraviť kuchynské štúdio"
msgid "Curtain"
-msgstr ""
+msgstr "Záclony"
-msgid "Edit Curtain"
-msgstr ""
+msgid "Edit Curtain Shop"
+msgstr "Upraviť obchod so záclonami"
msgid "Frame"
-msgstr ""
+msgstr "Rámy"
-msgid "Edit Frames"
-msgstr ""
+msgid "Edit Frames Shop"
+msgstr "Upraviť obchod s rámami"
msgid "Stationery"
msgstr "Papiernictvo"
@@ -19213,10 +20660,10 @@ msgid "Edit Stationery Shop"
msgstr "Upraviť papiernictvo"
msgid "Copyshop"
-msgstr "Kopírovanie"
+msgstr "Kopírovacia služba"
msgid "Edit Copyshop"
-msgstr "Upraviť kopírovanie (copyshop)"
+msgstr "Upraviť kopírovaciu službu (copyshop)"
msgid "Book Store"
msgstr "Kníhkupectvo"
@@ -19224,6 +20671,12 @@ msgstr "Kníhkupectvo"
msgid "Edit Book Store"
msgstr "Upraviť kníhkupectvo"
+msgid "Newsagent''s shop"
+msgstr "Novinový stánok"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Upraviť novinový stánok"
+
msgid "Travel Agency"
msgstr "Cestovná kancelária"
@@ -19233,7 +20686,7 @@ msgstr "Upraviť cestovnú kanceláciu"
msgid "Musical Instrument"
msgstr "Hudobné nástroje"
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr "Upraviť obchod s hudobnými nástrojmi"
msgid "Toys"
@@ -19246,7 +20699,7 @@ msgid "Variety Store"
msgstr "Zmiešaný tovar"
msgid "Edit Variety Store"
-msgstr "Upraviť Zmiešaný tovar"
+msgstr "Upraviť obchod so zmiešaným tovarom"
msgid "Vending machine"
msgstr "Predajný automat"
@@ -19261,7 +20714,7 @@ msgid "animal_food"
msgstr "krmivo pre zvieratá"
msgid "bicycle_tube"
-msgstr ""
+msgstr "duše na bicykle"
msgid "cigarettes"
msgstr "cigarety"
@@ -19314,6 +20767,9 @@ msgstr "hračky"
msgid "vouchers"
msgstr "kupóny (poukážky)"
+msgid "Note"
+msgstr "Poznámka"
+
msgid "Geography"
msgstr "Geografia(Zemepis)"
@@ -19366,34 +20822,34 @@ msgid "Edit Country"
msgstr "Upraviť krajinu (štát)"
msgid "State"
-msgstr "Štát"
+msgstr "Štát (vo federácii)"
msgid "Edit State"
msgstr "Upraviť štát"
msgid "Region"
-msgstr "Oblasť (región)"
+msgstr "Kraj (región)"
msgid "Edit Region"
-msgstr "Upraviť oblasť (región)"
+msgstr "Upraviť kraj (región)"
msgid "County"
-msgstr "kraj (okres)"
+msgstr "Okres"
msgid "Edit County"
-msgstr "Upraviť kraj (okres)"
+msgstr "Upraviť okres"
msgid "Population"
-msgstr "Populácia"
+msgstr "Počet obyvateľov"
msgid "Post code"
msgstr "Poštové smerovacie číslo"
msgid "City"
-msgstr "Mesto (city)"
+msgstr "Veľkomesto (city)"
msgid "Edit City"
-msgstr "Upraviť mesto"
+msgstr "Upraviť veľkomesto"
msgid "Town"
msgstr "Mesto (town)"
@@ -19402,13 +20858,13 @@ msgid "Edit Town"
msgstr "Upraviť mesto"
msgid "Suburb"
-msgstr "Štvrť"
+msgstr "Mestská štvrť"
msgid "Edit Suburb"
-msgstr "Upraviť štvrť"
+msgstr "Upraviť mestskú štvrť"
msgid "Village"
-msgstr "Dedina"
+msgstr "Dedina (obec)"
msgid "Edit Village"
msgstr "Upraviť dedinu"
@@ -19420,29 +20876,35 @@ msgid "Edit Hamlet"
msgstr "Upraviť malú dedinu"
msgid "Isolated Dwelling"
-msgstr "izolované byt"
+msgstr "Izolované obydlie"
msgid "Edit Isolated Dwelling"
-msgstr "Upravi5 izolované byt"
+msgstr "Upraviť izolované obydlie"
msgid "Neighbourhood"
msgstr "Okolie"
msgid "Edit Neighbourhood"
-msgstr ""
+msgstr "Upraviť okolie"
msgid "Locality"
-msgstr "Oblasť (lokalita)"
+msgstr "Oblasť (neobývaná lokalita)"
msgid "Edit Locality"
msgstr "Upraviť oblasť (lokalitu)"
msgid "Peak"
-msgstr "Vrchol"
+msgstr "Vrchol kopca"
msgid "Edit Peak"
msgstr "Upraviť vrchol kopca"
+msgid "Saddle"
+msgstr "Horské sedlo"
+
+msgid "Edit Saddle"
+msgstr "Upraviť horské sedlo"
+
msgid "Glacier"
msgstr "Ľadovec"
@@ -19465,7 +20927,7 @@ msgid "Island"
msgstr "Ostrov"
msgid "Edit Island"
-msgstr "Upraviť Ostrov"
+msgstr "Upraviť ostrov"
msgid "Islet"
msgstr "Ostrovček"
@@ -19482,24 +20944,33 @@ msgstr "Strom"
msgid "Edit Tree"
msgstr "Upraviť strom"
+msgid "broad_leaved"
+msgstr "listnatý"
+
+msgid "conifer"
+msgstr "ihličnatý"
+
+msgid "palm"
+msgstr "palma"
+
msgid "Botanical Name"
msgstr "Botanický názov"
+msgid "Tree Row"
+msgstr "Stromoradie"
+
msgid "Wood"
-msgstr "Prales"
+msgstr "Les"
msgid "Edit Wood"
-msgstr "Upraviť prales"
+msgstr "Upraviť les"
-msgctxt "wood"
msgid "coniferous"
msgstr "ihličnatý"
-msgctxt "wood"
msgid "deciduous"
msgstr "listnatý"
-msgctxt "wood"
msgid "mixed"
msgstr "zmiešaný"
@@ -19509,15 +20980,6 @@ msgstr "Les"
msgid "Edit Forest Landuse"
msgstr "Upraviť les"
-msgid "coniferous"
-msgstr "ihličnatý"
-
-msgid "deciduous"
-msgstr "listnatý"
-
-msgid "mixed"
-msgstr "zmiešaný"
-
msgid "Grassland"
msgstr "Lúka"
@@ -19586,7 +21048,7 @@ msgid "Farmland"
msgstr "Poľnohospodárska pôda"
msgid "Edit Farmland Landuse"
-msgstr "Upraviť poľnohospodárske pôdu"
+msgstr "Upraviť poľnohospodársku pôdu"
msgid "Meadow"
msgstr "Lúka"
@@ -19594,6 +21056,12 @@ msgstr "Lúka"
msgid "Edit Meadow Landuse"
msgstr "Upraviť lúku"
+msgid "Orchard"
+msgstr "Ovocný sad"
+
+msgid "Edit Orchard Landuse"
+msgstr "Upraviť ovocný sad"
+
msgid "Vineyard"
msgstr "Vinica"
@@ -19607,10 +21075,10 @@ msgid "Edit Greenhouse Horticulture"
msgstr "Upraviť Skleník Záhradníctvo"
msgid "Allotments"
-msgstr "Ťažobný priestor"
+msgstr "Záhradkárska oblasť"
msgid "Edit Allotments Landuse"
-msgstr "Upraviť ťažobný priestor"
+msgstr "Upraviť záhradkársku oblasť"
msgid "Garden"
msgstr "Záhrada"
@@ -19625,7 +21093,7 @@ msgid "Edit Grass Landuse"
msgstr "Upraviť trávnatú plochu"
msgid "Village Green"
-msgstr "Obecná zeleň"
+msgstr "Obecná zeleň (centrálny park obce)"
msgid "Edit Village Green Landuse"
msgstr "Upraviť obecnú zeleň"
@@ -19648,17 +21116,20 @@ msgstr "Rekreačná oblasť"
msgid "Edit Recreation Ground Landuse"
msgstr "Upraviť rekreačnú oblasť"
-msgid "Residential area"
-msgstr "Osídlená oblasť (Residential area)"
+msgid "Residential Area"
+msgstr "Obytná oblasť"
msgid "Edit Residential Landuse"
msgstr "Upraviť osídlenú oblasť"
msgid "Graveyard"
-msgstr "Cintorín (malý, blizko kostola)"
+msgstr "Malý cintorín (pri kostole)"
msgid "Edit Graveyard"
-msgstr "Upraviť cintorín (malý, blizko kostola)"
+msgstr "Upraviť malý cintorín"
+
+msgid "shinto"
+msgstr "šintoistická"
msgid "Cemetery"
msgstr "Cintorín"
@@ -19735,6 +21206,33 @@ msgstr "Upraviť lom"
msgid "Annotation"
msgstr "Popisy"
+msgid "Edit Name Information"
+msgstr "Upraviť údaje o názve"
+
+msgid "Alternative name"
+msgstr "Alternatívny názov"
+
+msgid "Historical name"
+msgstr "Historický názov"
+
+msgid "Local name"
+msgstr "Miestny názov"
+
+msgid "Regional name"
+msgstr "Regionálny názov"
+
+msgid "National name"
+msgstr "Národný názov"
+
+msgid "International name"
+msgstr "Medzinárodný názov"
+
+msgid "Official name"
+msgstr "Oficiálny názov"
+
+msgid "Common name abbreviation"
+msgstr "Bežná skratka názvu"
+
msgid "Edit Address Information"
msgstr "Upraviť informácie o adrese"
@@ -19753,30 +21251,6 @@ msgstr "Názov mesta"
msgid "Country code"
msgstr "Kód krajiny"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Interpolácia adries"
@@ -19795,20 +21269,32 @@ msgstr "párne"
msgid "alphabetic"
msgstr "abecedný"
+msgid "Accuracy"
+msgstr "Presnosť"
+
+msgid "actual"
+msgstr "skutočná"
+
+msgid "estimate"
+msgstr "odhadovaná"
+
+msgid "potential"
+msgstr "možná"
+
msgid "Contact (common schema)"
msgstr "Kontakt (spoločné schéma)"
msgid "Edit Contact information"
-msgstr "Upraviť Kontaktné informácie"
+msgstr "Upraviť kontaktné informácie"
msgid "Image"
msgstr "Obrázok"
msgid "Contact (schema with ''contact:*'' prefix)"
-msgstr ""
+msgstr "Kontakt (schéma s predponou \"contact:*\")"
msgid "Edit Contact information (new schema)"
-msgstr "Upraviť Kontaktné informácie (nová schéma)"
+msgstr "Upraviť kontaktné informácie (nová schéma)"
msgid "Edit Multipolygon"
msgstr "Upraviť multipolygón"
@@ -19841,37 +21327,37 @@ msgid "political"
msgstr "politická"
msgid "Administrative level"
-msgstr ""
+msgstr "Administratívna úroveň"
msgid "Sub area"
-msgstr ""
+msgstr "Podoblasť"
msgid "Administration centre"
msgstr "Administratívne centrum"
msgid "Label point"
-msgstr ""
+msgstr "Miesto pre menovku"
msgid "Site"
-msgstr "Stránka"
+msgstr "Areál (site)"
msgid "Edit Site"
-msgstr ""
+msgstr "Upraviť areál"
msgid "Site name"
-msgstr ""
+msgstr "Názov areálu"
msgid "where to place the label"
-msgstr ""
+msgstr "kam umiestniť menovku"
msgid "perimeter of the site"
-msgstr "obvod miesta"
+msgstr "obvod areálu"
msgid "entrances to the site, on the perimeter"
msgstr "vstupy do areálu, na obvode"
msgid "members of site"
-msgstr "členy obvodu"
+msgstr "členy areálu"
msgid "Turn restriction"
msgstr "Prikázané smery jazdy (turn restriction)"
@@ -19913,28 +21399,28 @@ msgid "to way"
msgstr "k ceste"
msgid "Enforcement"
-msgstr ""
+msgstr "Vynútenie dopravného obmedzenia"
msgid "Edit Enforcement"
-msgstr ""
+msgstr "Upraviť vynútenie dopravného obmedzenia"
msgid "Type of enforcement"
-msgstr ""
+msgstr "Typ vynútenia"
msgid "maxheight"
-msgstr "max výška"
+msgstr "max. výška"
msgid "maxweight"
-msgstr "max hmotnosť"
+msgstr "max. hmotnosť"
msgid "maxspeed"
-msgstr "max rýchlosť"
+msgstr "max. rýchlosť"
msgid "mindistance"
-msgstr "min vzdialenosť"
+msgstr "min. vzdialenosť"
msgid "check "
-msgstr ""
+msgstr "cestná kontrola "
msgid "Max. height (meters, only if enforcement=maxheight)"
msgstr "Max. výška (metre, iba ak enforcement=maxheight)"
@@ -19946,43 +21432,72 @@ msgid "Max. speed (km/h, only if enforcement=maxspeed)"
msgstr "Max. rýchlosť (km/h, iba ak enforcement=maxspeed)"
msgid "location of enforcement device"
-msgstr ""
+msgstr "umiestnenie kontrolného zariadenia"
msgid "node on way where enforcement starts"
-msgstr "Bod na ceste kde obmedzenie začína"
+msgstr "bod na ceste kde kontrola obmedzenia začína"
msgid "where enforcement ends"
-msgstr "kde obmedzenie končí"
+msgstr "kde kontrola obmedzenia končí"
msgid "traffic light or barrier that stops you"
msgstr "semafor alebo bariéra, ktorá vás zastaví"
-msgid "Route (legacy)"
-msgstr ""
+msgid "General route"
+msgstr "Všeobecná trasa"
-msgid "Edit Route (legacy)"
-msgstr ""
+msgid "Edit general route"
+msgstr "Upraviť všeobecnú trasu"
+
+msgctxt "route type"
+msgid "bicycle"
+msgstr "cyklistika"
+
+msgctxt "route type"
+msgid "bus"
+msgstr "autobus"
+msgctxt "route type"
msgid "road"
-msgstr "cesta (vozovka)"
+msgstr "cesta"
+
+msgctxt "route type"
+msgid "ferry"
+msgstr "trajekt"
+msgctxt "route type"
msgid "ski"
-msgstr "lyžovanie"
+msgstr "zjazdovka"
+msgctxt "route type"
msgid "foot"
-msgstr "pešia (foot)"
+msgstr "pešia"
+msgctxt "route type"
msgid "hiking"
msgstr "turistika"
+msgctxt "route type"
+msgid "tram"
+msgstr "električka"
+
+msgctxt "route type"
msgid "detour"
msgstr "obchádzka"
+msgctxt "route type"
+msgid "railway"
+msgstr "vlak"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "metro"
+
msgid "Symbol description"
msgstr "Popis značky"
msgid "Route state"
-msgstr "Štátna cesta"
+msgstr "Stav trasy"
msgid "proposed"
msgstr "plánovaný"
@@ -19997,22 +21512,22 @@ msgid "connection"
msgstr "spojenie"
msgid "forward segment"
-msgstr "predný segment"
+msgstr "segment smerom dopredu"
msgid "backward segment"
-msgstr "zadný segment"
+msgstr "segment smerom dozadu"
msgid "east segment (North America)"
-msgstr ""
+msgstr "východný segment (Severná Amerika)"
msgid "north segment (North America)"
-msgstr ""
+msgstr "severný segment (Severná Amerika)"
msgid "west segment (North America)"
-msgstr ""
+msgstr "západný segment (Severná Amerika)"
msgid "south segment (North America)"
-msgstr ""
+msgstr "južný segment (Severná Amerika)"
msgid "halt point"
msgstr "bod prerušenia"
@@ -20023,29 +21538,32 @@ msgstr "predný bod prerušenia"
msgid "backward halt point"
msgstr "zadný bod prerušenia"
-msgid "Route network"
-msgstr ""
+msgid "Route Network"
+msgstr "Sieť trás"
-msgid "Edit route network"
-msgstr ""
+msgid "Edit Route Network"
+msgstr "Upraviť sieť trás"
msgid "member"
msgstr "člen"
-msgid "Associated street"
-msgstr "Priradená ulica"
+msgid "Associated Street"
+msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
msgstr ""
+msgid "house"
+msgstr "dom"
+
msgid "Street"
msgstr "Ulica"
msgid "Edit Street"
-msgstr ""
+msgstr "Upraviť ulicu"
msgid "ways being part of street"
-msgstr ""
+msgstr "cesty súčasťou ulice"
msgid "addresses belonging to the street"
msgstr "adresy patriace do ulice"
@@ -20057,13 +21575,13 @@ msgid "anything related to the street"
msgstr "niečo vzťahujúce sa k ulici"
msgid "Destination sign"
-msgstr ""
+msgstr "Smerovník"
-msgid "Edit Destination sign"
-msgstr ""
+msgid "Edit Destination Sign"
+msgstr "Upraviť smerovník"
msgid "Destination written on sign (w/o distance)"
-msgstr ""
+msgstr "Cieľ vyznačený na smerovníku (bez vzdialenosti)"
msgid "Distance (km)"
msgstr "Vzdialenosť (km)"
@@ -20090,7 +21608,7 @@ msgid "first way after junction"
msgstr "prvý úsek po križovatke"
msgid "position of sign"
-msgstr ""
+msgstr "umiestnenie smerovníka"
msgid "Waterway"
msgstr "Vodné cesty"
@@ -20105,7 +21623,7 @@ msgid "river"
msgstr "rieka (river)"
msgid "stream"
-msgstr "potok (stream)"
+msgstr "prúd"
msgid "canal"
msgstr "prieplav"
@@ -20141,43 +21659,55 @@ msgid "branch waterways (no riverbank)"
msgstr "vetva vodnej cesty (bez nábrežia)"
msgid "spring of waterway"
-msgstr ""
+msgstr "prameň vodného toku"
msgid "Length (meters)"
msgstr "Dĺžka (v metroch)"
msgid "ways supported by (on top of) the bridge"
-msgstr ""
+msgstr "cesty nesené mostom"
msgid "ways passing under the bridge"
msgstr "cesty prechádzajúce pod mostom"
msgid "way forming the outline footprint"
-msgstr ""
+msgstr "cesta vytvárajúca celý obrys"
-msgid "nodes forming the outline"
-msgstr ""
+msgid "edge ways parallel to ''across''"
+msgstr "okrajové cesty paralelné s cestami \"across\""
msgid "ways passing through the tunnel"
msgstr "cesty prechádzajúce tunelom"
+msgid "edge ways parallel to ''through''"
+msgstr "okrajové cesty paralelné s cestami \"through\""
+
msgid "bridge"
msgstr "most"
msgid "deprecated"
-msgstr "zastaralý"
+msgstr "zastaralé"
+
+msgid "bicycle"
+msgstr "pre cyklistov"
+
+msgid "foot"
+msgstr "pre peších"
msgid "horse"
-msgstr "koňská (horse)"
+msgstr "pre kone"
msgid "barrier"
-msgstr "prekážka"
+msgstr "prekážky a zábrany"
msgid "motorroad"
-msgstr "cesta pre motorové vozidlá"
+msgstr "iná rýchlostná cesta"
+
+msgid "highway.track"
+msgstr "poľná cesta"
-msgid "highway_track"
-msgstr "cesta (highway_track)"
+msgid "livingdashed"
+msgstr "doprava"
msgid "services"
msgstr "služby"
@@ -20185,11 +21715,11 @@ msgstr "služby"
msgid "ford"
msgstr "brod"
-msgid "highway_platform"
-msgstr ""
+msgid "highway.platform"
+msgstr "nástupištia"
-msgid "emergency_access_point"
-msgstr "miesto pohotovostnej prvej pomoci"
+msgid "emergency.access.point"
+msgstr "bod pre príchod záchrannej služby"
msgid "riverbank"
msgstr "riečny breh"
@@ -20204,46 +21734,49 @@ msgid "rapids"
msgstr "pereje"
msgid "railwaypoint"
-msgstr "železničná výhybka"
+msgstr "železničné objekty"
+
+msgid "raildashed"
+msgstr "železnica"
msgid "railyard"
msgstr "koľajisko"
msgid "otherrail"
-msgstr "iná koľaj"
+msgstr "ľahká železnica"
msgid "railover"
-msgstr "nadchod nad železnicou"
+msgstr "električka na ceste"
msgid "oldrail"
-msgstr "historická železnica (turistická)"
+msgstr "historická alebo opustená železnica"
msgid "aeroway"
-msgstr "letecké cesty"
+msgstr "letecké pomocné dráhy a budovy"
-msgid "aeroway_dark"
-msgstr "zjazdovka_čierna"
+msgid "aeroway.dark"
+msgstr "letecké dráhy"
-msgid "aeroway_light"
-msgstr "zjazdovka_ľahká"
+msgid "aeroway.light"
+msgstr "letecké servisné oblasti"
-msgid "piste_easy"
-msgstr "mierna zjazdovka (piste_easy)"
+msgid "piste.easy"
+msgstr "zjazdovka ľahká"
-msgid "piste_intermediate"
-msgstr "stredne ťažká zjazdovka (piste_intermediate)"
+msgid "piste.intermediate"
+msgstr "zjazdovka pre stredne pokročilých"
-msgid "piste_advanced"
-msgstr "zjazdovka pre pokročilých (piste_advanced)"
+msgid "piste.advanced"
+msgstr "zjazdovka pre pokročilých"
-msgid "piste_expert"
-msgstr "zjazdovka pre expertov (piste_expert)"
+msgid "piste.expert"
+msgstr "zjazdovka pre skúsených"
-msgid "piste_freeride"
-msgstr "zjazdovka pre freeride (piste_freeride)"
+msgid "piste.freeride"
+msgstr "zjazdovka pre voľný zjazd"
-msgid "piste_novice"
-msgstr "zjazdovka pre začiatočníkov (piste_novice)"
+msgid "piste.novice"
+msgstr "zjazdovka pre začiatočníkov"
msgid "power"
msgstr "energia (power)"
@@ -20255,28 +21788,28 @@ msgid "pipeline"
msgstr "potrubie (pipeline)"
msgid "leisure"
-msgstr "oddych (leisure)"
+msgstr "oddych a šport (leisure)"
msgid "marina"
msgstr "prístav (marina)"
msgid "amenity"
-msgstr "vybavenosť (amenity)"
+msgstr "jedlo a pitie"
-msgid "amenity_traffic"
-msgstr "verejná_doprava"
+msgid "amenity.traffic"
+msgstr "dopravná vybavenosť"
-msgid "amenity_light"
-msgstr "svetelné zariadenie"
+msgid "amenity.light"
+msgstr "občianska vybavenosť"
-msgid "light_water"
-msgstr "osvetlená_voda (light_water)"
+msgid "light.water"
+msgstr "svetlá voda"
msgid "health"
msgstr "zdravie"
-msgid "shop"
-msgstr "obchod"
+msgid "office"
+msgstr "úrad"
msgid "hotel"
msgstr "hotel"
@@ -20294,7 +21827,7 @@ msgid "landfill"
msgstr "skládka odpadov (landfill)"
msgid "basin"
-msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
+msgstr "nádrž na dažďovú vodu"
msgid "forest"
msgstr "les"
@@ -20309,10 +21842,10 @@ msgid "retail"
msgstr "maloobchody"
msgid "brownfield"
-msgstr "brownfield (opustený priemyselný objekt)"
+msgstr "opustený priemyselný objekt (brownfield)"
msgid "greenfield"
-msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
+msgstr "oblasť používaná pre poľnohospodárstvo (greenfield)"
msgid "railland"
msgstr "železničný pozemok"
@@ -20341,9 +21874,6 @@ msgstr "vresovisko"
msgid "woodarea"
msgstr "zalesnená oblasť (woodarea)"
-msgid "mud"
-msgstr "blato (mud)"
-
msgid "beach"
msgstr "pláž (beach)"
@@ -20353,11 +21883,14 @@ msgstr "trasa (route)"
msgid "boundary"
msgstr "hranica (boundary)"
+msgid "sport"
+msgstr "šport"
+
msgid "place"
msgstr "miesto"
-msgid "tiger_data"
-msgstr ""
+msgid "tiger.data"
+msgstr "tiger dáta (USA)"
msgid "address"
msgstr "adresa"
@@ -20371,9 +21904,6 @@ msgstr "Dedina/Mesto"
msgid "One Way"
msgstr "Jednosmerka"
-msgid "Church"
-msgstr "Kostol"
-
msgid "Fuel Station"
msgstr "Čerpacia stanica"
@@ -20393,269 +21923,470 @@ msgid "abbreviated street name"
msgstr "skrátený názov ulice"
msgid "oneway tag on a node"
-msgstr "tag jednosmerný na bode"
+msgstr "značka \"jednosmerná\" na bode"
msgid "bridge tag on a node"
-msgstr "tag most na bode"
+msgstr "značka \"most\" na bode"
msgid "wrong highway tag on a node"
-msgstr "tag zlá cesta na bode"
+msgstr "nesprávna značka \"highway\" na bode"
+
+msgid "wrong crossing tag on a way"
+msgstr "nesprávna značka \"crossing\" na bode"
msgid "Unnamed unclassified highway"
-msgstr "nepomenovaná a nezaradená cesta"
+msgstr "nepomenovaná neklasifikovaná cesta"
msgid "highway without a reference"
-msgstr "cesta bez označenia ref"
+msgstr "cesta bez označenia \"ref\""
msgid "temporary highway type"
-msgstr ""
+msgstr "dočasný typ cesty"
msgid "misspelled key name"
-msgstr ""
+msgstr "názov kľúča s preklepom"
msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "cyklotrasa so značkou \"bicycle\""
msgid "footway with tag foot"
-msgstr ""
+msgstr "cesta pre peších so značkou \"foot\""
msgid "separate cycleway as lane on a cycleway"
-msgstr "samostatný chodník pre cyklistov ako pruhu na cyklotrasy"
+msgstr "samostatný chodník pre cyklistov ako pruh na cyklotrase"
msgid "barrier used on a way"
-msgstr "bariéry na ceste"
+msgstr "bariéry na úseku cesty"
msgid "maxspeed used for footway"
msgstr "maximálna rýchlosť pre chodník"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "hodnota značky \"layer\" so znamienkom +"
msgid "street name contains ss"
-msgstr ""
+msgstr "názov ulice obsahuje ss (Nemecko)"
msgid "relation without type"
-msgstr ""
+msgstr "relácia bez \"type\""
msgid "restaurant without name"
-msgstr ""
+msgstr "reštaurácia bez názvu (\"name\")"
msgid "unusual tag combination (highway & waterway)"
-msgstr ""
+msgstr "nezvyčajná kombinácia značiek (highway a waterway)"
msgid "unusual tag combination (highway & natural)"
-msgstr ""
+msgstr "nezvyčajná kombinácia značiek (highway & natural)"
+
+msgid "unusual tag combination (landuse & building)"
+msgstr "nezvyčajná kombinácia značiek (landuse & building)"
+
+msgid "unnecessary access key"
+msgstr "nepotrebný kľúč \"access\""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "nepotrebná značka \"motor_vehicle=yes\""
msgid "natural water used for swimming pool"
-msgstr ""
+msgstr "značka \"natural=water\" použitá pre plavecký bazén"
-msgid "incline without highway"
-msgstr ""
+msgid "numerical key"
+msgstr "číselný kľúč"
+
+msgid "route_master relation without route_master=*"
+msgstr "Relácia \"route_master\" bez \"route_master\""
+
+msgid "power line without voltage"
+msgstr "elektrické vedenie bez \"voltage\""
+
+msgid "substation key without power=substation"
+msgstr "Kľúč \"substation\" bez \"power=substation\""
+
+msgid "transformer key without power"
+msgstr "Kľúč \"transformer\" bez \"power\""
+
+msgid "missing substation=*"
+msgstr "Chýba \"substation=*\""
+
+msgid "missing transformer=*"
+msgstr "Chýba \"transformer=*\""
+
+msgid "incline without highway or railway"
+msgstr "\"incline\" bez \"highway\" alebo \"railway\""
msgid "junction without highway"
-msgstr ""
+msgstr "\"junction\" bez \"highway\""
msgid "lanes without highway"
-msgstr ""
+msgstr "\"lanes\" bez \"highway\""
msgid "lcn without highway"
-msgstr ""
+msgstr "\"lcn\" bez \"highway\""
-msgid "lit without highway"
-msgstr ""
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "\"lit\" bez \"highway/railway/piste/parking/platform\""
msgid "living_street without highway"
-msgstr ""
+msgstr "\"living_street\" bez \"highway\""
msgid "maintenance without highway"
-msgstr ""
+msgstr "\"maintenance\" bez \"highway\""
msgid "median without highway"
-msgstr ""
+msgstr "\"median\" bez \"highway\""
msgid "motorroad without highway"
-msgstr ""
+msgstr "\"motorroad\" bez \"highway\""
msgid "ntd_id without highway"
-msgstr ""
+msgstr "\"ntd_id\" bez \"highway\""
-msgid "oneway without highway"
-msgstr ""
+msgid "oneway without highway or railway"
+msgstr "\"oneway\" bez \"highway\" alebo \"railway\""
msgid "sac_scale without highway"
-msgstr ""
+msgstr "\"sac_scale\" bez \"highway\""
msgid "segregated without highway"
-msgstr ""
+msgstr "\"segregated\" bez \"highway\""
msgid "sidewalk without highway"
-msgstr ""
+msgstr "\"sidewalk\" bez \"highway\""
msgid "smoothness without highway"
-msgstr ""
+msgstr "\"smoothness\" bez \"highway\""
msgid "snowplowing without highway"
-msgstr ""
+msgstr "\"snowplowing\" bez \"highway\""
msgid "step_count without highway"
-msgstr ""
+msgstr "\"step_count\" bez \"highway\""
msgid "toll without highway"
-msgstr ""
+msgstr "\"toll\" bez \"highway\""
msgid "tracktype without highway"
-msgstr ""
+msgstr "\"tracktype\" bez \"highway\""
msgid "trail_visibility without highway"
-msgstr ""
+msgstr "\"trail_visibility\" bez \"highway\""
msgid "trolley_wire without highway"
-msgstr ""
+msgstr "\"trolley_wire\" bez \"highway\""
msgid "zip_left without highway"
-msgstr ""
+msgstr "\"zip_left\" bez \"highway\""
msgid "zip_right without highway"
-msgstr ""
+msgstr "\"zip_right\" bez \"highway\""
msgid "detail without railway"
-msgstr ""
+msgstr "\"detail\" bez \"railway\""
msgid "eddy_current_brake without railway"
-msgstr ""
+msgstr "\"eddy_current_brake\" bez \"railway\""
msgid "electrified without railway"
-msgstr ""
+msgstr "\"electrified\" bez \"railway\""
msgid "etcs without railway"
-msgstr ""
+msgstr "\"etcs\" bez \"railway\""
msgid "gauge without railway"
-msgstr ""
+msgstr "\"gauge\" bez \"railway\""
msgid "grade_of_track without railway"
-msgstr ""
+msgstr "\"grade_of_track\" bez \"railway\""
msgid "kursbuchstrecke without railway"
-msgstr ""
+msgstr "\"kursbuchstrecke\" bez \"railway\""
msgid "lzb without railway"
-msgstr ""
+msgstr "\"lzb\" bez \"railway\""
msgid "old_railway_operator without railway"
-msgstr ""
+msgstr "\"old_railway_operator\" bez \"railway\""
msgid "operating_procedure without railway"
-msgstr ""
+msgstr "\"operating_procedure\" bez \"railway\""
msgid "pzb without railway"
-msgstr ""
+msgstr "\"pzb\" bez \"railway\""
msgid "radio without railway"
-msgstr ""
+msgstr "\"radio\" bez \"railway\""
msgid "structure_gauge without railway"
-msgstr ""
+msgstr "\"structure_gauge\" bez \"railway\""
msgid "tilting_technologie without railway"
-msgstr ""
+msgstr "\"tilting_technologie\" bez \"railway\""
msgid "track_class without railway"
-msgstr ""
+msgstr "\"track_class\" bez \"railway\""
msgid "tracks without railway"
-msgstr ""
+msgstr "\"tracks\" bez \"railway\""
msgid "traffic_mode without railway"
-msgstr ""
+msgstr "\"traffic_mode\" bez \"railway\""
msgid "usage without railway"
-msgstr ""
+msgstr "\"usage\" bez \"railway\""
msgid "workrules without railway"
-msgstr ""
+msgstr "\"workrules\" bez \"railway\""
msgid "stream without waterway"
-msgstr ""
+msgstr "\"stream\" bez \"railway\""
msgid "intermittent without waterway"
-msgstr ""
+msgstr "\"intermittent\" bez \"railway\""
msgid "boat without waterway / natural=water"
-msgstr ""
+msgstr "\"boat\" bez \"waterway\" alebo \"natural=water\""
msgid "length_unit without waterway"
-msgstr ""
+msgstr "\"length_unit\" bez \"waterway\""
msgid "llid without waterway"
-msgstr ""
+msgstr "\"llid\" bez \"waterway\""
msgid "canal without waterway"
-msgstr ""
+msgstr "\"canal\" bez \"waterway\""
msgid "have_riverbank without waterway"
+msgstr "\"have_riverbank\" bez \"waterway\""
+
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "\"tunnel\" bez \"highway/railway/waterway/platform/pipeline\""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "\"bridge\" bez \"highway/railway/waterway/platform/piste/pipeline\""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr "\"psv\" bez \"highway/railway/waterway/parking\""
+
+msgid "width without physical linear feature"
+msgstr "\"width\" bez fyzickej cesty"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "\"maxspeed\" bez \"highway/railway/traffic_sign/enforcement\""
+
+msgid "fence_type without barrier=fence"
+msgstr "\"fence_type\" bez \"barrier=fence\""
+
+msgid "border_type without boundary"
+msgstr "\"border_type\" bez \"boundary\""
+
+msgid "recycling_type without amenity=recycling"
+msgstr "\"recycling_type\" bez \"amenity=recycling\""
+
+msgid "board_type without information=board"
+msgstr "\"board_type\" bez \"information=board\""
+
+msgid "shelter_type without amenity=shelter"
+msgstr "\"shelter_type\" bez \"amenity=shelter\""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr "\"lamp_type\" bez \"highway=street_lamp\""
+
+msgid "map_type without information=map"
+msgstr "\"map_type\" bez \"information=map\""
+
+msgid "site_type without historic=archaeological_site"
+msgstr "\"site_type\" bez \"historic=archaeological_site\""
+
+msgid "artwork_type without tourism=artwork"
+msgstr "\"artwork_type\" bez \"tourism=artwork\""
+
+msgid "castle_type without historic=castle"
+msgstr "\"castle_type\" bez \"historic=castle\""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "\"reservoir_type\" bez \"landuse/water=reservoir\""
+
+msgid "bunker_type without military=bunker"
+msgstr "\"bunker_type\" bez \"military=bunker\""
+
+msgid "source:addr without addr:*"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "source:date without source"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:name without name"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:maxspeed without maxspeed"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:building without building"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:ref without ref"
msgstr ""
-msgid "religion without denomination"
+msgid "source:population without population"
msgstr ""
-msgid "unknown christian denomination"
+msgid "source:geometry on a node"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
+msgstr ""
+
+msgid "religion without denomination"
+msgstr "\"religion\" bez \"denomination\""
+
+msgid "unknown christian denomination"
+msgstr "neznáma kresťanská \"denomination\""
+
+msgid "unknown muslim denomination"
+msgstr "neznáma moslimská \"denomination\""
+
+msgid "unknown jewish denomination"
+msgstr "neznáma židovská \"denomination\""
+
msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
+"nezadaný jazyk pre wikipediu, použite \"wikipedia=jazyk:názov stránky\""
+
+msgid "unknown language prefix in wikipedia tag"
+msgstr "neznáma predpona jazyka v značke \"wikipedia\""
+
+msgid "layer should be between -5 and 5"
+msgstr "hodnota \"layer\" by mala byť medzi -5 a 5"
+
+msgid "level should be numbers with optional .5 increments"
+msgstr "\"level\" by malo byť číslo v násobkoch 0.5"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"Kľúč \"height\" (výška): predvolené sú metre; bodka je desatinný oddeľovať; "
+"ak je zadaná jednotka oddeľuje sa medzerou"
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"Kľúč \"maxheight\" (max.výška): predvolené sú metre; bodka je desatinný "
+"oddeľovať; ak je zadaná jednotka oddeľuje sa medzerou"
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"Kľúč \"width\" (šírka): predvolené sú metre; bodka je desatinný oddeľovať; "
+"ak je zadaná jednotka oddeľuje sa medzerou"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"Kľúč \"maxwidth\" (max.šírka): predvolené sú metre; bodka je desatinný "
+"oddeľovať; ak je zadaná jednotka oddeľuje sa medzerou"
+
+msgid "unusual maxspeed format"
+msgstr "nezvyčajný formát pre \"maxspeed\""
-msgid "unkown language prefix in wikipedia tag"
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
+"napätie by malo byť vo Voltoch bez medzier, oddeľovačov a merných jednotiek"
+
+msgid "unusual frequency specification"
+msgstr "nezvyčajné určenie frekvencie"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "nezvyčajný rozchod koľajníc; použite milimetre bez oddeľovačov"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+"nezvyčajná hodnota sklonu; použite percentá, stupne alebo \"up\" alebo "
+"\"down\""
msgid "Landsat"
msgstr "Landsat"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "OSM Inspector: Redaction Bot"
-
msgid "Yahoo Sat"
msgstr "Yahoo Sat"
msgid "Bing Sat"
msgstr "Bing Sat"
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitný OpenStreetMap)"
+
msgid "MapBox Satellite"
-msgstr ""
+msgstr "MapBox Satellite"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr "GPS stopy z OpenStreetMap"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik čierno biely)"
+msgstr "OpenStreetMap (Mapnik Čiernobiely)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -20667,37 +22398,25 @@ msgid "Public Transport (ÖPNV)"
msgstr "Public Transport (ÖPNV)"
msgid "OpenStreetMap (German Style)"
-msgstr "OpenStreetMap (nemecký štýl)"
-
-msgid "Streets NRW Geofabrik.de"
-msgstr "Ulice NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Hike & Bike"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Sorbian Language)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (nemecký jazyk)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "OpenPT Map (overlay)"
+msgstr "OpenStreetMap (Nemecký štýl)"
-msgid "Bavaria (2 m)"
-msgstr "Bavaria (2 m)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgid "Hamburg (40 cm)"
-msgstr "Hamburg (40 cm)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (DK5)"
-msgstr "Hamburg (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI black-and-white 2.5m"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
-msgstr "Graz: Basiskarte (základná mapa)"
+msgstr "Graz: Basiskarte (base map)"
msgid "Tiris: DGM (Terrain model)"
msgstr "Tiris: DGM (Terrain model)"
@@ -20706,49 +22425,25 @@ msgid "Tiris: DOM (Surface model)"
msgstr "Tiris: DOM (Surface model)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr ""
+msgstr "Vienna: Mehrzweckkarte (general purpose)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "Vienna: Beschriftungen (annotations)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr ""
-
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr ""
-
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr ""
-
-msgid "Stadtplan Zürich"
-msgstr "Stadtplan Zürich"
-
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
-
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Vienna: Orthofoto (aerial image)"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 (12cm)"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Canton de Génève 5cm (SITG 2011)"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Terrain model)"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Canton du Jura 50cm (RCJU 1998)"
-
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Canton de Fribourg 50cm (2005)"
-
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Stadt Bern 10cm/25cm (2008)"
-
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Surface model)"
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -20762,50 +22457,139 @@ msgstr "Canvec"
msgid "British Columbia Mosaic"
msgstr "British Columbia Mosaic"
-msgid "MSR Maps Topo"
-msgstr "MSR Maps Topo"
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
-msgid "MSR Maps Urban"
-msgstr "MSR Maps Urban"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "USGS Scanned Topographic Maps"
-msgstr "USGS Scanned Topographic Maps"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Denmark)"
-msgid "USGS Large Scale Imagery"
-msgstr "USGS Large Scale Imagery"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Denmark)"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "OSM US TIGER 2012 Roads Overlay"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Denmark)"
-msgid "Czech CUZK:KM"
-msgstr "Czech CUZK:KM"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Estonia Basemap (Maaamet)"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Czech UHUL:ORTOFOTO"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Estonia Ortho (Maaamet)"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Estonia Multi (Maaamet)"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition historic"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Moulins 2009 - 15 cm"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Montluçon 2009 - 15 cm"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Vichy 2009 - 15 cm"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-inch Scotland 1842-82"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Le Puy 2010 - 15 cm"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1st Series 1937-61"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Brest 2010 - 10 cm"
+
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Morbihan 2010"
+
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Orthophotos 2000"
+
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Orthophotos 2010-2012"
+
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Sentiers"
+
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Toulouse - Orthophotoplan 2011"
+
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Toulouse - Orthophotoplan 2007"
+
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Tours - Orthophotos 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Tours - Orthophotos 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Streets NRW Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Sorbian Language)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (German Language)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (overlay)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Hamburg (40 cm)"
+
+msgid "Hamburg (DK5)"
+msgstr "Hamburg (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Bavaria (2 m)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Stuttgart (Luftbild)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Erlangen 2013 Luftbild (6,25 cm)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Erlangen 2011 Luftbild (5,0 cm)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr "Stará mapa Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Stará mapa Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Physical DE - Physische Karte (Naturräume)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Physical DE:Harz - Physische Karte (Naturräume)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Haiti)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
msgstr "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -20814,10 +22598,10 @@ msgid "Ireland Bartholomew Quarter-Inch 1940"
msgstr "Ireland Bartholomew Quarter-Inch 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Írsko EEA GMES Urban Atlas"
+msgstr "Ireland EEA GMES Urban Atlas"
msgid "Ireland EEA CORINE 2006"
-msgstr "Ǐrsko EEA CORINE 2006"
+msgstr "Ireland EEA CORINE 2006"
msgid "Lodi - Italy"
msgstr "Lodi - Italy"
@@ -20835,55 +22619,58 @@ msgid "PCN 2008 - IT Lazio+Umbria"
msgstr "PCN 2008 - IT Lazio+Umbria"
msgid "USSR - Latvia"
-msgstr "ZSSR - Lotyšsko"
+msgstr "USSR - Latvia"
msgid "50cm ortho - Latvia"
-msgstr "50cm ortho - Lotyšsko"
+msgstr "50cm ortho - Latvia"
msgid "20cm ortho - Coastline"
-msgstr "20cm ortho -Pobrežná čiara"
+msgstr "20cm ortho - Coastline"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Lithuania)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Niger Delta Oct 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Car (Auto)"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Hiking (Turistika)"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Cyclo (Bicyklovanie)"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Ski (Lyžovanie)"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Slovakia EEA GMES Urban Atlas"
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Slovakia EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Tours - Orthophotos 2008-2010"
+msgid "Slovakia Historic Maps"
+msgstr "Slovakia Historic Maps (historické mapy)"
-msgid "Tours - Orthophotos 2008"
-msgstr "Tours - Orthophotos 2008"
+msgid "South Africa CD:NGI Aerial"
+msgstr "South Africa CD:NGI Aerial"
msgid "Catastro Spain"
msgstr "Catastro Spain"
@@ -20903,89 +22690,149 @@ msgstr "ITACyL - Castile and León"
msgid "IDEIB - Balearic Islands"
msgstr "IDEIB - Balearic Islands"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Estonia Basemap (Maaamet)"
-
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Estonia Ortho (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Kanton Aargau 25cm (AGIS 2011)"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Estonia Multi (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Stadt Uster Orthophoto 2008 10cm"
-msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgid "Stadtplan Zürich"
+msgstr "Stadtplan Zürich"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr "Vejmidte (Denmark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Canton de Génève 5cm (SITG 2011)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Canton de Neuchâtel 50cm (SITN 2006)"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Canton du Jura 50cm (RCJU 1998)"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Canton de Fribourg 50cm (2005)"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr "Niger Delta Oct 2012 Landsat"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Stadt Bern 10cm/25cm (2008)"
-msgid "South Africa CD:NGI Aerial"
-msgstr "South Africa CD:NGI Aerial"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk autoatlas"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk turistika"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Orthophoto 2012"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk cyklistika"
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Orthophoto 2012"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk lyžovanie"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Lausanne - Orthophoto technique 2012"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "MSR Maps Topo"
+msgstr "MSR Maps Topo"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "MSR Maps Urban"
+msgstr "MSR Maps Urban"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Slovakia EEA GMES Urban Atlas"
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Scanned Topographic Maps"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Slovakia EEA CORINE 2006"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Large Scale Imagery"
-msgid "Slovakia Historic Maps"
-msgstr "Slovensko historické mapy"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Roads Overlay"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI black-and-white 2.5m"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "New & Misaligned TIGER Roads (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
msgstr "OSM - Tiger Edited Map"
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Parcels"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Orthoimagery"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Ukraine - Orthophotomaps 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr "OS New Popular Edition historic"
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
+
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
+
+msgid "Surrey Air Survey"
+msgstr "Surrey Air Survey"
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS 6-inch Scotland 1842-82"
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-inch 7th Series 1955-61"
+
msgid "OS 1:25k historic (OSM)"
-msgstr "OS 1:25k historické (OSM)"
+msgstr "OS 1:25k historic (OSM)"
msgid "OS Scottish Popular historic"
-msgstr "OS Scottish Popular historické"
+msgstr "OS Scottish Popular historic"
-msgid "Stuttgart (Luftbild)"
-msgstr "Stuttgart (Luftbild)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew Half Inch, 1897-1907"
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "OS Town Plans, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "OSM Export"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Exportovať dopravné údaje do súboru siete SUMO."
+
+msgid "SUMO Export"
+msgstr "SUMO Export"
+
+msgid "Export"
+msgstr "Export"
+
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "obnoviť obsah okna"
+
+msgid "Configure"
+msgstr "Konfigurovať"
+
+msgid "Connection Error."
+msgstr "Chyba pri pripojovaní."
-msgid "2u"
-msgstr "2u"
+msgid "configure the connected DG100"
+msgstr "konfigurovať spojenie DG100"
+
+msgid "delete data after import"
+msgstr "zmazať dáta po importe"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV Súbory"
@@ -21045,10 +22892,10 @@ msgid "Missing definition of new object with id {0}."
msgstr "Chýbajú definície nového objektu s id {0}."
msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
-msgstr ""
+msgstr "Chýba povinný atribút ''{0}'' na členovi (<member>) relácie {1}."
msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
+msgstr "Neplatná hodnota pre vlastnosť ''uid''. Obdržaná hodnota je \"{0}\""
msgid "nodes"
msgstr "body"
@@ -21136,7 +22983,7 @@ msgid "Upload Traces"
msgstr "Nahrať stopy"
msgid "Defines the visibility of your trace for other OSM users."
-msgstr "Definovať viditeľnosť pre vašu stopu pre iných OSM používateľov."
+msgstr "Definovať viditeľnosť pre vašu stopu pre iných používateľov OSM."
msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -21195,6 +23042,18 @@ msgstr "Zobraziť výškový profil"
msgid "Elevation Profile"
msgstr "Výškový profil"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Vrstva výškového profilu (experimentálne!)"
+
+msgid "Shows elevation grid layer"
+msgstr "Zobrazí vrstvu s výškovým profilom"
+
+msgid "Elevation Grid"
+msgstr "Výškový profil"
+
+msgid "No SRTM data"
+msgstr "Žiadne dáta SRTM"
+
msgid "Open the elevation profile window."
msgstr "Otvoriť okno výškového profilu."
@@ -21202,13 +23061,13 @@ msgid "Min"
msgstr "Min"
msgid "Avrg"
-msgstr "Avrg"
+msgstr "Priem"
msgid "Max"
msgstr "Max"
msgid "Dist"
-msgstr "Vzdialenosť"
+msgstr "Vzdial"
msgid "Gain"
msgstr "Zvýšenie"
@@ -21216,14 +23075,8 @@ msgstr "Zvýšenie"
msgid "Time"
msgstr "Čas"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "Automatické"
-
-msgid "Fixed value"
-msgstr "Pevná hodnota"
+msgid "Tracks"
+msgstr "Stopy"
msgid "Elevation profile for track ''{0}''."
msgstr "Výškový profil pre stopu ''{0}''."
@@ -21247,7 +23100,7 @@ msgid "Starting Epsilon"
msgstr ""
msgid "Max points count per 1 km"
-msgstr "Max počet bodov na 1 km"
+msgstr "Max. počet bodov na 1 km"
msgid "Enter key mode"
msgstr ""
@@ -21337,10 +23190,10 @@ msgid "Fix addresses"
msgstr "Oprava adries"
msgid "Show dialog with incomplete addresses"
-msgstr ""
+msgstr "Zobraziť okno s nekompletnými adresami"
msgid "Include objects used for guesses"
-msgstr ""
+msgstr "Vložte objekty použité pre odhady"
msgid "Fix street addresses"
msgstr "Oprava adries ulíc"
@@ -21361,7 +23214,7 @@ msgid "Address has no street"
msgstr "Adresa nemá ulicu"
msgid "Address has no valid street"
-msgstr ""
+msgstr "Adresa nemá platnú ulicu"
msgid "Address has no post code"
msgstr "Adresa nemá PSČ"
@@ -21376,7 +23229,7 @@ msgid "Assign to"
msgstr "Priradiť k"
msgid "Remove all address tags"
-msgstr "Odstrániť všetky adresné tagy"
+msgstr "Odstrániť všetky značky adries"
msgid "No name"
msgstr "Žiadny názov"
@@ -21397,7 +23250,7 @@ msgid "Incomplete Addresses"
msgstr "Nekompletné adresy"
msgid "Selected Addresses"
-msgstr ""
+msgstr "Zvolené adresy"
msgid "Selected Street"
msgstr "Vybraná ulica"
@@ -21412,20 +23265,20 @@ msgid "Show incomplete addresses"
msgstr "Zobraziť nekompletné adresy"
msgid "items"
-msgstr ""
+msgstr "položky"
msgid "no items"
-msgstr ""
+msgstr "žiadne položky"
msgctxt "address"
msgid "City"
-msgstr ""
+msgstr "Mesto"
msgid "Postcode"
msgstr "PSČ"
msgid "Turns all guesses into the corresponding tag values."
-msgstr ""
+msgstr "Vytvoriť príslušné hodnoty značiek zo všetkých odhadov."
msgid "Applied guessed values"
msgstr "Aplikované hádané hodnoty"
@@ -21437,7 +23290,7 @@ msgid "Assign address to street"
msgstr "Priradiť adresy na ulici"
msgid "Assign the selected address(es) to the selected street."
-msgstr ""
+msgstr "Priradiť vybrané adresy vybranej ulici."
msgid "Set street name"
msgstr "Nastaviť názov ulice"
@@ -21449,35 +23302,39 @@ msgid ""
"Create relation between street and related addresses for ALL streets in the "
"current layer."
msgstr ""
+"Vytvoriť reláciu medzi ulicou a súvisiacimi adresami pre VŠETKY ulice v "
+"aktuálnej vrstve."
msgid "Convert to relation."
-msgstr ""
+msgstr "Konvertovať na reláciu"
msgid "Create relation between street and related addresses."
-msgstr ""
+msgstr "Vytvoriť reláciu medzi ulicou a súvisiacimi adresami."
msgid "Create address relation for "
-msgstr ""
+msgstr "Vytvoriť reláciu pre "
msgid "Guess"
-msgstr ""
+msgstr "Odhad"
msgid ""
"Tries to guess address data by picking the name of the closest object with "
"according tag."
msgstr ""
+"Pokúsi sa uhádnuť údaje adresy vybraním názvu najbližšieho objektu s "
+"potrebnou značkou."
msgid "Guessing address values"
-msgstr ""
+msgstr "Odhadujem hodnoty adries"
msgid "Removes address related tags from the object."
-msgstr "Odstráni súvisiace tagy adresy z objektu."
+msgstr "Odstráni značky súvisiace s adresou z objektu."
msgid "Remove address tags"
-msgstr "Odobrať tagy pre adresy"
+msgstr "Odobrať značky pre adresy"
msgid "Marks selected addresses in the map"
-msgstr ""
+msgstr "Vyznačí zvolené adresy na mape"
msgid "Select incomplete addresses"
msgstr "Vyberte neúplné adresy"
@@ -21485,8 +23342,14 @@ msgstr "Vyberte neúplné adresy"
msgid "Selects all addresses with incomplete data."
msgstr "Vyberie všetky adresy s neúplnými údajmi."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Použite značku \"addr:street\" alebo \"addr:place\""
+
msgid "House Number Editor"
-msgstr ""
+msgstr "Editor čísel domov"
+
+msgid "House number increment:"
+msgstr "Prírastok čísla domu:"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -21510,6 +23373,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Vlastnosti vrstvy"
+msgid "Error while creating image layer: {0}"
+msgstr "Chyba pri vytváraní obrazovej vrstvy: {0}"
+
msgid "Import image"
msgstr "Importovať obrázok"
@@ -21538,13 +23404,13 @@ msgid "Edit opening hours"
msgstr "Upraviť otváraciu dobu"
msgid "Edit time-tag of selected element in a graphical interface"
-msgstr "Úpravy časovú značku vybraných prvkov v grafickom rozhraní"
+msgstr "Upraviť časovú značku vybraných prvkov v grafickom rozhraní"
msgid "edit existing tag"
-msgstr "upraviť existujúci tag"
+msgstr "upraviť existujúcu značku"
msgid "edit new tag"
-msgstr "pridať nový tag"
+msgstr "upraviť novú značku"
msgid "Display clock in 12h mode."
msgstr "Zobraziť čas v 12 hodinovom formáte."
@@ -21588,9 +23454,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
"Handy Address Interpolation Functions (Funkcia šikovného priraďovania adresy)"
@@ -21668,7 +23546,7 @@ msgid "Please select a street to associate with address interpolation way"
msgstr "Prosím zvoľte ulicu pre pridruženie s adresami vloženou cestou"
msgid "Please select address interpolation way for this street"
-msgstr "Prosím vyberte adresami vloženú cestu pre túto ulicu"
+msgstr "Prosím vyberte adresami vloženú cestu pre túto ulicu"
msgid "Expected odd numbers for addresses"
msgstr "Očakávané nepárne čísla pre adresy"
@@ -21676,8 +23554,8 @@ msgstr "Očakávané nepárne čísla pre adresy"
msgid "Expected even numbers for addresses"
msgstr "Očakávané párne čísla pre adresy"
-msgid "Expected valid number for address increment"
-msgstr "Očakávané platné číslo prírastka čísla adresy"
+msgid "Expected valid number for increment"
+msgstr "Očakávané platné číslo pre prírastok"
msgid "Country code must be 2 letters"
msgstr "Kód krajiny musí byť z 2 písmen"
@@ -21927,16 +23805,16 @@ msgid ""
msgstr ""
msgid "Don''t show this again"
-msgstr ""
+msgstr "Nezobrazovať znovu"
msgid "What''s new..."
-msgstr ""
+msgstr "Čo je nové..."
msgid "Added <b>angle preserving</b> aligning mode"
msgstr ""
msgid "Various improvements and bugfixes"
-msgstr ""
+msgstr "Rôzne vylepšenia a opravy chýb"
msgid "Errr..."
msgstr ""
@@ -21953,26 +23831,17 @@ msgstr "Číslo domu:"
msgid "Street Name:"
msgstr "Názov ulice:"
-msgid "Increment"
-msgstr "Prírastok"
-
-msgid "Decrement"
-msgstr "Úbytok"
-
-msgid "Numbers:"
-msgstr "Čísla:"
-
msgid "Big buildings mode"
-msgstr ""
+msgstr "Režim veľkých budov"
msgid "Rotate crosshair"
msgstr ""
msgid "Advanced settings"
-msgstr ""
+msgstr "Pokročilé nastavenia"
msgid "Buildings tags:"
-msgstr ""
+msgstr "Značky budov:"
msgid "Cannot place building outside of the world."
msgstr "Nemožno umiestniť budovy mimo Zeme."
@@ -21987,10 +23856,10 @@ msgid "Use Address dialog"
msgstr "Použiť adresný dialóg"
msgid "Auto-select building"
-msgstr ""
+msgstr "Automaticky vybrať budovu"
msgid "Use address nodes under buildings"
-msgstr ""
+msgstr "Použiť adresové body pod budovami"
msgid "Buildings width:"
msgstr "Šírka budovy:"
@@ -21999,19 +23868,19 @@ msgid "Length step:"
msgstr "Dĺžka kroku:"
msgid "Advanced..."
-msgstr ""
+msgstr "Pokročilé..."
msgid "Draw buildings"
msgstr "Kresliť budovy"
msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "Označte roh budovy pre začiatok kreslenia"
msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Označte protiľahlý koniec budovy"
msgid "Set width of the building"
-msgstr ""
+msgstr "Nastavte šírku budovy"
msgid "on polygon"
msgstr ""
@@ -22147,6 +24016,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "Zvoľte najprv WMS vrstvu v zozname."
@@ -22154,7 +24026,7 @@ msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
msgstr "Nepoužívaj reláciu pre adresy, ale addr:street na prvku."
msgid "off"
-msgstr ""
+msgstr "vypnuté"
msgid "25 m"
msgstr "25 m"
@@ -22165,12 +24037,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "symbol"
@@ -22213,7 +24079,7 @@ msgstr ""
"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
"l\"> "
"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
-"<BR>predtým, ako nahráte nejaké dáta vytvorené týmto pluginom."
+"<BR>predtým, ako nahráte nejaké dáta vytvorené týmto pluginom."
msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
msgstr ""
@@ -22228,7 +24094,7 @@ msgid ""
"Invert the original black and white colors (and all intermediate greys). "
"Useful for texts on dark backgrounds."
msgstr ""
-"Zameňte originálnu čiernu a bielu farbu ( a všetky prechodné šedé). Použité "
+"Zameňte originálnu čiernu a bielu farbu (a všetky prechodné šedé). Použité "
"pre texty na tmavých pozadiach."
msgid "Allows multiple layers stacking"
@@ -22317,6 +24183,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr "Zobraziť kríže:"
@@ -22336,6 +24205,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Pridať \"source=...\" do položiek?"
@@ -22400,77 +24272,27 @@ msgstr ""
msgid "Cadastre grab"
msgstr ""
-msgid "Download Image from French Cadastre WMS"
-msgstr "Stiahnuť obrázok z francúzkeho Cadastre WMS"
-
-msgid "Cadastre: {0}"
-msgstr "Cadastre: {0}"
-
-msgid "Georeference an image"
-msgstr ""
-
-msgid "Grab non-georeferenced image"
-msgstr "Zachytený obrázok bez zemepisných súradníc"
-
-msgid "Georeferencing interrupted"
-msgstr "Určovanie zemepisných súradníc prerušené"
-
-msgid ""
-"This image contains georeference data.\n"
-"Do you want to use them ?"
-msgstr ""
-"Tento obrázok obsahuje georeferenčné dáta.\n"
-"Chcete ich použiť?"
-
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Kliknite na prvý roh pre orezanie obrázka\n"
-"(povinné sú dva body)"
-
-msgid "Image cropping"
-msgstr "Orezávanie obrázkov"
-
-msgid "Click second corner for image cropping"
-msgstr "Kliknite na druhý roh pre orezanie obrázka"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Kliknite na prvý Lambertov priečnik (crosspiece) pre georeferencing\n"
-"(povinné sú dva body)"
-
-msgid "Image georeferencing"
-msgstr "Určovanie zemepisnej polohy obrázkov"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej "
-"polohy(georeferencing)"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Chcete zrušiť kompletne\n"
-"alebo len opakovať "
-
-msgid "Enter cadastre east,north position"
-msgstr "Vstúpiť do cadastre na východ, sever pozícii"
+msgid "Download Image from French Cadastre WMS"
+msgstr "Stiahnuť obrázok z francúzkeho Cadastre WMS"
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Varovanie: potvrdte sever so šípkou !!)"
+msgid "Cadastre: {0}"
+msgstr "Cadastre: {0}"
-msgid "East"
-msgstr "Východ"
+msgid "Georeference an image"
+msgstr ""
-msgid "I use the mouse"
-msgstr "Používam myš"
+msgid "Grab non-georeferenced image"
+msgstr "Zachytený obrázok bez zemepisných súradníc"
-msgid "Set {0} Lambert coordinates"
-msgstr "Zvoliť {0} Lambert súradnice"
+msgid "Georeferencing interrupted"
+msgstr "Určovanie zemepisných súradníc prerušené"
+
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
+msgstr ""
+"Tento obrázok obsahuje georeferenčné dáta.\n"
+"Chcete ich použiť?"
msgid "Load layer from cache"
msgstr ""
@@ -22529,20 +24351,84 @@ msgstr "Pridať novú vrstvu"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "Vymazať cookie"
msgid "Get a new cookie (session timeout)"
msgstr "Získať nové cookie (časový limit na súčasné sedenie)"
-msgid "Save image as PNG"
-msgstr "Uložiť obrázok ako PNG"
+msgid "Save image as..."
+msgstr ""
msgid "PNG files (*.png)"
msgstr "PNG súbory (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "Exportovať ako PNG formát (iba rastrové obrázky)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Kliknite na prvý roh pre orezanie obrázka\n"
+"(povinné sú dva body)"
+
+msgid "Image cropping"
+msgstr "Orezávanie obrázkov"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Kliknite na prvý Lambertov priečnik (crosspiece) pre georeferencing\n"
+"(povinné sú dva body)"
+
+msgid "Image georeferencing"
+msgstr "Určovanie zemepisnej polohy obrázkov"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Chcete zrušiť kompletne\n"
+"alebo len opakovať "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr "Vstúpiť do cadastre na východ, sever pozícii"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Varovanie: potvrdte sever so šípkou !!)"
+
+msgid "East"
+msgstr "Východ"
+
+msgid "I use the mouse"
+msgstr "Používam myš"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "Zvoliť {0} Lambert súradnice"
+
+msgid "Click second corner for image cropping"
+msgstr "Kliknite na druhý roh pre orezanie obrázka"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
+"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej "
+"polohy(georeferencing)"
msgid "Adjust WMS"
msgstr "Nastaviť WMS"
@@ -22569,8 +24455,11 @@ msgstr "WMS vrstva ({0}), {1} dlaždice(dlaždíc) načítané"
msgid "Is not vectorized."
msgstr "Nie je vektorizované."
-msgid "Raster size: {0}"
-msgstr "Veľkosť rastra: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "Je vektorizované."
@@ -22623,8 +24512,8 @@ msgstr "Zmazať vybranú schému zo zoznamu."
msgid "Color Schemes"
msgstr "Farebná schéma"
-msgid "Adress"
-msgstr ""
+msgid "Address"
+msgstr "Adresa"
msgid "Split area"
msgstr "Rozdeliť oblasť"
@@ -22670,6 +24559,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -22742,6 +24634,71 @@ msgstr ""
msgid "Install"
msgstr ""
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr "Používatelia mapujúci v okolí:"
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Iba poloha"
@@ -22781,27 +24738,9 @@ msgstr "Vypnúť zaznamenávanie dát ak vzdialenosť klesla pod"
msgid "Unknown logFormat"
msgstr "Neznámy zaznamenaný formát"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "obnoviť obsah okna"
-
-msgid "Configure"
-msgstr "Konfigurovať"
-
msgid "Configure Device"
msgstr "Konfigurácia zariadenia"
-msgid "Connection Error."
-msgstr "Chyba pri pripojovaní."
-
-msgid "configure the connected DG100"
-msgstr "konfigurovať spojenie DG100"
-
-msgid "delete data after import"
-msgstr "zmazať dáta po importe"
-
msgid "Importing data from device."
msgstr "Importovať dáta zo zariadenia."
@@ -22944,31 +24883,37 @@ msgid "Collection must contain at least one condition"
msgstr ""
msgid "No ruleset has been selected!"
-msgstr ""
+msgstr "Nebola zvolená sada pravidiel!"
msgid "No ruleset"
-msgstr ""
+msgstr "Žiadna sada pravidiel"
msgid ""
"Syntax exception in access ruleset:\n"
"{0}"
msgstr ""
+"Chyba syntaxe v sade pravidiel:\n"
+"{0}"
msgid ""
"File not found:\n"
"{0}"
msgstr ""
+"Súbor sa nenašiel:\n"
+"{0}"
msgid ""
"Problem when accessing a file:\n"
"{0}"
msgstr ""
+"Chyba pri otváraní súboru:\n"
+"{0}"
msgid "File not found:\n"
-msgstr ""
+msgstr "Súbor sa nenašiel:\n"
msgid "Couldn''t find built-in ruleset {0}"
-msgstr ""
+msgstr "Nenašla sa zabudovaná sada pravidiel {0}"
msgid "height (m)"
msgstr "výška (m)"
@@ -22983,7 +24928,7 @@ msgid "speed (km/h)"
msgstr "rýchlosť (km/h)"
msgid "weight (t)"
-msgstr "váha (t)"
+msgstr "hmotnosť (t)"
msgid "axleload (t)"
msgstr "zaťaženie na nápravu (t)"
@@ -22998,19 +24943,19 @@ msgid "Bookmark name must not contain ''{0}''!"
msgstr "Názov záložky nesmie obsahovať \"{0}\"!"
msgid "Access class"
-msgstr ""
+msgstr "Trieda prístupu"
msgid "Access class must not contain ''{0}''!"
-msgstr ""
+msgstr "Trieda prístupu nesmie obsahovať\"{0}\"!"
msgid "Access types"
-msgstr ""
+msgstr "Typy prístupu"
msgid "Vehicle properties"
-msgstr ""
+msgstr "Vlastnosti vozidla"
msgid "Road requirements"
-msgstr ""
+msgstr "Požiadavky na cestu"
msgid "Max. incline up (%, pos.)"
msgstr "Max. stúpanie (%)"
@@ -23025,69 +24970,72 @@ msgid "Maximum incline the vehicle can go down"
msgstr "Maximálne klesanie pre vozidlo"
msgid "Surface blacklist"
-msgstr ""
+msgstr "Zakázané povrchy"
msgid ""
"List of surfaces the vehicle cannot use, values are separated by semicolons "
"(;)"
msgstr ""
+"Zoznam povrchov, ktoré vozidlo nemôže použiť; hodnoty sú oddelené "
+"bodkočiarkou (;)"
msgid "max. tracktype grade"
-msgstr ""
+msgstr "maximálny stupeň cesty (tracktype)"
msgid "Worst tracktype (1-5) the vehicle can still use, 0 for none"
msgstr ""
+"Najhorší stupeň cesty (1-5), ktorý môže vozidlo ešte použiť; 0 pre žiadny"
msgid "Change bookmark"
-msgstr ""
+msgstr "Zmeniť záložku"
msgid "Edit access parameters"
-msgstr ""
+msgstr "Upraviť parametre prístupu"
msgid "Graph View Dialog"
-msgstr ""
+msgstr "Okno \"Graph view\""
msgid "Open the dialog for graph view configuration."
-msgstr ""
+msgstr "Otvoriť okno konfigurície \"Graph view\""
msgid "default"
-msgstr ""
+msgstr "predvolené"
msgid "end nodes"
-msgstr ""
+msgstr "krajné body"
msgid "incline"
-msgstr ""
+msgstr "sklon"
msgid "Ruleset:"
-msgstr ""
+msgstr "Sada pravidiel:"
msgid "Parameters:"
-msgstr ""
+msgstr "Parametre:"
msgid "Coloring:"
-msgstr ""
+msgstr "Farba:"
msgid "Create/update graph"
-msgstr ""
+msgstr "Vytvoriť/aktualizovať graf"
msgid "Graphview"
-msgstr ""
+msgstr "Graphview"
msgid "Settings for the Graphview plugin that visualizes routing graphs."
-msgstr ""
+msgstr "Nastavenia pluginu Graphview, ktorý zvýrazňuje graf navigácie."
msgid "Ruleset"
-msgstr ""
+msgstr "Sada pravidiel"
msgid "Use built-in rulesets"
-msgstr ""
+msgstr "Použiť zabudované sady pravidiel"
msgid "External ruleset directory:"
-msgstr ""
+msgstr "Externý priečinok sád pravidiel:"
msgid "Select directory"
-msgstr ""
+msgstr "Zvoľte priečinok"
msgid "Vehicle"
msgstr "Vozidlo"
@@ -23096,13 +25044,13 @@ msgid "Create"
msgstr "Vytvoriť"
msgid "Restore defaults"
-msgstr ""
+msgstr "Obnoviť predvolené hodnoty"
msgid "Visualization"
-msgstr ""
+msgstr "Zobrazenie"
msgid "Draw directions separately"
-msgstr ""
+msgstr "Kresliť smery samostatne"
msgid "Node color"
msgstr "Farba bodu"
@@ -23111,51 +25059,53 @@ msgid "Arrow color"
msgstr "Farba šípky"
msgid "Arrowhead fill color"
-msgstr ""
+msgstr "Farba hlavy šípky"
msgid "Arrowhead placement"
-msgstr ""
+msgstr "Umiestnenie hlavy šípky"
msgid "New bookmark"
-msgstr ""
+msgstr "Nová záložka"
msgid "Really delete \"{0}\"?"
msgstr "Naozaj zmazať \"{0}\"?"
msgid "Bookmark deletion"
-msgstr ""
+msgstr "Vymazanie záložky"
msgid ""
"Really restore default bookmarks?\n"
"All manually added or edited bookmarks will be lost!"
msgstr ""
+"Naozaj obnoviť predvolené záložky?\n"
+"Všetky manuálne pridané a upravané záložky budú stratené!"
msgid "Bookmark reset"
-msgstr ""
+msgstr "Resetovať záložky"
msgid "Choose node color"
-msgstr ""
+msgstr "Vyberte farbu bodu"
msgid "Choose arrow color"
-msgstr ""
+msgstr "Vyberte farbu šípky"
msgid "Choose arrowhead fill color"
-msgstr ""
+msgstr "Vyberte farbu hlavy šípky"
msgid "Routing graph calculated by the GraphView plugin"
-msgstr ""
+msgstr "Graf navigácie vypočítaný pluginom GraphView"
msgid "GraphView layer is not mergable"
-msgstr ""
+msgstr "Vrstva GraphView nie je zlúčiteľná"
msgid "graphview default node"
-msgstr ""
+msgstr "predvolený bod graphview"
msgid "graphview default segment"
-msgstr ""
+msgstr "predovlený segment graphview"
msgid "graphview arrowhead core"
-msgstr ""
+msgstr "hlava šípky graphview"
msgid ""
"Weights must be given as positive decimal numbers with unit \"t\" or without "
@@ -23185,11 +25135,14 @@ msgstr "Sklon musí byť zadaný ako kladné desatinné číslo nasledované \"%
msgid "Tracktype grades must be given as integers between 0 and 5."
msgstr ""
+"Stupeň cesty (tracktype) musí byť zadaný ako celé číslo medzi 0 až 5."
msgid ""
"Surface values must not contain any of the following characters: '','', '' "
"'{' '', '' '}' '', ''='', ''|''"
msgstr ""
+"hodnoty povrchu nesmú obsahovať nasledovné znaky: \",\", \" '{' \", \" '}' "
+"\", \"=\", \"|\""
msgid "Imagery XML Files"
msgstr "XML súbory mapových podkladov"
@@ -23206,6 +25159,9 @@ msgstr "Generovať XML hranice mapového podkladu pre výber"
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23276,10 +25232,10 @@ msgid "Imagery Offset Database"
msgstr ""
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "m"
msgstr "m"
@@ -23394,23 +25350,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "Upraviť mapový podklad"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "Upraviť pozíciu vybratej vrstvy mapového podkladu"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Prosím vyberte vrstvu s mapovým podkladom, ktorú chcete upraviť."
+msgstr ""
msgid "Start adjusting"
-msgstr "Začať nastavovanie"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
msgstr ""
-"Aktuálne nie je k dispozícií žiadna vrstva s mapovým podkladom na úpravu."
msgid "No layers to adjust"
-msgstr "Žiadne vrstvy na nastavovanie"
+msgstr ""
msgid "Normal"
msgstr "Normálny"
@@ -23454,12 +25409,6 @@ msgstr "Importované obrázky"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Obrázky (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Otvoriť obrázky s ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Načítať sadu obrázkov na novú vrstvu."
-
msgid "Import vector graphics"
msgstr ""
@@ -23469,18 +25418,15 @@ msgstr "Mierka:"
msgid "unit(s) = "
msgstr "jednotka(ky) = "
-msgid "Import..."
-msgstr "Importovať..."
+msgid "Importing..."
+msgstr "Importujem..."
-msgid "Import vector graphics."
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "Please open or create data layer before importing"
msgstr ""
-msgid "Importing..."
-msgstr "Importujem..."
-
msgid "InfoMode"
msgstr ""
@@ -23701,10 +25647,10 @@ msgid "Size of Landsat tiles (pixels)"
msgstr "Veľkosť dlaždíc Landsatu (pixely)"
msgid "Shift all traces to east (degrees)"
-msgstr "Posunúť všetky stopy(traces) na východ (stupeň)"
+msgstr "Posunúť všetky stopy (traces) na východ (stupne)"
msgid "Shift all traces to north (degrees)"
-msgstr "Posunúť všetky stopy(traces) na sever (stupeň)"
+msgstr "Posunúť všetky stopy (traces) na sever (stupne)"
msgid "Direction to search for land"
msgstr "Smer hľadania zeme"
@@ -23739,14 +25685,14 @@ msgid ""
"Maximum number of nodes to generate before bailing out (before simplifying "
"lines). Default 50000."
msgstr ""
-"Maximálny počet bodov na tvorbu pred sanáciou (pred zjednodušením línií). "
+"Maximálny počet bodov na tvorbu pred sanáciou (pred zjednodušením línií). "
"Štandardne 50000."
msgid ""
"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
"in the range 0-255. Default 90."
msgstr ""
-"Maximálna hodnota šedej branej ako voda (umiestnená na Landsat IR-1 data). "
+"Maximálna hodnota šedej branej ako voda (umiestnená na Landsat IR-1 data). "
"Môže byť v rozsahu 0-255. Štandardne 90."
msgid ""
@@ -23853,9 +25799,6 @@ msgstr "Automatický stred (Auto-Center)"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Nepretržite stred LiveGPS vrstvy do aktuálnej polohy"
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Otvoriť MapDust"
@@ -23910,14 +25853,39 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Funkcia umiestnená v relačnom člene bola skopírovaná do všetkých "
+"nových ciest.<br>Mali by ste toto potvrdiť a opraviť to ak je to "
+"potrebné.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Členstvo v relácii bolo skopírované do všetkých nových ciest.<br>Mali "
+"by ste toto overiť a opraviť ak je to nutné.</html>"
+
msgid "Split way"
+msgstr "Rozdeliť cestu"
+
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Vložte kľúč značky, t.j. <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
msgstr ""
+"<html>Vložte hodnotu značky, t.j. <strong><tt>kontrola "
+"členov</tt></strong></html>"
msgid "Michigan Left"
msgstr "Michigan Left"
msgid "Adds no left turn for sets of 4 or 5 ways."
-msgstr "Pridť zákaz zabočenia vľavo pre sadu zo 4 alebo 5 ciest."
+msgstr "Pridať zákaz zabočenia vľavo pre sadu zo 4 alebo 5 ciest."
msgid "Please select 4 or 5 ways to assign no left turns."
msgstr "Prosím vybrať 4 alebo 5 ciest na priradenie zákazu zabočenia v ľavo."
@@ -23933,7 +25901,7 @@ msgstr "Vytvoriť Michigan zákaz odbočenia vľavo"
msgid "Unable to find via nodes. Please check your selection"
msgstr ""
-"Nie som schopný nájsť sprostredkujúce body. Prosím skontrolujte váš výber."
+"Nie som schopný nájsť sprostredkujúce body. Prosím skontrolujte Váš výber."
msgid ""
"XAPI query, e.g., '''' (to download all data), ''[highway=*]'', or "
@@ -23955,6 +25923,15 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
+msgid "Download from Overpass API ..."
+msgstr ""
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr ""
@@ -23967,15 +25944,6 @@ msgstr ""
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Zmeniť na multipolygón"
-
-msgid "Convert to multipolygon."
-msgstr "Zmeniť na multipolygón."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Jedna z vybraných ciest už je súčasťou iného multipolygónu."
-
msgid "About Plugin"
msgstr "O plugine"
@@ -24047,7 +26015,7 @@ msgid "The username and password is protected by {0}."
msgstr ""
msgid "username"
-msgstr ""
+msgstr "meno používateľa"
msgid "password"
msgstr ""
@@ -24059,10 +26027,10 @@ msgid "proxy password"
msgstr ""
msgid "oauth key"
-msgstr ""
+msgstr "oauth kľúč"
msgid "oauth secret"
-msgstr ""
+msgstr "oauth heslo"
msgid ""
"<br><strong>Warning:</strong> There may be sensitive data left in your "
@@ -24079,7 +26047,7 @@ msgid "Use {0}"
msgstr ""
msgid "Encrypt data with Windows logon credentials"
-msgstr "Zakódovať údaje s prihlasovacími údajmi Windowsu"
+msgstr "Zašifrovať údaje s prihlasovacími údajmi Windows"
msgid "The native password manager plugin detected {0} on your system."
msgstr ""
@@ -24110,9 +26078,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr "CSV súbory"
@@ -24137,12 +26102,21 @@ msgstr "GML súbory"
msgid "Zip Files"
msgstr "zip súbory"
+msgid "7Zip Files"
+msgstr "7Zip súbory"
+
msgid "OpenData XML files"
msgstr "OpenData XML súbory"
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -24195,7 +26169,7 @@ msgid "Download the list of available modules"
msgstr ""
msgid "Update modules"
-msgstr ""
+msgstr "Aktualizovať moduly"
msgid "Update the selected modules"
msgstr "Aktualizovať vybrané moduly"
@@ -24291,6 +26265,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -24307,6 +26284,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -24515,7 +26503,7 @@ msgid "Processing module list from site ''{0}''"
msgstr ""
msgid "OpenStreetBugs download loop"
-msgstr "OpenStreetBugs sťahovaná slučka"
+msgstr "Cyklus sťahovania z OpenStreetBugs"
msgid "Displays OpenStreetBugs issues"
msgstr "Zobrazuje chyby z OpenStreetBugs"
@@ -24545,14 +26533,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Nastala chyba : {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Nedá sa vytvoriť nová chyba. Výsledok: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Hlavička obsahuje niekoľko hodnôt a nemôže byť namapovaný jednotlivý reťazec"
-
msgid "Process queue"
msgstr "Proces poradia"
@@ -24609,18 +26589,6 @@ msgstr ""
msgid "Close: "
msgstr "Zatvoriť: "
-msgid "New issue"
-msgstr "Nový problém"
-
-msgid "Create issue"
-msgstr "Vytvoriť problém"
-
-msgid "Describe the problem precisely"
-msgstr "Podrobne popíšte problém"
-
-msgid "Create: "
-msgstr "Vytvoriť: "
-
msgid "Open in browser"
msgstr ""
@@ -24679,6 +26647,9 @@ msgstr "Spúšťací súbor Firefoxu"
msgid "OSM Server Files pbf compressed"
msgstr "Súbory OSM servera skomprimované v pbf"
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -24886,9 +26857,6 @@ msgstr "Import PDF súboru."
msgid "Import PDF"
msgstr "Import PDF"
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -24968,8 +26936,26 @@ msgstr "Test zlyhal: Nemôžem čítať mčas."
msgid "Test failed: Could not write mtime."
msgstr "Test zlyhal: Nemôžem zapísať mčas."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -25122,6 +27108,10 @@ msgstr "Prázdna schránka"
msgid "The clipboard data is not an image"
msgstr "V schránke nie je obrázok"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Varovanie: Nepodarilo sa spracovať zip súbor ''{0}''. Výnimka bola: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -25143,6 +27133,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -25359,13 +27352,13 @@ msgid "[gap]"
msgstr ""
msgid " [ID] {0}"
-msgstr ""
+msgstr " [ID] {0}"
msgid "Route patterns ..."
-msgstr "Dotiahnuť do mierky obrázka v osi Y"
+msgstr "Vzory trás"
msgid "Edit Route patterns for public transport"
-msgstr "Upraviť trasy liniek pre verejnú dopravu"
+msgstr "Upraviť vzory trás liniek pre hromadnú dopravu"
msgid "Route Patterns"
msgstr ""
@@ -25436,9 +27429,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "Stopy"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -25507,9 +27497,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -25636,17 +27623,14 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "Reštartovať JOSM"
-
msgid "Revert changeset fully"
-msgstr ""
+msgstr "Vrátiť celý zmenový súbor"
msgid "Revert selection only"
-msgstr ""
+msgstr "Vrátiť len výber"
msgid "Revert selection and restore deleted objects"
-msgstr ""
+msgstr "Vrátiť výber a obnoviť vymazané objekty"
msgid "Revert changeset"
msgstr "Vrátiť zmeny vykonané v zmenovom súbore"
@@ -25655,10 +27639,13 @@ msgid "Revert"
msgstr "Vrátiť naspäť"
msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "Zadajte ID zmenového súboru, ktorý má byť vrátený"
msgid "Reverted changeset"
-msgstr ""
+msgstr "Vrátený zmenový súbor"
+
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "Nie je povolené vrátiť zmenový súbor z {0}"
msgid "Missing merge target for {0} with id {1}"
msgstr "Chýba zlučovaný cieľ pre {0} s id {1}"
@@ -25667,81 +27654,107 @@ msgid "Objects history"
msgstr "História objektov"
msgid "History reverter"
-msgstr ""
+msgstr "Vrátenie histórie"
msgid "Preparing history data..."
msgstr "Pripravujem dáta histórie..."
msgid "Remote Control has been asked to revert a changeset."
-msgstr ""
+msgstr "Diaľkové ovládanie bolo požiadané o vrátenie zmenového súboru."
msgid "Reverting..."
-msgstr ""
+msgstr "Vracia sa..."
msgid ""
"This changeset has objects that are not present in current dataset.\n"
"It is needed to download them before reverting. Do you want to continue?"
msgstr ""
+"Tento zmenový súbor obsahuje objekty, ktoré sa nenachádzajú v súčasnej sade "
+"údajov.\n"
+"Je potrebné ich pred vrátením najprv stiahnuť. Chcete pokračovať?"
msgid "Confirm"
-msgstr ""
+msgstr "Potvrdiť"
msgid "Fetching missing primitives"
-msgstr ""
+msgstr "Sťahujú sa chýbajúce základné objekty"
msgid "Downloading changeset"
-msgstr ""
+msgstr "Sťahuje sa zmenový súbor"
+
+msgid "See {0}"
+msgstr "Pozri {0}"
msgid "Revert changeset #{0}"
+msgstr "Vrátiť zmenový súbor #{0}"
+
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
+"Upozornenie: Nepodporovaný začiatočný prvok ''{0}'' v obsahu zmenového "
+"súboru na pozícii ({1},{2}). Vynechávam."
-msgid "Road Sign Plugin"
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
+"Upozornenie: Nepodporovaný koncový prvok ''{0}'' v obsahu zmenového súboru "
+"na pozícii ({1},{2}). Vynechávam."
+
+msgid "Road Sign Plugin"
+msgstr "Plugin Dopravné značky (Road Sign Plugin)"
msgid "signs"
-msgstr ""
+msgstr "dopravné značky"
+
+msgid "Change Properties"
+msgstr "Zmeniť vlastnosti"
msgid "Country preset:"
-msgstr ""
+msgstr "Prednastavenie krajiny:"
msgid "Show all signs"
-msgstr ""
+msgstr "Zobrazovať všetky značky"
msgid "Show a selection of the most useful signs"
-msgstr ""
+msgstr "Zobrazovať výber najdôležitejších značiek"
+
+msgid "Spain"
+msgstr "Španielsko"
msgid "Germany"
-msgstr ""
+msgstr "Nemecko"
msgid "Poland"
-msgstr ""
+msgstr "Poľsko"
msgid "Slovakia"
-msgstr ""
+msgstr "Slovensko"
msgid "Roadsign tagging"
-msgstr ""
+msgstr "Dopravné značky"
msgid "Add tags by clicking on road signs"
-msgstr ""
+msgstr "Pridajte značky kliknutím na dopravné značky"
msgid "Roadsigns plugin: open dialog"
-msgstr ""
+msgstr "Plugin Dopravné značky: otvoriť dialóg"
msgid "custom"
-msgstr ""
+msgstr "prispôsobené"
msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "Nepodarilo sa načítať zdroj prednastavených značiek: ''{0}''"
msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "Chyba pri čítaní prednastavených značiek z ''{0}'':\n"
msgid "Sign {0}"
-msgstr ""
+msgstr "Dopravná značka {0}"
msgid "Additional sign {0}"
-msgstr ""
+msgstr "Doplňujúca dopravná značka {0}"
msgid "Edit relation"
msgstr "Upraviť reláciu"
@@ -25804,7 +27817,7 @@ msgid "Clear route"
msgstr "Vymazať trasu"
msgid "Reconstruct Graph"
-msgstr ""
+msgstr "Rekonštruovať graf"
msgid "Routing Plugin Preferences"
msgstr "Nastavenia trasového (Routing) Pluginu"
@@ -25812,9 +27825,6 @@ msgstr "Nastavenia trasového (Routing) Pluginu"
msgid "Configure routing preferences."
msgstr "Konfigurácia trasových priorít."
-msgid "Highway type"
-msgstr "Typ komunikácie"
-
msgid "Speed (Km/h)"
msgstr "Rýchlosť (km/h)"
@@ -25853,13 +27863,13 @@ msgid "SDS data file"
msgstr ""
msgid "Load..."
-msgstr ""
+msgstr "Načítať..."
msgid "Load separate data store data from a file."
msgstr ""
msgid "Loading files"
-msgstr ""
+msgstr "Načítajú sa súbory"
msgid "SDS"
msgstr ""
@@ -25880,7 +27890,7 @@ msgid "Configures access to the Separate Data Store."
msgstr ""
msgid "Server"
-msgstr ""
+msgstr "Server"
msgid "The URL under which the SDS server can be contacted."
msgstr ""
@@ -25910,19 +27920,19 @@ msgid "SDS password"
msgstr ""
msgid "Test credentials now"
-msgstr ""
+msgstr "Otestovať prihlasovacie údaje"
msgid "SDS tag prefix"
msgstr ""
msgid "Connection successful."
-msgstr ""
+msgstr "Spojenie úspešné"
msgid "Cannot connect to SDS server: "
msgstr ""
msgid "Save..."
-msgstr ""
+msgstr "Uložiť..."
msgid "Save the current separate data store information to a file."
msgstr ""
@@ -25930,6 +27940,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Nemôžem zálohovať súbor. Výnimka je: {0}"
+
msgid "Simplify Area"
msgstr "Zjednodušiť oblasť"
@@ -25990,19 +28003,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -26144,6 +28157,9 @@ msgstr "vymazať obrysovú cestu"
msgid "Street name: "
msgstr "Názov ulice: "
+msgid "Building: "
+msgstr "Budova: "
+
msgid "Even/Odd"
msgstr "Párne/Nepárne"
@@ -26190,7 +28206,7 @@ msgid "Creates individual buildings from a long building."
msgstr "Vytvoriť viac jednotlivých budov z jednej dlhej budovy."
msgid "Invalid selection"
-msgstr ""
+msgstr "Chybný výber"
msgid ""
"Select a single, closed way of at least four nodes. (Optionally you can also "
@@ -26219,6 +28235,95 @@ msgstr "Tracer."
msgid "Tracer building"
msgstr "Tracer stavieb"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -26234,9 +28339,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -26258,6 +28360,10 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Upozornenie: Ignorujem výnimku, pretože úloha bola zrušená. Výnimka: {0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -26276,7 +28382,7 @@ msgid "Signed"
msgstr ""
msgid "Unknown"
-msgstr ""
+msgstr "Neznámy"
msgid "Object signatures"
msgstr ""
@@ -26410,9 +28516,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -26547,14 +28650,14 @@ msgid ""
"In the following table you can edit the <strong>raw tags</strong> of the OSM "
"relation representing this turn restriction."
msgstr ""
-"V nasledujúcej tabuľke si môžete upraviť <strong> neupravené tagy </strong> "
+"V nasledujúcej tabuľke si môžete upraviť <strong>neupravené značky</strong> "
"ktoré reprezentujú v OSM tieto zákazy odbočenia."
msgid ""
"In the following table you can edit the <strong>raw members</strong> of the "
"OSM relation representing this turn restriction."
msgstr ""
-"V nasledujúcej tabuľke si môžete upraviť <strong> neupravené členy </strong> "
+"V nasledujúcej tabuľke si môžete upraviť <strong>neupravené členy</strong> "
"reprezentujúce vzťahy v OSM tieto zákazy odbočenia."
msgid "Type:"
@@ -26601,7 +28704,7 @@ msgid "Edit the raw tags and members of this turn restriction"
msgstr "Upraviť raw značky a členov tohto zákazu odbočenia"
msgid "Errors/Warnings"
-msgstr "Chyby /Varovania"
+msgstr "Chyby/Varovania"
msgid "Show errors and warnings related to this turn restriction"
msgstr "Zobraziť chyby a varovania týkajúce sa tohto zákazu odbočenia"
@@ -26622,13 +28725,13 @@ msgid_plural ""
"There are still {0} errors and/or warnings identified for this turn "
"restriction. You are recommended to resolve these issues first."
msgstr[0] ""
-"Je tu ešte nevyriešená chyba alebo varovanie, určené pre tento zákaz "
-"odbočenia. Odporúča sa tento problém vyriešiť ako prvý."
-msgstr[1] ""
-"Sú tu ešte {0} chyby a/alebo varovania, určené pre tento zákaz odbočenia. "
+"Pre tento zákaz odbočenia sa našlo {0} nevyriešených chýb alebo varovaní. "
"Odporúča sa tieto problémy vyriešiť ako prvé."
+msgstr[1] ""
+"Pre tento zákaz odbočenia sa našla {0} nevyriešená chyba alebo varovanie. "
+"Odporúča sa tento problém vyriešiť ako prvý."
msgstr[2] ""
-"Je tu ešte {0} chýb a/alebo varovaní, určených pre tento zákaz odbočenia. "
+"Pre tento zákaz odbočenia sa našli {0} nevyriešené chyby alebo varovania. "
"Odporúča sa tieto problémy vyriešiť ako prvé."
msgid "Do you want to save anyway?"
@@ -26656,14 +28759,21 @@ msgid_plural ""
"This turn restriction refers to {0} objects which were deleted outside of "
"this turn restriction editor:"
msgstr[0] ""
+"Tento zákaz odbočenia odkazuje na {0} objektov, ktoré boli zmazané mimo "
+"tohto editora zákazov:"
msgstr[1] ""
+"Tento zákaz odbočenia odkazuje na {0} objekt, ktorý bol zmazaný mimo tohto "
+"editora zákazov:"
+msgstr[2] ""
+"Tento zákaz odbočenia odkazuje na {0} objekty, ktoré boli zmazané mimo tohto "
+"editora zákazov:"
msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
"removed.<br>How to you want to proceed?"
msgstr ""
"Aktualizácia tohto zákazu odbočenia nemôže byť uložená, iba ak vymazané "
-"členy sú odstránené. <br> Ako chcete pokračovať?"
+"členy sú odstránené.<br>Ako chcete pokračovať?"
msgid "Remove deleted members and save"
msgstr "Odstrániť zmazané členy a uložiť"
@@ -26685,9 +28795,9 @@ msgid ""
"cannot apply your changes and continue editing.<br><br>Do you want to create "
"a conflict and close the editor?</html>"
msgstr ""
-"<html>Tento zákaz odbočenia bol zmenený mimo editora. <br> Nemôžete použiť "
-"vaše zmeny a pokračovať v úprave. <br> Chcete spôsobiť konflikt a zatvoriť "
-"editor? </html>"
+"<html>Tento zákaz odbočenia bol zmenený mimo editora.<br>Nemôžete použiť "
+"vaše zmeny a pokračovať v úprave.<br>Chcete spôsobiť konflikt a zatvoriť "
+"editor?</html>"
msgid "Already participating in a conflict"
msgstr "Už sa zúčastňujú konfliktu"
@@ -26704,18 +28814,18 @@ msgstr ""
msgid "{0} warning"
msgid_plural "{0} warnings"
-msgstr[0] "{0} varovanie"
-msgstr[1] "{0} varovania"
-msgstr[2] "{0} varovaní"
+msgstr[0] "{0} varovaní"
+msgstr[1] "{0} varovanie"
+msgstr[2] "{0} varovania"
msgid "{0} error"
msgid_plural "{0} errors"
-msgstr[0] "{0} chyba"
-msgstr[1] "{0} chyby"
-msgstr[2] "{0} chýb"
+msgstr[0] "{0} chýb"
+msgstr[1] "{0} chyba"
+msgstr[2] "{0} chyby"
msgid "no issues"
-msgstr "žiadne otázky"
+msgstr "žiadne problémy"
msgid "please select a way"
msgstr "vyberte prosím cestu"
@@ -26770,14 +28880,14 @@ msgid ""
"Select the vehicle types this turn restriction is <strong>not</strong> "
"applicable for."
msgstr ""
-"Vyberte typy vozidiel, pre ktoré sa toto obmedzenie v jazde "
+"Vyberte typy vozidiel, na ktoré sa toto obmedzenie v jazde "
"<strong>nevzťahuje</strong>."
msgid "Public Service Vehicles"
-msgstr "Vozidlá verejnej dopravy"
+msgstr "Vozidlá hromadnej dopravy"
msgid "Public service vehicles like buses, tramways, etc."
-msgstr "Vozidlá verejnej dopravy ako autobusy, električky, atď."
+msgstr "Vozidlá hromadnej dopravy ako autobusy, električky, atď."
msgid "Heavy Goods Vehicles"
msgstr "Nákladné vozidlá"
@@ -26792,29 +28902,29 @@ msgid "Use standard exceptions"
msgstr "Použiť štandardné výnimky"
msgid "Use non-standard exceptions"
-msgstr "Použitie špeciálnej vynimky"
+msgstr "Použitie špeciálnej výnimky"
msgid "Remove the currently selected vias"
-msgstr "Vymazať aktuálne vybraté \"vias(cez)\""
+msgstr "Vymazať aktuálne vybraté \"cez (via)\" objekty"
msgid "Move the selected vias down by one position"
-msgstr "Presunutie vybratých \"vias(cez)\" dole o jednu pozíciu"
+msgstr "Presunutie vybratých \"cez (via)\" objektov dole o jednu pozíciu"
msgid "Move the selected vias up by one position"
-msgstr "Presunutie vybratých \"vias(cez)\" hore o jednu pozíciu"
+msgstr "Presunutie vybratých \"cez (via)\" objektov hore o jednu pozíciu"
msgid "Copy the selected vias to the clipboard"
-msgstr "Kopírovať vybrané \"vias(cez)\" do schránky"
+msgstr "Kopírovať vybrané \"cez (via)\" objekty do schránky"
msgid "Insert ''via'' objects from the clipboard"
-msgstr "Vložiť ''via(cez)'' objekty zo schránky"
+msgstr "Vložiť ''cez (via)'' objekty zo schránky"
msgid ""
"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
"''via''."
msgstr ""
"Nepodarilo sa získať OSM objekt s id {0} z dátového súboru {1}. Nemožno "
-"pridať ako \"vias(cez)\"."
+"pridať ako \"cez (via)\"."
msgctxt "turnrestrictions"
msgid "From:"
@@ -26825,10 +28935,10 @@ msgid "To:"
msgstr "Do:"
msgid "no participating way with role ''from''"
-msgstr "nezúčastňujúca sa cesta s funkciou ''from''"
+msgstr "nezúčastňujúca sa cesta s funkciou ''z (from)''"
msgid "no participating way with role ''to''"
-msgstr "nezúčastňujúca sa cesta s funkciou ''to''"
+msgstr "nezúčastňujúca sa cesta s funkciou ''do (to)''"
msgid "Only participating in selection"
msgstr "Len účasť vo výbere"
@@ -26838,9 +28948,9 @@ msgid ""
"selection only.<br>Deselect to display all turn restrictions in the current "
"data set.</html>"
msgstr ""
-"<html> Zvoľte pre zobrazenie iba zákazy odbočenia vzťahujúce sa k objektu v "
-"súčasnom výbere. <br> Zrušte zobrazenie všetkých zákazov odbočenia v "
-"aktuálnom súbore dát. </ html>"
+"<html>Zvoľte pre zobrazenie iba zákazy odbočenia vzťahujúce sa k objektu v "
+"súčasnom výbere.<br>Zrušte zobrazenie všetkých zákazov odbočenia v aktuálnom "
+"súbore dát.</html>"
msgid "Turn Restrictions"
msgstr "Zákaz odbočenia"
@@ -26874,7 +28984,7 @@ msgid ""
"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgstr ""
"Vývoj pluginu zákaz odbočenia bol sponzorovaný <a "
-"href=\"http://www.skobbler.de\"> skobbler GmbH </ a>."
+"href=\"http://www.skobbler.de\">skobbler GmbH</a>."
msgid "Configure the preferences for the turnrestrictions plugin"
msgstr "Nastaviť predvoľby pre plugin zákaz odbočenia"
@@ -26887,12 +28997,13 @@ msgid ""
"restriction. If enabled, one can edit them in the Basic editor too. If "
"disabled, editing of via-objects is possible in the Advanced Editor only."
msgstr ""
-"Základný Editor môže voliteľne zobraziť zoznam \"via(cez)\"-objektov zákazu "
+"Základný Editor môže voliteľne zobraziť zoznam \"cez (via)\"-objektov zákazu "
"odbočenia. Ak je povolené, je možné aj upravovať v Základnom editore. Ak je "
-"vypnuté, editácia \"via(cez)\"-objektov je možné iba v pokročilom editore."
+"vypnuté, editácia \"cez (via)\"-objektov je možné iba v pokročilom editore."
msgid "Display and edit list of via-objects in the Basic Editor"
-msgstr "Zobraziť a editovať zoznam \"via(cez)\"-objektov v Základnom Editore"
+msgstr ""
+"Zobraziť a editovať zoznam \"cez (via)\"-objektov v Základnom Editore"
msgid "Road signs - Set A"
msgstr "Dopravné značky - Sada A"
@@ -26909,8 +29020,8 @@ msgid ""
"Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
"Assuming the default value ''set-a''."
msgstr ""
-"Upozornenie: nastavený kľúč ''{0}'' má nepodporovanú hodnotu ''{1}''. Za "
-"predpokladu, že sú východiskové hodnoty ''sady-a''."
+"Upozornenie: nastavenie s kľúčom \"{0}\" má nepodporovanú hodnotu \"{1}\". "
+"Použije sa východisková hodnota \"sada A\"."
msgid ""
"This turn restriction uses the way <span class=\"object-name\">{0}</span> "
@@ -26918,18 +29029,22 @@ msgid ""
"turn restriction, the way with role <tt>from</tt> should be different from "
"the way with role <tt>to</tt>, though."
msgstr ""
+"Tento zákaz odbočenia používa cestu <span class=\"object-name\">{0}</span> s "
+"rolou <tt>z (from)</tt> <strong>a</strong> rolou <tt>do (to)</tt>. V "
+"obmedzení odbočenia však musí byť cesta s rolou <tt>z (from)</tt> odlišná od "
+"cesty s rolou <tt>do (to)</tt>."
msgid "Delete ''from''"
-msgstr "Vymazať ''z''"
+msgstr "Vymazať \"z\""
msgid "Removes the member with role ''from''"
-msgstr "Odstrániť člena s funkciou ''z''"
+msgstr "Odstrániť člena s funkciou \"z (from)\""
msgid "Delete ''to''"
-msgstr "Vymazať ''na''"
+msgstr "Vymazať \"do\""
msgid "Removes the member with role ''to''"
-msgstr "Odstrániť člena s funkciou ''na''"
+msgstr "Odstrániť člena s funkciou \"do (to)\""
msgid "Fix in editor"
msgstr "Opraviť v editore"
@@ -26937,7 +29052,7 @@ msgstr "Opraviť v editore"
msgid ""
"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
msgstr ""
-"Prejsť do Základného Editora a ručne zvoliť členov s funkciou ''z'' a ''na''"
+"Prejsť do Základného Editora a ručne zvoliť členov s funkciou \"z\" a \"do\""
msgid ""
"This turn restriction uses a non-standard restriction type <tt>{0}</tt> for "
@@ -26958,15 +29073,20 @@ msgid ""
"<strong>via</strong>-object.<br> It is recommended to set it as unique "
"<strong>via</strong>-object."
msgstr ""
+"Cesta <strong>z (from)</strong> <span class=\"object-name\">{0}</span> a "
+"cesta <strong>do (to)</strong> <span class=\"object-name\">{1}</span> sa "
+"pretínajú v bode <span class=\"object-name\">{2}</span>, ale tento bod nemá "
+"úlohu <strong>cez (via)</strong>.<br> Odporúča sa nastaviť ho ako samostatný "
+"objekt <strong>cez (via)</strong>."
msgid "Set via-Object"
-msgstr "Nastaviť cez (via) objekt"
+msgstr "Nastaviť \"cez (via)\" objekt"
msgid ""
"Replaces the currently configured via-objects with the node at the "
"intersection"
msgstr ""
-"Nahrádza aktuálne konfigurovaná cez (via) objekty s bodom na križovatke"
+"Nahrádza aktuálne konfigurované \"cez (via)\" objekty s bodom na križovatke"
msgid "Go to Basic Editor and manually fix the list of via-objects"
msgstr "Prejsť na základný editor a opraviť ručne zoznam cez (via) objektov"
@@ -26999,7 +29119,7 @@ msgstr "Pridať cestu s úlohou \"do (to)\""
msgid ""
"The two ways participating in the turn restriction <strong>aren''t "
"connected.</strong>"
-msgstr "Cesty v zákaze odbočenia <strong>nie sú spojené.</strong>"
+msgstr "Cesty v zákaze odbočenia <strong>nie sú spojené</strong>."
msgid ""
"Make sure you add one or more via objects (nodes or ways) to the turn "
@@ -27009,7 +29129,7 @@ msgstr ""
"(body alebo cesty)."
msgid "Go to the Advanced Editor and add via objects"
-msgstr "Prejsť na rozšírený editor a pridať via (cez) objekty."
+msgstr "Prejsť na rozšírený editor a pridať \"cez (via)\" objekty."
msgid ""
"A turn restriction requires exactly one way with role <tt>from</tt>. This "
@@ -27034,8 +29154,8 @@ msgid ""
"The tag <tt>except</tt> has the non-standard value <tt>{0}</tt>. It is "
"recommended to use standard values for <tt>except</tt> only."
msgstr ""
-"Tag <tt>okrem (except)</tt> má neštandardnú hodnotu <tt>{0}</tt>. Odporúča "
-"sa používať len štandardné hodnoty pre <tt>okrem (except)</tt>."
+"Značka <tt>except (okrem)</tt> má neštandardnú hodnotu <tt>{0}</tt>. "
+"Odporúča sa používať len štandardné hodnoty pre <tt>except (okrem)</tt>."
msgid "Go to Basic Editor and select standard vehicle type based exceptions"
msgstr ""
@@ -27106,46 +29226,34 @@ msgstr "Obnoviť objekt..."
msgid "Undelete object by id"
msgstr "Obnoviť objekt s id"
-msgid "Select if the data should be added into a new layer"
-msgstr "Vyberte v prípade, že údaje by mali byť pridané do novej vrstvy"
-
-msgid ""
-"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
-"w2''"
-msgstr ""
-
msgid "Undelete Object"
msgstr "Obnoviť Objekt"
msgid "Undelete object"
msgstr "Obnoviť Objekt"
+msgid ""
+"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
+"w2''"
+msgstr "Zadajte typ a ID objektov, ktoré majú byť obnovené, napr. \"n1 w2\""
+
+msgid "Select if the data should be added into a new layer"
+msgstr "Vyberte v prípade, že údaje by mali byť pridané do novej vrstvy"
+
msgid "Start undeleting"
msgstr "Spustiť obnovenie"
msgid "Close dialog and cancel"
msgstr "Zatvoriť dialóg a zrušiť"
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr "Viac nástrojov"
-
msgid "Add nodes at intersections"
-msgstr "Pridať uzly v priesečníkoch"
+msgstr "Pridať body v priesečníkoch"
msgid "Add missing nodes at intersections of selected ways."
msgstr "Pridať chýbajúce body v priesečníkoch vybraných ciest."
msgid "Please select one or more ways with intersections of segments."
-msgstr ""
+msgstr "Prosím vyberte jednu alebo viac ciest s križovaním segmentov."
msgid "Align Way Nodes"
msgstr "Zarovnať body cesty"
@@ -27154,7 +29262,7 @@ msgid "Align nodes in a way"
msgstr "Zarovnať body v ceste"
msgid "The way with selected nodes can not be straightened."
-msgstr ""
+msgstr "Cesta s vybranými bodmi nemôže byť vyrovnaná."
msgid "Internal error: number of nodes is {0}."
msgstr "Interná chyba: počet bodov je {0}."
@@ -27182,15 +29290,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr "Vložiť členstvo relácie z objektov v zásobníku ma vybraný objekt(y)"
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "Rozdeliť objekt"
@@ -27201,21 +29300,22 @@ msgid "The current selection cannot be used for splitting."
msgstr "Tento výber nemôže byť použitý k rozdeleniu."
msgid "The selected way is not closed."
-msgstr ""
+msgstr "Vybraná cesta nie je uzatvorená"
msgid "The selected way does not contain the selected node."
msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Označená cesta neobsahuje vybratý bod."
-msgstr[1] "Označená cesta neobsahuje všetky vybraté body."
-msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
+msgstr[0] "Označená cesta neobsahuje všetky vybrané body."
+msgstr[1] "Označená cesta neobsahuje vybraný bod."
+msgstr[2] "Označená cesta neobsahuje všetky vybrané body."
msgid ""
"The selected way is not a split way, please select split points or split way "
"too."
msgstr ""
+"Vybraná cesta nerozdeľuje objekt, prosím zvoľte rozdeľujúce body a cestu."
msgid "The selected nodes can not be consecutive nodes in the object."
-msgstr ""
+msgstr "Vybrané body nemôžu byť za sebou idúcimi bodmi v objekte."
msgid "Split adjacent ways"
msgstr "Rozdeliť susedné cesty"
@@ -27227,6 +29327,8 @@ msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
"participating in this operation."
msgstr ""
+"Existuje viacero ciest obsahujúcich jeden z rozdeľujúcich bodov. Vyberte "
+"cesty požadované pre túto operáciu."
msgid "Symmetry"
msgstr "Symetria"
@@ -27235,19 +29337,19 @@ msgid ""
"Please select at least two nodes for symmetry axis and something else to "
"mirror."
msgstr ""
-"Prosím, vyberte aspoň dva body pre os symetrie a niečo iní na odzrkadlenie."
+"Prosím, vyberte aspoň dva body pre os symetrie a niečo iné na odzrkadlenie."
msgid "Copy tags from previous selection"
-msgstr "Skopírovať tagy z predošlého výberu"
+msgstr "Skopírovať značky z predošlého výberu"
msgid "Pastes tags of previously selected object(s)"
-msgstr "Vložiť tagy z predošle vybraného objektu(ov)"
+msgstr "Vložiť značky z naposledy vybraného objektu(ov)"
msgid "Add Source Tag"
-msgstr "Pridať tag zdroja"
+msgstr "Pridať značku \"zdroj\""
msgid "Add remembered source tag"
-msgstr "Pridať zapamätaný tag zdroja"
+msgstr "Pridať zapamätanú značku \"zdroj\""
msgid "UnGlue Relation"
msgstr "Odlepiť reláciu"
@@ -27260,10 +29362,10 @@ msgid "UnGlue Relations"
msgstr "Odlepiť relácie"
msgid "Unglued Relations"
-msgstr ""
+msgstr "Odlepené relácie"
msgid "Change relation member for {0} {1}"
-msgstr ""
+msgstr "Zmeniť člena relácie pre {0} {1}"
msgid "Circle arc"
msgstr "Polkružnica"
@@ -27314,23 +29416,11 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr "Nástroj zem. šírky/dĺžky"
msgid "Create geometry by entering lat lon coordinates for it."
-msgstr "Vytvoriť geometriu zadaním súradníc zemepisnej šírky a dĺžky"
+msgstr "Vytvoriť geometriu zadaním súradníc zemepisnej šírky a dĺžky."
msgid ""
"Enter the coordinates for the new nodes, one for each line.<br/>If you enter "
@@ -27373,10 +29463,10 @@ msgid ""
msgstr ""
msgid "Node belongs to way(s), cannot replace."
-msgstr "Uzol popri ceste(ách) nemôže byť nahradený."
+msgstr "Bod patrí ceste(ám), nemôže byť nahradený."
msgid "Replace geometry for node {0}"
-msgstr "Nahradiť geometriu pre uzol {0}"
+msgstr "Nahradiť geometriu pre bod {0}"
msgid "Relation is not a multipolygon, cannot be used as a replacement."
msgstr "Relácia nie je multipolygón, nemôže byť použitý ako náhrada."
@@ -27395,8 +29485,8 @@ msgid ""
"The way to be replaced cannot have any nodes with properties or relation "
"memberships unless they belong to both ways."
msgstr ""
-"Cesta, ktorá má byť nahradená, nemôže obsahovať žiadne uzly s vlastnosťou "
-"členstva v relácii, pokiaľ nepatrí obom cestám."
+"Cesta, ktorá má byť nahradená, nemôže obsahovať žiadne body s vlastnosťou "
+"členstva v relácii, pokiaľ nepatria obom cestám."
msgid "Exceeded iteration limit for robust method, using simpler method."
msgstr ""
@@ -27450,7 +29540,7 @@ msgid "Select middle nodes"
msgstr "Vybrať stredné body"
msgid "Please select two nodes connected by way!"
-msgstr "Prosím, vyberte dva uzly spojené cestou!"
+msgstr "Prosím, vyberte dva body spojené cestou!"
msgid "Too many ways are added: {0}!"
msgstr "Je pridaných príliš veľa ciest: {0}!"
@@ -27500,7 +29590,7 @@ msgid "Select Way Nodes"
msgstr "Vybrať body cesty"
msgid "Select all nodes of a selected way."
-msgstr "Vybrať všetky uzly vybratej cesty."
+msgstr "Vybrať všetky body vybratej cesty."
msgid "Undo selection"
msgstr "Vrátiť výber"
@@ -27512,10 +29602,7 @@ msgid "Unselect nodes"
msgstr "Odznačiť body"
msgid "Removes all nodes from selection"
-msgstr "Odstráni všetky uzly z výberu"
-
-msgid "Video"
-msgstr "Video"
+msgstr "Odstráni všetky body z výberu"
msgid "Import Video"
msgstr "Importovať video"
@@ -27539,7 +29626,7 @@ msgid "Video: {0}"
msgstr "Video: {0}"
msgid "Backward"
-msgstr ""
+msgstr "Späť"
msgid "jumps n sec back"
msgstr "skočí n sekúnd späť"
@@ -27566,19 +29653,19 @@ msgid "Jump To"
msgstr "Skočiť na"
msgid "jumps to the entered gps time"
-msgstr ""
+msgstr "skočiť na zadaný čas gps"
msgid "Loop"
msgstr "Slučka"
msgid "loops n sec around current position"
-msgstr ""
+msgstr "Opakovať n sekúnd okolo aktuálnej pozície"
msgid "Keep centered"
msgstr "Zachovať vycentrované"
msgid "follows the video icon automaticly"
-msgstr ""
+msgstr "automaticky nasleduje ikonu videa"
msgid "Subtitles"
msgstr "Titulky"
@@ -27593,7 +29680,7 @@ msgid "Set the length of a jump"
msgstr "Nastaviť dĺžku skoku"
msgid "Jump in video for x ms"
-msgstr ""
+msgstr "Preskočiť vo videu x ms"
msgid "Loop length"
msgstr "Dĺžka slučky"
@@ -27643,8 +29730,8 @@ msgstr "slučka"
msgid "mute"
msgstr "stlmiť"
-msgid "Scanned Map..."
-msgstr "Skenovaná mapa ..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -27665,9 +29752,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers vrstva ({0}) vo zväčšení {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Way Download (Sťahovanie cesty)"
@@ -27706,9 +29790,9 @@ msgid ""
"continue way downloading?</html>"
msgstr ""
"<html>Nie sú ďalšie pripojené cesty na stiahnutie. <br>Bol zistený "
-"potenciálny duplicitný bod z práve vybraných bodov, hoci. <br>Aktuálne "
-"vybraný bod je ''{0}''< br> Potenciály duplicitný bod je ''{1}''<br> Spojiť "
-"duplicitné body na aktuálne vybraný bod a pokračovať v sťahovaní? </ html>"
+"potenciálny duplicitný bod z práve vybraných bodov, hoci. <br>Aktuálne "
+"vybraný bod je ''{0}''<br>Potenciálny duplicitný bod je ''{1}''<br>Spojiť "
+"duplicitné body na aktuálne vybraný bod a pokračovať v sťahovaní?</html>"
msgid "Merge duplicate node?"
msgstr "Zlúčiť duplikátne body?"
@@ -27750,7 +29834,7 @@ msgid ""
msgstr ""
msgid "Copy {0} template"
-msgstr ""
+msgstr "Kopírovať šablónu {0}"
msgid "Fetch Wikipedia articles with coordinates"
msgstr "Získať články Wikipedie so súradnicami"
@@ -27767,19 +29851,19 @@ msgid "Available in local dataset"
msgstr ""
msgid "Not linked yet"
-msgstr ""
+msgstr "Zatiaľ neprepojené"
msgid "{0}.Wikipedia.org"
-msgstr ""
+msgstr "{0}.Wikipedia.org"
msgid "{0}.Wikipedia.org: {1}"
-msgstr ""
+msgstr "{0}.Wikipedia.org: {1}"
msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr "Získa všetky súradnice z Wikipedie v aktuálnom zobrazení"
msgid "coordinates"
-msgstr ""
+msgstr "súradnice"
msgid "Category"
msgstr "Kategória"
@@ -27791,13 +29875,13 @@ msgid "Enter the Wikipedia category"
msgstr "Zadajte kategóriu Wikipedie"
msgid "Clipboard"
-msgstr ""
+msgstr "Schránka"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Vloží články Wikipedie zo systémovej schránky"
msgid "clipboard"
-msgstr ""
+msgstr "schránka"
msgid "Open Article"
msgstr "Otvoriť článok"
@@ -27806,19 +29890,16 @@ msgid "Opens the Wikipedia article of the selected item in a browser"
msgstr "Otvorí v prehliadači článok Wikipedie pre zvolenú položku"
msgid "Sets the default language for the Wikipedia articles"
-msgstr "Nastaví štandardný jazyk pre články Wikipedie"
+msgstr "Nastaví predvolený jazyk pre články Wikipedie"
msgid "Enter the Wikipedia language"
msgstr "Zadajte jazyk Wikipedie"
-msgid "Add Tag"
-msgstr "Pridať tag"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
-"Pridá tag \"wikipedia\" odpovedajúci tomuto článku pre vybraté objekty"
+"Pridá do vybratých objektov značku \"wikipedia\" zodpovedajúcu tomuto článku"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
msgstr ""
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index c8a20be..2b96b6c 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-30 13:06+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Slovenian <sl at li.org>\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:58+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:59+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -151,13 +166,13 @@ msgid "About JOSM..."
msgstr "O JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -200,6 +215,9 @@ msgstr "Ni ciljne plasti"
msgid "Add imagery layer {0}"
msgstr "Dodaj plast zračnih posnetkov {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -239,9 +257,6 @@ msgstr "Orodje: {0}"
msgid "Please select at least four nodes."
msgstr "Prosim, izberite vsaj 4 vozlišča."
-msgid "Information"
-msgstr "Informacije"
-
msgid "Align Nodes in Line"
msgstr "Poravnaj vozlišča na premico"
@@ -266,6 +281,9 @@ msgstr "konflikt"
msgid "download"
msgstr "sprejem"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "nazaj"
@@ -275,6 +293,9 @@ msgstr "naprej"
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "Informacije"
+
msgid "Zoom to {0}"
msgstr "Povečava na {0}"
@@ -331,9 +352,9 @@ msgstr ""
"njih?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "Združi {0} poti"
@@ -388,18 +409,37 @@ msgstr "Izbriši"
msgid "Delete selected objects."
msgstr "Izbriši izbrane predmete."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Sprejem iz OSM..."
msgid "Download map data from the OSM server."
msgstr "Prenesi podatke zemljevida s strežnika OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>To dejanje bo zahtevalo {0} ločenih<br>zahtev za sprejem. Ali želite "
+"nadaljevati?</html>"
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -504,6 +544,9 @@ msgstr "Zgodovina"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Prikaz zgodovine poti, vozlišča ali relacije OSM."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -617,7 +660,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -767,11 +810,9 @@ msgid "Merge nodes into the oldest one."
msgstr "Združi vozlišča v najstarejšega."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Prosim izberite vsaj dve točki za združevanje oz. točko, ki je zelo blizu "
-"drugi točki."
msgid "Abort Merging"
msgstr "Prekini Združevanje"
@@ -927,8 +968,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -955,12 +996,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -978,9 +1015,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1087,6 +1121,15 @@ msgstr "Hkrati preimenuj datoteko"
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1137,9 +1180,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1202,6 +1242,9 @@ msgstr "Poročilo stanja"
msgid "Copy to clipboard and close"
msgstr "Kopiraj na odložišče in zapri"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Zapri"
@@ -1282,13 +1325,13 @@ msgstr ""
"sredini poti.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1377,6 +1420,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Izniči"
@@ -1401,9 +1465,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1599,6 +1660,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Počasneje naprej"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Sprejem podatkov GPS"
@@ -1608,6 +1672,18 @@ msgstr "Sprejeti podatki GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Sprejem podatkov"
@@ -1627,6 +1703,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Sprejto {0} od {1} (še {2})"
@@ -1677,25 +1778,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1840,6 +1922,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1864,8 +1949,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1881,6 +1966,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2287,6 +2375,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2447,13 +2538,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2462,6 +2553,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2480,8 +2574,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2567,6 +2660,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2603,10 +2699,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2631,8 +2727,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2736,6 +2832,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2796,8 +2895,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2827,11 +2926,11 @@ msgstr "Uveljavi izbrane spremembe"
msgid "Do not apply changes"
msgstr "Ne uveljavi sprememb"
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
-msgstr "Lastnosti "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr ""
@@ -2851,6 +2950,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2881,18 +2983,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2901,8 +3003,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2910,13 +3012,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2930,8 +3030,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2961,11 +3061,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "NEZNANO"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3124,8 +3223,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3232,7 +3330,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3251,6 +3349,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3267,9 +3368,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3310,6 +3408,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Naslovi"
@@ -3334,6 +3435,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3393,15 +3503,15 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Podvojena vozlišča"
msgid "This test checks that there are no nodes at the very same location."
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3469,6 +3579,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3538,6 +3666,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3595,13 +3729,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3633,10 +3767,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
-msgstr "Preverjanje lastnosti:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3770,8 +3904,8 @@ msgstr "Uporabi privzeto datoteko za črkovanje."
msgid "Use the default spellcheck file (recommended)."
msgstr "Uporabi privzeto datoteko za črkovanje (priporočeno)."
-msgid "Fix properties"
-msgstr "Popravi lastnosti"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr ""
@@ -3845,6 +3979,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3875,9 +4012,6 @@ msgstr "zgradba"
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3902,10 +4036,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3968,23 +4102,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4092,7 +4209,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4288,9 +4405,24 @@ msgstr "Pogled"
msgid "Tools"
msgstr "Orodja"
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Izbor"
+
msgid "Presets"
msgstr "Prednastavitve"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4306,10 +4438,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Zvok"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4318,6 +4462,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4377,6 +4524,9 @@ msgstr "(ni predmeta)"
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "Plasti ni na seznamu."
@@ -4404,24 +4554,11 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "ne: lastnost je izrecno izklopljena"
-
-msgid "true: the property is explicitly switched on"
-msgstr "da: lastnost je izrecno vklopljena"
+msgid "{0} ({1} ms)"
+msgstr ""
msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
-msgid "{0} ({1} ms)"
-msgstr ""
-
-msgid ""
-"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
+"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
msgstr ""
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -4704,29 +4841,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4741,8 +4896,8 @@ msgstr ""
msgid "Up"
msgstr "Gor"
-msgid "Move up the selected elements by one position."
-msgstr "Premakni izbrani element za eno mesto višje."
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "Dol"
@@ -4793,14 +4948,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr "Vozlišče"
@@ -5050,14 +5197,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5578,6 +5725,9 @@ msgstr "Prikaži/Skrij"
msgid "Information about layer"
msgstr "Informacije o plasti"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5661,6 +5811,36 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Tip objekta:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "mešano"
+
+msgid "Choose the OSM object type"
+msgstr "Izberi tip OSM objekta"
+
+msgid "Object ID:"
+msgstr "ID objekta:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Vnesi ID objekta, ki naj se prenese"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"IDji objektov so lahko ločeni z vejicami ali presledki.<br/> Primeri: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> v mešanem načinu določi "
+"tudi tip objekta: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relacije"
@@ -5682,9 +5862,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr "Izbor"
-
msgid "Open a selection list window."
msgstr "Odpri okno s seznamom izbora."
@@ -5709,32 +5886,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5754,8 +5931,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5781,9 +5957,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Povečava na težavo"
-
msgid "Fix"
msgstr "Popravi"
@@ -5928,9 +6101,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6215,8 +6385,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6281,34 +6451,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Lastnosti/Članstva"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Lastnosti izbranih predmetov."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<različno>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Latnosti: {0} / Članstva: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Lastnosti / Članstva"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Izbriši izbrani ključ vsem predmetom"
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6323,13 +6505,13 @@ msgstr "Naj res izbrišem izbor iz relacije {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Dodaj nov par ključ/vrednost vsem predmetom"
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "Dodaj oznako"
msgid "Edit the value of the selected key for all objects"
msgstr "Spremeni vrednost izbranega ključa vsem predmetom"
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6410,12 +6592,6 @@ msgstr[3] "Spremeni lastnosti do {0} predmetov"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6447,9 +6623,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6487,7 +6669,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6547,6 +6729,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6802,6 +6987,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Zaznamki"
@@ -6868,9 +7072,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr "Viri in tipi podatkov:"
@@ -6938,21 +7139,8 @@ msgstr "Prenesi povezane (nadrejene relacije)"
msgid "Download object"
msgstr "Prenesi object"
-msgid "Object type:"
-msgstr "Tip objekta:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "mešano"
-
-msgid "Choose the OSM object type"
-msgstr "Izberi tip OSM objekta"
-
-msgid "Object ID:"
-msgstr "ID objekta:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Vnesi ID objekta, ki naj se prenese"
+msgid "Start downloading"
+msgstr "Začni prenos"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6964,28 +7152,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Izberi, če naj se prenesejo tudi člani relacije"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"IDji objektov so lahko ločeni z vejicami ali presledki.<br/> Primeri: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> v mešanem načinu določi "
-"tudi tip objekta: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Prenesi povezane (nadrejene relacije in poti)"
-msgid "Start downloading"
-msgstr "Začni prenos"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Vnešen napačen ID\n"
-"Ne morem prenesti oobjekta."
-
msgid "Class Type"
msgstr ""
@@ -7082,7 +7251,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7181,6 +7350,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7268,7 +7440,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7287,6 +7459,12 @@ msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7353,8 +7531,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7429,8 +7606,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7444,8 +7621,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7660,12 +7836,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7674,6 +7844,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7689,6 +7875,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7696,8 +7897,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7809,9 +8010,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7821,6 +8019,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7837,7 +8038,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7983,7 +8184,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8013,7 +8214,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8127,6 +8328,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8164,6 +8368,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8360,9 +8567,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8381,6 +8585,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Slike z geografskim položajem"
@@ -8438,6 +8645,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8510,9 +8723,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8525,8 +8735,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Prenesi iz OSM vzdolž te sledi"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Prenesi vse znotraj:"
@@ -8552,15 +8765,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
-msgstr "Izračun področja za prenos"
+msgid "Click to download"
+msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
msgstr ""
-"<html>To dejanje bo zahtevalo {0} ločenih<br>zahtev za sprejem. Ali želite "
-"nadaljevati?</html>"
+
+msgid "Download from OSM along this track"
+msgstr "Prenesi iz OSM vzdolž te sledi"
+
+msgid "Calculating Download Area"
+msgstr "Izračun področja za prenos"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -8688,14 +8903,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8710,7 +8921,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8720,8 +8931,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8941,7 +9151,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9007,6 +9217,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9064,9 +9280,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9313,6 +9526,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9441,6 +9657,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9483,6 +9705,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9533,19 +9758,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9563,40 +9779,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9620,6 +9845,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9676,6 +9934,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr "Riši nedejavne plasti v drugi barvi"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9729,6 +9990,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10012,7 +10278,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10181,6 +10453,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10244,8 +10522,8 @@ msgstr "Nastavitve zemljevida"
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10502,40 +10780,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10588,8 +10866,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10598,20 +10876,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10693,14 +10976,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10744,31 +11021,38 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
-msgid "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Uporabi prednastavitev ''{0}''"
+
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Spremeni {0} predmete"
+msgstr[1] "Spremeni {0} predmetov"
+msgstr[2] "Spremeni {0} predmet"
+msgstr[3] "Spremeni {0} predmeta"
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Apply Preset"
+msgstr "Uporabi prednastavitev"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10777,6 +11061,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10792,59 +11079,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
-
-msgid "Use preset ''{0}''"
-msgstr "Uporabi prednastavitev ''{0}''"
-
-msgid "Unknown type: {0}"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Spremeni {0} predmete"
-msgstr[1] "Spremeni {0} predmetov"
-msgstr[2] "Spremeni {0} predmet"
-msgstr[3] "Spremeni {0} predmeta"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
-msgstr "Uporabi prednastavitev"
+msgid "Preset group {0}"
+msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
-msgstr "Spremeni lastnosti"
+msgid "Preset role element without parent"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10862,6 +11149,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10891,6 +11186,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr "ne: lastnost je izrecno izklopljena"
+
+msgid "true: the property is explicitly switched on"
+msgstr "da: lastnost je izrecno vklopljena"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10921,7 +11259,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10961,28 +11299,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11081,6 +11417,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11096,12 +11435,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11180,7 +11527,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11279,35 +11626,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11317,8 +11640,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11345,10 +11668,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11359,9 +11679,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11383,6 +11700,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11432,8 +11752,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11578,6 +11898,9 @@ msgstr "Shrani uporabniško ime in geslo (nekriptirano)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11596,6 +11919,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11620,16 +11952,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11641,6 +11976,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11655,6 +11998,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11685,19 +12037,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11719,11 +12071,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11793,13 +12157,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11942,10 +12306,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11960,22 +12324,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12048,8 +12411,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12064,9 +12426,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12388,17 +12765,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12409,9 +12780,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12443,9 +12857,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
msgstr ""
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12768,6 +13196,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12847,6 +13280,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12948,9 +13385,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13006,6 +13440,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13030,9 +13467,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13058,9 +13492,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13097,6 +13528,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13143,9 +13579,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr "Ceste"
@@ -13230,6 +13663,9 @@ msgstr "Nasip"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "Cestnina"
+
msgid "Motorway Link"
msgstr "Avtocestni priključek"
@@ -13320,6 +13756,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "da"
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13338,10 +13818,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13353,6 +13833,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13380,18 +13863,12 @@ msgstr "krožišče"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "da"
-
msgid "Road Restrictions"
msgstr "Cestne omejitve"
msgid "Edit Road Restrictions"
msgstr "Uredi cestne omejitve"
-msgid "Toll"
-msgstr "Cestnina"
-
msgid "No exit (cul-de-sac)"
msgstr "Brez izhoda (slepa ulica)"
@@ -13401,9 +13878,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13413,13 +13887,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13467,6 +13941,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Najnižja hitrost (km/h)"
@@ -13551,6 +14028,9 @@ msgstr "Uredi most"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13655,21 +14135,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13685,10 +14174,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13724,7 +14213,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13793,12 +14282,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr ""
+msgid "Drinking Water"
+msgstr "Pitna voda"
msgid "Traffic Signal"
msgstr "Semafor"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13814,15 +14309,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13844,6 +14330,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "Stop znak"
@@ -13853,6 +14348,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13862,10 +14360,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13898,9 +14393,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Obračališče"
@@ -13934,19 +14426,43 @@ msgstr "Wikipedija"
msgid "Barriers"
msgstr "Ovire"
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr "Stebriček"
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13958,6 +14474,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13979,19 +14498,34 @@ msgstr ""
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14000,22 +14534,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14048,12 +14611,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14111,6 +14689,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14120,6 +14701,12 @@ msgstr "Potok"
msgid "Edit Stream"
msgstr "Uredi potok"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14159,9 +14746,6 @@ msgstr "Uredi jez"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14195,6 +14779,21 @@ msgstr ""
msgid "Edit Water"
msgstr "Uredi vodo"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Kopno"
@@ -14276,18 +14875,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14360,7 +14964,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14384,10 +14991,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14399,9 +15009,6 @@ msgstr "Tir ozkotirne železnice"
msgid "Edit Narrow Gauge Rail"
msgstr "Uredi tir ozkotirne železnice"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14444,18 +15051,56 @@ msgstr "Nerabljen tir"
msgid "Edit Disused Railway"
msgstr "Uredi nerabljen tir"
-msgid "Optional Types"
-msgstr "Vrsta (neobvezno)"
-
msgid "Abandoned Rail"
msgstr "Zapuščeni tir"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14555,11 +15200,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14571,11 +15214,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14594,12 +15235,12 @@ msgstr ""
msgid "underground"
msgstr ""
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Dostop"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14627,9 +15268,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14645,19 +15283,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14807,6 +15461,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14828,6 +15485,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14855,6 +15518,12 @@ msgstr "Izposojevalnica"
msgid "Edit Car Rental"
msgstr "Uredi izposojevalnico avtomobilov"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14879,22 +15548,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14916,9 +15569,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14982,7 +15632,7 @@ msgstr "Uredi izposojevalnico koles"
msgid "Public Transport"
msgstr "Javni prevoz"
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15113,6 +15763,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15143,6 +15796,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "Klopca"
@@ -15155,9 +15811,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15167,9 +15820,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr "Zgradba"
@@ -15182,6 +15840,9 @@ msgstr "Uredi vhod v podzemno"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15206,14 +15867,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15262,8 +15915,8 @@ msgstr "Uredi avtobusni peron"
msgid "Taxi"
msgstr "Taksi"
-msgid "Edit Taxi station"
-msgstr "Uredi postajališče taksijev"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Letališče"
@@ -15316,41 +15969,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15536,6 +16189,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turizem"
@@ -15557,9 +16216,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Zemljevid"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15572,6 +16237,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15611,6 +16279,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15632,22 +16303,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15671,9 +16354,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15698,8 +16378,17 @@ msgstr "Savna"
msgid "Edit Sauna"
msgstr "Uredi savno"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "Igrišče"
@@ -15771,49 +16460,43 @@ msgstr "Umetnina"
msgid "Edit Artwork"
msgstr "Uredi umetnino"
-msgid "Place of Worship"
-msgstr "Kraj čaščenja"
-
-msgid "Edit Place of Worship"
-msgstr "Uredi kraj čaščenja"
-
-msgid "Religion"
-msgstr "Vera"
-
-msgid "bahai"
+msgid "Recording Studio"
msgstr ""
-msgid "buddhist"
-msgstr "budizem"
+msgid "Edit Studio"
+msgstr ""
-msgid "christian"
+msgid "audio"
msgstr ""
-msgid "hindu"
+msgid "video"
msgstr ""
-msgid "jain"
+msgid "Place of Worship"
+msgstr "Kraj čaščenja"
+
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15831,6 +16514,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15843,6 +16532,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15858,37 +16550,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Vera"
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15978,6 +16773,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Zdravje"
@@ -15987,6 +16788,12 @@ msgstr "Bolnišnica"
msgid "Edit Hospital"
msgstr "Uredi bolnišnico"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -16053,12 +16860,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr "Poštni nabiralnik"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefon"
@@ -16068,6 +16929,30 @@ msgstr "Uredi telefon"
msgid "Telephone cards"
msgstr "Telefonske kartice"
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16077,31 +16962,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16129,8 +17020,8 @@ msgstr ""
msgid "Recycling"
msgstr "Recikliranje"
-msgid "Edit Recycling station"
-msgstr "Uredi raciklažno točko"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr ""
@@ -16156,27 +17047,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16211,12 +17090,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16226,11 +17108,11 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
-msgstr "Pitna voda"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Uredi pitno vodo"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr ""
@@ -16257,6 +17139,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16294,119 +17179,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Uredi stadion"
-msgid "select sport:"
-msgstr "izberite šport:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "šport"
+msgid "Sport"
+msgstr "Šport"
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "lokostrelstvo"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "košarka"
+msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "plezanje"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "kolesarjenje"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gimnastika"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hokej"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "strelišče"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "smučanje"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "nogomet"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "plavanje"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "namizni_tenis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenis"
+msgstr ""
msgid "Sports Centre"
msgstr "Športno središče"
@@ -16438,26 +17359,27 @@ msgstr "Mini golf"
msgid "Edit Miniature Golf"
msgstr "Uredi mini golf"
-msgid "Sport"
-msgstr "Šport"
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr "vrsta"
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16465,6 +17387,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr ""
@@ -16498,10 +17429,26 @@ msgstr ""
msgid "Edit Cycling"
msgstr "Uredi kolesarjenje"
-msgid "Dog Racing"
-msgstr "Pasje dirke"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
-msgid "Edit Dog Racing"
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
+msgid "Dog Racing"
+msgstr "Pasje dirke"
+
+msgid "Edit Dog Racing"
msgstr "Uredi pasje dirke"
msgid "Equestrian"
@@ -16510,7 +17457,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16529,7 +17501,7 @@ msgid "Skating"
msgstr "Drsanje"
msgid "Edit Skating"
-msgstr "Uredi Drsanje"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16573,36 +17545,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16645,19 +17635,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16796,6 +17782,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16808,60 +17806,134 @@ msgstr ""
msgid "Edit Building"
msgstr "Uredi Zgradbo"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
msgstr ""
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr "Stanovanjska zgradba"
msgid "Edit Residential Building"
msgstr "Urejanje stanovanjske stavbe"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Stolp"
@@ -16877,9 +17949,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17089,157 +18158,147 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
msgstr ""
-msgid "Survey Point"
-msgstr "Geodetska točka"
-
-msgid "Edit Survey Point"
-msgstr "Uredi geodetsko točko"
-
-msgid "Surveillance"
-msgstr "Video nadzor"
-
-msgid "Edit Surveillance Camera"
-msgstr "Uredi video nadzorno kamero"
-
-msgid "indoor"
+msgid "Radiation"
msgstr ""
-msgid "outdoor"
+msgid "Seismic Activity"
msgstr ""
-msgid "public"
+msgid "Recording:"
msgstr ""
-msgid "Power"
+msgid "Automated"
msgstr ""
-msgid "Power Generator"
+msgid "Manually"
msgstr ""
-msgid "Edit Power Generator"
+msgid "Remote"
msgstr ""
-msgid "biofuel"
+msgid "Display:"
msgstr ""
-msgid "biogas"
+msgid "Analog"
msgstr ""
-msgid "biomass"
+msgid "Digital"
msgstr ""
-msgid "diesel"
-msgstr ""
+msgid "Survey Point"
+msgstr "Geodetska točka"
-msgid "gasoline"
-msgstr ""
+msgid "Edit Survey Point"
+msgstr "Uredi geodetsko točko"
-msgid "geothermal"
+msgid "Surveillance Camera"
msgstr ""
-msgid "hydro"
-msgstr ""
+msgid "Edit Surveillance Camera"
+msgstr "Uredi video nadzorno kamero"
-msgid "nuclear"
+msgid "indoor"
msgstr ""
-msgid "osmotic"
+msgid "outdoor"
msgstr ""
-msgid "solar"
+msgid "Zone"
msgstr ""
-msgid "tidal"
+msgid "parking"
msgstr ""
-msgid "waste"
+msgid "traffic"
msgstr ""
-msgid "wave"
+msgid "shop"
msgstr ""
-msgid "wind"
+msgid "bank"
msgstr ""
-msgid "Method"
+msgid "Camera"
msgstr ""
-msgid "anaerobic_digestion"
+msgid "fixed"
msgstr ""
-msgid "combustion"
+msgid "panning"
msgstr ""
-msgid "dam"
+msgid "dome"
msgstr ""
-msgid "fission"
+msgid "Mounted on"
msgstr ""
-msgid "fusion"
+msgid "ceiling"
msgstr ""
-msgid "gasification"
+msgid "Direction in degrees"
msgstr ""
-msgid "photovoltaic"
+msgid "Inclination in degrees"
msgstr ""
-msgid "pumped-storage"
+msgid "Height in meter (m)"
msgstr ""
-msgid "pumping"
+msgid "Power"
msgstr ""
-msgid "pyrolysis"
+msgid "Power Plant"
msgstr ""
-msgid "run-of-the-river"
+msgid "Edit Power Plant"
msgstr ""
-msgid "thermal"
+msgid "Start date"
msgstr ""
msgid "Output forms of energy"
msgstr ""
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
msgid "electricity"
msgstr ""
@@ -17276,186 +18335,431 @@ msgstr ""
msgid "vacuum"
msgstr ""
-msgid "battery charging"
+msgid "Power Generator"
msgstr ""
-msgid "Power Station"
+msgid "Edit Power Generator"
msgstr ""
-msgid "Edit Power Station"
+msgid "biofuel"
msgstr ""
-msgid "Power Sub Station"
+msgid "biogas"
msgstr ""
-msgid "Edit Power Sub Station"
+msgid "biomass"
msgstr ""
-msgid "Line reference"
+msgid "diesel"
msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "gasoline"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "geothermal"
msgstr ""
-msgid "Power Tower"
-msgstr "Steber daljnovoda"
+msgid "hydro"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "Uredi steber daljnovoda"
+msgid "nuclear"
+msgstr ""
-msgid "Tower reference"
+msgid "osmotic"
msgstr ""
-msgid "Pole"
+msgid "solar"
msgstr ""
-msgid "Edit Power Pole"
+msgid "tidal"
msgstr ""
-msgid "Pole reference"
+msgid "waste"
msgstr ""
-msgid "Power Line"
+msgid "wave"
msgstr ""
-msgid "Edit Power Line"
+msgid "wind"
msgstr ""
-msgid "Line type"
+msgid "Method"
msgstr ""
-msgctxt "Power Line"
-msgid "line"
+msgctxt "generator method"
+msgid "anaerobic_digestion"
msgstr ""
-msgctxt "Power Line"
-msgid "minor_line"
+msgctxt "generator method"
+msgid "barrage"
msgstr ""
-msgid "Amount of Cables"
+msgctxt "generator method"
+msgid "combustion"
msgstr ""
-msgid "Number of wires (better: conductors) per power cable"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
-msgid "single"
+msgctxt "generator method"
+msgid "fission"
msgstr ""
-msgid "double"
+msgctxt "generator method"
+msgid "fusion"
msgstr ""
-msgid "triple"
+msgctxt "generator method"
+msgid "gasification"
msgstr ""
-msgid "quad"
+msgid "biomass / waste"
msgstr ""
-msgid "Historic Places"
-msgstr "Zgodovinski kraji"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
-msgid "Castle"
-msgstr "Grad"
+msgctxt "generator method"
+msgid "pyrolysis"
+msgstr ""
-msgid "Edit Castle"
-msgstr "Uredi grad"
+msgctxt "generator method"
+msgid "run-of-the-river"
+msgstr ""
-msgid "Ruins"
-msgstr "Ruševine"
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
-msgid "Edit Ruins"
-msgstr "Uredi ruševine"
+msgctxt "generator method"
+msgid "thermal"
+msgstr ""
-msgid "Archaeological Site"
-msgstr "Arheološko najdišče"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "Edit Archaeological Site"
-msgstr "Uredi arheološko najdišče"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "Battlefield"
+msgid "Generator Type"
msgstr ""
-msgid "Edit Battlefield"
+msgid "combined_cycle"
msgstr ""
-msgid "Palaeontological Site"
+msgid "gas combustion"
msgstr ""
-msgid "Edit Palaeontological Site"
+msgid "francis_turbine"
msgstr ""
-msgid "Monument"
+msgid "gas_turbine"
msgstr ""
-msgid "Edit Monument"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "Memorial"
+msgid "heat_pump"
msgstr ""
-msgid "Edit Memorial"
+msgid "horizontal_axis"
msgstr ""
-msgid "Wayside Cross"
+msgid "tidal steam / wind"
msgstr ""
-msgid "Edit Wayside Cross"
+msgid "kaplan_turbine"
msgstr ""
-msgid "Wayside Shrine"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "Edit Wayside Shrine"
+msgid "pelton_turbine"
msgstr ""
-msgid "Boundary Stone"
+msgid "hygro run-of-the-river / hydro water-storage"
msgstr ""
-msgid "Edit Boundary Stone"
+msgid "reciprocating_engine"
msgstr ""
-msgid "Shops"
-msgstr "Trgovine"
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
-msgid "Food"
+msgid "solar_photovoltaic_panel"
msgstr ""
-msgid "Supermarket"
+msgid "solar photovoltaic"
msgstr ""
-msgid "Edit Supermarket"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Convenience Store"
+msgid "solar thermal"
msgstr ""
-msgid "Edit Convenience Store"
+msgid "steam_generator"
msgstr ""
-msgid "Kiosk"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
msgstr ""
-msgid "Edit Kiosk"
+msgid "steam_turbine"
msgstr ""
-msgid "Baker"
-msgstr "Pekarna"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Uredi pekarno"
+msgid "stellarator"
+msgstr ""
-msgid "Butcher"
-msgstr "Mesar"
+msgid "nuclear fusion"
+msgstr ""
-msgid "Edit Butcher"
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr ""
+
+msgid "Edit Power Sub Station"
+msgstr ""
+
+msgid "Line reference"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "Steber daljnovoda"
+
+msgid "Edit Power Tower"
+msgstr "Uredi steber daljnovoda"
+
+msgid "Tower reference"
+msgstr ""
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr ""
+
+msgid "Edit Power Pole"
+msgstr ""
+
+msgid "Pole reference"
+msgstr ""
+
+msgid "Power Line"
+msgstr ""
+
+msgid "Edit Power Line"
+msgstr ""
+
+msgid "Line type"
+msgstr ""
+
+msgid "line"
+msgstr ""
+
+msgid "minor_line"
+msgstr ""
+
+msgid "Amount of Cables"
+msgstr ""
+
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+msgid "single"
+msgstr ""
+
+msgid "double"
+msgstr ""
+
+msgid "triple"
+msgstr ""
+
+msgid "quad"
+msgstr ""
+
+msgid "Historic Places"
+msgstr "Zgodovinski kraji"
+
+msgid "Castle"
+msgstr "Grad"
+
+msgid "Edit Castle"
+msgstr "Uredi grad"
+
+msgid "Ruins"
+msgstr "Ruševine"
+
+msgid "Edit Ruins"
+msgstr "Uredi ruševine"
+
+msgid "Archaeological Site"
+msgstr "Arheološko najdišče"
+
+msgid "Edit Archaeological Site"
+msgstr "Uredi arheološko najdišče"
+
+msgid "Battlefield"
+msgstr ""
+
+msgid "Edit Battlefield"
+msgstr ""
+
+msgid "Palaeontological Site"
+msgstr ""
+
+msgid "Edit Palaeontological Site"
+msgstr ""
+
+msgid "Monument"
+msgstr ""
+
+msgid "Edit Monument"
+msgstr ""
+
+msgid "Memorial"
+msgstr ""
+
+msgid "Edit Memorial"
+msgstr ""
+
+msgid "Wayside Cross"
+msgstr ""
+
+msgid "Edit Wayside Cross"
+msgstr ""
+
+msgid "Wayside Shrine"
+msgstr ""
+
+msgid "Edit Wayside Shrine"
+msgstr ""
+
+msgid "Boundary Stone"
+msgstr ""
+
+msgid "Edit Boundary Stone"
+msgstr ""
+
+msgid "Shops"
+msgstr "Trgovine"
+
+msgid "Food"
+msgstr ""
+
+msgid "Supermarket"
+msgstr ""
+
+msgid "Edit Supermarket"
+msgstr ""
+
+msgid "Convenience Store"
+msgstr ""
+
+msgid "Edit Convenience Store"
+msgstr ""
+
+msgid "Kiosk"
+msgstr ""
+
+msgid "Edit Kiosk"
+msgstr ""
+
+msgid "Bakery"
+msgstr ""
+
+msgid "Edit Bakery"
+msgstr ""
+
+msgid "Butcher"
+msgstr "Mesar"
+
+msgid "Edit Butcher"
msgstr "Uredi mesarja"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17476,13 +18780,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17554,7 +18864,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17575,13 +18885,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17590,7 +18900,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17618,6 +18927,12 @@ msgstr "Uredi menjalnico"
msgid "Edit Automated Teller Machine"
msgstr "Uredi bankomat"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17654,10 +18969,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "budizem"
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17687,7 +19023,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17699,19 +19035,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17732,6 +19068,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17741,7 +19083,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17822,6 +19164,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17951,6 +19296,12 @@ msgstr "Vrh"
msgid "Edit Peak"
msgstr "Uredi vrh"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17990,32 +19341,26 @@ msgstr "Drevo"
msgid "Edit Tree"
msgstr "Uredi drevo"
-msgid "Botanical Name"
+msgid "broad_leaved"
msgstr ""
-msgid "Wood"
+msgid "conifer"
msgstr ""
-msgid "Edit Wood"
+msgid "palm"
msgstr ""
-msgctxt "wood"
-msgid "coniferous"
+msgid "Botanical Name"
msgstr ""
-msgctxt "wood"
-msgid "deciduous"
+msgid "Tree Row"
msgstr ""
-msgctxt "wood"
-msgid "mixed"
+msgid "Wood"
msgstr ""
-msgid "Forest"
-msgstr "Gozd"
-
-msgid "Edit Forest Landuse"
-msgstr "Uredi gozdnata tla"
+msgid "Edit Wood"
+msgstr ""
msgid "coniferous"
msgstr ""
@@ -18026,6 +19371,12 @@ msgstr ""
msgid "mixed"
msgstr ""
+msgid "Forest"
+msgstr "Gozd"
+
+msgid "Edit Forest Landuse"
+msgstr "Uredi gozdnata tla"
+
msgid "Grassland"
msgstr ""
@@ -18101,6 +19452,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vinograd"
@@ -18155,7 +19512,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18167,6 +19524,9 @@ msgstr "Pokopališče"
msgid "Edit Graveyard"
msgstr "Uredi pokopališče"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18242,46 +19602,49 @@ msgstr "Uredi kamnolom"
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
-msgstr "Urejanje podatkov o naslovu"
-
-msgid "House number"
+msgid "Edit Name Information"
msgstr ""
-msgid "House name"
+msgid "Alternative name"
msgstr ""
-msgid "Street name"
-msgstr "Ime ceste"
+msgid "Historical name"
+msgstr ""
-msgid "City name"
+msgid "Local name"
msgstr ""
-msgid "Country code"
+msgid "Regional name"
msgstr ""
-msgid "AT"
+msgid "National name"
msgstr ""
-msgid "CH"
+msgid "International name"
msgstr ""
-msgid "DE"
+msgid "Official name"
msgstr ""
-msgid "FR"
+msgid "Common name abbreviation"
msgstr ""
-msgid "GB"
+msgid "Edit Address Information"
+msgstr "Urejanje podatkov o naslovu"
+
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
msgstr ""
-msgid "RS"
+msgid "Street name"
+msgstr "Ime ceste"
+
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18302,6 +19665,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18464,27 +19839,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18530,19 +19934,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18566,7 +19973,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18662,18 +20069,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18683,7 +20099,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18692,10 +20111,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18713,6 +20132,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18728,28 +20150,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18770,19 +20192,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18848,9 +20270,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18860,10 +20279,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr "šport"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18878,9 +20300,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18908,6 +20327,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18953,10 +20375,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18968,7 +20420,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18986,7 +20438,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19103,19 +20555,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:designation without designation"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19134,13 +20697,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19149,19 +20748,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19176,142 +20784,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19350,150 +21007,213 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Catastro Spain"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "SUMO Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Export"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "Port:"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "refresh the port list"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Configure"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "Connection Error."
msgstr ""
-msgid "2u"
+msgid "configure the connected DG100"
msgstr ""
+msgid "delete data after import"
+msgstr "izbriši podatke po uvozu"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19695,6 +21415,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19716,13 +21448,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19985,9 +21711,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20009,6 +21741,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20087,9 +21822,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20174,7 +21921,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20445,15 +22192,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20624,6 +22362,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20642,12 +22383,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20783,6 +22518,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20800,6 +22538,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20880,113 +22621,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
msgstr ""
-msgid "Save image as PNG"
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21012,7 +22767,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21062,7 +22820,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21107,6 +22865,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21167,16 +22928,81 @@ msgstr ""
msgid "External tools"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr "Ali ste prepričani?"
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
-msgstr "Ali ste prepričani?"
+msgid "Logout"
+msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21218,27 +23044,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr "izbriši podatke po uvozu"
-
msgid "Importing data from device."
msgstr ""
@@ -21634,6 +23442,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21881,12 +23692,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr "Naloži slike v novo plast."
-
msgid "Import vector graphics"
msgstr ""
@@ -21896,16 +23701,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22270,9 +24072,6 @@ msgstr "Samodejno centriraj"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj."
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22327,9 +24126,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22371,25 +24187,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22526,9 +24342,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22553,12 +24366,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22707,6 +24529,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22723,6 +24548,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22956,13 +24792,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -23015,18 +24844,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23084,6 +24901,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23291,9 +25111,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23373,7 +25190,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23527,6 +25362,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23548,6 +25386,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23841,9 +25682,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23912,9 +25750,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24041,9 +25876,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24065,6 +25897,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24097,15 +25932,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Spremeni lastnosti"
+
msgid "Country preset:"
msgstr ""
@@ -24115,6 +25966,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24217,9 +26071,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24335,6 +26186,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24395,19 +26249,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24545,6 +26399,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24620,6 +26477,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24635,9 +26581,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24659,6 +26602,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24811,9 +26757,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25439,7 +27382,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25447,10 +27393,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25459,18 +27402,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25513,15 +27444,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25645,18 +27567,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25834,9 +27744,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25963,7 +27870,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25983,9 +27890,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26118,9 +28022,6 @@ msgstr "Nastavi privzeti jezik za članke Wikipedije"
msgid "Enter the Wikipedia language"
msgstr "Vnesite jezik Wikipedije"
-msgid "Add Tag"
-msgstr "Dodaj oznako"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index bafdd05..1407bfb 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:31+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:31+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "Rreth JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr "Vegla: {0}"
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "E PANJOHUR"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Shëndet"
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Doktor"
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index c71fc4f..1d4c729 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-07-13 07:57+0000\n"
"Last-Translator: Никола Смоленски <Unknown>\n"
"Language-Team: Serbian <sr at li.org>\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 04:56+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 04:57+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -51,6 +51,21 @@ msgstr "Услови коришћења позадине"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -154,13 +169,13 @@ msgid "About JOSM..."
msgstr "О програму ЈОСМ"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -203,6 +218,9 @@ msgstr "Наме одредишних слојева"
msgid "Add imagery layer {0}"
msgstr "Додај слој за слике {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -242,9 +260,6 @@ msgstr "Алатка: {0}"
msgid "Please select at least four nodes."
msgstr "Изаберите најмање четири тачке."
-msgid "Information"
-msgstr "Обавештење"
-
msgid "Align Nodes in Line"
msgstr "Поређај тачке у линију"
@@ -269,6 +284,9 @@ msgstr "несплагање"
msgid "download"
msgstr "преузимање"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "претходно"
@@ -278,6 +296,9 @@ msgstr "следеће"
msgid "Nothing selected to zoom to."
msgstr "Ниеј изабрани ништа што треба приказати."
+msgid "Information"
+msgstr "Обавештење"
+
msgid "Zoom to {0}"
msgstr ""
@@ -332,7 +353,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -389,18 +410,35 @@ msgstr "Уклони"
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -495,6 +533,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -608,7 +649,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -758,8 +799,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -916,8 +957,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -944,12 +985,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -967,9 +1004,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1076,6 +1110,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1126,9 +1169,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1190,6 +1230,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1264,13 +1307,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1359,6 +1402,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1383,9 +1447,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1581,6 +1642,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1590,6 +1654,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1609,6 +1685,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1659,25 +1760,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1820,6 +1902,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1844,8 +1929,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1861,6 +1946,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2267,6 +2355,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2427,13 +2518,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2442,6 +2533,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2460,8 +2554,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2547,6 +2640,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2583,10 +2679,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2609,8 +2705,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2714,6 +2810,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2774,8 +2873,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2805,10 +2904,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2829,6 +2928,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2859,18 +2961,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2879,8 +2981,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2888,13 +2990,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2908,8 +3008,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2939,11 +3039,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "НЕПОЗНАТО"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3096,8 +3195,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3204,7 +3302,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3223,6 +3321,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3239,9 +3340,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3280,6 +3378,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3304,6 +3405,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3363,13 +3473,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3439,6 +3549,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3508,6 +3636,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3565,13 +3699,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3603,10 +3737,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3740,7 +3874,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3815,6 +3949,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3845,9 +3982,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3872,10 +4006,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3938,23 +4072,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4058,7 +4175,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4254,9 +4371,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Избор"
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4272,10 +4404,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4284,6 +4428,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4343,6 +4490,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4370,19 +4520,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4670,29 +4807,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4707,7 +4862,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4759,14 +4914,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5016,14 +5163,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5544,6 +5691,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5627,6 +5777,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5648,9 +5825,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr "Избор"
-
msgid "Open a selection list window."
msgstr ""
@@ -5675,32 +5849,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5720,8 +5894,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5747,9 +5920,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5894,9 +6064,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6181,8 +6348,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6247,34 +6414,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6289,13 +6468,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6374,12 +6553,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6409,9 +6582,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6449,7 +6628,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6509,6 +6688,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6764,6 +6946,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6829,9 +7030,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6898,20 +7096,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6922,23 +7107,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7035,7 +7206,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7135,6 +7306,9 @@ msgid ""
msgstr ""
"<html>Верзија <strong>{0}</strong> направљена <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7222,7 +7396,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7241,6 +7415,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7307,8 +7487,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7383,8 +7562,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7398,8 +7577,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7614,12 +7792,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7628,6 +7800,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7643,6 +7831,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7650,8 +7853,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7763,9 +7966,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7775,6 +7975,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7791,7 +7994,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7937,7 +8140,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7967,7 +8170,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8081,6 +8284,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8118,6 +8324,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8314,9 +8523,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8335,6 +8541,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8392,6 +8601,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8458,9 +8673,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8473,7 +8685,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8500,12 +8715,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8634,14 +8853,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8656,7 +8871,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8666,8 +8881,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8887,7 +9101,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8953,6 +9167,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9010,9 +9230,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9259,6 +9476,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9387,6 +9607,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9429,6 +9655,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9479,19 +9708,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9509,40 +9729,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9566,6 +9795,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9622,6 +9884,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9675,6 +9940,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9956,7 +10226,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10125,6 +10401,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10188,7 +10470,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10446,40 +10728,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10532,8 +10814,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10542,20 +10824,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10637,14 +10924,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10688,31 +10969,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10721,6 +11007,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10736,57 +11025,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10804,6 +11095,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10833,6 +11132,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10863,7 +11205,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10903,28 +11245,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11019,6 +11359,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11034,12 +11377,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11118,7 +11469,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11217,35 +11568,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11255,8 +11582,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11283,10 +11610,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11297,9 +11621,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11321,6 +11642,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11370,8 +11694,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11514,6 +11838,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11532,6 +11859,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11556,16 +11892,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11577,6 +11916,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11591,6 +11938,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11621,19 +11977,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11655,11 +12011,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11729,13 +12097,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11878,10 +12246,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11896,22 +12264,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11980,8 +12347,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11996,9 +12362,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12320,17 +12701,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12341,9 +12716,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12375,9 +12793,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12700,6 +13132,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12779,6 +13216,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12880,9 +13321,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12938,6 +13376,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12962,9 +13403,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12990,9 +13428,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13029,6 +13464,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13075,9 +13515,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13162,6 +13599,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13252,6 +13692,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13270,10 +13754,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13285,6 +13769,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13312,18 +13799,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13333,9 +13814,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13345,13 +13823,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13399,6 +13877,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13483,6 +13964,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13587,21 +14071,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13617,10 +14110,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13656,7 +14149,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13725,12 +14218,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13746,15 +14245,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13776,6 +14266,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13785,6 +14284,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13794,10 +14296,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13830,9 +14329,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13866,19 +14362,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13890,6 +14410,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13911,55 +14434,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13980,12 +14547,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14043,6 +14625,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14052,6 +14637,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14091,9 +14682,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14127,6 +14715,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14208,18 +14811,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14292,7 +14900,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14316,10 +14927,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14331,9 +14945,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14376,18 +14987,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14487,11 +15136,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14503,11 +15150,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14526,10 +15171,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14559,9 +15204,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14577,19 +15219,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14739,6 +15397,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14760,6 +15421,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14787,6 +15454,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14811,22 +15484,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14848,9 +15505,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14914,7 +15568,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15045,6 +15699,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15075,6 +15732,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15087,9 +15747,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15099,9 +15756,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15114,6 +15776,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15138,14 +15803,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15194,7 +15851,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15248,41 +15905,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15468,6 +16125,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15489,9 +16152,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15504,6 +16173,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15543,6 +16215,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15564,22 +16239,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15603,9 +16290,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15630,7 +16314,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15703,52 +16396,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15763,6 +16450,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15775,6 +16468,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15790,37 +16486,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15910,6 +16709,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15919,6 +16724,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15985,12 +16796,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16000,6 +16865,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16009,31 +16898,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16061,7 +16956,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16088,27 +16983,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16143,12 +17026,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16158,10 +17044,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16189,6 +17075,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16226,117 +17115,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16370,33 +17295,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16430,6 +17365,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16442,7 +17393,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16505,36 +17481,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16577,19 +17571,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16728,6 +17718,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16740,60 +17742,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16809,9 +17885,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17021,41 +18094,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17064,7 +18163,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17076,12 +18175,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17133,88 +18322,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17226,6 +18518,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17241,6 +18548,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17259,11 +18569,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17372,10 +18680,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17387,7 +18695,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17408,13 +18716,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17486,7 +18800,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17507,13 +18821,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17522,7 +18836,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17550,6 +18863,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17586,40 +18905,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17631,19 +18971,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17664,6 +19004,12 @@ msgstr "Књижара"
msgid "Edit Book Store"
msgstr "Измени књижару"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Туристичка агенција"
@@ -17673,7 +19019,7 @@ msgstr "Измени туристичку агенцију"
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17754,6 +19100,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17883,6 +19232,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17922,24 +19277,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17949,15 +19313,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18033,6 +19388,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18087,7 +19448,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18099,6 +19460,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18174,46 +19538,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18234,6 +19601,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18396,27 +19775,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18462,19 +19870,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18498,7 +19909,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18594,18 +20005,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18615,7 +20035,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18624,10 +20047,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18645,6 +20068,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18660,28 +20086,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18702,19 +20128,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18780,9 +20206,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18792,10 +20215,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18810,9 +20236,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18840,6 +20263,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18885,10 +20311,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18900,7 +20356,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18918,7 +20374,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19035,19 +20491,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19066,13 +20633,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19081,19 +20684,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19108,142 +20720,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19282,148 +20943,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19627,6 +21351,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19648,13 +21384,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19917,9 +21647,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19941,6 +21677,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20019,9 +21758,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20106,7 +21857,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20377,15 +22128,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20556,6 +22298,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20574,12 +22319,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20715,6 +22454,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20732,6 +22474,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20812,113 +22557,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20944,7 +22703,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20994,7 +22756,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21039,6 +22801,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21096,19 +22861,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21150,27 +22980,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21566,6 +23378,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21813,12 +23628,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21828,16 +23637,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22200,9 +24006,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22257,9 +24060,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22301,25 +24121,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22456,9 +24276,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22483,12 +24300,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22637,6 +24463,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22653,6 +24482,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22886,13 +24726,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22945,18 +24778,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23014,6 +24835,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23221,9 +25045,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23303,7 +25124,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23457,6 +25296,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23478,6 +25320,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23771,9 +25616,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23842,9 +25684,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23971,9 +25810,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23995,6 +25831,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24027,15 +25866,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24045,6 +25900,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24147,9 +26005,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24265,6 +26120,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24325,19 +26183,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24475,6 +26333,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24550,6 +26411,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24565,9 +26515,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24589,6 +26536,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24741,9 +26691,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25369,7 +27316,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25377,10 +27327,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25389,18 +27336,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25443,15 +27378,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25573,18 +27499,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25762,9 +27676,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25891,7 +27802,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25911,9 +27822,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26046,9 +27954,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index de4ed09..9e60629 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -2,47 +2,47 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-04-03 10:22+0000\n"
-"Last-Translator: denahl <Unknown>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-06 12:31+0000\n"
+"Last-Translator: Tomas Marklund <tomasmarklund75 at gmail.com>\n"
"Language-Team: Swedish <sv 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: 2013-04-05 04:59+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:00+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
-msgstr ""
+msgstr "{0}: ogiltigt val ''{1}''"
msgid "{0}: option ''--{1}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: argument är inte tillåtet för ''--{1}''"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr ""
+msgstr "{0}: argument är inte tillåtet för ''{1}{2}''"
msgid "{0}: option ''{1}'' requires an argument"
-msgstr ""
+msgstr "{0}: argument behövs för ''{1}''"
msgid "{0}: unrecognized option ''--{1}''"
-msgstr ""
+msgstr "{0}: okänt val ''--{1}''"
msgid "{0}: unrecognized option ''{1}{2}''"
-msgstr ""
+msgstr "{0}: okänt val ''{1}{2}''"
msgid "{0}: illegal option -- {1}"
-msgstr ""
+msgstr "{0}: ogiltigt val -- {1}"
msgid "{0}: invalid option -- {1}"
-msgstr ""
+msgstr "{0}: ogiltigt val -- {1}"
msgid "{0}: option requires an argument -- {1}"
-msgstr ""
+msgstr "{0}: argument behövs för -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr ""
+msgstr "Ogiltigt värde {0} för parameter ''has_arg''"
msgid "Background Terms of Use"
msgstr "Villkor för användning av bakgrund"
@@ -50,6 +50,21 @@ msgstr "Villkor för användning av bakgrund"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Öppnande av länk stöds inte på aktuell platform (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr "VARNING: {0}"
+
+msgid "INFO: {0}"
+msgstr "INFO: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "DEBUG: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Kör plattformens uppstarts-hook"
@@ -153,19 +168,14 @@ msgid "About JOSM..."
msgstr "Om JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"VARNING: oväntat format på API-baserad URL. Omdirigering till informations- "
-"eller historiesida för OSM-objekt kommer förmodligen inte lyckas. API-"
-"baserad URL är: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"VARNING: felaktigt skriven URL till API:t. Länkar till användarsidor kommer "
-"antagligen inte att fungera. API-URL:en är \"{0}\"."
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -211,23 +221,26 @@ msgstr "Inga mållager"
msgid "Add imagery layer {0}"
msgstr "Lägg till bildlager {0}"
+msgid "Select image format for WMS layer"
+msgstr "Välj bildformat för WMS-lager"
+
msgid "Select WMS layers"
-msgstr ""
+msgstr "Välj WMS-lager"
msgid "Add layers"
-msgstr ""
+msgstr "Lägg till lager"
msgid "Invalid service URL."
-msgstr ""
+msgstr "Ogiltig URL"
msgid "WMS Error"
-msgstr ""
+msgstr "WMS-fel"
msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "Kunde inte hämta lista över WMS-lager"
msgid "Could not parse WMS layer list."
-msgstr ""
+msgstr "Kunde inte använda lista over WMS-lager"
msgid "Add Node..."
msgstr "Lägg till nod..."
@@ -250,9 +263,6 @@ msgstr "Verktyg: {0}"
msgid "Please select at least four nodes."
msgstr "Välj åtminstone fyra noder."
-msgid "Information"
-msgstr "Information"
-
msgid "Align Nodes in Line"
msgstr "Placera noderna i en rak linje"
@@ -275,7 +285,10 @@ msgid "conflict"
msgstr "konflikt"
msgid "download"
-msgstr "nedhämtad data"
+msgstr "ladda ner"
+
+msgid "problem"
+msgstr "problem"
msgid "previous"
msgstr "föregående"
@@ -286,6 +299,9 @@ msgstr "nästa"
msgid "Nothing selected to zoom to."
msgstr "Det finns inte något valt att zooma till"
+msgid "Information"
+msgstr "Information"
+
msgid "Zoom to {0}"
msgstr "Zooma till {0}"
@@ -342,11 +358,9 @@ msgstr ""
"några av dem?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Kunde inte slå ihop sträckorna (Det gick inte att göra en enda sekvens av "
-"noder av dem)"
msgid "Combine {0} ways"
msgstr "Slå ihop {0} sträckor"
@@ -403,18 +417,37 @@ msgstr "Radera"
msgid "Delete selected objects."
msgstr "Radera markerade objekt."
+msgid "Toggle dialogs panel"
+msgstr "Växlar dialogpanelen"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Växlar dialogpanelen, maximerar kartvyn"
+
msgid "Distribute Nodes"
msgstr "Distribuera noder"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Distribuera de valda noderna på jämna avstånd längs en linje."
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Ignorerar {0} noder med null-koordinater"
+
msgid "Download from OSM..."
msgstr "Ladda ner från OSM..."
msgid "Download map data from the OSM server."
msgstr "Ladda ner kartdata från OSM-servern."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>För att utföra detta så kommer {0} separata<br>hämtningar att begäras. "
+"Önskar du<br>fortsätta?</html>"
+
+msgid "Download data"
+msgstr "Hämta data"
+
msgid "Download object..."
msgstr "Ladda ner objekt..."
@@ -511,6 +544,9 @@ msgstr "Historik"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Visa historik om sträckor, noder eller relationer i OSM"
+msgid "Show history"
+msgstr "Visa historik"
+
msgid "History (web)"
msgstr "Historik (webb)"
@@ -632,11 +668,9 @@ msgid "Joined overlapping areas"
msgstr "Slog ihop ytor som låg ovanpå varandra"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Några av sträckorna var medlemmar i relationer som har ändrats. Kontrollera "
-"att det inte har uppstått några fel."
msgid "Fix tag conflicts"
msgstr "Korrigera taggkonflikter"
@@ -725,10 +759,10 @@ msgid "Unable to parse Lon/Lat"
msgstr "Kunde inte tolka lon/lat"
msgid "Lasso Mode"
-msgstr ""
+msgstr "Lasso-läge"
msgid "Lasso selection mode: select objects within a hand-drawn region"
-msgstr ""
+msgstr "Lasso läge: välj objekt i ett område genom att rita på frihand"
msgid "Rectified Image..."
msgstr "Korrigerad bild..."
@@ -737,7 +771,7 @@ msgid "Download Rectified Images From Various Services"
msgstr "Hämta hem upprätade bilder från olika tjänsteleverantörer"
msgid "Imagery: {0}"
-msgstr ""
+msgstr "Bild: {0}"
msgid "Custom WMS Link"
msgstr "Egen WMS-länk"
@@ -770,7 +804,7 @@ msgid "Merge the current layer into another layer"
msgstr "Sammafoga det nuvarande lagret med ett annat"
msgid "Merging layers with different upload policies"
-msgstr ""
+msgstr "Slå ihop lager med olika upppladdningsprinciper"
msgid ""
"You are about to merge data between layers ''{0}'' and ''{1}''.<br /><br "
@@ -781,9 +815,16 @@ msgid ""
"one by one, by using ''<i>Merge selection</i>''.<br /><br />Are you sure you "
"want to continue?"
msgstr ""
+"Du håller på att slå ihop data från lagren ''{0}'' och ''{1}''.<br /><br "
+"/>Dessa lager har olika principer för uppladdning och bör inte slås ihop på "
+"detta sättet.<br />Att slå ihop dem innebär att den striktare policyn "
+"(uppladdning avråds) används för ''{1}''.<br /><br /><b>Detta är inte det "
+"rekommenderade sättet att slå ihop denna typ av data</b>.<br />Du bör "
+"istället kontrollera och slå ihop varje objekt var för sig genom ''<i>Slå "
+"ihop val</i>''.<br /><br />Är du säker på att du vill fortsätta?"
msgid "Ignore this hint and merge anyway"
-msgstr ""
+msgstr "Strunta i detta och slå ihop ändå"
msgid "Merge Nodes"
msgstr "Slå ihop noder"
@@ -792,11 +833,11 @@ msgid "Merge nodes into the oldest one."
msgstr "Slå ihop noder med den äldsta."
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Vänligen välj åtminstone två noder att slå ihop eller en nod som ligger nära "
-"en annan nod."
+"Välj minst två noder för att slå ihop dem, eller en nod som är nära en annan "
+"nod."
msgid "Abort Merging"
msgstr "Avbryt sammanslagning"
@@ -807,6 +848,8 @@ msgstr "Klicka för att avbryta nodsammanslagning"
msgid ""
"Cannot merge nodes: Would have to delete way {0} which is still used by {1}"
msgstr ""
+"Kan inte slå ihop noder: Väg {0} skulle då behöva tas bort vilken "
+"fortfarande används av {1}"
msgid "Merge {0} nodes"
msgstr "Slå ihop {0} noder"
@@ -818,7 +861,7 @@ msgid "Merge the currently selected objects into another layer"
msgstr "Slå ihop valda objekt till ett annat lager"
msgid "Merging too many objects with different upload policies"
-msgstr ""
+msgstr "Ihopslagning av för många objekt med olika uppladdningsprinciper"
msgid ""
"You are about to merge more than 1 object between layers ''{0}'' and "
@@ -826,6 +869,10 @@ msgid ""
"data</b>.<br />You should instead check and merge each object, <b>one by "
"one</b>.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Du håller på att slå ihop mer än 1 objekt mellan lagren ''{0}'' och "
+"''{1}''.<br /><br /><b>Detta är inte det rekommenderade sättet att slå ihop "
+"denna typ av data</b>.<br />Du bör istället kontrollera och slå ihop varje "
+"objekt <b>var för sig</b>.<br /><br />Vill du verkligen fortsätta?"
msgid "Mirror"
msgstr "Spegel"
@@ -873,7 +920,7 @@ msgid "Create a new map layer."
msgstr "Skapa nytt kartlager."
msgid "URL Files"
-msgstr ""
+msgstr "URL filer"
msgid "Open..."
msgstr "Öppna..."
@@ -956,9 +1003,11 @@ msgid "Download Data"
msgstr "Hämta data"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
+"Kan inte öppna URL \"{0}\"<br>Följande nedladdningar accepterar URL-mönster "
+"som:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -989,15 +1038,9 @@ msgid "Orthogonalize / Undo"
msgstr "Räta ut vinkel / ångra"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Räta ut form / ångra\n"
-"Välj noder som flyttades vid förra formuträtningen!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Ångra formuträtning"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1017,9 +1060,6 @@ msgstr "Räta upp"
msgid "Usage"
msgstr "Användning"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Valda element kan ej rätas ut"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1124,10 +1164,10 @@ msgid "Redo the last undone action."
msgstr "Gör om den senaste ogjorda handlingen."
msgid "Redo ..."
-msgstr ""
+msgstr "Gör om..."
msgid "Redo {0}"
-msgstr ""
+msgstr "Gör om {0}"
msgid "Rename layer"
msgstr "Byt namn på lager"
@@ -1138,6 +1178,15 @@ msgstr "Byt också namn på filen"
msgid "Could not rename file ''{0}''"
msgstr "Kunde inte döpa om filen ''{0}''"
+msgid "Restart"
+msgstr "Starta om"
+
+msgid "Restart the application."
+msgstr "Starta om programmet."
+
+msgid "Click to restart later."
+msgstr "Klicka för att starta om senare."
+
msgid "Reverse way"
msgstr "Ändra riktning på sträcka"
@@ -1190,9 +1239,6 @@ msgstr "Ladda session"
msgid "Load a session from file."
msgstr "Ladda session från fil."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Sessionsfil (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Öppna session"
@@ -1255,6 +1301,9 @@ msgstr "Statusrapport"
msgid "Copy to clipboard and close"
msgstr "Kopiera till urklipp och stäng"
+msgid "Report bug"
+msgstr "Rapportera fel"
+
msgid "Close"
msgstr "Stäng"
@@ -1339,18 +1388,14 @@ msgstr ""
"sträckan.)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya "
-"sträckor.<br>Du bör kontrollera detta och rätta om nödvändigt.</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Ett relationsmedlemskap kopierades till alla nya sträckor.<br>Du bör "
-"kontrollera detta och rätta om nödvändigt.</html>"
msgid "Split way {0} into {1} parts"
msgstr "Dela sträcka {0} i {1} delar"
@@ -1365,7 +1410,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Byter läge för den globala inställningen ''{0}''."
msgid "Encourage/discourage upload"
-msgstr ""
+msgstr "Tillstyrk/avråd uppladdning"
msgid "UnGlue Ways"
msgstr "Frigör sträckor"
@@ -1454,6 +1499,27 @@ msgstr ""
"eftersom du inte kan se det fullständiga objektet.<br>Är du säker på att du "
"vill frigöra?"
+msgid "Disconnect Node from Way"
+msgstr "Koppla bort nod från sträcka"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Koppla loss noder från en sträcka de för närvarande tillhör"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Välj minst en nod för att koppla loss."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Ångra"
@@ -1464,7 +1530,7 @@ msgid "Undo ..."
msgstr "Ångra ..."
msgid "Undo {0}"
-msgstr ""
+msgstr "Ångra {0}"
msgid "Unselect All"
msgstr "Avmarkera alla"
@@ -1478,9 +1544,6 @@ msgstr "Uppdatera data"
msgid "Updates the objects in the active data layer from the server."
msgstr "Uppdaterar objekten i det aktiva datalagret från servern."
-msgid "Download data"
-msgstr "Hämta data"
-
msgid "Update modified"
msgstr "Uppdatering modifierad"
@@ -1521,7 +1584,7 @@ msgstr ""
"''{0}''.<br>Du måste lösa dem först.</html>"
msgid "Upload discouraged"
-msgstr ""
+msgstr "Uppladning avråds"
msgid ""
"You are about to upload data from the layer ''{0}''.<br /><br />Sending data "
@@ -1529,6 +1592,10 @@ msgid ""
"require you subsequently have to revert your changes, or force other "
"contributors to.<br /><br />Are you sure you want to continue?"
msgstr ""
+"Du håller på att ladda upp data från lager ''{0}''.<br /><br />Du <b>avråds "
+"starkt</b> från att fortsätta. Om du fortsätter,<br />kan du behöva "
+"återställa dina ändringar i efterhand, eller tvinga någon annan att göra "
+"det.<br /><br />Är du säker på att du vill fortsätta?"
msgid "Ignore this hint and upload anyway"
msgstr "Strunta i detta tips och skicka in i alla fall"
@@ -1603,22 +1670,25 @@ msgid "Zoom to"
msgstr "Zooma till"
msgid "Zoom to the object the first selected member refers to"
-msgstr ""
+msgstr "Zooma till det objekt som den första valda medlemmen relaterar till"
msgid "Zooming disabled because layer of this relation is not active"
msgstr ""
+"Zoomning är tillgängligt eftersom lagret som denna relation tillhör inte är "
+"aktivt"
msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Zoomning är inte tillgängligt eftersom ingen medlem är vald"
msgid "Zoom to the first selected node"
-msgstr ""
+msgstr "Zooma till den första valda noden"
msgid "Zooming disabled because layer of this way is not active"
msgstr ""
+"Zoomning är tillgängligt eftersom lagret som denna väg tillhör inte är aktivt"
msgid "Zooming disabled because there is no selected node"
-msgstr ""
+msgstr "Zoomning är inte tillgängligt eftersom ingen nod är vald"
msgctxt "audio"
msgid "Back"
@@ -1678,6 +1748,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Långsammare framåt"
+msgid "Download GPS"
+msgstr "Ladda ner från GPS"
+
msgid "Downloading GPS data"
msgstr "Hämtar GPS-data"
@@ -1687,6 +1760,18 @@ msgstr "Hämtade GPX-data"
msgid "Markers from {0}"
msgstr "Markörer från {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Ladda ner komprimerad OSM-förändring"
+
+msgid "Download OSM Change"
+msgstr "Ladda ner OSM-förändring"
+
+msgid "Download Compressed OSM"
+msgstr "Ladda ner komprimerad OSM"
+
+msgid "Download OSM"
+msgstr "Hämta OSM"
+
msgid "Downloading data"
msgstr "Hämtar data"
@@ -1698,12 +1783,37 @@ msgid "No data found in this area."
msgstr "Ingen data fanns i detta område."
msgid "OSM Server URL:"
-msgstr ""
+msgstr "OSM server URL:"
msgid "Command"
-msgstr ""
+msgstr "Kommando"
msgid "Request details: {0}"
+msgstr "Hämta detaljer: {0}"
+
+msgid "Download OSM URL"
+msgstr "Ladda ner OSM-länk"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "{0} konflikt under import."
+msgstr[1] "{0} konflikter under import."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Konflikt vid hämtning"
+msgstr[1] "Konflikter vid hämtning"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Laddar noden {2}:s överordnade"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Läser in överordnade objekt till sträckan {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Laddar relationen {2}:s överordnade"
+
+msgid "Download session"
msgstr ""
msgid "Download {0} of {1} ({2} left)"
@@ -1737,7 +1847,13 @@ msgid_plural ""
"server.<br>If you later try to delete or update them the server is likely to "
"report a conflict."
msgstr[0] ""
+"Det finns {0} objekt i ditt lokala dataset som kan vara borttaget på "
+"servern.<br>Om du senare försöker ta bort eller uppdatera detta så kommer "
+"det antagligen att orsaka en konflikt vid uppladdning till servern."
msgstr[1] ""
+"Det finns {0} objekt i ditt lokala dataset som kan vara borttagna på "
+"servern.<br>Om du senare försöker ta bort eller uppdatera dessa så kommer "
+"det antagligen att orsaka en konflikt vid uppladdning till servern."
msgid ""
"Click <strong>{0}</strong> to check the state of this object on the server."
@@ -1762,25 +1878,6 @@ msgstr "Följande fel uppstod under masshämtning: {0}"
msgid "Errors during download"
msgstr "Fel under hämtning"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "{0} konflikt under import."
-msgstr[1] "{0} konflikter under import."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Konflikt vid hämtning"
-msgstr[1] "Konflikter vid hämtning"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Laddar noden {2}:s överordnade"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Läser in överordnade objekt till sträckan {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Laddar relationen {2}:s överordnade"
-
msgid "Error during download"
msgstr "Fel vid hämtning"
@@ -1807,13 +1904,13 @@ msgid "Draw nodes"
msgstr "Rita noder"
msgid "Mode: Draw Angle snapping"
-msgstr ""
+msgstr "Läge: Rita vinkellänkning"
msgid "Backspace in Add mode"
-msgstr ""
+msgstr "Bakåtsteg i redigerarläge"
msgid "helper line"
-msgstr ""
+msgstr "hjälplinje"
msgid "Cannot add a node outside of the world."
msgstr "Det går inte att lägga till en nod utanför världen."
@@ -1857,16 +1954,16 @@ msgid "Finish drawing."
msgstr "Avsluta ritning."
msgid "FIX"
-msgstr ""
+msgstr "FIXA"
msgid "draw angle snap"
msgstr "Rita vinkellåst"
msgid "draw angle snap highlight"
-msgstr ""
+msgstr "mall för att snappa vinklar"
msgid "Toggle snapping by {0}"
-msgstr ""
+msgstr "Växla länkning med {0}"
msgid "Show helper geometry"
msgstr "Visa hjälpgeometri"
@@ -1923,9 +2020,12 @@ msgid "Extrude Way"
msgstr "Dra ut sträcka"
msgid "Improve Way Accuracy"
-msgstr ""
+msgstr "Förbättra vägnoggrannhet"
msgid "Improve Way Accuracy mode"
+msgstr "Läge för att förbättra vägnoggrannhet"
+
+msgid "improve way accuracy helper line"
msgstr ""
msgid "Click on the way to start improving its shape."
@@ -1950,17 +2050,19 @@ msgid ""
"Click to move the highlighted node. Hold Ctrl to add new nodes, or Alt to "
"delete."
msgstr ""
+"Klicka för att flytta den valda noden. Håll Ctrl nedtryckt för att lägga "
+"till nya noder, eller Alt för att ta bort."
msgid "Cannot place a node outside of the world."
msgstr "Kan inte placera en nod utanför världen."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "Lägg till en ny nod till väg"
-msgstr[1] "Lägg till ny nod till {0} vägar"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
-msgstr ""
+msgstr "Kan inte ta bort nod som används av ytterligare objekt"
msgid "Cannot delete node that has tags"
msgstr "Kan inte radera nod som har taggar"
@@ -1971,6 +2073,9 @@ msgstr "Parallell"
msgid "Make parallel copies of ways"
msgstr "Skapa parallella kopior av vägar"
+msgid "make parallel helper line"
+msgstr "skapa parallell hjälplinje"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2025,7 +2130,7 @@ msgid "Release the mouse button to select the objects in the rectangle."
msgstr "Släpp musknappen för att välja objekten i rektangeln."
msgid "Ctrl to merge with nearest node."
-msgstr ""
+msgstr "Ctrl för att slå ihop med närmaste nod."
msgid "Release the mouse button to stop moving."
msgstr ""
@@ -2419,6 +2524,9 @@ msgstr "\"värde\" i någon nyckel"
msgid "matches if ''key'' exists"
msgstr "matchar om \"nyckel\" existerar"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2587,14 +2695,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
-msgstr "ID för primitiv förväntades"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "ID för ändringsuppsättning förväntades"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "Version förväntades"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2606,6 +2714,9 @@ msgstr ""
"Okänd dataprimitiv: {0}. Tillåtna värden är node (nod), way (sträcka) eller "
"relation"
+msgid "Primitive id expected"
+msgstr "ID för primitiv förväntades"
+
msgid "Range of numbers expected"
msgstr "Ett sifferintervall förväntades"
@@ -2624,8 +2735,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr "Parameter saknar för NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2721,6 +2831,9 @@ msgid_plural "Added {0} objects"
msgstr[0] "Lade till {0} objekt"
msgstr[1] "Lade till {0} objekt"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Ändra nod {0}"
@@ -2757,10 +2870,10 @@ msgstr "Radera \"{0}\" från {1} objekt"
msgid "Set {0}={1} for {2} objects"
msgstr "Sätt {0}={1} för {2} objekt"
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2783,11 +2896,9 @@ msgid "Double conflict"
msgstr "Dubbel konflikt"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Varning: Lager ''{0}'' existerar inte längre. Kan inte ta bort konflikt för "
-"objekt ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "La till konflikt för ''{0}''"
@@ -2903,6 +3014,9 @@ msgstr[1] "Rensade {0} objekt"
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Rotera en nod"
@@ -2963,11 +3077,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Vid riktningsbyte på denna sträcka, så föreslås följande egenskaper hos "
-"sträckan och dess noder ändras så att dataintegriteten inte komprometteras."
msgid "Relation"
msgstr "Relation"
@@ -2996,11 +3108,11 @@ msgstr "Verkställ valda ändringar"
msgid "Do not apply changes"
msgstr "Verkställ inte ändringar"
-msgid "Please select which property changes you want to apply."
-msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Egenskaper för "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Roller i relationer hänvisar till"
@@ -3020,6 +3132,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Kunde Ej ta bort den utdaterade backup-filen {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Fel inträffade medan en backup skapades för borttaget lager: {0}"
@@ -3050,21 +3165,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Varning: Misslyckades med att hålla kvar preferenser till ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Varning: Misslyckades med att ladda preferenserna; ''katalogen'' ''{0}'' är "
-"Ej en katalog."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3072,24 +3185,20 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Varning: Misslyckades med att ladda preferenserna; misslyckades med att "
-"skapa katalogen: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -3103,8 +3212,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -3134,12 +3243,11 @@ msgstr "Misslyckades med att ladda resursen ''{0}'', med felet {1}."
msgid "UNKNOWN"
msgstr "OKÄND"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Varning: revisionsfilen ''/REVISION'' saknas"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr ""
@@ -3295,8 +3403,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parametern {0} är inte inom området «0..{1}», Fick ''{2}''."
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3403,7 +3510,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3422,6 +3529,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3438,9 +3548,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3481,6 +3588,9 @@ msgstr "andra typer av validering"
msgid "Running test {0}"
msgstr "Kör test {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresser"
@@ -3505,6 +3615,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr "Byggnader i byggnader"
@@ -3566,6 +3685,9 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Dubbletter av noder"
@@ -3573,9 +3695,6 @@ msgid "This test checks that there are no nodes at the very same location."
msgstr ""
"Detta test kontrollerar att det inte finns några noder med precis samma läge."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Duplicerade noder i två ostängda vägar"
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3643,6 +3762,24 @@ msgstr "Dubbletter av noder på sträckor"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Letar efter sträckor med identiska noder i följd."
+msgid "Highways"
+msgstr "Vägar"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "Multipolygon"
@@ -3712,6 +3849,12 @@ msgstr "Noder med samma namn"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Detta test hittar noder som har samma namn (de kan vara dubbletter)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "Överlappande ytor"
@@ -3772,15 +3915,15 @@ msgstr "Relationstypen är okänd"
msgid "Relation is empty"
msgstr "Relationen är tom"
+msgid "Role verification problem"
+msgstr "Rollverifieringsproblem"
+
msgid "<empty>"
msgstr ""
msgid "Role {0} missing"
msgstr "Rollen {0} saknas"
-msgid "Role verification problem"
-msgstr "Rollverifieringsproblem"
-
msgid "Number of {0} roles too low ({1})"
msgstr ""
@@ -3814,11 +3957,11 @@ msgstr ""
"Detta testar letar efter sträckor med likartade namn som kan tyda på "
"felstavning."
-msgid "Properties checker :"
-msgstr "Egenskapskontrollerare:"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Denna insticksmodul letar efter fel i egenskapsnycklar och -värden."
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Ogiltig taggkontrollsrad - {0}: {1}"
@@ -3960,8 +4103,8 @@ msgstr "Använd förvalda rättstavningsfil."
msgid "Use the default spellcheck file (recommended)."
msgstr "Använd den förvalda rättstavningsfilen (rekommenderas)."
-msgid "Fix properties"
-msgstr "Rätta till egenskaper"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Kunde inte hitta elementtyp"
@@ -4037,6 +4180,9 @@ msgstr "Öppna sträckor"
msgid "This tests if ways which should be circular are closed."
msgstr "Detta kontrollerar om sträckor som bör bilda en cirkel är slutna"
+msgid "Unclosed way"
+msgstr "Ej sluten sträcka"
+
msgid "natural type {0}"
msgstr "naturfenomen typ {0}"
@@ -4067,9 +4213,6 @@ msgstr "byggnad (building)"
msgid "area"
msgstr "yta"
-msgid "Unclosed way"
-msgstr "Ej sluten sträcka"
-
msgid "Unconnected ways"
msgstr ""
@@ -4098,12 +4241,12 @@ msgstr ""
"Detta test letar efter noder som saknar tagg och som inte ingår i någon "
"sträcka"
-msgid "No tags"
-msgstr "Inga etiketter"
-
msgid "Unconnected nodes without physical tags"
msgstr ""
+msgid "No tags"
+msgstr "Inga etiketter"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Har taggar som innehåller ''fixme'' eller ''FIXME''"
@@ -4168,23 +4311,6 @@ msgstr "Felvänd kustlinje (coastline): land inte på vänster sida"
msgid "Reversed land: land not on left side"
msgstr "Felriktat land: land inte på vänster sida"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Fel antal argument för bokmärke"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Fel inträffade under läsning av bokmärket: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Fel: Oväntad rad ''{0}'' i bokmärkesfilen ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr "Visa Ej igen (Kom ihåg mitt val)"
@@ -4288,7 +4414,7 @@ msgstr "Visa hjälpinformation"
msgid "Downloading \"Message of the day\""
msgstr "Hämtar \"Dagens meddelande\""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4500,13 +4626,28 @@ msgstr "Visa"
msgid "Tools"
msgstr "Verktyg"
-msgid "Presets"
-msgstr "Snabbval"
+msgid "More tools"
+msgstr "Fler verktyg"
-msgid "Windows"
+msgid "Data"
msgstr ""
-msgid "Menu: {0}"
+msgid "Selection"
+msgstr "Markering"
+
+msgid "Presets"
+msgstr "Snabbval"
+
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
+msgid "Windows"
+msgstr ""
+
+msgid "Menu: {0}"
msgstr "Meny: {0}"
msgid "Save and load the current session (list of layers, etc.)"
@@ -4518,10 +4659,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Ljud"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4530,6 +4683,9 @@ msgstr "Dölj denna knapp"
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4589,6 +4745,9 @@ msgstr "(inget objekt)"
msgid "User:"
msgstr "Användare:"
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "lagret finns inte i listan."
@@ -4616,19 +4775,6 @@ msgstr "I bakgrunden"
msgid "Click to run job in background"
msgstr "Klicka för att köra jobb i bakgrunden"
-msgid "false: the property is explicitly switched off"
-msgstr "false: egenskapen är uttryckligen avstängd"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true: egenskapen är uttryckligen aktiverad"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "delvis: olika valda object har olika värden, ändra inte"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "ej angiven: ange inte denna egenskap för valda objekt"
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4698,7 +4844,7 @@ msgid "from tile"
msgstr "från ruta"
msgid "up to tile"
-msgstr ""
+msgstr "upp till ruta"
msgid ""
"<html>Alternatively you may enter a <strong>tile address</strong> for a "
@@ -4918,29 +5064,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4955,8 +5119,8 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
-msgstr "Flytta upp valda element en position."
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr ""
@@ -5007,14 +5171,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5266,14 +5422,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5567,7 +5723,7 @@ msgid "Display the history of the selected objects."
msgstr "Visa historik för valt objekt"
msgid "Advanced object info"
-msgstr ""
+msgstr "Avancerad objektinformation"
msgid "map style"
msgstr ""
@@ -5834,6 +5990,9 @@ msgstr "Visa/Dölj"
msgid "Information about layer"
msgstr "Information om lager"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "Färgscheman karta"
@@ -5917,6 +6076,36 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Objekttyp"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "flertypsläge"
+
+msgid "Choose the OSM object type"
+msgstr "Välj OSM-objekttyp"
+
+msgid "Object ID:"
+msgstr "Objekt-ID:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Ange ID för det objekt som ska laddas ner"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Objekt ID’s kan separeras med komma eller blanksteg.</br> Exempel: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Om Flertypsläge används "
+"specifiera objekten enligt detta exempel: <b>w123,n110,w12,r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "Relationer"
@@ -5938,9 +6127,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "Relationer: {0}"
-msgid "Selection"
-msgstr "Markering"
-
msgid "Open a selection list window."
msgstr "Öppna en urvalslista"
@@ -5965,18 +6151,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Urval: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr "Visas alltid"
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr "Alltid dold"
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5995,6 +6169,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Klicka för att minimera/maximera panelens innehåll"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr "Visas alltid"
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr "Alltid dold"
+
msgid "Authors"
msgstr "Upphovsmän"
@@ -6012,8 +6198,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -6039,9 +6224,6 @@ msgstr "Öppna valideringslistan"
msgid "Validation results"
msgstr "Valideringsresultat"
-msgid "Zoom to problem"
-msgstr "Zooma till problem"
-
msgid "Fix"
msgstr "Rätta till"
@@ -6190,9 +6372,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr "Uppdatera ändringsuppsättningens innehåll mot OSM-servern"
-msgid "Show history"
-msgstr "Visa historik"
-
msgid "Download and show the history of the selected objects"
msgstr "Ladda ner och visa historik för de valda objekten"
@@ -6477,8 +6656,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6497,7 +6676,7 @@ msgid "Query changesets from a server URL"
msgstr ""
msgid "Advanced"
-msgstr ""
+msgstr "Avancerat"
msgid "Use a custom changeset query"
msgstr ""
@@ -6545,35 +6724,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
-msgstr "Markera objekt för vilka du vill ändra egenskaper."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "Egenskaper/Roller"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Egenskaper för valda objekt."
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<olika>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Medlem av"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Egenskaper: {0} / Medlemskap: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Egenskaper / Roller"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Ta bort den valda nyckeln från alla objekt."
-msgid "Delete Properties"
-msgstr "Ta bort egenskaper"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "Ändra relation"
@@ -6587,13 +6778,13 @@ msgstr "Verkligen ta bort det valda från relation {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "Lägg till tagg"
msgid "Edit the value of the selected key for all objects"
msgstr "Redigera värdet av den valda nyckeln för alla objekt."
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6672,12 +6863,6 @@ msgstr[1] "Ändra egenskaper för upp till {0} objekt."
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr "Lägg till värde?"
@@ -6707,9 +6892,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6747,7 +6938,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr "Hämtar relation {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6807,6 +6998,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr "Ignorera dem, lämna relation som den är"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7064,6 +7258,25 @@ msgstr ""
"sträckan sitter inte ihop med vare sig den föregående eller den nästa "
"medlemmen i relationen"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Fel antal argument för bokmärke"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Fel inträffade under läsning av bokmärket: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Bokmärken"
@@ -7135,9 +7348,6 @@ msgstr "Värde för latitud i intervallet [-90,90] krävs"
msgid "Value for longitude in range [-180,180] required."
msgstr "Värde för longitud i intervallet [-180,180] krävs"
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr "Datakällor och -typer"
@@ -7211,21 +7421,8 @@ msgstr "Laddar ner referenser (föräldrarelationer)"
msgid "Download object"
msgstr "Ladda ner objekt"
-msgid "Object type:"
-msgstr "Objekttyp"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "flertypsläge"
-
-msgid "Choose the OSM object type"
-msgstr "Välj OSM-objekttyp"
-
-msgid "Object ID:"
-msgstr "Objekt-ID:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Ange ID för det objekt som ska laddas ner"
+msgid "Start downloading"
+msgstr "Påbörja nerladdning"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7235,28 +7432,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Välj om även medlemmar i relationen ska laddas ner"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Objekt ID’s kan separeras med komma eller blanksteg.</br> Exempel: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Om Flertypsläge används "
-"specifiera objekten enligt detta exempel: <b>w123,n110,w12,r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Påbörja nerladdning"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Ogiltig ID-lista specificerad\n"
-"Kan inte ladda ner objekt."
-
msgid "Class Type"
msgstr ""
@@ -7353,7 +7531,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7452,6 +7630,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7552,7 +7733,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7571,6 +7752,12 @@ msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7604,7 +7791,7 @@ msgid "Select an open changeset"
msgstr ""
msgid "Close changeset after upload"
-msgstr ""
+msgstr "Stäng ändringsuppsättning efter uppladdning"
msgid "Select to close the changeset after the next upload"
msgstr ""
@@ -7622,7 +7809,7 @@ msgid "Open changesets"
msgstr ""
msgid "Close changesets"
-msgstr ""
+msgstr "Stäng ändringsuppsättningar"
msgid "Close the selected open changesets"
msgstr ""
@@ -7637,8 +7824,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7713,8 +7899,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7728,8 +7914,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7753,7 +7938,7 @@ msgid "The bold text is the name of the layer."
msgstr ""
msgid "Click here to choose save path"
-msgstr ""
+msgstr "Klicka här för att välja filsökväg"
msgid "Layer ''{0}'' is not backed by a file"
msgstr ""
@@ -7780,13 +7965,13 @@ msgid "Saving layer to ''{0}'' ..."
msgstr ""
msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
+msgstr "Osparade ändringar - Spara/Ladda upp innan du avslutar?"
msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
+msgstr "Osparade ändringar - Spara/Ladda upp innan du raderar?"
msgid "Uploading and saving modified layers ..."
-msgstr ""
+msgstr "Skickar in och sparar modifierade lager ..."
msgid ""
"<html>{0} layer has unresolved conflicts.<br>Either resolve them first or "
@@ -7895,7 +8080,7 @@ msgid "Layer ''{0}'' has no modifications to be saved."
msgstr "Lager ''{0}'' har inga ändringar att spara."
msgid "Layer Name and File Path"
-msgstr ""
+msgstr "Namn på lager och filsökväg"
msgid "Recommended Actions"
msgstr "Rekommenderade åtgärder"
@@ -7945,12 +8130,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7965,6 +8144,22 @@ msgstr ""
"offrar en minut nu på att förklara din ändring<br/> kommer du att göra livet "
"enklare för många andra kartredigerare."
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7980,6 +8175,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "Avbryt uppladdning och fortsätt redigera"
@@ -7987,8 +8197,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -8016,7 +8226,11 @@ msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
msgstr[0] ""
+"Skickar in<strong>{0} objekt</strong> med <strong>1 "
+"ändringsuppsättning</strong>"
msgstr[1] ""
+"Skickar in<strong>{0} objekt</strong> med <strong>1 "
+"ändringsuppsättning</strong>"
msgid ""
"Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using "
@@ -8025,7 +8239,11 @@ msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>1 request</strong>"
msgstr[0] ""
+"Skickar in <strong>{0} objekt</strong> till <strong>1 "
+"ändringsuppsättning</strong> med <strong>1 request</strong>"
msgstr[1] ""
+"Skickar in <strong>{0} objekt</strong> till <strong>1 "
+"ändringsuppsättning</strong> med <strong>1 request</strong>"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
@@ -8047,7 +8265,7 @@ msgid ""
msgstr ""
msgid "Uploading data for layer ''{0}''"
-msgstr ""
+msgstr "Skickar in data för lager ''{0}''"
msgid "Continue uploading"
msgstr "Fortsätt uppladdning"
@@ -8102,9 +8320,6 @@ msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
"Objekt ''{0}'' är redan raderat. Hoppar över objektet i uppladdningen."
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Laddar upp {0} objekt..."
@@ -8114,6 +8329,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8134,7 +8352,7 @@ msgstr "Markera objekt att ladda upp"
msgid "Cancel uploading"
msgstr "Avbryt uppladdning"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -8280,7 +8498,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8310,7 +8528,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8426,6 +8644,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8464,6 +8685,9 @@ msgstr "Läs om felaktiga rutor"
msgid "Alpha channel"
msgstr "Alfakanal"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8670,9 +8894,6 @@ msgstr "Extraherar GPS-plats från EXIF"
msgid "Starting directory scan"
msgstr "Påbörjar foldergenomläsning"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Läs in foton..."
@@ -8691,6 +8912,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr "Fel vid läsning av filer från folder {0}\n"
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Geotaggade bilder"
@@ -8748,6 +8972,12 @@ msgstr "Nästa"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Centrera visning"
@@ -8818,9 +9048,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8833,8 +9060,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "Hämta från OSM längs med detta spår"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Hämta allting inom:"
@@ -8860,15 +9090,17 @@ msgstr "enbart sträckpunkter"
msgid "track and waypoints"
msgstr "spår och sträckpunkter"
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "Hämta från OSM längs med detta spår"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>För att utföra detta så kommer {0} separata<br>hämtningar att begäras. "
-"Önskar du<br>fortsätta?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9004,14 +9236,10 @@ msgstr "Fel uppstod vid visning av URL:en för denna markör."
msgid "(URL was: "
msgstr "(URL:en var: "
-msgid "Error displaying URL"
-msgstr "Fel vid visning av URL"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -9026,7 +9254,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -9036,8 +9264,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -9209,13 +9436,13 @@ msgid "Access Token"
msgstr ""
msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "Avancerade OAuth-parametrar"
msgid "Enter the OAuth Access Token"
msgstr ""
msgid "Enter advanced OAuth properties"
-msgstr ""
+msgstr "Ange avancerade OAuth-parametrar"
msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
@@ -9257,7 +9484,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9323,6 +9550,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9339,7 +9572,7 @@ msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
msgstr ""
msgid "Display Advanced OAuth Parameters"
-msgstr ""
+msgstr "Visa avancerade OAuth-parametrar"
msgid "Retrieve Request Token"
msgstr ""
@@ -9380,9 +9613,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9648,6 +9878,9 @@ msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
"Du behöver starta om JOSM för att vissa inställningar skall slå igenom."
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "Fjärrstyrning"
@@ -9777,6 +10010,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9819,6 +10058,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Datavalidator"
@@ -9871,19 +10113,10 @@ msgstr "Sök: "
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9901,40 +10134,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9958,6 +10200,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr "Avancerad Bakgrund: Ändrad"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -10015,6 +10290,9 @@ msgstr "Rita virtuella noder i urvalsläge"
msgid "Draw inactive layers in other color"
msgstr "Rita inaktiva lager i avvikande färg"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -10069,6 +10347,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10365,7 +10648,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10534,6 +10823,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "Filbackup"
@@ -10598,8 +10893,8 @@ msgstr "Kartinställningar"
msgid "Settings for the map projection and data interpretation."
msgstr "Inställningar för kartprojektion och datatolkning."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10637,13 +10932,13 @@ msgid "Tagging Presets"
msgstr "Snabbval för taggning"
msgid "Available presets:"
-msgstr ""
+msgstr "Tillgängliga snabbval:"
msgid "Active presets:"
-msgstr ""
+msgstr "Aktiva snabbval:"
msgid "Add a new preset by entering filename or URL"
-msgstr ""
+msgstr "Lägg till ett nytt snabbval genom att ange sökväg eller URL"
msgid "New preset entry:"
msgstr ""
@@ -10860,21 +11155,6 @@ msgstr "Swiss Grid (Switzerland)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr ""
-
-msgid "UTM Zone"
-msgstr ""
-
-msgid "North"
-msgstr "Nord"
-
-msgid "South"
-msgstr "Syd"
-
-msgid "Hemisphere"
-msgstr "Halvklot"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
@@ -10896,6 +11176,21 @@ msgstr ""
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr ""
+
+msgid "UTM Zone"
+msgstr ""
+
+msgid "North"
+msgstr "Nord"
+
+msgid "South"
+msgstr "Syd"
+
+msgid "Hemisphere"
+msgstr "Halvklot"
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -10946,8 +11241,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10956,20 +11251,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -11051,16 +11351,10 @@ msgid "Use a SOCKS proxy"
msgstr "Använd en SOCKS proxy"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-msgid "disabled"
-msgstr "avaktiverad"
-
-msgid "no modifier"
-msgstr "ingen modifierare"
-
msgid "Shortcut Background: User"
msgstr ""
@@ -11102,32 +11396,37 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "Använd snabbval ''{0}''"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "Objekt av typ {0} stöds."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Ändra {0} objekt"
+msgstr[1] "Ändra {0} objekt"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Nothing selected!"
+msgstr "Inget markerat!"
+
+msgid "Selection unsuitable!"
+msgstr "Urvalet passar inte!"
+
+msgid "Apply Preset"
+msgstr "Tillämpa snabbval"
+
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
-msgstr "Mer information om denna funktion"
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
@@ -11135,6 +11434,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "Mer information om denna funktion"
+
msgid "Available roles"
msgstr ""
@@ -11150,15 +11452,49 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Valfria attribut:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr ""
-msgid "Use preset ''{0}''"
-msgstr "Använd snabbval ''{0}''"
+msgid "Cancel auto-increment for this field"
+msgstr ""
+
+msgid "{0}:"
+msgstr ""
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
msgid "Unknown type: {0}"
msgstr "Okänd typ: {0}"
+msgid "Preset group {1} / {0}"
+msgstr ""
+
+msgid "Preset group {0}"
+msgstr ""
+
msgid "Roles cannot appear more than once"
msgstr ""
@@ -11168,41 +11504,9 @@ msgstr ""
msgid "Preset sub element without parent"
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
-
msgid "Error parsing {0}: "
msgstr "Fel vid tolkning {0}: "
-msgid "Elements of type {0} are supported."
-msgstr "Objekt av typ {0} stöds."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Ändra {0} objekt"
-msgstr[1] "Ändra {0} objekt"
-
-msgid "Nothing selected!"
-msgstr "Inget markerat!"
-
-msgid "Selection unsuitable!"
-msgstr "Urvalet passar inte!"
-
-msgid "Apply Preset"
-msgstr "Tillämpa snabbval"
-
-msgid "New relation"
-msgstr ""
-
-msgid "Change Properties"
-msgstr "Ändra egenskaper"
-
-msgid "Preset group {1} / {0}"
-msgstr ""
-
-msgid "Preset group {0}"
-msgstr ""
-
msgid "Search preset"
msgstr "Sök snabbval"
@@ -11218,6 +11522,14 @@ msgstr "Visa enbart Nyckel/värde applicerbart på markerade objekt"
msgid "Search in tags"
msgstr "Sök bland taggar"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -11249,6 +11561,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr "false: egenskapen är uttryckligen avstängd"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true: egenskapen är uttryckligen aktiverad"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "delvis: olika valda object har olika värden, ändra inte"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "ej angiven: ange inte denna egenskap för valda objekt"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr "Högerklick = kopiera till urklipp"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -11282,7 +11637,7 @@ msgid "Contacting OSM Server..."
msgstr "Ansluter till OSM-servern..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -11322,28 +11677,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11442,6 +11795,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11457,12 +11813,20 @@ msgstr "Söker efter bilder"
msgid "No image files found."
msgstr "Inga bilder hittades."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11541,8 +11905,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Import från NMEA genomförd"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "Import från NMEA misslyckades!"
@@ -11640,35 +12004,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11680,8 +12020,8 @@ msgstr ""
"''modify'' eller ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11708,10 +12048,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11722,9 +12059,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11746,6 +12080,9 @@ msgstr "Ingen data hittad i fil ''{0}''."
msgid "Open OSM file"
msgstr "Öppna OSM-fil"
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11795,8 +12132,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11944,6 +12281,9 @@ msgstr "Spara användare och lösenord (okrypterat)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr "Lägg till taggar till valda objekt"
@@ -11962,6 +12302,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr "Ladda data från API"
@@ -11986,7 +12335,13 @@ msgstr "Skapa nya objekt"
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -11995,9 +12350,6 @@ msgstr ""
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr "Lägg till sträcka"
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
@@ -12007,6 +12359,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr "Lägg till sträcka"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -12021,6 +12381,15 @@ msgstr "Fjärrstyrning har begärts för att importera data från följande URL:
msgid "Remote Control has been asked to load data from the API."
msgstr "Fjärrstyrning har begärts för att hämta data från API"
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -12051,19 +12420,19 @@ msgstr ""
msgid "local file"
msgstr "lokal fil"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Länk till OSM datafil på lokal disk."
+msgid "Link to a GPX file on your local disk."
+msgstr ""
msgid "include"
msgstr "inkludera"
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -12085,11 +12454,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr "Länk till OSM datafil på lokal disk."
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "Sessionsfil (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Hittar inte fil ''{0}''."
@@ -12159,13 +12540,13 @@ msgid "Download skipped"
msgstr "Hämta överhoppade"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -12326,10 +12707,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr "Uppdatering av insticksmodul misslyckades"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -12344,22 +12725,21 @@ msgstr "Behåll plugin"
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12433,8 +12813,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12449,9 +12828,24 @@ msgstr "Hämtar lista över insticksmoduler..."
msgid "Downloading plugin list from ''{0}''"
msgstr "Hämtar lista över insticksmoduler från ''{0}''"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12786,17 +13180,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12807,9 +13195,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr "reserverad"
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12841,8 +13272,22 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
-msgstr "Högerklick = kopiera till urklipp"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -13168,6 +13613,11 @@ msgid "Saturation:"
msgstr "Färgmättnad:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -13249,6 +13699,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -13353,9 +13807,6 @@ msgstr "Lägger till förbjuden vänstersväng för grupper av 4 eller 5 sträck
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13411,6 +13862,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13437,9 +13891,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13470,9 +13921,6 @@ msgstr ""
"begränsas genom största ytstorlek som tillåts tas bort. Också genomsnitt av "
"närliggande noder."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13509,6 +13957,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13555,9 +14008,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr "Vägar"
-
msgid "Streets"
msgstr "Vägar"
@@ -13640,7 +14090,10 @@ msgid "Embankment"
msgstr "Bank"
msgid "Lit"
-msgstr ""
+msgstr "Belyst"
+
+msgid "Toll"
+msgstr "Betalstation"
msgid "Motorway Link"
msgstr "Motorvägslänk"
@@ -13732,14 +14185,58 @@ msgstr "Bostadsområde"
msgid "Edit Residential Street"
msgstr "Redigera en gata i bostadsområde"
-msgid "Living Street"
-msgstr "Gårdsgata"
+msgid "Bicycle Road"
+msgstr ""
-msgid "Edit Living Street"
-msgstr "Redigera en gårdsgata"
+msgid "Edit Bicycle Road"
+msgstr ""
-msgid "Pedestrian"
-msgstr "Gågata"
+msgid "Highway type"
+msgstr "Typ av väg"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "ja"
+
+msgid "no"
+msgstr "nej"
+
+msgid "destination"
+msgstr "mål"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
+msgid "Living Street"
+msgstr "Gårdsgata"
+
+msgid "Edit Living Street"
+msgstr "Redigera en gårdsgata"
+
+msgid "Pedestrian"
+msgstr "Gågata"
msgid "Edit Pedestrian Street"
msgstr "Redigera en gågata"
@@ -13750,11 +14247,11 @@ msgstr "Område"
msgid "Service"
msgstr "Tillfartsväg"
-msgid "Edit Serviceway"
-msgstr "Redigera en tillfartsväg"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "Typ av tillfartsväg"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "gränd"
@@ -13765,6 +14262,9 @@ msgstr "uppfart"
msgid "parking_aisle"
msgstr "parkeringsväg"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Parkeringskorridor"
@@ -13792,18 +14292,12 @@ msgstr "rondell"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "ja"
-
msgid "Road Restrictions"
msgstr "Vägbegränsningar"
msgid "Edit Road Restrictions"
msgstr "Redigera vägbegränsningar"
-msgid "Toll"
-msgstr "Betalstation"
-
msgid "No exit (cul-de-sac)"
msgstr "Återvändsgränd"
@@ -13813,9 +14307,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "mål"
-
msgid "delivery"
msgstr "leveranser"
@@ -13825,15 +14316,15 @@ msgstr "med tillåtelse"
msgid "private"
msgstr "privat"
+msgid "customers"
+msgstr "kunder"
+
msgid "agricultural"
msgstr "jordbruksfordon"
msgid "forestry"
msgstr "skogsbruk"
-msgid "no"
-msgstr "nej"
-
msgid "official"
msgstr ""
@@ -13879,6 +14370,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Allmänna transportmedel (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Minsta tillåtna hastighet (km/h)"
@@ -13963,6 +14457,9 @@ msgstr "Redigera en bro"
msgid "viaduct"
msgstr "viadukt"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -14067,20 +14564,29 @@ msgstr ""
msgid "Visibility"
msgstr "Synlighet"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "suverän"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "bra"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "medel"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "dålig"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "hemsk"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "Rullstolar"
@@ -14097,10 +14603,10 @@ msgstr "Påbjuden ridväg"
msgid "Edit Bridleway"
msgstr "Redigera påbjuden ridväg"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -14136,7 +14642,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -14205,12 +14711,18 @@ msgstr "Rastplats"
msgid "Edit Rest Area"
msgstr "Redigera rastplats"
-msgid "Emergency Phone"
-msgstr "Nödtelefon"
+msgid "Drinking Water"
+msgstr "Dricksvatten"
msgid "Traffic Signal"
msgstr "Trafikljus"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "Typ av övergångsställe"
@@ -14226,15 +14738,6 @@ msgstr "ö"
msgid "unmarked"
msgstr "utan markering"
-msgid "Cross on horseback"
-msgstr "Korsa ridande"
-
-msgid "Cross by bicycle"
-msgstr "Korsa cyklande"
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr "Brittiskt namn på övergångsställe"
@@ -14256,15 +14759,27 @@ msgstr "pegasus"
msgid "tiger"
msgstr "tiger"
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr "Korsa cyklande"
+
+msgid "Cross on horseback"
+msgstr "Korsa ridande"
+
msgid "Stop"
msgstr "Stopp"
msgid "Give way"
-msgstr ""
+msgstr "Väjningsplikt"
msgid "Mini-roundabout"
msgstr "Minirondell"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "Riktning"
@@ -14274,12 +14789,9 @@ msgstr "medurs"
msgid "Pedestrian Crossing"
msgstr "Övergångsställe för fotgängare"
-msgid "Edit Crossing"
+msgid "Edit Pedestrian Crossing"
msgstr ""
-msgid "Type name (UK)"
-msgstr "Brittiskt typnamn"
-
msgid "Traffic Calming"
msgstr "Farthinder"
@@ -14310,9 +14822,6 @@ msgstr ""
msgid "Passing Place"
msgstr "Mötesplats"
-msgid "Edit Passing Place"
-msgstr "Redigera Mötesplats"
-
msgid "Turning Circle"
msgstr "Vändplats"
@@ -14346,20 +14855,44 @@ msgstr "Wikipedia"
msgid "Barriers"
msgstr "Hinder"
+msgid "Block"
+msgstr "Block"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "Tillåten trafik:"
+
+msgid "Material"
+msgstr "Material"
+
+msgid "stone"
+msgstr "sten"
+
msgid "Bollard"
msgstr "Trafikkon"
msgid "Edit Bollard"
msgstr "Redigera en trafikkon"
-msgid "Allowed traffic:"
-msgstr "Tillåten trafik:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plast"
msgid "Cycle Barrier"
msgstr "Cykelhinder"
-msgid "Block"
-msgstr "Block"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Färist"
@@ -14370,6 +14903,9 @@ msgstr "Redigera en färist"
msgid "Bus Trap"
msgstr "Bussfålla"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Spikhinder"
@@ -14391,44 +14927,88 @@ msgstr "Redigera en gränskontroll"
msgid "Hedge"
msgstr "Häck"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "Höjd (meter)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Stängsel"
+msgid "Edit Fence"
+msgstr ""
+
msgid "barbed_wire"
msgstr "taggtråd"
-msgid "chain"
-msgstr "kedja"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "elektriskt"
-msgid "hedge"
-msgstr "häck"
-
msgid "pole"
msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Mur"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Stadsmur"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "Stödmur"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "Dike"
+msgstr ""
-msgid "Entrance"
-msgstr "Ingång"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Redigera en ingång"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Grind"
@@ -14460,12 +15040,27 @@ msgstr "Manshål"
msgid "Edit Kissing Gate"
msgstr "Redigera ett manshål"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Stätta"
msgid "Edit Stile"
msgstr "Redigera en stätta"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "Vändkors"
@@ -14523,6 +15118,9 @@ msgstr "Avlopp"
msgid "Edit Drain"
msgstr "Redigera en avloppsränna"
+msgid "Ditch"
+msgstr "Dike"
+
msgid "Edit Ditch"
msgstr "Redigera dike"
@@ -14532,6 +15130,12 @@ msgstr "Bäck"
msgid "Edit Stream"
msgstr "Redigera en bäck"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14571,9 +15175,6 @@ msgstr "Redigera en damm"
msgid "Groyne"
msgstr "Vågbrytare"
-msgid "Edit Groyne"
-msgstr "Redigera vågbrytare"
-
msgid "Breakwater"
msgstr ""
@@ -14607,6 +15208,21 @@ msgstr "Redigera täckt resevoar"
msgid "Edit Water"
msgstr "Redigera vatten"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Land"
@@ -14688,20 +15304,25 @@ msgstr "Redigera en färjeterminal"
msgid "Cargo"
msgstr "Last"
+msgctxt "cargo"
msgid "passengers"
-msgstr "passagerare"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "fordon"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "cykel"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "passagerare;fordon"
+msgstr ""
msgid "Ferry Route"
msgstr "Färjelinje"
@@ -14772,8 +15393,11 @@ msgstr "militär"
msgid "tourism"
msgstr "turism"
-msgid "Service/Type"
-msgstr "Sidospår/Typ"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "bangård"
@@ -14796,11 +15420,14 @@ msgstr "kontaktledning"
msgid "rail"
msgstr "räls"
-msgid "Voltage"
-msgstr "Spänning"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "Frekvens (Hz)"
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14811,9 +15438,6 @@ msgstr "Smalspår"
msgid "Edit Narrow Gauge Rail"
msgstr "Redigera en smalspårig järnväg"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "Monorail"
@@ -14856,18 +15480,56 @@ msgstr "Järnväg utan trafik"
msgid "Edit Disused Railway"
msgstr "Redigera en nedlagd järnväg"
-msgid "Optional Types"
-msgstr "Valfria typer"
-
msgid "Abandoned Rail"
msgstr "Nedlagd järnväg"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "Plankorsning"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "Järnvägsövergång"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "Typ av övergångsställe"
@@ -14967,11 +15629,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14983,13 +15643,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Redigera station"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "Pylon"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "Redigera Pylon"
+msgstr ""
msgid "Parking"
msgstr "Parkeringsplats"
@@ -15006,11 +15664,11 @@ msgstr "yta"
msgid "underground"
msgstr "underjordisk"
-msgid "Access"
-msgstr "Åtkomst"
+msgid "rooftop"
+msgstr "takparkering"
-msgid "customers"
-msgstr "kunder"
+msgid "Access"
+msgstr "Åtkomst"
msgid "Park and Ride"
msgstr ""
@@ -15039,9 +15697,6 @@ msgstr "Parkeringsplats"
msgid "Edit Parking space"
msgstr "Redigera Parkeringsplats"
-msgid "rooftop"
-msgstr "takparkering"
-
msgid "Capacity"
msgstr "Kapacitet"
@@ -15057,20 +15712,36 @@ msgstr "Tidsbegräsning (minuter)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Öppettider"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Mån-Fre 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Tis-Sön 08:00-15:00;Lör 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr ""
@@ -15219,6 +15890,9 @@ msgstr "Laddstation"
msgid "Edit Charging Station (for electric cars)"
msgstr "Redigera laddstation"
+msgid "Voltage"
+msgstr "Spänning"
+
msgid "Amperage"
msgstr "Ampere"
@@ -15240,6 +15914,12 @@ msgstr "Bilverkstad"
msgid "Edit Car Repair"
msgstr "Redigera en bilverkstad"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "Däckaffär"
@@ -15267,6 +15947,12 @@ msgstr "Uthyrning"
msgid "Edit Car Rental"
msgstr "Redigera biluthyrning"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "endast"
+
msgid "Sharing"
msgstr "Bilpool"
@@ -15291,22 +15977,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "ja"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -15328,9 +15998,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Kläder"
@@ -15394,8 +16061,8 @@ msgstr "Redigera en cykeluthyrning"
msgid "Public Transport"
msgstr "Kollektivtrafik"
-msgid "Route"
-msgstr "Rutt"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "Redigera rutt"
@@ -15525,6 +16192,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15535,7 +16205,7 @@ msgid "Tram stop (legacy)"
msgstr ""
msgid "Train"
-msgstr ""
+msgstr "Tåg"
msgid "Railway station (legacy)"
msgstr ""
@@ -15544,15 +16214,18 @@ msgid "Railway halt (legacy)"
msgstr ""
msgid "Trolleybus"
-msgstr ""
+msgstr "Trådbuss"
msgid "Share taxi"
-msgstr ""
+msgstr "Delad taxi"
msgid "Funicular"
msgstr ""
msgid "Ferry"
+msgstr "Färja"
+
+msgid "Edit Platform"
msgstr ""
msgid "Bench"
@@ -15565,10 +16238,7 @@ msgid "Wheelchair"
msgstr "Rullstol"
msgid "limited"
-msgstr ""
-
-msgid "only"
-msgstr ""
+msgstr "begränsat"
msgid "Highway platform (legacy)"
msgstr ""
@@ -15579,8 +16249,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "Järnvägsstation"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Redigera Järnvägsstation"
msgid "Building"
msgstr "Byggnad"
@@ -15594,6 +16269,9 @@ msgstr "Redigera tunnelbaneingång"
msgid "Ticket Machine"
msgstr "Biljettmaskin"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "Referensnummer"
@@ -15601,7 +16279,7 @@ msgid "Coins"
msgstr "Mynt"
msgid "Notes"
-msgstr "Anteckningar"
+msgstr "Sedlar"
msgid "Electronic purses and Charge cards"
msgstr "Betalkort"
@@ -15613,27 +16291,19 @@ msgid "Credit cards"
msgstr "Kreditkort"
msgid "Account or loyalty cards"
-msgstr ""
+msgstr "Medlems eller Bonuskort"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "Järnvägsstation"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Redigera Järnvägsstation"
-
msgid "UIC-Reference"
-msgstr "UIC-klassificering"
+msgstr "UIC-Referens"
msgid "Railway Halt"
msgstr "Järnvägshållplats"
msgid "Edit Halt"
-msgstr "Redigera hållplats"
+msgstr "Redigera järnvägshållplats"
msgid "Tram Stop"
msgstr "Spårvagnshållplats"
@@ -15674,8 +16344,8 @@ msgstr "Redigera en bussplattform"
msgid "Taxi"
msgstr "Taxi"
-msgid "Edit Taxi station"
-msgstr "Redigera en taxistation"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Flygplats"
@@ -15693,10 +16363,10 @@ msgid "ICAO"
msgstr "ICAO"
msgid "Runway"
-msgstr "Rullbana"
+msgstr "Landningsbana"
msgid "Edit Runway"
-msgstr "Redigera rullbana"
+msgstr "Redigera landningsbana"
msgid "Taxiway"
msgstr "Taxibana"
@@ -15728,6 +16398,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr "Internetåtkomst"
+
+msgid "wlan"
+msgstr "wlan"
+
+msgid "wired"
+msgstr "trådbundet"
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr "Internetåtkomst, avgift"
+
msgctxt "airport"
msgid "Gate"
msgstr "Gate"
@@ -15736,7 +16421,7 @@ msgid "Edit Terminal Gate"
msgstr ""
msgid "Facilities"
-msgstr ""
+msgstr "Faciliteter"
msgid "Accommodation"
msgstr "Boende"
@@ -15750,21 +16435,6 @@ msgstr "Redigera ett hotell"
msgid "Stars"
msgstr "Stjärnor"
-msgid "Internet access"
-msgstr "Internetåtkomst"
-
-msgid "wlan"
-msgstr "wlan"
-
-msgid "wired"
-msgstr "trådbundet"
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr "Internetåtkomst, avgift"
-
msgid "Smoking"
msgstr "Rökare"
@@ -15948,6 +16618,12 @@ msgstr "Nattklubb"
msgid "Edit Nightclub"
msgstr "Redigera nattklubb"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turism"
@@ -15969,9 +16645,15 @@ msgstr "Utsiktstorn"
msgid "Information Office"
msgstr "Turistbyrå"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Karta"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "Detaljeringsgrad"
@@ -15984,6 +16666,9 @@ msgstr "gata"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "Visat område"
@@ -16023,6 +16708,9 @@ msgstr ""
msgid "Information Board"
msgstr "Informationstavla"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "Tavlans innehåll"
@@ -16044,22 +16732,34 @@ msgstr "växter"
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "Informationsterminal"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "Detaljerad beskrivning"
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr "Telefonnummer"
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -16083,9 +16783,6 @@ msgstr "Hundpark"
msgid "Edit Dog Park"
msgstr "Redigera hundpark"
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "staket"
@@ -16110,8 +16807,17 @@ msgstr "Bastu"
msgid "Edit Sauna"
msgstr "Redigera bastu"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Tis-Sön 08:00-15:00; Lör 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr "Bordell"
+
+msgid "Edit Brothel"
+msgstr "Redigera Bordell"
msgid "Playground"
msgstr "Lekplats"
@@ -16183,50 +16889,44 @@ msgstr "Konst"
msgid "Edit Artwork"
msgstr "Redigera konstverk"
-msgid "Place of Worship"
-msgstr "Religiös helgedom"
-
-msgid "Edit Place of Worship"
-msgstr "Redigera religiös helgedom"
-
-msgid "Religion"
-msgstr "Religion"
-
-msgid "bahai"
-msgstr "bahai"
+msgid "Recording Studio"
+msgstr "Inspelningsstudio"
-msgid "buddhist"
-msgstr "buddism"
+msgid "Edit Studio"
+msgstr ""
-msgid "christian"
-msgstr "kristendom"
+msgid "audio"
+msgstr "audio"
-msgid "hindu"
-msgstr "hinduism"
+msgid "video"
+msgstr "video"
-msgid "jain"
-msgstr "jain"
+msgid "Place of Worship"
+msgstr "Religiös helgedom"
-msgid "jewish"
-msgstr "judendom"
+msgid "Church"
+msgstr "Kyrka"
-msgid "muslim"
-msgstr "islam"
+msgid "Edit Church"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "Building type"
+msgstr ""
-msgid "spiritualist"
+msgid "basilica"
msgstr ""
-msgid "taoist"
-msgstr "daoism"
+msgid "cathedral"
+msgstr "katedral"
-msgid "unitarian"
-msgstr ""
+msgid "chapel"
+msgstr "kapell"
-msgid "zoroastrian"
-msgstr "zoroastrianism"
+msgid "church"
+msgstr "kyrka"
+
+msgid "temple"
+msgstr "tempel"
msgid "Denomination"
msgstr "Samfund"
@@ -16243,6 +16943,12 @@ msgstr "katoliker"
msgid "evangelical"
msgstr "evangelister"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "jehovas_vittnen"
@@ -16255,6 +16961,9 @@ msgstr "metodister"
msgid "mormon"
msgstr "mormoner"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "ortodoxa"
@@ -16270,77 +16979,180 @@ msgstr "protestanter"
msgid "quaker"
msgstr "kväkare"
-msgid "shia"
-msgstr "shiamuslimer"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "sunnimuslimer"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
-msgstr "Sön 10:00"
+msgid "18:00"
+msgstr ""
-msgid "Su 10:30"
-msgstr "Sön 10:30"
+msgid "sunset,sunrise"
+msgstr ""
-msgid "Su 11:00"
-msgstr "Sön 11:00"
+msgid "Su 9:30,11:00"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "Öppettider för besök"
+msgid "Sa,Su,PH 9:00"
+msgstr ""
-msgid "Recording Studio"
-msgstr "Inspelningsstudio"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
msgstr ""
-msgid "audio"
-msgstr "audio"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "video"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "Offentlig byggnad"
+msgid "Edit Mosque"
+msgstr ""
-msgid "Edit Public Building"
-msgstr "Redigera offentlig byggnad"
+msgid "mosque"
+msgstr "moské"
-msgid "Town hall"
-msgstr "Stadshus"
+msgid "ibadi"
+msgstr ""
-msgid "Edit Town hall"
-msgstr "Redigera stadshus"
+msgid "shia"
+msgstr "shiamuslimer"
-msgid "Community Centre"
+msgid "sunni"
+msgstr "sunnimuslimer"
+
+msgid "Synagogue"
msgstr ""
-msgid "Embassy"
-msgstr "Ambassad"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Edit Embassy"
-msgstr "Redigera ambassad"
+msgid "synagogue"
+msgstr "synagoga"
-msgid "Courthouse"
-msgstr "Domstol"
+msgid "conservative"
+msgstr ""
-msgid "Edit Courthouse"
-msgstr "Redigera domstol"
+msgid "reform"
+msgstr ""
-msgid "Prison"
-msgstr "Fängelse"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Prison"
-msgstr "Redigera fängelse"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "Police"
-msgstr "Polisstation"
+msgid "theravada"
+msgstr ""
-msgid "Edit Police"
-msgstr "Redigera polisstation"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Religion"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jain"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr "daoism"
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
+msgstr "zoroastrianism"
+
+msgid "Public Building"
+msgstr "Offentlig byggnad"
+
+msgid "Edit Public Building"
+msgstr "Redigera offentlig byggnad"
+
+msgid "Town hall"
+msgstr "Stadshus"
+
+msgid "Edit Town hall"
+msgstr "Redigera stadshus"
+
+msgid "Community Centre"
+msgstr ""
+
+msgid "Embassy"
+msgstr "Ambassad"
+
+msgid "Edit Embassy"
+msgstr "Redigera ambassad"
+
+msgid "Courthouse"
+msgstr "Domstol"
+
+msgid "Edit Courthouse"
+msgstr "Redigera domstol"
+
+msgid "Prison"
+msgstr "Fängelse"
+
+msgid "Edit Prison"
+msgstr "Redigera fängelse"
+
+msgid "Police"
+msgstr "Polisstation"
+
+msgid "Edit Police"
+msgstr "Redigera polisstation"
msgid "Fire Station"
msgstr "Brandstation"
@@ -16390,6 +17202,12 @@ msgstr "Redigera Körskola"
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Hälsovård"
@@ -16399,6 +17217,12 @@ msgstr "Sjukhus"
msgid "Edit Hospital"
msgstr "Redigera sjukhus"
+msgid "Clinic"
+msgstr "Vårdcentral"
+
+msgid "Edit Clinic"
+msgstr "Redigera Vårdcentral"
+
msgid "Doctors"
msgstr "Läkare"
@@ -16418,10 +17242,10 @@ msgid "Edit Nursing Home"
msgstr ""
msgid "Retirement Home"
-msgstr ""
+msgstr "Äldreboende"
msgid "Edit Retirement Home"
-msgstr ""
+msgstr "Redigera Äldreboende"
msgid "Pharmacy"
msgstr "Apotek"
@@ -16465,12 +17289,66 @@ msgstr "Veterinär"
msgid "Edit Veterinary"
msgstr "Redigera veterinär"
-msgid "Note"
-msgstr "Anteckning"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "offentlig"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "Brevlåda"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "Telefon"
@@ -16480,6 +17358,30 @@ msgstr "Redigera en telefon"
msgid "Telephone cards"
msgstr "Telefonkort"
+msgid "Emergency Phone"
+msgstr "Nödtelefon"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "Klocka"
@@ -16489,31 +17391,37 @@ msgstr "Redigera Klocka"
msgid "Display"
msgstr "Display"
-msgctxt "display"
msgid "analog"
-msgstr "analog"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "digital"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "solur"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
-msgstr "okonventionell"
+msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "väggmonterad"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16541,8 +17449,8 @@ msgstr "Visar luftfuktighet"
msgid "Recycling"
msgstr "Återvinning"
-msgid "Edit Recycling station"
-msgstr "Redigera en återvinningsstation"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Batterier"
@@ -16568,27 +17476,15 @@ msgstr ""
msgid "Waste Basket"
msgstr "Papperskorg"
-msgid "Edit Waste Basket"
-msgstr "Redigera Papperskorg"
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr "Ryggstöd"
-msgid "Material"
-msgstr "Material"
-
-msgid "stone"
-msgstr "sten"
-
-msgid "plastic"
-msgstr "plast"
-
msgid "Amount of Seats"
msgstr "Antal säten"
@@ -16623,14 +17519,17 @@ msgstr "Redigera ett jakttorn"
msgid "Height"
msgstr "Höjd"
+msgctxt "height"
msgid "low"
-msgstr "låg"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "halv"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "full"
+msgstr ""
msgid "Hide"
msgstr "Dölj"
@@ -16638,11 +17537,11 @@ msgstr "Dölj"
msgid "Lock"
msgstr "Lås"
-msgid "Drinking Water"
-msgstr "Dricksvatten"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "Redigera dricksvattensfacilitet"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "Brandpost"
@@ -16669,6 +17568,9 @@ msgstr "damm"
msgid "Diameter (in mm)"
msgstr "Diameter (mm)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16706,119 +17608,155 @@ msgstr "Stadion"
msgid "Edit Stadium"
msgstr "Redigera stadion"
-msgid "select sport:"
-msgstr "välj sport:"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "sport"
+msgid "Sport"
+msgstr "Sport"
+msgctxt "sport"
msgid "multi"
-msgstr "flera"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "bågskytte"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "friidrott"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "amerikansk fotboll"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "australisk fotboll"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "baseball"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basket"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "boule"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "bowls"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kanot"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "klättring"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "cricket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "kricket_nät"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "krocket"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "cykling"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "hundracing"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "ridsport"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "gymnastik"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "ishockey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "hästkapplöpning"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motorsport"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "rackets"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "skytte"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "skateboard"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "skridskoåkning"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "skidåkning"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "fotboll"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "simning"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "bordtennis"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tennis"
+msgstr ""
msgid "Sports Centre"
msgstr "Sporthall"
@@ -16850,26 +17788,27 @@ msgstr "Minigolf"
msgid "Edit Miniature Golf"
msgstr "Redigera minigolfbana"
-msgid "Sport"
-msgstr "Sport"
-
msgid "Multi"
msgstr "Flera"
msgid "Edit Multi"
msgstr "Redigera flersportsfacilitet"
-msgid "type"
-msgstr "typ"
-
+msgctxt "running"
msgid "pitch"
-msgstr "plan"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "sporthall"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadion"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16877,6 +17816,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "plan"
+
+msgid "sports_centre"
+msgstr "sporthall"
+
+msgid "stadium"
+msgstr "stadion"
+
msgid "10pin"
msgstr ""
@@ -16910,6 +17858,22 @@ msgstr "Redigera kanotpaddling"
msgid "Edit Cycling"
msgstr "Redigera cykling"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Hundkapplöpning"
@@ -16922,10 +17886,35 @@ msgstr "Ridsport"
msgid "Edit Equestrian"
msgstr "Redigera ridsport"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
msgstr ""
-msgid "Horse Racing"
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "lera"
+
+msgid "Horse Racing"
msgstr "Hästkapplöpning"
msgid "Edit Horse Racing"
@@ -16941,7 +17930,7 @@ msgid "Skating"
msgstr "Skridskoåkning"
msgid "Edit Skating"
-msgstr "Redigera skridskoåkning"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16985,36 +17974,54 @@ msgstr ""
msgid "Difficulty"
msgstr "Svårighetsgrad"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "nybörjare"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "lätt"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "expert"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "ospårat"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -17057,19 +18064,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -17116,7 +18119,7 @@ msgid "Edit Golf"
msgstr "Redigera golf"
msgid "golf_course"
-msgstr "golf_bana"
+msgstr "golfbana"
msgid "Boule"
msgstr "Boule"
@@ -17208,6 +18211,18 @@ msgstr "Modellflygfält"
msgid "Edit Model Aerodrome"
msgstr "Redigera Modellflygfält"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "RC-bilar"
@@ -17220,38 +18235,73 @@ msgstr "Byggnadsverk"
msgid "Edit Building"
msgstr "Redigera byggnad"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr "tak"
+msgctxt "building"
msgid "garage"
-msgstr "garage"
+msgstr ""
-msgid "church"
-msgstr "kyrka"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industri"
+msgctxt "building"
msgid "school"
msgstr "skola"
+msgctxt "building"
msgid "hangar"
msgstr "hangar"
+msgctxt "building"
msgid "commercial"
msgstr "kommersiell"
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
-msgstr "transport"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr "växthus"
+msgctxt "building"
msgid "office"
msgstr "kontorsbyggnad"
+msgctxt "building"
msgid "university"
-msgstr "universitet"
+msgstr "universitet/högskola"
+
+msgctxt "building"
+msgid "hospital"
+msgstr "sjukhus"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "varuhus"
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr "sjul"
msgid "Residential Building"
msgstr ""
@@ -17259,20 +18309,59 @@ msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "lägenheter"
+msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
-msgstr "hydda"
+msgstr ""
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
-msgstr "terrass"
+msgstr ""
+msgctxt "building"
msgid "detached"
-msgstr "fristående"
+msgstr ""
+
+msgid "Entrance"
+msgstr "Ingång"
+
+msgid "Edit Entrance"
+msgstr "Redigera en ingång"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
msgid "Tower"
msgstr "Torn"
@@ -17289,9 +18378,6 @@ msgstr "kommunikation"
msgid "observation"
msgstr "observation"
-msgid "Height (meters)"
-msgstr "Höjd (meter)"
-
msgid "Flagpole"
msgstr "Flaggstång"
@@ -17501,42 +18587,68 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr "Mån-Fre 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Mätstation"
+msgid "Monitoring Station"
+msgstr ""
+
+msgid "Edit Monitoring Station"
+msgstr ""
+
+msgid "Monitoring:"
+msgstr ""
+
+msgid "Weather"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "Redigera Mätstation"
+msgid "Water level"
+msgstr ""
-msgid "Measurement"
-msgstr "Mätning"
+msgid "Tide Level"
+msgstr ""
-msgid "particulate_matter"
+msgid "Traffic"
msgstr ""
-msgid "seismic"
-msgstr "seismisk"
+msgid "Air Quality"
+msgstr ""
-msgid "water_level"
-msgstr "vattennivå"
+msgid "Noise"
+msgstr ""
-msgid "weather"
-msgstr "väder"
+msgid "GPS Signals"
+msgstr ""
-msgid "Recording"
-msgstr "Spelar in"
+msgid "GLONASS Signals"
+msgstr ""
-msgid "manually"
-msgstr "manuellt"
+msgid "Galileo Signals"
+msgstr ""
-msgid "automated"
-msgstr "automatiserat"
+msgid "Radiation"
+msgstr ""
-msgid "remote"
-msgstr "fjärrstyrd"
+msgid "Seismic Activity"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "nej"
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "Mätpunkt"
@@ -17544,8 +18656,8 @@ msgstr "Mätpunkt"
msgid "Edit Survey Point"
msgstr "Redigera mätpunkt"
-msgid "Surveillance"
-msgstr "Övervakning"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Redigera övervakningskamera"
@@ -17556,12 +18668,102 @@ msgstr "inomhus"
msgid "outdoor"
msgstr "utomhus"
-msgid "public"
-msgstr "offentlig"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "affär"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "Elkraft"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "elektricitet"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "hetvatten"
+
+msgid "hot air"
+msgstr "hetluft"
+
+msgid "cold water"
+msgstr "kallvatten"
+
+msgid "cold air"
+msgstr "kalluft"
+
+msgid "compressed air"
+msgstr "tryckluft"
+
+msgid "steam"
+msgstr "ånga"
+
+msgid "vacuum"
+msgstr "vacuum"
+
msgid "Power Generator"
msgstr "Kraftverk"
@@ -17613,89 +18815,192 @@ msgstr "vindkraft"
msgid "Method"
msgstr "Metod"
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "förbränning"
+msgstr ""
-msgid "dam"
-msgstr "damm"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "fission"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "fusion"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
-msgstr "förgasning"
-
-msgid "photovoltaic"
-msgstr "solkraft"
+msgstr ""
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "pyrolys"
+msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "termisk"
+msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
-msgstr "elektricitet"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "hetvatten"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "hetluft"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "kallvatten"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "kalluft"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "tryckluft"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "ånga"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
-msgid "battery charging"
-msgstr "batteriladdning"
+msgid "pelton_turbine"
+msgstr ""
-msgid "Power Station"
-msgstr "Kraftstation"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Redigera en kraftstation"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Transformatorstation"
@@ -17706,12 +19011,27 @@ msgstr "Redigera en transformatorstation"
msgid "Line reference"
msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "high"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "medium"
msgstr ""
+msgid "low"
+msgstr "låg"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr "Elskåp"
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr "Redigera Elskåp"
+
msgid "Power Tower"
msgstr "Kraftledningsmast"
@@ -17721,6 +19041,9 @@ msgstr "Redigera en kraftledningsmast"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "Elstolpe"
@@ -17739,11 +19062,9 @@ msgstr "Redigera en kraftledning"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17852,11 +19173,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Redigera kiosk"
-msgid "Baker"
-msgstr "Bageri"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "Redigera bageri"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "Slakteri"
@@ -17867,8 +19188,8 @@ msgstr "Redigera slakteri"
msgid "Seafood"
msgstr "Skaldjur"
-msgid "Edit Seafood"
-msgstr "Redigera Skaldjur"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr ""
@@ -17888,14 +19209,20 @@ msgstr "Marknad"
msgid "Edit Marketplace"
msgstr "Redigera Marknad"
+msgid "Organic"
+msgstr "Organisk"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "Organisk"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17966,8 +19293,8 @@ msgstr "Redigera skrädderi"
msgid "Fabric"
msgstr "Tyg"
-msgid "Edit Fabric"
-msgstr "Redigera Tyg"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "Elektronik"
@@ -17987,14 +19314,14 @@ msgstr "Redigera elektronikaffär"
msgid "Mobile Phone"
msgstr "Mobiltelefoni"
-msgid "Edit Mobile Phone"
-msgstr "Redigera Mobiltelefoni"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "Dammsugare"
-msgid "Edit Vacuum Cleaner"
-msgstr "Redigera Dammsugare"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hifi"
@@ -18002,9 +19329,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "Redigera hifi-affär"
-msgctxt "shop"
msgid "Video"
-msgstr "Videobutik"
+msgstr "Video"
msgid "Edit Video Shop"
msgstr "Redigera videobutik"
@@ -18030,6 +19356,12 @@ msgstr "Redigera växlingskontor"
msgid "Edit Automated Teller Machine"
msgstr "Redigera uttagsautomat"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "Varuhus"
@@ -18066,11 +19398,32 @@ msgstr "Guldsmed"
msgid "Edit Jewelry"
msgstr "Redigera guldsmed"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "buddism"
+
+msgid "christian"
+msgstr "kristendom"
+
+msgid "hindu"
+msgstr "hinduism"
+
+msgid "jewish"
+msgstr "judendom"
+
+msgid "muslim"
+msgstr "islam"
+
msgid "Erotic"
msgstr "Erotikaffär"
-msgid "Edit Erotic"
-msgstr "Redigera erotikaffär"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "Florist"
@@ -18099,8 +19452,8 @@ msgstr "Redigera järnaffär"
msgid "Paint"
msgstr "Färgaffär"
-msgid "Edit Paint"
-msgstr "Redigera Färgaffär"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "Möbler"
@@ -18111,20 +19464,20 @@ msgstr "Redigera möbelaffär"
msgid "Kitchen"
msgstr "Kök"
-msgid "Edit Kitchen"
-msgstr "Redigera Kök"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "Gardiner"
-msgid "Edit Curtain"
-msgstr "Redigera Gardiner"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "Rambutik"
-msgid "Edit Frames"
-msgstr "Redigera rambutik"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "Kontorsmaterial"
@@ -18144,6 +19497,12 @@ msgstr "Bokhandel"
msgid "Edit Book Store"
msgstr "Redigera bokhandel"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "Resebyrå"
@@ -18153,8 +19512,8 @@ msgstr "Redigera resebyrå"
msgid "Musical Instrument"
msgstr "Musikaffär"
-msgid "Edit Musical Instruments"
-msgstr "Redigera musikaffär"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "Leksaker"
@@ -18234,6 +19593,9 @@ msgstr "leksaker"
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr "Anteckning"
+
msgid "Geography"
msgstr "Geografi"
@@ -18363,6 +19725,12 @@ msgstr "Topp"
msgid "Edit Peak"
msgstr "Redigera topp"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Glaciär"
@@ -18402,24 +19770,33 @@ msgstr "Träd"
msgid "Edit Tree"
msgstr "Redigera ett träd"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botaniskt namn"
+msgid "Tree Row"
+msgstr "Allé"
+
msgid "Wood"
msgstr "Naturskog"
msgid "Edit Wood"
msgstr "Redigera naturskog"
-msgctxt "wood"
msgid "coniferous"
msgstr "barrskog"
-msgctxt "wood"
msgid "deciduous"
msgstr "lövskog"
-msgctxt "wood"
msgid "mixed"
msgstr "blandskog"
@@ -18429,15 +19806,6 @@ msgstr "Kulturskog"
msgid "Edit Forest Landuse"
msgstr "Redigera användning av mark för skogsbruk"
-msgid "coniferous"
-msgstr "barrskog"
-
-msgid "deciduous"
-msgstr "lövskog"
-
-msgid "mixed"
-msgstr "blandskog"
-
msgid "Grassland"
msgstr ""
@@ -18513,6 +19881,12 @@ msgstr "Äng"
msgid "Edit Meadow Landuse"
msgstr "Redigera markanvändning som äng"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Vingård"
@@ -18567,7 +19941,7 @@ msgstr "Fritidsområde"
msgid "Edit Recreation Ground Landuse"
msgstr "Redigera användning av mark för fritidsområde"
-msgid "Residential area"
+msgid "Residential Area"
msgstr "Bostadsområde"
msgid "Edit Residential Landuse"
@@ -18579,6 +19953,9 @@ msgstr "Kyrkogård"
msgid "Edit Graveyard"
msgstr "Redigera kyrkogård"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Begravningsplats"
@@ -18595,13 +19972,13 @@ msgid "Commercial"
msgstr "Affärsområde"
msgid "Edit Commercial Landuse"
-msgstr "Redigera användning av mark för affärsområde"
+msgstr "Redigera markanvändning för affärsområde"
msgid "Industrial"
msgstr "Industriområde"
msgid "Edit Industrial Landuse"
-msgstr "Redigera användning av mark för industriområde"
+msgstr "Redigera markanvändning för industriområde"
msgid "Garages"
msgstr "Garage"
@@ -18654,6 +20031,33 @@ msgstr "Redigera användning av mark för stenbrott"
msgid "Annotation"
msgstr "Annotering"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Redigera adressinformation"
@@ -18672,30 +20076,6 @@ msgstr "Stadsnamn"
msgid "Country code"
msgstr "Landskod"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "Adressinterpolation"
@@ -18714,6 +20094,18 @@ msgstr "jämn"
msgid "alphabetic"
msgstr "alfabetisk"
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18876,26 +20268,55 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "väg"
+msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
-msgstr "skidor"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "fot"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "vandring"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
-msgstr "omväg"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr ""
@@ -18942,19 +20363,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
-msgstr "Ruttnätverk"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "Redigera ruttnätverk"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "medlem"
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18978,7 +20402,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -19074,18 +20498,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "bro"
msgid "deprecated"
msgstr "förlegad"
+msgid "bicycle"
+msgstr "cykel"
+
+msgid "foot"
+msgstr "fot"
+
msgid "horse"
msgstr "häst"
@@ -19095,8 +20528,11 @@ msgstr "Hinder"
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "landsvägsspår"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr ""
@@ -19104,10 +20540,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -19125,6 +20561,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "järnvägspunkt"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -19140,28 +20579,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -19182,20 +20621,20 @@ msgstr "marina"
msgid "amenity"
msgstr "inrättning"
-msgid "amenity_traffic"
-msgstr "trafikinrättning"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "hälsa"
-msgid "shop"
-msgstr "affär"
+msgid "office"
+msgstr "kontorsbyggnad"
msgid "hotel"
msgstr "hotell"
@@ -19260,9 +20699,6 @@ msgstr "hed"
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "lera"
-
msgid "beach"
msgstr "strand"
@@ -19272,10 +20708,13 @@ msgstr "rutt"
msgid "boundary"
msgstr "gräns"
+msgid "sport"
+msgstr "sport"
+
msgid "place"
msgstr "plats"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -19290,9 +20729,6 @@ msgstr "Mindre tätort/Stad"
msgid "One Way"
msgstr "Enkelriktat"
-msgid "Church"
-msgstr "Kyrka"
-
msgid "Fuel Station"
msgstr "Bensinstation"
@@ -19320,6 +20756,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -19365,10 +20804,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
-msgid "natural water used for swimming pool"
+msgid "unusual tag combination (landuse & building)"
msgstr ""
-msgid "incline without highway"
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
+msgid "natural water used for swimming pool"
+msgstr ""
+
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19380,7 +20849,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19398,7 +20867,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19515,19 +20984,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:ref without ref"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:population without population"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:geometry on a node"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19546,13 +21126,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19561,19 +21177,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19588,142 +21213,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19762,46 +21436,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -19822,90 +21499,150 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
+msgstr ""
+
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OSM Export"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
msgstr ""
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "uppdatera portlistan"
+
+msgid "Configure"
+msgstr "Anpassa"
+
+msgid "Connection Error."
+msgstr "Anslutningsfel."
+
+msgid "configure the connected DG100"
+msgstr "anpassa den anslutna DG100"
+
+msgid "delete data after import"
+msgstr "ta bort data efter import"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -20107,6 +21844,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -20128,13 +21877,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20397,9 +22140,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Uppdatera egenskaper för upp till {0} objekt"
@@ -20421,6 +22170,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20499,9 +22251,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20586,7 +22350,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20857,15 +22621,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20873,7 +22628,7 @@ msgid "Rotate crosshair"
msgstr ""
msgid "Advanced settings"
-msgstr ""
+msgstr "Avancerade inställningar"
msgid "Buildings tags:"
msgstr ""
@@ -20903,7 +22658,7 @@ msgid "Length step:"
msgstr ""
msgid "Advanced..."
-msgstr ""
+msgstr "Avancerat..."
msgid "Draw buildings"
msgstr ""
@@ -21036,6 +22791,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -21054,12 +22812,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -21199,6 +22951,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -21216,6 +22971,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "Lägg \"source=...\" till objekt?"
@@ -21296,48 +23054,6 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image cropping"
-msgstr ""
-
-msgid "Click second corner for image cropping"
-msgstr ""
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr ""
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-
-msgid "Enter cadastre east,north position"
-msgstr ""
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-msgid "East"
-msgstr ""
-
-msgid "I use the mouse"
-msgstr ""
-
-msgid "Set {0} Lambert coordinates"
-msgstr ""
-
msgid "Load layer from cache"
msgstr ""
@@ -21390,19 +23106,75 @@ msgstr "Lägg till ett nytt lager"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr ""
msgid "Get a new cookie (session timeout)"
msgstr "Hämta ny cookie (sessions-timeout)"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image cropping"
+msgstr ""
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr ""
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+msgid "East"
+msgstr ""
+
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
+msgstr ""
+
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21428,7 +23200,10 @@ msgstr "WMS-lager ({0}), {1} ruta/rutor inlästa"
msgid "Is not vectorized."
msgstr "Är inte vektoriserad"
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21480,7 +23255,7 @@ msgstr "Ta bort valt schema från listan."
msgid "Color Schemes"
msgstr "Färgscheman"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21527,6 +23302,9 @@ msgstr "Hämta längs"
msgid "Please select 1 or more ways to download along"
msgstr "Välj en eller fler sträckor att hämta data längs med"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr "{0} mellanliggande noder att hämta"
@@ -21599,6 +23377,71 @@ msgstr ""
msgid "Install"
msgstr ""
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "Enbart position"
@@ -21632,32 +23475,14 @@ msgstr "Format för dataloggning"
msgid "Disable data logging if speed falls below"
msgstr "Avaktivera dataloggning om hastigheten blir långsammare än"
-msgid "Disable data logging if distance falls below"
-msgstr "Avaktivera dataloggning om avståndet blir kortare än"
-
-msgid "Unknown logFormat"
-msgstr "Okänt loggningsformat"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "uppdatera portlistan"
-
-msgid "Configure"
-msgstr "Anpassa"
-
-msgid "Configure Device"
-msgstr "Anpassa enheten"
-
-msgid "Connection Error."
-msgstr "Anslutningsfel."
+msgid "Disable data logging if distance falls below"
+msgstr "Avaktivera dataloggning om avståndet blir kortare än"
-msgid "configure the connected DG100"
-msgstr "anpassa den anslutna DG100"
+msgid "Unknown logFormat"
+msgstr "Okänt loggningsformat"
-msgid "delete data after import"
-msgstr "ta bort data efter import"
+msgid "Configure Device"
+msgstr "Anpassa enheten"
msgid "Importing data from device."
msgstr "Importerar data från enhet."
@@ -22057,6 +23882,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22251,7 +24079,7 @@ msgid "Adjust the position of the selected imagery layer"
msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "Välj bildlager att justera"
+msgstr ""
msgid "Start adjusting"
msgstr ""
@@ -22304,12 +24132,6 @@ msgstr "Importerade bilder"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Bildfiler (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Öppna bilder med ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Hämta en uppsättning bilder som ett nytt lager."
-
msgid "Import vector graphics"
msgstr ""
@@ -22319,16 +24141,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22703,9 +24522,6 @@ msgstr "Autocentrera"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Centrera kontinuerligt LiveGPS-lagret runt nuvarande position."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr ""
@@ -22760,9 +24576,30 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Ett rollbaserat relationsmedlemskap kopierades till alla nya "
+"sträckor.<br>Du bör kontrollera detta och rätta om nödvändigt.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Ett relationsmedlemskap kopierades till alla nya sträckor.<br>Du bör "
+"kontrollera detta och rätta om nödvändigt.</html>"
+
msgid "Split way"
msgstr "Dela sträcka"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22804,25 +24641,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "Konvertera till multipolygon"
+msgid "Select OSM mirror URL to download from."
+msgstr ""
-msgid "Convert to multipolygon."
-msgstr "Konvertera till multipolygon"
+msgid "Base URL"
+msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22959,9 +24796,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22986,12 +24820,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -23140,6 +24983,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -23156,6 +25002,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23391,14 +25248,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Ett fel inträffade: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Kunde inte skapa en ny felrapport. Resultat: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Huvudet innehåller flera värden och kan inte mappas till en enda sträng"
-
msgid "Process queue"
msgstr ""
@@ -23453,18 +25302,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "Nytt problemfall"
-
-msgid "Create issue"
-msgstr "Skapa ett problemfall"
-
-msgid "Describe the problem precisely"
-msgstr "Beskriv problem noggrannt"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23524,6 +25361,9 @@ msgstr "Firefox-applikationen"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23731,9 +25571,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23813,7 +25650,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23967,6 +25822,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23988,6 +25846,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24281,9 +26142,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24352,9 +26210,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24481,9 +26336,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24505,6 +26357,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24537,15 +26392,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Ändra egenskaper"
+
msgid "Country preset:"
msgstr ""
@@ -24555,6 +26426,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24657,9 +26531,6 @@ msgstr "Inställningar för insticksmodulen för ruttberäkning"
msgid "Configure routing preferences."
msgstr "Konfigurera ruttberäkning"
-msgid "Highway type"
-msgstr "Typ av väg"
-
msgid "Speed (Km/h)"
msgstr "Hastighet (Km/h)"
@@ -24775,6 +26646,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr "Förenkla yta"
@@ -24835,19 +26709,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
-msgstr "Online-hjälp"
+msgid "SeaMap Editor"
+msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24988,6 +26862,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "Jämn/Udda"
@@ -25063,6 +26940,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -25078,9 +27044,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr "Hämta OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -25102,6 +27065,9 @@ msgstr "Ladda ner objekt från server"
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25254,9 +27220,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25882,7 +27845,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25890,10 +27856,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25902,18 +27865,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25956,15 +27907,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -26086,18 +28028,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -26275,9 +28205,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr "Tar bort alla noder från urvaö"
-msgid "Video"
-msgstr "Video"
-
msgid "Import Video"
msgstr ""
@@ -26404,7 +28331,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -26424,9 +28351,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr "Sträckhämtning"
@@ -26539,19 +28463,19 @@ msgid "Category"
msgstr ""
msgid "Fetches a list of all Wikipedia articles of a category"
-msgstr ""
+msgstr "Hämtar en lista med alla Wikipedia-artiklar i en kategori"
msgid "Enter the Wikipedia category"
-msgstr ""
+msgstr "Skriv in Wikipedia-kategorin"
msgid "Clipboard"
-msgstr ""
+msgstr "Urklipp"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "Klistrar in Wikipedia-artiklar från systemets urklipp"
msgid "clipboard"
-msgstr ""
+msgstr "urklipp"
msgid "Open Article"
msgstr "Öppna artikel"
@@ -26560,24 +28484,23 @@ msgid "Opens the Wikipedia article of the selected item in a browser"
msgstr "Öppnar det markerade objektets Wikipedia-artikel i en webbläsare"
msgid "Sets the default language for the Wikipedia articles"
-msgstr ""
+msgstr "Standardspråket för Wikipedia-artiklar"
msgid "Enter the Wikipedia language"
-msgstr ""
-
-msgid "Add Tag"
-msgstr ""
+msgstr "Ange Wikipedia språk"
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr ""
+"Lägger till en ''wikipedia'' tagg till de valda objekten angående denna "
+"artikel"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr ""
+msgstr "Den ultimata WMS Supersnabba Turbo Utmaningen II"
msgid "Go driving"
-msgstr ""
+msgstr "Ut och kör"
msgid "Drive a race car on this layer"
-msgstr ""
+msgstr "Kör en racerbil i detta lager"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 424bec0..3484190 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2012-10-03 22:36+0000\n"
"Last-Translator: நவீன் குமார்(கெம்ளின்) <naveenmtp at gmail.com>\n"
"Language-Team: Tamil <ta at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 04:59+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:01+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -52,6 +52,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -152,13 +167,13 @@ msgid "About JOSM..."
msgstr "JOSM பற்றி"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -204,6 +219,9 @@ msgstr "தேவையான அடுக்குகள் இல்லை"
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -243,9 +261,6 @@ msgstr "கருவி: {0}"
msgid "Please select at least four nodes."
msgstr "குளைந்தபட்தமாக நாங்கு பள்ளிகளை தேர்ந்தெடுக"
-msgid "Information"
-msgstr "தகவல்"
-
msgid "Align Nodes in Line"
msgstr "பள்ளிகளை கோடாக வரிசைப்படுத்து"
@@ -270,6 +285,9 @@ msgstr "முறன்பாடு"
msgid "download"
msgstr "இறக்கவும்"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "முந்தய"
@@ -279,6 +297,9 @@ msgstr "அடுத்த"
msgid "Nothing selected to zoom to."
msgstr "பெரியதாக்குவதற்கான குறி தேர்ந்த்தெடுக்கபடவில்லை"
+msgid "Information"
+msgstr "தகவல்"
+
msgid "Zoom to {0}"
msgstr "{0} வரை பெரியதாக்கு"
@@ -334,10 +355,9 @@ msgstr ""
"நிகழும் திசைகளில் வழிகளை இணைக்க இயலாது. சிலவற்றை திருப்பி போட வேண்டுமா?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"வழிகளை இணைக்க முடியவில்லை. (புள்ளிகளின் ஒரே கயிறாக இணைக்கபட முடியவில்லை)"
msgid "Combine {0} ways"
msgstr "{0} வழிகளை இணை"
@@ -394,18 +414,35 @@ msgstr "நீக்கு"
msgid "Delete selected objects."
msgstr "தேர்ந்தெடுக்கப்பட்ட பொருட்களை நீக்கு"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "புள்ளிகளை பங்கிடு"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "கோட்டின் வழியாக தேர்ந்தெடுக்கப்பட்ட புள்ளிகளை சம தூரத்தில் பங்கிடு"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSMயில் இருந்து பதிவிறக்கு"
msgid "Download map data from the OSM server."
msgstr "OSMயில் இருந்து வரைபட தகவளைப் பதிவிறக்கு"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -503,6 +540,9 @@ msgstr ""
"OSM வழிகள், புள்ளிகள், தொடர்ப்புகள் ஆகியவற்றைப் பற்றி வரலாறு தகவலைக் "
"காட்டவும்"
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -622,7 +662,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -772,8 +812,8 @@ msgid "Merge nodes into the oldest one."
msgstr "மிகவும் பழைய புள்ளியில் புள்ளிகளை இணைக்கவும்"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -932,8 +972,8 @@ msgid "Download Data"
msgstr "விவரத்தை பதிவிறக்கு"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -960,15 +1000,9 @@ msgid "Orthogonalize / Undo"
msgstr "செங்குத்தாக்குதலை ரத்துச் செய்"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"வடிவத்தை செங்குத்தாக்குதலை ரத்துச் செய்\n"
-"முந்திய வடிவத்தை செங்குத்தாக்குதலால் நகர்த்த புள்ளிகளை தேர்ந்தெடுத்துக"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "வடிவத்தை செங்குத்தாக்குதலை ரத்துச் செய்"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -988,9 +1022,6 @@ msgstr "செகுத்தாக்கு"
msgid "Usage"
msgstr "பயன்பாடு"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "தேர்ந்தெடுத்த கூறுகளை செகுத்தாக்க முடியாது"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1097,6 +1128,15 @@ msgstr "கோப்பின் பெயரையும் மாற்றவ
msgid "Could not rename file ''{0}''"
msgstr "\"{0}\" ஆம் கோப்பின் பெயரை மாற்ற முடியவில்லை"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1149,9 +1189,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1214,6 +1251,9 @@ msgstr "நிகழும் நிலை அறிக்கை"
msgid "Copy to clipboard and close"
msgstr "ஒட்டுப் பலகைக்கு நகலெடுத்து மூடவும்"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "மூடுக"
@@ -1295,20 +1335,14 @@ msgstr ""
"நடுவிலுள்ள புள்ளிகளைத் தேர்ந்தெடு)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>எல்லா புது வழிகளுக்கும் பங்கு அடிப்படைக் கொண்ட உறவு உறுப்பினர் "
-"நிலையொன்று நகலெடுக்கப்பட்டது<br>நீங்கள் சரிப்பார்த்து, தேவைப்படும்போது "
-"திருத்த வேண்டும்</html>"
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>எல்லா புது வழிகளுக்கும் உறவு உறுப்பினர் நிலையொன்று "
-"நகலெடுக்கப்பட்டது<br>நீங்கள் சரிப்பார்த்து, தேவைப்படும்போது திருத்த "
-"வேண்டும்</html>"
msgid "Split way {0} into {1} parts"
msgstr "{0} வழியை {1} பாகங்களாக பிரி."
@@ -1396,6 +1430,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "செயல்நீக்கு"
@@ -1420,9 +1475,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1620,6 +1672,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1629,6 +1684,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1648,6 +1715,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1698,25 +1790,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1859,6 +1932,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1883,8 +1959,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1900,6 +1976,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2306,6 +2385,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2466,13 +2548,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2481,6 +2563,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2499,8 +2584,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2586,6 +2670,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2622,10 +2709,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2648,8 +2735,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2753,6 +2840,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2813,8 +2903,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2844,10 +2934,10 @@ msgstr "தேர்ந்தெடுக்கப்பட்ட மாற்
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2868,6 +2958,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2898,18 +2991,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2918,8 +3011,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2927,13 +3020,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2947,8 +3038,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2978,11 +3069,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "அறியாத"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3135,8 +3225,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3243,7 +3332,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3262,6 +3351,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3278,9 +3370,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3319,6 +3408,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3343,6 +3435,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3402,13 +3503,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3478,6 +3579,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3547,6 +3666,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3604,13 +3729,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3642,10 +3767,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3779,7 +3904,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3854,6 +3979,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3884,9 +4012,6 @@ msgstr "கட்டிடம்"
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3911,10 +4036,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3977,23 +4102,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4097,7 +4205,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4293,9 +4401,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4311,10 +4434,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4323,6 +4458,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4382,6 +4520,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4409,30 +4550,17 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
+msgid "{0} ({1} ms)"
msgstr ""
msgid ""
-"partial: different selected objects have different values, do not change"
+"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
msgstr ""
-msgid "unset: do not set this property on the selected objects"
+msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr ""
-msgid "{0} ({1} ms)"
-msgstr ""
-
-msgid ""
-"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
-msgstr ""
-
-msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
-msgstr ""
-
-msgid "Details..."
+msgid "Details..."
msgstr ""
msgid "Hide this message and never show it again"
@@ -4709,29 +4837,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4746,7 +4892,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4798,14 +4944,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5055,14 +5193,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5583,6 +5721,9 @@ msgstr "காண்பி/மறை"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5666,6 +5807,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5687,9 +5855,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5714,32 +5879,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5759,8 +5924,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5786,9 +5950,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5933,9 +6094,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6220,8 +6378,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6287,34 +6445,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6329,13 +6499,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6414,12 +6584,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6449,9 +6613,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6489,7 +6659,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr "பதிவிறக்கப்படும் உறவு {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6549,6 +6719,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6804,6 +6977,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6869,9 +7061,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6938,21 +7127,8 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr ""
+msgid "Start downloading"
+msgstr "பதிவிறக்கத்தை துவங்கு"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6962,23 +7138,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "பதிவிறக்கத்தை துவங்கு"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7075,7 +7237,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7174,6 +7336,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7261,7 +7426,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7280,6 +7445,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7346,8 +7517,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7422,8 +7592,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7437,8 +7607,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7653,12 +7822,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7667,6 +7830,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7682,6 +7861,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7689,8 +7883,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7802,9 +7996,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7814,6 +8005,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7830,7 +8024,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7976,7 +8170,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8006,7 +8200,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8122,6 +8316,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8159,6 +8356,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8355,9 +8555,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8376,6 +8573,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8433,6 +8633,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8499,9 +8705,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8514,7 +8717,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8541,12 +8747,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8675,14 +8885,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8697,7 +8903,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8707,8 +8913,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8928,7 +9133,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8994,6 +9199,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9051,9 +9262,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9300,6 +9508,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9428,6 +9639,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9470,6 +9687,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9520,19 +9740,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9550,40 +9761,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9607,6 +9827,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9663,6 +9916,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9716,6 +9972,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9997,7 +10258,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10166,6 +10433,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10229,7 +10502,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10487,21 +10760,6 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zone"
-
-msgid "North"
-msgstr ""
-
-msgid "South"
-msgstr ""
-
-msgid "Hemisphere"
-msgstr ""
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
@@ -10523,6 +10781,21 @@ msgstr ""
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zone"
+
+msgid "North"
+msgstr ""
+
+msgid "South"
+msgstr ""
+
+msgid "Hemisphere"
+msgstr ""
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -10573,8 +10846,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10583,20 +10856,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10678,14 +10956,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10729,31 +11001,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10762,6 +11039,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10777,57 +11057,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10845,6 +11127,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10874,6 +11164,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10904,7 +11237,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10944,28 +11277,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11060,6 +11391,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11075,12 +11409,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11159,7 +11501,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11258,52 +11600,28 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
+msgid "Unsupported version: {0}"
msgstr ""
-msgid "Unsupported version: {0}"
+msgid ""
+"Unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgid "Parsing changeset content ..."
msgstr ""
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr ""
-
-msgid "Parsing changeset content ..."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
msgstr ""
msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
@@ -11324,10 +11642,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11338,9 +11653,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11362,6 +11674,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11411,8 +11726,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11555,6 +11870,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11573,6 +11891,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11597,16 +11924,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11618,6 +11948,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11632,6 +11970,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11662,19 +12009,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11696,11 +12043,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11770,13 +12129,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11919,10 +12278,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11937,22 +12296,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12021,8 +12379,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12037,9 +12394,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12361,17 +12733,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12382,9 +12748,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12416,9 +12825,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12741,6 +13164,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12820,6 +13248,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12921,9 +13353,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12979,6 +13408,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13003,9 +13435,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13031,9 +13460,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13070,6 +13496,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13116,9 +13547,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13203,6 +13631,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13293,6 +13724,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13311,10 +13786,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13326,6 +13801,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13353,18 +13831,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13374,9 +13846,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13386,13 +13855,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13440,6 +13909,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13524,6 +13996,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13628,21 +14103,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13658,10 +14142,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13697,7 +14181,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13766,12 +14250,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13787,15 +14277,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13817,6 +14298,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13826,6 +14316,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13835,10 +14328,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13871,9 +14361,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13907,34 +14394,61 @@ msgstr ""
msgid "Barriers"
msgstr ""
-msgid "Bollard"
+msgid "Block"
msgstr ""
-msgid "Edit Bollard"
+msgid "Edit Block"
msgstr ""
msgid "Allowed traffic:"
msgstr ""
-msgid "Cycle Barrier"
+msgid "Material"
msgstr ""
-msgid "Block"
+msgid "stone"
msgstr ""
-msgid "Cattle Grid"
+msgid "Bollard"
msgstr ""
-msgid "Edit Cattle Grid"
+msgid "Edit Bollard"
msgstr ""
-msgid "Bus Trap"
+msgid "Bollard type"
msgstr ""
-msgid "Spikes"
+msgid "rising"
msgstr ""
-msgid "Edit Spikes"
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr ""
+
+msgid "Cycle Barrier"
+msgstr ""
+
+msgid "Edit Cycle Barrier"
+msgstr ""
+
+msgid "Cattle Grid"
+msgstr ""
+
+msgid "Edit Cattle Grid"
+msgstr ""
+
+msgid "Bus Trap"
+msgstr ""
+
+msgid "Edit Bus Trap"
+msgstr ""
+
+msgid "Spikes"
+msgstr ""
+
+msgid "Edit Spikes"
msgstr ""
msgid "Toll Booth"
@@ -13952,19 +14466,34 @@ msgstr ""
msgid "Hedge"
msgstr ""
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr ""
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -13973,22 +14502,51 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr ""
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr ""
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr ""
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
+msgctxt "Barrier"
+msgid "Edit Ditch"
msgstr ""
-msgid "Edit Entrance"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14021,12 +14579,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14084,6 +14657,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14093,6 +14669,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14132,9 +14714,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14168,6 +14747,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14249,18 +14843,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14333,7 +14932,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14357,10 +14959,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14372,9 +14977,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14417,18 +15019,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14528,11 +15168,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14544,11 +15182,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14567,10 +15203,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14600,9 +15236,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14618,19 +15251,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14780,6 +15429,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14801,6 +15453,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14828,6 +15486,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14852,22 +15516,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14889,9 +15537,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14955,7 +15600,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15086,6 +15731,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15116,6 +15764,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15128,9 +15779,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15140,9 +15788,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15155,6 +15808,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15179,14 +15835,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15235,7 +15883,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15289,41 +15937,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15509,6 +16157,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15530,9 +16184,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15545,6 +16205,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15584,6 +16247,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15605,22 +16271,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15644,9 +16322,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15671,13 +16346,22 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
msgstr ""
-msgid "Playground"
+msgid "Edit Horse riding"
msgstr ""
-msgid "Edit Playground"
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
+
+msgid "Playground"
+msgstr ""
+
+msgid "Edit Playground"
msgstr ""
msgid "Picnic Site"
@@ -15744,49 +16428,43 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
-msgstr ""
-
-msgid "Edit Place of Worship"
-msgstr ""
-
-msgid "Religion"
+msgid "Recording Studio"
msgstr ""
-msgid "bahai"
+msgid "Edit Studio"
msgstr ""
-msgid "buddhist"
+msgid "audio"
msgstr ""
-msgid "christian"
+msgid "video"
msgstr ""
-msgid "hindu"
+msgid "Place of Worship"
msgstr ""
-msgid "jain"
+msgid "Church"
msgstr ""
-msgid "jewish"
+msgid "Edit Church"
msgstr ""
-msgid "muslim"
+msgid "Building type"
msgstr ""
-msgid "sikh"
+msgid "basilica"
msgstr ""
-msgid "spiritualist"
+msgid "cathedral"
msgstr ""
-msgid "taoist"
+msgid "chapel"
msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
+msgid "temple"
msgstr ""
msgid "Denomination"
@@ -15804,6 +16482,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15816,6 +16500,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15831,37 +16518,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15951,6 +16741,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "உடல்நலம்"
@@ -15960,6 +16756,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "மருத்துவர்கள்"
@@ -16026,12 +16828,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16041,6 +16897,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16050,31 +16930,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16102,7 +16988,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16129,27 +17015,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16184,12 +17058,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16199,10 +17076,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16230,6 +17107,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16267,117 +17147,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16411,33 +17327,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16471,6 +17397,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16483,7 +17425,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16546,36 +17513,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
-msgid "advanced"
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16618,19 +17603,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16769,6 +17750,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16781,60 +17774,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
msgstr ""
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16850,9 +17917,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17062,41 +18126,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17105,7 +18195,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17117,12 +18207,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17174,88 +18354,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
msgstr ""
-msgid "battery charging"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Power Station"
+msgid "solar thermal"
msgstr ""
-msgid "Edit Power Station"
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17267,6 +18550,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17282,6 +18580,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17300,11 +18601,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17413,10 +18712,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17428,7 +18727,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17449,13 +18748,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17527,7 +18832,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17548,13 +18853,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17563,9 +18868,8 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "வீடியோ"
msgid "Edit Video Shop"
msgstr ""
@@ -17591,6 +18895,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17627,10 +18937,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17660,7 +18991,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17672,19 +19003,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17705,6 +19036,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17714,7 +19051,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17795,6 +19132,9 @@ msgstr "பொம்மைகள்"
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17924,6 +19264,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17963,24 +19309,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17990,15 +19345,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18074,6 +19420,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18128,7 +19480,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18140,6 +19492,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18215,46 +19570,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
msgstr ""
-msgid "RS"
+msgid "Street name"
msgstr ""
-msgid "US"
+msgid "City name"
+msgstr ""
+
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18275,6 +19633,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18437,27 +19807,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgid "Edit general route"
msgstr ""
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
+msgstr ""
+
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18503,19 +19902,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18539,7 +19941,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18635,18 +20037,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18656,7 +20067,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18665,10 +20079,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18686,6 +20100,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18701,28 +20118,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18743,19 +20160,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18821,9 +20238,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18833,10 +20247,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18851,9 +20268,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18881,6 +20295,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18926,10 +20343,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18941,7 +20388,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18959,7 +20406,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19076,19 +20523,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:postal_code without addr:postcode"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:ele without ele"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:ref:INSEE without ref:INSEE"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19107,13 +20665,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19122,19 +20716,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19149,142 +20752,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "செக் (Czech) CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "செக் (Czech) UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7வது வரிசை (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19300,16 +20952,16 @@ msgid "Ireland EEA CORINE 2006"
msgstr ""
msgid "Lodi - Italy"
-msgstr "லோடி - இத்தாலி"
+msgstr ""
msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "சிசிலி - இத்தாலி"
+msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - இத்தாலி"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
@@ -19323,148 +20975,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19668,6 +21383,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19689,13 +21416,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19958,9 +21679,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19982,6 +21709,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20060,9 +21790,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20147,7 +21889,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20418,15 +22160,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20597,6 +22330,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20615,12 +22351,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20756,6 +22486,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20773,6 +22506,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20853,113 +22589,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20985,7 +22735,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21035,7 +22788,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21080,6 +22833,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21152,64 +22908,111 @@ msgstr ""
msgid "Install"
msgstr ""
-msgid "Position only"
+msgid "Public"
msgstr ""
-msgid "Position, Time, Date, Speed"
+msgid "Could not get server response, check logs"
msgstr ""
-msgid "Position, Time, Date, Speed, Altitude"
+msgid "Failed to login as {0}:"
msgstr ""
-msgid "A By Time"
+msgid "The server did not return user ID"
msgstr ""
-msgid "A By Distance"
+msgid "Failed to send message:"
msgstr ""
-msgid "B By Time"
+msgid "Failed to get messages as {0}:"
msgstr ""
-msgid "B By Distance"
+msgid "GeoChat"
msgstr ""
-msgid "C By Time"
+msgid "Open GeoChat panel"
msgstr ""
-msgid "C By Distance"
+msgid "Zoom in to see messages"
msgstr ""
-msgid "Data Logging Format"
+msgid "Login"
msgstr ""
-msgid "Disable data logging if speed falls below"
+msgid "Enable autologin"
msgstr ""
-msgid "Disable data logging if distance falls below"
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
+msgid "Position only"
+msgstr ""
+
+msgid "Position, Time, Date, Speed"
+msgstr ""
+
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr ""
+
+msgid "A By Time"
+msgstr ""
+
+msgid "A By Distance"
+msgstr ""
+
+msgid "B By Time"
msgstr ""
-msgid "Unknown logFormat"
+msgid "B By Distance"
msgstr ""
-msgid "Port:"
+msgid "C By Time"
msgstr ""
-msgid "refresh the port list"
+msgid "C By Distance"
msgstr ""
-msgid "Configure"
+msgid "Data Logging Format"
msgstr ""
-msgid "Configure Device"
+msgid "Disable data logging if speed falls below"
msgstr ""
-msgid "Connection Error."
+msgid "Disable data logging if distance falls below"
msgstr ""
-msgid "configure the connected DG100"
+msgid "Unknown logFormat"
msgstr ""
-msgid "delete data after import"
+msgid "Configure Device"
msgstr ""
msgid "Importing data from device."
@@ -21607,6 +23410,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21854,12 +23660,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21869,16 +23669,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22241,9 +24038,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22298,9 +24092,32 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>எல்லா புது வழிகளுக்கும் பங்கு அடிப்படைக் கொண்ட உறவு உறுப்பினர் "
+"நிலையொன்று நகலெடுக்கப்பட்டது<br>நீங்கள் சரிப்பார்த்து, தேவைப்படும்போது "
+"திருத்த வேண்டும்</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>எல்லா புது வழிகளுக்கும் உறவு உறுப்பினர் நிலையொன்று "
+"நகலெடுக்கப்பட்டது<br>நீங்கள் சரிப்பார்த்து, தேவைப்படும்போது திருத்த "
+"வேண்டும்</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22342,25 +24159,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22497,9 +24314,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22524,12 +24338,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22678,6 +24501,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22694,6 +24520,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22927,13 +24764,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22986,18 +24816,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23055,6 +24873,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23262,9 +25083,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23344,7 +25162,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23498,6 +25334,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23519,6 +25358,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23812,9 +25654,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23883,9 +25722,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24012,9 +25848,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24036,6 +25869,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24068,15 +25904,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24086,6 +25938,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24188,9 +26043,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24306,6 +26158,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24366,19 +26221,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24516,6 +26371,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24591,6 +26449,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24606,9 +26553,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24630,6 +26574,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24782,9 +26729,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25410,7 +27354,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25418,10 +27365,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25430,18 +27374,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25484,15 +27416,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25614,18 +27537,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25803,9 +27714,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr "வீடியோ"
-
msgid "Import Video"
msgstr ""
@@ -25932,7 +27840,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25952,9 +27860,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26087,9 +27992,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 10c86a7..2aa298a 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:00+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:01+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr "JOSM గురించి..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr "సమాచారం"
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr "సంఘర్షణ"
msgid "download"
msgstr "డౌన్లోడ్"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr "సమాచారం"
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 4c9da98..e4974fe 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:01+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:02+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index 05e8db8..6f9983a 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 12:49+0000\n"
-"Last-Translator: katpatuka <email at katpatuka.org>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-11-17 07:49+0000\n"
+"Last-Translator: Erkin Alp Güney <Unknown>\n"
"Language-Team: Türkçe <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 05:01+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:02+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -27,19 +27,19 @@ msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: unrecognized option ''--{1}''"
-msgstr ""
+msgstr "{0}: ''--{1}'' seçeneği tanınmıyor"
msgid "{0}: unrecognized option ''{1}{2}''"
-msgstr ""
+msgstr "{0}: ''--{1}{2}'' seçeneği tanınmıyor"
msgid "{0}: illegal option -- {1}"
-msgstr ""
+msgstr "{0}: yasadışı seçenek -- {1}"
msgid "{0}: invalid option -- {1}"
-msgstr ""
+msgstr "{0}: geçersiz seçenek -- {1}"
msgid "{0}: option requires an argument -- {1}"
-msgstr ""
+msgstr "{0}: ''--{1}'' seçeneği argüman gerektirir"
msgid "Invalid value {0} for parameter ''has_arg''"
msgstr ""
@@ -50,6 +50,21 @@ msgstr "Arkaplanın Kullanım Şartları"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Link açma işlemi bu platformda desteklenmiyor (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "HATA: {0}"
+
+msgid "WARNING: {0}"
+msgstr "UYARI: {0}"
+
+msgid "INFO: {0}"
+msgstr "BİLGİ: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "HATA AYIKLAMA: {0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "Platform başlangıç kancası yürütülüyor."
@@ -155,19 +170,14 @@ msgid "About JOSM..."
msgstr "JOSM Hakkında..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"DİKKAT: Beklenmeyen format ya da API linki. OSM nesnesi için bilgi yada "
-"geçmiş sayfasına yönlendirme işlemi muhtemelen başarısız olacak. API linki: "
-"''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"DİKKAT: Beklenmeyen format ya da API linki. OSM kullanıcı sayfasına "
-"yönlendirme işlemi muhtemelen başarısız olacak. API linki: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -211,20 +221,23 @@ msgstr "Hedef katman yok"
msgid "Add imagery layer {0}"
msgstr "Referans görüntü katmanı ekle {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
msgid "Add layers"
-msgstr ""
+msgstr "Katman ekle"
msgid "Invalid service URL."
-msgstr ""
+msgstr "Geçersiz servis URL''si"
msgid "WMS Error"
-msgstr ""
+msgstr "WMS Hatası"
msgid "Could not retrieve WMS layer list."
-msgstr ""
+msgstr "WMS katman listesi getirilemedi."
msgid "Could not parse WMS layer list."
msgstr ""
@@ -250,9 +263,6 @@ msgstr "Araç: {0}"
msgid "Please select at least four nodes."
msgstr "En azından dört nokta seç."
-msgid "Information"
-msgstr "Bilgi"
-
msgid "Align Nodes in Line"
msgstr "Noktalar düz çizgi olarak hızala"
@@ -277,6 +287,9 @@ msgstr "çakışma"
msgid "download"
msgstr "indir"
+msgid "problem"
+msgstr "sorun"
+
msgid "previous"
msgstr "önceki"
@@ -286,6 +299,9 @@ msgstr "sonraki"
msgid "Nothing selected to zoom to."
msgstr "Yakınlaştıracak bir şey yok."
+msgid "Information"
+msgstr "Bilgi"
+
msgid "Zoom to {0}"
msgstr "{0} kadar yakınlaştır"
@@ -342,9 +358,9 @@ msgstr ""
"değiştirmek istermisiniz?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "{0} yol birleştir"
@@ -401,18 +417,37 @@ msgstr "Sil"
msgid "Delete selected objects."
msgstr "Seçili Objeleri Sil."
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Noktaları Dağıt"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Noktaları düz bir çüzgi olarak dağıt"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "OSM sitesinden indir..."
msgid "Download map data from the OSM server."
msgstr "Harita verisi OSM sunucusundan indir."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Bu hareket {0} ayrı indirme<br> isteği gerektirir. <br>Devam etmek "
+"istiyor musunuz?</html>"
+
+msgid "Download data"
+msgstr "Veriyi indir"
+
msgid "Download object..."
msgstr "Nesneyi indir..."
@@ -504,6 +539,9 @@ msgstr "Geçmiş"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "OSM yolları, nodları ve ilişkileri hakkında tarih bilgisini göster."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr "Geçmiş (web)"
@@ -624,7 +662,7 @@ msgid "Joined overlapping areas"
msgstr "Üstüste gelen alanlar birleştirildi"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -775,8 +813,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Noktaları en eskisiyle birleştir"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -932,11 +970,9 @@ msgid "Download Data"
msgstr "Veriyi İndir"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html> \"{0}\" URL açılamıyor çünkü herhangi bir uygun indirme görevi hazır "
-"değil.</html>"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -962,12 +998,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -985,9 +1017,6 @@ msgstr "Dikdörtgenleştir"
msgid "Usage"
msgstr "Kullanım"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1100,6 +1129,15 @@ msgstr "Dosyayıda yeniden isimlendir"
msgid "Could not rename file ''{0}''"
msgstr "''{0}'' dosyası yeniden adlandırılamadı"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr "Yolunun yönünü ters çevir"
@@ -1152,9 +1190,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1216,6 +1251,9 @@ msgstr "Durum Raporu"
msgid "Copy to clipboard and close"
msgstr "Panoya kopyala ve kapat"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Kapat"
@@ -1252,6 +1290,7 @@ msgstr[0] "{0} yolu basiteştir."
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
msgstr[0] "Yolu Basitleştir ({0} nokta kaldır)"
+msgstr[1] "Yolu Basitleştir ({0} nokta kaldır)"
msgid "Split Way"
msgstr "Yolları Böl"
@@ -1269,6 +1308,7 @@ msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar."
msgid "The selected node is not in the middle of any way."
msgid_plural "The selected nodes are not in the middle of any way."
msgstr[0] "Seçili kavşak herhangi bir yolun ortasında değil."
+msgstr[1] "Seçili kavşaklar herhangi bir yolun ortasında değil."
msgid ""
"There is more than one way using the node you selected. Please select the "
@@ -1290,13 +1330,13 @@ msgstr ""
"Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1391,6 +1431,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Geri AL(undo)"
@@ -1415,9 +1476,6 @@ msgstr "Veriyi güncelle"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr "Veriyi indir"
-
msgid "Update modified"
msgstr ""
@@ -1613,6 +1671,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Yavaş İleri Götür"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "GPS verisi indiriliyor"
@@ -1622,6 +1683,18 @@ msgstr "İndirilen GPX Verisi"
msgid "Markers from {0}"
msgstr "İmleçler {0}"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "OSM indir"
+
msgid "Downloading data"
msgstr "Bilgi İndiriliyor"
@@ -1641,6 +1714,30 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "İndirme sırasında çakışma"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "{1} nesneden {0} indiriliyor (kalan: {2})"
@@ -1691,24 +1788,6 @@ msgstr ""
msgid "Errors during download"
msgstr "İndirme sırasında hatalarla karşılaşıldı"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "İndirme sırasında çakışma"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr "İndirirken hata oluştu"
@@ -1854,6 +1933,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1878,8 +1960,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1895,6 +1977,9 @@ msgstr "Paralel"
msgid "Make parallel copies of ways"
msgstr "Yolunun paralel yolu oluşturuluyor"
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2311,6 +2396,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2474,13 +2562,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2489,6 +2577,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2507,8 +2598,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2593,6 +2683,9 @@ msgid "Added {0} object"
msgid_plural "Added {0} objects"
msgstr[0] "{0} nesne eklendi"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "Nokta {0} değiştir"
@@ -2629,10 +2722,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2641,6 +2734,7 @@ msgstr "\"{0}\" u, \"{1}\" bununla değiştir"
msgid "object"
msgid_plural "objects"
msgstr[0] "obje"
+msgstr[1] "objeler"
msgid "Change relation member role for {0} {1}"
msgstr ""
@@ -2654,8 +2748,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2761,6 +2855,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2821,11 +2918,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Bu yolu terslerken şu yolun özelliği ve onun sahip olduğu kavşalarında "
-"değişmesidata bütünlüğü için önerilir."
msgid "Relation"
msgstr "İlişki"
@@ -2854,11 +2949,11 @@ msgstr "Seçili değişiklikleri uygula"
msgid "Do not apply changes"
msgstr "Değişiklikleri Uygulama"
-msgid "Please select which property changes you want to apply."
-msgstr "lütfen hangi özelliğin değişimin uygulanacağını seçiniz."
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Özellikleri "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "İlişkide rolü şunu gösteriyor"
@@ -2878,6 +2973,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2908,18 +3006,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2928,8 +3026,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2937,13 +3035,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2957,8 +3053,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2988,11 +3084,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "BİLİNMEYEN"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3100,14 +3195,17 @@ msgstr ""
msgid "node"
msgid_plural "nodes"
msgstr[0] "kavşak"
+msgstr[1] "kavşaklar"
msgid "way"
msgid_plural "ways"
msgstr[0] "yol"
+msgstr[1] "yollar"
msgid "relation"
msgid_plural "relations"
msgstr[0] "ilişki"
+msgstr[1] "ilişkiler"
msgid "closedway"
msgstr ""
@@ -3142,8 +3240,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3250,7 +3347,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3269,6 +3366,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3285,9 +3385,6 @@ msgstr ""
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr "WGS84"
@@ -3328,6 +3425,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "Adresler"
@@ -3352,6 +3452,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3411,15 +3520,15 @@ msgstr " veya "
msgid "{0} is deprecated, use {1} instead"
msgstr ""
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "Çift Noktalar"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
-
msgid "Mixed type duplicated nodes"
msgstr ""
@@ -3487,6 +3596,24 @@ msgstr "Çift yol noktaları"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Yolların ardışık özdeş noktalar içermesini kontrol et."
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3556,6 +3683,12 @@ msgstr "Aynı isimli noktalar"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Bu test aynı isme sahip kavşakları kontrol eder (çift olabilirler)."
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3614,13 +3747,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3652,12 +3785,11 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr "Bu test yazım hatalarına karşı test yapar."
-msgid "Properties checker :"
-msgstr "Özellik kontol edici :"
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
-"Bu test özellik anahtarlarını ve değerlerindeki yanlışları kontrol eder."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Geçersiz etkiket kontrol satırı - {0}: {1}"
@@ -3797,8 +3929,8 @@ msgstr "Varsayılan imla dosyasını kontrol et."
msgid "Use the default spellcheck file (recommended)."
msgstr "Varsayılan imla dosyasını kontrol et (önerilen)."
-msgid "Fix properties"
-msgstr "Özellikler Düzelt"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "Eleman tipi bulunamadı"
@@ -3872,6 +4004,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr "Bu test dairesel yolların kapalı olmasını kontrol eder."
+msgid "Unclosed way"
+msgstr "Kapanmamış yollar"
+
msgid "natural type {0}"
msgstr "doğal tip {0}"
@@ -3902,9 +4037,6 @@ msgstr "yapılar"
msgid "area"
msgstr "alan"
-msgid "Unclosed way"
-msgstr "Kapanmamış yollar"
-
msgid "Unconnected ways"
msgstr ""
@@ -3931,12 +4063,12 @@ msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
"Bu test etiketsiz ve herhangi bir yola dahil olmayan noktaları kontrol eder."
-msgid "No tags"
-msgstr "Etiket yok"
-
msgid "Unconnected nodes without physical tags"
msgstr "Sahipsiz ve etiketlenmemiş noktalar"
+msgid "No tags"
+msgstr "Etiket yok"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr ""
@@ -3999,23 +4131,6 @@ msgstr "Ters çizilmiş sahil çizgisi: kara solda değil"
msgid "Reversed land: land not on left side"
msgstr "Ters çizilmiş yer: kara solda değil"
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4049,10 +4164,12 @@ msgstr "arazi kullanımı"
msgid "{0} node"
msgid_plural "{0} nodes"
msgstr[0] "{0} Kavşak"
+msgstr[1] "{0} Kavşaklar"
msgid "{0} member"
msgid_plural "{0} members"
msgstr[0] "{0} üye"
+msgstr[1] "{0} üyeler"
msgid "public transport"
msgstr ""
@@ -4117,7 +4234,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4320,9 +4437,24 @@ msgstr "Görünüm"
msgid "Tools"
msgstr "Araçlar"
+msgid "More tools"
+msgstr "Daha fazla araç"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "Seçim"
+
msgid "Presets"
msgstr "Ayarlanmış"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4338,10 +4470,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr "Ses"
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4350,6 +4494,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4409,6 +4556,9 @@ msgstr "(obje yok)"
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "tabaka listede yok."
@@ -4436,21 +4586,8 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr "yanlış: özellik kaptılmış"
-
-msgid "true: the property is explicitly switched on"
-msgstr "doğru: özellik açık"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "kısmen: farklı objeler farklı değerlere sahip, değiştirmeyin"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "atanmamış: bu özelliği seçili objeye atamayın"
-
-msgid "{0} ({1} ms)"
-msgstr ""
+msgid "{0} ({1} ms)"
+msgstr ""
msgid ""
"Aerial imagery might be misaligned. Please check its offset using GPS tracks!"
@@ -4735,29 +4872,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4772,7 +4927,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4824,14 +4979,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5037,10 +5184,12 @@ msgstr[0] "{0} etiket"
msgid "{0} way"
msgid_plural "{0} ways"
msgstr[0] "{0} Yol"
+msgstr[1] "{0} Yollar"
msgid "{0} relation"
msgid_plural "{0} relations"
msgstr[0] "{0} İlişki"
+msgstr[1] "{0} İlişkiler"
msgid "Position {0} is out of range. Current number of members is {1}."
msgstr ""
@@ -5078,14 +5227,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5606,6 +5755,9 @@ msgstr "Göster/Sakla"
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5689,6 +5841,36 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Nesne tipi:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "karma"
+
+msgid "Choose the OSM object type"
+msgstr "OSM nesne tipini seçin"
+
+msgid "Object ID:"
+msgstr "Nesne ID’si :"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "İndirilecek nesnenin ID numarasını giriniz"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"Nesne numaraları virgül yada boşluk kullanılarfak ayrılabilir.<br/> Örnek: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Karışık durumda nesneleri "
+"şu şekilde belirtin: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "İlişkiler"
@@ -5710,9 +5892,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "İlişkiler: {0}"
-msgid "Selection"
-msgstr "Seçim"
-
msgid "Open a selection list window."
msgstr "Seçim listesi penceresini aç."
@@ -5737,18 +5916,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "Seçim: {0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr ""
@@ -5765,6 +5932,18 @@ msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz."
msgid "Click to minimize/maximize the panel content"
msgstr "paneli büyütüp/küçültmek için tıklayınız"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "Yazarlar"
@@ -5782,8 +5961,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5809,9 +5987,6 @@ msgstr "Onaylama penceresini aç."
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr "Probleme Yaklaş"
-
msgid "Fix"
msgstr "Onar"
@@ -5956,9 +6131,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6243,8 +6415,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6309,35 +6481,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
-msgstr "Özellikler/Üyelikler"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "Seçili objenin özellikleri"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<farklı>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "Üyesi"
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Özellik: {0} / Üyelik: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "Özellik / Üyelik"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "Seçili anahtarı her objeden sil"
-msgid "Delete Properties"
-msgstr "Özelliği Sil"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "İlişkiyi değiştir"
@@ -6351,14 +6535,14 @@ msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
msgid "Add a new key/value pair to all objects"
msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
-msgid "Add Property"
-msgstr ""
+msgid "Add Tag"
+msgstr "Etiket Ekle"
msgid "Edit the value of the selected key for all objects"
msgstr "Seçili anahtarın değerini her obje için düzenle"
-msgid "Edit Properties"
-msgstr "Özellikleri Düzenle"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr ""
@@ -6431,22 +6615,18 @@ msgstr ""
msgid "Change properties of up to {0} object"
msgid_plural "Change properties of up to {0} objects"
msgstr[0] "Değerleri {0} obje için değiştir"
+msgstr[1] "Değerleri {0} obje için değiştir"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
msgid "This will change up to {0} object."
msgid_plural "This will change up to {0} objects."
msgstr[0] "İşlem {0} objeyi değiştirecek."
+msgstr[1] "İşlem {0} objeyi değiştirecek."
msgid "Please select a key"
msgstr "Lütfen bir anahtar seçiniz"
@@ -6469,9 +6649,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6509,7 +6695,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6569,6 +6755,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6824,6 +7013,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr "Yer İmleri"
@@ -6891,9 +7099,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr "Veri kaynakları ve türleri"
@@ -6960,21 +7165,8 @@ msgstr "Yönlendirenleri indir (üst ilişkiler)"
msgid "Download object"
msgstr "Nesneyi indir"
-msgid "Object type:"
-msgstr "Nesne tipi:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "karma"
-
-msgid "Choose the OSM object type"
-msgstr "OSM nesne tipini seçin"
-
-msgid "Object ID:"
-msgstr "Nesne ID’si :"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "İndirilecek nesnenin ID numarasını giriniz"
+msgid "Start downloading"
+msgstr "İndirmeyi başlat"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6984,26 +7176,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"Nesne numaraları virgül yada boşluk kullanılarfak ayrılabilir.<br/> Örnek: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> Karışık durumda nesneleri "
-"şu şekilde belirtin: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Yönlendirenleri indir (üst ilişkiler ve yollar)"
-msgid "Start downloading"
-msgstr "İndirmeyi başlat"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr "Sınıf Tipi"
@@ -7100,7 +7275,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7199,6 +7374,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7286,7 +7464,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7305,6 +7483,12 @@ msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "Takım ID:"
@@ -7371,8 +7555,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7447,8 +7630,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7462,8 +7645,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7678,12 +7860,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7692,6 +7868,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7707,6 +7899,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7714,8 +7921,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7827,9 +8034,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7839,6 +8043,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7855,7 +8062,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7971,10 +8178,12 @@ msgstr ""
msgid "{0} route, "
msgid_plural "{0} routes, "
msgstr[0] "{0} rut, "
+msgstr[1] "{0} rut, "
msgid "{0} waypoint"
msgid_plural "{0} waypoints"
msgstr[0] "{0} yol noktaları"
+msgstr[1] "{0} yol noktaları"
msgid "gps point"
msgstr "gps noktası"
@@ -7982,6 +8191,7 @@ msgstr "gps noktası"
msgid "{0} track, "
msgid_plural "{0} tracks, "
msgstr[0] "{0} iz, "
+msgstr[1] "{0} izler, "
msgid "Save GPX file"
msgstr "GPX olarak sakla"
@@ -7998,7 +8208,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -8028,7 +8238,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8142,6 +8352,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8180,6 +8393,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr "WMS İmi Belirle"
@@ -8385,9 +8601,6 @@ msgstr "EXIF den GPS verisi çıkartılıyor"
msgid "Starting directory scan"
msgstr "klasör arama başladı"
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr "Fotoğraflar okunuyor..."
@@ -8406,6 +8619,9 @@ msgstr "Klasörde null dosya bulundu {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Klasörden dosya alınmasında hata oluştu {0}\n"
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr "Geotagged Görüntüler"
@@ -8463,6 +8679,12 @@ msgstr "Sonraki"
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "Merkezi görünüm"
@@ -8533,9 +8755,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8548,8 +8767,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "OSM den bu izi indir"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "Bunun içindeki herşeyi indir:"
@@ -8575,15 +8797,17 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "OSM den bu izi indir"
+
+msgid "Calculating Download Area"
msgstr ""
-"<html>Bu hareket {0} ayrı indirme<br> isteği gerektirir. <br>Devam etmek "
-"istiyor musunuz?</html>"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -8656,10 +8880,12 @@ msgstr "gps imleçi"
msgid "marker"
msgid_plural "markers"
msgstr[0] "imleç"
+msgstr[1] "imleçler"
msgid "{0} consists of {1} marker"
msgid_plural "{0} consists of {1} markers"
msgstr[0] "{0} {1} imleçten oluşur"
+msgstr[1] "{0} {1} imleçten oluşur"
msgid "No existing audio markers in this layer to offset from."
msgstr "Sesi işaretleyecek herhangi bir nesne yok."
@@ -8712,14 +8938,10 @@ msgstr "Bu imleç için tanımlanan link gösterilemedi."
msgid "(URL was: "
msgstr "(URL : "
-msgid "Error displaying URL"
-msgstr "Linkin gösterilmesinde hata"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8734,7 +8956,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8744,8 +8966,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8969,7 +9190,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -9035,6 +9256,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9092,9 +9319,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9345,7 +9569,10 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız."
-msgid "Remote Control"
+msgid "Would you like to restart now?"
+msgstr ""
+
+msgid "Remote Control"
msgstr "Uzak Kontrol"
msgid "Settings for the remote control feature."
@@ -9473,6 +9700,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr "Kısayol düzenle"
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9515,6 +9748,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "Veri Onaylama"
@@ -9566,19 +9802,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9596,40 +9823,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
+msgstr "kısayol"
+
+msgid "color"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "toolbar"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "imagery"
msgstr ""
-msgid "Select Setting Type:"
+msgid "Reset preferences"
msgstr ""
-msgid "Simple"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List"
+msgid "Load profile"
msgstr ""
-msgid "List of lists"
+msgid "Save {0} profile"
msgstr ""
-msgid "List of maps"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Add setting"
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9653,6 +9889,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9709,6 +9978,9 @@ msgstr "Seçim modunda sanal kavşakları çiziniz"
msgid "Draw inactive layers in other color"
msgstr "Pasif katmanları farklı renkte çiz"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9762,6 +10034,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -10046,7 +10323,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10215,6 +10498,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10278,8 +10567,8 @@ msgstr "Harita Ayarları"
msgid "Settings for the map projection and data interpretation."
msgstr "Harita Projeksiyonu ve İnterpolasyon Ayarları."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgid "Could not read tagging preset source: {0}"
+msgstr "Etiketteki özellikler okunamadı: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10536,21 +10825,6 @@ msgstr "Swiss Grid (İsviçre)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM Zone"
-
-msgid "North"
-msgstr "Kuzey"
-
-msgid "South"
-msgstr "Güney"
-
-msgid "Hemisphere"
-msgstr "Yarımküre"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -10572,6 +10846,21 @@ msgstr "UTM Fransa (DOM)"
msgid "UTM Geodesic system"
msgstr ""
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM Zone"
+
+msgid "North"
+msgstr "Kuzey"
+
+msgid "South"
+msgstr "Güney"
+
+msgid "Hemisphere"
+msgstr "Yarımküre"
+
msgid "Testing OSM API URL ''{0}''"
msgstr ""
@@ -10622,8 +10911,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10632,20 +10921,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10727,16 +11021,10 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-msgid "disabled"
-msgstr "seçilemez"
-
-msgid "no modifier"
-msgstr "Belirteç yok"
-
msgid "Shortcut Background: User"
msgstr ""
@@ -10753,7 +11041,7 @@ msgid "Attention: Use real keyboard keys only!"
msgstr "Dikkat: Gerçek Klavye tuşları kullanının!"
msgid "Keyboard Shortcuts"
-msgstr "klavye kısayolları"
+msgstr "Klavye Kısayolları"
msgid "Changing keyboard shortcuts manually."
msgstr "Klavye kısayollarını elle değiştir."
@@ -10778,31 +11066,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "''{1}'' gurubu için ''{0}'' kullan"
+
+msgid "Use preset ''{0}''"
+msgstr "''{0}'' ı kullan"
+
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid "{0}:"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "{0} Objeyi Değiştir"
+msgstr[1] "{0} Objeyi Değiştir"
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Selection unsuitable!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Apply Preset"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "New relation"
msgstr ""
-msgid "More information about this feature"
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10811,6 +11104,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10826,58 +11122,61 @@ msgstr ""
msgid "Optional Attributes:"
msgstr "Seçilebilen Özellikler:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "''{1}'' gurubu için ''{0}'' kullan"
-
-msgid "Use preset ''{0}''"
-msgstr "''{0}'' ı kullan"
-
-msgid "Unknown type: {0}"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Preset role element without parent"
+msgid "{0}:"
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "Etiketteki özellikler okunamadı: {0}"
-
-msgid "Error parsing {0}: "
-msgstr "İşleme Hatası {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "{0} Objeyi Değiştir"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
-msgid "Nothing selected!"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "New relation"
+msgid "Preset group {0}"
msgstr ""
-msgid "Change Properties"
-msgstr "Özellikleri Değiştir"
+msgid "Roles cannot appear more than once"
+msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Preset sub element without parent"
msgstr ""
+msgid "Error parsing {0}: "
+msgstr "İşleme Hatası {0}: "
+
msgid "Search preset"
msgstr "Ön tanımlarında ara"
@@ -10893,6 +11192,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10922,41 +11229,84 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr "yanlış: özellik kaptılmış"
-msgid "Deleted node {0} is part of way {1}"
-msgstr ""
+msgid "true: the property is explicitly switched on"
+msgstr "doğru: özellik açık"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
-msgstr ""
+"partial: different selected objects have different values, do not change"
+msgstr "kısmen: farklı objeler farklı değerlere sahip, değiştirmeyin"
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
-msgstr ""
+msgid "unset: do not set this property on the selected objects"
+msgstr "atanmamış: bu özelliği seçili objeye atamayın"
-msgid "Deleted member {0} is used by relation {1}"
+msgid "Cut"
msgstr ""
-msgid "All Formats"
-msgstr "Tüm dosya biçimleri"
+msgid "Right click = copy to clipboard"
+msgstr ""
-msgid "Downloading points {0} to {1}..."
-msgstr "{0} ve {1} arası bilgiler indiriliyor"
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
-msgid "Contacting OSM Server..."
-msgstr "OSM Server’ına Bağlanıyor..."
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}''"
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
msgstr ""
-msgid "Failed to parse date ''{0}'' replied by server."
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr ""
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+
+msgid "Deleted member {0} is used by relation {1}"
+msgstr ""
+
+msgid "All Formats"
+msgstr "Tüm dosya biçimleri"
+
+msgid "Downloading points {0} to {1}..."
+msgstr "{0} ve {1} arası bilgiler indiriliyor"
+
+msgid "Contacting OSM Server..."
+msgstr "OSM Server’ına Bağlanıyor..."
+
+msgid ""
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}''"
+msgstr ""
+
+msgid "Failed to parse date ''{0}'' replied by server."
msgstr ""
msgid ""
@@ -10992,28 +11342,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11112,6 +11460,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11127,12 +11478,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11211,8 +11570,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "NMEA içeri alınması başarılı"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA içeri alınmasında hata!"
@@ -11310,35 +11669,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11348,8 +11683,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11376,10 +11711,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11390,9 +11722,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11414,6 +11743,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11463,8 +11795,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11609,6 +11941,9 @@ msgstr "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11627,6 +11962,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11651,16 +11995,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11672,6 +12019,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11686,6 +12041,15 @@ msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:"
msgid "Remote Control has been asked to load data from the API."
msgstr "API tarafından uzaktan kontrol veri yüklemesi soruldu."
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11716,19 +12080,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11750,11 +12114,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11824,13 +12200,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11973,10 +12349,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11991,22 +12367,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12078,8 +12453,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12094,9 +12468,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12418,17 +12807,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12439,9 +12822,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12473,9 +12899,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
msgstr ""
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12802,6 +13242,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12881,6 +13326,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12982,9 +13431,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -13040,6 +13486,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13064,9 +13513,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13092,9 +13538,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13131,6 +13574,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13177,9 +13625,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr "Sokaklar"
@@ -13264,6 +13709,9 @@ msgstr "toprak set"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "ücret"
+
msgid "Motorway Link"
msgstr "Araç yolu hattı"
@@ -13354,6 +13802,50 @@ msgstr "yerleşim alanı"
msgid "Edit Residential Street"
msgstr "yerleşim sokağını düzenle"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "Otoyol tipi"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "Evet"
+
+msgid "no"
+msgstr "hayır"
+
+msgid "destination"
+msgstr "varış"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "Canlı Sokak"
@@ -13372,10 +13864,10 @@ msgstr "Alan"
msgid "Service"
msgstr "Servis"
-msgid "Edit Serviceway"
-msgstr "Servis yolu düzenle"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13387,6 +13879,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "Park alanı"
@@ -13414,18 +13909,12 @@ msgstr "döner kavşak"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "Evet"
-
msgid "Road Restrictions"
msgstr "Yol kısıtlamaları"
msgid "Edit Road Restrictions"
msgstr "Yol kısıtlamalarını düzenle"
-msgid "Toll"
-msgstr "ücret"
-
msgid "No exit (cul-de-sac)"
msgstr "Çıkış Yok"
@@ -13435,9 +13924,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr "varış"
-
msgid "delivery"
msgstr ""
@@ -13447,15 +13933,15 @@ msgstr "ihtiyari"
msgid "private"
msgstr "özel"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "tarımsal"
msgid "forestry"
msgstr ""
-msgid "no"
-msgstr "hayır"
-
msgid "official"
msgstr ""
@@ -13501,6 +13987,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "Toplu taşıma araçları"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "Min. Hız (km/h)"
@@ -13585,6 +14074,9 @@ msgstr "Köprü Düzenle"
msgid "viaduct"
msgstr "viyadük"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13689,21 +14181,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13719,10 +14220,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr "At yolu düzenle"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13758,7 +14259,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13827,12 +14328,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
-msgstr "Acil durum telefonu"
+msgid "Drinking Water"
+msgstr "İçme Suyu"
msgid "Traffic Signal"
msgstr "Trafik ışıkları"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13848,15 +14355,6 @@ msgstr "ada"
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13878,6 +14376,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "Dur"
@@ -13887,6 +14394,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13896,10 +14406,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13932,9 +14439,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr "Dönme Daire"
@@ -13968,20 +14472,44 @@ msgstr ""
msgid "Barriers"
msgstr "Bariyer"
+msgid "Block"
+msgstr "Blok"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "İzin verilen trafik:"
+
+msgid "Material"
+msgstr "Malzeme"
+
+msgid "stone"
+msgstr "taş"
+
msgid "Bollard"
msgstr "direk-iskele"
msgid "Edit Bollard"
msgstr "direk-iskele düzenle"
-msgid "Allowed traffic:"
-msgstr "İzin verilen trafik:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "plastik"
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
-msgstr "Blok"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "Hayvan Kapısı"
@@ -13992,6 +14520,9 @@ msgstr "Hayvan Kapısı Düzenle"
msgid "Bus Trap"
msgstr "otobüs geçidi"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "Spikes"
@@ -14013,19 +14544,34 @@ msgstr "Sınır kontrol noktası düzenle"
msgid "Hedge"
msgstr "Çalı Çit"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr ""
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "Çit"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14034,23 +14580,52 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "Duvar"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "Şehir Duvarı"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "istinat duvarı"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr ""
-msgid "Entrance"
-msgstr "Giriş"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "Giriş düzenle"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "Geçit"
@@ -14082,12 +14657,27 @@ msgstr "geçit"
msgid "Edit Kissing Gate"
msgstr "geçit düzenle"
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "Stil"
msgid "Edit Stile"
msgstr "Stil düzenle"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14145,6 +14735,9 @@ msgstr "kanalizasyon"
msgid "Edit Drain"
msgstr "kanalizasyon düzenle"
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14154,6 +14747,12 @@ msgstr "dere"
msgid "Edit Stream"
msgstr "dere düzenle"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "Kanal"
@@ -14193,9 +14792,6 @@ msgstr "Baraj düzenle"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14229,6 +14825,21 @@ msgstr "Kapalı Sarnıç Düzenle"
msgid "Edit Water"
msgstr "Su Düzenle"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "Kara"
@@ -14310,18 +14921,23 @@ msgstr "Feribot Terminal düzenle"
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "bisiklet"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14394,7 +15010,10 @@ msgstr "askeri"
msgid "tourism"
msgstr "turizm"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14418,10 +15037,13 @@ msgstr ""
msgid "rail"
msgstr "demiryolu"
-msgid "Voltage"
-msgstr "Voltaj"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14433,9 +15055,6 @@ msgstr "Dar geçiş demiryolu"
msgid "Edit Narrow Gauge Rail"
msgstr "Dar geçiş demiryolu düzenle"
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr "tek ray"
@@ -14478,18 +15097,56 @@ msgstr "Kullanılmayan Demiryolu"
msgid "Edit Disused Railway"
msgstr "Kullanılmayan Demiryolu Düzenle"
-msgid "Optional Types"
-msgstr "seçmeli tipler"
-
msgid "Abandoned Rail"
msgstr "Terkedilmiş demiryolu düzenle"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "hemzemin geçit"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "geçit"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14589,11 +15246,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14605,11 +15260,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14628,12 +15281,12 @@ msgstr "yüzey"
msgid "underground"
msgstr "yer altı"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "Erişim"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14661,9 +15314,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "kapasite"
@@ -14679,19 +15329,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr "Açılış saati"
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "Su 10:00+"
+msgstr ""
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14841,6 +15507,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr "Voltaj"
+
msgid "Amperage"
msgstr ""
@@ -14862,6 +15531,12 @@ msgstr "tamirci"
msgid "Edit Car Repair"
msgstr "tamirci düzenle"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14889,6 +15564,12 @@ msgstr "araç kiralam"
msgid "Edit Car Rental"
msgstr "araç kiralam düzenle"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "Paylaşım Alanı"
@@ -14913,22 +15594,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14950,9 +15615,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "Kıyafet"
@@ -15016,7 +15678,7 @@ msgstr "bisiklet kiralama düzenle"
msgid "Public Transport"
msgstr "Toplu taşıma"
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15147,6 +15809,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15177,6 +15842,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "banket"
@@ -15189,9 +15857,6 @@ msgstr "tekerlekli sandalye"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15201,12 +15866,17 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
-msgid "Building"
-msgstr "Bina"
-
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
+msgid "Building"
+msgstr "Bina"
+
msgid "Subway Entrance"
msgstr "Metro Girişi"
@@ -15216,6 +15886,9 @@ msgstr "Metro Girişi Düzenle"
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15240,14 +15913,6 @@ msgstr "hesap veya üyelik kartı"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr "UIC-Referans"
@@ -15296,8 +15961,8 @@ msgstr "otobüs platformu düzenle"
msgid "Taxi"
msgstr "Taksi"
-msgid "Edit Taxi station"
-msgstr "taksi istasyonu düzenle"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "Havaalanı"
@@ -15350,6 +16015,21 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
+msgid "Internet access"
+msgstr ""
+
+msgid "wlan"
+msgstr ""
+
+msgid "wired"
+msgstr ""
+
+msgid "terminal"
+msgstr "terminal"
+
+msgid "Internet access fee"
+msgstr ""
+
msgctxt "airport"
msgid "Gate"
msgstr ""
@@ -15372,21 +16052,6 @@ msgstr "Hotel Düzenle"
msgid "Stars"
msgstr "Stars"
-msgid "Internet access"
-msgstr ""
-
-msgid "wlan"
-msgstr ""
-
-msgid "wired"
-msgstr ""
-
-msgid "terminal"
-msgstr "terminal"
-
-msgid "Internet access fee"
-msgstr ""
-
msgid "Smoking"
msgstr ""
@@ -15570,6 +16235,12 @@ msgstr "GeceKlubu"
msgid "Edit Nightclub"
msgstr "GeceKulubu Düzenle"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "Turizm"
@@ -15591,9 +16262,15 @@ msgstr "Seyir Kulesi"
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "Harita"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15606,6 +16283,9 @@ msgstr "sokak"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15645,6 +16325,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15666,22 +16349,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15705,9 +16400,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15732,7 +16424,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15805,50 +16506,44 @@ msgstr "Sanatsal"
msgid "Edit Artwork"
msgstr "Sanatsal Düzenle"
-msgid "Place of Worship"
-msgstr "Tapınak"
-
-msgid "Edit Place of Worship"
-msgstr "Tapınak Düzenle"
-
-msgid "Religion"
-msgstr "Din"
+msgid "Recording Studio"
+msgstr ""
-msgid "bahai"
-msgstr "bahai"
+msgid "Edit Studio"
+msgstr ""
-msgid "buddhist"
-msgstr "budist"
+msgid "audio"
+msgstr ""
-msgid "christian"
-msgstr "hristiyan"
+msgid "video"
+msgstr ""
-msgid "hindu"
-msgstr "hindu"
+msgid "Place of Worship"
+msgstr "Tapınak"
-msgid "jain"
-msgstr "jain"
+msgid "Church"
+msgstr "klise"
-msgid "jewish"
-msgstr "yahudi"
+msgid "Edit Church"
+msgstr ""
-msgid "muslim"
-msgstr "müslüman"
+msgid "Building type"
+msgstr ""
-msgid "sikh"
-msgstr "sikh"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "spiritualist"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "taoist"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
+msgid "church"
msgstr ""
-msgid "zoroastrian"
-msgstr "Zerdüştlük"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "mezhep"
@@ -15865,6 +16560,12 @@ msgstr "katholik"
msgid "evangelical"
msgstr "protestan"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "yahova_şahitleri"
@@ -15877,6 +16578,9 @@ msgstr "methodist"
msgid "mormon"
msgstr "mormon"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "orthodox"
@@ -15892,39 +16596,142 @@ msgstr "protestant"
msgid "quaker"
msgstr "quaker"
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "shia"
msgid "sunni"
msgstr "sunni"
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "Din"
+
+msgid "bahai"
+msgstr "bahai"
+
+msgid "jain"
+msgstr "jain"
+
+msgid "sikh"
+msgstr "sikh"
+
+msgid "spiritualist"
+msgstr "spiritualist"
+
+msgid "taoist"
+msgstr "taoist"
+
+msgid "unitarian"
msgstr ""
+msgid "zoroastrian"
+msgstr "Zerdüştlük"
+
msgid "Public Building"
msgstr "Kamu Binası"
@@ -16012,6 +16819,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "Sağlık"
@@ -16021,6 +16834,12 @@ msgstr "Hastane"
msgid "Edit Hospital"
msgstr "Hastane Düzenle"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "Doktor"
@@ -16087,68 +16906,152 @@ msgstr "Veteriner"
msgid "Edit Veterinary"
msgstr "Veteriner Düzenle"
-msgid "Note"
-msgstr "Not"
-
-msgid "Post Box"
-msgstr "Posta Kutusu"
+msgid "Edit Toilets"
+msgstr ""
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Access rights"
+msgstr ""
-msgid "Edit Telephone"
-msgstr "Telefon Düzenle"
+msgid "public"
+msgstr ""
-msgid "Telephone cards"
-msgstr "Telefon kart"
+msgid "seasonal"
+msgstr ""
-msgid "Clock"
+msgid "flush"
msgstr ""
-msgid "Edit Clock"
+msgid "pitlatrine"
msgstr ""
-msgid "Display"
+msgid "chemical"
msgstr ""
-msgctxt "display"
-msgid "analog"
+msgid "bucket"
msgstr ""
-msgctxt "display"
-msgid "digital"
+msgid "Usage Position"
msgstr ""
-msgctxt "display"
-msgid "sundial"
+msgid "seated"
msgstr ""
-msgctxt "display"
-msgid "unorthodox"
+msgid "seated;urinal"
msgstr ""
-msgid "Support"
+msgid "squat"
msgstr ""
-msgid "wall_mounted"
+msgid "urinal"
msgstr ""
-msgid "billboard"
+msgid "Post Box"
+msgstr "Posta Kutusu"
+
+msgid "Edit Postbox"
msgstr ""
-msgid "Visibility/readability"
+msgid "Collection times"
msgstr ""
-msgid "house (up to 5m)"
+msgid "11:30"
msgstr ""
-msgid "street (up to 20m)"
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
msgstr ""
-msgid "area (more than 20m)"
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
msgstr ""
-msgid "Shows current date"
+msgid "Drive through"
+msgstr ""
+
+msgid "Telephone"
+msgstr "Telefon"
+
+msgid "Edit Telephone"
+msgstr "Telefon Düzenle"
+
+msgid "Telephone cards"
+msgstr "Telefon kart"
+
+msgid "Emergency Phone"
+msgstr "Acil durum telefonu"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
+msgid "Clock"
+msgstr ""
+
+msgid "Edit Clock"
+msgstr ""
+
+msgid "Display"
+msgstr ""
+
+msgid "analog"
+msgstr ""
+
+msgid "digital"
+msgstr ""
+
+msgid "sundial"
+msgstr ""
+
+msgid "unorthodox"
+msgstr ""
+
+msgid "Support"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "wall_mounted"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "billboard"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
+msgid "Visibility/readability"
+msgstr ""
+
+msgid "house (up to 5m)"
+msgstr ""
+
+msgid "street (up to 20m)"
+msgstr ""
+
+msgid "area (more than 20m)"
+msgstr ""
+
+msgid "Shows current date"
msgstr ""
msgid "Shows temperature"
@@ -16163,8 +17066,8 @@ msgstr ""
msgid "Recycling"
msgstr "Geri Dönüşüm"
-msgid "Edit Recycling station"
-msgstr "Geri Dönüşüm İstasyonu"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "Piller"
@@ -16190,27 +17093,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr "Malzeme"
-
-msgid "stone"
-msgstr "taş"
-
-msgid "plastic"
-msgstr "plastik"
-
msgid "Amount of Seats"
msgstr ""
@@ -16245,14 +17136,17 @@ msgstr "Av Standı Düzenle"
msgid "Height"
msgstr "Yükseklik"
+msgctxt "height"
msgid "low"
-msgstr "alçak"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "yarım"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "tam"
+msgstr ""
msgid "Hide"
msgstr "Sakla"
@@ -16260,11 +17154,11 @@ msgstr "Sakla"
msgid "Lock"
msgstr "Kilitle"
-msgid "Drinking Water"
-msgstr "İçme Suyu"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "İçme Suyu Düzenle"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr ""
@@ -16291,6 +17185,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16328,119 +17225,155 @@ msgstr "Stadyum"
msgid "Edit Stadium"
msgstr "Stadyum Düzenle"
-msgid "select sport:"
-msgstr "Spor Seç"
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
-msgstr "spor"
+msgid "Sport"
+msgstr "Spor"
+msgctxt "sport"
msgid "multi"
-msgstr "çoğul"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "okçuluk"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "atletik"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "avustralya_footbol"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "basebol"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "basketbol"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "bowling"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "çimen bowling"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "kano"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "tırmanma"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "kriket"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "cricket nets"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "croquet"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "bisiklet"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "köpek yarışı"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "at binicilik"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "golf"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "jimnastik"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "hokey"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "at_yarışı"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "motor"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "pelota"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
-msgstr "raket"
+msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "atıcılık"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "kaykay"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "paten"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "kaymak"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "futbol"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "yüzmek"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "masa_tenisi"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "tenis"
+msgstr ""
msgid "Sports Centre"
msgstr "spor merkezi"
@@ -16472,26 +17405,27 @@ msgstr "Minyatür Golf"
msgid "Edit Miniature Golf"
msgstr "Minyatür Golf Düzenle"
-msgid "Sport"
-msgstr "Spor"
-
msgid "Multi"
msgstr "Çoğul"
msgid "Edit Multi"
msgstr "Çoğul Düzenle"
-msgid "type"
-msgstr "tip"
-
+msgctxt "running"
msgid "pitch"
-msgstr "atıcılık"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "spor_merkezi"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "stadyum"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16499,6 +17433,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr "atıcılık"
+
+msgid "sports_centre"
+msgstr "spor_merkezi"
+
+msgid "stadium"
+msgstr "stadyum"
+
msgid "10pin"
msgstr "10pin"
@@ -16532,6 +17475,22 @@ msgstr "Kano Düzenle"
msgid "Edit Cycling"
msgstr "Bisiklet Düzenle"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "Köpek Yarışı"
@@ -16544,8 +17503,33 @@ msgstr "binicilik"
msgid "Edit Equestrian"
msgstr "binicilik düzenle"
-msgid "horse_riding"
-msgstr "Ata binme"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "çamur"
msgid "Horse Racing"
msgstr "At Yarışı"
@@ -16563,7 +17547,7 @@ msgid "Skating"
msgstr "patinaj"
msgid "Edit Skating"
-msgstr "patinaj düzenle"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16607,36 +17591,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16679,19 +17681,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16830,6 +17828,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16842,60 +17852,134 @@ msgstr "İnsan Yapımı"
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "Giriş"
+
+msgid "Edit Entrance"
+msgstr "Giriş düzenle"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "Kule"
@@ -16911,9 +17995,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17123,41 +18204,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17166,8 +18273,8 @@ msgstr "Poligon Noktası"
msgid "Edit Survey Point"
msgstr "Poligon Noktası Düzenle"
-msgid "Surveillance"
-msgstr "Gözetim"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Gözetim Kamera Düzenle"
@@ -17178,12 +18285,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "alışveriş"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr "Güç Jeneratorü"
@@ -17235,89 +18432,192 @@ msgstr "rüzgar"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "güneş enerjisi"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
-msgstr "Güç İstasyonu"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "Güç İstasyonu Düzenle"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "Alt Güç İstasyonu"
@@ -17328,6 +18628,21 @@ msgstr "Alt Güç İstasyonu Düzenle"
msgid "Line reference"
msgstr "çizgi referansı"
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "alçak"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17343,6 +18658,9 @@ msgstr "güç Kulesi Düzenle"
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17361,11 +18679,9 @@ msgstr "Güç Hattı Düzenle"
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17474,11 +18790,11 @@ msgstr "Kiosk"
msgid "Edit Kiosk"
msgstr "Kiosk Düzenle"
-msgid "Baker"
-msgstr "fırın"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "fırın düzenle"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "kasap"
@@ -17489,7 +18805,7 @@ msgstr "kasap düzenle"
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17510,13 +18826,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17588,7 +18910,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17609,13 +18931,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17624,7 +18946,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17652,6 +18973,12 @@ msgstr "Döviz Bürosu Düzenle"
msgid "Edit Automated Teller Machine"
msgstr "ATM Düzenle"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17688,10 +19015,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "budist"
+
+msgid "christian"
+msgstr "hristiyan"
+
+msgid "hindu"
+msgstr "hindu"
+
+msgid "jewish"
+msgstr "yahudi"
+
+msgid "muslim"
+msgstr "müslüman"
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17721,7 +19069,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17733,19 +19081,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17766,6 +19114,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17775,7 +19129,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17856,6 +19210,9 @@ msgstr "oyuncuklar"
msgid "vouchers"
msgstr "bilet"
+msgid "Note"
+msgstr "Not"
+
msgid "Geography"
msgstr ""
@@ -17985,6 +19342,12 @@ msgstr "Zirve"
msgid "Edit Peak"
msgstr "Zirve Düzenle"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "Buzul"
@@ -18024,26 +19387,35 @@ msgstr "Ağaç"
msgid "Edit Tree"
msgstr "Ağaç Düzenle"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "Botannik İsim"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "Orman"
msgid "Edit Wood"
msgstr "Orman Düzenle"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "Kozalaklı Orman"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "yaprak düken orman"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "karışık"
msgid "Forest"
msgstr "orman"
@@ -18051,17 +19423,8 @@ msgstr "orman"
msgid "Edit Forest Landuse"
msgstr "orman kullanımı düzenle"
-msgid "coniferous"
-msgstr "Kozalaklı Orman"
-
-msgid "deciduous"
-msgstr "yaprak düken orman"
-
-msgid "mixed"
-msgstr "karışık"
-
-msgid "Grassland"
-msgstr ""
+msgid "Grassland"
+msgstr ""
msgid "Edit Grassland"
msgstr ""
@@ -18135,6 +19498,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "Bağ"
@@ -18189,8 +19558,8 @@ msgstr "oyun alanı"
msgid "Edit Recreation Ground Landuse"
msgstr "oyun alanı kullanımı düzenle"
-msgid "Residential area"
-msgstr "Yerleşim Alanı"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "Yerleşim Alanı Kullanımı Düzenle"
@@ -18201,6 +19570,9 @@ msgstr "Mezarlık"
msgid "Edit Graveyard"
msgstr "Mezarlık Düzenle"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "Mezarlık"
@@ -18276,6 +19648,33 @@ msgstr "taşocağı Düzenle"
msgid "Annotation"
msgstr ""
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "Adres Bilgileri Düzenle"
@@ -18294,30 +19693,6 @@ msgstr "Şehir adı"
msgid "Country code"
msgstr "Ülke kodu"
-msgid "AT"
-msgstr ""
-
-msgid "CH"
-msgstr ""
-
-msgid "DE"
-msgstr ""
-
-msgid "FR"
-msgstr ""
-
-msgid "GB"
-msgstr ""
-
-msgid "IT"
-msgstr ""
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr ""
-
msgid "Address Interpolation"
msgstr "Adres İnterpolasyon"
@@ -18336,6 +19711,18 @@ msgstr "çift"
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr "Doğruluk"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18498,27 +19885,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "ayak"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18564,19 +19980,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18600,7 +20019,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18696,18 +20115,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "köprü"
msgid "deprecated"
msgstr "kırılmış"
+msgid "bicycle"
+msgstr "bisiklet"
+
+msgid "foot"
+msgstr "ayak"
+
msgid "horse"
msgstr "at"
@@ -18717,8 +20145,11 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
-msgstr "araçyolu_hattı"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr ""
@@ -18726,10 +20157,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18747,6 +20178,9 @@ msgstr ""
msgid "railwaypoint"
msgstr "demiryolu_noktası"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18762,29 +20196,29 @@ msgstr "eski_demiryolu"
msgid "aeroway"
msgstr "havayolu"
-msgid "aeroway_dark"
-msgstr "havayolu_ağır"
+msgid "aeroway.dark"
+msgstr ""
-msgid "aeroway_light"
-msgstr "hafif_hafif"
+msgid "aeroway.light"
+msgstr ""
-msgid "piste_easy"
-msgstr "basit_meydan"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "orta_meydan"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "büyük_meydan"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
-msgstr "acemiKullanıcı_meydanı"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "acemiKullanıcı_meydanı"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "güç"
@@ -18804,20 +20238,20 @@ msgstr ""
msgid "amenity"
msgstr "dinlenme_yeri"
-msgid "amenity_traffic"
-msgstr "tail_trafiği"
+msgid "amenity.traffic"
+msgstr ""
-msgid "amenity_light"
-msgstr "eski_sokak_lambası"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "su_lambası"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "sağlık"
-msgid "shop"
-msgstr "alışveriş"
+msgid "office"
+msgstr ""
msgid "hotel"
msgstr "hotel"
@@ -18882,9 +20316,6 @@ msgstr "çalılık"
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr "çamur"
-
msgid "beach"
msgstr "sahil"
@@ -18894,10 +20325,13 @@ msgstr "rut"
msgid "boundary"
msgstr "sınırlar"
+msgid "sport"
+msgstr "spor"
+
msgid "place"
msgstr "yer"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18912,9 +20346,6 @@ msgstr "Köy/Şehir"
msgid "One Way"
msgstr "tek Yol"
-msgid "Church"
-msgstr "klise"
-
msgid "Fuel Station"
msgstr "Benzin İstasyonu"
@@ -18942,6 +20373,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18987,10 +20421,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19002,7 +20466,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19020,7 +20484,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19137,19 +20601,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "width without physical linear feature"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19168,13 +20743,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19183,19 +20794,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19210,142 +20830,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19367,7 +21036,7 @@ msgid "Lombardia - Italy (CTR)"
msgstr ""
msgid "Sicily - Italy"
-msgstr "Sicilya - İtalya"
+msgstr ""
msgid "PCN 2006 - Italy"
msgstr ""
@@ -19384,150 +21053,213 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Catastro Spain"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "PNOA Spain"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "OSM Export"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "SUMO Export"
msgstr ""
-msgid "2u"
+msgid "Export"
msgstr ""
+msgid "Port:"
+msgstr "Port:"
+
+msgid "refresh the port list"
+msgstr "port listesini güncelle"
+
+msgid "Configure"
+msgstr "konfigüre"
+
+msgid "Connection Error."
+msgstr "Bağlantı Hatası."
+
+msgid "configure the connected DG100"
+msgstr "Bağlı DG100 ü ayarla"
+
+msgid "delete data after import"
+msgstr "verinin içeri alınmasından sonra sil"
+
msgid "Columbus V-900 CSV Files"
msgstr ""
@@ -19729,6 +21461,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19750,13 +21494,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -20019,9 +21757,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -20043,6 +21787,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Katman Özellikleri"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20121,9 +21868,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20208,7 +21967,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20479,15 +22238,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20658,6 +22408,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20676,12 +22429,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20817,6 +22564,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20834,6 +22584,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20914,113 +22667,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -21046,7 +22813,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21096,7 +22866,7 @@ msgstr "Seçili şemayı sil."
msgid "Color Schemes"
msgstr "Renk Şeması"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21141,6 +22911,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21207,10 +22980,75 @@ msgstr ""
msgid "Are you sure?"
msgstr "Emin misiniz?"
-msgid "New tool..."
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21252,27 +23090,9 @@ msgstr "Mesafe bu değerin altına düşerşe veri loglamayı kapat"
msgid "Unknown logFormat"
msgstr "Bilinmeyen logFormat"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "refresh the port list"
-msgstr "port listesini güncelle"
-
-msgid "Configure"
-msgstr "konfigüre"
-
msgid "Configure Device"
msgstr "Aracı Konfigüre et"
-msgid "Connection Error."
-msgstr "Bağlantı Hatası."
-
-msgid "configure the connected DG100"
-msgstr "Bağlı DG100 ü ayarla"
-
-msgid "delete data after import"
-msgstr "verinin içeri alınmasından sonra sil"
-
msgid "Importing data from device."
msgstr "Aletten veri alınıyor."
@@ -21670,6 +23490,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21917,12 +23740,6 @@ msgstr "İçeri alınan görüntüler"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Görüntü Dosyaları (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "ImageWayPoint ile görüntüleri aç"
-
-msgid "Load set of images as a new layer."
-msgstr "Görüntü kümesini yeni bir tabaka olarak kaydet."
-
msgid "Import vector graphics"
msgstr ""
@@ -21932,16 +23749,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22314,9 +24128,6 @@ msgstr "Otomatik-Merkezleme"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Devamlı olarak canlı GPS tabakasını görüntünün ortasına getir"
-msgid "LiveGPS"
-msgstr "Canlı GPS"
-
msgid "Open MapDust"
msgstr ""
@@ -22371,9 +24182,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22415,25 +24243,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22570,9 +24398,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22597,12 +24422,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22751,6 +24585,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22767,6 +24604,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23002,13 +24850,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Hata Oluştu: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Yeni hata oluşturulamadı. Sonuç: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr "Başlık çeşitli değerler taşır ve bir metine atanamaz."
-
msgid "Process queue"
msgstr ""
@@ -23061,18 +24902,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr "Yeni konu"
-
-msgid "Create issue"
-msgstr "Konu oluştur"
-
-msgid "Describe the problem precisely"
-msgstr "problemi detaylı olarak anlatınız"
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23132,6 +24961,9 @@ msgstr "Firefox exe"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23339,9 +25171,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23421,7 +25250,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23575,6 +25422,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23596,6 +25446,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23782,7 +25635,7 @@ msgid "Can''t parse a time from this string."
msgstr ""
msgid "Invalid value"
-msgstr "geçersiz değer"
+msgstr "Geçersiz değer"
msgid "moved"
msgstr "taşındı"
@@ -23889,9 +25742,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23960,9 +25810,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24089,9 +25936,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "JOSM yi tekrar başlat"
-
msgid "Revert changeset fully"
msgstr ""
@@ -24113,6 +25957,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24145,15 +25992,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "Özellikleri Değiştir"
+
msgid "Country preset:"
msgstr ""
@@ -24163,6 +26026,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24265,9 +26131,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr "Otoyol tipi"
-
msgid "Speed (Km/h)"
msgstr "Hız (Km/h)"
@@ -24383,6 +26246,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr "Alanı sadeleştir"
@@ -24443,19 +26309,19 @@ msgstr "Mesafe faktörü"
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
-msgstr "Çevrimiçi yardım"
+msgid "SeaMap Editor"
+msgstr "SeaMap düzenleyici"
-msgid "Load"
-msgstr "Yükle"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "Görünmez"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "SeaMap düzenleyici"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24593,6 +26459,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24668,6 +26537,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24683,9 +26641,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr "OSM indir"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24707,6 +26662,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24859,9 +26817,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "Doğruluk"
-
msgid "Select as much as you like:"
msgstr ""
@@ -25485,19 +27440,19 @@ msgstr "Nesne silme işlemi geri al..."
msgid "Undelete object by id"
msgstr "ID’ye göre nesne silme işlemi geri al..."
-msgid "Select if the data should be added into a new layer"
-msgstr ""
+msgid "Undelete Object"
+msgstr "Nesne Silme İşlemi Geri Al..."
+
+msgid "Undelete object"
+msgstr "Nesne silme işlemi geri al"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr "Nesne Silme İşlemi Geri Al..."
-
-msgid "Undelete object"
-msgstr "Nesne silme işlemi geri al"
+msgid "Select if the data should be added into a new layer"
+msgstr ""
msgid "Start undeleting"
msgstr "Nesne silme işlemi geri almaya başla"
@@ -25505,18 +27460,6 @@ msgstr "Nesne silme işlemi geri almaya başla"
msgid "Close dialog and cancel"
msgstr "Diyaloğu kapat ve vasgeç"
-msgid "Will get {0}"
-msgstr "{0} adet alacak"
-
-msgid "Looking for {0}"
-msgstr "{0} adet gerekli"
-
-msgid "Found {0}"
-msgstr "{0} adet bulundu"
-
-msgid "More tools"
-msgstr "Daha fazla araç"
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25559,15 +27502,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25583,6 +27517,7 @@ msgstr ""
msgid "The selected way does not contain the selected node."
msgid_plural "The selected way does not contain all the selected nodes."
msgstr[0] "Seçili yol seçili kavşakları içermiyor."
+msgstr[1] "Seçili yol seçili kavşakları içermiyor."
msgid ""
"The selected way is not a split way, please select split points or split way "
@@ -25688,18 +27623,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25877,9 +27800,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -26006,7 +27926,7 @@ msgstr "döngü"
msgid "mute"
msgstr "sessiz"
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -26026,9 +27946,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26120,10 +28037,10 @@ msgid "Not linked yet"
msgstr ""
msgid "{0}.Wikipedia.org"
-msgstr ""
+msgstr "{0}.Wikipedia.org"
msgid "{0}.Wikipedia.org: {1}"
-msgstr ""
+msgstr "{0}.Wikipedia.org: {1}"
msgid "Fetches all coordinates from Wikipedia in the current view"
msgstr ""
@@ -26132,7 +28049,7 @@ msgid "coordinates"
msgstr ""
msgid "Category"
-msgstr ""
+msgstr "Kategori"
msgid "Fetches a list of all Wikipedia articles of a category"
msgstr ""
@@ -26141,7 +28058,7 @@ msgid "Enter the Wikipedia category"
msgstr ""
msgid "Clipboard"
-msgstr ""
+msgstr "Pano"
msgid "Pastes Wikipedia articles from the system clipboard"
msgstr ""
@@ -26161,9 +28078,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index c396afe..4cd2c15 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:02+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:03+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index edde495..ac5d24e 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-04-04 06:47+0000\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-12-17 20:41+0000\n"
"Last-Translator: andygol <Unknown>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
"MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@ 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: 2013-04-05 05:02+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:03+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -52,6 +52,21 @@ msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
"Відкриття посилання, що не підтримується поточною платформою (''{0}'')"
+msgid "ERROR: {0}"
+msgstr "ПОМИЛКА: {0}"
+
+msgid "WARNING: {0}"
+msgstr "ПОПЕРЕДЖЕННЯ: {0}"
+
+msgid "INFO: {0}"
+msgstr "ІНФОРМАЦІЯ: {0}"
+
+msgid "DEBUG: {0}"
+msgstr "ВІДЛАГОДЖЕННЯ: {0}"
+
+msgid "Cause: "
+msgstr "Причина: "
+
msgid "Executing platform startup hook"
msgstr "Виконання стартових процедур"
@@ -156,19 +171,20 @@ msgid "About JOSM..."
msgstr "Про JOSM…"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ПОПЕРЕДЖЕННЯ: неочікуваний формат посилання до API. Перенаправлення на "
-"сторінку з інформацією або з історією об’єкта OSM можливо не вдалось. "
-"Основне посилання до API: ''{0}''"
+"Неочікуваний формат посилання (URL) для API. Перенаправлення на сторінку з "
+"інформацією або історією об’єкта OSM можливо не відбудеться. Основне "
+"посилання (URL) на API: ''{0}''"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"ПОПЕРЕДЖЕННЯ: неочікуваний формат базової адреси API. Перенаправлення на "
-"персональну сторінку користувача OSM не можливо. Базова адреса API: \"{0}\""
+"Неочікуваний формат посилання (URL) для API. Перенаправлення на сторінку з "
+"інформацією про учасника OSM можливо не відбудеться. Основне посилання (URL) "
+"на API: ''{0}''"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -217,6 +233,9 @@ msgstr "Шар не обрано"
msgid "Add imagery layer {0}"
msgstr "Додати шар з зображенням {0}"
+msgid "Select image format for WMS layer"
+msgstr "Оберіть формат зображення для шару WMS"
+
msgid "Select WMS layers"
msgstr "Оберіть шари WMS"
@@ -257,9 +276,6 @@ msgstr "Інструмент: {0}"
msgid "Please select at least four nodes."
msgstr "Будь ласка, виберіть щонайменше чотири точки."
-msgid "Information"
-msgstr "Інформація"
-
msgid "Align Nodes in Line"
msgstr "Вирівняти точки в одну лінію"
@@ -284,6 +300,9 @@ msgstr "конфлікту"
msgid "download"
msgstr "завантаження"
+msgid "problem"
+msgstr "проблеми"
+
msgid "previous"
msgstr "попереднього"
@@ -293,6 +312,9 @@ msgstr "наступного"
msgid "Nothing selected to zoom to."
msgstr "Нічого не виділено для масштабування"
+msgid "Information"
+msgstr "Інформація"
+
msgid "Zoom to {0}"
msgstr "Масштабувати до {0}"
@@ -349,10 +371,11 @@ msgstr ""
"напрямок однієї з них на протилежний?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Не вдалося з’єднати лінії (Неможливо створити єдиний ланцюг з вузлів)"
+"Лінії не можливо об’єднати<br>(Їх не можна перетворити у єдину послідовність "
+"точок)"
msgid "Combine {0} ways"
msgstr "З’єднати лінії — {0} шт."
@@ -408,18 +431,37 @@ msgstr "Вилучити"
msgid "Delete selected objects."
msgstr "Вилучити виділені об’єкти."
+msgid "Toggle dialogs panel"
+msgstr "Панель діалогів"
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr "Приховує панель діалогів, для збільшення площі для редагування"
+
msgid "Distribute Nodes"
msgstr "Розташувати точки"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Розташувати точки на рівних відстанях вздовж лінії"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr "Поігноровано {0} точок із нульовими координатами"
+
msgid "Download from OSM..."
msgstr "Завантажити з OSM…"
msgid "Download map data from the OSM server."
msgstr "Завантажити дані мапи з сервера OSM."
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Ця дія потребує {0} окремих<br>запитів на завантаження. "
+"Продовжити?</html>"
+
+msgid "Download data"
+msgstr "Отримати дані"
+
msgid "Download object..."
msgstr "Завантажити об’єкт…"
@@ -520,6 +562,9 @@ msgstr "Історія"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Показати історію лінії, точки або зв’язку OSM"
+msgid "Show history"
+msgstr "Показати історію"
+
msgid "History (web)"
msgstr "Історія (веб)"
@@ -642,11 +687,11 @@ msgid "Joined overlapping areas"
msgstr "Об’єднані полігони, що перекриваються"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
-"Деякі з ліній належали до зв’язків, які було змінено. Будь ласка, перевірте, "
-"чи не виникло помилок."
+"Деякі з ліній входили до складу зв’язків, що були змінені.<br>Будь ласка, "
+"перевірте чи не з’явились помилки."
msgid "Fix tag conflicts"
msgstr "Виправити конфлікти теґів"
@@ -814,11 +859,11 @@ msgid "Merge nodes into the oldest one."
msgstr "З’єднати точки в одну (найстарішу)"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
-"Будь ласка, виділіть що найменше дві точки для злиття або точки, які "
-"розташовані дуже близько друг до друга."
+"Будь ласка, виділіть принаймні дві точки для злиття чи одну точку, що "
+"знаходиться поруч з іншою."
msgid "Abort Merging"
msgstr "Скасувати об’єднання"
@@ -995,11 +1040,11 @@ msgid "Download Data"
msgstr "Завантажити дані"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
-"<html>Неможливо відкрити URL ''{0}'' через відсутність відповідних завдань "
-"для завантаження.</html>"
+"Неможливо завантажити URL ''{0}''<br>Це посилання може приймати наступні "
+"аргументи:<br>{1}"
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -1032,16 +1077,11 @@ msgid "Orthogonalize / Undo"
msgstr "Зробити прямі кути / Відмінити"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"Зробити кути прямим / Відмінити\n"
-"Будь ласка, виберіть точки, які були зміщені попередньою дією \"Зробити кути "
-"прямими\"!"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "Відмінити випрямлення кутів"
+"Ортогоналізація форми / Відміна<br>Будь ласка, виділіть точки які були "
+"переміщені під час початкової ортогоналізації!"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1062,9 +1102,6 @@ msgstr "Зробити кути прямими"
msgid "Usage"
msgstr "Використання"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "Для виділених елементів неможливо зробити прямі кути"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1186,6 +1223,15 @@ msgstr "Також змінити назву файлу"
msgid "Could not rename file ''{0}''"
msgstr "Не можливо перейменувати файл \"{0}\""
+msgid "Restart"
+msgstr "Перезапустити"
+
+msgid "Restart the application."
+msgstr "Перезапустити програму."
+
+msgid "Click to restart later."
+msgstr "Перезапустити пізніше."
+
msgid "Reverse way"
msgstr "Змінити напрямок лінії"
@@ -1238,9 +1284,6 @@ msgstr "Завантажити сеанс"
msgid "Load a session from file."
msgstr "Завантажити сеанс з файлу."
-msgid "Session file (*.jos, *.joz)"
-msgstr "Файл сеансу (*.jos, *.joz)"
-
msgid "Open session"
msgstr "Відрити сеанс"
@@ -1306,6 +1349,9 @@ msgstr "Звіт про стан"
msgid "Copy to clipboard and close"
msgstr "Скопіювати в буфер і закрити"
+msgid "Report bug"
+msgstr "Звіт про збій програми"
+
msgid "Close"
msgstr "Закрити"
@@ -1395,19 +1441,18 @@ msgstr ""
"лінії)."
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
-"<html>Роль, заснована на участі у зв’язках, була скопійована у всі нові "
-"лінії.<br>Результат необхідно перевірити і виправити, якщо буде "
-"потрібно.</html>"
+"Роль члену зв’язку була скопійована на всі нові лінії.<br>У разі потреби вам "
+"треба перевірити їх та виправити."
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
-"<html>Член зв’язку був скопійований у всі нові лінії. <br> Результат "
-"потрібно перевірити та виправити за потреби.</html>"
+"Нові лінії також будуть членами зв’язку.<br>У разі потреби вам треба "
+"перевірити їх та виправити."
msgid "Split way {0} into {1} parts"
msgstr "Розділити лінію {0} на {1} частин"
@@ -1510,6 +1555,29 @@ msgstr ""
"Ви намагаєтесь роз’єднати неповні об’єкти.<br>Це може викликати проблеми, "
"тому що ви не бачите їх повністю.<br>Ви дійсно бажаєте роз’єднати?"
+msgid "Disconnect Node from Way"
+msgstr "Від’єднати точку від лінії"
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr "Від’єднання точки від лінії, до якої вана належить"
+
+msgid "Select at least one node to be disconnected."
+msgstr "Виділіть принаймні одну точку для від’єднання."
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] "Неможливо від’єднати виділену точку від будь-чого."
+msgstr[1] "Неможливо від’єднати виділені точки від будь-чого."
+msgstr[2] "Неможливо від’єднати виділені точки від будь-чого."
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] "Залежна лінія зникне після від’єднання точки."
+msgstr[1] "Залежна лінія зникне після від’єднання точок."
+msgstr[2] "Залежна лінія зникне після від’єднання точок."
+
msgid "Undo"
msgstr "Відмінити"
@@ -1534,9 +1602,6 @@ msgstr "Оновити дані"
msgid "Updates the objects in the active data layer from the server."
msgstr "Оновлює об’єкти в активному шарі даних, одержуючи їх із сервера."
-msgid "Download data"
-msgstr "Отримати дані"
-
msgid "Update modified"
msgstr "Оновити змінене"
@@ -1743,6 +1808,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "Відтворювати повільніше."
+msgid "Download GPS"
+msgstr "Завантажити GPS"
+
msgid "Downloading GPS data"
msgstr "Отримання GPS-даних"
@@ -1752,6 +1820,18 @@ msgstr "Отримані GPX-дані"
msgid "Markers from {0}"
msgstr "Мітки з {0}"
+msgid "Download Compressed OSM Change"
+msgstr "Завантаження стиснених змін OSM"
+
+msgid "Download OSM Change"
+msgstr "Завантаження змін OSM"
+
+msgid "Download Compressed OSM"
+msgstr "Завантаження стиснених даних OSM"
+
+msgid "Download OSM"
+msgstr "Заватажити OSM"
+
msgid "Downloading data"
msgstr "Отримання даних"
@@ -1772,6 +1852,33 @@ msgstr "Команда"
msgid "Request details: {0}"
msgstr "Подробиці запиту: {0}"
+msgid "Download OSM URL"
+msgstr "URL для завантаження даних OSM"
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Стався {0} конфлікт під час імпорту."
+msgstr[1] "Сталося {0} конфлікти під час імпорту."
+msgstr[2] "Сталося {0} конфліктів під час імпорту."
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Конфлікт під час отримання даних з сервера"
+msgstr[1] "Конфлікти під час отримання даних з сервера"
+msgstr[2] "Конфліктів під час отримання даних з сервера"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Завантаження батьків точки {2}"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Завантаження батьків лінії {2}"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Завантаження батьків зв’язку {2}"
+
+msgid "Download session"
+msgstr "Завантажити сесію"
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Отримання {0} з {1} ({2} лишилось)"
@@ -1838,27 +1945,6 @@ msgstr "Під час масового завантаження виникли
msgid "Errors during download"
msgstr "Помилки під час отримання даних з сервера"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Стався {0} конфлікт під час імпорту."
-msgstr[1] "Сталося {0} конфлікти під час імпорту."
-msgstr[2] "Сталося {0} конфліктів під час імпорту."
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "Конфлікт під час отримання даних з сервера"
-msgstr[1] "Конфлікти під час отримання даних з сервера"
-msgstr[2] "Конфліктів під час отримання даних з сервера"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Завантаження батьків точки {2}"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Завантаження батьків лінії {2}"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Завантаження батьків зв’язку {2}"
-
msgid "Error during download"
msgstr "Помилка під час завантаження з сервера"
@@ -2011,6 +2097,9 @@ msgstr "Покращення Точності Ліній"
msgid "Improve Way Accuracy mode"
msgstr "Режим Покращення Точності Ліній"
+msgid "improve way accuracy helper line"
+msgstr "допоміжна лінія інструменту покращення точності ліній"
+
msgid "Click on the way to start improving its shape."
msgstr "Клацніть по лінії, щоб розпочати покращення її форми."
@@ -2041,11 +2130,11 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr "Неможливо помістити точку за межі світу."
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] "Додати нову точку до лінії"
-msgstr[1] "Додати {0} нових точки до лінії"
-msgstr[2] "Додати {0} нових точок до лінії"
+msgstr[1] "Додати нову точку до {0} ліній"
+msgstr[2] "Додати нову точку до {0} ліній"
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "Неможливо вилучити точку пов’язану із багатьма об’єктами"
@@ -2059,6 +2148,9 @@ msgstr "Паралельні лінії"
msgid "Make parallel copies of ways"
msgstr "Створити паралельну копію лінії"
+msgid "make parallel helper line"
+msgstr "допоміжна лінія інструменту паралельних ліній"
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2364,10 +2456,10 @@ msgstr ""
"<b>relation</b>)"
msgid "<b>user:</b>... - objects changed by user"
-msgstr "<b>user:</b>… - об’єкти, які змінив користувач"
+msgstr "<b>user:</b>… - об’єкти, які змінив учасник"
msgid "<b>user:anonymous</b> - objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - об’єкти змінені анонімними користувачами"
+msgstr "<b>user:anonymous</b> - об’єкти змінені анонімними учасниками"
msgid "<b>id:</b>... - objects with given ID (0 for new objects)"
msgstr "<b>id:</b>… - об’єкти зі вказаним ID (0 для нових об’єктів)"
@@ -2514,6 +2606,9 @@ msgstr "''value'' у будьякому ключі"
msgid "matches if ''key'' exists"
msgstr "збігається якщо ''key'' існує"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr "виконується, якщо ''key'' більше ''value'' (аналогічно, якщо менге)"
+
msgid "combinators"
msgstr "комбінатори"
@@ -2557,7 +2652,7 @@ msgid "metadata"
msgstr "метадані"
msgid "objects changed by user"
-msgstr "об’єкти змінені користувачем"
+msgstr "об’єкти змінені учасником"
msgid "objects with given ID"
msgstr "об’єкти із вказаними ID"
@@ -2684,14 +2779,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "Очікується <i>min</i>/<i>max</i> після ''timestamp''"
-msgid "Primitive id expected"
-msgstr "Очікується ідентифікатор елемента"
+msgid "Range of primitive ids expected"
+msgstr "Очікується діапазон id примітивів"
-msgid "Changeset id expected"
-msgstr "Очікується ідентифікатор набору змін"
+msgid "Range of changeset ids expected"
+msgstr "Очікується діапазон id наборів змін"
-msgid "Version expected"
-msgstr "Очікується версія"
+msgid "Range of versions expected"
+msgstr "Очікується діапазон id версій"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr ""
@@ -2702,6 +2797,9 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
"Невідомий тип елементу: {0}. Дозволені значення: точка, лінія або зв’язко"
+msgid "Primitive id expected"
+msgstr "Очікується ідентифікатор елемента"
+
msgid "Range of numbers expected"
msgstr "Очікується діапазон чисел"
@@ -2720,10 +2818,8 @@ msgstr "Відсутній параметр для XOR"
msgid "Missing operator for NOT"
msgstr "Відсутній параметр для NOT"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
-"Попередження: автоматичне скорочення теґу ''{0}'' на вилученому об’єкті {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr "Автоматичне усікання значення теґу ''{0}'' у вилученого об’єкта {1}"
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2819,6 +2915,9 @@ msgstr[0] "Додано {0} об’єкт"
msgstr[1] "Додано {0} об’єкти"
msgstr[2] "Додано {0} об’єктів"
+msgid "New way {0} has 0 nodes"
+msgstr "Нова лінія {0} має 0 точок"
+
msgid "Change node {0}"
msgstr "Змінити точку {0}"
@@ -2855,11 +2954,11 @@ msgstr "Вилучити \"{0}\" для {1} об’єктів"
msgid "Set {0}={1} for {2} objects"
msgstr "Встановити {0}={1} для {2} об’єктів"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "Вилучити {0} параметр(и) для {1} об’єкта(ів)"
+msgid "Deleted {0} tags for {1} objects"
+msgstr "Вилучено {0} теґів у {1} об’єкта(ів)"
-msgid "Set {0} properties for {1} objects"
-msgstr "Встановити {0} параметр(и) для {1} об’єкта(ів)"
+msgid "Set {0} tags for {1} objects"
+msgstr "Встановлено {0} теґів у {1} об’єкта(ів)"
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "Замінити \"{0}\" на \"{1}\" для"
@@ -2884,11 +2983,10 @@ msgid "Double conflict"
msgstr "Подвійний конфлікт"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
-"Попередження: Шару ''{0}'' більше не існує. Не можливо вилучити конфлікт для "
-"об’єкту ''{1}''."
+"Шар ''{0}'' більше не існує. Неможливо усунути конфлікт для об’єкта ''{1}''."
msgid "Add conflict for ''{0}''"
msgstr "Додати конфлікт для ''{0}''"
@@ -2971,16 +3069,16 @@ msgid_plural ""
"really want to delete?"
msgstr[0] ""
"Ви збираєтесь вилучити {0} зв’язок: {1}<br/>Потреба в цьому виникає дуже "
-"рідко та не може бути легко скасованим після завантаження даних на "
-"сервер.<br/>Ви дійсно бажаєте вилучити зв’язок?"
+"рідко, але скасувати вилучення після завантаження даних на сервер може бути "
+"не легко.<br/>Ви дійсно бажаєте вилучити зв’язок?"
msgstr[1] ""
"Ви збираєтесь вилучити {0} зв’язки: {1}<br/>Потреба в цьому виникає дуже "
-"рідко та не може бути легко скасованим після завантаження даних на "
-"сервер.<br/>Ви дійсно бажаєте вилучити зв’язки?"
+"рідко, але скасувати вилучення після завантаження даних на сервер може бути "
+"не легко.<br/>Ви дійсно бажаєте вилучити зв’язки?"
msgstr[2] ""
"Ви збираєтесь вилучити {0} зв’язків: {1}<br/>Потреба в цьому виникає дуже "
-"рідко та не може бути легко скасованим після завантаження даних на "
-"сервер.<br/>Ви дійсно бажаєте вилучити зв’язки?"
+"рідко, але скасувати вилучення після завантаження даних на сервер може бути "
+"не легко.<br/>Ви дійсно бажаєте вилучити зв’язки?"
msgid "Delete relation?"
msgstr "Вилучити зв’язок?"
@@ -3012,6 +3110,9 @@ msgstr[2] "Очищено {0} об’єктів"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Розв’язання конфліктів серед членів зв’язку {0}"
+msgid "Removed nodes from {0}"
+msgstr "Точки вилучені з {0}"
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "Обернути {0} точку"
@@ -3086,11 +3187,11 @@ msgid "Reverse directional way."
msgstr "Розвернути спрямовану лінію"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"При зміні напрямку лінії, пропонується виправити наступні параметри для "
-"підтримки цілісності даних."
+"Під час зміни напрямку лінії, наступні зміни пропонуються для підтримання "
+"цілісності даних."
msgid "Relation"
msgstr "Зв’язок"
@@ -3119,11 +3220,11 @@ msgstr "Застосувати позначені зміни"
msgid "Do not apply changes"
msgstr "Не застосовувати зміни"
-msgid "Please select which property changes you want to apply."
-msgstr "Будь ласка, позначте які зміни властивостей ви бажаєте застосувати."
+msgid "Please select which changes you want to apply."
+msgstr "Будь ласка, оберіть які зміни ви бажаєте застосувати."
-msgid "Properties of "
-msgstr "Властивості "
+msgid "Tags of "
+msgstr "Теґи "
msgid "Roles in relations referring to"
msgstr "Ролі в зв’язках, що відносяться до"
@@ -3145,6 +3246,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr "Не можливо вилучити старий резервний файл {0}"
+msgid "Your work has been saved automatically."
+msgstr "Вашу роботу було збережено автоматично"
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "Помилка під час створення резервної копії вилучаємого шару : {0}"
@@ -3178,21 +3282,21 @@ msgstr ""
"але його типове значення у поточний момент не відоме.<br/> Будь ласка, "
"активуйте відповідну функцію вручну і повторіть спробу імпорту."
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "Попередження: Не вдалося створити втрачену теку кешу: {0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr "Не вдалося створити відсутню теку для кешу: {0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>Не вдалося створити втрачену теку кешу: {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Попередження: не зберігаються налаштування у ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr "Не вдалося зберегти налаштування у ''{0}''"
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
-"Попередження: Збій ініціалізації налаштувань. Каталог налаштувань ''{0}'' не "
-"є каталогом."
+"Не вдалося ініціалізувати налаштування. Тека для налаштувань ''{0}'' — не є "
+"текою."
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3202,11 +3306,11 @@ msgstr ""
"каталогом.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
-"Попередження: Збій ініціалізації налаштувань. Не можливо створити відсутній "
-"каталог для налаштувань: {0}"
+"Не вдалося ініціалізувати налаштування. Не вдалося створити відсутню теку "
+"для налаштувань: {0}"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3215,18 +3319,14 @@ msgstr ""
"<html>Збій ініціалізації налаштувань<br>Не можливо створити відсутній "
"каталог для налаштувань: {0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
-"Інформація: Відсутній файл налаштувань ''{0}''. Створення типового файли "
-"налаштувань."
+"Файл налаштувань ''{0}'' відсутній. Створюємо файл з типовими налаштуваннями."
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
-"Попередження: Існуючий файл налаштувань ''{0}'' буде замінений на файл з "
-"типовими налаштуваннями."
+"Зміна поточного файлу налаштувань ''{0}'' файлом з типовими налаштуваннями."
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3243,11 +3343,11 @@ msgstr ""
"<br>{0}<br> та створено новий файл з типовими налаштуваннями.</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
-"Попередження: Збій ініціалізації налаштувань. Збій перевстановлення файлу "
-"налаштувань на типові значення: {0}"
+"Не вдалося ініціалізувати налаштування. Не вдалося замінити файл налаштувань "
+"типовими налаштуваннями: {0}"
msgid "Paint style {0}: {1}"
msgstr "Стиль зафарбовування {0}:{1}"
@@ -3278,13 +3378,11 @@ msgstr "Збій завантаження ресурсу ''{0}'', помилка
msgid "UNKNOWN"
msgstr "НЕВІДОМО"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr ""
-"Попередження: неочікуваний номер версії JOSM у фалі випуску — ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr "Неочікуваний номер версії JOSM — ''{0}'' у файлі ревізії"
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "Попередження: файл змін ''/ REVISION'' відсутній."
+msgid "The revision file ''/REVISION'' is missing."
+msgstr "Відсутній файл ревізії ''/REVISION''."
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "Конфлікт вже зареєстровано для елемента ''{0}''"
@@ -3453,10 +3551,9 @@ msgstr "Неможливо порівняти елементи з ідентиф
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Параментр {0} не в діапазоні 0..{1}, його значення {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
-"Помилка: збій завантаження класу рендера мапи — ''{0}''. Клас не знайдений."
+"Не вдалось завантажити клас рендерінгу мапи ''{0}''. Клас не знайдено."
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3568,8 +3665,8 @@ msgstr "Параметр +nadgrids для файлу зсуву решітки '
msgid "Unkown datum identifier: ''{0}''"
msgstr "Невідомий ідентифікатор датуму: ''{0}''"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "Вимагається датум (+datum=*, +towgs84=* або +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr "Потрібен датум (+datum=*, +towgs84=* or +nadgrids=*)"
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3590,6 +3687,9 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
"Неочікувана кількість аргументів для параметру ''+bounds'' (потрібно бути 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "Невідомий параметр ''{0}''"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "Очікувався числовий аргумент для параметра ''{0}''"
@@ -3606,9 +3706,6 @@ msgstr "Власна проекція"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "Помилка: збій відкриття вхідного потоку для ресурсу ''/data/{0}''."
-
msgid "WGS84"
msgstr "WGS84"
@@ -3649,6 +3746,9 @@ msgstr "інше при перевірці"
msgid "Running test {0}"
msgstr "Виконується тест {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr "Перевірку ''{0}'' завершено за {1}"
+
msgid "Addresses"
msgstr "Адреси"
@@ -3673,6 +3773,15 @@ msgstr "Частини вулиці у зв’язку мають різні н
msgid "House number too far from street"
msgstr "Будинок з номером доволі далеко від вулиці"
+msgid "Barriers and entrances"
+msgstr "Бар’єри та під'їзди"
+
+msgid "Checks for errors in barriers and entrances."
+msgstr "Перевірка помилок бар’єрів та під'їздів"
+
+msgid "Barrier entrance not set on a barrier"
+msgstr "Точка входу/в’їзду не на ліні огорожі"
+
msgid "Building inside building"
msgstr "Будівля в сердені будівлі"
@@ -3734,15 +3843,15 @@ msgstr " чи "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} заборонено, використовуйте {1} замість цього"
+msgid "{0} is unnecessary"
+msgstr "{0} не є потрібними"
+
msgid "Duplicated nodes"
msgstr "Подвійні точки"
msgid "This test checks that there are no nodes at the very same location."
msgstr "Цей тест перевіряє на наявність однакових точок в одному місці."
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "Подвоєння точок у двох незамкнених лініях"
-
msgid "Mixed type duplicated nodes"
msgstr "Змішаний тип точок, що дублюються"
@@ -3814,6 +3923,24 @@ msgstr "Подвійні точки ліній"
msgid "Checks for ways with identical consecutive nodes."
msgstr "Перевіряє ліні на наявність однакових послідовних точок."
+msgid "Highways"
+msgstr "Дороги"
+
+msgid "Performs semantic checks on highways."
+msgstr "Виконує семантичний аналіз доріг."
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr "Неправильний круговий рух (highway: {0} замість {1})"
+
+msgid "Missing pedestrian crossing information"
+msgstr "Відсутня інформація про пішохідний перехід"
+
+msgid "Unknown country code: {0}"
+msgstr "Невідомий код країни: {0}"
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr "Невідомий source:maxspeed контекст: {0}"
+
msgid "Multipolygon"
msgstr "Мультиполігон"
@@ -3886,6 +4013,14 @@ msgstr "Точки з однаковою назвою"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "Цей тест шукає точки з однаковими назвами (можливо це дублікати)."
+msgid "Opening hours syntax"
+msgstr "Синтаксис часу роботи"
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+"Цей тест перевіряє правильне використання синтаксису теґу opening hours "
+"(режиму роботи)."
+
msgid "Overlapping Areas"
msgstr "Полігони, що перекриваються"
@@ -3945,15 +4080,15 @@ msgstr "Тип зв’язку невідомий"
msgid "Relation is empty"
msgstr "Зв’язок порожній"
+msgid "Role verification problem"
+msgstr "Проблеми перевірки ролі"
+
msgid "<empty>"
msgstr "<порожньо>"
msgid "Role {0} missing"
msgstr "Відсутня роль {0}"
-msgid "Role verification problem"
-msgstr "Проблеми перевірки ролі"
-
msgid "Number of {0} roles too low ({1})"
msgstr "Кількість ролей {0} занизька ({1})"
@@ -3985,11 +4120,11 @@ msgid ""
msgstr ""
"Цей тест виявляє лінії зі схожими назвами, можливо це помилки набору."
-msgid "Properties checker :"
-msgstr "Перевірка властивостей:"
+msgid "Tag checker"
+msgstr "Перевірка теґів"
-msgid "This plugin checks for errors in property keys and values."
-msgstr "Цей втулок шукає помилки в назвах ключів та їх значеннях."
+msgid "This test checks for errors in tag keys and values."
+msgstr "Цей тест перевіряє теґи та їх значення на наявність помилок."
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "Невірний рядок перевірки теґів — {0}: {1}"
@@ -4128,8 +4263,8 @@ msgid "Use the default spellcheck file (recommended)."
msgstr ""
"Використовувати типовий файл для перевірки правопису (рекомендується)."
-msgid "Fix properties"
-msgstr "Виправити властивості"
+msgid "Fix tags"
+msgstr "Виправити теґи"
msgid "Could not find element type"
msgstr "Неможливо знайти тип елементу"
@@ -4204,6 +4339,9 @@ msgstr "Незамкнена лінія"
msgid "This tests if ways which should be circular are closed."
msgstr "Цей тест шукає розімкнені лінії, які повинні бути замкненими."
+msgid "Unclosed way"
+msgstr "Незамкнена лінія"
+
msgid "natural type {0}"
msgstr "тип довкілля (natural) {0}"
@@ -4234,9 +4372,6 @@ msgstr "будівля"
msgid "area"
msgstr "полігон"
-msgid "Unclosed way"
-msgstr "Незамкнена лінія"
-
msgid "Unconnected ways"
msgstr "Нез’єднана лінія"
@@ -4264,12 +4399,12 @@ msgstr ""
"Цей тест перевіряє на наявність точок, що не мають теґів, і що не є частиною "
"ліній."
-msgid "No tags"
-msgstr "Немає теґів"
-
msgid "Unconnected nodes without physical tags"
msgstr "Не з’єднані точки без теґів"
+msgid "No tags"
+msgstr "Немає теґів"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "Є теґи, що містять ''fixme'' або ''FIXME''"
@@ -4332,26 +4467,6 @@ msgstr "Зворотня берегова лінія: земля не лівор
msgid "Reversed land: land not on left side"
msgstr "Зворотня лінія суші: земля не ліворуч"
-msgid "Wrong number of arguments for bookmark"
-msgstr "Помилкова кількість аргументів для закладки"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "Помилка читання закладки: %s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "Помилка: Неочікуваний рядок ''{0}'' у файлі закладок ''{1}''"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Помилка: Невірне подвійне значення ''{0}'' у рядку ''{1}'' у файлі закладок "
-"''{2}''"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Неможливо прочитати закладки з<br>''{0}''<br>Помилка: {1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "Не показувати знову (запам’ятати вибір)"
@@ -4457,8 +4572,8 @@ msgstr "Показати довідкову інформацію"
msgid "Downloading \"Message of the day\""
msgstr "Завантаження «Повідомлення дня»"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "Попередження: неможливо прочитати «Повідомлення дня». Помилка: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr "Неможливо прочитати Повідомлення дня. Помилка: {0}"
msgid "Message of the day not available"
msgstr "Повідомлення дня недоступне"
@@ -4678,9 +4793,24 @@ msgstr "Вид"
msgid "Tools"
msgstr "Інструменти"
+msgid "More tools"
+msgstr "Ще інструменти"
+
+msgid "Data"
+msgstr "Дані"
+
+msgid "Selection"
+msgstr "Виділення"
+
msgid "Presets"
msgstr "Заготовки"
+msgid "More..."
+msgstr "Ще…"
+
+msgid "GPS"
+msgstr "GPS"
+
msgid "Windows"
msgstr "Вікна"
@@ -4698,11 +4828,23 @@ msgstr ""
"Перемикає видимість панелі інструментів редагування (тобто вертикальної "
"панелі)"
+msgid "Preset preferences"
+msgstr "Налаштування заготовок"
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr "Відкрити вкладку налаштування заготовок у Налаштуваннях"
+
+msgid "Imagery preferences"
+msgstr "Налаштування фону"
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr "Відкрити вкладку налаштування фону в Налаштуваннях"
+
msgid "Audio"
msgstr "Звук"
-msgid "Hide edit toolbar"
-msgstr "Приховати панель інструментів редагування"
+msgid "Do not hide toolbar"
+msgstr "Не ховати панель інструментів"
msgid "Hide this button"
msgstr "Сховати кнопку"
@@ -4710,6 +4852,9 @@ msgstr "Сховати кнопку"
msgid "Click the arrow at the bottom to show it again."
msgstr "Клацніть по стрілці на кнопці, щоб показати її знову"
+msgid "Hide edit toolbar"
+msgstr "Приховати панель інструментів редагування"
+
msgid "Hide or show this toggle button"
msgstr "Сховати чи показати цю кнопку-перемикач"
@@ -4771,6 +4916,9 @@ msgstr "(Немає об’єкта)"
msgid "User:"
msgstr "Користувач:"
+msgid "Do not hide status bar"
+msgstr "Не ховати панель стану"
+
msgid "Layer not in list."
msgstr "Шару немає в списку."
@@ -4798,19 +4946,6 @@ msgstr "В фоні"
msgid "Click to run job in background"
msgstr "Клацніть щоб перевести роботу у фоновий режим"
-msgid "false: the property is explicitly switched off"
-msgstr "хибність: параметр явно вимкнено"
-
-msgid "true: the property is explicitly switched on"
-msgstr "істина: параметр явно увімкнено"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "частково: різні обрані об’єкти мають відмінні значення; не змінюйте"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "обнулити: не встановлювати цей параметр для обраних об’єктів"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} мс)"
@@ -5125,6 +5260,9 @@ msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
"Копіювати мої виділені елементи в кінець списку об’єднаних елементів."
+msgid "> before"
+msgstr "> до"
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
@@ -5132,6 +5270,9 @@ msgstr ""
"Копіювати мої виділені елементи перед першим виділеним елементом у списку "
"об’єднаних елементів."
+msgid "> after"
+msgstr "> після"
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
@@ -5139,16 +5280,25 @@ msgstr ""
"Копіювати мої виділені елементи після першого виділеного елемента в списку "
"об’єднаних елементів"
+msgid "< top"
+msgstr "< зверху"
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
"Скопіювати чужі виділені елементи в початок списку об’єднаних елементів."
+msgid "< bottom"
+msgstr "< знизу"
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
"Скопіювати чужі виділені елементи в кінець списку об’єднаних елементів."
+msgid "< before"
+msgstr "< до"
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
@@ -5156,6 +5306,9 @@ msgstr ""
"Скопіювати чужі виділені елементи перед першим виділеним елементом у списку "
"об’єднаних елементів."
+msgid "< after"
+msgstr "< після"
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -5172,8 +5325,8 @@ msgstr "Копіювати всі чужі елементи в місце при
msgid "Up"
msgstr "Вгору"
-msgid "Move up the selected elements by one position."
-msgstr "Підняти виділені елементи на одну позицію."
+msgid "Move up the selected entries by one position."
+msgstr "Посунути виділені об’єкти на одну позицію."
msgid "Down"
msgstr "Вниз"
@@ -5231,16 +5384,6 @@ msgstr[0] "Чужа версія ({0} запис)"
msgstr[1] "Чужа версія ({0} записи)"
msgstr[2] "Чужа версія ({0} записів)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Регульований {0} ще не зареєстрований. Неможливо встановити участь у "
-"синхронізованих регулюваннях."
-
-msgid "Adjustable {0} not registered yet."
-msgstr "Регульований {0} ще не зареєстровано"
-
msgid "Node"
msgstr "Точка"
@@ -5521,17 +5664,17 @@ msgctxt "tag"
msgid "Key:"
msgstr "Ключ:"
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
-"<html>Введіть ключ теґу, наприклад: <strong><tt>fixme</tt></strong></html>"
+"<html>Введіть ключ теґу, на прикл. <strong><tt>fixme</tt></strong></html>"
msgid "Value:"
msgstr "Значення:"
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
-"<html>Введіть значення теґу, наприклад: <strong><tt>перевірте "
+"<html>Ведіть значення теґу, на прикл. <strong><tt>перевірити "
"членів</tt></strong></html>"
msgid ""
@@ -6113,6 +6256,9 @@ msgstr "Показати/сховати"
msgid "Information about layer"
msgstr "Інформація про шар"
+msgid "Map paint preferences"
+msgstr "Налаштування кольорів мапи"
+
msgid "Map Paint Styles"
msgstr "Стиль кольорів мапи"
@@ -6197,19 +6343,51 @@ msgstr "Стиль є активним?"
msgid "No"
msgstr "Ні"
-msgid "Relations"
-msgstr "Зв’язки"
+msgid "Object type:"
+msgstr "Тип об’єкту:"
-msgid "Open a list of all relations."
-msgstr "Відкрити список усіх зв’язків."
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "мішаний"
-msgid "Relation list filter"
-msgstr "Фільтр переліку зв’язків"
+msgid "Choose the OSM object type"
+msgstr "Оберіть тип об’єкту OSM"
-msgid "Create a new relation"
-msgstr "Створити новий зв’язок"
+msgid "Object ID:"
+msgstr "Ідентифікатор об’єкту:"
-msgid "New"
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Введіть ідентифікатор об’єкту, який потрібно завантажити з сервера"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"ID об’єктів можуть бути відокремлені комою чи пробілом.<br/> Приклад: "
+"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> у змішаному вигляді "
+"об’єкти зазначаються наступним чином: <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+"Зазначено невірний ID переліку\n"
+"Продовження неможливе."
+
+msgid "Relations"
+msgstr "Зв’язки"
+
+msgid "Open a list of all relations."
+msgstr "Відкрити список усіх зв’язків."
+
+msgid "Relation list filter"
+msgstr "Фільтр переліку зв’язків"
+
+msgid "Create a new relation"
+msgstr "Створити новий зв’язок"
+
+msgid "New"
msgstr "Створити"
msgid "Relations: {0}/{1}"
@@ -6218,9 +6396,6 @@ msgstr "Зв’язки: {0}/{1}"
msgid "Relations: {0}"
msgstr "Зв’язки: {0}"
-msgid "Selection"
-msgstr "Виділення"
-
msgid "Open a selection list window."
msgstr "Відкрити вікно зі списком виділених об’єктів."
@@ -6245,18 +6420,6 @@ msgstr "Зараз не можна виділити"
msgid "Selection: {0}"
msgstr "Вибір: {0}"
-msgid "Side buttons"
-msgstr "Бокові кнопки"
-
-msgid "Always shown"
-msgstr "Завжди показувати"
-
-msgid "Dynamic"
-msgstr "Динамічно"
-
-msgid "Always hidden"
-msgstr "Завжди ховати"
-
msgid "Toggle dynamic buttons"
msgstr "Ввімкнути динамічні кнопки"
@@ -6275,6 +6438,18 @@ msgstr ""
msgid "Click to minimize/maximize the panel content"
msgstr "Натисніть для згортання/розгортання панелі"
+msgid "Side buttons"
+msgstr "Динамічні кнопки"
+
+msgid "Always shown"
+msgstr "Завжди показувати"
+
+msgid "Dynamic"
+msgstr "Динамічно"
+
+msgid "Always hidden"
+msgstr "Завжди ховати"
+
msgid "Authors"
msgstr "Автори"
@@ -6288,16 +6463,15 @@ msgstr[1] "{0} Автори"
msgstr[2] "{0} Авторів"
msgid "Select objects submitted by this user"
-msgstr "Виділити об’єкти надіслані цим користувачем"
+msgstr "Виділити об’єкти надіслані цим учасником"
msgid "Launches a browser with information about the user"
-msgstr "Відкрити у оглядачі інформацію про користувача"
+msgstr "Відкрити у оглядачі інформацію про учасника"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
-"Увага: відкриваються сторінки інформації про перших {0} з {1} виділених "
-"користувачів"
+"Відкрити в оглядачі інформацію тільки про перших {0} з {1} виділених "
+"учасників"
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -6324,9 +6498,6 @@ msgstr "Відкрити вікно перевірки"
msgid "Validation results"
msgstr "Результат перевірки"
-msgid "Zoom to problem"
-msgstr "Наблизитися до проблеми"
-
msgid "Fix"
msgstr "Виправити"
@@ -6416,7 +6587,7 @@ msgid ""
"download<br>your changesets from the OSM server unless you enter your OSM "
"user name<br>in the JOSM preferences.</html>"
msgstr ""
-"<html>JOSM запущений від імені анонімного користувача.Він не може "
+"<html>JOSM запущений від імені анонімного користувача. Він не може "
"завантажити<br>ваші набори змін з сервера OSM, поки не введено ім’я "
"користувача<br>в налаштуваннях JOSM.</html>"
@@ -6474,9 +6645,6 @@ msgstr "Оновити вміст"
msgid "Update the changeset content from the OSM server"
msgstr "Оновити вміст набору змін з сервера OSM"
-msgid "Show history"
-msgstr "Показати історію"
-
msgid "Download and show the history of the selected objects"
msgstr "Завантажити та показати історію виділених об’єктів"
@@ -6604,7 +6772,7 @@ msgstr ""
"Завантажити набір змін з вказаним номером, включаючи вміст набору змін"
msgid "Select changesets owned by specific users"
-msgstr "Виберіть набори змін, що належать певним користувачам"
+msgstr "Виберіть набори змін, що належать певним учасникам"
msgid "Select changesets depending on whether they are open or closed"
msgstr "Виберіть набори змін залежно від того, відкриті вони або закриті"
@@ -6629,7 +6797,7 @@ msgid "Query both open and closed changesets"
msgstr "Отримати відкриті та закриті набори змін"
msgid "User ID:"
-msgstr "Ід. користувача:"
+msgstr "Ід. учасника:"
msgid "User name:"
msgstr "Ім’я користувача:"
@@ -6638,10 +6806,10 @@ msgid "Only changesets owned by myself"
msgstr "Тільки мої набори змін"
msgid "Only changesets owned by the user with the following user ID"
-msgstr "Тільки набори змін користувача з ідентифікатором"
+msgstr "Тільки набори змін учасника з ідентифікатором"
msgid "Only changesets owned by the user with the following user name"
-msgstr "Тільки набори змін користувача з іменем"
+msgstr "Тільки набори змін учасника з іменем"
msgid ""
"Only changesets owned by myself (disabled. JOSM is currently run by an "
@@ -6658,24 +6826,24 @@ msgstr ""
"так як він є анонімним"
msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "Поточне значення ''{0}'' для ідентифікатора користувача недійсне"
+msgstr "Поточне значення ''{0}'' для ідентифікатора учасника недійсне"
msgid "Cannot restrict the changeset query to the user name ''{0}''"
msgstr ""
-"Не можливо обмежити отримання наборів змін змінами для користувача з іменем "
-"— ''{0}''"
+"Не можливо обмежити отримання наборів змін змінами для учасника з іменем — "
+"''{0}''"
msgid "Please enter a valid user ID"
-msgstr "Будь ласка, введіть дійсний ідентифікатор користувача"
+msgstr "Будь ласка, введіть дійсний ідентифікатор учасника"
msgid "Invalid user ID"
-msgstr "Недійсний ідентифікатор користувача"
+msgstr "Недійсний ідентифікатор учасника"
msgid "Please enter a non-empty user name"
-msgstr "Будь ласка, введіть непорожнє ім’я користувача"
+msgstr "Будь ласка, введіть непорожнє ім’я учасника"
msgid "Invalid user name"
-msgstr "Невірне ім’я користувача"
+msgstr "Невірне ім’я учасника"
msgid "Date: "
msgstr "Дата: "
@@ -6736,8 +6904,8 @@ msgstr "Невірний габаритний прямокутник"
msgid ""
"The current value is not a valid user ID. Please enter an integer value > 0"
msgstr ""
-"Поточне значення не є вірним ідентифікатором користувача. Будь ласка, "
-"введіть ціле значення > 0"
+"Поточне значення не є вірним ідентифікатором учасника. Будь ласка, введіть "
+"ціле значення > 0"
msgid "Please enter an integer value > 0"
msgstr "Будь ласка, введіть ціле число> 0"
@@ -6746,11 +6914,11 @@ msgid ""
"<html>The current value is not a valid user name.<br>Please enter an non-"
"empty user name.</html>"
msgstr ""
-"<html>Поточне значення не є вірним ідентифікатором користувача.<br>Будь "
-"ласка, введіть непорожнє ім’я користувача.</html>"
+"<html>Поточне значення не є вірним ідентифікатором учасника.<br>Будь ласка, "
+"введіть непорожнє ім’я учасника.</html>"
msgid "Please enter an non-empty user name"
-msgstr "Будь ласка, введіть непорожнє ім’я користувача"
+msgstr "Будь ласка, введіть непорожнє ім’я учасника"
msgid ""
"Please enter a date in the usual format for your locale.<br>Example: "
@@ -6795,7 +6963,7 @@ msgid ""
"user name in the preferences first.</em></html>"
msgstr ""
"<html>Завантажити мої відкриті набори змін<br><em>Відключено. Будь ласка, "
-"вкажіть спочатку ваше ім’я користувача OSM в налаштуваннях.</em></html>"
+"вкажіть спочатку ваше ім’я учасника OSM в налаштуваннях.</em></html>"
msgid "<html>Download my open changesets</html>"
msgstr "<html>Завантажити мої відкриті набори змін</html>"
@@ -6811,11 +6979,11 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>Завантажити набори змін для поточного виду мапи</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
-"Увага: неочікуване значення для налаштування ''{0}'', отримано ''{1}''. "
-"Скидання до типового запиту."
+"Неочікуване значення ''{1}'' параметру налаштувань ''{0}''. Скидання до "
+"типового запиту."
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr ""
@@ -6883,35 +7051,47 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr "Недійсний URL запиту отримання набору змін"
-msgid "Select objects for which to change properties."
-msgstr "Виділіть об’єкти властивості яких потрібно змінити."
+msgid "Discardable key: selection Foreground"
+msgstr "Застарілий теґ: виділення Foreground"
-msgid "Properties/Memberships"
-msgstr "Параметри/Членство"
+msgid "Discardable key: selection Background"
+msgstr "Застарілий теґ: виділення Background"
-msgid "Properties for selected objects."
-msgstr "Параметри обраних об’єктів."
+msgid "Discardable key: foreground"
+msgstr "Застарілий теґ: foreground"
+
+msgid "Discardable key: background"
+msgstr "Застарілий теґ: background"
msgid "<different>"
msgstr "<різні>"
+msgid "Select objects for which to change tags."
+msgstr "Виділіть об’єкти для яких потрібно змінити теґи."
+
+msgid "Tags/Memberships"
+msgstr "Теґи/Членство"
+
+msgid "Tags for selected objects."
+msgstr "Теґи виділених об’єктів."
+
msgid "Member Of"
msgstr "Член групи"
msgid "Position"
msgstr "Розташування"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "Параметрів: {0} / Членів: {1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr "Теґи: {0} / Членство: {1}"
-msgid "Properties / Memberships"
-msgstr "Параметри / Члени"
+msgid "Tags / Memberships"
+msgstr "Теґи / Членство"
msgid "Delete the selected key in all objects"
msgstr "Вилучити обраний ключ зі всіх об’єктів"
-msgid "Delete Properties"
-msgstr "Вилучити параметри"
+msgid "Delete Tags"
+msgstr "Вилучити теґи"
msgid "Change relation"
msgstr "Змінити зв’язок"
@@ -6925,14 +7105,14 @@ msgstr "Ви дійсно бажаєте вилучити цей елемент
msgid "Add a new key/value pair to all objects"
msgstr "Додати нову пару ключ/значення до всіх об’єктів"
-msgid "Add Property"
-msgstr "Додати параметр"
+msgid "Add Tag"
+msgstr "Додати теґ"
msgid "Edit the value of the selected key for all objects"
msgstr "Правити значення обраного ключа для всіх об’єктів"
-msgid "Edit Properties"
-msgstr "Редагувати параметри"
+msgid "Edit Tags"
+msgstr "Редагувати теґи"
msgid "Go to OSM wiki for tag help (F1)"
msgstr "Перейти до OSM-Вікі, щоб отримати довідку про теґ (F1)"
@@ -7017,12 +7197,6 @@ msgstr[2] "Зміна властивостей {0} об’єктів"
msgid "Use English language for tag by default"
msgstr "Для теґів типово використовувати англійську"
-msgid "Paste tag"
-msgstr "Вставити теґи"
-
-msgid "Paste value"
-msgstr "Вставити значення"
-
msgid "Add value?"
msgstr "Додати значення?"
@@ -7053,9 +7227,15 @@ msgstr "Будь ласка, вкажіть ціле число від 1 до {0
msgid "Recently added tags"
msgstr "Нещодавно додані теґи"
+msgid "Choose recent tag {0}"
+msgstr "Вибрати останній теґ {0}"
+
msgid "Use this tag again"
msgstr "Використовуйте цей теґ знову"
+msgid "Apply recent tag {0}"
+msgstr "Застосувати останній теґ {0}"
+
msgid "The key ''{0}'' is already used"
msgstr "Ключ ''{0}'' вже використовується"
@@ -7097,10 +7277,8 @@ msgstr "Зв’язок вилучено"
msgid "Downloading relation {0}"
msgstr "Завантаження зв’язку {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr ""
-"Попередження: Ігнорування винятку, тому що завдання було відмінено. Виняток: "
-"{0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr "Ігнорування винятку, завдання було скасоване. Виняток: {0}"
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -7165,6 +7343,11 @@ msgstr "Вилучити їх із зв’язку"
msgid "Ignore them, leave relation as is"
msgstr "Ігнорувати, залишити зв’язок як є"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+"Вибачте, комбінація клавіш \"{0}\" на може бути використана в діалозі "
+"редактора зв’язків"
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -7446,6 +7629,28 @@ msgstr "лінія з’єднана з наступним членом зв’
msgid "way is not connected to previous or next relation member"
msgstr "лінія не з’єднана ні з попереднім, ні з наступним членом зв’язку"
+msgid "{0} - {1} ({2})"
+msgstr "{0} - {1} ({2})"
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "Помилкова кількість аргументів для закладки"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "Помилка читання закладки: %s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Неочікуваний рядок ''{0}'' у файлі закладок ''{1}''"
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Помилкове значення типу double ''{0}'' у рядку ''{1}'' у файлі закладок "
+"''{2}''"
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+"<html>Неможливо прочитати закладки з<br>''{0}''<br>Помилка: {1}</html>"
+
msgid "Bookmarks"
msgstr "Закладки"
@@ -7518,9 +7723,6 @@ msgstr "Значення широти має бути в межах [-90,90]."
msgid "Value for longitude in range [-180,180] required."
msgstr "Значення довготи має бути в межах [-180,180]."
-msgid "Paste URL from clipboard"
-msgstr "Вставити URL з буфера обміну"
-
msgid "Data Sources and Types:"
msgstr "Джерела і типи даних:"
@@ -7599,21 +7801,8 @@ msgstr "Завантаження пов’язаних членів (батьк
msgid "Download object"
msgstr "Завантажити об’єкт"
-msgid "Object type:"
-msgstr "Тип об’єкту:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "мішаний"
-
-msgid "Choose the OSM object type"
-msgstr "Оберіть тип об’єкту OSM"
-
-msgid "Object ID:"
-msgstr "Ідентифікатор об’єкту:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Введіть ідентифікатор об’єкту, який потрібно завантажити з сервера"
+msgid "Start downloading"
+msgstr "Почати завантаження"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -7625,28 +7814,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "Виберіть, якщо члени зв’язку повинні також бути завантажені"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"ID об’єктів можуть бути відокремлені комою чи пробілом.<br/> Приклад: "
-"<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> у змішаному вигляді "
-"об’єкти зазначаються наступним чином: <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "Завантаження пов’язаних членів (батьківські зв’язки та лінії)"
-msgid "Start downloading"
-msgstr "Почати завантаження"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"Задано невірний перелік ID\n"
-"Неможливо завантажити об’єкт."
-
msgid "Class Type"
msgstr "Тип класу"
@@ -7759,8 +7929,8 @@ msgstr "Перейти до наступної сторінки"
msgid "Go to the JOSM help home page"
msgstr "Перейти до початкової сторінки довідки JOSM"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Попередження: невірне розташування в документі HTML. Помилка: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr "Погане розташування в HTML документі. Виняток: {0}"
msgid "Failed to open help page. The target URL is empty."
msgstr "Не вдалося відкрити сторінку довідки. Цільовий URL порожній."
@@ -7868,6 +8038,9 @@ msgid ""
msgstr ""
"<html>Версію <strong>{0}</strong> створено у <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr "Коментар набору змін"
+
msgid "Changeset info"
msgstr "Інформація набору змін"
@@ -7978,9 +8151,8 @@ msgstr ""
msgid "Object still in use"
msgstr "Об’єкт все ще використовується"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Попередження: помилка в заголовку \"{0}\" не відповідає очікуваному шаблону"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr "Заголовок помилки \"{0}\" відрізняється від очікуванного шаблону"
msgid "Upload"
msgstr "Надіслати"
@@ -8002,6 +8174,12 @@ msgstr "Напишіть короткий пояснення для змін, я
msgid "Enter an upload comment"
msgstr "Введіть коментар до даних, що надсилаються на сервер"
+msgid "Specify the data source for the changes:"
+msgstr "Зазначте джерело даних для цих змін:"
+
+msgid "Enter a source"
+msgstr "Додайте джерело"
+
msgid "Changeset id:"
msgstr "Набір змін:"
@@ -8074,11 +8252,10 @@ msgid "Closing changeset {0}"
msgstr "Закриття набору змін {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
-"Попередження: не вдалося утримати діалог облікових даних завжди поверх "
-"вікон. Виявлена помилка безпеки."
+"Неможливо зробити Діалог облікових даних завжди зверху. Отримано виняток "
+"безпеки."
msgid "Enter credentials for OSM API"
msgstr "Введіть облікові дані для OSM API"
@@ -8162,11 +8339,11 @@ msgid "Unpacking {0} into {1}"
msgstr "Розпакування {0} в {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
-"Попередження: Не вдається завантажити файл ''{0}''. Посилання на нього "
-"''{1}'' не є допустимою URL-адресою. Пропускаємо завантаження."
+"Неможливо завантажити файл ''{0}''. Посилання для його завантаження ''{1}'' "
+"не є вірними URL. Пропускаємо завантаження."
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8176,17 +8353,15 @@ msgid ""
msgstr ""
"Не вдалося отримати ваш список відкритих наборів змін, оскільки<br>JOSM не "
"ідентифікував вас.<br>Або ви працюєте анонімно, або вам не "
-"дозволено<br>ідентифікувати користувача, від імені якого ви працюєте."
+"дозволено<br>ідентифікувати учасника, від імені якого ви працюєте."
msgid "Missing user identity"
-msgstr "Ідентифікації користувача відсутня"
+msgstr "Ідентифікації учасника відсутня"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
-"Попередження: Не вдалося отримати інформацію про поточного користувача JOSM. "
-"Помилка: {0}"
+"Не вдалося отримати інформацію про поточного користувача JOSM. Виняток: {0}"
msgid "Download objects"
msgstr "Завантаження об’єктів"
@@ -8443,12 +8618,6 @@ msgstr "Надіслати на сервер змінені елементи"
msgid "Please revise upload comment"
msgstr "Будьласка, перегляньте свій коментар"
-msgid "Revise"
-msgstr "Переглянути"
-
-msgid "Continue as is"
-msgstr "Продовжити так як є"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -8458,11 +8627,31 @@ msgid ""
msgstr ""
"Ваш коментар — <i>порожній</i> або <i>дуже короткий</i>.<br /><br "
"/>Технічно, його можливо лишити таким, але зважте на те, що багато "
-"користувачів<br />переглядають зміни у цій ділянці бажають бачити зрозумілі "
+"учасників<br />переглядають зміни у цій ділянці бажають бачити зрозумілі "
"пояснення<br />того, що тут було змінено!<br /><br />Якщо зараз ви витратите "
"хвилину на пояснення того, що ви зробили,<br />це полегшити роботу інших "
"учасників проекту."
+msgid "Please specify a changeset source"
+msgstr "Будь ласка, вкажіть джерело даних"
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+"Ви не вказали джерело даних для цих змін.<br />Технічно це дозволяється, але "
+"це може допомогти іншим учасникам <br />зрозуміти походження цих даних.<br "
+"/><br />Витратьте хвилину зараз, для того щоб пояснити внесені вами зміни, "
+"це значно<br />спростить життя іншим маперам."
+
+msgid "Revise"
+msgstr "Переглянути"
+
+msgid "Continue as is"
+msgstr "Продовжити так як є"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
"Повернутись до попереднього вікна, щоб ввести більш докладний коментар"
@@ -8479,6 +8668,27 @@ msgstr "Будь ласка, спочатку введіть вірний роз
msgid "Illegal chunk size"
msgstr "Невірний розмір порції"
+msgid "{0}={1}"
+msgstr "{0}={1}"
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+"<html>Теґ набору змін має пусті ключ/значення:<br>{0}<br>Продовжити?</html>"
+msgstr[1] ""
+"<html>Теґи набору змін мають пусті "
+"ключ/значення:<br>{0}<br>Продовжити?</html>"
+msgstr[2] ""
+"<html>Теґи набору змін мають пусті "
+"ключ/значення:<br>{0}<br>Продовжити?</html>"
+
+msgid "Empty metadata"
+msgstr "Відсутні метадані"
+
msgid "Cancel the upload and resume editing"
msgstr "Відмінити надсилання даний та повернутись до редагування"
@@ -8486,11 +8696,11 @@ msgid "Tags of changeset {0}"
msgstr "Теґи набору змін {0}"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
-"Попередження: об’єкт ''{0}'' вилучений на сервері. Дані будуть знову "
-"надіслані на сервер, але без цього об’єкта."
+"Об’єкт ''{0}'' вилучено на сервері. Пропускаємо його та намагаємось "
+"повторити надсилання."
msgid "Preparing objects to upload ..."
msgstr "Підготування об’єктів до надсилання…"
@@ -8637,9 +8847,6 @@ msgstr ""
"Об’єкт ''{0}'' вилучений. Об’єкт буде пропущено під час надсилання даних на "
"сервер."
-msgid "Warning: {0}"
-msgstr "Попередження: {0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "Надсилання {0} об’єкту…"
@@ -8652,6 +8859,9 @@ msgstr ""
"Ігнорування виявленого виключення, тому що надсилання на сервер скасовано. "
"Помилка: {0}"
+msgid "Upload successful!"
+msgstr "Дані збережено!"
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -8672,10 +8882,8 @@ msgstr "Виділити об’єкти для надсилання"
msgid "Cancel uploading"
msgstr "Відмінити надсилання"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
-"Попередження: несподіване значення ключа ''{0}'' в налаштуваннях, отримано "
-"''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr "Неочікуване значення ''{1}'' для ключа ''{0}'' у налаштуваннях"
msgid "Please select the upload strategy:"
msgstr "Будь ласка, виберіть стратегію надсилання:"
@@ -8835,7 +9043,7 @@ msgstr "Наступна мітка"
msgid "Jump to next marker"
msgstr "Перейти до наступного маркера"
-msgid "Previos marker"
+msgid "Previous marker"
msgstr "Попередня мітка"
msgid "Jump to previous marker"
@@ -8857,7 +9065,7 @@ msgid "Save Layer"
msgstr "Зберегти шар"
msgid "Data Layer {0}"
-msgstr "Шар даних {0}"
+msgstr "Дані {0}"
msgid "outside downloaded area"
msgstr "по-за межами завантаженої ділянки"
@@ -8868,8 +9076,9 @@ msgstr "версія {0}"
msgid "Merging layers"
msgstr "Злиття шарів"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Увага: спільне використання даних версій 0.6 і 0.5 у версії 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+"В результаті змішування даних версії 0.6 та 0.5 отримуємо дані версії 0.5"
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8941,7 +9150,7 @@ msgid ""
"{1}\n"
"Change the projection or remove the layer."
msgstr ""
-"Шар TMSне підтримує проекцію {0}.\n"
+"Шар TMS не підтримує проекцію {0}.\n"
"{1}\n"
"Змініть проекцію або вилучіть шар."
@@ -8990,6 +9199,9 @@ msgstr "збільшити масштаб, що побачити більше д
msgid "No tiles at this zoom level"
msgstr "На цьому рівні масштабування квадрати мапи відсутні"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr "Шар TMS ({0}), завантажується в масштабі {1}"
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "Підтримуються проекції EPSG:4326 та Mercator"
@@ -9029,6 +9241,9 @@ msgstr "Перезавантажити помилкові квадрати"
msgid "Alpha channel"
msgstr "Альфа-канал"
+msgid "Automatically change resolution"
+msgstr "Автоматично змінювати розподільчу здатність"
+
msgid "Set WMS Bookmark"
msgstr "Встановити закладку WMS"
@@ -9242,9 +9457,6 @@ msgstr "Видобування координат GPS з EXIF"
msgid "Starting directory scan"
msgstr "Запуск сканування каталогу"
-msgid "One of the selected files was null"
-msgstr "Один з виділених файлів порожній"
-
msgid "Read photos..."
msgstr "Переглянути фотографії…"
@@ -9263,6 +9475,9 @@ msgstr "Знайдено порожній файл в каталозі {0}\n"
msgid "Error while getting files from directory {0}\n"
msgstr "Помилка читання файлів з каталогу {0}\n"
+msgid "One of the selected files was null"
+msgstr "Один з виділених файлів порожній"
+
msgid "Geotagged Images"
msgstr "Зображення з геотеґами"
@@ -9324,6 +9539,12 @@ msgstr "Наступне"
msgid "Show next Image"
msgstr "Показати наступне зображення"
+msgid "Show first Image"
+msgstr "Показати перше зображення"
+
+msgid "Show last Image"
+msgstr "Показати останнє зображення"
+
msgid "Center view"
msgstr "Центрувати вид"
@@ -9407,9 +9628,6 @@ msgstr ""
"вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з "
"цим:</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "Налаштування креслення треків"
@@ -9422,8 +9640,11 @@ msgstr "По"
msgid "No timestamp"
msgstr "Немає відбитку часу"
-msgid "Download from OSM along this track"
-msgstr "Завантажити з OSM дані уздовж цього треку"
+msgid "Select to download OSM data."
+msgstr "Виділіть для завантаження даних OSM."
+
+msgid "Select to download GPS traces."
+msgstr "Виділіть для завантаження треків GPX."
msgid "Download everything within:"
msgstr "Завантажити всі в межах:"
@@ -9449,16 +9670,18 @@ msgstr "тільки маршрутні точки"
msgid "track and waypoints"
msgstr "треки та маршрутні точки"
+msgid "Click to download"
+msgstr "Натисніть для завантаження"
+
+msgid "Click to cancel"
+msgstr "Натисніть для відміни"
+
+msgid "Download from OSM along this track"
+msgstr "Завантажити з OSM дані уздовж цього треку"
+
msgid "Calculating Download Area"
msgstr "Обрахунок Ділянки для Завантаження"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Ця дія потребує {0} окремих<br>запитів на завантаження. "
-"Продовжити?</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "Завантажити до кешу фонове зображення вздовж треку"
@@ -9605,16 +9828,12 @@ msgstr "Сталася помилка при спробі показати URL
msgid "(URL was: "
msgstr "(посилання: "
-msgid "Error displaying URL"
-msgstr "Помилка показу URL"
-
msgid "Select the map painting styles"
msgstr "Виберіть стилі відтворення мапи"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
-"Попередження: не вдалося завантажити стилі Mappaint з ''{0}''. Помилка: {1}"
+"Не вдалось завантажити стилі кольорів мапи з ''{0}''. Виключення: {1}"
msgid "loading style ''{0}''..."
msgstr "завантаження стилю ''{0}''…"
@@ -9635,9 +9854,8 @@ msgstr[2] ""
"Під час завантаження стилю виникло {0} помилок. Подробиці у пункті "
"\"Інформація\" контекстного меню."
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr ""
-"Попередження: помилка розбору стилів Mappaint з ''{0}''. Помилка: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr "Не вдалось розібрати стилі кольорів мапи з ''{0}''. Помилка: {1}"
msgid "Illegal dash pattern, values must be positive"
msgstr "Невірний шаблон переривчастою лінії, значення має бути позитивним"
@@ -9647,11 +9865,9 @@ msgstr ""
"Невірний шаблон переривчастою лінії, принаймні, одне значення має бути> 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
-"Попередження: помилка розбору стилів Mappaint з ''{0}''. Помилка: [{1}:{2}] "
-"{3}"
+"Не вдалось розібрати стилі кольорів мапи з ''{0}''. Помилка: [{1}:{2}] {3}"
msgid "Access Token Key:"
msgstr "Ключ мітки доступу:"
@@ -9915,8 +10131,8 @@ msgstr "Закрити діалог і скасувати авторизацію
msgid "Close the dialog and accept the Access Token"
msgstr "Закрити діалог і прийняти мітку доступу"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "Попередження: через збій відмінено запуск операції OAuth"
+msgid "Failed to cancel running OAuth operation"
+msgstr "Не вдалось скасувати запуск операції OAuth"
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "Отримання мітки запиту OAuth з ''{0}''"
@@ -9987,6 +10203,12 @@ msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
"Виберіть, для надання JOSM прав на запис ваших налаштувань для сервера"
+msgid "Allow modifications of notes"
+msgstr "Дозволити змінювати нотатки"
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr "Позначте, щоб JOSM мав змогу змінювати нотатки від вашого імені"
+
msgid "Retrieving OAuth Access Token..."
msgstr "Отримання мітки доступу OAuth…"
@@ -10056,9 +10278,6 @@ msgstr ""
"використовувати його для автентифікації та авторизації на сервері "
"OSM.<br><br>Мітка доступу: </html>"
-msgid "Restart"
-msgstr "Перезапустити"
-
msgid "Click to retrieve a Request Token"
msgstr "Натисніть, щоб отримати мітку доступу"
@@ -10349,6 +10568,9 @@ msgstr "Завантажити втулки"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "Потрібно перезапустити JOSM, щоб зміни набрали сили."
+msgid "Would you like to restart now?"
+msgstr "Ви бажаєте перезапустити програму зараз?"
+
msgid "Remote Control"
msgstr "Дистанційне керування"
@@ -10377,7 +10599,7 @@ msgstr ""
"звертаються до JOSM."
msgid "Enable remote control"
-msgstr "Включити дистанційне керування"
+msgstr "Включити Дистанційне керування"
msgid "Permitted actions:"
msgstr "Допустимі дії:"
@@ -10481,6 +10703,12 @@ msgstr "Вилучити з панелі інструментів"
msgid "Configure toolbar"
msgstr "Налаштувати панель інструментів"
+msgid "Edit shortcut"
+msgstr "Змінити сполучення клавіш"
+
+msgid "Do not hide toolbar and menu"
+msgstr "Не приховувати панель інструментів та меню"
+
msgid "Actions"
msgstr "Дії"
@@ -10524,6 +10752,9 @@ msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
"Зареєстрована дія панелі інструментів {0} перезаписана: {1} отримав(ла) {2}"
+msgid "Toolbar: {0}"
+msgstr "Панель нструментів: {0}"
+
msgid "Data validator"
msgstr "Перевірка даних"
@@ -10532,7 +10763,7 @@ msgid ""
"programs."
msgstr ""
"Перевірка даних OSM, яка перевіряє наявність загальних помилок, що "
-"здійснюються користувачами та програмами-редакторами."
+"здійснюються учасниками та програмами-редакторами."
msgid "Use ignore list."
msgstr "Використовувати список ігнорування."
@@ -10576,24 +10807,12 @@ msgstr "Пошук: "
msgid "Read from file"
msgstr "Читати з файлу"
-msgid "Open JOSM customization file"
-msgstr "Відкрити файл власних налаштувань користувача JOSM"
-
-msgid "Import log"
-msgstr "Журнал импорту"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>Це файл із результатами імпорту. <br/>Ви можете відмінити зміни "
-"налаштувань натиснувши на кнопку «Скасувати» у вікні налаштувань.<br/>Щоб "
-"задіяти деякі зміни потрібно перезапустити JOSM.</html>"
-
msgid "Export selected items"
msgstr "Експорт виділених елементів"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "Файли власних налаштувань користувача JOSM (*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr "Оберіть, будь ласка, кілька параметрів, які не мають типових значень"
@@ -10609,43 +10828,56 @@ msgstr "Додати налаштування з цього файлу до іс
msgid "Replace existing values"
msgstr "Замінити існуючі налаштування"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "Файли власних налаштувань користувача JOSM (*.xml)"
+msgid "Open JOSM customization file"
+msgstr "Відкрити файл власних налаштувань користувача JOSM"
-msgid "Advanced Background: Changed"
-msgstr "Розширене значення фону: Змінений"
+msgid "Import log"
+msgstr "Журнал импорту"
-msgid "Advanced Background: NonDefalut"
-msgstr "Розширене значення фону: Нетиповий"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>Це файл із результатами імпорту. <br/>Ви можете відмінити зміни "
+"налаштувань натиснувши на кнопку «Скасувати» у вікні налаштувань.<br/>Щоб "
+"задіяти деякі зміни потрібно перезапустити JOSM.</html>"
-msgid "Current value is default."
-msgstr "Поточне значення є типовим."
+msgid "shortcut"
+msgstr "комбінації клавіш"
-msgid "Default value is ''{0}''."
-msgstr "Типове значення — ''{0}''."
+msgid "color"
+msgstr "для кольорів"
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Типове значення на поточний момент невідоме (параметр досі не "
-"використовувався)."
+msgid "toolbar"
+msgstr "панелі інструментів"
-msgid "Select Setting Type:"
-msgstr "Оберіть тип налаштувань"
+msgid "imagery"
+msgstr "фонових зображень"
-msgid "Simple"
-msgstr "Простий"
+msgid "Reset preferences"
+msgstr "Скинути налаштування"
-msgid "List"
-msgstr "Список"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
+"Ви намагаєтесь скинути налаштування на типові значення<br />Всі ваші "
+"налаштування будуть вилучені: втулки, фільтри, кнопки на панелі "
+"інструментів, комбінації клавіш й т.і. <br />Ви дійсно бажаєте продовжити?"
-msgid "List of lists"
-msgstr "Перелік списків"
+msgid "Load profile"
+msgstr "Завантажити профіль"
-msgid "List of maps"
-msgstr "Перелік мап"
+msgid "Save {0} profile"
+msgstr "Зберегти профіль {0}"
-msgid "Add setting"
-msgstr "Додати параметр"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr "Всі налаштування для цієї групи є типовими — немає що зберігати"
+
+msgid "Choose profile file"
+msgstr "Оберіть файл профілю"
msgid "Change list setting"
msgstr "Змінити пареметр списку"
@@ -10668,6 +10900,41 @@ msgstr "Змінити параметри переліку мап"
msgid "Entry {0}"
msgstr "Пункт {0}"
+msgid "Select Setting Type:"
+msgstr "Оберіть тип налаштувань"
+
+msgid "Simple"
+msgstr "Простий"
+
+msgid "List"
+msgstr "Список"
+
+msgid "List of lists"
+msgstr "Перелік списків"
+
+msgid "List of maps"
+msgstr "Перелік мап"
+
+msgid "Add setting"
+msgstr "Додати параметр"
+
+msgid "Advanced Background: Changed"
+msgstr "Розширене значення фону: Змінений"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "Поточне значення є типовим."
+
+msgid "Default value is ''{0}''."
+msgstr "Типове значення — ''{0}''."
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+"Типове значення на поточний момент невідоме (параметр досі не "
+"використовувався)."
+
msgid "Change string setting"
msgstr "Змінити праметри рядка"
@@ -10724,6 +10991,9 @@ msgstr "Показувати віртуальні точки в режимі в
msgid "Draw inactive layers in other color"
msgstr "Показувати неактивні шари іншим кольором"
+msgid "Display discardable keys"
+msgstr "Показувати застарілі теґи"
+
msgid "Highlight target ways and nodes"
msgstr "Підсвічувати лінії та точки"
@@ -10784,6 +11054,13 @@ msgstr ""
"Ця опція пригнічує заповнення ділянок, відкидаючи будь що, що зазначено в "
"обраному стилі."
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+"Показувати теґи, які були визнані застарілими до такої міри, що вони можуть "
+"бути вилучені без попередження."
+
msgid "Options that affect drawing performance"
msgstr "Параметри, що впливають на швидкодію"
@@ -10817,7 +11094,7 @@ msgid "Name or offset"
msgstr "Назва чи зсув"
msgid "None"
-msgstr "Нічого"
+msgstr "Ні, не показувати"
msgid "Custom"
msgstr "Власне"
@@ -11092,8 +11369,14 @@ msgstr "Отримати шари"
msgid "2. Select layers"
msgstr "2. Оберіть шари"
-msgid "3. Verify generated WMS URL"
-msgstr "3. Перевірте отриманий WMS URL"
+msgid "3. Select image format"
+msgstr "3. Оберіть формат зображення"
+
+msgid "4. Verify generated WMS URL"
+msgstr "4. Перевірте створений WMS URL"
+
+msgid "5. Enter name for this layer"
+msgstr "5. Додайте назву для цього шару"
msgid "Show Bounds"
msgstr "Показати границі"
@@ -11270,6 +11553,12 @@ msgstr ""
"<i>(JOSM може залишати резервні копії зберігаючи шари з даними. Він додає до "
"їх назви ''~'' та зберігає у ту ж саму теку.)</i>"
+msgid "Notification at each save"
+msgstr "Повідомлення при кожному збереженні"
+
+msgid "When saving, display a small notification"
+msgstr "Під час збереження показувати невеличке повідомлення"
+
msgid "File backup"
msgstr "Резервне копіювання файлів"
@@ -11339,8 +11628,8 @@ msgstr "Налаштування мапи"
msgid "Settings for the map projection and data interpretation."
msgstr "Налаштування проекції мапи та інтерпретації даних."
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "Попередження: Неможливо прочитати джерело шаблонів: {0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -11622,21 +11911,6 @@ msgstr "Швейцарська проекція"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (без локальної корекції)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "Зона UTM"
-
-msgid "North"
-msgstr "Північна"
-
-msgid "South"
-msgstr "Південна"
-
-msgid "Hemisphere"
-msgstr "Півкуля"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Форт Marigot Гваделупа 1949"
@@ -11658,6 +11932,21 @@ msgstr "Франція UTM (DOM)"
msgid "UTM Geodesic system"
msgstr "Система координат UTM"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "Зона UTM"
+
+msgid "North"
+msgstr "Північна"
+
+msgid "South"
+msgstr "Південна"
+
+msgid "Hemisphere"
+msgstr "Півкуля"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "Перевірка URL OSM API ''{0}''"
@@ -11722,11 +12011,11 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "Вибрати для використання OAuth, як механізму перевірки автентичності"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
-"Попередження: Непідтримуване значення параметру ''{0}'', маємо ''{1}''. "
-"Використовується метод ''Базової автентифікації''."
+"Не підтримуване значення ''{1}'' в параметрі ''{0}''. Використовуємо метод "
+"''Базової автентифікації''."
msgid "OSM username:"
msgstr "Ім’я в OSM:"
@@ -11734,29 +12023,26 @@ msgstr "Ім’я в OSM:"
msgid "OSM password:"
msgstr "Пароль в OSM:"
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr ""
-"Попередження: не вдалося отримати облікові дані OSM від менеджера облікових "
-"даних."
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr "Не вдалось отримати облікові дані ОСМ з менеджера облікових даних."
msgid "Current credential manager is of type ''{0}''"
msgstr "Поточний менеджер облікових записів має тип ''{0}''"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr ""
-"Попередження: Не вдалося зберегти облікові дані OSM в менеджері облікових "
-"даних."
+msgid "Failed to save OSM credentials to credential manager."
+msgstr "Не вдалось зберегти облікові дані в менеджері облікових даних."
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
-"Попередження: Не вдалося отримати мітку доступу OAuth від менеджера "
-"облікових даних"
+msgid "Periodically check for new messages"
+msgstr "Періодично перевіряти наявність нових повідомлень"
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr ""
-"Попередження: Не вдалося зберегти мітку доступу OAuth в менеджері облікових "
-"даних"
+msgid "Check interval (minutes):"
+msgstr "Інтервал перевірки (хв.):"
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr "Не вдалось отримати Мітку доступу OAuth з менеджера облікових даних"
+
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr "Не вдалось зберегти Мітку доступу OAuth в менеджері облікових даних"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -11848,17 +12134,12 @@ msgid "Use a SOCKS proxy"
msgstr "Використовувати SOCKS-проксі"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
-"Увага: JOSM налаштований на використання системних налаштувань проксі, але "
-"JVM не налаштована на їх отримання. Встановлено параметр «Без проксі»"
-
-msgid "disabled"
-msgstr "вимкнено"
-
-msgid "no modifier"
-msgstr "модифікатор відсутній"
+"JOSM налаштовано на використання проксі-сервера із системними "
+"налаштуваннями, але віртуальна машина Java не налаштована на їх отримання. "
+"Скидання налаштувань на \"Без проксі\""
msgid "Shortcut Background: User"
msgstr "Фонова комбінація: Користувач"
@@ -11902,38 +12183,38 @@ msgstr "Вилучити виділене з таблиці теґів"
msgid "Add a new tag"
msgstr "Додати новий теґ"
-msgid "Select auto-increment of {0} for this field"
-msgstr "Оберіть авто-збільшення {0} для цього поля"
+msgid "Paste tags from buffer"
+msgstr "Вставити теґи з буфера обміну"
-msgid "Cancel auto-increment for this field"
-msgstr "Скасувати авто-збільшення для цього поля"
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "Використовувати заготовку \"{0}\" в групі ''{1}''"
-msgid "{0}:"
-msgstr "{0}:"
+msgid "Use preset ''{0}''"
+msgstr "Використовувати заготовку \"{0}\""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
-"Попередження у шаблоні теґів \"{0}-{1}\": проігноровано ''{2}'' атрибут для "
-"заданого елемента ''{3}''."
+msgid "Elements of type {0} are supported."
+msgstr "Елементи типу {0} підтримуються."
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"Зламаний шаблон теґів \"{0}-{1}\" — кількість елементів у ''display_values'' "
-"повинна дорівнювати кількості ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Правка {0} об’єкта"
+msgstr[1] "Правка {0} об’єктів"
+msgstr[2] "Правка {0} об’єктів"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"Зламаний шаблон теґів \"{0}-{1}\" — кількість елементів у "
-"''short_descriptions'' повинна дорівнювати кількості ''values''"
+msgid "Nothing selected!"
+msgstr "Нічого не вибрано!"
-msgid "More information about this feature"
-msgstr "Більш детальна інформація про цей елемент"
+msgid "Selection unsuitable!"
+msgstr "Невдалий вибір!"
+
+msgid "Apply Preset"
+msgstr "Застосувати заготовку"
+
+msgid "New relation"
+msgstr "Новий зв’язок"
+
+msgid "Change Tags"
+msgstr "Змінити теґи"
msgid "Unknown requisite: {0}"
msgstr "Невідомий запит: {0}"
@@ -11941,6 +12222,9 @@ msgstr "Невідомий запит: {0}"
msgid "Illegal member expression: {0}"
msgstr "Некоректний вираз: {0}"
+msgid "More information about this feature"
+msgstr "Більш детальна інформація про цей елемент"
+
msgid "Available roles"
msgstr "Доступні ролі"
@@ -11956,15 +12240,59 @@ msgstr "елементи"
msgid "Optional Attributes:"
msgstr "Необов’язкові атрибути:"
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "Використовувати заготовку \"{0}\" в групі ''{1}''"
+msgid "Select auto-increment of {0} for this field"
+msgstr "Оберіть авто-збільшення {0} для цього поля"
-msgid "Use preset ''{0}''"
-msgstr "Використовувати заготовку \"{0}\""
+msgid "Cancel auto-increment for this field"
+msgstr "Скасувати авто-збільшення для цього поля"
+
+msgid "{0}:"
+msgstr "{0}:"
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+"Попередження у шаблоні теґів \"{0}-{1}\": проігноровано ''{2}'' атрибут для "
+"заданого елемента ''{3}''."
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+"Поламана заготовка \"{0}-{1}\" - метод Java вказаний у ''values_from'' не "
+"\"{2}\""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+"Поламана заготовка \"{0}-{1}\" - метод Java вказаний у ''values_from'' "
+"скинуто {2} ({3})"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"Зламаний шаблон теґів \"{0}-{1}\" — кількість елементів у ''display_values'' "
+"повинна дорівнювати кількості ''values''"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"Зламаний шаблон теґів \"{0}-{1}\" — кількість елементів у "
+"''short_descriptions'' повинна дорівнювати кількості ''values''"
msgid "Unknown type: {0}"
msgstr "Невідомий тип: {0}"
+msgid "Preset group {1} / {0}"
+msgstr "Група заготовок {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "Група заготовок {0}"
+
msgid "Roles cannot appear more than once"
msgstr "Ролі не можуть зазначатись більше одного разу"
@@ -11974,42 +12302,9 @@ msgstr "Роль елемента заготовки без батьків"
msgid "Preset sub element without parent"
msgstr "Вкладені елементи заготовок без батьків"
-msgid "Could not read tagging preset source: {0}"
-msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
-
msgid "Error parsing {0}: "
msgstr "Помилка синтаксичного аналізу: {0} "
-msgid "Elements of type {0} are supported."
-msgstr "Елементи типу {0} підтримуються."
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "Правка {0} об’єкта"
-msgstr[1] "Правка {0} об’єктів"
-msgstr[2] "Правка {0} об’єктів"
-
-msgid "Nothing selected!"
-msgstr "Нічого не вибрано!"
-
-msgid "Selection unsuitable!"
-msgstr "Невдалий вибір!"
-
-msgid "Apply Preset"
-msgstr "Застосувати заготовку"
-
-msgid "New relation"
-msgstr "Новий зв’язок"
-
-msgid "Change Properties"
-msgstr "Змінити параметри"
-
-msgid "Preset group {1} / {0}"
-msgstr "Група заготовок {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "Група заготовок {0}"
-
msgid "Search preset"
msgstr "Пошук заготовок"
@@ -12025,6 +12320,16 @@ msgstr "Показати тільки ті, що застосовуються д
msgid "Search in tags"
msgstr "Шукати в теґах"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Регульований {0} ще не зареєстрований. Неможливо встановити участь у "
+"синхронізованих регулюваннях."
+
+msgid "Adjustable {0} not registered yet."
+msgstr "Регульований {0} ще не зареєстровано"
+
msgid "All files (*.*)"
msgstr "Усі файли (*.*)"
@@ -12059,24 +12364,75 @@ msgstr ""
"Поточне значення не є допустимим ідентифікатором OSM. Будь ласка, введіть "
"ціле число > 0"
+msgid "false: the property is explicitly switched off"
+msgstr "хибність: параметр явно вимкнено"
+
+msgid "true: the property is explicitly switched on"
+msgstr "істина: параметр явно увімкнено"
+
msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
-msgstr ""
-"Лінія із зовнішнім ідентифікатором ''{0}'' містить відсутню точку з "
-"зовнішнім ідентифікатором ''{1}''."
+"partial: different selected objects have different values, do not change"
+msgstr "частково: різні обрані об’єкти мають відмінні значення; не змінюйте"
-msgid "Deleted node {0} is part of way {1}"
-msgstr "Вилучена точка {0} є частиною лінії {1}"
+msgid "unset: do not set this property on the selected objects"
+msgstr "обнулити: не встановлювати цей параметр для обраних об’єктів"
+
+msgid "Cut"
+msgstr "Вирізати"
+
+msgid "Right click = copy to clipboard"
+msgstr "Права кнопка миші = копіювати у буфер"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Відсутній обов’язковий атрибут ''{0}''"
msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
msgstr ""
-"Лінія {0} з {1} точками має неповні точки, тому що принаймні одна точка "
-"відсутня у завантажених даних."
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу long. Отримано "
+"''{1}''."
msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу long (>=0). "
+"Отримано ''{1}''."
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr "Неприпустиме значення атрибуту ''{0}'' типу double. Маємо ''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу boolean. Отримано "
+"''{1}''."
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу OsmPrimitiveType. "
+"Отримано ''{1}''."
+
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Лінія із зовнішнім ідентифікатором ''{0}'' містить відсутню точку з "
+"зовнішнім ідентифікатором ''{1}''."
+
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Вилучена точка {0} є частиною лінії {1}"
+
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"Лінія {0} з {1} точками має неповні точки, тому що принаймні одна точка "
+"відсутня у завантажених даних."
+
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
"external id ''{1}''."
msgstr ""
"Зв’язок із зовнішнім ідентифікатором ''{0}'' посилається на елемент з "
@@ -12095,11 +12451,11 @@ msgid "Contacting OSM Server..."
msgstr "З’єднання з сервером OSM…"
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
-"Попередження: невірне значення атрибуту ''{0}'' елемента ''{1}'' в "
-"настройках можливостей сервера. Отримано ''{2}''"
+"Неприпустиме значення ''{2}'' атрибуту ''{0}'' елемента ''{1}'' у "
+"можливостях сервера."
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "Сервер повідомив про невдалий розборі дати ''{0}''."
@@ -12143,39 +12499,35 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "Неправильний номер порту в налаштуванні ''{0}''. Отримано {1}."
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
-"Попередження: знайдено неочікуване значення для налаштування ''{0}''. "
-"Отримано ''{1}''. Проксі використовуватись не буде."
+"Неочікуване значення ''{1}'' параметру ''{0}''. Використовуємо пряме "
+"з’єднання (\"Без проксі\")."
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Попередження: неочікувані параметри для HTTP-проксі. Отримано хост ''{0}'' "
-"та порт ''{1}''."
+"Неочікуваний параметр для HTTP-проксі. Маємо хост ''{0}'' та порт ''{1}''."
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
-"Попередження: неочікувані параметри для SOCKS-проксі. Отримано хост ''{0}'' "
-"та порт ''{1}''."
+"Неочікуваний параметр для SOCKS-проксі. Маємо хост ''{0}'' та порт ''{1}''."
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
-"Помилка: підключення до ''{0}'' з URI ''{1}'' не вдалося. Помилка: {2}"
+"З’єднання з проксі ''{0}'' для URI ''{1}'' не вдалось. Виключення: {2}"
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"Попередження: У системних настройках JVM вказано, не використовувати проксі. "
-"Параметр ''java.net.useSystemProxies'' був відсутній у момент запуску JOSM. "
-"Проксі не буде використовуватись."
+"Віртуальна машина Java не налаштована на отримання системних налаштувань "
+"проксі-сервера. Параметр ''java.net.useSystemProxies'' був пропущений під "
+"час запуску. Використовуємо пряме з’єднання (Без проксі)."
msgid "Parsing response from server..."
msgstr "Розбір відповіді від сервера…"
@@ -12277,6 +12629,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr "Помилка розбору: неправильна структура документа GPX"
+msgid "(at line {0}, column {1})"
+msgstr "(рядок {0}, стовпець {1})"
+
msgid "Unknown mode {0}."
msgstr "Невідомий режим {0}."
@@ -12292,15 +12647,24 @@ msgstr "Пошук файлів зображень"
msgid "No image files found."
msgstr "Файли зображень не знайдені."
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] "Маєте {0} не прочитане повідомлення."
+msgstr[1] "Маєте {0} не прочитаних повідомлень."
+msgstr[2] "Маєте {0} не прочитаних повідомлень."
+
+msgid "Click here to see your inbox."
+msgstr "Натисніть тут, щоб перейти до вхідних повідомлень."
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "Не вдалося відкрити вхідний потік ресурсів ''{0}''"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
-"Попередження: не вдалося відкрити файл з розширенням ''{2}'' та ім’ям "
-"''{3}'' в файлі архіву zip ''{0}''. Помилка: {1}"
+"Не вдалось відрити файл з розширенням ''{2}'' та іменем ''{3}'' в zip-файлі "
+"''{0}''. Виключення: {1}"
msgid "Failed to rename file {0} to {1}."
msgstr "Збій перейменування файлу {0} у {1}."
@@ -12387,8 +12751,8 @@ msgstr "Невідомі фрази: {0}"
msgid "Zero coordinates: {0}"
msgstr "Нульові координати: {0}"
-msgid "NMEA import success"
-msgstr "Імпорт NMEA успішно завершено"
+msgid "NMEA import success:"
+msgstr "Успішний імпорт NMEA:"
msgid "NMEA import failure!"
msgstr "Збій при імпорті NMEA!"
@@ -12497,47 +12861,15 @@ msgstr "В файлі {0} немає даних."
msgid "Open OsmChange file"
msgstr "Відкрити файл OsmChange"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "Відсутній обов’язковий атрибут ''{0}''"
-
msgid "Unsupported version: {0}"
msgstr "Непідтримувана версія: {0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу long. Отримано "
-"''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу long (>=0). "
-"Отримано ''{1}''."
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr "Неприпустиме значення атрибуту ''{0}'' типу double. Маємо ''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу boolean. Отримано "
-"''{1}''."
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу OsmPrimitiveType. "
-"Отримано ''{1}''."
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
-"Попередження: непідтримуваний початковий елемент ''{0}'' в наборі змін в "
-"позиції ({1},{2}). Пропускаємо."
+"Непідтримуваний початковий елемент ''{0}'' в наборі змін в позиції "
+"({1},{2}). Пропускаємо."
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -12547,11 +12879,11 @@ msgstr ""
"''create'', ''modify'' або ''delete''."
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
-"Попередження: непідтримуваний кінцевий елемент ''{0}'' в наборі змін в "
-"позиції ({1},{2}). Пропускаємо."
+"Непідтримуваний кінцевий елемент ''{0}'' в наборі змін в позиції ({1},{2}). "
+"Пропускаємо."
msgid "Parsing changeset content ..."
msgstr "Розбір вмісту набору змін…"
@@ -12579,13 +12911,8 @@ msgstr ""
"Не вдалося підписати HTTP-з’єднання, використовуючи заголовок автентифікації "
"OAuth"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-"Попередження: неочікуване значення для налаштування ''{0}''. Отримано "
-"''{1}''."
-
-msgid "(at line {0}, column {1})"
-msgstr "(рядок {0}, стовпець {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "Неочікуване значення ''{1}'' параметру ''{0}''."
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>Виникла помилка під час збереження.<br>Помилка: <br>{0}</html>"
@@ -12597,9 +12924,6 @@ msgstr ""
"<html>Сталася помилка під час відновлення резервної копії файлу.<br>Помилка: "
"<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "Не можу створити резервний файл. Помилка: {0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "Файли сервера OSM стиснені gzip"
@@ -12621,6 +12945,9 @@ msgstr "У файлі ''{0}'' дані не знайдені."
msgid "Open OSM file"
msgstr "Відкрити файл OSM"
+msgid "Reading was canceled"
+msgstr "Читання скасоване"
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -12677,11 +13004,11 @@ msgstr ""
"ідентифікатором {0}. Отримано {1}."
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
-"ПОПЕРЕДЖЕННЯ: Нормалізація значення атрибута ''version'' елемента {0} на "
-"{2}, версія API — ''{3}''. Отримано {1}."
+"Впорядкування значення {1} атрибуту ''version'' елементу {0} з {2}, версія "
+"API ''{3}''."
msgid "Unknown or unsupported API version. Got {0}."
msgstr "Невідома чи непідтримувана версія API. Отримано {0}."
@@ -12779,7 +13106,7 @@ msgstr ""
"Неприпустиме значення атрибуту ''{0}'' у XML-теґа ''{1}''. Отримано {2}."
msgid "Reading user info ..."
-msgstr "Читання інформації про користувача…"
+msgstr "Читання інформації про учасника…"
msgid "Starting to upload with one request per primitive ..."
msgstr ""
@@ -12836,6 +13163,9 @@ msgstr "Зберегти логін і пароль (незашифровани
msgid "<delete from {0} objects>"
msgstr "<вилучити з {0} об’єкт(ів)>"
+msgid "Old values of"
+msgstr "Старі значення"
+
msgid "Add tags to selected objects"
msgstr "Додати теґи до виділених об’єктів"
@@ -12854,6 +13184,15 @@ msgstr "Shift+Enter: додати всі теґи до виділених об
msgid "Assume"
msgstr "Припущення"
+msgid "Existing values"
+msgstr "Поточні значення"
+
+msgid "Enable the checkbox to accept the value"
+msgstr "Поставте прапорець для отримання значень"
+
+msgid "Accept all tags from {0} for this session"
+msgstr "Застосувати всі теґи з {0} для цієї сесії"
+
msgid "Load data from API"
msgstr "Завантаження даних через API"
@@ -12878,21 +13217,21 @@ msgstr "Створення нових об’єктів"
msgid "Read protocol version"
msgstr "Отримання версії протоколу"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
-msgstr ""
-"Попередження: Неможливо запустити сервер дистанційного керування на порту "
-"{0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr "Неможливо запустити серер відділеного керування з портом {0}: {1}"
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr "RemoteControl::Встановлення з’єднання на порту {0}"
+
+msgid "RemoteControl::Server stopped."
+msgstr "RemoteControl::Сервер зупинено."
msgid "Remote Control has been asked to create a new node."
-msgstr ""
-"Втулок Дистанційного керування отримав запит на створення нової точки."
+msgstr "Через Дистанційне керування отримано запит на створення нової точки."
msgid "There is no layer opened to add node"
msgstr "Немає шарів, відкритих для додавання точок"
-msgid "Add way"
-msgstr "Додати лінію"
-
msgid "Remote Control has been asked to create a new way."
msgstr "Через Дистанційне керування отримано запит на створення нової лінії."
@@ -12902,24 +13241,43 @@ msgstr "Неприпустимі координати: {0}"
msgid "There is no layer opened to add way"
msgstr "Немає шарів, відкритих для додавання ліній"
+msgid "Add way"
+msgstr "Додати лінію"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+"Через Дистанційне керування отримано запит про підтримувані нею можливості. "
+"Це дозволить веб-сайтам спробувати визначити вашу версію JOSM"
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
msgstr ""
-"Втулок Дистанційного керування отримав запит на завантаження фону за "
-"наступним посиланням:"
+"Через Дистанційне керування отримано запит на завантаження фону за наступним "
+"посиланням:"
msgid "Remote imagery"
msgstr "Віддалений фон"
msgid "Remote Control has been asked to import data from the following URL:"
msgstr ""
-"Втулок Дистанційного керування отримав запит на імпорт даних з наступного "
+"Через Дистанційне керування отримано запит на імпорт даних з наступного "
"посилання:"
msgid "Remote Control has been asked to load data from the API."
msgstr ""
-"Втулок Дистанційного керування отримав запит на завантаження даних з API."
+"Через Дистанційне керування отримано запит на завантаження даних з API."
+
+msgid "The latitudes must be between {0} and {1}"
+msgstr "Широта повинна бути між {0} і {1}"
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr "Довгота повинна бути між {0} і {1}"
+
+msgid "The minima must be less than the maxima"
+msgstr "Мінімум має бути менше максимуму"
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
@@ -12930,7 +13288,7 @@ msgstr ""
msgid "Remote Control has been asked to open a local file."
msgstr ""
-"Втулок Дистанційного керування отримав запит на відкриття локального файлу."
+"Через Дистанційне керування отримано запит на відкриття локального файлу."
msgid "Do you want to allow this?"
msgstr "Дозволити?"
@@ -12942,7 +13300,7 @@ msgid ""
"Remote Control has been asked to report its protocol version. This enables "
"web sites to detect a running JOSM."
msgstr ""
-"Втулок Дистанційного керування отримав запит про версію протоколу. Це "
+"Через Дистанційне керування отримано запит про версію протоколу. Це "
"дозволить веб сайтам визначити, чи запущено JOSM."
msgid ""
@@ -12957,20 +13315,20 @@ msgstr "Дані:"
msgid "local file"
msgstr "локальний файл"
-msgid "Link to a OSM data file on your local disk."
-msgstr "Посилання на OSM-файл на локальному диску"
+msgid "Link to a GPX file on your local disk."
+msgstr "Посилання на файл GPX на локальному диску."
msgid "include"
msgstr "додати"
-msgid "Include OSM data in the .joz session file."
-msgstr "Додати дані OSM у файл сеансу .joz."
+msgid "Include GPX data in the .joz session file."
+msgstr "Додавати дані GPX до файлу сесії .joz"
msgid "No file association"
msgstr "Невідомий тип файлу"
-msgid "OSM data will be included in the session file."
-msgstr "Дані OSM будуть додані у файл сеансу."
+msgid "GPX data will be included in the session file."
+msgstr "Дані GPX будуть додані до файлу сесії."
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -12994,12 +13352,24 @@ msgstr "Шар містить незбережені дані — зберег
msgid "Layer does not contain unsaved data."
msgstr "Шар не містить не збережених даних."
+msgid "Link to a OSM data file on your local disk."
+msgstr "Посилання на OSM-файл на локальному диску"
+
+msgid "Include OSM data in the .joz session file."
+msgstr "Додати дані OSM у файл сеансу .joz."
+
+msgid "OSM data will be included in the session file."
+msgstr "Дані OSM будуть додані у файл сеансу."
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
"Версія ''{0}'' метаданих для шару даних не підтримується. Очікується: 0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "Файл сеансу (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "Неможливо знайти файл ''{0}''."
@@ -13075,18 +13445,18 @@ msgid "Download skipped"
msgstr "Завантаження пропущено"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
-"Попередження: Неможливо завантажити втулок ''{0}''. Невідоме посилання для "
-"його завантаження. Завантаження пропущене."
+"Неможливо завантажити втулок ''{0}''. Невідоме посилання для його "
+"завантаження. Пропускаємо завантаження."
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
-"Попередження: Неможливо завантажити втулок ''{0}''. Посилання для його "
-"завантаження ''{1}'' не є вірним. Завантаження пропущене."
+"Неможливо завантажити втулок ''{0}''. Посилання для його завантаження "
+"''{1}'' не є допустимим URL. Пропускаємо завантаження."
msgid "Failed to create plugin directory ''{0}''"
msgstr "Не вдалося створити каталог втулка ''{0}''"
@@ -13260,11 +13630,11 @@ msgstr[2] ""
msgid "Plugin update failed"
msgstr "Не вдалося оновити втулок"
-msgid "Warning: failed to find plugin {0}"
-msgstr "Попередження: неможливо знайти втулок {0}"
+msgid "Failed to find plugin {0}"
+msgstr "Не вдалося знайти втулок {0}"
-msgid "Warning: failed to download plugin information list"
-msgstr "Попередження: не вдалося завантажити інформаційний список втулків"
+msgid "Failed to download plugin information list"
+msgstr "Не вдалося завантажити перелік втулків"
msgid "Disable plugin"
msgstr "Вимкнути втулок"
@@ -13278,29 +13648,27 @@ msgstr "Залишити втулок"
msgid "Click to keep the plugin ''{0}''"
msgstr "Натисніть, щоб залишити втулок ''{0}''"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "Попередження: не вдалося вилучити застарілий втулок ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr "Не вдалося вилучити застарілий втулок ''{0}''."
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
-"Попередження: не вдалося встановити вже завантажений втулок ''{0}''. Пропуск "
-"установки. JOSM все ще може завантажити стару версію втулка."
+"Не вдалось встановити завантажений втулок ''{0}''. Пропускаємо встановлення. "
+"JOSM все ще використовуватиме попередню версію втулка."
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
-"Попередження: збій встановлення втулку ''{0}'' із тимчасового файлу ''{1}''. "
-"{2}"
+"Не вдалось встановити втулок ''{0}'' із завантаженого файлу ''{1}''. {2}"
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
-"Попередження: не вдалося встановити втулок ''{0}'' з тимчасово завантаженого "
-"файлу ''{1}''. Перейменування не вдалось."
+"Не вдалось встановити втулок ''{0}'' із завантаженого файлу ''{1}''. "
+"Перейменування не вдалось."
msgid "Click to disable the plugin ''{0}''"
msgstr "Натисніть, щоб відключити втулок ''{0}''"
@@ -13375,17 +13743,16 @@ msgstr "Обробка інформації з кешу втулків…"
msgid "Processing file ''{0}''"
msgstr "Обробка файлу ''{0}''"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
-"Попередження: Не вдалося сканування файлу ''{0}'' для отримання інформації "
-"про втулок. Пропущено."
+"Не вдалось просканувати файл ''{0}'' на наявність інформації про втулок. "
+"Пропускаємо."
msgid "Processing plugin site cache icon files..."
-msgstr "Обробка файлів значків з кешу сайта втулка…"
+msgstr "Обробка файлів значків втулків з кешу сайта…"
msgid "Processing plugin files..."
-msgstr "Обробка файлів втулка…"
+msgstr "Обробка файлів втулків…"
msgid "Download plugin list..."
msgstr "Завантажити список втулків…"
@@ -13393,12 +13760,27 @@ msgstr "Завантажити список втулків…"
msgid "Downloading plugin list from ''{0}''"
msgstr "Завантаження списку втулків з ''{0}''"
+msgid "Plugin list download error"
+msgstr "Помилка завантаження переліку втулків"
+
+msgid "JOSM failed to download plugin list:"
+msgstr "JOSM не вдалось завантажити перелік втулків:"
+
+msgid "Details:"
+msgstr "Подробиці:"
+
+msgid "Plugin icons download error"
+msgstr "Помилка завантаження значків втулків"
+
+msgid "JOSM failed to download plugin icons:"
+msgstr "JOSM не вдалось завантажити значки втулків:"
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
-"Попередження: не вдалося створити каталогу втулка ''{0}''. Неможливо "
-"записати у кеш список втулків з сайту ''{1}''."
+"Не вдалось створити теку для втулків ''{0}''. Неможливо створити кеш "
+"переліку втулків з сайту ''{1}''."
msgid "Writing plugin list to local cache ''{0}''"
msgstr "Запис списку втулків в локальний кеш ''{0}''"
@@ -13881,22 +14263,13 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr "Збій пошук зображення ''{0}''"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "Попередження: не вдалося обробити zip-файл ''{0}''. Помилка: {1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
-"Попередження: не вдалося отримати доступ до каталогу ''{0}'' з міркувань "
-"безпеки. Помилка: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Не вдалось обробити zip-файл ''{0}''. Виключення: {1}"
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
-"Попередження: не вдалося отримати вікі префікс мови з локального коду JOSM "
-"''{0}''. Використовую типовий код — ''en''."
+"Не вдалось отримати доступ до теки ''{0}'' з причин безпеки. Виключення: {1}"
msgid "{0}... [please type its number]"
msgstr "{0}… [вкажіть номер]"
@@ -13908,9 +14281,56 @@ msgstr ""
"Не вдалося відкрити посилання. Зараз не задано платформу. Будь ласка, "
"спочатку встановіть платформу."
+msgid "Opening URL: {0}"
+msgstr "Відкриття URL: {0}"
+
+msgid "zoom"
+msgstr "масштаб"
+
+msgid "latitude"
+msgstr "широта"
+
+msgid "longitude"
+msgstr "довгота"
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr "URL не містить {0}/{1}/{2}"
+
+msgid "URL does not contain valid {0}"
+msgstr "URL не містить вірний {0}"
+
msgid "reserved"
msgstr "зарезервовано"
+msgid "Outdated Java version"
+msgstr "Застаріла версія Java"
+
+msgid "Update Java"
+msgstr "Оновити Java"
+
+msgid "You are running version {0} of Java."
+msgstr "Ви використовуєте Java версії {0}."
+
+msgid "February 2013"
+msgstr "Лютий 2013"
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+"Ця версія більше не підтримується {0}, починаючи з {1} її використання не "
+"рекомендується."
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+"JOSM дуже скоро перестане працювати з цією версією; рекомендуємо оновити "
+"Java до версії {0}."
+
+msgid "Would you like to update now ?"
+msgstr "Хочете оновити зараз?"
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
"Конфлікт комбінацій клавіш: ''{0}'' перепризначений з ''{1}'' на ''{2}''."
@@ -13946,8 +14366,23 @@ msgstr ""
"<html><p> На жаль, не можливо вставити теґи з буферу обміну. Він не містить "
"об’єктів JOSM чи відповідного тексту. </p></html>"
-msgid "Right click = copy to clipboard"
-msgstr "Права кнопка миші = копіювати у буфер"
+msgid "ms"
+msgstr "мс"
+
+msgid "s"
+msgstr "c"
+
+msgid "min"
+msgstr "хв"
+
+msgid "h"
+msgstr "г"
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] "день"
+msgstr[1] "дні"
+msgstr[2] "днів"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14293,6 +14728,13 @@ msgid "Saturation:"
msgstr "Насиченість:"
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+"Дозволяє редагувати інформацію про трафік та експортувати її в мобільний "
+"симулятор міста SUMO"
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -14394,6 +14836,12 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "Знаходить та виправляє помилки в адресах у зручний спосіб."
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+"Спілкуйтесь із іншими учасниками, що працюють з мапою поруч з вами, "
+"отримуйте сповіщення якщо хтось з’являється поруч."
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -14432,7 +14880,7 @@ msgstr ""
"фонових зображень однією кнопкою."
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Режим налаштування положення фону як у WMSPlugin"
+msgstr "WMSPlugin-подібний втулок для підлаштування фонового зображення"
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -14527,9 +14975,6 @@ msgstr "Додає заборону повороту ліворуч для на
msgid "Simplifies download from different read-only APIs."
msgstr "Спрощує завантаження з різних доступних тільки для читання API."
-msgid "Simply convert an area to a multipolygon."
-msgstr "Просте перетворення полігону у мультиполігон."
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
"Дозволяє призначити теґи до всіх об’єктів в будь-якій виділеній області за "
@@ -14601,6 +15046,9 @@ msgstr ""
"Записує позицію gps в заголовок файлу зображення. Увімкніть цю можливість, "
"натиснувши праву клавішу миші на шарі зображення."
+msgid "Make photos movable and position them on the map."
+msgstr "Робить знімки рухомими для позиціювання їх положення на мапі."
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -14628,9 +15076,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr "Панель створення та редагування зв’язків та мультиполігонів."
-msgid "Adds Restart JOSM item to File menu."
-msgstr "Додає пункт меню «Перезапустити JOSM»."
-
msgid "Plugin for reverting changesets"
msgstr "Втулок для відміни наборів змін"
@@ -14664,9 +15109,6 @@ msgstr ""
"можна обмежити максимально допустимим розміром полігону, а також кількістю "
"прилеглих точок."
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "Створення та редагування морських мап для OpenSeaMap"
-
msgid "Edit features for OpenSeaMap"
msgstr "Редагування об’єктів OpenSeaMap"
@@ -14713,6 +15155,13 @@ msgstr ""
"Нанесення будівель з мапи Чеського кадастру. Для запуску потрібний "
"TracerServer (. NET або Mono)."
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+"Відтворює контури будівель та інших об’єктів на мапі. Потребує для роботи "
+"Tracer2Server"
+
msgid "Plugin to digital sign OSM-Data"
msgstr "Втулок для накладення цифрового підпису на дані OSM"
@@ -14770,9 +15219,6 @@ msgstr ""
"Ведіть гоночний автомобіль від точки A до точки B по супутниковому знімку, "
"залишаючи кактуси позаду."
-msgid "Highways"
-msgstr "Дороги"
-
msgid "Streets"
msgstr "Дороги"
@@ -14857,6 +15303,9 @@ msgstr "Насип"
msgid "Lit"
msgstr "Освітлення"
+msgid "Toll"
+msgstr "Платна"
+
msgid "Motorway Link"
msgstr "З’їзд з/на Автомагістраль"
@@ -14947,6 +15396,50 @@ msgstr "Місцевого значення"
msgid "Edit Residential Street"
msgstr "Властивості Місцевої вулиці"
+msgid "Bicycle Road"
+msgstr "Велодорога"
+
+msgid "Edit Bicycle Road"
+msgstr "Властивості велодороги"
+
+msgid "Highway type"
+msgstr "Тип дороги"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr "місцевого значення"
+
+msgctxt "Highway"
+msgid "service"
+msgstr "службова"
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr "дорога без класифікації"
+
+msgctxt "Highway"
+msgid "path"
+msgstr "тропа"
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr "велодоріжка"
+
+msgid "Vehicle access"
+msgstr "Дозвіл для автомобілів"
+
+msgid "yes"
+msgstr "так"
+
+msgid "no"
+msgstr "ні"
+
+msgid "destination"
+msgstr "за призначенням"
+
+msgid "Oneway for bicycle"
+msgstr "Односторонній рух для велосипедів"
+
msgid "Living Street"
msgstr "Житлова зона"
@@ -14965,11 +15458,11 @@ msgstr "Полігон"
msgid "Service"
msgstr "Службовий проїзд"
-msgid "Edit Serviceway"
-msgstr "Властивості Службового проїзду"
+msgid "Edit Service Way"
+msgstr "Властивості Службового проізду"
-msgid "Serviceway type"
-msgstr "Тип Службового проїзду"
+msgid "Service way type"
+msgstr "Тип проїзду"
msgid "alley"
msgstr "провулок"
@@ -14980,6 +15473,9 @@ msgstr "під’їзна дорога"
msgid "parking_aisle"
msgstr "проїзд на стоянці"
+msgid "drive-through"
+msgstr "обслуговування автомобілістів"
+
msgid "Parking Aisle"
msgstr "Проїзд на стоянці"
@@ -15007,18 +15503,12 @@ msgstr "Круг"
msgid "jughandle"
msgstr "одностороннє"
-msgid "yes"
-msgstr "так"
-
msgid "Road Restrictions"
msgstr "Дорожні обмеження"
msgid "Edit Road Restrictions"
msgstr "Властивості Дорожніх обмежень"
-msgid "Toll"
-msgstr "Платна"
-
msgid "No exit (cul-de-sac)"
msgstr "Глухий кут"
@@ -15028,9 +15518,6 @@ msgstr "Обмеження за типами транспорту"
msgid "General Access"
msgstr "Загальний доступ"
-msgid "destination"
-msgstr "за призначенням"
-
msgid "delivery"
msgstr "для доставки товарів"
@@ -15040,15 +15527,15 @@ msgstr "дозволено власником"
msgid "private"
msgstr "приватна"
+msgid "customers"
+msgstr "клієнти"
+
msgid "agricultural"
msgstr "сільськогосподарського призначення"
msgid "forestry"
msgstr "для транспорту лісництва"
-msgid "no"
-msgstr "ні"
-
msgid "official"
msgstr "офіційно"
@@ -15094,6 +15581,9 @@ msgstr "Автомобілі з пасажирами"
msgid "Public Service Vehicles (psv)"
msgstr "Громадський транспорт"
+msgid "Tourist buses"
+msgstr "Туристичні автобуси"
+
msgid "Min. speed (km/h)"
msgstr "Мін. швидкість (км/г)"
@@ -15178,6 +15668,9 @@ msgstr "Властивості Мосту"
msgid "viaduct"
msgstr "віадук"
+msgid "suspension"
+msgstr "підвісний"
+
msgid "swing"
msgstr "розвідний"
@@ -15194,10 +15687,10 @@ msgid "Ways"
msgstr "Шляхи"
msgid "Track"
-msgstr "Ґрунтовка"
+msgstr "Путівець"
msgid "Edit Track"
-msgstr "Властивості Ґрунтовки"
+msgstr "Властивості Путівця"
msgid "Tracktype"
msgstr "Дорожнє покриття"
@@ -15296,20 +15789,29 @@ msgstr ""
msgid "Visibility"
msgstr "Видимість"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "чудова"
+msgstr "неперевершено"
+msgctxt "trail_visibility"
msgid "good"
-msgstr "добра"
+msgstr "добре"
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "середня"
+msgstr "посередньо"
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "погана"
+msgstr "погано"
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "жахлива"
+msgstr "жахливо"
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr "відсутня"
msgid "Wheelchairs"
msgstr "Інвалідним візком"
@@ -15326,14 +15828,14 @@ msgstr "Дорога для вершників"
msgid "Edit Bridleway"
msgstr "Властивості Дороги для вершників"
-msgid "Cycle Lane"
-msgstr "Вело-доріжка"
+msgid "Cycle Lane/Track"
+msgstr "Велодоріжка/Смуга"
-msgid "Edit Cycle Lane"
-msgstr "Властивості вело-доріжки"
+msgid "Edit Cycle Lane or Track"
+msgstr "Властивості Велодоріжки/Смуги"
msgid "Cycleway"
-msgstr "Вело-доріжка"
+msgstr "Велодоріжка"
msgid "lane"
msgstr "смуга"
@@ -15357,16 +15859,16 @@ msgid "shared_lane"
msgstr "спільна смуга"
msgid "Cycleway left"
-msgstr "Вело-доріжка ліворуч"
+msgstr "Велодоріжка ліворуч"
msgid "Cycleway right"
-msgstr "Вело-доріжка праворуч"
+msgstr "Велодоріжка праворуч"
msgid "Oneway (bicycle)"
-msgstr "Одностороння вело-доріжка"
+msgstr "Одностороння велодоріжка"
-msgid "Edit Highway"
-msgstr "Властивості дороги"
+msgid "Edit Highway Attributes:"
+msgstr "Властивості атрибуту highway"
msgid "Highway"
msgstr "Дорога"
@@ -15434,12 +15936,18 @@ msgstr "Зона відпочинку"
msgid "Edit Rest Area"
msgstr "Властивості Зони відпочинку"
-msgid "Emergency Phone"
-msgstr "Телефон для екстрених викликів"
+msgid "Drinking Water"
+msgstr "Питна вода"
msgid "Traffic Signal"
msgstr "Світлофор"
+msgid "Edit Traffic Signal"
+msgstr "Властивості світлофора"
+
+msgid "Optional crossing attributes:"
+msgstr "Додаткові властивості перехрестя:"
+
msgid "Pedestrian crossing type"
msgstr "Тип пішохідного переходу"
@@ -15455,15 +15963,6 @@ msgstr "острів"
msgid "unmarked"
msgstr "непозначений"
-msgid "Cross on horseback"
-msgstr "Дозволено переїзд верхи"
-
-msgid "Cross by bicycle"
-msgstr "Дозволено переїзд велосипедом"
-
-msgid "Crossing attendant"
-msgstr "Під наглядом регулювальника"
-
msgid "Crossing type name (UK)"
msgstr "Тип перехода (В.Британія)"
@@ -15485,6 +15984,15 @@ msgstr "pegasus (для вершників)"
msgid "tiger"
msgstr "tiger (нерегульований вело-пішохідний)"
+msgid "Crossing attendant"
+msgstr "Під наглядом регулювальника"
+
+msgid "Cross by bicycle"
+msgstr "Дозволено переїзд велосипедом"
+
+msgid "Cross on horseback"
+msgstr "Дозволено переїзд верхи"
+
msgid "Stop"
msgstr "Стоп"
@@ -15494,6 +16002,9 @@ msgstr "Дати дорогу"
msgid "Mini-roundabout"
msgstr "Міні-круг"
+msgid "Edit Mini-Roundabout"
+msgstr "Властивості міні-круга"
+
msgid "Direction"
msgstr "Напрямок"
@@ -15503,11 +16014,8 @@ msgstr "за годинниковою стрілкою"
msgid "Pedestrian Crossing"
msgstr "Пішохідний перехід"
-msgid "Edit Crossing"
-msgstr "Властивості Пішохідного переходу"
-
-msgid "Type name (UK)"
-msgstr "Назва типи (В.Брит)"
+msgid "Edit Pedestrian Crossing"
+msgstr "Властивості пішохідного переходу"
msgid "Traffic Calming"
msgstr "Засоби для обмеження швидкості"
@@ -15539,9 +16047,6 @@ msgstr "платформа"
msgid "Passing Place"
msgstr "Місце роз’їзду"
-msgid "Edit Passing Place"
-msgstr "Властивості Місця роз’їзду"
-
msgid "Turning Circle"
msgstr "Круг для розвороту"
@@ -15575,20 +16080,44 @@ msgstr "Вікіпедія"
msgid "Barriers"
msgstr "Перепони"
+msgid "Block"
+msgstr "Блок"
+
+msgid "Edit Block"
+msgstr "Властивості блоку"
+
+msgid "Allowed traffic:"
+msgstr "Дозволено пересування:"
+
+msgid "Material"
+msgstr "Матеріал"
+
+msgid "stone"
+msgstr "камінь"
+
msgid "Bollard"
msgstr "Стовпчик"
msgid "Edit Bollard"
msgstr "Властивості Стовпчика"
-msgid "Allowed traffic:"
-msgstr "Дозволено пересування:"
+msgid "Bollard type"
+msgstr "Тип стовпчика"
+
+msgid "rising"
+msgstr "піднімається"
+
+msgid "removable"
+msgstr "знімний"
+
+msgid "plastic"
+msgstr "пластик"
msgid "Cycle Barrier"
msgstr "Перешкода для велосипедів"
-msgid "Block"
-msgstr "Блок"
+msgid "Edit Cycle Barrier"
+msgstr "Властивості Перешкоди для велосипедистів"
msgid "Cattle Grid"
msgstr "Перешкода для виходу худоби"
@@ -15599,6 +16128,9 @@ msgstr "Властивості Перешкоди для виходу худоб
msgid "Bus Trap"
msgstr "Проїзд для автобусів"
+msgid "Edit Bus Trap"
+msgstr "Властивості Проїзду для автобусів"
+
msgid "Spikes"
msgstr "Шипи"
@@ -15620,44 +16152,88 @@ msgstr "Властивості Прикордонного контролю"
msgid "Hedge"
msgstr "Жива огорожа"
+msgid "Edit Hedge"
+msgstr "Властивості Живої огорожі"
+
+msgid "Height (meters)"
+msgstr "Висота (в метрах)"
+
+msgid "Genus"
+msgstr "Рід"
+
+msgid "Species"
+msgstr "Вид"
+
+msgid "Taxon"
+msgstr "Таксон"
+
msgid "Fence"
msgstr "Паркан"
+msgid "Edit Fence"
+msgstr "Властивості Паркану"
+
msgid "barbed_wire"
msgstr "колючий дріт"
-msgid "chain"
+msgid "chain_link"
msgstr "сітка рабиця"
msgid "electric"
msgstr "електрика"
-msgid "hedge"
-msgstr "тин"
-
msgid "pole"
msgstr "стовп"
msgid "split_rail"
msgstr "штахетник"
+msgid "wire"
+msgstr "дріт"
+
+msgid "Guard Rail"
+msgstr "Захисна огорожа"
+
+msgid "Edit Guard Rail"
+msgstr "Властивості Захисної огорожі"
+
msgid "Wall"
msgstr "Стіна"
+msgid "Edit Wall"
+msgstr "Властивості Стіни"
+
msgid "City Wall"
msgstr "Міська стіна"
+msgid "Edit City Wall"
+msgstr "Властивості Міської стіни"
+
msgid "Retaining Wall"
msgstr "Підпірна стінка"
+msgid "Edit Retaining Wall"
+msgstr "Властивості Підпірної стінки"
+
+msgctxt "Barrier"
msgid "Ditch"
msgstr "Канава"
-msgid "Entrance"
-msgstr "Вхід/В’їзд"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr "Властивості Канави"
-msgid "Edit Entrance"
-msgstr "Властивості Входу/В’їзду"
+msgid "Kerb"
+msgstr "Бордюр"
+
+msgid "Edit Kerb"
+msgstr "Властивості Бордюру"
+
+msgid "Entrance (barrier opening)"
+msgstr "Прохід (в огорожі)"
+
+msgid "Edit Entrance (barrier opening)"
+msgstr "Властивості Проходу (в огорожі)"
msgid "Gate"
msgstr "Ворота"
@@ -15689,12 +16265,27 @@ msgstr "Вузька хвіртка"
msgid "Edit Kissing Gate"
msgstr "Властивості Вузької хвіртки"
+msgid "Chain"
+msgstr "Ланцюг"
+
+msgid "Edit Chain"
+msgstr "Властивості Ланцюга"
+
msgid "Stile"
msgstr "Перелаз"
msgid "Edit Stile"
msgstr "Властивості Перелазу"
+msgid "ladder"
+msgstr "сходи"
+
+msgid "squeezer"
+msgstr "вузький лаз"
+
+msgid "stepover"
+msgstr "перелаз"
+
msgid "Turnstile"
msgstr "Турнікет"
@@ -15752,6 +16343,9 @@ msgstr "Дренажний канал"
msgid "Edit Drain"
msgstr "Властивості Дренажного каналу"
+msgid "Ditch"
+msgstr "Канава"
+
msgid "Edit Ditch"
msgstr "Властивості Канави"
@@ -15761,6 +16355,12 @@ msgstr "Струмок"
msgid "Edit Stream"
msgstr "Властивості Струмка"
+msgid "Wadi"
+msgstr "Ваді"
+
+msgid "Edit Wadi"
+msgstr "Властивості Ваді"
+
msgid "Canal"
msgstr "Канал"
@@ -15800,9 +16400,6 @@ msgstr "Властивості Дамби"
msgid "Groyne"
msgstr "Хвилелом"
-msgid "Edit Groyne"
-msgstr "Властивості Хвилелому"
-
msgid "Breakwater"
msgstr "Хвилеріз (Мол)"
@@ -15836,6 +16433,21 @@ msgstr "Властивості Критого резервуара"
msgid "Edit Water"
msgstr "Властивості Води"
+msgid "Water Body"
+msgstr "Водойма"
+
+msgid "lake"
+msgstr "озеро"
+
+msgid "lagoon"
+msgstr "лагуна"
+
+msgid "pond"
+msgstr "ставок"
+
+msgid "reservoir"
+msgstr "водосховище"
+
msgid "Land"
msgstr "Суходіл"
@@ -15917,20 +16529,25 @@ msgstr "Властивості Поромного причалу"
msgid "Cargo"
msgstr "Для перевезення"
+msgctxt "cargo"
msgid "passengers"
msgstr "пасажирів"
+msgctxt "cargo"
msgid "vehicle"
-msgstr "автомобілі"
+msgstr "автомобілів"
+msgctxt "cargo"
msgid "bicycle"
-msgstr "велосипедний"
+msgstr "велосипедів"
+msgctxt "cargo"
msgid "hgv"
-msgstr "вантажівки"
+msgstr "вантажівок"
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "пасажири; автомобілі"
+msgstr "пасажирів;автомобілів"
msgid "Ferry Route"
msgstr "Поромна переправа"
@@ -16001,8 +16618,11 @@ msgstr "військовий"
msgid "tourism"
msgstr "туристичний"
-msgid "Service/Type"
-msgstr "Сервіс/Тип"
+msgid "freight"
+msgstr "вантажні"
+
+msgid "Service type"
+msgstr "Тип"
msgid "yard"
msgstr "депо"
@@ -16025,11 +16645,14 @@ msgstr "контактний дріт"
msgid "rail"
msgstr "рейка"
-msgid "Voltage"
-msgstr "Напруга"
+msgid "Voltage in Volts (V)"
+msgstr "Напруга у вольтах (V)"
+
+msgid "Frequency in Hertz (Hz)"
+msgstr "Частота в Герцах (Hz)"
-msgid "Frequency (Hz)"
-msgstr "Частота (Гц)"
+msgid "16.67"
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
@@ -16040,9 +16663,6 @@ msgstr "Вузькоколійка"
msgid "Edit Narrow Gauge Rail"
msgstr "Властивості Вузькоколійки"
-msgid "Types"
-msgstr "Типи"
-
msgid "Monorail"
msgstr "Монорейка"
@@ -16085,18 +16705,56 @@ msgstr "Путі, що не використовуються"
msgid "Edit Disused Railway"
msgstr "Властивості Путів, що не використовуються"
-msgid "Optional Types"
-msgstr "Додаткові типи"
-
msgid "Abandoned Rail"
msgstr "Занедбані колії"
+msgid "Edit Abandoned Railway"
+msgstr "Властивості занедбаної колії"
+
msgid "Level Crossing"
msgstr "Залізничний переїзд"
+msgid "Edit Level Crossing"
+msgstr "Властивості переїзду"
+
+msgid "Supervised"
+msgstr "Охороняється"
+
+msgid "Traffic lights"
+msgstr "Семафор"
+
+msgid "Sound signals"
+msgstr "Звукові сигнали"
+
+msgid "Barrier"
+msgstr "Огорожа"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr "так"
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr "ні"
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr "наполовину"
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr "повністю"
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr "подвійна половинна"
+
msgid "Crossing"
msgstr "Перехід"
+msgid "Edit Crossing"
+msgstr "Властивості переходу"
+
msgid "Crossing type"
msgstr "Тип переходу"
@@ -16196,13 +16854,11 @@ msgstr "Транспортерна стрічка"
msgid "Edit Magic Carpet"
msgstr "Властивості транспортерної стрічки"
-msgctxt "aerialway"
msgid "Goods"
-msgstr "Вантажна дорога"
+msgstr "Вантажна"
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "Властивості вантажної дороги"
+msgstr "Властивості Вантажної дороги"
msgctxt "aerialway"
msgid "Station"
@@ -16212,11 +16868,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "Властивості Станції"
-msgctxt "aerialway"
msgid "Pylon"
msgstr "Опора"
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr "Властивості Опори"
@@ -16235,12 +16889,12 @@ msgstr "наземна"
msgid "underground"
msgstr "підземна"
+msgid "rooftop"
+msgstr "дах"
+
msgid "Access"
msgstr "Дозволи"
-msgid "customers"
-msgstr "клієнти"
-
msgid "Park and Ride"
msgstr "Перехоплююча стоянка"
@@ -16268,9 +16922,6 @@ msgstr "Парковоче місце"
msgid "Edit Parking space"
msgstr "Властивості парковочного місця"
-msgid "rooftop"
-msgstr "дах"
-
msgid "Capacity"
msgstr "Місткість"
@@ -16286,20 +16937,37 @@ msgstr "Обмеження часу (хвилин)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "Охороняється"
-
msgid "Opening Hours"
msgstr "Години роботи"
msgid "24/7"
msgstr "Цілодобово"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "Пн-Пт 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr "08:30-12:30,15:30-20:00"
+
+msgid "Sa-Su 00:00-24:00"
+msgstr "Сб-Нд 00:00-24:00"
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "Вт-Нд 08:00-15:00;Сб 08:00-12:00"
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr "Пн-Пт 08:30-20:00; Сб,Нд 08:00-15:00; крім Свят"
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "Пн-Пт 08:30-20:00,Вт-Нд 08:00-15:00; Сб 08:00-12:00"
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+"Пн-Вс 08:00-18:00; Кві 10-15 вих.; Чер 08:00-14:00; Сер вих.; Гру 25 вих."
+
+msgid "sunrise-sunset"
+msgstr "схід-захід"
+
+msgid "Su 10:00+"
+msgstr "Нд 10:00+"
+
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr "Тижд 1-53/2 Пт 09:00-12:00; Тижд 2-52/2 Ср 09:00-12:00"
msgid "Parking entrance"
msgstr "В’їзд на стоянку"
@@ -16448,6 +17116,9 @@ msgstr "Зарядна станція"
msgid "Edit Charging Station (for electric cars)"
msgstr "Властивості Зарядної станції (для електромобілів)"
+msgid "Voltage"
+msgstr "Напруга"
+
msgid "Amperage"
msgstr "Сила струму"
@@ -16469,6 +17140,12 @@ msgstr "Автомайстерня"
msgid "Edit Car Repair"
msgstr "Властивості Автомайстерні"
+msgid "Parts"
+msgstr "Запчастини"
+
+msgid "Edit Car Parts"
+msgstr "Властивості Автозапчастин"
+
msgid "Tyres"
msgstr "Колеса та Шини"
@@ -16496,6 +17173,12 @@ msgstr "Прокат"
msgid "Edit Car Rental"
msgstr "Властивості Прокату автомобілів"
+msgid "Second hand"
+msgstr "Вживані"
+
+msgid "only"
+msgstr "лише"
+
msgid "Sharing"
msgstr "Спільне користування"
@@ -16520,22 +17203,6 @@ msgstr "Підрозділи:"
msgid "Sale"
msgstr "Продаж"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "так"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "певної марки"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "використання"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "ні"
-
msgid "brand"
msgstr "певної марки"
@@ -16557,11 +17224,8 @@ msgstr "MOT"
msgid "TÜV"
msgstr "TÜV"
-msgid "Parts"
-msgstr "Запчастини"
-
msgid "Clothes"
-msgstr "Одяг/Дрантя"
+msgstr "Одяг"
msgid "Edit Bicycle Parking"
msgstr "Властивості Велостоянки"
@@ -16623,8 +17287,8 @@ msgstr "Властивості Велопрокату"
msgid "Public Transport"
msgstr "Громадський транспорт"
-msgid "Route"
-msgstr "Маршрут"
+msgid "Public transport route"
+msgstr "Маршрут громадського транспорту"
msgid "Edit Route"
msgstr "Властивості маршруту"
@@ -16754,6 +17418,9 @@ msgstr "Платформа"
msgid "Station or amenities"
msgstr "Станція чи т.і."
+msgid "Edit Stop Position"
+msgstr "Властивості Місця зупинки"
+
msgid "Bus"
msgstr "Автобус"
@@ -16784,6 +17451,9 @@ msgstr "Фунікулер"
msgid "Ferry"
msgstr "Паром"
+msgid "Edit Platform"
+msgstr "Властивості Платформи"
+
msgid "Bench"
msgstr "Лавка"
@@ -16796,9 +17466,6 @@ msgstr "В інвалідних візках"
msgid "limited"
msgstr "обмежений"
-msgid "only"
-msgstr "лише"
-
msgid "Highway platform (legacy)"
msgstr "Зупинка на дорозі (застаріле)"
@@ -16808,9 +17475,14 @@ msgstr "Залізнична платформа (застаріле)"
msgid "funicular"
msgstr "фунікулер"
+msgctxt "railway"
msgid "Station"
msgstr "Станція"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "Властивості Станції"
+
msgid "Building"
msgstr "Будівля"
@@ -16823,6 +17495,9 @@ msgstr "Властивості Входу в метро"
msgid "Ticket Machine"
msgstr "Автомат продажу квитків"
+msgid "Edit Ticket Machine"
+msgstr "Властивості Автомату продажу квитків"
+
msgid "Reference Number"
msgstr "Номер"
@@ -16847,14 +17522,6 @@ msgstr "накопичувальні, дисконтні карти"
msgid "Public Transport (legacy)"
msgstr "Громадський транспорт (застаріле)"
-msgctxt "railway"
-msgid "Station"
-msgstr "Станція"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "Властивості Станції"
-
msgid "UIC-Reference"
msgstr "код UIC"
@@ -16903,8 +17570,8 @@ msgstr "Властивості Автобусної платформи"
msgid "Taxi"
msgstr "Таксі"
-msgid "Edit Taxi station"
-msgstr "Властивості Стоянки таксі"
+msgid "Edit Taxi Station"
+msgstr "Властивості Зупинки таксі"
msgid "Airport"
msgstr "Аеропорт"
@@ -16957,6 +17624,21 @@ msgstr "Термінал"
msgid "Edit Terminal"
msgstr "Властивості Терміналу"
+msgid "Internet access"
+msgstr "Інтернет доступ"
+
+msgid "wlan"
+msgstr "бездротовий"
+
+msgid "wired"
+msgstr "по проводах"
+
+msgid "terminal"
+msgstr "термінал"
+
+msgid "Internet access fee"
+msgstr "Плата за інтернет доступ"
+
msgctxt "airport"
msgid "Gate"
msgstr "Вихід на посадку"
@@ -16979,21 +17661,6 @@ msgstr "Властивості Готелю"
msgid "Stars"
msgstr "Зірки"
-msgid "Internet access"
-msgstr "Інтернет доступ"
-
-msgid "wlan"
-msgstr "бездротовий"
-
-msgid "wired"
-msgstr "по проводах"
-
-msgid "terminal"
-msgstr "термінал"
-
-msgid "Internet access fee"
-msgstr "Плата за інтернет доступ"
-
msgid "Smoking"
msgstr "Місця для паління"
@@ -17177,6 +17844,12 @@ msgstr "Нічний клуб"
msgid "Edit Nightclub"
msgstr "Властивості Нічного клубу"
+msgid "Stripclub"
+msgstr "Стрипклуб"
+
+msgid "Edit Stripclub"
+msgstr "Властивості стрипклубу"
+
msgid "Tourism"
msgstr "Туризм"
@@ -17198,9 +17871,15 @@ msgstr "Оглядова вежа"
msgid "Information Office"
msgstr "Інформаційне бюро"
+msgid "Edit Information Office"
+msgstr "Властивості Інформаційного бюро"
+
msgid "Map"
msgstr "Мапа"
+msgid "Edit Information Map"
+msgstr "Властивості Мапи"
+
msgid "Detail Grade"
msgstr "Тип мапи"
@@ -17208,11 +17887,14 @@ msgid "topo"
msgstr "топографічна"
msgid "street"
-msgstr "мапа вулиць"
+msgstr "вулиця"
msgid "scheme"
msgstr "план-схема"
+msgid "toposcope"
+msgstr "топоскоп"
+
msgid "Shown Area"
msgstr "Територія"
@@ -17229,7 +17911,7 @@ msgid "Closer Description"
msgstr "Детальний опис"
msgid "Routes shown for:"
-msgstr "Маршрути на мапі:"
+msgstr "Маршрути:"
msgid "Hiking"
msgstr "піші"
@@ -17252,6 +17934,9 @@ msgstr "…інші можливі способи пересування"
msgid "Information Board"
msgstr "Інформаційна дошка"
+msgid "Edit Information Board"
+msgstr "Властивості Інформаційної дошки"
+
msgid "Board Content"
msgstr "Вміст покажчика"
@@ -17262,10 +17947,10 @@ msgid "history"
msgstr "історична довідка"
msgid "nature"
-msgstr "природа"
+msgstr "рослинність"
msgid "wildlife"
-msgstr "жива природа"
+msgstr "дикі тварини"
msgid "plants"
msgstr "рослини"
@@ -17273,23 +17958,35 @@ msgstr "рослини"
msgid "Guidepost"
msgstr "Вказівний стовп"
+msgid "Edit Guidepost"
+msgstr "Властивості Вказівного стовпу"
+
msgid "Information Terminal"
msgstr "Інформаційний термінал"
+msgid "Edit Information Terminal"
+msgstr "Властивості Інформаційного терміналу"
+
msgid "Closer description"
msgstr "Детальний опис"
msgid "Audioguide"
msgstr "Аудіогід"
+msgid "Edit Audioguide"
+msgstr "Властивості Аудіогіду"
+
msgid "Audioguide via mobile phone?"
msgstr "Аудіогід за допомогою мобільного телефону?"
msgid "Phone number"
msgstr "Номер телефону"
-msgid "Other Information Points"
-msgstr "Інші інформаційні пункти"
+msgid "Other Information Point"
+msgstr "Інша інформація"
+
+msgid "Edit Information Point"
+msgstr "Властивості Іншої інформації"
msgid "Leisure"
msgstr "Дозвілля"
@@ -17312,9 +18009,6 @@ msgstr "Собачий майданчик"
msgid "Edit Dog Park"
msgstr "Властивості Собачого майданчику"
-msgid "Barrier"
-msgstr "Огорожа"
-
msgid "fence"
msgstr "паркан"
@@ -17339,8 +18033,17 @@ msgstr "Сауна"
msgid "Edit Sauna"
msgstr "Властивості Сауни"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Вт-Сб 08:00-15:00; Нд 08:00-12:00"
+msgid "Horse riding"
+msgstr "Верхова їзда"
+
+msgid "Edit Horse riding"
+msgstr "Властивості Верхової їзди"
+
+msgid "Brothel"
+msgstr "Дім розпусти"
+
+msgid "Edit Brothel"
+msgstr "Властивості дому розпусти"
msgid "Playground"
msgstr "Ігровий майданчик"
@@ -17412,50 +18115,44 @@ msgstr "Витвори мистецтв"
msgid "Edit Artwork"
msgstr "Властивості Витворів мистецтв"
+msgid "Recording Studio"
+msgstr "Студія звукозапису"
+
+msgid "Edit Studio"
+msgstr "Властивості Студії"
+
+msgid "audio"
+msgstr "звук"
+
+msgid "video"
+msgstr "відео"
+
msgid "Place of Worship"
msgstr "Культове місце"
-msgid "Edit Place of Worship"
-msgstr "Властивості Культового місця"
+msgid "Church"
+msgstr "Храм"
-msgid "Religion"
-msgstr "Релігія"
+msgid "Edit Church"
+msgstr "Властивості Церкви"
-msgid "bahai"
-msgstr "бахаі"
+msgid "Building type"
+msgstr "Тип будівлі"
-msgid "buddhist"
-msgstr "буддизм"
+msgid "basilica"
+msgstr "базиліка"
-msgid "christian"
-msgstr "християнство"
+msgid "cathedral"
+msgstr "собор"
-msgid "hindu"
-msgstr "індуїзм"
+msgid "chapel"
+msgstr "каплиця"
-msgid "jain"
-msgstr "джайнізм"
+msgid "church"
+msgstr "церква"
-msgid "jewish"
-msgstr "іудаїзм"
-
-msgid "muslim"
-msgstr "іслам"
-
-msgid "sikh"
-msgstr "сикхізм"
-
-msgid "spiritualist"
-msgstr "спіритуалізм"
-
-msgid "taoist"
-msgstr "даосизм"
-
-msgid "unitarian"
-msgstr "уніатство"
-
-msgid "zoroastrian"
-msgstr "зороастризм"
+msgid "temple"
+msgstr "храм"
msgid "Denomination"
msgstr "Віросповідання"
@@ -17472,6 +18169,12 @@ msgstr "католицизм"
msgid "evangelical"
msgstr "євангелізм"
+msgid "greek_catholic"
+msgstr "греко-католицька"
+
+msgid "greek_orthodox"
+msgstr "грецька православна"
+
msgid "jehovahs_witness"
msgstr "свідки ієгови"
@@ -17484,6 +18187,9 @@ msgstr "методизм"
msgid "mormon"
msgstr "мормонство"
+msgid "new_apostolic"
+msgstr "новоапостольська церква"
+
msgid "orthodox"
msgstr "православ’я"
@@ -17499,38 +18205,142 @@ msgstr "протестантизм"
msgid "quaker"
msgstr "квакери"
+msgid "roman_catholic"
+msgstr "римсько-католицькие"
+
+msgid "russian_orthodox"
+msgstr "російська православна"
+
+msgid "seventh_day_adventist"
+msgstr "адвентистів сьомого дня"
+
+msgid "Service Times"
+msgstr "Розклад служінь"
+
+msgid "18:00"
+msgstr "18:00"
+
+msgid "sunset,sunrise"
+msgstr "захід,схід"
+
+msgid "Su 9:30,11:00"
+msgstr "Нд 9:30,11:00"
+
+msgid "Sa,Su,PH 9:00"
+msgstr "Сб,Нд,Свята 9:00"
+
+msgid "Sa 18:00; Su 10:45"
+msgstr "Сб 18:00; Нд 10:45"
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+"Пт 08:00-18:00; Кві 10-15 вих.; Чер 07:00-20:00; Сер вих.; Гру 24 08:00-24:00"
+
+msgid "Sa 10:00+"
+msgstr "СБ 10:00+"
+
+msgid "Mosque"
+msgstr "Мечеть"
+
+msgid "Edit Mosque"
+msgstr "Властивості Мечеті"
+
+msgid "mosque"
+msgstr "мечеть"
+
+msgid "ibadi"
+msgstr "ібадитська"
+
msgid "shia"
msgstr "шиїти"
msgid "sunni"
msgstr "суніти"
-msgid "Service Times"
-msgstr "Розклад служінь"
+msgid "Synagogue"
+msgstr "Синагога"
-msgid "Su 10:00"
-msgstr "Суб 10:00"
+msgid "Edit Synagogue"
+msgstr "Властивості Синагоги"
-msgid "Su 10:30"
-msgstr "Нед 10:30"
+msgid "synagogue"
+msgstr "синагога"
-msgid "Su 11:00"
-msgstr "Суб 11:00"
+msgid "conservative"
+msgstr "консервативне"
-msgid "Opening Hours for visiting"
-msgstr "Години для відвідування"
+msgid "reform"
+msgstr "реформістське"
-msgid "Recording Studio"
-msgstr "Студія звукозапису"
+msgid "Buddhist Temple"
+msgstr "Буддистський храм"
-msgid "Edit Studio"
-msgstr "Властивості Студії"
+msgid "Edit Buddhist Temple"
+msgstr "Властивості Буддистського храму"
-msgid "audio"
-msgstr "звук"
+msgid "theravada"
+msgstr "тхеравада"
-msgid "video"
-msgstr "відео"
+msgid "mahayana"
+msgstr "махаяна"
+
+msgid "vajrayana"
+msgstr "ваджраяна"
+
+msgid "Hindu Temple"
+msgstr "Індуїстський храм"
+
+msgid "Edit Hindu Temple"
+msgstr "Властивості Індуїстського храму"
+
+msgid "vaishnavism"
+msgstr "вайшнавізм"
+
+msgid "shaivism"
+msgstr "шиваізм"
+
+msgid "shaktism"
+msgstr "шактизм"
+
+msgid "smartism"
+msgstr "смартизм"
+
+msgid "Shinto Shrine"
+msgstr "Синтоїстське святилище"
+
+msgid "Edit Shinto Shrine"
+msgstr "Властивості Синтоїстського святилища"
+
+msgid "Other Place of Worship"
+msgstr "Інші культові місця"
+
+msgid "Edit other Place of Worship"
+msgstr "Властивості Культового місця"
+
+msgid "Religion"
+msgstr "Релігія"
+
+msgid "bahai"
+msgstr "бахаі"
+
+msgid "jain"
+msgstr "джайнізм"
+
+msgid "sikh"
+msgstr "сикхізм"
+
+msgid "spiritualist"
+msgstr "спіритуалізм"
+
+msgid "taoist"
+msgstr "даосизм"
+
+msgid "unitarian"
+msgstr "уніатство"
+
+msgid "zoroastrian"
+msgstr "зороастризм"
msgid "Public Building"
msgstr "Громадські будівлі"
@@ -17619,6 +18429,12 @@ msgstr "Властивості Автошколи"
msgid "License Classes"
msgstr "Класи з теоретичної підготовки"
+msgid "A;A1;B;BE;C"
+msgstr "A;A1;B;BE;C"
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+
msgid "Health"
msgstr "Медицина"
@@ -17628,6 +18444,12 @@ msgstr "Лікарня"
msgid "Edit Hospital"
msgstr "Властивості Лікарні"
+msgid "Clinic"
+msgstr "Клініка"
+
+msgid "Edit Clinic"
+msgstr "ВЛастивості Клініки"
+
msgid "Doctors"
msgstr "Лікар"
@@ -17694,12 +18516,66 @@ msgstr "Ветеринар"
msgid "Edit Veterinary"
msgstr "Властивості Ветеренарного пункту"
-msgid "Note"
-msgstr "Примітка"
+msgid "Edit Toilets"
+msgstr "Властивості Туалету"
+
+msgid "Access rights"
+msgstr "Права доступу"
+
+msgid "public"
+msgstr "загальнодоступне"
+
+msgid "seasonal"
+msgstr "періодично"
+
+msgid "flush"
+msgstr "зі зливом"
+
+msgid "pitlatrine"
+msgstr "з вигрібною ямою"
+
+msgid "chemical"
+msgstr "хімічний"
+
+msgid "bucket"
+msgstr "відро"
+
+msgid "Usage Position"
+msgstr "Спосіб використання"
+
+msgid "seated"
+msgstr "унітаз"
+
+msgid "seated;urinal"
+msgstr "унітаз; пісуар"
+
+msgid "squat"
+msgstr "навприсядки"
+
+msgid "urinal"
+msgstr "пісуар"
msgid "Post Box"
msgstr "Поштова скринька"
+msgid "Edit Postbox"
+msgstr "Властивості Поштової скриньки"
+
+msgid "Collection times"
+msgstr "Час виїмки"
+
+msgid "11:30"
+msgstr "11:30"
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr "Пн-Пт 15:00,17:45,19:00,23:00; Сб 15:10; Нд 10:30,23:00"
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr "Пн-Пт 09:00-12:00,17:15; Сб 14:00; So,Свята вих."
+
+msgid "Drive through"
+msgstr "Обслуговування автомобілістів"
+
msgid "Telephone"
msgstr "Телефон"
@@ -17709,6 +18585,30 @@ msgstr "Властивості телефону"
msgid "Telephone cards"
msgstr "Телефонні картки"
+msgid "Emergency Phone"
+msgstr "Телефон для екстрених викликів"
+
+msgid "Internet Access"
+msgstr "Доступ в Інтернет"
+
+msgid "Edit Internet Access"
+msgstr "Властивості Доступу в Інтернет"
+
+msgid "Automated Defibrillator"
+msgstr "Автоматизований дефібрилятор"
+
+msgid "Edit Automated External Defibrillator"
+msgstr "Властивості Автоматизованого дефібрилятора"
+
+msgid "Located inside a building?"
+msgstr "Розташований у будівлі?"
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr "Перевірявся в останнє (YYYY-MM-DD)"
+
+msgid "Last check note"
+msgstr "Відмітка про останню перевірку"
+
msgid "Clock"
msgstr "Годинник"
@@ -17718,30 +18618,36 @@ msgstr "Властивості годинника"
msgid "Display"
msgstr "Циферблат"
-msgctxt "display"
msgid "analog"
-msgstr "аналоговий"
+msgstr "стіролчний"
-msgctxt "display"
msgid "digital"
msgstr "цифровий"
-msgctxt "display"
msgid "sundial"
msgstr "сонячний"
-msgctxt "display"
msgid "unorthodox"
msgstr "незвичайний"
msgid "Support"
-msgstr "Розташуваний на"
+msgstr "Розташований на"
+
+msgctxt "mounting/support"
+msgid "pole"
+msgstr "стовпі"
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr "стіні"
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "стенді для оголошень"
+msgstr "дошці для оголошень"
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr "землі"
msgid "Visibility/readability"
msgstr "Видно з відстані"
@@ -17770,8 +18676,8 @@ msgstr "Показує вологість"
msgid "Recycling"
msgstr "Пункт прийому вторинної сировини"
-msgid "Edit Recycling station"
-msgstr "Властивості Пункту прийому вторинної сировини"
+msgid "Edit Recycling Station"
+msgstr "Властивості Пункту прийому вторсировини"
msgid "Batteries"
msgstr "Батарейки/Акумулятори"
@@ -17797,27 +18703,15 @@ msgstr "центр"
msgid "Waste Basket"
msgstr "Урна для сміття"
-msgid "Edit Waste Basket"
-msgstr "Властивості Урни для сміття"
-
msgid "Waste Disposal"
msgstr "Баки для сміття"
-msgid "Edit Waste Disposal"
-msgstr "Властивості баків для сміття"
+msgid "Edit Bench"
+msgstr "Властивості Лавки"
msgid "Backrest"
msgstr "Спинка"
-msgid "Material"
-msgstr "Матеріал"
-
-msgid "stone"
-msgstr "камінь"
-
-msgid "plastic"
-msgstr "пластик"
-
msgid "Amount of Seats"
msgstr "Кількість місць"
@@ -17852,12 +18746,15 @@ msgstr "Властивості Мисливської вежі"
msgid "Height"
msgstr "Висота"
+msgctxt "height"
msgid "low"
msgstr "низька"
+msgctxt "height"
msgid "half"
msgstr "половинна"
+msgctxt "height"
msgid "full"
msgstr "повна"
@@ -17867,12 +18764,12 @@ msgstr "Прихована"
msgid "Lock"
msgstr "Зачиняється"
-msgid "Drinking Water"
-msgstr "Питна вода"
-
-msgid "Edit Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr "Властивості Питної води"
+msgid "Indoor"
+msgstr "в приміщенні"
+
msgid "Fire Hydrant"
msgstr "Пожежний гідрант"
@@ -17898,6 +18795,9 @@ msgstr "ставок"
msgid "Diameter (in mm)"
msgstr "Діаметр (в мм)"
+msgid "Hydrant Position"
+msgstr "Розташування"
+
msgctxt "hydrant position"
msgid "lane"
msgstr "провулок"
@@ -17935,117 +18835,153 @@ msgstr "Стадіон"
msgid "Edit Stadium"
msgstr "Властивості Стадіону"
-msgid "select sport:"
-msgstr "види спорту:"
+msgid "Select sport:"
+msgstr "Вид спорту"
-msgid "sport"
-msgstr "спорт"
+msgid "Sport"
+msgstr "Спорт"
+msgctxt "sport"
msgid "multi"
msgstr "багатоборство"
+msgctxt "sport"
msgid "archery"
msgstr "стрільба з лука"
+msgctxt "sport"
msgid "athletics"
msgstr "атлетика"
+msgctxt "sport"
msgid "american_football"
msgstr "американський футбол"
+msgctxt "sport"
msgid "australian_football"
msgstr "австралійський футбол"
+msgctxt "sport"
msgid "baseball"
msgstr "бейсбол"
+msgctxt "sport"
msgid "basketball"
msgstr "баскетбол"
+msgctxt "sport"
msgid "boules"
-msgstr "боче (петанк)"
+msgstr "буль"
+msgctxt "sport"
msgid "bowls"
-msgstr "боулз"
+msgstr "кеглі"
+msgctxt "sport"
msgid "canadian_football"
msgstr "канадський футбол"
+msgctxt "sport"
msgid "canoe"
msgstr "каное"
+msgctxt "sport"
msgid "climbing"
-msgstr "скелелазіння"
+msgstr "сходження"
+msgctxt "sport"
msgid "cricket"
msgstr "крикет"
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "тренувальні сітки для крикету"
+msgstr "крикетні сітки"
+msgctxt "sport"
msgid "croquet"
msgstr "крокет"
+msgctxt "sport"
msgid "cycling"
-msgstr "велоспорт"
+msgstr "їзда на велосипеді"
+msgctxt "sport"
msgid "dog_racing"
msgstr "собачі перегони"
+msgctxt "sport"
msgid "equestrian"
msgstr "кінний спорт"
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "гаельські ігри"
+msgstr "гельські ігри"
+msgctxt "sport"
msgid "golf"
msgstr "гольф"
+msgctxt "sport"
msgid "gymnastics"
msgstr "гімнастика"
+msgctxt "sport"
msgid "hockey"
msgstr "хокей"
+msgctxt "sport"
msgid "horse_racing"
-msgstr "кінські перегони"
+msgstr "кінні перегони"
+msgctxt "sport"
msgid "motor"
msgstr "мотоспорт"
+msgctxt "sport"
msgid "pelota"
msgstr "пелота"
+msgctxt "sport"
msgid "racquet"
-msgstr "ракетбол"
+msgstr "ракетка"
+msgctxt "sport"
msgid "rugby_league"
msgstr "ліга регбі"
+msgctxt "sport"
msgid "rugby_union"
msgstr "союз регбі"
+msgctxt "sport"
msgid "shooting"
msgstr "стрільба"
+msgctxt "sport"
msgid "skateboard"
msgstr "скейтборд"
+msgctxt "sport"
msgid "skating"
msgstr "катання на ковзанах"
+msgctxt "sport"
msgid "skiing"
msgstr "катання на лижах"
+msgctxt "sport"
msgid "soccer"
msgstr "футбол"
+msgctxt "sport"
msgid "swimming"
msgstr "плавання"
+msgctxt "sport"
msgid "table_tennis"
msgstr "настільний теніс"
+msgctxt "sport"
msgid "tennis"
msgstr "теніс"
@@ -18079,33 +19015,43 @@ msgstr "Міні-гольф"
msgid "Edit Miniature Golf"
msgstr "Властивості Поля для міні-гольфу"
-msgid "Sport"
-msgstr "Спорт"
-
msgid "Multi"
msgstr "Багатоборство"
msgid "Edit Multi"
msgstr "Правити Багатоборство"
-msgid "type"
-msgstr "тип"
-
+msgctxt "running"
msgid "pitch"
msgstr "спортивний майданчик"
+msgctxt "running"
msgid "sports_centre"
msgstr "спортивний центр"
+msgctxt "running"
msgid "stadium"
msgstr "стадіон"
+msgctxt "running"
+msgid "track"
+msgstr "бігова доріжка"
+
msgid "9pin"
msgstr "9 кеглів"
msgid "Edit 9pin"
msgstr "Властивості 9 кеглів"
+msgid "pitch"
+msgstr "спортивний майданчик"
+
+msgid "sports_centre"
+msgstr "спортивний центр"
+
+msgid "stadium"
+msgstr "стадіон"
+
msgid "10pin"
msgstr "Боулінг (10-кегельний)"
@@ -18139,6 +19085,22 @@ msgstr "Властивості Каное"
msgid "Edit Cycling"
msgstr "Властивості Велоспорту"
+msgctxt "racing"
+msgid "pitch"
+msgstr "спортивний майданчик"
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr "спортивний центр"
+
+msgctxt "racing"
+msgid "stadium"
+msgstr "стадіон"
+
+msgctxt "racing"
+msgid "track"
+msgstr "трек"
+
msgid "Dog Racing"
msgstr "Собачі перегони"
@@ -18151,8 +19113,33 @@ msgstr "Кінний спорт"
msgid "Edit Equestrian"
msgstr "Властивості Кінного спорту"
-msgid "horse_riding"
-msgstr "їзда верхи"
+msgctxt "riding"
+msgid "pitch"
+msgstr "поле"
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr "спортивний центр"
+
+msgctxt "riding"
+msgid "stadium"
+msgstr "стадіон"
+
+msgctxt "riding"
+msgid "track"
+msgstr "трек"
+
+msgid "clay"
+msgstr "глина"
+
+msgid "dirt"
+msgstr "бруд"
+
+msgid "fine_gravel"
+msgstr "мілкий гравій"
+
+msgid "mud"
+msgstr "грязь"
msgid "Horse Racing"
msgstr "Кінні перегони"
@@ -18214,38 +19201,56 @@ msgstr "сніговий парк"
msgid "Difficulty"
msgstr "Складність"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "початковий рівень"
+msgstr "для початківеців"
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "легкий рівень"
+msgstr "легко"
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr "посередньо"
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "складний рівень"
+msgstr "для досвідчених"
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "для професіоналів"
+msgstr "Для фахівців"
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr "фрірайд"
msgid "Grooming"
msgstr "Лижня"
+msgctxt "piste:grooming"
msgid "classic"
msgstr "класична"
+msgctxt "piste:grooming"
msgid "mogul"
msgstr "могул"
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr "коньковий крок"
+
+msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr "класична;коньковий крок"
+msgstr "класична; коньковий крок"
+msgctxt "piste:grooming"
msgid "scooter"
-msgstr "прокладено снігоходом"
+msgstr "стрімкий спуск"
+msgctxt "piste:grooming"
msgid "backcountry"
-msgstr "прокладено лижниками"
+msgstr "в глушині"
msgid "Shooting"
msgstr "Стрільба"
@@ -18286,21 +19291,17 @@ msgstr "Гаельські Ігри"
msgid "Edit Gaelic Games"
msgstr "Властивості Гаельських Ігор"
-msgctxt "gaelic game"
msgid "Hurling"
-msgstr "Герлінг"
+msgstr "Херлінг"
-msgctxt "gaelic game"
msgid "Football"
msgstr "Футбол"
-msgctxt "gaelic game"
msgid "Camogie"
msgstr "Камоджі"
-msgctxt "gaelic game"
msgid "Rounders"
-msgstr "Раундерз (англійська лапта)"
+msgstr "Раундерз"
msgid "Rugby League"
msgstr "Ліга регбі"
@@ -18437,6 +19438,18 @@ msgstr "Аеродром для авіамоделей"
msgid "Edit Model Aerodrome"
msgstr "Властивості Аеродрому для авіамоделей"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr "спортивний майданчик"
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr "спортивний центр"
+
+msgctxt "aerialway"
+msgid "track"
+msgstr "трек"
+
msgid "RC Car"
msgstr "Дистанційно керовані автомобілі"
@@ -18449,59 +19462,133 @@ msgstr "Штучні об’єкти"
msgid "Edit Building"
msgstr "Властивості Будівлі"
+msgctxt "building"
+msgid "yes"
+msgstr "так"
+
+msgctxt "building"
msgid "roof"
msgstr "дах"
+msgctxt "building"
msgid "garage"
msgstr "гараж"
-msgid "church"
-msgstr "церква"
+msgctxt "building"
+msgid "garages"
+msgstr "гаражі"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "промисловість"
+msgctxt "building"
msgid "school"
msgstr "школа"
+msgctxt "building"
msgid "hangar"
msgstr "ангар"
+msgctxt "building"
msgid "commercial"
-msgstr "комерційна"
+msgstr "комерційного призначення"
+msgctxt "building"
msgid "farm"
msgstr "ферма"
+msgctxt "building"
msgid "transportation"
-msgstr "пов’язано з траспортом"
+msgstr "траспорт"
+msgctxt "building"
msgid "greenhouse"
msgstr "теплиця"
+msgctxt "building"
msgid "office"
msgstr "офіс"
+msgctxt "building"
msgid "university"
msgstr "університет"
+msgctxt "building"
+msgid "hospital"
+msgstr "лікарня"
+
+msgctxt "building"
+msgid "warehouse"
+msgstr "склад"
+
+msgctxt "building"
+msgid "retail"
+msgstr "роздрібна торгівля"
+
+msgctxt "building"
+msgid "shed"
+msgstr "сарай"
+
msgid "Residential Building"
msgstr "Житлова будівля"
msgid "Edit Residential Building"
msgstr "Властивості Житлової будівлі"
+msgctxt "building"
+msgid "residential"
+msgstr "житловий будинок"
+
+msgctxt "building"
msgid "apartments"
-msgstr "багатоповерхівка з квартирами"
+msgstr "багатоквартирний будинок"
+msgctxt "building"
msgid "house"
-msgstr "будинок"
+msgstr "житло"
+msgctxt "building"
msgid "hut"
-msgstr "сторожка"
+msgstr "халупа"
+msgctxt "building"
+msgid "dormitory"
+msgstr "гуртожиток"
+
+msgctxt "building"
msgid "terrace"
-msgstr "таунхаус"
+msgstr "таунхауз"
+msgctxt "building"
msgid "detached"
-msgstr "окремий будинок"
+msgstr "окремо розташована будівля"
+
+msgid "Entrance"
+msgstr "Вхід/В’їзд"
+
+msgid "Edit Entrance"
+msgstr "Властивості Входу/В’їзду"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr "так"
+
+msgctxt "entrance"
+msgid "main"
+msgstr "головний"
+
+msgctxt "entrance"
+msgid "service"
+msgstr "службовий"
+
+msgctxt "entrance"
+msgid "exit"
+msgstr "вихід"
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr "аварійний"
msgid "Tower"
msgstr "Башта"
@@ -18518,9 +19605,6 @@ msgstr "зв’язку"
msgid "observation"
msgstr "спостереження"
-msgid "Height (meters)"
-msgstr "Висота (в метрах)"
-
msgid "Flagpole"
msgstr "Флагшток"
@@ -18730,42 +19814,68 @@ msgstr "Час роботи"
msgid "Mo-Fr 22:00-05:00"
msgstr "Пн-Пт 22:00-05:00"
-msgid "Measurement Station"
-msgstr "Вимірювальна станція"
+msgid "Monitoring Station"
+msgstr "Станція спостереження"
-msgid "Edit Measurement Station"
-msgstr "Властивості Вимірювальної станції"
+msgid "Edit Monitoring Station"
+msgstr "Властивості станції спостереження"
-msgid "Measurement"
-msgstr "Вимірювання"
+msgid "Monitoring:"
+msgstr "Спостерігається:"
-msgid "particulate_matter"
-msgstr "твердих часток"
+msgid "Weather"
+msgstr "Погода"
-msgid "seismic"
-msgstr "сейсмічна"
+msgid "Water level"
+msgstr "Рівень води"
-msgid "water_level"
-msgstr "рівня води"
+msgid "Tide Level"
+msgstr "Висота хвиль"
-msgid "weather"
-msgstr "погодна"
+msgid "Traffic"
+msgstr "Трафік"
-msgid "Recording"
-msgstr "Рейстрація"
+msgid "Air Quality"
+msgstr "Чистота повітря"
-msgid "manually"
-msgstr "вручну"
+msgid "Noise"
+msgstr "Шум"
-msgid "automated"
-msgstr "автоматично"
+msgid "GPS Signals"
+msgstr "Сигнал GPS"
-msgid "remote"
-msgstr "віддалено"
+msgid "GLONASS Signals"
+msgstr "Сигнал GLONASS"
-msgctxt "display"
-msgid "no"
-msgstr "немає"
+msgid "Galileo Signals"
+msgstr "Сигнал Galileo"
+
+msgid "Radiation"
+msgstr "Радіаційний фон"
+
+msgid "Seismic Activity"
+msgstr "Сейсмічна активність"
+
+msgid "Recording:"
+msgstr "Запис:"
+
+msgid "Automated"
+msgstr "Автоматичний"
+
+msgid "Manually"
+msgstr "Вручну"
+
+msgid "Remote"
+msgstr "Віддалено"
+
+msgid "Display:"
+msgstr "Інтерфейс:"
+
+msgid "Analog"
+msgstr "Аналоговий"
+
+msgid "Digital"
+msgstr "Цифровий"
msgid "Survey Point"
msgstr "Геодезичний пункт"
@@ -18773,8 +19883,8 @@ msgstr "Геодезичний пункт"
msgid "Edit Survey Point"
msgstr "Властивості Геодезичного пункту"
-msgid "Surveillance"
-msgstr "Камера спостереження"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "Властивості Камери спостереження"
@@ -18785,18 +19895,108 @@ msgstr "внутрішня"
msgid "outdoor"
msgstr "зовнішня"
-msgid "public"
-msgstr "загальнодоступне"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "магазин"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr "Висота у метрах (м)"
msgid "Power"
msgstr "Енергетика"
-msgid "Power Generator"
+msgid "Power Plant"
msgstr "Електростанція"
-msgid "Edit Power Generator"
+msgid "Edit Power Plant"
msgstr "Властивості Електростанції"
+msgid "Start date"
+msgstr "Початок роботи"
+
+msgid "Output forms of energy"
+msgstr "Енергія, що генерується"
+
+msgid "(please add this information to the generators if possible)"
+msgstr "(будь ласка, додайте цю інформацію про тип генерованої енергії)"
+
+msgid "electricity"
+msgstr "електрична"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "гаряча вода"
+
+msgid "hot air"
+msgstr "гаряче повітря"
+
+msgid "cold water"
+msgstr "холодна вода"
+
+msgid "cold air"
+msgstr "холодне повітря"
+
+msgid "compressed air"
+msgstr "стиснене повітря"
+
+msgid "steam"
+msgstr "пар"
+
+msgid "vacuum"
+msgstr "вакуум"
+
+msgid "Power Generator"
+msgstr "Генератор"
+
+msgid "Edit Power Generator"
+msgstr "Властивості Генератора"
+
msgid "biofuel"
msgstr "біопаливо"
@@ -18842,89 +20042,195 @@ msgstr "вітряна"
msgid "Method"
msgstr "Спосіб"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "анаеробне перетравлення"
+msgstr "анаеробного зброджування"
+msgctxt "generator method"
+msgid "barrage"
+msgstr "дамба"
+
+msgctxt "generator method"
msgid "combustion"
-msgstr "спалювання"
+msgstr "згоряння"
-msgid "dam"
-msgstr "гребля"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr "біопаливо / вугілля / дизель / газ / бензин / масло / відходи"
+msgctxt "generator method"
msgid "fission"
msgstr "розщеплення"
+msgctxt "generator method"
msgid "fusion"
-msgstr "злиття"
+msgstr "плавлення"
+msgctxt "generator method"
msgid "gasification"
msgstr "газифікація"
-msgid "photovoltaic"
-msgstr "сонячна"
-
-msgid "pumped-storage"
-msgstr "гідроакумулятор"
+msgid "biomass / waste"
+msgstr "біомаси / відходи"
-msgid "pumping"
-msgstr "накачування"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr "фотоелектричний"
+msgctxt "generator method"
msgid "pyrolysis"
msgstr "піроліз"
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "річковий потік"
+msgstr "течія ріки"
+
+msgctxt "generator method"
+msgid "stream"
+msgstr "потік"
+msgctxt "generator method"
msgid "thermal"
msgstr "тепловий"
-msgid "Output forms of energy"
-msgstr "Енергія, що генерується"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr "гідроакумулюючий"
-msgid "electricity"
-msgstr "електрична"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr "водосховище"
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr "Тип генератора"
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr "комбінований цикл"
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr "спалювання газу"
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr "турбіна Френсіса"
-msgid "hot water"
-msgstr "гаряча вода"
+msgid "gas_turbine"
+msgstr "газова турбіна"
-msgid "hot air"
-msgstr "гаряче повітря"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr "спалювання біогазу, біомаси, відходів"
-msgid "cold water"
-msgstr "холодна вода"
+msgid "heat_pump"
+msgstr "тепловий насос"
-msgid "cold air"
-msgstr "холодне повітря"
+msgid "horizontal_axis"
+msgstr "горизонтальна вісь"
-msgid "compressed air"
-msgstr "стиснене повітря"
+msgid "tidal steam / wind"
+msgstr "приливи пари / вітру"
-msgid "steam"
-msgstr "пар"
+msgid "kaplan_turbine"
+msgstr "поворотно-лопатева гідротурбіна"
-msgid "vacuum"
-msgstr "вакуум"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr "гидротечія-ріки/ гідро водосховище / приливна гребля"
+
+msgid "pelton_turbine"
+msgstr "ковшова турбіна"
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr "гідро течія-ріки / гідро водосховище"
+
+msgid "reciprocating_engine"
+msgstr "поршневий двигун"
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr "біопаливо, біогаз, дизель, газ, бензин"
+
+msgid "solar_photovoltaic_panel"
+msgstr "сонячні фотоелектричні панелі"
+
+msgid "solar photovoltaic"
+msgstr "сонячні фотоелектричні"
+
+msgid "solar_thermal_collector"
+msgstr "сонячних тепловий колектор"
+
+msgid "solar thermal"
+msgstr "сонячне тепло"
+
+msgid "steam_generator"
+msgstr "парогенератор"
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+"спалювання біопалива, вугілля, дизелю, газу, бензину, нафти, відходів"
+
+msgid "steam_turbine"
+msgstr "парова турбіна"
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+"геотермальні / сонячні теплові / спалювання біопалива, вугілля, нафти, "
+"відходів"
+
+msgid "stellarator"
+msgstr "стеларатор"
+
+msgid "nuclear fusion"
+msgstr "ядерний синтез"
+
+msgid "tokamak"
+msgstr "токамак"
+
+msgid "vertical_axis"
+msgstr "вертикальна вісь"
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr "Киплячий ядерний реакторr 1 (BWR-1)"
+
+msgid "nuclear fission"
+msgstr "ядерий поділ"
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr "Киплячий ядерний реактор 2 (BWR-2)"
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr "Киплячий ядерний реактор 3 (BWR-3)"
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr "Киплячий ядерний реактор 4 (BWR-4)"
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr "Киплячий ядерний реактор 5 (BWR-5)"
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr "Киплячий ядерний реактор 6 (BWR-6)"
-msgid "battery charging"
-msgstr "зарядка батарей"
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr "Важководний водо-водяний ядерний реактор виробництва Канади"
-msgid "Power Station"
-msgstr "Електропідстанція"
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr "Китайський Реактор високого тиску (CPR-1000)"
-msgid "Edit Power Station"
-msgstr "Властивості Електропідстанції"
+msgid "European Pressurized Reactor (EPR)"
+msgstr "Європейський Реактор високого тиску (EPR)"
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr "Термоядерний синтез (ICF)"
+
+msgid "Pressurized water reactor (PWR)"
+msgstr "Водо-водяний ядерний реактор (PWR)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr "Реактор великої потужності канальний 1000 (RBMK-1000)"
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr "Реактор великої потужності канальний 1500 (RBMK-1500)"
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr "Водно-водяний Енергетичний реактор (VVER)"
+
+msgid "Output forms of energy:"
+msgstr "Вид вихідної енергії"
msgid "Power Sub Station"
msgstr "Трансформаторна будка"
@@ -18935,6 +20241,21 @@ msgstr "Властивості Трансформаторної будки"
msgid "Line reference"
msgstr "назва (номер) мережі"
+msgid "high"
+msgstr "високий"
+
+msgid "medium"
+msgstr "середній"
+
+msgid "low"
+msgstr "низька"
+
+msgid "750000;200000"
+msgstr "750000;200000"
+
+msgid "110000;20000"
+msgstr "110000;20000"
+
msgid "Cable Distribution Cabinet"
msgstr "Кабельна розподільча шафа"
@@ -18950,6 +20271,9 @@ msgstr "Властивості Опори ЛЕП"
msgid "Tower reference"
msgstr "Номер опори"
+msgid "steel"
+msgstr "сталь"
+
msgid "Pole"
msgstr "Опора"
@@ -18968,13 +20292,11 @@ msgstr "Властивості Лінії електропередач"
msgid "Line type"
msgstr "Тип лінії"
-msgctxt "Power Line"
msgid "line"
-msgstr "електромережа"
+msgstr "високовольтна"
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "середньої/низької напруги"
+msgstr "низьковольтна"
msgid "Amount of Cables"
msgstr "Кількість кабелів"
@@ -19081,11 +20403,11 @@ msgstr "Кіоск"
msgid "Edit Kiosk"
msgstr "Властивості Кіоску"
-msgid "Baker"
-msgstr "Булочна"
+msgid "Bakery"
+msgstr "Пекарня"
-msgid "Edit Baker"
-msgstr "Властивості Булочної"
+msgid "Edit Bakery"
+msgstr "Властивості пекарні"
msgid "Butcher"
msgstr "М’ясна лавка"
@@ -19096,8 +20418,8 @@ msgstr "Властивості М’ясної лавки"
msgid "Seafood"
msgstr "Морепродукти"
-msgid "Edit Seafood"
-msgstr "Властивості Морепродуктів"
+msgid "Edit Seafood Shop"
+msgstr "Властивості магазину морепродуктів"
msgid "Deli (Fine Food)"
msgstr "Делікатеси (Вишукана їжа)"
@@ -19117,14 +20439,20 @@ msgstr "Ринок"
msgid "Edit Marketplace"
msgstr "Властивості Ринку"
+msgid "Organic"
+msgstr "Екологічно чисті продукти"
+
msgid "Greengrocer"
msgstr "Овочевий"
msgid "Edit Greengrocer"
msgstr "Властивості Овочевого"
-msgid "Organic"
-msgstr "Екологічно чисті продукти"
+msgid "Farm Stand"
+msgstr "Стелаж з фермерськими товарами"
+
+msgid "Edit Farm Stand"
+msgstr "Властивості стелажу з фермерськими товарами"
msgid "Edit Organic/Bio"
msgstr "Властивості магазину натуральних продуктів"
@@ -19195,8 +20523,8 @@ msgstr "Властивості Кравця"
msgid "Fabric"
msgstr "Тканини"
-msgid "Edit Fabric"
-msgstr "Властивості Тканин"
+msgid "Edit Fabric Shop"
+msgstr "Властивості магазину тканин"
msgid "Electronic"
msgstr "Електроніка"
@@ -19216,14 +20544,14 @@ msgstr "Властивості Магазину побутової електр
msgid "Mobile Phone"
msgstr "Мобільні телефони"
-msgid "Edit Mobile Phone"
-msgstr "Властивості Мобільних телефонів"
+msgid "Edit Mobile Phone Shop"
+msgstr "Властивості магазину мобільних телефонів"
msgid "Vacuum Cleaner"
msgstr "Пилососи"
-msgid "Edit Vacuum Cleaner"
-msgstr "Властивості Пилососів"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr "Властивості магазину пилососів"
msgid "Hifi"
msgstr "Аудіо апаратура"
@@ -19231,7 +20559,6 @@ msgstr "Аудіо апаратура"
msgid "Edit Hifi Shop"
msgstr "Властивості Магазину Аудіо апаратури"
-msgctxt "shop"
msgid "Video"
msgstr "Відео"
@@ -19259,6 +20586,12 @@ msgstr "Властивості Пункту обміну валют"
msgid "Edit Automated Teller Machine"
msgstr "Властивості Банкомату"
+msgid "Pawnbroker"
+msgstr "Ломбард"
+
+msgid "Edit Pawnbroker"
+msgstr "Властивості ломбарду"
+
msgid "Department Store"
msgstr "Універмаг"
@@ -19295,11 +20628,32 @@ msgstr "Ювелірні вироби"
msgid "Edit Jewelry"
msgstr "Властивості Ювелірних виробів"
+msgid "Gift"
+msgstr "Подарунки"
+
+msgid "Edit Gift Shop"
+msgstr "Властивості Магазину подарунків"
+
+msgid "buddhist"
+msgstr "буддизм"
+
+msgid "christian"
+msgstr "християнство"
+
+msgid "hindu"
+msgstr "індуїзм"
+
+msgid "jewish"
+msgstr "іудаїзм"
+
+msgid "muslim"
+msgstr "іслам"
+
msgid "Erotic"
msgstr "Секс-шоп"
-msgid "Edit Erotic"
-msgstr "Властивості Секс-шопу"
+msgid "Edit Erotic Shop"
+msgstr "Властивості секс-шопу"
msgid "Florist"
msgstr "Квітковий магазин"
@@ -19328,8 +20682,8 @@ msgstr "Властивості Магазину господарських то
msgid "Paint"
msgstr "Малярні аксесуари"
-msgid "Edit Paint"
-msgstr "Властивості Малярних аксесуарів"
+msgid "Edit Paint Shop"
+msgstr "Властивості магазину малярних аксесуарів"
msgid "Furniture"
msgstr "Меблі"
@@ -19340,20 +20694,20 @@ msgstr "Властивості Меблевого магазину"
msgid "Kitchen"
msgstr "Все для кухні"
-msgid "Edit Kitchen"
-msgstr "Властивості Все для кухні"
+msgid "Edit Kitchen Store"
+msgstr "Властивості магазину Все для кухні"
msgid "Curtain"
msgstr "Штори та гардини"
-msgid "Edit Curtain"
-msgstr "Властивості Штор та гардин"
+msgid "Edit Curtain Shop"
+msgstr "Властивості магазину штор та гардин"
msgid "Frame"
msgstr "Рами"
-msgid "Edit Frames"
-msgstr "Властивості Рам"
+msgid "Edit Frames Shop"
+msgstr "Властивості магазину рам"
msgid "Stationery"
msgstr "Канцтовари"
@@ -19373,6 +20727,12 @@ msgstr "Книжковий магазин"
msgid "Edit Book Store"
msgstr "Властивості Книжкового магазину"
+msgid "Newsagent''s shop"
+msgstr "Газетний кіоск"
+
+msgid "Edit Newsagent''s shop"
+msgstr "Властивості газетного кіоску"
+
msgid "Travel Agency"
msgstr "Турагентство"
@@ -19382,8 +20742,8 @@ msgstr "Властивості Турагентства"
msgid "Musical Instrument"
msgstr "Музичні інструменти"
-msgid "Edit Musical Instruments"
-msgstr "Властивості Музичних інструментів"
+msgid "Edit Musical Instruments Shop"
+msgstr "Властивості магазину музичних інструментів"
msgid "Toys"
msgstr "Іграшки"
@@ -19463,6 +20823,9 @@ msgstr "іграшки"
msgid "vouchers"
msgstr "ваучери"
+msgid "Note"
+msgstr "Примітка"
+
msgid "Geography"
msgstr "Географія"
@@ -19592,6 +20955,12 @@ msgstr "Вершина"
msgid "Edit Peak"
msgstr "Властивості Вершини"
+msgid "Saddle"
+msgstr "Перевал"
+
+msgid "Edit Saddle"
+msgstr "Властивості гірського перевалу"
+
msgid "Glacier"
msgstr "Льодовик"
@@ -19631,26 +21000,35 @@ msgstr "Дерево"
msgid "Edit Tree"
msgstr "Властивості Дерева"
+msgid "broad_leaved"
+msgstr "листяні"
+
+msgid "conifer"
+msgstr "хвойні"
+
+msgid "palm"
+msgstr "пальми"
+
msgid "Botanical Name"
msgstr "Ботанічна назва"
+msgid "Tree Row"
+msgstr "Ряд дерев"
+
msgid "Wood"
msgstr "Дерева"
msgid "Edit Wood"
msgstr "Властивості Дерев"
-msgctxt "wood"
msgid "coniferous"
-msgstr "хвойні"
+msgstr "хвойний"
-msgctxt "wood"
msgid "deciduous"
-msgstr "листяні"
+msgstr "листяний"
-msgctxt "wood"
msgid "mixed"
-msgstr "мішані"
+msgstr "мішаний"
msgid "Forest"
msgstr "Лісовий масив"
@@ -19658,15 +21036,6 @@ msgstr "Лісовий масив"
msgid "Edit Forest Landuse"
msgstr "Властивості Лісового масиву"
-msgid "coniferous"
-msgstr "хвойний"
-
-msgid "deciduous"
-msgstr "листяний"
-
-msgid "mixed"
-msgstr "мішаний"
-
msgid "Grassland"
msgstr "Трави"
@@ -19742,6 +21111,12 @@ msgstr "Левада"
msgid "Edit Meadow Landuse"
msgstr "Властивості Левади"
+msgid "Orchard"
+msgstr "Фруктовий сад"
+
+msgid "Edit Orchard Landuse"
+msgstr "Властивості Фруктового саду"
+
msgid "Vineyard"
msgstr "Виноградник"
@@ -19796,8 +21171,8 @@ msgstr "Майданчик для ігор"
msgid "Edit Recreation Ground Landuse"
msgstr "Властивості Майданчику для ігор"
-msgid "Residential area"
-msgstr "Житлова зона"
+msgid "Residential Area"
+msgstr "Житловий район"
msgid "Edit Residential Landuse"
msgstr "Властивості Житлової зони"
@@ -19808,6 +21183,9 @@ msgstr "Цвинтар"
msgid "Edit Graveyard"
msgstr "Властивості Цвинтаря"
+msgid "shinto"
+msgstr "синтоїзм"
+
msgid "Cemetery"
msgstr "Кладовище"
@@ -19883,6 +21261,33 @@ msgstr "Властивості Кар’єра"
msgid "Annotation"
msgstr "Вказівники"
+msgid "Edit Name Information"
+msgstr "Властивості назви"
+
+msgid "Alternative name"
+msgstr "Альтернативна назва"
+
+msgid "Historical name"
+msgstr "Історична назва"
+
+msgid "Local name"
+msgstr "Місцева назва"
+
+msgid "Regional name"
+msgstr "Регіональна назва"
+
+msgid "National name"
+msgstr "Національна назва"
+
+msgid "International name"
+msgstr "Міжнародна назва"
+
+msgid "Official name"
+msgstr "Офіційна назва"
+
+msgid "Common name abbreviation"
+msgstr "Загальна скорочена назва"
+
msgid "Edit Address Information"
msgstr "Властивості Адреси"
@@ -19901,30 +21306,6 @@ msgstr "Назва міста"
msgid "Country code"
msgstr "Код країни"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr "RS"
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "Вставка адрес"
@@ -19943,6 +21324,18 @@ msgstr "парні"
msgid "alphabetic"
msgstr "за абеткою"
+msgid "Accuracy"
+msgstr "Точність"
+
+msgid "actual"
+msgstr "актуальна"
+
+msgid "estimate"
+msgstr "приблизна"
+
+msgid "potential"
+msgstr "можлива"
+
msgid "Contact (common schema)"
msgstr "Контакти (загальна схема)"
@@ -20105,27 +21498,56 @@ msgstr "кінець обмеження"
msgid "traffic light or barrier that stops you"
msgstr "світлофор чи перешкода, що зупиняє вас"
-msgid "Route (legacy)"
-msgstr "Маршрут (застаріле)"
+msgid "General route"
+msgstr "Маршрут"
-msgid "Edit Route (legacy)"
-msgstr "Властивості маршруту (застаріле)"
+msgid "Edit general route"
+msgstr "Властивості маршруту"
+msgctxt "route type"
+msgid "bicycle"
+msgstr "велосипедний"
+
+msgctxt "route type"
+msgid "bus"
+msgstr "автобусний"
+
+msgctxt "route type"
msgid "road"
msgstr "дорога"
+msgctxt "route type"
+msgid "ferry"
+msgstr "поромний"
+
+msgctxt "route type"
msgid "ski"
msgstr "лижний"
+msgctxt "route type"
msgid "foot"
msgstr "піший"
+msgctxt "route type"
msgid "hiking"
-msgstr "пішохідна екскурсія"
+msgstr "туристичний"
+msgctxt "route type"
+msgid "tram"
+msgstr "трамвайний"
+
+msgctxt "route type"
msgid "detour"
msgstr "об’їзд"
+msgctxt "route type"
+msgid "railway"
+msgstr "залізничний"
+
+msgctxt "route type"
+msgid "subway"
+msgstr "метро"
+
msgid "Symbol description"
msgstr "Опис символів"
@@ -20171,26 +21593,29 @@ msgstr "точка зупинки в одному напрямку"
msgid "backward halt point"
msgstr "точка зупинки зворотнього напрямку"
-msgid "Route network"
+msgid "Route Network"
msgstr "Маршрутна мережа"
-msgid "Edit route network"
-msgstr "Властивості маршрутної мережі"
+msgid "Edit Route Network"
+msgstr "Властивості Маршрутної мережі"
msgid "member"
msgstr "член"
-msgid "Associated street"
-msgstr "Зв’язана вулиця"
+msgid "Associated Street"
+msgstr "Вулиця (Associated Street)"
+
+msgid "Edit Associated Street"
+msgstr "Властивості Вулиці (Associated Street)"
-msgid "Edit associated street"
-msgstr "Властивості зв’язаної вулиці"
+msgid "house"
+msgstr "будинок"
msgid "Street"
-msgstr "Вулиця"
+msgstr "Вулиця (Street)"
msgid "Edit Street"
-msgstr "Властивості вулиці"
+msgstr "Властивості Вулиці (Street)"
msgid "ways being part of street"
msgstr "ліній — частини вулиці"
@@ -20207,8 +21632,8 @@ msgstr "інше"
msgid "Destination sign"
msgstr "Вказівник напрямку"
-msgid "Edit Destination sign"
-msgstr "Властивості вказівника напрямку"
+msgid "Edit Destination Sign"
+msgstr "Властивості Вказівника напрямку"
msgid "Destination written on sign (w/o distance)"
msgstr "Місце призначення (без відстані)"
@@ -20303,18 +21728,27 @@ msgstr "лінії, що проходять під мостом"
msgid "way forming the outline footprint"
msgstr "лінія, що утворює контур"
-msgid "nodes forming the outline"
-msgstr "точки, що утворюють контур"
+msgid "edge ways parallel to ''across''"
+msgstr "лінії контуру паралельні ''across''"
msgid "ways passing through the tunnel"
msgstr "лінії, що проходять по тунелю"
+msgid "edge ways parallel to ''through''"
+msgstr "лінії контуру паралельні ''through''"
+
msgid "bridge"
msgstr "міст"
msgid "deprecated"
msgstr "застарілий"
+msgid "bicycle"
+msgstr "велосипедний"
+
+msgid "foot"
+msgstr "піший"
+
msgid "horse"
msgstr "кінь"
@@ -20324,8 +21758,11 @@ msgstr "бар’єр"
msgid "motorroad"
msgstr "дорога для автомобілів"
-msgid "highway_track"
-msgstr "траса"
+msgid "highway.track"
+msgstr "highway.track"
+
+msgid "livingdashed"
+msgstr "livingdashed"
msgid "services"
msgstr "послуги"
@@ -20333,11 +21770,11 @@ msgstr "послуги"
msgid "ford"
msgstr "брід"
-msgid "highway_platform"
-msgstr "платформа"
+msgid "highway.platform"
+msgstr "highway.platform"
-msgid "emergency_access_point"
-msgstr "пункт першої допомоги"
+msgid "emergency.access.point"
+msgstr "emergency.access.point"
msgid "riverbank"
msgstr "берег ріки"
@@ -20354,6 +21791,9 @@ msgstr "пороги"
msgid "railwaypoint"
msgstr "точка залізниці"
+msgid "raildashed"
+msgstr "raildashed"
+
msgid "railyard"
msgstr "депо"
@@ -20369,29 +21809,29 @@ msgstr "стара колія"
msgid "aeroway"
msgstr "авіатраса"
-msgid "aeroway_dark"
-msgstr "Завантажена авіатраса"
+msgid "aeroway.dark"
+msgstr "aeroway.dark"
-msgid "aeroway_light"
-msgstr "Помірно завантажена авіатраса"
+msgid "aeroway.light"
+msgstr "aeroway.light"
-msgid "piste_easy"
-msgstr "легка лижня"
+msgid "piste.easy"
+msgstr "piste.easy"
-msgid "piste_intermediate"
-msgstr "нормальна лижня"
+msgid "piste.intermediate"
+msgstr "piste.intermediate"
-msgid "piste_advanced"
-msgstr "ускладнена лижня"
+msgid "piste.advanced"
+msgstr "piste.advanced"
-msgid "piste_expert"
-msgstr "складна лижня"
+msgid "piste.expert"
+msgstr "piste.expert"
-msgid "piste_freeride"
-msgstr "дуже складня лижня"
+msgid "piste.freeride"
+msgstr "piste.freeride"
-msgid "piste_novice"
-msgstr "лижня для новачків"
+msgid "piste.novice"
+msgstr "piste.novice"
msgid "power"
msgstr "енергія"
@@ -20411,20 +21851,20 @@ msgstr "гавань"
msgid "amenity"
msgstr "зручності"
-msgid "amenity_traffic"
-msgstr "зручності пересування"
+msgid "amenity.traffic"
+msgstr "amenity.traffic"
-msgid "amenity_light"
-msgstr "зручності прості"
+msgid "amenity.light"
+msgstr "amenity.light"
-msgid "light_water"
-msgstr "легка вода"
+msgid "light.water"
+msgstr "light.water"
msgid "health"
msgstr "медицина"
-msgid "shop"
-msgstr "магазин"
+msgid "office"
+msgstr "офіс"
msgid "hotel"
msgstr "готель"
@@ -20489,9 +21929,6 @@ msgstr "пустир"
msgid "woodarea"
msgstr "дерева"
-msgid "mud"
-msgstr "грязь"
-
msgid "beach"
msgstr "пляж"
@@ -20501,11 +21938,14 @@ msgstr "маршрут"
msgid "boundary"
msgstr "кордон"
+msgid "sport"
+msgstr "спорт"
+
msgid "place"
msgstr "місцевість"
-msgid "tiger_data"
-msgstr "дані TIGER"
+msgid "tiger.data"
+msgstr "tiger.data"
msgid "address"
msgstr "адреса"
@@ -20519,9 +21959,6 @@ msgstr "Село/Місто"
msgid "One Way"
msgstr "Одностороння"
-msgid "Church"
-msgstr "Храм"
-
msgid "Fuel Station"
msgstr "АЗС"
@@ -20549,6 +21986,9 @@ msgstr "теґ bridge на точці"
msgid "wrong highway tag on a node"
msgstr "помилковий теґ highway на точці"
+msgid "wrong crossing tag on a way"
+msgstr "помилковий теґ crossing на лінії"
+
msgid "Unnamed unclassified highway"
msgstr "Дороги без класифікації, що не мають назви"
@@ -20562,7 +22002,7 @@ msgid "misspelled key name"
msgstr "помилки в ключі name"
msgid "cycleway with tag bicycle"
-msgstr "вело-доріжки із теґом bicycle"
+msgstr "велодоріжки із теґом bicycle"
msgid "footway with tag foot"
msgstr "тротуари із теґом foot"
@@ -20594,11 +22034,41 @@ msgstr "неочікувана комбінація теґів (highway та wat
msgid "unusual tag combination (highway & natural)"
msgstr "неочікувана комбінація теґів (highway та natural)"
+msgid "unusual tag combination (landuse & building)"
+msgstr "незвична комбінація теґів (landuse & building)"
+
+msgid "unnecessary access key"
+msgstr "непотрібний теґ access"
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr "непотрібний теґ motor_vehicle=yes"
+
msgid "natural water used for swimming pool"
msgstr "natural=water у плавальних басейнах"
-msgid "incline without highway"
-msgstr "теґ incline без теґу highway"
+msgid "numerical key"
+msgstr "числовий ключ"
+
+msgid "route_master relation without route_master=*"
+msgstr "зв’язок route_master без теґу route_master=*"
+
+msgid "power line without voltage"
+msgstr "не вказано напругу електромережі"
+
+msgid "substation key without power=substation"
+msgstr "теґ substation без power=substation"
+
+msgid "transformer key without power"
+msgstr "теґ transformer без power"
+
+msgid "missing substation=*"
+msgstr "немає substation=*"
+
+msgid "missing transformer=*"
+msgstr "немає transformer=*"
+
+msgid "incline without highway or railway"
+msgstr "теґ incline без теґів highway чи railway"
msgid "junction without highway"
msgstr "теґ junction без теґу highway"
@@ -20609,8 +22079,8 @@ msgstr "теґ lanes без теґу highway"
msgid "lcn without highway"
msgstr "теґ lcn без теґу highway"
-msgid "lit without highway"
-msgstr "теґ lit без теґу highway"
+msgid "lit without highway/railway/piste/parking/platform"
+msgstr "теґ lit без highway/railway/piste/parking/platform"
msgid "living_street without highway"
msgstr "теґ living_street без туґу highway"
@@ -20627,8 +22097,8 @@ msgstr "теґ motorroad без теґу highway"
msgid "ntd_id without highway"
msgstr "теґ ntd_id без теґу highway"
-msgid "oneway without highway"
-msgstr "теґ oneway без теґу highway"
+msgid "oneway without highway or railway"
+msgstr "теґ oneway без теґів highway чи railway"
msgid "sac_scale without highway"
msgstr "теґ sac_scale без теґу highway"
@@ -20744,20 +22214,131 @@ msgstr "теґ canal без теґу waterway"
msgid "have_riverbank without waterway"
msgstr "теґ have_riverbank без теґу waterway"
-msgid "tunnel without highway/railway/waterway"
-msgstr "теґ tunnel без теґу highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr "теґ tunnel без highway/railway/waterway/platform/pipeline"
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr "теґ bridge без highway/railway/waterway/platform/piste/pipeline"
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr "теґ psv без highway/railway/waterway/parking"
+
+msgid "width without physical linear feature"
+msgstr "теґ width на нелінійному об’єкті"
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr "теґ maxspeed без highway/railway/traffic_sign/enforcement"
+
+msgid "fence_type without barrier=fence"
+msgstr "теґ fence_type без barrier=fence"
+
+msgid "border_type without boundary"
+msgstr "теґ border_type без boundary"
+
+msgid "recycling_type without amenity=recycling"
+msgstr "теґ recycling_type без amenity=recycling"
+
+msgid "board_type without information=board"
+msgstr "теґ board_type без information=board"
-msgid "bridge without highway/railway/waterway"
-msgstr "теґ bridge без теґу highway/railway/waterway"
+msgid "shelter_type without amenity=shelter"
+msgstr "теґ shelter_type без amenity=shelter"
-msgid "psv without highway/railway/waterway"
-msgstr "теґ psv без теґу highway/railway/waterway"
+msgid "lamp_type without highway=street_lamp"
+msgstr "теґ lamp_type без highway=street_lamp"
-msgid "width without highway/railway/waterway/aeroway"
-msgstr "теґ width без теґу highway/railway/waterway/aeroway"
+msgid "map_type without information=map"
+msgstr "теґ map_type без information=map"
-msgid "maxspeed without highway/railway/traffic_sign"
-msgstr "теґ maxspeed без теґу highway/railway/traffic_sign"
+msgid "site_type without historic=archaeological_site"
+msgstr "теґ site_type без historic=archaeological_site"
+
+msgid "artwork_type without tourism=artwork"
+msgstr "теґ artwork_type без tourism=artwork"
+
+msgid "castle_type without historic=castle"
+msgstr "теґ castle_type без historic=castle"
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr "теґ reservoir_type без landuse/water=reservoir"
+
+msgid "bunker_type without military=bunker"
+msgstr "теґ bunker_type без military=bunker"
+
+msgid "source:addr without addr:*"
+msgstr "source:addr без addr:*"
+
+msgid "source:date without source"
+msgstr "source:date без source"
+
+msgid "source:name without name"
+msgstr "source:name без name"
+
+msgid "source:maxspeed without maxspeed"
+msgstr "source:maxspeed без maxspeed"
+
+msgid "source:building without building"
+msgstr "source:building без building"
+
+msgid "source:ref without ref"
+msgstr "source:ref без ref"
+
+msgid "source:population without population"
+msgstr "source:population без population"
+
+msgid "source:geometry on a node"
+msgstr "source:geometry на точці"
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr "source:[addr:]postcode без addr:postcode"
+
+msgid "source:postal_code without addr:postcode"
+msgstr "source:postal_code без addr:postcode"
+
+msgid "source:ele without ele"
+msgstr "source:ele без ele"
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr "source:ref:INSEE без ref:INSEE"
+
+msgid "source:lit without lit"
+msgstr "source:lit без lit"
+
+msgid "source:hgv without hgv"
+msgstr "source:hgv без hgv"
+
+msgid "source:outline on a node"
+msgstr "source:outline на точці"
+
+msgid "source:highway without highway"
+msgstr "source:highway без highway"
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr "source:maxaxleload без maxaxleload"
+
+msgid "source:surface without surface"
+msgstr "source:surface без surface"
+
+msgid "source:bridge without bridge"
+msgstr "source:bridge без bridge"
+
+msgid "source:old_name without old_name"
+msgstr "source:old_name без old_name"
+
+msgid "source:bicycle without bicycle"
+msgstr "source:bicycle без bicycle"
+
+msgid "source:designation without designation"
+msgstr "source:designation без designation"
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr "source:[addr:]housenumber без addr:housenumber"
+
+msgid "source:height without height"
+msgstr "source:height без height"
+
+msgid "source:lanes without lanes"
+msgstr "source:lanes без lanes"
msgid "religion without denomination"
msgstr "теґ religion без теґу denomination"
@@ -20777,35 +22358,90 @@ msgstr ""
"не зазначено мову Вікіпедії, використовуйте'' wikipedia''=''мова:заголовок "
"сторінки''"
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr "невідомий префікс мови теґу wikipedia"
-msgid "Landsat"
-msgstr "Тло Landsat"
+msgid "layer should be between -5 and 5"
+msgstr "рівень повинен бути між -5 та 5"
-msgid "OSM Inspector: Redaction Bot"
-msgstr "OSM Inspector: Redaction Bot"
+msgid "level should be numbers with optional .5 increments"
+msgstr "значенням level повинно бути число із можливим кроком .5"
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"height: типово в метрах; крапка - десятковий розділювач; одинці виміру "
+"вказуються через пробіл"
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"maxheight: типово в метрах; крапка - десятковий розділювач; одинці виміру "
+"вказуються через пробіл"
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+"width: типово в метрах; крапка - десятковий розділювач; одинці виміру "
+"вказуються через пробіл"
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+"maxwidth: типово в метрах; крапка - десятковий розділювач; одинці виміру "
+"вказуються через пробіл"
+
+msgid "unusual maxspeed format"
+msgstr "незвичайний формат в maxspeed"
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+"напруга повинна зазначатись у вольтах без пробілів/роздільників/одиниць "
+"виміру"
+
+msgid "unusual frequency specification"
+msgstr "незвичайний формат частоти"
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr "незвичайна ширина колії; використовується mm без розділових знаків"
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr "незвичайний нахилу; використовуються відсотки/градусів або up/down"
+
+msgid "Landsat"
+msgstr "Landsat"
msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgstr "Yahoo - супутникові знімки"
msgid "Bing Sat"
-msgstr "Знімки Bing"
+msgstr "Bing - супутникові знімки"
+
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr "HDDM (Humanitarian OpenStreetMap)"
msgid "MapBox Satellite"
-msgstr "Суптникові знімки MapBox"
+msgstr "MapBox Супутникові знімки"
msgid "MapQuest Open Aerial"
msgstr "MapQuest Open Aerial"
+msgid "OpenStreetMap GPS Traces"
+msgstr "OpenStreetMap GPS-треки"
+
msgid "OpenStreetMap (Mapnik)"
msgstr "OpenStreetMap (Mapnik)"
msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik Ч&Б)"
+msgstr "OpenStreetMap (Mapnik Ч/Б)"
-msgid "Skobbler"
-msgstr "Skobbler"
+msgid "skobbler"
+msgstr "skobbler"
+
+msgid "skobbler heatmap"
+msgstr "skobbler heatmap"
msgid "OpenCycleMap"
msgstr "OpenCycleMap"
@@ -20814,232 +22450,287 @@ msgid "MapQuest OSM"
msgstr "MapQuest OSM"
msgid "Public Transport (ÖPNV)"
-msgstr "Громадський транспорт (ÖPNV)"
+msgstr "Громадський траснпорт (ÖPNV)"
msgid "OpenStreetMap (German Style)"
msgstr "OpenStreetMap (Німецький стиль)"
-msgid "Streets NRW Geofabrik.de"
-msgstr "Вулиці NRW Geofabrik.de"
-
-msgid "Hike & Bike"
-msgstr "Тристична мапа"
-
-msgid "OpenStreetMap (Sorbian Language)"
-msgstr "OpenStreetMap (Сербська мова)"
-
-msgid "OpenStreetMap (German Language)"
-msgstr "OpenStreetMap (Німецька мова)"
-
-msgid "OpenPT Map (overlay)"
-msgstr "OpenPT Map (по верху)"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr "Камбоджа, Лаос, Таїланд, В’єтнам дві мови"
-msgid "Bavaria (2 m)"
-msgstr "Баварія (2 м)"
+msgid "osmfr"
+msgstr "osmfr"
-msgid "Hamburg (40 cm)"
-msgstr "Гамбург (40 см)"
-
-msgid "Hamburg (DK5)"
-msgstr "Гамбург (DK5)"
+msgid "AGRI black-and-white 2.5m"
+msgstr "AGRI ч/б 2.5м"
msgid "Geoimage.at MaxRes"
msgstr "Geoimage.at MaxRes"
+msgid "basemap.at"
+msgstr "basemap.at"
+
msgid "Graz: Basiskarte (base map)"
-msgstr "Грац: Basiskarte (базова мапа)"
+msgstr "Graz: Basiskarte (основна мапа)"
msgid "Tiris: DGM (Terrain model)"
-msgstr "Тирис: DGM (модель рельєфу)"
+msgstr "Tiris: DGM (рельєф)"
msgid "Tiris: DOM (Surface model)"
-msgstr "Тирис: DOM (модель поверхні)"
+msgstr "Tiris: DOM (поверхня)"
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr "Відень: Універсальні мапи (загального призначення)"
+msgstr "Vienna: Mehrzweckkarte (загальна мапа)"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr "Відень: Мітки (анотації)"
+msgstr "Vienna: Beschriftungen (примітки)"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr "Відень: Orthofoto (аерофотознімки)"
+msgstr "Vienna: Orthofoto (аерофото)"
-msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr "Кантон Ааргау 25см (AGIS 2011)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr "VoGIS: Echtfarbenbild 2012 - 12см (Повнокольорове зображення)"
-msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr "Місто Устер (ортофотоплан) 2008 10 см"
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr "VoGIS: Flächenwidmungsplan (План зонування)"
-msgid "Stadtplan Zürich"
-msgstr "Мапа Цюриха"
+msgid "VoGIS: DGM (Terrain model)"
+msgstr "VoGIS: DGM (Рельєф)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
-msgstr "Кантон Золотурн 12.5см (SOGIS 2007)"
+msgid "VoGIS: DOM (Surface model)"
+msgstr "VoGIS: DOM (Поверхня)"
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
-msgstr "Кантон Золотурн 12.5см (SOGIS 2011)"
+msgid "Geobase Hydrography"
+msgstr "Geobase Hydrography (Гідрографія)"
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
-msgstr "Кантон Золотурн Інфрачервоний 12.5см (SOGIS 2011)"
+msgid "Geobase Roads"
+msgstr "Geobase Roads (Дороги)"
-msgid "Canton de Génève 5cm (SITG 2011)"
-msgstr "Кантона Женева 5см (SITG 2011)"
+msgid "Canvec"
+msgstr "Canvec"
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
-msgstr "Кантон Невшатель 50см (SITN 2006)"
+msgid "British Columbia Mosaic"
+msgstr "British Columbia Mosaic (Британська Колумбія)"
-msgid "Canton du Jura 50cm (RCJU 1998)"
-msgstr "Кантон Юра 50см (RCJU 1998)"
+msgid "Czech CUZK:KM"
+msgstr "Czech CUZK:KM"
-msgid "Canton de Fribourg 50cm (2005)"
-msgstr "Кантон Фрібург 50см (2005)"
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "Czech UHUL:ORTOFOTO"
-msgid "Stadt Bern 10cm/25cm (2008)"
-msgstr "Місто Берн 10см/25см (2008)"
+msgid "Fugro (Denmark)"
+msgstr "Fugro (Данія)"
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
-msgstr "HEIG-VD/Ортофото Івердон-ле-Бен 25см (2007)"
+msgid "Stevns (Denmark)"
+msgstr "Stevns (Данія)"
-msgid "Geobase Hydrography"
-msgstr "Geobase — Гідрографічна мапа"
+msgid "Vejmidte (Denmark)"
+msgstr "Vejmidte (Данія)"
-msgid "Geobase Roads"
-msgstr "Geobase — Дороги"
+msgid "Estonia Basemap (Maaamet)"
+msgstr "Естонія - Базова мапа (Maaamet)"
-msgid "Canvec"
-msgstr "Canvec"
+msgid "Estonia Ortho (Maaamet)"
+msgstr "Естонія - Ortho (Maaamet)"
-msgid "British Columbia Mosaic"
-msgstr "Британська Колумбія Mosaic"
+msgid "Estonia Multi (Maaamet)"
+msgstr "Естонія - Multi (Maaamet)"
-msgid "MSR Maps Topo"
-msgstr "Топографічні мапи MSR"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgstr "CRAIG - Овернь 2009/2010 - 30 см"
-msgid "MSR Maps Urban"
-msgstr "Міські мапи MSR"
+msgid "CRAIG - Moulins 2009 - 15 cm"
+msgstr "CRAIG - Мулен 2009-15 см"
-msgid "USGS Scanned Topographic Maps"
-msgstr "USGS Скановані топографічні мапи"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgstr "CRAIG - Монлюсон 2009-15 см"
-msgid "USGS Large Scale Imagery"
-msgstr "USGS Зображення великого мачштабу"
+msgid "CRAIG - Vichy 2009 - 15 cm"
+msgstr "CRAIG - Віші 2009-15 см"
-msgid "OSM US TIGER 2012 Roads Overlay"
-msgstr "OSM США TIGER 2012 шар Дороги"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgstr "CRAIG - Ле-Пюї 2010 - 15 см"
-msgid "Czech CUZK:KM"
-msgstr "Чехія CUZK:KM"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr "CRIGE Лазурний берег Приморські Альпи 2009 - 40 см"
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "Чехія UHUL:ORTOFOTO"
+msgid "Géobretagne - Brest 2010 - 10 cm"
+msgstr "Géobretagne - Брест 2010 - 10 см"
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Géobretagne - Morbihan 2010"
+msgstr "Géobretagne - Морбіан 2010"
-msgid "OS New Popular Edition historic"
-msgstr "OS New Popular Edition історична"
+msgid "Géolittoral - Orthophotos 2000"
+msgstr "Géolittoral - Ортофотознімки 2000"
-msgid "OS OpenData StreetView"
-msgstr "OS OpenData StreetView"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr "Géolittoral V2 - Ортофотознімки 2010-2012"
-msgid "OS OpenData Locator"
-msgstr "OS OpenData Locator"
+msgid "Géolittoral - Sentiers"
+msgstr "Géolittoral - Дороги"
-msgid "Surrey Air Survey"
-msgstr "Surrey Air Survey"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr "Атлантична Луара - Ортофотознімки 2012 - 20 см"
-msgid "NLS - OS 6-inch Scotland 1842-82"
-msgstr "NLS - OS 6-дюймів Шотландія 1842-82"
+msgid "Toulouse - Orthophotoplan 2011"
+msgstr "Тулуза - Ортофотоплан 2011"
-msgid "NLS - OS 1:25k 1st Series 1937-61"
-msgstr "NLS - OS 1:25k 1-а Серія 1937-61"
+msgid "Toulouse - Orthophotoplan 2007"
+msgstr "Тулуза - Ортофотоплан 2007"
-msgid "NLS - OS 1-inch 7th Series 1955-61"
-msgstr "NLS - OS 1-дюйм 7-ма Серія 1955-61"
+msgid "Tours - Orthophotos 2008-2010"
+msgstr "Тур - Ортофознімки 2008-2010"
+
+msgid "Tours - Orthophotos 2008"
+msgstr "Тур - Ортофознімки 2008"
+
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr "Веркор - Заповідник нагір’я Веркор - Ортофознімки 1999 - 1м"
+
+msgid "Streets NRW Geofabrik.de"
+msgstr "Вулиці Північний Рейн-Вестфалія Geofabrik.de"
+
+msgid "Hike & Bike"
+msgstr "Hike & Bike (туристична)"
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr "OpenStreetMap (Сербською)"
+
+msgid "OpenStreetMap (German Language)"
+msgstr "OpenStreetMap (Німецькою)"
+
+msgid "OpenPT Map (overlay)"
+msgstr "OpenPT Map (шар)"
+
+msgid "Hamburg (40 cm)"
+msgstr "Гамбург (40 см)"
+
+msgid "Hamburg (DK5)"
+msgstr "Гамбург (DK5)"
+
+msgid "Bavaria (2 m)"
+msgstr "Баварія (2 м)"
+
+msgid "Stuttgart (Luftbild)"
+msgstr "Штутгарт (Вид з повітря)"
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr "Ерланген 2013 Аерознімок (6.25 см)"
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr "Ерланген 2011 Аерознімок (5.0 см)"
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr "Стара мапа Цвенкау - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr "Стара мапа Пегау - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr "Фізичні мапи DE - Фізична мапа (природних територій)"
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr "Фізичні мапи DE:Гарц - Фізична мапа (природних територій)"
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+"Фізичні мапи DE:Гарц - шар для Bing (наприклад, непрозорість від 20 до 50 "
+"відсотків використання)"
+
+msgid "Imagerie Drone (Haiti)"
+msgstr "Imagerie Drone (Гаїті)"
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
-msgstr "Ірландія, Міністерство оборони Британії в 1 дюйм 1941-43 GSGS 4136"
+msgstr ""
+"Ірландія, Британське військове міністерство, 1 дюйм, 1941-43 GSGS 4136"
msgid "Ireland Bartholomew Quarter-Inch 1940"
-msgstr "Ірландія, Варфоломія чверть дюйма 1940"
+msgstr "Ірландія, Bartholomew, чверть дюйма 1940"
msgid "Ireland EEA GMES Urban Atlas"
-msgstr "Ірландія EEA GMES Urban Atlas"
+msgstr "Ірландія, EEA GMES Міський атлас"
msgid "Ireland EEA CORINE 2006"
-msgstr "Ірландія EEA CORINE 2006"
+msgstr "Ірландія, EEA CORINE 2006"
msgid "Lodi - Italy"
-msgstr "Італия – Лоді"
+msgstr "Лоді - Італія"
msgid "Lombardia - Italy (CTR)"
-msgstr "Ломбардія — Італія (CTR)"
+msgstr "Ломбардія - Італія (CTR)"
msgid "Sicily - Italy"
-msgstr "Італія – Сицилія"
+msgstr "Сицилія - Італія"
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 — Італія"
+msgstr "PCN 2006 - Італія"
msgid "PCN 2008 - IT Lazio+Umbria"
-msgstr "PCN 2008 - ІТ-Лаціо+Умбрія"
+msgstr "PCN 2008 - IT Лаціо + Умбрія"
msgid "USSR - Latvia"
-msgstr "СРСР — Латвія"
+msgstr "СРСР - Латвійська республіка"
msgid "50cm ortho - Latvia"
-msgstr "50 см орто — Латвія"
+msgstr "50cм орто - Латвія"
msgid "20cm ortho - Coastline"
-msgstr "20 см орто — Берегова лінія"
+msgstr "20cm орто - Берегова лінія"
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
-msgstr "CRAIG - Овернь 2009/2010 - 30 см"
+msgid "ORT10LT (Lithuania)"
+msgstr "ORT10LT (Литва)"
-msgid "CRAIG - Moulins 2009 - 15 cm"
-msgstr "CRAIG - Мулен 2009 - 15 см"
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr "Дельта Нігеру Жовт 2012 Landsat"
-msgid "CRAIG - Montluçon 2009 - 15 cm"
-msgstr "CRAIG - Молюсон 2009 - 15 см"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr "Пангасінан/Булакан (Філіппіни HiRes)"
-msgid "CRAIG - Vichy 2009 - 15 cm"
-msgstr "CRAIG - Віші 2009 - 15 см"
+msgid "ScanEx IRS"
+msgstr "ScanEx IRS"
-msgid "CRAIG - Le Puy 2010 - 15 cm"
-msgstr "CRAIG - Ле-Пюї 2010 - 15 см"
+msgid "ScanEx SPOT"
+msgstr "ScanEx SPOT"
-msgid "Géobretagne - Brest 2010 - 10 cm"
-msgstr "Жеобретань - Брест 2010 - 10 см"
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk Авто"
-msgid "Géobretagne - Morbihan 2010"
-msgstr "Жеобретань - Морбіан 2010"
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk Пішки"
-msgid "Géolittoral - Orthophotos 2000"
-msgstr "Жеобретань - ортофотоплани 2000"
+msgid "Freemap.sk Cyclo"
+msgstr "Freemap.sk Вело"
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
-msgstr "Géolittoral V2 - ортофотоплани 2010-2012"
+msgid "Freemap.sk Ski"
+msgstr "Freemap.sk Лижі"
-msgid "Géolittoral - Sentiers"
-msgstr "Géolittoral - Шляхи"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr "Кадастрова карта Словаччини (KaPor, 2010-04)"
-msgid "Toulouse - Orthophotoplan 2011"
-msgstr "Тулуза — Ортофотоплан 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr "Кадастрова карта Словаччини (KaPor, 2011-05)"
-msgid "Toulouse - Orthophotoplan 2007"
-msgstr "Тулуза — Ортофотоплан 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr "Словаччина EEA GMES Міський атлас"
-msgid "Tours - Orthophotos 2008-2010"
-msgstr "Подорожі — ортофотоплани 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
+msgstr "Словаччина EEA CORINE 2006"
-msgid "Tours - Orthophotos 2008"
-msgstr "Тури - ортофотоплани 2008"
+msgid "Slovakia Historic Maps"
+msgstr "Словаччина, історичні мапи"
+
+msgid "South Africa CD:NGI Aerial"
+msgstr "ПАР CD:NGI Aerial аерофото"
msgid "Catastro Spain"
-msgstr "Катастрофи (Іспанія)"
+msgstr "Кадастр Іспанії"
msgid "PNOA Spain"
-msgstr "PNOA Spain (Іспанія)"
+msgstr "PNOA Іспанія"
msgid "SIGPAC Spain"
msgstr "SIGPAC Іспанія"
@@ -21053,89 +22744,149 @@ msgstr "ITACyL - Кастилія і Леон"
msgid "IDEIB - Balearic Islands"
msgstr "IDEIB - Балеарські острови"
-msgid "Estonia Basemap (Maaamet)"
-msgstr "Основна мапа Естонії (Maaamet)"
-
-msgid "Estonia Ortho (Maaamet)"
-msgstr "Орто мапа Естонії (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr "Кантон Ааргау, 25 см (AGIS 2011)"
-msgid "Estonia Multi (Maaamet)"
-msgstr "Мулти мапа Естонії (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr "Місто Устер, Ортофото 2008 10 см"
-msgid "ORT10LT (Lithuania)"
-msgstr "ORT10LT (Литва)"
+msgid "Stadtplan Zürich"
+msgstr "Цюрих"
-msgid "Fugro (Denmark)"
-msgstr "Fugro (Данія)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr "Кантон Золотурн 12,5 см (SOGIS 2007)"
-msgid "Stevns (Denmark)"
-msgstr "Stevns (Данія)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr "Кантон Золотурн 12,5 см (SOGIS 2011)"
-msgid "Vejmidte (Denmark)"
-msgstr "Головні дороги (Данія)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr "Кантон Золотурн Інфрачервоний 12,5 см (SOGIS 2011)"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Пангасінан/Булакан (Філіпіни HiRes)"
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr "Кантон Женева 5 см (SITG 2011)"
-msgid "ScanEx IRS"
-msgstr "ScanEx IRS"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr "Кантон Невшатель 50 см (SITN 2006)"
-msgid "ScanEx SPOT"
-msgstr "ScanEx SPOT"
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr "Кантон Юра 50 см (RCJU 1998)"
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
-msgstr "Камбоджа, Лаос, Таїланд, В’єтнам двомовні"
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr "Кантон Фрібург 50 см (2005)"
-msgid "Niger Delta Oct 2012 Landsat"
-msgstr "Дельта Нігеру жовтень 2012 Landsat"
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr "Місто Берн 10 см/25 см (2008)"
-msgid "South Africa CD:NGI Aerial"
-msgstr "Південна Африка CD: NGI аеро"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr "HEIG-VD / Ортофото Івердон-ле-Бен 25 см (2007)"
-msgid "Freemap.sk Car"
-msgstr "Freemap.sk Авто"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr "Віль де Ньон - Ортофото 2010 HD 5 см/пкс"
-msgid "Freemap.sk Hiking"
-msgstr "Freemap.sk Піший туризм"
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr "Cartoriviera - Ортофото 2012"
-msgid "Freemap.sk Cyclo"
-msgstr "Freemap.sk Велотуризм"
+msgid "SIGIP - Orthophoto 2012"
+msgstr "SIGIP - Ортофото 2012"
-msgid "Freemap.sk Ski"
-msgstr "Freemap.sk Лижний туризм"
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr "Лозанна - Ортофото 2012"
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
-msgstr "Кадастрова Мапа Словаччини (KaPor, 2010-04)"
+msgid "MSR Maps Topo"
+msgstr "MSR Топографічні мапи"
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
-msgstr "Кадастрова Мапа Словаччини (KaPor, 2011-05)"
+msgid "MSR Maps Urban"
+msgstr "MSR Мапи міст"
-msgid "Slovakia EEA GMES Urban Atlas"
-msgstr "Міський атлас Словаччини EEA GMES"
+msgid "USGS Scanned Topographic Maps"
+msgstr "USGS Відскановані топографічні мапи"
-msgid "Slovakia EEA CORINE 2006"
-msgstr "Словаччина EEA CORINE 2006"
+msgid "USGS Large Scale Imagery"
+msgstr "USGS Зображення великого масштабу"
-msgid "Slovakia Historic Maps"
-msgstr "Історична мапа Словаччини"
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr "OSM US TIGER 2012 Шар доріг"
-msgid "AGRI black-and-white 2.5m"
-msgstr "AGRI чорно-біле 2,5 м"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr "Нові та зміщені дороги TIGER (TIGER 2013)"
msgid "OSM - Tiger Edited Map"
-msgstr "OSM - Мапи від Tiger"
+msgstr "OSM - мапа під редакцією Tiger"
+
+msgid "MassGIS L3 Parcels"
+msgstr "MassGIS L3 Земельні ділянки"
+
+msgid "NC 2010 Orthoimagery"
+msgstr "NC 2010 Ортозображення"
+
+msgid "Ukraine - Orthophotomaps 2012"
+msgstr "Україна - Ортофотомапа 2012"
+
+msgid "7th Series (OS7)"
+msgstr "7th Series (OS7)"
+
+msgid "OS New Popular Edition historic"
+msgstr "OS New Popular Edition, історичні"
+
+msgid "OS OpenData StreetView"
+msgstr "OS OpenData StreetView"
+
+msgid "OS OpenData Locator"
+msgstr "OS OpenData Locator"
+
+msgid "Surrey Air Survey"
+msgstr "Суррей Арефотозімки"
+
+msgid "NLS - OS 6-inch Scotland 1842-82"
+msgstr "NLS - OS, Шотландія, 6-дюймів 1842-82"
+
+msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgstr "NLS - OS 1:25k 1st Series 1937-61"
+
+msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgstr "NLS - OS 1-дюйм 7th Series 1955-61"
msgid "OS 1:25k historic (OSM)"
msgstr "OS 1:25k історичні (OSM)"
msgid "OS Scottish Popular historic"
-msgstr "OS Шотландські популярні історичні мапи"
+msgstr "OS Scottish Popular історичні"
-msgid "Stuttgart (Luftbild)"
-msgstr "Штутгарт (Аерофотозйомка)"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
+msgstr "NLS - Bartholomew півдюйма, 1897-1907"
+
+msgid "OS Town Plans, Cupar 1854 (NLS)"
+msgstr "OS Town Plans, Cupar 1854 (NLS)"
+
+msgid "OSM Export"
+msgstr "Експорт OSM"
+
+msgid "Export traffic data to SUMO network file."
+msgstr "Експорт даних трафіку в мережевий файл SUMO."
+
+msgid "SUMO Export"
+msgstr "SUMO Експорт"
+
+msgid "Export"
+msgstr "Експорт"
-msgid "2u"
-msgstr "2u"
+msgid "Port:"
+msgstr "Порт:"
+
+msgid "refresh the port list"
+msgstr "оновити список портів"
+
+msgid "Configure"
+msgstr "Налаштувати"
+
+msgid "Connection Error."
+msgstr "Помилка підключення."
+
+msgid "configure the connected DG100"
+msgstr "налаштування підключеного DG100"
+
+msgid "delete data after import"
+msgstr "вилучити дані після імпорту"
msgid "Columbus V-900 CSV Files"
msgstr "Файли Columbus V-900 CSV"
@@ -21289,7 +23040,7 @@ msgid "Upload Traces"
msgstr "Надсилання треків на сервер"
msgid "Defines the visibility of your trace for other OSM users."
-msgstr "Визначає видимість вашого треку для інших користувачів OSM."
+msgstr "Визначає видимість вашого треку для інших учасників OSM."
msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -21348,6 +23099,18 @@ msgstr "Показує профілі висоти"
msgid "Elevation Profile"
msgstr "Профілі висоти"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr "Шар з сіткою висот (експериментальний!)"
+
+msgid "Shows elevation grid layer"
+msgstr "Показує шар з сіткою висот"
+
+msgid "Elevation Grid"
+msgstr "Сітка висот"
+
+msgid "No SRTM data"
+msgstr "Без даних SRTM"
+
msgid "Open the elevation profile window."
msgstr "Відкрити вікно профілів висоти"
@@ -21369,14 +23132,8 @@ msgstr "Збільшення"
msgid "Time"
msgstr "Час"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "Автоматично"
-
-msgid "Fixed value"
-msgstr "Встановлене значення"
+msgid "Tracks"
+msgstr "Треки"
msgid "Elevation profile for track ''{0}''."
msgstr "Профіль висот для треку ''{0}''."
@@ -21652,9 +23409,15 @@ msgstr "Виділити неповні адреси"
msgid "Selects all addresses with incomplete data."
msgstr "Виділити всі адреси з неповними даними."
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr "Використовувати теґ 'addr:street' або 'addr:place'"
+
msgid "House Number Editor"
msgstr "Редактор номерів будинків"
+msgid "House number increment:"
+msgstr "Прирощення номерів будинків"
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "Оновлення властивостей {0} об’єкта"
@@ -21681,6 +23444,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "Властивості Шару"
+msgid "Error while creating image layer: {0}"
+msgstr "Під час створення шару з фоновим зображенням виникла помилка: {0}"
+
msgid "Import image"
msgstr "Імпортувати зображення"
@@ -21759,9 +23525,21 @@ msgstr "Відкрити вікно вибору OSM Inspector."
msgid "Current Selected Bug Info"
msgstr "Поточна відібрана інформація про помилки"
+msgid "Prev OSMI bug"
+msgstr "Попередня помилка (OSMI)"
+
+msgid "Next OSMI bug"
+msgstr "Наступна помилка (OSMI)"
+
msgid "Osm Inspector Bugs"
msgstr "Помилки з Osm Inspector"
+msgid "OSM Inspector Bugs"
+msgstr "Інспектор помилок (OSMI)"
+
+msgid "Selected Bug Info"
+msgstr "Інформація про помилку"
+
msgid "Handy Address Interpolation Functions"
msgstr "Функція ручної вставки адрес"
@@ -21847,8 +23625,8 @@ msgstr "Очікуються непарні номери будівель"
msgid "Expected even numbers for addresses"
msgstr "Очікуються непарні номери будівель"
-msgid "Expected valid number for address increment"
-msgstr "Очікується вірне значення для збільшення номерів будівель"
+msgid "Expected valid number for increment"
+msgstr "Очікується вірний номер для прирощення"
msgid "Country code must be 2 letters"
msgstr "Код країни повинен складатись з 2 символів"
@@ -22223,15 +24001,6 @@ msgstr "Номер дома:"
msgid "Street Name:"
msgstr "Вулиця:"
-msgid "Increment"
-msgstr "Збільшення"
-
-msgid "Decrement"
-msgstr "Зменшення"
-
-msgid "Numbers:"
-msgstr "Номери:"
-
msgid "Big buildings mode"
msgstr "Режим великих будівель"
@@ -22423,6 +24192,9 @@ msgstr "Відключити обрізку зображень під час г
msgid "Use \"Tableau d''assemblage\""
msgstr "Використовувати «Диаграму збірки»"
+msgid "Replace grey shades by white color only"
+msgstr "Замініть сірі відтінки білим кольором"
+
msgid "Select first WMS layer in list."
msgstr "Виберіть перший шар WMS зі списку"
@@ -22442,12 +24214,6 @@ msgstr "50 м"
msgid "100 m"
msgstr "100 м"
-msgid "high"
-msgstr "високий"
-
-msgid "medium"
-msgstr "середній"
-
msgid "symbol"
msgstr "символ"
@@ -22599,6 +24365,10 @@ msgid ""
msgstr ""
"Додайте \"Таблицю(і) збірки\" у перелік кадастрових листів для захвату."
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+"Замініть сірі відтінки білим кольором (менші файли та використання пам’яті)"
+
msgid "Display crosspieces:"
msgstr "Показати перемички:"
@@ -22620,6 +24390,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "Увімкніть для можливості використання \"add:street\" на точках."
+msgid "Unexpected file extension. {0}"
+msgstr "Несподіване розширення файлу. {0}"
+
msgid "Add \"source=...\" to elements?"
msgstr "Додати до елементів \"source=…\"?"
@@ -22708,54 +24481,6 @@ msgstr ""
"Це зображення містить дані з координатами.\n"
"Ви бажаєте їх використовувати?"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"Позначте перший кут для обрізки зображення\n"
-"(Потрібно позначити дві точки)"
-
-msgid "Image cropping"
-msgstr "Кадрування"
-
-msgid "Click second corner for image cropping"
-msgstr "Позначте другий кут для обрізки зображення"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-"Клацніть на першу Lambert-перемичку для геоприв’язки\n"
-"(Потрібно позначити дві точки)"
-
-msgid "Image georeferencing"
-msgstr "Геоприв’язування зображень"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr "Клацніть на другу Lambert-перемичку для геоприв’язки"
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"Ви хочете повністю скасувати\n"
-"чи лише повторити спробу "
-
-msgid "Enter cadastre east,north position"
-msgstr "Введіть положення сходу та півночі кадастру"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(Попередження: перевірте північ за допомогою стрілки!!)"
-
-msgid "East"
-msgstr "Схід"
-
-msgid "I use the mouse"
-msgstr "Я користуюсь мишею"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "Встановити {0} Lambert-координати"
-
msgid "Load layer from cache"
msgstr "Завантажити шар з кешу"
@@ -22808,23 +24533,87 @@ msgstr "<html>Номер відділку (опціонально)</html>"
msgid "Add new layer"
msgstr "Додати новий шар"
-msgid "Open Cadastre Preferences"
-msgstr "Налаштування відкритого кадастру"
+msgid "Open Cadastre Preferences"
+msgstr "Налаштування відкритого кадастру"
+
+msgid "Refine georeferencing"
+msgstr "Уточнити прив’язку"
+
+msgid "Improve georeferencing (only raster images)"
+msgstr "Покращити прив’язку (тільки растрових зображень)"
+
+msgid "Reset cookie"
+msgstr "Скинути файли кукі"
+
+msgid "Get a new cookie (session timeout)"
+msgstr "Отримати нові файли кукі (сесія закінчилась)"
+
+msgid "Save image as..."
+msgstr "Зберегти зображення як…"
+
+msgid "PNG files (*.png)"
+msgstr "PNG файли (*.png)"
+
+msgid "GeoTiff files (*.tif)"
+msgstr "GeoTiff файл (*.tif)"
+
+msgid "Export image (only raster images)"
+msgstr "Експорт зображення (тільки растрові зображення)"
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Позначте перший кут для обрізки зображення\n"
+"(Потрібно позначити дві точки)"
+
+msgid "Image cropping"
+msgstr "Кадрування"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Клацніть на першу Lambert-перемичку для геоприв’язки\n"
+"(Потрібно позначити дві точки)"
+
+msgid "Image georeferencing"
+msgstr "Геоприв’язування зображень"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Ви хочете повністю скасувати\n"
+"чи лише повторити спробу "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+"Ой. Мені не вдалося визначити всі координати \n"
+"правильно. Повторіть, будь ласка."
+
+msgid "Enter cadastre east,north position"
+msgstr "Введіть положення сходу та півночі кадастру"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Попередження: перевірте північ за допомогою стрілки!!)"
-msgid "Reset cookie"
-msgstr "Скинути файли кукі"
+msgid "East"
+msgstr "Схід"
-msgid "Get a new cookie (session timeout)"
-msgstr "Отримати нові файли кукі (сесія закінчилась)"
+msgid "I use the mouse"
+msgstr "Я користуюсь мишею"
-msgid "Save image as PNG"
-msgstr "Зберегти зображення як PNG"
+msgid "Set {0} Lambert coordinates"
+msgstr "Встановити {0} Lambert-координати"
-msgid "PNG files (*.png)"
-msgstr "PNG файли (*.png)"
+msgid "Click second corner for image cropping"
+msgstr "Позначте другий кут для обрізки зображення"
-msgid "Export as PNG format (only raster images)"
-msgstr "Експорт у PNG формат (тільки растрові зображення)"
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Клацніть на другу Lambert-перемичку для геоприв’язки"
msgid "Adjust WMS"
msgstr "Підлаштувати WMS"
@@ -22852,8 +24641,11 @@ msgstr "Шар WMS ({0}), {1} квадрат(и,ів) завантажено"
msgid "Is not vectorized."
msgstr "Не векторизований."
-msgid "Raster size: {0}"
-msgstr "Розмір растру: {0}"
+msgid "Bounding box: {0}"
+msgstr "Габаритна рамка: {0}"
+
+msgid "Image size (px): {0}/{1}"
+msgstr "Розмір зображення (px): {0}/{1}"
msgid "Is vectorized."
msgstr "Векторизований."
@@ -22904,7 +24696,7 @@ msgstr "Вилучити обрану схему зі списку."
msgid "Color Schemes"
msgstr "Колірні схеми"
-msgid "Adress"
+msgid "Address"
msgstr "Адреса"
msgid "Split area"
@@ -22940,7 +24732,7 @@ msgid "TCX Files (*.tcx)"
msgstr "TCX файли (*.tcx)"
msgid "Download along..."
-msgstr "Завантаження вздовж…"
+msgstr "Завантажити вздовж…"
msgid "Download OSM data along the selected ways."
msgstr "Завантаження даних OSM вздовж виділеної лінії."
@@ -22951,6 +24743,9 @@ msgstr "Завантажити вздовж"
msgid "Please select 1 or more ways to download along"
msgstr "Будь ласка, виділіть 1 чи більше ліній для завантаження вздовж них"
+msgid "Download from OSM along selected ways"
+msgstr "Завантаження з OSM вздовж виділеної лінії"
+
msgid "{0} intermediate nodes to download."
msgstr "{0} - кількість проміжних точок для завантаження."
@@ -23026,6 +24821,72 @@ msgstr "Новий інструмент…"
msgid "Install"
msgstr "Встановити"
+msgid "Public"
+msgstr "Загальнодоступне"
+
+msgid "Could not get server response, check logs"
+msgstr "Не вдалося отримати відповідь сервера, перевірте журнали"
+
+msgid "Failed to login as {0}:"
+msgstr "Не вдалося увійти в систему як {0}:"
+
+msgid "The server did not return user ID"
+msgstr "Сервер не повернув код користувача"
+
+msgid "Failed to send message:"
+msgstr "Не вдалося відправити повідомлення:"
+
+msgid "Failed to get messages as {0}:"
+msgstr "Збій отримання повідомлення {0}:"
+
+msgid "GeoChat"
+msgstr "ГеоЧат"
+
+msgid "Open GeoChat panel"
+msgstr "Відкрити панель ГеоЧату"
+
+msgid "Zoom in to see messages"
+msgstr "Наблизитись, щоб побачити повідомлення"
+
+msgid "Login"
+msgstr "Увійти"
+
+msgid "Enable autologin"
+msgstr "Входити автоматично"
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] "{0} особа"
+msgstr[1] "{0} особи"
+msgstr[2] "{0} осіб"
+
+msgid "not logged in"
+msgstr "не ввійшли в систему"
+
+msgid "User {0} has left"
+msgstr "Учасник {0} вийшов"
+
+msgid "User {0} is mapping nearby"
+msgstr "Учасник {0} мапить поруч з вами"
+
+msgid "Users mapping nearby:"
+msgstr "Учасникі поруч:"
+
+msgid "Private chat"
+msgstr "Приватний чат"
+
+msgid "Close tab"
+msgstr "Закрити вкладку"
+
+msgid "Logout"
+msgstr "Вихід"
+
+msgid "Clear log"
+msgstr "Очистити журнал"
+
+msgid "Show users on map"
+msgstr "Показати учасників на мапі"
+
msgid "Position only"
msgstr "Тільки положення"
@@ -23065,27 +24926,9 @@ msgstr "Відключити реєстрацію даних, якщо відс
msgid "Unknown logFormat"
msgstr "Невідомий формат реєстрації даних"
-msgid "Port:"
-msgstr "Порт:"
-
-msgid "refresh the port list"
-msgstr "оновити список портів"
-
-msgid "Configure"
-msgstr "Налаштувати"
-
msgid "Configure Device"
msgstr "Налаштування пристрою"
-msgid "Connection Error."
-msgstr "Помилка підключення."
-
-msgid "configure the connected DG100"
-msgstr "налаштування підключеного DG100"
-
-msgid "delete data after import"
-msgstr "вилучити дані після імпорту"
-
msgid "Importing data from device."
msgstr "Імпортувати дані з пристрою"
@@ -23507,6 +25350,9 @@ msgstr "Створити межі зображення в форматі XML д
msgid "edit bounds for selected defaults"
msgstr "правити межі для типового виілення"
+msgid "Download imagery XML bounds"
+msgstr "Завантажити XML-межі фону"
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -23693,8 +25539,8 @@ msgid ""
"Please make sure it is as precise as possible, and describe a region this "
"offset is applicable to."
msgstr ""
-"Ви зберігаєте зсув фону. Інші користувачі будуть використовувати його під "
-"час креслення мапи\n"
+"Ви зберігаєте зсув фону. Інші учасники будуть використовувати його під час "
+"креслення мапи\n"
"цієї місцевості. Переконайтесь, що він є максимально точним, та опишіть "
"місцевість для якої він підходить."
@@ -23716,22 +25562,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr "Цей рядок повинен бути від 3 до 200 знаків в довжину."
msgid "Adjust imagery"
-msgstr "Підлаштувати зображення"
+msgstr "Підлаштувати фон"
msgid "Adjust the position of the selected imagery layer"
-msgstr "Підлаштувати положення обраного шару зображення"
+msgstr "Налаштування положення вибраного фонового шару"
msgid "Please select the imagery layer to adjust."
-msgstr "Будь ласка, виберіть шар із зображенням для підлаштування."
+msgstr "Будь ласка, оберіть шар для налаштування."
msgid "Start adjusting"
-msgstr "Початок коригування"
+msgstr "Почати налаштування"
msgid "There are currently no imagery layer to adjust."
-msgstr "Зараз шар із зображенням для підлаштування відсутній.Фо"
+msgstr "Відсутній шар з фоновим зображенням для налаштування."
msgid "No layers to adjust"
-msgstr "Відсутні шари для коригування"
+msgstr "Відсутні шари для налаштування"
msgid "Normal"
msgstr "Звичайний"
@@ -23775,12 +25621,6 @@ msgstr "Імпортовані зображення"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "Файли зображень (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "Відкрити зображення в ImageWayPoint"
-
-msgid "Load set of images as a new layer."
-msgstr "Завантажити набір зображень як новий шар."
-
msgid "Import vector graphics"
msgstr "Імпорт векторної графіки"
@@ -23790,18 +25630,15 @@ msgstr "Масштаб:"
msgid "unit(s) = "
msgstr "одиниці = "
-msgid "Import..."
-msgstr "Імпорт…"
-
-msgid "Import vector graphics."
-msgstr "Імпорт векторної графіки."
-
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG малюнки (*.svg)"
-
msgid "Importing..."
msgstr "Імпортується…"
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr "Файли SVG [втулок ImportVec] (*.svg)"
+
+msgid "Please open or create data layer before importing"
+msgstr "Будь ласка, створіть чи відкрийте шар з даними перед імпортом"
+
msgid "InfoMode"
msgstr "ІнфоРежим"
@@ -24188,9 +26025,6 @@ msgstr "Авто-центрування"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "Безпереривно центрувати шар LiveGPS на поточному положенні."
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "Показати MapDust"
@@ -24204,7 +26038,7 @@ msgid "Missing input data"
msgstr "Вхідні дані відсутні"
msgid "Measured values"
-msgstr "Виміряні значення"
+msgstr "Результати вимірювання"
msgid "Open the measurement window."
msgstr "Відкрити вікно вимірювань."
@@ -24246,9 +26080,34 @@ msgstr "Злиття перекриття ліній."
msgid "Merge Overlap (combine)"
msgstr "Злиття перекриття (комбіноване)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Роль, заснована на участі у зв’язках, була скопійована у всі нові "
+"лінії.<br>Результат необхідно перевірити і виправити, якщо буде "
+"потрібно.</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Член зв’язку був скопійований у всі нові лінії. <br> Результат "
+"потрібно перевірити та виправити за потреби.</html>"
+
msgid "Split way"
msgstr "Розділити лінію"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Введіть ключ теґу, наприклад: <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Введіть значення теґу, наприклад: <strong><tt>перевірте "
+"членів</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "Мічиганський поворот ліворуч"
@@ -24279,7 +26138,7 @@ msgstr ""
"або ''[[network=VRR][ref=603|613]''"
msgid "Download from OSM mirror..."
-msgstr "Завантаженн з дзеркала OSM…"
+msgstr "Завантаження з дзеркала OSM…"
msgid "This XAPI query seems to be invalid, please doublecheck"
msgstr "Цей запит XAPI здається недійсним, будь ласка, перевірте"
@@ -24293,6 +26152,15 @@ msgstr "Тип об’єкта OSM для завантаження (''*'' — б
msgid "XAPI query: "
msgstr "Запит XAPI: "
+msgid "Download from Overpass API ..."
+msgstr "Завантажити з Overpass API…"
+
+msgid "Download map data from Overpass API server."
+msgstr "Завантажити картографічні дані з сервера Overpass API."
+
+msgid "Overpass query: "
+msgstr "Overpass запит: "
+
msgid "Select OSM mirror URL"
msgstr "Виберіть URL дзеркала OSM"
@@ -24305,15 +26173,6 @@ msgstr "Базовий URL"
msgid "Enforce meta data"
msgstr "Задати мета дані"
-msgid "Convert to multipolygon"
-msgstr "Перетворити на мультіполігон"
-
-msgid "Convert to multipolygon."
-msgstr "Перетворити на мультіполігон."
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "Одна з виділених ліній вже є частиною іншого мультіполігону."
-
msgid "About Plugin"
msgstr "Про втулок"
@@ -24458,9 +26317,6 @@ msgstr "Поділ на околиці"
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr "Розділити дані по околицях (admin_level=11)."
-msgid "Open Data"
-msgstr "Open Data"
-
msgid "CSV files"
msgstr "Файли CSV"
@@ -24485,12 +26341,21 @@ msgstr "Файли GML"
msgid "Zip Files"
msgstr "Файли Zip"
+msgid "7Zip Files"
+msgstr "Файли 7Zip"
+
msgid "OpenData XML files"
msgstr "Файли OpenData XML"
+msgid "Download open data"
+msgstr "Завантажити open data"
+
msgid "License URL not available: {0}"
msgstr "URL ліцензії недоступний: {0}"
+msgid "OpenData preferences"
+msgstr "Налаштування OpenData"
+
msgid "License Agreement"
msgstr "Ліцензійна угода"
@@ -24655,6 +26520,9 @@ msgstr "Звантаження даних…"
msgid "File to load"
msgstr "Файл для звантаження"
+msgid "Reading 7Zip file..."
+msgstr "Читання файлу 7Zip…"
+
msgid "Reading Zip file..."
msgstr "Читання файлу Zip…"
@@ -24675,6 +26543,19 @@ msgstr ""
msgid "Try lenient method"
msgstr "Спробувати м’який метод"
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+"неможливо визначити систему координат.\n"
+"Чи бажаєте використовувати типово ESPG:4326 (WGS 84) ?"
+
+msgid "Warning: CRS not found"
+msgstr "Попередження: CRS не знайдено"
+
+msgid "Unable to detect CRS !"
+msgstr "Неможливо виявити CRS!"
+
msgid "Unable to find a data store for file {0}"
msgstr "Неможливо знайти сховище даних для файлу {0}"
@@ -24882,7 +26763,7 @@ msgid "Processing module site cache icon files..."
msgstr "Обробка файлу кешу значків сайту модуля…"
msgid "Processing module files..."
-msgstr "Обробка файлів модуля…"
+msgstr "Обробка файлів модулів…"
msgid "Download module list..."
msgstr "Завантаження списку модулів…"
@@ -24944,14 +26825,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr "Сталася помилка: {0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "Не вдалося створити повідомлення про нову помилку. Результат: {0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-"Заголовок містить кілька значень і не може бути представлений одним рядком"
-
msgid "Process queue"
msgstr "Обробити чергу"
@@ -25008,18 +26881,6 @@ msgstr ""
msgid "Close: "
msgstr "Закрити: "
-msgid "New issue"
-msgstr "Нова проблема"
-
-msgid "Create issue"
-msgstr "Вказати нову проблему"
-
-msgid "Describe the problem precisely"
-msgstr "Опишіть проблему як можна докладніше"
-
-msgid "Create: "
-msgstr "Створити: "
-
msgid "Open in browser"
msgstr "Відкрити в оглядачі"
@@ -25080,6 +26941,9 @@ msgstr "виконуваний файл Firefox"
msgid "OSM Server Files pbf compressed"
msgstr "Файли сервера OSM стиснені pbf"
+msgid "Download PBF"
+msgstr "Завантажити PBF"
+
msgid "Invalid changeset id: {0}"
msgstr "Неприпустимий id набору змін: {0}"
@@ -25289,9 +27153,6 @@ msgstr "Імпорт PDF файлів."
msgid "Import PDF"
msgstr "Імпорт PDF"
-msgid "Import PDf file"
-msgstr "Імпорт PDF файлів"
-
msgid " {0} objects so far"
msgstr " {0} об’єкт(ів) лишилось"
@@ -25372,8 +27233,26 @@ msgstr "Тест не пройдено: Неможливо прочитати mt
msgid "Test failed: Could not write mtime."
msgstr "Тест не пройдено: Не можу записати mtime."
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr "Підігнати знімки"
+
+msgid "Move and position photos"
+msgstr "Пересування та позиціювання знімків"
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr "Click+потягніть знімок або shift+click для позиціювання знімку."
+
+msgid "Please load some photos."
+msgstr "Завантажте кілька знімків."
+
+msgid "Toggle the image thumbnail preview"
+msgstr "Увімкнути показ мініатюр"
+
+msgid "New layer for untagged images"
+msgstr "Новий шар для непозначених знімків"
+
+msgid "Untagged Images"
+msgstr "Непозначені знімки"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Бажаєте зберегти поточне калібрування для шару {0}?"
@@ -25530,6 +27409,9 @@ msgstr "У буфері обміну нічого немає"
msgid "The clipboard data is not an image"
msgstr "Дані буфера обміну не є зображенням"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Попередження: не вдалося обробити zip-файл ''{0}''. Помилка: {1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
"Калібрувальний файл, пов’язаний з файлом зображення був знайдений у: {0}\n"
@@ -25555,6 +27437,9 @@ msgid ""
msgstr ""
"Отже, відтепер, калібрувальні файли будуть завантажуватись автоматично."
+msgid "Download Osmosis poly"
+msgstr "Завантажити Osmosis poly"
+
msgid "Reading polygon filter file..."
msgstr "Читання файлу фільтра полігону…"
@@ -25850,9 +27735,6 @@ msgstr "Файл GPX не містить ні треку, а ні маршрут
msgid "Create Stops from GPX"
msgstr "Створити зупинки з GPX"
-msgid "Tracks"
-msgstr "Треки"
-
msgid "Tracks in this GPX file:"
msgstr "Треки у файлі GPX:"
@@ -25923,9 +27805,6 @@ msgstr "Зазначити роль"
msgid "Change relation member roles to {0}"
msgstr "Змінити роль члена зв’язку на {0}"
-msgid "Change multipolygon creation settings"
-msgstr "Змінити налаштування для створення мультиполігонів"
-
msgid "Create administrative boundary relations"
msgstr "Створити зв’язок з адміністративними кордонами"
@@ -26053,9 +27932,6 @@ msgstr "Знайдено точку без ролі ''label'' або ''admin_cen
msgid "Way without ''inner'' or ''outer'' role found"
msgstr "Знайдено лінію без ролі ''inner'' або ''outer''"
-msgid "Restart JOSM"
-msgstr "Перезапустити JOSM"
-
msgid "Revert changeset fully"
msgstr "Повністю відмінити набір змін"
@@ -26077,6 +27953,9 @@ msgstr "Введіть Id набору змін, який потрібно ві
msgid "Reverted changeset"
msgstr "Відмінений набір змін"
+msgid "It is not allowed to revert changeset from {0}"
+msgstr "Не допускається, скасування набору змін {0}"
+
msgid "Missing merge target for {0} with id {1}"
msgstr "Відсутній об’єкт злиття для {0} з ідентифікатором {1}"
@@ -26090,7 +27969,7 @@ msgid "Preparing history data..."
msgstr "Підготовка даних історії…"
msgid "Remote Control has been asked to revert a changeset."
-msgstr "Втулок віддаленого керування отримав запит на відміну набору правок."
+msgstr "Через Дистанційне керування отримано запит на відміну набору правок."
msgid "Reverting..."
msgstr "Відміна…"
@@ -26112,15 +27991,35 @@ msgstr "Отримання відсутніх елементів"
msgid "Downloading changeset"
msgstr "Завантаження набору змін"
+msgid "See {0}"
+msgstr "Див {0}"
+
msgid "Revert changeset #{0}"
msgstr "Відміна набору змін №{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Попередження: непідтримуваний початковий елемент ''{0}'' в наборі змін в "
+"позиції ({1},{2}). Пропускаємо."
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Попередження: непідтримуваний кінцевий елемент ''{0}'' в наборі змін в "
+"позиції ({1},{2}). Пропускаємо."
+
msgid "Road Sign Plugin"
msgstr "Втулок Дорожні знаки"
msgid "signs"
msgstr "знаки"
+msgid "Change Properties"
+msgstr "Змінити параметри"
+
msgid "Country preset:"
msgstr "Шаблони для країн:"
@@ -26130,6 +28029,9 @@ msgstr "Показати всі знаки"
msgid "Show a selection of the most useful signs"
msgstr "Показати підбірку найкорисніших знаків"
+msgid "Spain"
+msgstr "Іспанія"
+
msgid "Germany"
msgstr "Німеччина"
@@ -26232,9 +28134,6 @@ msgstr "Налаштування втулку маршрутизації"
msgid "Configure routing preferences."
msgstr "Задати налаштування маршрутизації"
-msgid "Highway type"
-msgstr "Тип дороги"
-
msgid "Speed (Km/h)"
msgstr "Швидкість (км/г)"
@@ -26360,6 +28259,9 @@ msgstr "Зберегти поточні дані SDS у файл."
msgid "Save SDS file"
msgstr "Зберегти файл SDS"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Не можу створити резервний файл. Помилка: {0}"
+
msgid "Simplify Area"
msgstr "Спростити полігон"
@@ -26434,20 +28336,20 @@ msgstr "Коефіцієнт відстані"
msgid "Merge Nearby Nodes Threshold"
msgstr "Злиття найближчих граничних точок"
-msgid "Online Help"
-msgstr "Інтерактивна довідка"
+msgid "SeaMap Editor"
+msgstr "Редактор морських мап"
-msgid "Load"
-msgstr "Завантажити"
+msgid "No object selected"
+msgstr "Об’єкти не виділені"
-msgid "invisible"
-msgstr "невидимий"
+msgid "Seamark Inspector"
+msgstr "Перевірка навігаційних знаків"
-msgid "SeaMap Editor"
-msgstr "Редактор морських мап"
+msgid "Select only one object"
+msgstr "Виділіть тільки один об'єкт"
-msgid "Export"
-msgstr "Експорт"
+msgid "Select a map object"
+msgstr "Виділіть об’єкт на мапі"
msgid "AutoSave LiveData"
msgstr "Автозбереження редагованих даних"
@@ -26590,6 +28492,9 @@ msgstr "вилучити лінію контуру"
msgid "Street name: "
msgstr "Назва вулиці: "
+msgid "Building: "
+msgstr "Будівля: "
+
msgid "Even/Odd"
msgstr "Парні/Непарні"
@@ -26668,6 +28573,103 @@ msgstr "Трасувальник."
msgid "Tracer building"
msgstr "Трасувальник будівлі"
+msgid "Tracer2"
+msgstr "Tracer2"
+
+msgid "Tracer2."
+msgstr "Tracer2."
+
+msgid "Change tag {0} to {1}"
+msgstr "Змінити теґ {0} на {1}"
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+"Версія Tracer2Server не сумісна із втулком. Будь ласка, завантажте версію "
+"{0} з\n"
+"{1}."
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+"Наявна нова версія Tracer2Server. Для отримання кращих результатів оновіться "
+"до версії {0}."
+
+msgid "No set of parameter is active!"
+msgstr "Не активовано жодного набору параметрів!"
+
+msgid "Select parameter"
+msgstr "Оберіть параметр"
+
+msgid "Tracer2: add a way with {0} points"
+msgstr "Tracer2: додавання лінії з {0} точки(ок)"
+
+msgid "Tracer2: modify way to {0} points"
+msgstr "Tracer2: зміна лінії з {0} точки(ок)"
+
+msgid "Tracer2 error"
+msgstr "Tracer2 помилка"
+
+msgid "Parameter for server request"
+msgstr "Параметри для запиту до сервера"
+
+msgid "Tile size:"
+msgstr "Розмір квадрату:"
+
+msgid "Resolution:"
+msgstr "Роздільність:"
+
+msgid "Mode:"
+msgstr "Режим:"
+
+msgid "Threshold:"
+msgstr "Поріг:"
+
+msgid "Points per circle:"
+msgstr "Точок в колі:"
+
+msgid "Tag:"
+msgstr "Теґ:"
+
+msgid "Preferred values:"
+msgstr "Переважні значення:"
+
+msgid "Delete parameter \"{0}\"?"
+msgstr "Вилучити параметр \"{0}\"?"
+
+msgid "Add new"
+msgstr "Додати новий"
+
+msgid "Add predefined"
+msgstr "Додати зумовлений"
+
+msgid "Select predefined parameter"
+msgstr "Вибрати зумовлений параметр"
+
+msgid "Modify list of parameter for server request."
+msgstr "Змінити перелік параметрів для запиту до сервера"
+
+msgid "Parameter:"
+msgstr "Параметр:"
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+"Tracer2Server не запущений. Будь ласка, запустіть Server.\n"
+"Якщо у вас немає сервера завантажте його з\n"
+"{0}."
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr "Tracer2Server нічого не знайшов."
+
+msgid "Tracer2Server has detected an error."
+msgstr "Tracer2Server виявив помилку."
+
msgid "GPG"
msgstr "GPG"
@@ -26683,9 +28685,6 @@ msgstr "Експорт підписів в XML…"
msgid "Save Signatures file"
msgstr "Зберегти файл підписів"
-msgid "Download OSM"
-msgstr "Заватажити OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -26710,6 +28709,11 @@ msgstr "Заватаження об’єктів з сервера"
msgid "Download signed data"
msgstr "Завантаження підписаних даних"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+"Попередження: Ігнорування винятку, тому що завдання було відмінено. Виняток: "
+"{0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -26875,9 +28879,6 @@ msgstr "Підпис скасовано!"
msgid "Please give a tolerance in meters"
msgstr "Будь ласка, додайте припущення у метрах"
-msgid "Accuracy"
-msgstr "Точність"
-
msgid "Select as much as you like:"
msgstr "Виділіть стільки, скільки вам потрібно:"
@@ -27606,8 +29607,11 @@ msgstr "Відновити об’єкт…"
msgid "Undelete object by id"
msgstr "Відновити об’єкт за ідентифікатором"
-msgid "Select if the data should be added into a new layer"
-msgstr "Виділіть, якщо треба щоб данні додавались до нового шару"
+msgid "Undelete Object"
+msgstr "Відновити об’єкт"
+
+msgid "Undelete object"
+msgstr "Відновити об’єкт"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
@@ -27615,11 +29619,8 @@ msgid ""
msgstr ""
"Введіть тип та ID об’єктів які потрібно відновити, наприклад ''n1 w2''"
-msgid "Undelete Object"
-msgstr "Відновити об’єкт"
-
-msgid "Undelete object"
-msgstr "Відновити об’єкт"
+msgid "Select if the data should be added into a new layer"
+msgstr "Виділіть, якщо треба щоб данні додавались до нового шару"
msgid "Start undeleting"
msgstr "Розпочати відновлення"
@@ -27627,18 +29628,6 @@ msgstr "Розпочати відновлення"
msgid "Close dialog and cancel"
msgstr "Закрити діалог та скасувати"
-msgid "Will get {0}"
-msgstr "Очікується {0}"
-
-msgid "Looking for {0}"
-msgstr "Шукаємо {0}"
-
-msgid "Found {0}"
-msgstr "Знайдено {0}"
-
-msgid "More tools"
-msgstr "Ще інструменти"
-
msgid "Add nodes at intersections"
msgstr "Додати точку на перетині ліній"
@@ -27683,15 +29672,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr "Вставити членство об’єкта з буферу обміну у виділений(і) об’єкт(и)"
-msgid "Paste tags [testing]"
-msgstr "Вставити теґи [тестуваня]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr "Застосування теґів із буферу обміну до всіх виділених об’єктів"
-
-msgid "Paste tags"
-msgstr "Вставити теґи"
-
msgid "Split Object"
msgstr "Розділення Об’єктів"
@@ -27773,7 +29753,7 @@ msgid "Change relation member for {0} {1}"
msgstr "Заміна члену зв’язку {0} {1}"
msgid "Circle arc"
-msgstr "Дуга кола"
+msgstr "Дуга"
msgid "Create a circle arc"
msgstr "Створити дугу кола"
@@ -27829,18 +29809,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "Налаштування URL користувача"
-msgid "Key is too long:"
-msgstr "Ключ занадто довгий"
-
-msgid "Suspiciouns characters in tag:"
-msgstr "Підозрілий символ в тезі:"
-
-msgid "Value too long (max 255 characters):"
-msgstr "Знавчення задовге (макс 255 сиволів):"
-
-msgid "Ingore warnings"
-msgstr "Ігнорувати попередження"
-
msgid "Lat Lon tool"
msgstr "Іструмент Lat Lon"
@@ -28058,9 +30026,6 @@ msgstr "Зняти виділення з точок"
msgid "Removes all nodes from selection"
msgstr "Зняти виділення з усіх точок"
-msgid "Video"
-msgstr "Відео"
-
msgid "Import Video"
msgstr "Імпортувати відео"
@@ -28190,8 +30155,8 @@ msgstr "по кругу"
msgid "mute"
msgstr "вимкнути звук"
-msgid "Scanned Map..."
-msgstr "Сканована мапа…"
+msgid "Walking Papers Scanned Map"
+msgstr "Скановані мапи Walking Papers"
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -28213,9 +30178,6 @@ msgstr "Walking Papers: {0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Шар ({0}) Walking Papers в масштабі {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "Завантажити лінію"
@@ -28367,9 +30329,6 @@ msgstr "Встановити типову мову для статей з Вік
msgid "Enter the Wikipedia language"
msgstr "Вкажіть мову у Вікіпедії"
-msgid "Add Tag"
-msgstr "Додати теґ"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index d65e012..2c469fe 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\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"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:03+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:04+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Opening link not supported on current platform (''{0}'')"
msgstr ""
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -150,13 +165,13 @@ msgid "About JOSM..."
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
@@ -199,6 +214,9 @@ msgstr ""
msgid "Add imagery layer {0}"
msgstr ""
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -238,9 +256,6 @@ msgstr ""
msgid "Please select at least four nodes."
msgstr ""
-msgid "Information"
-msgstr ""
-
msgid "Align Nodes in Line"
msgstr ""
@@ -265,6 +280,9 @@ msgstr ""
msgid "download"
msgstr ""
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr ""
@@ -274,6 +292,9 @@ msgstr ""
msgid "Nothing selected to zoom to."
msgstr ""
+msgid "Information"
+msgstr ""
+
msgid "Zoom to {0}"
msgstr ""
@@ -328,7 +349,7 @@ msgid ""
msgstr ""
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
@@ -385,18 +406,35 @@ msgstr ""
msgid "Delete selected objects."
msgstr ""
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr ""
msgid "Distribute the selected nodes to equal distances along a line."
msgstr ""
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr ""
msgid "Download map data from the OSM server."
msgstr ""
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr ""
+
msgid "Download object..."
msgstr ""
@@ -491,6 +529,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr ""
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -604,7 +645,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -754,8 +795,8 @@ msgid "Merge nodes into the oldest one."
msgstr ""
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -912,8 +953,8 @@ msgid "Download Data"
msgstr ""
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -940,12 +981,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -963,9 +1000,6 @@ msgstr ""
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1072,6 +1106,15 @@ msgstr ""
msgid "Could not rename file ''{0}''"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1122,9 +1165,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1186,6 +1226,9 @@ msgstr ""
msgid "Copy to clipboard and close"
msgstr ""
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr ""
@@ -1260,13 +1303,13 @@ msgid ""
msgstr ""
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1355,6 +1398,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr ""
@@ -1379,9 +1443,6 @@ msgstr ""
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr ""
-
msgid "Update modified"
msgstr ""
@@ -1577,6 +1638,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr ""
@@ -1586,6 +1650,18 @@ msgstr ""
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr ""
@@ -1605,6 +1681,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr ""
@@ -1655,25 +1756,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1816,6 +1898,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1840,8 +1925,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1857,6 +1942,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2263,6 +2351,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2423,13 +2514,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2438,6 +2529,9 @@ msgstr ""
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr ""
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2456,8 +2550,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2543,6 +2636,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2579,10 +2675,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2605,8 +2701,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2710,6 +2806,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr ""
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2770,8 +2869,8 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
msgid "Relation"
@@ -2801,10 +2900,10 @@ msgstr ""
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
+msgid "Please select which changes you want to apply."
msgstr ""
-msgid "Properties of "
+msgid "Tags of "
msgstr ""
msgid "Roles in relations referring to"
@@ -2825,6 +2924,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2855,18 +2957,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2875,8 +2977,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2884,13 +2986,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2904,8 +3004,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2935,11 +3035,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr ""
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3092,8 +3191,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3200,7 +3298,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3219,6 +3317,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3235,9 +3336,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3276,6 +3374,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3300,6 +3401,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3359,13 +3469,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3435,6 +3545,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3504,6 +3632,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3561,13 +3695,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3599,10 +3733,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3736,7 +3870,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3811,6 +3945,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3841,9 +3978,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3868,10 +4002,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3934,23 +4068,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4054,7 +4171,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4250,9 +4367,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4268,10 +4400,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4280,6 +4424,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4339,6 +4486,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4366,19 +4516,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4666,29 +4803,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
-msgid ""
+msgid "> after"
+msgstr ""
+
+msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4703,7 +4858,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4755,14 +4910,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5012,14 +5159,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5540,6 +5687,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5623,6 +5773,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr ""
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr ""
+
+msgid "Object ID:"
+msgstr ""
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr ""
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5644,9 +5821,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5671,32 +5845,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5716,8 +5890,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5743,9 +5916,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5890,9 +6060,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6177,8 +6344,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6243,34 +6410,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: foreground"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6285,13 +6464,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6370,12 +6549,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6405,9 +6578,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6445,7 +6624,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6505,6 +6684,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6760,6 +6942,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6825,9 +7026,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6894,20 +7092,7 @@ msgstr ""
msgid "Download object"
msgstr ""
-msgid "Object type:"
-msgstr ""
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr ""
-
-msgid "Object ID:"
-msgstr ""
-
-msgid "Enter the ID of the object that should be downloaded"
+msgid "Start downloading"
msgstr ""
msgid ""
@@ -6918,23 +7103,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr ""
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7031,7 +7202,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7130,6 +7301,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7217,7 +7391,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7236,6 +7410,12 @@ msgstr ""
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7302,8 +7482,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7378,8 +7557,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7393,8 +7572,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7609,12 +7787,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7623,6 +7795,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7638,6 +7826,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7645,8 +7848,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7758,9 +7961,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7770,6 +7970,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7786,7 +7989,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7932,7 +8135,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7962,7 +8165,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8076,6 +8279,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8113,6 +8319,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8309,9 +8518,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8330,6 +8536,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8387,6 +8596,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8453,9 +8668,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8468,7 +8680,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8495,12 +8710,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8629,14 +8848,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8651,7 +8866,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8661,8 +8876,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8882,7 +9096,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8948,6 +9162,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9005,9 +9225,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9254,6 +9471,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9382,6 +9602,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9424,6 +9650,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9474,19 +9703,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9504,40 +9724,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9561,6 +9790,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9617,6 +9879,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9670,6 +9935,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9951,7 +10221,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10120,6 +10396,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10183,7 +10465,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10441,40 +10723,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10527,8 +10809,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10537,20 +10819,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10632,14 +10919,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10683,31 +10964,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10716,6 +11002,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10731,57 +11020,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10799,6 +11090,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10828,6 +11127,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10858,7 +11200,7 @@ msgid "Contacting OSM Server..."
msgstr ""
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10898,28 +11240,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11014,6 +11354,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11029,12 +11372,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11113,7 +11464,7 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
+msgid "NMEA import success:"
msgstr ""
msgid "NMEA import failure!"
@@ -11212,35 +11563,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11250,8 +11577,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11278,10 +11605,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11292,9 +11616,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11316,6 +11637,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11365,8 +11689,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11509,6 +11833,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11527,6 +11854,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11551,16 +11887,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11572,6 +11911,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11586,6 +11933,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11616,19 +11972,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11650,11 +12006,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11724,13 +12092,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11873,10 +12241,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11891,22 +12259,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -11975,8 +12342,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -11991,9 +12357,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12315,17 +12696,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12336,9 +12711,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12370,9 +12788,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
msgstr ""
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12695,6 +13127,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12774,6 +13211,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12875,9 +13316,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12933,6 +13371,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12957,9 +13398,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -12985,9 +13423,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13024,6 +13459,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13070,9 +13510,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13157,6 +13594,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13247,6 +13687,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13265,10 +13749,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13280,6 +13764,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13307,18 +13794,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13328,9 +13809,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13340,13 +13818,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13394,6 +13872,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13478,6 +13959,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13582,21 +14066,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13612,10 +14105,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13651,7 +14144,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13720,12 +14213,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13741,15 +14240,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13771,6 +14261,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13780,6 +14279,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13789,10 +14291,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13825,9 +14324,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13861,19 +14357,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13885,6 +14405,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13906,55 +14429,99 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
msgstr ""
-msgid "Gate"
+msgid "Guard Rail"
msgstr ""
-msgid "Edit Gate"
+msgid "Edit Guard Rail"
msgstr ""
-msgid "Lift Gate"
+msgid "Wall"
msgstr ""
-msgid "Edit Lift Gate"
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr ""
+
+msgid "Edit Gate"
+msgstr ""
+
+msgid "Lift Gate"
+msgstr ""
+
+msgid "Edit Lift Gate"
msgstr ""
msgid "Hampshire Gate"
@@ -13975,12 +14542,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14038,6 +14620,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14047,6 +14632,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14086,9 +14677,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14122,6 +14710,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14203,18 +14806,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14287,7 +14895,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14311,10 +14922,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14326,9 +14940,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14371,18 +14982,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14482,11 +15131,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14498,11 +15145,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14521,10 +15166,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14554,9 +15199,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14572,19 +15214,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14734,6 +15392,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14755,6 +15416,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14782,6 +15449,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14806,22 +15479,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14843,9 +15500,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14909,7 +15563,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15040,6 +15694,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15070,6 +15727,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15082,9 +15742,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15094,9 +15751,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15109,6 +15771,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15133,14 +15798,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15189,7 +15846,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15243,41 +15900,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15463,6 +16120,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15484,9 +16147,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15499,6 +16168,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15538,6 +16210,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15559,22 +16234,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15598,9 +16285,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15625,7 +16309,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15698,52 +16391,46 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
msgstr ""
-msgid "hindu"
+msgid "Edit Church"
msgstr ""
-msgid "jain"
+msgid "Building type"
msgstr ""
-msgid "jewish"
+msgid "basilica"
msgstr ""
-msgid "muslim"
+msgid "cathedral"
msgstr ""
-msgid "sikh"
+msgid "chapel"
msgstr ""
-msgid "spiritualist"
+msgid "church"
msgstr ""
-msgid "taoist"
+msgid "temple"
msgstr ""
-msgid "unitarian"
-msgstr ""
-
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "Denomination"
msgstr ""
msgid "anglican"
@@ -15758,6 +16445,12 @@ msgstr ""
msgid "evangelical"
msgstr ""
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15770,6 +16463,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15785,37 +16481,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15905,6 +16704,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15914,6 +16719,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -15980,12 +16791,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -15995,6 +16860,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16004,31 +16893,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16056,7 +16951,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16083,27 +16978,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16138,12 +17021,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16153,10 +17039,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16184,6 +17070,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16221,117 +17110,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16365,33 +17290,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16425,6 +17360,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16437,7 +17388,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16500,36 +17476,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16572,19 +17566,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16723,6 +17713,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16735,60 +17737,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
msgstr ""
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
msgstr ""
-msgid "Edit Residential Building"
+msgctxt "building"
+msgid "warehouse"
msgstr ""
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
+msgstr ""
+
+msgid "Edit Residential Building"
+msgstr ""
+
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16804,9 +17880,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17016,41 +18089,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17059,7 +18158,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17071,12 +18170,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17128,88 +18317,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
msgstr ""
-msgid "battery charging"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
msgstr ""
-msgid "Power Station"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17221,6 +18513,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17236,6 +18543,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17254,11 +18564,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17367,10 +18675,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17382,7 +18690,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17403,13 +18711,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17481,7 +18795,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17502,13 +18816,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17517,7 +18831,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17545,6 +18858,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17581,40 +18900,61 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
-msgid "Erotic"
+msgid "Gift"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Gift Shop"
msgstr ""
-msgid "Florist"
+msgid "buddhist"
msgstr ""
-msgid "Edit Florist"
+msgid "christian"
msgstr ""
-msgid "Garden Centre"
+msgid "hindu"
msgstr ""
-msgid "Edit Garden Centre"
+msgid "jewish"
msgstr ""
-msgid "Do-it-yourself-store"
+msgid "muslim"
msgstr ""
-msgid "Edit Do-it-yourself-store"
+msgid "Erotic"
msgstr ""
-msgid "Hardware"
+msgid "Edit Erotic Shop"
msgstr ""
-msgid "Edit Hardware Store"
+msgid "Florist"
msgstr ""
-msgid "Paint"
+msgid "Edit Florist"
msgstr ""
-msgid "Edit Paint"
+msgid "Garden Centre"
+msgstr ""
+
+msgid "Edit Garden Centre"
+msgstr ""
+
+msgid "Do-it-yourself-store"
+msgstr ""
+
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+msgid "Hardware"
+msgstr ""
+
+msgid "Edit Hardware Store"
+msgstr ""
+
+msgid "Paint"
+msgstr ""
+
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17626,19 +18966,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17659,6 +18999,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17668,7 +19014,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17749,6 +19095,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17878,6 +19227,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17917,24 +19272,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17944,15 +19308,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18028,6 +19383,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18082,7 +19443,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18094,6 +19455,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18169,46 +19533,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
+msgstr ""
+
+msgid "International name"
msgstr ""
-msgid "AT"
+msgid "Official name"
msgstr ""
-msgid "CH"
+msgid "Common name abbreviation"
msgstr ""
-msgid "DE"
+msgid "Edit Address Information"
msgstr ""
-msgid "FR"
+msgid "House number"
msgstr ""
-msgid "GB"
+msgid "House name"
msgstr ""
-msgid "IT"
+msgid "Street name"
msgstr ""
-msgid "RS"
+msgid "City name"
msgstr ""
-msgid "US"
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18229,6 +19596,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18391,27 +19770,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bicycle"
+msgstr ""
+
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18457,19 +19865,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "house"
msgstr ""
msgid "Street"
@@ -18493,7 +19904,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18589,18 +20000,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18610,7 +20030,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18619,10 +20042,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18640,6 +20063,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18655,28 +20081,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18697,19 +20123,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18775,9 +20201,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18787,10 +20210,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18805,9 +20231,6 @@ msgstr ""
msgid "One Way"
msgstr ""
-msgid "Church"
-msgstr ""
-
msgid "Fuel Station"
msgstr ""
@@ -18835,6 +20258,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18880,10 +20306,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18895,7 +20351,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18913,7 +20369,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19030,19 +20486,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "artwork_type without tourism=artwork"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "castle_type without historic=castle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
+msgstr ""
+
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19061,13 +20628,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19076,19 +20679,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19103,142 +20715,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19277,148 +20938,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19622,6 +21346,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19643,13 +21379,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19912,9 +21642,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19936,6 +21672,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20014,9 +21753,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20101,7 +21852,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20372,15 +22123,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20551,6 +22293,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20569,12 +22314,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20710,6 +22449,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20727,6 +22469,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20807,113 +22552,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20939,7 +22698,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -20989,7 +22751,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21034,6 +22796,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21091,19 +22856,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21145,27 +22975,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21561,6 +23373,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21808,12 +23623,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21823,16 +23632,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22195,9 +24001,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22252,9 +24055,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22296,25 +24116,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22451,9 +24271,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22478,12 +24295,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22632,6 +24458,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22648,6 +24477,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22881,13 +24721,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22940,18 +24773,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23009,6 +24830,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23216,9 +25040,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23298,7 +25119,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23452,6 +25291,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23473,6 +25315,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23766,9 +25611,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23837,9 +25679,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23966,9 +25805,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -23990,6 +25826,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24022,15 +25861,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24040,6 +25895,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24142,9 +26000,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24260,6 +26115,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24320,19 +26178,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24470,6 +26328,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24545,6 +26406,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24560,9 +26510,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24584,6 +26531,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24736,9 +26686,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25364,7 +27311,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25372,10 +27322,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25384,18 +27331,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25438,15 +27373,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25568,18 +27494,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25757,9 +27671,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25886,7 +27797,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25906,9 +27817,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26041,9 +27949,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index 5ad4bd5..7c3493a 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
"PO-Revision-Date: 2013-03-13 05:33+0000\n"
"Last-Translator: Minh Nguyễn <mxn at 1ec5.org>\n"
"Language-Team: Vietnamese <vi at li.org>\n"
@@ -10,8 +10,8 @@ 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: 2013-04-05 05:03+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:04+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "Điều khoản Sử dụng Hình nền"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "Liên kết đang mở không được hỗ trợ trên phiên bản (''{0}'')"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr ""
@@ -153,16 +168,14 @@ msgid "About JOSM..."
msgstr "Thông tin về JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
msgstr ""
-"Cảnh báo: Định dạng không rõ của URL dựa theo API. Chuyển hướng sang trang "
-"người dung của các đối tượng OSM có thể thất bại. URL dựa theo API :{0}"
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -205,6 +218,9 @@ msgstr "Không có layer đích"
msgid "Add imagery layer {0}"
msgstr "Thêm lớp ảnh {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr "Chọn lớp WMS"
@@ -244,9 +260,6 @@ msgstr "Công cụ {0}"
msgid "Please select at least four nodes."
msgstr "Xin hãy chọn ít nhất 4 nốt"
-msgid "Information"
-msgstr "Thông tin"
-
msgid "Align Nodes in Line"
msgstr "Canh các nốt theo đường"
@@ -271,6 +284,9 @@ msgstr "xung đột"
msgid "download"
msgstr "tải về"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "trước"
@@ -280,6 +296,9 @@ msgstr "kế tiếp"
msgid "Nothing selected to zoom to."
msgstr "Chưa chọn để xem"
+msgid "Information"
+msgstr "Thông tin"
+
msgid "Zoom to {0}"
msgstr "Phóng to đến {0}"
@@ -336,10 +355,9 @@ msgstr ""
"chúng ?"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
msgstr ""
-"Không thể gộp ( Các đường này không thể gộp thành một chuỗi các nốt đơn được)"
msgid "Combine {0} ways"
msgstr "Gộp {0} đường"
@@ -394,18 +412,35 @@ msgstr "Xoá"
msgid "Delete selected objects."
msgstr "Xóa các đối tượng đã chọn"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "Phân bố các nốt"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "Phân bố các nốt đã chọn theo một khoảng bằng nhau dọc theo 1 đường"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "Tải về từ OSM"
msgid "Download map data from the OSM server."
msgstr "Tải dữ liệu bản đồ từ server của OSM"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+msgid "Download data"
+msgstr "Tải dữ liệu"
+
msgid "Download object..."
msgstr "Tải về đối tượng…"
@@ -500,6 +535,9 @@ msgstr ""
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "Hiện thông tin lịch sử về lối, nốt, hoặc quan hệ OSM."
+msgid "Show history"
+msgstr ""
+
msgid "History (web)"
msgstr ""
@@ -613,7 +651,7 @@ msgid "Joined overlapping areas"
msgstr ""
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
msgstr ""
@@ -763,8 +801,8 @@ msgid "Merge nodes into the oldest one."
msgstr "Hợp nhất các nốt vào nốt cũ nhất"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
msgstr ""
msgid "Abort Merging"
@@ -919,8 +957,8 @@ msgid "Download Data"
msgstr "Tải dữ liệu"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
msgstr ""
msgid ""
@@ -947,12 +985,8 @@ msgid "Orthogonalize / Undo"
msgstr ""
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
-msgstr ""
-
-msgid "Undo Orthogonalize Shape"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
msgid ""
@@ -970,9 +1004,6 @@ msgstr "Trực giao hóa"
msgid "Usage"
msgstr ""
-msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1079,6 +1110,15 @@ msgstr "Đồng thời đổi tên tập tin"
msgid "Could not rename file ''{0}''"
msgstr "Không thể đặt lại tên tập tin \"{0}\""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr ""
@@ -1130,9 +1170,6 @@ msgstr ""
msgid "Load a session from file."
msgstr ""
-msgid "Session file (*.jos, *.joz)"
-msgstr ""
-
msgid "Open session"
msgstr ""
@@ -1196,6 +1233,9 @@ msgstr "Báo cáo Trạng Thái"
msgid "Copy to clipboard and close"
msgstr "Sao chép vào clipboard và Đóng"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "Đóng"
@@ -1271,13 +1311,13 @@ msgstr ""
"của đường)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
msgstr ""
msgid "Split way {0} into {1} parts"
@@ -1372,6 +1412,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "Hoàn lại"
@@ -1396,9 +1457,6 @@ msgstr "Cập nhật dữ liệu"
msgid "Updates the objects in the active data layer from the server."
msgstr ""
-msgid "Download data"
-msgstr "Tải dữ liệu"
-
msgid "Update modified"
msgstr ""
@@ -1594,6 +1652,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr ""
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "Tải dữ liệu GPS"
@@ -1603,6 +1664,18 @@ msgstr "Đã tải dữ liệu GPX"
msgid "Markers from {0}"
msgstr ""
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr ""
+
msgid "Downloading data"
msgstr "Đang tải dữ liệu"
@@ -1622,6 +1695,31 @@ msgstr ""
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr ""
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr ""
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "Tải {0} của {1} (còn {2})"
@@ -1672,25 +1770,6 @@ msgstr ""
msgid "Errors during download"
msgstr ""
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr ""
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr ""
-
msgid "Error during download"
msgstr ""
@@ -1832,6 +1911,9 @@ msgstr ""
msgid "Improve Way Accuracy mode"
msgstr ""
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr ""
@@ -1856,8 +1938,8 @@ msgstr ""
msgid "Cannot place a node outside of the world."
msgstr ""
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
msgstr[0] ""
msgstr[1] ""
@@ -1873,6 +1955,9 @@ msgstr ""
msgid "Make parallel copies of ways"
msgstr ""
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2283,6 +2368,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2443,13 +2531,13 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr ""
-msgid "Primitive id expected"
+msgid "Range of primitive ids expected"
msgstr ""
-msgid "Changeset id expected"
+msgid "Range of changeset ids expected"
msgstr ""
-msgid "Version expected"
+msgid "Range of versions expected"
msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
@@ -2461,6 +2549,9 @@ msgstr ""
"Kiểu đối tượng không rõ:{0}. Các giá trị được phép dùng là nốt, đường và "
"quan hệ"
+msgid "Primitive id expected"
+msgstr ""
+
msgid "Range of numbers expected"
msgstr ""
@@ -2479,8 +2570,7 @@ msgstr ""
msgid "Missing operator for NOT"
msgstr ""
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
msgstr ""
msgid ""
@@ -2566,6 +2656,9 @@ msgid_plural "Added {0} objects"
msgstr[0] ""
msgstr[1] ""
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr ""
@@ -2602,10 +2695,10 @@ msgstr ""
msgid "Set {0}={1} for {2} objects"
msgstr ""
-msgid "Deleted {0} properties for {1} objects"
+msgid "Deleted {0} tags for {1} objects"
msgstr ""
-msgid "Set {0} properties for {1} objects"
+msgid "Set {0} tags for {1} objects"
msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
@@ -2627,8 +2720,8 @@ msgid "Double conflict"
msgstr ""
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
msgstr ""
msgid "Add conflict for ''{0}''"
@@ -2732,6 +2825,9 @@ msgstr[1] ""
msgid "Resolve conflicts in member list of relation {0}"
msgstr "Xử lý các xung đột trong danh sách các thành phần {0}"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] ""
@@ -2792,11 +2888,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
msgstr ""
-"Khi đảo chiều đường này, những thay đổi tiếp theo đến tính chất của đường và "
-"các nốt của nó được đề nghị để duy trì tính thống nhất của dữ liệu"
msgid "Relation"
msgstr "Quan hệ"
@@ -2825,11 +2919,11 @@ msgstr "Áp dụng các thay đổi đã chọn"
msgid "Do not apply changes"
msgstr ""
-msgid "Please select which property changes you want to apply."
-msgstr "Hãy chọn các tính chất thay đổi mà bạn muốn áp dụng"
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "Thuộc tính của "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "Các vai trò trong quan hệ đang tham chiếu đến"
@@ -2849,6 +2943,9 @@ msgstr ""
msgid "Unable to delete old backup file {0}"
msgstr ""
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr ""
@@ -2879,18 +2976,18 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr ""
-msgid "Warning: failed to persist preferences to ''{0}''"
+msgid "Failed to persist preferences to ''{0}''"
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
msgstr ""
msgid ""
@@ -2899,8 +2996,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
msgstr ""
msgid ""
@@ -2908,13 +3005,11 @@ msgid ""
"preference directory: {0}</html>"
msgstr ""
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
+"Replacing existing preference file ''{0}'' with default preference file."
msgstr ""
msgid ""
@@ -2928,8 +3023,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
@@ -2959,11 +3054,10 @@ msgstr ""
msgid "UNKNOWN"
msgstr "KHÔNG RÕ"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
+msgid "The revision file ''/REVISION'' is missing."
msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
@@ -3113,8 +3207,7 @@ msgstr ""
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr ""
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3221,7 +3314,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3240,6 +3333,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3256,9 +3352,6 @@ msgstr ""
msgid "GRS80"
msgstr ""
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr ""
-
msgid "WGS84"
msgstr ""
@@ -3297,6 +3390,9 @@ msgstr ""
msgid "Running test {0}"
msgstr ""
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr ""
@@ -3321,6 +3417,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr ""
@@ -3380,13 +3485,13 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead"
msgstr ""
-msgid "Duplicated nodes"
+msgid "{0} is unnecessary"
msgstr ""
-msgid "This test checks that there are no nodes at the very same location."
+msgid "Duplicated nodes"
msgstr ""
-msgid "Duplicate nodes in two un-closed ways"
+msgid "This test checks that there are no nodes at the very same location."
msgstr ""
msgid "Mixed type duplicated nodes"
@@ -3456,6 +3561,24 @@ msgstr ""
msgid "Checks for ways with identical consecutive nodes."
msgstr ""
+msgid "Highways"
+msgstr ""
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr ""
@@ -3525,6 +3648,12 @@ msgstr ""
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr ""
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr ""
@@ -3582,13 +3711,13 @@ msgstr ""
msgid "Relation is empty"
msgstr ""
-msgid "<empty>"
+msgid "Role verification problem"
msgstr ""
-msgid "Role {0} missing"
+msgid "<empty>"
msgstr ""
-msgid "Role verification problem"
+msgid "Role {0} missing"
msgstr ""
msgid "Number of {0} roles too low ({1})"
@@ -3620,10 +3749,10 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr ""
-msgid "Properties checker :"
+msgid "Tag checker"
msgstr ""
-msgid "This plugin checks for errors in property keys and values."
+msgid "This test checks for errors in tag keys and values."
msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
@@ -3757,7 +3886,7 @@ msgstr ""
msgid "Use the default spellcheck file (recommended)."
msgstr ""
-msgid "Fix properties"
+msgid "Fix tags"
msgstr ""
msgid "Could not find element type"
@@ -3832,6 +3961,9 @@ msgstr ""
msgid "This tests if ways which should be circular are closed."
msgstr ""
+msgid "Unclosed way"
+msgstr ""
+
msgid "natural type {0}"
msgstr ""
@@ -3862,9 +3994,6 @@ msgstr ""
msgid "area"
msgstr ""
-msgid "Unclosed way"
-msgstr ""
-
msgid "Unconnected ways"
msgstr ""
@@ -3889,10 +4018,10 @@ msgstr ""
msgid "This test checks for untagged nodes that are not part of any way."
msgstr ""
-msgid "No tags"
+msgid "Unconnected nodes without physical tags"
msgstr ""
-msgid "Unconnected nodes without physical tags"
+msgid "No tags"
msgstr ""
msgid "Has tag containing ''fixme'' or ''FIXME''"
@@ -3955,23 +4084,6 @@ msgstr ""
msgid "Reversed land: land not on left side"
msgstr ""
-msgid "Wrong number of arguments for bookmark"
-msgstr ""
-
-msgid "Error reading bookmark entry: %s"
-msgstr ""
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
msgid "Do not show again (remembers choice)"
msgstr ""
@@ -4073,7 +4185,7 @@ msgstr ""
msgid "Downloading \"Message of the day\""
msgstr ""
-msgid "Warning: failed to read MOTD. Exception was: {0}"
+msgid "Failed to read MOTD. Exception was: {0}"
msgstr ""
msgid "Message of the day not available"
@@ -4269,9 +4381,24 @@ msgstr ""
msgid "Tools"
msgstr ""
+msgid "More tools"
+msgstr ""
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr ""
+
msgid "Presets"
msgstr ""
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr ""
@@ -4287,10 +4414,22 @@ msgstr ""
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr ""
+msgid "Preset preferences"
+msgstr ""
+
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
msgid "Audio"
msgstr ""
-msgid "Hide edit toolbar"
+msgid "Do not hide toolbar"
msgstr ""
msgid "Hide this button"
@@ -4299,6 +4438,9 @@ msgstr ""
msgid "Click the arrow at the bottom to show it again."
msgstr ""
+msgid "Hide edit toolbar"
+msgstr ""
+
msgid "Hide or show this toggle button"
msgstr ""
@@ -4358,6 +4500,9 @@ msgstr ""
msgid "User:"
msgstr ""
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr ""
@@ -4385,19 +4530,6 @@ msgstr ""
msgid "Click to run job in background"
msgstr ""
-msgid "false: the property is explicitly switched off"
-msgstr ""
-
-msgid "true: the property is explicitly switched on"
-msgstr ""
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-
-msgid "unset: do not set this property on the selected objects"
-msgstr ""
-
msgid "{0} ({1} ms)"
msgstr ""
@@ -4685,29 +4817,47 @@ msgstr ""
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr ""
-msgid ""
+msgid "> before"
+msgstr ""
+
+msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr ""
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr ""
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr ""
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr ""
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4722,7 +4872,7 @@ msgstr ""
msgid "Up"
msgstr ""
-msgid "Move up the selected elements by one position."
+msgid "Move up the selected entries by one position."
msgstr ""
msgid "Down"
@@ -4774,14 +4924,6 @@ msgid_plural "Their version ({0} entries)"
msgstr[0] ""
msgstr[1] ""
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-
-msgid "Adjustable {0} not registered yet."
-msgstr ""
-
msgid "Node"
msgstr ""
@@ -5031,14 +5173,14 @@ msgctxt "tag"
msgid "Key:"
msgstr ""
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
msgstr ""
msgid "Value:"
msgstr ""
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
msgstr ""
msgid ""
@@ -5559,6 +5701,9 @@ msgstr ""
msgid "Information about layer"
msgstr ""
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr ""
@@ -5642,6 +5787,33 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "Object type:"
+msgstr "Loại đối tượng:"
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr ""
+
+msgid "Choose the OSM object type"
+msgstr "Lựa chọn loại đối tượng OSM"
+
+msgid "Object ID:"
+msgstr "ID của Đối tượng:"
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Nhập ID của đối tượng để tải về"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr ""
@@ -5663,9 +5835,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr ""
-msgid "Selection"
-msgstr ""
-
msgid "Open a selection list window."
msgstr ""
@@ -5690,32 +5859,32 @@ msgstr ""
msgid "Selection: {0}"
msgstr ""
-msgid "Side buttons"
+msgid "Toggle dynamic buttons"
msgstr ""
-msgid "Always shown"
+msgid "Open preferences for this panel"
msgstr ""
-msgid "Dynamic"
+msgid "Undock the panel"
msgstr ""
-msgid "Always hidden"
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
msgstr ""
-msgid "Toggle dynamic buttons"
+msgid "Click to minimize/maximize the panel content"
msgstr ""
-msgid "Open preferences for this panel"
+msgid "Side buttons"
msgstr ""
-msgid "Undock the panel"
+msgid "Always shown"
msgstr ""
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid "Dynamic"
msgstr ""
-msgid "Click to minimize/maximize the panel content"
+msgid "Always hidden"
msgstr ""
msgid "Authors"
@@ -5735,8 +5904,7 @@ msgstr ""
msgid "Launches a browser with information about the user"
msgstr ""
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
msgstr ""
msgid ""
@@ -5762,9 +5930,6 @@ msgstr ""
msgid "Validation results"
msgstr ""
-msgid "Zoom to problem"
-msgstr ""
-
msgid "Fix"
msgstr ""
@@ -5909,9 +6074,6 @@ msgstr ""
msgid "Update the changeset content from the OSM server"
msgstr ""
-msgid "Show history"
-msgstr ""
-
msgid "Download and show the history of the selected objects"
msgstr ""
@@ -6196,8 +6358,8 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
@@ -6262,34 +6424,46 @@ msgstr ""
msgid "This changeset query URL is invalid"
msgstr ""
-msgid "Select objects for which to change properties."
+msgid "Discardable key: selection Foreground"
msgstr ""
-msgid "Properties/Memberships"
+msgid "Discardable key: selection Background"
msgstr ""
-msgid "Properties for selected objects."
+msgid "Discardable key: foreground"
+msgstr ""
+
+msgid "Discardable key: background"
msgstr ""
msgid "<different>"
msgstr ""
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr ""
msgid "Position"
msgstr ""
-msgid "Properties: {0} / Memberships: {1}"
+msgid "Tags: {0} / Memberships: {1}"
msgstr ""
-msgid "Properties / Memberships"
+msgid "Tags / Memberships"
msgstr ""
msgid "Delete the selected key in all objects"
msgstr ""
-msgid "Delete Properties"
+msgid "Delete Tags"
msgstr ""
msgid "Change relation"
@@ -6304,13 +6478,13 @@ msgstr ""
msgid "Add a new key/value pair to all objects"
msgstr ""
-msgid "Add Property"
+msgid "Add Tag"
msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr ""
-msgid "Edit Properties"
+msgid "Edit Tags"
msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
@@ -6389,12 +6563,6 @@ msgstr[1] ""
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr ""
@@ -6424,9 +6592,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6464,7 +6638,7 @@ msgstr ""
msgid "Downloading relation {0}"
msgstr ""
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
msgid "Downloading {0} incomplete object"
@@ -6524,6 +6698,9 @@ msgstr ""
msgid "Ignore them, leave relation as is"
msgstr ""
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6779,6 +6956,25 @@ msgstr ""
msgid "way is not connected to previous or next relation member"
msgstr ""
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr ""
+
+msgid "Error reading bookmark entry: %s"
+msgstr ""
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
msgid "Bookmarks"
msgstr ""
@@ -6844,9 +7040,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
-msgid "Paste URL from clipboard"
-msgstr ""
-
msgid "Data Sources and Types:"
msgstr ""
@@ -6913,21 +7106,8 @@ msgstr ""
msgid "Download object"
msgstr "Tải về đối tượng"
-msgid "Object type:"
-msgstr "Loại đối tượng:"
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr ""
-
-msgid "Choose the OSM object type"
-msgstr "Lựa chọn loại đối tượng OSM"
-
-msgid "Object ID:"
-msgstr "ID của Đối tượng:"
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "Nhập ID của đối tượng để tải về"
+msgid "Start downloading"
+msgstr "Bắt đầu tải về"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6937,23 +7117,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr ""
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-
msgid "Download referrers (parent relations and ways)"
msgstr ""
-msgid "Start downloading"
-msgstr "Bắt đầu tải về"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr ""
@@ -7050,7 +7216,7 @@ msgstr ""
msgid "Go to the JOSM help home page"
msgstr ""
-msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgid "Bad location in HTML document. Exception was: {0}"
msgstr ""
msgid "Failed to open help page. The target URL is empty."
@@ -7149,6 +7315,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr ""
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr ""
@@ -7243,7 +7412,7 @@ msgstr ""
msgid "Object still in use"
msgstr ""
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgid "Error header \"{0}\" did not match with an expected pattern"
msgstr ""
msgid "Upload"
@@ -7262,6 +7431,12 @@ msgstr "Mô tả ngắn một số thay đổi mà bạn muốn tải lên:"
msgid "Enter an upload comment"
msgstr ""
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr ""
@@ -7328,8 +7503,7 @@ msgid "Closing changeset {0}"
msgstr ""
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
+"Failed to put Credential Dialog always on top. Caught security exception."
msgstr ""
msgid "Enter credentials for OSM API"
@@ -7404,8 +7578,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7419,8 +7593,7 @@ msgid "Missing user identity"
msgstr ""
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
msgstr ""
msgid "Download objects"
@@ -7635,12 +7808,6 @@ msgstr ""
msgid "Please revise upload comment"
msgstr ""
-msgid "Revise"
-msgstr ""
-
-msgid "Continue as is"
-msgstr ""
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7649,6 +7816,22 @@ msgid ""
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr ""
+
+msgid "Continue as is"
+msgstr ""
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr ""
@@ -7664,6 +7847,21 @@ msgstr ""
msgid "Illegal chunk size"
msgstr ""
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr ""
@@ -7671,8 +7869,8 @@ msgid "Tags of changeset {0}"
msgstr ""
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
msgstr ""
msgid "Preparing objects to upload ..."
@@ -7784,9 +7982,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] ""
@@ -7796,6 +7991,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7812,7 +8010,7 @@ msgstr ""
msgid "Cancel uploading"
msgstr ""
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Please select the upload strategy:"
@@ -7958,7 +8156,7 @@ msgstr ""
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7988,7 +8186,7 @@ msgstr ""
msgid "Merging layers"
msgstr ""
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
msgstr ""
msgid "{0} deleted"
@@ -8104,6 +8302,9 @@ msgstr ""
msgid "No tiles at this zoom level"
msgstr ""
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8141,6 +8342,9 @@ msgstr ""
msgid "Alpha channel"
msgstr ""
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr ""
@@ -8337,9 +8541,6 @@ msgstr ""
msgid "Starting directory scan"
msgstr ""
-msgid "One of the selected files was null"
-msgstr ""
-
msgid "Read photos..."
msgstr ""
@@ -8358,6 +8559,9 @@ msgstr ""
msgid "Error while getting files from directory {0}\n"
msgstr ""
+msgid "One of the selected files was null"
+msgstr ""
+
msgid "Geotagged Images"
msgstr ""
@@ -8415,6 +8619,12 @@ msgstr ""
msgid "Show next Image"
msgstr ""
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr ""
@@ -8481,9 +8691,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr ""
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
msgid "Customize track drawing"
msgstr ""
@@ -8496,7 +8703,10 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
msgstr ""
msgid "Download everything within:"
@@ -8523,12 +8733,16 @@ msgstr ""
msgid "track and waypoints"
msgstr ""
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr ""
+
+msgid "Calculating Download Area"
msgstr ""
msgid "Precache imagery tiles along this track"
@@ -8657,14 +8871,10 @@ msgstr ""
msgid "(URL was: "
msgstr ""
-msgid "Error displaying URL"
-msgstr ""
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
msgstr ""
msgid "loading style ''{0}''..."
@@ -8679,7 +8889,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
msgstr ""
msgid "Illegal dash pattern, values must be positive"
@@ -8689,8 +8899,7 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
msgstr ""
msgid "Access Token Key:"
@@ -8910,7 +9119,7 @@ msgstr ""
msgid "Close the dialog and accept the Access Token"
msgstr ""
-msgid "Warning: failed to cancel running OAuth operation"
+msgid "Failed to cancel running OAuth operation"
msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
@@ -8976,6 +9185,12 @@ msgstr ""
msgid "Select to grant JOSM the right to write your server preferences"
msgstr ""
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr ""
@@ -9033,9 +9248,6 @@ msgid ""
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-msgid "Restart"
-msgstr ""
-
msgid "Click to retrieve a Request Token"
msgstr ""
@@ -9282,6 +9494,9 @@ msgstr ""
msgid "You have to restart JOSM for some settings to take effect."
msgstr ""
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr ""
@@ -9410,6 +9625,12 @@ msgstr ""
msgid "Configure toolbar"
msgstr ""
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr ""
@@ -9452,6 +9673,9 @@ msgstr ""
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr ""
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr ""
@@ -9502,19 +9726,10 @@ msgstr ""
msgid "Read from file"
msgstr ""
-msgid "Open JOSM customization file"
-msgstr ""
-
-msgid "Import log"
-msgstr ""
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
+msgid "Export selected items"
msgstr ""
-msgid "Export selected items"
+msgid "JOSM custom settings files (*.xml)"
msgstr ""
msgid "Please select some preference keys not marked as default"
@@ -9532,40 +9747,49 @@ msgstr ""
msgid "Replace existing values"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
+msgid "Open JOSM customization file"
msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Import log"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Current value is default."
+msgid "shortcut"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "color"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
+msgid "toolbar"
msgstr ""
-msgid "Select Setting Type:"
+msgid "imagery"
msgstr ""
-msgid "Simple"
+msgid "Reset preferences"
msgstr ""
-msgid "List"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "List of lists"
+msgid "Load profile"
msgstr ""
-msgid "List of maps"
+msgid "Save {0} profile"
msgstr ""
-msgid "Add setting"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
+
+msgid "Choose profile file"
msgstr ""
msgid "Change list setting"
@@ -9589,6 +9813,39 @@ msgstr ""
msgid "Entry {0}"
msgstr ""
+msgid "Select Setting Type:"
+msgstr ""
+
+msgid "Simple"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "List of lists"
+msgstr ""
+
+msgid "List of maps"
+msgstr ""
+
+msgid "Add setting"
+msgstr ""
+
+msgid "Advanced Background: Changed"
+msgstr ""
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr ""
+
+msgid "Default value is ''{0}''."
+msgstr ""
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr ""
+
msgid "Change string setting"
msgstr ""
@@ -9645,6 +9902,9 @@ msgstr ""
msgid "Draw inactive layers in other color"
msgstr ""
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr ""
@@ -9698,6 +9958,11 @@ msgid ""
"in the selected style."
msgstr ""
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr ""
@@ -9979,7 +10244,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10148,6 +10419,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr ""
@@ -10211,7 +10488,7 @@ msgstr ""
msgid "Settings for the map projection and data interpretation."
msgstr ""
-msgid "Warning: Could not read tagging preset source: {0}"
+msgid "Could not read tagging preset source: {0}"
msgstr ""
msgid ""
@@ -10469,40 +10746,40 @@ msgstr ""
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr ""
-msgid "UTM"
+msgid "Guadeloupe Fort-Marigot 1949"
msgstr ""
-msgid "UTM Zone"
+msgid "Guadeloupe Ste-Anne 1948"
msgstr ""
-msgid "North"
+msgid "Martinique Fort Desaix 1952"
msgstr ""
-msgid "South"
+msgid "Reunion RGR92"
msgstr ""
-msgid "Hemisphere"
+msgid "Guyane RGFG95"
msgstr ""
-msgid "Guadeloupe Fort-Marigot 1949"
+msgid "UTM France (DOM)"
msgstr ""
-msgid "Guadeloupe Ste-Anne 1948"
+msgid "UTM Geodesic system"
msgstr ""
-msgid "Martinique Fort Desaix 1952"
+msgid "UTM"
msgstr ""
-msgid "Reunion RGR92"
+msgid "UTM Zone"
msgstr ""
-msgid "Guyane RGFG95"
+msgid "North"
msgstr ""
-msgid "UTM France (DOM)"
+msgid "South"
msgstr ""
-msgid "UTM Geodesic system"
+msgid "Hemisphere"
msgstr ""
msgid "Testing OSM API URL ''{0}''"
@@ -10555,8 +10832,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr ""
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10565,20 +10842,25 @@ msgstr ""
msgid "OSM password:"
msgstr ""
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgid "Failed to retrieve OSM credentials from credential manager."
msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr ""
-msgid "Warning: failed to save OSM credentials to credential manager."
+msgid "Failed to save OSM credentials to credential manager."
msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgid "Failed to store OAuth Access Token to credentials manager"
msgstr ""
msgid ""
@@ -10660,14 +10942,8 @@ msgid "Use a SOCKS proxy"
msgstr ""
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "no modifier"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
msgstr ""
msgid "Shortcut Background: User"
@@ -10711,31 +10987,36 @@ msgstr ""
msgid "Add a new tag"
msgstr ""
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
+msgid "Use preset ''{0}'' of group ''{1}''"
msgstr ""
-msgid "{0}:"
+msgid "Use preset ''{0}''"
msgstr ""
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
+msgid "Elements of type {0} are supported."
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Nothing selected!"
msgstr ""
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
+msgid "Selection unsuitable!"
msgstr ""
-msgid "More information about this feature"
+msgid "Apply Preset"
+msgstr ""
+
+msgid "New relation"
+msgstr ""
+
+msgid "Change Tags"
msgstr ""
msgid "Unknown requisite: {0}"
@@ -10744,6 +11025,9 @@ msgstr ""
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr ""
+
msgid "Available roles"
msgstr ""
@@ -10759,57 +11043,59 @@ msgstr ""
msgid "Optional Attributes:"
msgstr ""
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
-
-msgid "Use preset ''{0}''"
+msgid "Select auto-increment of {0} for this field"
msgstr ""
-msgid "Unknown type: {0}"
+msgid "Cancel auto-increment for this field"
msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
msgstr ""
-msgid "Preset sub element without parent"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
msgstr ""
-msgid "Could not read tagging preset source: {0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
msgstr ""
-msgid "Error parsing {0}: "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
msgstr ""
-msgid "Elements of type {0} are supported."
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
msgstr ""
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Nothing selected!"
+msgid "Unknown type: {0}"
msgstr ""
-msgid "Selection unsuitable!"
+msgid "Preset group {1} / {0}"
msgstr ""
-msgid "Apply Preset"
+msgid "Preset group {0}"
msgstr ""
-msgid "New relation"
+msgid "Roles cannot appear more than once"
msgstr ""
-msgid "Change Properties"
+msgid "Preset role element without parent"
msgstr ""
-msgid "Preset group {1} / {0}"
+msgid "Preset sub element without parent"
msgstr ""
-msgid "Preset group {0}"
+msgid "Error parsing {0}: "
msgstr ""
msgid "Search preset"
@@ -10827,6 +11113,14 @@ msgstr ""
msgid "Search in tags"
msgstr ""
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+
+msgid "Adjustable {0} not registered yet."
+msgstr ""
+
msgid "All files (*.*)"
msgstr ""
@@ -10856,6 +11150,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr ""
+msgid "false: the property is explicitly switched off"
+msgstr ""
+
+msgid "true: the property is explicitly switched on"
+msgstr ""
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr ""
+
+msgid "unset: do not set this property on the selected objects"
+msgstr ""
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr ""
@@ -10886,7 +11223,7 @@ msgid "Contacting OSM Server..."
msgstr "Đang kết nối đến máy chủ OSM..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
msgstr ""
@@ -10926,28 +11263,26 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr ""
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
msgid "Parsing response from server..."
@@ -11046,6 +11381,9 @@ msgstr ""
msgid "Parse error: invalid document structure for GPX document."
msgstr ""
+msgid "(at line {0}, column {1})"
+msgstr ""
+
msgid "Unknown mode {0}."
msgstr ""
@@ -11061,12 +11399,20 @@ msgstr ""
msgid "No image files found."
msgstr ""
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr ""
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
msgstr ""
msgid "Failed to rename file {0} to {1}."
@@ -11145,8 +11491,8 @@ msgstr ""
msgid "Zero coordinates: {0}"
msgstr ""
-msgid "NMEA import success"
-msgstr "Nhập NMEA thành công"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr ""
@@ -11244,35 +11590,11 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr ""
-
msgid "Unsupported version: {0}"
msgstr ""
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr ""
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr ""
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
msgstr ""
@@ -11282,8 +11604,8 @@ msgid ""
msgstr ""
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
msgstr ""
msgid "Parsing changeset content ..."
@@ -11310,10 +11632,7 @@ msgstr ""
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr ""
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr ""
-
-msgid "(at line {0}, column {1})"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
@@ -11324,9 +11643,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr ""
-msgid "Could not back up file. Exception is: {0}"
-msgstr ""
-
msgid "OSM Server Files gzip compressed"
msgstr ""
@@ -11348,6 +11664,9 @@ msgstr ""
msgid "Open OSM file"
msgstr ""
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11397,8 +11716,8 @@ msgid ""
msgstr ""
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
@@ -11541,6 +11860,9 @@ msgstr ""
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr ""
@@ -11559,6 +11881,15 @@ msgstr ""
msgid "Assume"
msgstr ""
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr ""
@@ -11583,16 +11914,19 @@ msgstr ""
msgid "Read protocol version"
msgstr ""
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
msgstr ""
-msgid "Remote Control has been asked to create a new node."
+msgid "RemoteControl::Accepting connections on port {0}"
msgstr ""
-msgid "There is no layer opened to add node"
+msgid "RemoteControl::Server stopped."
msgstr ""
-msgid "Add way"
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
+msgid "There is no layer opened to add node"
msgstr ""
msgid "Remote Control has been asked to create a new way."
@@ -11604,6 +11938,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr ""
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11618,6 +11960,15 @@ msgstr ""
msgid "Remote Control has been asked to load data from the API."
msgstr ""
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11648,19 +11999,19 @@ msgstr ""
msgid "local file"
msgstr ""
-msgid "Link to a OSM data file on your local disk."
+msgid "Link to a GPX file on your local disk."
msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
+msgid "Include GPX data in the .joz session file."
msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
+msgid "GPX data will be included in the session file."
msgstr ""
msgid ""
@@ -11682,11 +12033,23 @@ msgstr ""
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr ""
+
+msgid "Include OSM data in the .joz session file."
+msgstr ""
+
+msgid "OSM data will be included in the session file."
+msgstr ""
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr ""
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11756,13 +12119,13 @@ msgid "Download skipped"
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
msgstr ""
msgid "Failed to create plugin directory ''{0}''"
@@ -11905,10 +12268,10 @@ msgstr[1] ""
msgid "Plugin update failed"
msgstr ""
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
+msgid "Failed to download plugin information list"
msgstr ""
msgid "Disable plugin"
@@ -11923,22 +12286,21 @@ msgstr ""
msgid "Click to keep the plugin ''{0}''"
msgstr ""
-msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgid "Failed to delete outdated plugin ''{0}''."
msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
msgstr ""
msgid "Click to disable the plugin ''{0}''"
@@ -12007,8 +12369,7 @@ msgstr ""
msgid "Processing file ''{0}''"
msgstr ""
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
msgstr ""
msgid "Processing plugin site cache icon files..."
@@ -12023,9 +12384,24 @@ msgstr ""
msgid "Downloading plugin list from ''{0}''"
msgstr ""
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
@@ -12347,17 +12723,11 @@ msgstr ""
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
msgstr ""
msgid "{0}... [please type its number]"
@@ -12368,9 +12738,52 @@ msgid ""
"platform first."
msgstr ""
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12402,9 +12815,23 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
+msgstr ""
+
+msgid "s"
msgstr ""
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
"geometry from preferences."
@@ -12727,6 +13154,11 @@ msgid "Saturation:"
msgstr ""
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr ""
@@ -12806,6 +13238,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr ""
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12907,9 +13343,6 @@ msgstr ""
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr ""
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr ""
@@ -12965,6 +13398,9 @@ msgid ""
"right click menu of the image layer."
msgstr ""
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -12989,9 +13425,6 @@ msgstr ""
msgid "Relation and multipolygon creating and editing panel."
msgstr ""
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr ""
@@ -13017,9 +13450,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr ""
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13056,6 +13486,11 @@ msgid ""
"to be running."
msgstr ""
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr ""
@@ -13102,9 +13537,6 @@ msgid ""
"behind."
msgstr ""
-msgid "Highways"
-msgstr ""
-
msgid "Streets"
msgstr ""
@@ -13189,6 +13621,9 @@ msgstr ""
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr ""
+
msgid "Motorway Link"
msgstr ""
@@ -13279,6 +13714,50 @@ msgstr ""
msgid "Edit Residential Street"
msgstr ""
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr ""
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr ""
+
+msgid "no"
+msgstr ""
+
+msgid "destination"
+msgstr ""
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr ""
@@ -13297,10 +13776,10 @@ msgstr ""
msgid "Service"
msgstr ""
-msgid "Edit Serviceway"
+msgid "Edit Service Way"
msgstr ""
-msgid "Serviceway type"
+msgid "Service way type"
msgstr ""
msgid "alley"
@@ -13312,6 +13791,9 @@ msgstr ""
msgid "parking_aisle"
msgstr ""
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr ""
@@ -13339,18 +13821,12 @@ msgstr ""
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr ""
-
msgid "Road Restrictions"
msgstr ""
msgid "Edit Road Restrictions"
msgstr ""
-msgid "Toll"
-msgstr ""
-
msgid "No exit (cul-de-sac)"
msgstr ""
@@ -13360,9 +13836,6 @@ msgstr ""
msgid "General Access"
msgstr ""
-msgid "destination"
-msgstr ""
-
msgid "delivery"
msgstr ""
@@ -13372,13 +13845,13 @@ msgstr ""
msgid "private"
msgstr ""
-msgid "agricultural"
+msgid "customers"
msgstr ""
-msgid "forestry"
+msgid "agricultural"
msgstr ""
-msgid "no"
+msgid "forestry"
msgstr ""
msgid "official"
@@ -13426,6 +13899,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr ""
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr ""
@@ -13510,6 +13986,9 @@ msgstr ""
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13614,21 +14093,30 @@ msgstr ""
msgid "Visibility"
msgstr ""
+msgctxt "trail_visibility"
msgid "excellent"
msgstr ""
+msgctxt "trail_visibility"
msgid "good"
msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
msgstr ""
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
+
msgid "Wheelchairs"
msgstr ""
@@ -13644,10 +14132,10 @@ msgstr ""
msgid "Edit Bridleway"
msgstr ""
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13683,7 +14171,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13752,12 +14240,18 @@ msgstr ""
msgid "Edit Rest Area"
msgstr ""
-msgid "Emergency Phone"
+msgid "Drinking Water"
msgstr ""
msgid "Traffic Signal"
msgstr ""
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr ""
@@ -13773,15 +14267,6 @@ msgstr ""
msgid "unmarked"
msgstr ""
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr ""
-
-msgid "Crossing attendant"
-msgstr ""
-
msgid "Crossing type name (UK)"
msgstr ""
@@ -13803,6 +14288,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr ""
+
+msgid "Cross by bicycle"
+msgstr ""
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr ""
@@ -13812,6 +14306,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr ""
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr ""
@@ -13821,10 +14318,7 @@ msgstr ""
msgid "Pedestrian Crossing"
msgstr ""
-msgid "Edit Crossing"
-msgstr ""
-
-msgid "Type name (UK)"
+msgid "Edit Pedestrian Crossing"
msgstr ""
msgid "Traffic Calming"
@@ -13857,9 +14351,6 @@ msgstr ""
msgid "Passing Place"
msgstr ""
-msgid "Edit Passing Place"
-msgstr ""
-
msgid "Turning Circle"
msgstr ""
@@ -13893,19 +14384,43 @@ msgstr ""
msgid "Barriers"
msgstr ""
+msgid "Block"
+msgstr ""
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr ""
+
+msgid "Material"
+msgstr ""
+
+msgid "stone"
+msgstr ""
+
msgid "Bollard"
msgstr ""
msgid "Edit Bollard"
msgstr ""
-msgid "Allowed traffic:"
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
msgstr ""
msgid "Cycle Barrier"
msgstr ""
-msgid "Block"
+msgid "Edit Cycle Barrier"
msgstr ""
msgid "Cattle Grid"
@@ -13917,6 +14432,9 @@ msgstr ""
msgid "Bus Trap"
msgstr ""
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr ""
@@ -13938,43 +14456,87 @@ msgstr ""
msgid "Hedge"
msgstr ""
-msgid "Fence"
+msgid "Edit Hedge"
msgstr ""
-msgid "barbed_wire"
+msgid "Height (meters)"
msgstr ""
-msgid "chain"
+msgid "Genus"
msgstr ""
-msgid "electric"
+msgid "Species"
msgstr ""
-msgid "hedge"
+msgid "Taxon"
msgstr ""
-msgid "pole"
+msgid "Fence"
msgstr ""
-msgid "split_rail"
+msgid "Edit Fence"
msgstr ""
-msgid "Wall"
+msgid "barbed_wire"
msgstr ""
-msgid "City Wall"
+msgid "chain_link"
msgstr ""
-msgid "Retaining Wall"
+msgid "electric"
msgstr ""
-msgid "Ditch"
+msgid "pole"
msgstr ""
-msgid "Entrance"
+msgid "split_rail"
msgstr ""
-msgid "Edit Entrance"
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
+msgid "Wall"
+msgstr ""
+
+msgid "Edit Wall"
+msgstr ""
+
+msgid "City Wall"
+msgstr ""
+
+msgid "Edit City Wall"
+msgstr ""
+
+msgid "Retaining Wall"
+msgstr ""
+
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Ditch"
+msgstr ""
+
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
+
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
msgstr ""
msgid "Gate"
@@ -14007,12 +14569,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr ""
msgid "Edit Stile"
msgstr ""
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr ""
@@ -14070,6 +14647,9 @@ msgstr ""
msgid "Edit Drain"
msgstr ""
+msgid "Ditch"
+msgstr ""
+
msgid "Edit Ditch"
msgstr ""
@@ -14079,6 +14659,12 @@ msgstr ""
msgid "Edit Stream"
msgstr ""
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr ""
@@ -14118,9 +14704,6 @@ msgstr ""
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14154,6 +14737,21 @@ msgstr ""
msgid "Edit Water"
msgstr ""
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr ""
@@ -14235,18 +14833,23 @@ msgstr ""
msgid "Cargo"
msgstr ""
+msgctxt "cargo"
msgid "passengers"
msgstr ""
+msgctxt "cargo"
msgid "vehicle"
msgstr ""
+msgctxt "cargo"
msgid "bicycle"
msgstr ""
+msgctxt "cargo"
msgid "hgv"
msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
msgstr ""
@@ -14319,7 +14922,10 @@ msgstr ""
msgid "tourism"
msgstr ""
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14343,10 +14949,13 @@ msgstr ""
msgid "rail"
msgstr ""
-msgid "Voltage"
+msgid "Voltage in Volts (V)"
+msgstr ""
+
+msgid "Frequency in Hertz (Hz)"
msgstr ""
-msgid "Frequency (Hz)"
+msgid "16.67"
msgstr ""
msgid "16.7"
@@ -14358,9 +14967,6 @@ msgstr ""
msgid "Edit Narrow Gauge Rail"
msgstr ""
-msgid "Types"
-msgstr ""
-
msgid "Monorail"
msgstr ""
@@ -14403,18 +15009,56 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr ""
-msgid "Optional Types"
+msgid "Abandoned Rail"
msgstr ""
-msgid "Abandoned Rail"
+msgid "Edit Abandoned Railway"
msgstr ""
msgid "Level Crossing"
msgstr ""
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr ""
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr ""
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr ""
@@ -14514,11 +15158,9 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
msgstr ""
@@ -14530,11 +15172,9 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr ""
-msgctxt "aerialway"
msgid "Pylon"
msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
msgstr ""
@@ -14553,10 +15193,10 @@ msgstr ""
msgid "underground"
msgstr ""
-msgid "Access"
+msgid "rooftop"
msgstr ""
-msgid "customers"
+msgid "Access"
msgstr ""
msgid "Park and Ride"
@@ -14586,9 +15226,6 @@ msgstr ""
msgid "Edit Parking space"
msgstr ""
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr ""
@@ -14604,19 +15241,35 @@ msgstr ""
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr ""
-
msgid "Opening Hours"
msgstr ""
msgid "24/7"
msgstr ""
-msgid "Mo-Fr 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
msgstr ""
msgid "Parking entrance"
@@ -14766,6 +15419,9 @@ msgstr ""
msgid "Edit Charging Station (for electric cars)"
msgstr ""
+msgid "Voltage"
+msgstr ""
+
msgid "Amperage"
msgstr ""
@@ -14787,6 +15443,12 @@ msgstr ""
msgid "Edit Car Repair"
msgstr ""
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr ""
@@ -14814,6 +15476,12 @@ msgstr ""
msgid "Edit Car Rental"
msgstr ""
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr ""
@@ -14838,22 +15506,6 @@ msgstr ""
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr ""
-
msgid "brand"
msgstr ""
@@ -14875,9 +15527,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr ""
@@ -14941,7 +15590,7 @@ msgstr ""
msgid "Public Transport"
msgstr ""
-msgid "Route"
+msgid "Public transport route"
msgstr ""
msgid "Edit Route"
@@ -15072,6 +15721,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15102,6 +15754,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr ""
@@ -15114,9 +15769,6 @@ msgstr ""
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15126,9 +15778,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr ""
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
msgid "Building"
msgstr ""
@@ -15141,6 +15798,9 @@ msgstr ""
msgid "Ticket Machine"
msgstr ""
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15165,14 +15825,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr ""
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr ""
-
msgid "UIC-Reference"
msgstr ""
@@ -15221,7 +15873,7 @@ msgstr ""
msgid "Taxi"
msgstr ""
-msgid "Edit Taxi station"
+msgid "Edit Taxi Station"
msgstr ""
msgid "Airport"
@@ -15275,41 +15927,41 @@ msgstr ""
msgid "Edit Terminal"
msgstr ""
-msgctxt "airport"
-msgid "Gate"
+msgid "Internet access"
msgstr ""
-msgid "Edit Terminal Gate"
+msgid "wlan"
msgstr ""
-msgid "Facilities"
+msgid "wired"
msgstr ""
-msgid "Accommodation"
+msgid "terminal"
msgstr ""
-msgid "Hotel"
+msgid "Internet access fee"
msgstr ""
-msgid "Edit Hotel"
+msgctxt "airport"
+msgid "Gate"
msgstr ""
-msgid "Stars"
+msgid "Edit Terminal Gate"
msgstr ""
-msgid "Internet access"
+msgid "Facilities"
msgstr ""
-msgid "wlan"
+msgid "Accommodation"
msgstr ""
-msgid "wired"
+msgid "Hotel"
msgstr ""
-msgid "terminal"
+msgid "Edit Hotel"
msgstr ""
-msgid "Internet access fee"
+msgid "Stars"
msgstr ""
msgid "Smoking"
@@ -15495,6 +16147,12 @@ msgstr ""
msgid "Edit Nightclub"
msgstr ""
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr ""
@@ -15516,9 +16174,15 @@ msgstr ""
msgid "Information Office"
msgstr ""
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr ""
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15531,6 +16195,9 @@ msgstr ""
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr ""
@@ -15570,6 +16237,9 @@ msgstr ""
msgid "Information Board"
msgstr ""
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr ""
@@ -15591,22 +16261,34 @@ msgstr ""
msgid "Guidepost"
msgstr ""
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr ""
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr ""
msgid "Phone number"
msgstr ""
-msgid "Other Information Points"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
msgstr ""
msgid "Leisure"
@@ -15630,9 +16312,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr ""
@@ -15657,7 +16336,16 @@ msgstr ""
msgid "Edit Sauna"
msgstr ""
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
msgstr ""
msgid "Playground"
@@ -15730,64 +16418,64 @@ msgstr ""
msgid "Edit Artwork"
msgstr ""
-msgid "Place of Worship"
+msgid "Recording Studio"
msgstr ""
-msgid "Edit Place of Worship"
+msgid "Edit Studio"
msgstr ""
-msgid "Religion"
+msgid "audio"
msgstr ""
-msgid "bahai"
+msgid "video"
msgstr ""
-msgid "buddhist"
+msgid "Place of Worship"
msgstr ""
-msgid "christian"
+msgid "Church"
+msgstr "Nhà thờ"
+
+msgid "Edit Church"
msgstr ""
-msgid "hindu"
+msgid "Building type"
msgstr ""
-msgid "jain"
+msgid "basilica"
msgstr ""
-msgid "jewish"
+msgid "cathedral"
msgstr ""
-msgid "muslim"
+msgid "chapel"
msgstr ""
-msgid "sikh"
+msgid "church"
msgstr ""
-msgid "spiritualist"
+msgid "temple"
msgstr ""
-msgid "taoist"
+msgid "Denomination"
msgstr ""
-msgid "unitarian"
+msgid "anglican"
msgstr ""
-msgid "zoroastrian"
-msgstr ""
-
-msgid "Denomination"
+msgid "baptist"
msgstr ""
-msgid "anglican"
+msgid "catholic"
msgstr ""
-msgid "baptist"
+msgid "evangelical"
msgstr ""
-msgid "catholic"
+msgid "greek_catholic"
msgstr ""
-msgid "evangelical"
+msgid "greek_orthodox"
msgstr ""
msgid "jehovahs_witness"
@@ -15802,6 +16490,9 @@ msgstr ""
msgid "mormon"
msgstr ""
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr ""
@@ -15817,37 +16508,140 @@ msgstr ""
msgid "quaker"
msgstr ""
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr ""
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr ""
msgid "sunni"
msgstr ""
-msgid "Service Times"
+msgid "Synagogue"
msgstr ""
-msgid "Su 10:00"
+msgid "Edit Synagogue"
msgstr ""
-msgid "Su 10:30"
+msgid "synagogue"
msgstr ""
-msgid "Su 11:00"
+msgid "conservative"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "reform"
msgstr ""
-msgid "Recording Studio"
+msgid "Buddhist Temple"
msgstr ""
-msgid "Edit Studio"
+msgid "Edit Buddhist Temple"
msgstr ""
-msgid "audio"
+msgid "theravada"
msgstr ""
-msgid "video"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr ""
+
+msgid "bahai"
+msgstr ""
+
+msgid "jain"
+msgstr ""
+
+msgid "sikh"
+msgstr ""
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr ""
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
msgstr ""
msgid "Public Building"
@@ -15937,6 +16731,12 @@ msgstr ""
msgid "License Classes"
msgstr ""
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr ""
@@ -15946,6 +16746,12 @@ msgstr ""
msgid "Edit Hospital"
msgstr ""
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr ""
@@ -16012,12 +16818,66 @@ msgstr ""
msgid "Edit Veterinary"
msgstr ""
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr ""
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr ""
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr ""
@@ -16027,6 +16887,30 @@ msgstr ""
msgid "Telephone cards"
msgstr ""
+msgid "Emergency Phone"
+msgstr ""
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr ""
@@ -16036,31 +16920,37 @@ msgstr ""
msgid "Display"
msgstr ""
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr ""
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr ""
@@ -16088,7 +16978,7 @@ msgstr ""
msgid "Recycling"
msgstr ""
-msgid "Edit Recycling station"
+msgid "Edit Recycling Station"
msgstr ""
msgid "Batteries"
@@ -16115,27 +17005,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr ""
-
-msgid "stone"
-msgstr ""
-
-msgid "plastic"
-msgstr ""
-
msgid "Amount of Seats"
msgstr ""
@@ -16170,12 +17048,15 @@ msgstr ""
msgid "Height"
msgstr ""
+msgctxt "height"
msgid "low"
msgstr ""
+msgctxt "height"
msgid "half"
msgstr ""
+msgctxt "height"
msgid "full"
msgstr ""
@@ -16185,10 +17066,10 @@ msgstr ""
msgid "Lock"
msgstr ""
-msgid "Drinking Water"
+msgid "Edit Source of Potable Water"
msgstr ""
-msgid "Edit Drinking Water"
+msgid "Indoor"
msgstr ""
msgid "Fire Hydrant"
@@ -16216,6 +17097,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16253,117 +17137,153 @@ msgstr ""
msgid "Edit Stadium"
msgstr ""
-msgid "select sport:"
+msgid "Select sport:"
msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr ""
+msgctxt "sport"
msgid "multi"
msgstr ""
+msgctxt "sport"
msgid "archery"
msgstr ""
+msgctxt "sport"
msgid "athletics"
msgstr ""
+msgctxt "sport"
msgid "american_football"
msgstr ""
+msgctxt "sport"
msgid "australian_football"
msgstr ""
+msgctxt "sport"
msgid "baseball"
msgstr ""
+msgctxt "sport"
msgid "basketball"
msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
msgstr ""
+msgctxt "sport"
msgid "canadian_football"
msgstr ""
+msgctxt "sport"
msgid "canoe"
msgstr ""
+msgctxt "sport"
msgid "climbing"
msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
msgstr ""
+msgctxt "sport"
msgid "cycling"
msgstr ""
+msgctxt "sport"
msgid "dog_racing"
msgstr ""
+msgctxt "sport"
msgid "equestrian"
msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
msgstr ""
+msgctxt "sport"
msgid "gymnastics"
msgstr ""
+msgctxt "sport"
msgid "hockey"
msgstr ""
+msgctxt "sport"
msgid "horse_racing"
msgstr ""
+msgctxt "sport"
msgid "motor"
msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
msgstr ""
+msgctxt "sport"
msgid "soccer"
msgstr ""
+msgctxt "sport"
msgid "swimming"
msgstr ""
+msgctxt "sport"
msgid "table_tennis"
msgstr ""
+msgctxt "sport"
msgid "tennis"
msgstr ""
@@ -16397,33 +17317,43 @@ msgstr ""
msgid "Edit Miniature Golf"
msgstr ""
-msgid "Sport"
-msgstr ""
-
msgid "Multi"
msgstr ""
msgid "Edit Multi"
msgstr ""
-msgid "type"
-msgstr ""
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
msgstr ""
+msgctxt "running"
msgid "stadium"
msgstr ""
+msgctxt "running"
+msgid "track"
+msgstr ""
+
msgid "9pin"
msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr ""
+
+msgid "stadium"
+msgstr ""
+
msgid "10pin"
msgstr ""
@@ -16457,6 +17387,22 @@ msgstr ""
msgid "Edit Cycling"
msgstr ""
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr ""
@@ -16469,7 +17415,32 @@ msgstr ""
msgid "Edit Equestrian"
msgstr ""
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16532,36 +17503,54 @@ msgstr ""
msgid "Difficulty"
msgstr ""
+msgctxt "piste:difficulty"
msgid "novice"
msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16604,19 +17593,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16755,6 +17740,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16767,60 +17764,134 @@ msgstr ""
msgid "Edit Building"
msgstr ""
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
msgstr ""
+msgctxt "building"
msgid "garage"
msgstr ""
-msgid "church"
+msgctxt "building"
+msgid "garages"
msgstr ""
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
+msgctxt "building"
msgid "school"
msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
msgstr ""
+msgctxt "building"
msgid "university"
msgstr ""
-msgid "Residential Building"
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
+
+msgid "Residential Building"
msgstr ""
msgid "Edit Residential Building"
msgstr ""
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr ""
+
+msgid "Edit Entrance"
+msgstr ""
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr ""
@@ -16836,9 +17907,6 @@ msgstr ""
msgid "observation"
msgstr ""
-msgid "Height (meters)"
-msgstr ""
-
msgid "Flagpole"
msgstr ""
@@ -17048,41 +18116,67 @@ msgstr ""
msgid "Mo-Fr 22:00-05:00"
msgstr ""
-msgid "Measurement Station"
+msgid "Monitoring Station"
msgstr ""
-msgid "Edit Measurement Station"
+msgid "Edit Monitoring Station"
msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
+msgid "Traffic"
msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
+msgid "Noise"
msgstr ""
-msgid "automated"
+msgid "GPS Signals"
msgstr ""
-msgid "remote"
+msgid "GLONASS Signals"
msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17091,7 +18185,7 @@ msgstr ""
msgid "Edit Survey Point"
msgstr ""
-msgid "Surveillance"
+msgid "Surveillance Camera"
msgstr ""
msgid "Edit Surveillance Camera"
@@ -17103,12 +18197,102 @@ msgstr ""
msgid "outdoor"
msgstr ""
-msgid "public"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr ""
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
msgstr ""
msgid "Power"
msgstr ""
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
msgstr ""
@@ -17160,88 +18344,191 @@ msgstr ""
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr ""
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
msgstr ""
-msgid "battery charging"
+msgid "Boiling Water Reactor 3 (BWR-3)"
msgstr ""
-msgid "Power Station"
+msgid "Boiling Water Reactor 4 (BWR-4)"
msgstr ""
-msgid "Edit Power Station"
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
msgstr ""
msgid "Power Sub Station"
@@ -17253,6 +18540,21 @@ msgstr ""
msgid "Line reference"
msgstr ""
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr ""
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr ""
@@ -17268,6 +18570,9 @@ msgstr ""
msgid "Tower reference"
msgstr ""
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr ""
@@ -17286,11 +18591,9 @@ msgstr ""
msgid "Line type"
msgstr ""
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17399,10 +18702,10 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
+msgid "Bakery"
msgstr ""
-msgid "Edit Baker"
+msgid "Edit Bakery"
msgstr ""
msgid "Butcher"
@@ -17414,7 +18717,7 @@ msgstr ""
msgid "Seafood"
msgstr ""
-msgid "Edit Seafood"
+msgid "Edit Seafood Shop"
msgstr ""
msgid "Deli (Fine Food)"
@@ -17435,13 +18738,19 @@ msgstr ""
msgid "Edit Marketplace"
msgstr ""
+msgid "Organic"
+msgstr ""
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
msgstr ""
msgid "Edit Organic/Bio"
@@ -17513,7 +18822,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17534,13 +18843,13 @@ msgstr ""
msgid "Mobile Phone"
msgstr ""
-msgid "Edit Mobile Phone"
+msgid "Edit Mobile Phone Shop"
msgstr ""
msgid "Vacuum Cleaner"
msgstr ""
-msgid "Edit Vacuum Cleaner"
+msgid "Edit Vacuum Cleaner Shop"
msgstr ""
msgid "Hifi"
@@ -17549,7 +18858,6 @@ msgstr ""
msgid "Edit Hifi Shop"
msgstr ""
-msgctxt "shop"
msgid "Video"
msgstr ""
@@ -17577,6 +18885,12 @@ msgstr ""
msgid "Edit Automated Teller Machine"
msgstr ""
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr ""
@@ -17613,10 +18927,31 @@ msgstr ""
msgid "Edit Jewelry"
msgstr ""
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr ""
+
+msgid "christian"
+msgstr ""
+
+msgid "hindu"
+msgstr ""
+
+msgid "jewish"
+msgstr ""
+
+msgid "muslim"
+msgstr ""
+
msgid "Erotic"
msgstr ""
-msgid "Edit Erotic"
+msgid "Edit Erotic Shop"
msgstr ""
msgid "Florist"
@@ -17646,7 +18981,7 @@ msgstr ""
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17658,19 +18993,19 @@ msgstr ""
msgid "Kitchen"
msgstr ""
-msgid "Edit Kitchen"
+msgid "Edit Kitchen Store"
msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17691,6 +19026,12 @@ msgstr ""
msgid "Edit Book Store"
msgstr ""
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr ""
@@ -17700,7 +19041,7 @@ msgstr ""
msgid "Musical Instrument"
msgstr ""
-msgid "Edit Musical Instruments"
+msgid "Edit Musical Instruments Shop"
msgstr ""
msgid "Toys"
@@ -17781,6 +19122,9 @@ msgstr ""
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr ""
@@ -17910,6 +19254,12 @@ msgstr ""
msgid "Edit Peak"
msgstr ""
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr ""
@@ -17949,24 +19299,33 @@ msgstr ""
msgid "Edit Tree"
msgstr ""
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr ""
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr ""
msgid "Edit Wood"
msgstr ""
-msgctxt "wood"
msgid "coniferous"
msgstr ""
-msgctxt "wood"
msgid "deciduous"
msgstr ""
-msgctxt "wood"
msgid "mixed"
msgstr ""
@@ -17976,15 +19335,6 @@ msgstr ""
msgid "Edit Forest Landuse"
msgstr ""
-msgid "coniferous"
-msgstr ""
-
-msgid "deciduous"
-msgstr ""
-
-msgid "mixed"
-msgstr ""
-
msgid "Grassland"
msgstr ""
@@ -18060,6 +19410,12 @@ msgstr ""
msgid "Edit Meadow Landuse"
msgstr ""
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18114,7 +19470,7 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
+msgid "Residential Area"
msgstr ""
msgid "Edit Residential Landuse"
@@ -18126,6 +19482,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18201,46 +19560,49 @@ msgstr ""
msgid "Annotation"
msgstr ""
-msgid "Edit Address Information"
+msgid "Edit Name Information"
msgstr ""
-msgid "House number"
+msgid "Alternative name"
msgstr ""
-msgid "House name"
+msgid "Historical name"
msgstr ""
-msgid "Street name"
+msgid "Local name"
msgstr ""
-msgid "City name"
+msgid "Regional name"
msgstr ""
-msgid "Country code"
+msgid "National name"
msgstr ""
-msgid "AT"
+msgid "International name"
msgstr ""
-msgid "CH"
+msgid "Official name"
msgstr ""
-msgid "DE"
+msgid "Common name abbreviation"
msgstr ""
-msgid "FR"
+msgid "Edit Address Information"
msgstr ""
-msgid "GB"
+msgid "House number"
msgstr ""
-msgid "IT"
+msgid "House name"
msgstr ""
-msgid "RS"
+msgid "Street name"
msgstr ""
-msgid "US"
+msgid "City name"
+msgstr ""
+
+msgid "Country code"
msgstr ""
msgid "Address Interpolation"
@@ -18261,6 +19623,18 @@ msgstr ""
msgid "alphabetic"
msgstr ""
+msgid "Accuracy"
+msgstr ""
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr ""
@@ -18423,27 +19797,56 @@ msgstr ""
msgid "traffic light or barrier that stops you"
msgstr ""
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
msgstr ""
+msgctxt "route type"
msgid "hiking"
msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18489,19 +19892,22 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
+msgid "Route Network"
msgstr ""
-msgid "Edit route network"
+msgid "Edit Route Network"
msgstr ""
msgid "member"
msgstr ""
-msgid "Associated street"
+msgid "Associated Street"
msgstr ""
-msgid "Edit associated street"
+msgid "Edit Associated Street"
+msgstr ""
+
+msgid "house"
msgstr ""
msgid "Street"
@@ -18525,7 +19931,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18621,18 +20027,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr ""
msgid "deprecated"
msgstr ""
+msgid "bicycle"
+msgstr ""
+
+msgid "foot"
+msgstr ""
+
msgid "horse"
msgstr ""
@@ -18642,7 +20057,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18651,10 +20069,10 @@ msgstr ""
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
+msgid "emergency.access.point"
msgstr ""
msgid "riverbank"
@@ -18672,6 +20090,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18687,28 +20108,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18729,19 +20150,19 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr ""
-msgid "shop"
+msgid "office"
msgstr ""
msgid "hotel"
@@ -18807,9 +20228,6 @@ msgstr ""
msgid "woodarea"
msgstr ""
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr ""
@@ -18819,10 +20237,13 @@ msgstr ""
msgid "boundary"
msgstr ""
+msgid "sport"
+msgstr ""
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18837,9 +20258,6 @@ msgstr "Làng/Thành phố"
msgid "One Way"
msgstr "Một chiều"
-msgid "Church"
-msgstr "Nhà thờ"
-
msgid "Fuel Station"
msgstr "Trạm xăng"
@@ -18867,6 +20285,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18912,10 +20333,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18927,7 +20378,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -18945,7 +20396,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19062,19 +20513,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:maxaxleload without maxaxleload"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:surface without surface"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:bridge without bridge"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:old_name without old_name"
+msgstr ""
+
+msgid "source:bicycle without bicycle"
+msgstr ""
+
+msgid "source:designation without designation"
+msgstr ""
+
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19093,13 +20655,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Ảnh vệ tinh Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19108,19 +20706,28 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
@@ -19135,142 +20742,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
msgstr ""
-msgid "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19309,148 +20965,211 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
+msgid "Catastro Spain"
+msgstr ""
+
+msgid "PNOA Spain"
+msgstr ""
+
+msgid "SIGPAC Spain"
+msgstr ""
+
+msgid "GRAFCAN - Canary Islands"
+msgstr ""
+
+msgid "ITACyL - Castile and León"
+msgstr ""
+
+msgid "IDEIB - Balearic Islands"
+msgstr ""
+
+msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgstr ""
+
+msgid "Stadt Uster Orthophoto 2008 10cm"
+msgstr ""
+
+msgid "Stadtplan Zürich"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgstr ""
+
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Canton du Jura 50cm (RCJU 1998)"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Canton de Fribourg 50cm (2005)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Stadt Bern 10cm/25cm (2008)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Cartoriviera - Orthophoto 2012"
msgstr ""
-msgid "Catastro Spain"
+msgid "SIGIP - Orthophoto 2012"
msgstr ""
-msgid "PNOA Spain"
+msgid "Lausanne - Orthophoto technique 2012"
msgstr ""
-msgid "SIGPAC Spain"
+msgid "MSR Maps Topo"
msgstr ""
-msgid "GRAFCAN - Canary Islands"
+msgid "MSR Maps Urban"
msgstr ""
-msgid "ITACyL - Castile and León"
+msgid "USGS Scanned Topographic Maps"
msgstr ""
-msgid "IDEIB - Balearic Islands"
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "ScanEx IRS"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "OSM Export"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "SUMO Export"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "Export"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "Port:"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "refresh the port list"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Configure"
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "Connection Error."
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "configure the connected DG100"
msgstr ""
-msgid "2u"
+msgid "delete data after import"
msgstr ""
msgid "Columbus V-900 CSV Files"
@@ -19654,6 +21373,18 @@ msgstr ""
msgid "Elevation Profile"
msgstr ""
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr ""
@@ -19675,13 +21406,7 @@ msgstr ""
msgid "Time"
msgstr ""
-msgid "Geoid"
-msgstr ""
-
-msgid "Automatic"
-msgstr ""
-
-msgid "Fixed value"
+msgid "Tracks"
msgstr ""
msgid "Elevation profile for track ''{0}''."
@@ -19944,9 +21669,15 @@ msgstr ""
msgid "Selects all addresses with incomplete data."
msgstr ""
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] ""
@@ -19968,6 +21699,9 @@ msgstr ""
msgid "Layer Properties"
msgstr ""
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr ""
@@ -20046,9 +21780,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr ""
@@ -20133,7 +21879,7 @@ msgstr ""
msgid "Expected even numbers for addresses"
msgstr ""
-msgid "Expected valid number for address increment"
+msgid "Expected valid number for increment"
msgstr ""
msgid "Country code must be 2 letters"
@@ -20404,15 +22150,6 @@ msgstr ""
msgid "Street Name:"
msgstr ""
-msgid "Increment"
-msgstr ""
-
-msgid "Decrement"
-msgstr ""
-
-msgid "Numbers:"
-msgstr ""
-
msgid "Big buildings mode"
msgstr ""
@@ -20583,6 +22320,9 @@ msgstr ""
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr ""
@@ -20601,12 +22341,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr ""
@@ -20742,6 +22476,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20759,6 +22496,9 @@ msgstr ""
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr ""
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr ""
@@ -20839,113 +22579,127 @@ msgid ""
"Do you want to use them ?"
msgstr ""
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
+msgid "Load layer from cache"
msgstr ""
-msgid "Image cropping"
+msgid "Load location from cache (only if cache is enabled)"
msgstr ""
-msgid "Click second corner for image cropping"
+msgid "{0} not allowed with the current projection"
msgstr ""
msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
+"Cannot load cache {0} which is not compatible with current projection zone"
msgstr ""
-msgid "Image georeferencing"
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
msgstr ""
-msgid "Click second Lambert crosspiece for georeferencing"
+msgid "The location {0} is already on screen. Cache not loaded."
msgstr ""
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
+msgid "(optional)"
msgstr ""
-msgid "Enter cadastre east,north position"
+msgid "Change location"
msgstr ""
-msgid "(Warning: verify north with arrow !!)"
+msgid "Set a new location for the next request"
msgstr ""
-msgid "East"
+msgid "Add a new municipality layer"
msgstr ""
-msgid "I use the mouse"
+msgid "Commune"
msgstr ""
-msgid "Set {0} Lambert coordinates"
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
msgstr ""
-msgid "Load layer from cache"
+msgid "Departement"
msgstr ""
-msgid "Load location from cache (only if cache is enabled)"
+msgid "<html>Departement number (optional)</html>"
msgstr ""
-msgid "{0} not allowed with the current projection"
+msgid "Add new layer"
msgstr ""
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Open Cadastre Preferences"
msgstr ""
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Refine georeferencing"
msgstr ""
-msgid "The location {0} is already on screen. Cache not loaded."
+msgid "Improve georeferencing (only raster images)"
msgstr ""
-msgid "(optional)"
+msgid "Reset cookie"
msgstr ""
-msgid "Change location"
+msgid "Get a new cookie (session timeout)"
msgstr ""
-msgid "Set a new location for the next request"
+msgid "Save image as..."
msgstr ""
-msgid "Add a new municipality layer"
+msgid "PNG files (*.png)"
msgstr ""
-msgid "Commune"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
msgstr ""
msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+"Click first corner for image cropping\n"
+"(two points required)"
msgstr ""
-msgid "Departement"
+msgid "Image cropping"
msgstr ""
-msgid "<html>Departement number (optional)</html>"
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
msgstr ""
-msgid "Add new layer"
+msgid "Image georeferencing"
msgstr ""
-msgid "Open Cadastre Preferences"
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
msgstr ""
-msgid "Reset cookie"
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
msgstr ""
-msgid "Get a new cookie (session timeout)"
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+msgid "(Warning: verify north with arrow !!)"
msgstr ""
-msgid "Save image as PNG"
+msgid "East"
msgstr ""
-msgid "PNG files (*.png)"
+msgid "I use the mouse"
+msgstr ""
+
+msgid "Set {0} Lambert coordinates"
msgstr ""
-msgid "Export as PNG format (only raster images)"
+msgid "Click second corner for image cropping"
+msgstr ""
+
+msgid "Click second Lambert crosspiece for georeferencing"
msgstr ""
msgid "Adjust WMS"
@@ -20971,7 +22725,10 @@ msgstr ""
msgid "Is not vectorized."
msgstr ""
-msgid "Raster size: {0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
msgstr ""
msgid "Is vectorized."
@@ -21021,7 +22778,7 @@ msgstr ""
msgid "Color Schemes"
msgstr ""
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21066,6 +22823,9 @@ msgstr ""
msgid "Please select 1 or more ways to download along"
msgstr ""
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr ""
@@ -21123,19 +22883,84 @@ msgstr ""
msgid "CmdLine:"
msgstr ""
-msgid "External tools"
+msgid "External tools"
+msgstr ""
+
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "New tool..."
+msgstr ""
+
+msgid "Install"
+msgstr ""
+
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
msgstr ""
-msgid "Delete tool \"{0}\"?"
+msgid "Close tab"
msgstr ""
-msgid "Are you sure?"
+msgid "Logout"
msgstr ""
-msgid "New tool..."
+msgid "Clear log"
msgstr ""
-msgid "Install"
+msgid "Show users on map"
msgstr ""
msgid "Position only"
@@ -21177,27 +23002,9 @@ msgstr ""
msgid "Unknown logFormat"
msgstr ""
-msgid "Port:"
-msgstr ""
-
-msgid "refresh the port list"
-msgstr ""
-
-msgid "Configure"
-msgstr ""
-
msgid "Configure Device"
msgstr ""
-msgid "Connection Error."
-msgstr ""
-
-msgid "configure the connected DG100"
-msgstr ""
-
-msgid "delete data after import"
-msgstr ""
-
msgid "Importing data from device."
msgstr ""
@@ -21593,6 +23400,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21840,12 +23650,6 @@ msgstr ""
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr ""
-msgid "Open images with ImageWayPoint"
-msgstr ""
-
-msgid "Load set of images as a new layer."
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -21855,16 +23659,13 @@ msgstr ""
msgid "unit(s) = "
msgstr ""
-msgid "Import..."
-msgstr ""
-
-msgid "Import vector graphics."
+msgid "Importing..."
msgstr ""
-msgid "SVG Drawings (*.svg)"
+msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr ""
-msgid "Importing..."
+msgid "Please open or create data layer before importing"
msgstr ""
msgid "InfoMode"
@@ -22227,9 +24028,6 @@ msgstr ""
msgid "Continuously center the LiveGPS layer to current position."
msgstr ""
-msgid "LiveGPS"
-msgstr ""
-
msgid "Open MapDust"
msgstr ""
@@ -22284,9 +24082,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
msgid "Michigan Left"
msgstr ""
@@ -22328,25 +24143,25 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
-msgid "Select OSM mirror URL"
+msgid "Download from Overpass API ..."
msgstr ""
-msgid "Select OSM mirror URL to download from."
+msgid "Download map data from Overpass API server."
msgstr ""
-msgid "Base URL"
+msgid "Overpass query: "
msgstr ""
-msgid "Enforce meta data"
+msgid "Select OSM mirror URL"
msgstr ""
-msgid "Convert to multipolygon"
+msgid "Select OSM mirror URL to download from."
msgstr ""
-msgid "Convert to multipolygon."
+msgid "Base URL"
msgstr ""
-msgid "One of the selected ways is already part of another multipolygon."
+msgid "Enforce meta data"
msgstr ""
msgid "About Plugin"
@@ -22483,9 +24298,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22510,12 +24322,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22664,6 +24485,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22680,6 +24504,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -22913,13 +24748,6 @@ msgstr ""
msgid "An error occurred: {0}"
msgstr ""
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr ""
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr ""
-
msgid "Process queue"
msgstr ""
@@ -22972,18 +24800,6 @@ msgstr ""
msgid "Close: "
msgstr ""
-msgid "New issue"
-msgstr ""
-
-msgid "Create issue"
-msgstr ""
-
-msgid "Describe the problem precisely"
-msgstr ""
-
-msgid "Create: "
-msgstr ""
-
msgid "Open in browser"
msgstr ""
@@ -23041,6 +24857,9 @@ msgstr ""
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23248,9 +25067,6 @@ msgstr ""
msgid "Import PDF"
msgstr ""
-msgid "Import PDf file"
-msgstr ""
-
msgid " {0} objects so far"
msgstr ""
@@ -23330,7 +25146,25 @@ msgstr ""
msgid "Test failed: Could not write mtime."
msgstr ""
-msgid "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
@@ -23484,6 +25318,9 @@ msgstr ""
msgid "The clipboard data is not an image"
msgstr ""
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23505,6 +25342,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23798,9 +25638,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr ""
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -23869,9 +25706,6 @@ msgstr ""
msgid "Change relation member roles to {0}"
msgstr ""
-msgid "Change multipolygon creation settings"
-msgstr ""
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -23998,9 +25832,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr ""
-
msgid "Revert changeset fully"
msgstr ""
@@ -24022,6 +25853,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr ""
@@ -24054,15 +25888,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+
msgid "Road Sign Plugin"
msgstr ""
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr ""
+
msgid "Country preset:"
msgstr ""
@@ -24072,6 +25922,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24174,9 +26027,6 @@ msgstr ""
msgid "Configure routing preferences."
msgstr ""
-msgid "Highway type"
-msgstr ""
-
msgid "Speed (Km/h)"
msgstr ""
@@ -24292,6 +26142,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr ""
+
msgid "Simplify Area"
msgstr ""
@@ -24352,19 +26205,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
+msgid "SeaMap Editor"
msgstr ""
-msgid "Load"
+msgid "No object selected"
msgstr ""
-msgid "invisible"
+msgid "Seamark Inspector"
msgstr ""
-msgid "SeaMap Editor"
+msgid "Select only one object"
msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24502,6 +26355,9 @@ msgstr ""
msgid "Street name: "
msgstr ""
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr ""
@@ -24577,6 +26433,95 @@ msgstr ""
msgid "Tracer building"
msgstr ""
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr ""
@@ -24592,9 +26537,6 @@ msgstr ""
msgid "Save Signatures file"
msgstr ""
-msgid "Download OSM"
-msgstr ""
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr ""
@@ -24616,6 +26558,9 @@ msgstr ""
msgid "Download signed data"
msgstr ""
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24768,9 +26713,6 @@ msgstr ""
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr ""
-
msgid "Select as much as you like:"
msgstr ""
@@ -25396,7 +27338,10 @@ msgstr ""
msgid "Undelete object by id"
msgstr ""
-msgid "Select if the data should be added into a new layer"
+msgid "Undelete Object"
+msgstr ""
+
+msgid "Undelete object"
msgstr ""
msgid ""
@@ -25404,10 +27349,7 @@ msgid ""
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr ""
-
-msgid "Undelete object"
+msgid "Select if the data should be added into a new layer"
msgstr ""
msgid "Start undeleting"
@@ -25416,18 +27358,6 @@ msgstr ""
msgid "Close dialog and cancel"
msgstr ""
-msgid "Will get {0}"
-msgstr ""
-
-msgid "Looking for {0}"
-msgstr ""
-
-msgid "Found {0}"
-msgstr ""
-
-msgid "More tools"
-msgstr ""
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25470,15 +27400,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr ""
@@ -25599,18 +27520,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25788,9 +27697,6 @@ msgstr ""
msgid "Removes all nodes from selection"
msgstr ""
-msgid "Video"
-msgstr ""
-
msgid "Import Video"
msgstr ""
@@ -25917,7 +27823,7 @@ msgstr ""
msgid "mute"
msgstr ""
-msgid "Scanned Map..."
+msgid "Walking Papers Scanned Map"
msgstr ""
msgid ""
@@ -25937,9 +27843,6 @@ msgstr ""
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr ""
-msgid "Walking Papers"
-msgstr ""
-
msgid "Way Download"
msgstr ""
@@ -26072,9 +27975,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 574fa19..7125186 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 12:54+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-10-19 00:04+0000\n"
+"Last-Translator: mmyfl <Unknown>\n"
"Language-Team: 汉语 <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 05:06+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:07+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: zh_CN\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,8 +50,23 @@ msgstr "背景使用条款"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "当前平台不支持打开链接(“{0}”)"
+msgid "ERROR: {0}"
+msgstr "错误：{0}"
+
+msgid "WARNING: {0}"
+msgstr "【警告】：{0}"
+
+msgid "INFO: {0}"
+msgstr "【信息】：{0}"
+
+msgid "DEBUG: {0}"
+msgstr "【调试】：{0}"
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
-msgstr "执行平台启动钩子中"
+msgstr "执行平台启动挂钩中"
msgid "Building main menu"
msgstr "构建主菜单中"
@@ -152,14 +167,14 @@ msgid "About JOSM..."
msgstr "关于 JOSM..."
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
-msgstr "警告：意外的 API 基础 URL 格式。重定向至 OSM 对象的信息或历史记录页面可能会失败。API 基础 URL 为：“{0}”"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
+msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
-msgstr "警告：意外的 API 基础 URL 格式。重定向至 OSM 用户的个人页面可能会失败。API 基础 URL 为：“{0}”"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
+msgstr ""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -201,6 +216,9 @@ msgstr "没有目标图层"
msgid "Add imagery layer {0}"
msgstr "添加图像层 {0}"
+msgid "Select image format for WMS layer"
+msgstr "为WMS图层选择图像格式"
+
msgid "Select WMS layers"
msgstr "选择 WMS 图层"
@@ -240,9 +258,6 @@ msgstr "工具：{0}"
msgid "Please select at least four nodes."
msgstr "请至少选择 4 个节点。"
-msgid "Information"
-msgstr "信息"
-
msgid "Align Nodes in Line"
msgstr "排列节点为直线"
@@ -267,6 +282,9 @@ msgstr "冲突"
msgid "download"
msgstr "下载"
+msgid "problem"
+msgstr "问题"
+
msgid "previous"
msgstr "上一个"
@@ -276,6 +294,9 @@ msgstr "下一个"
msgid "Nothing selected to zoom to."
msgstr "没有选择缩放的对象。"
+msgid "Information"
+msgstr "信息"
+
msgid "Zoom to {0}"
msgstr "缩放到 {0}"
@@ -330,9 +351,9 @@ msgid ""
msgstr "以这些路径目前的方向是不能组合的。是否要将它们中的一部分反转？"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "不能组合路径(它们无法合并为单一的节点串)"
+msgstr ""
msgid "Combine {0} ways"
msgstr "合并 {0} 条路径"
@@ -387,18 +408,35 @@ msgstr "删除"
msgid "Delete selected objects."
msgstr "删除选择的对象。"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "散布节点"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "依一条直线将选定的节点等距离散布。"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "从 OSM 下载..."
msgid "Download map data from the OSM server."
msgstr "从 OSM 服务器下载地图数据"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr "<html>这个动作会发出 {0} 个<br>个别的下载要求。您是否希望<br>继续？</html>"
+
+msgid "Download data"
+msgstr "下载数据"
+
msgid "Download object..."
msgstr "下载对象..."
@@ -489,6 +527,9 @@ msgstr "历史记录"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "显示 OSM 路径、节点或关系的历史记录信息。"
+msgid "Show history"
+msgstr "显示历史记录"
+
msgid "History (web)"
msgstr "历史记录(网页)"
@@ -604,9 +645,9 @@ msgid "Joined overlapping areas"
msgstr "已连结重叠的区域"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
-msgstr "部分属于关系的一部分的路径被修改了。请检查是否造成错误。"
+msgstr ""
msgid "Fix tag conflicts"
msgstr "修正标签冲突"
@@ -757,9 +798,9 @@ msgid "Merge nodes into the oldest one."
msgstr "将节点合并到最旧的一个中。"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
-msgstr "请至少选择两个要合并的节点，或是靠近另一个节点的节点。"
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
+msgstr ""
msgid "Abort Merging"
msgstr "放弃合并"
@@ -914,9 +955,9 @@ msgid "Download Data"
msgstr "下载数据"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
-msgstr "<html>无法打开 URL“{0}”，因为没有合适的下载任务可用。</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
+msgstr ""
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -945,15 +986,9 @@ msgid "Orthogonalize / Undo"
msgstr "直角化/撤销"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"形状直角化/撤销\n"
-"请选择被前一次形状直角化动作所移动的节点！"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "撤销形状直角化"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -972,9 +1007,6 @@ msgstr "直角化"
msgid "Usage"
msgstr "用途"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "选定的元素不能直角化"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1079,6 +1111,15 @@ msgstr "同时重命名文件"
msgid "Could not rename file ''{0}''"
msgstr "无法重命名文件“{0}”"
+msgid "Restart"
+msgstr "重新启动"
+
+msgid "Restart the application."
+msgstr "重启应用程序。"
+
+msgid "Click to restart later."
+msgstr "单击以稍后重启。"
+
msgid "Reverse way"
msgstr "反转路径"
@@ -1129,9 +1170,6 @@ msgstr "加载会话"
msgid "Load a session from file."
msgstr "从文件中加载一个会话。"
-msgid "Session file (*.jos, *.joz)"
-msgstr "会话文件(*.jos, *.joz)"
-
msgid "Open session"
msgstr "打开会话"
@@ -1193,6 +1231,9 @@ msgstr "状态报告"
msgid "Copy to clipboard and close"
msgstr "复制到剪贴板并关闭"
+msgid "Report bug"
+msgstr "报告故障"
+
msgid "Close"
msgstr "关闭"
@@ -1263,14 +1304,14 @@ msgid ""
msgstr "此路径不能从选定的节点分割。(提示：选定的节点在路径的中央。)"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr "<html>以角色为基础的关系成员会复制到所有的新路径。<br>必要时您应该检验并修正它。</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
+msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr "<html>将关系成员复制到所有的新路径。<br>您应该验证这一点，必要时予以纠正。</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
+msgstr ""
msgid "Split way {0} into {1} parts"
msgstr "将路径 {0} 分割为 {1} 个部分"
@@ -1359,6 +1400,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr "您将要拆开不完整的对象。<br>这会导致一些问题，因为您没有看到真正的对象。<br>您真的要拆开吗？"
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "撤消"
@@ -1383,9 +1445,6 @@ msgstr "更新数据"
msgid "Updates the objects in the active data layer from the server."
msgstr "从服务器更新使用中数据图层的对象。"
-msgid "Download data"
-msgstr "下载数据"
-
msgid "Update modified"
msgstr "更新已修改的"
@@ -1583,6 +1642,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "慢进"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "正在下载 GPS 数据"
@@ -1592,6 +1654,18 @@ msgstr "已下载的 GPX 数据"
msgid "Markers from {0}"
msgstr "{0} 的标记"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "下载 OSM"
+
msgid "Downloading data"
msgstr "正在下载数据"
@@ -1611,6 +1685,29 @@ msgstr "命令"
msgid "Request details: {0}"
msgstr "要求详细信息：{0}"
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "在输入过程中发生 {0} 个冲突。"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "下载时发生冲突"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) 正在加载节点 {2} 的父项目"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) 正在加载路径 {2} 的父项目"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) 正在加载关系 {2} 的父项目"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "下载 {0} / {1} (剩下 {2})"
@@ -1659,23 +1756,6 @@ msgstr "在大量下载时发生下列错误：{0}"
msgid "Errors during download"
msgstr "下载时发生错误"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "在输入过程中发生 {0} 个冲突。"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "下载时发生冲突"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) 正在加载节点 {2} 的父项目"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) 正在加载路径 {2} 的父项目"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) 正在加载关系 {2} 的父项目"
-
msgid "Error during download"
msgstr "下载时发生错误"
@@ -1706,7 +1786,7 @@ msgid "Backspace in Add mode"
msgstr "添加模式中的退格"
msgid "helper line"
-msgstr ""
+msgstr "辅助线"
msgid "Cannot add a node outside of the world."
msgstr "不能在世界之外添加节点。"
@@ -1804,7 +1884,7 @@ msgstr ""
"拖动一条路径区段，以制作一个矩形。按住 Ctrl 键拖动以沿着区段的正常方向移动，按住 Alt 键拖动以创建一个新的矩形，双击以添加一个新节点。"
msgid "Extrude: main line"
-msgstr ""
+msgstr "挤压出： 为主线"
msgid "Extrude: helper line"
msgstr "拉伸：辅助线"
@@ -1818,6 +1898,9 @@ msgstr "提高路径精度"
msgid "Improve Way Accuracy mode"
msgstr "提高路径精度模式"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr "点击路径以改进其形状。"
@@ -1842,9 +1925,10 @@ msgstr "单击以移动高亮的节点。按住 Ctrl 键以添加新节点，或
msgid "Cannot place a node outside of the world."
msgstr "不能在世界之外放置节点。"
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "添加一个新节点至 {0} 条路径"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "无法删除被多个对象参照的节点"
@@ -1858,6 +1942,9 @@ msgstr "平行"
msgid "Make parallel copies of ways"
msgstr "制作平行的路径副本"
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2283,6 +2370,9 @@ msgstr "值“value”在任意键中"
msgid "matches if ''key'' exists"
msgstr "如果存在键“key”则匹配"
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr "组合"
@@ -2319,7 +2409,7 @@ msgid "all closed ways"
msgstr "所有封闭的路径"
msgid "object without useful tags"
-msgstr ""
+msgstr "物件没有有用的标签"
msgid "metadata"
msgstr "元数据"
@@ -2451,14 +2541,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "预计的“timestamp”后的<i>最小</i>/<i>最大</i>值"
-msgid "Primitive id expected"
-msgstr "预计的原型 id"
+msgid "Range of primitive ids expected"
+msgstr "预期元素 id 范围"
-msgid "Changeset id expected"
-msgstr "预计的修改集合 id"
+msgid "Range of changeset ids expected"
+msgstr "预期修改集合 id 范围"
-msgid "Version expected"
-msgstr "预计的版本"
+msgid "Range of versions expected"
+msgstr "预期版本范围"
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr "使用标签操作时，设定键不能为空。使用例子：key=value"
@@ -2466,6 +2556,9 @@ msgstr "使用标签操作时，设定键不能为空。使用例子：key=value
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr "未知的原型类型：{0}。允许的数值为node、way或relation"
+msgid "Primitive id expected"
+msgstr "预计的原型 id"
+
msgid "Range of numbers expected"
msgstr "预计的数字范围"
@@ -2484,9 +2577,8 @@ msgstr "缺少 异或 的参数"
msgid "Missing operator for NOT"
msgstr "缺少 非 的运算子"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr "警告：自动截短在已删除对象 {1} 上标签“{0}”的数值"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr ""
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2572,6 +2664,9 @@ msgid "Added {0} object"
msgid_plural "Added {0} objects"
msgstr[0] "已添加 {0} 个对象"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "改变节点 {0}"
@@ -2608,11 +2703,11 @@ msgstr "从 {1} 对象删除“{0}”"
msgid "Set {0}={1} for {2} objects"
msgstr "在 {2} 对象设定 {0}={1}"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "删除 {1} 个对象的 {0} 个属性"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "设置 {1} 个对象的 {0} 个属性"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "将“{1}”取代为“{0}”"
@@ -2633,9 +2728,9 @@ msgid "Double conflict"
msgstr "双重冲突"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
-msgstr "警告：图层“{0}”不再存在。不能删除对象“{1}”的冲突。"
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
+msgstr ""
msgid "Add conflict for ''{0}''"
msgstr "添加“{0}”的冲突"
@@ -2731,6 +2826,9 @@ msgstr[0] "清除 {0} 个对象"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "解决关系 {0} 成员列表的冲突"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "旋转 {0} 个节点"
@@ -2789,9 +2887,9 @@ msgid "Reverse directional way."
msgstr "反转路径方向。"
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr "在反转这条路径时，为了维持数据的一致性，建议修改下列该路径与其节点的属性。"
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
+msgstr ""
msgid "Relation"
msgstr "关系"
@@ -2820,11 +2918,11 @@ msgstr "应用选定的修改"
msgid "Do not apply changes"
msgstr "不要应用修改"
-msgid "Please select which property changes you want to apply."
-msgstr "请选择要接受的属性修改。"
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "属性 "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "关系中的角色参照到"
@@ -2844,6 +2942,9 @@ msgstr "创建文件时发生 IO 错误，将跳过自动保存：{0}"
msgid "Unable to delete old backup file {0}"
msgstr "无法删除旧的备份文件 {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "创建删除图层的备份时发生错误：{0}"
@@ -2874,19 +2975,19 @@ msgid ""
"function manually and retry importing."
msgstr "<html>设置文件要求追加首选项到<b>{0}</b>，<br/>但此时，它的默认值未知。<br/>请手动激活相应的功能，并重试导入。"
-msgid "Warning: Failed to create missing cache directory: {0}"
-msgstr "警告：无法创建丢失的缓存目录：{0}"
+msgid "Failed to create missing cache directory: {0}"
+msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>无法创建丢失的缓存目录：{0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "警告：将首选项固定为“{0}”失败"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
-msgstr "警告：初始化首选项失败。首选项目录“{0}”不是一个目录。"
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
+msgstr ""
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -2894,23 +2995,21 @@ msgid ""
msgstr "<html>初始化首选项失败。<br>首选项目录“{0}”不是一个目录。</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
-msgstr "警告：初始化首选项失败。无法建立缺少的首选项目录：{0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
+msgstr ""
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr "<html>初始化首选项失败。<br>无法建立缺少的首选项目录：{0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
-msgstr "信息：缺少首选项文件“{0}”。正在创建一个默认的首选项文件。"
+msgid "Missing preference file ''{0}''. Creating a default preference file."
+msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
-msgstr "警告：以默认首选项文件取代现有的首选项文件“{0}”。"
+"Replacing existing preference file ''{0}'' with default preference file."
+msgstr ""
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -2923,9 +3022,9 @@ msgid ""
msgstr "<html>首选项文件有错误。<br>将旧的设定制作备份为<br>{0}<br>并建立新的默认首选项文件。</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
-msgstr "警告：无法初始化首选项。无法重置为默认首选项文件：{0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
+msgstr ""
msgid "Paint style {0}: {1}"
msgstr "绘画样式 {0}：{1}"
@@ -2954,12 +3053,11 @@ msgstr "无法加载资源“{0}”，错误为 {1}。"
msgid "UNKNOWN"
msgstr "不明"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr "警告：意外的 JOSM 修订文件版本号，值为“{0}”"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "警告：缺少修订文件“/REVISION”。"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "已经注册原型“{0}”的冲突。"
@@ -3110,9 +3208,8 @@ msgstr "不能比较 ID“{0}”和 ID“{1}”的原型。"
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "参数“{0}”不应使用范围 0..{1}，却收到“{2}”"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
-msgstr "错误：无法加载地图渲染类“{0}”。没有找到类。"
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
+msgstr ""
msgid ""
"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
@@ -3218,8 +3315,8 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr "未知的基准标识符：“{0}”"
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
-msgstr "需要基准(+datum=*, +towgs84=* 或 +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
+msgstr ""
msgid ""
"Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"
@@ -3237,6 +3334,9 @@ msgstr "未知的投影标识符：“{0}”"
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr "意外的参数“+bounds”的值(必须为 4)"
+msgid "Unknown parameter ''{0}''"
+msgstr "未知参数“{0}”"
+
msgid "Expected number argument for parameter ''{0}''"
msgstr "期望参数“{0}”的个数"
@@ -3253,9 +3353,6 @@ msgstr "自定义投影法"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "错误：无法打开输入流资源“/data/{0}”。"
-
msgid "WGS84"
msgstr "WGS84"
@@ -3296,6 +3393,9 @@ msgstr "验证其他的"
msgid "Running test {0}"
msgstr "执行测试 {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "地址"
@@ -3320,6 +3420,15 @@ msgstr "关系中的多重街道名称"
msgid "House number too far from street"
msgstr "远离街道的门牌号"
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr "建筑物内的建筑物"
@@ -3379,15 +3488,15 @@ msgstr " 或 "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} 已过时，使用 {1} 代替"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "重复的节点"
msgid "This test checks that there are no nodes at the very same location."
msgstr "这会测试有没有位置非常相近的节点存在。"
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "两个未封闭路径有重复的节点"
-
msgid "Mixed type duplicated nodes"
msgstr "混合类型的重复节点"
@@ -3455,6 +3564,24 @@ msgstr "重复的路径节点"
msgid "Checks for ways with identical consecutive nodes."
msgstr "检查是否有相同连续节点的路径。"
+msgid "Highways"
+msgstr "公路"
+
+msgid "Performs semantic checks on highways."
+msgstr "在公路上执行语义检查。"
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "多重多边形"
@@ -3526,6 +3653,12 @@ msgstr "有相同名称的节点"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "这个测试会找出有相同名称的节点(可能是重复的节点)。"
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "重叠的区域"
@@ -3583,15 +3716,15 @@ msgstr "关系类型不明"
msgid "Relation is empty"
msgstr "关系是空白的"
+msgid "Role verification problem"
+msgstr "角色验证问题"
+
msgid "<empty>"
msgstr "<空白>"
msgid "Role {0} missing"
msgstr "缺少角色 {0}"
-msgid "Role verification problem"
-msgstr "角色验证问题"
-
msgid "Number of {0} roles too low ({1})"
msgstr "{0} 角色的编号太低({1})"
@@ -3621,11 +3754,11 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr "这个测试会检查名称近似的路径，因为有可能是拼错字了。"
-msgid "Properties checker :"
-msgstr "属性检查器："
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "这个插件会检查属性中的键值和数值有无错误。"
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "无效的标签检查行 - {0}：{1}"
@@ -3762,8 +3895,8 @@ msgstr "使用默认的拼写检查文件。"
msgid "Use the default spellcheck file (recommended)."
msgstr "使用默认的拼写检查文件(推荐)。"
-msgid "Fix properties"
-msgstr "修正属性"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "找不到元件类型"
@@ -3837,6 +3970,9 @@ msgstr "未封闭的路径"
msgid "This tests if ways which should be circular are closed."
msgstr "这会测试圆形的路径是否已封闭。"
+msgid "Unclosed way"
+msgstr "未封闭的路径"
+
msgid "natural type {0}"
msgstr "自然类型 {0}"
@@ -3867,9 +4003,6 @@ msgstr "建筑"
msgid "area"
msgstr "区域"
-msgid "Unclosed way"
-msgstr "未封闭的路径"
-
msgid "Unconnected ways"
msgstr "未连接的路径"
@@ -3894,12 +4027,12 @@ msgstr "未标记的且未连接的节点"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "这个测试会检查未加标签，且不属任何路径的一部分的节点。"
-msgid "No tags"
-msgstr "无标记"
-
msgid "Unconnected nodes without physical tags"
msgstr "未连接且没有实体标签的节点"
+msgid "No tags"
+msgstr "无标记"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "已标记“fixme”或“FIXME”"
@@ -3960,23 +4093,6 @@ msgstr "反转的海岸线：陆地不在左侧"
msgid "Reversed land: land not on left side"
msgstr "反转的陆地：陆地不在左侧"
-msgid "Wrong number of arguments for bookmark"
-msgstr "错误的书签参数值"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "读取书签时发生错误：%s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "错误：在书签文件“{1}”中有意外的行“{0}”"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr "错误：书签文件“{2}”的“{1}”行有不合法的 double 数值“{0}”"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>无法读取书签<br>“{0}”<br>错误为：{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "不要再显示(记住选择)"
@@ -4052,7 +4168,7 @@ msgid "Authentication Failed"
msgstr "验证失败"
msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr ""
+msgstr "禁止访问{1} {2} 的编辑版本“{0}”"
msgid "Authorisation Failed"
msgstr "验证失败"
@@ -4078,8 +4194,8 @@ msgstr "显示帮助信息"
msgid "Downloading \"Message of the day\""
msgstr "正在下载“当天的信息”"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "警告：无法读取当天的信息。异常为：{0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr ""
msgid "Message of the day not available"
msgstr "无法取得当天的信息。"
@@ -4275,9 +4391,24 @@ msgstr "查看(V)"
msgid "Tools"
msgstr "工具(T)"
+msgid "More tools"
+msgstr "更多工具(R)"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "选择(N)"
+
msgid "Presets"
msgstr "预设组合(P)"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr "窗口(W)"
@@ -4293,18 +4424,33 @@ msgstr "编辑工具栏"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "切换编辑工具栏(即垂直的工具)的可见度"
-msgid "Audio"
-msgstr "音频(U)"
+msgid "Preset preferences"
+msgstr ""
-msgid "Hide edit toolbar"
-msgstr "隐藏编辑工具栏"
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
-msgid "Hide this button"
-msgstr "隐藏这个按钮"
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
+msgid "Audio"
+msgstr "音频(U)"
+
+msgid "Do not hide toolbar"
+msgstr ""
+
+msgid "Hide this button"
+msgstr "隐藏这个按钮"
msgid "Click the arrow at the bottom to show it again."
msgstr "点击底部的按钮再次显示它。"
+msgid "Hide edit toolbar"
+msgstr "隐藏编辑工具栏"
+
msgid "Hide or show this toggle button"
msgstr "隐藏或显示这个切换按钮"
@@ -4364,6 +4510,9 @@ msgstr "(没有对象)"
msgid "User:"
msgstr "用户："
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "图层不在列表中。"
@@ -4391,19 +4540,6 @@ msgstr "在后台"
msgid "Click to run job in background"
msgstr "点击以在后台运行工作"
-msgid "false: the property is explicitly switched off"
-msgstr "false：该属性已经被确实关闭了"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true：该属性已经被确实打开了"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "部分：不同选定的对象有不同的数值，不要改变"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "取消设定：不要在选定的对象上设定这个属性"
-
msgid "{0} ({1} ms)"
msgstr "{0}({1} 毫秒)"
@@ -4692,29 +4828,47 @@ msgstr "> 底部"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "将我选定的元件复制到合并元件列表的结尾"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr "将我选定的元件复制到合并元件列表的第一个选定元件之前"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr "将我选定的元件复制到合并元件列表的第一个选定元件之后"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "将他们选定的元件复制到合并元件列表的开头"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "将他们选定的元件复制到合并元件列表的结尾"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr "将他们选定的元件复制到合并元件列表的第一个选定元件之前"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4729,8 +4883,8 @@ msgstr "将他们所有的元素复制到目标"
msgid "Up"
msgstr "上"
-msgid "Move up the selected elements by one position."
-msgstr "将选定的元件向上移动一个位置"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "下"
@@ -4778,14 +4932,6 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "他们的版本({0} 个项目)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr "可调整的 {0} 尚未设定。不能在同步调整中设定参与。"
-
-msgid "Adjustable {0} not registered yet."
-msgstr "可调整的 {0} 尚未注册。"
-
msgid "Node"
msgstr "节点"
@@ -5037,15 +5183,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "键值："
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>输入标签键值，例如 <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
msgid "Value:"
msgstr "数值："
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
-msgstr "<html>输入标签数值，例如 <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
+msgstr ""
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5598,6 +5744,9 @@ msgstr "显示/隐藏"
msgid "Information about layer"
msgstr "关于图层的信息"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "地图样式"
@@ -5636,10 +5785,10 @@ msgid "Save a copy of this Style to file and add it to the list"
msgstr "保存这个样式的复本到文件中，并将它添加到列表中"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "地图绘制风格文件(*.mapcss，*.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "地图绘制风格文件(*.xml，*.zip)"
msgid "Reloading style sources"
msgstr "重新加载样式来源"
@@ -5680,6 +5829,36 @@ msgstr "样式目前是否使用中？"
msgid "No"
msgstr "否"
+msgid "Object type:"
+msgstr "对象类型："
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "混合"
+
+msgid "Choose the OSM object type"
+msgstr "选择 OSM 对象类型"
+
+msgid "Object ID:"
+msgstr "对象 ID："
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "输入要下载的对象 ID："
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"对象 ID 可以用逗号或空格分隔。<br/>例如：<b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b>在混合模式下，可以这样指定对象：<b>w123, n110, w12, "
+"r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "关系"
@@ -5687,7 +5866,7 @@ msgid "Open a list of all relations."
msgstr "打开所有关系的列表。"
msgid "Relation list filter"
-msgstr ""
+msgstr "关系列表的筛选器"
msgid "Create a new relation"
msgstr "建立新的关系"
@@ -5696,14 +5875,11 @@ msgid "New"
msgstr "新增"
msgid "Relations: {0}/{1}"
-msgstr ""
+msgstr "关系: {0}/{1}"
msgid "Relations: {0}"
msgstr "关系：{0}"
-msgid "Selection"
-msgstr "选择(N)"
-
msgid "Open a selection list window."
msgstr "打开选择范围列表窗口。"
@@ -5728,23 +5904,11 @@ msgstr "现在不可选择"
msgid "Selection: {0}"
msgstr "选择范围：{0}"
-msgid "Side buttons"
-msgstr "侧边栏按钮"
-
-msgid "Always shown"
-msgstr "总是显示"
-
-msgid "Dynamic"
-msgstr "动态"
-
-msgid "Always hidden"
-msgstr "总是隐藏"
-
msgid "Toggle dynamic buttons"
msgstr "切换动态按钮"
msgid "Open preferences for this panel"
-msgstr ""
+msgstr "打开此面板的首选项"
msgid "Undock the panel"
msgstr "解锁面板"
@@ -5756,6 +5920,18 @@ msgstr "关闭这个面板。您可以用左侧工具栏的按钮重新打开它
msgid "Click to minimize/maximize the panel content"
msgstr "点击以最小化/最大化面板内容"
+msgid "Side buttons"
+msgstr "侧边栏按钮"
+
+msgid "Always shown"
+msgstr "总是显示"
+
+msgid "Dynamic"
+msgstr "动态"
+
+msgid "Always hidden"
+msgstr "总是隐藏"
+
msgid "Authors"
msgstr "作者"
@@ -5772,9 +5948,8 @@ msgstr "选择这个用户上传的对象"
msgid "Launches a browser with information about the user"
msgstr "启动浏览器，显示关于此用户的信息"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr "警告：只会显示 {1} 个已选定用户的前 {0} 位"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
+msgstr ""
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -5799,9 +5974,6 @@ msgstr "打开验证窗口。"
msgid "Validation results"
msgstr "验证结果"
-msgid "Zoom to problem"
-msgstr "缩放至问题点"
-
msgid "Fix"
msgstr "修正"
@@ -5948,9 +6120,6 @@ msgstr "更新内容"
msgid "Update the changeset content from the OSM server"
msgstr "从 OSM 服务器更新修改集合内容"
-msgid "Show history"
-msgstr "显示历史记录"
-
msgid "Download and show the history of the selected objects"
msgstr "下载并显示选定对象的历史记录"
@@ -6236,9 +6405,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>下载在目前地图查看中的修改集合</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
-msgstr "警告：首选项“{0}”有意外的数值，得到“{1}”。重设为默认的查询。"
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
+msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr "不能创建匿名用户的开放修改集合查询"
@@ -6302,35 +6471,47 @@ msgstr "请注意修改集合查询目前永远提交到“{0}”，不管下列
msgid "This changeset query URL is invalid"
msgstr "这个修改集合查询 URL 是无效的"
-msgid "Select objects for which to change properties."
-msgstr "选择要更改属性的对象。"
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "属性/成员"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "选定对象的属性。"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<不同>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "成员"
msgid "Position"
msgstr "位置"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "属性：{0}/成员：{1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "属性/成员"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "删除所有对象中选定的设定键"
-msgid "Delete Properties"
-msgstr "删除属性"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "改变关系"
@@ -6344,14 +6525,14 @@ msgstr "确定要删除关系 {0} 的选择范围？"
msgid "Add a new key/value pair to all objects"
msgstr "将新的设定键/数值配对添加到所有的对象"
-msgid "Add Property"
-msgstr "添加属性"
+msgid "Add Tag"
+msgstr "添加标签"
msgid "Edit the value of the selected key for all objects"
msgstr "编辑所有对象选定设定键的数值"
-msgid "Edit Properties"
-msgstr "编辑属性"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "转到 OSM 的维基页面查看标签的帮助内容(F1)"
@@ -6360,10 +6541,10 @@ msgid "Launch browser with wiki help for selected object"
msgstr "启动浏览器并显示选定对象的维基说明"
msgid "Paste Value"
-msgstr ""
+msgstr "粘贴值参"
msgid "Paste the value of the selected tag from clipboard"
-msgstr ""
+msgstr "从剪贴板粘贴标签的值参"
msgid "Copy Value"
msgstr "复制数值"
@@ -6426,13 +6607,7 @@ msgid_plural "Change properties of up to {0} objects"
msgstr[0] "改变属性至 {0} 个对象"
msgid "Use English language for tag by default"
-msgstr ""
-
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
+msgstr "默认使用英语标签名"
msgid "Add value?"
msgstr "添加数值？"
@@ -6451,20 +6626,26 @@ msgid "Set number of recently added tags"
msgstr ""
msgid "Remember last used tags"
-msgstr ""
+msgstr "记住上次使用的标签"
msgid "Please enter the number of recently added tags to display"
-msgstr ""
+msgstr "请输入应显示多少最近的新标签"
msgid "Please enter integer number between 0 and {0}"
-msgstr ""
+msgstr "请输入整数从 0 到 {0}"
msgid "Recently added tags"
msgstr "最近添加的标签"
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr "再次使用此标签"
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr "键“{0}”已被使用"
@@ -6501,8 +6682,8 @@ msgstr "关系已删除"
msgid "Downloading relation {0}"
msgstr "正在下载关系 {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr "警告：忽略异常，因为任务被取消。异常为：{0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -6560,6 +6741,9 @@ msgstr "删除它们，清除关系"
msgid "Ignore them, leave relation as is"
msgstr "忽略它们，保持关系原貌"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6759,16 +6943,16 @@ msgid "Select the previous relation member which gives rise to a gap"
msgstr ""
msgid "Select next Gap"
-msgstr ""
+msgstr "下一个空白间选择"
msgid "Select the next relation member which gives rise to a gap"
msgstr ""
msgid "Zoom to Gap"
-msgstr ""
+msgstr "缩放到空白点"
msgid "Zoom to the gap in the way sequence"
-msgstr ""
+msgstr "缩放到道序列的空白点"
msgid "Refers to"
msgstr "参照到"
@@ -6818,6 +7002,25 @@ msgstr "路径已连接到下一个关系成员"
msgid "way is not connected to previous or next relation member"
msgstr "路径未连接到前一个或下一个关系成员"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "错误的书签参数值"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "读取书签时发生错误：%s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>无法读取书签<br>“{0}”<br>错误为：{1}</html>"
+
msgid "Bookmarks"
msgstr "书签"
@@ -6883,9 +7086,6 @@ msgstr "纬度的数值范围必须为[-90,90]。"
msgid "Value for longitude in range [-180,180] required."
msgstr "经度的数值范围必须为[-180,180]。"
-msgid "Paste URL from clipboard"
-msgstr "从剪贴板粘贴 URL"
-
msgid "Data Sources and Types:"
msgstr "数据来源和类型："
@@ -6954,21 +7154,8 @@ msgstr "下载参照者(父关系)"
msgid "Download object"
msgstr "下载对象"
-msgid "Object type:"
-msgstr "对象类型："
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "混合"
-
-msgid "Choose the OSM object type"
-msgstr "选择 OSM 对象类型"
-
-msgid "Object ID:"
-msgstr "对象 ID："
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "输入要下载的对象 ID："
+msgid "Start downloading"
+msgstr "开始下载"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6978,28 +7165,9 @@ msgstr "如果对象的参照者也应被下载(即父关系，还有节点的
msgid "Select if the members of a relation should be downloaded as well"
msgstr "如果一个关系的成员也应被下载，则选择"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"对象 ID 可以用逗号或空格分隔。<br/>例如：<b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b>在混合模式下，可以这样指定对象：<b>w123, n110, w12, "
-"r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "下载参照者(父关系和路径)"
-msgid "Start downloading"
-msgstr "开始下载"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-"指定了无效的 ID 列表\n"
-"无法下载对象。"
-
msgid "Class Type"
msgstr "类别类型"
@@ -7105,8 +7273,8 @@ msgstr "前往下一页"
msgid "Go to the JOSM help home page"
msgstr "转到 JOSM 帮助首页"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "警告：在 HTML 文件中有错误的位置。异常为：{0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "无法打开帮助页面。目标 URL 是空的。"
@@ -7204,6 +7372,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>版本 <strong>{0}</strong> 建立于 <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "修改集合信息"
@@ -7300,8 +7471,8 @@ msgstr "点击 <strong>{0}</strong> 以现在加载它们。如有必要 JOSM
msgid "Object still in use"
msgstr "对象仍然在使用"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "警告：错误标头“{0}”与预计的模式不符"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr ""
msgid "Upload"
msgstr "上传"
@@ -7321,6 +7492,12 @@ msgstr "提供您的修改的一些简短说明："
msgid "Enter an upload comment"
msgstr "输入一个上传注解"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "修改集合 id："
@@ -7387,9 +7564,8 @@ msgid "Closing changeset {0}"
msgstr "正在关闭修改集合 {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
-msgstr "警告：无法将凭证对话框永远置于最上层。抓到安全性异常。"
+"Failed to put Credential Dialog always on top. Caught security exception."
+msgstr ""
msgid "Enter credentials for OSM API"
msgstr "输入 OSM API 的凭证"
@@ -7463,9 +7639,9 @@ msgid "Unpacking {0} into {1}"
msgstr "正在释放 {0} 到 {1}"
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
-msgstr "警告：无法下载文件“{0}”。其下载链接“{1}”不是一个有效的 URL。正在跳过下载。"
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
+msgstr ""
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -7479,9 +7655,8 @@ msgid "Missing user identity"
msgstr "缺少用户身份"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
-msgstr "警告：无法取得目前的 JOSM 用户信息。异常为：{0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
+msgstr ""
msgid "Download objects"
msgstr "下载对象"
@@ -7693,12 +7868,6 @@ msgstr "上传已修改的原型"
msgid "Please revise upload comment"
msgstr "请修改上传注解"
-msgid "Revise"
-msgstr "修改"
-
-msgid "Continue as is"
-msgstr "就这样继续"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7710,6 +7879,22 @@ msgstr ""
"/>在观看他们区域的修改时，都是依据有意义的修改组合备注<br />来了解发生了什么事！<br /><br "
"/>如果您现在花一点时间说明您的修改，就可以让其他<br />众多制图者更好做事。"
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "修改"
+
+msgid "Continue as is"
+msgstr "就这样继续"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "返回到上一个对话框中输入一个更具描述性的注释"
@@ -7725,6 +7910,21 @@ msgstr "请先输入有效的区块大小"
msgid "Illegal chunk size"
msgstr "不合法的区块大小"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "取消上传并继续编辑"
@@ -7732,9 +7932,9 @@ msgid "Tags of changeset {0}"
msgstr "修改集合 {0} 的标签"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
-msgstr "警告：对象“{0}”已经在服务器端被删除了。现在跳过这个对象并重新尝试上传。"
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
+msgstr ""
msgid "Preparing objects to upload ..."
msgstr "正在准备要上传的对象..."
@@ -7852,9 +8052,6 @@ msgstr "关系“{0}”已经被删除。在上传中跳过此对象。"
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "对象“{0}”已经被删除。在上传中跳过此对象。"
-msgid "Warning: {0}"
-msgstr "警告：{0}"
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "正在上传 {0} 个对象..."
@@ -7863,7 +8060,10 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr "忽略捕捉到的异常，因为上传已被取消。异常为：{0}"
-msgid ""
+msgid "Upload successful!"
+msgstr ""
+
+msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
msgstr "<html><strong>从目前的选择范围</strong>标记修改过的对象上传到服务器。</html>"
@@ -7879,8 +8079,8 @@ msgstr "选择要上传的对象"
msgid "Cancel uploading"
msgstr "正在取消上传"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr "警告：首选项的设定键“{0}”有意外的数值，得到“{1}”"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr ""
msgid "Please select the upload strategy:"
msgstr "请选择上传的方式："
@@ -8017,8 +8217,8 @@ msgstr "下一个标记"
msgid "Jump to next marker"
msgstr "跳至下一个标记"
-msgid "Previos marker"
-msgstr "前一个标记"
+msgid "Previous marker"
+msgstr ""
msgid "Jump to previous marker"
msgstr "跳至前一个标记"
@@ -8050,8 +8250,8 @@ msgstr "版本 {0}"
msgid "Merging layers"
msgstr "合并图层"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "警告：混合 0.6 和 0.5 版的数据会成为 0.5 版"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8168,6 +8368,9 @@ msgstr "缩小以查看更多信息"
msgid "No tiles at this zoom level"
msgstr "在此缩放等级没有瓦片"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr "支持 EPSG:4326 和麦卡托投影法"
@@ -8205,6 +8408,9 @@ msgstr "重新加载错误的瓦片"
msgid "Alpha channel"
msgstr "Alpha 通道"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr "设定 WMS 书签"
@@ -8406,9 +8612,6 @@ msgstr "正在从 EXIF 中提取 GPS 位置"
msgid "Starting directory scan"
msgstr "开始扫描目录"
-msgid "One of the selected files was null"
-msgstr "选定的文件中有一个为空"
-
msgid "Read photos..."
msgstr "读取相片..."
@@ -8427,6 +8630,9 @@ msgstr "在目录 {0} 发现空的文件\n"
msgid "Error while getting files from directory {0}\n"
msgstr "从目录 {0} 取得文件时发生错误\n"
+msgid "One of the selected files was null"
+msgstr "选定的文件中有一个为空"
+
msgid "Geotagged Images"
msgstr "有地理标记的图片"
@@ -8482,6 +8688,12 @@ msgstr "下一幅"
msgid "Show next Image"
msgstr "显示下一张图片"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
msgid "Center view"
msgstr "置中查看"
@@ -8533,7 +8745,7 @@ msgid "Choose visible tracks"
msgstr "选择可见的轨迹"
msgid "Select by date"
-msgstr ""
+msgstr "按日期选择"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -8560,23 +8772,23 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr "<html>将未经处理的 GPS 数据上传作地图数据是不适当的。<br>如果您想要上传轨迹，请看这里：</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr "自定义轨迹绘制"
msgid "From"
-msgstr ""
+msgstr "从"
msgid "To"
-msgstr ""
+msgstr "往"
msgid "No timestamp"
msgstr "没有时间戳"
-msgid "Download from OSM along this track"
-msgstr "从 OSM 沿这条轨迹下载"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "下载这里面的每个对象："
@@ -8602,14 +8814,18 @@ msgstr "只有路点"
msgid "track and waypoints"
msgstr "轨迹与路点"
+msgid "Click to download"
+msgstr ""
+
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "从 OSM 沿这条轨迹下载"
+
msgid "Calculating Download Area"
msgstr "计算下载区域"
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr "<html>这个动作会发出 {0} 个<br>个别的下载要求。您是否希望<br>继续？</html>"
-
msgid "Precache imagery tiles along this track"
msgstr "沿该轨迹预缓存图像瓦片"
@@ -8735,15 +8951,11 @@ msgstr "尝试显示这个标记的 URL 时发生错误"
msgid "(URL was: "
msgstr "(URL 为： "
-msgid "Error displaying URL"
-msgstr "在显示 URL 时发生错误"
-
msgid "Select the map painting styles"
msgstr "选择地图的绘画样式"
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "警告：从“{0}”加载 Mappaint 样式失败。异常为：{1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
msgid "loading style ''{0}''..."
msgstr "加载样式“{0}”中..."
@@ -8756,8 +8968,8 @@ msgid_plural ""
"right click menu for details."
msgstr[0] "加载这种样式时发生了 {0} 个错误。查看详细信息，请从右键菜单中选择“信息”。"
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr "警告：无法解析“{0}”的 Mappaint 样式。错误为：{1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr ""
msgid "Illegal dash pattern, values must be positive"
msgstr "非法的虚线模式，值必须为正"
@@ -8766,9 +8978,8 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr "非法的虚线模式，至少有一个值必须 > 0"
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
-msgstr "警告：无法解析“{0}”的 Mappaint 样式。错误为：[{1}：{2}] {3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
+msgstr ""
msgid "Access Token Key:"
msgstr "访问令牌键："
@@ -9003,8 +9214,8 @@ msgstr "关闭对话框，并取消授权"
msgid "Close the dialog and accept the Access Token"
msgstr "关闭对话框，并应用访问令牌"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "警告：无法取消执行中的 OAuth 操作"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "正在从“{0}”取回 OAuth 要求令牌"
@@ -9069,6 +9280,12 @@ msgstr "允许写入您的首选项"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "选择以使 JOSM 有权写入您服务器的首选项"
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "正在取回 OAuth 访问令牌..."
@@ -9131,9 +9348,6 @@ msgstr ""
"<html>JOSM 已成功的取回访问令牌。您现在可以应用这个令牌。JOSM 往后会用它进行与 OSM "
"服务器的验证。<br><br>访问令牌为：</html>"
-msgid "Restart"
-msgstr "重新启动"
-
msgid "Click to retrieve a Request Token"
msgstr "点击以取回要求令牌"
@@ -9169,6 +9383,8 @@ msgid ""
"not<br>be able to access any protected resource on this server using this "
"token.</html>"
msgstr ""
+"<html>无法使用访问令牌“{1}”<br>访问 OSM "
+"服务器“{0}”。<br>服务器拒绝了未经授权的访问令牌。您将不能使用此令牌访问此服务器上任何受保护的资源。</html>"
msgid "Test failed"
msgstr "测试失败"
@@ -9386,6 +9602,9 @@ msgstr "下载插件"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "您必须重新启动 JOSM，才能让某些设定值生效。"
+msgid "Would you like to restart now?"
+msgstr "您想要现在重启吗？"
+
msgid "Remote Control"
msgstr "远程控制"
@@ -9453,7 +9672,7 @@ msgid "Version:"
msgstr "版本："
msgid "Minimum JOSM Version:"
-msgstr ""
+msgstr "最低的JOSM版本"
msgid "by {0}"
msgstr "由 {0}"
@@ -9468,25 +9687,25 @@ msgid "active"
msgstr "启用"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr ""
+msgstr "地图绘制风格文件(*.xml，*.mapcss，*.zip)"
msgid "Preset definition file (*.xml, *.zip)"
-msgstr ""
+msgstr "预设组合定义文件(*.xml，*.zip)"
msgid "Edit source entry:"
msgstr "编辑来源项目："
msgid "Entry ''{0}'' requires JOSM Version {1}. (Currently running: {2})"
-msgstr ""
+msgstr "条目“{0}”需要 JOSM 版本 {1}。(当前运行：{2})"
msgid "Continue anyway"
-msgstr ""
+msgstr "仍然继续"
msgid "Ignore warning and install style anyway"
-msgstr ""
+msgstr "忽略警告，并强制安装风格"
msgid "Some entries have unmet dependencies:"
-msgstr ""
+msgstr "一些条目有未满足的依赖关系："
msgid "Reset"
msgstr "重新设定"
@@ -9515,6 +9734,12 @@ msgstr "从工具栏中删除"
msgid "Configure toolbar"
msgstr "配置工具栏"
+msgid "Edit shortcut"
+msgstr "编辑快捷键"
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "动作"
@@ -9557,6 +9782,9 @@ msgstr "没有名字的已注册工具栏动作：{0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "覆盖已注册的工具栏动作 {0}：{1} 得到 {2}"
+msgid "Toolbar: {0}"
+msgstr "工具栏：{0}"
+
msgid "Data validator"
msgstr "数据检验器"
@@ -9607,22 +9835,12 @@ msgstr "查找： "
msgid "Read from file"
msgstr "从文件中读取"
-msgid "Open JOSM customization file"
-msgstr "打开 JOSM 自定义文件"
-
-msgid "Import log"
-msgstr "导入日志"
-
-msgid ""
-"<html>Here is file import summary. <br/>You can reject preferences changes "
-"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
-"JOSM restart may be needed.</html>"
-msgstr ""
-"<html>这里是文件导入摘要。<br/>您可以在首选项对话框中按“取消”以拒绝首选项的改变。<br/>要激活一些更改，JOSM 可能需要重新启动。"
-
msgid "Export selected items"
msgstr "导出所选项目"
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM 自定义设置文件(*.xml)"
+
msgid "Please select some preference keys not marked as default"
msgstr "请选择一些没有被标记为默认值的首选项键"
@@ -9638,41 +9856,51 @@ msgstr "依文件，追加首选项到现有的值"
msgid "Replace existing values"
msgstr "取代现有的值"
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM 自定义设置文件(*.xml)"
+msgid "Open JOSM customization file"
+msgstr "打开 JOSM 自定义文件"
-msgid "Advanced Background: Changed"
-msgstr "高级背景：已更改"
+msgid "Import log"
+msgstr "导入日志"
+
+msgid ""
+"<html>Here is file import summary. <br/>You can reject preferences changes "
+"by pressing \"Cancel\" in preferences dialog <br/>To activate some changes "
+"JOSM restart may be needed.</html>"
+msgstr ""
+"<html>这里是文件导入摘要。<br/>您可以在首选项对话框中按“取消”以拒绝首选项的改变。<br/>要激活一些更改，JOSM 可能需要重新启动。"
-msgid "Advanced Background: NonDefalut"
-msgstr "高级背景：非默认"
+msgid "shortcut"
+msgstr ""
-msgid "Current value is default."
-msgstr "当前值是默认的。"
+msgid "color"
+msgstr ""
-msgid "Default value is ''{0}''."
-msgstr "默认值为“{0}”。"
+msgid "toolbar"
+msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "默认值目前未知(设定值尚未使用)。"
+msgid "imagery"
+msgstr ""
-msgid "Select Setting Type:"
-msgstr "选择设置类型："
+msgid "Reset preferences"
+msgstr ""
-msgid "Simple"
-msgstr "简单"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
+msgstr ""
-msgid "List"
-msgstr "列表"
+msgid "Load profile"
+msgstr ""
-msgid "List of lists"
-msgstr "列表的列表"
+msgid "Save {0} profile"
+msgstr ""
-msgid "List of maps"
-msgstr "地图列表"
+msgid "All the preferences of this group are default, nothing to save"
+msgstr ""
-msgid "Add setting"
-msgstr "添加设置"
+msgid "Choose profile file"
+msgstr ""
msgid "Change list setting"
msgstr "更改列表设置"
@@ -9695,6 +9923,39 @@ msgstr "更改地图设置的列表"
msgid "Entry {0}"
msgstr "条目 {0}"
+msgid "Select Setting Type:"
+msgstr "选择设置类型："
+
+msgid "Simple"
+msgstr "简单"
+
+msgid "List"
+msgstr "列表"
+
+msgid "List of lists"
+msgstr "列表的列表"
+
+msgid "List of maps"
+msgstr "地图列表"
+
+msgid "Add setting"
+msgstr "添加设置"
+
+msgid "Advanced Background: Changed"
+msgstr "高级背景：已更改"
+
+msgid "Advanced Background: NonDefault"
+msgstr ""
+
+msgid "Current value is default."
+msgstr "当前值是默认的。"
+
+msgid "Default value is ''{0}''."
+msgstr "默认值为“{0}”。"
+
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "默认值目前未知(设定值尚未使用)。"
+
msgid "Change string setting"
msgstr "更改字符串设置"
@@ -9751,6 +10012,9 @@ msgstr "在选择模式中，绘出虚拟节点"
msgid "Draw inactive layers in other color"
msgstr "将未使用的图层以其他颜色绘制"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "高亮显示目标路径和节点"
@@ -9761,7 +10025,7 @@ msgid "Smooth map graphics (antialiasing)"
msgstr "平滑地图图片(反锯齿)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
-msgstr ""
+msgstr "线框模式中平滑地图图形(反锯齿)"
msgid "Draw only outlines of areas"
msgstr "只绘出区域的轮廓"
@@ -9794,7 +10058,7 @@ msgstr "在地图查看应用平滑化，以产生较平滑的外观。"
msgid ""
"Apply antialiasing to the map view in wireframe mode resulting in a smoother "
"appearance."
-msgstr ""
+msgstr "在线框模式中平滑地图视图，以产生一个平滑的外观。"
msgid "Hightlight target nodes and ways while drawing or selecting"
msgstr "当绘制或选择时，高亮显示目标路径和节点"
@@ -9804,6 +10068,11 @@ msgid ""
"in the selected style."
msgstr "这个选项会防止填满区域，并且会覆盖在选定样式中指定的任何数值。"
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr "影响绘制性能的选项"
@@ -9814,7 +10083,7 @@ msgid "Select and draw mode options"
msgstr ""
msgid "Other options"
-msgstr ""
+msgstr "其它选项"
msgid "OSM Data"
msgstr "OSM 数据"
@@ -10035,7 +10304,7 @@ msgid "Add Imagery URL"
msgstr "添加图像 URL"
msgid "1. Enter URL"
-msgstr ""
+msgstr "输入URL"
msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
@@ -10062,13 +10331,13 @@ msgid ""
msgstr ""
msgid "2. Enter maximum zoom (optional)"
-msgstr ""
+msgstr "请输入最高的缩放 (可选)"
msgid "3. Verify generated TMS URL"
-msgstr ""
+msgstr "验证生成的 TMS URL"
msgid "4. Enter name for this layer"
-msgstr ""
+msgstr "请输入层名字"
msgid "Store WMS endpoint only, select layers at usage"
msgstr ""
@@ -10077,15 +10346,21 @@ msgid "Show bounds"
msgstr ""
msgid "1. Enter service URL"
-msgstr ""
+msgstr "请输入服务的URL"
msgid "Get layers"
-msgstr ""
+msgstr "检索面板"
msgid "2. Select layers"
+msgstr "选择层"
+
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10143,7 +10418,7 @@ msgid "Selected entries:"
msgstr "选择的项目："
msgid "Add a new {0} entry by entering the URL"
-msgstr ""
+msgstr "输入URL添加新值参 {0}"
msgid "Remove entry"
msgstr "删除条目"
@@ -10258,6 +10533,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr "<i>(JOSM 可以在保存数据图层时保存备份文件。会在文件名上追加“~”并保存在同一目录。)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "文件备份"
@@ -10321,8 +10602,8 @@ msgstr "地图设定值"
msgid "Settings for the map projection and data interpretation."
msgstr "地图投影与数据转译设定值。"
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "警告：无法读取标签预设组合来源：{0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "无法读取标签预设组合来源：{0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10448,10 +10729,10 @@ msgstr "更新间隔(以日计)："
msgid ""
"Please decide whether JOSM shall automatically update active plugins after a "
"certain period of time."
-msgstr ""
+msgstr "请决定一段时间后，JOSM是否自动更新活动的插件"
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "由代码(EPSG)"
msgid "Invalid projection configuration: {0}"
msgstr "无效的投影法配置：{0}"
@@ -10514,7 +10795,7 @@ msgid "GK Zone"
msgstr "高斯克鲁格区"
msgid "Gauß-Krüger Zone {0}"
-msgstr ""
+msgstr "高斯克鲁格坐标系地带 {0}"
msgid "{0} ({1} to {2} degrees)"
msgstr "{0}({1} 到 {2} 度)"
@@ -10588,21 +10869,6 @@ msgstr "Swiss Grid(瑞士)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903/ LV03(没有本地校正)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM 区"
-
-msgid "North"
-msgstr "北"
-
-msgid "South"
-msgstr "南"
-
-msgid "Hemisphere"
-msgstr "球面投影"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -10624,6 +10890,21 @@ msgstr "UTM 法国(DOM)"
msgid "UTM Geodesic system"
msgstr "UTM 大地测量系统"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM 区"
+
+msgid "North"
+msgstr "北"
+
+msgid "South"
+msgstr "南"
+
+msgid "Hemisphere"
+msgstr "球面投影"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "正在测试 OSM API URL“{0}”"
@@ -10678,9 +10959,9 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "选择以使用 OAuth 做为验证机制"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
-msgstr "警告：不支持首选项“{0}”的值，得到“{1}”。使用身份验证方法“基本身份验证”。"
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
+msgstr ""
msgid "OSM username:"
msgstr "OSM 用户名："
@@ -10688,21 +10969,26 @@ msgstr "OSM 用户名："
msgid "OSM password:"
msgstr "OSM 密码："
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "警告：无法从凭证管理程序取回 OSM 凭证。"
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr "目前的凭证管理程序类型为“{0}”"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "警告：无法将 OSM 凭证保存到凭证管理程序。"
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr "警告：无法从凭证管理程序取回 OAuth 访问令牌"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr "警告：无法将 OAuth 访问令牌保存到凭证管理程序"
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr ""
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -10784,15 +11070,9 @@ msgid "Use a SOCKS proxy"
msgstr "使用 SOCKS 代理服务器"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr "警告：JOSM 是设定为使用系统设定的代理服务器，但是 JVM 并未设定为可以取得它们。正在将首选项重设为“不使用代理服务器”"
-
-msgid "disabled"
-msgstr "已停用"
-
-msgid "no modifier"
-msgstr "没有修饰键"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
msgid "Shortcut Background: User"
msgstr "快捷键背景：用户"
@@ -10834,32 +11114,36 @@ msgstr "删除在标签表中的选择范围"
msgid "Add a new tag"
msgstr "添加新标签"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "使用群组“{1}”中的预设组合“{0}”"
-msgid "{0}:"
-msgstr "{0}："
+msgid "Use preset ''{0}''"
+msgstr "使用预设组合“{0}”"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "支持类型 {0} 的元素。"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr "预设标签“{0}-{1}”损坏 - 在“display_values”中的项目数量必须与“values”中的相同"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "更改 {0} 个对象"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr "预设标签“{0}-{1}”损坏 - 在“short_descriptions”中的项目数量必须与“values”中的相同"
+msgid "Nothing selected!"
+msgstr "尚未选择！"
-msgid "More information about this feature"
-msgstr "关于这个功能的更多信息"
+msgid "Selection unsuitable!"
+msgstr "选择范围不合适！"
+
+msgid "Apply Preset"
+msgstr "应用预设组合"
+
+msgid "New relation"
+msgstr "新建关系"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "不明的必需品：{0}"
@@ -10867,6 +11151,9 @@ msgstr "不明的必需品：{0}"
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "关于这个功能的更多信息"
+
msgid "Available roles"
msgstr "可用的角色"
@@ -10882,15 +11169,49 @@ msgstr "元素"
msgid "Optional Attributes:"
msgstr "额外属性："
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "使用群组“{1}”中的预设组合“{0}”"
+msgid "Select auto-increment of {0} for this field"
+msgstr ""
-msgid "Use preset ''{0}''"
-msgstr "使用预设组合“{0}”"
+msgid "Cancel auto-increment for this field"
+msgstr ""
+
+msgid "{0}:"
+msgstr "{0}："
+
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr "预设标签“{0}-{1}”损坏 - 在“display_values”中的项目数量必须与“values”中的相同"
+
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr "预设标签“{0}-{1}”损坏 - 在“short_descriptions”中的项目数量必须与“values”中的相同"
msgid "Unknown type: {0}"
msgstr "未知类型：{0}"
+msgid "Preset group {1} / {0}"
+msgstr "预设组合 {1} / {0}"
+
+msgid "Preset group {0}"
+msgstr "预设组合 {0}"
+
msgid "Roles cannot appear more than once"
msgstr ""
@@ -10900,40 +11221,9 @@ msgstr "预置无父元素的角色元素"
msgid "Preset sub element without parent"
msgstr "预置无父元素的子元素"
-msgid "Could not read tagging preset source: {0}"
-msgstr "无法读取标签预设组合来源：{0}"
-
msgid "Error parsing {0}: "
msgstr "分析 {0} 时发生错误： "
-msgid "Elements of type {0} are supported."
-msgstr "支持类型 {0} 的元素。"
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "更改 {0} 个对象"
-
-msgid "Nothing selected!"
-msgstr "尚未选择！"
-
-msgid "Selection unsuitable!"
-msgstr "选择范围不合适！"
-
-msgid "Apply Preset"
-msgstr "应用预设组合"
-
-msgid "New relation"
-msgstr "新建关系"
-
-msgid "Change Properties"
-msgstr "更改属性"
-
-msgid "Preset group {1} / {0}"
-msgstr "预设组合 {1} / {0}"
-
-msgid "Preset group {0}"
-msgstr "预设组合 {0}"
-
msgid "Search preset"
msgstr "搜索预设组合"
@@ -10949,8 +11239,16 @@ msgstr "只显示可适用的选项"
msgid "Search in tags"
msgstr "搜索关键字"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr "可调整的 {0} 尚未设定。不能在同步调整中设定参与。"
+
+msgid "Adjustable {0} not registered yet."
+msgstr "可调整的 {0} 尚未注册。"
+
msgid "All files (*.*)"
-msgstr ""
+msgstr "所有文件(*.*)"
msgid "Min. latitude"
msgstr "最小纬度"
@@ -10978,6 +11276,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr "目前的数值不是有效的 OSM ID。请输入大于 0 的整数值"
+msgid "false: the property is explicitly switched off"
+msgstr "false：该属性已经被确实关闭了"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true：该属性已经被确实打开了"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "部分：不同选定的对象有不同的数值，不要改变"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "取消设定：不要在选定的对象上设定这个属性"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr "右键=复制到剪贴板"
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "缺少必要的属性“{0}”。"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr "类型 long 的必要属性“{0}”有不合法的数值。得到“{1}”。"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr "类型 long (>=0) 的必要属性“{0}”有不合法的数值。得到“{1}”。"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr "类型 boolean 的属性“{0}”有不合法的数值。得到“{1}”。"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr "类型 boolean 的必要属性“{0}”有不合法的数值。得到“{1}”。"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr "类型 OsmPrimitiveType 的必要属性“{0}”有不合法的数值。得到“{1}”。"
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr "外部 ID“{0}”的路径包含了缺失的外部 ID“{1}”的节点。"
@@ -11008,9 +11349,9 @@ msgid "Contacting OSM Server..."
msgstr "正在连接 OSM 服务器..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
-msgstr "警告：在服务器功能元素“{1}”的属性“{0}”数值无效。得到“{2}”"
+msgstr ""
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "解析服务器返回的日期“{0}”失败。"
@@ -11048,30 +11389,27 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "首选项“{0}”中有无效的端口号。得到“{1}”。"
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
-msgstr "警告：发现意外的首选项“{0}”数值。得到“{1}”。将不使用代理服务器。"
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
+msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
-msgstr "警告：意外的 HTTP 代理服务器参数。得到主机“{0}”和端口“{1}”。"
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
+msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
-msgstr "警告：意外的 SOCKS 代理服务器参数。得到主机“{0}”和端口“{1}”。"
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
+msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr "错误：用代理服务器“{0}”连接到 URI“{1}”失败。异常为：{2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"警告：JVM 并未设定从系统设定值查询代理服务器。属性“java.net.useSystemProxies”在启动时缺失了。将不使用代理服务器。"
msgid "Parsing response from server..."
msgstr "正在分析服务器的回应..."
@@ -11167,6 +11505,9 @@ msgstr "解析 GPX 文件“{0}”时发生错误。只有文件的一部分将
msgid "Parse error: invalid document structure for GPX document."
msgstr "分析错误：GPX 文件有无效的文件结构"
+msgid "(at line {0}, column {1})"
+msgstr "(在第 {0} 行，第 {1} 列)"
+
msgid "Unknown mode {0}."
msgstr "未知模式 {0}。"
@@ -11182,13 +11523,21 @@ msgstr "寻找图像文件"
msgid "No image files found."
msgstr "找不到图像文件。"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "打开资源“{0}”的输入串流失败"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
-msgstr "警告：无法打开 zip 文件“{0}”中扩展名为“{2}”、名称为“{3}”的文件。异常为：{1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
+msgstr ""
msgid "Failed to rename file {0} to {1}."
msgstr "无法重命名文件 {0} 为 {1}。"
@@ -11265,8 +11614,8 @@ msgstr "未知的句子：{0}"
msgid "Zero coordinates: {0}"
msgstr "零坐标：{0}"
-msgid "NMEA import success"
-msgstr "NMEA 输入成功"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA 输入失败！"
@@ -11364,37 +11713,13 @@ msgstr "没有在文件 {0} 中找到数据。"
msgid "Open OsmChange file"
msgstr "打开 OsmChange 文件"
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "缺少必要的属性“{0}”。"
-
msgid "Unsupported version: {0}"
msgstr "不支持的版本：{0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr "类型 long 的必要属性“{0}”有不合法的数值。得到“{1}”。"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr "类型 long (>=0) 的必要属性“{0}”有不合法的数值。得到“{1}”。"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr "类型 boolean 的属性“{0}”有不合法的数值。得到“{1}”。"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr "类型 boolean 的必要属性“{0}”有不合法的数值。得到“{1}”。"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr "类型 OsmPrimitiveType 的必要属性“{0}”有不合法的数值。得到“{1}”。"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
-msgstr "警告：在修改集合内容的位置({1},{2})有不支持的起始元素“{0}”。正在跳过。"
+msgstr ""
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -11402,9 +11727,9 @@ msgid ""
msgstr "不合法的文件结构。发现节点、路径或关系并非“create”、“modify”或“delete”。"
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr "警告：在修改集合内容的位置({1},{2})有不支持的起始元素“{0}”。正在跳过。"
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
+msgstr ""
msgid "Parsing changeset content ..."
msgstr "正在分析修改集合内容..."
@@ -11430,11 +11755,8 @@ msgstr "正在分析修改集合列表..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "无法以 OAuth 验证标头签署 HTTP 连接"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "警告：首选项“{0}”有意外的数值。得到“{1}”。"
-
-msgid "(at line {0}, column {1})"
-msgstr "(在第 {0} 行，第 {1} 列)"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>在保存时发生错误。<br>错误为：<br>{0}</html>"
@@ -11444,9 +11766,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr "<html>从备份文件还原时发生错误。<br>错误为：<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "无法备份文件。异常为：{0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM 服务器文件(gzip 压缩)"
@@ -11468,6 +11787,9 @@ msgstr "文件“{0}”中未找到数据。"
msgid "Open OSM file"
msgstr "打开 OSM 文件"
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11519,9 +11841,9 @@ msgid ""
msgstr "在 OSM 原型 ID {0} 的属性“version”有不合法的数值。得到 {1}。"
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
-msgstr "警告：将元素 {0} 的属性“version”数值一般化为 {2}，API 版本为“{3}”。得到 {1}。"
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
+msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
msgstr "不明或不支持的 API 版本。得到 {0}。"
@@ -11664,6 +11986,9 @@ msgstr "保存用户与密码(未加密)"
msgid "<delete from {0} objects>"
msgstr "<从 {0} 个对象中删除>"
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr "将标签添加到选定的对象中"
@@ -11682,6 +12007,15 @@ msgstr "Shift+Enter：将所有的标签添加到选定的对象"
msgid "Assume"
msgstr "猜测"
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr "启用该复选框可接值参"
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr "从 API 加载数据"
@@ -11706,8 +12040,14 @@ msgstr "创建新对象"
msgid "Read protocol version"
msgstr "读取通讯许可证版本"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
-msgstr "警告：无法启动远程控制服务端口 {0}:{1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
+msgstr ""
msgid "Remote Control has been asked to create a new node."
msgstr "远程控制被要求建立新的节点。"
@@ -11715,9 +12055,6 @@ msgstr "远程控制被要求建立新的节点。"
msgid "There is no layer opened to add node"
msgstr "没有用以添加节点的打开的图层"
-msgid "Add way"
-msgstr "添加路径"
-
msgid "Remote Control has been asked to create a new way."
msgstr "远程控制已被要求创建一条新的路径。"
@@ -11727,6 +12064,14 @@ msgstr "无效的坐标：{0}"
msgid "There is no layer opened to add way"
msgstr "没有用以添加路径的打开的图层"
+msgid "Add way"
+msgstr "添加路径"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11741,6 +12086,15 @@ msgstr "远程控制被要求自下列 URL 输入数据："
msgid "Remote Control has been asked to load data from the API."
msgstr "远程控制被要求自 API 下载数据。"
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11771,20 +12125,20 @@ msgstr "数据："
msgid "local file"
msgstr "本地文件"
-msgid "Link to a OSM data file on your local disk."
-msgstr "连接到本地磁盘上的一个 OSM 数据文件。"
+msgid "Link to a GPX file on your local disk."
+msgstr ""
msgid "include"
msgstr "包含"
-msgid "Include OSM data in the .joz session file."
-msgstr "将 OSM 数据包含在 .joz 会话文件。"
+msgid "Include GPX data in the .joz session file."
+msgstr ""
msgid "No file association"
msgstr "没有文件关联"
-msgid "OSM data will be included in the session file."
-msgstr "OSM 数据将会包含在会话文件中。"
+msgid "GPX data will be included in the session file."
+msgstr ""
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -11805,11 +12159,23 @@ msgstr "图层包含未保存的数据 - 保存到文件。"
msgid "Layer does not contain unsaved data."
msgstr "图层不包含未保存的数据。"
+msgid "Link to a OSM data file on your local disk."
+msgstr "连接到本地磁盘上的一个 OSM 数据文件。"
+
+msgid "Include OSM data in the .joz session file."
+msgstr "将 OSM 数据包含在 .joz 会话文件。"
+
+msgid "OSM data will be included in the session file."
+msgstr "OSM 数据将会包含在会话文件中。"
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr "不支持数据图层版本“{0}”的 OSM 元数据。预期：0.1"
+msgid "Session file (*.jos, *.joz)"
+msgstr "会话文件(*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr "无法定位文件“{0}”。"
@@ -11879,14 +12245,14 @@ msgid "Download skipped"
msgstr "下载跳过的"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
-msgstr "警告：无法下载插件“{0}”。它的下载连接不明。正跳过下载。"
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
+msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
-msgstr "警告：无法下载插件“{0}”。它的下载连接“{1}”不是有效的 URL。正跳过下载。"
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
+msgstr ""
msgid "Failed to create plugin directory ''{0}''"
msgstr "无法建立插件目录“{0}”"
@@ -12024,11 +12390,11 @@ msgstr[0] "请在 JOSM 启动后打开首选项对话框，并尝试手动更新
msgid "Plugin update failed"
msgstr "插件更新失败"
-msgid "Warning: failed to find plugin {0}"
-msgstr "警告：无法找到插件 {0}"
+msgid "Failed to find plugin {0}"
+msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "警告：无法下载插件数据列表"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "停用插件"
@@ -12042,23 +12408,22 @@ msgstr "保留插件"
msgid "Click to keep the plugin ''{0}''"
msgstr "点击以保留插件“{0}”"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "警告：删除过时的插件“{0}”失败。"
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
-msgstr "警告：安装已下载的插件“{0}”失败。正在跳过安装。JOSM 仍然会加载旧的插件版本。"
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
+msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
-msgstr "警告：从临时下载文件“{1}”安装插件“{0}”失败。{2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
-msgstr "警告：从临时下载文件“{1}”安装插件“{0}”失败。仍然失败。"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
+msgstr ""
msgid "Click to disable the plugin ''{0}''"
msgstr "点击以停用插件“{0}”"
@@ -12126,9 +12491,8 @@ msgstr "正在处理插件网站缓存文件..."
msgid "Processing file ''{0}''"
msgstr "正在处理文件“{0}”"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
-msgstr "警告：无法扫描文件“{0}”的插件信息。正在跳过。"
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
+msgstr ""
msgid "Processing plugin site cache icon files..."
msgstr "正在处理插件网站的缓存图标文件..."
@@ -12142,10 +12506,25 @@ msgstr "下载插件列表..."
msgid "Downloading plugin list from ''{0}''"
msgstr "正在从“{0}”下载插件列表"
-msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
-msgstr "警告：无法建立插件目录“{0}”。不能从插件网站“{1}”缓存插件列表。"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
+msgid ""
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
+msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
msgstr "正在将插件列表写入本地缓存“{0}”"
@@ -12483,18 +12862,12 @@ msgstr "严重的错误：无法定位图片“{0}”。这是严重的配置问
msgid "Failed to locate image ''{0}''"
msgstr "定位图像“{0}”时失败"
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "警告：无法处理 zip 文件“{0}”。异常为：{1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr "警告：基于安全性理由无法访问目录“{0}”。异常为：{1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
-msgstr "警告：无法从 JOSM 地区代码“{0}”取得维基语言前缀。使用默认的代码“en”。"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
+msgstr ""
msgid "{0}... [please type its number]"
msgstr "{0}... [请输入其编号]"
@@ -12504,42 +12877,98 @@ msgid ""
"platform first."
msgstr "无法打开 URL。目前尚未设定平台。请先设定平台。"
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr "已保留"
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr "安静快捷键冲突：“{0}”被“{1}”移动到“{2}”。"
msgid "There was {0} tag found in the buffer, it is suspicious!"
msgid_plural "There were {0} tags found in the buffer, it is suspicious!"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "在剪贴板找到 {0} 标签，可疑！"
msgid "Key is too long (max {0} characters):"
-msgstr ""
+msgstr "键太长(最长为 {0} 个字符)："
msgid "Suspicious characters in key:"
-msgstr ""
+msgstr "键中有可疑字符："
msgid "Value is too long (max {0} characters):"
-msgstr ""
+msgstr "值太长(最长为 {0} 个字符)："
msgid "Do you want to paste these tags?"
msgstr "您想要粘贴这些标签吗？"
msgid "Clear buffer"
-msgstr ""
+msgstr "清空缓存"
msgid "Ignore warnings"
-msgstr ""
+msgstr "忽略警告"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
"contain any JOSM object or suitable text. </p></html>"
+msgstr "<html><p>对不起，无法粘贴缓存中的标签，缓存中没有JOSM对象或适当的文本。</p></html>"
+
+msgid "ms"
msgstr ""
-msgid "Right click = copy to clipboard"
-msgstr "右键=复制到剪贴板"
+msgid "s"
+msgstr ""
+
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -12863,6 +13292,11 @@ msgid "Saturation:"
msgstr "饱和度："
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr "以单一对话框进行群组通用地址填写的输入，同时也可以选择自动从路径产生个别门牌号码节点。"
@@ -12942,6 +13376,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "寻找并以适当的方式来修正无效的街道地址。"
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr "为其他 JOSM 插件提供 GeoTools 库。这并不意味着要由用户直接安装，而是作为其他插件的一个依赖。"
@@ -12972,7 +13410,7 @@ msgid ""
msgstr "图像偏移的数据库：一个按钮，分享和获取图像偏移。"
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-样式图片调整地图模式"
+msgstr ""
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -13045,9 +13483,6 @@ msgstr "为 4 或 5 条路径添加禁止左转"
msgid "Simplifies download from different read-only APIs."
msgstr "简化从不同的只读 API 下载。"
-msgid "Simply convert an area to a multipolygon."
-msgstr "简单地用多重多边形覆盖一个区域。"
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr "允许在任何选定区域中，一次性给所有的对象添加标签"
@@ -13104,6 +13539,9 @@ msgid ""
"right click menu of the image layer."
msgstr "将 gps 地点信息写入图片档的档头。在图片图层按右键菜单就可以执行这项功能。"
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13128,9 +13566,6 @@ msgstr "这个插件简化了公共交通路线的制图与编辑。"
msgid "Relation and multipolygon creating and editing panel."
msgstr "关系及多重多边形的创建和编辑面板。"
-msgid "Adds Restart JOSM item to File menu."
-msgstr "添加重新启动 JOSM 项目到文件菜单。"
-
msgid "Plugin for reverting changesets"
msgstr "还原修改集合的插件"
@@ -13156,9 +13591,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr "由移除属于很钝的钝角的节点来简化区域。这可以使用最大移除区域大小来限制。同时也会平均化附近的节点。"
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "建立并编辑 OpenSeaMap 海图"
-
msgid "Edit features for OpenSeaMap"
msgstr "OpenSeaMap 的编辑功能"
@@ -13195,6 +13627,11 @@ msgid ""
"to be running."
msgstr "从捷克地籍图描出建筑物。需要有执行 TracerServer(.NET 或 Mono)。"
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "用来数字签名 OSM-数据的插件"
@@ -13241,9 +13678,6 @@ msgid ""
"behind."
msgstr "在航拍图上将一辆赛车从 A 点开到 B 点，不管后面的仙人掌。"
-msgid "Highways"
-msgstr "公路"
-
msgid "Streets"
msgstr "街道"
@@ -13328,6 +13762,9 @@ msgstr "路堤"
msgid "Lit"
msgstr "路灯"
+msgid "Toll"
+msgstr "收费"
+
msgid "Motorway Link"
msgstr "高速公路连络线"
@@ -13418,6 +13855,50 @@ msgstr "居住区道路(Residential)"
msgid "Edit Residential Street"
msgstr "编辑居住区道路"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "公路类型"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "是"
+
+msgid "no"
+msgstr "否"
+
+msgid "destination"
+msgstr "仅目的地"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "生活街道"
@@ -13436,11 +13917,11 @@ msgstr "区域"
msgid "Service"
msgstr "服务道路(Service)"
-msgid "Edit Serviceway"
-msgstr "编辑服务道路"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "服务道路类型"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "巷/弄"
@@ -13451,6 +13932,9 @@ msgstr "车道"
msgid "parking_aisle"
msgstr "停车场通道"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "停车场通道"
@@ -13478,18 +13962,12 @@ msgstr "环岛"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "是"
-
msgid "Road Restrictions"
msgstr "道路限制"
msgid "Edit Road Restrictions"
msgstr "编辑道路限制"
-msgid "Toll"
-msgstr "收费"
-
msgid "No exit (cul-de-sac)"
msgstr "没有出口(死路)"
@@ -13499,9 +13977,6 @@ msgstr "交通模式限制"
msgid "General Access"
msgstr "常规"
-msgid "destination"
-msgstr "仅目的地"
-
msgid "delivery"
msgstr "送交"
@@ -13511,15 +13986,15 @@ msgstr "有限"
msgid "private"
msgstr "私人"
+msgid "customers"
+msgstr "顾客"
+
msgid "agricultural"
msgstr "农业"
msgid "forestry"
msgstr "林业"
-msgid "no"
-msgstr "否"
-
msgid "official"
msgstr "官方"
@@ -13565,6 +14040,9 @@ msgstr "大容量车(hov)"
msgid "Public Service Vehicles (psv)"
msgstr "公共汽车(psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "最低速度(km/h)"
@@ -13649,6 +14127,9 @@ msgstr "编辑桥梁"
msgid "viaduct"
msgstr "旱桥"
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr "吊桥"
@@ -13753,20 +14234,29 @@ msgstr ""
msgid "Visibility"
msgstr "可见状态"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "极好"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "良好"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "中等"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "较差"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "可怕"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "轮椅"
@@ -13783,11 +14273,11 @@ msgstr "专用马道"
msgid "Edit Bridleway"
msgstr "编辑马道"
-msgid "Cycle Lane"
-msgstr "自行车道"
+msgid "Cycle Lane/Track"
+msgstr ""
-msgid "Edit Cycle Lane"
-msgstr "编辑自行车道"
+msgid "Edit Cycle Lane or Track"
+msgstr ""
msgid "Cycleway"
msgstr "自行车路"
@@ -13822,8 +14312,8 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr "单行道(自行车)"
-msgid "Edit Highway"
-msgstr "编辑公路"
+msgid "Edit Highway Attributes:"
+msgstr ""
msgid "Highway"
msgstr "公路"
@@ -13891,12 +14381,18 @@ msgstr "休息区"
msgid "Edit Rest Area"
msgstr "编辑休息区"
-msgid "Emergency Phone"
-msgstr "紧急电话"
+msgid "Drinking Water"
+msgstr "饮水机"
msgid "Traffic Signal"
msgstr "信号灯"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "人行横道类型"
@@ -13912,15 +14408,6 @@ msgstr "安全岛"
msgid "unmarked"
msgstr "未画标记"
-msgid "Cross on horseback"
-msgstr "骑马穿越"
-
-msgid "Cross by bicycle"
-msgstr "以自行车穿越"
-
-msgid "Crossing attendant"
-msgstr "有人陪同穿越"
-
msgid "Crossing type name (UK)"
msgstr "人行横道类型名称(英国)"
@@ -13942,6 +14429,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr "有人陪同穿越"
+
+msgid "Cross by bicycle"
+msgstr "以自行车穿越"
+
+msgid "Cross on horseback"
+msgstr "骑马穿越"
+
msgid "Stop"
msgstr "禁止通行"
@@ -13951,6 +14447,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "小型环岛"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "方向"
@@ -13960,11 +14459,8 @@ msgstr "顺时针"
msgid "Pedestrian Crossing"
msgstr "人行横道"
-msgid "Edit Crossing"
-msgstr "编辑人行横道"
-
-msgid "Type name (UK)"
-msgstr "类型名称(英国)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "道路减速设施"
@@ -13996,9 +14492,6 @@ msgstr ""
msgid "Passing Place"
msgstr "让车处"
-msgid "Edit Passing Place"
-msgstr "编辑让车处"
-
msgid "Turning Circle"
msgstr "回旋圈"
@@ -14032,20 +14525,44 @@ msgstr "维基百科"
msgid "Barriers"
msgstr "障碍物"
+msgid "Block"
+msgstr "水泥护栏"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "允许通行方向："
+
+msgid "Material"
+msgstr "材质"
+
+msgid "stone"
+msgstr "石头"
+
msgid "Bollard"
msgstr "车阻柱"
msgid "Edit Bollard"
msgstr "编辑车阻柱"
-msgid "Allowed traffic:"
-msgstr "允许通行方向："
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "塑胶"
msgid "Cycle Barrier"
msgstr "自行车护栏"
-msgid "Block"
-msgstr "水泥护栏"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "家畜栅栏"
@@ -14056,6 +14573,9 @@ msgstr "编辑家畜栅栏"
msgid "Bus Trap"
msgstr "公交车专用道障碍"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "长钉"
@@ -14077,50 +14597,94 @@ msgstr "编辑国境管控站"
msgid "Hedge"
msgstr "树篱"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "高度(米)"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "围栏"
+msgid "Edit Fence"
+msgstr ""
+
msgid "barbed_wire"
msgstr "铁丝网"
-msgid "chain"
-msgstr "锁链"
+msgid "chain_link"
+msgstr ""
msgid "electric"
msgstr "电"
-msgid "hedge"
-msgstr "树篱"
-
msgid "pole"
msgstr "杆"
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "墙"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "城墙"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "挡土墙"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "沟"
+msgstr ""
-msgid "Entrance"
-msgstr "入口"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "编辑入口"
+msgid "Kerb"
+msgstr ""
-msgid "Gate"
-msgstr "门"
+msgid "Edit Kerb"
+msgstr ""
-msgid "Edit Gate"
-msgstr "编辑门"
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
+
+msgid "Gate"
+msgstr "门"
+
+msgid "Edit Gate"
+msgstr "编辑门"
msgid "Lift Gate"
msgstr ""
@@ -14146,12 +14710,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "栅栏台阶"
msgid "Edit Stile"
msgstr "编辑栅栏台阶"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "旋转栅门"
@@ -14209,6 +14788,9 @@ msgstr "渠"
msgid "Edit Drain"
msgstr "编辑渠"
+msgid "Ditch"
+msgstr "沟"
+
msgid "Edit Ditch"
msgstr "编辑沟"
@@ -14218,6 +14800,12 @@ msgstr "溪流"
msgid "Edit Stream"
msgstr "编辑溪流"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "运河"
@@ -14257,9 +14845,6 @@ msgstr "编辑水坝"
msgid "Groyne"
msgstr "防波堤"
-msgid "Edit Groyne"
-msgstr "编辑防波堤"
-
msgid "Breakwater"
msgstr "防波堤"
@@ -14293,6 +14878,21 @@ msgstr "编辑有覆盖的贮水处"
msgid "Edit Water"
msgstr "编辑水域"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "陆地"
@@ -14374,20 +14974,25 @@ msgstr "编辑渡轮端点"
msgid "Cargo"
msgstr "装载物"
+msgctxt "cargo"
msgid "passengers"
-msgstr "乘客"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "车辆"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "单车"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "大型货车"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "旅客和车辆"
+msgstr ""
msgid "Ferry Route"
msgstr "渡轮路线"
@@ -14458,8 +15063,11 @@ msgstr "军事"
msgid "tourism"
msgstr "旅游"
-msgid "Service/Type"
-msgstr "类别"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
+msgstr ""
msgid "yard"
msgstr "站线"
@@ -14482,11 +15090,14 @@ msgstr "接触网"
msgid "rail"
msgstr "第三轨"
-msgid "Voltage"
-msgstr "电压"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "频率(Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14497,9 +15108,6 @@ msgstr "窄轨"
msgid "Edit Narrow Gauge Rail"
msgstr "编辑窄轨"
-msgid "Types"
-msgstr "类型"
-
msgid "Monorail"
msgstr "单轨"
@@ -14542,18 +15150,56 @@ msgstr "不使用的轨道"
msgid "Edit Disused Railway"
msgstr "编辑不使用的铁路"
-msgid "Optional Types"
-msgstr "选择性的类型"
-
msgid "Abandoned Rail"
msgstr "废弃的轨道"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "铁路平交道"
+msgid "Edit Level Crossing"
+msgstr ""
+
+msgid "Supervised"
+msgstr "有人看管"
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr "障碍物"
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
msgid "Crossing"
msgstr "铁路人行道口"
+msgid "Edit Crossing"
+msgstr ""
+
msgid "Crossing type"
msgstr "平交道类型"
@@ -14653,13 +15299,11 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
-msgstr "货物缆车"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "编辑货物缆车"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -14669,13 +15313,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "编辑车站"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "吊塔"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "编辑吊塔"
+msgstr ""
msgid "Parking"
msgstr "停车场"
@@ -14692,12 +15334,12 @@ msgstr "平面"
msgid "underground"
msgstr "地下"
+msgid "rooftop"
+msgstr "屋顶"
+
msgid "Access"
msgstr "通行"
-msgid "customers"
-msgstr "顾客"
-
msgid "Park and Ride"
msgstr "停车换乘"
@@ -14725,9 +15367,6 @@ msgstr "停车位"
msgid "Edit Parking space"
msgstr "编辑停车位"
-msgid "rooftop"
-msgstr "屋顶"
-
msgid "Capacity"
msgstr "容量"
@@ -14743,20 +15382,36 @@ msgstr "时间限制(分钟)"
msgid "30+"
msgstr "30+"
-msgid "Supervised"
-msgstr "有人看管"
-
msgid "Opening Hours"
msgstr "开放时间"
msgid "24/7"
msgstr "7*24 小时"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "周一-周五 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "周二-周日 08:00-15:00；周六 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "停车场入口"
@@ -14905,6 +15560,9 @@ msgstr "充电站"
msgid "Edit Charging Station (for electric cars)"
msgstr "编辑充电站(为电动车)"
+msgid "Voltage"
+msgstr "电压"
+
msgid "Amperage"
msgstr "安培数"
@@ -14926,6 +15584,12 @@ msgstr "修车场"
msgid "Edit Car Repair"
msgstr "编辑修车场"
+msgid "Parts"
+msgstr "零件"
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "补胎处"
@@ -14953,6 +15617,12 @@ msgstr "租车"
msgid "Edit Car Rental"
msgstr "编辑租车"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr "只有"
+
msgid "Sharing"
msgstr "共享"
@@ -14977,22 +15647,6 @@ msgstr "服务："
msgid "Sale"
msgstr "减价"
-msgctxt "motorcycle"
-msgid "yes"
-msgstr "有"
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr "品牌"
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "二手"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "无"
-
msgid "brand"
msgstr "品牌"
@@ -15014,9 +15668,6 @@ msgstr "旧车性能检测"
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr "零件"
-
msgid "Clothes"
msgstr "服装店"
@@ -15080,8 +15731,8 @@ msgstr "编辑自行车租用点"
msgid "Public Transport"
msgstr "公共交通"
-msgid "Route"
-msgstr "路线"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "编辑路线"
@@ -15211,6 +15862,9 @@ msgstr "站台"
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr "公交车"
@@ -15241,6 +15895,9 @@ msgstr "缆车"
msgid "Ferry"
msgstr "渡轮"
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "长椅"
@@ -15253,9 +15910,6 @@ msgstr "轮椅"
msgid "limited"
msgstr "有限"
-msgid "only"
-msgstr "只有"
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15265,9 +15919,14 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
msgstr "车站"
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "编辑车站"
+
msgid "Building"
msgstr "建筑物"
@@ -15280,6 +15939,9 @@ msgstr "编辑地铁入口"
msgid "Ticket Machine"
msgstr "自动售票机"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr "编号"
@@ -15304,14 +15966,6 @@ msgstr "帐号或会员卡"
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "车站"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "编辑车站"
-
msgid "UIC-Reference"
msgstr "国际铁路联盟编号"
@@ -15360,8 +16014,8 @@ msgstr "编辑公交车月台"
msgid "Taxi"
msgstr "出租车"
-msgid "Edit Taxi station"
-msgstr "编辑出租车招呼站"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "机场"
@@ -15414,6 +16068,21 @@ msgstr "航站楼"
msgid "Edit Terminal"
msgstr "编辑航站楼"
+msgid "Internet access"
+msgstr "网络接入"
+
+msgid "wlan"
+msgstr "无线"
+
+msgid "wired"
+msgstr "有线"
+
+msgid "terminal"
+msgstr "终端"
+
+msgid "Internet access fee"
+msgstr "收费网络接入"
+
msgctxt "airport"
msgid "Gate"
msgstr "登机口"
@@ -15436,21 +16105,6 @@ msgstr "编辑旅馆"
msgid "Stars"
msgstr "星级"
-msgid "Internet access"
-msgstr "网络接入"
-
-msgid "wlan"
-msgstr "无线"
-
-msgid "wired"
-msgstr "有线"
-
-msgid "terminal"
-msgstr "终端"
-
-msgid "Internet access fee"
-msgstr "收费网络接入"
-
msgid "Smoking"
msgstr "吸烟"
@@ -15634,6 +16288,12 @@ msgstr "夜总会"
msgid "Edit Nightclub"
msgstr "编辑夜总会"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "旅游"
@@ -15655,9 +16315,15 @@ msgstr "眺望塔"
msgid "Information Office"
msgstr "信息服务处"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "地图"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr "详细等级"
@@ -15670,6 +16336,9 @@ msgstr "街"
msgid "scheme"
msgstr "设计图"
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "显示区域"
@@ -15709,6 +16378,9 @@ msgstr "... 其他运输方式也可被接受"
msgid "Information Board"
msgstr "信息板"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "信息板内容"
@@ -15730,23 +16402,35 @@ msgstr "植物"
msgid "Guidepost"
msgstr "路牌"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr "信息终端机"
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr "贴切描述"
msgid "Audioguide"
msgstr "语音导览"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "在手机上的语音导览？"
msgid "Phone number"
msgstr "电话号码"
-msgid "Other Information Points"
-msgstr "其他的信息点"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "休闲"
@@ -15769,9 +16453,6 @@ msgstr ""
msgid "Edit Dog Park"
msgstr ""
-msgid "Barrier"
-msgstr "障碍物"
-
msgid "fence"
msgstr "栅栏"
@@ -15796,8 +16477,17 @@ msgstr "桑拿"
msgid "Edit Sauna"
msgstr "编辑桑拿"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "周二-周日 08:00-15:00；周六 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "运动场"
@@ -15869,50 +16559,44 @@ msgstr "艺术工作"
msgid "Edit Artwork"
msgstr "编辑艺术工作"
+msgid "Recording Studio"
+msgstr "录音室"
+
+msgid "Edit Studio"
+msgstr "编辑录音室"
+
+msgid "audio"
+msgstr "音频"
+
+msgid "video"
+msgstr "视频"
+
msgid "Place of Worship"
msgstr "宗教场所"
-msgid "Edit Place of Worship"
-msgstr "编辑宗教场所"
+msgid "Church"
+msgstr "教堂"
-msgid "Religion"
-msgstr "宗教"
+msgid "Edit Church"
+msgstr ""
-msgid "bahai"
-msgstr "巴海大同教"
+msgid "Building type"
+msgstr ""
-msgid "buddhist"
-msgstr "佛教"
-
-msgid "christian"
-msgstr "基督教系"
-
-msgid "hindu"
-msgstr "印度教"
-
-msgid "jain"
-msgstr "耆那教"
-
-msgid "jewish"
-msgstr "犹太教"
-
-msgid "muslim"
-msgstr "伊斯兰教"
-
-msgid "sikh"
-msgstr "锡克教"
+msgid "basilica"
+msgstr ""
-msgid "spiritualist"
-msgstr "巫术"
+msgid "cathedral"
+msgstr ""
-msgid "taoist"
-msgstr "道教"
+msgid "chapel"
+msgstr ""
-msgid "unitarian"
-msgstr "一位论派基督教"
+msgid "church"
+msgstr "教堂"
-msgid "zoroastrian"
-msgstr "祆教"
+msgid "temple"
+msgstr ""
msgid "Denomination"
msgstr "教派"
@@ -15929,6 +16613,12 @@ msgstr "天主教"
msgid "evangelical"
msgstr "福音派"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr "耶和华见证"
@@ -15941,6 +16631,9 @@ msgstr "卫理公会教"
msgid "mormon"
msgstr "摩门教"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "东正教"
@@ -15956,38 +16649,141 @@ msgstr "新教"
msgid "quaker"
msgstr "教友派"
+msgid "roman_catholic"
+msgstr ""
+
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
+
+msgid "Service Times"
+msgstr "服务时间"
+
+msgid "18:00"
+msgstr ""
+
+msgid "sunset,sunrise"
+msgstr ""
+
+msgid "Su 9:30,11:00"
+msgstr ""
+
+msgid "Sa,Su,PH 9:00"
+msgstr ""
+
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
+
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
+
+msgid "Sa 10:00+"
+msgstr ""
+
+msgid "Mosque"
+msgstr ""
+
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
msgid "shia"
msgstr "什叶派"
msgid "sunni"
msgstr "逊尼派"
-msgid "Service Times"
-msgstr "服务时间"
+msgid "Synagogue"
+msgstr ""
-msgid "Su 10:00"
-msgstr "星期日 10:00"
+msgid "Edit Synagogue"
+msgstr ""
-msgid "Su 10:30"
-msgstr "星期日 10:30"
+msgid "synagogue"
+msgstr ""
-msgid "Su 11:00"
-msgstr "星期日 11:00"
+msgid "conservative"
+msgstr ""
-msgid "Opening Hours for visiting"
-msgstr "参观时间"
+msgid "reform"
+msgstr ""
-msgid "Recording Studio"
-msgstr "录音室"
+msgid "Buddhist Temple"
+msgstr ""
-msgid "Edit Studio"
-msgstr "编辑录音室"
+msgid "Edit Buddhist Temple"
+msgstr ""
-msgid "audio"
-msgstr "音频"
+msgid "theravada"
+msgstr ""
-msgid "video"
-msgstr "视频"
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "宗教"
+
+msgid "bahai"
+msgstr "巴海大同教"
+
+msgid "jain"
+msgstr "耆那教"
+
+msgid "sikh"
+msgstr "锡克教"
+
+msgid "spiritualist"
+msgstr "巫术"
+
+msgid "taoist"
+msgstr "道教"
+
+msgid "unitarian"
+msgstr "一位论派基督教"
+
+msgid "zoroastrian"
+msgstr "祆教"
msgid "Public Building"
msgstr "公共建筑"
@@ -16076,6 +16872,12 @@ msgstr "编辑驾校"
msgid "License Classes"
msgstr "许可类型"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "健康"
@@ -16085,6 +16887,12 @@ msgstr "医院"
msgid "Edit Hospital"
msgstr "编辑医院"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "医师"
@@ -16151,12 +16959,66 @@ msgstr "兽医"
msgid "Edit Veterinary"
msgstr "编辑兽医"
-msgid "Note"
-msgstr "注释"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "公共"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
+msgstr ""
msgid "Post Box"
msgstr "邮筒"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "电话"
@@ -16166,6 +17028,30 @@ msgstr "编辑电话"
msgid "Telephone cards"
msgstr "电话卡"
+msgid "Emergency Phone"
+msgstr "紧急电话"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "时钟"
@@ -16175,30 +17061,36 @@ msgstr "编辑时钟"
msgid "Display"
msgstr "显示"
-msgctxt "display"
msgid "analog"
-msgstr "模拟"
+msgstr ""
-msgctxt "display"
msgid "digital"
-msgstr "数字"
+msgstr ""
-msgctxt "display"
msgid "sundial"
-msgstr "日晷"
+msgstr ""
-msgctxt "display"
msgid "unorthodox"
-msgstr "非主流"
+msgstr ""
msgid "Support"
msgstr "支撑"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "壁挂式"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
-msgstr "告示牌"
+msgstr ""
+
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
msgid "Visibility/readability"
msgstr "可见性/可读性"
@@ -16227,8 +17119,8 @@ msgstr "显示湿度"
msgid "Recycling"
msgstr "回收"
-msgid "Edit Recycling station"
-msgstr "编辑回收站"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "电池"
@@ -16254,27 +17146,15 @@ msgstr "中心"
msgid "Waste Basket"
msgstr "垃圾桶"
-msgid "Edit Waste Basket"
-msgstr "编辑垃圾桶"
-
msgid "Waste Disposal"
msgstr "废物处理"
-msgid "Edit Waste Disposal"
-msgstr "编辑废物处理"
+msgid "Edit Bench"
+msgstr ""
msgid "Backrest"
msgstr "靠背"
-msgid "Material"
-msgstr "材质"
-
-msgid "stone"
-msgstr "石头"
-
-msgid "plastic"
-msgstr "塑胶"
-
msgid "Amount of Seats"
msgstr "座椅数量"
@@ -16309,14 +17189,17 @@ msgstr "编辑狩猎站"
msgid "Height"
msgstr "高度"
+msgctxt "height"
msgid "low"
-msgstr "低"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "半高"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "全高"
+msgstr ""
msgid "Hide"
msgstr "隐藏"
@@ -16324,11 +17207,11 @@ msgstr "隐藏"
msgid "Lock"
msgstr "锁"
-msgid "Drinking Water"
-msgstr "饮水机"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "编辑饮水机"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "消防栓"
@@ -16355,6 +17238,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr "直径(毫米)"
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr "车道"
@@ -16392,119 +17278,155 @@ msgstr "竞技场"
msgid "Edit Stadium"
msgstr "编辑竞技扬"
-msgid "select sport:"
-msgstr "选择运动："
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr "运动"
+msgctxt "sport"
msgid "multi"
-msgstr "多种"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "射箭"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "田径"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "橄榄球"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "澳洲足球"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "棒球"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "篮球"
+msgstr ""
+msgctxt "sport"
msgid "boules"
-msgstr "法式滚球"
+msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "保龄球"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "加拿大足球"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "独木舟"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "攀岩"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
-msgstr "板球"
+msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
-msgstr "板球网"
+msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "木球"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "自行车"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "赛狗"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "马术"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
-msgstr "盖尔式足球"
+msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "高尔夫"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "体操"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "曲棍球"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "赛马"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "摩托车"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
-msgstr "回力球"
+msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
-msgstr "橄榄球联赛"
+msgstr ""
+msgctxt "sport"
msgid "rugby_union"
-msgstr "橄榄球联盟"
+msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "射击"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
-msgstr "滑板"
+msgstr ""
+msgctxt "sport"
msgid "skating"
-msgstr "滑冰"
+msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "滑雪"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "足球"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "游泳"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "桌球"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "网球"
+msgstr ""
msgid "Sports Centre"
msgstr "运动中心"
@@ -16536,26 +17458,27 @@ msgstr "迷你高尔夫"
msgid "Edit Miniature Golf"
msgstr "编辑迷你高尔夫"
-msgid "Sport"
-msgstr "运动"
-
msgid "Multi"
msgstr "多种"
msgid "Edit Multi"
msgstr "编辑多种"
-msgid "type"
-msgstr "类型"
-
+msgctxt "running"
msgid "pitch"
-msgstr "场地"
+msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "运动中心"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "体育场"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr "保龄球(9瓶)"
@@ -16563,6 +17486,15 @@ msgstr "保龄球(9瓶)"
msgid "Edit 9pin"
msgstr "编辑保龄球(9瓶)"
+msgid "pitch"
+msgstr "场地"
+
+msgid "sports_centre"
+msgstr "运动中心"
+
+msgid "stadium"
+msgstr "体育场"
+
msgid "10pin"
msgstr "保龄球"
@@ -16596,6 +17528,22 @@ msgstr "编辑独木舟"
msgid "Edit Cycling"
msgstr "编辑自行车"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "赛狗"
@@ -16608,8 +17556,33 @@ msgstr "马术"
msgid "Edit Equestrian"
msgstr "编辑马术"
-msgid "horse_riding"
-msgstr "骑马"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
+msgstr "泥沼"
msgid "Horse Racing"
msgstr "赛马"
@@ -16627,7 +17600,7 @@ msgid "Skating"
msgstr "溜冰"
msgid "Edit Skating"
-msgstr "编辑溜冰"
+msgstr ""
msgid "ice_rink"
msgstr "溜冰场"
@@ -16671,36 +17644,54 @@ msgstr "公园"
msgid "Difficulty"
msgstr "困难度"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "新手"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "容易"
+msgstr ""
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "高级"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "专家"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
-msgstr "自由滑"
+msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
-msgstr "经典"
+msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16743,19 +17734,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16894,6 +17881,18 @@ msgstr "模型飞机机场"
msgid "Edit Model Aerodrome"
msgstr "编辑模型飞机机场"
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr "遥控车"
@@ -16906,38 +17905,73 @@ msgstr "人造物"
msgid "Edit Building"
msgstr "编辑建筑物"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "屋顶"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "车库"
+msgstr ""
-msgid "church"
-msgstr "教堂"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "学校"
+msgstr ""
+msgctxt "building"
msgid "hangar"
-msgstr "机库"
+msgstr ""
+msgctxt "building"
msgid "commercial"
-msgstr "商业"
+msgstr ""
+msgctxt "building"
msgid "farm"
-msgstr "农场"
+msgstr ""
+msgctxt "building"
msgid "transportation"
-msgstr "交通"
+msgstr ""
+msgctxt "building"
msgid "greenhouse"
-msgstr "温室"
+msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "办公室"
+msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "大学"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr "住宅楼"
@@ -16945,21 +17979,60 @@ msgstr "住宅楼"
msgid "Edit Residential Building"
msgstr "编辑住宅楼"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
-msgstr "公寓"
+msgstr ""
+msgctxt "building"
msgid "house"
-msgstr "房子"
+msgstr ""
+msgctxt "building"
msgid "hut"
-msgstr "小屋"
+msgstr ""
+
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+msgctxt "building"
msgid "terrace"
-msgstr "平台"
+msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "入口"
+
+msgid "Edit Entrance"
+msgstr "编辑入口"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "塔"
@@ -16975,9 +18048,6 @@ msgstr "通讯"
msgid "observation"
msgstr "观测"
-msgid "Height (meters)"
-msgstr "高度(米)"
-
msgid "Flagpole"
msgstr "旗杆"
@@ -17187,42 +18257,68 @@ msgstr "工作时间"
msgid "Mo-Fr 22:00-05:00"
msgstr "周一-周五 22：00-05：00"
-msgid "Measurement Station"
-msgstr "测量站"
+msgid "Monitoring Station"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "编辑测量站"
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Measurement"
-msgstr "测量"
+msgid "Monitoring:"
+msgstr ""
-msgid "particulate_matter"
-msgstr "颗粒物"
+msgid "Weather"
+msgstr ""
-msgid "seismic"
-msgstr "地震"
+msgid "Water level"
+msgstr ""
-msgid "water_level"
-msgstr "水位"
+msgid "Tide Level"
+msgstr ""
-msgid "weather"
-msgstr "天气"
+msgid "Traffic"
+msgstr ""
-msgid "Recording"
-msgstr "记录"
+msgid "Air Quality"
+msgstr ""
-msgid "manually"
-msgstr "手动"
+msgid "Noise"
+msgstr ""
-msgid "automated"
-msgstr "自动"
+msgid "GPS Signals"
+msgstr ""
-msgid "remote"
-msgstr "远程"
+msgid "GLONASS Signals"
+msgstr ""
-msgctxt "display"
-msgid "no"
-msgstr "无"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
+msgstr ""
msgid "Survey Point"
msgstr "测量点"
@@ -17230,8 +18326,8 @@ msgstr "测量点"
msgid "Edit Survey Point"
msgstr "编辑测量点"
-msgid "Surveillance"
-msgstr "监控"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "编辑监控摄影机"
@@ -17242,29 +18338,119 @@ msgstr "室内"
msgid "outdoor"
msgstr "室外"
-msgid "public"
-msgstr "公共"
+msgid "Zone"
+msgstr ""
-msgid "Power"
-msgstr "电力"
+msgid "parking"
+msgstr ""
-msgid "Power Generator"
-msgstr "发电厂"
+msgid "traffic"
+msgstr ""
-msgid "Edit Power Generator"
-msgstr "编辑发电厂"
+msgid "shop"
+msgstr "商店"
-msgid "biofuel"
-msgstr "生物燃料"
+msgid "bank"
+msgstr ""
-msgid "biogas"
-msgstr "沼气"
+msgid "Camera"
+msgstr ""
-msgid "biomass"
-msgstr "生物质"
+msgid "fixed"
+msgstr ""
-msgid "diesel"
-msgstr "柴油"
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
+
+msgid "Power"
+msgstr "电力"
+
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr "能量输出形式"
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr "电"
+
+msgid "2 W"
+msgstr "2 W"
+
+msgid "3 kW"
+msgstr "3 kW"
+
+msgid "5 MW"
+msgstr "5 MW"
+
+msgid "7 GW"
+msgstr "7 GW"
+
+msgid "hot water"
+msgstr "热水"
+
+msgid "hot air"
+msgstr "热气"
+
+msgid "cold water"
+msgstr "冷水"
+
+msgid "cold air"
+msgstr "冷气"
+
+msgid "compressed air"
+msgstr "压缩空气"
+
+msgid "steam"
+msgstr "蒸汽"
+
+msgid "vacuum"
+msgstr "真空"
+
+msgid "Power Generator"
+msgstr "发电厂"
+
+msgid "Edit Power Generator"
+msgstr "编辑发电厂"
+
+msgid "biofuel"
+msgstr "生物燃料"
+
+msgid "biogas"
+msgstr "沼气"
+
+msgid "biomass"
+msgstr "生物质"
+
+msgid "diesel"
+msgstr "柴油"
msgid "gasoline"
msgstr "汽油"
@@ -17299,89 +18485,192 @@ msgstr "风"
msgid "Method"
msgstr "方式"
+msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr "无氧消化"
+msgstr ""
+
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+msgctxt "generator method"
msgid "combustion"
-msgstr "燃烧"
+msgstr ""
-msgid "dam"
-msgstr "水坝"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
+msgstr ""
+msgctxt "generator method"
msgid "fission"
-msgstr "裂变"
+msgstr ""
+msgctxt "generator method"
msgid "fusion"
-msgstr "聚变"
+msgstr ""
+msgctxt "generator method"
msgid "gasification"
-msgstr "气化"
-
-msgid "photovoltaic"
-msgstr "光伏"
+msgstr ""
-msgid "pumped-storage"
-msgstr "抽水蓄能"
+msgid "biomass / waste"
+msgstr ""
-msgid "pumping"
-msgstr "泵"
+msgctxt "generator method"
+msgid "photovoltaic"
+msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
-msgstr "裂解"
+msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
-msgstr "水流"
+msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
-msgstr "热"
+msgstr ""
-msgid "Output forms of energy"
-msgstr "能量输出形式"
+msgctxt "generator method"
+msgid "water-pumped-storage"
+msgstr ""
-msgid "electricity"
-msgstr "电"
+msgctxt "generator method"
+msgid "water-storage"
+msgstr ""
-msgid "2 W"
-msgstr "2 W"
+msgid "Generator Type"
+msgstr ""
-msgid "3 kW"
-msgstr "3 kW"
+msgid "combined_cycle"
+msgstr ""
-msgid "5 MW"
-msgstr "5 MW"
+msgid "gas combustion"
+msgstr ""
-msgid "7 GW"
-msgstr "7 GW"
+msgid "francis_turbine"
+msgstr ""
-msgid "hot water"
-msgstr "热水"
+msgid "gas_turbine"
+msgstr ""
-msgid "hot air"
-msgstr "热气"
+msgid "biogas, biomass, gas, waste combustion"
+msgstr ""
-msgid "cold water"
-msgstr "冷水"
+msgid "heat_pump"
+msgstr ""
-msgid "cold air"
-msgstr "冷气"
+msgid "horizontal_axis"
+msgstr ""
-msgid "compressed air"
-msgstr "压缩空气"
+msgid "tidal steam / wind"
+msgstr ""
-msgid "steam"
-msgstr "蒸汽"
+msgid "kaplan_turbine"
+msgstr ""
-msgid "vacuum"
-msgstr "真空"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
+msgstr ""
+
+msgid "pelton_turbine"
+msgstr ""
+
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
+
+msgid "reciprocating_engine"
+msgstr ""
+
+msgid "biofuel, biogas, diesel, gas, gasoline"
+msgstr ""
+
+msgid "solar_photovoltaic_panel"
+msgstr ""
+
+msgid "solar photovoltaic"
+msgstr ""
+
+msgid "solar_thermal_collector"
+msgstr ""
+
+msgid "solar thermal"
+msgstr ""
+
+msgid "steam_generator"
+msgstr ""
+
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
+
+msgid "steam_turbine"
+msgstr ""
+
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
+
+msgid "stellarator"
+msgstr ""
+
+msgid "nuclear fusion"
+msgstr ""
+
+msgid "tokamak"
+msgstr ""
+
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
-msgid "battery charging"
-msgstr "电池充电"
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
-msgid "Power Station"
-msgstr "配电站"
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "编辑配电站"
+msgid "Output forms of energy:"
+msgstr ""
msgid "Power Sub Station"
msgstr "配电分站"
@@ -17392,6 +18681,21 @@ msgstr "编辑配电分站"
msgid "Line reference"
msgstr "电线编号"
+msgid "high"
+msgstr "高"
+
+msgid "medium"
+msgstr "中"
+
+msgid "low"
+msgstr "低"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
msgid "Cable Distribution Cabinet"
msgstr "电缆配电柜"
@@ -17407,6 +18711,9 @@ msgstr "编辑电塔"
msgid "Tower reference"
msgstr "塔编号"
+msgid "steel"
+msgstr ""
+
msgid "Pole"
msgstr "电竿"
@@ -17425,13 +18732,11 @@ msgstr "编辑电线"
msgid "Line type"
msgstr "电线类型"
-msgctxt "Power Line"
msgid "line"
-msgstr "高压线"
+msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
-msgstr "低压线"
+msgstr ""
msgid "Amount of Cables"
msgstr "电缆数"
@@ -17538,11 +18843,11 @@ msgstr "售货亭"
msgid "Edit Kiosk"
msgstr "编辑售货亭"
-msgid "Baker"
-msgstr "面包店"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "编辑面包店"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "肉类"
@@ -17553,8 +18858,8 @@ msgstr "编辑肉店"
msgid "Seafood"
msgstr "海鲜"
-msgid "Edit Seafood"
-msgstr "编辑海鲜"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr "熟食店(美食)"
@@ -17574,14 +18879,20 @@ msgstr "市场"
msgid "Edit Marketplace"
msgstr "编辑市场"
+msgid "Organic"
+msgstr "有机"
+
msgid "Greengrocer"
msgstr "蔬果店"
msgid "Edit Greengrocer"
msgstr "编辑蔬果店"
-msgid "Organic"
-msgstr "有机"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr "编辑有机/生物"
@@ -17652,8 +18963,8 @@ msgstr "编辑制衣店"
msgid "Fabric"
msgstr "布"
-msgid "Edit Fabric"
-msgstr "编辑布店"
+msgid "Edit Fabric Shop"
+msgstr ""
msgid "Electronic"
msgstr "电器"
@@ -17673,14 +18984,14 @@ msgstr "编辑电子材料行"
msgid "Mobile Phone"
msgstr "手机"
-msgid "Edit Mobile Phone"
-msgstr "编辑手机"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "吸尘器"
-msgid "Edit Vacuum Cleaner"
-msgstr "编辑吸尘器"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hifi"
@@ -17688,9 +18999,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "编辑 Hifi 音响店"
-msgctxt "shop"
msgid "Video"
-msgstr "影像"
+msgstr "影片"
msgid "Edit Video Shop"
msgstr "编辑影像店"
@@ -17716,6 +19026,12 @@ msgstr "编辑货币兑换所"
msgid "Edit Automated Teller Machine"
msgstr "编辑自动柜员机"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "百货商店"
@@ -17752,23 +19068,44 @@ msgstr "首饰"
msgid "Edit Jewelry"
msgstr "编辑首饰"
-msgid "Erotic"
-msgstr "情色"
-
-msgid "Edit Erotic"
-msgstr "编辑情色"
+msgid "Gift"
+msgstr ""
-msgid "Florist"
-msgstr "花类"
+msgid "Edit Gift Shop"
+msgstr ""
-msgid "Edit Florist"
-msgstr "编辑花店"
+msgid "buddhist"
+msgstr "佛教"
-msgid "Garden Centre"
-msgstr "园艺中心"
+msgid "christian"
+msgstr "基督教系"
-msgid "Edit Garden Centre"
-msgstr "编辑园艺中心"
+msgid "hindu"
+msgstr "印度教"
+
+msgid "jewish"
+msgstr "犹太教"
+
+msgid "muslim"
+msgstr "伊斯兰教"
+
+msgid "Erotic"
+msgstr "情色"
+
+msgid "Edit Erotic Shop"
+msgstr ""
+
+msgid "Florist"
+msgstr "花类"
+
+msgid "Edit Florist"
+msgstr "编辑花店"
+
+msgid "Garden Centre"
+msgstr "园艺中心"
+
+msgid "Edit Garden Centre"
+msgstr "编辑园艺中心"
msgid "Do-it-yourself-store"
msgstr "DIY 商店"
@@ -17785,8 +19122,8 @@ msgstr "编辑硬件商店"
msgid "Paint"
msgstr "油漆"
-msgid "Edit Paint"
-msgstr "编辑油漆"
+msgid "Edit Paint Shop"
+msgstr ""
msgid "Furniture"
msgstr "家俱"
@@ -17797,20 +19134,20 @@ msgstr "编辑家俱店"
msgid "Kitchen"
msgstr "炊具"
-msgid "Edit Kitchen"
-msgstr "编辑炊具"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr "窗帘"
-msgid "Edit Curtain"
-msgstr "编辑窗帘"
+msgid "Edit Curtain Shop"
+msgstr ""
msgid "Frame"
msgstr "框架"
-msgid "Edit Frames"
-msgstr "编辑框架"
+msgid "Edit Frames Shop"
+msgstr ""
msgid "Stationery"
msgstr "文具"
@@ -17830,6 +19167,12 @@ msgstr "书店"
msgid "Edit Book Store"
msgstr "编辑书店"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "旅行社"
@@ -17839,8 +19182,8 @@ msgstr "编辑旅行社"
msgid "Musical Instrument"
msgstr "乐器"
-msgid "Edit Musical Instruments"
-msgstr "编辑乐器"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "玩具"
@@ -17920,6 +19263,9 @@ msgstr "玩具"
msgid "vouchers"
msgstr "券"
+msgid "Note"
+msgstr "注释"
+
msgid "Geography"
msgstr "地理"
@@ -18049,6 +19395,12 @@ msgstr "山峰"
msgid "Edit Peak"
msgstr "编辑山峰"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "冰川"
@@ -18088,24 +19440,33 @@ msgstr "树"
msgid "Edit Tree"
msgstr "编辑树"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "植物学名"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "树林"
msgid "Edit Wood"
msgstr "编辑树林"
-msgctxt "wood"
msgid "coniferous"
-msgstr "针叶"
+msgstr "松类"
-msgctxt "wood"
msgid "deciduous"
-msgstr "落叶"
+msgstr "落叶类"
-msgctxt "wood"
msgid "mixed"
msgstr "混合"
@@ -18115,15 +19476,6 @@ msgstr "森林"
msgid "Edit Forest Landuse"
msgstr "编辑森林土地利用"
-msgid "coniferous"
-msgstr "松类"
-
-msgid "deciduous"
-msgstr "落叶类"
-
-msgid "mixed"
-msgstr "混合"
-
msgid "Grassland"
msgstr ""
@@ -18199,6 +19551,12 @@ msgstr "牧场"
msgid "Edit Meadow Landuse"
msgstr "编辑牧场"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr "葡萄园"
@@ -18253,8 +19611,8 @@ msgstr "游乐场"
msgid "Edit Recreation Ground Landuse"
msgstr "编辑游乐场用地"
-msgid "Residential area"
-msgstr "居住区"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "编辑居住区"
@@ -18265,6 +19623,9 @@ msgstr "教堂附近的墓地"
msgid "Edit Graveyard"
msgstr "编辑墓地"
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr "不靠近教堂的墓地"
@@ -18340,6 +19701,33 @@ msgstr "编辑采石场"
msgid "Annotation"
msgstr "注释"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "编辑地址信息"
@@ -18358,30 +19746,6 @@ msgstr "城市名称"
msgid "Country code"
msgstr "国家代码"
-msgid "AT"
-msgstr "奥地利(AT)"
-
-msgid "CH"
-msgstr "瑞士(CH)"
-
-msgid "DE"
-msgstr "德国(DE)"
-
-msgid "FR"
-msgstr "法国(FR)"
-
-msgid "GB"
-msgstr "英国(GB)"
-
-msgid "IT"
-msgstr "意大利(IT)"
-
-msgid "RS"
-msgstr "塞尔维亚(RS)"
-
-msgid "US"
-msgstr "美国(US)"
-
msgid "Address Interpolation"
msgstr "地址编排规则"
@@ -18400,6 +19764,18 @@ msgstr "偶数"
msgid "alphabetic"
msgstr "按字母顺序"
+msgid "Accuracy"
+msgstr "精度"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "联系(普通方式)"
@@ -18562,26 +19938,55 @@ msgstr "违章检查停止的位置"
msgid "traffic light or barrier that stops you"
msgstr "停止您的交通灯或路障"
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "道路"
+msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
-msgstr "滑雪"
+msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "步行"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "健行"
+msgstr ""
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+
+msgctxt "route type"
msgid "detour"
-msgstr "绕行"
+msgstr ""
+
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
msgid "Symbol description"
msgstr "符号说明"
@@ -18628,20 +20033,23 @@ msgstr "顺向停止点"
msgid "backward halt point"
msgstr "逆向停止点"
-msgid "Route network"
-msgstr "线路网络"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "编辑线路网络"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "成员"
-msgid "Associated street"
-msgstr "相关街道"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "编辑相关街道"
+msgid "house"
+msgstr "房子"
msgid "Street"
msgstr "街"
@@ -18664,8 +20072,8 @@ msgstr "任何与街道相关"
msgid "Destination sign"
msgstr "目的地标志"
-msgid "Edit Destination sign"
-msgstr "编辑目的地标志"
+msgid "Edit Destination Sign"
+msgstr ""
msgid "Destination written on sign (w/o distance)"
msgstr "写于标志上的目的地(和/或距离)"
@@ -18760,18 +20168,27 @@ msgstr "路径在桥下通过"
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr "路径穿过隧道"
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "桥"
msgid "deprecated"
msgstr "已废弃"
+msgid "bicycle"
+msgstr "单车"
+
+msgid "foot"
+msgstr "步行"
+
msgid "horse"
msgstr "马"
@@ -18781,8 +20198,11 @@ msgstr "障碍"
msgid "motorroad"
msgstr "机动车专用道"
-msgid "highway_track"
-msgstr "公路轨迹"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
+msgstr ""
msgid "services"
msgstr "服务"
@@ -18790,11 +20210,11 @@ msgstr "服务"
msgid "ford"
msgstr "浅滩"
-msgid "highway_platform"
-msgstr "公路站台"
+msgid "highway.platform"
+msgstr ""
-msgid "emergency_access_point"
-msgstr "紧急连络点"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "河堤"
@@ -18811,6 +20231,9 @@ msgstr "急流"
msgid "railwaypoint"
msgstr "铁路点"
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr "铁路车场"
@@ -18826,29 +20249,29 @@ msgstr "旧铁路"
msgid "aeroway"
msgstr "机场"
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
-msgstr "初级滑雪场"
+msgid "piste.easy"
+msgstr ""
-msgid "piste_intermediate"
-msgstr "中级滑雪场"
+msgid "piste.intermediate"
+msgstr ""
-msgid "piste_advanced"
-msgstr "高级滑雪场"
+msgid "piste.advanced"
+msgstr ""
-msgid "piste_expert"
-msgstr "专业滑雪场"
+msgid "piste.expert"
+msgstr ""
-msgid "piste_freeride"
-msgstr "自由式滑雪场"
+msgid "piste.freeride"
+msgstr ""
-msgid "piste_novice"
-msgstr "初学者滑雪场"
+msgid "piste.novice"
+msgstr ""
msgid "power"
msgstr "塔"
@@ -18868,20 +20291,20 @@ msgstr "码头"
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
-msgstr "景观灯"
+msgid "amenity.light"
+msgstr ""
-msgid "light_water"
-msgstr "自来水"
+msgid "light.water"
+msgstr ""
msgid "health"
msgstr "医疗"
-msgid "shop"
-msgstr "商店"
+msgid "office"
+msgstr "办公室"
msgid "hotel"
msgstr "旅馆"
@@ -18946,9 +20369,6 @@ msgstr "荒野"
msgid "woodarea"
msgstr "树林区"
-msgid "mud"
-msgstr "泥沼"
-
msgid "beach"
msgstr "海滩"
@@ -18958,10 +20378,13 @@ msgstr "路线"
msgid "boundary"
msgstr "边界"
+msgid "sport"
+msgstr "运动"
+
msgid "place"
msgstr "地点"
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18976,9 +20399,6 @@ msgstr "村/市"
msgid "One Way"
msgstr "单行道"
-msgid "Church"
-msgstr "教堂"
-
msgid "Fuel Station"
msgstr "加油站"
@@ -19006,6 +20426,9 @@ msgstr "节点上的桥梁标签"
msgid "wrong highway tag on a node"
msgstr "节点上的错误公路标签"
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr "未命名的未分类公路"
@@ -19051,10 +20474,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -19066,7 +20519,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19084,7 +20537,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19201,251 +20654,314 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "psv without highway/railway/waterway/parking"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "width without physical linear feature"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
msgstr ""
-msgid "religion without denomination"
+msgid "fence_type without barrier=fence"
msgstr ""
-msgid "unknown christian denomination"
+msgid "border_type without boundary"
msgstr ""
-msgid "unknown muslim denomination"
+msgid "recycling_type without amenity=recycling"
msgstr ""
-msgid "unknown jewish denomination"
+msgid "board_type without information=board"
msgstr ""
-msgid ""
-"no wikipedia-language given, use ''wikipedia''=''language:page title''"
+msgid "shelter_type without amenity=shelter"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "lamp_type without highway=street_lamp"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "map_type without information=map"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid "site_type without historic=archaeological_site"
msgstr ""
-msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgid "artwork_type without tourism=artwork"
+msgstr ""
-msgid "Bing Sat"
-msgstr "Bing Sat"
+msgid "castle_type without historic=castle"
+msgstr ""
-msgid "MapBox Satellite"
+msgid "reservoir_type without landuse/water=reservoir"
msgstr ""
-msgid "MapQuest Open Aerial"
+msgid "bunker_type without military=bunker"
msgstr ""
-msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgid "source:addr without addr:*"
+msgstr ""
-msgid "OpenStreetMap (Mapnik Black & White)"
-msgstr "OpenStreetMap (Mapnik 黑白)"
+msgid "source:date without source"
+msgstr ""
-msgid "Skobbler"
+msgid "source:name without name"
msgstr ""
-msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgid "source:maxspeed without maxspeed"
+msgstr ""
-msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgid "source:building without building"
+msgstr ""
-msgid "Public Transport (ÖPNV)"
+msgid "source:ref without ref"
msgstr ""
-msgid "OpenStreetMap (German Style)"
+msgid "source:population without population"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
+msgid "source:geometry on a node"
msgstr ""
-msgid "Hike & Bike"
+msgid "source:[addr:]postcode without addr:postcode"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "source:postal_code without addr:postcode"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "source:ele without ele"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "source:ref:INSEE without ref:INSEE"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "source:lit without lit"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "source:hgv without hgv"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "source:outline on a node"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "source:highway without highway"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "source:maxaxleload without maxaxleload"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "source:surface without surface"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "source:bridge without bridge"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "source:old_name without old_name"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "source:designation without designation"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "source:[addr:]housenumber without addr:housenumber"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "source:height without height"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "source:lanes without lanes"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "religion without denomination"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "unknown christian denomination"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "unknown muslim denomination"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "unknown jewish denomination"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid ""
+"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "layer should be between -5 and 5"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "level should be numbers with optional .5 increments"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
msgstr ""
-msgid "Geobase Hydrography"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
msgstr ""
-msgid "Geobase Roads"
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
msgstr ""
-msgid "Canvec"
-msgstr "Canvec"
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
-msgid "British Columbia Mosaic"
+msgid "unusual maxspeed format"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "unusual frequency specification"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "unusual train track gauge; use mm with no separator"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "unusual incline; use percentages/degrees or up/down"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Landsat"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "捷克 CUZK:KM"
+msgid "Yahoo Sat"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "捷克 UHUL:ORTOFOTO"
+msgid "Bing Sat"
+msgstr ""
-msgid "7th Series (OS7)"
+msgid "HDDM (Humanitarian OpenStreetMap)"
msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "MapBox Satellite"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "MapQuest Open Aerial"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "OpenStreetMap GPS Traces"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "OpenStreetMap (Mapnik)"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "skobbler"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "skobbler heatmap"
msgstr ""
-msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgid "OpenCycleMap"
msgstr ""
-msgid "Ireland Bartholomew Quarter-Inch 1940"
+msgid "MapQuest OSM"
msgstr ""
-msgid "Ireland EEA GMES Urban Atlas"
+msgid "Public Transport (ÖPNV)"
msgstr ""
-msgid "Ireland EEA CORINE 2006"
+msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Lodi - Italy"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
msgstr ""
-msgid "Lombardia - Italy (CTR)"
+msgid "osmfr"
msgstr ""
-msgid "Sicily - Italy"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "PCN 2006 - Italy"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "PCN 2008 - IT Lazio+Umbria"
+msgid "basemap.at"
msgstr ""
-msgid "USSR - Latvia"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "50cm ortho - Latvia"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "20cm ortho - Coastline"
+msgid "Tiris: DOM (Surface model)"
+msgstr ""
+
+msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgstr ""
+
+msgid "Vienna: Beschriftungen (annotations)"
+msgstr ""
+
+msgid "Vienna: Orthofoto (aerial image)"
+msgstr ""
+
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
+msgstr ""
+
+msgid "VoGIS: Flächenwidmungsplan"
+msgstr ""
+
+msgid "VoGIS: DGM (Terrain model)"
+msgstr ""
+
+msgid "VoGIS: DOM (Surface model)"
+msgstr ""
+
+msgid "Geobase Hydrography"
+msgstr ""
+
+msgid "Geobase Roads"
+msgstr ""
+
+msgid "Canvec"
+msgstr ""
+
+msgid "British Columbia Mosaic"
+msgstr ""
+
+msgid "Czech CUZK:KM"
+msgstr ""
+
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+msgid "Fugro (Denmark)"
+msgstr ""
+
+msgid "Stevns (Denmark)"
+msgstr ""
+
+msgid "Vejmidte (Denmark)"
+msgstr ""
+
+msgid "Estonia Basemap (Maaamet)"
+msgstr ""
+
+msgid "Estonia Ortho (Maaamet)"
+msgstr ""
+
+msgid "Estonia Multi (Maaamet)"
msgstr ""
msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
@@ -19463,6 +20979,9 @@ msgstr ""
msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
+msgstr ""
+
msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
@@ -19478,6 +20997,9 @@ msgstr ""
msgid "Géolittoral - Sentiers"
msgstr ""
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
+
msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
@@ -19490,6 +21012,145 @@ msgstr ""
msgid "Tours - Orthophotos 2008"
msgstr ""
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
+msgstr ""
+
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
+msgstr ""
+
+msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
+msgstr ""
+
+msgid "Ireland Bartholomew Quarter-Inch 1940"
+msgstr ""
+
+msgid "Ireland EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Ireland EEA CORINE 2006"
+msgstr ""
+
+msgid "Lodi - Italy"
+msgstr ""
+
+msgid "Lombardia - Italy (CTR)"
+msgstr ""
+
+msgid "Sicily - Italy"
+msgstr ""
+
+msgid "PCN 2006 - Italy"
+msgstr ""
+
+msgid "PCN 2008 - IT Lazio+Umbria"
+msgstr ""
+
+msgid "USSR - Latvia"
+msgstr ""
+
+msgid "50cm ortho - Latvia"
+msgstr ""
+
+msgid "20cm ortho - Coastline"
+msgstr ""
+
+msgid "ORT10LT (Lithuania)"
+msgstr ""
+
+msgid "Niger Delta Oct 2012 Landsat"
+msgstr ""
+
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgstr ""
+
+msgid "ScanEx IRS"
+msgstr ""
+
+msgid "ScanEx SPOT"
+msgstr ""
+
+msgid "Freemap.sk Car"
+msgstr ""
+
+msgid "Freemap.sk Hiking"
+msgstr ""
+
+msgid "Freemap.sk Cyclo"
+msgstr ""
+
+msgid "Freemap.sk Ski"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgstr ""
+
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgstr ""
+
+msgid "Slovakia EEA GMES Urban Atlas"
+msgstr ""
+
+msgid "Slovakia EEA CORINE 2006"
+msgstr ""
+
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
+msgstr ""
+
msgid "Catastro Spain"
msgstr ""
@@ -19508,89 +21169,149 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "Canton de Génève 5cm (SITG 2011)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
+msgstr ""
+
+msgid "OSM US TIGER 2012 Roads Overlay"
+msgstr ""
+
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
+msgstr ""
+
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx IRS"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OSM Export"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "SUMO Export"
msgstr ""
-msgid "Stuttgart (Luftbild)"
-msgstr ""
+msgid "Export"
+msgstr "导出"
-msgid "2u"
-msgstr "2u"
+msgid "Port:"
+msgstr "端口："
+
+msgid "refresh the port list"
+msgstr "重新整理端口列表"
+
+msgid "Configure"
+msgstr "设定"
+
+msgid "Connection Error."
+msgstr "连接错误。"
+
+msgid "configure the connected DG100"
+msgstr "设定连接的 DG100"
+
+msgid "delete data after import"
+msgstr "输入后删除数据"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV 文件"
@@ -19793,6 +21514,18 @@ msgstr "显示高度轮廓"
msgid "Elevation Profile"
msgstr "高度轮廓"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr "打开高度轮廓窗口。"
@@ -19814,14 +21547,8 @@ msgstr "增益"
msgid "Time"
msgstr "时间"
-msgid "Geoid"
-msgstr "大地水准面"
-
-msgid "Automatic"
-msgstr "自动"
-
-msgid "Fixed value"
-msgstr "固定值"
+msgid "Tracks"
+msgstr "轨迹"
msgid "Elevation profile for track ''{0}''."
msgstr "轨迹“{0}”的高度配置文件。"
@@ -20087,9 +21814,15 @@ msgstr "选择不完整的地址"
msgid "Selects all addresses with incomplete data."
msgstr "选择有不完整数据的所有地址。"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr "门牌号编辑器"
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "更新 {0} 个对象之多的属性"
@@ -20112,6 +21845,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "图层属性"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "导入图像"
@@ -20190,9 +21926,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr "简便的地址编排函数"
@@ -20277,8 +22025,8 @@ msgstr "预测的奇数地址"
msgid "Expected even numbers for addresses"
msgstr "预测的偶数地址"
-msgid "Expected valid number for address increment"
-msgstr "预测地址增加的数字"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "国码只能使用 2 个字节"
@@ -20621,15 +22369,6 @@ msgstr "门牌号码："
msgid "Street Name:"
msgstr "街道名称："
-msgid "Increment"
-msgstr "递增"
-
-msgid "Decrement"
-msgstr "递减"
-
-msgid "Numbers:"
-msgstr "号码："
-
msgid "Big buildings mode"
msgstr "大型建筑模式"
@@ -20812,6 +22551,9 @@ msgstr "在进行地理参照时，停用图片剪裁。"
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "先在列表中选定一个 WMS 图层。"
@@ -20830,12 +22572,6 @@ msgstr "50 m"
msgid "100 m"
msgstr "100 m"
-msgid "high"
-msgstr "高"
-
-msgid "medium"
-msgstr "中"
-
msgid "symbol"
msgstr "符号"
@@ -20976,6 +22712,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20993,6 +22732,9 @@ msgstr "如果抓取时有多个图层，则自动选择第一个 WMS 图层。"
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "启用这个选项，以使用节点的“add:street”标签。"
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "将“source=...”添加到元件？"
@@ -21077,52 +22819,6 @@ msgstr ""
"这张图片包含地理参照数据。\n"
"您是否想要使用它们？"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"点击剪裁图片的第一个角落\n"
-"(需要两个点)"
-
-msgid "Image cropping"
-msgstr "图片剪裁"
-
-msgid "Click second corner for image cropping"
-msgstr "点击剪裁图片的第二个角落"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr "图片地理参照"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"您是否想要完全取消或是\n"
-"要再试一次 "
-
-msgid "Enter cadastre east,north position"
-msgstr "输入 cadastre 东,北 方位置"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(警告：检验有箭头的北方！！)"
-
-msgid "East"
-msgstr "东"
-
-msgid "I use the mouse"
-msgstr "我使用鼠标"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "设定 {0} 兰勃特坐标"
-
msgid "Load layer from cache"
msgstr "从缓存中加载图层"
@@ -21175,20 +22871,80 @@ msgstr "添加新的图层"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "重设 cookie"
msgid "Get a new cookie (session timeout)"
msgstr "取得新的 cookie(会话超时)"
-msgid "Save image as PNG"
-msgstr "保存为 PNG 图像"
+msgid "Save image as..."
+msgstr ""
msgid "PNG files (*.png)"
msgstr "PNG 文件(*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "输出为 PNG 格式(只有点阵图)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"点击剪裁图片的第一个角落\n"
+"(需要两个点)"
+
+msgid "Image cropping"
+msgstr "图片剪裁"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr "图片地理参照"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"您是否想要完全取消或是\n"
+"要再试一次 "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr "输入 cadastre 东,北 方位置"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(警告：检验有箭头的北方！！)"
+
+msgid "East"
+msgstr "东"
+
+msgid "I use the mouse"
+msgstr "我使用鼠标"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "设定 {0} 兰勃特坐标"
+
+msgid "Click second corner for image cropping"
+msgstr "点击剪裁图片的第二个角落"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
msgid "Adjust WMS"
msgstr "调整 WMS"
@@ -21215,8 +22971,11 @@ msgstr "WMS 图层({0})，已加载 {1} 个瓦片"
msgid "Is not vectorized."
msgstr "并非矢量化的。"
-msgid "Raster size: {0}"
-msgstr "点阵大小：{0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "是矢量化的。"
@@ -21267,8 +23026,8 @@ msgstr "从列表中删除选定的配置。"
msgid "Color Schemes"
msgstr "颜色配置"
-msgid "Adress"
-msgstr "地址"
+msgid "Address"
+msgstr ""
msgid "Split area"
msgstr "分离区域"
@@ -21314,6 +23073,9 @@ msgstr "沿线下载"
msgid "Please select 1 or more ways to download along"
msgstr "请选择 1 或多条路径来沿着下载"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr "要下载 {0} 个中间的节点。"
@@ -21389,6 +23151,71 @@ msgstr "新工具..."
msgid "Install"
msgstr "安装"
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "只有位置"
@@ -21422,33 +23249,15 @@ msgstr "数据记录格式"
msgid "Disable data logging if speed falls below"
msgstr "停用数据记录速限"
-msgid "Disable data logging if distance falls below"
-msgstr "停用数据记录距离"
-
-msgid "Unknown logFormat"
-msgstr "不明的记录格式"
-
-msgid "Port:"
-msgstr "端口："
-
-msgid "refresh the port list"
-msgstr "重新整理端口列表"
+msgid "Disable data logging if distance falls below"
+msgstr "停用数据记录距离"
-msgid "Configure"
-msgstr "设定"
+msgid "Unknown logFormat"
+msgstr "不明的记录格式"
msgid "Configure Device"
msgstr "设定装置"
-msgid "Connection Error."
-msgstr "连接错误。"
-
-msgid "configure the connected DG100"
-msgstr "设定连接的 DG100"
-
-msgid "delete data after import"
-msgstr "输入后删除数据"
-
msgid "Importing data from device."
msgstr "从装置输入数据"
@@ -21854,6 +23663,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -22042,22 +23854,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "调整图像"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "调整选定图像图层的位置"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "请选择要调整的图像图层。"
+msgstr ""
msgid "Start adjusting"
-msgstr "开始调整"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "没有要调整的图像图层。"
+msgstr ""
msgid "No layers to adjust"
-msgstr "没有要调整的图层"
+msgstr ""
msgid "Normal"
msgstr "一般"
@@ -22101,12 +23913,6 @@ msgstr "输入的图片"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "图片文件(*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "以 ImageWayPoing 打开图片"
-
-msgid "Load set of images as a new layer."
-msgstr "将多组图片加载为新的图层。"
-
msgid "Import vector graphics"
msgstr "导入矢量图形"
@@ -22116,18 +23922,15 @@ msgstr "比例："
msgid "unit(s) = "
msgstr "单位为 "
-msgid "Import..."
-msgstr "输入..."
-
-msgid "Import vector graphics."
-msgstr "导入矢量图形。"
-
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG 图画(*.svg)"
-
msgid "Importing..."
msgstr "输入中..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -22491,9 +24294,6 @@ msgstr "自动置中"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "持续将 LiveGPS 图层置中到目前的位置。"
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "打开 MapDust"
@@ -22548,9 +24348,26 @@ msgstr "合并重叠的路径。"
msgid "Merge Overlap (combine)"
msgstr "合并重叠部分(结合)"
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr "<html>以角色为基础的关系成员会复制到所有的新路径。<br>必要时您应该检验并修正它。</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr "<html>将关系成员复制到所有的新路径。<br>您应该验证这一点，必要时予以纠正。</html>"
+
msgid "Split way"
msgstr "分割路径"
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>输入标签键值，例如 <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr "<html>输入标签数值，例如 <strong><tt>check members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "密歇根左转"
@@ -22592,6 +24409,15 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
+msgid "Download from Overpass API ..."
+msgstr ""
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr ""
@@ -22604,15 +24430,6 @@ msgstr "基础 URL"
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "转换为多重多边形"
-
-msgid "Convert to multipolygon."
-msgstr "转换为多重多边形。"
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "选定的路径中之一已经是另一个多重多边形的一部分。"
-
msgid "About Plugin"
msgstr "关于插件"
@@ -22747,9 +24564,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr "开放数据"
-
msgid "CSV files"
msgstr "CSV 文件"
@@ -22774,12 +24588,21 @@ msgstr "GML 文件"
msgid "Zip Files"
msgstr "Zip 文件"
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr "OpenData XML 文件"
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr "许可证 URL 不可用：{0}"
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr "许可协议"
@@ -22926,6 +24749,9 @@ msgstr "正在下载数据..."
msgid "File to load"
msgstr "要加载的文件"
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr "正在读取 Zip 文件..."
@@ -22942,6 +24768,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23174,13 +25011,6 @@ msgstr "<html>选定的数据包含来自 OpenStreetBugs 的数据。<br>您不
msgid "An error occurred: {0}"
msgstr "发生一个错误：{0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "无法建立新的错误报告。结果：{0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr "标头包含许多数值，而且不能对映为单一字串"
-
msgid "Process queue"
msgstr "进程队列"
@@ -23233,18 +25063,6 @@ msgstr "<html>确定将这个议题标记为“已解决”？<br><br>您也许
msgid "Close: "
msgstr "关闭： "
-msgid "New issue"
-msgstr "新增议题"
-
-msgid "Create issue"
-msgstr "建立议题"
-
-msgid "Describe the problem precisely"
-msgstr "明确的描述此问题"
-
-msgid "Create: "
-msgstr "建立： "
-
msgid "Open in browser"
msgstr "在浏览器中打开"
@@ -23302,6 +25120,9 @@ msgstr "Firefox 可执行文件"
msgid "OSM Server Files pbf compressed"
msgstr "压缩的 OSM 服务器文件 pbf"
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr "无效的修改集合 ID：{0}"
@@ -23509,9 +25330,6 @@ msgstr "导入 PDF 文件。"
msgid "Import PDF"
msgstr "导入 PDF"
-msgid "Import PDf file"
-msgstr "导入 PDF 文件"
-
msgid " {0} objects so far"
msgstr " 目前 {0} 个对象"
@@ -23591,8 +25409,26 @@ msgstr "测试失败：无法读取 mtime。"
msgid "Test failed: Could not write mtime."
msgstr "测试失败：无法写入 mtime。"
-msgid "PicLayer"
-msgstr "图片图层"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr "您想保存当前的校准层 {0} 吗？"
@@ -23747,6 +25583,9 @@ msgstr "剪贴板中没有东西"
msgid "The clipboard data is not an image"
msgstr "剪贴板数据不是图片"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "警告：无法处理 zip 文件“{0}”。异常为：{1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23768,6 +25607,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -24061,9 +25903,6 @@ msgstr "GPX 文件中不包含轨迹或路点。"
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "轨迹"
-
msgid "Tracks in this GPX file:"
msgstr "这个 GPX 文件中的轨迹："
@@ -24132,9 +25971,6 @@ msgstr "指定角色"
msgid "Change relation member roles to {0}"
msgstr "将关系成员角色改变为 {0}"
-msgid "Change multipolygon creation settings"
-msgstr "改变多重多边形建立设定值"
-
msgid "Create administrative boundary relations"
msgstr "建立行政区界关系"
@@ -24261,9 +26097,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "重启 JOSM"
-
msgid "Revert changeset fully"
msgstr "还原整个修改集合"
@@ -24285,6 +26118,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr "缺少 id {1} {0} 的合并目标"
@@ -24319,15 +26155,31 @@ msgstr "正在获取缺失的原型"
msgid "Downloading changeset"
msgstr "正在下载修改集合"
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr "恢复修改集合#{0}"
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr "警告：在修改集合内容的位置({1},{2})有不支持的起始元素“{0}”。正在跳过。"
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr "警告：在修改集合内容的位置({1},{2})有不支持的起始元素“{0}”。正在跳过。"
+
msgid "Road Sign Plugin"
msgstr "路标插件"
msgid "signs"
msgstr "标志"
+msgid "Change Properties"
+msgstr "更改属性"
+
msgid "Country preset:"
msgstr "预设国家："
@@ -24337,6 +26189,9 @@ msgstr "显示所有标志"
msgid "Show a selection of the most useful signs"
msgstr "显示一组最有用的标志"
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr "德国"
@@ -24439,9 +26294,6 @@ msgstr "路线规划插件首选项"
msgid "Configure routing preferences."
msgstr "设定路线规划首选项"
-msgid "Highway type"
-msgstr "公路类型"
-
msgid "Speed (Km/h)"
msgstr "速度限制(Km/h)"
@@ -24559,6 +26411,9 @@ msgstr "保存当前的独立数据存储信息到文件。"
msgid "Save SDS file"
msgstr "保存 SDS 文件"
+msgid "Could not back up file. Exception is: {0}"
+msgstr "无法备份文件。异常为：{0}"
+
msgid "Simplify Area"
msgstr "简化区域"
@@ -24619,20 +26474,20 @@ msgstr "距离系数"
msgid "Merge Nearby Nodes Threshold"
msgstr "合并阈值附近的节点"
-msgid "Online Help"
-msgstr "在线帮助"
+msgid "SeaMap Editor"
+msgstr "SeaMap 编辑器"
-msgid "Load"
-msgstr "加载"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "不可见"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "SeaMap 编辑器"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
-msgstr "导出"
+msgid "Select a map object"
+msgstr ""
msgid "AutoSave LiveData"
msgstr "自动保存即时数据"
@@ -24769,6 +26624,9 @@ msgstr "删除轮廓路径"
msgid "Street name: "
msgstr "街道名称： "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "奇数/偶数"
@@ -24844,6 +26702,95 @@ msgstr "示踪器。"
msgid "Tracer building"
msgstr "描出建筑物"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -24859,9 +26806,6 @@ msgstr "导出签名到 XML..."
msgid "Save Signatures file"
msgstr "保存签名文件"
-msgid "Download OSM"
-msgstr "下载 OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr "从 OSM 服务器取得所有参照但没有实际显示的 OSM 对象。"
@@ -24885,6 +26829,9 @@ msgstr "从服务器加载对象"
msgid "Download signed data"
msgstr "下载签名的数据"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr "警告：忽略异常，因为任务被取消。异常为：{0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -25045,9 +26992,6 @@ msgstr "签署已取消！"
msgid "Please give a tolerance in meters"
msgstr "请给出一个容差(米)"
-msgid "Accuracy"
-msgstr "精度"
-
msgid "Select as much as you like:"
msgstr "选择您想要的："
@@ -25686,19 +27630,19 @@ msgstr "取消删除对象..."
msgid "Undelete object by id"
msgstr "依 ID 取消删除对象"
-msgid "Select if the data should be added into a new layer"
-msgstr "如果数据要添加到新的图层里，请选择此项"
+msgid "Undelete Object"
+msgstr "取消删除对象"
+
+msgid "Undelete object"
+msgstr "取消删除对象"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr "输入应取消删除对象的类型和 ID，例如，“n1 w2”"
-msgid "Undelete Object"
-msgstr "取消删除对象"
-
-msgid "Undelete object"
-msgstr "取消删除对象"
+msgid "Select if the data should be added into a new layer"
+msgstr "如果数据要添加到新的图层里，请选择此项"
msgid "Start undeleting"
msgstr "开始取消删除"
@@ -25706,18 +27650,6 @@ msgstr "开始取消删除"
msgid "Close dialog and cancel"
msgstr "关闭对话框并取消"
-msgid "Will get {0}"
-msgstr "会得到 {0}"
-
-msgid "Looking for {0}"
-msgstr "寻找 {0}"
-
-msgid "Found {0}"
-msgstr "发现 {0}"
-
-msgid "More tools"
-msgstr "更多工具(R)"
-
msgid "Add nodes at intersections"
msgstr "在交叉点添加节点"
@@ -25760,15 +27692,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr "粘贴标签[测试中]"
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr "粘贴标签"
-
msgid "Split Object"
msgstr "分割对象"
@@ -25893,18 +27816,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr "自定义 URL 配置"
-msgid "Key is too long:"
-msgstr "键太长："
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr "值太长(最多255个字符)："
-
-msgid "Ingore warnings"
-msgstr "忽略警告"
-
msgid "Lat Lon tool"
msgstr "经纬度工具"
@@ -26097,9 +28008,6 @@ msgstr "取消选定节点"
msgid "Removes all nodes from selection"
msgstr "删除选择范围中所有的节点"
-msgid "Video"
-msgstr "影片"
-
msgid "Import Video"
msgstr "导入视频"
@@ -26226,8 +28134,8 @@ msgstr "循环"
msgid "mute"
msgstr "静音"
-msgid "Scanned Map..."
-msgstr "扫描的地图..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26246,9 +28154,6 @@ msgstr "Walking Papers：{0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers 图层({0})，缩放级别 {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "路径下载"
@@ -26363,13 +28268,13 @@ msgid "Enter the Wikipedia category"
msgstr "输入维基百科分类"
msgid "Clipboard"
-msgstr ""
+msgstr "剪贴板"
msgid "Pastes Wikipedia articles from the system clipboard"
-msgstr ""
+msgstr "从系统剪贴板粘贴维基百科文章"
msgid "clipboard"
-msgstr ""
+msgstr "剪贴板"
msgid "Open Article"
msgstr "打开文章"
@@ -26383,16 +28288,13 @@ msgstr "设置维基百科文章的默认语言"
msgid "Enter the Wikipedia language"
msgstr "输入维基百科语言"
-msgid "Add Tag"
-msgstr "添加标签"
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
msgstr "添加对应本文的“维基百科”标签到所选对象"
msgid "The Ultimate WMS Super-speed Turbo Challenge II"
-msgstr ""
+msgstr "第二版“最终 WMS 超高速涡轮增压挑战”"
msgid "Go driving"
msgstr "开始驾驶"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index deff8a8..641a483 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -2,16 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-04 03:39+0200\n"
-"PO-Revision-Date: 2013-03-30 12:48+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2013-12-18 20:13+0100\n"
+"PO-Revision-Date: 2013-07-14 15:08+0000\n"
+"Last-Translator: Kuang-che Wu <kcwu at csie.org>\n"
"Language-Team: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2013-04-05 05:06+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-12-19 05:07+0000\n"
+"X-Generator: Launchpad (build 16872)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -50,6 +50,21 @@ msgstr "背景使用條款"
msgid "Opening link not supported on current platform (''{0}'')"
msgstr "目前的平臺不支援開啟連結(「{0}」)"
+msgid "ERROR: {0}"
+msgstr ""
+
+msgid "WARNING: {0}"
+msgstr ""
+
+msgid "INFO: {0}"
+msgstr ""
+
+msgid "DEBUG: {0}"
+msgstr ""
+
+msgid "Cause: "
+msgstr ""
+
msgid "Executing platform startup hook"
msgstr "執行平臺啟動掛鉤"
@@ -152,14 +167,14 @@ msgid "About JOSM..."
msgstr "關於 JOSM"
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM object will probably fail. API base URL is: ''{0}''"
-msgstr "警告：非預期的 API 基礎 URL 格式。重新導向至 OSM 物件的資訊或歷史紀錄頁面可能會失敗。API 基礎 URL 為：「{0}」"
+"Unexpected format of API base URL. Redirection to info or history page for "
+"OSM object will probably fail. API base URL is: ''{0}''"
+msgstr ""
msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
-msgstr "警告：未預期的 API 基礎 URL 格式。重新導向至 OSM 使用者的使用者頁面可能會失敗。API 基礎 URL 為：「{0}」"
+"Unexpected format of API base URL. Redirection to user page for OSM user "
+"will probably fail. API base URL is: ''{0}''"
+msgstr ""
msgid ""
"You are about to launch {0} browser windows.<br>This may both clutter your "
@@ -201,6 +216,9 @@ msgstr "沒有目標圖層"
msgid "Add imagery layer {0}"
msgstr "加入圖片圖層 {0}"
+msgid "Select image format for WMS layer"
+msgstr ""
+
msgid "Select WMS layers"
msgstr ""
@@ -240,9 +258,6 @@ msgstr "工具：{0}"
msgid "Please select at least four nodes."
msgstr "請選取至少四個節點"
-msgid "Information"
-msgstr "資訊"
-
msgid "Align Nodes in Line"
msgstr "對齊在直線裡的節點"
@@ -267,6 +282,9 @@ msgstr "衝突"
msgid "download"
msgstr "下載"
+msgid "problem"
+msgstr ""
+
msgid "previous"
msgstr "上一級"
@@ -276,6 +294,9 @@ msgstr "下一級"
msgid "Nothing selected to zoom to."
msgstr "沒有選擇要縮放的物件。"
+msgid "Information"
+msgstr "資訊"
+
msgid "Zoom to {0}"
msgstr "縮放至 {0}"
@@ -330,9 +351,9 @@ msgid ""
msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？"
msgid ""
-"Could not combine ways (They could not be merged into a single string of "
+"Could not combine ways<br>(They could not be merged into a single string of "
"nodes)"
-msgstr "不能組合路徑（它們無法合併為節點的單一字串）"
+msgstr ""
msgid "Combine {0} ways"
msgstr "組合 {0} 條路徑"
@@ -387,18 +408,35 @@ msgstr "刪除"
msgid "Delete selected objects."
msgstr "刪除選擇的物件"
+msgid "Toggle dialogs panel"
+msgstr ""
+
+msgid "Toggle dialogs panel, maximize mapview"
+msgstr ""
+
msgid "Distribute Nodes"
msgstr "散佈節點"
msgid "Distribute the selected nodes to equal distances along a line."
msgstr "依一條直線將選取的節點等距離散佈。"
+msgid "Ignoring {0} nodes with null coordinates"
+msgstr ""
+
msgid "Download from OSM..."
msgstr "從 OSM 下載"
msgid "Download map data from the OSM server."
msgstr "從 OSM 主機下載圖資"
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
+
+msgid "Download data"
+msgstr "下載資料"
+
msgid "Download object..."
msgstr "下載物件..."
@@ -489,6 +527,9 @@ msgstr "歷史紀錄"
msgid "Display history information about OSM ways, nodes, or relations."
msgstr "顯示 OSM 路徑、節點或關係的歷史紀錄資訊。"
+msgid "Show history"
+msgstr "顯示歷史紀錄"
+
msgid "History (web)"
msgstr "歷史 (網頁)"
@@ -604,9 +645,9 @@ msgid "Joined overlapping areas"
msgstr "已連結重疊的區域"
msgid ""
-"Some of the ways were part of relations that have been modified. Please "
+"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
-msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。"
+msgstr ""
msgid "Fix tag conflicts"
msgstr "修正標籤的衝突"
@@ -754,9 +795,9 @@ msgid "Merge nodes into the oldest one."
msgstr "將節點合併到最舊的一個中。"
msgid ""
-"Please select at least two nodes to merge or a node that is close to another "
-"node."
-msgstr "請至少選擇兩個要合併的節點或是靠近另一個節點的節點。"
+"Please select at least two nodes to merge or one node that is close to "
+"another node."
+msgstr ""
msgid "Abort Merging"
msgstr "放棄合併"
@@ -909,9 +950,9 @@ msgid "Download Data"
msgstr "下載資料"
msgid ""
-"<html>Cannot open URL ''{0}'' because no suitable download task is "
-"available.</html>"
-msgstr "<html>不能開啟 URL ''{0}'' 因為沒有適合的下載工作可用。</html>"
+"Cannot open URL ''{0}''<br>The following download tasks accept the URL "
+"patterns shown:<br>{1}"
+msgstr ""
msgid ""
"<h3>When one or more ways are selected, the shape is adjusted such, that all "
@@ -940,15 +981,9 @@ msgid "Orthogonalize / Undo"
msgstr "直角化 / 復原"
msgid ""
-"Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Orthogonalize Shape / Undo<br>Please select nodes that were moved by the "
+"previous Orthogonalize Shape action!"
msgstr ""
-"形狀直角化 / 復原\n"
-"請選擇被前一次形狀直角化動作所移動的節點！"
-
-msgid "Undo Orthogonalize Shape"
-msgstr "復原形狀直角化"
msgid ""
"<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -967,9 +1002,6 @@ msgstr "直角化"
msgid "Usage"
msgstr "用法"
-msgid "Selected Elements cannot be orthogonalized"
-msgstr "選取的元素不能直角化"
-
msgid ""
"<html>Please make sure all selected ways head in a similar direction<br>or "
"orthogonalize them one by one.</html>"
@@ -1074,6 +1106,15 @@ msgstr "同時重新命名該檔案"
msgid "Could not rename file ''{0}''"
msgstr "無法重新命名檔案「{0}」"
+msgid "Restart"
+msgstr "重新啟動"
+
+msgid "Restart the application."
+msgstr ""
+
+msgid "Click to restart later."
+msgstr ""
+
msgid "Reverse way"
msgstr "反轉路徑"
@@ -1124,9 +1165,6 @@ msgstr "載入作業階段"
msgid "Load a session from file."
msgstr "從檔案載入作業階段。"
-msgid "Session file (*.jos, *.joz)"
-msgstr "作業階段檔案 (*.jos, *.joz)"
-
msgid "Open session"
msgstr "開啟作業階段"
@@ -1188,6 +1226,9 @@ msgstr "狀態報告"
msgid "Copy to clipboard and close"
msgstr "複製到剪貼簿並關閉"
+msgid "Report bug"
+msgstr ""
+
msgid "Close"
msgstr "關閉"
@@ -1258,14 +1299,14 @@ msgid ""
msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）"
msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr "<html>以角色為基礎的關係成員會複製到所有的新路徑。<br>必要時您應該檢驗並修正它。</html>"
+"A role based relation membership was copied to all new ways.<br>You should "
+"verify this and correct it when necessary."
+msgstr ""
msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr "<html>將關係成員複製到所有的新路徑。<br>您應該在必要時才檢驗這個項目並修正它。</html>"
+"A relation membership was copied to all new ways.<br>You should verify this "
+"and correct it when necessary."
+msgstr ""
msgid "Split way {0} into {1} parts"
msgstr "將路徑 {0} 分割為 {1} 個部分"
@@ -1355,6 +1396,27 @@ msgid ""
"because you don''t see the real object.<br>Do you really want to unglue?"
msgstr ""
+msgid "Disconnect Node from Way"
+msgstr ""
+
+msgid "Disconnect nodes from a way they currently belong to"
+msgstr ""
+
+msgid "Select at least one node to be disconnected."
+msgstr ""
+
+msgid "Selected node cannot be disconnected from anything."
+msgid_plural "Selected nodes cannot be disconnected from anything."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"The affected way would disappear after disconnecting the selected node."
+msgid_plural ""
+"The affected way would disappear after disconnecting the selected nodes."
+msgstr[0] ""
+msgstr[1] ""
+
msgid "Undo"
msgstr "復原"
@@ -1379,9 +1441,6 @@ msgstr "更新資料"
msgid "Updates the objects in the active data layer from the server."
msgstr "從伺服器更新使用中資料圖層的物件。"
-msgid "Download data"
-msgstr "下載資料"
-
msgid "Update modified"
msgstr "更新已修改的"
@@ -1577,6 +1636,9 @@ msgctxt "audio"
msgid "Slower Forward"
msgstr "慢速快轉"
+msgid "Download GPS"
+msgstr ""
+
msgid "Downloading GPS data"
msgstr "正在下載 GPS 資料"
@@ -1586,6 +1648,18 @@ msgstr "已下載的 GPX 資料"
msgid "Markers from {0}"
msgstr "{0} 的標記"
+msgid "Download Compressed OSM Change"
+msgstr ""
+
+msgid "Download OSM Change"
+msgstr ""
+
+msgid "Download Compressed OSM"
+msgstr ""
+
+msgid "Download OSM"
+msgstr "下載 OSM"
+
msgid "Downloading data"
msgstr "正在下載資料"
@@ -1605,6 +1679,29 @@ msgstr "指令"
msgid "Request details: {0}"
msgstr ""
+msgid "Download OSM URL"
+msgstr ""
+
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "在匯入過程中發生 {0} 個衝突。"
+
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "下載時發生衝突"
+
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) 正在載入節點 {2} 的上層項目"
+
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) 正在載入路徑 {2} 的上層項目"
+
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) 正在載入關係 {2} 的上層項目"
+
+msgid "Download session"
+msgstr ""
+
msgid "Download {0} of {1} ({2} left)"
msgstr "下載 {0} / {1} (剩下 {2})"
@@ -1654,23 +1751,6 @@ msgstr "在大量下載時發生下列錯誤：{0}"
msgid "Errors during download"
msgstr "下載時發生錯誤"
-msgid "There was {0} conflict during import."
-msgid_plural "There were {0} conflicts during import."
-msgstr[0] "在匯入過程中發生 {0} 個衝突。"
-
-msgid "Conflict during download"
-msgid_plural "Conflicts during download"
-msgstr[0] "下載時發生衝突"
-
-msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) 正在載入節點 {2} 的上層項目"
-
-msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) 正在載入路徑 {2} 的上層項目"
-
-msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) 正在載入關係 {2} 的上層項目"
-
msgid "Error during download"
msgstr "下載時發生錯誤"
@@ -1812,6 +1892,9 @@ msgstr "加強路徑準確度"
msgid "Improve Way Accuracy mode"
msgstr "加強路徑準確度模式"
+msgid "improve way accuracy helper line"
+msgstr ""
+
msgid "Click on the way to start improving its shape."
msgstr "點選路徑開始改善它的形狀。"
@@ -1836,9 +1919,10 @@ msgstr "點選可移動強調的節點。按住 Ctrl 會加入新節點，或按
msgid "Cannot place a node outside of the world."
msgstr "不能在世界範圍以外放置節點。"
-msgid "Add and a new node to way"
-msgid_plural "Add and a new node to {0} ways"
-msgstr[0] "加入新節點到 {0} 路徑"
+msgid "Add a new node to way"
+msgid_plural "Add a new node to {0} ways"
+msgstr[0] ""
+msgstr[1] ""
msgid "Cannot delete node that is referenced by multiple objects"
msgstr "不能刪除由多個物件參照的節點"
@@ -1852,6 +1936,9 @@ msgstr "平行線"
msgid "Make parallel copies of ways"
msgstr "製作路徑的平行複本"
+msgid "make parallel helper line"
+msgstr ""
+
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
@@ -2268,6 +2355,9 @@ msgstr ""
msgid "matches if ''key'' exists"
msgstr ""
+msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
+msgstr ""
+
msgid "combinators"
msgstr ""
@@ -2434,14 +2524,14 @@ msgstr ""
msgid "Expecting <i>min</i>/<i>max</i> after ''timestamp''"
msgstr "在 ''timestamp'' 之後預期應有 <i>min</i>/<i>max</i>"
-msgid "Primitive id expected"
-msgstr "預期的原型 id"
+msgid "Range of primitive ids expected"
+msgstr ""
-msgid "Changeset id expected"
-msgstr "預期的變更組合 id"
+msgid "Range of changeset ids expected"
+msgstr ""
-msgid "Version expected"
-msgstr "預期的版本"
+msgid "Range of versions expected"
+msgstr ""
msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value"
@@ -2449,6 +2539,9 @@ msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=
msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
msgstr "不明的原型類型：{0}。允許的數值為 node、 way 或 relation"
+msgid "Primitive id expected"
+msgstr "預期的原型 id"
+
msgid "Range of numbers expected"
msgstr "預期的數字範圍"
@@ -2467,9 +2560,8 @@ msgstr "缺少 XOR 的參數"
msgid "Missing operator for NOT"
msgstr "缺少 NOT 的運算子"
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr "警告：自動截短在已刪除物件 {1} 上標籤「{0}」的數值"
+msgid "Automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr ""
msgid ""
"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
@@ -2554,6 +2646,9 @@ msgid "Added {0} object"
msgid_plural "Added {0} objects"
msgstr[0] "已加入 {0} 個物件"
+msgid "New way {0} has 0 nodes"
+msgstr ""
+
msgid "Change node {0}"
msgstr "改變節點 {0}"
@@ -2590,11 +2685,11 @@ msgstr "從 {1} 物件移除「{0}」"
msgid "Set {0}={1} for {2} objects"
msgstr "在 {2} 物件設定 {0}={1}"
-msgid "Deleted {0} properties for {1} objects"
-msgstr "刪除 {1} 物件的 {0} 屬性"
+msgid "Deleted {0} tags for {1} objects"
+msgstr ""
-msgid "Set {0} properties for {1} objects"
-msgstr "設定 {1} 物件的 {0} 屬性"
+msgid "Set {0} tags for {1} objects"
+msgstr ""
msgid "Replace \"{0}\" by \"{1}\" for"
msgstr "將「{1}」取代為「{0}」"
@@ -2615,9 +2710,9 @@ msgid "Double conflict"
msgstr "雙重衝突"
msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"object ''{1}''."
-msgstr "警告：圖層「{0}」不再存在。不能移除物件「{1}」的衝突。"
+"Layer ''{0}'' does not exist any more. Cannot remove conflict for object "
+"''{1}''."
+msgstr ""
msgid "Add conflict for ''{0}''"
msgstr "加入「{0}」衝突"
@@ -2714,6 +2809,9 @@ msgstr[0] "已清除 {0} 個物件"
msgid "Resolve conflicts in member list of relation {0}"
msgstr "解決關係 {0} 的成員清單的衝突"
+msgid "Removed nodes from {0}"
+msgstr ""
+
msgid "Rotate {0} node"
msgid_plural "Rotate {0} nodes"
msgstr[0] "旋轉 {0} 個節點"
@@ -2771,9 +2869,9 @@ msgid "Reverse directional way."
msgstr ""
msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr "在反轉這條路徑時，為了維持資料的一致性，建議下列對該路徑的屬性與其節點的變更。"
+"When reversing this way, the following changes are suggested in order to "
+"maintain data consistency."
+msgstr ""
msgid "Relation"
msgstr "關係"
@@ -2802,11 +2900,11 @@ msgstr "套用選取的變更"
msgid "Do not apply changes"
msgstr "不要套用變更"
-msgid "Please select which property changes you want to apply."
-msgstr "請選擇要接受的屬性變更。"
+msgid "Please select which changes you want to apply."
+msgstr ""
-msgid "Properties of "
-msgstr "屬性 "
+msgid "Tags of "
+msgstr ""
msgid "Roles in relations referring to"
msgstr "關係中的角色參照到"
@@ -2826,6 +2924,9 @@ msgstr "建立檔案時發生 IOError，自動儲存會被略過：{0}"
msgid "Unable to delete old backup file {0}"
msgstr "無法刪除舊的備份檔案 {0}"
+msgid "Your work has been saved automatically."
+msgstr ""
+
msgid "Error while creating backup of removed layer: {0}"
msgstr "在建立已移除圖層的備份時發生錯誤：{0}"
@@ -2856,19 +2957,19 @@ msgid ""
"function manually and retry importing."
msgstr ""
-msgid "Warning: Failed to create missing cache directory: {0}"
+msgid "Failed to create missing cache directory: {0}"
msgstr ""
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>無法建立缺少的快取目錄： {0}</html>"
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "警告：將偏好設定固定為「{0}」失敗"
+msgid "Failed to persist preferences to ''{0}''"
+msgstr ""
msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
-msgstr "警告：初始化偏好設定失敗。偏好設定目錄「{0}」不是一個目錄。"
+"Failed to initialize preferences. Preference directory ''{0}'' is not a "
+"directory."
+msgstr ""
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -2876,23 +2977,21 @@ msgid ""
msgstr "<html>初始化偏好設定失敗。<br>偏好設定目錄「{0}」不是一個目錄。</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
-msgstr "警告：初始化偏好設定失敗。無法建立缺少的偏好設定目錄：{0}"
+"Failed to initialize preferences. Failed to create missing preference "
+"directory: {0}"
+msgstr ""
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
"preference directory: {0}</html>"
msgstr "<html>初始化偏好設定失敗。<br>無法建立缺少的偏好設定目錄：{0}</html>"
-msgid ""
-"Info: Missing preference file ''{0}''. Creating a default preference file."
+msgid "Missing preference file ''{0}''. Creating a default preference file."
msgstr ""
msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
-msgstr "警告：以預設的偏好設定檔案取代現有的偏好設定檔案「{0}」。"
+"Replacing existing preference file ''{0}'' with default preference file."
+msgstr ""
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -2905,9 +3004,9 @@ msgid ""
msgstr "<html>偏好設定檔案有錯誤。<br>將舊的設定製作備份為 <br>{0}<br> 並建立新的預設偏好設定檔案。</html>"
msgid ""
-"Warning: Failed to initialize preferences. Failed to reset preference file "
-"to default: {0}"
-msgstr "警告：無法初始化偏好設定。無法將偏好設定檔重設為預設值：{0}"
+"Failed to initialize preferences. Failed to reset preference file to "
+"default: {0}"
+msgstr ""
msgid "Paint style {0}: {1}"
msgstr "繪畫樣式 {0}：{1}"
@@ -2936,12 +3035,11 @@ msgstr "無法載入資源「{0}」，錯誤為 {1}。"
msgid "UNKNOWN"
msgstr "不明"
-msgid ""
-"Warning: unexpected JOSM version number in revision file, value is ''{0}''"
-msgstr "警告：在修訂版檔案中有未預期的 JOSM 版本號碼，數值為「{0}」"
+msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
+msgstr ""
-msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr "警告：缺少修訂版檔案「/REVISION」。"
+msgid "The revision file ''/REVISION'' is missing."
+msgstr ""
msgid "Already registered a conflict for primitive ''{0}''."
msgstr "已經註冊原型「{0}」的衝突。"
@@ -3090,8 +3188,7 @@ msgstr "不能比較 ID「{0}」和 ID「{1}」的原型。"
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
-msgid ""
-"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgid "Failed to load map renderer class ''{0}''. The class wasn''t found."
msgstr ""
msgid ""
@@ -3198,7 +3295,7 @@ msgstr ""
msgid "Unkown datum identifier: ''{0}''"
msgstr ""
-msgid "Datum required (+datum=*, +towgs84=* or +nadgirds=*)"
+msgid "Datum required (+datum=*, +towgs84=* or +nadgrids=*)"
msgstr ""
msgid ""
@@ -3217,6 +3314,9 @@ msgstr ""
msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
+msgid "Unknown parameter ''{0}''"
+msgstr ""
+
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3233,9 +3333,6 @@ msgstr "自訂投影法"
msgid "GRS80"
msgstr "GRS80"
-msgid "Error: failed to open input stream for resource ''/data/{0}''."
-msgstr "錯誤：無法開啟資源 ''/data/{0}'' 的輸入串流。"
-
msgid "WGS84"
msgstr "WGS84"
@@ -3276,6 +3373,9 @@ msgstr "驗證其他的"
msgid "Running test {0}"
msgstr "執行測試 {0}"
+msgid "Test ''{0}'' completed in {1}"
+msgstr ""
+
msgid "Addresses"
msgstr "地址"
@@ -3300,6 +3400,15 @@ msgstr ""
msgid "House number too far from street"
msgstr ""
+msgid "Barriers and entrances"
+msgstr ""
+
+msgid "Checks for errors in barriers and entrances."
+msgstr ""
+
+msgid "Barrier entrance not set on a barrier"
+msgstr ""
+
msgid "Building inside building"
msgstr "建築物中的建築"
@@ -3327,7 +3436,7 @@ msgstr ""
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
"the same layer, but are not connected by a node."
-msgstr "這會測試是否有兩條道路、鐵路、水路或建築物在同一圖層交錯，但沒有以節點連接。"
+msgstr "這會測試是否有兩條道路、鐵路、水路或建築物在同一層交錯，但沒有以節點連接。"
msgid "Crossing buildings"
msgstr "交錯的建築物"
@@ -3359,15 +3468,15 @@ msgstr " 或 "
msgid "{0} is deprecated, use {1} instead"
msgstr "{0} 已廢棄，使用 {1} 代替"
+msgid "{0} is unnecessary"
+msgstr ""
+
msgid "Duplicated nodes"
msgstr "重複的節點"
msgid "This test checks that there are no nodes at the very same location."
msgstr "這會測試有沒有位置非常相近的節點存在。"
-msgid "Duplicate nodes in two un-closed ways"
-msgstr "兩個未封閉路徑有重複的節點"
-
msgid "Mixed type duplicated nodes"
msgstr "混合類型的重複節點"
@@ -3435,6 +3544,24 @@ msgstr "重複的路徑節點"
msgid "Checks for ways with identical consecutive nodes."
msgstr "檢查是否有整個節點都相同的路徑。"
+msgid "Highways"
+msgstr "公路"
+
+msgid "Performs semantic checks on highways."
+msgstr ""
+
+msgid "Incorrect roundabout (highway: {0} instead of {1})"
+msgstr ""
+
+msgid "Missing pedestrian crossing information"
+msgstr ""
+
+msgid "Unknown country code: {0}"
+msgstr ""
+
+msgid "Unknown source:maxspeed context: {0}"
+msgstr ""
+
msgid "Multipolygon"
msgstr "多重多邊形"
@@ -3504,6 +3631,12 @@ msgstr "有同樣名稱的節點"
msgid "This test finds nodes that have the same name (might be duplicates)."
msgstr "這個測試會找出有相同名稱的節點（可能是重複的節點）。"
+msgid "Opening hours syntax"
+msgstr ""
+
+msgid "This test checks the correct usage of the opening hours syntax."
+msgstr ""
+
msgid "Overlapping Areas"
msgstr "重疊的區域"
@@ -3561,15 +3694,15 @@ msgstr "關係類型不明"
msgid "Relation is empty"
msgstr "關係是空白的"
+msgid "Role verification problem"
+msgstr "角色驗證問題"
+
msgid "<empty>"
msgstr "<空白>"
msgid "Role {0} missing"
msgstr "缺少角色 {0}"
-msgid "Role verification problem"
-msgstr "角色驗證問題"
-
msgid "Number of {0} roles too low ({1})"
msgstr "{0} 角色的編號太低 ({1})"
@@ -3599,11 +3732,11 @@ msgid ""
"This test checks for ways with similar names that may have been misspelled."
msgstr "這個測試會檢查名稱近似的路徑，因為那有可能是拼錯字了。"
-msgid "Properties checker :"
-msgstr "屬性檢查器："
+msgid "Tag checker"
+msgstr ""
-msgid "This plugin checks for errors in property keys and values."
-msgstr "這個外掛程式會檢查屬性中的設定鍵和數值有無錯誤。"
+msgid "This test checks for errors in tag keys and values."
+msgstr ""
msgid "Invalid tagchecker line - {0}: {1}"
msgstr "無效的標籤檢查行- {0}： {1}"
@@ -3740,8 +3873,8 @@ msgstr "使用預設的拼字檢查檔案。"
msgid "Use the default spellcheck file (recommended)."
msgstr "使用預設的拼字檢查檔案（建議值）。"
-msgid "Fix properties"
-msgstr "修正屬性"
+msgid "Fix tags"
+msgstr ""
msgid "Could not find element type"
msgstr "找不到元件類型"
@@ -3815,6 +3948,9 @@ msgstr "未封閉路徑"
msgid "This tests if ways which should be circular are closed."
msgstr "這會測試圓形的路徑是否已封閉。"
+msgid "Unclosed way"
+msgstr "未封閉的路徑"
+
msgid "natural type {0}"
msgstr "自然的類型 {0}"
@@ -3845,9 +3981,6 @@ msgstr "建築"
msgid "area"
msgstr "區域"
-msgid "Unclosed way"
-msgstr "未封閉的路徑"
-
msgid "Unconnected ways"
msgstr "未連接路徑"
@@ -3872,12 +4005,12 @@ msgstr "沒有標籤且未連接的節點"
msgid "This test checks for untagged nodes that are not part of any way."
msgstr "這個測試會檢查未加標籤且不屬任何路徑的一部分的節點。"
-msgid "No tags"
-msgstr "沒有標籤"
-
msgid "Unconnected nodes without physical tags"
msgstr "未連接且沒有實體標籤的節點"
+msgid "No tags"
+msgstr "沒有標籤"
+
msgid "Has tag containing ''fixme'' or ''FIXME''"
msgstr "使用的標籤含有「fixme」或「FIXME」"
@@ -3938,23 +4071,6 @@ msgstr "反轉的海岸線：陸地不在左側"
msgid "Reversed land: land not on left side"
msgstr "反轉的陸地：陸地不在左側"
-msgid "Wrong number of arguments for bookmark"
-msgstr "書籤的引數數量錯誤"
-
-msgid "Error reading bookmark entry: %s"
-msgstr "讀取書籤項目時發生錯誤：%s"
-
-msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr "錯誤：在書籤檔案「{1}」中有未預期的行「{0}」"
-
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr "錯誤：書籤檔「{2}」的「{1}」行有不合格的 double 數值「{0}」"
-
-msgid ""
-"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr "<html>無法讀取書籤<br>''{0}''<br>錯誤為：{1}</html>"
-
msgid "Do not show again (remembers choice)"
msgstr "不要再顯示（記住選擇）"
@@ -4056,8 +4172,8 @@ msgstr "顯示求助資訊"
msgid "Downloading \"Message of the day\""
msgstr "正在下載「當天的訊息」"
-msgid "Warning: failed to read MOTD. Exception was: {0}"
-msgstr "警告：無法讀取 MOTD。例外為：{0}"
+msgid "Failed to read MOTD. Exception was: {0}"
+msgstr ""
msgid "Message of the day not available"
msgstr "無法取得當天的訊息。"
@@ -4253,9 +4369,24 @@ msgstr "檢視"
msgid "Tools"
msgstr "工具"
+msgid "More tools"
+msgstr "更多工具"
+
+msgid "Data"
+msgstr ""
+
+msgid "Selection"
+msgstr "選擇區域"
+
msgid "Presets"
msgstr "預設組合"
+msgid "More..."
+msgstr ""
+
+msgid "GPS"
+msgstr ""
+
msgid "Windows"
msgstr "視窗"
@@ -4271,11 +4402,23 @@ msgstr "編輯工具列"
msgid "Toggles the visibility of the edit toolbar (i.e., the vertical tool)"
msgstr "切換編輯工具列的顯示 (例如：垂直工具列)"
-msgid "Audio"
-msgstr "音效"
+msgid "Preset preferences"
+msgstr ""
-msgid "Hide edit toolbar"
-msgstr "隱藏編輯工具列"
+msgid "Click to open the tagging presets tab in the preferences"
+msgstr ""
+
+msgid "Imagery preferences"
+msgstr ""
+
+msgid "Click to open the imagery tab in the preferences"
+msgstr ""
+
+msgid "Audio"
+msgstr "音效"
+
+msgid "Do not hide toolbar"
+msgstr ""
msgid "Hide this button"
msgstr "隱藏這個按鈕"
@@ -4283,6 +4426,9 @@ msgstr "隱藏這個按鈕"
msgid "Click the arrow at the bottom to show it again."
msgstr "點選底部的按鈕再次顯示它。"
+msgid "Hide edit toolbar"
+msgstr "隱藏編輯工具列"
+
msgid "Hide or show this toggle button"
msgstr "隱藏或顯示這個切換按鈕"
@@ -4342,6 +4488,9 @@ msgstr "(沒有物件)"
msgid "User:"
msgstr "使用者："
+msgid "Do not hide status bar"
+msgstr ""
+
msgid "Layer not in list."
msgstr "圖層不在清單中。"
@@ -4369,19 +4518,6 @@ msgstr "背景執行"
msgid "Click to run job in background"
msgstr "點選以在背景執行工作"
-msgid "false: the property is explicitly switched off"
-msgstr "false：該屬性已經被確實關上了"
-
-msgid "true: the property is explicitly switched on"
-msgstr "true：該屬性已經被確實開啟了"
-
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr "部分：不同選取的物件有不同的數值，不要改變"
-
-msgid "unset: do not set this property on the selected objects"
-msgstr "取消設定：不要在選取的物件上設定這個屬性"
-
msgid "{0} ({1} ms)"
msgstr "{0} ({1} 毫秒)"
@@ -4671,29 +4807,47 @@ msgstr "> 底部"
msgid "Copy my selected elements to the end of the list of merged elements."
msgstr "將我選取的元件複製到合併元件清單的結尾"
+msgid "> before"
+msgstr ""
+
msgid ""
"Copy my selected elements before the first selected element in the list of "
"merged elements."
msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之前"
+msgid "> after"
+msgstr ""
+
msgid ""
"Copy my selected elements after the first selected element in the list of "
"merged elements."
msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之後"
+msgid "< top"
+msgstr ""
+
msgid ""
"Copy their selected element to the start of the list of merged elements."
msgstr "將他們選取的元件複製到合併元件清單的開頭"
+msgid "< bottom"
+msgstr ""
+
msgid ""
"Copy their selected elements to the end of the list of merged elements."
msgstr "將他們選取的元件複製到合併元件清單的結尾"
+msgid "< before"
+msgstr ""
+
msgid ""
"Copy their selected elements before the first selected element in the list "
"of merged elements."
msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之前"
+msgid "< after"
+msgstr ""
+
msgid ""
"Copy their selected element after the first selected element in the list of "
"merged elements"
@@ -4708,8 +4862,8 @@ msgstr "將他們所有的元素複製到目標"
msgid "Up"
msgstr "上"
-msgid "Move up the selected elements by one position."
-msgstr "將選取的元件向上移動一個位置"
+msgid "Move up the selected entries by one position."
+msgstr ""
msgid "Down"
msgstr "下"
@@ -4757,14 +4911,6 @@ msgid "Their version ({0} entry)"
msgid_plural "Their version ({0} entries)"
msgstr[0] "他們的版本 ({0} 個項目)"
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr "可調整的 {0} 尚未設定。不能在同步調整中設定參與。"
-
-msgid "Adjustable {0} not registered yet."
-msgstr "可調整的 {0} 尚未註冊。"
-
msgid "Node"
msgstr "節點"
@@ -5011,15 +5157,15 @@ msgctxt "tag"
msgid "Key:"
msgstr "鍵值："
-msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr "<html>輸入標籤鍵值，例如 <strong><tt>fixme</tt></strong></html>"
+msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
msgid "Value:"
msgstr "數值："
msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
-msgstr "<html>輸入標籤數值，例如 <strong><tt>check members</tt></strong></html>"
+"<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
+msgstr ""
msgid ""
"<html>The combined ways are members in one ore more relations. Please decide "
@@ -5548,6 +5694,9 @@ msgstr "顯示/隱藏"
msgid "Information about layer"
msgstr "關於圖層的資訊"
+msgid "Map paint preferences"
+msgstr ""
+
msgid "Map Paint Styles"
msgstr "地圖繪製樣式"
@@ -5631,6 +5780,35 @@ msgstr "樣式目前是否使用中？"
msgid "No"
msgstr "否"
+msgid "Object type:"
+msgstr "物件類型："
+
+msgctxt "osm object types"
+msgid "mixed"
+msgstr "混合"
+
+msgid "Choose the OSM object type"
+msgstr "選擇 OSM 物件類型"
+
+msgid "Object ID:"
+msgstr "物件 ID："
+
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "輸入要下載的物件 ID"
+
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+"物件 ID 可以用逗號或空白分隔。<br/> 例如：<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> "
+"混合模式，請以這樣指定物件： <b>w123, n110, w12, r15</b><br/>"
+
+msgid ""
+"Invalid ID list specified\n"
+"Cannot continue."
+msgstr ""
+
msgid "Relations"
msgstr "關係"
@@ -5652,9 +5830,6 @@ msgstr ""
msgid "Relations: {0}"
msgstr "關係：{0}"
-msgid "Selection"
-msgstr "選擇區域"
-
msgid "Open a selection list window."
msgstr "開啓選擇區域清單視窗。"
@@ -5679,18 +5854,6 @@ msgstr ""
msgid "Selection: {0}"
msgstr "選擇區域：{0}"
-msgid "Side buttons"
-msgstr ""
-
-msgid "Always shown"
-msgstr ""
-
-msgid "Dynamic"
-msgstr ""
-
-msgid "Always hidden"
-msgstr ""
-
msgid "Toggle dynamic buttons"
msgstr "切換動態按鈕"
@@ -5707,6 +5870,18 @@ msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它
msgid "Click to minimize/maximize the panel content"
msgstr "點選以最小化/最大化面板內容"
+msgid "Side buttons"
+msgstr ""
+
+msgid "Always shown"
+msgstr ""
+
+msgid "Dynamic"
+msgstr ""
+
+msgid "Always hidden"
+msgstr ""
+
msgid "Authors"
msgstr "作者"
@@ -5723,9 +5898,8 @@ msgstr "選取這個使用者傳送的物件"
msgid "Launches a browser with information about the user"
msgstr "啟動瀏覽器顯示關於此使用者的資訊"
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr "警告：只會顯示 {1} 個已選取使用者的前 {0} 位"
+msgid "Only launching info browsers for the first {0} of {1} selected users"
+msgstr ""
msgid ""
"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
@@ -5750,9 +5924,6 @@ msgstr "開啟驗證視窗。"
msgid "Validation results"
msgstr "驗證的結果"
-msgid "Zoom to problem"
-msgstr "縮放至問題點"
-
msgid "Fix"
msgstr "修正"
@@ -5899,9 +6070,6 @@ msgstr "更新內容"
msgid "Update the changeset content from the OSM server"
msgstr "從 OSM 伺服器更新變更組合內容"
-msgid "Show history"
-msgstr "顯示歷史紀錄"
-
msgid "Download and show the history of the selected objects"
msgstr "下載並顯示選取物件的歷史紀錄"
@@ -6187,9 +6355,9 @@ msgid "<html>Download changesets in the current map view</html>"
msgstr "<html>下載在目前地圖檢視中的變更組合</html>"
msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
-msgstr "警告：偏好設定「{0}」有未預期的數值，卻收到「{1}」。重設為預設的查詢。"
+"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
+"query."
+msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
msgstr "對匿名使用者不能建立開放變更組合的建立變更組合查詢"
@@ -6253,35 +6421,47 @@ msgstr "請注意變更組合查詢目前永遠送出到「{0}」，不管下列
msgid "This changeset query URL is invalid"
msgstr "這個變更組合查詢 URL 是無效的"
-msgid "Select objects for which to change properties."
-msgstr "選擇要改變屬性的物件。"
+msgid "Discardable key: selection Foreground"
+msgstr ""
+
+msgid "Discardable key: selection Background"
+msgstr ""
-msgid "Properties/Memberships"
-msgstr "屬性/成員"
+msgid "Discardable key: foreground"
+msgstr ""
-msgid "Properties for selected objects."
-msgstr "選取物件的屬性。"
+msgid "Discardable key: background"
+msgstr ""
msgid "<different>"
msgstr "<不同>"
+msgid "Select objects for which to change tags."
+msgstr ""
+
+msgid "Tags/Memberships"
+msgstr ""
+
+msgid "Tags for selected objects."
+msgstr ""
+
msgid "Member Of"
msgstr "成員"
msgid "Position"
msgstr "位置"
-msgid "Properties: {0} / Memberships: {1}"
-msgstr "屬性：{0} / 成員：{1}"
+msgid "Tags: {0} / Memberships: {1}"
+msgstr ""
-msgid "Properties / Memberships"
-msgstr "屬性 / 成員"
+msgid "Tags / Memberships"
+msgstr ""
msgid "Delete the selected key in all objects"
msgstr "刪除所有物件中選取的設定鍵"
-msgid "Delete Properties"
-msgstr "删除屬性"
+msgid "Delete Tags"
+msgstr ""
msgid "Change relation"
msgstr "改變關係"
@@ -6295,14 +6475,14 @@ msgstr "確定要刪除關係 {0} 的選擇區域？"
msgid "Add a new key/value pair to all objects"
msgstr "將新的設定鍵/數值配對加入到所有的物件"
-msgid "Add Property"
-msgstr "加入屬性"
+msgid "Add Tag"
+msgstr ""
msgid "Edit the value of the selected key for all objects"
msgstr "編輯所有物件選取設定鍵的數值"
-msgid "Edit Properties"
-msgstr "編輯屬性"
+msgid "Edit Tags"
+msgstr ""
msgid "Go to OSM wiki for tag help (F1)"
msgstr "前往 OSM wiki 取得標籤說明 (F1)"
@@ -6377,12 +6557,6 @@ msgstr[0] "改變屬性至 {0} 個物件"
msgid "Use English language for tag by default"
msgstr ""
-msgid "Paste tag"
-msgstr ""
-
-msgid "Paste value"
-msgstr ""
-
msgid "Add value?"
msgstr "加入數值？"
@@ -6411,9 +6585,15 @@ msgstr ""
msgid "Recently added tags"
msgstr ""
+msgid "Choose recent tag {0}"
+msgstr ""
+
msgid "Use this tag again"
msgstr ""
+msgid "Apply recent tag {0}"
+msgstr ""
+
msgid "The key ''{0}'' is already used"
msgstr ""
@@ -6450,8 +6630,8 @@ msgstr "關係已刪除"
msgid "Downloading relation {0}"
msgstr "正在下載關係 {0}"
-msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr "警告：忽略例外，因為工作已被取消。例外：{0}"
+msgid "Ignoring exception because task was canceled. Exception: {0}"
+msgstr ""
msgid "Downloading {0} incomplete object"
msgid_plural "Downloading {0} incomplete objects"
@@ -6509,6 +6689,9 @@ msgstr "移除它們，清除關係"
msgid "Ignore them, leave relation as is"
msgstr "忽略它們，保持關係原貌"
+msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
+msgstr ""
+
msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
@@ -6766,6 +6949,25 @@ msgstr "路徑已連接到下一個關係成員"
msgid "way is not connected to previous or next relation member"
msgstr "路徑未連接到前一個或下一個關係成員"
+msgid "{0} - {1} ({2})"
+msgstr ""
+
+msgid "Wrong number of arguments for bookmark"
+msgstr "書籤的引數數量錯誤"
+
+msgid "Error reading bookmark entry: %s"
+msgstr "讀取書籤項目時發生錯誤：%s"
+
+msgid "Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+msgid "Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+msgid ""
+"<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>無法讀取書籤<br>''{0}''<br>錯誤為：{1}</html>"
+
msgid "Bookmarks"
msgstr "書籤"
@@ -6831,9 +7033,6 @@ msgstr "緯度的數值範圍必須為 [-90,90]。"
msgid "Value for longitude in range [-180,180] required."
msgstr "經度的數值範圍必須為 [-180,180]。"
-msgid "Paste URL from clipboard"
-msgstr "從剪貼簿貼上 URL"
-
msgid "Data Sources and Types:"
msgstr "資料來源和類型："
@@ -6902,21 +7101,8 @@ msgstr "下載參照 (父關係)"
msgid "Download object"
msgstr "下載物件"
-msgid "Object type:"
-msgstr "物件類型："
-
-msgctxt "osm object types"
-msgid "mixed"
-msgstr "混合"
-
-msgid "Choose the OSM object type"
-msgstr "選擇 OSM 物件類型"
-
-msgid "Object ID:"
-msgstr "物件 ID："
-
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "輸入要下載的物件 ID"
+msgid "Start downloading"
+msgstr "開始下載"
msgid ""
"Select if the referrers of the object should be downloaded as well, "
@@ -6926,25 +7112,9 @@ msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
msgstr "如果關係的成員也要下載請選擇"
-msgid ""
-"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
-"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
-"<b>w123, n110, w12, r15</b><br/>"
-msgstr ""
-"物件 ID 可以用逗號或空白分隔。<br/> 例如：<b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b> "
-"混合模式，請以這樣指定物件： <b>w123, n110, w12, r15</b><br/>"
-
msgid "Download referrers (parent relations and ways)"
msgstr "下載參照 (父關係與路徑)"
-msgid "Start downloading"
-msgstr "開始下載"
-
-msgid ""
-"Invalid ID list specified\n"
-"Cannot download object."
-msgstr ""
-
msgid "Class Type"
msgstr "類別類型"
@@ -7046,8 +7216,8 @@ msgstr "前往下一頁"
msgid "Go to the JOSM help home page"
msgstr "移至 JOSM 求助首頁"
-msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "警告：在 HTML 文件中有錯誤的位置。例外為：{0}"
+msgid "Bad location in HTML document. Exception was: {0}"
+msgstr ""
msgid "Failed to open help page. The target URL is empty."
msgstr "無法開啟求助頁面。目標 URL 是空的。"
@@ -7145,6 +7315,9 @@ msgid ""
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
msgstr "<html>版本 <strong>{0}</strong> 建立於 <strong>{1}</strong></html>"
+msgid "Changeset comment"
+msgstr ""
+
msgid "Changeset info"
msgstr "變更組合資訊"
@@ -7240,8 +7413,8 @@ msgstr ""
msgid "Object still in use"
msgstr "物件仍在使用中"
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "警告：錯誤標頭「{0}」與預期的模式不符"
+msgid "Error header \"{0}\" did not match with an expected pattern"
+msgstr ""
msgid "Upload"
msgstr "上傳"
@@ -7259,6 +7432,12 @@ msgstr "提供關於您所上傳變更的簡短註解："
msgid "Enter an upload comment"
msgstr "請輸入上傳備註"
+msgid "Specify the data source for the changes:"
+msgstr ""
+
+msgid "Enter a source"
+msgstr ""
+
msgid "Changeset id:"
msgstr "變更組合 id："
@@ -7325,9 +7504,8 @@ msgid "Closing changeset {0}"
msgstr "正在關閉變更組合 {0}"
msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
-msgstr "警告：無法將憑證對話盒永遠置於最上層。抓到安全性例外。"
+"Failed to put Credential Dialog always on top. Caught security exception."
+msgstr ""
msgid "Enter credentials for OSM API"
msgstr "輸入 OSM API 的憑證"
@@ -7401,8 +7579,8 @@ msgid "Unpacking {0} into {1}"
msgstr ""
msgid ""
-"Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
+"Skipping download."
msgstr ""
msgid ""
@@ -7418,9 +7596,8 @@ msgid "Missing user identity"
msgstr "遺失使用者識別"
msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
-msgstr "警告：無法取得目前的 JOSM 使用者資訊。例外為：{0}"
+"Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
+msgstr ""
msgid "Download objects"
msgstr "下載物件.."
@@ -7632,12 +7809,6 @@ msgstr "上傳已變更的原型"
msgid "Please revise upload comment"
msgstr "請修正上傳備註"
-msgid "Revise"
-msgstr "修訂"
-
-msgid "Continue as is"
-msgstr "仍然繼續"
-
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
"is technically allowed, but please consider that many users who are<br "
@@ -7649,6 +7820,22 @@ msgstr ""
"/>在觀看他們區域的變更時都是依據有意義的變更組合備註<br />來了解發生了什麼事！<br /><br "
"/>如果您現在花一點時間說明您的變更，就可以讓其他<br />眾多製圖者更好做事。"
+msgid "Please specify a changeset source"
+msgstr ""
+
+msgid ""
+"You did not specify a source for your changes.<br />This is technically "
+"allowed, but it assists other users <br />to understand the origins of the "
+"data.<br /><br />If you spend a minute now to explain your change, you will "
+"make life<br />easier for many other mappers."
+msgstr ""
+
+msgid "Revise"
+msgstr "修訂"
+
+msgid "Continue as is"
+msgstr "仍然繼續"
+
msgid "Return to the previous dialog to enter a more descriptive comment"
msgstr "回到前一個對話盒以輸入更多描述性備註"
@@ -7664,6 +7851,21 @@ msgstr "請先輸入有效的區塊大小"
msgid "Illegal chunk size"
msgstr "不合格的區塊大小"
+msgid "{0}={1}"
+msgstr ""
+
+msgid ""
+"<html>The following changeset tag contains an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgid_plural ""
+"<html>The following changeset tags contain an empty "
+"key/value:<br>{0}<br>Continue?</html>"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Empty metadata"
+msgstr ""
+
msgid "Cancel the upload and resume editing"
msgstr "取消上傳並繼續編輯"
@@ -7671,9 +7873,9 @@ msgid "Tags of changeset {0}"
msgstr "變更組合 {0} 的標籤"
msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
-msgstr "警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。"
+"Object ''{0}'' is already deleted on the server. Skipping this object and "
+"retrying to upload."
+msgstr ""
msgid "Preparing objects to upload ..."
msgstr "正在準備要上傳的物件..."
@@ -7791,9 +7993,6 @@ msgstr ""
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr "物件「{0}」已經被刪除。在上傳中略過此物件。"
-msgid "Warning: {0}"
-msgstr ""
-
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
msgstr[0] "正在上傳 {0} 個物件..."
@@ -7802,6 +8001,9 @@ msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr "忽略捕捉到的例外，因為上傳已被取消。例外為：{0}"
+msgid "Upload successful!"
+msgstr ""
+
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
"be uploaded to the server.</html>"
@@ -7818,8 +8020,8 @@ msgstr "選擇要上傳的物件"
msgid "Cancel uploading"
msgstr "正在取消上傳"
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr "警告：偏好設定的設定鍵「{0}」有未預期的數值，得到「{1}」"
+msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr ""
msgid "Please select the upload strategy:"
msgstr "請選擇上傳的方式："
@@ -7956,7 +8158,7 @@ msgstr "下個標記"
msgid "Jump to next marker"
msgstr ""
-msgid "Previos marker"
+msgid "Previous marker"
msgstr ""
msgid "Jump to previous marker"
@@ -7986,8 +8188,8 @@ msgstr "版本 {0}"
msgid "Merging layers"
msgstr "合併圖層"
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
+msgid "Mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
msgid "{0} deleted"
msgid_plural "{0} deleted"
@@ -8099,6 +8301,9 @@ msgstr "增加縮放等級以查看更多詳細資料"
msgid "No tiles at this zoom level"
msgstr "這個縮放等級沒有拼貼"
+msgid "TMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
msgid "EPSG:4326 and Mercator projection are supported"
msgstr ""
@@ -8136,6 +8341,9 @@ msgstr "重新載入錯誤的拼貼"
msgid "Alpha channel"
msgstr "透明色版"
+msgid "Automatically change resolution"
+msgstr ""
+
msgid "Set WMS Bookmark"
msgstr "設定 WMS 書籤"
@@ -8337,9 +8545,6 @@ msgstr "從 EXIF 中解出 GPS 位置"
msgid "Starting directory scan"
msgstr "開始掃描目錄"
-msgid "One of the selected files was null"
-msgstr "選取的檔案中有一個是 null"
-
msgid "Read photos..."
msgstr "讀取相片..."
@@ -8358,6 +8563,9 @@ msgstr "在目錄 {0} 找到空的檔案\n"
msgid "Error while getting files from directory {0}\n"
msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
+msgid "One of the selected files was null"
+msgstr "選取的檔案中有一個是 null"
+
msgid "Geotagged Images"
msgstr "有 Geotag 的圖片"
@@ -8413,8 +8621,14 @@ msgstr "下一幅"
msgid "Show next Image"
msgstr "顯示下一張圖片"
-msgid "Center view"
-msgstr "置中檢視"
+msgid "Show first Image"
+msgstr ""
+
+msgid "Show last Image"
+msgstr ""
+
+msgid "Center view"
+msgstr "置中檢視"
msgid "Zoom best fit and 1:1"
msgstr "最適與 1:1 縮放"
@@ -8485,9 +8699,6 @@ msgid ""
"harmful.<br>If you want to upload traces, look here:</html>"
msgstr "<html>上傳未經處理的 GPS 資料當作地圖資料是不適當的。<br>如果您想要上傳軌跡，請看這裡：</html>"
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
msgid "Customize track drawing"
msgstr ""
@@ -8500,8 +8711,11 @@ msgstr ""
msgid "No timestamp"
msgstr ""
-msgid "Download from OSM along this track"
-msgstr "從 OSM 沿這條軌跡下載"
+msgid "Select to download OSM data."
+msgstr ""
+
+msgid "Select to download GPS traces."
+msgstr ""
msgid "Download everything within:"
msgstr "下載這裡面的每個物件："
@@ -8527,13 +8741,17 @@ msgstr "只有航點"
msgid "track and waypoints"
msgstr "軌跡與航點"
-msgid "Calculating Download Area"
+msgid "Click to download"
msgstr ""
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
+msgid "Click to cancel"
+msgstr ""
+
+msgid "Download from OSM along this track"
+msgstr "從 OSM 沿這條軌跡下載"
+
+msgid "Calculating Download Area"
+msgstr ""
msgid "Precache imagery tiles along this track"
msgstr "預先快取沿這條軌跡上的圖片拼貼"
@@ -8660,15 +8878,11 @@ msgstr "嘗試顯示這個標記的 URL 時發生錯誤"
msgid "(URL was: "
msgstr "(URL 是： "
-msgid "Error displaying URL"
-msgstr "在顯示 URL 時發生錯誤"
-
msgid "Select the map painting styles"
msgstr ""
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "警告：從「{0}」載入 Mappaint 樣式失敗。例外為：{1}"
+msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
msgid "loading style ''{0}''..."
msgstr "載入樣式「{0}」..."
@@ -8682,8 +8896,8 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr "警告：無法解析「{0}」的 Mappaint 樣式。錯誤為：{1}"
+msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
+msgstr ""
msgid "Illegal dash pattern, values must be positive"
msgstr ""
@@ -8692,9 +8906,8 @@ msgid "Illegal dash pattern, at least one value must be > 0"
msgstr ""
msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] "
-"{3}"
-msgstr "警告：無法解析「{0}」的 Mappaint 樣式。錯誤為：[{1}:{2}] {3}"
+"Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}"
+msgstr ""
msgid "Access Token Key:"
msgstr "存取記號鍵："
@@ -8926,8 +9139,8 @@ msgstr "關閉對話盒並取消授權"
msgid "Close the dialog and accept the Access Token"
msgstr "關閉對話盒並套用存取記號"
-msgid "Warning: failed to cancel running OAuth operation"
-msgstr "警告：無法取消執行中的 OAuth 操作"
+msgid "Failed to cancel running OAuth operation"
+msgstr ""
msgid "Retrieving OAuth Request Token from ''{0}''"
msgstr "正從「{0}」取回 OAuth 要求記號"
@@ -8992,6 +9205,12 @@ msgstr "允許寫入您的偏好設定"
msgid "Select to grant JOSM the right to write your server preferences"
msgstr "選擇以使 JOSM 有權寫入您伺服器的偏好設定"
+msgid "Allow modifications of notes"
+msgstr ""
+
+msgid "Select to grant JOSM the right to modify notes on your behalf"
+msgstr ""
+
msgid "Retrieving OAuth Access Token..."
msgstr "正在取回 OAuth 存取記號..."
@@ -9054,9 +9273,6 @@ msgstr ""
"<html>JOSM 已成功的取回存取記號。您現在可以套用這個記號。JOSM 往後會用它進行與 OSM "
"伺服器的驗證。<br><br>存取記號為：</html>"
-msgid "Restart"
-msgstr "重新啟動"
-
msgid "Click to retrieve a Request Token"
msgstr "點選以取回要求記號"
@@ -9309,6 +9525,9 @@ msgstr "下載外掛程式"
msgid "You have to restart JOSM for some settings to take effect."
msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
+msgid "Would you like to restart now?"
+msgstr ""
+
msgid "Remote Control"
msgstr "遠端控制"
@@ -9438,6 +9657,12 @@ msgstr "從工具列移除"
msgid "Configure toolbar"
msgstr "設定工具列"
+msgid "Edit shortcut"
+msgstr ""
+
+msgid "Do not hide toolbar and menu"
+msgstr ""
+
msgid "Actions"
msgstr "動作"
@@ -9480,6 +9705,9 @@ msgstr "註冊的工具列動作沒有名稱：{0}"
msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "註冊的工具列動作 {0} 被覆蓋：{1} 得到 {2}"
+msgid "Toolbar: {0}"
+msgstr ""
+
msgid "Data validator"
msgstr "資料檢驗器"
@@ -9530,6 +9758,27 @@ msgstr "搜尋： "
msgid "Read from file"
msgstr "從檔案讀取"
+msgid "Export selected items"
+msgstr "匯出選取的項目"
+
+msgid "JOSM custom settings files (*.xml)"
+msgstr "JOSM 自訂設定值檔案 (*.xml)"
+
+msgid "Please select some preference keys not marked as default"
+msgstr ""
+
+msgid "Export preferences keys to JOSM customization file"
+msgstr ""
+
+msgid "What to do with preference lists when this file is to be imported?"
+msgstr ""
+
+msgid "Append preferences from file to existing values"
+msgstr ""
+
+msgid "Replace existing values"
+msgstr ""
+
msgid "Open JOSM customization file"
msgstr "開啟 JOSM 自訂檔案"
@@ -9542,41 +9791,59 @@ msgid ""
"JOSM restart may be needed.</html>"
msgstr ""
-msgid "Export selected items"
-msgstr "匯出選取的項目"
+msgid "shortcut"
+msgstr ""
-msgid "Please select some preference keys not marked as default"
+msgid "color"
msgstr ""
-msgid "Export preferences keys to JOSM customization file"
+msgid "toolbar"
msgstr ""
-msgid "What to do with preference lists when this file is to be imported?"
+msgid "imagery"
msgstr ""
-msgid "Append preferences from file to existing values"
+msgid "Reset preferences"
msgstr ""
-msgid "Replace existing values"
+msgid ""
+"You are about to clear all preferences to their default values<br />All your "
+"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
+"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
-msgid "JOSM custom settings files (*.xml)"
-msgstr "JOSM 自訂設定值檔案 (*.xml)"
+msgid "Load profile"
+msgstr ""
-msgid "Advanced Background: Changed"
+msgid "Save {0} profile"
msgstr ""
-msgid "Advanced Background: NonDefalut"
+msgid "All the preferences of this group are default, nothing to save"
msgstr ""
-msgid "Current value is default."
+msgid "Choose profile file"
msgstr ""
-msgid "Default value is ''{0}''."
+msgid "Change list setting"
msgstr ""
-msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "預設值目前不明 (設定值尚未使用)"
+msgid "Key: {0}"
+msgstr "設定鍵：{0}"
+
+msgid "Change list of lists setting"
+msgstr ""
+
+msgid "add entry"
+msgstr "加入項目"
+
+msgid "Remove the selected entry"
+msgstr ""
+
+msgid "Change list of maps setting"
+msgstr ""
+
+msgid "Entry {0}"
+msgstr "項目 {0}"
msgid "Select Setting Type:"
msgstr "選擇設定類型："
@@ -9596,26 +9863,20 @@ msgstr "地圖的清單"
msgid "Add setting"
msgstr "加入設定值"
-msgid "Change list setting"
+msgid "Advanced Background: Changed"
msgstr ""
-msgid "Key: {0}"
-msgstr "設定鍵：{0}"
-
-msgid "Change list of lists setting"
+msgid "Advanced Background: NonDefault"
msgstr ""
-msgid "add entry"
-msgstr "加入項目"
-
-msgid "Remove the selected entry"
+msgid "Current value is default."
msgstr ""
-msgid "Change list of maps setting"
+msgid "Default value is ''{0}''."
msgstr ""
-msgid "Entry {0}"
-msgstr "項目 {0}"
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "預設值目前不明 (設定值尚未使用)"
msgid "Change string setting"
msgstr ""
@@ -9673,6 +9934,9 @@ msgstr "在選擇模式繪出虛擬節點"
msgid "Draw inactive layers in other color"
msgstr "將未使用的圖層以其他顏色繪製"
+msgid "Display discardable keys"
+msgstr ""
+
msgid "Highlight target ways and nodes"
msgstr "突顯目標路徑和節點"
@@ -9726,6 +9990,11 @@ msgid ""
"in the selected style."
msgstr "這個選項會防止填滿區域，並且會覆蓋在選取樣式中指定的任何數值。"
+msgid ""
+"Display keys which have been deemed uninteresting to the point that they can "
+"be silently removed."
+msgstr ""
+
msgid "Options that affect drawing performance"
msgstr "影響繪製效率的選項"
@@ -9792,7 +10061,7 @@ msgid "Dilution of Position (red = high, green = low, if available)"
msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
msgid "Track date"
-msgstr "軌跡日期"
+msgstr "軌跡時間"
msgid "Single Color (can be customized for named layers)"
msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -10007,7 +10276,13 @@ msgstr ""
msgid "2. Select layers"
msgstr ""
-msgid "3. Verify generated WMS URL"
+msgid "3. Select image format"
+msgstr ""
+
+msgid "4. Verify generated WMS URL"
+msgstr ""
+
+msgid "5. Enter name for this layer"
msgstr ""
msgid "Show Bounds"
@@ -10180,6 +10455,12 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr "<i>(JOSM 會在儲存資料圖層時保留備份檔案。它會在檔案名稱後加上 ''~'' 並將它儲存在同一個資料夾。)</i>"
+msgid "Notification at each save"
+msgstr ""
+
+msgid "When saving, display a small notification"
+msgstr ""
+
msgid "File backup"
msgstr "檔案備份"
@@ -10243,8 +10524,8 @@ msgstr "地圖設定值"
msgid "Settings for the map projection and data interpretation."
msgstr "地圖投影與資料轉譯設定值。"
-msgid "Warning: Could not read tagging preset source: {0}"
-msgstr "警告：無法讀取標籤預設組合來源：{0}"
+msgid "Could not read tagging preset source: {0}"
+msgstr "無法讀取標籤預設組合來源：{0}"
msgid ""
"Could not read tagging preset source: {0}\n"
@@ -10511,21 +10792,6 @@ msgstr "Swiss Grid (瑞士)"
msgid "<i>CH1903 / LV03 (without local corrections)</i>"
msgstr "<i>CH1903 / LV03 (沒有本地校正)</i>"
-msgid "UTM"
-msgstr "UTM"
-
-msgid "UTM Zone"
-msgstr "UTM 區"
-
-msgid "North"
-msgstr "北"
-
-msgid "South"
-msgstr "南"
-
-msgid "Hemisphere"
-msgstr "球面投影（Hemisphere）"
-
msgid "Guadeloupe Fort-Marigot 1949"
msgstr "Guadeloupe Fort-Marigot 1949"
@@ -10547,6 +10813,21 @@ msgstr "UTM 法國 (DOM)"
msgid "UTM Geodesic system"
msgstr "UTM 大地測量系統"
+msgid "UTM"
+msgstr "UTM"
+
+msgid "UTM Zone"
+msgstr "UTM 區"
+
+msgid "North"
+msgstr "北"
+
+msgid "South"
+msgstr "南"
+
+msgid "Hemisphere"
+msgstr "球面投影（Hemisphere）"
+
msgid "Testing OSM API URL ''{0}''"
msgstr "正在測試 OSM API URL「{0}」"
@@ -10601,8 +10882,8 @@ msgid "Select to use OAuth as authentication mechanism"
msgstr "選擇以使用 OAuth 做為驗證機制"
msgid ""
-"Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using "
-"authentication method ''Basic Authentication''."
+"Unsupported value in preference ''{0}'', got ''{1}''. Using authentication "
+"method ''Basic Authentication''."
msgstr ""
msgid "OSM username:"
@@ -10611,21 +10892,26 @@ msgstr "OSM 使用者名稱："
msgid "OSM password:"
msgstr "OSM 密碼："
-msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr "警告：無法從憑證管理程式取回 OSM 憑證。"
+msgid "Failed to retrieve OSM credentials from credential manager."
+msgstr ""
msgid "Current credential manager is of type ''{0}''"
msgstr "目前的憑證管理程式類型為「{0}」"
-msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr "警告：無法將 OSM 憑證儲存到憑證管理程式。"
+msgid "Failed to save OSM credentials to credential manager."
+msgstr ""
-msgid ""
-"Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr "警告：無法從憑證管理程式取回 OAuth 存取記號"
+msgid "Periodically check for new messages"
+msgstr ""
+
+msgid "Check interval (minutes):"
+msgstr ""
+
+msgid "Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
-msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr "警告：無法將 OAuth 存取記號儲存到憑證管理程式"
+msgid "Failed to store OAuth Access Token to credentials manager"
+msgstr ""
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
@@ -10707,15 +10993,9 @@ msgid "Use a SOCKS proxy"
msgstr "使用 SOCKS 代理伺服器"
msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr "警告：JOSM 是設定為使用系統設定的代理伺服器，但是 JVM 並未設定為可以取得它們。將偏好設定重設為「不使用代理伺服器」"
-
-msgid "disabled"
-msgstr "已停用"
-
-msgid "no modifier"
-msgstr "沒有修飾鍵"
+"JOSM is configured to use proxies from the system setting, but the JVM is "
+"not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
msgid "Shortcut Background: User"
msgstr ""
@@ -10757,34 +11037,36 @@ msgstr "刪除在標籤表中的選擇區域"
msgid "Add a new tag"
msgstr "加入新標籤"
-msgid "Select auto-increment of {0} for this field"
+msgid "Paste tags from buffer"
msgstr ""
-msgid "Cancel auto-increment for this field"
-msgstr ""
+msgid "Use preset ''{0}'' of group ''{1}''"
+msgstr "使用群組「{1}」的預設組合「{0}」"
-msgid "{0}:"
-msgstr ""
+msgid "Use preset ''{0}''"
+msgstr "使用預設組合「{0}」"
-msgid ""
-"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
-"elements are given."
-msgstr ""
+msgid "Elements of type {0} are supported."
+msgstr "類型 {0} 的元件已支援。"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
-"must be the same as in ''values''"
-msgstr ""
-"預先設定標籤 \"{0}-{1}\" 損毀 - 在 ''display_values'' 中的項目數量必須與 ''values'' 中的相同"
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "改變 {0} 個物件"
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in "
-"''short_descriptions'' must be the same as in ''values''"
-msgstr ""
-"損壞的標籤預先設定 \"{0}-{1}\" - 在 ''short_descriptions'' 中的項目數量必須與 ''values'' 中的相同"
+msgid "Nothing selected!"
+msgstr "尚未選擇！"
-msgid "More information about this feature"
-msgstr "更多關於這個功能的資訊"
+msgid "Selection unsuitable!"
+msgstr "選擇區域不合適！"
+
+msgid "Apply Preset"
+msgstr "套用預設組合"
+
+msgid "New relation"
+msgstr "新關係"
+
+msgid "Change Tags"
+msgstr ""
msgid "Unknown requisite: {0}"
msgstr "不明的必需品：{0}"
@@ -10792,6 +11074,9 @@ msgstr "不明的必需品：{0}"
msgid "Illegal member expression: {0}"
msgstr ""
+msgid "More information about this feature"
+msgstr "更多關於這個功能的資訊"
+
msgid "Available roles"
msgstr "可用的角色"
@@ -10807,51 +11092,44 @@ msgstr "元素"
msgid "Optional Attributes:"
msgstr "額外屬性："
-msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr "使用群組「{1}」的預設組合「{0}」"
-
-msgid "Use preset ''{0}''"
-msgstr "使用預設組合「{0}」"
+msgid "Select auto-increment of {0} for this field"
+msgstr ""
-msgid "Unknown type: {0}"
-msgstr "不明的類型：{0}"
+msgid "Cancel auto-increment for this field"
+msgstr ""
-msgid "Roles cannot appear more than once"
+msgid "{0}:"
msgstr ""
-msgid "Preset role element without parent"
-msgstr "沒有父項的預設組合角色元素"
+msgid ""
+"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
+"elements are given."
+msgstr ""
-msgid "Preset sub element without parent"
-msgstr "沒有父項的子元素"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is "
+"not \"{2}\""
+msgstr ""
-msgid "Could not read tagging preset source: {0}"
-msgstr "無法讀取標籤預設組合來源：{0}"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' "
+"threw {2} ({3})"
+msgstr ""
-msgid "Error parsing {0}: "
-msgstr "分析 {0} 時發生錯誤： "
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' "
+"must be the same as in ''values''"
+msgstr ""
+"預先設定標籤 \"{0}-{1}\" 損毀 - 在 ''display_values'' 中的項目數量必須與 ''values'' 中的相同"
-msgid "Elements of type {0} are supported."
-msgstr "類型 {0} 的元件已支援。"
-
-msgid "Change {0} object"
-msgid_plural "Change {0} objects"
-msgstr[0] "改變 {0} 個物件"
-
-msgid "Nothing selected!"
-msgstr "尚未選擇！"
-
-msgid "Selection unsuitable!"
-msgstr "選擇區域不合適！"
-
-msgid "Apply Preset"
-msgstr "套用預設組合"
-
-msgid "New relation"
-msgstr "新關係"
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in "
+"''short_descriptions'' must be the same as in ''values''"
+msgstr ""
+"損壞的標籤預先設定 \"{0}-{1}\" - 在 ''short_descriptions'' 中的項目數量必須與 ''values'' 中的相同"
-msgid "Change Properties"
-msgstr "改變屬性"
+msgid "Unknown type: {0}"
+msgstr "不明的類型：{0}"
msgid "Preset group {1} / {0}"
msgstr "預設組合 {1} / {0}"
@@ -10859,6 +11137,18 @@ msgstr "預設組合 {1} / {0}"
msgid "Preset group {0}"
msgstr "預設組合 {0}"
+msgid "Roles cannot appear more than once"
+msgstr ""
+
+msgid "Preset role element without parent"
+msgstr "沒有父項的預設組合角色元素"
+
+msgid "Preset sub element without parent"
+msgstr "沒有父項的子元素"
+
+msgid "Error parsing {0}: "
+msgstr "分析 {0} 時發生錯誤： "
+
msgid "Search preset"
msgstr "搜尋預設組合"
@@ -10874,6 +11164,14 @@ msgstr "只顯示適合選擇區域"
msgid "Search in tags"
msgstr "搜尋標籤"
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr "可調整的 {0} 尚未設定。不能在同步調整中設定參與。"
+
+msgid "Adjustable {0} not registered yet."
+msgstr "可調整的 {0} 尚未註冊。"
+
msgid "All files (*.*)"
msgstr ""
@@ -10903,6 +11201,49 @@ msgid ""
"The current value is not a valid OSM ID. Please enter an integer value > 0"
msgstr "目前的數值不是有效的 OSM ID。請輸入大於 0 的整數值"
+msgid "false: the property is explicitly switched off"
+msgstr "false：該屬性已經被確實關上了"
+
+msgid "true: the property is explicitly switched on"
+msgstr "true：該屬性已經被確實開啟了"
+
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "部分：不同選取的物件有不同的數值，不要改變"
+
+msgid "unset: do not set this property on the selected objects"
+msgstr "取消設定：不要在選取的物件上設定這個屬性"
+
+msgid "Cut"
+msgstr ""
+
+msgid "Right click = copy to clipboard"
+msgstr ""
+
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "缺少必要的屬性「{0}」"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr "類型 long 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr "類型 long (>=0)的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+
+msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr "類型 boolean 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr "類型 OsmPrimitiveType 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
msgstr "外部 ID「{0}」的路徑包含了缺少的外部 ID「{1}」的節點。"
@@ -10933,9 +11274,9 @@ msgid "Contacting OSM Server..."
msgstr "正在連接 OSM 伺服器..."
msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"Illegal value of attribute ''{0}'' of element ''{1}'' in server "
"capabilities. Got ''{2}''"
-msgstr "警告：在伺服器功能元素「{1}」的屬性「{0}」數值無效。得到「{2}」"
+msgstr ""
msgid "Failed to parse date ''{0}'' replied by server."
msgstr "解析伺服器回覆的日期「{0}」。"
@@ -10973,30 +11314,27 @@ msgid "Illegal port number in preference ''{0}''. Got {1}."
msgstr "在偏好設定「{0}」中有無效的連接埠號。得到「{1}」。"
msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
-msgstr "警告：發現未預期的偏好設定「{0}」數值。得到的數值是「{1}」。將不使用代理伺服器。"
+"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
+"proxy."
+msgstr ""
msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
-msgstr "警告：未預期的 HTTP 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。"
+"Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
+msgstr ""
msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
-msgstr "警告：未預期的 SOCKS 代理伺服器參數。得到主機「{0}」和連接埠「{1}」。"
+"Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
+msgstr ""
msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr "錯誤：以代理伺服器「{0}」連線到 URI「{1}」失敗。例外為：{2}"
+"Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+msgstr ""
msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time. Will not use a proxy."
+"The JVM is not configured to lookup proxies from the system settings. The "
+"property ''java.net.useSystemProxies'' was missing at startup time. Will "
+"not use a proxy."
msgstr ""
-"警告：JVM 並未設定從系統設定值查詢代理伺服器。屬性「java.net.useSystemProxies」在啟動時遺失了。將不使用代理伺服器。"
msgid "Parsing response from server..."
msgstr "正在分析伺服器的回應..."
@@ -11092,6 +11430,9 @@ msgstr "當解析 gpx 檔案「{0}」時發生錯誤。只有部分檔案能使
msgid "Parse error: invalid document structure for GPX document."
msgstr "分析錯誤：gpx 文件有無效的文件結構"
+msgid "(at line {0}, column {1})"
+msgstr "(第 {0} 行，第 {1} 欄)"
+
msgid "Unknown mode {0}."
msgstr "不明的模式 {0}。"
@@ -11107,13 +11448,21 @@ msgstr "尋找圖片檔案"
msgid "No image files found."
msgstr "找不到圖片檔案。"
+msgid "You have {0} unread message."
+msgid_plural "You have {0} unread messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Click here to see your inbox."
+msgstr ""
+
msgid "Failed to open input stream for resource ''{0}''"
msgstr "開啟資源「{0}」的輸入串流失敗"
msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
-msgstr "警告：無法開啟 zip 檔案「{0}」中副檔名「{2}」，名稱為「{3}」的檔案。例外為：{1}"
+"Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file "
+"''{0}''. Exception was: {1}"
+msgstr ""
msgid "Failed to rename file {0} to {1}."
msgstr ""
@@ -11190,8 +11539,8 @@ msgstr "不明的段落：{0}"
msgid "Zero coordinates: {0}"
msgstr "零坐標：{0}"
-msgid "NMEA import success"
-msgstr "NMEA 匯入成功"
+msgid "NMEA import success:"
+msgstr ""
msgid "NMEA import failure!"
msgstr "NMEA 匯入失敗！"
@@ -11289,37 +11638,13 @@ msgstr ""
msgid "Open OsmChange file"
msgstr ""
-msgid "Missing mandatory attribute ''{0}''."
-msgstr "缺少必要的屬性「{0}」"
-
msgid "Unsupported version: {0}"
msgstr "不支援的版本：{0}"
msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr "類型 long 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
-msgstr "類型 long (>=0)的必要屬性「{0}」有不合格的數值。得到「{1}」。"
-
-msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
-msgstr ""
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr "類型 boolean 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
-
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
-msgstr "類型 OsmPrimitiveType 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
-
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
+"Unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
-msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的起始元素「{0}」。正在略過。"
+msgstr ""
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
@@ -11327,9 +11652,9 @@ msgid ""
msgstr "不合格的文件結構。發現節點、路徑或關係並非「create」、「modify」或「delete」。"
msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
-msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的結尾元素「{0}」。正在略過。"
+"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
+"Skipping."
+msgstr ""
msgid "Parsing changeset content ..."
msgstr "正在分析變更組合內容 ..."
@@ -11355,11 +11680,8 @@ msgstr "正在分析變更組合清單..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "無法以 OAuth 驗證標頭簽署 HTTP 連線"
-msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
-msgstr "警告：偏好設定「{0}」有未預期的數值。得到「{1}」。"
-
-msgid "(at line {0}, column {1})"
-msgstr "(第 {0} 行，第 {1} 欄)"
+msgid "Unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
msgstr "<html>在儲存時發生錯誤。<br>錯誤為：<br>{0}</html>"
@@ -11369,9 +11691,6 @@ msgid ""
"is:<br>{0}</html>"
msgstr "<html>從備份檔案還原時發生錯誤。<br>錯誤為：<br>{0}</html>"
-msgid "Could not back up file. Exception is: {0}"
-msgstr "無法備份檔案。例外為：{0}"
-
msgid "OSM Server Files gzip compressed"
msgstr "OSM 伺服器檔案(以 gzip 壓縮)"
@@ -11393,6 +11712,9 @@ msgstr ""
msgid "Open OSM file"
msgstr "開啟 OSM 檔案"
+msgid "Reading was canceled"
+msgstr ""
+
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
@@ -11442,9 +11764,9 @@ msgid ""
msgstr "在 OSM 原型 ID {0} 的屬性「version」有不合格的數值。得到 {1}。"
msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
-msgstr "警告：將元素 {0} 的屬性「version」數值一般化為 {2}，API 版本為「{3}」。得到 {1}。"
+"Normalizing value of attribute ''version'' of element {0} to {2}, API "
+"version is ''{3}''. Got {1}."
+msgstr ""
msgid "Unknown or unsupported API version. Got {0}."
msgstr "不明或不支援的 API 版本。得到 {0}。"
@@ -11587,6 +11909,9 @@ msgstr "儲存使用者與密碼(未加密)"
msgid "<delete from {0} objects>"
msgstr ""
+msgid "Old values of"
+msgstr ""
+
msgid "Add tags to selected objects"
msgstr "將標籤加入選取的物件"
@@ -11605,6 +11930,15 @@ msgstr ""
msgid "Assume"
msgstr "猜測"
+msgid "Existing values"
+msgstr ""
+
+msgid "Enable the checkbox to accept the value"
+msgstr ""
+
+msgid "Accept all tags from {0} for this session"
+msgstr ""
+
msgid "Load data from API"
msgstr "從 API 載入資料"
@@ -11629,7 +11963,13 @@ msgstr "建立新的物件"
msgid "Read protocol version"
msgstr "讀取通訊協定版本"
-msgid "Warning: Cannot start remotecontrol server on port {0}: {1}"
+msgid "Cannot start remotecontrol server on port {0}: {1}"
+msgstr ""
+
+msgid "RemoteControl::Accepting connections on port {0}"
+msgstr ""
+
+msgid "RemoteControl::Server stopped."
msgstr ""
msgid "Remote Control has been asked to create a new node."
@@ -11638,9 +11978,6 @@ msgstr "遠端控制被要求建立新的節點。"
msgid "There is no layer opened to add node"
msgstr ""
-msgid "Add way"
-msgstr "加入路徑"
-
msgid "Remote Control has been asked to create a new way."
msgstr ""
@@ -11650,6 +11987,14 @@ msgstr ""
msgid "There is no layer opened to add way"
msgstr ""
+msgid "Add way"
+msgstr "加入路徑"
+
+msgid ""
+"Remote Control has been asked to report its supported features. This enables "
+"web sites to guess a running JOSM version"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load an imagery layer from the following "
"URL:"
@@ -11664,6 +12009,15 @@ msgstr "遠端控制被要求自下列 URL 匯入資料："
msgid "Remote Control has been asked to load data from the API."
msgstr "遠端控制被要求自 API 下載資料。"
+msgid "The latitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The longitudes must be between {0} and {1}"
+msgstr ""
+
+msgid "The minima must be less than the maxima"
+msgstr ""
+
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
"the API."
@@ -11694,20 +12048,20 @@ msgstr "資料："
msgid "local file"
msgstr "本地檔案"
-msgid "Link to a OSM data file on your local disk."
-msgstr "連結到您本地磁碟的 OSM 資料檔案。"
+msgid "Link to a GPX file on your local disk."
+msgstr ""
msgid "include"
msgstr ""
-msgid "Include OSM data in the .joz session file."
-msgstr "在 .joz 作業階段檔案中包含 OSM 資料。"
+msgid "Include GPX data in the .joz session file."
+msgstr ""
msgid "No file association"
msgstr ""
-msgid "OSM data will be included in the session file."
-msgstr "OSM 資料會包含於作業階段檔案中。"
+msgid "GPX data will be included in the session file."
+msgstr ""
msgid ""
"Version ''{0}'' of meta data for gpx track layer is not supported. Expected: "
@@ -11728,11 +12082,23 @@ msgstr "圖層包含未儲存的資料 - 儲存為檔案。"
msgid "Layer does not contain unsaved data."
msgstr ""
+msgid "Link to a OSM data file on your local disk."
+msgstr "連結到您本地磁碟的 OSM 資料檔案。"
+
+msgid "Include OSM data in the .joz session file."
+msgstr "在 .joz 作業階段檔案中包含 OSM 資料。"
+
+msgid "OSM data will be included in the session file."
+msgstr "OSM 資料會包含於作業階段檔案中。"
+
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
"0.1"
msgstr ""
+msgid "Session file (*.jos, *.joz)"
+msgstr "作業階段檔案 (*.jos, *.joz)"
+
msgid "Unable to locate file ''{0}''."
msgstr ""
@@ -11802,14 +12168,14 @@ msgid "Download skipped"
msgstr "下載略過的"
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
-msgstr "警告：不能下載外掛程式「{0}」。它的下載連結不明。正略過下載。"
+"Cannot download plugin ''{0}''. Its download link is not known. Skipping "
+"download."
+msgstr ""
msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
-msgstr "警告：不能下載外掛程式「{0}」。它的下載連結「{1}」不是有效的 URL。正略過下載。"
+"Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
+"URL. Skipping download."
+msgstr ""
msgid "Failed to create plugin directory ''{0}''"
msgstr "無法建立外掛程式目錄「{0}」"
@@ -11949,11 +12315,11 @@ msgstr[0] "請在 JOSM 啟動後開啟偏好設定對話盒並試著手動更新
msgid "Plugin update failed"
msgstr "外掛程式更新失敗"
-msgid "Warning: failed to find plugin {0}"
+msgid "Failed to find plugin {0}"
msgstr ""
-msgid "Warning: failed to download plugin information list"
-msgstr "警告：無法下載外掛程式資料清單"
+msgid "Failed to download plugin information list"
+msgstr ""
msgid "Disable plugin"
msgstr "停用外掛程式"
@@ -11967,23 +12333,22 @@ msgstr "保留外掛程式"
msgid "Click to keep the plugin ''{0}''"
msgstr "點選以保留外掛程式「{0}」"
-msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr "警告：無法刪除過時的外掛程式「{0}」"
+msgid "Failed to delete outdated plugin ''{0}''."
+msgstr ""
msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
-msgstr "警告：無法安裝已下載的外掛程式「{0}」。正在略過安裝。JOSM 仍然會載入舊的外掛程式版本。"
+"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
+"JOSM is still going to load the old plugin version."
+msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. {2}"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
msgstr ""
msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
-msgstr "警告：無法從暫存下載檔案「{1}」安裝外掛程式「{0}」。仍然失敗。"
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
+"Renaming failed."
+msgstr ""
msgid "Click to disable the plugin ''{0}''"
msgstr "點選以停用外掛程式「{0}」"
@@ -12051,9 +12416,8 @@ msgstr "正在處理外掛程式網站快取檔案..."
msgid "Processing file ''{0}''"
msgstr "正在處理檔案「{0}」"
-msgid ""
-"Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
-msgstr "警告：無法掃描檔案「{0}」的外掛程式資訊。正在略過。"
+msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
+msgstr ""
msgid "Processing plugin site cache icon files..."
msgstr "正在處理外掛程式網站快取圖示檔案..."
@@ -12067,10 +12431,25 @@ msgstr "下載外掛程式清單..."
msgid "Downloading plugin list from ''{0}''"
msgstr "正從「{0}」下載外掛程式清單"
+msgid "Plugin list download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin list:"
+msgstr ""
+
+msgid "Details:"
+msgstr ""
+
+msgid "Plugin icons download error"
+msgstr ""
+
+msgid "JOSM failed to download plugin icons:"
+msgstr ""
+
msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
-msgstr "警告：無法建立外掛程式目錄「{0}」。不能從外掛程式網站「{1}」快取外掛程式清單。"
+"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
+"plugin site ''{1}''."
+msgstr ""
msgid "Writing plugin list to local cache ''{0}''"
msgstr "正在將外掛程式清單寫入本地端快取「{0}」"
@@ -12404,18 +12783,12 @@ msgstr "嚴重的錯誤：無法定位圖片「{0}」。這是嚴重的組態問
msgid "Failed to locate image ''{0}''"
msgstr ""
-msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "警告：無法處理 zip 檔案「{0}」。例外為：{1}"
-
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr "警告：基於安全性理由無法存取目錄「{0}」。例外為：{1}"
+msgid "Failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
-msgstr "警告：無法從 JOSM 地區代碼「{0}」取得 wiki 語言前綴。使用預設的代碼「en」。"
+"Failed to access directory ''{0}'' for security reasons. Exception was: {1}"
+msgstr ""
msgid "{0}... [please type its number]"
msgstr ""
@@ -12425,9 +12798,52 @@ msgid ""
"platform first."
msgstr "無法開啟 URL。目前尚未設定平台。請先設定平台。"
+msgid "Opening URL: {0}"
+msgstr ""
+
+msgid "zoom"
+msgstr ""
+
+msgid "latitude"
+msgstr ""
+
+msgid "longitude"
+msgstr ""
+
+msgid "URL does not contain {0}/{1}/{2}"
+msgstr ""
+
+msgid "URL does not contain valid {0}"
+msgstr ""
+
msgid "reserved"
msgstr ""
+msgid "Outdated Java version"
+msgstr ""
+
+msgid "Update Java"
+msgstr ""
+
+msgid "You are running version {0} of Java."
+msgstr ""
+
+msgid "February 2013"
+msgstr ""
+
+msgid ""
+"This version is no longer supported by {0} since {1} and is not recommended "
+"for use."
+msgstr ""
+
+msgid ""
+"JOSM will soon stop working with this version; we highly recommend you to "
+"update to Java {0}."
+msgstr ""
+
+msgid "Would you like to update now ?"
+msgstr ""
+
msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
@@ -12459,15 +12875,29 @@ msgid ""
"contain any JOSM object or suitable text. </p></html>"
msgstr ""
-msgid "Right click = copy to clipboard"
+msgid "ms"
msgstr ""
-msgid ""
-"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
-"geometry from preferences."
-msgstr "偏好設定的設定鍵「{0}」不包含「{1}」。不能從偏好設定中回復視窗位置大小。"
+msgid "s"
+msgstr ""
-msgid ""
+msgid "min"
+msgstr ""
+
+msgid "h"
+msgstr ""
+
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
+"geometry from preferences."
+msgstr "偏好設定的設定鍵「{0}」不包含「{1}」。不能從偏好設定中回復視窗位置大小。"
+
+msgid ""
"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
"{2}. Cannot restore window geometry from preferences."
msgstr "偏好設定的設定鍵「{0}」沒有提供「{1}」的整數值。得到「{2}」。不能從偏好設定中回復視窗位置大小。"
@@ -12784,6 +13214,11 @@ msgid "Saturation:"
msgstr "彩度："
msgid ""
+"Allows to edit traffic information and export it to the urban mobility "
+"simulator SUMO"
+msgstr ""
+
+msgid ""
"Group common Address Interpolation inputs in a single dialog, as well as an "
"option to automatically generate individual house number nodes from a Way."
msgstr "以單一對話盒進行群組通用地址填寫的輸入，同時也可以選擇自動從路徑產生個別門牌號碼節點。"
@@ -12863,6 +13298,10 @@ msgid "Finds and fixes invalid street addresses in a comfortable way."
msgstr "尋找並以適當的方式來修正無效的街道地址。"
msgid ""
+"Talk with users editing the map nearby, be notified when someone comes close."
+msgstr ""
+
+msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
"be installed directly by users, but rather as a dependency for other plugins."
msgstr ""
@@ -12893,7 +13332,7 @@ msgid ""
msgstr ""
msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-樣式圖片調整地圖模式"
+msgstr ""
msgid ""
"This experimental plugin allows JOSM to store tile cache in database files, "
@@ -12966,9 +13405,6 @@ msgstr "為 4 或 5 條路徑加入禁止左轉"
msgid "Simplifies download from different read-only APIs."
msgstr ""
-msgid "Simply convert an area to a multipolygon."
-msgstr "簡單的將區域轉換為多邊形。"
-
msgid "Allows to attribute tags to all objects in any selected area at once"
msgstr "允許在任何選取的區域中一次將所有物件加入屬性標籤"
@@ -13025,6 +13461,9 @@ msgid ""
"right click menu of the image layer."
msgstr "將 gps 地點資訊寫入圖片檔的檔頭。在圖片圖層按右鍵選單就可以執行這項功能。"
+msgid "Make photos movable and position them on the map."
+msgstr ""
+
msgid ""
"This plugin allows to display any picture as a background in the editor and "
"align it with the map."
@@ -13049,9 +13488,6 @@ msgstr "這個外掛程式簡化了大眾運輸路線的製圖與編輯。"
msgid "Relation and multipolygon creating and editing panel."
msgstr "關係與多重多邊形建立與編輯面板。"
-msgid "Adds Restart JOSM item to File menu."
-msgstr ""
-
msgid "Plugin for reverting changesets"
msgstr "還原變更組合的外掛程式"
@@ -13077,9 +13513,6 @@ msgid ""
"constrained by maximum removed area size. Also average nearby nodes."
msgstr "藉由移除屬於很鈍的鈍角的節點來簡化區域。這可以使用最大移除區域大小來限制。同時也會平均化附近的節點。"
-msgid "Create and edit seamaps for OpenSeaMap"
-msgstr "建立並編輯 OpenSeaMap 海圖"
-
msgid "Edit features for OpenSeaMap"
msgstr ""
@@ -13116,6 +13549,11 @@ msgid ""
"to be running."
msgstr "從捷克地籍圖描出建築物。需要有執行 TracerServer (.NET 或 Mono)。"
+msgid ""
+"Traces buildings and other shapes from a map. Needs Tracer2Server to be "
+"running."
+msgstr ""
+
msgid "Plugin to digital sign OSM-Data"
msgstr "用來數位簽署 OSM-Data 的外掛程式"
@@ -13162,9 +13600,6 @@ msgid ""
"behind."
msgstr "在航照圖上將一輛賽車從 A 點開到 B 點，不管 cacti。"
-msgid "Highways"
-msgstr "公路"
-
msgid "Streets"
msgstr "街道"
@@ -13249,6 +13684,9 @@ msgstr "堤防"
msgid "Lit"
msgstr ""
+msgid "Toll"
+msgstr "通行費"
+
msgid "Motorway Link"
msgstr "高速公路連絡道路"
@@ -13339,6 +13777,50 @@ msgstr "居住的(Residential)"
msgid "Edit Residential Street"
msgstr "編輯居住的街道"
+msgid "Bicycle Road"
+msgstr ""
+
+msgid "Edit Bicycle Road"
+msgstr ""
+
+msgid "Highway type"
+msgstr "公路類型"
+
+msgctxt "Highway"
+msgid "residential"
+msgstr ""
+
+msgctxt "Highway"
+msgid "service"
+msgstr ""
+
+msgctxt "Highway"
+msgid "unclassified"
+msgstr ""
+
+msgctxt "Highway"
+msgid "path"
+msgstr ""
+
+msgctxt "Highway"
+msgid "cycleway"
+msgstr ""
+
+msgid "Vehicle access"
+msgstr ""
+
+msgid "yes"
+msgstr "是"
+
+msgid "no"
+msgstr "否"
+
+msgid "destination"
+msgstr "目的地"
+
+msgid "Oneway for bicycle"
+msgstr ""
+
msgid "Living Street"
msgstr "生活街道"
@@ -13357,11 +13839,11 @@ msgstr "區域"
msgid "Service"
msgstr "服務型(Service)"
-msgid "Edit Serviceway"
-msgstr "編輯服務型道路"
+msgid "Edit Service Way"
+msgstr ""
-msgid "Serviceway type"
-msgstr "服務型道路類型"
+msgid "Service way type"
+msgstr ""
msgid "alley"
msgstr "巷/弄"
@@ -13372,6 +13854,9 @@ msgstr "車道"
msgid "parking_aisle"
msgstr "停車場通道"
+msgid "drive-through"
+msgstr ""
+
msgid "Parking Aisle"
msgstr "停車場通道"
@@ -13399,18 +13884,12 @@ msgstr "圓環"
msgid "jughandle"
msgstr ""
-msgid "yes"
-msgstr "是"
-
msgid "Road Restrictions"
msgstr "道路限制"
msgid "Edit Road Restrictions"
msgstr "編輯道路限制"
-msgid "Toll"
-msgstr "通行費"
-
msgid "No exit (cul-de-sac)"
msgstr "沒有出口（死路）"
@@ -13420,9 +13899,6 @@ msgstr ""
msgid "General Access"
msgstr "一般通行"
-msgid "destination"
-msgstr "目的地"
-
msgid "delivery"
msgstr ""
@@ -13432,15 +13908,15 @@ msgstr "隨意的"
msgid "private"
msgstr "私人的"
+msgid "customers"
+msgstr ""
+
msgid "agricultural"
msgstr "農業的"
msgid "forestry"
msgstr "林業"
-msgid "no"
-msgstr "否"
-
msgid "official"
msgstr "正式的"
@@ -13486,6 +13962,9 @@ msgstr ""
msgid "Public Service Vehicles (psv)"
msgstr "公共汽車 (psv)"
+msgid "Tourist buses"
+msgstr ""
+
msgid "Min. speed (km/h)"
msgstr "最低限速 (km/h)"
@@ -13570,6 +14049,9 @@ msgstr "編輯橋樑"
msgid "viaduct"
msgstr ""
+msgid "suspension"
+msgstr ""
+
msgid "swing"
msgstr ""
@@ -13674,20 +14156,29 @@ msgstr ""
msgid "Visibility"
msgstr "可見狀態"
+msgctxt "trail_visibility"
msgid "excellent"
-msgstr "極好"
+msgstr ""
+msgctxt "trail_visibility"
msgid "good"
-msgstr "良好"
+msgstr ""
+msgctxt "trail_visibility"
msgid "intermediate"
-msgstr "中級"
+msgstr ""
+msgctxt "trail_visibility"
msgid "bad"
-msgstr "差"
+msgstr ""
+msgctxt "trail_visibility"
msgid "horrible"
-msgstr "恐怖的"
+msgstr ""
+
+msgctxt "trail_visibility"
+msgid "no"
+msgstr ""
msgid "Wheelchairs"
msgstr "輪椅"
@@ -13704,10 +14195,10 @@ msgstr "專用馬道"
msgid "Edit Bridleway"
msgstr "編輯馬道"
-msgid "Cycle Lane"
+msgid "Cycle Lane/Track"
msgstr ""
-msgid "Edit Cycle Lane"
+msgid "Edit Cycle Lane or Track"
msgstr ""
msgid "Cycleway"
@@ -13743,7 +14234,7 @@ msgstr ""
msgid "Oneway (bicycle)"
msgstr ""
-msgid "Edit Highway"
+msgid "Edit Highway Attributes:"
msgstr ""
msgid "Highway"
@@ -13812,12 +14303,18 @@ msgstr "休息區"
msgid "Edit Rest Area"
msgstr "編輯休息區"
-msgid "Emergency Phone"
-msgstr "緊急電話"
+msgid "Drinking Water"
+msgstr "飲水機"
msgid "Traffic Signal"
msgstr "交通號誌"
+msgid "Edit Traffic Signal"
+msgstr ""
+
+msgid "Optional crossing attributes:"
+msgstr ""
+
msgid "Pedestrian crossing type"
msgstr "行人穿越道類型"
@@ -13833,15 +14330,6 @@ msgstr "安全島"
msgid "unmarked"
msgstr "未畫標記"
-msgid "Cross on horseback"
-msgstr ""
-
-msgid "Cross by bicycle"
-msgstr "以自行車穿越"
-
-msgid "Crossing attendant"
-msgstr "有人陪同穿越"
-
msgid "Crossing type name (UK)"
msgstr "行人穿越道類型名稱 (英國)"
@@ -13863,6 +14351,15 @@ msgstr ""
msgid "tiger"
msgstr ""
+msgid "Crossing attendant"
+msgstr "有人陪同穿越"
+
+msgid "Cross by bicycle"
+msgstr "以自行車穿越"
+
+msgid "Cross on horseback"
+msgstr ""
+
msgid "Stop"
msgstr "禁止通行"
@@ -13872,6 +14369,9 @@ msgstr ""
msgid "Mini-roundabout"
msgstr "小型圓環"
+msgid "Edit Mini-Roundabout"
+msgstr ""
+
msgid "Direction"
msgstr "方向"
@@ -13881,11 +14381,8 @@ msgstr "順時針"
msgid "Pedestrian Crossing"
msgstr "行人穿越道"
-msgid "Edit Crossing"
-msgstr "編輯行人穿越道"
-
-msgid "Type name (UK)"
-msgstr "類型名稱 (英國)"
+msgid "Edit Pedestrian Crossing"
+msgstr ""
msgid "Traffic Calming"
msgstr "道路減速設施"
@@ -13917,9 +14414,6 @@ msgstr ""
msgid "Passing Place"
msgstr "讓車處"
-msgid "Edit Passing Place"
-msgstr "編輯讓車處"
-
msgid "Turning Circle"
msgstr "迴旋圈"
@@ -13953,20 +14447,44 @@ msgstr "維基百科"
msgid "Barriers"
msgstr "障礙物"
+msgid "Block"
+msgstr "水泥護欄"
+
+msgid "Edit Block"
+msgstr ""
+
+msgid "Allowed traffic:"
+msgstr "允許通行方向："
+
+msgid "Material"
+msgstr "材質"
+
+msgid "stone"
+msgstr "石頭"
+
msgid "Bollard"
msgstr "車阻柱"
msgid "Edit Bollard"
msgstr "編輯車阻柱"
-msgid "Allowed traffic:"
-msgstr "允許通行方向："
+msgid "Bollard type"
+msgstr ""
+
+msgid "rising"
+msgstr ""
+
+msgid "removable"
+msgstr ""
+
+msgid "plastic"
+msgstr "塑膠"
msgid "Cycle Barrier"
msgstr "自行車護欄"
-msgid "Block"
-msgstr "水泥護欄"
+msgid "Edit Cycle Barrier"
+msgstr ""
msgid "Cattle Grid"
msgstr "家畜柵欄"
@@ -13977,6 +14495,9 @@ msgstr "編輯家畜柵欄"
msgid "Bus Trap"
msgstr "公車專用道障礙"
+msgid "Edit Bus Trap"
+msgstr ""
+
msgid "Spikes"
msgstr "長釘"
@@ -13998,19 +14519,34 @@ msgstr "編輯國境管控站"
msgid "Hedge"
msgstr "籬笆"
+msgid "Edit Hedge"
+msgstr ""
+
+msgid "Height (meters)"
+msgstr "高度（米）"
+
+msgid "Genus"
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Taxon"
+msgstr ""
+
msgid "Fence"
msgstr "欄柵"
-msgid "barbed_wire"
+msgid "Edit Fence"
msgstr ""
-msgid "chain"
+msgid "barbed_wire"
msgstr ""
-msgid "electric"
+msgid "chain_link"
msgstr ""
-msgid "hedge"
+msgid "electric"
msgstr ""
msgid "pole"
@@ -14019,23 +14555,52 @@ msgstr ""
msgid "split_rail"
msgstr ""
+msgid "wire"
+msgstr ""
+
+msgid "Guard Rail"
+msgstr ""
+
+msgid "Edit Guard Rail"
+msgstr ""
+
msgid "Wall"
msgstr "牆"
+msgid "Edit Wall"
+msgstr ""
+
msgid "City Wall"
msgstr "城牆"
+msgid "Edit City Wall"
+msgstr ""
+
msgid "Retaining Wall"
msgstr "擋土牆"
+msgid "Edit Retaining Wall"
+msgstr ""
+
+msgctxt "Barrier"
msgid "Ditch"
-msgstr "渠道"
+msgstr ""
-msgid "Entrance"
-msgstr "入口"
+msgctxt "Barrier"
+msgid "Edit Ditch"
+msgstr ""
-msgid "Edit Entrance"
-msgstr "編輯入口"
+msgid "Kerb"
+msgstr ""
+
+msgid "Edit Kerb"
+msgstr ""
+
+msgid "Entrance (barrier opening)"
+msgstr ""
+
+msgid "Edit Entrance (barrier opening)"
+msgstr ""
msgid "Gate"
msgstr "閘門"
@@ -14067,12 +14632,27 @@ msgstr ""
msgid "Edit Kissing Gate"
msgstr ""
+msgid "Chain"
+msgstr ""
+
+msgid "Edit Chain"
+msgstr ""
+
msgid "Stile"
msgstr "柵欄台階"
msgid "Edit Stile"
msgstr "編輯柵欄台階"
+msgid "ladder"
+msgstr ""
+
+msgid "squeezer"
+msgstr ""
+
+msgid "stepover"
+msgstr ""
+
msgid "Turnstile"
msgstr "旋轉柵門"
@@ -14130,6 +14710,9 @@ msgstr "排水溝"
msgid "Edit Drain"
msgstr "編輯排水溝"
+msgid "Ditch"
+msgstr "渠道"
+
msgid "Edit Ditch"
msgstr "編輯渠道"
@@ -14139,6 +14722,12 @@ msgstr "溪流"
msgid "Edit Stream"
msgstr "編輯溪流"
+msgid "Wadi"
+msgstr ""
+
+msgid "Edit Wadi"
+msgstr ""
+
msgid "Canal"
msgstr "運河"
@@ -14178,9 +14767,6 @@ msgstr "編輯水壩"
msgid "Groyne"
msgstr ""
-msgid "Edit Groyne"
-msgstr ""
-
msgid "Breakwater"
msgstr ""
@@ -14214,6 +14800,21 @@ msgstr "編輯有覆蓋的水庫"
msgid "Edit Water"
msgstr "編輯水域"
+msgid "Water Body"
+msgstr ""
+
+msgid "lake"
+msgstr ""
+
+msgid "lagoon"
+msgstr ""
+
+msgid "pond"
+msgstr ""
+
+msgid "reservoir"
+msgstr ""
+
msgid "Land"
msgstr "陸地"
@@ -14295,20 +14896,25 @@ msgstr "編輯渡輪端點"
msgid "Cargo"
msgstr "貨櫃"
+msgctxt "cargo"
msgid "passengers"
-msgstr "乘客"
+msgstr ""
+msgctxt "cargo"
msgid "vehicle"
-msgstr "車輛"
+msgstr ""
+msgctxt "cargo"
msgid "bicycle"
-msgstr "單車"
+msgstr ""
+msgctxt "cargo"
msgid "hgv"
-msgstr "大型車"
+msgstr ""
+msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr "乘客；車輛"
+msgstr ""
msgid "Ferry Route"
msgstr "渡輪路線"
@@ -14379,7 +14985,10 @@ msgstr "軍事"
msgid "tourism"
msgstr "旅遊"
-msgid "Service/Type"
+msgid "freight"
+msgstr ""
+
+msgid "Service type"
msgstr ""
msgid "yard"
@@ -14403,11 +15012,14 @@ msgstr "連接線"
msgid "rail"
msgstr "軌"
-msgid "Voltage"
-msgstr "電壓"
+msgid "Voltage in Volts (V)"
+msgstr ""
-msgid "Frequency (Hz)"
-msgstr "頻率 (Hz)"
+msgid "Frequency in Hertz (Hz)"
+msgstr ""
+
+msgid "16.67"
+msgstr ""
msgid "16.7"
msgstr "16.7"
@@ -14418,9 +15030,6 @@ msgstr "窄軌"
msgid "Edit Narrow Gauge Rail"
msgstr "編輯窄軌"
-msgid "Types"
-msgstr "類型"
-
msgid "Monorail"
msgstr "單軌"
@@ -14463,19 +15072,57 @@ msgstr ""
msgid "Edit Disused Railway"
msgstr "編輯不使用的鐵路"
-msgid "Optional Types"
-msgstr "選擇性的類型"
-
msgid "Abandoned Rail"
msgstr "廢棄的軌道"
+msgid "Edit Abandoned Railway"
+msgstr ""
+
msgid "Level Crossing"
msgstr "鐵路平交道"
-msgid "Crossing"
-msgstr "平交道"
+msgid "Edit Level Crossing"
+msgstr ""
-msgid "Crossing type"
+msgid "Supervised"
+msgstr "有管理員"
+
+msgid "Traffic lights"
+msgstr ""
+
+msgid "Sound signals"
+msgstr ""
+
+msgid "Barrier"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "yes"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "no"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "half"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "full"
+msgstr ""
+
+msgctxt "crossing:barrier"
+msgid "double_half"
+msgstr ""
+
+msgid "Crossing"
+msgstr "平交道"
+
+msgid "Edit Crossing"
+msgstr ""
+
+msgid "Crossing type"
msgstr "平交道類型"
msgid "Turntable"
@@ -14574,13 +15221,11 @@ msgstr ""
msgid "Edit Magic Carpet"
msgstr ""
-msgctxt "aerialway"
msgid "Goods"
-msgstr "貨物纜車"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Goods"
-msgstr "編輯貨物貨物"
+msgstr ""
msgctxt "aerialway"
msgid "Station"
@@ -14590,13 +15235,11 @@ msgctxt "aerialway"
msgid "Edit Station"
msgstr "編輯纜車站"
-msgctxt "aerialway"
msgid "Pylon"
-msgstr "塔柱"
+msgstr ""
-msgctxt "aerialway"
msgid "Edit Pylon"
-msgstr "編輯塔柱"
+msgstr ""
msgid "Parking"
msgstr "停車場"
@@ -14613,12 +15256,12 @@ msgstr "平面式"
msgid "underground"
msgstr "地下"
+msgid "rooftop"
+msgstr ""
+
msgid "Access"
msgstr "使用"
-msgid "customers"
-msgstr ""
-
msgid "Park and Ride"
msgstr ""
@@ -14646,9 +15289,6 @@ msgstr "停車格"
msgid "Edit Parking space"
msgstr "編輯停車格"
-msgid "rooftop"
-msgstr ""
-
msgid "Capacity"
msgstr "容量"
@@ -14664,20 +15304,36 @@ msgstr "時間限制 (分鐘)"
msgid "30+"
msgstr ""
-msgid "Supervised"
-msgstr "有管理員"
-
msgid "Opening Hours"
msgstr "開放時間"
msgid "24/7"
msgstr "24/7"
-msgid "Mo-Fr 08:30-20:00"
-msgstr "週一-週五 08:30-20:00"
+msgid "08:30-12:30,15:30-20:00"
+msgstr ""
+
+msgid "Sa-Su 00:00-24:00"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off"
+msgstr ""
+
+msgid "Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+msgid ""
+"Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off"
+msgstr ""
+
+msgid "sunrise-sunset"
+msgstr ""
+
+msgid "Su 10:00+"
+msgstr ""
-msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
-msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00"
+msgid "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00"
+msgstr ""
msgid "Parking entrance"
msgstr "停車場入口"
@@ -14826,6 +15482,9 @@ msgstr "充電站"
msgid "Edit Charging Station (for electric cars)"
msgstr "編輯充電站（電動車輛用）"
+msgid "Voltage"
+msgstr "電壓"
+
msgid "Amperage"
msgstr ""
@@ -14847,6 +15506,12 @@ msgstr "修車場"
msgid "Edit Car Repair"
msgstr "編輯修車場"
+msgid "Parts"
+msgstr ""
+
+msgid "Edit Car Parts"
+msgstr ""
+
msgid "Tyres"
msgstr "輪胎"
@@ -14874,6 +15539,12 @@ msgstr "租車"
msgid "Edit Car Rental"
msgstr "編輯租車"
+msgid "Second hand"
+msgstr ""
+
+msgid "only"
+msgstr ""
+
msgid "Sharing"
msgstr "汽車分享"
@@ -14898,22 +15569,6 @@ msgstr "服務："
msgid "Sale"
msgstr ""
-msgctxt "motorcycle"
-msgid "yes"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "brand"
-msgstr ""
-
-msgctxt "motorcycle"
-msgid "used"
-msgstr "用過"
-
-msgctxt "motorcycle"
-msgid "no"
-msgstr "否"
-
msgid "brand"
msgstr ""
@@ -14935,9 +15590,6 @@ msgstr ""
msgid "TÜV"
msgstr ""
-msgid "Parts"
-msgstr ""
-
msgid "Clothes"
msgstr "衣服"
@@ -15001,8 +15653,8 @@ msgstr "編輯自行車租用點"
msgid "Public Transport"
msgstr "大眾運輸"
-msgid "Route"
-msgstr "路線"
+msgid "Public transport route"
+msgstr ""
msgid "Edit Route"
msgstr "編輯路線"
@@ -15132,6 +15784,9 @@ msgstr ""
msgid "Station or amenities"
msgstr ""
+msgid "Edit Stop Position"
+msgstr ""
+
msgid "Bus"
msgstr ""
@@ -15162,6 +15817,9 @@ msgstr ""
msgid "Ferry"
msgstr ""
+msgid "Edit Platform"
+msgstr ""
+
msgid "Bench"
msgstr "長椅"
@@ -15174,9 +15832,6 @@ msgstr "輪椅"
msgid "limited"
msgstr ""
-msgid "only"
-msgstr ""
-
msgid "Highway platform (legacy)"
msgstr ""
@@ -15186,8 +15841,13 @@ msgstr ""
msgid "funicular"
msgstr ""
+msgctxt "railway"
msgid "Station"
-msgstr ""
+msgstr "火車站"
+
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "編輯火車站"
msgid "Building"
msgstr "建築物"
@@ -15201,6 +15861,9 @@ msgstr "編輯地下鐵入口"
msgid "Ticket Machine"
msgstr "售票機"
+msgid "Edit Ticket Machine"
+msgstr ""
+
msgid "Reference Number"
msgstr ""
@@ -15225,14 +15888,6 @@ msgstr ""
msgid "Public Transport (legacy)"
msgstr ""
-msgctxt "railway"
-msgid "Station"
-msgstr "火車站"
-
-msgctxt "railway"
-msgid "Edit Station"
-msgstr "編輯火車站"
-
msgid "UIC-Reference"
msgstr "UIC-參考"
@@ -15281,8 +15936,8 @@ msgstr "編輯公車月台"
msgid "Taxi"
msgstr "計程車"
-msgid "Edit Taxi station"
-msgstr "編輯計程車招呼站"
+msgid "Edit Taxi Station"
+msgstr ""
msgid "Airport"
msgstr "機場"
@@ -15335,6 +15990,21 @@ msgstr "航廈"
msgid "Edit Terminal"
msgstr "編輯航廈"
+msgid "Internet access"
+msgstr "附設網際網路"
+
+msgid "wlan"
+msgstr "無線網路"
+
+msgid "wired"
+msgstr "有線網路"
+
+msgid "terminal"
+msgstr ""
+
+msgid "Internet access fee"
+msgstr "網際網路使用費"
+
msgctxt "airport"
msgid "Gate"
msgstr "登機門"
@@ -15357,21 +16027,6 @@ msgstr "編輯旅館"
msgid "Stars"
msgstr "星級"
-msgid "Internet access"
-msgstr "附設網際網路"
-
-msgid "wlan"
-msgstr "無線網路"
-
-msgid "wired"
-msgstr "有線網路"
-
-msgid "terminal"
-msgstr ""
-
-msgid "Internet access fee"
-msgstr "網際網路使用費"
-
msgid "Smoking"
msgstr "吸菸區"
@@ -15555,6 +16210,12 @@ msgstr "夜店"
msgid "Edit Nightclub"
msgstr "編輯夜店"
+msgid "Stripclub"
+msgstr ""
+
+msgid "Edit Stripclub"
+msgstr ""
+
msgid "Tourism"
msgstr "旅遊相關"
@@ -15576,9 +16237,15 @@ msgstr ""
msgid "Information Office"
msgstr "資訊服務處"
+msgid "Edit Information Office"
+msgstr ""
+
msgid "Map"
msgstr "地圖"
+msgid "Edit Information Map"
+msgstr ""
+
msgid "Detail Grade"
msgstr ""
@@ -15591,6 +16258,9 @@ msgstr "街"
msgid "scheme"
msgstr ""
+msgid "toposcope"
+msgstr ""
+
msgid "Shown Area"
msgstr "顯示區域"
@@ -15630,6 +16300,9 @@ msgstr "... 其他可能的運輸模式"
msgid "Information Board"
msgstr "資訊板"
+msgid "Edit Information Board"
+msgstr ""
+
msgid "Board Content"
msgstr "板的內容"
@@ -15651,23 +16324,35 @@ msgstr "植物"
msgid "Guidepost"
msgstr "路牌"
+msgid "Edit Guidepost"
+msgstr ""
+
msgid "Information Terminal"
msgstr ""
+msgid "Edit Information Terminal"
+msgstr ""
+
msgid "Closer description"
msgstr ""
msgid "Audioguide"
msgstr "語音導覽"
+msgid "Edit Audioguide"
+msgstr ""
+
msgid "Audioguide via mobile phone?"
msgstr "是否透過行動電話使用語音導覽？"
msgid "Phone number"
msgstr "電話號碼"
-msgid "Other Information Points"
-msgstr "其他的資訊點"
+msgid "Other Information Point"
+msgstr ""
+
+msgid "Edit Information Point"
+msgstr ""
msgid "Leisure"
msgstr "休閒"
@@ -15690,9 +16375,6 @@ msgstr "狗狗公園"
msgid "Edit Dog Park"
msgstr "編輯狗狗公園"
-msgid "Barrier"
-msgstr ""
-
msgid "fence"
msgstr "欄柵"
@@ -15717,8 +16399,17 @@ msgstr "三溫暖"
msgid "Edit Sauna"
msgstr "編輯三溫暖"
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00"
+msgid "Horse riding"
+msgstr ""
+
+msgid "Edit Horse riding"
+msgstr ""
+
+msgid "Brothel"
+msgstr ""
+
+msgid "Edit Brothel"
+msgstr ""
msgid "Playground"
msgstr "運動場"
@@ -15790,51 +16481,45 @@ msgstr "藝術工作"
msgid "Edit Artwork"
msgstr "編輯藝術工作"
-msgid "Place of Worship"
-msgstr "宗教儀式場所"
-
-msgid "Edit Place of Worship"
-msgstr "編輯宗教儀式場所"
+msgid "Recording Studio"
+msgstr "錄音室"
-msgid "Religion"
-msgstr "宗教"
+msgid "Edit Studio"
+msgstr "編輯錄音室"
-msgid "bahai"
-msgstr "巴海大同教"
+msgid "audio"
+msgstr "音樂"
-msgid "buddhist"
-msgstr "佛教"
+msgid "video"
+msgstr "影片"
-msgid "christian"
-msgstr "基督教系"
+msgid "Place of Worship"
+msgstr "宗教儀式場所"
-msgid "hindu"
-msgstr "印度教"
+msgid "Church"
+msgstr "教堂"
-msgid "jain"
-msgstr "耆那教"
+msgid "Edit Church"
+msgstr ""
-msgid "jewish"
-msgstr "猶太教"
+msgid "Building type"
+msgstr ""
-msgid "muslim"
-msgstr "回教"
+msgid "basilica"
+msgstr ""
-msgid "sikh"
-msgstr "錫克教"
+msgid "cathedral"
+msgstr ""
-msgid "spiritualist"
+msgid "chapel"
msgstr ""
-msgid "taoist"
-msgstr "道教"
+msgid "church"
+msgstr "教堂"
-msgid "unitarian"
+msgid "temple"
msgstr ""
-msgid "zoroastrian"
-msgstr "祆教"
-
msgid "Denomination"
msgstr "教派"
@@ -15850,6 +16535,12 @@ msgstr "天主教"
msgid "evangelical"
msgstr "福音派教會"
+msgid "greek_catholic"
+msgstr ""
+
+msgid "greek_orthodox"
+msgstr ""
+
msgid "jehovahs_witness"
msgstr ""
@@ -15862,6 +16553,9 @@ msgstr "衛理公會教"
msgid "mormon"
msgstr "摩門教"
+msgid "new_apostolic"
+msgstr ""
+
msgid "orthodox"
msgstr "東正教"
@@ -15877,41 +16571,144 @@ msgstr "新教"
msgid "quaker"
msgstr "教友派"
-msgid "shia"
-msgstr "什葉派"
+msgid "roman_catholic"
+msgstr ""
-msgid "sunni"
-msgstr "遜尼派"
+msgid "russian_orthodox"
+msgstr ""
+
+msgid "seventh_day_adventist"
+msgstr ""
msgid "Service Times"
msgstr ""
-msgid "Su 10:00"
+msgid "18:00"
msgstr ""
-msgid "Su 10:30"
+msgid "sunset,sunrise"
msgstr ""
-msgid "Su 11:00"
+msgid "Su 9:30,11:00"
msgstr ""
-msgid "Opening Hours for visiting"
+msgid "Sa,Su,PH 9:00"
msgstr ""
-msgid "Recording Studio"
-msgstr "錄音室"
+msgid "Sa 18:00; Su 10:45"
+msgstr ""
-msgid "Edit Studio"
-msgstr "編輯錄音室"
+msgid ""
+"Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00"
+msgstr ""
-msgid "audio"
-msgstr "音樂"
+msgid "Sa 10:00+"
+msgstr ""
-msgid "video"
-msgstr "影片"
+msgid "Mosque"
+msgstr ""
-msgid "Public Building"
-msgstr "公共建築"
+msgid "Edit Mosque"
+msgstr ""
+
+msgid "mosque"
+msgstr ""
+
+msgid "ibadi"
+msgstr ""
+
+msgid "shia"
+msgstr "什葉派"
+
+msgid "sunni"
+msgstr "遜尼派"
+
+msgid "Synagogue"
+msgstr ""
+
+msgid "Edit Synagogue"
+msgstr ""
+
+msgid "synagogue"
+msgstr ""
+
+msgid "conservative"
+msgstr ""
+
+msgid "reform"
+msgstr ""
+
+msgid "Buddhist Temple"
+msgstr ""
+
+msgid "Edit Buddhist Temple"
+msgstr ""
+
+msgid "theravada"
+msgstr ""
+
+msgid "mahayana"
+msgstr ""
+
+msgid "vajrayana"
+msgstr ""
+
+msgid "Hindu Temple"
+msgstr ""
+
+msgid "Edit Hindu Temple"
+msgstr ""
+
+msgid "vaishnavism"
+msgstr ""
+
+msgid "shaivism"
+msgstr ""
+
+msgid "shaktism"
+msgstr ""
+
+msgid "smartism"
+msgstr ""
+
+msgid "Shinto Shrine"
+msgstr ""
+
+msgid "Edit Shinto Shrine"
+msgstr ""
+
+msgid "Other Place of Worship"
+msgstr ""
+
+msgid "Edit other Place of Worship"
+msgstr ""
+
+msgid "Religion"
+msgstr "宗教"
+
+msgid "bahai"
+msgstr "巴海大同教"
+
+msgid "jain"
+msgstr "耆那教"
+
+msgid "sikh"
+msgstr "錫克教"
+
+msgid "spiritualist"
+msgstr ""
+
+msgid "taoist"
+msgstr "道教"
+
+msgid "unitarian"
+msgstr ""
+
+msgid "zoroastrian"
+msgstr "祆教"
+
+msgid "Public Building"
+msgstr "公共建築"
msgid "Edit Public Building"
msgstr "編輯公共建築"
@@ -15997,6 +16794,12 @@ msgstr "編輯駕駛訓練學校"
msgid "License Classes"
msgstr "駕照類別"
+msgid "A;A1;B;BE;C"
+msgstr ""
+
+msgid "A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E"
+msgstr ""
+
msgid "Health"
msgstr "健康"
@@ -16006,6 +16809,12 @@ msgstr "醫院"
msgid "Edit Hospital"
msgstr "編輯醫院"
+msgid "Clinic"
+msgstr ""
+
+msgid "Edit Clinic"
+msgstr ""
+
msgid "Doctors"
msgstr "醫師"
@@ -16072,12 +16881,66 @@ msgstr "獸醫"
msgid "Edit Veterinary"
msgstr "編輯獸醫"
-msgid "Note"
+msgid "Edit Toilets"
+msgstr ""
+
+msgid "Access rights"
+msgstr ""
+
+msgid "public"
+msgstr "公開"
+
+msgid "seasonal"
+msgstr ""
+
+msgid "flush"
+msgstr ""
+
+msgid "pitlatrine"
+msgstr ""
+
+msgid "chemical"
+msgstr ""
+
+msgid "bucket"
+msgstr ""
+
+msgid "Usage Position"
+msgstr ""
+
+msgid "seated"
+msgstr ""
+
+msgid "seated;urinal"
+msgstr ""
+
+msgid "squat"
+msgstr ""
+
+msgid "urinal"
msgstr ""
msgid "Post Box"
msgstr "郵筒"
+msgid "Edit Postbox"
+msgstr ""
+
+msgid "Collection times"
+msgstr ""
+
+msgid "11:30"
+msgstr ""
+
+msgid "Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00"
+msgstr ""
+
+msgid "Mo-Fr 09:00-12:00,17:15; Sa 14:00; So,PH off"
+msgstr ""
+
+msgid "Drive through"
+msgstr ""
+
msgid "Telephone"
msgstr "電話"
@@ -16087,6 +16950,30 @@ msgstr "編輯電話"
msgid "Telephone cards"
msgstr "電話卡"
+msgid "Emergency Phone"
+msgstr "緊急電話"
+
+msgid "Internet Access"
+msgstr ""
+
+msgid "Edit Internet Access"
+msgstr ""
+
+msgid "Automated Defibrillator"
+msgstr ""
+
+msgid "Edit Automated External Defibrillator"
+msgstr ""
+
+msgid "Located inside a building?"
+msgstr ""
+
+msgid "Last check date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "Last check note"
+msgstr ""
+
msgid "Clock"
msgstr "時鐘"
@@ -16096,31 +16983,37 @@ msgstr "編輯時鐘"
msgid "Display"
msgstr "顯示"
-msgctxt "display"
msgid "analog"
msgstr ""
-msgctxt "display"
msgid "digital"
msgstr ""
-msgctxt "display"
msgid "sundial"
msgstr ""
-msgctxt "display"
msgid "unorthodox"
msgstr ""
msgid "Support"
msgstr "支援"
+msgctxt "mounting/support"
+msgid "pole"
+msgstr ""
+
+msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr "掛於牆上"
+msgstr ""
+msgctxt "mounting/support"
msgid "billboard"
msgstr ""
+msgctxt "mounting/support"
+msgid "ground"
+msgstr ""
+
msgid "Visibility/readability"
msgstr "能見度/可讀性"
@@ -16148,8 +17041,8 @@ msgstr "顯示溼度"
msgid "Recycling"
msgstr "資源回收"
-msgid "Edit Recycling station"
-msgstr "資源回收站"
+msgid "Edit Recycling Station"
+msgstr ""
msgid "Batteries"
msgstr "電池"
@@ -16175,27 +17068,15 @@ msgstr ""
msgid "Waste Basket"
msgstr ""
-msgid "Edit Waste Basket"
-msgstr ""
-
msgid "Waste Disposal"
msgstr ""
-msgid "Edit Waste Disposal"
+msgid "Edit Bench"
msgstr ""
msgid "Backrest"
msgstr ""
-msgid "Material"
-msgstr "材質"
-
-msgid "stone"
-msgstr "石頭"
-
-msgid "plastic"
-msgstr "塑膠"
-
msgid "Amount of Seats"
msgstr "座椅數量"
@@ -16230,14 +17111,17 @@ msgstr ""
msgid "Height"
msgstr "高度"
+msgctxt "height"
msgid "low"
-msgstr "低"
+msgstr ""
+msgctxt "height"
msgid "half"
-msgstr "半高"
+msgstr ""
+msgctxt "height"
msgid "full"
-msgstr "全高"
+msgstr ""
msgid "Hide"
msgstr "隱藏"
@@ -16245,11 +17129,11 @@ msgstr "隱藏"
msgid "Lock"
msgstr "鎖"
-msgid "Drinking Water"
-msgstr "飲水機"
+msgid "Edit Source of Potable Water"
+msgstr ""
-msgid "Edit Drinking Water"
-msgstr "編輯飲水機"
+msgid "Indoor"
+msgstr ""
msgid "Fire Hydrant"
msgstr "消防栓"
@@ -16276,6 +17160,9 @@ msgstr ""
msgid "Diameter (in mm)"
msgstr ""
+msgid "Hydrant Position"
+msgstr ""
+
msgctxt "hydrant position"
msgid "lane"
msgstr ""
@@ -16313,119 +17200,155 @@ msgstr "體育館"
msgid "Edit Stadium"
msgstr "編輯體育館"
-msgid "select sport:"
-msgstr "選擇運動："
+msgid "Select sport:"
+msgstr ""
-msgid "sport"
+msgid "Sport"
msgstr "運動"
+msgctxt "sport"
msgid "multi"
-msgstr "多種"
+msgstr ""
+msgctxt "sport"
msgid "archery"
-msgstr "射箭"
+msgstr ""
+msgctxt "sport"
msgid "athletics"
-msgstr "田徑"
+msgstr ""
+msgctxt "sport"
msgid "american_football"
-msgstr "美式足球"
+msgstr ""
+msgctxt "sport"
msgid "australian_football"
-msgstr "澳洲足球"
+msgstr ""
+msgctxt "sport"
msgid "baseball"
-msgstr "棒球"
+msgstr ""
+msgctxt "sport"
msgid "basketball"
-msgstr "籃球"
+msgstr ""
+msgctxt "sport"
msgid "boules"
msgstr ""
+msgctxt "sport"
msgid "bowls"
-msgstr "保齡球"
+msgstr ""
+msgctxt "sport"
msgid "canadian_football"
-msgstr "加拿大足球"
+msgstr ""
+msgctxt "sport"
msgid "canoe"
-msgstr "獨木舟"
+msgstr ""
+msgctxt "sport"
msgid "climbing"
-msgstr "攀岩"
+msgstr ""
+msgctxt "sport"
msgid "cricket"
msgstr ""
+msgctxt "sport"
msgid "cricket_nets"
msgstr ""
+msgctxt "sport"
msgid "croquet"
-msgstr "木球"
+msgstr ""
+msgctxt "sport"
msgid "cycling"
-msgstr "自行車"
+msgstr ""
+msgctxt "sport"
msgid "dog_racing"
-msgstr "賽狗"
+msgstr ""
+msgctxt "sport"
msgid "equestrian"
-msgstr "馬術"
+msgstr ""
+msgctxt "sport"
msgid "gaelic_games"
msgstr ""
+msgctxt "sport"
msgid "golf"
-msgstr "高爾夫"
+msgstr ""
+msgctxt "sport"
msgid "gymnastics"
-msgstr "體操"
+msgstr ""
+msgctxt "sport"
msgid "hockey"
-msgstr "曲棍球"
+msgstr ""
+msgctxt "sport"
msgid "horse_racing"
-msgstr "賽馬"
+msgstr ""
+msgctxt "sport"
msgid "motor"
-msgstr "摩托車"
+msgstr ""
+msgctxt "sport"
msgid "pelota"
msgstr ""
+msgctxt "sport"
msgid "racquet"
msgstr ""
+msgctxt "sport"
msgid "rugby_league"
msgstr ""
+msgctxt "sport"
msgid "rugby_union"
msgstr ""
+msgctxt "sport"
msgid "shooting"
-msgstr "射擊"
+msgstr ""
+msgctxt "sport"
msgid "skateboard"
msgstr ""
+msgctxt "sport"
msgid "skating"
msgstr ""
+msgctxt "sport"
msgid "skiing"
-msgstr "滑雪"
+msgstr ""
+msgctxt "sport"
msgid "soccer"
-msgstr "足球"
+msgstr ""
+msgctxt "sport"
msgid "swimming"
-msgstr "游泳"
+msgstr ""
+msgctxt "sport"
msgid "table_tennis"
-msgstr "桌球"
+msgstr ""
+msgctxt "sport"
msgid "tennis"
-msgstr "網球"
+msgstr ""
msgid "Sports Centre"
msgstr "運動中心"
@@ -16457,26 +17380,27 @@ msgstr "迷你高爾夫"
msgid "Edit Miniature Golf"
msgstr "編輯迷你高爾夫"
-msgid "Sport"
-msgstr "運動"
-
msgid "Multi"
msgstr "多種"
msgid "Edit Multi"
msgstr "編輯多種"
-msgid "type"
-msgstr "類型"
-
+msgctxt "running"
msgid "pitch"
msgstr ""
+msgctxt "running"
msgid "sports_centre"
-msgstr "運動中心"
+msgstr ""
+msgctxt "running"
msgid "stadium"
-msgstr "體育館"
+msgstr ""
+
+msgctxt "running"
+msgid "track"
+msgstr ""
msgid "9pin"
msgstr ""
@@ -16484,6 +17408,15 @@ msgstr ""
msgid "Edit 9pin"
msgstr ""
+msgid "pitch"
+msgstr ""
+
+msgid "sports_centre"
+msgstr "運動中心"
+
+msgid "stadium"
+msgstr "體育館"
+
msgid "10pin"
msgstr ""
@@ -16517,6 +17450,22 @@ msgstr "編輯獨木舟"
msgid "Edit Cycling"
msgstr "編輯自行車"
+msgctxt "racing"
+msgid "pitch"
+msgstr ""
+
+msgctxt "racing"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "racing"
+msgid "stadium"
+msgstr ""
+
+msgctxt "racing"
+msgid "track"
+msgstr ""
+
msgid "Dog Racing"
msgstr "賽狗"
@@ -16529,7 +17478,32 @@ msgstr "馬術"
msgid "Edit Equestrian"
msgstr "編輯馬術"
-msgid "horse_riding"
+msgctxt "riding"
+msgid "pitch"
+msgstr ""
+
+msgctxt "riding"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "riding"
+msgid "stadium"
+msgstr ""
+
+msgctxt "riding"
+msgid "track"
+msgstr ""
+
+msgid "clay"
+msgstr ""
+
+msgid "dirt"
+msgstr ""
+
+msgid "fine_gravel"
+msgstr ""
+
+msgid "mud"
msgstr ""
msgid "Horse Racing"
@@ -16548,7 +17522,7 @@ msgid "Skating"
msgstr "溜冰"
msgid "Edit Skating"
-msgstr "編輯溜冰"
+msgstr ""
msgid "ice_rink"
msgstr ""
@@ -16592,36 +17566,54 @@ msgstr ""
msgid "Difficulty"
msgstr "困難度"
+msgctxt "piste:difficulty"
msgid "novice"
-msgstr "新手"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "easy"
-msgstr "容易"
+msgstr ""
+
+msgctxt "piste:difficulty"
+msgid "intermediate"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "advanced"
-msgstr "進階"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "expert"
-msgstr "專家"
+msgstr ""
+msgctxt "piste:difficulty"
msgid "freeride"
msgstr ""
msgid "Grooming"
msgstr ""
+msgctxt "piste:grooming"
msgid "classic"
msgstr ""
+msgctxt "piste:grooming"
msgid "mogul"
msgstr ""
+msgctxt "piste:grooming"
+msgid "skating"
+msgstr ""
+
+msgctxt "piste:grooming"
msgid "classic;skating"
msgstr ""
+msgctxt "piste:grooming"
msgid "scooter"
msgstr ""
+msgctxt "piste:grooming"
msgid "backcountry"
msgstr ""
@@ -16664,19 +17656,15 @@ msgstr ""
msgid "Edit Gaelic Games"
msgstr ""
-msgctxt "gaelic game"
msgid "Hurling"
msgstr ""
-msgctxt "gaelic game"
msgid "Football"
msgstr ""
-msgctxt "gaelic game"
msgid "Camogie"
msgstr ""
-msgctxt "gaelic game"
msgid "Rounders"
msgstr ""
@@ -16815,6 +17803,18 @@ msgstr ""
msgid "Edit Model Aerodrome"
msgstr ""
+msgctxt "aerialway"
+msgid "pitch"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "sports_centre"
+msgstr ""
+
+msgctxt "aerialway"
+msgid "track"
+msgstr ""
+
msgid "RC Car"
msgstr ""
@@ -16827,38 +17827,73 @@ msgstr "人造物"
msgid "Edit Building"
msgstr "編輯建築"
+msgctxt "building"
+msgid "yes"
+msgstr ""
+
+msgctxt "building"
msgid "roof"
-msgstr "屋頂"
+msgstr ""
+msgctxt "building"
msgid "garage"
-msgstr "車庫"
+msgstr ""
-msgid "church"
-msgstr "教堂"
+msgctxt "building"
+msgid "garages"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+msgctxt "building"
msgid "school"
-msgstr "學校"
+msgstr ""
+msgctxt "building"
msgid "hangar"
msgstr ""
+msgctxt "building"
msgid "commercial"
msgstr ""
+msgctxt "building"
msgid "farm"
msgstr ""
+msgctxt "building"
msgid "transportation"
msgstr ""
+msgctxt "building"
msgid "greenhouse"
msgstr ""
+msgctxt "building"
msgid "office"
-msgstr "辦公室"
+msgstr ""
+msgctxt "building"
msgid "university"
-msgstr "大學"
+msgstr ""
+
+msgctxt "building"
+msgid "hospital"
+msgstr ""
+
+msgctxt "building"
+msgid "warehouse"
+msgstr ""
+
+msgctxt "building"
+msgid "retail"
+msgstr ""
+
+msgctxt "building"
+msgid "shed"
+msgstr ""
msgid "Residential Building"
msgstr "居住的建築"
@@ -16866,21 +17901,60 @@ msgstr "居住的建築"
msgid "Edit Residential Building"
msgstr "編輯居住的建築"
+msgctxt "building"
+msgid "residential"
+msgstr ""
+
+msgctxt "building"
msgid "apartments"
msgstr ""
+msgctxt "building"
msgid "house"
msgstr ""
+msgctxt "building"
msgid "hut"
msgstr ""
+msgctxt "building"
+msgid "dormitory"
+msgstr ""
+
+msgctxt "building"
msgid "terrace"
msgstr ""
+msgctxt "building"
msgid "detached"
msgstr ""
+msgid "Entrance"
+msgstr "入口"
+
+msgid "Edit Entrance"
+msgstr "編輯入口"
+
+msgctxt "entrance"
+msgid "yes"
+msgstr ""
+
+msgctxt "entrance"
+msgid "main"
+msgstr ""
+
+msgctxt "entrance"
+msgid "service"
+msgstr ""
+
+msgctxt "entrance"
+msgid "exit"
+msgstr ""
+
+msgctxt "entrance"
+msgid "emergency"
+msgstr ""
+
msgid "Tower"
msgstr "塔"
@@ -16896,9 +17970,6 @@ msgstr "通訊"
msgid "observation"
msgstr "觀測"
-msgid "Height (meters)"
-msgstr "高度（米）"
-
msgid "Flagpole"
msgstr ""
@@ -17108,41 +18179,67 @@ msgstr "運作時間"
msgid "Mo-Fr 22:00-05:00"
msgstr "週一-週五 22:00-05:00"
-msgid "Measurement Station"
-msgstr "觀測站"
+msgid "Monitoring Station"
+msgstr ""
-msgid "Edit Measurement Station"
-msgstr "編輯觀測站"
+msgid "Edit Monitoring Station"
+msgstr ""
-msgid "Measurement"
+msgid "Monitoring:"
msgstr ""
-msgid "particulate_matter"
+msgid "Weather"
msgstr ""
-msgid "seismic"
+msgid "Water level"
msgstr ""
-msgid "water_level"
+msgid "Tide Level"
msgstr ""
-msgid "weather"
-msgstr "天氣"
+msgid "Traffic"
+msgstr ""
-msgid "Recording"
+msgid "Air Quality"
msgstr ""
-msgid "manually"
-msgstr "手動"
+msgid "Noise"
+msgstr ""
-msgid "automated"
-msgstr "自動"
+msgid "GPS Signals"
+msgstr ""
-msgid "remote"
-msgstr "遙控"
+msgid "GLONASS Signals"
+msgstr ""
-msgctxt "display"
-msgid "no"
+msgid "Galileo Signals"
+msgstr ""
+
+msgid "Radiation"
+msgstr ""
+
+msgid "Seismic Activity"
+msgstr ""
+
+msgid "Recording:"
+msgstr ""
+
+msgid "Automated"
+msgstr ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "Remote"
+msgstr ""
+
+msgid "Display:"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "Digital"
msgstr ""
msgid "Survey Point"
@@ -17151,8 +18248,8 @@ msgstr "測量點"
msgid "Edit Survey Point"
msgstr "編輯測量點"
-msgid "Surveillance"
-msgstr "監視"
+msgid "Surveillance Camera"
+msgstr ""
msgid "Edit Surveillance Camera"
msgstr "編輯監視攝影機"
@@ -17163,17 +18260,107 @@ msgstr "室內"
msgid "outdoor"
msgstr "戶外"
-msgid "public"
-msgstr "公開"
+msgid "Zone"
+msgstr ""
+
+msgid "parking"
+msgstr ""
+
+msgid "traffic"
+msgstr ""
+
+msgid "shop"
+msgstr "商店"
+
+msgid "bank"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "panning"
+msgstr ""
+
+msgid "dome"
+msgstr ""
+
+msgid "Mounted on"
+msgstr ""
+
+msgid "ceiling"
+msgstr ""
+
+msgid "Direction in degrees"
+msgstr ""
+
+msgid "Inclination in degrees"
+msgstr ""
+
+msgid "Height in meter (m)"
+msgstr ""
msgid "Power"
msgstr "電力"
+msgid "Power Plant"
+msgstr ""
+
+msgid "Edit Power Plant"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "Output forms of energy"
+msgstr ""
+
+msgid "(please add this information to the generators if possible)"
+msgstr ""
+
+msgid "electricity"
+msgstr ""
+
+msgid "2 W"
+msgstr ""
+
+msgid "3 kW"
+msgstr ""
+
+msgid "5 MW"
+msgstr ""
+
+msgid "7 GW"
+msgstr ""
+
+msgid "hot water"
+msgstr ""
+
+msgid "hot air"
+msgstr ""
+
+msgid "cold water"
+msgstr ""
+
+msgid "cold air"
+msgstr ""
+
+msgid "compressed air"
+msgstr ""
+
+msgid "steam"
+msgstr ""
+
+msgid "vacuum"
+msgstr ""
+
msgid "Power Generator"
-msgstr "發電廠"
+msgstr "發電機組"
msgid "Edit Power Generator"
-msgstr "編輯發電廠"
+msgstr "編輯發電機組"
msgid "biofuel"
msgstr ""
@@ -17220,137 +18407,256 @@ msgstr "風力"
msgid "Method"
msgstr ""
+msgctxt "generator method"
msgid "anaerobic_digestion"
msgstr ""
+msgctxt "generator method"
+msgid "barrage"
+msgstr ""
+
+msgctxt "generator method"
msgid "combustion"
msgstr ""
-msgid "dam"
+msgid "bio / coal / diesel / gas / gasoline / oil / waste"
msgstr ""
+msgctxt "generator method"
msgid "fission"
msgstr ""
+msgctxt "generator method"
msgid "fusion"
msgstr ""
+msgctxt "generator method"
msgid "gasification"
msgstr ""
-msgid "photovoltaic"
-msgstr "光電"
-
-msgid "pumped-storage"
+msgid "biomass / waste"
msgstr ""
-msgid "pumping"
+msgctxt "generator method"
+msgid "photovoltaic"
msgstr ""
+msgctxt "generator method"
msgid "pyrolysis"
msgstr ""
+msgctxt "generator method"
msgid "run-of-the-river"
msgstr ""
+msgctxt "generator method"
+msgid "stream"
+msgstr ""
+
+msgctxt "generator method"
msgid "thermal"
msgstr ""
-msgid "Output forms of energy"
+msgctxt "generator method"
+msgid "water-pumped-storage"
msgstr ""
-msgid "electricity"
+msgctxt "generator method"
+msgid "water-storage"
msgstr ""
-msgid "2 W"
+msgid "Generator Type"
msgstr ""
-msgid "3 kW"
+msgid "combined_cycle"
msgstr ""
-msgid "5 MW"
+msgid "gas combustion"
msgstr ""
-msgid "7 GW"
+msgid "francis_turbine"
msgstr ""
-msgid "hot water"
+msgid "gas_turbine"
msgstr ""
-msgid "hot air"
+msgid "biogas, biomass, gas, waste combustion"
msgstr ""
-msgid "cold water"
+msgid "heat_pump"
msgstr ""
-msgid "cold air"
+msgid "horizontal_axis"
msgstr ""
-msgid "compressed air"
+msgid "tidal steam / wind"
msgstr ""
-msgid "steam"
+msgid "kaplan_turbine"
msgstr ""
-msgid "vacuum"
+msgid "hygro run-of-the-river / hydro water-storage / tidal barrage"
msgstr ""
-msgid "battery charging"
+msgid "pelton_turbine"
msgstr ""
-msgid "Power Station"
-msgstr "發電廠"
+msgid "hygro run-of-the-river / hydro water-storage"
+msgstr ""
-msgid "Edit Power Station"
-msgstr "編輯發電廠"
+msgid "reciprocating_engine"
+msgstr ""
-msgid "Power Sub Station"
+msgid "biofuel, biogas, diesel, gas, gasoline"
msgstr ""
-msgid "Edit Power Sub Station"
+msgid "solar_photovoltaic_panel"
msgstr ""
-msgid "Line reference"
+msgid "solar photovoltaic"
msgstr ""
-msgid "Cable Distribution Cabinet"
+msgid "solar_thermal_collector"
msgstr ""
-msgid "Edit Cable Distribution Cabinet"
+msgid "solar thermal"
msgstr ""
-msgid "Power Tower"
-msgstr "電塔"
+msgid "steam_generator"
+msgstr ""
-msgid "Edit Power Tower"
-msgstr "編輯電塔"
+msgid "bio, coal, diesel, gas, gasoline, oil, waste combustion"
+msgstr ""
-msgid "Tower reference"
-msgstr "高壓電塔編號"
+msgid "steam_turbine"
+msgstr ""
-msgid "Pole"
-msgstr "電線竿"
+msgid "geothermal / solar thermal / bio, coal, oil, waste combustion"
+msgstr ""
-msgid "Edit Power Pole"
-msgstr "編輯電線竿"
+msgid "stellarator"
+msgstr ""
-msgid "Pole reference"
-msgstr "電線竿編號"
+msgid "nuclear fusion"
+msgstr ""
-msgid "Power Line"
-msgstr "電線"
+msgid "tokamak"
+msgstr ""
-msgid "Edit Power Line"
-msgstr "編輯電線"
+msgid "vertical_axis"
+msgstr ""
+
+msgid "Boiling Water Reactor 1 (BWR-1)"
+msgstr ""
+
+msgid "nuclear fission"
+msgstr ""
+
+msgid "Boiling Water Reactor 2 (BWR-2)"
+msgstr ""
+
+msgid "Boiling Water Reactor 3 (BWR-3)"
+msgstr ""
+
+msgid "Boiling Water Reactor 4 (BWR-4)"
+msgstr ""
+
+msgid "Boiling Water Reactor 5 (BWR-5)"
+msgstr ""
+
+msgid "Boiling Water Reactor 6 (BWR-6)"
+msgstr ""
+
+msgid "CANada Deuterium Uranium reactor (CANDU)"
+msgstr ""
+
+msgid "China Pressurized Reactor (CPR-1000)"
+msgstr ""
+
+msgid "European Pressurized Reactor (EPR)"
+msgstr ""
+
+msgid "Inertial Confinement Fusion (ICF)"
+msgstr ""
+
+msgid "Pressurized water reactor (PWR)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
+msgstr ""
+
+msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
+msgstr ""
+
+msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
+msgstr ""
+
+msgid "Output forms of energy:"
+msgstr ""
+
+msgid "Power Sub Station"
+msgstr ""
+
+msgid "Edit Power Sub Station"
+msgstr ""
+
+msgid "Line reference"
+msgstr ""
+
+msgid "high"
+msgstr ""
+
+msgid "medium"
+msgstr ""
+
+msgid "low"
+msgstr "低"
+
+msgid "750000;200000"
+msgstr ""
+
+msgid "110000;20000"
+msgstr ""
+
+msgid "Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Edit Cable Distribution Cabinet"
+msgstr ""
+
+msgid "Power Tower"
+msgstr "電塔"
+
+msgid "Edit Power Tower"
+msgstr "編輯電塔"
+
+msgid "Tower reference"
+msgstr "高壓電塔編號"
+
+msgid "steel"
+msgstr ""
+
+msgid "Pole"
+msgstr "電線竿"
+
+msgid "Edit Power Pole"
+msgstr "編輯電線竿"
+
+msgid "Pole reference"
+msgstr "電線竿編號"
+
+msgid "Power Line"
+msgstr "電線"
+
+msgid "Edit Power Line"
+msgstr "編輯電線"
msgid "Line type"
msgstr "電線類型"
-msgctxt "Power Line"
msgid "line"
msgstr ""
-msgctxt "Power Line"
msgid "minor_line"
msgstr ""
@@ -17459,11 +18765,11 @@ msgstr ""
msgid "Edit Kiosk"
msgstr ""
-msgid "Baker"
-msgstr "麵包類"
+msgid "Bakery"
+msgstr ""
-msgid "Edit Baker"
-msgstr "編輯麵包店"
+msgid "Edit Bakery"
+msgstr ""
msgid "Butcher"
msgstr "肉類"
@@ -17474,8 +18780,8 @@ msgstr "編輯肉店"
msgid "Seafood"
msgstr "海產"
-msgid "Edit Seafood"
-msgstr "編輯海產"
+msgid "Edit Seafood Shop"
+msgstr ""
msgid "Deli (Fine Food)"
msgstr ""
@@ -17495,14 +18801,20 @@ msgstr "市場"
msgid "Edit Marketplace"
msgstr "編輯市場"
+msgid "Organic"
+msgstr "有機產品"
+
msgid "Greengrocer"
msgstr ""
msgid "Edit Greengrocer"
msgstr ""
-msgid "Organic"
-msgstr "有機產品"
+msgid "Farm Stand"
+msgstr ""
+
+msgid "Edit Farm Stand"
+msgstr ""
msgid "Edit Organic/Bio"
msgstr ""
@@ -17573,7 +18885,7 @@ msgstr ""
msgid "Fabric"
msgstr ""
-msgid "Edit Fabric"
+msgid "Edit Fabric Shop"
msgstr ""
msgid "Electronic"
@@ -17594,14 +18906,14 @@ msgstr "編輯電子材料行"
msgid "Mobile Phone"
msgstr "行動電話"
-msgid "Edit Mobile Phone"
-msgstr "編輯行動電話"
+msgid "Edit Mobile Phone Shop"
+msgstr ""
msgid "Vacuum Cleaner"
msgstr "吸塵器"
-msgid "Edit Vacuum Cleaner"
-msgstr "編輯吸塵器"
+msgid "Edit Vacuum Cleaner Shop"
+msgstr ""
msgid "Hifi"
msgstr "Hifi"
@@ -17609,9 +18921,8 @@ msgstr "Hifi"
msgid "Edit Hifi Shop"
msgstr "編輯 Hifi 音響店"
-msgctxt "shop"
msgid "Video"
-msgstr ""
+msgstr "影片類"
msgid "Edit Video Shop"
msgstr "編輯影片類商店"
@@ -17637,6 +18948,12 @@ msgstr "編輯金錢兌換所"
msgid "Edit Automated Teller Machine"
msgstr "編輯自動提款機"
+msgid "Pawnbroker"
+msgstr ""
+
+msgid "Edit Pawnbroker"
+msgstr ""
+
msgid "Department Store"
msgstr "百貨公司"
@@ -17673,11 +18990,32 @@ msgstr "珠寶"
msgid "Edit Jewelry"
msgstr "編輯珠寶"
+msgid "Gift"
+msgstr ""
+
+msgid "Edit Gift Shop"
+msgstr ""
+
+msgid "buddhist"
+msgstr "佛教"
+
+msgid "christian"
+msgstr "基督教系"
+
+msgid "hindu"
+msgstr "印度教"
+
+msgid "jewish"
+msgstr "猶太教"
+
+msgid "muslim"
+msgstr "回教"
+
msgid "Erotic"
msgstr "情趣用品"
-msgid "Edit Erotic"
-msgstr "編輯情趣用品"
+msgid "Edit Erotic Shop"
+msgstr ""
msgid "Florist"
msgstr "花類"
@@ -17706,7 +19044,7 @@ msgstr "編輯硬體商店"
msgid "Paint"
msgstr ""
-msgid "Edit Paint"
+msgid "Edit Paint Shop"
msgstr ""
msgid "Furniture"
@@ -17718,19 +19056,19 @@ msgstr "編輯傢俱店"
msgid "Kitchen"
msgstr "廚房"
-msgid "Edit Kitchen"
-msgstr "編輯廚房"
+msgid "Edit Kitchen Store"
+msgstr ""
msgid "Curtain"
msgstr ""
-msgid "Edit Curtain"
+msgid "Edit Curtain Shop"
msgstr ""
msgid "Frame"
msgstr ""
-msgid "Edit Frames"
+msgid "Edit Frames Shop"
msgstr ""
msgid "Stationery"
@@ -17751,6 +19089,12 @@ msgstr "書店"
msgid "Edit Book Store"
msgstr "編輯書店"
+msgid "Newsagent''s shop"
+msgstr ""
+
+msgid "Edit Newsagent''s shop"
+msgstr ""
+
msgid "Travel Agency"
msgstr "旅行社"
@@ -17760,8 +19104,8 @@ msgstr "編輯旅行社"
msgid "Musical Instrument"
msgstr "樂器"
-msgid "Edit Musical Instruments"
-msgstr "編輯樂器"
+msgid "Edit Musical Instruments Shop"
+msgstr ""
msgid "Toys"
msgstr "玩具類"
@@ -17841,6 +19185,9 @@ msgstr "玩具"
msgid "vouchers"
msgstr ""
+msgid "Note"
+msgstr ""
+
msgid "Geography"
msgstr "地理學"
@@ -17970,6 +19317,12 @@ msgstr "峰"
msgid "Edit Peak"
msgstr "編輯山峰"
+msgid "Saddle"
+msgstr ""
+
+msgid "Edit Saddle"
+msgstr ""
+
msgid "Glacier"
msgstr "冰河"
@@ -18009,26 +19362,35 @@ msgstr "樹"
msgid "Edit Tree"
msgstr "編輯樹"
+msgid "broad_leaved"
+msgstr ""
+
+msgid "conifer"
+msgstr ""
+
+msgid "palm"
+msgstr ""
+
msgid "Botanical Name"
msgstr "植物學名"
+msgid "Tree Row"
+msgstr ""
+
msgid "Wood"
msgstr "樹林"
msgid "Edit Wood"
msgstr "編輯樹林"
-msgctxt "wood"
msgid "coniferous"
-msgstr ""
+msgstr "松類"
-msgctxt "wood"
msgid "deciduous"
-msgstr ""
+msgstr "落葉類"
-msgctxt "wood"
msgid "mixed"
-msgstr ""
+msgstr "混合"
msgid "Forest"
msgstr "森林"
@@ -18036,15 +19398,6 @@ msgstr "森林"
msgid "Edit Forest Landuse"
msgstr "編輯森林土地利用"
-msgid "coniferous"
-msgstr "松類"
-
-msgid "deciduous"
-msgstr "落葉類"
-
-msgid "mixed"
-msgstr "混合"
-
msgid "Grassland"
msgstr ""
@@ -18120,6 +19473,12 @@ msgstr "青草地"
msgid "Edit Meadow Landuse"
msgstr "編輯青草地土地利用"
+msgid "Orchard"
+msgstr ""
+
+msgid "Edit Orchard Landuse"
+msgstr ""
+
msgid "Vineyard"
msgstr ""
@@ -18174,8 +19533,8 @@ msgstr ""
msgid "Edit Recreation Ground Landuse"
msgstr ""
-msgid "Residential area"
-msgstr "住宅區"
+msgid "Residential Area"
+msgstr ""
msgid "Edit Residential Landuse"
msgstr "編輯住宅區土地利用"
@@ -18186,6 +19545,9 @@ msgstr ""
msgid "Edit Graveyard"
msgstr ""
+msgid "shinto"
+msgstr ""
+
msgid "Cemetery"
msgstr ""
@@ -18261,6 +19623,33 @@ msgstr "編輯露天採礦土地利用"
msgid "Annotation"
msgstr "附註"
+msgid "Edit Name Information"
+msgstr ""
+
+msgid "Alternative name"
+msgstr ""
+
+msgid "Historical name"
+msgstr ""
+
+msgid "Local name"
+msgstr ""
+
+msgid "Regional name"
+msgstr ""
+
+msgid "National name"
+msgstr ""
+
+msgid "International name"
+msgstr ""
+
+msgid "Official name"
+msgstr ""
+
+msgid "Common name abbreviation"
+msgstr ""
+
msgid "Edit Address Information"
msgstr "編輯地址資訊"
@@ -18279,30 +19668,6 @@ msgstr "城市名稱"
msgid "Country code"
msgstr "國碼"
-msgid "AT"
-msgstr "AT"
-
-msgid "CH"
-msgstr "CH"
-
-msgid "DE"
-msgstr "DE"
-
-msgid "FR"
-msgstr "FR"
-
-msgid "GB"
-msgstr "GB"
-
-msgid "IT"
-msgstr "IT"
-
-msgid "RS"
-msgstr ""
-
-msgid "US"
-msgstr "US"
-
msgid "Address Interpolation"
msgstr "內插法地址"
@@ -18321,6 +19686,18 @@ msgstr "偶數"
msgid "alphabetic"
msgstr "按字母順序"
+msgid "Accuracy"
+msgstr "準確度"
+
+msgid "actual"
+msgstr ""
+
+msgid "estimate"
+msgstr ""
+
+msgid "potential"
+msgstr ""
+
msgid "Contact (common schema)"
msgstr "連絡方式 (一般形式)"
@@ -18483,27 +19860,56 @@ msgstr "限制在何處結束"
msgid "traffic light or barrier that stops you"
msgstr "會讓您停下的交通號誌或障礙物"
-msgid "Route (legacy)"
+msgid "General route"
+msgstr ""
+
+msgid "Edit general route"
+msgstr ""
+
+msgctxt "route type"
+msgid "bicycle"
msgstr ""
-msgid "Edit Route (legacy)"
+msgctxt "route type"
+msgid "bus"
msgstr ""
+msgctxt "route type"
msgid "road"
-msgstr "道路"
+msgstr ""
+msgctxt "route type"
+msgid "ferry"
+msgstr ""
+
+msgctxt "route type"
msgid "ski"
msgstr ""
+msgctxt "route type"
msgid "foot"
-msgstr "步行"
+msgstr ""
+msgctxt "route type"
msgid "hiking"
-msgstr "健行"
+msgstr ""
+
+msgctxt "route type"
+msgid "tram"
+msgstr ""
+msgctxt "route type"
msgid "detour"
msgstr ""
+msgctxt "route type"
+msgid "railway"
+msgstr ""
+
+msgctxt "route type"
+msgid "subway"
+msgstr ""
+
msgid "Symbol description"
msgstr ""
@@ -18549,20 +19955,23 @@ msgstr ""
msgid "backward halt point"
msgstr ""
-msgid "Route network"
-msgstr "路線網路"
+msgid "Route Network"
+msgstr ""
-msgid "Edit route network"
-msgstr "編輯路線網路"
+msgid "Edit Route Network"
+msgstr ""
msgid "member"
msgstr "成員"
-msgid "Associated street"
-msgstr "關聯的街道"
+msgid "Associated Street"
+msgstr ""
+
+msgid "Edit Associated Street"
+msgstr ""
-msgid "Edit associated street"
-msgstr "編輯關聯的街道"
+msgid "house"
+msgstr ""
msgid "Street"
msgstr "街"
@@ -18585,7 +19994,7 @@ msgstr ""
msgid "Destination sign"
msgstr ""
-msgid "Edit Destination sign"
+msgid "Edit Destination Sign"
msgstr ""
msgid "Destination written on sign (w/o distance)"
@@ -18681,18 +20090,27 @@ msgstr ""
msgid "way forming the outline footprint"
msgstr ""
-msgid "nodes forming the outline"
+msgid "edge ways parallel to ''across''"
msgstr ""
msgid "ways passing through the tunnel"
msgstr ""
+msgid "edge ways parallel to ''through''"
+msgstr ""
+
msgid "bridge"
msgstr "橋"
msgid "deprecated"
msgstr "已廢棄"
+msgid "bicycle"
+msgstr "單車"
+
+msgid "foot"
+msgstr "步行"
+
msgid "horse"
msgstr "馬"
@@ -18702,7 +20120,10 @@ msgstr ""
msgid "motorroad"
msgstr ""
-msgid "highway_track"
+msgid "highway.track"
+msgstr ""
+
+msgid "livingdashed"
msgstr ""
msgid "services"
@@ -18711,11 +20132,11 @@ msgstr "服務"
msgid "ford"
msgstr ""
-msgid "highway_platform"
+msgid "highway.platform"
msgstr ""
-msgid "emergency_access_point"
-msgstr "緊急連絡點"
+msgid "emergency.access.point"
+msgstr ""
msgid "riverbank"
msgstr "河岸"
@@ -18732,6 +20153,9 @@ msgstr ""
msgid "railwaypoint"
msgstr ""
+msgid "raildashed"
+msgstr ""
+
msgid "railyard"
msgstr ""
@@ -18747,28 +20171,28 @@ msgstr ""
msgid "aeroway"
msgstr ""
-msgid "aeroway_dark"
+msgid "aeroway.dark"
msgstr ""
-msgid "aeroway_light"
+msgid "aeroway.light"
msgstr ""
-msgid "piste_easy"
+msgid "piste.easy"
msgstr ""
-msgid "piste_intermediate"
+msgid "piste.intermediate"
msgstr ""
-msgid "piste_advanced"
+msgid "piste.advanced"
msgstr ""
-msgid "piste_expert"
+msgid "piste.expert"
msgstr ""
-msgid "piste_freeride"
+msgid "piste.freeride"
msgstr ""
-msgid "piste_novice"
+msgid "piste.novice"
msgstr ""
msgid "power"
@@ -18789,20 +20213,20 @@ msgstr ""
msgid "amenity"
msgstr ""
-msgid "amenity_traffic"
+msgid "amenity.traffic"
msgstr ""
-msgid "amenity_light"
+msgid "amenity.light"
msgstr ""
-msgid "light_water"
+msgid "light.water"
msgstr ""
msgid "health"
msgstr "健康"
-msgid "shop"
-msgstr "商店"
+msgid "office"
+msgstr "辦公室"
msgid "hotel"
msgstr "旅館"
@@ -18867,9 +20291,6 @@ msgstr ""
msgid "woodarea"
msgstr "樹林區"
-msgid "mud"
-msgstr ""
-
msgid "beach"
msgstr "海灘"
@@ -18879,10 +20300,13 @@ msgstr "路線"
msgid "boundary"
msgstr "邊界"
+msgid "sport"
+msgstr "運動"
+
msgid "place"
msgstr ""
-msgid "tiger_data"
+msgid "tiger.data"
msgstr ""
msgid "address"
@@ -18897,9 +20321,6 @@ msgstr "村/市"
msgid "One Way"
msgstr "單行道"
-msgid "Church"
-msgstr "教堂"
-
msgid "Fuel Station"
msgstr "加油站"
@@ -18927,6 +20348,9 @@ msgstr ""
msgid "wrong highway tag on a node"
msgstr ""
+msgid "wrong crossing tag on a way"
+msgstr ""
+
msgid "Unnamed unclassified highway"
msgstr ""
@@ -18972,10 +20396,40 @@ msgstr ""
msgid "unusual tag combination (highway & natural)"
msgstr ""
+msgid "unusual tag combination (landuse & building)"
+msgstr ""
+
+msgid "unnecessary access key"
+msgstr ""
+
+msgid "unnecessary motor_vehicle=yes"
+msgstr ""
+
msgid "natural water used for swimming pool"
msgstr ""
-msgid "incline without highway"
+msgid "numerical key"
+msgstr ""
+
+msgid "route_master relation without route_master=*"
+msgstr ""
+
+msgid "power line without voltage"
+msgstr ""
+
+msgid "substation key without power=substation"
+msgstr ""
+
+msgid "transformer key without power"
+msgstr ""
+
+msgid "missing substation=*"
+msgstr ""
+
+msgid "missing transformer=*"
+msgstr ""
+
+msgid "incline without highway or railway"
msgstr ""
msgid "junction without highway"
@@ -18987,7 +20441,7 @@ msgstr ""
msgid "lcn without highway"
msgstr ""
-msgid "lit without highway"
+msgid "lit without highway/railway/piste/parking/platform"
msgstr ""
msgid "living_street without highway"
@@ -19005,7 +20459,7 @@ msgstr ""
msgid "ntd_id without highway"
msgstr ""
-msgid "oneway without highway"
+msgid "oneway without highway or railway"
msgstr ""
msgid "sac_scale without highway"
@@ -19122,19 +20576,130 @@ msgstr ""
msgid "have_riverbank without waterway"
msgstr ""
-msgid "tunnel without highway/railway/waterway"
+msgid "tunnel without highway/railway/waterway/platform/pipeline"
+msgstr ""
+
+msgid "bridge without highway/railway/waterway/platform/piste/pipeline"
+msgstr ""
+
+msgid "psv without highway/railway/waterway/parking"
+msgstr ""
+
+msgid "width without physical linear feature"
+msgstr ""
+
+msgid "maxspeed without highway/railway/traffic_sign/enforcement"
+msgstr ""
+
+msgid "fence_type without barrier=fence"
+msgstr ""
+
+msgid "border_type without boundary"
+msgstr ""
+
+msgid "recycling_type without amenity=recycling"
+msgstr ""
+
+msgid "board_type without information=board"
+msgstr ""
+
+msgid "shelter_type without amenity=shelter"
+msgstr ""
+
+msgid "lamp_type without highway=street_lamp"
+msgstr ""
+
+msgid "map_type without information=map"
+msgstr ""
+
+msgid "site_type without historic=archaeological_site"
+msgstr ""
+
+msgid "artwork_type without tourism=artwork"
+msgstr ""
+
+msgid "castle_type without historic=castle"
+msgstr ""
+
+msgid "reservoir_type without landuse/water=reservoir"
+msgstr ""
+
+msgid "bunker_type without military=bunker"
+msgstr ""
+
+msgid "source:addr without addr:*"
+msgstr ""
+
+msgid "source:date without source"
+msgstr ""
+
+msgid "source:name without name"
+msgstr ""
+
+msgid "source:maxspeed without maxspeed"
+msgstr ""
+
+msgid "source:building without building"
+msgstr ""
+
+msgid "source:ref without ref"
+msgstr ""
+
+msgid "source:population without population"
+msgstr ""
+
+msgid "source:geometry on a node"
+msgstr ""
+
+msgid "source:[addr:]postcode without addr:postcode"
+msgstr ""
+
+msgid "source:postal_code without addr:postcode"
+msgstr ""
+
+msgid "source:ele without ele"
+msgstr ""
+
+msgid "source:ref:INSEE without ref:INSEE"
+msgstr ""
+
+msgid "source:lit without lit"
+msgstr ""
+
+msgid "source:hgv without hgv"
+msgstr ""
+
+msgid "source:outline on a node"
+msgstr ""
+
+msgid "source:highway without highway"
+msgstr ""
+
+msgid "source:maxaxleload without maxaxleload"
+msgstr ""
+
+msgid "source:surface without surface"
+msgstr ""
+
+msgid "source:bridge without bridge"
msgstr ""
-msgid "bridge without highway/railway/waterway"
+msgid "source:old_name without old_name"
msgstr ""
-msgid "psv without highway/railway/waterway"
+msgid "source:bicycle without bicycle"
msgstr ""
-msgid "width without highway/railway/waterway/aeroway"
+msgid "source:designation without designation"
msgstr ""
-msgid "maxspeed without highway/railway/traffic_sign"
+msgid "source:[addr:]housenumber without addr:housenumber"
+msgstr ""
+
+msgid "source:height without height"
+msgstr ""
+
+msgid "source:lanes without lanes"
msgstr ""
msgid "religion without denomination"
@@ -19153,13 +20718,49 @@ msgid ""
"no wikipedia-language given, use ''wikipedia''=''language:page title''"
msgstr ""
-msgid "unkown language prefix in wikipedia tag"
+msgid "unknown language prefix in wikipedia tag"
msgstr ""
-msgid "Landsat"
-msgstr "Landsat"
+msgid "layer should be between -5 and 5"
+msgstr ""
+
+msgid "level should be numbers with optional .5 increments"
+msgstr ""
+
+msgid ""
+"height: meters is default; period is separator; if units, put space then unit"
+msgstr ""
-msgid "OSM Inspector: Redaction Bot"
+msgid ""
+"maxheight: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid ""
+"width: meters is default; period is separator; if units, put space then unit"
+msgstr ""
+
+msgid ""
+"maxwidth: meters is default; period is separator; if units, put space then "
+"unit"
+msgstr ""
+
+msgid "unusual maxspeed format"
+msgstr ""
+
+msgid "voltage should be in volts with no units/delimiter/spaces"
+msgstr ""
+
+msgid "unusual frequency specification"
+msgstr ""
+
+msgid "unusual train track gauge; use mm with no separator"
+msgstr ""
+
+msgid "unusual incline; use percentages/degrees or up/down"
+msgstr ""
+
+msgid "Landsat"
msgstr ""
msgid "Yahoo Sat"
@@ -19168,26 +20769,35 @@ msgstr ""
msgid "Bing Sat"
msgstr ""
+msgid "HDDM (Humanitarian OpenStreetMap)"
+msgstr ""
+
msgid "MapBox Satellite"
msgstr ""
msgid "MapQuest Open Aerial"
msgstr ""
+msgid "OpenStreetMap GPS Traces"
+msgstr ""
+
msgid "OpenStreetMap (Mapnik)"
-msgstr "OpenStreetMap (Mapnik)"
+msgstr ""
msgid "OpenStreetMap (Mapnik Black & White)"
msgstr ""
-msgid "Skobbler"
+msgid "skobbler"
+msgstr ""
+
+msgid "skobbler heatmap"
msgstr ""
msgid "OpenCycleMap"
-msgstr "OpenCycleMap"
+msgstr ""
msgid "MapQuest OSM"
-msgstr "MapQuest OSM"
+msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
@@ -19195,142 +20805,191 @@ msgstr ""
msgid "OpenStreetMap (German Style)"
msgstr ""
-msgid "Streets NRW Geofabrik.de"
-msgstr "Streets NRW Geofabrik.de"
+msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgstr ""
-msgid "Hike & Bike"
+msgid "osmfr"
msgstr ""
-msgid "OpenStreetMap (Sorbian Language)"
+msgid "AGRI black-and-white 2.5m"
msgstr ""
-msgid "OpenStreetMap (German Language)"
+msgid "Geoimage.at MaxRes"
msgstr ""
-msgid "OpenPT Map (overlay)"
+msgid "basemap.at"
msgstr ""
-msgid "Bavaria (2 m)"
+msgid "Graz: Basiskarte (base map)"
msgstr ""
-msgid "Hamburg (40 cm)"
+msgid "Tiris: DGM (Terrain model)"
msgstr ""
-msgid "Hamburg (DK5)"
+msgid "Tiris: DOM (Surface model)"
msgstr ""
-msgid "Geoimage.at MaxRes"
+msgid "Vienna: Mehrzweckkarte (general purpose)"
msgstr ""
-msgid "Graz: Basiskarte (base map)"
+msgid "Vienna: Beschriftungen (annotations)"
msgstr ""
-msgid "Tiris: DGM (Terrain model)"
+msgid "Vienna: Orthofoto (aerial image)"
msgstr ""
-msgid "Tiris: DOM (Surface model)"
+msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
-msgid "Vienna: Mehrzweckkarte (general purpose)"
+msgid "VoGIS: Flächenwidmungsplan"
msgstr ""
-msgid "Vienna: Beschriftungen (annotations)"
+msgid "VoGIS: DGM (Terrain model)"
msgstr ""
-msgid "Vienna: Orthofoto (aerial image)"
+msgid "VoGIS: DOM (Surface model)"
msgstr ""
-msgid "Kanton Aargau 25cm (AGIS 2011)"
+msgid "Geobase Hydrography"
msgstr ""
-msgid "Stadt Uster Orthophoto 2008 10cm"
+msgid "Geobase Roads"
msgstr ""
-msgid "Stadtplan Zürich"
+msgid "Canvec"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
+msgid "British Columbia Mosaic"
msgstr ""
-msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgid "Czech CUZK:KM"
msgstr ""
-msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgid "Czech UHUL:ORTOFOTO"
msgstr ""
-msgid "Canton de Génève 5cm (SITG 2011)"
+msgid "Fugro (Denmark)"
msgstr ""
-msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgid "Stevns (Denmark)"
msgstr ""
-msgid "Canton du Jura 50cm (RCJU 1998)"
+msgid "Vejmidte (Denmark)"
msgstr ""
-msgid "Canton de Fribourg 50cm (2005)"
+msgid "Estonia Basemap (Maaamet)"
msgstr ""
-msgid "Stadt Bern 10cm/25cm (2008)"
+msgid "Estonia Ortho (Maaamet)"
msgstr ""
-msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgid "Estonia Multi (Maaamet)"
msgstr ""
-msgid "Geobase Hydrography"
+msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
msgstr ""
-msgid "Geobase Roads"
+msgid "CRAIG - Moulins 2009 - 15 cm"
msgstr ""
-msgid "Canvec"
+msgid "CRAIG - Montluçon 2009 - 15 cm"
msgstr ""
-msgid "British Columbia Mosaic"
+msgid "CRAIG - Vichy 2009 - 15 cm"
msgstr ""
-msgid "MSR Maps Topo"
+msgid "CRAIG - Le Puy 2010 - 15 cm"
msgstr ""
-msgid "MSR Maps Urban"
+msgid "CRIGE PACA Alpes-Maritimes 2009 - 40 cm"
msgstr ""
-msgid "USGS Scanned Topographic Maps"
+msgid "Géobretagne - Brest 2010 - 10 cm"
msgstr ""
-msgid "USGS Large Scale Imagery"
+msgid "Géobretagne - Morbihan 2010"
msgstr ""
-msgid "OSM US TIGER 2012 Roads Overlay"
+msgid "Géolittoral - Orthophotos 2000"
msgstr ""
-msgid "Czech CUZK:KM"
-msgstr "捷克 CUZK:KM"
+msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgstr ""
-msgid "Czech UHUL:ORTOFOTO"
-msgstr "捷克 UHUL:ORTOFOTO"
+msgid "Géolittoral - Sentiers"
+msgstr ""
-msgid "7th Series (OS7)"
-msgstr "7th Series (OS7)"
+msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
+msgstr ""
-msgid "OS New Popular Edition historic"
+msgid "Toulouse - Orthophotoplan 2011"
msgstr ""
-msgid "OS OpenData StreetView"
+msgid "Toulouse - Orthophotoplan 2007"
msgstr ""
-msgid "OS OpenData Locator"
+msgid "Tours - Orthophotos 2008-2010"
msgstr ""
-msgid "Surrey Air Survey"
+msgid "Tours - Orthophotos 2008"
msgstr ""
-msgid "NLS - OS 6-inch Scotland 1842-82"
+msgid ""
+"Vercors - Réserve naturelle des Hauts-Plateaux du Vercors - Orthophotos 1999 "
+"- 1 m"
msgstr ""
-msgid "NLS - OS 1:25k 1st Series 1937-61"
+msgid "Streets NRW Geofabrik.de"
msgstr ""
-msgid "NLS - OS 1-inch 7th Series 1955-61"
+msgid "Hike & Bike"
+msgstr ""
+
+msgid "OpenStreetMap (Sorbian Language)"
+msgstr ""
+
+msgid "OpenStreetMap (German Language)"
+msgstr ""
+
+msgid "OpenPT Map (overlay)"
+msgstr ""
+
+msgid "Hamburg (40 cm)"
+msgstr ""
+
+msgid "Hamburg (DK5)"
+msgstr ""
+
+msgid "Bavaria (2 m)"
+msgstr ""
+
+msgid "Stuttgart (Luftbild)"
+msgstr ""
+
+msgid "Erlangen 2013 Luftbild (6,25 cm)"
+msgstr ""
+
+msgid "Erlangen 2011 Luftbild (5,0 cm)"
+msgstr ""
+
+msgid "Old map of Zwenkau - TK25 Messtischblatt (4739; 1906; PROJ.4-rect)"
+msgstr ""
+
+msgid "Old map of Pegau - TK25 Messtischblatt (4839; 1909; PROJ.4-rect)"
+msgstr ""
+
+msgid "Physical DE - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid "Physical DE:Harz - Physische Karte (Naturräume)"
+msgstr ""
+
+msgid ""
+"Physical DE:Harz - Overlay für Bing (z.B. Deckkraft zw. 20 und 50 Prozent "
+"nutzen)"
+msgstr ""
+
+msgid "Imagerie Drone (Haiti)"
msgstr ""
msgid "Ireland British War Office One-Inch 1941-43 GSGS 4136"
@@ -19355,7 +21014,7 @@ msgid "Sicily - Italy"
msgstr ""
msgid "PCN 2006 - Italy"
-msgstr "PCN 2006 - 義大利"
+msgstr ""
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
@@ -19369,46 +21028,49 @@ msgstr ""
msgid "20cm ortho - Coastline"
msgstr ""
-msgid "CRAIG - Auvergne 2009/2010 - 30 cm"
+msgid "ORT10LT (Lithuania)"
msgstr ""
-msgid "CRAIG - Moulins 2009 - 15 cm"
+msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
-msgid "CRAIG - Montluçon 2009 - 15 cm"
+msgid "Pangasinán/Bulacan (Phillipines HiRes)"
msgstr ""
-msgid "CRAIG - Vichy 2009 - 15 cm"
+msgid "ScanEx IRS"
msgstr ""
-msgid "CRAIG - Le Puy 2010 - 15 cm"
+msgid "ScanEx SPOT"
msgstr ""
-msgid "Géobretagne - Brest 2010 - 10 cm"
+msgid "Freemap.sk Car"
msgstr ""
-msgid "Géobretagne - Morbihan 2010"
+msgid "Freemap.sk Hiking"
msgstr ""
-msgid "Géolittoral - Orthophotos 2000"
+msgid "Freemap.sk Cyclo"
msgstr ""
-msgid "Géolittoral V2 - Orthophotos 2010-2012"
+msgid "Freemap.sk Ski"
msgstr ""
-msgid "Géolittoral - Sentiers"
+msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2011"
+msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
msgstr ""
-msgid "Toulouse - Orthophotoplan 2007"
+msgid "Slovakia EEA GMES Urban Atlas"
msgstr ""
-msgid "Tours - Orthophotos 2008-2010"
+msgid "Slovakia EEA CORINE 2006"
msgstr ""
-msgid "Tours - Orthophotos 2008"
+msgid "Slovakia Historic Maps"
+msgstr ""
+
+msgid "South Africa CD:NGI Aerial"
msgstr ""
msgid "Catastro Spain"
@@ -19429,89 +21091,149 @@ msgstr ""
msgid "IDEIB - Balearic Islands"
msgstr ""
-msgid "Estonia Basemap (Maaamet)"
+msgid "Kanton Aargau 25cm (AGIS 2011)"
msgstr ""
-msgid "Estonia Ortho (Maaamet)"
+msgid "Stadt Uster Orthophoto 2008 10cm"
msgstr ""
-msgid "Estonia Multi (Maaamet)"
+msgid "Stadtplan Zürich"
msgstr ""
-msgid "ORT10LT (Lithuania)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2007)"
msgstr ""
-msgid "Fugro (Denmark)"
+msgid "Kanton Solothurn 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Kanton Solothurn Infrarot 12.5cm (SOGIS 2011)"
+msgstr ""
+
+msgid "Canton de Génève 5cm (SITG 2011)"
+msgstr ""
+
+msgid "Canton de Neuchâtel 50cm (SITN 2006)"
+msgstr ""
+
+msgid "Canton du Jura 50cm (RCJU 1998)"
+msgstr ""
+
+msgid "Canton de Fribourg 50cm (2005)"
+msgstr ""
+
+msgid "Stadt Bern 10cm/25cm (2008)"
+msgstr ""
+
+msgid "HEIG-VD / Orthophoto Yverdon-les-Bains 25cm (2007)"
+msgstr ""
+
+msgid "Ville de Nyon - Orthophoto 2010 HD 5cm/pi"
+msgstr ""
+
+msgid "Cartoriviera - Orthophoto 2012"
+msgstr ""
+
+msgid "SIGIP - Orthophoto 2012"
+msgstr ""
+
+msgid "Lausanne - Orthophoto technique 2012"
+msgstr ""
+
+msgid "MSR Maps Topo"
+msgstr ""
+
+msgid "MSR Maps Urban"
+msgstr ""
+
+msgid "USGS Scanned Topographic Maps"
+msgstr ""
+
+msgid "USGS Large Scale Imagery"
msgstr ""
-msgid "Stevns (Denmark)"
+msgid "OSM US TIGER 2012 Roads Overlay"
msgstr ""
-msgid "Vejmidte (Denmark)"
+msgid "New & Misaligned TIGER Roads (TIGER 2013)"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "OSM - Tiger Edited Map"
msgstr ""
-msgid "ScanEx IRS"
+msgid "MassGIS L3 Parcels"
msgstr ""
-msgid "ScanEx SPOT"
+msgid "NC 2010 Orthoimagery"
msgstr ""
-msgid "Cambodia, Laos, Thailand, Vietnam bilingual"
+msgid "Ukraine - Orthophotomaps 2012"
msgstr ""
-msgid "Niger Delta Oct 2012 Landsat"
+msgid "7th Series (OS7)"
msgstr ""
-msgid "South Africa CD:NGI Aerial"
+msgid "OS New Popular Edition historic"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "OS OpenData StreetView"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid "OS OpenData Locator"
msgstr ""
-msgid "Freemap.sk Cyclo"
+msgid "Surrey Air Survey"
msgstr ""
-msgid "Freemap.sk Ski"
+msgid "NLS - OS 6-inch Scotland 1842-82"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2010-04)"
+msgid "NLS - OS 1:25k 1st Series 1937-61"
msgstr ""
-msgid "Katastrálna mapa Slovenska (KaPor, 2011-05)"
+msgid "NLS - OS 1-inch 7th Series 1955-61"
msgstr ""
-msgid "Slovakia EEA GMES Urban Atlas"
+msgid "OS 1:25k historic (OSM)"
msgstr ""
-msgid "Slovakia EEA CORINE 2006"
+msgid "OS Scottish Popular historic"
msgstr ""
-msgid "Slovakia Historic Maps"
+msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
-msgid "AGRI black-and-white 2.5m"
+msgid "OS Town Plans, Cupar 1854 (NLS)"
msgstr ""
-msgid "OSM - Tiger Edited Map"
+msgid "OSM Export"
msgstr ""
-msgid "OS 1:25k historic (OSM)"
+msgid "Export traffic data to SUMO network file."
msgstr ""
-msgid "OS Scottish Popular historic"
+msgid "SUMO Export"
msgstr ""
-msgid "Stuttgart (Luftbild)"
+msgid "Export"
msgstr ""
-msgid "2u"
-msgstr ""
+msgid "Port:"
+msgstr "連接埠："
+
+msgid "refresh the port list"
+msgstr "重新整理連接埠清單"
+
+msgid "Configure"
+msgstr "設定"
+
+msgid "Connection Error."
+msgstr "連線錯誤。"
+
+msgid "configure the connected DG100"
+msgstr "設定連接的 DG100"
+
+msgid "delete data after import"
+msgstr "匯入後删除資料"
msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV 檔案"
@@ -19714,6 +21436,18 @@ msgstr "顯示海拔設定檔"
msgid "Elevation Profile"
msgstr "海拔設定檔"
+msgid "Elevation Grid Layer (experimental!)"
+msgstr ""
+
+msgid "Shows elevation grid layer"
+msgstr ""
+
+msgid "Elevation Grid"
+msgstr ""
+
+msgid "No SRTM data"
+msgstr ""
+
msgid "Open the elevation profile window."
msgstr "開啟海拔設定檔視窗。"
@@ -19735,14 +21469,8 @@ msgstr "增益"
msgid "Time"
msgstr "時刻"
-msgid "Geoid"
-msgstr "Geoid"
-
-msgid "Automatic"
-msgstr "自動"
-
-msgid "Fixed value"
-msgstr "固定值"
+msgid "Tracks"
+msgstr "軌跡"
msgid "Elevation profile for track ''{0}''."
msgstr ""
@@ -20004,9 +21732,15 @@ msgstr "選擇不完整的地址"
msgid "Selects all addresses with incomplete data."
msgstr "選擇所有資料不完整的地址。"
+msgid "Use tag 'addr:street' or 'addr:place'"
+msgstr ""
+
msgid "House Number Editor"
msgstr ""
+msgid "House number increment:"
+msgstr ""
+
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "更新 {0} 個物件之多的屬性"
@@ -20027,6 +21761,9 @@ msgstr ""
msgid "Layer Properties"
msgstr "圖層屬性"
+msgid "Error while creating image layer: {0}"
+msgstr ""
+
msgid "Import image"
msgstr "匯入圖片"
@@ -20105,9 +21842,21 @@ msgstr ""
msgid "Current Selected Bug Info"
msgstr ""
+msgid "Prev OSMI bug"
+msgstr ""
+
+msgid "Next OSMI bug"
+msgstr ""
+
msgid "Osm Inspector Bugs"
msgstr ""
+msgid "OSM Inspector Bugs"
+msgstr ""
+
+msgid "Selected Bug Info"
+msgstr ""
+
msgid "Handy Address Interpolation Functions"
msgstr "便利住址填寫功能"
@@ -20192,8 +21941,8 @@ msgstr "預測的奇數地址"
msgid "Expected even numbers for addresses"
msgstr "預測的偶數地址"
-msgid "Expected valid number for address increment"
-msgstr "預測地址增加的數字"
+msgid "Expected valid number for increment"
+msgstr ""
msgid "Country code must be 2 letters"
msgstr "國碼只能使用 2 個字元"
@@ -20497,15 +22246,6 @@ msgstr "門牌號碼："
msgid "Street Name:"
msgstr "街道名稱："
-msgid "Increment"
-msgstr "遞增"
-
-msgid "Decrement"
-msgstr "遞減"
-
-msgid "Numbers:"
-msgstr "號碼："
-
msgid "Big buildings mode"
msgstr "大型建築模式"
@@ -20688,6 +22428,9 @@ msgstr "在進行地理參照時停用圖片剪裁。"
msgid "Use \"Tableau d''assemblage\""
msgstr ""
+msgid "Replace grey shades by white color only"
+msgstr ""
+
msgid "Select first WMS layer in list."
msgstr "先在清單中選取一個 WMS 圖層。"
@@ -20706,12 +22449,6 @@ msgstr ""
msgid "100 m"
msgstr ""
-msgid "high"
-msgstr ""
-
-msgid "medium"
-msgstr ""
-
msgid "symbol"
msgstr "符號"
@@ -20852,6 +22589,9 @@ msgid ""
"Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."
msgstr ""
+msgid "Replace greyscale by white color (smaller files and memory usage)."
+msgstr ""
+
msgid "Display crosspieces:"
msgstr ""
@@ -20869,6 +22609,9 @@ msgstr "如果抓取時有多個圖層則自動選擇第一個 WMS 圖層。"
msgid "Enable this to use the tag \"add:street\" on nodes."
msgstr "啟用這個選項來使用節點的 \"add:street\" 標籤。"
+msgid "Unexpected file extension. {0}"
+msgstr ""
+
msgid "Add \"source=...\" to elements?"
msgstr "將「source=...」加入元件？"
@@ -20953,52 +22696,6 @@ msgstr ""
"這張圖片包含地理參照資料。\n"
"您是否想要使用它們？"
-msgid ""
-"Click first corner for image cropping\n"
-"(two points required)"
-msgstr ""
-"點選剪裁圖片的第一個角落\n"
-"(需要兩個點)"
-
-msgid "Image cropping"
-msgstr "圖片剪裁"
-
-msgid "Click second corner for image cropping"
-msgstr "點選剪裁圖片的第二個角落"
-
-msgid ""
-"Click first Lambert crosspiece for georeferencing\n"
-"(two points required)"
-msgstr ""
-
-msgid "Image georeferencing"
-msgstr "圖片地理參照"
-
-msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
-
-msgid ""
-"Do you want to cancel completely\n"
-"or just retry "
-msgstr ""
-"您是否想要完全取消或是\n"
-"要再試一次 "
-
-msgid "Enter cadastre east,north position"
-msgstr "輸入 cadastre 東,北 方位置"
-
-msgid "(Warning: verify north with arrow !!)"
-msgstr "(警告：檢驗有箭頭的北方！！)"
-
-msgid "East"
-msgstr "東"
-
-msgid "I use the mouse"
-msgstr "我使用滑鼠"
-
-msgid "Set {0} Lambert coordinates"
-msgstr "設定 {0} 蘭勃特坐標"
-
msgid "Load layer from cache"
msgstr ""
@@ -21051,20 +22748,80 @@ msgstr "加入新的圖層"
msgid "Open Cadastre Preferences"
msgstr ""
+msgid "Refine georeferencing"
+msgstr ""
+
+msgid "Improve georeferencing (only raster images)"
+msgstr ""
+
msgid "Reset cookie"
msgstr "重設 cookie"
msgid "Get a new cookie (session timeout)"
msgstr "取得新的 cookie（作業階段逾時）"
-msgid "Save image as PNG"
+msgid "Save image as..."
msgstr ""
msgid "PNG files (*.png)"
msgstr "PNG 檔案 (*.png)"
-msgid "Export as PNG format (only raster images)"
-msgstr "匯出為 PNG 格式 (只有點陣圖)"
+msgid "GeoTiff files (*.tif)"
+msgstr ""
+
+msgid "Export image (only raster images)"
+msgstr ""
+
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"點選剪裁圖片的第一個角落\n"
+"(需要兩個點)"
+
+msgid "Image cropping"
+msgstr "圖片剪裁"
+
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+msgid "Image georeferencing"
+msgstr "圖片地理參照"
+
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"您是否想要完全取消或是\n"
+"要再試一次 "
+
+msgid ""
+"Ooops. I failed to catch all coordinates\n"
+"correctly. Retry please."
+msgstr ""
+
+msgid "Enter cadastre east,north position"
+msgstr "輸入 cadastre 東,北 方位置"
+
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(警告：檢驗有箭頭的北方！！)"
+
+msgid "East"
+msgstr "東"
+
+msgid "I use the mouse"
+msgstr "我使用滑鼠"
+
+msgid "Set {0} Lambert coordinates"
+msgstr "設定 {0} 蘭勃特坐標"
+
+msgid "Click second corner for image cropping"
+msgstr "點選剪裁圖片的第二個角落"
+
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
msgid "Adjust WMS"
msgstr "調整 WMS"
@@ -21091,8 +22848,11 @@ msgstr "WMS 圖層 ({0})，已載入 {1} 個拼貼"
msgid "Is not vectorized."
msgstr "並非向量化的。"
-msgid "Raster size: {0}"
-msgstr "點陣大小：{0}"
+msgid "Bounding box: {0}"
+msgstr ""
+
+msgid "Image size (px): {0}/{1}"
+msgstr ""
msgid "Is vectorized."
msgstr "是向量化的。"
@@ -21143,7 +22903,7 @@ msgstr "從清單中刪除選取的配置。"
msgid "Color Schemes"
msgstr "顏色配置"
-msgid "Adress"
+msgid "Address"
msgstr ""
msgid "Split area"
@@ -21190,6 +22950,9 @@ msgstr "沿線下載"
msgid "Please select 1 or more ways to download along"
msgstr "請選擇 1 或多個路徑以沿線下載"
+msgid "Download from OSM along selected ways"
+msgstr ""
+
msgid "{0} intermediate nodes to download."
msgstr "下要載 {0} 個中間的節點。"
@@ -21265,6 +23028,71 @@ msgstr "新增工具..."
msgid "Install"
msgstr "安裝"
+msgid "Public"
+msgstr ""
+
+msgid "Could not get server response, check logs"
+msgstr ""
+
+msgid "Failed to login as {0}:"
+msgstr ""
+
+msgid "The server did not return user ID"
+msgstr ""
+
+msgid "Failed to send message:"
+msgstr ""
+
+msgid "Failed to get messages as {0}:"
+msgstr ""
+
+msgid "GeoChat"
+msgstr ""
+
+msgid "Open GeoChat panel"
+msgstr ""
+
+msgid "Zoom in to see messages"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Enable autologin"
+msgstr ""
+
+msgid "{0} user"
+msgid_plural "{0} users"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "not logged in"
+msgstr ""
+
+msgid "User {0} has left"
+msgstr ""
+
+msgid "User {0} is mapping nearby"
+msgstr ""
+
+msgid "Users mapping nearby:"
+msgstr ""
+
+msgid "Private chat"
+msgstr ""
+
+msgid "Close tab"
+msgstr ""
+
+msgid "Logout"
+msgstr ""
+
+msgid "Clear log"
+msgstr ""
+
+msgid "Show users on map"
+msgstr ""
+
msgid "Position only"
msgstr "只有位置"
@@ -21299,32 +23127,14 @@ msgid "Disable data logging if speed falls below"
msgstr "停用資料記錄速限"
msgid "Disable data logging if distance falls below"
-msgstr "停用資料記錄距離"
-
-msgid "Unknown logFormat"
-msgstr "不明的記錄格式"
-
-msgid "Port:"
-msgstr "連接埠："
-
-msgid "refresh the port list"
-msgstr "重新整理連接埠清單"
+msgstr "停用資料記錄距離"
-msgid "Configure"
-msgstr "設定"
+msgid "Unknown logFormat"
+msgstr "不明的記錄格式"
msgid "Configure Device"
msgstr "設定裝置"
-msgid "Connection Error."
-msgstr "連線錯誤。"
-
-msgid "configure the connected DG100"
-msgstr "設定連接的 DG100"
-
-msgid "delete data after import"
-msgstr "匯入後删除資料"
-
msgid "Importing data from device."
msgstr "從裝置匯入資料"
@@ -21724,6 +23534,9 @@ msgstr ""
msgid "edit bounds for selected defaults"
msgstr ""
+msgid "Download imagery XML bounds"
+msgstr ""
+
msgid ""
"Validating error in file {0}:\n"
"{1}\n"
@@ -21912,22 +23725,22 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
msgid "Adjust imagery"
-msgstr "調整圖片"
+msgstr ""
msgid "Adjust the position of the selected imagery layer"
-msgstr "調整選取圖片圖層的位置"
+msgstr ""
msgid "Please select the imagery layer to adjust."
-msgstr "請選擇要調整的圖片圖層。"
+msgstr ""
msgid "Start adjusting"
-msgstr "開始調整"
+msgstr ""
msgid "There are currently no imagery layer to adjust."
-msgstr "沒有要調整的圖片圖層。"
+msgstr ""
msgid "No layers to adjust"
-msgstr "沒有要調整的圖層"
+msgstr ""
msgid "Normal"
msgstr "一般"
@@ -21971,12 +23784,6 @@ msgstr "匯入的圖片"
msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
msgstr "圖片檔案 (*.jpg, *.jpeg, *.png, *.gif)"
-msgid "Open images with ImageWayPoint"
-msgstr "以 ImageWayPoing 開啟圖片"
-
-msgid "Load set of images as a new layer."
-msgstr "將多組圖片載入為新的圖層。"
-
msgid "Import vector graphics"
msgstr "匯入向量圖形"
@@ -21986,18 +23793,15 @@ msgstr "縮放："
msgid "unit(s) = "
msgstr "單位 = "
-msgid "Import..."
-msgstr "匯入..."
-
-msgid "Import vector graphics."
-msgstr "匯入向量圖形。"
-
-msgid "SVG Drawings (*.svg)"
-msgstr "SVG 繪圖 (*.svg)"
-
msgid "Importing..."
msgstr "正在匯入..."
+msgid "SVG files [ImportVec plugin] (*.svg)"
+msgstr ""
+
+msgid "Please open or create data layer before importing"
+msgstr ""
+
msgid "InfoMode"
msgstr ""
@@ -22361,9 +24165,6 @@ msgstr "自動置中"
msgid "Continuously center the LiveGPS layer to current position."
msgstr "持續將 LiveGPS 圖層置中到目前的位置。"
-msgid "LiveGPS"
-msgstr "LiveGPS"
-
msgid "Open MapDust"
msgstr "開啟 MapDust"
@@ -22418,9 +24219,26 @@ msgstr ""
msgid "Merge Overlap (combine)"
msgstr ""
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr "<html>以角色為基礎的關係成員會複製到所有的新路徑。<br>必要時您應該檢驗並修正它。</html>"
+
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr "<html>將關係成員複製到所有的新路徑。<br>您應該在必要時才檢驗這個項目並修正它。</html>"
+
msgid "Split way"
msgstr ""
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>輸入標籤鍵值，例如 <strong><tt>fixme</tt></strong></html>"
+
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr "<html>輸入標籤數值，例如 <strong><tt>check members</tt></strong></html>"
+
msgid "Michigan Left"
msgstr "密西根左轉"
@@ -22462,6 +24280,15 @@ msgstr ""
msgid "XAPI query: "
msgstr ""
+msgid "Download from Overpass API ..."
+msgstr ""
+
+msgid "Download map data from Overpass API server."
+msgstr ""
+
+msgid "Overpass query: "
+msgstr ""
+
msgid "Select OSM mirror URL"
msgstr "選取 OSM 鏡射網址"
@@ -22474,15 +24301,6 @@ msgstr ""
msgid "Enforce meta data"
msgstr ""
-msgid "Convert to multipolygon"
-msgstr "轉換為多重多邊形"
-
-msgid "Convert to multipolygon."
-msgstr "轉換為多重多邊形。"
-
-msgid "One of the selected ways is already part of another multipolygon."
-msgstr "選取的路徑中之一已經是另一個多重多邊形的一部分。"
-
msgid "About Plugin"
msgstr "關於外掛程式"
@@ -22617,9 +24435,6 @@ msgstr ""
msgid "Split this data by neighbourhood (admin_level=11)."
msgstr ""
-msgid "Open Data"
-msgstr ""
-
msgid "CSV files"
msgstr ""
@@ -22644,12 +24459,21 @@ msgstr ""
msgid "Zip Files"
msgstr ""
+msgid "7Zip Files"
+msgstr ""
+
msgid "OpenData XML files"
msgstr ""
+msgid "Download open data"
+msgstr ""
+
msgid "License URL not available: {0}"
msgstr ""
+msgid "OpenData preferences"
+msgstr ""
+
msgid "License Agreement"
msgstr ""
@@ -22798,6 +24622,9 @@ msgstr ""
msgid "File to load"
msgstr ""
+msgid "Reading 7Zip file..."
+msgstr ""
+
msgid "Reading Zip file..."
msgstr ""
@@ -22814,6 +24641,17 @@ msgstr ""
msgid "Try lenient method"
msgstr ""
+msgid ""
+"Unable to detect Coordinate Reference System.\n"
+"Would you like to fallback to ESPG:4326 (WGS 84) ?"
+msgstr ""
+
+msgid "Warning: CRS not found"
+msgstr ""
+
+msgid "Unable to detect CRS !"
+msgstr ""
+
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -23049,13 +24887,6 @@ msgstr "<html>選取的資料包含來自 OpenStreetBugs 的資料。<br>您不
msgid "An error occurred: {0}"
msgstr "發生一個錯誤：{0}"
-msgid "Couldn''t create new bug. Result: {0}"
-msgstr "無法建立新的錯誤報告。結果：{0}"
-
-msgid ""
-"Header contains several values and cannot be mapped to a single string"
-msgstr "標頭包含許多數值而且不能對映為單一字串"
-
msgid "Process queue"
msgstr "程序佇列"
@@ -23108,18 +24939,6 @@ msgstr "<html>確定將這個議題標記為「已解決」？<br><br>您也許
msgid "Close: "
msgstr "關閉： "
-msgid "New issue"
-msgstr "新增議題"
-
-msgid "Create issue"
-msgstr "建立議題"
-
-msgid "Describe the problem precisely"
-msgstr "明確的描述此問題"
-
-msgid "Create: "
-msgstr "建立： "
-
msgid "Open in browser"
msgstr ""
@@ -23177,6 +24996,9 @@ msgstr "Firefox 可執行檔"
msgid "OSM Server Files pbf compressed"
msgstr ""
+msgid "Download PBF"
+msgstr ""
+
msgid "Invalid changeset id: {0}"
msgstr ""
@@ -23384,9 +25206,6 @@ msgstr "匯入 PDF 檔案。"
msgid "Import PDF"
msgstr "匯入 PDF"
-msgid "Import PDf file"
-msgstr "匯入 PDF 檔案"
-
msgid " {0} objects so far"
msgstr " {0} 個物件"
@@ -23466,8 +25285,26 @@ msgstr "測試失敗：無法讀取 mtime。"
msgid "Test failed: Could not write mtime."
msgstr "測試失敗：無法寫入 mtime。"
-msgid "PicLayer"
-msgstr "PicLayer"
+msgid "Adjust photos"
+msgstr ""
+
+msgid "Move and position photos"
+msgstr ""
+
+msgid "Click+drag photo or shift+click to position photo."
+msgstr ""
+
+msgid "Please load some photos."
+msgstr ""
+
+msgid "Toggle the image thumbnail preview"
+msgstr ""
+
+msgid "New layer for untagged images"
+msgstr ""
+
+msgid "Untagged Images"
+msgstr ""
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -23620,6 +25457,9 @@ msgstr "剪貼簿中沒有東西"
msgid "The clipboard data is not an image"
msgstr "剪貼簿資料不是圖片"
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "警告：無法處理 zip 檔案「{0}」。例外為：{1}"
+
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -23641,6 +25481,9 @@ msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+msgid "Download Osmosis poly"
+msgstr ""
+
msgid "Reading polygon filter file..."
msgstr ""
@@ -23678,7 +25521,7 @@ msgid "Print the Map"
msgstr ""
msgid "Printer"
-msgstr ""
+msgstr "印表機"
msgid "Media"
msgstr ""
@@ -23687,7 +25530,7 @@ msgid "Orientation"
msgstr ""
msgid "Printer settings"
-msgstr ""
+msgstr "印表機設定"
msgid "Scale"
msgstr ""
@@ -23934,9 +25777,6 @@ msgstr ""
msgid "Create Stops from GPX"
msgstr ""
-msgid "Tracks"
-msgstr "軌跡"
-
msgid "Tracks in this GPX file:"
msgstr ""
@@ -24005,9 +25845,6 @@ msgstr "指定角色"
msgid "Change relation member roles to {0}"
msgstr "將關係成員角色改變為 {0}"
-msgid "Change multipolygon creation settings"
-msgstr "改變多重多邊形建立設定值"
-
msgid "Create administrative boundary relations"
msgstr ""
@@ -24134,9 +25971,6 @@ msgstr ""
msgid "Way without ''inner'' or ''outer'' role found"
msgstr ""
-msgid "Restart JOSM"
-msgstr "重新啟動 JOSM"
-
msgid "Revert changeset fully"
msgstr "還原整個變更組合"
@@ -24158,6 +25992,9 @@ msgstr ""
msgid "Reverted changeset"
msgstr ""
+msgid "It is not allowed to revert changeset from {0}"
+msgstr ""
+
msgid "Missing merge target for {0} with id {1}"
msgstr "缺少 id {1} {0} 的合併目標"
@@ -24190,15 +26027,31 @@ msgstr ""
msgid "Downloading changeset"
msgstr ""
+msgid "See {0}"
+msgstr ""
+
msgid "Revert changeset #{0}"
msgstr ""
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的起始元素「{0}」。正在略過。"
+
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的結尾元素「{0}」。正在略過。"
+
msgid "Road Sign Plugin"
msgstr "路標外掛程式"
msgid "signs"
msgstr ""
+msgid "Change Properties"
+msgstr "改變屬性"
+
msgid "Country preset:"
msgstr ""
@@ -24208,6 +26061,9 @@ msgstr ""
msgid "Show a selection of the most useful signs"
msgstr ""
+msgid "Spain"
+msgstr ""
+
msgid "Germany"
msgstr ""
@@ -24310,9 +26166,6 @@ msgstr "路線規畫外掛程式偏好設定"
msgid "Configure routing preferences."
msgstr "設定路線規畫偏好設定"
-msgid "Highway type"
-msgstr "公路類型"
-
msgid "Speed (Km/h)"
msgstr "速限 (Km/h)"
@@ -24428,6 +26281,9 @@ msgstr ""
msgid "Save SDS file"
msgstr ""
+msgid "Could not back up file. Exception is: {0}"
+msgstr "無法備份檔案。例外為：{0}"
+
msgid "Simplify Area"
msgstr "簡化區域"
@@ -24488,19 +26344,19 @@ msgstr ""
msgid "Merge Nearby Nodes Threshold"
msgstr ""
-msgid "Online Help"
-msgstr "線上求助"
+msgid "SeaMap Editor"
+msgstr "海圖編輯器"
-msgid "Load"
-msgstr "載入"
+msgid "No object selected"
+msgstr ""
-msgid "invisible"
-msgstr "隱藏"
+msgid "Seamark Inspector"
+msgstr ""
-msgid "SeaMap Editor"
-msgstr "海圖編輯器"
+msgid "Select only one object"
+msgstr ""
-msgid "Export"
+msgid "Select a map object"
msgstr ""
msgid "AutoSave LiveData"
@@ -24638,6 +26494,9 @@ msgstr "刪除輪廓路徑"
msgid "Street name: "
msgstr "街道名稱： "
+msgid "Building: "
+msgstr ""
+
msgid "Even/Odd"
msgstr "奇數/偶數"
@@ -24713,6 +26572,95 @@ msgstr "追蹤器。"
msgid "Tracer building"
msgstr "描出建築物"
+msgid "Tracer2"
+msgstr ""
+
+msgid "Tracer2."
+msgstr ""
+
+msgid "Change tag {0} to {1}"
+msgstr ""
+
+msgid ""
+"The Tracer2Server version isn''t compatible with this plugin. Please "
+"download version {0} from\n"
+"{1}."
+msgstr ""
+
+msgid ""
+"New version of Tracer2Server is available. For best results please upgrade "
+"to version {0}."
+msgstr ""
+
+msgid "No set of parameter is active!"
+msgstr ""
+
+msgid "Select parameter"
+msgstr ""
+
+msgid "Tracer2: add a way with {0} points"
+msgstr ""
+
+msgid "Tracer2: modify way to {0} points"
+msgstr ""
+
+msgid "Tracer2 error"
+msgstr ""
+
+msgid "Parameter for server request"
+msgstr ""
+
+msgid "Tile size:"
+msgstr ""
+
+msgid "Resolution:"
+msgstr ""
+
+msgid "Mode:"
+msgstr ""
+
+msgid "Threshold:"
+msgstr ""
+
+msgid "Points per circle:"
+msgstr ""
+
+msgid "Tag:"
+msgstr ""
+
+msgid "Preferred values:"
+msgstr ""
+
+msgid "Delete parameter \"{0}\"?"
+msgstr ""
+
+msgid "Add new"
+msgstr ""
+
+msgid "Add predefined"
+msgstr ""
+
+msgid "Select predefined parameter"
+msgstr ""
+
+msgid "Modify list of parameter for server request."
+msgstr ""
+
+msgid "Parameter:"
+msgstr ""
+
+msgid ""
+"Tracer2Server isn''t running. Please start the Server.\n"
+"If you don''t have the server, please download it from\n"
+"{0}."
+msgstr ""
+
+msgid "Tracer2Server hasn''t found anything."
+msgstr ""
+
+msgid "Tracer2Server has detected an error."
+msgstr ""
+
msgid "GPG"
msgstr "GPG"
@@ -24728,9 +26676,6 @@ msgstr "將簽章匯出為 XML..."
msgid "Save Signatures file"
msgstr "儲存簽章檔案"
-msgid "Download OSM"
-msgstr "下載 OSM"
-
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
msgstr "從 OSM 伺服器取得所有參照但沒有實際顯現的 OSM 物件。"
@@ -24754,6 +26699,9 @@ msgstr "從伺服器載入物件"
msgid "Download signed data"
msgstr "下載簽署的資料"
+msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
+msgstr "警告：忽略例外，因為工作已被取消。例外：{0}"
+
msgid ""
"Generating new Keypair.\n"
"Collecting randomness..."
@@ -24914,9 +26862,6 @@ msgstr "簽署已取消！"
msgid "Please give a tolerance in meters"
msgstr ""
-msgid "Accuracy"
-msgstr "準確度"
-
msgid "Select as much as you like:"
msgstr "選擇您想要的："
@@ -25546,19 +27491,19 @@ msgstr "取消刪除物件..."
msgid "Undelete object by id"
msgstr "依 ID 取消刪除物件"
-msgid "Select if the data should be added into a new layer"
-msgstr "如果資料要加入到新的圖層裡請選擇此項"
+msgid "Undelete Object"
+msgstr "取消刪除物件"
+
+msgid "Undelete object"
+msgstr "取消刪除物件"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
msgstr ""
-msgid "Undelete Object"
-msgstr "取消刪除物件"
-
-msgid "Undelete object"
-msgstr "取消刪除物件"
+msgid "Select if the data should be added into a new layer"
+msgstr "如果資料要加入到新的圖層裡請選擇此項"
msgid "Start undeleting"
msgstr "開始取消刪除"
@@ -25566,18 +27511,6 @@ msgstr "開始取消刪除"
msgid "Close dialog and cancel"
msgstr "關閉對話盒並取消"
-msgid "Will get {0}"
-msgstr "會得到 {0}"
-
-msgid "Looking for {0}"
-msgstr "尋找 {0}"
-
-msgid "Found {0}"
-msgstr "找到 {0}"
-
-msgid "More tools"
-msgstr "更多工具"
-
msgid "Add nodes at intersections"
msgstr ""
@@ -25620,15 +27553,6 @@ msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
msgstr ""
-msgid "Paste tags [testing]"
-msgstr ""
-
-msgid "Apply tags parsed from buffer to all selected items.."
-msgstr ""
-
-msgid "Paste tags"
-msgstr ""
-
msgid "Split Object"
msgstr "分割物件"
@@ -25749,18 +27673,6 @@ msgstr ""
msgid "Custom URL configuration"
msgstr ""
-msgid "Key is too long:"
-msgstr ""
-
-msgid "Suspiciouns characters in tag:"
-msgstr ""
-
-msgid "Value too long (max 255 characters):"
-msgstr ""
-
-msgid "Ingore warnings"
-msgstr ""
-
msgid "Lat Lon tool"
msgstr ""
@@ -25938,9 +27850,6 @@ msgstr "取消選取節點"
msgid "Removes all nodes from selection"
msgstr "從選擇區域移除所有的節點"
-msgid "Video"
-msgstr "影片類"
-
msgid "Import Video"
msgstr "匯入影片"
@@ -26067,8 +27976,8 @@ msgstr "循環"
msgid "mute"
msgstr "靜音"
-msgid "Scanned Map..."
-msgstr "掃描的地圖..."
+msgid "Walking Papers Scanned Map"
+msgstr ""
msgid ""
"Display a map that was previously scanned and uploaded to walking-papers.org"
@@ -26087,9 +27996,6 @@ msgstr "Walking Papers：{0}"
msgid "Walking Papers layer ({0}) in zoom {1}"
msgstr "Walking Papers 圖層 ({0})，於縮放 {1}"
-msgid "Walking Papers"
-msgstr "Walking Papers"
-
msgid "Way Download"
msgstr "路徑下載"
@@ -26224,9 +28130,6 @@ msgstr ""
msgid "Enter the Wikipedia language"
msgstr ""
-msgid "Add Tag"
-msgstr ""
-
msgid ""
"Adds a ''wikipedia'' tag corresponding to this article to the selected "
"objects"
diff --git a/images/bug.png b/images/bug.png
new file mode 100644
index 0000000..9a28bbf
Binary files /dev/null and b/images/bug.png differ
diff --git a/images/dialogs/autoscale/problem.png b/images/dialogs/autoscale/problem.png
new file mode 100644
index 0000000..57f84b0
Binary files /dev/null and b/images/dialogs/autoscale/problem.png differ
diff --git a/images/icons/amenity_library.n.16.png b/images/icons/amenity_library.n.16.png
new file mode 100644
index 0000000..cbc2ce3
Binary files /dev/null and b/images/icons/amenity_library.n.16.png differ
diff --git a/images/icons/emergency_hydrant.n.16.png b/images/icons/emergency_hydrant.n.16.png
new file mode 100644
index 0000000..c214fdf
Binary files /dev/null and b/images/icons/emergency_hydrant.n.16.png differ
diff --git a/images/icons/food_nightclub.n.16.png b/images/icons/food_nightclub.n.16.png
new file mode 100644
index 0000000..d961d71
Binary files /dev/null and b/images/icons/food_nightclub.n.16.png differ
diff --git a/images/icons/office_blue.png b/images/icons/office_blue.png
new file mode 100644
index 0000000..98f593f
Binary files /dev/null and b/images/icons/office_blue.png differ
diff --git a/images/icons/office_pink.png b/images/icons/office_pink.png
new file mode 100644
index 0000000..645ba22
Binary files /dev/null and b/images/icons/office_pink.png differ
diff --git a/images/icons/shopping_department_store.n.16.png b/images/icons/shopping_department_store.n.16.png
new file mode 100644
index 0000000..9932087
Binary files /dev/null and b/images/icons/shopping_department_store.n.16.png differ
diff --git a/images/java.png b/images/java.png
new file mode 100644
index 0000000..6793915
Binary files /dev/null and b/images/java.png differ
diff --git a/images/misc/check_large.png b/images/misc/check_large.png
new file mode 100644
index 0000000..823fa80
Binary files /dev/null and b/images/misc/check_large.png differ
diff --git a/images/misc/grey_x.png b/images/misc/grey_x.png
new file mode 100644
index 0000000..44743fe
Binary files /dev/null and b/images/misc/grey_x.png differ
diff --git a/images/presets/aed.svg b/images/presets/aed.svg
new file mode 100644
index 0000000..8ea54b0
--- /dev/null
+++ b/images/presets/aed.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Creator: CorelDRAW -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:odm="http://product.corel.com/CGS/11/cddns/" xml:space="preserve" width="600px" height="600px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd"
+ viewBox="0 0 600 600">
+ <defs>
+ <style type="text/css">
+ <![CDATA[
+ .fil0 {fill:#FFFFFF}
+ .fil1 {fill:#009A3B}
+ ]]>
+ </style>
+ </defs>
+ <g id="Ebene 1">
+ <rect fill="#FFFFFF" x="0" y="0" width="600" height="600"/>
+ <path fill="#009A3B" d="M0 0l300 0 300 0 0 300 0 300 -300 0 -300 0 0 -600zm259 553c21,-11 49,-30 77,-55 30,-25 53,-49 74,-75 27,-32 46,-65 51,-90 2,-13 2,-36 0,-50 -5,-27 -16,-52 -33,-72 -20,-25 -48,-40 -75,-41 -19,-1 -37,3 -55,12 -15,7 -26,14 -38,26 -4,5 -8,8 -8,8 0,0 -4,-3 -8,-7 -19,-19 -41,-32 -65,-37 -32,-7 -60,0 -86,20 -27,23 -47,60 -52,98 -2,16 -1,35 3,48 9,35 38,79 85,125 38,38 83,73 115,90 4,1 7,3 8,3 0,0 3,-1 7,-3zm253 -393l0 -28 29 -1 30 0 0 -24 0 -24 -29 0c-22,0 -29,-1 -30,-1 0,-1 0,-8 0,-29l0 -29 -27 0 -26 0 0 28c0,25 0,29 -1,30 0,1 -4,1 -30,1l-29 0 0 24 0 24 30 0c26,0 29,0 30,1 0,1 0,8 0,29l0 27 26 0 26 0 1 -28z"/>
+ <path fill="#009A3B" d="M201 479c-1,-1 10,-26 24,-57 13,-31 24,-57 24,-58l1 -1 -35 0c-31,-1 -34,-1 -34,-2 0,0 21,-26 56,-68 31,-37 57,-68 58,-69 2,-2 3,-2 3,-1 0,1 -10,25 -22,54 -12,30 -22,54 -22,54 0,1 6,1 33,1 23,0 32,1 32,1 0,1 -116,145 -117,146 -1,0 -1,0 -1,0z"/>
+ </g>
+</svg>
diff --git a/images/presets/apple.png b/images/presets/apple.png
new file mode 100644
index 0000000..926eb69
Binary files /dev/null and b/images/presets/apple.png differ
diff --git a/images/presets/bicycle_road.svg b/images/presets/bicycle_road.svg
new file mode 100644
index 0000000..7ebd3ae
--- /dev/null
+++ b/images/presets/bicycle_road.svg
@@ -0,0 +1,121 @@
+<?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"
+ version="1.0"
+ width="760"
+ height="760"
+ id="svg2"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="bicycle_road_sign_icon.svg">
+ <title
+ id="title3003">bicycle_road_sign_icon</title>
+ <metadata
+ id="metadata28">
+ <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>bicycle_road_sign_icon</dc:title>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>skyper</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </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>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1021"
+ id="namedview26"
+ showgrid="false"
+ inkscape:zoom="0.62105263"
+ inkscape:cx="-369.68442"
+ inkscape:cy="327.45704"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4" />
+ <path
+ inkscape:connector-curvature="0"
+ id="rect2841"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.01799999999999979;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0;opacity:1;stroke-dasharray:none"
+ d="m 45.824811,3.3417118 667.440239,0 c 17.26431,0 44.40426,25.3658182 44.40426,44.6040572 l 0,663.062641 c 0,17.56106 -26.23171,45.64977 -47.01218,45.64977 l -662.224403,0 c -16.898243,0 -44.6781525,-25.29652 -44.6781525,-37.91916 l 0,-672.469767 c 0,-19.094699 22.7368545,-42.9275412 42.0702365,-42.9275412 z" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path1934"
+ style="fill:none;stroke:#000000;stroke-width:17;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
+ d="m 25.443662,52.632534 0,658.329506 c 0,15.81111 15.542175,24.19269 27.474772,24.19269 l 657.360006,-0.25172 c 11.21703,0 24.66493,-13.41694 24.66493,-25.92349 l 0,-654.891497 c 0.17207,-19.416771 -15.69419,-29.40446 -26.88735,-29.40446 l -654.202941,0.25171 c -19.69216,0 -28.409417,14.141544 -28.409417,27.697261 z" />
+ <g
+ id="g3093"
+ transform="translate(-0.29929775,60.174376)">
+ <path
+ d="m 620.29687,319.82557 a 239.28563,239.28563 0 0 1 -478.57126,0 239.28563,239.28563 0 1 1 478.57126,0 z"
+ style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path1882"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g12681">
+ <circle
+ cx="215"
+ cy="409"
+ r="161"
+ transform="matrix(0.404263,0,0,0.404263,177.6268,199.8607)"
+ style="fill:none;stroke:#ffffff;stroke-width:40px;stroke-opacity:1"
+ id="circle11777"
+ sodipodi:cx="215"
+ sodipodi:cy="409"
+ sodipodi:rx="161"
+ sodipodi:ry="161"
+ d="m 376,409 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
+ <circle
+ cx="790"
+ cy="406"
+ r="161"
+ transform="matrix(0.404263,0,0,0.404263,177.6268,199.8607)"
+ style="fill:none;stroke:#ffffff;stroke-width:40px;stroke-opacity:1"
+ id="circle11779"
+ sodipodi:cx="790"
+ sodipodi:cy="406"
+ sodipodi:rx="161"
+ sodipodi:ry="161"
+ d="m 951,406 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
+ <path
+ d="m 351.25144,206.11348 c -53.59172,0.52234 -44.50307,-5.53676 -73.33604,87.12573 -23.48869,74.03725 -20.93021,65.96322 -21.05305,71.15653 -0.0861,4.03463 3.17077,7.23353 7.26337,7.50734 8.51119,-0.86058 4.93119,0.9205 34.43938,-90.71243 107.82185,113.74166 67.3698,95.29738 125.39558,97.60727 76.26112,-0.73127 82.45951,3.96976 83.3649,-7.20825 -0.10447,-3.79564 -1.88041,-6.0591 -54.21853,-122.54013 l 5.01443,-13.78968 17.2371,-0.3134 -0.6268,-14.41649 -64.24739,0 c -5.67605,7.7654 2.29829,7.73058 31.02679,14.10308 l -5.01443,14.10309 -128.18137,0.3134 c 8.63597,-30.15622 3.76082,-28.27581 42.62266,-28.20617 l 0.3134,-14.72989 z m -46.63991,58.39296 125.428,-0.22238 -36.24958,97.40685 -89.17842,-97.18447 z m 140.55052,5.78215 -35.58241,93.40383 77.83652,0.22239 -42.25411,-93.62622 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-opacity:1"
+ id="path11781"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
diff --git a/images/presets/message.png b/images/presets/message.png
new file mode 100644
index 0000000..8c28ff5
Binary files /dev/null and b/images/presets/message.png differ
diff --git a/images/presets/measurement_station.png b/images/presets/monitoring_station.png
similarity index 100%
rename from images/presets/measurement_station.png
rename to images/presets/monitoring_station.png
diff --git a/images/presets/network-wireless.svg b/images/presets/network-wireless.svg
new file mode 100644
index 0000000..08a7085
--- /dev/null
+++ b/images/presets/network-wireless.svg
@@ -0,0 +1,230 @@
+<?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="48"
+ height="48"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="network-wireless.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.395833"
+ inkscape:cx="38.873857"
+ inkscape:cy="24"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:object-paths="true"
+ inkscape:object-nodes="true"
+ inkscape:snap-bbox="true"
+ objecttolerance="10000"
+ gridtolerance="10000"
+ guidetolerance="10000"
+ inkscape:window-width="1022"
+ inkscape:window-height="918"
+ inkscape:window-x="256"
+ inkscape:window-y="26">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2383"
+ visible="true"
+ enabled="true" />
+ </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>Network Wireless</dc:title>
+ <dc:date>December 2008</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Luca Ferretti <elle.uca at libero.it></dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>network</rdf:li>
+ <rdf:li>wireless</rdf:li>
+ <rdf:li>antenna</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <dc:description>An antenna with EM waves</dc:description>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Livello 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ style="fill:none;fill-opacity:0.50000000000000000;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3169"
+ width="48"
+ height="48"
+ x="0"
+ y="0" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path3201"
+ d="M 20,34 L 32,41 L 24,23 L 16,41"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:11;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path3199"
+ sodipodi:cx="24"
+ sodipodi:cy="18"
+ sodipodi:rx="14"
+ sodipodi:ry="14"
+ d="M 36.349644,11.405586 A 14,14 0 0 1 36.493432,24.317765"
+ sodipodi:start="5.7927277"
+ sodipodi:end="6.7513721"
+ transform="matrix(-1,0,0,1,51.849644,0.1394818)"
+ sodipodi:open="true" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path3177"
+ sodipodi:cx="24"
+ sodipodi:cy="18"
+ sodipodi:rx="19"
+ sodipodi:ry="19"
+ d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+ sodipodi:start="5.6278819"
+ sodipodi:end="6.9231659"
+ sodipodi:open="true"
+ transform="matrix(-1,0,0,1,49.122899,-0.4214032)" />
+ <path
+ transform="translate(-1.0658982,-0.4214032)"
+ sodipodi:open="true"
+ sodipodi:end="6.9231659"
+ sodipodi:start="5.6278819"
+ d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+ sodipodi:ry="19"
+ sodipodi:rx="19"
+ sodipodi:cy="18"
+ sodipodi:cx="24"
+ id="path3175"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:open="true"
+ transform="translate(-3.600083,0.1394818)"
+ sodipodi:end="6.7513721"
+ sodipodi:start="5.7927277"
+ d="M 36.349644,11.405586 A 14,14 0 0 1 36.493432,24.317765"
+ sodipodi:ry="14"
+ sodipodi:rx="14"
+ sodipodi:cy="18"
+ sodipodi:cx="24"
+ id="path3173"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:11;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ transform="translate(0,-6)"
+ d="M 29,24 A 5,5 0 1 1 19,24 A 5,5 0 1 1 29,24 z"
+ sodipodi:ry="5"
+ sodipodi:rx="5"
+ sodipodi:cy="24"
+ sodipodi:cx="24"
+ id="path3171"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path2385"
+ sodipodi:cx="24"
+ sodipodi:cy="24"
+ sodipodi:rx="5"
+ sodipodi:ry="5"
+ d="M 29,24 A 5,5 0 1 1 19,24 A 5,5 0 1 1 29,24 z"
+ transform="translate(0,-6)" />
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 20,34 L 32,41 L 24,23 L 16,41"
+ id="path3157"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path3159"
+ sodipodi:cx="24"
+ sodipodi:cy="18"
+ sodipodi:rx="14"
+ sodipodi:ry="14"
+ d="M 36.349644,11.405586 A 14,14 0 0 1 36.493432,24.317765"
+ sodipodi:start="5.7927277"
+ sodipodi:end="6.7513721"
+ transform="translate(-3.600083,0.1394818)"
+ sodipodi:open="true" />
+ <path
+ sodipodi:open="true"
+ sodipodi:end="6.7456074"
+ sodipodi:start="5.8050181"
+ d="M 36.429757,11.557862 A 14,14 0 0 1 36.529644,24.24564"
+ sodipodi:ry="14"
+ sodipodi:rx="14"
+ sodipodi:cy="18"
+ sodipodi:cx="24"
+ id="path3163"
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc"
+ transform="matrix(-1,0,0,1,51.600083,0.1394818)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path3165"
+ sodipodi:cx="24"
+ sodipodi:cy="18"
+ sodipodi:rx="19"
+ sodipodi:ry="19"
+ d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+ sodipodi:start="5.6278819"
+ sodipodi:end="6.9231659"
+ sodipodi:open="true"
+ transform="translate(-1.0658982,-0.4214032)" />
+ <path
+ sodipodi:open="true"
+ sodipodi:end="6.9231659"
+ sodipodi:start="5.6278819"
+ d="M 39.064398,6.4214032 A 19,19 0 0 1 39.24004,29.346418"
+ sodipodi:ry="19"
+ sodipodi:rx="19"
+ sodipodi:cy="18"
+ sodipodi:cx="24"
+ id="path3167"
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc"
+ transform="matrix(-1,0,0,1,49.24004,-0.3464176)" />
+ </g>
+</svg>
diff --git a/images/presets/pawnbroker.svg b/images/presets/pawnbroker.svg
new file mode 100644
index 0000000..d695283
--- /dev/null
+++ b/images/presets/pawnbroker.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ version="1.0"
+ width="147"
+ height="122"
+ id="svg4679">
+ <defs
+ id="defs4681">
+ <linearGradient
+ id="linearGradient5676">
+ <stop
+ style="stop-color:#fff700;stop-opacity:1"
+ offset="0"
+ id="stop5678" />
+ <stop
+ style="stop-color:#ff6600;stop-opacity:1"
+ offset="1"
+ id="stop5680" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5668">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop5670" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop5672" />
+ </linearGradient>
+ <radialGradient
+ cx="27.799845"
+ cy="53.432285"
+ r="18.192326"
+ fx="27.799845"
+ fy="53.432285"
+ id="radialGradient5682"
+ xlink:href="#linearGradient5676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.2578576,1.2578576,-0.7681944,-0.7681944,106.05052,60.620874)" />
+ <radialGradient
+ cx="27.799845"
+ cy="53.432285"
+ r="18.192326"
+ fx="27.799845"
+ fy="53.432285"
+ id="radialGradient5686"
+ xlink:href="#linearGradient5676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.2578576,1.2578576,-0.7681944,-0.7681944,106.05052,60.620874)" />
+ <radialGradient
+ cx="27.799845"
+ cy="53.432285"
+ r="18.192326"
+ fx="27.799845"
+ fy="53.432285"
+ id="radialGradient5690"
+ xlink:href="#linearGradient5676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.2578576,1.2578576,-0.7681944,-0.7681944,106.05052,60.620874)" />
+ <radialGradient
+ cx="27.799845"
+ cy="53.432285"
+ r="18.192326"
+ fx="27.799845"
+ fy="53.432285"
+ id="radialGradient5711"
+ xlink:href="#linearGradient5676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.2578576,1.2578576,-0.7681944,-0.7681944,106.05052,60.620874)" />
+ <radialGradient
+ cx="27.799845"
+ cy="53.432285"
+ r="18.192326"
+ fx="27.799845"
+ fy="53.432285"
+ id="radialGradient5713"
+ xlink:href="#linearGradient5676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.2578576,1.2578576,-0.7681944,-0.7681944,106.05052,60.620874)" />
+ <radialGradient
+ cx="27.799845"
+ cy="53.432285"
+ r="18.192326"
+ fx="27.799845"
+ fy="53.432285"
+ id="radialGradient5715"
+ xlink:href="#linearGradient5676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.2578576,1.2578576,-0.7681944,-0.7681944,106.05052,60.620874)" />
+ </defs>
+ <g
+ transform="translate(-317.92856,-608.50507)"
+ id="layer1">
+ <path
+ d="M 336.41254,656.18829 C 336.41254,631.25585 361.05972,611.02083 391.42856,611.02083 C 421.79742,611.02083 446.44459,631.25585 446.44459,656.18829"
+ style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0.1;stroke-opacity:1"
+ id="path5692" />
+ <path
+ d="M 391.42856,611.14448 L 391.42856,693.75024"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path5702" />
+ <path
+ d="M 35.576973 66.420525 A 17.712141 17.712141 0 1 1 0.15269089,66.420525 A 17.712141 17.712141 0 1 1 35.576973 66.420525 z"
+ transform="matrix(1.0412678,0,0,1.0412678,318.46854,605.34963)"
+ style="fill:url(#radialGradient5711);fill-opacity:1;stroke:#ffffff;stroke-width:0.96036774;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.09841505;stroke-opacity:1"
+ id="path4697" />
+ <path
+ d="M 35.576973 66.420525 A 17.712141 17.712141 0 1 1 0.15269089,66.420525 A 17.712141 17.712141 0 1 1 35.576973 66.420525 z"
+ transform="matrix(1.0412678,0,0,1.0412678,427.18443,605.34963)"
+ style="fill:url(#radialGradient5713);fill-opacity:1;stroke:#ffffff;stroke-width:0.96036774;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.09841505;stroke-opacity:1"
+ id="path5684" />
+ <path
+ d="M 35.576973 66.420525 A 17.712141 17.712141 0 1 1 0.15269089,66.420525 A 17.712141 17.712141 0 1 1 35.576973 66.420525 z"
+ transform="matrix(1.0412678,0,0,1.0412678,372.82649,641.38467)"
+ style="fill:url(#radialGradient5715);fill-opacity:1;stroke:#ffffff;stroke-width:0.96036774;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.09841505;stroke-opacity:1"
+ id="path5688" />
+ </g>
+</svg>
diff --git a/images/presets/peak.png b/images/presets/peak.png
deleted file mode 100644
index 82a80b4..0000000
Binary files a/images/presets/peak.png and /dev/null differ
diff --git a/images/presets/peak.svg b/images/presets/peak.svg
new file mode 100644
index 0000000..f041bf4
--- /dev/null
+++ b/images/presets/peak.svg
@@ -0,0 +1,69 @@
+<?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="400"
+ height="400"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="peak.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.28"
+ inkscape:cx="-81.092565"
+ inkscape:cy="202.02508"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ showguides="true"
+ inkscape:snap-global="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="848"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <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:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-0.125,2.75)">
+ <path
+ style="fill:#aa4400;fill-rule:evenodd;stroke:#000000;stroke-width:1.58364117px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 199.92412,110.62652 2.0903838,396.45845 398.24849,396.45629 z"
+ id="rect2985"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ </g>
+</svg>
diff --git a/images/presets/saddle.svg b/images/presets/saddle.svg
new file mode 100644
index 0000000..8ce6040
--- /dev/null
+++ b/images/presets/saddle.svg
@@ -0,0 +1,70 @@
+<?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="400"
+ height="400"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="saddle.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.28"
+ inkscape:cx="103.57162"
+ inkscape:cy="153.96921"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ showguides="true"
+ inkscape:snap-global="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1600"
+ inkscape:window-height="848"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ borderlayer="true" />
+ <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 />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0.0625,-52.5)">
+ <path
+ style="fill:#aa4400;fill-rule:evenodd;stroke:#000000;stroke-width:1.12357688px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0.45279466,253.35932 199.97641,396.81907 399.38023,253.59533 l 0.0109,198.33894 -398.81205628,0.12911 z"
+ id="rect2985"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ </g>
+</svg>
diff --git a/images/restart.png b/images/restart.png
new file mode 100644
index 0000000..b80f38e
Binary files /dev/null and b/images/restart.png differ
diff --git a/images/unjoinnodeway.png b/images/unjoinnodeway.png
new file mode 100644
index 0000000..4179e69
Binary files /dev/null and b/images/unjoinnodeway.png differ
diff --git a/josm.jnlp b/josm.jnlp
index 44af863..31e347a 100644
--- a/josm.jnlp
+++ b/josm.jnlp
@@ -21,6 +21,7 @@
<resources>
<j2se version="1.6+"/>
<jar href="josm-tested.jar"/>
+ <property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
</resources>
<application-desc main-class="JOSM"/>
</jnlp>
\ No newline at end of file
diff --git a/macosx/JOSM.app/Contents/Info.plist b/macosx/JOSM.app/Contents/Info.plist
index a0c776f..32a2661 100644
--- a/macosx/JOSM.app/Contents/Info.plist
+++ b/macosx/JOSM.app/Contents/Info.plist
@@ -29,7 +29,7 @@
<key>ClassPath</key>
<string>$JAVAROOT/josm-custom.jar</string>
<key>JVMVersion</key>
- <string>1.5+</string>
+ <string>1.6+</string>
<key>MainClass</key>
<string>org.openstreetmap.josm.gui.MainApplication</string>
<key>Properties</key>
@@ -42,5 +42,7 @@
<key>WorkingDirectory</key>
<string>$APP_PACKAGE/Contents/Resources/Java</string>
</dict>
+ <key>NSHighResolutionCapable</key>
+ <string>True</string>
</dict>
</plist>
diff --git a/netbeans/nbproject/private/private.properties b/netbeans/nbproject/private/private.properties
deleted file mode 100644
index 784b376..0000000
--- a/netbeans/nbproject/private/private.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-compile.on.save=false
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
diff --git a/patches/20svgsalamander_getxform.patch b/patches/20svgsalamander_getxform.patch
deleted file mode 100644
index 3b372ed..0000000
--- a/patches/20svgsalamander_getxform.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch against rev 98 of https://svn.java.net/svn/svgsalamander~svn/trunk. Adds getXForm() method needed for the importvec plugin.
-Index: core/src/com/kitfox/svg/TransformableElement.java
-===================================================================
---- core.orig/src/com/kitfox/svg/TransformableElement.java 2012-05-11 17:03:52.404311564 +0200
-+++ core/src/com/kitfox/svg/TransformableElement.java 2012-06-18 00:00:20.444550308 +0200
-@@ -53,11 +53,6 @@
- {
- super(id, parent);
- }
--
-- public AffineTransform getXForm()
-- {
-- return xform;
-- }
- /*
- public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent)
- {
diff --git a/patches/series b/patches/series
index de39132..3797dd4 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,2 @@
10trim_svgsalamander.patch
-20svgsalamander_getxform.patch
30gettext_i18n.patch
diff --git a/presets_lang.pl b/presets_lang.pl
new file mode 100755
index 0000000..fd2cf2a
--- /dev/null
+++ b/presets_lang.pl
@@ -0,0 +1,72 @@
+#! /usr/bin/perl -w
+# short tool to update language links in presets file
+
+use XML::Parser;
+use Data::Dumper;
+use URI::Escape;
+
+my $skip = 0;
+my $xml = new XML::Parser(Handlers => {Start => \&handle_start});
+undef $/;
+open FILE,"<","data/defaultpresets.xml" or die;
+my $file = <FILE>;
+close FILE;
+$xml->parsefile('data/defaultpresets.xml');
+
+sub handle_start
+{
+ my ($expat, $element, %data) = @_;
+
+ if($element eq "link" && $skip < 50000)
+ {
+ my %datan;
+ foreach my $k (sort {$az=$a;$bz=$b;$az=~s/.?href//;;$bz=~s/.?href//;$az cmp $bz} keys %data)
+ {
+ my $z = $k;
+ $z =~ s/.?href//;
+ #printf("%-5s %s\n", $z,$data{$k});
+ }
+
+ if(!$data{href})
+ {
+ print "Missing href: %s\n", join(" ", %data);
+ }
+ else
+ {
+ my $main = `wget '$data{href}' -O - -q`;
+ my $h = uri_unescape($data{href});
+ my $v = "href=\"$h\"";
+ if($h eq "http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema")
+ {
+ $datan{"de"} = "/wiki/Proposed_features/De:Hausnummern";
+ }
+ while($main =~ /<span lang="([a-z_A-Z-]+)"(?: style="unicode-bidi:embed")?><a href="(\/wiki\/.*?)"/g)
+ {
+ my $lang = lc($1);
+ my $val = uri_unescape($2);
+ $lang = "$1_".uc($2) if($lang =~ /^(..)[_-](..)$/);
+ $lang = "zh_CN" if $lang eq "zh-hans";
+ $lang = "zh_TW" if $lang eq "zh-hant";
+ $datan{$lang} = $val;
+ }
+ while($main =~ /<a href="(\/wiki\/([a-zA-Z-_]):.*?)".*? • /g)
+ {
+ my $lang = lc($1);
+ my $val = uri_unescape($2);
+ $lang = "$1_".uc($2) if($lang =~ /^(..)[_-](..)$/);
+ $datan{$lang} = $val;
+ }
+ foreach my $l (sort keys %datan)
+ {
+ $v .= "\n" . (" " x 18) . "$l.href=\"http://wiki.openstreetmap.org$datan{$l}\"";
+ }
+ print "$v\n";
+ print "Replace failed for $data{href}.\n" if !($file =~ s/(<link )href="\Q$data{href}\E.*?( ?\/>)/$1$v$2/s);
+
+ $skip++;
+ }
+ }
+}
+open FILE,">","data/defaultpresets.xml" or die;
+print FILE $file;
+close FILE;
diff --git a/src/JOSM.java b/src/JOSM.java
index d79e86e..8d0f604 100644
--- a/src/JOSM.java
+++ b/src/JOSM.java
@@ -1,12 +1,15 @@
// License: GPL. Copyright 2007 by Immanuel Scholz and others
-//Licence: GPL
-
-// Note: The name of the main class will be the name of the application menu on OS X.
-// so instead of exposing "org.openstreetmap.josm.gui.MainApplication" to the
-// user, we subclass it with a nicer name "JOSM".
-// An alternative would be to set the name in the plist file---but JOSM usually
-// is not delivered as an OS X Application Bundle, so we have no plist file.
-
import org.openstreetmap.josm.gui.MainApplication;
+/**
+ * JOSM main class (entry point of the application).<br/>
+ *
+ * The name of the main class will be the name of the application menu on OS X.
+ * so instead of exposing "org.openstreetmap.josm.gui.MainApplication" to the
+ * user, we subclass it with a nicer name "JOSM".
+ * An alternative would be to set the name in the plist file---but JOSM usually
+ * is not delivered as an OS X Application Bundle, so we have no plist file.
+ *
+ * @since 1023
+ */
public class JOSM extends MainApplication {}
diff --git a/src/org/json/JSONArray.java b/src/org/json/JSONArray.java
new file mode 100644
index 0000000..673a919
--- /dev/null
+++ b/src/org/json/JSONArray.java
@@ -0,0 +1,944 @@
+package org.json;
+
+/*
+ Copyright (c) 2002 JSON.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ The Software shall be used for Good, not Evil.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+ */
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * A JSONArray is an ordered sequence of values. Its external text form is a
+ * string wrapped in square brackets with commas separating the values. The
+ * internal form is an object having <code>get</code> and <code>opt</code>
+ * methods for accessing the values by index, and <code>put</code> methods for
+ * adding or replacing values. The values can be any of these types:
+ * <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>,
+ * <code>Number</code>, <code>String</code>, or the
+ * <code>JSONObject.NULL object</code>.
+ * <p>
+ * The constructor can convert a JSON text into a Java object. The
+ * <code>toString</code> method converts to JSON text.
+ * <p>
+ * A <code>get</code> method returns a value if one can be found, and throws an
+ * exception if one cannot be found. An <code>opt</code> method returns a
+ * default value instead of throwing an exception, and so is useful for
+ * obtaining optional values.
+ * <p>
+ * The generic <code>get()</code> and <code>opt()</code> methods return an
+ * object which you can cast or query for type. There are also typed
+ * <code>get</code> and <code>opt</code> methods that do type checking and type
+ * coercion for you.
+ * <p>
+ * The texts produced by the <code>toString</code> methods strictly conform to
+ * JSON syntax rules. The constructors are more forgiving in the texts they will
+ * accept:
+ * <ul>
+ * <li>An extra <code>,</code> <small>(comma)</small> may appear just
+ * before the closing bracket.</li>
+ * <li>The <code>null</code> value will be inserted when there is <code>,</code>
+ * <small>(comma)</small> elision.</li>
+ * <li>Strings may be quoted with <code>'</code> <small>(single
+ * quote)</small>.</li>
+ * <li>Strings do not need to be quoted at all if they do not begin with a quote
+ * or single quote, and if they do not contain leading or trailing spaces, and
+ * if they do not contain any of these characters:
+ * <code>{ } [ ] / \ : , #</code> and if they do not look like numbers and
+ * if they are not the reserved words <code>true</code>, <code>false</code>, or
+ * <code>null</code>.</li>
+ * </ul>
+ *
+ * @author JSON.org
+ * @version 2013-04-18
+ */
+public class JSONArray {
+
+ /**
+ * The arrayList where the JSONArray's properties are kept.
+ */
+ private final ArrayList myArrayList;
+
+ /**
+ * Construct an empty JSONArray.
+ */
+ public JSONArray() {
+ this.myArrayList = new ArrayList();
+ }
+
+ /**
+ * Construct a JSONArray from a JSONTokener.
+ *
+ * @param x
+ * A JSONTokener
+ * @throws JSONException
+ * If there is a syntax error.
+ */
+ public JSONArray(JSONTokener x) throws JSONException {
+ this();
+ if (x.nextClean() != '[') {
+ throw x.syntaxError("A JSONArray text must start with '['");
+ }
+ if (x.nextClean() != ']') {
+ x.back();
+ for (;;) {
+ if (x.nextClean() == ',') {
+ x.back();
+ this.myArrayList.add(JSONObject.NULL);
+ } else {
+ x.back();
+ this.myArrayList.add(x.nextValue());
+ }
+ switch (x.nextClean()) {
+ case ',':
+ if (x.nextClean() == ']') {
+ return;
+ }
+ x.back();
+ break;
+ case ']':
+ return;
+ default:
+ throw x.syntaxError("Expected a ',' or ']'");
+ }
+ }
+ }
+ }
+
+ /**
+ * Construct a JSONArray from a source JSON text.
+ *
+ * @param source
+ * A string that begins with <code>[</code> <small>(left
+ * bracket)</small> and ends with <code>]</code>
+ * <small>(right bracket)</small>.
+ * @throws JSONException
+ * If there is a syntax error.
+ */
+ public JSONArray(String source) throws JSONException {
+ this(new JSONTokener(source));
+ }
+
+ /**
+ * Construct a JSONArray from a Collection.
+ *
+ * @param collection
+ * A Collection.
+ */
+ public JSONArray(Collection collection) {
+ this.myArrayList = new ArrayList();
+ if (collection != null) {
+ Iterator iter = collection.iterator();
+ while (iter.hasNext()) {
+ this.myArrayList.add(JSONObject.wrap(iter.next()));
+ }
+ }
+ }
+
+ /**
+ * Construct a JSONArray from an array
+ *
+ * @throws JSONException
+ * If not an array.
+ */
+ public JSONArray(Object array) throws JSONException {
+ this();
+ if (array.getClass().isArray()) {
+ int length = Array.getLength(array);
+ for (int i = 0; i < length; i += 1) {
+ this.put(JSONObject.wrap(Array.get(array, i)));
+ }
+ } else {
+ throw new JSONException(
+ "JSONArray initial value should be a string or collection or array.");
+ }
+ }
+
+ /**
+ * Get the object value associated with an index.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return An object value.
+ * @throws JSONException
+ * If there is no value for the index.
+ */
+ public Object get(int index) throws JSONException {
+ Object object = this.opt(index);
+ if (object == null) {
+ throw new JSONException("JSONArray[" + index + "] not found.");
+ }
+ return object;
+ }
+
+ /**
+ * Get the boolean value associated with an index. The string values "true"
+ * and "false" are converted to boolean.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The truth.
+ * @throws JSONException
+ * If there is no value for the index or if the value is not
+ * convertible to boolean.
+ */
+ public boolean getBoolean(int index) throws JSONException {
+ Object object = this.get(index);
+ if (object.equals(Boolean.FALSE)
+ || (object instanceof String && ((String) object)
+ .equalsIgnoreCase("false"))) {
+ return false;
+ } else if (object.equals(Boolean.TRUE)
+ || (object instanceof String && ((String) object)
+ .equalsIgnoreCase("true"))) {
+ return true;
+ }
+ throw new JSONException("JSONArray[" + index + "] is not a boolean.");
+ }
+
+ /**
+ * Get the double value associated with an index.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The value.
+ * @throws JSONException
+ * If the key is not found or if the value cannot be converted
+ * to a number.
+ */
+ public double getDouble(int index) throws JSONException {
+ Object object = this.get(index);
+ try {
+ return object instanceof Number ? ((Number) object).doubleValue()
+ : Double.parseDouble((String) object);
+ } catch (Exception e) {
+ throw new JSONException("JSONArray[" + index + "] is not a number.");
+ }
+ }
+
+ /**
+ * Get the int value associated with an index.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The value.
+ * @throws JSONException
+ * If the key is not found or if the value is not a number.
+ */
+ public int getInt(int index) throws JSONException {
+ Object object = this.get(index);
+ try {
+ return object instanceof Number ? ((Number) object).intValue()
+ : Integer.parseInt((String) object);
+ } catch (Exception e) {
+ throw new JSONException("JSONArray[" + index + "] is not a number.");
+ }
+ }
+
+ /**
+ * Get the JSONArray associated with an index.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return A JSONArray value.
+ * @throws JSONException
+ * If there is no value for the index. or if the value is not a
+ * JSONArray
+ */
+ public JSONArray getJSONArray(int index) throws JSONException {
+ Object object = this.get(index);
+ if (object instanceof JSONArray) {
+ return (JSONArray) object;
+ }
+ throw new JSONException("JSONArray[" + index + "] is not a JSONArray.");
+ }
+
+ /**
+ * Get the JSONObject associated with an index.
+ *
+ * @param index
+ * subscript
+ * @return A JSONObject value.
+ * @throws JSONException
+ * If there is no value for the index or if the value is not a
+ * JSONObject
+ */
+ public JSONObject getJSONObject(int index) throws JSONException {
+ Object object = this.get(index);
+ if (object instanceof JSONObject) {
+ return (JSONObject) object;
+ }
+ throw new JSONException("JSONArray[" + index + "] is not a JSONObject.");
+ }
+
+ /**
+ * Get the long value associated with an index.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The value.
+ * @throws JSONException
+ * If the key is not found or if the value cannot be converted
+ * to a number.
+ */
+ public long getLong(int index) throws JSONException {
+ Object object = this.get(index);
+ try {
+ return object instanceof Number ? ((Number) object).longValue()
+ : Long.parseLong((String) object);
+ } catch (Exception e) {
+ throw new JSONException("JSONArray[" + index + "] is not a number.");
+ }
+ }
+
+ /**
+ * Get the string associated with an index.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return A string value.
+ * @throws JSONException
+ * If there is no string value for the index.
+ */
+ public String getString(int index) throws JSONException {
+ Object object = this.get(index);
+ if (object instanceof String) {
+ return (String) object;
+ }
+ throw new JSONException("JSONArray[" + index + "] not a string.");
+ }
+
+ /**
+ * Determine if the value is null.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return true if the value at the index is null, or if there is no value.
+ */
+ public boolean isNull(int index) {
+ return JSONObject.NULL.equals(this.opt(index));
+ }
+
+ /**
+ * Make a string from the contents of this JSONArray. The
+ * <code>separator</code> string is inserted between each element. Warning:
+ * This method assumes that the data structure is acyclical.
+ *
+ * @param separator
+ * A string that will be inserted between the elements.
+ * @return a string.
+ * @throws JSONException
+ * If the array contains an invalid number.
+ */
+ public String join(String separator) throws JSONException {
+ int len = this.length();
+ StringBuffer sb = new StringBuffer();
+
+ for (int i = 0; i < len; i += 1) {
+ if (i > 0) {
+ sb.append(separator);
+ }
+ sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Get the number of elements in the JSONArray, included nulls.
+ *
+ * @return The length (or size).
+ */
+ public int length() {
+ return this.myArrayList.size();
+ }
+
+ /**
+ * Get the optional object value associated with an index.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return An object value, or null if there is no object at that index.
+ */
+ public Object opt(int index) {
+ return (index < 0 || index >= this.length()) ? null : this.myArrayList
+ .get(index);
+ }
+
+ /**
+ * Get the optional boolean value associated with an index. It returns false
+ * if there is no value at that index, or if the value is not Boolean.TRUE
+ * or the String "true".
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The truth.
+ */
+ public boolean optBoolean(int index) {
+ return this.optBoolean(index, false);
+ }
+
+ /**
+ * Get the optional boolean value associated with an index. It returns the
+ * defaultValue if there is no value at that index or if it is not a Boolean
+ * or the String "true" or "false" (case insensitive).
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @param defaultValue
+ * A boolean default.
+ * @return The truth.
+ */
+ public boolean optBoolean(int index, boolean defaultValue) {
+ try {
+ return this.getBoolean(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get the optional double value associated with an index. NaN is returned
+ * if there is no value for the index, or if the value is not a number and
+ * cannot be converted to a number.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The value.
+ */
+ public double optDouble(int index) {
+ return this.optDouble(index, Double.NaN);
+ }
+
+ /**
+ * Get the optional double value associated with an index. The defaultValue
+ * is returned if there is no value for the index, or if the value is not a
+ * number and cannot be converted to a number.
+ *
+ * @param index
+ * subscript
+ * @param defaultValue
+ * The default value.
+ * @return The value.
+ */
+ public double optDouble(int index, double defaultValue) {
+ try {
+ return this.getDouble(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get the optional int value associated with an index. Zero is returned if
+ * there is no value for the index, or if the value is not a number and
+ * cannot be converted to a number.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The value.
+ */
+ public int optInt(int index) {
+ return this.optInt(index, 0);
+ }
+
+ /**
+ * Get the optional int value associated with an index. The defaultValue is
+ * returned if there is no value for the index, or if the value is not a
+ * number and cannot be converted to a number.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @param defaultValue
+ * The default value.
+ * @return The value.
+ */
+ public int optInt(int index, int defaultValue) {
+ try {
+ return this.getInt(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get the optional JSONArray associated with an index.
+ *
+ * @param index
+ * subscript
+ * @return A JSONArray value, or null if the index has no value, or if the
+ * value is not a JSONArray.
+ */
+ public JSONArray optJSONArray(int index) {
+ Object o = this.opt(index);
+ return o instanceof JSONArray ? (JSONArray) o : null;
+ }
+
+ /**
+ * Get the optional JSONObject associated with an index. Null is returned if
+ * the key is not found, or null if the index has no value, or if the value
+ * is not a JSONObject.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return A JSONObject value.
+ */
+ public JSONObject optJSONObject(int index) {
+ Object o = this.opt(index);
+ return o instanceof JSONObject ? (JSONObject) o : null;
+ }
+
+ /**
+ * Get the optional long value associated with an index. Zero is returned if
+ * there is no value for the index, or if the value is not a number and
+ * cannot be converted to a number.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return The value.
+ */
+ public long optLong(int index) {
+ return this.optLong(index, 0);
+ }
+
+ /**
+ * Get the optional long value associated with an index. The defaultValue is
+ * returned if there is no value for the index, or if the value is not a
+ * number and cannot be converted to a number.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @param defaultValue
+ * The default value.
+ * @return The value.
+ */
+ public long optLong(int index, long defaultValue) {
+ try {
+ return this.getLong(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get the optional string value associated with an index. It returns an
+ * empty string if there is no value at that index. If the value is not a
+ * string and is not null, then it is coverted to a string.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return A String value.
+ */
+ public String optString(int index) {
+ return this.optString(index, "");
+ }
+
+ /**
+ * Get the optional string associated with an index. The defaultValue is
+ * returned if the key is not found.
+ *
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @param defaultValue
+ * The default value.
+ * @return A String value.
+ */
+ public String optString(int index, String defaultValue) {
+ Object object = this.opt(index);
+ return JSONObject.NULL.equals(object) ? defaultValue : object
+ .toString();
+ }
+
+ /**
+ * Append a boolean value. This increases the array's length by one.
+ *
+ * @param value
+ * A boolean value.
+ * @return this.
+ */
+ public JSONArray put(boolean value) {
+ this.put(value ? Boolean.TRUE : Boolean.FALSE);
+ return this;
+ }
+
+ /**
+ * Put a value in the JSONArray, where the value will be a JSONArray which
+ * is produced from a Collection.
+ *
+ * @param value
+ * A Collection value.
+ * @return this.
+ */
+ public JSONArray put(Collection value) {
+ this.put(new JSONArray(value));
+ return this;
+ }
+
+ /**
+ * Append a double value. This increases the array's length by one.
+ *
+ * @param value
+ * A double value.
+ * @throws JSONException
+ * if the value is not finite.
+ * @return this.
+ */
+ public JSONArray put(double value) throws JSONException {
+ Double d = new Double(value);
+ JSONObject.testValidity(d);
+ this.put(d);
+ return this;
+ }
+
+ /**
+ * Append an int value. This increases the array's length by one.
+ *
+ * @param value
+ * An int value.
+ * @return this.
+ */
+ public JSONArray put(int value) {
+ this.put(new Integer(value));
+ return this;
+ }
+
+ /**
+ * Append an long value. This increases the array's length by one.
+ *
+ * @param value
+ * A long value.
+ * @return this.
+ */
+ public JSONArray put(long value) {
+ this.put(new Long(value));
+ return this;
+ }
+
+ /**
+ * Put a value in the JSONArray, where the value will be a JSONObject which
+ * is produced from a Map.
+ *
+ * @param value
+ * A Map value.
+ * @return this.
+ */
+ public JSONArray put(Map value) {
+ this.put(new JSONObject(value));
+ return this;
+ }
+
+ /**
+ * Append an object value. This increases the array's length by one.
+ *
+ * @param value
+ * An object value. The value should be a Boolean, Double,
+ * Integer, JSONArray, JSONObject, Long, or String, or the
+ * JSONObject.NULL object.
+ * @return this.
+ */
+ public JSONArray put(Object value) {
+ this.myArrayList.add(value);
+ return this;
+ }
+
+ /**
+ * Put or replace a boolean value in the JSONArray. If the index is greater
+ * than the length of the JSONArray, then null elements will be added as
+ * necessary to pad it out.
+ *
+ * @param index
+ * The subscript.
+ * @param value
+ * A boolean value.
+ * @return this.
+ * @throws JSONException
+ * If the index is negative.
+ */
+ public JSONArray put(int index, boolean value) throws JSONException {
+ this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
+ return this;
+ }
+
+ /**
+ * Put a value in the JSONArray, where the value will be a JSONArray which
+ * is produced from a Collection.
+ *
+ * @param index
+ * The subscript.
+ * @param value
+ * A Collection value.
+ * @return this.
+ * @throws JSONException
+ * If the index is negative or if the value is not finite.
+ */
+ public JSONArray put(int index, Collection value) throws JSONException {
+ this.put(index, new JSONArray(value));
+ return this;
+ }
+
+ /**
+ * Put or replace a double value. If the index is greater than the length of
+ * the JSONArray, then null elements will be added as necessary to pad it
+ * out.
+ *
+ * @param index
+ * The subscript.
+ * @param value
+ * A double value.
+ * @return this.
+ * @throws JSONException
+ * If the index is negative or if the value is not finite.
+ */
+ public JSONArray put(int index, double value) throws JSONException {
+ this.put(index, new Double(value));
+ return this;
+ }
+
+ /**
+ * Put or replace an int value. If the index is greater than the length of
+ * the JSONArray, then null elements will be added as necessary to pad it
+ * out.
+ *
+ * @param index
+ * The subscript.
+ * @param value
+ * An int value.
+ * @return this.
+ * @throws JSONException
+ * If the index is negative.
+ */
+ public JSONArray put(int index, int value) throws JSONException {
+ this.put(index, new Integer(value));
+ return this;
+ }
+
+ /**
+ * Put or replace a long value. If the index is greater than the length of
+ * the JSONArray, then null elements will be added as necessary to pad it
+ * out.
+ *
+ * @param index
+ * The subscript.
+ * @param value
+ * A long value.
+ * @return this.
+ * @throws JSONException
+ * If the index is negative.
+ */
+ public JSONArray put(int index, long value) throws JSONException {
+ this.put(index, new Long(value));
+ return this;
+ }
+
+ /**
+ * Put a value in the JSONArray, where the value will be a JSONObject that
+ * is produced from a Map.
+ *
+ * @param index
+ * The subscript.
+ * @param value
+ * The Map value.
+ * @return this.
+ * @throws JSONException
+ * If the index is negative or if the the value is an invalid
+ * number.
+ */
+ public JSONArray put(int index, Map value) throws JSONException {
+ this.put(index, new JSONObject(value));
+ return this;
+ }
+
+ /**
+ * Put or replace an object value in the JSONArray. If the index is greater
+ * than the length of the JSONArray, then null elements will be added as
+ * necessary to pad it out.
+ *
+ * @param index
+ * The subscript.
+ * @param value
+ * The value to put into the array. The value should be a
+ * Boolean, Double, Integer, JSONArray, JSONObject, Long, or
+ * String, or the JSONObject.NULL object.
+ * @return this.
+ * @throws JSONException
+ * If the index is negative or if the the value is an invalid
+ * number.
+ */
+ public JSONArray put(int index, Object value) throws JSONException {
+ JSONObject.testValidity(value);
+ if (index < 0) {
+ throw new JSONException("JSONArray[" + index + "] not found.");
+ }
+ if (index < this.length()) {
+ this.myArrayList.set(index, value);
+ } else {
+ while (index != this.length()) {
+ this.put(JSONObject.NULL);
+ }
+ this.put(value);
+ }
+ return this;
+ }
+
+ /**
+ * Remove an index and close the hole.
+ *
+ * @param index
+ * The index of the element to be removed.
+ * @return The value that was associated with the index, or null if there
+ * was no value.
+ */
+ public Object remove(int index) {
+ Object o = this.opt(index);
+ this.myArrayList.remove(index);
+ return o;
+ }
+
+ /**
+ * Produce a JSONObject by combining a JSONArray of names with the values of
+ * this JSONArray.
+ *
+ * @param names
+ * A JSONArray containing a list of key strings. These will be
+ * paired with the values.
+ * @return A JSONObject, or null if there are no names or if this JSONArray
+ * has no values.
+ * @throws JSONException
+ * If any of the names are null.
+ */
+ public JSONObject toJSONObject(JSONArray names) throws JSONException {
+ if (names == null || names.length() == 0 || this.length() == 0) {
+ return null;
+ }
+ JSONObject jo = new JSONObject();
+ for (int i = 0; i < names.length(); i += 1) {
+ jo.put(names.getString(i), this.opt(i));
+ }
+ return jo;
+ }
+
+ /**
+ * Make a JSON text of this JSONArray. For compactness, no unnecessary
+ * whitespace is added. If it is not possible to produce a syntactically
+ * correct JSON text then null will be returned instead. This could occur if
+ * the array contains an invalid number.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return a printable, displayable, transmittable representation of the
+ * array.
+ */
+ public String toString() {
+ try {
+ return this.toString(0);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /**
+ * Make a prettyprinted JSON text of this JSONArray. Warning: This method
+ * assumes that the data structure is acyclical.
+ *
+ * @param indentFactor
+ * The number of spaces to add to each level of indentation.
+ * @return a printable, displayable, transmittable representation of the
+ * object, beginning with <code>[</code> <small>(left
+ * bracket)</small> and ending with <code>]</code>
+ * <small>(right bracket)</small>.
+ * @throws JSONException
+ */
+ public String toString(int indentFactor) throws JSONException {
+ StringWriter sw = new StringWriter();
+ synchronized (sw.getBuffer()) {
+ return this.write(sw, indentFactor, 0).toString();
+ }
+ }
+
+ /**
+ * Write the contents of the JSONArray as JSON text to a writer. For
+ * compactness, no whitespace is added.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return The writer.
+ * @throws JSONException
+ */
+ public Writer write(Writer writer) throws JSONException {
+ return this.write(writer, 0, 0);
+ }
+
+ /**
+ * Write the contents of the JSONArray as JSON text to a writer. For
+ * compactness, no whitespace is added.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @param indentFactor
+ * The number of spaces to add to each level of indentation.
+ * @param indent
+ * The indention of the top level.
+ * @return The writer.
+ * @throws JSONException
+ */
+ Writer write(Writer writer, int indentFactor, int indent)
+ throws JSONException {
+ try {
+ boolean commanate = false;
+ int length = this.length();
+ writer.write('[');
+
+ if (length == 1) {
+ JSONObject.writeValue(writer, this.myArrayList.get(0),
+ indentFactor, indent);
+ } else if (length != 0) {
+ final int newindent = indent + indentFactor;
+
+ for (int i = 0; i < length; i += 1) {
+ if (commanate) {
+ writer.write(',');
+ }
+ if (indentFactor > 0) {
+ writer.write('\n');
+ }
+ JSONObject.indent(writer, newindent);
+ JSONObject.writeValue(writer, this.myArrayList.get(i),
+ indentFactor, newindent);
+ commanate = true;
+ }
+ if (indentFactor > 0) {
+ writer.write('\n');
+ }
+ JSONObject.indent(writer, indent);
+ }
+ writer.write(']');
+ return writer;
+ } catch (IOException e) {
+ throw new JSONException(e);
+ }
+ }
+}
diff --git a/src/org/json/JSONException.java b/src/org/json/JSONException.java
new file mode 100644
index 0000000..971547e
--- /dev/null
+++ b/src/org/json/JSONException.java
@@ -0,0 +1,41 @@
+package org.json;
+
+/**
+ * The JSONException is thrown by the JSON.org classes when things are amiss.
+ *
+ * @author JSON.org
+ * @version 2013-02-10
+ */
+public class JSONException extends RuntimeException {
+ private static final long serialVersionUID = 0;
+ private Throwable cause;
+
+ /**
+ * Constructs a JSONException with an explanatory message.
+ *
+ * @param message
+ * Detail about the reason for the exception.
+ */
+ public JSONException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new JSONException with the specified cause.
+ */
+ public JSONException(Throwable cause) {
+ super(cause.getMessage());
+ this.cause = cause;
+ }
+
+ /**
+ * Returns the cause of this exception or null if the cause is nonexistent
+ * or unknown.
+ *
+ * @returns the cause of this exception or null if the cause is nonexistent
+ * or unknown.
+ */
+ public Throwable getCause() {
+ return this.cause;
+ }
+}
diff --git a/src/org/json/JSONObject.java b/src/org/json/JSONObject.java
new file mode 100644
index 0000000..5ca5a45
--- /dev/null
+++ b/src/org/json/JSONObject.java
@@ -0,0 +1,1641 @@
+package org.json;
+
+/*
+ Copyright (c) 2002 JSON.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ The Software shall be used for Good, not Evil.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+ */
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.Set;
+
+/**
+ * A JSONObject is an unordered collection of name/value pairs. Its external
+ * form is a string wrapped in curly braces with colons between the names and
+ * values, and commas between the values and names. The internal form is an
+ * object having <code>get</code> and <code>opt</code> methods for accessing
+ * the values by name, and <code>put</code> methods for adding or replacing
+ * values by name. The values can be any of these types: <code>Boolean</code>,
+ * <code>JSONArray</code>, <code>JSONObject</code>, <code>Number</code>,
+ * <code>String</code>, or the <code>JSONObject.NULL</code> object. A
+ * JSONObject constructor can be used to convert an external form JSON text
+ * into an internal form whose values can be retrieved with the
+ * <code>get</code> and <code>opt</code> methods, or to convert values into a
+ * JSON text using the <code>put</code> and <code>toString</code> methods. A
+ * <code>get</code> method returns a value if one can be found, and throws an
+ * exception if one cannot be found. An <code>opt</code> method returns a
+ * default value instead of throwing an exception, and so is useful for
+ * obtaining optional values.
+ * <p>
+ * The generic <code>get()</code> and <code>opt()</code> methods return an
+ * object, which you can cast or query for type. There are also typed
+ * <code>get</code> and <code>opt</code> methods that do type checking and type
+ * coercion for you. The opt methods differ from the get methods in that they
+ * do not throw. Instead, they return a specified value, such as null.
+ * <p>
+ * The <code>put</code> methods add or replace values in an object. For
+ * example,
+ *
+ * <pre>
+ * myString = new JSONObject()
+ * .put("JSON", "Hello, World!").toString();
+ * </pre>
+ *
+ * produces the string <code>{"JSON": "Hello, World"}</code>.
+ * <p>
+ * The texts produced by the <code>toString</code> methods strictly conform to
+ * the JSON syntax rules. The constructors are more forgiving in the texts they
+ * will accept:
+ * <ul>
+ * <li>An extra <code>,</code> <small>(comma)</small> may appear just
+ * before the closing brace.</li>
+ * <li>Strings may be quoted with <code>'</code> <small>(single
+ * quote)</small>.</li>
+ * <li>Strings do not need to be quoted at all if they do not begin with a
+ * quote or single quote, and if they do not contain leading or trailing
+ * spaces, and if they do not contain any of these characters:
+ * <code>{ } [ ] / \ : , #</code> and if they do not look like numbers and
+ * if they are not the reserved words <code>true</code>, <code>false</code>,
+ * or <code>null</code>.</li>
+ * </ul>
+ *
+ * @author JSON.org
+ * @version 2013-06-17
+ */
+public class JSONObject {
+ /**
+ * JSONObject.NULL is equivalent to the value that JavaScript calls null,
+ * whilst Java's null is equivalent to the value that JavaScript calls
+ * undefined.
+ */
+ private static final class Null {
+
+ /**
+ * There is only intended to be a single instance of the NULL object,
+ * so the clone method returns itself.
+ *
+ * @return NULL.
+ */
+ protected final Object clone() {
+ return this;
+ }
+
+ /**
+ * A Null object is equal to the null value and to itself.
+ *
+ * @param object
+ * An object to test for nullness.
+ * @return true if the object parameter is the JSONObject.NULL object or
+ * null.
+ */
+ public boolean equals(Object object) {
+ return object == null || object == this;
+ }
+
+ /**
+ * Get the "null" string value.
+ *
+ * @return The string "null".
+ */
+ public String toString() {
+ return "null";
+ }
+ }
+
+ /**
+ * The map where the JSONObject's properties are kept.
+ */
+ private final Map map;
+
+ /**
+ * It is sometimes more convenient and less ambiguous to have a
+ * <code>NULL</code> object than to use Java's <code>null</code> value.
+ * <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
+ * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
+ */
+ public static final Object NULL = new Null();
+
+ /**
+ * Construct an empty JSONObject.
+ */
+ public JSONObject() {
+ this.map = new HashMap();
+ }
+
+ /**
+ * Construct a JSONObject from a subset of another JSONObject. An array of
+ * strings is used to identify the keys that should be copied. Missing keys
+ * are ignored.
+ *
+ * @param jo
+ * A JSONObject.
+ * @param names
+ * An array of strings.
+ * @throws JSONException
+ * @exception JSONException
+ * If a value is a non-finite number or if a name is
+ * duplicated.
+ */
+ public JSONObject(JSONObject jo, String[] names) {
+ this();
+ for (int i = 0; i < names.length; i += 1) {
+ try {
+ this.putOnce(names[i], jo.opt(names[i]));
+ } catch (Exception ignore) {
+ }
+ }
+ }
+
+ /**
+ * Construct a JSONObject from a JSONTokener.
+ *
+ * @param x
+ * A JSONTokener object containing the source string.
+ * @throws JSONException
+ * If there is a syntax error in the source string or a
+ * duplicated key.
+ */
+ public JSONObject(JSONTokener x) throws JSONException {
+ this();
+ char c;
+ String key;
+
+ if (x.nextClean() != '{') {
+ throw x.syntaxError("A JSONObject text must begin with '{'");
+ }
+ for (;;) {
+ c = x.nextClean();
+ switch (c) {
+ case 0:
+ throw x.syntaxError("A JSONObject text must end with '}'");
+ case '}':
+ return;
+ default:
+ x.back();
+ key = x.nextValue().toString();
+ }
+
+// The key is followed by ':'.
+
+ c = x.nextClean();
+ if (c != ':') {
+ throw x.syntaxError("Expected a ':' after a key");
+ }
+ this.putOnce(key, x.nextValue());
+
+// Pairs are separated by ','.
+
+ switch (x.nextClean()) {
+ case ';':
+ case ',':
+ if (x.nextClean() == '}') {
+ return;
+ }
+ x.back();
+ break;
+ case '}':
+ return;
+ default:
+ throw x.syntaxError("Expected a ',' or '}'");
+ }
+ }
+ }
+
+ /**
+ * Construct a JSONObject from a Map.
+ *
+ * @param map
+ * A map object that can be used to initialize the contents of
+ * the JSONObject.
+ * @throws JSONException
+ */
+ public JSONObject(Map map) {
+ this.map = new HashMap();
+ if (map != null) {
+ Iterator i = map.entrySet().iterator();
+ while (i.hasNext()) {
+ Map.Entry e = (Map.Entry) i.next();
+ Object value = e.getValue();
+ if (value != null) {
+ this.map.put(e.getKey(), wrap(value));
+ }
+ }
+ }
+ }
+
+ /**
+ * Construct a JSONObject from an Object using bean getters. It reflects on
+ * all of the public methods of the object. For each of the methods with no
+ * parameters and a name starting with <code>"get"</code> or
+ * <code>"is"</code> followed by an uppercase letter, the method is invoked,
+ * and a key and the value returned from the getter method are put into the
+ * new JSONObject.
+ *
+ * The key is formed by removing the <code>"get"</code> or <code>"is"</code>
+ * prefix. If the second remaining character is not upper case, then the
+ * first character is converted to lower case.
+ *
+ * For example, if an object has a method named <code>"getName"</code>, and
+ * if the result of calling <code>object.getName()</code> is
+ * <code>"Larry Fine"</code>, then the JSONObject will contain
+ * <code>"name": "Larry Fine"</code>.
+ *
+ * @param bean
+ * An object that has getter methods that should be used to make
+ * a JSONObject.
+ */
+ public JSONObject(Object bean) {
+ this();
+ this.populateMap(bean);
+ }
+
+ /**
+ * Construct a JSONObject from an Object, using reflection to find the
+ * public members. The resulting JSONObject's keys will be the strings from
+ * the names array, and the values will be the field values associated with
+ * those keys in the object. If a key is not found or not visible, then it
+ * will not be copied into the new JSONObject.
+ *
+ * @param object
+ * An object that has fields that should be used to make a
+ * JSONObject.
+ * @param names
+ * An array of strings, the names of the fields to be obtained
+ * from the object.
+ */
+ public JSONObject(Object object, String names[]) {
+ this();
+ Class c = object.getClass();
+ for (int i = 0; i < names.length; i += 1) {
+ String name = names[i];
+ try {
+ this.putOpt(name, c.getField(name).get(object));
+ } catch (Exception ignore) {
+ }
+ }
+ }
+
+ /**
+ * Construct a JSONObject from a source JSON text string. This is the most
+ * commonly used JSONObject constructor.
+ *
+ * @param source
+ * A string beginning with <code>{</code> <small>(left
+ * brace)</small> and ending with <code>}</code>
+ * <small>(right brace)</small>.
+ * @exception JSONException
+ * If there is a syntax error in the source string or a
+ * duplicated key.
+ */
+ public JSONObject(String source) throws JSONException {
+ this(new JSONTokener(source));
+ }
+
+ /**
+ * Construct a JSONObject from a ResourceBundle.
+ *
+ * @param baseName
+ * The ResourceBundle base name.
+ * @param locale
+ * The Locale to load the ResourceBundle for.
+ * @throws JSONException
+ * If any JSONExceptions are detected.
+ */
+ public JSONObject(String baseName, Locale locale) throws JSONException {
+ this();
+ ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale,
+ Thread.currentThread().getContextClassLoader());
+
+// Iterate through the keys in the bundle.
+
+ Enumeration keys = bundle.getKeys();
+ while (keys.hasMoreElements()) {
+ Object key = keys.nextElement();
+ if (key instanceof String) {
+
+// Go through the path, ensuring that there is a nested JSONObject for each
+// segment except the last. Add the value using the last segment's name into
+// the deepest nested JSONObject.
+
+ String[] path = ((String) key).split("\\.");
+ int last = path.length - 1;
+ JSONObject target = this;
+ for (int i = 0; i < last; i += 1) {
+ String segment = path[i];
+ JSONObject nextTarget = target.optJSONObject(segment);
+ if (nextTarget == null) {
+ nextTarget = new JSONObject();
+ target.put(segment, nextTarget);
+ }
+ target = nextTarget;
+ }
+ target.put(path[last], bundle.getString((String) key));
+ }
+ }
+ }
+
+ /**
+ * Accumulate values under a key. It is similar to the put method except
+ * that if there is already an object stored under the key then a JSONArray
+ * is stored under the key to hold all of the accumulated values. If there
+ * is already a JSONArray, then the new value is appended to it. In
+ * contrast, the put method replaces the previous value.
+ *
+ * If only one value is accumulated that is not a JSONArray, then the result
+ * will be the same as using put. But if multiple values are accumulated,
+ * then the result will be like append.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * An object to be accumulated under the key.
+ * @return this.
+ * @throws JSONException
+ * If the value is an invalid number or if the key is null.
+ */
+ public JSONObject accumulate(String key, Object value) throws JSONException {
+ testValidity(value);
+ Object object = this.opt(key);
+ if (object == null) {
+ this.put(key,
+ value instanceof JSONArray ? new JSONArray().put(value)
+ : value);
+ } else if (object instanceof JSONArray) {
+ ((JSONArray) object).put(value);
+ } else {
+ this.put(key, new JSONArray().put(object).put(value));
+ }
+ return this;
+ }
+
+ /**
+ * Append values to the array under a key. If the key does not exist in the
+ * JSONObject, then the key is put in the JSONObject with its value being a
+ * JSONArray containing the value parameter. If the key was already
+ * associated with a JSONArray, then the value parameter is appended to it.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * An object to be accumulated under the key.
+ * @return this.
+ * @throws JSONException
+ * If the key is null or if the current value associated with
+ * the key is not a JSONArray.
+ */
+ public JSONObject append(String key, Object value) throws JSONException {
+ testValidity(value);
+ Object object = this.opt(key);
+ if (object == null) {
+ this.put(key, new JSONArray().put(value));
+ } else if (object instanceof JSONArray) {
+ this.put(key, ((JSONArray) object).put(value));
+ } else {
+ throw new JSONException("JSONObject[" + key
+ + "] is not a JSONArray.");
+ }
+ return this;
+ }
+
+ /**
+ * Produce a string from a double. The string "null" will be returned if the
+ * number is not finite.
+ *
+ * @param d
+ * A double.
+ * @return A String.
+ */
+ public static String doubleToString(double d) {
+ if (Double.isInfinite(d) || Double.isNaN(d)) {
+ return "null";
+ }
+
+// Shave off trailing zeros and decimal point, if possible.
+
+ String string = Double.toString(d);
+ if (string.indexOf('.') > 0 && string.indexOf('e') < 0
+ && string.indexOf('E') < 0) {
+ while (string.endsWith("0")) {
+ string = string.substring(0, string.length() - 1);
+ }
+ if (string.endsWith(".")) {
+ string = string.substring(0, string.length() - 1);
+ }
+ }
+ return string;
+ }
+
+ /**
+ * Get the value object associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return The object associated with the key.
+ * @throws JSONException
+ * if the key is not found.
+ */
+ public Object get(String key) throws JSONException {
+ if (key == null) {
+ throw new JSONException("Null key.");
+ }
+ Object object = this.opt(key);
+ if (object == null) {
+ throw new JSONException("JSONObject[" + quote(key) + "] not found.");
+ }
+ return object;
+ }
+
+ /**
+ * Get the boolean value associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return The truth.
+ * @throws JSONException
+ * if the value is not a Boolean or the String "true" or
+ * "false".
+ */
+ public boolean getBoolean(String key) throws JSONException {
+ Object object = this.get(key);
+ if (object.equals(Boolean.FALSE)
+ || (object instanceof String && ((String) object)
+ .equalsIgnoreCase("false"))) {
+ return false;
+ } else if (object.equals(Boolean.TRUE)
+ || (object instanceof String && ((String) object)
+ .equalsIgnoreCase("true"))) {
+ return true;
+ }
+ throw new JSONException("JSONObject[" + quote(key)
+ + "] is not a Boolean.");
+ }
+
+ /**
+ * Get the double value associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return The numeric value.
+ * @throws JSONException
+ * if the key is not found or if the value is not a Number
+ * object and cannot be converted to a number.
+ */
+ public double getDouble(String key) throws JSONException {
+ Object object = this.get(key);
+ try {
+ return object instanceof Number ? ((Number) object).doubleValue()
+ : Double.parseDouble((String) object);
+ } catch (Exception e) {
+ throw new JSONException("JSONObject[" + quote(key)
+ + "] is not a number.");
+ }
+ }
+
+ /**
+ * Get the int value associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return The integer value.
+ * @throws JSONException
+ * if the key is not found or if the value cannot be converted
+ * to an integer.
+ */
+ public int getInt(String key) throws JSONException {
+ Object object = this.get(key);
+ try {
+ return object instanceof Number ? ((Number) object).intValue()
+ : Integer.parseInt((String) object);
+ } catch (Exception e) {
+ throw new JSONException("JSONObject[" + quote(key)
+ + "] is not an int.");
+ }
+ }
+
+ /**
+ * Get the JSONArray value associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return A JSONArray which is the value.
+ * @throws JSONException
+ * if the key is not found or if the value is not a JSONArray.
+ */
+ public JSONArray getJSONArray(String key) throws JSONException {
+ Object object = this.get(key);
+ if (object instanceof JSONArray) {
+ return (JSONArray) object;
+ }
+ throw new JSONException("JSONObject[" + quote(key)
+ + "] is not a JSONArray.");
+ }
+
+ /**
+ * Get the JSONObject value associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return A JSONObject which is the value.
+ * @throws JSONException
+ * if the key is not found or if the value is not a JSONObject.
+ */
+ public JSONObject getJSONObject(String key) throws JSONException {
+ Object object = this.get(key);
+ if (object instanceof JSONObject) {
+ return (JSONObject) object;
+ }
+ throw new JSONException("JSONObject[" + quote(key)
+ + "] is not a JSONObject.");
+ }
+
+ /**
+ * Get the long value associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return The long value.
+ * @throws JSONException
+ * if the key is not found or if the value cannot be converted
+ * to a long.
+ */
+ public long getLong(String key) throws JSONException {
+ Object object = this.get(key);
+ try {
+ return object instanceof Number ? ((Number) object).longValue()
+ : Long.parseLong((String) object);
+ } catch (Exception e) {
+ throw new JSONException("JSONObject[" + quote(key)
+ + "] is not a long.");
+ }
+ }
+
+ /**
+ * Get an array of field names from a JSONObject.
+ *
+ * @return An array of field names, or null if there are no names.
+ */
+ public static String[] getNames(JSONObject jo) {
+ int length = jo.length();
+ if (length == 0) {
+ return null;
+ }
+ Iterator iterator = jo.keys();
+ String[] names = new String[length];
+ int i = 0;
+ while (iterator.hasNext()) {
+ names[i] = (String) iterator.next();
+ i += 1;
+ }
+ return names;
+ }
+
+ /**
+ * Get an array of field names from an Object.
+ *
+ * @return An array of field names, or null if there are no names.
+ */
+ public static String[] getNames(Object object) {
+ if (object == null) {
+ return null;
+ }
+ Class klass = object.getClass();
+ Field[] fields = klass.getFields();
+ int length = fields.length;
+ if (length == 0) {
+ return null;
+ }
+ String[] names = new String[length];
+ for (int i = 0; i < length; i += 1) {
+ names[i] = fields[i].getName();
+ }
+ return names;
+ }
+
+ /**
+ * Get the string associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return A string which is the value.
+ * @throws JSONException
+ * if there is no string value for the key.
+ */
+ public String getString(String key) throws JSONException {
+ Object object = this.get(key);
+ if (object instanceof String) {
+ return (String) object;
+ }
+ throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
+ }
+
+ /**
+ * Determine if the JSONObject contains a specific key.
+ *
+ * @param key
+ * A key string.
+ * @return true if the key exists in the JSONObject.
+ */
+ public boolean has(String key) {
+ return this.map.containsKey(key);
+ }
+
+ /**
+ * Increment a property of a JSONObject. If there is no such property,
+ * create one with a value of 1. If there is such a property, and if it is
+ * an Integer, Long, Double, or Float, then add one to it.
+ *
+ * @param key
+ * A key string.
+ * @return this.
+ * @throws JSONException
+ * If there is already a property with this name that is not an
+ * Integer, Long, Double, or Float.
+ */
+ public JSONObject increment(String key) throws JSONException {
+ Object value = this.opt(key);
+ if (value == null) {
+ this.put(key, 1);
+ } else if (value instanceof Integer) {
+ this.put(key, ((Integer) value).intValue() + 1);
+ } else if (value instanceof Long) {
+ this.put(key, ((Long) value).longValue() + 1);
+ } else if (value instanceof Double) {
+ this.put(key, ((Double) value).doubleValue() + 1);
+ } else if (value instanceof Float) {
+ this.put(key, ((Float) value).floatValue() + 1);
+ } else {
+ throw new JSONException("Unable to increment [" + quote(key) + "].");
+ }
+ return this;
+ }
+
+ /**
+ * Determine if the value associated with the key is null or if there is no
+ * value.
+ *
+ * @param key
+ * A key string.
+ * @return true if there is no value associated with the key or if the value
+ * is the JSONObject.NULL object.
+ */
+ public boolean isNull(String key) {
+ return JSONObject.NULL.equals(this.opt(key));
+ }
+
+ /**
+ * Get an enumeration of the keys of the JSONObject.
+ *
+ * @return An iterator of the keys.
+ */
+ public Iterator keys() {
+ return this.keySet().iterator();
+ }
+
+ /**
+ * Get a set of keys of the JSONObject.
+ *
+ * @return A keySet.
+ */
+ public Set keySet() {
+ return this.map.keySet();
+ }
+
+ /**
+ * Get the number of keys stored in the JSONObject.
+ *
+ * @return The number of keys in the JSONObject.
+ */
+ public int length() {
+ return this.map.size();
+ }
+
+ /**
+ * Produce a JSONArray containing the names of the elements of this
+ * JSONObject.
+ *
+ * @return A JSONArray containing the key strings, or null if the JSONObject
+ * is empty.
+ */
+ public JSONArray names() {
+ JSONArray ja = new JSONArray();
+ Iterator keys = this.keys();
+ while (keys.hasNext()) {
+ ja.put(keys.next());
+ }
+ return ja.length() == 0 ? null : ja;
+ }
+
+ /**
+ * Produce a string from a Number.
+ *
+ * @param number
+ * A Number
+ * @return A String.
+ * @throws JSONException
+ * If n is a non-finite number.
+ */
+ public static String numberToString(Number number) throws JSONException {
+ if (number == null) {
+ throw new JSONException("Null pointer");
+ }
+ testValidity(number);
+
+// Shave off trailing zeros and decimal point, if possible.
+
+ String string = number.toString();
+ if (string.indexOf('.') > 0 && string.indexOf('e') < 0
+ && string.indexOf('E') < 0) {
+ while (string.endsWith("0")) {
+ string = string.substring(0, string.length() - 1);
+ }
+ if (string.endsWith(".")) {
+ string = string.substring(0, string.length() - 1);
+ }
+ }
+ return string;
+ }
+
+ /**
+ * Get an optional value associated with a key.
+ *
+ * @param key
+ * A key string.
+ * @return An object which is the value, or null if there is no value.
+ */
+ public Object opt(String key) {
+ return key == null ? null : this.map.get(key);
+ }
+
+ /**
+ * Get an optional boolean associated with a key. It returns false if there
+ * is no such key, or if the value is not Boolean.TRUE or the String "true".
+ *
+ * @param key
+ * A key string.
+ * @return The truth.
+ */
+ public boolean optBoolean(String key) {
+ return this.optBoolean(key, false);
+ }
+
+ /**
+ * Get an optional boolean associated with a key. It returns the
+ * defaultValue if there is no such key, or if it is not a Boolean or the
+ * String "true" or "false" (case insensitive).
+ *
+ * @param key
+ * A key string.
+ * @param defaultValue
+ * The default.
+ * @return The truth.
+ */
+ public boolean optBoolean(String key, boolean defaultValue) {
+ try {
+ return this.getBoolean(key);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get an optional double associated with a key, or NaN if there is no such
+ * key or if its value is not a number. If the value is a string, an attempt
+ * will be made to evaluate it as a number.
+ *
+ * @param key
+ * A string which is the key.
+ * @return An object which is the value.
+ */
+ public double optDouble(String key) {
+ return this.optDouble(key, Double.NaN);
+ }
+
+ /**
+ * Get an optional double associated with a key, or the defaultValue if
+ * there is no such key or if its value is not a number. If the value is a
+ * string, an attempt will be made to evaluate it as a number.
+ *
+ * @param key
+ * A key string.
+ * @param defaultValue
+ * The default.
+ * @return An object which is the value.
+ */
+ public double optDouble(String key, double defaultValue) {
+ try {
+ return this.getDouble(key);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get an optional int value associated with a key, or zero if there is no
+ * such key or if the value is not a number. If the value is a string, an
+ * attempt will be made to evaluate it as a number.
+ *
+ * @param key
+ * A key string.
+ * @return An object which is the value.
+ */
+ public int optInt(String key) {
+ return this.optInt(key, 0);
+ }
+
+ /**
+ * Get an optional int value associated with a key, or the default if there
+ * is no such key or if the value is not a number. If the value is a string,
+ * an attempt will be made to evaluate it as a number.
+ *
+ * @param key
+ * A key string.
+ * @param defaultValue
+ * The default.
+ * @return An object which is the value.
+ */
+ public int optInt(String key, int defaultValue) {
+ try {
+ return this.getInt(key);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get an optional JSONArray associated with a key. It returns null if there
+ * is no such key, or if its value is not a JSONArray.
+ *
+ * @param key
+ * A key string.
+ * @return A JSONArray which is the value.
+ */
+ public JSONArray optJSONArray(String key) {
+ Object o = this.opt(key);
+ return o instanceof JSONArray ? (JSONArray) o : null;
+ }
+
+ /**
+ * Get an optional JSONObject associated with a key. It returns null if
+ * there is no such key, or if its value is not a JSONObject.
+ *
+ * @param key
+ * A key string.
+ * @return A JSONObject which is the value.
+ */
+ public JSONObject optJSONObject(String key) {
+ Object object = this.opt(key);
+ return object instanceof JSONObject ? (JSONObject) object : null;
+ }
+
+ /**
+ * Get an optional long value associated with a key, or zero if there is no
+ * such key or if the value is not a number. If the value is a string, an
+ * attempt will be made to evaluate it as a number.
+ *
+ * @param key
+ * A key string.
+ * @return An object which is the value.
+ */
+ public long optLong(String key) {
+ return this.optLong(key, 0);
+ }
+
+ /**
+ * Get an optional long value associated with a key, or the default if there
+ * is no such key or if the value is not a number. If the value is a string,
+ * an attempt will be made to evaluate it as a number.
+ *
+ * @param key
+ * A key string.
+ * @param defaultValue
+ * The default.
+ * @return An object which is the value.
+ */
+ public long optLong(String key, long defaultValue) {
+ try {
+ return this.getLong(key);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ /**
+ * Get an optional string associated with a key. It returns an empty string
+ * if there is no such key. If the value is not a string and is not null,
+ * then it is converted to a string.
+ *
+ * @param key
+ * A key string.
+ * @return A string which is the value.
+ */
+ public String optString(String key) {
+ return this.optString(key, "");
+ }
+
+ /**
+ * Get an optional string associated with a key. It returns the defaultValue
+ * if there is no such key.
+ *
+ * @param key
+ * A key string.
+ * @param defaultValue
+ * The default.
+ * @return A string which is the value.
+ */
+ public String optString(String key, String defaultValue) {
+ Object object = this.opt(key);
+ return NULL.equals(object) ? defaultValue : object.toString();
+ }
+
+ private void populateMap(Object bean) {
+ Class klass = bean.getClass();
+
+// If klass is a System class then set includeSuperClass to false.
+
+ boolean includeSuperClass = klass.getClassLoader() != null;
+
+ Method[] methods = includeSuperClass ? klass.getMethods() : klass
+ .getDeclaredMethods();
+ for (int i = 0; i < methods.length; i += 1) {
+ try {
+ Method method = methods[i];
+ if (Modifier.isPublic(method.getModifiers())) {
+ String name = method.getName();
+ String key = "";
+ if (name.startsWith("get")) {
+ if ("getClass".equals(name)
+ || "getDeclaringClass".equals(name)) {
+ key = "";
+ } else {
+ key = name.substring(3);
+ }
+ } else if (name.startsWith("is")) {
+ key = name.substring(2);
+ }
+ if (key.length() > 0
+ && Character.isUpperCase(key.charAt(0))
+ && method.getParameterTypes().length == 0) {
+ if (key.length() == 1) {
+ key = key.toLowerCase();
+ } else if (!Character.isUpperCase(key.charAt(1))) {
+ key = key.substring(0, 1).toLowerCase()
+ + key.substring(1);
+ }
+
+ Object result = method.invoke(bean, (Object[]) null);
+ if (result != null) {
+ this.map.put(key, wrap(result));
+ }
+ }
+ }
+ } catch (Exception ignore) {
+ }
+ }
+ }
+
+ /**
+ * Put a key/boolean pair in the JSONObject.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * A boolean which is the value.
+ * @return this.
+ * @throws JSONException
+ * If the key is null.
+ */
+ public JSONObject put(String key, boolean value) throws JSONException {
+ this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
+ return this;
+ }
+
+ /**
+ * Put a key/value pair in the JSONObject, where the value will be a
+ * JSONArray which is produced from a Collection.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * A Collection value.
+ * @return this.
+ * @throws JSONException
+ */
+ public JSONObject put(String key, Collection value) throws JSONException {
+ this.put(key, new JSONArray(value));
+ return this;
+ }
+
+ /**
+ * Put a key/double pair in the JSONObject.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * A double which is the value.
+ * @return this.
+ * @throws JSONException
+ * If the key is null or if the number is invalid.
+ */
+ public JSONObject put(String key, double value) throws JSONException {
+ this.put(key, new Double(value));
+ return this;
+ }
+
+ /**
+ * Put a key/int pair in the JSONObject.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * An int which is the value.
+ * @return this.
+ * @throws JSONException
+ * If the key is null.
+ */
+ public JSONObject put(String key, int value) throws JSONException {
+ this.put(key, new Integer(value));
+ return this;
+ }
+
+ /**
+ * Put a key/long pair in the JSONObject.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * A long which is the value.
+ * @return this.
+ * @throws JSONException
+ * If the key is null.
+ */
+ public JSONObject put(String key, long value) throws JSONException {
+ this.put(key, new Long(value));
+ return this;
+ }
+
+ /**
+ * Put a key/value pair in the JSONObject, where the value will be a
+ * JSONObject which is produced from a Map.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * A Map value.
+ * @return this.
+ * @throws JSONException
+ */
+ public JSONObject put(String key, Map value) throws JSONException {
+ this.put(key, new JSONObject(value));
+ return this;
+ }
+
+ /**
+ * Put a key/value pair in the JSONObject. If the value is null, then the
+ * key will be removed from the JSONObject if it is present.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * An object which is the value. It should be of one of these
+ * types: Boolean, Double, Integer, JSONArray, JSONObject, Long,
+ * String, or the JSONObject.NULL object.
+ * @return this.
+ * @throws JSONException
+ * If the value is non-finite number or if the key is null.
+ */
+ public JSONObject put(String key, Object value) throws JSONException {
+ if (key == null) {
+ throw new NullPointerException("Null key.");
+ }
+ if (value != null) {
+ testValidity(value);
+ this.map.put(key, value);
+ } else {
+ this.remove(key);
+ }
+ return this;
+ }
+
+ /**
+ * Put a key/value pair in the JSONObject, but only if the key and the value
+ * are both non-null, and only if there is not already a member with that
+ * name.
+ *
+ * @param key
+ * @param value
+ * @return his.
+ * @throws JSONException
+ * if the key is a duplicate
+ */
+ public JSONObject putOnce(String key, Object value) throws JSONException {
+ if (key != null && value != null) {
+ if (this.opt(key) != null) {
+ throw new JSONException("Duplicate key \"" + key + "\"");
+ }
+ this.put(key, value);
+ }
+ return this;
+ }
+
+ /**
+ * Put a key/value pair in the JSONObject, but only if the key and the value
+ * are both non-null.
+ *
+ * @param key
+ * A key string.
+ * @param value
+ * An object which is the value. It should be of one of these
+ * types: Boolean, Double, Integer, JSONArray, JSONObject, Long,
+ * String, or the JSONObject.NULL object.
+ * @return this.
+ * @throws JSONException
+ * If the value is a non-finite number.
+ */
+ public JSONObject putOpt(String key, Object value) throws JSONException {
+ if (key != null && value != null) {
+ this.put(key, value);
+ }
+ return this;
+ }
+
+ /**
+ * Produce a string in double quotes with backslash sequences in all the
+ * right places. A backslash will be inserted within </, producing <\/,
+ * allowing JSON text to be delivered in HTML. In JSON text, a string cannot
+ * contain a control character or an unescaped quote or backslash.
+ *
+ * @param string
+ * A String
+ * @return A String correctly formatted for insertion in a JSON text.
+ */
+ public static String quote(String string) {
+ StringWriter sw = new StringWriter();
+ synchronized (sw.getBuffer()) {
+ try {
+ return quote(string, sw).toString();
+ } catch (IOException ignored) {
+ // will never happen - we are writing to a string writer
+ return "";
+ }
+ }
+ }
+
+ public static Writer quote(String string, Writer w) throws IOException {
+ if (string == null || string.length() == 0) {
+ w.write("\"\"");
+ return w;
+ }
+
+ char b;
+ char c = 0;
+ String hhhh;
+ int i;
+ int len = string.length();
+
+ w.write('"');
+ for (i = 0; i < len; i += 1) {
+ b = c;
+ c = string.charAt(i);
+ switch (c) {
+ case '\\':
+ case '"':
+ w.write('\\');
+ w.write(c);
+ break;
+ case '/':
+ if (b == '<') {
+ w.write('\\');
+ }
+ w.write(c);
+ break;
+ case '\b':
+ w.write("\\b");
+ break;
+ case '\t':
+ w.write("\\t");
+ break;
+ case '\n':
+ w.write("\\n");
+ break;
+ case '\f':
+ w.write("\\f");
+ break;
+ case '\r':
+ w.write("\\r");
+ break;
+ default:
+ if (c < ' ' || (c >= '\u0080' && c < '\u00a0')
+ || (c >= '\u2000' && c < '\u2100')) {
+ w.write("\\u");
+ hhhh = Integer.toHexString(c);
+ w.write("0000", 0, 4 - hhhh.length());
+ w.write(hhhh);
+ } else {
+ w.write(c);
+ }
+ }
+ }
+ w.write('"');
+ return w;
+ }
+
+ /**
+ * Remove a name and its value, if present.
+ *
+ * @param key
+ * The name to be removed.
+ * @return The value that was associated with the name, or null if there was
+ * no value.
+ */
+ public Object remove(String key) {
+ return this.map.remove(key);
+ }
+
+ /**
+ * Try to convert a string into a number, boolean, or null. If the string
+ * can't be converted, return the string.
+ *
+ * @param string
+ * A String.
+ * @return A simple JSON value.
+ */
+ public static Object stringToValue(String string) {
+ Double d;
+ if (string.equals("")) {
+ return string;
+ }
+ if (string.equalsIgnoreCase("true")) {
+ return Boolean.TRUE;
+ }
+ if (string.equalsIgnoreCase("false")) {
+ return Boolean.FALSE;
+ }
+ if (string.equalsIgnoreCase("null")) {
+ return JSONObject.NULL;
+ }
+
+ /*
+ * If it might be a number, try converting it. If a number cannot be
+ * produced, then the value will just be a string.
+ */
+
+ char b = string.charAt(0);
+ if ((b >= '0' && b <= '9') || b == '-') {
+ try {
+ if (string.indexOf('.') > -1 || string.indexOf('e') > -1
+ || string.indexOf('E') > -1) {
+ d = Double.valueOf(string);
+ if (!d.isInfinite() && !d.isNaN()) {
+ return d;
+ }
+ } else {
+ Long myLong = new Long(string);
+ if (string.equals(myLong.toString())) {
+ if (myLong.longValue() == myLong.intValue()) {
+ return new Integer(myLong.intValue());
+ } else {
+ return myLong;
+ }
+ }
+ }
+ } catch (Exception ignore) {
+ }
+ }
+ return string;
+ }
+
+ /**
+ * Throw an exception if the object is a NaN or infinite number.
+ *
+ * @param o
+ * The object to test.
+ * @throws JSONException
+ * If o is a non-finite number.
+ */
+ public static void testValidity(Object o) throws JSONException {
+ if (o != null) {
+ if (o instanceof Double) {
+ if (((Double) o).isInfinite() || ((Double) o).isNaN()) {
+ throw new JSONException(
+ "JSON does not allow non-finite numbers.");
+ }
+ } else if (o instanceof Float) {
+ if (((Float) o).isInfinite() || ((Float) o).isNaN()) {
+ throw new JSONException(
+ "JSON does not allow non-finite numbers.");
+ }
+ }
+ }
+ }
+
+ /**
+ * Produce a JSONArray containing the values of the members of this
+ * JSONObject.
+ *
+ * @param names
+ * A JSONArray containing a list of key strings. This determines
+ * the sequence of the values in the result.
+ * @return A JSONArray of values.
+ * @throws JSONException
+ * If any of the values are non-finite numbers.
+ */
+ public JSONArray toJSONArray(JSONArray names) throws JSONException {
+ if (names == null || names.length() == 0) {
+ return null;
+ }
+ JSONArray ja = new JSONArray();
+ for (int i = 0; i < names.length(); i += 1) {
+ ja.put(this.opt(names.getString(i)));
+ }
+ return ja;
+ }
+
+ /**
+ * Make a JSON text of this JSONObject. For compactness, no whitespace is
+ * added. If this would not result in a syntactically correct JSON text,
+ * then null will be returned instead.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return a printable, displayable, portable, transmittable representation
+ * of the object, beginning with <code>{</code> <small>(left
+ * brace)</small> and ending with <code>}</code> <small>(right
+ * brace)</small>.
+ */
+ public String toString() {
+ try {
+ return this.toString(0);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /**
+ * Make a prettyprinted JSON text of this JSONObject.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @param indentFactor
+ * The number of spaces to add to each level of indentation.
+ * @return a printable, displayable, portable, transmittable representation
+ * of the object, beginning with <code>{</code> <small>(left
+ * brace)</small> and ending with <code>}</code> <small>(right
+ * brace)</small>.
+ * @throws JSONException
+ * If the object contains an invalid number.
+ */
+ public String toString(int indentFactor) throws JSONException {
+ StringWriter w = new StringWriter();
+ synchronized (w.getBuffer()) {
+ return this.write(w, indentFactor, 0).toString();
+ }
+ }
+
+ /**
+ * Make a JSON text of an Object value. If the object has an
+ * value.toJSONString() method, then that method will be used to produce the
+ * JSON text. The method is required to produce a strictly conforming text.
+ * If the object does not contain a toJSONString method (which is the most
+ * common case), then a text will be produced by other means. If the value
+ * is an array or Collection, then a JSONArray will be made from it and its
+ * toJSONString method will be called. If the value is a MAP, then a
+ * JSONObject will be made from it and its toJSONString method will be
+ * called. Otherwise, the value's toString method will be called, and the
+ * result will be quoted.
+ *
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @param value
+ * The value to be serialized.
+ * @return a printable, displayable, transmittable representation of the
+ * object, beginning with <code>{</code> <small>(left
+ * brace)</small> and ending with <code>}</code> <small>(right
+ * brace)</small>.
+ * @throws JSONException
+ * If the value is or contains an invalid number.
+ */
+ public static String valueToString(Object value) throws JSONException {
+ if (value == null || value.equals(null)) {
+ return "null";
+ }
+ if (value instanceof JSONString) {
+ Object object;
+ try {
+ object = ((JSONString) value).toJSONString();
+ } catch (Exception e) {
+ throw new JSONException(e);
+ }
+ if (object instanceof String) {
+ return (String) object;
+ }
+ throw new JSONException("Bad value from toJSONString: " + object);
+ }
+ if (value instanceof Number) {
+ return numberToString((Number) value);
+ }
+ if (value instanceof Boolean || value instanceof JSONObject
+ || value instanceof JSONArray) {
+ return value.toString();
+ }
+ if (value instanceof Map) {
+ return new JSONObject((Map) value).toString();
+ }
+ if (value instanceof Collection) {
+ return new JSONArray((Collection) value).toString();
+ }
+ if (value.getClass().isArray()) {
+ return new JSONArray(value).toString();
+ }
+ return quote(value.toString());
+ }
+
+ /**
+ * Wrap an object, if necessary. If the object is null, return the NULL
+ * object. If it is an array or collection, wrap it in a JSONArray. If it is
+ * a map, wrap it in a JSONObject. If it is a standard property (Double,
+ * String, et al) then it is already wrapped. Otherwise, if it comes from
+ * one of the java packages, turn it into a string. And if it doesn't, try
+ * to wrap it in a JSONObject. If the wrapping fails, then null is returned.
+ *
+ * @param object
+ * The object to wrap
+ * @return The wrapped value
+ */
+ public static Object wrap(Object object) {
+ try {
+ if (object == null) {
+ return NULL;
+ }
+ if (object instanceof JSONObject || object instanceof JSONArray
+ || NULL.equals(object) || object instanceof JSONString
+ || object instanceof Byte || object instanceof Character
+ || object instanceof Short || object instanceof Integer
+ || object instanceof Long || object instanceof Boolean
+ || object instanceof Float || object instanceof Double
+ || object instanceof String) {
+ return object;
+ }
+
+ if (object instanceof Collection) {
+ return new JSONArray((Collection) object);
+ }
+ if (object.getClass().isArray()) {
+ return new JSONArray(object);
+ }
+ if (object instanceof Map) {
+ return new JSONObject((Map) object);
+ }
+ Package objectPackage = object.getClass().getPackage();
+ String objectPackageName = objectPackage != null ? objectPackage
+ .getName() : "";
+ if (objectPackageName.startsWith("java.")
+ || objectPackageName.startsWith("javax.")
+ || object.getClass().getClassLoader() == null) {
+ return object.toString();
+ }
+ return new JSONObject(object);
+ } catch (Exception exception) {
+ return null;
+ }
+ }
+
+ /**
+ * Write the contents of the JSONObject as JSON text to a writer. For
+ * compactness, no whitespace is added.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return The writer.
+ * @throws JSONException
+ */
+ public Writer write(Writer writer) throws JSONException {
+ return this.write(writer, 0, 0);
+ }
+
+ static final Writer writeValue(Writer writer, Object value,
+ int indentFactor, int indent) throws JSONException, IOException {
+ if (value == null || value.equals(null)) {
+ writer.write("null");
+ } else if (value instanceof JSONObject) {
+ ((JSONObject) value).write(writer, indentFactor, indent);
+ } else if (value instanceof JSONArray) {
+ ((JSONArray) value).write(writer, indentFactor, indent);
+ } else if (value instanceof Map) {
+ new JSONObject((Map) value).write(writer, indentFactor, indent);
+ } else if (value instanceof Collection) {
+ new JSONArray((Collection) value).write(writer, indentFactor,
+ indent);
+ } else if (value.getClass().isArray()) {
+ new JSONArray(value).write(writer, indentFactor, indent);
+ } else if (value instanceof Number) {
+ writer.write(numberToString((Number) value));
+ } else if (value instanceof Boolean) {
+ writer.write(value.toString());
+ } else if (value instanceof JSONString) {
+ Object o;
+ try {
+ o = ((JSONString) value).toJSONString();
+ } catch (Exception e) {
+ throw new JSONException(e);
+ }
+ writer.write(o != null ? o.toString() : quote(value.toString()));
+ } else {
+ quote(value.toString(), writer);
+ }
+ return writer;
+ }
+
+ static final void indent(Writer writer, int indent) throws IOException {
+ for (int i = 0; i < indent; i += 1) {
+ writer.write(' ');
+ }
+ }
+
+ /**
+ * Write the contents of the JSONObject as JSON text to a writer. For
+ * compactness, no whitespace is added.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return The writer.
+ * @throws JSONException
+ */
+ Writer write(Writer writer, int indentFactor, int indent)
+ throws JSONException {
+ try {
+ boolean commanate = false;
+ final int length = this.length();
+ Iterator keys = this.keys();
+ writer.write('{');
+
+ if (length == 1) {
+ Object key = keys.next();
+ writer.write(quote(key.toString()));
+ writer.write(':');
+ if (indentFactor > 0) {
+ writer.write(' ');
+ }
+ writeValue(writer, this.map.get(key), indentFactor, indent);
+ } else if (length != 0) {
+ final int newindent = indent + indentFactor;
+ while (keys.hasNext()) {
+ Object key = keys.next();
+ if (commanate) {
+ writer.write(',');
+ }
+ if (indentFactor > 0) {
+ writer.write('\n');
+ }
+ indent(writer, newindent);
+ writer.write(quote(key.toString()));
+ writer.write(':');
+ if (indentFactor > 0) {
+ writer.write(' ');
+ }
+ writeValue(writer, this.map.get(key), indentFactor,
+ newindent);
+ commanate = true;
+ }
+ if (indentFactor > 0) {
+ writer.write('\n');
+ }
+ indent(writer, indent);
+ }
+ writer.write('}');
+ return writer;
+ } catch (IOException exception) {
+ throw new JSONException(exception);
+ }
+ }
+}
diff --git a/src/org/json/JSONString.java b/src/org/json/JSONString.java
new file mode 100644
index 0000000..1f2d77d
--- /dev/null
+++ b/src/org/json/JSONString.java
@@ -0,0 +1,18 @@
+package org.json;
+/**
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
+ * method so that a class can change the behavior of
+ * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
+ * and <code>JSONWriter.value(</code>Object<code>)</code>. The
+ * <code>toJSONString</code> method will be used instead of the default behavior
+ * of using the Object's <code>toString()</code> method and quoting the result.
+ */
+public interface JSONString {
+ /**
+ * The <code>toJSONString</code> method allows a class to produce its own JSON
+ * serialization.
+ *
+ * @return A strictly syntactically correct JSON text.
+ */
+ public String toJSONString();
+}
diff --git a/src/org/json/JSONStringer.java b/src/org/json/JSONStringer.java
new file mode 100644
index 0000000..25c2e5d
--- /dev/null
+++ b/src/org/json/JSONStringer.java
@@ -0,0 +1,78 @@
+package org.json;
+
+/*
+Copyright (c) 2006 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+import java.io.StringWriter;
+
+/**
+ * JSONStringer provides a quick and convenient way of producing JSON text.
+ * The texts produced strictly conform to JSON syntax rules. No whitespace is
+ * added, so the results are ready for transmission or storage. Each instance of
+ * JSONStringer can produce one JSON text.
+ * <p>
+ * A JSONStringer instance provides a <code>value</code> method for appending
+ * values to the
+ * text, and a <code>key</code>
+ * method for adding keys before values in objects. There are <code>array</code>
+ * and <code>endArray</code> methods that make and bound array values, and
+ * <code>object</code> and <code>endObject</code> methods which make and bound
+ * object values. All of these methods return the JSONWriter instance,
+ * permitting cascade style. For example, <pre>
+ * myString = new JSONStringer()
+ * .object()
+ * .key("JSON")
+ * .value("Hello, World!")
+ * .endObject()
+ * .toString();</pre> which produces the string <pre>
+ * {"JSON":"Hello, World!"}</pre>
+ * <p>
+ * The first method called must be <code>array</code> or <code>object</code>.
+ * There are no methods for adding commas or colons. JSONStringer adds them for
+ * you. Objects and arrays can be nested up to 20 levels deep.
+ * <p>
+ * This can sometimes be easier than using a JSONObject to build a string.
+ * @author JSON.org
+ * @version 2008-09-18
+ */
+public class JSONStringer extends JSONWriter {
+ /**
+ * Make a fresh JSONStringer. It can be used to build one JSON text.
+ */
+ public JSONStringer() {
+ super(new StringWriter());
+ }
+
+ /**
+ * Return the JSON text. This method is used to obtain the product of the
+ * JSONStringer instance. It will return <code>null</code> if there was a
+ * problem in the construction of the JSON text (such as the calls to
+ * <code>array</code> were not properly balanced with calls to
+ * <code>endArray</code>).
+ * @return The JSON text.
+ */
+ public String toString() {
+ return this.mode == 'd' ? this.writer.toString() : null;
+ }
+}
diff --git a/src/org/json/JSONTokener.java b/src/org/json/JSONTokener.java
new file mode 100644
index 0000000..13c84f1
--- /dev/null
+++ b/src/org/json/JSONTokener.java
@@ -0,0 +1,446 @@
+package org.json;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+
+/*
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/**
+ * A JSONTokener takes a source string and extracts characters and tokens from
+ * it. It is used by the JSONObject and JSONArray constructors to parse
+ * JSON source strings.
+ * @author JSON.org
+ * @version 2012-02-16
+ */
+public class JSONTokener {
+
+ private long character;
+ private boolean eof;
+ private long index;
+ private long line;
+ private char previous;
+ private Reader reader;
+ private boolean usePrevious;
+
+
+ /**
+ * Construct a JSONTokener from a Reader.
+ *
+ * @param reader A reader.
+ */
+ public JSONTokener(Reader reader) {
+ this.reader = reader.markSupported()
+ ? reader
+ : new BufferedReader(reader);
+ this.eof = false;
+ this.usePrevious = false;
+ this.previous = 0;
+ this.index = 0;
+ this.character = 1;
+ this.line = 1;
+ }
+
+
+ /**
+ * Construct a JSONTokener from an InputStream.
+ */
+ public JSONTokener(InputStream inputStream) throws JSONException {
+ this(new InputStreamReader(inputStream));
+ }
+
+
+ /**
+ * Construct a JSONTokener from a string.
+ *
+ * @param s A source string.
+ */
+ public JSONTokener(String s) {
+ this(new StringReader(s));
+ }
+
+
+ /**
+ * Back up one character. This provides a sort of lookahead capability,
+ * so that you can test for a digit or letter before attempting to parse
+ * the next number or identifier.
+ */
+ public void back() throws JSONException {
+ if (this.usePrevious || this.index <= 0) {
+ throw new JSONException("Stepping back two steps is not supported");
+ }
+ this.index -= 1;
+ this.character -= 1;
+ this.usePrevious = true;
+ this.eof = false;
+ }
+
+
+ /**
+ * Get the hex value of a character (base16).
+ * @param c A character between '0' and '9' or between 'A' and 'F' or
+ * between 'a' and 'f'.
+ * @return An int between 0 and 15, or -1 if c was not a hex digit.
+ */
+ public static int dehexchar(char c) {
+ if (c >= '0' && c <= '9') {
+ return c - '0';
+ }
+ if (c >= 'A' && c <= 'F') {
+ return c - ('A' - 10);
+ }
+ if (c >= 'a' && c <= 'f') {
+ return c - ('a' - 10);
+ }
+ return -1;
+ }
+
+ public boolean end() {
+ return this.eof && !this.usePrevious;
+ }
+
+
+ /**
+ * Determine if the source string still contains characters that next()
+ * can consume.
+ * @return true if not yet at the end of the source.
+ */
+ public boolean more() throws JSONException {
+ this.next();
+ if (this.end()) {
+ return false;
+ }
+ this.back();
+ return true;
+ }
+
+
+ /**
+ * Get the next character in the source string.
+ *
+ * @return The next character, or 0 if past the end of the source string.
+ */
+ public char next() throws JSONException {
+ int c;
+ if (this.usePrevious) {
+ this.usePrevious = false;
+ c = this.previous;
+ } else {
+ try {
+ c = this.reader.read();
+ } catch (IOException exception) {
+ throw new JSONException(exception);
+ }
+
+ if (c <= 0) { // End of stream
+ this.eof = true;
+ c = 0;
+ }
+ }
+ this.index += 1;
+ if (this.previous == '\r') {
+ this.line += 1;
+ this.character = c == '\n' ? 0 : 1;
+ } else if (c == '\n') {
+ this.line += 1;
+ this.character = 0;
+ } else {
+ this.character += 1;
+ }
+ this.previous = (char) c;
+ return this.previous;
+ }
+
+
+ /**
+ * Consume the next character, and check that it matches a specified
+ * character.
+ * @param c The character to match.
+ * @return The character.
+ * @throws JSONException if the character does not match.
+ */
+ public char next(char c) throws JSONException {
+ char n = this.next();
+ if (n != c) {
+ throw this.syntaxError("Expected '" + c + "' and instead saw '" +
+ n + "'");
+ }
+ return n;
+ }
+
+
+ /**
+ * Get the next n characters.
+ *
+ * @param n The number of characters to take.
+ * @return A string of n characters.
+ * @throws JSONException
+ * Substring bounds error if there are not
+ * n characters remaining in the source string.
+ */
+ public String next(int n) throws JSONException {
+ if (n == 0) {
+ return "";
+ }
+
+ char[] chars = new char[n];
+ int pos = 0;
+
+ while (pos < n) {
+ chars[pos] = this.next();
+ if (this.end()) {
+ throw this.syntaxError("Substring bounds error");
+ }
+ pos += 1;
+ }
+ return new String(chars);
+ }
+
+
+ /**
+ * Get the next char in the string, skipping whitespace.
+ * @throws JSONException
+ * @return A character, or 0 if there are no more characters.
+ */
+ public char nextClean() throws JSONException {
+ for (;;) {
+ char c = this.next();
+ if (c == 0 || c > ' ') {
+ return c;
+ }
+ }
+ }
+
+
+ /**
+ * Return the characters up to the next close quote character.
+ * Backslash processing is done. The formal JSON format does not
+ * allow strings in single quotes, but an implementation is allowed to
+ * accept them.
+ * @param quote The quoting character, either
+ * <code>"</code> <small>(double quote)</small> or
+ * <code>'</code> <small>(single quote)</small>.
+ * @return A String.
+ * @throws JSONException Unterminated string.
+ */
+ public String nextString(char quote) throws JSONException {
+ char c;
+ StringBuffer sb = new StringBuffer();
+ for (;;) {
+ c = this.next();
+ switch (c) {
+ case 0:
+ case '\n':
+ case '\r':
+ throw this.syntaxError("Unterminated string");
+ case '\\':
+ c = this.next();
+ switch (c) {
+ case 'b':
+ sb.append('\b');
+ break;
+ case 't':
+ sb.append('\t');
+ break;
+ case 'n':
+ sb.append('\n');
+ break;
+ case 'f':
+ sb.append('\f');
+ break;
+ case 'r':
+ sb.append('\r');
+ break;
+ case 'u':
+ sb.append((char)Integer.parseInt(this.next(4), 16));
+ break;
+ case '"':
+ case '\'':
+ case '\\':
+ case '/':
+ sb.append(c);
+ break;
+ default:
+ throw this.syntaxError("Illegal escape.");
+ }
+ break;
+ default:
+ if (c == quote) {
+ return sb.toString();
+ }
+ sb.append(c);
+ }
+ }
+ }
+
+
+ /**
+ * Get the text up but not including the specified character or the
+ * end of line, whichever comes first.
+ * @param delimiter A delimiter character.
+ * @return A string.
+ */
+ public String nextTo(char delimiter) throws JSONException {
+ StringBuffer sb = new StringBuffer();
+ for (;;) {
+ char c = this.next();
+ if (c == delimiter || c == 0 || c == '\n' || c == '\r') {
+ if (c != 0) {
+ this.back();
+ }
+ return sb.toString().trim();
+ }
+ sb.append(c);
+ }
+ }
+
+
+ /**
+ * Get the text up but not including one of the specified delimiter
+ * characters or the end of line, whichever comes first.
+ * @param delimiters A set of delimiter characters.
+ * @return A string, trimmed.
+ */
+ public String nextTo(String delimiters) throws JSONException {
+ char c;
+ StringBuffer sb = new StringBuffer();
+ for (;;) {
+ c = this.next();
+ if (delimiters.indexOf(c) >= 0 || c == 0 ||
+ c == '\n' || c == '\r') {
+ if (c != 0) {
+ this.back();
+ }
+ return sb.toString().trim();
+ }
+ sb.append(c);
+ }
+ }
+
+
+ /**
+ * Get the next value. The value can be a Boolean, Double, Integer,
+ * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
+ * @throws JSONException If syntax error.
+ *
+ * @return An object.
+ */
+ public Object nextValue() throws JSONException {
+ char c = this.nextClean();
+ String string;
+
+ switch (c) {
+ case '"':
+ case '\'':
+ return this.nextString(c);
+ case '{':
+ this.back();
+ return new JSONObject(this);
+ case '[':
+ this.back();
+ return new JSONArray(this);
+ }
+
+ /*
+ * Handle unquoted text. This could be the values true, false, or
+ * null, or it can be a number. An implementation (such as this one)
+ * is allowed to also accept non-standard forms.
+ *
+ * Accumulate characters until we reach the end of the text or a
+ * formatting character.
+ */
+
+ StringBuffer sb = new StringBuffer();
+ while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) {
+ sb.append(c);
+ c = this.next();
+ }
+ this.back();
+
+ string = sb.toString().trim();
+ if ("".equals(string)) {
+ throw this.syntaxError("Missing value");
+ }
+ return JSONObject.stringToValue(string);
+ }
+
+
+ /**
+ * Skip characters until the next character is the requested character.
+ * If the requested character is not found, no characters are skipped.
+ * @param to A character to skip to.
+ * @return The requested character, or zero if the requested character
+ * is not found.
+ */
+ public char skipTo(char to) throws JSONException {
+ char c;
+ try {
+ long startIndex = this.index;
+ long startCharacter = this.character;
+ long startLine = this.line;
+ this.reader.mark(1000000);
+ do {
+ c = this.next();
+ if (c == 0) {
+ this.reader.reset();
+ this.index = startIndex;
+ this.character = startCharacter;
+ this.line = startLine;
+ return c;
+ }
+ } while (c != to);
+ } catch (IOException exc) {
+ throw new JSONException(exc);
+ }
+
+ this.back();
+ return c;
+ }
+
+
+ /**
+ * Make a JSONException to signal a syntax error.
+ *
+ * @param message The error message.
+ * @return A JSONException object, suitable for throwing
+ */
+ public JSONException syntaxError(String message) {
+ return new JSONException(message + this.toString());
+ }
+
+
+ /**
+ * Make a printable string of this JSONTokener.
+ *
+ * @return " at {index} [character {character} line {line}]"
+ */
+ public String toString() {
+ return " at " + this.index + " [character " + this.character + " line " +
+ this.line + "]";
+ }
+}
diff --git a/src/org/json/JSONWriter.java b/src/org/json/JSONWriter.java
new file mode 100644
index 0000000..855b2bd
--- /dev/null
+++ b/src/org/json/JSONWriter.java
@@ -0,0 +1,327 @@
+package org.json;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/*
+Copyright (c) 2006 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/**
+ * JSONWriter provides a quick and convenient way of producing JSON text.
+ * The texts produced strictly conform to JSON syntax rules. No whitespace is
+ * added, so the results are ready for transmission or storage. Each instance of
+ * JSONWriter can produce one JSON text.
+ * <p>
+ * A JSONWriter instance provides a <code>value</code> method for appending
+ * values to the
+ * text, and a <code>key</code>
+ * method for adding keys before values in objects. There are <code>array</code>
+ * and <code>endArray</code> methods that make and bound array values, and
+ * <code>object</code> and <code>endObject</code> methods which make and bound
+ * object values. All of these methods return the JSONWriter instance,
+ * permitting a cascade style. For example, <pre>
+ * new JSONWriter(myWriter)
+ * .object()
+ * .key("JSON")
+ * .value("Hello, World!")
+ * .endObject();</pre> which writes <pre>
+ * {"JSON":"Hello, World!"}</pre>
+ * <p>
+ * The first method called must be <code>array</code> or <code>object</code>.
+ * There are no methods for adding commas or colons. JSONWriter adds them for
+ * you. Objects and arrays can be nested up to 20 levels deep.
+ * <p>
+ * This can sometimes be easier than using a JSONObject to build a string.
+ * @author JSON.org
+ * @version 2011-11-24
+ */
+public class JSONWriter {
+ private static final int maxdepth = 200;
+
+ /**
+ * The comma flag determines if a comma should be output before the next
+ * value.
+ */
+ private boolean comma;
+
+ /**
+ * The current mode. Values:
+ * 'a' (array),
+ * 'd' (done),
+ * 'i' (initial),
+ * 'k' (key),
+ * 'o' (object).
+ */
+ protected char mode;
+
+ /**
+ * The object/array stack.
+ */
+ private final JSONObject stack[];
+
+ /**
+ * The stack top index. A value of 0 indicates that the stack is empty.
+ */
+ private int top;
+
+ /**
+ * The writer that will receive the output.
+ */
+ protected Writer writer;
+
+ /**
+ * Make a fresh JSONWriter. It can be used to build one JSON text.
+ */
+ public JSONWriter(Writer w) {
+ this.comma = false;
+ this.mode = 'i';
+ this.stack = new JSONObject[maxdepth];
+ this.top = 0;
+ this.writer = w;
+ }
+
+ /**
+ * Append a value.
+ * @param string A string value.
+ * @return this
+ * @throws JSONException If the value is out of sequence.
+ */
+ private JSONWriter append(String string) throws JSONException {
+ if (string == null) {
+ throw new JSONException("Null pointer");
+ }
+ if (this.mode == 'o' || this.mode == 'a') {
+ try {
+ if (this.comma && this.mode == 'a') {
+ this.writer.write(',');
+ }
+ this.writer.write(string);
+ } catch (IOException e) {
+ throw new JSONException(e);
+ }
+ if (this.mode == 'o') {
+ this.mode = 'k';
+ }
+ this.comma = true;
+ return this;
+ }
+ throw new JSONException("Value out of sequence.");
+ }
+
+ /**
+ * Begin appending a new array. All values until the balancing
+ * <code>endArray</code> will be appended to this array. The
+ * <code>endArray</code> method must be called to mark the array's end.
+ * @return this
+ * @throws JSONException If the nesting is too deep, or if the object is
+ * started in the wrong place (for example as a key or after the end of the
+ * outermost array or object).
+ */
+ public JSONWriter array() throws JSONException {
+ if (this.mode == 'i' || this.mode == 'o' || this.mode == 'a') {
+ this.push(null);
+ this.append("[");
+ this.comma = false;
+ return this;
+ }
+ throw new JSONException("Misplaced array.");
+ }
+
+ /**
+ * End something.
+ * @param mode Mode
+ * @param c Closing character
+ * @return this
+ * @throws JSONException If unbalanced.
+ */
+ private JSONWriter end(char mode, char c) throws JSONException {
+ if (this.mode != mode) {
+ throw new JSONException(mode == 'a'
+ ? "Misplaced endArray."
+ : "Misplaced endObject.");
+ }
+ this.pop(mode);
+ try {
+ this.writer.write(c);
+ } catch (IOException e) {
+ throw new JSONException(e);
+ }
+ this.comma = true;
+ return this;
+ }
+
+ /**
+ * End an array. This method most be called to balance calls to
+ * <code>array</code>.
+ * @return this
+ * @throws JSONException If incorrectly nested.
+ */
+ public JSONWriter endArray() throws JSONException {
+ return this.end('a', ']');
+ }
+
+ /**
+ * End an object. This method most be called to balance calls to
+ * <code>object</code>.
+ * @return this
+ * @throws JSONException If incorrectly nested.
+ */
+ public JSONWriter endObject() throws JSONException {
+ return this.end('k', '}');
+ }
+
+ /**
+ * Append a key. The key will be associated with the next value. In an
+ * object, every value must be preceded by a key.
+ * @param string A key string.
+ * @return this
+ * @throws JSONException If the key is out of place. For example, keys
+ * do not belong in arrays or if the key is null.
+ */
+ public JSONWriter key(String string) throws JSONException {
+ if (string == null) {
+ throw new JSONException("Null key.");
+ }
+ if (this.mode == 'k') {
+ try {
+ this.stack[this.top - 1].putOnce(string, Boolean.TRUE);
+ if (this.comma) {
+ this.writer.write(',');
+ }
+ this.writer.write(JSONObject.quote(string));
+ this.writer.write(':');
+ this.comma = false;
+ this.mode = 'o';
+ return this;
+ } catch (IOException e) {
+ throw new JSONException(e);
+ }
+ }
+ throw new JSONException("Misplaced key.");
+ }
+
+
+ /**
+ * Begin appending a new object. All keys and values until the balancing
+ * <code>endObject</code> will be appended to this object. The
+ * <code>endObject</code> method must be called to mark the object's end.
+ * @return this
+ * @throws JSONException If the nesting is too deep, or if the object is
+ * started in the wrong place (for example as a key or after the end of the
+ * outermost array or object).
+ */
+ public JSONWriter object() throws JSONException {
+ if (this.mode == 'i') {
+ this.mode = 'o';
+ }
+ if (this.mode == 'o' || this.mode == 'a') {
+ this.append("{");
+ this.push(new JSONObject());
+ this.comma = false;
+ return this;
+ }
+ throw new JSONException("Misplaced object.");
+
+ }
+
+
+ /**
+ * Pop an array or object scope.
+ * @param c The scope to close.
+ * @throws JSONException If nesting is wrong.
+ */
+ private void pop(char c) throws JSONException {
+ if (this.top <= 0) {
+ throw new JSONException("Nesting error.");
+ }
+ char m = this.stack[this.top - 1] == null ? 'a' : 'k';
+ if (m != c) {
+ throw new JSONException("Nesting error.");
+ }
+ this.top -= 1;
+ this.mode = this.top == 0
+ ? 'd'
+ : this.stack[this.top - 1] == null
+ ? 'a'
+ : 'k';
+ }
+
+ /**
+ * Push an array or object scope.
+ * @param c The scope to open.
+ * @throws JSONException If nesting is too deep.
+ */
+ private void push(JSONObject jo) throws JSONException {
+ if (this.top >= maxdepth) {
+ throw new JSONException("Nesting too deep.");
+ }
+ this.stack[this.top] = jo;
+ this.mode = jo == null ? 'a' : 'k';
+ this.top += 1;
+ }
+
+
+ /**
+ * Append either the value <code>true</code> or the value
+ * <code>false</code>.
+ * @param b A boolean.
+ * @return this
+ * @throws JSONException
+ */
+ public JSONWriter value(boolean b) throws JSONException {
+ return this.append(b ? "true" : "false");
+ }
+
+ /**
+ * Append a double value.
+ * @param d A double.
+ * @return this
+ * @throws JSONException If the number is not finite.
+ */
+ public JSONWriter value(double d) throws JSONException {
+ return this.value(new Double(d));
+ }
+
+ /**
+ * Append a long value.
+ * @param l A long.
+ * @return this
+ * @throws JSONException
+ */
+ public JSONWriter value(long l) throws JSONException {
+ return this.append(Long.toString(l));
+ }
+
+
+ /**
+ * Append an object value.
+ * @param object The object to append. It can be null, or a Boolean, Number,
+ * String, JSONObject, or JSONArray, or an object that implements JSONString.
+ * @return this
+ * @throws JSONException If the value is out of sequence.
+ */
+ public JSONWriter value(Object object) throws JSONException {
+ return this.append(JSONObject.valueToString(object));
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java b/src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java
new file mode 100644
index 0000000..49b41ff
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/AbstractLayer.java
@@ -0,0 +1,87 @@
+package org.openstreetmap.gui.jmapviewer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AbstractLayer {
+ private LayerGroup parent;
+ private String name;
+ private String description;
+ private Style style;
+ private Boolean visible;
+ private Boolean visibleTexts=true;
+
+ public AbstractLayer(String name){
+ this(name, (String)null);
+ }
+ public AbstractLayer(String name, String description){
+ this(name, description, MapMarkerCircle.getDefaultStyle());
+ }
+ public AbstractLayer(String name, Style style){
+ this(name, null, style);
+ }
+ public AbstractLayer(String name, String description, Style style){
+ this(null, name, description, style);
+ }
+ public AbstractLayer(LayerGroup parent, String name){
+ this(parent, name, MapMarkerCircle.getDefaultStyle());
+ }
+ public AbstractLayer(LayerGroup parent, String name, Style style){
+ this(parent, name, null, style);
+ }
+ public AbstractLayer(LayerGroup parent, String name, String description, Style style){
+ setParent(parent);
+ setName(name);
+ setDescription(description);
+ setStyle(style);
+ setVisible(true);
+
+ if(parent!=null) parent.add(this);
+ }
+ public LayerGroup getParent() {
+ return parent;
+ }
+ public void setParent(LayerGroup parent) {
+ this.parent = parent;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
+ public Style getStyle() {
+ return style;
+ }
+ public void setStyle(Style style) {
+ this.style = style;
+ }
+ public Boolean isVisible() {
+ return visible;
+ }
+ public void setVisible(Boolean visible) {
+ this.visible = visible;
+ }
+ public static <E> List<E> add(List<E> list, E element) {
+ if(element!=null){
+ if(list==null) list = new ArrayList<E>();
+ if(!list.contains(element)) list.add(element);
+ }
+ return list;
+ }
+ public Boolean isVisibleTexts() {
+ return visibleTexts;
+ }
+ public void setVisibleTexts(Boolean visibleTexts) {
+ this.visibleTexts = visibleTexts;
+ }
+ public String toString(){
+ return name;
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java b/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
index a677524..84ef0b6 100644
--- a/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
+++ b/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
@@ -26,7 +26,7 @@ public class AttributionSupport {
private String attrTermsUrl;
public static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10);
public static final Font ATTR_LINK_FONT;
-
+
protected Rectangle attrTextBounds = null;
protected Rectangle attrToUBounds = null;
protected Rectangle attrImageBounds = null;
@@ -58,9 +58,9 @@ public class AttributionSupport {
attrToUBounds = null;
attrImageBounds = null;
attrTextBounds = null;
- return;
+ return;
}
-
+
// Draw attribution
Font font = g.getFont();
g.setFont(ATTR_LINK_FONT);
@@ -127,7 +127,7 @@ public class AttributionSupport {
}
return false;
}
-
+
public boolean handleAttribution(Point p, boolean click) {
if (source == null || !source.requiresAttribution())
return false;
diff --git a/src/org/openstreetmap/gui/jmapviewer/Coordinate.java b/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
index 47b20cf..f98338b 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
@@ -8,6 +8,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+
/**
* This class encapsulates a Point2D.Double and provide access
* via <tt>lat</tt> and <tt>lon</tt>.
@@ -15,7 +17,7 @@ import java.io.Serializable;
* @author Jan Peter Stotz
*
*/
-public class Coordinate implements Serializable {
+public class Coordinate implements Serializable, ICoordinate {
private transient Point2D.Double data;
public Coordinate(double lat, double lon) {
diff --git a/src/org/openstreetmap/gui/jmapviewer/Demo.java b/src/org/openstreetmap/gui/jmapviewer/Demo.java
index cb6da22..68c466b 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Demo.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Demo.java
@@ -4,6 +4,7 @@ package org.openstreetmap.gui.jmapviewer;
import java.awt.BorderLayout;
import java.awt.Cursor;
+import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@ -21,6 +22,7 @@ import javax.swing.JPanel;
import org.openstreetmap.gui.jmapviewer.events.JMVCommandEvent;
import org.openstreetmap.gui.jmapviewer.interfaces.JMapViewerEventListener;
+import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
@@ -39,7 +41,7 @@ public class Demo extends JFrame implements JMapViewerEventListener {
private static final long serialVersionUID = 1L;
- private JMapViewer map = null;
+ private JMapViewerTree treeMap = null;
private JLabel zoomLabel=null;
private JLabel zoomValue=null;
@@ -47,15 +49,18 @@ public class Demo extends JFrame implements JMapViewerEventListener {
private JLabel mperpLabelName=null;
private JLabel mperpLabelValue = null;
+ /**
+ * Constructs the {@code Demo}.
+ */
public Demo() {
super("JMapViewer Demo");
setSize(400, 400);
- map = new JMapViewer();
+ treeMap = new JMapViewerTree("Zones");
// Listen to the map viewer for user operations so components will
// recieve events and update
- map.addJMVListener(this);
+ map().addJMVListener(this);
// final JMapViewer map = new JMapViewer(new MemoryTileCache(),4);
// map.setTileLoader(new OsmFileCacheTileLoader(map));
@@ -70,10 +75,10 @@ public class Demo extends JFrame implements JMapViewerEventListener {
JPanel helpPanel = new JPanel();
mperpLabelName=new JLabel("Meters/Pixels: ");
- mperpLabelValue=new JLabel(String.format("%s",map.getMeterPerPixel()));
+ mperpLabelValue=new JLabel(String.format("%s",map().getMeterPerPixel()));
zoomLabel=new JLabel("Zoom: ");
- zoomValue=new JLabel(String.format("%s", map.getZoom()));
+ zoomValue=new JLabel(String.format("%s", map().getZoom()));
add(panel, BorderLayout.NORTH);
add(helpPanel, BorderLayout.SOUTH);
@@ -87,62 +92,76 @@ public class Demo extends JFrame implements JMapViewerEventListener {
button.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- map.setDisplayToFitMapMarkers();
+ map().setDisplayToFitMapMarkers();
}
});
JComboBox tileSourceSelector = new JComboBox(new TileSource[] { new OsmTileSource.Mapnik(),
new OsmTileSource.CycleMap(), new BingAerialTileSource(), new MapQuestOsmTileSource(), new MapQuestOpenAerialTileSource() });
tileSourceSelector.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
- map.setTileSource((TileSource) e.getItem());
+ map().setTileSource((TileSource) e.getItem());
}
});
JComboBox tileLoaderSelector;
try {
- tileLoaderSelector = new JComboBox(new TileLoader[] { new OsmFileCacheTileLoader(map),
- new OsmTileLoader(map) });
+ tileLoaderSelector = new JComboBox(new TileLoader[] { new OsmFileCacheTileLoader(map()),
+ new OsmTileLoader(map()) });
} catch (IOException e) {
- tileLoaderSelector = new JComboBox(new TileLoader[] { new OsmTileLoader(map) });
+ tileLoaderSelector = new JComboBox(new TileLoader[] { new OsmTileLoader(map()) });
}
tileLoaderSelector.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
- map.setTileLoader((TileLoader) e.getItem());
+ map().setTileLoader((TileLoader) e.getItem());
}
});
- map.setTileLoader((TileLoader) tileLoaderSelector.getSelectedItem());
+ map().setTileLoader((TileLoader) tileLoaderSelector.getSelectedItem());
panelTop.add(tileSourceSelector);
panelTop.add(tileLoaderSelector);
final JCheckBox showMapMarker = new JCheckBox("Map markers visible");
- showMapMarker.setSelected(map.getMapMarkersVisible());
+ showMapMarker.setSelected(map().getMapMarkersVisible());
showMapMarker.addActionListener(new ActionListener() {
-
public void actionPerformed(ActionEvent e) {
- map.setMapMarkerVisible(showMapMarker.isSelected());
+ map().setMapMarkerVisible(showMapMarker.isSelected());
}
});
panelBottom.add(showMapMarker);
+ ///
+ final JCheckBox showTreeLayers = new JCheckBox("Tree Layers visible");
+ showTreeLayers.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ treeMap.setTreeVisible(showTreeLayers.isSelected());
+ }
+ });
+ panelBottom.add(showTreeLayers);
+ ///
+ final JCheckBox showToolTip = new JCheckBox("ToolTip visible");
+ showToolTip.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ map().setToolTipText(null);
+ }
+ });
+ panelBottom.add(showToolTip);
+ ///
final JCheckBox showTileGrid = new JCheckBox("Tile grid visible");
- showTileGrid.setSelected(map.isTileGridVisible());
+ showTileGrid.setSelected(map().isTileGridVisible());
showTileGrid.addActionListener(new ActionListener() {
-
public void actionPerformed(ActionEvent e) {
- map.setTileGridVisible(showTileGrid.isSelected());
+ map().setTileGridVisible(showTileGrid.isSelected());
}
});
panelBottom.add(showTileGrid);
final JCheckBox showZoomControls = new JCheckBox("Show zoom controls");
- showZoomControls.setSelected(map.getZoomContolsVisible());
+ showZoomControls.setSelected(map().getZoomContolsVisible());
showZoomControls.addActionListener(new ActionListener() {
-
public void actionPerformed(ActionEvent e) {
- map.setZoomContolsVisible(showZoomControls.isSelected());
+ map().setZoomContolsVisible(showZoomControls.isSelected());
}
});
panelBottom.add(showZoomControls);
final JCheckBox scrollWrapEnabled = new JCheckBox("Scrollwrap enabled");
scrollWrapEnabled.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- map.setScrollWrapEnabled(scrollWrapEnabled.isSelected());
+ map().setScrollWrapEnabled(scrollWrapEnabled.isSelected());
}
});
panelBottom.add(scrollWrapEnabled);
@@ -153,39 +172,72 @@ public class Demo extends JFrame implements JMapViewerEventListener {
panelTop.add(mperpLabelName);
panelTop.add(mperpLabelValue);
- add(map, BorderLayout.CENTER);
+ add(treeMap, BorderLayout.CENTER);
//
- map.addMapMarker(new MapMarkerDot(49.814284999, 8.642065999));
- map.addMapMarker(new MapMarkerDot(49.91, 8.24));
- map.addMapMarker(new MapMarkerDot(49.71, 8.64));
- map.addMapMarker(new MapMarkerDot(48.71, -1));
- map.addMapMarker(new MapMarkerDot(49.8588, 8.643));
+ LayerGroup germanyGroup = new LayerGroup("Germany");
+ Layer germanyWestLayer = germanyGroup.addLayer("Germany West");
+ Layer germanyEastLayer = germanyGroup.addLayer("Germany East");
+ MapMarkerDot eberstadt = new MapMarkerDot(germanyEastLayer, "Eberstadt", 49.814284999, 8.642065999);
+ MapMarkerDot ebersheim = new MapMarkerDot(germanyWestLayer, "Ebersheim", 49.91, 8.24);
+ MapMarkerDot empty = new MapMarkerDot(germanyEastLayer, 49.71, 8.64);
+ MapMarkerDot darmstadt = new MapMarkerDot(germanyEastLayer, "Darmstadt", 49.8588, 8.643);
+ map().addMapMarker(eberstadt);
+ map().addMapMarker(ebersheim);
+ map().addMapMarker(empty);
+ Layer franceLayer = treeMap.addLayer("France");
+ map().addMapMarker(new MapMarkerDot(franceLayer, "La Gallerie", 48.71, -1));
+ map().addMapMarker(new MapMarkerDot(43.604, 1.444));
+ map().addMapMarker(new MapMarkerCircle(53.343, -6.267, 0.666));
+ map().addMapRectangle(new MapRectangleImpl(new Coordinate(53.343, -6.267), new Coordinate(43.604, 1.444)));
+ map().addMapMarker(darmstadt);
+ treeMap.addLayer(germanyWestLayer);
+ treeMap.addLayer(germanyEastLayer);
+
+ MapPolygon bermudas = new MapPolygonImpl(c(49,1), c(45,10), c(40,5));
+ map().addMapPolygon( bermudas );
+ map().addMapPolygon( new MapPolygonImpl(germanyEastLayer, "Riedstadt", ebersheim, darmstadt, eberstadt, empty));
+
+ map().addMapMarker(new MapMarkerCircle(germanyWestLayer, "North of Suisse", new Coordinate(48, 7), .5));
+ Layer spain = treeMap.addLayer("Spain");
+ map().addMapMarker(new MapMarkerCircle(spain, "La Garena", new Coordinate(40.4838, -3.39), .002));
+ spain.setVisible(false);
+
+ Layer wales = treeMap.addLayer("UK");
+ map().addMapRectangle(new MapRectangleImpl(wales, "Wales", c(53.35,-4.57), c(51.64,-2.63)));
// map.setDisplayPositionByLatLon(49.807, 8.6, 11);
// map.setTileGridVisible(true);
-
- map.addMouseListener(new MouseAdapter() {
+
+ map().addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON1) {
- map.getAttribution().handleAttribution(e.getPoint(), true);
+ map().getAttribution().handleAttribution(e.getPoint(), true);
}
}
});
-
- map.addMouseMotionListener(new MouseAdapter() {
+
+ map().addMouseMotionListener(new MouseAdapter() {
@Override
public void mouseMoved(MouseEvent e) {
- boolean cursorHand = map.getAttribution().handleAttributionCursor(e.getPoint());
+ Point p = e.getPoint();
+ boolean cursorHand = map().getAttribution().handleAttributionCursor(p);
if (cursorHand) {
- map.setCursor(new Cursor(Cursor.HAND_CURSOR));
+ map().setCursor(new Cursor(Cursor.HAND_CURSOR));
} else {
- map.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+ map().setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
+ if(showToolTip.isSelected()) map().setToolTipText(map().getPosition(p).toString());
}
});
}
+ private JMapViewer map(){
+ return treeMap.getViewer();
+ }
+ private static Coordinate c(double lat, double lon){
+ return new Coordinate(lat, lon);
+ }
/**
* @param args
@@ -199,9 +251,9 @@ public class Demo extends JFrame implements JMapViewerEventListener {
private void updateZoomParameters() {
if (mperpLabelValue!=null)
- mperpLabelValue.setText(String.format("%s",map.getMeterPerPixel()));
+ mperpLabelValue.setText(String.format("%s",map().getMeterPerPixel()));
if (zoomValue!=null)
- zoomValue.setText(String.format("%s", map.getZoom()));
+ zoomValue.setText(String.format("%s", map().getZoom()));
}
@Override
diff --git a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
index 27c099c..dcce880 100644
--- a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
+++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
@@ -23,6 +23,7 @@ import javax.swing.event.EventListenerList;
import org.openstreetmap.gui.jmapviewer.events.JMVCommandEvent;
import org.openstreetmap.gui.jmapviewer.events.JMVCommandEvent.COMMAND;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
import org.openstreetmap.gui.jmapviewer.interfaces.JMapViewerEventListener;
import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
@@ -80,7 +81,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
protected JSlider zoomSlider;
protected JButton zoomInButton;
protected JButton zoomOutButton;
-
+
public static enum ZOOM_BUTTON_STYLE {
HORIZONTAL,
VERTICAL
@@ -268,33 +269,39 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
if (markers) {
for (MapMarker marker : mapMarkerList) {
- int x = OsmMercator.LonToX(marker.getLon(), mapZoomMax);
- int y = OsmMercator.LatToY(marker.getLat(), mapZoomMax);
- x_max = Math.max(x_max, x);
- y_max = Math.max(y_max, y);
- x_min = Math.min(x_min, x);
- y_min = Math.min(y_min, y);
+ if(marker.isVisible()){
+ int x = OsmMercator.LonToX(marker.getLon(), mapZoomMax);
+ int y = OsmMercator.LatToY(marker.getLat(), mapZoomMax);
+ x_max = Math.max(x_max, x);
+ y_max = Math.max(y_max, y);
+ x_min = Math.min(x_min, x);
+ y_min = Math.min(y_min, y);
+ }
}
}
if (rectangles) {
for (MapRectangle rectangle : mapRectangleList) {
- x_max = Math.max(x_max, OsmMercator.LonToX(rectangle.getBottomRight().getLon(), mapZoomMax));
- y_max = Math.max(y_max, OsmMercator.LatToY(rectangle.getTopLeft().getLat(), mapZoomMax));
- x_min = Math.min(x_min, OsmMercator.LonToX(rectangle.getTopLeft().getLon(), mapZoomMax));
- y_min = Math.min(y_min, OsmMercator.LatToY(rectangle.getBottomRight().getLat(), mapZoomMax));
+ if(rectangle.isVisible()){
+ x_max = Math.max(x_max, OsmMercator.LonToX(rectangle.getBottomRight().getLon(), mapZoomMax));
+ y_max = Math.max(y_max, OsmMercator.LatToY(rectangle.getTopLeft().getLat(), mapZoomMax));
+ x_min = Math.min(x_min, OsmMercator.LonToX(rectangle.getTopLeft().getLon(), mapZoomMax));
+ y_min = Math.min(y_min, OsmMercator.LatToY(rectangle.getBottomRight().getLat(), mapZoomMax));
+ }
}
}
if (polygons) {
for (MapPolygon polygon : mapPolygonList) {
- for (Coordinate c : polygon.getPoints()) {
- int x = OsmMercator.LonToX(c.getLon(), mapZoomMax);
- int y = OsmMercator.LatToY(c.getLat(), mapZoomMax);
- x_max = Math.max(x_max, x);
- y_max = Math.max(y_max, y);
- x_min = Math.min(x_min, x);
- y_min = Math.min(y_min, y);
+ if(polygon.isVisible()){
+ for (ICoordinate c : polygon.getPoints()) {
+ int x = OsmMercator.LonToX(c.getLon(), mapZoomMax);
+ int y = OsmMercator.LatToY(c.getLat(), mapZoomMax);
+ x_max = Math.max(x_max, x);
+ y_max = Math.max(y_max, y);
+ x_min = Math.min(x_min, x);
+ y_min = Math.min(y_min, y);
+ }
}
}
}
@@ -421,6 +428,24 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
/**
* Calculates the position on the map of a given coordinate
*
+ * @param lat Latitude
+ * @param offset Offset respect Latitude
+ * @param checkOutside
+ * @return Integer the radius in pixels
+ */
+ public Integer getLatOffset(double lat, double offset, boolean checkOutside) {
+ int y = OsmMercator.LatToY(lat+offset, zoom);
+ y -= center.y - getHeight() / 2;
+ if (checkOutside) {
+ if (y < 0 || y > getHeight())
+ return null;
+ }
+ return y;
+ }
+
+ /**
+ * Calculates the position on the map of a given coordinate
+ *
* @param lat
* @param lon
* @return point on the map or <code>null</code> if the point is not visible
@@ -432,6 +457,22 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
/**
* Calculates the position on the map of a given coordinate
*
+ * @param marker MapMarker object that define the x,y coordinate
+ * @return Integer the radius in pixels
+ */
+ public Integer getRadius(MapMarker marker, Point p) {
+ if(marker.getMarkerStyle() == MapMarker.STYLE.FIXED)
+ return (int)marker.getRadius();
+ else if(p!=null){
+ Integer radius = getLatOffset(marker.getLat(), marker.getRadius(), false);
+ radius = radius==null?null:p.y-radius.intValue();
+ return radius;
+ }else return null;
+ }
+
+ /**
+ * Calculates the position on the map of a given coordinate
+ *
* @param coord
* @return point on the map or <code>null</code> if the point is not visible
*/
@@ -449,7 +490,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
* @return point on the map or <code>null</code> if the point is not visible
* and checkOutside set to <code>true</code>
*/
- public Point getMapPosition(Coordinate coord, boolean checkOutside) {
+ public Point getMapPosition(ICoordinate coord, boolean checkOutside) {
if (coord != null)
return getMapPosition(coord.getLat(), coord.getLon(), checkOutside);
else
@@ -519,7 +560,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
int y_min = -tilesize;
int x_max = getWidth();
int y_max = getHeight();
-
+
// calculate the length of the grid (number of squares per edge)
int gridLength = 1 << zoom;
@@ -575,22 +616,22 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
if (scrollWrapEnabled) {
center.x = center.x % mapSize;
}
-
+
if (mapPolygonsVisible && mapPolygonList != null) {
for (MapPolygon polygon : mapPolygonList) {
- paintPolygon(g, polygon);
+ if(polygon.isVisible()) paintPolygon(g, polygon);
}
}
if (mapRectanglesVisible && mapRectangleList != null) {
for (MapRectangle rectangle : mapRectangleList) {
- paintRectangle(g, rectangle);
+ if(rectangle.isVisible()) paintRectangle(g, rectangle);
}
}
if (mapMarkersVisible && mapMarkerList != null) {
for (MapMarker marker : mapMarkerList) {
- paintMarker(g, marker);
+ if(marker.isVisible())paintMarker(g, marker);
}
}
@@ -601,29 +642,31 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
* Paint a single marker.
*/
protected void paintMarker(Graphics g, MapMarker marker) {
- Point p = getMapPosition(marker.getLat(), marker.getLon());
+ Point p = getMapPosition(marker.getLat(), marker.getLon(), marker.getMarkerStyle()==MapMarker.STYLE.FIXED);
+ Integer radius = getRadius(marker, p);
if (scrollWrapEnabled) {
int tilesize = tileSource.getTileSize();
int mapSize = tilesize << zoom;
if (p == null) {
p = getMapPosition(marker.getLat(), marker.getLon(), false);
+ radius = getRadius(marker, p);
}
- marker.paint(g, p);
+ marker.paint(g, p, radius);
int xSave = p.x;
int xWrap = xSave;
// overscan of 15 allows up to 30-pixel markers to gracefully scroll off the edge of the panel
while ((xWrap -= mapSize) >= -15) {
p.x = xWrap;
- marker.paint(g, p);
+ marker.paint(g, p, radius);
}
xWrap = xSave;
while ((xWrap += mapSize) <= getWidth() + 15) {
p.x = xWrap;
- marker.paint(g, p);
+ marker.paint(g, p, radius);
}
} else {
if (p != null) {
- marker.paint(g, p);
+ marker.paint(g, p, radius);
}
}
}
@@ -660,7 +703,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
pBottomRight.x = xBottomRightWrap;
rectangle.paint(g, pTopLeft, pBottomRight);
}
-
+
}
}
}
@@ -670,10 +713,10 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
* Paint a single polygon.
*/
protected void paintPolygon(Graphics g, MapPolygon polygon) {
- List<Coordinate> coords = polygon.getPoints();
+ List<? extends ICoordinate> coords = polygon.getPoints();
if (coords != null && coords.size() >= 3) {
List<Point> points = new LinkedList<Point>();
- for (Coordinate c : coords) {
+ for (ICoordinate c : coords) {
Point p = getMapPosition(c, false);
if (p == null) {
return;
@@ -966,20 +1009,20 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
this.mapPolygonsVisible = mapPolygonsVisible;
repaint();
}
-
+
public boolean isScrollWrapEnabled() {
return scrollWrapEnabled;
}
-
+
public void setScrollWrapEnabled(boolean scrollWrapEnabled) {
this.scrollWrapEnabled = scrollWrapEnabled;
repaint();
}
-
+
public ZOOM_BUTTON_STYLE getZoomButtonStyle() {
return zoomButtonStyle;
}
-
+
public void setZoomButtonStyle(ZOOM_BUTTON_STYLE style) {
zoomButtonStyle = style;
if (zoomSlider == null || zoomInButton == null || zoomOutButton == null) {
@@ -1008,7 +1051,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
public TileController getTileController() {
return tileController;
}
-
+
/**
* Return tile information caching class
* @see TileLoaderListener#getTileCache()
diff --git a/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java b/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java
new file mode 100644
index 0000000..38eeb57
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java
@@ -0,0 +1,176 @@
+package org.openstreetmap.gui.jmapviewer;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.List;
+
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JSplitPane;
+import javax.swing.event.TreeModelEvent;
+import javax.swing.event.TreeModelListener;
+
+import org.openstreetmap.gui.jmapviewer.checkBoxTree.CheckBoxNodePanel;
+import org.openstreetmap.gui.jmapviewer.checkBoxTree.CheckBoxTree;
+import org.openstreetmap.gui.jmapviewer.interfaces.MapObject;
+
+/**
+ * Tree of layers for JMapViewer component
+ * @author galo
+ */
+public class JMapViewerTree extends JPanel{
+ /** Serial Version UID */
+ private static final long serialVersionUID = 3050203054402323972L;
+
+ private JMapViewer map;
+ private CheckBoxTree tree;
+ private JPanel treePanel;
+ private JSplitPane splitPane;
+
+ public JMapViewerTree(String name){
+ this(name, false);
+ }
+ public JMapViewerTree(String name, boolean treeVisible){
+ super();
+ splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+
+ tree = new CheckBoxTree(name);
+ treePanel = new JPanel();
+ treePanel.setLayout(new BorderLayout());
+ treePanel.add(tree, BorderLayout.CENTER);
+ treePanel.add(new JLabel("<html><center>Use right mouse button to<br />show/hide texts</center></html>"), BorderLayout.SOUTH);
+ map = new JMapViewer();
+
+ splitPane.setOneTouchExpandable(true);
+ splitPane.setDividerLocation(150);
+
+ //Provide minimum sizes for the two components in the split pane
+ Dimension minimumSize = new Dimension(100, 50);
+ //tree.setMinimumSize(minimumSize);
+ map.setMinimumSize(minimumSize);
+ createRefresh();
+ setLayout(new BorderLayout());
+ setTreeVisible(treeVisible);
+ tree.addNodeListener(new MouseAdapter() {
+ public void mousePressed(MouseEvent e) {
+ maybeShowPopup(e);
+ }
+ public void mouseReleased(MouseEvent e) {
+ maybeShowPopup(e);
+ }
+ private void maybeShowPopup(MouseEvent e) {
+ if (e.isPopupTrigger()) {
+ e.getSource();
+ AbstractLayer layer = ((CheckBoxNodePanel)e.getComponent()).getData().getAbstractLayer();
+ if(layer!=null)
+ JMapViewerTree.this.createPopupMenu(layer).show(e.getComponent(), e.getX(), e.getY());
+ }
+ }
+ });
+ }
+ private JPopupMenu createPopupMenu(final AbstractLayer layer) {
+ JMenuItem menuItemShow = new JMenuItem("show texts");
+ JMenuItem menuItemHide = new JMenuItem("hide texts");
+
+ //Create the popup menu.
+ JPopupMenu popup = new JPopupMenu();
+
+ // Create items
+ if(layer.isVisibleTexts()==null){
+ popup.add(menuItemShow);
+ popup.add(menuItemHide);
+ }else if(layer.isVisibleTexts()) popup.add(menuItemHide);
+ else popup.add(menuItemShow);
+
+ menuItemShow.addActionListener(new ActionListener(){
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ setVisibleTexts(layer, true);
+ if(layer.getParent()!=null) layer.getParent().calculateVisibleTexts();
+ map.repaint();
+ }
+ });
+ menuItemHide.addActionListener(new ActionListener(){
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ setVisibleTexts(layer, false);
+ if(layer.getParent()!=null) layer.getParent().calculateVisibleTexts();
+ map.repaint();
+ }
+ });
+
+ return popup;
+ }
+ private void setVisibleTexts(AbstractLayer layer, boolean visible){
+ layer.setVisibleTexts(visible);
+ if(layer instanceof LayerGroup){
+ LayerGroup group = (LayerGroup)layer;
+ if(group.getLayers()!=null) for(AbstractLayer al: group.getLayers()) setVisibleTexts(al, visible);
+ }
+ }
+ public Layer addLayer(String name){
+ Layer layer = new Layer(name);
+ this.addLayer(layer);
+ return layer;
+ }
+ public JMapViewerTree addLayer(Layer layer){
+ tree.addLayer(layer);
+ return this;
+ }
+ public JMapViewerTree addLayer(MapObject element){
+ //element.getLayer().add(element);
+ return addLayer(element.getLayer());
+ }
+ public Layer removeFromLayer(MapObject element){
+ element.getLayer().getElements().remove(element);
+ return element.getLayer();
+ }
+ public static int size(List<?> list){
+ return list==null?0:list.size();
+ }
+ public JMapViewer getViewer(){
+ return map;
+ }
+ public CheckBoxTree getTree(){
+ return tree;
+ }
+ public void addMapObject(MapObject o){
+
+ }
+ public void setTreeVisible(boolean visible){
+ removeAll();
+ revalidate();
+ if(visible){
+ splitPane.setLeftComponent(treePanel);
+ splitPane.setRightComponent(map);
+ add(splitPane, BorderLayout.CENTER);
+ }else add(map, BorderLayout.CENTER);
+ repaint();
+ }
+ private void createRefresh(){
+ tree.getModel().addTreeModelListener(new TreeModelListener() {
+ @Override
+ public void treeNodesChanged(final TreeModelEvent e) {
+ repaint();
+ }
+ @Override
+ public void treeNodesInserted(TreeModelEvent arg0) {
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void treeNodesRemoved(TreeModelEvent arg0) {
+ // TODO Auto-generated method stub
+ }
+ @Override
+ public void treeStructureChanged(TreeModelEvent arg0) {
+ // TODO Auto-generated method stub
+ }
+ });
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/Layer.java b/src/org/openstreetmap/gui/jmapviewer/Layer.java
new file mode 100644
index 0000000..18aff1f
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/Layer.java
@@ -0,0 +1,42 @@
+package org.openstreetmap.gui.jmapviewer;
+
+import java.util.List;
+
+import org.openstreetmap.gui.jmapviewer.interfaces.MapObject;
+
+public class Layer extends AbstractLayer{
+ private List<MapObject> elements;
+
+ public Layer(String name){
+ super(name);
+ }
+ public Layer(String name, String description){
+ super(name, description);
+ }
+ public Layer(String name, Style style){
+ super(name, style);
+ }
+ public Layer(String name, String description, Style style){
+ super(name, description, style);
+ }
+ public Layer(LayerGroup parent, String name){
+ super(parent, name);
+ }
+ public Layer(LayerGroup parent, String name, Style style){
+ super(parent, name, style);
+ }
+ public Layer(LayerGroup parent, String name, String description, Style style){
+ super(parent, name, description, style);
+ }
+ public List<MapObject> getElements() {
+ return elements;
+ }
+ public void setElements(List<MapObject> elements) {
+ this.elements = elements;
+ }
+ public Layer add(MapObject element) {
+ element.setLayer(this);
+ elements = add(elements, element);
+ return this;
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java b/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java
new file mode 100644
index 0000000..04cffb3
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java
@@ -0,0 +1,58 @@
+package org.openstreetmap.gui.jmapviewer;
+
+import java.util.List;
+
+public class LayerGroup extends AbstractLayer{
+ private List<AbstractLayer> layers;
+
+ public LayerGroup(String name){
+ super(name);
+ }
+ public LayerGroup(String name, String description){
+ super(name, description);
+ }
+ public LayerGroup(String name, Style style){
+ super(name, style);
+ }
+ public LayerGroup(String name, String description, Style style){
+ super(name, description, style);
+ }
+ public LayerGroup(LayerGroup parent, String name){
+ super(parent, name);
+ }
+ public LayerGroup(LayerGroup parent, String name, String description, Style style){
+ super(name, description, style);
+ }
+ public List<AbstractLayer> getLayers() {
+ return layers;
+ }
+ public void setElements(List<AbstractLayer> layers) {
+ this.layers = layers;
+ }
+ public Layer addLayer(String name) {
+ Layer layer = new Layer(this, name);
+ layers = add(layers, layer);
+ return layer;
+ }
+ public LayerGroup add(AbstractLayer layer) {
+ layer.setParent(this);
+ layers = add(layers, layer);
+ return this;
+ }
+ public void calculateVisibleTexts(){
+ Boolean calculate=null;
+ if(layers!=null&&layers.size()>0){
+ calculate=layers.get(0).isVisibleTexts();
+ for(int i=1;i<layers.size(); i++){
+ calculate = resultOf(calculate, layers.get(i).isVisibleTexts());
+ }
+ }
+ setVisibleTexts(calculate);
+ if(getParent()!=null) getParent().calculateVisibleTexts();
+ }
+ public Boolean resultOf(Boolean b1, Boolean b2){
+ if(b1==null||b2==null) return null;
+ else if(b1.booleanValue() == b2.booleanValue()) return b1.booleanValue();
+ else return null;
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java b/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
new file mode 100644
index 0000000..d7a2472
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
@@ -0,0 +1,107 @@
+package org.openstreetmap.gui.jmapviewer;
+
+//License: GPL. Copyright 2008 by Jan Peter Stotz
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+
+import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+
+/**
+ * A simple implementation of the {@link MapMarker} interface. Each map marker
+ * is painted as a circle with a black border line and filled with a specified
+ * color.
+ *
+ * @author Jan Peter Stotz
+ *
+ */
+public class MapMarkerCircle extends MapObjectImpl implements MapMarker {
+
+ Coordinate coord;
+ double radius;
+ STYLE markerStyle;
+
+ public MapMarkerCircle(Coordinate coord, double radius) {
+ this(null, null, coord, radius);
+ }
+ public MapMarkerCircle(String name, Coordinate coord, double radius) {
+ this(null, name, coord, radius);
+ }
+ public MapMarkerCircle(Layer layer, Coordinate coord, double radius) {
+ this(layer, null, coord, radius);
+ }
+ public MapMarkerCircle(double lat, double lon, double radius) {
+ this(null, null, new Coordinate(lat,lon), radius);
+ }
+ public MapMarkerCircle(Layer layer, double lat, double lon, double radius) {
+ this(layer, null, new Coordinate(lat,lon), radius);
+ }
+ public MapMarkerCircle(Layer layer, String name, Coordinate coord, double radius) {
+ this(layer, name, coord, radius, STYLE.VARIABLE, getDefaultStyle());
+ }
+ public MapMarkerCircle(Layer layer, String name, Coordinate coord, double radius, STYLE markerStyle, Style style) {
+ super(layer, name, style);
+ this.markerStyle = markerStyle;
+ this.coord = coord;
+ this.radius = radius;
+ }
+
+ public Coordinate getCoordinate(){
+ return coord;
+ }
+ public double getLat() {
+ return coord.getLat();
+ }
+
+ public double getLon() {
+ return coord.getLon();
+ }
+
+ public double getRadius() {
+ return radius;
+ }
+
+ public STYLE getMarkerStyle() {
+ return markerStyle;
+ }
+
+ public void paint(Graphics g, Point position, int radio) {
+ int size_h = radio;
+ int size = size_h * 2;
+
+ if (g instanceof Graphics2D && getBackColor()!=null) {
+ Graphics2D g2 = (Graphics2D) g;
+ Composite oldComposite = g2.getComposite();
+ g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ g2.setPaint(getBackColor());
+ g.fillOval(position.x - size_h, position.y - size_h, size, size);
+ g2.setComposite(oldComposite);
+ }
+ g.setColor(getColor());
+ g.drawOval(position.x - size_h, position.y - size_h, size, size);
+
+ if(getLayer()==null||getLayer().isVisibleTexts()) paintText(g, position);
+ }
+
+ public static Style getDefaultStyle(){
+ return new Style(Color.ORANGE, new Color(200,200,200,200), null, getDefaultFont());
+ }
+ @Override
+ public String toString() {
+ return "MapMarker at " + getLat() + " " + getLon();
+ }
+ @Override
+ public void setLat(double lat) {
+ if(coord==null) coord = new Coordinate(lat,0);
+ else coord.setLat(lat);
+ }
+ @Override
+ public void setLon(double lon) {
+ if(coord==null) coord = new Coordinate(0,lon);
+ else coord.setLon(lon);
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java b/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java
index e6d658f..4b55e4f 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java
@@ -3,8 +3,6 @@ package org.openstreetmap.gui.jmapviewer;
//License: GPL. Copyright 2008 by Jan Peter Stotz
import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Point;
import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
@@ -16,43 +14,40 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
* @author Jan Peter Stotz
*
*/
-public class MapMarkerDot implements MapMarker {
+public class MapMarkerDot extends MapMarkerCircle {
- double lat;
- double lon;
- Color color;
+ public static final int DOT_RADIUS = 5;
- public MapMarkerDot(double lat, double lon) {
- this(Color.YELLOW, lat, lon);
+ public MapMarkerDot(Coordinate coord) {
+ this(null, null, coord);
+ }
+ public MapMarkerDot(String name, Coordinate coord) {
+ this(null, name, coord);
+ }
+ public MapMarkerDot(Layer layer, Coordinate coord) {
+ this(layer, null, coord);
+ }
+ public MapMarkerDot(Layer layer, String name, Coordinate coord) {
+ this(layer, name, coord, getDefaultStyle());
}
-
public MapMarkerDot(Color color, double lat, double lon) {
- super();
- this.color = color;
- this.lat = lat;
- this.lon = lon;
+ this(null, null, lat, lon);
+ setColor(color);
}
-
- public double getLat() {
- return lat;
+ public MapMarkerDot(double lat, double lon) {
+ this(null, null, lat, lon);
}
-
- public double getLon() {
- return lon;
+ public MapMarkerDot(Layer layer, double lat, double lon) {
+ this(layer, null, lat, lon);
}
-
- public void paint(Graphics g, Point position) {
- int size_h = 5;
- int size = size_h * 2;
- g.setColor(color);
- g.fillOval(position.x - size_h, position.y - size_h, size, size);
- g.setColor(Color.BLACK);
- g.drawOval(position.x - size_h, position.y - size_h, size, size);
+ public MapMarkerDot(Layer layer, String name, double lat, double lon) {
+ this(layer, name, new Coordinate(lat, lon), getDefaultStyle());
}
-
- @Override
- public String toString() {
- return "MapMarker at " + lat + " " + lon;
+ public MapMarkerDot(Layer layer, String name, Coordinate coord, Style style) {
+ super(layer, name, coord, DOT_RADIUS, STYLE.FIXED, style);
}
+ public static Style getDefaultStyle(){
+ return new Style(Color.BLACK, Color.YELLOW, null, getDefaultFont());
+ }
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/MapObjectImpl.java b/src/org/openstreetmap/gui/jmapviewer/MapObjectImpl.java
new file mode 100644
index 0000000..69b8b01
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/MapObjectImpl.java
@@ -0,0 +1,109 @@
+package org.openstreetmap.gui.jmapviewer;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Stroke;
+
+import javax.swing.UIManager;
+
+public abstract class MapObjectImpl {
+ private Layer layer;
+ private String name;
+ private Style style;
+ private Boolean visible;
+
+ public MapObjectImpl(String name) {
+ this(null, name, null);
+ }
+ public MapObjectImpl(Layer layer) {
+ this(layer, null, null);
+ }
+ public MapObjectImpl(Layer layer, String name, Style style) {
+ super();
+ this.layer = layer;
+ this.name = name;
+ this.style = style;
+ }
+ public Layer getLayer() {
+ return layer;
+ }
+ public void setLayer(Layer layer) {
+ this.layer = layer;
+ }
+ public Style getStyle(){
+ return style;
+ }
+ public Style getStyleAssigned(){
+ return style == null ? (layer == null ? null : layer.getStyle()) : style;
+ }
+ public void setStyle(Style style){
+ this.style = style;
+ }
+ public Color getColor() {
+ Style styleAssigned = getStyleAssigned();
+ return styleAssigned == null ? null : getStyleAssigned().getColor();
+ }
+ public void setColor(Color color) {
+ if(style==null&&color!=null) style=new Style();
+ if(style!=null) style.setColor(color);
+ }
+
+ public Color getBackColor() {
+ Style styleAssigned = getStyleAssigned();
+ return styleAssigned == null ? null : getStyleAssigned().getBackColor();
+ }
+ public void setBackColor(Color backColor) {
+ if(style==null&&backColor!=null) style=new Style();
+ if(style!=null) style.setBackColor(backColor);
+ }
+
+ public Stroke getStroke() {
+ Style styleAssigned = getStyleAssigned();
+ return styleAssigned == null ? null : getStyleAssigned().getStroke();
+ }
+ public void setStroke(Stroke stroke) {
+ if(style==null&&stroke!=null) style=new Style();
+ if(style!=null) style.setStroke(stroke);
+ }
+
+ public Font getFont() {
+ Style styleAssigned = getStyleAssigned();
+ return styleAssigned == null ? null : getStyleAssigned().getFont();
+ }
+ public void setFont(Font font) {
+ if(style==null&&font!=null) style=new Style();
+ if(style!=null) style.setFont(font);
+ }
+ private boolean isVisibleLayer(){
+ return layer==null||layer.isVisible()==null?true:layer.isVisible();
+ }
+ public boolean isVisible() {
+ return visible==null?isVisibleLayer():visible.booleanValue();
+ }
+ public void setVisible(Boolean visible) {
+ this.visible = visible;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String txt) {
+ this.name = txt;
+ }
+ public static Font getDefaultFont(){
+ Font f = UIManager.getDefaults().getFont("TextField.font");
+ return new Font(f.getName(), Font.BOLD, f.getSize());
+ }
+ public void paintText(Graphics g, Point position) {
+ if(name!=null && g!=null && position!=null){
+ if(getFont()==null){
+ Font f = getDefaultFont(); // g.getFont();
+ setFont(new Font(f.getName(), Font.BOLD, f.getSize()));
+ }
+ g.setColor(Color.DARK_GRAY);
+ g.setFont(getFont());
+ g.drawString(name, position.x+MapMarkerDot.DOT_RADIUS+2, position.y+MapMarkerDot.DOT_RADIUS);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java b/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
index 7f97433..e928b45 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
@@ -1,42 +1,61 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.gui.jmapviewer;
+import java.awt.AlphaComposite;
import java.awt.BasicStroke;
import java.awt.Color;
+import java.awt.Composite;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Polygon;
+import java.awt.Rectangle;
import java.awt.Stroke;
+import java.util.Arrays;
import java.util.List;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
/**
* @author Vincent
*
*/
-public class MapPolygonImpl implements MapPolygon {
+public class MapPolygonImpl extends MapObjectImpl implements MapPolygon {
- private List<Coordinate> points;
- private Color color;
- private Stroke stroke;
+ private List<? extends ICoordinate> points;
- public MapPolygonImpl(List<Coordinate> points) {
- this(points, Color.BLUE, new BasicStroke(2));
+ public MapPolygonImpl(ICoordinate ... points) {
+ this(null, null, points);
}
-
- public MapPolygonImpl(List<Coordinate> points, Color color, Stroke stroke) {
+ public MapPolygonImpl(List<? extends ICoordinate> points) {
+ this(null, null, points);
+ }
+ public MapPolygonImpl(String name, List<? extends ICoordinate> points) {
+ this(null, name, points);
+ }
+ public MapPolygonImpl(String name, ICoordinate ... points) {
+ this(null, name, points);
+ }
+ public MapPolygonImpl(Layer layer, List<? extends ICoordinate> points) {
+ this(layer, null, points);
+ }
+ public MapPolygonImpl(Layer layer, String name, List<? extends ICoordinate> points) {
+ this(layer, name, points, getDefaultStyle());
+ }
+ public MapPolygonImpl(Layer layer, String name, ICoordinate ... points) {
+ this(layer, name, Arrays.asList(points), getDefaultStyle());
+ }
+ public MapPolygonImpl(Layer layer, String name, List<? extends ICoordinate> points, Style style) {
+ super(layer, name, style);
this.points = points;
- this.color = color;
- this.stroke = stroke;
}
/* (non-Javadoc)
* @see org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon#getPoints()
*/
@Override
- public List<Coordinate> getPoints() {
+ public List<? extends ICoordinate> getPoints() {
return this.points;
}
@@ -59,22 +78,38 @@ public class MapPolygonImpl implements MapPolygon {
public void paint(Graphics g, Polygon polygon) {
// Prepare graphics
Color oldColor = g.getColor();
- g.setColor(color);
+ g.setColor(getColor());
+
Stroke oldStroke = null;
if (g instanceof Graphics2D) {
Graphics2D g2 = (Graphics2D) g;
oldStroke = g2.getStroke();
- g2.setStroke(stroke);
+ g2.setStroke(getStroke());
}
// Draw
g.drawPolygon(polygon);
+ if (g instanceof Graphics2D && getBackColor()!=null) {
+ Graphics2D g2 = (Graphics2D) g;
+ Composite oldComposite = g2.getComposite();
+ g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ g2.setPaint(getBackColor());
+ g2.fillPolygon(polygon);
+ g2.setComposite(oldComposite);
+ }
// Restore graphics
g.setColor(oldColor);
if (g instanceof Graphics2D) {
((Graphics2D) g).setStroke(oldStroke);
}
+ Rectangle rec = polygon.getBounds();
+ Point corner = rec.getLocation();
+ Point p= new Point(corner.x+(rec.width/2), corner.y+(rec.height/2));
+ if(getLayer()==null||getLayer().isVisibleTexts()) paintText(g, p);
}
+ public static Style getDefaultStyle(){
+ return new Style(Color.BLUE, new Color(100,100,100,50), new BasicStroke(2), getDefaultFont());
+ }
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
diff --git a/src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java b/src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java
index 83889f6..18ab4d5 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java
@@ -14,22 +14,27 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
* @author Vincent
*
*/
-public class MapRectangleImpl implements MapRectangle {
+public class MapRectangleImpl extends MapObjectImpl implements MapRectangle {
private Coordinate topLeft;
private Coordinate bottomRight;
- private Color color;
- private Stroke stroke;
public MapRectangleImpl(Coordinate topLeft, Coordinate bottomRight) {
- this(topLeft, bottomRight, Color.BLUE, new BasicStroke(2));
+ this(null, null, topLeft, bottomRight);
}
-
- public MapRectangleImpl(Coordinate topLeft, Coordinate bottomRight, Color color, Stroke stroke) {
+ public MapRectangleImpl(String name, Coordinate topLeft, Coordinate bottomRight) {
+ this(null, name, topLeft, bottomRight);
+ }
+ public MapRectangleImpl(Layer layer, Coordinate topLeft, Coordinate bottomRight) {
+ this(layer, null, topLeft, bottomRight);
+ }
+ public MapRectangleImpl(Layer layer, String name, Coordinate topLeft, Coordinate bottomRight) {
+ this(layer, name, topLeft, bottomRight, getDefaultStyle());
+ }
+ public MapRectangleImpl(Layer layer, String name, Coordinate topLeft, Coordinate bottomRight, Style style) {
+ super(layer, name, style);
this.topLeft = topLeft;
this.bottomRight = bottomRight;
- this.color = color;
- this.stroke = stroke;
}
/* (non-Javadoc)
@@ -55,12 +60,12 @@ public class MapRectangleImpl implements MapRectangle {
public void paint(Graphics g, Point topLeft, Point bottomRight) {
// Prepare graphics
Color oldColor = g.getColor();
- g.setColor(color);
+ g.setColor(getColor());
Stroke oldStroke = null;
if (g instanceof Graphics2D) {
Graphics2D g2 = (Graphics2D) g;
oldStroke = g2.getStroke();
- g2.setStroke(stroke);
+ g2.setStroke(getStroke());
}
// Draw
g.drawRect(topLeft.x, topLeft.y, bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
@@ -69,10 +74,16 @@ public class MapRectangleImpl implements MapRectangle {
if (g instanceof Graphics2D) {
((Graphics2D) g).setStroke(oldStroke);
}
+ int width=bottomRight.x-topLeft.x;
+ int height=bottomRight.y-topLeft.y;
+ Point p= new Point(topLeft.x+(width/2), topLeft.y+(height/2));
+ if(getLayer()==null||getLayer().isVisibleTexts()) paintText(g, p);
+ }
+ public static Style getDefaultStyle(){
+ return new Style(Color.BLUE, null, new BasicStroke(2), getDefaultFont());
}
-
@Override
public String toString() {
- return "MapRectangle from " + topLeft + " to " + bottomRight;
+ return "MapRectangle from " + getTopLeft() + " to " + getBottomRight();
}
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java b/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
index 2591a99..f1d4dd1 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
@@ -2,7 +2,8 @@ package org.openstreetmap.gui.jmapviewer;
//License: GPL. Copyright 2008 by Jan Peter Stotz
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import java.util.logging.Logger;
import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
@@ -24,28 +25,31 @@ public class MemoryTileCache implements TileCache {
*/
protected int cacheSize = 200;
- protected Hashtable<String, CacheEntry> hashtable;
+ protected final Map<String, CacheEntry> hash;
/**
* List of all tiles in their last recently used order
*/
- protected CacheLinkedListElement lruTiles;
+ protected final CacheLinkedListElement lruTiles;
public MemoryTileCache() {
- hashtable = new Hashtable<String, CacheEntry>(cacheSize);
+ hash = new HashMap<String, CacheEntry>(cacheSize);
lruTiles = new CacheLinkedListElement();
}
- public void addTile(Tile tile) {
+ @Override
+ public synchronized void addTile(Tile tile) {
CacheEntry entry = createCacheEntry(tile);
- hashtable.put(tile.getKey(), entry);
- lruTiles.addFirst(entry);
- if (hashtable.size() > cacheSize)
- removeOldEntries();
+ hash.put(tile.getKey(), entry);
+ lruTiles.addFirst(entry);
+ if (hash.size() > cacheSize) {
+ removeOldEntries();
+ }
}
- public Tile getTile(TileSource source, int x, int y, int z) {
- CacheEntry entry = hashtable.get(Tile.getTileKey(source, x, y, z));
+ @Override
+ public synchronized Tile getTile(TileSource source, int x, int y, int z) {
+ CacheEntry entry = hash.get(Tile.getTileKey(source, x, y, z));
if (entry == null)
return null;
// We don't care about placeholder tiles and hourglass image tiles, the
@@ -58,20 +62,18 @@ public class MemoryTileCache implements TileCache {
/**
* Removes the least recently used tiles
*/
- protected void removeOldEntries() {
- synchronized (lruTiles) {
- try {
- while (lruTiles.getElementCount() > cacheSize) {
- removeEntry(lruTiles.getLastElement());
- }
- } catch (Exception e) {
- log.warning(e.getMessage());
+ protected synchronized void removeOldEntries() {
+ try {
+ while (lruTiles.getElementCount() > cacheSize) {
+ removeEntry(lruTiles.getLastElement());
}
+ } catch (Exception e) {
+ log.warning(e.getMessage());
}
}
- protected void removeEntry(CacheEntry entry) {
- hashtable.remove(entry.tile.getKey());
+ protected synchronized void removeEntry(CacheEntry entry) {
+ hash.remove(entry.tile.getKey());
lruTiles.removeEntry(entry);
}
@@ -82,15 +84,14 @@ public class MemoryTileCache implements TileCache {
/**
* Clears the cache deleting all tiles from memory
*/
- public void clear() {
- synchronized (lruTiles) {
- hashtable.clear();
- lruTiles.clear();
- }
+ public synchronized void clear() {
+ hash.clear();
+ lruTiles.clear();
}
+ @Override
public int getTileCount() {
- return hashtable.size();
+ return hash.size();
}
public int getCacheSize() {
@@ -103,9 +104,9 @@ public class MemoryTileCache implements TileCache {
* @param cacheSize
* new maximum number of tiles
*/
- public void setCacheSize(int cacheSize) {
+ public synchronized void setCacheSize(int cacheSize) {
this.cacheSize = cacheSize;
- if (hashtable.size() > cacheSize)
+ if (hash.size() > cacheSize)
removeOldEntries();
}
@@ -153,7 +154,7 @@ public class MemoryTileCache implements TileCache {
clear();
}
- public synchronized void clear() {
+ public void clear() {
elementCount = 0;
firstElement = null;
lastElement = null;
@@ -164,7 +165,8 @@ public class MemoryTileCache implements TileCache {
*
* @param element new element to be added
*/
- public synchronized void addFirst(CacheEntry element) {
+ public void addFirst(CacheEntry element) {
+ if (element == null) return;
if (elementCount == 0) {
firstElement = element;
lastElement = element;
@@ -184,7 +186,8 @@ public class MemoryTileCache implements TileCache {
*
* @param element element to be removed
*/
- public synchronized void removeEntry(CacheEntry element) {
+ public void removeEntry(CacheEntry element) {
+ if (element == null) return;
if (element.next != null) {
element.next.prev = element.prev;
}
@@ -200,7 +203,7 @@ public class MemoryTileCache implements TileCache {
elementCount--;
}
- public synchronized void moveElementToFirstPos(CacheEntry entry) {
+ public void moveElementToFirstPos(CacheEntry entry) {
if (firstElement == entry)
return;
removeEntry(entry);
diff --git a/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java b/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java
index ea82c74..7cc6dab 100644
--- a/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java
+++ b/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java
@@ -14,7 +14,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.lang.Thread;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
@@ -26,6 +25,8 @@ import java.util.Random;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
@@ -40,7 +41,7 @@ import org.openstreetmap.gui.jmapviewer.interfaces.TileSource.TileUpdate;
* @author Jan Peter Stotz
* @author Stefan Zeller
*/
-public class OsmFileCacheTileLoader extends OsmTileLoader {
+public class OsmFileCacheTileLoader extends OsmTileLoader implements CachedTileLoader {
private static final Logger log = Logger.getLogger(OsmFileCacheTileLoader.class.getName());
@@ -53,7 +54,7 @@ public class OsmFileCacheTileLoader extends OsmTileLoader {
public static final long FILE_AGE_ONE_WEEK = FILE_AGE_ONE_DAY * 7;
protected String cacheDirBase;
-
+
protected final Map<TileSource, File> sourceCacheDirMap;
protected long maxCacheFileAge = FILE_AGE_ONE_WEEK;
@@ -126,7 +127,7 @@ public class OsmFileCacheTileLoader extends OsmTileLoader {
}
return dir;
}
-
+
protected class FileLoadJob implements TileJob {
InputStream input = null;
@@ -140,10 +141,12 @@ public class OsmFileCacheTileLoader extends OsmTileLoader {
this.tile = tile;
}
+ @Override
public Tile getTile() {
return tile;
}
+ @Override
public void run() {
synchronized (tile) {
if ((tile.isLoaded() && !tile.hasError()) || tile.isLoading())
@@ -159,9 +162,11 @@ public class OsmFileCacheTileLoader extends OsmTileLoader {
if (fileTilePainted) {
TileJob job = new TileJob() {
+ @Override
public void run() {
loadOrUpdateTile();
}
+ @Override
public Tile getTile() {
return tile;
}
@@ -304,20 +309,25 @@ public class OsmFileCacheTileLoader extends OsmTileLoader {
protected byte[] loadTileInBuffer(URLConnection urlConn) throws IOException {
input = urlConn.getInputStream();
- ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available());
- byte[] buffer = new byte[2048];
- boolean finished = false;
- do {
- int read = input.read(buffer);
- if (read >= 0) {
- bout.write(buffer, 0, read);
- } else {
- finished = true;
- }
- } while (!finished);
- if (bout.size() == 0)
- return null;
- return bout.toByteArray();
+ try {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available());
+ byte[] buffer = new byte[2048];
+ boolean finished = false;
+ do {
+ int read = input.read(buffer);
+ if (read >= 0) {
+ bout.write(buffer, 0, read);
+ } else {
+ finished = true;
+ }
+ } while (!finished);
+ if (bout.size() == 0)
+ return null;
+ return bout.toByteArray();
+ } finally {
+ input.close();
+ input = null;
+ }
}
/**
@@ -331,7 +341,7 @@ public class OsmFileCacheTileLoader extends OsmTileLoader {
* <li>{@link tilesources.OsmTileSource.Mapnik} - not supported</li>
* </ul>
*
- * @param fileAge time of the
+ * @param fileAge time of the
* @return <code>true</code> if the tile on the server is newer than the
* file
* @throws IOException
@@ -481,24 +491,13 @@ public class OsmFileCacheTileLoader extends OsmTileLoader {
dir.mkdirs();
this.cacheDirBase = dir.getAbsolutePath();
}
-
- public static interface TileClearController {
- void initClearDir(File dir);
-
- void initClearFiles(File[] files);
-
- boolean cancel();
-
- void fileDeleted(File file);
-
- void clearFinished();
- }
-
+ @Override
public void clearCache(TileSource source) {
clearCache(source, null);
}
-
+
+ @Override
public void clearCache(TileSource source, TileClearController controller) {
File dir = getSourceCacheDir(source);
if (dir != null) {
diff --git a/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java b/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
index 10d65a4..8bc92a1 100644
--- a/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
+++ b/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
@@ -18,7 +18,7 @@ public class OsmMercator {
private static int TILE_SIZE = 256;
public static final double MAX_LAT = 85.05112877980659;
public static final double MIN_LAT = -85.05112877980659;
- private static double EARTH_RADIUS = 6378137; // equatorial earth radius for EPSG:3857 (Mercator)
+ private static double EARTH_RADIUS = 6378137; // equatorial earth radius for EPSG:3857 (Mercator)
public static double radius(int aZoomlevel) {
return (TILE_SIZE * (1 << aZoomlevel)) / (2.0 * Math.PI);
@@ -50,7 +50,7 @@ public class OsmMercator {
* @param y1 the first y coordinate
* @param x2 the second x coordinate
* @param y2 the second y coordinate
- *
+ *
* @param zoomLevel the zoom level
* @return the distance
* @author Jason Huntley
@@ -84,7 +84,7 @@ public class OsmMercator {
+ Math.cos(aStartLat) * Math.cos(aEndLat)
* Math.cos(aEndLong - aStartLong));
- return (EARTH_RADIUS * distance);
+ return (EARTH_RADIUS * distance);
}
/**
diff --git a/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java b/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
index 1d80996..8f34039 100644
--- a/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
+++ b/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
@@ -7,14 +7,13 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.HashMap;
import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
/**
* A {@link TileLoader} implementation that loads tiles from OSM.
@@ -58,9 +57,12 @@ public class OsmTileLoader implements TileLoader {
tile.setError("No tile at this zoom level");
} else {
input = conn.getInputStream();
- tile.loadImage(input);
- input.close();
- input = null;
+ try {
+ tile.loadImage(input);
+ } finally {
+ input.close();
+ input = null;
+ }
}
tile.setLoaded(true);
listener.tileLoadingFinished(tile, true);
diff --git a/src/org/openstreetmap/gui/jmapviewer/Style.java b/src/org/openstreetmap/gui/jmapviewer/Style.java
new file mode 100644
index 0000000..b7e3e8f
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/Style.java
@@ -0,0 +1,61 @@
+package org.openstreetmap.gui.jmapviewer;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Stroke;
+
+public class Style {
+ private Color color;
+ private Color backColor;
+ private Stroke stroke;
+ private Font font;
+
+ private static final AlphaComposite TRANSPARENCY = AlphaComposite.getInstance(AlphaComposite.SRC_OVER);
+ private static final AlphaComposite OPAQUE = AlphaComposite.getInstance(AlphaComposite.SRC);
+
+ public Style(){
+ super();
+ }
+ public Style(Color color, Color backColor, Stroke stroke, Font font) {
+ super();
+ this.color = color;
+ this.backColor = backColor;
+ this.stroke = stroke;
+ this.font = font;
+ }
+
+ public Color getColor() {
+ return color;
+ }
+ public void setColor(Color color) {
+ this.color = color;
+ }
+ public Color getBackColor() {
+ return backColor;
+ }
+ public void setBackColor(Color backColor) {
+ this.backColor = backColor;
+ }
+ public Stroke getStroke() {
+ return stroke;
+ }
+ public void setStroke(Stroke stroke) {
+ this.stroke = stroke;
+ }
+ public Font getFont() {
+ return font;
+ }
+ public void setFont(Font font) {
+ this.font = font;
+ }
+ private AlphaComposite getAlphaComposite(Color color){
+ return color.getAlpha()==255?OPAQUE:TRANSPARENCY;
+ }
+ public AlphaComposite getAlphaComposite(){
+ return getAlphaComposite(color);
+ }
+ public AlphaComposite getBackAlphaComposite(){
+ return getAlphaComposite(backColor);
+ }
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/Tile.java b/src/org/openstreetmap/gui/jmapviewer/Tile.java
index 185bb15..7a6086e 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Tile.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java
@@ -283,11 +283,11 @@ public class Tile {
/**
* Puts the given key/value pair to the metadata of the tile.
- * If value is null, the (possibly existing) key/value pair is removed from
+ * If value is null, the (possibly existing) key/value pair is removed from
* the meta data.
- *
+ *
* @param key
- * @param value
+ * @param value
*/
public void putValue(String key, String value) {
if (value == null || value.isEmpty()) {
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeData.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeData.java
new file mode 100644
index 0000000..152a15a
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeData.java
@@ -0,0 +1,43 @@
+package org.openstreetmap.gui.jmapviewer.checkBoxTree;
+
+import org.openstreetmap.gui.jmapviewer.AbstractLayer;
+import org.openstreetmap.gui.jmapviewer.LayerGroup;
+
+/**
+ * Node Data for checkBox Tree
+ *
+ * @author galo
+ */
+public class CheckBoxNodeData {
+ private AbstractLayer layer;
+
+ public CheckBoxNodeData(final AbstractLayer layer) {
+ this.layer = layer;
+ }
+ public CheckBoxNodeData(final String txt) {
+ this(new LayerGroup(txt));
+ }
+ public CheckBoxNodeData(final String txt, final Boolean selected) {
+ this(new LayerGroup(txt));
+ layer.setVisible(selected);
+ }
+ public Boolean isSelected() {
+ return layer.isVisible();
+ }
+ public void setSelected(final Boolean newValue) {
+ layer.setVisible(newValue);
+ }
+ public String getText() {
+ return layer.getName();
+ }
+ public AbstractLayer getAbstractLayer() {
+ return layer;
+}
+ public void setAbstractLayer(final AbstractLayer layer) {
+ this.layer = layer;
+ }
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "[" + getText() + "/" + isSelected() + "]";
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java
new file mode 100644
index 0000000..b55a15e
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java
@@ -0,0 +1,101 @@
+package org.openstreetmap.gui.jmapviewer.checkBoxTree;
+
+import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.EventObject;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeCellEditor;
+import javax.swing.tree.TreePath;
+
+/**
+ * Editor for checkBox Tree
+ *
+ * @author galo
+ */
+public class CheckBoxNodeEditor extends AbstractCellEditor implements TreeCellEditor{
+ /** SerialVersionUID */
+ private static final long serialVersionUID = -8921320784224636657L;
+
+ private final CheckBoxNodeRenderer renderer = new CheckBoxNodeRenderer();
+
+ private final CheckBoxTree theTree;
+
+ public CheckBoxNodeEditor(final CheckBoxTree tree) {
+ theTree = tree;
+ }
+
+ @Override
+ public Object getCellEditorValue() {
+ final CheckBoxNodePanel panel = renderer.getPanel();
+ /*final CheckBoxNodeData checkBoxNode =
+ new CheckBoxNodeData(panel.label.getText(), panel.check.isSelected());
+ return checkBoxNode;
+ CheckBoxNodeData data = search(theTree.rootNode(), panel.label.getText());
+ data.setSelected(panel.check.isSelected());*/
+ return panel.getData();
+ }
+ /*public CheckBoxNodeData search(DefaultMutableTreeNode node, String name){
+ CheckBoxNodeData data = CheckBoxTree.data(node);
+ if(data.getText().equals(name)) return data;
+ else{
+ data = null;
+ for(int i=0; i<node.getChildCount() && data==null; i++){
+ data = search((DefaultMutableTreeNode)node.getChildAt(i), name);
+ }
+ return data;
+ }
+ }*/
+ public void addNodeListener(MouseAdapter listener){
+ renderer.addNodeListener(listener);
+ }
+ @Override
+ public boolean isCellEditable(final EventObject event) {
+ if (!(event instanceof MouseEvent)) return false;
+ final MouseEvent mouseEvent = (MouseEvent) event;
+
+ final TreePath path =
+ theTree.getPathForLocation(mouseEvent.getX(), mouseEvent.getY());
+ if (path == null) return false;
+
+ final Object node = path.getLastPathComponent();
+ if (!(node instanceof DefaultMutableTreeNode)) return false;
+ final DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) node;
+
+ final Object userObject = treeNode.getUserObject();
+ return userObject instanceof CheckBoxNodeData;
+ }
+
+ @Override
+ public Component getTreeCellEditorComponent(final JTree tree,
+ final Object value, final boolean selected, final boolean expanded,
+ final boolean leaf, final int row)
+ {
+
+ final Component editor =
+ renderer.getTreeCellRendererComponent(tree, value, true, expanded, leaf,
+ row, true);
+
+ // editor always selected / focused
+ final ItemListener itemListener = new ItemListener() {
+
+ @Override
+ public void itemStateChanged(final ItemEvent itemEvent) {
+ if (stopCellEditing()) {
+ fireEditingStopped();
+ }
+ }
+ };
+ if (editor instanceof CheckBoxNodePanel) {
+ final CheckBoxNodePanel panel = (CheckBoxNodePanel) editor;
+ panel.check.addItemListener(itemListener);
+ }
+
+ return editor;
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodePanel.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodePanel.java
new file mode 100644
index 0000000..e8985dc
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodePanel.java
@@ -0,0 +1,48 @@
+package org.openstreetmap.gui.jmapviewer.checkBoxTree;
+
+import java.awt.BorderLayout;
+import java.awt.Insets;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ * Node Panel for checkBox Tree
+ *
+ * @author galo
+ */
+public class CheckBoxNodePanel extends JPanel {
+ /** Serial Version UID */
+ private static final long serialVersionUID = -7236481597785619029L;
+ private final JLabel label = new JLabel();
+ private CheckBoxNodeData data;
+ public final JCheckBox check = new JCheckBox();
+
+ public CheckBoxNodePanel() {
+ this.check.setMargin(new Insets(0, 0, 0, 0));
+ setLayout(new BorderLayout());
+ add(check, BorderLayout.WEST);
+ add(label, BorderLayout.CENTER);
+ }
+ public void setSelected(Boolean bool){
+ if(bool==null){
+ check.getModel().setPressed(true);
+ check.getModel().setArmed(true);
+ }else{
+ check.setSelected(bool.booleanValue());
+ check.getModel().setArmed(false);
+ }
+ }
+ public CheckBoxNodeData getData() {
+ data.setSelected(check.isSelected());
+ return data;
+ }
+ public void setData(CheckBoxNodeData data) {
+ this.data = data;
+ label.setText(data.getText());
+ }
+ public JLabel getLabel() {
+ return label;
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java
new file mode 100644
index 0000000..a85cb0e
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java
@@ -0,0 +1,126 @@
+package org.openstreetmap.gui.jmapviewer.checkBoxTree;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JTree;
+import javax.swing.UIManager;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.TreeCellRenderer;
+
+import org.openstreetmap.gui.jmapviewer.AbstractLayer;
+import org.openstreetmap.gui.jmapviewer.LayerGroup;
+
+/**
+ * Renderer for checkBox Tree
+ *
+ * @author galo
+ */
+public class CheckBoxNodeRenderer implements TreeCellRenderer{
+
+ private final CheckBoxNodePanel panel = new CheckBoxNodePanel();
+ private final DefaultTreeCellRenderer defaultRenderer = new DefaultTreeCellRenderer();
+ private final Color selectionForeground, selectionBackground;
+ private final Color textForeground, textBackground;
+
+ protected CheckBoxNodePanel getPanel() {
+ return panel;
+ }
+
+ public CheckBoxNodeRenderer() {
+ final Font fontValue = UIManager.getFont("Tree.font");
+ if (fontValue != null) panel.getLabel().setFont(fontValue);
+
+ final Boolean focusPainted =
+ (Boolean) UIManager.get("Tree.drawsFocusBorderAroundIcon");
+ panel.check.setFocusPainted(focusPainted != null && focusPainted);
+
+ selectionForeground = UIManager.getColor("Tree.selectionForeground");
+ selectionBackground = UIManager.getColor("Tree.selectionBackground");
+ textForeground = UIManager.getColor("Tree.textForeground");
+ textBackground = UIManager.getColor("Tree.textBackground");
+ }
+ public void addNodeListener(MouseAdapter listener){
+ panel.addMouseListener(listener);
+ }
+ // -- TreeCellRenderer methods --
+
+ @Override
+ public Component getTreeCellRendererComponent(final JTree tree,
+ final Object value, final boolean selected, final boolean expanded,
+ final boolean leaf, final int row, final boolean hasFocus)
+ {
+ CheckBoxNodeData data = null;
+ if (value instanceof DefaultMutableTreeNode) {
+ final DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
+ final Object userObject = node.getUserObject();
+ if (userObject instanceof CheckBoxNodeData) {
+ data = (CheckBoxNodeData) userObject;
+ }
+ }
+
+ //final String stringValue =
+ // tree.convertValueToText(value, selected, expanded, leaf, row, false);
+ //panel.label.setText(stringValue);
+
+ panel.setSelected(false);
+
+ panel.setEnabled(tree.isEnabled());
+
+ if (selected) {
+ panel.setForeground(selectionForeground);
+ panel.setBackground(selectionBackground);
+ panel.getLabel().setForeground(selectionForeground);
+ panel.getLabel().setBackground(selectionBackground);
+ }
+ else {
+ panel.setForeground(textForeground);
+ panel.setBackground(textBackground);
+ panel.getLabel().setForeground(textForeground);
+ panel.getLabel().setBackground(textBackground);
+ }
+
+ if (data == null) {
+ // not a check box node; return default cell renderer
+ return defaultRenderer.getTreeCellRendererComponent(tree, value,
+ selected, expanded, leaf, row, hasFocus);
+ }
+
+ //panel.label.setText(data.getText());
+ panel.setData(data);
+ panel.setSelected(data.isSelected());
+
+ return panel;
+ }
+ private JPopupMenu createPopupMenu(final AbstractLayer layer) {
+ JMenuItem menuItem;
+
+ //Create the popup menu.
+ if(layer.isVisibleTexts()) menuItem = new JMenuItem("hide texts");
+ else menuItem = new JMenuItem("show texts");
+ JPopupMenu popup = new JPopupMenu();
+ popup.add(menuItem);
+ menuItem.addActionListener(new ActionListener(){
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ setVisibleTexts(layer, !layer.isVisibleTexts());
+ }
+ });
+
+ return popup;
+ }
+ private void setVisibleTexts(AbstractLayer layer, boolean visible){
+ layer.setVisibleTexts(visible);
+ if(layer instanceof LayerGroup){
+ LayerGroup group = (LayerGroup)layer;
+ if(group.getLayers()!=null) for(AbstractLayer al: group.getLayers()) setVisibleTexts(al, visible);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java
new file mode 100644
index 0000000..dcd0a7b
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java
@@ -0,0 +1,237 @@
+package org.openstreetmap.gui.jmapviewer.checkBoxTree;
+
+import java.awt.BorderLayout;
+import java.awt.event.MouseAdapter;
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.event.TreeModelEvent;
+import javax.swing.event.TreeModelListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+import org.openstreetmap.gui.jmapviewer.AbstractLayer;
+import org.openstreetmap.gui.jmapviewer.Layer;
+import org.openstreetmap.gui.jmapviewer.LayerGroup;
+
+/**
+ * JTree for checkBox Tree Layers
+ *
+ * @author galo
+ */
+public class CheckBoxTree extends JTree{
+ /** Serial Version UID */
+ private static final long serialVersionUID = 6943401106938034256L;
+
+ private final CheckBoxNodeEditor editor;
+
+ public CheckBoxTree(AbstractLayer layer){
+ this(new CheckBoxNodeData(layer));
+ }
+ public CheckBoxTree(String rootName){
+ this(new CheckBoxNodeData(rootName));
+ }
+ public CheckBoxTree(CheckBoxNodeData root ){
+ this(new DefaultMutableTreeNode(root));
+ }
+ public CheckBoxTree(DefaultMutableTreeNode node){
+ super(new DefaultTreeModel(node));
+
+ final CheckBoxNodeRenderer renderer = new CheckBoxNodeRenderer();
+ setCellRenderer(renderer);
+
+ editor = new CheckBoxNodeEditor(this);
+ setCellEditor(editor);
+ setEditable(true);
+
+ // listen for changes in the model (including check box toggles)
+ getModel().addTreeModelListener(new TreeModelListener() {
+ @Override
+ public void treeNodesChanged(final TreeModelEvent e) {
+ DefaultTreeModel model = (DefaultTreeModel)e.getSource();
+ Object[] nodes = e.getChildren();
+ DefaultMutableTreeNode node;
+ if(nodes==null||nodes.length==0){
+ node = node(model.getRoot());
+ }else{
+ node = node(nodes[0]);
+ }
+ nodeChanged(node);
+ repaint();
+ }
+
+ @Override
+ public void treeNodesInserted(final TreeModelEvent e) {
+ //System.out.println("nodes inserted");
+ }
+
+ @Override
+ public void treeNodesRemoved(final TreeModelEvent e) {
+ //System.out.println("nodes removed");
+ }
+
+ @Override
+ public void treeStructureChanged(final TreeModelEvent e) {
+ //System.out.println("structure changed");
+ }
+ });
+ }
+ public void addNodeListener(MouseAdapter listener){
+ editor.addNodeListener(listener);
+ }
+ public static void main(final String args[]) {
+ final DefaultMutableTreeNode root = new DefaultMutableTreeNode(new CheckBoxNodeData("Root",true));
+
+ final DefaultMutableTreeNode accessibility =
+ add(root, "Accessibility", true);
+ add(accessibility, "Move system caret with focus/selection changes", false);
+ add(accessibility, "Always expand alt text for images", true);
+ root.add(accessibility);
+
+ final DefaultMutableTreeNode browsing =
+ new DefaultMutableTreeNode(new CheckBoxNodeData("Browsing", null));
+ add(browsing, "Notify when downloads complete", true);
+ add(browsing, "Disable script debugging", true);
+ add(browsing, "Use AutoComplete", true);
+ add(browsing, "Browse in a new process", false);
+ root.add(browsing);
+
+ final CheckBoxTree tree = new CheckBoxTree(root);
+ ((DefaultMutableTreeNode)tree.getModel().getRoot()).add(new DefaultMutableTreeNode(new CheckBoxNodeData("gggg", null)));
+ ((DefaultTreeModel)tree.getModel()).reload();
+ // listen for changes in the selection
+ tree.addTreeSelectionListener(new TreeSelectionListener() {
+ @Override
+ public void valueChanged(final TreeSelectionEvent e) {
+ //System.out.println("selection changed");
+ }
+ });
+ // show the tree on screen
+ final JFrame frame = new JFrame("CheckBox Tree");
+ final JScrollPane scrollPane = new JScrollPane(tree);
+ frame.getContentPane().add(scrollPane, BorderLayout.CENTER);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setSize(300, 150);
+ frame.setVisible(true);
+ }
+ private static Boolean childStatus(DefaultMutableTreeNode node){
+ Boolean status = data(node.getChildAt(0)).isSelected();
+ for(int i=1; i<node.getChildCount()&&status!=null; i++){
+ if(status != data(node.getChildAt(i)).isSelected()) return null;
+ }
+ return status;
+ }
+ private static void changeParents(DefaultMutableTreeNode node){
+ if(node!=null){
+ DefaultMutableTreeNode parent = node(node.getParent());
+ if(parent!=null){
+ CheckBoxNodeData dataParent = data(parent);
+ Boolean childStatus = childStatus(parent);
+ if(dataParent.isSelected()!=childStatus){
+ dataParent.setSelected(childStatus);
+ changeParents(parent);
+ }
+ }
+ }
+ }
+ private static void nodeChanged(DefaultMutableTreeNode node){
+ if(node!=null){
+ changeParents(node);
+ setChildrens(node, data(node).isSelected());
+ }
+ }
+ private static void setChildrens(DefaultMutableTreeNode node, Boolean value){
+ for(int i=0; i<node.getChildCount(); i++){
+ DefaultMutableTreeNode childNode = node(node.getChildAt(i));
+ if (data(childNode).isSelected() !=data(node).isSelected()){
+ data(childNode).setSelected(data(node).isSelected());
+ setChildrens(childNode, value);
+ }
+ }
+ }
+ public DefaultMutableTreeNode rootNode(){
+ return node(getModel().getRoot());
+ }
+ public LayerGroup rootLayer(){
+ return (LayerGroup)rootData().getAbstractLayer();
+ }
+ public CheckBoxNodeData rootData(){
+ return data(rootNode());
+ }
+ private static DefaultMutableTreeNode node(Object node){
+ return (DefaultMutableTreeNode)node;
+ }
+ public static CheckBoxNodeData data(DefaultMutableTreeNode node){
+ return node==null?null:(CheckBoxNodeData)node.getUserObject();
+ }
+ private static CheckBoxNodeData data(Object node){
+ return data(node(node));
+ }
+ private static DefaultMutableTreeNode add(final DefaultMutableTreeNode parent, final String text, final boolean checked){
+ final CheckBoxNodeData data = new CheckBoxNodeData(text, checked);
+ final DefaultMutableTreeNode node = new DefaultMutableTreeNode(data);
+ parent.add(node);
+ return node;
+ }
+ public static CheckBoxNodeData createNodeData(AbstractLayer layer){
+ return new CheckBoxNodeData(layer);
+ }
+ public static DefaultMutableTreeNode createNode(AbstractLayer layer){
+ return new DefaultMutableTreeNode(createNodeData(layer));
+ }
+ /*public DefaultMutableTreeNode addLayerGroup(LayerGroup group){
+ if(group!=null){
+ if(group.getParent()==null){
+ return add(rootNode(), group);
+ }else{
+ DefaultMutableTreeNode parentGroup = searchNode(group.getParent());
+ if(parentGroup==null) parentGroup = addLayerGroup(group.getParent());
+ DefaultMutableTreeNode node = add(parentGroup, group);
+ return node;
+ }
+ }else return null;
+ }*/
+ public Layer addLayer(String name){
+ Layer layer = new Layer(name);
+ addLayer(layer);
+ return layer;
+ }
+ public DefaultMutableTreeNode addLayer(AbstractLayer layer){
+ if (layer!=null){
+ DefaultMutableTreeNode parent;
+ if(layer.getParent()==null){
+ rootLayer().add(layer);
+ parent = rootNode();
+ }else{
+ parent = searchNode(layer.getParent());
+ if(parent==null) parent=addLayer(layer.getParent());
+ }
+ return add(parent, layer);
+ }else return null;
+ }
+ public DefaultMutableTreeNode add(DefaultMutableTreeNode parent, final AbstractLayer layer){
+ layer.setVisible(data(parent).isSelected());
+ DefaultMutableTreeNode node = createNode(layer);
+ parent.add(node);
+ ((DefaultTreeModel)getModel()).reload();
+ //System.out.println("Created node "+layer+" upper of "+data(parent));
+ return node;
+ }
+ public DefaultMutableTreeNode searchNode(AbstractLayer layer){
+ return searchNode(rootNode(), layer);
+ }
+ public DefaultMutableTreeNode searchNode(DefaultMutableTreeNode node, AbstractLayer layer){
+ CheckBoxNodeData data = CheckBoxTree.data(node);
+ if(data.getAbstractLayer() == layer) return node;
+ else{
+ DefaultMutableTreeNode found = null;
+ for(int i=0; i<node.getChildCount() && found==null; i++){
+ found = searchNode((DefaultMutableTreeNode)node.getChildAt(i), layer);
+ }
+ return found;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/gui/jmapviewer/events/JMVCommandEvent.java b/src/org/openstreetmap/gui/jmapviewer/events/JMVCommandEvent.java
index 2c1c668..fbb81ef 100644
--- a/src/org/openstreetmap/gui/jmapviewer/events/JMVCommandEvent.java
+++ b/src/org/openstreetmap/gui/jmapviewer/events/JMVCommandEvent.java
@@ -7,7 +7,7 @@ import java.util.EventObject;
/**
* Used for passing events between UI components and other
* objects that register as a JMapViewerEventListener
- *
+ *
* @author Jason Huntley
*
*/
@@ -19,7 +19,7 @@ public class JMVCommandEvent extends EventObject {
private COMMAND command;
/**
- *
+ *
*/
private static final long serialVersionUID = 8701544867914969620L;
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/CachedTileLoader.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/CachedTileLoader.java
new file mode 100644
index 0000000..1a40956
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/CachedTileLoader.java
@@ -0,0 +1,10 @@
+// License: GPL
+package org.openstreetmap.gui.jmapviewer.interfaces;
+
+/**
+ * Interface that allow cleaning the tile cache without specifying exact type of loader
+ */
+public interface CachedTileLoader {
+ public void clearCache(TileSource source);
+ public void clearCache(TileSource source, TileClearController controller);
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/ICoordinate.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/ICoordinate.java
new file mode 100644
index 0000000..c34e00f
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/ICoordinate.java
@@ -0,0 +1,8 @@
+package org.openstreetmap.gui.jmapviewer.interfaces;
+
+public interface ICoordinate {
+ public double getLat();
+ public void setLat(double lat);
+ public double getLon();
+ public void setLon(double lon);
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/JMapViewerEventListener.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/JMapViewerEventListener.java
index b33f285..cb12b6a 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/JMapViewerEventListener.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/JMapViewerEventListener.java
@@ -9,10 +9,10 @@ import org.openstreetmap.gui.jmapviewer.events.JMVCommandEvent;
/**
* Must be implemented for processing commands while user
* interacts with map viewer.
- *
+ *
* @author Jason Huntley
*
*/
public interface JMapViewerEventListener extends EventListener {
- public void processCommand(JMVCommandEvent command);
+ public void processCommand(JMVCommandEvent command);
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java
index 4a96a8d..2c1dc34 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java
@@ -5,6 +5,7 @@ package org.openstreetmap.gui.jmapviewer.interfaces;
import java.awt.Graphics;
import java.awt.Point;
+import org.openstreetmap.gui.jmapviewer.Coordinate;
import org.openstreetmap.gui.jmapviewer.JMapViewer;
/**
@@ -14,8 +15,14 @@ import org.openstreetmap.gui.jmapviewer.JMapViewer;
* @see JMapViewer#addMapMarker(MapMarker)
* @see JMapViewer#getMapMarkerList()
*/
-public interface MapMarker {
+public interface MapMarker extends MapObject, ICoordinate{
+ public static enum STYLE {FIXED, VARIABLE};
+
+ /**
+ * @return Latitude and Longitude of the map marker position
+ */
+ public Coordinate getCoordinate();
/**
* @return Latitude of the map marker position
*/
@@ -27,11 +34,22 @@ public interface MapMarker {
public double getLon();
/**
+ * @return Radius of the map marker position
+ */
+ public double getRadius();
+
+ /**
+ * @return Style of the map marker
+ */
+ public STYLE getMarkerStyle();
+
+ /**
* Paints the map marker on the map. The <code>position</code> specifies the
* coordinates within <code>g</code>
*
* @param g
* @param position
+ * @param radio
*/
- public void paint(Graphics g, Point position);
+ public void paint(Graphics g, Point position, int radio);
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapObject.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapObject.java
new file mode 100644
index 0000000..9c0f7fe
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapObject.java
@@ -0,0 +1,22 @@
+package org.openstreetmap.gui.jmapviewer.interfaces;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Stroke;
+
+import org.openstreetmap.gui.jmapviewer.Layer;
+import org.openstreetmap.gui.jmapviewer.Style;
+
+public interface MapObject {
+
+ public Layer getLayer();
+ public void setLayer(Layer layer);
+ public Style getStyle();
+ public Style getStyleAssigned();
+ public Color getColor();
+ public Color getBackColor();
+ public Stroke getStroke();
+ public Font getFont();
+ public String getName();
+ public boolean isVisible();
+}
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java
index eaece53..d72dc93 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java
@@ -6,22 +6,20 @@ import java.awt.Point;
import java.awt.Polygon;
import java.util.List;
-import org.openstreetmap.gui.jmapviewer.Coordinate;
-
/**
* Interface to be implemented by polygons that can be displayed on the map.
*
* @author Vincent
*/
-public interface MapPolygon {
+public interface MapPolygon extends MapObject{
/**
* @return Latitude/Longitude of each point of polygon
*/
- public List<Coordinate> getPoints();
+ public List<? extends ICoordinate> getPoints();
/**
- * Paints the map rectangle on the map. The <code>points</code>
+ * Paints the map rectangle on the map. The <code>points</code>
* are specifying the coordinates within <code>g</code>
*
* @param g
@@ -30,7 +28,7 @@ public interface MapPolygon {
public void paint(Graphics g, List<Point> points);
/**
- * Paints the map rectangle on the map. The <code>polygon</code>
+ * Paints the map rectangle on the map. The <code>polygon</code>
* is specifying the coordinates within <code>g</code>
*
* @param g
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
index 9b4518f..8e0b942 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
@@ -15,7 +15,7 @@ import org.openstreetmap.gui.jmapviewer.JMapViewer;
* @see JMapViewer#addMapRectangle(MapRectangle)
* @see JMapViewer#getMapRectangleList()
*/
-public interface MapRectangle {
+public interface MapRectangle extends MapObject{
/**
* @return Latitude/Longitude of top left of rectangle
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileClearController.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileClearController.java
new file mode 100644
index 0000000..3ae88c4
--- /dev/null
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileClearController.java
@@ -0,0 +1,16 @@
+package org.openstreetmap.gui.jmapviewer.interfaces;
+
+import java.io.File;
+
+public interface TileClearController {
+
+ void initClearDir(File dir);
+
+ void initClearFiles(File[] files);
+
+ boolean cancel();
+
+ void fileDeleted(File file);
+
+ void clearFinished();
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
index da1d8a1..83de8a9 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
@@ -1,9 +1,7 @@
package org.openstreetmap.gui.jmapviewer.interfaces;
-import java.awt.Image;
import java.io.IOException;
-import org.openstreetmap.gui.jmapviewer.Coordinate;
import org.openstreetmap.gui.jmapviewer.JMapViewer;
//License: GPL. Copyright 2008 by Jan Peter Stotz
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
index 997ccbc..2dac34c 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
@@ -1,23 +1,30 @@
-/**
- *
- */
package org.openstreetmap.gui.jmapviewer.tilesources;
import java.awt.Image;
-import java.io.IOException;
-
-import javax.swing.ImageIcon;
import org.openstreetmap.gui.jmapviewer.Coordinate;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+/**
+ * Abstract clas for OSM Tile sources
+ */
public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
+
+ /**
+ * The OSM attribution. Must be always in line with <a href="http://www.openstreetmap.org/copyright/en">http://www.openstreetmap.org/copyright/en</a>
+ */
+ public static final String DEFAULT_OSM_ATTRIBUTION = "\u00a9 OpenStreetMap contributors";
+
+ /**
+ * Constructs a new OSM tile source
+ * @param name Source name as displayed in GUI
+ * @param base_url Source URL
+ */
public AbstractOsmTileSource(String name, String base_url) {
super(name, base_url);
}
public int getMaxZoom() {
- return 18;
+ return 19;
}
@Override
@@ -27,7 +34,7 @@ public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
@Override
public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) {
- return "\u00a9 OpenStreetMap contributors, CC-BY-SA ";
+ return DEFAULT_OSM_ATTRIBUTION;
}
@Override
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java
index 614fdc0..56c2359 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java
@@ -13,6 +13,6 @@ public class MapQuestOsmTileSource extends AbstractMapQuestTileSource {
@Override
public String getAttributionText(int zoom, Coordinate topLeft,
Coordinate botRight) {
- return super.getAttributionText(zoom, topLeft, botRight)+"- "+MAPQUEST_ATTRIBUTION;
+ return super.getAttributionText(zoom, topLeft, botRight)+" - "+MAPQUEST_ATTRIBUTION;
}
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
index 4f774d4..be0bc1c 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
@@ -1,10 +1,23 @@
package org.openstreetmap.gui.jmapviewer.tilesources;
+/**
+ * OSM Tile source.
+ */
public class OsmTileSource {
+ /**
+ * The default "Mapnik" OSM tile source URL
+ */
public static final String MAP_MAPNIK = "http://tile.openstreetmap.org";
+ /**
+ * The default "Mapnik" OSM tile source.
+ */
public static class Mapnik extends AbstractOsmTileSource {
+
+ /**
+ * Constructs a new {@code "Mapnik"} tile source.
+ */
public Mapnik() {
super("Mapnik", MAP_MAPNIK);
}
@@ -14,6 +27,9 @@ public class OsmTileSource {
}
}
+ /**
+ * The "Cycle Map" OSM tile source.
+ */
public static class CycleMap extends AbstractOsmTileSource {
private static final String PATTERN = "http://%s.tile.opencyclemap.org/cycle";
@@ -22,6 +38,9 @@ public class OsmTileSource {
private int SERVER_NUM = 0;
+ /**
+ * Constructs a new {@code CycleMap} tile source.
+ */
public CycleMap() {
super("OSM Cycle Map", PATTERN);
}
@@ -35,7 +54,7 @@ public class OsmTileSource {
@Override
public int getMaxZoom() {
- return 17;
+ return 18;
}
public TileUpdate getTileUpdate() {
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
index 1b184a7..4d20822 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
@@ -64,9 +64,9 @@ public class ScanexTileSource extends AbstractTMSTileSource {
return TileUpdate.IfNoneMatch;
}
- private static double RADIUS_E = 6378137; /* radius of Earth at equator, m */
+ private static double RADIUS_E = 6378137; /* radius of Earth at equator, m */
private static double EQUATOR = 40075016.68557849; /* equator length, m */
- private static double E = 0.0818191908426; /* eccentricity of Earth's ellipsoid */
+ private static double E = 0.0818191908426; /* eccentricity of Earth's ellipsoid */
@Override
public double latToTileY(double lat, int zoom) {
@@ -92,21 +92,21 @@ public class ScanexTileSource extends AbstractTMSTileSource {
@Override
public double tileYToLat(int y, int zoom) {
- Random r= new Random();
+ Random r= new Random();
double lat0, lat;
- lat = cached_lat;
- do {
- lat0 = lat;
+ lat = cached_lat;
+ do {
+ lat0 = lat;
lat = lat - Math.toDegrees(NextTerm(Math.toRadians(lat), y, zoom));
if (lat > OsmMercator.MAX_LAT || lat < OsmMercator.MIN_LAT) {
lat = OsmMercator.MIN_LAT +
(double )r.nextInt((int )(OsmMercator.MAX_LAT -
OsmMercator.MIN_LAT));
}
- } while ((Math.abs(lat0 - lat) > 0.000001));
+ } while ((Math.abs(lat0 - lat) > 0.000001));
- cached_lat = lat;
+ cached_lat = lat;
return (lat);
}
@@ -115,13 +115,13 @@ public class ScanexTileSource extends AbstractTMSTileSource {
private double NextTerm(double lat, double y, int zoom) {
double sinl=Math.sin(lat);
double cosl=Math.cos(lat);
- double ec, f, df;
+ double ec, f, df;
zoom = (int )Math.pow(2.0, zoom - 1);
- ec = Math.exp((1 - y/zoom)*Math.PI);
+ ec = Math.exp((1 - y/zoom)*Math.PI);
- f = (Math.tan(Math.PI/4+lat/2) -
- ec * Math.pow(Math.tan(Math.PI/4 + Math.asin(E * sinl)/2), E));
+ f = (Math.tan(Math.PI/4+lat/2) -
+ ec * Math.pow(Math.tan(Math.PI/4 + Math.asin(E * sinl)/2), E));
df = 1/(1 - sinl) - ec * E * cosl/((1 - E * sinl) *
(Math.sqrt (1 - E * E * sinl * sinl)));
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 8f20d9a..8eee98d 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17,6 +17,7 @@ import java.io.File;
import java.lang.ref.WeakReference;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URL;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -40,6 +41,7 @@ import javax.swing.JPanel;
import javax.swing.JTextArea;
import javax.swing.KeyStroke;
import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
import org.openstreetmap.josm.actions.JosmAction;
@@ -52,6 +54,7 @@ import org.openstreetmap.josm.actions.mapmode.MapMode;
import org.openstreetmap.josm.actions.search.SearchAction;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.ServerSidePreferences;
import org.openstreetmap.josm.data.UndoRedoHandler;
import org.openstreetmap.josm.data.coor.CoordinateFormat;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -64,9 +67,11 @@ import org.openstreetmap.josm.gui.GettingStarted;
import org.openstreetmap.josm.gui.MainApplication.Option;
import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrameListener;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.NavigatableComponent.ViewportData;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.io.SaveLayersDialog;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -80,7 +85,6 @@ import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitorExecutor;
import org.openstreetmap.josm.gui.util.RedirectInputMap;
import org.openstreetmap.josm.io.OsmApi;
-import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -94,9 +98,25 @@ import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
+/**
+ * Abstract class holding various static global variables and methods used in large parts of JOSM application.
+ * @since 98
+ */
abstract public class Main {
/**
+ * The JOSM website URL.
+ * @since 6143
+ */
+ public static final String JOSM_WEBSITE = "http://josm.openstreetmap.de";
+
+ /**
+ * The OSM website URL.
+ * @since 6453
+ */
+ public static final String OSM_WEBSITE = "http://www.openstreetmap.org";
+
+ /**
* Replies true if JOSM currently displays a map view. False, if it doesn't, i.e. if
* it only shows the MOTD panel.
*
@@ -107,20 +127,29 @@ abstract public class Main {
if (map.mapView == null) return false;
return true;
}
+
/**
* Global parent component for all dialogs and message boxes
*/
public static Component parent;
+
/**
* Global application.
*/
public static Main main;
+
+ /**
+ * Command-line arguments used to run the application.
+ */
+ public static String[] commandLineArgs;
+
/**
* The worker thread slave. This is for executing all long and intensive
* calculations. The executed runnables are guaranteed to be executed separately
* and sequential.
*/
public final static ExecutorService worker = new ProgressMonitorExecutor();
+
/**
* Global application preferences
*/
@@ -130,12 +159,17 @@ abstract public class Main {
* The global paste buffer.
*/
public static final PrimitiveDeepCopy pasteBuffer = new PrimitiveDeepCopy();
+
+ /**
+ * The layer source from which {@link Main#pasteBuffer} data comes from.
+ */
public static Layer pasteSource;
/**
- * The MapFrame. Use setMapFrame to set or clear it.
+ * The MapFrame. Use {@link Main#setMapFrame} to set or clear it.
*/
public static MapFrame map;
+
/**
* Set to <code>true</code>, when in applet mode
*/
@@ -146,8 +180,14 @@ abstract public class Main {
*/
public static ToolbarPreferences toolbar;
+ /**
+ * The commands undo/redo handler.
+ */
public UndoRedoHandler undoRedo = new UndoRedoHandler();
+ /**
+ * The progress monitor being currently displayed.
+ */
public static PleaseWaitProgressMonitor currentProgressMonitor;
/**
@@ -164,66 +204,128 @@ abstract public class Main {
*/
private GettingStarted gettingStarted = new GettingStarted();
+ private static final Collection<MapFrameListener> mapFrameListeners = new ArrayList<MapFrameListener>();
+
/**
- * Logging level (3 = debug, 2 = info, 1 = warn, 0 = none).
+ * Logging level (4 = debug, 3 = info, 2 = warn, 1 = error, 0 = none).
+ * @since 6248
*/
- static public int log_level = 2;
+ public static int logLevel = 3;
+
/**
- * Print a warning message if logging is on.
+ * Prints an error message if logging is on.
* @param msg The message to print.
+ * @since 6248
*/
- static public void warn(String msg) {
- if (log_level < 1)
+ public static void error(String msg) {
+ if (logLevel < 1)
return;
- System.out.println(msg);
+ System.err.println(tr("ERROR: {0}", msg));
}
+
/**
- * Print an informational message if logging is on.
+ * Prints a warning message if logging is on.
* @param msg The message to print.
*/
- static public void info(String msg) {
- if (log_level < 2)
+ public static void warn(String msg) {
+ if (logLevel < 2)
return;
- System.out.println(msg);
+ System.err.println(tr("WARNING: {0}", msg));
}
+
/**
- * Print an debug message if logging is on.
+ * Prints an informational message if logging is on.
* @param msg The message to print.
*/
- static public void debug(String msg) {
- if (log_level < 3)
+ public static void info(String msg) {
+ if (logLevel < 3)
return;
- System.out.println(msg);
+ System.out.println(tr("INFO: {0}", msg));
}
+
/**
- * Print a formated warning message if logging is on. Calls {@link MessageFormat#format}
+ * Prints a debug message if logging is on.
+ * @param msg The message to print.
+ */
+ public static void debug(String msg) {
+ if (logLevel < 4)
+ return;
+ System.out.println(tr("DEBUG: {0}", msg));
+ }
+
+ /**
+ * Prints a formated error message if logging is on. Calls {@link MessageFormat#format}
* function to format text.
* @param msg The formated message to print.
* @param objects The objects to insert into format string.
+ * @since 6248
*/
- static public void warn(String msg, Object... objects) {
+ public static void error(String msg, Object... objects) {
+ error(MessageFormat.format(msg, objects));
+ }
+
+ /**
+ * Prints a formated warning message if logging is on. Calls {@link MessageFormat#format}
+ * function to format text.
+ * @param msg The formated message to print.
+ * @param objects The objects to insert into format string.
+ */
+ public static void warn(String msg, Object... objects) {
warn(MessageFormat.format(msg, objects));
}
+
/**
- * Print a formated informational message if logging is on. Calls {@link MessageFormat#format}
+ * Prints a formated informational message if logging is on. Calls {@link MessageFormat#format}
* function to format text.
* @param msg The formated message to print.
* @param objects The objects to insert into format string.
*/
- static public void info(String msg, Object... objects) {
+ public static void info(String msg, Object... objects) {
info(MessageFormat.format(msg, objects));
}
+
/**
- * Print a formated debug message if logging is on. Calls {@link MessageFormat#format}
+ * Prints a formated debug message if logging is on. Calls {@link MessageFormat#format}
* function to format text.
* @param msg The formated message to print.
* @param objects The objects to insert into format string.
*/
- static public void debug(String msg, Object... objects) {
+ public static void debug(String msg, Object... objects) {
debug(MessageFormat.format(msg, objects));
}
/**
+ * Prints an error message for the given Throwable.
+ * @param t The throwable object causing the error
+ * @since 6248
+ */
+ public static void error(Throwable t) {
+ error(getErrorMessage(t));
+ }
+
+ /**
+ * Prints a warning message for the given Throwable.
+ * @param t The throwable object causing the error
+ * @since 6248
+ */
+ public static void warn(Throwable t) {
+ warn(getErrorMessage(t));
+ }
+
+ private static String getErrorMessage(Throwable t) {
+ StringBuilder sb = new StringBuilder(t.getClass().getName());
+ String msg = t.getMessage();
+ if (msg != null) {
+ sb.append(": ").append(msg.trim());
+ }
+ Throwable cause = t.getCause();
+ if (cause != null && !cause.equals(t)) {
+ sb.append(". ").append(tr("Cause: ")).append(getErrorMessage(cause));
+ }
+ return sb.toString();
+ }
+
+ /**
* Platform specific code goes in here.
* Plugins may replace it, however, some hooks will be called before any plugins have been loeaded.
* So if you need to hook into those early ones, split your class and send the one with the early hooks
@@ -238,7 +340,25 @@ abstract public class Main {
public static boolean isOpenjdk;
/**
+ * Initializes {@code Main.pref} in applet context.
+ * @param serverURL The server URL hosting the user preferences.
+ * @since 6471
+ */
+ public static void initAppletPreferences(URL serverURL) {
+ Main.pref = new ServerSidePreferences(serverURL);
+ }
+
+ /**
+ * Initializes {@code Main.pref} in normal application context.
+ * @since 6471
+ */
+ public static void initApplicationPreferences() {
+ Main.pref = new Preferences();
+ }
+
+ /**
* Set or clear (if passed <code>null</code>) the map.
+ * @param map The map to set {@link Main#map} to. Can be null.
*/
public final void setMapFrame(final MapFrame map) {
MapFrame old = Main.map;
@@ -255,7 +375,9 @@ abstract public class Main {
Main.map = map;
- PluginHandler.notifyMapFrameChanged(old, map);
+ for (MapFrameListener listener : mapFrameListeners ) {
+ listener.mapFrameInitialized(old, map);
+ }
if (map == null && currentProgressMonitor != null) {
currentProgressMonitor.showForegroundDialog();
}
@@ -264,11 +386,12 @@ abstract public class Main {
/**
* Remove the specified layer from the map. If it is the last layer,
* remove the map as well.
+ * @param layer The layer to remove
*/
- public final void removeLayer(final Layer layer) {
+ public final synchronized void removeLayer(final Layer layer) {
if (map != null) {
map.mapView.removeLayer(layer);
- if (map != null && map.mapView.getAllLayers().isEmpty()) {
+ if (isDisplayingMapView() && map.mapView.getAllLayers().isEmpty()) {
setMapFrame(null);
}
}
@@ -428,7 +551,9 @@ abstract public class Main {
// bootstrapping problem: make sure the layer list dialog is going to
// listen to change events of the very first layer
//
- firstLayer.addPropertyChangeListener(LayerListDialog.getInstance().getModel());
+ if (firstLayer != null) {
+ firstLayer.addPropertyChangeListener(LayerListDialog.getInstance().getModel());
+ }
}
/**
@@ -447,8 +572,7 @@ abstract public class Main {
* @return the current edit layer. <code>null</code>, if no current edit layer exists
*/
public OsmDataLayer getEditLayer() {
- if (map == null) return null;
- if (map.mapView == null) return null;
+ if (!isDisplayingMapView()) return null;
return map.mapView.getEditLayer();
}
@@ -468,8 +592,7 @@ abstract public class Main {
* @return the currently active layer. <code>null</code>, if currently no active layer exists
*/
public Layer getActiveLayer() {
- if (map == null) return null;
- if (map.mapView == null) return null;
+ if (!isDisplayingMapView()) return null;
return map.mapView.getActiveLayer();
}
@@ -491,7 +614,7 @@ abstract public class Main {
InputMap inputMap = contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
Object existing = inputMap.get(keyStroke);
if (existing != null && !existing.equals(action)) {
- System.out.println(String.format("Keystroke %s is already assigned to %s, will be overridden by %s", keyStroke, existing, action));
+ info(String.format("Keystroke %s is already assigned to %s, will be overridden by %s", keyStroke, existing, action));
}
inputMap.put(keyStroke, action);
@@ -510,7 +633,7 @@ abstract public class Main {
unregisterShortcut(shortcut);
contentPanePrivate.getActionMap().remove(action);
}
-
+
/**
* Replies the registered action for the given shortcut
* @param shortcut The shortcut to look for
@@ -531,12 +654,16 @@ abstract public class Main {
// Implementation part
///////////////////////////////////////////////////////////////////////////
+ /**
+ * Global panel.
+ */
public static final JPanel panel = new JPanel(new BorderLayout());
protected static WindowGeometry geometry;
protected static int windowState = JFrame.NORMAL;
private final CommandQueueListener redoUndoListener = new CommandQueueListener(){
+ @Override
public void commandChanged(final int queueSize, final int redoSize) {
menu.undo.setEnabled(queueSize > 0);
menu.redo.setEnabled(redoSize > 0);
@@ -556,12 +683,12 @@ abstract public class Main {
try {
UIManager.setLookAndFeel(laf);
}
- catch (final java.lang.ClassNotFoundException e) {
- System.out.println("Look and Feel not found: " + laf);
+ catch (final ClassNotFoundException e) {
+ info("Look and Feel not found: " + laf);
Main.pref.put("laf", defaultlaf);
}
- catch (final javax.swing.UnsupportedLookAndFeelException e) {
- System.out.println("Look and Feel not supported: " + laf);
+ catch (final UnsupportedLookAndFeelException e) {
+ info("Look and Feel not supported: " + laf);
Main.pref.put("laf", defaultlaf);
}
toolbar = new ToolbarPreferences();
@@ -580,7 +707,6 @@ abstract public class Main {
// init default coordinate format
//
try {
- //CoordinateFormat format = CoordinateFormat.valueOf(Main.pref.get("coordinates"));
CoordinateFormat.setCoordinateFormat(CoordinateFormat.valueOf(Main.pref.get("coordinates")));
} catch (IllegalArgumentException iae) {
CoordinateFormat.setCoordinateFormat(CoordinateFormat.DECIMAL_DEGREES);
@@ -591,7 +717,7 @@ abstract public class Main {
!args.containsKey(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
}
- public void postConstructorProcessCmdLine(Map<Option, Collection<String>> args) {
+ protected static void postConstructorProcessCmdLine(Map<Option, Collection<String>> args) {
if (args.containsKey(Option.DOWNLOAD)) {
List<File> fileList = new ArrayList<File>();
for (String s : args.get(Option.DOWNLOAD)) {
@@ -662,13 +788,13 @@ abstract public class Main {
* @since 2025
*/
public static boolean saveUnsavedModifications() {
- if (map == null || map.mapView == null) return true;
+ if (!isDisplayingMapView()) return true;
return saveUnsavedModifications(map.mapView.getLayersOfType(OsmDataLayer.class), true);
}
/**
* Asks user to perform "save layer" operations (save .osm on disk and/or upload osm data to server) before osm layers deletion.
- *
+ *
* @param selectedLayers The layers to check. Only instances of {@link OsmDataLayer} are considered.
* @param exit {@code true} if JOSM is exiting, {@code false} otherwise.
* @return {@code true} if there was nothing to save, or if the user wants to proceed to save operations. {@code false} if the user cancels.
@@ -704,10 +830,17 @@ abstract public class Main {
return true;
}
- public static boolean exitJosm(boolean exit) {
+ /**
+ * Closes JOSM and optionally terminates the Java Virtual Machine (JVM). If there are some unsaved data layers, asks first for user confirmation.
+ * @param exit If {@code true}, the JVM is terminated by running {@link System#exit} with a given return code.
+ * @param exitCode The return code
+ * @return {@code true} if JOSM has been closed, {@code false} if the user has cancelled the operation.
+ * @since 3378
+ */
+ public static boolean exitJosm(boolean exit, int exitCode) {
if (Main.saveUnsavedModifications()) {
geometry.remember("gui.geometry");
- if (map != null) {
+ if (map != null) {
map.rememberToggleDialogWidth();
}
pref.put("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0);
@@ -715,16 +848,15 @@ abstract public class Main {
if (Main.isDisplayingMapView()) {
Collection<Layer> layers = new ArrayList<Layer>(Main.map.mapView.getAllLayers());
for (Layer l: layers) {
- Main.map.mapView.removeLayer(l);
+ Main.main.removeLayer(l);
}
}
if (exit) {
- System.exit(0);
- return true;
- } else
- return true;
- } else
- return false;
+ System.exit(exitCode);
+ }
+ return true;
+ }
+ return false;
}
/**
@@ -738,7 +870,7 @@ abstract public class Main {
* @param s A parameter string
* @return The guessed parameter type
*/
- private DownloadParamType paramType(String s) {
+ private static DownloadParamType paramType(String s) {
if(s.startsWith("http:")) return DownloadParamType.httpUrl;
if(s.startsWith("file:")) return DownloadParamType.fileUrl;
String coorPattern = "\\s*[+-]?[0-9]+(\\.[0-9]+)?\\s*";
@@ -797,10 +929,14 @@ abstract public class Main {
Main.worker.execute(new PostDownloadHandler(task, future));
}
+ /**
+ * Identifies the current operating system family and initializes the platform hook accordingly.
+ * @since 1849
+ */
public static void determinePlatformHook() {
String os = System.getProperty("os.name");
if (os == null) {
- System.err.println("Your operating system has no name, so I'm guessing its some kind of *nix.");
+ warn("Your operating system has no name, so I'm guessing its some kind of *nix.");
platform = new PlatformHookUnixoid();
} else if (os.toLowerCase().startsWith("windows")) {
platform = new PlatformHookWindows();
@@ -811,7 +947,7 @@ abstract public class Main {
} else if (os.toLowerCase().startsWith("mac os x")) {
platform = new PlatformHookOsx();
} else {
- System.err.println("I don't know your operating system '"+os+"', so I'm guessing its some kind of *nix.");
+ warn("I don't know your operating system '"+os+"', so I'm guessing its some kind of *nix.");
platform = new PlatformHookUnixoid();
}
}
@@ -852,16 +988,23 @@ abstract public class Main {
}
}
}
- public static void addListener() {
+
+ protected static void addListener() {
parent.addComponentListener(new WindowPositionSizeListener());
((JFrame)parent).addWindowStateListener(new WindowPositionSizeListener());
}
+ /**
+ * Checks that JOSM is at least running with Java 6.
+ * @since 3815
+ */
public static void checkJava6() {
String version = System.getProperty("java.version");
if (version != null) {
if (version.startsWith("1.6") || version.startsWith("6") ||
- version.startsWith("1.7") || version.startsWith("7"))
+ version.startsWith("1.7") || version.startsWith("7") ||
+ version.startsWith("1.8") || version.startsWith("8") ||
+ version.startsWith("1.9") || version.startsWith("9"))
return;
if (version.startsWith("1.5") || version.startsWith("5")) {
JLabel ho = new JLabel("<html>"+
@@ -870,7 +1013,7 @@ abstract public class Main {
"You can <ul><li>update your Java (JRE) or</li>"+
"<li>use an earlier (Java 5 compatible) version of JOSM.</li></ul>"+
"More Info:", version)+"</html>");
- JTextArea link = new JTextArea("http://josm.openstreetmap.de/wiki/Help/SystemRequirements");
+ JTextArea link = new JTextArea(HelpUtil.getWikiBaseHelpUrl()+"/Help/SystemRequirements");
link.setEditable(false);
link.setBackground(panel.getBackground());
JPanel panel = new JPanel(new GridBagLayout());
@@ -889,7 +1032,7 @@ abstract public class Main {
return;
}
}
- System.err.println("Error: Could not recognize Java Version: "+version);
+ error("Could not recognize Java Version: "+version);
}
/* ----------------------------------------------------------------------------------------- */
@@ -932,7 +1075,7 @@ abstract public class Main {
* explicitly removing the listeners and allows us to transparently register every
* created dataset as projection change listener.
*/
- private static final ArrayList<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<WeakReference<ProjectionChangeListener>>();
+ private static final List<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<WeakReference<ProjectionChangeListener>>();
private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
if (newValue == null ^ oldValue == null
@@ -995,7 +1138,7 @@ abstract public class Main {
/**
* Listener for window switch events.
- *
+ *
* These are events, when the user activates a window of another application
* or comes back to JOSM. Window switches from one JOSM window to another
* are not reported.
@@ -1012,7 +1155,7 @@ abstract public class Main {
void fromOtherApplication();
}
- private static final ArrayList<WeakReference<WindowSwitchListener>> windowSwitchListeners = new ArrayList<WeakReference<WindowSwitchListener>>();
+ private static final List<WeakReference<WindowSwitchListener>> windowSwitchListeners = new ArrayList<WeakReference<WindowSwitchListener>>();
/**
* Register a window switch listener.
@@ -1161,4 +1304,23 @@ abstract public class Main {
}
}
+ /**
+ * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes
+ * @param listener The MapFrameListener
+ * @return {@code true} if the listeners collection changed as a result of the call
+ * @since 5957
+ */
+ public static boolean addMapFrameListener(MapFrameListener listener) {
+ return listener != null ? mapFrameListeners.add(listener) : false;
+ }
+
+ /**
+ * Unregisters the given {@code MapFrameListener} from MapFrame changes
+ * @param listener The MapFrameListener
+ * @return {@code true} if the listeners collection changed as a result of the call
+ * @since 5957
+ */
+ public static boolean removeMapFrameListener(MapFrameListener listener) {
+ return listener != null ? mapFrameListeners.remove(listener) : false;
+ }
}
diff --git a/src/org/openstreetmap/josm/actions/AboutAction.java b/src/org/openstreetmap/josm/actions/AboutAction.java
index 3204ae0..08dc17b 100644
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -1,10 +1,9 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -15,16 +14,18 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.UrlLabel;
+import org.openstreetmap.josm.tools.Utils;
/**
* Nice about screen. I guess every application need one these days.. *sigh*
@@ -36,40 +37,44 @@ import org.openstreetmap.josm.tools.UrlLabel;
*/
public class AboutAction extends JosmAction {
+ /**
+ * Constructs a new {@code AboutAction}.
+ */
public AboutAction() {
super(tr("About"), "about", tr("Display the about screen."),
Shortcut.registerShortcut("system:about", tr("About"),
KeyEvent.VK_F1, Shortcut.SHIFT), true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
final JTabbedPane about = new JTabbedPane();
Version version = Version.getInstance();
- JTextArea readme = new JTextArea();
+ JosmTextArea readme = new JosmTextArea();
readme.setEditable(false);
readme.setText(Version.loadResourceFile(Main.class.getResource("/README")));
readme.setCaretPosition(0);
- JTextArea revision = new JTextArea();
+ JosmTextArea revision = new JosmTextArea();
revision.setEditable(false);
revision.setText(version.getReleaseAttributes());
revision.setCaretPosition(0);
- JTextArea contribution = new JTextArea();
+ JosmTextArea contribution = new JosmTextArea();
contribution.setEditable(false);
contribution.setText(Version.loadResourceFile(Main.class.getResource("/CONTRIBUTION")));
contribution.setCaretPosition(0);
- JTextArea license = new JTextArea();
+ JosmTextArea license = new JosmTextArea();
license.setEditable(false);
license.setText(Version.loadResourceFile(Main.class.getResource("/LICENSE")));
license.setCaretPosition(0);
JPanel info = new JPanel(new GridBagLayout());
JLabel caption = new JLabel("JOSM – " + tr("Java OpenStreetMap Editor"));
- caption.setFont(new Font("Helvetica", Font.BOLD, 20));
+ caption.setFont(GuiHelper.getTitleFont());
info.add(caption, GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr("Version {0}", version.getVersionString())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
@@ -79,10 +84,10 @@ public class AboutAction extends JosmAction {
info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0));
- info.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eol().fill(GBC.HORIZONTAL));
+ info.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eol().fill(GBC.HORIZONTAL));
info.add(GBC.glue(0,5), GBC.eol());
info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
- info.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eol().fill(GBC.HORIZONTAL));
+ info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())), GBC.eol().fill(GBC.HORIZONTAL));
about.addTab(tr("Info"), info);
about.addTab(tr("Readme"), createScrollPane(readme));
@@ -95,13 +100,13 @@ public class AboutAction extends JosmAction {
JPanel panel = new JPanel(new GridBagLayout());
panel.setPreferredSize(new Dimension(600, 300));
panel.add(about, GBC.std().fill());
-
+
GuiHelper.prepareResizeableOptionPane(panel, panel.getPreferredSize());
JOptionPane.showMessageDialog(Main.parent, panel, tr("About JOSM..."),
JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo"));
}
- private JScrollPane createScrollPane(JTextArea area) {
+ private JScrollPane createScrollPane(JosmTextArea area) {
area.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
area.setOpaque(false);
JScrollPane sp = new JScrollPane(area);
diff --git a/src/org/openstreetmap/josm/actions/AbstractInfoAction.java b/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
index 0ebedd8..9346627 100644
--- a/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
+++ b/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
@@ -8,6 +8,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import java.util.regex.Pattern;
import javax.swing.JOptionPane;
@@ -42,11 +43,11 @@ public abstract class AbstractInfoAction extends JosmAction {
Pattern pattern = Pattern.compile("/api/?$");
String ret = pattern.matcher(baseUrl).replaceAll("/browse");
if (ret.equals(baseUrl)) {
- System.out.println(tr("WARNING: unexpected format of API base URL. Redirection to info or history page for OSM object will probably fail. API base URL is: ''{0}''",baseUrl));
+ Main.warn(tr("Unexpected format of API base URL. Redirection to info or history page for OSM object will probably fail. API base URL is: ''{0}''",baseUrl));
}
if (ret.startsWith("http://api.openstreetmap.org/")) {
ret = ret.substring("http://api.openstreetmap.org/".length());
- ret = "http://www.openstreetmap.org/" + ret;
+ ret = Main.OSM_WEBSITE + "/" + ret;
}
return ret;
}
@@ -61,11 +62,11 @@ public abstract class AbstractInfoAction extends JosmAction {
Pattern pattern = Pattern.compile("/api/?$");
String ret = pattern.matcher(baseUrl).replaceAll("/user");
if (ret.equals(baseUrl)) {
- System.out.println(tr("WARNING: unexpected format of API base URL. Redirection to user page for OSM user will probably fail. API base URL is: ''{0}''",baseUrl));
+ Main.warn(tr("Unexpected format of API base URL. Redirection to user page for OSM user will probably fail. API base URL is: ''{0}''",baseUrl));
}
if (ret.startsWith("http://api.openstreetmap.org/")) {
ret = ret.substring("http://api.openstreetmap.org/".length());
- ret = "http://www.openstreetmap.org/" + ret;
+ ret = Main.OSM_WEBSITE + "/" + ret;
}
return ret;
}
@@ -116,7 +117,7 @@ public abstract class AbstractInfoAction extends JosmAction {
}
protected void launchInfoBrowsersForSelectedPrimitives() {
- ArrayList<OsmPrimitive> primitivesToShow = new ArrayList<OsmPrimitive>(getCurrentDataSet().getAllSelected());
+ List<OsmPrimitive> primitivesToShow = new ArrayList<OsmPrimitive>(getCurrentDataSet().getAllSelected());
// filter out new primitives which are not yet uploaded to the server
//
@@ -147,6 +148,7 @@ public abstract class AbstractInfoAction extends JosmAction {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
launchInfoBrowsersForSelectedPrimitives();
}
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index 68ea789..1b79ebb 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -4,21 +4,27 @@ package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Dimension;
+import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.net.MalformedURLException;
+
import javax.swing.Action;
import javax.swing.ImageIcon;
+import javax.swing.JComboBox;
import javax.swing.JOptionPane;
+import javax.swing.JPanel;
import javax.swing.JScrollPane;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.actionsupport.AlignImageryPanel;
import org.openstreetmap.josm.gui.layer.ImageryLayer;
-import org.openstreetmap.josm.io.imagery.WMSImagery;
import org.openstreetmap.josm.gui.preferences.imagery.WMSLayerTree;
+import org.openstreetmap.josm.io.imagery.WMSImagery;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
public class AddImageryLayerAction extends JosmAction implements AdaptableAction {
@@ -73,19 +79,24 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
final WMSImagery wms = new WMSImagery();
wms.attemptGetCapabilities(info.getUrl());
- System.out.println(wms.getLayers());
final WMSLayerTree tree = new WMSLayerTree();
tree.updateTree(wms);
+ final JComboBox formats = new JComboBox(wms.getFormats().toArray());
+ formats.setToolTipText(tr("Select image format for WMS layer"));
if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) {{
final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree());
- setContent(scrollPane);
scrollPane.setPreferredSize(new Dimension(400, 400));
+ final JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(scrollPane, GBC.eol().fill());
+ panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL));
+ setContent(panel);
}}.showDialog().getValue()) {
return null;
}
- String url = wms.buildGetMapUrl(tree.getSelectedLayers());
+ final String url = wms.buildGetMapUrl(
+ tree.getSelectedLayers(), (String) formats.getSelectedItem());
return new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies());
} // exception handling from AddWMSLayerPanel.java
catch (MalformedURLException ex) {
@@ -97,12 +108,11 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
} catch (WMSImagery.WMSGetCapabilitiesException ex) {
JOptionPane.showMessageDialog(Main.parent, tr("Could not parse WMS layer list."),
tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
- System.err.println("Could not parse WMS layer list. Incoming data:");
- System.err.println(ex.getIncomingData());
+ Main.error("Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData());
}
return null;
}
-
+
protected boolean isLayerAlreadyPresent() {
if (Main.isDisplayingMapView()) {
for (ImageryLayer layer : Main.map.mapView.getLayersOfType(ImageryLayer.class)) {
diff --git a/src/org/openstreetmap/josm/actions/AddNodeAction.java b/src/org/openstreetmap/josm/actions/AddNodeAction.java
index 5d47826..0daf384 100644
--- a/src/org/openstreetmap/josm/actions/AddNodeAction.java
+++ b/src/org/openstreetmap/josm/actions/AddNodeAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -9,7 +9,6 @@ import java.awt.event.KeyEvent;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.gui.dialogs.LatLonDialog;
@@ -30,6 +29,7 @@ public final class AddNodeAction extends JosmAction {
putValue("help", ht("/Action/AddNode"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -44,7 +44,7 @@ public final class AddNodeAction extends JosmAction {
}
dialog.showDialog();
-
+
if (dialog.getValue() != 1)
return;
diff --git a/src/org/openstreetmap/josm/actions/AlignInCircleAction.java b/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
index 264f422..54f4ec9 100644
--- a/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
+++ b/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
@@ -1,8 +1,8 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
-import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -24,6 +24,7 @@ import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Shortcut;
@@ -36,6 +37,9 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public final class AlignInCircleAction extends JosmAction {
+ /**
+ * Constructs a new {@code AlignInCircleAction}.
+ */
public AlignInCircleAction() {
super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."),
Shortcut.registerShortcut("tools:aligncircle", tr("Tool: {0}", tr("Align Nodes in Circle")),
@@ -84,6 +88,7 @@ public final class AlignInCircleAction extends JosmAction {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -136,12 +141,11 @@ public final class AlignInCircleAction extends JosmAction {
}
if (nodes.size() < 4) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least four nodes."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ new Notification(
+ tr("Please select at least four nodes."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
return;
}
@@ -149,8 +153,8 @@ public final class AlignInCircleAction extends JosmAction {
if (ways.size() != 1) {
// First calculate the average point
- BigDecimal east = new BigDecimal(0);
- BigDecimal north = new BigDecimal(0);
+ BigDecimal east = BigDecimal.ZERO;
+ BigDecimal north = BigDecimal.ZERO;
for (Node n : nodes) {
BigDecimal x = new BigDecimal(n.getEastNorth().east());
@@ -239,7 +243,7 @@ public final class AlignInCircleAction extends JosmAction {
protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
setEnabled(selection != null && !selection.isEmpty());
}
-
+
/**
* Determines if a regular polygon is allowed to be created with the given nodes collection.
* @param nodes The nodes collection to check.
diff --git a/src/org/openstreetmap/josm/actions/AlignInLineAction.java b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
index 76cab0a..4bdc487 100644
--- a/src/org/openstreetmap/josm/actions/AlignInLineAction.java
+++ b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Shortcut;
/**
@@ -30,6 +31,9 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public final class AlignInLineAction extends JosmAction {
+ /**
+ * Constructs a new {@code AlignInLineAction}.
+ */
public AlignInLineAction() {
super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes in to a line."),
Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.DIRECT), true);
@@ -37,7 +41,7 @@ public final class AlignInLineAction extends JosmAction {
}
// the joy of single return values only...
- private void nodePairFurthestApart(ArrayList<Node> nodes, Node[] resultOut) {
+ private void nodePairFurthestApart(List<Node> nodes, Node[] resultOut) {
if(resultOut.length < 2)
throw new IllegalArgumentException();
// Find from the selected nodes two that are the furthest apart.
@@ -64,13 +68,10 @@ public final class AlignInLineAction extends JosmAction {
}
private void showWarning() {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least three nodes."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
- return;
+ new Notification(
+ tr("Please select at least three nodes."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
}
private static int indexWrap(int size, int i) {
@@ -99,6 +100,7 @@ public final class AlignInLineAction extends JosmAction {
/**
* Operation depends on the selected objects:
*/
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -107,12 +109,12 @@ public final class AlignInLineAction extends JosmAction {
List<Node> selectedNodes = new ArrayList<Node>(getCurrentDataSet().getSelectedNodes());
Collection<Way> selectedWays = getCurrentDataSet().getSelectedWays();
- ArrayList<Node> nodes = new ArrayList<Node>();
+ List<Node> nodes = new ArrayList<Node>();
//// Decide what to align based on selection:
/// Only ways selected -> Align their nodes.
- if ((selectedNodes.size() == 0) && (selectedWays.size() == 1)) { // TODO: handle multiple ways
+ if ((selectedNodes.isEmpty()) && (selectedWays.size() == 1)) { // TODO: handle multiple ways
for (Way way : selectedWays) {
nodes.addAll(way.getNodes());
}
@@ -132,7 +134,7 @@ public final class AlignInLineAction extends JosmAction {
Way w = null;
if(selectedWays.size() == 1) {
w = selectedWays.iterator().next();
- if(w.containsNode(n) == false)
+ if (!w.containsNode(n))
// warning
return;
} else {
diff --git a/src/org/openstreetmap/josm/actions/AutoScaleAction.java b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
index f3360aa..4505cb7 100644
--- a/src/org/openstreetmap/josm/actions/AutoScaleAction.java
+++ b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -7,19 +7,29 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import javax.swing.JOptionPane;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrameListener;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.ValidatorDialog.ValidatorBoundingXYVisitor;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.tools.Shortcut;
@@ -29,14 +39,20 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class AutoScaleAction extends JosmAction {
- public static final String[] MODES = {
+ public static final Collection<String> MODES = Collections.unmodifiableList(Arrays.asList(
marktr("data"),
marktr("layer"),
marktr("selection"),
marktr("conflict"),
marktr("download"),
+ marktr("problem"),
marktr("previous"),
- marktr("next")};
+ marktr("next")));
+
+ private final String mode;
+
+ protected ZoomChangeAdapter zoomChangeAdapter;
+ protected MapFrameAdapter mapFrameAdapter;
/**
* Zooms the current map view to the currently selected primitives.
@@ -45,8 +61,7 @@ public class AutoScaleAction extends JosmAction {
*
*/
public static void zoomToSelection() {
- if (Main.main == null || Main.main.getEditLayer() == null) return;
- if (Main.map == null || Main.map.mapView == null) return;
+ if (Main.main == null || !Main.main.hasEditLayer()) return;
Collection<OsmPrimitive> sel = Main.main.getEditLayer().data.getSelected();
if (sel.isEmpty()) {
JOptionPane.showMessageDialog(
@@ -76,8 +91,6 @@ public class AutoScaleAction extends JosmAction {
new AutoScaleAction(mode, false).autoScale();
}
- private final String mode;
-
private static int getModeShortcut(String mode) {
int shortcut = -1;
@@ -87,6 +100,7 @@ public class AutoScaleAction extends JosmAction {
else if (mode.equals("selection")) { shortcut = KeyEvent.VK_3; }
else if (mode.equals("conflict")) { shortcut = KeyEvent.VK_4; }
else if (mode.equals("download")) { shortcut = KeyEvent.VK_5; }
+ else if (mode.equals("problem")) { shortcut = KeyEvent.VK_6; }
else if (mode.equals("previous")) { shortcut = KeyEvent.VK_8; }
else if (mode.equals("next")) { shortcut = KeyEvent.VK_9; }
@@ -94,8 +108,8 @@ public class AutoScaleAction extends JosmAction {
}
/**
- *
- * @param mode
+ * Constructs a new {@code AutoScaleAction}.
+ * @param mode The autoscale mode (one of {@link AutoScaleAction#MODES})
* @param marker Used only to differentiate from default constructor
*/
private AutoScaleAction(String mode, boolean marker) {
@@ -103,10 +117,14 @@ public class AutoScaleAction extends JosmAction {
this.mode = mode;
}
-
- public AutoScaleAction(String mode) {
+ /**
+ * Constructs a new {@code AutoScaleAction}.
+ * @param mode The autoscale mode (one of {@link AutoScaleAction#MODES})
+ */
+ public AutoScaleAction(final String mode) {
super(tr("Zoom to {0}", tr(mode)), "dialogs/autoscale/" + mode, tr("Zoom the view to {0}.", tr(mode)),
- Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.DIRECT), true);
+ Shortcut.registerShortcut("view:zoom"+mode, tr("View: {0}", tr("Zoom to {0}", tr(mode))), getModeShortcut(mode), Shortcut.DIRECT),
+ true, null, false);
String modeHelp = Character.toUpperCase(mode.charAt(0)) + mode.substring(1);
putValue("help", "Action/AutoScale/" + modeHelp);
this.mode = mode;
@@ -118,13 +136,18 @@ public class AutoScaleAction extends JosmAction {
putValue("help", ht("/Action/ZoomToSelection"));
} else if (mode.equals("conflict")) {
putValue("help", ht("/Action/ZoomToConflict"));
+ } else if (mode.equals("problem")) {
+ putValue("help", ht("/Action/ZoomToProblem"));
} else if (mode.equals("download")) {
putValue("help", ht("/Action/ZoomToDownload"));
} else if (mode.equals("previous")) {
putValue("help", ht("/Action/ZoomToPrevious"));
} else if (mode.equals("next")) {
putValue("help", ht("/Action/ZoomToNext"));
+ } else {
+ throw new IllegalArgumentException("Unknown mode: "+mode);
}
+ installAdapters();
}
public void autoScale() {
@@ -143,6 +166,7 @@ public class AutoScaleAction extends JosmAction {
putValue("active", true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
autoScale();
}
@@ -163,15 +187,21 @@ public class AutoScaleAction extends JosmAction {
* @return the first selected layer in the layer list dialog
*/
protected Layer getFirstSelectedLayer() {
- if (LayerListDialog.getInstance() == null) return null;
List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
if (layers.isEmpty()) return null;
return layers.get(0);
}
private BoundingXYVisitor getBoundingBox() {
- BoundingXYVisitor v = new BoundingXYVisitor();
- if (mode.equals("data")) {
+ BoundingXYVisitor v = mode.equals("problem") ? new ValidatorBoundingXYVisitor() : new BoundingXYVisitor();
+
+ if (mode.equals("problem")) {
+ TestError error = Main.map.validatorDialog.getSelectedError();
+ if (error == null) return null;
+ ((ValidatorBoundingXYVisitor) v).visit(error);
+ if (v.getBounds() == null) return null;
+ v.enlargeBoundingBox(Main.pref.getDouble("validator.zoom-enlarge-bbox", 0.0002));
+ } else if (mode.equals("data")) {
for (Layer l : Main.map.mapView.getAllLayers()) {
l.visitBoundingBox(v);
}
@@ -205,7 +235,7 @@ public class AutoScaleAction extends JosmAction {
return null;
}
for (OsmPrimitive osm : sel) {
- osm.visit(v);
+ osm.accept(v);
}
// increase bbox by 0.001 degrees on each side. this is required
// especially if the bbox contains one single node, but helpful
@@ -229,12 +259,16 @@ public class AutoScaleAction extends JosmAction {
if ("selection".equals(mode)) {
setEnabled(getCurrentDataSet() != null && ! getCurrentDataSet().getSelected().isEmpty());
} else if ("layer".equals(mode)) {
- if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getAllLayersAsList().isEmpty()) {
+ if (!Main.isDisplayingMapView() || Main.map.mapView.getAllLayersAsList().isEmpty()) {
setEnabled(false);
} else {
// FIXME: should also check for whether a layer is selected in the layer list dialog
setEnabled(true);
}
+ } else if ("conflict".equals(mode)) {
+ setEnabled(Main.map != null && Main.map.conflictDialog.getSelectedConflict() != null);
+ } else if ("problem".equals(mode)) {
+ setEnabled(Main.map != null && Main.map.validatorDialog.getSelectedError() != null);
} else if ("previous".equals(mode)) {
setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomUndoEntries());
} else if ("next".equals(mode)) {
@@ -257,22 +291,60 @@ public class AutoScaleAction extends JosmAction {
@Override
protected void installAdapters() {
super.installAdapters();
- // make this action listen to zoom change events
+ // make this action listen to zoom and mapframe change events
//
- zoomChangeAdapter = new ZoomChangeAdapter();
- MapView.addZoomChangeListener(zoomChangeAdapter);
+ MapView.addZoomChangeListener(zoomChangeAdapter = new ZoomChangeAdapter());
+ Main.addMapFrameListener(mapFrameAdapter = new MapFrameAdapter());
initEnabledState();
}
/**
- * Adapter for selection change events
- *
+ * Adapter for zoom change events
*/
private class ZoomChangeAdapter implements MapView.ZoomChangeListener {
+ @Override
public void zoomChanged() {
updateEnabledState();
}
}
- private ZoomChangeAdapter zoomChangeAdapter;
+ /**
+ * Adapter for MapFrame change events
+ */
+ private class MapFrameAdapter implements MapFrameListener {
+ private ListSelectionListener conflictSelectionListener;
+ private TreeSelectionListener validatorSelectionListener;
+
+ public MapFrameAdapter() {
+ if (mode.equals("conflict")) {
+ conflictSelectionListener = new ListSelectionListener() {
+ @Override public void valueChanged(ListSelectionEvent e) {
+ updateEnabledState();
+ }
+ };
+ } else if (mode.equals("problem")) {
+ validatorSelectionListener = new TreeSelectionListener() {
+ @Override public void valueChanged(TreeSelectionEvent e) {
+ updateEnabledState();
+ }
+ };
+ }
+ }
+
+ @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+ if (conflictSelectionListener != null) {
+ if (newFrame != null) {
+ newFrame.conflictDialog.addListSelectionListener(conflictSelectionListener);
+ } else if (oldFrame != null) {
+ oldFrame.conflictDialog.removeListSelectionListener(conflictSelectionListener);
+ }
+ } else if (validatorSelectionListener != null) {
+ if (newFrame != null) {
+ newFrame.validatorDialog.addTreeSelectionListener(validatorSelectionListener);
+ } else if (oldFrame != null) {
+ oldFrame.validatorDialog.removeTreeSelectionListener(validatorSelectionListener);
+ }
+ }
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java b/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
index da2c352..052f3da 100644
--- a/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
@@ -9,63 +9,39 @@ import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.ButtonModel;
import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
import org.openstreetmap.josm.tools.Shortcut;
+
/**
* This action toggles the visibility of the {@link ChangesetCacheManager} dialog.
- *
+ * @since 2685
*/
-public class ChangesetManagerToggleAction extends JosmAction {
- private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
- //FIXME: replace with property Action.SELECTED_KEY when migrating to
- // Java 6
- private boolean selected;
+public class ChangesetManagerToggleAction extends ToggleAction {
private WindowListener changesetCacheManagerClosedHandler;
+ /**
+ * Constructs a new {@code ChangesetManagerToggleAction}.
+ */
public ChangesetManagerToggleAction() {
- super(
- tr("Changeset Manager"),
- "dialogs/changeset/changesetmanager",
- tr("Toggle visibility of Changeset Manager window"),
- Shortcut.registerShortcut("menu:windows:changesetdialog",
- tr("Toggle visibility of Changeset Manager window"),
- KeyEvent.VK_C, Shortcut.ALT_CTRL),
- true /* register shortcut */
+ super(tr("Changeset Manager"),
+ "dialogs/changeset/changesetmanager",
+ tr("Toggle visibility of Changeset Manager window"),
+ Shortcut.registerShortcut("menu:windows:changesetdialog",
+ tr("Toggle visibility of Changeset Manager window"),
+ KeyEvent.VK_C, Shortcut.ALT_CTRL),
+ true /* register shortcut */
);
notifySelectedState();
changesetCacheManagerClosedHandler = new ChangesetCacheManagerClosedHandler();
putValue("help", ht("/Dialog/ChangesetManager"));
}
- public void addButtonModel(ButtonModel model) {
- if (model != null && !buttonModels.contains(model)) {
- buttonModels.add(model);
- }
- }
-
- public void removeButtonModel(ButtonModel model) {
- if (model != null && buttonModels.contains(model)) {
- buttonModels.remove(model);
- }
- }
-
- protected void notifySelectedState() {
- for (ButtonModel model: buttonModels) {
- if (model.isSelected() != selected) {
- model.setSelected(selected);
- }
- }
- }
-
- protected void toggleSelectedState() {
- selected = !selected;
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ toggleSelectedState(e);
notifySelectedState();
- if (selected) {
+ if (isSelected()) {
ChangesetCacheManager.getInstance().addWindowListener(changesetCacheManagerClosedHandler);
ChangesetCacheManager.getInstance().setVisible(true);
} else {
@@ -74,14 +50,10 @@ public class ChangesetManagerToggleAction extends JosmAction {
}
}
- public void actionPerformed(ActionEvent e) {
- toggleSelectedState();
- }
-
private class ChangesetCacheManagerClosedHandler extends WindowAdapter {
@Override
public void windowClosed(WindowEvent e) {
- selected = false;
+ setSelected(false);
notifySelectedState();
ChangesetCacheManager.getInstance().removeWindowListener(changesetCacheManagerClosedHandler);
}
diff --git a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
index e8a1340..618db4d 100644
--- a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
+++ b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
@@ -42,6 +42,7 @@ public class CloseChangesetAction extends JosmAction{
putValue("help", ht("/Action/CloseChangeset"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Main.worker.submit(new DownloadOpenChangesetsTask());
}
@@ -77,11 +78,6 @@ public class CloseChangesetAction extends JosmAction{
private Exception lastException;
private UserInfo userInfo;
- /**
- *
- * @param model provides the user id of the current user and accepts the changesets
- * after download
- */
public DownloadOpenChangesetsTask() {
super(tr("Downloading open changesets ...", false /* don't ignore exceptions */));
}
@@ -96,6 +92,7 @@ public class CloseChangesetAction extends JosmAction{
protected void finish() {
SwingUtilities.invokeLater(
new Runnable() {
+ @Override
public void run() {
if (lastException != null) {
ExceptionDialogUtil.explainException(lastException);
diff --git a/src/org/openstreetmap/josm/actions/CombineWayAction.java b/src/org/openstreetmap/josm/actions/CombineWayAction.java
index 703a1d7..d98057b 100644
--- a/src/org/openstreetmap/josm/actions/CombineWayAction.java
+++ b/src/org/openstreetmap/josm/actions/CombineWayAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -9,12 +9,12 @@ import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.Stack;
@@ -33,6 +33,7 @@ import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.Pair;
@@ -40,12 +41,15 @@ import org.openstreetmap.josm.tools.Shortcut;
/**
* Combines multiple ways into one.
- *
+ * @since 213
*/
public class CombineWayAction extends JosmAction {
private static final BooleanProperty PROP_REVERSE_WAY = new BooleanProperty("tag-correction.reverse-way", true);
+ /**
+ * Constructs a new {@code CombineWayAction}.
+ */
public CombineWayAction() {
super(tr("Combine Way"), "combineway", tr("Combine several ways into one."),
Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.DIRECT), true);
@@ -64,14 +68,11 @@ public class CombineWayAction extends JosmAction {
}
protected static void warnCombiningImpossible() {
- String msg = tr("Could not combine ways "
+ String msg = tr("Could not combine ways<br>"
+ "(They could not be merged into a single string of nodes)");
- JOptionPane.showMessageDialog(
- Main.parent,
- msg,
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ new Notification(msg)
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return;
}
@@ -124,7 +125,8 @@ public class CombineWayAction extends JosmAction {
List<Way> reversedWays = new LinkedList<Way>();
List<Way> unreversedWays = new LinkedList<Way>();
for (Way w: ways) {
- if ((path.indexOf(w.getNode(0)) + 1) == path.lastIndexOf(w.getNode(1))) {
+ // Treat zero or one-node ways as unreversed as Combine action action is a good way to fix them (see #8971)
+ if (w.getNodesCount() < 2 || (path.indexOf(w.getNode(0)) + 1) == path.lastIndexOf(w.getNode(1))) {
unreversedWays.add(w);
} else {
reversedWays.add(w);
@@ -153,7 +155,7 @@ public class CombineWayAction extends JosmAction {
List<Way> unreversedTagWays = new ArrayList<Way>(ways);
unreversedTagWays.removeAll(reversedWays);
ReverseWayTagCorrector reverseWayTagCorrector = new ReverseWayTagCorrector();
- List<Way> reversedTagWays = new ArrayList<Way>();
+ List<Way> reversedTagWays = new ArrayList<Way>(reversedWays.size());
Collection<Command> changePropertyCommands = null;
for (Way w : reversedWays) {
Way wnew = new Way(w);
@@ -190,18 +192,18 @@ public class CombineWayAction extends JosmAction {
return new Pair<Way, Command>(targetWay, sequenceCommand);
}
+ @Override
public void actionPerformed(ActionEvent event) {
if (getCurrentDataSet() == null)
return;
Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Set<Way> selectedWays = OsmPrimitive.getFilteredSet(selection, Way.class);
if (selectedWays.size() < 2) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least two ways to combine."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ new Notification(
+ tr("Please select at least two ways to combine."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
return;
}
// combine and update gui
@@ -219,6 +221,7 @@ public class CombineWayAction extends JosmAction {
if(selectedWay != null)
{
Runnable guiTask = new Runnable() {
+ @Override
public void run() {
getCurrentDataSet().setSelected(selectedWay);
}
@@ -247,28 +250,51 @@ public class CombineWayAction extends JosmAction {
setEnabled(numWays >= 2);
}
+ /**
+ * A pair of nodes.
+ */
static public class NodePair {
- private Node a;
- private Node b;
+ private final Node a;
+ private final Node b;
+
+ /**
+ * Constructs a new {@code NodePair}.
+ * @param a The first node
+ * @param b The second node
+ */
public NodePair(Node a, Node b) {
- this.a =a;
+ this.a = a;
this.b = b;
}
+ /**
+ * Constructs a new {@code NodePair}.
+ * @param pair An existing {@code Pair} of nodes
+ */
public NodePair(Pair<Node,Node> pair) {
- this.a = pair.a;
- this.b = pair.b;
+ this(pair.a, pair.b);
}
+ /**
+ * Constructs a new {@code NodePair}.
+ * @param other An existing {@code NodePair}
+ */
public NodePair(NodePair other) {
- this.a = other.a;
- this.b = other.b;
+ this(other.a, other.b);
}
+ /**
+ * Replies the first node.
+ * @return The first node
+ */
public Node getA() {
return a;
}
+ /**
+ * Replies the second node
+ * @return The second node
+ */
public Node getB() {
return b;
}
@@ -304,6 +330,11 @@ public class CombineWayAction extends JosmAction {
.toString();
}
+ /**
+ * Determines if this pair contains the given node.
+ * @param n The node to look for
+ * @return {@code true} if {@code n} is in the pair, {@code false} otherwise
+ */
public boolean contains(Node n) {
return a == n || b == n;
}
@@ -316,6 +347,7 @@ public class CombineWayAction extends JosmAction {
result = prime * result + ((b == null) ? 0 : b.hashCode());
return result;
}
+
@Override
public boolean equals(Object obj) {
if (this == obj)
@@ -341,7 +373,7 @@ public class CombineWayAction extends JosmAction {
static public class NodeGraph {
static public List<NodePair> buildNodePairs(Way way, boolean directed) {
- ArrayList<NodePair> pairs = new ArrayList<NodePair>();
+ List<NodePair> pairs = new ArrayList<NodePair>();
for (Pair<Node,Node> pair: way.getNodePairs(false /* don't sort */)) {
pairs.add(new NodePair(pair));
if (!directed) {
@@ -352,7 +384,7 @@ public class CombineWayAction extends JosmAction {
}
static public List<NodePair> buildNodePairs(List<Way> ways, boolean directed) {
- ArrayList<NodePair> pairs = new ArrayList<NodePair>();
+ List<NodePair> pairs = new ArrayList<NodePair>();
for (Way w: ways) {
pairs.addAll(buildNodePairs(w, directed));
}
@@ -360,7 +392,7 @@ public class CombineWayAction extends JosmAction {
}
static public List<NodePair> eliminateDuplicateNodePairs(List<NodePair> pairs) {
- ArrayList<NodePair> cleaned = new ArrayList<NodePair>();
+ List<NodePair> cleaned = new ArrayList<NodePair>();
for(NodePair p: pairs) {
if (!cleaned.contains(p) && !cleaned.contains(p.swap())) {
cleaned.add(p);
@@ -394,7 +426,7 @@ public class CombineWayAction extends JosmAction {
return graph;
}
- static public NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
+ public static NodeGraph createUndirectedGraphFromNodeWays(Collection<Way> ways) {
NodeGraph graph = new NodeGraph();
for (Way w: ways) {
graph.add(buildNodePairs(w, false /* undirected */));
@@ -404,8 +436,8 @@ public class CombineWayAction extends JosmAction {
private Set<NodePair> edges;
private int numUndirectedEges = 0;
- private HashMap<Node, List<NodePair>> successors;
- private HashMap<Node, List<NodePair>> predecessors;
+ private Map<Node, List<NodePair>> successors;
+ private Map<Node, List<NodePair>> predecessors;
protected void rememberSuccessor(NodePair pair) {
if (successors.containsKey(pair.getA())) {
@@ -413,7 +445,7 @@ public class CombineWayAction extends JosmAction {
successors.get(pair.getA()).add(pair);
}
} else {
- ArrayList<NodePair> l = new ArrayList<NodePair>();
+ List<NodePair> l = new ArrayList<NodePair>();
l.add(pair);
successors.put(pair.getA(), l);
}
@@ -425,7 +457,7 @@ public class CombineWayAction extends JosmAction {
predecessors.get(pair.getB()).add(pair);
}
} else {
- ArrayList<NodePair> l = new ArrayList<NodePair>();
+ List<NodePair> l = new ArrayList<NodePair>();
l.add(pair);
predecessors.put(pair.getB(), l);
}
@@ -458,6 +490,9 @@ public class CombineWayAction extends JosmAction {
numUndirectedEges = undirectedEdges.size();
}
+ /**
+ * Constructs a new {@code NodeGraph}.
+ */
public NodeGraph() {
edges = new LinkedHashSet<NodePair>();
}
@@ -494,7 +529,7 @@ public class CombineWayAction extends JosmAction {
}
protected Set<Node> getNodes(Stack<NodePair> pairs) {
- HashSet<Node> nodes = new LinkedHashSet<Node>();
+ HashSet<Node> nodes = new LinkedHashSet<Node>(2*pairs.size());
for (NodePair pair: pairs) {
nodes.add(pair.getA());
nodes.add(pair.getB());
@@ -514,7 +549,7 @@ public class CombineWayAction extends JosmAction {
}
protected Set<Node> getNodes() {
- Set<Node> nodes = new LinkedHashSet<Node>();
+ Set<Node> nodes = new LinkedHashSet<Node>(2 * edges.size());
for (NodePair pair: edges) {
nodes.add(pair.getA());
nodes.add(pair.getB());
diff --git a/src/org/openstreetmap/josm/actions/CopyAction.java b/src/org/openstreetmap/josm/actions/CopyAction.java
index 20cbc0b..fa1ac45 100644
--- a/src/org/openstreetmap/josm/actions/CopyAction.java
+++ b/src/org/openstreetmap/josm/actions/CopyAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
// Author: David Earl
package org.openstreetmap.josm.actions;
@@ -13,17 +13,31 @@ import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * Copy OSM primitives to clipboard in order to paste them, or their tags, somewhere else.
+ * @since 404
+ */
public final class CopyAction extends JosmAction {
+
+ // regular expression that matches text clipboard contents after copying
+ public static final String CLIPBOARD_REGEXP = "((node|way|relation)\\s\\d+,)*(node|way|relation)\\s\\d+";
+ /**
+ * Constructs a new {@code CopyAction}.
+ */
public CopyAction() {
super(tr("Copy"), "copy",
tr("Copy selected objects to paste buffer."),
Shortcut.registerShortcut("system:copy", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_C, Shortcut.CTRL), true);
putValue("help", ht("/Action/Copy"));
+ // CUA shortcut for copy (http://en.wikipedia.org/wiki/IBM_Common_User_Access#Description)
+ Main.registerActionShortcut(this,
+ Shortcut.registerShortcut("system:copy:cua", tr("Edit: {0}", tr("Copy")), KeyEvent.VK_INSERT, Shortcut.CTRL));
}
@Override
@@ -34,10 +48,17 @@ public final class CopyAction extends JosmAction {
copy(getEditLayer(), selection);
}
+ /**
+ * Copies the given primitive ids to the clipboard. The output by this function
+ * looks similar to: node 1089302677,node 1089303458,way 93793372
+ * @param source The OSM data layer source
+ * @param primitives The OSM primitives to copy
+ */
public static void copy(OsmDataLayer source, Collection<OsmPrimitive> primitives) {
/* copy ids to the clipboard */
StringBuilder idsBuilder = new StringBuilder();
for (OsmPrimitive p : primitives) {
+ idsBuilder.append(OsmPrimitiveType.from(p).getAPIName()).append(" ");
idsBuilder.append(p.getId()).append(",");
}
String ids = idsBuilder.substring(0, idsBuilder.length() - 1);
diff --git a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
index 4b61993..5160ea2 100644
--- a/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
+++ b/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -6,6 +7,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Collection;
import java.util.Collections;
+
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.tools.Shortcut;
diff --git a/src/org/openstreetmap/josm/actions/CreateCircleAction.java b/src/org/openstreetmap/josm/actions/CreateCircleAction.java
index a53de09..f9d75e7 100644
--- a/src/org/openstreetmap/josm/actions/CreateCircleAction.java
+++ b/src/org/openstreetmap/josm/actions/CreateCircleAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -23,6 +23,7 @@ import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Shortcut;
/**
@@ -40,6 +41,9 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public final class CreateCircleAction extends JosmAction {
+ /**
+ * Constructs a new {@code CreateCircleAction}.
+ */
public CreateCircleAction() {
super(tr("Create Circle"), "createcircle", tr("Create a circle from three selected nodes."),
Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")),
@@ -74,6 +78,7 @@ public final class CreateCircleAction extends JosmAction {
return a;
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -96,7 +101,7 @@ public final class CreateCircleAction extends JosmAction {
// special case if no single nodes are selected and exactly one way is:
// then use the way's nodes
- if ((nodes.size() == 0) && (sel.size() == 1)) {
+ if (nodes.isEmpty() && (sel.size() == 1)) {
for (OsmPrimitive osm : sel)
if (osm instanceof Way) {
existingWay = ((Way)osm);
@@ -135,7 +140,7 @@ public final class CreateCircleAction extends JosmAction {
if (a1 < a2) { double at = a1; Node nt = n1; a1 = a2; n1 = n2; a2 = at; n2 = nt; }
// build a way for the circle
- List<Node> wayToAdd = new ArrayList<Node>();
+ List<Node> wayToAdd = new ArrayList<Node>(numberOfNodesInCircle + 1);
for (int i = 1; i <= numberOfNodesInCircle; i++) {
double a = a2 + 2*Math.PI*(1.0 - i/(double)numberOfNodesInCircle); // "1-" to get it clock-wise
@@ -176,9 +181,6 @@ public final class CreateCircleAction extends JosmAction {
if (parents.isEmpty() || ((parents.size() == 1) && (parents.contains(existingWay)))) {
cmds.add(new DeleteCommand(n1));
}
-
- // or insert it
- // wayToAdd.nodes.add((numberOfNodesInCircle - 1) / 2, n1);
}
} else if (nodes.size() == 3) {
@@ -200,12 +202,10 @@ public final class CreateCircleAction extends JosmAction {
double sUnder = (x1 - x2)*(y3 - y1) - (y2 - y1)*(x1 - x3);
if (sUnder == 0) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Those nodes are not in a circle. Aborting."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
+ new Notification(
+ tr("Those nodes are not in a circle. Aborting."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
return;
}
@@ -261,12 +261,11 @@ public final class CreateCircleAction extends JosmAction {
}
} else {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select exactly two or three nodes or one way with exactly two or three nodes."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ new Notification(
+ tr("Please select exactly two or three nodes or one way with exactly two or three nodes."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_LONG)
+ .show();
return;
}
diff --git a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
index c77cd7a..09044cd 100644
--- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
+++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
@@ -11,12 +11,13 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
+import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
-import javax.swing.JOptionPane;
+import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.AddCommand;
import org.openstreetmap.josm.command.ChangeCommand;
@@ -29,6 +30,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.tools.Shortcut;
@@ -49,6 +51,9 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class CreateMultipolygonAction extends JosmAction {
+ /**
+ * Constructs a new {@code CreateMultipolygonAction}.
+ */
public CreateMultipolygonAction() {
super(tr("Create multipolygon"), "multipoly_create", tr("Create multipolygon."),
Shortcut.registerShortcut("tools:multipoly", tr("Tool: {0}", tr("Create multipolygon")),
@@ -59,9 +64,14 @@ public class CreateMultipolygonAction extends JosmAction {
*
* @param e Action Event
*/
+ @Override
public void actionPerformed(ActionEvent e) {
- if (Main.main.getEditLayer() == null) {
- JOptionPane.showMessageDialog(Main.parent, tr("No data loaded."));
+ if (!Main.main.hasEditLayer()) {
+ new Notification(
+ tr("No data loaded."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
return;
}
@@ -70,7 +80,11 @@ public class CreateMultipolygonAction extends JosmAction {
if (selectedWays.size() < 1) {
// Sometimes it make sense creating multipoly of only one way (so it will form outer way)
// and then splitting the way later (so there are multiple ways forming outer way)
- JOptionPane.showMessageDialog(Main.parent, tr("You must select at least one way."));
+ new Notification(
+ tr("You must select at least one way."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
return;
}
@@ -111,6 +125,7 @@ public class CreateMultipolygonAction extends JosmAction {
// uses 'SwingUtilities.invokeLater' to fire events so we have to do
// the same.)
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
Main.map.relationListDialog.selectRelation(relation);
}
@@ -129,15 +144,19 @@ public class CreateMultipolygonAction extends JosmAction {
}
}
- /** Enable this action only if something is selected */
+ /**
+ * Enable this action only if something is selected
+ *
+ * @param selection the current selection, gets tested for emptyness
+ */
@Override protected void updateEnabledState(Collection < ? extends OsmPrimitive > selection) {
setEnabled(selection != null && !selection.isEmpty());
}
/**
* This method analyzes ways and creates multipolygon.
- * @param selectedWays
- * @return null, if there was a problem with the ways.
+ * @param selectedWays list of selected ways
+ * @return <code>null</code>, if there was a problem with the ways.
*/
private MultipolygonCreate analyzeWays(Collection < Way > selectedWays) {
@@ -145,7 +164,9 @@ public class CreateMultipolygonAction extends JosmAction {
String error = pol.makeFromWays(selectedWays);
if (error != null) {
- JOptionPane.showMessageDialog(Main.parent, error);
+ new Notification(error)
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return null;
} else {
return pol;
@@ -154,8 +175,8 @@ public class CreateMultipolygonAction extends JosmAction {
/**
* Builds a relation from polygon ways.
- * @param pol
- * @return
+ * @param pol data storage class containing polygon information
+ * @return multipolygon relation
*/
private Relation createRelation(MultipolygonCreate pol) {
// Create new relation
@@ -180,108 +201,111 @@ public class CreateMultipolygonAction extends JosmAction {
/**
* This method removes tags/value pairs from inner and outer ways and put them on relation if necessary
- * Function was extended in reltoolbox plugin by Zverikk and copied back to the core
- * @param relation
+ * Function was extended in reltoolbox plugin by Zverikk and copied back to the core
+ * @param relation the multipolygon style relation to process
+ * @return a list of commands to execute
*/
private List<Command> removeTagsFromWaysIfNeeded( Relation relation ) {
- Map<String, String> values = new HashMap<String, String>();
-
- if( relation.hasKeys() ) {
- for( String key : relation.keySet() ) {
- values.put(key, relation.get(key));
- }
- }
-
- List<Way> innerWays = new ArrayList<Way>();
- List<Way> outerWays = new ArrayList<Way>();
-
- Set<String> conflictingKeys = new TreeSet<String>();
-
- for( RelationMember m : relation.getMembers() ) {
-
- if( m.hasRole() && "inner".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
- innerWays.add(m.getWay());
- }
-
- if( m.hasRole() && "outer".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
- Way way = m.getWay();
- outerWays.add(way);
-
- for( String key : way.keySet() ) {
- if( !values.containsKey(key) ) { //relation values take precedence
- values.put(key, way.get(key));
- } else if( !relation.hasKey(key) && !values.get(key).equals(way.get(key)) ) {
- conflictingKeys.add(key);
- }
- }
- }
- }
-
- // filter out empty key conflicts - we need second iteration
- if( !Main.pref.getBoolean("multipoly.alltags", false) )
- for( RelationMember m : relation.getMembers() )
- if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
- for( String key : values.keySet() )
- if( !m.getWay().hasKey(key) && !relation.hasKey(key) )
- conflictingKeys.add(key);
-
- for( String key : conflictingKeys )
- values.remove(key);
-
- for( String linearTag : Main.pref.getCollection("multipoly.lineartagstokeep", DEFAULT_LINEAR_TAGS) )
- values.remove(linearTag);
-
- if( values.containsKey("natural") && values.get("natural").equals("coastline") )
- values.remove("natural");
-
- values.put("area", "yes");
-
- List<Command> commands = new ArrayList<Command>();
- boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
-
- for( String key : values.keySet() ) {
- List<OsmPrimitive> affectedWays = new ArrayList<OsmPrimitive>();
- String value = values.get(key);
-
- for( Way way : innerWays ) {
- if( way.hasKey(key) && (value.equals(way.get(key))) ) {
- affectedWays.add(way);
- }
- }
-
- if( moveTags ) {
- // remove duplicated tags from outer ways
- for( Way way : outerWays ) {
- if( way.hasKey(key) ) {
- affectedWays.add(way);
- }
- }
- }
-
- if( affectedWays.size() > 0 ) {
+ Map<String, String> values = new HashMap<String, String>();
+
+ if( relation.hasKeys() ) {
+ for( String key : relation.keySet() ) {
+ values.put(key, relation.get(key));
+ }
+ }
+
+ List<Way> innerWays = new ArrayList<Way>();
+ List<Way> outerWays = new ArrayList<Way>();
+
+ Set<String> conflictingKeys = new TreeSet<String>();
+
+ for( RelationMember m : relation.getMembers() ) {
+
+ if( m.hasRole() && "inner".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
+ innerWays.add(m.getWay());
+ }
+
+ if( m.hasRole() && "outer".equals(m.getRole()) && m.isWay() && m.getWay().hasKeys() ) {
+ Way way = m.getWay();
+ outerWays.add(way);
+
+ for( String key : way.keySet() ) {
+ if( !values.containsKey(key) ) { //relation values take precedence
+ values.put(key, way.get(key));
+ } else if( !relation.hasKey(key) && !values.get(key).equals(way.get(key)) ) {
+ conflictingKeys.add(key);
+ }
+ }
+ }
+ }
+
+ // filter out empty key conflicts - we need second iteration
+ if( !Main.pref.getBoolean("multipoly.alltags", false) )
+ for( RelationMember m : relation.getMembers() )
+ if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
+ for( String key : values.keySet() )
+ if( !m.getWay().hasKey(key) && !relation.hasKey(key) )
+ conflictingKeys.add(key);
+
+ for( String key : conflictingKeys )
+ values.remove(key);
+
+ for( String linearTag : Main.pref.getCollection("multipoly.lineartagstokeep", DEFAULT_LINEAR_TAGS) )
+ values.remove(linearTag);
+
+ if( values.containsKey("natural") && values.get("natural").equals("coastline") )
+ values.remove("natural");
+
+ values.put("area", "yes");
+
+ List<Command> commands = new ArrayList<Command>();
+ boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
+
+ for (Entry<String, String> entry : values.entrySet()) {
+ List<OsmPrimitive> affectedWays = new ArrayList<OsmPrimitive>();
+ String key = entry.getKey();
+ String value = entry.getValue();
+
+ for (Way way : innerWays) {
+ if (way.hasKey(key) && (value.equals(way.get(key)))) {
+ affectedWays.add(way);
+ }
+ }
+
+ if (moveTags) {
+ // remove duplicated tags from outer ways
+ for( Way way : outerWays ) {
+ if( way.hasKey(key) ) {
+ affectedWays.add(way);
+ }
+ }
+ }
+
+ if (!affectedWays.isEmpty()) {
// reset key tag on affected ways
- commands.add(new ChangePropertyCommand(affectedWays, key, null));
- }
- }
-
- if( moveTags ) {
- // add those tag values to the relation
-
- boolean fixed = false;
- Relation r2 = new Relation(relation);
- for( String key : values.keySet() ) {
- if( !r2.hasKey(key) && !key.equals("area") ) {
- if( relation.isNew() )
- relation.put(key, values.get(key));
- else
- r2.put(key, values.get(key));
- fixed = true;
- }
- }
- if( fixed && !relation.isNew() )
- commands.add(new ChangeCommand(relation, r2));
- }
-
- return commands;
+ commands.add(new ChangePropertyCommand(affectedWays, key, null));
+ }
+ }
+
+ if (moveTags) {
+ // add those tag values to the relation
+
+ boolean fixed = false;
+ Relation r2 = new Relation(relation);
+ for (Entry<String, String> entry : values.entrySet()) {
+ String key = entry.getKey();
+ if (!r2.hasKey(key) && !key.equals("area") ) {
+ if (relation.isNew())
+ relation.put(key, entry.getValue());
+ else
+ r2.put(key, entry.getValue());
+ fixed = true;
+ }
+ }
+ if (fixed && !relation.isNew())
+ commands.add(new ChangeCommand(relation, r2));
+ }
+
+ return commands;
}
}
diff --git a/src/org/openstreetmap/josm/actions/DeleteAction.java b/src/org/openstreetmap/josm/actions/DeleteAction.java
index 9e988b0..e0409bc 100644
--- a/src/org/openstreetmap/josm/actions/DeleteAction.java
+++ b/src/org/openstreetmap/josm/actions/DeleteAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -20,6 +20,7 @@ public final class DeleteAction extends JosmAction {
putValue("help", ht("/Action/Delete"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
diff --git a/src/org/openstreetmap/josm/actions/DialogsToggleAction.java b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
new file mode 100644
index 0000000..7050ff7
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
@@ -0,0 +1,69 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.Icon;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+* This action toggles visibility of dialogs panel and other panels to free more space for drawing (GIMP-like)
+* @author cmuelle8
+* @since 5965
+*/
+public class DialogsToggleAction extends ToggleAction {
+
+ /**
+ * Constructs a new {@code DialogsToggleAction}.
+ */
+ public DialogsToggleAction() {
+ super(tr("Toggle dialogs panel"),
+ (Icon) null, /* no icon */
+ tr("Toggle dialogs panel, maximize mapview"),
+ Shortcut.registerShortcut("menu:view:dialogspanel", tr("Toggle dialogs panel"),KeyEvent.VK_TAB, Shortcut.DIRECT),
+ true, "dialogspanel", /* register in toolbar */
+ false
+ );
+ putValue("help", ht("/Action/ToggleDialogsPanel"));
+ setSelected(Main.pref.getBoolean("draw.dialogspanel", true));
+ notifySelectedState();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ toggleSelectedState(e);
+ Main.pref.put("draw.dialogspanel", isSelected());
+ notifySelectedState();
+ setMode();
+ }
+
+ /**
+ * To call if this action must be initially run at JOSM startup.
+ */
+ public void initial() {
+ if (isSelected()) {
+ setMode();
+ }
+ }
+
+ protected void setMode() {
+ if (Main.isDisplayingMapView()) {
+ boolean selected = isSelected();
+ Main.map.setDialogsPanelVisible(selected);
+ Main.map.statusLine.setVisible(selected || Main.pref.getBoolean("statusbar.always-visible", true));
+ Main.toolbar.control.setVisible(selected || Main.pref.getBoolean("toolbar.always-visible", true));
+ Main.main.menu.setVisible(selected || Main.pref.getBoolean("menu.always-visible", true));
+ // sideToolBar listens to preference changes, use it here
+ if (!Main.pref.getBoolean("sidetoolbar.always-visible", true)) {
+ Main.pref.put("sidetoolbar.visible", selected);
+ }
+ Main.map.mapView.rememberLastPositionOnScreen();
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/DiskAccessAction.java b/src/org/openstreetmap/josm/actions/DiskAccessAction.java
index 0238bf1..4041129 100644
--- a/src/org/openstreetmap/josm/actions/DiskAccessAction.java
+++ b/src/org/openstreetmap/josm/actions/DiskAccessAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import java.util.Collection;
@@ -17,7 +17,7 @@ abstract public class DiskAccessAction extends JosmAction {
/**
* Constructs a new {@code DiskAccessAction}.
- *
+ *
* @param name The action's text as displayed on the menu (if it is added to a menu)
* @param iconName The filename of the icon to use
* @param tooltip A longer description of the action that will be displayed in the tooltip
@@ -46,7 +46,7 @@ abstract public class DiskAccessAction extends JosmAction {
/**
* Creates a new {@link JFileChooser} and makes it visible.
- * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
+ * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @return The {@code JFileChooser}.
@@ -58,7 +58,7 @@ abstract public class DiskAccessAction extends JosmAction {
/**
* Creates a new {@link JFileChooser} and makes it visible.
- * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
+ * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @param extension The file extension that will be selected as the default file filter
@@ -71,17 +71,17 @@ abstract public class DiskAccessAction extends JosmAction {
/**
* Creates a new {@link JFileChooser} and makes it visible.
- * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
+ * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @param extension The file extension that will be selected as the default file filter
* @param selectionMode The selection mode that allows the user to:<br/>
- * <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
- * <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
+ * <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
+ * <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
* <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li>
- * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
+ * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
* If false, only the file filters that include {@code extension} will be proposed
- * @param lastDirProperty The name of the property used to setup the JFileChooser initial directory.
+ * @param lastDirProperty The name of the property used to setup the JFileChooser initial directory.
* This property will then be updated to the new "last directory" chosen by the user. If null, the default property "lastDirectory" will be used.
* @return The {@code JFileChooser}.
* @since 5438
@@ -92,13 +92,13 @@ abstract public class DiskAccessAction extends JosmAction {
/**
* Creates a new {@link JFileChooser} for a single {@link FileFilter} and makes it visible.
- * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
+ * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @param filter The only file filter that will be proposed by the dialog
* @param selectionMode The selection mode that allows the user to:<br/>
- * <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
- * <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
+ * <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
+ * <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
* <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li>
* @param lastDirProperty The name of the property used to setup the JFileChooser initial directory. This property will then be updated to the new "last directory" chosen by the user
* @return The {@code JFileChooser}.
@@ -110,20 +110,20 @@ abstract public class DiskAccessAction extends JosmAction {
/**
* Creates a new {@link JFileChooser} for several {@link FileFilter}s and makes it visible.
- * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
+ * @param open If true, pops up an "Open File" dialog. If false, pops up a "Save File" dialog
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @param filters The file filters that will be proposed by the dialog
* @param defaultFilter The file filter that will be selected by default
* @param selectionMode The selection mode that allows the user to:<br/>
- * <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
- * <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
+ * <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
+ * <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
* <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li>
* @param lastDirProperty The name of the property used to setup the JFileChooser initial directory. This property will then be updated to the new "last directory" chosen by the user
* @return The {@code JFileChooser}.
* @since 5438
*/
- public static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title,
+ public static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title,
Collection<? extends FileFilter> filters, FileFilter defaultFilter, int selectionMode, String lastDirProperty) {
return new JFileChooserManager(open, lastDirProperty).createFileChooser(multiple, title, filters, defaultFilter, selectionMode).openFileChooser();
}
diff --git a/src/org/openstreetmap/josm/actions/DistributeAction.java b/src/org/openstreetmap/josm/actions/DistributeAction.java
index 5b3faea..5e98f9a 100644
--- a/src/org/openstreetmap/josm/actions/DistributeAction.java
+++ b/src/org/openstreetmap/josm/actions/DistributeAction.java
@@ -1,13 +1,16 @@
-// License: GPL. Copyright 2009 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
-import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedList;
+import java.util.Set;
import javax.swing.JOptionPane;
@@ -18,6 +21,7 @@ import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Shortcut;
/**
@@ -27,6 +31,9 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public final class DistributeAction extends JosmAction {
+ /**
+ * Constructs a new {@code DistributeAction}.
+ */
public DistributeAction() {
super(tr("Distribute Nodes"), "distribute", tr("Distribute the selected nodes to equal distances along a line."),
Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B,
@@ -39,6 +46,7 @@ public final class DistributeAction extends JosmAction {
* that are furthest apart, and then to distribute all other selected
* nodes along the straight line between these nodes.
*/
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -52,7 +60,7 @@ public final class DistributeAction extends JosmAction {
}
// special case if no single nodes are selected and exactly one way is:
// then use the way's nodes
- if ((nodes.size() == 0) && (sel.size() == 1)) {
+ if (nodes.isEmpty() && (sel.size() == 1)) {
for (OsmPrimitive osm : sel)
if (osm instanceof Way) {
nodes.addAll(((Way)osm).getNodes());
@@ -60,13 +68,19 @@ public final class DistributeAction extends JosmAction {
}
}
+ Set<Node> ignoredNodes = removeNodesWithoutCoordinates(nodes);
+ ignoredNodes.addAll(removeNodesWithoutCoordinates(itnodes));
+ if (!ignoredNodes.isEmpty()) {
+ Main.warn(tr("Ignoring {0} nodes with null coordinates", ignoredNodes.size()));
+ ignoredNodes.clear();
+ }
+
if (nodes.size() < 3) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least three nodes."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ new Notification(
+ tr("Please select at least three nodes."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
return;
}
@@ -107,7 +121,7 @@ public final class DistributeAction extends JosmAction {
// Current number of node
int pos = 0;
- while (nodes.size() > 0) {
+ while (!nodes.isEmpty()) {
pos++;
Node s = null;
@@ -136,6 +150,18 @@ public final class DistributeAction extends JosmAction {
Main.map.repaint();
}
+ private Set<Node> removeNodesWithoutCoordinates(Collection<Node> col) {
+ Set<Node> result = new HashSet<Node>();
+ for (Iterator<Node> it = col.iterator(); it.hasNext();) {
+ Node n = it.next();
+ if (n.getCoor() == null) {
+ it.remove();
+ result.add(n);
+ }
+ }
+ return result;
+ }
+
@Override
protected void updateEnabledState() {
if (getCurrentDataSet() == null) {
diff --git a/src/org/openstreetmap/josm/actions/DownloadAction.java b/src/org/openstreetmap/josm/actions/DownloadAction.java
index 2e75458..85a90eb 100644
--- a/src/org/openstreetmap/josm/actions/DownloadAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -31,6 +31,7 @@ public class DownloadAction extends JosmAction {
putValue("help", ht("/Action/Download"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
DownloadDialog dialog = DownloadDialog.getInstance();
dialog.restoreSettings();
diff --git a/src/org/openstreetmap/josm/actions/DownloadAlongAction.java b/src/org/openstreetmap/josm/actions/DownloadAlongAction.java
new file mode 100644
index 0000000..bf5dd6c
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/DownloadAlongAction.java
@@ -0,0 +1,120 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
+import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Future;
+
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTaskList;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+ * Abstract superclass of DownloadAlongTrackAction and DownloadAlongWayAction
+ * @since 6054
+ */
+public abstract class DownloadAlongAction extends JosmAction {
+
+ /**
+ * Constructs a new {@code DownloadAlongAction}
+ * @param name the action's text as displayed in the menu
+ * @param iconName the filename of the icon to use
+ * @param tooltip a longer description of the action that will be displayed in the tooltip. Please note
+ * that html is not supported for menu actions on some platforms.
+ * @param shortcut a ready-created shortcut object or null if you don't want a shortcut. But you always
+ * do want a shortcut, remember you can always register it with group=none, so you
+ * won't be assigned a shortcut unless the user configures one. If you pass null here,
+ * the user CANNOT configure a shortcut for your action.
+ * @param registerInToolbar register this action for the toolbar preferences?
+ */
+ public DownloadAlongAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
+ super(name, iconName, tooltip, shortcut, registerInToolbar);
+ }
+
+ protected static void addToDownload(Area a, Rectangle2D r, Collection<Rectangle2D> results, double max_area) {
+ Area tmp = new Area(r);
+ // intersect with sought-after area
+ tmp.intersect(a);
+ if (tmp.isEmpty()) {
+ return;
+ }
+ Rectangle2D bounds = tmp.getBounds2D();
+ if (bounds.getWidth() * bounds.getHeight() > max_area) {
+ // the rectangle gets too large; split it and make recursive call.
+ Rectangle2D r1;
+ Rectangle2D r2;
+ if (bounds.getWidth() > bounds.getHeight()) {
+ // rectangles that are wider than high are split into a left and right half,
+ r1 = new Rectangle2D.Double(bounds.getX(), bounds.getY(), bounds.getWidth() / 2, bounds.getHeight());
+ r2 = new Rectangle2D.Double(bounds.getX() + bounds.getWidth() / 2, bounds.getY(),
+ bounds.getWidth() / 2, bounds.getHeight());
+ } else {
+ // others into a top and bottom half.
+ r1 = new Rectangle2D.Double(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight() / 2);
+ r2 = new Rectangle2D.Double(bounds.getX(), bounds.getY() + bounds.getHeight() / 2, bounds.getWidth(),
+ bounds.getHeight() / 2);
+ }
+ addToDownload(a, r1, results, max_area);
+ addToDownload(a, r2, results, max_area);
+ } else {
+ results.add(bounds);
+ }
+ }
+
+ /**
+ * Area "a" contains the hull that we would like to download data for. however we
+ * can only download rectangles, so the following is an attempt at finding a number of
+ * rectangles to download.
+ *
+ * The idea is simply: Start out with the full bounding box. If it is too large, then
+ * split it in half and repeat recursively for each half until you arrive at something
+ * small enough to download. The algorithm is improved by always using the intersection
+ * between the rectangle and the actual desired area. For example, if you have a track
+ * that goes like this: +----+ | /| | / | | / | |/ | +----+ then we would first look at
+ * downloading the whole rectangle (assume it's too big), after that we split it in half
+ * (upper and lower half), but we donot request the full upper and lower rectangle, only
+ * the part of the upper/lower rectangle that actually has something in it.
+ *
+ * This functions calculates the rectangles, asks the user to continue and downloads
+ * the areas if applicable.
+ */
+ protected static void confirmAndDownloadAreas(Area a, double max_area, boolean osmDownload, boolean gpxDownload, String title, ProgressMonitor progressMonitor) {
+ List<Rectangle2D> toDownload = new ArrayList<Rectangle2D>();
+ addToDownload(a, a.getBounds(), toDownload, max_area);
+ if (toDownload.isEmpty()) {
+ return;
+ }
+ JPanel msg = new JPanel(new GridBagLayout());
+ msg.add(new JLabel(tr("<html>This action will require {0} individual<br>" + "download requests. Do you wish<br>to continue?</html>", toDownload.size())), GBC.eol());
+ if (JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(Main.parent, msg, title, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE)) {
+ return;
+ }
+ final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
+ final Future<?> future = new DownloadTaskList().download(false, toDownload, osmDownload, gpxDownload, monitor);
+ Main.worker.submit(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ future.get();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return;
+ }
+ monitor.close();
+ }
+ });
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
index 4506d1f..5bae4eb 100644
--- a/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
@@ -3,49 +3,34 @@ package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trc;
import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import javax.swing.BorderFactory;
-import javax.swing.GroupLayout;
-import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
-import javax.swing.border.EtchedBorder;
-import javax.swing.plaf.basic.BasicComboBoxEditor;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.download.DownloadObjectDialog;
import org.openstreetmap.josm.gui.io.DownloadPrimitivesTask;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
-import org.openstreetmap.josm.gui.widgets.OsmIdTextField;
-import org.openstreetmap.josm.gui.widgets.OsmPrimitiveTypesComboBox;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
@@ -57,154 +42,22 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class DownloadPrimitiveAction extends JosmAction {
+ /**
+ * Constructs a new {@code DownloadPrimitiveAction}.
+ */
public DownloadPrimitiveAction() {
super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID."),
Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")), KeyEvent.VK_O, Shortcut.CTRL_SHIFT), true);
putValue("help", ht("/Action/DownloadObject"));
}
- /**
- * Restore the current history from the preferences
- *
- * @param cbHistory
- */
- protected void restorePrimitivesHistory(HistoryComboBox cbHistory) {
- List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(getClass().getName() + ".primitivesHistory", new LinkedList<String>()));
- // we have to reverse the history, because ComboBoxHistory will reverse it again
- // in addElement()
- //
- Collections.reverse(cmtHistory);
- cbHistory.setPossibleItems(cmtHistory);
- }
-
- /**
- * Remind the current history in the preferences
- * @param cbHistory
- */
- protected void remindPrimitivesHistory(HistoryComboBox cbHistory) {
- cbHistory.addCurrentItemToHistory();
- Main.pref.putCollection(getClass().getName() + ".primitivesHistory", cbHistory.getHistory());
- }
-
+ @Override
public void actionPerformed(ActionEvent e) {
- JPanel all = new JPanel();
- GroupLayout layout = new GroupLayout(all);
- all.setLayout(layout);
- layout.setAutoCreateGaps(true);
- layout.setAutoCreateContainerGaps(true);
-
- JLabel lbl1 = new JLabel(tr("Object type:"));
- final OsmPrimitiveTypesComboBox cbType = new OsmPrimitiveTypesComboBox();
- cbType.addItem(trc("osm object types", "mixed"));
- cbType.setToolTipText(tr("Choose the OSM object type"));
- JLabel lbl2 = new JLabel(tr("Object ID:"));
- final OsmIdTextField tfId = new OsmIdTextField();
- HistoryComboBox cbId = new HistoryComboBox();
- cbId.setEditor(new BasicComboBoxEditor() {
- @Override
- protected JTextField createEditorComponent() {
- return tfId;
- }
- });
- cbId.setToolTipText(tr("Enter the ID of the object that should be downloaded"));
- restorePrimitivesHistory(cbId);
- // forward the enter key stroke to the download button
- tfId.getKeymap().removeKeyStrokeBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false));
- JCheckBox layer = new JCheckBox(tr("Separate Layer"));
- layer.setToolTipText(tr("Select if the data should be downloaded into a new layer"));
- layer.setSelected(Main.pref.getBoolean("download.newlayer"));
- final JCheckBox referrers = new JCheckBox(tr("Download referrers (parent relations)"));
- referrers.setToolTipText(tr("Select if the referrers of the object should be downloaded as well, i.e.,"
- + "parent relations and for nodes, additionally, parent ways"));
- referrers.setSelected(Main.pref.getBoolean("downloadprimitive.referrers", true));
- JCheckBox full = new JCheckBox(tr("Download relation members"));
- full.setToolTipText(tr("Select if the members of a relation should be downloaded as well"));
- full.setSelected(Main.pref.getBoolean("downloadprimitive.full", true));
- HtmlPanel help = new HtmlPanel(tr("Object IDs can be separated by comma or space.<br/>"
- + " Examples: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b>"
- + " In mixed mode, specify objects like this: <b>w123, n110, w12, r15</b><br/>"));
- help.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
-
- layout.setVerticalGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup()
- .addComponent(lbl1)
- .addComponent(cbType, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE))
- .addGroup(layout.createParallelGroup()
- .addComponent(lbl2)
- .addComponent(cbId, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE))
- .addComponent(referrers)
- .addComponent(full)
- .addComponent(layer)
- .addComponent(help)
- );
-
- cbType.addItemListener(new ItemListener() {
+ DownloadObjectDialog dialog = new DownloadObjectDialog();
+ if (dialog.showDialog().getValue() != dialog.getContinueButtonIndex()) return;
- @Override
- public void itemStateChanged(ItemEvent e) {
- tfId.setType(cbType.getType());
- tfId.performValidation();
- referrers.setText(cbType.getType() == OsmPrimitiveType.NODE
- ? tr("Download referrers (parent relations and ways)")
- : tr("Download referrers (parent relations)"));
- }
- });
-
- layout.setHorizontalGroup(layout.createParallelGroup()
- .addGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup()
- .addComponent(lbl1)
- .addComponent(lbl2)
- )
- .addGroup(layout.createParallelGroup()
- .addComponent(cbType)
- .addComponent(cbId))
- )
- .addComponent(referrers)
- .addComponent(full)
- .addComponent(layer)
- .addComponent(help)
- );
-
- ExtendedDialog dialog = new ExtendedDialog(Main.parent,
- tr("Download object"),
- new String[] {tr("Download object"), tr("Cancel")}
- );
- dialog.setContent(all, false);
- dialog.setButtonIcons(new String[] {"download.png", "cancel.png"});
- dialog.setToolTipTexts(new String[] {
- tr("Start downloading"),
- tr("Close dialog and cancel downloading")
- });
- dialog.setDefaultButton(1);
- dialog.configureContextsensitiveHelp("/Action/DownloadObject", true /* show help button */);
- cbType.setSelectedIndex(Main.pref.getInteger("downloadprimitive.lasttype", 0));
- tfId.setType(cbType.getType());
- if (Main.pref.getBoolean("downloadprimitive.autopaste", true)) {
- tryToPasteFromClipboard(tfId, cbType);
- }
-
- dialog.showDialog();
- if (dialog.getValue() != 1) return;
- Main.pref.putInteger("downloadprimitive.lasttype", cbType.getSelectedIndex());
- Main.pref.put("downloadprimitive.referrers", referrers.isSelected());
- Main.pref.put("downloadprimitive.full", full.isSelected());
- Main.pref.put("download.newlayer", layer.isSelected());
-
- tfId.setType(cbType.getType());
- if(!tfId.readOsmIds()) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Invalid ID list specified\n"
- + "Cannot download object."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
- return;
- }
- remindPrimitivesHistory(cbId);
- processItems(layer.isSelected(), tfId.getIds(), referrers.isSelected(), full.isSelected());
+ processItems(dialog.isNewLayerRequested(), dialog.getOsmIds(), dialog.isReferrersRequested(), dialog.isFullRelationRequested());
}
/**
@@ -231,32 +84,33 @@ public class DownloadPrimitiveAction extends JosmAction {
Runnable showErrorsAndWarnings = new Runnable() {
@Override
public void run() {
- Set<PrimitiveId> errs = task.getMissingPrimitives();
+ final Set<PrimitiveId> errs = task.getMissingPrimitives();
if (errs != null && !errs.isEmpty()) {
- final ExtendedDialog dlg = reportProblemDialog(errs,
- trn("Object could not be downloaded", "Some objects could not be downloaded", errs.size()),
- trn("One object could not be downloaded.<br>",
- "{0} objects could not be downloaded.<br>",
- errs.size(),
- errs.size())
- + tr("The server replied with response code 404.<br>"
- + "This usually means, the server does not know an object with the requested id."),
- tr("missing objects:"),
- JOptionPane.ERROR_MESSAGE
- );
try {
SwingUtilities.invokeAndWait(new Runnable() {
@Override
public void run() {
- dlg.showDialog();
+ reportProblemDialog(errs,
+ trn("Object could not be downloaded", "Some objects could not be downloaded", errs.size()),
+ trn("One object could not be downloaded.<br>",
+ "{0} objects could not be downloaded.<br>",
+ errs.size(),
+ errs.size())
+ + tr("The server replied with response code 404.<br>"
+ + "This usually means, the server does not know an object with the requested id."),
+ tr("missing objects:"),
+ JOptionPane.ERROR_MESSAGE
+ ).showDialog();
}
});
} catch (InterruptedException ex) {
+ Main.warn("InterruptedException while displaying error dialog");
} catch (InvocationTargetException ex) {
+ Main.warn(ex);
}
}
- Set<PrimitiveId> del = new TreeSet<PrimitiveId>();
+ final Set<PrimitiveId> del = new TreeSet<PrimitiveId>();
DataSet ds = getCurrentDataSet();
for (PrimitiveId id : ids) {
OsmPrimitive osm = ds.getPrimitiveById(id);
@@ -265,20 +119,19 @@ public class DownloadPrimitiveAction extends JosmAction {
}
}
if (!del.isEmpty()) {
- final ExtendedDialog dlg = reportProblemDialog(del,
- trn("Object deleted", "Objects deleted", del.size()),
- trn(
- "One downloaded object is deleted.",
- "{0} downloaded objects are deleted.",
- del.size(),
- del.size()),
- null,
- JOptionPane.WARNING_MESSAGE
- );
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- dlg.showDialog();
+ reportProblemDialog(del,
+ trn("Object deleted", "Objects deleted", del.size()),
+ trn(
+ "One downloaded object is deleted.",
+ "{0} downloaded objects are deleted.",
+ del.size(),
+ del.size()),
+ null,
+ JOptionPane.WARNING_MESSAGE
+ ).showDialog();
}
});
}
@@ -296,7 +149,7 @@ public class DownloadPrimitiveAction extends JosmAction {
missing.setFont(missing.getFont().deriveFont(Font.PLAIN));
p.add(missing, GBC.eol());
}
- JTextArea txt = new JTextArea();
+ JosmTextArea txt = new JosmTextArea();
txt.setFont(new Font("Monospaced", txt.getFont().getStyle(), txt.getFont().getSize()));
txt.setEditable(false);
txt.setBackground(p.getBackground());
@@ -314,23 +167,4 @@ public class DownloadPrimitiveAction extends JosmAction {
.setIcon(msgType)
.setContent(p, false);
}
-
- private void tryToPasteFromClipboard(OsmIdTextField tfId, OsmPrimitiveTypesComboBox cbType) {
- String buf = Utils.getClipboardContent();
- if (buf != null) {
- if (buf.contains("node")) cbType.setSelectedIndex(0);
- if (buf.contains("way")) cbType.setSelectedIndex(1);
- if (buf.contains("relation")) cbType.setSelectedIndex(2);
- String[] res = buf.split("/");
- String txt;
- if (res.length>0) {
- txt = res[res.length-1];
- if (txt.isEmpty() && txt.length()>1) txt=res[res.length-2];
- } else {
- txt=buf;
- }
- tfId.setText(txt);
- tfId.clearTextIfInvalid();
- }
- }
}
diff --git a/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java b/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
index 463a8bf..2f6255a 100644
--- a/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
+++ b/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
@@ -78,10 +78,11 @@ public class DownloadReferrersAction extends JosmAction{
Main.worker.submit(new DownloadReferrersTask(targetLayer, id, type));
}
+ @Override
public void actionPerformed(ActionEvent e) {
- if (!isEnabled() || ! Main.isDisplayingMapView())
+ if (!isEnabled())
return;
- OsmDataLayer layer = Main.map.mapView.getEditLayer();
+ OsmDataLayer layer = Main.main.getEditLayer();
if (layer == null)
return;
Collection<OsmPrimitive> primitives = layer.data.getSelected();
diff --git a/src/org/openstreetmap/josm/actions/DuplicateAction.java b/src/org/openstreetmap/josm/actions/DuplicateAction.java
index 75cc258..27b8305 100644
--- a/src/org/openstreetmap/josm/actions/DuplicateAction.java
+++ b/src/org/openstreetmap/josm/actions/DuplicateAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
// Author: David Earl
package org.openstreetmap.josm.actions;
@@ -23,6 +23,7 @@ public final class DuplicateAction extends JosmAction{
putValue("help", ht("/Action/Duplicate"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Main.main.menu.paste.pasteData(new PrimitiveDeepCopy(getCurrentDataSet().getSelected()), getEditLayer(), e);
}
diff --git a/src/org/openstreetmap/josm/actions/ExitAction.java b/src/org/openstreetmap/josm/actions/ExitAction.java
index 3eb64d8..78ab972 100644
--- a/src/org/openstreetmap/josm/actions/ExitAction.java
+++ b/src/org/openstreetmap/josm/actions/ExitAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -25,7 +25,8 @@ public class ExitAction extends JosmAction {
putValue("help", ht("/Action/Exit"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
- Main.exitJosm(true);
+ Main.exitJosm(true, 0);
}
}
diff --git a/src/org/openstreetmap/josm/actions/ExpertToggleAction.java b/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
index 82873b5..59a3a11 100644
--- a/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
@@ -10,14 +10,13 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.swing.ButtonModel;
-
import org.openstreetmap.josm.Main;
-public class ExpertToggleAction extends JosmAction {
-
- private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
- private boolean selected;
+/**
+ * This action toggles the Expert mode.
+ * @since 4840
+ */
+public class ExpertToggleAction extends ToggleAction {
public interface ExpertModeChangeListener {
void expertChanged(boolean isExpert);
@@ -117,60 +116,46 @@ public class ExpertToggleAction extends JosmAction {
}
}
+ /**
+ * Constructs a new {@code ExpertToggleAction}.
+ */
public ExpertToggleAction() {
- super(
- tr("Expert Mode"),
- "expert",
- tr("Enable/disable expert mode"),
- null,
- false /* register toolbar */
+ super(tr("Expert Mode"),
+ "expert",
+ tr("Enable/disable expert mode"),
+ null,
+ false /* register toolbar */
);
putValue("toolbar", "expertmode");
Main.toolbar.register(this);
- selected = Main.pref.getBoolean("expert", false);
+ setSelected(Main.pref.getBoolean("expert", false));
notifySelectedState();
}
- public void addButtonModel(ButtonModel model) {
- if (model != null && !buttonModels.contains(model)) {
- buttonModels.add(model);
- model.setSelected(selected);
- }
- }
-
- public void removeButtonModel(ButtonModel model) {
- if (model != null && buttonModels.contains(model)) {
- buttonModels.remove(model);
- }
- }
-
protected void notifySelectedState() {
- for (ButtonModel model: buttonModels) {
- if (model.isSelected() != selected) {
- model.setSelected(selected);
- }
- }
- fireExpertModeChanged(selected);
- }
-
- protected void toggleSelectedState() {
- selected = !selected;
- Main.pref.put("expert", selected);
- notifySelectedState();
+ super.notifySelectedState();
+ fireExpertModeChanged(isSelected());
}
+ @Override
public void actionPerformed(ActionEvent e) {
- toggleSelectedState();
- }
-
- public boolean isSelected() {
- return selected;
+ toggleSelectedState(e);
+ Main.pref.put("expert", isSelected());
+ notifySelectedState();
}
+ /**
+ * Replies the unique instance of this action.
+ * @return The unique instance of this action
+ */
public static ExpertToggleAction getInstance() {
return INSTANCE;
}
+ /**
+ * Determines if expert mode is enabled.
+ * @return {@code true} if expert mode is enabled, {@code false} otherwise.
+ */
public static boolean isExpert() {
return INSTANCE.isSelected();
}
diff --git a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
index 86ec461..c1627fa 100644
--- a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
+++ b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import java.io.File;
@@ -11,6 +11,7 @@ import java.util.List;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.io.AllFormatsImporter;
import org.openstreetmap.josm.io.FileExporter;
@@ -35,7 +36,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
*/
public static final ArrayList<FileExporter> exporters;
- // add some file types only if the relevant classes are there;
+ // add some file types only if the relevant classes are there.
// this gives us the option to painlessly drop them from the .jar
// and build JOSM versions without support for these formats
@@ -52,7 +53,8 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
"org.openstreetmap.josm.io.OsmBzip2Importer",
"org.openstreetmap.josm.io.JpgImporter",
"org.openstreetmap.josm.io.WMSLayerImporter",
- "org.openstreetmap.josm.io.AllFormatsImporter"
+ "org.openstreetmap.josm.io.AllFormatsImporter",
+ "org.openstreetmap.josm.io.session.SessionImporter"
};
for (String classname : importerNames) {
@@ -60,7 +62,9 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
FileImporter importer = (FileImporter) Class.forName(classname).newInstance();
importers.add(importer);
MapView.addLayerChangeListener(importer);
- } catch (Throwable t) { }
+ } catch (Throwable t) {
+ Main.debug(t.getMessage());
+ }
}
exporters = new ArrayList<FileExporter>();
@@ -79,7 +83,9 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
FileExporter exporter = (FileExporter)Class.forName(classname).newInstance();
exporters.add(exporter);
MapView.addLayerChangeListener(exporter);
- } catch (Throwable t) { }
+ } catch (Throwable t) {
+ Main.debug(t.getMessage());
+ }
}
}
@@ -92,6 +98,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
filters,
new Comparator<ExtensionFileFilter>() {
private AllFormatsImporter all = new AllFormatsImporter();
+ @Override
public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) {
if (o1.getDescription().equals(all.filter.getDescription())) return 1;
if (o2.getDescription().equals(all.filter.getDescription())) return -1;
@@ -108,7 +115,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
* Updating the AllFormatsImporter is required when plugins add new importers that
* support new file extensions. The old AllFormatsImporter doesn’t include the new
* extensions and thus will not display these files.
- *
+ *
* @since 5131
*/
public static void updateAllFormatsImporter() {
@@ -195,7 +202,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
*
* @param fileChooser the file chooser
* @param extension the default extension
- * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
+ * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
* If false, only the file filters that include {@code extension} will be proposed
* @since 5438
*/
@@ -214,7 +221,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
*
* @param fileChooser the file chooser
* @param extension the default extension
- * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
+ * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
* If false, only the file filters that include {@code extension} will be proposed
* @since 5438
*/
@@ -267,7 +274,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
}
/**
- * Replies the comma-separated list of file extensions of this file filter.
+ * Replies the comma-separated list of file extensions of this file filter.
* @return the comma-separated list of file extensions of this file filter, as a String
* @since 5131
*/
diff --git a/src/org/openstreetmap/josm/actions/FollowLineAction.java b/src/org/openstreetmap/josm/actions/FollowLineAction.java
index e2bd02e..bdeccfa 100644
--- a/src/org/openstreetmap/josm/actions/FollowLineAction.java
+++ b/src/org/openstreetmap/josm/actions/FollowLineAction.java
@@ -6,7 +6,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -62,12 +61,12 @@ public class FollowLineAction extends JosmAction {
if (osmLayer == null)
return;
if (!(Main.map.mapMode instanceof DrawAction)) return; // We are not on draw mode
-
+
Collection<Node> selectedPoints = osmLayer.data.getSelectedNodes();
Collection<Way> selectedLines = osmLayer.data.getSelectedWays();
if ((selectedPoints.size() > 1) || (selectedLines.size() != 1)) // Unsuitable selection
return;
-
+
Node last = ((DrawAction) Main.map.mapMode).getCurrentBaseNode();
if (last == null)
return;
@@ -82,11 +81,9 @@ public class FollowLineAction extends JosmAction {
}
List<OsmPrimitive> referrers = last.getReferrers();
if (referrers.size() < 2) return; // There's nothing to follow
-
- Node newPoint = null;
- Iterator<OsmPrimitive> i = referrers.iterator();
- while (i.hasNext()) {
- OsmPrimitive referrer = i.next();
+
+ Node newPoint = null;
+ for (OsmPrimitive referrer : referrers) {
if (!referrer.getType().equals(OsmPrimitiveType.WAY)) { // Can't follow points or relations
continue;
}
@@ -95,7 +92,7 @@ public class FollowLineAction extends JosmAction {
continue;
}
Set<Node> points = toFollow.getNeighbours(last);
- if (!points.remove(prev) || (points.size() == 0))
+ if (!points.remove(prev) || points.isEmpty())
continue;
if (points.size() > 1) // Ambiguous junction?
return;
@@ -118,11 +115,11 @@ public class FollowLineAction extends JosmAction {
osmLayer.data.clearSelection();
osmLayer.data.addSelected(newFollower);
osmLayer.data.addSelected(newPoint);
- // "viewport following" mode for tracing long features
- // from aerial imagery or GPS tracks.
+ // "viewport following" mode for tracing long features
+ // from aerial imagery or GPS tracks.
if (Main.map.mapView.viewportFollowing) {
Main.map.mapView.smoothScrollTo(newPoint.getEastNorth());
- };
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java b/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
index 2869de8..6d6b899 100644
--- a/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java
@@ -15,7 +15,6 @@ import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.List;
-import javax.swing.ButtonModel;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.KeyStroke;
@@ -24,58 +23,47 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.PlatformHookWindows;
import org.openstreetmap.josm.tools.Shortcut;
-public class FullscreenToggleAction extends JosmAction {
- private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
- private boolean selected;
+/**
+ * This class toggles the full-screen mode.
+ * @since 2533
+ */
+public class FullscreenToggleAction extends ToggleAction {
private GraphicsDevice gd;
private Rectangle prevBounds;
+ /**
+ * Constructs a new {@code FullscreenToggleAction}.
+ */
public FullscreenToggleAction() {
- super(
- tr("Fullscreen view"),
- null, /* no icon */
- tr("Toggle fullscreen view"),
- Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"),KeyEvent.VK_F11, Shortcut.DIRECT),
- false /* register */
+ super(tr("Fullscreen view"),
+ null, /* no icon */
+ tr("Toggle fullscreen view"),
+ Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"),KeyEvent.VK_F11, Shortcut.DIRECT),
+ false /* register */
);
putValue("help", ht("/Action/FullscreenView"));
putValue("toolbar", "fullscreen");
Main.toolbar.register(this);
gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
- selected = Main.pref.getBoolean("draw.fullscreen", false);
+ setSelected(Main.pref.getBoolean("draw.fullscreen", false));
notifySelectedState();
}
- public void addButtonModel(ButtonModel model) {
- if (model != null && !buttonModels.contains(model)) {
- buttonModels.add(model);
- }
- }
-
- public void removeButtonModel(ButtonModel model) {
- if (model != null && buttonModels.contains(model)) {
- buttonModels.remove(model);
- }
- }
-
- protected void notifySelectedState() {
- for (ButtonModel model: buttonModels) {
- if (model.isSelected() != selected) {
- model.setSelected(selected);
- }
- }
- }
-
- protected void toggleSelectedState() {
- selected = !selected;
- Main.pref.put("draw.fullscreen", selected);
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ toggleSelectedState(e);
+ Main.pref.put("draw.fullscreen", isSelected());
notifySelectedState();
setMode();
}
+ /**
+ * To call if this action must be initially run at JOSM startup.
+ */
public void initial() {
- if(selected)
+ if (isSelected()) {
setMode();
+ }
}
protected void setMode() {
@@ -88,6 +76,8 @@ public class FullscreenToggleAction extends JosmAction {
visibleWindows.add(w);
}
}
+
+ boolean selected = isSelected();
frame.dispose();
frame.setUndecorated(selected);
@@ -119,8 +109,4 @@ public class FullscreenToggleAction extends JosmAction {
// Free F10 key to allow it to be used by plugins, even after full screen (see #7502)
frame.getJMenuBar().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0), "none");
}
-
- public void actionPerformed(ActionEvent e) {
- toggleSelectedState();
- }
}
diff --git a/src/org/openstreetmap/josm/actions/GpxExportAction.java b/src/org/openstreetmap/josm/actions/GpxExportAction.java
index e256264..050d7fa 100644
--- a/src/org/openstreetmap/josm/actions/GpxExportAction.java
+++ b/src/org/openstreetmap/josm/actions/GpxExportAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.actions.SaveActionBase.createAndOpenSaveFileChooser;
@@ -44,6 +44,7 @@ public class GpxExportAction extends DiskAccessAction {
return (layer instanceof GpxLayer || layer instanceof OsmDataLayer) ? layer : null;
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
diff --git a/src/org/openstreetmap/josm/actions/HelpAction.java b/src/org/openstreetmap/josm/actions/HelpAction.java
index 7054dc6..3834de6 100644
--- a/src/org/openstreetmap/josm/actions/HelpAction.java
+++ b/src/org/openstreetmap/josm/actions/HelpAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -26,6 +26,7 @@ public class HelpAction extends AbstractAction {
putValue("toolbar", "help");
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand() == null) {
String topic;
diff --git a/src/org/openstreetmap/josm/actions/HistoryInfoAction.java b/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
index 034c38a..7af1391 100644
--- a/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
+++ b/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
@@ -1,50 +1,64 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.util.Collection;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.dialogs.OsmIdSelectionDialog;
import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
import org.openstreetmap.josm.tools.Shortcut;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+/**
+ * Display history information about OSM ways, nodes, or relations.
+ * @since 968
+ */
public class HistoryInfoAction extends JosmAction {
- public HistoryInfoAction() {
- super(tr("History"), "about",
- tr("Display history information about OSM ways, nodes, or relations."),
- Shortcut.registerShortcut("core:historyinfo",
- tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
- putValue("help", ht("/Action/ObjectHistory"));
- putValue("toolbar", "action/historyinfo");
- Main.toolbar.register(this);
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- DataSet set = getCurrentDataSet();
- if (set != null) {
- HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected());
- }
- }
-
- @Override
- public void updateEnabledState() {
- if (getCurrentDataSet() == null) {
- setEnabled(false);
- } else {
- updateEnabledState(getCurrentDataSet().getAllSelected());
- }
- }
-
- @Override
- protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
- setEnabled(!selection.isEmpty());
- }
+ /**
+ * Constructs a new {@code HistoryInfoAction}.
+ */
+ public HistoryInfoAction() {
+ super(tr("History"), "about",
+ tr("Display history information about OSM ways, nodes, or relations."),
+ Shortcut.registerShortcut("core:historyinfo",
+ tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
+ putValue("help", ht("/Action/ObjectHistory"));
+ putValue("toolbar", "action/historyinfo");
+ Main.toolbar.register(this);
+ setEnabled(true);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ DataSet set = getCurrentDataSet();
+ if (set != null && !set.getAllSelected().isEmpty()) {
+ HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected());
+ } else {
+ HistoryObjectIDDialog dialog = new HistoryObjectIDDialog();
+ if (dialog.showDialog().getValue() == dialog.getContinueButtonIndex()) {
+ HistoryBrowserDialogManager.getInstance().showHistory(dialog.getOsmIds());
+ }
+ }
+ }
+
+ /**
+ * Dialog allowing to choose object id if no one is selected.
+ * @since 6448
+ */
+ public static class HistoryObjectIDDialog extends OsmIdSelectionDialog {
+
+ /**
+ * Constructs a new {@code HistoryObjectIDDialog}.
+ */
+ public HistoryObjectIDDialog() {
+ super(Main.parent, tr("Show history"), new String[]{tr("Show history"), tr("Cancel")});
+ setButtonIcons(new String[]{"dialogs/history.png", "cancel.png"});
+ init();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java b/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
index 5d9e959..497f4a7 100644
--- a/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
+++ b/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
@@ -1,15 +1,14 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.KeyEvent;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.tools.Shortcut;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
public class HistoryInfoWebAction extends AbstractInfoAction {
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index 8300718..a974790 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -19,18 +19,17 @@ import java.awt.event.MouseMotionListener;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.mapmode.MapMode;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.imagery.OffsetBookmark;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.layer.ImageryLayer;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
-
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
public class ImageryAdjustAction extends MapMode implements MouseListener, MouseMotionListener, AWTEventListener{
static ImageryOffsetDialog offsetDialog;
@@ -57,16 +56,20 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
if (!layer.isVisible()) {
layer.setVisible(true);
}
- Main.map.mapView.addMouseListener(this);
- Main.map.mapView.addMouseMotionListener(this);
oldDx = layer.getDx();
oldDy = layer.getDy();
+ addListeners();
+ offsetDialog = new ImageryOffsetDialog();
+ offsetDialog.setVisible(true);
+ }
+
+ protected void addListeners() {
+ Main.map.mapView.addMouseListener(this);
+ Main.map.mapView.addMouseMotionListener(this);
try {
Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
} catch (SecurityException ex) {
}
- offsetDialog = new ImageryOffsetDialog();
- offsetDialog.setVisible(true);
}
@Override public void exitMode() {
@@ -76,12 +79,18 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
offsetDialog.setVisible(false);
offsetDialog = null;
}
+ removeListeners();
+ }
+
+ protected void removeListeners() {
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
} catch (SecurityException ex) {
}
- Main.map.mapView.removeMouseListener(this);
- Main.map.mapView.removeMouseMotionListener(this);
+ if (Main.isDisplayingMapView()) {
+ Main.map.mapView.removeMouseMotionListener(this);
+ Main.map.mapView.removeMouseListener(this);
+ }
}
@Override
@@ -114,6 +123,7 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
return;
if (layer.isVisible()) {
+ requestFocusInMapView();
prevEastNorth=Main.map.mapView.getEastNorth(e.getX(),e.getY());
Main.map.mapView.setNewCursor(Cursor.MOVE_CURSOR, this);
}
@@ -144,13 +154,12 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
if (offsetDialog != null || layer == null || Main.map == null)
return;
oldMapMode = Main.map.mapMode;
- layer.enableOffsetServer(false);
super.actionPerformed(e);
}
class ImageryOffsetDialog extends ExtendedDialog implements FocusListener {
- public final JTextField tOffset = new JTextField();
- JTextField tBookmarkName = new JTextField();
+ public final JosmTextField tOffset = new JosmTextField();
+ JosmTextField tBookmarkName = new JosmTextField();
private boolean ignoreListener;
public ImageryOffsetDialog() {
super(Main.parent,
@@ -237,7 +246,7 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
@Override
protected void buttonAction(int buttonIndex, ActionEvent evt) {
- if (buttonIndex == 0 && tBookmarkName.getText() != null && !"".equals(tBookmarkName.getText()) &&
+ if (buttonIndex == 0 && tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty() &&
OffsetBookmark.getBookmarkByName(layer, tBookmarkName.getText()) != null) {
if (!confirmOverwriteBookmark()) return;
}
@@ -251,7 +260,7 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
offsetDialog = null;
if (getValue() != 1) {
layer.setOffset(oldDx, oldDy);
- } else if (tBookmarkName.getText() != null && !"".equals(tBookmarkName.getText())) {
+ } else if (tBookmarkName.getText() != null && !tBookmarkName.getText().isEmpty()) {
OffsetBookmark.bookmarkOffset(tBookmarkName.getText(), layer);
}
Main.main.menu.imageryMenu.refreshOffsetMenu();
@@ -264,4 +273,12 @@ public class ImageryAdjustAction extends MapMode implements MouseListener, Mouse
}
}
}
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ removeListeners();
+ this.layer = null;
+ this.oldMapMode = null;
+ }
}
diff --git a/src/org/openstreetmap/josm/actions/InfoAction.java b/src/org/openstreetmap/josm/actions/InfoAction.java
index 71b01fe..a75aacd 100644
--- a/src/org/openstreetmap/josm/actions/InfoAction.java
+++ b/src/org/openstreetmap/josm/actions/InfoAction.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import java.awt.event.ActionEvent;
@@ -16,6 +16,9 @@ import org.openstreetmap.josm.tools.Shortcut;
public class InfoAction extends JosmAction {
+ /**
+ * Constructs a new {@code InfoAction}.
+ */
public InfoAction() {
super(tr("Advanced info"), "about",
tr("Display advanced object information about OSM nodes, ways, or relations."),
@@ -28,9 +31,9 @@ public class InfoAction extends JosmAction {
@Override
public void actionPerformed(ActionEvent ae) {
DataSet set = getCurrentDataSet();
- if (set != null) {
- new InspectPrimitiveDialog(set.getAllSelected(), Main.map.mapView.getEditLayer()).showDialog();
- }
+ if (set != null) {
+ new InspectPrimitiveDialog(set.getAllSelected(), Main.main.getEditLayer()).showDialog();
+ }
}
@Override
diff --git a/src/org/openstreetmap/josm/actions/InfoWebAction.java b/src/org/openstreetmap/josm/actions/InfoWebAction.java
index 68cafc7..d4cbe2a 100644
--- a/src/org/openstreetmap/josm/actions/InfoWebAction.java
+++ b/src/org/openstreetmap/josm/actions/InfoWebAction.java
@@ -1,12 +1,11 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
-import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.KeyEvent;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.tools.Shortcut;
diff --git a/src/org/openstreetmap/josm/actions/JoinAreasAction.java b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
index da09a62..fd8d8d5 100644
--- a/src/org/openstreetmap/josm/actions/JoinAreasAction.java
+++ b/src/org/openstreetmap/josm/actions/JoinAreasAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -41,12 +41,12 @@ import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
-
/**
* Join Areas (i.e. closed ways and multipolygons)
*/
@@ -55,7 +55,6 @@ public class JoinAreasAction extends JosmAction {
private LinkedList<Command> cmds = new LinkedList<Command>();
private int cmdsCount = 0;
-
/**
* This helper class describes join ares action result.
* @author viesturs
@@ -63,9 +62,7 @@ public class JoinAreasAction extends JosmAction {
*/
public static class JoinAreasResult {
- public boolean mergeSuccessful;
public boolean hasChanges;
- public boolean hasRelationProblems;
public List<Multipolygon> polygons;
}
@@ -74,8 +71,6 @@ public class JoinAreasAction extends JosmAction {
public Way outerWay;
public List<Way> innerWays;
- public Relation relation;
-
public Multipolygon(Way way) {
outerWay = way;
innerWays = new ArrayList<Way>();
@@ -199,7 +194,7 @@ public class JoinAreasAction extends JosmAction {
}
public boolean hasWays() {
- return availableWays.size() > 0;
+ return !availableWays.isEmpty();
}
public WayInPolygon startNewWay(WayInPolygon way) {
@@ -316,18 +311,25 @@ public class JoinAreasAction extends JosmAction {
* Gets called whenever the shortcut is pressed or the menu entry is selected
* Checks whether the selected objects are suitable to join and joins them if so
*/
+ @Override
public void actionPerformed(ActionEvent e) {
LinkedList<Way> ways = new LinkedList<Way>(Main.main.getCurrentDataSet().getSelectedWays());
if (ways.isEmpty()) {
- JOptionPane.showMessageDialog(Main.parent, tr("Please select at least one closed way that should be joined."));
+ new Notification(
+ tr("Please select at least one closed way that should be joined."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return;
}
List<Node> allNodes = new ArrayList<Node>();
for (Way way : ways) {
if (!way.isClosed()) {
- JOptionPane.showMessageDialog(Main.parent, tr("One of the selected ways is not closed and therefore cannot be joined."));
+ new Notification(
+ tr("One of the selected ways is not closed and therefore cannot be joined."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return;
}
@@ -355,7 +357,10 @@ public class JoinAreasAction extends JosmAction {
return;
if (!testJoin(areas)) {
- JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed."));
+ new Notification(
+ tr("No intersection found. Nothing was changed."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return;
}
@@ -377,7 +382,10 @@ public class JoinAreasAction extends JosmAction {
ds.setSelected(allWays);
Main.map.mapView.repaint();
} else {
- JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed."));
+ new Notification(
+ tr("No intersection found. Nothing was changed."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
}
}
catch (UserCancelException exception) {
@@ -391,8 +399,8 @@ public class JoinAreasAction extends JosmAction {
/**
* Tests if the areas have some intersections to join.
- * @param areas
- * @return
+ * @param areas Areas to test
+ * @return @{code true} if areas are joinable
*/
private boolean testJoin(List<Multipolygon> areas) {
List<Way> allStartingWays = new ArrayList<Way>();
@@ -404,12 +412,12 @@ public class JoinAreasAction extends JosmAction {
//find intersection points
Set<Node> nodes = Geometry.addIntersections(allStartingWays, true, cmds);
- return nodes.size() > 0;
+ return !nodes.isEmpty();
}
/**
* Will join two or more overlapping areas
- * @param areas - list of areas to join
+ * @param areas list of areas to join
* @return new area formed.
*/
private JoinAreasResult joinAreas(List<Multipolygon> areas) throws UserCancelException {
@@ -446,7 +454,7 @@ public class JoinAreasAction extends JosmAction {
return result;
commitCommands(marktr("Added node on all intersections"));
- ArrayList<RelationRole> relations = new ArrayList<RelationRole>();
+ List<RelationRole> relations = new ArrayList<RelationRole>();
// Remove ways from all relations so ways can be combined/split quietly
for (Way way : allStartingWays) {
@@ -454,22 +462,22 @@ public class JoinAreasAction extends JosmAction {
}
// Don't warn now, because it will really look corrupted
- boolean warnAboutRelations = relations.size() > 0 && allStartingWays.size() > 1;
+ boolean warnAboutRelations = !relations.isEmpty() && allStartingWays.size() > 1;
- ArrayList<WayInPolygon> preparedWays = new ArrayList<WayInPolygon>();
+ List<WayInPolygon> preparedWays = new ArrayList<WayInPolygon>();
for (Way way : outerStartingWays) {
- ArrayList<Way> splitWays = splitWayOnNodes(way, nodes);
+ List<Way> splitWays = splitWayOnNodes(way, nodes);
preparedWays.addAll(markWayInsideSide(splitWays, false));
}
for (Way way : innerStartingWays) {
- ArrayList<Way> splitWays = splitWayOnNodes(way, nodes);
+ List<Way> splitWays = splitWayOnNodes(way, nodes);
preparedWays.addAll(markWayInsideSide(splitWays, true));
}
// Find boundary ways
- ArrayList<Way> discardedWays = new ArrayList<Way>();
+ List<Way> discardedWays = new ArrayList<Way>();
List<AssembledPolygon> bounadries = findBoundaryPolygons(preparedWays, discardedWays);
//find polygons
@@ -507,28 +515,33 @@ public class JoinAreasAction extends JosmAction {
commitCommands(marktr("Delete relations"));
// Delete the discarded inner ways
- if (discardedWays.size() > 0) {
- cmds.add(DeleteCommand.delete(Main.map.mapView.getEditLayer(), discardedWays, true));
- commitCommands(marktr("Delete Ways that are not part of an inner multipolygon"));
+ if (!discardedWays.isEmpty()) {
+ Command deleteCmd = DeleteCommand.delete(Main.main.getEditLayer(), discardedWays, true);
+ if (deleteCmd != null) {
+ cmds.add(deleteCmd);
+ commitCommands(marktr("Delete Ways that are not part of an inner multipolygon"));
+ }
}
makeCommitsOneAction(marktr("Joined overlapping areas"));
if (warnAboutRelations) {
- JOptionPane.showMessageDialog(Main.parent, tr("Some of the ways were part of relations that have been modified. Please verify no errors have been introduced."));
+ new Notification(
+ tr("Some of the ways were part of relations that have been modified.<br>Please verify no errors have been introduced."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_LONG)
+ .show();
}
result.hasChanges = true;
- result.mergeSuccessful = true;
result.polygons = polygons;
return result;
}
/**
* Checks if tags of two given ways differ, and presents the user a dialog to solve conflicts
- * @param Way First way to check
- * @param Way Second Way to check
- * @return boolean True if all conflicts are resolved, False if conflicts remain.
+ * @param polygons ways to check
+ * @return {@code true} if all conflicts are resolved, {@code false} if conflicts remain.
*/
private boolean resolveTagConflicts(List<Multipolygon> polygons) {
@@ -555,8 +568,8 @@ public class JoinAreasAction extends JosmAction {
/**
* This method removes duplicate points (if any) from the input way.
- * @param way the way to process
- * @return true if any changes where made
+ * @param ways the ways to process
+ * @return {@code true} if any changes where made
*/
private boolean removeDuplicateNodes(List<Way> ways) {
//TODO: maybe join nodes with JoinNodesAction, rather than reconnect the ways.
@@ -618,7 +631,7 @@ public class JoinAreasAction extends JosmAction {
/**
* Commits the command list with a description
- * @param String The description of what the commands do
+ * @param description The description of what the commands do
*/
private void commitCommands(String description) {
switch(cmds.size()) {
@@ -643,9 +656,9 @@ public class JoinAreasAction extends JosmAction {
* @param isInner - if true, reverts the direction (for multipolygon islands)
* @return list of parts, marked with the inside orientation.
*/
- private ArrayList<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
+ private List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
- ArrayList<WayInPolygon> result = new ArrayList<WayInPolygon>();
+ List<WayInPolygon> result = new ArrayList<WayInPolygon>();
//prepare prev and next maps
Map<Way, Way> nextWayMap = new HashMap<Way, Way>();
@@ -798,7 +811,7 @@ public class JoinAreasAction extends JosmAction {
}
//if odd number of crossings, invert orientation
- if (intersectionCount % 2 == 1) {
+ if (intersectionCount % 2 != 0) {
curWayInsideToTheRight = !curWayInsideToTheRight;
}
@@ -813,13 +826,13 @@ public class JoinAreasAction extends JosmAction {
* Uses SplitWayAction.splitWay for the heavy lifting.
* @return list of split ways (or original ways if no splitting is done).
*/
- private ArrayList<Way> splitWayOnNodes(Way way, Set<Node> nodes) {
+ private List<Way> splitWayOnNodes(Way way, Set<Node> nodes) {
- ArrayList<Way> result = new ArrayList<Way>();
+ List<Way> result = new ArrayList<Way>();
List<List<Node>> chunks = buildNodeChunks(way, nodes);
if (chunks.size() > 1) {
- SplitWayResult split = SplitWayAction.splitWay(Main.map.mapView.getEditLayer(), way, chunks, Collections.<OsmPrimitive>emptyList());
+ SplitWayResult split = SplitWayAction.splitWay(Main.main.getEditLayer(), way, chunks, Collections.<OsmPrimitive>emptyList());
//execute the command, we need the results
cmds.add(split.getCommand());
@@ -864,9 +877,9 @@ public class JoinAreasAction extends JosmAction {
/**
- * This method finds witch ways are outer and witch are inner.
- * @param boundaryWays
- * @return
+ * This method finds which ways are outer and which are inner.
+ * @param boundaries list of joined boundaries to search in
+ * @return outer ways
*/
private List<AssembledMultipolygon> findPolygons(Collection<AssembledPolygon> boundaries) {
@@ -885,6 +898,7 @@ public class JoinAreasAction extends JosmAction {
/**
* Collects outer way and corresponding inner ways from all boundaries.
+ * @param level depth level
* @param boundaryWays
* @return the outermostWay.
*/
@@ -920,7 +934,7 @@ public class JoinAreasAction extends JosmAction {
PolygonLevel polLev = new PolygonLevel(pol, level);
//process inner ways
- if (innerCandidates.size() > 0) {
+ if (!innerCandidates.isEmpty()) {
List<PolygonLevel> innerList = findOuterWaysImpl(level + 1, innerCandidates);
result.addAll(innerList);
@@ -1074,9 +1088,9 @@ public class JoinAreasAction extends JosmAction {
/**
* Tests if way is inside other way
- * @param outside
- * @param inside
- * @return
+ * @param outside outer polygon description
+ * @param inside inner polygon description
+ * @return {@code true} if inner is inside outer
*/
public static boolean wayInsideWay(AssembledPolygon inside, AssembledPolygon outside) {
Set<Node> outsideNodes = new HashSet<Node>(outside.getNodes());
@@ -1095,8 +1109,8 @@ public class JoinAreasAction extends JosmAction {
/**
* Joins the lists of ways.
- * @param Collection<Way> The list of outer ways that belong to that multigon.
- * @return Way The newly created outer way
+ * @param polygon The list of outer ways that belong to that multigon.
+ * @return The newly created outer way
*/
private Multipolygon joinPolygon(AssembledMultipolygon polygon) throws UserCancelException {
Multipolygon result = new Multipolygon(joinWays(polygon.outerWay.ways));
@@ -1110,8 +1124,8 @@ public class JoinAreasAction extends JosmAction {
/**
* Joins the outer ways and deletes all short ways that can't be part of a multipolygon anyway.
- * @param Collection<Way> The list of outer ways that belong to that multigon.
- * @return Way The newly created outer way
+ * @param ways The list of outer ways that belong to that multigon.
+ * @return The newly created outer way
*/
private Way joinWays(List<WayInPolygon> ways) throws UserCancelException {
@@ -1138,8 +1152,8 @@ public class JoinAreasAction extends JosmAction {
/**
* Joins a list of ways (using CombineWayAction and ReverseWayAction as specified in WayInPath)
- * @param ArrayList<Way> The list of ways to join and reverse
- * @return Way The newly created way
+ * @param ways The list of ways to join and reverse
+ * @return The newly created way
*/
private Way joinOrientedWays(List<WayInPolygon> ways) throws UserCancelException{
if (ways.size() < 2)
@@ -1209,7 +1223,10 @@ public class JoinAreasAction extends JosmAction {
}
if (outerWays.size() > 1) {
- JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle multipolygon relations with multiple outer ways."));
+ new Notification(
+ tr("Sorry. Cannot handle multipolygon relations with multiple outer ways."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return null;
}
@@ -1219,24 +1236,36 @@ public class JoinAreasAction extends JosmAction {
innerWays.retainAll(selectedWays);
if (processedOuterWays.contains(outerWay)) {
- JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is outer in multiple multipolygon relations."));
+ new Notification(
+ tr("Sorry. Cannot handle way that is outer in multiple multipolygon relations."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return null;
}
if (processedInnerWays.contains(outerWay)) {
- JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."));
+ new Notification(
+ tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return null;
}
for (Way way :innerWays)
{
if (processedOuterWays.contains(way)) {
- JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."));
+ new Notification(
+ tr("Sorry. Cannot handle way that is both inner and outer in multipolygon relations."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return null;
}
if (processedInnerWays.contains(way)) {
- JOptionPane.showMessageDialog(Main.parent, tr("Sorry. Cannot handle way that is inner in multiple multipolygon relations."));
+ new Notification(
+ tr("Sorry. Cannot handle way that is inner in multiple multipolygon relations."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
return null;
}
}
@@ -1246,7 +1275,6 @@ public class JoinAreasAction extends JosmAction {
Multipolygon pol = new Multipolygon(outerWay);
pol.innerWays.addAll(innerWays);
- pol.relation = r;
result.add(pol);
}
@@ -1264,36 +1292,13 @@ public class JoinAreasAction extends JosmAction {
}
/**
- * This method filters the list of relations that form the multipolygons.
- * @param relations
- * @param polygons
- * @return
- */
- private List<Relation> filterOwnMultipolygonRelations(Collection<Relation> relations, List<Multipolygon> polygons) {
-
- List<Relation> relationsToRemove = new ArrayList<Relation>();
-
- for (Multipolygon m : polygons) {
- if (m.relation != null) {
- relationsToRemove.add(m.relation);
- }
- }
-
- List<Relation> result = new ArrayList<Relation>();
-
- result.addAll(relations);
- result.removeAll(relationsToRemove);
- return result;
- }
-
- /**
* Will add own multipolygon relation to the "previously existing" relations. Fixup is done by fixRelations
- * @param Collection<Way> List of already closed inner ways
- * @param Way The outer way
- * @param ArrayList<RelationRole> The list of relation with roles to add own relation to
+ * @param inner List of already closed inner ways
+ * @param outer The outer way
+ * @return The list of relation with roles to add own relation to
*/
private RelationRole addOwnMultigonRelation(Collection<Way> inner, Way outer) {
- if (inner.size() == 0) return null;
+ if (inner.isEmpty()) return null;
// Create new multipolygon relation and add all inner ways to it
Relation newRel = new Relation();
newRel.put("type", "multipolygon");
@@ -1309,11 +1314,11 @@ public class JoinAreasAction extends JosmAction {
/**
* Removes a given OsmPrimitive from all relations
- * @param OsmPrimitive Element to remove from all relations
- * @return ArrayList<RelationRole> List of relations with roles the primitives was part of
+ * @param osm Element to remove from all relations
+ * @return List of relations with roles the primitives was part of
*/
- private ArrayList<RelationRole> removeFromAllRelations(OsmPrimitive osm) {
- ArrayList<RelationRole> result = new ArrayList<RelationRole>();
+ private List<RelationRole> removeFromAllRelations(OsmPrimitive osm) {
+ List<RelationRole> result = new ArrayList<RelationRole>();
for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
if (r.isDeleted()) {
@@ -1346,14 +1351,15 @@ public class JoinAreasAction extends JosmAction {
* Adds the previously removed relations again to the outer way. If there are multiple multipolygon
* relations where the joined areas were in "outer" role a new relation is created instead with all
* members of both. This function depends on multigon relations to be valid already, it won't fix them.
- * @param ArrayList<RelationRole> List of relations with roles the (original) ways were part of
- * @param Way The newly created outer area/way
- * @param relationsToDelete - set of relations to delete.
+ * @param rels List of relations with roles the (original) ways were part of
+ * @param outer The newly created outer area/way
+ * @param ownMultipol elements to directly add as outer
+ * @param relationsToDelete set of relations to delete.
*/
- private void fixRelations(ArrayList<RelationRole> rels, Way outer, RelationRole ownMultipol, Set<Relation> relationsToDelete) {
- ArrayList<RelationRole> multiouters = new ArrayList<RelationRole>();
+ private void fixRelations(List<RelationRole> rels, Way outer, RelationRole ownMultipol, Set<Relation> relationsToDelete) {
+ List<RelationRole> multiouters = new ArrayList<RelationRole>();
- if (ownMultipol != null){
+ if (ownMultipol != null) {
multiouters.add(ownMultipol);
}
@@ -1368,7 +1374,7 @@ public class JoinAreasAction extends JosmAction {
cmds.add(new ChangeCommand(r.rel, newRel));
}
- Relation newRel = null;
+ Relation newRel;
switch (multiouters.size()) {
case 0:
return;
@@ -1400,7 +1406,8 @@ public class JoinAreasAction extends JosmAction {
}
/**
- * @param Collection<Way> The List of Ways to remove all tags from
+ * Remove all tags from the all the way
+ * @param ways The List of Ways to remove all tags from
*/
private void stripTags(Collection<Way> ways) {
for (Way w : ways) {
@@ -1411,11 +1418,10 @@ public class JoinAreasAction extends JosmAction {
}
/**
- * @param Way The Way to remove all tags from
+ * Remove all tags from the way
+ * @param x The Way to remove all tags from
*/
private void stripTags(Way x) {
- if (x.getKeys() == null)
- return;
Way y = new Way(x);
for (String key : x.keySet()) {
y.remove(key);
@@ -1426,7 +1432,7 @@ public class JoinAreasAction extends JosmAction {
/**
* Takes the last cmdsCount actions back and combines them into a single action
* (for when the user wants to undo the join action)
- * @param String The commit message to display
+ * @param message The commit message to display
*/
private void makeCommitsOneAction(String message) {
UndoRedoHandler ur = Main.main.undoRedo;
diff --git a/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
index 795d1bc..d32f1ef 100644
--- a/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
+++ b/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -32,6 +32,7 @@ public class JoinNodeWayAction extends JosmAction {
putValue("help", ht("/Action/JoinNodeWay"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -45,7 +46,7 @@ public class JoinNodeWayAction extends JosmAction {
// If the user has selected some ways, only join the node to these.
boolean restrictToSelectedWays =
- getCurrentDataSet().getSelectedWays().size() > 0;
+ !getCurrentDataSet().getSelectedWays().isEmpty();
List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
Main.map.mapView.getPoint(node), OsmPrimitive.isSelectablePredicate);
@@ -72,7 +73,7 @@ public class JoinNodeWayAction extends JosmAction {
for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
List<Integer> is = insertPoint.getValue();
- if (is.size() == 0) {
+ if (is.isEmpty()) {
continue;
}
@@ -86,14 +87,12 @@ public class JoinNodeWayAction extends JosmAction {
wnew.setNodes(nodesToAdd);
cmds.add(new ChangeCommand(w, wnew));
}
- if (cmds.size() == 0) return;
+ if (cmds.isEmpty()) return;
Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds));
Main.map.repaint();
}
private static void pruneSuccsAndReverse(List<Integer> is) {
- //if (is.size() < 2) return;
-
HashSet<Integer> is2 = new HashSet<Integer>();
for (int i : is) {
if (!is2.contains(i - 1) && !is2.contains(i + 1)) {
diff --git a/src/org/openstreetmap/josm/actions/JosmAction.java b/src/org/openstreetmap/josm/actions/JosmAction.java
index f4fe716..848a7a3 100644
--- a/src/org/openstreetmap/josm/actions/JosmAction.java
+++ b/src/org/openstreetmap/josm/actions/JosmAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17,6 +17,7 @@ import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -222,16 +223,26 @@ abstract public class JosmAction extends AbstractAction implements Destroyable {
*
*/
private class LayerChangeAdapter implements MapView.LayerChangeListener {
+ private void updateEnabledStateInEDT() {
+ GuiHelper.runInEDT(new Runnable() {
+ @Override public void run() {
+ updateEnabledState();
+ }
+ });
+ }
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
- updateEnabledState();
+ updateEnabledStateInEDT();
}
+ @Override
public void layerAdded(Layer newLayer) {
- updateEnabledState();
+ updateEnabledStateInEDT();
}
+ @Override
public void layerRemoved(Layer oldLayer) {
- updateEnabledState();
+ updateEnabledStateInEDT();
}
}
@@ -240,6 +251,7 @@ abstract public class JosmAction extends AbstractAction implements Destroyable {
*
*/
private class SelectionChangeAdapter implements SelectionChangedListener {
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
updateEnabledState(newSelection);
}
diff --git a/src/org/openstreetmap/josm/actions/JumpToAction.java b/src/org/openstreetmap/josm/actions/JumpToAction.java
index ddf3924..44064a8 100644
--- a/src/org/openstreetmap/josm/actions/JumpToAction.java
+++ b/src/org/openstreetmap/josm/actions/JumpToAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -7,50 +7,61 @@ import java.awt.BorderLayout;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrameListener;
import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
import org.openstreetmap.josm.tools.Shortcut;
-public class JumpToAction extends JosmAction implements MouseListener {
+/**
+ * Allows to jump to a specific location.
+ * @since 2575
+ */
+public class JumpToAction extends JosmAction {
+
+ /**
+ * Constructs a new {@code JumpToAction}.
+ */
public JumpToAction() {
- super(tr("Jump To Position"), null, tr("Opens a dialog that allows to jump to a specific location"), Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
- KeyEvent.VK_J, Shortcut.CTRL), false);
- putValue("toolbar", "action/jumpto");
- Main.toolbar.register(this);
+ super(tr("Jump To Position"), (Icon) null, tr("Opens a dialog that allows to jump to a specific location"),
+ Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
+ KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", true);
}
- private JTextField url = new JTextField();
- private JTextField lat = new JTextField();
- private JTextField lon = new JTextField();
- private JTextField zm = new JTextField();
+ private final JosmTextField url = new JosmTextField();
+ private final JosmTextField lat = new JosmTextField();
+ private final JosmTextField lon = new JosmTextField();
+ private final JosmTextField zm = new JosmTextField();
- private double zoomFactor = 0;
+ /**
+ * Displays the "Jump to" dialog.
+ */
public void showJumpToDialog() {
- MapView mv = Main.map.mapView;
- if(mv == null)
+ if (!Main.isDisplayingMapView()) {
return;
- LatLon curPos=mv.getProjection().eastNorth2latlon(mv.getCenter());
- lat.setText(java.lang.Double.toString(curPos.lat()));
- lon.setText(java.lang.Double.toString(curPos.lon()));
+ }
+ MapView mv = Main.map.mapView;
+ LatLon curPos = mv.getProjection().eastNorth2latlon(mv.getCenter());
+ lat.setText(Double.toString(curPos.lat()));
+ lon.setText(Double.toString(curPos.lon()));
double dist = mv.getDist100Pixel();
- zoomFactor = 1/dist;
+ double zoomFactor = 1/dist;
- zm.setText(java.lang.Long.toString(Math.round(dist*100)/100));
+ zm.setText(Long.toString(Math.round(dist*100)/100));
updateUrl(true);
JPanel panel = new JPanel(new BorderLayout());
@@ -62,23 +73,23 @@ public class JumpToAction extends JosmAction implements MouseListener {
+ "</html>"),
BorderLayout.NORTH);
- class osmURLListener implements DocumentListener {
- public void changedUpdate(DocumentEvent e) { parseURL(); }
- public void insertUpdate(DocumentEvent e) { parseURL(); }
- public void removeUpdate(DocumentEvent e) { parseURL(); }
+ class OsmURLListener implements DocumentListener {
+ @Override public void changedUpdate(DocumentEvent e) { parseURL(); }
+ @Override public void insertUpdate(DocumentEvent e) { parseURL(); }
+ @Override public void removeUpdate(DocumentEvent e) { parseURL(); }
}
- class osmLonLatListener implements DocumentListener {
- public void changedUpdate(DocumentEvent e) { updateUrl(false); }
- public void insertUpdate(DocumentEvent e) { updateUrl(false); }
- public void removeUpdate(DocumentEvent e) { updateUrl(false); }
+ class OsmLonLatListener implements DocumentListener {
+ @Override public void changedUpdate(DocumentEvent e) { updateUrl(false); }
+ @Override public void insertUpdate(DocumentEvent e) { updateUrl(false); }
+ @Override public void removeUpdate(DocumentEvent e) { updateUrl(false); }
}
- osmLonLatListener x=new osmLonLatListener();
+ OsmLonLatListener x = new OsmLonLatListener();
lat.getDocument().addDocumentListener(x);
lon.getDocument().addDocumentListener(x);
zm.getDocument().addDocumentListener(x);
- url.getDocument().addDocumentListener(new osmURLListener());
+ url.getDocument().addDocumentListener(new OsmURLListener());
JPanel p = new JPanel(new GridBagLayout());
panel.add(p, BorderLayout.NORTH);
@@ -113,7 +124,7 @@ public class JumpToAction extends JosmAction implements MouseListener {
try {
zoomLvl = Double.parseDouble(zm.getText());
ll = new LatLon(Double.parseDouble(lat.getText()), Double.parseDouble(lon.getText()));
- } catch (Exception ex) {
+ } catch (NumberFormatException ex) {
JOptionPane.showMessageDialog(Main.parent, tr("Could not parse Latitude, Longitude or Zoom. Please check."), tr("Unable to parse Lon/Lat"), JOptionPane.ERROR_MESSAGE);
}
}
@@ -122,20 +133,26 @@ public class JumpToAction extends JosmAction implements MouseListener {
}
private void parseURL() {
- if(!url.hasFocus()) return;
- Bounds b = OsmUrlToBounds.parse(url.getText());
+ if (!url.hasFocus()) return;
+ String urlText = url.getText();
+ Bounds b = OsmUrlToBounds.parse(urlText);
if (b != null) {
- lat.setText(Double.toString((b.getMin().lat() + b.getMax().lat())/2));
- lon.setText(Double.toString((b.getMin().lon() + b.getMax().lon())/2));
+ lat.setText(Double.toString((b.getMinLat() + b.getMaxLat())/2));
+ lon.setText(Double.toString((b.getMinLon() + b.getMaxLon())/2));
int zoomLvl = 16;
- String[] args = url.getText().substring(url.getText().indexOf('?')+1).split("&");
- for (String arg : args) {
- int eq = arg.indexOf('=');
- if (eq == -1 || !arg.substring(0, eq).equalsIgnoreCase("zoom")) continue;
-
- zoomLvl = Integer.parseInt(arg.substring(eq + 1));
- break;
+ int hashIndex = urlText.indexOf("#map");
+ if (hashIndex >= 0) {
+ zoomLvl = Integer.parseInt(urlText.substring(hashIndex+5, urlText.indexOf('/', hashIndex)));
+ } else {
+ String[] args = urlText.substring(urlText.indexOf('?')+1).split("&");
+ for (String arg : args) {
+ int eq = arg.indexOf('=');
+ if (eq == -1 || !arg.substring(0, eq).equalsIgnoreCase("zoom")) continue;
+
+ zoomLvl = Integer.parseInt(arg.substring(eq + 1));
+ break;
+ }
}
// 10 000 000 = 10 000 * 1000 = World * (km -> m)
@@ -156,28 +173,31 @@ public class JumpToAction extends JosmAction implements MouseListener {
if(m > 0)
zoomLvl = (int)Math.round((-1) * Math.log(m/10000000)/Math.log(2));
- int decimals = (int) Math.pow(10, (zoomLvl / 3));
- dlat = Math.round(dlat * decimals);
- dlat /= decimals;
- dlon = Math.round(dlon * decimals);
- dlon /= decimals;
- url.setText("http://www.openstreetmap.org/?lat="+dlat+"&lon="+dlon+"&zoom="+zoomLvl);
- } catch (NumberFormatException x) {}
+ url.setText(OsmUrlToBounds.getURL(dlat, dlon, zoomLvl));
+ } catch (NumberFormatException x) {
+ Main.debug(x.getMessage());
+ }
}
+ @Override
public void actionPerformed(ActionEvent e) {
showJumpToDialog();
}
- public void mousePressed(MouseEvent e) {}
-
- public void mouseReleased(MouseEvent e) {}
-
- public void mouseEntered(MouseEvent e) {}
-
- public void mouseExited(MouseEvent e) {}
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(Main.isDisplayingMapView());
+ }
- public void mouseClicked(MouseEvent e) {
- showJumpToDialog();
+ @Override
+ protected void installAdapters() {
+ super.installAdapters();
+ // make this action listen to mapframe change events
+ Main.addMapFrameListener(new MapFrameListener() {
+ @Override
+ public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+ updateEnabledState();
+ }
+ });
}
}
diff --git a/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java b/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
similarity index 94%
rename from src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java
rename to src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
index f75eb78..7cfd17e 100644
--- a/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java
+++ b/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
@@ -8,6 +8,7 @@ import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -16,7 +17,6 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -24,10 +24,11 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.layer.WMSLayer;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.UrlLabel;
import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
-public class Map_Rectifier_WMSmenuAction extends JosmAction {
+public class MapRectifierWMSmenuAction extends JosmAction {
/**
* Class that bundles all required information of a rectifier service
*/
@@ -38,7 +39,7 @@ public class Map_Rectifier_WMSmenuAction extends JosmAction {
private final Pattern urlRegEx;
private final Pattern idValidator;
public JRadioButton btn;
-
+
/**
* @param name Name of the rectifing service
* @param url URL to the service where users can register, upload, etc.
@@ -62,9 +63,9 @@ public class Map_Rectifier_WMSmenuAction extends JosmAction {
/**
* List of available rectifier services. May be extended from the outside
*/
- public ArrayList<RectifierService> services = new ArrayList<RectifierService>();
+ public List<RectifierService> services = new ArrayList<RectifierService>();
- public Map_Rectifier_WMSmenuAction() {
+ public MapRectifierWMSmenuAction() {
super(tr("Rectified Image..."),
"OLmarker",
tr("Download Rectified Images From Various Services"),
@@ -110,7 +111,7 @@ public class Map_Rectifier_WMSmenuAction extends JosmAction {
JPanel panel = new JPanel(new GridBagLayout());
panel.add(new JLabel(tr("Supported Rectifier Services:")), GBC.eol());
- JTextField tfWmsUrl = new JTextField(30);
+ JosmTextField tfWmsUrl = new JosmTextField(30);
String clip = Utils.getClipboardContent();
clip = clip == null ? "" : clip.trim();
@@ -125,14 +126,14 @@ public class Map_Rectifier_WMSmenuAction extends JosmAction {
// Checks clipboard contents against current service if no match has been found yet.
// If the contents match, they will be inserted into the text field and the corresponding
// service will be pre-selected.
- if(!clip.equals("") && tfWmsUrl.getText().equals("")
+ if(!clip.isEmpty() && tfWmsUrl.getText().isEmpty()
&& (s.urlRegEx.matcher(clip).find() || s.idValidator.matcher(clip).matches())) {
serviceBtn.setSelected(true);
tfWmsUrl.setText(clip);
}
s.btn = serviceBtn;
group.add(serviceBtn);
- if(!s.url.equals("")) {
+ if(!s.url.isEmpty()) {
panel.add(serviceBtn, GBC.std());
panel.add(new UrlLabel(s.url, tr("Visit Homepage")), GBC.eol().anchor(GridBagConstraints.EAST));
} else {
@@ -141,7 +142,7 @@ public class Map_Rectifier_WMSmenuAction extends JosmAction {
}
// Fallback in case no match was found
- if(tfWmsUrl.getText().equals("") && firstBtn != null) {
+ if(tfWmsUrl.getText().isEmpty() && firstBtn != null) {
firstBtn.setSelected(true);
}
@@ -174,7 +175,7 @@ public class Map_Rectifier_WMSmenuAction extends JosmAction {
// We've reached the custom WMS URL service
// Just set the URL and hope everything works out
- if(s.wmsUrl.equals("")) {
+ if(s.wmsUrl.isEmpty()) {
addWMSLayer(s.name + " (" + text + ")", text);
break outer;
}
diff --git a/src/org/openstreetmap/josm/actions/MergeLayerAction.java b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
index 659fc72..6558c41 100644
--- a/src/org/openstreetmap/josm/actions/MergeLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
@@ -46,7 +46,7 @@ public class MergeLayerAction extends AbstractMergeAction {
}
}
targetLayer.mergeFrom(sourceLayer);
- Main.map.mapView.removeLayer(sourceLayer);
+ Main.main.removeLayer(sourceLayer);
layerMerged = true;
}
}
@@ -56,7 +56,7 @@ public class MergeLayerAction extends AbstractMergeAction {
}
});
}
-
+
public void merge(List<Layer> sourceLayers) {
doMerge(sourceLayers, sourceLayers);
}
@@ -72,6 +72,7 @@ public class MergeLayerAction extends AbstractMergeAction {
doMerge(targetLayers, Collections.singleton(sourceLayer));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Layer sourceLayer = Main.main.getEditLayer();
if (sourceLayer == null)
@@ -92,7 +93,7 @@ public class MergeLayerAction extends AbstractMergeAction {
}
});
}
-
+
/**
* returns true if the user wants to cancel, false if they want to continue
*/
diff --git a/src/org/openstreetmap/josm/actions/MergeNodesAction.java b/src/org/openstreetmap/josm/actions/MergeNodesAction.java
index 7b97291..5f1829b 100644
--- a/src/org/openstreetmap/josm/actions/MergeNodesAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeNodesAction.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others. See LICENSE file for details.
+//License: GPL. For details, see LICENSE file.. See LICENSE file for details.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -27,12 +27,12 @@ import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.RelationToChildReference;
import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -48,15 +48,21 @@ import org.openstreetmap.josm.tools.Shortcut;
* However we use the location of the node that was selected *last*.
* The "surviving" node will be moved to that location if it is
* different from the last selected node.
+ *
+ * @since 422
*/
public class MergeNodesAction extends JosmAction {
+ /**
+ * Constructs a new {@code MergeNodesAction}.
+ */
public MergeNodesAction() {
super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."),
Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.DIRECT), true);
putValue("help", ht("/Action/MergeNodes"));
}
+ @Override
public void actionPerformed(ActionEvent event) {
if (!isEnabled())
return;
@@ -66,13 +72,10 @@ public class MergeNodesAction extends JosmAction {
if (selectedNodes.size() == 1) {
List<Node> nearestNodes = Main.map.mapView.getNearestNodes(Main.map.mapView.getPoint(selectedNodes.get(0)), selectedNodes, OsmPrimitive.isUsablePredicate);
if (nearestNodes.isEmpty()) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least two nodes to merge or a node that is close to another node."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
-
+ new Notification(
+ tr("Please select at least two nodes to merge or one node that is close to another node."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
return;
}
selectedNodes.addAll(nearestNodes);
@@ -152,20 +155,28 @@ public class MergeNodesAction extends JosmAction {
* @return the selected target node
*/
public static Node selectTargetNode(Collection<Node> candidates) {
+ Node oldestNode = null;
Node targetNode = null;
Node lastNode = null;
for (Node n : candidates) {
if (!n.isNew()) {
- if (targetNode == null) {
- targetNode = n;
- } else if (n.getId() < targetNode.getId()) {
- targetNode = n;
+ // Among existing nodes, try to keep the oldest used one
+ if (!n.getReferrers().isEmpty()) {
+ if (targetNode == null) {
+ targetNode = n;
+ } else if (n.getId() < targetNode.getId()) {
+ targetNode = n;
+ }
+ } else if (oldestNode == null) {
+ oldestNode = n;
+ } else if (n.getId() < oldestNode.getId()) {
+ oldestNode = n;
}
}
lastNode = n;
}
if (targetNode == null) {
- targetNode = lastNode;
+ targetNode = (oldestNode != null ? oldestNode : lastNode);
}
return targetNode;
}
@@ -186,7 +197,7 @@ public class MergeNodesAction extends JosmAction {
Set<Way> waysToDelete = new HashSet<Way>();
for (Way w: OsmPrimitive.getFilteredList(OsmPrimitive.getReferrer(nodesToDelete), Way.class)) {
- ArrayList<Node> newNodes = new ArrayList<Node>(w.getNodesCount());
+ List<Node> newNodes = new ArrayList<Node>(w.getNodesCount());
for (Node n: w.getNodes()) {
if (! nodesToDelete.contains(n) && n != targetNode) {
newNodes.add(n);
@@ -239,13 +250,26 @@ public class MergeNodesAction extends JosmAction {
return cmds;
}
+ /**
+ * Merges the nodes in {@code nodes} at the specified node's location. Uses the dataset
+ * managed by {@code layer} as reference.
+ * @param layer layer the reference data layer. Must not be null
+ * @param nodes the collection of nodes. Ignored if null
+ * @param targetLocationNode this node's location will be used for the target node
+ * @throws IllegalArgumentException thrown if {@code layer} is null
+ */
public static void doMergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetLocationNode) {
if (nodes == null) {
return;
}
Set<Node> allNodes = new HashSet<Node>(nodes);
allNodes.add(targetLocationNode);
- Node target = selectTargetNode(allNodes);
+ Node target;
+ if (nodes.contains(targetLocationNode) && !targetLocationNode.isNew()) {
+ target = targetLocationNode; // keep existing targetLocationNode as target to avoid unnecessary changes (see #2447)
+ } else {
+ target = selectTargetNode(allNodes);
+ }
Command cmd = mergeNodes(layer, nodes, target, targetLocationNode);
if (cmd != null) {
@@ -254,6 +278,16 @@ public class MergeNodesAction extends JosmAction {
}
}
+ /**
+ * Merges the nodes in {@code nodes} at the specified node's location. Uses the dataset
+ * managed by {@code layer} as reference.
+ *
+ * @param layer layer the reference data layer. Must not be null.
+ * @param nodes the collection of nodes. Ignored if null.
+ * @param targetLocationNode this node's location will be used for the targetNode.
+ * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do
+ * @throws IllegalArgumentException thrown if {@code layer} is null
+ */
public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetLocationNode) {
if (nodes == null) {
return null;
@@ -271,7 +305,8 @@ public class MergeNodesAction extends JosmAction {
* @param nodes the collection of nodes. Ignored if null.
* @param targetNode the target node the collection of nodes is merged to. Must not be null.
* @param targetLocationNode this node's location will be used for the targetNode.
- * @throw IllegalArgumentException thrown if layer is null
+ * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do
+ * @throws IllegalArgumentException thrown if layer is null
*/
public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode, Node targetLocationNode) {
CheckParameterUtil.ensureParameterNotNull(layer, "layer");
@@ -280,8 +315,6 @@ public class MergeNodesAction extends JosmAction {
return null;
}
- Set<RelationToChildReference> relationToNodeReferences = RelationToChildReference.getRelationToChildReferences(nodes);
-
try {
TagCollection nodeTags = TagCollection.unionOfAllPrimitives(nodes);
List<Command> resultion = CombinePrimitiveResolverDialog.launchIfNecessary(nodeTags, nodes, Collections.singleton(targetNode));
@@ -306,9 +339,12 @@ public class MergeNodesAction extends JosmAction {
// build the commands
//
if (targetNode != targetLocationNode) {
- Node newTargetNode = new Node(targetNode);
- newTargetNode.setCoor(targetLocationNode.getCoor());
- cmds.add(new ChangeCommand(targetNode, newTargetNode));
+ LatLon targetLocationCoor = targetLocationNode.getCoor();
+ if (!targetNode.getCoor().equals(targetLocationCoor)) {
+ Node newTargetNode = new Node(targetNode);
+ newTargetNode.setCoor(targetLocationCoor);
+ cmds.add(new ChangeCommand(targetNode, newTargetNode));
+ }
}
cmds.addAll(resultion);
if (!nodesToDelete.isEmpty()) {
diff --git a/src/org/openstreetmap/josm/actions/MergeSelectionAction.java b/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
index 822efbe..0a1c0ae 100644
--- a/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
@@ -38,7 +38,7 @@ public class MergeSelectionAction extends AbstractMergeAction {
Layer targetLayer = askTargetLayer(targetLayers);
if (targetLayer == null)
return;
- if (getEditLayer().isUploadDiscouraged() && targetLayer instanceof OsmDataLayer && !((OsmDataLayer)targetLayer).isUploadDiscouraged()
+ if (getEditLayer().isUploadDiscouraged() && targetLayer instanceof OsmDataLayer && !((OsmDataLayer)targetLayer).isUploadDiscouraged()
&& getEditLayer().data.getAllSelected().size() > 1) {
if (warnMergingUploadDiscouragedObjects(targetLayer)) {
return;
@@ -48,6 +48,7 @@ public class MergeSelectionAction extends AbstractMergeAction {
((OsmDataLayer)targetLayer).mergeFrom(builder.build());
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (getEditLayer() == null || getEditLayer().data.getAllSelected().isEmpty())
return;
@@ -67,7 +68,7 @@ public class MergeSelectionAction extends AbstractMergeAction {
protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
setEnabled(selection != null && !selection.isEmpty());
}
-
+
/**
* returns true if the user wants to cancel, false if they want to continue
*/
diff --git a/src/org/openstreetmap/josm/actions/MirrorAction.java b/src/org/openstreetmap/josm/actions/MirrorAction.java
index ee935e6..ab49320 100644
--- a/src/org/openstreetmap/josm/actions/MirrorAction.java
+++ b/src/org/openstreetmap/josm/actions/MirrorAction.java
@@ -1,8 +1,8 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
-import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Shortcut;
/**
@@ -37,6 +38,7 @@ public final class MirrorAction extends JosmAction {
putValue("help", ht("/Action/Mirror"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
HashSet<Node> nodes = new HashSet<Node>();
@@ -49,13 +51,12 @@ public final class MirrorAction extends JosmAction {
}
}
- if (nodes.size() == 0) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least one node or way."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ if (nodes.isEmpty()) {
+ new Notification(
+ tr("Please select at least one node or way."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
return;
}
diff --git a/src/org/openstreetmap/josm/actions/MoveAction.java b/src/org/openstreetmap/josm/actions/MoveAction.java
index f066724..7e41db7 100644
--- a/src/org/openstreetmap/josm/actions/MoveAction.java
+++ b/src/org/openstreetmap/josm/actions/MoveAction.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -39,7 +39,7 @@ public class MoveAction extends JosmAction {
directiontext = tr("down");
} else if (dir == Direction.LEFT) {
directiontext = tr("left");
- } else { //dir == Direction.RIGHT) {
+ } else {
directiontext = tr("right");
}
return directiontext;
@@ -78,6 +78,7 @@ public class MoveAction extends JosmAction {
Main.toolbar.register(this);
}
+ @Override
public void actionPerformed(ActionEvent event) {
if (!Main.isDisplayingMapView())
@@ -114,15 +115,15 @@ public class MoveAction extends JosmAction {
Command c = !Main.main.undoRedo.commands.isEmpty()
? Main.main.undoRedo.commands.getLast() : null;
- getCurrentDataSet().beginUpdate();
+ getCurrentDataSet().beginUpdate();
if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).getParticipatingPrimitives())) {
((MoveCommand)c).moveAgain(distx, disty);
} else {
Main.main.undoRedo.add(
c = new MoveCommand(selection, distx, disty));
}
- getCurrentDataSet().endUpdate();
-
+ getCurrentDataSet().endUpdate();
+
for (Node n : affectedNodes) {
if (n.getCoor().isOutSideWorld()) {
// Revert move
diff --git a/src/org/openstreetmap/josm/actions/MoveNodeAction.java b/src/org/openstreetmap/josm/actions/MoveNodeAction.java
index ff29aa1..c7a923f 100644
--- a/src/org/openstreetmap/josm/actions/MoveNodeAction.java
+++ b/src/org/openstreetmap/josm/actions/MoveNodeAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -27,6 +27,7 @@ public final class MoveNodeAction extends JosmAction {
putValue("help", ht("/Action/MoveNode"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled() || (getCurrentDataSet().getSelectedNodes().size() != 1))
return;
diff --git a/src/org/openstreetmap/josm/actions/NewAction.java b/src/org/openstreetmap/josm/actions/NewAction.java
index a191ed3..3d2bf28 100644
--- a/src/org/openstreetmap/josm/actions/NewAction.java
+++ b/src/org/openstreetmap/josm/actions/NewAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -20,6 +20,7 @@ public class NewAction extends JosmAction {
putValue("help", ht("/Action/NewLayer"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Main.main.addLayer(new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null));
}
diff --git a/src/org/openstreetmap/josm/actions/OpenFileAction.java b/src/org/openstreetmap/josm/actions/OpenFileAction.java
index 1cb6f58..a09f5e3 100644
--- a/src/org/openstreetmap/josm/actions/OpenFileAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenFileAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -37,6 +37,7 @@ import org.openstreetmap.josm.io.FileImporter;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
/**
@@ -47,6 +48,9 @@ import org.xml.sax.SAXException;
*/
public class OpenFileAction extends DiskAccessAction {
+ /**
+ * The {@link ExtensionFileFilter} matching .url files
+ */
public static final ExtensionFileFilter urlFileFilter = new ExtensionFileFilter("url", "url", tr("URL Files") + " (*.url)");
/**
@@ -56,9 +60,9 @@ public class OpenFileAction extends DiskAccessAction {
super(tr("Open..."), "open", tr("Open a file."),
Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL));
putValue("help", ht("/Action/Open"));
-
}
+ @Override
public void actionPerformed(ActionEvent e) {
JFileChooser fc = createAndOpenFileChooser(true, true, null);
if (fc == null)
@@ -214,6 +218,7 @@ public class OpenFileAction extends DiskAccessAction {
if (!chosenImporter.acceptFile(f)) {
if (f.isDirectory()) {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
JOptionPane.showMessageDialog(Main.parent, tr(
"<html>Cannot open directory ''{0}''.<br>Please select a file.</html>",
@@ -283,7 +288,7 @@ public class OpenFileAction extends DiskAccessAction {
}
}
}
-
+
for (File urlFile: urlFiles) {
try {
BufferedReader reader = new BufferedReader(new FileReader(urlFile));
@@ -295,9 +300,9 @@ public class OpenFileAction extends DiskAccessAction {
Main.main.menu.openLocation.openUrl(false, url);
}
}
- reader.close();
+ Utils.close(reader);
} catch (Exception e) {
- System.err.println(e.getMessage());
+ Main.error(e);
}
}
@@ -332,6 +337,10 @@ public class OpenFileAction extends DiskAccessAction {
}
}
+ /**
+ * Replies the list of files that have been successfully opened.
+ * @return The list of files that have been successfully opened.
+ */
public List<File> getSuccessfullyOpenedFiles() {
return successfullyOpenedFiles;
}
diff --git a/src/org/openstreetmap/josm/actions/OpenLocationAction.java b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
index 87c364b..c82322f 100644
--- a/src/org/openstreetmap/josm/actions/OpenLocationAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -19,21 +19,24 @@ import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeCompressedTask;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmCompressedTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmCompressedTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmUrlTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadSessionTask;
import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
/**
* Open an URL input dialog and load data from the given URL.
@@ -43,7 +46,7 @@ import org.openstreetmap.josm.tools.Shortcut;
public class OpenLocationAction extends JosmAction {
protected final List<Class<? extends DownloadTask>> downloadTasks;
-
+
/**
* Create an open action. The name is "Open a file".
*/
@@ -59,6 +62,7 @@ public class OpenLocationAction extends JosmAction {
addDownloadTaskClass(DownloadOsmUrlTask.class);
addDownloadTaskClass(DownloadOsmCompressedTask.class);
addDownloadTaskClass(DownloadOsmChangeCompressedTask.class);
+ addDownloadTaskClass(DownloadSessionTask.class);
}
/**
@@ -84,6 +88,7 @@ public class OpenLocationAction extends JosmAction {
Main.pref.putCollection(getClass().getName() + ".uploadAddressHistory", cbHistory.getHistory());
}
+ @Override
public void actionPerformed(ActionEvent e) {
JCheckBox layer = new JCheckBox(tr("Separate Layer"));
@@ -118,9 +123,9 @@ public class OpenLocationAction extends JosmAction {
dialog.showDialog();
if (dialog.getValue() != 1) return;
remindUploadAddressHistory(uploadAddresses);
- openUrl(layer.isSelected(), uploadAddresses.getText());
+ openUrl(layer.isSelected(), Utils.strip(uploadAddresses.getText()));
}
-
+
/**
* Replies the list of download tasks accepting the given url.
* @param url The URL to open
@@ -129,8 +134,7 @@ public class OpenLocationAction extends JosmAction {
*/
public Collection<DownloadTask> findDownloadTasks(final String url) {
List<DownloadTask> result = new ArrayList<DownloadTask>();
- for (int i = 0; i < downloadTasks.size(); i++) {
- Class<? extends DownloadTask> taskClass = downloadTasks.get(i);
+ for (Class<? extends DownloadTask> taskClass : downloadTasks) {
if (taskClass != null) {
try {
DownloadTask task = taskClass.getConstructor().newInstance();
@@ -146,6 +150,27 @@ public class OpenLocationAction extends JosmAction {
}
/**
+ * Summarizes acceptable urls for error message purposes.
+ * @return The HTML message to be displayed
+ * @since 6031
+ */
+ public String findSummaryDocumentation() {
+ StringBuilder result = new StringBuilder("<table>");
+ for (Class<? extends DownloadTask> taskClass : downloadTasks) {
+ if (taskClass != null) {
+ try {
+ DownloadTask task = taskClass.getConstructor().newInstance();
+ result.append(task.acceptsDocumentationSummary());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ result.append("</table>");
+ return result.toString();
+ }
+
+ /**
* Open the given URL.
* @param new_layer true if the URL needs to be opened in a new layer, false otherwise
* @param url The URL to open
@@ -157,21 +182,27 @@ public class OpenLocationAction extends JosmAction {
Future<?> future = null;
if (!tasks.isEmpty()) {
// TODO: handle multiple suitable tasks ?
- future = tasks.iterator().next().loadUrl(new_layer, url, monitor);
+ try {
+ future = tasks.iterator().next().loadUrl(new_layer, url, monitor);
+ } catch (IllegalArgumentException e) {
+ Main.error(e);
+ }
}
if (future != null) {
Main.worker.submit(new PostDownloadHandler(task, future));
} else {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- JOptionPane.showMessageDialog(Main.parent, tr(
- "<html>Cannot open URL ''{0}'' because no suitable download task is available.</html>",
- url), tr("Download Location"), JOptionPane.ERROR_MESSAGE);
- }
- });
+ final String details = findSummaryDocumentation(); // Explain what patterns are supported
+ HelpAwareOptionPane.showMessageDialogInEDT(Main.parent, "<html><p>" + tr(
+ "Cannot open URL ''{0}''<br>The following download tasks accept the URL patterns shown:<br>{1}",
+ url, details) + "</p></html>", tr("Download Location"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Action/OpenLocation"));
}
}
-
+
+ /**
+ * Adds a new download task to the supported ones.
+ * @param taskClass The new download task to add
+ * @return <tt>true</tt> (as specified by {@link Collection#add})
+ */
public boolean addDownloadTaskClass(Class<? extends DownloadTask> taskClass) {
return this.downloadTasks.add(taskClass);
}
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index a755cb7..a8e7385 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -16,6 +16,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.swing.JOptionPane;
@@ -29,6 +30,7 @@ import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Shortcut;
/**
@@ -42,7 +44,7 @@ public final class OrthogonalizeAction extends JosmAction {
"<h3>When one or more ways are selected, the shape is adjusted such, that all angles are 90 or 180 degrees.</h3>"+
"You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes. "+
"(Afterwards, you can undo the movement for certain nodes:<br>"+
- "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)");
+ "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)");
/**
* Constructor
@@ -69,7 +71,7 @@ public final class OrthogonalizeAction extends JosmAction {
/**
* Remember movements, so the user can later undo it for certain nodes
*/
- private static final HashMap<Node, EastNorth> rememberMovements = new HashMap<Node, EastNorth>();
+ private static final Map<Node, EastNorth> rememberMovements = new HashMap<Node, EastNorth>();
/**
* Undo the previous orthogonalization for certain nodes.
@@ -91,6 +93,7 @@ public final class OrthogonalizeAction extends JosmAction {
Shortcut.SHIFT),
true, "action/orthogonalize/undo", true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -106,22 +109,22 @@ public final class OrthogonalizeAction extends JosmAction {
rememberMovements.remove(n);
}
}
- if (commands.size() > 0) {
+ if (!commands.isEmpty()) {
Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize / Undo"), commands));
Main.map.repaint();
} else throw new InvalidUserInputException();
}
catch (InvalidUserInputException ex) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Orthogonalize Shape / Undo\n"+
- "Please select nodes that were moved by the previous Orthogonalize Shape action!"),
- tr("Undo Orthogonalize Shape"),
- JOptionPane.INFORMATION_MESSAGE);
+ new Notification(
+ tr("Orthogonalize Shape / Undo<br>"+
+ "Please select nodes that were moved by the previous Orthogonalize Shape action!"))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
}
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -141,8 +144,8 @@ public final class OrthogonalizeAction extends JosmAction {
return;
}
- final ArrayList<Node> nodeList = new ArrayList<Node>();
- final ArrayList<WayData> wayDataList = new ArrayList<WayData>();
+ final List<Node> nodeList = new ArrayList<Node>();
+ final List<WayData> wayDataList = new ArrayList<WayData>();
final Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
try {
@@ -167,8 +170,8 @@ public final class OrthogonalizeAction extends JosmAction {
commands.addAll(orthogonalize(wayDataList, nodeList));
}
else if (nodeList.isEmpty()) {
- List<ArrayList<WayData>> groups = buildGroups(wayDataList);
- for (ArrayList<WayData> g: groups) {
+ List<List<WayData>> groups = buildGroups(wayDataList);
+ for (List<WayData> g: groups) {
commands.addAll(orthogonalize(g, nodeList));
}
} else
@@ -181,31 +184,27 @@ public final class OrthogonalizeAction extends JosmAction {
throw new InvalidUserInputException("usage");
}
} catch (InvalidUserInputException ex) {
+ String msg;
if (ex.getMessage().equals("usage")) {
- ConditionalOptionPaneUtil.showMessageDialog("orthogonalize_usage",
- Main.parent,
- "<html><h2>" + tr("Usage") + "</h2>" + USAGE + "</html>",
- tr("Orthogonalize Shape"),
- JOptionPane.INFORMATION_MESSAGE);
- }
- else {
- ConditionalOptionPaneUtil.showMessageDialog("orthogonalize_error",
- Main.parent,
- "<html>" + ex.getMessage() + "<br><hr><h2>" + tr("Usage") + "</h2>" + USAGE + "</html>",
- tr("Selected Elements cannot be orthogonalized"),
- JOptionPane.INFORMATION_MESSAGE);
+ msg = "<h2>" + tr("Usage") + "</h2>" + USAGE;
+ } else {
+ msg = ex.getMessage() + "<br><hr><h2>" + tr("Usage") + "</h2>" + USAGE;
}
+ new Notification(msg)
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_VERY_LONG)
+ .show();
}
}
-
+
/**
* Collect groups of ways with common nodes in order to orthogonalize each group separately.
*/
- private static List<ArrayList<WayData>> buildGroups(ArrayList<WayData> wayDataList) {
- List<ArrayList<WayData>> groups = new ArrayList<ArrayList<WayData>>();
+ private static List<List<WayData>> buildGroups(List<WayData> wayDataList) {
+ List<List<WayData>> groups = new ArrayList<List<WayData>>();
Set<WayData> remaining = new HashSet<WayData>(wayDataList);
while (!remaining.isEmpty()) {
- ArrayList<WayData> group = new ArrayList<WayData>();
+ List<WayData> group = new ArrayList<WayData>();
groups.add(group);
Iterator<WayData> it = remaining.iterator();
WayData next = it.next();
@@ -215,7 +214,7 @@ public final class OrthogonalizeAction extends JosmAction {
}
return groups;
}
-
+
private static void extendGroupRec(List<WayData> group, WayData newGroupMember, List<WayData> remaining) {
group.add(newGroupMember);
for (int i = 0; i < remaining.size(); ++i) {
@@ -248,9 +247,7 @@ public final class OrthogonalizeAction extends JosmAction {
* 5. Rotate back.
*
**/
- private static Collection<Command> orthogonalize(ArrayList<WayData> wayDataList, ArrayList<Node> headingNodes)
- throws InvalidUserInputException
- {
+ private static Collection<Command> orthogonalize(List<WayData> wayDataList, List<Node> headingNodes) throws InvalidUserInputException {
// find average heading
double headingAll;
try {
@@ -384,7 +381,6 @@ public final class OrthogonalizeAction extends JosmAction {
// rotate back and log the change
final Collection<Command> commands = new LinkedList<Command>();
- // OrthogonalizeAction.rememberMovements.clear();
for (Node n: allNodes) {
EastNorth tmp = new EastNorth(nX.get(n), nY.get(n));
tmp = EN.rotate_cc(pivot, tmp, headingAll);
@@ -426,7 +422,7 @@ public final class OrthogonalizeAction extends JosmAction {
* direction <code>pInitialDirection</code>.
* Then sum up all horizontal / vertical segments to have a good guess for the
* heading of the entire way.
- * @throws InvalidUserInputException
+ * @throws InvalidUserInputException
*/
public void calcDirections(Direction pInitialDirection) throws InvalidUserInputException {
final EastNorth[] en = new EastNorth[nNode]; // alias: way.getNodes().get(i).getEastNorth() ---> en[i]
@@ -449,9 +445,7 @@ public final class OrthogonalizeAction extends JosmAction {
// sum up segments
EastNorth h = new EastNorth(0.,0.);
- //double lh = EN.abs(h);
EastNorth v = new EastNorth(0.,0.);
- //double lv = EN.abs(v);
for (int i = 0; i < nSeg; ++i) {
EastNorth segment = EN.diff(en[i+1], en[i]);
if (segDirections[i] == Direction.RIGHT) {
diff --git a/src/org/openstreetmap/josm/actions/OsmPrimitiveAction.java b/src/org/openstreetmap/josm/actions/OsmPrimitiveAction.java
new file mode 100644
index 0000000..515c893
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/OsmPrimitiveAction.java
@@ -0,0 +1,21 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import java.util.Collection;
+
+import javax.swing.Action;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Interface used to enable/disable all primitive-related actions, even those registered by plugins.
+ * @since 5821
+ */
+public interface OsmPrimitiveAction extends Action {
+
+ /**
+ * Specifies the working set of primitives.
+ * @param primitives The new working set of primitives. Can be null or empty
+ */
+ public abstract void setPrimitives(Collection<? extends OsmPrimitive> primitives);
+}
diff --git a/src/org/openstreetmap/josm/actions/ParameterizedAction.java b/src/org/openstreetmap/josm/actions/ParameterizedAction.java
index 5592461..051abc6 100644
--- a/src/org/openstreetmap/josm/actions/ParameterizedAction.java
+++ b/src/org/openstreetmap/josm/actions/ParameterizedAction.java
@@ -5,8 +5,6 @@ import java.awt.event.ActionEvent;
import java.util.List;
import java.util.Map;
-import javax.swing.Action;
-
public interface ParameterizedAction extends AdaptableAction {
List<ActionParameter<?>> getActionParameters();
diff --git a/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java b/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java
index 28ef4dc..cea4350 100644
--- a/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java
+++ b/src/org/openstreetmap/josm/actions/ParameterizedActionDecorator.java
@@ -18,24 +18,31 @@ public class ParameterizedActionDecorator implements Action {
this.parameters = new HashMap<String, Object>(parameters);
}
+ @Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
action.addPropertyChangeListener(listener);
}
+ @Override
public Object getValue(String key) {
return action.getValue(key);
}
+ @Override
public boolean isEnabled() {
return action.isEnabled();
}
+ @Override
public void putValue(String key, Object value) {
action.putValue(key, value);
}
+ @Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
action.removePropertyChangeListener(listener);
}
+ @Override
public void setEnabled(boolean b) {
action.setEnabled(b);
}
+ @Override
public void actionPerformed(ActionEvent e) {
action.actionPerformed(e, parameters);
}
diff --git a/src/org/openstreetmap/josm/actions/PasteAction.java b/src/org/openstreetmap/josm/actions/PasteAction.java
index 4588b1d..9b6e8df 100644
--- a/src/org/openstreetmap/josm/actions/PasteAction.java
+++ b/src/org/openstreetmap/josm/actions/PasteAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
// Author: David Earl
package org.openstreetmap.josm.actions;
@@ -21,30 +21,47 @@ import org.openstreetmap.josm.data.osm.NodeData;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
+import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
import org.openstreetmap.josm.data.osm.RelationData;
import org.openstreetmap.josm.data.osm.RelationMemberData;
import org.openstreetmap.josm.data.osm.WayData;
-import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Paste OSM primitives from clipboard to the current edit layer.
+ * @since 404
+ */
public final class PasteAction extends JosmAction implements PasteBufferChangedListener {
+ /**
+ * Constructs a new {@code PasteAction}.
+ */
public PasteAction() {
super(tr("Paste"), "paste", tr("Paste contents of paste buffer."),
Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.CTRL), true);
putValue("help", ht("/Action/Paste"));
+ // CUA shortcut for paste (http://en.wikipedia.org/wiki/IBM_Common_User_Access#Description)
+ Main.registerActionShortcut(this,
+ Shortcut.registerShortcut("system:paste:cua", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_INSERT, Shortcut.SHIFT));
Main.pasteBuffer.addPasteBufferChangedListener(this);
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
pasteData(Main.pasteBuffer, Main.pasteSource, e);
}
- public void pasteData(PrimitiveDeepCopy pasteBuffer, Layer source, ActionEvent e) {
+ /**
+ * Paste OSM primitives from the given paste buffer and OSM data layer source to the current edit layer.
+ * @param pasteBuffer The paste buffer containing primitive ids to copy
+ * @param source The OSM data layer used to look for primitive ids
+ * @param e The ActionEvent that triggered this operation
+ */
+ public void pasteData(PrimitiveDeepCopy pasteBuffer, Layer source, ActionEvent e) {
/* Find the middle of the pasteBuffer area */
double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
boolean incomplete = false;
@@ -72,7 +89,10 @@ public final class PasteAction extends JosmAction implements PasteBufferChangedL
// default to paste in center of map (pasted via menu or cursor not in MapView)
EastNorth mPosition = Main.map.mapView.getCenter();
- if((e.getModifiers() & ActionEvent.CTRL_MASK) != 0) {
+ // We previously checked for modifier to know if the action has been trigerred via shortcut or via menu
+ // But this does not work if the shortcut is changed to a single key (see #9055)
+ // Observed behaviour: getActionCommand() returns Action.NAME when triggered via menu, but shortcut text when triggered with it
+ if (!getValue(NAME).equals(e.getActionCommand())) {
final Point mp = MouseInfo.getPointerInfo().getLocation();
final Point tl = Main.map.mapView.getLocationOnScreen();
final Point pos = new Point(mp.x-tl.x, mp.y-tl.y);
@@ -86,6 +106,7 @@ public final class PasteAction extends JosmAction implements PasteBufferChangedL
// Make a copy of pasteBuffer and map from old id to copied data id
List<PrimitiveData> bufferCopy = new ArrayList<PrimitiveData>();
+ List<PrimitiveData> toSelect = new ArrayList<PrimitiveData>();
Map<Long, Long> newNodeIds = new HashMap<Long, Long>();
Map<Long, Long> newWayIds = new HashMap<Long, Long>();
Map<Long, Long> newRelationIds = new HashMap<Long, Long>();
@@ -94,7 +115,7 @@ public final class PasteAction extends JosmAction implements PasteBufferChangedL
continue;
}
PrimitiveData copy = data.makeCopy();
- copy.clearOsmId();
+ copy.clearOsmMetadata();
if (data instanceof NodeData) {
newNodeIds.put(data.getUniqueId(), copy.getUniqueId());
} else if (data instanceof WayData) {
@@ -103,13 +124,16 @@ public final class PasteAction extends JosmAction implements PasteBufferChangedL
newRelationIds.put(data.getUniqueId(), copy.getUniqueId());
}
bufferCopy.add(copy);
+ if (pasteBuffer.getDirectlyAdded().contains(data)) {
+ toSelect.add(copy);
+ }
}
// Update references in copied buffer
for (PrimitiveData data:bufferCopy) {
if (data instanceof NodeData) {
NodeData nodeData = (NodeData)data;
- if (Main.map.mapView.getEditLayer() == source) {
+ if (Main.main.getEditLayer() == source) {
nodeData.setEastNorth(nodeData.getEastNorth().add(offsetEast, offsetNorth));
}
} else if (data instanceof WayData) {
@@ -147,7 +171,7 @@ public final class PasteAction extends JosmAction implements PasteBufferChangedL
/* Now execute the commands to add the duplicated contents of the paste buffer to the map */
- Main.main.undoRedo.add(new AddPrimitivesCommand(bufferCopy));
+ Main.main.undoRedo.add(new AddPrimitivesCommand(bufferCopy, toSelect));
Main.map.mapView.repaint();
}
diff --git a/src/org/openstreetmap/josm/actions/PasteTagsAction.java b/src/org/openstreetmap/josm/actions/PasteTagsAction.java
index 5f0a7af..bc6fae1 100644
--- a/src/org/openstreetmap/josm/actions/PasteTagsAction.java
+++ b/src/org/openstreetmap/josm/actions/PasteTagsAction.java
@@ -1,11 +1,10 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
-import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
@@ -13,9 +12,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+import java.util.Map.Entry;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -26,13 +23,9 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.osm.TagCollection;
-import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
import org.openstreetmap.josm.gui.conflict.tags.PasteTagsConflictResolverDialog;
-import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.TextTagParser;
-import org.openstreetmap.josm.tools.UrlLabel;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -45,26 +38,17 @@ import org.openstreetmap.josm.tools.Utils;
*/
public final class PasteTagsAction extends JosmAction {
+ private static final String help = ht("/Action/PasteTags");
+
+ /**
+ * Constructs a new {@code PasteTagsAction}.
+ */
public PasteTagsAction() {
super(tr("Paste Tags"), "pastetags",
tr("Apply tags of contents of paste buffer to all selected items."),
Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")),
KeyEvent.VK_V, Shortcut.CTRL_SHIFT), true);
- putValue("help", ht("/Action/PasteTags"));
- }
-
- private void showBadBufferMessage() {
- String msg = tr("<html><p> Sorry, it is impossible to paste tags from buffer. It does not contain any JOSM object"
- + " or suitable text. </p></html>");
- JPanel p = new JPanel(new GridBagLayout());
- p.add(new JLabel(msg),GBC.eop());
- p.add(new UrlLabel(
- HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic((String)getValue("help")))),
- GBC.eop());
-
- ConditionalOptionPaneUtil.showMessageDialog(
- "paste_badbuffer", Main.parent,
- p, tr("Warning"), JOptionPane.WARNING_MESSAGE);
+ putValue("help", help);
}
public static class TagPaster {
@@ -189,7 +173,7 @@ public final class PasteTagsAction extends JosmAction {
}
/**
- * Replies true if there is at least one primitive of type <code>type</code>
+ * Replies true if there is at least one primitive of type <code>type</code>
* is in the target collection
*
* @param <T>
@@ -261,37 +245,64 @@ public final class PasteTagsAction extends JosmAction {
}
+ @Override
public void actionPerformed(ActionEvent e) {
Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
if (selection.isEmpty())
return;
-
+
String buf = Utils.getClipboardContent();
+ if (buf == null || buf.isEmpty() || buf.matches(CopyAction.CLIPBOARD_REGEXP)) {
+ pasteTagsFromJOSMBuffer(selection);
+ } else {
+ // Paste tags from arbitrary text
+ pasteTagsFromText(selection, buf);
+ }
+ }
- List<Command> commands = new ArrayList<Command>();
- if (buf==null) {
- showBadBufferMessage();
- return;
+ /** Paste tags from arbitrary text, not using JOSM buffer
+ * @return true if action was successful
+ */
+ public static boolean pasteTagsFromText(Collection<OsmPrimitive> selection, String text) {
+ Map<String, String> tags = TextTagParser.readTagsFromText(text);
+ if (tags==null || tags.isEmpty()) {
+ TextTagParser.showBadBufferMessage(help);
+ return false;
}
- if (buf.matches("(\\d+,)*\\d+")) { // Paste tags from JOSM buffer
- PasteTagsAction.TagPaster tagPaster = new PasteTagsAction.TagPaster(Main.pasteBuffer.getDirectlyAdded(), selection);
- for (Tag tag: tagPaster.execute()) {
- commands.add(new ChangePropertyCommand(selection, tag.getKey(), "".equals(tag.getValue())?null:tag.getValue()));
- }
- } else { // Paste tags from arbitrary text
- Map<String, String> tags = TextTagParser.readTagsFromText(buf);
- if (tags==null || tags.isEmpty()) {
- showBadBufferMessage();
- return;
- }
- if (!TextTagParser.validateTags(tags)) return;
- String v;
- for (String key: tags.keySet()) {
- v = tags.get(key);
- commands.add(new ChangePropertyCommand(selection, key, "".equals(v)?null:v));
- }
+ if (!TextTagParser.validateTags(tags)) return false;
+
+ List<Command> commands = new ArrayList<Command>(tags.size());
+ for (Entry<String, String> entry: tags.entrySet()) {
+ String v = entry.getValue();
+ commands.add(new ChangePropertyCommand(selection, entry.getKey(), "".equals(v)?null:v));
}
+ commitCommands(selection, commands);
+ return !commands.isEmpty();
+ }
+
+ /** Paste tags from JOSM buffer
+ * @param selection objects that will have the tags
+ * @return false if JOSM buffer was empty
+ */
+ public static boolean pasteTagsFromJOSMBuffer(Collection<OsmPrimitive> selection) {
+ List<PrimitiveData> directlyAdded = Main.pasteBuffer.getDirectlyAdded();
+ if (directlyAdded==null || directlyAdded.isEmpty()) return false;
+
+ PasteTagsAction.TagPaster tagPaster = new PasteTagsAction.TagPaster(directlyAdded, selection);
+ List<Command> commands = new ArrayList<Command>();
+ for (Tag tag : tagPaster.execute()) {
+ commands.add(new ChangePropertyCommand(selection, tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue()));
+ }
+ commitCommands(selection, commands);
+ return true;
+ }
+
+ /**
+ * Create and execute SequenceCommand with descriptive title
+ * @param commands
+ */
+ private static void commitCommands(Collection<OsmPrimitive> selection, List<Command> commands) {
if (!commands.isEmpty()) {
String title1 = trn("Pasting {0} tag", "Pasting {0} tags", commands.size(), commands.size());
String title2 = trn("to {0} object", "to {0} objects", selection.size(), selection.size());
@@ -301,10 +312,8 @@ public final class PasteTagsAction extends JosmAction {
commands
));
}
-
}
-
@Override
protected void updateEnabledState() {
if (getCurrentDataSet() == null) {
diff --git a/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java b/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java
index ef6eb97..dec48ff 100644
--- a/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import java.awt.event.ActionEvent;
diff --git a/src/org/openstreetmap/josm/actions/PreferencesAction.java b/src/org/openstreetmap/josm/actions/PreferencesAction.java
index 9e06082..08361cd 100644
--- a/src/org/openstreetmap/josm/actions/PreferencesAction.java
+++ b/src/org/openstreetmap/josm/actions/PreferencesAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -9,7 +9,11 @@ import java.awt.event.KeyEvent;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
/**
* Open the Preferences dialog.
@@ -18,6 +22,26 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class PreferencesAction extends JosmAction implements Runnable {
+ private final Class<? extends TabPreferenceSetting> tab;
+ private final Class<? extends SubPreferenceSetting> subTab;
+
+ private PreferencesAction(String name, String tooltip,
+ Class<? extends TabPreferenceSetting> tab, Class<? extends SubPreferenceSetting> subTab) {
+ super(name, "preference", tooltip, null, false, "preference_" + Utils.<Class>firstNonNull(tab, subTab).getName(), false);
+ this.tab = tab;
+ this.subTab = subTab;
+ }
+
+ public static PreferencesAction forPreferenceTab(String name, String tooltip, Class<? extends TabPreferenceSetting> tab) {
+ CheckParameterUtil.ensureParameterNotNull(tab);
+ return new PreferencesAction(name, tooltip, tab, null);
+ }
+
+ public static PreferencesAction forPreferenceSubTab(String name, String tooltip, Class<? extends SubPreferenceSetting> subTab) {
+ CheckParameterUtil.ensureParameterNotNull(subTab);
+ return new PreferencesAction(name, tooltip, null, subTab);
+ }
+
/**
* Create the preference action with "&Preferences" as label.
*/
@@ -25,16 +49,26 @@ public class PreferencesAction extends JosmAction implements Runnable {
super(tr("Preferences..."), "preference", tr("Open a preferences dialog for global settings."),
Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true);
putValue("help", ht("/Action/Preferences"));
+ this.tab = null;
+ this.subTab = null;
}
/**
* Launch the preferences dialog.
*/
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
+ @Override
public void run() {
- new PreferenceDialog(Main.parent).setVisible(true);
+ final PreferenceDialog p = new PreferenceDialog(Main.parent);
+ if (tab != null) {
+ p.selectPreferencesTabByClass(tab);
+ } else if( subTab != null) {
+ p.selectSubPreferencesTabByClass(subTab);
+ }
+ p.setVisible(true);
}
}
diff --git a/src/org/openstreetmap/josm/actions/PurgeAction.java b/src/org/openstreetmap/josm/actions/PurgeAction.java
index 21da547..3903ee3 100644
--- a/src/org/openstreetmap/josm/actions/PurgeAction.java
+++ b/src/org/openstreetmap/josm/actions/PurgeAction.java
@@ -89,7 +89,7 @@ public class PurgeAction extends JosmAction {
return;
Collection<OsmPrimitive> sel = getCurrentDataSet().getAllSelected();
- layer = Main.map.mapView.getEditLayer();
+ layer = Main.main.getEditLayer();
toPurge = new HashSet<OsmPrimitive>(sel);
toPurgeAdditionally = new ArrayList<OsmPrimitive>();
@@ -97,19 +97,23 @@ public class PurgeAction extends JosmAction {
// Add referrer, unless the object to purge is not new
// and the parent is a relation
+ HashSet<OsmPrimitive> toPurgeRecursive = new HashSet<OsmPrimitive>();
while (!toPurge.isEmpty()) {
- OsmPrimitive osm = toPurge.iterator().next();
- for (OsmPrimitive parent: osm.getReferrers()) {
- if (toPurge.contains(parent) || toPurgeChecked.contains(parent)) {
- continue;
- }
- if (parent instanceof Way || (parent instanceof Relation && osm.isNew())) {
- toPurgeAdditionally.add(parent);
- toPurge.add(parent);
+
+ for (OsmPrimitive osm: toPurge) {
+ for (OsmPrimitive parent: osm.getReferrers()) {
+ if (toPurge.contains(parent) || toPurgeChecked.contains(parent) || toPurgeRecursive.contains(parent)) {
+ continue;
+ }
+ if (parent instanceof Way || (parent instanceof Relation && osm.isNew())) {
+ toPurgeAdditionally.add(parent);
+ toPurgeRecursive.add(parent);
+ }
}
+ toPurgeChecked.add(osm);
}
- toPurge.remove(osm);
- toPurgeChecked.add(osm);
+ toPurge = toPurgeRecursive;
+ toPurgeRecursive = new HashSet<OsmPrimitive>();
}
makeIncomplete = new HashSet<OsmPrimitive>();
@@ -204,7 +208,7 @@ public class PurgeAction extends JosmAction {
Main.pref.put("purge.clear_undo_redo", cbClearUndoRedo.isSelected());
- Main.main.undoRedo.add(new PurgeCommand(Main.map.mapView.getEditLayer(), toPurgeChecked, makeIncomplete));
+ Main.main.undoRedo.add(new PurgeCommand(Main.main.getEditLayer(), toPurgeChecked, makeIncomplete));
if (cbClearUndoRedo.isSelected()) {
Main.main.undoRedo.clean();
@@ -232,6 +236,7 @@ public class PurgeAction extends JosmAction {
ImageProvider.get("warning-small"), JLabel.LEFT), GBC.eol().fill(GBC.HORIZONTAL));
Collections.sort(toPurgeAdditionally, new Comparator<OsmPrimitive>() {
+ @Override
public int compare(OsmPrimitive o1, OsmPrimitive o2) {
int type = o2.getType().compareTo(o1.getType());
if (type != 0)
@@ -239,7 +244,7 @@ public class PurgeAction extends JosmAction {
return (Long.valueOf(o1.getUniqueId())).compareTo(o2.getUniqueId());
}
});
- JList list = new JList(toPurgeAdditionally.toArray(new OsmPrimitive[0]));
+ JList list = new JList(toPurgeAdditionally.toArray(new OsmPrimitive[toPurgeAdditionally.size()]));
/* force selection to be active for all entries */
list.setCellRenderer(new OsmPrimitivRenderer() {
@Override
@@ -262,6 +267,7 @@ public class PurgeAction extends JosmAction {
putValue(SMALL_ICON, ImageProvider.get("dialogs","select"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
layer.data.addSelected(toPurgeAdditionally);
}
diff --git a/src/org/openstreetmap/josm/actions/RedoAction.java b/src/org/openstreetmap/josm/actions/RedoAction.java
index bb30dba..b5c9120 100644
--- a/src/org/openstreetmap/josm/actions/RedoAction.java
+++ b/src/org/openstreetmap/josm/actions/RedoAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -28,6 +28,7 @@ public class RedoAction extends JosmAction implements OsmDataLayer.CommandQueueL
putValue("help", ht("/Action/Redo"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (Main.map == null)
return;
diff --git a/src/org/openstreetmap/josm/actions/RenameLayerAction.java b/src/org/openstreetmap/josm/actions/RenameLayerAction.java
index 9bc0f1c..5f10550 100644
--- a/src/org/openstreetmap/josm/actions/RenameLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/RenameLayerAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -13,11 +13,11 @@ import javax.swing.Box;
import javax.swing.JCheckBox;
import javax.swing.JDialog;
import javax.swing.JOptionPane;
-import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* Action to rename an specific layer. Provides the option to rename the
@@ -41,9 +41,10 @@ public class RenameLayerAction extends AbstractAction {
this.putValue("help", ht("/Action/RenameLayer"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Box panel = Box.createVerticalBox();
- final JTextField name = new JTextField(layer.getName());
+ final JosmTextField name = new JosmTextField(layer.getName());
panel.add(name);
JCheckBox filerename = new JCheckBox(tr("Also rename the file"));
if (Main.applet) {
@@ -77,7 +78,7 @@ public class RenameLayerAction extends AbstractAction {
Main.pref.put("layer.rename-file", filerename.isSelected());
if (filerename.isSelected()) {
String newname = nameText;
- if (newname.indexOf("/") == -1 && newname.indexOf("\\") == -1) {
+ if (newname.indexOf('/') == -1 && newname.indexOf('\\') == -1) {
newname = file.getParent() + File.separator + newname;
}
String oldname = file.getName();
diff --git a/src/org/openstreetmap/josm/actions/RestartAction.java b/src/org/openstreetmap/josm/actions/RestartAction.java
new file mode 100644
index 0000000..5b5a9c2
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/RestartAction.java
@@ -0,0 +1,176 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.io.File;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.PlatformHookWindows;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+ * Restarts JOSM as it was launched. Comes from "restart" plugin, originally written by Upliner.
+ * <br/><br/>
+ * Mechanisms have been improved based on #8561 discussions and <a href="http://lewisleo.blogspot.jp/2012/08/programmatically-restart-java.html">this article</a>.
+ * @since 5857
+ */
+public class RestartAction extends JosmAction {
+
+ /**
+ * Constructs a new {@code RestartAction}.
+ */
+ public RestartAction() {
+ super(tr("Restart"), "restart", tr("Restart the application."),
+ Shortcut.registerShortcut("file:restart", tr("File: {0}", tr("Restart")), KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT), false);
+ putValue("help", ht("/Action/Restart"));
+ putValue("toolbar", "action/restart");
+ Main.toolbar.register(this);
+ setEnabled(isRestartSupported());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ // If JOSM has been started with property 'josm.restart=true' this means
+ // it is executed by a start script that can handle restart.
+ // Request for restart is indicated by exit code 9.
+ String scriptRestart = System.getProperty("josm.restart");
+ if ("true".equals(scriptRestart)) {
+ Main.exitJosm(true, 9);
+ }
+
+ try {
+ restartJOSM();
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ /**
+ * Determines if restarting the application should be possible on this platform.
+ * @return {@code true} if the mandatory system property {@code sun.java.command} is defined, {@code false} otherwise.
+ * @since 5951
+ */
+ public static boolean isRestartSupported() {
+ return System.getProperty("sun.java.command") != null;
+ }
+
+ /**
+ * Restarts the current Java application
+ * @throws IOException
+ */
+ public static void restartJOSM() throws IOException {
+ if (isRestartSupported() && !Main.exitJosm(false, 0)) return;
+ try {
+ // java binary
+ final String java = System.getProperty("java.home") + File.separator + "bin" + File.separator +
+ (Main.platform instanceof PlatformHookWindows ? "java.exe" : "java");
+ if (!new File(java).isFile()) {
+ throw new IOException("Unable to find suitable java runtime at "+java);
+ }
+ final List<String> cmd = new ArrayList<String>(Collections.singleton(java));
+ // vm arguments
+ for (String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
+ // if it's the agent argument : we ignore it otherwise the
+ // address of the old application and the new one will be in conflict
+ if (!arg.contains("-agentlib")) {
+ cmd.add(arg);
+ }
+ }
+ // program main and program arguments (be careful a sun property. might not be supported by all JVM)
+ String[] mainCommand = System.getProperty("sun.java.command").split(" ");
+ // look for a .jar in all chunks to support paths with spaces (fix #9077)
+ String jarPath = mainCommand[0];
+ for (int i = 1; i < mainCommand.length && !jarPath.endsWith(".jar"); i++) {
+ jarPath += " " + mainCommand[i];
+ }
+ // program main is a jar
+ if (jarPath.endsWith(".jar")) {
+ // if it's a jar, add -jar mainJar
+ cmd.add("-jar");
+ cmd.add(new File(jarPath).getPath());
+ } else {
+ // else it's a .class, add the classpath and mainClass
+ cmd.add("-cp");
+ cmd.add("\"" + System.getProperty("java.class.path") + "\"");
+ cmd.add(mainCommand[0]);
+ }
+ // if it's webstart add JNLP file
+ String jnlp = System.getProperty("jnlp.application.href");
+ if (jnlp != null) {
+ cmd.add(jnlp);
+ }
+ // finally add program arguments
+ cmd.addAll(Arrays.asList(Main.commandLineArgs));
+ Main.info("Restart "+cmd);
+ // execute the command in a shutdown hook, to be sure that all the
+ // resources have been disposed before restarting the application
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
+ public void run() {
+ try {
+ Runtime.getRuntime().exec(cmd.toArray(new String[cmd.size()]));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ // exit
+ System.exit(0);
+ } catch (Exception e) {
+ // something went wrong
+ throw new IOException("Error while trying to restart the application", e);
+ }
+ }
+
+ /**
+ * Returns a new {@code ButtonSpec} instance that performs this action.
+ * @return A new {@code ButtonSpec} instance that performs this action.
+ */
+ public static ButtonSpec getRestartButtonSpec() {
+ return new ButtonSpec(
+ tr("Restart"),
+ ImageProvider.get("restart"),
+ tr("Restart the application."),
+ ht("/Action/Restart"),
+ isRestartSupported()
+ );
+ }
+
+ /**
+ * Returns a new {@code ButtonSpec} instance that do not perform this action.
+ * @return A new {@code ButtonSpec} instance that do not perform this action.
+ */
+ public static ButtonSpec getCancelButtonSpec() {
+ return new ButtonSpec(
+ tr("Cancel"),
+ ImageProvider.get("cancel"),
+ tr("Click to restart later."),
+ null /* no specific help context */
+ );
+ }
+
+ /**
+ * Returns default {@code ButtonSpec} instances for this action (Restart/Cancel).
+ * @return Default {@code ButtonSpec} instances for this action.
+ * @see #getRestartButtonSpec
+ * @see #getCancelButtonSpec
+ */
+ public static ButtonSpec[] getButtonSpecs() {
+ return new ButtonSpec[] {
+ getRestartButtonSpec(),
+ getCancelButtonSpec()
+ };
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/ReverseWayAction.java b/src/org/openstreetmap/josm/actions/ReverseWayAction.java
index aa97822..c5b5123 100644
--- a/src/org/openstreetmap/josm/actions/ReverseWayAction.java
+++ b/src/org/openstreetmap/josm/actions/ReverseWayAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -24,6 +24,7 @@ import org.openstreetmap.josm.corrector.UserCancelException;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
@@ -70,6 +71,7 @@ public final class ReverseWayAction extends JosmAction {
putValue("help", ht("/Action/ReverseWays"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (! isEnabled())
return;
@@ -78,12 +80,11 @@ public final class ReverseWayAction extends JosmAction {
final Collection<Way> sel = getCurrentDataSet().getSelectedWays();
if (sel.isEmpty()) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Please select at least one way."),
- tr("Information"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ new Notification(
+ tr("Please select at least one way."))
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .show();
return;
}
diff --git a/src/org/openstreetmap/josm/actions/SaveAction.java b/src/org/openstreetmap/josm/actions/SaveAction.java
index 844d208..010bd2b 100644
--- a/src/org/openstreetmap/josm/actions/SaveAction.java
+++ b/src/org/openstreetmap/josm/actions/SaveAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -18,12 +18,11 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author imi
*/
-public class SaveAction extends SaveActionBase {
+public final class SaveAction extends SaveActionBase {
private static SaveAction instance = new SaveAction();
/**
* Construct the action with "Save" as label.
- * @param layer Save this layer.
*/
private SaveAction() {
super(tr("Save"), "save", tr("Save the current data."),
diff --git a/src/org/openstreetmap/josm/actions/SaveActionBase.java b/src/org/openstreetmap/josm/actions/SaveActionBase.java
index eb3c335..296a13d 100644
--- a/src/org/openstreetmap/josm/actions/SaveActionBase.java
+++ b/src/org/openstreetmap/josm/actions/SaveActionBase.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -117,7 +117,7 @@ public abstract class SaveActionBase extends DiskAccessAction {
/**
* Creates a new "Save" dialog for a single {@link ExtensionFileFilter} and makes it visible.<br/>
* When the user has chosen a file, checks the file extension, and confirms overwrite if needed.
- *
+ *
* @param title The dialog title
* @param filter The dialog file filter
* @return The output {@code File}
@@ -132,7 +132,7 @@ public abstract class SaveActionBase extends DiskAccessAction {
/**
* Creates a new "Save" dialog for a given file extension and makes it visible.<br/>
* When the user has chosen a file, checks the file extension, and confirms overwrite if needed.
- *
+ *
* @param title The dialog title
* @param extension The file extension
* @return The output {@code File}
@@ -142,14 +142,22 @@ public abstract class SaveActionBase extends DiskAccessAction {
JFileChooser fc = createAndOpenFileChooser(false, false, title, extension);
return checkFileAndConfirmOverWrite(fc, extension);
}
-
+
private static File checkFileAndConfirmOverWrite(JFileChooser fc, String extension) {
if (fc == null) return null;
File file = fc.getSelectedFile();
- String fn = file.getPath();
- if (fn.indexOf('.') == -1)
- {
- FileFilter ff = fc.getFileFilter();
+
+ FileFilter ff = fc.getFileFilter();
+ if (!ff.accept(file)) {
+ // Extension of another filefilter given ?
+ for (FileFilter cff : fc.getChoosableFileFilters()) {
+ if (cff.accept(file)) {
+ fc.setFileFilter(cff);
+ return file;
+ }
+ }
+ // No filefilter accepts current filename, add default extension
+ String fn = file.getPath();
if (ff instanceof ExtensionFileFilter) {
fn += "." + ((ExtensionFileFilter)ff).getDefaultExtension();
} else if (extension != null) {
diff --git a/src/org/openstreetmap/josm/actions/SaveAsAction.java b/src/org/openstreetmap/josm/actions/SaveAsAction.java
index 8a9fc4a..3a4838f 100644
--- a/src/org/openstreetmap/josm/actions/SaveAsAction.java
+++ b/src/org/openstreetmap/josm/actions/SaveAsAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17,7 +17,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class SaveAsAction extends SaveActionBase {
private static SaveAsAction instance = new SaveAsAction();
-
+
/**
* Construct the action with "Save" as label.
*/
@@ -27,7 +27,7 @@ public class SaveAsAction extends SaveActionBase {
KeyEvent.VK_S, Shortcut.CTRL_SHIFT));
putValue("help", ht("/Action/SaveAs"));
}
-
+
public static SaveAsAction getInstance() {
return instance;
}
diff --git a/src/org/openstreetmap/josm/actions/SelectAllAction.java b/src/org/openstreetmap/josm/actions/SelectAllAction.java
index 8d296da..9237799 100644
--- a/src/org/openstreetmap/josm/actions/SelectAllAction.java
+++ b/src/org/openstreetmap/josm/actions/SelectAllAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17,6 +17,7 @@ public class SelectAllAction extends JosmAction {
putValue("help", ht("/Action/SelectAll"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
diff --git a/src/org/openstreetmap/josm/actions/SessionLoadAction.java b/src/org/openstreetmap/josm/actions/SessionLoadAction.java
index 1e21b84..611996e 100644
--- a/src/org/openstreetmap/josm/actions/SessionLoadAction.java
+++ b/src/org/openstreetmap/josm/actions/SessionLoadAction.java
@@ -6,7 +6,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
import java.util.Arrays;
import java.util.List;
@@ -15,50 +18,91 @@ import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.NavigatableComponent.ViewportData;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.session.SessionImporter;
import org.openstreetmap.josm.io.session.SessionReader;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
+/**
+ * Loads a JOSM session
+ * @since 4668
+ */
public class SessionLoadAction extends DiskAccessAction {
-
+
+ /**
+ * Constructs a new {@code SessionLoadAction}.
+ */
public SessionLoadAction() {
super(tr("Load Session"), "open", tr("Load a session from file."), null, true, "load-session", true);
putValue("help", ht("/Action/SessionLoad"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
- ExtensionFileFilter ff = new ExtensionFileFilter("jos,joz", "jos", tr("Session file (*.jos, *.joz)"));
- JFileChooser fc = createAndOpenFileChooser(true, false, tr("Open session"), Arrays.asList(ff, FileFilterAllFiles.getInstance()), ff, JFileChooser.FILES_ONLY, "lastDirectory");
+ JFileChooser fc = createAndOpenFileChooser(true, false, tr("Open session"),
+ Arrays.asList(SessionImporter.FILE_FILTER, FileFilterAllFiles.getInstance()),
+ SessionImporter.FILE_FILTER, JFileChooser.FILES_ONLY, "lastDirectory");
if (fc == null) return;
File file = fc.getSelectedFile();
boolean zip = file.getName().toLowerCase().endsWith(".joz");
Main.worker.submit(new Loader(file, zip));
}
+ /**
+ * JOSM session loader
+ */
public static class Loader extends PleaseWaitRunnable {
private boolean canceled;
private File file;
- private boolean zip;
+ private final URI uri;
+ private final InputStream is;
+ private final boolean zip;
private List<Layer> layers;
+ private Layer active;
private List<Runnable> postLoadTasks;
private ViewportData viewport;
+ /**
+ * Constructs a new {@code Loader} for local session file.
+ * @param file The JOSM session file
+ * @param zip {@code true} if the file is a session archive file (*.joz)
+ */
public Loader(File file, boolean zip) {
super(tr("Loading session ''{0}''", file.getName()));
+ CheckParameterUtil.ensureParameterNotNull(file, "file");
this.file = file;
+ this.uri = null;
+ this.is = null;
+ this.zip = zip;
+ }
+
+ /**
+ * Constructs a new {@code Loader} for session file input stream (may be a remote file).
+ * @param is The input stream to session file
+ * @param uri The file URI
+ * @param zip {@code true} if the file is a session archive file (*.joz)
+ * @since 6245
+ */
+ public Loader(InputStream is, URI uri, boolean zip) {
+ super(tr("Loading session ''{0}''", uri));
+ CheckParameterUtil.ensureParameterNotNull(is, "is");
+ CheckParameterUtil.ensureParameterNotNull(uri, "uri");
+ this.file = null;
+ this.uri = uri;
+ this.is = is;
this.zip = zip;
}
@Override
- protected void cancel() {
+ public void cancel() {
Thread.dumpStack();
canceled = true;
}
@@ -79,6 +123,9 @@ public class SessionLoadAction extends DiskAccessAction {
if (canceled) return;
Main.main.addLayer(l);
}
+ if (active != null) {
+ Main.map.mapView.setActiveLayer(active);
+ }
if (noMap) {
Main.map.setVisible(true);
}
@@ -99,15 +146,37 @@ public class SessionLoadAction extends DiskAccessAction {
try {
ProgressMonitor monitor = getProgressMonitor();
SessionReader reader = new SessionReader();
- reader.loadSession(file, zip, monitor);
- layers = reader.getLayers();
- postLoadTasks = reader.getPostLoadTasks();
- viewport = reader.getViewport();
+ boolean tempFile = false;
+ try {
+ if (file == null) {
+ // Download and write entire joz file as a temp file on disk as we need random access later
+ file = File.createTempFile("session_", ".joz", Utils.getJosmTempDir());
+ tempFile = true;
+ FileOutputStream out = new FileOutputStream(file);
+ try {
+ Utils.copyStream(is, out);
+ } finally {
+ Utils.close(out);
+ }
+ }
+ reader.loadSession(file, zip, monitor);
+ layers = reader.getLayers();
+ active = reader.getActive();
+ postLoadTasks = reader.getPostLoadTasks();
+ viewport = reader.getViewport();
+ } finally {
+ if (tempFile) {
+ if (!file.delete()) {
+ file.deleteOnExit();
+ }
+ file = null;
+ }
+ }
} catch (IllegalDataException e) {
e.printStackTrace();
HelpAwareOptionPane.showMessageDialogInEDT(
Main.parent,
- tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>", file.getName(), e.getMessage()),
+ tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>", uri != null ? uri : file.getName(), e.getMessage()),
tr("Data Error"),
JOptionPane.ERROR_MESSAGE,
null
@@ -117,7 +186,7 @@ public class SessionLoadAction extends DiskAccessAction {
e.printStackTrace();
HelpAwareOptionPane.showMessageDialogInEDT(
Main.parent,
- tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>", file.getName(), e.getMessage()),
+ tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>", uri != null ? uri : file.getName(), e.getMessage()),
tr("IO Error"),
JOptionPane.ERROR_MESSAGE,
null
diff --git a/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java b/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
index 929c3f1..aee8d73 100644
--- a/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
+++ b/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
@@ -41,14 +41,19 @@ import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.WindowGeometry;
+/**
+ * Saves a JOSM session
+ * @since 4685
+ */
public class SessionSaveAsAction extends DiskAccessAction {
private List<Layer> layers;
private Map<Layer, SessionLayerExporter> exporters;
private MultiMap<Layer, Layer> dependencies;
- private boolean zipRequired;
-
+ /**
+ * Constructs a new {@code SessionSaveAsAction}.
+ */
public SessionSaveAsAction() {
super(tr("Save Session As..."), "save_as", tr("Save the current session to a new file."), null, true, "save_as-session", true);
putValue("help", ht("/Action/SessionSaveAs"));
@@ -64,7 +69,7 @@ public class SessionSaveAsAction extends DiskAccessAction {
dlg.showDialog();
if (dlg.getValue() != 1) return;
- zipRequired = false;
+ boolean zipRequired = false;
for (Layer l : layers) {
SessionLayerExporter ex = exporters.get(l);
if (ex != null && ex.requiresZip()) {
@@ -72,7 +77,7 @@ public class SessionSaveAsAction extends DiskAccessAction {
break;
}
}
-
+
FileFilter joz = new ExtensionFileFilter("joz", "joz", tr("Session file (archive) (*.joz)"));
FileFilter jos = new ExtensionFileFilter("jos", "jos", tr("Session file (*.jos)"));
@@ -117,8 +122,14 @@ public class SessionSaveAsAction extends DiskAccessAction {
// TODO: resolve dependencies for layers excluded by the user
layersOut.add(layer);
}
+
+ int active = -1;
+ Layer activeLayer = Main.map.mapView.getActiveLayer();
+ if (activeLayer != null) {
+ active = layersOut.indexOf(activeLayer);
+ }
- SessionWriter sw = new SessionWriter(layersOut, exporters, dependencies, zip);
+ SessionWriter sw = new SessionWriter(layersOut, active, exporters, dependencies, zip);
try {
sw.write(file);
} catch (IOException ex) {
@@ -133,8 +144,14 @@ public class SessionSaveAsAction extends DiskAccessAction {
}
}
+ /**
+ * The "Save Session" dialog
+ */
public class SessionSaveAsDialog extends ExtendedDialog {
+ /**
+ * Constructs a new {@code SessionSaveAsDialog}.
+ */
public SessionSaveAsDialog() {
super(Main.parent, tr("Save Session"), new String[] {tr("Save As"), tr("Cancel")});
initialize();
@@ -145,6 +162,9 @@ public class SessionSaveAsAction extends DiskAccessAction {
setContent(build(), false);
}
+ /**
+ * Initializes action.
+ */
public void initialize() {
layers = new ArrayList<Layer>(Main.map.mapView.getAllLayersAsList());
exporters = new HashMap<Layer, SessionLayerExporter>();
@@ -184,7 +204,7 @@ public class SessionSaveAsAction extends DiskAccessAction {
}
}
- public Component build() {
+ protected Component build() {
JPanel p = new JPanel(new GridBagLayout());
JPanel ip = new JPanel(new GridBagLayout());
for (Layer layer : layers) {
@@ -224,4 +244,8 @@ public class SessionSaveAsAction extends DiskAccessAction {
}
}
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(Main.isDisplayingMapView());
+ }
}
diff --git a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
index 89aa38b..874ce54 100644
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -7,13 +7,17 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.lang.management.ManagementFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
+import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences.Setting;
@@ -21,11 +25,15 @@ import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.PlatformHookUnixoid;
+import org.openstreetmap.josm.tools.PlatformHookWindows;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
-
/**
* @author xeen
*
@@ -33,6 +41,10 @@ import org.openstreetmap.josm.tools.Utils;
* Also includes preferences with stripped username and password
*/
public final class ShowStatusReportAction extends JosmAction {
+
+ /**
+ * Constructs a new {@code ShowStatusReportAction}
+ */
public ShowStatusReportAction() {
super(
tr("Show Status Report"),
@@ -46,6 +58,16 @@ public final class ShowStatusReportAction extends JosmAction {
Main.toolbar.register(this);
}
+ private static void shortenParam(ListIterator<String> it, String[] param, String source, String target) {
+ if (source != null && target.length() < source.length() && param[1].startsWith(source)) {
+ it.set(param[0] + "=" + param[1].replace(source, target));
+ }
+ }
+
+ /**
+ * Replies the report header (software and system info)
+ * @return The report header (software and system info)
+ */
public static String getReportHeader()
{
StringBuilder text = new StringBuilder();
@@ -63,15 +85,55 @@ public final class ShowStatusReportAction extends JosmAction {
text.append("\n");
text.append("Java version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + ", " + System.getProperty("java.vm.name"));
text.append("\n");
- text.append("Operating system: "+ System.getProperty("os.name"));
- text.append("\n");
- DataSet dataset = Main.main.getCurrentDataSet();
- if (dataset != null) {
- String result = DatasetConsistencyTest.runTests(dataset);
- if (result.length() == 0) {
- text.append("Dataset consistency test: No problems found\n");
- } else {
- text.append("\nDataset consistency test:\n"+result+"\n");
+ if (Main.platform.getClass() == PlatformHookUnixoid.class) {
+ String packageDetails = ((PlatformHookUnixoid) Main.platform).getJavaPackageDetails();
+ if (packageDetails != null) {
+ text.append("Java package: ");
+ text.append(packageDetails);
+ text.append("\n");
+ }
+ }
+ try {
+ final String env_java_home = System.getenv("JAVA_HOME");
+ final String env_java_home_alt = Main.platform instanceof PlatformHookWindows ? "%JAVA_HOME%" : "${JAVA_HOME}";
+ final String prop_java_home = System.getProperty("java.home");
+ final String prop_java_home_alt = "<java.home>";
+ // Build a new list of VM parameters to modify it below if needed (default implementation returns an UnmodifiableList instance)
+ List<String> vmArguments = new ArrayList<String>(ManagementFactory.getRuntimeMXBean().getInputArguments());
+ for (ListIterator<String> it = vmArguments.listIterator(); it.hasNext(); ) {
+ String value = it.next();
+ if (value.contains("=")) {
+ String[] param = value.split("=");
+ // Hide some parameters for privacy concerns
+ if (param[0].toLowerCase().startsWith("-dproxy")) {
+ it.set(param[0]+"=xxx");
+ // Shorten some parameters for readability concerns
+ } else {
+ shortenParam(it, param, env_java_home, env_java_home_alt);
+ shortenParam(it, param, prop_java_home, prop_java_home_alt);
+ }
+ }
+ }
+ if (!vmArguments.isEmpty()) {
+ text.append("VM arguments: "+ vmArguments.toString().replace("\\\\", "\\"));
+ text.append("\n");
+ }
+ } catch (SecurityException e) {
+ // Ignore exception
+ }
+ if (Main.commandLineArgs.length > 0) {
+ text.append("Program arguments: "+ Arrays.toString(Main.commandLineArgs));
+ text.append("\n");
+ }
+ if (Main.main != null) {
+ DataSet dataset = Main.main.getCurrentDataSet();
+ if (dataset != null) {
+ String result = DatasetConsistencyTest.runTests(dataset);
+ if (result.length() == 0) {
+ text.append("Dataset consistency test: No problems found\n");
+ } else {
+ text.append("\nDataset consistency test:\n"+result+"\n");
+ }
}
}
text.append("\n");
@@ -81,9 +143,11 @@ public final class ShowStatusReportAction extends JosmAction {
return text.toString();
}
+ @Override
public void actionPerformed(ActionEvent e) {
StringBuilder text = new StringBuilder();
- text.append(getReportHeader());
+ String reportHeader = getReportHeader();
+ text.append(reportHeader);
try {
Map<String, Setting> settings = Main.pref.getAllSettings();
settings.remove("osm-server.username");
@@ -103,7 +167,7 @@ public final class ShowStatusReportAction extends JosmAction {
x.printStackTrace();
}
- JTextArea ta = new JTextArea(text.toString());
+ JosmTextArea ta = new JosmTextArea(text.toString());
ta.setWrapStyleWord(true);
ta.setLineWrap(true);
ta.setEditable(false);
@@ -111,13 +175,16 @@ public final class ShowStatusReportAction extends JosmAction {
ExtendedDialog ed = new ExtendedDialog(Main.parent,
tr("Status Report"),
- new String[] {tr("Copy to clipboard and close"), tr("Close") });
- ed.setButtonIcons(new String[] {"copy.png", "cancel.png" });
+ new String[] {tr("Copy to clipboard and close"), tr("Report bug"), tr("Close") });
+ ed.setButtonIcons(new String[] {"copy.png", "bug.png", "cancel.png" });
ed.setContent(sp, false);
- ed.setMinimumSize(new Dimension(500, 0));
- ed.showDialog();
+ ed.setMinimumSize(new Dimension(380, 200));
+ ed.setPreferredSize(new Dimension(700, Main.parent.getHeight()-50));
- if(ed.getValue() != 1) return;
- Utils.copyToClipboard(text.toString());
+ switch (ed.showDialog().getValue()) {
+ case 1: Utils.copyToClipboard(text.toString()); break;
+ case 2: OpenBrowser.displayUrl(BugReportExceptionHandler.getBugReportUrl(
+ Utils.strip(reportHeader)).toExternalForm()) ; break;
+ }
}
}
diff --git a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
index beb60f3..3a7dea9 100644
--- a/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -27,11 +27,20 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Delete unnecessary nodes from a way
+ * @since 2575
+ */
public class SimplifyWayAction extends JosmAction {
+
+ /**
+ * Constructs a new {@code SimplifyWayAction}.
+ */
public SimplifyWayAction() {
super(tr("Simplify Way"), "simplify", tr("Delete unnecessary nodes from a way."), Shortcut.registerShortcut("tools:simplify", tr("Tool: {0}", tr("Simplify Way")),
KeyEvent.VK_Y, Shortcut.SHIFT), true);
@@ -39,18 +48,16 @@ public class SimplifyWayAction extends JosmAction {
}
protected boolean confirmWayWithNodesOutsideBoundingBox(List<? extends OsmPrimitive> primitives) {
- System.out.println(primitives);
- return DeleteCommand.checkAndConfirmOutlyingDelete(Main.map.mapView.getEditLayer(), primitives, null);
+ return DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getEditLayer(), primitives, null);
}
protected void alertSelectAtLeastOneWay() {
- HelpAwareOptionPane.showOptionDialog(
- Main.parent,
- tr("Please select at least one way to simplify."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE,
- HelpUtil.ht("/Action/SimplifyWay#SelectAWayToSimplify")
- );
+ new Notification(
+ tr("Please select at least one way to simplify."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .setDuration(Notification.TIME_SHORT)
+ .setHelpTopic(HelpUtil.ht("/Action/SimplifyWay#SelectAWayToSimplify"))
+ .show();
}
protected boolean confirmSimplifyManyWays(int numWays) {
@@ -84,6 +91,7 @@ public class SimplifyWayAction extends JosmAction {
return ret == 0;
}
+ @Override
public void actionPerformed(ActionEvent e) {
DataSet ds = getCurrentDataSet();
ds.beginUpdate();
@@ -102,7 +110,7 @@ public class SimplifyWayAction extends JosmAction {
Collection<Command> allCommands = new LinkedList<Command>();
for (Way way: ways) {
- SequenceCommand simplifyCommand = simplifyWay(way, ds);
+ SequenceCommand simplifyCommand = simplifyWay(way);
if (simplifyCommand == null) {
continue;
}
@@ -144,19 +152,30 @@ public class SimplifyWayAction extends JosmAction {
}
/**
- * Simplifies a way
+ * Simplifies a way with default threshold (read from preferences).
+ *
+ * @param w the way to simplify
+ * @return The sequence of commands to run
+ * @since 6411
+ */
+ public final SequenceCommand simplifyWay(Way w) {
+ return simplifyWay(w, Main.pref.getDouble("simplify-way.max-error", 3.0));
+ }
+
+ /**
+ * Simplifies a way with a given threshold.
*
* @param w the way to simplify
+ * @return The sequence of commands to run
+ * @since 6411
*/
- public SequenceCommand simplifyWay(Way w, DataSet ds) {
- double threshold = Double.parseDouble(Main.pref.get("simplify-way.max-error", "3"));
+ public SequenceCommand simplifyWay(Way w, double threshold) {
int lower = 0;
int i = 0;
List<Node> newNodes = new ArrayList<Node>(w.getNodesCount());
while(i < w.getNodesCount()){
if (isRequiredNode(w,w.getNode(i))) {
- // copy a required node to the list of new nodes. Simplify not
- // possible
+ // copy a required node to the list of new nodes. Simplify not possible
newNodes.add(w.getNode(i));
i++;
lower++;
@@ -184,7 +203,7 @@ public class SimplifyWayAction extends JosmAction {
newWay.setNodes(newNodes);
cmds.add(new ChangeCommand(w, newWay));
cmds.add(new DeleteCommand(delNodes));
- ds.clearSelection(delNodes);
+ w.getDataSet().clearSelection(delNodes);
return new SequenceCommand(trn("Simplify Way (remove {0} node)", "Simplify Way (remove {0} nodes)", delNodes.size(), delNodes.size()), cmds);
}
@@ -220,7 +239,6 @@ public class SimplifyWayAction extends JosmAction {
if (imax != -1 && xtemax >= threshold) {
// Segment cannot be simplified - try shorter segments
buildSimplifiedNodeList(wnew, from, imax,threshold,simplifiedNodes);
- //simplifiedNodes.add(wnew.get(imax));
buildSimplifiedNodeList(wnew, imax, to, threshold,simplifiedNodes);
} else {
// Simplify segment
diff --git a/src/org/openstreetmap/josm/actions/SplitWayAction.java b/src/org/openstreetmap/josm/actions/SplitWayAction.java
index a2fbd86..6044531 100644
--- a/src/org/openstreetmap/josm/actions/SplitWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SplitWayAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -31,6 +31,7 @@ import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Shortcut;
@@ -116,6 +117,7 @@ public class SplitWayAction extends JosmAction {
* This method performs an expensive check whether the selection clearly defines one
* of the split actions outlined above, and if yes, calls the splitWay method.
*/
+ @Override
public void actionPerformed(ActionEvent e) {
Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
@@ -126,17 +128,16 @@ public class SplitWayAction extends JosmAction {
List<Way> applicableWays = getApplicableWays(selectedWays, selectedNodes);
if (applicableWays == null) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("The current selection cannot be used for splitting - no node is selected."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ new Notification(
+ tr("The current selection cannot be used for splitting - no node is selected."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
return;
} else if (applicableWays.isEmpty()) {
- JOptionPane.showMessageDialog(Main.parent,
- tr("The selected nodes do not share the same way."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ new Notification(
+ tr("The selected nodes do not share the same way."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
return;
}
@@ -155,20 +156,20 @@ public class SplitWayAction extends JosmAction {
}
if (applicableWays.isEmpty()) {
- JOptionPane.showMessageDialog(Main.parent,
+ new Notification(
trn("The selected node is not in the middle of any way.",
- "The selected nodes are not in the middle of any way.",
- selectedNodes.size()),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ "The selected nodes are not in the middle of any way.",
+ selectedNodes.size()))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
return;
} else if (applicableWays.size() > 1) {
- JOptionPane.showMessageDialog(Main.parent,
+ new Notification(
trn("There is more than one way using the node you selected. Please select the way also.",
- "There is more than one way using the nodes you selected. Please select the way also.",
- selectedNodes.size()),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ "There is more than one way using the nodes you selected. Please select the way also.",
+ selectedNodes.size()))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
return;
}
@@ -288,11 +289,10 @@ public class SplitWayAction extends JosmAction {
&& wayChunks.get(0).get(0) == lastWayChunk.get(lastWayChunk.size() - 1)
&& !nodeSet.contains(wayChunks.get(0).get(0))) {
if (wayChunks.size() == 2) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("You must select two or more nodes to split a circular way."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ new Notification(
+ tr("You must select two or more nodes to split a circular way."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
return null;
}
lastWayChunk.remove(lastWayChunk.size() - 1);
@@ -303,17 +303,15 @@ public class SplitWayAction extends JosmAction {
if (wayChunks.size() < 2) {
if (wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size() - 1)) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("You must select two or more nodes to split a circular way."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ new Notification(
+ tr("You must select two or more nodes to split a circular way."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
} else {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)"),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ new Notification(
+ tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)"))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
}
return null;
}
@@ -493,17 +491,15 @@ public class SplitWayAction extends JosmAction {
}
}
if (warnmerole) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("<html>A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ new Notification(
+ tr("A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
} else if (warnme) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("<html>A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE);
+ new Notification(
+ tr("A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary."))
+ .setIcon(JOptionPane.WARNING_MESSAGE)
+ .show();
}
return new SplitWayResult(
diff --git a/src/org/openstreetmap/josm/actions/ToggleAction.java b/src/org/openstreetmap/josm/actions/ToggleAction.java
new file mode 100644
index 0000000..cdf38b2
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/ToggleAction.java
@@ -0,0 +1,132 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JCheckBox;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JRadioButton;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JToggleButton;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+ * Abtract class for Toggle Actions.
+ * @since 6220
+ */
+public abstract class ToggleAction extends JosmAction {
+
+ private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
+
+ /**
+ * Constructs a {@code ToggleAction}.
+ *
+ * @param name the action's text as displayed on the menu (if it is added to a menu)
+ * @param icon the icon to use
+ * @param tooltip a longer description of the action that will be displayed in the tooltip. Please note
+ * that html is not supported for menu actions on some platforms.
+ * @param shortcut a ready-created shortcut object or null if you don't want a shortcut. But you always
+ * do want a shortcut, remember you can always register it with group=none, so you
+ * won't be assigned a shortcut unless the user configures one. If you pass null here,
+ * the user CANNOT configure a shortcut for your action.
+ * @param registerInToolbar register this action for the toolbar preferences?
+ * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
+ * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
+ */
+ public ToggleAction(String name, Icon icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
+ super(name, icon, tooltip, shortcut, registerInToolbar, toolbarId, installAdapters);
+ // It is required to set the SELECTED_KEY to a non-null value in order to let Swing components update it
+ setSelected(false);
+ }
+
+ /**
+ * Constructs a {@code ToggleAction}.
+ *
+ * @param name the action's text as displayed on the menu (if it is added to a menu)
+ * @param iconName the name of icon to use
+ * @param tooltip a longer description of the action that will be displayed in the tooltip. Please note
+ * that html is not supported for menu actions on some platforms.
+ * @param shortcut a ready-created shortcut object or null if you don't want a shortcut. But you always
+ * do want a shortcut, remember you can always register it with group=none, so you
+ * won't be assigned a shortcut unless the user configures one. If you pass null here,
+ * the user CANNOT configure a shortcut for your action.
+ * @param registerInToolbar register this action for the toolbar preferences?
+ */
+ public ToggleAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) {
+ super(name, iconName, tooltip, shortcut, registerInToolbar);
+ // It is required to set the SELECTED_KEY to a non-null value in order to let Swing components update it
+ setSelected(false);
+ }
+
+ protected final void setSelected(boolean selected) {
+ putValue(SELECTED_KEY, selected);
+ }
+
+ /**
+ * Determines if this action is currently being selected.
+ * @return {@code true} if this action is currently being selected, {@code false} otherwise
+ */
+ public final boolean isSelected() {
+ Object selected = getValue(SELECTED_KEY);
+ if (selected instanceof Boolean) {
+ return (Boolean) selected;
+ } else {
+ Main.warn(getClass().getName()+" does not define a boolean for SELECTED_KEY but "+selected+". You should report it to JOSM developers.");
+ return false;
+ }
+ }
+
+ /**
+ * Adds a button model
+ * @param model The button model to add
+ */
+ public final void addButtonModel(ButtonModel model) {
+ if (model != null && !buttonModels.contains(model)) {
+ buttonModels.add(model);
+ model.setSelected(isSelected());
+ }
+ }
+
+ /**
+ * Removes a button model
+ * @param model The button model to remove
+ */
+ public final void removeButtonModel(ButtonModel model) {
+ if (model != null && buttonModels.contains(model)) {
+ buttonModels.remove(model);
+ }
+ }
+
+ protected void notifySelectedState() {
+ boolean selected = isSelected();
+ for (ButtonModel model: buttonModels) {
+ if (model.isSelected() != selected) {
+ model.setSelected(selected);
+ }
+ }
+ }
+
+ /**
+ * Toggles the selcted action state, if needed according to the ActionEvent that trigerred the action.
+ * This method will do nothing if the action event comes from a Swing component supporting the SELECTED_KEY property because the component already set the selected state.
+ * This method needs to be called especially if the action is associated with a keyboard shortcut to ensure correct selected state.
+ * @see <a href="https://weblogs.java.net/blog/zixle/archive/2005/11/changes_to_acti.html">Changes to Actions in 1.6</a>
+ * @see <a href="http://docs.oracle.com/javase/6/docs/api/javax/swing/Action.html">Interface Action</a>
+ */
+ protected final void toggleSelectedState(ActionEvent e) {
+ if (e == null || !(e.getSource() instanceof JToggleButton ||
+ e.getSource() instanceof JCheckBox ||
+ e.getSource() instanceof JRadioButton ||
+ e.getSource() instanceof JCheckBoxMenuItem ||
+ e.getSource() instanceof JRadioButtonMenuItem
+ )) {
+ setSelected(!isSelected());
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java b/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java
index a09167f..e115c49 100644
--- a/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java
+++ b/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -18,6 +18,7 @@ public class ToggleGPXLinesAction extends JosmAction {
putValue("help", ht("/Action/ToggleGPXLines"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Main.pref.put("draw.rawgps.lines", !Main.pref.getBoolean("draw.rawgps.lines", true));
if (Main.isDisplayingMapView()) {
diff --git a/src/org/openstreetmap/josm/actions/UnGlueAction.java b/src/org/openstreetmap/josm/actions/UnGlueAction.java
index beefa7e..9647533 100644
--- a/src/org/openstreetmap/josm/actions/UnGlueAction.java
+++ b/src/org/openstreetmap/josm/actions/UnGlueAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.tools.Shortcut;
/**
@@ -40,7 +41,6 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* If a single node is selected, it will copy that node and remove all tags from the old one
*/
-
public class UnGlueAction extends JosmAction {
private Node selectedNode;
@@ -67,6 +67,7 @@ public class UnGlueAction extends JosmAction {
Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
String errMsg = null;
+ int errorTime = Notification.TIME_DEFAULT;
if (checkSelection(selection)) {
if (!checkAndConfirmOutlyingUnglue()) {
return;
@@ -84,6 +85,7 @@ public class UnGlueAction extends JosmAction {
if (checkForUnglueNode(selection)) {
unglueNode(e);
} else {
+ errorTime = Notification.TIME_SHORT;
errMsg = tr("This node is not glued to anything else.");
}
} else {
@@ -119,6 +121,7 @@ public class UnGlueAction extends JosmAction {
unglueWays2();
}
} else {
+ errorTime = Notification.TIME_VERY_LONG;
errMsg =
tr("The current selection cannot be used for unglueing.")+"\n"+
"\n"+
@@ -135,11 +138,11 @@ public class UnGlueAction extends JosmAction {
}
if(errMsg != null) {
- JOptionPane.showMessageDialog(
- Main.parent,
- errMsg,
- tr("Error"),
- JOptionPane.ERROR_MESSAGE);
+ new Notification(
+ errMsg)
+ .setIcon(JOptionPane.ERROR_MESSAGE)
+ .setDuration(errorTime)
+ .show();
}
selectedNode = null;
@@ -148,8 +151,8 @@ public class UnGlueAction extends JosmAction {
}
/**
- * Assumes there is one tagged Node stored in selectedNode that it will try to unglue
- * (= copy node and remove all tags from the old one. Relations will not be removed)
+ * Assumes there is one tagged Node stored in selectedNode that it will try to unglue.
+ * (i.e. copy node and remove all tags from the old one. Relations will not be removed)
*/
private void unglueNode(ActionEvent e) {
LinkedList<Command> cmds = new LinkedList<Command>();
@@ -182,8 +185,8 @@ public class UnGlueAction extends JosmAction {
* not make sense. Due to the call order in actionPerformed, this is only called when the
* node is only part of one or less ways.
*
- * @param The selection to check against
- * @return Selection is suitable
+ * @param selection The selection to check against
+ * @return {@code true} if selection is suitable
*/
private boolean checkForUnglueNode(Collection<? extends OsmPrimitive> selection) {
if (selection.size() != 1)
@@ -293,7 +296,7 @@ public class UnGlueAction extends JosmAction {
newNodes.add(newNode);
cmds.add(new AddCommand(newNode));
- ArrayList<Node> nn = new ArrayList<Node>();
+ List<Node> nn = new ArrayList<Node>();
for (Node pushNode : w.getNodes()) {
if (originalNode == pushNode) {
pushNode = newNode;
@@ -364,7 +367,7 @@ public class UnGlueAction extends JosmAction {
}
}
if (wayWithSelectedNode == null) {
- wayWithSelectedNode = parentWays.removeFirst();
+ parentWays.removeFirst();
}
for (Way w : parentWays) {
cmds.add(new ChangeCommand(w, modifyWay(selectedNode, w, cmds, newNodes)));
diff --git a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
new file mode 100644
index 0000000..419b30f
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
@@ -0,0 +1,138 @@
+//License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.RemoveNodesCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.Shortcut;
+
+public class UnJoinNodeWayAction extends JosmAction {
+ public UnJoinNodeWayAction() {
+ super(tr("Disconnect Node from Way"), "unjoinnodeway",
+ tr("Disconnect nodes from a way they currently belong to"),
+ Shortcut.registerShortcut("tools:unjoinnodeway",
+ tr("Tool: {0}", tr("Disconnect Node from Way")), KeyEvent.VK_J, Shortcut.ALT), true);
+ putValue("help", ht("/Action/UnJoinNodeWay"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+
+ Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+
+ List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
+ List<Way> selectedWays = OsmPrimitive.getFilteredList(selection, Way.class);
+ List<Way> applicableWays = getApplicableWays(selectedWays, selectedNodes);
+
+ if (applicableWays == null) {
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ tr("Select at least one node to be disconnected."),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE);
+ return;
+ } else if (applicableWays.isEmpty()) {
+ JOptionPane.showMessageDialog(Main.parent,
+ trn("Selected node cannot be disconnected from anything.",
+ "Selected nodes cannot be disconnected from anything.",
+ selectedNodes.size()),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE);
+ return;
+ } else if (applicableWays.size() > 1) {
+ JOptionPane.showMessageDialog(Main.parent,
+ trn("There is more than one way using the node you selected. Please select the way also.",
+ "There is more than one way using the nodes you selected. Please select the way also.",
+ selectedNodes.size()),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE);
+ return;
+ } else if (applicableWays.get(0).getRealNodesCount() < selectedNodes.size() + 2) {
+ // there is only one affected way, but removing the selected nodes would only leave it
+ // with less than 2 nodes
+ JOptionPane.showMessageDialog(Main.parent,
+ trn("The affected way would disappear after disconnecting the selected node.",
+ "The affected way would disappear after disconnecting the selected nodes.",
+ selectedNodes.size()),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+
+
+ // Finally, applicableWays contains only one perfect way
+ Way selectedWay = applicableWays.get(0);
+
+ // I'm sure there's a better way to handle this
+ Main.main.undoRedo.add(new RemoveNodesCommand(selectedWay, selectedNodes));
+ Main.map.repaint();
+ }
+
+ // Find ways to which the disconnect can be applied. This is the list of ways with more
+ // than two nodes which pass through all the given nodes, intersected with the selected ways (if any)
+ private List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+ if (selectedNodes.isEmpty())
+ return null;
+
+ // List of ways shared by all nodes
+ List<Way> result = new ArrayList<Way>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(), Way.class));
+ for (int i=1; i<selectedNodes.size(); i++) {
+ List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
+ for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+ if (!ref.contains(it.next())) {
+ it.remove();
+ }
+ }
+ }
+
+ // Remove broken ways
+ for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+ if (it.next().getNodesCount() <= 2) {
+ it.remove();
+ }
+ }
+
+ if (selectedWays.isEmpty())
+ return result;
+ else {
+ // Return only selected ways
+ for (Iterator<Way> it = result.iterator(); it.hasNext(); ) {
+ if (!selectedWays.contains(it.next())) {
+ it.remove();
+ }
+ }
+ return result;
+ }
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ if (getCurrentDataSet() == null) {
+ setEnabled(false);
+ } else {
+ updateEnabledState(getCurrentDataSet().getSelected());
+ }
+ }
+
+ @Override
+ protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+ setEnabled(selection != null && !selection.isEmpty());
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/UndoAction.java b/src/org/openstreetmap/josm/actions/UndoAction.java
index 3c8a682..cf5ca3c 100644
--- a/src/org/openstreetmap/josm/actions/UndoAction.java
+++ b/src/org/openstreetmap/josm/actions/UndoAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -28,6 +28,7 @@ public class UndoAction extends JosmAction implements OsmDataLayer.CommandQueueL
putValue("help", ht("/Action/Undo"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (Main.map == null)
return;
diff --git a/src/org/openstreetmap/josm/actions/UnselectAllAction.java b/src/org/openstreetmap/josm/actions/UnselectAllAction.java
index 65e3758..50a3a7a 100644
--- a/src/org/openstreetmap/josm/actions/UnselectAllAction.java
+++ b/src/org/openstreetmap/josm/actions/UnselectAllAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -7,7 +7,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Shortcut;
public class UnselectAllAction extends JosmAction {
@@ -20,6 +19,7 @@ public class UnselectAllAction extends JosmAction {
putValue("help", ht("/Action/UnselectAll"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
diff --git a/src/org/openstreetmap/josm/actions/UpdateDataAction.java b/src/org/openstreetmap/josm/actions/UpdateDataAction.java
index 1795af3..d19ce0e 100644
--- a/src/org/openstreetmap/josm/actions/UpdateDataAction.java
+++ b/src/org/openstreetmap/josm/actions/UpdateDataAction.java
@@ -12,7 +12,7 @@ import java.util.List;
import java.util.concurrent.Future;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTaskList;
import org.openstreetmap.josm.data.osm.DataSource;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
@@ -43,6 +43,7 @@ public class UpdateDataAction extends JosmAction{
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (! isEnabled())
return;
@@ -82,14 +83,15 @@ public class UpdateDataAction extends JosmAction{
// no bounds defined in the dataset? we update all primitives in the data set
// using a series of multi fetch requests
//
- new UpdateSelectionAction().updatePrimitives(getEditLayer().data.allPrimitives());
+ UpdateSelectionAction.updatePrimitives(getEditLayer().data.allPrimitives());
} else {
// bounds defined? => use the bbox downloader
//
final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
- final Future<?> future = new DownloadOsmTaskList().download(false /* no new layer */, areasToDownload, monitor);
+ final Future<?> future = new DownloadTaskList().download(false /* no new layer */, areasToDownload, true, false, monitor);
Main.worker.submit(
new Runnable() {
+ @Override
public void run() {
try {
future.get();
diff --git a/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java b/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
index c55d682..c7327ef 100644
--- a/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
@@ -34,12 +34,12 @@ public class UpdateSelectionAction extends JosmAction {
*
* @param id the primitive id
*/
- public void handlePrimitiveGoneException(long id, OsmPrimitiveType type) {
+ public static void handlePrimitiveGoneException(long id, OsmPrimitiveType type) {
MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
reader.append(getCurrentDataSet(),id, type);
try {
DataSet ds = reader.parseOsm(NullProgressMonitor.INSTANCE);
- Main.map.mapView.getEditLayer().mergeFrom(ds);
+ Main.main.getEditLayer().mergeFrom(ds);
} catch(Exception e) {
ExceptionDialogUtil.explainException(e);
}
@@ -52,7 +52,7 @@ public class UpdateSelectionAction extends JosmAction {
* @param selection a collection of {@link OsmPrimitive}s to update
*
*/
- public void updatePrimitives(final Collection<OsmPrimitive> selection) {
+ public static void updatePrimitives(final Collection<OsmPrimitive> selection) {
UpdatePrimitivesTask task = new UpdatePrimitivesTask(Main.main.getEditLayer(),selection);
Main.worker.submit(task);
}
@@ -68,7 +68,7 @@ public class UpdateSelectionAction extends JosmAction {
* @exception IllegalStateException thrown if there is no current dataset
*
*/
- public void updatePrimitive(PrimitiveId id) throws IllegalStateException, IllegalArgumentException{
+ public static void updatePrimitive(PrimitiveId id) throws IllegalStateException, IllegalArgumentException{
ensureParameterNotNull(id, "id");
if (getEditLayer() == null)
throw new IllegalStateException(tr("No current dataset found"));
@@ -113,11 +113,12 @@ public class UpdateSelectionAction extends JosmAction {
/**
* action handler
*/
+ @Override
public void actionPerformed(ActionEvent e) {
if (! isEnabled())
return;
Collection<OsmPrimitive> toUpdate =getData();
- if (toUpdate.size() == 0) {
+ if (toUpdate.isEmpty()) {
JOptionPane.showMessageDialog(
Main.parent,
tr("There are no selected objects to update."),
diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index 3ab5fb8..42540d2 100644
--- a/src/org/openstreetmap/josm/actions/UploadAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.LinkedList;
+import java.util.List;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
@@ -50,8 +51,8 @@ public class UploadAction extends JosmAction{
* dialog is the last thing shown before upload really starts; on occasion
* however, a plugin might also want to insert something after that.
*/
- private static final LinkedList<UploadHook> uploadHooks = new LinkedList<UploadHook>();
- private static final LinkedList<UploadHook> lateUploadHooks = new LinkedList<UploadHook>();
+ private static final List<UploadHook> uploadHooks = new LinkedList<UploadHook>();
+ private static final List<UploadHook> lateUploadHooks = new LinkedList<UploadHook>();
static {
/**
* Calls validator before upload.
@@ -154,7 +155,7 @@ public class UploadAction extends JosmAction{
HelpUtil.ht("/Action/Upload#PrimitivesParticipateInConflicts")
);
}
-
+
/**
* returns true if the user wants to cancel, false if they
* want to continue
@@ -227,6 +228,7 @@ public class UploadAction extends JosmAction{
// after these events.
// TODO: find better way to initialize the comment field
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
dialog.setDefaultChangesetTags(layer.data.getChangeSetTags());
}
@@ -252,6 +254,7 @@ public class UploadAction extends JosmAction{
);
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -265,6 +268,6 @@ public class UploadAction extends JosmAction{
return;
}
APIDataSet apiData = new APIDataSet(Main.main.getCurrentDataSet());
- uploadData(Main.map.mapView.getEditLayer(), apiData);
+ uploadData(Main.main.getEditLayer(), apiData);
}
}
diff --git a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
index 21cee81..680c2f0 100644
--- a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -86,6 +86,7 @@ public class UploadSelectionAction extends JosmAction{
return ret;
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -189,6 +190,7 @@ public class UploadSelectionAction extends JosmAction{
hull = new HashSet<OsmPrimitive>();
}
+ @Override
public void visit(Node n) {
if (n.isNewOrUndeleted() || n.isModified() || n.isDeleted()) {
// upload new nodes as well as modified and deleted ones
@@ -196,6 +198,7 @@ public class UploadSelectionAction extends JosmAction{
}
}
+ @Override
public void visit(Way w) {
if (w.isNewOrUndeleted() || w.isModified() || w.isDeleted()) {
// upload new ways as well as modified and deleted ones
@@ -203,11 +206,12 @@ public class UploadSelectionAction extends JosmAction{
for (Node n: w.getNodes()) {
// we upload modified nodes even if they aren't in the current
// selection.
- n.visit(this);
+ n.accept(this);
}
}
}
+ @Override
public void visit(Relation r) {
if (r.isNewOrUndeleted() || r.isModified() || r.isDeleted()) {
hull.add(r);
@@ -217,12 +221,13 @@ public class UploadSelectionAction extends JosmAction{
// so wont check here for deleted primitives here
//
if (p.isNewOrUndeleted()) {
- p.visit(this);
+ p.accept(this);
}
}
}
}
+ @Override
public void visit(Changeset cs) {
// do nothing
}
@@ -239,7 +244,7 @@ public class UploadSelectionAction extends JosmAction{
CheckParameterUtil.ensureParameterNotNull(base, "base");
hull = new HashSet<OsmPrimitive>();
for (OsmPrimitive p: base) {
- p.visit(this);
+ p.accept(this);
}
return hull;
}
@@ -282,6 +287,7 @@ public class UploadSelectionAction extends JosmAction{
return;
}
Runnable r = new Runnable() {
+ @Override
public void run() {
processPostParentChecker(layer, toUpload);
}
@@ -293,7 +299,7 @@ public class UploadSelectionAction extends JosmAction{
* Replies the collection of deleted OSM primitives for which we have to check whether
* there are dangling references on the server.
*
- * @return
+ * @return primitives to check
*/
protected Set<OsmPrimitive> getPrimitivesToCheckForParents() {
HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
diff --git a/src/org/openstreetmap/josm/actions/ValidateAction.java b/src/org/openstreetmap/josm/actions/ValidateAction.java
index ad32d88..89f9c12 100644
--- a/src/org/openstreetmap/josm/actions/ValidateAction.java
+++ b/src/org/openstreetmap/josm/actions/ValidateAction.java
@@ -48,6 +48,7 @@ public class ValidateAction extends JosmAction {
KeyEvent.VK_V, Shortcut.SHIFT), true);
}
+ @Override
public void actionPerformed(ActionEvent ev) {
doValidate(ev, true);
}
diff --git a/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java b/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
index c850f79..b1ae65b 100644
--- a/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java
@@ -6,63 +6,41 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.ButtonModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Shortcut;
-public class ViewportFollowToggleAction extends JosmAction {
- private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
- private boolean selected;
+/**
+ * This action toggles automatic moving of the map view to last placed node
+ * @since 3837
+ */
+public class ViewportFollowToggleAction extends ToggleAction {
+
+ /**
+ * Constructs a new {@code ViewportFollowToggleAction}.
+ */
public ViewportFollowToggleAction() {
- super(
- tr("Viewport Following"),
- "viewport-follow",
- tr("Enable/disable automatic moving of the map view to last placed node"),
- Shortcut.registerShortcut("menu:view:viewportfollow", tr("Toggle Viewport Following"),
- KeyEvent.VK_F, Shortcut.CTRL_SHIFT),
- true /* register shortcut */
+ super(tr("Viewport Following"),
+ "viewport-follow",
+ tr("Enable/disable automatic moving of the map view to last placed node"),
+ Shortcut.registerShortcut("menu:view:viewportfollow", tr("Toggle Viewport Following"),
+ KeyEvent.VK_F, Shortcut.CTRL_SHIFT),
+ true /* register shortcut */
);
putValue("help", ht("/Action/ViewportFollowing"));
- selected = false;
+ setSelected(false);
notifySelectedState();
}
- public void addButtonModel(ButtonModel model) {
- if (model != null && !buttonModels.contains(model)) {
- buttonModels.add(model);
- model.setSelected(selected);
- }
- }
-
- public void removeButtonModel(ButtonModel model) {
- if (model != null && buttonModels.contains(model)) {
- buttonModels.remove(model);
- }
- }
-
- protected void notifySelectedState() {
- for (ButtonModel model: buttonModels) {
- if (model.isSelected() != selected) {
- model.setSelected(selected);
- }
- }
- }
-
- protected void toggleSelectedState() {
- selected = !selected;
- Main.map.mapView.viewportFollowing = selected;
- notifySelectedState();
- }
+ @Override
public void actionPerformed(ActionEvent e) {
- toggleSelectedState();
+ toggleSelectedState(e);
+ Main.map.mapView.viewportFollowing = isSelected();
+ notifySelectedState();
}
@Override
protected void updateEnabledState() {
- setEnabled(Main.isDisplayingMapView() && Main.main.getEditLayer() != null);
+ setEnabled(Main.main.hasEditLayer());
}
}
diff --git a/src/org/openstreetmap/josm/actions/WireframeToggleAction.java b/src/org/openstreetmap/josm/actions/WireframeToggleAction.java
index 2358227..15d5ebf 100644
--- a/src/org/openstreetmap/josm/actions/WireframeToggleAction.java
+++ b/src/org/openstreetmap/josm/actions/WireframeToggleAction.java
@@ -5,10 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.ButtonModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
@@ -16,71 +12,45 @@ import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.data.osm.visitor.paint.WireframeMapRenderer;
import org.openstreetmap.josm.tools.Shortcut;
-public class WireframeToggleAction extends JosmAction {
- private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
- //FIXME: replace with property Action.SELECTED_KEY when migrating to
- // Java 6
- private boolean selected;
+/**
+ * This class toggles the wireframe rendering mode.
+ * @since 2530
+ */
+public class WireframeToggleAction extends ToggleAction {
+
+ /**
+ * Constructs a new {@code WireframeToggleAction}.
+ */
public WireframeToggleAction() {
- super(
- tr("Wireframe View"),
- null, /* no icon */
- tr("Enable/disable rendering the map as wireframe only"),
- Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"),KeyEvent.VK_W, Shortcut.CTRL),
- false /* register toolbar */
+ super(tr("Wireframe View"),
+ null, /* no icon */
+ tr("Enable/disable rendering the map as wireframe only"),
+ Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"),KeyEvent.VK_W, Shortcut.CTRL),
+ false /* register toolbar */
);
- putValue("toolbar", "wireframe");
+ putValue("toolbar", "wireframe");
Main.toolbar.register(this);
- selected = MapRendererFactory.getInstance().isWireframeMapRendererActive();
+ setSelected(MapRendererFactory.getInstance().isWireframeMapRendererActive());
notifySelectedState();
}
- public void addButtonModel(ButtonModel model) {
- if (model != null && !buttonModels.contains(model)) {
- buttonModels.add(model);
- model.setSelected(selected);
- }
+ @Override
+ protected void updateEnabledState() {
+ setEnabled(Main.main.hasEditLayer());
}
- public void removeButtonModel(ButtonModel model) {
- if (model != null && buttonModels.contains(model)) {
- buttonModels.remove(model);
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ toggleSelectedState(e);
+ if (isSelected()) {
+ MapRendererFactory.getInstance().activate(WireframeMapRenderer.class);
+ } else {
+ MapRendererFactory.getInstance().activate(StyledMapRenderer.class);
}
- }
- protected void notifySelectedState() {
- for (ButtonModel model: buttonModels) {
- if (model.isSelected() != selected) {
- model.setSelected(selected);
- }
- }
- }
-
- protected void toggleSelectedState() {
- selected = !selected;
- //Main.pref.put("draw.wireframe", selected);
- if (selected){
- MapRendererFactory.getInstance().activate(WireframeMapRenderer.class);
- } else {
- MapRendererFactory.getInstance().activate(StyledMapRenderer.class);
- }
-
notifySelectedState();
if (Main.isDisplayingMapView()) {
Main.map.mapView.repaint();
}
}
-
- public void actionPerformed(ActionEvent e) {
- toggleSelectedState();
- }
-
- @Override
- protected void updateEnabledState() {
- setEnabled(Main.isDisplayingMapView() && Main.main.getEditLayer() != null);
- }
-
- public boolean isSelected() {
- return selected;
- }
}
diff --git a/src/org/openstreetmap/josm/actions/ZoomInAction.java b/src/org/openstreetmap/josm/actions/ZoomInAction.java
index 771c119..2dca9d7 100644
--- a/src/org/openstreetmap/josm/actions/ZoomInAction.java
+++ b/src/org/openstreetmap/josm/actions/ZoomInAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -7,28 +7,39 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import javax.swing.KeyStroke;
-
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Zoom in map.
+ * @since 770
+ */
public final class ZoomInAction extends JosmAction {
+ /**
+ * Constructs a new {@code ZoomInAction}.
+ */
public ZoomInAction() {
super(
tr("Zoom In"),
"dialogs/zoomin",
tr("Zoom In"),
+ // Although it might be possible on few custom keyboards, the vast majority of layouts do not have a direct '+' key, see below
Shortcut.registerShortcut("view:zoomin", tr("View: {0}", tr("Zoom In")),KeyEvent.VK_PLUS, Shortcut.DIRECT),
true
);
putValue("help", ht("/Action/ZoomIn"));
+ // On standard QWERTY, AZERTY and other common layouts the '+' key is obtained with Shift+EQUALS
+ Main.registerActionShortcut(this,
+ Shortcut.registerShortcut("view:zoominbis", tr("View: {0}", tr("Zoom In")),
+ KeyEvent.VK_EQUALS, Shortcut.SHIFT));
// make numpad + behave like +
Main.registerActionShortcut(this,
Shortcut.registerShortcut("view:zoominkeypad", tr("View: {0}", tr("Zoom In (Keypad)")),
KeyEvent.VK_ADD, Shortcut.DIRECT));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!Main.isDisplayingMapView()) return;
Main.map.mapView.zoomToFactor(1/Math.sqrt(2));
diff --git a/src/org/openstreetmap/josm/actions/ZoomOutAction.java b/src/org/openstreetmap/josm/actions/ZoomOutAction.java
index 2e91ff2..33f4a84 100644
--- a/src/org/openstreetmap/josm/actions/ZoomOutAction.java
+++ b/src/org/openstreetmap/josm/actions/ZoomOutAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -7,13 +7,18 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import javax.swing.KeyStroke;
-
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Zoom out map.
+ * @since 770
+ */
public final class ZoomOutAction extends JosmAction {
+ /**
+ * Constructs a new {@code ZoomOutAction}.
+ */
public ZoomOutAction() {
super(tr("Zoom Out"), "dialogs/zoomout", tr("Zoom Out"),
Shortcut.registerShortcut("view:zoomout", tr("View: {0}", tr("Zoom Out")), KeyEvent.VK_MINUS, Shortcut.DIRECT), true);
@@ -24,6 +29,7 @@ public final class ZoomOutAction extends JosmAction {
KeyEvent.VK_SUBTRACT, Shortcut.DIRECT));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!Main.isDisplayingMapView()) return;
Main.map.mapView.zoomToFactor(Math.sqrt(2));
diff --git a/src/org/openstreetmap/josm/actions/ZoomToAction.java b/src/org/openstreetmap/josm/actions/ZoomToAction.java
index 3018d99..5dc5366 100644
--- a/src/org/openstreetmap/josm/actions/ZoomToAction.java
+++ b/src/org/openstreetmap/josm/actions/ZoomToAction.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -59,10 +60,11 @@ public class ZoomToAction extends AbstractAction implements LayerChangeListener,
tr("Zooming disabled because there is no selected node"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (! isEnabled())
return;
- int rows[] = this.table.getSelectedRows();
+ int[] rows = this.table.getSelectedRows();
if (rows == null || rows.length == 0)
return;
int row = rows[0];
@@ -89,18 +91,22 @@ public class ZoomToAction extends AbstractAction implements LayerChangeListener,
putValue(SHORT_DESCRIPTION, descriptionNominal);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
updateEnabledState();
}
+ @Override
public void layerAdded(Layer newLayer) {
updateEnabledState();
}
+ @Override
public void layerRemoved(Layer oldLayer) {
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java b/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java
index d79b22c..7cd1cce 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -14,19 +14,27 @@ import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.tools.AudioPlayer;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Jump the audio backward 10 seconds and start playing if paused.
+ * @since 547
+ */
public class AudioBackAction extends JosmAction {
+ /**
+ * Constructs a new {@code AudioBackAction}.
+ */
public AudioBackAction() {
super(trc("audio", "Back"), "audio-back", trc("audio", "Jump back."),
Shortcut.registerShortcut("audio:back", tr("Audio: {0}", trc("audio", "Back")), KeyEvent.VK_F6, Shortcut.DIRECT), true);
this.putValue("help", ht("/Action/AudioBack"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
try {
if (AudioPlayer.playing() || AudioPlayer.paused())
AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position()
- - Main.pref.getDouble("audio.forwardbackamount","10.0"));
+ - Main.pref.getDouble("audio.forwardbackamount", 10.0));
else
MarkerLayer.playAudio();
} catch (Exception ex) {
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java b/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java
index 3e58b13..f11648a 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import java.awt.event.ActionEvent;
@@ -8,17 +8,31 @@ import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.tools.AudioPlayer;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Abstract superclass of {@link AudioFasterAction} and {@link AudioSlowerAction}.
+ * @since 563
+ */
abstract public class AudioFastSlowAction extends JosmAction {
private double multiplier;
+ /**
+ * Constructs a new {@code AudioFastSlowAction}.
+ *
+ * @param name the action's text as displayed on the menu (if it is added to a menu)
+ * @param iconName the filename of the icon to use
+ * @param tooltip a longer description of the action that will be displayed in the tooltip.
+ * @param shortcut a ready-created shortcut object.
+ * @param fast {@code true} to increase speed (faster audio), {@code false} to decrease it (slower audio).
+ */
public AudioFastSlowAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean fast) {
super(name, iconName, tooltip, shortcut, true);
- multiplier = Main.pref.getDouble("audio.fastfwdmultiplier","1.3");
+ multiplier = Main.pref.getDouble("audio.fastfwdmultiplier", 1.3);
if (! fast)
multiplier = 1.0 / multiplier;
}
+ @Override
public void actionPerformed(ActionEvent e) {
double speed = AudioPlayer.speed();
if (speed * multiplier <= 0.1)
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java b/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java
index 29ccbea..752ebc1 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -9,8 +9,16 @@ import java.awt.event.KeyEvent;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Increase the speed of audio playback.
+ * Each use increases the speed further until one of the other controls is used.
+ * @since 563
+ */
public class AudioFasterAction extends AudioFastSlowAction {
+ /**
+ * Constructs a new {@code AudioFasterAction}.
+ */
public AudioFasterAction() {
super(trc("audio", "Faster"), "audio-faster", trc("audio", "Faster Forward"),
Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", trc("audio", "Faster")), KeyEvent.VK_F9, Shortcut.DIRECT), true);
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java b/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java
index ded7614..7e33a24 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -13,17 +13,26 @@ import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.tools.AudioPlayer;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Jump the audio forward 10 seconds.
+ * @since 547
+ */
public class AudioFwdAction extends JosmAction {
+
+ /**
+ * Constructs a new {@code AudioFwdAction}.
+ */
public AudioFwdAction() {
super(trc("audio", "Forward"), "audio-fwd", trc("audio", "Jump forward"),
Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", trc("audio", "Forward")), KeyEvent.VK_F7, Shortcut.DIRECT), true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
try {
if (AudioPlayer.playing() || AudioPlayer.paused())
AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position()
- + Main.pref.getDouble("audio.forwardbackamount","10.0"));
+ + Main.pref.getDouble("audio.forwardbackamount", 10.0));
else
MarkerLayer.playAudio();
} catch (Exception ex) {
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java b/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java
index bd8ed47..29d60b0 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11,13 +11,22 @@ import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Play the sound track from the Audio Marker after the one most recently played.<br/>
+ * Play from the first such Marker if none has been played, or repeat the last marker if at the end.
+ * @since 547
+ */
public class AudioNextAction extends JosmAction {
+ /**
+ * Constructs a new {@code AudioNextAction}.
+ */
public AudioNextAction() {
super(trc("audio", "Next Marker"), "audio-next", trc("audio", "Play next marker."),
Shortcut.registerShortcut("audio:next", tr("Audio: {0}", trc("audio", "Next Marker")), KeyEvent.VK_F8, Shortcut.DIRECT), true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
MarkerLayer.playNextMarker();
}
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java b/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java
index 539a7dc..1b9e7ac 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java
@@ -1,24 +1,36 @@
-// License: GPL. Copyright 2008 by David Earl and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trc;
+
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.net.URL;
import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.tools.AudioPlayer;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * If not playing, play the sound track from the first Audio Marker, or from the point at which it was paused.<br/>
+ * If playing, pause the sound.<br/>
+ * If fast forwarding or slow forwarding, resume normal speed.
+ * @since 547
+ */
public class AudioPlayPauseAction extends JosmAction {
+ /**
+ * Constructs a new {@code AudioPlayPauseAction}.
+ */
public AudioPlayPauseAction() {
super(trc("audio", "Play/Pause"), "audio-playpause", tr("Play/pause audio."),
Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", trc("audio", "Play/Pause")), KeyEvent.VK_PERIOD, Shortcut.DIRECT), true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
URL url = AudioPlayer.url();
try {
@@ -30,8 +42,14 @@ public class AudioPlayPauseAction extends JosmAction {
else
AudioPlayer.pause();
} else {
- // find first audio marker to play
- MarkerLayer.playAudio();
+ // play the last-played marker again, if there is one
+ AudioMarker lastPlayed = AudioMarker.recentlyPlayedMarker();
+ if (lastPlayed != null) {
+ lastPlayed.play();
+ } else {
+ // If no marker was played recently, play the first one
+ MarkerLayer.playAudio();
+ }
}
} catch (Exception ex) {
AudioPlayer.audioMalfunction(ex);
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java b/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java
index e5a3950..6c2635a 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11,13 +11,22 @@ import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Play the sound track from the Audio Marker before the one most recently played.<br/>
+ * Play from the first such Marker if none has been played or already at the first marker.
+ * @since 547
+ */
public class AudioPrevAction extends JosmAction {
+ /**
+ * Constructs a new {@code AudioPrevAction}.
+ */
public AudioPrevAction() {
super(trc("audio", "Previous Marker"), "audio-prev", trc("audio", "Play previous marker."),
Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", trc("audio", "Previous Marker")), KeyEvent.VK_F5, Shortcut.DIRECT), true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
MarkerLayer.playPreviousMarker();
}
diff --git a/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java b/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java
index 1d62c93..12c871f 100644
--- a/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java
+++ b/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.audio;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -9,11 +9,19 @@ import java.awt.event.KeyEvent;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Decrease the speed of audio playback.
+ * Each use decreases the speed further until one of the other controls is used.
+ * @since 563
+ */
public class AudioSlowerAction extends AudioFastSlowAction {
+ /**
+ * Constructs a new {@code AudioSlowerAction}.
+ */
public AudioSlowerAction() {
super(trc("audio", "Slower"), "audio-slower", trc("audio", "Slower Forward"),
- Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", trc("audio", "Slower")), KeyEvent.VK_F4, Shortcut.DIRECT), true);
+ Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", trc("audio", "Slower")), KeyEvent.VK_F4, Shortcut.DIRECT), false);
this.putValue("help", ht("/Action/AudioSlower"));
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
index 4a20d8d..c803cf4 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java
@@ -3,7 +3,12 @@ package org.openstreetmap.josm.actions.downloadtasks;
import java.util.ArrayList;
import java.util.List;
+import org.openstreetmap.josm.io.XmlWriter;
+/**
+ * Common abstract implementation of other download tasks
+ * @since 2322
+ */
public abstract class AbstractDownloadTask implements DownloadTask {
private List<Object> errorMessages;
private boolean canceled = false;
@@ -37,7 +42,52 @@ public abstract class AbstractDownloadTask implements DownloadTask {
errorMessages.add(exception);
}
+ @Override
public List<Object> getErrorObjects() {
return errorMessages;
}
+
+ @Override
+ public String acceptsDocumentationSummary() {
+ StringBuilder buf = new StringBuilder("<tr><td>");
+ buf.append(getTitle());
+ buf.append(":</td><td>");
+ String[] patterns = getPatterns();
+ if (patterns.length>0) {
+ buf.append("<ul>");
+ for (String pattern: patterns) {
+ buf.append("<li>");
+ buf.append(XmlWriter.encode(pattern));
+ buf.append("</li>");
+ }
+ buf.append("</ul>");
+ }
+ buf.append("</td></tr>");
+ return buf.toString();
+ }
+
+ // Can be overridden for more complex checking logic
+ @Override
+ public boolean acceptsUrl(String url) {
+ if (url==null) return false;
+ for (String p: getPatterns()) {
+ if (url.matches(p)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ // Default name to keep old plugins compatible
+ @Override
+ public String getTitle() {
+ return getClass().getName();
+ }
+
+ // Default pattern to keep old plugins compatible
+ @Override
+ public String[] getPatterns() {
+ return new String[]{};
+ }
+
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
index aa40d14..a304eb7 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.downloadtasks;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -26,6 +26,7 @@ import org.openstreetmap.josm.io.GpxImporter.GpxImporterData;
import org.openstreetmap.josm.io.OsmServerLocationReader;
import org.openstreetmap.josm.io.OsmServerReader;
import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.xml.sax.SAXException;
/**
@@ -35,7 +36,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
private DownloadTask downloadTask;
- private static final String PATTERN_TRACE_ID = "http://.*openstreetmap.org/trace/\\p{Digit}+/data";
+ private static final String PATTERN_TRACE_ID = "http://.*(osm|openstreetmap).org/trace/\\p{Digit}+/data";
private static final String PATTERN_TRACKPOINTS_BBOX = "http://.*/api/0.6/trackpoints\\?bbox=.*,.*,.*,.*";
@@ -44,18 +45,31 @@ public class DownloadGpsTask extends AbstractDownloadTask {
protected String newLayerName = null;
+ @Override
+ public String[] getPatterns() {
+ return new String[] {PATTERN_EXTERNAL_GPX_FILE, PATTERN_EXTERNAL_GPX_SCRIPT, PATTERN_TRACE_ID, PATTERN_TRACKPOINTS_BBOX};
+ }
+
+ @Override
+ public String getTitle() {
+ return tr("Download GPS");
+ }
+
+ @Override
public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
downloadTask = new DownloadTask(newLayer,
- new BoundingBoxDownloader(downloadArea), progressMonitor);
+ new BoundingBoxDownloader(downloadArea), progressMonitor, false);
// We need submit instead of execute so we can wait for it to finish and get the error
// message if necessary. If no one calls getErrorMessage() it just behaves like execute.
return Main.worker.submit(downloadTask);
}
+ @Override
public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
- if (url != null && (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT) || url.matches(PATTERN_EXTERNAL_GPX_FILE))) {
+ CheckParameterUtil.ensureParameterNotNull(url, "url");
+ if (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT) || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
downloadTask = new DownloadTask(newLayer,
- new OsmServerLocationReader(url), progressMonitor);
+ new OsmServerLocationReader(url), progressMonitor, url.matches(PATTERN_TRACE_ID));
// Extract .gpx filename from URL to set the new layer name
Matcher matcher = Pattern.compile(PATTERN_EXTERNAL_GPX_FILE).matcher(url);
newLayerName = matcher.matches() ? matcher.group(1) : null;
@@ -63,7 +77,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
// message if necessary. If no one calls getErrorMessage() it just behaves like execute.
return Main.worker.submit(downloadTask);
- } else if (url != null && url.matches(PATTERN_TRACKPOINTS_BBOX)) {
+ } else if (url.matches(PATTERN_TRACKPOINTS_BBOX)) {
String[] table = url.split("\\?|=|&");
for (int i = 0; i<table.length; i++) {
if (table[i].equals("bbox") && i<table.length-1 )
@@ -73,15 +87,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
return null;
}
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.actions.downloadtasks.DownloadTask#acceptsUrl(java.lang.String)
- */
@Override
- public boolean acceptsUrl(String url) {
- return url != null && (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_TRACKPOINTS_BBOX)
- || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT) || url.matches(PATTERN_EXTERNAL_GPX_FILE));
- }
-
public void cancel() {
if (downloadTask != null) {
downloadTask.cancel();
@@ -92,18 +98,25 @@ public class DownloadGpsTask extends AbstractDownloadTask {
private OsmServerReader reader;
private GpxData rawData;
private final boolean newLayer;
+ private final boolean compressed;
- public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
+ public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor, boolean compressed) {
super(tr("Downloading GPS data"));
this.reader = reader;
this.newLayer = newLayer;
+ this.compressed = compressed;
}
@Override public void realRun() throws IOException, SAXException, OsmTransferException {
try {
if (isCanceled())
return;
- rawData = reader.parseRawGps(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ ProgressMonitor subMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
+ if (compressed) {
+ rawData = reader.parseRawGpsBzip2(subMonitor);
+ } else {
+ rawData = reader.parseRawGps(subMonitor);
+ }
} catch(Exception e) {
if (isCanceled())
return;
@@ -121,15 +134,15 @@ public class DownloadGpsTask extends AbstractDownloadTask {
if (rawData == null)
return;
String name = newLayerName != null ? newLayerName : tr("Downloaded GPX Data");
-
+
GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name, tr("Markers from {0}", name));
-
+
GpxLayer gpxLayer = addOrMergeLayer(layers.getGpxLayer(), findGpxMergeLayer());
addOrMergeLayer(layers.getMarkerLayer(), findMarkerMergeLayer(gpxLayer));
-
+
layers.getPostLayerTask().run();
}
-
+
private <L extends Layer> L addOrMergeLayer(L layer, L mergeLayer) {
if (layer == null) return null;
if (newLayer || mergeLayer == null) {
@@ -147,7 +160,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
return null;
boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false);
Layer active = Main.map.mapView.getActiveLayer();
- if (active != null && active instanceof GpxLayer && (merge || ((GpxLayer)active).data.fromServer))
+ if (active instanceof GpxLayer && (merge || ((GpxLayer)active).data.fromServer))
return (GpxLayer) active;
for (GpxLayer l : Main.map.mapView.getLayersOfType(GpxLayer.class)) {
if (merge || l.data.fromServer)
@@ -155,7 +168,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
}
return null;
}
-
+
private MarkerLayer findMarkerMergeLayer(GpxLayer fromLayer) {
if (!Main.isDisplayingMapView())
return null;
@@ -184,7 +197,7 @@ public class DownloadGpsTask extends AbstractDownloadTask {
// TODO
return null;
}
-
+
/**
* Determines if the given URL denotes an OSM gpx-related API call.
* @param url The url to check
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
index de8d435..b488c3c 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
@@ -1,29 +1,39 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.downloadtasks;
import java.util.concurrent.Future;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.OsmServerLocationReader;
import org.openstreetmap.josm.io.OsmTransferException;
+/**
+ * Task allowing to download compressed OSM-Change files (gzip and bzip2)
+ * @since 5361
+ */
public class DownloadOsmChangeCompressedTask extends DownloadOsmChangeTask {
-
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.actions.downloadtasks.DownloadTask#acceptsUrl(java.lang.String)
- */
+
@Override
- public boolean acceptsUrl(String url) {
- return url != null && url.matches("https?://.*/.*\\.osc.(gz|bz2?)"); // Remote .osc.gz / .osc.bz / .osc.bz2 files
+ public String[] getPatterns() {
+ return new String[]{"https?://.*/.*\\.osc.(gz|bz2?)"};
}
-
+
+ @Override
+ public String getTitle() {
+ return tr("Download Compressed OSM Change");
+ }
+
/**
* Loads a given URL
- * @param True if the data should be saved to a new layer
- * @param The URL as String
+ * @param new_layer {@code true} if the data should be saved to a new layer
+ * @param url The URL as String
+ * @param progressMonitor progress monitor for user interaction
*/
+ @Override
public Future<?> loadUrl(boolean new_layer, final String url, ProgressMonitor progressMonitor) {
downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor) {
@Override
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
index 893799c..d6925f2 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
@@ -1,5 +1,8 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.downloadtasks;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -32,16 +35,24 @@ import org.openstreetmap.josm.io.OsmServerLocationReader;
import org.openstreetmap.josm.io.OsmServerReader;
import org.openstreetmap.josm.io.OsmTransferException;
+/**
+ * Task allowing to download OsmChange data (http://wiki.openstreetmap.org/wiki/OsmChange).
+ * @since 4530
+ */
public class DownloadOsmChangeTask extends DownloadOsmTask {
@Override
- public boolean acceptsUrl(String url) {
- return url != null && (
- url.matches("http://.*/api/0.6/changeset/\\p{Digit}+/download") // OSM API 0.6 changesets
- || url.matches("https?://.*/.*\\.osc") // Remote .osc files
- );
+ public String[] getPatterns() {
+ return new String[]{"http://.*/api/0.6/changeset/\\p{Digit}+/download", // OSM API 0.6 changesets
+ "https?://.*/.*\\.osc" // Remote .osc files
+ };
}
+ @Override
+ public String getTitle() {
+ return tr("Download OSM Change");
+ }
+
/* (non-Javadoc)
* @see org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask#download(boolean, org.openstreetmap.josm.data.Bounds, org.openstreetmap.josm.gui.progress.ProgressMonitor)
*/
@@ -172,11 +183,11 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
try {
data.setVisible(hp.isVisible());
} catch (IllegalStateException e) {
- System.err.println("Cannot change visibility for "+p+": "+e.getMessage());
+ Main.error("Cannot change visibility for "+p+": "+e.getMessage());
}
data.setTimestamp(hp.getTimestamp());
data.setKeys(hp.getTags());
- data.setOsmId(hp.getChangesetId(), (int) hp.getVersion());
+ data.setOsmId(hp.getId(), (int) hp.getVersion());
// Load the history data
try {
@@ -184,7 +195,7 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
// Forget this primitive
it.remove();
} catch (AssertionError e) {
- System.err.println("Cannot load "+p + ": " + e.getMessage());
+ Main.error("Cannot load "+p + ": " + e.getMessage());
}
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
index 03523aa..66a0f77 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
@@ -1,8 +1,10 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.downloadtasks;
import java.util.concurrent.Future;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.osm.DataSet;
@@ -10,14 +12,22 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.OsmServerLocationReader;
import org.openstreetmap.josm.io.OsmTransferException;
+/**
+ * Task allowing to download compressed OSM files (gzip and bzip2)
+ * @since 5317
+ */
public class DownloadOsmCompressedTask extends DownloadOsmTask {
-
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.actions.downloadtasks.DownloadTask#acceptsUrl(java.lang.String)
- */
+
+ String PATTERN_GZ = "https?://.*/.*\\.osm.(gz|bz2?)";
+
@Override
- public boolean acceptsUrl(String url) {
- return url != null && url.matches("https?://.*/.*\\.osm.(gz|bz2?)"); // Remote .osm.gz / .osm.bz / .osm.bz2 files
+ public String[] getPatterns() {
+ return new String[]{PATTERN_GZ};
+ }
+
+ @Override
+ public String getTitle() {
+ return tr("Download Compressed OSM");
}
/* (non-Javadoc)
@@ -31,9 +41,11 @@ public class DownloadOsmCompressedTask extends DownloadOsmTask {
/**
* Loads a given URL
- * @param True if the data should be saved to a new layer
- * @param The URL as String
+ * @param new_layer {@code true} if the data should be saved to a new layer
+ * @param url The URL as String
+ * @param progressMonitor progress monitor for user interaction
*/
+ @Override
public Future<?> loadUrl(boolean new_layer, final String url, ProgressMonitor progressMonitor) {
downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor) {
@Override
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
index 984c298..3a58436 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
@@ -1,18 +1,17 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.downloadtasks;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.geom.Area;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.net.URLEncoder;
import java.util.Collection;
import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.xml.sax.SAXException;
-
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -29,26 +28,46 @@ import org.openstreetmap.josm.io.OsmServerLocationReader;
import org.openstreetmap.josm.io.OsmServerReader;
import org.openstreetmap.josm.io.OsmTransferCanceledException;
import org.openstreetmap.josm.io.OsmTransferException;
+import org.xml.sax.SAXException;
/**
* Open the download dialog and download the data.
* Run in the worker thread.
*/
public class DownloadOsmTask extends AbstractDownloadTask {
-
+
private static final String PATTERN_OSM_API_URL = "http://.*/api/0.6/(map|nodes?|ways?|relations?|\\*).*";
private static final String PATTERN_OVERPASS_API_URL = "http://.*/interpreter\\?data=.*";
- private static final String PATTERN_OVERPASS_API_XAPI_URL = "http://.*/xapi\\?.*\\[@meta\\].*";
+ private static final String PATTERN_OVERPASS_API_XAPI_URL = "http://.*/xapi(\\?.*\\[@meta\\]|_meta\\?).*";
private static final String PATTERN_EXTERNAL_OSM_FILE = "https?://.*/.*\\.osm";
-
+
protected Bounds currentBounds;
protected DataSet downloadedData;
protected DownloadTask downloadTask;
-
+
protected OsmDataLayer targetLayer;
-
+
protected String newLayerName = null;
+ @Override
+ public String[] getPatterns() {
+ if (this.getClass() == DownloadOsmTask.class) {
+ return new String[]{PATTERN_OSM_API_URL, PATTERN_OVERPASS_API_URL,
+ PATTERN_OVERPASS_API_XAPI_URL, PATTERN_EXTERNAL_OSM_FILE};
+ } else {
+ return super.getPatterns();
+ }
+ }
+
+ @Override
+ public String getTitle() {
+ if (this.getClass() == DownloadOsmTask.class) {
+ return tr("Download OSM");
+ } else {
+ return super.getTitle();
+ }
+ }
+
protected void rememberDownloadedData(DataSet ds) {
this.downloadedData = ds;
}
@@ -115,12 +134,34 @@ public class DownloadOsmTask extends AbstractDownloadTask {
return Main.worker.submit(downloadTask);
}
+ protected final String encodePartialUrl(String url, String safePart) {
+ if (url != null && safePart != null) {
+ int pos = url.indexOf(safePart);
+ if (pos > -1) {
+ pos += safePart.length();
+ try {
+ return url.substring(0, pos) + URLEncoder.encode(url.substring(pos), "UTF-8").replaceAll("\\+", "%20");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return url;
+ }
+
/**
* Loads a given URL from the OSM Server
* @param new_layer True if the data should be saved to a new layer
* @param url The URL as String
*/
+ @Override
public Future<?> loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
+ if (url.matches(PATTERN_OVERPASS_API_URL)) {
+ url = encodePartialUrl(url, "/interpreter?data="); // encode only the part after the = sign
+
+ } else if (url.matches(PATTERN_OVERPASS_API_XAPI_URL)) {
+ url = encodePartialUrl(url, "/xapi?"); // encode only the part after the ? sign
+ }
downloadTask = new DownloadTask(new_layer,
new OsmServerLocationReader(url),
progressMonitor);
@@ -129,25 +170,13 @@ public class DownloadOsmTask extends AbstractDownloadTask {
extractOsmFilename("https?://.*/(.*\\.osm)", url);
return Main.worker.submit(downloadTask);
}
-
+
protected final void extractOsmFilename(String pattern, String url) {
Matcher matcher = Pattern.compile(pattern).matcher(url);
newLayerName = matcher.matches() ? matcher.group(1) : null;
}
-
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.actions.downloadtasks.DownloadTask#acceptsUrl(java.lang.String)
- */
- @Override
- public boolean acceptsUrl(String url) {
- return url != null && (
- url.matches(PATTERN_OSM_API_URL) // OSM API 0.6 and XAPI
- || url.matches(PATTERN_OVERPASS_API_URL) // Overpass API
- || url.matches(PATTERN_OVERPASS_API_XAPI_URL) // Overpass API XAPI compatibility layer
- || url.matches(PATTERN_EXTERNAL_OSM_FILE) // Remote .osm files
- );
- }
+ @Override
public void cancel() {
if (downloadTask != null) {
downloadTask.cancel();
@@ -164,7 +193,7 @@ public class DownloadOsmTask extends AbstractDownloadTask {
this.reader = reader;
this.newLayer = newLayer;
}
-
+
protected DataSet parseDataSet() throws OsmTransferException {
return reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
}
@@ -176,7 +205,7 @@ public class DownloadOsmTask extends AbstractDownloadTask {
dataSet = parseDataSet();
} catch(Exception e) {
if (isCanceled()) {
- System.out.println(tr("Ignoring exception because download has been canceled. Exception was: {0}", e.toString()));
+ Main.info(tr("Ignoring exception because download has been canceled. Exception was: {0}", e.toString()));
return;
}
if (e instanceof OsmTransferCanceledException) {
@@ -193,7 +222,7 @@ public class DownloadOsmTask extends AbstractDownloadTask {
protected OsmDataLayer getEditLayer() {
if (!Main.isDisplayingMapView()) return null;
- return Main.map.mapView.getEditLayer();
+ return Main.main.getEditLayer();
}
protected int getNumDataLayers() {
@@ -217,14 +246,14 @@ public class DownloadOsmTask extends AbstractDownloadTask {
}
return null;
}
-
+
protected OsmDataLayer createNewLayer(String layerName) {
if (layerName == null || layerName.isEmpty()) {
layerName = OsmDataLayer.createNewName();
}
return new OsmDataLayer(dataSet, layerName, null);
}
-
+
protected OsmDataLayer createNewLayer() {
return createNewLayer(null);
}
@@ -267,7 +296,7 @@ public class DownloadOsmTask extends AbstractDownloadTask {
targetLayer.onPostDownloadFromServer();
}
}
-
+
protected void computeBboxAndCenterScale() {
BoundingXYVisitor v = new BoundingXYVisitor();
if (currentBounds != null) {
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
index d5a4777..ba34605 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmUrlTask.java
@@ -3,20 +3,31 @@ package org.openstreetmap.josm.actions.downloadtasks;
import java.util.concurrent.Future;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
+/**
+ * Task allowing to download an OSM url containing coordinates
+ * @since 4996
+ */
public class DownloadOsmUrlTask extends DownloadOsmTask {
@Override
public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
return download(newLayer, OsmUrlToBounds.parse(url), null);
}
+
+ @Override
+ public String[] getPatterns() {
+ return new String[]{
+ "http://www\\.(osm|openstreetmap)\\.org/\\?lat=.*&lon=.*",
+ "http://www\\.(osm|openstreetmap)\\.org/#map=\\p{Digit}+/.*/.*"};
+ }
@Override
- public boolean acceptsUrl(String url) {
- return url != null && (
- url.matches("http://www\\.openstreetmap\\.org/\\?lat=.*&lon=.*")
- );
+ public String getTitle() {
+ return tr("Download OSM URL");
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java
index 0a7e015..56c4926 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java
@@ -77,9 +77,8 @@ public class DownloadReferrersTask extends PleaseWaitRunnable {
* constructor
*
* @param targetLayer the target layer for the downloaded primitives. Must not be null.
- * @param primitives the collection of children for which parents are to be downloaded. Children
+ * @param children the collection of children for which parents are to be downloaded. Children
* are specified by their id and their type.
- *
*/
public DownloadReferrersTask(OsmDataLayer targetLayer, Map<Long, OsmPrimitiveType> children) {
super("Download referrers", false /* don't ignore exception*/);
@@ -165,6 +164,7 @@ public class DownloadReferrersTask extends PleaseWaitRunnable {
visitor.merge();
SwingUtilities.invokeLater(
new Runnable() {
+ @Override
public void run() {
targetLayer.onPostDownloadFromServer();
Main.map.mapView.repaint();
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java
new file mode 100644
index 0000000..bb24d60
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadSessionTask.java
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.concurrent.Future;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.SessionLoadAction.Loader;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Task allowing to download JOSM session (*.jos, *.joz file).
+ * @since 6215
+ */
+public class DownloadSessionTask extends AbstractDownloadTask {
+
+ private static final String PATTERN_SESSION = "https?://.*/.*\\.jo(s|z)";
+
+ private Loader loader;
+
+ /**
+ * Constructs a new {@code DownloadSessionTask}.
+ */
+ public DownloadSessionTask() {
+ }
+
+ @Override
+ public String getTitle() {
+ return tr("Download session");
+ }
+
+ @Override
+ public String[] getPatterns() {
+ return new String[]{PATTERN_SESSION};
+ }
+
+ @Override
+ public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
+ return null;
+ }
+
+ @Override
+ public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+ if (url != null && (url.matches(PATTERN_SESSION))) {
+ try {
+ URL u = new URL(url);
+ loader = new Loader(Utils.openURL(u), u.toURI(), url.endsWith(".joz"));
+ return Main.worker.submit(loader);
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void cancel() {
+ if (loader != null) {
+ loader.cancel();
+ }
+ }
+
+ @Override
+ public String getConfirmationMessage(URL url) {
+ // TODO
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
index ea4abb1..25122ca 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
@@ -13,7 +13,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
* Interface defining a general download task used to download geographic data (OSM data, GPX tracks, etc.) for a given URL or geographic area.
*/
public interface DownloadTask {
-
+
/**
* Asynchronously launches the download task for a given bounding box.
*
@@ -70,7 +70,7 @@ public interface DownloadTask {
* @see #download(boolean, Bounds, ProgressMonitor)
*/
Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor);
-
+
/**
* Returns true if the task is able to open the given URL, false otherwise.
* @param url the url to download from
@@ -79,6 +79,27 @@ public interface DownloadTask {
boolean acceptsUrl(String url);
/**
+ * Returns a short HTML documentation string, describing acceptable URLs.
+ * @return The HTML documentation
+ * @since 6031
+ */
+ String acceptsDocumentationSummary();
+
+ /**
+ * Returns human-readable description of the task
+ * @return The task description
+ * @since 6031
+ */
+ String getTitle();
+
+ /**
+ * Returns regular expressions that match the URLs
+ * @return The array of accepted URL patterns
+ * @since 6031
+ */
+ String[] getPatterns();
+
+ /**
* Replies the error objects of the task. Empty list, if no error messages are available.
*
* Error objects are either {@link String}s with error messages or {@link Exception}s.
@@ -92,12 +113,12 @@ public interface DownloadTask {
*
*/
public void cancel();
-
+
/**
* Replies the HTML-formatted confirmation message to be shown to user when the given URL needs to be confirmed before loading.
* @param url The URL to be confirmed
* @return The HTML-formatted confirmation message to be shown to user
- * @since
+ * @since
*/
public String getConfirmationMessage(URL url);
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
similarity index 76%
rename from src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java
rename to src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
index 82584f7..a6e5f12 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
@@ -18,7 +18,6 @@ import java.util.Set;
import java.util.concurrent.Future;
import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.UpdateSelectionAction;
@@ -31,6 +30,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ExceptionUtil;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -39,21 +39,31 @@ import org.openstreetmap.josm.tools.ImageProvider;
* large to download in one go. Error messages will be collected for all downloads and displayed as
* a list in the end.
* @author xeen
- *
+ * @since 6053
*/
-public class DownloadOsmTaskList {
- private List<DownloadTask> osmTasks = new LinkedList<DownloadTask>();
- private List<Future<?>> osmTaskFutures = new LinkedList<Future<?>>();
+public class DownloadTaskList {
+ private List<DownloadTask> tasks = new LinkedList<DownloadTask>();
+ private List<Future<?>> taskFutures = new LinkedList<Future<?>>();
private ProgressMonitor progressMonitor;
+ private void addDownloadTask(DownloadTask dt, Rectangle2D td, int i, int n) {
+ ProgressMonitor childProgress = progressMonitor.createSubTaskMonitor(1, false);
+ childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, n, n - i));
+ Future<?> future = dt.download(false, new Bounds(td), childProgress);
+ taskFutures.add(future);
+ tasks.add(dt);
+ }
+
/**
* Downloads a list of areas from the OSM Server
* @param newLayer Set to true if all areas should be put into a single new layer
* @param rects The List of Rectangle2D to download
- * @param progressMonitor The progress monitor
+ * @param osmData Set to true if OSM data should be downloaded
+ * @param gpxData Set to true if GPX data should be downloaded
+ * @param progressMonitor The progress monitor
* @return The Future representing the asynchronous download task
*/
- public Future<?> download(boolean newLayer, List<Rectangle2D> rects, ProgressMonitor progressMonitor) {
+ public Future<?> download(boolean newLayer, List<Rectangle2D> rects, boolean osmData, boolean gpxData, ProgressMonitor progressMonitor) {
this.progressMonitor = progressMonitor;
if (newLayer) {
Layer l = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
@@ -61,35 +71,39 @@ public class DownloadOsmTaskList {
Main.map.mapView.setActiveLayer(l);
}
- progressMonitor.beginTask(null, rects.size());
+ int n = (osmData && gpxData ? 2 : 1)*rects.size();
+ progressMonitor.beginTask(null, n);
int i = 0;
for (Rectangle2D td : rects) {
i++;
- DownloadTask dt = new DownloadOsmTask();
- ProgressMonitor childProgress = progressMonitor.createSubTaskMonitor(1, false);
- childProgress.setCustomText(tr("Download {0} of {1} ({2} left)", i, rects.size(), rects.size() - i));
- Future<?> future = dt.download(false, new Bounds(td), childProgress);
- osmTaskFutures.add(future);
- osmTasks.add(dt);
+ if (osmData) {
+ addDownloadTask(new DownloadOsmTask(), td, i, n);
+ }
+ if (gpxData) {
+ addDownloadTask(new DownloadGpsTask(), td, i, n);
+ }
}
progressMonitor.addCancelListener(new CancelListener() {
+ @Override
public void operationCanceled() {
- for (DownloadTask dt : osmTasks) {
+ for (DownloadTask dt : tasks) {
dt.cancel();
}
}
});
- return Main.worker.submit(new PostDownloadProcessor());
+ return Main.worker.submit(new PostDownloadProcessor(osmData));
}
/**
* Downloads a list of areas from the OSM Server
* @param newLayer Set to true if all areas should be put into a single new layer
* @param areas The Collection of Areas to download
+ * @param osmData Set to true if OSM data should be downloaded
+ * @param gpxData Set to true if GPX data should be downloaded
* @param progressMonitor The progress monitor
* @return The Future representing the asynchronous download task
*/
- public Future<?> download(boolean newLayer, Collection<Area> areas, ProgressMonitor progressMonitor) {
+ public Future<?> download(boolean newLayer, Collection<Area> areas, boolean osmData, boolean gpxData, ProgressMonitor progressMonitor) {
progressMonitor.beginTask(tr("Updating data"));
try {
List<Rectangle2D> rects = new ArrayList<Rectangle2D>(areas.size());
@@ -97,7 +111,7 @@ public class DownloadOsmTaskList {
rects.add(a.getBounds2D());
}
- return download(newLayer, rects, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+ return download(newLayer, rects, osmData, gpxData, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
} finally {
progressMonitor.finishTask();
}
@@ -126,15 +140,15 @@ public class DownloadOsmTaskList {
* @param potentiallyDeleted a set of ids to check update from the server
*/
protected void updatePotentiallyDeletedPrimitives(Set<OsmPrimitive> potentiallyDeleted) {
- final ArrayList<OsmPrimitive> toSelect = new ArrayList<OsmPrimitive>();
+ final List<OsmPrimitive> toSelect = new ArrayList<OsmPrimitive>();
for (OsmPrimitive primitive : potentiallyDeleted) {
if (primitive != null) {
toSelect.add(primitive);
}
}
EventQueue.invokeLater(new Runnable() {
- public void run() {
- new UpdateSelectionAction().updatePrimitives(toSelect);
+ @Override public void run() {
+ UpdateSelectionAction.updatePrimitives(toSelect);
}
});
}
@@ -201,7 +215,7 @@ public class DownloadOsmTaskList {
*/
public Set<OsmPrimitive> getDownloadedPrimitives() {
HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
- for (DownloadTask task : osmTasks) {
+ for (DownloadTask task : tasks) {
if (task instanceof DownloadOsmTask) {
DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
if (ds != null) {
@@ -213,15 +227,23 @@ public class DownloadOsmTaskList {
}
class PostDownloadProcessor implements Runnable {
+
+ private final boolean osmData;
+
+ public PostDownloadProcessor(boolean osmData) {
+ this.osmData = osmData;
+ }
+
/**
* Grabs and displays the error messages after all download threads have finished.
*/
+ @Override
public void run() {
progressMonitor.finishTask();
// wait for all download tasks to finish
//
- for (Future<?> future : osmTaskFutures) {
+ for (Future<?> future : taskFutures) {
try {
future.get();
} catch (Exception e) {
@@ -230,7 +252,7 @@ public class DownloadOsmTaskList {
}
}
LinkedHashSet<Object> errors = new LinkedHashSet<Object>();
- for (DownloadTask dt : osmTasks) {
+ for (DownloadTask dt : tasks) {
errors.addAll(dt.getErrorObjects());
}
if (!errors.isEmpty()) {
@@ -246,7 +268,7 @@ public class DownloadOsmTaskList {
sb.insert(0, "<ul>");
sb.append("</ul>");
- SwingUtilities.invokeLater(new Runnable() {
+ GuiHelper.runInEDT(new Runnable() {
@Override
public void run() {
JOptionPane.showMessageDialog(Main.parent, "<html>"
@@ -259,20 +281,19 @@ public class DownloadOsmTaskList {
}
// FIXME: this is a hack. We assume that the user canceled the whole download if at
- // least
- // one task was canceled or if it failed
+ // least one task was canceled or if it failed
//
- for (DownloadTask task : osmTasks) {
- if (task instanceof DownloadOsmTask) {
- DownloadOsmTask osmTask = (DownloadOsmTask) task;
- if (osmTask.isCanceled() || osmTask.isFailed())
+ for (DownloadTask task : tasks) {
+ if (task instanceof AbstractDownloadTask) {
+ AbstractDownloadTask absTask = (AbstractDownloadTask) task;
+ if (absTask.isCanceled() || absTask.isFailed())
return;
}
}
- final OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
- if (editLayer != null) {
- Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.data);
- for (DownloadTask task : osmTasks) {
+ final OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null && osmData) {
+ final Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.data);
+ for (DownloadTask task : tasks) {
if (task instanceof DownloadOsmTask) {
DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
if (ds != null) {
@@ -284,7 +305,11 @@ public class DownloadOsmTaskList {
}
}
if (!myPrimitives.isEmpty()) {
- handlePotentiallyDeletedPrimitives(myPrimitives);
+ GuiHelper.runInEDT(new Runnable() {
+ @Override public void run() {
+ handlePotentiallyDeletedPrimitives(myPrimitives);
+ }
+ });
}
}
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java b/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java
index d78d09a..d99f933 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java
@@ -58,6 +58,7 @@ public class PostDownloadHandler implements Runnable {
this.futures.addAll(futures);
}
+ @Override
public void run() {
// wait for all downloads task to finish (by waiting for the futures
// to return a value)
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
index e242d95..b520f3e 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.mapmode;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -27,6 +27,7 @@ import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -56,9 +57,9 @@ public class DeleteAction extends MapMode implements AWTEventListener {
* to remove the highlight from them again as otherwise the whole data
* set would have to be checked.
*/
- private Set<OsmPrimitive> oldHighlights = new HashSet<OsmPrimitive>();
private WaySegment oldHighlightedWaySegment = null;
+ private static final HighlightHelper highlightHelper = new HighlightHelper();
private boolean drawTargetHighlight;
private enum DeleteMode {
@@ -114,7 +115,7 @@ public class DeleteAction extends MapMode implements AWTEventListener {
try {
Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
} catch (SecurityException ex) {
- System.out.println(ex);
+ Main.warn(ex);
}
}
@@ -125,7 +126,7 @@ public class DeleteAction extends MapMode implements AWTEventListener {
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
} catch (SecurityException ex) {
- System.out.println(ex);
+ Main.warn(ex);
}
removeHighlighting();
}
@@ -172,10 +173,7 @@ public class DeleteAction extends MapMode implements AWTEventListener {
* removes any highlighting that may have been set beforehand.
*/
private void removeHighlighting() {
- for(OsmPrimitive prim : oldHighlights) {
- prim.setHighlighted(false);
- }
- oldHighlights = new HashSet<OsmPrimitive>();
+ highlightHelper.clear();
DataSet ds = getCurrentDataSet();
if(ds != null) {
ds.clearHighlightedWaySegments();
@@ -232,20 +230,7 @@ public class DeleteAction extends MapMode implements AWTEventListener {
}
oldHighlightedWaySegment = newHighlightedWaySegment;
}
-
- for(OsmPrimitive x : newHighlights) {
- if(oldHighlights.contains(x)) {
- continue;
- }
- needsRepaint = true;
- x.setHighlighted(true);
- }
- oldHighlights.removeAll(newHighlights);
- for(OsmPrimitive x : oldHighlights) {
- x.setHighlighted(false);
- needsRepaint = true;
- }
- oldHighlights = newHighlights;
+ needsRepaint |= highlightHelper.highlightOnly(newHighlights);
if(needsRepaint) {
Main.map.mapView.repaint();
}
@@ -271,7 +256,7 @@ public class DeleteAction extends MapMode implements AWTEventListener {
* Gives the user feedback for the action he/she is about to do. Currently
* calls the cursor and target highlighting routines. Allows for modifiers
* not taken from the given mouse event.
- *
+ *
* Normally the mouse event also contains the modifiers. However, when the
* mouse is not moved and only modifier keys are pressed, no mouse event
* occurs. We can use AWTEvent to catch those but still lack a proper
@@ -383,10 +368,10 @@ public class DeleteAction extends MapMode implements AWTEventListener {
* This function takes any mouse event argument and builds the list of elements
* that should be deleted but does not actually delete them.
* @param e MouseEvent from which modifiers and position are taken
- * @param modifiers For explanation: @see updateCursor
- * @param silet Set to true if the user should not be bugged with additional
+ * @param modifiers For explanation, see {@link #updateCursor}
+ * @param silent Set to true if the user should not be bugged with additional
* dialogs
- * @return
+ * @return delete command
*/
private Command buildDeleteCommands(MouseEvent e, int modifiers, boolean silent) {
DeleteParameters parameters = getDeleteParameters(e, modifiers);
@@ -411,6 +396,7 @@ public class DeleteAction extends MapMode implements AWTEventListener {
/**
* This is required to update the cursors when ctrl/shift/alt is pressed
*/
+ @Override
public void eventDispatched(AWTEvent e) {
if(oldEvent == null)
return;
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index 0afeb0b..4329a71 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -65,6 +65,7 @@ import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MapViewPaintable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -85,6 +86,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
private Node lastUsedNode = null;
private double PHI=Math.toRadians(90);
+ private double toleranceMultiplier;
private Node mouseOnExistingNode;
private Set<Way> mouseOnExistingWays = new HashSet<Way>();
@@ -118,14 +120,14 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
private boolean useRepeatedShortcut;
private Stroke rubberLineStroke;
private static final BasicStroke BASIC_STROKE = new BasicStroke(1);
-
+
public DrawAction(MapFrame mapFrame) {
super(tr("Draw"), "node/autonode", tr("Draw nodes"),
Shortcut.registerShortcut("mapmode:draw", tr("Mode: {0}", tr("Draw")), KeyEvent.VK_A, Shortcut.DIRECT),
mapFrame, ImageProvider.getCursor("crosshair", null));
snappingShortcut = Shortcut.registerShortcut("mapmode:drawanglesnapping",
- tr("Mode: Draw Angle snapping"), KeyEvent.VK_TAB, Shortcut.DIRECT);
+ tr("Mode: Draw Angle snapping"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
snapChangeAction = new SnapChangeAction();
snapCheckboxMenuItem = addMenuItem();
snapHelper.setMenuCheckBox(snapCheckboxMenuItem);
@@ -176,7 +178,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
return false;
// update selection to reflect which way being modified
- if (currentBaseNode != null && getCurrentDataSet() != null && getCurrentDataSet().getSelected().isEmpty() == false) {
+ if (currentBaseNode != null && getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty()) {
Way continueFrom = getWayForNode(currentBaseNode);
if (alt && continueFrom != null && (!currentBaseNode.isSelected() || continueFrom.isSelected())) {
getCurrentDataSet().beginUpdate(); // to prevent the selection listener to screw around with the state
@@ -201,10 +203,10 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
if (!isEnabled())
return;
super.enterMode();
-
- rubberLineColor = Main.pref.getColor(marktr("draw.helper-line"), null);
+
+ rubberLineColor = Main.pref.getColor(marktr("helper line"), null);
if (rubberLineColor == null) rubberLineColor = PaintColors.SELECTED.get();
-
+
rubberLineStroke = GuiHelper.getCustomizedStroke(Main.pref.get("draw.stroke.helper-line","3"));
drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
@@ -214,6 +216,8 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
determineCurrentBaseNodeAndPreviousNode(getCurrentDataSet().getSelected());
wayIsFinished = currentBaseNode == null;
+ toleranceMultiplier = 0.01 * NavigatableComponent.PROP_SNAP_DISTANCE.get();
+
snapHelper.init();
snapCheckboxMenuItem.getAction().setEnabled(true);
@@ -238,6 +242,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
try {
Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
// would like to but haven't got mouse position yet:
// computeHelperLine(false, false, false);
@@ -275,8 +280,9 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
/**
* redraw to (possibly) get rid of helper line if selection changes.
*/
+ @Override
public void eventDispatched(AWTEvent event) {
- if(Main.map == null || Main.map.mapView == null || !Main.map.mapView.isActiveLayerDrawable())
+ if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable())
return;
if (event instanceof KeyEvent) {
KeyEvent e = (KeyEvent) event;
@@ -294,7 +300,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
// events for crossplatform key holding processing
// thanks to http://www.arco.in-berlin.de/keyevent.html
- private final TreeSet<Integer> set = new TreeSet<Integer>();
+ private final Set<Integer> set = new TreeSet<Integer>();
private KeyEvent releaseEvent;
private Timer timer;
void processKeyEvent(KeyEvent e) {
@@ -334,6 +340,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
/**
* redraw to (possibly) get rid of helper line if selection changes.
*/
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
if(!Main.map.mapView.isActiveLayerDrawable())
return;
@@ -416,13 +423,20 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
Collection<Command> cmds = new LinkedList<Command>();
Collection<OsmPrimitive> newSelection = new LinkedList<OsmPrimitive>(ds.getSelected());
- ArrayList<Way> reuseWays = new ArrayList<Way>(),
+ List<Way> reuseWays = new ArrayList<Way>(),
replacedWays = new ArrayList<Way>();
boolean newNode = false;
Node n = null;
- if (!ctrl) {
- n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
+ n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
+ if (ctrl) {
+ Iterator<Way> it = getCurrentDataSet().getSelectedWays().iterator();
+ if (it.hasNext()) {
+ // ctrl-click on node of selected way = reuse node despite of ctrl
+ if (!it.next().containsNode(n)) n = null;
+ } else {
+ n=null; // ctrl-click + no selected way = new node
+ }
}
if (n != null && !snapHelper.isActive()) {
@@ -449,7 +463,9 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
EastNorth foundPoint = n.getEastNorth();
// project found node to snapping line
newEN = snapHelper.getSnapPoint(foundPoint);
- if (foundPoint.distance(newEN) > 1e-4) {
+ // do not add new node if there is some node within snapping distance
+ double tolerance = Main.map.mapView.getDist100Pixel() * toleranceMultiplier;
+ if (foundPoint.distance(newEN) > tolerance) {
n = new Node(newEN); // point != projected, so we create new node
newNode = true;
}
@@ -501,7 +517,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
wayIsFinished = false;
// don't draw lines if shift is held
- if (selection.size() > 0 && !shift) {
+ if (!selection.isEmpty() && !shift) {
Node selectedNode = null;
Way selectedWay = null;
@@ -630,12 +646,12 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
// from aerial imagery or GPS tracks.
if (n != null && Main.map.mapView.viewportFollowing) {
Main.map.mapView.smoothScrollTo(n.getEastNorth());
- };
+ }
computeHelperLine();
removeHighlighting();
}
- private void insertNodeIntoAllNearbySegments(List<WaySegment> wss, Node n, Collection<OsmPrimitive> newSelection, Collection<Command> cmds, ArrayList<Way> replacedWays, ArrayList<Way> reuseWays) {
+ private void insertNodeIntoAllNearbySegments(List<WaySegment> wss, Node n, Collection<OsmPrimitive> newSelection, Collection<Command> cmds, List<Way> replacedWays, List<Way> reuseWays) {
Map<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
for (WaySegment ws : wss) {
List<Integer> is;
@@ -683,19 +699,19 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
}
/**
- * Prevent creation of ways that look like this: <---->
+ * Prevent creation of ways that look like this: <---->
* This happens if users want to draw a no-exit-sideway from the main way like this:
* ^
- * |<---->
+ * |<---->
* |
* The solution isn't ideal because the main way will end in the side way, which is bad for
* navigation software ("drive straight on") but at least easier to fix. Maybe users will fix
* it on their own, too. At least it's better than producing an error.
*
- * @param Way the way to check
- * @param Node the current node (i.e. the one the connection will be made from)
- * @param Node the target node (i.e. the one the connection will be made to)
- * @return Boolean True if this would create a selfcontaining way, false otherwise.
+ * @param selectedWay the way to check
+ * @param currentNode the current node (i.e. the one the connection will be made from)
+ * @param targetNode the target node (i.e. the one the connection will be made to)
+ * @return {@code true} if this would create a selfcontaining way, {@code false} otherwise.
*/
private boolean isSelfContainedWay(Way selectedWay, Node currentNode, Node targetNode) {
if(selectedWay != null) {
@@ -757,13 +773,13 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
// if that can ever happen but better be safe.
updateKeyModifiers(e);
mousePos = e.getPoint();
- if (snapHelper.isSnapOn() && ctrl)
+ if (snapHelper.isSnapOn() && ctrl)
tryToSetBaseSegmentForAngleSnap();
-
+
computeHelperLine();
addHighlighting();
}
-
+
/**
* This method is used to detect segment under mouse and use it as reference for angle snapping
*/
@@ -873,33 +889,48 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
currentBaseNode = null;
previousNode = null;
+ // Try to find an open way to measure angle from it. The way is not to be continued!
+ // warning: may result in changes of currentBaseNode and previousNode
+ // please remove if bugs arise
+ if (selectedWay == null && selectedNode != null) {
+ for (OsmPrimitive p: selectedNode.getReferrers()) {
+ if (p.isUsable() && p instanceof Way && ((Way) p).isFirstLastNode(selectedNode)) {
+ if (selectedWay!=null) { // two uncontinued ways, nothing to take as reference
+ selectedWay=null;
+ break;
+ } else {
+ // set us ~continue this way (measure angle from it)
+ selectedWay = (Way) p;
+ }
+ }
+ }
+ }
+
if (selectedNode == null) {
if (selectedWay == null)
return;
- if (selectedWay.isFirstLastNode(lastUsedNode)) {
- currentBaseNode = lastUsedNode;
- if (lastUsedNode == selectedWay.getNode(selectedWay.getNodesCount()-1) && selectedWay.getNodesCount() > 1) {
- previousNode = selectedWay.getNode(selectedWay.getNodesCount()-2);
- }
- }
+ continueWayFromNode(selectedWay, lastUsedNode);
} else if (selectedWay == null) {
currentBaseNode = selectedNode;
} else if (!selectedWay.isDeleted()) { // fix #7118
- if (selectedNode == selectedWay.getNode(0)){
- currentBaseNode = selectedNode;
- if (selectedWay.getNodesCount()>1) {
- previousNode = selectedWay.getNode(1);
- }
- }
- if (selectedNode == selectedWay.lastNode()) {
- currentBaseNode = selectedNode;
- if (selectedWay.getNodesCount()>1) {
- previousNode = selectedWay.getNode(selectedWay.getNodesCount()-2);
- }
- }
+ continueWayFromNode(selectedWay, selectedNode);
}
}
+ /**
+ * if one of the ends of @param way is given @param node ,
+ * then set currentBaseNode = node and previousNode = adjacent node of way
+ */
+ private void continueWayFromNode(Way way, Node node) {
+ int n = way.getNodesCount();
+ if (node == way.firstNode()){
+ currentBaseNode = node;
+ if (n>1) previousNode = way.getNode(1);
+ } else if (node == way.lastNode()) {
+ currentBaseNode = node;
+ if (n>1) previousNode = way.getNode(n-2);
+ }
+ }
/**
* Repaint on mouse exit so that the helper line goes away.
@@ -1009,7 +1040,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
// only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise
// fall through to default action.
// (for semi-parallel lines, intersection might be miles away!)
- if (Main.map.mapView.getPoint(n).distance(Main.map.mapView.getPoint(intersection)) < snapToIntersectionThreshold) {
+ if (Main.map.mapView.getPoint2D(n).distance(Main.map.mapView.getPoint2D(intersection)) < snapToIntersectionThreshold) {
n.setEastNorth(intersection);
return;
}
@@ -1066,7 +1097,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
}
// This happens when nothing is selected, but we still want to highlight the "target node"
- if (mouseOnExistingNode == null && getCurrentDataSet().getSelected().size() == 0
+ if (mouseOnExistingNode == null && getCurrentDataSet().getSelected().isEmpty()
&& mousePos != null) {
mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
}
@@ -1079,7 +1110,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
}
// Insert the node into all the nearby way segments
- if (mouseOnExistingWays.size() == 0) {
+ if (mouseOnExistingWays.isEmpty()) {
Main.map.mapView.setNewCursor(cursor, this);
redrawIfRequired();
return;
@@ -1099,6 +1130,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
return redrawIfRequired();
}
+ @Override
public void paint(Graphics2D g, MapView mv, Bounds box) {
// sanity checks
if (Main.map.mapView == null || mousePos == null
@@ -1138,7 +1170,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
@Override
public String getModeHelpText() {
- String rv = "";
+ StringBuilder rv;
/*
* No modifiers: all (Connect, Node Re-Use, Auto-Weld)
* CTRL: disables node re-use, auto-weld
@@ -1161,15 +1193,15 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
// oldHighlights stores the current highlights. If this
// list is empty we can assume that we won't do any joins
if (ctrl || oldHighlights.isEmpty()) {
- rv = tr("Create new node.");
+ rv = new StringBuilder(tr("Create new node."));
} else {
// oldHighlights may store a node or way, check if it's a node
OsmPrimitive x = oldHighlights.iterator().next();
if (x instanceof Node) {
- rv = tr("Select node under cursor.");
+ rv = new StringBuilder(tr("Select node under cursor."));
} else {
- rv = trn("Insert new node into way.", "Insert new node into {0} ways.",
- oldHighlights.size(), oldHighlights.size());
+ rv = new StringBuilder(trn("Insert new node into way.", "Insert new node into {0} ways.",
+ oldHighlights.size(), oldHighlights.size()));
}
}
@@ -1178,12 +1210,12 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
*/
if (currentBaseNode != null && !wayIsFinished) {
if (alt) {
- rv += " " + tr("Start new way from last node.");
+ rv.append(" ").append(tr("Start new way from last node."));
} else {
- rv += " " + tr("Continue way from last node.");
+ rv.append(" ").append(tr("Continue way from last node."));
}
if (snapHelper.isSnapOn()) {
- rv += " "+ tr("Angle snapping active.");
+ rv.append(" ").append(tr("Angle snapping active."));
}
}
@@ -1193,25 +1225,25 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
*/
if (n != null && getCurrentDataSet() != null && getCurrentDataSet().getSelectedNodes().contains(n)) {
if (wayIsFinished) {
- rv = tr("Select node under cursor.");
+ rv = new StringBuilder(tr("Select node under cursor."));
} else {
- rv = tr("Finish drawing.");
+ rv = new StringBuilder(tr("Finish drawing."));
}
}
/*
* Handle special case: Self-Overlapping or closing way
*/
- if (getCurrentDataSet() != null && getCurrentDataSet().getSelectedWays().size() > 0 && !wayIsFinished && !alt) {
+ if (getCurrentDataSet() != null && !getCurrentDataSet().getSelectedWays().isEmpty() && !wayIsFinished && !alt) {
Way w = getCurrentDataSet().getSelectedWays().iterator().next();
for (Node m : w.getNodes()) {
if (m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w)) {
- rv += " " + tr("Finish drawing.");
+ rv.append(" ").append(tr("Finish drawing."));
break;
}
}
}
- return rv;
+ return rv.toString();
}
/**
@@ -1301,7 +1333,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
private EastNorth segmentPoint2; // remembered second point of base segment
private EastNorth projectionSource; // point that we are projecting to the line
- double snapAngles[];
+ double[] snapAngles;
double snapAngleTolerance;
double pe,pn; // (pe,pn) - direction of snapping line
@@ -1317,7 +1349,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
JCheckBoxMenuItem checkBox;
public final Color ORANGE_TRANSPARENT = new Color(Color.ORANGE.getRed(),Color.ORANGE.getGreen(),Color.ORANGE.getBlue(),128);
-
+
public void init() {
snapOn=false;
checkBox.setState(snapOn);
@@ -1333,7 +1365,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
snapAngles[i] = Double.parseDouble(s); i++;
snapAngles[i] = 360-Double.parseDouble(s); i++;
} catch (NumberFormatException e) {
- System.err.println("Warning: incorrect number in draw.anglesnap.angles preferences: "+s);
+ Main.warn("Incorrect number in draw.anglesnap.angles preferences: "+s);
snapAngles[i]=0;i++;
snapAngles[i]=0;i++;
}
@@ -1581,8 +1613,6 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
if (hdg>360) {
hdg-=360;
}
- //fixed=true;
- //absoluteFix=true;
customBaseHeading=hdg;
}
@@ -1638,11 +1668,11 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
private double getNearestAngle(double angle) {
double delta,minDelta=1e5, bestAngle=0.0;
- for (int i=0; i < snapAngles.length; i++) {
- delta = getAngleDelta(angle,snapAngles[i]);
+ for (double snapAngle : snapAngles) {
+ delta = getAngleDelta(angle, snapAngle);
if (delta < minDelta) {
- minDelta=delta;
- bestAngle=snapAngles[i];
+ minDelta = delta;
+ bestAngle = snapAngle;
}
}
if (Math.abs(bestAngle-360) < 1e-3) {
@@ -1669,14 +1699,14 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
MouseListener anglePopupListener = new PopupMenuLauncher( new JPopupMenu() {
JCheckBoxMenuItem repeatedCb = new JCheckBoxMenuItem(new AbstractAction(tr("Toggle snapping by {0}", getShortcut().getKeyText())){
- public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
Main.pref.put("draw.anglesnap.toggleOnRepeatedA", sel);
init();
}
});
JCheckBoxMenuItem helperCb = new JCheckBoxMenuItem(new AbstractAction(tr("Show helper geometry")){
- public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
Main.pref.put("draw.anglesnap.drawConstructionGeometry", sel);
Main.pref.put("draw.anglesnap.drawProjectedPoint", sel);
@@ -1686,7 +1716,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
}
});
JCheckBoxMenuItem projectionCb = new JCheckBoxMenuItem(new AbstractAction(tr("Snap to node projections")){
- public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
Main.pref.put("draw.anglesnap.projectionsnap", sel);
init();
@@ -1699,30 +1729,30 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
repeatedCb.setState(Main.pref.getBoolean("draw.anglesnap.toggleOnRepeatedA",true));
add(repeatedCb);
add(helperCb);
- add(projectionCb);;
+ add(projectionCb);
add(new AbstractAction(tr("Disable")) {
- public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
saveAngles("180");
init();
enableSnapping();
}
});
add(new AbstractAction(tr("0,90,...")) {
- public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
saveAngles("0","90","180");
init();
enableSnapping();
}
});
add(new AbstractAction(tr("0,45,90,...")) {
- public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
saveAngles("0","45","90","135","180");
init();
enableSnapping();
}
});
add(new AbstractAction(tr("0,30,45,60,90,...")) {
- public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
saveAngles("0","30","45","60","90","120","135","150","180");
init();
enableSnapping();
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index 88aebc5..537ff52 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.mapmode;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -65,13 +65,17 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
* If true, when extruding create new node even if segments parallel.
*/
private boolean alwaysCreateNodes = false;
+ private boolean nodeDragWithoutCtrl;
private long mouseDownTime = 0;
private WaySegment selectedSegment = null;
private Node selectedNode = null;
private Color mainColor;
private Stroke mainStroke;
-
+
+ /** settings value whether shared nodes should be ignored or not */
+ private boolean ignoreSharedNodes;
+
/**
* drawing settings for helper lines
*/
@@ -86,7 +90,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
*/
private List<ReferenceSegment> possibleMoveDirections;
-
+
/**
* Collection of nodes that is moved
*/
@@ -151,7 +155,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
private final AWTEventListener altKeyListener = new AWTEventListener() {
@Override
public void eventDispatched(AWTEvent e) {
- if(Main.map == null || Main.map.mapView == null || !Main.map.mapView.isActiveLayerDrawable())
+ if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable())
return;
InputEvent ie = (InputEvent) e;
boolean alt = (ie.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0;
@@ -201,6 +205,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
try {
Toolkit.getDefaultToolkit().addAWTEventListener(altKeyListener, AWTEvent.KEY_EVENT_MASK);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
mainColor = Main.pref.getColor(marktr("Extrude: main line"), null);
@@ -209,9 +214,11 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
helperStrokeDash = GuiHelper.getCustomizedStroke(Main.pref.get("extrude.stroke.helper-line", "1 4"));
helperStrokeRA = new BasicStroke(1);
symbolSize = Main.pref.getDouble("extrude.angle-symbol-radius", 8);
-
+ nodeDragWithoutCtrl = Main.pref.getBoolean("extrude.drag-nodes-without-ctrl", false);
oldLineStroke = GuiHelper.getCustomizedStroke(Main.pref.get("extrude.ctrl.stroke.old-line", "1"));
mainStroke = GuiHelper.getCustomizedStroke(Main.pref.get("extrude.stroke.main", "3"));
+
+ ignoreSharedNodes = Main.pref.getBoolean("extrude.ignore-shared-nodes", true);
}
@Override public void exitMode() {
@@ -221,6 +228,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(altKeyListener);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
super.exitMode();
}
@@ -237,23 +245,26 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
if (e.getButton() != MouseEvent.BUTTON1)
return;
+ requestFocusInMapView();
updateKeyModifiers(e);
-
+
selectedNode = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive.isSelectablePredicate);
selectedSegment = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive.isSelectablePredicate);
-
+
// If nothing gets caught, stay in select mode
if (selectedSegment == null && selectedNode == null) return;
-
+
if (selectedNode != null) {
- movingNodeList = new ArrayList<OsmPrimitive>();
- movingNodeList.add(selectedNode);
- calculatePossibleDirectionsByNode();
- if (possibleMoveDirections.isEmpty()) {
- // if no directions fould, do not enter dragging mode
- return;
+ if (ctrl || nodeDragWithoutCtrl) {
+ movingNodeList = new ArrayList<OsmPrimitive>();
+ movingNodeList.add(selectedNode);
+ calculatePossibleDirectionsByNode();
+ if (possibleMoveDirections.isEmpty()) {
+ // if no directions fould, do not enter dragging mode
+ return;
+ }
+ mode = Mode.translate_node;
}
- mode = Mode.translate_node;
} else {
// Otherwise switch to another mode
if (ctrl) {
@@ -273,7 +284,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
}
calculatePossibleDirectionsBySegment();
}
-
+
// Signifies that nothing has happened yet
newN1en = null;
newN2en = null;
@@ -381,10 +392,10 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
Main.map.mapView.repaint();
}
}
-
+
/**
* Insert node into nearby segment
- * @param e - current mouse point
+ * @param e - current mouse point
*/
private void addNewNode(MouseEvent e) {
// Should maybe do the same as in DrawAction and fetch all nearby segments?
@@ -432,17 +443,28 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
Collection<Command> cmds = new LinkedList<Command>();
Way wnew = new Way(selectedSegment.way);
boolean wayWasModified = false;
+ boolean wayWasSingleSegment = wnew.getNodesCount() == 2;
int insertionPoint = selectedSegment.lowerIndex + 1;
//find if the new points overlap existing segments (in case of 90 degree angles)
Node prevNode = getPreviousNode(selectedSegment.lowerIndex);
boolean nodeOverlapsSegment = prevNode != null && Geometry.segmentsParallel(initialN1en, prevNode.getEastNorth(), initialN1en, newN1en);
+ // segmentAngleZero marks subset of nodeOverlapsSegment. nodeOverlapsSegment is true if angle between segments is 0 or PI, segmentAngleZero only if angle is 0
+ boolean segmentAngleZero = prevNode != null && Math.abs(Geometry.getCornerAngle(prevNode.getEastNorth(), initialN1en, newN1en)) < 1e-5;
boolean hasOtherWays = this.hasNodeOtherWays(selectedSegment.getFirstNode(), selectedSegment.way);
if (nodeOverlapsSegment && !alwaysCreateNodes && !hasOtherWays) {
//move existing node
Node n1Old = selectedSegment.getFirstNode();
cmds.add(new MoveCommand(n1Old, Main.getProjection().eastNorth2latlon(newN1en)));
+ } else if (ignoreSharedNodes && segmentAngleZero && !alwaysCreateNodes && hasOtherWays) {
+ // replace shared node with new one
+ Node n1Old = selectedSegment.getFirstNode();
+ Node n1New = new Node(Main.getProjection().eastNorth2latlon(newN1en));
+ wnew.addNode(insertionPoint, n1New);
+ wnew.removeNode(n1Old);
+ wayWasModified = true;
+ cmds.add(new AddCommand(n1New));
} else {
//introduce new node
Node n1New = new Node(Main.getProjection().eastNorth2latlon(newN1en));
@@ -455,12 +477,21 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
//find if the new points overlap existing segments (in case of 90 degree angles)
Node nextNode = getNextNode(selectedSegment.lowerIndex + 1);
nodeOverlapsSegment = nextNode != null && Geometry.segmentsParallel(initialN2en, nextNode.getEastNorth(), initialN2en, newN2en);
+ segmentAngleZero = nextNode != null && Math.abs(Geometry.getCornerAngle(nextNode.getEastNorth(), initialN2en, newN2en)) < 1e-5;
hasOtherWays = hasNodeOtherWays(selectedSegment.getSecondNode(), selectedSegment.way);
if (nodeOverlapsSegment && !alwaysCreateNodes && !hasOtherWays) {
//move existing node
Node n2Old = selectedSegment.getSecondNode();
cmds.add(new MoveCommand(n2Old, Main.getProjection().eastNorth2latlon(newN2en)));
+ } else if (ignoreSharedNodes && segmentAngleZero && !alwaysCreateNodes && hasOtherWays) {
+ // replace shared node with new one
+ Node n2Old = selectedSegment.getSecondNode();
+ Node n2New = new Node(Main.getProjection().eastNorth2latlon(newN2en));
+ wnew.addNode(insertionPoint, n2New);
+ wnew.removeNode(n2Old);
+ wayWasModified = true;
+ cmds.add(new AddCommand(n2New));
} else {
//introduce new node
Node n2New = new Node(Main.getProjection().eastNorth2latlon(newN2en));
@@ -471,7 +502,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
}
//the way was a single segment, close the way
- if (wnew.getNodesCount() == 4) {
+ if (wayWasSingleSegment) {
wnew.addNode(selectedSegment.getFirstNode());
wayWasModified = true;
}
@@ -482,7 +513,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
Command c = new SequenceCommand(tr("Extrude Way"), cmds);
Main.main.undoRedo.add(c);
}
-
+
/**
* This method tests if a node has other ways apart from the given one.
* @param node
@@ -496,17 +527,17 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
}
return false;
}
-
+
/**
* Determine best movenemnt from initialMousePos to current position @param mouseEn,
* choosing one of the directions @field possibleMoveDirections
- * @return movement vector
+ * @return movement vector
*/
private EastNorth calculateBestMovement(EastNorth mouseEn) {
-
+
EastNorth initialMouseEn = Main.map.mapView.getEastNorth(initialMousePos.x, initialMousePos.y);
EastNorth mouseMovement = initialMouseEn.sub(mouseEn);
-
+
double bestDistance = Double.POSITIVE_INFINITY;
EastNorth bestMovement = null;
activeMoveDirection = null;
@@ -559,7 +590,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
// remember initial positions for segment nodes.
initialN1en = selectedSegment.getFirstNode().getEastNorth();
initialN2en = selectedSegment.getSecondNode().getEastNorth();
-
+
//add direction perpendicular to the selected segment
possibleMoveDirections = new ArrayList<ReferenceSegment>();
possibleMoveDirections.add(new ReferenceSegment(new EastNorth(
@@ -567,7 +598,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
initialN2en.getX() - initialN1en.getX()
), initialN1en, initialN2en, true));
-
+
//add directions parallel to neighbor segments
Node prevNode = getPreviousNode(selectedSegment.lowerIndex);
if (prevNode != null) {
@@ -587,7 +618,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
), initialN2en, en, false));
}
}
-
+
/**
* Gather possible move directions - along all adjacent segments
*/
@@ -603,12 +634,12 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
possibleMoveDirections.add(new ReferenceSegment(new EastNorth(
initialN1en.getX() - en.getX(),
initialN1en.getY() - en.getY()
- ), initialN1en, en, false));
+ ), initialN1en, en, false));
}
}
}
}
-
+
/**
* Gets a node from selected way before given index.
* @param index index of current node
@@ -678,8 +709,8 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
Point p3 = mv.getPoint(newN1en);
Point p4 = mv.getPoint(newN2en);
- EastNorth normalUnitVector = getNormalUniVector();
-
+ Point2D normalUnitVector = getNormalUniVector();
+
if (mode == Mode.extrude || mode == Mode.create_new) {
g2.setColor(mainColor);
g2.setStroke(mainStroke);
@@ -716,7 +747,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
g2.setColor(mainColor);
if (p1.distance(p2) < 3) {
g2.setStroke(mainStroke);
- g2.drawOval((int)(p1.x-symbolSize/2), (int)(p1.y-symbolSize/2),
+ g2.drawOval((int)(p1.x-symbolSize/2), (int)(p1.y-symbolSize/2),
(int)(symbolSize), (int)(symbolSize));
} else {
Line2D oldline = new Line2D.Double(p1, p2);
@@ -746,17 +777,17 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
g2.setStroke(helperStrokeRA); // restore default stroke to prevent starnge occasional drawings
}
}
-
- private EastNorth getNormalUniVector() {
- double fac = 1.0 / activeMoveDirection.en.distance(0,0);
+
+ private Point2D getNormalUniVector() {
+ double fac = 1.0 / activeMoveDirection.en.length();
// mult by factor to get unit vector.
- EastNorth normalUnitVector = new EastNorth(activeMoveDirection.en.getX() * fac, activeMoveDirection.en.getY() * fac);
+ Point2D normalUnitVector = new Point2D.Double(activeMoveDirection.en.getX() * fac, activeMoveDirection.en.getY() * fac);
// Check to see if our new N1 is in a positive direction with respect to the normalUnitVector.
// Even if the x component is zero, we should still be able to discern using +0.0 and -0.0
if (newN1en != null && ((newN1en.getX() > initialN1en.getX()) != (normalUnitVector.getX() > -0.0))) {
// If not, use a sign-flipped version of the normalUnitVector.
- normalUnitVector = new EastNorth(-normalUnitVector.getX(), -normalUnitVector.getY());
+ normalUnitVector = new Point2D.Double(-normalUnitVector.getX(), -normalUnitVector.getY());
}
//HACK: swap Y, because the target pixels are top down, but EastNorth is bottom-up.
@@ -764,19 +795,19 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable {
normalUnitVector.setLocation(normalUnitVector.getX(), -normalUnitVector.getY());
return normalUnitVector;
}
-
- private void drawAngleSymbol(Graphics2D g2, Point2D center, EastNorth normal, boolean mirror) {
+
+ private void drawAngleSymbol(Graphics2D g2, Point2D center, Point2D normal, boolean mirror) {
// EastNorth units per pixel
double factor = 1.0/g2.getTransform().getScaleX();
double raoffsetx = symbolSize*factor*normal.getX();
double raoffsety = symbolSize*factor*normal.getY();
-
- double cx = center.getX(), cy = center.getY();
+
+ double cx = center.getX(), cy = center.getY();
double k = (mirror ? -1 : 1);
Point2D ra1 = new Point2D.Double(cx + raoffsetx, cy + raoffsety);
Point2D ra3 = new Point2D.Double(cx - raoffsety*k, cy + raoffsetx*k);
Point2D ra2 = new Point2D.Double(ra1.getX() - raoffsety*k, ra1.getY() + raoffsetx*k);
-
+
GeneralPath ra = new GeneralPath();
ra.moveTo((float)ra1.getX(), (float)ra1.getY());
ra.lineTo((float)ra2.getX(), (float)ra2.getY());
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index 8a51c7e..2c010c1 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -1,15 +1,16 @@
// License: GPL. See LICENSE file for details.
package org.openstreetmap.josm.actions.mapmode;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.AWTEvent;
-import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Graphics2D;
import java.awt.Point;
+import java.awt.Stroke;
import java.awt.Toolkit;
import java.awt.event.AWTEventListener;
import java.awt.event.InputEvent;
@@ -18,7 +19,6 @@ import java.awt.event.MouseEvent;
import java.awt.geom.GeneralPath;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -45,6 +45,7 @@ import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MapViewPaintable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Shortcut;
@@ -80,11 +81,12 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
final private Cursor cursorImproveAddLock;
final private Cursor cursorImproveLock;
- private final Color guideColor;
- private final BasicStroke selectTargetWayStroke;
- private final BasicStroke moveNodeStroke;
- private final BasicStroke addNodeStroke;
- private final BasicStroke deleteNodeStroke;
+ private Color guideColor;
+ private Stroke selectTargetWayStroke;
+ private Stroke moveNodeStroke;
+ private Stroke addNodeStroke;
+ private Stroke deleteNodeStroke;
+ private int dotSize;
private boolean selectionChangedBlocked = false;
@@ -106,16 +108,6 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
"add_node_lock");
cursorImproveLock = ImageProvider.getCursor("crosshair", "lock");
- guideColor = PaintColors.HIGHLIGHT.get();
- selectTargetWayStroke = new BasicStroke(2, BasicStroke.CAP_ROUND,
- BasicStroke.JOIN_ROUND);
- float dash1[] = {4.0f};
- moveNodeStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f);
- addNodeStroke = new BasicStroke(1, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER);
- deleteNodeStroke = new BasicStroke(1, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER);
}
// -------------------------------------------------------------------------
@@ -128,6 +120,15 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
}
super.enterMode();
+ guideColor = Main.pref.getColor(marktr("improve way accuracy helper line"), null);
+ if (guideColor == null) guideColor = PaintColors.HIGHLIGHT.get();
+
+ selectTargetWayStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.select-target", "2"));
+ moveNodeStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.move-node", "1 6"));
+ addNodeStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.add-node", "1"));
+ deleteNodeStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.delete-node", "1"));
+ dotSize = Main.pref.getInteger("improvewayaccuracy.dot-size",6);
+
mv = Main.map.mapView;
mousePos = null;
oldModeHelpText = "";
@@ -147,6 +148,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
Toolkit.getDefaultToolkit().addAWTEventListener(this,
AWTEvent.KEY_EVENT_MASK);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
}
@@ -162,6 +164,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
Main.map.mapView.repaint();
@@ -204,7 +207,6 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
@Override
protected void updateEnabledState() {
setEnabled(getEditLayer() != null);
- // setEnabled(Main.main.getActiveLayer() instanceof OsmDataLayer);
}
// -------------------------------------------------------------------------
@@ -308,7 +310,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
// Highlighting candidateNode
if (candidateNode != null) {
p1 = mv.getPoint(candidateNode);
- g.fillRect(p1.x - 2, p1.y - 2, 6, 6);
+ g.fillRect(p1.x - dotSize/2, p1.y - dotSize/2, dotSize, dotSize);
}
}
@@ -319,8 +321,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
// -------------------------------------------------------------------------
@Override
public void eventDispatched(AWTEvent event) {
- if (Main.map == null || Main.map.mapView == null
- || !Main.map.mapView.isActiveLayerDrawable()) {
+ if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable()) {
return;
}
updateKeyModifiers((InputEvent) event);
@@ -433,8 +434,8 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
}
// Finishing the sequence command
- String text = trn("Add and a new node to way",
- "Add and a new node to {0} ways",
+ String text = trn("Add a new node to way",
+ "Add a new node to {0} ways",
virtualSegments.size(), virtualSegments.size());
Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
@@ -442,17 +443,6 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
} else if (alt && !ctrl && candidateNode != null) {
// Deleting the highlighted node
- //check to see if node has interesting keys
- Iterator<String> keyIterator = candidateNode.getKeys().keySet().iterator();
- boolean hasTags = false;
- while (keyIterator.hasNext()) {
- String key = keyIterator.next();
- if (!OsmPrimitive.isUninterestingKey(key)) {
- hasTags = true;
- break;
- }
- }
-
//check to see if node is in use by more than one object
List<OsmPrimitive> referrers = candidateNode.getReferrers();
List<Way> ways = OsmPrimitive.getFilteredList(referrers, Way.class);
@@ -460,7 +450,7 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
JOptionPane.showMessageDialog(Main.parent,
tr("Cannot delete node that is referenced by multiple objects"),
tr("Error"), JOptionPane.ERROR_MESSAGE);
- } else if (hasTags) {
+ } else if (candidateNode.isTagged()) {
JOptionPane.showMessageDialog(Main.parent,
tr("Cannot delete node that has tags"),
tr("Error"), JOptionPane.ERROR_MESSAGE);
@@ -468,7 +458,9 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
List<Node> nodeList = new ArrayList<Node>();
nodeList.add(candidateNode);
Command deleteCmd = DeleteCommand.delete(getEditLayer(), nodeList, true);
- Main.main.undoRedo.add(deleteCmd);
+ if (deleteCmd != null) {
+ Main.main.undoRedo.add(deleteCmd);
+ }
}
@@ -607,8 +599,8 @@ public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintabl
*
*/
private void updateStateByCurrentSelection() {
- final ArrayList<Node> nodeList = new ArrayList<Node>();
- final ArrayList<Way> wayList = new ArrayList<Way>();
+ final List<Node> nodeList = new ArrayList<Node>();
+ final List<Way> wayList = new ArrayList<Way>();
final Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
// Collecting nodes and ways from the selection
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
index b1358a8..8c6bd09 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
@@ -21,15 +21,19 @@ import org.openstreetmap.josm.tools.Pair;
*
* @author Alexander Kachkaev <alexander at kachkaev.ru>, 2011
*/
-class ImproveWayAccuracyHelper {
+final class ImproveWayAccuracyHelper {
+ private ImproveWayAccuracyHelper() {
+ // Hide default constructor for utils classes
+ }
+
/**
* Finds the way to work on. If the mouse is on the node, extracts one of
* the ways containing it. If the mouse is on the way, simply returns it.
*
- * @param mv
- * @param p
- * @return Way or null in case there is nothing under the cursor.
+ * @param mv the current map view
+ * @param p the cursor position
+ * @return {@code Way} or {@code null} in case there is nothing under the cursor.
*/
public static Way findWay(MapView mv, Point p) {
if (mv == null || p == null) {
@@ -63,10 +67,10 @@ class ImproveWayAccuracyHelper {
* are neglected. This is to avoid way self-intersection after moving the
* candidateNode to a new place.
*
- * @param mv
- * @param w
- * @param p
- * @return
+ * @param mv the current map view
+ * @param w the way to check
+ * @param p the cursor position
+ * @return nearest node to cursor
*/
public static Node findCandidateNode(MapView mv, Way w, Point p) {
if (mv == null || w == null || p == null) {
@@ -113,10 +117,10 @@ class ImproveWayAccuracyHelper {
* The priority is given to segments where c is in ab. Otherwise, a segment
* with the largest angle apb is chosen.
*
- * @param mv
- * @param w
- * @param p
- * @return
+ * @param mv the current map view
+ * @param w the way to check
+ * @param p the cursor position
+ * @return nearest way segment to cursor
*/
public static WaySegment findCandidateSegment(MapView mv, Way w, Point p) {
if (mv == null || w == null || p == null) {
diff --git a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
index 10548ae..ce552fc 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
@@ -48,11 +48,18 @@ abstract public class MapMode extends JosmAction implements MouseListener, Mouse
this.cursor = cursor;
}
+ /**
+ * Makes this map mode active.
+ */
public void enterMode() {
putValue("active", true);
Main.map.mapView.setNewCursor(cursor, this);
updateStatusLine();
}
+
+ /**
+ * Makes this map mode inactive.
+ */
public void exitMode() {
putValue("active", false);
Main.map.mapView.resetCursor(this);
@@ -69,6 +76,7 @@ abstract public class MapMode extends JosmAction implements MouseListener, Mouse
/**
* Call selectMapMode(this) on the parent mapFrame.
*/
+ @Override
public void actionPerformed(ActionEvent e) {
if (Main.isDisplayingMapView()) {
Main.map.selectMapMode(this);
@@ -95,11 +103,25 @@ abstract public class MapMode extends JosmAction implements MouseListener, Mouse
shift = (modifiers & ActionEvent.SHIFT_MASK) != 0;
}
- public void mouseReleased(MouseEvent e) {}
+ protected void requestFocusInMapView() {
+ if (isEnabled()) {
+ // request focus in order to enable the expected keyboard shortcuts (see #8710)
+ Main.map.mapView.requestFocus();
+ }
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {requestFocusInMapView();}
+ @Override
public void mouseExited(MouseEvent e) {}
- public void mousePressed(MouseEvent e) {}
+ @Override
+ public void mousePressed(MouseEvent e) {requestFocusInMapView();}
+ @Override
public void mouseClicked(MouseEvent e) {}
+ @Override
public void mouseEntered(MouseEvent e) {}
+ @Override
public void mouseMoved(MouseEvent e) {}
+ @Override
public void mouseDragged(MouseEvent e) {}
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index 3b3d1cd..f26be1b 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -2,10 +2,10 @@
package org.openstreetmap.josm.actions.mapmode;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.AWTEvent;
-import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Graphics2D;
@@ -18,16 +18,20 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.Collection;
import java.util.LinkedHashSet;
+import java.util.Set;
import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -35,6 +39,7 @@ import org.openstreetmap.josm.gui.NavigatableComponent.SystemOfMeasurement;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MapViewPaintable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -78,9 +83,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author Ole Jørgen Brønner (olejorgenb)
*/
-public class ParallelWayAction extends MapMode implements AWTEventListener, MapViewPaintable {
-
- private static final long serialVersionUID = 1L;
+public class ParallelWayAction extends MapMode implements AWTEventListener, MapViewPaintable, PreferenceChangedListener {
private enum Mode {
dragging, normal
@@ -95,10 +98,11 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
private boolean snap;
private boolean snapDefault;
- private double snapThreshold;
+ private double snapThreshold;
private double snapDistanceMetric;
private double snapDistanceImperial;
private double snapDistanceChinese;
+ private double snapDistanceNautical;
private ModifiersSpec snapModifierCombo;
private ModifiersSpec copyTagsModifierCombo;
@@ -118,10 +122,14 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
private WaySegment referenceSegment;
private ParallelWays pWays;
- LinkedHashSet<Way> sourceWays;
+ private Set<Way> sourceWays;
private EastNorth helperLineStart;
private EastNorth helperLineEnd;
+ Stroke helpLineStroke;
+ Stroke refLineStroke;
+ Color mainColor;
+
public ParallelWayAction(MapFrame mapFrame) {
super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"),
Shortcut.registerShortcut("mapmode:parallel", tr("Mode: {0}",
@@ -130,6 +138,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
putValue("help", ht("/Action/Parallel"));
mv = mapFrame.mapView;
updateModeLocalPreferences();
+ Main.pref.addPreferenceChangeListener(this);
}
@Override
@@ -145,10 +154,16 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
mv.addMouseMotionListener(this);
mv.addTemporaryLayer(this);
+ helpLineStroke = GuiHelper.getCustomizedStroke(getStringPref("stroke.hepler-line", "1" ));
+ refLineStroke = GuiHelper.getCustomizedStroke(getStringPref("stroke.ref-line", "1 2 2"));
+ mainColor = Main.pref.getColor(marktr("make parallel helper line"), null);
+ if (mainColor == null) mainColor = PaintColors.SELECTED.get();
+
//// Needed to update the mouse cursor if modifiers are changed when the mouse is motionless
try {
Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
sourceWays = new LinkedHashSet<Way>(getCurrentDataSet().getSelectedWays());
for (Way w : sourceWays) {
@@ -168,6 +183,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
} catch (SecurityException ex) {
+ Main.warn(ex);
}
removeWayHighlighting(sourceWays);
pWays = null;
@@ -198,7 +214,6 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
private void updateModeLocalPreferences() {
// @formatter:off
- //snapThreshold = Main.pref.getDouble (prefKey("snap-threshold"), 0.35); // Old preference was stored in meters, hence the new name (percent)
snapThreshold = Main.pref.getDouble (prefKey("snap-threshold-percent"), 0.70);
snapDefault = Main.pref.getBoolean(prefKey("snap-default"), true);
copyTagsDefault = Main.pref.getBoolean(prefKey("copy-tags-default"), true);
@@ -206,6 +221,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
snapDistanceMetric = Main.pref.getDouble(prefKey("snap-distance-metric"), 0.5);
snapDistanceImperial = Main.pref.getDouble(prefKey("snap-distance-imperial"), 1);
snapDistanceChinese = Main.pref.getDouble(prefKey("snap-distance-chinese"), 1);
+ snapDistanceNautical = Main.pref.getDouble(prefKey("snap-distance-nautical"), 0.1);
snapModifierCombo = new ModifiersSpec(getStringPref("snap-modifier-combo", "?sC"));
copyTagsModifierCombo = new ModifiersSpec(getStringPref("copy-tags-modifier-combo", "As?"));
@@ -272,11 +288,6 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
updateStatusLine();
}
- private boolean isValidModifierCombination() {
- // TODO: implement to give feedback on invalid modifier combination
- return true;
- }
-
private boolean sanityCheck() {
// @formatter:off
boolean areWeSane =
@@ -290,12 +301,13 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
@Override
public void mousePressed(MouseEvent e) {
+ requestFocusInMapView();
updateModifiersState(e);
// Other buttons are off limit, but we still get events.
if (e.getButton() != MouseEvent.BUTTON1)
return;
- if(sanityCheck() == false)
+ if (!sanityCheck())
return;
updateFlagsOnlyChangeableOnPress();
@@ -398,7 +410,7 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
setMode(Mode.dragging);
}
- //// Calculate distance to the reference line
+ // Calculate distance to the reference line
EastNorth enp = mv.getEastNorth((int) p.getX(), (int) p.getY());
EastNorth nearestPointOnRefLine = Geometry.closestPointToLine(referenceSegment.getFirstNode().getEastNorth(),
referenceSegment.getSecondNode().getEastNorth(), enp);
@@ -421,6 +433,8 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
snapDistance = snapDistanceChinese * NavigatableComponent.CHINESE_SOM.aValue;
} else if (som.equals(NavigatableComponent.IMPERIAL_SOM)) {
snapDistance = snapDistanceImperial * NavigatableComponent.IMPERIAL_SOM.aValue;
+ } else if (som.equals(NavigatableComponent.NAUTICAL_MILE_SOM)) {
+ snapDistance = snapDistanceNautical * NavigatableComponent.NAUTICAL_MILE_SOM.aValue;
} else {
snapDistance = snapDistanceMetric; // Metric system by default
}
@@ -462,17 +476,14 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
return;
// FIXME: should clip the line (gets insanely slow when zoomed in on a very long line
- Stroke refLineStroke = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 10.0f, new float[] {
- 2f, 2f }, 0f);
g.setStroke(refLineStroke);
- g.setColor(Color.RED);
+ g.setColor(mainColor);
Point p1 = mv.getPoint(referenceSegment.getFirstNode().getEastNorth());
Point p2 = mv.getPoint(referenceSegment.getSecondNode().getEastNorth());
g.drawLine(p1.x, p1.y, p2.x, p2.y);
- Stroke helpLineStroke = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL);
g.setStroke(helpLineStroke);
- g.setColor(Color.RED);
+ g.setColor(mainColor);
p1 = mv.getPoint(helperLineStart);
p2 = mv.getPoint(helperLineEnd);
g.drawLine(p1.x, p1.y, p2.x, p2.y);
@@ -509,8 +520,6 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
private void clearSourceWays() {
assert (sourceWays != null);
- if (sourceWays == null)
- return;
getCurrentDataSet().clearSelection(sourceWays);
for (Way w : sourceWays) {
w.setHighlighted(false);
@@ -572,7 +581,16 @@ public class ParallelWayAction extends MapMode implements AWTEventListener, MapV
return Main.pref.get(prefKey(subKey), def);
}
- private String getStringPref(String subKey) {
- return getStringPref(subKey, null);
+ @Override
+ public void preferenceChanged(PreferenceChangeEvent e) {
+ if (e.getKey().startsWith(prefKey(""))) {
+ updateAllPreferences();
+ }
+ }
+
+ @Override
+ public void destroy() {
+ super.destroy();
+ Main.pref.removePreferenceChangeListener(this);
}
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
index 5422e54..389fed8 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java
@@ -5,7 +5,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.CombineWayAction;
@@ -19,7 +21,7 @@ import org.openstreetmap.josm.tools.Geometry;
/**
* Helper for ParallelWayAction
- *
+ *
* @author Ole Jørgen Brønner (olejorgenb)
*/
public class ParallelWays {
@@ -35,7 +37,7 @@ public class ParallelWays {
public ParallelWays(Collection<Way> sourceWays, boolean copyTags, int refWayIndex) {
// Possible/sensible to use PrimetiveDeepCopy here?
- //// Make a deep copy of the ways, keeping the copied ways connected
+ // Make a deep copy of the ways, keeping the copied ways connected
// TODO: This assumes the first/last nodes of the ways are the only possible shared nodes.
HashMap<Node, Node> splitNodeMap = new HashMap<Node, Node>(sourceWays.size());
for (Way w : sourceWays) {
@@ -61,13 +63,31 @@ public class ParallelWays {
}
sourceWays = null; // Ensure that we only use the copies from now
- //// Find a linear ordering of the nodes. Fail if there isn't one.
+ // Find a linear ordering of the nodes. Fail if there isn't one.
CombineWayAction.NodeGraph nodeGraph = CombineWayAction.NodeGraph.createUndirectedGraphFromNodeWays(ways);
- sortedNodes = nodeGraph.buildSpanningPath();
- if (sortedNodes == null)
+ List<Node> sortedNodesPath = nodeGraph.buildSpanningPath();
+ if (sortedNodesPath == null)
throw new IllegalArgumentException("Ways must have spanning path"); // Create a dedicated exception?
- //// Ugly method of ensuring that the offset isn't inverted. I'm sure there is a better and more elegant way, but I'm starting to get sleepy, so I do this for now.
+ // Fix #8631 - Remove duplicated nodes from graph to be robust with self-intersecting ways
+ Set<Node> removedNodes = new HashSet<Node>();
+ sortedNodes = new ArrayList<Node>();
+ for (int i = 0; i < sortedNodesPath.size(); i++) {
+ Node n = sortedNodesPath.get(i);
+ if (i < sortedNodesPath.size()-1) {
+ if (sortedNodesPath.get(i+1).getCoor().equals(n.getCoor())) {
+ removedNodes.add(n);
+ for (Way w : ways)
+ w.removeNode(n);
+ continue;
+ }
+ }
+ if (!removedNodes.contains(n)) {
+ sortedNodes.add(n);
+ }
+ }
+
+ // Ugly method of ensuring that the offset isn't inverted. I'm sure there is a better and more elegant way, but I'm starting to get sleepy, so I do this for now.
{
Way refWay = ways.get(refWayIndex);
boolean refWayReversed = true;
@@ -82,7 +102,7 @@ public class ParallelWays {
}
}
- //// Initialize the required parameters. (segment normals, etc.)
+ // Initialize the required parameters. (segment normals, etc.)
nodeCount = sortedNodes.size();
pts = new EastNorth[nodeCount];
normals = new EastNorth[nodeCount - 1];
@@ -109,11 +129,9 @@ public class ParallelWays {
* @param d
*/
public void changeOffset(double d) {
- //// This is the core algorithm:
- /* 1. Calculate a parallel line, offset by 'd', to each segment in
- * the path
- * 2. Find the intersection of lines belonging to neighboring
- * segments. These become the new node positions
+ // This is the core algorithm:
+ /* 1. Calculate a parallel line, offset by 'd', to each segment in the path
+ * 2. Find the intersection of lines belonging to neighboring segments. These become the new node positions
* 3. Do some special casing for closed paths
*
* Simple and probably not even close to optimal performance wise
@@ -159,13 +177,10 @@ public class ParallelWays {
}
private List<Command> makeAddWayAndNodesCommandList() {
- ArrayList<Command> commands = new ArrayList<Command>(sortedNodes.size() + ways.size());
- for (int i = 0; i < sortedNodes.size() - 1; i++) {
+ List<Command> commands = new ArrayList<Command>(sortedNodes.size() + ways.size());
+ for (int i = 0; i < sortedNodes.size() - (isClosedPath() ? 1 : 0); i++) {
commands.add(new AddCommand(sortedNodes.get(i)));
}
- if (!isClosedPath()) {
- commands.add(new AddCommand(sortedNodes.get(sortedNodes.size() - 1)));
- }
for (Way w : ways) {
commands.add(new AddCommand(w));
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java b/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
index 8809884..a5755c4 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.mapmode;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -24,6 +24,10 @@ public class PlayHeadDragMode extends MapMode {
private Point mouseStart = null;
private PlayHeadMarker playHeadMarker = null;
+ /**
+ * Constructs a new {@code PlayHeadDragMode}.
+ * @param m Audio marker
+ */
public PlayHeadDragMode(PlayHeadMarker m) {
super(tr("Drag play head"), "playheaddrag", tr("Drag play head"), null,
Main.map, Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
@@ -50,7 +54,6 @@ public class PlayHeadDragMode extends MapMode {
if (mouseStart == null || mousePos == null) return;
if ((ev.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) return;
Point p = ev.getPoint();
- if (p == null) return;
if (! dragging) {
if (p.distance(mouseStart) < 3) return;
playHeadMarker.startDrag();
@@ -67,6 +70,7 @@ public class PlayHeadDragMode extends MapMode {
if (ev.getButton() != MouseEvent.BUTTON1 || p == null || ! dragging)
return;
+ requestFocusInMapView();
updateKeyModifiers(ev);
EastNorth en = Main.map.mapView.getEastNorth(ev.getX(), ev.getY());
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index 5132472..ae37d59 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.mapmode;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -36,6 +36,7 @@ import org.openstreetmap.josm.command.RotateCommand;
import org.openstreetmap.josm.command.ScaleCommand;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -189,7 +190,9 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
// This is required to update the cursors when ctrl/shift/alt is pressed
try {
Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
- } catch (SecurityException ex) {}
+ } catch (SecurityException ex) {
+ Main.warn(ex);
+ }
}
@Override
@@ -201,15 +204,18 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
mv.setVirtualNodesEnabled(false);
try {
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
- } catch (SecurityException ex) {}
+ } catch (SecurityException ex) {
+ Main.warn(ex);
+ }
removeHighlighting();
}
int previousModifiers;
-
+
/**
* This is called whenever the keyboard modifier status changes
*/
+ @Override
public void eventDispatched(AWTEvent e) {
if(oldEvent == null)
return;
@@ -227,8 +233,8 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
/**
* handles adding highlights and updating the cursor for the given mouse event.
* Please note that the highlighting for merging while moving is handled via mouseDragged.
- * @param MouseEvent which should be used as base for the feedback
- * @return true if repaint is required
+ * @param e {@code MouseEvent} which should be used as base for the feedback
+ * @return {@code true} if repaint is required
*/
private boolean giveUserFeedback(MouseEvent e) {
return giveUserFeedback(e, e.getModifiers());
@@ -237,9 +243,9 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
/**
* handles adding highlights and updating the cursor for the given mouse event.
* Please note that the highlighting for merging while moving is handled via mouseDragged.
- * @param MouseEvent which should be used as base for the feedback
- * @param define custom keyboard modifiers if the ones from MouseEvent are outdated or similar
- * @return true if repaint is required
+ * @param e {@code MouseEvent} which should be used as base for the feedback
+ * @param modifiers define custom keyboard modifiers if the ones from MouseEvent are outdated or similar
+ * @return {@code true} if repaint is required
*/
private boolean giveUserFeedback(MouseEvent e, int modifiers) {
Collection<OsmPrimitive> c = MapView.asColl(
@@ -281,7 +287,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
return repaintIfRequired(newHighlights);
}
-
+
/**
* works out which cursor should be displayed for most of SelectAction's
* features. The only exception is the "move" cursor when actually dragging
@@ -309,7 +315,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
// only show merge to node cursor if nearby node and that node is currently
// not being dragged
- final boolean hasTarget = osm != null && osm instanceof Node && !osm.isSelected();
+ final boolean hasTarget = osm instanceof Node && !osm.isSelected();
c = hasTarget ? "merge_to_node" : "merge";
break;
}
@@ -360,7 +366,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
return true;
}
- private boolean repaintIfRequired(HashSet<OsmPrimitive> newHighlights) {
+ private boolean repaintIfRequired(Set<OsmPrimitive> newHighlights) {
if(!drawTargetHighlight)
return false;
@@ -380,7 +386,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
oldHighlights = newHighlights;
return needsRepaint;
}
-
+
/**
* Look, whether any object is selected. If not, select the nearest node.
* If there are no nodes in the dataset, do nothing.
@@ -396,9 +402,9 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
// return early
if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || mouseDownButton != MouseEvent.BUTTON1)
return;
-
+
// left-button mouse click only is processed here
-
+
// request focus in order to enable the expected keyboard shortcuts
mv.requestFocus();
@@ -415,11 +421,11 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
startEN = mv.getEastNorth(lastMousePos.x,lastMousePos.y);
// primitives under cursor are stored in c collection
-
+
OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(e.getPoint(), OsmPrimitive.isSelectablePredicate, true);
determineMapMode(nearestPrimitive!=null);
-
+
switch(mode) {
case rotate:
case scale:
@@ -444,6 +450,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
useLastMoveCommandIfPossible();
// Schedule a timer to update status line "initialMoveDelay+1" ms in the future
GuiHelper.scheduleTimer(initialMoveDelay+1, new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
updateStatusLine();
}
@@ -461,7 +468,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
updateStatusLine();
}
-
+
@Override
public void mouseMoved(MouseEvent e) {
// Mac OSX simulates with ctrl + mouse 1 the second mouse button hence no dragging events get fired.
@@ -474,7 +481,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
mv.repaint();
}
}
-
+
/**
* If the left mouse button is pressed, move all currently selected
* objects (if one of them is under the mouse) or the current one under the
@@ -484,12 +491,12 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
public void mouseDragged(MouseEvent e) {
if (!mv.isActiveLayerVisible())
return;
-
+
// Swing sends random mouseDragged events when closing dialogs by double-clicking their top-left icon on Windows
// Ignore such false events to prevent issues like #7078
if (mouseDownButton == MouseEvent.BUTTON1 && mouseReleaseTime > mouseDownTime)
return;
-
+
cancelDrawMode = true;
if (mode == Mode.select)
return;
@@ -541,7 +548,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
if (e.getPoint().equals(lastMousePos))
return;
-
+
EastNorth currentEN = mv.getEastNorth(e.getX(), e.getY());
if (virtualManager.hasVirtualWaysToBeConstructed()) {
@@ -558,7 +565,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
didMouseDrag = true;
}
-
+
@Override
public void mouseExited(MouseEvent e) {
@@ -567,7 +574,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
}
-
+
@Override
public void mouseReleased(MouseEvent e) {
if (!mv.isActiveLayerVisible())
@@ -603,6 +610,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
// We need to do it like this as otherwise drawAction will see a double
// click and switch back to SelectMode
Main.worker.execute(new Runnable() {
+ @Override
public void run() {
Main.map.selectDrawTool(true);
}
@@ -652,7 +660,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
mode = Mode.select;
}
}
-
+
/** returns true whenever elements have been grabbed and moved (i.e. the initial
* thresholds have been exceeded) and is still in progress (i.e. mouse button
* still pressed)
@@ -661,9 +669,9 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
return didMouseDrag && startingDraggingPos != null;
}
-
+
/**
- * Create or update data modification command while dragging mouse - implementation of
+ * Create or update data modification command while dragging mouse - implementation of
* continuous moving, scaling and rotation
* @param currentEN - mouse position
* @return status of action (<code>true</code> when action was performed)
@@ -676,7 +684,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
OsmPrimitive nearestPrimitive = mv.getNearestNodeOrWay(mv.getPoint(startEN), OsmPrimitive.isSelectablePredicate, true);
getCurrentDataSet().setSelected(nearestPrimitive);
}
-
+
Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
// for these transformations, having only one node makes no sense - quit silently
if (affectedNodes.size() < 2 && (mode == Mode.rotate || mode == Mode.scale)) {
@@ -694,7 +702,8 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
c = new MoveCommand(selection, startEN, currentEN));
}
for (Node n : affectedNodes) {
- if (n.getCoor().isOutSideWorld()) {
+ LatLon ll = n.getCoor();
+ if (ll != null && ll.isOutSideWorld()) {
// Revert move
((MoveCommand) c).resetToCheckpoint();
getCurrentDataSet().endUpdate();
@@ -709,29 +718,47 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
} else {
startEN = currentEN; // drag can continue after scaling/rotation
-
+
+ if (mode != Mode.rotate && mode != Mode.scale) {
+ return false;
+ }
+
+ getCurrentDataSet().beginUpdate();
+
if (mode == Mode.rotate) {
- getCurrentDataSet().beginUpdate();
if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand) c).getTransformedNodes())) {
((RotateCommand) c).handleEvent(currentEN);
} else {
Main.main.undoRedo.add(new RotateCommand(selection, currentEN));
}
} else if (mode == Mode.scale) {
- getCurrentDataSet().beginUpdate();
if (c instanceof ScaleCommand && affectedNodes.equals(((ScaleCommand) c).getTransformedNodes())) {
((ScaleCommand) c).handleEvent(currentEN);
} else {
Main.main.undoRedo.add(new ScaleCommand(selection, currentEN));
}
- } else {
- return false;
+ }
+
+ Collection<Way> ways = getCurrentDataSet().getSelectedWays();
+ if (doesImpactStatusLine(affectedNodes, ways)) {
+ Main.map.statusLine.setDist(ways);
}
}
getCurrentDataSet().endUpdate();
return true;
}
-
+
+ private boolean doesImpactStatusLine(Collection<Node> affectedNodes, Collection<Way> selectedWays) {
+ for (Way w : selectedWays) {
+ for (Node n : w.getNodes()) {
+ if (affectedNodes.contains(n)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
/**
* Adapt last move command (if it is suitable) to work with next drag, started at point startEN
*/
@@ -743,7 +770,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
((MoveCommand) c).changeStartPoint(startEN);
}
}
-
+
/**
* Obtain command in undoRedo stack to "continue" when dragging
*/
@@ -755,7 +782,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
return c;
}
-
+
/**
* Present warning in case of large and possibly unwanted movements and undo
* unwanted movements.
@@ -793,9 +820,9 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
getCurrentDataSet().fireSelectionChanged();
}
-
+
/**
- * Merges the selected nodes to the one closest to the given mouse position iff the control
+ * Merges the selected nodes to the one closest to the given mouse position if the control
* key is pressed. If there is no such node, no action will be done and no error will be
* reported. If there is, it will execute the merge and add it to the undo buffer.
*/
@@ -831,14 +858,14 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
// Virtual Ways: if non-empty the cursor is above a virtual node. So don't highlight
// anything if about to drag the virtual node (i.e. !released) but continue if the
// cursor is only released above a virtual node by accident (i.e. released). See #7018
- if ((shift && ctrl) || (ctrl && !released) || (virtualManager.hasVirtualWaysToBeConstructed() && !released))
+ if (ds == null || (shift && ctrl) || (ctrl && !released) || (virtualManager.hasVirtualWaysToBeConstructed() && !released))
return;
if (!released) {
// Don't replace the selection if the user clicked on a
// selected object (it breaks moving of selected groups).
// Do it later, on mouse release.
- shift |= getCurrentDataSet().getSelected().containsAll(prims);
+ shift |= ds.getSelected().containsAll(prims);
}
if (ctrl) {
@@ -889,10 +916,10 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
this.selectionManager.setLassoMode(lassoMode);
this.lassoMode = lassoMode;
}
-
+
CycleManager cycleManager = new CycleManager();
VirtualManager virtualManager = new VirtualManager();
-
+
private class CycleManager {
private Collection<OsmPrimitive> cycleList = Collections.emptyList();
@@ -907,7 +934,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
waitForMouseUpParameter = Main.pref.getBoolean("mappaint.select.waits-for-mouse-up", false);
multipleMatchesParameter = Main.pref.getBoolean("selectaction.cycles.multiple.matches", false);
}
-
+
/**
* Determine prmitive to be selected and build cycleList
* @param nearest primitive found by simple method
@@ -920,11 +947,8 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
if (nearest != null) {
osm = nearest;
- // Point p = e.getPoint();
-// updateKeyModifiers(e); // cycleSetup called only after updateModifiers !
-
if (!(alt || multipleMatchesParameter)) {
- // no real cycling, just one element in cycle list
+ // no real cycling, just one element in cycle list
cycleList = MapView.asColl(osm);
if (waitForMouseUpParameter) {
@@ -1002,7 +1026,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
foundInDS = nxt;
// first selected primitive in cycleList is found
if (cyclePrims || ctrl) {
- ds.clearSelection(foundInDS); // deselect it
+ ds.clearSelection(foundInDS); // deselect it
nxt = i.hasNext() ? i.next() : first;
// return next one in cycle list (last->first)
}
@@ -1010,7 +1034,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
}
}
}
-
+
// if "no-alt-cycling" is enabled, Ctrl-Click arrives here.
if (ctrl) {
// a member of cycleList was found in the current dataset selection
@@ -1035,7 +1059,7 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
return MapView.asColl(nxt);
}
}
-
+
private class VirtualManager {
private Node virtualNode = null;
@@ -1043,21 +1067,21 @@ public class SelectAction extends MapMode implements AWTEventListener, Selection
private int nodeVirtualSize;
private int virtualSnapDistSq2;
private int virtualSpace;
-
+
private void init() {
nodeVirtualSize = Main.pref.getInteger("mappaint.node.virtual-size", 8);
int virtualSnapDistSq = Main.pref.getInteger("mappaint.node.virtual-snap-distance", 8);
virtualSnapDistSq2 = virtualSnapDistSq*virtualSnapDistSq;
virtualSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70);
}
-
+
/**
* Calculate a virtual node if there is enough visual space to draw a
* crosshair node and the middle of a way segment is clicked. If the
* user drags the crosshair node, it will be added to all ways in
* <code>virtualWays</code>.
*
- * @param e contains the point clicked
+ * @param p the point clicked
* @return whether
* <code>virtualNode</code> and
* <code>virtualWays</code> were setup.
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java b/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java
index e62dd29..ad7febf 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.mapmode;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -50,6 +50,7 @@ public class ZoomAction extends MapMode implements SelectionEnded {
/**
* Zoom to the rectangle on the map.
*/
+ @Override
public void selectionEnded(Rectangle r, MouseEvent e) {
if (r.width >= 3 && r.height >= 3 && Main.isDisplayingMapView()) {
MapView mv = Main.map.mapView;
diff --git a/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java b/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java
new file mode 100644
index 0000000..364f058
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java
@@ -0,0 +1,43 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.actions.OsmPrimitiveAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+
+/**
+ * Ancestor for all actions that want to work with relation collection and
+ * to be disabled is the collection is empty
+ * @since 5793
+ */
+public abstract class AbstractRelationAction extends AbstractAction implements OsmPrimitiveAction {
+ protected Collection<Relation> relations = Collections.<Relation>emptySet();
+
+ protected static final Collection<Relation> getRelations(Collection<? extends OsmPrimitive> primitives) {
+ if (primitives == null || primitives.isEmpty()) {
+ return Collections.<Relation>emptySet();
+ } else {
+ return new SubclassFilteredCollection<OsmPrimitive, Relation>(
+ primitives, OsmPrimitive.relationPredicate);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.actions.relation.RelationAction#setPrimitives
+ */
+ @Override
+ public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+ this.relations = getRelations(primitives);
+ updateEnabledState();
+ }
+
+ protected void updateEnabledState() {
+ setEnabled(!relations.isEmpty());
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java b/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
new file mode 100644
index 0000000..2df5269
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
@@ -0,0 +1,60 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
+
+import java.awt.event.ActionEvent;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+
+public class AddSelectionToRelations extends AbstractRelationAction implements SelectionChangedListener {
+ /**
+ * Constructs a new <code>AddSelectionToRelation</code>.
+ */
+ public AddSelectionToRelations() {
+ putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright"));
+ putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Collection<Command> cmds = new LinkedList<Command>();
+ for (Relation orig : relations) {
+ Command c = GenericRelationEditor.addPrimitivesToRelation(orig, Main.main.getCurrentDataSet().getSelected());
+ if (c != null) {
+ cmds.add(c);
+ }
+ }
+ if (!cmds.isEmpty()) {
+ Main.main.undoRedo.add(new SequenceCommand(tr("Add selection to relation"), cmds));
+ }
+ }
+
+ @Override
+ public void updateEnabledState() {
+ putValue(NAME, trn("Add selection to {0} relation", "Add selection to {0} relations",
+ relations.size(), relations.size()));
+ }
+
+ @Override
+ public void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) {
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
+ public void run() {
+ setEnabled(newSelection != null && !newSelection.isEmpty());
+ }
+ });
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java b/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java
new file mode 100644
index 0000000..c54b278
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import java.awt.event.ActionEvent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+
+/**
+ * Action that delete relations
+ * @since 5799
+ */
+public class DeleteRelationsAction extends AbstractRelationAction {
+ class AbortException extends Exception {}
+
+ /**
+ * Constructs a new <code>DeleteRelationsAction</code>.
+ */
+ public DeleteRelationsAction() {
+ putValue(SHORT_DESCRIPTION,tr("Delete the selected relation"));
+ putValue(NAME, tr("Delete"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+ }
+
+ protected void deleteRelation(Relation toDelete) {
+ if (toDelete == null)
+ return;
+ org.openstreetmap.josm.actions.mapmode.DeleteAction
+ .deleteRelation( Main.main.getEditLayer(), toDelete );
+ // clear selection after deletion
+ if (Main.map.relationListDialog!=null)
+ Main.map.relationListDialog.selectRelations(null);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || !Main.main.hasEditLayer())
+ return;
+ for (Relation r : relations) {
+ deleteRelation(r);
+ }
+ }
+}
+
diff --git a/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java b/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
new file mode 100644
index 0000000..2af6e66
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java
@@ -0,0 +1,49 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.util.Collection;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * The action for downloading members of relations
+ * @since 5793
+ */
+public class DownloadMembersAction extends AbstractRelationAction {
+
+ /**
+ * Constructs a new <code>DownloadMembersAction</code>.
+ */
+ public DownloadMembersAction() {
+ putValue(SHORT_DESCRIPTION, tr("Download all members of the selected relations"));
+ putValue(NAME, tr("Download members"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "downloadincomplete"));
+ putValue("help", ht("/Dialog/RelationList#DownloadMembers"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
+ Main.worker.submit(new DownloadRelationTask(relations, Main.main.getEditLayer()));
+ }
+
+ @Override
+ public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+ // selected non-new relations
+ this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>(){
+ @Override public boolean evaluate(Relation r) {
+ return !r.isNew();
+ }});
+ updateEnabledState();
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java b/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
new file mode 100644
index 0000000..e4d7011
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java
@@ -0,0 +1,65 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Action for downloading incomplete members of selected relations
+ * @since 5793
+ */
+public class DownloadSelectedIncompleteMembersAction extends AbstractRelationAction {
+
+ /**
+ * Constructs a new <code>DownloadSelectedIncompleteMembersAction</code>.
+ */
+ public DownloadSelectedIncompleteMembersAction() {
+ putValue(SHORT_DESCRIPTION, tr("Download incomplete members of selected relations"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
+ putValue(NAME, tr("Download incomplete members"));
+ }
+
+ /**
+ * Returns the set of incomplete members of the given relations.
+ * @param rels The relations to inspect.
+ * @return The set of incomplete members of the given relations.
+ */
+ public Set<OsmPrimitive> buildSetOfIncompleteMembers(Collection<Relation> rels) {
+ Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+ for (Relation r : rels) {
+ ret.addAll(r.getIncompleteMembers());
+ }
+ return ret;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
+ Main.worker.submit(new DownloadRelationMemberTask(
+ relations,
+ buildSetOfIncompleteMembers(relations),
+ Main.main.getEditLayer()));
+ }
+
+ @Override
+ public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+ // selected relations with incomplete members
+ this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>(){
+ @Override public boolean evaluate(Relation r) {
+ return !r.isNew() && r.hasIncompleteMembers();
+ }});
+ updateEnabledState();
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java b/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java
new file mode 100644
index 0000000..d194fc7
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java
@@ -0,0 +1,53 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+
+/**
+ * Creates a new relation with a copy of the current editor state
+ * @since 5799
+ */
+public class DuplicateRelationAction extends AbstractRelationAction {
+
+ /**
+ * Constructs a new {@code DuplicateRelationAction}.
+ */
+ public DuplicateRelationAction() {
+ putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window"));
+ putValue(SMALL_ICON, ImageProvider.get("duplicate"));
+ putValue(NAME, tr("Duplicate"));
+ }
+
+ public static void duplicateRelationAndLaunchEditor(Relation original) {
+ Relation copy = new Relation(original, true);
+ copy.setModified(true);
+ RelationEditor editor = RelationEditor.getEditor(
+ Main.main.getEditLayer(),
+ copy,
+ null /* no selected members */
+ );
+ editor.setVisible(true);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || relations.isEmpty())
+ return;
+ Relation r = relations.iterator().next();
+ duplicateRelationAndLaunchEditor(r);
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ // only one selected relation can be edited
+ setEnabled( relations.size()==1 );
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java b/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java
new file mode 100644
index 0000000..5e1f00c
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java
@@ -0,0 +1,76 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The action for editing a relation
+ * @since 5793
+ */
+public class EditRelationAction extends AbstractRelationAction {
+
+ /**
+ * Constructs a new <code>EditRelationAction</code>.
+ */
+ public EditRelationAction() {
+ putValue(NAME, tr("Edit"));
+ putValue(SHORT_DESCRIPTION, tr("Call relation editor for selected relation"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
+ }
+
+ /**
+ * Returns the set of currently selected relation members for the given relation.
+ * @param r The relation to inspect
+ * @return The set of currently selected relation members for the given relation.
+ */
+ public static Set<RelationMember> getMembersForCurrentSelection(Relation r) {
+ Set<RelationMember> members = new HashSet<RelationMember>();
+ if (Main.isDisplayingMapView()) {
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null && editLayer.data != null) {
+ Collection<OsmPrimitive> selection = editLayer.data.getSelected();
+ for (RelationMember member: r.getMembers()) {
+ if (selection.contains(member.getMember())) {
+ members.add(member);
+ }
+ }
+ }
+ }
+ return members;
+ }
+
+ /**
+ * Launches relation editor for the given relation.
+ * @param toEdit The relation to edit
+ */
+ public static void launchEditor(Relation toEdit) {
+ if (toEdit == null || !Main.isDisplayingMapView()) return;
+ RelationEditor.getEditor(Main.main.getEditLayer(), toEdit,
+ getMembersForCurrentSelection(toEdit)).setVisible(true);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || relations.size()!=1) return;
+ launchEditor(relations.iterator().next());
+ }
+
+ @Override
+ protected void updateEnabledState() {
+ // only one selected relation can be edited
+ setEnabled( relations.size()==1 );
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/relation/SelectInRelationListAction.java b/src/org/openstreetmap/josm/actions/relation/SelectInRelationListAction.java
new file mode 100644
index 0000000..b03dcaf
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/SelectInRelationListAction.java
@@ -0,0 +1,32 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * The action for activating a relation in relation list dialog
+ * @since 5793
+ */
+public class SelectInRelationListAction extends AbstractRelationAction {
+
+ /**
+ * Constructs a new <code>SelectInRelationListAction</code>.
+ */
+ public SelectInRelationListAction() {
+ putValue(NAME, tr("Select in relation list"));
+ putValue(SHORT_DESCRIPTION, tr("Select relation in relation list."));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "selectionlist"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || relations.isEmpty() || Main.map==null || Main.map.relationListDialog==null) return;
+ Main.map.relationListDialog.selectRelations(relations);
+ Main.map.relationListDialog.unfurlDialog();
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java b/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
new file mode 100644
index 0000000..d11d91b
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.util.HashSet;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Sets the current selection to the list of relations selected in this dialog
+ * @since 5793
+ */
+public class SelectMembersAction extends AbstractRelationAction {
+
+ private final boolean add;
+
+ /**
+ * Constructs a new <code>SelectMembersAction</code>.
+ * @param add if <code>true</code>, the members will be added to current selection. If <code>false</code>, the members will replace the current selection.
+ */
+ public SelectMembersAction(boolean add) {
+ putValue(SHORT_DESCRIPTION,add ? tr("Add the members of all selected relations to current selection")
+ : tr("Select the members of all selected relations"));
+ putValue(SMALL_ICON, ImageProvider.get("selectall"));
+ putValue(NAME, add ? tr("Select members (add)") : tr("Select members"));
+ this.add = add;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || relations.isEmpty() || !Main.isDisplayingMapView()) return;
+
+ HashSet<OsmPrimitive> members = new HashSet<OsmPrimitive>();
+ for (Relation r: relations) {
+ members.addAll(r.getMemberPrimitives());
+ }
+ if (add) {
+ Main.main.getEditLayer().data.addSelected(members);
+ } else {
+ Main.main.getEditLayer().data.setSelected(members);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java b/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java
new file mode 100644
index 0000000..9134dd7
--- /dev/null
+++ b/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.relation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Sets the current selection to specified list of relations
+ * @since 5793
+ */
+public class SelectRelationAction extends AbstractRelationAction {
+
+ private final boolean add;
+
+ /**
+ * Constructs a new <code>SelectRelationAction</code>.
+ * @param add if <code>true</code>, the relation will be added to current selection. If <code>false</code>, the relation will replace the current selection.
+ */
+ public SelectRelationAction(boolean add) {
+ putValue(SHORT_DESCRIPTION, add ? tr("Add the selected relations to the current selection") : tr("Set the current selection to the list of selected relations"));
+ putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
+ putValue(NAME, add ? tr("Select relation (add)") : tr("Select relation"));
+ this.add = add;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if (!isEnabled() || relations.isEmpty()) return;
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer==null || editLayer.data==null) return;
+ if (add) {
+ editLayer.data.addSelected(relations);
+ } else {
+ editLayer.data.setSelected(relations);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java b/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
index 6738826..a46def5 100644
--- a/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
+++ b/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.search;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -30,6 +30,14 @@ public class PushbackTokenizer {
public long getEnd() {
return end;
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Range [start=" + start + ", end=" + end + "]";
+ }
}
private final Reader search;
@@ -50,7 +58,7 @@ public class PushbackTokenizer {
NOT(marktr("<not>")), OR(marktr("<or>")), XOR(marktr("<xor>")), LEFT_PARENT(marktr("<left parent>")),
RIGHT_PARENT(marktr("<right parent>")), COLON(marktr("<colon>")), EQUALS(marktr("<equals>")),
KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")),
- EOF(marktr("<end-of-file>"));
+ EOF(marktr("<end-of-file>")), LESS_THAN("<less-than>"), GREATER_THAN("<greater-than>");
private Token(String name) {
this.name = name;
@@ -73,8 +81,8 @@ public class PushbackTokenizer {
}
}
- private static final List<Character> specialChars = Arrays.asList(new Character[] {'"', ':', '(', ')', '|', '^', '=', '?'});
- private static final List<Character> specialCharsQuoted = Arrays.asList(new Character[] {'"'});
+ private static final List<Character> specialChars = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '?', '<', '>');
+ private static final List<Character> specialCharsQuoted = Arrays.asList('"');
private String getString(boolean quoted) {
List<Character> sChars = quoted ? specialCharsQuoted : specialChars;
@@ -125,6 +133,12 @@ public class PushbackTokenizer {
case '=':
getChar();
return Token.EQUALS;
+ case '<':
+ getChar();
+ return Token.LESS_THAN;
+ case '>':
+ getChar();
+ return Token.GREATER_THAN;
case '(':
getChar();
return Token.LEFT_PARENT;
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index cc30a6e..1599ac1 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.search;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -29,14 +29,14 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import javax.swing.text.BadLocationException;
+import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ActionParameter;
+import org.openstreetmap.josm.actions.ActionParameter.SearchSettingsActionParameter;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.actions.ParameterizedAction;
-import org.openstreetmap.josm.actions.ActionParameter.SearchSettingsActionParameter;
import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Filter;
@@ -51,6 +51,7 @@ import org.openstreetmap.josm.tools.Property;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
+
public class SearchAction extends JosmAction implements ParameterizedAction {
public static final int DEFAULT_SEARCH_HISTORY_SIZE = 15;
@@ -79,19 +80,17 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
}
- private static LinkedList<SearchSetting> searchHistory = null;
-
- public static Collection<SearchSetting> getSearchHistory() {
- if (searchHistory == null) {
- searchHistory = new LinkedList<SearchSetting>();
- for (String s: Main.pref.getCollection("search.history", Collections.<String>emptyList())) {
- SearchSetting ss = SearchSetting.readFromString(s);
- if (ss != null) {
- searchHistory.add(ss);
- }
+ private static final LinkedList<SearchSetting> searchHistory = new LinkedList<SearchSetting>();
+ static {
+ for (String s: Main.pref.getCollection("search.history", Collections.<String>emptyList())) {
+ SearchSetting ss = SearchSetting.readFromString(s);
+ if (ss != null) {
+ searchHistory.add(ss);
}
}
+ }
+ public static Collection<SearchSetting> getSearchHistory() {
return searchHistory;
}
@@ -103,7 +102,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
while (searchHistory.size() > maxsize) {
searchHistory.removeLast();
}
- List<String> savedHistory = new ArrayList<String>();
+ List<String> savedHistory = new ArrayList<String>(searchHistory.size());
for (SearchSetting item: searchHistory) {
savedHistory.add(item.writeToString());
}
@@ -111,7 +110,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
}
public static List<String> getSearchExpressionHistory() {
- ArrayList<String> ret = new ArrayList<String>(getSearchHistory().size());
+ List<String> ret = new ArrayList<String>(getSearchHistory().size());
for (SearchSetting ss: getSearchHistory()) {
ret.add(ss.text);
}
@@ -120,18 +119,23 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
private static SearchSetting lastSearch = null;
+ /**
+ * Constructs a new {@code SearchAction}.
+ */
public SearchAction() {
super(tr("Search..."), "dialogs/search", tr("Search for objects."),
Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.CTRL), true);
putValue("help", ht("/Action/Search"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
search();
}
+ @Override
public void actionPerformed(ActionEvent e, Map<String, Object> parameters) {
if (parameters.get(SEARCH_EXPRESSION) == null) {
actionPerformed(e);
@@ -194,7 +198,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
@Override
public void mouseClicked(MouseEvent e) {
try {
- JTextField tf = (JTextField) hcb.getEditor().getEditorComponent();
+ JTextComponent tf = (JTextComponent) hcb.getEditor().getEditorComponent();
tf.getDocument().insertString(tf.getCaretPosition(), " " + insertText, null);
} catch (BadLocationException ex) {
throw new RuntimeException(ex.getMessage(), ex);
@@ -390,6 +394,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
.addKeyword("<i>key</i>=*", null, tr("''key'' with any value"))
.addKeyword("*=<i>value</i>", null, tr("''value'' in any key"))
.addKeyword("<i>key</i>=", null, tr("matches if ''key'' exists"))
+ .addKeyword("<i>key</i>><i>value</i>", null, tr("matches if ''key'' is greater than ''value'' (analogously, less than)"))
, GBC.eol());
right.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("combinators"))
@@ -408,6 +413,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
.addKeyword("type:way", "type:way ", tr("all ways"))
.addKeyword("type:relation", "type:relation ", tr("all relations"))
.addKeyword("closed", "closed ", tr("all closed ways"))
+ .addKeyword("untagged", "untagged ", tr("object without useful tags"))
, GBC.eol());
right.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("metadata"))
@@ -680,7 +686,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
} else if (s.charAt(index) == ' ') {
break;
} else {
- System.out.println("Unknown char in SearchSettings: " + s);
+ Main.warn("Unknown char in SearchSettings: " + s);
break;
}
index++;
@@ -725,6 +731,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
setEnabled(getEditLayer() != null);
}
+ @Override
public List<ActionParameter<?>> getActionParameters() {
return Collections.<ActionParameter<?>>singletonList(new SearchSettingsActionParameter(SEARCH_EXPRESSION));
}
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index 8587582..4e4dc25 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.search;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -9,7 +9,6 @@ import java.io.StringReader;
import java.text.Normalizer;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
@@ -28,6 +27,7 @@ import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.tools.DateUtils;
import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Predicate;
/**
Implements a google-like search.
@@ -150,7 +150,7 @@ public class SearchCompiler {
String rangeA1 = rangeA[0].trim();
String rangeA2 = rangeA[1].trim();
long minDate = DateUtils.fromString(rangeA1.isEmpty() ? "1980" : rangeA1).getTime(); // if min timestap is empty: use lowest possible date
- long maxDate = rangeA2.isEmpty() ? new Date().getTime() : DateUtils.fromString(rangeA2).getTime(); // if max timestamp is empty: use "now"
+ long maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.fromString(rangeA2).getTime(); // if max timestamp is empty: use "now"
return new TimestampRange(minDate, maxDate);
} else
/*
@@ -207,7 +207,7 @@ public class SearchCompiler {
/**
* Base class for all search operators.
*/
- abstract public static class Match {
+ abstract public static class Match implements Predicate<OsmPrimitive> {
abstract public boolean match(OsmPrimitive osm);
@@ -232,6 +232,11 @@ public class SearchCompiler {
}
return true;
}
+
+ @Override
+ public final boolean evaluate(OsmPrimitive object) {
+ return match(object);
+ }
}
/**
@@ -373,50 +378,51 @@ public class SearchCompiler {
}
/**
- * Matches objects with the given object ID.
+ * Matches objects with ID in the given range.
*/
- private static class Id extends Match {
- private long id;
- public Id(long id) {
- this.id = id;
- }
+ private static class Id extends RangeMatch {
+ public Id(Range range) {super(range);}
public Id(PushbackTokenizer tokenizer) throws ParseError {
- this(tokenizer.readNumber(tr("Primitive id expected")));
+ this(tokenizer.readRange(tr("Range of primitive ids expected")));
}
- @Override public boolean match(OsmPrimitive osm) {
- return id == 0?osm.isNew():osm.getUniqueId() == id;
+ @Override protected Long getNumber(OsmPrimitive osm) {
+ return osm.isNew() ? 0 : osm.getUniqueId();
+ }
+ @Override protected String getString() {
+ return "id";
}
- @Override public String toString() {return "id="+id;}
}
/**
- * Matches objects with the given changeset ID.
+ * Matches objects with a changeset ID in the given range.
*/
- private static class ChangesetId extends Match {
- private long changesetid;
- public ChangesetId(long changesetid) {this.changesetid = changesetid;}
+ private static class ChangesetId extends RangeMatch {
+ public ChangesetId(Range range) {super(range);}
public ChangesetId(PushbackTokenizer tokenizer) throws ParseError {
- this(tokenizer.readNumber(tr("Changeset id expected")));
+ this(tokenizer.readRange(tr("Range of changeset ids expected")));
}
- @Override public boolean match(OsmPrimitive osm) {
- return osm.getChangesetId() == changesetid;
+ @Override protected Long getNumber(OsmPrimitive osm) {
+ return (long) osm.getChangesetId();
+ }
+ @Override protected String getString() {
+ return "changeset";
}
- @Override public String toString() {return "changeset="+changesetid;}
}
/**
- * Matches objects with the given version number.
+ * Matches objects with a version number in the given range.
*/
- private static class Version extends Match {
- private long version;
- public Version(long version) {this.version = version;}
+ private static class Version extends RangeMatch {
+ public Version(Range range) {super(range);}
public Version(PushbackTokenizer tokenizer) throws ParseError {
- this(tokenizer.readNumber(tr("Version expected")));
+ this(tokenizer.readRange(tr("Range of versions expected")));
}
- @Override public boolean match(OsmPrimitive osm) {
- return osm.getVersion() == version;
+ @Override protected Long getNumber(OsmPrimitive osm) {
+ return (long) osm.getVersion();
+ }
+ @Override protected String getString() {
+ return "version";
}
- @Override public String toString() {return "version="+version;}
}
/**
@@ -516,6 +522,32 @@ public class SearchCompiler {
@Override public String toString() {return key+"="+value;}
}
+ public static class ValueComparison extends Match {
+ private final String key;
+ private final String referenceValue;
+ private final int compareMode;
+
+ public ValueComparison(String key, String referenceValue, int compareMode) {
+ this.key = key;
+ this.referenceValue = referenceValue;
+ this.compareMode = compareMode;
+ }
+
+ @Override
+ public boolean match(OsmPrimitive osm) {
+ int compareResult;
+ try {
+ compareResult = Double.compare(
+ Double.parseDouble(osm.get(key)),
+ Double.parseDouble(referenceValue)
+ );
+ } catch (Exception ignore) {
+ compareResult = osm.get(key).compareTo(referenceValue);
+ }
+ return compareMode < 0 ? compareResult < 0 : compareMode > 0 ? compareResult > 0 : compareResult == 0;
+ }
+ }
+
/**
* Matches objects with the exact given key-value pair.
*/
@@ -678,7 +710,7 @@ public class SearchCompiler {
@Override public boolean match(OsmPrimitive osm) {
if (!osm.hasKeys() && osm.getUser() == null)
- return search.equals("");
+ return search.isEmpty();
for (String key: osm.keySet()) {
String value = osm.get(key);
@@ -754,7 +786,7 @@ public class SearchCompiler {
}
@Override public String toString() {
- return "user=" + user == null ? "" : user;
+ return "user=" + (user == null ? "" : user);
}
}
@@ -832,36 +864,36 @@ public class SearchCompiler {
/**
* Matches objects with properties in a certain range.
*/
- private abstract static class CountRange extends Match {
+ private abstract static class RangeMatch extends Match {
- private long minCount;
- private long maxCount;
+ private final long min;
+ private final long max;
- public CountRange(long minCount, long maxCount) {
- this.minCount = Math.min(minCount, maxCount);
- this.maxCount = Math.max(minCount, maxCount);
+ public RangeMatch(long min, long max) {
+ this.min = Math.min(min, max);
+ this.max = Math.max(min, max);
}
- public CountRange(Range range) {
+ public RangeMatch(Range range) {
this(range.getStart(), range.getEnd());
}
- protected abstract Long getCount(OsmPrimitive osm);
+ protected abstract Long getNumber(OsmPrimitive osm);
- protected abstract String getCountString();
+ protected abstract String getString();
@Override
public boolean match(OsmPrimitive osm) {
- Long count = getCount(osm);
- if (count == null)
+ Long num = getNumber(osm);
+ if (num == null)
return false;
else
- return (count >= minCount) && (count <= maxCount);
+ return (num >= min) && (num <= max);
}
@Override
public String toString() {
- return getCountString() + "=" + minCount + "-" + maxCount;
+ return getString() + "=" + min + "-" + max;
}
}
@@ -869,7 +901,7 @@ public class SearchCompiler {
/**
* Matches ways with a number of nodes in given range
*/
- private static class NodeCountRange extends CountRange {
+ private static class NodeCountRange extends RangeMatch {
public NodeCountRange(Range range) {
super(range);
}
@@ -879,15 +911,15 @@ public class SearchCompiler {
}
@Override
- protected Long getCount(OsmPrimitive osm) {
+ protected Long getNumber(OsmPrimitive osm) {
if (!(osm instanceof Way))
return null;
else
- return (long) ((Way) osm).getNodesCount();
+ return (long) ((Way) osm).getRealNodesCount();
}
@Override
- protected String getCountString() {
+ protected String getString() {
return "nodes";
}
}
@@ -895,7 +927,7 @@ public class SearchCompiler {
/**
* Matches objects with a number of tags in given range
*/
- private static class TagCountRange extends CountRange {
+ private static class TagCountRange extends RangeMatch {
public TagCountRange(Range range) {
super(range);
}
@@ -905,12 +937,12 @@ public class SearchCompiler {
}
@Override
- protected Long getCount(OsmPrimitive osm) {
+ protected Long getNumber(OsmPrimitive osm) {
return (long) osm.getKeys().size();
}
@Override
- protected String getCountString() {
+ protected String getString() {
return "tags";
}
}
@@ -918,19 +950,19 @@ public class SearchCompiler {
/**
* Matches objects with a timestamp in given range
*/
- private static class TimestampRange extends CountRange {
+ private static class TimestampRange extends RangeMatch {
public TimestampRange(long minCount, long maxCount) {
super(minCount, maxCount);
}
@Override
- protected Long getCount(OsmPrimitive osm) {
+ protected Long getNumber(OsmPrimitive osm) {
return osm.getTimestamp().getTime();
}
@Override
- protected String getCountString() {
+ protected String getString() {
return "timestamp";
}
@@ -1050,7 +1082,7 @@ public class SearchCompiler {
*
* @author Ole Jørgen Brønner
*/
- private static class AreaSize extends CountRange {
+ private static class AreaSize extends RangeMatch {
public AreaSize(Range range) {
super(range);
@@ -1061,7 +1093,7 @@ public class SearchCompiler {
}
@Override
- protected Long getCount(OsmPrimitive osm) {
+ protected Long getNumber(OsmPrimitive osm) {
if (!(osm instanceof Way && ((Way) osm).isClosed()))
return null;
Way way = (Way) osm;
@@ -1069,7 +1101,7 @@ public class SearchCompiler {
}
@Override
- protected String getCountString() {
+ protected String getString() {
return "areasize";
}
}
@@ -1133,7 +1165,7 @@ public class SearchCompiler {
@Override
protected Bounds getBounds() {
- if (Main.map == null || Main.map.mapView == null) {
+ if (!Main.isDisplayingMapView()) {
return null;
}
return Main.map.mapView.getRealBounds();
@@ -1149,8 +1181,7 @@ public class SearchCompiler {
}
}
- public static Match compile(String searchStr, boolean caseSensitive, boolean regexSearch)
- throws ParseError {
+ public static Match compile(String searchStr, boolean caseSensitive, boolean regexSearch) throws ParseError {
return new SearchCompiler(caseSensitive, regexSearch,
new PushbackTokenizer(
new PushbackReader(new StringReader(searchStr))))
@@ -1202,8 +1233,9 @@ public class SearchCompiler {
* Parse expression, showing the specified error message if parsing fails.
*
* @param errorMessage to display if parsing error occurs
- * @return
+ * @return match determined by parsing expression
* @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError
+ * @see #parseExpression()
*/
private Match parseExpression(String errorMessage) throws ParseError {
Match expression = parseExpression();
@@ -1230,9 +1262,13 @@ public class SearchCompiler {
} else if (tokenizer.readIfEqual(Token.KEY)) {
// factor consists of key:value or key=value
String key = tokenizer.getText();
- if (tokenizer.readIfEqual(Token.EQUALS))
+ if (tokenizer.readIfEqual(Token.EQUALS)) {
return new ExactKeyValue(regexSearch, key, tokenizer.readTextOrNumber());
- else if (tokenizer.readIfEqual(Token.COLON)) {
+ } else if (tokenizer.readIfEqual(Token.LESS_THAN)) {
+ return new ValueComparison(key, tokenizer.readTextOrNumber(), -1);
+ } else if (tokenizer.readIfEqual(Token.GREATER_THAN)) {
+ return new ValueComparison(key, tokenizer.readTextOrNumber(), +1);
+ } else if (tokenizer.readIfEqual(Token.COLON)) {
// see if we have a Match that takes a data parameter
SimpleMatchFactory factory = simpleMatchFactoryMap.get(key);
if (factory != null)
diff --git a/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java b/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java
index ea93ebc..57fc753 100644
--- a/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java
@@ -20,6 +20,7 @@ import org.openstreetmap.josm.io.OsmTransferCanceledException;
public class ApiPreconditionCheckerHook implements UploadHook {
+ @Override
public boolean checkUpload(APIDataSet apiData) {
OsmApi api = OsmApi.getOsmApi();
try {
@@ -51,12 +52,11 @@ public class ApiPreconditionCheckerHook implements UploadHook {
for (OsmPrimitive osmPrimitive : primitives) {
for (String key: osmPrimitive.keySet()) {
String value = osmPrimitive.get(key);
- if(key.length() > 255) {
+ if (key.length() > 255) {
if (osmPrimitive.isDeleted()) {
- // if OsmPrimitive is going to be deleted we automatically shorten the
- // value
- System.out.println(
- tr("Warning: automatically truncating value of tag ''{0}'' on deleted object {1}",
+ // if OsmPrimitive is going to be deleted we automatically shorten the value
+ Main.warn(
+ tr("Automatically truncating value of tag ''{0}'' on deleted object {1}",
key,
Long.toString(osmPrimitive.getId())
)
diff --git a/src/org/openstreetmap/josm/actions/upload/FixDataHook.java b/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
index a70fc2a..09beb52 100644
--- a/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
@@ -5,9 +5,9 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
-import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -42,6 +42,7 @@ public class FixDataHook implements UploadHook {
deprecated.add(new FixDataTag("oneway", "1", "oneway", "yes"));
deprecated.add(new FixDataTag("highway", "stile", "barrier", "stile"));
deprecated.add(new FixData() {
+ @Override
public boolean fixKeys(Map<String, String> keys, OsmPrimitive osm) {
if(osm instanceof Relation && "multipolygon".equals(keys.get("type")) && "administrative".equals(keys.get("boundary"))) {
keys.put("type", "boundary");
@@ -72,30 +73,33 @@ public class FixDataHook implements UploadHook {
public class FixDataSpace implements FixData {
@Override
public boolean fixKeys(Map<String, String> keys, OsmPrimitive osm) {
- boolean changed = false;
- for(Entry<String, String> e : keys.entrySet()) {
+ Map<String, String> newKeys = new HashMap<String, String>(keys);
+ for (Entry<String, String> e : keys.entrySet()) {
String v = e.getValue().trim();
String k = e.getKey().trim();
if(!e.getKey().equals(k)) {
- changed = true;
boolean drop = k.isEmpty() || v.isEmpty();
if(drop || !keys.containsKey(k)) {
- keys.remove(e.getKey());
+ newKeys.remove(e.getKey());
if(!drop)
- keys.put(k, v);
+ newKeys.put(k, v);
}
} else if(!e.getValue().equals(v)) {
if(v.isEmpty())
- keys.remove(k);
+ newKeys.remove(k);
else
- keys.put(k, v);
- changed = true;
+ newKeys.put(k, v);
}
}
+ boolean changed = !keys.equals(newKeys);
+ if (changed) {
+ keys.clear();
+ keys.putAll(newKeys);
+ }
return changed;
}
}
-
+
/**
* Data fix to cleanup wrong spelled keys
*/
@@ -126,7 +130,7 @@ public class FixDataHook implements UploadHook {
return false;
}
}
-
+
/**
* Data fix to cleanup wrong spelled tags
*/
@@ -166,7 +170,7 @@ public class FixDataHook implements UploadHook {
return false;
}
}
-
+
/**
* Checks the upload for deprecated or wrong tags.
* @param apiDataSet the data to upload
@@ -179,7 +183,6 @@ public class FixDataHook implements UploadHook {
List<OsmPrimitive> objectsToUpload = apiDataSet.getPrimitives();
Collection<Command> cmds = new LinkedList<Command>();
- boolean needsChange = false;
for (OsmPrimitive osm : objectsToUpload) {
Map<String, String> keys = osm.getKeys();
if(!keys.isEmpty()) {
diff --git a/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java b/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java
index 1e218dc..4c892d3 100644
--- a/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.actions.upload;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.Iterator;
@@ -19,10 +21,6 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
import org.openstreetmap.josm.tools.WindowGeometry;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.actions.upload.UploadHook;
-
/**
* This upload hook reorders the list of new relations to upload such that child
* relations are uploaded before parent relations. It also checks for cyclic
@@ -32,9 +30,6 @@ import org.openstreetmap.josm.actions.upload.UploadHook;
*/
public class RelationUploadOrderHook implements UploadHook {
- /** the data to be analyzed */
- private APIDataSet data;
-
/**
* builds the panel which warns users about a cyclic dependency
*
@@ -96,10 +91,10 @@ public class RelationUploadOrderHook implements UploadHook {
dialog.showDialog();
}
+ @Override
public boolean checkUpload(APIDataSet apiDataSet) {
- this.data = apiDataSet;
try {
- data.adjustRelationUploadOrder();
+ apiDataSet.adjustRelationUploadOrder();
return true;
} catch(CyclicUploadDependencyException e) {
warnCyclicUploadDependency(e);
diff --git a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
index b6940be..98fde1c 100644
--- a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
@@ -1,15 +1,14 @@
// License: GPL. See LICENSE file for details.
package org.openstreetmap.josm.actions.upload;
-import java.awt.Dimension;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.Dimension;
import java.awt.GridBagLayout;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@@ -23,6 +22,7 @@ import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.data.validation.util.AggregatePrimitivesVisitor;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.tools.GBC;
@@ -34,15 +34,14 @@ import org.openstreetmap.josm.tools.GBC;
* each one can test it.
*
* @author frsantos
+ * @since 3669
*/
-public class ValidateUploadHook implements UploadHook
-{
- /** Serializable ID */
- private static final long serialVersionUID = -2304521273582574603L;
-
+public class ValidateUploadHook implements UploadHook {
+
/**
* Validate the modified data before uploading
*/
+ @Override
public boolean checkUpload(APIDataSet apiDataSet) {
Collection<Test> tests = OsmValidator.getEnabledTests(true);
@@ -60,12 +59,10 @@ public class ValidateUploadHook implements UploadHook
test.startTest(null);
test.visit(selection);
test.endTest();
- if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false) &&
- Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false))
- {
- errors.addAll( test.getErrors() );
- }
- else {
+ if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false) &&
+ Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false)) {
+ errors.addAll(test.getErrors());
+ } else {
for (TestError e : test.getErrors()) {
if (e.getSeverity() != Severity.OTHER) {
errors.add(e);
@@ -74,6 +71,10 @@ public class ValidateUploadHook implements UploadHook
}
}
tests = null;
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ editLayer.validationErrors.clear();
+ editLayer.validationErrors.addAll(errors);
+ Main.map.validatorDialog.tree.setErrors(errors);
if (errors == null || errors.isEmpty())
return true;
@@ -140,10 +141,9 @@ public class ValidateUploadHook implements UploadHook
ed.setContent(p);
ed.showDialog();
- if(ed.getValue() != 1) {
+ if (ed.getValue() != 1) {
OsmValidator.initializeErrorLayer();
Main.map.validatorDialog.unfurlDialog();
- Main.map.validatorDialog.tree.setErrors(errors);
Main.main.getCurrentDataSet().fireSelectionChanged();
return false;
}
diff --git a/src/org/openstreetmap/josm/command/AddCommand.java b/src/org/openstreetmap/josm/command/AddCommand.java
index f6f5a16..5e43406 100644
--- a/src/org/openstreetmap/josm/command/AddCommand.java
+++ b/src/org/openstreetmap/josm/command/AddCommand.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.command;
import static org.openstreetmap.josm.tools.I18n.marktr;
diff --git a/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java b/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
index 1f85d01..e5f86ef 100644
--- a/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
+++ b/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
@@ -9,40 +9,69 @@ import java.util.HashSet;
import java.util.List;
import javax.swing.Icon;
-import javax.swing.JLabel;
-
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.NodeData;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
* Add primitives to a data layer.
- *
+ * @since 2305
*/
public class AddPrimitivesCommand extends Command {
private List<PrimitiveData> data = new ArrayList<PrimitiveData>();
+ private Collection<PrimitiveData> toSelect = new ArrayList<PrimitiveData>();
// only filled on undo
private List<OsmPrimitive> createdPrimitives = null;
+ private Collection<OsmPrimitive> createdPrimitivesToSelect = null;
+ /**
+ * Constructs a new {@code AddPrimitivesCommand} to add data to the current edit layer.
+ * @param data The OSM primitives data to add. Must not be {@code null}
+ */
public AddPrimitivesCommand(List<PrimitiveData> data) {
- this.data.addAll(data);
+ this(data, data);
}
-
- public AddPrimitivesCommand(List<PrimitiveData> data, OsmDataLayer layer) {
+
+ /**
+ * Constructs a new {@code AddPrimitivesCommand} to add data to the current edit layer.
+ * @param data The OSM primitives to add. Must not be {@code null}
+ * @param toSelect The OSM primitives to select at the end. Can be {@code null}
+ * @since 5953
+ */
+ public AddPrimitivesCommand(List<PrimitiveData> data, List<PrimitiveData> toSelect) {
+ init(data, toSelect);
+ }
+
+ /**
+ * Constructs a new {@code AddPrimitivesCommand} to add data to the given layer.
+ * @param data The OSM primitives data to add. Must not be {@code null}
+ * @param toSelect The OSM primitives to select at the end. Can be {@code null}
+ * @param layer The target data layer. Must not be {@code null}
+ */
+ public AddPrimitivesCommand(List<PrimitiveData> data, List<PrimitiveData> toSelect, OsmDataLayer layer) {
super(layer);
+ init(data, toSelect);
+ }
+
+ private final void init(List<PrimitiveData> data, List<PrimitiveData> toSelect) {
+ CheckParameterUtil.ensureParameterNotNull(data, "data");
this.data.addAll(data);
+ if (toSelect != null) {
+ this.toSelect.addAll(toSelect);
+ }
}
- @SuppressWarnings("null")
@Override public boolean executeCommand() {
- List<OsmPrimitive> newPrimitives;
+ Collection<OsmPrimitive> primitivesToSelect;
if (createdPrimitives == null) { // first time execution
- newPrimitives = new ArrayList<OsmPrimitive>(data.size());
+ List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(data.size());
+ primitivesToSelect = new ArrayList<OsmPrimitive>(toSelect.size());
for (PrimitiveData pd : data) {
OsmPrimitive primitive = getLayer().data.getPrimitiveById(pd);
@@ -57,9 +86,12 @@ public class AddPrimitivesCommand extends Command {
getLayer().data.addPrimitive(primitive);
}
newPrimitives.add(primitive);
+ if (toSelect.contains(pd)) {
+ primitivesToSelect.add(primitive);
+ }
}
- //Then load ways and relations
+ // Then load ways and relations
for (int i=0; i<newPrimitives.size(); i++) {
if (!(newPrimitives.get(i) instanceof Node)) {
newPrimitives.get(i).load(data.get(i));
@@ -71,29 +103,35 @@ public class AddPrimitivesCommand extends Command {
for (OsmPrimitive osm : createdPrimitives) {
getLayer().data.addPrimitive(osm);
}
- newPrimitives = createdPrimitives;
+ primitivesToSelect = createdPrimitivesToSelect;
}
- getLayer().data.setSelected(newPrimitives);
+ getLayer().data.setSelected(primitivesToSelect);
return true;
}
@Override public void undoCommand() {
DataSet ds = getLayer().data;
-
+
if (createdPrimitives == null) {
createdPrimitives = new ArrayList<OsmPrimitive>(data.size());
-
- for (PrimitiveData p : data) {
- createdPrimitives.add(ds.getPrimitiveById(p));
+ createdPrimitivesToSelect = new ArrayList<OsmPrimitive>(toSelect.size());
+
+ for (PrimitiveData pd : data) {
+ OsmPrimitive p = ds.getPrimitiveById(pd);
+ createdPrimitives.add(p);
+ if (toSelect.contains(pd)) {
+ createdPrimitivesToSelect.add(p);
+ }
}
createdPrimitives = PurgeCommand.topoSort(createdPrimitives);
-
+
for (PrimitiveData p : data) {
ds.removePrimitive(p);
}
data = null;
-
+ toSelect = null;
+
} else {
for (OsmPrimitive osm : createdPrimitives) {
ds.removePrimitive(osm);
@@ -122,7 +160,7 @@ public class AddPrimitivesCommand extends Command {
public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
if (createdPrimitives != null)
return createdPrimitives;
-
+
Collection<OsmPrimitive> prims = new HashSet<OsmPrimitive>();
for (PrimitiveData d : data) {
OsmPrimitive osm = getLayer().data.getPrimitiveById(d);
diff --git a/src/org/openstreetmap/josm/command/ChangeCommand.java b/src/org/openstreetmap/josm/command/ChangeCommand.java
index b431a9f..d182b0e 100644
--- a/src/org/openstreetmap/josm/command/ChangeCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangeCommand.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.command;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -10,42 +10,55 @@ import javax.swing.Icon;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
/**
- * Command that basically replaces one OSM primitive by another of the
- * same type.
+ * Command that basically replaces one OSM primitive by another of the same type.
*
- * @author Imi
+ * @since 93
*/
public class ChangeCommand extends Command {
private final OsmPrimitive osm;
private final OsmPrimitive newOsm;
-
public ChangeCommand(OsmPrimitive osm, OsmPrimitive newOsm) {
super();
this.osm = osm;
this.newOsm = newOsm;
+ sanityChecks();
}
public ChangeCommand(OsmDataLayer layer, OsmPrimitive osm, OsmPrimitive newOsm) {
super(layer);
this.osm = osm;
this.newOsm = newOsm;
+ sanityChecks();
+ }
+
+ private void sanityChecks() {
+ CheckParameterUtil.ensureParameterNotNull(osm, "osm");
+ CheckParameterUtil.ensureParameterNotNull(newOsm, "newOsm");
+ if (newOsm instanceof Way && ((Way)newOsm).getNodesCount() == 0) {
+ // Do not allow to create empty ways (see #7465)
+ throw new IllegalArgumentException(tr("New way {0} has 0 nodes", newOsm));
+ }
}
- @Override public boolean executeCommand() {
+ @Override
+ public boolean executeCommand() {
super.executeCommand();
osm.cloneFrom(newOsm);
osm.setModified(true);
return true;
}
- @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+ @Override
+ public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
modified.add(osm);
}
diff --git a/src/org/openstreetmap/josm/command/ChangePropertyCommand.java b/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
index 999fdf5..8a3ac10 100644
--- a/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.command;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -35,16 +35,16 @@ public class ChangePropertyCommand extends Command {
private final List<OsmPrimitive> objects;
/**
* Key and value pairs. If value is <code>null</code>, delete all key references with the given
- * key. Otherwise, change the properties of all objects to the given value or create keys of
+ * key. Otherwise, change the tags of all objects to the given value or create keys of
* those objects that do not have the key yet.
*/
private final AbstractMap<String, String> tags;
/**
- * Creates a command to change multiple properties of multiple objects
+ * Creates a command to change multiple tags of multiple objects
*
* @param objects the objects to modify
- * @param tags the properties to set
+ * @param tags the tags to set
*/
public ChangePropertyCommand(Collection<? extends OsmPrimitive> objects, AbstractMap<String, String> tags) {
super();
@@ -54,10 +54,10 @@ public class ChangePropertyCommand extends Command {
}
/**
- * Creates a command to change one property of multiple objects
+ * Creates a command to change one tag of multiple objects
*
* @param objects the objects to modify
- * @param key the key of the property to set
+ * @param key the key of the tag to set
* @param value the value of the key to set
*/
public ChangePropertyCommand(Collection<? extends OsmPrimitive> objects, String key, String value) {
@@ -68,10 +68,10 @@ public class ChangePropertyCommand extends Command {
}
/**
- * Creates a command to change on property of one object
+ * Creates a command to change one tag of one object
*
* @param object the object to modify
- * @param key the key of the property to set
+ * @param key the key of the tag to set
* @param value the value of the key to set
*/
public ChangePropertyCommand(OsmPrimitive object, String key, String value) {
@@ -179,9 +179,9 @@ public class ChangePropertyCommand extends Command {
}
if (allnull) {
- text = tr("Deleted {0} properties for {1} objects", tags.size(), objects.size());
+ text = tr("Deleted {0} tags for {1} objects", tags.size(), objects.size());
} else
- text = tr("Set {0} properties for {1} objects", tags.size(), objects.size());
+ text = tr("Set {0} tags for {1} objects", tags.size(), objects.size());
}
return text;
}
diff --git a/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java b/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java
index 5719307..1d54339 100644
--- a/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java
@@ -16,7 +16,7 @@ import org.openstreetmap.josm.data.validation.util.NameVisitor;
import org.openstreetmap.josm.tools.ImageProvider;
/**
- * Command that replaces the key of several objects
+ * Command that replaces the key of one or several objects
*
*/
public class ChangePropertyKeyCommand extends Command {
@@ -34,7 +34,19 @@ public class ChangePropertyKeyCommand extends Command {
private final String newKey;
/**
- * Constructor
+ * Constructs a new {@code ChangePropertyKeyCommand}.
+ *
+ * @param object the object subject to change replacement
+ * @param key The key to replace
+ * @param newKey the new value of the key
+ * @since 6329
+ */
+ public ChangePropertyKeyCommand(OsmPrimitive object, String key, String newKey) {
+ this(Collections.singleton(object), key, newKey);
+ }
+
+ /**
+ * Constructs a new {@code ChangePropertyKeyCommand}.
*
* @param objects all objects subject to change replacement
* @param key The key to replace
@@ -71,7 +83,7 @@ public class ChangePropertyKeyCommand extends Command {
String text = tr( "Replace \"{0}\" by \"{1}\" for", key, newKey);
if (objects.size() == 1) {
NameVisitor v = new NameVisitor();
- objects.iterator().next().visit(v);
+ objects.iterator().next().accept(v);
text += " "+tr(v.className)+" "+v.name;
} else {
text += " "+objects.size()+" "+trn("object","objects",objects.size());
@@ -92,7 +104,7 @@ public class ChangePropertyKeyCommand extends Command {
final NameVisitor v = new NameVisitor();
for (final OsmPrimitive osm : objects) {
- osm.visit(v);
+ osm.accept(v);
children.add(new PseudoCommand() {
@Override
public String getDescriptionText() {
diff --git a/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java b/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
index 985950c..2c20e09 100644
--- a/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
+++ b/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
@@ -29,7 +29,7 @@ public class ChangeRelationMemberRoleCommand extends Command {
private final String newRole;
// The old role
private String oldRole;
- // Old value of modified;
+ // Old value of modified
private Boolean oldModified;
public ChangeRelationMemberRoleCommand(Relation relation, int position, String newRole) {
diff --git a/src/org/openstreetmap/josm/command/Command.java b/src/org/openstreetmap/josm/command/Command.java
index 15f4383..4bf3385 100644
--- a/src/org/openstreetmap/josm/command/Command.java
+++ b/src/org/openstreetmap/josm/command/Command.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.command;
import java.awt.GridBagLayout;
@@ -15,6 +15,8 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -39,17 +41,40 @@ abstract public class Command extends PseudoCommand {
private static final class CloneVisitor extends AbstractVisitor {
public final Map<OsmPrimitive, PrimitiveData> orig = new LinkedHashMap<OsmPrimitive, PrimitiveData>();
+ @Override
public void visit(Node n) {
orig.put(n, n.save());
}
+ @Override
public void visit(Way w) {
orig.put(w, w.save());
}
+ @Override
public void visit(Relation e) {
orig.put(e, e.save());
}
}
+ /**
+ * Small helper for holding the interesting part of the old data state of the objects.
+ */
+ public static class OldNodeState {
+
+ final LatLon latlon;
+ final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement
+ final boolean modified;
+
+ /**
+ * Constructs a new {@code OldNodeState} for the given node.
+ * @param node The node whose state has to be remembered
+ */
+ public OldNodeState(Node node){
+ latlon = node.getCoor();
+ eastNorth = node.getEastNorth();
+ modified = node.isModified();
+ }
+ }
+
/** the map of OsmPrimitives in the original state to OsmPrimitives in cloned state */
private Map<OsmPrimitive, PrimitiveData> cloneMap = new HashMap<OsmPrimitive, PrimitiveData>();
@@ -60,7 +85,7 @@ abstract public class Command extends PseudoCommand {
* Creates a new command in the context of the current edit layer, if any
*/
public Command() {
- this.layer = Main.map != null && Main.map.mapView != null ? Main.map.mapView.getEditLayer() : null;
+ this.layer = Main.main.getEditLayer();
}
/**
@@ -84,7 +109,7 @@ abstract public class Command extends PseudoCommand {
Collection<OsmPrimitive> all = new ArrayList<OsmPrimitive>();
fillModifiedData(all, all, all);
for (OsmPrimitive osm : all) {
- osm.visit(visitor);
+ osm.accept(visitor);
}
cloneMap = visitor.orig;
return true;
@@ -216,8 +241,8 @@ abstract public class Command extends PseudoCommand {
}
private static boolean isOutlying(OsmPrimitive osm, Area area) {
- if (osm instanceof Node) {
- return !osm.isNewOrUndeleted() && !area.contains(((Node) osm).getCoor());
+ if (osm instanceof Node && !osm.isNewOrUndeleted()) {
+ return !((Node) osm).getCoor().isIn(area);
} else if (osm instanceof Way) {
for (Node n : ((Way) osm).getNodes()) {
if (isOutlying(n, area)) {
diff --git a/src/org/openstreetmap/josm/command/ConflictAddCommand.java b/src/org/openstreetmap/josm/command/ConflictAddCommand.java
index 141142d..65af855 100644
--- a/src/org/openstreetmap/josm/command/ConflictAddCommand.java
+++ b/src/org/openstreetmap/josm/command/ConflictAddCommand.java
@@ -48,7 +48,7 @@ public class ConflictAddCommand extends Command {
@Override public void undoCommand() {
if (! Main.map.mapView.hasLayer(getLayer())) {
- System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
+ Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
getLayer().getName(),
conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
));
diff --git a/src/org/openstreetmap/josm/command/ConflictResolveCommand.java b/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
index defd12d..fd95ee6 100644
--- a/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
@@ -10,7 +10,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
/**
* This is the common base class for {@link Command}s which manipulate {@link Conflict}s in
- * addition to {@link OsmPrimitive}s.
+ * addition to {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
*
* A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing
* it reconstitutes them.
@@ -60,7 +60,7 @@ public abstract class ConflictResolveCommand extends Command {
super.undoCommand();
if (! Main.map.mapView.hasLayer(getLayer())) {
- System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
+ Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
this.toString(),
getLayer().toString()
));
diff --git a/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java b/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java
index 873a93d..1c78bce 100644
--- a/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java
@@ -25,10 +25,9 @@ public class CoordinateConflictResolveCommand extends ConflictResolveCommand {
private final MergeDecisionType decision;
/**
- * constructor
+ * constructor for coordinate conflict
*
- * @param my my node
- * @param their their node
+ * @param conflict the conflict data set
* @param decision the merge decision
*/
public CoordinateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, MergeDecisionType decision) {
diff --git a/src/org/openstreetmap/josm/command/DeleteCommand.java b/src/org/openstreetmap/josm/command/DeleteCommand.java
index cc77702..ea2e7a6 100644
--- a/src/org/openstreetmap/josm/command/DeleteCommand.java
+++ b/src/org/openstreetmap/josm/command/DeleteCommand.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.command;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -201,7 +201,7 @@ public class DeleteCommand extends Command {
if (toDelete.size() == 1)
return null;
else {
- List<PseudoCommand> children = new ArrayList<PseudoCommand>();
+ List<PseudoCommand> children = new ArrayList<PseudoCommand>(toDelete.size());
for (final OsmPrimitive osm : toDelete) {
children.add(new PseudoCommand() {
@@ -394,9 +394,7 @@ public class DeleteCommand extends Command {
// remove the objects from their parent relations
//
- Iterator<Relation> iterator = OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Relation.class).iterator();
- while (iterator.hasNext()) {
- Relation cur = iterator.next();
+ for (Relation cur : OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Relation.class)) {
Relation rel = new Relation(cur);
rel.removeMembersFor(primitivesToDelete);
cmds.add(new ChangeCommand(cur, rel));
diff --git a/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java b/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java
index efe4a9a..7a98c5d 100644
--- a/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java
@@ -29,8 +29,7 @@ public class DeletedStateConflictResolveCommand extends ConflictResolveCommand {
/**
* constructor
*
- * @param my my node
- * @param their their node
+ * @param conflict the conflict data set
* @param decision the merge decision
*/
public DeletedStateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, MergeDecisionType decision) {
diff --git a/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java b/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
index 7b4756c..6513641 100644
--- a/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
@@ -5,9 +5,8 @@ import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
-import javax.swing.Icon;
-import javax.swing.JLabel;
+import javax.swing.Icon;
import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -26,8 +25,7 @@ public class ModifiedConflictResolveCommand extends ConflictResolveCommand {
/**
* constructor
- * @param my my primitive (i.e. the primitive from the local dataset)
- * @param their their primitive (i.e. the primitive from the server)
+ * @param conflict the conflict data set
*/
public ModifiedConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
this.conflict = conflict;
diff --git a/src/org/openstreetmap/josm/command/MoveCommand.java b/src/org/openstreetmap/josm/command/MoveCommand.java
index 181e8bb..cc23997 100644
--- a/src/org/openstreetmap/josm/command/MoveCommand.java
+++ b/src/org/openstreetmap/josm/command/MoveCommand.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.command;
import static org.openstreetmap.josm.tools.I18n.trn;
@@ -8,6 +8,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+
import javax.swing.Icon;
import org.openstreetmap.josm.data.coor.EastNorth;
@@ -30,7 +31,7 @@ public class MoveCommand extends Command {
*/
private Collection<Node> nodes = new LinkedList<Node>();
/**
- * Starting position, base command point, current (mouse-drag) position = startEN + (x,y) =
+ * Starting position, base command point, current (mouse-drag) position = startEN + (x,y) =
*/
private EastNorth startEN;
@@ -47,19 +48,9 @@ public class MoveCommand extends Command {
private double backupY;
/**
- * Small helper for holding the interesting part of the old data state of the
- * objects.
- */
- public static class OldState {
- LatLon latlon;
- EastNorth en; // cached EastNorth to be used for applying exact displacenment
- boolean modified;
- }
-
- /**
* List of all old states of the objects.
*/
- private List<OldState> oldState = new LinkedList<OldState>();
+ private List<OldNodeState> oldState = new LinkedList<OldNodeState>();
public MoveCommand(OsmPrimitive osm, double x, double y) {
this(Collections.singleton(osm), x, y);
@@ -72,7 +63,7 @@ public class MoveCommand extends Command {
public MoveCommand(Collection<OsmPrimitive> objects, EastNorth offset) {
this(objects, offset.getX(), offset.getY());
}
-
+
/**
* Create a MoveCommand and assign the initial object set and movement vector.
*/
@@ -84,24 +75,20 @@ public class MoveCommand extends Command {
this.y = y;
this.nodes = AllNodesVisitor.getAllNodes(objects);
for (Node n : this.nodes) {
- OldState os = new OldState();
- os.latlon = new LatLon(n.getCoor());
- os.en = n.getEastNorth();
- os.modified = n.isModified();
- oldState.add(os);
+ oldState.add(new OldNodeState(n));
}
}
- public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
- this(objects, end.getX()-start.getX(), end.getY()-start.getY());
- startEN = start;
- }
+ public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
+ this(objects, end.getX()-start.getX(), end.getY()-start.getY());
+ startEN = start;
+ }
+
+ public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
+ this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
+ startEN = start;
+ }
- public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
- this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
- startEN = start;
- }
-
/**
* Move the same set of objects again by the specified vector. The vectors
* are added together and so the resulting will be moved to the previous
@@ -121,26 +108,26 @@ public class MoveCommand extends Command {
public void moveAgainTo(double x, double y) {
moveAgain(x - this.x, y - this.y);
}
-
+
/**
- * Change the displacement vector to have endpoint @param currentEN
+ * Change the displacement vector to have endpoint @param currentEN
* starting point is startEN
*/
public void applyVectorTo(EastNorth currentEN) {
- if (startEN == null)
+ if (startEN == null)
return;
x = currentEN.getX() - startEN.getX();
y = currentEN.getY() - startEN.getY();
updateCoordinates();
}
- /**
+ /**
* Changes base point of movement
* @param newDraggedStartPoint - new starting point after movement (where user clicks to start new drag)
*/
public void changeStartPoint(EastNorth newDraggedStartPoint) {
startEN = new EastNorth(newDraggedStartPoint.getX()-x, newDraggedStartPoint.getY()-y);
- }
+ }
/**
* Save curent displacement to restore in case of some problems
@@ -160,10 +147,12 @@ public class MoveCommand extends Command {
}
private void updateCoordinates() {
- Iterator<OldState> it = oldState.iterator();
+ Iterator<OldNodeState> it = oldState.iterator();
for (Node n : nodes) {
- OldState os = it.next();
- n.setEastNorth(os.en.add(x, y));
+ OldNodeState os = it.next();
+ if (os.eastNorth != null) {
+ n.setEastNorth(os.eastNorth.add(x, y));
+ }
}
}
@@ -172,19 +161,19 @@ public class MoveCommand extends Command {
// in case #3892 happens again
if (n == null)
throw new AssertionError("null detected in node list");
- if (n.getEastNorth() == null)
- throw new AssertionError("null coordinates detected in node list");
-
- n.setEastNorth(n.getEastNorth().add(x, y));
- n.setModified(true);
+ EastNorth en = n.getEastNorth();
+ if (en != null) {
+ n.setEastNorth(en.add(x, y));
+ n.setModified(true);
+ }
}
return true;
}
@Override public void undoCommand() {
- Iterator<OldState> it = oldState.iterator();
+ Iterator<OldNodeState> it = oldState.iterator();
for (Node n : nodes) {
- OldState os = it.next();
+ OldNodeState os = it.next();
n.setCoor(os.latlon);
n.setModified(os.modified);
}
diff --git a/src/org/openstreetmap/josm/command/PseudoCommand.java b/src/org/openstreetmap/josm/command/PseudoCommand.java
index 8c389e0..3834bcb 100644
--- a/src/org/openstreetmap/josm/command/PseudoCommand.java
+++ b/src/org/openstreetmap/josm/command/PseudoCommand.java
@@ -2,8 +2,8 @@
package org.openstreetmap.josm.command;
import java.util.Collection;
+
import javax.swing.Icon;
-import javax.swing.JLabel;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
diff --git a/src/org/openstreetmap/josm/command/PurgeCommand.java b/src/org/openstreetmap/josm/command/PurgeCommand.java
index 6a68bf7..6f734e2 100644
--- a/src/org/openstreetmap/josm/command/PurgeCommand.java
+++ b/src/org/openstreetmap/josm/command/PurgeCommand.java
@@ -14,6 +14,8 @@ import java.util.Set;
import javax.swing.Icon;
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.NodeData;
@@ -37,6 +39,8 @@ public class PurgeCommand extends Command {
protected Map<PrimitiveId, PrimitiveData> makeIncompleteData_byPrimId;
+ protected final ConflictCollection purgedConflicts = new ConflictCollection();
+
final protected DataSet ds;
/**
@@ -75,6 +79,7 @@ public class PurgeCommand extends Command {
public boolean executeCommand() {
ds.beginUpdate();
try {
+ purgedConflicts.get().clear();
/**
* Loop from back to front to keep referential integrity.
*/
@@ -96,6 +101,11 @@ public class PurgeCommand extends Command {
osm.load(empty);
} else {
ds.removePrimitive(osm);
+ Conflict<?> conflict = getLayer().getConflicts().getConflictForMy(osm);
+ if (conflict != null) {
+ purgedConflicts.add(conflict);
+ getLayer().getConflicts().remove(conflict);
+ }
}
}
} finally {
@@ -121,6 +131,10 @@ public class PurgeCommand extends Command {
ds.addPrimitive(osm);
}
}
+
+ for (Conflict<?> conflict : purgedConflicts) {
+ getLayer().getConflicts().add(conflict);
+ }
}
/**
@@ -132,6 +146,9 @@ public class PurgeCommand extends Command {
List<OsmPrimitive> out = new ArrayList<OsmPrimitive>(in.size());
+ // Nodes not deleted in the first pass
+ Set<OsmPrimitive> remainingNodes = new HashSet<OsmPrimitive>(in.size());
+
/**
* First add nodes that have no way referrer.
*/
@@ -142,6 +159,8 @@ public class PurgeCommand extends Command {
Node n = (Node) u;
for (OsmPrimitive ref : n.getReferrers()) {
if (ref instanceof Way && in.contains(ref)) {
+ it.remove();
+ remainingNodes.add(n);
continue outer;
}
}
@@ -153,30 +172,30 @@ public class PurgeCommand extends Command {
/**
* Then add all ways, each preceded by its (remaining) nodes.
*/
- top: while (!in.isEmpty()) {
- for (Iterator<OsmPrimitive> it = in.iterator(); it.hasNext();) {
- OsmPrimitive u = it.next();
- if (u instanceof Way) {
- Way w = (Way) u;
- it.remove();
- for (Node n : w.getNodes()) {
- if (in.contains(n)) {
- in.remove(n);
- out.add(n);
- }
+ for (Iterator<OsmPrimitive> it = in.iterator(); it.hasNext();) {
+ OsmPrimitive u = it.next();
+ if (u instanceof Way) {
+ Way w = (Way) u;
+ it.remove();
+ for (Node n : w.getNodes()) {
+ if (remainingNodes.contains(n)) {
+ remainingNodes.remove(n);
+ out.add(n);
}
- out.add(w);
- continue top;
}
+ out.add(w);
}
- break; // no more ways left
}
+ if (!remainingNodes.isEmpty())
+ throw new AssertionError("topo sort algorithm failed (nodes remaining)");
+
/**
- * Rest are relations. Do topological sorting on a DAG where each
- * arrow points from child to parent. (Because it is faster to
- * loop over getReferrers() than getMembers().)
- */
+ * Rest are relations. Do topological sorting on a DAG where each
+ * arrow points from child to parent. (Because it is faster to
+ * loop over getReferrers() than getMembers().)
+ */
+ @SuppressWarnings({ "unchecked", "rawtypes" })
Set<Relation> inR = (Set) in;
Set<Relation> childlessR = new HashSet<Relation>();
List<Relation> outR = new ArrayList<Relation>(inR.size());
diff --git a/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java b/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
index 1ec6d3f..368c354 100644
--- a/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
+++ b/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
@@ -37,7 +37,7 @@ public class RelationMemberConflictResolverCommand extends Command {
*
* @param my my relation
* @param their their relation
- * @param mergedNodeList the list of merged relation members
+ * @param mergedMembers the list of merged relation members
*/
public RelationMemberConflictResolverCommand(Relation my, Relation their, List<RelationMember> mergedMembers) {
this.my = my;
@@ -67,7 +67,7 @@ public class RelationMemberConflictResolverCommand extends Command {
my.setMembers(mergedMembers);
// remember the layer
- layer = Main.map.mapView.getEditLayer();
+ layer = Main.main.getEditLayer();
return true;
}
@@ -80,7 +80,7 @@ public class RelationMemberConflictResolverCommand extends Command {
@Override
public void undoCommand() {
if (! Main.map.mapView.hasLayer(layer)) {
- System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
+ Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
this.toString(),
layer.toString()
));
@@ -88,7 +88,7 @@ public class RelationMemberConflictResolverCommand extends Command {
}
Main.map.mapView.setActiveLayer(layer);
- OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
+ OsmDataLayer editLayer = Main.main.getEditLayer();
// restore the former state
//
diff --git a/src/org/openstreetmap/josm/command/RemoveNodesCommand.java b/src/org/openstreetmap/josm/command/RemoveNodesCommand.java
new file mode 100644
index 0000000..b00f233
--- /dev/null
+++ b/src/org/openstreetmap/josm/command/RemoveNodesCommand.java
@@ -0,0 +1,58 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.command;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.Icon;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Command that removes a set of nodes from a way.
+ * The same can be done with ChangeNodesCommand, but this is more
+ * efficient. (Needed for the tool to disconnect nodes from ways.)
+ *
+ * @author Giuseppe Bilotta
+ */
+public class RemoveNodesCommand extends Command {
+
+ private final Way way;
+ private final Set<Node> rmNodes;
+
+ public RemoveNodesCommand(Way way, List<Node> rmNodes) {
+ super();
+ this.way = way;
+ this.rmNodes = new HashSet<Node>(rmNodes);
+ }
+
+ @Override public boolean executeCommand() {
+ super.executeCommand();
+ way.removeNodes(rmNodes);
+ way.setModified(true);
+ return true;
+ }
+
+ @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+ modified.add(way);
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Removed nodes from {0}", way.getDisplayName(DefaultNameFormatter.getInstance()));
+ }
+
+ @Override
+ public Icon getDescriptionIcon() {
+ return ImageProvider.get(OsmPrimitiveType.WAY);
+ }
+}
diff --git a/src/org/openstreetmap/josm/command/RotateCommand.java b/src/org/openstreetmap/josm/command/RotateCommand.java
index ad6603e..402e2cc 100644
--- a/src/org/openstreetmap/josm/command/RotateCommand.java
+++ b/src/org/openstreetmap/josm/command/RotateCommand.java
@@ -25,12 +25,6 @@ public class RotateCommand extends TransformNodesCommand {
private EastNorth pivot;
/**
- * World position of the mouse when the user started the command.
- *
- */
- EastNorth startEN = null;
-
- /**
* angle of rotation starting click to pivot
*/
private double startAngle = 0.0;
@@ -48,19 +42,12 @@ public class RotateCommand extends TransformNodesCommand {
super(objects);
pivot = getNodesCenter();
-
- // We remember the very first position of the mouse for this action.
- // Note that SelectAction will keep the same ScaleCommand when the user
- // releases the button and presses it again with the same modifiers.
- // The very first point of this operation is stored here.
- startEN = currentEN;
-
startAngle = getAngle(currentEN);
rotationAngle = 0.0;
handleEvent(currentEN);
}
-
+
/**
* Get angle between the horizontal axis and the line formed by the pivot and give points.
**/
diff --git a/src/org/openstreetmap/josm/command/ScaleCommand.java b/src/org/openstreetmap/josm/command/ScaleCommand.java
index b01a2a2..1c95329 100644
--- a/src/org/openstreetmap/josm/command/ScaleCommand.java
+++ b/src/org/openstreetmap/josm/command/ScaleCommand.java
@@ -68,7 +68,6 @@ public class ScaleCommand extends TransformNodesCommand {
*/
@Override
protected void transformNodes() {
- // scalingFactor = 2.0;
for (Node n : nodes) {
EastNorth oldEastNorth = oldStates.get(n).eastNorth;
double dx = oldEastNorth.east() - pivot.east();
diff --git a/src/org/openstreetmap/josm/command/SequenceCommand.java b/src/org/openstreetmap/josm/command/SequenceCommand.java
index c8af9f7..58e9bb4 100644
--- a/src/org/openstreetmap/josm/command/SequenceCommand.java
+++ b/src/org/openstreetmap/josm/command/SequenceCommand.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.command;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -6,12 +6,9 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
-import java.util.List;
-import javax.swing.Icon;
-import javax.swing.JLabel;
+import javax.swing.Icon;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -19,30 +16,32 @@ import org.openstreetmap.josm.tools.ImageProvider;
* A command consisting of a sequence of other commands. Executes the other commands
* and undo them in reverse order.
* @author imi
+ * @since 31
*/
public class SequenceCommand extends Command {
- /**
- * The command sequenz to be executed.
- */
+ /** The command sequence to be executed. */
private Command[] sequence;
- private boolean sequence_complete;
+ private boolean sequenceComplete;
private final String name;
+ /** Determines if the sequence execution should continue after one of its commands fails. */
public boolean continueOnError = false;
/**
* Create the command by specifying the list of commands to execute.
+ * @param name The description text
* @param sequenz The sequence that should be executed.
*/
public SequenceCommand(String name, Collection<Command> sequenz) {
super();
this.name = name;
- this.sequence = new Command[sequenz.size()];
- this.sequence = sequenz.toArray(this.sequence);
+ this.sequence = sequenz.toArray(new Command[sequenz.size()]);
}
/**
* Convenient constructor, if the commands are known at compile time.
+ * @param name The description text
+ * @param sequenz The sequence that should be executed.
*/
public SequenceCommand(String name, Command... sequenz) {
this(name, Arrays.asList(sequenz));
@@ -50,27 +49,31 @@ public class SequenceCommand extends Command {
@Override public boolean executeCommand() {
for (int i=0; i < sequence.length; i++) {
- Command c = sequence[i];
- boolean result = c.executeCommand();
+ boolean result = sequence[i].executeCommand();
if (!result && !continueOnError) {
- this.undoCommands(i-1);
+ undoCommands(i-1);
return false;
}
}
- sequence_complete = true;
+ sequenceComplete = true;
return true;
}
+ /**
+ * Returns the last command.
+ * @return The last command, or {@code null} if the sequence is empty.
+ */
public Command getLastCommand() {
- if(sequence.length == 0)
+ if (sequence.length == 0)
return null;
return sequence[sequence.length-1];
}
- private void undoCommands(int start) {
+
+ protected final void undoCommands(int start) {
// We probably aborted this halfway though the
// execution sequence because of a sub-command
// error. We already undid the sub-commands.
- if (!sequence_complete)
+ if (!sequenceComplete)
return;
for (int i = start; i >= 0; --i) {
sequence[i].undoCommand();
@@ -78,7 +81,7 @@ public class SequenceCommand extends Command {
}
@Override public void undoCommand() {
- this.undoCommands(sequence.length-1);
+ undoCommands(sequence.length-1);
}
@Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
@@ -98,9 +101,8 @@ public class SequenceCommand extends Command {
}
@Override
- @SuppressWarnings("unchecked")
public Collection<PseudoCommand> getChildren() {
- return (List) Arrays.asList(sequence);
+ return Arrays.<PseudoCommand>asList(sequence);
}
@Override
@@ -111,4 +113,12 @@ public class SequenceCommand extends Command {
}
return prims;
}
+
+ protected final void setSequence(Command[] sequence) {
+ this.sequence = Arrays.copyOf(sequence, sequence.length);
+ }
+
+ protected final void setSequenceComplete(boolean sequenceComplete) {
+ this.sequenceComplete = sequenceComplete;
+ }
}
diff --git a/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java b/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
index f7c0a08..e2722fd 100644
--- a/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
@@ -45,8 +45,7 @@ public class TagConflictResolveCommand extends ConflictResolveCommand {
/**
* constructor
*
- * @param my my primitive
- * @param their their primitive
+ * @param conflict the conflict data set
* @param mergeItems the list of merge decisions, represented as {@link TagMergeItem}s
*/
public TagConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, List<TagMergeItem> mergeItems) {
diff --git a/src/org/openstreetmap/josm/command/TransformNodesCommand.java b/src/org/openstreetmap/josm/command/TransformNodesCommand.java
index d50dca1..a9b806e 100644
--- a/src/org/openstreetmap/josm/command/TransformNodesCommand.java
+++ b/src/org/openstreetmap/josm/command/TransformNodesCommand.java
@@ -11,7 +11,6 @@ import java.util.Map;
import javax.swing.Icon;
import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
@@ -29,31 +28,18 @@ public abstract class TransformNodesCommand extends Command {
*/
protected Collection<Node> nodes = new LinkedList<Node>();
- /**
- * Small helper for holding the interesting part of the old data state of the
- * nodes.
- */
- public static class OldState {
- LatLon latlon;
- EastNorth eastNorth;
- boolean modified;
- }
/**
* List of all old states of the nodes.
*/
- protected Map<Node, OldState> oldStates = new HashMap<Node, OldState>();
+ protected Map<Node, OldNodeState> oldStates = new HashMap<Node, OldNodeState>();
/**
* Stores the state of the nodes before the command.
*/
protected void storeOldState() {
for (Node n : this.nodes) {
- OldState os = new OldState();
- os.latlon = new LatLon(n.getCoor());
- os.eastNorth = n.getEastNorth();
- os.modified = n.isModified();
- oldStates.put(n, os);
+ oldStates.put(n, new OldNodeState(n));
}
}
@@ -106,7 +92,7 @@ public abstract class TransformNodesCommand extends Command {
@Override
public void undoCommand() {
for (Node n : nodes) {
- OldState os = oldStates.get(n);
+ OldNodeState os = oldStates.get(n);
n.setCoor(os.latlon);
n.setModified(os.modified);
}
diff --git a/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java b/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
index 0025ce2..afa0740 100644
--- a/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
+++ b/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
@@ -24,8 +24,7 @@ public class VersionConflictResolveCommand extends ConflictResolveCommand {
/**
* constructor
- * @param my my primitive (i.e. the primitive from the local dataset)
- * @param their their primitive (i.e. the primitive from the server)
+ * @param conflict the conflict data set
*/
public VersionConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
this.conflict = conflict;
diff --git a/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java b/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
index 2ea3343..891a1a4 100644
--- a/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
+++ b/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
@@ -8,6 +8,7 @@ import java.util.List;
import javax.swing.Icon;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.conflict.Conflict;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -29,10 +30,8 @@ public class WayNodesConflictResolverCommand extends ConflictResolveCommand {
private final List<Node> mergedNodeList;
/**
- *
- * @param my my may
- * @param their their way
- * @param mergedNodeList the list of merged nodes
+ * @param conflict the conflict data set
+ * @param mergedNodeList the list of merged nodes
*/
@SuppressWarnings("unchecked")
public WayNodesConflictResolverCommand(Conflict<? extends OsmPrimitive> conflict, List<Node> mergedNodeList) {
@@ -55,12 +54,11 @@ public class WayNodesConflictResolverCommand extends ConflictResolveCommand {
//
super.executeCommand();
- // replace the list of nodes of 'my' way by the list of merged
- // nodes
+ // replace the list of nodes of 'my' way by the list of merged nodes
//
for (Node n:mergedNodeList) {
if (! getLayer().data.getNodes().contains(n)) {
- System.out.println(tr("Main dataset does not include node {0}", n.toString()));
+ Main.warn(tr("Main dataset does not include node {0}", n.toString()));
}
}
conflict.getMy().setNodes(mergedNodeList);
diff --git a/src/org/openstreetmap/josm/corrector/CorrectionTable.java b/src/org/openstreetmap/josm/corrector/CorrectionTable.java
index 301f1ae..3215ddc 100644
--- a/src/org/openstreetmap/josm/corrector/CorrectionTable.java
+++ b/src/org/openstreetmap/josm/corrector/CorrectionTable.java
@@ -9,7 +9,7 @@ import javax.swing.JLabel;
import javax.swing.JTable;
import javax.swing.table.TableCellRenderer;
-public abstract class CorrectionTable<TM extends CorrectionTableModel<?>>
+public abstract class CorrectionTable<T extends CorrectionTableModel<?>>
extends JTable {
private static final int MAX_VISIBLE_LINES = 10;
@@ -17,6 +17,7 @@ public abstract class CorrectionTable<TM extends CorrectionTableModel<?>>
public static class BoldRenderer extends JLabel implements
TableCellRenderer {
+ @Override
public Component getTableCellRendererComponent(JTable table,
Object value, boolean isSelected, boolean hasFocus, int row,
int column) {
@@ -32,7 +33,7 @@ public abstract class CorrectionTable<TM extends CorrectionTableModel<?>>
private static BoldRenderer boldRenderer = null;
- protected CorrectionTable(TM correctionTableModel) {
+ protected CorrectionTable(T correctionTableModel) {
super(correctionTableModel);
final int correctionsSize = correctionTableModel.getCorrections().size();
@@ -45,6 +46,7 @@ public abstract class CorrectionTable<TM extends CorrectionTableModel<?>>
setRowSelectionAllowed(false);
}
+ @Override
public TableCellRenderer getCellRenderer(int row, int column) {
if (getCorrectionTableModel().isBoldCell(row, column)) {
if (boldRenderer == null)
@@ -55,8 +57,8 @@ public abstract class CorrectionTable<TM extends CorrectionTableModel<?>>
}
@SuppressWarnings("unchecked")
- public TM getCorrectionTableModel() {
- return (TM)getModel();
+ public T getCorrectionTableModel() {
+ return (T)getModel();
}
}
diff --git a/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java b/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
index d9046e8..7870979 100644
--- a/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
+++ b/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
@@ -23,6 +23,7 @@ public abstract class CorrectionTableModel<C extends Correction> extends
applyColumn = getColumnCount() - 1;
}
+ @Override
abstract public int getColumnCount();
abstract protected boolean isBoldCell(int row, int column);
@@ -41,6 +42,7 @@ public abstract class CorrectionTableModel<C extends Correction> extends
return apply[i];
}
+ @Override
public int getRowCount() {
return corrections.size();
}
@@ -71,6 +73,7 @@ public abstract class CorrectionTableModel<C extends Correction> extends
apply[rowIndex] = (Boolean)aValue;
}
+ @Override
public Object getValueAt(int rowIndex, int colIndex) {
if (colIndex == applyColumn)
return apply[rowIndex];
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
index a9a24c6..56bd2a6 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
@@ -22,8 +22,12 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter;
* @see ReverseWayTagCorrector for handling of tags that can be modified (oneway=yes, etc.)
* @since 5724
*/
-public class ReverseWayNoTagCorrector {
+public final class ReverseWayNoTagCorrector {
+ private ReverseWayNoTagCorrector() {
+ // Hide default constructor for utils classes
+ }
+
/**
* Tags that imply a semantic meaning from the way direction and cannot be changed.
*/
@@ -63,12 +67,12 @@ public class ReverseWayNoTagCorrector {
if (tags.size() == 1) {
return tags.iterator().next().toString();
} else if (tags.size() > 1) {
- String s = "<ul>";
+ StringBuilder s = new StringBuilder("<ul>");
for (Tag t : tags) {
- s += "<li>" + t.toString() + "</li>";
+ s.append("<li>").append(t).append("</li>");
}
- s += "</ul>";
- return s;
+ s.append("</ul>");
+ return s.toString();
} else {
return "";
}
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
index f5f8a49..a31e397 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.corrector;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -17,6 +16,8 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.data.osm.Way;
/**
@@ -27,42 +28,58 @@ import org.openstreetmap.josm.data.osm.Way;
* The Corrector offers the automatic resolution in an dialog
* for the user to confirm.
*/
-
public class ReverseWayTagCorrector extends TagCorrector<Way> {
- private static class PrefixSuffixSwitcher {
+ private static final String SEPARATOR = "[:_]";
+
+ private static final Pattern getPatternFor(String s) {
+ return getPatternFor(s, false);
+ }
+
+ private static final Pattern getPatternFor(String s, boolean exactMatch) {
+ if (exactMatch) {
+ return Pattern.compile("(^)(" + s + ")($)");
+ } else {
+ return Pattern.compile("(^|.*" + SEPARATOR + ")(" + s + ")(" + SEPARATOR + ".*|$)",
+ Pattern.CASE_INSENSITIVE);
+ }
+ }
+
+ private static final Collection<Pattern> ignoredKeys = new ArrayList<Pattern>();
+ static {
+ for (String s : OsmPrimitive.getUninterestingKeys()) {
+ ignoredKeys.add(getPatternFor(s));
+ }
+ for (String s : new String[]{"name", "ref", "tiger:county"}) {
+ ignoredKeys.add(getPatternFor(s, false));
+ }
+ for (String s : new String[]{"tiger:county", "turn:lanes", "change:lanes", "placement"}) {
+ ignoredKeys.add(getPatternFor(s, true));
+ }
+ }
- private static final String SEPARATOR = "[:_]?";
+ private static class StringSwitcher {
private final String a;
private final String b;
- private final Pattern startPattern;
- private final Pattern endPattern;
+ private final Pattern pattern;
- public PrefixSuffixSwitcher(String a, String b) {
+ public StringSwitcher(String a, String b) {
this.a = a;
this.b = b;
- startPattern = Pattern.compile(
- "^(" + a + "|" + b + ")(" + SEPARATOR + "|$)",
- Pattern.CASE_INSENSITIVE);
- endPattern = Pattern.compile("^.*" +
- SEPARATOR + "(" + a + "|" + b + ")$",
- Pattern.CASE_INSENSITIVE);
+ this.pattern = getPatternFor(a + "|" + b);
}
public String apply(String text) {
- Matcher m = startPattern.matcher(text);
- if (!m.lookingAt()) {
- m = endPattern.matcher(text);
- }
+ Matcher m = pattern.matcher(text);
if (m.lookingAt()) {
- String leftRight = m.group(1).toLowerCase();
+ String leftRight = m.group(2).toLowerCase();
StringBuilder result = new StringBuilder();
- result.append(text.substring(0, m.start(1)));
+ result.append(text.substring(0, m.start(2)));
result.append(leftRight.equals(a) ? b : a);
- result.append(text.substring(m.end(1)));
+ result.append(text.substring(m.end(2)));
return result.toString();
}
@@ -70,14 +87,72 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
}
}
- private static final PrefixSuffixSwitcher[] prefixSuffixSwitchers =
- new PrefixSuffixSwitcher[] {
- new PrefixSuffixSwitcher("left", "right"),
- new PrefixSuffixSwitcher("forward", "backward"),
- new PrefixSuffixSwitcher("forwards", "backwards"),
- new PrefixSuffixSwitcher("up", "down"),
- new PrefixSuffixSwitcher("east", "west"),
- new PrefixSuffixSwitcher("north", "south"),
+ /**
+ * Reverses a given tag.
+ * @since 5787
+ */
+ public static class TagSwitcher {
+
+ /**
+ * Reverses a given tag.
+ * @param tag The tag to reverse
+ * @return The reversed tag (is equal to <code>tag</code> if no change is needed)
+ */
+ public static final Tag apply(final Tag tag) {
+ return apply(tag.getKey(), tag.getValue());
+ }
+
+ /**
+ * Reverses a given tag (key=value).
+ * @param key The tag key
+ * @param value The tag value
+ * @return The reversed tag (is equal to <code>key=value</code> if no change is needed)
+ */
+ public static final Tag apply(final String key, final String value) {
+ String newKey = key;
+ String newValue = value;
+
+ if (key.startsWith("oneway") || key.endsWith("oneway")) {
+ if (OsmUtils.isReversed(value)) {
+ newValue = OsmUtils.trueval;
+ } else if (OsmUtils.isTrue(value)) {
+ newValue = OsmUtils.reverseval;
+ }
+ } else if (key.startsWith("incline") || key.endsWith("incline")
+ || key.startsWith("direction") || key.endsWith("direction")) {
+ newValue = UP_DOWN.apply(value);
+ if (newValue.equals(value)) {
+ newValue = invertNumber(value);
+ }
+ } else if (key.endsWith(":forward") || key.endsWith(":backward")) {
+ // Change key but not left/right value (fix #8518)
+ newKey = FORWARD_BACKWARD.apply(key);
+
+ } else if (!ignoreKeyForCorrection(key)) {
+ for (StringSwitcher prefixSuffixSwitcher : stringSwitchers) {
+ newKey = prefixSuffixSwitcher.apply(key);
+ if (!key.equals(newKey)) {
+ break;
+ }
+ newValue = prefixSuffixSwitcher.apply(value);
+ if (!value.equals(newValue)) {
+ break;
+ }
+ }
+ }
+ return new Tag(newKey, newValue);
+ }
+ }
+
+ private static final StringSwitcher FORWARD_BACKWARD = new StringSwitcher("forward", "backward");
+ private static final StringSwitcher UP_DOWN = new StringSwitcher("up", "down");
+
+ private static final StringSwitcher[] stringSwitchers = new StringSwitcher[] {
+ new StringSwitcher("left", "right"),
+ new StringSwitcher("forwards", "backwards"),
+ new StringSwitcher("east", "west"),
+ new StringSwitcher("north", "south"),
+ FORWARD_BACKWARD, UP_DOWN
};
/**
@@ -87,17 +162,9 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
* @return false if tags should be changed to keep semantic, true otherwise.
*/
public static boolean isReversible(Way way) {
- for (String key : way.keySet()) {
- for (String k : Arrays.asList("oneway", "incline", "direction")) {
- if (key.startsWith(k) || key.endsWith(k)) {
- return false;
- }
- }
- String value = way.get(key);
- for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
- if (!key.equals(prefixSuffixSwitcher.apply(key)) || !value.equals(prefixSuffixSwitcher.apply(value))) {
- return false;
- }
+ for (Tag tag : TagCollection.from(way)) {
+ if (!tag.equals(TagSwitcher.apply(tag))) {
+ return false;
}
}
return true;
@@ -113,7 +180,7 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
return newWays;
}
- public String invertNumber(String value) {
+ public static String invertNumber(String value) {
Pattern pattern = Pattern.compile("^([+-]?)(\\d.*)$", Pattern.CASE_INSENSITIVE);
Matcher matcher = pattern.matcher(value);
if (!matcher.matches()) return value;
@@ -128,37 +195,12 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap =
new HashMap<OsmPrimitive, List<TagCorrection>>();
- ArrayList<TagCorrection> tagCorrections = new ArrayList<TagCorrection>();
+ List<TagCorrection> tagCorrections = new ArrayList<TagCorrection>();
for (String key : way.keySet()) {
- String newKey = key;
String value = way.get(key);
- String newValue = value;
-
- if (key.startsWith("oneway") || key.endsWith("oneway")) {
- if (OsmUtils.isReversed(value)) {
- newValue = OsmUtils.trueval;
- } else if (OsmUtils.isTrue(value)) {
- newValue = OsmUtils.reverseval;
- }
- } else if (key.startsWith("incline") || key.endsWith("incline")
- || key.startsWith("direction") || key.endsWith("direction")) {
- PrefixSuffixSwitcher switcher = new PrefixSuffixSwitcher("up", "down");
- newValue = switcher.apply(value);
- if (newValue.equals(value)) {
- newValue = invertNumber(value);
- }
- } else if (!ignoreKeyForPrefixSuffixCorrection(key)) {
- for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
- newKey = prefixSuffixSwitcher.apply(key);
- if (!key.equals(newKey)) {
- break;
- }
- newValue = prefixSuffixSwitcher.apply(value);
- if (!value.equals(newValue)) {
- break;
- }
- }
- }
+ Tag newTag = TagSwitcher.apply(key, value);
+ String newKey = newTag.getKey();
+ String newValue = newTag.getValue();
boolean needsCorrection = !key.equals(newKey);
if (way.get(newKey) != null && way.get(newKey).equals(newValue)) {
@@ -178,7 +220,7 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap =
new HashMap<OsmPrimitive, List<RoleCorrection>>();
- ArrayList<RoleCorrection> roleCorrections = new ArrayList<RoleCorrection>();
+ List<RoleCorrection> roleCorrections = new ArrayList<RoleCorrection>();
Collection<OsmPrimitive> referrers = oldway.getReferrers();
for (OsmPrimitive referrer: referrers) {
@@ -196,7 +238,7 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
boolean found = false;
String newRole = null;
- for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
+ for (StringSwitcher prefixSuffixSwitcher : stringSwitchers) {
newRole = prefixSuffixSwitcher.apply(member.getRole());
if (!newRole.equals(member.getRole())) {
found = true;
@@ -216,13 +258,15 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
}
return applyCorrections(tagCorrectionsMap, roleCorrectionMap,
- tr("When reversing this way, the following changes to properties "
- + "of the way and its nodes are suggested in order "
- + "to maintain data consistency."));
+ tr("When reversing this way, the following changes are suggested in order to maintain data consistency."));
}
- private static boolean ignoreKeyForPrefixSuffixCorrection(String key) {
- return key.contains("name") || key.equals("tiger:county")
- || key.equalsIgnoreCase("fixme") || key.startsWith("note");
+ private static boolean ignoreKeyForCorrection(String key) {
+ for (Pattern ignoredKey : ignoredKeys) {
+ if (ignoredKey.matcher(key).matches()) {
+ return true;
+ }
+ }
+ return false;
}
}
diff --git a/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java b/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java
index f5ef698..ffc08cc 100644
--- a/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java
+++ b/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java
@@ -31,6 +31,7 @@ public class TagCorrectionTableModel extends CorrectionTableModel<TagCorrection>
return null;
}
+ @Override
public Object getCorrectionValueAt(int rowIndex, int colIndex) {
TagCorrection tagCorrection = getCorrections().get(rowIndex);
@@ -47,6 +48,7 @@ public class TagCorrectionTableModel extends CorrectionTableModel<TagCorrection>
return null;
}
+ @Override
protected boolean isBoldCell(int row, int column) {
TagCorrection tagCorrection = getCorrections().get(row);
return (column == 2 && tagCorrection.isKeyChanged())
diff --git a/src/org/openstreetmap/josm/corrector/TagCorrector.java b/src/org/openstreetmap/josm/corrector/TagCorrector.java
index 5aa553c..3e19bd7 100644
--- a/src/org/openstreetmap/josm/corrector/TagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/TagCorrector.java
@@ -28,7 +28,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
-import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -70,7 +70,7 @@ public abstract class TagCorrector<P extends OsmPrimitive> {
p.add(label1, GBC.eop().anchor(GBC.CENTER));
final JMultilineLabel label2 = new JMultilineLabel(
- tr("Please select which property changes you want to apply."));
+ tr("Please select which changes you want to apply."));
label2.setMaxWidth(600);
p.add(label2, GBC.eop().anchor(GBC.CENTER));
@@ -82,7 +82,7 @@ public abstract class TagCorrector<P extends OsmPrimitive> {
continue;
}
- final JLabel propertiesLabel = new JLabel(tr("Properties of "));
+ final JLabel propertiesLabel = new JLabel(tr("Tags of "));
p.add(propertiesLabel, GBC.std());
final JLabel primitiveLabel = new JLabel(
diff --git a/src/org/openstreetmap/josm/data/APIDataSet.java b/src/org/openstreetmap/josm/data/APIDataSet.java
index b96e37f..7ab1334 100644
--- a/src/org/openstreetmap/josm/data/APIDataSet.java
+++ b/src/org/openstreetmap/josm/data/APIDataSet.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.Stack;
@@ -34,9 +35,9 @@ import org.openstreetmap.josm.tools.Utils;
*
*/
public class APIDataSet {
- private LinkedList<OsmPrimitive> toAdd;
- private LinkedList<OsmPrimitive> toUpdate;
- private LinkedList<OsmPrimitive> toDelete;
+ private List<OsmPrimitive> toAdd;
+ private List<OsmPrimitive> toUpdate;
+ private List<OsmPrimitive> toDelete;
/**
* creates a new empty data set
@@ -266,7 +267,7 @@ public class APIDataSet {
*
*/
private static class RelationUploadDependencyGraph {
- private HashMap<Relation, Set<Relation>> children;
+ private Map<Relation, Set<Relation>> children;
private Collection<Relation> relations;
private Set<Relation> visited;
private List<Relation> uploadOrder;
@@ -332,10 +333,11 @@ public class APIDataSet {
for (Relation relation: relations) {
visit(path, relation);
}
- ArrayList<Relation> ret = new ArrayList<Relation>(relations);
+ List<Relation> ret = new ArrayList<Relation>(relations);
Collections.sort(
ret,
new Comparator<Relation>() {
+ @Override
public int compare(Relation o1, Relation o2) {
return Integer.valueOf(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2));
}
diff --git a/src/org/openstreetmap/josm/data/AutosaveTask.java b/src/org/openstreetmap/josm/data/AutosaveTask.java
index 4e17373..0bb58ad 100644
--- a/src/org/openstreetmap/josm/data/AutosaveTask.java
+++ b/src/org/openstreetmap/josm/data/AutosaveTask.java
@@ -33,10 +33,13 @@ import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.OsmExporter;
import org.openstreetmap.josm.io.OsmImporter;
+import org.openstreetmap.josm.tools.Utils;
/**
* Saves data layers periodically so they can be recovered in case of a crash.
@@ -65,6 +68,8 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
public static final IntegerProperty PROP_DELETED_LAYERS = new IntegerProperty("autosave.deletedLayersBackupCount", 5);
public static final IntegerProperty PROP_INTERVAL = new IntegerProperty("autosave.interval", 5 * 60);
public static final IntegerProperty PROP_INDEX_LIMIT = new IntegerProperty("autosave.index-limit", 1000);
+ /** Defines if a notification should be displayed after each autosave */
+ public static final BooleanProperty PROP_NOTIFICATION = new BooleanProperty("autosave.notification", false);
private static class AutosaveLayerInfo {
OsmDataLayer layer;
@@ -87,11 +92,11 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
if (PROP_INTERVAL.get() > 0) {
if (!autosaveDir.exists() && !autosaveDir.mkdirs()) {
- System.out.println(tr("Unable to create directory {0}, autosave will be disabled", autosaveDir.getAbsolutePath()));
+ Main.warn(tr("Unable to create directory {0}, autosave will be disabled", autosaveDir.getAbsolutePath()));
return;
}
if (!deletedLayersDir.exists() && !deletedLayersDir.mkdirs()) {
- System.out.println(tr("Unable to create directory {0}, autosave will be disabled", deletedLayersDir.getAbsolutePath()));
+ Main.warn(tr("Unable to create directory {0}, autosave will be disabled", deletedLayersDir.getAbsolutePath()));
return;
}
@@ -112,9 +117,9 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
private String getFileName(String layerName, int index) {
String result = layerName;
- for (int i=0; i<ILLEGAL_CHARACTERS.length; i++) {
- result = result.replaceAll(Pattern.quote(String.valueOf(ILLEGAL_CHARACTERS[i])),
- '&' + String.valueOf((int)ILLEGAL_CHARACTERS[i]) + ';');
+ for (char illegalCharacter : ILLEGAL_CHARACTERS) {
+ result = result.replaceAll(Pattern.quote(String.valueOf(illegalCharacter)),
+ '&' + String.valueOf((int) illegalCharacter) + ';');
}
if (index != 0) {
result = result + '_' + index;
@@ -155,18 +160,18 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
File pidFile = new File(autosaveDir, filename+".pid");
PrintStream ps = new PrintStream(pidFile);
ps.println(ManagementFactory.getRuntimeMXBean().getName());
- ps.close();
+ Utils.close(ps);
} catch (Throwable t) {
- System.err.println(t.getMessage());
+ Main.error(t);
}
return result;
} else {
- System.out.println(tr("Unable to create file {0}, other filename will be used", result.getAbsolutePath()));
+ Main.warn(tr("Unable to create file {0}, other filename will be used", result.getAbsolutePath()));
if (index > PROP_INDEX_LIMIT.get())
throw new IOException("index limit exceeded");
}
} catch (IOException e) {
- System.err.println(tr("IOError while creating file, autosave will be skipped: {0}", e.getMessage()));
+ Main.error(tr("IOError while creating file, autosave will be skipped: {0}", e.getMessage()));
return null;
}
index++;
@@ -188,7 +193,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
while (info.backupFiles.size() > PROP_FILES_PER_LAYER.get()) {
File oldFile = info.backupFiles.remove();
if (!oldFile.delete()) {
- System.out.println(tr("Unable to delete old backup file {0}", oldFile.getAbsolutePath()));
+ Main.warn(tr("Unable to delete old backup file {0}", oldFile.getAbsolutePath()));
} else {
getPidFile(oldFile).delete();
}
@@ -203,14 +208,29 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
savelayer(info);
}
changedDatasets.clear();
+ if (PROP_NOTIFICATION.get() && !layersInfo.isEmpty()) {
+ displayNotification();
+ }
} catch (Throwable t) {
// Don't let exception stop time thread
- System.err.println("Autosave failed: ");
+ Main.error("Autosave failed:");
+ Main.error(t);
t.printStackTrace();
}
}
}
+ protected void displayNotification() {
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
+ public void run() {
+ new Notification(tr("Your work has been saved automatically."))
+ .setDuration(Notification.TIME_SHORT)
+ .show();
+ }
+ });
+ }
+
@Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
// Do nothing
@@ -255,7 +275,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
}
}
} catch (IOException e) {
- System.err.println(tr("Error while creating backup of removed layer: {0}", e.getMessage()));
+ Main.error(tr("Error while creating backup of removed layer: {0}", e.getMessage()));
}
it.remove();
@@ -273,7 +293,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
private final File getPidFile(File osmFile) {
return new File(autosaveDir, osmFile.getName().replaceFirst("[.][^.]+$", ".pid"));
}
-
+
/**
* Replies the list of .osm files still present in autosave dir, that are not currently managed by another instance of JOSM.
* These files are hence unsaved layers from an old instance of JOSM that crashed and may be recovered by this instance.
@@ -293,15 +313,17 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(pidFile)));
try {
String jvmId = reader.readLine();
- String pid = jvmId.split("@")[0];
- skipFile = jvmPerfDataFileExists(pid);
+ if (jvmId != null) {
+ String pid = jvmId.split("@")[0];
+ skipFile = jvmPerfDataFileExists(pid);
+ }
} catch (Throwable t) {
- System.err.println(t.getClass()+":"+t.getMessage());
+ Main.error(t);
} finally {
- reader.close();
+ Utils.close(reader);
}
} catch (Throwable t) {
- System.err.println(t.getClass()+":"+t.getMessage());
+ Main.error(t);
}
}
if (!skipFile) {
@@ -311,7 +333,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
}
return result;
}
-
+
private boolean jvmPerfDataFileExists(final String jvmId) {
File jvmDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "hsperfdata_" + System.getProperty("user.name"));
if (jvmDir.exists() && jvmDir.canRead()) {
@@ -331,6 +353,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
final OpenFileTask openFileTsk = new OpenFileTask(files, null, tr("Restoring files"));
Main.worker.submit(openFileTsk);
Main.worker.submit(new Runnable() {
+ @Override
public void run() {
for (File f: openFileTsk.getSuccessfullyOpenedFiles()) {
moveToDeletedLayersFolder(f);
@@ -350,21 +373,21 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
private void moveToDeletedLayersFolder(File f) {
File backupFile = new File(deletedLayersDir, f.getName());
File pidFile = getPidFile(f);
-
+
if (backupFile.exists()) {
deletedLayers.remove(backupFile);
if (!backupFile.delete()) {
- System.err.println(String.format("Warning: Could not delete old backup file %s", backupFile));
+ Main.warn(String.format("Could not delete old backup file %s", backupFile));
}
}
if (f.renameTo(backupFile)) {
deletedLayers.add(backupFile);
pidFile.delete();
} else {
- System.err.println(String.format("Warning: Could not move autosaved file %s to %s folder", f.getName(), deletedLayersDir.getName()));
+ Main.warn(String.format("Could not move autosaved file %s to %s folder", f.getName(), deletedLayersDir.getName()));
// we cannot move to deleted folder, so just try to delete it directly
if (!f.delete()) {
- System.err.println(String.format("Warning: Could not delete backup file %s", f));
+ Main.warn(String.format("Could not delete backup file %s", f));
} else {
pidFile.delete();
}
@@ -375,7 +398,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
break;
}
if (!next.delete()) {
- System.err.println(String.format("Warning: Could not delete archived backup file %s", next));
+ Main.warn(String.format("Could not delete archived backup file %s", next));
}
}
}
diff --git a/src/org/openstreetmap/josm/data/Bounds.java b/src/org/openstreetmap/josm/data/Bounds.java
index 08e1cfd..260b312 100644
--- a/src/org/openstreetmap/josm/data/Bounds.java
+++ b/src/org/openstreetmap/josm/data/Bounds.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -8,6 +8,7 @@ import java.text.DecimalFormat;
import java.text.MessageFormat;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
@@ -26,17 +27,57 @@ public class Bounds {
return new LatLon(minLat, minLon);
}
+ /**
+ * Returns min latitude of bounds. Efficient shortcut for {@code getMin().lat()}.
+ *
+ * @return min latitude of bounds.
+ * @since 6203
+ */
+ public double getMinLat() {
+ return minLat;
+ }
+
+ /**
+ * Returns min longitude of bounds. Efficient shortcut for {@code getMin().lon()}.
+ *
+ * @return min longitude of bounds.
+ * @since 6203
+ */
+ public double getMinLon() {
+ return minLon;
+ }
+
public LatLon getMax() {
return new LatLon(maxLat, maxLon);
}
-
+
+ /**
+ * Returns max latitude of bounds. Efficient shortcut for {@code getMax().lat()}.
+ *
+ * @return max latitude of bounds.
+ * @since 6203
+ */
+ public double getMaxLat() {
+ return maxLat;
+ }
+
+ /**
+ * Returns max longitude of bounds. Efficient shortcut for {@code getMax().lon()}.
+ *
+ * @return max longitude of bounds.
+ * @since 6203
+ */
+ public double getMaxLon() {
+ return maxLon;
+ }
+
public enum ParseMethod {
MINLAT_MINLON_MAXLAT_MAXLON,
LEFT_BOTTOM_RIGHT_TOP
}
-
+
/**
- * Construct bounds out of two points
+ * Construct bounds out of two points. Coords will be rounded.
*/
public Bounds(LatLon min, LatLon max) {
this(min.lat(), min.lon(), max.lat(), max.lon());
@@ -49,15 +90,35 @@ public class Bounds {
public Bounds(LatLon b) {
this(b, true);
}
-
+
+ /**
+ * Single point Bounds defined by lat/lon {@code b}.
+ * Coordinates will be rounded to osm precision if {@code roundToOsmPrecision} is true.
+ *
+ * @param b lat/lon of given point.
+ * @param roundToOsmPrecision defines if lat/lon will be rounded.
+ */
public Bounds(LatLon b, boolean roundToOsmPrecision) {
+ this(b.lat(), b.lon(), roundToOsmPrecision);
+ }
+
+ /**
+ * Single point Bounds defined by point [lat,lon].
+ * Coordinates will be rounded to osm precision if {@code roundToOsmPrecision} is true.
+ *
+ * @param lat latitude of given point.
+ * @param lon longitude of given point.
+ * @param roundToOsmPrecision defines if lat/lon will be rounded.
+ * @since 6203
+ */
+ public Bounds(double lat, double lon, boolean roundToOsmPrecision) {
// Do not call this(b, b) to avoid GPX performance issue (see #7028) until roundToOsmPrecision() is improved
if (roundToOsmPrecision) {
- this.minLat = LatLon.roundToOsmPrecision(b.lat());
- this.minLon = LatLon.roundToOsmPrecision(b.lon());
+ this.minLat = LatLon.roundToOsmPrecision(lat);
+ this.minLon = LatLon.roundToOsmPrecision(lon);
} else {
- this.minLat = b.lat();
- this.minLon = b.lon();
+ this.minLat = lat;
+ this.minLon = lon;
}
this.maxLat = this.minLat;
this.maxLon = this.minLon;
@@ -123,7 +184,7 @@ public class Bounds {
throw new IllegalArgumentException(MessageFormat.format("Illegal double value ''{0}''", components[i]));
}
}
-
+
switch (parseMethod) {
case LEFT_BOTTOM_RIGHT_TOP:
this.minLat = initLat(values[1], roundToOsmPrecision);
@@ -139,7 +200,7 @@ public class Bounds {
this.maxLon = initLon(values[3], roundToOsmPrecision);
}
}
-
+
protected static double initLat(double value, boolean roundToOsmPrecision) {
if (!LatLon.isValidLat(value))
throw new IllegalArgumentException(tr("Illegal latitude value ''{0}''", value));
@@ -152,8 +213,12 @@ public class Bounds {
return roundToOsmPrecision ? LatLon.roundToOsmPrecision(value) : value;
}
- public Bounds(Bounds other) {
- this(other.getMin(), other.getMax());
+ /**
+ * Creates new {@code Bounds} from an existing one.
+ * @param other The bounds to copy
+ */
+ public Bounds(final Bounds other) {
+ this(other.minLat, other.minLon, other.maxLat, other.maxLon);
}
public Bounds(Rectangle2D rect) {
@@ -185,6 +250,16 @@ public class Bounds {
this.maxLon = LatLon.roundToOsmPrecision(LatLon.toIntervalLon(center.lon() + lonExtent / 2));
}
+ /**
+ * Creates BBox with same coordinates.
+ *
+ * @return BBox with same coordinates.
+ * @since 6203
+ */
+ public BBox toBBox() {
+ return new BBox(minLon, minLat, maxLon, maxLat);
+ }
+
@Override public String toString() {
return "Bounds["+minLat+","+minLon+","+maxLat+","+maxLon+"]";
}
@@ -202,52 +277,67 @@ public class Bounds {
*/
public LatLon getCenter()
{
- if (crosses180thMeridian()) {
- LatLon result = new LatLon(minLat, minLon-360.0).getCenter(getMax());
- if (result.lon() < -180.0) {
- result.setLocation(result.lon()+360.0, result.lat());
+ if (crosses180thMeridian()) {
+ double lat = (minLat + maxLat) / 2;
+ double lon = (minLon + maxLon - 360.0) / 2;
+ if (lon < -180.0){
+ lon += 360.0;
}
- return result;
+ return new LatLon(lat, lon);
} else {
- return getMin().getCenter(getMax());
+ return new LatLon((minLat + maxLat) / 2, (minLon + maxLon) / 2);
}
}
/**
* Extend the bounds if necessary to include the given point.
+ * @param ll The point to include into these bounds
*/
public void extend(LatLon ll) {
- if (ll.lat() < minLat) {
- minLat = LatLon.roundToOsmPrecision(ll.lat());
+ extend(ll.lat(), ll.lon());
+ }
+
+ /**
+ * Extend the bounds if necessary to include the given point [lat,lon].
+ * Good to use if you know coordinates to avoid creation of LatLon object.
+ * @param lat Latitude of point to include into these bounds
+ * @param lon Longitude of point to include into these bounds
+ * @since 6203
+ */
+ public void extend(final double lat, final double lon) {
+ if (lat < minLat) {
+ minLat = LatLon.roundToOsmPrecision(lat);
}
- if (ll.lat() > maxLat) {
- maxLat = LatLon.roundToOsmPrecision(ll.lat());
+ if (lat > maxLat) {
+ maxLat = LatLon.roundToOsmPrecision(lat);
}
if (crosses180thMeridian()) {
- if (ll.lon() > maxLon && ll.lon() < minLon) {
- if (Math.abs(ll.lon() - minLon) <= Math.abs(ll.lon() - maxLon)) {
- minLon = LatLon.roundToOsmPrecision(ll.lon());
+ if (lon > maxLon && lon < minLon) {
+ if (Math.abs(lon - minLon) <= Math.abs(lon - maxLon)) {
+ minLon = LatLon.roundToOsmPrecision(lon);
} else {
- maxLon = LatLon.roundToOsmPrecision(ll.lon());
+ maxLon = LatLon.roundToOsmPrecision(lon);
}
}
} else {
- if (ll.lon() < minLon) {
- minLon = LatLon.roundToOsmPrecision(ll.lon());
+ if (lon < minLon) {
+ minLon = LatLon.roundToOsmPrecision(lon);
}
- if (ll.lon() > maxLon) {
- maxLon = LatLon.roundToOsmPrecision(ll.lon());
+ if (lon > maxLon) {
+ maxLon = LatLon.roundToOsmPrecision(lon);
}
}
}
public void extend(Bounds b) {
- extend(b.getMin());
- extend(b.getMax());
+ extend(b.minLat, b.minLon);
+ extend(b.maxLat, b.maxLon);
}
-
+
/**
- * Is the given point within this bounds?
+ * Determines if the given point {@code ll} is within these bounds.
+ * @param ll The lat/lon to check
+ * @return {@code true} if {@code ll} is within these bounds, {@code false} otherwise
*/
public boolean contains(LatLon ll) {
if (ll.lat() < minLat || ll.lat() > maxLat)
@@ -265,7 +355,7 @@ public class Bounds {
private static boolean intersectsLonCrossing(Bounds crossing, Bounds notCrossing) {
return notCrossing.minLon <= crossing.maxLon || notCrossing.maxLon >= crossing.minLon;
}
-
+
/**
* The two bounds intersect? Compared to java Shape.intersects, if does not use
* the interior but the closure. (">=" instead of ">")
@@ -273,7 +363,7 @@ public class Bounds {
public boolean intersects(Bounds b) {
if (b.maxLat < minLat || b.minLat > maxLat)
return false;
-
+
if (crosses180thMeridian() && !b.crosses180thMeridian()) {
return intersectsLonCrossing(this, b);
} else if (!crosses180thMeridian() && b.crosses180thMeridian()) {
@@ -293,7 +383,7 @@ public class Bounds {
public boolean crosses180thMeridian() {
return this.minLon > this.maxLon;
}
-
+
/**
* Converts the lat/lon bounding box to an object of type Rectangle2D.Double
* @return the bounding box to Rectangle2D.Double
@@ -319,11 +409,12 @@ public class Bounds {
/**
* <p>Replies true, if this bounds are <em>collapsed</em>, i.e. if the min
* and the max corner are equal.</p>
- *
+ *
* @return true, if this bounds are <em>collapsed</em>
*/
public boolean isCollapsed() {
- return getMin().equals(getMax());
+ return Double.doubleToLongBits(minLat) == Double.doubleToLongBits(maxLat)
+ && Double.doubleToLongBits(minLon) == Double.doubleToLongBits(maxLon);
}
public boolean isOutOfTheWorld() {
diff --git a/src/org/openstreetmap/josm/data/CustomConfigurator.java b/src/org/openstreetmap/josm/data/CustomConfigurator.java
index 018ebe3..4185f6e 100644
--- a/src/org/openstreetmap/josm/data/CustomConfigurator.java
+++ b/src/org/openstreetmap/josm/data/CustomConfigurator.java
@@ -1,8 +1,6 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
-import javax.script.ScriptException;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences.Setting;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.BufferedInputStream;
@@ -11,11 +9,8 @@ import java.io.CharArrayReader;
import java.io.CharArrayWriter;
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.InputStream;
-
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -26,11 +21,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import javax.xml.parsers.DocumentBuilder;
@@ -41,11 +37,14 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences.Setting;
import org.openstreetmap.josm.gui.io.DownloadFileTask;
import org.openstreetmap.josm.plugins.PluginDownloadTask;
import org.openstreetmap.josm.plugins.PluginInformation;
import org.openstreetmap.josm.plugins.ReadLocalPluginInformationTask;
import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -55,22 +54,27 @@ import org.w3c.dom.NodeList;
* Class to process configuration changes stored in XML
* can be used to modify preferences, store/delete files in .josm folders etc
*/
-public class CustomConfigurator {
+public final class CustomConfigurator {
+
+ private CustomConfigurator() {
+ // Hide default constructor for utils classes
+ }
+
private static StringBuilder summary = new StringBuilder();
-
+
public static void log(String fmt, Object... vars) {
summary.append(String.format(fmt, vars));
}
-
+
public static void log(String s) {
summary.append(s);
summary.append("\n");
}
-
+
public static String getLog() {
return summary.toString();
}
-
+
public static void readXML(String dir, String fileName) {
readXML(new File(dir, fileName));
}
@@ -86,11 +90,11 @@ public class CustomConfigurator {
}
new XMLCommandProcessor(prefs).openAndReadXML(file);
synchronized(CustomConfigurator.class) {
- CustomConfigurator.class.notifyAll();
+ CustomConfigurator.class.notifyAll();
busy=false;
}
}
-
+
/**
* Read configuration script from XML file, modifying main preferences
* @param file - file to open for reading XML
@@ -98,11 +102,11 @@ public class CustomConfigurator {
public static void readXML(File file) {
readXML(file, Main.pref);
}
-
+
/**
* Downloads file to one of JOSM standard folders
* @param address - URL to download
- * @param path - file path relative to base where to put downloaded file
+ * @param path - file path relative to base where to put downloaded file
* @param base - only "prefs", "cache" and "plugins" allowed for standard folders
*/
public static void downloadFile(String address, String path, String base) {
@@ -112,7 +116,7 @@ public class CustomConfigurator {
/**
* Downloads file to one of JOSM standard folders nad unpack it as ZIP/JAR file
* @param address - URL to download
- * @param path - file path relative to base where to put downloaded file
+ * @param path - file path relative to base where to put downloaded file
* @param base - only "prefs", "cache" and "plugins" allowed for standard folders
*/
public static void downloadAndUnpackFile(String address, String path, String base) {
@@ -122,7 +126,7 @@ public class CustomConfigurator {
/**
* Downloads file to arbitrary folder
* @param address - URL to download
- * @param path - file path relative to parentDir where to put downloaded file
+ * @param path - file path relative to parentDir where to put downloaded file
* @param parentDir - folder where to put file
* @param mkdir - if true, non-existing directories will be created
* @param unzip - if true file wil be unzipped and deleted after download
@@ -135,15 +139,15 @@ public class CustomConfigurator {
File fOut = new File(dir, path);
DownloadFileTask downloadFileTask = new DownloadFileTask(Main.parent, address, fOut, mkdir, unzip);
- Future f = Main.worker.submit(downloadFileTask);
+ Main.worker.submit(downloadFileTask);
log("Info: downloading file from %s to %s in background ", parentDir, fOut.getAbsolutePath());
if (unzip) log("and unpacking it"); else log("");
-
+
}
/**
* Simple function to show messageBox, may be used from JS API and from other code
- * @param type - 'i','w','e','q','p' for Information, Warning, Error, Question, Message
+ * @param type - 'i','w','e','q','p' for Information, Warning, Error, Question, Message
* @param text - message to display, HTML allowed
*/
public static void messageBox(String type, String text) {
@@ -157,7 +161,7 @@ public class CustomConfigurator {
case 'p': JOptionPane.showMessageDialog(Main.parent, text, tr("Message"), JOptionPane.PLAIN_MESSAGE); break;
}
}
-
+
/**
* Simple function for choose window, may be used from JS API and from other code
* @param text - message to show, HTML allowed
@@ -201,19 +205,19 @@ public class CustomConfigurator {
* This function exports part of user preferences to specified file.
* Default values are not saved.
* Preference keys matching specified pattern are saved
- * @param filename - where to export
+ * @param fileName - where to export
* @param append - if true, resulting file cause appending to exuisting preferences
* @param pattern - Regexp pattern forh preferences keys you need to export (".*imagery.*", for example)
*/
public static void exportPreferencesKeysByPatternToFile(String fileName, boolean append, String pattern) {
- ArrayList<String> keySet = new ArrayList<String>();
+ List<String> keySet = new ArrayList<String>();
Map<String, Setting> allSettings = Main.pref.getAllSettings();
for (String key: allSettings.keySet()) {
if (key.matches(pattern)) keySet.add(key);
}
exportPreferencesKeysToFile(fileName, append, keySet);
}
-
+
/**
* Export specified preferences keys to configuration file
* @param filename - name of file
@@ -236,14 +240,14 @@ public class CustomConfigurator {
exportDocument = builder.newDocument();
root = document.getDocumentElement();
} catch (Exception ex) {
- System.out.println("Error getting preferences to save:" +ex.getMessage());
+ Main.warn("Error getting preferences to save:" +ex.getMessage());
}
if (root==null) return;
try {
-
+
Element newRoot = exportDocument.createElement("config");
exportDocument.appendChild(newRoot);
-
+
Element prefElem = exportDocument.createElement("preferences");
prefElem.setAttribute("operation", append?"append":"replace");
newRoot.appendChild(prefElem);
@@ -265,12 +269,12 @@ public class CustomConfigurator {
ts.setOutputProperty(OutputKeys.INDENT, "yes");
ts.transform(new DOMSource(exportDocument), new StreamResult(f.toURI().getPath()));
} catch (Exception ex) {
- System.out.println("Error saving preferences part: " +ex.getMessage());
+ Main.warn("Error saving preferences part: " +ex.getMessage());
ex.printStackTrace();
}
}
-
-
+
+
public static void deleteFile(String path, String base) {
String dir = getDirectoryByAbbr(base);
if (dir==null) {
@@ -291,12 +295,12 @@ public class CustomConfigurator {
public static void deleteFileOrDirectory(String path) {
deleteFileOrDirectory(new File(path));
}
-
+
public static void deleteFileOrDirectory(File f) {
if (f.isDirectory()) {
for (File f1: f.listFiles()) {
deleteFileOrDirectory(f1);
- }
+ }
}
try {
f.delete();
@@ -307,7 +311,7 @@ public class CustomConfigurator {
private static boolean busy=false;
-
+
public static void pluginOperation(String install, String uninstall, String delete) {
final List<String> installList = new ArrayList<String>();
final List<String> removeList = new ArrayList<String>();
@@ -316,7 +320,7 @@ public class CustomConfigurator {
Collections.addAll(removeList, uninstall.toLowerCase().split(";"));
Collections.addAll(deleteList, delete.toLowerCase().split(";"));
installList.remove("");removeList.remove("");deleteList.remove("");
-
+
if (!installList.isEmpty()) {
log("Plugins install: "+installList);
}
@@ -329,21 +333,24 @@ public class CustomConfigurator {
final ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask();
Runnable r = new Runnable() {
+ @Override
public void run() {
if (task.isCanceled()) return;
- synchronized (CustomConfigurator.class) {
+ synchronized (CustomConfigurator.class) {
try { // proceed only after all other tasks were finished
while (busy) CustomConfigurator.class.wait();
- } catch (InterruptedException ex) { }
-
+ } catch (InterruptedException ex) {
+ Main.warn("InterruptedException while reading local plugin information");
+ }
+
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
List<PluginInformation> availablePlugins = task.getAvailablePlugins();
List<PluginInformation> toInstallPlugins = new ArrayList<PluginInformation>();
List<PluginInformation> toRemovePlugins = new ArrayList<PluginInformation>();
List<PluginInformation> toDeletePlugins = new ArrayList<PluginInformation>();
for (PluginInformation pi: availablePlugins) {
- //System.out.print(pi.name+";");
String name = pi.name.toLowerCase();
if (installList.contains(name)) toInstallPlugins.add(pi);
if (removeList.contains(name)) toRemovePlugins.add(pi);
@@ -353,20 +360,21 @@ public class CustomConfigurator {
PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(Main.parent, toInstallPlugins, tr ("Installing plugins"));
Main.worker.submit(pluginDownloadTask);
}
- Collection<String> pls = new ArrayList<String>(Main.pref.getCollection("plugins"));
- for (PluginInformation pi: toInstallPlugins) {
- if (!pls.contains(pi.name)) pls.add(pi.name);
- }
- for (PluginInformation pi: toRemovePlugins) {
- pls.remove(pi.name);
+ Collection<String> pls = new ArrayList<String>(Main.pref.getCollection("plugins"));
+ for (PluginInformation pi: toInstallPlugins) {
+ if (!pls.contains(pi.name)) {
+ pls.add(pi.name);
}
- for (PluginInformation pi: toDeletePlugins) {
- pls.remove(pi.name);
- new File(Main.pref.getPluginsDirectory(),pi.name+".jar").deleteOnExit();
- }
- System.out.println(pls);
- Main.pref.putCollection("plugins",pls);
}
+ for (PluginInformation pi: toRemovePlugins) {
+ pls.remove(pi.name);
+ }
+ for (PluginInformation pi: toDeletePlugins) {
+ pls.remove(pi.name);
+ new File(Main.pref.getPluginsDirectory(), pi.name+".jar").deleteOnExit();
+ }
+ Main.pref.putCollection("plugins",pls);
+ }
});
}
}
@@ -375,7 +383,7 @@ public class CustomConfigurator {
Main.worker.submit(task);
Main.worker.submit(r);
}
-
+
private static String getDirectoryByAbbr(String base) {
String dir;
if ("prefs".equals(base) || base.length()==0) {
@@ -401,19 +409,19 @@ public class CustomConfigurator {
tmp.listOfStructsDefaults.putAll( pref.listOfStructsDefaults );
tmp.listOfStructsProperties.putAll( pref.listOfStructsProperties );
tmp.colornames.putAll( pref.colornames );
-
+
return tmp;
}
public static class XMLCommandProcessor {
-
+
Preferences mainPrefs;
Map<String,Element> tasksMap = new HashMap<String,Element>();
-
+
private boolean lastV; // last If condition result
-
-
+
+
ScriptEngine engine ;
public void openAndReadXML(File file) {
@@ -440,11 +448,7 @@ public class CustomConfigurator {
} catch (Exception ex) {
log("Error reading custom preferences: "+ex.getMessage());
} finally {
- try {
- if (is != null) {
- is.close();
- }
- } catch (IOException ex) { }
+ Utils.close(is);
}
log("-- Reading complete --");
}
@@ -455,7 +459,7 @@ public class CustomConfigurator {
CustomConfigurator.summary = new StringBuilder();
engine = new ScriptEngineManager().getEngineByName("rhino");
engine.eval("API={}; API.pref={}; API.fragments={};");
-
+
engine.eval("homeDir='"+normalizeDirName(Main.pref.getPreferencesDir()) +"';");
engine.eval("josmVersion="+Version.getInstance().getVersion()+";");
String className = CustomConfigurator.class.getName();
@@ -486,7 +490,6 @@ public class CustomConfigurator {
Node item = childNodes.item(i);
if (item.getNodeType() != Node.ELEMENT_NODE) continue;
String elementName = item.getNodeName();
- //if (monitor!=null) monitor.indeterminateSubTask(elementName);
Element elem = (Element) item;
if ("var".equals(elementName)) {
@@ -496,11 +499,11 @@ public class CustomConfigurator {
} else if ("runtask".equals(elementName)) {
if (processRunTaskElement(elem)) return;
} else if ("ask".equals(elementName)) {
- processAskElement(elem);
+ processAskElement(elem);
} else if ("if".equals(elementName)) {
- processIfElement(elem);
+ processIfElement(elem);
} else if ("else".equals(elementName)) {
- processElseElement(elem);
+ processElseElement(elem);
} else if ("break".equals(elementName)) {
return;
} else if ("plugin".equals(elementName)) {
@@ -518,7 +521,7 @@ public class CustomConfigurator {
} else {
log("Error: Unknown element " + elementName);
}
-
+
}
}
@@ -527,8 +530,8 @@ public class CustomConfigurator {
private void processPreferencesElement(Element item) {
String oper = evalVars(item.getAttribute("operation"));
String id = evalVars(item.getAttribute("id"));
-
-
+
+
if ("delete-keys".equals(oper)) {
String pattern = evalVars(item.getAttribute("pattern"));
String key = evalVars(item.getAttribute("key"));
@@ -540,10 +543,10 @@ public class CustomConfigurator {
}
return;
}
-
+
Preferences tmpPref = readPreferencesFromDOMElement(item);
PreferencesUtils.showPrefs(tmpPref);
-
+
if (id.length()>0) {
try {
String fragmentVar = "API.fragments['"+id+"']";
@@ -554,7 +557,7 @@ public class CustomConfigurator {
log("Error: can not load preferences fragment : "+ex.getMessage());
}
}
-
+
if ("replace".equals(oper)) {
log("Preferences replace: %d keys: %s\n",
tmpPref.getAllSettings().size(), tmpPref.getAllSettings().keySet().toString());
@@ -567,7 +570,7 @@ public class CustomConfigurator {
PreferencesUtils.deletePreferenceValues(tmpPref, mainPrefs);
}
}
-
+
private void processDeleteElement(Element item) {
String path = evalVars(item.getAttribute("path"));
String base = evalVars(item.getAttribute("base"));
@@ -586,7 +589,7 @@ public class CustomConfigurator {
log("Error: Can not find directory to place file, use base=cache, base=prefs or base=plugins attribute.");
return;
}
-
+
if (path.contains("..") || path.startsWith("/") || path.contains(":")) {
return; // some basic protection
}
@@ -596,14 +599,14 @@ public class CustomConfigurator {
}
processDownloadOperation(address, path, dir, "true".equals(mkdir), "true".equals(unzip));
}
-
+
private void processPluginInstallElement(Element elem) {
String install = elem.getAttribute("install");
String uninstall = elem.getAttribute("remove");
String delete = elem.getAttribute("delete");
pluginOperation(install, uninstall, delete);
}
-
+
private void processMsgBoxElement(Element elem) {
String text = evalVars(elem.getAttribute("text"));
String locText = evalVars(elem.getAttribute(LanguageInfo.getJOSMLocaleCode()+".text"));
@@ -612,7 +615,7 @@ public class CustomConfigurator {
String type = evalVars(elem.getAttribute("type"));
messageBox(type, text);
}
-
+
private void processAskElement(Element elem) {
String text = evalVars(elem.getAttribute("text"));
@@ -620,7 +623,7 @@ public class CustomConfigurator {
if (locText.length()>0) text=locText;
String var = elem.getAttribute("var");
if (var.length()==0) var="result";
-
+
String input = evalVars(elem.getAttribute("input"));
if ("true".equals(input)) {
setVar(var, askForText(text));
@@ -639,7 +642,7 @@ public class CustomConfigurator {
log("Error: Can not assign variable: %s=%s : %s\n", name, value, ex.getMessage());
}
}
-
+
private void processIfElement(Element elem) {
String realValue = evalVars(elem.getAttribute("test"));
boolean v=false;
@@ -648,14 +651,14 @@ public class CustomConfigurator {
{
log("Error: Illegal test expression in if: %s=%s\n", elem.getAttribute("test"), realValue);
}
-
- if (v) processXmlFragment(elem);
+
+ if (v) processXmlFragment(elem);
lastV = v;
}
private void processElseElement(Element elem) {
if (!lastV) {
- processXmlFragment(elem);
+ processXmlFragment(elem);
}
}
@@ -671,8 +674,8 @@ public class CustomConfigurator {
}
return false;
}
-
-
+
+
private void processScriptElement(Element elem) {
String js = elem.getChildNodes().item(0).getTextContent();
log("Processing script...");
@@ -684,22 +687,21 @@ public class CustomConfigurator {
}
log("Script finished");
}
-
+
/**
- * subsititute ${expression} = expression evaluated by JavaScript
+ * substitute ${expression} = expression evaluated by JavaScript
*/
private String evalVars(String s) {
Pattern p = Pattern.compile("\\$\\{([^\\}]*)\\}");
Matcher mr = p.matcher(s);
StringBuffer sb = new StringBuffer();
while (mr.find()) {
- try {
- String result = engine.eval(mr.group(1)).toString();
- mr.appendReplacement(sb, result);
- } catch (ScriptException ex) {
- log("Error: Can not evaluate expression %s : %s", mr.group(1), ex.getMessage());
- //mr.appendReplacement(sb, mr.group(0));
- }
+ try {
+ String result = engine.eval(mr.group(1)).toString();
+ mr.appendReplacement(sb, result);
+ } catch (ScriptException ex) {
+ log("Error: Can not evaluate expression %s : %s", mr.group(1), ex.getMessage());
+ }
}
mr.appendTail(sb);
return sb.toString();
@@ -713,14 +715,14 @@ public class CustomConfigurator {
StreamResult out = new StreamResult(outputWriter);
xformer.transform(new DOMSource(item), out);
-
+
String fragmentWithReplacedVars= evalVars(outputWriter.toString());
CharArrayReader reader = new CharArrayReader(fragmentWithReplacedVars.toCharArray());
tmpPref.fromXML(reader);
} catch (Exception ex) {
log("Error: can not read XML fragment :" + ex.getMessage());
- }
+ }
return tmpPref;
}
@@ -740,7 +742,7 @@ public class CustomConfigurator {
* Also contains functions that convert preferences object to JavaScript object and back
*/
public static class PreferencesUtils {
-
+
private static void replacePreferences(Preferences fragment, Preferences mainpref) {
// normal prefs
for (Entry<String, String> entry : fragment.properties.entrySet()) {
@@ -752,7 +754,7 @@ public class CustomConfigurator {
}
// "lists"
for (Entry<String, List<List<String>>> entry : fragment.arrayProperties.entrySet()) {
- ArrayList<Collection<String>> array = new ArrayList<Collection<String>>();
+ List<Collection<String>> array = new ArrayList<Collection<String>>();
array.addAll(entry.getValue());
mainpref.putArray(entry.getKey(), array);
}
@@ -801,14 +803,14 @@ public class CustomConfigurator {
mainpref.putArray(entry.getKey(), newLists);
}
- /// "maps"
+ /// "maps"
for (Entry<String, List<Map<String, String>>> entry : fragment.listOfStructsProperties.entrySet()) {
String key = entry.getKey();
List<Map<String, String>> newMaps = getListOfStructs(mainpref, key, true);
if (newMaps == null) continue;
- // get existing properties as list of maps
+ // get existing properties as list of maps
for (Map<String, String> map : entry.getValue()) {
// add nonexisting map (equals comparison for maps is used implicitly)
@@ -819,7 +821,7 @@ public class CustomConfigurator {
mainpref.putListOfStructs(entry.getKey(), newMaps);
}
}
-
+
/**
* Delete items from @param mainpref collections that match items from @param fragment collections
*/
@@ -853,10 +855,10 @@ public class CustomConfigurator {
for (Entry<String, List<List<String>>> entry : fragment.arrayProperties.entrySet()) {
String key = entry.getKey();
-
+
Collection<Collection<String>> newLists = getArray(mainpref, key, true);
if (newLists == null) continue;
-
+
// if items are found in one of lists, remove that list!
Iterator<Collection<String>> listIterator = newLists.iterator();
while (listIterator.hasNext()) {
@@ -873,13 +875,13 @@ public class CustomConfigurator {
mainpref.putArray(entry.getKey(), newLists);
}
- /// "maps"
+ /// "maps"
for (Entry<String, List<Map<String, String>>> entry : fragment.listOfStructsProperties.entrySet()) {
String key = entry.getKey();
List<Map<String, String>> newMaps = getListOfStructs(mainpref, key, true);
if (newMaps == null) continue;
-
+
Iterator<Map<String, String>> mapIterator = newMaps.iterator();
while (mapIterator.hasNext()) {
Map<String, String> map = mapIterator.next();
@@ -894,13 +896,14 @@ public class CustomConfigurator {
mainpref.putListOfStructs(entry.getKey(), newMaps);
}
}
-
+
private static void deletePreferenceKeyByPattern(String pattern, Preferences pref) {
Map<String, Setting> allSettings = pref.getAllSettings();
- for (String key : allSettings.keySet()) {
+ for (Entry<String, Setting> entry : allSettings.entrySet()) {
+ String key = entry.getKey();
if (key.matches(pattern)) {
- log("Deleting preferences: deleting key from preferences: " + key);
- pref.putSetting(key, allSettings.get(key).getNullInstance());
+ log("Deleting preferences: deleting key from preferences: " + key);
+ pref.putSetting(key, entry.getValue().getNullInstance());
}
}
}
@@ -908,11 +911,11 @@ public class CustomConfigurator {
private static void deletePreferenceKey(String key, Preferences pref) {
Map<String, Setting> allSettings = pref.getAllSettings();
if (allSettings.containsKey(key)) {
- log("Deleting preferences: deleting key from preferences: " + key);
+ log("Deleting preferences: deleting key from preferences: " + key);
pref.putSetting(key, allSettings.get(key).getNullInstance());
}
}
-
+
private static Collection<String> getCollection(Preferences mainpref, String key, boolean warnUnknownDefault) {
Collection<String> existing = mainpref.collectionProperties.get(key);
Collection<String> defaults = mainpref.collectionDefaults.get(key);
@@ -924,7 +927,7 @@ public class CustomConfigurator {
return (existing != null)
? new ArrayList<String>(existing) : new ArrayList<String>(defaults);
}
-
+
private static Collection<Collection<String>> getArray(Preferences mainpref, String key, boolean warnUnknownDefault) {
Collection<List<String>> existing = mainpref.arrayProperties.get(key);
Collection<List<String>> defaults = mainpref.arrayDefaults.get(key);
@@ -950,8 +953,6 @@ public class CustomConfigurator {
return (existing != null)
? new ArrayList<Map<String, String>>(existing) : new ArrayList<Map<String, String>>(defaults);
}
-
-
private static void defaultUnknownWarning(String key) {
log("Warning: Unknown default value of %s , skipped\n", key);
@@ -963,25 +964,24 @@ public class CustomConfigurator {
}
private static void showPrefs(Preferences tmpPref) {
- System.out.println("properties: " + tmpPref.properties);
- System.out.println("collections: " + tmpPref.collectionProperties);
- System.out.println("arrays: " + tmpPref.arrayProperties);
- System.out.println("maps: " + tmpPref.listOfStructsProperties);
+ Main.info("properties: " + tmpPref.properties);
+ Main.info("collections: " + tmpPref.collectionProperties);
+ Main.info("arrays: " + tmpPref.arrayProperties);
+ Main.info("maps: " + tmpPref.listOfStructsProperties);
}
-
+
private static void modifyPreferencesByScript(ScriptEngine engine, Preferences tmpPref, String js) throws ScriptException {
loadPrefsToJS(engine, tmpPref, "API.pref", true);
engine.eval(js);
readPrefsFromJS(engine, tmpPref, "API.pref");
}
-
- /**
+ /**
* Convert JavaScript preferences object to preferences data structures
* @param engine - JS engine to put object
* @param tmpPref - preferences to fill from JS
* @param varInJS - JS variable name, where preferences are stored
- * @throws ScriptException
+ * @throws ScriptException
*/
public static void readPrefsFromJS(ScriptEngine engine, Preferences tmpPref, String varInJS) throws ScriptException {
String finish =
@@ -1061,17 +1061,15 @@ public class CustomConfigurator {
if (Preferences.equalListOfStructs(e.getValue(), tmpPref.listOfStructsDefaults.get(e.getKey()))) continue;
tmpPref.listOfStructsProperties.put(e.getKey(), e.getValue());
}
-
}
-
-
+
/**
* Convert preferences data structures to JavaScript object
* @param engine - JS engine to put object
* @param tmpPref - preferences to convert
* @param whereToPutInJS - variable name to store preferences in JS
* @param includeDefaults - include known default values to JS objects
- * @throws ScriptException
+ * @throws ScriptException
*/
public static void loadPrefsToJS(ScriptEngine engine, Preferences tmpPref, String whereToPutInJS, boolean includeDefaults) throws ScriptException {
Map<String, String> stringMap = new TreeMap<String, String>();
@@ -1086,10 +1084,10 @@ public class CustomConfigurator {
listmapMap.putAll(tmpPref.listOfStructsDefaults);
}
- while (stringMap.values().remove(null)) { };
- while (listMap.values().remove(null)) { };
- while (listlistMap.values().remove(null)) { };
- while (listmapMap.values().remove(null)) { };
+ while (stringMap.values().remove(null));
+ while (listMap.values().remove(null));
+ while (listlistMap.values().remove(null));
+ while (listmapMap.values().remove(null));
stringMap.putAll(tmpPref.properties);
listMap.putAll(tmpPref.collectionProperties);
@@ -1154,15 +1152,9 @@ public class CustomConfigurator {
" jslistmap.type = 'listmap';"+
whereToPutInJS+"[String(e.getKey())] = jslistmap;"+
"}\n";
-
- //System.out.println("map1: "+stringMap );
- //System.out.println("lists1: "+listMap );
- //System.out.println("listlist1: "+listlistMap );
- //System.out.println("listmap1: "+listmapMap );
// Execute conversion script
engine.eval(init);
-
}
}
}
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index 5416571..5653c0a 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17,7 +17,6 @@ import java.io.Reader;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
-import java.nio.channels.FileChannel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -136,65 +135,100 @@ public class Preferences {
Setting<T> getNullInstance();
}
+ /**
+ * Base abstract class of all settings, holding the setting value.
+ *
+ * @param <T> The setting type
+ */
abstract public static class AbstractSetting<T> implements Setting<T> {
- private T value;
+ private final T value;
+ /**
+ * Constructs a new {@code AbstractSetting} with the given value
+ * @param value The setting value
+ */
public AbstractSetting(T value) {
this.value = value;
}
- @Override
- public T getValue() {
+ @Override public T getValue() {
return value;
}
- @Override
- public String toString() {
+ @Override public String toString() {
return value != null ? value.toString() : "null";
}
}
+ /**
+ * Setting containing a {@link String} value.
+ */
public static class StringSetting extends AbstractSetting<String> {
+ /**
+ * Constructs a new {@code StringSetting} with the given value
+ * @param value The setting value
+ */
public StringSetting(String value) {
super(value);
}
- public void visit(SettingVisitor visitor) {
+ @Override public void visit(SettingVisitor visitor) {
visitor.visit(this);
}
- public StringSetting getNullInstance() {
+ @Override public StringSetting getNullInstance() {
return new StringSetting(null);
}
}
+ /**
+ * Setting containing a {@link List} of {@link String} values.
+ */
public static class ListSetting extends AbstractSetting<List<String>> {
+ /**
+ * Constructs a new {@code ListSetting} with the given value
+ * @param value The setting value
+ */
public ListSetting(List<String> value) {
super(value);
}
- public void visit(SettingVisitor visitor) {
+ @Override public void visit(SettingVisitor visitor) {
visitor.visit(this);
}
- public ListSetting getNullInstance() {
+ @Override public ListSetting getNullInstance() {
return new ListSetting(null);
}
}
+ /**
+ * Setting containing a {@link List} of {@code List}s of {@link String} values.
+ */
public static class ListListSetting extends AbstractSetting<List<List<String>>> {
+ /**
+ * Constructs a new {@code ListListSetting} with the given value
+ * @param value The setting value
+ */
public ListListSetting(List<List<String>> value) {
super(value);
}
- public void visit(SettingVisitor visitor) {
+ @Override public void visit(SettingVisitor visitor) {
visitor.visit(this);
}
- public ListListSetting getNullInstance() {
+ @Override public ListListSetting getNullInstance() {
return new ListListSetting(null);
}
}
+ /**
+ * Setting containing a {@link List} of {@link Map}s of {@link String} values.
+ */
public static class MapListSetting extends AbstractSetting<List<Map<String, String>>> {
+ /**
+ * Constructs a new {@code MapListSetting} with the given value
+ * @param value The setting value
+ */
public MapListSetting(List<Map<String, String>> value) {
super(value);
}
- public void visit(SettingVisitor visitor) {
+ @Override public void visit(SettingVisitor visitor) {
visitor.visit(this);
}
- public MapListSetting getNullInstance() {
+ @Override public MapListSetting getNullInstance() {
return new MapListSetting(null);
}
}
@@ -227,12 +261,15 @@ public class Preferences {
this.newValue = newValue;
}
+ @Override
public String getKey() {
return key;
}
+ @Override
public Setting<T> getOldValue() {
return oldValue;
}
+ @Override
public Setting<T> getNewValue() {
return newValue;
}
@@ -264,7 +301,8 @@ public class Preferences {
}
/**
- * Return the location of the user defined preferences file
+ * Returns the location of the user defined preferences directory
+ * @return The location of the user defined preferences directory
*/
public String getPreferencesDir() {
final String path = getPreferencesDirFile().getPath();
@@ -273,6 +311,10 @@ public class Preferences {
return path + File.separator;
}
+ /**
+ * Returns the user defined preferences directory
+ * @return The user defined preferences directory
+ */
public File getPreferencesDirFile() {
if (preferencesDirFile != null)
return preferencesDirFile;
@@ -291,15 +333,18 @@ public class Preferences {
return preferencesDirFile;
}
+ /**
+ * Returns the user preferences file
+ * @return The user preferences file
+ */
public File getPreferenceFile() {
return new File(getPreferencesDirFile(), "preferences.xml");
}
- /* remove end of 2012 */
- public File getOldPreferenceFile() {
- return new File(getPreferencesDirFile(), "preferences");
- }
-
+ /**
+ * Returns the user plugin directory
+ * @return The user plugin directory
+ */
public File getPluginsDirectory() {
return new File(getPreferencesDirFile(), "plugins");
}
@@ -319,7 +364,7 @@ public class Preferences {
if (path != null) {
cacheDirFile = new File(path).getAbsoluteFile();
} else {
- path = Main.pref.get("cache.folder", null);
+ path = get("cache.folder", null);
if (path != null) {
cacheDirFile = new File(path);
} else {
@@ -327,7 +372,7 @@ public class Preferences {
}
}
if (!cacheDirFile.exists() && !cacheDirFile.mkdirs()) {
- System.err.println(tr("Warning: Failed to create missing cache directory: {0}", cacheDirFile.getAbsoluteFile()));
+ Main.warn(tr("Failed to create missing cache directory: {0}", cacheDirFile.getAbsoluteFile()));
JOptionPane.showMessageDialog(
Main.parent,
tr("<html>Failed to create missing cache directory: {0}</html>", cacheDirFile.getAbsoluteFile()),
@@ -343,7 +388,7 @@ public class Preferences {
*/
public Collection<String> getAllPossiblePreferenceDirs() {
LinkedList<String> locations = new LinkedList<String>();
- locations.add(Main.pref.getPreferencesDir());
+ locations.add(getPreferencesDir());
String s;
if ((s = System.getenv("JOSM_RESOURCES")) != null) {
if (!s.endsWith(File.separator)) {
@@ -395,7 +440,7 @@ public class Preferences {
synchronized public String get(final String key, final String def) {
putDefault(key, def);
final String prop = properties.get(key);
- if (prop == null || prop.equals(""))
+ if (prop == null || prop.isEmpty())
return def;
return prop;
}
@@ -420,19 +465,9 @@ public class Preferences {
return all;
}
- synchronized private Map<String, String> getAllPrefixDefault(final String prefix) {
+ synchronized public Map<String, String> getAllColors() {
final Map<String,String> all = new TreeMap<String,String>();
for (final Entry<String,String> e : defaults.entrySet()) {
- if (e.getKey().startsWith(prefix)) {
- all.put(e.getKey(), e.getValue());
- }
- }
- return all;
- }
-
- synchronized public TreeMap<String, String> getAllColors() {
- final TreeMap<String,String> all = new TreeMap<String,String>();
- for (final Entry<String,String> e : defaults.entrySet()) {
if (e.getKey().startsWith("color.") && e.getValue() != null) {
all.put(e.getKey().substring(6), e.getValue());
}
@@ -453,7 +488,7 @@ public class Preferences {
if(!defaults.containsKey(key) || defaults.get(key) == null) {
defaults.put(key, def);
} else if(def != null && !defaults.get(key).equals(def)) {
- System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key));
+ Main.info("Defaults for " + key + " differ: " + def + " != " + defaults.get(key));
}
}
@@ -510,8 +545,8 @@ public class Preferences {
}
try {
save();
- } catch(IOException e){
- System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+ } catch (IOException e) {
+ Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
}
changed = true;
}
@@ -555,17 +590,17 @@ public class Preferences {
File backupFile = new File(prefFile + "_backup");
// Backup old preferences if there are old preferences
- if(prefFile.exists()) {
- copyFile(prefFile, backupFile);
+ if (prefFile.exists()) {
+ Utils.copyFile(prefFile, backupFile);
}
final PrintWriter out = new PrintWriter(new OutputStreamWriter(
new FileOutputStream(prefFile + "_tmp"), "utf-8"), false);
out.print(toXML(false));
- out.close();
+ Utils.close(out);
File tmpFile = new File(prefFile + "_tmp");
- copyFile(tmpFile, prefFile);
+ Utils.copyFile(tmpFile, prefFile);
tmpFile.delete();
setCorrectPermissions(prefFile);
@@ -581,96 +616,21 @@ public class Preferences {
file.setWritable(true, true);
}
- /**
- * Simple file copy function that will overwrite the target file
- * Taken from http://www.rgagnon.com/javadetails/java-0064.html (CC-NC-BY-SA)
- * @param in
- * @param out
- * @throws IOException
- */
- public static void copyFile(File in, File out) throws IOException {
- FileChannel inChannel = new FileInputStream(in).getChannel();
- FileChannel outChannel = new FileOutputStream(out).getChannel();
- try {
- inChannel.transferTo(0, inChannel.size(),
- outChannel);
- }
- catch (IOException e) {
- throw e;
- }
- finally {
- if (inChannel != null) {
- inChannel.close();
- }
- if (outChannel != null) {
- outChannel.close();
- }
- }
- }
-
- public void loadOld() throws Exception {
- load(true);
- }
-
public void load() throws Exception {
- load(false);
- }
-
- private void load(boolean old) throws Exception {
properties.clear();
if (!Main.applet) {
- File pref = old ? getOldPreferenceFile() : getPreferenceFile();
+ File pref = getPreferenceFile();
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), "utf-8"));
- /* FIXME: TODO: remove old style config file end of 2012 */
try {
- if (old) {
- in.mark(1);
- int v = in.read();
- in.reset();
- if(v == '<') {
- validateXML(in);
- Utils.close(in);
- in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), "utf-8"));
- fromXML(in);
- } else {
- int lineNumber = 0;
- ArrayList<Integer> errLines = new ArrayList<Integer>();
- for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) {
- final int i = line.indexOf('=');
- if (i == -1 || i == 0) {
- errLines.add(lineNumber);
- continue;
- }
- String key = line.substring(0,i);
- String value = line.substring(i+1);
- if (!value.isEmpty()) {
- properties.put(key, value);
- }
- }
- if (!errLines.isEmpty())
- throw new IOException(tr("Malformed config file at lines {0}", errLines));
- }
- } else {
- validateXML(in);
- Utils.close(in);
- in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), "utf-8"));
- fromXML(in);
- }
+ validateXML(in);
+ Utils.close(in);
+ in = new BufferedReader(new InputStreamReader(new FileInputStream(pref), "utf-8"));
+ fromXML(in);
} finally {
- in.close();
+ Utils.close(in);
}
}
updateSystemProperties();
- /* FIXME: TODO: remove special version check end of 2012 */
- if(!properties.containsKey("expert")) {
- try {
- String v = get("josm.version");
- if(v.isEmpty() || Integer.parseInt(v) <= 4511)
- properties.put("expert", "true");
- } catch(Exception e) {
- properties.put("expert", "true");
- }
- }
removeObsolete();
}
@@ -681,7 +641,7 @@ public class Preferences {
File prefDir = getPreferencesDirFile();
if (prefDir.exists()) {
if(!prefDir.isDirectory()) {
- System.err.println(tr("Warning: Failed to initialize preferences. Preference directory ''{0}'' is not a directory.", prefDir.getAbsoluteFile()));
+ Main.warn(tr("Failed to initialize preferences. Preference directory ''{0}'' is not a directory.", prefDir.getAbsoluteFile()));
JOptionPane.showMessageDialog(
Main.parent,
tr("<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is not a directory.</html>", prefDir.getAbsoluteFile()),
@@ -692,7 +652,7 @@ public class Preferences {
}
} else {
if (! prefDir.mkdirs()) {
- System.err.println(tr("Warning: Failed to initialize preferences. Failed to create missing preference directory: {0}", prefDir.getAbsoluteFile()));
+ Main.warn(tr("Failed to initialize preferences. Failed to create missing preference directory: {0}", prefDir.getAbsoluteFile()));
JOptionPane.showMessageDialog(
Main.parent,
tr("<html>Failed to initialize preferences.<br>Failed to create missing preference directory: {0}</html>",prefDir.getAbsoluteFile()),
@@ -706,36 +666,11 @@ public class Preferences {
File preferenceFile = getPreferenceFile();
try {
if (!preferenceFile.exists()) {
- File oldPreferenceFile = getOldPreferenceFile();
- if (!oldPreferenceFile.exists()) {
- System.out.println(tr("Info: Missing preference file ''{0}''. Creating a default preference file.", preferenceFile.getAbsoluteFile()));
- resetToDefault();
- save();
- } else {
- try {
- loadOld();
- } catch (Exception e) {
- e.printStackTrace();
- File backupFile = new File(prefDir,"preferences.bak");
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("<html>Preferences file had errors.<br> Making backup of old one to <br>{0}<br> and creating a new default preference file.</html>", backupFile.getAbsoluteFile()),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- Main.platform.rename(oldPreferenceFile, backupFile);
- try {
- resetToDefault();
- save();
- } catch(IOException e1) {
- e1.printStackTrace();
- System.err.println(tr("Warning: Failed to initialize preferences. Failed to reset preference file to default: {0}", getPreferenceFile()));
- }
- }
- return;
- }
+ Main.info(tr("Missing preference file ''{0}''. Creating a default preference file.", preferenceFile.getAbsoluteFile()));
+ resetToDefault();
+ save();
} else if (reset) {
- System.out.println(tr("Warning: Replacing existing preference file ''{0}'' with default preference file.", preferenceFile.getAbsoluteFile()));
+ Main.warn(tr("Replacing existing preference file ''{0}'' with default preference file.", preferenceFile.getAbsoluteFile()));
resetToDefault();
save();
}
@@ -766,7 +701,7 @@ public class Preferences {
save();
} catch(IOException e1) {
e1.printStackTrace();
- System.err.println(tr("Warning: Failed to initialize preferences. Failed to reset preference file to default: {0}", getPreferenceFile()));
+ Main.warn(tr("Failed to initialize preferences. Failed to reset preference file to default: {0}", getPreferenceFile()));
}
}
}
@@ -792,20 +727,22 @@ public class Preferences {
/* only for preferences */
synchronized public String getColorName(String o) {
- try
- {
+ try {
Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
- m.matches();
- return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
+ if (m.matches()) {
+ return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
+ }
+ } catch (Exception e) {
+ Main.warn(e);
}
- catch (Exception e) {}
- try
- {
+ try {
Matcher m = Pattern.compile("layer (.+)").matcher(o);
- m.matches();
- return tr("Layer: {0}", tr(m.group(1)));
+ if (m.matches()) {
+ return tr("Layer: {0}", tr(m.group(1)));
+ }
+ } catch (Exception e) {
+ Main.warn(e);
}
- catch (Exception e) {}
return tr(colornames.containsKey(o) ? colornames.get(o) : o);
}
@@ -828,15 +765,15 @@ public class Preferences {
}
putDefault("color."+colKey, ColorHelper.color2html(def));
String colStr = specName != null ? get("color."+specName) : "";
- if(colStr.equals("")) {
+ if(colStr.isEmpty()) {
colStr = get("color."+colKey);
}
- return colStr.equals("") ? def : ColorHelper.html2color(colStr);
+ return colStr.isEmpty() ? def : ColorHelper.html2color(colStr);
}
synchronized public Color getDefaultColor(String colKey) {
String colStr = defaults.get("color."+colKey);
- return colStr == null || "".equals(colStr) ? null : ColorHelper.html2color(colStr);
+ return colStr == null || colStr.isEmpty() ? null : ColorHelper.html2color(colStr);
}
synchronized public boolean putColor(String colKey, Color val) {
@@ -901,16 +838,6 @@ public class Preferences {
return def;
}
- synchronized public double getDouble(String key, String def) {
- putDefault(key, def);
- String v = get(key);
- if(v != null && v.length() != 0) {
- try { return Double.parseDouble(v); } catch(NumberFormatException e) {}
- }
- try { return Double.parseDouble(def); } catch(NumberFormatException e) {}
- return 0.0;
- }
-
/**
* Get a list of values for a certain key
* @param key the identifier for the setting
@@ -920,7 +847,7 @@ public class Preferences {
*/
public Collection<String> getCollection(String key, Collection<String> def) {
putCollectionDefault(key, def == null ? null : new ArrayList<String>(def));
- Collection<String> prop = getCollectionInternal(key);
+ Collection<String> prop = collectionProperties.get(key);
if (prop != null)
return prop;
else
@@ -935,31 +862,13 @@ public class Preferences {
*/
public Collection<String> getCollection(String key) {
putCollectionDefault(key, null);
- Collection<String> prop = getCollectionInternal(key);
+ Collection<String> prop = collectionProperties.get(key);
if (prop != null)
return prop;
else
return Collections.emptyList();
}
- /* remove this workaround end of 2012, replace by direct access to structure */
- synchronized private List<String> getCollectionInternal(String key) {
- List<String> prop = collectionProperties.get(key);
- if (prop != null)
- return prop;
- else {
- String s = properties.get(key);
- if(s != null) {
- prop = Arrays.asList(s.split("\u001e", -1));
- collectionProperties.put(key, Collections.unmodifiableList(prop));
- properties.remove(key);
- defaults.remove(key);
- return prop;
- }
- }
- return null;
- }
-
synchronized public void removeFromCollection(String key, String value) {
List<String> a = new ArrayList<String>(getCollection(key, Collections.<String>emptyList()));
a.remove(value);
@@ -977,7 +886,7 @@ public class Preferences {
changed |= properties.remove(key) != null;
if (!changed) return false;
} else {
- oldValue = getCollectionInternal(key);
+ oldValue = collectionProperties.get(key);
if (equalCollection(value, oldValue)) return false;
Collection<String> defValue = collectionDefaults.get(key);
if (oldValue == null && equalCollection(value, defValue)) return false;
@@ -988,8 +897,8 @@ public class Preferences {
}
try {
save();
- } catch(IOException e){
- System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+ } catch (IOException e){
+ Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
}
}
// Call outside of synchronized section in case some listener wait for other thread that wait for preference lock
@@ -1043,9 +952,9 @@ public class Preferences {
} else {
putArrayDefault(key, null);
}
- List<List<String>> prop = getArrayInternal(key);
+ List<List<String>> prop = arrayProperties.get(key);
if (prop != null) {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
Collection<Collection<String>> prop_cast = (Collection) prop;
return prop_cast;
} else
@@ -1054,54 +963,24 @@ public class Preferences {
public Collection<Collection<String>> getArray(String key) {
putArrayDefault(key, null);
- List<List<String>> prop = getArrayInternal(key);
+ List<List<String>> prop = arrayProperties.get(key);
if (prop != null) {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
Collection<Collection<String>> prop_cast = (Collection) prop;
return prop_cast;
} else
return Collections.emptyList();
}
- /* remove this workaround end of 2012 and replace by direct array access */
- synchronized private List<List<String>> getArrayInternal(String key) {
- List<List<String>> prop = arrayProperties.get(key);
- if (prop != null)
- return prop;
- else {
- String keyDot = key + ".";
- int num = 0;
- List<List<String>> col = new ArrayList<List<String>>();
- while (true) {
- List<String> c = getCollectionInternal(keyDot+num);
- if (c == null) {
- break;
- }
- col.add(c);
- collectionProperties.remove(keyDot+num);
- collectionDefaults.remove(keyDot+num);
- num++;
- }
- if (num > 0) {
- arrayProperties.put(key, Collections.unmodifiableList(col));
- return col;
- }
- }
- return null;
- }
-
public boolean putArray(String key, Collection<Collection<String>> value) {
- boolean changed = false;
-
List<List<String>> oldValue = null;
List<List<String>> valueCopy = null;
synchronized (this) {
+ oldValue = arrayProperties.get(key);
if (value == null) {
- oldValue = getArrayInternal(key);
if (arrayProperties.remove(key) != null) return false;
} else {
- oldValue = getArrayInternal(key);
if (equalArray(value, oldValue)) return false;
List<List<String>> defValue = arrayDefaults.get(key);
@@ -1118,8 +997,8 @@ public class Preferences {
}
try {
save();
- } catch(IOException e){
- System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+ } catch (IOException e){
+ Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
}
}
// Call outside of synchronized section in case some listener wait for other thread that wait for preference lock
@@ -1153,54 +1032,23 @@ public class Preferences {
} else {
putListOfStructsDefault(key, null);
}
- Collection<Map<String, String>> prop = getListOfStructsInternal(key);
+ Collection<Map<String, String>> prop = listOfStructsProperties.get(key);
if (prop != null)
return prop;
else
return def;
}
- /* remove this workaround end of 2012 and use direct access to proper variable */
- private synchronized List<Map<String, String>> getListOfStructsInternal(String key) {
- List<Map<String, String>> prop = listOfStructsProperties.get(key);
- if (prop != null)
- return prop;
- else {
- List<List<String>> array = getArrayInternal(key);
- if (array == null) return null;
- prop = new ArrayList<Map<String, String>>(array.size());
- for (Collection<String> mapStr : array) {
- Map<String, String> map = new LinkedHashMap<String, String>();
- for (String key_value : mapStr) {
- final int i = key_value.indexOf(':');
- if (i == -1 || i == 0) {
- continue;
- }
- String k = key_value.substring(0,i);
- String v = key_value.substring(i+1);
- map.put(k, v);
- }
- prop.add(Collections.unmodifiableMap(map));
- }
- arrayProperties.remove(key);
- arrayDefaults.remove(key);
- listOfStructsProperties.put(key, Collections.unmodifiableList(prop));
- return prop;
- }
- }
-
public boolean putListOfStructs(String key, Collection<Map<String, String>> value) {
- boolean changed = false;
List<Map<String, String>> oldValue;
List<Map<String, String>> valueCopy = null;
synchronized (this) {
+ oldValue = listOfStructsProperties.get(key);
if (value == null) {
- oldValue = getListOfStructsInternal(key);
if (listOfStructsProperties.remove(key) != null) return false;
} else {
- oldValue = getListOfStructsInternal(key);
if (equalListOfStructs(oldValue, value)) return false;
List<Map<String, String>> defValue = listOfStructsDefaults.get(key);
@@ -1218,8 +1066,8 @@ public class Preferences {
}
try {
save();
- } catch(IOException e){
- System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
+ } catch (IOException e) {
+ Main.warn(tr("Failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
}
}
// Call outside of synchronized section in case some listener wait for other thread that wait for preference lock
@@ -1410,21 +1258,25 @@ public class Preferences {
if (value == null) return false;
class PutVisitor implements SettingVisitor {
public boolean changed;
+ @Override
public void visit(StringSetting setting) {
changed = put(key, setting.getValue());
}
+ @Override
public void visit(ListSetting setting) {
changed = putCollection(key, setting.getValue());
}
+ @Override
public void visit(ListListSetting setting) {
@SuppressWarnings("unchecked")
boolean changed = putArray(key, (Collection) setting.getValue());
this.changed = changed;
}
+ @Override
public void visit(MapListSetting setting) {
changed = putListOfStructs(key, setting.getValue());
}
- };
+ }
PutVisitor putVisitor = new PutVisitor();
value.visit(putVisitor);
return putVisitor.changed;
@@ -1471,8 +1323,12 @@ public class Preferences {
*
*/
public void updateSystemProperties() {
+ if(getBoolean("prefer.ipv6", false)) {
+ // never set this to false, only true!
+ updateSystemProperty("java.net.preferIPv6Addresses", "true");
+ }
updateSystemProperty("http.agent", Version.getInstance().getAgentString());
- updateSystemProperty("user.language", Main.pref.get("language"));
+ updateSystemProperty("user.language", get("language"));
// Workaround to fix a Java bug.
// Force AWT toolkit to update its internal preferences (fix #3645).
// This ugly hack comes from Sun bug database: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6292739
@@ -1483,8 +1339,15 @@ public class Preferences {
} catch (Exception e) {
// Ignore all exceptions
}
+ // Workaround to fix another Java bug
+ // Force Java 7 to use old sorting algorithm of Arrays.sort (fix #8712).
+ // See Oracle bug database: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7075600
+ // and http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6923200
+ if (Main.pref.getBoolean("jdk.Arrays.useLegacyMergeSort", !Version.getInstance().isLocalBuild())) {
+ updateSystemProperty("java.util.Arrays.useLegacyMergeSort", "true");
+ }
}
-
+
private void updateSystemProperty(String key, String value) {
if (value != null) {
System.setProperty(key, value);
@@ -1495,12 +1358,10 @@ public class Preferences {
* The default plugin site
*/
private final static String[] DEFAULT_PLUGIN_SITE = {
- "http://josm.openstreetmap.de/plugin%<?plugins=>"};
+ Main.JOSM_WEBSITE+"/plugin%<?plugins=>"};
/**
* Replies the collection of plugin site URLs from where plugin lists can be downloaded
- *
- * @return
*/
public Collection<String> getPluginSites() {
return getCollection("pluginmanager.sites", Arrays.asList(DEFAULT_PLUGIN_SITE));
@@ -1518,7 +1379,7 @@ public class Preferences {
protected XMLStreamReader parser;
public void validateXML(Reader in) throws Exception {
- SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
Schema schema = factory.newSchema(new StreamSource(new MirroredInputStream("resource://data/preferences.xsd")));
Validator validator = schema.newValidator();
validator.validate(new StreamSource(in));
@@ -1684,6 +1545,7 @@ public class Preferences {
this.key = key;
}
+ @Override
public void visit(StringSetting setting) {
if (noPassword && key.equals("osm-server.password"))
return; // do not store plain password.
@@ -1691,31 +1553,15 @@ public class Preferences {
String s = defaults.get(key);
/* don't save default values */
if(s == null || !s.equals(r)) {
- /* TODO: remove old format exception end of 2012 */
- if(r.contains("\u001e"))
- {
- b.append(" <list key='");
- b.append(XmlWriter.encode(key));
- b.append("'>\n");
- for (String val : r.split("\u001e", -1))
- {
- b.append(" <entry value='");
- b.append(XmlWriter.encode(val));
- b.append("'/>\n");
- }
- b.append(" </list>\n");
- }
- else
- {
- b.append(" <tag key='");
- b.append(XmlWriter.encode(key));
- b.append("' value='");
- b.append(XmlWriter.encode(setting.getValue()));
- b.append("'/>\n");
- }
+ b.append(" <tag key='");
+ b.append(XmlWriter.encode(key));
+ b.append("' value='");
+ b.append(XmlWriter.encode(setting.getValue()));
+ b.append("'/>\n");
}
}
+ @Override
public void visit(ListSetting setting) {
b.append(" <list key='").append(XmlWriter.encode(key)).append("'>\n");
for (String s : setting.getValue()) {
@@ -1724,6 +1570,7 @@ public class Preferences {
b.append(" </list>\n");
}
+ @Override
public void visit(ListListSetting setting) {
b.append(" <lists key='").append(XmlWriter.encode(key)).append("'>\n");
for (List<String> list : setting.getValue()) {
@@ -1736,6 +1583,7 @@ public class Preferences {
b.append(" </lists>\n");
}
+ @Override
public void visit(MapListSetting setting) {
b.append(" <maps key='").append(XmlWriter.encode(key)).append("'>\n");
for (Map<String, String> struct : setting.getValue()) {
@@ -1752,10 +1600,10 @@ public class Preferences {
public String toXML(boolean nopass) {
StringBuilder b = new StringBuilder(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<preferences xmlns=\"http://josm.openstreetmap.de/preferences-1.0\" version=\""+
+ "<preferences xmlns=\""+Main.JOSM_WEBSITE+"/preferences-1.0\" version=\""+
Version.getInstance().getVersion() + "\">\n");
SettingToXml toXml = new SettingToXml(b, nopass);
- Map<String, Setting> settings = new TreeMap<String, Setting>();
+ Map<String, Setting<?>> settings = new TreeMap<String, Setting<?>>();
for (Entry<String, String> e : properties.entrySet()) {
settings.put(e.getKey(), new StringSetting(e.getValue()));
@@ -1769,7 +1617,7 @@ public class Preferences {
for (Entry<String, List<Map<String, String>>> e : listOfStructsProperties.entrySet()) {
settings.put(e.getKey(), new MapListSetting(e.getValue()));
}
- for (Entry<String, Setting> e : settings.entrySet()) {
+ for (Entry<String, Setting<?>> e : settings.entrySet()) {
toXml.setKey(e.getKey());
e.getValue().visit(toXml);
}
@@ -1783,42 +1631,54 @@ public class Preferences {
* see something with an expiry date in the past, remove it from the list.
*/
public void removeObsolete() {
+ /* update the data with old consumer key*/
+ if(getInteger("josm.version", Version.getInstance().getVersion()) < 6076) {
+ if(!get("oauth.access-token.key").isEmpty() && get("oauth.settings.consumer-key").isEmpty()) {
+ put("oauth.settings.consumer-key", "AdCRxTpvnbmfV8aPqrTLyA");
+ put("oauth.settings.consumer-secret", "XmYOiGY9hApytcBC3xCec3e28QBqOWz5g6DSb5UpE");
+ }
+ }
+
String[] obsolete = {
- "gui.combobox.maximum-row-count", // 08/2012 - briefly introduced with #7917, can be removed end 2012
- "color.Imagery fade", // 08/2012 - wrong property caused by #6723, can be removed mid-2013
+ "downloadAlong.downloadAlongTrack.distance", // 07/2013 - can be removed mid-2014. Replaced by downloadAlongWay.distance
+ "downloadAlong.downloadAlongTrack.area", // 07/2013 - can be removed mid-2014. Replaced by downloadAlongWay.area
+ "gpxLayer.downloadAlongTrack.distance", // 07/2013 - can be removed mid-2014. Replaced by downloadAlongTrack.distance
+ "gpxLayer.downloadAlongTrack.area", // 07/2013 - can be removed mid-2014. Replaced by downloadAlongTrack.area
+ "gpxLayer.downloadAlongTrack.near", // 07/2013 - can be removed mid-2014. Replaced by downloadAlongTrack.near
};
for (String key : obsolete) {
boolean removed = false;
- if(properties.containsKey(key)) { properties.remove(key); removed = true; }
- if(collectionProperties.containsKey(key)) { collectionProperties.remove(key); removed = true; }
- if(arrayProperties.containsKey(key)) { arrayProperties.remove(key); removed = true; }
- if(listOfStructsProperties.containsKey(key)) { listOfStructsProperties.remove(key); removed = true; }
- if(removed)
- System.out.println(tr("Preference setting {0} has been removed since it is no longer used.", key));
+ if (properties.containsKey(key)) { properties.remove(key); removed = true; }
+ if (collectionProperties.containsKey(key)) { collectionProperties.remove(key); removed = true; }
+ if (arrayProperties.containsKey(key)) { arrayProperties.remove(key); removed = true; }
+ if (listOfStructsProperties.containsKey(key)) { listOfStructsProperties.remove(key); removed = true; }
+ if (removed) {
+ Main.info(tr("Preference setting {0} has been removed since it is no longer used.", key));
+ }
}
}
- public static boolean isEqual(Setting a, Setting b) {
+ public static boolean isEqual(Setting<?> a, Setting<?> b) {
if (a==null && b==null) return true;
if (a==null) return false;
if (b==null) return false;
if (a==b) return true;
-
- if (a instanceof StringSetting)
+
+ if (a instanceof StringSetting)
return (a.getValue().equals(b.getValue()));
if (a instanceof ListSetting) {
- @SuppressWarnings("unchecked") Collection<String> aValue = (Collection) a.getValue();
- @SuppressWarnings("unchecked") Collection<String> bValue = (Collection) b.getValue();
+ @SuppressWarnings("unchecked") Collection<String> aValue = (Collection<String>) a.getValue();
+ @SuppressWarnings("unchecked") Collection<String> bValue = (Collection<String>) b.getValue();
return equalCollection(aValue, bValue);
}
if (a instanceof ListListSetting) {
- @SuppressWarnings("unchecked") Collection<Collection<String>> aValue = (Collection) a.getValue();
- @SuppressWarnings("unchecked") Collection<List<String>> bValue = (Collection) b.getValue();
+ @SuppressWarnings("unchecked") Collection<Collection<String>> aValue = (Collection<Collection<String>>) a.getValue();
+ @SuppressWarnings("unchecked") Collection<List<String>> bValue = (Collection<List<String>>) b.getValue();
return equalArray(aValue, bValue);
}
if (a instanceof MapListSetting) {
- @SuppressWarnings("unchecked") Collection<Map<String, String>> aValue = (Collection) a.getValue();
- @SuppressWarnings("unchecked") Collection<Map<String, String>> bValue = (Collection) b.getValue();
+ @SuppressWarnings("unchecked") Collection<Map<String, String>> aValue = (Collection<Map<String, String>>) a.getValue();
+ @SuppressWarnings("unchecked") Collection<Map<String, String>> bValue = (Collection<Map<String, String>>) b.getValue();
return equalListOfStructs(aValue, bValue);
}
return a.equals(b);
diff --git a/src/org/openstreetmap/josm/data/ProjectionBounds.java b/src/org/openstreetmap/josm/data/ProjectionBounds.java
index 1b91616..83473bb 100644
--- a/src/org/openstreetmap/josm/data/ProjectionBounds.java
+++ b/src/org/openstreetmap/josm/data/ProjectionBounds.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
import org.openstreetmap.josm.data.coor.EastNorth;
diff --git a/src/org/openstreetmap/josm/data/SelectionChangedListener.java b/src/org/openstreetmap/josm/data/SelectionChangedListener.java
index 7ceafcb..74ff89e 100644
--- a/src/org/openstreetmap/josm/data/SelectionChangedListener.java
+++ b/src/org/openstreetmap/josm/data/SelectionChangedListener.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
import java.util.Collection;
diff --git a/src/org/openstreetmap/josm/data/ServerSidePreferences.java b/src/org/openstreetmap/josm/data/ServerSidePreferences.java
index ee505ab..0235ab3 100644
--- a/src/org/openstreetmap/josm/data/ServerSidePreferences.java
+++ b/src/org/openstreetmap/josm/data/ServerSidePreferences.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -21,6 +21,7 @@ import javax.xml.stream.XMLStreamException;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.OsmConnection;
import org.openstreetmap.josm.tools.Base64;
+import org.openstreetmap.josm.tools.Utils;
/**
* This class tweak the Preferences class to provide server side preference settings, as example
@@ -45,7 +46,7 @@ public class ServerSidePreferences extends Preferences {
}
public String download() throws MissingPassword {
try {
- System.out.println("reading preferences from "+serverUrl);
+ Main.info("reading preferences from "+serverUrl);
URLConnection con = serverUrl.openConnection();
String username = get("applet.username");
String password = get("applet.password");
@@ -62,15 +63,20 @@ public class ServerSidePreferences extends Preferences {
}
BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
StringBuilder b = new StringBuilder();
- for (String line = reader.readLine(); line != null; line = reader.readLine()) {
- b.append(line);
- b.append("\n");
+ try {
+ for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+ b.append(line);
+ b.append("\n");
+ }
+ } finally {
+ reader.close();
}
if (con instanceof HttpURLConnection) {
((HttpURLConnection) con).disconnect();
}
return b.toString();
} catch (IOException e) {
+ Main.error(e);
e.printStackTrace();
}
return null;
@@ -78,7 +84,7 @@ public class ServerSidePreferences extends Preferences {
public void upload(String s) {
try {
URL u = new URL(getPreferencesDir());
- System.out.println("uploading preferences to "+u);
+ Main.info("uploading preferences to "+u);
HttpURLConnection con = (HttpURLConnection)u.openConnection();
String username = get("applet.username");
String password = get("applet.password");
@@ -90,8 +96,8 @@ public class ServerSidePreferences extends Preferences {
con.connect();
PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutputStream()));
out.println(s);
- out.close();
- con.getInputStream().close();
+ Utils.close(out);
+ Utils.close(con.getInputStream());
con.disconnect();
JOptionPane.showMessageDialog(
Main.parent,
@@ -153,6 +159,7 @@ public class ServerSidePreferences extends Preferences {
try {
download();
} catch (MissingPassword e) {
+ Main.warn(e);
}
}
diff --git a/src/org/openstreetmap/josm/data/UndoRedoHandler.java b/src/org/openstreetmap/josm/data/UndoRedoHandler.java
index b948b40..465f22a 100644
--- a/src/org/openstreetmap/josm/data/UndoRedoHandler.java
+++ b/src/org/openstreetmap/josm/data/UndoRedoHandler.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data;
import java.util.Collection;
@@ -11,6 +11,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
public class UndoRedoHandler implements MapView.LayerChangeListener {
@@ -25,14 +26,19 @@ public class UndoRedoHandler implements MapView.LayerChangeListener {
private final LinkedList<CommandQueueListener> listenerCommands = new LinkedList<CommandQueueListener>();
+ /**
+ * Constructs a new {@code UndoRedoHandler}.
+ */
public UndoRedoHandler() {
MapView.addLayerChangeListener(this);
}
/**
- * Execute the command and add it to the intern command queue.
+ * Executes the command and add it to the intern command queue.
+ * @param c The command to execute. Must not be {@code null}.
*/
public void addNoRedraw(final Command c) {
+ CheckParameterUtil.ensureParameterNotNull(c, "c");
c.executeCommand();
commands.add(c);
// Limit the number of commands in the undo list.
@@ -52,7 +58,8 @@ public class UndoRedoHandler implements MapView.LayerChangeListener {
}
/**
- * Execute the command and add it to the intern command queue.
+ * Executes the command and add it to the intern command queue.
+ * @param c The command to execute. Must not be {@code null}.
*/
synchronized public void add(final Command c) {
addNoRedraw(c);
@@ -68,6 +75,7 @@ public class UndoRedoHandler implements MapView.LayerChangeListener {
/**
* Undoes multiple commands.
+ * @param num The number of commands to undo
*/
synchronized public void undo(int num) {
if (commands.isEmpty())
@@ -103,6 +111,7 @@ public class UndoRedoHandler implements MapView.LayerChangeListener {
/**
* Redoes multiple commands.
+ * @param num The number of commands to redo
*/
public void redo(int num) {
if (redoCommands.isEmpty())
@@ -156,17 +165,29 @@ public class UndoRedoHandler implements MapView.LayerChangeListener {
}
}
+ @Override
public void layerRemoved(Layer oldLayer) {
clean(oldLayer);
}
+ @Override
public void layerAdded(Layer newLayer) {}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
+ /**
+ * Removes a command queue listener.
+ * @param l The command queue listener to remove
+ */
public void removeCommandQueueListener(CommandQueueListener l) {
listenerCommands.remove(l);
}
+ /**
+ * Adds a command queue listener.
+ * @param l The commands queue listener to add
+ * @return {@code true} if the listener has been added, {@code false} otherwise
+ */
public boolean addCommandQueueListener(CommandQueueListener l) {
return listenerCommands.add(l);
}
diff --git a/src/org/openstreetmap/josm/data/Version.java b/src/org/openstreetmap/josm/data/Version.java
index 83a2db8..03ab753 100644
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -5,15 +5,16 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap;
+import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.Utils;
/**
* Provides basic information about the currently used JOSM build.
@@ -34,17 +35,20 @@ public class Version {
*/
static public String loadResourceFile(URL resource) {
if (resource == null) return null;
- BufferedReader in;
String s = null;
try {
- in = new BufferedReader(new InputStreamReader(resource.openStream(), "UTF-8"));
+ BufferedReader in = Utils.openURLReader(resource);
StringBuffer sb = new StringBuffer();
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- sb.append(line).append("\n");
+ try {
+ for (String line = in.readLine(); line != null; line = in.readLine()) {
+ sb.append(line).append("\n");
+ }
+ } finally {
+ Utils.close(in);
}
s = sb.toString();
} catch (IOException e) {
- System.err.println(tr("Failed to load resource ''{0}'', error is {1}.", resource.toString(), e.toString()));
+ Main.error(tr("Failed to load resource ''{0}'', error is {1}.", resource.toString(), e.toString()));
e.printStackTrace();
}
return s;
@@ -70,12 +74,12 @@ public class Version {
private String buildName;
private boolean isLocalBuild;
- protected HashMap<String, String> parseManifestStyleFormattedString(String content) {
- HashMap<String, String> properties = new HashMap<String, String>();
+ protected Map<String, String> parseManifestStyleFormattedString(String content) {
+ Map<String, String> properties = new HashMap<String, String>();
if (content == null) return properties;
Pattern p = Pattern.compile("^([^:]+):(.*)$");
for (String line: content.split("\n")) {
- if (line == null || line.trim().equals("")) {
+ if (line == null || line.trim().isEmpty()) {
continue;
}
if (line.matches("^\\s*#.*$")) {
@@ -102,7 +106,7 @@ public class Version {
return;
}
- HashMap<String, String> properties = parseManifestStyleFormattedString(revisionInfo);
+ Map<String, String> properties = parseManifestStyleFormattedString(revisionInfo);
String value = properties.get("Revision");
if (value != null) {
value = value.trim();
@@ -110,7 +114,7 @@ public class Version {
version = Integer.parseInt(value);
} catch(NumberFormatException e) {
version = 0;
- System.err.println(tr("Warning: unexpected JOSM version number in revision file, value is ''{0}''", value));
+ Main.warn(tr("Unexpected JOSM version number in revision file, value is ''{0}''", value));
}
} else {
version = JOSM_UNKNOWN_VERSION;
@@ -127,7 +131,7 @@ public class Version {
//
isLocalBuild = false;
value = properties.get("Is-Local-Build");
- if (value != null && value.trim().toLowerCase().equals("true")) {
+ if (value != null && value.trim().equalsIgnoreCase("true")) {
isLocalBuild = true;
}
@@ -148,10 +152,13 @@ public class Version {
releaseDescription = sb.toString();
}
+ /**
+ * Initializes version info
+ */
public void init() {
URL u = Main.class.getResource("/REVISION");
if (u == null) {
- System.err.println(tr("Warning: the revision file ''/REVISION'' is missing."));
+ Main.warn(tr("The revision file ''/REVISION'' is missing."));
version = 0;
releaseDescription = "";
return;
@@ -204,7 +211,21 @@ public class Version {
return isLocalBuild;
}
+ /**
+ * Returns the User-Agent string
+ * @return The User-Agent
+ */
public String getAgentString() {
+ return getAgentString(true);
+ }
+
+ /**
+ * Returns the User-Agent string, with or without OS details
+ * @param includeOsDetails Append Operating System details at the end of the User-Agent
+ * @return The User-Agent
+ * @since 5956
+ */
+ public String getAgentString(boolean includeOsDetails) {
int v = getVersion();
String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);
if (buildName != null) {
@@ -213,6 +234,19 @@ public class Version {
if (isLocalBuild() && v != JOSM_UNKNOWN_VERSION) {
s += " SVN";
}
- return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
+ String result = "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
+ if (includeOsDetails && Main.platform != null) {
+ result += " " + Main.platform.getOSDescription();
+ }
+ return result;
+ }
+
+ /**
+ * Returns the full User-Agent string
+ * @return The User-Agent
+ * @since 5868
+ */
+ public String getFullAgentString() {
+ return getAgentString() + " Java/"+System.getProperty("java.version");
}
}
diff --git a/src/org/openstreetmap/josm/data/conflict/Conflict.java b/src/org/openstreetmap/josm/data/conflict/Conflict.java
index 4b67001..a8518aa 100644
--- a/src/org/openstreetmap/josm/data/conflict/Conflict.java
+++ b/src/org/openstreetmap/josm/data/conflict/Conflict.java
@@ -23,7 +23,7 @@ public class Conflict<T extends OsmPrimitive> {
private final T my;
private final T their;
private final boolean isMyDeleted;
-
+
// mergedMap is only set if the conflict results from merging two layers
private Map<PrimitiveId, PrimitiveId> mergedMap;
@@ -123,4 +123,9 @@ public class Conflict<T extends OsmPrimitive> {
public final void setMergedMap(Map<PrimitiveId, PrimitiveId> mergedMap) {
this.mergedMap = mergedMap;
}
+
+ @Override
+ public String toString() {
+ return "Conflict [my=" + my + ", their=" + their + "]";
+ }
}
diff --git a/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java b/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
index 4c7d5c7..da89741 100644
--- a/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
+++ b/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
@@ -36,17 +36,28 @@ public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimit
private final List<Conflict<? extends OsmPrimitive>> conflicts;
private CopyOnWriteArrayList<IConflictListener> listeners;
+ /**
+ * Constructs a new {@code ConflictCollection}.
+ */
public ConflictCollection() {
- conflicts = new ArrayList<Conflict<?>>();
+ conflicts = new ArrayList<Conflict<? extends OsmPrimitive>>();
listeners = new CopyOnWriteArrayList<IConflictListener>();
}
+ /**
+ * Adds the specified conflict listener, if not already present.
+ * @param listener The conflict listener to add
+ */
public void addConflictListener(IConflictListener listener) {
if (listener != null) {
listeners.addIfAbsent(listener);
}
}
+ /**
+ * Removes the specified conflict listener.
+ * @param listener The conflict listener to remove
+ */
public void removeConflictListener(IConflictListener listener) {
listeners.remove(listener);
}
@@ -58,9 +69,8 @@ public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimit
}
protected void fireConflictRemoved() {
- Iterator<IConflictListener> it = listeners.iterator();
- while(it.hasNext()) {
- it.next().onConflictsRemoved(this);
+ for (IConflictListener listener : listeners) {
+ listener.onConflictsRemoved(this);
}
}
@@ -162,7 +172,7 @@ public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimit
* Replies the conflict for the {@link OsmPrimitive} <code>their</code>, null
* if no such conflict exists.
*
- * @param my my primitive
+ * @param their their primitive
* @return the conflict for the {@link OsmPrimitive} <code>their</code>, null
* if no such conflict exists.
*/
@@ -265,6 +275,7 @@ public class ConflictCollection implements Iterable<Conflict<? extends OsmPrimit
*
* @return the iterator
*/
+ @Override
public Iterator<Conflict<?>> iterator() {
return conflicts.iterator();
}
diff --git a/src/org/openstreetmap/josm/data/coor/CachedLatLon.java b/src/org/openstreetmap/josm/data/coor/CachedLatLon.java
index be676c1..efe07c7 100644
--- a/src/org/openstreetmap/josm/data/coor/CachedLatLon.java
+++ b/src/org/openstreetmap/josm/data/coor/CachedLatLon.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.coor;
import org.openstreetmap.josm.Main;
@@ -6,11 +6,11 @@ import org.openstreetmap.josm.data.projection.Projection;
/**
* LatLon class that maintains a cache of projected EastNorth coordinates.
- *
+ *
* This class is convenient to use, but has relatively high memory costs.
- * It keeps a pointer to the last known projection in order to detect projection
+ * It keeps a pointer to the last known projection in order to detect projection
* changes.
- *
+ *
* Node and WayPoint have another, optimized, cache for projected coordinates.
*/
public class CachedLatLon extends LatLon {
@@ -32,21 +32,9 @@ public class CachedLatLon extends LatLon {
this.eastNorth = eastNorth;
}
- public final void setCoor(LatLon coor) {
- setLocation(coor.lon(), coor.lat());
- proj = null;
- }
-
- public final void setEastNorth(EastNorth eastNorth) {
- proj = Main.getProjection();
- this.eastNorth = eastNorth;
- LatLon l = proj.eastNorth2latlon(eastNorth);
- setLocation(l.lon(), l.lat());
- }
-
/**
* Replies the projected east/north coordinates.
- *
+ *
* @return the internally cached east/north coordinates. null, if the globally defined projection is null
*/
public final EastNorth getEastNorth() {
diff --git a/src/org/openstreetmap/josm/data/coor/Coordinate.java b/src/org/openstreetmap/josm/data/coor/Coordinate.java
index 5f9b4b3..9685356 100644
--- a/src/org/openstreetmap/josm/data/coor/Coordinate.java
+++ b/src/org/openstreetmap/josm/data/coor/Coordinate.java
@@ -1,9 +1,10 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.coor;
-import java.awt.geom.Point2D;
import java.io.Serializable;
+import org.openstreetmap.josm.data.osm.BBox;
+
/**
* Base class of points of both coordinate systems.
*
@@ -14,12 +15,12 @@ import java.io.Serializable;
* outside of the data package. Routines there should only use LatLon or
* EastNorth.
*
- * @author imi
+ * @since 6162
*/
-abstract class Coordinate extends Point2D implements Serializable {
+abstract class Coordinate implements Serializable {
- protected double x;
- protected double y;
+ protected final double x;
+ protected final double y;
/**
* Construct the point with latitude / longitude values.
@@ -39,15 +40,82 @@ abstract class Coordinate extends Point2D implements Serializable {
return y;
}
- public void setLocation (double x, double y) {
- this.x = x;
- this.y = y;
+ /**
+ * Returns the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}.
+ *
+ * @param coor the specified coordinate to be measured against this {@code Coordinate}
+ * @return the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}
+ * @since 6166
+ */
+ protected final double distance(final Coordinate coor) {
+ return distance(coor.x, coor.y);
+ }
+
+ /**
+ * Returns the euclidean distance from this {@code Coordinate} to a specified coordinate.
+ *
+ * @param px the X coordinate of the specified point to be measured against this {@code Coordinate}
+ * @param py the Y coordinate of the specified point to be measured against this {@code Coordinate}
+ * @return the euclidean distance from this {@code Coordinate} to a specified coordinate
+ * @since 6166
+ */
+ public final double distance(final double px, final double py) {
+ final double dx = this.x-px;
+ final double dy = this.y-py;
+ return Math.sqrt(dx*dx + dy*dy);
+ }
+
+ /**
+ * Returns the square of the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}.
+ *
+ * @param coor the specified coordinate to be measured against this {@code Coordinate}
+ * @return the square of the euclidean distance from this {@code Coordinate} to a specified {@code Coordinate}
+ * @since 6166
+ */
+ protected final double distanceSq(final Coordinate coor) {
+ return distanceSq(coor.x, coor.y);
+ }
+
+ /**
+ * Returns the square of euclidean distance from this {@code Coordinate} to a specified coordinate.
+ *
+ * @param px the X coordinate of the specified point to be measured against this {@code Coordinate}
+ * @param py the Y coordinate of the specified point to be measured against this {@code Coordinate}
+ * @return the square of the euclidean distance from this {@code Coordinate} to a specified coordinate
+ * @since 6166
+ */
+ public final double distanceSq(final double px, final double py) {
+ final double dx = this.x-px;
+ final double dy = this.y-py;
+ return dx*dx + dy*dy;
+ }
+
+ /**
+ * Converts to single point BBox.
+ *
+ * @return single point BBox defined by this coordinate.
+ * @since 6203
+ */
+ public BBox toBBox() {
+ return new BBox(x, y);
+ }
+
+ /**
+ * Creates bbox around this coordinate. Coordinate defines
+ * center of bbox, its edge will be 2*r.
+ *
+ * @param r size
+ * @return BBox around this coordinate
+ * @since 6203
+ */
+ public BBox toBBox(final double r) {
+ return new BBox(x - r, y - r, x + r, y + r);
}
@Override
public int hashCode() {
final int prime = 31;
- int result = super.hashCode();
+ int result = 1;
long temp;
temp = java.lang.Double.doubleToLongBits(x);
result = prime * result + (int) (temp ^ (temp >>> 32));
@@ -60,9 +128,7 @@ abstract class Coordinate extends Point2D implements Serializable {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
+ if (obj == null || getClass() != obj.getClass())
return false;
Coordinate other = (Coordinate) obj;
if (java.lang.Double.doubleToLongBits(x) != java.lang.Double.doubleToLongBits(other.x))
diff --git a/src/org/openstreetmap/josm/data/coor/EastNorth.java b/src/org/openstreetmap/josm/data/coor/EastNorth.java
index 3112afd..5a67512 100644
--- a/src/org/openstreetmap/josm/data/coor/EastNorth.java
+++ b/src/org/openstreetmap/josm/data/coor/EastNorth.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.coor;
/**
@@ -36,15 +36,42 @@ public class EastNorth extends Coordinate {
public EastNorth interpolate(EastNorth en2, double proportion) {
return new EastNorth(this.x + proportion * (en2.x - this.x),
- this.y + proportion * (en2.y - this.y));
+ this.y + proportion * (en2.y - this.y));
}
public EastNorth getCenter(EastNorth en2) {
return new EastNorth((this.x + en2.x)/2.0, (this.y + en2.y)/2.0);
}
- public double distance(EastNorth en2) {
- return Math.sqrt((this.x-en2.x)*(this.x-en2.x) + (this.y-en2.y)*(this.y-en2.y));
+ /**
+ * Returns the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}.
+ *
+ * @param en the specified coordinate to be measured against this {@code EastNorth}
+ * @return the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}
+ * @since 6166
+ */
+ public double distance(final EastNorth en) {
+ return super.distance(en);
+ }
+
+ /**
+ * Returns the square of the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}.
+ *
+ * @param en the specified coordinate to be measured against this {@code EastNorth}
+ * @return the square of the euclidean distance from this {@code EastNorth} to a specified {@code EastNorth}
+ * @since 6166
+ */
+ public double distanceSq(final EastNorth en) {
+ return super.distanceSq(en);
+ }
+
+ /**
+ * Counts length (distance from [0,0]) of this.
+ *
+ * @return length of this
+ */
+ public double length(){
+ return Math.sqrt(x*x + y*y);
}
/**
@@ -56,13 +83,15 @@ public class EastNorth extends Coordinate {
*/
public double heading(EastNorth other) {
double hd = Math.atan2(other.east() - east(), other.north() - north());
- if(hd < 0) hd = 2 * Math.PI + hd;
+ if(hd < 0) {
+ hd = 2 * Math.PI + hd;
+ }
return hd;
}
-
+
/**
* Replies true if east and north are different from Double.NaN
- *
+ *
* @return true if east and north are different from Double.NaN
*/
public boolean isValid() {
diff --git a/src/org/openstreetmap/josm/data/coor/LatLon.java b/src/org/openstreetmap/josm/data/coor/LatLon.java
index cd419db..41f552f 100644
--- a/src/org/openstreetmap/josm/data/coor/LatLon.java
+++ b/src/org/openstreetmap/josm/data/coor/LatLon.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.coor;
import static java.lang.Math.PI;
@@ -10,6 +10,7 @@ import static java.lang.Math.sqrt;
import static java.lang.Math.toRadians;
import static org.openstreetmap.josm.tools.I18n.trc;
+import java.awt.geom.Area;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.Locale;
@@ -19,14 +20,21 @@ import org.openstreetmap.josm.data.Bounds;
/**
* LatLon are unprojected latitude / longitude coordinates.
- *
+ * <br>
+ * <b>Latitude</b> specifies the north-south position in degrees
+ * where valid values are in the [-90,90] and positive values specify positions north of the equator.
+ * <br>
+ * <b>Longitude</b> specifies the east-west position in degrees
+ * where valid values are in the [-180,180] and positive values specify positions east of the prime meridian.
+ * <br>
+ * <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/62/Latitude_and_Longitude_of_the_Earth.svg/500px-Latitude_and_Longitude_of_the_Earth.svg.png">
+ * <br>
* This class is immutable.
*
* @author Imi
*/
public class LatLon extends Coordinate {
-
/**
* Minimum difference in location to not be represented as the same position.
* The API returns 7 decimals.
@@ -35,6 +43,12 @@ public class LatLon extends Coordinate {
public static final double MAX_SERVER_INV_PRECISION = 1e7;
public static final int MAX_SERVER_DIGITS = 7;
+ /**
+ * The (0,0) coordinates.
+ * @since 6178
+ */
+ public static final LatLon ZERO = new LatLon(0, 0);
+
private static DecimalFormat cDmsMinuteFormatter = new DecimalFormat("00");
private static DecimalFormat cDmsSecondFormatter = new DecimalFormat("00.0");
private static DecimalFormat cDmMinuteFormatter = new DecimalFormat("00.000");
@@ -45,7 +59,7 @@ public class LatLon extends Coordinate {
cDdFormatter = (DecimalFormat) NumberFormat.getInstance(Locale.UK);
cDdFormatter.applyPattern("###0.0######");
}
-
+
private static final String cDms60 = cDmsSecondFormatter.format(60.0);
private static final String cDms00 = cDmsSecondFormatter.format( 0.0);
private static final String cDm60 = cDmMinuteFormatter.format(60.0);
@@ -91,7 +105,7 @@ public class LatLon extends Coordinate {
/**
* Returns a valid OSM longitude [-180,+180] for the given extended longitude value.
* For example, a value of -181 will return +179, a value of +181 will return -179.
- * @param lon A longitude value not restricted to the [-180,+180] range.
+ * @param value A longitude value not restricted to the [-180,+180] range.
*/
public static double toIntervalLon(double value) {
if (isValidLon(value))
@@ -114,11 +128,11 @@ public class LatLon extends Coordinate {
double tTmpMinutes = (tAbsCoord - tDegree) * 60;
int tMinutes = (int) tTmpMinutes;
double tSeconds = (tTmpMinutes - tMinutes) * 60;
-
+
String sDegrees = Integer.toString(tDegree);
String sMinutes = cDmsMinuteFormatter.format(tMinutes);
String sSeconds = cDmsSecondFormatter.format(tSeconds);
-
+
if (sSeconds.equals(cDms60)) {
sSeconds = cDms00;
sMinutes = cDmsMinuteFormatter.format(tMinutes+1);
@@ -141,26 +155,35 @@ public class LatLon extends Coordinate {
double tAbsCoord = Math.abs(pCoordinate);
int tDegree = (int) tAbsCoord;
double tMinutes = (tAbsCoord - tDegree) * 60;
-
+
String sDegrees = Integer.toString(tDegree);
String sMinutes = cDmMinuteFormatter.format(tMinutes);
-
+
if (sMinutes.equals(cDm60)) {
sMinutes = cDm00;
sDegrees = Integer.toString(tDegree+1);
}
-
+
return sDegrees + "\u00B0" + sMinutes + "\'";
}
+ /**
+ * Constructs a new {@link LatLon}
+ * @param lat the latitude, i.e., the north-south position in degrees
+ * @param lon the longitude, i.e., the east-west position in degrees
+ */
public LatLon(double lat, double lon) {
super(lon, lat);
}
- public LatLon(LatLon coor) {
+ protected LatLon(LatLon coor) {
super(coor.lon(), coor.lat());
}
+ /**
+ * Returns the latitude, i.e., the north-south position in degrees.
+ * @return the latitude
+ */
public double lat() {
return y;
}
@@ -177,6 +200,10 @@ public class LatLon extends Coordinate {
}
}
+ /**
+ * Returns the longitude, i.e., the east-west position in degrees.
+ * @return the longitude
+ */
public double lon() {
return x;
}
@@ -209,8 +236,8 @@ public class LatLon extends Coordinate {
*/
public boolean isOutSideWorld() {
Bounds b = Main.getProjection().getWorldBoundsLatLon();
- return lat() < b.getMin().lat() || lat() > b.getMax().lat() ||
- lon() < b.getMin().lon() || lon() > b.getMax().lon();
+ return lat() < b.getMinLat() || lat() > b.getMaxLat() ||
+ lon() < b.getMinLon() || lon() > b.getMaxLon();
}
/**
@@ -221,6 +248,16 @@ public class LatLon extends Coordinate {
}
/**
+ * Check if this is contained in given area or area is null.
+ *
+ * @param a Area
+ * @return <code>true</code> if this is contained in given area or area is null.
+ */
+ public boolean isIn(Area a) {
+ return a == null || a.contains(x, y);
+ }
+
+ /**
* Computes the distance between this lat/lon and another point on the earth.
* Uses Haversine formular.
* @param other the other point.
@@ -237,7 +274,7 @@ public class LatLon extends Coordinate {
// rounding errors could make the argument of asin greater than 1
// (This should almost never happen.)
if (java.lang.Double.isNaN(d)) {
- System.err.println("Error: NaN in greatCircleDistance");
+ Main.error("NaN in greatCircleDistance");
d = PI * R;
}
return d;
@@ -285,6 +322,28 @@ public class LatLon extends Coordinate {
return new LatLon((this.lat() + ll2.lat())/2.0, (this.lon() + ll2.lon())/2.0);
}
+ /**
+ * Returns the euclidean distance from this {@code LatLon} to a specified {@code LatLon}.
+ *
+ * @param ll the specified coordinate to be measured against this {@code LatLon}
+ * @return the euclidean distance from this {@code LatLon} to a specified {@code LatLon}
+ * @since 6166
+ */
+ public double distance(final LatLon ll) {
+ return super.distance(ll);
+ }
+
+ /**
+ * Returns the square of the euclidean distance from this {@code LatLon} to a specified {@code LatLon}.
+ *
+ * @param ll the specified coordinate to be measured against this {@code LatLon}
+ * @return the square of the euclidean distance from this {@code LatLon} to a specified {@code LatLon}
+ * @since 6166
+ */
+ public double distanceSq(final LatLon ll) {
+ return super.distanceSq(ll);
+ }
+
@Override public String toString() {
return "LatLon[lat="+lat()+",lon="+lon()+"]";
}
diff --git a/src/org/openstreetmap/josm/data/coor/QuadTiling.java b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
index 9398d3c..f07d034 100644
--- a/src/org/openstreetmap/josm/data/coor/QuadTiling.java
+++ b/src/org/openstreetmap/josm/data/coor/QuadTiling.java
@@ -1,21 +1,24 @@
-// License: GPL. Copyright 2009 by Dave Hansen, others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.coor;
-public class QuadTiling
-{
+public final class QuadTiling {
+
+ private QuadTiling() {
+ // Hide default constructor for utils classes
+ }
+
public static final int NR_LEVELS = 24;
public static final double WORLD_PARTS = (1 << NR_LEVELS);
public static final int TILES_PER_LEVEL_SHIFT = 2; // Has to be 2. Other parts of QuadBuckets code rely on it
public static final int TILES_PER_LEVEL = 1<<TILES_PER_LEVEL_SHIFT;
- static public final int X_PARTS = 360;
- static public final int X_BIAS = -180;
+ public static final int X_PARTS = 360;
+ public static final int X_BIAS = -180;
- static public final int Y_PARTS = 180;
- static public final int Y_BIAS = -90;
+ public static final int Y_PARTS = 180;
+ public static final int Y_BIAS = -90;
- public static LatLon tile2LatLon(long quad)
- {
+ public static LatLon tile2LatLon(long quad) {
// The world is divided up into X_PARTS,Y_PARTS.
// The question is how far we move for each bit
// being set. In the case of the top level, we
@@ -43,8 +46,8 @@ public class QuadTiling
y += Y_BIAS;
return new LatLon(y, x);
}
- static long xy2tile(long x, long y)
- {
+
+ static long xy2tile(long x, long y) {
long tile = 0;
int i;
for (i = NR_LEVELS-1; i >= 0; i--)
@@ -57,48 +60,68 @@ public class QuadTiling
}
return tile;
}
- static long coorToTile(LatLon coor)
- {
+
+ static long coorToTile(LatLon coor) {
return quadTile(coor);
}
- static long lon2x(double lon)
- {
- //return Math.round((lon + 180.0) * QuadBuckets.WORLD_PARTS / 360.0)-1;
+
+ static long lon2x(double lon) {
long ret = (long)((lon + 180.0) * WORLD_PARTS / 360.0);
if (ret == WORLD_PARTS) {
ret--;
}
return ret;
}
- static long lat2y(double lat)
- {
- //return Math.round((lat + 90.0) * QuadBuckets.WORLD_PARTS / 180.0)-1;
+
+ static long lat2y(double lat) {
long ret = (long)((lat + 90.0) * WORLD_PARTS / 180.0);
if (ret == WORLD_PARTS) {
ret--;
}
return ret;
}
- static public long quadTile(LatLon coor)
- {
- return xy2tile(lon2x(coor.lon()),
- lat2y(coor.lat()));
+
+ public static long quadTile(LatLon coor) {
+ return xy2tile(lon2x(coor.lon()), lat2y(coor.lat()));
}
- static public int index(int level, long quad)
- {
+
+ public static int index(int level, long quad) {
long mask = 0x00000003;
int total_shift = TILES_PER_LEVEL_SHIFT*(NR_LEVELS-level-1);
return (int)(mask & (quad >> total_shift));
}
- static public int index(LatLon coor, int level) {
- // The nodes that don't return coordinates will all get
- // stuck in a single tile. Hopefully there are not too
- // many of them
+
+ /**
+ * Returns quad tiling index for given coordinates and level.
+ *
+ * @param coor coordinates
+ * @param level level
+ *
+ * @return quad tiling index for given coordinates and level.
+ * @since 2263
+ */
+ public static int index(LatLon coor, int level) {
+ // The nodes that don't return coordinates will all get stuck in a single tile.
+ // Hopefully there are not too many of them
if (coor == null)
return 0;
- long x = lon2x(coor.lon());
- long y = lat2y(coor.lat());
+ return index(coor.lat(), coor.lon(), level);
+ }
+
+ /**
+ * Returns quad tiling index for given coordinates and level.
+ *
+ * @param lat latitude
+ * @param lon longitude
+ * @param level level
+ *
+ * @return quad tiling index for given coordinates and level.
+ * @since 6171
+ */
+ public static int index(final double lat, final double lon, final int level) {
+ long x = lon2x(lon);
+ long y = lat2y(lat);
int shift = NR_LEVELS-level-1;
return (int)((x >> shift & 1) * 2 + (y >> shift & 1));
}
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxConstants.java b/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
index 827a6b8..81d021a 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
@@ -4,6 +4,8 @@ package org.openstreetmap.josm.data.gpx;
import java.util.Arrays;
import java.util.List;
+import org.openstreetmap.josm.Main;
+
/**
* Constants for GPX handling.
*/
@@ -23,7 +25,7 @@ public interface GpxConstants {
public static final String META_TIME = META_PREFIX + "time";
public static final String META_EXTENSIONS = META_PREFIX + "extensions";
- public static final String JOSM_EXTENSIONS_NAMESPACE_URI = "http://josm.openstreetmap.de/gpx-extensions";
+ public static final String JOSM_EXTENSIONS_NAMESPACE_URI = Main.JOSM_WEBSITE + "/gpx-extensions-1.0";
public static List<String> WPT_KEYS = Arrays.asList("ele", "time", "magvar", "geoidheight",
"name", "cmt", "desc", "src", META_LINKS, "sym", "number", "type",
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxData.java b/src/org/openstreetmap/josm/data/gpx/GpxData.java
index b7320d6..0d7fbf1 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxData.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxData.java
@@ -1,13 +1,13 @@
-//License: GPLv2 or later. Copyright 2007 by Raphael Mack and others
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.gpx;
import java.io.File;
import java.util.Collection;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.EastNorth;
@@ -77,7 +77,7 @@ public class GpxData extends WithAttributes {
* calculates the bounding box of available data and returns it.
* The bounds are not stored internally, but recalculated every time
* this function is called.
- *
+ *
* FIXME might perhaps use visitor pattern?
*/
public Bounds recalculateBounds() {
@@ -123,7 +123,7 @@ public class GpxData extends WithAttributes {
return result;
}
-
+
/**
* Makes a WayPoint at the projection of point P onto the track providing P is less than
* tolerance away from the track
@@ -146,7 +146,7 @@ public class GpxData extends WithAttributes {
*
* PN^2 = (Axp + Byp + C)^2 / RS^2 that is the distance from P to the line
*
- * so if PN^2 is less than PNmin^2 (initialized to tolerance) we can reject the line;
+ * so if PN^2 is less than PNmin^2 (initialized to tolerance) we can reject the line
* otherwise... determine if the projected poijnt lies within the bounds of the line: PR^2 -
* PN^2 <= RS^2 and PS^2 - PN^2 <= RS^2
*
@@ -237,4 +237,87 @@ public class GpxData extends WithAttributes {
best.time = bestTime;
return best;
}
+
+ /**
+ * Iterate over all track segments and over all routes.
+ *
+ * @param trackVisibility An array indicating which tracks should be
+ * included in the iteration. Can be null, then all tracks are included.
+ * @return an Iterable object, which iterates over all track segments and
+ * over all routes
+ */
+ public Iterable<Collection<WayPoint>> getLinesIterable(final boolean[] trackVisibility) {
+ return new Iterable<Collection<WayPoint>>() {
+ @Override
+ public Iterator<Collection<WayPoint>> iterator() {
+ return new LinesIterator(GpxData.this, trackVisibility);
+ }
+ };
+ }
+
+ /**
+ * Iterates over all track segments and then over all routes.
+ */
+ public static class LinesIterator implements Iterator<Collection<WayPoint>> {
+
+ private Iterator<GpxTrack> itTracks;
+ private int idxTracks;
+ private Iterator<GpxTrackSegment> itTrackSegments;
+ private Iterator<GpxRoute> itRoutes;
+
+ private Collection<WayPoint> next;
+ private boolean[] trackVisibility;
+
+ public LinesIterator(GpxData data, boolean[] trackVisibility) {
+ itTracks = data.tracks.iterator();
+ idxTracks = -1;
+ itRoutes = data.routes.iterator();
+ this.trackVisibility = trackVisibility;
+ next = getNext();
+ }
+
+ @Override
+ public boolean hasNext() {
+ return next != null;
+ }
+
+ @Override
+ public Collection<WayPoint> next() {
+ Collection<WayPoint> current = next;
+ next = getNext();
+ return current;
+ }
+
+ private Collection<WayPoint> getNext() {
+ if (itTracks != null) {
+ if (itTrackSegments != null && itTrackSegments.hasNext()) {
+ return itTrackSegments.next().getWayPoints();
+ } else {
+ while (itTracks.hasNext()) {
+ GpxTrack nxtTrack = itTracks.next();
+ idxTracks++;
+ if (trackVisibility != null && !trackVisibility[idxTracks])
+ continue;
+ itTrackSegments = nxtTrack.getSegments().iterator();
+ if (itTrackSegments.hasNext()) {
+ return itTrackSegments.next().getWayPoints();
+ }
+ }
+ // if we get here, all the Tracks are finished; Continue with
+ // Routes
+ itTracks = null;
+ }
+ }
+ if (itRoutes.hasNext()) {
+ return itRoutes.next().routePoints;
+ }
+ return null;
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
}
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxLink.java b/src/org/openstreetmap/josm/data/gpx/GpxLink.java
index 7198d04..ae76d74 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxLink.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxLink.java
@@ -1,6 +1,4 @@
-//License: GPLv2 or later.
-//Copyright 2007 by Raphael Mack and others
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.gpx;
public class GpxLink {
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxRoute.java b/src/org/openstreetmap/josm/data/gpx/GpxRoute.java
index 8793b50..3af83f7 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxRoute.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxRoute.java
@@ -1,6 +1,4 @@
-//License: GPLv2 or later
-//Copyright 2007 by Raphael Mack and others
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.gpx;
import java.util.Collection;
diff --git a/src/org/openstreetmap/josm/data/gpx/GpxTrack.java b/src/org/openstreetmap/josm/data/gpx/GpxTrack.java
index 9fadc48..c1054ab 100644
--- a/src/org/openstreetmap/josm/data/gpx/GpxTrack.java
+++ b/src/org/openstreetmap/josm/data/gpx/GpxTrack.java
@@ -1,6 +1,4 @@
-//License: GPLv2 or later
-//Copyright 2007 by Raphael Mack and others
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.gpx;
import java.util.Collection;
@@ -8,22 +6,20 @@ import java.util.Map;
import org.openstreetmap.josm.data.Bounds;
-
/**
* Read-only gpx track. Implementations doesn't have to be immutable, but should always be thread safe.
*
*/
-
public interface GpxTrack extends IWithAttributes {
Collection<GpxTrackSegment> getSegments();
Map<String, Object> getAttributes();
Bounds getBounds();
double length();
+
/**
*
* @return Number of times this track has been changed. Always 0 for read-only tracks
*/
int getUpdateCount();
-
}
diff --git a/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java b/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java
index dccbca8..7fcb82e 100644
--- a/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java
+++ b/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java
@@ -18,11 +18,11 @@ public interface IWithAttributes {
Object get(String key);
/**
- * Returns the String value to which the specified key is mapped,
+ * Returns the String value to which the specified key is mapped,
* or {@code null} if this map contains no String mapping for the key.
- *
+ *
* @param key the key whose associated value is to be returned
- * @return the String value to which the specified key is mapped,
+ * @return the String value to which the specified key is mapped,
* or {@code null} if this map contains no String mapping for the key
*/
String getString(String key);
@@ -36,7 +36,7 @@ public interface IWithAttributes {
* or {@code null} if this map contains no Collection mapping for the key
* @since 5502
*/
- Collection getCollection(String key);
+ Collection<?> getCollection(String key);
/**
* Put a key / value pair as a new attribute.
diff --git a/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java b/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java
index 5a6eff6..daf12c3 100644
--- a/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java
+++ b/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java
@@ -46,6 +46,7 @@ public class ImmutableGpxTrackSegment implements GpxTrackSegment {
return result;
}
+ @Override
public Bounds getBounds() {
if (bounds == null)
return null;
@@ -53,14 +54,17 @@ public class ImmutableGpxTrackSegment implements GpxTrackSegment {
return new Bounds(bounds);
}
+ @Override
public Collection<WayPoint> getWayPoints() {
return wayPoints;
}
+ @Override
public double length() {
return length;
}
+ @Override
public int getUpdateCount() {
return 0;
}
diff --git a/src/org/openstreetmap/josm/data/gpx/WayPoint.java b/src/org/openstreetmap/josm/data/gpx/WayPoint.java
index 534a3bf..4dfa7fd 100644
--- a/src/org/openstreetmap/josm/data/gpx/WayPoint.java
+++ b/src/org/openstreetmap/josm/data/gpx/WayPoint.java
@@ -1,6 +1,4 @@
-//License: GPLv2 or later
-//Copyright 2007 by Raphael Mack and others
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.gpx;
import java.awt.Color;
@@ -50,8 +48,8 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
* We "inline" lat/lon, rather than usinga LatLon internally => reduces memory overhead. Relevant
* because a lot of GPX waypoints are created when GPS tracks are downloaded from the OSM server.
*/
- private double lat = 0;
- private double lon = 0;
+ private final double lat;
+ private final double lon;
/*
* internal cache of projected coordinates
@@ -78,11 +76,10 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
* Internally caches the projected coordinates.</p>
*
* <p><strong>Caveat:</strong> doesn't listen to projection changes. Clients must
- * {@link #reproject() trigger a reprojection} or {@link #invalidateEastNorthCache() invalidate the internal cache}.</p>
+ * {@link #invalidateEastNorthCache() invalidate the internal cache}.</p>
*
* @return the east north coordinates or {@code null}
* @see #invalidateEastNorthCache()
- *
*/
public final EastNorth getEastNorth() {
if (Double.isNaN(east) || Double.isNaN(north)) {
@@ -113,6 +110,7 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
}
}
+ @Override
public int compareTo(WayPoint w) {
return Double.compare(time, w.time);
}
diff --git a/src/org/openstreetmap/josm/data/gpx/WithAttributes.java b/src/org/openstreetmap/josm/data/gpx/WithAttributes.java
index 527dc05..9ffadf2 100644
--- a/src/org/openstreetmap/josm/data/gpx/WithAttributes.java
+++ b/src/org/openstreetmap/josm/data/gpx/WithAttributes.java
@@ -56,9 +56,9 @@ public class WithAttributes implements IWithAttributes, GpxConstants {
* @since 5502
*/
@Override
- public Collection getCollection(String key) {
+ public Collection<?> getCollection(String key) {
Object value = attr.get(key);
- return (value instanceof Collection) ? (Collection)value : null;
+ return (value instanceof Collection) ? (Collection<?>)value : null;
}
/**
diff --git a/src/org/openstreetmap/josm/data/imagery/GeorefImage.java b/src/org/openstreetmap/josm/data/imagery/GeorefImage.java
index 3cd6601..95dc221 100644
--- a/src/org/openstreetmap/josm/data/imagery/GeorefImage.java
+++ b/src/org/openstreetmap/josm/data/imagery/GeorefImage.java
@@ -147,9 +147,7 @@ public class GeorefImage implements Serializable {
img.flush();
}
long freeMem = Runtime.getRuntime().maxMemory() - Runtime.getRuntime().totalMemory();
- //System.out.println("Free Memory: "+ (freeMem/1024/1024) +" MB");
// Notice that this value can get negative due to integer overflows
- //System.out.println("Img Size: "+ (width*height*3/1024/1024) +" MB");
int multipl = alphaChannel ? 4 : 3;
// This happens when requesting images while zoomed out and then zooming in
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index 977a395..1781dfb 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -47,7 +47,7 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
public String getUrlString() {
return urlString;
}
-
+
public static ImageryType fromUrlString(String s) {
for (ImageryType type : ImageryType.values()) {
if (type.getUrlString().equals(s)) {
@@ -76,6 +76,31 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
public List<Shape> getShapes() {
return shapes;
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((shapes == null) ? 0 : shapes.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (!super.equals(obj))
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ImageryBounds other = (ImageryBounds) obj;
+ if (shapes == null) {
+ if (other.shapes != null)
+ return false;
+ } else if (!shapes.equals(other.shapes))
+ return false;
+ return true;
+ }
}
private String name;
@@ -121,6 +146,9 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
@pref String projections;
@pref String icon;
+ /**
+ * Constructs a new {@code ImageryPreferenceEntry}.
+ */
public ImageryPreferenceEntry() {
}
@@ -143,29 +171,38 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
icon = i.icon;
if (i.bounds != null) {
bounds = i.bounds.encodeAsString(",");
- String shapesString = "";
+ StringBuilder shapesString = new StringBuilder();
for (Shape s : i.bounds.getShapes()) {
- if (!shapesString.isEmpty()) {
- shapesString += ";";
+ if (shapesString.length() > 0) {
+ shapesString.append(";");
}
- shapesString += s.encodeAsString(",");
+ shapesString.append(s.encodeAsString(","));
}
- if (!shapesString.isEmpty()) {
- shapes = shapesString;
+ if (shapesString.length() > 0) {
+ shapes = shapesString.toString();
}
}
if (i.serverProjections != null && !i.serverProjections.isEmpty()) {
- String val = "";
+ StringBuilder val = new StringBuilder();
for (String p : i.serverProjections) {
- if (!val.isEmpty())
- val += ",";
- val += p;
+ if (val.length() > 0) {
+ val.append(",");
+ }
+ val.append(p);
}
- projections = val;
+ projections = val.toString();
}
}
+
+ @Override
+ public String toString() {
+ return "ImageryPreferenceEntry [name=" + name + "]";
+ }
}
+ /**
+ * Constructs a new {@code ImageryInfo}.
+ */
public ImageryInfo() {
}
@@ -196,6 +233,7 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
setExtendedUrl(url);
ImageryType t = ImageryType.fromUrlString(type);
this.cookies=cookies;
+ this.eulaAcceptanceRequired = eulaAcceptanceRequired;
if (t != null) {
this.imageryType = t;
}
@@ -228,7 +266,7 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
bounds.addShape(new Shape(s, ","));
}
} catch (IllegalArgumentException ex) {
- Main.warn(ex.toString());
+ Main.warn(ex);
}
}
}
@@ -413,20 +451,20 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
defaultMinZoom = 0;
for (ImageryType type : ImageryType.values()) {
Matcher m = Pattern.compile(type.getUrlString()+"(?:\\[(?:(\\d+),)?(\\d+)\\])?:(.*)").matcher(url);
- if(m.matches()) {
+ if (m.matches()) {
this.url = m.group(3);
this.imageryType = type;
- if(m.group(2) != null) {
+ if (m.group(2) != null) {
defaultMaxZoom = Integer.valueOf(m.group(2));
}
- if(m.group(1) != null) {
+ if (m.group(1) != null) {
defaultMinZoom = Integer.valueOf(m.group(1));
}
break;
}
}
- if(serverProjections == null || serverProjections.isEmpty()) {
+ if (serverProjections == null || serverProjections.isEmpty()) {
try {
serverProjections = new ArrayList<String>();
Matcher m = Pattern.compile(".*\\{PROJ\\(([^)}]+)\\)\\}.*").matcher(url.toUpperCase());
@@ -434,7 +472,8 @@ public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
for(String p : m.group(1).split(","))
serverProjections.add(p);
}
- } catch(Exception e) {
+ } catch (Exception e) {
+ Main.warn(e);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
index d179e32..68b5f56 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
@@ -8,13 +8,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.xml.sax.SAXException;
-
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.io.imagery.ImageryReader;
import org.openstreetmap.josm.tools.Utils;
+import org.xml.sax.SAXException;
/**
* Manages the list of imagery entries that are shown in the imagery menu.
@@ -22,11 +21,11 @@ import org.openstreetmap.josm.tools.Utils;
public class ImageryLayerInfo {
public static final ImageryLayerInfo instance = new ImageryLayerInfo();
- ArrayList<ImageryInfo> layers = new ArrayList<ImageryInfo>();
- static ArrayList<ImageryInfo> defaultLayers = new ArrayList<ImageryInfo>();
+ List<ImageryInfo> layers = new ArrayList<ImageryInfo>();
+ static List<ImageryInfo> defaultLayers = new ArrayList<ImageryInfo>();
private final static String[] DEFAULT_LAYER_SITES = {
- "http://josm.openstreetmap.de/maps"
+ Main.JOSM_WEBSITE+"/maps"
};
private ImageryLayerInfo() {
@@ -41,7 +40,7 @@ public class ImageryLayerInfo {
}
public void load() {
- boolean addedDefault = layers.size() != 0;
+ boolean addedDefault = !layers.isEmpty();
List<ImageryPreferenceEntry> entries = Main.pref.getListOfStructs("imagery.entries", null, ImageryPreferenceEntry.class);
if (entries != null) {
for (ImageryPreferenceEntry prefEntry : entries) {
@@ -49,7 +48,7 @@ public class ImageryLayerInfo {
ImageryInfo i = new ImageryInfo(prefEntry);
add(i);
} catch (IllegalArgumentException e) {
- System.err.println("Warning: Unable to load imagery preference entry:"+e);
+ Main.warn("Unable to load imagery preference entry:"+e);
}
}
Collections.sort(layers);
@@ -89,10 +88,10 @@ public class ImageryLayerInfo {
continue;
}
}
- while (defaultLayers.remove(null)) {}
+ while (defaultLayers.remove(null));
Collection<String> defaults = Main.pref.getCollection("imagery.layers.default");
- ArrayList<String> defaultsSave = new ArrayList<String>();
+ List<String> defaultsSave = new ArrayList<String>();
for (ImageryInfo def : defaultLayers) {
if (def.isDefaultEntry()) {
defaultsSave.add(def.getUrl());
@@ -120,13 +119,12 @@ public class ImageryLayerInfo {
}
Collections.sort(defaultLayers);
- Main.pref.putCollection("imagery.layers.default", defaultsSave.size() > 0
- ? defaultsSave : defaults);
+ Main.pref.putCollection("imagery.layers.default", defaultsSave.isEmpty() ? defaults : defaultsSave);
}
// some additional checks to respect extended URLs in preferences (legacy workaround)
private boolean isSimilar(String a, String b) {
- return Utils.equal(a, b) || (a != null && b != null && !"".equals(a) && !"".equals(b) && (a.contains(b) || b.contains(a)));
+ return Utils.equal(a, b) || (a != null && b != null && !a.isEmpty() && !b.isEmpty() && (a.contains(b) || b.contains(a)));
}
public void add(ImageryInfo info) {
diff --git a/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java b/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
index a231c71..6301c92 100644
--- a/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
+++ b/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
@@ -44,7 +44,7 @@ public class OffsetBookmark {
}
public OffsetBookmark(Collection<String> list) {
- ArrayList<String> array = new ArrayList<String>(list);
+ List<String> array = new ArrayList<String>(list);
this.projectionCode = array.get(0);
this.layerName = array.get(1);
this.name = array.get(2);
@@ -55,12 +55,12 @@ public class OffsetBookmark {
this.centerY = Double.valueOf(array.get(6));
}
if (projectionCode == null) {
- System.err.println(tr("Projection ''{0}'' is not found, bookmark ''{1}'' is not usable", projectionCode, name));
+ Main.error(tr("Projection ''{0}'' is not found, bookmark ''{1}'' is not usable", projectionCode, name));
}
}
- public ArrayList<String> getInfoArray() {
- ArrayList<String> res = new ArrayList<String>(7);
+ public List<String> getInfoArray() {
+ List<String> res = new ArrayList<String>(7);
if (projectionCode != null) {
res.add(projectionCode);
} else {
diff --git a/src/org/openstreetmap/josm/data/imagery/Shape.java b/src/org/openstreetmap/josm/data/imagery/Shape.java
index 1fe80f2..8ed663d 100644
--- a/src/org/openstreetmap/josm/data/imagery/Shape.java
+++ b/src/org/openstreetmap/josm/data/imagery/Shape.java
@@ -20,7 +20,7 @@ import org.openstreetmap.josm.tools.Geometry;
public class Shape {
private List<Coordinate> coords = new ArrayList<Coordinate>();
-
+
public Shape(String asString, String separator) throws IllegalArgumentException {
CheckParameterUtil.ensureParameterNotNull(asString, "asString");
String[] components = asString.split(separator);
@@ -48,7 +48,7 @@ public class Shape {
public List<Coordinate> getPoints() {
return coords;
}
-
+
public boolean contains(LatLon latlon) {
if (latlon == null)
return false;
@@ -64,7 +64,7 @@ public class Shape {
CheckParameterUtil.ensureParameterNotNull(sLon, "sLon");
double lat, lon;
-
+
try {
lat = Double.parseDouble(sLat);
if (!LatLon.isValidLat(lat))
@@ -80,7 +80,7 @@ public class Shape {
} catch (NumberFormatException e) {
throw new IllegalArgumentException(MessageFormat.format("Illegal double value ''{0}''", sLon));
}
-
+
coords.add(new Coordinate(LatLon.roundToOsmPrecision(lat), LatLon.roundToOsmPrecision(lon)));
}
}
diff --git a/src/org/openstreetmap/josm/data/imagery/WmsCache.java b/src/org/openstreetmap/josm/data/imagery/WmsCache.java
index 119e1ff..f4198ba 100644
--- a/src/org/openstreetmap/josm/data/imagery/WmsCache.java
+++ b/src/org/openstreetmap/josm/data/imagery/WmsCache.java
@@ -100,14 +100,6 @@ public class WmsCache {
if (!(new File(cPath).isAbsolute())) {
cPath = Main.pref.getCacheDirectory() + File.separator + cPath;
}
- // Migrate to new cache directory. Remove 2012-06
- {
- File oldPath = new File(Main.pref.getPreferencesDirFile(), "wms-cache");
- File newPath = new File(cPath);
- if (oldPath.exists() && !newPath.exists()) {
- oldPath.renameTo(newPath);
- }
- }
return cPath;
}
@@ -130,9 +122,9 @@ public class WmsCache {
fis = new FileInputStream(layerIndexFile);
layersIndex.load(fis);
} catch (FileNotFoundException e) {
- System.out.println("Unable to load layers index for wms cache (file " + layerIndexFile + " not found)");
+ Main.error("Unable to load layers index for wms cache (file " + layerIndexFile + " not found)");
} catch (IOException e) {
- System.err.println("Unable to load layers index for wms cache");
+ Main.error("Unable to load layers index for wms cache");
e.printStackTrace();
}
@@ -158,21 +150,13 @@ public class WmsCache {
fos = new FileOutputStream(layerIndexFile);
layersIndex.store(fos, "");
} catch (IOException e) {
- System.err.println("Unable to save layer index for wms cache");
+ Main.error("Unable to save layer index for wms cache");
e.printStackTrace();
}
}
} finally {
- try {
- if (fis != null) {
- fis.close();
- }
- if (fos != null) {
- fos.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
+ Utils.close(fos);
+ Utils.close(fis);
}
return cacheDirName;
@@ -202,7 +186,7 @@ public class WmsCache {
WmsCacheType cacheEntries = (WmsCacheType)unmarshaller.unmarshal(new FileInputStream(indexFile));
totalFileSize = cacheEntries.getTotalFileSize();
if (cacheEntries.getTileSize() != tileSize) {
- System.out.println("Cache created with different tileSize, cache will be discarded");
+ Main.info("Cache created with different tileSize, cache will be discarded");
return;
}
for (ProjectionType projectionType: cacheEntries.getProjection()) {
@@ -217,9 +201,9 @@ public class WmsCache {
} catch (Exception e) {
if (indexFile.exists()) {
e.printStackTrace();
- System.out.println("Unable to load index for wms-cache, new file will be created");
+ Main.info("Unable to load index for wms-cache, new file will be created");
} else {
- System.out.println("Index for wms-cache doesn't exist, new file will be created");
+ Main.info("Index for wms-cache doesn't exist, new file will be created");
}
}
@@ -284,7 +268,7 @@ public class WmsCache {
index.setTileSize(tileSize);
index.setTotalFileSize(totalFileSize);
for (ProjectionEntries projectionEntries: entries.values()) {
- if (projectionEntries.entries.size() > 0) {
+ if (!projectionEntries.entries.isEmpty()) {
ProjectionType projectionType = new ProjectionType();
projectionType.setName(projectionEntries.projection);
projectionType.setCacheDirectory(projectionEntries.cacheDirectory);
@@ -312,7 +296,7 @@ public class WmsCache {
Marshaller marshaller = context.createMarshaller();
marshaller.marshal(index, new FileOutputStream(new File(cacheDir, INDEX_FILENAME)));
} catch (Exception e) {
- System.err.println("Failed to save wms-cache file");
+ Main.error("Failed to save wms-cache file");
e.printStackTrace();
}
}
@@ -379,7 +363,7 @@ public class WmsCache {
try {
return loadImage(projectionEntries, entry);
} catch (IOException e) {
- System.err.println("Unable to load file from wms cache");
+ Main.error("Unable to load file from wms cache");
e.printStackTrace();
return null;
}
@@ -539,7 +523,7 @@ public class WmsCache {
try {
totalFileSize += Utils.copyStream(imageData, os);
} finally {
- os.close();
+ Utils.close(os);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java b/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
index 4f3289d..e371e4f 100644
--- a/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
+++ b/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
@@ -9,6 +9,7 @@ import oauth.signpost.OAuthProvider;
import oauth.signpost.basic.DefaultOAuthConsumer;
import oauth.signpost.basic.DefaultOAuthProvider;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -20,25 +21,25 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
public class OAuthParameters {
/**
- * The default JOSM OAuth consumer key.
+ * The default JOSM OAuth consumer key (created by user josmeditor).
*/
- static public final String DEFAULT_JOSM_CONSUMER_KEY = "AdCRxTpvnbmfV8aPqrTLyA";
+ static public final String DEFAULT_JOSM_CONSUMER_KEY = "F7zPYlVCqE2BUH9Hr4SsWZSOnrKjpug1EgqkbsSb";
/**
- * The default JOSM OAuth consumer secret.
+ * The default JOSM OAuth consumer secret (created by user josmeditor).
*/
- static public final String DEFAULT_JOSM_CONSUMER_SECRET = "XmYOiGY9hApytcBC3xCec3e28QBqOWz5g6DSb5UpE";
+ static public final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5";
/**
* The default OSM OAuth request token URL.
*/
- static public final String DEFAULT_REQUEST_TOKEN_URL = "http://www.openstreetmap.org/oauth/request_token";
+ static public final String DEFAULT_REQUEST_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/request_token";
/**
* The default OSM OAuth access token URL.
*/
- static public final String DEFAULT_ACCESS_TOKEN_URL = "http://www.openstreetmap.org/oauth/access_token";
+ static public final String DEFAULT_ACCESS_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/access_token";
/**
* The default OSM OAuth authorize URL.
*/
- static public final String DEFAULT_AUTHORISE_URL = "http://www.openstreetmap.org/oauth/authorize";
+ static public final String DEFAULT_AUTHORISE_URL = Main.OSM_WEBSITE + "/oauth/authorize";
/**
@@ -55,7 +56,7 @@ public class OAuthParameters {
* Replies a set of default parameters for a consumer accessing an OSM server
* at the given API url. URL parameters are only set if the URL equals {@link OsmApi#DEFAULT_API_URL}
* or references the domain "dev.openstreetmap.org", otherwise they may be <code>null</code>.
- *
+ *
* @param apiUrl The API URL for which the OAuth default parameters are created. If null or empty, the default OSM API url is used.
* @return a set of default parameters for the given {@code apiUrl}
* @since 5422
@@ -64,11 +65,10 @@ public class OAuthParameters {
OAuthParameters parameters = new OAuthParameters();
parameters.setConsumerKey(DEFAULT_JOSM_CONSUMER_KEY);
parameters.setConsumerSecret(DEFAULT_JOSM_CONSUMER_SECRET);
- if (apiUrl == null || apiUrl.isEmpty() || apiUrl.equals(OsmApi.DEFAULT_API_URL)) {
- parameters.setRequestTokenUrl(DEFAULT_REQUEST_TOKEN_URL);
- parameters.setAccessTokenUrl(DEFAULT_ACCESS_TOKEN_URL);
- parameters.setAuthoriseUrl(DEFAULT_AUTHORISE_URL);
- } else {
+ parameters.setRequestTokenUrl(DEFAULT_REQUEST_TOKEN_URL);
+ parameters.setAccessTokenUrl(DEFAULT_ACCESS_TOKEN_URL);
+ parameters.setAuthoriseUrl(DEFAULT_AUTHORISE_URL);
+ if (!OsmApi.DEFAULT_API_URL.equals(apiUrl)) {
try {
String host = new URL(apiUrl).getHost();
if (host.endsWith("dev.openstreetmap.org")) {
@@ -90,32 +90,15 @@ public class OAuthParameters {
* @return the parameters
*/
static public OAuthParameters createFromPreferences(Preferences pref) {
- boolean useDefault = pref.getBoolean("oauth.settings.use-default", true );
- if (useDefault)
- return createDefault(pref.get("osm-server.url"));
- OAuthParameters parameters = new OAuthParameters();
- parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", ""));
- parameters.setConsumerSecret(pref.get("oauth.settings.consumer-secret", ""));
- parameters.setRequestTokenUrl(pref.get("oauth.settings.request-token-url", ""));
- parameters.setAccessTokenUrl(pref.get("oauth.settings.access-token-url", ""));
- parameters.setAuthoriseUrl(pref.get("oauth.settings.authorise-url", ""));
+ OAuthParameters parameters = createDefault(pref.get("osm-server.url"));
+ parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", parameters.getConsumerKey()));
+ parameters.setConsumerSecret(pref.get("oauth.settings.consumer-secret", parameters.getConsumerSecret()));
+ parameters.setRequestTokenUrl(pref.get("oauth.settings.request-token-url", parameters.getRequestTokenUrl()));
+ parameters.setAccessTokenUrl(pref.get("oauth.settings.access-token-url", parameters.getAccessTokenUrl()));
+ parameters.setAuthoriseUrl(pref.get("oauth.settings.authorise-url", parameters.getAuthoriseUrl()));
return parameters;
}
- /**
- * Clears the preferences for OAuth parameters
- *
- * @param pref the preferences in which keys related to OAuth parameters are
- * removed
- */
- static public void clearPreferences(Preferences pref) {
- pref.put("oauth.settings.consumer-key", null);
- pref.put("oauth.settings.consumer-secret", null);
- pref.put("oauth.settings.request-token-url", null);
- pref.put("oauth.settings.access-token-url", null);
- pref.put("oauth.settings.authorise-url", null);
- }
-
private String consumerKey;
private String consumerSecret;
private String requestTokenUrl;
@@ -124,7 +107,7 @@ public class OAuthParameters {
/**
* Constructs a new, unitialized, {@code OAuthParameters}.
- *
+ *
* @see #createDefault
* @see #createFromPreferences
*/
@@ -153,7 +136,7 @@ public class OAuthParameters {
public String getConsumerKey() {
return consumerKey;
}
-
+
/**
* Sets the consumer key.
* @param consumerKey The consumer key
@@ -161,15 +144,15 @@ public class OAuthParameters {
public void setConsumerKey(String consumerKey) {
this.consumerKey = consumerKey;
}
-
+
/**
- * Gets the consumer secret.
+ * Gets the consumer secret.
* @return The consumer secret
*/
public String getConsumerSecret() {
return consumerSecret;
}
-
+
/**
* Sets the consumer secret.
* @param consumerSecret The consumer secret
@@ -177,7 +160,7 @@ public class OAuthParameters {
public void setConsumerSecret(String consumerSecret) {
this.consumerSecret = consumerSecret;
}
-
+
/**
* Gets the request token URL.
* @return The request token URL
@@ -185,7 +168,7 @@ public class OAuthParameters {
public String getRequestTokenUrl() {
return requestTokenUrl;
}
-
+
/**
* Sets the request token URL.
* @param requestTokenUrl the request token URL
@@ -193,7 +176,7 @@ public class OAuthParameters {
public void setRequestTokenUrl(String requestTokenUrl) {
this.requestTokenUrl = requestTokenUrl;
}
-
+
/**
* Gets the access token URL.
* @return The access token URL
@@ -201,7 +184,7 @@ public class OAuthParameters {
public String getAccessTokenUrl() {
return accessTokenUrl;
}
-
+
/**
* Sets the access token URL.
* @param accessTokenUrl The access token URL
@@ -209,7 +192,7 @@ public class OAuthParameters {
public void setAccessTokenUrl(String accessTokenUrl) {
this.accessTokenUrl = accessTokenUrl;
}
-
+
/**
* Gets the authorise URL.
* @return The authorise URL
@@ -217,7 +200,7 @@ public class OAuthParameters {
public String getAuthoriseUrl() {
return authoriseUrl;
}
-
+
/**
* Sets the authorise URL.
* @param authoriseUrl The authorise URL
@@ -256,12 +239,6 @@ public class OAuthParameters {
* @param pref The Preferences into which are saved these OAuth parameters with the prefix "oauth.settings"
*/
public void saveToPreferences(Preferences pref) {
- if (this.equals(createDefault(pref.get("osm-server.url")))) {
- pref.put("oauth.settings.use-default", true );
- clearPreferences(pref);
- return;
- }
- pref.put("oauth.settings.use-default", false);
pref.put("oauth.settings.consumer-key", consumerKey);
pref.put("oauth.settings.consumer-secret", consumerSecret);
pref.put("oauth.settings.request-token-url", requestTokenUrl);
diff --git a/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java b/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java
index a33a82d..6c782e0 100644
--- a/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java
+++ b/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java
@@ -7,6 +7,7 @@ public class OsmPrivileges {
private boolean allowReadGpx;
private boolean allowReadPrefs;
private boolean allowWritePrefs;
+ private boolean allowModifyNotes;
public boolean isAllowWriteApi() {
return allowWriteApi;
@@ -38,4 +39,12 @@ public class OsmPrivileges {
public void setAllowWritePrefs(boolean allowWritePrefs) {
this.allowWritePrefs = allowWritePrefs;
}
+
+ public boolean isAllowModifyNotes() {
+ return allowModifyNotes;
+ }
+
+ public void setAllowModifyNotes(boolean allowModifyNotes) {
+ this.allowModifyNotes = allowModifyNotes;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
index 9ff916a..d8f8d33 100644
--- a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -198,17 +199,22 @@ public abstract class AbstractPrimitive implements IPrimitive {
}
/**
- * Clears the id and version known to the OSM API. The id and the version is set to 0.
- * incomplete is set to false. It's preferred to use copy constructor with clearId set to true instead
+ * Clears the metadata, including id and version known to the OSM API.
+ * The id is a new unique id. The version, changeset and timestamp are set to 0.
+ * incomplete and deleted are set to false. It's preferred to use copy constructor with clearMetadata set to true instead
* of calling this method.
+ * @since 6140
*/
- public void clearOsmId() {
+ public void clearOsmMetadata() {
// Not part of dataset - no lock necessary
this.id = generateUniqueId();
this.version = 0;
this.user = null;
this.changesetId = 0; // reset changeset id on a new object
+ this.timestamp = 0;
this.setIncomplete(false);
+ this.setDeleted(false);
+ this.setVisible(true);
}
/**
@@ -260,7 +266,6 @@ public abstract class AbstractPrimitive implements IPrimitive {
if (isNew() && changesetId > 0)
throw new IllegalStateException(tr("Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is {0}", changesetId));
- int old = this.changesetId;
this.changesetId = changesetId;
}
@@ -292,7 +297,7 @@ public abstract class AbstractPrimitive implements IPrimitive {
*/
@Override
public Date getTimestamp() {
- return new Date(timestamp * 1000l);
+ return new Date(timestamp * 1000L);
}
@Override
@@ -392,7 +397,7 @@ public abstract class AbstractPrimitive implements IPrimitive {
*/
@Override
public void setVisible(boolean visible) throws IllegalStateException{
- if (isNew() && visible == false)
+ if (isNew() && !visible)
throw new IllegalStateException(tr("A primitive with ID = 0 cannot be invisible."));
updateFlags(FLAG_VISIBLE, visible);
}
@@ -656,9 +661,9 @@ public abstract class AbstractPrimitive implements IPrimitive {
*/
public boolean hasSameTags(OsmPrimitive other) {
// We cannot directly use Arrays.equals(keys, other.keys) as keys is not ordered by key
- // but we can at least check if both arrays are null or of the same size before creating
+ // but we can at least check if both arrays are null or of the same size before creating
// and comparing the key maps (costly operation, see #7159)
- return (keys == null && other.keys == null)
+ return (keys == null && other.keys == null)
|| (keys != null && other.keys != null && keys.length == other.keys.length && (keys.length == 0 || getKeys().equals(other.getKeys())));
}
@@ -709,7 +714,7 @@ public abstract class AbstractPrimitive implements IPrimitive {
* Tests whether this primitive contains a tag consisting of {@code key} and any of {@code values}.
* @param key the key forming the tag.
* @param values one or many values forming the tag.
- * @return true iff primitive contains a tag consisting of {@code key} and any of {@code values}.
+ * @return true if primitive contains a tag consisting of {@code key} and any of {@code values}.
*/
public boolean hasTag(String key, String... values) {
return hasTag(key, Arrays.asList(values));
diff --git a/src/org/openstreetmap/josm/data/osm/BBox.java b/src/org/openstreetmap/josm/data/osm/BBox.java
index 74a5418..fde44d0 100644
--- a/src/org/openstreetmap/josm/data/osm/BBox.java
+++ b/src/org/openstreetmap/josm/data/osm/BBox.java
@@ -1,12 +1,10 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
-import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.QuadTiling;
import org.openstreetmap.josm.tools.Utils;
public class BBox {
@@ -16,16 +14,35 @@ public class BBox {
private double ymin = Double.POSITIVE_INFINITY;
private double ymax = Double.NEGATIVE_INFINITY;
- public BBox(Bounds bounds) {
- add(bounds.getMin());
- add(bounds.getMax());
+ /**
+ * Constructs a new {@code BBox} defined by a single point.
+ *
+ * @param x X coordinate
+ * @param y Y coordinate
+ * @since 6203
+ */
+ public BBox(final double x, final double y) {
+ xmax = xmin = x;
+ ymax = ymin = y;
+ sanity();
}
+ /**
+ * Constructs a new {@code BBox} defined by points <code>a</code> and <code>b</code>.
+ * Result is minimal BBox containing both points.
+ *
+ * @param a
+ * @param b
+ */
public BBox(LatLon a, LatLon b) {
- add(a);
- add(b);
+ this(a.lon(), a.lat(), b.lon(), b.lat());
}
+ /**
+ * Constructs a new {@code BBox} from another one.
+ *
+ * @param copy the BBox to copy
+ */
public BBox(BBox copy) {
this.xmin = copy.xmin;
this.xmax = copy.xmax;
@@ -34,10 +51,23 @@ public class BBox {
}
public BBox(double a_x, double a_y, double b_x, double b_y) {
- xmin = Math.min(a_x, b_x);
- xmax = Math.max(a_x, b_x);
- ymin = Math.min(a_y, b_y);
- ymax = Math.max(a_y, b_y);
+
+ if (a_x > b_x) {
+ xmax = a_x;
+ xmin = b_x;
+ } else {
+ xmax = b_x;
+ xmin = a_x;
+ }
+
+ if (a_y > b_y) {
+ ymax = a_y;
+ ymin = b_y;
+ } else {
+ ymax = b_y;
+ ymin = a_y;
+ }
+
sanity();
}
@@ -92,8 +122,11 @@ public class BBox {
}
public void add(BBox box) {
- add(box.getTopLeft());
- add(box.getBottomRight());
+ xmin = Math.min(xmin, box.xmin);
+ xmax = Math.max(xmax, box.xmax);
+ ymin = Math.min(ymin, box.ymin);
+ ymax = Math.max(ymax, box.ymax);
+ sanity();
}
public void addPrimitive(OsmPrimitive primitive, double extraSpace) {
@@ -152,33 +185,80 @@ public class BBox {
}
/**
- * Returns a list of all 4 corners of the bbox rectangle.
+ * Returns the top-left point.
+ * @return The top-left point
*/
- public List<LatLon> points() {
- LatLon p1 = new LatLon(ymin, xmin);
- LatLon p2 = new LatLon(ymin, xmax);
- LatLon p3 = new LatLon(ymax, xmin);
- LatLon p4 = new LatLon(ymax, xmax);
- List<LatLon> ret = new ArrayList<LatLon>(4);
- ret.add(p1);
- ret.add(p2);
- ret.add(p3);
- ret.add(p4);
- return ret;
- }
-
public LatLon getTopLeft() {
return new LatLon(ymax, xmin);
}
+ /**
+ * Returns the latitude of top-left point.
+ * @return The latitude of top-left point
+ * @since 6203
+ */
+ public double getTopLeftLat() {
+ return ymax;
+ }
+
+ /**
+ * Returns the longitude of top-left point.
+ * @return The longitude of top-left point
+ * @since 6203
+ */
+ public double getTopLeftLon() {
+ return xmin;
+ }
+
+ /**
+ * Returns the bottom-right point.
+ * @return The bottom-right point
+ */
public LatLon getBottomRight() {
return new LatLon(ymin, xmax);
}
-
+
+ /**
+ * Returns the latitude of bottom-right point.
+ * @return The latitude of bottom-right point
+ * @since 6203
+ */
+ public double getBottomRightLat() {
+ return ymin;
+ }
+
+ /**
+ * Returns the longitude of bottom-right point.
+ * @return The longitude of bottom-right point
+ * @since 6203
+ */
+ public double getBottomRightLon() {
+ return xmax;
+ }
+
public LatLon getCenter() {
return new LatLon(ymin + (ymax-ymin)/2.0, xmin + (xmax-xmin)/2.0);
}
+ int getIndex(final int level) {
+
+ int idx1 = QuadTiling.index(ymin, xmin, level);
+
+ final int idx2 = QuadTiling.index(ymin, xmax, level);
+ if (idx1 == -1) idx1 = idx2;
+ else if (idx1 != idx2) return -1;
+
+ final int idx3 = QuadTiling.index(ymax, xmin, level);
+ if (idx1 == -1) idx1 = idx3;
+ else if (idx1 != idx3) return -1;
+
+ final int idx4 = QuadTiling.index(ymax, xmax, level);
+ if (idx1 == -1) idx1 = idx4;
+ else if (idx1 != idx4) return -1;
+
+ return idx1;
+ }
+
@Override
public int hashCode() {
return (int)(ymin * xmin);
diff --git a/src/org/openstreetmap/josm/data/osm/Changeset.java b/src/org/openstreetmap/josm/data/osm/Changeset.java
index 947df94..a8b217b 100644
--- a/src/org/openstreetmap/josm/data/osm/Changeset.java
+++ b/src/org/openstreetmap/josm/data/osm/Changeset.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Martijn van Oosterhout and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import java.util.Collection;
@@ -16,10 +16,10 @@ import org.openstreetmap.josm.data.osm.visitor.Visitor;
*
*/
public final class Changeset implements Tagged {
-
+
/** The maximum changeset comment text length allowed by API 0.6 **/
public static final int MAX_COMMENT_LENGTH = 255;
-
+
/** the changeset id */
private int id;
/** the user who owns the changeset */
@@ -47,8 +47,7 @@ public final class Changeset implements Tagged {
* Creates a new changeset with id 0.
*/
public Changeset() {
- this.id = 0;
- this.tags = new HashMap<String, String>();
+ this(0);
}
/**
@@ -161,10 +160,12 @@ public final class Changeset implements Tagged {
this.max = max;
}
+ @Override
public Map<String, String> getKeys() {
return tags;
}
+ @Override
public void setKeys(Map<String, String> keys) {
this.tags = keys;
}
@@ -177,18 +178,22 @@ public final class Changeset implements Tagged {
this.incomplete = incomplete;
}
+ @Override
public void put(String key, String value) {
this.tags.put(key, value);
}
+ @Override
public String get(String key) {
return this.tags.get(key);
}
+ @Override
public void remove(String key) {
this.tags.remove(key);
}
+ @Override
public void removeAll() {
this.tags.clear();
}
@@ -255,10 +260,12 @@ public final class Changeset implements Tagged {
return this == obj;
}
+ @Override
public boolean hasKeys() {
return !tags.keySet().isEmpty();
}
+ @Override
public Collection<String> keySet() {
return tags.keySet();
}
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
index a35731b..06839aa 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
@@ -31,7 +31,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
* {@link ChangesetCacheEvent}s are delivered on the EDT.
*
*/
-public class ChangesetCache implements PreferenceChangedListener{
+public final class ChangesetCache implements PreferenceChangedListener{
/** the unique instance */
static private final ChangesetCache instance = new ChangesetCache();
@@ -64,7 +64,7 @@ public class ChangesetCache implements PreferenceChangedListener{
protected void fireChangesetCacheEvent(final ChangesetCacheEvent e) {
GuiHelper.runInEDT(new Runnable() {
- public void run() {
+ @Override public void run() {
for(ChangesetCacheListener l: listeners) {
l.changesetCacheUpdated(e);
}
@@ -187,6 +187,7 @@ public class ChangesetCache implements PreferenceChangedListener{
/* ------------------------------------------------------------------------- */
/* interface PreferenceChangedListener */
/* ------------------------------------------------------------------------- */
+ @Override
public void preferenceChanged(PreferenceChangeEvent e) {
if (e.getKey() == null || ! e.getKey().equals("osm-server.url"))
return;
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java b/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
index 10779c9..f371b5c 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
@@ -159,10 +159,12 @@ public class ChangesetDataSet {
this.primitive = primitive;
}
+ @Override
public ChangesetModificationType getModificationType() {
return modificationType;
}
+ @Override
public HistoryOsmPrimitive getPrimitive() {
return primitive;
}
@@ -175,10 +177,12 @@ public class ChangesetDataSet {
typeIterator = modificationTypes.entrySet().iterator();
}
+ @Override
public boolean hasNext() {
return typeIterator.hasNext();
}
+ @Override
public ChangesetDataSetEntry next() {
Entry<PrimitiveId, ChangesetModificationType> next = typeIterator.next();
ChangesetModificationType type = next.getValue();
@@ -186,6 +190,7 @@ public class ChangesetDataSet {
return new DefaultChangesetDataSetEntry(type, primitive);
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index 6f389d7..9736ae9 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -14,6 +14,7 @@ import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
@@ -87,7 +88,7 @@ import org.openstreetmap.josm.tools.Utils;
*
* @author imi
*/
-public class DataSet implements Cloneable, ProjectionChangeListener {
+public final class DataSet implements Cloneable, ProjectionChangeListener {
/**
* Maximum number of events that can be fired between beginUpdate/endUpdate to be send as single events (ie without DatasetChangedEvent)
@@ -134,7 +135,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
/**
* This method can be used to detect changes in highlight state of primitives. If highlighting was changed
* then the method will return different number.
- * @return
+ * @return the current highlight counter
*/
public int getHighlightUpdateCount() {
return highlightUpdateCount;
@@ -148,7 +149,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
/**
* Replies the history of JOSM selections
*
- * @return
+ * @return list of history entries
*/
public LinkedList<Collection<? extends OsmPrimitive>> getSelectionHistory() {
return selectionHistory;
@@ -370,7 +371,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
* {@link #relations}. References from other primitives to this
* primitive are left unchanged.
*
- * @param primitive the primitive
+ * @param primitiveId the id of the primitive
*/
public void removePrimitive(PrimitiveId primitiveId) {
beginUpdate();
@@ -431,7 +432,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
}
}
- private LinkedHashSet<OsmPrimitive> selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
+ private Set<OsmPrimitive> selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
private Collection<OsmPrimitive> selectionSnapshot;
public Collection<OsmPrimitive> getSelectedNodesAndWays() {
@@ -555,7 +556,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
* set what virtual nodes should be highlighted. Requires a Collection of
* *WaySegments* to avoid a VirtualNode class that wouldn't have much use
* otherwise.
- * @param Collection of waySegments
+ * @param waySegments Collection of way segments
*/
public void setHighlightedVirtualNodes(Collection<WaySegment> waySegments) {
if(highlightedVirtualNodes.isEmpty() && waySegments.isEmpty())
@@ -568,7 +569,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
/**
* set what virtual ways should be highlighted.
- * @param Collection of waySegments
+ * @param waySegments Collection of way segments
*/
public void setHighlightedWaySegments(Collection<WaySegment> waySegments) {
if(highlightedWaySegments.isEmpty() && waySegments.isEmpty())
@@ -589,10 +590,10 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
public void setSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
boolean changed;
synchronized (selectionLock) {
- boolean wasEmpty = selectedPrimitives.isEmpty();
+ LinkedHashSet<OsmPrimitive> oldSelection = new LinkedHashSet<OsmPrimitive>(selectedPrimitives);
selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
- changed = addSelected(selection, false)
- || (!wasEmpty && selectedPrimitives.isEmpty());
+ addSelected(selection, false);
+ changed = !oldSelection.equals(selectedPrimitives);
if (changed) {
selectionSnapshot = null;
}
@@ -680,7 +681,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
/**
* Remove the selection from every value in the collection.
- * @param list The collection to remove the selection from.
+ * @param osm The collection of ids to remove the selection from.
*/
public void clearSelection(PrimitiveId... osm) {
clearSelection(Arrays.asList(osm));
@@ -798,7 +799,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
private OsmPrimitive getPrimitiveByIdChecked(PrimitiveId primitiveId) {
OsmPrimitive result = getPrimitiveById(primitiveId);
if (result == null) {
- System.out.println(tr("JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
+ Main.warn(tr("JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this "
+ "at http://josm.openstreetmap.de/. This is not a critical error, it should be safe to continue in your work.",
primitiveId.getType(), Long.toString(primitiveId.getUniqueId())));
new Exception().printStackTrace();
@@ -949,7 +950,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
/**
* Can be called before bigger changes on dataset. Events are disabled until {@link #endUpdate()}.
- * {@link DataSetListener#dataChanged()} event is triggered after end of changes
+ * {@link DataSetListener#dataChanged(DataChangedEvent event)} event is triggered after end of changes
* <br>
* Typical usecase should look like this:
* <pre>
@@ -1054,8 +1055,7 @@ public class DataSet implements Cloneable, ProjectionChangeListener {
* Invalidates the internal cache of projected east/north coordinates.
*
* This method can be invoked after the globally configured projection method
- * changed. In contrast to {@link DataSet#reproject()} it only invalidates the
- * cache and doesn't reproject the coordinates.
+ * changed.
*/
public void invalidateEastNorthCache() {
if (Main.getProjection() == null) return; // sanity check
diff --git a/src/org/openstreetmap/josm/data/osm/DataSetMerger.java b/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
index b716734..f1f4f71 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
@@ -47,9 +47,9 @@ public class DataSetMerger {
/**
* constructor
*
- * The visitor will merge <code>theirDataSet</code> onto <code>myDataSet</code>
+ * The visitor will merge <code>sourceDataSet</code> onto <code>targetDataSet</code>
*
- * @param targetDataSet dataset with my primitives. Must not be null.
+ * @param targetDataSet dataset with my primitives. Must not be null.
* @param sourceDataSet dataset with their primitives. Ignored, if null.
* @throws IllegalArgumentException thrown if myDataSet is null
*/
@@ -64,29 +64,25 @@ public class DataSetMerger {
}
/**
- * Merges a primitive <code>other</code> of type <P> onto my primitives.
+ * Merges a primitive onto primitives dataset.
*
* If other.id != 0 it tries to merge it with an corresponding primitive from
* my dataset with the same id. If this is not possible a conflict is remembered
* in {@link #conflicts}.
*
- * If other.id == 0 it tries to find a primitive in my dataset with id == 0 which
+ * If other.id == 0 (new primitive) it tries to find a primitive in my dataset with id == 0 which
* is semantically equal. If it finds one it merges its technical attributes onto
* my primitive.
*
- * @param <P> the type of the other primitive
- * @param source the other primitive
+ * @param source the primitive to merge
+ * @param candidates a set of possible candidates for a new primitive
*/
protected void mergePrimitive(OsmPrimitive source, Collection<? extends OsmPrimitive> candidates) {
if (!source.isNew() ) {
- // try to merge onto a matching primitive with the same
- // defined id
+ // try to merge onto a matching primitive with the same defined id
//
if (mergeById(source))
return;
- //if (!source.isVisible())
- // ignore it
- // return;
} else {
// ignore deleted primitives from source
if (source.isDeleted()) return;
@@ -100,8 +96,7 @@ public class DataSetMerger {
}
if (target.hasEqualSemanticAttributes(source)) {
mergedMap.put(source.getPrimitiveId(), target.getPrimitiveId());
- // copy the technical attributes from other
- // version
+ // copy the technical attributes from other version
target.setVisible(source.isVisible());
target.setUser(source.getUser());
target.setTimestamp(source.getTimestamp());
@@ -134,7 +129,7 @@ public class DataSetMerger {
return null;
return targetDataSet.getPrimitiveById(targetId);
}
-
+
protected void addConflict(Conflict<?> c) {
c.setMergedMap(mergedMap);
conflicts.add(c);
@@ -220,7 +215,7 @@ public class DataSetMerger {
}
}
}
-
+
private final void resetPrimitive(OsmPrimitive osm) {
if (osm instanceof Way) {
((Way) osm).setNodes(null);
@@ -384,7 +379,7 @@ public class DataSetMerger {
/**
* Runs the merge operation. Successfully merged {@link OsmPrimitive}s are in
- * {@link #getMyDataSet()}.
+ * {@link #getTargetDataSet()}.
*
* See {@link #getConflicts()} for a map of conflicts after the merge operation.
*/
@@ -394,7 +389,7 @@ public class DataSetMerger {
/**
* Runs the merge operation. Successfully merged {@link OsmPrimitive}s are in
- * {@link #getMyDataSet()}.
+ * {@link #getTargetDataSet()}.
*
* See {@link #getConflicts()} for a map of conflicts after the merge operation.
*/
@@ -406,7 +401,7 @@ public class DataSetMerger {
}
targetDataSet.beginUpdate();
try {
- ArrayList<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes());
+ List<? extends OsmPrimitive> candidates = new ArrayList<Node>(targetDataSet.getNodes());
for (Node node: sourceDataSet.getNodes()) {
mergePrimitive(node, candidates);
if (progressMonitor != null) {
@@ -442,7 +437,7 @@ public class DataSetMerger {
/**
* replies my dataset
*
- * @return
+ * @return the own (target) data set
*/
public DataSet getTargetDataSet() {
return targetDataSet;
diff --git a/src/org/openstreetmap/josm/data/osm/DataSource.java b/src/org/openstreetmap/josm/data/osm/DataSource.java
index e7c7bcc..c35206a 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSource.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSource.java
@@ -1,16 +1,32 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+/**
+ * A data source, defined by bounds and textual description for the origin.
+ * @since 247
+ */
public class DataSource {
+ /**
+ * The bounds of this data source
+ */
public final Bounds bounds;
+ /**
+ * The textual description of the origin (example: "OpenStreetMap Server")
+ */
public final String origin;
+ /**
+ * Constructs a new {@code DataSource}.
+ * @param bounds The bounds of this data source
+ * @param origin The textual description of the origin (example: "OpenStreetMap Server")
+ * @throws IllegalArgumentException if bounds is {@code null}
+ */
public DataSource(Bounds bounds, String origin) {
+ CheckParameterUtil.ensureParameterNotNull(bounds, "bounds");
this.bounds = bounds;
this.origin = origin;
- if (bounds == null)
- throw new NullPointerException();
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java b/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java
index d7d5777..0413646 100644
--- a/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java
+++ b/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java
@@ -80,7 +80,7 @@ public class DatasetConsistencyTest {
if (!n.isIncomplete() && !n.isDeleted()) {
LatLon c = n.getCoor();
if (c != null) {
- BBox box = new BBox(new LatLon(c.lat() - 0.0001, c.lon() - 0.0001), new LatLon(c.lat() + 0.0001, c.lon() + 0.0001));
+ BBox box = c.toBBox(0.0001);
if (!dataSet.searchNodes(box).contains(n)) {
printError("SEARCH NODES", "%s not found using Dataset.searchNodes()", n);
}
diff --git a/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java b/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
index 0d8e5cb..d671fa7 100644
--- a/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/DefaultChangesetCacheEvent.java
@@ -20,15 +20,19 @@ public class DefaultChangesetCacheEvent implements ChangesetCacheEvent{
removed = new HashSet<Changeset>();
}
+ @Override
public Collection<Changeset> getAddedChangesets() {
return Collections.unmodifiableCollection(added);
}
+ @Override
public Collection<Changeset> getRemovedChangesets() {
return Collections.unmodifiableCollection(removed);
}
+ @Override
public ChangesetCache getSource() {
return source;
}
+ @Override
public Collection<Changeset> getUpdatedChangesets() {
return Collections.unmodifiableCollection(modified);
}
diff --git a/src/org/openstreetmap/josm/data/osm/Filter.java b/src/org/openstreetmap/josm/data/osm/Filter.java
index 146a173..297de34 100644
--- a/src/org/openstreetmap/josm/data/osm/Filter.java
+++ b/src/org/openstreetmap/josm/data/osm/Filter.java
@@ -7,7 +7,6 @@ import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
import org.openstreetmap.josm.data.Preferences.pref;
import org.openstreetmap.josm.data.Preferences.writeExplicitly;
-import org.openstreetmap.josm.tools.Utils;
/**
*
@@ -20,9 +19,13 @@ public class Filter extends SearchSetting {
public boolean hiding = false;
public boolean inverted = false;
+ /**
+ * Constructs a new {@code Filter}.
+ */
public Filter() {
super("", SearchMode.add, false, false, false);
}
+
public Filter(String text, SearchMode mode, boolean caseSensitive,
boolean regexSearch, boolean allElements) {
super(text, mode, caseSensitive, regexSearch, allElements);
diff --git a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
index 9071d3f..fa0a8dd 100644
--- a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
+++ b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
@@ -16,7 +16,7 @@ import org.openstreetmap.josm.tools.SubclassFilteredCollection;
* Class that encapsulates the filter logic, i.e. applies a list of
* filters to a primitive.
*
- * Uses {@link SearchCompiler.Match#match} to see if the filter expression matches,
+ * Uses {@link Match#match} to see if the filter expression matches,
* cares for "inverted-flag" of the filters and combines the results of all active
* filters.
*
diff --git a/src/org/openstreetmap/josm/data/osm/FilterWorker.java b/src/org/openstreetmap/josm/data/osm/FilterWorker.java
index e3be66b..fb1c4c0 100644
--- a/src/org/openstreetmap/josm/data/osm/FilterWorker.java
+++ b/src/org/openstreetmap/josm/data/osm/FilterWorker.java
@@ -11,7 +11,12 @@ import org.openstreetmap.josm.tools.Utils;
*
* @author Petr_Dlouhý
*/
-public class FilterWorker {
+public final class FilterWorker {
+
+ private FilterWorker() {
+ // Hide default constructor for utils classes
+ }
+
/**
* Apply the filters to the primitives of the data set.
*
diff --git a/src/org/openstreetmap/josm/data/osm/Hash.java b/src/org/openstreetmap/josm/data/osm/Hash.java
index 37e0eef..bd33a89 100644
--- a/src/org/openstreetmap/josm/data/osm/Hash.java
+++ b/src/org/openstreetmap/josm/data/osm/Hash.java
@@ -1,23 +1,4 @@
-/*
- * JOSMng - a Java Open Street Map editor, the next generation.
- *
- * Copyright (C) 2008 Petr Nejedly <P.Nejedly at sh.cvut.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
/**
diff --git a/src/org/openstreetmap/josm/data/osm/IPrimitive.java b/src/org/openstreetmap/josm/data/osm/IPrimitive.java
index ff60451..f2f1fad 100644
--- a/src/org/openstreetmap/josm/data/osm/IPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/IPrimitive.java
@@ -30,7 +30,7 @@ public interface IPrimitive extends Tagged, PrimitiveId {
int getChangesetId();
void setChangesetId(int changesetId);
- void visit(PrimitiveVisitor visitor);
+ void accept(PrimitiveVisitor visitor);
String getName();
String getLocalName();
diff --git a/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java b/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java
index c42491d..29e2d1f 100644
--- a/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java
+++ b/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java
@@ -34,7 +34,7 @@ public class MultipolygonCreate {
/**
* Creates a polygon from single way.
- * @param way
+ * @param way the way to form the polygon
*/
public JoinedPolygon(Way way) {
this.ways = Collections.singletonList(way);
@@ -45,7 +45,7 @@ public class MultipolygonCreate {
/**
* Builds a list of nodes for this polygon. First node is not duplicated as last node.
- * @return
+ * @return list of nodes
*/
private List<Node> getNodes() {
List<Node> nodes = new ArrayList<Node>();
@@ -102,9 +102,10 @@ public class MultipolygonCreate {
}
/**
- * Splits ways into inner and outer JoinedWays. Sets innerWays and outerWays to the result.
- * TODO: Currently cannot process touching polygons. See code in JoinAreasAction.
- * @return error description if the ways cannot be split. Null if all fine.
+ * Splits ways into inner and outer JoinedWays. Sets {@link #innerWays} and {@link #outerWays} to the result.
+ * TODO: Currently cannot process touching polygons. See code in JoinAreasAction.
+ * @param ways ways to analyze
+ * @return error description if the ways cannot be split, {@code null} if all fine.
*/
public String makeFromWays(Collection<Way> ways){
List<JoinedPolygon> joinedWays = new ArrayList<JoinedPolygon>();
@@ -184,9 +185,9 @@ public class MultipolygonCreate {
}
/**
- * This method analyzes which ways are inner and which outer. Sets innerWays and outerWays to the result.
- * @param joinedWays
- * @return error description if the ways cannot be split. Null if all fine.
+ * This method analyzes which ways are inner and which outer. Sets {@link #innerWays} and {@link #outerWays} to the result.
+ * @param polygons polygons to analyze
+ * @return error description if the ways cannot be split, {@code null} if all fine.
*/
private String makeFromPolygons(List<JoinedPolygon> polygons) {
List<PolygonLevel> list = findOuterWaysRecursive(0, polygons);
@@ -214,7 +215,7 @@ public class MultipolygonCreate {
/**
* Collects outer way and corresponding inner ways from all boundaries.
* @param boundaryWays
- * @return the outermostWay, or null if intersection found.
+ * @return the outermostWay, or {@code null} if intersection found.
*/
private List<PolygonLevel> findOuterWaysRecursive(int level, Collection<JoinedPolygon> boundaryWays) {
@@ -254,7 +255,7 @@ public class MultipolygonCreate {
PolygonLevel pol = new PolygonLevel(outerWay, level);
//process inner ways
- if (innerCandidates.size() > 0) {
+ if (!innerCandidates.isEmpty()) {
List<PolygonLevel> innerList = this.findOuterWaysRecursive(level + 1, innerCandidates);
if (innerList == null) {
return null; //intersection found
diff --git a/src/org/openstreetmap/josm/data/osm/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index 84d827d..c2b23f7 100644
--- a/src/org/openstreetmap/josm/data/osm/Node.java
+++ b/src/org/openstreetmap/josm/data/osm/Node.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import org.openstreetmap.josm.Main;
@@ -62,18 +62,18 @@ public final class Node extends OsmPrimitive implements INode {
/**
* <p>Replies the projected east/north coordinates.</p>
- *
+ *
* <p>Uses the {@link Main#getProjection() global projection} to project the lan/lon-coordinates.
* Internally caches the projected coordinates.</p>
*
* <p><strong>Caveat:</strong> doesn't listen to projection changes. Clients must
* {@link #invalidateEastNorthCache() invalidate the internal cache}.</p>
- *
+ *
* <p>Replies {@code null} if this node doesn't know lat/lon-coordinates, i.e. because it is an incomplete node.
- *
+ *
* @return the east north coordinates or {@code null}
* @see #invalidateEastNorthCache()
- *
+ *
*/
@Override
public final EastNorth getEastNorth() {
@@ -112,6 +112,9 @@ public final class Node extends OsmPrimitive implements INode {
this.lat = Double.NaN;
this.lon = Double.NaN;
invalidateEastNorthCache();
+ if (isVisible()) {
+ setIncomplete(true);
+ }
}
}
@@ -148,13 +151,13 @@ public final class Node extends OsmPrimitive implements INode {
/**
* Constructs an identical clone of the argument.
* @param clone The node to clone
- * @param clearId If true, set version to 0 and id to new unique value
+ * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. If {@code false}, does nothing
*/
- public Node(Node clone, boolean clearId) {
+ public Node(Node clone, boolean clearMetadata) {
super(clone.getUniqueId(), true /* allow negative IDs */);
cloneFrom(clone);
- if (clearId) {
- clearOsmId();
+ if (clearMetadata) {
+ clearOsmMetadata();
}
}
@@ -192,12 +195,12 @@ public final class Node extends OsmPrimitive implements INode {
}
@Override
- public void visit(Visitor visitor) {
+ public void accept(Visitor visitor) {
visitor.visit(this);
}
@Override
- public void visit(PrimitiveVisitor visitor) {
+ public void accept(PrimitiveVisitor visitor) {
visitor.visit(this);
}
@@ -263,7 +266,7 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
- if (other == null || ! (other instanceof Node) )
+ if (!(other instanceof Node))
return false;
if (! super.hasEqualSemanticAttributes(other))
return false;
@@ -301,7 +304,7 @@ public final class Node extends OsmPrimitive implements INode {
@Override
public void updatePosition() {
}
-
+
@Override
public boolean isDrawable() {
// Not possible to draw a node without coordinates.
@@ -310,9 +313,9 @@ public final class Node extends OsmPrimitive implements INode {
/**
* Check whether this node connects 2 ways.
- *
+ *
* @return true if isReferredByWays(2) returns true
- * @see #isReferredByWays(int)
+ * @see #isReferredByWays(int)
*/
public boolean isConnectionNode() {
return isReferredByWays(2);
@@ -327,4 +330,10 @@ public final class Node extends OsmPrimitive implements INode {
this.east = Double.NaN;
this.north = Double.NaN;
}
+
+ @Override
+ public boolean concernsArea() {
+ // A node cannot be an area
+ return false;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/NodeData.java b/src/org/openstreetmap/josm/data/osm/NodeData.java
index ccfd847..5590ea7 100644
--- a/src/org/openstreetmap/josm/data/osm/NodeData.java
+++ b/src/org/openstreetmap/josm/data/osm/NodeData.java
@@ -72,7 +72,7 @@ public class NodeData extends PrimitiveData implements INode {
}
@Override
- public void visit(PrimitiveVisitor visitor) {
+ public void accept(PrimitiveVisitor visitor) {
visitor.visit(this);
}
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index 63086ec..a43d307 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -29,7 +29,7 @@ import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
/**
* The base class for OSM objects ({@link Node}, {@link Way}, {@link Relation}).
- *
+ *
* It can be created, deleted and uploaded to the OSM-Server.
*
* Although OsmPrimitive is designed as a base class, it is not to be meant to subclass
@@ -139,8 +139,8 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
* @param type the type to filter for
* @return the sub-set of OSM primitives of type <code>type</code>
*/
- static public <T extends OsmPrimitive> LinkedHashSet<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
- LinkedHashSet<T> ret = new LinkedHashSet<T>();
+ static public <T extends OsmPrimitive> Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
+ Set<T> ret = new LinkedHashSet<T>();
if (set != null) {
for(OsmPrimitive p: set) {
if (type.isInstance(p)) {
@@ -382,19 +382,20 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
}
/**
- * Clears the id and version known to the OSM API. The id and the version is set to 0.
- * incomplete is set to false. It's preferred to use copy constructor with clearId set to true instead
- * of calling this method.
+ * Clears the metadata, including id and version known to the OSM API.
+ * The id is a new unique id. The version, changeset and timestamp are set to 0.
+ * incomplete and deleted are set to false. It's preferred to use copy constructor with clearMetadata set to true instead
*
* <strong>Caution</strong>: Do not use this method on primitives which are already added to a {@link DataSet}.
*
* @throws DataIntegrityProblemException If primitive was already added to the dataset
+ * @since 6140
*/
@Override
- public void clearOsmId() {
+ public void clearOsmMetadata() {
if (dataSet != null)
throw new DataIntegrityProblemException("Method cannot be called after primitive was added to the dataset");
- super.clearOsmId();
+ super.clearOsmMetadata();
}
@Override
@@ -619,7 +620,7 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
private static volatile Collection<String> workinprogress = null;
private static volatile Collection<String> uninteresting = null;
private static volatile Collection<String> discardable = null;
-
+
/**
* Returns a list of "uninteresting" keys that do not make an object
* "tagged". Entries that end with ':' are causing a whole namespace to be considered
@@ -648,16 +649,53 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
public static Collection<String> getDiscardableKeys() {
if (discardable == null) {
discardable = Main.pref.getCollection("tags.discardable",
- Arrays.asList("created_by",
- "tiger:upload_uuid", "tiger:tlid", "tiger:source", "tiger:separated",
- "geobase:datasetName", "geobase:uuid", "sub_sea:type",
- "odbl", "odbl:note",
- "yh:LINE_NAME", "yh:LINE_NUM", "yh:STRUCTURE", "yh:TOTYUMONO",
- "yh:TYPE", "yh:WIDTH_RANK"));
+ Arrays.asList(
+ "created_by",
+ "geobase:datasetName",
+ "geobase:uuid",
+ "KSJ2:ADS",
+ "KSJ2:ARE",
+ "KSJ2:AdminArea",
+ "KSJ2:COP_label",
+ "KSJ2:DFD",
+ "KSJ2:INT",
+ "KSJ2:INT_label",
+ "KSJ2:LOC",
+ "KSJ2:LPN",
+ "KSJ2:OPC",
+ "KSJ2:PubFacAdmin",
+ "KSJ2:RAC",
+ "KSJ2:RAC_label",
+ "KSJ2:RIC",
+ "KSJ2:RIN",
+ "KSJ2:WSC",
+ "KSJ2:coordinate",
+ "KSJ2:curve_id",
+ "KSJ2:curve_type",
+ "KSJ2:filename",
+ "KSJ2:lake_id",
+ "KSJ2:lat",
+ "KSJ2:long",
+ "KSJ2:river_id",
+ "odbl",
+ "odbl:note",
+ "SK53_bulk:load",
+ "sub_sea:type",
+ "tiger:source",
+ "tiger:separated",
+ "tiger:tlid",
+ "tiger:upload_uuid",
+ "yh:LINE_NAME",
+ "yh:LINE_NUM",
+ "yh:STRUCTURE",
+ "yh:TOTYUMONO",
+ "yh:TYPE",
+ "yh:WIDTH_RANK"
+ ));
}
return discardable;
}
-
+
/**
* Returns a list of "work in progress" keys that do not make an object
* "tagged" but "annotated".
@@ -706,7 +744,7 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
try {
reversedDirectionKeys = SearchCompiler.compile(Main.pref.get("tags.reversed_direction", reversedDirectionDefault), false, false);
} catch (ParseError e) {
- System.err.println("Unable to compile pattern for tags.reversed_direction, trying default pattern: " + e.getMessage());
+ Main.error("Unable to compile pattern for tags.reversed_direction, trying default pattern: " + e.getMessage());
try {
reversedDirectionKeys = SearchCompiler.compile(reversedDirectionDefault, false, false);
@@ -717,7 +755,7 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
try {
directionKeys = SearchCompiler.compile(Main.pref.get("tags.direction", directionDefault), false, false);
} catch (ParseError e) {
- System.err.println("Unable to compile pattern for tags.direction, trying default pattern: " + e.getMessage());
+ Main.error("Unable to compile pattern for tags.direction, trying default pattern: " + e.getMessage());
try {
directionKeys = SearchCompiler.compile(directionDefault, false, false);
@@ -730,7 +768,9 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
private void updateTagged() {
if (keys != null) {
for (String key: keySet()) {
- if (!isUninterestingKey(key)) {
+ // 'area' is not really uninteresting (putting it in that list may have unpredictable side effects)
+ // but it's clearly not enough to consider an object as tagged (see #9261)
+ if (!isUninterestingKey(key) && !"area".equals(key)) {
updateFlagsNoLock(FLAG_TAGGED, true);
return;
}
@@ -761,7 +801,7 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
public boolean isTagged() {
return (flags & FLAG_TAGGED) != 0;
}
-
+
/**
* Determines if this object is considered "annotated". To be "annotated", an object
* must have one or more "work in progress" tags, such as "note" or "fixme".
@@ -980,13 +1020,13 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
else if (this.referrers instanceof OsmPrimitive) {
OsmPrimitive ref = (OsmPrimitive) this.referrers;
if (ref.dataSet == dataSet) {
- ref.visit(visitor);
+ ref.accept(visitor);
}
} else if (this.referrers instanceof OsmPrimitive[]) {
OsmPrimitive[] refs = (OsmPrimitive[]) this.referrers;
for (OsmPrimitive ref: refs) {
if (ref.dataSet == dataSet) {
- ref.visit(visitor);
+ ref.accept(visitor);
}
}
}
@@ -1026,7 +1066,7 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
* visitor function.
* @param visitor The visitor from which the visit() function must be called.
*/
- abstract public void visit(Visitor visitor);
+ abstract public void accept(Visitor visitor);
/**
* Get and write all attributes from the parameter. Does not fire any listener, so
@@ -1088,7 +1128,6 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
if (!isNew() && id != other.id)
return false;
- // if (isIncomplete() && ! other.isIncomplete() || !isIncomplete() && other.isIncomplete())
if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
return false;
// can't do an equals check on the internal keys array because it is not ordered
@@ -1272,4 +1311,27 @@ abstract public class OsmPrimitive extends AbstractPrimitive implements Comparab
}
return ret;
}
+
+ /**
+ * Determines if this primitive has tags denoting an area.
+ * @return {@code true} if this primitive has tags denoting an area, {@code false} otherwise.
+ * @since 6491
+ */
+ public final boolean hasAreaTags() {
+ return hasKey("landuse")
+ || "yes".equals(get("area"))
+ || "riverbank".equals(get("waterway"))
+ || hasKey("natural")
+ || hasKey("amenity")
+ || hasKey("leisure")
+ || hasKey("building")
+ || hasKey("building:part");
+ }
+
+ /**
+ * Determines if this primitive semantically concerns an area.
+ * @return {@code true} if this primitive semantically concerns an area, according to its type, geometry and tags, {@code false} otherwise.
+ * @since 6491
+ */
+ public abstract boolean concernsArea();
}
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
index 84fd9e3..bd5cfa1 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
@@ -1,14 +1,15 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.Map;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
/** Comparator, comparing by type and objects display names */
public class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
- final private HashMap<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
+ final private Map<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
final private DefaultNameFormatter df = DefaultNameFormatter.getInstance();
public boolean relationsFirst = false;
@@ -54,6 +55,7 @@ public class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
return -1;
}
+ @Override
public int compare(OsmPrimitive a, OsmPrimitive b) {
if (a.getType().equals(b.getType()))
return compareName(a, b);
diff --git a/src/org/openstreetmap/josm/data/osm/OsmUtils.java b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
index 54166dd..1047673 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmUtils.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmUtils.java
@@ -3,15 +3,20 @@ package org.openstreetmap.josm.data.osm;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Locale;
-public class OsmUtils {
+public final class OsmUtils {
+
+ private OsmUtils() {
+ // Hide default constructor for utils classes
+ }
- static ArrayList<String> TRUE_VALUES = new ArrayList<String>(Arrays
+ static List<String> TRUE_VALUES = new ArrayList<String>(Arrays
.asList(new String[] { "true", "yes", "1", "on" }));
- static ArrayList<String> FALSE_VALUES = new ArrayList<String>(Arrays
+ static List<String> FALSE_VALUES = new ArrayList<String>(Arrays
.asList(new String[] { "false", "no", "0", "off" }));
- static ArrayList<String> REVERSE_VALUES = new ArrayList<String>(Arrays
+ static List<String> REVERSE_VALUES = new ArrayList<String>(Arrays
.asList(new String[] { "reverse", "-1" }));
public static final String trueval = "yes";
diff --git a/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java b/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
index 69362fd..e542a76 100644
--- a/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
+++ b/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java
@@ -48,11 +48,13 @@ public class PrimitiveDeepCopy {
new AbstractVisitor() {
boolean firstIteration;
+ @Override
public void visit(Node n) {
if (!visitedNodeIds.add(n.getUniqueId()))
return;
(firstIteration ? directlyAdded : referenced).add(n.save());
}
+ @Override
public void visit(Way w) {
if (!visitedWayIds.add(w.getUniqueId()))
return;
@@ -62,20 +64,21 @@ public class PrimitiveDeepCopy {
visit(n);
}
}
+ @Override
public void visit(Relation r) {
if (!visitedRelationIds.add(r.getUniqueId()))
return;
(firstIteration ? directlyAdded : referenced).add(r.save());
firstIteration = false;
for (RelationMember m : r.getMembers()) {
- m.getMember().visit(this);
+ m.getMember().accept(this);
}
}
public void visitAll() {
for (OsmPrimitive osm : primitives) {
firstIteration = true;
- osm.visit(this);
+ osm.accept(this);
}
}
}.visitAll();
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index fccd771..5ffb4ba 100644
--- a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
+++ b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
@@ -1,13 +1,13 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
-import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.coor.QuadTiling;
@@ -18,76 +18,53 @@ import org.openstreetmap.josm.data.coor.QuadTiling;
* This class is (no longer) thread safe.
*
*/
-public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
-{
- //private static boolean debug = false;
+public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
private static final boolean consistency_testing = false;
private static final int NW_INDEX = 1;
private static final int NE_INDEX = 3;
private static final int SE_INDEX = 2;
private static final int SW_INDEX = 0;
- static void abort(String s)
- {
+ static void abort(String s) {
throw new AssertionError(s);
}
- static void out(String s)
- {
- System.out.println(s);
- }
- // periodic output
- long last_out = -1;
- void pout(String s)
- {
- long now = System.currentTimeMillis();
- if (now - last_out < 300)
- return;
- last_out = now;
- System.out.print(s + "\r");
- }
- void pout(String s, int i, int total)
- {
- long now = System.currentTimeMillis();
- if ((now - last_out < 300) &&
- ((i+1) < total))
- return;
- last_out = now;
- // cast to float to keep the output size down
- System.out.print(s + " " + (float)((i+1)*100.0/total) + "% done \r");
- }
public static final int MAX_OBJECTS_PER_LEVEL = 16;
- class QBLevel
- {
- final int level;
+
+ static class QBLevel<T extends OsmPrimitive> {
+ private final int level;
+ private final int index;
private final BBox bbox;
- final long quad;
- final QBLevel parent;
+ private final long quad;
+ private final QBLevel<T> parent;
private boolean isLeaf = true;
- public List<T> content;
- public QBLevel nw, ne, sw, se;
+ private List<T> content;
+ // child order by index is sw, nw, se, ne
+ private QBLevel<T> nw, ne, sw, se;
+
+ private final QuadBuckets<T> buckets;
- private QBLevel getChild(int index) {
+ private QBLevel<T> getChild(int index) {
switch (index) {
case NE_INDEX:
if (ne == null) {
- ne = new QBLevel(this, index);
+ ne = new QBLevel<T>(this, index, buckets);
}
return ne;
case NW_INDEX:
if (nw == null) {
- nw = new QBLevel(this, index);
+ nw = new QBLevel<T>(this, index, buckets);
}
return nw;
case SE_INDEX:
if (se == null) {
- se = new QBLevel(this, index);
+ se = new QBLevel<T>(this, index, buckets);
}
return se;
case SW_INDEX:
if (sw == null) {
- sw = new QBLevel(this, index);
+ sw = new QBLevel<T>(this, index, buckets);
}
return sw;
default:
@@ -95,77 +72,65 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
}
}
- private QBLevel[] getChildren() {
- // This is ugly and hackish. But, it seems to work,
- // and using an ArrayList here seems to cost us
- // a significant performance penalty -- 50% in my
- // testing. Child access is one of the single
- // hottest code paths in this entire class.
- QBLevel[] result = (QBLevel[]) Array.newInstance(this.getClass(), QuadTiling.TILES_PER_LEVEL);
- result[NW_INDEX] = nw;
- result[NE_INDEX] = ne;
- result[SW_INDEX] = sw;
- result[SE_INDEX] = se;
- return result;
+ @SuppressWarnings("unchecked")
+ private QBLevel<T>[] getChildren() {
+ return new QBLevel[] {sw, nw, se, ne};
}
@Override
- public String toString() {
- return super.toString()+ "["+level+"]: " + bbox();
+ public String toString() {
+ return super.toString() + "[" + level + "]: " + bbox();
}
+
/**
* Constructor for root node
*/
- public QBLevel() {
+ public QBLevel(final QuadBuckets<T> buckets) {
level = 0;
+ index = 0;
quad = 0;
parent = null;
bbox = new BBox(-180, 90, 180, -90);
+ this.buckets = buckets;
}
- public QBLevel(QBLevel parent, int parent_index) {
+ public QBLevel(QBLevel<T> parent, int parent_index, final QuadBuckets<T> buckets) {
this.parent = parent;
this.level = parent.level + 1;
+ this.index = parent_index;
+ this.buckets = buckets;
+
int shift = (QuadTiling.NR_LEVELS - level) * 2;
long mult = 1;
- // Java blows the big one. It seems to wrap when
- // you shift by > 31
+ // Java blows the big one. It seems to wrap when you shift by > 31
if (shift >= 30) {
shift -= 30;
- mult = 1<<30;
+ mult = 1 << 30;
}
long this_quadpart = mult * (parent_index << shift);
this.quad = parent.quad | this_quadpart;
this.bbox = calculateBBox(); // calculateBBox reference quad
- /*if (debug) {
- out("new level["+this.level+"] bbox["+parent_index+"]: " + this.bbox()
- + " coor: " + this.coor()
- + " quadpart: " + Long.toHexString(this_quadpart)
- + " quad: " + Long.toHexString(this.quad));
- }*/
}
private BBox calculateBBox() {
LatLon bottom_left = this.coor();
double lat = bottom_left.lat() + parent.height() / 2;
double lon = bottom_left.lon() + parent.width() / 2;
- LatLon top_right = new LatLon(lat, lon);
- return new BBox(bottom_left, top_right);
+ return new BBox(bottom_left.lon(), bottom_left.lat(), lon, lat);
}
- QBLevel findBucket(BBox bbox) {
+ QBLevel<T> findBucket(BBox bbox) {
if (!hasChildren())
return this;
else {
- int index = get_index(bbox, level);
- if (index == -1)
+ int idx = bbox.getIndex(level);
+ if (idx == -1)
return this;
- return getChild(index).findBucket(bbox);
+ return getChild(idx).findBucket(bbox);
}
}
- boolean remove_content(T o)
- {
+ boolean remove_content(T o) {
// If two threads try to remove item at the same time from different buckets of this QBLevel,
// it might happen that one thread removes bucket but don't remove parent because it still sees
// another bucket set. Second thread do the same. Due to thread memory caching, it's possible that
@@ -174,7 +139,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
if (content == null)
return false;
boolean ret = this.content.remove(o);
- if (this.content.size() == 0) {
+ if (this.content.isEmpty()) {
this.content = null;
}
if (this.canRemove()) {
@@ -182,31 +147,7 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
}
return ret;
}
- // Get the correct index for the given primitive
- // at the given level. If the primitive can not
- // fit into a single quad at this level, return -1
- int get_index(BBox bbox, int level) {
- int index = -1;
- for (LatLon c : bbox.points()) {
- /*if (debug) {
- out("getting index for point: " + c);
- }*/
- if (index == -1) {
- index = QuadTiling.index(c, level);
- /*if (debug) {
- out("set initial index to: " + index);
- }*/
- continue;
- }
- int another_index = QuadTiling.index(c, level);
- /*if (debug) {
- out("other point index: " + another_index);
- }*/
- if (another_index != index)
- return -1;
- }
- return index;
- }
+
/*
* There is a race between this and qb.nextContentNode().
* If nextContentNode() runs into this bucket, it may
@@ -214,50 +155,40 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
* is a dead end.
*/
void __split() {
- /*if (debug) {
- out("splitting "+this.bbox()+" level "+level+" with "
- + content.size() + " entries (my dimensions: "
- + this.bbox().width()+", "+this.bbox().height()+")");
- }*/
List<T> tmpcontent = content;
content = null;
- for (T o: tmpcontent) {
- int index = get_index(o.getBBox(), level);
- if (index == -1) {
+ for (T o : tmpcontent) {
+ int idx = o.getBBox().getIndex(level);
+ if (idx == -1) {
__add_content(o);
} else {
- getChild(index).doAdd(o);
+ getChild(idx).doAdd(o);
}
}
isLeaf = false; // It's not enough to check children because all items could end up in this level (index == -1)
}
- boolean __add_content(T o)
- {
+ boolean __add_content(T o) {
boolean ret = false;
- // The split_lock will keep two concurrent
- // calls from overwriting content
+ // The split_lock will keep two concurrent calls from overwriting content
if (content == null) {
content = new ArrayList<T>();
}
ret = content.add(o);
- /*if (debug && !this.isLeaf()) {
- pout("added "+o.getClass().getName()+" to non-leaf with size: " + content.size());
- }*/
return ret;
}
- boolean matches(T o, BBox search_bbox)
- {
- // This can be optimized when o is a node
- //return search_bbox.bounds(coor));
+
+ boolean matches(final T o, final BBox search_bbox) {
+ if (o instanceof Node){
+ final LatLon latLon = ((Node)o).getCoor();
+ // node without coords -> bbox[0,0,0,0]
+ return search_bbox.bounds(latLon != null ? latLon : LatLon.ZERO);
+ }
return o.getBBox().intersects(search_bbox);
}
- private void search_contents(BBox search_bbox, List<T> result)
- {
- /*if (debug) {
- out("searching contents (size: " + content == null?"<null>":content.size() + ") for " + search_bbox);
- }*/
+
+ private void search_contents(BBox search_bbox, List<T> result) {
/*
* It is possible that this was created in a split
* but never got any content populated.
@@ -270,70 +201,37 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
result.add(o);
}
}
- /*if (debug) {
- out("done searching quad " + Long.toHexString(this.quad));
- }*/
}
+
/*
- * This is stupid. I tried to have a QBLeaf and QBBranch
- * class decending from a QBLevel. It's more than twice
- * as slow. So, this throws OO out the window, but it
- * is fast. Runtime type determination must be slow.
+ * This is stupid. I tried to have a QBLeaf and QBBranch
+ * class descending from a QBLevel. It's more than twice
+ * as slow. So, this throws OO out the window, but it
+ * is fast. Runtime type determination must be slow.
*/
boolean isLeaf() {
return isLeaf;
}
+
boolean hasChildren() {
return nw != null || ne != null || sw != null || se != null;
}
- QBLevel next_sibling()
- {
- boolean found_me = false;
- if (parent == null)
- return null;
- int __nr = 0;
- for (QBLevel sibling : parent.getChildren()) {
- __nr++;
- int nr = __nr-1;
- if (sibling == null) {
- /*if (debug) {
- out("[" + this.level + "] null child nr: " + nr);
- }*/
- continue;
- }
- // We're looking for the *next* child
- // after us.
- if (sibling == this) {
- /*if (debug) {
- out("[" + this.level + "] I was child nr: " + nr);
- }*/
- found_me = true;
- continue;
- }
- if (found_me)
- /*if (debug) {
- out("[" + this.level + "] next sibling was child nr: " + nr);
- }*/
- return sibling;
- }
- return null;
+ QBLevel<T> next_sibling() {
+ return (parent == null) ? null : parent.firstSiblingOf(this);
}
- boolean hasContent()
- {
+
+ boolean hasContent() {
return content != null;
}
- QBLevel nextSibling()
- {
- QBLevel next = this;
- QBLevel sibling = next.next_sibling();
+
+ QBLevel<T> nextSibling() {
+ QBLevel<T> next = this;
+ QBLevel<T> sibling = next.next_sibling();
// Walk back up the tree to find the
// next sibling node. It may be either
// a leaf or branch.
while (sibling == null) {
- /*if (debug) {
- out("no siblings at level["+next.level+"], moving to parent");
- }*/
next = next.parent;
if (next == null) {
break;
@@ -343,27 +241,39 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
next = sibling;
return next;
}
- QBLevel firstChild()
- {
- QBLevel ret = null;
- for (QBLevel child : getChildren()) {
- if (child == null) {
- continue;
- }
- ret = child;
- break;
+
+ QBLevel<T> firstChild() {
+ if (sw != null)
+ return sw;
+ if (nw != null)
+ return nw;
+ if (se != null)
+ return se;
+ return ne;
+ }
+
+ QBLevel<T> firstSiblingOf(final QBLevel<T> child) {
+ switch (child.index) {
+ case SW_INDEX:
+ if (nw != null)
+ return nw;
+ case NW_INDEX:
+ if (se != null)
+ return se;
+ case SE_INDEX:
+ return ne;
}
- return ret;
+ return null;
}
- QBLevel nextNode()
- {
+
+ QBLevel<T> nextNode() {
if (!this.hasChildren())
return this.nextSibling();
return this.firstChild();
}
- QBLevel nextContentNode()
- {
- QBLevel next = this.nextNode();
+
+ QBLevel<T> nextContentNode() {
+ QBLevel<T> next = this.nextNode();
if (next == null)
return next;
if (next.hasContent())
@@ -374,14 +284,8 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
void doAdd(T o) {
if (consistency_testing) {
if (!matches(o, this.bbox())) {
- /*out("-----------------------------");
- debug = true;*/
- get_index(o.getBBox(), level);
- get_index(o.getBBox(), level-1);
- int nr = 0;
- /*for (QBLevel sibling : parent.getChildren()) {
- out("sibling["+ (nr++) +"]: " + sibling.bbox() + " this: " + (this==sibling));
- }*/
+ o.getBBox().getIndex(level);
+ o.getBBox().getIndex(level - 1);
abort("\nobject " + o + " does not belong in node at level: " + level + " bbox: " + this.bbox());
}
}
@@ -395,30 +299,17 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
findBucket(o.getBBox()).doAdd(o);
}
- private void search(BBox search_bbox, List<T> result)
- {
- /*if (debug) {
- System.out.print("[" + level + "] qb bbox: " + this.bbox() + " ");
- }*/
+ private void search(BBox search_bbox, List<T> result) {
if (!this.bbox().intersects(search_bbox))
- /*if (debug) {
- out("miss " + Long.toHexString(this.quad));
- //QuadTiling.tile2xy(this.quad);
- }*/
return;
else if (bbox().bounds(search_bbox)) {
- search_cache = this;
+ buckets.search_cache = this;
}
if (this.hasContent()) {
search_contents(search_bbox, result);
}
- /*if (debug) {
- out("hit " + this.quads());
- out("[" + level + "] not leaf, moving down");
- }*/
-
//TODO Coincidence vector should be calculated here and only buckets that match search_bbox should be checked
if (nw != null) {
@@ -434,19 +325,20 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
sw.search(search_bbox, result);
}
}
- public String quads()
- {
+
+ public String quads() {
return Long.toHexString(quad);
}
- int index_of(QBLevel find_this)
- {
- QBLevel[] children = getChildren();
+
+ int index_of(QBLevel<T> find_this) {
+ QBLevel<T>[] children = getChildren();
for (int i = 0; i < QuadTiling.TILES_PER_LEVEL; i++) {
if (children[i] == find_this)
return i;
}
return -1;
}
+
double width() {
return bbox.width();
}
@@ -458,16 +350,16 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
public BBox bbox() {
return bbox;
}
+
/*
* This gives the coordinate of the bottom-left
* corner of the box
*/
- LatLon coor()
- {
+ LatLon coor() {
return QuadTiling.tile2LatLon(this.quad);
}
- void remove_from_parent()
- {
+
+ void remove_from_parent() {
if (parent == null)
return;
@@ -489,9 +381,9 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
parent.remove_from_parent();
}
}
- boolean canRemove()
- {
- if (content != null && content.size() > 0)
+
+ boolean canRemove() {
+ if (content != null && !content.isEmpty())
return false;
if (this.hasChildren())
return false;
@@ -499,31 +391,33 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
}
}
- private QBLevel root;
- private QBLevel search_cache;
+ private QBLevel<T> root;
+ private QBLevel<T> search_cache;
private int size;
- public QuadBuckets()
- {
+ /**
+ * Constructs a new {@code QuadBuckets}.
+ */
+ public QuadBuckets() {
clear();
}
- public void clear() {
- root = new QBLevel();
+
+ @Override
+ public void clear() {
+ root = new QBLevel<T>(this);
search_cache = null;
size = 0;
- /*if (debug) {
- out("QuadBuckets() cleared: " + this);
- out("root: " + root + " level: " + root.level + " bbox: " + root.bbox());
- }*/
}
+
+ @Override
public boolean add(T n) {
root.add(n);
size++;
return true;
}
- public boolean retainAll(Collection<?> objects)
- {
+ @Override
+ public boolean retainAll(Collection<?> objects) {
for (T o : this) {
if (objects.contains(o)) {
continue;
@@ -533,119 +427,110 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
}
return true;
}
- public boolean removeAll(Collection<?> objects)
- {
+
+ @Override
+ public boolean removeAll(Collection<?> objects) {
boolean changed = false;
for (Object o : objects) {
changed = changed | remove(o);
}
return changed;
}
- public boolean addAll(Collection<? extends T> objects)
- {
+
+ @Override
+ public boolean addAll(Collection<? extends T> objects) {
boolean changed = false;
for (T o : objects) {
changed = changed | this.add(o);
}
return changed;
}
- public boolean containsAll(Collection<?> objects)
- {
+
+ @Override
+ public boolean containsAll(Collection<?> objects) {
for (Object o : objects) {
if (!this.contains(o))
return false;
}
return true;
}
+
+ @Override
public boolean remove(Object o) {
- @SuppressWarnings("unchecked") T t = (T) o;
+ @SuppressWarnings("unchecked")
+ T t = (T) o;
search_cache = null; // Search cache might point to one of removed buckets
- QBLevel bucket = root.findBucket(t.getBBox());
+ QBLevel<T> bucket = root.findBucket(t.getBBox());
if (bucket.remove_content(t)) {
size--;
return true;
} else
return false;
}
+
+ @Override
public boolean contains(Object o) {
- @SuppressWarnings("unchecked") T t = (T) o;
- QBLevel bucket = root.findBucket(t.getBBox());
+ @SuppressWarnings("unchecked")
+ T t = (T) o;
+ QBLevel<T> bucket = root.findBucket(t.getBBox());
return bucket != null && bucket.content != null && bucket.content.contains(t);
}
- public ArrayList<T> toArrayList()
- {
+ public ArrayList<T> toArrayList() {
ArrayList<T> a = new ArrayList<T>();
for (T n : this) {
a.add(n);
}
- /*if (debug) {
- out("returning array list with size: " + a.size());
- }*/
return a;
}
- public Object[] toArray()
- {
+
+ @Override
+ public Object[] toArray() {
return this.toArrayList().toArray();
}
- public <A> A[] toArray(A[] template)
- {
+
+ @Override
+ public <A> A[] toArray(A[] template) {
return this.toArrayList().toArray(template);
}
- class QuadBucketIterator implements Iterator<T>
- {
- QBLevel current_node;
+
+ class QuadBucketIterator implements Iterator<T> {
+ QBLevel<T> current_node;
int content_index;
int iterated_over;
- QBLevel next_content_node(QBLevel q)
- {
+
+ QBLevel<T> next_content_node(QBLevel<T> q) {
if (q == null)
return null;
- QBLevel orig = q;
- QBLevel next;
+ QBLevel<T> orig = q;
+ QBLevel<T> next;
next = q.nextContentNode();
- //if (consistency_testing && (orig == next))
if (orig == next) {
abort("got same leaf back leaf: " + q.isLeaf());
}
return next;
}
- public QuadBucketIterator(QuadBuckets<T> qb)
- {
- /*if (debug) {
- out(this + " is a new iterator qb: " + qb + " size: " + qb.size());
- }*/
+
+ public QuadBucketIterator(QuadBuckets<T> qb) {
if (!qb.root.hasChildren() || qb.root.hasContent()) {
current_node = qb.root;
} else {
current_node = next_content_node(qb.root);
}
- /*if (debug) {
- out("\titerator first leaf: " + current_node);
- }*/
iterated_over = 0;
}
- public boolean hasNext()
- {
+
+ @Override
+ public boolean hasNext() {
if (this.peek() == null)
- /*if (debug) {
- out(this + " no hasNext(), but iterated over so far: " + iterated_over);
- }*/
return false;
return true;
}
- T peek()
- {
+
+ T peek() {
if (current_node == null)
- /*if (debug) {
- out("null current leaf, nowhere to go");
- }*/
return null;
- while((current_node.content == null) ||
- (content_index >= current_node.content.size())) {
- /*if (debug) {
- out("moving to next leaf");
- }*/
+ while ((current_node.content == null) || (content_index >= current_node.content.size())) {
content_index = 0;
current_node = next_content_node(current_node);
if (current_node == null) {
@@ -653,29 +538,20 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
}
}
if (current_node == null || current_node.content == null)
- /*if (debug) {
- out("late nowhere to go " + current_node);
- }*/
return null;
return current_node.content.get(content_index);
}
- public T next()
- {
+
+ @Override
+ public T next() {
T ret = peek();
content_index++;
- /*if (debug) {
- out("iteration["+iterated_over+"] " + content_index + " leaf: " + current_node);
- }*/
iterated_over++;
- if (ret == null) {
- /*if (debug) {
- out(this + " no next node, but iterated over so far: " + iterated_over);
- }*/
- }
return ret;
}
- public void remove()
- {
+
+ @Override
+ public void remove() {
// two uses
// 1. Back up to the thing we just returned
// 2. move the index back since we removed
@@ -685,58 +561,47 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
current_node.remove_content(object);
}
}
- public Iterator<T> iterator()
- {
+
+ @Override
+ public Iterator<T> iterator() {
return new QuadBucketIterator(this);
}
+
+ @Override
public int size() {
return size;
}
- public boolean isEmpty()
- {
+ @Override
+ public boolean isEmpty() {
if (this.size() == 0)
return true;
return false;
}
+
public List<T> search(BBox search_bbox) {
- /*if (debug) {
- out("qb root search at " + search_bbox);
- out("root bbox: " + root.bbox());
- }*/
List<T> ret = new ArrayList<T>();
- // Doing this cuts down search cost on a real-life data
- // set by about 25%
+ // Doing this cuts down search cost on a real-life data set by about 25%
boolean cache_searches = true;
if (cache_searches) {
if (search_cache == null) {
search_cache = root;
}
- // Walk back up the tree when the last
- // search spot can not cover the current
- // search
+ // Walk back up the tree when the last search spot can not cover the current search
while (search_cache != null && !search_cache.bbox().bounds(search_bbox)) {
- /*if (debug) {
- out("bbox: " + search_bbox);
- out("search_cache: " + search_cache + " level: " + search_cache.level);
- out("search_cache.bbox(): " + search_cache.bbox());
- }*/
search_cache = search_cache.parent;
- /*if (debug) {
- out("new search_cache: " + search_cache);
- }*/
}
if (search_cache == null) {
search_cache = root;
- out("bbox: " + search_bbox + " is out of the world");
+ Main.info("bbox: " + search_bbox + " is out of the world");
}
} else {
search_cache = root;
}
// Save parent because search_cache might change during search call
- QBLevel tmp = search_cache.parent;
+ QBLevel<T> tmp = search_cache.parent;
search_cache.search(search_bbox, ret);
@@ -746,9 +611,6 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
tmp.search_contents(search_bbox, ret);
tmp = tmp.parent;
}
- /*if (debug) {
- out("search of QuadBuckets for " + search_bbox + " ret len: " + ret.size());
- }*/
return ret;
}
@@ -756,24 +618,24 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
printTreeRecursive(root, 0);
}
- private void printTreeRecursive(QBLevel level, int indent) {
+ private void printTreeRecursive(QBLevel<T> level, int indent) {
if (level == null) {
printIndented(indent, "<empty child>");
return;
}
printIndented(indent, level);
if (level.hasContent()) {
- for (T o:level.content) {
+ for (T o : level.content) {
printIndented(indent, o);
}
}
- for (QBLevel child:level.getChildren()) {
+ for (QBLevel<T> child : level.getChildren()) {
printTreeRecursive(child, indent + 2);
}
}
private void printIndented(int indent, Object msg) {
- for (int i=0; i<indent; i++) {
+ for (int i = 0; i < indent; i++) {
System.out.print(' ');
}
System.out.println(msg);
diff --git a/src/org/openstreetmap/josm/data/osm/Relation.java b/src/org/openstreetmap/josm/data/osm/Relation.java
index 71dfe15..be38f35 100644
--- a/src/org/openstreetmap/josm/data/osm/Relation.java
+++ b/src/org/openstreetmap/josm/data/osm/Relation.java
@@ -163,11 +163,11 @@ public final class Relation extends OsmPrimitive implements IRelation {
return members[idx].getType();
}
- @Override public void visit(Visitor visitor) {
+ @Override public void accept(Visitor visitor) {
visitor.visit(this);
}
- @Override public void visit(PrimitiveVisitor visitor) {
+ @Override public void accept(PrimitiveVisitor visitor) {
visitor.visit(this);
}
@@ -182,16 +182,22 @@ public final class Relation extends OsmPrimitive implements IRelation {
super(0, false);
}
- public Relation(Relation clone, boolean clearId) {
+ /**
+ * Constructs an identical clone of the argument.
+ * @param clone The relation to clone
+ * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. If {@code false}, does nothing
+ */
+ public Relation(Relation clone, boolean clearMetadata) {
super(clone.getUniqueId(), true);
cloneFrom(clone);
- if (clearId) {
- clearOsmId();
+ if (clearMetadata) {
+ clearOsmMetadata();
}
}
/**
* Create an identical clone of the argument (including the id)
+ * @param clone The relation to clone, including its id
*/
public Relation(Relation clone) {
this(clone, false);
@@ -280,7 +286,7 @@ public final class Relation extends OsmPrimitive implements IRelation {
@Override
public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
- if (other == null || ! (other instanceof Relation) )
+ if (!(other instanceof Relation))
return false;
if (! super.hasEqualSemanticAttributes(other))
return false;
@@ -360,7 +366,7 @@ public final class Relation extends OsmPrimitive implements IRelation {
boolean locked = writeLock();
try {
- ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
+ List<RelationMember> todelete = new ArrayList<RelationMember>();
for (RelationMember member: members) {
if (primitives.contains(member.getMember())) {
todelete.add(member);
@@ -541,4 +547,9 @@ public final class Relation extends OsmPrimitive implements IRelation {
}
}
}
+
+ @Override
+ public boolean concernsArea() {
+ return isMultipolygon() && hasAreaTags();
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/RelationData.java b/src/org/openstreetmap/josm/data/osm/RelationData.java
index 3b42dce..9705903 100644
--- a/src/org/openstreetmap/josm/data/osm/RelationData.java
+++ b/src/org/openstreetmap/josm/data/osm/RelationData.java
@@ -63,7 +63,7 @@ public class RelationData extends PrimitiveData implements IRelation {
}
@Override
- public void visit(PrimitiveVisitor visitor) {
+ public void accept(PrimitiveVisitor visitor) {
visitor.visit(this);
}
diff --git a/src/org/openstreetmap/josm/data/osm/RelationMember.java b/src/org/openstreetmap/josm/data/osm/RelationMember.java
index 86a1867..2657b4f 100644
--- a/src/org/openstreetmap/josm/data/osm/RelationMember.java
+++ b/src/org/openstreetmap/josm/data/osm/RelationMember.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+import java.util.Arrays;
+
/**
* A linkage class that can be used by an relation to keep a list of
* members. Since membership may be qualified by a "role", a simple
@@ -20,7 +22,7 @@ public class RelationMember implements PrimitiveId {
private final OsmPrimitive member;
/**
- *
+ * Returns the role of this relation member.
* @return Role name or "". Never returns null
* @since 1930
*/
@@ -29,7 +31,7 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Determines if this relation member has a role.
* @return True if role is set
* @since 1930
*/
@@ -38,7 +40,17 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Determines if this relation member's role is in the given list.
+ * @param roles The roles to look after
+ * @return True if role is in the given list
+ * @since 6305
+ */
+ public boolean hasRole(String ... roles) {
+ return Arrays.asList(roles).contains(role);
+ }
+
+ /**
+ * Determines if this relation member is a relation.
* @return True if member is relation
* @since 1937
*/
@@ -47,7 +59,7 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Determines if this relation member is a way.
* @return True if member is way
* @since 1937
*/
@@ -65,7 +77,7 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Determines if this relation member is a node.
* @return True if member is node
* @since 1937
*/
@@ -74,7 +86,7 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Returns the relation member as a relation.
* @return Member as relation
* @since 1937
*/
@@ -83,7 +95,7 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Returns the relation member as a way.
* @return Member as way
* @since 1937
*/
@@ -92,7 +104,7 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Returns the relation member as a node.
* @return Member as node
* @since 1937
*/
@@ -101,7 +113,7 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Returns the relation member.
* @return Member. Returned value is never null.
* @since 1937
*/
@@ -110,10 +122,10 @@ public class RelationMember implements PrimitiveId {
}
/**
- *
+ * Constructs a new {@code RelationMember}.
* @param role Can be null, in this case it's save as ""
* @param member Cannot be null
- * @throw IllegalArgumentException thrown if member is null
+ * @throws IllegalArgumentException thrown if member is <code>null</code>
*/
public RelationMember(String role, OsmPrimitive member) throws IllegalArgumentException{
if (role == null) {
@@ -170,6 +182,7 @@ public class RelationMember implements PrimitiveId {
/**
* PrimitiveId implementation. Returns the same value as getMember().getType()
*/
+ @Override
public OsmPrimitiveType getType() {
return member.getType();
}
@@ -177,10 +190,12 @@ public class RelationMember implements PrimitiveId {
/**
* PrimitiveId implementation. Returns the same value as getMemberType().getUniqueId()
*/
+ @Override
public long getUniqueId() {
return member.getUniqueId();
}
+ @Override
public boolean isNew() {
return member.isNew();
}
diff --git a/src/org/openstreetmap/josm/data/osm/RelationMemberData.java b/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
index c49b557..2e230de 100644
--- a/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
+++ b/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
@@ -20,11 +20,11 @@ public class RelationMemberData implements PrimitiveId {
public long getMemberId() {
return memberId;
}
-
+
public String getRole() {
return role;
}
-
+
public OsmPrimitiveType getMemberType() {
return memberType;
}
diff --git a/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java b/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
index 2dcdc26..e4ad7cc 100644
--- a/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
+++ b/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java
@@ -14,14 +14,17 @@ public class SimplePrimitiveId implements PrimitiveId, Serializable {
this.type = type;
}
+ @Override
public OsmPrimitiveType getType() {
return type;
}
+ @Override
public long getUniqueId() {
return id;
}
+ @Override
public boolean isNew() {
return id <= 0;
}
diff --git a/src/org/openstreetmap/josm/data/osm/Storage.java b/src/org/openstreetmap/josm/data/osm/Storage.java
index 90486ec..7cee4f5 100644
--- a/src/org/openstreetmap/josm/data/osm/Storage.java
+++ b/src/org/openstreetmap/josm/data/osm/Storage.java
@@ -1,23 +1,4 @@
-/*
- * JOSMng - a Java Open Street Map editor, the next generation.
- *
- * Copyright (C) 2008 Petr Nejedly <P.Nejedly at sh.cvut.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import java.util.AbstractSet;
@@ -89,10 +70,12 @@ public class Storage<T> extends AbstractSet<T> {
public static class PrimitiveIdHash implements Hash<PrimitiveId, PrimitiveId> {
+ @Override
public int getHashCode(PrimitiveId k) {
return (int)k.getUniqueId() ^ k.getType().hashCode();
}
+ @Override
public boolean equals(PrimitiveId key, PrimitiveId value) {
if (key == null || value == null) return false;
return key.getUniqueId() == value.getUniqueId() && key.getType() == value.getType();
@@ -109,10 +92,16 @@ public class Storage<T> extends AbstractSet<T> {
private final boolean safeIterator;
private boolean arrayCopyNecessary;
+ /**
+ * Constructs a new {@code Storage} with default capacity (16).
+ */
public Storage() {
this(Storage.<T>defaultHash(), DEFAULT_CAPACITY, false);
}
+ /**
+ * Constructs a new {@code Storage} with given capacity.
+ */
public Storage(int capacity) {
this(Storage.<T>defaultHash(), capacity, false);
}
@@ -141,7 +130,7 @@ public class Storage<T> extends AbstractSet<T> {
* @param ha
* @param capacity
* @param safeIterator If set to false, you must not modify the Storage
- * while iterating over it. If set to true, you can savely
+ * while iterating over it. If set to true, you can safely
* modify, but the read-only iteration will happen on a copy
* of the unmodified Storage.
* This is similar to CopyOnWriteArrayList.
@@ -360,9 +349,11 @@ public class Storage<T> extends AbstractSet<T> {
*/
public static <O> Hash<O,O> defaultHash() {
return new Hash<O,O>() {
+ @Override
public int getHashCode(O t) {
return t.hashCode();
}
+ @Override
public boolean equals(O t1, O t2) {
return t1.equals(t2);
}
@@ -381,42 +372,49 @@ public class Storage<T> extends AbstractSet<T> {
}
*/
- private class FMap<K> implements Map<K,T> {
+ private final class FMap<K> implements Map<K,T> {
Hash<K,? super T> fHash;
private FMap(Hash<K,? super T> h) {
fHash = h;
}
+ @Override
public int size() {
return Storage.this.size();
}
+ @Override
public boolean isEmpty() {
return Storage.this.isEmpty();
}
+ @Override
public boolean containsKey(Object o) {
@SuppressWarnings("unchecked") K key = (K) o;
int bucket = getBucket(fHash, key);
return bucket >= 0;
}
+ @Override
public boolean containsValue(Object value) {
return Storage.this.contains(value);
}
+ @Override
public T get(Object o) {
@SuppressWarnings("unchecked") K key = (K) o;
int bucket = getBucket(fHash, key);
return bucket < 0 ? null : data[bucket];
}
+ @Override
public T put(K key, T value) {
if (!fHash.equals(key, value)) throw new IllegalArgumentException("inconsistent key");
return Storage.this.put(value);
}
+ @Override
public T remove(Object o) {
modCount++;
@SuppressWarnings("unchecked") K key = (K) o;
@@ -425,9 +423,10 @@ public class Storage<T> extends AbstractSet<T> {
return bucket < 0 ? null : doRemove(bucket);
}
+ @Override
public void putAll(Map<? extends K, ? extends T> m) {
if (m instanceof Storage.FMap) {
- Storage.this.addAll(((Storage.FMap)m).values());
+ Storage.this.addAll(m.values());
} else {
for (Map.Entry<? extends K, ? extends T> e : m.entrySet()) {
put(e.getKey(), e.getValue());
@@ -435,18 +434,22 @@ public class Storage<T> extends AbstractSet<T> {
}
}
+ @Override
public void clear() {
Storage.this.clear();
}
+ @Override
public Set<K> keySet() {
throw new UnsupportedOperationException();
}
+ @Override
public Collection<T> values() {
return Storage.this;
}
+ @Override
public Set<Entry<K, T>> entrySet() {
throw new UnsupportedOperationException();
}
@@ -460,16 +463,19 @@ public class Storage<T> extends AbstractSet<T> {
this.data = data;
}
+ @Override
public boolean hasNext() {
align();
return slot < data.length;
}
+ @Override
public T next() {
if (!hasNext()) throw new NoSuchElementException();
return data[slot++];
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -491,17 +497,20 @@ public class Storage<T> extends AbstractSet<T> {
mods = modCount;
}
+ @Override
public boolean hasNext() {
align();
return slot < data.length;
}
+ @Override
public T next() {
if (!hasNext()) throw new NoSuchElementException();
removeSlot = slot;
return data[slot++];
}
+ @Override
public void remove() {
if (removeSlot == -1) throw new IllegalStateException();
diff --git a/src/org/openstreetmap/josm/data/osm/TagCollection.java b/src/org/openstreetmap/josm/data/osm/TagCollection.java
index 2e5bcf5..e02e091 100644
--- a/src/org/openstreetmap/josm/data/osm/TagCollection.java
+++ b/src/org/openstreetmap/josm/data/osm/TagCollection.java
@@ -138,7 +138,7 @@ public class TagCollection implements Iterable<Tag> {
return tags;
}
- private final HashSet<Tag> tags = new HashSet<Tag>();
+ private final Set<Tag> tags = new HashSet<Tag>();
/**
* Creates an empty tag collection
@@ -484,6 +484,7 @@ public class TagCollection implements Iterable<Tag> {
*
* @return the iterator
*/
+ @Override
public Iterator<Tag> iterator() {
return tags.iterator();
}
@@ -581,7 +582,7 @@ public class TagCollection implements Iterable<Tag> {
/**
* Replies true if for every key there is one tag only, i.e. exactly one value.
*
- * @return
+ * @return {@code true} if for every key there is one tag only
*/
public boolean isApplicableToPrimitive() {
return size() == getKeys().size();
@@ -600,7 +601,7 @@ public class TagCollection implements Iterable<Tag> {
if (! isApplicableToPrimitive())
throw new IllegalStateException(tr("Tag collection cannot be applied to a primitive because there are keys with multiple values."));
for (Tag tag: tags) {
- if (tag.getValue() == null || tag.getValue().equals("")) {
+ if (tag.getValue() == null || tag.getValue().isEmpty()) {
primitive.remove(tag.getKey());
} else {
primitive.put(tag.getKey(), tag.getValue());
diff --git a/src/org/openstreetmap/josm/data/osm/TigerUtils.java b/src/org/openstreetmap/josm/data/osm/TigerUtils.java
index 97032ba..4fa4df3 100644
--- a/src/org/openstreetmap/josm/data/osm/TigerUtils.java
+++ b/src/org/openstreetmap/josm/data/osm/TigerUtils.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Dave Hansen and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import java.util.Set;
@@ -8,12 +8,20 @@ import java.util.TreeSet;
* A simple class to keep helper functions for merging TIGER data
*
* @author daveh
- *
+ * @since 529
*/
-public class TigerUtils {
+public final class TigerUtils {
+
+ private TigerUtils() {
+ // Hide default constructor for utils classes
+ }
- public static boolean isTigerTag(String tag)
- {
+ /**
+ * Determines if the given tag is a TIGER one
+ * @param tag The tag to check
+ * @return {@code true} if {@code tag} starts with {@code tiger:} namespace
+ */
+ public static boolean isTigerTag(String tag) {
if (tag.indexOf("tiger:") == -1)
return false;
return true;
@@ -27,7 +35,7 @@ public class TigerUtils {
public static Object tagObj(String name) {
if (tagIsInt(name))
- return new Integer(name);
+ return Integer.valueOf(name);
return name;
}
@@ -43,13 +51,14 @@ public class TigerUtils {
return value;
}
}
- String combined = "";
+ StringBuilder combined = new StringBuilder();
for (Object part : resultSet) {
- if (combined.length() > 0)
- combined += ":";
- combined += part;
+ if (combined.length() > 0) {
+ combined.append(":");
+ }
+ combined.append(part);
}
- return combined;
+ return combined.toString();
}
public static String combineTags(String name, String t1, String t2) {
diff --git a/src/org/openstreetmap/josm/data/osm/User.java b/src/org/openstreetmap/josm/data/osm/User.java
index d198283..9b888b5 100644
--- a/src/org/openstreetmap/josm/data/osm/User.java
+++ b/src/org/openstreetmap/josm/data/osm/User.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -7,6 +7,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import org.openstreetmap.josm.tools.Utils;
@@ -20,14 +22,14 @@ import org.openstreetmap.josm.tools.Utils;
*
*
*/
-public class User {
+public final class User {
static private AtomicLong uidCounter = new AtomicLong();
/**
* the map of known users
*/
- private static HashMap<Long,User> userMap = new HashMap<Long,User>();
+ private static Map<Long,User> userMap = new HashMap<Long,User>();
private final static User anonymous = createLocalUser(tr("<anonymous>"));
private static long getNextLocalUid() {
@@ -38,6 +40,7 @@ public class User {
* Creates a local user with the given name
*
* @param name the name
+ * @return a new local user with the given name
*/
public static User createLocalUser(String name) {
for(long i = -1; i >= uidCounter.get(); --i)
@@ -56,6 +59,7 @@ public class User {
*
* @param uid the user id
* @param name the name
+ * @return a new OSM user with the given name and uid
*/
public static User createOsmUser(long uid, String name) {
User user = userMap.get(uid);
@@ -106,19 +110,23 @@ public class User {
return ret;
}
+ /**
+ * Replies the anonymous user
+ * @return The anonymous user
+ */
public static User getAnonymous() {
return anonymous;
}
/** the user name */
- private final HashSet<String> names = new HashSet<String>();
+ private final Set<String> names = new HashSet<String>();
/** the user id */
private final long uid;
/**
* Replies the user name
*
- * @return the user name. Never null, but may be the empty string
+ * @return the user name. Never <code>null</code>, but may be the empty string
*/
public String getName() {
return Utils.join("/", names);
@@ -127,9 +135,9 @@ public class User {
/**
* Returns the list of user names
*
- * @returns list of names
+ * @return list of names
*/
- public ArrayList<String> getNames() {
+ public List<String> getNames() {
return new ArrayList<String>(names);
}
@@ -146,6 +154,7 @@ public class User {
* Returns true if the name is in the names list
*
* @param name
+ * @return <code>true</code> if the name is in the names list
*/
public boolean hasName(String name) {
return names.contains(name);
@@ -159,6 +168,7 @@ public class User {
* application is closed and there is no guarantee that a negative local user id is
* always bound to a user with the same name.
*
+ * @return the user id
*/
public long getId() {
return uid;
@@ -172,10 +182,18 @@ public class User {
}
}
+ /**
+ * Determines if this user is known to OSM
+ * @return {@code true} if this user is known to OSM, {@code false} otherwise
+ */
public boolean isOsmUser() {
return uid > 0;
}
+ /**
+ * Determines if this user is local
+ * @return {@code true} if this user is local, {@code false} otherwise
+ */
public boolean isLocalUser() {
return uid < 0;
}
@@ -202,9 +220,9 @@ public class User {
@Override
public String toString() {
StringBuffer s = new StringBuffer();
- s.append("id:"+uid);
+ s.append("id:").append(uid);
if (names.size() == 1) {
- s.append(" name:"+getName());
+ s.append(" name:").append(getName());
}
else if (names.size() > 1) {
s.append(String.format(" %d names:%s", names.size(), getName()));
diff --git a/src/org/openstreetmap/josm/data/osm/UserInfo.java b/src/org/openstreetmap/josm/data/osm/UserInfo.java
index e9cc3b0..6c38215 100644
--- a/src/org/openstreetmap/josm/data/osm/UserInfo.java
+++ b/src/org/openstreetmap/josm/data/osm/UserInfo.java
@@ -21,7 +21,12 @@ public class UserInfo {
private String description;
/** the list of preferred languages */
private List<String> languages;
+ /** the number of unread messages */
+ private int unreadMessages;
+ /**
+ * Constructs a new {@code UserInfo}.
+ */
public UserInfo() {
id = 0;
}
@@ -70,4 +75,22 @@ public class UserInfo {
public void setHomeZoom(int homeZoom) {
this.homeZoom = homeZoom;
}
+
+ /**
+ * Replies the number of unread messages
+ * @return the number of unread messages
+ * @since 6349
+ */
+ public final int getUnreadMessages() {
+ return unreadMessages;
+ }
+
+ /**
+ * Sets the number of unread messages
+ * @param unreadMessages the number of unread messages
+ * @since 6349
+ */
+ public final void setUnreadMessages(int unreadMessages) {
+ this.unreadMessages = unreadMessages;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/Way.java b/src/org/openstreetmap/josm/data/osm/Way.java
index 8778dc0..04af6e8 100644
--- a/src/org/openstreetmap/josm/data/osm/Way.java
+++ b/src/org/openstreetmap/josm/data/osm/Way.java
@@ -1,13 +1,13 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.HashSet;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -95,9 +95,9 @@ public final class Way extends OsmPrimitive implements IWay {
}
/**
- * Replies the number of nodes in this ways.
+ * Replies the number of nodes in this way.
*
- * @return the number of nodes in this ways.
+ * @return the number of nodes in this way.
* @since 1862
*/
@Override
@@ -106,6 +106,20 @@ public final class Way extends OsmPrimitive implements IWay {
}
/**
+ * Replies the real number of nodes in this way (full number of nodes minus one if this way is closed)
+ *
+ * @return the real number of nodes in this way.
+ * @since 5847
+ *
+ * @see #getNodesCount()
+ * @see #isClosed()
+ */
+ public int getRealNodesCount() {
+ int count = getNodesCount();
+ return isClosed() ? count-1 : count;
+ }
+
+ /**
* Replies the node at position <code>index</code>.
*
* @param index the position
@@ -136,8 +150,8 @@ public final class Way extends OsmPrimitive implements IWay {
if (node == null) return false;
Node[] nodes = this.nodes;
- for (int i=0; i<nodes.length; i++) {
- if (nodes[i].equals(node))
+ for (Node n : nodes) {
+ if (n.equals(node))
return true;
}
return false;
@@ -168,9 +182,9 @@ public final class Way extends OsmPrimitive implements IWay {
}
/**
- * Replies the ordered {@link List} of chunks of this way. Each chunk is replied as a {@link Pair} of {@link Node nodes}.
- * @param sort If true, the nodes of each pair are sorted as defined by {@link Pair#sort}.
- * If false, Pair.a and Pair.b are in the way order (i.e for a given Pair(n), Pair(n-1).b == Pair(n).a, Pair(n).b == Pair(n+1).a, etc.)
+ * Replies the ordered {@link List} of chunks of this way. Each chunk is replied as a {@link Pair} of {@link Node nodes}.
+ * @param sort If true, the nodes of each pair are sorted as defined by {@link Pair#sort}.
+ * If false, Pair.a and Pair.b are in the way order (i.e for a given Pair(n), Pair(n-1).b == Pair(n).a, Pair(n).b == Pair(n+1).a, etc.)
* @return The ordered list of chunks of this way.
* @since 3348
*/
@@ -194,11 +208,11 @@ public final class Way extends OsmPrimitive implements IWay {
return chunkSet;
}
- @Override public void visit(Visitor visitor) {
+ @Override public void accept(Visitor visitor) {
visitor.visit(this);
}
- @Override public void visit(PrimitiveVisitor visitor) {
+ @Override public void accept(PrimitiveVisitor visitor) {
visitor.visit(this);
}
@@ -217,14 +231,14 @@ public final class Way extends OsmPrimitive implements IWay {
/**
* Contructs a new {@code Way} from an existing {@code Way}.
* @param original The original {@code Way} to be identically cloned. Must not be null
- * @param clearId If true, clears the OSM id as defined by {@link #clearOsmId}. If false, does nothing
+ * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. If {@code false}, does nothing
* @since 2410
*/
- public Way(Way original, boolean clearId) {
+ public Way(Way original, boolean clearMetadata) {
super(original.getUniqueId(), true);
cloneFrom(original);
- if (clearId) {
- clearOsmId();
+ if (clearMetadata) {
+ clearOsmMetadata();
}
}
@@ -312,7 +326,7 @@ public final class Way extends OsmPrimitive implements IWay {
@Override
public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
- if (other == null || ! (other instanceof Way) )
+ if (!(other instanceof Way))
return false;
if (! super.hasEqualSemanticAttributes(other))
return false;
@@ -479,7 +493,7 @@ public final class Way extends OsmPrimitive implements IWay {
Node[] nodes = this.nodes;
return nodes.length >= 3 && nodes[nodes.length-1] == nodes[0];
}
-
+
/**
* Determines if this way denotes an area (closed way with at least three distinct nodes).
* @return {@code true} if this way is closed and contains at least three distinct nodes
@@ -667,7 +681,7 @@ public final class Way extends OsmPrimitive implements IWay {
/**
* Tests if this way is a oneway.
- * @return {@code 1} if the way is a oneway,
+ * @return {@code 1} if the way is a oneway,
* {@code -1} if the way is a reversed oneway,
* {@code 0} otherwise.
* @since 5199
@@ -706,4 +720,9 @@ public final class Way extends OsmPrimitive implements IWay {
public Node lastNode(boolean respectOneway) {
return !respectOneway || isOneway() != -1 ? lastNode() : firstNode();
}
+
+ @Override
+ public boolean concernsArea() {
+ return hasAreaTags();
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/WayData.java b/src/org/openstreetmap/josm/data/osm/WayData.java
index 56c5a31..27dd1d9 100644
--- a/src/org/openstreetmap/josm/data/osm/WayData.java
+++ b/src/org/openstreetmap/josm/data/osm/WayData.java
@@ -59,7 +59,7 @@ public class WayData extends PrimitiveData implements IWay {
}
@Override
- public void visit(PrimitiveVisitor visitor) {
+ public void accept(PrimitiveVisitor visitor) {
visitor.visit(this);
}
diff --git a/src/org/openstreetmap/josm/data/osm/WaySegment.java b/src/org/openstreetmap/josm/data/osm/WaySegment.java
index 5360001..878beff 100644
--- a/src/org/openstreetmap/josm/data/osm/WaySegment.java
+++ b/src/org/openstreetmap/josm/data/osm/WaySegment.java
@@ -1,10 +1,10 @@
-// License: GPL. Copyright 2007 by Gabriel Ebner
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
/**
* A segment consisting of 2 consecutive nodes out of a way.
*/
-public final class WaySegment {
+public final class WaySegment implements Comparable<WaySegment> {
/**
* The way.
*/
@@ -21,17 +21,25 @@ public final class WaySegment {
lowerIndex = i;
}
- public Node getFirstNode(){
+ /**
+ * Returns the first node of the way segment.
+ * @return the first node
+ */
+ public Node getFirstNode() {
return way.getNode(lowerIndex);
}
+ /**
+ * Returns the second (last) node of the way segment.
+ * @return the second node
+ */
public Node getSecondNode(){
return way.getNode(lowerIndex + 1);
}
/**
- * returns this way segment as complete way.
- * @return
+ * Returns this way segment as complete way.
+ * @return the way segment as {@code Way}
*/
public Way toWay() {
Way w = new Way();
@@ -41,7 +49,7 @@ public final class WaySegment {
}
@Override public boolean equals(Object o) {
- return o != null && o instanceof WaySegment
+ return o instanceof WaySegment
&& ((WaySegment) o).way == way
&& ((WaySegment) o).lowerIndex == lowerIndex;
}
@@ -49,4 +57,9 @@ public final class WaySegment {
@Override public int hashCode() {
return way.hashCode() ^ lowerIndex;
}
+
+ @Override
+ public int compareTo(WaySegment o) {
+ return equals(o) ? 0 : toWay().compareTo(o.toWay());
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java b/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java
index 87f81f5..85285f4 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java
@@ -1,24 +1,5 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.event;
-/*
- * JOSMng - a Java Open Street Map editor, the next generation.
-
- *
- * Copyright (C) 2008 Petr Nejedly <P.Nejedly at sh.cvut.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
/**
* A listener listening for all DataSet changes.
@@ -31,7 +12,7 @@ public interface DataSetListener {
* A bunch of primitives were added into the DataSet, or existing
* deleted/invisible primitives were resurrected.
*
- * @param added A collection of newly-visible primitives
+ * @param event An event for an collection of newly-visible primitives
*/
void primitivesAdded(PrimitivesAddedEvent event);
@@ -39,7 +20,7 @@ public interface DataSetListener {
* A bunch of primitives were removed from the DataSet, or preexisting
* primitives were marked as deleted.
*
- * @param removed A collection of newly-invisible primitives
+ * @param event An event for an collection of newly-invisible primitives
*/
void primitivesRemoved(PrimitivesRemovedEvent event);
@@ -47,38 +28,38 @@ public interface DataSetListener {
* There was some change in the tag set of a primitive. It can have been
* a tag addition, tag removal or change in tag value.
*
- * @param prim the primitive, whose tags were affected.
+ * @param event the event for the primitive, whose tags were affected.
*/
void tagsChanged(TagsChangedEvent event);
/**
* A node's coordinates were modified.
- * @param node The node that was moved.
+ * @param event The event for the node that was moved.
*/
void nodeMoved(NodeMovedEvent event);
/**
* A way's node list was changed.
- * @param way The way that was modified.
+ * @param event The event for the way that was modified.
*/
void wayNodesChanged(WayNodesChangedEvent event);
/**
* A relation's members have changed.
- * @param relation The relation that was modified.
+ * @param event The event for the relation that was modified.
*/
void relationMembersChanged(RelationMembersChangedEvent event);
/**
* Minor dataset change, currently only changeset id changed is supported, but can
* be extended in future.
- * @param event
+ * @param event the event for data modification
*/
void otherDatasetChange(AbstractDatasetChangedEvent event);
/**
* Called after big changes in dataset. Usually other events are stopped using Dataset.beginUpdate() and
- * after operation is completed (Dataset.endUpdate()), {@link #dataChanged()} is called.
+ * after operation is completed (Dataset.endUpdate()), {@link #dataChanged(DataChangedEvent event)} is called.
*/
void dataChanged(DataChangedEvent event);
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java b/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
index c070b62..0201e44 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
@@ -19,34 +19,42 @@ public class DataSetListenerAdapter implements DataSetListener {
this.listener = listener;
}
+ @Override
public void dataChanged(DataChangedEvent event) {
listener.processDatasetEvent(event);
}
+ @Override
public void nodeMoved(NodeMovedEvent event) {
listener.processDatasetEvent(event);
}
+ @Override
public void primitivesAdded(PrimitivesAddedEvent event) {
listener.processDatasetEvent(event);
}
+ @Override
public void primitivesRemoved(PrimitivesRemovedEvent event) {
listener.processDatasetEvent(event);
}
+ @Override
public void relationMembersChanged(RelationMembersChangedEvent event) {
listener.processDatasetEvent(event);
}
+ @Override
public void tagsChanged(TagsChangedEvent event) {
listener.processDatasetEvent(event);
}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {
listener.processDatasetEvent(event);
}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {
listener.processDatasetEvent(event);
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
index 5e6ff51..5f94ea6 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
@@ -21,7 +21,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
* (it's no longer necessary to register for layer events and reregister every time
* new layer is selected)
*
- * Events in EDT are supported, see {@link #addDatasetListener(DataSetListener, FireMode}
+ * Events in EDT are supported, see {@link #addDatasetListener(DataSetListener, FireMode)}
*
*/
public class DatasetEventManager implements MapView.EditLayerChangeListener, Listener {
@@ -29,7 +29,13 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
private static final DatasetEventManager instance = new DatasetEventManager();
public enum FireMode {
+ /**
+ * Fire in calling thread immediately.
+ */
IMMEDIATELY,
+ /**
+ * Fire in event dispatch thread.
+ */
IN_EDT,
/**
* Fire in event dispatch thread. If more than one event arrived when event queue is checked, merged them to
@@ -72,9 +78,10 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
/**
* Register listener, that will receive events from currently active dataset
- * @param listener
- * @param fireInEDT If true, listener will be notified in event dispatch thread
- * instead of thread that caused the dataset change
+ * @param listener the listener to be registered
+ * @param fireMode If {@link FireMode#IN_EDT} or {@link FireMode#IN_EDT_CONSOLIDATED},
+ * listener will be notified in event dispatch thread instead of thread that caused
+ * the dataset change
*/
public void addDatasetListener(DataSetListener listener, FireMode fireMode) {
if (fireMode == FireMode.IN_EDT || fireMode == FireMode.IN_EDT_CONSOLIDATED) {
@@ -90,6 +97,7 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
normalListeners.remove(searchListener);
}
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
if (oldLayer != null) {
oldLayer.data.removeDataSetListener(myListener);
@@ -119,6 +127,7 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
}
}
+ @Override
public void processDatasetEvent(AbstractDatasetChangedEvent event) {
fireEvents(normalListeners, event);
eventsInEDT.add(event);
@@ -126,6 +135,7 @@ public class DatasetEventManager implements MapView.EditLayerChangeListener, Lis
}
private final Runnable edtRunnable = new Runnable() {
+ @Override
public void run() {
while (!eventsInEDT.isEmpty()) {
List<AbstractDatasetChangedEvent> events = new ArrayList<AbstractDatasetChangedEvent>();
diff --git a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
index 71f9c14..0df8f20 100644
--- a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
@@ -28,7 +28,7 @@ public class SelectionEventManager implements SelectionChangedListener {
private static class ListenerInfo {
final SelectionChangedListener listener;
- public ListenerInfo(SelectionChangedListener listener, boolean consolidate) {
+ public ListenerInfo(SelectionChangedListener listener) {
this.listener = listener;
}
@@ -47,6 +47,9 @@ public class SelectionEventManager implements SelectionChangedListener {
private final CopyOnWriteArrayList<ListenerInfo> inEDTListeners = new CopyOnWriteArrayList<ListenerInfo>();
private final CopyOnWriteArrayList<ListenerInfo> normalListeners = new CopyOnWriteArrayList<ListenerInfo>();
+ /**
+ * Constructs a new {@code SelectionEventManager}.
+ */
public SelectionEventManager() {
DataSet.addSelectionListener(this);
}
@@ -55,18 +58,19 @@ public class SelectionEventManager implements SelectionChangedListener {
if (fireMode == FireMode.IN_EDT)
throw new UnsupportedOperationException("IN_EDT mode not supported, you probably want to use IN_EDT_CONSOLIDATED.");
if (fireMode == FireMode.IN_EDT || fireMode == FireMode.IN_EDT_CONSOLIDATED) {
- inEDTListeners.addIfAbsent(new ListenerInfo(listener, fireMode == FireMode.IN_EDT_CONSOLIDATED));
+ inEDTListeners.addIfAbsent(new ListenerInfo(listener));
} else {
- normalListeners.addIfAbsent(new ListenerInfo(listener, false));
+ normalListeners.addIfAbsent(new ListenerInfo(listener));
}
}
public void removeSelectionListener(SelectionChangedListener listener) {
- ListenerInfo searchListener = new ListenerInfo(listener, false);
+ ListenerInfo searchListener = new ListenerInfo(listener);
inEDTListeners.remove(searchListener);
normalListeners.remove(searchListener);
}
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
fireEvents(normalListeners, newSelection);
selection = newSelection;
@@ -80,6 +84,7 @@ public class SelectionEventManager implements SelectionChangedListener {
}
private final Runnable edtRunnable = new Runnable() {
+ @Override
public void run() {
if (selection != null) {
fireEvents(inEDTListeners, selection);
diff --git a/src/org/openstreetmap/josm/data/osm/history/History.java b/src/org/openstreetmap/josm/data/osm/history/History.java
index 9c892b5..fb1f00b 100644
--- a/src/org/openstreetmap/josm/data/osm/history/History.java
+++ b/src/org/openstreetmap/josm/data/osm/history/History.java
@@ -24,7 +24,7 @@ public class History{
}
private static History filter(History history, FilterPredicate predicate) {
- ArrayList<HistoryOsmPrimitive> out = new ArrayList<HistoryOsmPrimitive>();
+ List<HistoryOsmPrimitive> out = new ArrayList<HistoryOsmPrimitive>();
for (HistoryOsmPrimitive primitive: history.versions) {
if (predicate.matches(primitive)) {
out.add(primitive);
@@ -34,7 +34,7 @@ public class History{
}
/** the list of object snapshots */
- private ArrayList<HistoryOsmPrimitive> versions;
+ private List<HistoryOsmPrimitive> versions;
/** the object id */
private final long id;
private final OsmPrimitiveType type;
@@ -62,10 +62,11 @@ public class History{
}
public History sortAscending() {
- ArrayList<HistoryOsmPrimitive> copy = new ArrayList<HistoryOsmPrimitive>(versions);
+ List<HistoryOsmPrimitive> copy = new ArrayList<HistoryOsmPrimitive>(versions);
Collections.sort(
copy,
new Comparator<HistoryOsmPrimitive>() {
+ @Override
public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) {
return o1.compareTo(o2);
}
@@ -75,10 +76,11 @@ public class History{
}
public History sortDescending() {
- ArrayList<HistoryOsmPrimitive> copy = new ArrayList<HistoryOsmPrimitive>(versions);
+ List<HistoryOsmPrimitive> copy = new ArrayList<HistoryOsmPrimitive>(versions);
Collections.sort(
copy,
new Comparator<HistoryOsmPrimitive>() {
+ @Override
public int compare(HistoryOsmPrimitive o1, HistoryOsmPrimitive o2) {
return o2.compareTo(o1);
}
@@ -91,6 +93,7 @@ public class History{
return filter(
this,
new FilterPredicate() {
+ @Override
public boolean matches(HistoryOsmPrimitive primitive) {
return primitive.getTimestamp().compareTo(fromDate) >= 0;
}
@@ -102,6 +105,7 @@ public class History{
return filter(
this,
new FilterPredicate() {
+ @Override
public boolean matches(HistoryOsmPrimitive primitive) {
return primitive.getTimestamp().compareTo(untilDate) <= 0;
}
@@ -117,6 +121,7 @@ public class History{
return filter(
this,
new FilterPredicate() {
+ @Override
public boolean matches(HistoryOsmPrimitive primitive) {
return primitive.getVersion() >= fromVersion;
}
@@ -128,6 +133,7 @@ public class History{
return filter(
this,
new FilterPredicate() {
+ @Override
public boolean matches(HistoryOsmPrimitive primitive) {
return primitive.getVersion() <= untilVersion;
}
@@ -143,6 +149,7 @@ public class History{
return filter(
this,
new FilterPredicate() {
+ @Override
public boolean matches(HistoryOsmPrimitive primitive) {
return primitive.getUser() != null && primitive.getUser().getId() == uid;
}
@@ -233,15 +240,15 @@ public class History{
@Override
public String toString() {
- String result = "History ["
- + (type != null ? "type=" + type + ", " : "") + "id=" + id;
+ StringBuilder result = new StringBuilder("History ["
+ + (type != null ? "type=" + type + ", " : "") + "id=" + id);
if (versions != null) {
- result += ", versions=\n";
+ result.append(", versions=\n");
for (HistoryOsmPrimitive v : versions) {
- result += "\t" + v + ",\n";
+ result.append("\t").append(v).append(",\n");
}
}
- result += "]";
- return result;
+ result.append("]");
+ return result.toString();
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
index 947e9a6..9656f44 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
@@ -3,10 +3,16 @@ package org.openstreetmap.josm.data.osm.history;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.IPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
@@ -17,8 +23,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
* A data set holding histories of OSM primitives.
- *
- *
+ * @since 1670
*/
public class HistoryDataSet implements LayerChangeListener{
/** the unique instance */
@@ -38,12 +43,17 @@ public class HistoryDataSet implements LayerChangeListener{
}
/** the history data */
- private HashMap<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;
+ private Map<PrimitiveId, ArrayList<HistoryOsmPrimitive>> data;
private CopyOnWriteArrayList<HistoryDataSetListener> listeners;
+ private Map<Long, Changeset> changesets;
+ /**
+ * Constructs a new {@code HistoryDataSet}.
+ */
public HistoryDataSet() {
data = new HashMap<PrimitiveId, ArrayList<HistoryOsmPrimitive>>();
listeners = new CopyOnWriteArrayList<HistoryDataSetListener>();
+ changesets = new HashMap<Long, Changeset>();
}
public void addHistoryDataSetListener(HistoryDataSetListener listener) {
@@ -86,7 +96,7 @@ public class HistoryDataSet implements LayerChangeListener{
throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected, got {1}", "version", version));
SimplePrimitiveId pid = new SimplePrimitiveId(id, type);
- ArrayList<HistoryOsmPrimitive> versions = data.get(pid);
+ List<HistoryOsmPrimitive> versions = data.get(pid);
if (versions == null)
return null;
for (HistoryOsmPrimitive primitive: versions) {
@@ -111,6 +121,16 @@ public class HistoryDataSet implements LayerChangeListener{
}
/**
+ * Adds a changeset to the data set
+ *
+ * @param changeset the changeset to add
+ */
+ public void putChangeset(Changeset changeset) {
+ changesets.put((long) changeset.getId(), changeset);
+ fireHistoryUpdated(null);
+ }
+
+ /**
* Replies the history for a given primitive with id <code>id</code>
* and type <code>type</code>.
*
@@ -140,9 +160,15 @@ public class HistoryDataSet implements LayerChangeListener{
*/
public History getHistory(PrimitiveId pid) throws IllegalArgumentException{
CheckParameterUtil.ensureParameterNotNull(pid, "pid");
- ArrayList<HistoryOsmPrimitive> versions = data.get(pid);
+ List<HistoryOsmPrimitive> versions = data.get(pid);
+ if (versions == null && pid instanceof IPrimitive) {
+ versions = data.get(((IPrimitive) pid).getPrimitiveId());
+ }
if (versions == null)
return null;
+ for (HistoryOsmPrimitive i : versions) {
+ i.setChangeset(changesets.get(i.getChangesetId()));
+ }
return new History(pid.getUniqueId(), pid.getType(), versions);
}
@@ -154,19 +180,31 @@ public class HistoryDataSet implements LayerChangeListener{
public void mergeInto(HistoryDataSet other) {
if (other == null)
return;
- for (PrimitiveId id : other.data.keySet()) {
- this.data.put(id, other.data.get(id));
- }
+ this.data.putAll(other.data);
+ this.changesets.putAll(other.changesets);
fireHistoryUpdated(null);
}
+ public Collection<Long> getChangesetIds() {
+ final HashSet<Long> ids = new HashSet<Long>();
+ for (Collection<HistoryOsmPrimitive> i : data.values()) {
+ for (HistoryOsmPrimitive j : i) {
+ ids.add(j.getChangesetId());
+ }
+ }
+ return ids;
+ }
+
/* ------------------------------------------------------------------------------ */
/* interface LayerChangeListener */
/* ------------------------------------------------------------------------------ */
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {/* irrelevant in this context */}
+ @Override
public void layerAdded(Layer newLayer) {/* irrelevant in this context */}
+ @Override
public void layerRemoved(Layer oldLayer) {
- if (Main.map == null || Main.map.mapView == null) return;
+ if (!Main.isDisplayingMapView()) return;
if (Main.map.mapView.getNumLayers() == 0) {
data.clear();
fireCacheCleared();
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java b/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
index 76f922b..0be641f 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
@@ -14,13 +14,13 @@ import org.openstreetmap.josm.data.osm.User;
*
*/
public class HistoryNode extends HistoryOsmPrimitive {
-
+
/** the coordinates. May be null for deleted nodes */
private LatLon coords;
/**
* Constructs a new {@code HistoryNode}.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
* @param visible whether the node is still visible
@@ -37,7 +37,7 @@ public class HistoryNode extends HistoryOsmPrimitive {
/**
* Constructs a new {@code HistoryNode} with a configurable checking of historic parameters.
* This is needed to build virtual HistoryNodes for modified nodes, which do not have a timestamp and a changeset id.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
* @param visible whether the node is still visible
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
index f54bdc2..eb2699e 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
@@ -10,6 +10,7 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -31,13 +32,15 @@ public abstract class HistoryOsmPrimitive implements Comparable<HistoryOsmPrimit
private boolean visible;
private User user;
private long changesetId;
+ private Changeset changeset;
private Date timestamp;
private long version;
- private HashMap<String, String> tags;
+ private Map<String, String> tags;
protected void ensurePositiveLong(long value, String name) {
- if (value <= 0)
+ if (value <= 0) {
throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
+ }
}
/**
@@ -87,7 +90,7 @@ public abstract class HistoryOsmPrimitive implements Comparable<HistoryOsmPrimit
this.timestamp = timestamp;
tags = new HashMap<String, String>();
}
-
+
/**
* Constructs a new {@code HistoryOsmPrimitive} from an existing {@link OsmPrimitive}.
* @param p the primitive
@@ -148,6 +151,7 @@ public abstract class HistoryOsmPrimitive implements Comparable<HistoryOsmPrimit
public abstract OsmPrimitiveType getType();
+ @Override
public int compareTo(HistoryOsmPrimitive o) {
if (this.id != o.id)
throw new ClassCastException(tr("Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id));
@@ -170,6 +174,14 @@ public abstract class HistoryOsmPrimitive implements Comparable<HistoryOsmPrimit
return Collections.unmodifiableMap(tags);
}
+ public Changeset getChangeset() {
+ return changeset;
+ }
+
+ public void setChangeset(Changeset changeset) {
+ this.changeset = changeset;
+ }
+
/**
* Sets the tags for this history primitive. Removes all
* tags if <code>tags</code> is null.
@@ -247,9 +259,6 @@ public abstract class HistoryOsmPrimitive implements Comparable<HistoryOsmPrimit
return false;
// equal semantics is valid for subclasses like {@link HistoryOsmNode} etc. too.
// So, don't enforce equality of class.
- //
- // if (getClass() != obj.getClass())
- // return false;
HistoryOsmPrimitive other = (HistoryOsmPrimitive) obj;
if (id != other.id)
return false;
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java b/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
index 8747f09..bc0d142 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
@@ -20,7 +20,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
*/
public class HistoryRelation extends HistoryOsmPrimitive{
- private ArrayList<RelationMemberData> members = new ArrayList<RelationMemberData>();
+ private List<RelationMemberData> members = new ArrayList<RelationMemberData>();
/**
* constructor
@@ -69,8 +69,7 @@ public class HistoryRelation extends HistoryOsmPrimitive{
*
* @throws IllegalArgumentException thrown if preconditions are violated
*/
- public HistoryRelation(long id, long version, boolean visible, User user, long changesetId,
- Date timestamp, ArrayList<RelationMemberData> members) {
+ public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<RelationMemberData> members) {
this(id, version, visible, user, changesetId, timestamp);
if (members != null) {
this.members.addAll(members);
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java b/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
index 15024b5..71b3396 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
@@ -20,11 +20,11 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
*/
public class HistoryWay extends HistoryOsmPrimitive {
- private ArrayList<Long> nodeIds = new ArrayList<Long>();
+ private List<Long> nodeIds = new ArrayList<Long>();
/**
* Constructs a new {@code HistoryWay}.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
* @param visible whether the node is still visible
@@ -40,7 +40,7 @@ public class HistoryWay extends HistoryOsmPrimitive {
/**
* Constructs a new {@code HistoryWay} with a configurable checking of historic parameters.
* This is needed to build virtual HistoryWays for modified ways, which do not have a timestamp and a changeset id.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
* @param visible whether the node is still visible
@@ -57,7 +57,7 @@ public class HistoryWay extends HistoryOsmPrimitive {
/**
* Constructs a new {@code HistoryWay} with a given list of node ids.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
* @param visible whether the node is still visible
@@ -67,7 +67,7 @@ public class HistoryWay extends HistoryOsmPrimitive {
* @param nodeIdList the node ids (! null required)
* @throws IllegalArgumentException if preconditions are violated
*/
- public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, ArrayList<Long> nodeIdList) throws IllegalArgumentException {
+ public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<Long> nodeIdList) throws IllegalArgumentException {
this(id, version, visible, user, changesetId, timestamp);
CheckParameterUtil.ensureParameterNotNull(nodeIdList, "nodeIdList");
this.nodeIds.addAll(nodeIdList);
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java
index 869018a..c6fbc2e 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java
@@ -12,6 +12,7 @@ import org.openstreetmap.josm.data.osm.Changeset;
*/
public abstract class AbstractVisitor implements Visitor {
+ @Override
public void visit(Changeset cs) {
// do nothing
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java
index b36dcab..abc52f3 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.visitor;
import java.util.Collection;
@@ -25,6 +25,7 @@ public class AllNodesVisitor extends AbstractVisitor {
/**
* Nodes have only itself as nodes.
*/
+ @Override
public void visit(Node n) {
nodes.add(n);
}
@@ -32,6 +33,7 @@ public class AllNodesVisitor extends AbstractVisitor {
/**
* Ways have their way nodes.
*/
+ @Override
public void visit(Way w) {
if (w.isIncomplete()) return;
for (Node n : w.getNodes())
@@ -43,17 +45,21 @@ public class AllNodesVisitor extends AbstractVisitor {
* FIXME: do we want to collect nodes from segs/ways that are relation members?
* if so, use AutomatchVisitor!
*/
+ @Override
public void visit(Relation e) {
for (RelationMember m : e.getMembers())
if (m.isNode()) visit(m.getNode());
}
+
/**
- * @return All nodes the given primitive has.
+ * Replies all nodes contained by the given primitives
+ * @param osms The OSM primitives to inspect
+ * @return All nodes the given primitives have.
*/
public static Collection<Node> getAllNodes(Collection<? extends OsmPrimitive> osms) {
AllNodesVisitor v = new AllNodesVisitor();
for (OsmPrimitive osm : osms)
- osm.visit(v);
+ osm.accept(v);
return v.nodes;
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
index 4448074..d2d7362 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.visitor;
import java.util.Collection;
@@ -24,10 +24,12 @@ public class BoundingXYVisitor extends AbstractVisitor {
private ProjectionBounds bounds = null;
+ @Override
public void visit(Node n) {
visit(n.getEastNorth());
}
+ @Override
public void visit(Way w) {
if (w.isIncomplete()) return;
for (Node n : w.getNodes()) {
@@ -35,11 +37,12 @@ public class BoundingXYVisitor extends AbstractVisitor {
}
}
+ @Override
public void visit(Relation e) {
// only use direct members
for (RelationMember m : e.getMembers()) {
if (!m.isRelation()) {
- m.getMember().visit(this);
+ m.getMember().accept(this);
}
}
}
@@ -129,7 +132,7 @@ public class BoundingXYVisitor extends AbstractVisitor {
if (p == null) {
continue;
}
- p.visit(this);
+ p.accept(this);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
index cfe171b..e5fd4d8 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.data.osm.visitor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
@@ -32,7 +33,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
public class MergeSourceBuildingVisitor extends AbstractVisitor {
private DataSet selectionBase;
private DataSet hull;
- private HashMap<OsmPrimitive, PrimitiveData> mappedPrimitives;
+ private Map<OsmPrimitive, PrimitiveData> mappedPrimitives;
/**
* Creates the visitor. The visitor starts to build the "hull" from
@@ -125,20 +126,23 @@ public class MergeSourceBuildingVisitor extends AbstractVisitor {
mappedPrimitives.put(primitive, clone);
}
+ @Override
public void visit(Node n) {
rememberNode(n);
}
+ @Override
public void visit(Way w) {
// remember all nodes this way refers to ...
//
for (Node n: w.getNodes()) {
- n.visit(this);
+ n.accept(this);
}
// ... and the way itself
rememberWay(w);
}
+ @Override
public void visit(Relation r) {
// first, remember all primitives members refer to (only if necessary, see
// below)
@@ -151,7 +155,7 @@ public class MergeSourceBuildingVisitor extends AbstractVisitor {
continue;
}
if (isInSelectionBase(member.getMember()) || member.getMember().isNew()) {
- member.getMember().visit(this);
+ member.getMember().accept(this);
} else {
rememberIncomplete(member.getMember());
}
@@ -184,7 +188,7 @@ public class MergeSourceBuildingVisitor extends AbstractVisitor {
public DataSet build() {
for (OsmPrimitive primitive: selectionBase.getAllSelected()) {
- primitive.visit(this);
+ primitive.accept(this);
}
buildHull();
return hull;
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java b/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java
index 753bed4..78b39b1 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java
@@ -1,11 +1,31 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.visitor;
import org.openstreetmap.josm.data.osm.INode;
import org.openstreetmap.josm.data.osm.IRelation;
import org.openstreetmap.josm.data.osm.IWay;
+/**
+ * OSM primitives interfaces visitor, following conventional <a href="http://en.wikipedia.org/wiki/Visitor_pattern">visitor design pattern</a>.
+ * @since 4100
+ */
public interface PrimitiveVisitor {
+
+ /**
+ * Visiting call for points.
+ * @param n The node to inspect.
+ */
void visit(INode n);
+
+ /**
+ * Visiting call for lines.
+ * @param w The way to inspect.
+ */
void visit(IWay w);
- void visit(IRelation e);
+
+ /**
+ * Visiting call for relations.
+ * @param r The relation to inspect.
+ */
+ void visit(IRelation r);
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java b/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
index 933ba5c..0b24e3b 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.visitor;
import org.openstreetmap.josm.data.osm.Changeset;
@@ -9,6 +9,7 @@ import org.openstreetmap.josm.data.osm.Way;
/**
* Implementation of the visitor scheme. Every @{link org.openstreetmap.josm.data.OsmPrimitive}
* can be visited by several different visitors.
+ * @since 8
*/
public interface Visitor {
/**
@@ -19,16 +20,19 @@ public interface Visitor {
/**
* Visiting call for lines.
* @param w The way to inspect.
+ * @since 64
*/
void visit(Way w);
/**
* Visiting call for relations.
- * @param e The relation to inspect.
+ * @param r The relation to inspect.
+ * @since 343
*/
- void visit(Relation e);
+ void visit(Relation r);
/**
* Visiting call for changesets.
* @param cs The changeset to inspect.
+ * @since 1523
*/
void visit(Changeset cs);
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
index a606332..0d9877f 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
@@ -27,7 +27,7 @@ public abstract class AbstractMapRenderer implements Rendering {
protected Graphics2D g;
/** the map viewport - provides projection and hit detection functionality */
protected NavigatableComponent nc;
-
+
/** if true, the paint visitor shall render OSM objects such that they
* look inactive. Example: rendering of data in an inactive layer using light gray as color only. */
protected boolean isInactiveMode;
@@ -49,10 +49,10 @@ public abstract class AbstractMapRenderer implements Rendering {
/** Preference: minimum space (displayed way length) to display segment numbers */
protected int segmentNumberSpace;
-
+
/**
* <p>Creates an abstract paint visitor</p>
- *
+ *
* @param g the graphics context. Must not be null.
* @param nc the map viewport. Must not be null.
* @param isInactiveMode if true, the paint visitor shall render OSM objects such that they
@@ -67,7 +67,7 @@ public abstract class AbstractMapRenderer implements Rendering {
this.nc = nc;
this.isInactiveMode = isInactiveMode;
}
-
+
/**
* Draw the node as small rectangle with the given color.
*
@@ -79,7 +79,7 @@ public abstract class AbstractMapRenderer implements Rendering {
/**
* Draw an number of the order of the two consecutive nodes within the
* parents way
- *
+ *
* @param p1 First point of the way segment.
* @param p2 Second point of the way segment.
* @param orderNumber The number of the segment in the way.
@@ -101,7 +101,7 @@ public abstract class AbstractMapRenderer implements Rendering {
g.drawString(on, x, y);
}
}
-
+
/**
* Draws virtual nodes.
*
@@ -133,7 +133,7 @@ public abstract class AbstractMapRenderer implements Rendering {
g.setColor(highlightColor);
g.draw(path);
} catch (ArrayIndexOutOfBoundsException e) {
- // Silently ignore any ArrayIndexOutOfBoundsException that may be raised
+ // Silently ignore any ArrayIndexOutOfBoundsException that may be raised
// if the way has changed while being rendered (fix #7979)
// TODO: proper solution ?
// Idea from bastiK: avoid the WaySegment class and add another data class with { Way way; Node firstNode, secondNode; int firstIdx; }.
@@ -141,7 +141,7 @@ public abstract class AbstractMapRenderer implements Rendering {
// and report changes in a more controlled manner.
}
}
-
+
/**
* Reads the color definitions from preferences. This function is <code>public</code>, so that
* color names in preferences can be displayed even without calling the wireframe display before.
@@ -153,7 +153,7 @@ public abstract class AbstractMapRenderer implements Rendering {
this.nodeColor = PaintColors.NODE.get();
this.highlightColor = PaintColors.HIGHLIGHT.get();
}
-
+
/**
* Reads all the settings from preferences. Calls the @{link #getColors}
* function.
@@ -166,7 +166,7 @@ public abstract class AbstractMapRenderer implements Rendering {
this.segmentNumberSpace = Main.pref.getInteger("mappaint.segmentnumber.space", 40);
getColors();
}
-
+
/**
* Checks if a way segemnt is large enough for additional information display.
*
@@ -180,7 +180,7 @@ public abstract class AbstractMapRenderer implements Rendering {
double yd = Math.abs(p1.getY()-p2.getY());
return (xd+yd > space);
}
-
+
/**
* Checks if segment is visible in display.
*
@@ -195,7 +195,7 @@ public abstract class AbstractMapRenderer implements Rendering {
if ((p1.y > nc.getHeight()) && (p2.y > nc.getHeight())) return false;
return true;
}
-
+
/**
* Creates path for drawing virtual nodes for one way.
*
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
index 3650a9b..c4bb639 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
@@ -7,7 +7,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
-public class MapPaintSettings implements PreferenceChangedListener {
+public final class MapPaintSettings implements PreferenceChangedListener {
public static final MapPaintSettings INSTANCE = new MapPaintSettings();
@@ -102,6 +102,7 @@ public class MapPaintSettings implements PreferenceChangedListener {
}
+ @Override
public void preferenceChanged(PreferenceChangeEvent e) {
load();
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
index 848a6fb..a2228ff 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
@@ -20,26 +20,26 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
* <p>MapRendererFactory manages a list of map renderer classes and associated
* meta data (display name, description).</p>
- *
+ *
* <p>Plugins can implement and supply their own map renderers.</p>
* <strong>Sample code in a plugin</strong>
* <pre>
* public class MyMapRenderer extends AbstractMapRenderer {
* // ....
* }
- *
+ *
* // to be called when the plugin is created
* MapRendererFactory factory = MapRendererFactory.getInstance();
* factory.register(MyMapRenderer.class, "My map renderer", "This is is a fast map renderer");
* factory.activate(MyMapRenderer.class);
- *
+ *
* </pre>
*
*/
-public class MapRendererFactory {
+public final class MapRendererFactory {
/** preference key for the renderer class name. Default: class name for {@link StyledMapRenderer}
- *
+ *
*/
static public final String PREF_KEY_RENDERER_CLASS_NAME = "mappaint.renderer-class-name";
@@ -88,7 +88,7 @@ public class MapRendererFactory {
/**
* Replies the unique instance
- * @return
+ * @return instance of map rending class
*/
public static MapRendererFactory getInstance() {
if (instance == null) {
@@ -105,7 +105,7 @@ public class MapRendererFactory {
// ignore
}
}
- System.err.println(tr("Error: failed to load map renderer class ''{0}''. The class wasn''t found.", className));
+ Main.error(tr("Failed to load map renderer class ''{0}''. The class wasn''t found.", className));
return null;
}
@@ -125,18 +125,18 @@ public class MapRendererFactory {
private void activateMapRenderer(String rendererClassName){
Class<?> c = loadRendererClass(rendererClassName);
if (c == null){
- System.err.println(tr("Can''t activate map renderer class ''{0}'', because the class wasn''t found.", rendererClassName));
- System.err.println(tr("Activating the standard map renderer instead."));
+ Main.error(tr("Can''t activate map renderer class ''{0}'', because the class wasn''t found.", rendererClassName));
+ Main.error(tr("Activating the standard map renderer instead."));
activateDefault();
} else if (! AbstractMapRenderer.class.isAssignableFrom(c)) {
- System.err.println(tr("Can''t activate map renderer class ''{0}'', because it isn''t a subclass of ''{1}''.", rendererClassName, AbstractMapRenderer.class.getName()));
- System.err.println(tr("Activating the standard map renderer instead."));
+ Main.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t a subclass of ''{1}''.", rendererClassName, AbstractMapRenderer.class.getName()));
+ Main.error(tr("Activating the standard map renderer instead."));
activateDefault();
} else {
Class<? extends AbstractMapRenderer> renderer = c.asSubclass(AbstractMapRenderer.class);
if (! isRegistered(renderer)) {
- System.err.println(tr("Can''t activate map renderer class ''{0}'', because it isn''t registered as map renderer.", rendererClassName));
- System.err.println(tr("Activating the standard map renderer instead."));
+ Main.error(tr("Can''t activate map renderer class ''{0}'', because it isn''t registered as map renderer.", rendererClassName));
+ Main.error(tr("Activating the standard map renderer instead."));
activateDefault();
} else {
activate(renderer);
@@ -160,7 +160,7 @@ public class MapRendererFactory {
/**
* <p>Replies true, if {@code Renderer} is already a registered map renderer
* class.</p>
- *
+ *
* @param renderer the map renderer class. Must not be null.
* @return true, if {@code Renderer} is already a registered map renderer
* class
@@ -176,7 +176,7 @@ public class MapRendererFactory {
/**
* <p>Registers a map renderer class.</p>
- *
+ *
* @param renderer the map renderer class. Must not be null.
* @param displayName the display name to be displayed in UIs (i.e. in the preference dialog)
* @param description the description
@@ -200,9 +200,9 @@ public class MapRendererFactory {
*
* <p>If the respective class is also the active renderer, the renderer is reset
* to the default renderer.</p>
- *
+ *
* @param renderer the map renderer class. Must not be null.
- *
+ *
*/
public void unregister(Class<? extends AbstractMapRenderer> renderer) {
if (renderer == null) return;
@@ -224,11 +224,11 @@ public class MapRendererFactory {
* <p>Activates a map renderer class.</p>
*
* <p>The renderer class must already be registered.</p>
- *
+ *
* @param renderer the map renderer class. Must not be null.
* @throws IllegalArgumentException thrown if {@code renderer} is null
* @throws IllegalStateException thrown if {@code renderer} isn't registered yet
- *
+ *
*/
public void activate(Class<? extends AbstractMapRenderer> renderer) throws IllegalArgumentException, IllegalStateException{
CheckParameterUtil.ensureParameterNotNull(renderer);
@@ -246,7 +246,7 @@ public class MapRendererFactory {
* <p>Activates the default map renderer.</p>
*
* @throws IllegalStateException thrown if the default renderer {@link StyledMapRenderer} isn't registered
- *
+ *
*/
public void activateDefault() throws IllegalStateException{
Class<? extends AbstractMapRenderer> defaultRenderer = StyledMapRenderer.class;
@@ -282,7 +282,7 @@ public class MapRendererFactory {
/**
* <p>Replies the (unmodifiable) list of map renderer descriptors.</p>
- *
+ *
* @return the descriptors
*/
public List<Descriptor> getMapRendererDescriptors() {
@@ -292,12 +292,12 @@ public class MapRendererFactory {
/**
* <p>Replies true, if currently the wireframe map renderer is active. Otherwise,
* false.</p>
- *
+ *
* <p>There is a specific method for {@link WireframeMapRenderer} for legacy support.
* Until 03/2011 there were only two possible map renderers in JOSM: the wireframe
* renderer and the styled renderer. For the time being there are still UI elements
* (menu entries, etc.) which toggle between these two renderers only.</p>
- *
+ *
* @return true, if currently the wireframe map renderer is active. Otherwise,
* false
*/
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
index c1f8302..9c5142d 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java
@@ -38,10 +38,12 @@ public enum PaintColors implements ColorKey {
private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() {
+ @Override
public void mapPaintStylesUpdated() {
backgroundColorCache = null;
}
+ @Override
public void mapPaintStyleEntryUpdated(int idx) {
mapPaintStylesUpdated();
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/Rendering.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/Rendering.java
index 9f8bc9c..7744937 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/Rendering.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/Rendering.java
@@ -10,7 +10,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
public interface Rendering {
/**
* <p>Renders the OSM data in {@code data}</p>
- *
+ *
* @param data the data set to be rendered
* @param renderVirtualNodes if true, renders virtual nodes. Otherwise, ignores them.
* @param bbox the bounding box for the data to be rendered. Only objects within or intersecting
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 075569c..22cabf6 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -1,9 +1,11 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.visitor.paint;
import java.awt.AlphaComposite;
import java.awt.BasicStroke;
import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
@@ -28,7 +30,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import javax.swing.ImageIcon;
+import javax.swing.AbstractButton;
+import javax.swing.FocusManager;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
@@ -56,6 +59,7 @@ import org.openstreetmap.josm.gui.mappaint.MapImage;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.Symbol;
+import org.openstreetmap.josm.gui.mappaint.RepeatImageElemStyle.LineImageAlignment;
import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
import org.openstreetmap.josm.gui.mappaint.TextElement;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -218,7 +222,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
}
-
+
private static class StyleRecord implements Comparable<StyleRecord> {
final ElemStyle style;
final OsmPrimitive osm;
@@ -306,7 +310,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
private Color relationSelectedColor;
private Color highlightColorTransparent;
-
+
private static final int FLAG_NORMAL = 0;
private static final int FLAG_DISABLED = 1;
private static final int FLAG_MEMBER_OF_SELECTED = 2;
@@ -318,6 +322,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
private Collection<WaySegment> highlightWaySegments;
+ // highlight customization fields
+ private int highlightLineWidth;
+ private int highlightPointRadius;
+ private int widerHighlight;
+ private int highlightStep;
+
+ //flag that activate wider highlight mode
+ private boolean useWiderHighlight;
+
private boolean useStrokes;
private boolean showNames;
private boolean showIcons;
@@ -327,11 +340,13 @@ public class StyledMapRenderer extends AbstractMapRenderer {
private boolean leftHandTraffic;
- /**
- * {@inheritDoc}
- */
public StyledMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) {
super(g, nc, isInactiveMode);
+
+ if (nc!=null) {
+ Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
+ useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
+ }
}
private Polygon buildPolygon(Point center, int radius, int sides) {
@@ -426,6 +441,48 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.setStroke(new BasicStroke());
}
}
+
+ /**
+ * Displays text at specified position including its halo, if applicable.
+ *
+ * @param gv Text's glyphs to display. If {@code null}, use text from {@code s} instead.
+ * @param s text to display if {@code gv} is {@code null}
+ * @param x X position
+ * @param y Y position
+ * @param disabled {@code true} if element is disabled (filtered out)
+ * @param text text style to use
+ */
+ private void displayText(GlyphVector gv, String s, int x, int y, boolean disabled, TextElement text) {
+ if (isInactiveMode || disabled) {
+ g.setColor(inactiveColor);
+ if (gv != null) {
+ g.drawGlyphVector(gv, x, y);
+ } else {
+ g.setFont(text.font);
+ g.drawString(s, x, y);
+ }
+ } else if (text.haloRadius != null) {
+ g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+ g.setColor(text.haloColor);
+ if (gv == null) {
+ FontRenderContext frc = g.getFontRenderContext();
+ gv = text.font.createGlyphVector(frc, s);
+ }
+ Shape textOutline = gv.getOutline(x, y);
+ g.draw(textOutline);
+ g.setStroke(new BasicStroke());
+ g.setColor(text.color);
+ g.fill(textOutline);
+ } else {
+ g.setColor(text.color);
+ if (gv != null) {
+ g.drawGlyphVector(gv, x, y);
+ } else {
+ g.setFont(text.font);
+ g.drawString(s, x, y);
+ }
+ }
+ }
protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, TextElement text) {
@@ -440,7 +497,6 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.fill(area);
} else {
TexturePaint texture = new TexturePaint(fillImage.getImage(),
- // new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
g.setPaint(texture);
Float alpha = Utils.color_int2float(fillImage.alpha);
@@ -453,9 +509,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
if (text != null && isShowNames()) {
- /*
- * abort if we can't compose the label to be rendered
- */
+ // abort if we can't compose the label to be rendered
if (text.labelCompositionStrategy == null) return;
String name = text.labelCompositionStrategy.compose(osm);
if (name == null) return;
@@ -464,18 +518,11 @@ public class StyledMapRenderer extends AbstractMapRenderer {
FontMetrics fontMetrics = g.getFontMetrics(orderFont); // if slow, use cache
Rectangle2D nb = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
- // Point2D c = getCentroid(polygon);
// Using the Centroid is Nicer for buildings like: +--------+
// but this needs to be fast. As most houses are | 42 |
// boxes anyway, the center of the bounding box +---++---+
// will have to do. ++
// Centroids are not optimal either, just imagine a U-shaped house.
- // Point2D c = new Point2D.Double(pb.x + pb.width / 2.0, pb.y + pb.height / 2.0);
- // Rectangle2D.Double centeredNBounds =
- // new Rectangle2D.Double(c.getX() - nb.getWidth()/2,
- // c.getY() - nb.getHeight()/2,
- // nb.getWidth(),
- // nb.getHeight());
Rectangle centeredNBounds = new Rectangle(pb.x + (int)((pb.width - nb.getWidth())/2.0),
pb.y + (int)((pb.height - nb.getHeight())/2.0),
@@ -485,21 +532,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
if ((pb.width >= nb.getWidth() && pb.height >= nb.getHeight()) && // quick check
area.contains(centeredNBounds) // slow but nice
) {
- if (isInactiveMode || osm.isDisabled()) {
- g.setColor(inactiveColor);
- } else {
- g.setColor(text.color);
- }
Font defaultFont = g.getFont();
- g.setFont (text.font);
- g.drawString (name,
- (int)(centeredNBounds.getMinX() - nb.getMinX()),
- (int)(centeredNBounds.getMinY() - nb.getMinY()));
+ int x = (int)(centeredNBounds.getMinX() - nb.getMinX());
+ int y = (int)(centeredNBounds.getMinY() - nb.getMinY());
+ displayText(null, name, x, y, osm.isDisabled(), text);
g.setFont(defaultFont);
}
}
}
-
+
public void drawArea(Relation r, Color color, MapImage fillImage, TextElement text) {
Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
if (!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
@@ -514,7 +555,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
}
-
+
public void drawArea(Way w, Color color, MapImage fillImage, TextElement text) {
drawArea(w, getPath(w), color, fillImage, text);
}
@@ -573,38 +614,58 @@ public class StyledMapRenderer extends AbstractMapRenderer {
y += box.y + box.height + metrics.getAscent() + 2;
} else throw new AssertionError();
}
- if (isInactiveMode || n.isDisabled()) {
- g.setColor(inactiveColor);
- } else {
- g.setColor(text.color);
- }
- if (text.haloRadius != null) {
- g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
- g.setColor(text.haloColor);
- FontRenderContext frc = g.getFontRenderContext();
- GlyphVector gv = text.font.createGlyphVector(frc, s);
- Shape textOutline = gv.getOutline(x, y);
- g.draw(textOutline);
- g.setStroke(new BasicStroke());
- g.setColor(text.color);
- g.fill(textOutline);
- } else {
- g.drawString(s, x, y);
- }
+ displayText(null, s, x, y, n.isDisabled(), text);
g.setFont(defaultFont);
}
+ @Deprecated
public void drawLinePattern(Way way, Image pattern) {
- final int width = pattern.getWidth(null);
- final int height = pattern.getHeight(null);
+ drawRepeatImage(way, pattern, 0f, 0f, 0f, LineImageAlignment.TOP);
+ }
+
+ /**
+ * Draw an image along a way repeatedly.
+ *
+ * @param way the way
+ * @param pattern the image
+ * @param offset offset from the way
+ * @param spacing spacing between two images
+ * @param phase initial spacing
+ * @param align alignment of the image. The top, center or bottom edge
+ * can be aligned with the way.
+ */
+ public void drawRepeatImage(Way way, Image pattern, float offset, float spacing, float phase, LineImageAlignment align) {
+ final int imgWidth = pattern.getWidth(null);
+ final double repeat = imgWidth + spacing;
+ final int imgHeight = pattern.getHeight(null);
Point lastP = null;
- double wayLength = 0;
+ double currentWayLength = phase % repeat;
+ if (currentWayLength < 0) {
+ currentWayLength += repeat;
+ }
- Iterator<Node> it = way.getNodes().iterator();
+ int dy1, dy2;
+ switch (align) {
+ case TOP:
+ dy1 = 0;
+ dy2 = imgHeight;
+ break;
+ case CENTER:
+ dy1 = - imgHeight / 2;
+ dy2 = imgHeight + dy1;
+ break;
+ case BOTTOM:
+ dy1 = -imgHeight;
+ dy2 = 0;
+ break;
+ default:
+ throw new AssertionError();
+ }
+
+ OffsetIterator it = new OffsetIterator(way.getNodes(), offset);
while (it.hasNext()) {
- Node n = it.next();
- Point thisP = nc.getPoint(n);
+ Point thisP = it.next();
if (lastP != null) {
final double segmentLength = thisP.distance(lastP);
@@ -612,33 +673,47 @@ public class StyledMapRenderer extends AbstractMapRenderer {
final double dx = thisP.x - lastP.x;
final double dy = thisP.y - lastP.y;
- double dist = wayLength == 0 ? 0 : width - (wayLength % width);
+ // pos is the position from the beginning of the current segment
+ // where an image should be painted
+ double pos = repeat - (currentWayLength % repeat);
AffineTransform saveTransform = g.getTransform();
g.translate(lastP.x, lastP.y);
g.rotate(Math.atan2(dy, dx));
- if (dist > 0) {
- g.drawImage(pattern, 0, 0, (int) dist, height,
- width - (int) dist, 0, width, height, null);
+ // draw the rest of the image from the last segment in case it
+ // is cut off
+ if (pos > spacing) {
+ // segment is too short for a complete image
+ if (pos > segmentLength + spacing) {
+ g.drawImage(pattern, 0, dy1, (int) segmentLength, dy2,
+ (int) (repeat - pos), 0,
+ (int) (repeat - pos + segmentLength), imgHeight, null);
+ // rest of the image fits fully on the current segment
+ } else {
+ g.drawImage(pattern, 0, dy1, (int) (pos - spacing), dy2,
+ (int) (repeat - pos), 0, imgWidth, imgHeight, null);
+ }
}
- while (dist < segmentLength) {
- if (dist + width > segmentLength) {
- g.drawImage(pattern, (int) dist, 0, (int) segmentLength, height,
- 0, 0, (int) segmentLength - (int) dist, height, null);
+ // draw remaining images for this segment
+ while (pos < segmentLength) {
+ // cut off at the end?
+ if (pos + imgWidth > segmentLength) {
+ g.drawImage(pattern, (int) pos, dy1, (int) segmentLength, dy2,
+ 0, 0, (int) segmentLength - (int) pos, imgHeight, null);
} else {
- g.drawImage(pattern, (int) dist, 0, nc);
+ g.drawImage(pattern, (int) pos, dy1, nc);
}
- dist += width;
+ pos += repeat;
}
g.setTransform(saveTransform);
- wayLength += segmentLength;
+ currentWayLength += segmentLength;
}
lastP = thisP;
}
}
-
+
@Override
public void drawNode(Node n, Color color, int size, boolean fill) {
if(size <= 0 && !n.isHighlighted())
@@ -666,7 +741,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
}
-
+
public void drawNodeIcon(Node n, Image img, float alpha, boolean selected, boolean member) {
Point p = nc.getPoint(n);
@@ -682,7 +757,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.setPaintMode();
if (selected || member)
{
- Color color = null;
+ Color color;
if (isInactiveMode || n.isDisabled()) {
color = inactiveColor;
} else if (selected) {
@@ -694,7 +769,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.drawRect(p.x-w/2-2, p.y-h/2-2, w+4, h+4);
}
}
-
+
public void drawNodeSymbol(Node n, Symbol s, Color fillColor, Color strokeColor) {
Point p = nc.getPoint(n);
int radius = s.size / 2;
@@ -784,7 +859,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
Point p2 = nc.getPoint(n2);
StyledMapRenderer.this.drawOrderNumber(p1, p2, orderNumber, clr);
}
-
+
/**
* highlights a given GeneralPath using the settings from BasicStroke to match the line's
* style. Width of the highlight is hard coded.
@@ -795,11 +870,12 @@ public class StyledMapRenderer extends AbstractMapRenderer {
if(path == null)
return;
g.setColor(highlightColorTransparent);
- float w = (line.getLineWidth() + 4);
+ float w = (line.getLineWidth() + highlightLineWidth);
+ if (useWiderHighlight) w+=widerHighlight;
while(w >= line.getLineWidth()) {
g.setStroke(new BasicStroke(w, line.getEndCap(), line.getLineJoin(), line.getMiterLimit()));
g.draw(path);
- w -= 4;
+ w -= highlightStep;
}
}
/**
@@ -808,20 +884,18 @@ public class StyledMapRenderer extends AbstractMapRenderer {
*/
private void drawPointHighlight(Point p, int size) {
g.setColor(highlightColorTransparent);
- int s = size + 7;
+ int s = size + highlightPointRadius;
+ if (useWiderHighlight) s+=widerHighlight;
while(s >= size) {
int r = (int) Math.floor(s/2);
g.fillRoundRect(p.x-r, p.y-r, s, s, r, r);
- s -= 4;
+ s -= highlightStep;
}
}
public void drawRestriction(Image img, Point pVia, double vx, double vx2, double vy, double vy2, double angle, boolean selected) {
- /* rotate image with direction last node in from to */
- Image rotatedImg = ImageProvider.createRotatedImage(null , img, angle);
-
- /* scale down image to 16*16 pixels */
- Image smallImg = new ImageIcon(rotatedImg.getScaledInstance(16 , 16, Image.SCALE_SMOOTH)).getImage();
+ // rotate image with direction last node in from to, and scale down image to 16*16 pixels
+ Image smallImg = ImageProvider.createRotatedImage(img, angle, new Dimension(16, 16));
int w = smallImg.getWidth(null), h=smallImg.getHeight(null);
g.drawImage(smallImg, (int)(pVia.x+vx+vx2)-w/2, (int)(pVia.y+vy+vy2)-h/2, nc);
@@ -830,7 +904,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.drawRect((int)(pVia.x+vx+vx2)-w/2-2,(int)(pVia.y+vy+vy2)-h/2-2, w+4, h+4);
}
}
-
+
public void drawRestriction(Relation r, MapImage icon) {
Way fromWay = null;
Way toWay = null;
@@ -916,7 +990,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
/* find the "direct" nodes before the via node */
- Node fromNode = null;
+ Node fromNode;
if(fromWay.firstNode() == via) {
fromNode = fromWay.getNode(1);
} else {
@@ -1005,7 +1079,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
drawRestriction(isInactiveMode || r.isDisabled() ? icon.getDisabled() : icon.getImage(),
pVia, vx, vx2, vy, vy2, iconAngle, r.isSelected());
}
-
+
public void drawTextOnPath(Way way, TextElement text) {
if (way == null || text == null)
return;
@@ -1042,7 +1116,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
double[] p1 = pointAt(t1, poly, pathLength);
double[] p2 = pointAt(t2, poly, pathLength);
-
+
if (p1 == null || p2 == null)
return;
@@ -1083,20 +1157,9 @@ public class StyledMapRenderer extends AbstractMapRenderer {
gv.setGlyphTransform(i, trfm);
}
}
- if (text.haloRadius != null) {
- Shape textOutline = gv.getOutline();
- g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
- g.setColor(text.haloColor);
- g.draw(textOutline);
- g.setStroke(new BasicStroke());
- g.setColor(text.color);
- g.fill(textOutline);
- } else {
- g.setColor(text.color);
- g.drawGlyphVector(gv, 0, 0);
- }
+ displayText(gv, null, 0, 0, way.isDisabled(), text);
}
-
+
/**
* draw way
* @param showOrientation show arrows that indicate the technical orientation of
@@ -1236,7 +1299,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100);
this.backgroundColor = PaintColors.getBackgroundColor();
}
-
+
@Override
protected void getSettings(boolean virtual) {
super.getSettings(virtual);
@@ -1255,13 +1318,18 @@ public class StyledMapRenderer extends AbstractMapRenderer {
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
+
+ highlightLineWidth = Main.pref.getInteger("mappaint.highlight.width", 4);
+ highlightPointRadius = Main.pref.getInteger("mappaint.highlight.radius", 7);
+ widerHighlight = Main.pref.getInteger("mappaint.highlight.bigger-increment", 5);
+ highlightStep = Main.pref.getInteger("mappaint.highlight.step", 4);
}
private Path2D.Double getPath(Way w) {
Path2D.Double path = new Path2D.Double();
boolean initial = true;
for (Node n : w.getNodes()) {
- Point2D p = n.getEastNorth();
+ EastNorth p = n.getEastNorth();
if (p != null) {
if (initial) {
path.moveTo(p.getX(), p.getY());
@@ -1324,8 +1392,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
@Override
public void render(final DataSet data, boolean renderVirtualNodes, Bounds bounds) {
- //long start = System.currentTimeMillis();
- BBox bbox = new BBox(bounds);
+ BBox bbox = bounds.toBBox();
getSettings(renderVirtualNodes);
boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10000000);
@@ -1341,12 +1408,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
collectNodeStyles(data, sc, bbox);
collectWayStyles(data, sc, bbox);
collectRelationStyles(data, sc, bbox);
- //long phase1 = System.currentTimeMillis();
sc.drawAll();
sc = null;
drawVirtualNodes(data, bbox);
-
- //long now = System.currentTimeMillis();
- //System.err.println(String.format("PAINTING TOOK %d [PHASE1 took %d] (at scale %s)", now - start, phase1 - start, circum));
}
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
index fa5f931..d6c51cc 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
@@ -1,4 +1,4 @@
-/* License: GPL. Copyright 2007 by Immanuel Scholz and others */
+/* License: GPL. For details, see LICENSE file. */
package org.openstreetmap.josm.data.osm.visitor.paint;
import java.awt.BasicStroke;
@@ -82,11 +82,11 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
*/
private DataSet ds;
- /** Helper variable for {@link #drawSgement} */
+ /** Helper variable for {@link #drawSegment} */
private static final double PHI = Math.toRadians(20);
- /** Helper variable for {@link #drawSgement} */
+ /** Helper variable for {@link #drawSegment} */
private static final double cosPHI = Math.cos(PHI);
- /** Helper variable for {@link #drawSgement} */
+ /** Helper variable for {@link #drawSegment} */
private static final double sinPHI = Math.sin(PHI);
/** Helper variable for {@link #visit(Relation)} */
@@ -95,7 +95,7 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
/**
* Creates an wireframe render
- *
+ *
* @param g the graphics context. Must not be null.
* @param nc the map viewport. Must not be null.
* @param isInactiveMode if true, the paint visitor shall render OSM objects such that they
@@ -153,14 +153,16 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
* @param virtual <code>true</code> if virtual nodes are used
* @param bounds display boundaries
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void render(DataSet data, boolean virtual, Bounds bounds) {
- BBox bbox = new BBox(bounds);
+ BBox bbox = bounds.toBBox();
this.ds = data;
getSettings(virtual);
-
+
for (final Relation rel : data.searchRelations(bbox)) {
if (rel.isDrawable() && !ds.isSelected(rel) && !rel.isDisabledAndHidden()) {
- rel.visit(this);
+ rel.accept(this);
}
}
@@ -175,24 +177,24 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
} else if (!way.isTagged()) {
untaggedWays.add(way);
} else {
- way.visit(this);
+ way.accept(this);
}
}
}
displaySegments();
-
+
// Display highlighted ways after the other ones (fix #8276)
for (List<Way> specialWays : Arrays.asList(new List[]{untaggedWays, highlightedWays})) {
for (final Way way : specialWays){
- way.visit(this);
+ way.accept(this);
}
specialWays.clear();
displaySegments();
}
-
+
for (final OsmPrimitive osm : data.getSelected()) {
if (osm.isDrawable()) {
- osm.visit(this);
+ osm.accept(this);
}
}
displaySegments();
@@ -200,7 +202,7 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
for (final OsmPrimitive osm: data.searchNodes(bbox)) {
if (osm.isDrawable() && !ds.isSelected(osm) && !osm.isDisabledAndHidden())
{
- osm.visit(this);
+ osm.accept(this);
}
}
drawVirtualNodes(data, bbox);
@@ -273,7 +275,7 @@ public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor
drawNode(n, color, size, fill);
}
}
-
+
private boolean isNodeTagged(Node n) {
return n.isTagged() || n.isAnnotated();
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
index c8111b1..3fd5eb5 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.data.osm.visitor.paint.relations;
import java.awt.geom.Path2D;
import java.awt.geom.Path2D.Double;
import java.awt.geom.PathIterator;
-import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Collection;
@@ -17,6 +16,7 @@ import java.util.Set;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -49,10 +49,10 @@ public class Multipolygon {
* <p>Kind of strategy object which is responsible for deciding whether a given
* member role indicates that the member belongs to an <em>outer</em> or an
* <em>inner</em> polygon.</p>
- *
+ *
* <p>The decision is taken based on preference settings, see the four preference keys
* above.</p>
- *
+ *
*/
private static class MultipolygonRoleMatcher implements PreferenceChangedListener{
private final List<String> outerExactRoles = new ArrayList<String>();
@@ -208,11 +208,11 @@ public class Multipolygon {
this.poly.setWindingRule(Path2D.WIND_EVEN_ODD);
buildPoly();
}
-
+
private void buildPoly() {
boolean initial = true;
for (Node n : nodes) {
- Point2D p = n.getEastNorth();
+ EastNorth p = n.getEastNorth();
if (p != null) {
if (initial) {
poly.moveTo(p.getX(), p.getY());
@@ -237,7 +237,7 @@ public class Multipolygon {
this.nodes = new ArrayList<Node>(copy.nodes);
this.inners = new ArrayList<Multipolygon.PolyData>(copy.inners);
}
-
+
public Intersection contains(Path2D.Double p) {
int contains = 0;
int total = 0;
@@ -261,7 +261,7 @@ public class Multipolygon {
inners.add(inner);
appendInner(inner.poly);
}
-
+
private void appendInner(Path2D.Double inner) {
poly.append(inner.getPathIterator(null), false);
}
@@ -276,11 +276,11 @@ public class Multipolygon {
}
return bounds;
}
-
+
public Collection<Long> getWayIds() {
return wayIds;
}
-
+
private void resetNodes(DataSet dataSet) {
if (!nodes.isEmpty()) {
DataSet ds = dataSet;
@@ -291,30 +291,32 @@ public class Multipolygon {
nodes.clear();
if (ds == null) {
// DataSet still not found. This should not happen, but a warning does no harm
- System.err.println("Warning: DataSet not found while resetting nodes in Multipolygon. This should not happen, you may report it to JOSM developers.");
+ Main.warn("DataSet not found while resetting nodes in Multipolygon. This should not happen, you may report it to JOSM developers.");
} else if (wayIds.size() == 1) {
Way w = (Way) ds.getPrimitiveById(wayIds.iterator().next(), OsmPrimitiveType.WAY);
nodes.addAll(w.getNodes());
- } else {
+ } else if (!wayIds.isEmpty()) {
List<Way> waysToJoin = new ArrayList<Way>();
- for (Iterator<Long> it = wayIds.iterator(); it.hasNext(); ) {
- Way w = (Way) ds.getPrimitiveById(it.next(), OsmPrimitiveType.WAY);
+ for (Long wayId : wayIds) {
+ Way w = (Way) ds.getPrimitiveById(wayId, OsmPrimitiveType.WAY);
if (w != null && w.getNodesCount() > 0) { // fix #7173 (empty ways on purge)
waysToJoin.add(w);
}
}
- nodes.addAll(joinWays(waysToJoin).iterator().next().getNodes());
+ if (!waysToJoin.isEmpty()) {
+ nodes.addAll(joinWays(waysToJoin).iterator().next().getNodes());
+ }
}
resetPoly();
}
}
-
+
private void resetPoly() {
poly.reset();
buildPoly();
bounds = null;
}
-
+
public void nodeMoved(NodeMovedEvent event) {
final Node n = event.getNode();
boolean innerChanged = false;
@@ -328,7 +330,7 @@ public class Multipolygon {
resetPoly();
}
}
-
+
public void wayNodesChanged(WayNodesChangedEvent event) {
final Long wayId = event.getChangedWay().getUniqueId();
boolean innerChanged = false;
@@ -349,7 +351,7 @@ public class Multipolygon {
private final List<PolyData> innerPolygons = new ArrayList<PolyData>();
private final List<PolyData> outerPolygons = new ArrayList<PolyData>();
private final List<PolyData> combinedPolygons = new ArrayList<PolyData>();
-
+
private boolean incomplete;
public Multipolygon(Relation r) {
@@ -388,7 +390,7 @@ public class Multipolygon {
addInnerToOuters();
}
}
-
+
public final boolean isIncomplete() {
return incomplete;
}
@@ -485,8 +487,8 @@ public class Multipolygon {
}
}
}
- } /* for(i = ... */
- } /* while(joined) */
+ }
+ }
if (nodes == null) {
nodes = w.getNodes();
@@ -494,7 +496,7 @@ public class Multipolygon {
}
result.add(new JoinedWay(nodes, wayIds, selected));
- } /* while(left != 0) */
+ }
return result;
}
@@ -517,7 +519,7 @@ public class Multipolygon {
intersectingCount++;
}
}
-
+
if (insideCount == 1)
return insidePolygon;
else if (intersectingCount == 1)
@@ -559,7 +561,7 @@ public class Multipolygon {
o.addInner(pdInner);
}
}
-
+
// Clear inner and outer polygons to reduce memory footprint
innerPolygons.clear();
outerPolygons.clear();
@@ -572,15 +574,7 @@ public class Multipolygon {
public List<Way> getInnerWays() {
return innerWays;
}
-/*
- public List<PolyData> getInnerPolygons() {
- return innerPolygons;
- }
- public List<PolyData> getOuterPolygons() {
- return outerPolygons;
- }
-*/
public List<PolyData> getCombinedPolygons() {
return combinedPolygons;
}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
index 11245d6..f5241a5 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm.visitor.paint.relations;
import java.util.ArrayList;
@@ -36,7 +37,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
* A memory cache for Multipolygon objects.
*
*/
-public class MultipolygonCache implements DataSetListener, LayerChangeListener, ProjectionChangeListener, SelectionChangedListener {
+public final class MultipolygonCache implements DataSetListener, LayerChangeListener, ProjectionChangeListener, SelectionChangedListener {
private static final MultipolygonCache instance = new MultipolygonCache();
diff --git a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
index 42df1ee..1516d42 100644
--- a/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
@@ -52,14 +52,14 @@ public abstract class AbstractProperty<T> {
public void remove() {
Main.pref.put(getKey(), String.valueOf(getDefaultValue()));
}
-
+
/**
* Replies the value of this property.
* @return the value of this property
* @since 5464
*/
public abstract T get();
-
+
/**
* Sets this property to the specified value.
* @param value The new value of this property
diff --git a/src/org/openstreetmap/josm/data/preferences/CachedProperty.java b/src/org/openstreetmap/josm/data/preferences/CachedProperty.java
index 7fc778e..28352d6 100644
--- a/src/org/openstreetmap/josm/data/preferences/CachedProperty.java
+++ b/src/org/openstreetmap/josm/data/preferences/CachedProperty.java
@@ -49,10 +49,10 @@ public abstract class CachedProperty<T> extends AbstractProperty<T> implements P
public int getUpdateCount() {
return updateCount;
}
-
- @Override
- public T getDefaultValue() {
- return fromString(getDefaultValueAsString());
+
+ @Override
+ public T getDefaultValue() {
+ return fromString(getDefaultValueAsString());
}
public String getDefaultValueAsString() {
diff --git a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
index 35acdce..941b655 100644
--- a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
@@ -38,6 +38,10 @@ abstract public class AbstractProjection implements Projection {
return datum;
}
+ /**
+ * Replies the projection (in the narrow sense)
+ * @return The projection object
+ */
public final Proj getProj() {
return proj;
}
@@ -99,15 +103,4 @@ abstract public class AbstractProjection implements Projection {
protected static final double convertDegreeMinuteSecond(double degree, double minute, double second) {
return degree + (minute/60.0) + (second/3600.0);
}
-
- public void dump() {
- System.err.println("x_0="+x_0);
- System.err.println("y_0="+y_0);
- System.err.println("lon_0="+lon_0);
- System.err.println("k_0="+k_0);
- System.err.println("ellps="+ellps);
- System.err.println("proj="+proj);
- System.err.println("datum="+datum);
- }
-
}
diff --git a/src/org/openstreetmap/josm/data/projection/CustomProjection.java b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
index bb95b75..6409de1 100644
--- a/src/org/openstreetmap/josm/data/projection/CustomProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
@@ -10,6 +10,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.datum.CentricDatum;
@@ -123,8 +124,8 @@ public class CustomProjection extends AbstractProjection {
datum = WGS84Datum.INSTANCE;
proj = new Mercator();
bounds = new Bounds(
- new LatLon(-85.05112877980659, -180.0),
- new LatLon(85.05112877980659, 180.0), true);
+ -85.05112877980659, -180.0,
+ 85.05112877980659, 180.0, true);
} else {
Map<String, String> parameters = parseParameterList(pref);
ellps = parseEllipsoid(parameters);
@@ -159,8 +160,7 @@ public class CustomProjection extends AbstractProjection {
if (pref.trim().isEmpty()) {
parts = new String[0];
}
- for (int i = 0; i < parts.length; i++) {
- String part = parts[i];
+ for (String part : parts) {
if (part.isEmpty() || part.charAt(0) != '+')
throw new ProjectionConfigurationException(tr("Parameter must begin with a ''+'' character (found ''{0}'')", part));
Matcher m = Pattern.compile("\\+([a-zA-Z0-9_]+)(=(.*))?").matcher(part);
@@ -277,7 +277,7 @@ public class CustomProjection extends AbstractProjection {
return datum;
}
if (parameters.containsKey(Param.no_defs.key))
- throw new ProjectionConfigurationException(tr("Datum required (+datum=*, +towgs84=* or +nadgirds=*)"));
+ throw new ProjectionConfigurationException(tr("Datum required (+datum=*, +towgs84=* or +nadgrids=*)"));
return new CentricDatum(null, null, ellps);
}
@@ -287,16 +287,16 @@ public class CustomProjection extends AbstractProjection {
if (numStr.length != 3 && numStr.length != 7)
throw new ProjectionConfigurationException(tr("Unexpected number of arguments for parameter ''towgs84'' (must be 3 or 7)"));
List<Double> towgs84Param = new ArrayList<Double>();
- for (int i = 0; i < numStr.length; i++) {
+ for (String str : numStr) {
try {
- towgs84Param.add(Double.parseDouble(numStr[i]));
+ towgs84Param.add(Double.parseDouble(str));
} catch (NumberFormatException e) {
- throw new ProjectionConfigurationException(tr("Unable to parse value of parameter ''towgs84'' (''{0}'')", numStr[i]));
+ throw new ProjectionConfigurationException(tr("Unable to parse value of parameter ''towgs84'' (''{0}'')", str));
}
}
boolean isCentric = true;
- for (int i = 0; i<towgs84Param.size(); i++) {
- if (towgs84Param.get(i) != 0.0) {
+ for (Double param : towgs84Param) {
+ if (param != 0.0) {
isCentric = false;
break;
}
@@ -327,7 +327,7 @@ public class CustomProjection extends AbstractProjection {
}
public Proj parseProjection(Map<String, String> parameters, Ellipsoid ellps) throws ProjectionConfigurationException {
- String id = (String) parameters.get(Param.proj.key);
+ String id = parameters.get(Param.proj.key);
if (id == null) throw new ProjectionConfigurationException(tr("Projection required (+proj=*)"));
Proj proj = Projections.getBaseProjection(id);
@@ -365,8 +365,10 @@ public class CustomProjection extends AbstractProjection {
}
public static double parseDouble(Map<String, String> parameters, String parameterName) throws ProjectionConfigurationException {
+ if (!parameters.containsKey(parameterName))
+ throw new IllegalArgumentException(tr("Unknown parameter ''{0}''", parameterName));
String doubleStr = parameters.get(parameterName);
- if (doubleStr == null && parameters.containsKey(parameterName))
+ if (doubleStr == null)
throw new ProjectionConfigurationException(
tr("Expected number argument for parameter ''{0}''", parameterName));
return parseDouble(doubleStr, parameterName);
@@ -449,7 +451,9 @@ public class CustomProjection extends AbstractProjection {
if (code != null && code.startsWith("EPSG:")) {
try {
return Integer.parseInt(code.substring(5));
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ Main.warn(e);
+ }
}
return null;
}
diff --git a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
index 4c47621..deb6956 100644
--- a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
+++ b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
@@ -12,7 +12,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
/**
* the reference ellipsoids
*/
-public class Ellipsoid {
+public final class Ellipsoid {
/**
* Clarke 1880 IGN (French national geographic institute)
*/
@@ -23,6 +23,10 @@ public class Ellipsoid {
*/
public static final Ellipsoid hayford = Ellipsoid.create_a_rf(6378388.0, 297.0);
/**
+ * GRS67 ellipsoid
+ */
+ public static final Ellipsoid GRS67 = Ellipsoid.create_a_rf(6378160.0, 298.247167);
+ /**
* GRS80 ellipsoid
*/
public static final Ellipsoid GRS80 = Ellipsoid.create_a_rf(6378137.0, 298.257222101);
diff --git a/src/org/openstreetmap/josm/data/projection/Projection.java b/src/org/openstreetmap/josm/data/projection/Projection.java
index 0db7745..e0e8227 100644
--- a/src/org/openstreetmap/josm/data/projection/Projection.java
+++ b/src/org/openstreetmap/josm/data/projection/Projection.java
@@ -14,7 +14,8 @@ import org.openstreetmap.josm.data.coor.LatLon;
*/
public interface Projection {
/**
- * The default scale factor in east/north units per pixel ({@link #NavigatableComponent#scale})).
+ * The default scale factor in east/north units per pixel
+ * ({@link org.openstreetmap.josm.gui.NavigatableComponent#scale})).
* FIXME: misnomer
* @return the scale factor
*/
@@ -48,7 +49,7 @@ public interface Projection {
* This should be a unique identifier.
* If projection supports parameters, return a different code
* for each set of parameters.
- *
+ *
* The EPSG code can be used (if defined for the projection).
*
* @return the projection identifier
diff --git a/src/org/openstreetmap/josm/data/projection/Projections.java b/src/org/openstreetmap/josm/data/projection/Projections.java
index 0f1107e..72048ac 100644
--- a/src/org/openstreetmap/josm/data/projection/Projections.java
+++ b/src/org/openstreetmap/josm/data/projection/Projections.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection;
import java.io.BufferedReader;
@@ -23,6 +23,7 @@ import org.openstreetmap.josm.data.projection.datum.WGS84Datum;
import org.openstreetmap.josm.data.projection.proj.ClassProjFactory;
import org.openstreetmap.josm.data.projection.proj.LambertConformalConic;
import org.openstreetmap.josm.data.projection.proj.LonLat;
+import org.openstreetmap.josm.data.projection.proj.Mercator;
import org.openstreetmap.josm.data.projection.proj.Proj;
import org.openstreetmap.josm.data.projection.proj.ProjFactory;
import org.openstreetmap.josm.data.projection.proj.SwissObliqueMercator;
@@ -31,12 +32,17 @@ import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
/**
* Class to handle projections
*
*/
-public class Projections {
+public final class Projections {
+
+ private Projections() {
+ // Hide default constructor for utils classes
+ }
public static EastNorth project(LatLon ll) {
if (ll == null) return null;
@@ -61,12 +67,14 @@ public class Projections {
static {
registerBaseProjection("lonlat", LonLat.class, "core");
- registerBaseProjection("josm:smerc", org.openstreetmap.josm.data.projection.proj.Mercator.class, "core");
+ registerBaseProjection("josm:smerc", Mercator.class, "core");
registerBaseProjection("lcc", LambertConformalConic.class, "core");
registerBaseProjection("somerc", SwissObliqueMercator.class, "core");
registerBaseProjection("tmerc", TransverseMercator.class, "core");
+ ellipsoids.put("clarkeIGN", Ellipsoid.clarkeIGN);
ellipsoids.put("intl", Ellipsoid.hayford);
+ ellipsoids.put("GRS67", Ellipsoid.GRS67);
ellipsoids.put("GRS80", Ellipsoid.GRS80);
ellipsoids.put("WGS84", Ellipsoid.WGS84);
ellipsoids.put("bessel", Ellipsoid.Bessel1841);
@@ -123,9 +131,10 @@ public class Projections {
*/
private static void loadInits() {
Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
+ BufferedReader r = null;
try {
- InputStream in = new MirroredInputStream("resource://data/epsg");
- BufferedReader r = new BufferedReader(new InputStreamReader(in));
+ InputStream in = new MirroredInputStream("resource://data/projection/epsg");
+ r = new BufferedReader(new InputStreamReader(in));
String line, lastline = "";
while ((line = r.readLine()) != null) {
line = line.trim();
@@ -136,13 +145,15 @@ public class Projections {
if (m.matches()) {
inits.put("EPSG:" + m.group(1), Pair.create(name, m.group(2).trim()));
} else {
- System.err.println("Warning: failed to parse line from the epsg projection definition: "+line);
+ Main.warn("Failed to parse line from the EPSG projection definition: "+line);
}
}
lastline = line;
}
} catch (IOException ex) {
- throw new RuntimeException();
+ throw new RuntimeException(ex);
+ } finally {
+ Utils.close(r);
}
}
@@ -165,15 +176,21 @@ public class Projections {
if (proj != null) return proj;
ProjectionChoice pc = allProjectionChoicesByCode.get(code);
if (pc != null) {
+ Collection<String> pref = pc.getPreferencesFromCode(code);
+ pc.setPreferences(pref);
+ try {
+ proj = pc.getProjection();
+ } catch (Throwable t) {
+ String cause = t.getMessage();
+ Main.warn("Unable to get projection "+code+" with "+pc + (cause != null ? ". "+cause : ""));
+ }
+ }
+ if (proj == null) {
Pair<String, String> pair = inits.get(code);
if (pair == null) return null;
String name = pair.a;
String init = pair.b;
proj = new CustomProjection(name, code, init, null);
- } else {
- Collection<String> pref = pc.getPreferencesFromCode(code);
- pc.setPreferences(pref);
- proj = pc.getProjection();
}
projectionsByCode_cache.put(code, proj);
return proj;
@@ -182,5 +199,4 @@ public class Projections {
public static Collection<String> getAllProjectionCodes() {
return Collections.unmodifiableCollection(allCodes);
}
-
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java b/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
index 7e0fece..61b2174 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
@@ -4,7 +4,7 @@ package org.openstreetmap.josm.data.projection.datum;
import org.openstreetmap.josm.data.projection.Ellipsoid;
abstract public class AbstractDatum implements Datum {
-
+
protected String name;
protected String proj4Id;
protected Ellipsoid ellps;
diff --git a/src/org/openstreetmap/josm/data/projection/datum/Datum.java b/src/org/openstreetmap/josm/data/projection/datum/Datum.java
index ce2d754..7b96f56 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/Datum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/Datum.java
@@ -6,7 +6,7 @@ import org.openstreetmap.josm.data.projection.Ellipsoid;
/**
* Represents a geodetic datum.
- *
+ *
* Basically it provides conversion functions from and to the WGS84 datum.
*/
public interface Datum {
@@ -22,7 +22,7 @@ public interface Datum {
* If no id exists, return null.
*/
String getProj4Id();
-
+
/**
* @return the ellipsoid associated with this datum
*/
@@ -32,7 +32,7 @@ public interface Datum {
* Convert lat/lon from this datum to WGS84 datum.
*/
LatLon toWGS84(LatLon ll);
-
+
/**
* Convert lat/lon from WGS84 to this datum.
*/
diff --git a/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java b/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
index 29332b6..af243b9 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
@@ -3,14 +3,13 @@ package org.openstreetmap.josm.data.projection.datum;
import static org.openstreetmap.josm.tools.I18n.tr;
-import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Ellipsoid;
/**
* This datum indicates, that GRS80 ellipsoid is used and no conversion
* is necessary to get from or to the WGS84 datum.
*/
-public class GRS80Datum extends NullDatum {
+public final class GRS80Datum extends NullDatum {
public final static GRS80Datum INSTANCE = new GRS80Datum();
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
index c3c29b3..e118c02 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
@@ -57,56 +57,64 @@ public class NTV2GridShift implements Serializable {
}
/**
- * @return
+ * Data access function for latitude value
+ * @return latitude in seconds
*/
public double getLatSeconds() {
return lat;
}
/**
- * @return
+ * Data access function for latitude value
+ * @return latitude in degree
*/
public double getLatDegrees() {
return lat / 3600.0;
}
/**
- * @return
+ * Data access function for latitude shift value
+ * @return latitude shift in seconds
*/
public double getLatShiftSeconds() {
return latShift;
}
/**
- * @return
+ * Data access function for latitude shift value
+ * @return latitude shift in degree
*/
public double getLatShiftDegrees() {
return latShift / 3600.0;
}
/**
- * @return
+ * Data access function for already shifted latitude value
+ * @return shifted latitude in seconds
*/
public double getShiftedLatSeconds() {
return lat + latShift;
}
/**
- * @return
+ * Data access function for already shifted latitude value
+ * @return shifted latitude in degree
*/
public double getShiftedLatDegrees() {
return (lat + latShift) / 3600.0;
}
/**
- * @return
+ * Checks whether latitude accuracy is available or not
+ * @return <code>true</code> if latitude accuracy is available
*/
public boolean isLatAccuracyAvailable() {
return latAccuracyAvailable;
}
/**
- * @return
+ * Data access function for latitude accuracy
+ * @return latitude accuracy in seconds
*/
public double getLatAccuracySeconds() {
if (!latAccuracyAvailable)
@@ -115,7 +123,8 @@ public class NTV2GridShift implements Serializable {
}
/**
- * @return
+ * Data access function for latitude accuracy
+ * @return latitude accuracy in degree
*/
public double getLatAccuracyDegrees() {
if (!latAccuracyAvailable)
@@ -124,7 +133,8 @@ public class NTV2GridShift implements Serializable {
}
/**
- * @return
+ * Data access function for latitude accuracy
+ * @return latitude accuracy in meter
*/
public double getLatAccuracyMetres() {
if (!latAccuracyAvailable)
@@ -133,56 +143,64 @@ public class NTV2GridShift implements Serializable {
}
/**
- * @return
+ * Data access function for longitude value, positive values in west direction
+ * @return longitude in seconds
*/
public double getLonPositiveWestSeconds() {
return lon;
}
/**
- * @return
+ * Data access function for longitude value, positive values in east direction
+ * @return longitude in degree
*/
public double getLonPositiveEastDegrees() {
return lon / -3600.0;
}
/**
- * @return
+ * Data access function for longitude shift value, positive values in west direction
+ * @return longitude shift in seconds
*/
public double getLonShiftPositiveWestSeconds() {
return lonShift;
}
/**
- * @return
+ * Data access function for longitude shift value, positive values in east direction
+ * @return longitude shift in degree
*/
public double getLonShiftPositiveEastDegrees() {
return lonShift / -3600.0;
}
/**
- * @return
+ * Data access function for shifted longitude value, positive values in west direction
+ * @return shifted longitude in seconds
*/
public double getShiftedLonPositiveWestSeconds() {
return lon + lonShift;
}
/**
- * @return
+ * Data access function for shifted longitude value, positive values in east direction
+ * @return shifted longitude in degree
*/
public double getShiftedLonPositiveEastDegrees() {
return (lon + lonShift) / -3600.0;
}
/**
- * @return
+ * Checks whether longitude accuracy is available or not
+ * @return <code>true</code> if longitude accuracy is available
*/
public boolean isLonAccuracyAvailable() {
return lonAccuracyAvailable;
}
/**
- * @return
+ * Data access function for longitude accuracy
+ * @return longitude accuracy in seconds
*/
public double getLonAccuracySeconds() {
if (!lonAccuracyAvailable)
@@ -191,7 +209,8 @@ public class NTV2GridShift implements Serializable {
}
/**
- * @return
+ * Data access function for longitude accuracy
+ * @return longitude accuracy in degree
*/
public double getLonAccuracyDegrees() {
if (!lonAccuracyAvailable)
@@ -200,7 +219,8 @@ public class NTV2GridShift implements Serializable {
}
/**
- * @return
+ * Data access function for longitude accuracy
+ * @return longitude accuracy in meter
*/
public double getLonAccuracyMetres() {
if (!lonAccuracyAvailable)
@@ -209,84 +229,96 @@ public class NTV2GridShift implements Serializable {
}
/**
- * @param d
+ * Data store function for latitude
+ * @param d latitude value in seconds
*/
public void setLatSeconds(double d) {
lat = d;
}
/**
- * @param d
+ * Data store function for latitude
+ * @param d latitude value in degree
*/
public void setLatDegrees(double d) {
lat = d * 3600.0;
}
/**
- * @param b
+ * Data store function for latitude accuracy availability
+ * @param b availability of latitude accuracy
*/
public void setLatAccuracyAvailable(boolean b) {
latAccuracyAvailable = b;
}
/**
- * @param d
+ * Data store function for latitude accuracy
+ * @param d latitude accuracy in seconds
*/
public void setLatAccuracySeconds(double d) {
latAccuracy = d;
}
/**
- * @param d
+ * Data store function for latitude shift
+ * @param d latitude shift in seconds
*/
public void setLatShiftSeconds(double d) {
latShift = d;
}
/**
- * @param d
+ * Data store function for longitude
+ * @param d latitude value in seconds, west direction is positive
*/
public void setLonPositiveWestSeconds(double d) {
lon = d;
}
/**
- * @param d
+ * Data store function for longitude
+ * @param d latitude value in degree, est direction is positive
*/
public void setLonPositiveEastDegrees(double d) {
lon = d * -3600.0;
}
/**
- * @param b
+ * Data store function for longitude accuracy availability
+ * @param b availability of longitude accuracy
*/
public void setLonAccuracyAvailable(boolean b) {
lonAccuracyAvailable = b;
}
/**
- * @param d
+ * Data store function for longitude accuracy
+ * @param d longitude accuracy in seconds
*/
public void setLonAccuracySeconds(double d) {
lonAccuracy = d;
}
/**
- * @param d
+ * Data store function for longitude shift value
+ * @param d longitude shift in seconds, west direction is positive
*/
public void setLonShiftPositiveWestSeconds(double d) {
lonShift = d;
}
/**
- * @return
+ * Get the name of the sub grid
+ * @return name of the sub grid
*/
public String getSubGridName() {
return subGridName;
}
/**
- * @param string
+ * Set the name of the sub grid
+ * @param string name of the sub grid
*/
public void setSubGridName(String string) {
subGridName = string;
@@ -294,7 +326,7 @@ public class NTV2GridShift implements Serializable {
/**
* Make this object a copy of the supplied GridShift
- * @param gs
+ * @param gs grid to copy data from
*/
public void copy(NTV2GridShift gs) {
this.lon = gs.lon;
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
index bc2c941..5d5af7f 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
@@ -24,6 +24,9 @@ import java.io.InputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
+
+import org.openstreetmap.josm.tools.Utils;
/**
* Models the NTv2 format Grid Shift File and exposes methods to shift
@@ -60,7 +63,6 @@ import java.util.HashMap;
*/
public class NTV2GridShiftFile implements Serializable {
- private String overviewHeaderCountId;
private int overviewHeaderCount;
private int subGridHeaderCount;
private int subGridCount;
@@ -76,6 +78,9 @@ public class NTV2GridShiftFile implements Serializable {
private NTV2SubGrid[] topLevelSubGrid;
private NTV2SubGrid lastSubGrid;
+ /**
+ * Constructs a new {@code NTV2GridShiftFile}.
+ */
public NTV2GridShiftFile() {
}
@@ -89,7 +94,7 @@ public class NTV2GridShiftFile implements Serializable {
*
* @param in Grid Shift File InputStream
* @param loadAccuracy is Accuracy data to be loaded as well as shift data?
- * @throws Exception
+ * @throws IOException
*/
public void loadGridShiftFile(InputStream in, boolean loadAccuracy ) throws IOException {
byte[] b8 = new byte[8];
@@ -98,7 +103,7 @@ public class NTV2GridShiftFile implements Serializable {
toEllipsoid = "";
topLevelSubGrid = null;
in.read(b8);
- overviewHeaderCountId = new String(b8);
+ String overviewHeaderCountId = new String(b8);
if (!"NUM_OREC".equals(overviewHeaderCountId))
throw new IllegalArgumentException("Input file is not an NTv2 grid shift file");
in.read(b8);
@@ -150,7 +155,7 @@ public class NTV2GridShiftFile implements Serializable {
topLevelSubGrid = createSubGridTree(subGrid);
lastSubGrid = topLevelSubGrid[0];
- in.close();
+ Utils.close(in);
}
/**
@@ -161,7 +166,7 @@ public class NTV2GridShiftFile implements Serializable {
*/
private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
int topLevelCount = 0;
- HashMap<String, ArrayList<NTV2SubGrid>> subGridMap = new HashMap<String, ArrayList<NTV2SubGrid>>();
+ HashMap<String, List<NTV2SubGrid>> subGridMap = new HashMap<String, List<NTV2SubGrid>>();
for (int i = 0; i < subGrid.length; i++) {
if (subGrid[i].getParentSubGridName().equalsIgnoreCase("NONE")) {
topLevelCount++;
@@ -174,14 +179,14 @@ public class NTV2GridShiftFile implements Serializable {
if (subGrid[i].getParentSubGridName().equalsIgnoreCase("NONE")) {
topLevelSubGrid[topLevelCount++] = subGrid[i];
} else {
- ArrayList<NTV2SubGrid> parent = subGridMap.get(subGrid[i].getParentSubGridName());
+ List<NTV2SubGrid> parent = subGridMap.get(subGrid[i].getParentSubGridName());
parent.add(subGrid[i]);
}
}
NTV2SubGrid[] nullArray = new NTV2SubGrid[0];
for (int i = 0; i < subGrid.length; i++) {
- ArrayList<NTV2SubGrid> subSubGrids = subGridMap.get(subGrid[i].getSubGridName());
- if (subSubGrids.size() > 0) {
+ List<NTV2SubGrid> subSubGrids = subGridMap.get(subGrid[i].getSubGridName());
+ if (!subSubGrids.isEmpty()) {
NTV2SubGrid[] subGridArray = subSubGrids.toArray(nullArray);
subGrid[i].setSubGridArray(subGridArray);
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
index 4f597f0..1e5f5e6 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
@@ -1,37 +1,55 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection.datum;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
import java.io.InputStream;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.MirroredInputStream;
/**
- * Wrapper for NTV2GridShiftFile.
+ * Wrapper for {@link NTV2GridShiftFile}.
*
* Loads the shift file from disk, when it is first accessed.
+ * @since 5226
*/
public class NTV2GridShiftFileWrapper {
- public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/BETA2007.gsb");
- public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/ntf_r93_b.gsb");
-
+ /**
+ * Used in Germany to convert coordinates between the DHDN (<i>Deutsches Hauptdreiecksnetz</i>)
+ * and ETRS89 (<i>European Terrestrial Reference System 1989</i>) datums.
+ * @see <a href="http://crs.bkg.bund.de/crseu/crs/descrtrans/eu-descrtrans.php?crs_id=REVfREhETiAvIEdLXzM=&op_id=REVfREhETiAoQmVUQSwgMjAwNykgdG8gRVRSUzg5">
+ * Description of Transformation - DE_DHDN (BeTA, 2007) to ETRS89</a>
+ */
+ public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/projection/BETA2007.gsb");
+
+ /**
+ * Used in France to convert coordinates between the NTF (<i>Nouvelle triangulation de la France</i>)
+ * and RGF93 (<i>Réseau géodésique français 1993</i>) datums.
+ * @see <a href="http://geodesie.ign.fr/contenu/fichiers/documentation/algorithmes/notice/NT111_V1_HARMEL_TransfoNTF-RGF93_FormatGrilleNTV2.pdf">
+ * [French] Transformation de coordonnées NTF – RGF93 / Format de grille NTv2</a>
+ */
+ public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/projection/ntf_r93_b.gsb");
+
private NTV2GridShiftFile instance = null;
private String gridFileName;
+ /**
+ * Constructs a new {@code NTV2GridShiftFileWrapper}.
+ * @param filename Path to the grid file (GSB format)
+ */
public NTV2GridShiftFileWrapper(String filename) {
this.gridFileName = filename;
}
+ /**
+ * Returns the actual {@link NTV2GridShiftFile} behind this wrapper.
+ * The grid file is only loaded once, when first accessed.
+ * @return The NTv2 grid file
+ */
public NTV2GridShiftFile getShiftFile() {
if (instance == null) {
try {
InputStream is = new MirroredInputStream(gridFileName);
- if (is == null)
- throw new RuntimeException(tr("Error: failed to open input stream for resource ''/data/{0}''.", gridFileName));
instance = new NTV2GridShiftFile();
instance.loadGridShiftFile(is, false);
} catch (Exception e) {
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
index bc9c8e4..8c05446 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
@@ -23,11 +23,14 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
+
/**
* Models the NTv2 Sub Grid within a Grid Shift File
*
* @author Peter Yuill
- * Modifified for JOSM :
+ * Modified for JOSM :
* - removed the RandomAccessFile mode (Pieren)
* - read grid file by single bytes. Workaround for a bug in some VM not supporting
* file reading by group of 4 bytes from a jar file.
@@ -63,7 +66,7 @@ public class NTV2SubGrid implements Cloneable, Serializable {
* @param in GridShiftFile InputStream
* @param bigEndian is the file bigEndian?
* @param loadAccuracy is the node Accuracy data to be loaded?
- * @throws Exception
+ * @throws IOException
*/
public NTV2SubGrid(InputStream in, boolean bigEndian, boolean loadAccuracy) throws IOException {
byte[] b8 = new byte[8];
@@ -162,9 +165,9 @@ public class NTV2SubGrid implements Cloneable, Serializable {
if (subGrid == null)
return this;
else {
- for (int i = 0; i < subGrid.length; i++) {
- if (subGrid[i].isCoordWithin(lon, lat))
- return subGrid[i].getSubGridForCoord(lon, lat);
+ for (NTV2SubGrid aSubGrid : subGrid) {
+ if (aSubGrid.isCoordWithin(lon, lat))
+ return aSubGrid.getSubGridForCoord(lon, lat);
}
return this;
}
@@ -215,7 +218,6 @@ public class NTV2SubGrid implements Cloneable, Serializable {
* <p>This method is thread safe for both memory based and file based node data.
* @param gs GridShift object containing the coordinate to shift and the shift values
* @return the GridShift object supplied, with values updated.
- * @throws IOException
*/
public NTV2GridShift interpolateGridShift(NTV2GridShift gs) {
int lonIndex = (int)((gs.getLonPositiveWestSeconds() - minLon) / lonInterval);
@@ -280,7 +282,7 @@ public class NTV2SubGrid implements Cloneable, Serializable {
* @param subGrid
*/
public void setSubGridArray(NTV2SubGrid[] subGrid) {
- this.subGrid = subGrid;
+ this.subGrid = Utils.copyArray(subGrid);
}
@Override
@@ -288,6 +290,10 @@ public class NTV2SubGrid implements Cloneable, Serializable {
return subGridName;
}
+ /**
+ * Returns textual details about the sub grid.
+ * @return textual details about the sub grid
+ */
public String getDetails() {
StringBuffer buf = new StringBuffer("Sub Grid : ");
buf.append(subGridName);
@@ -322,43 +328,47 @@ public class NTV2SubGrid implements Cloneable, Serializable {
NTV2SubGrid clone = null;
try {
clone = (NTV2SubGrid)super.clone();
- } catch (CloneNotSupportedException cnse) {
- }
- // Do a deep clone of the sub grids
- if (subGrid != null) {
- clone.subGrid = new NTV2SubGrid[subGrid.length];
- for (int i = 0; i < subGrid.length; i++) {
- clone.subGrid[i] = (NTV2SubGrid)subGrid[i].clone();
+ // Do a deep clone of the sub grids
+ if (subGrid != null) {
+ clone.subGrid = new NTV2SubGrid[subGrid.length];
+ for (int i = 0; i < subGrid.length; i++) {
+ clone.subGrid[i] = (NTV2SubGrid)subGrid[i].clone();
+ }
}
+ } catch (CloneNotSupportedException cnse) {
+ Main.warn(cnse);
}
return clone;
}
/**
- * @return
+ * Get maximum latitude value
+ * @return maximum latitude
*/
public double getMaxLat() {
return maxLat;
}
/**
- * @return
+ * Get maximum longitude value
+ * @return maximum longitude
*/
public double getMaxLon() {
return maxLon;
}
/**
- * @return
+ * Get minimum latitude value
+ * @return minimum latitude
*/
public double getMinLat() {
return minLat;
}
/**
- * @return
+ * Get minimum longitude value
+ * @return minimum longitude
*/
public double getMinLon() {
return minLon;
}
-
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java b/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
index b456f9e..370a1d3 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
@@ -19,12 +19,14 @@
*/
package org.openstreetmap.josm.data.projection.datum;
+import org.openstreetmap.josm.Main;
+
/**
* A set of static utility methods for reading the NTv2 file format
*
* @author Peter Yuill
*/
-public class NTV2Util {
+public final class NTV2Util {
private NTV2Util() {
}
@@ -111,7 +113,9 @@ public class NTV2Util {
try {
Class.forName("java.nio.channels.FileChannel");
nioAvailable = true;
- } catch (ClassNotFoundException cnfe) {}
+ } catch (ClassNotFoundException cnfe) {
+ Main.info(cnfe.getMessage());
+ }
return nioAvailable;
}
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java b/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java
index e932ec8..09ebc1c 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java
@@ -6,21 +6,21 @@ import org.openstreetmap.josm.data.projection.Ellipsoid;
/**
* Datum provides general conversion from one ellipsoid to another.
- *
+ *
* Seven parameters can be specified:
* - 3D offset
* - general rotation
* - scale
- *
+ *
* This method is described by EPSG as EPSG::9606.
* Also known as Bursa-Wolf.
*/
public class SevenParameterDatum extends AbstractDatum {
-
+
protected double dx, dy, dz, rx, ry, rz, s;
/**
- *
+ *
* @param name name of the datum
* @param proj4Id Proj.4 identifier for this datum (or null)
* @param ellps the ellipsoid used
@@ -60,5 +60,5 @@ public class SevenParameterDatum extends AbstractDatum {
double z = (1-s)*(-dz + xyz[2] + ((-dy+xyz[1])*(-rx) - (-dx+xyz[0])*(-ry)));
return this.ellps.cart2LatLon(new double[] { x, y, z });
}
-
+
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/ThreeParameterDatum.java b/src/org/openstreetmap/josm/data/projection/datum/ThreeParameterDatum.java
index 8879255..7311915 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/ThreeParameterDatum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/ThreeParameterDatum.java
@@ -8,7 +8,7 @@ import org.openstreetmap.josm.data.projection.Ellipsoid;
* Datum provides 3 dimensional offset and ellipsoid conversion.
*/
public class ThreeParameterDatum extends AbstractDatum {
-
+
protected double dx, dy, dz;
public ThreeParameterDatum(String name, String proj4Id, Ellipsoid ellps, double dx, double dy, double dz) {
@@ -35,5 +35,5 @@ public class ThreeParameterDatum extends AbstractDatum {
xyz[2] -= dz;
return this.ellps.cart2LatLon(xyz);
}
-
+
}
diff --git a/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java b/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java
index 81f0d88..1789763 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/WGS84Datum.java
@@ -3,13 +3,12 @@ package org.openstreetmap.josm.data.projection.datum;
import static org.openstreetmap.josm.tools.I18n.tr;
-import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Ellipsoid;
/**
* WGS84 datum. Transformation from and to WGS84 datum is a no-op.
*/
-public class WGS84Datum extends NullDatum {
+public final class WGS84Datum extends NullDatum {
public static final WGS84Datum INSTANCE = new WGS84Datum();
diff --git a/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java b/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
index bda23a1..2813d7c 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
@@ -1,8 +1,17 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection.proj;
-import static java.lang.Math.*;
-
+import static java.lang.Math.PI;
+import static java.lang.Math.abs;
+import static java.lang.Math.atan;
+import static java.lang.Math.cos;
+import static java.lang.Math.exp;
+import static java.lang.Math.log;
+import static java.lang.Math.pow;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.tan;
+import static java.lang.Math.toRadians;
import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.projection.Ellipsoid;
@@ -23,7 +32,7 @@ public class LambertConformalConic implements Proj {
public Parameters(double latitudeOrigin) {
this.latitudeOrigin = latitudeOrigin;
}
- };
+ }
public static class Parameters1SP extends Parameters {
public Parameters1SP(double latitudeOrigin) {
diff --git a/src/org/openstreetmap/josm/data/projection/proj/Mercator.java b/src/org/openstreetmap/josm/data/projection/proj/Mercator.java
index 5a82d69..6b88aa9 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/Mercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/Mercator.java
@@ -1,8 +1,11 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection.proj;
-import static java.lang.Math.*;
-
+import static java.lang.Math.PI;
+import static java.lang.Math.atan;
+import static java.lang.Math.log;
+import static java.lang.Math.sinh;
+import static java.lang.Math.tan;
import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
diff --git a/src/org/openstreetmap/josm/data/projection/proj/Proj.java b/src/org/openstreetmap/josm/data/projection/proj/Proj.java
index 160ce08..36e3e5a 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/Proj.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/Proj.java
@@ -22,21 +22,24 @@ import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
*
*/
public interface Proj {
+
/**
- * A Human readable name of this projection.
+ * Replies a human readable name of this projection.
+ * @return The projection name. must not be null.
*/
String getName();
/**
- * The Proj.4 identifier.
+ * Replies the Proj.4 identifier.
*
- * (as reported by cs2cs -lp)
- * If no id exists, return null.
+ * @return The Proj.4 identifier (as reported by cs2cs -lp).
+ * If no id exists, return {@code null}.
*/
String getProj4Id();
/**
* Initialize the projection using the provided parameters.
+ * @param params The projection parameters
*
* @throws ProjectionConfigurationException in case parameters are not suitable
*/
diff --git a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
index c3b2bc2..e973613 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
@@ -1,17 +1,28 @@
//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection.proj;
-import static java.lang.Math.*;
-
+import static java.lang.Math.PI;
+import static java.lang.Math.abs;
+import static java.lang.Math.asin;
+import static java.lang.Math.atan;
+import static java.lang.Math.atan2;
+import static java.lang.Math.cos;
+import static java.lang.Math.exp;
+import static java.lang.Math.log;
+import static java.lang.Math.pow;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.tan;
+import static java.lang.Math.toRadians;
import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.projection.Ellipsoid;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
/**
- * Projection for the SwissGrid CH1903 / L03, see http://de.wikipedia.org/wiki/Swiss_Grid.
+ * Projection for the SwissGrid CH1903 / L03, see http://en.wikipedia.org/wiki/Swiss_coordinate_system.
*
- * Calculations are based on formula from
+ * Calculations were originally based on simple formula from
* http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/sys/refsys/switzerland.parsysrelated1.37696.downloadList.12749.DownloadFile.tmp/ch1903wgs84en.pdf
*
* August 2010 update to this formula (rigorous formulas)
diff --git a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
index d7b4691..f13f8a8 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
@@ -1,11 +1,13 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection.proj;
-import static java.lang.Math.*;
-
+import static java.lang.Math.cos;
+import static java.lang.Math.pow;
+import static java.lang.Math.sin;
+import static java.lang.Math.sqrt;
+import static java.lang.Math.tan;
import static org.openstreetmap.josm.tools.I18n.tr;
-import org.openstreetmap.josm.data.projection.Ellipsoid;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
/**
diff --git a/src/org/openstreetmap/josm/data/validation/FixableTestError.java b/src/org/openstreetmap/josm/data/validation/FixableTestError.java
new file mode 100644
index 0000000..3602100
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/validation/FixableTestError.java
@@ -0,0 +1,55 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.data.validation;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+import java.util.Collection;
+
+/**
+ * Validation error easily fixable right at its detection. The fix can be given when constructing the error.
+ * @since 6377
+ */
+public class FixableTestError extends TestError {
+ protected final Command fix;
+
+ public FixableTestError(Test tester, Severity severity, String message, int code, OsmPrimitive primitive, Command fix) {
+ super(tester, severity, message, code, primitive);
+ this.fix = fix;
+ }
+
+ public FixableTestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives, Command fix) {
+ super(tester, severity, message, code, primitives);
+ this.fix = fix;
+ }
+
+ public FixableTestError(Test tester, Severity severity, String message, int code, Collection<? extends OsmPrimitive> primitives, Collection<?> highlighted, Command fix) {
+ super(tester, severity, message, code, primitives, highlighted);
+ this.fix = fix;
+ }
+
+ public FixableTestError(Test tester, Severity severity, String message, String description, String description_en, int code, OsmPrimitive primitive, Command fix) {
+ super(tester, severity, message, description, description_en, code, primitive);
+ this.fix = fix;
+ }
+
+ public FixableTestError(Test tester, Severity severity, String message, String description, String description_en, int code, Collection<? extends OsmPrimitive> primitives, Command fix) {
+ super(tester, severity, message, description, description_en, code, primitives);
+ this.fix = fix;
+ }
+
+ public FixableTestError(Test tester, Severity severity, String message, String description, String description_en, int code, Collection<? extends OsmPrimitive> primitives, Collection<?> highlighted, Command fix) {
+ super(tester, severity, message, description, description_en, code, primitives, highlighted);
+ this.fix = fix;
+ }
+
+ @Override
+ public Command getFix() {
+ return fix;
+ }
+
+ @Override
+ public final boolean isFixable() {
+ return true;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/validation/OsmValidator.java b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
index f91da9b..e643614 100644
--- a/src/org/openstreetmap/josm/data/validation/OsmValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
@@ -24,6 +24,7 @@ import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ValidateAction;
import org.openstreetmap.josm.data.validation.tests.Addresses;
+import org.openstreetmap.josm.data.validation.tests.BarriersEntrances;
import org.openstreetmap.josm.data.validation.tests.BuildingInBuilding;
import org.openstreetmap.josm.data.validation.tests.Coastlines;
import org.openstreetmap.josm.data.validation.tests.CrossingWays;
@@ -32,10 +33,12 @@ import org.openstreetmap.josm.data.validation.tests.DuplicateNode;
import org.openstreetmap.josm.data.validation.tests.DuplicateRelation;
import org.openstreetmap.josm.data.validation.tests.DuplicateWay;
import org.openstreetmap.josm.data.validation.tests.DuplicatedWayNodes;
+import org.openstreetmap.josm.data.validation.tests.Highways;
import org.openstreetmap.josm.data.validation.tests.MultipolygonTest;
import org.openstreetmap.josm.data.validation.tests.NameMismatch;
import org.openstreetmap.josm.data.validation.tests.NodesDuplicatingWayTags;
import org.openstreetmap.josm.data.validation.tests.NodesWithSameName;
+import org.openstreetmap.josm.data.validation.tests.OpeningHourTest;
import org.openstreetmap.josm.data.validation.tests.OverlappingAreas;
import org.openstreetmap.josm.data.validation.tests.OverlappingWays;
import org.openstreetmap.josm.data.validation.tests.PowerLines;
@@ -56,10 +59,10 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.layer.ValidatorLayer;
import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
+import org.openstreetmap.josm.tools.Utils;
/**
- *
- * A OSM data validator
+ * A OSM data validator.
*
* @author Francisco R. Santos <frsantos at gmail.com>
*/
@@ -80,7 +83,7 @@ public class OsmValidator implements LayerChangeListener {
* TODO: is there any way to find out automatically all available tests?
*/
@SuppressWarnings("unchecked")
- public static Class<Test>[] allAvailableTests = new Class[] {
+ private static final Class<Test>[] allAvailableTests = new Class[] {
DuplicateNode.class, // ID 1 .. 99
OverlappingWays.class, // ID 101 .. 199
UntaggedNode.class, // ID 201 .. 299
@@ -108,8 +111,27 @@ public class OsmValidator implements LayerChangeListener {
NodesDuplicatingWayTags.class, // ID 2401 .. 2499
PowerLines.class, // ID 2501 .. 2599
Addresses.class, // ID 2601 .. 2699
+ Highways.class, // ID 2701 .. 2799
+ BarriersEntrances.class, // ID 2801 .. 2899
+ OpeningHourTest.class // 2901 .. 2999
};
+
+ private static Map<String, Test> allTestsMap;
+ static {
+ allTestsMap = new HashMap<String, Test>();
+ for (Class<Test> testClass : allAvailableTests) {
+ try {
+ allTestsMap.put(testClass.getSimpleName(), testClass.newInstance());
+ } catch (Exception e) {
+ Main.error(e);
+ continue;
+ }
+ }
+ }
+ /**
+ * Constructs a new {@code OsmValidator}.
+ */
public OsmValidator() {
checkValidatorDir();
initializeGridDetail();
@@ -122,8 +144,7 @@ public class OsmValidator implements LayerChangeListener {
*
* @return The directory of the plugin
*/
- public static String getValidatorDir()
- {
+ public static String getValidatorDir() {
return Main.pref.getPreferencesDir() + "validator/";
}
@@ -144,8 +165,9 @@ public class OsmValidator implements LayerChangeListener {
private void loadIgnoredErrors() {
ignoredErrors.clear();
if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {
+ BufferedReader in = null;
try {
- final BufferedReader in = new BufferedReader(new FileReader(getValidatorDir() + "ignorederrors"));
+ in = new BufferedReader(new FileReader(getValidatorDir() + "ignorederrors"));
for (String line = in.readLine(); line != null; line = in.readLine()) {
ignoredErrors.add(line);
}
@@ -153,6 +175,8 @@ public class OsmValidator implements LayerChangeListener {
// Ignore
} catch (final IOException e) {
e.printStackTrace();
+ } finally {
+ Utils.close(in);
}
}
}
@@ -166,14 +190,16 @@ public class OsmValidator implements LayerChangeListener {
}
public static void saveIgnoredErrors() {
+ PrintWriter out = null;
try {
- final PrintWriter out = new PrintWriter(new FileWriter(getValidatorDir() + "ignorederrors"), false);
+ out = new PrintWriter(new FileWriter(getValidatorDir() + "ignorederrors"), false);
for (String e : ignoredErrors) {
out.println(e);
}
- out.close();
- } catch (final IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
+ } finally {
+ Utils.close(out);
}
}
@@ -186,21 +212,14 @@ public class OsmValidator implements LayerChangeListener {
}
}
- /** Gets a map from simple names to all tests. */
+ /**
+ * Gets a map from simple names to all tests.
+ * @return A map of all tests, indexed by the simple name of their Java class
+ */
public static Map<String, Test> getAllTestsMap() {
- Map<String, Test> tests = new HashMap<String, Test>();
- for (Class<Test> testClass : getAllAvailableTests()) {
- try {
- Test test = testClass.newInstance();
- tests.put(testClass.getSimpleName(), test);
- } catch (Exception e) {
- e.printStackTrace();
- continue;
- }
- }
- applyPrefs(tests, false);
- applyPrefs(tests, true);
- return tests;
+ applyPrefs(allTestsMap, false);
+ applyPrefs(allTestsMap, true);
+ return new HashMap<String, Test>(allTestsMap);
}
private static void applyPrefs(Map<String, Test> tests, boolean beforeUpload) {
@@ -244,7 +263,7 @@ public class OsmValidator implements LayerChangeListener {
* @return An array of the test classes
*/
public static Class<Test>[] getAllAvailableTests() {
- return allAvailableTests;
+ return Arrays.copyOf(allAvailableTests, allAvailableTests.length);
}
/**
@@ -305,7 +324,7 @@ public class OsmValidator implements LayerChangeListener {
}
if (Main.map.mapView.getLayersOfType(OsmDataLayer.class).isEmpty()) {
if (errorLayer != null) {
- Main.map.mapView.removeLayer(errorLayer);
+ Main.main.removeLayer(errorLayer);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
index 1c5936f..9fe304a 100644
--- a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
@@ -121,7 +121,7 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
@Override
public void visit(OsmPrimitive p) {
if (p.isUsable()) {
- p.visit(this);
+ p.accept(this);
}
}
@@ -241,8 +241,9 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
* Checks if the given segment is in the visible area.
* NOTE: This will return true for a small number of non-visible
* segments.
- * @param ls The segment to check
- * @return true if the segment is visible
+ * @param n1 The first point of the segment to check
+ * @param n2 The second point of the segment to check
+ * @return {@code true} if the segment is visible
*/
protected boolean isSegmentVisible(Node n1, Node n2) {
Point p1 = mv.getPoint(n1);
diff --git a/src/org/openstreetmap/josm/data/validation/Test.java b/src/org/openstreetmap/josm/data/validation/Test.java
index 9dcad25..a4abe74 100644
--- a/src/org/openstreetmap/josm/data/validation/Test.java
+++ b/src/org/openstreetmap/josm/data/validation/Test.java
@@ -22,6 +22,7 @@ import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
/**
* Parent class for all validation tests.
@@ -63,6 +64,10 @@ public class Test extends AbstractVisitor
/** the progress monitor to use */
protected ProgressMonitor progressMonitor;
+
+ /** the start time to compute elapsed time when test finishes */
+ protected long startTime;
+
/**
* Constructor
* @param name Name of the test
@@ -86,6 +91,7 @@ public class Test extends AbstractVisitor
* @throws Exception When cannot initialize the test
*/
public void initialize() throws Exception {
+ this.startTime = -1;
}
/**
@@ -99,8 +105,11 @@ public class Test extends AbstractVisitor
} else {
this.progressMonitor = progressMonitor;
}
- this.progressMonitor.beginTask(tr("Running test {0}", name));
- errors = new ArrayList<TestError>(30);
+ String startMessage = tr("Running test {0}", name);
+ this.progressMonitor.beginTask(startMessage);
+ Main.debug(startMessage);
+ this.errors = new ArrayList<TestError>(30);
+ this.startTime = System.currentTimeMillis();
}
/**
@@ -129,6 +138,10 @@ public class Test extends AbstractVisitor
public void endTest() {
progressMonitor.finishTask();
progressMonitor = null;
+ if (startTime > 0) {
+ long elapsedTime = System.currentTimeMillis() - startTime;
+ Main.info(tr("Test ''{0}'' completed in {1}", getName(), Utils.getDurationString(elapsedTime)));
+ }
}
/**
@@ -140,13 +153,17 @@ public class Test extends AbstractVisitor
public void visit(Collection<OsmPrimitive> selection) {
progressMonitor.setTicksCount(selection.size());
for (OsmPrimitive p : selection) {
- if (p.isUsable()) {
- p.visit(this);
+ if (isPrimitiveUsable(p)) {
+ p.accept(this);
}
progressMonitor.worked(1);
}
}
+ public boolean isPrimitiveUsable(OsmPrimitive p) {
+ return p.isUsable() && (!(p instanceof Way) || (((Way) p).getNodesCount() > 1)); // test only Ways with at least 2 nodes
+ }
+
@Override
public void visit(Node n) {}
@@ -224,7 +241,7 @@ public class Test extends AbstractVisitor
public boolean isCanceled() {
return progressMonitor.isCanceled();
}
-
+
/**
* Build a Delete command on all primitives that have not yet been deleted manually by user, or by another error fix.
* If all primitives have already been deleted, null is returned.
@@ -239,7 +256,7 @@ public class Test extends AbstractVisitor
}
}
if (!primitivesToDelete.isEmpty()) {
- return DeleteCommand.delete(Main.map.mapView.getEditLayer(), primitivesToDelete);
+ return DeleteCommand.delete(Main.main.getEditLayer(), primitivesToDelete);
} else {
return null;
}
diff --git a/src/org/openstreetmap/josm/data/validation/TestError.java b/src/org/openstreetmap/josm/data/validation/TestError.java
index 2ed6ee7..a659d11 100644
--- a/src/org/openstreetmap/josm/data/validation/TestError.java
+++ b/src/org/openstreetmap/josm/data/validation/TestError.java
@@ -7,18 +7,29 @@ import java.util.Collections;
import java.util.List;
import java.util.TreeSet;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
/**
* Validation error
- * @author frsantos
+ * @since 3669
*/
-public class TestError {
+public class TestError implements Comparable<TestError>, DataSetListener {
/** is this error on the ignore list */
private Boolean ignored = false;
/** Severity */
@@ -40,7 +51,7 @@ public class TestError {
private boolean selected;
/**
- * Constructors
+ * Constructs a new {@code TestError}.
* @param tester The tester
* @param severity The severity of this error
* @param message The error message
@@ -120,21 +131,19 @@ public class TestError {
* @return the list of selectable primitives affected by this error
*/
public Collection<? extends OsmPrimitive> getSelectablePrimitives() {
- List<OsmPrimitive> selectablePrimitives = new ArrayList<OsmPrimitive>(primitives.size());
- for (OsmPrimitive o : primitives) {
- if (o.isSelectable()) {
- selectablePrimitives.add(o);
- }
- }
+ List<OsmPrimitive> selectablePrimitives = new ArrayList<OsmPrimitive>(primitives.size());
+ for (OsmPrimitive o : primitives) {
+ if (o.isSelectable()) {
+ selectablePrimitives.add(o);
+ }
+ }
return selectablePrimitives;
}
-
/**
* Sets the list of primitives affected by this error
* @param primitives the list of primitives affected by this error
*/
-
public void setPrimitives(List<OsmPrimitive> primitives) {
this.primitives = primitives;
}
@@ -160,7 +169,7 @@ public class TestError {
*/
public String getIgnoreState() {
Collection<String> strings = new TreeSet<String>();
- String ignorestring = getIgnoreSubGroup();
+ StringBuilder ignorestring = new StringBuilder(getIgnoreSubGroup());
for (OsmPrimitive o : primitives) {
// ignore data not yet uploaded
if (o.isNew())
@@ -176,9 +185,9 @@ public class TestError {
strings.add(type + "_" + o.getId());
}
for (String o : strings) {
- ignorestring += ":" + o;
+ ignorestring.append(":").append(o);
}
- return ignorestring;
+ return ignorestring.toString();
}
public String getIgnoreSubGroup() {
@@ -232,7 +241,7 @@ public class TestError {
* @return The command to fix the error
*/
public Command getFix() {
- if (tester == null || !tester.isFixable(this))
+ if (tester == null || !tester.isFixable(this) || primitives.isEmpty())
return null;
return tester.fixError(this);
@@ -276,4 +285,42 @@ public class TestError {
public Collection<?> getHighlighted() {
return highlighted;
}
+
+ @Override
+ public int compareTo(TestError o) {
+ if (equals(o)) return 0;
+
+ MultipleNameVisitor v1 = new MultipleNameVisitor();
+ MultipleNameVisitor v2 = new MultipleNameVisitor();
+
+ v1.visit(getPrimitives());
+ v2.visit(o.getPrimitives());
+ return v1.toString().compareToIgnoreCase(v2.toString());
+ }
+
+ @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {
+ // Remove purged primitives (fix #8639)
+ try {
+ primitives.removeAll(event.getPrimitives());
+ } catch (UnsupportedOperationException e) {
+ if (event.getPrimitives().containsAll(primitives)) {
+ primitives = Collections.emptyList();
+ } else {
+ Main.warn("Unable to remove primitives from "+this);
+ }
+ }
+ }
+
+ @Override public void primitivesAdded(PrimitivesAddedEvent event) {}
+ @Override public void tagsChanged(TagsChangedEvent event) {}
+ @Override public void nodeMoved(NodeMovedEvent event) {}
+ @Override public void wayNodesChanged(WayNodesChangedEvent event) {}
+ @Override public void relationMembersChanged(RelationMembersChangedEvent event) {}
+ @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {}
+ @Override public void dataChanged(DataChangedEvent event) {}
+
+ @Override
+ public String toString() {
+ return "TestError [tester=" + tester + ", code=" + code + "]";
+ }
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
index ea5ce6f..bdb9f2a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
@@ -12,6 +12,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.openstreetmap.josm.Main;
@@ -38,14 +39,13 @@ public class Addresses extends Test {
protected static final int MULTIPLE_STREET_NAMES = 2603;
protected static final int MULTIPLE_STREET_RELATIONS = 2604;
protected static final int HOUSE_NUMBER_TOO_FAR = 2605;
- protected static final int HOUSE_NUMBER_ON_NON_BUILDING_AREA = 2606;
-
+
protected static final String ADDR_HOUSE_NUMBER = "addr:housenumber";
protected static final String ADDR_INTERPOLATION = "addr:interpolation";
protected static final String ADDR_PLACE = "addr:place";
protected static final String ADDR_STREET = "addr:street";
protected static final String ASSOCIATED_STREET = "associatedStreet";
-
+
protected class AddressError extends TestError {
public AddressError(int code, OsmPrimitive p, String message) {
@@ -54,18 +54,18 @@ public class Addresses extends Test {
public AddressError(int code, Collection<OsmPrimitive> collection, String message) {
this(code, collection, message, null, null);
}
- public AddressError(int code, Collection<OsmPrimitive> collection, String message, String description, String description_en) {
- super(Addresses.this, Severity.WARNING, message, description, description_en, code, collection);
+ public AddressError(int code, Collection<OsmPrimitive> collection, String message, String description, String englishDescription) {
+ super(Addresses.this, Severity.WARNING, message, description, englishDescription, code, collection);
}
}
-
+
/**
* Constructor
*/
public Addresses() {
super(tr("Addresses"), tr("Checks for errors in addresses and associatedStreet relations."));
}
-
+
protected List<Relation> getAndCheckAssociatedStreets(OsmPrimitive p) {
List<Relation> list = OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class);
for (Iterator<Relation> it = list.iterator(); it.hasNext();) {
@@ -85,13 +85,18 @@ public class Addresses extends Test {
@Override
public void visit(Node n) {
List<Relation> associatedStreets = getAndCheckAssociatedStreets(n);
- // Find house number without proper location (neither addr:street, associatedStreet or addr:place)
+ // Find house number without proper location (neither addr:street, associatedStreet, addr:place or addr:interpolation)
if (n.hasKey(ADDR_HOUSE_NUMBER) && !n.hasKey(ADDR_STREET) && !n.hasKey(ADDR_PLACE)) {
for (Relation r : associatedStreets) {
if (r.hasTag("type", ASSOCIATED_STREET)) {
return;
}
}
+ for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+ if (w.hasKey(ADDR_INTERPOLATION) && w.hasKey(ADDR_STREET)) {
+ return;
+ }
+ }
// No street found
errors.add(new AddressError(HOUSE_NUMBER_WITHOUT_STREET, n, tr("House number without street")));
}
@@ -100,9 +105,6 @@ public class Addresses extends Test {
@Override
public void visit(Way w) {
getAndCheckAssociatedStreets(w);
- if (w.isArea() && w.hasKey(ADDR_HOUSE_NUMBER) && !w.hasKey("building")) {
- errors.add(new AddressError(HOUSE_NUMBER_ON_NON_BUILDING_AREA, w, tr("House number on a non-building area")));
- }
}
@Override
@@ -144,17 +146,17 @@ public class Addresses extends Test {
}
}
// Report duplicate house numbers
- String description_en = marktr("House number ''{0}'' duplicated");
- for (String key : map.keySet()) {
- List<OsmPrimitive> list = map.get(key);
+ String englishDescription = marktr("House number ''{0}'' duplicated");
+ for (Entry<String, List<OsmPrimitive>> entry : map.entrySet()) {
+ List<OsmPrimitive> list = entry.getValue();
if (list.size() > 1) {
- errors.add(new AddressError(DUPLICATE_HOUSE_NUMBER, list,
- tr("Duplicate house numbers"), tr(description_en, key), description_en));
+ errors.add(new AddressError(DUPLICATE_HOUSE_NUMBER, list,
+ tr("Duplicate house numbers"), tr(englishDescription, entry.getKey()), englishDescription));
}
}
// Report wrong street names
if (!wrongStreetNames.isEmpty()) {
- errors.add(new AddressError(MULTIPLE_STREET_NAMES, wrongStreetNames,
+ errors.add(new AddressError(MULTIPLE_STREET_NAMES, wrongStreetNames,
tr("Multiple street names in relation")));
}
// Report addresses too far away
@@ -167,7 +169,7 @@ public class Addresses extends Test {
}
}
}
-
+
protected void checkDistance(OsmPrimitive house, Collection<Way> street) {
EastNorth centroid;
if (house instanceof Node) {
@@ -191,10 +193,15 @@ public class Addresses extends Test {
boolean hasIncompleteWays = false;
for (Way streetPart : street) {
for (Pair<Node, Node> chunk : streetPart.getNodePairs(false)) {
- EastNorth closest = Geometry.closestPointToSegment(
- chunk.a.getEastNorth(), chunk.b.getEastNorth(), centroid);
- if (closest.distance(centroid) <= maxDistance) {
- return;
+ EastNorth p1 = chunk.a.getEastNorth();
+ EastNorth p2 = chunk.b.getEastNorth();
+ if (p1 != null && p2 != null) {
+ EastNorth closest = Geometry.closestPointToSegment(p1, p2, centroid);
+ if (closest.distance(centroid) <= maxDistance) {
+ return;
+ }
+ } else {
+ Main.warn("Addresses test skipped chunck "+chunk+" for street part "+streetPart+" because p1 or p2 is null");
}
}
if (!hasIncompleteWays && streetPart.isIncomplete()) {
@@ -205,7 +212,7 @@ public class Addresses extends Test {
if (hasIncompleteWays) return;
List<OsmPrimitive> errorList = new ArrayList<OsmPrimitive>(street);
errorList.add(0, house);
- errors.add(new AddressError(HOUSE_NUMBER_TOO_FAR, errorList,
+ errors.add(new AddressError(HOUSE_NUMBER_TOO_FAR, errorList,
tr("House number too far from street")));
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/BarriersEntrances.java b/src/org/openstreetmap/josm/data/validation/tests/BarriersEntrances.java
new file mode 100644
index 0000000..24144aa
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/validation/tests/BarriersEntrances.java
@@ -0,0 +1,38 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.Test;
+import org.openstreetmap.josm.data.validation.TestError;
+
+/**
+ * Performs validation tests on barriers and entrances.
+ * @since 6192
+ */
+public class BarriersEntrances extends Test {
+
+ protected static final int BARRIER_ENTRANCE_WITHOUT_BARRIER = 2801;
+
+ /**
+ * Constructor
+ */
+ public BarriersEntrances() {
+ super(tr("Barriers and entrances"), tr("Checks for errors in barriers and entrances."));
+ }
+
+ @Override
+ public void visit(Node n) {
+ if (n.hasTag("barrier", "entrance")) {
+ for (OsmPrimitive p : n.getReferrers()) {
+ if (p.hasKey("barrier")) {
+ return;
+ }
+ }
+ errors.add(new TestError(this, Severity.WARNING, tr("Barrier entrance not set on a barrier"), BARRIER_ENTRANCE_WITHOUT_BARRIER, n));
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java b/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java
index 9806a9c..313b9ac 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java
@@ -24,12 +24,19 @@ import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
import org.openstreetmap.josm.tools.Predicate;
+/**
+ * Checks for building areas inside of buildings
+ * @since 4409
+ */
public class BuildingInBuilding extends Test {
protected static final int BUILDING_INSIDE_BUILDING = 2001;
- protected List<OsmPrimitive> primitivesToCheck = new LinkedList<OsmPrimitive>();
- protected QuadBuckets<Way> index = new QuadBuckets<Way>();
+ private final List<OsmPrimitive> primitivesToCheck = new LinkedList<OsmPrimitive>();
+ private final QuadBuckets<Way> index = new QuadBuckets<Way>();
+ /**
+ * Constructs a new {@code BuildingInBuilding} test.
+ */
public BuildingInBuilding() {
super(tr("Building inside building"), tr("Checks for building areas inside of buildings."));
}
@@ -66,8 +73,8 @@ public class BuildingInBuilding extends Test {
}
protected class MultiPolygonMembers {
- public final Set<Way> outers = new HashSet<Way>();
- public final Set<Way> inners = new HashSet<Way>();
+ private final Set<Way> outers = new HashSet<Way>();
+ private final Set<Way> inners = new HashSet<Way>();
public MultiPolygonMembers(Relation multiPolygon) {
for (RelationMember m : multiPolygon.getMembers()) {
if (m.getType().equals(OsmPrimitiveType.WAY)) {
@@ -80,13 +87,13 @@ public class BuildingInBuilding extends Test {
}
}
}
-
+
protected boolean sameLayers(Way w1, Way w2) {
String l1 = w1.get("layer") != null ? w1.get("layer") : "0";
String l2 = w2.get("layer") != null ? w2.get("layer") : "0";
return l1.equals(l2);
}
-
+
protected boolean isWayInsideMultiPolygon(Way object, Relation multiPolygon) {
// Extract outer/inner members from multipolygon
MultiPolygonMembers mpm = new MultiPolygonMembers(multiPolygon);
@@ -114,19 +121,19 @@ public class BuildingInBuilding extends Test {
}
return false;
}
-
+
@Override
public void endTest() {
for (final OsmPrimitive p : primitivesToCheck) {
Collection<Way> outers = new FilteredCollection<Way>(index.search(p.getBBox()), new Predicate<Way>() {
-
+
protected boolean evaluateNode(Node n, Way object) {
return isInPolygon(n, object.getNodes()) || object.getNodes().contains(n);
}
-
+
protected boolean evaluateWay(Way w, Way object) {
if (w.equals(object)) return false;
-
+
// Get all multipolygons referencing object
Collection<OsmPrimitive> buildingMultiPolygons = new FilteredCollection<OsmPrimitive>(object.getReferrers(), new Predicate<OsmPrimitive>() {
@Override
@@ -134,7 +141,7 @@ public class BuildingInBuilding extends Test {
return primitivesToCheck.contains(object);
}
}) ;
-
+
// if there's none, test if w is inside object
if (buildingMultiPolygons.isEmpty()) {
PolygonIntersection inter = Geometry.polygonIntersection(w.getNodes(), object.getNodes());
@@ -143,16 +150,14 @@ public class BuildingInBuilding extends Test {
} else {
// Else, test if w is inside one of the multipolygons
for (OsmPrimitive bmp : buildingMultiPolygons) {
- if (bmp instanceof Relation) {
- if (isWayInsideMultiPolygon(w, (Relation) bmp)) {
- return true;
- }
+ if (bmp instanceof Relation && isWayInsideMultiPolygon(w, (Relation) bmp)) {
+ return true;
}
}
return false;
}
}
-
+
protected boolean evaluateRelation(Relation r, Way object) {
MultiPolygonMembers mpm = new MultiPolygonMembers((Relation) p);
for (Way out : mpm.outers) {
@@ -162,7 +167,7 @@ public class BuildingInBuilding extends Test {
}
return false;
}
-
+
@Override
public boolean evaluate(Way object) {
if (p.equals(object))
@@ -176,12 +181,15 @@ public class BuildingInBuilding extends Test {
return false;
}
});
-
+
if (!outers.isEmpty()) {
errors.add(new TestError(this, Severity.WARNING,
tr("Building inside building"), BUILDING_INSIDE_BUILDING, p));
}
}
+
+ primitivesToCheck.clear();
+ index.clear();
super.endTest();
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java b/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
index 58326e6..9da1ad8 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
@@ -7,6 +7,7 @@ import java.awt.geom.Area;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -51,7 +52,7 @@ public class Coastlines extends Test {
super.startTest(monitor);
- OsmDataLayer layer = Main.map.mapView.getEditLayer();
+ OsmDataLayer layer = Main.main.getEditLayer();
if (layer != null) {
downloadedArea = layer.data.getDataSourceArea();
@@ -149,14 +150,14 @@ public class Coastlines extends Test {
if (headWays == 0 || tailWays == 0) {
List<OsmPrimitive> highlight = new ArrayList<OsmPrimitive>();
- if (headWays == 0 && (downloadedArea == null || downloadedArea.contains(head.getCoor()))) {
+ if (headWays == 0 && head.getCoor().isIn(downloadedArea)) {
highlight.add(head);
}
- if (tailWays == 0 && (downloadedArea == null || downloadedArea.contains(tail.getCoor()))) {
+ if (tailWays == 0 && tail.getCoor().isIn(downloadedArea)) {
highlight.add(tail);
}
- if (highlight.size() > 0) {
+ if (!highlight.isEmpty()) {
errors.add(new TestError(this, Severity.ERROR, tr("Unconnected coastline"),
UNCONNECTED_COASTLINE, primitives, highlight));
}
@@ -217,14 +218,18 @@ public class Coastlines extends Test {
@Override
public Command fixError(TestError testError) {
if (isFixable(testError)) {
- Way way = (Way) testError.getPrimitives().iterator().next();
- Way newWay = new Way(way);
+ // primitives list can be empty if all primitives have been purged
+ Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
+ if (it.hasNext()) {
+ Way way = (Way) it.next();
+ Way newWay = new Way(way);
- List<Node> nodesCopy = newWay.getNodes();
- Collections.reverse(nodesCopy);
- newWay.setNodes(nodesCopy);
+ List<Node> nodesCopy = newWay.getNodes();
+ Collections.reverse(nodesCopy);
+ newWay.setNodes(nodesCopy);
- return new ChangeCommand(way, newWay);
+ return new ChangeCommand(way, newWay);
+ }
}
return null;
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
index 73b58af..d9cc71e 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
@@ -11,6 +11,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.Way;
@@ -31,11 +32,11 @@ public class CrossingWays extends Test {
protected static final int CROSSING_WAYS = 601;
/** All way segments, grouped by cells */
- Map<Point2D,List<ExtendedSegment>> cellSegments;
+ private Map<Point2D,List<ExtendedSegment>> cellSegments;
/** The already detected errors */
- HashSet<WaySegment> errorSegments;
+ private Set<WaySegment> errorSegments;
/** The already detected ways in error */
- Map<List<Way>, List<WaySegment>> ways_seen;
+ private Map<List<Way>, List<WaySegment>> seenWays;
/**
* Constructor
@@ -50,7 +51,7 @@ public class CrossingWays extends Test {
super.startTest(monitor);
cellSegments = new HashMap<Point2D,List<ExtendedSegment>>(1000);
errorSegments = new HashSet<WaySegment>();
- ways_seen = new HashMap<List<Way>, List<WaySegment>>(50);
+ seenWays = new HashMap<List<Way>, List<WaySegment>>(50);
}
@Override
@@ -58,7 +59,7 @@ public class CrossingWays extends Test {
super.endTest();
cellSegments = null;
errorSegments = null;
- ways_seen = null;
+ seenWays = null;
}
@Override
@@ -69,6 +70,7 @@ public class CrossingWays extends Test {
String natural1 = w.get("natural");
String landuse1 = w.get("landuse");
boolean isCoastline1 = "water".equals(natural1) || "coastline".equals(natural1) || "reservoir".equals(landuse1);
+ String highway1 = w.get("highway");
String railway1 = w.get("railway");
boolean isSubway1 = "subway".equals(railway1);
boolean isTram1 = "tram".equals(railway1);
@@ -80,17 +82,17 @@ public class CrossingWays extends Test {
&& !isCoastline1 && !isBuilding)
return;
+ String level1 = w.get("level");
String layer1 = w.get("layer");
if ("0".equals(layer1)) {
- layer1 = null; //0 is default value
+ layer1 = null; // 0 is default value for layer. Don't assume the same for levels
}
int nodesSize = w.getNodesCount();
for (int i = 0; i < nodesSize - 1; i++) {
WaySegment ws = new WaySegment(w, i);
- ExtendedSegment es1 = new ExtendedSegment(ws, layer1, railway1, isCoastline1, waterway1);
- List<List<ExtendedSegment>> cellSegments = getSegments(es1.n1, es1.n2);
- for (List<ExtendedSegment> segments : cellSegments) {
+ ExtendedSegment es1 = new ExtendedSegment(ws, layer1, highway1, railway1, isCoastline1, waterway1, level1);
+ for (List<ExtendedSegment> segments : getSegments(es1.n1, es1.n2)) {
for (ExtendedSegment es2 : segments) {
List<Way> prims;
List<WaySegment> highlight;
@@ -99,12 +101,18 @@ public class CrossingWays extends Test {
continue;
}
+ String level2 = es2.level;
String layer2 = es2.layer;
+ String highway2 = es2.highway;
String railway2 = es2.railway;
boolean isCoastline2 = es2.coastline;
if (layer1 == null ? layer2 != null : !layer1.equals(layer2)) {
continue;
}
+ // Ignore indoor highways on different levels
+ if (highway1 != null && highway2 != null && level1 != null && level2 != null && !level1.equals(level2)) {
+ continue;
+ }
if (!es1.intersects(es2) ) {
continue;
@@ -124,13 +132,14 @@ public class CrossingWays extends Test {
continue;
}
- if ((es1.railway != null && es1.railway.equals("abandoned"))
- || (railway2 != null && railway2.equals("abandoned"))) {
+ if ("proposed".equals(es1.highway) || "proposed".equals(highway2)
+ || "proposed".equals(es1.railway) || "proposed".equals(railway2)
+ || "abandoned".equals(es1.railway) || "abandoned".equals(railway2)) {
continue;
}
prims = Arrays.asList(es1.ws.way, es2.ws.way);
- if ((highlight = ways_seen.get(prims)) == null) {
+ if ((highlight = seenWays.get(prims)) == null) {
highlight = new ArrayList<WaySegment>();
highlight.add(es1.ws);
highlight.add(es2.ws);
@@ -140,8 +149,8 @@ public class CrossingWays extends Test {
message = tr("Crossing buildings");
} else if ((es1.waterway != null && es2.waterway != null)) {
message = tr("Crossing waterways");
- } else if ((es1.waterway != null && es2.ws.way.get("highway") != null)
- || (es2.waterway != null && es1.ws.way.get("highway") != null)) {
+ } else if ((es1.waterway != null && es2.highway != null)
+ || (es2.waterway != null && es1.highway != null)) {
message = tr("Crossing waterway/highway");
} else {
message = tr("Crossing ways");
@@ -152,7 +161,7 @@ public class CrossingWays extends Test {
CROSSING_WAYS,
prims,
highlight));
- ways_seen.put(prims, highlight);
+ seenWays.put(prims, highlight);
} else {
highlight.add(es1.ws);
highlight.add(es2.ws);
@@ -187,41 +196,50 @@ public class CrossingWays extends Test {
/**
* A way segment with some additional information
- * @author frsantos
*/
public static class ExtendedSegment {
- public Node n1, n2;
+ private final Node n1, n2;
- public WaySegment ws;
+ private final WaySegment ws;
/** The layer */
- public String layer;
+ private final String layer;
+
+ /** The highway type */
+ private final String highway;
/** The railway type */
- public String railway;
+ private final String railway;
/** The waterway type */
- public String waterway;
+ private final String waterway;
/** The coastline type */
- public boolean coastline;
+ private final boolean coastline;
+
+ /** The level, only considered for indoor highways */
+ private final String level;
/**
* Constructor
* @param ws The way segment
* @param layer The layer of the way this segment is in
+ * @param highway The highway type of the way this segment is in
* @param railway The railway type of the way this segment is in
* @param coastline The coastline flag of the way the segment is in
* @param waterway The waterway type of the way this segment is in
+ * @param level The level of the way this segment is in
*/
- public ExtendedSegment(WaySegment ws, String layer, String railway, boolean coastline, String waterway) {
+ public ExtendedSegment(WaySegment ws, String layer, String highway, String railway, boolean coastline, String waterway, String level) {
this.ws = ws;
this.n1 = ws.way.getNodes().get(ws.lowerIndex);
this.n2 = ws.way.getNodes().get(ws.lowerIndex + 1);
this.layer = layer;
+ this.highway = highway;
this.railway = railway;
this.coastline = coastline;
this.waterway = waterway;
+ this.level = level;
}
/**
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java b/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
index 169e4a0..7012402 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
@@ -1,12 +1,16 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.ChangePropertyKeyCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.Node;
@@ -19,16 +23,23 @@ import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * Checks and corrects deprecated and unnecessary tags.
+ * @since 4442
+ */
public class DeprecatedTags extends Test {
- private List<DeprecationCheck> checks = new LinkedList<DeprecationCheck>();
+ private final List<DeprecationCheck> checks = new LinkedList<DeprecationCheck>();
+ /**
+ * Constructs a new {@code DeprecatedTags} test.
+ */
public DeprecatedTags() {
super(tr("Deprecated Tags"), tr("Checks and corrects deprecated tags."));
checks.add(new DeprecationCheck(2101).
testAndRemove("barrier", "wire_fence").
add("barrier", "fence").
- add("fence_type", "chain"));
+ add("fence_type", "chain_link"));
checks.add(new DeprecationCheck(2102).
testAndRemove("barrier", "wood_fence").
add("barrier", "fence").
@@ -44,13 +55,11 @@ public class DeprecatedTags extends Test {
testAndRemove("highway", "stile").
add("barrier", "stile"));
checks.add(new DeprecationCheck(2106).
- testAndRemove("highway", "incline").
- add("highway", "road").
- add("incline", "up"));
+ test("highway", "incline").
+ alternative("incline"));
checks.add(new DeprecationCheck(2107).
- testAndRemove("highway", "incline_steep").
- add("highway", "road").
- add("incline", "up"));
+ test("highway", "incline").
+ alternative("incline"));
checks.add(new DeprecationCheck(2108).
testAndRemove("highway", "unsurfaced").
add("highway", "road").
@@ -71,7 +80,7 @@ public class DeprecatedTags extends Test {
checks.add(new DeprecationCheck(2113).
test("power_rating").
alternative("generator:output"));
- // from http://wiki.openstreetmap.org/wiki/Tag:shop%3Dorganic
+ // from http://wiki.openstreetmap.org/wiki/Tag:shop=organic
checks.add(new DeprecationCheck(2114).
testAndRemove("shop", "organic").
add("shop", "supermarket").
@@ -84,8 +93,61 @@ public class DeprecatedTags extends Test {
checks.add(new DeprecationCheck(2116).
testAndRemove("amenity", "emergency_phone").
add("emergency", "phone"));
+ // fix #8132 - http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_football
+ checks.add(new DeprecationCheck(2117).
+ testAndRemove("sport", "gaelic_football").
+ add("sport", "gaelic_games"));
+ // see #8847 / #8961 - http://wiki.openstreetmap.org/wiki/Tag:power=station
+ checks.add(new DeprecationCheck(2118).
+ test("power", "station").
+ alternative("power", "plant").
+ alternative("power", "sub_station"));
+ checks.add(new DeprecationCheck(2119).
+ testAndRemove("generator:method", "dam").
+ add("generator:method", "water-storage"));
+ checks.add(new DeprecationCheck(2120).
+ testAndRemove("generator:method", "pumped-storage").
+ add("generator:method", "water-pumped-storage"));
+ checks.add(new DeprecationCheck(2121).
+ testAndRemove("generator:method", "pumping").
+ add("generator:method", "water-pumped-storage"));
+ // see #8962 - http://wiki.openstreetmap.org/wiki/Key:fence_type
+ checks.add(new DeprecationCheck(2122).
+ test("fence_type", "chain").
+ alternative("barrier", "chain").
+ alternative("fence_type", "chain_link"));
+ // see #9000 - http://wiki.openstreetmap.org/wiki/Key:entrance
+ checks.add(new DeprecationCheck(2123).
+ test("building", "entrance").
+ alternative("entrance"));
+ // see #9213 - Useless tag proposed in internal preset for years
+ checks.add(new DeprecationCheck(2124).
+ testAndRemove("board_type", "board"));
+ // see #8434 - http://wiki.openstreetmap.org/wiki/Proposed_features/monitoring_station
+ checks.add(new DeprecationCheck(2125).
+ testAndRemove("man_made", "measurement_station").
+ add("man_made", "monitoring_station"));
+ checks.add(new DeprecationCheck(2126).
+ testAndRemove("measurement", "water_level").
+ add("monitoring:water_level", "yes"));
+ checks.add(new DeprecationCheck(2127).
+ testAndRemove("measurement", "weather").
+ add("monitoring:weather", "yes"));
+ checks.add(new DeprecationCheck(2128).
+ testAndRemove("measurement", "seismic").
+ add("monitoring:seismic_activity", "yes"));
+ checks.add(new DeprecationCheck(2129).
+ test("monitoring:river_level").
+ changeKey("monitoring:river_level", "monitoring:water_level"));
+ // see #9365 - Useless tag layer=0
+ checks.add(new UnnecessaryTagCheck(2130).
+ testAndRemove("layer", "0"));
}
+ /**
+ * Visiting call for primitives.
+ * @param p The primitive to inspect.
+ */
public void visit(OsmPrimitive p) {
for (DeprecationCheck check : checks) {
if (check.matchesPrimitive(p)) {
@@ -109,53 +171,107 @@ public class DeprecatedTags extends Test {
visit((OsmPrimitive) r);
}
+ /**
+ * Represents on deprecation check consisting of a series of {@code test}s,
+ * automatic {@code change}s/{@code keyChange}s (fixes for the deprecated tag),
+ * or a suggestion of tagging {@code alternatives}.
+ */
private static class DeprecationCheck {
- int code;
- List<Tag> test = new LinkedList<Tag>();
- List<Tag> change = new LinkedList<Tag>();
- List<Tag> alternatives = new LinkedList<Tag>();
+ private int code;
+ protected final List<Tag> test = new LinkedList<Tag>();
+ protected final List<Tag> change = new LinkedList<Tag>();
+ protected final Map<String, String> keyChange = new LinkedHashMap<String, String>();
+ protected final List<Tag> alternatives = new LinkedList<Tag>();
+ /**
+ * Creates a new {@code DeprecationCheck}.
+ * @param code {@link TestError#code}
+ */
public DeprecationCheck(int code) {
this.code = code;
}
+ /**
+ * Adds a test criterion which matches primitives with tag {@code key=value}.
+ * @return {@code this}
+ */
DeprecationCheck test(String key, String value) {
test.add(new Tag(key, value));
return this;
}
+ /**
+ * Adds a test criterion which matches primitives with key {@code key}.
+ * @return {@code this}
+ */
DeprecationCheck test(String key) {
return test(key, null);
}
+ /**
+ * Adds an automatic fix which sets/adds the tag {@code key=value}.
+ * @return {@code this}
+ * @see #alternative(String, String)
+ * @see #alternative(String)
+ */
DeprecationCheck add(String key, String value) {
change.add(new Tag(key, value));
return this;
}
+ /**
+ * Adds an automatic fix which removes the key {@code key}.
+ * @return {@code this}
+ */
DeprecationCheck remove(String key) {
change.add(new Tag(key));
return this;
}
- DeprecationCheck testAndRemove(String key, String value) {
- return test(key, value).remove(key);
+ /**
+ * Adds an automatic fix which changes the key {@code oldKey} to {@code newKey}.
+ * @return {@code this}
+ */
+ DeprecationCheck changeKey(String oldKey, String newKey) {
+ keyChange.put(oldKey, newKey);
+ return this;
}
- DeprecationCheck testAndRemove(String key) {
- return test(key).remove(key);
+ /**
+ * Adds a test criterion which matches primitives with tag {@code key=value},
+ * and an automatic fix which removes the key {@code key}.
+ * Equivalent to {@link #test(String, String)} plus {@link #remove(String)}.
+ * @return {@code this}
+ */
+ DeprecationCheck testAndRemove(String key, String value) {
+ return test(key, value).remove(key);
}
+ /**
+ * Adds a suggestion to use an alternative tag {@code key=value} instead of the deprecated tag.
+ * This is used for cases where no automatic fix is sensible.
+ * @return {@code this}
+ */
DeprecationCheck alternative(String key, String value) {
alternatives.add(new Tag(key, value));
return this;
}
+ /**
+ * Adds a suggestion to use an alternative key {@code key} instead of the deprecated tag.
+ * This is used for cases where no automatic fix is sensible.
+ * @return {@code this}
+ */
DeprecationCheck alternative(String key) {
return alternative(key, null);
}
+ /**
+ * Tests whether the {@link OsmPrimitive} contains a deprecated tag which is represented by this {@code DeprecationCheck}.
+ * @param p the primitive to test
+ * @return true when the primitive contains a deprecated tag
+ */
boolean matchesPrimitive(OsmPrimitive p) {
for (Tag tag : test) {
String key = tag.getKey();
@@ -168,14 +284,26 @@ public class DeprecatedTags extends Test {
return true;
}
+ /**
+ * Constructs a fix in terms of a {@link Command} for the {@link OsmPrimitive}.
+ * @param p the primitive to construct the fix for
+ * @return the fix
+ */
Command fixPrimitive(OsmPrimitive p) {
Collection<Command> cmds = new LinkedList<Command>();
for (Tag tag : change) {
cmds.add(new ChangePropertyCommand(p, tag.getKey(), tag.getValue()));
}
+ for (Map.Entry<String, String> i : keyChange.entrySet()) {
+ cmds.add(new ChangePropertyKeyCommand(p, i.getKey(), i.getValue()));
+ }
return new SequenceCommand(tr("Deprecation fix of {0}", Utils.join(", ", test)), cmds);
}
+ /**
+ * Constructs a localized description for this deprecation check.
+ * @return a localized description
+ */
String getDescription() {
if (alternatives.isEmpty())
return tr("{0} is deprecated", Utils.join(", ", test));
@@ -183,13 +311,25 @@ public class DeprecatedTags extends Test {
return tr("{0} is deprecated, use {1} instead", Utils.join(", ", test), Utils.join(tr(" or "), alternatives));
}
}
+
+ private static class UnnecessaryTagCheck extends DeprecationCheck {
+
+ public UnnecessaryTagCheck(int code) {
+ super(code);
+ }
+
+ @Override
+ String getDescription() {
+ return tr("{0} is unnecessary", Utils.join(", ", test));
+ }
+ }
private class DeprecationError extends TestError {
- OsmPrimitive p;
- DeprecationCheck check;
+ private OsmPrimitive p;
+ private DeprecationCheck check;
- DeprecationError(OsmPrimitive p, DeprecationCheck check) {
+ public DeprecationError(OsmPrimitive p, DeprecationCheck check) {
super(DeprecatedTags.this, Severity.WARNING, check.getDescription(), check.code, p);
this.p = p;
this.check = check;
@@ -197,7 +337,7 @@ public class DeprecatedTags extends Test {
@Override
public boolean isFixable() {
- return !check.change.isEmpty();
+ return !check.change.isEmpty() || !check.keyChange.isEmpty();
}
@Override
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
index 3082550..9e4491b 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
@@ -14,6 +14,7 @@ import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.openstreetmap.josm.Main;
@@ -42,7 +43,7 @@ public class DuplicateNode extends Test {
private static class NodeHash implements Hash<Object, Object> {
- double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);
+ private double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);
private LatLon roundCoord(LatLon coor) {
return new LatLon(
@@ -88,7 +89,6 @@ public class DuplicateNode extends Test {
protected final static int DUPLICATE_NODE = 1;
protected final static int DUPLICATE_NODE_MIXED = 2;
protected final static int DUPLICATE_NODE_OTHER = 3;
- protected final static int DUPLICATE_NODE_UNCLOSED = 4;
protected final static int DUPLICATE_NODE_BUILDING = 10;
protected final static int DUPLICATE_NODE_BOUNDARY = 11;
protected final static int DUPLICATE_NODE_HIGHWAY = 12;
@@ -104,7 +104,7 @@ public class DuplicateNode extends Test {
* If there are multiple nodes for a given pos, the map includes a pair
* <pos, NodesByEqualTagsMap>
*/
- Storage<Object> potentialDuplicates;
+ private Storage<Object> potentialDuplicates;
/**
* Constructor
@@ -145,7 +145,7 @@ public class DuplicateNode extends Test {
// Do not report this as an error
continue;
}
-
+
// report errors
errors.addAll(buildTestErrors(this, nodes));
}
@@ -153,6 +153,12 @@ public class DuplicateNode extends Test {
potentialDuplicates = null;
}
+ /**
+ * Returns the list of "duplicate nodes" errors for the given selection of node and parent test
+ * @param parentTest The parent test of returned errors
+ * @param nodes The nodes selction to look into
+ * @return the list of "duplicate nodes" errors
+ */
public List<TestError> buildTestErrors(Test parentTest, List<Node> nodes) {
List<TestError> errors = new ArrayList<TestError>();
@@ -172,8 +178,6 @@ public class DuplicateNode extends Test {
Map<String,String> tagSet = it.next();
if (mm.get(tagSet).size() > 1) {
- boolean oneWayClosed = false;
-
for (String type: types) {
typeMap.put(type, false);
}
@@ -186,7 +190,6 @@ public class DuplicateNode extends Test {
if (sp.getType()==OsmPrimitiveType.WAY) {
boolean typed = false;
Way w=(Way) sp;
- oneWayClosed = oneWayClosed || w.isClosed();
Map<String, String> keys = w.getKeys();
for (String type: typeMap.keySet()) {
if (keys.containsKey(type)) {
@@ -204,24 +207,13 @@ public class DuplicateNode extends Test {
}
int nbType=0;
- for (String type: typeMap.keySet()) {
- if (typeMap.get(type)) {
+ for (Entry<String, Boolean> entry: typeMap.entrySet()) {
+ if (entry.getValue()) {
nbType++;
}
}
- if (!oneWayClosed) {
- String msg = marktr("Duplicate nodes in two un-closed ways");
- errors.add(new TestError(
- parentTest,
- Severity.WARNING,
- tr("Duplicated nodes"),
- tr(msg),
- msg,
- DUPLICATE_NODE_UNCLOSED,
- mm.get(tagSet)
- ));
- } else if (nbType>1) {
+ if (nbType>1) {
String msg = marktr("Mixed type duplicated nodes");
errors.add(new TestError(
parentTest,
@@ -415,7 +407,7 @@ public class DuplicateNode extends Test {
if (target == null) {
target = nodes.iterator().next();
}
-
+
if (DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getCurrentDataSet().getDataSourceArea(), nodes, Collections.singleton(target)))
return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
}
@@ -428,8 +420,6 @@ public class DuplicateNode extends Test {
if (!(testError.getTester() instanceof DuplicateNode)) return false;
// never merge nodes with different tags.
if (testError.getCode() == DUPLICATE_NODE) return false;
- // never merge nodes from two different non-closed geometries
- if (testError.getCode() == DUPLICATE_NODE_UNCLOSED) return false;
// everything else is ok to merge
return true;
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
index 2ae63a1..8713add 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
@@ -6,10 +6,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.Command;
@@ -50,18 +50,18 @@ public class DuplicateRelation extends Test {
private List<LatLon> coor;
/** ID of the relation member in case it is a {@link Relation} */
- private long rel_id;
+ private long relId;
@Override
public int hashCode() {
- return role.hashCode()+(int)rel_id+tags.hashCode()+type.hashCode()+coor.hashCode();
+ return role.hashCode()+(int)relId+tags.hashCode()+type.hashCode()+coor.hashCode();
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof RelMember)) return false;
RelMember rm = (RelMember) obj;
- return rm.role.equals(role) && rm.type.equals(type) && rm.rel_id==rel_id && rm.tags.equals(tags) && rm.coor.equals(coor);
+ return rm.role.equals(role) && rm.type.equals(type) && rm.relId==relId && rm.tags.equals(tags) && rm.coor.equals(coor);
}
/** Extract and store relation information based on the relation member
@@ -70,7 +70,7 @@ public class DuplicateRelation extends Test {
public RelMember(RelationMember src) {
role = src.getRole();
type = src.getType();
- rel_id = 0;
+ relId = 0;
coor = new ArrayList<LatLon>();
if (src.isNode()) {
@@ -84,14 +84,14 @@ public class DuplicateRelation extends Test {
tags = r.getKeys();
List<Node> wNodes = r.getNodes();
coor = new ArrayList<LatLon>(wNodes.size());
- for (int i = 0; i < wNodes.size(); i++) {
- coor.add(wNodes.get(i).getCoor());
+ for (Node wNode : wNodes) {
+ coor.add(wNode.getCoor());
}
}
if (src.isRelation()) {
Relation r = src.getRelation();
tags = r.getKeys();
- rel_id = r.getId();
+ relId = r.getId();
coor = new ArrayList<LatLon>();
}
}
@@ -102,15 +102,15 @@ public class DuplicateRelation extends Test {
*/
private class RelationMembers {
/** List of member objects of the relation */
- public List<RelMember> members;
+ private List<RelMember> members;
/** Store relation information
* @param members The list of relation members
*/
public RelationMembers(List<RelationMember> members) {
this.members = new ArrayList<RelMember>(members.size());
- for (int i = 0; i < members.size(); i++) {
- this.members.add(new RelMember(members.get(i)));
+ for (RelationMember member : members) {
+ this.members.add(new RelMember(member));
}
}
@@ -132,9 +132,9 @@ public class DuplicateRelation extends Test {
*/
private class RelationPair {
/** Member objects of the relation */
- public RelationMembers members;
+ private RelationMembers members;
/** Tags of the relation */
- public Map<String, String> keys;
+ private Map<String, String> keys;
/** Store relation information
* @param members The list of relation members
@@ -165,13 +165,13 @@ public class DuplicateRelation extends Test {
protected static final int SAME_RELATION = 1902;
/** MultiMap of all relations */
- MultiMap<RelationPair, OsmPrimitive> relations;
+ private MultiMap<RelationPair, OsmPrimitive> relations;
/** MultiMap of all relations, regardless of keys */
- MultiMap<List<RelationMember>, OsmPrimitive> relations_nokeys;
+ private MultiMap<List<RelationMember>, OsmPrimitive> relations_nokeys;
/** List of keys without useful information */
- Collection<String> ignoreKeys = new HashSet<String>(OsmPrimitive.getUninterestingKeys());
+ private final Set<String> ignoreKeys = new HashSet<String>(OsmPrimitive.getUninterestingKeys());
/**
* Default constructor
@@ -191,14 +191,14 @@ public class DuplicateRelation extends Test {
@Override
public void endTest() {
super.endTest();
- for(LinkedHashSet<OsmPrimitive> duplicated : relations.values()) {
+ for (Set<OsmPrimitive> duplicated : relations.values()) {
if (duplicated.size() > 1) {
TestError testError = new TestError(this, Severity.ERROR, tr("Duplicated relations"), DUPLICATE_RELATION, duplicated);
errors.add( testError );
}
}
relations = null;
- for(LinkedHashSet<OsmPrimitive> duplicated : relations_nokeys.values()) {
+ for (Set<OsmPrimitive> duplicated : relations_nokeys.values()) {
if (duplicated.size() > 1) {
TestError testError = new TestError(this, Severity.WARNING, tr("Relations with same members"), SAME_RELATION, duplicated);
errors.add( testError );
@@ -228,39 +228,37 @@ public class DuplicateRelation extends Test {
public Command fixError(TestError testError) {
if (testError.getCode() == SAME_RELATION) return null;
Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
- HashSet<Relation> rel_fix = new HashSet<Relation>();
+ HashSet<Relation> relFix = new HashSet<Relation>();
for (OsmPrimitive osm : sel)
if (osm instanceof Relation && !osm.isDeleted()) {
- rel_fix.add((Relation)osm);
+ relFix.add((Relation)osm);
}
- if( rel_fix.size() < 2 )
+ if (relFix.size() < 2)
return null;
long idToKeep = 0;
- Relation relationToKeep = rel_fix.iterator().next();
+ Relation relationToKeep = relFix.iterator().next();
// Only one relation will be kept - the one with lowest positive ID, if such exist
// or one "at random" if no such exists. Rest of the relations will be deleted
- for (Relation w: rel_fix) {
- if (!w.isNew()) {
- if (idToKeep == 0 || w.getId() < idToKeep) {
- idToKeep = w.getId();
- relationToKeep = w;
- }
+ for (Relation w: relFix) {
+ if (!w.isNew() && (idToKeep == 0 || w.getId() < idToKeep)) {
+ idToKeep = w.getId();
+ relationToKeep = w;
}
}
// Find the relation that is member of one or more relations. (If any)
Relation relationWithRelations = null;
- List<Relation> rel_ref = null;
- for (Relation w : rel_fix) {
+ List<Relation> relRef = null;
+ for (Relation w : relFix) {
List<Relation> rel = OsmPrimitive.getFilteredList(w.getReferrers(), Relation.class);
if (!rel.isEmpty()) {
if (relationWithRelations != null)
throw new AssertionError("Cannot fix duplicate relations: More than one relation is member of another relation.");
relationWithRelations = w;
- rel_ref = rel;
+ relRef = rel;
}
}
@@ -268,7 +266,7 @@ public class DuplicateRelation extends Test {
// Fix relations.
if (relationWithRelations != null && relationToKeep != relationWithRelations) {
- for (Relation rel : rel_ref) {
+ for (Relation rel : relRef) {
Relation newRel = new Relation(rel);
for (int i = 0; i < newRel.getMembers().size(); ++i) {
RelationMember m = newRel.getMember(i);
@@ -281,8 +279,8 @@ public class DuplicateRelation extends Test {
}
//Delete all relations in the list
- rel_fix.remove(relationToKeep);
- commands.add(new DeleteCommand(rel_fix));
+ relFix.remove(relationToKeep);
+ commands.add(new DeleteCommand(relFix));
return new SequenceCommand(tr("Delete duplicate relations"), commands);
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
index f48c4ed..5b9d8ec 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
@@ -31,19 +31,19 @@ import org.openstreetmap.josm.tools.MultiMap;
/**
* Tests if there are duplicate ways
*/
-public class DuplicateWay extends Test
-{
+public class DuplicateWay extends Test {
/**
* Class to store a way reduced to coordinates and keys. Essentially this is used to call the
* <code>equals{}</code> function.
*/
private static class WayPair {
- public List<LatLon> coor;
- public Map<String, String> keys;
- public WayPair(List<LatLon> _coor, Map<String, String> _keys) {
- coor=_coor;
- keys=_keys;
+ private final List<LatLon> coor;
+ private final Map<String, String> keys;
+
+ public WayPair(List<LatLon> coor, Map<String, String> keys) {
+ this.coor = coor;
+ this.keys = keys;
}
@Override
@@ -65,9 +65,9 @@ public class DuplicateWay extends Test
* <code>equals{}</code> function.
*/
private static class WayPairNoTags {
- public List<LatLon> coor;
- public WayPairNoTags(List<LatLon> _coor) {
- coor=_coor;
+ private final List<LatLon> coor;
+ public WayPairNoTags(List<LatLon> coor) {
+ this.coor = coor;
}
@Override
public int hashCode() {
@@ -91,7 +91,7 @@ public class DuplicateWay extends Test
/** Bag of all ways, regardless of tags */
private MultiMap<WayPairNoTags, OsmPrimitive> waysNoTags;
-
+
/** Set of known hashcodes for list of coordinates **/
private Set<Integer> knownHashCodes;
@@ -121,13 +121,13 @@ public class DuplicateWay extends Test
}
}
- for(Set<OsmPrimitive> sameway : waysNoTags.values()) {
- if( sameway.size() > 1) {
+ for (Set<OsmPrimitive> sameway : waysNoTags.values()) {
+ if (sameway.size() > 1) {
//Report error only if at least some tags are different, as otherwise the error was already reported as duplicated ways
Map<String, String> tags0=null;
boolean skip=true;
- for(OsmPrimitive o : sameway) {
+ for (OsmPrimitive o : sameway) {
if (tags0==null) {
tags0=o.getKeys();
removeUninterestingKeys(tags0);
@@ -192,8 +192,8 @@ public class DuplicateWay extends Test
}
// Build the list of lat/lon
List<LatLon> wLat = new ArrayList<LatLon>(wNodesToUse.size());
- for (int i=0; i<wNodesToUse.size(); i++) {
- wLat.add(wNodesToUse.get(i).getCoor());
+ for (Node node : wNodesToUse) {
+ wLat.add(node.getCoor());
}
// If this way has not direction-dependant keys, make sure the list is ordered the same for all ways (fix #8015)
if (!w.hasDirectionKeys()) {
@@ -241,11 +241,9 @@ public class DuplicateWay extends Test
// Only one way will be kept - the one with lowest positive ID, if such exist
// or one "at random" if no such exists. Rest of the ways will be deleted
for (Way w: ways) {
- if (!w.isNew()) {
- if (idToKeep == 0 || w.getId() < idToKeep) {
- idToKeep = w.getId();
- wayToKeep = w;
- }
+ if (!w.isNew() && (idToKeep == 0 || w.getId() < idToKeep)) {
+ idToKeep = w.getId();
+ wayToKeep = w;
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java
index 95be615..de3354a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java
@@ -5,18 +5,27 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Iterator;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
+/**
+ * Checks for ways with identical consecutive nodes.
+ * @since 3669
+ */
public class DuplicatedWayNodes extends Test {
protected static final int DUPLICATE_WAY_NODE = 501;
+ /**
+ * Constructs a new {@code DuplicatedWayNodes} test.
+ */
public DuplicatedWayNodes() {
super(tr("Duplicated way nodes"),
tr("Checks for ways with identical consecutive nodes."));
@@ -41,29 +50,36 @@ public class DuplicatedWayNodes extends Test {
}
}
- @Override public Command fixError(TestError testError) {
- Way w = (Way) testError.getPrimitives().iterator().next();
- Way wnew = new Way(w);
- wnew.setNodes(null);
- Node lastN = null;
- for (Node n : w.getNodes()) {
- if (lastN == null) {
- wnew.addNode(n);
- } else if (n == lastN) {
- // Skip this node
- } else {
- wnew.addNode(n);
+ @Override
+ public Command fixError(TestError testError) {
+ // primitives list can be empty if all primitives have been purged
+ Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
+ if (it.hasNext()) {
+ Way w = (Way) it.next();
+ Way wnew = new Way(w);
+ wnew.setNodes(null);
+ Node lastN = null;
+ for (Node n : w.getNodes()) {
+ if (lastN == null) {
+ wnew.addNode(n);
+ } else if (n == lastN) {
+ // Skip this node
+ } else {
+ wnew.addNode(n);
+ }
+ lastN = n;
}
- lastN = n;
+ if (wnew.getNodesCount() < 2)
+ // Empty way, delete
+ return deletePrimitivesIfNeeded(Collections.singleton(w));
+ else
+ return new ChangeCommand(w, wnew);
}
- if (wnew.getNodesCount() < 2)
- // Empty way, delete
- return deletePrimitivesIfNeeded(Collections.singleton(w));
- else
- return new ChangeCommand(w, wnew);
+ return null;
}
- @Override public boolean isFixable(TestError testError) {
+ @Override
+ public boolean isFixable(TestError testError) {
return testError.getTester() instanceof DuplicatedWayNodes;
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Highways.java b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
new file mode 100644
index 0000000..08cda49
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
@@ -0,0 +1,234 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.Test;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Test that performs semantic checks on highways.
+ * @since 5902
+ */
+public class Highways extends Test {
+
+ protected static final int WRONG_ROUNDABOUT_HIGHWAY = 2701;
+ protected static final int MISSING_PEDESTRIAN_CROSSING = 2702;
+ protected static final int SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE = 2703;
+ protected static final int SOURCE_MAXSPEED_UNKNOWN_CONTEXT = 2704;
+ protected static final int SOURCE_MAXSPEED_CONTEXT_MISMATCH_VS_MAXSPEED = 2705;
+ protected static final int SOURCE_MAXSPEED_CONTEXT_MISMATCH_VS_HIGHWAY = 2706;
+
+ /**
+ * Classified highways in order of importance
+ */
+ protected static final List<String> CLASSIFIED_HIGHWAYS = Arrays.asList(
+ "motorway", "motorway_link",
+ "trunk", "trunk_link",
+ "primary", "primary_link",
+ "secondary", "secondary_link",
+ "tertiary", "tertiary_link",
+ "unclassified",
+ "residential",
+ "living_street");
+
+ protected static final List<String> KNOWN_SOURCE_MAXSPEED_CONTEXTS = Arrays.asList(
+ "urban", "rural", "zone", "zone30", "zone:30", "nsl_single", "nsl_dual", "motorway", "trunk", "living_street");
+
+ protected static final List<String> ISO_COUNTRIES = Arrays.asList(Locale.getISOCountries());
+
+ boolean leftByPedestrians = false;
+ boolean leftByCyclists = false;
+ boolean leftByCars = false;
+ int pedestrianWays = 0;
+ int cyclistWays = 0;
+ int carsWays = 0;
+
+ /**
+ * Constructs a new {@code Highways} test.
+ */
+ public Highways() {
+ super(tr("Highways"), tr("Performs semantic checks on highways."));
+ }
+
+ protected class WrongRoundaboutHighway extends TestError {
+
+ public final String correctValue;
+
+ public WrongRoundaboutHighway(Way w, String key) {
+ super(Highways.this, Severity.WARNING,
+ tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), key),
+ WRONG_ROUNDABOUT_HIGHWAY, w);
+ this.correctValue = key;
+ }
+ }
+
+ @Override
+ public void visit(Node n) {
+ if (n.isUsable()) {
+ if (!n.hasTag("highway", "crossing") && !n.hasTag("crossing", "no") && n.isReferredByWays(2)) {
+ testMissingPedestrianCrossing(n);
+ }
+ if (n.hasKey("source:maxspeed")) {
+ // Check maxspeed but not context against highway for nodes as maxspeed is not set on highways here but on signs, speed cameras, etc.
+ testSourceMaxspeed(n, false);
+ }
+ }
+ }
+
+ @Override
+ public void visit(Way w) {
+ if (w.isUsable()) {
+ if (w.hasKey("highway") && w.hasKey("junction") && w.get("junction").equals("roundabout")) {
+ testWrongRoundabout(w);
+ }
+ if (w.hasKey("source:maxspeed")) {
+ // Check maxspeed, including context against highway
+ testSourceMaxspeed(w, true);
+ }
+ }
+ }
+
+ private void testWrongRoundabout(Way w) {
+ Map<String, List<Way>> map = new HashMap<String, List<Way>>();
+ // Count all highways (per type) connected to this roundabout
+ // As roundabouts are closed ways, take care of not processing the first/last node twice
+ for (Node n : new HashSet<Node>(w.getNodes())) {
+ for (Way h : Utils.filteredCollection(n.getReferrers(), Way.class)) {
+ if (h != w && h.hasKey("highway")) {
+ List<Way> list = map.get(h.get("highway"));
+ if (list == null) {
+ map.put(h.get("highway"), list = new ArrayList<Way>());
+ }
+ list.add(h);
+ }
+ }
+ }
+ // The roundabout should carry the highway tag of its two biggest highways
+ for (String s : CLASSIFIED_HIGHWAYS) {
+ List<Way> list = map.get(s);
+ if (list != null && list.size() >= 2) {
+ // Except when a single road is connected, but with two oneway segments
+ Boolean oneway1 = OsmUtils.getOsmBoolean(list.get(0).get("oneway"));
+ Boolean oneway2 = OsmUtils.getOsmBoolean(list.get(1).get("oneway"));
+ if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
+ // Error when the highway tags do not match
+ if (!w.get("highway").equals(s)) {
+ errors.add(new WrongRoundaboutHighway(w, s));
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ private void testMissingPedestrianCrossing(Node n) {
+ leftByPedestrians = false;
+ leftByCyclists = false;
+ leftByCars = false;
+ pedestrianWays = 0;
+ cyclistWays = 0;
+ carsWays = 0;
+
+ for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+ String highway = w.get("highway");
+ if (highway != null) {
+ if (highway.equals("footway") || highway.equals("path")) {
+ handlePedestrianWay(n, w);
+ if (w.hasTag("bicycle", "yes", "designated")) {
+ handleCyclistWay(n, w);
+ }
+ } else if (highway.equals("cycleway")) {
+ handleCyclistWay(n, w);
+ if (w.hasTag("foot", "yes", "designated")) {
+ handlePedestrianWay(n, w);
+ }
+ } else if (CLASSIFIED_HIGHWAYS.contains(highway)) {
+ // Only look at classified highways for now:
+ // - service highways support is TBD (see #9141 comments)
+ // - roads should be determined first. Another warning is raised anyway
+ handleCarWay(n, w);
+ }
+ if ((leftByPedestrians || leftByCyclists) && leftByCars) {
+ errors.add(new TestError(this, Severity.OTHER, tr("Missing pedestrian crossing information"), MISSING_PEDESTRIAN_CROSSING, n));
+ return;
+ }
+ }
+ }
+ }
+
+ private void handleCarWay(Node n, Way w) {
+ carsWays++;
+ if (!w.isFirstLastNode(n) || carsWays > 1) {
+ leftByCars = true;
+ }
+ }
+
+ private void handleCyclistWay(Node n, Way w) {
+ cyclistWays++;
+ if (!w.isFirstLastNode(n) || cyclistWays > 1) {
+ leftByCyclists = true;
+ }
+ }
+
+ private void handlePedestrianWay(Node n, Way w) {
+ pedestrianWays++;
+ if (!w.isFirstLastNode(n) || pedestrianWays > 1) {
+ leftByPedestrians = true;
+ }
+ }
+
+ private void testSourceMaxspeed(OsmPrimitive p, boolean testContextHighway) {
+ String value = p.get("source:maxspeed");
+ if (value.matches("[A-Z]{2}:.+")) {
+ int index = value.indexOf(':');
+ // Check country
+ String country = value.substring(0, index);
+ if (!ISO_COUNTRIES.contains(country)) {
+ errors.add(new TestError(this, Severity.WARNING, tr("Unknown country code: {0}", country), SOURCE_MAXSPEED_UNKNOWN_COUNTRY_CODE, p));
+ }
+ // Check context
+ String context = value.substring(index+1);
+ if (!KNOWN_SOURCE_MAXSPEED_CONTEXTS.contains(context)) {
+ errors.add(new TestError(this, Severity.WARNING, tr("Unknown source:maxspeed context: {0}", context), SOURCE_MAXSPEED_UNKNOWN_CONTEXT, p));
+ }
+ // TODO: Check coherence of context against maxspeed
+ // TODO: Check coherence of context against highway
+ }
+ }
+
+ @Override
+ public boolean isFixable(TestError testError) {
+ return testError instanceof WrongRoundaboutHighway;
+ }
+
+ @Override
+ public Command fixError(TestError testError) {
+ if (testError instanceof WrongRoundaboutHighway) {
+ // primitives list can be empty if all primitives have been purged
+ Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
+ if (it.hasNext()) {
+ return new ChangePropertyCommand(it.next(),
+ "highway", ((WrongRoundaboutHighway) testError).correctValue);
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index b1d8112..3accd67 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -8,8 +8,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Node;
@@ -21,13 +23,19 @@ import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.JoinedWay;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData.Intersection;
import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.data.validation.OsmValidator;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
import org.openstreetmap.josm.gui.mappaint.ElemStyles;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+/**
+ * Checks if multipolygons are valid
+ * @since 3669
+ */
public class MultipolygonTest extends Test {
protected static final int WRONG_MEMBER_TYPE = 1601;
@@ -45,18 +53,38 @@ public class MultipolygonTest extends Test {
private static ElemStyles styles;
private final List<List<Node>> nonClosedWays = new ArrayList<List<Node>>();
+ private final Set<String> keysCheckedByAnotherTest = new HashSet<String>();
- private final double SCALE = 1.0; // arbitrary scale - we could test every possible scale, but this should suffice
-
+ /**
+ * Constructs a new {@code MultipolygonTest}.
+ */
public MultipolygonTest() {
super(tr("Multipolygon"),
tr("This test checks if multipolygons are valid."));
}
@Override
- public void initialize() throws Exception {
+ public void initialize() {
styles = MapPaintStyles.getStyles();
}
+
+ @Override
+ public void startTest(ProgressMonitor progressMonitor) {
+ super.startTest(progressMonitor);
+ keysCheckedByAnotherTest.clear();
+ for (Test t : OsmValidator.getEnabledTests(false)) {
+ if (t instanceof UnclosedWays) {
+ keysCheckedByAnotherTest.addAll(((UnclosedWays)t).getCheckedKeys());
+ break;
+ }
+ }
+ }
+
+ @Override
+ public void endTest() {
+ keysCheckedByAnotherTest.clear();
+ super.endTest();
+ }
private List<List<Node>> joinWays(Collection<Way> ways) {
List<List<Node>> result = new ArrayList<List<Node>>();
@@ -118,6 +146,11 @@ public class MultipolygonTest extends Test {
if (!w.isArea() && ElemStyles.hasAreaElemStyle(w, false)) {
List<Node> nodes = w.getNodes();
if (nodes.size()<1) return; // fix zero nodes bug
+ for (String key : keysCheckedByAnotherTest) {
+ if (w.hasKey(key)) {
+ return;
+ }
+ }
errors.add(new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED,
Collections.singletonList(w), Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1))));
}
@@ -242,19 +275,20 @@ public class MultipolygonTest extends Test {
private void checkMembersAndRoles(Relation r) {
for (RelationMember rm : r.getMembers()) {
if (rm.isWay()) {
- if (!("inner".equals(rm.getRole()) || "outer".equals(rm.getRole()) || !rm.hasRole())) {
+ if (!(rm.hasRole("inner", "outer") || !rm.hasRole())) {
addError(r, new TestError(this, Severity.WARNING, tr("No useful role for multipolygon member"), WRONG_MEMBER_ROLE, rm.getMember()));
}
} else {
- if(!"admin_centre".equals(rm.getRole()))
+ if (!rm.hasRole("admin_centre", "label", "subarea", "land_area")) {
addError(r, new TestError(this, Severity.WARNING, tr("Non-Way in multipolygon"), WRONG_MEMBER_TYPE, rm.getMember()));
+ }
}
}
}
-
+
private void addRelationIfNeeded(TestError error, Relation r) {
- // Fix #8212 : if the error references only incomplete primitives,
- // add multipolygon in order to let user select something and fix the error
+ // Fix #8212 : if the error references only incomplete primitives,
+ // add multipolygon in order to let user select something and fix the error
Collection<? extends OsmPrimitive> primitives = error.getPrimitives();
if (!primitives.contains(r)) {
for (OsmPrimitive p : primitives) {
@@ -267,7 +301,7 @@ public class MultipolygonTest extends Test {
error.setPrimitives(newPrimitives);
}
}
-
+
private void addError(Relation r, TestError error) {
addRelationIfNeeded(error, r);
errors.add(error);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java b/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
index 34fe1c7..4c032a0 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java
@@ -32,6 +32,9 @@ public class NameMismatch extends Test {
protected static final int NAME_MISSING = 1501;
protected static final int NAME_TRANSLATION_MISSING = 1502;
+ /**
+ * Constructs a new {@code NameMismatch} test.
+ */
public NameMismatch() {
super(tr("Missing name:* translation"),
tr("This test finds multilingual objects whose ''name'' attribute is not equal to some ''name:*'' attribute and not a composition of ''name:*'' attributes, e.g., Italia - Italien - Italy."));
@@ -58,9 +61,9 @@ public class NameMismatch extends Test {
for (Entry<String, String> entry : p.getKeys().entrySet()) {
if (entry.getKey().startsWith("name:")) {
- String name_s = entry.getValue();
- if (name_s != null) {
- names.add(name_s);
+ String n = entry.getValue();
+ if (n != null) {
+ names.add(n);
}
}
}
@@ -73,23 +76,23 @@ public class NameMismatch extends Test {
errors.add(new TestError(this, Severity.OTHER,
tr("A name is missing, even though name:* exists."),
NAME_MISSING, p));
- return;
- }
+ return;
+ }
if (names.contains(name)) return;
/* If name is not equal to one of the name:*, it should be a
composition of some (not necessarily all) name:* labels.
Check if this is the case. */
- String split_names[] = name.split(" - ");
- if (split_names.length == 1) {
+ String[] splitNames = name.split(" - ");
+ if (splitNames.length == 1) {
/* The name is not composed of multiple parts. Complain. */
missingTranslation(p);
return;
}
/* Check that each part corresponds to a translated name:*. */
- for (String n : split_names) {
+ for (String n : splitNames) {
if (!names.contains(n)) {
missingTranslation(p);
return;
@@ -102,10 +105,12 @@ public class NameMismatch extends Test {
*
* @param selection The primitives to be tested
*/
- @Override public void visit(Collection<OsmPrimitive> selection) {
- for (OsmPrimitive p : selection)
+ @Override
+ public void visit(Collection<OsmPrimitive> selection) {
+ for (OsmPrimitive p : selection) {
if (!p.isDeleted() && !p.isIncomplete()) {
check(p);
}
+ }
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java b/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java
index d5d3401..6d4b6ff 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java
@@ -19,13 +19,16 @@ import org.openstreetmap.josm.data.validation.TestError;
* no warning for a way and a node that only have a "source=PGS" tag).
* <p>
* See JOSM ticket #7639 for the original request.
- *
+ *
* @author Mrwojo
*/
public class NodesDuplicatingWayTags extends Test {
protected static final int NODE_DUPING_PARENT_WAY_TAGS = 2401;
+ /**
+ * Constructs a new {@code NodesDuplicatingWayTags} test.
+ */
public NodesDuplicatingWayTags() {
super(tr("Nodes duplicating way tags"),
tr("Checks for nodes that have the same tags as their parent way."));
diff --git a/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java b/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java
index f4fd5b2..522a595 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java
@@ -15,30 +15,37 @@ import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+/**
+ * Finds nodes that have the same name (might be duplicates)
+ * @since 3669
+ */
public class NodesWithSameName extends Test {
protected static final int SAME_NAME = 801;
private Map<String, List<Node>> namesToNodes;
+ /**
+ * Constructs a new {@code NodesWithSameName} test.
+ */
public NodesWithSameName() {
super(tr("Nodes with same name"),
tr("This test finds nodes that have the same name (might be duplicates)."));
}
- @Override public void startTest(ProgressMonitor monitor) {
+ @Override
+ public void startTest(ProgressMonitor monitor) {
super.startTest(monitor);
namesToNodes = new HashMap<String, List<Node>>();
}
- @Override public void visit(Node n) {
+ @Override
+ public void visit(Node n) {
if (!n.isUsable()) return;
String name = n.get("name");
String sign = n.get("traffic_sign");
String highway = n.get("highway");
- if (name == null
- || (sign != null && sign.equals("city_limit"))
- || (highway != null && highway.equals("bus_stop")))
+ if (name == null || ("city_limit".equals(sign)) || ("bus_stop".equals(highway)))
return;
List<Node> nodes = namesToNodes.get(name);
@@ -49,7 +56,8 @@ public class NodesWithSameName extends Test {
nodes.add(n);
}
- @Override public void endTest() {
+ @Override
+ public void endTest() {
for (List<Node> nodes : namesToNodes.values()) {
if (nodes.size() > 1) {
// Report the same-name nodes, unless each has a unique ref=*.
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
new file mode 100644
index 0000000..bf1d9d1
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
@@ -0,0 +1,244 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.validation.FixableTestError;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.Test;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.io.MirroredInputStream;
+
+/**
+ * Tests the correct usage of the opening hour syntax of the tags
+ * {@code opening_hours}, {@code collection_times}, {@code service_times} according to
+ * <a href="https://github.com/ypid/opening_hours.js">opening_hours.js</a>.
+ *
+ * @since 6370
+ */
+public class OpeningHourTest extends Test {
+
+ /**
+ * Javascript engine
+ */
+ public static final ScriptEngine ENGINE = new ScriptEngineManager().getEngineByName("JavaScript");
+
+ /**
+ * Constructs a new {@code OpeningHourTest}.
+ */
+ public OpeningHourTest() {
+ super(tr("Opening hours syntax"),
+ tr("This test checks the correct usage of the opening hours syntax."));
+ }
+
+ @Override
+ public void initialize() throws Exception {
+ super.initialize();
+ if (ENGINE != null) {
+ ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/validator/opening_hours.js"), "UTF-8"));
+ // fake country/state to not get errors on holidays
+ ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");
+ ENGINE.eval("" +
+ "var oh = function (value, mode) {" +
+ " try {" +
+ " var r= new opening_hours(value, nominatimJSON, mode);" +
+ " r.getErrors = function() {return [];};" +
+ " return r;" +
+ " } catch(err) {" +
+ " return {" +
+ " getWarnings: function() {return [];}," +
+ " getErrors: function() {return [err.toString()]}" +
+ " };" +
+ " }" +
+ "};");
+ } else {
+ Main.warn("Unable to initialize OpeningHourTest because no JavaScript engine has been found");
+ }
+ }
+
+ static enum CheckMode {
+ TIME_RANGE(0), POINTS_IN_TIME(1), BOTH(2);
+ final int code;
+
+ CheckMode(int code) {
+ this.code = code;
+ }
+ }
+
+ protected Object parse(String value, CheckMode mode) throws ScriptException, NoSuchMethodException {
+ return ((Invocable) ENGINE).invokeFunction("oh", value, mode.code);
+ }
+
+ @SuppressWarnings("unchecked")
+ protected List<Object> getList(Object obj) throws ScriptException, NoSuchMethodException {
+ if (obj == null || "".equals(obj)) {
+ return Arrays.asList();
+ } else if (obj instanceof String) {
+ final Object[] strings = ((String) obj).split("\\\\n");
+ return Arrays.asList(strings);
+ } else if (obj instanceof List) {
+ return (List<Object>) obj;
+ } else {
+ // recursively call getList() with argument converted to newline-separated string
+ return getList(((Invocable) ENGINE).invokeMethod(obj, "join", "\\n"));
+ }
+ }
+
+ /**
+ * An error concerning invalid syntax for an "opening_hours"-like tag.
+ */
+ public class OpeningHoursTestError {
+ final Severity severity;
+ final String message, prettifiedValue;
+
+ /**
+ * Constructs a new {@code OpeningHoursTestError} with a known pretiffied value.
+ * @param message The error message
+ * @param severity The error severity
+ * @param prettifiedValue The prettified value
+ */
+ public OpeningHoursTestError(String message, Severity severity, String prettifiedValue) {
+ this.message = message;
+ this.severity = severity;
+ this.prettifiedValue = prettifiedValue;
+ }
+
+ /**
+ * Constructs a new {@code OpeningHoursTestError}.
+ * @param message The error message
+ * @param severity The error severity
+ */
+ public OpeningHoursTestError(String message, Severity severity) {
+ this(message, severity, null);
+ }
+
+ /**
+ * Returns the real test error given to JOSM validator.
+ * @param p The incriminated OSM primitive.
+ * @param key The incriminated key, used for display.
+ * @return The real test error given to JOSM validator. Can be fixable or not if a prettified values has been determined.
+ */
+ public TestError getTestError(final OsmPrimitive p, final String key) {
+ if (prettifiedValue == null) {
+ return new TestError(OpeningHourTest.this, severity, message, 2901, p);
+ } else {
+ return new FixableTestError(OpeningHourTest.this, severity, message, 2901, p,
+ new ChangePropertyCommand(p, key, prettifiedValue));
+ }
+ }
+
+ /**
+ * Returns the error message.
+ * @return The error message.
+ */
+ public String getMessage() {
+ return message;
+ }
+
+ /**
+ * Returns the prettified value.
+ * @return The prettified value.
+ */
+ public String getPrettifiedValue() {
+ return prettifiedValue;
+ }
+
+ /**
+ * Returns the error severity.
+ * @return The error severity.
+ */
+ public Severity getSeverity() {
+ return severity;
+ }
+ }
+
+ /**
+ * Checks for a correct usage of the opening hour syntax of the {@code value} given according to
+ * <a href="https://github.com/ypid/opening_hours.js">opening_hours.js</a> and returns a list containing
+ * validation errors or an empty list. Null values result in an empty list.
+ * @param key the OSM key (should be "opening_hours", "collection_times" or "service_times"). Used in error message
+ * @param value the opening hour value to be checked.
+ * @param mode whether to validate {@code value} as a time range, or points in time, or both.
+ * @return a list of {@link TestError} or an empty list
+ */
+ public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value, CheckMode mode) {
+ if (ENGINE == null || value == null || value.trim().isEmpty()) {
+ return Collections.emptyList();
+ }
+ try {
+ final Object r = parse(value, mode);
+ final List<OpeningHoursTestError> errors = new ArrayList<OpeningHoursTestError>();
+ String prettifiedValue = null;
+ try {
+ prettifiedValue = (String) ((Invocable) ENGINE).invokeMethod(r, "prettifyValue");
+ } catch (Exception e) {
+ Main.debug(e.getMessage());
+ }
+ for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getErrors"))) {
+ errors.add(new OpeningHoursTestError(key + " - " + i.toString().trim(), Severity.ERROR, prettifiedValue));
+ }
+ for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"))) {
+ errors.add(new OpeningHoursTestError(i.toString().trim(), Severity.WARNING, prettifiedValue));
+ }
+ return errors;
+ } catch (final Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ /**
+ * Checks for a correct usage of the opening hour syntax of the {@code value} given, in time range mode, according to
+ * <a href="https://github.com/ypid/opening_hours.js">opening_hours.js</a> and returns a list containing
+ * validation errors or an empty list. Null values result in an empty list.
+ * @param key the OSM key (should be "opening_hours", "collection_times" or "service_times"). Used in error message
+ * @param value the opening hour value to be checked.
+ * @return a list of {@link TestError} or an empty list
+ */
+ public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value) {
+ return checkOpeningHourSyntax(key, value, CheckMode.TIME_RANGE);
+ }
+
+ protected void check(final OsmPrimitive p, final String key, CheckMode mode) {
+ for (OpeningHoursTestError e : checkOpeningHourSyntax(key, p.get(key), mode)) {
+ errors.add(e.getTestError(p, key));
+ }
+ }
+
+ protected void check(final OsmPrimitive p) {
+ check(p, "opening_hours", CheckMode.TIME_RANGE);
+ check(p, "collection_times", CheckMode.BOTH);
+ check(p, "service_times", CheckMode.BOTH);
+ }
+
+ @Override
+ public void visit(final Node n) {
+ check(n);
+ }
+
+ @Override
+ public void visit(final Relation r) {
+ check(r);
+ }
+
+ @Override
+ public void visit(final Way w) {
+ check(w);
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java b/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java
index 939c949..775a5a8 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -16,11 +17,18 @@ import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.Predicate;
import org.openstreetmap.josm.tools.Utils;
+/**
+ * Checks if areas overlap.
+ * @since 4448
+ */
public class OverlappingAreas extends Test {
protected static final int OVERLAPPING_AREAS = 2201;
- protected QuadBuckets<Way> index = new QuadBuckets<Way>();
+ protected final QuadBuckets<Way> index = new QuadBuckets<Way>();
+ /**
+ * Constructs a new {@code OverlappingAreas} test.
+ */
public OverlappingAreas() {
super(tr("Overlapping Areas"), tr("This test checks if areas overlap."));
}
@@ -84,6 +92,8 @@ public class OverlappingAreas extends Test {
}
}
}
+
+ index.clear();
super.endTest();
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
index 1f070d4..7fe03b0 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
@@ -6,13 +6,14 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.data.validation.Severity;
@@ -30,7 +31,7 @@ import org.openstreetmap.josm.tools.Pair;
public class OverlappingWays extends Test {
/** Bag of all way segments */
- MultiMap<Pair<Node,Node>, WaySegment> nodePairs;
+ private MultiMap<Pair<Node,Node>, WaySegment> nodePairs;
protected static final int OVERLAPPING_HIGHWAY = 101;
protected static final int OVERLAPPING_RAILWAY = 102;
@@ -53,16 +54,25 @@ public class OverlappingWays extends Test {
nodePairs = new MultiMap<Pair<Node,Node>, WaySegment>(1000);
}
+ private boolean parentMultipolygonConcernsArea(OsmPrimitive p) {
+ for (Relation r : OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class)) {
+ if (r.concernsArea() ) {
+ return true;
+ }
+ }
+ return false;
+ }
+
@Override
public void endTest() {
- Map<List<Way>, LinkedHashSet<WaySegment>> ways_seen = new HashMap<List<Way>, LinkedHashSet<WaySegment>>(500);
+ Map<List<Way>, Set<WaySegment>> seenWays = new HashMap<List<Way>, Set<WaySegment>>(500);
- for (LinkedHashSet<WaySegment> duplicated : nodePairs.values()) {
+ for (Set<WaySegment> duplicated : nodePairs.values()) {
int ways = duplicated.size();
if (ways > 1) {
List<OsmPrimitive> prims = new ArrayList<OsmPrimitive>();
- List<Way> current_ways = new ArrayList<Way>();
+ List<Way> currentWays = new ArrayList<Way>();
Collection<WaySegment> highlight;
int highway = 0;
int railway = 0;
@@ -78,23 +88,19 @@ public class OverlappingWays extends Test {
if (ar != null && ar) {
area++;
}
- if (ws.way.get("landuse") != null
- || ws.way.get("natural") != null
- || ws.way.get("amenity") != null
- || ws.way.get("leisure") != null
- || ws.way.get("building") != null) {
+ if (ws.way.concernsArea() || parentMultipolygonConcernsArea(ws.way)) {
area++;
ways--;
}
prims.add(ws.way);
- current_ways.add(ws.way);
+ currentWays.add(ws.way);
}
/* These ways not seen before
* If two or more of the overlapping ways are
* highways or railways mark a separate error
*/
- if ((highlight = ways_seen.get(current_ways)) == null) {
+ if ((highlight = seenWays.get(currentWays)) == null) {
String errortype;
int type;
@@ -127,7 +133,7 @@ public class OverlappingWays extends Test {
errors.add(new TestError(this,
type < OVERLAPPING_HIGHWAY_AREA ? Severity.WARNING : Severity.OTHER,
errortype, type, prims, duplicated));
- ways_seen.put(current_ways, duplicated);
+ seenWays.put(currentWays, duplicated);
} else { /* way seen, mark highlight layer only */
for (WaySegment ws : duplicated) {
highlight.add(ws);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java b/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
index fd21a6b..b73e453 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -23,6 +24,7 @@ import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.Geometry;
/**
@@ -30,24 +32,31 @@ import org.openstreetmap.josm.tools.Geometry;
* See #7812 for discussions about this test.
*/
public class PowerLines extends Test {
-
+
protected static final int POWER_LINES = 2501;
-
+
+ /** Values for {@code power} key interpreted as power lines */
public static final Collection<String> POWER_LINE_TAGS = Arrays.asList("line", "minor_line");
+ /** Values for {@code power} key interpreted as power towers */
public static final Collection<String> POWER_TOWER_TAGS = Arrays.asList("tower", "pole");
+ /** Values for {@code power} key interpreted as power stations */
public static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "plant", "generator");
+ /** Values for {@code power} key interpreted as allowed power items */
public static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator");
-
- protected final Map<Way, String> towerPoleTagMap = new HashMap<Way, String>();
-
- protected final List<PowerLineError> potentialErrors = new ArrayList<PowerLineError>();
- protected final List<OsmPrimitive> powerStations = new ArrayList<OsmPrimitive>();
+ private final Map<Way, String> towerPoleTagMap = new HashMap<Way, String>();
+
+ private final List<PowerLineError> potentialErrors = new ArrayList<PowerLineError>();
+ private final List<OsmPrimitive> powerStations = new ArrayList<OsmPrimitive>();
+
+ /**
+ * Constructs a new {@code PowerLines} test.
+ */
public PowerLines() {
super(tr("Power lines"), tr("Checks for nodes in power lines that do not have a power=tower/pole tag."));
}
-
+
@Override
public void visit(Way w) {
if (w.isUsable()) {
@@ -78,24 +87,34 @@ public class PowerLines extends Test {
}
}
}
-
+
@Override
public void visit(Relation r) {
if (r.isMultipolygon() && isPowerStation(r)) {
powerStations.add(r);
}
- }
+ }
+
+ @Override
+ public void startTest(ProgressMonitor progressMonitor) {
+ super.startTest(progressMonitor);
+ towerPoleTagMap.clear();
+ powerStations.clear();
+ potentialErrors.clear();
+ }
@Override
public void endTest() {
for (PowerLineError e : potentialErrors) {
- if (!isInPowerStation(e.getNode())) {
+ Node n = e.getNode();
+ if (n != null && !isInPowerStation(n)) {
errors.add(e);
}
}
+ potentialErrors.clear();
super.endTest();
}
-
+
protected final boolean isInPowerStation(Node n) {
for (OsmPrimitive station : powerStations) {
List<List<Node>> nodesLists = new ArrayList<List<Node>>();
@@ -120,10 +139,13 @@ public class PowerLines extends Test {
@Override
public Command fixError(TestError testError) {
- if (isFixable(testError)) {
- return new ChangePropertyCommand(
- testError.getPrimitives().iterator().next(),
- "power", towerPoleTagMap.get(((PowerLineError)testError).line));
+ if (testError instanceof PowerLineError && isFixable(testError)) {
+ // primitives list can be empty if all primitives have been purged
+ Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
+ if (it.hasNext()) {
+ return new ChangePropertyCommand(it.next(),
+ "power", towerPoleTagMap.get(((PowerLineError)testError).line));
+ }
}
return null;
}
@@ -132,11 +154,11 @@ public class PowerLines extends Test {
public boolean isFixable(TestError testError) {
return testError instanceof PowerLineError && towerPoleTagMap.containsKey(((PowerLineError)testError).line);
}
-
+
/**
* Determines if the specified way denotes a power line.
* @param w The way to be tested
- * @return True if power key is set and equal to line/minor_line
+ * @return {@code true} if power key is set and equal to line/minor_line
*/
protected static final boolean isPowerLine(Way w) {
return isPowerIn(w, POWER_LINE_TAGS);
@@ -144,8 +166,8 @@ public class PowerLines extends Test {
/**
* Determines if the specified primitive denotes a power station.
- * @param w The way to be tested
- * @return True if power key is set and equal to station/sub_station/plant
+ * @param p The primitive to be tested
+ * @return {@code true} if power key is set and equal to station/sub_station/plant
*/
protected static final boolean isPowerStation(OsmPrimitive p) {
return isPowerIn(p, POWER_STATION_TAGS);
@@ -153,36 +175,44 @@ public class PowerLines extends Test {
/**
* Determines if the specified node denotes a power tower/pole.
- * @param w The node to be tested
- * @return True if power key is set and equal to tower/pole
+ * @param n The node to be tested
+ * @return {@code true} if power key is set and equal to tower/pole
*/
protected static final boolean isPowerTower(Node n) {
return isPowerIn(n, POWER_TOWER_TAGS);
}
-
+
/**
* Determines if the specified node denotes a power infrastructure allowed on a power line.
- * @param w The node to be tested
+ * @param n The node to be tested
* @return True if power key is set and equal to switch/tranformer/busbar/generator
*/
protected static final boolean isPowerAllowed(Node n) {
return isPowerIn(n, POWER_ALLOWED_TAGS);
}
-
+
+ /**
+ * Helper function to check if power tags is a certain value.
+ * @param p The primitive to be tested
+ * @param values List of possible values
+ * @return {@code true} if power key is set and equal to possible values
+ */
private static final boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
String v = p.get("power");
return v != null && values != null && values.contains(v);
}
-
+
protected class PowerLineError extends TestError {
- public final Way line;
+ private final Way line;
public PowerLineError(Node n, Way line) {
- super(PowerLines.this, Severity.WARNING,
+ super(PowerLines.this, Severity.WARNING,
tr("Missing power tower/pole within power line"), POWER_LINES, n);
this.line = line;
}
public final Node getNode() {
- return (Node) getPrimitives().iterator().next();
+ // primitives list can be empty if all primitives have been purged
+ Iterator<? extends OsmPrimitive> it = getPrimitives().iterator();
+ return it.hasNext() ? (Node) it.next() : null;
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
index df30462..d61a225 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
@@ -12,6 +12,8 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.Set;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.DeleteCommand;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
@@ -22,7 +24,11 @@ import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Key;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Roles;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
/**
* Check for wrong relations
@@ -52,7 +58,7 @@ public class RelationChecker extends Test {
initializePresets();
}
- static Collection<TaggingPreset> relationpresets = new LinkedList<TaggingPreset>();
+ private static Collection<TaggingPreset> relationpresets = new LinkedList<TaggingPreset>();
/**
* Reads the presets data.
@@ -62,8 +68,8 @@ public class RelationChecker extends Test {
Collection<TaggingPreset> presets = TaggingPresetPreference.taggingPresets;
if (presets != null) {
for (TaggingPreset p : presets) {
- for (TaggingPreset.Item i : p.data) {
- if (i instanceof TaggingPreset.Roles) {
+ for (TaggingPresetItem i : p.data) {
+ if (i instanceof Roles) {
relationpresets.add(p);
break;
}
@@ -72,37 +78,37 @@ public class RelationChecker extends Test {
}
}
- public static class RoleInfo {
- int total = 0;
- Collection<Node> nodes = new LinkedList<Node>();
- Collection<Way> ways = new LinkedList<Way>();
- Collection<Way> closedways = new LinkedList<Way>();
- Collection<Way> openways = new LinkedList<Way>();
- Collection<Relation> relations = new LinkedList<Relation>();
+ private static class RoleInfo {
+ private int total = 0;
+ private Collection<Node> nodes = new LinkedList<Node>();
+ private Collection<Way> ways = new LinkedList<Way>();
+ private Collection<Way> openways = new LinkedList<Way>();
+ private Collection<Relation> relations = new LinkedList<Relation>();
}
+ @SuppressWarnings("unchecked")
@Override
public void visit(Relation n) {
- LinkedList<TaggingPreset.Role> allroles = new LinkedList<TaggingPreset.Role>();
+ LinkedList<Role> allroles = new LinkedList<Role>();
for (TaggingPreset p : relationpresets) {
boolean matches = true;
- TaggingPreset.Roles r = null;
- for (TaggingPreset.Item i : p.data) {
- if (i instanceof TaggingPreset.Key) {
- TaggingPreset.Key k = (TaggingPreset.Key) i;
+ Roles r = null;
+ for (TaggingPresetItem i : p.data) {
+ if (i instanceof Key) {
+ Key k = (Key) i;
if (!k.value.equals(n.get(k.key))) {
matches = false;
break;
}
- } else if (i instanceof TaggingPreset.Roles) {
- r = (TaggingPreset.Roles) i;
+ } else if (i instanceof Roles) {
+ r = (Roles) i;
}
}
if (matches && r != null) {
allroles.addAll(r.roles);
}
}
- if (allroles.size() == 0) {
+ if (allroles.isEmpty()) {
errors.add( new TestError(this, Severity.WARNING, tr("Relation type is unknown"),
RELATION_UNKNOWN, n) );
} else {
@@ -121,9 +127,7 @@ public class RelationChecker extends Test {
ri.relations.add(m.getRelation());
} else if(m.isWay()) {
ri.ways.add(m.getWay());
- if (m.getWay().isClosed()) {
- ri.closedways.add(m.getWay());
- } else {
+ if (!m.getWay().isClosed()) {
ri.openways.add(m.getWay());
}
}
@@ -137,7 +141,8 @@ public class RelationChecker extends Test {
RELATION_EMPTY, n) );
} else {
LinkedList<String> done = new LinkedList<String>();
- for (TaggingPreset.Role r : allroles) {
+ String errorMessage = tr("Role verification problem");
+ for (Role r : allroles) {
done.add(r.key);
String keyname = r.key;
if ("".equals(keyname)) {
@@ -149,29 +154,29 @@ public class RelationChecker extends Test {
if (count != vc) {
if (count == 0) {
String s = marktr("Role {0} missing");
- errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+ errors.add(new TestError(this, Severity.WARNING, errorMessage,
tr(s, keyname), MessageFormat.format(s, keyname), ROLE_MISSING, n));
}
else if (vc > count) {
String s = marktr("Number of {0} roles too low ({1})");
- errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+ errors.add(new TestError(this, Severity.WARNING, errorMessage,
tr(s, keyname, count), MessageFormat.format(s, keyname, count), LOW_COUNT, n));
} else {
String s = marktr("Number of {0} roles too high ({1})");
- errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+ errors.add(new TestError(this, Severity.WARNING, errorMessage,
tr(s, keyname, count), MessageFormat.format(s, keyname, count), HIGH_COUNT, n));
}
}
if (ri != null) {
Set<OsmPrimitive> wrongTypes = new HashSet<OsmPrimitive>();
if (r.types != null) {
- if (!r.types.contains(PresetType.WAY)) {
- wrongTypes.addAll(r.types.contains(PresetType.CLOSEDWAY) ? ri.openways : ri.ways);
+ if (!r.types.contains(TaggingPresetType.WAY)) {
+ wrongTypes.addAll(r.types.contains(TaggingPresetType.CLOSEDWAY) ? ri.openways : ri.ways);
}
- if (!r.types.contains(PresetType.NODE)) {
+ if (!r.types.contains(TaggingPresetType.NODE)) {
wrongTypes.addAll(ri.nodes);
}
- if (!r.types.contains(PresetType.RELATION)) {
+ if (!r.types.contains(TaggingPresetType.RELATION)) {
wrongTypes.addAll(ri.relations);
}
}
@@ -188,7 +193,7 @@ public class RelationChecker extends Test {
String s = marktr("Member for role {0} of wrong type");
LinkedList<OsmPrimitive> highlight = new LinkedList<OsmPrimitive>(wrongTypes);
highlight.addFirst(n);
- errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+ errors.add(new TestError(this, Severity.WARNING, errorMessage,
tr(s, keyname), MessageFormat.format(s, keyname), WRONG_TYPE,
highlight, wrongTypes));
}
@@ -198,11 +203,11 @@ public class RelationChecker extends Test {
if (!done.contains(key)) {
if (key.length() > 0) {
String s = marktr("Role {0} unknown");
- errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+ errors.add(new TestError(this, Severity.WARNING, errorMessage,
tr(s, key), MessageFormat.format(s, key), ROLE_UNKNOWN, n));
} else {
String s = marktr("Empty role found");
- errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+ errors.add(new TestError(this, Severity.WARNING, errorMessage,
tr(s), s, ROLE_EMPTY, n));
}
}
@@ -210,4 +215,18 @@ public class RelationChecker extends Test {
}
}
}
+
+ @Override
+ public Command fixError(TestError testError) {
+ if (isFixable(testError)) {
+ return new DeleteCommand(testError.getPrimitives());
+ }
+ return null;
+ }
+
+ @Override
+ public boolean isFixable(TestError testError) {
+ Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+ return testError.getCode() == RELATION_EMPTY && !primitives.isEmpty() && primitives.iterator().next().isNew();
+ }
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java b/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java
index c98df71..a6095fe 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java
@@ -19,6 +19,9 @@ public class SelfIntersectingWay extends Test {
protected static final int SELF_INTERSECT = 401;
+ /**
+ * Constructs a new {@code SelfIntersectingWay} test.
+ */
public SelfIntersectingWay() {
super(tr("Self-intersecting ways"),
tr("This test checks for ways " +
diff --git a/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java b/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
index 72b0080..2507237 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
@@ -30,9 +30,9 @@ public class SimilarNamedWays extends Test {
protected static final int SIMILAR_NAMED = 701;
/** All ways, grouped by cells */
- Map<Point2D,List<Way>> cellWays;
+ private Map<Point2D,List<Way>> cellWays;
/** The already detected errors */
- MultiMap<Way, Way> errorWays;
+ private MultiMap<Way, Way> errorWays;
/**
* Constructor
@@ -79,7 +79,7 @@ public class SimilarNamedWays extends Test {
int levenshteinDistance = getLevenshteinDistance(name, name2);
if (0 < levenshteinDistance && levenshteinDistance <= 2) {
- List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+ List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>(2);
primitives.add(w);
primitives.add(w2);
errors.add(new TestError(this, Severity.WARNING, tr("Similarly named ways"), SIMILAR_NAMED, primitives));
@@ -98,7 +98,7 @@ public class SimilarNamedWays extends Test {
* @return The distance between words
*/
public int getLevenshteinDistance(String s, String t) {
- int d[][]; // matrix
+ int[][] d; // matrix
int n; // length of s
int m; // length of t
int i; // iterates through s
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index 1bd2c8a..ac6c636 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -18,7 +18,6 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -56,21 +55,28 @@ import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Check;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.CheckGroup;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.KeyedItem;
import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.Utils;
/**
- * Check for misspelled or wrong properties
+ * Check for misspelled or wrong tags
*
* @author frsantos
*/
-public class TagChecker extends Test
-{
- /** The default data files */
- public static final String DATA_FILE = "resource://data/tagchecker.cfg";
- public static final String IGNORE_FILE = "resource://data/ignoretags.cfg";
- public static final String SPELL_FILE = "resource://data/words.cfg";
+public class TagChecker extends Test {
+
+ /** The default data file of tagchecker rules */
+ public static final String DATA_FILE = "resource://data/validator/tagchecker.cfg";
+ /** The config file of ignored tags */
+ public static final String IGNORE_FILE = "resource://data/validator/ignoretags.cfg";
+ /** The config file of dictionary words */
+ public static final String SPELL_FILE = "resource://data/validator/words.cfg";
/** The spell check key substitutions: the key should be substituted by the value */
protected static Map<String, String> spellCheckKeyData;
@@ -148,8 +154,7 @@ public class TagChecker extends Test
* Constructor
*/
public TagChecker() {
- super(tr("Properties checker :"),
- tr("This plugin checks for errors in property keys and values."));
+ super(tr("Tag checker"), tr("This test checks for errors in tag keys and values."));
}
@Override
@@ -202,6 +207,7 @@ public class TagChecker extends Test
if (sources.length() == 0)
return;
for (String source : sources.split(";")) {
+ BufferedReader reader = null;
try {
MirroredInputStream s = new MirroredInputStream(source);
InputStreamReader r;
@@ -210,7 +216,7 @@ public class TagChecker extends Test
} catch (UnsupportedEncodingException e) {
r = new InputStreamReader(s);
}
- BufferedReader reader = new BufferedReader(r);
+ reader = new BufferedReader(r);
String okValue = null;
boolean tagcheckerfile = false;
@@ -242,7 +248,7 @@ public class TagChecker extends Test
ignoreDataEndsWith.add(line);
} else if (key.equals("K:")) {
IgnoreKeyPair tmp = new IgnoreKeyPair();
- int mid = line.indexOf("=");
+ int mid = line.indexOf('=');
tmp.key = line.substring(0, mid);
tmp.value = line.substring(mid+1);
ignoreDataKeyPair.add(tmp);
@@ -256,7 +262,7 @@ public class TagChecker extends Test
if (err == null) {
checkerData.add(d);
} else {
- System.err.println(tr("Invalid tagchecker line - {0}: {1}", err, line));
+ Main.error(tr("Invalid tagchecker line - {0}: {1}", err, line));
}
}
} else if (line.charAt(0) == '+') {
@@ -264,11 +270,13 @@ public class TagChecker extends Test
} else if (line.charAt(0) == '-' && okValue != null) {
spellCheckKeyData.put(line.substring(1), okValue);
} else {
- System.err.println(tr("Invalid spellcheck line: {0}", line));
+ Main.error(tr("Invalid spellcheck line: {0}", line));
}
}
} catch (IOException e) {
errorSources += source + "\n";
+ } finally {
+ Utils.close(reader);
}
}
@@ -300,16 +308,29 @@ public class TagChecker extends Test
presetsValueData.putVoid(a);
}
for (TaggingPreset p : presets) {
- for (TaggingPreset.Item i : p.data) {
- if (i instanceof TaggingPreset.KeyedItem) {
- TaggingPreset.KeyedItem ky = (TaggingPreset.KeyedItem) i;
- presetsValueData.putAll(ky.key, ky.getValues());
+ for (TaggingPresetItem i : p.data) {
+ if (i instanceof KeyedItem) {
+ addPresetValue(p, (KeyedItem) i);
+ } else if (i instanceof CheckGroup) {
+ for (Check c : ((CheckGroup) i).checks) {
+ addPresetValue(p, c);
+ }
}
}
}
}
}
+ private static void addPresetValue(TaggingPreset p, KeyedItem ky) {
+ if (ky.key != null && ky.getValues() != null) {
+ try {
+ presetsValueData.putAll(ky.key, ky.getValues());
+ } catch (NullPointerException e) {
+ Main.error(p+": Unable to initialize "+ky);
+ }
+ }
+ }
+
@Override
public void visit(Node n) {
checkPrimitive(n);
@@ -340,7 +361,7 @@ public class TagChecker extends Test
}
/**
- * Checks the primitive properties
+ * Checks the primitive tags
* @param p The primitive to check
*/
private void checkPrimitive(OsmPrimitive p) {
@@ -358,8 +379,7 @@ public class TagChecker extends Test
}
}
- Map<String, String> props = (p.getKeys() == null) ? Collections.<String, String>emptyMap() : p.getKeys();
- for (Entry<String, String> prop : props.entrySet()) {
+ for (Entry<String, String> prop : p.getKeys().entrySet()) {
String s = marktr("Key ''{0}'' invalid.");
String key = prop.getKey();
String value = prop.getValue();
@@ -393,7 +413,7 @@ public class TagChecker extends Test
tr(s, key), MessageFormat.format(s, key), INVALID_KEY, p) );
withErrors.put(p, "IPK");
}
- if (checkKeys && key.indexOf(" ") >= 0 && !withErrors.contains(p, "IPK")) {
+ if (checkKeys && key.indexOf(' ') >= 0 && !withErrors.contains(p, "IPK")) {
errors.add( new TestError(this, Severity.WARNING, tr("Invalid white space in property key"),
tr(s, key), MessageFormat.format(s, key), INVALID_KEY_SPACE, p) );
withErrors.put(p, "IPK");
@@ -410,9 +430,9 @@ public class TagChecker extends Test
}
if (checkValues && value != null && value.length() > 0 && presetsValueData != null) {
final Set<String> values = presetsValueData.get(key);
- final boolean keyInPresets = values != null;
+ final boolean keyInPresets = values != null;
final boolean tagInPresets = values != null && (values.isEmpty() || values.contains(prop.getValue()));
-
+
boolean ignore = false;
for (String a : ignoreDataStartsWith) {
if (key.startsWith(a)) {
@@ -429,7 +449,7 @@ public class TagChecker extends Test
ignore = true;
}
}
-
+
if (!tagInPresets) {
for (IgnoreKeyPair a : ignoreDataKeyPair) {
if (key.equals(a.key) && value.equals(a.value)) {
@@ -437,7 +457,7 @@ public class TagChecker extends Test
}
}
}
-
+
if (!ignore) {
if (!keyInPresets) {
String i = marktr("Key ''{0}'' not in presets.");
@@ -501,7 +521,7 @@ public class TagChecker extends Test
GBC a = GBC.eol();
a.anchor = GridBagConstraints.EAST;
- testPanel.add(new JLabel(name), GBC.eol().insets(3,0,0,0));
+ testPanel.add(new JLabel(name+" :"), GBC.eol().insets(3,0,0,0));
prefCheckKeys = new JCheckBox(tr("Check property keys."), Main.pref.getBoolean(PREF_CHECK_KEYS, true));
prefCheckKeys.setToolTipText(tr("Validate that property keys are valid checking against list of words."));
@@ -660,8 +680,7 @@ public class TagChecker extends Test
}
@Override
- public boolean ok()
- {
+ public boolean ok() {
enabled = prefCheckKeys.isSelected() || prefCheckValues.isSelected() || prefCheckComplex.isSelected() || prefCheckFixmes.isSelected();
testBeforeUpload = prefCheckKeysBeforeUpload.isSelected() || prefCheckValuesBeforeUpload.isSelected()
|| prefCheckFixmesBeforeUpload.isSelected() || prefCheckComplexBeforeUpload.isSelected();
@@ -677,18 +696,16 @@ public class TagChecker extends Test
Main.pref.put(PREF_USE_DATA_FILE, prefUseDataFile.isSelected());
Main.pref.put(PREF_USE_IGNORE_FILE, prefUseIgnoreFile.isSelected());
Main.pref.put(PREF_USE_SPELL_FILE, prefUseSpellFile.isSelected());
- String sources = "";
+ StringBuilder sources = new StringBuilder();
if (sourcesList.getModel().getSize() > 0) {
- String sb = "";
for (int i = 0; i < sourcesList.getModel().getSize(); ++i) {
- sb += ";"+sourcesList.getModel().getElementAt(i);
+ if (sources.length() > 0) {
+ sources.append(";");
+ }
+ sources.append(sourcesList.getModel().getElementAt(i));
}
- sources = sb.substring(1);
}
- if (sources.length() == 0) {
- sources = null;
- }
- return Main.pref.put(PREF_SOURCES, sources);
+ return Main.pref.put(PREF_SOURCES, sources.length() > 0 ? sources.toString() : null);
}
@Override
@@ -707,20 +724,19 @@ public class TagChecker extends Test
String key = prop.getKey();
String value = prop.getValue();
if (value == null || value.trim().length() == 0) {
- commands.add(new ChangePropertyCommand(Collections.singleton(p), key, null));
+ commands.add(new ChangePropertyCommand(p, key, null));
} else if (value.startsWith(" ") || value.endsWith(" ")) {
- commands.add(new ChangePropertyCommand(Collections.singleton(p), key, value.trim()));
+ commands.add(new ChangePropertyCommand(p, key, value.trim()));
} else if (key.startsWith(" ") || key.endsWith(" ")) {
- commands.add(new ChangePropertyKeyCommand(Collections.singleton(p), key, key.trim()));
+ commands.add(new ChangePropertyKeyCommand(p, key, key.trim()));
} else {
String evalue = entities.unescape(value);
if (!evalue.equals(value)) {
- commands.add(new ChangePropertyCommand(Collections.singleton(p), key, evalue));
+ commands.add(new ChangePropertyCommand(p, key, evalue));
} else {
String replacementKey = spellCheckKeyData.get(key);
if (replacementKey != null) {
- commands.add(new ChangePropertyKeyCommand(Collections.singleton(p),
- key, replacementKey));
+ commands.add(new ChangePropertyKeyCommand(p, key, replacementKey));
}
}
}
@@ -732,7 +748,7 @@ public class TagChecker extends Test
if (commands.size() == 1)
return commands.get(0);
- return new SequenceCommand(tr("Fix properties"), commands);
+ return new SequenceCommand(tr("Fix tags"), commands);
}
@Override
@@ -753,7 +769,7 @@ public class TagChecker extends Test
protected static class CheckerData {
private String description;
- private List<CheckerElement> data = new ArrayList<CheckerElement>();
+ protected List<CheckerElement> data = new ArrayList<CheckerElement>();
private OsmPrimitiveType type;
private int code;
protected Severity severity;
@@ -761,7 +777,7 @@ public class TagChecker extends Test
protected static final int TAG_CHECK_WARN = 1260;
protected static final int TAG_CHECK_INFO = 1270;
- private static class CheckerElement {
+ protected static class CheckerElement {
public Object tag;
public Object value;
public boolean noMatch;
@@ -813,7 +829,7 @@ public class TagChecker extends Test
}
return noMatch;
}
- };
+ }
public String getData(String str) {
Matcher m = Pattern.compile(" *# *([^#]+) *$").matcher(str);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java b/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
index 81f182b..61cc641 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
@@ -17,6 +17,10 @@ import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
+/**
+ * Checks if turnrestrictions are valid
+ * @since 3669
+ */
public class TurnrestrictionTest extends Test {
protected static final int NO_VIA = 1801;
@@ -35,6 +39,9 @@ public class TurnrestrictionTest extends Test {
protected static final int UNCONNECTED_VIA = 1814;
protected static final int SUPERFLUOUS = 1815;
+ /**
+ * Constructs a new {@code TurnrestrictionTest}.
+ */
public TurnrestrictionTest() {
super(tr("Turnrestrictions"), tr("This test checks if turnrestrictions are valid"));
}
@@ -58,7 +65,7 @@ public class TurnrestrictionTest extends Test {
if (m.getMember().isIncomplete())
return;
- ArrayList<OsmPrimitive> l = new ArrayList<OsmPrimitive>();
+ List<OsmPrimitive> l = new ArrayList<OsmPrimitive>();
l.add(r);
l.add(m.getMember());
if (m.isWay()) {
@@ -156,7 +163,7 @@ public class TurnrestrictionTest extends Test {
for (int i = 1; i < via.size(); i++) {
Way previous = (Way) via.get(i - 1);
Way current = (Way) via.get(i);
- checkIfConnected(previous, current,
+ checkIfConnected(previous, current,
tr("The \"via\" ways are not connected."), UNCONNECTED_VIA);
}
}
@@ -164,7 +171,7 @@ public class TurnrestrictionTest extends Test {
errors.add(new TestError(this, Severity.WARNING, tr("Superfluous turnrestriction as \"to\" way is oneway"), SUPERFLUOUS, r));
return;
}
- checkIfConnected((Way) via.get(via.size() - 1), toWay,
+ checkIfConnected((Way) via.get(via.size() - 1), toWay,
tr("The last \"via\" and the \"to\" way are not connected."), TO_VIA_WAY);
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
index 5caf4e6..6c2ec0b 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
@@ -6,6 +6,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.text.MessageFormat;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -14,110 +18,167 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
/**
* Check area type ways for errors
*
* @author stoecker
+ * @since 3669
*/
public class UnclosedWays extends Test {
/**
- * Constructor
+ * Constructs a new {@code UnclosedWays} test.
*/
public UnclosedWays() {
super(tr("Unclosed Ways"), tr("This tests if ways which should be circular are closed."));
}
- @Override
- public void startTest(ProgressMonitor monitor) {
- super.startTest(monitor);
+ /**
+ * A check performed by UnclosedWays test.
+ * @since 6390
+ */
+ private class UnclosedWaysCheck {
+ /** The unique numeric code for this check */
+ public final int code;
+ /** The OSM key checked */
+ public final String key;
+ /** The English message */
+ private final String engMessage;
+ /** The special values, to be ignored if ignore is set to true; to be considered only if ignore is set to false */
+ private final List<String> specialValues;
+ /** The boolean indicating if special values must be ignored or considered only */
+ private final boolean ignore;
+
+ /**
+ * Constructs a new {@code UnclosedWaysCheck}.
+ * @param code The unique numeric code for this check
+ * @param key The OSM key checked
+ * @param engMessage The English message
+ */
+ @SuppressWarnings("unchecked")
+ public UnclosedWaysCheck(int code, String key, String engMessage) {
+ this(code, key, engMessage, (List<String>) Collections.EMPTY_LIST);
+ }
+
+ /**
+ * Constructs a new {@code UnclosedWaysCheck}.
+ * @param code The unique numeric code for this check
+ * @param key The OSM key checked
+ * @param engMessage The English message
+ * @param ignoredValues The ignored values.
+ */
+ public UnclosedWaysCheck(int code, String key, String engMessage, List<String> ignoredValues) {
+ this(code, key, engMessage, ignoredValues, true);
+ }
+
+ /**
+ * Constructs a new {@code UnclosedWaysCheck}.
+ * @param code The unique numeric code for this check
+ * @param key The OSM key checked
+ * @param engMessage The English message
+ * @param specialValues The special values, to be ignored if ignore is set to true; to be considered only if ignore is set to false
+ * @param ignore indicates if special values must be ignored or considered only
+ */
+ public UnclosedWaysCheck(int code, String key, String engMessage, List<String> specialValues, boolean ignore) {
+ this.code = code;
+ this.key = key;
+ this.engMessage = engMessage;
+ this.specialValues = specialValues;
+ this.ignore = ignore;
+ }
+
+ /**
+ * Returns the test error of the given way, if any.
+ * @param w The way to check
+ * @return The test error if the way is erroneous, {@code null} otherwise
+ */
+ public final TestError getTestError(Way w) {
+ String value = w.get(key);
+ if (isValueErroneous(value)) {
+ String type = engMessage.contains("{0}") ? tr(engMessage, tr(value)) : tr(engMessage);
+ String etype = engMessage.contains("{0}") ? MessageFormat.format(engMessage, value) : engMessage;
+ return new TestError(UnclosedWays.this, Severity.WARNING, tr("Unclosed way"),
+ type, etype, code, Arrays.asList(w),
+ // The important parts of an unclosed way are the first and
+ // the last node which should be connected, therefore we highlight them
+ Arrays.asList(w.firstNode(), w.lastNode()));
+ }
+ return null;
+ }
+
+ protected boolean isValueErroneous(String value) {
+ return value != null && ignore != specialValues.contains(value);
+ }
}
- @Override
- public void endTest() {
- super.endTest();
- }
+ /**
+ * A check performed by UnclosedWays test where the key is treated as boolean.
+ * @since 6390
+ */
+ private final class UnclosedWaysBooleanCheck extends UnclosedWaysCheck {
- private String type;
- private String etype;
- private int mode;
+ /**
+ * Constructs a new {@code UnclosedWaysBooleanCheck}.
+ * @param code The unique numeric code for this check
+ * @param key The OSM key checked
+ * @param engMessage The English message
+ */
+ public UnclosedWaysBooleanCheck(int code, String key, String engMessage) {
+ super(code, key, engMessage);
+ }
- public void set(int m, String text, String desc) {
- etype = MessageFormat.format(text, desc);
- type = tr(text, tr(desc));
- mode = m;
+ @Override
+ protected boolean isValueErroneous(String value) {
+ Boolean btest = OsmUtils.getOsmBoolean(value);
+ // Not a strict boolean comparison to handle building=house like a building=yes
+ return (btest != null && btest) || (btest == null && value != null);
+ }
}
- public void set(int m, String text) {
- etype = text;
- type = tr(text);
- mode = m;
+ private final UnclosedWaysCheck[] checks = {
+ new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"), Arrays.asList("coastline", "cliff", "tree_row")),
+ new UnclosedWaysCheck(1102, "landuse", marktr("landuse type {0}")),
+ new UnclosedWaysCheck(1103, "amenities", marktr("amenities type {0}")),
+ new UnclosedWaysCheck(1104, "sport", marktr("sport type {0}"), Arrays.asList("water_slide", "climbing")),
+ new UnclosedWaysCheck(1105, "tourism", marktr("tourism type {0}")),
+ new UnclosedWaysCheck(1106, "shop", marktr("shop type {0}")),
+ new UnclosedWaysCheck(1107, "leisure", marktr("leisure type {0}"), Arrays.asList("track")),
+ new UnclosedWaysCheck(1108, "waterway", marktr("waterway type {0}"), Arrays.asList("riverbank"), false),
+ new UnclosedWaysBooleanCheck(1120, "building", marktr("building")),
+ new UnclosedWaysBooleanCheck(1130, "area", marktr("area")),
+ };
+
+ /**
+ * Returns the set of checked OSM keys.
+ * @return The set of checked OSM keys.
+ * @since 6390
+ */
+ public Set<String> getCheckedKeys() {
+ Set<String> keys = new HashSet<String>();
+ for (UnclosedWaysCheck c : checks) {
+ keys.add(c.key);
+ }
+ return keys;
}
@Override
public void visit(Way w) {
- String test;
- type = etype = null;
- mode = 0;
- if (!w.isUsable())
+ if (!w.isUsable() || w.isArea())
return;
- test = w.get("natural");
- if (test != null && !"coastline".equals(test) && !"cliff".equals(test) && !"tree_row".equals(test)) {
- set(1101, marktr("natural type {0}"), test);
- }
- test = w.get("landuse");
- if (test != null) {
- set(1102, marktr("landuse type {0}"), test);
- }
- test = w.get("amenities");
- if (test != null) {
- set(1103, marktr("amenities type {0}"), test);
- }
- test = w.get("sport");
- if (test != null && !test.equals("water_slide")) {
- set(1104, marktr("sport type {0}"), test);
- }
- test = w.get("tourism");
- if (test != null) {
- set(1105, marktr("tourism type {0}"), test);
- }
- test = w.get("shop");
- if (test != null) {
- set(1106, marktr("shop type {0}"), test);
- }
- test = w.get("leisure");
- if (test != null && !"track".contains(test)) {
- set(1107, marktr("leisure type {0}"), test);
- }
- test = w.get("waterway");
- if (test != null && test.equals("riverbank")) {
- set(1108, marktr("waterway type {0}"), test);
- }
- Boolean btest = OsmUtils.getOsmBoolean(w.get("building"));
- if (btest != null && btest) {
- set(1120, marktr("building"));
- }
- btest = OsmUtils.getOsmBoolean(w.get("area"));
- if (btest != null && btest) {
- set(1130, marktr("area"));
+ for (OsmPrimitive parent: w.getReferrers()) {
+ if (parent instanceof Relation && ((Relation)parent).isMultipolygon())
+ return;
}
- if (type != null && !w.isArea()) {
- for (OsmPrimitive parent: w.getReferrers()) {
- if (parent instanceof Relation && ((Relation)parent).isMultipolygon())
- return;
+ for (UnclosedWaysCheck c : checks) {
+ TestError error = c.getTestError(w);
+ if (error != null) {
+ errors.add(error);
+ return;
}
-
- errors.add(new TestError(this, Severity.WARNING, tr("Unclosed way"),
- type, etype, mode,
- Arrays.asList(w),
- // The important parts of an unclosed way are the first and
- // the last node which should be connected, therefore we highlight them
- Arrays.asList(w.firstNode(), w.lastNode())));
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
index 0c7ffde..de4cbb8 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
@@ -20,7 +20,6 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.QuadBuckets;
@@ -41,18 +40,15 @@ public class UnconnectedWays extends Test {
protected static final int UNCONNECTED_WAYS = 1301;
protected static final String PREFIX = ValidatorPreference.PREFIX + "." + UnconnectedWays.class.getSimpleName();
- Set<MyWaySegment> ways;
- QuadBuckets<Node> endnodes; // nodes at end of way
- QuadBuckets<Node> endnodes_highway; // nodes at end of way
- QuadBuckets<Node> middlenodes; // nodes in middle of way
- Set<Node> othernodes; // nodes appearing at least twice
- //NodeSearchCache nodecache;
- QuadBuckets<Node> nodecache;
- Area ds_area;
- DataSet ds;
+ private Set<MyWaySegment> ways;
+ private QuadBuckets<Node> endnodes; // nodes at end of way
+ private QuadBuckets<Node> endnodes_highway; // nodes at end of way
+ private QuadBuckets<Node> middlenodes; // nodes in middle of way
+ private Set<Node> othernodes; // nodes appearing at least twice
+ private Area dsArea;
- double mindist;
- double minmiddledist;
+ private double mindist;
+ private double minmiddledist;
/**
* Constructor
@@ -72,16 +68,14 @@ public class UnconnectedWays extends Test {
othernodes = new HashSet<Node>();
mindist = Main.pref.getDouble(PREFIX + ".node_way_distance", 10.0);
minmiddledist = Main.pref.getDouble(PREFIX + ".way_way_distance", 0.0);
- this.ds = Main.main.getCurrentDataSet();
- this.ds_area = ds.getDataSourceArea();
+ dsArea = Main.main.getCurrentDataSet().getDataSourceArea();
}
@Override
public void endTest() {
Map<Node, Way> map = new HashMap<Node, Way>();
for (int iter = 0; iter < 1; iter++) {
- Collection<MyWaySegment> tmp_ways = ways;
- for (MyWaySegment s : tmp_ways) {
+ for (MyWaySegment s : ways) {
Collection<Node> nearbyNodes = s.nearbyNodes(mindist);
for (Node en : nearbyNodes) {
if (en == null || !s.highway || !endnodes_highway.contains(en)) {
@@ -117,9 +111,9 @@ public class UnconnectedWays extends Test {
if(isCanceled())
return;
for (Node en : s.nearbyNodes(mindist)) {
- if (endnodes_highway.contains(en) && !s.highway && !s.isArea()) {
+ if (endnodes_highway.contains(en) && !s.highway && !s.w.concernsArea()) {
map.put(en, s.w);
- } else if (endnodes.contains(en) && !s.isArea()) {
+ } else if (endnodes.contains(en) && !s.w.concernsArea()) {
map.put(en, s.w);
}
}
@@ -144,8 +138,6 @@ public class UnconnectedWays extends Test {
map.put(en, s.w);
}
}
- //System.out.println("p3 elapsed: " + (System.currentTimeMillis()-last));
- //last = System.currentTimeMillis();
for (Map.Entry<Node, Way> error : map.entrySet()) {
errors.add(new TestError(this, Severity.OTHER,
tr("Way node near other way"),
@@ -164,8 +156,6 @@ public class UnconnectedWays extends Test {
map.put(en, s.w);
}
}
- //System.out.println("p4 elapsed: " + (System.currentTimeMillis()-last));
- //last = System.currentTimeMillis();
for (Map.Entry<Node, Way> error : map.entrySet()) {
errors.add(new TestError(this, Severity.OTHER,
tr("Connected way end node near other way"),
@@ -176,9 +166,11 @@ public class UnconnectedWays extends Test {
}
ways = null;
endnodes = null;
+ endnodes_highway = null;
+ middlenodes = null;
+ othernodes = null;
+ dsArea = null;
super.endTest();
- //System.out.println("p99 elapsed: " + (System.currentTimeMillis()-last));
- //last = System.currentTimeMillis();
}
private class MyWaySegment {
@@ -244,7 +236,7 @@ public class UnconnectedWays extends Test {
}
LatLon topLeft = new LatLon(y2+fudge, x1-fudge);
LatLon botRight = new LatLon(y1-fudge, x2+fudge);
- List<LatLon> ret = new ArrayList<LatLon>();
+ List<LatLon> ret = new ArrayList<LatLon>(2);
ret.add(topLeft);
ret.add(botRight);
return ret;
@@ -255,15 +247,12 @@ public class UnconnectedWays extends Test {
// away that we looked for last time, the cached
// result is no good
if (dist > nearbyNodeCacheDist) {
- //if (nearbyNodeCacheDist != -1)
- // System.out.println("destroyed MyWaySegment nearby node cache:" + dist + " > " + nearbyNodeCacheDist);
nearbyNodeCache = null;
}
if (nearbyNodeCache != null) {
// If we've cached an aread greater than the
// one now being asked for...
if (nearbyNodeCacheDist > dist) {
- //System.out.println("had to trim MyWaySegment nearby node cache.");
// Used the cached result and trim out
// the nodes that are not in the smaller
// area, but keep the old larger cache.
@@ -292,8 +281,7 @@ public class UnconnectedWays extends Test {
found_nodes.addAll(endnodes.search(new BBox(bounds.get(0), bounds.get(1))));
for (Node n : found_nodes) {
- if (!nearby(n, dist) ||
- (ds_area != null && !ds_area.contains(n.getCoor()))) {
+ if (!nearby(n, dist) || !n.getCoor().isIn(dsArea)) {
continue;
}
// It is actually very rare for us to find a node
@@ -310,13 +298,6 @@ public class UnconnectedWays extends Test {
}
return nearbyNodeCache;
}
-
- public boolean isArea() {
- return w.hasKey("landuse")
- || w.hasKey("leisure")
- || w.hasKey("amenity")
- || w.hasKey("building");
- }
}
List<MyWaySegment> getWaySegments(Way w) {
@@ -333,18 +314,24 @@ public class UnconnectedWays extends Test {
if(i < size-1) {
addNode(w.getNode(i), middlenodes);
}
- MyWaySegment ws = new MyWaySegment(w, w.getNode(i-1), w.getNode(i));
- if (ws.isBoundary || ws.isAbandoned) {
- continue;
+ Node a = w.getNode(i-1);
+ Node b = w.getNode(i);
+ if (a.isDrawable() && b.isDrawable()) {
+ MyWaySegment ws = new MyWaySegment(w, a, b);
+ if (ws.isBoundary || ws.isAbandoned) {
+ continue;
+ }
+ ret.add(ws);
}
- ret.add(ws);
}
return ret;
}
@Override
public void visit(Way w) {
- if (w.getNodesCount() > 0) {
+ // Do not consider empty ways and addr:interpolation ways as they are not physical features and most of the time
+ // very near the associated highway, which is perfectly normal, see #9332
+ if (w.getNodesCount() > 0 && !w.hasKey("addr:interpolation")) {
ways.addAll(getWaySegments(w));
QuadBuckets<Node> set = endnodes;
if (w.hasKey("highway") || w.hasKey("railway")) {
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
index eba8c8f..51a6e6e 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
@@ -13,7 +13,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
/**
* Checks for nodes with uninteresting tags that are in no way
@@ -39,25 +38,21 @@ public class UntaggedNode extends Test {
}
@Override
- public void startTest(ProgressMonitor monitor) {
- super.startTest(monitor);
- }
-
- @Override
public void visit(Collection<OsmPrimitive> selection) {
for (OsmPrimitive p : selection) {
if (p.isUsable() && p instanceof Node) {
- p.visit(this);
+ p.accept(this);
}
}
}
@Override
public void visit(Node n) {
- if(n.isUsable() && !n.isTagged() && n.getReferrers().isEmpty()) {
+ if (n.isUsable() && !n.isTagged() && n.getReferrers().isEmpty()) {
+ String errorMessage = tr("Unconnected nodes without physical tags");
if (!n.hasKeys()) {
String msg = marktr("No tags");
- errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"), tr(msg), msg, UNTAGGED_NODE_BLANK, n));
+ errors.add(new TestError(this, Severity.WARNING, errorMessage, tr(msg), msg, UNTAGGED_NODE_BLANK, n));
return;
}
for (Map.Entry<String, String> tag : n.getKeys().entrySet()) {
@@ -65,8 +60,7 @@ public class UntaggedNode extends Test {
if (contains(tag, "fixme") || contains(tag, "FIXME")) {
/* translation note: don't translate quoted words */
String msg = marktr("Has tag containing ''fixme'' or ''FIXME''");
- errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
- tr(msg), msg, UNTAGGED_NODE_FIXME, n));
+ errors.add(new TestError(this, Severity.WARNING, errorMessage, tr(msg), msg, UNTAGGED_NODE_FIXME, n));
return;
}
@@ -90,14 +84,12 @@ public class UntaggedNode extends Test {
code = UNTAGGED_NODE_SOURCE;
}
if (msg != null) {
- errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
- tr(msg), msg, code, n));
+ errors.add(new TestError(this, Severity.WARNING, errorMessage, tr(msg), msg, code, n));
return;
}
}
// Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
- errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
- tr("Other"), "Other", UNTAGGED_NODE_OTHER, n));
+ errors.add(new TestError(this, Severity.WARNING, errorMessage, tr("Other"), "Other", UNTAGGED_NODE_OTHER, n));
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
index ddef3dd..61938b0 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
@@ -23,8 +23,8 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
*
* @author frsantos
*/
-public class UntaggedWay extends Test
-{
+public class UntaggedWay extends Test {
+
/** Empty way error */
protected static final int EMPTY_WAY = 301;
/** Untagged way error */
@@ -49,9 +49,9 @@ public class UntaggedWay extends Test
NAMED_WAYS.add( "secondary" );
NAMED_WAYS.add( "tertiary" );
NAMED_WAYS.add( "residential" );
- NAMED_WAYS.add( "pedestrian" ); ;
+ NAMED_WAYS.add( "pedestrian" );
}
-
+
/** Whitelist of roles allowed to reference an untagged way */
public static final Set<String> WHITELIST = new HashSet<String>();
static {
@@ -78,27 +78,25 @@ public class UntaggedWay extends Test
Map<String, String> tags = w.getKeys();
if (!tags.isEmpty()) {
String highway = tags.get("highway");
- if (highway != null && NAMED_WAYS.contains(highway)) {
- if (!tags.containsKey("name") && !tags.containsKey("ref")) {
- boolean isRoundabout = false;
- boolean hasName = false;
- for (String key : w.keySet()) {
- hasName = key.startsWith("name:") || key.endsWith("_name") || key.endsWith("_ref");
- if (hasName) {
- break;
- }
- if (key.equals("junction")) {
- isRoundabout = w.get("junction").equals("roundabout");
- break;
- }
+ if (highway != null && NAMED_WAYS.contains(highway) && !tags.containsKey("name") && !tags.containsKey("ref")) {
+ boolean isRoundabout = false;
+ boolean hasName = false;
+ for (String key : w.keySet()) {
+ hasName = key.startsWith("name:") || key.endsWith("_name") || key.endsWith("_ref");
+ if (hasName) {
+ break;
}
-
- if (!hasName && !isRoundabout) {
- errors.add(new TestError(this, Severity.WARNING, tr("Unnamed ways"), UNNAMED_WAY, w));
- } else if (isRoundabout) {
- errors.add(new TestError(this, Severity.WARNING, tr("Unnamed junction"), UNNAMED_JUNCTION, w));
+ if (key.equals("junction")) {
+ isRoundabout = w.get("junction").equals("roundabout");
+ break;
}
}
+
+ if (!hasName && !isRoundabout) {
+ errors.add(new TestError(this, Severity.WARNING, tr("Unnamed ways"), UNNAMED_WAY, w));
+ } else if (isRoundabout) {
+ errors.add(new TestError(this, Severity.WARNING, tr("Unnamed junction"), UNNAMED_JUNCTION, w));
+ }
}
}
@@ -126,7 +124,7 @@ public class UntaggedWay extends Test
for (RelationMember m : r.getMembers()) {
if (r.isMultipolygon() || WHITELIST.contains(m.getRole())) {
OsmPrimitive member = m.getMember();
- if (member != null && member instanceof Way && member.isUsable() && !member.isTagged()) {
+ if (member instanceof Way && member.isUsable() && !member.isTagged()) {
waysUsedInRelations.add((Way)member);
}
}
@@ -154,4 +152,9 @@ public class UntaggedWay extends Test
public Command fixError(TestError testError) {
return deletePrimitivesIfNeeded(testError.getPrimitives());
}
+
+ @Override
+ public boolean isPrimitiveUsable(OsmPrimitive p) {
+ return p.isUsable();
+ }
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
index a276095..cfde422 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
@@ -1,9 +1,11 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Arrays;
import java.util.List;
+
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
@@ -13,8 +15,15 @@ import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.mappaint.ElemStyles;
+/**
+ * Checks for ways connected to areas.
+ * @since 4682
+ */
public class WayConnectedToArea extends Test {
+ /**
+ * Constructs a new {@code WayConnectedToArea} test.
+ */
public WayConnectedToArea() {
super(tr("Way connected to Area"), tr("Checks for ways connected to areas."));
}
@@ -33,8 +42,7 @@ public class WayConnectedToArea extends Test {
break;
}
}
- if(!hasway)
- {
+ if (!hasway) {
for (OsmPrimitive p : r) {
testForError(w, w.firstNode(), p);
}
@@ -47,7 +55,7 @@ public class WayConnectedToArea extends Test {
break;
}
}
- if(!hasway) {
+ if (!hasway) {
for (OsmPrimitive p : r) {
testForError(w, w.lastNode(), p);
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java b/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java
index 74cb961..162a96d 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java
@@ -19,7 +19,6 @@ import org.openstreetmap.josm.tools.Geometry;
public class WronglyOrderedWays extends Test {
protected static final int WRONGLY_ORDERED_COAST = 1001;
- //protected static int WRONGLY_ORDERED_WATER = 1002;
protected static final int WRONGLY_ORDERED_LAND = 1003;
/**
@@ -41,8 +40,6 @@ public class WronglyOrderedWays extends Test {
return;
else if ("coastline".equals(natural) && Geometry.isClockwise(w)) {
reportError(w, tr("Reversed coastline: land not on left side"), WRONGLY_ORDERED_COAST);
- /*} else if ("water".equals(natural) && !Geometry.isClockwise(w)) {
- reportError(w, tr("Reversed water: land not on left side"), WRONGLY_ORDERED_WATER);*/
} else if ("land".equals(natural) && Geometry.isClockwise(w)) {
reportError(w, tr("Reversed land: land not on left side"), WRONGLY_ORDERED_LAND);
} else
diff --git a/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java b/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java
index 1eb9aae..0ca446a 100644
--- a/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java
@@ -29,7 +29,7 @@ public class AggregatePrimitivesVisitor extends AbstractVisitor {
*/
public Collection<OsmPrimitive> visit(Collection<OsmPrimitive> data) {
for (OsmPrimitive osm : data) {
- osm.visit(this);
+ osm.accept(this);
}
return aggregatedData;
@@ -57,7 +57,7 @@ public class AggregatePrimitivesVisitor extends AbstractVisitor {
if (!aggregatedData.contains(r)) {
aggregatedData.add(r);
for (RelationMember m : r.getMembers()) {
- m.getMember().visit(this);
+ m.getMember().accept(this);
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/util/Entities.java b/src/org/openstreetmap/josm/data/validation/util/Entities.java
index 272c92c..9897311 100644
--- a/src/org/openstreetmap/josm/data/validation/util/Entities.java
+++ b/src/org/openstreetmap/josm/data/validation/util/Entities.java
@@ -387,8 +387,8 @@ public class Entities {
if(mapNameToValue == null)
{
mapNameToValue = new HashMap<String, String>();
- for (int in = 0; in < ARRAY.length; ++in)
- mapNameToValue.put(ARRAY[in][0], ARRAY[in][1]);
+ for (String[] pair : ARRAY)
+ mapNameToValue.put(pair[0], pair[1]);
}
String value = mapNameToValue.get(entityContent);
entityValue = (value == null ? -1 : Integer.parseInt(value));
diff --git a/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java b/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
index a834729..d1ec495 100644
--- a/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
@@ -19,10 +19,10 @@ import org.openstreetmap.josm.tools.ImageProvider;
public class MultipleNameVisitor extends NameVisitor
{
public static final int MULTIPLE_NAME_MAX_LENGTH = 80;
-
+
/** The class name of the combined primitives */
private String multipleClassname;
- /* name to be displayed */
+ /** Name to be displayed */
private String displayName;
/** Size of the collection */
private int size;
@@ -32,7 +32,7 @@ public class MultipleNameVisitor extends NameVisitor
* @param data The collection of primitives
*/
public void visit(Collection<? extends OsmPrimitive> data) {
- String multipleName = "";
+ StringBuilder multipleName = new StringBuilder();
String multiplePluralClassname = null;
size = data.size();
@@ -43,13 +43,13 @@ public class MultipleNameVisitor extends NameVisitor
name = osm.get("ref");
}
if (name != null && !name.isEmpty() && multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
- if (!multipleName.isEmpty()) {
- multipleName += ", ";
+ if (multipleName.length() > 0) {
+ multipleName.append(", ");
}
- multipleName += name;
+ multipleName.append(name);
}
- osm.visit(this);
+ osm.accept(this);
if (multipleClassname == null) {
multipleClassname = className;
multiplePluralClassname = classNamePlural;
@@ -59,11 +59,11 @@ public class MultipleNameVisitor extends NameVisitor
}
}
- if (size == 1) {
+ if (size <= 1) {
displayName = name;
} else {
displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size);
- if (!multipleName.isEmpty()) {
+ if (multipleName.length() > 0) {
if (multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
displayName += ": " + multipleName;
} else {
@@ -91,7 +91,7 @@ public class MultipleNameVisitor extends NameVisitor
* @return the icon of the items
*/
public Icon getIcon() {
- if (size == 1)
+ if (size <= 1)
return icon;
else
return ImageProvider.get("data", multipleClassname);
diff --git a/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java b/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java
index 884e8be..c7306dc 100644
--- a/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java
@@ -29,7 +29,7 @@ public class NameVisitor extends AbstractVisitor {
/**
* The name of this item.
*/
- public String name;
+ public String name = "";
/**
* The icon of this item.
*/
@@ -59,8 +59,6 @@ public class NameVisitor extends AbstractVisitor {
classNamePlural = trn("way", "ways", 2);
}
- /**
- */
@Override
public void visit(Relation e) {
name = e.getDisplayName(DefaultNameFormatter.getInstance());
diff --git a/src/org/openstreetmap/josm/data/validation/util/ValUtil.java b/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
index 81f48fd..cdf4c15 100644
--- a/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
+++ b/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
@@ -18,8 +18,12 @@ import org.openstreetmap.josm.data.validation.OsmValidator;
*
* @author frsantos
*/
-public class ValUtil
-{
+public final class ValUtil {
+
+ private ValUtil() {
+ // Hide default constructor for utils classes
+ }
+
/**
* Returns the start and end cells of a way.
* @param w The way
diff --git a/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java b/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
index 6f6c21e..51aa12a 100644
--- a/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
+++ b/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -25,7 +25,7 @@ import org.openstreetmap.josm.tools.GBC;
* JOSM windows for detached dialogs, relation editors, history browser and the like.
*
*/
-public class ConditionalOptionPaneUtil {
+public final class ConditionalOptionPaneUtil {
static public final int DIALOG_DISABLED_OPTION = Integer.MIN_VALUE;
/**
@@ -37,8 +37,8 @@ public class ConditionalOptionPaneUtil {
* Replies the preference value for the preference key "message." + <code>prefKey</code>.
* The default value if the preference key is missing is true.
*
- * @param the preference key
- * @return prefKey the preference value for the preference key "message." + <code>prefKey</code>
+ * @param prefKey the preference key
+ * @return the preference value for the preference key "message." + <code>prefKey</code>
*/
public static boolean getDialogShowingEnabled(String prefKey) {
return Main.pref.getBoolean("message."+prefKey, true);
@@ -58,8 +58,8 @@ public class ConditionalOptionPaneUtil {
* Returns the preference value for the preference key "message." + <code>prefKey</code> + ".value".
* The default value if the preference key is missing is -1.
*
- * @param the preference key
- * @return prefKey the preference value for the preference key "message." + <code>prefKey</code> + ".value"
+ * @param prefKey the preference key
+ * @return the preference value for the preference key "message." + <code>prefKey</code> + ".value"
*/
public static Integer getDialogReturnValue(String prefKey) {
return Main.pref.getInteger("message."+prefKey+".value", -1);
diff --git a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
index 0c2b6af..1970082 100644
--- a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
+++ b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
@@ -48,7 +48,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
static private DefaultNameFormatter instance;
- private static final LinkedList<NameFormatterHook> formatHooks = new LinkedList<NameFormatterHook>();
+ private static final List<NameFormatterHook> formatHooks = new LinkedList<NameFormatterHook>();
/**
* Replies the unique instance of this formatter
@@ -137,6 +137,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* @param node the node
* @return the name
*/
+ @Override
public String format(Node node) {
StringBuilder name = new StringBuilder();
if (node.isIncomplete()) {
@@ -202,6 +203,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
}
};
+ @Override
public Comparator<Node> getNodeComparator() {
return nodeComparator;
}
@@ -213,6 +215,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* @param way the way
* @return the name
*/
+ @Override
public String format(Way way) {
StringBuilder name = new StringBuilder();
if (way.isIncomplete()) {
@@ -266,10 +269,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
preset.nameTemplate.appendText(name, way);
}
- int nodesNo = way.getNodesCount();
- if (nodesNo > 1 && way.isClosed()) {
- nodesNo--;
- }
+ int nodesNo = way.getRealNodesCount();
/* note: length == 0 should no longer happen, but leave the bracket code
nevertheless, who knows what future brings */
/* I18n: count of nodes as parameter */
@@ -295,6 +295,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
}
};
+ @Override
public Comparator<Way> getWayComparator() {
return wayComparator;
}
@@ -306,6 +307,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* @param relation the relation
* @return the name
*/
+ @Override
public String format(Relation relation) {
StringBuilder name = new StringBuilder();
if (relation.isIncomplete()) {
@@ -394,7 +396,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
if (comp != 0)
return comp;
- if (r1.getUniqueId() > r2.getUniqueId())
+ if (r1.getUniqueId() > r2.getUniqueId())
return 1;
else if (r1.getUniqueId() < r2.getUniqueId())
return -1;
@@ -403,18 +405,11 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
}
};
+ @Override
public Comparator<Relation> getRelationComparator() {
return relationComparator;
}
- private String getLeadingNumber(String s) {
- int i = 0;
- while (i < s.length() && Character.isDigit(s.charAt(i))) {
- i++;
- }
- return s.substring(0, i);
- }
-
private String getRelationTypeName(IRelation relation) {
String name = trc("Relation type", relation.get("type"));
if (name == null) {
@@ -486,6 +481,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* @param changeset the changeset
* @return the name
*/
+ @Override
public String format(Changeset changeset) {
return tr("Changeset {0}",changeset.getId());
}
@@ -502,7 +498,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
sb.append("<strong>id</strong>=")
.append(primitive.getId())
.append("<br>");
- ArrayList<String> keyList = new ArrayList<String>(primitive.keySet());
+ List<String> keyList = new ArrayList<String>(primitive.keySet());
Collections.sort(keyList);
for (int i = 0; i < keyList.size(); i++) {
if (i > 0) {
@@ -549,6 +545,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* @param node the node
* @return the name
*/
+ @Override
public String format(HistoryNode node) {
StringBuilder sb = new StringBuilder();
String name;
@@ -580,6 +577,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* @param way the way
* @return the name
*/
+ @Override
public String format(HistoryWay way) {
StringBuilder sb = new StringBuilder();
String name;
@@ -621,6 +619,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* @param relation the relation
* @return the name
*/
+ @Override
public String format(HistoryRelation relation) {
StringBuilder sb = new StringBuilder();
if (relation.get("type") != null) {
@@ -672,7 +671,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
sb.append("<strong>id</strong>=")
.append(primitive.getId())
.append("<br>");
- ArrayList<String> keyList = new ArrayList<String>(primitive.getTags().keySet());
+ List<String> keyList = new ArrayList<String>(primitive.getTags().keySet());
Collections.sort(keyList);
for (int i = 0; i < keyList.size(); i++) {
if (i > 0) {
diff --git a/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java b/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
index 492f637..d2a93aa 100644
--- a/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+++ b/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.io.ChangesetClosedException;
import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
+import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiException;
import org.openstreetmap.josm.io.OsmApiInitializationException;
import org.openstreetmap.josm.io.OsmTransferException;
@@ -29,7 +30,7 @@ import org.openstreetmap.josm.tools.ExceptionUtil;
* This utility class provides static methods which explain various exceptions to the user.
*
*/
-public class ExceptionDialogUtil {
+public final class ExceptionDialogUtil {
/**
* just static utility functions. no constructor
@@ -243,10 +244,6 @@ public class ExceptionDialogUtil {
);
}
- private static boolean isOAuth() {
- return Main.pref.get("osm-server.auth-method", "basic").equals("oauth");
- }
-
/**
* Explains a {@link OsmApiException} which was thrown because the authentication at
* the OSM server failed
@@ -255,7 +252,7 @@ public class ExceptionDialogUtil {
*/
public static void explainAuthenticationFailed(OsmApiException e) {
String msg;
- if (isOAuth()) {
+ if (OsmApi.isUsingOAuth()) {
msg = ExceptionUtil.explainFailedOAuthAuthentication(e);
} else {
msg = ExceptionUtil.explainFailedBasicAuthentication(e);
@@ -277,12 +274,12 @@ public class ExceptionDialogUtil {
* @param e the exception
*/
public static void explainAuthorizationFailed(OsmApiException e) {
-
+
Matcher m;
String msg;
String url = e.getAccessedUrl();
Pattern p = Pattern.compile("http://.*/api/0.6/(node|way|relation)/(\\d+)/(\\d+)");
-
+
// Special case for individual access to redacted versions
// See http://wiki.openstreetmap.org/wiki/Open_Database_License/Changes_in_the_API
if (url != null && (m = p.matcher(url)).matches()) {
@@ -292,12 +289,12 @@ public class ExceptionDialogUtil {
// {1} is the translation of "node", "way" or "relation"
msg = tr("Access to redacted version ''{0}'' of {1} {2} is forbidden.",
version, tr(type), id);
- } else if (isOAuth()) {
+ } else if (OsmApi.isUsingOAuth()) {
msg = ExceptionUtil.explainFailedOAuthAuthorisation(e);
} else {
msg = ExceptionUtil.explainFailedAuthorisation(e);
}
-
+
HelpAwareOptionPane.showOptionDialog(
Main.parent,
msg,
diff --git a/src/org/openstreetmap/josm/gui/ExtendedDialog.java b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
index 6ea03dc..d78a0ab 100644
--- a/src/org/openstreetmap/josm/gui/ExtendedDialog.java
+++ b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
@@ -34,8 +34,10 @@ import javax.swing.UIManager;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.help.HelpBrowser;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
/**
@@ -50,9 +52,9 @@ import org.openstreetmap.josm.tools.WindowGeometry;
* There are various options, see below.
*
* Note: The button indices are counted from 1 and upwards.
- * So for {@link #getValue()}, {@link #setDefaultButton(int)} and
+ * So for {@link #getValue()}, {@link #setDefaultButton(int)} and
* {@link #setCancelButton} the first button has index 1.
- *
+ *
* Simple example:
* <pre>
* ExtendedDialog ed = new ExtendedDialog(
@@ -102,7 +104,7 @@ public class ExtendedDialog extends JDialog {
// For easy access when inherited
protected Insets contentInsets = new Insets(10,5,0,5);
- protected ArrayList<JButton> buttons = new ArrayList<JButton>();
+ protected List<JButton> buttons = new ArrayList<JButton>();
/**
* This method sets up the most basic options for the dialog. Add more
@@ -131,18 +133,20 @@ public class ExtendedDialog extends JDialog {
/**
* Same as above but lets you define if the dialog should be modal.
+ * @param parent The parent element that will be used for position and maximum size
+ * @param title The text that will be shown in the window titlebar
+ * @param buttonTexts String Array of the text that will appear on the buttons. The first button is the default one.
+ * @param modal Set it to {@code true} if you want the dialog to be modal
*/
- public ExtendedDialog(Component parent, String title, String[] buttonTexts,
- boolean modal) {
+ public ExtendedDialog(Component parent, String title, String[] buttonTexts, boolean modal) {
this(parent, title, buttonTexts, modal, true);
}
- public ExtendedDialog(Component parent, String title, String[] buttonTexts,
- boolean modal, boolean disposeOnClose) {
+ public ExtendedDialog(Component parent, String title, String[] buttonTexts, boolean modal, boolean disposeOnClose) {
super(JOptionPane.getFrameForComponent(parent), title, modal ? ModalityType.DOCUMENT_MODAL : ModalityType.MODELESS);
this.parent = parent;
this.modal = modal;
- bTexts = buttonTexts;
+ bTexts = Utils.copyArray(buttonTexts);
if (disposeOnClose) {
setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
}
@@ -151,15 +155,18 @@ public class ExtendedDialog extends JDialog {
/**
* Allows decorating the buttons with icons.
- * @param buttonIcons
+ * @param buttonIcons The button icons
+ * @return {@code this}
*/
public ExtendedDialog setButtonIcons(Icon[] buttonIcons) {
- this.bIcons = buttonIcons;
+ this.bIcons = Utils.copyArray(buttonIcons);
return this;
}
/**
* Convenience method to provide image names instead of images.
+ * @param buttonIcons The button icon names
+ * @return {@code this}
*/
public ExtendedDialog setButtonIcons(String[] buttonIcons) {
bIcons = new Icon[buttonIcons.length];
@@ -174,9 +181,10 @@ public class ExtendedDialog extends JDialog {
* translated tooltip texts.
*
* @param toolTipTexts the tool tip texts. Ignored, if null.
+ * @return {@code this}
*/
public ExtendedDialog setToolTipTexts(String[] toolTipTexts) {
- this.bToolTipTexts = toolTipTexts;
+ this.bToolTipTexts = Utils.copyArray(toolTipTexts);
return this;
}
@@ -187,6 +195,7 @@ public class ExtendedDialog extends JDialog {
* The content is played on top of the other elements though.
*
* @param content Any element that can be displayed in the message dialog
+ * @return {@code this}
*/
public ExtendedDialog setContent(Component content) {
return setContent(content, true);
@@ -200,7 +209,7 @@ public class ExtendedDialog extends JDialog {
*
* @param content Any element that can be displayed in the message dialog
* @param placeContentInScrollPane if true, places the content in a JScrollPane
- *
+ * @return {@code this}
*/
public ExtendedDialog setContent(Component content, boolean placeContentInScrollPane) {
this.content = content;
@@ -216,6 +225,7 @@ public class ExtendedDialog extends JDialog {
* The content is played on top of the other elements though.
*
* @param message The text that should be shown to the user
+ * @return {@code this}
*/
public ExtendedDialog setContent(String message) {
return setContent(string2label(message), false);
@@ -224,6 +234,8 @@ public class ExtendedDialog extends JDialog {
/**
* Decorate the dialog with an icon that is shown on the left part of
* the window area. (Similar to how it is done in {@link JOptionPane})
+ * @param icon The icon to display
+ * @return {@code this}
*/
public ExtendedDialog setIcon(Icon icon) {
this.icon = icon;
@@ -232,6 +244,8 @@ public class ExtendedDialog extends JDialog {
/**
* Convenience method to allow values that would be accepted by {@link JOptionPane} as messageType.
+ * @param messageType The {@link JOptionPane} messageType
+ * @return {@code this}
*/
public ExtendedDialog setIcon(int messageType) {
switch (messageType) {
@@ -253,10 +267,11 @@ public class ExtendedDialog extends JDialog {
/**
* Show the dialog to the user. Call this after you have set all options
* for the dialog. You can retrieve the result using {@link #getValue()}.
+ * @return {@code this}
*/
public ExtendedDialog showDialog() {
// Check if the user has set the dialog to not be shown again
- if (toggleCheckState(togglePref)) {
+ if (toggleCheckState()) {
result = toggleValue;
return this;
}
@@ -273,7 +288,7 @@ public class ExtendedDialog extends JDialog {
/**
* Retrieve the user choice after the dialog has been closed.
- *
+ *
* @return <ul> <li>The selected button. The count starts with 1.</li>
* <li>A return value of {@link #DialogClosedOtherwise} means the dialog has been closed otherwise.</li>
* </ul>
@@ -423,7 +438,9 @@ public class ExtendedDialog extends JDialog {
if(parent != null) {
x = JOptionPane.getFrameForComponent(parent).getSize();
}
- } catch(NullPointerException e) { }
+ } catch(NullPointerException e) {
+ Main.warn(e);
+ }
return x;
}
@@ -451,7 +468,7 @@ public class ExtendedDialog extends JDialog {
geometry.remember(rememberSizePref);
}
}
-
+
protected final WindowGeometry initWindowGeometry() {
return new WindowGeometry(rememberSizePref, defaultWindowGeometry);
}
@@ -492,7 +509,7 @@ public class ExtendedDialog extends JDialog {
* @param wg The default window geometry that should be used if no
* existing preference is found (only takes effect if
* <code>pref</code> is not null or empty
- *
+ * @return {@code this}
*/
public ExtendedDialog setRememberWindowGeometry(String pref, WindowGeometry wg) {
rememberSizePref = pref == null ? "" : pref;
@@ -506,6 +523,7 @@ public class ExtendedDialog extends JDialog {
* every time.
* Currently, this is not supported for non-modal dialogs.
* @param togglePref The preference to save the checkbox state to
+ * @return {@code this}
*/
public ExtendedDialog toggleEnable(String togglePref) {
if (!modal) {
@@ -519,6 +537,7 @@ public class ExtendedDialog extends JDialog {
/**
* Call this if you "accidentally" called toggleEnable. This doesn't need
* to be called for every dialog, as it's the default anyway.
+ * @return {@code this}
*/
public ExtendedDialog toggleDisable() {
this.toggleable = false;
@@ -529,7 +548,8 @@ public class ExtendedDialog extends JDialog {
* Overwrites the default "Don't show again" text of the toggle checkbox
* if you want to give more information. Only has an effect if
* <code>toggleEnable</code> is set.
- * @param text
+ * @param text The toggle checkbox text
+ * @return {@code this}
*/
public ExtendedDialog setToggleCheckboxText(String text) {
this.toggleCheckboxText = text;
@@ -538,6 +558,8 @@ public class ExtendedDialog extends JDialog {
/**
* Sets the button that will react to ENTER.
+ * @param defaultButtonIdx The button index (starts to )
+ * @return {@code this}
*/
public ExtendedDialog setDefaultButton(int defaultButtonIdx) {
this.defaultButtonIdx = defaultButtonIdx;
@@ -547,8 +569,8 @@ public class ExtendedDialog extends JDialog {
/**
* Used in combination with toggle:
* If the user presses 'cancel' the toggle settings are ignored and not saved to the pref
- * @param cancelButton index of the button that stands for cancel, accepts
- * multiple values
+ * @param cancelButtonIdx index of the button that stands for cancel, accepts multiple values
+ * @return {@code this}
*/
public ExtendedDialog setCancelButton(Integer... cancelButtonIdx) {
this.cancelButtonIdx = Arrays.<Integer>asList(cancelButtonIdx);
@@ -572,14 +594,13 @@ public class ExtendedDialog extends JDialog {
* This function returns true if the dialog has been set to "do not show again"
* @return true if dialog should not be shown again
*/
- private boolean toggleCheckState(String togglePref) {
- toggleable = togglePref != null && !togglePref.equals("");
+ public final boolean toggleCheckState() {
+ toggleable = togglePref != null && !togglePref.isEmpty();
toggleValue = Main.pref.getInteger("message."+togglePref+".value", -1);
// No identifier given, so return false (= show the dialog)
- if(!toggleable || toggleValue == -1)
+ if (!toggleable || toggleValue == -1)
return false;
- this.togglePref = togglePref;
// The pref is true, if the dialog should be shown.
return !(Main.pref.getBoolean("message."+ togglePref, true));
}
@@ -623,6 +644,7 @@ public class ExtendedDialog extends JDialog {
*
* @param helpTopic the help topic
* @param showHelpButton true, if the dialog displays a help button
+ * @return {@code this}
*/
public ExtendedDialog configureContextsensitiveHelp(String helpTopic, boolean showHelpButton) {
this.helpTopic = helpTopic;
diff --git a/src/org/openstreetmap/josm/gui/FileDrop.java b/src/org/openstreetmap/josm/gui/FileDrop.java
index 63d61fc..033ad84 100644
--- a/src/org/openstreetmap/josm/gui/FileDrop.java
+++ b/src/org/openstreetmap/josm/gui/FileDrop.java
@@ -2,24 +2,41 @@
(public domain) with only very small additions */
package org.openstreetmap.josm.gui;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
-import java.io.PrintStream;
import java.io.Reader;
+import java.net.URI;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.TooManyListenersException;
import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.border.Border;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.OpenFileAction;
/**
* This class makes it easy to drag and drop files from the operating
- * system to a Java program. Any <tt>java.awt.Component</tt> can be
- * dropped onto, but only <tt>javax.swing.JComponent</tt>s will indicate
+ * system to a Java program. Any {@link java.awt.Component} can be
+ * dropped onto, but only {@link javax.swing.JComponent}s will indicate
* the drop event with a changed border.
* <p/>
* To use this class, construct a new <tt>FileDrop</tt> by passing
@@ -38,7 +55,7 @@ import org.openstreetmap.josm.actions.OpenFileAction;
* </pre></code>
* <p/>
* You can specify the border that will appear when files are being dragged by
- * calling the constructor with a <tt>javax.swing.border.Border</tt>. Only
+ * calling the constructor with a {@link javax.swing.border.Border}. Only
* <tt>JComponent</tt>s will show any indication with a border.
* <p/>
* You can turn on some debugging features by passing a <tt>PrintStream</tt>
@@ -54,27 +71,31 @@ import org.openstreetmap.josm.actions.OpenFileAction;
* @author Robert Harder
* @author rharder at users.sf.net
* @version 1.0.1
+ * @since 1231
*/
public class FileDrop
{
- private transient javax.swing.border.Border normalBorder;
- private transient java.awt.dnd.DropTargetListener dropListener;
+ private transient Border normalBorder;
+ private transient DropTargetListener dropListener;
/** Discover if the running JVM is modern enough to have drag and drop. */
private static Boolean supportsDnD;
// Default border color
- private static java.awt.Color defaultBorderColor = new java.awt.Color( 0f, 0f, 1f, 0.25f );
+ private static Color defaultBorderColor = new Color( 0f, 0f, 1f, 0.25f );
- /* Constructor for JOSM file drop */
- public FileDrop(final java.awt.Component c){
+ /**
+ * Constructor for JOSM file drop
+ * @param c The drop target
+ */
+ public FileDrop(final Component c){
this(
- null, // Logging stream
c, // Drop target
BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
true, // Recursive
new FileDrop.Listener(){
- public void filesDropped( java.io.File[] files ){
+ @Override
+ public void filesDropped( File[] files ){
// start asynchronous loading of files
OpenFileAction.OpenFileTask task = new OpenFileAction.OpenFileTask(Arrays.asList(files), null);
task.setRecordHistory(true);
@@ -85,240 +106,76 @@ public class FileDrop
}
/**
- * Constructs a {@link FileDrop} with a default light-blue border
- * and, if <var>c</var> is a {@link java.awt.Container}, recursively
- * sets all elements contained within as drop targets, though only
- * the top level container will change borders.
- *
- * @param c Component on which files will be dropped.
- * @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
- */
- public FileDrop(
- final java.awt.Component c,
- final Listener listener )
- { this( null, // Logging stream
- c, // Drop target
- javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
- true, // Recursive
- listener );
- } // end constructor
-
- /**
- * Constructor with a default border and the option to recursively set drop targets.
- * If your component is a <tt>java.awt.Container</tt>, then each of its children
- * components will also listen for drops, though only the parent will change borders.
- *
- * @param c Component on which files will be dropped.
- * @param recursive Recursively set children as drop targets.
- * @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
- */
- public FileDrop(
- final java.awt.Component c,
- final boolean recursive,
- final Listener listener )
- { this( null, // Logging stream
- c, // Drop target
- javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
- recursive, // Recursive
- listener );
- } // end constructor
-
- /**
- * Constructor with a default border and debugging optionally turned on.
- * With Debugging turned on, more status messages will be displayed to
- * <tt>out</tt>. A common way to use this constructor is with
- * <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
- * the parameter <tt>out</tt> will result in no debugging output.
- *
- * @param out PrintStream to record debugging info or null for no debugging.
- * @param c Component on which files will be dropped.
- * @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
- */
- public FileDrop(
- final java.io.PrintStream out,
- final java.awt.Component c,
- final Listener listener )
- { this( out, // Logging stream
- c, // Drop target
- javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ),
- false, // Recursive
- listener );
- } // end constructor
-
- /**
- * Constructor with a default border, debugging optionally turned on
- * and the option to recursively set drop targets.
- * If your component is a <tt>java.awt.Container</tt>, then each of its children
- * components will also listen for drops, though only the parent will change borders.
- * With Debugging turned on, more status messages will be displayed to
- * <tt>out</tt>. A common way to use this constructor is with
- * <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
- * the parameter <tt>out</tt> will result in no debugging output.
- *
- * @param out PrintStream to record debugging info or null for no debugging.
- * @param c Component on which files will be dropped.
- * @param recursive Recursively set children as drop targets.
- * @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
- */
- public FileDrop(
- final java.io.PrintStream out,
- final java.awt.Component c,
- final boolean recursive,
- final Listener listener)
- { this( out, // Logging stream
- c, // Drop target
- javax.swing.BorderFactory.createMatteBorder( 2, 2, 2, 2, defaultBorderColor ), // Drag border
- recursive, // Recursive
- listener );
- } // end constructor
-
- /**
- * Constructor with a specified border
- *
- * @param c Component on which files will be dropped.
- * @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
- * @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
- */
- public FileDrop(
- final java.awt.Component c,
- final javax.swing.border.Border dragBorder,
- final Listener listener)
- { this(
- null, // Logging stream
- c, // Drop target
- dragBorder, // Drag border
- false, // Recursive
- listener );
- } // end constructor
-
- /**
- * Constructor with a specified border and the option to recursively set drop targets.
- * If your component is a <tt>java.awt.Container</tt>, then each of its children
- * components will also listen for drops, though only the parent will change borders.
- *
- * @param c Component on which files will be dropped.
- * @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
- * @param recursive Recursively set children as drop targets.
- * @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
- */
- public FileDrop(
- final java.awt.Component c,
- final javax.swing.border.Border dragBorder,
- final boolean recursive,
- final Listener listener)
- { this(
- null,
- c,
- dragBorder,
- recursive,
- listener );
- } // end constructor
-
- /**
- * Constructor with a specified border and debugging optionally turned on.
- * With Debugging turned on, more status messages will be displayed to
- * <tt>out</tt>. A common way to use this constructor is with
- * <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
- * the parameter <tt>out</tt> will result in no debugging output.
- *
- * @param out PrintStream to record debugging info or null for no debugging.
- * @param c Component on which files will be dropped.
- * @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
- * @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
- */
- public FileDrop(
- final java.io.PrintStream out,
- final java.awt.Component c,
- final javax.swing.border.Border dragBorder,
- final Listener listener)
- { this(
- out, // Logging stream
- c, // Drop target
- dragBorder, // Drag border
- false, // Recursive
- listener );
- } // end constructor
-
- /**
* Full constructor with a specified border and debugging optionally turned on.
* With Debugging turned on, more status messages will be displayed to
* <tt>out</tt>. A common way to use this constructor is with
* <tt>System.out</tt> or <tt>System.err</tt>. A <tt>null</tt> value for
* the parameter <tt>out</tt> will result in no debugging output.
*
- * @param out PrintStream to record debugging info or null for no debugging.
* @param c Component on which files will be dropped.
* @param dragBorder Border to use on <tt>JComponent</tt> when dragging occurs.
* @param recursive Recursively set children as drop targets.
* @param listener Listens for <tt>filesDropped</tt>.
- * @since 1.0
*/
public FileDrop(
- final java.io.PrintStream out,
- final java.awt.Component c,
- final javax.swing.border.Border dragBorder,
+ final Component c,
+ final Border dragBorder,
final boolean recursive,
final Listener listener)
{
if( supportsDnD() )
{ // Make a drop listener
- dropListener = new java.awt.dnd.DropTargetListener()
- { public void dragEnter( java.awt.dnd.DropTargetDragEvent evt )
- { log( out, "FileDrop: dragEnter event." );
+ dropListener = new DropTargetListener()
+ { @Override
+ public void dragEnter( DropTargetDragEvent evt )
+ { Main.debug("FileDrop: dragEnter event." );
// Is this an acceptable drag event?
- if( isDragOk( out, evt ) )
+ if( isDragOk( evt ) )
{
// If it's a Swing component, set its border
- if( c instanceof javax.swing.JComponent )
- { javax.swing.JComponent jc = (javax.swing.JComponent) c;
+ if( c instanceof JComponent )
+ { JComponent jc = (JComponent) c;
normalBorder = jc.getBorder();
- log( out, "FileDrop: normal border saved." );
+ Main.debug("FileDrop: normal border saved." );
jc.setBorder( dragBorder );
- log( out, "FileDrop: drag border set." );
+ Main.debug("FileDrop: drag border set." );
} // end if: JComponent
// Acknowledge that it's okay to enter
- //evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY_OR_MOVE );
- evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY );
- log( out, "FileDrop: event accepted." );
+ evt.acceptDrag( DnDConstants.ACTION_COPY );
+ Main.debug("FileDrop: event accepted." );
} // end if: drag ok
else
{ // Reject the drag event
evt.rejectDrag();
- log( out, "FileDrop: event rejected." );
+ Main.debug("FileDrop: event rejected." );
} // end else: drag not ok
} // end dragEnter
- public void dragOver( java.awt.dnd.DropTargetDragEvent evt )
+ @Override
+ public void dragOver( DropTargetDragEvent evt )
{ // This is called continually as long as the mouse is
// over the drag target.
} // end dragOver
- public void drop( java.awt.dnd.DropTargetDropEvent evt )
- { log( out, "FileDrop: drop event." );
+ @Override
+ public void drop( DropTargetDropEvent evt )
+ { Main.debug("FileDrop: drop event." );
try
{ // Get whatever was dropped
- java.awt.datatransfer.Transferable tr = evt.getTransferable();
+ Transferable tr = evt.getTransferable();
// Is it a file list?
- if (tr.isDataFlavorSupported (java.awt.datatransfer.DataFlavor.javaFileListFlavor))
+ if (tr.isDataFlavorSupported (DataFlavor.javaFileListFlavor))
{
// Say we'll take it.
- //evt.acceptDrop ( java.awt.dnd.DnDConstants.ACTION_COPY_OR_MOVE );
- evt.acceptDrop ( java.awt.dnd.DnDConstants.ACTION_COPY );
- log( out, "FileDrop: file list accepted." );
+ evt.acceptDrop ( DnDConstants.ACTION_COPY );
+ Main.debug("FileDrop: file list accepted." );
// Get a useful list
- List<?> fileList = (List<?>)tr.getTransferData(java.awt.datatransfer.DataFlavor.javaFileListFlavor);
+ List<?> fileList = (List<?>)tr.getTransferData(DataFlavor.javaFileListFlavor);
// Convert list to array
final File[] files = fileList.toArray(new File[fileList.size()]);
@@ -330,7 +187,7 @@ public class FileDrop
// Mark that drop is completed.
evt.getDropTargetContext().dropComplete(true);
- log( out, "FileDrop: drop complete." );
+ Main.debug("FileDrop: drop complete." );
} // end if: file list
else // this section will check for a reader flavor.
{
@@ -338,86 +195,87 @@ public class FileDrop
// BEGIN 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
DataFlavor[] flavors = tr.getTransferDataFlavors();
boolean handled = false;
- for (int zz = 0; zz < flavors.length; zz++) {
- if (flavors[zz].isRepresentationClassReader()) {
+ for (DataFlavor flavor : flavors) {
+ if (flavor.isRepresentationClassReader()) {
// Say we'll take it.
- //evt.acceptDrop ( java.awt.dnd.DnDConstants.ACTION_COPY_OR_MOVE );
- evt.acceptDrop(java.awt.dnd.DnDConstants.ACTION_COPY);
- log(out, "FileDrop: reader accepted.");
+ evt.acceptDrop(DnDConstants.ACTION_COPY);
+ Main.debug("FileDrop: reader accepted.");
- Reader reader = flavors[zz].getReaderForText(tr);
+ Reader reader = flavor.getReaderForText(tr);
BufferedReader br = new BufferedReader(reader);
- if(listener != null) {
- listener.filesDropped(createFileArray(br, out));
+ if (listener != null) {
+ listener.filesDropped(createFileArray(br));
}
// Mark that drop is completed.
evt.getDropTargetContext().dropComplete(true);
- log(out, "FileDrop: drop complete.");
+ Main.debug("FileDrop: drop complete.");
handled = true;
break;
}
}
if(!handled){
- log( out, "FileDrop: not a file list or reader - abort." );
+ Main.debug("FileDrop: not a file list or reader - abort." );
evt.rejectDrop();
}
// END 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
} // end else: not a file list
} // end try
- catch ( java.io.IOException io)
- { log( out, "FileDrop: IOException - abort:" );
- io.printStackTrace( out );
+ catch ( IOException io)
+ { Main.warn("FileDrop: IOException - abort:" );
+ io.printStackTrace();
evt.rejectDrop();
} // end catch IOException
- catch (java.awt.datatransfer.UnsupportedFlavorException ufe)
- { log( out, "FileDrop: UnsupportedFlavorException - abort:" );
- ufe.printStackTrace( out );
+ catch (UnsupportedFlavorException ufe)
+ { Main.warn("FileDrop: UnsupportedFlavorException - abort:" );
+ ufe.printStackTrace();
evt.rejectDrop();
} // end catch: UnsupportedFlavorException
finally
{
// If it's a Swing component, reset its border
- if( c instanceof javax.swing.JComponent )
- { javax.swing.JComponent jc = (javax.swing.JComponent) c;
+ if( c instanceof JComponent )
+ { JComponent jc = (JComponent) c;
jc.setBorder( normalBorder );
- log( out, "FileDrop: normal border restored." );
+ Main.debug("FileDrop: normal border restored." );
} // end if: JComponent
} // end finally
} // end drop
- public void dragExit( java.awt.dnd.DropTargetEvent evt )
- { log( out, "FileDrop: dragExit event." );
+ @Override
+ public void dragExit( DropTargetEvent evt )
+ { Main.debug("FileDrop: dragExit event." );
// If it's a Swing component, reset its border
- if( c instanceof javax.swing.JComponent )
- { javax.swing.JComponent jc = (javax.swing.JComponent) c;
+ if( c instanceof JComponent )
+ { JComponent jc = (JComponent) c;
jc.setBorder( normalBorder );
- log( out, "FileDrop: normal border restored." );
+ Main.debug("FileDrop: normal border restored." );
} // end if: JComponent
} // end dragExit
- public void dropActionChanged( java.awt.dnd.DropTargetDragEvent evt )
- { log( out, "FileDrop: dropActionChanged event." );
+ @Override
+ public void dropActionChanged( DropTargetDragEvent evt )
+ { Main.debug("FileDrop: dropActionChanged event." );
// Is this an acceptable drag event?
- if( isDragOk( out, evt ) )
- { //evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY_OR_MOVE );
- evt.acceptDrag( java.awt.dnd.DnDConstants.ACTION_COPY );
- log( out, "FileDrop: event accepted." );
+ if( isDragOk( evt ) )
+ {
+ evt.acceptDrag( DnDConstants.ACTION_COPY );
+ Main.debug("FileDrop: event accepted." );
} // end if: drag ok
else
{ evt.rejectDrag();
- log( out, "FileDrop: event rejected." );
+ Main.debug("FileDrop: event rejected." );
} // end else: drag not ok
} // end dropActionChanged
}; // end DropTargetListener
// Make the component (and possibly children) drop targets
- makeDropTarget( out, c, recursive );
+ makeDropTarget( c, recursive );
} // end if: supports dnd
else
- { log( out, "FileDrop: Drag and drop is not supported with this JVM" );
+ { Main.info("FileDrop: Drag and drop is not supported with this JVM" );
} // end else: does not support DnD
} // end constructor
@@ -439,85 +297,86 @@ public class FileDrop
// BEGIN 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
private static String ZERO_CHAR_STRING = "" + (char)0;
- private static File[] createFileArray(BufferedReader bReader, PrintStream out)
+ private static File[] createFileArray(BufferedReader bReader)
{
try {
- java.util.List<File> list = new java.util.ArrayList<File>();
- java.lang.String line = null;
+ List<File> list = new ArrayList<File>();
+ String line = null;
while ((line = bReader.readLine()) != null) {
try {
// kde seems to append a 0 char to the end of the reader
- if(ZERO_CHAR_STRING.equals(line)) {
+ if (ZERO_CHAR_STRING.equals(line)) {
continue;
}
- java.io.File file = new java.io.File(new java.net.URI(line));
+ File file = new File(new URI(line));
list.add(file);
} catch (Exception ex) {
- log(out, "Error with " + line + ": " + ex.getMessage());
+ Main.warn("Error with " + line + ": " + ex.getMessage());
}
}
return list.toArray(new File[list.size()]);
} catch (IOException ex) {
- log(out, "FileDrop: IOException");
+ Main.warn("FileDrop: IOException");
}
return new File[0];
}
// END 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
- private void makeDropTarget( final java.io.PrintStream out, final java.awt.Component c, boolean recursive )
+ private void makeDropTarget( final Component c, boolean recursive )
{
// Make drop target
- final java.awt.dnd.DropTarget dt = new java.awt.dnd.DropTarget();
+ final DropTarget dt = new DropTarget();
try
{ dt.addDropTargetListener( dropListener );
} // end try
- catch( java.util.TooManyListenersException e )
+ catch( TooManyListenersException e )
{ e.printStackTrace();
- log(out, "FileDrop: Drop will not work due to previous error. Do you have another listener attached?" );
+ Main.warn("FileDrop: Drop will not work due to previous error. Do you have another listener attached?" );
} // end catch
// Listen for hierarchy changes and remove the drop target when the parent gets cleared out.
- c.addHierarchyListener( new java.awt.event.HierarchyListener()
- { public void hierarchyChanged( java.awt.event.HierarchyEvent evt )
- { log( out, "FileDrop: Hierarchy changed." );
- java.awt.Component parent = c.getParent();
+ c.addHierarchyListener( new HierarchyListener()
+ { @Override
+ public void hierarchyChanged( HierarchyEvent evt )
+ { Main.debug("FileDrop: Hierarchy changed." );
+ Component parent = c.getParent();
if( parent == null )
{ c.setDropTarget( null );
- log( out, "FileDrop: Drop target cleared from component." );
+ Main.debug("FileDrop: Drop target cleared from component." );
} // end if: null parent
else
- { new java.awt.dnd.DropTarget(c, dropListener);
- log( out, "FileDrop: Drop target added to component." );
+ { new DropTarget(c, dropListener);
+ Main.debug("FileDrop: Drop target added to component." );
} // end else: parent not null
} // end hierarchyChanged
}); // end hierarchy listener
if( c.getParent() != null ) {
- new java.awt.dnd.DropTarget(c, dropListener);
+ new DropTarget(c, dropListener);
}
- if( recursive && (c instanceof java.awt.Container ) )
+ if( recursive && (c instanceof Container ) )
{
// Get the container
- java.awt.Container cont = (java.awt.Container) c;
+ Container cont = (Container) c;
// Get it's components
- java.awt.Component[] comps = cont.getComponents();
+ Component[] comps = cont.getComponents();
// Set it's components as listeners also
- for( int i = 0; i < comps.length; i++ ) {
- makeDropTarget( out, comps[i], recursive );
+ for (Component comp : comps) {
+ makeDropTarget( comp, recursive);
}
} // end if: recursively set components as listener
} // end dropListener
/** Determine if the dragged data is a file list. */
- private boolean isDragOk( final java.io.PrintStream out, final java.awt.dnd.DropTargetDragEvent evt )
+ private boolean isDragOk( final DropTargetDragEvent evt )
{ boolean ok = false;
// Get data flavors being dragged
- java.awt.datatransfer.DataFlavor[] flavors = evt.getCurrentDataFlavors();
+ DataFlavor[] flavors = evt.getCurrentDataFlavors();
// See if any of the flavors are a file list
int i = 0;
@@ -526,7 +385,7 @@ public class FileDrop
// BEGIN 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
// Is the flavor a file list?
final DataFlavor curFlavor = flavors[i];
- if( curFlavor.equals( java.awt.datatransfer.DataFlavor.javaFileListFlavor ) ||
+ if( curFlavor.equals( DataFlavor.javaFileListFlavor ) ||
curFlavor.isRepresentationClassReader()){
ok = true;
}
@@ -534,27 +393,17 @@ public class FileDrop
i++;
} // end while: through flavors
- // If logging is enabled, show data flavors
- if( out != null )
- { if( flavors.length == 0 ) {
- log( out, "FileDrop: no data flavors." );
+ // show data flavors
+ if( flavors.length == 0 ) {
+ Main.debug("FileDrop: no data flavors." );
}
for( i = 0; i < flavors.length; i++ ) {
- log( out, flavors[i].toString() );
+ Main.debug(flavors[i].toString() );
}
- } // end if: logging enabled
return ok;
} // end isDragOk
- /** Outputs <tt>message</tt> to <tt>out</tt> if it's not null. */
- private static void log( java.io.PrintStream out, String message )
- { // Log message if requested
- if( out != null ) {
- out.println( message );
- }
- } // end log
-
/**
* Removes the drag-and-drop hooks from the component and optionally
* from the all children. You should call this if you add and remove
@@ -563,10 +412,10 @@ public class FileDrop
* <var>c</var> if <var>c</var> is a {@link java.awt.Container}.
*
* @param c The component to unregister as a drop target
- * @since 1.0
+ * @return {@code true} if at least one item has been removed, {@code false} otherwise
*/
- public static boolean remove( java.awt.Component c)
- { return remove( null, c, true );
+ public static boolean remove( Component c)
+ { return remove( c, true );
} // end remove
/**
@@ -574,24 +423,22 @@ public class FileDrop
* from the all children. You should call this if you add and remove
* components after you've set up the drag-and-drop.
*
- * @param out Optional {@link java.io.PrintStream} for logging drag and drop messages
* @param c The component to unregister
* @param recursive Recursively unregister components within a container
- * @since 1.0
+ * @return {@code true} if at least one item has been removed, {@code false} otherwise
*/
- public static boolean remove( java.io.PrintStream out, java.awt.Component c, boolean recursive )
+ public static boolean remove( Component c, boolean recursive )
{ // Make sure we support dnd.
- if( supportsDnD() )
- { log( out, "FileDrop: Removing drag-and-drop hooks." );
- c.setDropTarget( null );
- if( recursive && ( c instanceof java.awt.Container ) )
- { java.awt.Component[] comps = ((java.awt.Container)c).getComponents();
- for( int i = 0; i < comps.length; i++ ) {
- remove( out, comps[i], recursive );
- }
- return true;
- } // end if: recursive
- else return false;
+ if (supportsDnD()) {
+ Main.debug("FileDrop: Removing drag-and-drop hooks.");
+ c.setDropTarget(null);
+ if (recursive && (c instanceof Container)) {
+ for (Component comp : ((Container) c).getComponents()) {
+ remove(comp, recursive);
+ }
+ return true;
+ } // end if: recursive
+ else return false;
} // end if: supports DnD
else return false;
} // end remove
@@ -610,8 +457,6 @@ public class FileDrop
* } // end filesDropped
* ...
* </pre></code>
- *
- * @since 1.1
*/
public static interface Listener {
@@ -619,60 +464,14 @@ public class FileDrop
* This method is called when files have been successfully dropped.
*
* @param files An array of <tt>File</tt>s that were dropped.
- * @since 1.0
*/
- public abstract void filesDropped( java.io.File[] files );
+ public abstract void filesDropped( File[] files );
} // end inner-interface Listener
/* ******** I N N E R C L A S S ******** */
/**
- * This is the event that is passed to the
- * {@link FileDropListener#filesDropped filesDropped(...)} method in
- * your {@link FileDropListener} when files are dropped onto
- * a registered drop target.
- *
- * <p>I'm releasing this code into the Public Domain. Enjoy.</p>
- *
- * @author Robert Harder
- * @author rob at iharder.net
- * @version 1.2
- */
- public static class Event extends java.util.EventObject {
-
- private java.io.File[] files;
-
- /**
- * Constructs an {@link Event} with the array
- * of files that were dropped and the
- * {@link FileDrop} that initiated the event.
- *
- * @param files The array of files that were dropped
- * @source The event source
- * @since 1.1
- */
- public Event( java.io.File[] files, Object source ) {
- super( source );
- this.files = files;
- } // end constructor
-
- /**
- * Returns an array of files that were dropped on a
- * registered drop target.
- *
- * @return array of files that were dropped
- * @since 1.1
- */
- public java.io.File[] getFiles() {
- return files;
- } // end getFiles
-
- } // end inner class Event
-
- /* ******** I N N E R C L A S S ******** */
-
- /**
* At last an easy way to encapsulate your custom objects for dragging and dropping
* in your Java programs!
* When you need to create a {@link java.awt.datatransfer.Transferable} object,
@@ -714,13 +513,11 @@ public class FileDrop
* @author rob at iharder.net
* @version 1.2
*/
- public static class TransferableObject implements java.awt.datatransfer.Transferable
+ public static class TransferableObject implements Transferable
{
/**
* The MIME type for {@link #DATA_FLAVOR} is
* <tt>application/x-net.iharder.dnd.TransferableObject</tt>.
- *
- * @since 1.1
*/
public final static String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject";
@@ -730,16 +527,14 @@ public class FileDrop
* <tt>net.iharder.dnd.TransferableObject.class</tt>
* and the MIME type
* <tt>application/x-net.iharder.dnd.TransferableObject</tt>.
- *
- * @since 1.1
*/
- public final static java.awt.datatransfer.DataFlavor DATA_FLAVOR =
- new java.awt.datatransfer.DataFlavor( FileDrop.TransferableObject.class, MIME_TYPE );
+ public final static DataFlavor DATA_FLAVOR =
+ new DataFlavor( FileDrop.TransferableObject.class, MIME_TYPE );
private Fetcher fetcher;
private Object data;
- private java.awt.datatransfer.DataFlavor customFlavor;
+ private DataFlavor customFlavor;
/**
* Creates a new {@link TransferableObject} that wraps <var>data</var>.
@@ -749,11 +544,10 @@ public class FileDrop
* <tt>application/x-net.iharder.dnd.TransferableObject</tt>.
*
* @param data The data to transfer
- * @since 1.1
*/
public TransferableObject( Object data )
{ this.data = data;
- this.customFlavor = new java.awt.datatransfer.DataFlavor( data.getClass(), MIME_TYPE );
+ this.customFlavor = new DataFlavor( data.getClass(), MIME_TYPE );
} // end constructor
/**
@@ -764,7 +558,6 @@ public class FileDrop
*
* @see Fetcher
* @param fetcher The {@link Fetcher} that will return the data object
- * @since 1.1
*/
public TransferableObject( Fetcher fetcher )
{ this.fetcher = fetcher;
@@ -781,11 +574,10 @@ public class FileDrop
* @see Fetcher
* @param dataClass The {@link java.lang.Class} to use in the custom data flavor
* @param fetcher The {@link Fetcher} that will return the data object
- * @since 1.1
*/
public TransferableObject(Class<?> dataClass, Fetcher fetcher )
{ this.fetcher = fetcher;
- this.customFlavor = new java.awt.datatransfer.DataFlavor( dataClass, MIME_TYPE );
+ this.customFlavor = new DataFlavor( dataClass, MIME_TYPE );
} // end constructor
/**
@@ -794,9 +586,8 @@ public class FileDrop
* constructor was used without passing a {@link java.lang.Class}.
*
* @return The custom data flavor for the encapsulated object
- * @since 1.1
*/
- public java.awt.datatransfer.DataFlavor getCustomDataFlavor()
+ public DataFlavor getCustomDataFlavor()
{ return customFlavor;
} // end getCustomDataFlavor
@@ -807,23 +598,23 @@ public class FileDrop
* the custom data flavor, if one was created in the constructors,
* second the default {@link #DATA_FLAVOR} associated with
* {@link TransferableObject}, and third the
- * {@link java.awt.datatransfer.DataFlavor.stringFlavor}.
+ * {@link java.awt.datatransfer.DataFlavor#stringFlavor}.
*
* @return An array of supported data flavors
- * @since 1.1
*/
- public java.awt.datatransfer.DataFlavor[] getTransferDataFlavors()
+ @Override
+ public DataFlavor[] getTransferDataFlavors()
{
if( customFlavor != null )
- return new java.awt.datatransfer.DataFlavor[]
+ return new DataFlavor[]
{ customFlavor,
DATA_FLAVOR,
- java.awt.datatransfer.DataFlavor.stringFlavor
+ DataFlavor.stringFlavor
}; // end flavors array
else
- return new java.awt.datatransfer.DataFlavor[]
+ return new DataFlavor[]
{ DATA_FLAVOR,
- java.awt.datatransfer.DataFlavor.stringFlavor
+ DataFlavor.stringFlavor
}; // end flavors array
} // end getTransferDataFlavors
@@ -836,21 +627,21 @@ public class FileDrop
*
* @param flavor The data flavor for the data to return
* @return The dropped data
- * @since 1.1
*/
- public Object getTransferData( java.awt.datatransfer.DataFlavor flavor )
- throws java.awt.datatransfer.UnsupportedFlavorException, java.io.IOException
+ @Override
+ public Object getTransferData( DataFlavor flavor )
+ throws UnsupportedFlavorException, IOException
{
// Native object
if( flavor.equals( DATA_FLAVOR ) )
return fetcher == null ? data : fetcher.getObject();
// String
- if( flavor.equals( java.awt.datatransfer.DataFlavor.stringFlavor ) )
+ if( flavor.equals( DataFlavor.stringFlavor ) )
return fetcher == null ? data.toString() : fetcher.getObject().toString();
// We can't do anything else
- throw new java.awt.datatransfer.UnsupportedFlavorException(flavor);
+ throw new UnsupportedFlavorException(flavor);
} // end getTransferData
/**
@@ -859,16 +650,16 @@ public class FileDrop
*
* @param flavor The data flavor to check
* @return Whether or not the flavor is supported
- * @since 1.1
*/
- public boolean isDataFlavorSupported( java.awt.datatransfer.DataFlavor flavor )
+ @Override
+ public boolean isDataFlavorSupported( DataFlavor flavor )
{
// Native object
if( flavor.equals( DATA_FLAVOR ) )
return true;
// String
- if( flavor.equals( java.awt.datatransfer.DataFlavor.stringFlavor ) )
+ if( flavor.equals( DataFlavor.stringFlavor ) )
return true;
// We can't do anything else
@@ -886,9 +677,6 @@ public class FileDrop
* {@link #getObject getObject()} method will be called.
*
* @author Robert Harder
- * @copyright 2001
- * @version 1.1
- * @since 1.1
*/
public static interface Fetcher
{
@@ -897,7 +685,6 @@ public class FileDrop
* {@link TransferableObject}.
*
* @return The dropped object
- * @since 1.1
*/
public abstract Object getObject();
} // end inner interface Fetcher
diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java
index fa44962..2fedd72 100644
--- a/src/org/openstreetmap/josm/gui/GettingStarted.java
+++ b/src/org/openstreetmap/josm/gui/GettingStarted.java
@@ -15,7 +15,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.JComponent;
-import javax.swing.JEditorPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.KeyStroke;
@@ -25,12 +24,13 @@ import javax.swing.event.HyperlinkListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
import org.openstreetmap.josm.io.CacheCustomContent;
import org.openstreetmap.josm.tools.LanguageInfo;
import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.WikiReader;
-public class GettingStarted extends JPanel {
+public final class GettingStarted extends JPanel {
private String content = "";
private static final String STYLE = "<style type=\"text/css\">\n"
+ "body {font-family: sans-serif; font-weight: bold; }\n"
@@ -38,7 +38,12 @@ public class GettingStarted extends JPanel {
+ ".icon {font-size: 0; }\n"
+ "</style>\n";
- public static class LinkGeneral extends JEditorPane implements HyperlinkListener {
+ public static class LinkGeneral extends JosmEditorPane implements HyperlinkListener {
+
+ /**
+ * Constructs a new {@code LinkGeneral} with the given HTML text
+ * @param text The text to display
+ */
public LinkGeneral(String text) {
setContentType("text/html");
setText(text);
@@ -47,6 +52,7 @@ public class GettingStarted extends JPanel {
addHyperlinkListener(this);
}
+ @Override
public void hyperlinkUpdate(HyperlinkEvent e) {
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
OpenBrowser.displayUrl(e.getDescription());
@@ -63,6 +69,7 @@ public class GettingStarted extends JPanel {
}
final private int myVersion = Version.getInstance().getVersion();
+ final private String myJava = System.getProperty("java.version");
final private String myLang = LanguageInfo.getWikiLanguagePrefix();
/**
@@ -74,6 +81,7 @@ public class GettingStarted extends JPanel {
String motd = new WikiReader().readLang("StartupPage");
// Save this to prefs in case JOSM is updated so MOTD can be refreshed
Main.pref.putInteger("cache.motd.html.version", myVersion);
+ Main.pref.put("cache.motd.html.java", myJava);
Main.pref.put("cache.motd.html.lang", myLang);
try {
return motd.getBytes("utf-8");
@@ -93,6 +101,7 @@ public class GettingStarted extends JPanel {
// 2. Cannot be written (e.g. while developing). Obviously we don't want to update
// everytime because of something we can't read.
return (Main.pref.getInteger("cache.motd.html.version", -999) == myVersion)
+ && Main.pref.get("cache.motd.html.java").equals(myJava)
&& Main.pref.get("cache.motd.html.lang").equals(myLang);
}
}
@@ -120,7 +129,7 @@ public class GettingStarted extends JPanel {
try {
content = new MotdContent().updateIfRequiredString();
} catch (IOException ex) {
- System.out.println(tr("Warning: failed to read MOTD. Exception was: {0}", ex.toString()));
+ Main.warn(tr("Failed to read MOTD. Exception was: {0}", ex.toString()));
content = "<html>" + STYLE + "<h1>" + "JOSM - " + tr("Java OpenStreetMap Editor")
+ "</h1>\n<h2 align=\"center\">(" + tr("Message of the day not available") + ")</h2></html>";
}
@@ -130,7 +139,6 @@ public class GettingStarted extends JPanel {
@Override
public void run() {
lg.setText(fixImageLinks(content));
- // lg.moveCaretPosition(0);
}
});
}
@@ -142,7 +150,7 @@ public class GettingStarted extends JPanel {
}
private String fixImageLinks(String s) {
- Matcher m = Pattern.compile("src=\"http://josm.openstreetmap.de/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
+ Matcher m = Pattern.compile("src=\""+Main.JOSM_WEBSITE+"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
StringBuffer sb = new StringBuffer();
while (m.find()) {
String im = m.group(1);
diff --git a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
index 31d5434..6189af5 100644
--- a/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
+++ b/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
@@ -10,36 +10,98 @@ import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import org.openstreetmap.josm.gui.help.HelpBrowser;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.WindowGeometry;
-public class HelpAwareOptionPane {
+public final class HelpAwareOptionPane {
+ private HelpAwareOptionPane() {
+ // Hide default constructor for utils classes
+ }
+
public static class ButtonSpec {
- public String text;
- public Icon icon;
- public String tooltipText;
- public String helpTopic;
+ public final String text;
+ public final Icon icon;
+ public final String tooltipText;
+ public final String helpTopic;
+ private boolean enabled;
+
+ private final Collection<ChangeListener> listeners = new HashSet<ChangeListener>();
/**
- *
- * @param text the button text
- * @param icon the icon to display. Can be null
- * @param tooltipText the tooltip text. Can be null.
+ * Constructs a new {@code ButtonSpec}.
+ * @param text the button text
+ * @param icon the icon to display. Can be null
+ * @param tooltipText the tooltip text. Can be null.
* @param helpTopic the help topic. Can be null.
*/
public ButtonSpec(String text, Icon icon, String tooltipText, String helpTopic) {
+ this(text, icon, tooltipText, helpTopic, true);
+ }
+
+ /**
+ * Constructs a new {@code ButtonSpec}.
+ * @param text the button text
+ * @param icon the icon to display. Can be null
+ * @param tooltipText the tooltip text. Can be null.
+ * @param helpTopic the help topic. Can be null.
+ * @param enabled the enabled status
+ * @since 5951
+ */
+ public ButtonSpec(String text, Icon icon, String tooltipText, String helpTopic, boolean enabled) {
this.text = text;
this.icon = icon;
this.tooltipText = tooltipText;
this.helpTopic = helpTopic;
+ setEnabled(enabled);
+ }
+
+ /**
+ * Determines if this button spec is enabled
+ * @return {@code true} if this button spec is enabled, {@code false} otherwise
+ * @since 6051
+ */
+ public final boolean isEnabled() {
+ return enabled;
+ }
+
+ /**
+ * Enables or disables this button spec, depending on the value of the parameter {@code b}.
+ * @param enabled if {@code true}, this button spec is enabled; otherwise this button spec is disabled
+ * @since 6051
+ */
+ public final void setEnabled(boolean enabled) {
+ if (this.enabled != enabled) {
+ this.enabled = enabled;
+ ChangeEvent event = new ChangeEvent(this);
+ for (ChangeListener listener : listeners) {
+ listener.stateChanged(event);
+ }
+ }
+ }
+
+ private final boolean addChangeListener(ChangeListener listener) {
+ return listener != null ? listeners.add(listener) : false;
}
}
@@ -54,6 +116,7 @@ public class HelpAwareOptionPane {
this.value = value;
}
+ @Override
public void actionPerformed(ActionEvent e) {
pane.setValue(value);
dialog.setVisible(false);
@@ -77,14 +140,20 @@ public class HelpAwareOptionPane {
b.setFocusable(true);
buttons.add(b);
} else {
- for (ButtonSpec spec: options) {
- JButton b = new JButton(spec.text);
+ for (final ButtonSpec spec: options) {
+ final JButton b = new JButton(spec.text);
b.setIcon(spec.icon);
b.setToolTipText(spec.tooltipText == null? "" : spec.tooltipText);
if (helpTopic != null) {
HelpUtil.setHelpContext(b, helpTopic);
}
b.setFocusable(true);
+ b.setEnabled(spec.isEnabled());
+ spec.addChangeListener(new ChangeListener() {
+ @Override public void stateChanged(ChangeEvent e) {
+ b.setEnabled(spec.isEnabled());
+ }
+ });
buttons.add(b);
}
}
@@ -103,6 +172,7 @@ public class HelpAwareOptionPane {
b.setToolTipText(tr("Show help information"));
HelpUtil.setHelpContext(b, helpTopic);
Action a = new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
HelpBrowser.setUrlForHelpTopic(helpTopic);
}
@@ -157,9 +227,7 @@ public class HelpAwareOptionPane {
}
if (msg instanceof String) {
- JEditorPane pane = new JEditorPane();
- pane.setContentType("text/html");
- pane.setText((String) msg);
+ JosmEditorPane pane = new JosmEditorPane("text/html", (String) msg);
pane.setEditable(false);
pane.setOpaque(false);
msg = pane;
@@ -208,6 +276,7 @@ public class HelpAwareOptionPane {
});
dialog.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "close");
dialog.getRootPane().getActionMap().put("close", new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
pane.setValue(JOptionPane.CLOSED_OPTION);
dialog.setVisible(false);
@@ -238,13 +307,14 @@ public class HelpAwareOptionPane {
}
/**
+ * Displays an option dialog which is aware of a help context.
*
- * @param parentComponent
- * @param msg
- * @param title
- * @param messageType
- * @param helpTopic
- * @return
+ * @param parentComponent the parent component
+ * @param msg the message
+ * @param title the title
+ * @param messageType the message type (see {@link JOptionPane})
+ * @param helpTopic the help topic. Can be null.
+ * @return the index of the selected option or {@link JOptionPane#CLOSED_OPTION}
* @see #showOptionDialog(Component, Object, String, int, Icon, ButtonSpec[], ButtonSpec, String)
*/
static public int showOptionDialog(Component parentComponent, Object msg, String title, int messageType,final String helpTopic) {
@@ -259,7 +329,8 @@ public class HelpAwareOptionPane {
* e.g. from PleaseWaitRunnable
*/
static public void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic) {
- SwingUtilities.invokeLater(new Runnable() {
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
showOptionDialog(parentComponent, msg, title, messageType, null, null, null, helpTopic);
}
diff --git a/src/org/openstreetmap/josm/gui/HideableButton.java b/src/org/openstreetmap/josm/gui/HideableButton.java
index cc50ec7..0be5fc5 100644
--- a/src/org/openstreetmap/josm/gui/HideableButton.java
+++ b/src/org/openstreetmap/josm/gui/HideableButton.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import javax.swing.Icon;
diff --git a/src/org/openstreetmap/josm/gui/IconToggleButton.java b/src/org/openstreetmap/josm/gui/IconToggleButton.java
index 28d0eab..16e5268 100644
--- a/src/org/openstreetmap/josm/gui/IconToggleButton.java
+++ b/src/org/openstreetmap/josm/gui/IconToggleButton.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import java.awt.event.MouseAdapter;
@@ -6,7 +6,6 @@ import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.JToggleButton;
@@ -60,6 +59,7 @@ public class IconToggleButton extends JToggleButton implements HideableButton, P
ExpertToggleAction.addExpertModeChangeListener(this);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals("active")) {
setSelected((Boolean)evt.getNewValue());
@@ -69,6 +69,7 @@ public class IconToggleButton extends JToggleButton implements HideableButton, P
}
}
+ @Override
public void destroy() {
Action action = getAction();
if (action instanceof Destroyable) {
diff --git a/src/org/openstreetmap/josm/gui/ImageryMenu.java b/src/org/openstreetmap/josm/gui/ImageryMenu.java
index 80906c1..fbdfd83 100644
--- a/src/org/openstreetmap/josm/gui/ImageryMenu.java
+++ b/src/org/openstreetmap/josm/gui/ImageryMenu.java
@@ -5,8 +5,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trc;
import java.awt.Component;
+import java.awt.MenuComponent;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -24,7 +26,7 @@ import javax.swing.event.MenuListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AddImageryLayerAction;
import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.Map_Rectifier_WMSmenuAction;
+import org.openstreetmap.josm.actions.MapRectifierWMSmenuAction;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
@@ -77,9 +79,9 @@ public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
private JMenuItem singleOffset = new JMenuItem(offsetAction);
private JMenuItem offsetMenuItem = singleOffset;
- private Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
+ private MapRectifierWMSmenuAction rectaction = new MapRectifierWMSmenuAction();
- public ImageryMenu() {
+ public ImageryMenu(JMenu subMenu) {
super(tr("Imagery"));
setupMenuScroller();
MapView.addLayerChangeListener(this);
@@ -98,6 +100,7 @@ public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
public void menuCanceled(MenuEvent e) {
}
});
+ MainMenu.add(subMenu, rectaction);
}
private void setupMenuScroller() {
@@ -113,11 +116,14 @@ public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
* (In order to have actions ready for the toolbar, see #8446.)
*/
public void refreshImageryMenu() {
- removeAll();
+ removeDynamicItems();
+
+ addDynamic(offsetMenuItem);
+ addDynamicSeparator();
// for each configured ImageryInfo, add a menu entry.
for (final ImageryInfo u : ImageryLayerInfo.instance.getLayers()) {
- add(new AddImageryLayerAction(u));
+ addDynamic(new AddImageryLayerAction(u));
}
// list all imagery entries where the current map location
@@ -149,22 +155,30 @@ public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
}
}
if (!inViewLayers.isEmpty()) {
- addSeparator();
+ addDynamicSeparator();
for (ImageryInfo i : inViewLayers) {
- add(new AddImageryLayerAction(i));
+ addDynamic(new AddImageryLayerAction(i));
}
}
}
- addSeparator();
- add(new JMenuItem(rectaction));
-
- addSeparator();
- add(offsetMenuItem);
+ addDynamicSeparator();
+ JMenu subMenu = Main.main.menu.imagerySubMenu;
+ int heightUnrolled = 30*(getItemCount()+subMenu.getItemCount());
+ if (heightUnrolled < Main.panel.getHeight()) {
+ // add all items of submenu if they will fit on screen
+ int n = subMenu.getItemCount();
+ for (int i=0; i<n; i++) {
+ addDynamic(subMenu.getItem(i).getAction());
+ }
+ } else {
+ // or add the submenu itself
+ addDynamic(subMenu);
+ }
}
private JMenuItem getNewOffsetMenu(){
- if (Main.map == null || Main.map.mapView == null) {
+ if (!Main.isDisplayingMapView()) {
offsetAction.setEnabled(false);
return singleOffset;
}
@@ -216,4 +230,44 @@ public class ImageryMenu extends JMenu implements MapView.LayerChangeListener {
refreshOffsetMenu();
}
}
+
+ /**
+ * Collection to store temporary menu items. They will be deleted
+ * (and possibly recreated) when refreshImageryMenu() is called.
+ * @since 5803
+ */
+ private List <Object> dynamicItems = new ArrayList<Object>(20);
+
+ /**
+ * Remove all the items in @field dynamicItems collection
+ * @since 5803
+ */
+ private void removeDynamicItems() {
+ for (Object item : dynamicItems) {
+ if (item instanceof JMenuItem) {
+ remove((JMenuItem)item);
+ }
+ if (item instanceof MenuComponent) {
+ remove((MenuComponent)item);
+ }
+ if (item instanceof Component) {
+ remove((Component)item);
+ }
+ }
+ dynamicItems.clear();
+ }
+
+ private void addDynamicSeparator() {
+ JPopupMenu.Separator s = new JPopupMenu.Separator();
+ dynamicItems.add(s);
+ add(s);
+ }
+
+ private void addDynamic(Action a) {
+ dynamicItems.add( this.add(a) );
+ }
+
+ private void addDynamic(JMenuItem it) {
+ dynamicItems.add( this.add(it) );
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
index 20c6e1d..987e945 100644
--- a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
+++ b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
@@ -13,6 +13,7 @@ import org.openstreetmap.josm.data.Preferences.StringSetting;
import org.openstreetmap.josm.data.osm.UserInfo;
import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmServerUserInfoReader;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.io.auth.CredentialsManager;
@@ -47,7 +48,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
* </ul>
*
*/
-public class JosmUserIdentityManager implements PreferenceChangedListener{
+public final class JosmUserIdentityManager implements PreferenceChangedListener{
static private JosmUserIdentityManager instance;
@@ -59,7 +60,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
static public JosmUserIdentityManager getInstance() {
if (instance == null) {
instance = new JosmUserIdentityManager();
- if (Main.pref.get("osm-server.auth-method").equals("oauth") && OAuthAccessTokenHolder.getInstance().containsAccessToken()) {
+ if (OsmApi.isUsingOAuth() && OAuthAccessTokenHolder.getInstance().containsAccessToken()) {
try {
instance.initFromOAuth(Main.parent);
} catch (Throwable t) {
@@ -101,7 +102,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
*/
public void setPartiallyIdentified(String userName) throws IllegalArgumentException {
CheckParameterUtil.ensureParameterNotNull(userName, "userName");
- if (userName.trim().equals(""))
+ if (userName.trim().isEmpty())
throw new IllegalArgumentException(MessageFormat.format("Expected non-empty value for parameter ''{0}'', got ''{1}''", "userName", userName));
this.userName = userName;
userInfo = null;
@@ -111,7 +112,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
* Remembers the fact that the current JOSM user is fully identified with a
* verified pair of user name and user id.
*
- * @param userName the user name. Must not be null. Must not be empty.
+ * @param username the user name. Must not be null. Must not be empty.
* @param userinfo additional information about the user, retrieved from the OSM server and including the user id
* @throws IllegalArgumentException thrown if userName is null
* @throws IllegalArgumentException thrown if userName is empty
@@ -119,7 +120,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
*/
public void setFullyIdentified(String username, UserInfo userinfo) throws IllegalArgumentException {
CheckParameterUtil.ensureParameterNotNull(username, "username");
- if (username.trim().equals(""))
+ if (username.trim().isEmpty())
throw new IllegalArgumentException(tr("Expected non-empty value for parameter ''{0}'', got ''{1}''", "userName", userName));
CheckParameterUtil.ensureParameterNotNull(userinfo, "userinfo");
this.userName = username;
@@ -129,7 +130,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
/**
* Replies true if the current JOSM user is anonymous.
*
- * @return true if the current user is anonymous.
+ * @return {@code true} if the current user is anonymous.
*/
public boolean isAnonymous() {
return userName == null && userInfo == null;
@@ -182,7 +183,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
public UserInfo getUserInfo() {
return userInfo;
}
-
+
/**
* Initializes the user identity manager from Basic Authentication values in the {@link org.openstreetmap.josm.data.Preferences}
* This method should be called if {@code osm-server.auth-method} is set to {@code basic}.
@@ -191,14 +192,14 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
public void initFromPreferences() {
String userName = CredentialsManager.getInstance().getUsername();
if (isAnonymous()) {
- if (userName != null && ! userName.trim().equals("")) {
+ if (userName != null && !userName.trim().isEmpty()) {
setPartiallyIdentified(userName);
}
} else {
if (userName != null && !userName.equals(this.userName)) {
setPartiallyIdentified(userName);
} else {
- // same name in the preferences as JOSM already knows about;
+ // same name in the preferences as JOSM already knows about.
// keep the state, be it partially or fully identified
}
}
@@ -238,6 +239,7 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
/* ------------------------------------------------------------------- */
/* interface PreferenceChangeListener */
/* ------------------------------------------------------------------- */
+ @Override
public void preferenceChanged(PreferenceChangeEvent evt) {
if (evt.getKey().equals("osm-server.username")) {
if (!(evt.getNewValue() instanceof StringSetting)) return;
@@ -250,27 +252,27 @@ public class JosmUserIdentityManager implements PreferenceChangedListener{
}
}
return;
-
+
} else if (evt.getKey().equals("osm-server.url")) {
if (!(evt.getNewValue() instanceof StringSetting)) return;
String newValue = ((StringSetting) evt.getNewValue()).getValue();
- if (newValue == null || newValue.trim().equals("")) {
+ if (newValue == null || newValue.trim().isEmpty()) {
setAnonymous();
} else if (isFullyIdentified()) {
setPartiallyIdentified(getUserName());
}
-
+
} else if (evt.getKey().equals("oauth.access-token.key")) {
accessTokenKeyChanged = true;
-
+
} else if (evt.getKey().equals("oauth.access-token.secret")) {
accessTokenSecretChanged = true;
}
-
+
if (accessTokenKeyChanged && accessTokenSecretChanged) {
accessTokenKeyChanged = false;
accessTokenSecretChanged = false;
- if (Main.pref.get("osm-server.auth-method").equals("oauth")) {
+ if (OsmApi.isUsingOAuth()) {
try {
instance.initFromOAuth(Main.parent);
} catch (Throwable t) {
diff --git a/src/org/openstreetmap/josm/gui/MainApplet.java b/src/org/openstreetmap/josm/gui/MainApplet.java
index d99db59..c4722ce 100644
--- a/src/org/openstreetmap/josm/gui/MainApplet.java
+++ b/src/org/openstreetmap/josm/gui/MainApplet.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -21,14 +21,13 @@ import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.data.ServerSidePreferences;
import org.openstreetmap.josm.gui.MainApplication.Option;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.Shortcut;
@@ -38,19 +37,25 @@ public class MainApplet extends JApplet {
final static JFrame frame = new JFrame("Java OpenStreetMap Editor");
public static final class UploadPreferencesAction extends JosmAction {
+ /**
+ * Constructs a new {@code UploadPreferencesAction}.
+ */
public UploadPreferencesAction() {
super(tr("Upload Preferences"), "upload-preferences", tr("Upload the current preferences to the server"),
Shortcut.registerShortcut("applet:uploadprefs", tr("Upload Preferences"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
((ServerSidePreferences)Main.pref).upload();
}
}
private final class MainCaller extends Main {
- private MainCaller() {
+ private MainCaller(Map<Option, Collection<String>> mapargs) {
+ addListener();
setContentPane(contentPanePrivate);
setJMenuBar(menu);
+ postConstructorProcessCmdLine(mapargs);
}
}
@@ -95,10 +100,11 @@ public class MainApplet extends JApplet {
// call the really early hook before we do anything else
Main.platform.preStartupHook();
- Main.pref = new ServerSidePreferences(getCodeBase());
+ Main.initAppletPreferences(getCodeBase());
String lang = getParameter("language");
I18n.set(lang != null ? lang : Main.pref.get("language", null));
+ Main.pref.updateSystemProperties();
try
{
@@ -110,10 +116,10 @@ public class MainApplet extends JApplet {
JPanel p = new JPanel(new GridBagLayout());
p.add(new JLabel(tr(e.realm)), GBC.eol().fill(GBC.HORIZONTAL));
p.add(new JLabel(tr("Username")), GBC.std().insets(0,0,20,0));
- JTextField user = new JTextField(username == null ? "" : username);
+ JosmTextField user = new JosmTextField(username == null ? "" : username);
p.add(user, GBC.eol().fill(GBC.HORIZONTAL));
p.add(new JLabel(tr("Password")), GBC.std().insets(0,0,20,0));
- JPasswordField pass = new JosmPasswordField(password == null ? "" : password);
+ JosmPasswordField pass = new JosmPasswordField(password == null ? "" : password);
p.add(pass, GBC.eol().fill(GBC.HORIZONTAL));
JOptionPane.showMessageDialog(null, p);
username = user.getText();
@@ -129,10 +135,10 @@ public class MainApplet extends JApplet {
}
Main.preConstructorInit(Option.fromStringMap(args));
+ Main.pref.updateSystemProperties();
Main.parent = frame;
- Main.addListener();
- new MainCaller().postConstructorProcessCmdLine(Option.fromStringMap(args));
+ new MainCaller(Option.fromStringMap(args));
MainMenu m = Main.main.menu; // shortcut
@@ -159,16 +165,19 @@ public class MainApplet extends JApplet {
public static void main(String[] args) {
Main.applet = true;
MainApplet applet = new MainApplet();
- Main.pref = new ServerSidePreferences(applet.getCodeBase());
+ Main.initAppletPreferences(applet.getCodeBase());
applet.setStub(new AppletStub() {
+ @Override
public void appletResize(int w, int h) {
frame.setSize(w, h);
}
+ @Override
public AppletContext getAppletContext() {
return null;
}
+ @Override
public URL getCodeBase() {
try {
return new File(".").toURI().toURL();
@@ -178,14 +187,17 @@ public class MainApplet extends JApplet {
}
}
+ @Override
public URL getDocumentBase() {
return getCodeBase();
}
+ @Override
public String getParameter(String k) {
return null;
}
+ @Override
public boolean isActive() {
return true;
}
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index dd1f8b1..d278bb8 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -1,8 +1,10 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
import java.awt.Image;
import java.awt.Toolkit;
@@ -28,9 +30,6 @@ import javax.swing.JFrame;
import javax.swing.RepaintManager;
import javax.swing.SwingUtilities;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
-
import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.AutosaveTask;
@@ -40,7 +39,9 @@ import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.download.DownloadDialog;
import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.DefaultProxySelector;
+import org.openstreetmap.josm.io.MessageNotifier;
import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
import org.openstreetmap.josm.io.remotecontrol.RemoteControl;
@@ -49,6 +50,8 @@ import org.openstreetmap.josm.plugins.PluginInformation;
import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.OsmUrlToBounds;
+import org.openstreetmap.josm.tools.Utils;
/**
* Main window class application.
@@ -62,11 +65,11 @@ public class MainApplication extends Main {
public MainApplication() {}
/**
- * Construct an main frame, ready sized and operating. Does not
- * display the frame.
+ * Constructs a main frame, ready sized and operating. Does not display the frame.
+ * @param mainFrame The main JFrame of the application
*/
public MainApplication(JFrame mainFrame) {
- super();
+ addListener();
mainFrame.setContentPane(contentPanePrivate);
mainFrame.setJMenuBar(menu);
geometry.applySafe(mainFrame);
@@ -81,7 +84,7 @@ public class MainApplication extends Main {
mainFrame.setIconImages(l);
mainFrame.addWindowListener(new WindowAdapter(){
@Override public void windowClosing(final WindowEvent arg0) {
- Main.exitJosm(true);
+ Main.exitJosm(true, 0);
}
});
mainFrame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
@@ -89,7 +92,7 @@ public class MainApplication extends Main {
/**
* Displays help on the console
- *
+ * @since 2748
*/
public static void showHelp() {
// TODO: put in a platformHook for system that have no console by default
@@ -119,28 +122,48 @@ public class MainApplication extends Main {
"\t-Xmx...m\n\n"+
tr("examples")+":\n"+
"\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+
- "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?lat=43.2&lon=11.1&zoom=13\n"+
+ "\tjava -jar josm.jar "+OsmUrlToBounds.getURL(43.2, 11.1, 13)+"\n"+
"\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
"\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
"\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
- "\tjava -Xmx400m -jar josm.jar\n\n"+
+ "\tjava -Xmx1024m -jar josm.jar\n\n"+
tr("Parameters --download, --downloadgps, and --selection are processed in this order.")+"\n"+
tr("Make sure you load some data if you use --selection.")+"\n"
);
}
+ /**
+ * JOSM command line options.
+ * @see <a href="http://josm.openstreetmap.de/wiki/Help/CommandLineOptions">Help/CommandLineOptions</a>
+ * @since 5279
+ */
public enum Option {
+ /** --help|-h Show this help */
HELP(false),
+ /** --version Displays the JOSM version and exits */
VERSION(false),
+ /** --language=<language> Set the language */
LANGUAGE(true),
+ /** --reset-preferences Reset the preferences to default */
RESET_PREFERENCES(false),
+ /** --load-preferences=<url-to-xml> Changes preferences according to the XML file */
LOAD_PREFERENCES(true),
+ /** --set=<key>=<value> Set preference key to value */
SET(true),
+ /** --geometry=widthxheight(+|-)x(+|-)y Standard unix geometry argument */
GEOMETRY(true),
+ /** --no-maximize Do not launch in maximized mode */
NO_MAXIMIZE(false),
+ /** --maximize Launch in maximized mode */
MAXIMIZE(false),
+ /** --download=minlat,minlon,maxlat,maxlon Download the bounding box <br>
+ * --download=<URL> Download the location at the URL (with lat=x&lon=y&zoom=z) <br>
+ * --download=<filename> Open a file (any file type that can be opened with File/Open) */
DOWNLOAD(true),
+ /** --downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw GPS <br>
+ * --downloadgps=<URL> Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS */
DOWNLOADGPS(true),
+ /** --selection=<searchstring> Select with the given search */
SELECTION(true);
private String name;
@@ -151,10 +174,18 @@ public class MainApplication extends Main {
this.requiresArgument = requiresArgument;
}
+ /**
+ * Replies the option name
+ * @return The option name, in lowercase
+ */
public String getName() {
return name;
}
+ /**
+ * Determines if this option requires an argument.
+ * @return {@code true} if this option requires an argument, {@code false} otherwise
+ */
public boolean requiresArgument() {
return requiresArgument;
}
@@ -178,7 +209,7 @@ public class MainApplication extends Main {
los.add(new LongOpt(o.getName(), o.requiresArgument() ? LongOpt.REQUIRED_ARGUMENT : LongOpt.NO_ARGUMENT, null, 0));
}
- Getopt g = new Getopt("JOSM", args, "hv", los.toArray(new LongOpt[0]));
+ Getopt g = new Getopt("JOSM", args, "hv", los.toArray(new LongOpt[los.size()]));
Map<Option, Collection<String>> argMap = new HashMap<Option, Collection<String>>();
@@ -221,11 +252,27 @@ public class MainApplication extends Main {
/**
* Main application Startup
+ * @param argArray Command-line arguments
*/
public static void main(final String[] argArray) {
I18n.init();
Main.checkJava6();
- Main.pref = new Preferences();
+
+ // construct argument table
+ Map<Option, Collection<String>> args = null;
+ try {
+ args = buildCommandLineArgumentMap(argArray);
+ } catch (IllegalArgumentException e) {
+ System.exit(1);
+ }
+
+ final boolean languageGiven = args.containsKey(Option.LANGUAGE);
+
+ if (languageGiven) {
+ I18n.set(args.get(Option.LANGUAGE).iterator().next());
+ }
+
+ initApplicationPreferences();
Policy.setPolicy(new Policy() {
// Permissions for plug-ins loaded when josm is started via webstart
@@ -254,41 +301,29 @@ public class MainApplication extends Main {
// call the really early hook before we do anything else
Main.platform.preStartupHook();
- // construct argument table
- Map<Option, Collection<String>> args = null;
- try {
- args = buildCommandLineArgumentMap(argArray);
- } catch (IllegalArgumentException e) {
- System.exit(1);
- }
-
+ Main.commandLineArgs = Utils.copyArray(argArray);
+
if (args.containsKey(Option.VERSION)) {
System.out.println(Version.getInstance().getAgentString());
System.exit(0);
- } //else {
- // System.out.println(Version.getInstance().getReleaseAttributes());
- //}
+ }
Main.pref.init(args.containsKey(Option.RESET_PREFERENCES));
- // Check if passed as parameter
- if (args.containsKey(Option.LANGUAGE)) {
- I18n.set(args.get(Option.LANGUAGE).iterator().next());
- } else {
+ if (!languageGiven) {
I18n.set(Main.pref.get("language", null));
}
Main.pref.updateSystemProperties();
- JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
+ final JFrame mainFrame = new JFrame(tr("Java OpenStreetMap Editor"));
Main.parent = mainFrame;
if (args.containsKey(Option.LOAD_PREFERENCES)) {
CustomConfigurator.XMLCommandProcessor config = new CustomConfigurator.XMLCommandProcessor(Main.pref);
for (String i : args.get(Option.LOAD_PREFERENCES)) {
- System.out.println("Reading preferences from " + i);
+ info("Reading preferences from " + i);
try {
- URL url = new URL(i);
- config.openAndReadXML(url.openStream());
+ config.openAndReadXML(Utils.openURL(new URL(i)));
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -313,7 +348,7 @@ public class MainApplication extends Main {
System.exit(0);
}
- SplashScreen splash = new SplashScreen();
+ final SplashScreen splash = new SplashScreen();
final ProgressMonitor monitor = splash.getProgressMonitor();
monitor.beginTask(tr("Initializing"));
splash.setVisible(Main.pref.getBoolean("draw.splashscreen", true));
@@ -341,36 +376,40 @@ public class MainApplication extends Main {
preConstructorInit(args);
monitor.indeterminateSubTask(tr("Creating main GUI"));
- Main.addListener();
final Main main = new MainApplication(mainFrame);
monitor.indeterminateSubTask(tr("Loading plugins"));
PluginHandler.loadLatePlugins(splash,pluginsToLoad, monitor.createSubTaskMonitor(1, false));
toolbar.refreshToolbarControl();
- splash.setVisible(false);
- splash.dispose();
- mainFrame.setVisible(true);
+
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
+ public void run() {
+ splash.setVisible(false);
+ splash.dispose();
+ mainFrame.setVisible(true);
+ }
+ });
+
Main.MasterWindowListener.setup();
boolean maximized = Boolean.parseBoolean(Main.pref.get("gui.maximized"));
if ((!args.containsKey(Option.NO_MAXIMIZE) && maximized) || args.containsKey(Option.MAXIMIZE)) {
if (Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH)) {
- // Main.debug("Main window maximized");
Main.windowState = JFrame.MAXIMIZED_BOTH;
mainFrame.setExtendedState(Main.windowState);
} else {
Main.debug("Main window: maximizing not supported");
}
- } else {
- // Main.debug("Main window not maximized");
}
- if(main.menu.fullscreenToggleAction != null) {
+ if (main.menu.fullscreenToggleAction != null) {
main.menu.fullscreenToggleAction.initial();
}
final Map<Option, Collection<String>> args_final = args;
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) {
AutosaveTask autosaveTask = new AutosaveTask();
@@ -396,7 +435,7 @@ public class MainApplication extends Main {
autosaveTask.schedule();
}
- main.postConstructorProcessCmdLine(args_final);
+ postConstructorProcessCmdLine(args_final);
DownloadDialog.autostartIfNeeded();
}
@@ -405,10 +444,14 @@ public class MainApplication extends Main {
if (RemoteControl.PROP_REMOTECONTROL_ENABLED.get()) {
RemoteControl.start();
}
+
+ if (MessageNotifier.PROP_NOTIFIER_ENABLED.get()) {
+ MessageNotifier.start();
+ }
if (Main.pref.getBoolean("debug.edt-checker.enable", Version.getInstance().isLocalBuild())) {
// Repaint manager is registered so late for a reason - there is lots of violation during startup process but they don't seem to break anything and are difficult to fix
- System.out.println("Enabled EDT checker, wrongful access to gui from non EDT thread will be printed to console");
+ info("Enabled EDT checker, wrongful access to gui from non EDT thread will be printed to console");
RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
}
}
diff --git a/src/org/openstreetmap/josm/gui/MainMenu.java b/src/org/openstreetmap/josm/gui/MainMenu.java
index 6fab780..a4d6653 100644
--- a/src/org/openstreetmap/josm/gui/MainMenu.java
+++ b/src/org/openstreetmap/josm/gui/MainMenu.java
@@ -8,6 +8,8 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.awt.Toolkit;
import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JMenu;
@@ -33,6 +35,7 @@ import org.openstreetmap.josm.actions.CopyCoordinatesAction;
import org.openstreetmap.josm.actions.CreateCircleAction;
import org.openstreetmap.josm.actions.CreateMultipolygonAction;
import org.openstreetmap.josm.actions.DeleteAction;
+import org.openstreetmap.josm.actions.DialogsToggleAction;
import org.openstreetmap.josm.actions.DistributeAction;
import org.openstreetmap.josm.actions.DownloadAction;
import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
@@ -62,11 +65,14 @@ import org.openstreetmap.josm.actions.NewAction;
import org.openstreetmap.josm.actions.OpenFileAction;
import org.openstreetmap.josm.actions.OpenLocationAction;
import org.openstreetmap.josm.actions.OrthogonalizeAction;
+import org.openstreetmap.josm.actions.OrthogonalizeAction.Undo;
import org.openstreetmap.josm.actions.PasteAction;
import org.openstreetmap.josm.actions.PasteTagsAction;
+import org.openstreetmap.josm.actions.PreferenceToggleAction;
import org.openstreetmap.josm.actions.PreferencesAction;
import org.openstreetmap.josm.actions.PurgeAction;
import org.openstreetmap.josm.actions.RedoAction;
+import org.openstreetmap.josm.actions.RestartAction;
import org.openstreetmap.josm.actions.ReverseWayAction;
import org.openstreetmap.josm.actions.SaveAction;
import org.openstreetmap.josm.actions.SaveAsAction;
@@ -78,6 +84,7 @@ import org.openstreetmap.josm.actions.SimplifyWayAction;
import org.openstreetmap.josm.actions.SplitWayAction;
import org.openstreetmap.josm.actions.ToggleGPXLinesAction;
import org.openstreetmap.josm.actions.UnGlueAction;
+import org.openstreetmap.josm.actions.UnJoinNodeWayAction;
import org.openstreetmap.josm.actions.UndoAction;
import org.openstreetmap.josm.actions.UnselectAllAction;
import org.openstreetmap.josm.actions.UpdateDataAction;
@@ -89,8 +96,6 @@ import org.openstreetmap.josm.actions.ViewportFollowToggleAction;
import org.openstreetmap.josm.actions.WireframeToggleAction;
import org.openstreetmap.josm.actions.ZoomInAction;
import org.openstreetmap.josm.actions.ZoomOutAction;
-import org.openstreetmap.josm.actions.OrthogonalizeAction.Undo;
-import org.openstreetmap.josm.actions.PreferenceToggleAction;
import org.openstreetmap.josm.actions.audio.AudioBackAction;
import org.openstreetmap.josm.actions.audio.AudioFasterAction;
import org.openstreetmap.josm.actions.audio.AudioFwdAction;
@@ -104,6 +109,8 @@ import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.gui.io.RecentlyOpenedFilesMenu;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.mappaint.MapPaintMenu;
+import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -119,114 +126,250 @@ import org.openstreetmap.josm.tools.Shortcut;
public class MainMenu extends JMenuBar {
/* File menu */
+ /** File -> New Layer **/
public final NewAction newAction = new NewAction();
+ /** File -> Open... **/
public final OpenFileAction openFile = new OpenFileAction();
+ /** File -> Open Recent > **/
public final RecentlyOpenedFilesMenu recentlyOpened = new RecentlyOpenedFilesMenu();
+ /** File -> Open Location... **/
public final OpenLocationAction openLocation = new OpenLocationAction();
- public final JosmAction save = SaveAction.getInstance();
- public final JosmAction saveAs = SaveAsAction.getInstance();
- public JosmAction sessionLoad;
- public JosmAction sessionSaveAs;
- public final JosmAction gpxExport = new GpxExportAction();
+ /** File -> Save **/
+ public final SaveAction save = SaveAction.getInstance();
+ /** File -> Save As... **/
+ public final SaveAsAction saveAs = SaveAsAction.getInstance();
+ /** File -> Session > Load Session **/
+ public SessionLoadAction sessionLoad;
+ /** File -> Session > Save Session As... **/
+ public SessionSaveAsAction sessionSaveAs;
+ /** File -> Export to GPX... **/
+ public final GpxExportAction gpxExport = new GpxExportAction();
+ /** File -> Download from OSM... **/
public final DownloadAction download = new DownloadAction();
+ /** File -> Download object... **/
public final DownloadPrimitiveAction downloadPrimitive = new DownloadPrimitiveAction();
+ /** File -> Download parent ways/relations... **/
public final DownloadReferrersAction downloadReferrers = new DownloadReferrersAction();
+ /** File -> Close open changesets... **/
public final CloseChangesetAction closeChangesetAction = new CloseChangesetAction();
+ /** File -> Update data **/
public final JosmAction update = new UpdateDataAction();
+ /** File -> Update selection **/
public final JosmAction updateSelection = new UpdateSelectionAction();
+ /** File -> Update modified **/
public final JosmAction updateModified = new UpdateModifiedAction();
+ /** File -> Upload data **/
public final JosmAction upload = new UploadAction();
+ /** File -> Upload selection **/
public final JosmAction uploadSelection = new UploadSelectionAction();
- public final JosmAction exit = new ExitAction();
+ /** File -> Restart **/
+ public final RestartAction restart = new RestartAction();
+ /** File -> Exit **/
+ public final ExitAction exit = new ExitAction();
/* Edit menu */
+ /** Edit -> Undo... */
public final UndoAction undo = new UndoAction();
+ /** Edit -> Redo */
public final RedoAction redo = new RedoAction();
- public final JosmAction copy = new CopyAction();
+ /** Edit -> Copy */
+ public final CopyAction copy = new CopyAction();
+ /** Edit -> Copy Coordinates */
public final JosmAction copyCoordinates = new CopyCoordinatesAction();
+ /** Edit -> Paste */
public final PasteAction paste = new PasteAction();
- public final JosmAction pasteTags = new PasteTagsAction();
- public final JosmAction duplicate = new DuplicateAction();
- public final JosmAction delete = new DeleteAction();
+ /** Edit -> Paste Tags */
+ public final PasteTagsAction pasteTags = new PasteTagsAction();
+ /** Edit -> Duplicate */
+ public final DuplicateAction duplicate = new DuplicateAction();
+ /** Edit -> Delete */
+ public final DeleteAction delete = new DeleteAction();
+ /** Edit -> Purge... */
public final JosmAction purge = new PurgeAction();
- public final JosmAction merge = new MergeLayerAction();
- public final JosmAction mergeSelected = new MergeSelectionAction();
- public final JosmAction selectAll = new SelectAllAction();
- public final JosmAction unselectAll = new UnselectAllAction();
- public final JosmAction search = new SearchAction();
- public final JosmAction preferences = new PreferencesAction();
+ /** Edit -> Merge layer */
+ public final MergeLayerAction merge = new MergeLayerAction();
+ /** Edit -> Merge selection */
+ public final MergeSelectionAction mergeSelected = new MergeSelectionAction();
+ /** Edit -> Search... */
+ public final SearchAction search = new SearchAction();
+ /** Edit -> Preferences */
+ public final PreferencesAction preferences = new PreferencesAction();
/* View menu */
+ /** View -> Wireframe View */
public final WireframeToggleAction wireFrameToggleAction = new WireframeToggleAction();
public final JosmAction toggleGPXLines = new ToggleGPXLinesAction();
+ /** View -> Advanced info */
public final InfoAction info = new InfoAction();
+ /** View -> Advanced info (web) */
public final InfoWebAction infoweb = new InfoWebAction();
+ /** View -> History */
public final HistoryInfoAction historyinfo = new HistoryInfoAction();
+ /** View -> History (web) */
public final HistoryInfoWebAction historyinfoweb = new HistoryInfoWebAction();
+ /** View -> "Zoom to"... actions */
+ public final Map<String, AutoScaleAction> autoScaleActions = new HashMap<String, AutoScaleAction>();
+ /** View -> Jump to position */
+ public final JumpToAction jumpToAct = new JumpToAction();
/* Tools menu */
- public final JosmAction splitWay = new SplitWayAction();
- public final JosmAction combineWay = new CombineWayAction();
- public final JosmAction reverseWay = new ReverseWayAction();
- public final JosmAction alignInCircle = new AlignInCircleAction();
- public final JosmAction alignInLine = new AlignInLineAction();
- public final JosmAction distribute = new DistributeAction();
+ /** Tools -> Split Way */
+ public final SplitWayAction splitWay = new SplitWayAction();
+ /** Tools -> Combine Way */
+ public final CombineWayAction combineWay = new CombineWayAction();
+ /** Tools -> Reverse Ways */
+ public final ReverseWayAction reverseWay = new ReverseWayAction();
+ /** Tools -> Simplify Way */
+ public final SimplifyWayAction simplifyWay = new SimplifyWayAction();
+ /** Tools -> Align Nodes in Circle */
+ public final AlignInCircleAction alignInCircle = new AlignInCircleAction();
+ /** Tools -> Align Nodes in Line */
+ public final AlignInLineAction alignInLine = new AlignInLineAction();
+ /** Tools -> Distribute Nodes */
+ public final DistributeAction distribute = new DistributeAction();
+ /** Tools -> Orthogonalize Shape */
public final OrthogonalizeAction ortho = new OrthogonalizeAction();
- public final JosmAction orthoUndo = new Undo(); // action is not shown in the menu. Only triggered by shortcut
- public final JosmAction mirror = new MirrorAction();
- public final AddNodeAction addnode = new AddNodeAction();
- public final MoveNodeAction movenode = new MoveNodeAction();
- public final JosmAction createCircle = new CreateCircleAction();
- public final JosmAction mergeNodes = new MergeNodesAction();
- public final JosmAction joinNodeWay = new JoinNodeWayAction();
- public final JosmAction unglueNodes = new UnGlueAction();
- public final JosmAction simplifyWay = new SimplifyWayAction();
- public final JosmAction joinAreas = new JoinAreasAction();
- public final JosmAction createMultipolygon = new CreateMultipolygonAction();
- public final JosmAction followLine = new FollowLineAction();
+ /** Orthogonalize undo. Action is not shown in the menu. Only triggered by shortcut */
+ public final Undo orthoUndo = new Undo();
+ /** Tools -> Mirror */
+ public final MirrorAction mirror = new MirrorAction();
+ /** Tools -> Follow line */
+ public final FollowLineAction followLine = new FollowLineAction();
+ /** Tools -> Add Node... */
+ public final AddNodeAction addNode = new AddNodeAction();
+ /** Tools -> Move Node... */
+ public final MoveNodeAction moveNode = new MoveNodeAction();
+ /** Tools -> Create Circle */
+ public final CreateCircleAction createCircle = new CreateCircleAction();
+ /** Tools -> Merge Nodes */
+ public final MergeNodesAction mergeNodes = new MergeNodesAction();
+ /** Tools -> Join Node to Way */
+ public final JoinNodeWayAction joinNodeWay = new JoinNodeWayAction();
+ /** Tools -> Disconnect Node from Way */
+ public final UnJoinNodeWayAction unJoinNodeWay = new UnJoinNodeWayAction();
+ /** Tools -> Unglue Ways */
+ public final UnGlueAction unglueNodes = new UnGlueAction();
+ /** Tools -> Join overlapping Areas */
+ public final JoinAreasAction joinAreas = new JoinAreasAction();
+ /** Tools -> Create multipolygon */
+ public final CreateMultipolygonAction createMultipolygon = new CreateMultipolygonAction();
+
+ /* Selection menu */
+ /** Selection -> Select All */
+ public final SelectAllAction selectAll = new SelectAllAction();
+ /** Selection -> Unselect All */
+ public final UnselectAllAction unselectAll = new UnselectAllAction();
/* Audio menu */
+ /** Audio -> Play/Pause */
public final JosmAction audioPlayPause = new AudioPlayPauseAction();
+ /** Audio -> Next marker */
public final JosmAction audioNext = new AudioNextAction();
+ /** Audio -> Previous Marker */
public final JosmAction audioPrev = new AudioPrevAction();
+ /** Audio -> Forward */
public final JosmAction audioFwd = new AudioFwdAction();
+ /** Audio -> Back */
public final JosmAction audioBack = new AudioBackAction();
+ /** Audio -> Faster */
public final JosmAction audioFaster = new AudioFasterAction();
+ /** Audio -> Slower */
public final JosmAction audioSlower = new AudioSlowerAction();
+ /* Windows Menu */
+ /** Windows -> Changeset Manager */
+ public final ChangesetManagerToggleAction changesetManager = new ChangesetManagerToggleAction();
+
/* Help menu */
+ /** Help -> Help */
public final HelpAction help = new HelpAction();
- public final JosmAction about = new AboutAction();
- public final JosmAction statusreport = new ShowStatusReportAction();
+ /** Help -> About */
+ public final AboutAction about = new AboutAction();
+ /** Help -> Show Status Report */
+ public final ShowStatusReportAction statusreport = new ShowStatusReportAction();
+ /**
+ * fileMenu contains I/O actions
+ */
public final JMenu fileMenu = addMenu(marktr("File"), KeyEvent.VK_F, 0, ht("/Menu/File"));
- public final JMenu sessionMenu = new JMenu(tr("Session")); // submenu of the file menu
+ /**
+ * sessionMenu is a submenu of File menu containing all session actions
+ */
+ public final JMenu sessionMenu = new JMenu(tr("Session"));
+ /**
+ * editMenu contains editing actions
+ */
public final JMenu editMenu = addMenu(marktr("Edit"), KeyEvent.VK_E, 1, ht("/Menu/Edit"));
+ /**
+ * viewMenu contains display actions (zoom, map styles, etc.)
+ */
public final JMenu viewMenu = addMenu(marktr("View"), KeyEvent.VK_V, 2, ht("/Menu/View"));
+ /**
+ * toolsMenu contains different geometry manipulation actions from JOSM core (most used)
+ * The plugins should use other menus
+ */
public final JMenu toolsMenu = addMenu(marktr("Tools"), KeyEvent.VK_T, 3, ht("/Menu/Tools"));
- public final JMenu presetsMenu = addMenu(marktr("Presets"), KeyEvent.VK_P, 4, ht("/Menu/Presets"));
- public final ImageryMenu imageryMenu =
- (ImageryMenu)addMenu(new ImageryMenu(), marktr("Imagery"), KeyEvent.VK_I, 5, ht("/Menu/Imagery"));
+ /**
+ * moreToolsMenu contains geometry-related actions from all the plugins
+ * @since 6082 (moved from Utilsplugin2)
+ */
+ public final JMenu moreToolsMenu = addMenu(marktr("More tools"), KeyEvent.VK_M, 4, ht("/Menu/MoreTools"));
+ /**
+ * dataMenu contains plugin actions that are related to certain tagging schemes (addressing opening hours),
+ * importing external data and using external web APIs
+ * @since 6082
+ */
+ public final JMenu dataMenu = addMenu(marktr("Data"), KeyEvent.VK_D, 5, ht("/Menu/Data"));
+ /**
+ * selectionMenu contains all actions related to selecting different objects
+ * @since 6082 (moved from Utilsplugin2)
+ */
+ public final JMenu selectionMenu = addMenu(marktr("Selection"), KeyEvent.VK_N, 6, ht("/Menu/Selection"));
+ /**
+ * presetsMenu contains presets actions (search, presets tree)
+ */
+ public final JMenu presetsMenu = addMenu(marktr("Presets"), KeyEvent.VK_P, 7, ht("/Menu/Presets"));
+ /**
+ * submenu in Imagery menu that contains plugin-managed additional imagery layers
+ * @since 6097
+ */
+ public final JMenu imagerySubMenu = new JMenu(tr("More..."));
+ /**
+ * imageryMenu contains all imagery-related actions
+ */
+ public final ImageryMenu imageryMenu = addMenu(new ImageryMenu(imagerySubMenu), marktr("Imagery"), KeyEvent.VK_I, 8, ht("/Menu/Imagery"));
+ /**
+ * gpsMenu contains all plugin actions that are related
+ * to using GPS data, including opening, uploading and real-time tracking
+ * @since 6082
+ */
+ public final JMenu gpsMenu = addMenu(marktr("GPS"), KeyEvent.VK_G, 9, ht("/Menu/GPS"));
/** the window menu is split into several groups. The first is for windows that can be opened from
* this menu any time, e.g. the changeset editor. The second group is for toggle dialogs and the third
* group is for currently open windows that cannot be toggled, e.g. relation editors. It's recommended
* to use WINDOW_MENU_GROUP to determine the group integer.
*/
- public final JMenu windowMenu = addMenu(marktr("Windows"), KeyEvent.VK_W, 6, ht("/Menu/Windows"));
+ public final JMenu windowMenu = addMenu(marktr("Windows"), KeyEvent.VK_W, 10, ht("/Menu/Windows"));
public static enum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE }
+ /**
+ * audioMenu contains all audio-related actions. Be careful, this menu is not guaranteed to be displayed at all
+ */
public JMenu audioMenu = null;
- public final JMenu helpMenu = addMenu(marktr("Help"), KeyEvent.VK_H, 7, ht("/Menu/Help"));
+ /**
+ * helpMenu contains JOSM general actions (Help, About, etc.)
+ */
+ public final JMenu helpMenu = addMenu(marktr("Help"), KeyEvent.VK_H, 11, ht("/Menu/Help"));
- public final int defaultMenuPos = 7;
+ private static final int defaultMenuPos = 11;
public final JosmAction moveUpAction = new MoveAction(MoveAction.Direction.UP);
public final JosmAction moveDownAction = new MoveAction(MoveAction.Direction.DOWN);
public final JosmAction moveLeftAction = new MoveAction(MoveAction.Direction.LEFT);
public final JosmAction moveRightAction = new MoveAction(MoveAction.Direction.RIGHT);
- public final JumpToAction jumpToAct = new JumpToAction();
public final TaggingPresetSearchAction presetSearchAction = new TaggingPresetSearchAction();
+ public final DialogsToggleAction dialogsToggleAction = new DialogsToggleAction();
public FullscreenToggleAction fullscreenToggleAction = null;
/** this menu listener hides unnecessary JSeparators in a menu list but does not remove them.
@@ -257,6 +400,14 @@ public class MainMenu extends JMenuBar {
}
}
};
+
+ /**
+ * @since 6088
+ * @return the default position of tnew top-level menus
+ */
+ public int getDefaultMenuPos() {
+ return defaultMenuPos;
+ }
/**
* Add a JosmAction at the end of a menu.
@@ -312,6 +463,8 @@ public class MainMenu extends JMenuBar {
if (ks != null) {
menuitem.setAccelerator(ks);
}
+ // some menus are hidden before they are populated with some items by plugins
+ if (!menu.isVisible()) menu.setVisible(true);
return menuitem;
}
@@ -346,6 +499,7 @@ public class MainMenu extends JMenuBar {
* @param action the action that should get a menu item
* @param group the item should be added to. Groups are split by a separator.
* 0 is the first group, -1 will add the item to the end.
+ * @return The created menu item
*/
public static <E extends Enum<E>> JMenuItem add(JMenu menu, JosmAction action, Enum<E> group) {
if (action.getShortcut().getAutomatic())
@@ -367,6 +521,7 @@ public class MainMenu extends JMenuBar {
* @param group the item should be added to. Groups are split by a separator. Use
* one of the enums that are defined for some of the menus to tell in which
* group the item should go.
+ * @return The created menu item
*/
public static <E extends Enum<E>> JCheckBoxMenuItem addWithCheckbox(JMenu menu, JosmAction action, Enum<E> group) {
int i = getInsertionIndexForGroup(menu, group.ordinal());
@@ -410,7 +565,7 @@ public class MainMenu extends JMenuBar {
return addMenu(menu, name, mnemonicKey, position, relativeHelpTopic);
}
- public JMenu addMenu(JMenu menu, String name, int mnemonicKey, int position, String relativeHelpTopic) {
+ public <T extends JMenu> T addMenu(T menu, String name, int mnemonicKey, int position, String relativeHelpTopic) {
Shortcut.registerShortcut("menu:" + name, tr("Menu: {0}", tr(name)), mnemonicKey,
Shortcut.MNEMONIC).setMnemonic(menu);
add(menu, position);
@@ -418,9 +573,16 @@ public class MainMenu extends JMenuBar {
return menu;
}
+ /**
+ * Constructs a new {@code MainMenu}.
+ */
public MainMenu() {
JMenuItem current;
-
+
+ moreToolsMenu.setVisible(false);
+ dataMenu.setVisible(false);
+ gpsMenu.setVisible(false);
+
add(fileMenu, newAction);
add(fileMenu, openFile);
fileMenu.add(recentlyOpened);
@@ -428,15 +590,14 @@ public class MainMenu extends JMenuBar {
fileMenu.addSeparator();
add(fileMenu, save);
add(fileMenu, saveAs);
- if (Main.pref.getBoolean("session")) {
- sessionMenu.setToolTipText(tr("Save and load the current session (list of layers, etc.)"));
- sessionMenu.setIcon(ImageProvider.get("session"));
- sessionSaveAs = new SessionSaveAsAction();
- sessionLoad = new SessionLoadAction();
- add(sessionMenu, sessionSaveAs);
- add(sessionMenu, sessionLoad);
- fileMenu.add(sessionMenu);
- }
+ sessionMenu.setToolTipText(tr("Save and load the current session (list of layers, etc.)"));
+ sessionMenu.setIcon(ImageProvider.get("session"));
+ sessionSaveAs = new SessionSaveAsAction();
+ sessionLoad = new SessionLoadAction();
+ add(sessionMenu, sessionSaveAs);
+ add(sessionMenu, sessionLoad);
+ fileMenu.add(sessionMenu);
+ ExpertToggleAction.addVisibilitySwitcher(sessionMenu);
add(fileMenu, gpxExport, true);
fileMenu.addSeparator();
add(fileMenu, download);
@@ -453,6 +614,7 @@ public class MainMenu extends JMenuBar {
ExpertToggleAction.addVisibilitySwitcher(sep);
add(fileMenu, closeChangesetAction, true);
fileMenu.addSeparator();
+ add(fileMenu, restart);
add(fileMenu, exit);
add(editMenu, undo);
@@ -471,9 +633,6 @@ public class MainMenu extends JMenuBar {
add(editMenu,merge);
add(editMenu,mergeSelected);
editMenu.addSeparator();
- add(editMenu, selectAll);
- add(editMenu, unselectAll);
- editMenu.addSeparator();
add(editMenu, search);
editMenu.addSeparator();
add(editMenu, preferences);
@@ -490,7 +649,8 @@ public class MainMenu extends JMenuBar {
add(viewMenu, new ZoomOutAction());
viewMenu.addSeparator();
for (String mode : AutoScaleAction.MODES) {
- JosmAction autoScaleAction = new AutoScaleAction(mode);
+ AutoScaleAction autoScaleAction = new AutoScaleAction(mode);
+ autoScaleActions.put(mode, autoScaleAction);
add(viewMenu, autoScaleAction);
}
@@ -511,6 +671,14 @@ public class MainMenu extends JMenuBar {
fullscreen.setAccelerator(fullscreenToggleAction.getShortcut().getKeyStroke());
fullscreenToggleAction.addButtonModel(fullscreen.getModel());
}
+
+ // -- dialogs panel toggle action
+ final JCheckBoxMenuItem dialogsToggle = new JCheckBoxMenuItem(dialogsToggleAction);
+ dialogsToggle.setAccelerator(dialogsToggleAction.getShortcut().getKeyStroke());
+ dialogsToggleAction.addButtonModel(dialogsToggle.getModel());
+ viewMenu.add(dialogsToggle);
+
+ add(viewMenu, jumpToAct, true);
viewMenu.addSeparator();
add(viewMenu, info);
add(viewMenu, infoweb);
@@ -526,8 +694,16 @@ public class MainMenu extends JMenuBar {
ExpertToggleAction.getInstance().addButtonModel(expertItem.getModel());
add(presetsMenu, presetSearchAction);
+ add(presetsMenu, PreferencesAction.forPreferenceSubTab(tr("Preset preferences"),
+ tr("Click to open the tagging presets tab in the preferences"), TaggingPresetPreference.class));
presetsMenu.addSeparator();
+ add(imageryMenu, PreferencesAction.forPreferenceTab(tr("Imagery preferences"),
+ tr("Click to open the imagery tab in the preferences"), ImageryPreference.class));
+
+ add(selectionMenu, selectAll);
+ add(selectionMenu, unselectAll);
+
add(toolsMenu, splitWay);
add(toolsMenu, combineWay);
toolsMenu.addSeparator();
@@ -541,27 +717,27 @@ public class MainMenu extends JMenuBar {
add(toolsMenu, mirror, true);
toolsMenu.addSeparator();
add(toolsMenu, followLine, true);
- add(toolsMenu, addnode, true);
- add(toolsMenu, movenode, true);
+ add(toolsMenu, addNode, true);
+ add(toolsMenu, moveNode, true);
add(toolsMenu, createCircle);
toolsMenu.addSeparator();
add(toolsMenu, mergeNodes);
add(toolsMenu, joinNodeWay);
+ add(toolsMenu, unJoinNodeWay);
add(toolsMenu, unglueNodes);
toolsMenu.addSeparator();
add(toolsMenu, joinAreas);
add(toolsMenu, createMultipolygon);
// -- changeset manager toggle action
- ChangesetManagerToggleAction changesetManagerToggleAction = new ChangesetManagerToggleAction();
- final JCheckBoxMenuItem mi = MainMenu.addWithCheckbox(windowMenu, changesetManagerToggleAction,
+ final JCheckBoxMenuItem mi = MainMenu.addWithCheckbox(windowMenu, changesetManager,
MainMenu.WINDOW_MENU_GROUP.ALWAYS);
- changesetManagerToggleAction.addButtonModel(mi.getModel());
+ changesetManager.addButtonModel(mi.getModel());
if (!Main.pref.getBoolean("audio.menuinvisible", false)) {
showAudioMenu(true);
}
-
+
Main.pref.addPreferenceChangeListener(new PreferenceChangedListener() {
@Override
public void preferenceChanged(PreferenceChangeEvent e) {
@@ -583,7 +759,7 @@ public class MainMenu extends JMenuBar {
new PresetsMenuEnabler(presetsMenu).refreshEnabled();
}
-
+
protected void showAudioMenu(boolean showMenu) {
if (showMenu && audioMenu == null) {
audioMenu = addMenu(marktr("Audio"), KeyEvent.VK_U, defaultMenuPos, ht("/Menu/Audio"));
@@ -611,22 +787,22 @@ public class MainMenu extends JMenuBar {
}
/**
* Refreshes the enabled state
- *
*/
protected void refreshEnabled() {
- presetsMenu.setEnabled(Main.isDisplayingMapView()
- && Main.map.mapView.getEditLayer() != null
- );
+ presetsMenu.setEnabled(Main.main.hasEditLayer());
}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
refreshEnabled();
}
+ @Override
public void layerAdded(Layer newLayer) {
refreshEnabled();
}
+ @Override
public void layerRemoved(Layer oldLayer) {
refreshEnabled();
}
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 4e0ae94..61113b1 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -36,6 +36,8 @@ import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
import javax.swing.plaf.basic.BasicSplitPaneDivider;
import javax.swing.plaf.basic.BasicSplitPaneUI;
@@ -69,9 +71,10 @@ import org.openstreetmap.josm.gui.dialogs.UserListDialog;
import org.openstreetmap.josm.gui.dialogs.ValidatorDialog;
import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog;
import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
+
/**
* One Map frame with one dataset behind. This is the container gui class whose
@@ -86,21 +89,33 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
*/
public MapMode mapMode;
- private final List<MapMode> mapModes = new ArrayList<MapMode>();
/**
* The view control displayed.
*/
- public MapView mapView;
- /**
- * The toolbar with the action icons. To add new toggle dialog actions, use addToggleDialog
- * instead of adding directly to this list. To add a new mode use addMapMode.
- */
- private JToolBar toolBarActions = new JToolBar(JToolBar.VERTICAL);
- private JToolBar toolBarToggle = new JToolBar(JToolBar.VERTICAL);
+ public final MapView mapView;
+
/**
- * The status line below the map
+ * The toolbar with the action icons. To add new toggle dialog buttons,
+ * use addToggleDialog, to add a new map mode button use addMapMode.
*/
- public MapStatus statusLine;
+ private JComponent sideToolBar = new JToolBar(JToolBar.VERTICAL);
+ private final ButtonGroup toolBarActionsGroup = new ButtonGroup();
+ private final JToolBar toolBarActions = new JToolBar(JToolBar.VERTICAL);
+ private final JToolBar toolBarToggle = new JToolBar(JToolBar.VERTICAL);
+
+ private final List<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
+ private final List<MapMode> mapModes = new ArrayList<MapMode>();
+ private final List<IconToggleButton> allDialogButtons = new ArrayList<IconToggleButton>();
+ public final List<IconToggleButton> allMapModeButtons = new ArrayList<IconToggleButton>();
+
+ private final ListAllButtonsAction listAllDialogsAction = new ListAllButtonsAction(allDialogButtons);
+ private final ListAllButtonsAction listAllMapModesAction = new ListAllButtonsAction(allMapModeButtons);
+ private final JButton listAllToggleDialogsButton = new JButton(listAllDialogsAction);
+ private final JButton listAllMapModesButton = new JButton(listAllMapModesAction);
+ {
+ listAllDialogsAction.setButton(listAllToggleDialogsButton);
+ listAllMapModesAction.setButton(listAllMapModesButton);
+ }
// Toggle dialogs
public ConflictDialog conflictDialog;
@@ -112,42 +127,31 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
// Map modes
public final SelectAction mapModeSelect;
+ private final Map<Layer, MapMode> lastMapMode = new HashMap<Layer, MapMode>();
private final MapMode mapModeDraw;
private final MapMode mapModeZoom;
/**
- * The panel list of all toggle dialog icons. To add new toggle dialog actions, use addToggleDialog
- * instead of adding directly to this list.
+ * The status line below the map
+ */
+ public MapStatus statusLine;
+
+ /**
+ * The split pane with the mapview (leftPanel) and toggle dialogs (dialogsPanel).
*/
- private List<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
+ private final JSplitPane splitPane;
private final JPanel leftPanel;
private final DialogsPanel dialogsPanel;
- public final ButtonGroup toolGroup = new ButtonGroup();
-
- private List<IconToggleButton> allDialogButtons = new ArrayList<IconToggleButton>();
- private List<IconToggleButton> allMapModeButtons = new ArrayList<IconToggleButton>();
-
- private final ListAllButtonsAction listAllDialogsAction = new ListAllButtonsAction(allDialogButtons);
- private final ListAllButtonsAction listAllMapModesAction = new ListAllButtonsAction(allMapModeButtons);
- private final JButton listAllToggleDialogsButton = new JButton(listAllDialogsAction);
- private final JButton listAllMapModesButton = new JButton(listAllMapModesAction);
- {
- listAllDialogsAction.setButton(listAllToggleDialogsButton);
- listAllMapModesAction.setButton(listAllMapModesButton);
- }
-
/**
* Default width of the toggle dialog area.
*/
public static final int DEF_TOGGLE_DLG_WIDTH = 330;
- private final Map<Layer, MapMode> lastMapMode = new HashMap<Layer, MapMode>();
-
/**
* Constructs a new {@code MapFrame}.
* @param contentPane The content pane used to register shortcuts in its
- * {@link InputMap} and {@link ActionMap}
+ * {@link javax.swing.InputMap} and {@link javax.swing.ActionMap}
* @param viewportData the initial viewport of the map. Can be null, then
* the viewport is derived from the layer data.
*/
@@ -155,32 +159,17 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
setSize(400,400);
setLayout(new BorderLayout());
-
mapView = new MapView(contentPane, viewportData);
-
new FileDrop(mapView);
+ splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
+
leftPanel = new JPanel();
leftPanel.setLayout(new GridBagLayout());
-
leftPanel.add(mapView, GBC.std().fill());
+ splitPane.setLeftComponent(leftPanel);
- // toolbar
- toolBarActions.setFloatable(false);
- addMapMode(new IconToggleButton(mapModeSelect = new SelectAction(this)));
- addMapMode(new IconToggleButton(new LassoModeAction(), true));
- addMapMode(new IconToggleButton(mapModeDraw = new DrawAction(this)));
- addMapMode(new IconToggleButton(mapModeZoom = new ZoomAction(this)));
- addMapMode(new IconToggleButton(new DeleteAction(this), true));
- addMapMode(new IconToggleButton(new ParallelWayAction(this), true));
- addMapMode(new IconToggleButton(new ExtrudeAction(this), true));
- addMapMode(new IconToggleButton(new ImproveWayAccuracyAction(Main.map), true));
-
- toolGroup.setSelected(((AbstractButton)toolBarActions.getComponent(0)).getModel(), true);
-
- JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
dialogsPanel = new DialogsPanel(splitPane);
- splitPane.setLeftComponent(leftPanel);
splitPane.setRightComponent(dialogsPanel);
/**
@@ -212,28 +201,46 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
dialogsPanel.setLayout(new BoxLayout(dialogsPanel, BoxLayout.Y_AXIS));
dialogsPanel.setPreferredSize(new Dimension(Main.pref.getInteger("toggleDialogs.width",DEF_TOGGLE_DLG_WIDTH), 0));
-
dialogsPanel.setMinimumSize(new Dimension(24, 0));
mapView.setMinimumSize(new Dimension(10,0));
- toolBarToggle.setFloatable(false);
+ // toolBarActions, map mode buttons
+ addMapMode(new IconToggleButton(mapModeSelect = new SelectAction(this)));
+ addMapMode(new IconToggleButton(new LassoModeAction(), true));
+ addMapMode(new IconToggleButton(mapModeDraw = new DrawAction(this)));
+ addMapMode(new IconToggleButton(mapModeZoom = new ZoomAction(this)));
+ addMapMode(new IconToggleButton(new DeleteAction(this), true));
+ addMapMode(new IconToggleButton(new ParallelWayAction(this), true));
+ addMapMode(new IconToggleButton(new ExtrudeAction(this), true));
+ addMapMode(new IconToggleButton(new ImproveWayAccuracyAction(Main.map), false));
+ toolBarActionsGroup.setSelected(allMapModeButtons.get(0).getModel(), true);
+ toolBarActions.setFloatable(false);
+
+ // toolBarToggles, toggle dialog buttons
LayerListDialog.createInstance(this);
addToggleDialog(LayerListDialog.getInstance());
- addToggleDialog(propertiesDialog = new PropertiesDialog(this));
+ addToggleDialog(propertiesDialog = new PropertiesDialog());
addToggleDialog(selectionListDialog = new SelectionListDialog());
addToggleDialog(relationListDialog = new RelationListDialog());
- addToggleDialog(new CommandStackDialog(this));
+ addToggleDialog(new CommandStackDialog());
addToggleDialog(new UserListDialog());
addToggleDialog(new HistoryDialog(), true);
addToggleDialog(conflictDialog = new ConflictDialog());
addToggleDialog(validatorDialog = new ValidatorDialog());
addToggleDialog(filterDialog = new FilterDialog());
- addToggleDialog(new ChangesetDialog(this), true);
+ addToggleDialog(new ChangesetDialog(), true);
addToggleDialog(new MapPaintDialog());
+ toolBarToggle.setFloatable(false);
// status line below the map
statusLine = new MapStatus(this);
MapView.addLayerChangeListener(this);
+
+ boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
+ if (unregisterTab) {
+ for (JComponent c: allDialogButtons) c.setFocusTraversalKeysEnabled(false);
+ for (JComponent c: allMapModeButtons) c.setFocusTraversalKeysEnabled(false);
+ }
}
public boolean selectSelectTool(boolean onlyIfModeless) {
@@ -261,6 +268,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
* Called as some kind of destructor when the last layer has been removed.
* Delegates the call to all Destroyables within this component (e.g. MapModes)
*/
+ @Override
public void destroy() {
MapView.removeLayerChangeListener(this);
dialogsPanel.destroy();
@@ -276,15 +284,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
}
}
- // MapFrame gets destroyed when the last layer is removed, but the status line background
- // thread that collects the information doesn't get destroyed automatically.
- if(statusLine.thread != null) {
- try {
- statusLine.thread.interrupt();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+ statusLine.destroy();
mapView.destroy();
}
@@ -310,7 +310,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
public IconToggleButton addToggleDialog(final ToggleDialog dlg, boolean isExpert) {
final IconToggleButton button = new IconToggleButton(dlg.getToggleAction(), isExpert);
button.setShowHideButtonListener(dlg);
- addHideContextMenu(button);
+ button.setInheritsPopupMenu(true);
dlg.setButton(button);
toolBarToggle.add(button);
allDialogs.add(dlg);
@@ -325,19 +325,20 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
public void addMapMode(IconToggleButton b) {
- toolBarActions.add(b);
- toolGroup.add(b);
- allMapModeButtons.add(b);
if (b.getAction() instanceof MapMode) {
mapModes.add((MapMode) b.getAction());
} else
throw new IllegalArgumentException("MapMode action must be subclass of MapMode");
- addHideContextMenu(b);
+ allMapModeButtons.add(b);
+ toolBarActionsGroup.add(b);
+ toolBarActions.add(b);
b.applyButtonHiddenPreferences();
+ b.setInheritsPopupMenu(true);
}
/**
* Fires an property changed event "visible".
+ * @param aFlag {@code true} if display should be visible
*/
@Override public void setVisible(boolean aFlag) {
boolean old = isVisible();
@@ -352,8 +353,8 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
* old MapMode and register on the new one. Now this function also verifies
* if new map mode is correct mode for current layer and does not change mode
* in such cases.
- * @param mapMode The new mode to set.
- * @return
+ * @param newMapMode The new mode to set.
+ * @return {@code true} if mode is really selected
*/
public boolean selectMapMode(MapMode newMapMode) {
return selectMapMode(newMapMode, mapView.getActiveLayer());
@@ -362,9 +363,9 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
/**
* Another version of the selectMapMode for changing layer action.
* Pass newly selected layer to this method.
- * @param newMapMode
- * @param newLayer
- * @return True if mode is really selected
+ * @param newMapMode The new mode to set.
+ * @param newLayer newly selected layer
+ * @return {@code true} if mode is really selected
*/
public boolean selectMapMode(MapMode newMapMode, Layer newLayer) {
if (newMapMode == null || !newMapMode.layerIsSupported(newLayer))
@@ -391,90 +392,127 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
*/
public void fillPanel(Container panel) {
panel.add(this, BorderLayout.CENTER);
- JToolBar jb = new JToolBar(JToolBar.VERTICAL);
- jb.setFloatable(false);
+
+ /**
+ * sideToolBar: add map modes icons
+ */
+ if(Main.pref.getBoolean("sidetoolbar.mapmodes.visible", true)) {
toolBarActions.setAlignmentX(0.5f);
- jb.add(toolBarActions);
- listAllMapModesButton.setAlignmentX(0.5f);
- listAllMapModesButton.setBorder(null);
- listAllMapModesButton.setFont(listAllMapModesButton.getFont().deriveFont(Font.PLAIN));
- jb.add(listAllMapModesButton);
-
- if(Main.pref.getBoolean("sidetoolbar.togglevisible", true)) {
- jb.addSeparator(new Dimension(0,18));
+ toolBarActions.setInheritsPopupMenu(true);
+ sideToolBar.add(toolBarActions);
+ listAllMapModesButton.setAlignmentX(0.5f);
+ listAllMapModesButton.setBorder(null);
+ listAllMapModesButton.setFont(listAllMapModesButton.getFont().deriveFont(Font.PLAIN));
+ listAllMapModesButton.setInheritsPopupMenu(true);
+ sideToolBar.add(listAllMapModesButton);
+ }
+
+ /**
+ * sideToolBar: add toggle dialogs icons
+ */
+ if(Main.pref.getBoolean("sidetoolbar.toggledialogs.visible", true)) {
+ ((JToolBar)sideToolBar).addSeparator(new Dimension(0,18));
toolBarToggle.setAlignmentX(0.5f);
- jb.add(toolBarToggle);
+ toolBarToggle.setInheritsPopupMenu(true);
+ sideToolBar.add(toolBarToggle);
listAllToggleDialogsButton.setAlignmentX(0.5f);
listAllToggleDialogsButton.setBorder(null);
listAllToggleDialogsButton.setFont(listAllToggleDialogsButton.getFont().deriveFont(Font.PLAIN));
- jb.add(listAllToggleDialogsButton);
+ listAllToggleDialogsButton.setInheritsPopupMenu(true);
+ sideToolBar.add(listAllToggleDialogsButton);
}
- final Component toToggle;
- if (Main.pref.getBoolean("sidetoolbar.scrollable", true)) {
- final ScrollViewport svp = new ScrollViewport(jb, ScrollViewport.VERTICAL_DIRECTION);
- toToggle = svp;
- panel.add(svp, BorderLayout.WEST);
- jb.addMouseWheelListener(new MouseWheelListener() {
-
- public void mouseWheelMoved(MouseWheelEvent e) {
- svp.scroll(0, e.getUnitsToScroll() * 5);
+ /**
+ * sideToolBar: add dynamic popup menu
+ */
+ sideToolBar.setComponentPopupMenu(new JPopupMenu() {
+ static final int staticMenuEntryCount = 2;
+ JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
+ Main.pref.put("sidetoolbar.always-visible", sel);
}
});
- } else {
- toToggle = jb;
- panel.add(jb, BorderLayout.WEST);
+ {
+ addPopupMenuListener(new PopupMenuListener() {
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ final Object src = ((JPopupMenu)e.getSource()).getInvoker();
+ if (src instanceof IconToggleButton) {
+ insert(new Separator(), 0);
+ insert(new AbstractAction() {
+ {
+ putValue(NAME, tr("Hide this button"));
+ putValue(SHORT_DESCRIPTION, tr("Click the arrow at the bottom to show it again."));
}
- toToggle.setVisible(Main.pref.getBoolean("sidetoolbar.visible", true));
-
- jb.addMouseListener(new PopupMenuLauncher(new JPopupMenu() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ ((IconToggleButton)src).setButtonHidden(true);
+ validateToolBarsVisibility();
+ }
+ }, 0);
+ }
+ doNotHide.setSelected(Main.pref.getBoolean("sidetoolbar.always-visible", true));
+ }
+ @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ while (getComponentCount() > staticMenuEntryCount) {
+ remove(0);
+ }
+ }
+ @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {}
+ });
- {
add(new AbstractAction(tr("Hide edit toolbar")) {
-
@Override
public void actionPerformed(ActionEvent e) {
Main.pref.put("sidetoolbar.visible", false);
}
});
+ add(doNotHide);
}
- }));
+ });
+ ((JToolBar)sideToolBar).setFloatable(false);
+ /**
+ * sideToolBar: decide scroll- and visibility
+ */
+ if(Main.pref.getBoolean("sidetoolbar.scrollable", true)) {
+ final ScrollViewport svp = new ScrollViewport(sideToolBar, ScrollViewport.VERTICAL_DIRECTION);
+ svp.addMouseWheelListener(new MouseWheelListener() {
+ @Override
+ public void mouseWheelMoved(MouseWheelEvent e) {
+ svp.scroll(0, e.getUnitsToScroll() * 5);
+ }
+ });
+ sideToolBar = svp;
+ }
+ sideToolBar.setVisible(Main.pref.getBoolean("sidetoolbar.visible", true));
sidetoolbarPreferencesChangedListener = new Preferences.PreferenceChangedListener() {
-
@Override
public void preferenceChanged(PreferenceChangeEvent e) {
if ("sidetoolbar.visible".equals(e.getKey())) {
- toToggle.setVisible(Main.pref.getBoolean("sidetoolbar.visible"));
+ sideToolBar.setVisible(Main.pref.getBoolean("sidetoolbar.visible"));
}
}
};
Main.pref.addPreferenceChangeListener(sidetoolbarPreferencesChangedListener);
+ /**
+ * sideToolBar: add it to the panel
+ */
+ panel.add(sideToolBar, BorderLayout.WEST);
+
+ /**
+ * statusLine: add to panel
+ */
if (statusLine != null && Main.pref.getBoolean("statusline.visible", true)) {
panel.add(statusLine, BorderLayout.SOUTH);
}
}
- private void addHideContextMenu(final IconToggleButton b) {
- //context menu
- b.addMouseListener(new PopupMenuLauncher(new JPopupMenu() {
- {
- add(new AbstractAction() {
- {
- putValue(NAME, tr("Hide this button"));
- putValue(SHORT_DESCRIPTION, tr("Click the arrow at the bottom to show it again."));
- }
- @Override
- public void actionPerformed(ActionEvent e) {
- b.setButtonHidden(true);
- validateToolBarsVisibility();
- }
- });
- }
- }));
- }
-
class ListAllButtonsAction extends AbstractAction {
private JButton button;
@@ -543,15 +581,24 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
return dialogsPanel.getToggleDialog(type);
}
+ public void setDialogsPanelVisible(boolean visible) {
+ rememberToggleDialogWidth();
+ dialogsPanel.setVisible(visible);
+ splitPane.setDividerLocation(visible?splitPane.getWidth()-Main.pref.getInteger("toggleDialogs.width",DEF_TOGGLE_DLG_WIDTH):0);
+ splitPane.setDividerSize(visible?5:0);
+ }
+
/**
* Remember the current width of the (possibly resized) toggle dialog area
*/
public void rememberToggleDialogWidth() {
- Main.pref.putInteger("toggleDialogs.width", dialogsPanel.getWidth());
+ if (dialogsPanel.isVisible()) {
+ Main.pref.putInteger("toggleDialogs.width", splitPane.getWidth()-splitPane.getDividerLocation());
+ }
}
- /*
- * Remove panel from top of MapView by class
+ /**
+ * Remove panel from top of MapView by class
*/
public void removeTopPanel(Class<?> type) {
int n = leftPanel.getComponentCount();
@@ -560,7 +607,6 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
if (type.isInstance(c)) {
leftPanel.remove(i);
leftPanel.doLayout();
- // repaint();
return;
}
}
@@ -652,7 +698,7 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
// After all listeners notice new layer, some buttons will be disabled/enabled
// and possibly need to be hidden/shown.
SwingUtilities.invokeLater(new Runnable() {
- public void run() {
+ @Override public void run() {
validateToolBarsVisibility();
}
});
diff --git a/src/org/openstreetmap/josm/gui/MapFrameListener.java b/src/org/openstreetmap/josm/gui/MapFrameListener.java
new file mode 100644
index 0000000..6433470
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/MapFrameListener.java
@@ -0,0 +1,18 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.gui;
+
+/**
+ * Listener notified of MapFrame changes.
+ * @since 5957
+ */
+public interface MapFrameListener {
+
+ /**
+ * Called after Main.mapFrame is initalized. (After the first data is loaded).
+ * You can use this callback to tweak the newFrame to your needs, as example install
+ * an alternative Painter.
+ * @param oldFrame The old MapFrame
+ * @param newFrame The new MapFrame
+ */
+ public abstract void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame);
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/gui/MapMover.java b/src/org/openstreetmap/josm/gui/MapMover.java
index e2d7c86..8753837 100644
--- a/src/org/openstreetmap/josm/gui/MapMover.java
+++ b/src/org/openstreetmap/josm/gui/MapMover.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -39,6 +39,7 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
public ZoomerAction(String action) {
this.action = action;
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (action.equals(".") || action.equals(",")) {
Point mouse = nc.getMousePosition();
@@ -120,6 +121,7 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
/**
* If the right (and only the right) mouse button is pressed, move the map
*/
+ @Override
public void mouseDragged(MouseEvent e) {
int offMask = MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK;
if ((e.getModifiersEx() & (MouseEvent.BUTTON3_DOWN_MASK | offMask)) == MouseEvent.BUTTON3_DOWN_MASK) {
@@ -186,6 +188,7 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
* Zoom the map by 1/5th of current zoom per wheel-delta.
* @param e The wheel event.
*/
+ @Override
public void mouseWheelMoved(MouseWheelEvent e) {
nc.zoomToFactor(e.getX(), e.getY(), Math.pow(Math.sqrt(2), e.getWheelRotation()));
}
@@ -193,6 +196,7 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
/**
* Emulates dragging on Mac OSX
*/
+ @Override
public void mouseMoved(MouseEvent e) {
if (!movementInPlace)
return;
@@ -219,7 +223,7 @@ public class MapMover extends MouseAdapter implements MouseMotionListener, Mouse
* @return true if we are currently running on OSX
*/
public static boolean isPlatformOsx() {
- return Main.platform != null && Main.platform instanceof PlatformHookOsx;
+ return Main.platform instanceof PlatformHookOsx;
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/MapScaler.java b/src/org/openstreetmap/josm/gui/MapScaler.java
index 22079f9..d305a78 100644
--- a/src/org/openstreetmap/josm/gui/MapScaler.java
+++ b/src/org/openstreetmap/josm/gui/MapScaler.java
@@ -45,6 +45,7 @@ public class MapScaler extends JComponent implements Helpful {
return Main.pref.getColor(marktr("scale"), Color.white);
}
+ @Override
public String helpTopic() {
return ht("/MapView/Scaler");
}
diff --git a/src/org/openstreetmap/josm/gui/MapSlider.java b/src/org/openstreetmap/josm/gui/MapSlider.java
index 8bdab62..9773e38 100644
--- a/src/org/openstreetmap/josm/gui/MapSlider.java
+++ b/src/org/openstreetmap/josm/gui/MapSlider.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -28,6 +28,7 @@ class MapSlider extends JSlider implements PropertyChangeListener, ChangeListene
propertyChange(null);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (getModel().getValueIsAdjusting()) return;
@@ -53,6 +54,7 @@ class MapSlider extends JSlider implements PropertyChangeListener, ChangeListene
preventChange=false;
}
+ @Override
public void stateChanged(ChangeEvent e) {
if (preventChange) return;
@@ -64,6 +66,7 @@ class MapSlider extends JSlider implements PropertyChangeListener, ChangeListene
this.mv.zoomTo(new ProjectionBounds(this.mv.getCenter(), es/fact, n/fact));
}
+ @Override
public String helpTopic() {
return ht("/MapView/Slider");
}
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index acc3f11..7148355 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.AWTEvent;
-import java.awt.Color;
import java.awt.Component;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -16,6 +15,7 @@ import java.awt.Point;
import java.awt.SystemColor;
import java.awt.Toolkit;
import java.awt.event.AWTEventListener;
+import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
@@ -23,30 +23,43 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.List;
+import java.util.TreeSet;
+import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
+import javax.swing.JCheckBoxMenuItem;
import javax.swing.JLabel;
+import javax.swing.JMenuItem;
import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
-import javax.swing.JTextField;
import javax.swing.Popup;
import javax.swing.PopupFactory;
import javax.swing.UIManager;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.CoordinateFormat;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.NavigatableComponent.SoMChangeListener;
import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor.ProgressMonitorDialog;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.ImageLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -63,7 +76,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
*
* @author imi
*/
-public class MapStatus extends JPanel implements Helpful {
+public class MapStatus extends JPanel implements Helpful, Destroyable {
/**
* The MapView this status belongs to.
@@ -71,36 +84,6 @@ public class MapStatus extends JPanel implements Helpful {
final MapView mv;
final Collector collector;
- /**
- * A small user interface component that consists of an image label and
- * a fixed text content to the right of the image.
- */
- static class ImageLabel extends JPanel {
- static Color backColor = Color.decode("#b8cfe5");
- static Color backColorActive = Color.decode("#aaff5e");
-
- private JLabel tf;
- private int chars;
- public ImageLabel(String img, String tooltip, int chars) {
- super();
- setLayout(new GridBagLayout());
- setBackground(backColor);
- add(new JLabel(ImageProvider.get("statusline/"+img+".png")), GBC.std().anchor(GBC.WEST).insets(0,1,1,0));
- add(tf = new JLabel(), GBC.std().fill(GBC.BOTH).anchor(GBC.WEST).insets(2,1,1,0));
- setToolTipText(tooltip);
- this.chars = chars;
- }
- public void setText(String t) {
- tf.setText(t);
- }
- @Override public Dimension getPreferredSize() {
- return new Dimension(25 + chars*tf.getFontMetrics(tf.getFont()).charWidth('0'), super.getPreferredSize().height);
- }
- @Override public Dimension getMinimumSize() {
- return new Dimension(25 + chars*tf.getFontMetrics(tf.getFont()).charWidth('0'), super.getMinimumSize().height);
- }
- }
-
public class BackgroundProgressMonitor implements ProgressMonitorDialog {
private String title;
@@ -114,26 +97,31 @@ public class MapStatus extends JPanel implements Helpful {
}
}
+ @Override
public void setVisible(boolean visible) {
progressBar.setVisible(visible);
}
+ @Override
public void updateProgress(int progress) {
progressBar.setValue(progress);
progressBar.repaint();
MapStatus.this.doLayout();
}
+ @Override
public void setCustomText(String text) {
this.customText = text;
updateText();
}
+ @Override
public void setCurrentAction(String text) {
this.title = text;
updateText();
}
+ @Override
public void setIndeterminate(boolean newValue) {
UIManager.put("ProgressBar.cycleTime", UIManager.getInt("ProgressBar.repaintInterval") * 100);
progressBar.setIndeterminate(newValue);
@@ -142,7 +130,7 @@ public class MapStatus extends JPanel implements Helpful {
@Override
public void appendLogMessage(String message) {
if (message != null && !message.isEmpty()) {
- System.out.println("appendLogMessage not implemented for background tasks. Message was: " + message);
+ Main.info("appendLogMessage not implemented for background tasks. Message was: " + message);
}
}
@@ -150,7 +138,7 @@ public class MapStatus extends JPanel implements Helpful {
final ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 11);
final ImageLabel nameText = new ImageLabel("name", tr("The name of the object at the mouse pointer."), 20);
- final JTextField helpText = new JTextField();
+ final JosmTextField helpText = new JosmTextField();
final ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 11);
final ImageLabel angleText = new ImageLabel("angle", tr("The angle between the previous and the current way segment."), 6);
final ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6);
@@ -158,11 +146,15 @@ public class MapStatus extends JPanel implements Helpful {
final JProgressBar progressBar = new JProgressBar();
public final BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor();
+ private final SoMChangeListener somListener;
+
+ private double distValue; // Distance value displayed in distText, stored if refresh needed after a change of system of measurement
+
/**
* This is the thread that runs in the background and collects the information displayed.
- * It gets destroyed by MapFrame.java/destroy() when the MapFrame itself is destroyed.
+ * It gets destroyed by destroy() when the MapFrame itself is destroyed.
*/
- public Thread thread;
+ private Thread thread;
private final List<StatusTextHistory> statusText = new ArrayList<StatusTextHistory>();
@@ -217,6 +209,7 @@ public class MapStatus extends JPanel implements Helpful {
/**
* Execution function for the Collector.
*/
+ @Override
public void run() {
registerListeners();
try {
@@ -225,7 +218,12 @@ public class MapStatus extends JPanel implements Helpful {
final MouseState ms = new MouseState();
synchronized (this) {
// TODO Would be better if the timeout wasn't necessary
- try {wait(1000);} catch (InterruptedException e) {}
+ try {
+ wait(1000);
+ } catch (InterruptedException e) {
+ // Occurs frequently during JOSM shutdown, log set to debug only
+ Main.debug("InterruptedException in "+MapStatus.class.getSimpleName());
+ }
ms.modifiers = mouseState.modifiers;
ms.mousePos = mouseState.mousePos;
}
@@ -280,19 +278,17 @@ public class MapStatus extends JPanel implements Helpful {
// Set the text label in the bottom status bar
// "if mouse moved only" was added to stop heap growing
- if (!mouseNotMoved) statusBarElementUpdate(ms);
+ if (!mouseNotMoved) {
+ statusBarElementUpdate(ms);
+ }
// Popup Information
// display them if the middle mouse button is pressed and
// keep them until the mouse is moved
- if (middleMouseDown || isAtOldPosition)
- {
+ if (middleMouseDown || isAtOldPosition) {
Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos, OsmPrimitive.isUsablePredicate);
- if (osms == null)
- return;
-
final JPanel c = new JPanel(new GridBagLayout());
final JLabel lbl = new JLabel(
"<html>"+tr("Middle click again to cycle through.<br>"+
@@ -317,7 +313,7 @@ public class MapStatus extends JPanel implements Helpful {
// These labels may need to be updated from the outside
// so collect them
- List<JLabel> lbls = new ArrayList<JLabel>();
+ List<JLabel> lbls = new ArrayList<JLabel>(osms.size());
for (final OsmPrimitive osm : osms) {
JLabel l = popupBuildPrimitiveLabels(osm);
lbls.add(l);
@@ -331,9 +327,9 @@ public class MapStatus extends JPanel implements Helpful {
oldMousePos = ms.mousePos;
} catch (ConcurrentModificationException x) {
- //x.printStackTrace();
+ Main.warn(x);
} catch (NullPointerException x) {
- //x.printStackTrace();
+ Main.warn(x);
} finally {
if (ds != null) {
if(isAtOldPosition && middleMouseDown) {
@@ -345,8 +341,11 @@ public class MapStatus extends JPanel implements Helpful {
}
}
});
- } catch (Exception e) {
-
+ } catch (InterruptedException e) {
+ // Occurs frequently during JOSM shutdown, log set to debug only
+ Main.debug("InterruptedException in "+MapStatus.class.getSimpleName());
+ } catch (InvocationTargetException e) {
+ Main.warn(e);
}
}
} finally {
@@ -362,7 +361,7 @@ public class MapStatus extends JPanel implements Helpful {
* @param ms
* @return popup
*/
- private final Popup popupCreatePopup(Component content, MouseState ms) {
+ private Popup popupCreatePopup(Component content, MouseState ms) {
Point p = mv.getLocationOnScreen();
Dimension scrn = Toolkit.getDefaultToolkit().getScreenSize();
@@ -398,7 +397,7 @@ public class MapStatus extends JPanel implements Helpful {
* Calls this to update the element that is shown in the statusbar
* @param ms
*/
- private final void statusBarElementUpdate(MouseState ms) {
+ private void statusBarElementUpdate(MouseState ms) {
final OsmPrimitive osmNearest = mv.getNearestNodeOrWay(ms.mousePos, OsmPrimitive.isUsablePredicate, false);
if (osmNearest != null) {
nameText.setText(osmNearest.getDisplayName(DefaultNameFormatter.getInstance()));
@@ -410,10 +409,10 @@ public class MapStatus extends JPanel implements Helpful {
/**
* Call this with a set of primitives to cycle through them. Method
* will automatically select the next item and update the map
- * @param osms
- * @param mouse modifiers
+ * @param osms primitives to cycle through
+ * @param mods modifiers (i.e. control keys)
*/
- private final void popupCycleSelection(Collection<OsmPrimitive> osms, int mods) {
+ private void popupCycleSelection(Collection<OsmPrimitive> osms, int mods) {
DataSet ds = Main.main.getCurrentDataSet();
// Find some items that are required for cycling through
OsmPrimitive firstItem = null;
@@ -451,31 +450,34 @@ public class MapStatus extends JPanel implements Helpful {
/**
* Tries to hide the given popup
- * @param popup
*/
- private final void popupHidePopup() {
+ private void popupHidePopup() {
popupLabels = null;
if(popup == null)
return;
final Popup staticPopup = popup;
popup = null;
EventQueue.invokeLater(new Runnable(){
- public void run() { staticPopup.hide(); }});
+ @Override
+ public void run() {
+ staticPopup.hide();
+ }});
}
/**
- * Tries to show the given popup, can be hidden using popupHideOldPopup
+ * Tries to show the given popup, can be hidden using {@link #popupHidePopup}
* If an old popup exists, it will be automatically hidden
- * @param popup
+ * @param newPopup popup to show
+ * @param lbls lables to show (see {@link #popupLabels})
*/
- private final void popupShowPopup(Popup newPopup, List<JLabel> lbls) {
+ private void popupShowPopup(Popup newPopup, List<JLabel> lbls) {
final Popup staticPopup = newPopup;
if(this.popup != null) {
// If an old popup exists, remove it when the new popup has been
// drawn to keep flickering to a minimum
final Popup staticOldPopup = this.popup;
EventQueue.invokeLater(new Runnable(){
- public void run() {
+ @Override public void run() {
staticPopup.show();
staticOldPopup.hide();
}
@@ -483,7 +485,7 @@ public class MapStatus extends JPanel implements Helpful {
} else {
// There is no old popup
EventQueue.invokeLater(new Runnable(){
- public void run() { staticPopup.show(); }});
+ @Override public void run() { staticPopup.show(); }});
}
this.popupLabels = lbls;
this.popup = newPopup;
@@ -494,7 +496,7 @@ public class MapStatus extends JPanel implements Helpful {
* outside of this class. This is the case when CTRL is pressed and the
* user clicks on the map instead of the popup.
*/
- private final void popupUpdateLabels() {
+ private void popupUpdateLabels() {
if(this.popup == null || this.popupLabels == null)
return;
for(JLabel l : this.popupLabels) {
@@ -509,7 +511,7 @@ public class MapStatus extends JPanel implements Helpful {
* @param lbl The label to color
* @param osm The primitive to derive the colors from
*/
- private final void popupSetLabelColors(JLabel lbl, OsmPrimitive osm) {
+ private void popupSetLabelColors(JLabel lbl, OsmPrimitive osm) {
DataSet ds = Main.main.getCurrentDataSet();
if(ds.isSelected(osm)) {
lbl.setBackground(SystemColor.textHighlight);
@@ -524,19 +526,19 @@ public class MapStatus extends JPanel implements Helpful {
* Builds the labels with all necessary listeners for the info popup for the
* given OsmPrimitive
* @param osm The primitive to create the label for
- * @return
+ * @return labels for info popup
*/
- private final JLabel popupBuildPrimitiveLabels(final OsmPrimitive osm) {
+ private JLabel popupBuildPrimitiveLabels(final OsmPrimitive osm) {
final StringBuilder text = new StringBuilder();
String name = osm.getDisplayName(DefaultNameFormatter.getInstance());
if (osm.isNewOrUndeleted() || osm.isModified()) {
name = "<i><b>"+ name + "*</b></i>";
}
text.append(name);
-
+
boolean idShown = Main.pref.getBoolean("osm-primitives.showid");
// fix #7557 - do not show ID twice
-
+
if (!osm.isNew() && !idShown) {
text.append(" [id="+osm.getId()+"]");
}
@@ -586,11 +588,11 @@ public class MapStatus extends JPanel implements Helpful {
// will not be highlighted, making it confusing. The MotionListener
// can correct this defect.
l.addMouseMotionListener(new MouseMotionListener() {
- public void mouseMoved(MouseEvent e) {
+ @Override public void mouseMoved(MouseEvent e) {
l.setBackground(SystemColor.info);
l.setForeground(SystemColor.infoText);
}
- public void mouseDragged(MouseEvent e) {
+ @Override public void mouseDragged(MouseEvent e) {
l.setBackground(SystemColor.info);
l.setForeground(SystemColor.infoText);
}
@@ -613,7 +615,8 @@ public class MapStatus extends JPanel implements Helpful {
MouseState mouseState = new MouseState();
private AWTEventListener awtListener = new AWTEventListener() {
- public void eventDispatched(AWTEvent event) {
+ @Override
+ public void eventDispatched(AWTEvent event) {
if (event instanceof InputEvent &&
((InputEvent)event).getComponent() == mv) {
synchronized (collector) {
@@ -628,6 +631,7 @@ public class MapStatus extends JPanel implements Helpful {
};
private MouseMotionListener mouseMotionListener = new MouseMotionListener() {
+ @Override
public void mouseMoved(MouseEvent e) {
synchronized (collector) {
mouseState.modifiers = e.getModifiersEx();
@@ -636,6 +640,7 @@ public class MapStatus extends JPanel implements Helpful {
}
}
+ @Override
public void mouseDragged(MouseEvent e) {
mouseMoved(e);
}
@@ -685,14 +690,48 @@ public class MapStatus extends JPanel implements Helpful {
this.mv = mapFrame.mapView;
this.collector = new Collector(mapFrame);
- lonText.addMouseListener(Main.main.menu.jumpToAct);
- latText.addMouseListener(Main.main.menu.jumpToAct);
-
+ // Context menu of status bar
+ setComponentPopupMenu(new JPopupMenu() {
+ JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide status bar")) {
+ @Override public void actionPerformed(ActionEvent e) {
+ boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
+ Main.pref.put("statusbar.always-visible", sel);
+ }
+ });
+ JMenuItem jumpButton;
+ {
+ jumpButton = add(Main.main.menu.jumpToAct);
+ addPopupMenuListener(new PopupMenuListener() {
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ Component invoker = ((JPopupMenu)e.getSource()).getInvoker();
+ jumpButton.setVisible(invoker == latText || invoker == lonText);
+ doNotHide.setSelected(Main.pref.getBoolean("statusbar.always-visible", true));
+ }
+ @Override public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
+ @Override public void popupMenuCanceled(PopupMenuEvent e) {}
+ });
+ add(doNotHide);
+ }
+ });
+
+ // also show Jump To dialog on mouse click (except context menu)
+ MouseListener jumpToOnLeftClick = new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (e.getButton() != MouseEvent.BUTTON3) {
+ Main.main.menu.jumpToAct.showJumpToDialog();
+ }
+ }
+ };
+
// Listen for mouse movements and set the position text field
mv.addMouseMotionListener(new MouseMotionListener(){
+ @Override
public void mouseDragged(MouseEvent e) {
mouseMoved(e);
}
+ @Override
public void mouseMoved(MouseEvent e) {
if (mv.center == null)
return;
@@ -709,12 +748,41 @@ public class MapStatus extends JPanel implements Helpful {
setLayout(new GridBagLayout());
setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+ latText.setInheritsPopupMenu(true);
+ lonText.setInheritsPopupMenu(true);
+ headingText.setInheritsPopupMenu(true);
+ //angleText.setInheritsPopupMenu(true);
+ distText.setInheritsPopupMenu(true);
+ nameText.setInheritsPopupMenu(true);
+ //helpText.setInheritsPopupMenu(true);
+ //progressBar.setInheritsPopupMenu(true);
+
add(latText, GBC.std());
add(lonText, GBC.std().insets(3,0,0,0));
add(headingText, GBC.std().insets(3,0,0,0));
add(angleText, GBC.std().insets(3,0,0,0));
add(distText, GBC.std().insets(3,0,0,0));
+ distText.addMouseListener(new MouseAdapter() {
+ private final List<String> soms = new ArrayList<String>(new TreeSet<String>(NavigatableComponent.SYSTEMS_OF_MEASUREMENT.keySet()));
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ String som = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();
+ String newsom = soms.get((soms.indexOf(som)+1)%soms.size());
+ NavigatableComponent.setSystemOfMeasurement(newsom);
+ }
+ });
+
+ NavigatableComponent.addSoMChangeListener(somListener = new SoMChangeListener() {
+ @Override public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
+ setDist(distValue);
+ }
+ });
+
+ latText.addMouseListener(jumpToOnLeftClick);
+ lonText.addMouseListener(jumpToOnLeftClick);
+
helpText.setEditable(false);
add(nameText, GBC.std().insets(3,0,0,0));
add(helpText, GBC.std().insets(3,0,0,0).fill(GBC.HORIZONTAL));
@@ -739,11 +807,12 @@ public class MapStatus extends JPanel implements Helpful {
thread.setDaemon(true);
thread.start();
}
-
+
public JPanel getAnglePanel() {
return angleText;
}
+ @Override
public String helpTopic() {
return ht("/Statusline");
}
@@ -794,10 +863,48 @@ public class MapStatus extends JPanel implements Helpful {
public void setHeading(double h) {
headingText.setText(h < 0 ? "--" : Math.round(h*10)/10.0 + " \u00B0");
}
+ /**
+ * Sets the distance text to the given value
+ * @param dist The distance value to display, in meters
+ */
public void setDist(double dist) {
+ distValue = dist;
distText.setText(dist < 0 ? "--" : NavigatableComponent.getDistText(dist));
}
+ /**
+ * Sets the distance text to the total sum of given ways length
+ * @param ways The ways to consider for the total distance
+ * @since 5991
+ */
+ public void setDist(Collection<Way> ways) {
+ double dist = -1;
+ // Compute total length of selected way(s) until an arbitrary limit set to 250 ways
+ // in order to prevent performance issue if a large number of ways are selected (old behaviour kept in that case, see #8403)
+ int maxWays = Math.max(1, Main.pref.getInteger("selection.max-ways-for-statusline", 250));
+ if (!ways.isEmpty() && ways.size() <= maxWays) {
+ dist = 0.0;
+ for (Way w : ways) {
+ dist += w.getLength();
+ }
+ }
+ setDist(dist);
+ }
public void activateAnglePanel(boolean activeFlag) {
angleText.setBackground(activeFlag ? ImageLabel.backColorActive : ImageLabel.backColor);
}
+
+ @Override
+ public void destroy() {
+ NavigatableComponent.removeSoMChangeListener(somListener);
+
+ // MapFrame gets destroyed when the last layer is removed, but the status line background
+ // thread that collects the information doesn't get destroyed automatically.
+ if (thread != null) {
+ try {
+ thread.interrupt();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index e0e1b27..6a31d35 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -5,12 +5,15 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.AlphaComposite;
import java.awt.Color;
+import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.awt.geom.Area;
@@ -22,7 +25,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -40,6 +42,7 @@ import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.DataSource;
@@ -53,8 +56,10 @@ import org.openstreetmap.josm.gui.layer.MapViewPaintable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.AudioPlayer;
import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.Shortcut;
/**
* This is a component used in the {@link MapFrame} for browsing the map. It use is to
@@ -75,20 +80,20 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
* @author imi
*/
public interface LayerChangeListener {
-
+
/**
* Notifies this listener that the active layer has changed.
* @param oldLayer The previous active layer
* @param newLayer The new activer layer
*/
void activeLayerChange(Layer oldLayer, Layer newLayer);
-
+
/**
* Notifies this listener that a layer has been added.
* @param newLayer The new added layer
*/
void layerAdded(Layer newLayer);
-
+
/**
* Notifies this listener that a layer has been removed.
* @param oldLayer The old removed layer
@@ -204,7 +209,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
*/
public MouseEvent lastMEvent = new MouseEvent(this, 0, 0, 0, 0, 0, 0, false); // In case somebody reads it before first mouse move
- private LinkedList<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
+ private final List<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
private BufferedImage nonChangedLayersBuffer;
private BufferedImage offscreenBuffer;
@@ -225,6 +230,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
*/
public MapView(final JPanel contentPane, final ViewportData viewportData) {
Main.pref.addPreferenceChangeListener(this);
+ final boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
addComponentListener(new ComponentAdapter(){
@Override public void componentResized(ComponentEvent e) {
@@ -233,6 +239,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
MapSlider zoomSlider = new MapSlider(MapView.this);
add(zoomSlider);
zoomSlider.setBounds(3, 0, 114, 30);
+ zoomSlider.setFocusTraversalKeysEnabled(!unregisterTab);
MapScaler scaler = new MapScaler(MapView.this);
add(scaler);
@@ -260,13 +267,36 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
//store the last mouse action
this.addMouseMotionListener(new MouseMotionListener() {
- public void mouseDragged(MouseEvent e) {
+ @Override public void mouseDragged(MouseEvent e) {
mouseMoved(e);
}
- public void mouseMoved(MouseEvent e) {
+ @Override public void mouseMoved(MouseEvent e) {
lastMEvent = e;
}
});
+ this.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mousePressed(MouseEvent me) {
+ // focus the MapView component when mouse is pressed inside it
+ requestFocus();
+ }
+ });
+
+ if (Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null) {
+ setFocusTraversalKeysEnabled(false);
+ }
+ }
+
+ // remebered geometry of the component
+ private Dimension oldSize = null;
+ private Point oldLoc = null;
+
+ /*
+ * Call this method to keep map position on screen during next repaint
+ */
+ public void rememberLastPositionOnScreen() {
+ oldSize = getSize();
+ oldLoc = getLocationOnScreen();
}
/**
@@ -404,7 +434,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
if (layer == activeLayer) {
setActiveLayer(determineNextActiveLayer(layersList), false);
}
-
+
if (layer instanceof OsmDataLayer) {
((OsmDataLayer)layer).removeLayerPropertyChangeListener(this);
}
@@ -469,7 +499,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
* first, layer with the highest Z-Order last.
*/
protected List<Layer> getVisibleLayersInZOrder() {
- ArrayList<Layer> ret = new ArrayList<Layer>();
+ List<Layer> ret = new ArrayList<Layer>();
for (Layer l: layers) {
if (l.isVisible()) {
ret.add(l);
@@ -482,7 +512,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
Collections.sort(
ret,
new Comparator<Layer>() {
- public int compare(Layer l1, Layer l2) {
+ @Override public int compare(Layer l1, Layer l2) {
if (l1 instanceof OsmDataLayer && l2 instanceof OsmDataLayer) {
if (l1 == getActiveLayer()) return -1;
if (l2 == getActiveLayer()) return 1;
@@ -514,6 +544,17 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
if (center == null)
return; // no data loaded yet.
+ // if the position was remembered, we need to adjust center once before repainting
+ if (oldLoc != null && oldSize != null) {
+ Point l1 = getLocationOnScreen();
+ final EastNorth newCenter = new EastNorth(
+ center.getX()+ (l1.x-oldLoc.x - (oldSize.width-getWidth())/2.0)*getScale(),
+ center.getY()+ (oldLoc.y-l1.y + (oldSize.height-getHeight())/2.0)*getScale()
+ );
+ oldLoc = null; oldSize = null;
+ zoomTo(newCenter);
+ }
+
List<Layer> visibleLayers = getVisibleLayersInZOrder();
int nonChangedLayersCount = 0;
@@ -526,7 +567,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
}
boolean canUseBuffer;
-
+
synchronized (this) {
canUseBuffer = !paintPreferencesChanged;
paintPreferencesChanged = false;
@@ -594,8 +635,8 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
// draw world borders
tempG.setColor(Color.WHITE);
Bounds b = getProjection().getWorldBoundsLatLon();
- double lat = b.getMin().lat();
- double lon = b.getMin().lon();
+ double lat = b.getMinLat();
+ double lon = b.getMinLon();
Point p = getPoint(b.getMin());
@@ -614,13 +655,13 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
p = getPoint(new LatLon(lat, lon >= max ? max : lon));
path.lineTo(p.x, p.y);
}
- lon = max; max = b.getMin().lat();
+ lon = max; max = b.getMinLat();
for(; lat >= max; lat -= 1.0)
{
p = getPoint(new LatLon(lat <= max ? max : lat, lon));
path.lineTo(p.x, p.y);
}
- lat = max; max = b.getMin().lon();
+ lat = max; max = b.getMinLon();
for(; lon >= max; lon -= 1.0)
{
p = getPoint(new LatLon(lat, lon <= max ? max : lon));
@@ -671,14 +712,14 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
* @return An unmodifiable collection of all layers
*/
public Collection<Layer> getAllLayers() {
- return Collections.unmodifiableCollection(layers);
+ return Collections.unmodifiableCollection(new ArrayList<Layer>(layers));
}
/**
* @return An unmodifiable ordered list of all layers
*/
public List<Layer> getAllLayersAsList() {
- return Collections.unmodifiableList(layers);
+ return Collections.unmodifiableList(new ArrayList<Layer>(layers));
}
/**
@@ -692,7 +733,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
* @return an unmodifiable list of layers of a certain type.
*/
public <T> List<T> getLayersOfType(Class<T> ofType) {
- ArrayList<T> ret = new ArrayList<T>();
+ List<T> ret = new ArrayList<T>();
for (Layer layer : getAllLayersAsList()) {
if (ofType.isInstance(layer)) {
ret.add(ofType.cast(layer));
@@ -779,16 +820,22 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
* the user to re-select the tool after i.e. moving a layer. While testing I found
* that I switch layers and actions at the same time and it was annoying to mind the
* order. This way it works as visual clue for new users */
- for (Enumeration<AbstractButton> e = Main.map.toolGroup.getElements() ; e.hasMoreElements() ;) {
- AbstractButton button = e.nextElement();
- MapMode mode = (MapMode)button.getAction();
- boolean isLayerSupported = mode.layerIsSupported(layer);
- button.setEnabled(isLayerSupported);
- // Also update associated shortcut (fix #6876)
- if (isLayerSupported) {
- Main.registerActionShortcut(mode, mode.getShortcut());
+ for (final AbstractButton b: Main.map.allMapModeButtons) {
+ MapMode mode = (MapMode)b.getAction();
+ if (mode.layerIsSupported(layer)) {
+ Main.registerActionShortcut(mode, mode.getShortcut()); //fix #6876
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ b.setEnabled(true);
+ }
+ });
} else {
Main.unregisterShortcut(mode.getShortcut());
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ b.setEnabled(false);
+ }
+ });
}
}
AudioPlayer.reset();
@@ -858,6 +905,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
return temporaryLayers.remove(mvp);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(Layer.VISIBLE_PROP)) {
repaint();
@@ -893,7 +941,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
}
private SelectionChangedListener repaintSelectionChangedListener = new SelectionChangedListener(){
- public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+ @Override public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
repaint();
}
};
@@ -905,6 +953,12 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
if (mapMover != null) {
mapMover.destroy();
}
+ activeLayer = null;
+ changedLayer = null;
+ editLayer = null;
+ layers.clear();
+ nonChangedLayers.clear();
+ temporaryLayers.clear();
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/MenuScroller.java b/src/org/openstreetmap/josm/gui/MenuScroller.java
index d6764f8..2e0ba6b 100644
--- a/src/org/openstreetmap/josm/gui/MenuScroller.java
+++ b/src/org/openstreetmap/josm/gui/MenuScroller.java
@@ -1,5 +1,6 @@
/**
- * @(#)MenuScroller.java 1.5.0 04/02/12
+ * MenuScroller.java 1.5.0 04/02/12
+ * License: use / modify without restrictions (see http://tips4java.wordpress.com/about/)
*/
package org.openstreetmap.josm.gui;
@@ -36,7 +37,6 @@ import javax.swing.event.PopupMenuListener;
*/
public class MenuScroller {
- //private JMenu menu;
private JPopupMenu menu;
private Component[] menuItems;
private MenuScrollItem upItem;
@@ -436,7 +436,7 @@ public class MenuScroller {
* @see MenuScroller#dispose()
*/
@Override
- public void finalize() throws Throwable {
+ protected void finalize() throws Throwable {
dispose();
}
@@ -453,7 +453,7 @@ public class MenuScroller {
menu.add(menuItems[i]);
}
if (topFixedCount > 0) {
- menu.addSeparator();
+ menu.addSeparator();
}
menu.add(upItem);
@@ -480,7 +480,7 @@ public class MenuScroller {
parent.repaint();
}
}
-
+
private class MenuScrollListener implements PopupMenuListener {
@Override
@@ -595,8 +595,9 @@ public class MenuScroller {
return 10;
}
}
-
+
private class MouseScrollListener implements MouseWheelListener {
+ @Override
public void mouseWheelMoved(MouseWheelEvent mwe) {
if (menu.getComponents().length > scrollCount) {
firstIndex += mwe.getWheelRotation();
diff --git a/src/org/openstreetmap/josm/gui/NameFormatterHook.java b/src/org/openstreetmap/josm/gui/NameFormatterHook.java
index 40035a6..766cf57 100644
--- a/src/org/openstreetmap/josm/gui/NameFormatterHook.java
+++ b/src/org/openstreetmap/josm/gui/NameFormatterHook.java
@@ -14,7 +14,7 @@ public interface NameFormatterHook {
* @return The corrected type name if needed, null otherwise.
*/
public String checkRelationTypeName(IRelation relation, String defaultName);
-
+
/**
* Check the node format. Return the corrected format if needed, null otherwise.
* @param node The node.
@@ -22,14 +22,14 @@ public interface NameFormatterHook {
* @return The corrected format if needed, null otherwise.
*/
public String checkFormat(INode node, String defaultName);
-
+
/**
* Check the way format. Return the corrected format if needed, null otherwise.
* @param way The way.
* @param defaultName The default name generated by core.
* @return The corrected format if needed, null otherwise.
*/
- public String checkFormat(IWay node, String defaultName);
+ public String checkFormat(IWay way, String defaultName);
/**
* Check the relation format. Return the corrected format if needed, null otherwise.
@@ -37,5 +37,5 @@ public interface NameFormatterHook {
* @param defaultName The default name generated by core.
* @return The corrected format if needed, null otherwise.
*/
- public String checkFormat(IRelation node, String defaultName);
+ public String checkFormat(IRelation relation, String defaultName);
}
diff --git a/src/org/openstreetmap/josm/gui/NavigatableComponent.java b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
index 66c0248..a60719c 100644
--- a/src/org/openstreetmap/josm/gui/NavigatableComponent.java
+++ b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
@@ -10,6 +10,7 @@ import java.awt.Polygon;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
+import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -20,6 +21,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.Stack;
import java.util.TreeMap;
@@ -65,6 +67,19 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
/**
+ * Interface to notify listeners of the change of the system of measurement.
+ * @since 6056
+ */
+ public interface SoMChangeListener {
+ /**
+ * The current SoM has changed.
+ * @param oldSoM The old system of measurement
+ * @param newSoM The new (current) system of measurement
+ */
+ void systemOfMeasurementChanged(String oldSoM, String newSoM);
+ }
+
+ /**
* Simple data class that keeps map center and scale in one object.
*/
public static class ViewportData {
@@ -130,6 +145,39 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
/**
+ * the SoM listeners
+ */
+ private static final CopyOnWriteArrayList<SoMChangeListener> somChangeListeners = new CopyOnWriteArrayList<SoMChangeListener>();
+
+ /**
+ * Removes a SoM change listener
+ *
+ * @param listener the listener. Ignored if null or already absent
+ * @since 6056
+ */
+ public static void removeSoMChangeListener(NavigatableComponent.SoMChangeListener listener) {
+ somChangeListeners.remove(listener);
+ }
+
+ /**
+ * Adds a SoM change listener
+ *
+ * @param listener the listener. Ignored if null or already registered.
+ * @since 6056
+ */
+ public static void addSoMChangeListener(NavigatableComponent.SoMChangeListener listener) {
+ if (listener != null) {
+ somChangeListeners.addIfAbsent(listener);
+ }
+ }
+
+ protected static void fireSoMChanged(String oldSoM, String newSoM) {
+ for (SoMChangeListener l : somChangeListeners) {
+ l.systemOfMeasurementChanged(oldSoM, newSoM);
+ }
+ }
+
+ /**
* The scale factor in x or y-units per pixel. This means, if scale = 10,
* every physical pixel on screen are 10 x or 10 y units in the
* northing/easting space of the projection.
@@ -143,7 +191,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
private final Object paintRequestLock = new Object();
private Rectangle paintRect = null;
private Polygon paintPoly = null;
-
+
public NavigatableComponent() {
setLayout(null);
}
@@ -154,9 +202,9 @@ public class NavigatableComponent extends JComponent implements Helpful {
private EastNorth calculateDefaultCenter() {
Bounds b = Main.getProjection().getWorldBoundsLatLon();
- double lat = (b.getMax().lat() + b.getMin().lat())/2;
- double lon = (b.getMax().lon() + b.getMin().lon())/2;
-
+ double lat = (b.getMaxLat() + b.getMinLat())/2;
+ double lon = (b.getMaxLon() + b.getMinLon())/2;
+ // FIXME is it correct? b.getCenter() makes some adjustments...
return Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
}
@@ -346,7 +394,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
/**
* Zoom to the given coordinate.
* @param newCenter The center x-value (easting) to zoom to.
- * @param scale The scale to use.
+ * @param newScale The scale to use.
*/
public void zoomTo(EastNorth newCenter, double newScale) {
Bounds b = getProjection().getWorldBoundsLatLon();
@@ -354,25 +402,25 @@ public class NavigatableComponent extends JComponent implements Helpful {
boolean changed = false;
double lat = cl.lat();
double lon = cl.lon();
- if(lat < b.getMin().lat()) {changed = true; lat = b.getMin().lat(); }
- else if(lat > b.getMax().lat()) {changed = true; lat = b.getMax().lat(); }
- if(lon < b.getMin().lon()) {changed = true; lon = b.getMin().lon(); }
- else if(lon > b.getMax().lon()) {changed = true; lon = b.getMax().lon(); }
+ if(lat < b.getMinLat()) {changed = true; lat = b.getMinLat(); }
+ else if(lat > b.getMaxLat()) {changed = true; lat = b.getMaxLat(); }
+ if(lon < b.getMinLon()) {changed = true; lon = b.getMinLon(); }
+ else if(lon > b.getMaxLon()) {changed = true; lon = b.getMaxLon(); }
if(changed) {
newCenter = Projections.project(new LatLon(lat,lon));
}
int width = getWidth()/2;
int height = getHeight()/2;
- LatLon l1 = new LatLon(b.getMin().lat(), lon);
- LatLon l2 = new LatLon(b.getMax().lat(), lon);
+ LatLon l1 = new LatLon(b.getMinLat(), lon);
+ LatLon l2 = new LatLon(b.getMaxLat(), lon);
EastNorth e1 = getProjection().latlon2eastNorth(l1);
EastNorth e2 = getProjection().latlon2eastNorth(l2);
double d = e2.north() - e1.north();
if(d < height*newScale)
{
double newScaleH = d/height;
- e1 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMin().lon()));
- e2 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMax().lon()));
+ e1 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMinLon()));
+ e2 = getProjection().latlon2eastNorth(new LatLon(lat, b.getMaxLon()));
d = e2.east() - e1.east();
if(d < width*newScale) {
newScale = Math.max(newScaleH, d/width);
@@ -395,7 +443,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
/**
* Zoom to the given coordinate without adding to the zoom undo buffer.
* @param newCenter The center x-value (easting) to zoom to.
- * @param scale The scale to use.
+ * @param newScale The scale to use.
*/
private void zoomNoUndoTo(EastNorth newCenter, double newScale) {
if (!newCenter.equals(center)) {
@@ -430,7 +478,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
* animated fashion.
*/
public void smoothScrollTo(EastNorth newCenter) {
- // fixme make these configurable.
+ // FIXME make these configurable.
final int fps = 20; // animation frames per second
final int speed = 1500; // milliseconds for full-screen-width pan
if (!newCenter.equals(center)) {
@@ -443,11 +491,14 @@ public class NavigatableComponent extends JComponent implements Helpful {
new Thread(){
@Override
public void run() {
- for (int i=0; i<frames; i++)
- {
- // fixme - not use zoom history here
+ for (int i=0; i<frames; i++) {
+ // FIXME - not use zoom history here
zoomTo(oldCenter.interpolate(finalNewCenter, (i+1) / frames));
- try { Thread.sleep(1000 / fps); } catch (InterruptedException ex) { };
+ try {
+ Thread.sleep(1000 / fps);
+ } catch (InterruptedException ex) {
+ Main.warn("InterruptedException in "+NavigatableComponent.class.getSimpleName()+" during smooth scrolling");
+ }
}
}
}.start();
@@ -618,9 +669,9 @@ public class NavigatableComponent extends JComponent implements Helpful {
Map<Double, List<Node>> nlists = getNearestNodesImpl(p, predicate);
if (!nlists.isEmpty()) {
Double minDistSq = null;
- List<Node> nlist;
- for (Double distSq : nlists.keySet()) {
- nlist = nlists.get(distSq);
+ for (Entry<Double, List<Node>> entry : nlists.entrySet()) {
+ Double distSq = entry.getKey();
+ List<Node> nlist = entry.getValue();
// filter nodes to be ignored before determining minDistSq..
nlist.removeAll(ignore);
@@ -679,38 +730,81 @@ public class NavigatableComponent extends JComponent implements Helpful {
* give the nearest node that is tagged.
*/
public final Node getNearestNode(Point p, Predicate<OsmPrimitive> predicate, boolean use_selected) {
- Node n = null;
+ return getNearestNode(p, predicate, use_selected, null);
+ }
+
+ /**
+ * The *result* depends on the current map selection state IF use_selected is true
+ *
+ * If more than one node within node.snap-distance pixels is found,
+ * the nearest node selected is returned IF use_selected is true.
+ *
+ * If there are no selected nodes near that point, the node that is related to some of the preferredRefs
+ *
+ * Else the nearest new/id=0 node within about the same distance
+ * as the true nearest node is returned.
+ *
+ * If no such node is found either, the true nearest
+ * node to p is returned.
+ *
+ * Finally, if a node is not found at all, null is returned.
+ * @since 6065
+ * @return A node within snap-distance to point p,
+ * that is chosen by the algorithm described.
+ *
+ * @param p the screen point
+ * @param predicate this parameter imposes a condition on the returned object, e.g.
+ * give the nearest node that is tagged.
+ * @param preferredRefs primitives, whose nodes we prefer
+ */
+ public final Node getNearestNode(Point p, Predicate<OsmPrimitive> predicate,
+ boolean useSelected, Collection<OsmPrimitive> preferredRefs) {
Map<Double, List<Node>> nlists = getNearestNodesImpl(p, predicate);
- if (!nlists.isEmpty()) {
- Node ntsel = null, ntnew = null;
- double minDistSq = nlists.keySet().iterator().next();
-
- for (Double distSq : nlists.keySet()) {
- for (Node nd : nlists.get(distSq)) {
- // find the nearest selected node
- if (ntsel == null && nd.isSelected()) {
- ntsel = nd;
- // if there are multiple nearest nodes, prefer the one
- // that is selected. This is required in order to drag
- // the selected node if multiple nodes have the same
- // coordinates (e.g. after unglue)
- use_selected |= (distSq == minDistSq);
- }
- // find the nearest newest node that is within about the same
- // distance as the true nearest node
- if (ntnew == null && nd.isNew() && (distSq-minDistSq < 1)) {
- ntnew = nd;
+ if (nlists.isEmpty()) return null;
+
+ if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
+ Node ntsel = null, ntnew = null, ntref = null;
+ boolean useNtsel = useSelected;
+ double minDistSq = nlists.keySet().iterator().next();
+
+ for (Entry<Double, List<Node>> entry : nlists.entrySet()) {
+ Double distSq = entry.getKey();
+ for (Node nd : entry.getValue()) {
+ // find the nearest selected node
+ if (ntsel == null && nd.isSelected()) {
+ ntsel = nd;
+ // if there are multiple nearest nodes, prefer the one
+ // that is selected. This is required in order to drag
+ // the selected node if multiple nodes have the same
+ // coordinates (e.g. after unglue)
+ useNtsel |= (distSq == minDistSq);
+ }
+ if (ntref == null && preferredRefs != null && distSq == minDistSq) {
+ List<OsmPrimitive> ndRefs = nd.getReferrers();
+ for (OsmPrimitive ref: preferredRefs) {
+ if (ndRefs.contains(ref)) {
+ ntref = nd;
+ break;
+ }
}
}
+ // find the nearest newest node that is within about the same
+ // distance as the true nearest node
+ if (ntnew == null && nd.isNew() && (distSq-minDistSq < 1)) {
+ ntnew = nd;
+ }
}
-
- // take nearest selected, nearest new or true nearest node to p, in that order
- n = (ntsel != null && use_selected) ? ntsel
- : (ntnew != null) ? ntnew
- : nlists.values().iterator().next().get(0);
}
- return n;
+
+ // take nearest selected, nearest new or true nearest node to p, in that order
+ if (ntsel != null && useNtsel)
+ return ntsel;
+ if (ntref != null)
+ return ntref;
+ if (ntnew != null)
+ return ntnew;
+ return nlists.values().iterator().next().get(0);
}
/**
@@ -771,8 +865,6 @@ public class NavigatableComponent extends JComponent implements Helpful {
>> 32 << 32); // resolution in numbers with large exponent not needed here..
if (perDistSq < snapDistanceSq && a < c + snapDistanceSq && b < c + snapDistanceSq) {
- //System.err.println(Double.toHexString(perDistSq));
-
List<WaySegment> wslist;
if (nearestMap.containsKey(perDistSq)) {
wslist = nearestMap.get(perDistSq);
@@ -868,6 +960,59 @@ public class NavigatableComponent extends JComponent implements Helpful {
return (ntsel != null && use_selected) ? ntsel : wayseg;
}
+ /**
+ * The *result* depends on the current map selection state IF use_selected is true.
+ *
+ * @return The nearest way segment to point p,
+ * and, depending on use_selected, prefers a selected way segment, if found.
+ * Also prefers segments of ways that are related to one of preferredRefs primitives
+ * @see #getNearestWaySegments(Point, Collection, Predicate)
+ * @since 6065
+ * @param p the point for which to search the nearest segment.
+ * @param predicate the returned object has to fulfill certain properties.
+ * @param use_selected whether selected way segments should be preferred.
+ * @param preferredRefs - prefer segments related to these primitives, may be null
+ */
+ public final WaySegment getNearestWaySegment(Point p, Predicate<OsmPrimitive> predicate,
+ boolean use_selected, Collection<OsmPrimitive> preferredRefs) {
+ WaySegment wayseg = null, ntsel = null, ntref = null;
+ if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
+
+ searchLoop: for (List<WaySegment> wslist : getNearestWaySegmentsImpl(p, predicate).values()) {
+ for (WaySegment ws : wslist) {
+ if (wayseg == null) {
+ wayseg = ws;
+ }
+ if (ntsel == null && ws.way.isSelected()) {
+ ntsel = ws;
+ break searchLoop;
+ }
+ if (ntref == null && preferredRefs != null) {
+ // prefer ways containing given nodes
+ for (Node nd: ws.way.getNodes()) {
+ if (preferredRefs.contains(nd)) {
+ ntref = ws;
+ break searchLoop;
+ }
+ }
+ Collection<OsmPrimitive> wayRefs = ws.way.getReferrers();
+ // prefer member of the given relations
+ for (OsmPrimitive ref: preferredRefs) {
+ if (ref instanceof Relation && wayRefs.contains(ref)) {
+ ntref = ws;
+ break searchLoop;
+ }
+ }
+ }
+ }
+ }
+ if (ntsel != null && use_selected)
+ return ntsel;
+ if (ntref != null)
+ return ntref;
+ return wayseg;
+ }
+
/**
* Convenience method to {@link #getNearestWaySegment(Point, Predicate, boolean)}.
*
@@ -928,7 +1073,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
*
* @return The nearest way to point p,
* prefer a selected way if there are multiple nearest.
- * @see #getNearestWaySegment(Point, Collection, Predicate)
+ * @see #getNearestWaySegment(Point, Predicate)
*
* @param p the point for which to search the nearest segment.
* @param predicate the returned object has to fulfill certain properties.
@@ -984,7 +1129,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
* It solely depends on the distance to point p.
*
* @return Primitives nearest to the given screen point.
- * @see #getNearests(Point, Collection, Predicate)
+ * @see #getNearestNodesOrWays(Point, Collection, Predicate)
*
* @param p The point on screen.
* @param predicate the returned object has to fulfill certain properties.
@@ -1004,17 +1149,12 @@ public class NavigatableComponent extends JComponent implements Helpful {
* @param use_selected whether to prefer selected nodes
*/
private boolean isPrecedenceNode(Node osm, Point p, boolean use_selected) {
- boolean ret = false;
-
if (osm != null) {
- ret |= !(p.distanceSq(getPoint2D(osm)) > (4)*(4));
- ret |= osm.isTagged();
- if (use_selected) {
- ret |= osm.isSelected();
- }
+ if (!(p.distanceSq(getPoint2D(osm)) > (4)*(4))) return true;
+ if (osm.isTagged()) return true;
+ if (use_selected && osm.isSelected()) return true;
}
-
- return ret;
+ return false;
}
/**
@@ -1034,42 +1174,50 @@ public class NavigatableComponent extends JComponent implements Helpful {
*
* @return A primitive within snap-distance to point p,
* that is chosen by the algorithm described.
- * @see getNearestNode(Point, Predicate)
- * @see getNearestNodesImpl(Point, Predicate)
- * @see getNearestWay(Point, Predicate)
+ * @see #getNearestNode(Point, Predicate)
+ * @see #getNearestNodesImpl(Point, Predicate)
+ * @see #getNearestWay(Point, Predicate)
*
* @param p The point on screen.
* @param predicate the returned object has to fulfill certain properties.
- * @param use_selected whether to prefer primitives that are currently selected.
+ * @param use_selected whether to prefer primitives that are currently selected or referred by selected primitives
*/
public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean use_selected) {
- OsmPrimitive osm = getNearestNode(p, predicate, use_selected);
- WaySegment ws = null;
+ Collection<OsmPrimitive> sel;
+ DataSet ds = getCurrentDataSet();
+ if (use_selected && ds!=null) {
+ sel = ds.getSelected();
+ } else {
+ sel = null;
+ }
+ OsmPrimitive osm = getNearestNode(p, predicate, use_selected, sel);
- if (!isPrecedenceNode((Node)osm, p, use_selected)) {
+ if (isPrecedenceNode((Node)osm, p, use_selected)) return osm;
+ WaySegment ws;
+ if (use_selected) {
+ ws = getNearestWaySegment(p, predicate, use_selected, sel);
+ } else {
ws = getNearestWaySegment(p, predicate, use_selected);
-
- if (ws != null) {
- if ((ws.way.isSelected() && use_selected) || osm == null) {
- // either (no _selected_ nearest node found, if desired) or no nearest node was found
- osm = ws.way;
- } else {
- int maxWaySegLenSq = 3*PROP_SNAP_DISTANCE.get();
- maxWaySegLenSq *= maxWaySegLenSq;
-
- Point2D wp1 = getPoint2D(ws.way.getNode(ws.lowerIndex));
- Point2D wp2 = getPoint2D(ws.way.getNode(ws.lowerIndex+1));
-
- // is wayseg shorter than maxWaySegLenSq and
- // is p closer to the middle of wayseg than to the nearest node?
- if (wp1.distanceSq(wp2) < maxWaySegLenSq &&
- p.distanceSq(project(0.5, wp1, wp2)) < p.distanceSq(getPoint2D((Node)osm))) {
- osm = ws.way;
- }
- }
+ }
+ if (ws == null) return osm;
+
+ if ((ws.way.isSelected() && use_selected) || osm == null) {
+ // either (no _selected_ nearest node found, if desired) or no nearest node was found
+ osm = ws.way;
+ } else {
+ int maxWaySegLenSq = 3*PROP_SNAP_DISTANCE.get();
+ maxWaySegLenSq *= maxWaySegLenSq;
+
+ Point2D wp1 = getPoint2D(ws.way.getNode(ws.lowerIndex));
+ Point2D wp2 = getPoint2D(ws.way.getNode(ws.lowerIndex+1));
+
+ // is wayseg shorter than maxWaySegLenSq and
+ // is p closer to the middle of wayseg than to the nearest node?
+ if (wp1.distanceSq(wp2) < maxWaySegLenSq &&
+ p.distanceSq(project(0.5, wp1, wp2)) < p.distanceSq(getPoint2D((Node)osm))) {
+ osm = ws.way;
}
}
-
return osm;
}
@@ -1155,12 +1303,12 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
}
}
-
+
// add nearby nodes
for (List<Node> nlist : getNearestNodesImpl(p, predicate).values()) {
nearestList.addAll(nlist);
}
-
+
// add parent relations of nearby nodes and ways
Set<OsmPrimitive> parentRelations = new HashSet<OsmPrimitive>();
for (OsmPrimitive o : nearestList) {
@@ -1171,7 +1319,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
}
nearestList.addAll(parentRelations);
-
+
if (ignore != null) {
nearestList.removeAll(ignore);
}
@@ -1202,6 +1350,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
return Main.getProjection();
}
+ @Override
public String helpTopic() {
String n = getClass().getName();
return n.substring(n.lastIndexOf('.')+1);
@@ -1231,26 +1380,80 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
/**
+ * Sets the current system of measurement.
+ * @param somKey The system of measurement key. Must be defined in {@link NavigatableComponent#SYSTEMS_OF_MEASUREMENT}.
+ * @since 6056
+ * @throws IllegalArgumentException if {@code somKey} is not known
+ */
+ public static void setSystemOfMeasurement(String somKey) {
+ if (!SYSTEMS_OF_MEASUREMENT.containsKey(somKey)) {
+ throw new IllegalArgumentException("Invalid system of measurement: "+somKey);
+ }
+ String oldKey = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();
+ if (ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.put(somKey)) {
+ fireSoMChanged(oldKey, somKey);
+ }
+ }
+
+ /**
* A system of units used to express length and area measurements.
* @since 3406
*/
public static class SystemOfMeasurement {
+
+ /** First value, in meters, used to translate unit according to above formula. */
public final double aValue;
+ /** Second value, in meters, used to translate unit according to above formula. */
public final double bValue;
+ /** First unit used to format text. */
public final String aName;
+ /** Second unit used to format text. */
public final String bName;
+ /** Specific optional area value, in squared meters, between {@code aValue*aValue} and {@code bValue*bValue}. Set to {@code -1} if not used.
+ * @since 5870 */
+ public final double areaCustomValue;
+ /** Specific optional area unit. Set to {@code null} if not used.
+ * @since 5870 */
+ public final String areaCustomName;
/**
* System of measurement. Currently covers only length (and area) units.
*
* If a quantity x is given in m (x_m) and in unit a (x_a) then it translates as
* x_a == x_m / aValue
+ *
+ * @param aValue First value, in meters, used to translate unit according to above formula.
+ * @param aName First unit used to format text.
+ * @param bValue Second value, in meters, used to translate unit according to above formula.
+ * @param bName Second unit used to format text.
*/
public SystemOfMeasurement(double aValue, String aName, double bValue, String bName) {
+ this(aValue, aName, bValue, bName, -1, null);
+ }
+
+ /**
+ * System of measurement. Currently covers only length (and area) units.
+ *
+ * If a quantity x is given in m (x_m) and in unit a (x_a) then it translates as
+ * x_a == x_m / aValue
+ *
+ * @param aValue First value, in meters, used to translate unit according to above formula.
+ * @param aName First unit used to format text.
+ * @param bValue Second value, in meters, used to translate unit according to above formula.
+ * @param bName Second unit used to format text.
+ * @param areaCustomValue Specific optional area value, in squared meters, between {@code aValue*aValue} and {@code bValue*bValue}.
+ * Set to {@code -1} if not used.
+ * @param areaCustomName Specific optional area unit. Set to {@code null} if not used.
+ *
+ * @since 5870
+ */
+ public SystemOfMeasurement(double aValue, String aName, double bValue, String bName, double areaCustomValue, String areaCustomName) {
this.aValue = aValue;
this.aName = aName;
this.bValue = bValue;
this.bName = bName;
+ this.areaCustomValue = areaCustomValue;
+ this.areaCustomName = areaCustomName;
}
/**
@@ -1259,14 +1462,25 @@ public class NavigatableComponent extends JComponent implements Helpful {
* @return The text describing the given distance in this system of measurement.
*/
public String getDistText(double dist) {
+ return getDistText(dist, null, 0.01);
+ }
+
+ /**
+ * Returns the text describing the given distance in this system of measurement.
+ * @param dist The distance in metres
+ * @param format A {@link NumberFormat} to format the area value
+ * @param threshold Values lower than this {@code threshold} are displayed as {@code "< [threshold]"}
+ * @return The text describing the given distance in this system of measurement.
+ * @since 6422
+ */
+ public String getDistText(final double dist, final NumberFormat format, final double threshold) {
double a = dist / aValue;
- if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && a > bValue / aValue) {
- double b = dist / bValue;
- return String.format(Locale.US, "%." + (b<10 ? 2 : 1) + "f %s", b, bName);
- } else if (a < 0.01)
- return "< 0.01 " + aName;
+ if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && a > bValue / aValue)
+ return formatText(dist / bValue, bName, format);
+ else if (a < threshold)
+ return "< " + formatText(threshold, aName, format);
else
- return String.format(Locale.US, "%." + (a<10 ? 2 : 1) + "f %s", a, aName);
+ return formatText(a, aName, format);
}
/**
@@ -1276,14 +1490,36 @@ public class NavigatableComponent extends JComponent implements Helpful {
* @since 5560
*/
public String getAreaText(double area) {
+ return getAreaText(area, null, 0.01);
+ }
+
+ /**
+ * Returns the text describing the given area in this system of measurement.
+ * @param area The area in square metres
+ * @param format A {@link NumberFormat} to format the area value
+ * @param threshold Values lower than this {@code threshold} are displayed as {@code "< [threshold]"}
+ * @return The text describing the given area in this system of measurement.
+ * @since 6422
+ */
+ public String getAreaText(final double area, final NumberFormat format, final double threshold) {
double a = area / (aValue*aValue);
- if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && a > bValue / aValue) {
- double b = area / (bValue*bValue);
- return String.format(Locale.US, "%." + (b<10 ? 2 : 1) + "f %s", b, bName+"\u00b2");
- } else if (a < 0.01)
- return "< 0.01 " + aName;
+ boolean lowerOnly = Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false);
+ boolean customAreaOnly = Main.pref.getBoolean("system_of_measurement.use_only_custom_area_unit", false);
+ if ((!lowerOnly && areaCustomValue > 0 && a > areaCustomValue / (aValue*aValue) && a < (bValue*bValue) / (aValue*aValue)) || customAreaOnly)
+ return formatText(area / areaCustomValue, areaCustomName, format);
+ else if (!lowerOnly && a >= (bValue*bValue) / (aValue*aValue))
+ return formatText(area / (bValue * bValue), bName + "\u00b2", format);
+ else if (a < threshold)
+ return "< " + formatText(threshold, aName + "\u00b2", format);
else
- return String.format(Locale.US, "%." + (a<10 ? 2 : 1) + "f %s", a, aName+"\u00b2");
+ return formatText(a, aName + "\u00b2", format);
+ }
+
+ private static String formatText(double v, String unit, NumberFormat format) {
+ if (format != null) {
+ return format.format(v) + " " + unit;
+ }
+ return String.format(Locale.US, "%." + (v<9.999999 ? 2 : 1) + "f %s", v, unit);
}
}
@@ -1291,20 +1527,20 @@ public class NavigatableComponent extends JComponent implements Helpful {
* Metric system (international standard).
* @since 3406
*/
- public static final SystemOfMeasurement METRIC_SOM = new SystemOfMeasurement(1, "m", 1000, "km");
-
+ public static final SystemOfMeasurement METRIC_SOM = new SystemOfMeasurement(1, "m", 1000, "km", 10000, "ha");
+
/**
* Chinese system.
* @since 3406
*/
public static final SystemOfMeasurement CHINESE_SOM = new SystemOfMeasurement(1.0/3.0, "\u5e02\u5c3a" /* chi */, 500, "\u5e02\u91cc" /* li */);
-
+
/**
* Imperial system (British Commonwealth and former British Empire).
* @since 3406
*/
- public static final SystemOfMeasurement IMPERIAL_SOM = new SystemOfMeasurement(0.3048, "ft", 1609.344, "mi");
-
+ public static final SystemOfMeasurement IMPERIAL_SOM = new SystemOfMeasurement(0.3048, "ft", 1609.344, "mi", 4046.86, "ac");
+
/**
* Nautical mile system (navigation, polar exploration).
* @since 5549
@@ -1333,52 +1569,55 @@ public class NavigatableComponent extends JComponent implements Helpful {
}
}
- private LinkedList<CursorInfo> Cursors = new LinkedList<CursorInfo>();
+ private LinkedList<CursorInfo> cursors = new LinkedList<CursorInfo>();
+
/**
* Set new cursor.
*/
public void setNewCursor(Cursor cursor, Object reference) {
- if(Cursors.size() > 0) {
- CursorInfo l = Cursors.getLast();
+ if (!cursors.isEmpty()) {
+ CursorInfo l = cursors.getLast();
if(l != null && l.cursor == cursor && l.object == reference)
return;
stripCursors(reference);
}
- Cursors.add(new CursorInfo(cursor, reference));
+ cursors.add(new CursorInfo(cursor, reference));
setCursor(cursor);
}
+
public void setNewCursor(int cursor, Object reference) {
setNewCursor(Cursor.getPredefinedCursor(cursor), reference);
}
+
/**
* Remove the new cursor and reset to previous
*/
public void resetCursor(Object reference) {
- if(Cursors.size() == 0) {
+ if (cursors.isEmpty()) {
setCursor(null);
return;
}
- CursorInfo l = Cursors.getLast();
+ CursorInfo l = cursors.getLast();
stripCursors(reference);
- if(l != null && l.object == reference) {
- if(Cursors.size() == 0) {
+ if (l != null && l.object == reference) {
+ if (cursors.isEmpty()) {
setCursor(null);
} else {
- setCursor(Cursors.getLast().cursor);
+ setCursor(cursors.getLast().cursor);
}
}
}
private void stripCursors(Object reference) {
LinkedList<CursorInfo> c = new LinkedList<CursorInfo>();
- for(CursorInfo i : Cursors) {
+ for(CursorInfo i : cursors) {
if(i.object != reference) {
c.add(i);
}
}
- Cursors = c;
+ cursors = c;
}
-
+
@Override
public void paint(Graphics g) {
synchronized (paintRequestLock) {
@@ -1412,7 +1651,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
repaint();
}
}
-
+
/**
* Requests to paint the given {@code Polygon} as a polyline (unclosed polygon).
* @param p The Polygon to draw
@@ -1427,7 +1666,7 @@ public class NavigatableComponent extends JComponent implements Helpful {
repaint();
}
}
-
+
/**
* Requests to clear the rectangled previously drawn.
* @see #requestPaintRect
diff --git a/src/org/openstreetmap/josm/gui/Notification.java b/src/org/openstreetmap/josm/gui/Notification.java
new file mode 100644
index 0000000..59a7db7
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/Notification.java
@@ -0,0 +1,187 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import java.awt.Component;
+
+import javax.swing.Icon;
+import javax.swing.JOptionPane;
+import javax.swing.UIManager;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+
+/**
+ * A Notification Message similar to a popup window, but without disrupting the
+ * user's workflow.
+ *
+ * Non-modal info panel that vanishes after a certain time.
+ *
+ * This class only holds the data for a notification, {@link NotificationManager}
+ * is responsible for building the message panel and displaying it on screen.
+ *
+ * example:
+ * <pre>
+ * Notification note = new Notification("Hi there!");
+ * note.setIcon(JOptionPane.INFORMATION_MESSAGE); // optional
+ * note.setDuration(Notification.TIME_SHORT); // optional
+ * note.show();
+ * </pre>
+ */
+public class Notification {
+
+ public final static int DEFAULT_CONTENT_WIDTH = 350;
+
+ // some standard duration values (in milliseconds)
+
+ /**
+ * Very short and very easy to grasp message (3 s).
+ * E.g. "Please select at least one node".
+ */
+ public final static int TIME_SHORT = Main.pref.getInteger("notification-time-short-ms", 3000);
+ /**
+ * Short message of one or two lines (5 s).
+ */
+ public final static int TIME_DEFAULT = Main.pref.getInteger("notification-time-default-ms", 5000);
+ /**
+ * Somewhat longer message (10 s).
+ */
+ public final static int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000);
+ /**
+ * Long text.
+ * (Make sure is still sensible to show as a notification)
+ */
+ public final static int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000);
+
+ private Component content;
+ private int duration;
+ private Icon icon;
+ private String helpTopic;
+
+ /**
+ * Constructs a new {@code Notification} without content.
+ */
+ public Notification() {
+ duration = NotificationManager.defaultNotificationTime;
+ }
+
+ /**
+ * Constructs a new {@code Notification} with the given textual content.
+ * @param msg The text to display
+ */
+ public Notification(String msg) {
+ this();
+ setContent(msg);
+ }
+
+ /**
+ * Set the content of the message.
+ *
+ * @param content any Component to be shown
+ *
+ * @see #setContent(java.lang.String)
+ * @return the current Object, for convenience
+ */
+ public Notification setContent(Component content) {
+ this.content = content;
+ return this;
+ }
+
+ /**
+ * Set the notification text. (Convenience method)
+ *
+ * @param msg the message String. Will be wrapped in <html>, so
+ * you can use <br> and other markup directly.
+ *
+ * @see #Notification(java.lang.String)
+ * @return the current Object, for convenience
+ */
+ public Notification setContent(String msg) {
+ JMultilineLabel lbl = new JMultilineLabel(msg);
+ lbl.setMaxWidth(DEFAULT_CONTENT_WIDTH);
+ content = lbl;
+ return this;
+ }
+
+ /**
+ * Set the time after which the message is hidden.
+ *
+ * @param duration the time (in milliseconds)
+ * Preset values {@link #TIME_SHORT}, {@link #TIME_DEFAULT}, {@link #TIME_LONG}
+ * and {@link #TIME_VERY_LONG} can be used.
+ * @return the current Object, for convenience
+ */
+ public Notification setDuration(int duration) {
+ this.duration = duration;
+ return this;
+ }
+
+ /**
+ * Set an icon to display on the left part of the message window.
+ *
+ * @param icon the icon (null means no icon is displayed)
+ * @return the current Object, for convenience
+ */
+ public Notification setIcon(Icon icon) {
+ this.icon = icon;
+ return this;
+ }
+
+ /**
+ * Set an icon to display on the left part of the message window by
+ * choosing from the default JOptionPane icons.
+ *
+ * @param messageType one of the following: JOptionPane.ERROR_MESSAGE,
+ * JOptionPane.INFORMATION_MESSAGE, JOptionPane.WARNING_MESSAGE,
+ * JOptionPane.QUESTION_MESSAGE, JOptionPane.PLAIN_MESSAGE
+ * @return the current Object, for convenience
+ */
+ public Notification setIcon(int messageType) {
+ switch (messageType) {
+ case JOptionPane.ERROR_MESSAGE:
+ return setIcon(UIManager.getIcon("OptionPane.errorIcon"));
+ case JOptionPane.INFORMATION_MESSAGE:
+ return setIcon(UIManager.getIcon("OptionPane.informationIcon"));
+ case JOptionPane.WARNING_MESSAGE:
+ return setIcon(UIManager.getIcon("OptionPane.warningIcon"));
+ case JOptionPane.QUESTION_MESSAGE:
+ return setIcon(UIManager.getIcon("OptionPane.questionIcon"));
+ case JOptionPane.PLAIN_MESSAGE:
+ return setIcon(null);
+ default:
+ throw new IllegalArgumentException("Unknown message type!");
+ }
+ }
+
+ /**
+ * Display a help button at the bottom of the notification window.
+ * @param helpTopic the help topic
+ * @return the current Object, for convenience
+ */
+ public Notification setHelpTopic(String helpTopic) {
+ this.helpTopic = helpTopic;
+ return this;
+ }
+
+ public Component getContent() {
+ return content;
+ }
+
+ public int getDuration() {
+ return duration;
+ }
+
+ public Icon getIcon() {
+ return icon;
+ }
+
+ public String getHelpTopic() {
+ return helpTopic;
+ }
+
+ /**
+ * Display the notification.
+ */
+ public void show() {
+ NotificationManager.getInstance().showNotification(this);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/NotificationManager.java b/src/org/openstreetmap/josm/gui/NotificationManager.java
new file mode 100644
index 0000000..68e929d
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/NotificationManager.java
@@ -0,0 +1,369 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.RenderingHints;
+import java.awt.Shape;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.geom.RoundRectangle2D;
+import java.util.LinkedList;
+import java.util.Queue;
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.GroupLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
+import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.help.HelpBrowser;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Manages {@link Notification}s, i.e. displays them on screen.
+ *
+ * Don't use this class directly, but use {@link Notification#show()}.
+ *
+ * If multiple messages are sent in a short period of time, they are put in
+ * a queue and displayed on after the other.
+ *
+ * The user can stop the timer (freeze the message) by moving the mouse cursor
+ * above the panel. As a visual cue, the background color changes from
+ * semi-transparent to opaque while the timer is frozen.
+ */
+class NotificationManager {
+
+ private Timer hideTimer; // started when message is shown, responsible for hiding the message
+ private Timer pauseTimer; // makes sure the is a small pause between to consecutive messages
+ private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor
+ // is moved off the panel
+ private boolean running;
+
+ private Notification currentNotification;
+ private NotificationPanel currentNotificationPanel;
+ private final Queue<Notification> queue;
+
+ private static int pauseTime = Main.pref.getInteger("notification-default-pause-time-ms", 300); // milliseconds
+ static int defaultNotificationTime = Main.pref.getInteger("notification-default-time-ms", 5000); // milliseconds
+
+ private long displayTimeStart;
+ private long elapsedTime;
+
+ private static NotificationManager INSTANCE = null;
+
+ private final Color PANEL_SEMITRANSPARENT = new Color(224, 236, 249, 230);
+ private final Color PANEL_OPAQUE = new Color(224, 236, 249);
+
+ public static NotificationManager getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new NotificationManager();
+ }
+ return INSTANCE;
+ }
+
+ public NotificationManager() {
+ queue = new LinkedList<Notification>();
+ hideTimer = new Timer(defaultNotificationTime, new HideEvent());
+ hideTimer.setRepeats(false);
+ pauseTimer = new Timer(pauseTime, new PauseFinishedEvent());
+ pauseTimer.setRepeats(false);
+ unfreezeDelayTimer = new Timer(10, new UnfreezeEvent());
+ unfreezeDelayTimer.setRepeats(false);
+ }
+
+ public void showNotification(Notification note) {
+ synchronized (queue) {
+ queue.add(note);
+ processQueue();
+ }
+ }
+
+ private void processQueue() {
+ if (running) return;
+
+ currentNotification = queue.poll();
+ if (currentNotification == null) return;
+
+ currentNotificationPanel = new NotificationPanel(currentNotification);
+ currentNotificationPanel.validate();
+
+ int MARGIN = 5;
+ int x, y;
+ JFrame parentWindow = (JFrame) Main.parent;
+ Dimension size = currentNotificationPanel.getPreferredSize();
+ if (Main.isDisplayingMapView() && Main.map.mapView.getHeight() > 0) {
+ MapView mv = Main.map.mapView;
+ Point mapViewPos = SwingUtilities.convertPoint(mv.getParent(), mv.getX(), mv.getY(), Main.parent);
+ x = mapViewPos.x + MARGIN;
+ y = mapViewPos.y + mv.getHeight() - size.height - MARGIN;
+ } else {
+ x = MARGIN;
+ y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - MARGIN;
+ }
+ parentWindow.getLayeredPane().add(currentNotificationPanel, JLayeredPane.POPUP_LAYER, 0);
+
+ currentNotificationPanel.setLocation(x, y);
+ currentNotificationPanel.setSize(size);
+
+ currentNotificationPanel.setVisible(true);
+
+ running = true;
+ elapsedTime = 0;
+
+ startHideTimer();
+ }
+
+ private void startHideTimer() {
+ int remaining = (int) (currentNotification.getDuration() - elapsedTime);
+ if (remaining < 300) {
+ remaining = 300;
+ }
+ displayTimeStart = System.currentTimeMillis();
+ hideTimer.setInitialDelay(remaining);
+ hideTimer.restart();
+ }
+
+ private class HideEvent implements ActionListener {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ hideTimer.stop();
+ currentNotificationPanel.setVisible(false);
+ ((JFrame) Main.parent).getLayeredPane().remove(currentNotificationPanel);
+ currentNotificationPanel = null;
+ pauseTimer.restart();
+ }
+ }
+
+ private class PauseFinishedEvent implements ActionListener {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ synchronized (queue) {
+ running = false;
+ processQueue();
+ }
+ }
+ }
+
+ private class UnfreezeEvent implements ActionListener {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ currentNotificationPanel.setNotificationBackground(PANEL_SEMITRANSPARENT);
+ currentNotificationPanel.repaint();
+ startHideTimer();
+ }
+ }
+
+ private class NotificationPanel extends JPanel {
+
+ private JPanel innerPanel;
+
+ public NotificationPanel(Notification note) {
+ setVisible(false);
+ build(note);
+ }
+
+ public void setNotificationBackground(Color c) {
+ innerPanel.setBackground(c);
+ }
+
+ private void build(final Notification note) {
+ JButton btnClose = new JButton(new HideAction());
+ btnClose.setPreferredSize(new Dimension(50, 50));
+ btnClose.setMargin(new Insets(0, 0, 1, 1));
+ btnClose.setContentAreaFilled(false);
+ // put it in JToolBar to get a better appearance
+ JToolBar tbClose = new JToolBar();
+ tbClose.setFloatable(false);
+ tbClose.setBorderPainted(false);
+ tbClose.setOpaque(false);
+ tbClose.add(btnClose);
+
+ JToolBar tbHelp = null;
+ if (note.getHelpTopic() != null) {
+ JButton btnHelp = new JButton(tr("Help"));
+ btnHelp.setIcon(ImageProvider.get("help"));
+ btnHelp.setToolTipText(tr("Show help information"));
+ HelpUtil.setHelpContext(btnHelp, note.getHelpTopic());
+ btnHelp.addActionListener(new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ HelpBrowser.setUrlForHelpTopic(note.getHelpTopic());
+ }
+ });
+ }
+ });
+ btnHelp.setOpaque(false);
+ tbHelp = new JToolBar();
+ tbHelp.setFloatable(false);
+ tbHelp.setBorderPainted(false);
+ tbHelp.setOpaque(false);
+ tbHelp.add(btnHelp);
+ }
+
+ setOpaque(false);
+ innerPanel = new RoundedPanel();
+ innerPanel.setBackground(PANEL_SEMITRANSPARENT);
+ innerPanel.setForeground(Color.BLACK);
+
+ GroupLayout layout = new GroupLayout(innerPanel);
+ innerPanel.setLayout(layout);
+ layout.setAutoCreateGaps(true);
+ layout.setAutoCreateContainerGaps(true);
+
+ innerPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+ add(innerPanel);
+
+ JLabel icon = null;
+ if (note.getIcon() != null) {
+ icon = new JLabel(note.getIcon());
+ }
+ Component content = note.getContent();
+ GroupLayout.SequentialGroup hgroup = layout.createSequentialGroup();
+ if (icon != null) {
+ hgroup.addComponent(icon);
+ }
+ if (tbHelp != null) {
+ hgroup.addGroup(layout.createParallelGroup(GroupLayout.Alignment.TRAILING)
+ .addComponent(content)
+ .addComponent(tbHelp)
+ );
+ } else {
+ hgroup.addComponent(content);
+ }
+ hgroup.addComponent(tbClose);
+ GroupLayout.ParallelGroup vgroup = layout.createParallelGroup();
+ if (icon != null) {
+ vgroup.addComponent(icon);
+ }
+ vgroup.addComponent(content);
+ vgroup.addComponent(tbClose);
+ layout.setHorizontalGroup(hgroup);
+
+ if (tbHelp != null) {
+ layout.setVerticalGroup(layout.createSequentialGroup()
+ .addGroup(vgroup)
+ .addComponent(tbHelp)
+ );
+ } else {
+ layout.setVerticalGroup(vgroup);
+ }
+
+ /*
+ * The timer stops when the mouse cursor is above the panel.
+ *
+ * This is not straightforward, because the JPanel will get a
+ * mouseExited event when the cursor moves on top of the JButton
+ * inside the panel.
+ *
+ * The current hacky solution is to register the freeze MouseListener
+ * not only to the panel, but to all the components inside the panel.
+ *
+ * Moving the mouse cursor from one component to the next would
+ * cause some flickering (timer is started and stopped for a fraction
+ * of a second, background color is switched twice), so there is
+ * a tiny delay before the timer really resumes.
+ */
+ MouseListener freeze = new FreezeMouseListener();
+ addMouseListenerToAllChildComponents(this, freeze);
+ }
+
+ private void addMouseListenerToAllChildComponents(Component comp, MouseListener listener) {
+ comp.addMouseListener(listener);
+ if (comp instanceof Container) {
+ for (Component c: ((Container)comp).getComponents()) {
+ addMouseListenerToAllChildComponents(c, listener);
+ }
+ }
+ }
+
+ class HideAction extends AbstractAction {
+
+ public HideAction() {
+ putValue(SMALL_ICON, ImageProvider.get("misc", "grey_x"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ new HideEvent().actionPerformed(null);
+ }
+ }
+
+ class FreezeMouseListener extends MouseAdapter {
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ if (unfreezeDelayTimer.isRunning()) {
+ unfreezeDelayTimer.stop();
+ } else {
+ hideTimer.stop();
+ elapsedTime += System.currentTimeMillis() - displayTimeStart;
+ currentNotificationPanel.setNotificationBackground(PANEL_OPAQUE);
+ currentNotificationPanel.repaint();
+ }
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ unfreezeDelayTimer.restart();
+ }
+ }
+ }
+
+ /**
+ * A panel with rounded edges and line border.
+ */
+ public static class RoundedPanel extends JPanel {
+
+ public RoundedPanel() {
+ super();
+ setOpaque(false);
+ }
+
+ @Override
+ protected void paintComponent(Graphics graphics) {
+ Graphics2D g = (Graphics2D) graphics;
+ g.setRenderingHint(
+ RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g.setColor(getBackground());
+ float lineWidth = 1.4f;
+ Shape rect = new RoundRectangle2D.Float(
+ lineWidth/2 + getInsets().left,
+ lineWidth/2 + getInsets().top,
+ getWidth() - lineWidth/2 - getInsets().left - getInsets().right,
+ getHeight() - lineWidth/2 - getInsets().top - getInsets().bottom,
+ 20, 20);
+
+ g.fill(rect);
+ g.setColor(getForeground());
+ g.setStroke(new BasicStroke(lineWidth));
+ g.draw(rect);
+ super.paintComponent(graphics);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java b/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java
index 0c8f78c..3d5a3b1 100644
--- a/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java
+++ b/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java
@@ -1,9 +1,10 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import java.awt.Component;
import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JTable;
@@ -11,6 +12,7 @@ import javax.swing.ListCellRenderer;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -39,6 +41,7 @@ public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer
/**
* Adapter method supporting the ListCellRenderer interface.
*/
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component def = defaultListCellRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
return renderer(def, (OsmPrimitive) value);
@@ -47,6 +50,7 @@ public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer
/**
* Adapter method supporting the TableCellRenderer interface.
*/
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
Component def = defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
if (value instanceof OsmPrimitive)
@@ -65,9 +69,14 @@ public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer
* @return the modified rendering component
*/
private Component renderer(Component def, OsmPrimitive value) {
- if (def != null && value != null && def instanceof JLabel) {
+ if (value != null && def instanceof JLabel) {
((JLabel)def).setText(getComponentText(value));
- ((JLabel)def).setIcon(ImageProvider.get(value.getDisplayType()));
+ ImageIcon icon = ImageProvider.get(value.getDisplayType());
+ if (icon != null) {
+ ((JLabel)def).setIcon(icon);
+ } else {
+ Main.warn("Null icon for "+value.getDisplayType());
+ }
((JLabel)def).setToolTipText(getComponentToolTipText(value));
}
return def;
@@ -81,7 +90,7 @@ public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer
* @return the modified rendering component
*/
private Component renderer(Component def, HistoryOsmPrimitive value) {
- if (def != null && value != null && def instanceof JLabel) {
+ if (value != null && def instanceof JLabel) {
((JLabel)def).setText(value.getDisplayName(DefaultNameFormatter.getInstance()));
((JLabel)def).setIcon(ImageProvider.get(value.getType()));
((JLabel)def).setToolTipText(formatter.buildDefaultToolTip(value));
diff --git a/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java b/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
index e13d2ec..f1af64f 100644
--- a/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
+++ b/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -19,11 +19,11 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import javax.swing.UIManager;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor.ProgressMonitorDialog;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -37,7 +37,7 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
private JButton btnCancel;
private JButton btnInBackground;
/** the text area and the scroll pane for the log */
- private JTextArea taLog = new JTextArea(5,50);
+ private JosmTextArea taLog = new JosmTextArea(5,50);
private JScrollPane spLog;
private void initDialog() {
@@ -66,9 +66,13 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
setCustomText("");
setLocationRelativeTo(getParent());
addComponentListener(new ComponentListener() {
+ @Override
public void componentHidden(ComponentEvent e) {}
+ @Override
public void componentMoved(ComponentEvent e) {}
+ @Override
public void componentShown(ComponentEvent e) {}
+ @Override
public void componentResized(ComponentEvent ev) {
int w = getWidth();
if(w > 200) {
@@ -78,11 +82,16 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
});
}
+ /**
+ * Constructs a new {@code PleaseWaitDialog}.
+ * @param parent the {@code Component} from which the dialog is displayed. Can be {@code null}.
+ */
public PleaseWaitDialog(Component parent) {
super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
initDialog();
}
+ @Override
public void setIndeterminate(boolean newValue) {
UIManager.put("ProgressBar.cycleTime", UIManager.getInt("ProgressBar.repaintInterval") * 100);
progressBar.setIndeterminate(newValue);
@@ -90,6 +99,7 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
protected void adjustLayout() {
invalidate();
+ setDropTarget(null); // Workaround to JDK bug 7027598/7100524/7169912 (#8613)
pack();
setSize(Main.pref.getInteger("progressdialog.size", 600), getSize().height);
}
@@ -98,6 +108,7 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
* Sets a custom text line below currentAction. Can be used to display additional information
* @param text
*/
+ @Override
public void setCustomText(String text) {
if(text == null || text.trim().length() == 0) {
customText.setVisible(false);
@@ -111,6 +122,7 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
}
}
+ @Override
public void setCurrentAction(String text) {
currentAction.setText(text);
}
@@ -121,6 +133,7 @@ public class PleaseWaitDialog extends JDialog implements ProgressMonitorDialog {
*
* @param message the message to append to the log. Ignore if null or white space only.
*/
+ @Override
public void appendLogMessage(String message) {
if (message == null || message.trim().length() ==0 )
return;
diff --git a/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java b/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
index 0b063ef..6d08cae 100644
--- a/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
+++ b/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import java.awt.Component;
@@ -85,6 +85,7 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
finish();
} else {
EventQueue.invokeAndWait(new Runnable() {
+ @Override
public void run() {
finish();
}
@@ -102,6 +103,7 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
afterFinish();
} else {
EventQueue.invokeAndWait(new Runnable() {
+ @Override
public void run() {
afterFinish();
}
@@ -112,6 +114,7 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
if (!ignoreException) {
// Exception has to thrown in EDT to be shown to user
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
if (e instanceof RuntimeException) {
BugReportExceptionHandler.handleException(e);
@@ -131,12 +134,14 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
}
+ @Override
public final void run() {
if (canceled)
return; // since realRun isn't executed, do not call to finish
if (EventQueue.isDispatchThread()) {
new Thread(new Runnable() {
+ @Override
public void run() {
doRealRun();
}
@@ -146,6 +151,7 @@ public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
}
}
+ @Override
public void operationCanceled() {
cancel();
}
diff --git a/src/org/openstreetmap/josm/gui/PopupMenuHandler.java b/src/org/openstreetmap/josm/gui/PopupMenuHandler.java
new file mode 100644
index 0000000..bd78c4b
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/PopupMenuHandler.java
@@ -0,0 +1,125 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.Action;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.MenuElement;
+import javax.swing.event.PopupMenuListener;
+
+import org.openstreetmap.josm.actions.OsmPrimitiveAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Handler to ease management of actions in different popup menus.
+ * @since 5821
+ */
+public class PopupMenuHandler {
+
+ // Set of enabled osm primitives actions
+ private final Set<OsmPrimitiveAction> primitiveActions = new HashSet<OsmPrimitiveAction>();
+ // Managed menu
+ private final JPopupMenu menu;
+
+ /**
+ * Constructs a new {@code RelationActionMenuHandler} for the specified popup menu.
+ *
+ * @param menu The menu to be managed
+ */
+ public PopupMenuHandler(JPopupMenu menu) {
+ this.menu = menu;
+ }
+
+ /**
+ * Appends a new separator at the end of the menu.
+ * @see JPopupMenu#addSeparator
+ */
+ public void addSeparator() {
+ menu.addSeparator();
+ }
+
+ /**
+ * Appends a new menu item to the end of the menu which dispatches the specified <code>Action</code> object.
+ *
+ * @param a the <code>Action</code> to add to the menu
+ * @return the new menu item
+ * @see JPopupMenu#add(Action)
+ */
+ public JMenuItem addAction(Action a) {
+ if (a != null) {
+ if (a instanceof OsmPrimitiveAction) {
+ primitiveActions.add((OsmPrimitiveAction) a);
+ }
+ return menu.add(a);
+ }
+ return null;
+ }
+
+ /**
+ * Removes the menu item which dispatches the specified <code>Action</code> object.
+ *
+ * @param a the <code>Action</code> to remove from the menu
+ * @see JPopupMenu#remove(int)
+ */
+ public void removeAction(Action a) {
+ if (a != null) {
+ if (a instanceof OsmPrimitiveAction) {
+ primitiveActions.remove(a);
+ }
+ MenuElement[] elements = menu.getSubElements();
+ for (int i=0; i<elements.length; i++) {
+ if (elements[i] instanceof JMenuItem) {
+ if (((JMenuItem) elements[i]).getAction() == a) {
+ menu.remove(i);
+ return;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Adds a <code>PopupMenu</code> listener.
+ *
+ * @param l the <code>PopupMenuListener</code> to add
+ * @see JPopupMenu#addPopupMenuListener
+ */
+ public void addListener(PopupMenuListener l) {
+ menu.addPopupMenuListener(l);
+ }
+
+ /**
+ * Removes a <code>PopupMenu</code> listener.
+ *
+ * @param l the <code>PopupMenuListener</code> to remove
+ * @see JPopupMenu#removePopupMenuListener
+ */
+ public void removeListener(PopupMenuListener l) {
+ menu.removePopupMenuListener(l);
+ }
+
+ /**
+ * Returns all enabled primitive actions.
+ * @return All primitive actions that have been added.
+ * @see #addAction(Action)
+ */
+ public Collection<OsmPrimitiveAction> getPrimitiveActions() {
+ return Collections.unmodifiableCollection(primitiveActions);
+ }
+
+ /**
+ * Specifies the working set of primitives for all primitive actions.
+ * @param primitives The new working set of primitives. Can be null or empty
+ * @see OsmPrimitiveAction#setPrimitives
+ */
+ public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+ for (OsmPrimitiveAction action : primitiveActions) {
+ action.setPrimitives(primitives);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/ScrollViewport.java b/src/org/openstreetmap/josm/gui/ScrollViewport.java
index fb1142f..5031f82 100644
--- a/src/org/openstreetmap/josm/gui/ScrollViewport.java
+++ b/src/org/openstreetmap/josm/gui/ScrollViewport.java
@@ -1,5 +1,4 @@
-// License: GPL. Copyright 2007 by Christian Gallioz (aka khris78)
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import java.awt.BorderLayout;
@@ -69,6 +68,7 @@ public class ScrollViewport extends JPanel {
private List<JButton> buttons = new ArrayList<JButton>();
private Timer timer = new Timer(100, new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent arg0) {
ScrollViewport.this.scroll();
}
diff --git a/src/org/openstreetmap/josm/gui/SelectionManager.java b/src/org/openstreetmap/josm/gui/SelectionManager.java
index ae11e92..f84afe5 100644
--- a/src/org/openstreetmap/josm/gui/SelectionManager.java
+++ b/src/org/openstreetmap/josm/gui/SelectionManager.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
import java.awt.Component;
@@ -122,6 +122,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
eventSource.addMouseMotionListener(this);
selectionEndedListener.addPropertyChangeListener(this);
eventSource.addPropertyChangeListener("scale", new PropertyChangeListener(){
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (mousePosStart != null) {
paintRect();
@@ -145,6 +146,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
/**
* If the correct button, from the "drawing rectangle" mode
*/
+ @Override
public void mousePressed(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON1) {
mousePosStart = mousePos = e.getPoint();
@@ -157,6 +159,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
/**
* If the correct button is hold, draw the rectangle.
*/
+ @Override
public void mouseDragged(MouseEvent e) {
int buttonPressed = e.getModifiersEx() & (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK);
@@ -187,6 +190,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
/**
* Check the state of the keys and buttons and set the selection accordingly.
*/
+ @Override
public void mouseReleased(MouseEvent e) {
if (e.getButton() != MouseEvent.BUTTON1)
return;
@@ -220,7 +224,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
return;
nc.requestPaintRect(getSelectionRectangle());
}
-
+
private void paintLasso() {
if (mousePos == null || mousePosStart == null || mousePos == mousePosStart) {
return;
@@ -272,6 +276,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
/**
* If the action goes inactive, remove the selection rectangle from screen
*/
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals("active") && !(Boolean)evt.getNewValue() && mousePosStart != null) {
paintRect();
@@ -308,7 +313,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
} else {
// nodes
for (Node n : nc.getCurrentDataSet().getNodes()) {
- if (n.isSelectable() && lasso.contains(nc.getPoint(n))) {
+ if (n.isSelectable() && lasso.contains(nc.getPoint2D(n))) {
selection.add(n);
}
}
@@ -320,7 +325,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
}
if (alt) {
for (Node n : w.getNodes()) {
- if (!n.isIncomplete() && lasso.contains(nc.getPoint(n))) {
+ if (!n.isIncomplete() && lasso.contains(nc.getPoint2D(n))) {
selection.add(w);
break;
}
@@ -361,8 +366,12 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
this.lassoMode = lassoMode;
}
+ @Override
public void mouseClicked(MouseEvent e) {}
+ @Override
public void mouseEntered(MouseEvent e) {}
+ @Override
public void mouseExited(MouseEvent e) {}
+ @Override
public void mouseMoved(MouseEvent e) {}
}
diff --git a/src/org/openstreetmap/josm/gui/ShowHideButtonListener.java b/src/org/openstreetmap/josm/gui/ShowHideButtonListener.java
index 5f66c46..a17ec93 100644
--- a/src/org/openstreetmap/josm/gui/ShowHideButtonListener.java
+++ b/src/org/openstreetmap/josm/gui/ShowHideButtonListener.java
@@ -3,7 +3,7 @@ package org.openstreetmap.josm.gui;
/**
* When some component (ToggleDialog, for example) is linked to button
- * and needs information about button showing/hiding events, this interface
+ * and needs information about button showing/hiding events, this interface
* is used, setting the listener should be implemented by @class HideableButton
*/
public interface ShowHideButtonListener {
diff --git a/src/org/openstreetmap/josm/gui/SideButton.java b/src/org/openstreetmap/josm/gui/SideButton.java
index 779185d..1a856c1 100644
--- a/src/org/openstreetmap/josm/gui/SideButton.java
+++ b/src/org/openstreetmap/josm/gui/SideButton.java
@@ -1,8 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Image;
@@ -19,25 +17,24 @@ import javax.swing.JButton;
import javax.swing.SwingConstants;
import javax.swing.plaf.basic.BasicArrowButton;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * Button that is usually used in toggle dialogs
+ */
public class SideButton extends JButton implements Destroyable {
private final static int iconHeight = 20;
-
+
private PropertyChangeListener propertyChangeListener;
- public SideButton(Action action)
- {
+ public SideButton(Action action) {
super(action);
fixIcon(action);
doStyle();
}
- public SideButton(Action action, boolean usename)
- {
+ public SideButton(Action action, boolean usename) {
super(action);
if(!usename) {
setText(null);
@@ -46,8 +43,7 @@ public class SideButton extends JButton implements Destroyable {
}
}
- public SideButton(Action action, String imagename)
- {
+ public SideButton(Action action, String imagename) {
super(action);
setIcon(makeIcon(imagename));
doStyle();
@@ -67,7 +63,7 @@ public class SideButton extends JButton implements Destroyable {
});
}
Icon i = getIcon();
- if (i != null && i instanceof ImageIcon && i.getIconHeight() != iconHeight) {
+ if (i instanceof ImageIcon && i.getIconHeight() != iconHeight) {
setIcon(getScaledImage(((ImageIcon) i).getImage()));
}
}
@@ -83,49 +79,7 @@ public class SideButton extends JButton implements Destroyable {
return getScaledImage(im);
}
- // Used constructor with Action
- @Deprecated
- public SideButton(String imagename, String property, String tooltip, ActionListener actionListener)
- {
- super(makeIcon(imagename));
- doStyle();
- setActionCommand(imagename);
- addActionListener(actionListener);
- setToolTipText(tooltip);
- }
-
- // Used constructor with Action
- @Deprecated
- public SideButton(String name, String imagename, String property, String tooltip, Shortcut shortcut, ActionListener actionListener)
- {
- super(tr(name), makeIcon(imagename));
- if(shortcut != null)
- {
- shortcut.setMnemonic(this);
- if(tooltip != null) {
- tooltip = Main.platform.makeTooltip(tooltip, shortcut);
- }
- }
- setup(name, property, tooltip, actionListener);
- }
-
- // Used constructor with Action
- @Deprecated
- public SideButton(String name, String imagename, String property, String tooltip, ActionListener actionListener)
- {
- super(tr(name), makeIcon(imagename));
- setup(name, property, tooltip, actionListener);
- }
- private void setup(String name, String property, String tooltip, ActionListener actionListener)
- {
- doStyle();
- setActionCommand(name);
- addActionListener(actionListener);
- setToolTipText(tooltip);
- putClientProperty("help", "Dialog/"+property+"/"+name);
- }
- private void doStyle()
- {
+ private void doStyle() {
setLayout(new BorderLayout());
setIconTextGap(2);
setMargin(new Insets(-1,0,-1,0));
diff --git a/src/org/openstreetmap/josm/gui/SplashScreen.java b/src/org/openstreetmap/josm/gui/SplashScreen.java
index cbfc0f4..6dd4bab 100644
--- a/src/org/openstreetmap/josm/gui/SplashScreen.java
+++ b/src/org/openstreetmap/josm/gui/SplashScreen.java
@@ -5,15 +5,14 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-
import java.util.Arrays;
import java.util.LinkedList;
+
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -27,6 +26,7 @@ import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressRenderer;
import org.openstreetmap.josm.gui.progress.SwingRenderingProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -36,9 +36,11 @@ import org.openstreetmap.josm.tools.WindowGeometry;
*/
public class SplashScreen extends JFrame {
- private SplashScreenProgressRenderer progressRenderer;
private SwingRenderingProgressMonitor progressMonitor;
+ /**
+ * Constructs a new {@code SplashScreen}.
+ */
public SplashScreen() {
super();
setUndecorated(true);
@@ -63,7 +65,7 @@ public class SplashScreen extends JFrame {
// Add the name of this application
JLabel caption = new JLabel("JOSM - " + tr("Java OpenStreetMap Editor"));
- caption.setFont(new Font("Helvetica", Font.BOLD, 20));
+ caption.setFont(GuiHelper.getTitleFont());
gbc.gridheight = 1;
gbc.gridx = 1;
gbc.insets = new Insets(30, 0, 0, 0);
@@ -85,7 +87,7 @@ public class SplashScreen extends JFrame {
innerContentPane.add(separator, gbc);
// Add a status message
- progressRenderer = new SplashScreenProgressRenderer();
+ SplashScreenProgressRenderer progressRenderer = new SplashScreenProgressRenderer();
gbc.gridy = 3;
gbc.insets = new Insets(0, 0, 10, 0);
innerContentPane.add(progressRenderer, gbc);
@@ -153,18 +155,21 @@ public class SplashScreen extends JFrame {
build();
}
+ @Override
public void setCustomText(String message) {
if(message.isEmpty())
- message = " "; /* prevent killing of additional line */
+ message = " "; // prevent killing of additional line
lblCustomText.setText(message);
repaint();
}
+ @Override
public void setIndeterminate(boolean indeterminate) {
progressBar.setIndeterminate(indeterminate);
repaint();
}
+ @Override
public void setMaximum(int maximum) {
progressBar.setMaximum(maximum);
repaint();
@@ -178,6 +183,7 @@ public class SplashScreen extends JFrame {
* Stores and displays the {@code MAX_NUMBER_OF_MESSAGES} most recent
* task titles together with their execution time.
*/
+ @Override
public void setTaskTitle(String taskTitle) {
while (messages.size() >= MAX_NUMBER_OF_MESSAGES) {
@@ -193,10 +199,10 @@ public class SplashScreen extends JFrame {
if (!taskTitle.isEmpty()) {
messages.add(taskTitle);
}
- String html = "";
+ StringBuilder html = new StringBuilder();
int i = 0;
for (String m : messages) {
- html += "<p class=\"entry" + (++i) + "\">" + m + "</p>";
+ html.append("<p class=\"entry").append(++i).append("\">").append(m).append("</p>");
}
lblTaskTitle.setText("<html><style>"
@@ -206,6 +212,7 @@ public class SplashScreen extends JFrame {
repaint();
}
+ @Override
public void setValue(int value) {
progressBar.setValue(value);
repaint();
diff --git a/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java b/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java
index 7771150..e591108 100644
--- a/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java
+++ b/src/org/openstreetmap/josm/gui/actionsupport/AlignImageryPanel.java
@@ -1,6 +1,6 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.actionsupport;
-
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
@@ -18,14 +18,13 @@ import javax.swing.border.EmptyBorder;
import javax.swing.border.EtchedBorder;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.UrlLabel;
-
/**
* The panel to nag a user ONCE that he/she has to align imagery.
- *
+ *
* @author zverik
*/
public class AlignImageryPanel extends JPanel {
@@ -33,13 +32,13 @@ public class AlignImageryPanel extends JPanel {
public AlignImageryPanel(boolean oneLine) {
super();
-
+
Font font = getFont().deriveFont(Font.PLAIN, 14.0f);
JLabel nagLabel = new JLabel(tr("Aerial imagery might be misaligned. Please check its offset using GPS tracks!"));
UrlLabel detailsList = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Using_Imagery"), tr("Details..."));
nagLabel.setFont(font);
detailsList.setFont(font);
-
+
JButton closeButton = new JButton(ImageProvider.get("misc", "black_x"));
closeButton.setContentAreaFilled(false);
closeButton.setRolloverEnabled(true);
@@ -54,7 +53,7 @@ public class AlignImageryPanel extends JPanel {
}
}
});
-
+
setLayout(new GridBagLayout());
if (!oneLine) { // tune for small screens
add(nagLabel, GBC.std(1, 1).fill());
@@ -65,7 +64,6 @@ public class AlignImageryPanel extends JPanel {
add(detailsList, GBC.std(2,1).fill());
add(closeButton, GBC.std(3,1).anchor(GBC.EAST));
}
-// setBorder(new EmptyBorder(12, 12, 12, 12));
setBorder(new CompoundBorder(new EtchedBorder(EtchedBorder.LOWERED), new EmptyBorder(12, 12, 12, 12)));
setBackground(new Color(224, 236, 249));
}
@@ -79,5 +77,4 @@ public class AlignImageryPanel extends JPanel {
}
}
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java b/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
index 8d4c656..c123d61 100644
--- a/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
+++ b/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
@@ -8,34 +8,28 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
import javax.swing.JDialog;
-import javax.swing.JEditorPane;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.UIManager;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
-import javax.swing.text.html.HTMLEditorKit;
-import javax.swing.text.html.StyleSheet;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.NameFormatter;
@@ -46,13 +40,14 @@ import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
/**
* This dialog is used to get a user confirmation that a collection of primitives can be removed
* from their parent relations.
- *
+ * @since 2308
*/
public class DeleteFromRelationConfirmationDialog extends JDialog implements TableModelListener {
/** the unique instance of this dialog */
@@ -61,7 +56,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
/**
* Replies the unique instance of this dialog
*
- * @return
+ * @return The unique instance of this dialog
*/
static public DeleteFromRelationConfirmationDialog getInstance() {
if (instance == null) {
@@ -72,45 +67,10 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
/** the data model */
private RelationMemberTableModel model;
- private JEditorPane jepMessage;
+ private HtmlPanel htmlPanel;
private boolean canceled;
private SideButton btnOK;
- protected JPanel buildMessagePanel() {
- JPanel pnl = new JPanel(new BorderLayout());
- jepMessage = new JEditorPane("text/html", "");
- jepMessage.setOpaque(false);
- jepMessage.setEditable(false);
- Font f = UIManager.getFont("Label.font");
- StyleSheet ss = new StyleSheet();
- String rule = MessageFormat.format(
- "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
- f.getName(),
- f.getSize(),
- f.isBold() ? "bold" : "normal",
- f.isItalic() ? "italic" : "normal"
- );
- rule = "body {" + rule + "}";
- rule = MessageFormat.format(
- "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
- f.getName(),
- f.getSize(),
- "bold",
- f.isItalic() ? "italic" : "normal"
- );
- rule = "strong {" + rule + "}";
- ss.addRule(rule);
- ss.addRule("a {text-decoration: underline; color: blue}");
- HTMLEditorKit kit = new HTMLEditorKit();
- kit.setStyleSheet(ss);
- jepMessage.setEditorKit(kit);
-
- pnl.setLayout(new BorderLayout());
- pnl.add(jepMessage, BorderLayout.CENTER);
- pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
- return pnl;
- }
-
protected JPanel buildRelationMemberTablePanel() {
JTable table = new JTable(model, new RelationMemberTableColumnModel());
JPanel pnl = new JPanel();
@@ -133,7 +93,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
model = new RelationMemberTableModel();
model.addTableModelListener(this);
getContentPane().setLayout(new BorderLayout());
- getContentPane().add(buildMessagePanel(), BorderLayout.NORTH);
+ getContentPane().add(htmlPanel = new HtmlPanel(), BorderLayout.NORTH);
getContentPane().add(buildRelationMemberTablePanel(), BorderLayout.CENTER);
getContentPane().add(buildButtonPanel(), BorderLayout.SOUTH);
@@ -155,7 +115,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
} else {
msg = tr("<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} relations</strong>.</html>", numObjectsToDelete,numParentRelations);
}
- jepMessage.setText(msg);
+ htmlPanel.getEditorPane().setText(msg);
invalidate();
}
@@ -168,6 +128,9 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
}
}
+ /**
+ * Constructs a new {@code DeleteFromRelationConfirmationDialog}.
+ */
public DeleteFromRelationConfirmationDialog() {
super(JOptionPane.getFrameForComponent(Main.parent), "", ModalityType.DOCUMENT_MODAL);
build();
@@ -206,12 +169,13 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
)
).applySafe(this);
setCanceled(false);
- } else if(!visible && isShowing()) {
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateMessage();
updateTitle();
@@ -222,8 +186,11 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
*
*/
public static class RelationMemberTableModel extends DefaultTableModel {
- private ArrayList<RelationToChildReference> data;
+ private List<RelationToChildReference> data;
+ /**
+ * Constructs a new {@code RelationMemberTableModel}.
+ */
public RelationMemberTableModel() {
data = new ArrayList<RelationToChildReference>();
}
@@ -239,6 +206,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
data,
new Comparator<RelationToChildReference>() {
private NameFormatter nf = DefaultNameFormatter.getInstance();
+ @Override
public int compare(RelationToChildReference o1, RelationToChildReference o2) {
int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf));
if (cmp != 0) return cmp;
@@ -298,6 +266,10 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
return null;
}
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ return false;
+ }
}
private static class RelationMemberTableColumnModel extends DefaultTableColumnModel{
@@ -352,6 +324,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
putValue(SHORT_DESCRIPTION, tr("Click to close the dialog and remove the object from the relations"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
setCanceled(false);
setVisible(false);
@@ -365,6 +338,7 @@ public class DeleteFromRelationConfirmationDialog extends JDialog implements Tab
putValue(SHORT_DESCRIPTION, tr("Click to close the dialog and to abort deleting the objects"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
setCanceled(true);
setVisible(false);
diff --git a/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java b/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java
index c72f29e..e46162f 100644
--- a/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java
+++ b/src/org/openstreetmap/josm/gui/actionsupport/LogShowDialog.java
@@ -1,18 +1,20 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.actionsupport;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.Dimension;
import java.awt.GridBagLayout;
-import javax.swing.*;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference;
-import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
import org.openstreetmap.josm.tools.GBC;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
/**
* Generic dialog with message and scrolling area
* @author Alexei
@@ -33,7 +35,7 @@ public class LogShowDialog extends ExtendedDialog {
lbl.setFont(lbl.getFont().deriveFont(0, 14));
p.add(lbl, GBC.eol().insets(5,0,5,0));
- JEditorPane txt = new JEditorPane();
+ JosmEditorPane txt = new JosmEditorPane();
txt.setContentType("text/html");
txt.setText(log);
txt.setEditable(false);
@@ -49,5 +51,3 @@ public class LogShowDialog extends ExtendedDialog {
return p;
}
}
-
-
diff --git a/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
index d21a2e3..33e2456 100644
--- a/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
@@ -6,12 +6,12 @@ import org.openstreetmap.josm.data.Bounds;
/**
* A BBoxChooser is a component which provides a UI for choosing a
* bounding box.
- *
+ *
*/
public interface BBoxChooser {
/**
- * A BBoxChooser emits {@link ProperyChangeEvent}s for this property
+ * A BBoxChooser emits {@link java.beans.PropertyChangeEvent}s for this property
* if the current bounding box changes.
*/
String BBOX_PROP = BBoxChooser.class.getName() + ".bbox";
@@ -19,7 +19,7 @@ public interface BBoxChooser {
/**
* Sets the current bounding box in this BboxChooser. If {@code bbox}
* is null the current bbox in this BBoxChooser is removed.
- *
+ *
* @param bbox the bounding box
*/
public void setBoundingBox(Bounds bbox);
@@ -28,7 +28,7 @@ public interface BBoxChooser {
* Replies the currently selected bounding box in this BBoxChooser.
* Replies null, if currently there isn't a bbox choosen in this
* BBoxChooser.
- *
+ *
* @return the currently selected bounding box
*/
public Bounds getBoundingBox();
diff --git a/src/org/openstreetmap/josm/gui/bbox/SizeButton.java b/src/org/openstreetmap/josm/gui/bbox/SizeButton.java
index 4d85635..b19377f 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SizeButton.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SizeButton.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Tim Haussmann
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.bbox;
import java.awt.Graphics;
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index 8d79cf4..b697ffe 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -10,14 +10,13 @@ import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Point;
import java.awt.Rectangle;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import java.util.Vector;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.JOptionPane;
@@ -26,24 +25,23 @@ import org.openstreetmap.gui.jmapviewer.Coordinate;
import org.openstreetmap.gui.jmapviewer.JMapViewer;
import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
-import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
import org.openstreetmap.gui.jmapviewer.OsmMercator;
import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOsmTileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
import org.openstreetmap.josm.data.preferences.StringProperty;
import org.openstreetmap.josm.gui.layer.TMSLayer;
-public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
+public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
public interface TileSourceProvider {
List<TileSource> getTileSources();
@@ -102,7 +100,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
* TMS TileSource provider for the slippymap chooser
*/
public static class TMSTileSourceProvider implements TileSourceProvider {
- static final HashSet<String> existingSlippyMapUrls = new HashSet<String>();
+ static final Set<String> existingSlippyMapUrls = new HashSet<String>();
static {
// Urls that already exist in the slippymap chooser and shouldn't be copied from TMS layer list
existingSlippyMapUrls.add("http://tile.openstreetmap.org/{zoom}/{x}/{y}.png"); // Mapnik
@@ -140,7 +138,6 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
}
}
-
/**
* Plugins that wish to add custom tile sources to slippy map choose should call this method
* @param tileSourceProvider
@@ -169,37 +166,31 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
private static final StringProperty PROP_MAPSTYLE = new StringProperty("slippy_map_chooser.mapstyle", "Mapnik");
public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize";
- private TileLoader cachedLoader;
- private TileLoader uncachedLoader;
+ private OsmTileLoader cachedLoader;
+ private OsmTileLoader uncachedLoader;
private final SizeButton iSizeButton = new SizeButton();
private final SourceButton iSourceButton;
private Bounds bbox;
- // upper left and lower right corners of the selection rectangle (x/y on
- // ZOOM_MAX)
+ // upper left and lower right corners of the selection rectangle (x/y on ZOOM_MAX)
Point iSelectionRectStart;
Point iSelectionRectEnd;
+ /**
+ * Constructs a new {@code SlippyMapBBoxChooser}.
+ */
public SlippyMapBBoxChooser() {
- super();
TMSLayer.setMaxWorkers();
- cachedLoader = null;
- String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
- if (cachePath != null && !cachePath.isEmpty()) {
- try {
- cachedLoader = new OsmFileCacheTileLoader(this, new File(cachePath));
- } catch (IOException e) {
- }
- }
+ cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this);
uncachedLoader = new OsmTileLoader(this);
+ uncachedLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
setZoomContolsVisible(Main.pref.getBoolean("slippy_map_chooser.zoomcontrols",false));
setMapMarkerVisible(false);
setMinimumSize(new Dimension(350, 350 / 2));
// We need to set an initial size - this prevents a wrong zoom selection
- // for
- // the area before the component has been displayed the first time
+ // for the area before the component has been displayed the first time
setBounds(new Rectangle(getMinimumSize()));
if (cachedLoader == null) {
setFileCacheEnabled(false);
@@ -208,10 +199,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
}
setMaxTilesInMemory(Main.pref.getInteger("slippy_map_chooser.max_tiles", 1000));
- List<TileSource> tileSources = new ArrayList<TileSource>();
- for (TileSourceProvider provider: providers) {
- tileSources.addAll(provider.getTileSources());
- }
+ List<TileSource> tileSources = getAllTileSources();
iSourceButton = new SourceButton(tileSources);
@@ -232,6 +220,14 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
new SlippyMapControler(this, this, iSizeButton, iSourceButton);
}
+
+ private List<TileSource> getAllTileSources() {
+ List<TileSource> tileSources = new ArrayList<TileSource>();
+ for (TileSourceProvider provider: providers) {
+ tileSources.addAll(provider.getTileSources());
+ }
+ return tileSources;
+ }
public boolean handleAttribution(Point p, boolean click) {
return attribution.handleAttribution(p, click);
@@ -347,6 +343,7 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
PROP_MAPSTYLE.put(tileSource.getName()); // TODO Is name really unique?
}
+ @Override
public Bounds getBoundingBox() {
return bbox;
}
@@ -357,9 +354,10 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
*
* @param bbox the bounding box. null to reset the bounding box
*/
+ @Override
public void setBoundingBox(Bounds bbox) {
- if (bbox == null || (bbox.getMin().lat() == 0.0 && bbox.getMin().lon() == 0.0
- && bbox.getMax().lat() == 0.0 && bbox.getMax().lon() == 0.0)) {
+ if (bbox == null || (bbox.getMinLat() == 0.0 && bbox.getMinLon() == 0.0
+ && bbox.getMaxLat() == 0.0 && bbox.getMaxLon() == 0.0)) {
this.bbox = null;
iSelectionRectStart = null;
iSelectionRectEnd = null;
@@ -368,15 +366,15 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
}
this.bbox = bbox;
- double minLon = bbox.getMin().lon();
- double maxLon = bbox.getMax().lon();
+ double minLon = bbox.getMinLon();
+ double maxLon = bbox.getMaxLon();
if (bbox.crosses180thMeridian()) {
minLon -= 360.0;
}
- int y1 = OsmMercator.LatToY(bbox.getMin().lat(), MAX_ZOOM);
- int y2 = OsmMercator.LatToY(bbox.getMax().lat(), MAX_ZOOM);
+ int y1 = OsmMercator.LatToY(bbox.getMinLat(), MAX_ZOOM);
+ int y2 = OsmMercator.LatToY(bbox.getMaxLat(), MAX_ZOOM);
int x1 = OsmMercator.LonToX(minLon, MAX_ZOOM);
int x2 = OsmMercator.LonToX(maxLon, MAX_ZOOM);
@@ -384,10 +382,10 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
iSelectionRectEnd = new Point(Math.max(x1, x2), Math.max(y1, y2));
// calc the screen coordinates for the new selection rectangle
- MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMin().lat(), bbox.getMin().lon());
- MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMax().lat(), bbox.getMax().lon());
+ MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon());
+ MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
- Vector<MapMarker> marker = new Vector<MapMarker>(2);
+ List<MapMarker> marker = new ArrayList<MapMarker>(2);
marker.add(xmin_ymin);
marker.add(xmax_ymax);
setMapMarkerList(marker);
@@ -395,4 +393,12 @@ public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
zoomOut();
repaint();
}
+
+ /**
+ * Refreshes the tile sources
+ * @since 6364
+ */
+ public final void refreshTileSources() {
+ iSourceButton.setSources(getAllTileSources());
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
index fcf7e38..8db6204 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
@@ -1,5 +1,4 @@
-// This code has been adapted and copied from code that has been written by Immanuel Scholz and others for JOSM.
-// License: GPL. Copyright 2007 by Tim Haussmann
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.bbox;
import java.awt.Point;
@@ -20,7 +19,6 @@ import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.KeyStroke;
-
/**
* This class controls the user input by listening to mouse and key events.
* Currently implemented is: - zooming in and out with scrollwheel - zooming in
@@ -50,19 +48,18 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
private Point iStartSelectionPoint;
private Point iEndSelectionPoint;
- // the SlippyMapChooserComponent
private final SlippyMapBBoxChooser iSlippyMapChooser;
private SizeButton iSizeButton = null;
private SourceButton iSourceButton = null;
-
+
private boolean isSelecting;
/**
- * Create a new OsmMapControl
+ * Constructs a new {@code SlippyMapControler}.
*/
public SlippyMapControler(SlippyMapBBoxChooser navComp, JPanel contentPane, SizeButton sizeButton, SourceButton sourceButton) {
- this.iSlippyMapChooser = navComp;
+ iSlippyMapChooser = navComp;
iSlippyMapChooser.addMouseListener(this);
iSlippyMapChooser.addMouseMotionListener(this);
@@ -78,7 +75,7 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
}
iSizeButton = sizeButton;
iSourceButton = sourceButton;
-
+
isSelecting = false;
InputMap inputMap = navComp.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
@@ -100,10 +97,13 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.META_DOWN_MASK, false), "ZOOM_IN");
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_DOWN_MASK, false), "ZOOM_IN");
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, 0, false), "ZOOM_IN");
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, 0, false), "ZOOM_IN");
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.SHIFT_DOWN_MASK, false), "ZOOM_IN");
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_DOWN_MASK, false), "ZOOM_OUT");
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.META_DOWN_MASK, false), "ZOOM_OUT");
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_DOWN_MASK, false), "ZOOM_OUT");
inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, 0, false), "ZOOM_OUT");
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, 0, false), "ZOOM_OUT");
// action mapping
actionMap.put("MOVE_RIGHT", new MoveXAction(1));
@@ -150,15 +150,15 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
public void mouseReleased(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON1) {
- if (isSelecting && e.getClickCount() == 1) {
+ if (isSelecting && e.getClickCount() == 1) {
iSlippyMapChooser.setSelection(iStartSelectionPoint, e.getPoint());
// reset the selections start and end
iEndSelectionPoint = null;
iStartSelectionPoint = null;
isSelecting = false;
-
- } else {
+
+ } else {
int sourceButton = iSourceButton.hit(e.getPoint());
if (iSizeButton.hit(e.getPoint())) {
@@ -172,7 +172,7 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
} else if (sourceButton != 0) {
iSlippyMapChooser.toggleMapSource(iSourceButton.hitToTileSource(sourceButton));
}
- }
+ }
}
}
@@ -189,6 +189,7 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
this.direction = direction;
}
+ @Override
public void actionPerformed(ActionEvent e) {
moveTask.setDirectionX(direction);
}
@@ -202,6 +203,7 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
this.direction = direction;
}
+ @Override
public void actionPerformed(ActionEvent e) {
moveTask.setDirectionY(direction);
}
@@ -312,6 +314,7 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
private class ZoomInAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
iSlippyMapChooser.zoomIn();
}
@@ -319,6 +322,7 @@ public class SlippyMapControler extends MouseAdapter implements MouseMotionListe
private class ZoomOutAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
iSlippyMapChooser.zoomOut();
}
diff --git a/src/org/openstreetmap/josm/gui/bbox/SourceButton.java b/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
index 7b20083..d0fc897 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
@@ -7,11 +7,12 @@ import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.RenderingHints;
-import java.util.List;
+import java.util.Collection;
import javax.swing.ImageIcon;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
public class SourceButton {
@@ -22,7 +23,7 @@ public class SourceButton {
private int barWidth;
private int layerHeight;
- private final TileSource[] sources;
+ private TileSource[] sources;
private ImageIcon enlargeImage;
private ImageIcon shrinkImage;
@@ -33,12 +34,22 @@ public class SourceButton {
public static final int HIDE_OR_SHOW = 1;
- public SourceButton(List<TileSource> sources) {
- this.sources = sources.toArray(new TileSource[sources.size()]);
+ public SourceButton(Collection<TileSource> sources) {
+ setSources(sources);
this.currentMap = 2;
enlargeImage = ImageProvider.get("layer-switcher-maximize.png");
shrinkImage = ImageProvider.get("layer-switcher-minimize.png");
}
+
+ /**
+ * Set the tile sources.
+ * @param sources The tile sources to display
+ * @since 6364
+ */
+ public final void setSources(Collection<TileSource> sources) {
+ CheckParameterUtil.ensureParameterNotNull(sources, "sources");
+ this.sources = sources.toArray(new TileSource[sources.size()]);
+ }
public void paint(Graphics2D g) {
if (isEnlarged) {
diff --git a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
index 0957589..2a6586b 100644
--- a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
@@ -20,9 +20,10 @@ import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
-import java.util.Vector;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,7 +33,6 @@ import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
-import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent;
@@ -42,11 +42,15 @@ import javax.swing.text.JTextComponent;
import org.openstreetmap.gui.jmapviewer.JMapViewer;
import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
import org.openstreetmap.gui.jmapviewer.OsmMercator;
+import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -64,7 +68,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* public void propertyChange(PropertyChangeEvent evt) {
* // listen for BBOX events
* if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) {
- * System.out.println("new bbox based on OSM tiles selected: " + (Bounds)evt.getNewValue());
+ * Main.info("new bbox based on OSM tiles selected: " + (Bounds)evt.getNewValue());
* }
* }
* });
@@ -119,6 +123,9 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
pnlTileGrid.addPropertyChangeListener(new TileBoundsChangeListener());
}
+ /**
+ * Constructs a new {@code TileSelectionBBoxChooser}.
+ */
public TileSelectionBBoxChooser() {
build();
}
@@ -127,6 +134,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
* Replies the current bounding box. null, if no valid bounding box is currently selected.
*
*/
+ @Override
public Bounds getBoundingBox() {
return bbox;
}
@@ -136,6 +144,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
*
* @param bbox the bounding box. null, if this widget isn't initialized with a bounding box
*/
+ @Override
public void setBoundingBox(Bounds bbox) {
pnlTileGrid.initFromBoundingBox(bbox);
}
@@ -144,10 +153,10 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
if (bbox == null) return;
// calc the screen coordinates for the new selection rectangle
- MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMin().lat(), bbox.getMin().lon());
- MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMax().lat(), bbox.getMax().lon());
+ MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon());
+ MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
- Vector<MapMarker> marker = new Vector<MapMarker>(2);
+ List<MapMarker> marker = new ArrayList<MapMarker>(2);
marker.add(xmin_ymin);
marker.add(xmax_ymax);
mapViewer.setBoundingBox(bbox);
@@ -189,6 +198,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
* property change events for {@link BBoxChooser#BBOX_PROP}
*/
class TileBoundsChangeListener implements PropertyChangeListener {
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (!evt.getPropertyName().equals(TileGridInputPanel.TILE_BOUNDS_PROP)) return;
TileBounds tb = (TileBounds)evt.getNewValue();
@@ -209,10 +219,10 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
static private class TileGridInputPanel extends JPanel implements PropertyChangeListener{
static public final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds";
- private JTextField tfMaxY;
- private JTextField tfMinY;
- private JTextField tfMaxX;
- private JTextField tfMinX;
+ private JosmTextField tfMaxY;
+ private JosmTextField tfMinY;
+ private JosmTextField tfMaxX;
+ private JosmTextField tfMinX;
private TileCoordinateValidator valMaxY;
private TileCoordinateValidator valMinY;
private TileCoordinateValidator valMaxX;
@@ -266,7 +276,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
gc.gridx = 1;
gc.weightx = 0.5;
- pnl.add(tfMinX = new JTextField(), gc);
+ pnl.add(tfMinX = new JosmTextField(), gc);
valMinX = new TileCoordinateValidator(tfMinX);
SelectAllOnFocusGainedDecorator.decorate(tfMinX);
tfMinX.addActionListener(tileBoundsBuilder);
@@ -274,7 +284,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
gc.gridx = 2;
gc.weightx = 0.5;
- pnl.add(tfMaxX = new JTextField(), gc);
+ pnl.add(tfMaxX = new JosmTextField(), gc);
valMaxX = new TileCoordinateValidator(tfMaxX);
SelectAllOnFocusGainedDecorator.decorate(tfMaxX);
tfMaxX.addActionListener(tileBoundsBuilder);
@@ -287,7 +297,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
gc.gridx = 1;
gc.weightx = 0.5;
- pnl.add(tfMinY = new JTextField(), gc);
+ pnl.add(tfMinY = new JosmTextField(), gc);
valMinY = new TileCoordinateValidator(tfMinY);
SelectAllOnFocusGainedDecorator.decorate(tfMinY);
tfMinY.addActionListener(tileBoundsBuilder);
@@ -295,7 +305,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
gc.gridx = 2;
gc.weightx = 0.5;
- pnl.add(tfMaxY = new JTextField(), gc);
+ pnl.add(tfMaxY = new JosmTextField(), gc);
valMaxY = new TileCoordinateValidator(tfMaxY);
SelectAllOnFocusGainedDecorator.decorate(tfMaxY);
tfMaxY.addActionListener(tileBoundsBuilder);
@@ -332,12 +342,12 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
TileBounds tb = new TileBounds();
tb.zoomLevel = (Integer) spZoomLevel.getValue();
tb.min = new Point(
- Math.max(0,lonToTileX(tb.zoomLevel, bbox.getMin().lon())),
- Math.max(0,latToTileY(tb.zoomLevel, bbox.getMax().lat()-.00001))
+ Math.max(0,lonToTileX(tb.zoomLevel, bbox.getMinLon())),
+ Math.max(0,latToTileY(tb.zoomLevel, bbox.getMaxLat() - 0.00001))
);
tb.max = new Point(
- Math.max(0,lonToTileX(tb.zoomLevel, bbox.getMax().lon())),
- Math.max(0,latToTileY(tb.zoomLevel, bbox.getMin().lat()-.00001))
+ Math.max(0,lonToTileX(tb.zoomLevel, bbox.getMaxLon())),
+ Math.max(0,latToTileY(tb.zoomLevel, bbox.getMinLat() - 0.00001))
);
doFireTileBoundChanged = false;
setTileBounds(tb);
@@ -364,6 +374,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
spZoomLevel.setValue(tileBounds.zoomLevel);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(TileAddressInputPanel.TILE_BOUNDS_PROP)) {
TileBounds tb = (TileBounds)evt.getNewValue();
@@ -378,6 +389,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
}
class ZomeLevelChangeHandler implements ChangeListener {
+ @Override
public void stateChanged(ChangeEvent e) {
int zoomLevel = (Integer)spZoomLevel.getValue();
valMaxX.setZoomLevel(zoomLevel);
@@ -395,24 +407,25 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
if (!valMinY.isValid()) return;
Point min = new Point(valMinX.getTileIndex(), valMinY.getTileIndex());
Point max = new Point(valMaxX.getTileIndex(), valMaxY.getTileIndex());
- if (min.x > max.x) {
-
- }
int zoomlevel = (Integer)spZoomLevel.getValue();
TileBounds tb = new TileBounds(min, max, zoomlevel);
fireTileBoundsChanged(tb);
}
+ @Override
public void focusGained(FocusEvent e) {/* irrelevant */}
+ @Override
public void focusLost(FocusEvent e) {
buildTileBounds();
}
+ @Override
public void actionPerformed(ActionEvent e) {
buildTileBounds();
}
+ @Override
public void stateChanged(ChangeEvent e) {
buildTileBounds();
}
@@ -427,7 +440,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
static public final String TILE_BOUNDS_PROP = TileAddressInputPanel.class.getName() + ".tileBounds";
- private JTextField tfTileAddress;
+ private JosmTextField tfTileAddress;
private TileAddressValidator valTileAddress;
protected JPanel buildTextPanel() {
@@ -451,7 +464,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
gc.weightx = 1.0;
gc.gridx = 1;
- pnl.add(tfTileAddress = new JTextField(), gc);
+ pnl.add(tfTileAddress = new JosmTextField(), gc);
valTileAddress = new TileAddressValidator(tfTileAddress);
SelectAllOnFocusGainedDecorator.decorate(tfTileAddress);
@@ -499,6 +512,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
putValue(SHORT_DESCRIPTION, tr("Apply the tile address"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
TileBounds tb = valTileAddress.getTileBounds();
if (tb != null) {
@@ -587,7 +601,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
public boolean isValid() {
String value = getComponent().getText().trim();
try {
- if (value.equals("")) {
+ if (value.isEmpty()) {
tileIndex = 0;
} else {
tileIndex = Integer.parseInt(value);
@@ -654,6 +668,10 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
public TileBoundsMapView() {
setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
+ TileLoader loader = tileController.getTileLoader();
+ if (loader instanceof OsmTileLoader) {
+ ((OsmTileLoader)loader).headers.put("User-Agent", Version.getInstance().getFullAgentString());
+ }
}
public void setBoundingBox(Bounds bbox){
@@ -661,10 +679,10 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser{
min = null;
max = null;
} else {
- int y1 = OsmMercator.LatToY(bbox.getMin().lat(), MAX_ZOOM);
- int y2 = OsmMercator.LatToY(bbox.getMax().lat(), MAX_ZOOM);
- int x1 = OsmMercator.LonToX(bbox.getMin().lon(), MAX_ZOOM);
- int x2 = OsmMercator.LonToX(bbox.getMax().lon(), MAX_ZOOM);
+ int y1 = OsmMercator.LatToY(bbox.getMinLat(), MAX_ZOOM);
+ int y2 = OsmMercator.LatToY(bbox.getMaxLat(), MAX_ZOOM);
+ int x1 = OsmMercator.LonToX(bbox.getMinLon(), MAX_ZOOM);
+ int x2 = OsmMercator.LonToX(bbox.getMaxLon(), MAX_ZOOM);
min = new Point(Math.min(x1, x2), Math.min(y1, y2));
max = new Point(Math.max(x1, x2), Math.max(y1, y2));
diff --git a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
index 02da353..daa4600 100644
--- a/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
+++ b/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.gui.conflict;
import static org.openstreetmap.josm.tools.I18n.marktr;
import java.awt.Color;
-import java.util.List;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences.ColorKey;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java
index 0761a78..71b03ed 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java
@@ -13,6 +13,7 @@ public class ComparePairListCellRenderer extends JLabel implements ListCellRende
public ComparePairListCellRenderer() {
setOpaque(true);
}
+ @Override
public Component getListCellRendererComponent(
JList list,
Object value,
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java b/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
index c5754e8..0c8b861 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
@@ -5,6 +5,8 @@ import static org.openstreetmap.josm.gui.conflict.pair.ListRole.MY_ENTRIES;
import static org.openstreetmap.josm.gui.conflict.pair.ListRole.THEIR_ENTRIES;
import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.Utils;
+
/**
* Enumeration of the possible comparison pairs
*
@@ -12,17 +14,17 @@ import static org.openstreetmap.josm.tools.I18n.tr;
public enum ComparePairType {
/**
- * compare my version of an {@link OsmPrimitive} with their version
+ * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with their version
*/
MY_WITH_THEIR (tr("My with Their"), new ListRole[] {MY_ENTRIES, THEIR_ENTRIES}),
/**
- * compare my version of an {@link OsmPrimitive} with the merged version
+ * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version
*/
MY_WITH_MERGED (tr("My with Merged"), new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}),
/**
- * compare their version of an {@link OsmPrimitive} with the merged veresion
+ * compare their version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged veresion
*/
THEIR_WITH_MERGED(tr("Their with Merged"), new ListRole[] {THEIR_ENTRIES, MERGED_ENTRIES});
@@ -32,7 +34,7 @@ public enum ComparePairType {
ComparePairType(String displayName, ListRole[] participatingRoles) {
this.displayName = displayName;
- this.participatingRoles = participatingRoles;
+ this.participatingRoles = Utils.copyArray(participatingRoles);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
index 1cc65d5..ffcce38 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
@@ -162,7 +162,12 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener
/**
* handles property change events
+ * @param evt the event
+ * @see TagMergeModel
+ * @see ListMergeModel
+ * @see PropertiesMergeModel
*/
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(TagMergeModel.PROP_NUM_UNDECIDED_TAGS)) {
int newValue = (Integer)evt.getNewValue();
@@ -222,9 +227,7 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener
/**
* populates the conflict resolver with the conflicts between my and their
*
- * @param my my primitive (i.e. the primitive in the local dataset)
- * @param their their primitive (i.e. the primitive in the server dataset)
- *
+ * @param conflict the conflict data set
*/
public void populate(Conflict<? extends OsmPrimitive> conflict) {
setMy(conflict.getMy());
@@ -255,7 +258,7 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener
updateResolvedCompletely();
selectFirstTabWithConflicts();
}
-
+
public void selectFirstTabWithConflicts() {
for (int i = 0; i < tabbedPane.getTabCount(); i++) {
if (tabbedPane.isEnabledAt(i) && mergeIncomplete.equals(tabbedPane.getIconAt(i))) {
@@ -272,7 +275,7 @@ public class ConflictResolver extends JPanel implements PropertyChangeListener
* @return the resolution command
*/
public Command buildResolveCommand() {
- ArrayList<Command> commands = new ArrayList<Command>();
+ List<Command> commands = new ArrayList<Command>();
if (tagMerger.getModel().getNumResolvedConflicts() > 0) {
commands.add(tagMerger.getModel().buildResolveCommand(conflict));
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
index 0089834..086e0e3 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
@@ -54,12 +54,12 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
*
* A ListMergeModel can be ''frozen''. If it's frozen, it doesn't accept additional merge
* decisions. {@link PropertyChangeListener}s can register for property value changes of
- * {@link #PROP_FROZEN}.
+ * {@link #FROZEN_PROP}.
*
* ListMergeModel is an abstract class. Three methods have to be implemented by subclasses:
* <ul>
- * <li>{@link ListMergeModel#cloneEntryForMergedList(Object)} - clones an entry of type T</li>
- * <li>{@link ListMergeModel#isEqualEntry(Object, Object)} - checks whether two entries are equals </li>
+ * <li>{@link ListMergeModel#cloneEntryForMergedList} - clones an entry of type T</li>
+ * <li>{@link ListMergeModel#isEqualEntry} - checks whether two entries are equals </li>
* <li>{@link ListMergeModel#setValueAt(DefaultTableModel, Object, int, int)} - handles values edited in
* a JTable, dispatched from {@link TableModel#setValueAt(Object, int, int)} </li>
* </ul>
@@ -73,7 +73,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
private static final int MAX_DELETED_PRIMITIVE_IN_DIALOG = 5;
- protected HashMap<ListRole, ArrayList<T>> entries;
+ protected Map<ListRole, ArrayList<T>> entries;
protected EntriesTableModel myEntriesTableModel;
protected EntriesTableModel theirEntriesTableModel;
@@ -86,7 +86,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
private final List<PropertyChangeListener> listeners;
private boolean isFrozen = false;
private final ComparePairListModel comparePairListModel;
-
+
private DataSet myDataset;
private Map<PrimitiveId, PrimitiveId> mergedMap;
@@ -129,7 +129,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
public OsmPrimitive getMyPrimitive(T entry) {
return getMyPrimitiveById(entry);
}
-
+
public final OsmPrimitive getMyPrimitiveById(PrimitiveId entry) {
OsmPrimitive result = myDataset.getPrimitiveById(entry);
if (result == null && mergedMap != null) {
@@ -335,7 +335,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
getMergedEntries().clear();
fireModelDataChanged();
}
-
+
protected final void initPopulate(OsmPrimitive my, OsmPrimitive their, Map<PrimitiveId, PrimitiveId> mergedMap) {
CheckParameterUtil.ensureParameterNotNull(my, "my");
CheckParameterUtil.ensureParameterNotNull(their, "their");
@@ -585,7 +585,6 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
*
* From the point of view of the {@link JTable} it is a {@link TableModel}.
*
- * @param <T>
* @see ListMergeModel#getMyTableModel()
* @see ListMergeModel#getTheirTableModel()
* @see ListMergeModel#getMergedTableModel()
@@ -693,7 +692,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
return false;
}
- protected ArrayList<T> getEntries() {
+ protected List<T> getEntries() {
return entries.get(role);
}
@@ -702,7 +701,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
*
* @return the opposite list of entries
*/
- protected ArrayList<T> getOppositeEntries() {
+ protected List<T> getOppositeEntries() {
ListRole opposite = getComparePairListModel().getSelectedComparePair().getOppositeRole(role);
return entries.get(opposite);
}
@@ -719,7 +718,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
} else if (value instanceof RelationMember) {
return ((RelationMember)value).getMember();
} else {
- System.err.println("Unknown object type: "+value);
+ Main.error("Unknown object type: "+value);
return null;
}
}
@@ -738,7 +737,7 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
*
*/
protected class EntriesSelectionModel extends DefaultListSelectionModel {
- private final ArrayList<T> entries;
+ private final List<T> entries;
public EntriesSelectionModel(ArrayList<T> nodes) {
this.entries = nodes;
@@ -831,8 +830,8 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
public class ComparePairListModel extends AbstractListModel implements ComboBoxModel {
- private int selectedIdx;
- private final ArrayList<ComparePairType> compareModes;
+ private int selectedIdx;
+ private final List<ComparePairType> compareModes;
public ComparePairListModel() {
this.compareModes = new ArrayList<ComparePairType>();
@@ -842,20 +841,24 @@ public abstract class ListMergeModel<T extends PrimitiveId> extends Observable {
selectedIdx = 0;
}
+ @Override
public Object getElementAt(int index) {
if (index < compareModes.size())
return compareModes.get(index);
throw new IllegalArgumentException(tr("Unexpected value of parameter ''index''. Got {0}.", index));
}
+ @Override
public int getSize() {
return compareModes.size();
}
+ @Override
public Object getSelectedItem() {
return compareModes.get(selectedIdx);
}
+ @Override
public void setSelectedItem(Object anItem) {
int i = compareModes.indexOf(anItem);
if (i < 0)
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
index bf7001e..be9f684 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
@@ -4,21 +4,16 @@ package org.openstreetmap.josm.gui.conflict.pair;
import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
-import java.awt.Adjustable;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
-import java.awt.event.AdjustmentEvent;
-import java.awt.event.AdjustmentListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Observable;
import java.util.Observer;
@@ -42,15 +37,15 @@ import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.AdjustmentSynchronizer;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
/**
* A UI component for resolving conflicts in two lists of entries of type T.
*
- * @param T the type of the entries
+ * @param <T> the type of the entries
* @see ListMergeModel
*/
public abstract class ListMerger<T extends PrimitiveId> extends JPanel implements PropertyChangeListener, Observer {
@@ -79,10 +74,6 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
private AdjustmentSynchronizer adjustmentSynchronizer;
- private JCheckBox cbLockMyScrolling;
- private JCheckBox cbLockMergedScrolling;
- private JCheckBox cbLockTheirScrolling;
-
private JLabel lblMyVersion;
private JLabel lblMergedVersion;
private JLabel lblTheirVersion;
@@ -311,19 +302,19 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
gc.weightx = 0.33;
gc.weighty = 0.0;
gc.insets = new Insets(0,0,0,0);
- cbLockMyScrolling = new JCheckBox();
+ JCheckBox cbLockMyScrolling = new JCheckBox();
cbLockMyScrolling.setName("checkbox.lockmyscrolling");
add(buildAdjustmentLockControlPanel(cbLockMyScrolling), gc);
gc.gridx = 2;
gc.gridy = 1;
- cbLockMergedScrolling = new JCheckBox();
+ JCheckBox cbLockMergedScrolling = new JCheckBox();
cbLockMergedScrolling.setName("checkbox.lockmergedscrolling");
add(buildAdjustmentLockControlPanel(cbLockMergedScrolling), gc);
gc.gridx = 4;
gc.gridy = 1;
- cbLockTheirScrolling = new JCheckBox();
+ JCheckBox cbLockTheirScrolling = new JCheckBox();
cbLockTheirScrolling.setName("checkbox.locktheirscrolling");
add(buildAdjustmentLockControlPanel(cbLockTheirScrolling), gc);
@@ -412,6 +403,10 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
wireActionsToSelectionModels();
}
+ /**
+ * Constructs a new {@code ListMerger}.
+ * @param model
+ */
public ListMerger(ListMergeModel<T> model) {
this.model = model;
model.addObserver(this);
@@ -420,27 +415,37 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
}
/**
- * Action for copying selected nodes in the list of my nodes to the list of merged
- * nodes. Inserts the nodes at the beginning of the list of merged nodes.
- *
+ * Base class of all other Copy* inner classes.
*/
- class CopyStartLeftAction extends AbstractAction implements ListSelectionListener {
-
- public CopyStartLeftAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copystartleft.png");
+ abstract class CopyAction extends AbstractAction implements ListSelectionListener {
+
+ protected CopyAction(String icon_name, String action_name, String short_description) {
+ ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name+".png");
putValue(Action.SMALL_ICON, icon);
if (icon == null) {
- putValue(Action.NAME, tr("> top"));
+ putValue(Action.NAME, action_name);
}
- putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected nodes to the start of the merged node list"));
+ putValue(Action.SHORT_DESCRIPTION, short_description);
setEnabled(false);
}
+ }
+
+ /**
+ * Action for copying selected nodes in the list of my nodes to the list of merged
+ * nodes. Inserts the nodes at the beginning of the list of merged nodes.
+ */
+ class CopyStartLeftAction extends CopyAction {
- public void actionPerformed(ActionEvent arg0) {
- int [] rows = myEntriesTable.getSelectedRows();
- model.copyMyToTop(rows);
+ public CopyStartLeftAction() {
+ super("copystartleft", tr("> top"), tr("Copy my selected nodes to the start of the merged node list"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ model.copyMyToTop(myEntriesTable.getSelectedRows());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty());
}
@@ -449,25 +454,19 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
/**
* Action for copying selected nodes in the list of my nodes to the list of merged
* nodes. Inserts the nodes at the end of the list of merged nodes.
- *
*/
- class CopyEndLeftAction extends AbstractAction implements ListSelectionListener {
+ class CopyEndLeftAction extends CopyAction {
public CopyEndLeftAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copyendleft.png");
- putValue(Action.SMALL_ICON, icon);
- if (icon == null) {
- putValue(Action.NAME, tr("> bottom"));
- }
- putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements to the end of the list of merged elements."));
- setEnabled(false);
+ super("copyendleft", tr("> bottom"), tr("Copy my selected elements to the end of the list of merged elements."));
}
- public void actionPerformed(ActionEvent arg0) {
- int [] rows = myEntriesTable.getSelectedRows();
- model.copyMyToEnd(rows);
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ model.copyMyToEnd(myEntriesTable.getSelectedRows());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(!myEntriesTable.getSelectionModel().isSelectionEmpty());
}
@@ -476,33 +475,29 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
/**
* Action for copying selected nodes in the list of my nodes to the list of merged
* nodes. Inserts the nodes before the first selected row in the list of merged nodes.
- *
*/
- class CopyBeforeCurrentLeftAction extends AbstractAction implements ListSelectionListener {
+ class CopyBeforeCurrentLeftAction extends CopyAction {
public CopyBeforeCurrentLeftAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copybeforecurrentleft.png");
- putValue(Action.SMALL_ICON, icon);
- if (icon == null) {
- putValue(Action.NAME, "> before");
- }
- putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements before the first selected element in the list of merged elements."));
- setEnabled(false);
+ super("copybeforecurrentleft", tr("> before"),
+ tr("Copy my selected elements before the first selected element in the list of merged elements."));
}
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = myEntriesTable.getSelectedRows();
+ @Override
+ public void actionPerformed(ActionEvent e) {
int [] mergedRows = mergedEntriesTable.getSelectedRows();
if (mergedRows == null || mergedRows.length == 0)
return;
+ int [] myRows = myEntriesTable.getSelectedRows();
int current = mergedRows[0];
model.copyMyBeforeCurrent(myRows, current);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(
!myEntriesTable.getSelectionModel().isSelectionEmpty()
- && ! mergedEntriesTable.getSelectionModel().isSelectionEmpty()
+ && !mergedEntriesTable.getSelectionModel().isSelectionEmpty()
);
}
}
@@ -510,135 +505,115 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
/**
* Action for copying selected nodes in the list of my nodes to the list of merged
* nodes. Inserts the nodes after the first selected row in the list of merged nodes.
- *
*/
- class CopyAfterCurrentLeftAction extends AbstractAction implements ListSelectionListener {
+ class CopyAfterCurrentLeftAction extends CopyAction {
public CopyAfterCurrentLeftAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copyaftercurrentleft.png");
- putValue(Action.SMALL_ICON, icon);
- if (icon == null) {
- putValue(Action.NAME, "> after");
- }
- putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements after the first selected element in the list of merged elements."));
- setEnabled(false);
+ super("copyaftercurrentleft", tr("> after"),
+ tr("Copy my selected elements after the first selected element in the list of merged elements."));
}
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = myEntriesTable.getSelectedRows();
+ @Override
+ public void actionPerformed(ActionEvent e) {
int [] mergedRows = mergedEntriesTable.getSelectedRows();
if (mergedRows == null || mergedRows.length == 0)
return;
+ int [] myRows = myEntriesTable.getSelectedRows();
int current = mergedRows[0];
model.copyMyAfterCurrent(myRows, current);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(
!myEntriesTable.getSelectionModel().isSelectionEmpty()
- && ! mergedEntriesTable.getSelectionModel().isSelectionEmpty()
+ && !mergedEntriesTable.getSelectionModel().isSelectionEmpty()
);
}
}
- class CopyStartRightAction extends AbstractAction implements ListSelectionListener {
+ class CopyStartRightAction extends CopyAction {
public CopyStartRightAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copystartright.png");
- putValue(Action.SMALL_ICON, icon);
- if (icon == null) {
- putValue(Action.NAME, "< top");
- }
- putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element to the start of the list of merged elements."));
- setEnabled(false);
+ super("copystartright", tr("< top"), tr("Copy their selected element to the start of the list of merged elements."));
}
- public void actionPerformed(ActionEvent arg0) {
- int [] rows = theirEntriesTable.getSelectedRows();
- model.copyTheirToTop(rows);
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ model.copyTheirToTop(theirEntriesTable.getSelectedRows());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty());
}
}
- class CopyEndRightAction extends AbstractAction implements ListSelectionListener {
+ class CopyEndRightAction extends CopyAction {
public CopyEndRightAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copyendright.png");
- putValue(Action.SMALL_ICON, icon);
- if (icon == null) {
- putValue(Action.NAME, "< bottom");
- }
- putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements to the end of the list of merged elements."));
- setEnabled(false);
+ super("copyendright", tr("< bottom"), tr("Copy their selected elements to the end of the list of merged elements."));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
- int [] rows = theirEntriesTable.getSelectedRows();
- model.copyTheirToEnd(rows);
+ model.copyTheirToEnd(theirEntriesTable.getSelectedRows());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(!theirEntriesTable.getSelectionModel().isSelectionEmpty());
}
}
- class CopyBeforeCurrentRightAction extends AbstractAction implements ListSelectionListener {
+ class CopyBeforeCurrentRightAction extends CopyAction {
public CopyBeforeCurrentRightAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copybeforecurrentright.png");
- putValue(Action.SMALL_ICON, icon);
- if (icon == null) {
- putValue(Action.NAME, "< before");
- }
- putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements before the first selected element in the list of merged elements."));
- setEnabled(false);
+ super("copybeforecurrentright", tr("< before"),
+ tr("Copy their selected elements before the first selected element in the list of merged elements."));
}
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = theirEntriesTable.getSelectedRows();
+ @Override
+ public void actionPerformed(ActionEvent e) {
int [] mergedRows = mergedEntriesTable.getSelectedRows();
if (mergedRows == null || mergedRows.length == 0)
return;
+ int [] myRows = theirEntriesTable.getSelectedRows();
int current = mergedRows[0];
model.copyTheirBeforeCurrent(myRows, current);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(
!theirEntriesTable.getSelectionModel().isSelectionEmpty()
- && ! mergedEntriesTable.getSelectionModel().isSelectionEmpty()
+ && !mergedEntriesTable.getSelectionModel().isSelectionEmpty()
);
}
}
- class CopyAfterCurrentRightAction extends AbstractAction implements ListSelectionListener {
+ class CopyAfterCurrentRightAction extends CopyAction {
public CopyAfterCurrentRightAction() {
- ImageIcon icon = ImageProvider.get("dialogs/conflict", "copyaftercurrentright.png");
- putValue(Action.SMALL_ICON, icon);
- if (icon == null) {
- putValue(Action.NAME, "< after");
- }
- putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element after the first selected element in the list of merged elements"));
- setEnabled(false);
+ super("copyaftercurrentright", tr("< after"),
+ tr("Copy their selected element after the first selected element in the list of merged elements"));
}
- public void actionPerformed(ActionEvent arg0) {
- int [] myRows = theirEntriesTable.getSelectedRows();
+ @Override
+ public void actionPerformed(ActionEvent e) {
int [] mergedRows = mergedEntriesTable.getSelectedRows();
if (mergedRows == null || mergedRows.length == 0)
return;
+ int [] myRows = theirEntriesTable.getSelectedRows();
int current = mergedRows[0];
model.copyTheirAfterCurrent(myRows, current);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(
!theirEntriesTable.getSelectionModel().isSelectionEmpty()
- && ! mergedEntriesTable.getSelectionModel().isSelectionEmpty()
+ && !mergedEntriesTable.getSelectionModel().isSelectionEmpty()
);
}
}
@@ -651,6 +626,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
putValue(Action.SHORT_DESCRIPTION, tr("Copy all my elements to the target"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
model.copyAll(ListRole.MY_ENTRIES);
model.setFrozen(true);
@@ -660,10 +636,12 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
setEnabled(model.getMergedEntries().isEmpty() && !model.isFrozen());
}
+ @Override
public void update(Observable o, Object arg) {
updateEnabledState();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
updateEnabledState();
}
@@ -677,6 +655,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
putValue(Action.SHORT_DESCRIPTION, tr("Copy all their elements to the target"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
model.copyAll(ListRole.THEIR_ENTRIES);
model.setFrozen(true);
@@ -686,10 +665,12 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
setEnabled(model.getMergedEntries().isEmpty() && !model.isFrozen());
}
+ @Override
public void update(Observable o, Object arg) {
updateEnabledState();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
updateEnabledState();
}
@@ -703,15 +684,17 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
if (icon == null) {
putValue(Action.NAME, tr("Up"));
}
- putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected elements by one position."));
+ putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected entries by one position."));
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
int [] rows = mergedEntriesTable.getSelectedRows();
model.moveUpMerged(rows);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
int [] rows = mergedEntriesTable.getSelectedRows();
setEnabled(
@@ -739,11 +722,13 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
int [] rows = mergedEntriesTable.getSelectedRows();
model.moveDownMerged(rows);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
int [] rows = mergedEntriesTable.getSelectedRows();
setEnabled(
@@ -771,11 +756,13 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
int [] rows = mergedEntriesTable.getSelectedRows();
model.removeMerged(rows);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
int [] rows = mergedEntriesTable.getSelectedRows();
setEnabled(
@@ -802,6 +789,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
// do nothing
}
@@ -817,6 +805,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
btn.addItemListener(this);
addPropertyChangeListener(
new PropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(PROP_SELECTED)) {
btn.setSelected((Boolean)evt.getNewValue());
@@ -826,6 +815,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
);
}
+ @Override
public void itemStateChanged(ItemEvent e) {
int state = e.getStateChange();
if (state == ItemEvent.SELECTED) {
@@ -866,6 +856,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
}
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
handlePropertyChangeFrozen((Boolean)evt.getOldValue(), (Boolean)evt.getNewValue());
@@ -876,6 +867,7 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
return model;
}
+ @Override
public void update(Observable o, Object arg) {
lblMyVersion.setText(
trn("My version ({0} entry)", "My version ({0} entries)", model.getMyEntriesSize(), model.getMyEntriesSize())
@@ -887,150 +879,13 @@ public abstract class ListMerger<T extends PrimitiveId> extends JPanel implement
trn("Their version ({0} entry)", "Their version ({0} entries)", model.getTheirEntriesSize(), model.getTheirEntriesSize())
);
}
-
+
public void unlinkAsListener() {
myEntriesTable.unlinkAsListener();
mergedEntriesTable.unlinkAsListener();
theirEntriesTable.unlinkAsListener();
}
- /**
- * Synchronizes scrollbar adjustments between a set of
- * {@link Adjustable}s. Whenever the adjustment of one of
- * the registerd Adjustables is updated the adjustment of
- * the other registered Adjustables is adjusted too.
- *
- */
- class AdjustmentSynchronizer implements AdjustmentListener {
-
- private final ArrayList<Adjustable> synchronizedAdjustables;
- private final HashMap<Adjustable, Boolean> enabledMap;
-
- private final Observable observable;
-
- public AdjustmentSynchronizer() {
- synchronizedAdjustables = new ArrayList<Adjustable>();
- enabledMap = new HashMap<Adjustable, Boolean>();
- observable = new Observable();
- }
-
- /**
- * registers an {@link Adjustable} for participation in synchronized
- * scrolling.
- *
- * @param adjustable the adjustable
- */
- public void participateInSynchronizedScrolling(Adjustable adjustable) {
- if (adjustable == null)
- return;
- if (synchronizedAdjustables.contains(adjustable))
- return;
- synchronizedAdjustables.add(adjustable);
- setParticipatingInSynchronizedScrolling(adjustable, true);
- adjustable.addAdjustmentListener(this);
- }
-
- /**
- * event handler for {@link AdjustmentEvent}s
- *
- */
- public void adjustmentValueChanged(AdjustmentEvent e) {
- if (! enabledMap.get(e.getAdjustable()))
- return;
- for (Adjustable a : synchronizedAdjustables) {
- if (a != e.getAdjustable() && isParticipatingInSynchronizedScrolling(a)) {
- a.setValue(e.getValue());
- }
- }
- }
-
- /**
- * sets whether adjustable participates in adjustment synchronization
- * or not
- *
- * @param adjustable the adjustable
- */
- protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
- CheckParameterUtil.ensureParameterNotNull(adjustable, "adjustable");
- if (! synchronizedAdjustables.contains(adjustable))
- throw new IllegalStateException(tr("Adjustable {0} not registered yet. Cannot set participation in synchronized adjustment.", adjustable));
-
- enabledMap.put(adjustable, isParticipating);
- observable.notifyObservers();
- }
-
- /**
- * returns true if an adjustable is participating in synchronized scrolling
- *
- * @param adjustable the adjustable
- * @return true, if the adjustable is participating in synchronized scrolling, false otherwise
- * @throws IllegalStateException thrown, if adjustable is not registered for synchronized scrolling
- */
- protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) throws IllegalStateException {
- if (! synchronizedAdjustables.contains(adjustable))
- throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable));
-
- return enabledMap.get(adjustable);
- }
-
- /**
- * wires a {@link JCheckBox} to the adjustment synchronizer, in such a way that:
- * <li>
- * <ol>state changes in the checkbox control whether the adjustable participates
- * in synchronized adjustment</ol>
- * <ol>state changes in this {@link AdjustmentSynchronizer} are reflected in the
- * {@link JCheckBox}</ol>
- * </li>
- *
- *
- * @param view the checkbox to control whether an adjustable participates in synchronized
- * adjustment
- * @param adjustable the adjustable
- * @exception IllegalArgumentException thrown, if view is null
- * @exception IllegalArgumentException thrown, if adjustable is null
- */
- protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalStateException {
- CheckParameterUtil.ensureParameterNotNull(adjustable, "adjustable");
- CheckParameterUtil.ensureParameterNotNull(view, "view");
-
- if (! synchronizedAdjustables.contains(adjustable)) {
- participateInSynchronizedScrolling(adjustable);
- }
-
- // register an item lister with the check box
- //
- view.addItemListener(new ItemListener() {
- public void itemStateChanged(ItemEvent e) {
- switch(e.getStateChange()) {
- case ItemEvent.SELECTED:
- if (!isParticipatingInSynchronizedScrolling(adjustable)) {
- setParticipatingInSynchronizedScrolling(adjustable, true);
- }
- break;
- case ItemEvent.DESELECTED:
- if (isParticipatingInSynchronizedScrolling(adjustable)) {
- setParticipatingInSynchronizedScrolling(adjustable, false);
- }
- break;
- }
- }
- });
-
- observable.addObserver(
- new Observer() {
- public void update(Observable o, Object arg) {
- boolean sync = isParticipatingInSynchronizedScrolling(adjustable);
- if (view.isSelected() != sync) {
- view.setSelected(sync);
- }
- }
- }
- );
- setParticipatingInSynchronizedScrolling(adjustable, true);
- view.setSelected(true);
- }
- }
-
protected final <P extends OsmPrimitive> OsmDataLayer findLayerFor(P primitive) {
if (primitive != null) {
List<OsmDataLayer> layers = Main.map.mapView.getLayersOfType(OsmDataLayer.class);
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
index 97d28b7..a529106 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
@@ -51,8 +51,7 @@ public class NodeListMergeModel extends ListMergeModel<Node>{
/**
* Builds the command to resolve conflicts in the node list of a way
*
- * @param my my way. Must not be null.
- * @param their their way. Must not be null
+ * @param conflict the conflict data set
* @return the command
* @exception IllegalStateException thrown, if the merge is not yet frozen
*/
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
index 9a8f283..306c2c8 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
@@ -52,6 +52,7 @@ public class NodeListMerger extends ListMerger<Node> implements IConflictResolve
return embeddInScrollPane(theirEntriesTable);
}
+ @Override
public void populate(Conflict<? extends OsmPrimitive> conflict) {
Way myWay = (Way)conflict.getMy();
Way theirWay = (Way)conflict.getTheir();
@@ -59,7 +60,8 @@ public class NodeListMerger extends ListMerger<Node> implements IConflictResolve
myEntriesTable.setLayer(findLayerFor(myWay));
theirEntriesTable.setLayer(findLayerFor(theirWay));
}
-
+
+ @Override
public void deletePrimitive(boolean deleted) {
if (deleted) {
model.setFrozen(true);
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
index 85cc101..cdb0a6f 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
@@ -5,6 +5,7 @@ import java.awt.Component;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
@@ -57,7 +58,7 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRende
// show the key/value-pairs, sorted by key
//
- ArrayList<String> keyList = new ArrayList<String>(primitive.keySet());
+ List<String> keyList = new ArrayList<String>(primitive.keySet());
Collections.sort(keyList);
for (int i = 0; i < keyList.size(); i++) {
if (i > 0) {
@@ -150,6 +151,7 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRende
setText(Integer.toString(row+1));
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
index 55d3a53..aa5515c 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
@@ -36,10 +36,6 @@ import org.openstreetmap.josm.tools.ImageProvider;
public class PropertiesMerger extends JPanel implements Observer, IConflictResolver {
private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
- private JLabel lblMyVersion;
- private JLabel lblMergedVersion;
- private JLabel lblTheirVersion;
-
private JLabel lblMyCoordinates;
private JLabel lblMergedCoordinates;
private JLabel lblTheirCoordinates;
@@ -74,19 +70,19 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
gc.weightx = 0.0;
gc.weighty = 0.0;
gc.insets = new Insets(10,0,10,0);
- lblMyVersion = new JLabel(tr("My version"));
+ JLabel lblMyVersion = new JLabel(tr("My version"));
lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
add(lblMyVersion, gc);
gc.gridx = 3;
gc.gridy = 0;
- lblMergedVersion = new JLabel(tr("Merged version"));
+ JLabel lblMergedVersion = new JLabel(tr("Merged version"));
lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied."));
add(lblMergedVersion, gc);
gc.gridx = 5;
gc.gridy = 0;
- lblTheirVersion = new JLabel(tr("Their version"));
+ JLabel lblTheirVersion = new JLabel(tr("Their version"));
lblTheirVersion.setToolTipText(tr("Properties in their dataset, i.e. the server dataset"));
add(lblTheirVersion, gc);
}
@@ -310,12 +306,12 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
public String referrersToString(List<OsmPrimitive> referrers) {
if (referrers.isEmpty())
return tr("(none)");
- String str = "<html>";
+ StringBuilder str = new StringBuilder("<html>");
for (OsmPrimitive r: referrers) {
- str = str + r.getDisplayName(DefaultNameFormatter.getInstance()) + "<br>";
+ str.append(r.getDisplayName(DefaultNameFormatter.getInstance())).append("<br>");
}
- str = str + "</html>";
- return str;
+ str.append("</html>");
+ return str.toString();
}
protected void updateCoordinates() {
@@ -380,6 +376,7 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
lblTheirReferrers.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
}
+ @Override
public void update(Observable o, Object arg) {
updateCoordinates();
updateDeletedState();
@@ -396,10 +393,12 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
model.decideCoordsConflict(MergeDecisionType.KEEP_MINE);
}
+ @Override
public void update(Observable o, Object arg) {
setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord());
}
@@ -411,10 +410,12 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
model.decideCoordsConflict(MergeDecisionType.KEEP_THEIR);
}
+ @Override
public void update(Observable o, Object arg) {
setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord());
}
@@ -426,10 +427,12 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between different coordinates"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
model.decideCoordsConflict(MergeDecisionType.UNDECIDED);
}
+ @Override
public void update(Observable o, Object arg) {
setEnabled(model.hasCoordConflict() && model.isDecidedCoord());
}
@@ -441,10 +444,12 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
putValue(Action.SHORT_DESCRIPTION, tr("Keep my deleted state"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
model.decideDeletedStateConflict(MergeDecisionType.KEEP_MINE);
}
+ @Override
public void update(Observable o, Object arg) {
setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState());
}
@@ -456,10 +461,12 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
putValue(Action.SHORT_DESCRIPTION, tr("Keep their deleted state"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
model.decideDeletedStateConflict(MergeDecisionType.KEEP_THEIR);
}
+ @Override
public void update(Observable o, Object arg) {
setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState());
}
@@ -471,15 +478,18 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between deleted state"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
model.decideDeletedStateConflict(MergeDecisionType.UNDECIDED);
}
+ @Override
public void update(Observable o, Object arg) {
setEnabled(model.hasDeletedStateConflict() && model.isDecidedDeletedState());
}
}
+ @Override
public void deletePrimitive(boolean deleted) {
if (deleted) {
if (model.getMergedCoords() == null) {
@@ -490,6 +500,7 @@ public class PropertiesMerger extends JPanel implements Observer, IConflictResol
}
}
+ @Override
public void populate(Conflict<? extends OsmPrimitive> conflict) {
model.populate(conflict);
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
index 697cf20..59f4855 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
@@ -48,6 +48,7 @@ public class RelationMemberMerger extends ListMerger<RelationMember> implements
return embeddInScrollPane(theirEntriesTable);
}
+ @Override
public void populate(Conflict<? extends OsmPrimitive> conflict) {
Relation myRel = (Relation)conflict.getMy();
Relation theirRel = (Relation)conflict.getTheir();
@@ -60,6 +61,7 @@ public class RelationMemberMerger extends ListMerger<RelationMember> implements
super(new RelationMemberListMergeModel());
}
+ @Override
public void deletePrimitive(boolean deleted) {
if (deleted) {
model.clearMerged();
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java
index 3182a6c..5a23b45 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java
@@ -7,10 +7,11 @@ import java.awt.event.FocusEvent;
import javax.swing.AbstractCellEditor;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.table.TableCellEditor;
import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+
/**
* {@link TableCellEditor} for the role column in a table for {@link RelationMember}s.
@@ -18,10 +19,13 @@ import org.openstreetmap.josm.data.osm.RelationMember;
*/
public class RelationMemberTableCellEditor extends AbstractCellEditor implements TableCellEditor{
- private final JTextField editor;
+ private final JosmTextField editor;
+ /**
+ * Constructs a new {@code RelationMemberTableCellEditor}.
+ */
public RelationMemberTableCellEditor() {
- editor = new JTextField();
+ editor = new JosmTextField();
editor.addFocusListener(
new FocusAdapter() {
@Override
@@ -32,6 +36,7 @@ public class RelationMemberTableCellEditor extends AbstractCellEditor implements
);
}
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
// Do not edit empty or incomplete members ! (fix #5374 and #6315)
if (value == null)
@@ -44,6 +49,7 @@ public class RelationMemberTableCellEditor extends AbstractCellEditor implements
return editor;
}
+ @Override
public Object getCellEditorValue() {
return editor.getText();
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
index e7cf241..3578996 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
@@ -5,6 +5,7 @@ import java.awt.Color;
import java.awt.Component;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
@@ -42,7 +43,7 @@ public class RelationMemberTableCellRenderer extends JLabel implements TableCel
sb.append("<strong>id</strong>=")
.append(primitive.getId())
.append("<br>");
- ArrayList<String> keyList = new ArrayList<String>(primitive.keySet());
+ List<String> keyList = new ArrayList<String>(primitive.keySet());
Collections.sort(keyList);
for (int i = 0; i < keyList.size(); i++) {
if (i > 0) {
@@ -134,7 +135,6 @@ public class RelationMemberTableCellRenderer extends JLabel implements TableCel
/**
* render the row id
* @param row the row index
- * @param isSelected
*/
protected void renderRowId(int row) {
setBorder(rowNumberBorder);
@@ -147,6 +147,7 @@ public class RelationMemberTableCellRenderer extends JLabel implements TableCel
setText("");
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
index 7664620..12c2663 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
@@ -100,13 +100,13 @@ public class TagMergeItem {
} else if (mergeDecision == MergeDecisionType.KEEP_THEIR) {
if (theirTagValue == null) {
primitive.remove(key);
- } else if (theirTagValue != null) {
+ } else {
primitive.put(key, theirTagValue);
}
} else if (mergeDecision == MergeDecisionType.KEEP_MINE) {
if (myTagValue == null) {
primitive.remove(key);
- } else if (myTagValue != null) {
+ } else {
primitive.put(key, myTagValue);
}
} else {
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
index ab84e4b..767511e 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
@@ -16,7 +16,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
/**
- * This is the {@link TableModel} used in the tables of the {@link TagMerger}.
+ * This is the {@link javax.swing.table.TableModel} used in the tables of the {@link TagMerger}.
*
* The model can {@link #populate(OsmPrimitive, OsmPrimitive)} itself from the conflicts
* in the tag sets of two {@link OsmPrimitive}s. Internally, it keeps a list of {@link TagMergeItem}s.
@@ -141,7 +141,7 @@ public class TagMergeModel extends DefaultTableModel {
* set the merge decision of the {@link TagMergeItem} in row <code>row</code>
* to <code>decision</code>.
*
- * @param row the row
+ * @param row the row
* @param decision the decision
*/
public void decide(int row, MergeDecisionType decision) {
@@ -154,10 +154,9 @@ public class TagMergeModel extends DefaultTableModel {
* set the merge decision of all {@link TagMergeItem} given by indices in <code>rows</code>
* to <code>decision</code>.
*
- * @param row the array of row indices
+ * @param rows the array of row indices
* @param decision the decision
*/
-
public void decide(int [] rows, MergeDecisionType decision) {
if (rows == null || rows.length == 0)
return;
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java
index 4f272df..29e3a20 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java
@@ -22,6 +22,7 @@ public abstract class TagMergeTableCellRenderer extends JLabel implements TableC
setForeground(ConflictColors.FGCOLOR.get());
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row,
int col) {
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
index a7c0946..42abccb 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
@@ -13,6 +13,7 @@ import java.awt.event.AdjustmentListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
+import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.Action;
@@ -40,8 +41,6 @@ public class TagMerger extends JPanel implements IConflictResolver {
private JTable mergedTable;
private JTable theirTable;
private final TagMergeModel model;
- private JButton btnKeepMine;
- private JButton btnKeepTheir;
AdjustmentSynchronizer adjustmentSynchronizer;
/**
@@ -172,7 +171,7 @@ public class TagMerger extends JPanel implements IConflictResolver {
gc.weighty = 0.0;
KeepMineAction keepMineAction = new KeepMineAction();
mineTable.getSelectionModel().addListSelectionListener(keepMineAction);
- btnKeepMine = new JButton(keepMineAction);
+ JButton btnKeepMine = new JButton(keepMineAction);
btnKeepMine.setName("button.keepmine");
add(btnKeepMine, gc);
@@ -195,7 +194,7 @@ public class TagMerger extends JPanel implements IConflictResolver {
gc.weightx = 0.0;
gc.weighty = 0.0;
KeepTheirAction keepTheirAction = new KeepTheirAction();
- btnKeepTheir = new JButton(keepTheirAction);
+ JButton btnKeepTheir = new JButton(keepTheirAction);
btnKeepTheir.setName("button.keeptheir");
add(btnKeepTheir, gc);
@@ -230,6 +229,9 @@ public class TagMerger extends JPanel implements IConflictResolver {
}
+ /**
+ * Constructs a new {@code TagMerger}.
+ */
public TagMerger() {
model = new TagMergeModel();
build();
@@ -276,14 +278,16 @@ public class TagMerger extends JPanel implements IConflictResolver {
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
- int rows[] = mineTable.getSelectedRows();
+ int[] rows = mineTable.getSelectedRows();
if (rows == null || rows.length == 0)
return;
model.decide(rows, MergeDecisionType.KEEP_MINE);
selectNextConflict(rows);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(mineTable.getSelectedRowCount() > 0);
}
@@ -306,14 +310,16 @@ public class TagMerger extends JPanel implements IConflictResolver {
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
- int rows[] = theirTable.getSelectedRows();
+ int[] rows = theirTable.getSelectedRows();
if (rows == null || rows.length == 0)
return;
model.decide(rows, MergeDecisionType.KEEP_THEIR);
selectNextConflict(rows);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(theirTable.getSelectedRowCount() > 0);
}
@@ -327,7 +333,7 @@ public class TagMerger extends JPanel implements IConflictResolver {
*
*/
static class AdjustmentSynchronizer implements AdjustmentListener {
- private final ArrayList<Adjustable> synchronizedAdjustables;
+ private final List<Adjustable> synchronizedAdjustables;
public AdjustmentSynchronizer() {
synchronizedAdjustables = new ArrayList<Adjustable>();
@@ -342,6 +348,7 @@ public class TagMerger extends JPanel implements IConflictResolver {
adjustable.addAdjustmentListener(this);
}
+ @Override
public void adjustmentValueChanged(AdjustmentEvent e) {
for (Adjustable a : synchronizedAdjustables) {
if (a != e.getAdjustable()) {
@@ -401,18 +408,21 @@ public class TagMerger extends JPanel implements IConflictResolver {
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
- int rows[] = mergedTable.getSelectedRows();
+ int[] rows = mergedTable.getSelectedRows();
if (rows == null || rows.length == 0)
return;
model.decide(rows, MergeDecisionType.UNDECIDED);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(mergedTable.getSelectedRowCount() > 0);
}
}
+ @Override
public void deletePrimitive(boolean deleted) {
// Use my entries, as it doesn't really matter
MergeDecisionType decision = deleted?MergeDecisionType.KEEP_MINE:MergeDecisionType.UNDECIDED;
@@ -421,9 +431,12 @@ public class TagMerger extends JPanel implements IConflictResolver {
}
}
+ @Override
public void populate(Conflict<? extends OsmPrimitive> conflict) {
model.populate(conflict.getMy(), conflict.getTheir());
- mineTable.getSelectionModel().setSelectionInterval(0, 0);
- theirTable.getSelectionModel().setSelectionInterval(0, 0);
+ for (JTable table : new JTable[]{mineTable, theirTable}) {
+ int index = table.getRowCount() > 0 ? 0 : -1;
+ table.getSelectionModel().setSelectionInterval(index, index);
+ }
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
index 4e85028..d577ee0 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
@@ -45,6 +45,7 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
@@ -96,7 +97,11 @@ public class CombinePrimitiveResolverDialog extends JDialog {
@Deprecated
public static CombinePrimitiveResolverDialog getInstance() {
if (instance == null) {
- instance = new CombinePrimitiveResolverDialog(Main.parent);
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ instance = new CombinePrimitiveResolverDialog(Main.parent);
+ }
+ });
}
return instance;
}
@@ -128,14 +133,18 @@ public class CombinePrimitiveResolverDialog extends JDialog {
*
* @param primitive the target primitive
*/
- public void setTargetPrimitive(OsmPrimitive primitive) {
+ public void setTargetPrimitive(final OsmPrimitive primitive) {
this.targetPrimitive = primitive;
- updateTitle();
- if (primitive instanceof Way) {
- pnlRelationMemberConflictResolver.initForWayCombining();
- } else if (primitive instanceof Node) {
- pnlRelationMemberConflictResolver.initForNodeMerging();
- }
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ updateTitle();
+ if (primitive instanceof Way) {
+ pnlRelationMemberConflictResolver.initForWayCombining();
+ } else if (primitive instanceof Node) {
+ pnlRelationMemberConflictResolver.initForNodeMerging();
+ }
+ }
+ });
}
protected void updateTitle() {
@@ -249,10 +258,10 @@ public class CombinePrimitiveResolverDialog extends JDialog {
List<Command> cmds = new LinkedList<Command>();
TagCollection allResolutions = getTagConflictResolverModel().getAllResolutions();
- if (allResolutions.size() > 0) {
+ if (!allResolutions.isEmpty()) {
cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
}
- for(String p : targetPrimitive.getDiscardableKeys()) {
+ for(String p : OsmPrimitive.getDiscardableKeys()) {
if (targetPrimitive.get(p) != null) {
cmds.add(new ChangePropertyCommand(targetPrimitive, p, null));
}
@@ -364,7 +373,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
new Dimension(600, 400))).applySafe(this);
setCanceled(false);
btnApply.requestFocusInWindow();
- } else {
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
@@ -379,6 +388,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
setCanceled(true);
setVisible(false);
@@ -394,6 +404,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
setVisible(false);
pnlTagConflictResolver.rememberPreferences();
@@ -404,6 +415,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
&& pnlRelationMemberConflictResolver.getModel().getNumConflicts() == 0);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
updateEnabledState();
@@ -434,14 +446,17 @@ public class CombinePrimitiveResolverDialog extends JDialog {
addHierarchyBoundsListener(this);
}
+ @Override
public void ancestorResized(HierarchyEvent e) {
setDividerLocation((int) (dividerLocation * getHeight()));
}
+ @Override
public void ancestorMoved(HierarchyEvent e) {
// do nothing
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(JSplitPane.DIVIDER_LOCATION_PROPERTY)) {
int newVal = (Integer) evt.getNewValue();
@@ -453,12 +468,12 @@ public class CombinePrimitiveResolverDialog extends JDialog {
}
/**
- * Replies the list of {@link Command commands} needed to resolve specified conflicts,
+ * Replies the list of {@link Command commands} needed to resolve specified conflicts,
* by displaying if necessary a {@link CombinePrimitiveResolverDialog} to the user.
* This dialog will allow the user to choose conflict resolution actions.
- *
+ *
* Non-expert users are informed first of the meaning of these operations, allowing them to cancel.
- *
+ *
* @param tagsOfPrimitives The tag collection of the primitives to be combined.
* Should generally be equal to {@code TagCollection.unionOfAllPrimitives(primitives)}
* @param primitives The primitives to be combined
@@ -470,7 +485,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
final TagCollection tagsOfPrimitives,
final Collection<? extends OsmPrimitive> primitives,
final Collection<? extends OsmPrimitive> targetPrimitives) throws UserCancelException {
-
+
CheckParameterUtil.ensureParameterNotNull(tagsOfPrimitives, "tagsOfPrimitives");
CheckParameterUtil.ensureParameterNotNull(primitives, "primitives");
CheckParameterUtil.ensureParameterNotNull(targetPrimitives, "targetPrimitives");
@@ -501,7 +516,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
dialog.getTagConflictResolverModel().populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues());
dialog.getRelationMemberConflictResolverModel().populate(parentRelations, primitives);
dialog.prepareDefaultDecisions();
-
+
// Ensure a proper title is displayed instead of a previous target (fix #7925)
if (targetPrimitives.size() == 1) {
dialog.setTargetPrimitive(targetPrimitives.iterator().next());
@@ -545,7 +560,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
+ "Do you want to continue?",
parentRelations.size(), parentRelations.size(), primitives.size(),
DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(parentRelations));
-
+
if (!ConditionalOptionPaneUtil.showConfirmationDialog(
"combine_tags",
Main.parent,
@@ -586,7 +601,7 @@ public class CombinePrimitiveResolverDialog extends JDialog {
+ "If you want to continue, you are shown a dialog to fix the conflicting tags.<br/><br/>"
+ "Do you want to continue?",
primitives.size(), conflicts);
-
+
if (!ConditionalOptionPaneUtil.showConfirmationDialog(
"combine_tags",
Main.parent,
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
index 7f9de27..185b345 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
@@ -73,7 +73,7 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
public void processKeyEvent(KeyEvent e) {
if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ENTER) {
fireGotoNextDecision();
- } if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) {
+ } else if (e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_TAB) {
if (e.isShiftDown()) {
fireGotoPreviousDecision();
} else {
@@ -128,6 +128,7 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
}
}
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value;
initEditor(decision);
@@ -135,6 +136,7 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
return editor;
}
+ @Override
public Object getCellEditorValue() {
return editor.getSelectedItem();
}
@@ -179,6 +181,7 @@ public class MultiValueCellEditor extends AbstractCellEditor implements TableCel
}
}
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
boolean cellHasFocus) {
renderColors(isSelected);
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
index 3500a21..3a58f48 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
@@ -123,6 +123,7 @@ public class MultiValueCellRenderer extends JLabel implements TableCellRenderer
setText("");
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
index 21263dd..e31633b 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
@@ -147,7 +147,7 @@ public class MultiValueResolutionDecision {
* @return the list of possible, non empty values
*/
public List<String> getValues() {
- ArrayList<String> ret = new ArrayList<String>(tags.getValues());
+ List<String> ret = new ArrayList<String>(tags.getValues());
ret.remove("");
ret.remove(null);
Collections.sort(ret);
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java b/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
index ab41707..428baa4 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.swing.AbstractAction;
import javax.swing.Action;
@@ -271,6 +272,7 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
setVisible(false);
setCanceled(true);
@@ -286,6 +288,7 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
setVisible(false);
}
@@ -304,6 +307,7 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
}
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
updateEnabledState();
@@ -318,7 +322,7 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
getClass().getName() + ".geometry",
WindowGeometry.centerOnScreen(new Dimension(400,300))
).applySafe(this);
- } else {
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
@@ -333,6 +337,7 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
return resolvers.get(type).getModel().getResolution();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
TagConflictResolverModel model = (TagConflictResolverModel)evt.getSource();
@@ -445,9 +450,10 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
} else {
setIcon(ImageProvider.get("data", "object"));
}
- String text = "";
- for (OsmPrimitiveType type: stat.keySet()) {
- int numPrimitives = stat.get(type) == null ? 0 : stat.get(type);
+ StringBuilder text = new StringBuilder();
+ for (Entry<OsmPrimitiveType, Integer> entry: stat.entrySet()) {
+ OsmPrimitiveType type = entry.getKey();
+ int numPrimitives = entry.getValue() == null ? 0 : entry.getValue();
if (numPrimitives == 0) {
continue;
}
@@ -457,9 +463,12 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
}
- text = text.equals("") ? msg : text + ", " + msg;
+ if (text.length() > 0) {
+ text.append(", ");
+ }
+ text.append(msg);
}
- setText(text);
+ setText(text.toString());
}
protected void renderFrom(StatisticsInfo info) {
@@ -470,6 +479,7 @@ public class PasteTagsConflictResolverDialog extends JDialog implements Propert
renderStatistics(info.targetInfo);
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
reset();
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
index 231d63b..eff56ec 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
@@ -1,14 +1,14 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.conflict.tags;
+import static org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType.UNDECIDED;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.tools.CheckParameterUtil;
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType.*;
-
public class RelationMemberConflictDecision {
private Relation relation;
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java
index a64c3e8..c92f825 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java
@@ -22,6 +22,7 @@ public class RelationMemberConflictDecisionEditor extends JosmComboBox implement
/* --------------------------------------------------------------------------------- */
/* TableCellEditor */
/* --------------------------------------------------------------------------------- */
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
setSelectedItem(value);
this.originalValue = (RelationMemberConflictDecisionType)value;
@@ -31,31 +32,38 @@ public class RelationMemberConflictDecisionEditor extends JosmComboBox implement
private TableCellEditorSupport tableCellEditorSupport;
private RelationMemberConflictDecisionType originalValue;
+ @Override
public void addCellEditorListener(CellEditorListener l) {
tableCellEditorSupport.addCellEditorListener(l);
}
+ @Override
public void cancelCellEditing() {
setSelectedItem(originalValue);
tableCellEditorSupport.fireEditingCanceled();
}
+ @Override
public Object getCellEditorValue() {
return getSelectedItem();
}
+ @Override
public boolean isCellEditable(EventObject anEvent) {
return true;
}
+ @Override
public void removeCellEditorListener(CellEditorListener l) {
tableCellEditorSupport.removeCellEditorListener(l);
}
+ @Override
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
+ @Override
public boolean stopCellEditing() {
tableCellEditorSupport.fireEditingStopped();
return true;
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
index 8d93106..3a349a9 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
@@ -39,6 +39,7 @@ public class RelationMemberConflictDecisionRenderer extends JLabel implements Ta
/* --------------------------------------------------------------------------------- */
/* TableCellRenderer */
/* --------------------------------------------------------------------------------- */
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
resetTableRenderer();
@@ -57,6 +58,7 @@ public class RelationMemberConflictDecisionRenderer extends JLabel implements Ta
/* --------------------------------------------------------------------------------- */
/* ListCellRenderer */
/* --------------------------------------------------------------------------------- */
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
boolean cellHasFocus) {
resetListRenderer();
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
index 7681fdc..de88e51 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
@@ -31,9 +31,9 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.tools.ImageProvider;
public class RelationMemberConflictResolver extends JPanel {
@@ -104,10 +104,10 @@ public class RelationMemberConflictResolver extends JPanel {
pnl.add(cbTagRelations);
pnl.add(new JLabel(trc("tag", "Key:")));
pnl.add(tfKey = new AutoCompletingTextField(10));
- tfKey.setToolTipText(tr("<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"));
+ tfKey.setToolTipText(tr("<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"));
pnl.add(new JLabel(tr("Value:")));
pnl.add(tfValue = new AutoCompletingTextField(10));
- tfValue.setToolTipText(tr("<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"));
+ tfValue.setToolTipText(tr("<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"));
cbTagRelations.setSelected(false);
tfKey.setEnabled(false);
tfValue.setEnabled(false);
@@ -147,12 +147,14 @@ public class RelationMemberConflictResolver extends JPanel {
putValue(SHORT_DESCRIPTION, tr("Apply this role to all members"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
model.applyRole(tfRole.getText());
}
}
class ToggleTagRelationsAction implements ChangeListener {
+ @Override
public void stateChanged(ChangeEvent e) {
ButtonModel buttonModel = ((AbstractButton) e.getSource()).getModel();
tfKey.setEnabled(buttonModel.isSelected());
@@ -171,9 +173,9 @@ public class RelationMemberConflictResolver extends JPanel {
public Command buildTagApplyCommands(Collection<? extends OsmPrimitive> primitives) {
if (!cbTagRelations.isSelected())
return null;
- if (tfKey.getText().trim().equals(""))
+ if (tfKey.getText().trim().isEmpty())
return null;
- if (tfValue.getText().trim().equals(""))
+ if (tfValue.getText().trim().isEmpty())
return null;
if (primitives == null || primitives.isEmpty())
return null;
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
index 4ac791f..da842f9 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
@@ -18,13 +18,12 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.RelationToChildReference;
+import org.openstreetmap.josm.gui.util.GuiHelper;
/**
* This model manages a list of conflicting relation members.
*
- * It can be used as {@link TableModel}.
- *
- *
+ * It can be used as {@link javax.swing.table.TableModel}.
*/
public class RelationMemberConflictResolverModel extends DefaultTableModel {
/** the property name for the number conflicts managed by this model */
@@ -192,7 +191,11 @@ public class RelationMemberConflictResolverModel extends DefaultTableModel {
*/
public void refresh() {
updateNumConflicts();
- fireTableDataChanged();
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ fireTableDataChanged();
+ }
+ });
}
/**
@@ -250,8 +253,7 @@ public class RelationMemberConflictResolverModel extends DefaultTableModel {
/**
* Builds a collection of commands executing the decisions made in this model.
*
- * @param newPrimitive the primitive which members shall refer to if the
- * decision is {@link RelationMemberConflictDecisionType#REPLACE}
+ * @param newPrimitive the primitive which members shall refer to
* @return a list of commands
*/
public List<Command> buildResolutionCommands(OsmPrimitive newPrimitive) {
@@ -289,8 +291,7 @@ public class RelationMemberConflictResolverModel extends DefaultTableModel {
* Replies the set of relations which have to be modified according
* to the decisions managed by this model.
*
- * @param newPrimitive the primitive which members shall refer to if the
- * decision is {@link RelationMemberConflictDecisionType#REPLACE}
+ * @param newPrimitive the primitive which members shall refer to
*
* @return the set of relations which have to be modified according
* to the decisions managed by this model
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
index 70e70a8..ddba677 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
@@ -51,6 +51,7 @@ public class RelationMemberConflictResolverTable extends JTable implements Multi
*
*/
class SelectNextColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -81,6 +82,7 @@ public class RelationMemberConflictResolverTable extends JTable implements Multi
*/
class SelectPreviousColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -104,10 +106,12 @@ public class RelationMemberConflictResolverTable extends JTable implements Multi
}
}
+ @Override
public void gotoNextDecision() {
selectNextColumnCellAction.run();
}
+ @Override
public void gotoPreviousDecision() {
selectPreviousColumnCellAction.run();
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
index 1b425da..ecfe4d7 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
@@ -12,7 +12,7 @@ import org.openstreetmap.josm.data.osm.TigerUtils;
* Collection of utility methods for tag conflict resolution
*
*/
-public class TagConflictResolutionUtil {
+public final class TagConflictResolutionUtil {
/** no constructor, just static utility methods */
private TagConflictResolutionUtil() {}
@@ -38,7 +38,7 @@ public class TagConflictResolutionUtil {
int numNodesWithTags = 0;
for (OsmPrimitive p: merged) {
- if (p.getKeys().size() >0) {
+ if (!p.getKeys().isEmpty()) {
numNodesWithTags++;
}
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
index 0cfe25d..69e4306 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
@@ -19,7 +19,7 @@ import org.openstreetmap.josm.Main;
/**
* This is a UI widget for resolving tag conflicts, i.e. differences of the tag values
- * of multiple {@link OsmPrimitive}s.
+ * of multiple {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
*
*
*/
@@ -51,6 +51,7 @@ public class TagConflictResolver extends JPanel {
pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only")), gc);
cbShowTagsWithConflictsOnly.addChangeListener(
new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
model.setShowTagsWithConflictsOnly(cbShowTagsWithConflictsOnly.isSelected());
cbShowTagsWithMultiValuesOnly.setEnabled(cbShowTagsWithConflictsOnly.isSelected());
@@ -62,6 +63,7 @@ public class TagConflictResolver extends JPanel {
);
cbShowTagsWithMultiValuesOnly.addChangeListener(
new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
model.setShowTagsWithMultiValuesOnly(cbShowTagsWithMultiValuesOnly.isSelected());
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
index 56ae390..71b1f2f 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
@@ -9,11 +9,13 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.swing.table.DefaultTableModel;
import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.CheckParameterUtil;
public class TagConflictResolverModel extends DefaultTableModel {
@@ -22,12 +24,15 @@ public class TagConflictResolverModel extends DefaultTableModel {
private TagCollection tags;
private List<String> displayedKeys;
private Set<String> keysWithConflicts;
- private HashMap<String, MultiValueResolutionDecision> decisions;
+ private Map<String, MultiValueResolutionDecision> decisions;
private int numConflicts;
private PropertyChangeSupport support;
private boolean showTagsWithConflictsOnly = false;
private boolean showTagsWithMultiValuesOnly = false;
+ /**
+ * Constructs a new {@code TagConflictResolverModel}.
+ */
public TagConflictResolverModel() {
numConflicts = 0;
support = new PropertyChangeSupport(this);
@@ -63,6 +68,7 @@ public class TagConflictResolverModel extends DefaultTableModel {
Collections.sort(
displayedKeys,
new Comparator<String>() {
+ @Override
public int compare(String key1, String key2) {
if (decisions.get(key1).isDecided() && ! decisions.get(key2).isDecided())
return 1;
@@ -108,7 +114,11 @@ public class TagConflictResolverModel extends DefaultTableModel {
displayedKeys.addAll(keys);
refreshNumConflicts();
sort();
- fireTableDataChanged();
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ fireTableDataChanged();
+ }
+ });
}
/**
@@ -159,7 +169,11 @@ public class TagConflictResolverModel extends DefaultTableModel {
break;
}
}
- fireTableDataChanged();
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ fireTableDataChanged();
+ }
+ });
refreshNumConflicts();
}
diff --git a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
index 7415217..da0abc8 100644
--- a/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
+++ b/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
@@ -53,6 +53,7 @@ public class TagConflictResolverTable extends JTable implements MultiValueCellEd
*
*/
class SelectNextColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -83,6 +84,7 @@ public class TagConflictResolverTable extends JTable implements MultiValueCellEd
*/
class SelectPreviousColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -106,10 +108,12 @@ public class TagConflictResolverTable extends JTable implements MultiValueCellEd
}
}
+ @Override
public void gotoNextDecision() {
selectNextColumnCellAction.run();
}
+ @Override
public void gotoPreviousDecision() {
selectPreviousColumnCellAction.run();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
index 9dca3cf..b6a4d5b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
@@ -40,7 +40,6 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
-import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
@@ -51,6 +50,7 @@ import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetListModel;
import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetsInActiveDataLayerListModel;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.io.CloseChangesetTask;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.BugReportExceptionHandler;
@@ -80,11 +80,11 @@ public class ChangesetDialog extends ToggleDialog{
// the actions
private SelectObjectsAction selectObjectsAction;
- private ReadChangesetsAction readChangesetAction;
+ private ReadChangesetsAction readChangesetAction;
private ShowChangesetInfoAction showChangesetInfoAction;
private CloseOpenChangesetsAction closeChangesetAction;
private LaunchChangesetManagerAction launchChangesetManagerAction;
-
+
private ChangesetDialogPopup popupMenu;
protected void buildChangesetsLists() {
@@ -106,10 +106,6 @@ public class ChangesetDialog extends ToggleDialog{
DblClickHandler dblClickHandler = new DblClickHandler();
lstInSelection.addMouseListener(dblClickHandler);
lstInActiveDataLayer.addMouseListener(dblClickHandler);
-
- ChangesetPopupMenuLauncher popupMenuLauncher = new ChangesetPopupMenuLauncher();
- lstInSelection.addMouseListener(popupMenuLauncher);
- lstInActiveDataLayer.addMouseListener(popupMenuLauncher);
}
protected void registerAsListener() {
@@ -123,10 +119,11 @@ public class ChangesetDialog extends ToggleDialog{
// events and bootstrap it's content
ChangesetCache.getInstance().addChangesetCacheListener(inActiveDataLayerModel);
MapView.addEditLayerChangeListener(inActiveDataLayerModel);
- if (Main.main.getEditLayer() != null) {
- Main.main.getEditLayer().data.addDataSetListener(inActiveDataLayerModel);
- inActiveDataLayerModel.initFromDataSet(Main.main.getEditLayer().data);
- inSelectionModel.initFromPrimitives(Main.main.getEditLayer().data.getAllSelected());
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null) {
+ editLayer.data.addDataSetListener(inActiveDataLayerModel);
+ inActiveDataLayerModel.initFromDataSet(editLayer.data);
+ inSelectionModel.initFromPrimitives(editLayer.data.getAllSelected());
}
}
@@ -135,8 +132,9 @@ public class ChangesetDialog extends ToggleDialog{
//
ChangesetCache.getInstance().removeChangesetCacheListener(inActiveDataLayerModel);
MapView.removeEditLayerChangeListener(inActiveDataLayerModel);
- if (Main.main.getEditLayer() != null) {
- Main.main.getEditLayer().data.removeDataSetListener(inActiveDataLayerModel);
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null) {
+ editLayer.data.removeDataSetListener(inActiveDataLayerModel);
}
// remove the list model for the changesets in the current selection as
@@ -207,9 +205,13 @@ public class ChangesetDialog extends ToggleDialog{
// -- launch changeset manager action
launchChangesetManagerAction = new LaunchChangesetManagerAction();
cbInSelectionOnly.addItemListener(launchChangesetManagerAction);
-
+
popupMenu = new ChangesetDialogPopup(lstInActiveDataLayer, lstInSelection);
+ PopupMenuLauncher popupMenuLauncher = new PopupMenuLauncher(popupMenu);
+ lstInSelection.addMouseListener(popupMenuLauncher);
+ lstInActiveDataLayer.addMouseListener(popupMenuLauncher);
+
createLayout(pnl, false, Arrays.asList(new SideButton[] {
new SideButton(selectObjectsAction, false),
new SideButton(readChangesetAction, false),
@@ -232,13 +234,17 @@ public class ChangesetDialog extends ToggleDialog{
}
protected void initWithCurrentData() {
- if (Main.main.getEditLayer() != null) {
- inSelectionModel.initFromPrimitives(Main.main.getEditLayer().data.getAllSelected());
- inActiveDataLayerModel.initFromDataSet(Main.main.getEditLayer().data);
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null) {
+ inSelectionModel.initFromPrimitives(editLayer.data.getAllSelected());
+ inActiveDataLayerModel.initFromDataSet(editLayer.data);
}
}
- public ChangesetDialog(MapFrame mapFrame) {
+ /**
+ * Constructs a new {@code ChangesetDialog}.
+ */
+ public ChangesetDialog() {
super(
tr("Changesets"),
"changesetdialog",
@@ -267,6 +273,7 @@ public class ChangesetDialog extends ToggleDialog{
}
class FilterChangeHandler implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
Main.pref.put("changeset-dialog.for-selected-objects-only", cbInSelectionOnly.isSelected());
pnlList.removeAll();
@@ -304,8 +311,9 @@ public class ChangesetDialog extends ToggleDialog{
ds.setSelected(sel);
}
+ @Override
public void actionPerformed(ActionEvent e) {
- if (Main.main.getEditLayer() == null)
+ if (!Main.main.hasEditLayer())
return;
ChangesetListModel model = getCurrentChangesetListModel();
Set<Integer> sel = model.getSelectedChangesetIds();
@@ -320,11 +328,13 @@ public class ChangesetDialog extends ToggleDialog{
setEnabled(getCurrentChangesetList().getSelectedIndices().length > 0);
}
+ @Override
public void itemStateChanged(ItemEvent arg0) {
updateEnabledState();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -342,6 +352,7 @@ public class ChangesetDialog extends ToggleDialog{
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
ChangesetListModel model = getCurrentChangesetListModel();
Set<Integer> sel = model.getSelectedChangesetIds();
@@ -355,11 +366,13 @@ public class ChangesetDialog extends ToggleDialog{
setEnabled(getCurrentChangesetList().getSelectedIndices().length > 0);
}
+ @Override
public void itemStateChanged(ItemEvent arg0) {
updateEnabledState();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -377,6 +390,7 @@ public class ChangesetDialog extends ToggleDialog{
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
List<Changeset> sel = getCurrentChangesetListModel().getSelectedOpenChangesets();
if (sel.isEmpty())
@@ -388,10 +402,12 @@ public class ChangesetDialog extends ToggleDialog{
setEnabled(getCurrentChangesetListModel().hasSelectedOpenChangesets());
}
+ @Override
public void itemStateChanged(ItemEvent arg0) {
updateEnabledState();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -409,6 +425,7 @@ public class ChangesetDialog extends ToggleDialog{
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
Set<Changeset> sel = getCurrentChangesetListModel().getSelectedChangesets();
if (sel.isEmpty())
@@ -428,10 +445,12 @@ public class ChangesetDialog extends ToggleDialog{
setEnabled(getCurrentChangesetList().getSelectedIndices().length > 0);
}
+ @Override
public void itemStateChanged(ItemEvent arg0) {
updateEnabledState();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -462,6 +481,7 @@ public class ChangesetDialog extends ToggleDialog{
cm.setSelectedChangesetsById(toSelect);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
ChangesetListModel model = getCurrentChangesetListModel();
Set<Integer> sel = model.getSelectedChangesetIds();
@@ -484,6 +504,7 @@ public class ChangesetDialog extends ToggleDialog{
}
Runnable r = new Runnable() {
+ @Override
public void run() {
// first, wait for the download task to finish, if a download
// task was launched
@@ -491,7 +512,7 @@ public class ChangesetDialog extends ToggleDialog{
try {
future.get();
} catch(InterruptedException e) {
- e.printStackTrace();
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" while downloading changeset header");
} catch(ExecutionException e){
e.printStackTrace();
BugReportExceptionHandler.handleException(e.getCause());
@@ -514,24 +535,12 @@ public class ChangesetDialog extends ToggleDialog{
Main.worker.submit(r);
}
+ @Override
public void itemStateChanged(ItemEvent arg0) {
}
- public void valueChanged(ListSelectionEvent e) {
- }
- }
-
- class ChangesetPopupMenuLauncher extends PopupMenuLauncher {
@Override
- public void launch(MouseEvent evt) {
- JList lst = getCurrentChangesetList();
- if (lst.getSelectedIndices().length == 0) {
- int idx = lst.locationToIndex(evt.getPoint());
- if (idx >=0) {
- lst.getSelectionModel().addSelectionInterval(idx, idx);
- }
- }
- popupMenu.show(lst, evt.getX(), evt.getY());
+ public void valueChanged(ListSelectionEvent e) {
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java b/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
index 1f07cb3..e7ad8f0 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
@@ -1,13 +1,11 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.GridBagLayout;
-import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
@@ -41,7 +39,6 @@ import org.openstreetmap.josm.actions.AutoScaleAction;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.PseudoCommand;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
@@ -76,12 +73,15 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
// Actions for context menu and Enter key
private SelectAction selectAction = new SelectAction();
private SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
-
- public CommandStackDialog(final MapFrame mapFrame) {
+
+ /**
+ * Constructs a new {@code CommandStackDialog}.
+ */
+ public CommandStackDialog() {
super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}",
tr("Command Stack")), KeyEvent.VK_O, Shortcut.ALT_SHIFT), 100, true);
- undoTree.addMouseListener(new PopupMenuHandler());
+ undoTree.addMouseListener(new MouseEventHandler());
undoTree.setRootVisible(false);
undoTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
undoTree.setShowsRootHandles(true);
@@ -90,8 +90,8 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
undoSelectionListener = new UndoRedoSelectionListener(undoTree);
undoTree.getSelectionModel().addTreeSelectionListener(undoSelectionListener);
InputMapUtils.unassignCtrlShiftUpDown(undoTree, JComponent.WHEN_FOCUSED);
-
- redoTree.addMouseListener(new PopupMenuHandler());
+
+ redoTree.addMouseListener(new MouseEventHandler());
redoTree.setRootVisible(false);
redoTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
redoTree.setShowsRootHandles(true);
@@ -125,7 +125,7 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
new SideButton(undoAction),
new SideButton(redoAction)
}));
-
+
InputMapUtils.addEnterAction(undoTree, selectAndZoomAction);
InputMapUtils.addEnterAction(redoTree, selectAndZoomAction);
}
@@ -155,6 +155,7 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
this.source = source;
}
+ @Override
public void valueChanged(TreeSelectionEvent e) {
if (source == undoTree) {
redoTree.getSelectionModel().removeTreeSelectionListener(redoSelectionListener);
@@ -183,24 +184,29 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
addShowNotifyListener(updater);
tree.addTreeSelectionListener(new TreeSelectionListener() {
+ @Override
public void valueChanged(TreeSelectionEvent e) {
updater.updateEnabledState();
}
});
tree.getModel().addTreeModelListener(new TreeModelListener() {
+ @Override
public void treeNodesChanged(TreeModelEvent e) {
updater.updateEnabledState();
}
+ @Override
public void treeNodesInserted(TreeModelEvent e) {
updater.updateEnabledState();
}
+ @Override
public void treeNodesRemoved(TreeModelEvent e) {
updater.updateEnabledState();
}
+ @Override
public void treeStructureChanged(TreeModelEvent e) {
updater.updateEnabledState();
}
@@ -238,7 +244,7 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
*/
private void buildTrees() {
setTitle(tr("Command Stack"));
- if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null)
+ if (!Main.main.hasEditLayer())
return;
List<Command> undoCommands = Main.main.undoRedo.commands;
@@ -304,18 +310,19 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
}
return node;
}
-
+
/**
* Return primitives that are affected by some command
- * @param path GUI elements
- * @return collection of affected primitives, onluy usable ones
+ * @param path GUI elements
+ * @return collection of affected primitives, onluy usable ones
*/
protected static FilteredCollection<OsmPrimitive> getAffectedPrimitives(TreePath path) {
PseudoCommand c = ((CommandListMutableTreeNode) path.getLastPathComponent()).getCommand();
- final OsmDataLayer currentLayer = Main.map.mapView.getEditLayer();
+ final OsmDataLayer currentLayer = Main.main.getEditLayer();
FilteredCollection<OsmPrimitive> prims = new FilteredCollection<OsmPrimitive>(
c.getParticipatingPrimitives(),
new Predicate<OsmPrimitive>(){
+ @Override
public boolean evaluate(OsmPrimitive o) {
OsmPrimitive p = currentLayer.data.getPrimitiveById(o);
return p != null && p.isUsable();
@@ -325,6 +332,7 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
return prims;
}
+ @Override
public void commandChanged(int queueSize, int redoSize) {
if (!isVisible())
return;
@@ -333,12 +341,13 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
public class SelectAction extends AbstractAction implements IEnabledStateUpdating {
+ /**
+ * Constructs a new {@code SelectAction}.
+ */
public SelectAction() {
- super();
putValue(NAME,tr("Select"));
putValue(SHORT_DESCRIPTION, tr("Selects the objects that take part in this command (unless currently deleted)"));
putValue(SMALL_ICON, ImageProvider.get("dialogs","select"));
-
}
@Override
@@ -352,20 +361,22 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
} else
throw new IllegalStateException();
- if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null) return;
- Main.map.mapView.getEditLayer().data.setSelected( getAffectedPrimitives(path));
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer == null) return;
+ editLayer.data.setSelected( getAffectedPrimitives(path));
}
-
+
@Override
public void updateEnabledState() {
setEnabled(!undoTree.isSelectionEmpty() || !redoTree.isSelectionEmpty());
}
-
}
public class SelectAndZoomAction extends SelectAction {
+ /**
+ * Constructs a new {@code SelectAndZoomAction}.
+ */
public SelectAndZoomAction() {
- super();
putValue(NAME,tr("Select and zoom"));
putValue(SHORT_DESCRIPTION, tr("Selects the objects that take part in this command (unless currently deleted), then and zooms to it"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale","selection"));
@@ -374,15 +385,15 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
@Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
- if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null) return;
+ if (!Main.main.hasEditLayer()) return;
AutoScaleAction.autoScale("selection");
}
}
-
+
/**
* undo / redo switch to reduce duplicate code
*/
- protected enum UndoRedoType {UNDO, REDO};
+ protected enum UndoRedoType {UNDO, REDO}
/**
* Action to undo or redo all commands up to (and including) the seleced item.
@@ -414,6 +425,7 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
lastOperation = type;
TreePath path = tree.getSelectionPath();
@@ -438,42 +450,27 @@ public class CommandStackDialog extends ToggleDialog implements CommandQueueList
Main.map.repaint();
}
+ @Override
public void updateEnabledState() {
// do not allow execution if nothing is selected or a sub command was selected
setEnabled(!tree.isSelectionEmpty() && tree.getSelectionPath().getPathCount()==2);
}
}
- class PopupMenuHandler extends PopupMenuLauncher {
-
+ class MouseEventHandler extends PopupMenuLauncher {
+
+ public MouseEventHandler() {
+ super(new CommandStackPopup());
+ }
+
@Override
public void mouseClicked(MouseEvent evt) {
- super.mouseClicked(evt);
- if (evt.getButton() == MouseEvent.BUTTON1 && evt.getClickCount()>1) {
+ if (isDoubleClick(evt)) {
selectAndZoomAction.actionPerformed(null);
}
}
-
- @Override
- public void launch(MouseEvent evt) {
- Point p = evt.getPoint();
- JTree tree = (JTree) evt.getSource();
- int row = tree.getRowForLocation(p.x, p.y);
- if (row != -1) {
- TreePath path = tree.getPathForLocation(p.x, p.y);
- // right click on unselected element -> select it first
- if (!tree.isPathSelected(path)) {
- tree.setSelectionPath(path);
- }
- TreePath[] selPaths = tree.getSelectionPaths();
-
- CommandStackPopup menu = new CommandStackPopup();
- menu.show(tree, p.x, p.y-3);
- }
- }
}
-
private class CommandStackPopup extends JPopupMenu {
public CommandStackPopup(){
add(selectAction);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index f650da2..46f0429 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -4,24 +4,25 @@ package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.AbstractAction;
import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
import javax.swing.ListModel;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListDataEvent;
@@ -42,12 +43,16 @@ import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PopupMenuHandler;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
@@ -60,7 +65,7 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
/**
* Replies the color used to paint conflicts.
- *
+ *
* @return the color used to paint conflicts
* @since 1221
* @see #paintConflicts
@@ -77,6 +82,9 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
/** the list widget for the list of conflicts */
private JList lstConflicts;
+ private final JPopupMenu popupMenu = new JPopupMenu();
+ private final PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
+
private ResolveAction actResolve;
private SelectAction actSelect;
@@ -89,28 +97,25 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
lstConflicts = new JList(model);
lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
lstConflicts.setCellRenderer(new OsmPrimitivRenderer());
- lstConflicts.addMouseListener(new MouseAdapter(){
- @Override public void mouseClicked(MouseEvent e) {
- if (e.getClickCount() >= 2) {
- resolve();
- }
- }
- });
- lstConflicts.getSelectionModel().addListSelectionListener(new ListSelectionListener(){
+ lstConflicts.addMouseListener(new MouseEventHandler());
+ addListSelectionListener(new ListSelectionListener(){
+ @Override
public void valueChanged(ListSelectionEvent e) {
Main.map.mapView.repaint();
}
});
SideButton btnResolve = new SideButton(actResolve = new ResolveAction());
- lstConflicts.getSelectionModel().addListSelectionListener(actResolve);
+ addListSelectionListener(actResolve);
SideButton btnSelect = new SideButton(actSelect = new SelectAction());
- lstConflicts.getSelectionModel().addListSelectionListener(actSelect);
+ addListSelectionListener(actSelect);
createLayout(lstConflicts, true, Arrays.asList(new SideButton[] {
btnResolve, btnSelect
}));
+
+ popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
}
/**
@@ -139,6 +144,33 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
}
/**
+ * Add a list selection listener to the conflicts list.
+ * @param listener the ListSelectionListener
+ * @since 5958
+ */
+ public void addListSelectionListener(ListSelectionListener listener) {
+ lstConflicts.getSelectionModel().addListSelectionListener(listener);
+ }
+
+ /**
+ * Remove the given list selection listener from the conflicts list.
+ * @param listener the ListSelectionListener
+ * @since 5958
+ */
+ public void removeListSelectionListener(ListSelectionListener listener) {
+ lstConflicts.getSelectionModel().removeListSelectionListener(listener);
+ }
+
+ /**
+ * Replies the popup menu handler.
+ * @return The popup menu handler
+ * @since 5958
+ */
+ public PopupMenuHandler getPopupMenuHandler() {
+ return popupMenuHandler;
+ }
+
+ /**
* Launches a conflict resolution dialog for the first selected conflict
*
*/
@@ -185,7 +217,7 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
/**
* Paints all conflicts that can be expressed on the main window.
- *
+ *
* @param g The {@code Graphics} used to paint
* @param nc The {@code NavigatableComponent} used to get screen coordinates of nodes
* @since 86
@@ -198,6 +230,7 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
Visitor conflictPainter = new AbstractVisitor() {
// Manage a stack of visited relations to avoid infinite recursion with cyclic relations (fix #7938)
private final Set<Relation> visited = new HashSet<Relation>();
+ @Override
public void visit(Node n) {
Point p = nc.getPoint(n);
g.drawRect(p.x-1, p.y-1, 2, 2);
@@ -207,6 +240,7 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
Point p2 = nc.getPoint(n2);
g.drawLine(p1.x, p1.y, p2.x, p2.y);
}
+ @Override
public void visit(Way w) {
Node lastN = null;
for (Node n : w.getNodes()) {
@@ -218,12 +252,13 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
lastN = n;
}
}
+ @Override
public void visit(Relation e) {
if (!visited.contains(e)) {
visited.add(e);
try {
for (RelationMember em : e.getMembers()) {
- em.getMember().visit(this);
+ em.getMember().accept(this);
}
} finally {
visited.remove(e);
@@ -235,10 +270,11 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
if (conflicts == null || !conflicts.hasConflictForMy((OsmPrimitive)o)) {
continue;
}
- conflicts.getConflictForMy((OsmPrimitive)o).getTheir().visit(conflictPainter);
+ conflicts.getConflictForMy((OsmPrimitive)o).getTheir().accept(conflictPainter);
}
}
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
if (oldLayer != null) {
oldLayer.getConflicts().removeConflictListener(this);
@@ -261,7 +297,7 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
/**
* returns the first selected item of the conflicts list
- *
+ *
* @return Conflict
*/
public Conflict<? extends OsmPrimitive> getSelectedConflict() {
@@ -273,15 +309,18 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
return conflicts.get(index);
}
+ @Override
public void onConflictsAdded(ConflictCollection conflicts) {
refreshView();
}
+ @Override
public void onConflictsRemoved(ConflictCollection conflicts) {
- System.err.println("1 conflict has been resolved.");
+ Main.info("1 conflict has been resolved.");
refreshView();
}
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
lstConflicts.clearSelection();
for (OsmPrimitive osm : newSelection) {
@@ -299,6 +338,17 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
return ht("/Dialog/ConflictList");
}
+ class MouseEventHandler extends PopupMenuLauncher {
+ public MouseEventHandler() {
+ super(popupMenu);
+ }
+ @Override public void mouseClicked(MouseEvent e) {
+ if (isDoubleClick(e)) {
+ resolve();
+ }
+ }
+ }
+
/**
* The {@link ListModel} for conflicts
*
@@ -311,12 +361,14 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
listeners = new CopyOnWriteArrayList<ListDataListener>();
}
+ @Override
public void addListDataListener(ListDataListener l) {
if (l != null) {
listeners.addIfAbsent(l);
}
}
+ @Override
public void removeListDataListener(ListDataListener l) {
listeners.remove(l);
}
@@ -328,18 +380,19 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
0,
getSize()
);
- Iterator<ListDataListener> it = listeners.iterator();
- while(it.hasNext()) {
- it.next().contentsChanged(evt);
+ for (ListDataListener listener : listeners) {
+ listener.contentsChanged(evt);
}
}
+ @Override
public Object getElementAt(int index) {
if (index < 0) return null;
if (index >= getSize()) return null;
return conflicts.get(index).getMy();
}
+ @Override
public int getSize() {
if (conflicts == null) return 0;
return conflicts.size();
@@ -368,10 +421,12 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
putValue("help", ht("/Dialog/ConflictList#ResolveAction"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
resolve();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
ListSelectionModel model = (ListSelectionModel)e.getSource();
boolean enabled = model.getMinSelectionIndex() >= 0
@@ -388,17 +443,19 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
putValue("help", ht("/Dialog/ConflictList#SelectAction"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
for (Object o : lstConflicts.getSelectedValues()) {
sel.add((OsmPrimitive)o);
}
DataSet ds = Main.main.getCurrentDataSet();
- if (ds != null) { // Can't see how it is possible but it happened in #7942
+ if (ds != null) { // Can't see how it is possible but it happened in #7942
ds.setSelected(sel);
}
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
ListSelectionModel model = (ListSelectionModel)e.getSource();
boolean enabled = model.getMinSelectionIndex() >= 0
@@ -407,4 +464,50 @@ public final class ConflictDialog extends ToggleDialog implements MapView.EditLa
}
}
+ /**
+ * Warns the user about the number of detected conflicts
+ *
+ * @param numNewConflicts the number of detected conflicts
+ * @since 5775
+ */
+ public void warnNumNewConflicts(int numNewConflicts) {
+ if (numNewConflicts == 0) return;
+
+ String msg1 = trn(
+ "There was {0} conflict detected.",
+ "There were {0} conflicts detected.",
+ numNewConflicts,
+ numNewConflicts
+ );
+
+ final StringBuffer sb = new StringBuffer();
+ sb.append("<html>").append(msg1).append("</html>");
+ if (numNewConflicts > 0) {
+ final ButtonSpec[] options = new ButtonSpec[] {
+ new ButtonSpec(
+ tr("OK"),
+ ImageProvider.get("ok"),
+ tr("Click to close this dialog and continue editing"),
+ null /* no specific help */
+ )
+ };
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
+ public void run() {
+ HelpAwareOptionPane.showOptionDialog(
+ Main.parent,
+ sb.toString(),
+ tr("Conflicts detected"),
+ JOptionPane.WARNING_MESSAGE,
+ null, /* no icon */
+ options,
+ options[0],
+ ht("/Concepts/Conflict#WarningAboutDetectedConflicts")
+ );
+ unfurlDialog();
+ Main.map.repaint();
+ }
+ });
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
index 1c21797..fd720c2 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
@@ -55,7 +55,9 @@ public class ConflictResolutionDialog extends JDialog implements PropertyChangeL
new WindowGeometry(geom, WindowGeometry.centerInWindow(Main.parent,
new Dimension(600, 400))).applySafe(this);
} else {
- new WindowGeometry(this).remember(geom);
+ if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
+ new WindowGeometry(this).remember(geom);
+ }
unregisterListeners();
}
super.setVisible(isVisible);
@@ -140,6 +142,7 @@ public class ConflictResolutionDialog extends JDialog implements PropertyChangeL
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
closeDialog();
}
@@ -156,6 +159,7 @@ public class ConflictResolutionDialog extends JDialog implements PropertyChangeL
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
HelpBrowser.setUrlForHelpTopic(ht("/Dialog/Conflict"));
}
@@ -177,6 +181,7 @@ public class ConflictResolutionDialog extends JDialog implements PropertyChangeL
setEnabled(resolver.isResolvedCompletely());
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
if (! resolver.isResolvedCompletely()) {
Object[] options = {
@@ -211,6 +216,7 @@ public class ConflictResolutionDialog extends JDialog implements PropertyChangeL
closeDialog();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(ConflictResolver.RESOLVED_COMPLETELY_PROP)) {
updateEnabledState();
@@ -230,6 +236,7 @@ public class ConflictResolutionDialog extends JDialog implements PropertyChangeL
}
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(ConflictResolver.MY_PRIMITIVE_PROP)) {
updateTitle((OsmPrimitive)evt.getNewValue());
diff --git a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
index 8e7fddf..f4dff3f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
@@ -1,5 +1,4 @@
// License: GPL. See LICENSE file for details.
-
package org.openstreetmap.josm.gui.dialogs;
import java.awt.Dimension;
@@ -10,16 +9,17 @@ import javax.swing.BoxLayout;
import javax.swing.JPanel;
import javax.swing.JSplitPane;
-import org.openstreetmap.josm.gui.MultiSplitPane;
-import org.openstreetmap.josm.gui.MultiSplitLayout.Divider;
-import org.openstreetmap.josm.gui.MultiSplitLayout.Leaf;
-import org.openstreetmap.josm.gui.MultiSplitLayout.Node;
-import org.openstreetmap.josm.gui.MultiSplitLayout.Split;
+import org.openstreetmap.josm.gui.widgets.MultiSplitPane;
+import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Divider;
+import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Leaf;
+import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Node;
+import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Split;
+import org.openstreetmap.josm.tools.Destroyable;
-public class DialogsPanel extends JPanel {
+public class DialogsPanel extends JPanel implements Destroyable {
protected List<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
protected MultiSplitPane mSpltPane = new MultiSplitPane();
- final protected int DIVIDER_SIZE = 5;
+ protected static final int DIVIDER_SIZE = 5;
/**
* Panels that are added to the multisplitpane.
@@ -291,6 +291,7 @@ public class DialogsPanel extends JPanel {
}
}
+ @Override
public void destroy() {
for (ToggleDialog t : allDialogs) {
t.destroy();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
index 4b2f5e1..0af9598 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
@@ -1,7 +1,6 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.dialogs;
-import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
@@ -59,16 +58,14 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
private JTable userTable;
private FilterTableModel filterModel = new FilterTableModel();
- private SideButton addButton;
- private SideButton editButton;
- private SideButton deleteButton;
- private SideButton upButton;
- private SideButton downButton;
private EnableFilterAction enableFilterAction;
private HidingFilterAction hidingFilterAction;
- public FilterDialog(){
+ /**
+ * Constructs a new {@code FilterDialog}
+ */
+ public FilterDialog() {
super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."),
Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")),
KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
@@ -140,7 +137,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
userTable.setDefaultRenderer(Boolean.class, new BooleanRenderer());
userTable.setDefaultRenderer(String.class, new StringRenderer());
- addButton = new SideButton(new AbstractAction() {
+ SideButton addButton = new SideButton(new AbstractAction() {
{
putValue(NAME, tr("Add"));
putValue(SHORT_DESCRIPTION, tr("Add filter."));
@@ -153,7 +150,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
filterModel.addFilter(filter);
}
}});
- editButton = new SideButton(new AbstractAction() {
+ SideButton editButton = new SideButton(new AbstractAction() {
{
putValue(NAME, tr("Edit"));
putValue(SHORT_DESCRIPTION, tr("Edit filter."));
@@ -170,7 +167,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
}
}
});
- deleteButton = new SideButton(new AbstractAction() {
+ SideButton deleteButton = new SideButton(new AbstractAction() {
{
putValue(NAME, tr("Delete"));
putValue(SHORT_DESCRIPTION, tr("Delete filter."));
@@ -183,7 +180,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
filterModel.removeFilter(index);
}
});
- upButton = new SideButton(new AbstractAction() {
+ SideButton upButton = new SideButton(new AbstractAction() {
{
putValue(NAME, tr("Up"));
putValue(SHORT_DESCRIPTION, tr("Move filter up."));
@@ -198,7 +195,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
}
});
- downButton = new SideButton(new AbstractAction() {
+ SideButton downButton = new SideButton(new AbstractAction() {
{
putValue(NAME, tr("Down"));
putValue(SHORT_DESCRIPTION, tr("Move filter down."));
@@ -215,6 +212,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
// Toggle filter "enabled" on Enter
InputMapUtils.addEnterAction(userTable, new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
int index = userTable.getSelectedRow();
if (index<0) return;
@@ -225,6 +223,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
// Toggle filter "hiding" on Spacebar
InputMapUtils.addSpacebarAction(userTable, new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
int index = userTable.getSelectedRow();
if (index<0) return;
@@ -256,6 +255,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
}
static class BooleanRenderer extends JCheckBox implements TableCellRenderer {
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
FilterTableModel model = (FilterTableModel)table.getModel();
setSelected(value != null && (Boolean)value);
@@ -267,6 +267,7 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
public void updateDialogHeader() {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
setTitle(tr("Filter Hidden:{0} Disabled:{1}", filterModel.disabledAndHiddenCount, filterModel.disabledCount));
}
@@ -278,9 +279,9 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
}
/**
- *
- * @param primitive
- * @return List of primitives whose filtering can be affected by change in primitive
+ * Returns the list of primitives whose filtering can be affected by change in primitive
+ * @param primitives list of primitives to check
+ * @return List of primitives whose filtering can be affected by change in source primitives
*/
private Collection<OsmPrimitive> getAffectedPrimitives(Collection<? extends OsmPrimitive> primitives) {
// Filters can use nested parent/child expression so complete tree is necessary
@@ -315,34 +316,42 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
return result;
}
+ @Override
public void dataChanged(DataChangedEvent event) {
filterModel.executeFilters();
}
+ @Override
public void nodeMoved(NodeMovedEvent event) {
// Do nothing
}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {
filterModel.executeFilters();
}
+ @Override
public void primitivesAdded(PrimitivesAddedEvent event) {
filterModel.executeFilters(event.getPrimitives());
}
+ @Override
public void primitivesRemoved(PrimitivesRemovedEvent event) {
filterModel.executeFilters();
}
+ @Override
public void relationMembersChanged(RelationMembersChangedEvent event) {
filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives()));
}
+ @Override
public void tagsChanged(TagsChangedEvent event) {
filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives()));
}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {
filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives()));
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
index cdff81e..c273f22 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
@@ -13,7 +13,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
@@ -46,6 +45,9 @@ public class FilterTableModel extends AbstractTableModel {
// number of primitives that are disabled and hidden
public int disabledAndHiddenCount;
+ /**
+ * Constructs a new {@code FilterTableModel}.
+ */
public FilterTableModel() {
loadPrefs();
}
@@ -236,10 +238,12 @@ public class FilterTableModel extends AbstractTableModel {
return filters.get(i);
}
+ @Override
public int getRowCount() {
return filters.size();
}
+ @Override
public int getColumnCount() {
return 5;
}
@@ -278,6 +282,9 @@ public class FilterTableModel extends AbstractTableModel {
@Override
public void setValueAt(Object aValue, int row, int column) {
+ if (row >= filters.size()) {
+ return;
+ }
Filter f = filters.get(row);
switch (column) {
case COL_ENABLED:
@@ -306,7 +313,11 @@ public class FilterTableModel extends AbstractTableModel {
}
}
+ @Override
public Object getValueAt(int row, int column) {
+ if (row >= filters.size()) {
+ return null;
+ }
Filter f = filters.get(row);
switch (column) {
case COL_ENABLED:
diff --git a/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java b/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
index 2e3fd8a..d6bd036 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -61,6 +61,9 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
protected ShowHistoryAction showHistoryAction;
protected ReloadAction reloadAction;
+ /**
+ * Constructs a new {@code HistoryDialog}.
+ */
public HistoryDialog() {
super(tr("History"), "history", tr("Display the history of all selected items."),
Shortcut.registerShortcut("subwindow:history", tr("Toggle: {0}", tr("History")), KeyEvent.VK_H,
@@ -107,7 +110,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
//
historyTable.getSelectionModel().addListSelectionListener(showHistoryAction);
historyTable.getSelectionModel().addListSelectionListener(reloadAction);
-
+
// Show history dialog on Enter/Spacebar
InputMapUtils.addEnterAction(historyTable, showHistoryAction);
InputMapUtils.addSpacebarAction(historyTable, showHistoryAction);
@@ -133,10 +136,12 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
/* ----------------------------------------------------------------------------- */
/* interface HistoryDataSetListener */
/* ----------------------------------------------------------------------------- */
+ @Override
public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
model.refresh();
}
+ @Override
public void historyDataSetCleared(HistoryDataSet source) {
model.refresh();
}
@@ -146,7 +151,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
*
*/
static class HistoryItemTableModel extends DefaultTableModel implements SelectionChangedListener{
- private ArrayList<OsmPrimitive> data;
+ private List<OsmPrimitive> data;
private DefaultListSelectionModel selectionModel;
public HistoryItemTableModel(DefaultListSelectionModel selectionModel) {
@@ -172,7 +177,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
}
protected List<OsmPrimitive> getSelectedPrimitives() {
- ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
+ List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
for (int i=0; i< data.size(); i++) {
if (selectionModel.isSelectedIndex(i)) {
ret.add(data.get(i));
@@ -206,6 +211,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
selectPrimitives(selectedPrimitives);
}
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
data.clear();
selectionModel.clearSelection();
@@ -223,7 +229,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
public List<OsmPrimitive> getPrimitives(int [] rows) {
if (rows == null || rows.length == 0) return Collections.emptyList();
- ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(rows.length);
+ List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(rows.length);
for (int row: rows) {
ret.add(data.get(row));
}
@@ -267,6 +273,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
int [] rows = historyTable.getSelectedRows();
if (rows == null || rows.length == 0) return;
@@ -281,6 +288,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
setEnabled(historyTable.getSelectedRowCount() > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -307,6 +315,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
int [] rows = historyTable.getSelectedRows();
if (rows == null || rows.length == 0) return;
@@ -317,6 +326,7 @@ public class HistoryDialog extends ToggleDialog implements HistoryDataSetListene
setEnabled(historyTable.getSelectedRowCount() > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
index 563929d..a3614a3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
@@ -16,7 +16,6 @@ import java.util.Map.Entry;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
import javax.swing.SingleSelectionModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -45,6 +44,7 @@ import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
import org.openstreetmap.josm.gui.mappaint.StyleSource;
import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.DateUtils;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -60,8 +60,7 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
protected List<OsmPrimitive> primitives;
protected OsmDataLayer layer;
- private JTextArea txtData;
- private JTextArea txtMappaint;
+ private JosmTextArea txtMappaint;
boolean mappaintTabLoaded;
public InspectPrimitiveDialog(Collection<OsmPrimitive> primitives, OsmDataLayer layer) {
@@ -93,7 +92,7 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
protected JPanel buildDataPanel() {
JPanel p = new JPanel(new GridBagLayout());
- txtData = new JTextArea();
+ JosmTextArea txtData = new JosmTextArea();
txtData.setFont(new Font("Monospaced", txtData.getFont().getStyle(), txtData.getFont().getSize()));
txtData.setEditable(false);
txtData.setText(buildDataText());
@@ -143,11 +142,11 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
addHeadline(o);
if (!(o.getDataSet() != null && o.getDataSet().getPrimitiveById(o) != null)) {
- s.append(NL).append(INDENT).append(tr("not in data set"));
+ s.append(NL).append(INDENT).append(tr("not in data set")).append(NL);
return;
}
if (o.isIncomplete()) {
- s.append(NL).append(INDENT).append(tr("incomplete"));
+ s.append(NL).append(INDENT).append(tr("incomplete")).append(NL);
return;
}
s.append(NL);
@@ -231,7 +230,7 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
add(tr("Tags: "));
for (String key : o.keySet()) {
s.append(INDENT).append(INDENT);
- s.append(String.format("\"%s\"=\"%s\"\n", key, o.get(key)));
+ s.append(String.format("\"%s\"=\"%s\"%n", key, o.get(key)));
}
}
}
@@ -320,7 +319,7 @@ public class InspectPrimitiveDialog extends ExtendedDialog {
protected void buildMapPaintPanel(JPanel p) {
p.setLayout(new GridBagLayout());
- txtMappaint = new JTextArea();
+ txtMappaint = new JosmTextArea();
txtMappaint.setFont(new Font("Monospaced", txtMappaint.getFont().getStyle(), txtMappaint.getFont().getSize()));
txtMappaint.setEditable(false);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
index f308f4a..8599b77 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
@@ -6,11 +6,8 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Component;
import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
import java.text.NumberFormat;
import java.text.ParsePosition;
import java.util.ArrayList;
@@ -19,13 +16,11 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSeparator;
import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -38,15 +33,15 @@ import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
public class LatLonDialog extends ExtendedDialog {
private static final Color BG_COLOR_ERROR = new Color(255,224,224);
public JTabbedPane tabs;
- private JTextField tfLatLon, tfEastNorth;
+ private JosmTextField tfLatLon, tfEastNorth;
private LatLon latLonCoordinates;
private EastNorth eastNorthCoordinates;
@@ -76,22 +71,22 @@ public class LatLonDialog extends ExtendedDialog {
pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
pnl.add(new JLabel(tr("Coordinates:")), GBC.std().insets(0,10,5,0));
- tfLatLon = new JTextField(24);
+ tfLatLon = new JosmTextField(24);
pnl.add(tfLatLon, GBC.eol().insets(0,10,0,0).fill(GBC.HORIZONTAL).weight(1.0, 0.0));
pnl.add(new JSeparator(), GBC.eol().fill(GBC.HORIZONTAL).insets(0,5,0,5));
pnl.add(new HtmlPanel(
tr("Enter the coordinates for the new node.<br/>You can separate longitude and latitude with space, comma or semicolon.<br/>" +
- "Use positive numbers or N, E characters to indicate North or East cardinal direction.<br/>" +
- "For South and West cardinal directions you can use either negative numbers or S, W characters.<br/>" +
- "Coordinate value can be in one of three formats:<ul>" +
+ "Use positive numbers or N, E characters to indicate North or East cardinal direction.<br/>" +
+ "For South and West cardinal directions you can use either negative numbers or S, W characters.<br/>" +
+ "Coordinate value can be in one of three formats:<ul>" +
"<li><i>degrees</i><tt>°</tt></li>" +
"<li><i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt></li>" +
"<li><i>degrees</i><tt>°</tt> <i>minutes</i><tt>'</tt> <i>seconds</i><tt>"</tt></li>" +
- "</ul>" +
- "Symbols <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, <tt>″</tt> are optional.<br/><br/>" +
- "Some examples:<ul>" +
+ "</ul>" +
+ "Symbols <tt>°</tt>, <tt>'</tt>, <tt>′</tt>, <tt>"</tt>, <tt>″</tt> are optional.<br/><br/>" +
+ "Some examples:<ul>" +
"<li>49.29918° 19.24788°</li>" +
"<li>N 49.29918 E 19.24788</li>" +
"<li>W 49°29.918' S 19°24.788'</li>" +
@@ -108,7 +103,7 @@ public class LatLonDialog extends ExtendedDialog {
"<li>49 29.4 19 24.5</li>" +
"<li>-49 29.4 N -19 24.5 W</li></ul>" +
"<li>48 deg 42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
- )),
+ )),
GBC.eol().fill().weight(1.0, 1.0));
// parse and verify input on the fly
@@ -128,7 +123,7 @@ public class LatLonDialog extends ExtendedDialog {
pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
pnl.add(new JLabel(tr("Projected coordinates:")), GBC.std().insets(0,10,5,0));
- tfEastNorth = new JTextField(24);
+ tfEastNorth = new JosmTextField(24);
pnl.add(tfEastNorth, GBC.eol().insets(0,10,0,0).fill(GBC.HORIZONTAL).weight(1.0, 0.0));
@@ -167,9 +162,9 @@ public class LatLonDialog extends ExtendedDialog {
}
public LatLonDialog(Component parent, String title, String help) {
- super(Main.parent, tr("Add Node..."), new String[] { tr("Ok"), tr("Cancel") });
+ super(parent, title, new String[] { tr("Ok"), tr("Cancel") });
setButtonIcons(new String[] { "ok", "cancel" });
- configureContextsensitiveHelp("/Action/AddNode", true);
+ configureContextsensitiveHelp(help, true);
build();
setCoordinates(null);
@@ -207,13 +202,13 @@ public class LatLonDialog extends ExtendedDialog {
return eastNorthCoordinates;
}
- protected void setErrorFeedback(JTextField tf, String message) {
+ protected void setErrorFeedback(JosmTextField tf, String message) {
tf.setBorder(BorderFactory.createLineBorder(Color.RED, 1));
tf.setToolTipText(message);
tf.setBackground(BG_COLOR_ERROR);
}
- protected void clearErrorFeedback(JTextField tf, String message) {
+ protected void clearErrorFeedback(JosmTextField tf, String message) {
tf.setBorder(UIManager.getBorder("TextField.border"));
tf.setToolTipText(message);
tf.setBackground(UIManager.getColor("TextField.background"));
@@ -284,7 +279,7 @@ public class LatLonDialog extends ExtendedDialog {
}
private void setOkEnabled(boolean b) {
- if (buttons != null && buttons.size() > 0) {
+ if (buttons != null && !buttons.isEmpty()) {
buttons.get(0).setEnabled(b);
}
}
@@ -298,45 +293,53 @@ public class LatLonDialog extends ExtendedDialog {
}
class LatLonInputVerifier implements DocumentListener {
+ @Override
public void changedUpdate(DocumentEvent e) {
parseLatLonUserInput();
}
+ @Override
public void insertUpdate(DocumentEvent e) {
parseLatLonUserInput();
}
+ @Override
public void removeUpdate(DocumentEvent e) {
parseLatLonUserInput();
}
}
class EastNorthInputVerifier implements DocumentListener {
+ @Override
public void changedUpdate(DocumentEvent e) {
parseEastNorthUserInput();
}
+ @Override
public void insertUpdate(DocumentEvent e) {
parseEastNorthUserInput();
}
+ @Override
public void removeUpdate(DocumentEvent e) {
parseEastNorthUserInput();
}
}
static class TextFieldFocusHandler implements FocusListener {
+ @Override
public void focusGained(FocusEvent e) {
Component c = e.getComponent();
- if (c instanceof JTextField) {
- JTextField tf = (JTextField)c;
+ if (c instanceof JosmTextField) {
+ JosmTextField tf = (JosmTextField)c;
tf.selectAll();
}
}
+ @Override
public void focusLost(FocusEvent e) {}
}
- private static LatLon parseLatLon(final String coord) {
+ public static LatLon parseLatLon(final String coord) {
final Matcher m = p.matcher(coord);
final StringBuilder sb = new StringBuilder();
@@ -419,7 +422,7 @@ public class LatLonDialog extends ExtendedDialog {
return new LatLon(latLon.lat, latLon.lon);
}
- private static EastNorth parseEastNorth(String s) {
+ public static EastNorth parseEastNorth(String s) {
String[] en = s.split("[;, ]+");
if (en.length != 2) return null;
try {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index 64e8be3..0747c1c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -34,7 +34,6 @@ import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JSlider;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
@@ -57,12 +56,12 @@ import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.io.SaveLayersDialog;
import org.openstreetmap.josm.gui.layer.JumpToMarkerActions;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -91,7 +90,6 @@ public class LayerListDialog extends ToggleDialog {
if (instance != null)
throw new IllegalStateException("Dialog was already created");
instance = new LayerListDialog(mapFrame);
-
}
/**
@@ -193,7 +191,7 @@ public class LayerListDialog extends ToggleDialog {
layerList.getColumnModel().getColumn(1).setPreferredWidth(16);
layerList.getColumnModel().getColumn(1).setResizable(false);
layerList.getColumnModel().getColumn(2).setCellRenderer(new LayerNameCellRenderer());
- layerList.getColumnModel().getColumn(2).setCellEditor(new LayerNameCellEditor(new JTextField()));
+ layerList.getColumnModel().getColumn(2).setCellEditor(new LayerNameCellEditor(new JosmTextField()));
for (KeyStroke ks : new KeyStroke[] {
KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),
KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK),
@@ -276,6 +274,7 @@ public class LayerListDialog extends ToggleDialog {
// Activate layer on Enter key press
InputMapUtils.addEnterAction(layerList, new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
activateLayerAction.actionPerformed(null);
layerList.requestFocus();
@@ -344,8 +343,8 @@ public class LayerListDialog extends ToggleDialog {
* <code>listener</code> receives a {@link IEnabledStateUpdating#updateEnabledState()}
* on every {@link ListDataEvent}.
*
- * @param listener the listener
- * @param listSelectionModel the source emitting {@link ListDataEvent}s
+ * @param listener the listener
+ * @param listModel the source emitting {@link ListDataEvent}s
*/
protected void adaptTo(final IEnabledStateUpdating listener, LayerListModel listModel) {
listModel.addTableModelListener(
@@ -449,6 +448,9 @@ public class LayerListDialog extends ToggleDialog {
}
}
+ /**
+ * Constructs a new {@code ShowHideLayerAction}.
+ */
public ShowHideLayerAction() {
this(true);
}
@@ -640,6 +642,9 @@ public class LayerListDialog extends ToggleDialog {
updateEnabledState();
}
+ /**
+ * Constructs a new {@code ActivateLayerAction}.
+ */
public ActivateLayerAction() {
putValue(NAME, tr("Activate"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate"));
@@ -674,8 +679,7 @@ public class LayerListDialog extends ToggleDialog {
}
protected boolean isActiveLayer(Layer layer) {
- if (Main.map == null) return false;
- if (Main.map.mapView == null) return false;
+ if (!Main.isDisplayingMapView()) return false;
return Main.map.mapView.getActiveLayer() == layer;
}
@@ -744,6 +748,9 @@ public class LayerListDialog extends ToggleDialog {
updateEnabledState();
}
+ /**
+ * Constructs a new {@code MergeAction}.
+ */
public MergeAction() {
putValue(NAME, tr("Merge"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "mergedown"));
@@ -767,8 +774,7 @@ public class LayerListDialog extends ToggleDialog {
}
protected boolean isActiveLayer(Layer layer) {
- if (Main.map == null) return false;
- if (Main.map.mapView == null) return false;
+ if (!Main.isDisplayingMapView()) return false;
return Main.map.mapView.getActiveLayer() == layer;
}
@@ -811,6 +817,9 @@ public class LayerListDialog extends ToggleDialog {
updateEnabledState();
}
+ /**
+ * Constructs a new {@code DuplicateAction}.
+ */
public DuplicateAction() {
putValue(NAME, tr("Duplicate"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "duplicatelayer"));
@@ -820,7 +829,7 @@ public class LayerListDialog extends ToggleDialog {
}
private void duplicate(Layer layer) {
- if (Main.map == null || Main.map.mapView == null)
+ if (!Main.isDisplayingMapView())
return;
List<String> layerNames = new ArrayList<String>();
@@ -851,7 +860,7 @@ public class LayerListDialog extends ToggleDialog {
}
protected boolean isActiveLayer(Layer layer) {
- if (Main.map == null || Main.map.mapView == null)
+ if (!Main.isDisplayingMapView())
return false;
return Main.map.mapView.getActiveLayer() == layer;
}
@@ -962,8 +971,7 @@ public class LayerListDialog extends ToggleDialog {
private class LayerNameCellRenderer extends DefaultTableCellRenderer {
protected boolean isActiveLayer(Layer layer) {
- if (Main.map == null) return false;
- if (Main.map.mapView == null) return false;
+ if (!Main.isDisplayingMapView()) return false;
return Main.map.mapView.getActiveLayer() == layer;
}
@@ -1008,32 +1016,23 @@ public class LayerListDialog extends ToggleDialog {
}
private static class LayerNameCellEditor extends DefaultCellEditor {
- public LayerNameCellEditor(JTextField tf) {
+ public LayerNameCellEditor(JosmTextField tf) {
super(tf);
}
@Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
- JTextField tf = (JTextField) super.getTableCellEditorComponent(table, value, isSelected, row, column);
+ JosmTextField tf = (JosmTextField) super.getTableCellEditorComponent(table, value, isSelected, row, column);
tf.setText(value == null ? "" : ((Layer) value).getName());
return tf;
}
}
class PopupMenuHandler extends PopupMenuLauncher {
- @Override
- public void launch(MouseEvent evt) {
- Point p = evt.getPoint();
- int index = layerList.rowAtPoint(p);
- if (index < 0) return;
- if (!layerList.getCellRect(index, 2, false).contains(evt.getPoint()))
- return;
- if (!layerList.isRowSelected(index)) {
- layerList.setRowSelectionInterval(index, index);
- }
- Layer layer = model.getLayer(index);
- LayerListPopup menu = new LayerListPopup(getModel().getSelectedLayers(), layer);
- menu.show(layerList, p.x, p.y-3);
+ @Override public void showMenu(MouseEvent evt) {
+ Layer layer = getModel().getLayer(layerList.getSelectedRow());
+ menu = new LayerListPopup(getModel().getSelectedLayers(), layer);
+ super.showMenu(evt);
}
}
@@ -1104,7 +1103,7 @@ public class LayerListDialog extends ToggleDialog {
* It also listens to {@link PropertyChangeEvent}s of every {@link Layer} it manages, in particular to
* the properties {@link Layer#VISIBLE_PROP} and {@link Layer#NAME_PROP}.
*/
- public class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener {
+ public final class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener {
/** manages list selection state*/
private DefaultListSelectionModel selectionModel;
private CopyOnWriteArrayList<LayerListModelListener> listeners;
@@ -1202,7 +1201,7 @@ public class LayerListDialog extends ToggleDialog {
* be empty.
*/
public List<Layer> getSelectedLayers() {
- ArrayList<Layer> selected = new ArrayList<Layer>();
+ List<Layer> selected = new ArrayList<Layer>();
for (int i=0; i<getLayers().size(); i++) {
if (selectionModel.isSelectedIndex(i)) {
selected.add(getLayers().get(i));
@@ -1219,7 +1218,7 @@ public class LayerListDialog extends ToggleDialog {
* but may be empty.
*/
public List<Integer> getSelectedRows() {
- ArrayList<Integer> selected = new ArrayList<Integer>();
+ List<Integer> selected = new ArrayList<Integer>();
for (int i=0; i<getLayers().size();i++) {
if (selectionModel.isSelectedIndex(i)) {
selected.add(i);
@@ -1379,7 +1378,7 @@ public class LayerListDialog extends ToggleDialog {
* for <code>source</code>. Never null, but can be empty.
*/
public List<Layer> getPossibleMergeTargets(Layer source) {
- ArrayList<Layer> targets = new ArrayList<Layer>();
+ List<Layer> targets = new ArrayList<Layer>();
if (source == null)
return targets;
for (Layer target : getLayers()) {
@@ -1401,7 +1400,7 @@ public class LayerListDialog extends ToggleDialog {
* Never null, but can be empty.
*/
public List<Layer> getLayers() {
- if (Main.map == null || Main.map.mapView == null)
+ if (!Main.isDisplayingMapView())
return Collections.<Layer>emptyList();
return Main.map.mapView.getAllLayersAsList();
}
@@ -1434,7 +1433,7 @@ public class LayerListDialog extends ToggleDialog {
* @return the active layer. null, if no active layer is available
*/
protected Layer getActiveLayer() {
- if (Main.map == null || Main.map.mapView == null) return null;
+ if (!Main.isDisplayingMapView()) return null;
return Main.map.mapView.getActiveLayer();
}
@@ -1563,7 +1562,6 @@ public class LayerListDialog extends ToggleDialog {
* Creates a {@link ShowHideLayerAction} for <code>layer</code> in the
* context of this {@link LayerListDialog}.
*
- * @param layer the layer
* @return the action
*/
public ShowHideLayerAction createShowHideLayerAction() {
@@ -1576,7 +1574,6 @@ public class LayerListDialog extends ToggleDialog {
* Creates a {@link DeleteLayerAction} for <code>layer</code> in the
* context of this {@link LayerListDialog}.
*
- * @param layer the layer
* @return the action
*/
public DeleteLayerAction createDeleteLayerAction() {
@@ -1647,7 +1644,7 @@ public class LayerListDialog extends ToggleDialog {
if (!Main.isDisplayingMapView())
return false;
- return Main.map.mapView.getAllLayersAsList().indexOf(l) >= 0;
+ return Main.map.mapView.getAllLayersAsList().contains(l);
}
public static MultikeyInfo getLayerInfo(Layer l) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java
index 970029f..303353d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -34,6 +34,7 @@ public class LayerListPopup extends JPopupMenu {
putValue("help", ht("/Action/LayerInfo"));
this.layer = layer;
}
+ @Override
public void actionPerformed(ActionEvent e) {
JOptionPane.showMessageDialog(
Main.parent,
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
index 625bc48..7090e9a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
@@ -38,7 +38,6 @@ import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
-import javax.swing.JTextArea;
import javax.swing.JViewport;
import javax.swing.ListSelectionModel;
import javax.swing.SingleSelectionModel;
@@ -58,6 +57,8 @@ import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.PreferencesAction;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.SideButton;
@@ -66,11 +67,12 @@ import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintStyleLoader;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
import org.openstreetmap.josm.gui.mappaint.StyleSource;
import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
-import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -90,6 +92,12 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
protected MoveUpDownAction downAction;
protected JCheckBox cbWireframe;
+ public static final JosmAction PREFERENCE_ACTION = PreferencesAction.forPreferenceSubTab(
+ tr("Map paint preferences"), null, MapPaintPreference.class);
+
+ /**
+ * Constructs a new {@code MapPaintDialog}.
+ */
public MapPaintDialog() {
super(tr("Map Paint Styles"), "mapstyle", tr("configure the map painting style"),
Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")),
@@ -115,6 +123,7 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
}
});
cbWireframe.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
Main.main.menu.wireFrameToggleAction.actionPerformed(null);
}
@@ -153,12 +162,12 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
InputMapUtils.addEnterAction(tblStyles, onoffAction);
InputMapUtils.addSpacebarAction(tblStyles, onoffAction);
- createLayout(p, true, Arrays.asList(new SideButton[] {
+ createLayout(p, true, Arrays.asList(
new SideButton(onoffAction, false),
new SideButton(upAction, false),
new SideButton(downAction, false),
- new SideButton(new LaunchMapPaintPreferencesAction(), false)
- }));
+ new SideButton(PREFERENCE_ACTION, false)
+ ));
}
protected static class StylesTable extends JTable {
@@ -199,7 +208,7 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
}
}
if (!toReload.isEmpty()) {
- System.out.println(trn("Reloading {0} map style.", "Reloading {0} map styles.", toReload.size(), toReload.size()));
+ Main.info(trn("Reloading {0} map style.", "Reloading {0} map styles.", toReload.size(), toReload.size()));
Main.worker.submit(new MapPaintStyleLoader(toReload));
}
}
@@ -311,6 +320,7 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
setVerticalAlignment(SwingConstants.CENTER);
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
if (value == null)
return this;
@@ -396,28 +406,12 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
model.ensureSelectedIsVisible();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
}
- /**
- * Opens preferences window and selects the mappaint tab.
- */
- public static class LaunchMapPaintPreferencesAction extends AbstractAction {
- public LaunchMapPaintPreferencesAction() {
- putValue(NAME, tr("Preferences"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "mappaintpreference"));
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- final PreferenceDialog p =new PreferenceDialog(Main.parent);
- p.selectMapPaintPreferenceTab();
- p.setVisible(true);
- }
- }
-
protected class ReloadAction extends AbstractAction implements ListSelectionListener {
public ReloadAction() {
putValue(NAME, tr("Reload from file"));
@@ -524,12 +518,17 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
BufferedInputStream bis = null;
BufferedOutputStream bos = null;
try {
- bis = new BufferedInputStream(s.getSourceInputStream());
- bos = new BufferedOutputStream(new FileOutputStream(file));
- byte[] buffer = new byte[4096];
- int length;
- while ((length = bis.read(buffer)) > -1 && !canceled) {
- bos.write(buffer, 0, length);
+ InputStream in = s.getSourceInputStream();
+ try {
+ bis = new BufferedInputStream(in);
+ bos = new BufferedOutputStream(new FileOutputStream(file));
+ byte[] buffer = new byte[4096];
+ int length;
+ while ((length = bis.read(buffer)) > -1 && !canceled) {
+ bos.write(buffer, 0, length);
+ }
+ } finally {
+ s.closeSourceInputStream(in);
}
} catch (IOException e) {
error = true;
@@ -651,28 +650,33 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
}
private void buildSourcePanel(StyleSource s, JPanel p) {
- JTextArea txtSource = new JTextArea();
+ JosmTextArea txtSource = new JosmTextArea();
txtSource.setFont(new Font("Monospaced", txtSource.getFont().getStyle(), txtSource.getFont().getSize()));
txtSource.setEditable(false);
p.add(new JScrollPane(txtSource), GBC.std().fill());
- InputStream is = null;
try {
- is = s.getSourceInputStream();
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- String line;
- while ((line = reader.readLine()) != null) {
- txtSource.append(line + "\n");
+ InputStream is = s.getSourceInputStream();
+ try {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ try {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ txtSource.append(line + "\n");
+ }
+ } finally {
+ reader.close();
+ }
+ } finally {
+ s.closeSourceInputStream(is);
}
} catch (IOException ex) {
txtSource.append("<ERROR: failed to read file!>");
- } finally {
- Utils.close(is);
}
}
private void buildErrorsPanel(StyleSource s, JPanel p) {
- JTextArea txtErrors = new JTextArea();
+ JosmTextArea txtErrors = new JosmTextArea();
txtErrors.setFont(new Font("Monospaced", txtErrors.getFont().getStyle(), txtErrors.getFont().getSize()));
txtErrors.setEditable(false);
p.add(new JScrollPane(txtErrors), GBC.std().fill());
@@ -687,20 +691,23 @@ public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchLis
public void launch(MouseEvent evt) {
if (cbWireframe.isSelected())
return;
- Point p = evt.getPoint();
- int index = tblStyles.rowAtPoint(p);
- if (index < 0) return;
- if (!tblStyles.getCellRect(index, 1, false).contains(evt.getPoint()))
- return;
- if (!tblStyles.isRowSelected(index)) {
- tblStyles.setRowSelectionInterval(index, index);
- }
- MapPaintPopup menu = new MapPaintPopup();
- menu.show(tblStyles, p.x, p.y);
+ super.launch(evt);
+ }
+
+ @Override
+ protected void showMenu(MouseEvent evt) {
+ menu = new MapPaintPopup();
+ super.showMenu(evt);
}
}
+ /**
+ * The popup menu displayed when right-clicking a map paint entry
+ */
public class MapPaintPopup extends JPopupMenu {
+ /**
+ * Constructs a new {@code MapPaintPopup}.
+ */
public MapPaintPopup() {
add(reloadAction);
add(new SaveAsAction());
diff --git a/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
new file mode 100644
index 0000000..88eca98
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
@@ -0,0 +1,230 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
+import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.OsmIdTextField;
+import org.openstreetmap.josm.gui.widgets.OsmPrimitiveTypesComboBox;
+import org.openstreetmap.josm.tools.Utils;
+
+import javax.swing.BorderFactory;
+import javax.swing.GroupLayout;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.border.EtchedBorder;
+import javax.swing.plaf.basic.BasicComboBoxEditor;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
+
+/**
+ * Dialog prompt to user to let him choose OSM primitives by specifying their type and IDs.
+ * @since 6448, split from DownloadObjectDialog
+ */
+public class OsmIdSelectionDialog extends ExtendedDialog implements WindowListener {
+
+ protected final JPanel panel = new JPanel();
+ protected final OsmPrimitiveTypesComboBox cbType = new OsmPrimitiveTypesComboBox();
+ protected final OsmIdTextField tfId = new OsmIdTextField();
+ protected final HistoryComboBox cbId = new HistoryComboBox();
+ protected final GroupLayout layout = new GroupLayout(panel);
+
+ public OsmIdSelectionDialog(Component parent, String title, String[] buttonTexts) {
+ super(parent, title, buttonTexts);
+ }
+
+ public OsmIdSelectionDialog(Component parent, String title, String[] buttonTexts, boolean modal) {
+ super(parent, title, buttonTexts, modal);
+ }
+
+ public OsmIdSelectionDialog(Component parent, String title, String[] buttonTexts, boolean modal, boolean disposeOnClose) {
+ super(parent, title, buttonTexts, modal, disposeOnClose);
+ }
+
+ protected void init() {
+ panel.setLayout(layout);
+ layout.setAutoCreateGaps(true);
+ layout.setAutoCreateContainerGaps(true);
+
+ JLabel lbl1 = new JLabel(tr("Object type:"));
+
+ cbType.addItem(trc("osm object types", "mixed"));
+ cbType.setToolTipText(tr("Choose the OSM object type"));
+ JLabel lbl2 = new JLabel(tr("Object ID:"));
+
+ cbId.setEditor(new BasicComboBoxEditor() {
+ @Override
+ protected JosmTextField createEditorComponent() {
+ return tfId;
+ }
+ });
+ cbId.setToolTipText(tr("Enter the ID of the object that should be downloaded"));
+ restorePrimitivesHistory(cbId);
+
+ // forward the enter key stroke to the download button
+ tfId.getKeymap().removeKeyStrokeBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false));
+ tfId.setPreferredSize(new Dimension(400, tfId.getPreferredSize().height));
+
+ HtmlPanel help = new HtmlPanel(tr("Object IDs can be separated by comma or space.<br/>"
+ + " Examples: <b><ul><li>1 2 5</li><li>1,2,5</li></ul><br/></b>"
+ + " In mixed mode, specify objects like this: <b>w123, n110, w12, r15</b><br/>"));
+ help.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
+
+ cbType.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ tfId.setType(cbType.getType());
+ tfId.performValidation();
+ }
+ });
+
+ final GroupLayout.SequentialGroup sequentialGroup = layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup()
+ .addComponent(lbl1)
+ .addComponent(cbType, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE))
+ .addGroup(layout.createParallelGroup()
+ .addComponent(lbl2)
+ .addComponent(cbId, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE));
+
+ final GroupLayout.ParallelGroup parallelGroup = layout.createParallelGroup()
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup()
+ .addComponent(lbl1)
+ .addComponent(lbl2)
+ )
+ .addGroup(layout.createParallelGroup()
+ .addComponent(cbType)
+ .addComponent(cbId))
+ );
+
+ for (Component i : getComponentsBeforeHelp()) {
+ sequentialGroup.addComponent(i);
+ parallelGroup.addComponent(i);
+ }
+
+ layout.setVerticalGroup(sequentialGroup.addComponent(help));
+ layout.setHorizontalGroup(parallelGroup.addComponent(help));
+ }
+
+ /**
+ * Let subclasses add custom components between the id input field and the help text
+ * @return the collections to add
+ */
+ protected Collection<Component> getComponentsBeforeHelp() {
+ return Collections.emptySet();
+ }
+
+ /**
+ * Allows subclasses to specify a different continue button index. If this button is pressed, the history is updated.
+ * @return the button index
+ */
+ public int getContinueButtonIndex() {
+ return 1;
+ }
+
+ /**
+ * Restore the current history from the preferences
+ *
+ * @param cbHistory the {@link HistoryComboBox} to which the history is restored to
+ */
+ protected void restorePrimitivesHistory(HistoryComboBox cbHistory) {
+ java.util.List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(getClass().getName() + ".primitivesHistory", new LinkedList<String>()));
+ // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
+ Collections.reverse(cmtHistory);
+ cbHistory.setPossibleItems(cmtHistory);
+ }
+
+ /**
+ * Remind the current history in the preferences
+ *
+ * @param cbHistory the {@link HistoryComboBox} of which to restore the history
+ */
+ protected void remindPrimitivesHistory(HistoryComboBox cbHistory) {
+ cbHistory.addCurrentItemToHistory();
+ Main.pref.putCollection(getClass().getName() + ".primitivesHistory", cbHistory.getHistory());
+ }
+
+ /**
+ * Gets the requested OSM object IDs.
+ *
+ * @return The list of requested OSM object IDs
+ */
+ public final List<PrimitiveId> getOsmIds() {
+ return tfId.getIds();
+ }
+
+ @Override
+ public void setupDialog() {
+ setContent(panel, false);
+ cbType.setSelectedIndex(Main.pref.getInteger("downloadprimitive.lasttype", 0));
+ tfId.setType(cbType.getType());
+ if (Main.pref.getBoolean("downloadprimitive.autopaste", true)) {
+ tryToPasteFromClipboard(tfId, cbType);
+ }
+ setDefaultButton(getContinueButtonIndex());
+ addWindowListener(this);
+ super.setupDialog();
+ }
+
+ protected void tryToPasteFromClipboard(OsmIdTextField tfId, OsmPrimitiveTypesComboBox cbType) {
+ String buf = Utils.getClipboardContent();
+ if (buf != null) {
+ if (buf.contains("node")) cbType.setSelectedIndex(0);
+ if (buf.contains("way")) cbType.setSelectedIndex(1);
+ if (buf.contains("relation")) cbType.setSelectedIndex(2);
+ String[] res = buf.split("/");
+ String txt;
+ if (res.length > 0) {
+ txt = res[res.length - 1];
+ if (txt.isEmpty() && txt.length() > 1) txt = res[res.length - 2];
+ } else {
+ txt = buf;
+ }
+ if (buf.length() <= Main.pref.getInteger("downloadprimitive.max-autopaste-length", 2000)) {
+ tfId.tryToPasteFrom(txt);
+ }
+ }
+ }
+
+ @Override public void windowClosed(WindowEvent e) {
+ if (e != null && e.getComponent() == this && getValue() == getContinueButtonIndex()) {
+ Main.pref.putInteger("downloadprimitive.lasttype", cbType.getSelectedIndex());
+
+ if (!tfId.readIds()) {
+ JOptionPane.showMessageDialog(getParent(),
+ tr("Invalid ID list specified\n"
+ + "Cannot continue."),
+ tr("Information"),
+ JOptionPane.INFORMATION_MESSAGE
+ );
+ return;
+ }
+
+ remindPrimitivesHistory(cbId);
+ }
+ }
+
+ @Override public void windowOpened(WindowEvent e) {}
+ @Override public void windowClosing(WindowEvent e) {}
+ @Override public void windowIconified(WindowEvent e) {}
+ @Override public void windowDeiconified(WindowEvent e) {}
+ @Override public void windowActivated(WindowEvent e) {}
+ @Override public void windowDeactivated(WindowEvent e) {}
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
index 1c9fde8..0b49c88 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
@@ -1,56 +1,52 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.dialogs;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.Point;
+import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.AbstractListModel;
-import javax.swing.Action;
import javax.swing.DefaultListSelectionModel;
+import javax.swing.FocusManager;
import javax.swing.JComponent;
import javax.swing.JList;
-import javax.swing.JMenuItem;
import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
-import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.event.PopupMenuListener;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.relation.AddSelectionToRelations;
+import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
+import org.openstreetmap.josm.actions.relation.DownloadMembersAction;
+import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
+import org.openstreetmap.josm.actions.relation.DuplicateRelationAction;
+import org.openstreetmap.josm.actions.relation.EditRelationAction;
+import org.openstreetmap.josm.actions.relation.SelectMembersAction;
+import org.openstreetmap.josm.actions.relation.SelectRelationAction;
import org.openstreetmap.josm.actions.search.SearchCompiler;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.SelectionChangedListener;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
import org.openstreetmap.josm.data.osm.event.DataSetListener;
@@ -66,16 +62,15 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PopupMenuHandler;
import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
-import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
-import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
-import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.Predicate;
@@ -95,19 +90,34 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
/** the list model used */
private final RelationListModel model;
- /** the edit action */
- private final EditAction editAction;
- /** the delete action */
- private final DeleteAction deleteAction;
private final NewAction newAction;
- private final AddToRelation addToRelation;
- /** the popup menu */
- private final RelationDialogPopupMenu popupMenu;
- private final JTextField filter;
-
+ /** the popup menu and its handler */
+ private final JPopupMenu popupMenu = new JPopupMenu();
+ private final PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
+
+ private final JosmTextField filter;
+
+ // Actions
+ /** the edit action */
+ private final EditRelationAction editAction = new EditRelationAction();
+ /** the delete action */
+ private final DeleteRelationsAction deleteRelationsAction = new DeleteRelationsAction();
+ /** the duplicate action */
+ private final DuplicateRelationAction duplicateAction = new DuplicateRelationAction();
+ private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction();
+ private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction();
+ private final SelectMembersAction selectMembersAction = new SelectMembersAction(false);
+ private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
+ private final SelectRelationAction selectRelationAction = new SelectRelationAction(false);
+ private final SelectRelationAction addRelationToSelectionAction = new SelectRelationAction(true);
+ /** add all selected primitives to the given relations */
+ private final AddSelectionToRelations addSelectionToRelations = new AddSelectionToRelations();
+
+ HighlightHelper highlightHelper = new HighlightHelper();
+ private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
/**
- * constructor
+ * Constructs <code>RelationListDialog</code>
*/
public RelationListDialog() {
super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
@@ -136,58 +146,18 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
//
newAction = new NewAction();
- // the edit action
- //
- editAction = new EditAction();
- displaylist.addListSelectionListener(editAction);
-
- // the duplicate action
- //
- DuplicateAction duplicateAction = new DuplicateAction();
- displaylist.addListSelectionListener(duplicateAction);
-
- // the delete action
- //
- deleteAction = new DeleteAction();
- displaylist.addListSelectionListener(deleteAction);
-
- // the select action
- //
- SelectAction selectAction = new SelectAction(false);
- displaylist.addListSelectionListener(selectAction);
-
- filter = new DisableShortcutsOnFocusGainedTextField();
- filter.setToolTipText(tr("Relation list filter"));
- filter.getDocument().addDocumentListener(new DocumentListener() {
-
- private void setFilter() {
- try {
- filter.setBackground(UIManager.getColor("TextField.background"));
- filter.setToolTipText(tr("Relation list filter"));
- model.setFilter(SearchCompiler.compile(filter.getText(), false, false));
- } catch (SearchCompiler.ParseError ex) {
- filter.setBackground(new Color(255, 224, 224));
- filter.setToolTipText(ex.getMessage());
- model.setFilter(new SearchCompiler.Always());
- }
- }
-
- @Override
- public void insertUpdate(DocumentEvent e) {
- setFilter();
- }
-
- @Override
- public void removeUpdate(DocumentEvent e) {
- setFilter();
- }
+ filter = setupFilter();
+ displaylist.addListSelectionListener(new ListSelectionListener() {
@Override
- public void changedUpdate(DocumentEvent e) {
- setFilter();
+ public void valueChanged(ListSelectionEvent e) {
+ updateActionsRelationLists();
}
});
+ // Setup popup menu handler
+ setupPopupMenuHandler();
+
JPanel pane = new JPanel(new BorderLayout());
pane.add(filter, BorderLayout.NORTH);
pane.add(new JScrollPane(displaylist), BorderLayout.CENTER);
@@ -195,41 +165,51 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
new SideButton(newAction, false),
new SideButton(editAction, false),
new SideButton(duplicateAction, false),
- new SideButton(deleteAction, false),
- new SideButton(selectAction, false)
+ new SideButton(deleteRelationsAction, false),
+ new SideButton(selectRelationAction, false)
}));
- // activate DEL in the list of relations
- //displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE,0), "deleteRelation");
- //displaylist.getActionMap().put("deleteRelation", deleteAction);
-
InputMapUtils.unassignCtrlShiftUpDown(displaylist, JComponent.WHEN_FOCUSED);
-
- // Select relation on Ctrl-Enter
- InputMapUtils.addEnterAction(displaylist, selectAction);
- addToRelation = new AddToRelation();
- popupMenu = new RelationDialogPopupMenu(displaylist);
+ // Select relation on Ctrl-Enter
+ InputMapUtils.addEnterAction(displaylist, selectRelationAction);
// Edit relation on Ctrl-Enter
displaylist.getActionMap().put("edit", editAction);
displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_MASK), "edit");
+
+ updateActionsRelationLists();
+ }
+
+ // inform all actions about list of relations they need
+ private void updateActionsRelationLists() {
+ List<Relation> sel = model.getSelectedRelations();
+ popupMenuHandler.setPrimitives(sel);
+
+ Component focused = FocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+
+ //update highlights
+ if (highlightEnabled && focused==displaylist && Main.isDisplayingMapView()) {
+ if (highlightHelper.highlightOnly(sel)) {
+ Main.map.mapView.repaint();
+ }
+ }
}
@Override public void showNotify() {
MapView.addLayerChangeListener(newAction);
newAction.updateEnabledState();
DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT);
- DataSet.addSelectionListener(addToRelation);
+ DataSet.addSelectionListener(addSelectionToRelations);
dataChanged(null);
}
@Override public void hideNotify() {
MapView.removeLayerChangeListener(newAction);
DatasetEventManager.getInstance().removeDatasetListener(this);
- DataSet.removeSelectionListener(addToRelation);
+ DataSet.removeSelectionListener(addSelectionToRelations);
}
-
+
private void resetFilter() {
filter.setText(null);
}
@@ -243,31 +223,14 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
* @param layer the layer. May be null.
*/
protected void initFromLayer(Layer layer) {
- if (layer == null || ! (layer instanceof OsmDataLayer)) {
+ if (!(layer instanceof OsmDataLayer)) {
model.setRelations(null);
return;
}
OsmDataLayer l = (OsmDataLayer)layer;
model.setRelations(l.data.getRelations());
model.updateTitle();
- }
-
- /**
- * Adds a selection listener to the relation list.
- *
- * @param listener the listener to add
- */
- public void addListSelectionListener(ListSelectionListener listener) {
- displaylist.addListSelectionListener(listener);
- }
-
- /**
- * Removes a selection listener from the relation list.
- *
- * @param listener the listener to remove
- */
- public void removeListSelectionListener(ListSelectionListener listener) {
- displaylist.removeListSelectionListener(listener);
+ updateActionsRelationLists();
}
/**
@@ -305,127 +268,69 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
}
}
- class MouseEventHandler extends MouseAdapter {
- protected void setCurrentRelationAsSelection() {
- Main.main.getCurrentDataSet().setSelected((Relation)displaylist.getSelectedValue());
- }
-
- protected void editCurrentRelation() {
- new EditAction().launchEditor(getSelected());
- }
+ private JosmTextField setupFilter() {
+ final JosmTextField f = new DisableShortcutsOnFocusGainedTextField();
+ f.setToolTipText(tr("Relation list filter"));
+ f.getDocument().addDocumentListener(new DocumentListener() {
- @Override public void mouseClicked(MouseEvent e) {
- if (Main.main.getEditLayer() == null) return;
- if (e.getClickCount() == 2 && SwingUtilities.isLeftMouseButton(e)) {
- if (e.isControlDown()) {
- editCurrentRelation();
- } else {
- setCurrentRelationAsSelection();
+ private void setFilter() {
+ try {
+ f.setBackground(UIManager.getColor("TextField.background"));
+ f.setToolTipText(tr("Relation list filter"));
+ model.setFilter(SearchCompiler.compile(filter.getText(), false, false));
+ } catch (SearchCompiler.ParseError ex) {
+ f.setBackground(new Color(255, 224, 224));
+ f.setToolTipText(ex.getMessage());
+ model.setFilter(new SearchCompiler.Always());
}
}
- }
- private void openPopup(MouseEvent e) {
- Point p = e.getPoint();
- int index = displaylist.locationToIndex(p);
- if (index < 0) return;
- if (!displaylist.getCellBounds(index, index).contains(e.getPoint()))
- return;
- if (! displaylist.isSelectedIndex(index)) {
- displaylist.setSelectedIndex(index);
- }
- popupMenu.show(displaylist, p.x, p.y-3);
- }
- @Override public void mousePressed(MouseEvent e) {
- if (Main.main.getEditLayer() == null) return;
- if (e.isPopupTrigger()) {
- openPopup(e);
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ setFilter();
}
- }
- @Override public void mouseReleased(MouseEvent e) {
- if (Main.main.getEditLayer() == null) return;
- if (e.isPopupTrigger()) {
- openPopup(e);
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ setFilter();
}
- }
- }
- /**
- * The edit action
- *
- */
- class EditAction extends AbstractAction implements ListSelectionListener{
- public EditAction() {
- putValue(SHORT_DESCRIPTION,tr( "Open an editor for the selected relation"));
- putValue(NAME, tr("Edit"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
- setEnabled(false);
- }
- protected Collection<RelationMember> getMembersForCurrentSelection(Relation r) {
- Collection<RelationMember> members = new HashSet<RelationMember>();
- Collection<OsmPrimitive> selection = Main.map.mapView.getEditLayer().data.getSelected();
- for (RelationMember member: r.getMembers()) {
- if (selection.contains(member.getMember())) {
- members.add(member);
- }
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ setFilter();
}
- return members;
- }
+ });
+ return f;
+ }
- public void launchEditor(Relation toEdit) {
- if (toEdit == null)
- return;
- RelationEditor.getEditor(Main.map.mapView.getEditLayer(),toEdit, getMembersForCurrentSelection(toEdit)).setVisible(true);
- }
+ class MouseEventHandler extends PopupMenuLauncher {
- public void actionPerformed(ActionEvent e) {
- if (!isEnabled())
- return;
- launchEditor(getSelected());
+ public MouseEventHandler() {
+ super(popupMenu);
}
- public void valueChanged(ListSelectionEvent e) {
- setEnabled(displaylist.getSelectedIndices() != null && displaylist.getSelectedIndices().length == 1);
+ @Override
+ public void mouseExited(MouseEvent me) {
+ if (highlightEnabled) highlightHelper.clear();
}
- }
- /**
- * The delete action
- *
- */
- class DeleteAction extends AbstractAction implements ListSelectionListener {
- class AbortException extends Exception {}
-
- public DeleteAction() {
- putValue(SHORT_DESCRIPTION,tr("Delete the selected relation"));
- putValue(NAME, tr("Delete"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
- setEnabled(false);
+ protected void setCurrentRelationAsSelection() {
+ Main.main.getCurrentDataSet().setSelected((Relation)displaylist.getSelectedValue());
}
- protected void deleteRelation(Relation toDelete) {
- if (toDelete == null)
- return;
- org.openstreetmap.josm.actions.mapmode.DeleteAction.deleteRelation(
- Main.main.getEditLayer(),
- toDelete
- );
+ protected void editCurrentRelation() {
+ EditRelationAction.launchEditor(getSelected());
}
- public void actionPerformed(ActionEvent e) {
- if (!isEnabled())
- return;
- List<Relation> toDelete = new LinkedList<Relation>();
- for (int i : displaylist.getSelectedIndices()) {
- toDelete.add(model.getVisibleRelation(i));
- }
- for (Relation r : toDelete) {
- deleteRelation(r);
+ @Override public void mouseClicked(MouseEvent e) {
+ if (!Main.main.hasEditLayer()) return;
+ if (isDoubleClick(e)) {
+ if (e.isControlDown()) {
+ editCurrentRelation();
+ } else {
+ setCurrentRelationAsSelection();
+ }
}
- displaylist.clearSelection();
- }
-
- public void valueChanged(ListSelectionEvent e) {
- setEnabled(displaylist.getSelectedIndices() != null && displaylist.getSelectedIndices().length > 0);
}
}
@@ -445,263 +350,39 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
RelationEditor.getEditor(Main.main.getEditLayer(),null, null).setVisible(true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
protected void updateEnabledState() {
- setEnabled(Main.main != null && Main.main.getEditLayer() != null);
+ setEnabled(Main.main != null && Main.main.hasEditLayer());
}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
updateEnabledState();
- }
+ }
+ @Override
public void layerAdded(Layer newLayer) {
updateEnabledState();
}
+ @Override
public void layerRemoved(Layer oldLayer) {
updateEnabledState();
}
}
/**
- * Creates a new relation with a copy of the current editor state
- *
- */
- class DuplicateAction extends AbstractAction implements ListSelectionListener {
- public DuplicateAction() {
- putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window"));
- putValue(SMALL_ICON, ImageProvider.get("duplicate"));
- putValue(NAME, tr("Duplicate"));
- updateEnabledState();
- }
-
- public void launchEditorForDuplicate(Relation original) {
- Relation copy = new Relation(original, true);
- copy.setModified(true);
- RelationEditor editor = RelationEditor.getEditor(
- Main.main.getEditLayer(),
- copy,
- null /* no selected members */
- );
- editor.setVisible(true);
- }
-
- public void actionPerformed(ActionEvent e) {
- if (!isEnabled())
- return;
- launchEditorForDuplicate(getSelected());
- }
-
- protected void updateEnabledState() {
- setEnabled(displaylist.getSelectedIndices() != null && displaylist.getSelectedIndices().length == 1);
- }
-
- public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
- }
- }
-
- /**
- * Sets the current selection to the list of relations selected in this dialog
- *
- */
- class SelectAction extends AbstractAction implements ListSelectionListener{
- boolean add;
- public SelectAction(boolean add) {
- putValue(SHORT_DESCRIPTION, add ? tr("Add the selected relations to the current selection")
- : tr("Set the current selection to the list of selected relations"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
- putValue(NAME, add ? tr("Select relation (add)") : tr("Select relation"));
- this.add = add;
- updateEnabledState();
- }
-
- public void actionPerformed(ActionEvent e) {
- if (!isEnabled()) return;
- int [] idx = displaylist.getSelectedIndices();
- if (idx == null || idx.length == 0) return;
- ArrayList<OsmPrimitive> selection = new ArrayList<OsmPrimitive>(idx.length);
- for (int i: idx) {
- selection.add(model.getVisibleRelation(i));
- }
- if(add) {
- Main.map.mapView.getEditLayer().data.addSelected(selection);
- } else {
- Main.map.mapView.getEditLayer().data.setSelected(selection);
- }
- }
-
- protected void updateEnabledState() {
- setEnabled(displaylist.getSelectedIndices() != null && displaylist.getSelectedIndices().length > 0);
- }
-
- public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
- }
- }
-
- /**
- * Sets the current selection to the list of relations selected in this dialog
- *
- */
- class SelectMembersAction extends AbstractAction implements ListSelectionListener{
- boolean add;
- public SelectMembersAction(boolean add) {
- putValue(SHORT_DESCRIPTION,add ? tr("Add the members of all selected relations to current selection")
- : tr("Select the members of all selected relations"));
- putValue(SMALL_ICON, ImageProvider.get("selectall"));
- putValue(NAME, add ? tr("Select members (add)") : tr("Select members"));
- this.add = add;
- updateEnabledState();
- }
-
- public void actionPerformed(ActionEvent e) {
- if (!isEnabled()) return;
- List<Relation> relations = model.getSelectedRelations();
- HashSet<OsmPrimitive> members = new HashSet<OsmPrimitive>();
- for(Relation r: relations) {
- members.addAll(r.getMemberPrimitives());
- }
- if(add) {
- Main.map.mapView.getEditLayer().data.addSelected(members);
- } else {
- Main.map.mapView.getEditLayer().data.setSelected(members);
- }
- }
-
- protected void updateEnabledState() {
- setEnabled(displaylist.getSelectedIndices() != null && displaylist.getSelectedIndices().length > 0);
- }
-
- public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
- }
- }
-
- /**
- * The action for downloading members of all selected relations
- *
- */
- class DownloadMembersAction extends AbstractAction implements ListSelectionListener{
-
- public DownloadMembersAction() {
- putValue(SHORT_DESCRIPTION,tr("Download all members of the selected relations"));
- putValue(NAME, tr("Download members"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "downloadincomplete"));
- putValue("help", ht("/Dialog/RelationList#DownloadMembers"));
- updateEnabledState();
- }
-
- protected void updateEnabledState() {
- setEnabled(! model.getSelectedNonNewRelations().isEmpty());
- }
-
- public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
- }
-
- public void actionPerformed(ActionEvent e) {
- List<Relation> relations = model.getSelectedNonNewRelations();
- if (relations.isEmpty())
- return;
- Main.worker.submit(new DownloadRelationTask(
- model.getSelectedNonNewRelations(),
- Main.map.mapView.getEditLayer())
- );
- }
- }
-
- /**
- * Action for downloading incomplete members of selected relations
- *
- */
- class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener{
- public DownloadSelectedIncompleteMembersAction() {
- putValue(SHORT_DESCRIPTION, tr("Download incomplete members of selected relations"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
- putValue(NAME, tr("Download incomplete members"));
- updateEnabledState();
- }
-
- public Set<OsmPrimitive> buildSetOfIncompleteMembers(List<Relation> rels) {
- Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
- for(Relation r: rels) {
- ret.addAll(r.getIncompleteMembers());
- }
- return ret;
- }
-
- public void actionPerformed(ActionEvent e) {
- if (!isEnabled())
- return;
- List<Relation> rels = model.getSelectedRelationsWithIncompleteMembers();
- if (rels.isEmpty()) return;
- Main.worker.submit(new DownloadRelationMemberTask(
- rels,
- buildSetOfIncompleteMembers(rels),
- Main.map.mapView.getEditLayer()
- ));
- }
-
- protected void updateEnabledState() {
- setEnabled(!model.getSelectedRelationsWithIncompleteMembers().isEmpty());
- }
-
- public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
- }
- }
-
- class AddToRelation extends AbstractAction implements ListSelectionListener, SelectionChangedListener {
-
- public AddToRelation() {
- super("", ImageProvider.get("dialogs/conflict", "copyendright"));
- putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member"));
- setEnabled(false);
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- Collection<Command> cmds = new LinkedList<Command>();
- for (Relation orig : getSelectedRelations()) {
- Command c = GenericRelationEditor.addPrimitivesToRelation(orig, Main.main.getCurrentDataSet().getSelected());
- if (c != null) {
- cmds.add(c);
- }
- }
- if (!cmds.isEmpty()) {
- Main.main.undoRedo.add(new SequenceCommand(tr("Add selection to relation"), cmds));
- }
- }
-
- @Override
- public void valueChanged(ListSelectionEvent e) {
- putValue(NAME, trn("Add selection to {0} relation", "Add selection to {0} relations",
- getSelectedRelations().size(), getSelectedRelations().size()));
- }
-
- @Override
- public void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) {
- GuiHelper.runInEDT(new Runnable() {
- @Override
- public void run() {
- setEnabled(newSelection != null && !newSelection.isEmpty());
- }
- });
- }
- }
-
- /**
* The list model for the list of relations displayed in the relation list
* dialog.
*
*/
private class RelationListModel extends AbstractListModel {
- private final ArrayList<Relation> relations = new ArrayList<Relation>();
- private ArrayList<Relation> filteredRelations;
+ private final List<Relation> relations = new ArrayList<Relation>();
+ private List<Relation> filteredRelations;
private DefaultListSelectionModel selectionModel;
private SearchCompiler.Match filter;
@@ -808,23 +489,6 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
}
}
- /**
- * Replies the list of selected relations with incomplete members
- *
- * @return the list of selected relations with incomplete members
- */
- public List<Relation> getSelectedRelationsWithIncompleteMembers() {
- List<Relation> ret = getSelectedNonNewRelations();
- Iterator<Relation> it = ret.iterator();
- while(it.hasNext()) {
- Relation r = it.next();
- if (!r.hasIncompleteMembers()) {
- it.remove();
- }
- }
- return ret;
- }
-
private void updateFilteredRelations() {
if (filter != null) {
filteredRelations = new ArrayList<Relation>(Utils.filter(relations, new Predicate<Relation>() {
@@ -850,7 +514,7 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
private List<Relation> getVisibleRelations() {
return filteredRelations == null ? relations : filteredRelations;
}
-
+
private Relation getVisibleRelation(int index) {
if (index < 0 || index >= getVisibleRelations().size()) return null;
return getVisibleRelations().get(index);
@@ -867,33 +531,13 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
}
/**
- * Replies the list of selected, non-new relations. Empty list,
- * if there are no selected, non-new relations.
- *
- * @return the list of selected, non-new relations.
- */
- public List<Relation> getSelectedNonNewRelations() {
- ArrayList<Relation> ret = new ArrayList<Relation>();
- for (int i=0; i<getSize();i++) {
- if (!selectionModel.isSelectedIndex(i)) {
- continue;
- }
- if (getVisibleRelation(i).isNew()) {
- continue;
- }
- ret.add(getVisibleRelation(i));
- }
- return ret;
- }
-
- /**
* Replies the list of selected relations. Empty list,
* if there are no selected relations.
*
* @return the list of selected, non-new relations.
*/
public List<Relation> getSelectedRelations() {
- ArrayList<Relation> ret = new ArrayList<Relation>();
+ List<Relation> ret = new ArrayList<Relation>();
for (int i=0; i<getSize();i++) {
if (!selectionModel.isSelectedIndex(i)) {
continue;
@@ -935,7 +579,7 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
return null;
return i;
}
-
+
private Integer getVisibleRelationIndex(Relation rel) {
int i = getVisibleRelations().indexOf(rel);
if (i<0)
@@ -954,47 +598,41 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
}
}
- class RelationDialogPopupMenu extends ListPopupMenu {
+ private final void setupPopupMenuHandler() {
- public RelationDialogPopupMenu(JList list) {
- super(list);
+ // -- select action
+ popupMenuHandler.addAction(selectRelationAction);
+ popupMenuHandler.addAction(addRelationToSelectionAction);
- // -- download members action
- add(new DownloadMembersAction());
+ // -- select members action
+ popupMenuHandler.addAction(selectMembersAction);
+ popupMenuHandler.addAction(addMembersToSelectionAction);
- // -- download incomplete members action
- add(new DownloadSelectedIncompleteMembersAction());
+ popupMenuHandler.addSeparator();
+ // -- download members action
+ popupMenuHandler.addAction(downloadMembersAction);
- addSeparator();
+ // -- download incomplete members action
+ popupMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
- // -- select members action
- add(new SelectMembersAction(false));
- add(new SelectMembersAction(true));
+ popupMenuHandler.addSeparator();
+ popupMenuHandler.addAction(editAction).setVisible(false);
+ popupMenuHandler.addAction(duplicateAction).setVisible(false);
+ popupMenuHandler.addAction(deleteRelationsAction).setVisible(false);
- // -- select action
- add(new SelectAction(false));
- add(new SelectAction(true));
-
- addSeparator();
-
- add(addToRelation);
- }
+ popupMenuHandler.addAction(addSelectionToRelations);
}
- public void addPopupMenuSeparator() {
- popupMenu.addSeparator();
- }
-
- public JMenuItem addPopupMenuAction(Action a) {
- return popupMenu.add(a);
- }
-
- public void addPopupMenuListener(PopupMenuListener l) {
- popupMenu.addPopupMenuListener(l);
- }
+ /* ---------------------------------------------------------------------------------- */
+ /* Methods that can be called from plugins */
+ /* ---------------------------------------------------------------------------------- */
- public void removePopupMenuListener(PopupMenuListener l) {
- popupMenu.addPopupMenuListener(l);
+ /**
+ * Replies the popup menu handler.
+ * @return The popup menu handler
+ */
+ public PopupMenuHandler getPopupMenuHandler() {
+ return popupMenuHandler;
}
public Collection<Relation> getSelectedRelations() {
@@ -1005,20 +643,25 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
/* DataSetListener */
/* ---------------------------------------------------------------------------------- */
+ @Override
public void nodeMoved(NodeMovedEvent event) {/* irrelevant in this context */}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {/* irrelevant in this context */}
+ @Override
public void primitivesAdded(final PrimitivesAddedEvent event) {
model.addRelations(event.getPrimitives());
model.updateTitle();
}
+ @Override
public void primitivesRemoved(final PrimitivesRemovedEvent event) {
model.removeRelations(event.getPrimitives());
model.updateTitle();
}
+ @Override
public void relationMembersChanged(final RelationMembersChangedEvent event) {
List<Relation> sel = model.getSelectedRelations();
model.sort();
@@ -1026,9 +669,10 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
displaylist.repaint();
}
+ @Override
public void tagsChanged(TagsChangedEvent event) {
OsmPrimitive prim = event.getPrimitive();
- if (prim == null || ! (prim instanceof Relation))
+ if (!(prim instanceof Relation))
return;
// trigger a sort of the relation list because the display name may
// have changed
@@ -1039,9 +683,11 @@ public class RelationListDialog extends ToggleDialog implements DataSetListener
displaylist.repaint();
}
+ @Override
public void dataChanged(DataChangedEvent event) {
initFromLayer(Main.main.getEditLayer());
}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignore */}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
index b41ad8c..06c4986 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -9,7 +9,6 @@ import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,21 +22,21 @@ import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.AbstractListModel;
-import javax.swing.Action;
import javax.swing.DefaultListSelectionModel;
import javax.swing.JList;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.event.PopupMenuListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
+import org.openstreetmap.josm.actions.relation.EditRelationAction;
+import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
import org.openstreetmap.josm.data.SelectionChangedListener;
import org.openstreetmap.josm.data.osm.Node;
@@ -45,7 +44,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
@@ -64,10 +62,11 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PopupMenuHandler;
import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -77,28 +76,29 @@ import org.openstreetmap.josm.tools.SubclassFilteredCollection;
/**
* A small tool dialog for displaying the current selection.
- *
+ * @since 8
*/
public class SelectionListDialog extends ToggleDialog {
private JList lstPrimitives;
- private SelectionListModel model;
+ private DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
+ private SelectionListModel model = new SelectionListModel(selectionModel);
- private SelectAction actSelect;
- private SearchAction actSearch;
- private ZoomToJOSMSelectionAction actZoomToJOSMSelection;
- private ZoomToListSelection actZoomToListSelection;
- private SetRelationSelection actSetRelationSelection;
- private EditRelationSelection actEditRelationSelection;
- private DownloadSelectedIncompleteMembersAction actDownloadSelectedIncompleteMembers;
+ private SelectAction actSelect = new SelectAction();
+ private SearchAction actSearch = new SearchAction();
+ private ZoomToJOSMSelectionAction actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
+ private ZoomToListSelection actZoomToListSelection = new ZoomToListSelection();
+ private SelectInRelationListAction actSetRelationSelection = new SelectInRelationListAction();
+ private EditRelationAction actEditRelationSelection = new EditRelationAction();
+ private DownloadSelectedIncompleteMembersAction actDownloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
- private SelectionPopup popupMenu;
+ /** the popup menu and its handler */
+ private final ListPopupMenu popupMenu;
+ private final PopupMenuHandler popupMenuHandler;
/**
* Builds the content panel for this dialog
*/
protected void buildContentPanel() {
- DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
- model = new SelectionListModel(selectionModel);
lstPrimitives = new JList(model);
lstPrimitives.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
lstPrimitives.setSelectionModel(selectionModel);
@@ -106,17 +106,19 @@ public class SelectionListDialog extends ToggleDialog {
lstPrimitives.setTransferHandler(null); // Fix #6290. Drag & Drop is not supported anyway and Copy/Paste is better propagated to main window
// the select action
- final SideButton selectButton = new SideButton(actSelect = new SelectAction());
+ final SideButton selectButton = new SideButton(actSelect);
lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
selectButton.createArrow(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
SelectionHistoryPopup.launch(selectButton, model.getSelectionHistory());
}
});
// the search button
- final SideButton searchButton = new SideButton(actSearch = new SearchAction());
+ final SideButton searchButton = new SideButton(actSearch);
searchButton.createArrow(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
SearchPopupMenu.launch(searchButton);
}
@@ -127,6 +129,9 @@ public class SelectionListDialog extends ToggleDialog {
}));
}
+ /**
+ * Constructs a new {@code SelectionListDialog}.
+ */
public SelectionListDialog() {
super(tr("Selection"), "selectionlist", tr("Open a selection list window."),
Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}",
@@ -137,18 +142,21 @@ public class SelectionListDialog extends ToggleDialog {
buildContentPanel();
model.addListDataListener(new TitleUpdater());
- actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
model.addListDataListener(actZoomToJOSMSelection);
- actZoomToListSelection = new ZoomToListSelection();
- actSetRelationSelection = new SetRelationSelection();
- actEditRelationSelection = new EditRelationSelection();
- actDownloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
+ popupMenu = new ListPopupMenu(lstPrimitives);
+ popupMenuHandler = setupPopupMenuHandler();
+
+ lstPrimitives.addListSelectionListener(new ListSelectionListener() {
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ actZoomToListSelection.valueChanged(e);
+ popupMenuHandler.setPrimitives(model.getSelected());
+ }
+ });
- lstPrimitives.addMouseListener(new SelectionPopupMenuLauncher());
- lstPrimitives.addMouseListener(new DblClickHandler());
+ lstPrimitives.addMouseListener(new MouseEventHandler());
- popupMenu = new SelectionPopup(lstPrimitives);
InputMapUtils.addEnterAction(lstPrimitives, actZoomToListSelection);
}
@@ -159,9 +167,10 @@ public class SelectionListDialog extends ToggleDialog {
DatasetEventManager.getInstance().addDatasetListener(model, FireMode.IN_EDT);
MapView.addEditLayerChangeListener(actSearch);
// editLayerChanged also gets the selection history of the level
- model.editLayerChanged(null, Main.map.mapView.getEditLayer());
- if (Main.map.mapView.getEditLayer() != null) {
- model.setJOSMSelection(Main.map.mapView.getEditLayer().data.getAllSelected());
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ model.editLayerChanged(null, editLayer);
+ if (editLayer != null) {
+ model.setJOSMSelection(editLayer.data.getAllSelected());
}
actSearch.updateEnabledState();
}
@@ -175,68 +184,61 @@ public class SelectionListDialog extends ToggleDialog {
}
/**
- * Responds to double clicks on the list of selected objects
+ * Responds to double clicks on the list of selected objects and launches the popup menu
*/
- class DblClickHandler extends MouseAdapter {
+ class MouseEventHandler extends PopupMenuLauncher {
+ private final HighlightHelper helper = new HighlightHelper();
+ private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
+ public MouseEventHandler() {
+ super(popupMenu);
+ }
+
@Override
public void mouseClicked(MouseEvent e) {
- if (e.getClickCount() < 2 || ! SwingUtilities.isLeftMouseButton(e)) return;
int idx = lstPrimitives.locationToIndex(e.getPoint());
if (idx < 0) return;
- OsmDataLayer layer = Main.main.getEditLayer();
- if(layer == null) return;
- layer.data.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
- }
- }
-
- /**
- * The popup menu launcher
- */
- class SelectionPopupMenuLauncher extends PopupMenuLauncher {
-
- @Override
- public void launch(MouseEvent evt) {
- if (model.getSelected().isEmpty()) {
- int idx = lstPrimitives.locationToIndex(evt.getPoint());
- if (idx < 0) return;
- model.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
+ if (isDoubleClick(e)) {
+ OsmDataLayer layer = Main.main.getEditLayer();
+ if (layer == null) return;
+ layer.data.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
+ } else if (highlightEnabled && Main.isDisplayingMapView()) {
+ if (helper.highlightOnly((OsmPrimitive)model.getElementAt(idx))) {
+ Main.map.mapView.repaint();
+ }
}
- popupMenu.show(lstPrimitives, evt.getX(), evt.getY());
}
- }
- /**
- * The popup menu for the selection list
- */
- class SelectionPopup extends ListPopupMenu {
- public SelectionPopup(JList list) {
- super(list);
- add(actZoomToJOSMSelection);
- add(actZoomToListSelection);
- addSeparator();
- add(actSetRelationSelection);
- add(actEditRelationSelection);
- addSeparator();
- add(actDownloadSelectedIncompleteMembers);
+ @Override
+ public void mouseExited(MouseEvent me) {
+ if (highlightEnabled) helper.clear();
+ super.mouseExited(me);
}
}
- public void addPopupMenuSeparator() {
- popupMenu.addSeparator();
- }
-
- public JMenuItem addPopupMenuAction(Action a) {
- return popupMenu.add(a);
- }
-
- public void addPopupMenuListener(PopupMenuListener l) {
- popupMenu.addPopupMenuListener(l);
+ private PopupMenuHandler setupPopupMenuHandler() {
+ PopupMenuHandler handler = new PopupMenuHandler(popupMenu);
+ handler.addAction(actZoomToJOSMSelection);
+ handler.addAction(actZoomToListSelection);
+ handler.addSeparator();
+ handler.addAction(actSetRelationSelection);
+ handler.addAction(actEditRelationSelection);
+ handler.addSeparator();
+ handler.addAction(actDownloadSelectedIncompleteMembers);
+ return handler;
}
- public void removePopupMenuListener(PopupMenuListener l) {
- popupMenu.addPopupMenuListener(l);
+ /**
+ * Replies the popup menu handler.
+ * @return The popup menu handler
+ */
+ public PopupMenuHandler getPopupMenuHandler() {
+ return popupMenuHandler;
}
+ /**
+ * Replies the selected OSM primitives.
+ * @return The selected OSM primitives
+ */
public Collection<OsmPrimitive> getSelectedPrimitives() {
return model.getSelected();
}
@@ -249,14 +251,17 @@ public class SelectionListDialog extends ToggleDialog {
setTitle(model.getJOSMSelectionSummary());
}
+ @Override
public void contentsChanged(ListDataEvent e) {
updateTitle();
}
+ @Override
public void intervalAdded(ListDataEvent e) {
updateTitle();
}
+ @Override
public void intervalRemoved(ListDataEvent e) {
updateTitle();
}
@@ -273,15 +278,17 @@ public class SelectionListDialog extends ToggleDialog {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled()) return;
org.openstreetmap.josm.actions.search.SearchAction.search();
}
public void updateEnabledState() {
- setEnabled(Main.main != null && Main.main.getEditLayer() != null);
+ setEnabled(Main.main != null && Main.main.hasEditLayer());
}
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
updateEnabledState();
}
@@ -299,17 +306,20 @@ public class SelectionListDialog extends ToggleDialog {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
Collection<OsmPrimitive> sel = model.getSelected();
if (sel.isEmpty())return;
- if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null) return;
- Main.map.mapView.getEditLayer().data.setSelected(sel);
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer == null) return;
+ editLayer.data.setSelected(sel);
}
public void updateEnabledState() {
setEnabled(!model.getSelected().isEmpty());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -328,6 +338,7 @@ public class SelectionListDialog extends ToggleDialog {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
AutoScaleAction.autoScale("selection");
}
@@ -336,14 +347,17 @@ public class SelectionListDialog extends ToggleDialog {
setEnabled(model.getSize() > 0);
}
+ @Override
public void contentsChanged(ListDataEvent e) {
updateEnabledState();
}
+ @Override
public void intervalAdded(ListDataEvent e) {
updateEnabledState();
}
+ @Override
public void intervalRemoved(ListDataEvent e) {
updateEnabledState();
}
@@ -362,6 +376,7 @@ public class SelectionListDialog extends ToggleDialog {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
BoundingXYVisitor box = new BoundingXYVisitor();
Collection<OsmPrimitive> sel = model.getSelected();
@@ -377,61 +392,7 @@ public class SelectionListDialog extends ToggleDialog {
setEnabled(!model.getSelected().isEmpty());
}
- public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
- }
- }
-
- /**
- * The action for setting and editing a relation in relation list dialog
- *
- */
- class EditRelationSelection extends SetRelationSelection {
- public EditRelationSelection() {
- putValue(NAME, tr("Call editor for relation"));
- putValue(SHORT_DESCRIPTION, tr("Call relation editor for selected relation"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
- updateEnabledState();
- }
-
@Override
- public void actionPerformed(ActionEvent e) {
- Relation relation = (Relation)model.getSelected().toArray()[0];
- Collection<RelationMember> members = new HashSet<RelationMember>();
- Collection<OsmPrimitive> selection = model.getAllElements();
- for (RelationMember member: relation.getMembers()) {
- if (selection.contains(member.getMember())) {
- members.add(member);
- }
- }
- Main.map.relationListDialog.selectRelation(relation);
- RelationEditor.getEditor(Main.map.mapView.getEditLayer(), relation,
- members).setVisible(true);
- }
- }
-
- /**
- * The action for setting a relation in relation list dialog
- *
- */
- class SetRelationSelection extends AbstractAction implements ListSelectionListener{
- public SetRelationSelection() {
- putValue(NAME, tr("Select in relation list"));
- putValue(SHORT_DESCRIPTION, tr("Select relation in relation list."));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "selectionlist"));
- updateEnabledState();
- }
-
- public void actionPerformed(ActionEvent e) {
- Relation relation = (Relation)model.getSelected().toArray()[0];
- Main.map.relationListDialog.selectRelation(relation);
- }
-
- public void updateEnabledState() {
- Object[] sel = model.getSelected().toArray();
- setEnabled(sel.length == 1 && sel[0] instanceof Relation);
- }
-
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -511,16 +472,18 @@ public class SelectionListDialog extends ToggleDialog {
/**
* Replies the history of JOSM selections
*
- * @return
+ * @return history of JOSM selections
*/
public List<Collection<? extends OsmPrimitive>> getSelectionHistory() {
return history;
}
+ @Override
public Object getElementAt(int index) {
return selection.get(index);
}
+ @Override
public int getSize() {
return selection.size();
}
@@ -529,7 +492,7 @@ public class SelectionListDialog extends ToggleDialog {
* Replies the collection of OSM primitives currently selected in the view
* of this model
*
- * @return
+ * @return choosen elements in the view
*/
public Collection<OsmPrimitive> getSelected() {
Set<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
@@ -542,16 +505,6 @@ public class SelectionListDialog extends ToggleDialog {
}
/**
- * Replies the collection of OSM primitives in the view
- * of this model
- *
- * @return
- */
- public Collection<OsmPrimitive> getAllElements() {
- return selection;
- }
-
- /**
* Sets the OSM primitives to be selected in the view of this model
*
* @param sel the collection of primitives to select
@@ -579,27 +532,21 @@ public class SelectionListDialog extends ToggleDialog {
*
* @param selection the collection of currently selected OSM objects
*/
- public void setJOSMSelection(Collection<? extends OsmPrimitive> selection) {
+ public void setJOSMSelection(final Collection<? extends OsmPrimitive> selection) {
this.selection.clear();
- if (selection == null) {
- fireContentsChanged(this, 0, getSize());
- return;
+ if (selection != null) {
+ this.selection.addAll(selection);
+ sort();
}
- this.selection.addAll(selection);
- sort();
- fireContentsChanged(this, 0, getSize());
- remember(selection);
- double dist = -1;
- SubclassFilteredCollection<OsmPrimitive, Way> ways = new SubclassFilteredCollection<OsmPrimitive, Way>(selection, OsmPrimitive.wayPredicate);
- // Compute total length of selected way(s) until an arbitrary limit set to 250 ways
- // in order to prevent performance issue if a large number of ways are selected (old behaviour kept in that case, see #8403)
- int maxWays = Math.max(1, Main.pref.getInteger("selection.max-ways-for-statusline", 250));
- if (!ways.isEmpty() && ways.size() <= maxWays) {
- for (Way w : ways) {
- dist += w.getLength();
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ fireContentsChanged(this, 0, getSize());
+ if (selection != null) {
+ remember(selection);
+ Main.map.statusLine.setDist(new SubclassFilteredCollection<OsmPrimitive, Way>(selection, OsmPrimitive.wayPredicate));
+ }
}
- }
- Main.map.statusLine.setDist(dist);
+ });
}
/**
@@ -622,32 +569,6 @@ public class SelectionListDialog extends ToggleDialog {
}
/**
- * Replies the list of selected relations with incomplete members
- *
- * @return the list of selected relations with incomplete members
- */
- public List<Relation> getSelectedRelationsWithIncompleteMembers() {
- List<Relation> ret = new LinkedList<Relation>();
- for(int i=0; i<getSize(); i++) {
- if (!selectionModel.isSelectedIndex(i)) {
- continue;
- }
- OsmPrimitive p = selection.get(i);
- if (! (p instanceof Relation)) {
- continue;
- }
- if (p.isNew()) {
- continue;
- }
- Relation r = (Relation)p;
- if (r.hasIncompleteMembers()) {
- ret.add(r);
- }
- }
- return ret;
- }
-
- /**
* Sorts the current elements in the selection
*/
public void sort() {
@@ -662,6 +583,7 @@ public class SelectionListDialog extends ToggleDialog {
/* ------------------------------------------------------------------------ */
/* interface EditLayerChangeListener */
/* ------------------------------------------------------------------------ */
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
if (newLayer == null) {
setJOSMSelection(null);
@@ -675,6 +597,7 @@ public class SelectionListDialog extends ToggleDialog {
/* ------------------------------------------------------------------------ */
/* interface SelectionChangeListener */
/* ------------------------------------------------------------------------ */
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
setJOSMSelection(newSelection);
}
@@ -682,37 +605,45 @@ public class SelectionListDialog extends ToggleDialog {
/* ------------------------------------------------------------------------ */
/* interface DataSetListener */
/* ------------------------------------------------------------------------ */
+ @Override
public void dataChanged(DataChangedEvent event) {
// refresh the whole list
fireContentsChanged(this, 0, getSize());
}
+ @Override
public void nodeMoved(NodeMovedEvent event) {
// may influence the display name of primitives, update the data
update(event.getPrimitives());
}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {
// may influence the display name of primitives, update the data
update(event.getPrimitives());
}
+ @Override
public void relationMembersChanged(RelationMembersChangedEvent event) {
// may influence the display name of primitives, update the data
update(event.getPrimitives());
}
+ @Override
public void tagsChanged(TagsChangedEvent event) {
// may influence the display name of primitives, update the data
update(event.getPrimitives());
}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {
// may influence the display name of primitives, update the data
update(event.getPrimitives());
}
+ @Override
public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
+ @Override
public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
}
@@ -730,6 +661,7 @@ public class SelectionListDialog extends ToggleDialog {
addActionListener(this);
}
+ @Override
public void actionPerformed(ActionEvent e) {
org.openstreetmap.josm.actions.search.SearchAction.searchWithoutHistory(s);
}
@@ -796,7 +728,7 @@ public class SelectionListDialog extends ToggleDialog {
if(ways + nodes + relations == 0) {
text.append(tr("Unselectable now"));
this.sel=new ArrayList<OsmPrimitive>(); // empty selection
- }
+ }
if(ways + nodes + relations == 1)
{
text.append(": ");
@@ -810,14 +742,14 @@ public class SelectionListDialog extends ToggleDialog {
addActionListener(this);
}
+ @Override
public void actionPerformed(ActionEvent e) {
Main.main.getCurrentDataSet().setSelected(sel);
}
}
/**
- * The popup menue for the JOSM selection history entries
- *
+ * The popup menu for the JOSM selection history entries
*/
protected static class SelectionHistoryPopup extends JPopupMenu {
static public void launch(Component parent, Collection<Collection<? extends OsmPrimitive>> history) {
@@ -834,47 +766,6 @@ public class SelectionListDialog extends ToggleDialog {
}
}
- /**
- * Action for downloading incomplete members of selected relations
- *
- */
- class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener {
- public DownloadSelectedIncompleteMembersAction() {
- putValue(SHORT_DESCRIPTION, tr("Download incomplete members of selected relations"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
- putValue(NAME, tr("Download incomplete members"));
- updateEnabledState();
- }
-
- public Set<OsmPrimitive> buildSetOfIncompleteMembers(List<Relation> rels) {
- Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
- for(Relation r: rels) {
- ret.addAll(r.getIncompleteMembers());
- }
- return ret;
- }
-
- public void actionPerformed(ActionEvent e) {
- if (!isEnabled())
- return;
- List<Relation> rels = model.getSelectedRelationsWithIncompleteMembers();
- if (rels.isEmpty()) return;
- Main.worker.submit(new DownloadRelationMemberTask(
- rels,
- buildSetOfIncompleteMembers(rels),
- Main.map.mapView.getEditLayer()
- ));
- }
-
- protected void updateEnabledState() {
- setEnabled(!model.getSelectedRelationsWithIncompleteMembers().isEmpty());
- }
-
- public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
- }
- }
-
/** Quicker comparator, comparing just by type and ID's */
static private class OsmPrimitiveQuickComparator implements Comparator<OsmPrimitive> {
@@ -896,6 +787,7 @@ public class SelectionListDialog extends ToggleDialog {
return -1;
}
+ @Override
public int compare(OsmPrimitive a, OsmPrimitive b) {
if (a.getType().equals(b.getType()))
return compareId(a, b);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index d398eb5..15f6247 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
@@ -12,7 +12,6 @@ import java.awt.FlowLayout;
import java.awt.Graphics;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
-import java.awt.Image;
import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.event.AWTEventListener;
@@ -20,7 +19,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
-import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -33,7 +31,6 @@ import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
@@ -46,6 +43,7 @@ import javax.swing.JPopupMenu;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JScrollPane;
import javax.swing.JToggleButton;
+import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
@@ -60,6 +58,7 @@ import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -71,7 +70,7 @@ import org.openstreetmap.josm.tools.WindowGeometry.WindowGeometryException;
* This class is a toggle dialog that can be turned on and off.
*
*/
-public class ToggleDialog extends JPanel implements ShowHideButtonListener, Helpful, AWTEventListener {
+public class ToggleDialog extends JPanel implements ShowHideButtonListener, Helpful, AWTEventListener, Destroyable {
public enum ButtonHiddingType {
ALWAYS_SHOWN, ALWAYS_HIDDEN, DYNAMIC
@@ -94,7 +93,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
};
/** The action to toggle this dialog */
- protected ToggleDialogAction toggleAction;
+ protected final ToggleDialogAction toggleAction;
protected String preferencePrefix;
final protected String name;
@@ -142,7 +141,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
* toggle the checkbox on show/hide
*/
protected JCheckBoxMenuItem windowMenuItem;
-
+
/**
* The linked preferences class (optional). If set, accessible from the title bar with a dedicated button
*/
@@ -150,7 +149,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
/**
* Constructor
- *
+ *
* @param name the name of the dialog
* @param iconName the name of the icon to be displayed
* @param tooltip the tool tip
@@ -195,7 +194,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
/** Override any minimum sizes of child elements so the user can resize freely */
setMinimumSize(new Dimension(0,0));
this.preferredHeight = preferredHeight;
- toggleAction = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut, iconName);
+ toggleAction = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut);
String helpId = "Dialog/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);
toggleAction.putValue("help", helpId.substring(0, helpId.length()-6));
@@ -229,35 +228,33 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
*/
public final class ToggleDialogAction extends JosmAction {
- private ToggleDialogAction(String name, String iconName, String tooltip, Shortcut shortcut, String prefname) {
+ private ToggleDialogAction(String name, String iconName, String tooltip, Shortcut shortcut) {
super(name, iconName, tooltip, shortcut, false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
toggleButtonHook();
- if(getValue("toolbarbutton") != null && getValue("toolbarbutton") instanceof JButton) {
+ if (getValue("toolbarbutton") instanceof JButton) {
((JButton) getValue("toolbarbutton")).setSelected(!isShowing);
}
if (isShowing) {
hideDialog();
- dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+ if (dialogsPanel != null) {
+ dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+ }
hideNotify();
} else {
showDialog();
if (isDocked && isCollapsed) {
expand();
}
- if (isDocked) {
+ if (isDocked && dialogsPanel != null) {
dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
}
showNotify();
}
}
-
- @Override
- public void destroy() {
- super.destroy();
- }
}
/**
@@ -307,6 +304,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
}
}
+ @Override
public void buttonShown() {
unfurlDialog();
}
@@ -384,29 +382,30 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
* @param visible true, if the components should be visible; false otherwise
*/
protected void setContentVisible(boolean visible) {
- Component comps[] = getComponents();
- for(int i=0; i<comps.length; i++) {
- if (comps[i] != titleBar && (!visible || comps[i] != buttonsPanel || buttonHiding != ButtonHiddingType.ALWAYS_HIDDEN)) {
- comps[i].setVisible(visible);
+ Component[] comps = getComponents();
+ for (Component comp : comps) {
+ if (comp != titleBar && (!visible || comp != buttonsPanel || buttonHiding != ButtonHiddingType.ALWAYS_HIDDEN)) {
+ comp.setVisible(visible);
}
}
}
+ @Override
public void destroy() {
closeDetachedDialog();
hideNotify();
Main.main.menu.windowMenu.remove(windowMenuItem);
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
- destroyComponents(this);
+ destroyComponents(this, false);
}
- private void destroyComponents(Component component) {
+ private void destroyComponents(Component component, boolean destroyItself) {
if (component instanceof Container) {
for (Component c: ((Container)component).getComponents()) {
- destroyComponents(c);
+ destroyComponents(c, true);
}
}
- if (component instanceof Destroyable) {
+ if (destroyItself && component instanceof Destroyable) {
((Destroyable) component).destroy();
}
}
@@ -455,9 +454,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
add(lblMinimized);
// scale down the dialog icon
- ImageIcon inIcon = ImageProvider.get("dialogs", iconName);
- ImageIcon smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
- lblTitle = new JLabel("",smallIcon, JLabel.TRAILING);
+ lblTitle = new JLabel("", new ImageProvider("dialogs", iconName).setWidth(16).get(), JLabel.TRAILING);
lblTitle.setIconTextGap(8);
JPanel conceal = new JPanel();
@@ -476,73 +473,13 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
lblTitle_weak.setMinimumSize(new Dimension(0,20));
add(lblTitle_weak, GBC.std().fill(GBC.HORIZONTAL));
- addMouseListener(
- new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- if (isCollapsed) {
- expand();
- dialogsPanel.reconstruct(Action.COLLAPSED_TO_DEFAULT, ToggleDialog.this);
- } else {
- collapse();
- dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
- }
- }
-
- private void maybeShowPopup(MouseEvent e) {
- if (e.isPopupTrigger()) {
- JPopupMenu menu = new JPopupMenu();
- JMenu buttonHidingMenu = new JMenu(tr("Side buttons"));
- JRadioButtonMenuItem alwaysShown = new JRadioButtonMenuItem(new AbstractAction(tr("Always shown")) {
- @Override
- public void actionPerformed(ActionEvent e) {
- setIsButtonHiding(ButtonHiddingType.ALWAYS_SHOWN);
- }
- });
- JRadioButtonMenuItem dynamic = new JRadioButtonMenuItem(new AbstractAction(tr("Dynamic")) {
- @Override
- public void actionPerformed(ActionEvent e) {
- setIsButtonHiding(ButtonHiddingType.DYNAMIC);
- }
- });
- JRadioButtonMenuItem alwaysHidden = new JRadioButtonMenuItem(new AbstractAction(tr("Always hidden")) {
- @Override
- public void actionPerformed(ActionEvent e) {
- setIsButtonHiding(ButtonHiddingType.ALWAYS_HIDDEN);
- }
- });
- alwaysShown.setSelected(buttonHiding == ButtonHiddingType.ALWAYS_SHOWN);
- dynamic.setSelected(buttonHiding == ButtonHiddingType.DYNAMIC);
- alwaysHidden.setSelected(buttonHiding == ButtonHiddingType.ALWAYS_HIDDEN);
- buttonHidingMenu.add(alwaysShown);
- buttonHidingMenu.add(dynamic);
- buttonHidingMenu.add(alwaysHidden);
- menu.add(buttonHidingMenu);
- for (javax.swing.Action action: buttonActions) {
- menu.add(action);
- }
- menu.show(TitleBar.this, e.getX(), e.getY());
- }
- }
-
- @Override
- public void mousePressed(MouseEvent e) {
- maybeShowPopup(e);
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- maybeShowPopup(e);
- }
- }
- );
-
if(Main.pref.getBoolean("dialog.dynamic.buttons", true)) {
buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHiddingType.ALWAYS_SHOWN ? "buttonhide" : "buttonshow"));
buttonsHide.setToolTipText(tr("Toggle dynamic buttons"));
buttonsHide.setBorder(BorderFactory.createEmptyBorder());
buttonsHide.addActionListener(
new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
setIsButtonHiding(buttonHiding == ButtonHiddingType.ALWAYS_SHOWN?ButtonHiddingType.DYNAMIC:ButtonHiddingType.ALWAYS_SHOWN);
}
@@ -550,16 +487,15 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
);
add(buttonsHide);
}
-
+
// show the pref button if applicable
if (preferenceClass != null) {
- inIcon = ImageProvider.get("preference");
- smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
- JButton pref = new JButton(smallIcon);
+ JButton pref = new JButton(new ImageProvider("preference").setWidth(16).get());
pref.setToolTipText(tr("Open preferences for this panel"));
pref.setBorder(BorderFactory.createEmptyBorder());
pref.addActionListener(
new ActionListener(){
+ @Override
@SuppressWarnings("unchecked")
public void actionPerformed(ActionEvent e) {
final PreferenceDialog p = new PreferenceDialog(Main.parent);
@@ -581,6 +517,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
sticky.setBorder(BorderFactory.createEmptyBorder());
sticky.addActionListener(
new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
detach();
dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
@@ -595,6 +532,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
close.setBorder(BorderFactory.createEmptyBorder());
close.addActionListener(
new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
hideDialog();
dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
@@ -615,6 +553,58 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
public String getTitle() {
return lblTitle.getText();
}
+
+ public class DialogPopupMenu extends JPopupMenu {
+ public final JMenu buttonHidingMenu = new JMenu(tr("Side buttons"));
+ public final JRadioButtonMenuItem alwaysShown = new JRadioButtonMenuItem(new AbstractAction(tr("Always shown")) {
+ @Override public void actionPerformed(ActionEvent e) {
+ setIsButtonHiding(ButtonHiddingType.ALWAYS_SHOWN);
+ }
+ });
+ public final JRadioButtonMenuItem dynamic = new JRadioButtonMenuItem(new AbstractAction(tr("Dynamic")) {
+ @Override public void actionPerformed(ActionEvent e) {
+ setIsButtonHiding(ButtonHiddingType.DYNAMIC);
+ }
+ });
+ public final JRadioButtonMenuItem alwaysHidden = new JRadioButtonMenuItem(new AbstractAction(tr("Always hidden")) {
+ @Override public void actionPerformed(ActionEvent e) {
+ setIsButtonHiding(ButtonHiddingType.ALWAYS_HIDDEN);
+ }
+ });
+ public DialogPopupMenu() {
+ alwaysShown.setSelected(buttonHiding == ButtonHiddingType.ALWAYS_SHOWN);
+ dynamic.setSelected(buttonHiding == ButtonHiddingType.DYNAMIC);
+ alwaysHidden.setSelected(buttonHiding == ButtonHiddingType.ALWAYS_HIDDEN);
+ buttonHidingMenu.add(alwaysShown);
+ buttonHidingMenu.add(dynamic);
+ buttonHidingMenu.add(alwaysHidden);
+ add(buttonHidingMenu);
+ for (javax.swing.Action action: buttonActions) {
+ add(action);
+ }
+ }
+ }
+
+ public void registerMouseListener() {
+ addMouseListener(new MouseEventHandler());
+ }
+
+ class MouseEventHandler extends PopupMenuLauncher {
+ public MouseEventHandler() {
+ super(new DialogPopupMenu());
+ }
+ @Override public void mouseClicked(MouseEvent e) {
+ if (SwingUtilities.isLeftMouseButton(e)) {
+ if (isCollapsed) {
+ expand();
+ dialogsPanel.reconstruct(Action.COLLAPSED_TO_DEFAULT, ToggleDialog.this);
+ } else {
+ collapse();
+ dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+ }
+ }
+ }
+ }
}
/**
@@ -749,6 +739,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
return preferredHeight;
}
+ @Override
public String helpTopic() {
String help = getClass().getName();
help = help.substring(help.lastIndexOf('.')+1, help.length()-6);
@@ -839,7 +830,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
buttons.addAll(Arrays.asList(nextButtons));
}
add(data, BorderLayout.CENTER);
- if (buttons.size() > 0 && buttons.get(0) != null && !buttons.get(0).isEmpty()) {
+ if (!buttons.isEmpty() && buttons.get(0) != null && !buttons.get(0).isEmpty()) {
buttonsPanel = new JPanel(new GridLayout(buttons.size(), 1));
for (Collection<SideButton> buttonRow : buttons) {
if (buttonRow == null) {
@@ -854,7 +845,7 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
if (action != null) {
buttonActions.add(action);
} else {
- System.err.println("Button " + button + " doesn't have action defined");
+ Main.warn("Button " + button + " doesn't have action defined");
new Exception().printStackTrace();
}
}
@@ -869,6 +860,10 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
} else if (buttonsHide != null) {
buttonsHide.setVisible(false);
}
+
+ // Register title bar mouse listener only after buttonActions has been initialized to have a complete popup menu
+ titleBar.registerMouseListener();
+
return data;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
index d008a18..92ba752 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -105,10 +105,12 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
* Called when the selection in the dataset changed.
* @param newSelection The new selection array.
*/
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
refresh(newSelection);
}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
if (newLayer instanceof OsmDataLayer) {
refresh(((OsmDataLayer) newLayer).data.getAllSelected());
@@ -117,10 +119,12 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
}
}
+ @Override
public void layerAdded(Layer newLayer) {
// do nothing
}
+ @Override
public void layerRemoved(Layer oldLayer) {
// do nothing
}
@@ -158,11 +162,12 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
}
public void select() {
- int indexes[] = userTable.getSelectedRows();
+ int[] indexes = userTable.getSelectedRows();
if (indexes == null || indexes.length == 0) return;
model.selectPrimitivesOwnedBy(userTable.getSelectedRows());
}
+ @Override
public void actionPerformed(ActionEvent e) {
select();
}
@@ -171,6 +176,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
setEnabled(userTable != null && userTable.getSelectedRowCount() > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -191,12 +197,12 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
@Override
public void actionPerformed(ActionEvent e) {
- int rows[] = userTable.getSelectedRows();
+ int[] rows = userTable.getSelectedRows();
if (rows == null || rows.length == 0) return;
List<User> users = model.getSelectedUsers(rows);
if (users.isEmpty()) return;
if (users.size() > 10) {
- System.out.println(tr("Warning: only launching info browsers for the first {0} of {1} selected users", 10, users.size()));
+ Main.warn(tr("Only launching info browsers for the first {0} of {1} selected users", 10, users.size()));
}
int num = Math.min(10, users.size());
Iterator<User> it = users.iterator();
@@ -233,6 +239,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
setEnabled(userTable != null && userTable.getSelectedRowCount() > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -261,6 +268,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
this.count=count;
this.percent = percent;
}
+ @Override
public int compareTo(UserInfo o) {
if (count < o.count) return 1;
if (count > o.count) return -1;
@@ -281,7 +289,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
*
*/
static class UserTableModel extends DefaultTableModel {
- private ArrayList<UserInfo> data;
+ private List<UserInfo> data;
public UserTableModel() {
setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%"});
@@ -355,7 +363,7 @@ public class UserListDialog extends ToggleDialog implements SelectionChangedList
Main.main.getCurrentDataSet().setSelected(byUser);
}
- public List<User> getSelectedUsers(int rows[]) {
+ public List<User> getSelectedUsers(int[] rows) {
LinkedList<User> ret = new LinkedList<User>();
if (rows == null || rows.length == 0) return ret;
for (int row: rows) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
index ea7454d..1f34dd2 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
@@ -4,9 +4,7 @@ package org.openstreetmap.josm.gui.dialogs;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -20,7 +18,6 @@ import java.util.Set;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
-import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
@@ -44,12 +41,14 @@ import org.openstreetmap.josm.data.validation.ValidatorVisitor;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.PopupMenuHandler;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
@@ -64,8 +63,6 @@ import org.xml.sax.SAXException;
* @author frsantos
*/
public class ValidatorDialog extends ToggleDialog implements SelectionChangedListener, LayerChangeListener {
- /** Serializable ID */
- private static final long serialVersionUID = 2952292777351992696L;
/** The display tree */
public ValidatorTreePanel tree;
@@ -77,8 +74,8 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
/** The select button */
private SideButton selectButton;
- private JPopupMenu popupMenu;
- private TestError popupMenuError = null;
+ private final JPopupMenu popupMenu = new JPopupMenu();
+ private final PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
/** Last selected element */
private DefaultMutableTreeNode lastSelectedNode = null;
@@ -93,20 +90,11 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation results")),
KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class);
- popupMenu = new JPopupMenu();
-
- JMenuItem zoomTo = new JMenuItem(tr("Zoom to problem"));
- zoomTo.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- zoomToProblem();
- }
- });
- popupMenu.add(zoomTo);
+ popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("problem"));
tree = new ValidatorTreePanel();
- tree.addMouseListener(new ClickWatch());
- tree.addTreeSelectionListener(new SelectionWatch());
+ tree.addMouseListener(new MouseEventHandler());
+ addTreeSelectionListener(new SelectionWatch());
InputMapUtils.unassignCtrlShiftUpDown(tree, JComponent.WHEN_FOCUSED);
List<SideButton> buttons = new LinkedList<SideButton>();
@@ -137,7 +125,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
}
@Override
public void actionPerformed(ActionEvent e) {
- fixErrors(e);
+ fixErrors();
}
});
fixButton.setEnabled(false);
@@ -152,7 +140,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
}
@Override
public void actionPerformed(ActionEvent e) {
- ignoreErrors(e);
+ ignoreErrors();
}
});
ignoreButton.setEnabled(false);
@@ -194,11 +182,9 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
/**
* Fix selected errors
- *
- * @param e
*/
@SuppressWarnings("unchecked")
- private void fixErrors(ActionEvent e) {
+ private void fixErrors() {
TreePath[] selectionPaths = tree.getSelectionPaths();
if (selectionPaths == null)
return;
@@ -235,11 +221,9 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
/**
* Set selected errors to ignore state
- *
- * @param e
*/
@SuppressWarnings("unchecked")
- private void ignoreErrors(ActionEvent e) {
+ private void ignoreErrors() {
int asked = JOptionPane.DEFAULT_OPTION;
boolean changed = false;
TreePath[] selectionPaths = tree.getSelectionPaths();
@@ -316,31 +300,6 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
}
}
- private void showPopupMenu(MouseEvent e) {
- if (!e.isPopupTrigger())
- return;
- popupMenuError = null;
- TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
- if (selPath == null)
- return;
- DefaultMutableTreeNode node = (DefaultMutableTreeNode) selPath.getPathComponent(selPath.getPathCount() - 1);
- if (!(node.getUserObject() instanceof TestError))
- return;
- popupMenuError = (TestError) node.getUserObject();
- popupMenu.show(e.getComponent(), e.getX(), e.getY());
- }
-
- private void zoomToProblem() {
- if (popupMenuError == null)
- return;
- ValidatorBoundingXYVisitor bbox = new ValidatorBoundingXYVisitor();
- bbox.visit(popupMenuError);
- if (bbox.getBounds() == null)
- return;
- bbox.enlargeBoundingBox(Main.pref.getDouble("validator.zoom-enlarge-bbox", 0.0002));
- Main.map.mapView.recalculateCenterScale(bbox);
- }
-
/**
* Sets the selection of the map to the current selected items.
*/
@@ -414,7 +373,6 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
hasFixes = hasFixes || error.isFixable();
if (addSelected) {
- // sel.addAll(error.getPrimitives()); // was selecting already deleted primitives! see #6640
sel.addAll(error.getSelectablePrimitives());
}
}
@@ -446,9 +404,57 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
}
/**
- * Watches for clicks.
+ * Add a tree selection listener to the validator tree.
+ * @param listener the TreeSelectionListener
+ * @since 5958
+ */
+ public void addTreeSelectionListener(TreeSelectionListener listener) {
+ tree.addTreeSelectionListener(listener);
+ }
+
+ /**
+ * Remove the given tree selection listener from the validator tree.
+ * @param listener the TreeSelectionListener
+ * @since 5958
+ */
+ public void removeTreeSelectionListener(TreeSelectionListener listener) {
+ tree.removeTreeSelectionListener(listener);
+ }
+
+ /**
+ * Replies the popup menu handler.
+ * @return The popup menu handler
+ * @since 5958
+ */
+ public PopupMenuHandler getPopupMenuHandler() {
+ return popupMenuHandler;
+ }
+
+ /**
+ * Replies the currently selected error, or {@code null}.
+ * @return The selected error, if any.
+ * @since 5958
+ */
+ public TestError getSelectedError() {
+ Object comp = tree.getLastSelectedPathComponent();
+ if (comp instanceof DefaultMutableTreeNode) {
+ Object object = ((DefaultMutableTreeNode)comp).getUserObject();
+ if (object instanceof TestError) {
+ return (TestError) object;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Watches for double clicks and launches the popup menu.
*/
- public class ClickWatch extends MouseAdapter {
+ class MouseEventHandler extends PopupMenuLauncher {
+
+ public MouseEventHandler() {
+ super(popupMenu);
+ }
+
@Override
public void mouseClicked(MouseEvent e) {
fixButton.setEnabled(false);
@@ -457,7 +463,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
}
selectButton.setEnabled(false);
- boolean isDblClick = e.getClickCount() > 1;
+ boolean isDblClick = isDoubleClick(e);
Collection<OsmPrimitive> sel = isDblClick ? new HashSet<OsmPrimitive>(40) : null;
@@ -466,20 +472,20 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
if (isDblClick) {
Main.main.getCurrentDataSet().setSelected(sel);
- if(Main.pref.getBoolean("validator.autozoom", false)) {
+ if (Main.pref.getBoolean("validator.autozoom", false)) {
AutoScaleAction.zoomTo(sel);
}
}
}
- @Override
- public void mousePressed(MouseEvent e) {
- showPopupMenu(e);
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- showPopupMenu(e);
+ @Override public void launch(MouseEvent e) {
+ TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
+ if (selPath == null)
+ return;
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode) selPath.getPathComponent(selPath.getPathCount() - 1);
+ if (!(node.getUserObject() instanceof TestError))
+ return;
+ super.launch(e);
}
}
@@ -498,7 +504,9 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
boolean hasFixes = setSelection(null, false);
fixButton.setEnabled(hasFixes);
- Main.map.repaint();
+ if (Main.map != null) {
+ Main.map.repaint();
+ }
}
}
@@ -506,7 +514,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
@Override
public void visit(OsmPrimitive p) {
if (p.isUsable()) {
- p.visit(this);
+ p.accept(this);
}
}
@@ -571,7 +579,7 @@ public class ValidatorDialog extends ToggleDialog implements SelectionChangedLis
protected void finish() {
// do nothing
}
-
+
protected void fixError(TestError error) throws InterruptedException, InvocationTargetException {
if (error.isFixable()) {
final Command fixCommand = error.getFix();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
index 81477fd..d0c9b98 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
@@ -9,7 +9,6 @@ import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -32,7 +31,6 @@ import javax.swing.JTable;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -208,7 +206,7 @@ public class ChangesetCacheManager extends JFrame {
* Builds the table with actions which can be applied to the currently visible changesets
* in the changeset table.
*
- * @return
+ * @return changset actions panel
*/
protected JPanel buildChangesetTableActionPanel() {
JPanel pnl = new JPanel(new BorderLayout());
@@ -248,8 +246,7 @@ public class ChangesetCacheManager extends JFrame {
new ChangesetCacheTableColumnModel(),
model.getSelectionModel()
);
- tblChangesets.addMouseListener(new ChangesetTablePopupMenuLauncher());
- tblChangesets.addMouseListener(new DblClickHandler());
+ tblChangesets.addMouseListener(new MouseEventHandler());
tblChangesets.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "showDetails");
tblChangesets.getActionMap().put("showDetails", new ShowDetailAction());
model.getSelectionModel().addListSelectionListener(new ChangesetDetailViewSynchronizer());
@@ -303,7 +300,7 @@ public class ChangesetCacheManager extends JFrame {
needsSplitPaneAdjustment = true;
model.init();
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
model.tearDown();
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
@@ -343,6 +340,7 @@ public class ChangesetCacheManager extends JFrame {
destroyInstance();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
cancelAndClose();
}
@@ -358,6 +356,7 @@ public class ChangesetCacheManager extends JFrame {
putValue(SHORT_DESCRIPTION, tr("Launch the dialog for querying changesets"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
ChangesetQueryDialog dialog = new ChangesetQueryDialog(ChangesetCacheManager.this);
dialog.initForUserInput();
@@ -388,6 +387,7 @@ public class ChangesetCacheManager extends JFrame {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
List<Changeset> selected = model.getSelectedChangesets();
ChangesetCache.getInstance().remove(selected);
@@ -397,6 +397,7 @@ public class ChangesetCacheManager extends JFrame {
setEnabled(model.hasSelectedChangesets());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
@@ -415,6 +416,7 @@ public class ChangesetCacheManager extends JFrame {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
List<Changeset> selected = model.getSelectedChangesets();
Main.worker.submit(new CloseChangesetTask(selected));
@@ -438,6 +440,7 @@ public class ChangesetCacheManager extends JFrame {
setEnabled(false);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -455,6 +458,7 @@ public class ChangesetCacheManager extends JFrame {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
List<Changeset> selected = model.getSelectedChangesets();
ChangesetHeaderDownloadTask task =ChangesetHeaderDownloadTask.buildTaskForChangesets(ChangesetCacheManager.this,selected);
@@ -465,6 +469,7 @@ public class ChangesetCacheManager extends JFrame {
setEnabled(model.hasSelectedChangesets());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -482,6 +487,7 @@ public class ChangesetCacheManager extends JFrame {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetCacheManager.this,model.getSelectedChangesetIds());
ChangesetCacheManager.getInstance().runDownloadTask(task);
@@ -491,6 +497,7 @@ public class ChangesetCacheManager extends JFrame {
setEnabled(model.hasSelectedChangesets());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -504,6 +511,7 @@ public class ChangesetCacheManager extends JFrame {
model.setChangesetInDetailView(selected.get(0));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
showDetails();
}
@@ -529,6 +537,7 @@ public class ChangesetCacheManager extends JFrame {
);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
if (im.isAnonymous()) {
@@ -546,26 +555,17 @@ public class ChangesetCacheManager extends JFrame {
}
}
- class DblClickHandler extends MouseAdapter {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (! SwingUtilities.isLeftMouseButton(evt) || evt.getClickCount()<2)
- return;
- new ShowDetailAction().showDetails();
+ class MouseEventHandler extends PopupMenuLauncher {
+
+ public MouseEventHandler() {
+ super(new ChangesetTablePopupMenu());
}
- }
- class ChangesetTablePopupMenuLauncher extends PopupMenuLauncher {
- ChangesetTablePopupMenu menu = new ChangesetTablePopupMenu();
@Override
- public void launch(MouseEvent evt) {
- if (! model.hasSelectedChangesets()) {
- int row = tblChangesets.rowAtPoint(evt.getPoint());
- if (row >= 0) {
- model.setSelectedByIdx(row);
- }
+ public void mouseClicked(MouseEvent evt) {
+ if (isDoubleClick(evt)) {
+ new ShowDetailAction().showDetails();
}
- menu.show(tblChangesets, evt.getPoint().x, evt.getPoint().y);
}
}
@@ -579,6 +579,7 @@ public class ChangesetCacheManager extends JFrame {
}
class ChangesetDetailViewSynchronizer implements ListSelectionListener {
+ @Override
public void valueChanged(ListSelectionEvent e) {
List<Changeset> selected = model.getSelectedChangesets();
if (selected.size() == 1) {
@@ -593,7 +594,8 @@ public class ChangesetCacheManager extends JFrame {
* Selects the changesets in <code>changests</code>, provided the
* respective changesets are already present in the local changeset cache.
*
- * @param ids the collection of changesets. If null, the selection is cleared.
+ * @param changesets the collection of changesets. If {@code null}, the
+ * selection is cleared.
*/
public void setSelectedChangesets(Collection<Changeset> changesets) {
model.setSelectedChangesets(changesets);
@@ -627,7 +629,7 @@ public class ChangesetCacheManager extends JFrame {
public void runDownloadTask(final ChangesetDownloadTask task) {
Main.worker.submit(task);
Runnable r = new Runnable() {
- public void run() {
+ @Override public void run() {
if (task.isCanceled() || task.isFailed()) return;
setSelectedChangesets(task.getDownloadedChangesets());
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
index 3e55bde..2f3be81 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.ChangesetCache;
import org.openstreetmap.josm.data.osm.ChangesetCacheEvent;
import org.openstreetmap.josm.data.osm.ChangesetCacheListener;
+import org.openstreetmap.josm.gui.util.GuiHelper;
/**
* This is the model for the changeset cache manager dialog.
@@ -28,7 +29,7 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements Ch
/** the name of the property for the currently selected changeset in the detail view */
public final static String CHANGESET_IN_DETAIL_VIEW_PROP = ChangesetCacheManagerModel.class.getName() + ".changesetInDetailView";
- private final ArrayList<Changeset> data = new ArrayList<Changeset>();
+ private final List<Changeset> data = new ArrayList<Changeset>();
private DefaultListSelectionModel selectionModel;
private Changeset changesetInDetailView;
private final PropertyChangeSupport support = new PropertyChangeSupport(this);
@@ -74,7 +75,7 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements Ch
* @return the list of selected changesets
*/
public List<Changeset> getSelectedChangesets() {
- ArrayList<Changeset> ret = new ArrayList<Changeset>();
+ List<Changeset> ret = new ArrayList<Changeset>();
for (int i =0; i< data.size();i++) {
Changeset cs = data.get(i);
if (selectionModel.isSelectedIndex(i)) {
@@ -103,35 +104,36 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements Ch
* @param selected the collection of changesets to select. Ignored if empty.
*/
public void setSelectedChangesets(Collection<Changeset> selected) {
- selectionModel.clearSelection();
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ selectionModel.clearSelection();
+ }
+ });
if (selected == null || selected.isEmpty())
return;
for (Changeset cs: selected) {
- int idx = data.indexOf(cs);
+ final int idx = data.indexOf(cs);
if (idx >= 0) {
- selectionModel.addSelectionInterval(idx,idx);
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ selectionModel.addSelectionInterval(idx,idx);
+ }
+ });
}
}
}
- /**
- * Selects the changeset displayed at row <code>row</code>
- *
- * @param row the row. Ignored if < 0 or >= {@link #getRowCount()}
- */
- public void setSelectedByIdx(int row) {
- if (row < 0 || row >= getRowCount()) return;
- selectionModel.setSelectionInterval(row, row);
- }
-
+ @Override
public int getColumnCount() {
return 5;
}
+ @Override
public int getRowCount() {
return data.size();
}
+ @Override
public Object getValueAt(int row, int column) {
return data.get(row);
}
@@ -160,7 +162,7 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements Ch
Collections.sort(
this.data,
new Comparator<Changeset>() {
- public int compare(Changeset o1, Changeset o2) {
+ @Override public int compare(Changeset o1, Changeset o2) {
if (o1.getId() < o2.getId()) return 1;
if (o1.getId() == o2.getId()) return 0;
return -1;
@@ -172,6 +174,7 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements Ch
/* ------------------------------------------------------------------------------ */
/* interface ChangesetCacheListener */
/* ------------------------------------------------------------------------------ */
+ @Override
public void changesetCacheUpdated(ChangesetCacheEvent event) {
List<Changeset> selected = getSelectedChangesets();
for (Changeset cs: event.getAddedChangesets()) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
index e6c6316..d4d9156 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java
@@ -17,8 +17,15 @@ import javax.swing.table.TableCellRenderer;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.User;
+/**
+ * The cell renderer for the changeset table
+ * @since 2689
+ */
public class ChangesetCacheTableCellRenderer extends JLabel implements TableCellRenderer{
+ /**
+ * Constructs a new {@code ChangesetCacheTableCellRenderer}.
+ */
public ChangesetCacheTableCellRenderer() {
setOpaque(true);
}
@@ -47,7 +54,7 @@ public class ChangesetCacheTableCellRenderer extends JLabel implements TableCell
protected void renderUploadComment(Changeset cs) {
String comment = cs.get("comment");
- if (comment == null || comment.trim().equals("")) {
+ if (comment == null || comment.trim().isEmpty()) {
setText(trc("changeset.upload-comment", "empty"));
setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
} else {
@@ -68,7 +75,7 @@ public class ChangesetCacheTableCellRenderer extends JLabel implements TableCell
protected void renderUser(Changeset cs) {
User user = cs.getUser();
- if (user == null || user.getName().trim().equals("")) {
+ if (user == null || user.getName().trim().isEmpty()) {
setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
setText(tr("anonymous"));
} else {
@@ -87,6 +94,7 @@ public class ChangesetCacheTableCellRenderer extends JLabel implements TableCell
setToolTipText("");
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
if (value == null)
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
index 7ea0874..f4ab21a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
@@ -8,64 +8,48 @@ import javax.swing.table.TableColumn;
/**
* The column model for the changeset table
- *
+ * @since 2689
*/
public class ChangesetCacheTableColumnModel extends DefaultTableColumnModel {
- protected void createColumns() {
- TableColumn col = null;
- ChangesetCacheTableCellRenderer renderer = new ChangesetCacheTableCellRenderer();
-
- // column 0 - Id
- col = new TableColumn(0);
- col.setHeaderValue(tr("ID"));
+ private final ChangesetCacheTableCellRenderer renderer = new ChangesetCacheTableCellRenderer();
+
+ protected void createColumn(int modelIndex, String headerValue, int preferredWidth, int width) {
+ TableColumn col = new TableColumn(modelIndex);
+ col.setHeaderValue(headerValue);
col.setResizable(true);
- col.setWidth(20);
- col.setPreferredWidth(20);
+ if (width > -1) {
+ col.setWidth(width);
+ }
+ col.setPreferredWidth(preferredWidth);
col.setCellRenderer(renderer);
addColumn(col);
+ }
+
+ protected void createColumns() {
+
+ // column 0 - Id
+ createColumn(0, tr("ID"), 20, 20);
// column 1 - Upload comment
- col = new TableColumn(1);
- col.setHeaderValue(tr("Comment"));
- col.setResizable(true);
- col.setPreferredWidth(200);
- col.setCellRenderer(renderer);
- addColumn(col);
+ createColumn(1, tr("Comment"), 200, -1);
// column 2 - Open
- col = new TableColumn(2);
- col.setHeaderValue(tr("Open"));
- col.setResizable(true);
- col.setPreferredWidth(50);
- col.setCellRenderer(renderer);
- addColumn(col);
+ createColumn(2, tr("Open"), 50, -1);
// column 3 - User
- col = new TableColumn(3);
- col.setHeaderValue(tr("User"));
- col.setResizable(true);
- col.setPreferredWidth(50);
- col.setCellRenderer(renderer);
- addColumn(col);
+ createColumn(3, tr("User"), 50, -1);
// column 4 - Created at
- col = new TableColumn(4);
- col.setHeaderValue(tr("Created at"));
- col.setResizable(true);
- col.setPreferredWidth(100);
- col.setCellRenderer(renderer);
- addColumn(col);
+ createColumn(4, tr("Created at"), 100, -1);
// column 5 - Closed at
- col = new TableColumn(4);
- col.setHeaderValue(tr("Closed at"));
- col.setResizable(true);
- col.setPreferredWidth(100);
- col.setCellRenderer(renderer);
- addColumn(col);
+ createColumn(5, tr("Closed at"), 100, -1);
}
+ /**
+ * Creates a new {@code ChangesetCacheTableColumnModel}.
+ */
public ChangesetCacheTableColumnModel() {
createColumns();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
index 9f0c7eb..ba90302 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
@@ -86,10 +86,10 @@ public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements
/**
* Creates a download task for a single changeset
*
- * @param parent the parent component for the {@link PleaseWaitDialog}. Must not be null.
- * @param changesetId the changeset id. >0 required.
- * @throws IllegalArgumentException thrown if changesetId <= 0
- * @throws IllegalArgumentException thrown if parent is null
+ * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}.
+ * @param changesetId the changeset id. {@code >0} required.
+ * @throws IllegalArgumentException thrown if {@code changesetId <= 0}
+ * @throws IllegalArgumentException thrown if parent is {@code null}
*/
public ChangesetContentDownloadTask(Component parent, int changesetId) throws IllegalArgumentException{
super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */);
@@ -102,9 +102,9 @@ public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements
* Creates a download task for a collection of changesets. null values and id <=0 in
* the collection are sillently discarded.
*
- * @param parent the parent component for the {@link PleaseWaitDialog}. Must not be null.
- * @param changesetIds the changeset ids. Empty collection assumed, if null.
- * @throws IllegalArgumentException thrown if parent is null
+ * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}.
+ * @param changesetIds the changeset ids. Empty collection assumed, if {@code null}.
+ * @throws IllegalArgumentException thrown if parent is {@code null}
*/
public ChangesetContentDownloadTask(Component parent, Collection<Integer> changesetIds) throws IllegalArgumentException {
super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */);
@@ -203,14 +203,17 @@ public class ChangesetContentDownloadTask extends PleaseWaitRunnable implements
/* ------------------------------------------------------------------------------- */
/* interface ChangesetDownloadTask */
/* ------------------------------------------------------------------------------- */
+ @Override
public Set<Changeset> getDownloadedChangesets() {
return downloadedChangesets;
}
+ @Override
public boolean isCanceled() {
return canceled;
}
+ @Override
public boolean isFailed() {
return lastException != null;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
index e859b59..16f133a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
@@ -9,8 +9,6 @@ import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
@@ -30,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JTable;
import javax.swing.JToolBar;
-import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -42,13 +39,15 @@ import org.openstreetmap.josm.data.osm.history.History;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
import org.openstreetmap.josm.gui.history.HistoryLoadTask;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.BugReportExceptionHandler;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -63,7 +62,6 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
private ChangesetContentTableModel model;
private Changeset currentChangeset;
- private JTable tblContent;
private DonwloadChangesetContentAction actDownloadContentAction;
private ShowHistoryAction actShowHistory;
@@ -103,12 +101,12 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
protected JPanel buildContentPanel() {
JPanel pnl = new JPanel(new BorderLayout());
- tblContent = new JTable(
+ JTable tblContent = new JTable(
model,
new ChangesetContentTableColumnModel(),
model.getSelectionModel()
);
- tblContent.addMouseListener(new ChangesetContentTablePopupMenuLauncher());
+ tblContent.addMouseListener(new PopupMenuLauncher(new ChangesetContentTablePopupMenu()));
pnl.add(new JScrollPane(tblContent), BorderLayout.CENTER);
return pnl;
}
@@ -138,10 +136,17 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
+ /**
+ * Constructs a new {@code ChangesetContentPanel}.
+ */
public ChangesetContentPanel() {
build();
}
+ /**
+ * Replies the changeset content model
+ * @return The model
+ */
public ChangesetContentTableModel getModel() {
return model;
}
@@ -160,6 +165,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
/* ---------------------------------------------------------------------------- */
/* interface PropertyChangeListener */
/* ---------------------------------------------------------------------------- */
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if(!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP))
return;
@@ -178,6 +184,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
if (currentChangeset == null) return;
ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetContentPanel.this,currentChangeset.getId());
@@ -203,36 +210,6 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
}
- class ChangesetContentTablePopupMenuLauncher extends MouseAdapter {
- ChangesetContentTablePopupMenu menu = new ChangesetContentTablePopupMenu();
-
- protected void launch(MouseEvent evt) {
- if (! evt.isPopupTrigger()) return;
- if (! model.hasSelectedPrimitives()) {
- int row = tblContent.rowAtPoint(evt.getPoint());
- if (row >= 0) {
- model.setSelectedByIdx(row);
- }
- }
- menu.show(tblContent, evt.getPoint().x, evt.getPoint().y);
- }
-
- @Override
- public void mouseClicked(MouseEvent evt) {
- launch(evt);
- }
-
- @Override
- public void mousePressed(MouseEvent evt) {
- launch(evt);
- }
-
- @Override
- public void mouseReleased(MouseEvent evt) {
- launch(evt);
- }
- }
-
class ChangesetContentTablePopupMenu extends JPopupMenu {
public ChangesetContentTablePopupMenu() {
add(actDownloadContentAction);
@@ -252,7 +229,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
protected List<HistoryOsmPrimitive> filterPrimitivesWithUnloadedHistory(Collection<HistoryOsmPrimitive> primitives) {
- ArrayList<HistoryOsmPrimitive> ret = new ArrayList<HistoryOsmPrimitive>(primitives.size());
+ List<HistoryOsmPrimitive> ret = new ArrayList<HistoryOsmPrimitive>(primitives.size());
for (HistoryOsmPrimitive p: primitives) {
if (HistoryDataSet.getInstance().getHistory(p.getPrimitiveId()) == null) {
ret.add(p);
@@ -273,17 +250,23 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
Runnable r = new Runnable() {
+ @Override
public void run() {
try {
for (HistoryOsmPrimitive p : primitives) {
- History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
+ final History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
if (h == null) {
continue;
}
- HistoryBrowserDialogManager.getInstance().show(h);
+ GuiHelper.runInEDT(new Runnable() {
+ @Override public void run() {
+ HistoryBrowserDialogManager.getInstance().show(h);
+ }
+ });
}
} catch (final Exception e) {
- SwingUtilities.invokeLater(new Runnable() {
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
BugReportExceptionHandler.handleException(e);
}
@@ -299,12 +282,14 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
setEnabled(model.hasSelectedPrimitives());
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
Set<HistoryOsmPrimitive> selected = model.getSelectedPrimitives();
if (selected.isEmpty()) return;
showHistory(selected);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -335,10 +320,11 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
if (!isEnabled())
return;
- if (Main.main == null || Main.main.getEditLayer() == null) return;
+ if (Main.main == null || !Main.main.hasEditLayer()) return;
OsmDataLayer layer = Main.main.getEditLayer();
Set<HistoryOsmPrimitive> selected = model.getSelectedPrimitives();
Set<OsmPrimitive> target = new HashSet<OsmPrimitive>();
@@ -356,17 +342,19 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
public void updateEnabledState() {
- if (Main.main == null || Main.main.getEditLayer() == null){
+ if (Main.main == null || !Main.main.hasEditLayer()) {
setEnabled(false);
return;
}
setEnabled(model.hasSelectedPrimitives());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
updateEnabledState();
}
@@ -397,10 +385,11 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
if (!isEnabled())
return;
- if (Main.main == null || Main.main.getEditLayer() == null) return;
+ if (Main.main == null || !Main.main.hasEditLayer()) return;
OsmDataLayer layer = Main.main.getEditLayer();
Set<HistoryOsmPrimitive> selected = model.getSelectedPrimitives();
Set<OsmPrimitive> target = new HashSet<OsmPrimitive>();
@@ -419,17 +408,19 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
}
public void updateEnabledState() {
- if (Main.main == null || Main.main.getEditLayer() == null){
+ if (Main.main == null || !Main.main.hasEditLayer()) {
setEnabled(false);
return;
}
setEnabled(model.hasSelectedPrimitives());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
updateEnabledState();
}
@@ -466,6 +457,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangesetcontent"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
if (current == null) return;
ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(HeaderPanel.this, current.getId());
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
index 5064fc1..32f025b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
@@ -15,7 +15,7 @@ import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
/**
* The table cell renderer used in the changeset content table, except for the "name"
- * column in which we use a {@link OsmPrimitivRenderer}.
+ * column in which we use a {@link org.openstreetmap.josm.gui.OsmPrimitivRenderer}.
*
*/
public class ChangesetContentTableCellRenderer extends JLabel implements TableCellRenderer{
@@ -54,6 +54,7 @@ public class ChangesetContentTableCellRenderer extends JLabel implements TableCe
setToolTipText("");
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
if (value == null)
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
index 7ede248..988667c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
@@ -6,6 +6,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import javax.swing.DefaultListSelectionModel;
@@ -22,7 +23,7 @@ import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
*/
public class ChangesetContentTableModel extends AbstractTableModel {
- private final ArrayList<ChangesetContentEntry> data = new ArrayList<ChangesetContentEntry>();
+ private final List<ChangesetContentEntry> data = new ArrayList<ChangesetContentEntry>();
private DefaultListSelectionModel selectionModel;
public ChangesetContentTableModel(DefaultListSelectionModel selectionModel) {
@@ -83,6 +84,7 @@ public class ChangesetContentTableModel extends AbstractTableModel {
Collections.sort(
data,
new Comparator<ChangesetDataSetEntry>() {
+ @Override
public int compare(ChangesetDataSetEntry c1, ChangesetDataSetEntry c2) {
if (c1.getModificationType().equals(c2.getModificationType())) {
long id1 = c1.getPrimitive().getId();
@@ -114,14 +116,17 @@ public class ChangesetContentTableModel extends AbstractTableModel {
/* -------------------------------------------------------------- */
/* interface TableModel */
/* -------------------------------------------------------------- */
+ @Override
public int getColumnCount() {
return 3;
}
+ @Override
public int getRowCount() {
return data.size();
}
+ @Override
public Object getValueAt(int row, int col) {
switch(col) {
case 0: return data.get(row).getModificationType();
@@ -147,9 +152,11 @@ public class ChangesetContentTableModel extends AbstractTableModel {
this(entry.getModificationType(), entry.getPrimitive());
}
+ @Override
public ChangesetModificationType getModificationType() {
return modificationType;
}
+ @Override
public HistoryOsmPrimitive getPrimitive() {
return primitive;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
index ee8b8e3..76ea05b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
@@ -25,8 +25,6 @@ import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
import javax.swing.JToolBar;
import org.openstreetmap.josm.Main;
@@ -39,8 +37,11 @@ import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.ImageProvider;
+
/**
* This panel displays the properties of the currently selected changeset in the
* {@link ChangesetCacheManager}.
@@ -48,12 +49,12 @@ import org.openstreetmap.josm.tools.ImageProvider;
*/
public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener{
- private JTextField tfID;
- private JTextArea taComment;
- private JTextField tfOpen;
- private JTextField tfUser;
- private JTextField tfCreatedOn;
- private JTextField tfClosedOn;
+ private JosmTextField tfID;
+ private JosmTextArea taComment;
+ private JosmTextField tfOpen;
+ private JosmTextField tfUser;
+ private JosmTextField tfCreatedOn;
+ private JosmTextField tfClosedOn;
private DonwloadChangesetContentAction actDownloadChangesetContent;
private UpdateChangesetAction actUpdateChangesets;
private RemoveFromCacheAction actRemoveFromCache;
@@ -117,7 +118,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
gc.fill = GridBagConstraints.HORIZONTAL;
gc.weightx = 0.0;
gc.gridx = 1;
- pnl.add(tfID = new JTextField(10), gc);
+ pnl.add(tfID = new JosmTextField(10), gc);
tfID.setEditable(false);
//-- comment
@@ -131,7 +132,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
gc.weightx = 1.0;
gc.weighty = 1.0;
gc.gridx = 1;
- pnl.add(taComment= new JTextArea(5,40), gc);
+ pnl.add(taComment= new JosmTextArea(5,40), gc);
taComment.setEditable(false);
//-- Open/Closed
@@ -144,7 +145,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
gc.fill = GridBagConstraints.HORIZONTAL;
gc.gridx = 1;
- pnl.add(tfOpen= new JTextField(10), gc);
+ pnl.add(tfOpen= new JosmTextField(10), gc);
tfOpen.setEditable(false);
//-- Created by:
@@ -157,7 +158,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
gc.fill = GridBagConstraints.HORIZONTAL;
gc.weightx = 1.0;
gc.gridx = 1;
- pnl.add(tfUser= new JTextField(""), gc);
+ pnl.add(tfUser= new JosmTextField(""), gc);
tfUser.setEditable(false);
//-- Created On:
@@ -169,7 +170,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
gc.fill = GridBagConstraints.HORIZONTAL;
gc.gridx = 1;
- pnl.add(tfCreatedOn= new JTextField(20), gc);
+ pnl.add(tfCreatedOn= new JosmTextField(20), gc);
tfCreatedOn.setEditable(false);
//-- Closed On:
@@ -181,7 +182,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
gc.fill = GridBagConstraints.HORIZONTAL;
gc.gridx = 1;
- pnl.add(tfClosedOn= new JTextField(20), gc);
+ pnl.add(tfClosedOn= new JosmTextField(20), gc);
tfClosedOn.setEditable(false);
return pnl;
@@ -229,6 +230,9 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
tfClosedOn.setText(cs.getClosedAt() == null ? "" : sdf.format(cs.getClosedAt()));
}
+ /**
+ * Constructs a new {@code ChangesetDetailPanel}.
+ */
public ChangesetDetailPanel() {
build();
}
@@ -250,6 +254,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
/* ---------------------------------------------------------------------------- */
/* interface PropertyChangeListener */
/* ---------------------------------------------------------------------------- */
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (! evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP))
return;
@@ -267,6 +272,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
putValue(SHORT_DESCRIPTION, tr("Remove the changeset in the detail view panel from the local cache"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
if (current == null)
return;
@@ -289,6 +295,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
putValue(SHORT_DESCRIPTION, tr("Download the changeset content from the OSM server"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
if (current == null) return;
ChangesetContentDownloadTask task = new ChangesetContentDownloadTask(ChangesetDetailPanel.this,current.getId());
@@ -325,6 +332,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
putValue(SHORT_DESCRIPTION, tr("Update the changeset from the OSM server"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
if (current == null) return;
Main.worker.submit(
@@ -373,10 +381,11 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
if (!isEnabled())
return;
- if (Main.main == null || Main.main.getEditLayer() == null) return;
+ if (Main.main == null || !Main.main.hasEditLayer()) return;
OsmDataLayer layer = Main.main.getEditLayer();
Set<OsmPrimitive> target = new HashSet<OsmPrimitive>();
for (OsmPrimitive p: layer.data.allPrimitives()) {
@@ -392,13 +401,14 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
}
public void updateEnabledState() {
- if (Main.main == null || Main.main.getEditLayer() == null){
+ if (Main.main == null || !Main.main.hasEditLayer()) {
setEnabled(false);
return;
}
setEnabled(current != null);
}
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
updateEnabledState();
}
@@ -432,10 +442,11 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
if (!isEnabled())
return;
- if (Main.main == null || Main.main.getEditLayer() == null) return;
+ if (Main.main == null || !Main.main.hasEditLayer()) return;
OsmDataLayer layer = Main.main.getEditLayer();
Set<OsmPrimitive> target = new HashSet<OsmPrimitive>();
for (OsmPrimitive p: layer.data.allPrimitives()) {
@@ -452,13 +463,14 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
}
public void updateEnabledState() {
- if (Main.main == null || Main.main.getEditLayer() == null){
+ if (Main.main == null || !Main.main.hasEditLayer()) {
setEnabled(false);
return;
}
setEnabled(current != null);
}
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
index 90a5e4e..dfde992 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
@@ -52,7 +52,7 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
*
* Ignores null values and changesets with {@link Changeset#isNew()} == true.
*
- * @param parent the parent component relative to which the {@link PleaseWaitDialog} is displayed.
+ * @param parent the parent component relative to which the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} is displayed.
* Must not be null.
* @param changesets the collection of changesets. Assumes an empty collection if null.
* @return the download task
@@ -100,7 +100,7 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
}
/**
- * Creates the download task for a collection of changeset ids. Uses a {@link PleaseWaitDialog}
+ * Creates the download task for a collection of changeset ids. Uses a {@link org.openstreetmap.josm.gui.PleaseWaitDialog}
* whose parent is {@link Main#parent}.
*
* Null ids or or ids <= 0 in the id collection are ignored.
@@ -114,12 +114,12 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
}
/**
- * Creates the download task for a collection of changeset ids. Uses a {@link PleaseWaitDialog}
+ * Creates the download task for a collection of changeset ids. Uses a {@link org.openstreetmap.josm.gui.PleaseWaitDialog}
* whose parent is the parent window of <code>dialogParent</code>.
*
* Null ids or or ids <= 0 in the id collection are ignored.
*
- * @param dialogParent the parent reference component for the {@link PleaseWaitDialog}. Must not be null.
+ * @param dialogParent the parent reference component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be null.
* @param ids the collection of ids. Empty collection assumed if null.
* @throws IllegalArgumentException thrown if dialogParent is null
*/
@@ -146,6 +146,7 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
ExceptionDialogUtil.explainException(lastException);
}
Runnable r = new Runnable() {
+ @Override
public void run() {
ChangesetCache.getInstance().update(downloadedChangesets);
}
@@ -157,7 +158,7 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
try {
SwingUtilities.invokeAndWait(r);
} catch(InterruptedException e) {
- e.printStackTrace();
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
} catch(InvocationTargetException e) {
Throwable t = e.getTargetException();
if (t instanceof RuntimeException) {
@@ -191,14 +192,17 @@ public class ChangesetHeaderDownloadTask extends PleaseWaitRunnable implements C
/* ------------------------------------------------------------------------------- */
/* interface ChangesetDownloadTask */
/* ------------------------------------------------------------------------------- */
+ @Override
public Set<Changeset> getDownloadedChangesets() {
return downloadedChangesets;
}
+ @Override
public boolean isCanceled() {
return canceled;
}
+ @Override
public boolean isFailed() {
return lastException != null;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java
index 5608bf0..701d206 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java
@@ -18,6 +18,7 @@ public class ChangesetInSelectionListModel extends ChangesetListModel implements
/* ---------------------------------------------------------------------------- */
/* Interface SelectionChangeListener */
/* ---------------------------------------------------------------------------- */
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
initFromPrimitives(newSelection);
}
@@ -25,6 +26,7 @@ public class ChangesetInSelectionListModel extends ChangesetListModel implements
/* ---------------------------------------------------------------------------- */
/* Interface LayerChangeListener */
/* ---------------------------------------------------------------------------- */
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
if (newLayer == null) {
setChangesets(null);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java
index 80541d8..955e5bf 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java
@@ -46,6 +46,7 @@ public class ChangesetListCellRenderer extends JLabel implements ListCellRendere
setText(sb.toString());
}
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
boolean cellHasFocus) {
Changeset cs = (Changeset)value;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
index e05c220..1c4c115 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
@@ -143,6 +143,7 @@ public class ChangesetListModel extends DefaultListModel implements ChangesetCa
Collections.sort(
data,
new Comparator<Changeset>() {
+ @Override
public int compare(Changeset cs1, Changeset cs2) {
if (cs1.getId() > cs2.getId()) return -1;
if (cs1.getId() == cs2.getId()) return 0;
@@ -182,6 +183,7 @@ public class ChangesetListModel extends DefaultListModel implements ChangesetCa
/* ---------------------------------------------------------------------------- */
/* Interface ChangesetCacheListener */
/* ---------------------------------------------------------------------------- */
+ @Override
public void changesetCacheUpdated(ChangesetCacheEvent event) {
Set<Changeset> sel = getSelectedChangesets();
for(Changeset cs: event.getAddedChangesets()) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
index e79a24a..23b4e0b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java
@@ -19,18 +19,20 @@ import org.openstreetmap.josm.gui.tagging.TagTable;
*/
public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener{
- private TagTable tblTags;
private TagEditorModel model;
protected void build() {
setLayout(new BorderLayout());
setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
model = new TagEditorModel();
- tblTags = new TagTable(model);
+ TagTable tblTags = new TagTable(model);
tblTags.setEnabled(false);
add(new JScrollPane(tblTags), BorderLayout.CENTER);
}
+ /**
+ * Constructs a new {@code ChangesetTagsPanel}.
+ */
public ChangesetTagsPanel() {
build();
}
@@ -46,6 +48,7 @@ public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener
/* ---------------------------------------------------------------------------- */
/* interface PropertyChangeListener */
/* ---------------------------------------------------------------------------- */
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (!evt.getPropertyName().equals(ChangesetCacheManagerModel.CHANGESET_IN_DETAIL_VIEW_PROP))
return;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java
index 82d8d4a..b5ec5f3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java
@@ -28,27 +28,36 @@ public class ChangesetsInActiveDataLayerListModel extends ChangesetListModel imp
/* ------------------------------------------------------------------------------ */
/* interface DataSetListener */
/* ------------------------------------------------------------------------------ */
+ @Override
public void dataChanged(DataChangedEvent event) {
initFromDataSet(event.getDataset());
}
+ @Override
public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored */}
+ @Override
public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored */}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignored */}
+ @Override
public void nodeMoved(NodeMovedEvent event) {/* ignored */}
+ @Override
public void relationMembersChanged(RelationMembersChangedEvent event) {/* ignored */}
+ @Override
public void tagsChanged(TagsChangedEvent event) {/* ignored */}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {/* ignored */}
/* ------------------------------------------------------------------------------ */
/* interface EditLayerListener */
/* ------------------------------------------------------------------------------ */
+ @Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
// just init the model content. Don't register as DataSetListener. The mode
// is already registered to receive DataChangedEvents from the current
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
index b511150..e56b784 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
@@ -12,13 +12,12 @@ import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
-import javax.swing.text.JTextComponent;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+import org.openstreetmap.josm.gui.widgets.ChangesetIdTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -29,9 +28,8 @@ import org.openstreetmap.josm.tools.ImageProvider;
*/
public class SingleChangesetDownloadPanel extends JPanel {
- private JTextField tfChangesetId;
+ private ChangesetIdTextField tfChangesetId;
private DownloadAction actDownload;
- private ChangesetIdValidator valChangesetId;
protected void build() {
setLayout(new FlowLayout(FlowLayout.LEFT,0,0));
@@ -43,9 +41,8 @@ public class SingleChangesetDownloadPanel extends JPanel {
);
add(new JLabel(tr("Changeset ID: ")));
- add(tfChangesetId = new JTextField(10));
+ add(tfChangesetId = new ChangesetIdTextField());
tfChangesetId.setToolTipText(tr("Enter a changeset id"));
- valChangesetId =ChangesetIdValidator.decorate(tfChangesetId);
SelectAllOnFocusGainedDecorator.decorate(tfChangesetId);
actDownload = new DownloadAction();
@@ -53,8 +50,15 @@ public class SingleChangesetDownloadPanel extends JPanel {
tfChangesetId.addActionListener(actDownload);
tfChangesetId.getDocument().addDocumentListener(actDownload);
add(btn);
+
+ if (Main.pref.getBoolean("downloadchangeset.autopaste", true)) {
+ tfChangesetId.tryToPasteFromClipboard();
+ }
}
+ /**
+ * Constructs a new {@link SingleChangesetDownloadPanel}
+ */
public SingleChangesetDownloadPanel() {
build();
}
@@ -66,7 +70,7 @@ public class SingleChangesetDownloadPanel extends JPanel {
* @return the changeset id entered in this panel
*/
public int getChangesetId() {
- return valChangesetId.getChangesetId();
+ return tfChangesetId.getChangesetId();
}
/**
@@ -80,6 +84,7 @@ public class SingleChangesetDownloadPanel extends JPanel {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
if (!isEnabled())
return;
@@ -93,67 +98,22 @@ public class SingleChangesetDownloadPanel extends JPanel {
}
protected void updateEnabledState() {
- String v = tfChangesetId.getText();
- if (v == null || v.trim().length() == 0) {
- setEnabled(false);
- return;
- }
- setEnabled(valChangesetId.isValid());
+ setEnabled(tfChangesetId.readIds());
}
+ @Override
public void changedUpdate(DocumentEvent arg0) {
updateEnabledState();
}
+ @Override
public void insertUpdate(DocumentEvent arg0) {
updateEnabledState();
}
+ @Override
public void removeUpdate(DocumentEvent arg0) {
updateEnabledState();
}
}
-
- /**
- * Validator for a changeset ID entered in a {@link JTextComponent}.
- *
- */
- static private class ChangesetIdValidator extends AbstractTextComponentValidator {
- static public ChangesetIdValidator decorate(JTextComponent tc) {
- return new ChangesetIdValidator(tc);
- }
-
- public ChangesetIdValidator(JTextComponent tc) {
- super(tc);
- }
-
- @Override
- public boolean isValid() {
- String value = getComponent().getText();
- if (value == null || value.trim().length() == 0)
- return true;
- return getChangesetId() > 0;
- }
-
- @Override
- public void validate() {
- if (!isValid()) {
- feedbackInvalid(tr("The current value is not a valid changeset ID. Please enter an integer value > 0"));
- } else {
- feedbackValid(tr("Please enter an integer value > 0"));
- }
- }
-
- public int getChangesetId() {
- String value = getComponent().getText();
- if (value == null || value.trim().length() == 0) return 0;
- try {
- int changesetId = Integer.parseInt(value.trim());
- if (changesetId > 0) return changesetId;
- return 0;
- } catch(NumberFormatException e) {
- return 0;
- }
- }
- }
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
index fcfd527..f11dffb 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
@@ -24,20 +24,21 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
-import javax.swing.JTextField;
import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.BoundingBoxSelectionPanel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.io.ChangesetQuery;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+
/**
* This panel allows to specify a changeset query
@@ -257,6 +258,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
pnlBoundingBoxRestriction.setVisible(cbBoundingBoxRestriction.isSelected());
}
+ @Override
public void itemStateChanged(ItemEvent e) {
if (e.getSource() == cbUserRestriction) {
userRestrictionStateChanged();
@@ -374,9 +376,9 @@ public class AdvancedChangesetQueryPanel extends JPanel {
private JRadioButton rbRestrictToMyself;
private JRadioButton rbRestrictToUid;
private JRadioButton rbRestrictToUserName;
- private JTextField tfUid;
+ private JosmTextField tfUid;
private UidInputFieldValidator valUid;
- private JTextField tfUserName;
+ private JosmTextField tfUserName;
private UserNameInputValidator valUserName;
private JMultilineLabel lblRestrictedToMyself;
@@ -389,7 +391,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
pnl.add(new JLabel(tr("User ID:")), gc);
gc.gridx = 1;
- pnl.add(tfUid = new JTextField(10),gc);
+ pnl.add(tfUid = new JosmTextField(10),gc);
SelectAllOnFocusGainedDecorator.decorate(tfUid);
valUid = UidInputFieldValidator.decorate(tfUid);
@@ -409,7 +411,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
pnl.add(new JLabel(tr("User name:")), gc);
gc.gridx = 1;
- pnl.add(tfUserName = new JTextField(10),gc);
+ pnl.add(tfUserName = new JosmTextField(10),gc);
SelectAllOnFocusGainedDecorator.decorate(tfUserName);
valUserName = UserNameInputValidator.decorate(tfUserName);
@@ -615,6 +617,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
}
class UserRestrictionChangedHandler implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
tfUid.setEnabled(rbRestrictToUid.isSelected());
tfUserName.setEnabled(rbRestrictToUserName.isSelected());
@@ -634,17 +637,17 @@ public class AdvancedChangesetQueryPanel extends JPanel {
private JRadioButton rbClosedAfter;
private JRadioButton rbClosedAfterAndCreatedBefore;
- private JTextField tfClosedAfterDate1;
+ private JosmTextField tfClosedAfterDate1;
private DateValidator valClosedAfterDate1;
- private JTextField tfClosedAfterTime1;
+ private JosmTextField tfClosedAfterTime1;
private TimeValidator valClosedAfterTime1;
- private JTextField tfClosedAfterDate2;
+ private JosmTextField tfClosedAfterDate2;
private DateValidator valClosedAfterDate2;
- private JTextField tfClosedAfterTime2;
+ private JosmTextField tfClosedAfterTime2;
private TimeValidator valClosedAfterTime2;
- private JTextField tfCreatedBeforeDate;
+ private JosmTextField tfCreatedBeforeDate;
private DateValidator valCreatedBeforeDate;
- private JTextField tfCreatedBeforeTime;
+ private JosmTextField tfCreatedBeforeTime;
private TimeValidator valCreatedBeforeTime;
protected JPanel buildClosedAfterInputPanel() {
@@ -657,7 +660,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
gc.gridx = 1;
gc.weightx = 0.7;
- pnl.add(tfClosedAfterDate1 = new JTextField(),gc);
+ pnl.add(tfClosedAfterDate1 = new JosmTextField(),gc);
SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterDate1);
valClosedAfterDate1 = DateValidator.decorate(tfClosedAfterDate1);
tfClosedAfterDate1.setToolTipText(valClosedAfterDate1.getStandardTooltipTextAsHtml());
@@ -668,7 +671,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
gc.gridx = 3;
gc.weightx = 0.3;
- pnl.add(tfClosedAfterTime1 = new JTextField(),gc);
+ pnl.add(tfClosedAfterTime1 = new JosmTextField(),gc);
SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterTime1);
valClosedAfterTime1 = TimeValidator.decorate(tfClosedAfterTime1);
tfClosedAfterTime1.setToolTipText(valClosedAfterTime1.getStandardTooltipTextAsHtml());
@@ -691,7 +694,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
gc.gridx = 2;
gc.weightx = 0.7;
- pnl.add(tfClosedAfterDate2 = new JTextField(),gc);
+ pnl.add(tfClosedAfterDate2 = new JosmTextField(),gc);
SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterDate2);
valClosedAfterDate2 = DateValidator.decorate(tfClosedAfterDate2);
tfClosedAfterDate2.setToolTipText(valClosedAfterDate2.getStandardTooltipTextAsHtml());
@@ -701,7 +704,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
gc.gridx = 4;
gc.weightx = 0.3;
- pnl.add(tfClosedAfterTime2 = new JTextField(),gc);
+ pnl.add(tfClosedAfterTime2 = new JosmTextField(),gc);
SelectAllOnFocusGainedDecorator.decorate(tfClosedAfterTime2);
valClosedAfterTime2 = TimeValidator.decorate(tfClosedAfterTime2);
tfClosedAfterTime2.setToolTipText(valClosedAfterTime2.getStandardTooltipTextAsHtml());
@@ -721,7 +724,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
gc.gridx = 2;
gc.weightx = 0.7;
- pnl.add(tfCreatedBeforeDate = new JTextField(),gc);
+ pnl.add(tfCreatedBeforeDate = new JosmTextField(),gc);
SelectAllOnFocusGainedDecorator.decorate(tfCreatedBeforeDate);
valCreatedBeforeDate = DateValidator.decorate(tfCreatedBeforeDate);
tfCreatedBeforeDate.setToolTipText(valCreatedBeforeDate.getStandardTooltipTextAsHtml());
@@ -732,7 +735,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
gc.gridx = 4;
gc.weightx = 0.3;
- pnl.add(tfCreatedBeforeTime = new JTextField(),gc);
+ pnl.add(tfCreatedBeforeTime = new JosmTextField(),gc);
SelectAllOnFocusGainedDecorator.decorate(tfCreatedBeforeTime);
valCreatedBeforeTime = TimeValidator.decorate(tfCreatedBeforeTime);
tfCreatedBeforeTime.setToolTipText(valCreatedBeforeDate.getStandardTooltipTextAsHtml());
@@ -817,6 +820,7 @@ public class AdvancedChangesetQueryPanel extends JPanel {
}
class TimeRestrictionChangedHandler implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
tfClosedAfterDate1.setEnabled(rbClosedAfter.isSelected());
tfClosedAfterTime1.setEnabled(rbClosedAfter.isSelected());
@@ -1153,17 +1157,9 @@ public class AdvancedChangesetQueryPanel extends JPanel {
if (getComponent().getText().trim().length() == 0)
return null;
- for (int i = 0; i< 4; i++) {
+ for (int style : new int[]{DateFormat.SHORT, DateFormat.MEDIUM, DateFormat.LONG, DateFormat.FULL}) {
try {
- DateFormat df = null;
- switch(i) {
- case 0: df = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()); break;
- case 1: df = DateFormat.getTimeInstance(DateFormat.MEDIUM, Locale.getDefault()); break;
- case 2: df = DateFormat.getTimeInstance(DateFormat.LONG, Locale.getDefault()); break;
- case 3: df = DateFormat.getTimeInstance(DateFormat.FULL,Locale.getDefault()); break;
- }
- Date d = df.parse(getComponent().getText());
- return d;
+ return DateFormat.getTimeInstance(style, Locale.getDefault()).parse(getComponent().getText());
} catch(ParseException e) {
continue;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
index 575d475..0a4b6d7 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
@@ -20,9 +20,9 @@ import javax.swing.JRadioButton;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.io.ChangesetQuery;
/**
@@ -40,17 +40,14 @@ public class BasicChangesetQueryPanel extends JPanel {
CHANGESETS_IN_MAP_VIEW;
}
- private ButtonGroup bgQueries;
private Map<BasicQuery, JRadioButton> rbQueries;
private Map<BasicQuery, JMultilineLabel> lblQueries;
private JCheckBox cbMyChangesetsOnly;
- private HtmlPanel pnlInfos;
-
protected JPanel buildQueriesPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
- bgQueries = new ButtonGroup();
+ ButtonGroup bgQueries = new ButtonGroup();
rbQueries = new HashMap<BasicQuery, JRadioButton>();
lblQueries = new HashMap<BasicQuery, JMultilineLabel>();
SelectQueryHandler selectedQueryHandler = new SelectQueryHandler();
@@ -122,7 +119,7 @@ public class BasicChangesetQueryPanel extends JPanel {
}
protected JPanel buildInfoPanel() {
- pnlInfos = new HtmlPanel();
+ HtmlPanel pnlInfos = new HtmlPanel();
pnlInfos.setText(tr("<html>Please select one the following <strong>standard queries</strong>."
+ "Select <strong>Download my changesets only</strong>"
+ " if you only want to download changesets created by yourself.<br>"
@@ -160,7 +157,7 @@ public class BasicChangesetQueryPanel extends JPanel {
// query for changesets in the current map view only if there *is* a current
// map view
lbl = lblQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW);
- if (Main.map == null || Main.map.mapView == null) {
+ if (!Main.isDisplayingMapView()) {
rbQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW).setEnabled(false);
lbl.setText(tr("<html>Download changesets in the current map view.<br><em>Disabled. There is currently no map view active.</em></html>"));
} else {
@@ -190,7 +187,7 @@ public class BasicChangesetQueryPanel extends JPanel {
try {
q = BasicQuery.valueOf(BasicQuery.class, value);
} catch(IllegalArgumentException e) {
- System.err.println(tr("Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to default query.","changeset-query.basic.query", value));
+ Main.warn(tr("Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default query.","changeset-query.basic.query", value));
q = BasicQuery.MOST_RECENT_CHANGESETS;
}
}
@@ -244,6 +241,7 @@ public class BasicChangesetQueryPanel extends JPanel {
*
*/
class SelectQueryHandler implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
BasicQuery q = getSelectedQuery();
if (q == null) return;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
index d17bc61..cc080dd 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
@@ -151,7 +151,7 @@ public class ChangesetQueryDialog extends JDialog {
).applySafe(this);
setCanceled(false);
startUserInput();
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
pnlAdvancedQueries.rememberSettings();
}
@@ -175,6 +175,7 @@ public class ChangesetQueryDialog extends JDialog {
);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
try {
switch(tpQueryPanels.getSelectedIndex()) {
@@ -190,7 +191,7 @@ public class ChangesetQueryDialog extends JDialog {
return;
}
break;
-
+
case 2:
if (getChangesetQuery() == null) {
pnlAdvancedQueries.displayMessageIfInvalid();
@@ -218,6 +219,7 @@ public class ChangesetQueryDialog extends JDialog {
setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
cancel();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
index d19defd..eda7a3c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
@@ -64,7 +64,7 @@ public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetD
/**
* Creates the task.
*
- * @param parent the parent component relative to which the {@link PleaseWaitDialog} is displayed.
+ * @param parent the parent component relative to which the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} is displayed.
* Must not be null.
* @param query the query to submit to the OSM server. Must not be null.
* @throws IllegalArgumentException thrown if query is null.
@@ -109,14 +109,14 @@ public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetD
return;
}
- // update the global changeset cache with the downloaded changesets;
+ // update the global changeset cache with the downloaded changesets.
// this will trigger change events which views are listening to. They
// will update their views accordingly.
//
// Run on the EDT because UI updates are triggered.
//
Runnable r = new Runnable() {
- public void run() {
+ @Override public void run() {
ChangesetCache.getInstance().update(downloadedChangesets);
}
};
@@ -126,7 +126,7 @@ public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetD
try {
SwingUtilities.invokeAndWait(r);
} catch(InterruptedException e) {
- e.printStackTrace();
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" while updating changeset cache");
} catch(InvocationTargetException e) {
Throwable t = e.getTargetException();
if (t instanceof RuntimeException) {
@@ -186,7 +186,6 @@ public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetD
} catch(OsmTransferCanceledException e) {
// thrown if user cancel the authentication dialog
canceled = true;
- return;
} catch(OsmTransferException e) {
if (canceled)
return;
@@ -197,14 +196,17 @@ public class ChangesetQueryTask extends PleaseWaitRunnable implements ChangesetD
/* ------------------------------------------------------------------------------- */
/* interface ChangesetDownloadTask */
/* ------------------------------------------------------------------------------- */
+ @Override
public Set<Changeset> getDownloadedChangesets() {
return downloadedChangesets;
}
+ @Override
public boolean isCanceled() {
return canceled;
}
+ @Override
public boolean isFailed() {
return lastException != null;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
index 83c06ba..fb678ca 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
@@ -15,22 +15,23 @@ import java.net.URL;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.io.ChangesetQuery;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
public class UrlBasedQueryPanel extends JPanel {
- private JTextField tfUrl;
+ private JosmTextField tfUrl;
private JLabel lblValid;
protected JPanel buildURLPanel() {
@@ -44,7 +45,7 @@ public class UrlBasedQueryPanel extends JPanel {
gc.gridx = 1;
gc.weightx = 1.0;
gc.fill = GridBagConstraints.HORIZONTAL;
- pnl.add(tfUrl = new JTextField(), gc);
+ pnl.add(tfUrl = new JosmTextField(), gc);
tfUrl.getDocument().addDocumentListener(new ChangetQueryUrlValidator());
tfUrl.addFocusListener(
new FocusAdapter() {
@@ -70,7 +71,7 @@ public class UrlBasedQueryPanel extends JPanel {
+ tr("Please enter or paste an URL to retrieve changesets from the OSM API.")
+ "<p><strong>" + tr("Examples") + "</strong></p>"
+ "<ul>"
- + "<li><a href=\"http://www.openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/browse/changesets?open=true</a></li>"
+ + "<li><a href=\""+Main.OSM_WEBSITE+"/browse/changesets?open=true\">"+Main.OSM_WEBSITE+"/browse/changesets?open=true</a></li>"
+ "<li><a href=\"http://api.openstreetmap.org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/changesets?open=true</a></li>"
+ "</ul>"
+ tr("Note that changeset queries are currently always submitted to ''{0}'', regardless of the "
@@ -79,6 +80,7 @@ public class UrlBasedQueryPanel extends JPanel {
);
pnl.getEditorPane().addHyperlinkListener(
new HyperlinkListener() {
+ @Override
public void hyperlinkUpdate(HyperlinkEvent e) {
if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
tfUrl.setText(e.getDescription());
@@ -182,7 +184,7 @@ public class UrlBasedQueryPanel extends JPanel {
protected void validate() {
String value = tfUrl.getText();
- if (value.trim().equals("")) {
+ if (value.trim().isEmpty()) {
feedbackNone();
return;
}
@@ -193,14 +195,17 @@ public class UrlBasedQueryPanel extends JPanel {
feedbackInvalid();
}
}
+ @Override
public void changedUpdate(DocumentEvent e) {
validate();
}
+ @Override
public void insertUpdate(DocumentEvent e) {
validate();
}
+ @Override
public void removeUpdate(DocumentEvent e) {
validate();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
index cebd1fe..5e850ae 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
@@ -21,7 +21,7 @@ import javax.swing.JPanel;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
import org.openstreetmap.josm.tools.GBC;
public class PresetListPanel extends JPanel {
@@ -55,6 +55,7 @@ public class PresetListPanel extends JPanel {
tag = t;
this.presetHandler = presetHandler;
}
+ @Override
public void mouseClicked(MouseEvent arg0) {
Collection<OsmPrimitive> selection = tag.createSelection(presetHandler.getSelection());
if (selection == null || selection.isEmpty())
@@ -66,17 +67,21 @@ public class PresetListPanel extends JPanel {
}
}
+ @Override
public void mouseEntered(MouseEvent arg0) {
label.setFont(hover);
}
+ @Override
public void mouseExited(MouseEvent arg0) {
label.setFont(normal);
}
+ @Override
public void mousePressed(MouseEvent arg0) {}
+ @Override
public void mouseReleased(MouseEvent arg0) {}
}
- public void updatePresets(final Collection<PresetType> types, final Map<String, String> tags, PresetHandler presetHandler) {
+ public void updatePresets(final Collection<TaggingPresetType> types, final Map<String, String> tags, PresetHandler presetHandler) {
removeAll();
if (types.isEmpty()) {
@@ -86,7 +91,7 @@ public class PresetListPanel extends JPanel {
for (TaggingPreset t : TaggingPreset.getMatchingPresets(types, tags, true)) {
JLabel lbl = new JLabel(t.getName() + " …");
- lbl.setIcon((Icon) t.getValue(Action.SMALL_ICON));
+ lbl.setIcon(t.getIcon());
lbl.addMouseListener(new PresetLabelML(lbl, t, presetHandler));
add(lbl, GBC.eol().fill(GBC.HORIZONTAL));
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
new file mode 100644
index 0000000..65876d9
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java
@@ -0,0 +1,78 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.properties;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.util.Map;
+
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.UIDefaults;
+import javax.swing.table.DefaultTableCellRenderer;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Cell renderer of tags table.
+ * @since 6314
+ */
+public class PropertiesCellRenderer extends DefaultTableCellRenderer {
+
+ private void setColors(Component c, String key, boolean isSelected) {
+ UIDefaults defaults = javax.swing.UIManager.getDefaults();
+ if (OsmPrimitive.getDiscardableKeys().contains(key)) {
+ if (isSelected) {
+ c.setForeground(Main.pref.getColor(marktr("Discardable key: selection Foreground"), Color.GRAY));
+ c.setBackground(Main.pref.getColor(marktr("Discardable key: selection Background"), defaults.getColor("Table.selectionBackground")));
+ } else {
+ c.setForeground(Main.pref.getColor(marktr("Discardable key: foreground"), Color.GRAY));
+ c.setBackground(Main.pref.getColor(marktr("Discardable key: background"), defaults.getColor("Table.background")));
+ }
+ } else {
+ c.setForeground(defaults.getColor("Table."+(isSelected ? "selectionF" : "f")+"oreground"));
+ c.setBackground(defaults.getColor("Table."+(isSelected ? "selectionB" : "b")+"ackground"));
+ }
+ }
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+ Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
+ if (value == null)
+ return this;
+ if (c instanceof JLabel) {
+ String str = null;
+ if (value instanceof String) {
+ str = (String) value;
+ } else if (value instanceof Map<?, ?>) {
+ Map<?, ?> v = (Map<?, ?>) value;
+ if (v.size() != 1) {
+ str=tr("<different>");
+ c.setFont(c.getFont().deriveFont(Font.ITALIC));
+ } else {
+ final Map.Entry<?, ?> entry = v.entrySet().iterator().next();
+ str = (String) entry.getKey();
+ }
+ }
+ ((JLabel)c).putClientProperty("html.disable", Boolean.TRUE); // Fix #8730
+ ((JLabel)c).setText(str);
+ if (Main.pref.getBoolean("display.discardable-keys", false)) {
+ String key = null;
+ if (column == 0) {
+ key = str;
+ } else if (column == 1) {
+ Object value0 = table.getModel().getValueAt(row, 0);
+ if (value0 instanceof String) {
+ key = (String) value0;
+ }
+ }
+ setColors(c, key, isSelected);
+ }
+ }
+ return c;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index 0e0061a..a7a3a6d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -9,6 +9,7 @@ import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.Point;
import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -22,7 +23,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -32,10 +32,8 @@ import java.util.TreeMap;
import java.util.TreeSet;
import javax.swing.AbstractAction;
-import javax.swing.Action;
import javax.swing.JComponent;
import javax.swing.JLabel;
-import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
@@ -44,7 +42,6 @@ import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.event.PopupMenuListener;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumnModel;
@@ -52,11 +49,18 @@ import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.relation.DownloadMembersAction;
+import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
+import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
+import org.openstreetmap.josm.actions.relation.SelectMembersAction;
+import org.openstreetmap.josm.actions.relation.SelectRelationAction;
import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
import org.openstreetmap.josm.data.SelectionChangedListener;
import org.openstreetmap.josm.data.osm.IRelation;
import org.openstreetmap.josm.data.osm.Node;
@@ -72,16 +76,17 @@ import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.PopupMenuHandler;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
-import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -92,81 +97,63 @@ import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
/**
- * This dialog displays the properties of the current selected primitives.
+ * This dialog displays the tags of the current selected primitives.
*
* If no object is selected, the dialog list is empty.
- * If only one is selected, all properties of this object are selected.
- * If more than one object are selected, the sum of all properties are displayed. If the
- * different objects share the same property, the shared value is displayed. If they have
+ * If only one is selected, all tags of this object are selected.
+ * If more than one object are selected, the sum of all tags are displayed. If the
+ * different objects share the same tag, the shared value is displayed. If they have
* different values, all of them are put in a combo box and the string "<different>"
* is displayed in italic.
*
- * Below the list, the user can click on an add, modify and delete property button to
+ * Below the list, the user can click on an add, modify and delete tag button to
* edit the table selection value.
*
* The command is applied to all selected entries.
*
* @author imi
*/
-public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetListenerAdapter.Listener {
+public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetListenerAdapter.Listener, PreferenceChangedListener {
+
/**
- * Watches for mouse clicks
- * @author imi
+ * hook for roadsigns plugin to display a small button in the upper right corner of this dialog
*/
- public class MouseClickWatch extends MouseAdapter {
- @Override public void mouseClicked(MouseEvent e) {
- if (e.getClickCount() < 2)
- {
- // single click, clear selection in other table not clicked in
- if (e.getSource() == propertyTable) {
- membershipTable.clearSelection();
- } else if (e.getSource() == membershipTable) {
- propertyTable.clearSelection();
- }
- }
- // double click, edit or add property
- else if (e.getSource() == propertyTable)
- {
- int row = propertyTable.rowAtPoint(e.getPoint());
- if (row > -1) {
- boolean focusOnKey = (propertyTable.columnAtPoint(e.getPoint()) == 0);
- editHelper.editProperty(row, focusOnKey);
- } else {
- editHelper.addProperty();
- btnAdd.requestFocusInWindow();
- }
- } else if (e.getSource() == membershipTable) {
- int row = membershipTable.rowAtPoint(e.getPoint());
- if (row > -1) {
- editMembership(row);
- }
- }
- else
- {
- editHelper.addProperty();
- btnAdd.requestFocusInWindow();
- }
- }
- @Override public void mousePressed(MouseEvent e) {
- if (e.getSource() == propertyTable) {
- membershipTable.clearSelection();
- } else if (e.getSource() == membershipTable) {
- propertyTable.clearSelection();
- }
- }
+ public static final JPanel pluginHook = new JPanel();
- }
+ /**
+ * The tag data of selected objects.
+ */
+ private final DefaultTableModel tagData = new ReadOnlyTableModel();
- // hook for roadsigns plugin to display a small
- // button in the upper right corner of this dialog
- public static final JPanel pluginHook = new JPanel();
+ /**
+ * The membership data of selected objects.
+ */
+ private final DefaultTableModel membershipData = new ReadOnlyTableModel();
- private JPopupMenu propertyMenu;
- private JPopupMenu membershipMenu;
+ /**
+ * The tags table.
+ */
+ private final JTable tagTable = new JTable(tagData);
+
+ /**
+ * The membership table.
+ */
+ private final JTable membershipTable = new JTable(membershipData);
+
+ // Popup menus
+ private final JPopupMenu tagMenu = new JPopupMenu();
+ private final JPopupMenu membershipMenu = new JPopupMenu();
+
+ // Popup menu handlers
+ private final PopupMenuHandler tagMenuHandler = new PopupMenuHandler(tagMenu);
+ private final PopupMenuHandler membershipMenuHandler = new PopupMenuHandler(membershipMenu);
private final Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
+ /**
+ * This sub-object is responsible for all adding and editing of tags
+ */
+ private final TagEditHelper editHelper = new TagEditHelper(tagData, valueCount);
-
private final DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this);
private final HelpAction helpAction = new HelpAction();
private final PasteValueAction pasteValueAction = new PasteValueAction();
@@ -180,92 +167,31 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
private final DeleteAction deleteAction = new DeleteAction();
private final JosmAction[] josmActions = new JosmAction[]{addAction, editAction, deleteAction};
- @Override
- public void showNotify() {
- DatasetEventManager.getInstance().addDatasetListener(dataChangedAdapter, FireMode.IN_EDT_CONSOLIDATED);
- SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
- MapView.addEditLayerChangeListener(this);
- for (JosmAction action : josmActions) {
- Main.registerActionShortcut(action);
- }
- updateSelection();
- }
+ // relation actions
+ private final SelectInRelationListAction setRelationSelectionAction = new SelectInRelationListAction();
+ private final SelectRelationAction selectRelationAction = new SelectRelationAction(false);
+ private final SelectRelationAction addRelationToSelectionAction = new SelectRelationAction(true);
- @Override
- public void hideNotify() {
- DatasetEventManager.getInstance().removeDatasetListener(dataChangedAdapter);
- SelectionEventManager.getInstance().removeSelectionListener(this);
- MapView.removeEditLayerChangeListener(this);
- for (JosmAction action : josmActions) {
- Main.unregisterActionShortcut(action);
- }
- }
+ private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction();
+ private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction();
- /**
- * This simply fires up an {@link RelationEditor} for the relation shown; everything else
- * is the editor's business.
- *
- * @param row
- */
- private void editMembership(int row) {
- Relation relation = (Relation)membershipData.getValueAt(row, 0);
- Main.map.relationListDialog.selectRelation(relation);
- RelationEditor.getEditor(
- Main.map.mapView.getEditLayer(),
- relation,
- ((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true);
- }
-
- /**
- * The property data of selected objects.
- */
- private final DefaultTableModel propertyData = new DefaultTableModel() {
- @Override public boolean isCellEditable(int row, int column) {
- return false;
- }
- @Override public Class<?> getColumnClass(int columnIndex) {
- return String.class;
- }
- };
+ private final SelectMembersAction selectMembersAction = new SelectMembersAction(false);
+ private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
- /**
- * The membership data of selected objects.
- */
- private final DefaultTableModel membershipData = new DefaultTableModel() {
- @Override public boolean isCellEditable(int row, int column) {
- return false;
- }
- @Override public Class<?> getColumnClass(int columnIndex) {
- return String.class;
- }
- };
+ private final HighlightHelper highlightHelper= new HighlightHelper();
/**
- * The properties table.
- */
- private final JTable propertyTable = new JTable(propertyData);
- /**
- * The membership table.
- */
- private final JTable membershipTable = new JTable(membershipData);
-
- /**
- * This sub-object is responsible for all adding and editing of properties
- */
- private final TagEditHelper editHelper = new TagEditHelper(propertyData, valueCount);
-
- /**
* The Add button (needed to be able to disable it)
*/
- private final SideButton btnAdd;
+ private final SideButton btnAdd = new SideButton(addAction);
/**
* The Edit button (needed to be able to disable it)
*/
- private final SideButton btnEdit;
+ private final SideButton btnEdit = new SideButton(editAction);
/**
* The Delete button (needed to be able to disable it)
*/
- private final SideButton btnDel;
+ private final SideButton btnDel = new SideButton(deleteAction);
/**
* Matching preset display class
*/
@@ -275,138 +201,96 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
* Text to display when nothing selected.
*/
private final JLabel selectSth = new JLabel("<html><p>"
- + tr("Select objects for which to change properties.") + "</p></html>");
+ + tr("Select objects for which to change tags.") + "</p></html>");
- static class MemberInfo {
- List<RelationMember> role = new ArrayList<RelationMember>();
- List<Integer> position = new ArrayList<Integer>();
- private String positionString = null;
- void add(RelationMember r, Integer p) {
- role.add(r);
- position.add(p);
+ private PresetHandler presetHandler = new PresetHandler() {
+ @Override public void updateTags(List<Tag> tags) {
+ Command command = TaggingPreset.createCommand(getSelection(), tags);
+ if (command != null) Main.main.undoRedo.add(command);
}
- String getPositionString() {
- if (positionString == null) {
- Collections.sort(position);
- positionString = String.valueOf(position.get(0));
- int cnt = 0;
- int last = position.get(0);
- for (int i = 1; i < position.size(); ++i) {
- int cur = position.get(i);
- if (cur == last + 1) {
- ++cnt;
- } else if (cnt == 0) {
- positionString += "," + String.valueOf(cur);
- } else {
- positionString += "-" + String.valueOf(last);
- positionString += "," + String.valueOf(cur);
- cnt = 0;
- }
- last = cur;
- }
- if (cnt >= 1) {
- positionString += "-" + String.valueOf(last);
- }
- }
- if (positionString.length() > 20) {
- positionString = positionString.substring(0, 17) + "...";
- }
- return positionString;
+
+ @Override public Collection<OsmPrimitive> getSelection() {
+ if (Main.main == null) return null;
+ if (Main.main.getCurrentDataSet() == null) return null;
+ return Main.main.getCurrentDataSet().getSelected();
}
- }
+ };
+
+ // <editor-fold defaultstate="collapsed" desc="Dialog construction and helper methods">
/**
* Create a new PropertiesDialog
*/
- public PropertiesDialog(MapFrame mapFrame) {
- super(tr("Properties/Memberships"), "propertiesdialog", tr("Properties for selected objects."),
- Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Properties/Memberships")), KeyEvent.VK_P,
+ public PropertiesDialog() {
+ super(tr("Tags/Memberships"), "propertiesdialog", tr("Tags for selected objects."),
+ Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,
Shortcut.ALT_SHIFT), 150, true);
- // setting up the properties table
- propertyMenu = new JPopupMenu();
- propertyMenu.add(pasteValueAction);
- propertyMenu.add(copyValueAction);
- propertyMenu.add(copyKeyValueAction);
- propertyMenu.add(copyAllKeyValueAction);
- propertyMenu.addSeparator();
- propertyMenu.add(searchActionAny);
- propertyMenu.add(searchActionSame);
- propertyMenu.addSeparator();
- propertyMenu.add(helpAction);
-
- propertyData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
- propertyTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
- propertyTable.getTableHeader().setReorderingAllowed(false);
- propertyTable.addMouseListener(new PopupMenuLauncher() {
- @Override
- public void launch(MouseEvent evt) {
- Point p = evt.getPoint();
- int row = propertyTable.rowAtPoint(p);
- if (row > -1) {
- propertyTable.changeSelection(row, 0, false, false);
- propertyMenu.show(propertyTable, p.x, p.y-3);
- }
- }
- });
+ setupTagsMenu();
+ buildTagsTable();
- propertyTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer(){
- @Override public Component getTableCellRendererComponent(JTable table, Object value,
- boolean isSelected, boolean hasFocus, int row, int column) {
- Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
- if (value == null)
- return this;
- if (c instanceof JLabel) {
- String str = null;
- if (value instanceof String) {
- str = (String) value;
- } else if (value instanceof Map<?, ?>) {
- Map<?, ?> v = (Map<?, ?>) value;
- if (v.size() != 1) {
- str=tr("<different>");
- c.setFont(c.getFont().deriveFont(Font.ITALIC));
- } else {
- final Map.Entry<?, ?> entry = v.entrySet().iterator().next();
- str = (String) entry.getKey();
- }
- }
- ((JLabel)c).setText(str);
- }
- return c;
- }
- });
+ setupMembershipMenu();
+ buildMembershipTable();
- // setting up the membership table
- membershipMenu = new JPopupMenu();
- membershipMenu.add(new SelectRelationAction(true));
- membershipMenu.add(new SelectRelationAction(false));
- membershipMenu.add(new SelectRelationMembersAction());
- membershipMenu.add(new DownloadIncompleteMembersAction());
- membershipMenu.addSeparator();
- membershipMenu.add(helpAction);
+ // combine both tables and wrap them in a scrollPane
+ JPanel bothTables = new JPanel();
+ boolean top = Main.pref.getBoolean("properties.presets.top", true);
+ bothTables.setLayout(new GridBagLayout());
+ if(top) {
+ bothTables.add(presets, GBC.std().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2).anchor(GBC.NORTHWEST));
+ double epsilon = Double.MIN_VALUE; // need to set a weight or else anchor value is ignored
+ bothTables.add(pluginHook, GBC.eol().insets(0,1,1,1).anchor(GBC.NORTHEAST).weight(epsilon, epsilon));
+ }
+ bothTables.add(selectSth, GBC.eol().fill().insets(10, 10, 10, 10));
+ bothTables.add(tagTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
+ bothTables.add(tagTable, GBC.eol().fill(GBC.BOTH));
+ bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
+ bothTables.add(membershipTable, GBC.eol().fill(GBC.BOTH));
+ if(!top) {
+ bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
+ }
+
+ setupKeyboardShortcuts();
+
+ // Let the action know when selection in the tables change
+ tagTable.getSelectionModel().addListSelectionListener(editAction);
+ membershipTable.getSelectionModel().addListSelectionListener(editAction);
+ tagTable.getSelectionModel().addListSelectionListener(deleteAction);
+ membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
+
+
+ JScrollPane scrollPane = (JScrollPane) createLayout(bothTables, true, Arrays.asList(new SideButton[] {
+ this.btnAdd, this.btnEdit, this.btnDel
+ }));
+
+ MouseClickWatch mouseClickWatch = new MouseClickWatch();
+ tagTable.addMouseListener(mouseClickWatch);
+ membershipTable.addMouseListener(mouseClickWatch);
+ scrollPane.addMouseListener(mouseClickWatch);
+
+ selectSth.setPreferredSize(scrollPane.getSize());
+ presets.setSize(scrollPane.getSize());
+
+ editHelper.loadTagsIfNeeded();
+
+ Main.pref.addPreferenceChangeListener(this);
+ }
+ private void buildTagsTable() {
+ // setting up the tags table
+
+ tagData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
+ tagTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ tagTable.getTableHeader().setReorderingAllowed(false);
+
+ PropertiesCellRenderer cellRenderer = new PropertiesCellRenderer();
+ tagTable.getColumnModel().getColumn(0).setCellRenderer(cellRenderer);
+ tagTable.getColumnModel().getColumn(1).setCellRenderer(cellRenderer);
+ }
+
+ private void buildMembershipTable() {
membershipData.setColumnIdentifiers(new String[]{tr("Member Of"),tr("Role"),tr("Position")});
- membershipTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- membershipTable.addMouseListener(new PopupMenuLauncher() {
- @Override
- public void launch(MouseEvent evt) {
- Point p = evt.getPoint();
- int row = membershipTable.rowAtPoint(p);
- if (row > -1) {
- membershipTable.changeSelection(row, 0, false, false);
- Relation relation = (Relation)membershipData.getValueAt(row, 0);
- for (Component c : membershipMenu.getComponents()) {
- if (c instanceof JMenuItem) {
- Action action = ((JMenuItem) c).getAction();
- if (action instanceof RelationRelated) {
- ((RelationRelated)action).setRelation(relation);
- }
- }
- }
- membershipMenu.show(membershipTable, p.x, p.y-3);
- }
- }
- });
+ membershipTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
TableColumnModel mod = membershipTable.getColumnModel();
membershipTable.getTableHeader().setReorderingAllowed(false);
@@ -477,78 +361,173 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
mod.getColumn(2).setPreferredWidth(20);
mod.getColumn(1).setPreferredWidth(40);
mod.getColumn(0).setPreferredWidth(200);
+ }
- // combine both tables and wrap them in a scrollPane
- JPanel bothTables = new JPanel();
- boolean top = Main.pref.getBoolean("properties.presets.top", true);
- bothTables.setLayout(new GridBagLayout());
- if(top) {
- bothTables.add(presets, GBC.std().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2).anchor(GBC.NORTHWEST));
- double epsilon = Double.MIN_VALUE; // need to set a weight or else anchor value is ignored
- bothTables.add(pluginHook, GBC.eol().insets(0,1,1,1).anchor(GBC.NORTHEAST).weight(epsilon, epsilon));
- }
- bothTables.add(selectSth, GBC.eol().fill().insets(10, 10, 10, 10));
- bothTables.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
- bothTables.add(propertyTable, GBC.eol().fill(GBC.BOTH));
- bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
- bothTables.add(membershipTable, GBC.eol().fill(GBC.BOTH));
- if(!top) {
- bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
- }
-
- // Open edit dialog whe enter pressed in tables
- propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ /**
+ * creates the popup menu @field membershipMenu and its launcher on membership table
+ */
+ private void setupMembershipMenu() {
+ // setting up the membership table
+ membershipMenuHandler.addAction(setRelationSelectionAction);
+ membershipMenuHandler.addAction(selectRelationAction);
+ membershipMenuHandler.addAction(addRelationToSelectionAction);
+ membershipMenuHandler.addAction(selectMembersAction);
+ membershipMenuHandler.addAction(addMembersToSelectionAction);
+ membershipMenu.addSeparator();
+ membershipMenuHandler.addAction(downloadMembersAction);
+ membershipMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
+ membershipMenu.addSeparator();
+ membershipMenu.add(helpAction);
+
+ membershipTable.addMouseListener(new PopupMenuLauncher(membershipMenu) {
+ @Override
+ protected int checkTableSelection(JTable table, Point p) {
+ int row = super.checkTableSelection(table, p);
+ List<Relation> rels = new ArrayList<Relation>();
+ for (int i: table.getSelectedRows()) {
+ rels.add((Relation) table.getValueAt(i, 0));
+ }
+ membershipMenuHandler.setPrimitives(rels);
+ return row;
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ //update highlights
+ if (Main.isDisplayingMapView()) {
+ int row = membershipTable.rowAtPoint(e.getPoint());
+ if (row>=0) {
+ if (highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0))) {
+ Main.map.mapView.repaint();
+ }
+ }
+ }
+ super.mouseClicked(e);
+ }
+
+ @Override
+ public void mouseExited(MouseEvent me) {
+ highlightHelper.clear();
+ }
+ });
+ }
+
+ /**
+ * creates the popup menu @field tagMenu and its launcher on tag table
+ */
+ private void setupTagsMenu() {
+ tagMenu.add(pasteValueAction);
+ tagMenu.add(copyValueAction);
+ tagMenu.add(copyKeyValueAction);
+ tagMenu.add(copyAllKeyValueAction);
+ tagMenu.addSeparator();
+ tagMenu.add(searchActionAny);
+ tagMenu.add(searchActionSame);
+ tagMenu.addSeparator();
+ tagMenu.add(helpAction);
+ tagTable.addMouseListener(new PopupMenuLauncher(tagMenu));
+ }
+
+ /**
+ * Assignas all needed keys like Enter and Spacebar to most important actions
+ */
+ private void setupKeyboardShortcuts() {
+
+ // ENTER = editAction, open "edit" dialog
+ tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),"onTableEnter");
- propertyTable.getActionMap().put("onTableEnter",editAction);
+ tagTable.getActionMap().put("onTableEnter",editAction);
membershipTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),"onTableEnter");
membershipTable.getActionMap().put("onTableEnter",editAction);
-
- // Open add property dialog when INS is pressed in tables
- propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+
+ // INSERT button = addAction, open "add tag" dialog
+ tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
.put(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0),"onTableInsert");
- propertyTable.getActionMap().put("onTableInsert",addAction);
-
- // unassign some standard shortcuts for JTable to allow upload / download
- InputMapUtils.unassignCtrlShiftUpDown(propertyTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-
- // -- add action and shortcut
- this.btnAdd = new SideButton(addAction);
- InputMapUtils.enableEnter(this.btnAdd);
+ tagTable.getActionMap().put("onTableInsert",addAction);
- // -- edit action
- //
- propertyTable.getSelectionModel().addListSelectionListener(editAction);
- membershipTable.getSelectionModel().addListSelectionListener(editAction);
- this.btnEdit = new SideButton(editAction);
+ // unassign some standard shortcuts for JTable to allow upload / download
+ InputMapUtils.unassignCtrlShiftUpDown(tagTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
- // -- delete action
- //
- this.btnDel = new SideButton(deleteAction);
- membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
- propertyTable.getSelectionModel().addListSelectionListener(deleteAction);
+ // unassign some standard shortcuts for correct copy-pasting, fix #8508
+ tagTable.setTransferHandler(null);
+
+ tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),"onCopy");
+ tagTable.getActionMap().put("onCopy",copyKeyValueAction);
+
+ // allow using enter to add tags for all look&feel configurations
+ InputMapUtils.enableEnter(this.btnAdd);
+
+ // DEL button = deleteAction
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"delete"
);
getActionMap().put("delete", deleteAction);
- JScrollPane scrollPane = (JScrollPane) createLayout(bothTables, true, Arrays.asList(new SideButton[] {
- this.btnAdd, this.btnEdit, this.btnDel
- }));
+ // F1 button = custom help action
+ getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0), "onHelp");
+ getActionMap().put("onHelp", helpAction);
+ }
- MouseClickWatch mouseClickWatch = new MouseClickWatch();
- propertyTable.addMouseListener(mouseClickWatch);
- membershipTable.addMouseListener(mouseClickWatch);
- scrollPane.addMouseListener(mouseClickWatch);
+ /**
+ * This simply fires up an {@link RelationEditor} for the relation shown; everything else
+ * is the editor's business.
+ *
+ * @param row
+ */
+ private void editMembership(int row) {
+ Relation relation = (Relation)membershipData.getValueAt(row, 0);
+ Main.map.relationListDialog.selectRelation(relation);
+ RelationEditor.getEditor(
+ Main.main.getEditLayer(),
+ relation,
+ ((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true);
+ }
- selectSth.setPreferredSize(scrollPane.getSize());
- presets.setSize(scrollPane.getSize());
+ private int findRow(TableModel model, Object value) {
+ for (int i=0; i<model.getRowCount(); i++) {
+ if (model.getValueAt(i, 0).equals(value))
+ return i;
+ }
+ return -1;
+ }
+
+ /**
+ * Update selection status, call @{link #selectionChanged} function.
+ */
+ private void updateSelection() {
+ if (Main.main.getCurrentDataSet() == null) {
+ selectionChanged(Collections.<OsmPrimitive>emptyList());
+ } else {
+ selectionChanged(Main.main.getCurrentDataSet().getSelected());
+ }
+ }
+
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="Event listeners methods">
+
+ @Override
+ public void showNotify() {
+ DatasetEventManager.getInstance().addDatasetListener(dataChangedAdapter, FireMode.IN_EDT_CONSOLIDATED);
+ SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
+ MapView.addEditLayerChangeListener(this);
+ for (JosmAction action : josmActions) {
+ Main.registerActionShortcut(action);
+ }
+ updateSelection();
+ }
- // -- help action
- //
- getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0), "onHelp");
- getActionMap().put("onHelp", helpAction);
+ @Override
+ public void hideNotify() {
+ DatasetEventManager.getInstance().removeDatasetListener(dataChangedAdapter);
+ SelectionEventManager.getInstance().removeSelectionListener(this);
+ MapView.removeEditLayerChangeListener(this);
+ for (JosmAction action : josmActions) {
+ Main.unregisterActionShortcut(action);
+ }
}
@Override
@@ -559,72 +538,61 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
}
- private int findRow(TableModel model, Object value) {
- for (int i=0; i<model.getRowCount(); i++) {
- if (model.getValueAt(i, 0).equals(value))
- return i;
- }
- return -1;
- }
-
- private PresetHandler presetHandler = new PresetHandler() {
-
- @Override
- public void updateTags(List<Tag> tags) {
- Command command = TaggingPreset.createCommand(getSelection(), tags);
- if (command != null) {
- Main.main.undoRedo.add(command);
- }
+ @Override
+ public void destroy() {
+ super.destroy();
+ Main.pref.removePreferenceChangeListener(this);
+ for (JosmAction action : josmActions) {
+ action.destroy();
}
-
- @Override
- public Collection<OsmPrimitive> getSelection() {
- if (Main.main == null) return null;
- if (Main.main.getCurrentDataSet() == null) return null;
-
- return Main.main.getCurrentDataSet().getSelected();
+ Container parent = pluginHook.getParent();
+ if (parent != null) {
+ parent.remove(pluginHook);
}
- };
+ }
@Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
if (!isVisible())
return;
- if (propertyTable == null)
+ if (tagTable == null)
return; // selection changed may be received in base class constructor before init
- if (propertyTable.getCellEditor() != null) {
- propertyTable.getCellEditor().cancelCellEditing();
+ if (tagTable.getCellEditor() != null) {
+ tagTable.getCellEditor().cancelCellEditing();
}
- String selectedTag = null;
+ String selectedTag;
Relation selectedRelation = null;
selectedTag = editHelper.getChangedKey(); // select last added or last edited key by default
- if (selectedTag == null && propertyTable.getSelectedRowCount() == 1) {
- selectedTag = (String)propertyData.getValueAt(propertyTable.getSelectedRow(), 0);
+ if (selectedTag == null && tagTable.getSelectedRowCount() == 1) {
+ selectedTag = (String)tagData.getValueAt(tagTable.getSelectedRow(), 0);
}
if (membershipTable.getSelectedRowCount() == 1) {
selectedRelation = (Relation)membershipData.getValueAt(membershipTable.getSelectedRow(), 0);
}
- // re-load property data
- propertyData.setRowCount(0);
+ // re-load tag data
+ tagData.setRowCount(0);
+ final boolean displayDiscardableKeys = Main.pref.getBoolean("display.discardable-keys", false);
final Map<String, Integer> keyCount = new HashMap<String, Integer>();
final Map<String, String> tags = new HashMap<String, String>();
valueCount.clear();
- EnumSet<PresetType> types = EnumSet.noneOf(TaggingPreset.PresetType.class);
+ EnumSet<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
for (OsmPrimitive osm : newSelection) {
- types.add(PresetType.forPrimitive(osm));
+ types.add(TaggingPresetType.forPrimitive(osm));
for (String key : osm.keySet()) {
- String value = osm.get(key);
- keyCount.put(key, keyCount.containsKey(key) ? keyCount.get(key) + 1 : 1);
- if (valueCount.containsKey(key)) {
- Map<String, Integer> v = valueCount.get(key);
- v.put(value, v.containsKey(value) ? v.get(value) + 1 : 1);
- } else {
- TreeMap<String, Integer> v = new TreeMap<String, Integer>();
- v.put(value, 1);
- valueCount.put(key, v);
+ if (displayDiscardableKeys || !OsmPrimitive.getDiscardableKeys().contains(key)) {
+ String value = osm.get(key);
+ keyCount.put(key, keyCount.containsKey(key) ? keyCount.get(key) + 1 : 1);
+ if (valueCount.containsKey(key)) {
+ Map<String, Integer> v = valueCount.get(key);
+ v.put(value, v.containsKey(value) ? v.get(value) + 1 : 1);
+ } else {
+ TreeMap<String, Integer> v = new TreeMap<String, Integer>();
+ v.put(value, 1);
+ valueCount.put(key, v);
+ }
}
}
}
@@ -636,11 +604,11 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
if (count < newSelection.size()) {
e.getValue().put("", newSelection.size() - count);
}
- propertyData.addRow(new Object[]{e.getKey(), e.getValue()});
+ tagData.addRow(new Object[]{e.getKey(), e.getValue()});
tags.put(e.getKey(), e.getValue().size() == 1
? e.getValue().keySet().iterator().next() : tr("<different>"));
}
-
+
membershipData.setRowCount(0);
Map<Relation, MemberInfo> roles = new HashMap<Relation, MemberInfo>();
@@ -666,7 +634,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
List<Relation> sortedRelations = new ArrayList<Relation>(roles.keySet());
Collections.sort(sortedRelations, new Comparator<Relation>() {
- public int compare(Relation o1, Relation o2) {
+ @Override public int compare(Relation o1, Relation o2) {
int comp = Boolean.valueOf(o1.isDisabledAndHidden()).compareTo(o2.isDisabledAndHidden());
if (comp == 0) {
comp = o1.getDisplayName(DefaultNameFormatter.getInstance()).compareTo(o2.getDisplayName(DefaultNameFormatter.getInstance()));
@@ -685,43 +653,32 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
membershipTable.setVisible(membershipData.getRowCount() > 0);
boolean hasSelection = !newSelection.isEmpty();
- boolean hasTags = hasSelection && propertyData.getRowCount() > 0;
+ boolean hasTags = hasSelection && tagData.getRowCount() > 0;
boolean hasMemberships = hasSelection && membershipData.getRowCount() > 0;
btnAdd.setEnabled(hasSelection);
btnEdit.setEnabled(hasTags || hasMemberships);
btnDel.setEnabled(hasTags || hasMemberships);
- propertyTable.setVisible(hasTags);
- propertyTable.getTableHeader().setVisible(hasTags);
+ tagTable.setVisible(hasTags);
+ tagTable.getTableHeader().setVisible(hasTags);
selectSth.setVisible(!hasSelection);
pluginHook.setVisible(hasSelection);
int selectedIndex;
- if (selectedTag != null && (selectedIndex = findRow(propertyData, selectedTag)) != -1) {
- propertyTable.changeSelection(selectedIndex, 0, false, false);
+ if (selectedTag != null && (selectedIndex = findRow(tagData, selectedTag)) != -1) {
+ tagTable.changeSelection(selectedIndex, 0, false, false);
} else if (selectedRelation != null && (selectedIndex = findRow(membershipData, selectedRelation)) != -1) {
membershipTable.changeSelection(selectedIndex, 0, false, false);
} else if(hasTags) {
- propertyTable.changeSelection(0, 0, false, false);
+ tagTable.changeSelection(0, 0, false, false);
} else if(hasMemberships) {
membershipTable.changeSelection(0, 0, false, false);
}
- if(propertyData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
- setTitle(tr("Properties: {0} / Memberships: {1}",
- propertyData.getRowCount(), membershipData.getRowCount()));
- } else {
- setTitle(tr("Properties / Memberships"));
- }
- }
-
- /**
- * Update selection status, call @{link #selectionChanged} function.
- */
- private void updateSelection() {
- if (Main.main.getCurrentDataSet() == null) {
- selectionChanged(Collections.<OsmPrimitive>emptyList());
+ if(tagData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
+ setTitle(tr("Tags: {0} / Memberships: {1}",
+ tagData.getRowCount(), membershipData.getRowCount()));
} else {
- selectionChanged(Main.main.getCurrentDataSet().getSelected());
+ setTitle(tr("Tags / Memberships"));
}
}
@@ -730,7 +687,13 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
/* ---------------------------------------------------------------------------------- */
@Override
public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
- updateSelection();
+ if (newLayer == null) editHelper.saveTagsIfNeeded();
+ // it is time to save history of tags
+ GuiHelper.runInEDT(new Runnable() {
+ @Override public void run() {
+ updateSelection();
+ }
+ });
}
@Override
@@ -738,6 +701,141 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
updateSelection();
}
+ // </editor-fold>
+
+ // <editor-fold defaultstate="collapsed" desc="Methods that are called by plugins to extend fuctionality ">
+
+ /**
+ * Replies the tag popup menu handler.
+ * @return The tag popup menu handler
+ */
+ public PopupMenuHandler getPropertyPopupMenuHandler() {
+ return tagMenuHandler;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Tag getSelectedProperty() {
+ int row = tagTable.getSelectedRow();
+ if (row == -1) return null;
+ TreeMap<String, Integer> map = (TreeMap<String, Integer>) tagData.getValueAt(row, 1);
+ return new Tag(
+ tagData.getValueAt(row, 0).toString(),
+ map.size() > 1 ? "" : map.keySet().iterator().next());
+ }
+
+ /**
+ * Replies the membership popup menu handler.
+ * @return The membership popup menu handler
+ */
+ public PopupMenuHandler getMembershipPopupMenuHandler() {
+ return membershipMenuHandler;
+ }
+
+ public IRelation getSelectedMembershipRelation() {
+ int row = membershipTable.getSelectedRow();
+ return row > -1 ? (IRelation) membershipData.getValueAt(row, 0) : null;
+ }
+
+ // </editor-fold>
+
+ /**
+ * Class that watches for mouse clicks
+ * @author imi
+ */
+ public class MouseClickWatch extends MouseAdapter {
+ @Override public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount() < 2)
+ {
+ // single click, clear selection in other table not clicked in
+ if (e.getSource() == tagTable) {
+ membershipTable.clearSelection();
+ } else if (e.getSource() == membershipTable) {
+ tagTable.clearSelection();
+ }
+ }
+ // double click, edit or add tag
+ else if (e.getSource() == tagTable)
+ {
+ int row = tagTable.rowAtPoint(e.getPoint());
+ if (row > -1) {
+ boolean focusOnKey = (tagTable.columnAtPoint(e.getPoint()) == 0);
+ editHelper.editTag(row, focusOnKey);
+ } else {
+ editHelper.addTag();
+ btnAdd.requestFocusInWindow();
+ }
+ } else if (e.getSource() == membershipTable) {
+ int row = membershipTable.rowAtPoint(e.getPoint());
+ if (row > -1) {
+ editMembership(row);
+ }
+ }
+ else
+ {
+ editHelper.addTag();
+ btnAdd.requestFocusInWindow();
+ }
+ }
+ @Override public void mousePressed(MouseEvent e) {
+ if (e.getSource() == tagTable) {
+ membershipTable.clearSelection();
+ } else if (e.getSource() == membershipTable) {
+ tagTable.clearSelection();
+ }
+ }
+
+ }
+
+ static class MemberInfo {
+ List<RelationMember> role = new ArrayList<RelationMember>();
+ List<Integer> position = new ArrayList<Integer>();
+ private String positionString = null;
+ void add(RelationMember r, Integer p) {
+ role.add(r);
+ position.add(p);
+ }
+ String getPositionString() {
+ if (positionString == null) {
+ Collections.sort(position);
+ positionString = String.valueOf(position.get(0));
+ int cnt = 0;
+ int last = position.get(0);
+ for (int i = 1; i < position.size(); ++i) {
+ int cur = position.get(i);
+ if (cur == last + 1) {
+ ++cnt;
+ } else if (cnt == 0) {
+ positionString += "," + cur;
+ } else {
+ positionString += "-" + last;
+ positionString += "," + cur;
+ cnt = 0;
+ }
+ last = cur;
+ }
+ if (cnt >= 1) {
+ positionString += "-" + last;
+ }
+ }
+ if (positionString.length() > 20) {
+ positionString = positionString.substring(0, 17) + "...";
+ }
+ return positionString;
+ }
+ }
+
+ /**
+ * Class that allows fast creation of read-only table model with String columns
+ */
+ public static class ReadOnlyTableModel extends DefaultTableModel {
+ @Override public boolean isCellEditable(int row, int column) {
+ return false;
+ }
+ @Override public Class<?> getColumnClass(int columnIndex) {
+ return String.class;
+ }
+ }
+
/**
* Action handling delete button press in properties dialog.
*/
@@ -745,26 +843,26 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
public DeleteAction() {
super(tr("Delete"), "dialogs/delete", tr("Delete the selected key in all objects"),
- Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_D,
+ Shortcut.registerShortcut("properties:delete", tr("Delete Tags"), KeyEvent.VK_D,
Shortcut.ALT_CTRL_SHIFT), false);
updateEnabledState();
}
- protected void deleteProperties(int[] rows){
+ protected void deleteTags(int[] rows){
// convert list of rows to HashMap (and find gap for nextKey)
HashMap<String, String> tags = new HashMap<String, String>(rows.length);
int nextKeyIndex = rows[0];
for (int row : rows) {
- String key = propertyData.getValueAt(row, 0).toString();
+ String key = tagData.getValueAt(row, 0).toString();
if (row == nextKeyIndex + 1) {
nextKeyIndex = row; // no gap yet
}
tags.put(key, null);
}
- // find key to select after deleting other properties
+ // find key to select after deleting other tags
String nextKey = null;
- int rowCount = propertyData.getRowCount();
+ int rowCount = tagData.getRowCount();
if (rowCount > rows.length) {
if (nextKeyIndex == rows[rows.length-1]) {
// no gap found, pick next or previous key in list
@@ -773,7 +871,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
// gap found
nextKeyIndex++;
}
- nextKey = (String)propertyData.getValueAt(nextKeyIndex, 0);
+ nextKey = (String)tagData.getValueAt(nextKeyIndex, 0);
}
Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
@@ -781,7 +879,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
membershipTable.clearSelection();
if (nextKey != null) {
- propertyTable.changeSelection(findRow(propertyData, nextKey), 0, false, false);
+ tagTable.changeSelection(findRow(tagData, nextKey), 0, false, false);
}
}
@@ -812,7 +910,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
Main.main.undoRedo.add(new ChangeCommand(cur, rel));
- propertyTable.clearSelection();
+ tagTable.clearSelection();
if (nextRelation != null) {
membershipTable.changeSelection(findRow(membershipData, nextRelation), 0, false, false);
}
@@ -820,20 +918,23 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
@Override
public void actionPerformed(ActionEvent e) {
- if (propertyTable.getSelectedRowCount() > 0) {
- int[] rows = propertyTable.getSelectedRows();
- deleteProperties(rows);
+ if (tagTable.getSelectedRowCount() > 0) {
+ int[] rows = tagTable.getSelectedRows();
+ deleteTags(rows);
} else if (membershipTable.getSelectedRowCount() > 0) {
- int row = membershipTable.getSelectedRow();
- deleteFromRelation(row);
+ int[] rows = membershipTable.getSelectedRows();
+ // delete from last relation to convserve row numbers in the table
+ for (int i=rows.length-1; i>=0; i--) {
+ deleteFromRelation(rows[i]);
+ }
}
}
@Override
protected void updateEnabledState() {
setEnabled(
- (propertyTable != null && propertyTable.getSelectedRowCount() >= 1)
- || (membershipTable != null && membershipTable.getSelectedRowCount() == 1)
+ (tagTable != null && tagTable.getSelectedRowCount() >= 1)
+ || (membershipTable != null && membershipTable.getSelectedRowCount() > 0)
);
}
@@ -849,13 +950,13 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
class AddAction extends JosmAction {
public AddAction() {
super(tr("Add"), "dialogs/add", tr("Add a new key/value pair to all objects"),
- Shortcut.registerShortcut("properties:add", tr("Add Property"), KeyEvent.VK_A,
+ Shortcut.registerShortcut("properties:add", tr("Add Tag"), KeyEvent.VK_A,
Shortcut.ALT), false);
}
@Override
public void actionPerformed(ActionEvent e) {
- editHelper.addProperty();
+ editHelper.addTag();
btnAdd.requestFocusInWindow();
}
}
@@ -866,7 +967,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
class EditAction extends JosmAction implements ListSelectionListener {
public EditAction() {
super(tr("Edit"), "dialogs/edit", tr("Edit the value of the selected key for all objects"),
- Shortcut.registerShortcut("properties:edit", tr("Edit Properties"), KeyEvent.VK_S,
+ Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S,
Shortcut.ALT), false);
updateEnabledState();
}
@@ -875,9 +976,9 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
- if (propertyTable.getSelectedRowCount() == 1) {
- int row = propertyTable.getSelectedRow();
- editHelper.editProperty(row, false);
+ if (tagTable.getSelectedRowCount() == 1) {
+ int row = tagTable.getSelectedRow();
+ editHelper.editTag(row, false);
} else if (membershipTable.getSelectedRowCount() == 1) {
int row = membershipTable.getSelectedRow();
editMembership(row);
@@ -887,7 +988,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
@Override
protected void updateEnabledState() {
setEnabled(
- (propertyTable != null && propertyTable.getSelectedRowCount() == 1)
+ (tagTable != null && tagTable.getSelectedRowCount() == 1)
^ (membershipTable != null && membershipTable.getSelectedRowCount() == 1)
);
}
@@ -905,17 +1006,18 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
try {
String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
String lang = LanguageInfo.getWikiLanguagePrefix();
final List<URI> uris = new ArrayList<URI>();
int row;
- if (propertyTable.getSelectedRowCount() == 1) {
- row = propertyTable.getSelectedRow();
- String key = URLEncoder.encode(propertyData.getValueAt(row, 0).toString(), "UTF-8");
+ if (tagTable.getSelectedRowCount() == 1) {
+ row = tagTable.getSelectedRow();
+ String key = URLEncoder.encode(tagData.getValueAt(row, 0).toString(), "UTF-8");
@SuppressWarnings("unchecked")
- Map<String, Integer> m = (Map<String, Integer>) propertyData.getValueAt(row, 1);
+ Map<String, Integer> m = (Map<String, Integer>) tagData.getValueAt(row, 1);
String val = URLEncoder.encode(m.entrySet().iterator().next().getKey(), "UTF-8");
uris.add(new URI(String.format("%s%sTag:%s=%s", base, lang, key, val)));
@@ -930,7 +1032,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
((Relation)membershipData.getValueAt(row, 0)).get("type"), "UTF-8"
);
- if (type != null && !type.equals("")) {
+ if (type != null && !type.isEmpty()) {
uris.add(new URI(String.format("%s%sRelation:%s", base, lang, type)));
uris.add(new URI(String.format("%sRelation:%s", base, type)));
}
@@ -944,7 +1046,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
Main.worker.execute(new Runnable(){
- public void run() {
+ @Override public void run() {
try {
// find a page that actually exists in the wiki
HttpURLConnection conn;
@@ -953,27 +1055,29 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
if (conn.getResponseCode() != 200) {
- Main.info("INFO: {0} does not exist", u);
+ Main.info("{0} does not exist", u);
conn.disconnect();
} else {
int osize = conn.getContentLength();
- conn.disconnect();
-
- conn = Utils.openHttpConnection(new URI(u.toString()
- .replace("=", "%3D") /* do not URLencode whole string! */
- .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
- ).toURL());
- conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+ if (osize > -1) {
+ conn.disconnect();
+
+ conn = Utils.openHttpConnection(new URI(u.toString()
+ .replace("=", "%3D") /* do not URLencode whole string! */
+ .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
+ ).toURL());
+ conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+ }
/* redirect pages have different content length, but retrieving a "nonredirect"
* page using index.php and the direct-link method gives slightly different
* content lengths, so we have to be fuzzy.. (this is UGLY, recode if u know better)
*/
- if (Math.abs(conn.getContentLength() - osize) > 200) {
- Main.info("INFO: {0} is a mediawiki redirect", u);
+ if (conn.getContentLength() != -1 && osize > -1 && Math.abs(conn.getContentLength() - osize) > 200) {
+ Main.info("{0} is a mediawiki redirect", u);
conn.disconnect();
} else {
- Main.info("INFO: browsing to {0}", u);
+ Main.info("browsing to {0}", u);
conn.disconnect();
OpenBrowser.displayUrl(u.toString());
@@ -992,142 +1096,6 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
}
- public void addPropertyPopupMenuSeparator() {
- propertyMenu.addSeparator();
- }
-
- public JMenuItem addPropertyPopupMenuAction(Action a) {
- return propertyMenu.add(a);
- }
-
- public void addPropertyPopupMenuListener(PopupMenuListener l) {
- propertyMenu.addPopupMenuListener(l);
- }
-
- public void removePropertyPopupMenuListener(PopupMenuListener l) {
- propertyMenu.addPopupMenuListener(l);
- }
-
- @SuppressWarnings("unchecked")
- public Tag getSelectedProperty() {
- int row = propertyTable.getSelectedRow();
- if (row == -1) return null;
- TreeMap<String, Integer> map = (TreeMap<String, Integer>) propertyData.getValueAt(row, 1);
- return new Tag(
- propertyData.getValueAt(row, 0).toString(),
- map.size() > 1 ? "" : map.keySet().iterator().next());
- }
-
- public void addMembershipPopupMenuSeparator() {
- membershipMenu.addSeparator();
- }
-
- public JMenuItem addMembershipPopupMenuAction(Action a) {
- return membershipMenu.add(a);
- }
-
- public void addMembershipPopupMenuListener(PopupMenuListener l) {
- membershipMenu.addPopupMenuListener(l);
- }
-
- public void removeMembershipPopupMenuListener(PopupMenuListener l) {
- membershipMenu.addPopupMenuListener(l);
- }
-
- public IRelation getSelectedMembershipRelation() {
- int row = membershipTable.getSelectedRow();
- return row > -1 ? (IRelation) membershipData.getValueAt(row, 0) : null;
- }
-
- public static interface RelationRelated {
- public Relation getRelation();
- public void setRelation(Relation relation);
- }
-
- static abstract class AbstractRelationAction extends AbstractAction implements RelationRelated {
- protected Relation relation;
- public Relation getRelation() {
- return this.relation;
- }
- public void setRelation(Relation relation) {
- this.relation = relation;
- }
- }
-
- static class SelectRelationAction extends AbstractRelationAction {
- boolean selectionmode;
- public SelectRelationAction(boolean select) {
- selectionmode = select;
- if(select) {
- putValue(NAME, tr("Select relation"));
- putValue(SHORT_DESCRIPTION, tr("Select relation in main selection."));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
- } else {
- putValue(NAME, tr("Select in relation list"));
- putValue(SHORT_DESCRIPTION, tr("Select relation in relation list."));
- putValue(SMALL_ICON, ImageProvider.get("dialogs", "relationlist"));
- }
- }
-
- public void actionPerformed(ActionEvent e) {
- if(selectionmode) {
- Main.map.mapView.getEditLayer().data.setSelected(relation);
- } else {
- Main.map.relationListDialog.selectRelation(relation);
- Main.map.relationListDialog.unfurlDialog();
- }
- }
- }
-
-
- /**
- * Sets the current selection to the members of selected relation
- *
- */
- class SelectRelationMembersAction extends AbstractRelationAction {
- public SelectRelationMembersAction() {
- putValue(SHORT_DESCRIPTION,tr("Select the members of selected relation"));
- putValue(SMALL_ICON, ImageProvider.get("selectall"));
- putValue(NAME, tr("Select members"));
- }
-
- public void actionPerformed(ActionEvent e) {
- HashSet<OsmPrimitive> members = new HashSet<OsmPrimitive>();
- members.addAll(relation.getMemberPrimitives());
- Main.map.mapView.getEditLayer().data.setSelected(members);
- }
-
- }
-
- /**
- * Action for downloading incomplete members of selected relation
- *
- */
- class DownloadIncompleteMembersAction extends AbstractRelationAction {
- public DownloadIncompleteMembersAction() {
- putValue(SHORT_DESCRIPTION, tr("Download incomplete members of selected relations"));
- putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
- putValue(NAME, tr("Download incomplete members"));
- }
-
- public Set<OsmPrimitive> buildSetOfIncompleteMembers(Relation r) {
- Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
- ret.addAll(r.getIncompleteMembers());
- return ret;
- }
-
- public void actionPerformed(ActionEvent e) {
- if (!relation.hasIncompleteMembers()) return;
- ArrayList<Relation> rels = new ArrayList<Relation>();
- rels.add(relation);
- Main.worker.submit(new DownloadRelationMemberTask(
- rels,
- buildSetOfIncompleteMembers(relation),
- Main.map.mapView.getEditLayer()
- ));
- }
- }
-
class PasteValueAction extends AbstractAction {
public PasteValueAction() {
putValue(NAME, tr("Paste Value"));
@@ -1136,14 +1104,14 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
@Override
public void actionPerformed(ActionEvent ae) {
- if (propertyTable.getSelectedRowCount() != 1)
+ if (tagTable.getSelectedRowCount() != 1)
return;
- String key = propertyData.getValueAt(propertyTable.getSelectedRow(), 0).toString();
+ String key = tagData.getValueAt(tagTable.getSelectedRow(), 0).toString();
Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
- String value = Utils.getClipboardContent().trim();
- if (sel.isEmpty())
+ String clipboard = Utils.getClipboardContent();
+ if (sel.isEmpty() || clipboard == null)
return;
- Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
+ Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));
}
}
@@ -1153,20 +1121,25 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
@Override
public void actionPerformed(ActionEvent ae) {
- if (propertyTable.getSelectedRowCount() != 1)
- return;
- String key = propertyData.getValueAt(propertyTable.getSelectedRow(), 0).toString();
- Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
- if (sel.isEmpty())
- return;
+ int[] rows = tagTable.getSelectedRows();
Set<String> values = new TreeSet<String>();
- for (OsmPrimitive p : sel) {
- Collection<String> s = getString(p,key);
- if (s != null) {
- values.addAll(s);
+ Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+ if (rows.length == 0 || sel.isEmpty()) return;
+
+ for (int row: rows) {
+ String key = tagData.getValueAt(row, 0).toString();
+ if (sel.isEmpty())
+ return;
+ for (OsmPrimitive p : sel) {
+ Collection<String> s = getString(p,key);
+ if (s != null) {
+ values.addAll(s);
+ }
}
}
- Utils.copyToClipboard(Utils.join("\n", values));
+ if (!values.isEmpty()) {
+ Utils.copyToClipboard(Utils.join("\n", values));
+ }
}
}
@@ -1229,15 +1202,16 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
- if (propertyTable.getSelectedRowCount() != 1)
+ if (tagTable.getSelectedRowCount() != 1)
return;
- String key = propertyData.getValueAt(propertyTable.getSelectedRow(), 0).toString();
+ String key = tagData.getValueAt(tagTable.getSelectedRow(), 0).toString();
Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
if (sel.isEmpty())
return;
String sep = "";
- String s = "";
+ StringBuilder s = new StringBuilder();
for (OsmPrimitive p : sel) {
String val = p.get(key);
if (val == null) {
@@ -1253,26 +1227,22 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
} else if (p instanceof Relation) {
t = "type:relation ";
}
- s += sep + "(" + t + "\"" +
- org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(key) + "\"=\"" +
- org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(val) + "\")";
+ s.append(sep).append("(").append(t).append("\"").append(
+ org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(key)).append("\"=\"").append(
+ org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(val)).append("\")");
sep = " OR ";
}
- SearchSetting ss = new SearchSetting(s, SearchMode.replace, true, false, false);
+ SearchSetting ss = new SearchSetting(s.toString(), SearchMode.replace, true, false, false);
org.openstreetmap.josm.actions.search.SearchAction.searchWithoutHistory(ss);
}
}
@Override
- public void destroy() {
- super.destroy();
- for (JosmAction action : josmActions) {
- action.destroy();
- }
- Container parent = pluginHook.getParent();
- if (parent != null) {
- parent.remove(pluginHook);
+ public void preferenceChanged(PreferenceChangeEvent e) {
+ if ("display.discardable-keys".equals(e.getKey()) && Main.main.getCurrentDataSet() != null) {
+ // Re-load data when display preference change
+ selectionChanged(Main.main.getCurrentDataSet().getSelected());
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index fa5824c..7e57839 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -37,11 +37,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.DefaultListCellRenderer;
import javax.swing.ImageIcon;
@@ -49,7 +47,6 @@ import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JList;
-import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
@@ -70,6 +67,7 @@ import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
@@ -78,14 +76,13 @@ import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.io.XmlWriter;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
/**
* Class that helps PropertiesDialog add and edit tag values
*/
class TagEditHelper {
- private final DefaultTableModel propertyData;
+ private final DefaultTableModel tagData;
private final Map<String, Map<String, Integer>> valueCount;
// Selection that we are editing by using both dialogs
@@ -95,6 +92,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
private String objKey;
Comparator<AutoCompletionListItem> defaultACItemComparator = new Comparator<AutoCompletionListItem>() {
+ @Override
public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) {
return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue());
}
@@ -115,7 +113,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
};
TagEditHelper(DefaultTableModel propertyData, Map<String, Map<String, Integer>> valueCount) {
- this.propertyData = propertyData;
+ this.tagData = propertyData;
this.valueCount = valueCount;
}
@@ -123,7 +121,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
* Open the add selection dialog and add a new key/value to the table (and
* to the dataset, of course).
*/
- public void addProperty() {
+ public void addTag() {
changedKey = null;
if (Main.map.mapMode instanceof DrawAction) {
sel = ((DrawAction) Main.map.mapMode).getInProgressSelection();
@@ -146,25 +144,27 @@ import org.openstreetmap.josm.tools.WindowGeometry;
}
/**
- * Edit the value in the properties table row
+ * Edit the value in the tags table row
* @param row The row of the table from which the value is edited.
* @param focusOnKey Determines if the initial focus should be set on key instead of value
* @since 5653
*/
- public void editProperty(final int row, boolean focusOnKey) {
+ public void editTag(final int row, boolean focusOnKey) {
changedKey = null;
sel = Main.main.getCurrentDataSet().getSelected();
if (sel.isEmpty()) return;
- String key = propertyData.getValueAt(row, 0).toString();
+ String key = tagData.getValueAt(row, 0).toString();
objKey=key;
+ @SuppressWarnings("unchecked")
final EditTagDialog editDialog = new EditTagDialog(key, row,
- (Map<String, Integer>) propertyData.getValueAt(row, 1), focusOnKey);
+ (Map<String, Integer>) tagData.getValueAt(row, 1), focusOnKey);
editDialog.showDialog();
if (editDialog.getValue() !=1 ) return;
editDialog.performTagEdit();
}
+
/**
* If during last editProperty call user changed the key name, this key will be returned
* Elsewhere, returns null.
@@ -190,7 +190,38 @@ import org.openstreetmap.josm.tools.WindowGeometry;
return Arrays.asList(key);
}
- public class EditTagDialog extends AbstractTagsDialog {
+ /**
+ * Load recently used tags from preferences if needed
+ */
+ public void loadTagsIfNeeded() {
+ if (PROPERTY_REMEMBER_TAGS.get() && recentTags.isEmpty()) {
+ recentTags.clear();
+ Collection<String> c = Main.pref.getCollection("properties.recent-tags");
+ Iterator<String> it = c.iterator();
+ String key, value;
+ while (it.hasNext()) {
+ key = it.next();
+ value = it.next();
+ recentTags.put(new Tag(key, value), null);
+ }
+ }
+ }
+
+ /**
+ * Store recently used tags in preferences if needed
+ */
+ public void saveTagsIfNeeded() {
+ if (PROPERTY_REMEMBER_TAGS.get() && !recentTags.isEmpty()) {
+ List<String> c = new ArrayList<String>( recentTags.size()*2 );
+ for (Tag t: recentTags.keySet()) {
+ c.add(t.getKey());
+ c.add(t.getValue());
+ }
+ Main.pref.putCollection("properties.recent-tags", c);
+ }
+ }
+
+ public final class EditTagDialog extends AbstractTagsDialog {
final String key;
final Map<String, Integer> m;
final int row;
@@ -280,6 +311,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
p.add(Box.createHorizontalStrut(10), GBC.std());
p.add(values, GBC.eol().fill(GBC.HORIZONTAL));
values.getEditor().addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
buttonAction(0, null); // emulate OK button click
}
@@ -309,12 +341,12 @@ import org.openstreetmap.josm.tools.WindowGeometry;
String value = values.getEditor().getItem().toString().trim();
// is not Java 1.5
//value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
- if (value.equals("")) {
+ if (value.isEmpty()) {
value = null; // delete the key
}
String newkey = keys.getEditor().getItem().toString().trim();
//newkey = java.text.Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC);
- if (newkey.equals("")) {
+ if (newkey.isEmpty()) {
newkey = key;
value = null; // delete the key instead
}
@@ -341,24 +373,23 @@ import org.openstreetmap.josm.tools.WindowGeometry;
break;
}
}
- Collection<Command> commands=new Vector<Command>();
+ Collection<Command> commands = new ArrayList<Command>();
commands.add(new ChangePropertyCommand(sel, key, null));
if (value.equals(tr("<different>"))) {
- HashMap<String, Vector<OsmPrimitive>> map=new HashMap<String, Vector<OsmPrimitive>>();
+ Map<String, List<OsmPrimitive>> map = new HashMap<String, List<OsmPrimitive>>();
for (OsmPrimitive osm: sel) {
- String val=osm.get(key);
- if(val != null)
- {
+ String val = osm.get(key);
+ if (val != null) {
if (map.containsKey(val)) {
map.get(val).add(osm);
} else {
- Vector<OsmPrimitive> v = new Vector<OsmPrimitive>();
+ List<OsmPrimitive> v = new ArrayList<OsmPrimitive>();
v.add(osm);
map.put(val, v);
}
}
}
- for (Map.Entry<String, Vector<OsmPrimitive>> e: map.entrySet()) {
+ for (Map.Entry<String, List<OsmPrimitive>> e: map.entrySet()) {
commands.add(new ChangePropertyCommand(e.getValue(), newkey, e.getKey()));
}
} else {
@@ -375,6 +406,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
}
public static final BooleanProperty PROPERTY_FIX_TAG_LOCALE = new BooleanProperty("properties.fix-tag-combobox-locale", false);
+ public static final BooleanProperty PROPERTY_REMEMBER_TAGS = new BooleanProperty("properties.remember-recently-added-tags", false);
public static final IntegerProperty PROPERTY_RECENT_TAGS_NUMBER = new IntegerProperty("properties.recently-added-tags", DEFAULT_LRU_TAGS_NUMBER);
abstract class AbstractTagsDialog extends ExtendedDialog {
@@ -437,8 +469,6 @@ import org.openstreetmap.josm.tools.WindowGeometry;
/**
* Create a focus handling adapter and apply in to the editor component of value
* autocompletion box.
- * @param keys Box for keys entering and autocompletion
- * @param values Box for values entering and autocompletion
* @param autocomplete Manager handling the autocompletion
* @param comparator Class to decide what values are offered on autocompletion
* @return The created adapter
@@ -466,37 +496,17 @@ import org.openstreetmap.josm.tools.WindowGeometry;
protected JPopupMenu popupMenu = new JPopupMenu() {
JCheckBoxMenuItem fixTagLanguageCb = new JCheckBoxMenuItem(
new AbstractAction(tr("Use English language for tag by default")){
+ @Override
public void actionPerformed(ActionEvent e) {
boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
PROPERTY_FIX_TAG_LOCALE.put(sel);
}
});
- JMenuItem pasteK = new JMenuItem(
- new AbstractAction(tr("Paste tag")){
- public void actionPerformed(ActionEvent e) {
- String buf = Utils.getClipboardContent().trim();
- if (buf.isEmpty()) return;
- keys.setSelectedItem(buf);
- }
- });
- JMenuItem pasteV = new JMenuItem(
- new AbstractAction(tr("Paste value")){
- public void actionPerformed(ActionEvent e) {
- String buf = Utils.getClipboardContent().trim();
- if (buf.isEmpty()) return;
- values.setSelectedItem(buf);
- }
- });
-
{
- add(pasteK);
- add(pasteV);
- addSeparator();
add(fixTagLanguageCb);
fixTagLanguageCb.setState(PROPERTY_FIX_TAG_LOCALE.get());
}
};
-
}
class AddTagsDialog extends AbstractTagsDialog {
@@ -530,8 +540,8 @@ import org.openstreetmap.josm.tools.WindowGeometry;
if (item.getValue().equals(lastAddKey)) {
itemToSelect = item;
}
- for (int i = 0; i < propertyData.getRowCount(); ++i) {
- if (item.getValue().equals(propertyData.getValueAt(i, 0))) {
+ for (int i = 0; i < tagData.getRowCount(); ++i) {
+ if (item.getValue().equals(tagData.getValueAt(i, 0))) {
if (itemToSelect == item) {
itemToSelect = null;
}
@@ -584,10 +594,22 @@ import org.openstreetmap.josm.tools.WindowGeometry;
selectKeysComboBox();
popupMenu.add(new AbstractAction(tr("Set number of recently added tags")) {
+ @Override
public void actionPerformed(ActionEvent e) {
selectNumberOfTags();
}
});
+ JCheckBoxMenuItem rememberLastTags = new JCheckBoxMenuItem(
+ new AbstractAction(tr("Remember last used tags")){
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
+ PROPERTY_REMEMBER_TAGS.put(sel);
+ if (sel) saveTagsIfNeeded();
+ }
+ });
+ rememberLastTags.setState(PROPERTY_REMEMBER_TAGS.get());
+ popupMenu.add(rememberLastTags);
}
private void selectNumberOfTags() {
@@ -598,7 +620,9 @@ import org.openstreetmap.josm.tools.WindowGeometry;
PROPERTY_RECENT_TAGS_NUMBER.put(v);
return;
}
- } catch (NumberFormatException ex) { }
+ } catch (NumberFormatException ex) {
+ Main.warn(ex);
+ }
JOptionPane.showMessageDialog(this, tr("Please enter integer number between 0 and {0}", MAX_LRU_TAGS_NUMBER));
}
@@ -619,7 +643,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
// Create action for reusing the tag, with keyboard shortcut Ctrl+(1-5)
String actionShortcutKey = "properties:recent:"+count;
String actionShortcutShiftKey = "properties:recent:shift:"+count;
- Shortcut sc = Shortcut.registerShortcut(actionShortcutKey, null, KeyEvent.VK_0+count, Shortcut.CTRL);
+ Shortcut sc = Shortcut.registerShortcut(actionShortcutKey, tr("Choose recent tag {0}", count), KeyEvent.VK_0+count, Shortcut.CTRL);
final JosmAction action = new JosmAction(actionShortcutKey, null, tr("Use this tag again"), sc, false) {
@Override
public void actionPerformed(ActionEvent e) {
@@ -631,7 +655,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
selectValuesCombobox();
}
};
- Shortcut scShift = Shortcut.registerShortcut(actionShortcutShiftKey, null, KeyEvent.VK_0+count, Shortcut.CTRL_SHIFT);
+ Shortcut scShift = Shortcut.registerShortcut(actionShortcutShiftKey, tr("Apply recent tag {0}", count), KeyEvent.VK_0+count, Shortcut.CTRL_SHIFT);
final JosmAction actionShift = new JosmAction(actionShortcutShiftKey, null, tr("Use this tag again"), scShift, false) {
@Override
public void actionPerformed(ActionEvent e) {
@@ -646,7 +670,19 @@ import org.openstreetmap.josm.tools.WindowGeometry;
// Find and display icon
ImageIcon icon = MapPaintStyles.getNodeIcon(t, false); // Filters deprecated icon
if (icon == null) {
- icon = new ImageIcon(new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB));
+ // If no icon found in map style look at presets
+ Map<String, String> map = new HashMap<String, String>();
+ map.put(t.getKey(), t.getValue());
+ for (TaggingPreset tp : TaggingPreset.getMatchingPresets(null, map, false)) {
+ icon = tp.getIcon();
+ if (icon != null) {
+ break;
+ }
+ }
+ // If still nothing display an empty icon
+ if (icon == null) {
+ icon = new ImageIcon(new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB));
+ }
}
GridBagConstraints gbc = new GridBagConstraints();
gbc.ipadx = 5;
@@ -671,7 +707,6 @@ import org.openstreetmap.josm.tools.WindowGeometry;
action.actionPerformed(null);
// add tags and close window on double-click
if (e.getClickCount()>1) {
- performTagAdding();
buttonAction(0, null); // emulate OK click and close the dialog
}
// add tags on Shift-Click
@@ -700,7 +735,6 @@ import org.openstreetmap.josm.tools.WindowGeometry;
}
}
-
/**
* Read tags from comboboxes and add it to all selected objects
*/
@@ -725,8 +759,8 @@ import org.openstreetmap.josm.tools.WindowGeometry;
private void disableTagIfNeeded(final Tag t, final JosmAction action) {
// Disable action if its key is already set on the object (the key being absent from the keys list for this reason
// performing this action leads to autocomplete to the next key (see #7671 comments)
- for (int j = 0; j < propertyData.getRowCount(); ++j) {
- if (t.getKey().equals(propertyData.getValueAt(j, 0))) {
+ for (int j = 0; j < tagData.getRowCount(); ++j) {
+ if (t.getKey().equals(tagData.getValueAt(j, 0))) {
action.setEnabled(false);
break;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
index 31562af..10a184f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
@@ -199,12 +199,14 @@ public class ChildRelationBrowser extends JPanel {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
run();
}
+ @Override
public void valueChanged(TreeSelectionEvent e) {
refreshEnabled();
}
@@ -225,6 +227,7 @@ public class ChildRelationBrowser extends JPanel {
Main.worker.submit(new DownloadAllChildrenTask(getParentDialog(), (Relation)model.getRoot()));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -261,12 +264,14 @@ public class ChildRelationBrowser extends JPanel {
Main.worker.submit(new DownloadRelationSetTask(getParentDialog(),relations));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
run();
}
+ @Override
public void valueChanged(TreeSelectionEvent e) {
updateEnabledState();
}
@@ -414,15 +419,15 @@ public class ChildRelationBrowser extends JPanel {
mergeDataSet(dataSet);
refreshView(r);
}
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- Main.map.repaint();
- }
- });
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ Main.map.repaint();
+ }
+ });
} catch (Exception e) {
if (canceled) {
- System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
- .toString()));
+ Main.warn(tr("Ignoring exception because task was canceled. Exception: {0}", e.toString()));
return;
}
lastException = e;
@@ -514,8 +519,7 @@ public class ChildRelationBrowser extends JPanel {
}
} catch (Exception e) {
if (canceled) {
- System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
- .toString()));
+ Main.warn(tr("Ignoring exception because task was canceled. Exception: {0}", e.toString()));
return;
}
lastException = e;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java b/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java
index 0c1ad81..5f654bb 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java
@@ -90,7 +90,7 @@ public class DownloadRelationMemberTask extends PleaseWaitRunnable {
}
protected String buildDownloadFeedbackMessage() {
- if (parents.size() == 0) {
+ if (parents.isEmpty()) {
return trn("Downloading {0} incomplete object",
"Downloading {0} incomplete objects",
children.size(),
@@ -134,6 +134,7 @@ public class DownloadRelationMemberTask extends PleaseWaitRunnable {
SwingUtilities.invokeLater(
new Runnable() {
+ @Override
public void run() {
curLayer.mergeFrom(dataSet);
curLayer.onPostDownloadFromServer();
@@ -143,8 +144,7 @@ public class DownloadRelationMemberTask extends PleaseWaitRunnable {
} catch (Exception e) {
if (canceled) {
- System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
- .toString()));
+ Main.warn(tr("Ignoring exception because task was canceled. Exception: {0}", e.toString()));
return;
}
lastException = e;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java b/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java
index ec140ec..e907261 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java
@@ -97,6 +97,7 @@ public class DownloadRelationTask extends PleaseWaitRunnable {
SwingUtilities.invokeAndWait(
new Runnable() {
+ @Override
public void run() {
layer.mergeFrom(allDownloads);
layer.onPostDownloadFromServer();
@@ -106,8 +107,7 @@ public class DownloadRelationTask extends PleaseWaitRunnable {
);
} catch (Exception e) {
if (canceled) {
- System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e
- .toString()));
+ Main.warn(tr("Ignoring exception because task was canceled. Exception: {0}", e.toString()));
return;
}
lastException = e;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index a06a0d6..a3979ec 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -13,6 +13,7 @@ import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
+import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -23,11 +24,9 @@ import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.EnumSet;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.swing.AbstractAction;
@@ -57,7 +56,6 @@ import javax.swing.event.TableModelListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.CopyAction;
import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.PasteTagsAction.TagPaster;
import org.openstreetmap.josm.command.AddCommand;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.Command;
@@ -80,7 +78,8 @@ import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
-import org.openstreetmap.josm.gui.tagging.TagModel;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -132,7 +131,7 @@ public class GenericRelationEditor extends RelationEditor {
@Override
public void updateTags(List<Tag> tags) {
- GenericRelationEditor.this.updateTags(tags);
+ tagEditorPanel.getModel().updateTags(tags);
}
@Override
@@ -180,11 +179,12 @@ public class GenericRelationEditor extends RelationEditor {
getContentPane().setLayout(new BorderLayout());
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(tr("Tags and Members"), pnl);
- referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel, this);
+ referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel);
tabbedPane.add(tr("Parent Relations"), referrerBrowser);
tabbedPane.add(tr("Child Relations"), new ChildRelationBrowser(getLayer(), relation));
tabbedPane.addChangeListener(
new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
JTabbedPane sourceTabbedPane = (JTabbedPane) e.getSource();
int index = sourceTabbedPane.getSelectedIndex();
@@ -210,7 +210,14 @@ public class GenericRelationEditor extends RelationEditor {
}
}
);
-
+ registerCopyPasteAction(tagEditorPanel.getPasteAction(),
+ "PASTE_TAGS",
+ Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke());
+ registerCopyPasteAction(new PasteMembersAction(), "PASTE_MEMBERS", Shortcut.getPasteKeyStroke());
+ registerCopyPasteAction(new CopyMembersAction(), "COPY_MEMBERS", Shortcut.getCopyKeyStroke());
+
+ tagEditorPanel.setNextFocusComponent(memberTable);
+ selectionTable.setFocusable(false);
memberTableModel.setSelectedMembers(selectedMembers);
HelpUtil.setHelpContext(getRootPane(),ht("/Dialog/RelationEditor"));
}
@@ -352,6 +359,7 @@ public class GenericRelationEditor extends RelationEditor {
tfRole.addActionListener(setRoleAction);
memberTableModel.getSelectionModel().addListSelectionListener(
new ListSelectionListener() {
+ @Override
public void valueChanged(ListSelectionEvent e) {
tfRole.setEnabled(memberTable.getSelectedRowCount() > 0);
}
@@ -418,17 +426,13 @@ public class GenericRelationEditor extends RelationEditor {
pnl3.setLayout(new BorderLayout());
pnl3.add(splitPane, BorderLayout.CENTER);
- new PasteMembersAction();
- new CopyMembersAction();
- new PasteTagsAction();
-
return pnl3;
}
/**
* builds the panel with the table displaying the currently selected primitives
*
- * @return
+ * @return panel with current selection
*/
protected JPanel buildSelectionTablePanel() {
JPanel pnl = new JPanel();
@@ -465,7 +469,7 @@ public class GenericRelationEditor extends RelationEditor {
/**
* build the panel with the buttons on the left
*
- * @return
+ * @return left button panel
*/
protected JToolBar buildLeftButtonPanel() {
JToolBar tb = new JToolBar();
@@ -483,20 +487,20 @@ public class GenericRelationEditor extends RelationEditor {
memberTableModel.getSelectionModel().addListSelectionListener(moveDownAction);
tb.add(moveDownAction);
memberTable.getActionMap().put("moveDown", moveDownAction);
-
+
tb.addSeparator();
// -- edit action
EditAction editAction = new EditAction();
memberTableModel.getSelectionModel().addListSelectionListener(editAction);
tb.add(editAction);
-
+
// -- delete action
RemoveAction removeSelectedAction = new RemoveAction();
memberTable.getSelectionModel().addListSelectionListener(removeSelectedAction);
tb.add(removeSelectedAction);
memberTable.getActionMap().put("removeSelected", removeSelectedAction);
-
+
tb.addSeparator();
// -- sort action
SortAction sortAction = new SortAction();
@@ -527,14 +531,14 @@ public class GenericRelationEditor extends RelationEditor {
inputMap.put((KeyStroke) moveUpAction.getValue(AbstractAction.ACCELERATOR_KEY),"moveUp");
inputMap.put((KeyStroke) moveDownAction.getValue(AbstractAction.ACCELERATOR_KEY),"moveDown");
inputMap.put((KeyStroke) downloadIncompleteMembersAction.getValue(AbstractAction.ACCELERATOR_KEY),"downloadIncomplete");
-
+
return tb;
}
/**
* build the panel with the buttons for adding or removing the current selection
*
- * @return
+ * @return control buttons panel for selection/members
*/
protected JToolBar buildSelectionControlButtonPanel() {
JToolBar tb = new JToolBar(JToolBar.VERTICAL);
@@ -601,9 +605,11 @@ public class GenericRelationEditor extends RelationEditor {
if(windowMenuItem == null) {
addToWindowMenu();
}
+ tagEditorPanel.requestFocusInWindow();
} else {
// make sure all registered listeners are unregistered
//
+ memberTable.stopHighlighting();
selectionTableModel.unregister();
memberTableModel.unregister();
memberTable.unlinkAsListener();
@@ -639,7 +645,7 @@ public class GenericRelationEditor extends RelationEditor {
*
*/
protected void cleanSelfReferences() {
- ArrayList<OsmPrimitive> toCheck = new ArrayList<OsmPrimitive>();
+ List<OsmPrimitive> toCheck = new ArrayList<OsmPrimitive>();
toCheck.add(getRelation());
if (memberTableModel.hasMembersReferringTo(toCheck)) {
int ret = ConditionalOptionPaneUtil.showOptionDialog(
@@ -666,7 +672,14 @@ public class GenericRelationEditor extends RelationEditor {
}
}
+
private void registerCopyPasteAction(AbstractAction action, Object actionName, KeyStroke shortcut) {
+ int mods = shortcut.getModifiers();
+ int code = shortcut.getKeyCode();
+ if (code!=KeyEvent.VK_INSERT && (mods == 0 || mods == InputEvent.SHIFT_DOWN_MASK)) {
+ Main.info(tr("Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"), shortcut);
+ return;
+ }
getRootPane().getActionMap().put(actionName, action);
getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName);
// Assign also to JTables because they have their own Copy&Paste implementation (which is disabled in this case but eats key shortcuts anyway)
@@ -678,34 +691,6 @@ public class GenericRelationEditor extends RelationEditor {
selectionTable.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortcut, actionName);
}
- protected void updateTags(List<Tag> tags) {
-
- if (tags.isEmpty())
- return;
-
- Map<String, TagModel> modelTags = new HashMap<String, TagModel>();
- for (int i=0; i<tagEditorPanel.getModel().getRowCount(); i++) {
- TagModel tagModel = tagEditorPanel.getModel().get(i);
- modelTags.put(tagModel.getName(), tagModel);
- }
- for (Tag tag: tags) {
- TagModel existing = modelTags.get(tag.getKey());
-
- if (tag.getValue().isEmpty()) {
- if (existing != null) {
- tagEditorPanel.getModel().delete(tag.getKey());
- }
- } else {
- if (existing != null) {
- tagEditorPanel.getModel().updateTagValue(existing, tag.getValue());
- } else {
- tagEditorPanel.getModel().add(tag.getKey(), tag.getValue());
- }
- }
-
- }
- }
-
static class AddAbortException extends Exception {
}
@@ -752,6 +737,7 @@ public class GenericRelationEditor extends RelationEditor {
public static Command addPrimitivesToRelation(final Relation orig, Collection<? extends OsmPrimitive> primitivesToAdd) {
try {
+ final Collection<TaggingPreset> presets = TaggingPreset.getMatchingPresets(EnumSet.of(TaggingPresetType.RELATION), orig.getKeys(), false);
Relation relation = new Relation(orig);
boolean modified = false;
for (OsmPrimitive p : primitivesToAdd) {
@@ -762,7 +748,8 @@ public class GenericRelationEditor extends RelationEditor {
&& !confirmAddingPrimitive(p)) {
continue;
}
- relation.addMember(new RelationMember("", p));
+ final String role = presets.isEmpty() ? null : presets.iterator().next().suggestRoleForOsmPrimitive(p);
+ relation.addMember(new RelationMember(role == null ? "" : role, p));
modified = true;
}
return modified ? new ChangeCommand(orig, relation) : null;
@@ -779,15 +766,13 @@ public class GenericRelationEditor extends RelationEditor {
protected List<OsmPrimitive> filterConfirmedPrimitives(List<OsmPrimitive> primitives) throws AddAbortException {
if (primitives == null || primitives.isEmpty())
return primitives;
- ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
- Iterator<OsmPrimitive> it = primitives.iterator();
- while(it.hasNext()) {
- OsmPrimitive primitive = it.next();
+ List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
+ for (OsmPrimitive primitive : primitives) {
if (primitive instanceof Relation && getRelation() != null && getRelation().equals(primitive)) {
warnOfCircularReferences(primitive);
continue;
}
- if (isPotentialDuplicate(primitive)) {
+ if (isPotentialDuplicate(primitive)) {
if (confirmAddingPrimitive(primitive)) {
ret.add(primitive);
}
@@ -805,7 +790,6 @@ public class GenericRelationEditor extends RelationEditor {
putValue(SHORT_DESCRIPTION,
tr("Add all objects selected in the current dataset before the first member"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copystartright"));
- // putValue(NAME, tr("Add Selected"));
refreshEnabled();
}
@@ -813,6 +797,7 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(selectionTableModel.getRowCount() > 0);
}
+ @Override
public void actionPerformed(ActionEvent e) {
try {
List<OsmPrimitive> toAdd = filterConfirmedPrimitives(selectionTableModel.getSelection());
@@ -822,6 +807,7 @@ public class GenericRelationEditor extends RelationEditor {
}
}
+ @Override
public void tableChanged(TableModelEvent e) {
refreshEnabled();
}
@@ -831,7 +817,6 @@ public class GenericRelationEditor extends RelationEditor {
public AddSelectedAtEndAction() {
putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright"));
- // putValue(NAME, tr("Add Selected"));
refreshEnabled();
}
@@ -839,6 +824,7 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(selectionTableModel.getRowCount() > 0);
}
+ @Override
public void actionPerformed(ActionEvent e) {
try {
List<OsmPrimitive> toAdd = filterConfirmedPrimitives(selectionTableModel.getSelection());
@@ -848,6 +834,7 @@ public class GenericRelationEditor extends RelationEditor {
}
}
+ @Override
public void tableChanged(TableModelEvent e) {
refreshEnabled();
}
@@ -858,7 +845,6 @@ public class GenericRelationEditor extends RelationEditor {
putValue(SHORT_DESCRIPTION,
tr("Add all objects selected in the current dataset before the first selected member"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copybeforecurrentright"));
- // putValue(NAME, tr("Add Selected"));
refreshEnabled();
}
@@ -867,6 +853,7 @@ public class GenericRelationEditor extends RelationEditor {
&& memberTableModel.getSelectionModel().getMinSelectionIndex() >= 0);
}
+ @Override
public void actionPerformed(ActionEvent e) {
try {
List<OsmPrimitive> toAdd = filterConfirmedPrimitives(selectionTableModel.getSelection());
@@ -878,10 +865,12 @@ public class GenericRelationEditor extends RelationEditor {
}
+ @Override
public void tableChanged(TableModelEvent e) {
refreshEnabled();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
refreshEnabled();
}
@@ -892,7 +881,6 @@ public class GenericRelationEditor extends RelationEditor {
putValue(SHORT_DESCRIPTION,
tr("Add all objects selected in the current dataset after the last selected member"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyaftercurrentright"));
- // putValue(NAME, tr("Add Selected"));
refreshEnabled();
}
@@ -901,6 +889,7 @@ public class GenericRelationEditor extends RelationEditor {
&& memberTableModel.getSelectionModel().getMinSelectionIndex() >= 0);
}
+ @Override
public void actionPerformed(ActionEvent e) {
try {
List<OsmPrimitive> toAdd = filterConfirmedPrimitives(selectionTableModel.getSelection());
@@ -911,10 +900,12 @@ public class GenericRelationEditor extends RelationEditor {
}
}
+ @Override
public void tableChanged(TableModelEvent e) {
refreshEnabled();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
refreshEnabled();
}
@@ -924,7 +915,6 @@ public class GenericRelationEditor extends RelationEditor {
public RemoveSelectedAction() {
putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects"));
putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers"));
- // putValue(NAME, tr("Remove Selected"));
updateEnabledState();
}
@@ -940,10 +930,12 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(memberTableModel.hasMembersReferringTo(ds.getSelected()));
}
+ @Override
public void actionPerformed(ActionEvent e) {
memberTableModel.removeMembersReferringTo(selectionTableModel.getSelection());
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateEnabledState();
}
@@ -973,10 +965,12 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(enabled);
}
+ @Override
public void actionPerformed(ActionEvent e) {
memberTableModel.selectMembersReferringTo(getLayer().data.getSelected());
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateEnabledState();
@@ -999,10 +993,12 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(memberTable.getSelectedRowCount() > 0);
}
+ @Override
public void actionPerformed(ActionEvent e) {
getLayer().data.setSelected(memberTableModel.getSelectedChildPrimitives());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -1020,6 +1016,7 @@ public class GenericRelationEditor extends RelationEditor {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
memberTableModel.sort();
}
@@ -1028,6 +1025,7 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(memberTableModel.getRowCount() > 0);
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateEnabledState();
}
@@ -1043,6 +1041,7 @@ public class GenericRelationEditor extends RelationEditor {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
memberTableModel.reverse();
}
@@ -1051,6 +1050,7 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(memberTableModel.getRowCount() > 0);
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateEnabledState();
}
@@ -1060,7 +1060,6 @@ public class GenericRelationEditor extends RelationEditor {
public MoveUpAction() {
String tooltip = tr("Move the currently selected members up");
putValue(SMALL_ICON, ImageProvider.get("dialogs", "moveup"));
- // putValue(NAME, tr("Move Up"));
Shortcut sc = Shortcut.registerShortcut("relationeditor:moveup", tr("Relation Editor: Move Up"),
KeyEvent.VK_UP, Shortcut.ALT);
sc.setAccelerator(this);
@@ -1068,10 +1067,12 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
memberTableModel.moveUp(memberTable.getSelectedRows());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(memberTableModel.canMoveUp(memberTable.getSelectedRows()));
}
@@ -1081,7 +1082,6 @@ public class GenericRelationEditor extends RelationEditor {
public MoveDownAction() {
String tooltip = tr("Move the currently selected members down");
putValue(SMALL_ICON, ImageProvider.get("dialogs", "movedown"));
- // putValue(NAME, tr("Move Down"));
Shortcut sc = Shortcut.registerShortcut("relationeditor:movedown", tr("Relation Editor: Move Down"),
KeyEvent.VK_DOWN, Shortcut.ALT);
sc.setAccelerator(this);
@@ -1089,10 +1089,12 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
memberTableModel.moveDown(memberTable.getSelectedRows());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(memberTableModel.canMoveDown(memberTable.getSelectedRows()));
}
@@ -1110,10 +1112,12 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
memberTableModel.remove(memberTable.getSelectedRows());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
setEnabled(memberTableModel.canRemove(memberTable.getSelectedRows()));
}
@@ -1137,6 +1141,7 @@ public class GenericRelationEditor extends RelationEditor {
);
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -1145,6 +1150,7 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(getRelationSnapshot() != null);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(RELATION_SNAPSHOT_PROP)) {
updateEnabledState();
@@ -1300,6 +1306,7 @@ public class GenericRelationEditor extends RelationEditor {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -1315,6 +1322,7 @@ public class GenericRelationEditor extends RelationEditor {
public void run() {
Main.pref.put("relation.editor.generic.lastrole", tfRole.getText());
+ memberTable.stopHighlighting();
if (getRelation() == null) {
applyNewRelation();
} else if (!memberTableModel.hasSameMembersAs(getRelationSnapshot())
@@ -1335,6 +1343,7 @@ public class GenericRelationEditor extends RelationEditor {
setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -1352,7 +1361,9 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
+ memberTable.stopHighlighting();
if (!memberTableModel.hasSameMembersAs(getRelationSnapshot()) || tagEditorPanel.getModel().isDirty()) {
//give the user a chance to save the changes
int ret = confirmClosingByCancel();
@@ -1426,10 +1437,10 @@ public class GenericRelationEditor extends RelationEditor {
public AddTagAction() {
putValue(SHORT_DESCRIPTION, tr("Add an empty tag"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
- // putValue(NAME, tr("Cancel"));
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
tagEditorPanel.getModel().appendNewTag();
}
@@ -1447,6 +1458,7 @@ public class GenericRelationEditor extends RelationEditor {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -1462,6 +1474,7 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(memberTableModel.hasIncompleteMembers());
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateEnabledState();
}
@@ -1477,6 +1490,7 @@ public class GenericRelationEditor extends RelationEditor {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
@@ -1492,10 +1506,12 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(memberTableModel.hasIncompleteSelectedMembers());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateEnabledState();
}
@@ -1514,7 +1530,7 @@ public class GenericRelationEditor extends RelationEditor {
}
protected boolean isEmptyRole() {
- return tfRole.getText() == null || tfRole.getText().trim().equals("");
+ return tfRole.getText() == null || tfRole.getText().trim().isEmpty();
}
protected boolean confirmSettingEmptyRole(int onNumMembers) {
@@ -1547,6 +1563,7 @@ public class GenericRelationEditor extends RelationEditor {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (isEmptyRole()) {
if (! confirmSettingEmptyRole(memberTable.getSelectedRowCount()))
@@ -1555,18 +1572,22 @@ public class GenericRelationEditor extends RelationEditor {
memberTableModel.updateRole(memberTable.getSelectedRows(), tfRole.getText());
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
refreshEnabled();
}
+ @Override
public void changedUpdate(DocumentEvent e) {
refreshEnabled();
}
+ @Override
public void insertUpdate(DocumentEvent e) {
refreshEnabled();
}
+ @Override
public void removeUpdate(DocumentEvent e) {
refreshEnabled();
}
@@ -1585,6 +1606,7 @@ public class GenericRelationEditor extends RelationEditor {
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
Relation copy = new Relation();
tagEditorPanel.getModel().applyToPrimitive(copy);
@@ -1638,12 +1660,14 @@ public class GenericRelationEditor extends RelationEditor {
editor.setVisible(true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled())
return;
run();
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
refreshEnabled();
}
@@ -1651,10 +1675,6 @@ public class GenericRelationEditor extends RelationEditor {
class PasteMembersAction extends AddFromSelectionAction {
- public PasteMembersAction() {
- registerCopyPasteAction(this, "PASTE_MEMBERS", Shortcut.getPasteKeyStroke());
- }
-
@Override
public void actionPerformed(ActionEvent e) {
try {
@@ -1698,11 +1718,6 @@ public class GenericRelationEditor extends RelationEditor {
}
class CopyMembersAction extends AbstractAction {
-
- public CopyMembersAction() {
- registerCopyPasteAction(this, "COPY_MEMBERS", Shortcut.getCopyKeyStroke());
- }
-
@Override
public void actionPerformed(ActionEvent e) {
Set<OsmPrimitive> primitives = new HashSet<OsmPrimitive>();
@@ -1716,22 +1731,6 @@ public class GenericRelationEditor extends RelationEditor {
}
- class PasteTagsAction extends AbstractAction {
-
- public PasteTagsAction() {
- registerCopyPasteAction(this, "PASTE_TAGS", Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT).getKeyStroke());
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- Relation relation = new Relation();
- tagEditorPanel.getModel().applyToPrimitive(relation);
- TagPaster tagPaster = new TagPaster(Main.pasteBuffer.getDirectlyAdded(), Collections.<OsmPrimitive>singletonList(relation));
- updateTags(tagPaster.execute());
- }
-
- }
-
class MemberTableDblClickAdapter extends MouseAdapter {
@Override
public void mouseClicked(MouseEvent e) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
index 18ca2b3..c6209ae 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
@@ -25,7 +25,7 @@ public class MemberRoleCellEditor extends AbstractCellEditor implements TableCel
public MemberRoleCellEditor(DataSet ds) {
this.ds = ds;
editor = new AutoCompletingTextField();
- editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
+ editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
autoCompletionList = new AutoCompletionList();
editor.setAutoCompletionList(autoCompletionList);
}
@@ -33,6 +33,7 @@ public class MemberRoleCellEditor extends AbstractCellEditor implements TableCel
/**
* replies the table cell editor
*/
+ @Override
public Component getTableCellEditorComponent(JTable table,
Object value, boolean isSelected, int row, int column) {
@@ -43,20 +44,11 @@ public class MemberRoleCellEditor extends AbstractCellEditor implements TableCel
return editor;
}
+ @Override
public Object getCellEditorValue() {
return editor.getText();
}
- @Override
- public void cancelCellEditing() {
- super.cancelCellEditing();
- }
-
- @Override
- public boolean stopCellEditing() {
- return super.stopCellEditing();
- }
-
/** Returns the edit field for this cell editor. */
public AutoCompletingTextField getEditor() {
return editor;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
index 32b1e3d..7caa7c6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
@@ -5,10 +5,13 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Container;
import java.awt.Dimension;
+import java.awt.KeyboardFocusManager;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
@@ -17,12 +20,15 @@ import javax.swing.JTable;
import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AutoScaleAction;
import org.openstreetmap.josm.actions.ZoomToAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
@@ -30,18 +36,21 @@ import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
public class MemberTable extends OsmPrimitivesTable implements IMemberModelListener {
/** the additional actions in popup menu */
private ZoomToGapAction zoomToGap;
+ private HighlightHelper highlightHelper = new HighlightHelper();
+ private boolean highlightEnabled;
/**
- * constructor
+ * constructor for relation member table
*
- * @param model
- * @param columnModel
+ * @param layer the data layer of the relation
+ * @param model the table model
*/
public MemberTable(OsmDataLayer layer, MemberTableModel model) {
super(model, new MemberTableColumnModel(layer.data), model.getSelectionModel());
@@ -54,7 +63,7 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
* initialize the table
*/
protected void init() {
- MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor();
+ MemberRoleCellEditor ce = (MemberRoleCellEditor)getColumnModel().getColumn(0).getCellEditor();
setRowHeight(ce.getEditor().getPreferredSize().height);
setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -65,17 +74,19 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), "selectNextColumnCell");
+ initHighlighting();
+
// install custom navigation actions
//
getActionMap().put("selectNextColumnCell", new SelectNextColumnCellAction());
getActionMap().put("selectPreviousColumnCell", new SelectPreviousColumnCellAction());
}
-
+
@Override
protected ZoomToAction buildZoomToAction() {
return new ZoomToAction(this);
}
-
+
@Override
protected JPopupMenu buildPopupMenu() {
JPopupMenu menu = super.buildPopupMenu();
@@ -103,10 +114,43 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
return super.getPreferredSize();
}
+ @Override
public void makeMemberVisible(int index) {
scrollRectToVisible(getCellRect(index, 0, true));
}
+ ListSelectionListener highlighterListener = new ListSelectionListener() {
+ @Override
+ public void valueChanged(ListSelectionEvent lse) {
+ if (Main.isDisplayingMapView()) {
+ Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
+ final List<OsmPrimitive> toHighlight = new ArrayList<OsmPrimitive>();
+ for (RelationMember r: sel) {
+ if (r.getMember().isUsable()) {
+ toHighlight.add(r.getMember());
+ }
+ }
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ if (highlightHelper.highlightOnly(toHighlight)) {
+ Main.map.mapView.repaint();
+ }
+ }
+ });
+ }
+ }};
+
+ private void initHighlighting() {
+ highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
+ if (!highlightEnabled) return;
+ getMemberTableModel().getSelectionModel().addListSelectionListener(highlighterListener);
+ if (Main.isDisplayingMapView()) {
+ HighlightHelper.clearAllHighlighted();
+ Main.map.mapView.repaint();
+ }
+ }
+
/**
* Action to be run when the user navigates to the next cell in the table, for instance by
* pressing TAB or ENTER. The action alters the standard navigation path from cell to cell: <ul>
@@ -116,6 +160,7 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
*
*/
class SelectNextColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -132,6 +177,11 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
} else if (row < getRowCount() - 1) {
col = 0;
row++;
+ } else {
+ // go to next component, no more rows in this table
+ KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager();
+ manager.focusNextComponent();
+ return;
}
changeSelection(row, col, false, false);
}
@@ -144,6 +194,7 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
*/
private class SelectPreviousColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
int col = getSelectedColumn();
int row = getSelectedRow();
@@ -167,6 +218,17 @@ public class MemberTable extends OsmPrimitivesTable implements IMemberModelListe
MapView.removeLayerChangeListener(zoomToGap);
}
+ public void stopHighlighting() {
+ if (highlighterListener == null) return;
+ if (!highlightEnabled) return;
+ getMemberTableModel().getSelectionModel().removeListSelectionListener(highlighterListener);
+ highlighterListener = null;
+ if (Main.isDisplayingMapView()) {
+ HighlightHelper.clearAllHighlighted();
+ Main.map.mapView.repaint();
+ }
+ }
+
private class SelectPreviousGapAction extends AbstractAction {
public SelectPreviousGapAction() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
index c4e5b3a..b9d0ba9 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
@@ -12,7 +12,8 @@ import javax.swing.table.TableCellRenderer;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
/**
- * This is the {@link TableCellRenderer} used in the tables of {@link RelationMemberMerger}.
+ * This is the {@link TableCellRenderer} used in the tables of
+ * {@link org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger}.
*
*/
public abstract class MemberTableCellRenderer extends JLabel implements TableCellRenderer {
@@ -63,6 +64,7 @@ public abstract class MemberTableCellRenderer extends JLabel implements TableCel
setForeground(fgc);
}
+ @Override
abstract public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java
index dc19bbb..506a50e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java
@@ -27,7 +27,6 @@ public class MemberTableColumnModel extends DefaultTableColumnModel {
col.setHeaderValue(tr("Refers to"));
col.setResizable(true);
col.setPreferredWidth(300);
- // col.setCellRenderer(new OsmPrimitivRenderer());
col.setCellRenderer(new MemberTableMemberCellRenderer());
addColumn(col);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
index a91af14..11ff6f4 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
@@ -33,7 +33,6 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
this.value = (WayConnectionType) value;
renderForeground(isSelected);
- //setText(value.toString());
setToolTipText(((WayConnectionType)value).getToolTip());
renderBackground(getModel(table), null, isSelected);
return this;
@@ -129,8 +128,8 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
setDotted(g);
y1 = 7;
- int xValues [] = {xoff - xowloop + 1, xoff - xowloop + 1, xoff};
- int yValues [] = {ymax, y1+1, 1};
+ int[] xValues = {xoff - xowloop + 1, xoff - xowloop + 1, xoff};
+ int[] yValues = {ymax, y1+1, 1};
g.drawPolyline(xValues, yValues, 3);
unsetDotted(g);
g.drawLine(xoff + xowloop, y1+1, xoff, 1);
@@ -140,8 +139,8 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
setDotted(g);
y2 = ymax - 7;
- int xValues [] = {xoff+1, xoff - xowloop + 1, xoff - xowloop + 1};
- int yValues [] = {ymax-1, y2, y1};
+ int[] xValues = {xoff+1, xoff - xowloop + 1, xoff - xowloop + 1};
+ int[] yValues = {ymax-1, y2, y1};
g.drawPolyline(xValues, yValues, 3);
unsetDotted(g);
g.drawLine(xoff + xowloop, y2, xoff, ymax-1);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java
index 8ef2ed5..6f24fcd 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java
@@ -16,7 +16,7 @@ public class MemberTableMemberCellRenderer extends MemberTableCellRenderer {
}
protected void renderPrimitive(OsmPrimitive primitive) {
- setIcon(ImageProvider.get(primitive.getPrimitiveId().getType()));
+ setIcon(ImageProvider.get(primitive.getDisplayType()));
setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive));
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
index 199c909..7399877 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
@@ -10,6 +10,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.DefaultListSelectionModel;
@@ -39,6 +40,7 @@ import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionTypeCalculator;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
public class MemberTableModel extends AbstractTableModel implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPrimitivesTableModel {
@@ -85,6 +87,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
/* --------------------------------------------------------------------------- */
/* Interface SelectionChangedListener */
/* --------------------------------------------------------------------------- */
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
if (Main.main.getEditLayer() != this.layer) return;
// just trigger a repaint
@@ -96,6 +99,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
/* --------------------------------------------------------------------------- */
/* Interface DataSetListener */
/* --------------------------------------------------------------------------- */
+ @Override
public void dataChanged(DataChangedEvent event) {
// just trigger a repaint - the display name of the relation members may
// have changed
@@ -104,21 +108,26 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
setSelectedMembers(sel);
}
+ @Override
public void nodeMoved(NodeMovedEvent event) {/* ignore */}
+ @Override
public void primitivesAdded(PrimitivesAddedEvent event) {/* ignore */}
+ @Override
public void primitivesRemoved(PrimitivesRemovedEvent event) {
// ignore - the relation in the editor might become out of sync with the relation
// in the dataset. We will deal with it when the relation editor is closed or
// when the changes in the editor are applied.
}
+ @Override
public void relationMembersChanged(RelationMembersChangedEvent event) {
// ignore - the relation in the editor might become out of sync with the relation
// in the dataset. We will deal with it when the relation editor is closed or
// when the changes in the editor are applied.
}
+ @Override
public void tagsChanged(TagsChangedEvent event) {
// just refresh the respective table cells
//
@@ -131,8 +140,10 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
setSelectedMembers(sel);
}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {/* ignore */}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignore */}
/* --------------------------------------------------------------------------- */
@@ -162,14 +173,17 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
fireTableDataChanged();
}
+ @Override
public int getColumnCount() {
return 3;
}
+ @Override
public int getRowCount() {
return members.size();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
switch (columnIndex) {
case 0:
@@ -373,7 +387,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
}
protected List<Integer> getSelectedIndices() {
- ArrayList<Integer> selectedIndices = new ArrayList<Integer>();
+ List<Integer> selectedIndices = new ArrayList<Integer>();
for (int i = 0; i < members.size(); i++) {
if (getSelectionModel().isSelectedIndex(i)) {
selectedIndices.add(i);
@@ -383,12 +397,20 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
}
private void addMembersAtIndex(List<? extends OsmPrimitive> primitives, int index) {
- final Collection<TaggingPreset> presets = TaggingPreset.getMatchingPresets(EnumSet.of(TaggingPreset.PresetType.RELATION), presetHandler.getSelection().iterator().next().getKeys(), false);
+ final Collection<TaggingPreset> presets = TaggingPreset.getMatchingPresets(EnumSet.of(TaggingPresetType.RELATION), presetHandler.getSelection().iterator().next().getKeys(), false);
if (primitives == null)
return;
int idx = index;
for (OsmPrimitive primitive : primitives) {
- final String role = presets.isEmpty() ? null : presets.iterator().next().suggestRoleForOsmPrimitive(primitive);
+ Set<String> potentialRoles = new TreeSet<String>();
+ for (TaggingPreset tp : presets) {
+ String suggestedRole = tp.suggestRoleForOsmPrimitive(primitive);
+ if (suggestedRole != null) {
+ potentialRoles.add(suggestedRole);
+ }
+ }
+ // TODO: propose user to choose role among potential ones instead of picking first one
+ final String role = potentialRoles.isEmpty() ? null : potentialRoles.iterator().next();
RelationMember member = new RelationMember(role == null ? "" : role, primitive);
members.add(idx++, member);
}
@@ -457,7 +479,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
* @return a collection with the currently selected relation members
*/
public Collection<RelationMember> getSelectedMembers() {
- ArrayList<RelationMember> selectedMembers = new ArrayList<RelationMember>();
+ List<RelationMember> selectedMembers = new ArrayList<RelationMember>();
for (int i : getSelectedIndices()) {
selectedMembers.add(members.get(i));
}
@@ -537,7 +559,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
getSelectionModel().setValueIsAdjusting(false);
// make the first selected member visible
//
- if (selectedIndices.size() > 0) {
+ if (!selectedIndices.isEmpty()) {
fireMakeMemberVisible(Collections.min(selectedIndices));
}
}
@@ -616,7 +638,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
}
}
getSelectionModel().setValueIsAdjusting(false);
- if (getSelectedIndices().size() > 0) {
+ if (!getSelectedIndices().isEmpty()) {
fireMakeMemberVisible(getSelectedIndices().get(0));
}
}
@@ -641,47 +663,11 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
* layer
*/
protected boolean isActiveLayer() {
- if (Main.map == null || Main.map.mapView == null) return false;
+ if (!Main.isDisplayingMapView()) return false;
return Main.map.mapView.getActiveLayer() == layer;
}
/**
- * get a node we can link against when sorting members
- * @param element the element we want to link against
- * @param linked_element already linked against element
- * @return the unlinked node if element is a way, the node itself if element is a node, null otherwise
- */
- /*private static Node getUnusedNode(RelationMember element, RelationMember linked_element)
- {
- Node result = null;
-
- if (element.isWay()) {
- Way w = element.getWay();
- if (linked_element.isWay()) {
- Way x = linked_element.getWay();
- if ((w.firstNode() == x.firstNode()) || (w.firstNode() == x.lastNode())) {
- result = w.lastNode();
- } else {
- result = w.firstNode();
- }
- } else if (linked_element.isNode()) {
- Node m = linked_element.getNode();
- if (w.firstNode() == m) {
- result = w.lastNode();
- } else {
- result = w.firstNode();
- }
- }
- } else if (element.isNode()) {
- Node n = element.getNode();
- result = n;
- }
-
- return result;
- }*/
-
-
- /**
* Sort the selected relation members by the way they are linked.
*/
void sort() {
@@ -724,6 +710,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
return connectionType.get(i);
}
+ @Override
public void tableChanged(TableModelEvent e) {
connectionType = null;
}
@@ -742,7 +729,7 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
} else {
Collections.reverse(selectedIndicesReversed);
- ArrayList<RelationMember> newMembers = new ArrayList<RelationMember>(members);
+ List<RelationMember> newMembers = new ArrayList<RelationMember>(members);
for (int i=0; i < selectedIndices.size(); i++) {
newMembers.set(selectedIndices.get(i), members.get(selectedIndicesReversed.get(i)));
@@ -755,15 +742,4 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
setSelectedMembersIdx(selectedIndices);
}
}
-
- // private static void unconnectPreviousLink(List<WayConnectionType> con, int beg, boolean backward){
- // int i = beg;
- // while(true){
- // WayConnectionType t = con.get(i--);
- // t.isOnewayOppositeConnected = false;
- // if(backward && t.isOnewayLoopBackwardPart) break;
- // if(!backward && t.isOnewayLoopForwardPart) break;
- // }
- // }
-
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
index d2d808b..34ac08e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
@@ -57,7 +57,7 @@ public class ParentRelationLoadingTask extends PleaseWaitRunnable{
private boolean full;
private OsmDataLayer layer;
private Relation child;
- private ArrayList<Relation> parents;
+ private List<Relation> parents;
private Runnable continuation;
/**
@@ -80,6 +80,7 @@ public class ParentRelationLoadingTask extends PleaseWaitRunnable{
this.layer = layer;
parents = new ArrayList<Relation>();
this.child = child;
+ this.full = full;
}
/**
@@ -172,6 +173,7 @@ public class ParentRelationLoadingTask extends PleaseWaitRunnable{
//
SwingUtilities.invokeLater(
new Runnable() {
+ @Override
public void run() {
getLayer().onPostDownloadFromServer();
}
@@ -191,7 +193,7 @@ public class ParentRelationLoadingTask extends PleaseWaitRunnable{
}
} catch(Exception e) {
if (canceled) {
- System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e.toString()));
+ Main.warn(tr("Ignoring exception because task was canceled. Exception: {0}", e.toString()));
return;
}
lastException = e;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java
index f79e528..2369b91 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java
@@ -67,7 +67,7 @@ public class ReferringRelationsBrowser extends JPanel {
add(pnl, BorderLayout.SOUTH);
}
- public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model, GenericRelationEditor relationEditor) {
+ public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model) {
this.model = model;
this.layer = layer;
build();
@@ -97,6 +97,7 @@ public class ReferringRelationsBrowser extends JPanel {
setEnabled(model.canReload());
}
+ @Override
public void actionPerformed(ActionEvent e) {
boolean full = cbReadFull.isSelected();
final ParentRelationLoadingTask task = new ParentRelationLoadingTask(
@@ -107,6 +108,7 @@ public class ReferringRelationsBrowser extends JPanel {
);
task.setContinuation(
new Runnable() {
+ @Override
public void run() {
if (task.isCanceled() || task.hasError())
return;
@@ -117,14 +119,17 @@ public class ReferringRelationsBrowser extends JPanel {
Main.worker.submit(task);
}
+ @Override
public void contentsChanged(ListDataEvent e) {
refreshEnabled();
}
+ @Override
public void intervalAdded(ListDataEvent e) {
refreshEnabled();
}
+ @Override
public void intervalRemoved(ListDataEvent e) {
refreshEnabled();
}
@@ -146,6 +151,7 @@ public class ReferringRelationsBrowser extends JPanel {
setEnabled(referrers.getSelectionModel().getMinSelectionIndex() >=0);
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -159,6 +165,7 @@ public class ReferringRelationsBrowser extends JPanel {
editor.setVisible(true);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
refreshEnabled();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java
index 50179be..fd579bd 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java
@@ -14,7 +14,7 @@ public class ReferringRelationsBrowserModel extends AbstractListModel {
/** the relation */
private Relation relation;
- private ArrayList<Relation> referrers;
+ private List<Relation> referrers;
public ReferringRelationsBrowserModel() {
relation = null;
@@ -36,10 +36,12 @@ public class ReferringRelationsBrowserModel extends AbstractListModel {
fireModelUpdate();
}
+ @Override
public Object getElementAt(int index) {
return referrers.get(index);
}
+ @Override
public int getSize() {
return referrers.size();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
index d8946e3..8c5a5d3 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
@@ -6,6 +6,7 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import java.util.Map.Entry;
import org.openstreetmap.josm.data.osm.Relation;
@@ -91,7 +92,7 @@ public class RelationDialogManager extends WindowAdapter implements MapView.Laye
}
/** the map of open dialogs */
- private final HashMap<DialogContext, RelationEditor> openDialogs;
+ private final Map<DialogContext, RelationEditor> openDialogs;
/**
* constructor
@@ -182,8 +183,9 @@ public class RelationDialogManager extends WindowAdapter implements MapView.Laye
* called when a layer is removed
*
*/
+ @Override
public void layerRemoved(Layer oldLayer) {
- if (oldLayer == null || ! (oldLayer instanceof OsmDataLayer))
+ if (!(oldLayer instanceof OsmDataLayer))
return;
OsmDataLayer dataLayer = (OsmDataLayer)oldLayer;
@@ -199,10 +201,12 @@ public class RelationDialogManager extends WindowAdapter implements MapView.Laye
}
}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
// do nothing
}
+ @Override
public void layerAdded(Layer newLayer) {
// do nothing
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
index c01e0f4..b1ebfa2 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
@@ -9,6 +9,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Relation;
@@ -30,7 +31,7 @@ public abstract class RelationEditor extends ExtendedDialog {
static public final String RELATION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".relationSnapshot";
/** the list of registered relation editor classes */
- private static ArrayList<Class<RelationEditor>> editors = new ArrayList<Class<RelationEditor>>();
+ private static List<Class<RelationEditor>> editors = new ArrayList<Class<RelationEditor>>();
/**
* Registers a relation editor class. Depending on the type of relation to be edited
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
index 114b7d5..5e43598 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
@@ -80,10 +80,12 @@ public class RelationTree extends JTree {
*/
class LazyRelationLoader implements TreeWillExpandListener {
+ @Override
public void treeWillCollapse(TreeExpansionEvent event) throws ExpandVetoException {
// do nothing
}
+ @Override
public void treeWillExpand(TreeExpansionEvent event) throws ExpandVetoException {
TreePath path = event.getPath();
Relation parent = (Relation)event.getPath().getLastPathComponent();
@@ -140,6 +142,7 @@ public class RelationTree extends JTree {
final RelationTreeModel model = (RelationTreeModel)getModel();
SwingUtilities.invokeLater(
new Runnable() {
+ @Override
public void run() {
model.refreshNode(path);
}
@@ -155,7 +158,7 @@ public class RelationTree extends JTree {
.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
} catch(Exception e) {
if (canceled) {
- System.out.println(tr("Warning: Ignoring exception because task was canceled. Exception: {0}", e.toString()));
+ Main.warn(tr("Ignoring exception because task was canceled. Exception: {0}", e.toString()));
return;
}
this.lastException = e;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java
index cbeb3fb..8dbf6a0 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java
@@ -61,6 +61,7 @@ public class RelationTreeCellRenderer extends JLabel implements TreeCellRenderer
setBackground(bgColor);
}
+ @Override
public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
boolean leaf, int row, boolean hasFocus) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java
index d183b55..cae4a23 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.data.osm.RelationMember;
/**
* This is a {@link TreeModel} which provides the hierarchical structure of {@link Relation}s
- * to a {@link JTree}.
+ * to a {@link javax.swing.tree.JTree}.
*
* The model is initialized with a root relation or with a list of {@link RelationMember}s, see
* {@link #populate(Relation)} and {@link #populate(List)} respectively.
@@ -188,38 +188,46 @@ public class RelationTreeModel implements TreeModel {
/* ----------------------------------------------------------------------- */
/* interface TreeModel */
/* ----------------------------------------------------------------------- */
+ @Override
public Object getChild(Object parent, int index) {
return getRelationChildByIdx((Relation)parent, index);
}
+ @Override
public int getChildCount(Object parent) {
return getNumRelationChildren((Relation)parent);
}
+ @Override
public int getIndexOfChild(Object parent, Object child) {
return getIndexForRelationChild((Relation)parent, (Relation)child);
}
+ @Override
public Object getRoot() {
return root;
}
+ @Override
public boolean isLeaf(Object node) {
Relation r = (Relation)node;
if (r.isIncomplete()) return false;
return getNumRelationChildren(r) == 0;
}
+ @Override
public void addTreeModelListener(TreeModelListener l) {
if (l != null) {
listeners.addIfAbsent(l);
}
}
+ @Override
public void removeTreeModelListener(TreeModelListener l) {
listeners.remove(l);
}
+ @Override
public void valueForPathChanged(TreePath path, Object newValue) {
// do nothing
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java
index 092afed..11b1354 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java
@@ -10,8 +10,10 @@ public abstract class RunnableAction extends AbstractAction implements Runnable
public RunnableAction() {
}
+ @Override
public abstract void run();
+ @Override
public void actionPerformed(ActionEvent arg0) {
run();
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
index 5cf00a1..d599ea6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
@@ -17,7 +17,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
* This is the {@link TableCellRenderer} used in {@link SelectionTable}.
*
*/
-public class SelectionTableCellRenderer extends JLabel implements TableCellRenderer {
+public class SelectionTableCellRenderer extends JLabel implements TableCellRenderer {
public final static Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214);
public final static Color BGCOLOR_SINGLE_ENTRY = new Color(235,255,177);
@@ -58,11 +58,12 @@ public class SelectionTableCellRenderer extends JLabel implements TableCellRend
}
protected void renderPrimitive(OsmPrimitive primitive) {
- setIcon(ImageProvider.get(primitive.getPrimitiveId().getType()));
+ setIcon(ImageProvider.get(primitive.getDisplayType()));
setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive));
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
index a1ad548..f975825 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
@@ -19,7 +19,7 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
/** this selection table model only displays selected primitives in this layer */
private OsmDataLayer layer;
- private ArrayList<OsmPrimitive> cache;
+ private List<OsmPrimitive> cache;
/**
* constructor
@@ -44,20 +44,24 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
MapView.removeLayerChangeListener(this);
}
+ @Override
public int getColumnCount() {
return 1;
}
+ @Override
public int getRowCount() {
- if (Main.map.mapView.getEditLayer() != layer)
+ if (Main.main.getEditLayer() != layer)
return 0;
return cache.size();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
return cache.get(rowIndex);
}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
if (oldLayer == layer) {
cache.clear();
@@ -68,10 +72,12 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
fireTableDataChanged();
}
+ @Override
public void layerAdded(Layer newLayer) {
// do nothing
}
+ @Override
public void layerRemoved(Layer oldLayer) {
if (oldLayer == layer) {
unregister();
@@ -80,8 +86,9 @@ public class SelectionTableModel extends AbstractTableModel implements Selection
fireTableDataChanged();
}
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
- if (layer == Main.map.mapView.getEditLayer()) {
+ if (layer == Main.main.getEditLayer()) {
cache.clear();
cache.addAll(newSelection);
} else {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
index a6b14d0..de6ebef 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
@@ -99,26 +99,6 @@ public class RelationNodeMap {
}
remaining.addAll(map.ways.keySet());
-
- /*
- * Clean up the maps, i.e. remove nodes from roundabouts and dead ends that
- * cannot be used in future. (only for performance)
- */
- // Iterator<Map.Entry<Node,TreeSet<Integer>>> it = map.nodes.entrySet().iterator();
- // while (it.hasNext()) {
- // Map.Entry<Node,TreeSet<Integer>> nodeLinks = it.next();
- //
- // if (nodeLinks.getValue().size() < 2) {
- // if (nodeLinks.getValue().size() != 1) throw new AssertionError();
- //
- // Integer d_way = nodeLinks.getValue().iterator().next();
- // TreeSet<Node> d_way_nodes = map.ways.get(d_way);
- // d_way_nodes.remove(nodeLinks.getKey());
- //
- // it.remove();
- // continue;
- // }
- // }
}
private void addPair(Node n, int i) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java
index 03f361b..6747a0b 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSortUtils.java
@@ -10,8 +10,12 @@ import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction;
-class RelationSortUtils {
+final class RelationSortUtils {
+ private RelationSortUtils() {
+ // Hide default constructor for utils classes
+ }
+
/**
* determine, if the way i is a roundabout and if yes, what type of roundabout
*/
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
index eecb6f0..c2f381a 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
@@ -5,12 +5,15 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.tools.AlphanumComparator;
public class RelationSorter {
@@ -22,19 +25,39 @@ public class RelationSorter {
private static final Collection<AdditionalSorter> additionalSorters = new ArrayList<AdditionalSorter>();
static {
- additionalSorters.add(new AssociatedStreetSorter());
+ // first adequate sorter is used, so order matters
+ additionalSorters.add(new AssociatedStreetRoleStreetSorter());
+ additionalSorters.add(new AssociatedStreetRoleAddressHouseSorter());
}
/**
- * Class that sorts type=associatedStreet relation's houses.
+ * Class that sorts the {@code street} members of
+ * {@code type=associatedStreet} and {@code type=street} relations.
*/
- private static class AssociatedStreetSorter implements AdditionalSorter {
+ private static class AssociatedStreetRoleStreetSorter implements AdditionalSorter {
@Override
public boolean acceptsMember(RelationMember m) {
- return m != null
- && m.getRole() != null && m.getRole().equals("house")
- && m.getMember() != null && m.getMember().get("addr:housenumber") != null;
+ return "street".equals(m.getRole());
+ }
+
+ @Override
+ public List<RelationMember> sortMembers(List<RelationMember> list) {
+ return sortMembersByConnectivity(list);
+ }
+ }
+
+ /**
+ * Class that sorts the {@code address} and {@code house} members of
+ * {@code type=associatedStreet} and {@code type=street} relations.
+ */
+ private static class AssociatedStreetRoleAddressHouseSorter implements AdditionalSorter {
+
+ public static final AlphanumComparator ALPHANUM_COMPARATOR = new AlphanumComparator();
+
+ @Override
+ public boolean acceptsMember(RelationMember m) {
+ return "address".equals(m.getRole()) || "house".equals(m.getRole());
}
@Override
@@ -42,59 +65,66 @@ public class RelationSorter {
Collections.sort(list, new Comparator<RelationMember>() {
@Override
public int compare(RelationMember a, RelationMember b) {
- if (a == b || a.getMember() == b.getMember()) return 0;
- String addrA = a.getMember().get("addr:housenumber").trim();
- String addrB = b.getMember().get("addr:housenumber").trim();
- if (addrA.equals(addrB)) return 0;
- // Strip non-digits (from "1B" addresses for example)
- String addrAnum = addrA.replaceAll("\\D+", "");
- String addrBnum = addrB.replaceAll("\\D+", "");
- // Compare only numbers
- try {
- Integer res = Integer.parseInt(addrAnum) - Integer.parseInt(addrBnum);
- if (res != 0) return res;
- } catch (NumberFormatException e) {
- // Ignore NumberFormatException. If the number is not composed of digits, strings are compared next
+ final int houseNumber = ALPHANUM_COMPARATOR.compare(
+ a.getMember().get("addr:housenumber"),
+ b.getMember().get("addr:housenumber"));
+ if (houseNumber != 0) {
+ return houseNumber;
}
- // Same number ? Compare full strings
- return addrA.compareTo(addrB);
+ final String aDisplayName = a.getMember().getDisplayName(DefaultNameFormatter.getInstance());
+ final String bDisplayName = b.getMember().getDisplayName(DefaultNameFormatter.getInstance());
+ return ALPHANUM_COMPARATOR.compare(aDisplayName, bDisplayName);
}
});
return list;
}
}
- /*
+ /**
* Sort a collection of relation members by the way they are linked.
*
* @param relationMembers collection of relation members
* @return sorted collection of relation members
*/
public List<RelationMember> sortMembers(List<RelationMember> relationMembers) {
- ArrayList<RelationMember> newMembers = new ArrayList<RelationMember>();
+ List<RelationMember> newMembers = new ArrayList<RelationMember>();
// Sort members with custom mechanisms (relation-dependent)
List<RelationMember> defaultMembers = new ArrayList<RelationMember>(relationMembers.size());
- Map<AdditionalSorter, List<RelationMember>> customMap = new HashMap<AdditionalSorter, List<RelationMember>>();
+ // Maps sorter to assigned members for sorting. Use LinkedHashMap to retain order.
+ Map<AdditionalSorter, List<RelationMember>> customMap = new LinkedHashMap<AdditionalSorter, List<RelationMember>>();
- // Dispatch members to correct sorters
+ // Dispatch members to the first adequate sorter
for (RelationMember m : relationMembers) {
+ boolean wasAdded = false;
for (AdditionalSorter sorter : additionalSorters) {
- List<RelationMember> list = defaultMembers;
if (sorter.acceptsMember(m)) {
+ List<RelationMember> list;
list = customMap.get(sorter);
if (list == null) {
customMap.put(sorter, list = new LinkedList<RelationMember>());
}
+ list.add(m);
+ wasAdded = true;
+ break;
}
- list.add(m);
+ }
+ if (!wasAdded) {
+ defaultMembers.add(m);
}
}
// Sort members and add them to result
- for (AdditionalSorter s : customMap.keySet()) {
- newMembers.addAll(s.sortMembers(customMap.get(s)));
+ for (Entry<AdditionalSorter, List<RelationMember>> entry : customMap.entrySet()) {
+ newMembers.addAll(entry.getKey().sortMembers(entry.getValue()));
}
+ newMembers.addAll(sortMembersByConnectivity(defaultMembers));
+ return newMembers;
+ }
+
+ public static List<RelationMember> sortMembersByConnectivity(List<RelationMember> defaultMembers) {
+
+ List<RelationMember> newMembers = new ArrayList<RelationMember>();
RelationNodeMap map = new RelationNodeMap(defaultMembers);
// List of groups of linked members
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
index 552bf0b..b5cbd2e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
@@ -15,7 +15,7 @@ import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direct
public class WayConnectionTypeCalculator {
- private final int UNCONNECTED = Integer.MIN_VALUE;
+ private static final int UNCONNECTED = Integer.MIN_VALUE;
private List<RelationMember> members;
@@ -40,7 +40,7 @@ public class WayConnectionTypeCalculator {
for (int i=0; i<members.size(); ++i) {
final RelationMember m = members.get(i);
if (!m.isWay() || m.getWay() == null || m.getWay().isIncomplete()) {
- if(i > 0) {
+ if (i > 0) {
makeLoopIfNeeded(con, i-1);
}
con.set(i, new WayConnectionType());
@@ -52,11 +52,11 @@ public class WayConnectionTypeCalculator {
wct.linkPrev = i>0 && con.get(i-1) != null && con.get(i-1).isValid();
wct.direction = NONE;
- if(RelationSortUtils.isOneway(m)){
- if(lastWct != null && lastWct.isOnewayTail) {
+ if (RelationSortUtils.isOneway(m)){
+ if (lastWct != null && lastWct.isOnewayTail) {
wct.isOnewayHead = true;
}
- if(lastBackwardWay == UNCONNECTED && lastForwardWay == UNCONNECTED){ //Beginning of new oneway
+ if (lastBackwardWay == UNCONNECTED && lastForwardWay == UNCONNECTED){ //Beginning of new oneway
wct.isOnewayHead = true;
lastForwardWay = i-1;
lastBackwardWay = i-1;
@@ -65,14 +65,14 @@ public class WayConnectionTypeCalculator {
}
if (wct.linkPrev) {
- if(lastBackwardWay != UNCONNECTED && lastForwardWay != UNCONNECTED) {
+ if (lastBackwardWay != UNCONNECTED && lastForwardWay != UNCONNECTED) {
wct = determineOnewayConnectionType(con, m, i, wct);
- if(!wct.linkPrev) {
+ if (!wct.linkPrev) {
firstGroupIdx = i;
}
}
- if(!RelationSortUtils.isOneway(m)) {
+ if (!RelationSortUtils.isOneway(m)) {
wct.direction = determineDirection(i-1, lastWct.direction, i);
wct.linkPrev = (wct.direction != NONE);
}
@@ -80,21 +80,21 @@ public class WayConnectionTypeCalculator {
if (!wct.linkPrev) {
wct.direction = determineDirectionOfFirst(i, m);
- if(RelationSortUtils.isOneway(m)){
+ if (RelationSortUtils.isOneway(m)){
wct.isOnewayLoopForwardPart = true;
lastForwardWay = i;
}
}
wct.linkNext = false;
- if(lastWct != null) {
+ if (lastWct != null) {
lastWct.linkNext = wct.linkPrev;
}
con.set(i, wct);
lastWct = wct;
- if(!wct.linkPrev) {
- if(i > 0) {
+ if (!wct.linkPrev) {
+ if (i > 0) {
makeLoopIfNeeded(con, i-1);
}
firstGroupIdx = i;
@@ -126,11 +126,11 @@ public class WayConnectionTypeCalculator {
return result;
if (RelationSortUtils.isOneway(m)){
- if(RelationSortUtils.isBackward(m)) return BACKWARD;
+ if (RelationSortUtils.isBackward(m)) return BACKWARD;
else return FORWARD;
} else { /** guess the direction and see if it fits with the next member */
- if(determineDirection(i, FORWARD, i+1) != NONE) return FORWARD;
- if(determineDirection(i, BACKWARD, i+1) != NONE) return BACKWARD;
+ if (determineDirection(i, FORWARD, i+1) != NONE) return FORWARD;
+ if (determineDirection(i, BACKWARD, i+1) != NONE) return BACKWARD;
}
return NONE;
}
@@ -141,36 +141,35 @@ public class WayConnectionTypeCalculator {
RelationMember m, int i, final WayConnectionType wct) {
Direction dirFW = determineDirection(lastForwardWay, con.get(lastForwardWay).direction, i);
Direction dirBW = NONE;
- if(onewayBeginning) {
- if(lastBackwardWay < 0) {
+ if (onewayBeginning) {
+ if (lastBackwardWay < 0) {
dirBW = determineDirection(firstGroupIdx, reverse(con.get(firstGroupIdx).direction), i, true);
} else {
dirBW = determineDirection(lastBackwardWay, con.get(lastBackwardWay).direction, i, true);
}
- if(dirBW != NONE) {
+ if (dirBW != NONE) {
onewayBeginning = false;
}
} else {
dirBW = determineDirection(lastBackwardWay, con.get(lastBackwardWay).direction, i, true);
}
- if(RelationSortUtils.isOneway(m)) {
- if(dirBW != NONE){
+ if (RelationSortUtils.isOneway(m)) {
+ if (dirBW != NONE){
wct.direction = dirBW;
lastBackwardWay = i;
wct.isOnewayLoopBackwardPart = true;
}
- if(dirFW != NONE){
+ if (dirFW != NONE){
wct.direction = dirFW;
lastForwardWay = i;
wct.isOnewayLoopForwardPart = true;
}
- if(dirFW == NONE && dirBW == NONE) { //Not connected to previous
- // unconnectPreviousLink(con, i, true);
- // unconnectPreviousLink(con, i, false);
+ // Not connected to previous
+ if (dirFW == NONE && dirBW == NONE) {
wct.linkPrev = false;
- if(RelationSortUtils.isOneway(m)){
+ if (RelationSortUtils.isOneway(m)) {
wct.isOnewayHead = true;
lastForwardWay = i-1;
lastBackwardWay = i-1;
@@ -181,14 +180,12 @@ public class WayConnectionTypeCalculator {
onewayBeginning = true;
}
- if(dirFW != NONE && dirBW != NONE) { //End of oneway loop
- if(i+1<members.size() && determineDirection(i, dirFW, i+1) != NONE) {
+ if (dirFW != NONE && dirBW != NONE) { //End of oneway loop
+ if (i+1<members.size() && determineDirection(i, dirFW, i+1) != NONE) {
wct.isOnewayLoopBackwardPart = false;
- dirBW = NONE;
wct.direction = dirFW;
} else {
wct.isOnewayLoopForwardPart = false;
- dirFW = NONE;
wct.direction = dirBW;
}
@@ -198,7 +195,7 @@ public class WayConnectionTypeCalculator {
} else {
lastForwardWay = UNCONNECTED;
lastBackwardWay = UNCONNECTED;
- if(dirFW == NONE || dirBW == NONE) {
+ if (dirFW == NONE || dirBW == NONE) {
wct.linkPrev = false;
}
}
@@ -206,8 +203,8 @@ public class WayConnectionTypeCalculator {
}
private static Direction reverse(final Direction dir){
- if(dir == FORWARD) return BACKWARD;
- if(dir == BACKWARD) return FORWARD;
+ if (dir == FORWARD) return BACKWARD;
+ if (dir == BACKWARD) return FORWARD;
return dir;
}
@@ -263,9 +260,6 @@ public class WayConnectionTypeCalculator {
break;
}
- if (refNodes == null)
- return NONE;
-
for (Node n : refNodes) {
if (n == null) {
continue;
@@ -275,15 +269,15 @@ public class WayConnectionTypeCalculator {
if (n == nn)
return RelationSortUtils.roundaboutType(members.get(k));
}
- } else if(RelationSortUtils.isOneway(m)) {
+ } else if (RelationSortUtils.isOneway(m)) {
if (n == RelationNodeMap.firstOnewayNode(m) && !reversed) {
- if(RelationSortUtils.isBackward(m))
+ if (RelationSortUtils.isBackward(m))
return BACKWARD;
else
return FORWARD;
}
if (n == RelationNodeMap.lastOnewayNode(m) && reversed) {
- if(RelationSortUtils.isBackward(m))
+ if (RelationSortUtils.isBackward(m))
return FORWARD;
else
return BACKWARD;
@@ -297,5 +291,4 @@ public class WayConnectionTypeCalculator {
}
return NONE;
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
index 6cd4f64..d3ed02c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
@@ -1,6 +1,8 @@
// License: GPL. See LICENSE file for details.
package org.openstreetmap.josm.gui.dialogs.validator;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.event.KeyListener;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
@@ -8,7 +10,6 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -22,11 +23,13 @@ import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
+import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.MultiMap;
/**
@@ -36,7 +39,7 @@ import org.openstreetmap.josm.tools.MultiMap;
*
* @author frsantos
*/
-public class ValidatorTreePanel extends JTree {
+public class ValidatorTreePanel extends JTree implements Destroyable {
/** Serializable ID */
private static final long serialVersionUID = 2952292777351992696L;
@@ -54,6 +57,7 @@ public class ValidatorTreePanel extends JTree {
*/
private Set<OsmPrimitive> filter = null;
+ /** a counter to check if tree has been rebuild */
private int updateCount;
/**
@@ -128,6 +132,8 @@ public class ValidatorTreePanel extends JTree {
valTreeModel.setRoot(rootNode);
return;
}
+ // Sort validation errors - #8517
+ Collections.sort(errors);
// Remember the currently expanded rows
Set<Object> oldSelectedRows = new HashSet<Object>();
@@ -205,10 +211,10 @@ public class ValidatorTreePanel extends JTree {
expandedPaths.add(new TreePath(new Object[] { rootNode, severityNode }));
}
- for (Entry<String, LinkedHashSet<TestError>> msgErrors : severityErrors.entrySet()) {
+ for (Entry<String, Set<TestError>> msgErrors : severityErrors.entrySet()) {
// Message node
Set<TestError> errs = msgErrors.getValue();
- String msg = msgErrors.getKey() + " (" + errs.size() + ")";
+ String msg = tr("{0} ({1})", msgErrors.getKey(), errs.size());
DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
severityNode.add(messageNode);
@@ -227,7 +233,7 @@ public class ValidatorTreePanel extends JTree {
MultiMap<String, TestError> errorlist = bag.getValue();
DefaultMutableTreeNode groupNode = null;
if (errorlist.size() > 1) {
- String nmsg = bag.getKey() + " (" + errorlist.size() + ")";
+ String nmsg = tr("{0} ({1})", bag.getKey(), errorlist.size());
groupNode = new DefaultMutableTreeNode(nmsg);
severityNode.add(groupNode);
if (oldSelectedRows.contains(bag.getKey())) {
@@ -235,14 +241,14 @@ public class ValidatorTreePanel extends JTree {
}
}
- for (Entry<String, LinkedHashSet<TestError>> msgErrors : errorlist.entrySet()) {
+ for (Entry<String, Set<TestError>> msgErrors : errorlist.entrySet()) {
// Message node
Set<TestError> errs = msgErrors.getValue();
String msg;
if (groupNode != null) {
- msg = msgErrors.getKey() + " (" + errs.size() + ")";
+ msg = tr("{0} ({1})", msgErrors.getKey(), errs.size());
} else {
- msg = msgErrors.getKey() + " - " + bag.getKey() + " (" + errs.size() + ")";
+ msg = tr("{0} - {1} ({2})", msgErrors.getKey(), bag.getKey(), errs.size());
}
DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
if (groupNode != null) {
@@ -288,15 +294,19 @@ public class ValidatorTreePanel extends JTree {
/**
* Clears the current error list and adds these errors to it
- * @param errors The validation errors
+ * @param newerrors The validation errors
*/
public void setErrors(List<TestError> newerrors) {
if (errors == null)
return;
- errors.clear();
+ clearErrors();
+ DataSet ds = Main.main.getCurrentDataSet();
for (TestError error : newerrors) {
if (!error.getIgnored()) {
errors.add(error);
+ if (ds != null) {
+ ds.addDataSetListener(error);
+ }
}
}
if (isVisible()) {
@@ -306,16 +316,24 @@ public class ValidatorTreePanel extends JTree {
/**
* Returns the errors of the tree
- * @return the errors of the tree
+ * @return the errors of the tree
*/
public List<TestError> getErrors() {
return errors != null ? errors : Collections.<TestError> emptyList();
}
+ /**
+ * Returns the filter list
+ * @return the list of primitives used for filtering
+ */
public Set<OsmPrimitive> getFilter() {
return filter;
}
+ /**
+ * Set the filter list to a set of primitives
+ * @param filter the list of primitives used for filtering
+ */
public void setFilter(Set<OsmPrimitive> filter) {
if (filter != null && filter.isEmpty()) {
this.filter = null;
@@ -329,7 +347,6 @@ public class ValidatorTreePanel extends JTree {
/**
* Updates the current errors list
- * @param errors The validation errors
*/
public void resetErrors() {
List<TestError> e = new ArrayList<TestError>(errors);
@@ -337,7 +354,7 @@ public class ValidatorTreePanel extends JTree {
}
/**
- * Expands all tree
+ * Expands complete tree
*/
@SuppressWarnings("unchecked")
public void expandAll() {
@@ -359,7 +376,28 @@ public class ValidatorTreePanel extends JTree {
return (DefaultMutableTreeNode) valTreeModel.getRoot();
}
+ /**
+ * Returns a value to check if tree has been rebuild
+ * @return the current counter
+ */
public int getUpdateCount() {
return updateCount;
}
+
+ private void clearErrors() {
+ if (errors != null) {
+ DataSet ds = Main.main.getCurrentDataSet();
+ if (ds != null) {
+ for (TestError e : errors) {
+ ds.removeDataSetListener(e);
+ }
+ }
+ errors.clear();
+ }
+ }
+
+ @Override
+ public void destroy() {
+ clearErrors();
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/BookmarkList.java b/src/org/openstreetmap/josm/gui/download/BookmarkList.java
similarity index 65%
rename from src/org/openstreetmap/josm/gui/BookmarkList.java
rename to src/org/openstreetmap/josm/gui/download/BookmarkList.java
index 02acf3e..ae6f3f1 100644
--- a/src/org/openstreetmap/josm/gui/BookmarkList.java
+++ b/src/org/openstreetmap/josm/gui/download/BookmarkList.java
@@ -1,22 +1,20 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.gui;
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.download;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
-import java.io.IOException;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.Arrays;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,23 +29,29 @@ import javax.swing.UIManager;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
/**
* List class that read and save its content from the bookmark file.
- * @author imi
+ * @since 6340
*/
public class BookmarkList extends JList {
/**
* Class holding one bookmarkentry.
- * @author imi
*/
public static class Bookmark implements Comparable<Bookmark> {
private String name;
private Bounds area;
+ /**
+ * Constructs a new {@code Bookmark} with the given contents.
+ * @param list Bookmark contents as a list of 5 elements. First item is the name, then come bounds arguments (minlat, minlon, maxlat, maxlon)
+ * @throws NumberFormatException If the bounds arguments are not numbers
+ * @throws IllegalArgumentException If list contain less than 5 elements
+ */
public Bookmark(Collection<String> list) throws NumberFormatException, IllegalArgumentException {
- ArrayList<String> array = new ArrayList<String>(list);
+ List<String> array = new ArrayList<String>(list);
if(array.size() < 5)
throw new IllegalArgumentException(tr("Wrong number of arguments for bookmark"));
name = array.get(0);
@@ -55,11 +59,18 @@ public class BookmarkList extends JList {
Double.parseDouble(array.get(3)), Double.parseDouble(array.get(4)));
}
+ /**
+ * Constructs a new empty {@code Bookmark}.
+ */
public Bookmark() {
area = null;
name = null;
}
+ /**
+ * Constructs a new unamed {@code Bookmark} for the given area.
+ * @param area The bookmark area
+ */
public Bookmark(Bounds area) {
this.area = area;
}
@@ -68,29 +79,77 @@ public class BookmarkList extends JList {
return name;
}
+ @Override
public int compareTo(Bookmark b) {
return name.toLowerCase().compareTo(b.name.toLowerCase());
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((area == null) ? 0 : area.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Bookmark other = (Bookmark) obj;
+ if (area == null) {
+ if (other.area != null)
+ return false;
+ } else if (!area.equals(other.area))
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ return true;
+ }
+
+ /**
+ * Returns the bookmark area
+ * @return The bookmark area
+ */
public Bounds getArea() {
return area;
}
+ /**
+ * Returns the bookmark name
+ * @return The bookmark name
+ */
public String getName() {
return name;
}
+ /**
+ * Sets the bookmark name
+ * @param name The bookmark name
+ */
public void setName(String name) {
this.name = name;
}
+ /**
+ * Sets the bookmark area
+ * @param area The bookmark area
+ */
public void setArea(Bounds area) {
this.area = area;
}
}
/**
- * Create a bookmark list as well as the Buttons add and remove.
+ * Creates a bookmark list as well as the Buttons add and remove.
*/
public BookmarkList() {
setModel(new DefaultListModel());
@@ -102,7 +161,7 @@ public class BookmarkList extends JList {
/**
* Loads the bookmarks from file.
*/
- public void load() {
+ public final void load() {
DefaultListModel model = (DefaultListModel)getModel();
model.removeAllElements();
Collection<Collection<String>> args = Main.pref.getArray("bookmarks", null);
@@ -112,8 +171,8 @@ public class BookmarkList extends JList {
try {
bookmarks.add(new Bookmark(entry));
}
- catch(Exception e) {
- System.err.println(tr("Error reading bookmark entry: %s", e.getMessage()));
+ catch (Exception e) {
+ Main.error(tr("Error reading bookmark entry: %s", e.getMessage()));
}
}
Collections.sort(bookmarks);
@@ -126,14 +185,14 @@ public class BookmarkList extends JList {
try {
LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>();
if (bookmarkFile.exists()) {
- System.out.println("Try loading obsolete bookmarks file");
+ Main.info("Try loading obsolete bookmarks file");
BufferedReader in = new BufferedReader(new InputStreamReader(
new FileInputStream(bookmarkFile), "utf-8"));
for (String line = in.readLine(); line != null; line = in.readLine()) {
Matcher m = Pattern.compile("^(.+)[,\u001e](-?\\d+.\\d+)[,\u001e](-?\\d+.\\d+)[,\u001e](-?\\d+.\\d+)[,\u001e](-?\\d+.\\d+)$").matcher(line);
if (!m.matches() || m.groupCount() != 5) {
- System.err.println(tr("Error: Unexpected line ''{0}'' in bookmark file ''{1}''",line, bookmarkFile.toString()));
+ Main.error(tr("Unexpected line ''{0}'' in bookmark file ''{1}''",line, bookmarkFile.toString()));
continue;
}
Bookmark b = new Bookmark();
@@ -142,25 +201,27 @@ public class BookmarkList extends JList {
for (int i = 0; i < 4; ++i) {
try {
values[i] = Double.parseDouble(m.group(i+2));
- } catch(NumberFormatException e) {
- System.err.println(tr("Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''",m.group(i+2),line, bookmarkFile.toString()));
+ } catch (NumberFormatException e) {
+ Main.error(tr("Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''",m.group(i+2),line, bookmarkFile.toString()));
continue;
}
}
b.setArea(new Bounds(values));
bookmarks.add(b);
}
- in.close();
+ Utils.close(in);
Collections.sort(bookmarks);
for (Bookmark b : bookmarks) {
model.addElement(b);
}
save();
- System.out.println("Removing obsolete bookmarks file");
- bookmarkFile.delete();
+ Main.info("Removing obsolete bookmarks file");
+ if (!bookmarkFile.delete()) {
+ bookmarkFile.deleteOnExit();
+ }
}
} catch (IOException e) {
- e.printStackTrace();
+ Main.error(e);
JOptionPane.showMessageDialog(
Main.parent,
tr("<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>",
@@ -175,19 +236,19 @@ public class BookmarkList extends JList {
}
/**
- * Save all bookmarks to the preferences file
+ * Saves all bookmarks to the preferences file
*/
- public void save() {
+ public final void save() {
LinkedList<Collection<String>> coll = new LinkedList<Collection<String>>();
for (Object o : ((DefaultListModel)getModel()).toArray()) {
String[] array = new String[5];
Bookmark b = (Bookmark)o;
array[0] = b.getName();
Bounds area = b.getArea();
- array[1] = String.valueOf(area.getMin().lat());
- array[2] = String.valueOf(area.getMin().lon());
- array[3] = String.valueOf(area.getMax().lat());
- array[4] = String.valueOf(area.getMax().lon());
+ array[1] = String.valueOf(area.getMinLat());
+ array[2] = String.valueOf(area.getMinLon());
+ array[3] = String.valueOf(area.getMaxLat());
+ array[4] = String.valueOf(area.getMaxLon());
coll.add(Arrays.asList(array));
}
Main.pref.putArray("bookmarks", coll);
@@ -217,14 +278,15 @@ public class BookmarkList extends JList {
Bounds area = b.getArea();
StringBuffer sb = new StringBuffer();
sb.append("<html>min[latitude,longitude]=<strong>[")
- .append(area.getMin().lat()).append(",").append(area.getMin().lon()).append("]</strong>")
+ .append(area.getMinLat()).append(",").append(area.getMinLon()).append("]</strong>")
.append("<br>")
.append("max[latitude,longitude]=<strong>[")
- .append(area.getMax().lat()).append(",").append(area.getMax().lon()).append("]</strong>")
+ .append(area.getMaxLat()).append(",").append(area.getMaxLon()).append("]</strong>")
.append("</html>");
return sb.toString();
}
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
boolean cellHasFocus) {
diff --git a/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java b/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
index 378ddcd..3afd22b 100644
--- a/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.download;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -16,18 +16,15 @@ import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.CoordinateFormat;
-import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.gui.BookmarkList;
-import org.openstreetmap.josm.gui.BookmarkList.Bookmark;
-import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.download.BookmarkList.Bookmark;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -49,7 +46,7 @@ public class BookmarkSelection implements DownloadSelection {
/** displays information about the current download area */
private JMultilineLabel lblCurrentDownloadArea;
- final private JTextArea bboxDisplay = new JTextArea();
+ final private JosmTextArea bboxDisplay = new JosmTextArea();
/** the add action */
private AddAction actAdd;
@@ -105,6 +102,7 @@ public class BookmarkSelection implements DownloadSelection {
return pnl;
}
+ @Override
public void addGui(final DownloadDialog gui) {
JPanel dlg = new JPanel(new GridBagLayout());
gui.addDownloadAreaSelector(dlg, tr("Bookmarks"));
@@ -112,6 +110,7 @@ public class BookmarkSelection implements DownloadSelection {
bookmarks = new BookmarkList();
bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ @Override
public void valueChanged(ListSelectionEvent e) {
Bookmark b = (Bookmark)bookmarks.getSelectedValue();
if (b != null) {
@@ -152,7 +151,7 @@ public class BookmarkSelection implements DownloadSelection {
lblCurrentDownloadArea.setText(tr("<html>There is currently no download area selected.</html>"));
} else {
lblCurrentDownloadArea.setText(tr("<html><strong>Current download area</strong> (minlon, minlat, maxlon, maxlat): </html>"));
- bboxDisplay.setText(new BBox(currentArea).toStringCSV(","));
+ bboxDisplay.setText(currentArea.toBBox().toStringCSV(","));
}
}
@@ -161,6 +160,7 @@ public class BookmarkSelection implements DownloadSelection {
*
* @param area the download area.
*/
+ @Override
public void setDownloadArea(Bounds area) {
if (area == null) return;
this.currentArea = area;
@@ -180,6 +180,7 @@ public class BookmarkSelection implements DownloadSelection {
putValue(SHORT_DESCRIPTION, tr("Add a bookmark for the currently selected download area"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (currentArea == null) {
JOptionPane.showMessageDialog(
@@ -198,7 +199,7 @@ public class BookmarkSelection implements DownloadSelection {
JOptionPane.QUESTION_MESSAGE)
);
b.setArea(currentArea);
- if (b.getName() != null && !b.getName().equals("")) {
+ if (b.getName() != null && !b.getName().isEmpty()) {
((DefaultListModel)bookmarks.getModel()).addElement(b);
bookmarks.save();
}
@@ -207,12 +208,12 @@ public class BookmarkSelection implements DownloadSelection {
class RemoveAction extends AbstractAction implements ListSelectionListener{
public RemoveAction() {
- //putValue(NAME, tr("Remove"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
putValue(SHORT_DESCRIPTION, tr("Remove the currently selected bookmarks"));
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
Object[] sels = bookmarks.getSelectedValues();
if (sels == null || sels.length == 0)
@@ -225,6 +226,7 @@ public class BookmarkSelection implements DownloadSelection {
protected void updateEnabledState() {
setEnabled(bookmarks.getSelectedIndices().length > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -232,12 +234,12 @@ public class BookmarkSelection implements DownloadSelection {
class RenameAction extends AbstractAction implements ListSelectionListener{
public RenameAction() {
- //putValue(NAME, tr("Remove"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
putValue(SHORT_DESCRIPTION, tr("Rename the currently selected bookmark"));
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
Object[] sels = bookmarks.getSelectedValues();
if (sels == null || sels.length != 1)
@@ -261,6 +263,7 @@ public class BookmarkSelection implements DownloadSelection {
protected void updateEnabledState() {
setEnabled(bookmarks.getSelectedIndices().length == 1);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
index d56b715..4536f2d 100644
--- a/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.download;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -6,9 +6,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.GridBagLayout;
-import java.awt.Toolkit;
-import java.awt.datatransfer.FlavorEvent;
-import java.awt.datatransfer.FlavorListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
@@ -16,14 +13,10 @@ import java.awt.event.FocusEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
import javax.swing.UIManager;
import javax.swing.border.Border;
import javax.swing.event.DocumentEvent;
@@ -33,10 +26,10 @@ import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.CoordinateFormat;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
-import org.openstreetmap.josm.tools.Utils;
/**
* Bounding box selector.
@@ -48,24 +41,24 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class BoundingBoxSelection implements DownloadSelection {
- private JTextField[] latlon = null;
- private final JTextArea tfOsmUrl = new JTextArea();
- private final JTextArea showUrl = new JTextArea();
+ private JosmTextField[] latlon = null;
+ private final JosmTextArea tfOsmUrl = new JosmTextArea();
+ private final JosmTextArea showUrl = new JosmTextArea();
private DownloadDialog parent;
protected void registerBoundingBoxBuilder() {
BoundingBoxBuilder bboxbuilder = new BoundingBoxBuilder();
- for (int i = 0;i < latlon.length; i++) {
- latlon[i].addFocusListener(bboxbuilder);
- latlon[i].addActionListener(bboxbuilder);
+ for (JosmTextField ll : latlon) {
+ ll.addFocusListener(bboxbuilder);
+ ll.addActionListener(bboxbuilder);
}
}
protected void buildDownloadAreaInputFields() {
- latlon = new JTextField[4];
+ latlon = new JosmTextField[4];
for(int i=0; i< 4; i++) {
- latlon[i] = new JTextField(11);
- latlon[i].setMinimumSize(new Dimension(100,new JTextField().getMinimumSize().height));
+ latlon[i] = new JosmTextField(11);
+ latlon[i].setMinimumSize(new Dimension(100,new JosmTextField().getMinimumSize().height));
latlon[i].addFocusListener(new SelectAllOnFocusHandler(latlon[i]));
}
LatValueChecker latChecker = new LatValueChecker(latlon[0]);
@@ -87,6 +80,7 @@ public class BoundingBoxSelection implements DownloadSelection {
registerBoundingBoxBuilder();
}
+ @Override
public void addGui(final DownloadDialog gui) {
buildDownloadAreaInputFields();
final JPanel dlg = new JPanel(new GridBagLayout());
@@ -120,31 +114,6 @@ public class BoundingBoxSelection implements DownloadSelection {
dlg.add(new JLabel(tr("URL from www.openstreetmap.org (you can paste an URL here to download the area)")), GBC.eol().insets(10,5,5,0));
dlg.add(tfOsmUrl, GBC.eop().insets(10,0,5,0).fill());
- tfOsmUrl.addMouseListener(
- new MouseAdapter() {
- @Override
- public void mousePressed(MouseEvent e) {
- checkPopup(e);
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
- checkPopup(e);
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- checkPopup(e);
- }
-
- private void checkPopup(MouseEvent e) {
- if (e.isPopupTrigger()) {
- OsmUrlPopup popup = new OsmUrlPopup();
- popup.show(tfOsmUrl, e.getX(), e.getY());
- }
- }
- }
- );
dlg.add(showUrl, GBC.eop().insets(10,0,5,5));
showUrl.setEditable(false);
showUrl.setBackground(dlg.getBackground());
@@ -154,11 +123,16 @@ public class BoundingBoxSelection implements DownloadSelection {
this.parent = gui;
}
+ @Override
public void setDownloadArea(Bounds area) {
updateBboxFields(area);
updateUrl(area);
}
+ /**
+ * Replies the download area.
+ * @return The download area
+ */
public Bounds getDownloadArea() {
double[] values = new double[4];
for (int i=0; i < 4; i++) {
@@ -190,7 +164,7 @@ public class BoundingBoxSelection implements DownloadSelection {
latlon[1].setText(area.getMin().lonToString(CoordinateFormat.DECIMAL_DEGREES));
latlon[2].setText(area.getMax().latToString(CoordinateFormat.DECIMAL_DEGREES));
latlon[3].setText(area.getMax().lonToString(CoordinateFormat.DECIMAL_DEGREES));
- for (JTextField tf: latlon) {
+ for (JosmTextField tf: latlon) {
resetErrorMessage(tf);
}
}
@@ -202,20 +176,20 @@ public class BoundingBoxSelection implements DownloadSelection {
private Border errorBorder = BorderFactory.createLineBorder(Color.RED, 1);
- protected void setErrorMessage(JTextField tf, String msg) {
+ protected void setErrorMessage(JosmTextField tf, String msg) {
tf.setBorder(errorBorder);
tf.setToolTipText(msg);
}
- protected void resetErrorMessage(JTextField tf) {
+ protected void resetErrorMessage(JosmTextField tf) {
tf.setBorder(UIManager.getBorder("TextField.border"));
tf.setToolTipText("");
}
class LatValueChecker extends FocusAdapter implements ActionListener{
- private JTextField tfLatValue;
+ private JosmTextField tfLatValue;
- public LatValueChecker(JTextField tfLatValue) {
+ public LatValueChecker(JosmTextField tfLatValue) {
this.tfLatValue = tfLatValue;
}
@@ -239,15 +213,16 @@ public class BoundingBoxSelection implements DownloadSelection {
check();
}
+ @Override
public void actionPerformed(ActionEvent e) {
check();
}
}
class LonValueChecker extends FocusAdapter implements ActionListener {
- private JTextField tfLonValue;
+ private JosmTextField tfLonValue;
- public LonValueChecker(JTextField tfLonValue) {
+ public LonValueChecker(JosmTextField tfLonValue) {
this.tfLonValue = tfLonValue;
}
@@ -271,6 +246,7 @@ public class BoundingBoxSelection implements DownloadSelection {
check();
}
+ @Override
public void actionPerformed(ActionEvent e) {
check();
}
@@ -289,42 +265,14 @@ public class BoundingBoxSelection implements DownloadSelection {
}
class OsmUrlRefresher implements DocumentListener {
+ @Override
public void changedUpdate(DocumentEvent e) { parseURL(parent); }
+ @Override
public void insertUpdate(DocumentEvent e) { parseURL(parent); }
+ @Override
public void removeUpdate(DocumentEvent e) { parseURL(parent); }
}
- class PasteUrlAction extends AbstractAction implements FlavorListener {
-
- public PasteUrlAction() {
- putValue(NAME, tr("Paste"));
- putValue(SMALL_ICON, ImageProvider.get("paste"));
- putValue(SHORT_DESCRIPTION, tr("Paste URL from clipboard"));
- Toolkit.getDefaultToolkit().getSystemClipboard().addFlavorListener(this);
- }
-
- public void actionPerformed(ActionEvent e) {
- String content = Utils.getClipboardContent();
- if (content != null) {
- tfOsmUrl.setText(content);
- }
- }
-
- protected void updateEnabledState() {
- setEnabled(Utils.getClipboardContent() != null);
- }
-
- public void flavorsChanged(FlavorEvent e) {
- updateEnabledState();
- }
- }
-
- class OsmUrlPopup extends JPopupMenu {
- public OsmUrlPopup() {
- add(new PasteUrlAction());
- }
- }
-
class BoundingBoxBuilder extends FocusAdapter implements ActionListener {
protected Bounds build() {
double minlon, minlat, maxlon,maxlat;
@@ -356,6 +304,7 @@ public class BoundingBoxSelection implements DownloadSelection {
refreshBounds();
}
+ @Override
public void actionPerformed(ActionEvent e) {
refreshBounds();
}
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
index f860069..d8a14c0 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.download;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -65,6 +65,7 @@ public class DownloadDialog extends JDialog {
return instance;
}
+ protected SlippyMapChooser slippyMapChooser;
protected final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
protected final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
protected JCheckBox cbNewLayer;
@@ -100,8 +101,10 @@ public class DownloadDialog extends JDialog {
// hook for subclasses
buildMainPanelAboveDownloadSelections(pnl);
+ slippyMapChooser = new SlippyMapChooser();
+
// predefined download selections
- downloadSelections.add(new SlippyMapChooser());
+ downloadSelections.add(slippyMapChooser);
downloadSelections.add(new BookmarkSelection());
downloadSelections.add(new BoundingBoxSelection());
downloadSelections.add(new PlaceSelection());
@@ -135,6 +138,7 @@ public class DownloadDialog extends JDialog {
cbStartup = new JCheckBox(tr("Open this dialog on startup"));
cbStartup.setToolTipText(tr("<html>Autostart ''Download from OSM'' dialog every time JOSM is started.<br>You can open it manually from File menu or toolbar.</html>"));
cbStartup.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
Main.pref.put("download.autorun", cbStartup.isSelected());
}});
@@ -143,7 +147,7 @@ public class DownloadDialog extends JDialog {
pnl.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15,5,5,5));
pnl.add(sizeCheck, GBC.eol().anchor(GBC.EAST).insets(5,5,5,2));
-
+
if (!ExpertToggleAction.isExpert()) {
JLabel infoLabel = new JLabel(tr("Use left click&drag to select area, arrows or right mouse button to scroll map, wheel or +/- to zoom."));
pnl.add(infoLabel,GBC.eol().anchor(GBC.SOUTH).insets(0,0,0,0));
@@ -152,6 +156,7 @@ public class DownloadDialog extends JDialog {
}
/* This should not be necessary, but if not here, repaint is not always correct in SlippyMap! */
+ @Override
public void paint(Graphics g) {
tpDownloadAreaSelectors.getSelectedComponent().paint(g);
super.paint(g);
@@ -164,7 +169,7 @@ public class DownloadDialog extends JDialog {
// -- download button
pnl.add(btnDownload = new SideButton(actDownload = new DownloadAction()));
InputMapUtils.enableEnter(btnDownload);
-
+
makeCheckBoxRespondToEnter(cbDownloadGpxData);
makeCheckBoxRespondToEnter(cbDownloadOsmData);
makeCheckBoxRespondToEnter(cbNewLayer);
@@ -197,6 +202,7 @@ public class DownloadDialog extends JDialog {
KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents");
getRootPane().getActionMap().put("checkClipboardContents", new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
String clip = Utils.getClipboardContent();
if (clip == null) {
@@ -290,6 +296,16 @@ public class DownloadDialog extends JDialog {
}
/**
+ * Refreshes the tile sources
+ * @since 6364
+ */
+ public final void refreshTileSources() {
+ if (slippyMapChooser != null) {
+ slippyMapChooser.refreshTileSources();
+ }
+ }
+
+ /**
* Remembers the current settings in the download dialog
*
*/
@@ -307,7 +323,7 @@ public class DownloadDialog extends JDialog {
cbDownloadOsmData.setSelected(Main.pref.getBoolean("download.osm", true));
cbDownloadGpxData.setSelected(Main.pref.getBoolean("download.gps", false));
cbNewLayer.setSelected(Main.pref.getBoolean("download.newlayer", false));
- cbStartup.setSelected( isAutorunEnabled() );
+ cbStartup.setSelected( isAutorunEnabled() );
int idx = Main.pref.getInteger("download.tab", 0);
if (idx < 0 || idx > tpDownloadAreaSelectors.getTabCount()) {
idx = 0;
@@ -335,9 +351,6 @@ public class DownloadDialog extends JDialog {
}
public static boolean isAutorunEnabled() {
- //String autorun=Main.pref.get("download.autorun",null);
- //boolean expert=ExpertToggleAction.isExpert();
- //return (autorun==null && !expert) || "true".equals(autorun) ;
return Main.pref.getBoolean("download.autorun",false);
}
@@ -348,8 +361,7 @@ public class DownloadDialog extends JDialog {
}
/**
- * Replies the currently selected download area. May be null, if no download area is selected
- * yet.
+ * Replies the currently selected download area. May be null, if no download area is selected yet.
*/
public Bounds getSelectedDownloadArea() {
return currentBounds;
@@ -365,7 +377,7 @@ public class DownloadDialog extends JDialog {
new Dimension(1000,600)
)
).applySafe(this);
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
@@ -399,6 +411,7 @@ public class DownloadDialog extends JDialog {
setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -438,6 +451,7 @@ public class DownloadDialog extends JDialog {
setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
new file mode 100644
index 0000000..6e92a0c
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
@@ -0,0 +1,107 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.download;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.WindowEvent;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JCheckBox;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.dialogs.OsmIdSelectionDialog;
+
+/**
+ * Dialog prompt to user to let him choose OSM primitives to download by specifying their type and IDs
+ * @since 5765
+ */
+public class DownloadObjectDialog extends OsmIdSelectionDialog {
+
+ protected final JCheckBox referrers = new JCheckBox(tr("Download referrers (parent relations)"));
+ protected final JCheckBox fullRel = new JCheckBox(tr("Download relation members"));
+ protected final JCheckBox newLayer = new JCheckBox(tr("Separate Layer"));
+
+ /**
+ * Constructs a new DownloadObjectDialog with Main.parent as parent component.
+ */
+ public DownloadObjectDialog() {
+ this(Main.parent);
+ }
+
+ /**
+ * Constructs a new DownloadObjectDialog.
+ * @param parent The parent component
+ */
+ public DownloadObjectDialog(Component parent) {
+ super(parent, tr("Download object"), new String[]{tr("Download object"), tr("Cancel")});
+ init();
+ setButtonIcons(new String[]{"download.png", "cancel.png"});
+ setToolTipTexts(new String[]{
+ tr("Start downloading"),
+ tr("Close dialog and cancel downloading")
+ });
+ configureContextsensitiveHelp("/Action/DownloadObject", true /* show help button */);
+ }
+
+ protected Collection<Component> getComponentsBeforeHelp() {
+ newLayer.setToolTipText(tr("Select if the data should be downloaded into a new layer"));
+ newLayer.setSelected(Main.pref.getBoolean("download.newlayer"));
+
+ referrers.setToolTipText(tr("Select if the referrers of the object should be downloaded as well, i.e.,"
+ + "parent relations and for nodes, additionally, parent ways"));
+ referrers.setSelected(Main.pref.getBoolean("downloadprimitive.referrers", true));
+
+ fullRel.setToolTipText(tr("Select if the members of a relation should be downloaded as well"));
+ fullRel.setSelected(Main.pref.getBoolean("downloadprimitive.full", true));
+
+ cbType.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ referrers.setText(cbType.getType() == OsmPrimitiveType.NODE
+ ? tr("Download referrers (parent relations and ways)")
+ : tr("Download referrers (parent relations)"));
+ }
+ });
+
+ return Arrays.<Component>asList(referrers, fullRel, newLayer);
+ }
+
+ /**
+ * Determines if a new layer has been requested.
+ * @return true if a new layer has been requested, false otherwise
+ */
+ public final boolean isNewLayerRequested() {
+ return newLayer.isSelected();
+ }
+
+ /**
+ * Determines if relation members have been requested.
+ * @return true if relation members have been requested, false otherwise
+ */
+ public final boolean isFullRelationRequested() {
+ return fullRel.isSelected();
+ }
+
+ /**
+ * Determines if referrers have been requested.
+ * @return true if referrers have been requested, false otherwise
+ */
+ public final boolean isReferrersRequested() {
+ return referrers.isSelected();
+ }
+
+ @Override
+ public void windowClosed(WindowEvent e) {
+ super.windowClosed(e);
+ if (e != null && e.getComponent() == this && getValue() == 1) {
+ Main.pref.put("downloadprimitive.referrers", referrers.isSelected());
+ Main.pref.put("downloadprimitive.full", fullRel.isSelected());
+ Main.pref.put("download.newlayer", newLayer.isSelected());
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadSelection.java b/src/org/openstreetmap/josm/gui/download/DownloadSelection.java
index e2eee4a..d083b6a 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadSelection.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.download;
import org.openstreetmap.josm.data.Bounds;
@@ -14,7 +14,7 @@ public interface DownloadSelection {
* Sets the current download area. The area may be null to clear
* the current download area.
*
- * @param are the current download area
+ * @param area the current download area
*/
public void setDownloadArea(Bounds area);
}
diff --git a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
index 13683dc..9aa736b 100644
--- a/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
@@ -46,7 +46,6 @@ import javax.xml.parsers.SAXParserFactory;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.gui.ExceptionDialogUtil;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
@@ -132,6 +131,7 @@ public class PlaceSelection implements DownloadSelection {
*
* This method is, for all intents and purposes, the constructor for this class.
*/
+ @Override
public void addGui(final DownloadDialog gui) {
JPanel panel = new JPanel();
panel.setLayout(new BorderLayout());
@@ -163,6 +163,7 @@ public class PlaceSelection implements DownloadSelection {
parent = gui;
}
+ @Override
public void setDownloadArea(Bounds area) {
tblSearchResults.clearSelection();
}
@@ -239,8 +240,8 @@ public class PlaceSelection implements DownloadSelection {
currentResult.lon = Double.parseDouble(atts.getValue("lon"));
String[] bbox = atts.getValue("boundingbox").split(",");
currentResult.bounds = new Bounds(
- new LatLon(Double.parseDouble(bbox[0]), Double.parseDouble(bbox[2])),
- new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[3])));
+ Double.parseDouble(bbox[0]), Double.parseDouble(bbox[2]),
+ Double.parseDouble(bbox[1]), Double.parseDouble(bbox[3]));
data.add(currentResult);
}
} catch (NumberFormatException x) {
@@ -257,13 +258,11 @@ public class PlaceSelection implements DownloadSelection {
*/
@Override
public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
- if (qName.equals("searchresults")) {
- } else if (qName.equals("description") && description != null) {
+ if (qName.equals("description") && description != null) {
currentResult.description = description.toString();
description = null;
}
depth--;
-
}
/**
@@ -290,6 +289,7 @@ public class PlaceSelection implements DownloadSelection {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled() || cbSearchExpression.getText().trim().length() == 0)
return;
@@ -303,14 +303,17 @@ public class PlaceSelection implements DownloadSelection {
setEnabled(cbSearchExpression.getText().trim().length() > 0);
}
+ @Override
public void changedUpdate(DocumentEvent e) {
updateEnabledState();
}
+ @Override
public void insertUpdate(DocumentEvent e) {
updateEnabledState();
}
+ @Override
public void removeUpdate(DocumentEvent e) {
updateEnabledState();
}
@@ -382,7 +385,7 @@ public class PlaceSelection implements DownloadSelection {
}
static class NamedResultTableModel extends DefaultTableModel {
- private ArrayList<SearchResult> data;
+ private List<SearchResult> data;
private ListSelectionModel selectionModel;
public NamedResultTableModel(ListSelectionModel selectionModel) {
@@ -472,6 +475,7 @@ public class PlaceSelection implements DownloadSelection {
}
class ListSelectionHandler implements ListSelectionListener {
+ @Override
public void valueChanged(ListSelectionEvent lse) {
SearchResult r = model.getSelectedSearchResult();
if (r != null) {
@@ -523,6 +527,7 @@ public class PlaceSelection implements DownloadSelection {
return ret.toString();
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java b/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
index 9d253f9..534e023 100644
--- a/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
+++ b/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
@@ -1,13 +1,10 @@
-// This code has been adapted and copied from code that has been written by Immanuel Scholz and others for JOSM.
-// License: GPL. Copyright 2007 by Tim Haussmann
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.download;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Dimension;
-import java.awt.Graphics;
import java.awt.Toolkit;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -23,7 +20,7 @@ import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
* @author Tim Haussmann
*
*/
-public class SlippyMapChooser extends JPanel implements DownloadSelection, PropertyChangeListener{
+public class SlippyMapChooser extends JPanel implements DownloadSelection, PropertyChangeListener {
private DownloadDialog iGui;
private SlippyMapBBoxChooser pnlSlippyMapBBoxChooser;
@@ -38,16 +35,19 @@ public class SlippyMapChooser extends JPanel implements DownloadSelection, Prope
pnlSlippyMapBBoxChooser.addPropertyChangeListener(this);
}
+ @Override
public void addGui(final DownloadDialog gui) {
iGui = gui;
iGui.addDownloadAreaSelector(pnlSlippyMapBBoxChooser, tr("Slippy map"));
}
+ @Override
public void setDownloadArea(Bounds area) {
pnlSlippyMapBBoxChooser.setBoundingBox(area);
repaint();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) {
if (iGui != null) {
@@ -64,7 +64,7 @@ public class SlippyMapChooser extends JPanel implements DownloadSelection, Prope
// make the each dimension 90% of the absolute display size
w = iScreenSize.width * 90 / 100;
h = iScreenSize.height * 90 / 100;
- iDownloadDialogDimension = iGui.getSize();
+ iDownloadDialogDimension = iGui.getSize();
}
// shrink
else {
@@ -74,9 +74,19 @@ public class SlippyMapChooser extends JPanel implements DownloadSelection, Prope
iDownloadDialogDimension = null;
}
- // resize and center the DownloadDialog
- iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
+ // resize and center the DownloadDialog
+ iGui.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
repaint();
}
}
+
+ /**
+ * Refreshes the tile sources
+ * @since 6364
+ */
+ public final void refreshTileSources() {
+ if (pnlSlippyMapBBoxChooser != null) {
+ pnlSlippyMapBBoxChooser.refreshTileSources();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/download/TileSelection.java b/src/org/openstreetmap/josm/gui/download/TileSelection.java
index 9a67adb..20430d1 100644
--- a/src/org/openstreetmap/josm/gui/download/TileSelection.java
+++ b/src/org/openstreetmap/josm/gui/download/TileSelection.java
@@ -30,15 +30,18 @@ public class TileSelection implements DownloadSelection, PropertyChangeListener
build();
}
+ @Override
public void addGui(final DownloadDialog gui) {
gui.addDownloadAreaSelector(chooser, tr("Tile Numbers"));
parent = gui;
}
+ @Override
public void setDownloadArea(Bounds area) {
chooser.setBoundingBox(area);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(BBoxChooser.BBOX_PROP)) {
Bounds bbox = (Bounds)evt.getNewValue();
diff --git a/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java b/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java
index 2e372c7..f5bd326 100644
--- a/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java
+++ b/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java
@@ -49,6 +49,7 @@ public class ContextSensitiveHelpAction extends AbstractAction {
this.helpTopic = helpTopic;
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (helpTopic != null) {
HelpBrowser.setUrlForHelpTopic(helpTopic);
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
index efec299..1feb5e9 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
@@ -23,7 +23,6 @@ import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
-import javax.swing.JEditorPane;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
@@ -39,17 +38,20 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.Element;
import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.html.HTML.Tag;
import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
-import javax.swing.text.html.HTML.Tag;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
+import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
public class HelpBrowser extends JDialog {
@@ -81,6 +83,7 @@ public class HelpBrowser extends JDialog {
public static void setUrlForHelpTopic(final String helpTopic) {
final HelpBrowser browser = getInstance();
Runnable r = new Runnable() {
+ @Override
public void run() {
browser.openHelpTopic(helpTopic);
browser.setVisible(true);
@@ -104,7 +107,7 @@ public class HelpBrowser extends JDialog {
}
/** the help browser */
- private JEditorPane help;
+ private JosmEditorPane help;
/** the help browser history */
private HelpBrowserHistory history;
@@ -140,11 +143,12 @@ public class HelpBrowser extends JDialog {
css.append(line);
css.append("\n");
}
- reader.close();
} catch(Exception e) {
- System.err.println(tr("Failed to read CSS file ''help-browser.css''. Exception is: {0}", e.toString()));
+ Main.error(tr("Failed to read CSS file ''help-browser.css''. Exception is: {0}", e.toString()));
e.printStackTrace();
return ss;
+ } finally {
+ Utils.close(reader);
}
ss.addRule(css.toString());
return ss;
@@ -163,8 +167,8 @@ public class HelpBrowser extends JDialog {
}
protected void build() {
- help = new JEditorPane();
- HTMLEditorKit kit = new HTMLEditorKit();
+ help = new JosmEditorPane();
+ JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
kit.setStyleSheet(buildStyleSheet());
help.setEditorKit(kit);
help.setEditable(false);
@@ -186,6 +190,7 @@ public class HelpBrowser extends JDialog {
p.add(buildToolBar(), BorderLayout.NORTH);
help.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Close");
help.getActionMap().put("Close", new AbstractAction(){
+ @Override
public void actionPerformed(ActionEvent e) {
setVisible(false);
}
@@ -205,7 +210,7 @@ public class HelpBrowser extends JDialog {
new Dimension(600,400)
)
).applySafe(this);
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
if(windowMenuItem != null && !visible) {
@@ -218,6 +223,9 @@ public class HelpBrowser extends JDialog {
super.setVisible(visible);
}
+ /**
+ * Constructs a new {@code HelpBrowser}.
+ */
public HelpBrowser() {
reader = new HelpContentReader(HelpUtil.getWikiBaseUrl());
build();
@@ -238,7 +246,6 @@ public class HelpBrowser extends JDialog {
*
* @return the current URL
*/
-
public String getUrl() {
return url;
}
@@ -259,8 +266,8 @@ public class HelpBrowser extends JDialog {
+ "</p></html>",
relativeHelpTopic,
Locale.getDefault().getDisplayName(),
- getHelpTopicEditUrl(buildAbsoluteHelpTopic(relativeHelpTopic)),
- getHelpTopicEditUrl(buildAbsoluteHelpTopic(relativeHelpTopic, Locale.ENGLISH))
+ getHelpTopicEditUrl(buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.DEFAULT)),
+ getHelpTopicEditUrl(buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.ENGLISH))
);
loadTopic(message);
}
@@ -292,21 +299,30 @@ public class HelpBrowser extends JDialog {
* @param relativeHelpTopic the relative help topic
*/
protected void loadRelativeHelpTopic(String relativeHelpTopic) {
- String url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic));
+ String url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.DEFAULTNOTENGLISH));
String content = null;
try {
content = reader.fetchHelpTopicContent(url, true);
} catch(MissingHelpContentException e) {
- url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, Locale.ENGLISH));
+ url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.BASELANGUAGE));
try {
content = reader.fetchHelpTopicContent(url, true);
} catch(MissingHelpContentException e1) {
- this.url = url;
- handleMissingHelpContent(relativeHelpTopic);
- return;
+ url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.ENGLISH));
+ try {
+ content = reader.fetchHelpTopicContent(url, true);
+ } catch(MissingHelpContentException e2) {
+ this.url = url;
+ handleMissingHelpContent(relativeHelpTopic);
+ return;
+ } catch(HelpContentReaderException e2) {
+ e2.printStackTrace();
+ handleHelpContentReaderException(relativeHelpTopic, e2);
+ return;
+ }
} catch(HelpContentReaderException e1) {
e1.printStackTrace();
- handleHelpContentReaderException(relativeHelpTopic,e1);
+ handleHelpContentReaderException(relativeHelpTopic, e1);
return;
}
} catch(HelpContentReaderException e) {
@@ -374,7 +390,7 @@ public class HelpBrowser extends JDialog {
"<html>Failed to open help page for url {0}.<br>"
+ "This is most likely due to a network problem, please check<br>"
+ "your internet connection</html>",
- url.toString()
+ url
),
tr("Failed to open URL"),
JOptionPane.ERROR_MESSAGE,
@@ -413,6 +429,7 @@ public class HelpBrowser extends JDialog {
putValue(SMALL_ICON, ImageProvider.get("help", "internet"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
OpenBrowser.displayUrl(getUrl());
}
@@ -425,6 +442,7 @@ public class HelpBrowser extends JDialog {
putValue(SMALL_ICON,ImageProvider.get("dialogs", "edit"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
String url = getUrl();
if(url == null)
@@ -452,11 +470,11 @@ public class HelpBrowser extends JDialog {
class ReloadAction extends AbstractAction {
public ReloadAction() {
- //putValue(NAME, tr("Reload"));
putValue(SHORT_DESCRIPTION, tr("Reload the current help page"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
openUrl(getUrl());
}
@@ -467,17 +485,17 @@ public class HelpBrowser extends JDialog {
public BackAction(HelpBrowserHistory history) {
this.history = history;
history.addObserver(this);
- //putValue(NAME, tr("Back"));
putValue(SHORT_DESCRIPTION, tr("Go to the previous page"));
putValue(SMALL_ICON, ImageProvider.get("help", "previous"));
setEnabled(history.canGoBack());
}
+ @Override
public void actionPerformed(ActionEvent e) {
history.back();
}
+ @Override
public void update(Observable o, Object arg) {
- //System.out.println("BackAction: canGoBoack=" + history.canGoBack() );
setEnabled(history.canGoBack());
}
}
@@ -487,15 +505,16 @@ public class HelpBrowser extends JDialog {
public ForwardAction(HelpBrowserHistory history) {
this.history = history;
history.addObserver(this);
- //putValue(NAME, tr("Forward"));
putValue(SHORT_DESCRIPTION, tr("Go to the next page"));
putValue(SMALL_ICON, ImageProvider.get("help", "next"));
setEnabled(history.canGoForward());
}
+ @Override
public void actionPerformed(ActionEvent e) {
history.forward();
}
+ @Override
public void update(Observable o, Object arg) {
setEnabled(history.canGoForward());
}
@@ -503,11 +522,11 @@ public class HelpBrowser extends JDialog {
class HomeAction extends AbstractAction {
public HomeAction() {
- //putValue(NAME, tr("Home"));
putValue(SHORT_DESCRIPTION, tr("Go to the JOSM help home page"));
putValue(SMALL_ICON, ImageProvider.get("help", "home"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
openHelpTopic("/");
}
@@ -534,8 +553,8 @@ public class HelpBrowser extends JDialog {
help.scrollRectToVisible(r);
return true;
}
- } catch(BadLocationException e) {
- System.err.println(tr("Warning: bad location in HTML document. Exception was: {0}", e.toString()));
+ } catch (BadLocationException e) {
+ Main.warn(tr("Bad location in HTML document. Exception was: {0}", e.toString()));
e.printStackTrace();
}
}
@@ -543,20 +562,20 @@ public class HelpBrowser extends JDialog {
}
/**
- * Checks whether the hyperlink event originated on a <a ...> element with
+ * Checks whether the hyperlink event originated on a <a ...> element with
* a relative href consisting of a URL fragment only, i.e.
- * <a href="#thisIsALocalFragment">. If so, replies the fragment, i.e.
+ * <a href="#thisIsALocalFragment">. If so, replies the fragment, i.e.
* "thisIsALocalFragment".
*
- * Otherwise, replies null
+ * Otherwise, replies <code>null</code>
*
* @param e the hyperlink event
- * @return the local fragment
+ * @return the local fragment or <code>null</code>
*/
protected String getUrlFragment(HyperlinkEvent e) {
AttributeSet set = e.getSourceElement().getAttributes();
Object value = set.getAttribute(Tag.A);
- if (value == null || ! (value instanceof SimpleAttributeSet)) return null;
+ if (!(value instanceof SimpleAttributeSet)) return null;
SimpleAttributeSet atts = (SimpleAttributeSet)value;
value = atts.getAttribute(javax.swing.text.html.HTML.Attribute.HREF);
if (value == null) return null;
@@ -566,10 +585,11 @@ public class HelpBrowser extends JDialog {
return null;
}
+ @Override
public void hyperlinkUpdate(HyperlinkEvent e) {
if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED)
return;
- if (e.getURL() == null) {
+ if (e.getURL() == null || e.getURL().toString().startsWith(url+"#")) {
// Probably hyperlink event on a an A-element with a href consisting of
// a fragment only, i.e. "#ALocalFragment".
//
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java b/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
index bea045b..cbb30e4 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
@@ -3,11 +3,12 @@ package org.openstreetmap.josm.gui.help;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import java.util.Observable;
public class HelpBrowserHistory extends Observable {
private HelpBrowser browser;
- private ArrayList<String> history;
+ private List<String> history;
private int historyPos = 0;
public HelpBrowserHistory(HelpBrowser browser) {
@@ -51,7 +52,7 @@ public class HelpBrowserHistory extends Observable {
public void setCurrentUrl(String url) {
boolean add=true;
- if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).toString().equals(url.toString())) {
+ if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url)) {
add = false;
} else if (historyPos == history.size() -1) {
// do nothing just append
@@ -64,8 +65,8 @@ public class HelpBrowserHistory extends Observable {
}
if(add)
{
- history.add(url);
- historyPos = history.size()-1;
+ history.add(url);
+ historyPos = history.size()-1;
}
setChanged();
notifyObservers();
diff --git a/src/org/openstreetmap/josm/gui/help/HelpContentReader.java b/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
index 5db6804..27fb319 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
@@ -20,13 +20,8 @@ import org.openstreetmap.josm.tools.WikiReader;
*
* It also has to be <strong>transformed</strong> because the internal help browser required slightly
* different HTML than what is provided by the Wiki.
- *
- * @see WikiReader
*/
-public class HelpContentReader {
-
- /** the base url */
- private String baseUrl;
+public class HelpContentReader extends WikiReader {
/**
* constructor
@@ -34,7 +29,7 @@ public class HelpContentReader {
* @param baseUrl the base url of the JOSM help wiki, i.e. http://josm.openstreetmap.org
*/
public HelpContentReader(String baseUrl) {
- this.baseUrl = baseUrl;
+ super(baseUrl);
}
/**
@@ -46,13 +41,16 @@ public class HelpContentReader {
* @throws MissingHelpContentException thrown if this helpTopicUrl doesn't point to an existing Wiki help page
*/
public String fetchHelpTopicContent(String helpTopicUrl, boolean dotest) throws HelpContentReaderException {
+ if(helpTopicUrl == null)
+ throw new MissingHelpContentException();
HttpURLConnection con = null;
BufferedReader in = null;
try {
- con = Utils.openHttpConnection(new URL(helpTopicUrl));
+ URL u = new URL(helpTopicUrl);
+ con = Utils.openHttpConnection(u);
con.connect();
in = new BufferedReader(new InputStreamReader(con.getInputStream(),"utf-8"));
- return prepareHelpContent(in, dotest);
+ return prepareHelpContent(in, dotest, u);
} catch(MalformedURLException e) {
throw new HelpContentReaderException(e);
} catch(IOException e) {
@@ -66,13 +64,7 @@ public class HelpContentReader {
}
throw ex;
} finally {
- if (in != null) {
- try {
- in.close();
- } catch(IOException e) {
- // ignore
- }
- }
+ Utils.close(in);
}
}
@@ -87,60 +79,17 @@ public class HelpContentReader {
* @return the content
* @throws HelpContentReaderException thrown if an exception occurs
* @throws MissingHelpContentException thrown, if the content read isn't a help page
+ * @since 5936
*/
- protected String prepareHelpContent(BufferedReader in, boolean dotest) throws HelpContentReaderException {
- boolean isInContent = false;
- boolean isInTranslationsSideBar = false;
- boolean isExistingHelpPage = false;
- StringBuffer sball = new StringBuffer();
- StringBuffer sb = new StringBuffer();
+ protected String prepareHelpContent(BufferedReader in, boolean dotest, URL url) throws HelpContentReaderException {
+ String s = "";
try {
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- sball.append(line);
- sball.append("\n");
- if (line.contains("<div id=\"searchable\">")) {
- isInContent = true;
- } else if (line.contains("<div class=\"wiki-toc trac-nav\"")) {
- isInTranslationsSideBar = true;
- } else if (line.contains("<div class=\"wikipage searchable\">")) {
- isInContent = true;
- } else if (line.contains("<div class=\"buttons\">")) {
- isInContent = false;
- } else if (line.contains("<h3>Attachments</h3>")) {
- isInContent = false;
- } else if (line.contains("<div id=\"attachments\">")) {
- isInContent = false;
- } else if (line.contains("<div class=\"trac-modifiedby\">")) {
- continue;
- } else if (line.contains("<input type=\"submit\" name=\"attachfilebutton\"")) {
- // heuristic: if we find a button for uploading images we are in an
- // existing pages. Otherwise this is probably the stub page for a not yet
- // existing help page
- isExistingHelpPage = true;
- }
- if (isInContent && !isInTranslationsSideBar) {
- // add a border="0" attribute to images, otherwise the internal help browser
- // will render a thick border around images inside an <a> element
- //
- // Also make sure image URLs are absolute
- //
- line = line.replaceAll("<img ([^>]*)src=\"/", "<img border=\"0\" \\1src=\"" + baseUrl + "/").replaceAll("href=\"/",
- "href=\"" + baseUrl + "/").replaceAll(" />", ">");
- sb.append(line);
- sb.append("\n");
- } else if (isInTranslationsSideBar && line.contains("</div>")) {
- isInTranslationsSideBar = false;
- }
- }
+ s = readFromTrac(in, url);
} catch(IOException e) {
throw new HelpContentReaderException(e);
}
- if(!dotest && sb.length() == 0)
- sb = sball;
- else if (dotest && !isExistingHelpPage)
+ if(dotest && s.isEmpty())
throw new MissingHelpContentException();
- sb.insert(0, "<html>");
- sb.append("<html>");
- return sb.toString();
+ return s;
}
}
diff --git a/src/org/openstreetmap/josm/gui/help/HelpUtil.java b/src/org/openstreetmap/josm/gui/help/HelpUtil.java
index 793df87..2253793 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpUtil.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpUtil.java
@@ -13,16 +13,21 @@ import javax.swing.KeyStroke;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.HelpAction;
import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
-public class HelpUtil {
+public final class HelpUtil {
+ private HelpUtil() {
+ // Hide default constructor for utils classes
+ }
+
/**
* Replies the base wiki URL.
*
* @return the base wiki URL
*/
static public String getWikiBaseUrl() {
- return Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
+ return Main.pref.get("help.baseurl", Main.JOSM_WEBSITE);
}
/**
@@ -39,13 +44,14 @@ public class HelpUtil {
*
* @param absoluteHelpTopic the absolute help topic
* @return the url
- * @see #buildAbsoluteHelpTopic(String)
- * @see #buildAbsoluteHelpTopic(String, Locale)
+ * @see #buildAbsoluteHelpTopic
*/
static public String getHelpTopicUrl(String absoluteHelpTopic) {
+ if(absoluteHelpTopic == null)
+ return null;
String ret = getWikiBaseHelpUrl();
ret = ret.replaceAll("\\/+$", "");
- absoluteHelpTopic =absoluteHelpTopic.replace(" ", "%20");
+ absoluteHelpTopic = absoluteHelpTopic.replace(" ", "%20");
absoluteHelpTopic = absoluteHelpTopic.replaceAll("^\\/+", "/");
return ret + absoluteHelpTopic;
}
@@ -71,10 +77,12 @@ public class HelpUtil {
*/
static public String extractRelativeHelpTopic(String url) {
String topic = extractAbsoluteHelpTopic(url);
- if (topic == null) return null;
- String pattern = "/[A-Z][a-z]:" + getHelpTopicPrefix(Locale.ENGLISH).replaceAll("^\\/+", "");
- if (url.matches(pattern))
+ if (topic == null)
+ return null;
+ String pattern = "/[A-Z][a-z]{1,2}(_[A-Z]{2})?:" + getHelpTopicPrefix(LocaleType.ENGLISH).replaceAll("^\\/+", "");
+ if (url.matches(pattern)) {
return topic.substring(pattern.length());
+ }
return null;
}
@@ -88,11 +96,11 @@ public class HelpUtil {
static public String extractAbsoluteHelpTopic(String url) {
if (!url.startsWith(getWikiBaseHelpUrl())) return null;
url = url.substring(getWikiBaseHelpUrl().length());
- String prefix = getHelpTopicPrefix(Locale.ENGLISH);
+ String prefix = getHelpTopicPrefix(LocaleType.ENGLISH);
if (url.startsWith(prefix))
return url;
- String pattern = "/[A-Z][a-z]:" + prefix.replaceAll("^\\/+", "");
+ String pattern = "/[A-Z][a-z]{1,2}(_[A-Z]{2})?:" + prefix.replaceAll("^\\/+", "");
if (url.matches(pattern))
return url;
@@ -100,38 +108,22 @@ public class HelpUtil {
}
/**
- * Replies the help topic prefix for the current locale. Examples:
- * <ul>
- * <li>/Help if the current locale is a locale with language "en"</li>
- * <li>/De:Help if the current locale is a locale with language "de"</li>
- * </ul>
- *
- * @return the help topic prefix
- * @see #getHelpTopicPrefix(Locale)
- */
- static public String getHelpTopicPrefix() {
- return getHelpTopicPrefix(Locale.getDefault());
- }
-
- /**
* Replies the help topic prefix for the given locale. Examples:
* <ul>
* <li>/Help if the locale is a locale with language "en"</li>
* <li>/De:Help if the locale is a locale with language "de"</li>
* </ul>
*
- * @param locale the locale. {@link Locale#ENGLISH} assumed, if null.
+ * @param type the type of the locale to use
* @return the help topic prefix
- * @see #getHelpTopicPrefix(Locale)
+ * @since 5915
*/
- static public String getHelpTopicPrefix(Locale locale) {
- if (locale == null) {
- locale = Locale.ENGLISH;
- }
- String ret = Main.pref.get("help.pathhelp", "/Help");
- ret = ret.replaceAll("^\\/+", ""); // remove leading /
- ret = "/" + LanguageInfo.getWikiLanguagePrefix(locale) + ret;
- return ret;
+ static private String getHelpTopicPrefix(LocaleType type) {
+ String ret = LanguageInfo.getWikiLanguagePrefix(type);
+ if(ret == null)
+ return ret;
+ ret = "/" + ret + Main.pref.get("help.pathhelp", "/Help").replaceAll("^\\/+", ""); // remove leading /
+ return ret.replaceAll("\\/+", "\\/"); // collapse sequences of //
}
/**
@@ -141,36 +133,16 @@ public class HelpUtil {
* replies "/De:Help/Dialog/RelationEditor"
*
* @param topic the relative help topic. Home help topic assumed, if null.
- * @param locale the locale. {@link Locale#ENGLISH} assumed, if null.
- * @return the absolute, localized help topic
- */
- static public String buildAbsoluteHelpTopic(String topic, Locale locale) {
- if (locale == null) {
- locale = Locale.ENGLISH;
- }
- if (topic == null || topic.trim().length() == 0 || topic.trim().equals("/"))
- return getHelpTopicPrefix(locale);
- String ret = getHelpTopicPrefix(locale);
- if (topic.startsWith("/")) {
- ret += topic;
- } else {
- ret += "/" + topic;
- }
- ret = ret.replaceAll("\\/+", "\\/"); // just in case, collapse sequences of //
- return ret;
- }
-
- /**
- * Replies the absolute, localized help topic for the given topic and the
- * current locale.
- *
- * @param topic the relative help topic. Home help topic assumed, if null.
+ * @param type the locale. {@link Locale#ENGLISH} assumed, if null.
* @return the absolute, localized help topic
- * @see Locale#getDefault()
- * @see #buildAbsoluteHelpTopic(String, Locale)
+ * @since 5915
*/
- static public String buildAbsoluteHelpTopic(String topic) {
- return buildAbsoluteHelpTopic(topic, Locale.getDefault());
+ static public String buildAbsoluteHelpTopic(String topic, LocaleType type) {
+ String prefix = getHelpTopicPrefix(type);
+ if (prefix == null || topic == null || topic.trim().length() == 0 || topic.trim().equals("/"))
+ return prefix;
+ prefix += "/" + topic;
+ return prefix.replaceAll("\\/+", "\\/"); // collapse sequences of //
}
/**
@@ -208,7 +180,7 @@ public class HelpUtil {
* Replies the global help action, if available. Otherwise, creates an instance
* of {@link HelpAction}.
*
- * @return
+ * @return instance of help action
*/
static private Action getHelpAction() {
try {
@@ -226,7 +198,7 @@ public class HelpUtil {
* is not.
*
* @param component the component the component
- * @param topic the help topic. Set to the default help topic if null.
+ * @param relativeHelpTopic the help topic. Set to the default help topic if null.
*/
static public void setHelpContext(JComponent component, String relativeHelpTopic) {
if (relativeHelpTopic == null) {
diff --git a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
index 48965a1..2f14544 100644
--- a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
@@ -251,14 +251,14 @@ public class CoordinateInfoViewer extends JPanel {
protected void refresh() {
HistoryOsmPrimitive p = getPrimitive();
HistoryOsmPrimitive opposite = getOppositePrimitive();
- if (p == null || ! ( p instanceof HistoryNode)) return;
- if (opposite == null || ! (opposite instanceof HistoryNode)) return;
+ if (!(p instanceof HistoryNode)) return;
+ if (!(opposite instanceof HistoryNode)) return;
HistoryNode node = (HistoryNode)p;
HistoryNode oppositeNode = (HistoryNode) opposite;
LatLon coord = node.getCoords();
LatLon oppositeCoord = oppositeNode.getCoords();
-
+
// display the coordinates
//
lblLat.setText(coord != null ? coord.latToString(CoordinateFormat.DECIMAL_DEGREES) : tr("(none)"));
@@ -266,13 +266,13 @@ public class CoordinateInfoViewer extends JPanel {
// update background color to reflect differences in the coordinates
//
- if (coord == oppositeCoord ||
+ if (coord == oppositeCoord ||
(coord != null && oppositeCoord != null && coord.lat() == oppositeCoord.lat())) {
lblLat.setBackground(Color.WHITE);
} else {
lblLat.setBackground(BGCOLOR_DIFFERENCE);
}
- if (coord == oppositeCoord ||
+ if (coord == oppositeCoord ||
(coord != null && oppositeCoord != null && coord.lon() == oppositeCoord.lon())) {
lblLon.setBackground(Color.WHITE);
} else {
@@ -280,19 +280,21 @@ public class CoordinateInfoViewer extends JPanel {
}
}
+ @Override
public void update(Observable o, Object arg) {
refresh();
}
}
-
+
private static class DistanceViewer extends LatLonViewer {
private JLabel lblDistance;
-
+
public DistanceViewer(HistoryBrowserModel model) {
super(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
}
+ @Override
protected void build() {
setLayout(new GridBagLayout());
setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
@@ -318,17 +320,18 @@ public class CoordinateInfoViewer extends JPanel {
lblDistance.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
}
+ @Override
protected void refresh() {
HistoryOsmPrimitive p = getPrimitive();
HistoryOsmPrimitive opposite = getOppositePrimitive();
- if (p == null || ! ( p instanceof HistoryNode)) return;
- if (opposite == null || ! (opposite instanceof HistoryNode)) return;
+ if (!(p instanceof HistoryNode)) return;
+ if (!(opposite instanceof HistoryNode)) return;
HistoryNode node = (HistoryNode) p;
HistoryNode oppositeNode = (HistoryNode) opposite;
LatLon coord = node.getCoords();
LatLon oppositeCoord = oppositeNode.getCoords();
-
+
// update distance
//
if (coord != null && oppositeCoord != null) {
diff --git a/src/org/openstreetmap/josm/gui/history/DiffTableModel.java b/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
index c42a2e3..b4668de 100644
--- a/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
+++ b/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
@@ -9,9 +9,8 @@ import javax.swing.table.AbstractTableModel;
import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType;
/**
- * Simple model storing "diff cells" in a list. Could probably have used a DefaultTableModel instead..
- *
- * {@link NodeListDiffTableCellRenderer}
+ * Simple model storing "diff cells" in a list. Could probably have
+ * used a {@link javax.swing.table.DefaultTableModel} instead.
*/
class DiffTableModel extends AbstractTableModel {
private List<TwoColumnDiff.Item> rows;
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java
index 3b47712..f662d1b 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java
@@ -30,7 +30,6 @@ public class HistoryBrowser extends JPanel {
private RelationMemberListViewer relationMemberListViewer;
private CoordinateInfoViewer coordinateInfoViewer;
private JTabbedPane tpViewers;
- private VersionTable versionTable;
/**
* embedds table in a {@link JScrollPane}
@@ -54,7 +53,7 @@ public class HistoryBrowser extends JPanel {
JPanel pnl = new JPanel();
pnl.setLayout(new BorderLayout());
- versionTable = new VersionTable(model);
+ VersionTable versionTable = new VersionTable(model);
pnl.add(embeddInScrollPane(versionTable), BorderLayout.CENTER);
return pnl;
}
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
index 51c02eb..38d1803 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
@@ -31,7 +31,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
/**
* This is non-modal dialog, always showing on top, which displays history information
- * about a given {@link OsmPrimitive}.
+ * about a given {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
*
*/
public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener{
@@ -121,12 +121,14 @@ public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListe
/* ---------------------------------------------------------------------------------- */
/* interface HistoryDataSetListener */
/* ---------------------------------------------------------------------------------- */
+ @Override
public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
if (primitiveId == null || primitiveId.equals(browser.getHistory().getPrimitiveId())) {
browser.populate(source.getHistory(browser.getHistory().getPrimitiveId()));
}
}
+ @Override
public void historyDataSetCleared(HistoryDataSet source) {
closeAction.run();
}
@@ -145,6 +147,7 @@ public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListe
HistoryBrowserDialogManager.getInstance().hide(HistoryBrowserDialog.this);
}
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -157,6 +160,7 @@ public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListe
putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
HistoryLoadTask task = new HistoryLoadTask();
task.add(browser.getHistory());
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
index 7b8c36b..1580f02 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
@@ -8,6 +8,7 @@ import java.awt.Point;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.swing.JOptionPane;
@@ -15,6 +16,7 @@ import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.history.History;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
import org.openstreetmap.josm.gui.MapView;
@@ -101,7 +103,7 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
*
*/
public void hideAll() {
- ArrayList<HistoryBrowserDialog> dialogs = new ArrayList<HistoryBrowserDialog>();
+ List<HistoryBrowserDialog> dialogs = new ArrayList<HistoryBrowserDialog>();
dialogs.addAll(this.dialogs.values());
for (HistoryBrowserDialog dialog: dialogs) {
dialog.unlinkAsListener();
@@ -123,9 +125,12 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
/* ----------------------------------------------------------------------------- */
/* LayerChangeListener */
/* ----------------------------------------------------------------------------- */
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
+ @Override
public void layerAdded(Layer newLayer) {}
+ @Override
public void layerRemoved(Layer oldLayer) {
// remove all history browsers if the number of layers drops to 0
//
@@ -134,8 +139,8 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
}
}
- public void showHistory(final Collection<OsmPrimitive> primitives) {
- final Collection<OsmPrimitive> notNewPrimitives = Utils.filter(primitives, notNewPredicate);
+ public void showHistory(final Collection<? extends PrimitiveId> primitives) {
+ final Collection<? extends PrimitiveId> notNewPrimitives = Utils.filter(primitives, notNewPredicate);
if (notNewPrimitives.isEmpty()) {
JOptionPane.showMessageDialog(
Main.parent,
@@ -145,10 +150,12 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
return;
}
- Collection<OsmPrimitive> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);
+ Collection<PrimitiveId> toLoad = Utils.filter(primitives, unloadedHistoryPredicate);
if (!toLoad.isEmpty()) {
HistoryLoadTask task = new HistoryLoadTask();
- task.add(notNewPrimitives);
+ for (PrimitiveId p : notNewPrimitives) {
+ task.add(p);
+ }
Main.worker.submit(task);
}
@@ -157,8 +164,8 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
@Override
public void run() {
try {
- for (OsmPrimitive p : notNewPrimitives) {
- final History h = HistoryDataSet.getInstance().getHistory(p.getPrimitiveId());
+ for (PrimitiveId p : notNewPrimitives) {
+ final History h = HistoryDataSet.getInstance().getHistory(p);
if (h == null) {
continue;
}
@@ -178,16 +185,17 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
Main.worker.submit(r);
}
- private final Predicate<OsmPrimitive> unloadedHistoryPredicate = new Predicate<OsmPrimitive>() {
+ private final Predicate<PrimitiveId> unloadedHistoryPredicate = new Predicate<PrimitiveId>() {
HistoryDataSet hds = HistoryDataSet.getInstance();
@Override
- public boolean evaluate(OsmPrimitive p) {
- if (hds.getHistory(p.getPrimitiveId()) == null)
+ public boolean evaluate(PrimitiveId p) {
+ History h = hds.getHistory(p);
+ if (h == null)
// reload if the history is not in the cache yet
return true;
- else if (!p.isNew() && hds.getHistory(p.getPrimitiveId()).getByVersion(p.getUniqueId()) == null)
+ else if (!p.isNew() && h.getByVersion(p.getUniqueId()) == null)
// reload if the history object of the selected object is not in the cache yet
return true;
else
@@ -195,10 +203,10 @@ public class HistoryBrowserDialogManager implements MapView.LayerChangeListener
}
};
- private final Predicate<OsmPrimitive> notNewPredicate = new Predicate<OsmPrimitive>() {
+ private final Predicate<PrimitiveId> notNewPredicate = new Predicate<PrimitiveId>() {
@Override
- public boolean evaluate(OsmPrimitive p) {
+ public boolean evaluate(PrimitiveId p) {
return !p.isNew();
}
};
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
index 05c2636..95460d5 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
@@ -7,6 +7,7 @@ import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Observable;
import javax.swing.JTable;
@@ -41,7 +42,6 @@ import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.io.XmlWriter;
@@ -103,8 +103,9 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
currentRelationMemberTableModel = new DiffTableModel();
referenceRelationMemberTableModel = new DiffTableModel();
- if (getEditLayer() != null) {
- getEditLayer().data.addDataSetListener(this);
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null) {
+ editLayer.data.addDataSetListener(this);
}
MapView.addLayerChangeListener(this);
}
@@ -122,20 +123,6 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
/**
- * Replies the current edit layer; null, if there isn't a current edit layer
- * of type {@link OsmDataLayer}.
- *
- * @return the current edit layer
- */
- protected OsmDataLayer getEditLayer() {
- try {
- return Main.map.mapView.getEditLayer();
- } catch(NullPointerException e) {
- return null;
- }
- }
-
- /**
* replies the history managed by this model
* @return the history
*/
@@ -186,8 +173,9 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
this.history = history;
if (history.getNumVersions() > 0) {
HistoryOsmPrimitive newLatest = null;
- if (getEditLayer() != null) {
- OsmPrimitive p = getEditLayer().data.getPrimitiveById(history.getId(), history.getType());
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null) {
+ OsmPrimitive p = editLayer.data.getPrimitiveById(history.getId(), history.getType());
if (canShowAsLatest(p)) {
newLatest = new HistoryPrimitiveBuilder().build(p);
}
@@ -336,8 +324,8 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
* Sets the {@link HistoryOsmPrimitive} which plays the role of the current point
* in time (see {@link PointInTimeType}).
*
- * @param reference the reference history primitive. Must not be null.
- * @throws IllegalArgumentException thrown if reference is null
+ * @param current the reference history primitive. Must not be {@code null}.
+ * @throws IllegalArgumentException thrown if reference is {@code null}
* @throws IllegalStateException thrown if this model isn't a assigned a history yet
* @throws IllegalArgumentException if reference isn't an history primitive for the history managed by this mode
*
@@ -414,7 +402,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
* The table model for the list of versions in the current history
*
*/
- public class VersionTableModel extends AbstractTableModel {
+ public final class VersionTableModel extends AbstractTableModel {
private VersionTableModel() {
}
@@ -535,8 +523,9 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
public OsmPrimitive getLatest() {
if (latest == null) return null;
- if (getEditLayer() == null) return null;
- OsmPrimitive p = getEditLayer().data.getPrimitiveById(latest.getId(), latest.getType());
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer == null) return null;
+ OsmPrimitive p = editLayer.data.getPrimitiveById(latest.getId(), latest.getType());
return p;
}
@@ -553,7 +542,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
*/
public class TagTableModel extends AbstractTableModel {
- private ArrayList<String> keys;
+ private List<String> keys;
private PointInTimeType pointInTimeType;
protected void initKeyList() {
@@ -673,8 +662,9 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
*
*/
public void unlinkAsListener() {
- if (getEditLayer() != null) {
- getEditLayer().data.removeDataSetListener(this);
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null) {
+ editLayer.data.removeDataSetListener(this);
}
MapView.removeLayerChangeListener(this);
}
@@ -682,6 +672,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
/* ---------------------------------------------------------------------- */
/* DataSetListener */
/* ---------------------------------------------------------------------- */
+ @Override
public void nodeMoved(NodeMovedEvent event) {
Node node = event.getNode();
if (!node.isNew() && node.getId() == history.getId()) {
@@ -689,6 +680,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
}
+ @Override
public void primitivesAdded(PrimitivesAddedEvent event) {
for (OsmPrimitive p: event.getPrimitives()) {
if (canShowAsLatest(p)) {
@@ -697,6 +689,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
}
+ @Override
public void primitivesRemoved(PrimitivesRemovedEvent event) {
for (OsmPrimitive p: event.getPrimitives()) {
if (!p.isNew() && p.getId() == history.getId()) {
@@ -705,6 +698,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
}
+ @Override
public void relationMembersChanged(RelationMembersChangedEvent event) {
Relation r = event.getRelation();
if (!r.isNew() && r.getId() == history.getId()) {
@@ -712,6 +706,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
}
+ @Override
public void tagsChanged(TagsChangedEvent event) {
OsmPrimitive prim = event.getPrimitive();
if (!prim.isNew() && prim.getId() == history.getId()) {
@@ -719,6 +714,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {
Way way = event.getChangedWay();
if (!way.isNew() && way.getId() == history.getId()) {
@@ -726,6 +722,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
}
+ @Override
public void dataChanged(DataChangedEvent event) {
OsmPrimitive primitive = event.getDataset().getPrimitiveById(history.getId(), history.getType());
HistoryOsmPrimitive latest;
@@ -738,6 +735,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
fireModelChange();
}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {
// Irrelevant
}
@@ -745,12 +743,13 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
/* ---------------------------------------------------------------------- */
/* LayerChangeListener */
/* ---------------------------------------------------------------------- */
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
- if (oldLayer != null && oldLayer instanceof OsmDataLayer) {
+ if (oldLayer instanceof OsmDataLayer) {
OsmDataLayer l = (OsmDataLayer)oldLayer;
l.data.removeDataSetListener(this);
}
- if (newLayer == null || ! (newLayer instanceof OsmDataLayer)) {
+ if (!(newLayer instanceof OsmDataLayer)) {
latest = null;
fireModelChange();
return;
@@ -768,7 +767,9 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
fireModelChange();
}
+ @Override
public void layerAdded(Layer newLayer) {}
+ @Override
public void layerRemoved(Layer oldLayer) {}
/**
@@ -778,11 +779,13 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
static class HistoryPrimitiveBuilder extends AbstractVisitor {
private HistoryOsmPrimitive clone;
+ @Override
public void visit(Node n) {
clone = new HistoryNode(n.getId(), n.getVersion(), n.isVisible(), getCurrentUser(), 0, null, n.getCoor(), false);
clone.setTags(n.getKeys());
}
+ @Override
public void visit(Relation r) {
clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(), getCurrentUser(), 0, null, false);
clone.setTags(r.getKeys());
@@ -792,6 +795,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
}
+ @Override
public void visit(Way w) {
clone = new HistoryWay(w.getId(), w.getVersion(), w.isVisible(), getCurrentUser(), 0, null, false);
clone.setTags(w.getKeys());
@@ -806,7 +810,7 @@ public class HistoryBrowserModel extends Observable implements LayerChangeListen
}
public HistoryOsmPrimitive build(OsmPrimitive primitive) {
- primitive.visit(this);
+ primitive.accept(this);
return clone;
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
index 7841618..fb47a5f 100644
--- a/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
@@ -9,7 +9,10 @@ import java.io.IOException;
import java.text.MessageFormat;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -19,7 +22,8 @@ import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
import org.openstreetmap.josm.gui.ExceptionDialogUtil;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.io.OsmServerChangesetReader;
import org.openstreetmap.josm.io.OsmServerHistoryReader;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -48,8 +52,9 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
private boolean canceled = false;
private Exception lastException = null;
- private HashSet<PrimitiveId> toLoad;
+ private Set<PrimitiveId> toLoad;
private HistoryDataSet loadedData;
+ private OsmServerHistoryReader reader = null;
public HistoryLoadTask() {
super(tr("Load history"), true);
@@ -59,9 +64,10 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
/**
* Creates a new task
*
- * @param parent the component to be used as reference to find the parent for {@link PleaseWaitDialog}.
- * Must not be null.
- * @throws IllegalArgumentException thrown if parent is null
+ * @param parent the component to be used as reference to find the
+ * parent for {@link org.openstreetmap.josm.gui.PleaseWaitDialog}.
+ * Must not be <code>null</code>.
+ * @throws IllegalArgumentException thrown if parent is <code>null</code>
*/
public HistoryLoadTask(Component parent) {
super(parent, tr("Load history"), true);
@@ -140,10 +146,11 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
/**
* Adds a collection of objects to loaded, specified by a collection of OSM primitives.
*
- * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required.
+ * @param primitives the OSM primitives. Must not be <code>null</code>.
+ * <code>primitive.getId() > 0</code> required.
* @return this task
- * @throws IllegalArgumentException thrown if primitives is null
- * @throws IllegalArgumentException thrown if one of the ids in the collection <= 0
+ * @throws IllegalArgumentException thrown if primitives is <code>null</code>
+ * @throws IllegalArgumentException thrown if one of the ids in the collection <= 0
*/
public HistoryLoadTask add(Collection<? extends OsmPrimitive> primitives) {
CheckParameterUtil.ensureParameterNotNull(primitives, "primitives");
@@ -158,7 +165,9 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
@Override
protected void cancel() {
- OsmApi.getOsmApi().cancel();
+ if (reader != null) {
+ reader.cancel();
+ }
canceled = true;
}
@@ -190,11 +199,16 @@ public class HistoryLoadTask extends PleaseWaitRunnable {
}
progressMonitor.indeterminateSubTask(tr(msg,
Long.toString(pid.getUniqueId())));
- OsmServerHistoryReader reader = null;
+ reader = null;
HistoryDataSet ds = null;
try {
reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
+ // load corresponding changesets (mostly for changeset comment)
+ for (final Changeset i : new OsmServerChangesetReader().queryChangesets(
+ new ChangesetQuery().forChangesetIds(ds.getChangesetIds()), progressMonitor.createSubTaskMonitor(1, false))) {
+ ds.putChangeset(i);
+ }
} catch(OsmTransferException e) {
if (canceled)
return;
diff --git a/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java b/src/org/openstreetmap/josm/gui/history/HistoryViewerPanel.java
similarity index 58%
copy from src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
copy to src/org/openstreetmap/josm/gui/history/HistoryViewerPanel.java
index 3ba3f24..e981094 100644
--- a/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/HistoryViewerPanel.java
@@ -1,145 +1,127 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.history;
-
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-
-/**
- * TagInfoViewer is a UI component which displays the list of tags of two
- * version of a {@link OsmPrimitive} in a {@link History}.
- *
- * <ul>
- * <li>on the left, it displays the list of tags for the version at {@link PointInTimeType#REFERENCE_POINT_IN_TIME}</li>
- * <li>on the right, it displays the list of tags for the version at {@link PointInTimeType#CURRENT_POINT_IN_TIME}</li>
- * </ul>
- *
- */
-public class TagInfoViewer extends JPanel{
-
- private HistoryBrowserModel model;
- private VersionInfoPanel referenceInfoPanel;
- private VersionInfoPanel currentInfoPanel;
- private AdjustmentSynchronizer adjustmentSynchronizer;
- private SelectionSynchronizer selectionSynchronizer;
-
- protected JScrollPane embeddInScrollPane(JTable table) {
- JScrollPane pane = new JScrollPane(table);
- pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
- adjustmentSynchronizer.participateInSynchronizedScrolling(pane.getVerticalScrollBar());
- return pane;
- }
-
- protected JTable buildReferenceTagTable() {
- JTable table = new JTable(
- model.getTagTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME),
- new TagTableColumnModel()
- );
- table.setName("table.referencetagtable");
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
- return table;
- }
-
- protected JTable buildCurrentTagTable() {
- JTable table = new JTable(
- model.getTagTableModel(PointInTimeType.CURRENT_POINT_IN_TIME),
- new TagTableColumnModel()
- );
- table.setName("table.currenttagtable");
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
- return table;
- }
-
- protected void build() {
- setLayout(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
-
- // ---------------------------
- gc.gridx = 0;
- gc.gridy = 0;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 0.0;
- gc.insets = new Insets(5,5,5,0);
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.anchor = GridBagConstraints.FIRST_LINE_START;
- referenceInfoPanel = new VersionInfoPanel(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
- add(referenceInfoPanel,gc);
-
- gc.gridx = 1;
- gc.gridy = 0;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.5;
- gc.weighty = 0.0;
- gc.anchor = GridBagConstraints.FIRST_LINE_START;
- currentInfoPanel = new VersionInfoPanel(model, PointInTimeType.CURRENT_POINT_IN_TIME);
- add(currentInfoPanel,gc);
-
- adjustmentSynchronizer = new AdjustmentSynchronizer();
- selectionSynchronizer = new SelectionSynchronizer();
-
- // ---------------------------
- gc.gridx = 0;
- gc.gridy = 1;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 1.0;
- gc.fill = GridBagConstraints.BOTH;
- gc.anchor = GridBagConstraints.NORTHWEST;
- add(embeddInScrollPane(buildReferenceTagTable()),gc);
-
- gc.gridx = 1;
- gc.gridy = 1;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 1.0;
- gc.fill = GridBagConstraints.BOTH;
- gc.anchor = GridBagConstraints.NORTHWEST;
- add(embeddInScrollPane(buildCurrentTagTable()),gc);
- }
-
- public TagInfoViewer(HistoryBrowserModel model) {
- setModel(model);
- build();
- }
-
- protected void unregisterAsObserver(HistoryBrowserModel model) {
- if (currentInfoPanel != null) {
- model.deleteObserver(currentInfoPanel);
- }
- if (referenceInfoPanel != null) {
- model.deleteObserver(referenceInfoPanel);
- }
- }
- protected void registerAsObserver(HistoryBrowserModel model) {
- if (currentInfoPanel != null) {
- model.addObserver(currentInfoPanel);
- }
- if (referenceInfoPanel != null) {
- model.addObserver(referenceInfoPanel);
- }
- }
-
- public void setModel(HistoryBrowserModel model) {
- if (this.model != null) {
- unregisterAsObserver(model);
- }
- this.model = model;
- if (this.model != null) {
- registerAsObserver(model);
- }
- }
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.history;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+
+import org.openstreetmap.josm.gui.util.AdjustmentSynchronizer;
+
+/**
+ * Base class of {@link TagInfoViewer} and {@link RelationMemberListViewer}.
+ * @since 6207
+ */
+public abstract class HistoryViewerPanel extends JPanel {
+
+ protected HistoryBrowserModel model;
+ protected VersionInfoPanel referenceInfoPanel;
+ protected VersionInfoPanel currentInfoPanel;
+ protected AdjustmentSynchronizer adjustmentSynchronizer;
+ protected SelectionSynchronizer selectionSynchronizer;
+
+ protected HistoryViewerPanel(HistoryBrowserModel model) {
+ setModel(model);
+ build();
+ }
+
+ private JScrollPane embedInScrollPane(JTable table) {
+ JScrollPane pane = new JScrollPane(table);
+ pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+ adjustmentSynchronizer.participateInSynchronizedScrolling(pane.getVerticalScrollBar());
+ return pane;
+ }
+
+ /**
+ * Sets the history browsing model.
+ * @param model The history browsing model
+ */
+ public final void setModel(HistoryBrowserModel model) {
+ if (this.model != null) {
+ unregisterAsObserver(model);
+ }
+ this.model = model;
+ if (this.model != null) {
+ registerAsObserver(model);
+ }
+ }
+
+ protected final void unregisterAsObserver(HistoryBrowserModel model) {
+ if (currentInfoPanel != null) {
+ model.deleteObserver(currentInfoPanel);
+ }
+ if (referenceInfoPanel != null) {
+ model.deleteObserver(referenceInfoPanel);
+ }
+ }
+
+ protected final void registerAsObserver(HistoryBrowserModel model) {
+ if (currentInfoPanel != null) {
+ model.addObserver(currentInfoPanel);
+ }
+ if (referenceInfoPanel != null) {
+ model.addObserver(referenceInfoPanel);
+ }
+ }
+
+ protected abstract JTable buildReferenceTable();
+
+ protected abstract JTable buildCurrentTable();
+
+ private void build() {
+ setLayout(new GridBagLayout());
+ GridBagConstraints gc = new GridBagConstraints();
+
+ // ---------------------------
+ gc.gridx = 0;
+ gc.gridy = 0;
+ gc.gridwidth = 1;
+ gc.gridheight = 1;
+ gc.weightx = 0.5;
+ gc.weighty = 0.0;
+ gc.insets = new Insets(5,5,5,0);
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.anchor = GridBagConstraints.FIRST_LINE_START;
+ referenceInfoPanel = new VersionInfoPanel(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
+ add(referenceInfoPanel,gc);
+
+ gc.gridx = 1;
+ gc.gridy = 0;
+ gc.gridwidth = 1;
+ gc.gridheight = 1;
+ gc.fill = GridBagConstraints.HORIZONTAL;
+ gc.weightx = 0.5;
+ gc.weighty = 0.0;
+ gc.anchor = GridBagConstraints.FIRST_LINE_START;
+ currentInfoPanel = new VersionInfoPanel(model, PointInTimeType.CURRENT_POINT_IN_TIME);
+ add(currentInfoPanel,gc);
+
+ adjustmentSynchronizer = new AdjustmentSynchronizer();
+ selectionSynchronizer = new SelectionSynchronizer();
+
+ // ---------------------------
+ gc.gridx = 0;
+ gc.gridy = 1;
+ gc.gridwidth = 1;
+ gc.gridheight = 1;
+ gc.weightx = 0.5;
+ gc.weighty = 1.0;
+ gc.fill = GridBagConstraints.BOTH;
+ gc.anchor = GridBagConstraints.NORTHWEST;
+ add(embedInScrollPane(buildReferenceTable()),gc);
+
+ gc.gridx = 1;
+ gc.gridy = 1;
+ gc.gridwidth = 1;
+ gc.gridheight = 1;
+ gc.weightx = 0.5;
+ gc.weighty = 1.0;
+ gc.fill = GridBagConstraints.BOTH;
+ gc.anchor = GridBagConstraints.NORTHWEST;
+ add(embedInScrollPane(buildCurrentTable()),gc);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
index ed0480f..7ea911c 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
@@ -46,6 +46,7 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRender
}
// Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java b/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java
index 710a72b..665377a 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java
@@ -8,7 +8,7 @@ import javax.swing.table.TableColumn;
/**
- * The {@link TableColumnModel} for the table with the list of nodes.
+ * The {@link javax.swing.table.TableColumnModel} for the table with the list of nodes.
*
*
*/
diff --git a/src/org/openstreetmap/josm/gui/history/NodeListViewer.java b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
index cc02316..1c4be7a 100644
--- a/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
@@ -28,6 +28,9 @@ import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
import org.openstreetmap.josm.data.osm.history.History;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.AdjustmentSynchronizer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -65,7 +68,7 @@ public class NodeListViewer extends JPanel {
table.setName("table.referencenodelisttable");
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
- table.addMouseListener(new PopupMenuLauncher(table));
+ table.addMouseListener(new InternalPopupMenuLauncher());
table.addMouseListener(new DoubleClickAdapter(table));
return table;
}
@@ -78,7 +81,7 @@ public class NodeListViewer extends JPanel {
table.setName("table.currentnodelisttable");
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
- table.addMouseListener(new PopupMenuLauncher(table));
+ table.addMouseListener(new InternalPopupMenuLauncher());
table.addMouseListener(new DoubleClickAdapter(table));
return table;
}
@@ -114,6 +117,8 @@ public class NodeListViewer extends JPanel {
adjustmentSynchronizer = new AdjustmentSynchronizer();
selectionSynchronizer = new SelectionSynchronizer();
+ popupMenu = new NodeListPopupMenu();
+
// ---------------------------
gc.gridx = 0;
gc.gridy = 1;
@@ -134,8 +139,6 @@ public class NodeListViewer extends JPanel {
gc.fill = GridBagConstraints.BOTH;
gc.anchor = GridBagConstraints.NORTHWEST;
add(embeddInScrollPane(buildCurrentNodeListTable()),gc);
-
- popupMenu = new NodeListPopupMenu();
}
public NodeListViewer(HistoryBrowserModel model) {
@@ -171,8 +174,8 @@ public class NodeListViewer extends JPanel {
}
static class NodeListPopupMenu extends JPopupMenu {
- private ZoomToNodeAction zoomToNodeAction;
- private ShowHistoryAction showHistoryAction;
+ private final ZoomToNodeAction zoomToNodeAction;
+ private final ShowHistoryAction showHistoryAction;
public NodeListPopupMenu() {
zoomToNodeAction = new ZoomToNodeAction();
@@ -199,12 +202,16 @@ public class NodeListViewer extends JPanel {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "zoomin"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled()) return;
OsmPrimitive p = getPrimitiveToZoom();
- if (p!= null) {
- getEditLayer().data.setSelected(p.getPrimitiveId());
- AutoScaleAction.autoScale("selection");
+ if (p != null) {
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer != null) {
+ editLayer.data.setSelected(p.getPrimitiveId());
+ AutoScaleAction.autoScale("selection");
+ }
}
}
@@ -213,22 +220,16 @@ public class NodeListViewer extends JPanel {
updateEnabledState();
}
- protected OsmDataLayer getEditLayer() {
- try {
- return Main.map.mapView.getEditLayer();
- } catch(NullPointerException e) {
- return null;
- }
- }
-
protected OsmPrimitive getPrimitiveToZoom() {
if (primitiveId == null) return null;
- OsmPrimitive p = getEditLayer().data.getPrimitiveById(primitiveId);
+ OsmDataLayer editLayer = Main.main.getEditLayer();
+ if (editLayer == null) return null;
+ OsmPrimitive p = editLayer.data.getPrimitiveById(primitiveId);
return p;
}
public void updateEnabledState() {
- if (getEditLayer() == null) {
+ if (!Main.main.hasEditLayer()) {
setEnabled(false);
return;
}
@@ -245,6 +246,7 @@ public class NodeListViewer extends JPanel {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (!isEnabled()) return;
run();
@@ -260,11 +262,16 @@ public class NodeListViewer extends JPanel {
Main.worker.submit(new HistoryLoadTask().add(primitiveId));
}
Runnable r = new Runnable() {
+ @Override
public void run() {
- History h = HistoryDataSet.getInstance().getHistory(primitiveId);
+ final History h = HistoryDataSet.getInstance().getHistory(primitiveId);
if (h == null)
return;
- HistoryBrowserDialogManager.getInstance().show(h);
+ GuiHelper.runInEDT(new Runnable() {
+ @Override public void run() {
+ HistoryBrowserDialogManager.getInstance().show(h);
+ }
+ });
}
};
Main.worker.submit(r);
@@ -282,33 +289,15 @@ public class NodeListViewer extends JPanel {
return new SimplePrimitiveId(id, OsmPrimitiveType.NODE);
}
- class PopupMenuLauncher extends MouseAdapter {
- private JTable table;
-
- public PopupMenuLauncher(JTable table) {
- this.table = table;
- }
-
- @Override
- public void mousePressed(MouseEvent e) {
- showPopup(e);
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- showPopup(e);
+ class InternalPopupMenuLauncher extends PopupMenuLauncher {
+ public InternalPopupMenuLauncher() {
+ super(popupMenu);
}
- private void showPopup(MouseEvent e) {
- if (!e.isPopupTrigger()) return;
- Point p = e.getPoint();
- int row = table.rowAtPoint(p);
-
- PrimitiveId pid = primitiveIdAtRow(table.getModel(), row);
- if (pid == null)
- return;
- popupMenu.prepare(pid);
- popupMenu.show(e.getComponent(), e.getX(), e.getY());
+ @Override protected int checkTableSelection(JTable table, Point p) {
+ int row = super.checkTableSelection(table, p);
+ popupMenu.prepare(primitiveIdAtRow(table.getModel(), row));
+ return row;
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/PointInTimeType.java b/src/org/openstreetmap/josm/gui/history/PointInTimeType.java
index d461e80..1779098 100644
--- a/src/org/openstreetmap/josm/gui/history/PointInTimeType.java
+++ b/src/org/openstreetmap/josm/gui/history/PointInTimeType.java
@@ -2,9 +2,9 @@
package org.openstreetmap.josm.gui.history;
/**
- * PointInTimeType enumerates two points in time in the {@link History} of an {@link OsmPrimitive}.
+ * PointInTimeType enumerates two points in time in the {@link org.openstreetmap.josm.data.osm.history.History}
+ * of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
* @author karl
- *
*/
public enum PointInTimeType {
/** the point in time selected as reference point when comparing two version */
diff --git a/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
index 4dde646..eb4a7fb 100644
--- a/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Component;
import java.util.HashMap;
+import java.util.Map;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
@@ -18,7 +19,7 @@ import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item;
import org.openstreetmap.josm.tools.ImageProvider;
/**
- * The {@link TableCellRenderer} for a list of relation members in {@link HistoryBrower}
+ * The {@link TableCellRenderer} for a list of relation members in {@link HistoryBrowser}
*
*
*/
@@ -29,7 +30,7 @@ public class RelationMemberListTableCellRenderer extends JLabel implements Table
public final static Color BGCOLOR_IN_OPPOSITE = new Color(255,234,213);
public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
- private HashMap<OsmPrimitiveType, ImageIcon> icons;
+ private Map<OsmPrimitiveType, ImageIcon> icons;
public RelationMemberListTableCellRenderer(){
setOpaque(true);
@@ -75,6 +76,7 @@ public class RelationMemberListTableCellRenderer extends JLabel implements Table
}
// Warning: The model pads with null-rows to match the size of the opposite table. 'value' could be null
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java b/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
index d3bac69..e1065d5 100644
--- a/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
@@ -1,22 +1,16 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.history;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
import java.awt.Rectangle;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
-import org.openstreetmap.josm.data.osm.history.History;
/**
* RelationMemberListViewer is a UI component which displays the list of relation members of two
- * version of a {@link Relation} in a {@link History}.
+ * version of a {@link org.openstreetmap.josm.data.osm.Relation} in a {@link org.openstreetmap.josm.data.osm.history.History}.
*
* <ul>
* <li>on the left, it displays the list of relation members for the version at {@link PointInTimeType#REFERENCE_POINT_IN_TIME}</li>
@@ -24,22 +18,7 @@ import org.openstreetmap.josm.data.osm.history.History;
* </ul>
*
*/
-
-public class RelationMemberListViewer extends JPanel{
-
- private HistoryBrowserModel model;
- private VersionInfoPanel referenceInfoPanel;
- private VersionInfoPanel currentInfoPanel;
- private AdjustmentSynchronizer adjustmentSynchronizer;
- private SelectionSynchronizer selectionSynchronizer;
-
- protected JScrollPane embeddInScrollPane(JTable table) {
- JScrollPane pane = new JScrollPane(table);
- pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
- adjustmentSynchronizer.participateInSynchronizedScrolling(pane.getVerticalScrollBar());
- return pane;
- }
+public class RelationMemberListViewer extends HistoryViewerPanel {
protected class MemberModelChanged implements TableModelListener {
private final JTable table;
@@ -55,7 +34,7 @@ public class RelationMemberListViewer extends JPanel{
}
}
- protected JTable buildReferenceMemberListTable() {
+ protected JTable buildReferenceTable() {
JTable table = new JTable(
model.getRelationMemberTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME),
new RelationMemberTableColumnModel()
@@ -67,7 +46,7 @@ public class RelationMemberListViewer extends JPanel{
return table;
}
- protected JTable buildCurrentMemberListTable() {
+ protected JTable buildCurrentTable() {
JTable table = new JTable(
model.getRelationMemberTableModel(PointInTimeType.CURRENT_POINT_IN_TIME),
new RelationMemberTableColumnModel()
@@ -79,88 +58,11 @@ public class RelationMemberListViewer extends JPanel{
return table;
}
- protected void build() {
- setLayout(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
-
- // ---------------------------
- gc.gridx = 0;
- gc.gridy = 0;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 0.0;
- gc.insets = new Insets(5,5,5,0);
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.anchor = GridBagConstraints.FIRST_LINE_START;
- referenceInfoPanel = new VersionInfoPanel(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
- add(referenceInfoPanel,gc);
-
- gc.gridx = 1;
- gc.gridy = 0;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.5;
- gc.weighty = 0.0;
- gc.anchor = GridBagConstraints.FIRST_LINE_START;
- currentInfoPanel = new VersionInfoPanel(model, PointInTimeType.CURRENT_POINT_IN_TIME);
- add(currentInfoPanel,gc);
-
- adjustmentSynchronizer = new AdjustmentSynchronizer();
- selectionSynchronizer = new SelectionSynchronizer();
-
- // ---------------------------
- gc.gridx = 0;
- gc.gridy = 1;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 1.0;
- gc.fill = GridBagConstraints.BOTH;
- gc.anchor = GridBagConstraints.NORTHWEST;
- add(embeddInScrollPane(buildReferenceMemberListTable()),gc);
-
- gc.gridx = 1;
- gc.gridy = 1;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 1.0;
- gc.fill = GridBagConstraints.BOTH;
- gc.anchor = GridBagConstraints.NORTHWEST;
- add(embeddInScrollPane(buildCurrentMemberListTable()),gc);
- }
-
+ /**
+ * Constructs a new {@code RelationMemberListViewer}.
+ * @param model The history browsing model
+ */
public RelationMemberListViewer(HistoryBrowserModel model) {
- setModel(model);
- build();
- }
-
- protected void unregisterAsObserver(HistoryBrowserModel model) {
- if (currentInfoPanel != null) {
- model.deleteObserver(currentInfoPanel);
- }
- if (referenceInfoPanel != null) {
- model.deleteObserver(referenceInfoPanel);
- }
- }
- protected void registerAsObserver(HistoryBrowserModel model) {
- if (currentInfoPanel != null) {
- model.addObserver(currentInfoPanel);
- }
- if (referenceInfoPanel != null) {
- model.addObserver(referenceInfoPanel);
- }
- }
-
- public void setModel(HistoryBrowserModel model) {
- if (this.model != null) {
- unregisterAsObserver(model);
- }
- this.model = model;
- if (this.model != null) {
- registerAsObserver(model);
- }
+ super(model);
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java b/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java
index 9800831..712979a 100644
--- a/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java
@@ -7,7 +7,7 @@ import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
/**
- * The {@link TableColumnModel} for the table with the list of relation members.
+ * The {@link javax.swing.table.TableColumnModel} for the table with the list of relation members.
*
*/
public class RelationMemberTableColumnModel extends DefaultTableColumnModel {
diff --git a/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java b/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
index def0031..7dbd79a 100644
--- a/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
+++ b/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.gui.history;
import java.util.ArrayList;
+import java.util.List;
import javax.swing.DefaultListSelectionModel;
import javax.swing.ListSelectionModel;
@@ -10,8 +11,11 @@ import javax.swing.event.ListSelectionListener;
public class SelectionSynchronizer implements ListSelectionListener {
- private ArrayList<ListSelectionModel> participants;
+ private List<ListSelectionModel> participants;
+ /**
+ * Constructs a new {@code SelectionSynchronizer}.
+ */
public SelectionSynchronizer() {
participants = new ArrayList<ListSelectionModel>();
}
@@ -25,6 +29,7 @@ public class SelectionSynchronizer implements ListSelectionListener {
model.addListSelectionListener(this);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
DefaultListSelectionModel referenceModel = (DefaultListSelectionModel)e.getSource();
int i = referenceModel.getMinSelectionIndex();
diff --git a/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java b/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
index 3ba3f24..d785ffc 100644
--- a/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
@@ -1,18 +1,12 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.history;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
/**
* TagInfoViewer is a UI component which displays the list of tags of two
- * version of a {@link OsmPrimitive} in a {@link History}.
+ * version of a {@link org.openstreetmap.josm.data.osm.OsmPrimitive} in a {@link org.openstreetmap.josm.data.osm.history.History}.
*
* <ul>
* <li>on the left, it displays the list of tags for the version at {@link PointInTimeType#REFERENCE_POINT_IN_TIME}</li>
@@ -20,23 +14,9 @@ import javax.swing.ListSelectionModel;
* </ul>
*
*/
-public class TagInfoViewer extends JPanel{
-
- private HistoryBrowserModel model;
- private VersionInfoPanel referenceInfoPanel;
- private VersionInfoPanel currentInfoPanel;
- private AdjustmentSynchronizer adjustmentSynchronizer;
- private SelectionSynchronizer selectionSynchronizer;
-
- protected JScrollPane embeddInScrollPane(JTable table) {
- JScrollPane pane = new JScrollPane(table);
- pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
- adjustmentSynchronizer.participateInSynchronizedScrolling(pane.getVerticalScrollBar());
- return pane;
- }
+public class TagInfoViewer extends HistoryViewerPanel {
- protected JTable buildReferenceTagTable() {
+ protected JTable buildReferenceTable() {
JTable table = new JTable(
model.getTagTableModel(PointInTimeType.REFERENCE_POINT_IN_TIME),
new TagTableColumnModel()
@@ -47,7 +27,7 @@ public class TagInfoViewer extends JPanel{
return table;
}
- protected JTable buildCurrentTagTable() {
+ protected JTable buildCurrentTable() {
JTable table = new JTable(
model.getTagTableModel(PointInTimeType.CURRENT_POINT_IN_TIME),
new TagTableColumnModel()
@@ -58,88 +38,11 @@ public class TagInfoViewer extends JPanel{
return table;
}
- protected void build() {
- setLayout(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
-
- // ---------------------------
- gc.gridx = 0;
- gc.gridy = 0;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 0.0;
- gc.insets = new Insets(5,5,5,0);
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.anchor = GridBagConstraints.FIRST_LINE_START;
- referenceInfoPanel = new VersionInfoPanel(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
- add(referenceInfoPanel,gc);
-
- gc.gridx = 1;
- gc.gridy = 0;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 0.5;
- gc.weighty = 0.0;
- gc.anchor = GridBagConstraints.FIRST_LINE_START;
- currentInfoPanel = new VersionInfoPanel(model, PointInTimeType.CURRENT_POINT_IN_TIME);
- add(currentInfoPanel,gc);
-
- adjustmentSynchronizer = new AdjustmentSynchronizer();
- selectionSynchronizer = new SelectionSynchronizer();
-
- // ---------------------------
- gc.gridx = 0;
- gc.gridy = 1;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 1.0;
- gc.fill = GridBagConstraints.BOTH;
- gc.anchor = GridBagConstraints.NORTHWEST;
- add(embeddInScrollPane(buildReferenceTagTable()),gc);
-
- gc.gridx = 1;
- gc.gridy = 1;
- gc.gridwidth = 1;
- gc.gridheight = 1;
- gc.weightx = 0.5;
- gc.weighty = 1.0;
- gc.fill = GridBagConstraints.BOTH;
- gc.anchor = GridBagConstraints.NORTHWEST;
- add(embeddInScrollPane(buildCurrentTagTable()),gc);
- }
-
+ /**
+ * Constructs a new {@code TagInfoViewer}.
+ * @param model The history browsing model
+ */
public TagInfoViewer(HistoryBrowserModel model) {
- setModel(model);
- build();
- }
-
- protected void unregisterAsObserver(HistoryBrowserModel model) {
- if (currentInfoPanel != null) {
- model.deleteObserver(currentInfoPanel);
- }
- if (referenceInfoPanel != null) {
- model.deleteObserver(referenceInfoPanel);
- }
- }
- protected void registerAsObserver(HistoryBrowserModel model) {
- if (currentInfoPanel != null) {
- model.addObserver(currentInfoPanel);
- }
- if (referenceInfoPanel != null) {
- model.addObserver(referenceInfoPanel);
- }
- }
-
- public void setModel(HistoryBrowserModel model) {
- if (this.model != null) {
- unregisterAsObserver(model);
- }
- this.model = model;
- if (this.model != null) {
- registerAsObserver(model);
- }
+ super(model);
}
}
diff --git a/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java b/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
index 115bdf4..f87f834 100644
--- a/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
@@ -13,7 +13,7 @@ import javax.swing.UIManager;
import javax.swing.table.TableCellRenderer;
/**
- * The {@link TableCellRenderer} for a list of tagsin {@link HistoryBrower}
+ * The {@link TableCellRenderer} for a list of tags in {@link HistoryBrowser}
*
*/
public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
@@ -74,6 +74,7 @@ public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
setFont(font);
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
int row, int column) {
diff --git a/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java b/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java
index 2f491ad..3aec3d9 100644
--- a/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java
@@ -7,7 +7,7 @@ import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
/**
- * The {@link TableColumnModel} for the table with the list of tags
+ * The {@link javax.swing.table.TableColumnModel} for the table with the list of tags
*
*/
public class TagTableColumnModel extends DefaultTableColumnModel{
diff --git a/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java b/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
index 90707d3..9e2a90b 100644
--- a/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
+++ b/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
@@ -4,9 +4,11 @@ package org.openstreetmap.josm.gui.history;
import java.awt.Color;
import java.util.ArrayList;
+import java.util.List;
import org.openstreetmap.josm.gui.history.TwoColumnDiff.Item.DiffItemType;
import org.openstreetmap.josm.tools.Diff;
+import org.openstreetmap.josm.tools.Utils;
/**
* Produces a "two column diff" of two lists. (same as diff -y)
@@ -48,24 +50,22 @@ class TwoColumnDiff {
public final DiffItemType state;
}
- public ArrayList<Item> referenceDiff;
- public ArrayList<Item> currentDiff;
+ public List<Item> referenceDiff;
+ public List<Item> currentDiff;
Object[] reference;
Object[] current;
- /**
- * The arguments will _not_ be modified
- */
public TwoColumnDiff(Object[] reference, Object[] current) {
- this.reference = reference;
- this.current = current;
+ this.reference = Utils.copyArray(reference);
+ this.current = Utils.copyArray(current);
referenceDiff = new ArrayList<Item>();
currentDiff = new ArrayList<Item>();
diff();
}
+
private void diff() {
Diff diff = new Diff(reference, current);
- Diff.change script = diff.diff_2(false);
+ Diff.Change script = diff.diff_2(false);
twoColumnDiffFromScript(script, reference, current);
}
@@ -73,7 +73,7 @@ class TwoColumnDiff {
* The result from the diff algorithm is a "script" (a compressed description of the changes)
* This method expands this script into a full two column description.
*/
- private void twoColumnDiffFromScript(Diff.change script, Object[] a, Object[] b) {
+ private void twoColumnDiffFromScript(Diff.Change script, Object[] a, Object[] b) {
int ia = 0;
int ib = 0;
@@ -81,7 +81,6 @@ class TwoColumnDiff {
int deleted = script.deleted;
int inserted = script.inserted;
while(ia < script.line0 && ib < script.line1){
- // System.out.println(" "+a[ia] + "\t "+b[ib]);
Item cell = new Item(DiffItemType.SAME, a[ia]);
referenceDiff.add(cell);
currentDiff.add(cell);
@@ -91,15 +90,12 @@ class TwoColumnDiff {
while(inserted > 0 || deleted > 0) {
if(inserted > 0 && deleted > 0) {
- // System.out.println("="+a[ia] + "\t="+b[ib]);
referenceDiff.add(new Item(DiffItemType.CHANGED, a[ia++]));
currentDiff.add(new Item(DiffItemType.CHANGED, b[ib++]));
} else if(inserted > 0) {
- // System.out.println("\t+" + b[ib]);
referenceDiff.add(new Item(DiffItemType.EMPTY, null));
currentDiff.add(new Item(DiffItemType.INSERTED, b[ib++]));
} else if(deleted > 0) {
- // System.out.println("-"+a[ia]);
referenceDiff.add(new Item(DiffItemType.DELETED, a[ia++]));
currentDiff.add(new Item(DiffItemType.EMPTY, null));
}
@@ -109,7 +105,6 @@ class TwoColumnDiff {
script = script.link;
}
while(ia < a.length && ib < b.length) {
- // System.out.println((ia < a.length ? " "+a[ia]+"\t" : "\t") + (ib < b.length ? " "+b[ib] : ""));
referenceDiff.add(new Item(DiffItemType.SAME, a[ia++]));
currentDiff.add(new Item(DiffItemType.SAME, b[ib++]));
}
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index 810ac33..edd1294 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -1,13 +1,12 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.history;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.DateFormat;
@@ -16,17 +15,18 @@ import java.util.Observer;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import javax.swing.JTextArea;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AbstractInfoAction;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.UrlLabel;
/**
* VersionInfoPanel is an UI component which displays the basic properties of a version
@@ -39,16 +39,15 @@ public class VersionInfoPanel extends JPanel implements Observer{
private JMultilineLabel lblInfo;
private UrlLabel lblUser;
private UrlLabel lblChangeset;
- private JPanel pnlUserAndChangeset;
+ private JTextArea lblChangesetComment;
protected void build() {
JPanel pnl1 = new JPanel();
pnl1.setLayout(new BorderLayout());
lblInfo = new JMultilineLabel("");
- //lblInfo.setHorizontalAlignment(JLabel.LEFT);
pnl1.add(lblInfo, BorderLayout.CENTER);
- pnlUserAndChangeset = new JPanel();
+ JPanel pnlUserAndChangeset = new JPanel();
pnlUserAndChangeset.setLayout(new GridLayout(2,2));
lblUser = new UrlLabel("", 2);
pnlUserAndChangeset.add(new JLabel(tr("User:")));
@@ -57,6 +56,11 @@ public class VersionInfoPanel extends JPanel implements Observer{
lblChangeset = new UrlLabel("", 2);
pnlUserAndChangeset.add(lblChangeset);
+ lblChangesetComment = new JTextArea();
+ lblChangesetComment.setLineWrap(true);
+ lblChangesetComment.setEditable(false);
+ lblChangesetComment.setOpaque(false);
+
setLayout(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
gc.anchor = GridBagConstraints.NORTHWEST;
@@ -67,6 +71,8 @@ public class VersionInfoPanel extends JPanel implements Observer{
gc.gridy = 1;
gc.weighty = 0.0;
add(pnlUserAndChangeset, gc);
+ gc.gridy = 2;
+ add(lblChangesetComment, gc);
}
protected HistoryOsmPrimitive getPrimitive() {
@@ -75,34 +81,32 @@ public class VersionInfoPanel extends JPanel implements Observer{
return model.getPointInTime(pointInTimeType);
}
- protected OsmDataLayer getEditLayer() {
- try {
- return Main.map.mapView.getEditLayer();
- } catch(NullPointerException e) {
- return null;
- }
- }
-
protected String getInfoText() {
HistoryOsmPrimitive primitive = getPrimitive();
if (primitive == null)
return "";
String text;
if (model.isLatest(primitive)) {
+ OsmDataLayer editLayer = Main.main.getEditLayer();
text = tr("<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>",
Long.toString(primitive.getVersion()),
- getEditLayer() == null ? tr("unknown") : getEditLayer().getName()
+ editLayer == null ? tr("unknown") : editLayer.getName()
);
} else {
+ String date = "?";
+ if (primitive.getTimestamp() != null) {
+ date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(primitive.getTimestamp());
+ }
text = tr(
"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>",
- Long.toString(primitive.getVersion()),
- DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(primitive.getTimestamp())
- );
+ Long.toString(primitive.getVersion()), date);
}
return text;
}
+ /**
+ * Constructs a new {@code VersionInfoPanel}.
+ */
public VersionInfoPanel() {
pointInTimeType = null;
model = null;
@@ -128,6 +132,7 @@ public class VersionInfoPanel extends JPanel implements Observer{
build();
}
+ @Override
public void update(Observable o, Object arg) {
lblInfo.setText(getInfoText());
@@ -135,6 +140,9 @@ public class VersionInfoPanel extends JPanel implements Observer{
String url = AbstractInfoAction.getBaseBrowseUrl() + "/changeset/" + getPrimitive().getChangesetId();
lblChangeset.setUrl(url);
lblChangeset.setDescription(Long.toString(getPrimitive().getChangesetId()));
+ final String comment = getPrimitive().getChangeset() != null ? getPrimitive().getChangeset().get("comment") : null;
+ lblChangesetComment.setText(comment);
+ lblChangesetComment.setToolTipText(tr("Changeset comment"));
try {
if (getPrimitive().getUser() != null && getPrimitive().getUser() != User.getAnonymous()) {
diff --git a/src/org/openstreetmap/josm/gui/history/VersionTable.java b/src/org/openstreetmap/josm/gui/history/VersionTable.java
index 684af3c..4e8052d 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionTable.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionTable.java
@@ -5,11 +5,11 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.awt.Dimension;
+import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Observable;
import java.util.Observer;
@@ -29,6 +29,7 @@ import javax.swing.table.TableCellRenderer;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AbstractInfoAction;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -80,24 +81,19 @@ public class VersionTable extends JTable implements Observer{
return (HistoryBrowserModel.VersionTableModel) getModel();
}
+ @Override
public void update(Observable o, Object arg) {
repaint();
}
- protected void showPopupMenu(MouseEvent evt) {
- HistoryBrowserModel.VersionTableModel model = getVersionTableModel();
- int row = rowAtPoint(evt.getPoint());
- if (row > -1 && !model.isLatest(row)) {
- HistoryOsmPrimitive primitive = model.getPrimitive(row);
- popupMenu.prepare(primitive);
- popupMenu.show(evt.getComponent(), evt.getX(), evt.getY());
+ class MouseListener extends PopupMenuLauncher {
+ public MouseListener() {
+ super(popupMenu);
}
- }
-
- class MouseListener extends MouseAdapter {
@Override
public void mousePressed(MouseEvent e) {
- if (!showPopup(e) && e.getButton() == MouseEvent.BUTTON1) {
+ super.mousePressed(e);
+ if (!e.isPopupTrigger() && e.getButton() == MouseEvent.BUTTON1) {
int row = rowAtPoint(e.getPoint());
int col = columnAtPoint(e.getPoint());
if (row > 0 && (col == VersionTableColumnModel.COL_DATE || col == VersionTableColumnModel.COL_USER)) {
@@ -107,15 +103,13 @@ public class VersionTable extends JTable implements Observer{
}
}
@Override
- public void mouseReleased(MouseEvent e) {
- showPopup(e);
- }
- private boolean showPopup(MouseEvent e) {
- if (e.isPopupTrigger()) {
- showPopupMenu(e);
- return true;
+ protected int checkTableSelection(JTable table, Point p) {
+ HistoryBrowserModel.VersionTableModel model = getVersionTableModel();
+ int row = rowAtPoint(p);
+ if (row > -1 && !model.isLatest(row)) {
+ popupMenu.prepare(model.getPrimitive(row));
}
- return false;
+ return row;
}
}
@@ -170,6 +164,7 @@ public class VersionTable extends JTable implements Observer{
public static class RadioButtonRenderer extends JRadioButton implements TableCellRenderer {
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
setSelected(value != null && (Boolean)value);
setHorizontalAlignment(SwingConstants.CENTER);
@@ -202,6 +197,7 @@ public class VersionTable extends JTable implements Observer{
return btn.isSelected();
}
+ @Override
public void itemStateChanged(ItemEvent e) {
fireEditingStopped();
}
@@ -211,6 +207,7 @@ public class VersionTable extends JTable implements Observer{
public AlignedRenderer(int hAlignment) {
setHorizontalAlignment(hAlignment);
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,int row,int column) {
String v = value.toString();
setText(v);
diff --git a/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java b/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
index fa158c1..0a86747 100644
--- a/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
+++ b/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
@@ -87,6 +87,7 @@ public abstract class AbstractIOTask implements Runnable {
/**
* Runs the task
*/
+ @Override
public abstract void run();
/**
diff --git a/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java b/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
index 1c25d1c..4142a4e 100644
--- a/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
+++ b/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
@@ -24,8 +24,8 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.gui.ExceptionDialogUtil;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.OsmApiException;
@@ -239,7 +239,7 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable {
"/Action/Upload#NodeStillInUseInWay"
);
if (ret == 0) {
- DownloadReferrersAction.downloadReferrers(Main.map.mapView.getEditLayer(), Arrays.asList(conflict.a));
+ DownloadReferrersAction.downloadReferrers(Main.main.getEditLayer(), Arrays.asList(conflict.a));
}
}
@@ -249,21 +249,22 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable {
* @param e the exception
*/
protected void handleUploadConflict(OsmApiException e) {
- String pattern = "Version mismatch: Provided (\\d+), server had: (\\d+) of (\\S+) (\\d+)";
- Pattern p = Pattern.compile(pattern);
- Matcher m = p.matcher(e.getErrorHeader());
- if (m.matches()) {
- handleUploadConflictForKnownConflict(OsmPrimitiveType.from(m.group(3)), Long.parseLong(m.group(4)), m.group(2),m.group(1));
- return;
- }
- pattern ="The changeset (\\d+) was closed at (.*)";
- p = Pattern.compile(pattern);
- m = p.matcher(e.getErrorHeader());
- if (m.matches()) {
- handleUploadConflictForClosedChangeset(Long.parseLong(m.group(1)), DateUtils.fromString(m.group(2)));
- return;
+ final String errorHeader = e.getErrorHeader();
+ if (errorHeader != null) {
+ Pattern p = Pattern.compile("Version mismatch: Provided (\\d+), server had: (\\d+) of (\\S+) (\\d+)");
+ Matcher m = p.matcher(errorHeader);
+ if (m.matches()) {
+ handleUploadConflictForKnownConflict(OsmPrimitiveType.from(m.group(3)), Long.parseLong(m.group(4)), m.group(2),m.group(1));
+ return;
+ }
+ p = Pattern.compile("The changeset (\\d+) was closed at (.*)");
+ m = p.matcher(errorHeader);
+ if (m.matches()) {
+ handleUploadConflictForClosedChangeset(Long.parseLong(m.group(1)), DateUtils.fromString(m.group(2)));
+ return;
+ }
}
- System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader()));
+ Main.warn(tr("Error header \"{0}\" did not match with an expected pattern", errorHeader));
handleUploadConflictForUnknownConflict();
}
@@ -278,7 +279,7 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable {
if (conflict != null) {
handleUploadPreconditionFailedConflict(e, conflict);
} else {
- System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader()));
+ Main.warn(tr("Error header \"{0}\" did not match with an expected pattern", e.getErrorHeader()));
ExceptionDialogUtil.explainPreconditionFailed(e);
}
}
@@ -293,7 +294,7 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable {
*/
protected void handleGone(OsmApiPrimitiveGoneException e) {
if (e.isKnownPrimitive()) {
- new UpdateSelectionAction().handlePrimitiveGoneException(e.getPrimitiveId(),e.getPrimitiveType());
+ UpdateSelectionAction.handlePrimitiveGoneException(e.getPrimitiveId(),e.getPrimitiveType());
} else {
ExceptionDialogUtil.explainGoneForUnknownPrimitive(e);
}
diff --git a/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java b/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
index a9dbcf6..aea4eb0 100644
--- a/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
+++ b/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
@@ -27,7 +27,7 @@ import org.openstreetmap.josm.tools.GBC;
* This class creates a table cell that features two checkboxes, Upload and Save. It
* handles everything on its own, in other words it renders itself and also functions
* as editor so the checkboxes may be set by the user.
- *
+ *
* Intended usage is like this:
* ActionFlagsTableCell aftc = new ActionFlagsTableCell();
* col = new TableColumn(0);
@@ -39,6 +39,7 @@ class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCel
private CopyOnWriteArrayList<CellEditorListener> listeners;
private ActionListener al = new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
fireEditingStopped();
}
@@ -53,12 +54,12 @@ class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCel
setLayout(new GridBagLayout());
ActionMap am = getActionMap();
- for(int i=0; i<checkBoxes.length; i++) {
- final JCheckBox b = checkBoxes[i];
+ for (final JCheckBox b : checkBoxes) {
add(b, GBC.eol().fill(GBC.HORIZONTAL));
b.setPreferredSize(new Dimension(b.getPreferredSize().width, 19));
b.addActionListener(al);
am.put(b.getText(), new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
b.setSelected(!b.isSelected());
fireEditingStopped();
@@ -84,11 +85,13 @@ class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCel
}
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
updateCheckboxes(value);
return this;
}
+ @Override
public void addCellEditorListener(CellEditorListener l) {
if (l != null) {
listeners.addIfAbsent(l);
@@ -107,10 +110,12 @@ class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCel
}
}
+ @Override
public void cancelCellEditing() {
fireEditingCanceled();
}
+ @Override
public Object getCellEditorValue() {
boolean[] values = new boolean[2];
values[0] = checkBoxes[0].isSelected();
@@ -118,23 +123,28 @@ class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCel
return values;
}
+ @Override
public boolean isCellEditable(EventObject anEvent) {
return true;
}
+ @Override
public void removeCellEditorListener(CellEditorListener l) {
listeners.remove(l);
}
+ @Override
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
+ @Override
public boolean stopCellEditing() {
fireEditingStopped();
return true;
}
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
updateCheckboxes(value);
return this;
diff --git a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
index 8a75a1c..a7d7212 100644
--- a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
@@ -36,43 +36,41 @@ import org.openstreetmap.josm.tools.GBC;
public class BasicUploadSettingsPanel extends JPanel {
public static final String HISTORY_KEY = "upload.comment.history";
public static final String HISTORY_LAST_USED_KEY = "upload.comment.last-used";
+ public static final String SOURCE_HISTORY_KEY = "upload.source.history";
/** the history combo box for the upload comment */
- private HistoryComboBox hcbUploadComment;
+ private final HistoryComboBox hcbUploadComment = new HistoryComboBox();
+ private final HistoryComboBox hcbUploadSource = new HistoryComboBox();
/** the panel with a summary of the upload parameters */
- private UploadParameterSummaryPanel pnlUploadParameterSummary;
- /** the changset comment model */
- private ChangesetCommentModel changesetCommentModel;
+ private final UploadParameterSummaryPanel pnlUploadParameterSummary = new UploadParameterSummaryPanel();
+ /** the changeset comment model */
+ private final ChangesetCommentModel changesetCommentModel;
+ private final ChangesetCommentModel changesetSourceModel;
protected JPanel buildUploadCommentPanel() {
JPanel pnl = new JPanel();
pnl.setLayout(new GridBagLayout());
+
pnl.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3));
- hcbUploadComment = new HistoryComboBox();
hcbUploadComment.setToolTipText(tr("Enter an upload comment"));
hcbUploadComment.setMaxTextLength(Changeset.MAX_COMMENT_LENGTH);
List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
- // we have to reverse the history, because ComboBoxHistory will reverse it again
- // in addElement()
- //
- Collections.reverse(cmtHistory);
+ Collections.reverse(cmtHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
hcbUploadComment.setPossibleItems(cmtHistory);
- hcbUploadComment.getEditor().addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- changesetCommentModel.setComment(hcbUploadComment.getText());
- }
- }
- );
- hcbUploadComment.getEditor().getEditorComponent().addFocusListener(
- new FocusAdapter() {
- @Override
- public void focusLost(FocusEvent e) {
- changesetCommentModel.setComment(hcbUploadComment.getText());
- }
- }
- );
+ final CommentModelListener commentModelListener = new CommentModelListener(hcbUploadComment, changesetCommentModel);
+ hcbUploadComment.getEditor().addActionListener(commentModelListener);
+ hcbUploadComment.getEditor().getEditorComponent().addFocusListener(commentModelListener);
pnl.add(hcbUploadComment, GBC.eol().fill(GBC.HORIZONTAL));
+
+ pnl.add(new JLabel(tr("Specify the data source for the changes:")), GBC.eol().insets(0, 8, 10, 3));
+ hcbUploadSource.setToolTipText(tr("Enter a source"));
+ List<String> sourceHistory = new LinkedList<String>(Main.pref.getCollection(SOURCE_HISTORY_KEY, new LinkedList<String>()));
+ Collections.reverse(sourceHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
+ hcbUploadSource.setPossibleItems(sourceHistory);
+ final CommentModelListener sourceModelListener = new CommentModelListener(hcbUploadSource, changesetSourceModel);
+ hcbUploadSource.getEditor().addActionListener(sourceModelListener);
+ hcbUploadSource.getEditor().getEditorComponent().addFocusListener(sourceModelListener);
+ pnl.add(hcbUploadSource, GBC.eol().fill(GBC.HORIZONTAL));
return pnl;
}
@@ -80,33 +78,45 @@ public class BasicUploadSettingsPanel extends JPanel {
setLayout(new BorderLayout());
setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
add(buildUploadCommentPanel(), BorderLayout.NORTH);
- add(pnlUploadParameterSummary = new UploadParameterSummaryPanel(), BorderLayout.CENTER);
+ add(pnlUploadParameterSummary, BorderLayout.CENTER);
}
/**
* Creates the panel
*
* @param changesetCommentModel the model for the changeset comment. Must not be null
+ * @param changesetSourceModel the model for the changeset source. Must not be null.
* @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null
*/
- public BasicUploadSettingsPanel(ChangesetCommentModel changesetCommentModel) {
+ public BasicUploadSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) {
CheckParameterUtil.ensureParameterNotNull(changesetCommentModel, "changesetCommentModel");
+ CheckParameterUtil.ensureParameterNotNull(changesetSourceModel, "changesetSourceModel");
this.changesetCommentModel = changesetCommentModel;
- changesetCommentModel.addObserver(new ChangesetCommentObserver());
+ this.changesetSourceModel = changesetSourceModel;
+ changesetCommentModel.addObserver(new ChangesetCommentObserver(hcbUploadComment));
+ changesetSourceModel.addObserver(new ChangesetCommentObserver(hcbUploadSource));
build();
}
- public void setUploadCommentDownFocusTraversalHandler(final Action handler) {
- hcbUploadComment.getEditor().addActionListener(handler);
- hcbUploadComment.getEditor().getEditorComponent().addKeyListener(
+ public void setUploadTagDownFocusTraversalHandlers(final Action handler) {
+ setHistoryComboBoxDownFocusTraversalHandler(handler, hcbUploadComment);
+ setHistoryComboBoxDownFocusTraversalHandler(handler, hcbUploadSource);
+ }
+
+ public void setHistoryComboBoxDownFocusTraversalHandler(final Action handler, final HistoryComboBox hcb) {
+ hcb.getEditor().addActionListener(handler);
+ hcb.getEditor().getEditorComponent().addKeyListener(
new KeyListener() {
+ @Override
public void keyTyped(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_TAB) {
- handler.actionPerformed(new ActionEvent(hcbUploadComment,0, "focusDown"));
+ handler.actionPerformed(new ActionEvent(hcb, 0, "focusDown"));
}
}
+ @Override
public void keyReleased(KeyEvent e) {}
+ @Override
public void keyPressed(KeyEvent e) {}
}
);
@@ -120,6 +130,9 @@ public class BasicUploadSettingsPanel extends JPanel {
hcbUploadComment.addCurrentItemToHistory();
Main.pref.putCollection(HISTORY_KEY, hcbUploadComment.getHistory());
Main.pref.putInteger(HISTORY_LAST_USED_KEY, (int) (System.currentTimeMillis() / 1000));
+ // store the history of sources
+ hcbUploadSource.addCurrentItemToHistory();
+ Main.pref.putCollection(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory());
}
/**
@@ -146,15 +159,46 @@ public class BasicUploadSettingsPanel extends JPanel {
}
/**
+ * Updates the changeset comment model upon changes in the input field.
+ */
+ static class CommentModelListener extends FocusAdapter implements ActionListener {
+
+ final HistoryComboBox source;
+ final ChangesetCommentModel destination;
+
+ CommentModelListener(HistoryComboBox source, ChangesetCommentModel destination) {
+ this.source = source;
+ this.destination = destination;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ destination.setComment(source.getText());
+ }
+ @Override
+ public void focusLost(FocusEvent e) {
+ destination.setComment(source.getText());
+ }
+ }
+
+ /**
* Observes the changeset comment model and keeps the comment input field
* in sync with the current changeset comment
*/
- class ChangesetCommentObserver implements Observer {
+ static class ChangesetCommentObserver implements Observer {
+
+ private final HistoryComboBox destination;
+
+ ChangesetCommentObserver(HistoryComboBox destination) {
+ this.destination = destination;
+ }
+
+ @Override
public void update(Observable o, Object arg) {
if (!(o instanceof ChangesetCommentModel)) return;
String newComment = (String)arg;
- if (!hcbUploadComment.getText().equals(newComment)) {
- hcbUploadComment.setText(newComment);
+ if (!destination.getText().equals(newComment)) {
+ destination.setText(newComment);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java b/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
index c58a755..536133e 100644
--- a/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
@@ -40,6 +40,7 @@ public class ChangesetCellRenderer extends JLabel implements ListCellRenderer {
return sb.toString();
}
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
boolean cellHasFocus) {
Changeset cs = (Changeset)value;
diff --git a/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java b/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java
index e0d5b16..934bfd2 100644
--- a/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java
+++ b/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java
@@ -14,7 +14,7 @@ public class ChangesetCommentModel extends Observable {
/**
* Sets the current changeset comment and notifies observers if the comment
* has changed.
- *
+ *
* @param comment the new upload comment. Empty string assumed if null.
*/
public void setComment(String comment) {
@@ -28,7 +28,7 @@ public class ChangesetCommentModel extends Observable {
/**
* Replies the current changeset comment in this model.
- *
+ *
* @return the current changeset comment in this model.
*/
public String getComment() {
diff --git a/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java b/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
index 8a061cf..7e8d116 100644
--- a/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
@@ -25,7 +25,7 @@ import javax.swing.event.ListDataListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.ChangesetCache;
-import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -36,7 +36,7 @@ import org.openstreetmap.josm.tools.ImageProvider;
*
* It is displayed as one of the configuration panels in the {@link UploadDialog}.
*
- * ChangesetManagementPanel is a source for {@link PropertyChangeEvent}s. Clients can listen
+ * ChangesetManagementPanel is a source for {@link java.beans.PropertyChangeEvent}s. Clients can listen
* to
* <ul>
* <li>{@link #SELECTED_CHANGESET_PROP} - the new value in the property change event is
@@ -50,12 +50,9 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
public final static String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset";
public final static String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload";
- private ButtonGroup bgUseNewOrExisting;
private JRadioButton rbUseNew;
private JRadioButton rbExisting;
private JosmComboBox cbOpenChangesets;
- private JButton btnRefresh;
- private JButton btnClose;
private JCheckBox cbCloseAfterUpload;
private OpenChangesetComboBoxModel model;
private ChangesetCommentModel changesetCommentModel;
@@ -68,7 +65,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
GridBagConstraints gc = new GridBagConstraints();
setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
- bgUseNewOrExisting = new ButtonGroup();
+ ButtonGroup bgUseNewOrExisting = new ButtonGroup();
gc.gridwidth = 4;
gc.gridx = 0;
@@ -124,7 +121,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
gc.weightx = 0.0;
gc.gridwidth = 1;
gc.weightx = 0.0;
- btnRefresh = new JButton(new RefreshAction());
+ JButton btnRefresh = new JButton(new RefreshAction());
btnRefresh.setMargin(new Insets(0,0,0,0));
add(btnRefresh, gc);
@@ -132,7 +129,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
gc.gridy = 2;
gc.gridwidth = 1;
CloseChangesetAction closeChangesetAction = new CloseChangesetAction();
- btnClose = new JButton(closeChangesetAction);
+ JButton btnClose = new JButton(closeChangesetAction);
btnClose.setMargin(new Insets(0,0,0,0));
cbOpenChangesets.addItemListener(closeChangesetAction);
rbExisting.addItemListener(closeChangesetAction);
@@ -221,14 +218,17 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
/* ---------------------------------------------------------------------------- */
/* Interface ListDataListener */
/* ---------------------------------------------------------------------------- */
+ @Override
public void contentsChanged(ListDataEvent e) {
refreshGUI();
}
+ @Override
public void intervalAdded(ListDataEvent e) {
refreshGUI();
}
+ @Override
public void intervalRemoved(ListDataEvent e) {
refreshGUI();
}
@@ -239,6 +239,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
*
*/
class ChangesetListItemStateListener implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
if (cs == null) return;
@@ -254,6 +255,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
*
*/
class CloseAfterUploadItemStateListener implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
if (e.getItemSelectable() != cbCloseAfterUpload)
return;
@@ -275,6 +277,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
*
*/
class RadioButtonHandler implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
if (rbUseNew.isSelected()) {
cbOpenChangesets.setEnabled(false);
@@ -298,11 +301,11 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
*/
class RefreshAction extends AbstractAction {
public RefreshAction() {
- //putValue(NAME, tr("Reload"));
putValue(SHORT_DESCRIPTION, tr("Load the list of your open changesets from the server"));
putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
DownloadOpenChangesetsTask task = new DownloadOpenChangesetsTask(ChangesetManagementPanel.this);
Main.worker.submit(task);
@@ -315,12 +318,12 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
*/
class CloseChangesetAction extends AbstractAction implements ItemListener{
public CloseChangesetAction() {
- //putValue(NAME, tr("Close"));
putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset"));
refreshEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
if (cs == null) return;
@@ -336,6 +339,7 @@ public class ChangesetManagementPanel extends JPanel implements ListDataListener
);
}
+ @Override
public void itemStateChanged(ItemEvent e) {
refreshEnabledState();
}
diff --git a/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java b/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
index 5b45b2a..a9edd6d 100644
--- a/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
@@ -12,6 +12,7 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
@@ -102,7 +103,7 @@ public class CloseChangesetDialog extends JDialog {
getClass().getName() + ".geometry",
WindowGeometry.centerInWindow(Main.parent, new Dimension(300,300))
).applySafe(this);
- } else {
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
@@ -121,6 +122,7 @@ public class CloseChangesetDialog extends JDialog {
refreshEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
setCanceled(false);
setVisible(false);
@@ -130,6 +132,7 @@ public class CloseChangesetDialog extends JDialog {
setEnabled(lstOpenChangesets.getSelectedValues() != null && lstOpenChangesets.getSelectedValues().length > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
refreshEnabledState();
}
@@ -148,6 +151,7 @@ public class CloseChangesetDialog extends JDialog {
setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent e) {
cancel();
}
@@ -210,7 +214,7 @@ public class CloseChangesetDialog extends JDialog {
*/
public Collection<Changeset> getSelectedChangesets() {
Object [] sel = lstOpenChangesets.getSelectedValues();
- ArrayList<Changeset> ret = new ArrayList<Changeset>();
+ List<Changeset> ret = new ArrayList<Changeset>(sel.length);
for (Object o: sel) {
ret.add((Changeset)o);
}
diff --git a/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java b/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java
index 646cd55..e919a7f 100644
--- a/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java
+++ b/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import javax.swing.SwingUtilities;
@@ -25,7 +26,7 @@ public class CloseChangesetTask extends PleaseWaitRunnable {
private boolean canceled;
private Exception lastException;
private Collection<Changeset> changesets;
- private ArrayList<Changeset> closedChangesets;
+ private List<Changeset> closedChangesets;
/**
* Closes all changesets in <code>changesets</code> if they are not null, if they
@@ -58,6 +59,7 @@ public class CloseChangesetTask extends PleaseWaitRunnable {
}
SwingUtilities.invokeLater(
new Runnable() {
+ @Override
public void run() {
ChangesetCache.getInstance().update(closedChangesets);
}
diff --git a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
index af5cef4..7774198 100644
--- a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
@@ -25,16 +25,15 @@ import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JPasswordField;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -106,7 +105,7 @@ public class CredentialDialog extends JDialog {
try {
setAlwaysOnTop(true);
} catch(SecurityException e) {
- System.out.println(tr("Warning: failed to put Credential Dialog always on top. Caught security exception."));
+ Main.warn(tr("Failed to put Credential Dialog always on top. Caught security exception."));
}
build();
}
@@ -149,7 +148,7 @@ public class CredentialDialog extends JDialog {
protected static class CredentialPanel extends JPanel {
protected JTextField tfUserName;
- protected JPasswordField tfPassword;
+ protected JosmPasswordField tfPassword;
protected JCheckBox cbSaveCredentials;
protected JMultilineLabel lblHeading;
protected JMultilineLabel lblWarning;
@@ -230,7 +229,7 @@ public class CredentialDialog extends JDialog {
password = password == null ? "" : password;
tfUserName.setText(username);
tfPassword.setText(password);
- cbSaveCredentials.setSelected(!username.equals("") && ! password.equals(""));
+ cbSaveCredentials.setSelected(!username.isEmpty() && !password.isEmpty());
}
public void startUserInput() {
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
index 32d651f..71dcf85 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
@@ -17,12 +17,12 @@ import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.PleaseWaitDialog;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
-
/**
* Asynchronous task for downloading and unpacking arbitrary file lists
* Shows progress bar when downloading
@@ -37,8 +37,11 @@ public class DownloadFileTask extends PleaseWaitRunnable{
* Creates the download task
*
* @param parent the parent component relative to which the {@link PleaseWaitDialog} is displayed
- * @param title the title to display in the {@link PleaseWaitDialog}
- * @throws IllegalArgumentException thrown if toUpdate is null
+ * @param address the URL to download
+ * @param file The destination file
+ * @param mkdir {@code true} if the destination directory must be created, {@code false} otherwise
+ * @param unpack {@code true} if zip archives must be unpacked recursively, {@code false} otherwise
+ * @throws IllegalArgumentException if {@code parent} is null
*/
public DownloadFileTask(Component parent, String address, File file, boolean mkdir, boolean unpack) {
super(parent, tr("Downloading file"), false);
@@ -46,9 +49,8 @@ public class DownloadFileTask extends PleaseWaitRunnable{
this.file = file;
this.mkdir = mkdir;
this.unpack = unpack;
-
- }
-
+ }
+
private static class DownloadException extends Exception {
public DownloadException(String msg) {
super(msg);
@@ -66,15 +68,19 @@ public class DownloadFileTask extends PleaseWaitRunnable{
}
- @Override
+ @Override
protected void cancel() {
this.canceled = true;
closeConnectionIfNeeded();
}
- @Override
+ @Override
protected void finish() {}
+ /**
+ * Performs download.
+ * @throws DownloadException if the URL is invalid or if any I/O error occurs.
+ */
public void download() throws DownloadException {
OutputStream out = null;
InputStream in = null;
@@ -85,7 +91,7 @@ public class DownloadFileTask extends PleaseWaitRunnable{
newDir.mkdirs();
}
}
-
+
URL url = new URL(address);
int size;
synchronized(this) {
@@ -94,10 +100,10 @@ public class DownloadFileTask extends PleaseWaitRunnable{
downloadConnection.connect();
size = downloadConnection.getContentLength();
}
-
+
progressMonitor.setTicksCount(100);
progressMonitor.subTask(tr("Downloading File {0}: {1} bytes...", file.getName(),size));
-
+
in = downloadConnection.getInputStream();
out = new FileOutputStream(file);
byte[] buffer = new byte[32768];
@@ -106,23 +112,25 @@ public class DownloadFileTask extends PleaseWaitRunnable{
for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
out.write(buffer, 0, read);
count+=read;
- if (canceled) return;
+ if (canceled) break;
p2 = 100 * count / size;
if (p2!=p1) {
progressMonitor.setTicks(p2);
p1=p2;
}
}
- out.close();
- System.out.println(tr("Download finished"));
- if (unpack) {
- System.out.println(tr("Unpacking {0} into {1}", file.getAbsolutePath(), file.getParent()));
- unzipFileRecursively(file, file.getParent());
- file.delete();
+ Utils.close(out);
+ if (!canceled) {
+ Main.info(tr("Download finished"));
+ if (unpack) {
+ Main.info(tr("Unpacking {0} into {1}", file.getAbsolutePath(), file.getParent()));
+ unzipFileRecursively(file, file.getParent());
+ file.delete();
+ }
}
} catch(MalformedURLException e) {
- String msg = tr("Warning: Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. Skipping download.", file.getName(), address);
- System.err.println(msg);
+ String msg = tr("Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. Skipping download.", file.getName(), address);
+ Main.warn(msg);
throw new DownloadException(msg);
} catch (IOException e) {
if (canceled)
@@ -134,7 +142,7 @@ public class DownloadFileTask extends PleaseWaitRunnable{
}
}
- @Override
+ @Override
protected void realRun() throws SAXException, IOException {
if (canceled) return;
try {
@@ -147,18 +155,18 @@ public class DownloadFileTask extends PleaseWaitRunnable{
/**
* Replies true if the task was canceled by the user
*
- * @return
+ * @return {@code true} if the task was canceled by the user, {@code false} otherwise
*/
public boolean isCanceled() {
return canceled;
}
-
+
/**
* Recursive unzipping function
* TODO: May be placed somewhere else - Tools.Utils?
* @param file
* @param dir
- * @throws IOException
+ * @throws IOException
*/
public static void unzipFileRecursively(File file, String dir) throws IOException {
OutputStream os = null;
@@ -181,13 +189,12 @@ public class DownloadFileTask extends PleaseWaitRunnable{
while ((read = is.read(buffer)) != -1) {
os.write(buffer, 0, read);
}
- os.close();
- is.close();
+ Utils.close(os);
+ Utils.close(is);
}
}
- zf.close();
} finally {
- if (zf!=null) zf.close();
+ Utils.close(zf);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
index 0d3d003..e5699a3 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
@@ -36,9 +36,8 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
private Component parent;
/**
- *
- * @param model provides the user id of the current user and accepts the changesets
- * after download
+ * Constructs the task
+ * @param parent is a component to show error messages
*/
public DownloadOpenChangesetsTask(Component parent) {
super(parent, tr("Downloading open changesets ..."), false /* don't ignore exceptions */);
@@ -86,7 +85,7 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
}
SwingUtilities.invokeLater(
new Runnable() {
- public void run() {
+ @Override public void run() {
ChangesetCache.getInstance().update(changesets);
}
}
@@ -101,8 +100,8 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
protected void refreshUserIdentity(){
JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
try {
- OsmServerUserInfoReader reader = new OsmServerUserInfoReader();
- UserInfo info = reader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
+ OsmServerUserInfoReader infoReader = new OsmServerUserInfoReader();
+ UserInfo info = infoReader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
im.setFullyIdentified(info.getDisplayName(), info);
} catch(OsmTransferException e) {
// retrieving the user info can fail if the current user is not authorised to
@@ -117,7 +116,7 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
if (im.isFullyIdentified()) {
im.setPartiallyIdentified(im.getUserName());
}
- System.err.println(tr("Warning: Failed to retrieve user infos for the current JOSM user. Exception was: {0}", e.toString()));
+ Main.warn(tr("Failed to retrieve user infos for the current JOSM user. Exception was: {0}", e.toString()));
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
index 53e58f3..519a151 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
@@ -31,12 +31,12 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
private DataSet ds;
private boolean canceled;
private Exception lastException;
- private List<PrimitiveId> ids;
+ private final List<PrimitiveId> ids;
private Set<PrimitiveId> missingPrimitives;
- private OsmDataLayer layer;
- private boolean fullRelation;
+ private final OsmDataLayer layer;
+ private final boolean fullRelation;
private MultiFetchServerObjectReader multiObjectReader;
private OsmServerObjectReader objectReader;
@@ -44,13 +44,13 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
* Creates the task
*
* @param layer the layer in which primitives are updated. Must not be null.
- * @param toUpdate a collection of primitives to update from the server. Set to
+ * @param ids a collection of primitives to update from the server. Set to
* the empty collection if null.
* @param fullRelation true if a full download is required, i.e.,
* a download including the immediate children of a relation.
* @throws IllegalArgumentException thrown if layer is null.
*/
- public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation) throws IllegalArgumentException {
+ public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation) throws IllegalArgumentException {
super(tr("Download objects"), false /* don't ignore exception */);
ensureParameterNotNull(layer, "layer");
this.ids = ids;
@@ -80,6 +80,7 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
return;
}
GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override
public void run() {
layer.mergeFrom(ds);
AutoScaleAction.zoomTo(ds.allPrimitives());
@@ -94,7 +95,7 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
OsmPrimitive osm = layer.data.getPrimitiveById(id);
if (osm == null) {
switch (id.getType()) {
- case NODE:
+ case NODE:
osm = new Node(id.getUniqueId());
break;
case WAY:
@@ -127,7 +128,7 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
}
DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
merger.merge();
-
+
// if incomplete relation members exist, download them too
for (Relation r : ds.getRelations()) {
if (canceled) return;
@@ -164,13 +165,13 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable {
merger.merge();
}
}
-
+
} catch(Exception e) {
if (canceled) return;
lastException = e;
}
}
-
+
/**
* replies the set of ids of all primitives for which a fetch request to the
* server was submitted but which are not available from the server (the server
diff --git a/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java b/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java
index ac13f18..265b5d3 100644
--- a/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java
@@ -17,21 +17,19 @@ import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.table.TableCellEditor;
import org.openstreetmap.josm.actions.SaveActionBase;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* This is a {@link TableCellEditor} for filenames. It provides a text input field and
- * a button for launchinig a {@link JFileChooser}.
- *
- *
+ * a button for launchinig a {@link javax.swing.JFileChooser}.
*/
class FilenameCellEditor extends JPanel implements TableCellEditor {
- private JTextField tfFileName;
+ private JosmTextField tfFileName;
private CopyOnWriteArrayList<CellEditorListener> listeners;
private File value;
@@ -46,7 +44,7 @@ class FilenameCellEditor extends JPanel implements TableCellEditor {
gc.fill = GridBagConstraints.BOTH;
gc.weightx = 1.0;
gc.weighty = 1.0;
- add(tfFileName = new JTextField(), gc);
+ add(tfFileName = new JosmTextField(), gc);
gc.gridx = 1;
gc.gridy = 0;
@@ -70,6 +68,7 @@ class FilenameCellEditor extends JPanel implements TableCellEditor {
build();
}
+ @Override
public void addCellEditorListener(CellEditorListener l) {
if (l != null) {
listeners.addIfAbsent(l);
@@ -88,28 +87,34 @@ class FilenameCellEditor extends JPanel implements TableCellEditor {
}
}
+ @Override
public void cancelCellEditing() {
fireEditingCanceled();
}
+ @Override
public Object getCellEditorValue() {
return value;
}
+ @Override
public boolean isCellEditable(EventObject anEvent) {
return true;
}
+ @Override
public void removeCellEditorListener(CellEditorListener l) {
listeners.remove(l);
}
+ @Override
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
+ @Override
public boolean stopCellEditing() {
- if (tfFileName.getText() == null || tfFileName.getText().trim().equals("")) {
+ if (tfFileName.getText() == null || tfFileName.getText().trim().isEmpty()) {
value = null;
} else {
value = new File(tfFileName.getText());
@@ -127,6 +132,7 @@ class FilenameCellEditor extends JPanel implements TableCellEditor {
}
}
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
SaveLayerInfo info = (SaveLayerInfo)value;
setInitialValue(info.getFile());
@@ -140,6 +146,7 @@ class FilenameCellEditor extends JPanel implements TableCellEditor {
putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), "osm");
if (f != null) {
diff --git a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
index 01f5449..604294d 100644
--- a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
+++ b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
@@ -21,7 +21,6 @@ import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.table.TableCellEditor;
@@ -29,7 +28,7 @@ import javax.swing.table.TableCellRenderer;
import org.openstreetmap.josm.actions.SaveActionBase;
import org.openstreetmap.josm.tools.GBC;
-
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
private final static Color colorError = new Color(255,197,197);
@@ -38,7 +37,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
private final JLabel lblLayerName = new JLabel();
private final JLabel lblFilename = new JLabel("");
- private final JTextField tfFilename = new JTextField();
+ private final JosmTextField tfFilename = new JosmTextField();
private final JButton btnFileChooser = new JButton(new LaunchFileChooserAction());
private final static GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
@@ -76,6 +75,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
}
/** renderer used while not editing the file path **/
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
removeAll();
@@ -93,6 +93,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
}
/** renderer used while the file path is being edited **/
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected,
int row, int column) {
removeAll();
@@ -178,6 +179,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
return t;
}
+ @Override
public void addCellEditorListener(CellEditorListener l) {
if (l != null) {
listeners.addIfAbsent(l);
@@ -196,28 +198,34 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
}
}
+ @Override
public void cancelCellEditing() {
fireEditingCanceled();
}
+ @Override
public Object getCellEditorValue() {
return value;
}
+ @Override
public boolean isCellEditable(EventObject anEvent) {
return true;
}
+ @Override
public void removeCellEditorListener(CellEditorListener l) {
listeners.remove(l);
}
+ @Override
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
+ @Override
public boolean stopCellEditing() {
- if (tfFilename.getText() == null || tfFilename.getText().trim().equals("")) {
+ if (tfFilename.getText() == null || tfFilename.getText().trim().isEmpty()) {
value = null;
} else {
value = new File(tfFilename.getText());
@@ -232,6 +240,7 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
File f = SaveActionBase.createAndOpenSaveFileChooser(tr("Select filename"), "osm");
if (f != null) {
diff --git a/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java b/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java
index fa402f5..5aa049a 100644
--- a/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java
+++ b/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java
@@ -61,6 +61,7 @@ public class OpenChangesetComboBoxModel extends DefaultComboBoxModel implements
/* ------------------------------------------------------------------------------------ */
/* ChangesetCacheListener */
/* ------------------------------------------------------------------------------------ */
+ @Override
public void changesetCacheUpdated(ChangesetCacheEvent event) {
refresh();
}
diff --git a/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java b/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
index 1541c00..455510d 100644
--- a/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
+++ b/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
@@ -48,7 +48,7 @@ public class RecentlyOpenedFilesMenu extends JMenu {
}
});
}
-
+
private void rebuild() {
removeAll();
Collection<String> fileHistory = Main.pref.getCollection("file-open.history");
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java b/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
index 814479f..286ffbd 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
@@ -64,7 +64,7 @@ class SaveLayerInfo implements Comparable<SaveLayerInfo> {
/**
* Replies true if this layer should be uploaded to the server; false, otherwise
*
- * @return true if this layer should be uploaded to the server; false, otherwise
+ * @return {@code true} if this layer should be uploaded to the server; {@code false}, otherwise
*/
public boolean isDoUploadToServer() {
return doUploadToServer;
@@ -73,7 +73,7 @@ class SaveLayerInfo implements Comparable<SaveLayerInfo> {
/**
* Sets whether this layer should be uploaded to a file
*
- * @param doSaveToFile true to upload; false, to skip uploading
+ * @param doUploadToServer {@code true} to upload; {@code false}, to skip uploading
*/
public void setDoUploadToServer(boolean doUploadToServer) {
@@ -116,6 +116,7 @@ class SaveLayerInfo implements Comparable<SaveLayerInfo> {
this.file = file;
}
+ @Override
public int compareTo(SaveLayerInfo o) {
if (isDoSaveAndUpload()) {
if (o.isDoSaveAndUpload())
@@ -141,9 +142,9 @@ class SaveLayerInfo implements Comparable<SaveLayerInfo> {
/**
* Replies the upload state of {@link #getLayer()}.
* <ul>
- * <li>{@link UploadOrSaveState#OK} if {@link #getLayer() was successfully uploaded</li>
- * <li>{@link UploadOrSaveState#canceled} if uploading {@link #getLayer() was canceled</li>
- * <li>{@link UploadOrSaveState#FAILED} if uploading {@link #getLayer() has failed</li>
+ * <li>{@link UploadOrSaveState#OK} if {@link #getLayer()} was successfully uploaded</li>
+ * <li>{@link UploadOrSaveState#CANCELED} if uploading {@link #getLayer()} was canceled</li>
+ * <li>{@link UploadOrSaveState#FAILED} if uploading {@link #getLayer()} has failed</li>
* </ul>
*
* @return the upload state
@@ -164,9 +165,9 @@ class SaveLayerInfo implements Comparable<SaveLayerInfo> {
/**
* Replies the save state of {@link #getLayer()}.
* <ul>
- * <li>{@link UploadOrSaveState#OK} if {@link #getLayer() was successfully saved to file</li>
- * <li>{@link UploadOrSaveState#canceled} if saving {@link #getLayer() was canceled</li>
- * <li>{@link UploadOrSaveState#FAILED} if saving {@link #getLayer() has failed</li>
+ * <li>{@link UploadOrSaveState#OK} if {@link #getLayer()} was successfully saved to file</li>
+ * <li>{@link UploadOrSaveState#CANCELED} if saving {@link #getLayer()} was canceled</li>
+ * <li>{@link UploadOrSaveState#FAILED} if saving {@link #getLayer()} has failed</li>
* </ul>
*
* @return the save state
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java b/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java
index 7976683..738f75e 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java
@@ -9,8 +9,8 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
- * SaveLayerTask saves the data managed by an {@link OsmDataLayer} to the
- * {@link OsmDataLayer#getAssociatedFile()}.
+ * SaveLayerTask saves the data managed by an {@link org.openstreetmap.josm.gui.layer.OsmDataLayer} to the
+ * {@link org.openstreetmap.josm.gui.layer.OsmDataLayer#getAssociatedFile()}.
*
* <pre>
* ExecutorService executorService = ...
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
index 267f98a..b77c730 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
@@ -324,6 +324,7 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
cancel();
}
@@ -346,10 +347,12 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
setUserAction(UserAction.PROCEED);
closeDialog();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
Mode mode = (Mode)evt.getNewValue();
@@ -404,12 +407,14 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (! confirmSaveLayerInfosOK())
return;
launchSafeAndUploadTask();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
SaveLayersModel.Mode mode = (SaveLayersModel.Mode)evt.getNewValue();
@@ -549,6 +554,7 @@ public class SaveLayersDialog extends JDialog implements TableModelListener {
);
}
+ @Override
public void run() {
model.setMode(SaveLayersModel.Mode.UPLOADING_AND_SAVING);
List<SaveLayerInfo> toUpload = model.getLayersToUpload();
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java b/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
index 94b5d91..08ecb06 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
@@ -64,6 +64,7 @@ public class SaveLayersModel extends DefaultTableModel {
Collections.sort(
layerInfo,
new Comparator<SaveLayerInfo>() {
+ @Override
public int compare(SaveLayerInfo o1, SaveLayerInfo o2) {
return o1.compareTo(o2);
}
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java b/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
index c321717..04a2da9 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
@@ -18,6 +18,7 @@ class SaveLayersTable extends JTable implements PropertyChangeListener {
super.getTableHeader().setReorderingAllowed(false);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
Mode mode = (Mode)evt.getNewValue();
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java b/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
index 6c4fbe4..1afec12 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
@@ -30,6 +30,7 @@ class SaveLayersTableColumnModel extends DefaultTableColumnModel {
needsSave.setPreferredSize(new Dimension(needsSave.getPreferredSize().width, 19));
}
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
boolean hasFocus, int row, int column) {
JPanel panel = new JPanel(new GridBagLayout());
diff --git a/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
index 6c6770c..6e5a2b8 100644
--- a/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
@@ -12,6 +12,7 @@ import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
import org.openstreetmap.josm.gui.tagging.TagModel;
@@ -20,83 +21,81 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
public class TagSettingsPanel extends JPanel implements TableModelListener {
/** checkbox for selecting whether an atomic upload is to be used */
- private TagEditorPanel pnlTagEditor;
+ private final TagEditorPanel pnlTagEditor = new TagEditorPanel(null);
/** the model for the changeset comment */
- private ChangesetCommentModel changesetCommentModel;
+ private final ChangesetCommentModel changesetCommentModel;
+ private final ChangesetCommentModel changesetSourceModel;
/** tags that applied to uploaded changesets by default*/
- private Map<String, String> defaultTags = new HashMap<String, String>();
+ private final Map<String, String> defaultTags = new HashMap<String, String>();
protected void build() {
setLayout(new BorderLayout());
- add(pnlTagEditor = new TagEditorPanel(null), BorderLayout.CENTER);
+ add(pnlTagEditor, BorderLayout.CENTER);
}
/**
* Creates a new panel
*
* @param changesetCommentModel the changeset comment model. Must not be null.
+ * @param changesetSourceModel the changeset source model. Must not be null.
* @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null
*/
- public TagSettingsPanel(ChangesetCommentModel changesetCommentModel) throws IllegalArgumentException{
+ public TagSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) throws IllegalArgumentException{
CheckParameterUtil.ensureParameterNotNull(changesetCommentModel, "changesetCommentModel");
+ CheckParameterUtil.ensureParameterNotNull(changesetSourceModel, "changesetSourceModel");
this.changesetCommentModel = changesetCommentModel;
- this.changesetCommentModel.addObserver(new ChangesetCommentObserver());
+ this.changesetSourceModel = changesetSourceModel;
+ this.changesetCommentModel.addObserver(new ChangesetCommentObserver("comment"));
+ this.changesetSourceModel.addObserver(new ChangesetCommentObserver("source"));
build();
pnlTagEditor.getModel().addTableModelListener(this);
}
- /**
- * Replies the default value for "created_by"
- *
- * @return the default value for "created_by"
- */
- public static String getDefaultCreatedBy() {
- Object ua = System.getProperties().get("http.agent");
- return(ua == null) ? "JOSM" : ua.toString();
- }
-
- protected void setUploadComment(String comment) {
- if (comment == null) {
- comment = "";
+ protected void setProperty(String key, String value) {
+ if (value == null) {
+ value = "";
}
- comment = comment.trim();
- String commentInTag = getUploadComment();
- if (comment.equals(commentInTag))
+ value = value.trim();
+ String commentInTag = getTagEditorValue(key);
+ if (value.equals(commentInTag))
return;
- if (comment.equals("")) {
- pnlTagEditor.getModel().delete("comment");
+ if (value.isEmpty()) {
+ pnlTagEditor.getModel().delete(key);
return;
}
- TagModel tag = pnlTagEditor.getModel().get("comment");
+ TagModel tag = pnlTagEditor.getModel().get(key);
if (tag == null) {
- tag = new TagModel("comment", comment);
+ tag = new TagModel(key, value);
pnlTagEditor.getModel().add(tag);
} else {
- pnlTagEditor.getModel().updateTagValue(tag, comment);
+ pnlTagEditor.getModel().updateTagValue(tag, value);
}
}
- protected String getUploadComment() {
- TagModel tag = pnlTagEditor.getModel().get("comment");
+ protected String getTagEditorValue(String key) {
+ TagModel tag = pnlTagEditor.getModel().get(key);
if (tag == null) return null;
return tag.getValue();
}
public void initFromChangeset(Changeset cs) {
- String currentComment = getUploadComment();
Map<String,String> tags = getDefaultTags();
if (cs != null) {
tags.putAll(cs.getKeys());
}
if (tags.get("comment") == null) {
- tags.put("comment", currentComment);
+ tags.put("comment", getTagEditorValue("comment"));
}
+ if (tags.get("source") == null) {
+ tags.put("source", getTagEditorValue("source"));
+ }
+ String agent = Version.getInstance().getAgentString(false);
String created_by = tags.get("created_by");
- if (created_by == null || "".equals(created_by)) {
- tags.put("created_by", getDefaultCreatedBy());
- } else if (!created_by.contains(getDefaultCreatedBy())) {
- tags.put("created_by", created_by + ";" + getDefaultCreatedBy());
+ if (created_by == null || created_by.isEmpty()) {
+ tags.put("created_by", agent);
+ } else if (!created_by.contains(agent)) {
+ tags.put("created_by", created_by + ";" + agent);
}
pnlTagEditor.getModel().initFromTags(tags);
}
@@ -106,8 +105,8 @@ public class TagSettingsPanel extends JPanel implements TableModelListener {
*
* @return the map with the current tags in the tag editor model.
*/
- public Map<String,String> getTags() {
- return pnlTagEditor.getModel().getTags();
+ public Map<String,String> getTags(boolean keepEmpty) {
+ return pnlTagEditor.getModel().getTags(keepEmpty);
}
public Map<String,String> getDefaultTags() {
@@ -128,9 +127,10 @@ public class TagSettingsPanel extends JPanel implements TableModelListener {
/* -------------------------------------------------------------------------- */
/* Interface TableChangeListener */
/* -------------------------------------------------------------------------- */
+ @Override
public void tableChanged(TableModelEvent e) {
- String uploadComment = getUploadComment();
- changesetCommentModel.setComment(uploadComment);
+ changesetCommentModel.setComment(getTagEditorValue("comment"));
+ changesetSourceModel.setComment(getTagEditorValue("source"));
}
/**
@@ -139,15 +139,23 @@ public class TagSettingsPanel extends JPanel implements TableModelListener {
*
*/
class ChangesetCommentObserver implements Observer {
+
+ private final String key;
+
+ ChangesetCommentObserver(String key) {
+ this.key = key;
+ }
+
+ @Override
public void update(Observable o, Object arg) {
if (!(o instanceof ChangesetCommentModel)) return;
String newValue = (String)arg;
- String oldValue = getUploadComment();
+ String oldValue = getTagEditorValue(key);
if (oldValue == null) {
oldValue = "";
}
if (!oldValue.equals(newValue)) {
- setUploadComment((String)arg);
+ setProperty(key, (String) arg);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
index 3596603..9a9ef6f 100644
--- a/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
+++ b/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
@@ -5,12 +5,9 @@ import static org.openstreetmap.josm.tools.CheckParameterUtil.ensureParameterNot
import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.Collections;
-import javax.swing.SwingUtilities;
-
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.DataSetMerger;
import org.openstreetmap.josm.data.osm.Node;
@@ -81,6 +78,7 @@ public class UpdatePrimitivesTask extends PleaseWaitRunnable {
return;
}
GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override
public void run() {
layer.mergeFrom(ds);
layer.onPostDownloadFromServer();
@@ -92,7 +90,7 @@ public class UpdatePrimitivesTask extends PleaseWaitRunnable {
getProgressMonitor().indeterminateSubTask(tr("Initializing nodes to update ..."));
for (OsmPrimitive primitive : toUpdate) {
if (primitive instanceof Node && !primitive.isNew()) {
- reader.append((Node)primitive);
+ reader.append(primitive);
} else if (primitive instanceof Way) {
Way way = (Way)primitive;
for (Node node: way.getNodes()) {
@@ -108,7 +106,7 @@ public class UpdatePrimitivesTask extends PleaseWaitRunnable {
getProgressMonitor().indeterminateSubTask(tr("Initializing ways to update ..."));
for (OsmPrimitive primitive : toUpdate) {
if (primitive instanceof Way && !primitive.isNew()) {
- reader.append((Way)primitive);
+ reader.append(primitive);
}
}
}
@@ -117,7 +115,7 @@ public class UpdatePrimitivesTask extends PleaseWaitRunnable {
getProgressMonitor().indeterminateSubTask(tr("Initializing relations to update ..."));
for (OsmPrimitive primitive : toUpdate) {
if (primitive instanceof Relation && !primitive.isNew()) {
- reader.append((Relation)primitive);
+ reader.append(primitive);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java b/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
index 1d2bfa5..96ab187 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
@@ -54,31 +54,37 @@ class UploadAndSaveProgressRenderer extends JPanel implements ProgressRenderer,
setVisible(false);
}
+ @Override
public void setCustomText(String message) {
lblCustomText.setText(message);
repaint();
}
+ @Override
public void setIndeterminate(boolean indeterminate) {
progressBar.setIndeterminate(indeterminate);
repaint();
}
+ @Override
public void setMaximum(int maximum) {
progressBar.setMaximum(maximum);
repaint();
}
+ @Override
public void setTaskTitle(String taskTitle) {
lblTaskTitle.setText(taskTitle);
repaint();
}
+ @Override
public void setValue(int value) {
progressBar.setValue(value);
repaint();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
Mode mode = (Mode)evt.getNewValue();
diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index 8a44c9f..6b16932 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
@@ -3,10 +3,13 @@ package org.openstreetmap.josm.gui.io;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.BorderLayout;
+import java.awt.Component;
import java.awt.Dimension;
import java.awt.FlowLayout;
+import java.awt.GridBagLayout;
import java.awt.Image;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -14,9 +17,12 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
@@ -43,8 +49,10 @@ import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
/**
@@ -57,6 +65,11 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
static private UploadDialog uploadDialog;
/**
+ * List of custom components that can be added by plugins at JOSM startup.
+ */
+ static private final Collection<Component> customComponents = new ArrayList<Component>();
+
+ /**
* Replies the unique instance of the upload dialog
*
* @return the unique instance of the upload dialog
@@ -86,7 +99,8 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
private boolean canceled = false;
/** the changeset comment model keeping the state of the changeset comment */
- private ChangesetCommentModel changesetCommentModel;
+ private final ChangesetCommentModel changesetCommentModel = new ChangesetCommentModel();
+ private final ChangesetCommentModel changesetSourceModel = new ChangesetCommentModel();
/**
* builds the content panel for the upload dialog
@@ -94,16 +108,19 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
* @return the content panel
*/
protected JPanel buildContentPanel() {
- JPanel pnl = new JPanel();
+ JPanel pnl = new JPanel(new GridBagLayout());
pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
- pnl.setLayout(new BorderLayout());
// the panel with the list of uploaded objects
//
- pnl.add(pnlUploadedObjects = new UploadedObjectsSummaryPanel(), BorderLayout.CENTER);
+ pnl.add(pnlUploadedObjects = new UploadedObjectsSummaryPanel(), GBC.eol().fill(GBC.BOTH));
+
+ // Custom components
+ for (Component c : customComponents) {
+ pnl.add(c, GBC.eol().fill(GBC.HORIZONTAL));
+ }
- // a tabbed pane with two configuration panels in the
- // lower half
+ // a tabbed pane with configuration panels in the lower half
//
tpConfigPanels = new JTabbedPane() {
@Override
@@ -113,37 +130,31 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
return super.getMinimumSize();
}
};
- tpConfigPanels.add(new JPanel());
- tpConfigPanels.add(new JPanel());
- tpConfigPanels.add(new JPanel());
- tpConfigPanels.add(new JPanel());
- changesetCommentModel = new ChangesetCommentModel();
-
- tpConfigPanels.setComponentAt(0, pnlBasicUploadSettings = new BasicUploadSettingsPanel(changesetCommentModel));
+ tpConfigPanels.add(pnlBasicUploadSettings = new BasicUploadSettingsPanel(changesetCommentModel, changesetSourceModel));
tpConfigPanels.setTitleAt(0, tr("Settings"));
tpConfigPanels.setToolTipTextAt(0, tr("Decide how to upload the data and which changeset to use"));
- tpConfigPanels.setComponentAt(1,pnlTagSettings = new TagSettingsPanel(changesetCommentModel));
+ tpConfigPanels.add(pnlTagSettings = new TagSettingsPanel(changesetCommentModel, changesetSourceModel));
tpConfigPanels.setTitleAt(1, tr("Tags of new changeset"));
tpConfigPanels.setToolTipTextAt(1, tr("Apply tags to the changeset data is uploaded to"));
- tpConfigPanels.setComponentAt(2,pnlChangesetManagement = new ChangesetManagementPanel(changesetCommentModel));
+ tpConfigPanels.add(pnlChangesetManagement = new ChangesetManagementPanel(changesetCommentModel));
tpConfigPanels.setTitleAt(2, tr("Changesets"));
tpConfigPanels.setToolTipTextAt(2, tr("Manage open changesets and select a changeset to upload to"));
- tpConfigPanels.setComponentAt(3, pnlUploadStrategySelectionPanel = new UploadStrategySelectionPanel());
+ tpConfigPanels.add(pnlUploadStrategySelectionPanel = new UploadStrategySelectionPanel());
tpConfigPanels.setTitleAt(3, tr("Advanced"));
tpConfigPanels.setToolTipTextAt(3, tr("Configure advanced settings"));
- pnl.add(tpConfigPanels, BorderLayout.SOUTH);
+ pnl.add(tpConfigPanels, GBC.eol().fill(GBC.HORIZONTAL));
return pnl;
}
/**
* builds the panel with the OK and CANCEL buttons
*
- * @return
+ * @return The panel with the OK and CANCEL buttons
*/
protected JPanel buildActionPanel() {
JPanel pnl = new JPanel();
@@ -204,17 +215,20 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
//
pnlBasicUploadSettings.getUploadParameterSummaryPanel().setConfigurationParameterRequestListener(
new ConfigurationParameterRequestHandler() {
+ @Override
public void handleUploadStrategyConfigurationRequest() {
tpConfigPanels.setSelectedIndex(3);
}
+ @Override
public void handleChangesetConfigurationRequest() {
tpConfigPanels.setSelectedIndex(2);
}
}
);
- pnlBasicUploadSettings.setUploadCommentDownFocusTraversalHandler(
+ pnlBasicUploadSettings.setUploadTagDownFocusTraversalHandlers(
new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
btnUpload.requestFocusInWindow();
}
@@ -285,7 +299,7 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
if (cs == null) {
cs = new Changeset();
}
- cs.setKeys(pnlTagSettings.getTags());
+ cs.setKeys(pnlTagSettings.getTags(false));
return cs;
}
@@ -299,11 +313,11 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
public void setDefaultChangesetTags(Map<String, String> tags) {
pnlTagSettings.setDefaultTags(tags);
- for (String key: tags.keySet()) {
- if (key.equals("comment")) {
- changesetCommentModel.setComment(tags.get(key));
- }
- }
+ for (Entry<String, String> entry: tags.entrySet()) {
+ if ("comment".equals(entry.getKey())) {
+ changesetCommentModel.setComment(entry.getValue());
+ }
+ }
}
/**
@@ -327,6 +341,15 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
}
/**
+ * Returns the current value for the changeset source
+ *
+ * @return the current value for the changeset source
+ */
+ protected String getUploadSource() {
+ return changesetSourceModel.getComment();
+ }
+
+ /**
* Returns true if the dialog was canceled
*
* @return true if the dialog was canceled
@@ -355,13 +378,27 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
)
).applySafe(this);
startUserInput();
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
}
/**
+ * Adds a custom component to this dialog.
+ * Custom components added at JOSM startup are displayed between the objects list and the properties tab pane.
+ * @param c The custom component to add. If {@code null}, this method does nothing.
+ * @return {@code true} if the collection of custom components changed as a result of the call
+ * @since 5842
+ */
+ public static boolean addCustomComponent(Component c) {
+ if (c != null) {
+ return customComponents.add(c);
+ }
+ return false;
+ }
+
+ /**
* Handles an upload
*
*/
@@ -373,21 +410,43 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
}
/**
- * returns true if the user wants to revisit, false if they
- * want to continue
+ * Displays a warning message indicating that the upload comment is empty/short.
+ * @return true if the user wants to revisit, false if they want to continue
*/
protected boolean warnUploadComment() {
- ExtendedDialog dlg = new ExtendedDialog(UploadDialog.this,
+ return warnUploadTag(
tr("Please revise upload comment"),
- new String[] {tr("Revise"), tr("Cancel"), tr("Continue as is")});
- dlg.setContent("<html>" +
tr("Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />" +
"This is technically allowed, but please consider that many users who are<br />" +
"watching changes in their area depend on meaningful changeset comments<br />" +
"to understand what is going on!<br /><br />" +
"If you spend a minute now to explain your change, you will make life<br />" +
- "easier for many other mappers.") +
- "</html>");
+ "easier for many other mappers."),
+ "upload_comment_is_empty_or_very_short"
+ );
+ }
+
+ /**
+ * Displays a warning message indicating that no changeset source is given.
+ * @return true if the user wants to revisit, false if they want to continue
+ */
+ protected boolean warnUploadSource() {
+ return warnUploadTag(
+ tr("Please specify a changeset source"),
+ tr("You did not specify a source for your changes.<br />" +
+ "This is technically allowed, but it assists other users <br />" +
+ "to understand the origins of the data.<br /><br />" +
+ "If you spend a minute now to explain your change, you will make life<br />" +
+ "easier for many other mappers."),
+ "upload_source_is_empty"
+ );
+ }
+
+ protected boolean warnUploadTag(final String title, final String message, final String togglePref) {
+ ExtendedDialog dlg = new ExtendedDialog(UploadDialog.this,
+ title,
+ new String[] {tr("Revise"), tr("Cancel"), tr("Continue as is")});
+ dlg.setContent("<html>" + message + "</html>");
dlg.setButtonIcons(new Icon[] {
ImageProvider.get("ok"),
ImageProvider.get("cancel"),
@@ -400,7 +459,7 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
tr("Cancel and return to the previous dialog"),
tr("Ignore this hint and upload anyway")});
dlg.setIcon(JOptionPane.WARNING_MESSAGE);
- dlg.toggleEnable("upload_comment_is_empty_or_very_short");
+ dlg.toggleEnable(togglePref);
dlg.setToggleCheckboxText(tr("Do not show this message again"));
dlg.setCancelButton(1, 2);
return dlg.showDialog().getValue() != 3;
@@ -416,15 +475,42 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
);
}
+ @Override
public void actionPerformed(ActionEvent e) {
- if (getUploadComment().trim().length() < 10) {
- if (warnUploadComment())
- {
- tpConfigPanels.setSelectedIndex(0);
- pnlBasicUploadSettings.initEditingOfUploadComment();
- return;
+ if ((getUploadComment().trim().length() < 10 && warnUploadComment()) /* abort for missing comment */
+ || (getUploadSource().trim().isEmpty() && warnUploadSource()) /* abort for missing changeset source */
+ ) {
+ tpConfigPanels.setSelectedIndex(0);
+ pnlBasicUploadSettings.initEditingOfUploadComment();
+ return;
+ }
+
+ /* test for empty tags in the changeset metadata and proceed only after user's confirmation.
+ * though, accept if key and value are empty (cf. xor). */
+ List<String> emptyChangesetTags = new ArrayList<String>();
+ for (final Entry<String, String> i : pnlTagSettings.getTags(true).entrySet()) {
+ final boolean isKeyEmpty = i.getKey() == null || i.getKey().trim().isEmpty();
+ final boolean isValueEmpty = i.getValue() == null || i.getValue().trim().isEmpty();
+ final boolean ignoreKey = "comment".equals(i.getKey()) || "source".equals(i.getKey());
+ if ((isKeyEmpty ^ isValueEmpty) && !ignoreKey) {
+ emptyChangesetTags.add(tr("{0}={1}", i.getKey(), i.getValue()));
}
}
+ if (!emptyChangesetTags.isEmpty() && JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(
+ Main.parent,
+ trn(
+ "<html>The following changeset tag contains an empty key/value:<br>{0}<br>Continue?</html>",
+ "<html>The following changeset tags contain an empty key/value:<br>{0}<br>Continue?</html>",
+ emptyChangesetTags.size(), Utils.joinAsHtmlUnorderedList(emptyChangesetTags)),
+ tr("Empty metadata"),
+ JOptionPane.OK_CANCEL_OPTION,
+ JOptionPane.WARNING_MESSAGE
+ )) {
+ tpConfigPanels.setSelectedIndex(0);
+ pnlBasicUploadSettings.initEditingOfUploadComment();
+ return;
+ }
+
UploadStrategySpecification strategy = getUploadStrategySpecification();
if (strategy.getStrategy().equals(UploadStrategy.CHUNKED_DATASET_STRATEGY)) {
if (strategy.getChunkSize() == UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE) {
@@ -449,6 +535,7 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
putValue(SHORT_DESCRIPTION, tr("Cancel the upload and resume editing"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
setCanceled(true);
setVisible(false);
@@ -467,11 +554,6 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
}
@Override
- public void windowOpened(WindowEvent e) {
- //startUserInput();
- }
-
- @Override
public void windowActivated(WindowEvent arg0) {
if (tpConfigPanels.getSelectedIndex() == 0) {
pnlBasicUploadSettings.initEditingOfUploadComment();
@@ -482,6 +564,7 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
/* -------------------------------------------------------------------------- */
/* Interface PropertyChangeListener */
/* -------------------------------------------------------------------------- */
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
Changeset cs = (Changeset)evt.getNewValue();
@@ -496,6 +579,7 @@ public class UploadDialog extends JDialog implements PropertyChangeListener, Pre
/* -------------------------------------------------------------------------- */
/* Interface PreferenceChangedListener */
/* -------------------------------------------------------------------------- */
+ @Override
public void preferenceChanged(PreferenceChangeEvent e) {
if (e.getKey() == null || ! e.getKey().equals("osm-server.url"))
return;
diff --git a/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java b/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
index ccdf01e..ddc0ca2 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
@@ -5,7 +5,9 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
import java.util.HashSet;
+import java.util.Set;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
import org.openstreetmap.josm.data.APIDataSet;
import org.openstreetmap.josm.data.osm.Changeset;
@@ -43,7 +45,7 @@ class UploadLayerTask extends AbstractIOTask implements Runnable {
private ProgressMonitor monitor;
private Changeset changeset;
private Collection<OsmPrimitive> toUpload;
- private HashSet<IPrimitive> processedPrimitives;
+ private Set<IPrimitive> processedPrimitives;
private UploadStrategySpecification strategy;
/**
@@ -92,7 +94,7 @@ class UploadLayerTask extends AbstractIOTask implements Runnable {
if (p.isDeleted()) {
// we tried to delete an already deleted primitive.
//
- System.out.println(tr("Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
+ Main.warn(tr("Object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
processedPrimitives.addAll(writer.getProcessedPrimitives());
processedPrimitives.add(p);
toUpload.removeAll(processedPrimitives);
@@ -137,7 +139,7 @@ class UploadLayerTask extends AbstractIOTask implements Runnable {
}
} catch (Exception sxe) {
if (isCanceled()) {
- System.out.println("Ignoring exception caught because upload is canceled. Exception is: " + sxe.toString());
+ Main.info("Ignoring exception caught because upload is canceled. Exception is: " + sxe.toString());
return;
}
setLastException(sxe);
diff --git a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
index 0070763..1ca1309 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
@@ -11,23 +11,24 @@ import java.beans.PropertyChangeListener;
import java.text.MessageFormat;
import javax.swing.BorderFactory;
-import javax.swing.JEditorPane;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
-import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
+import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.ImageProvider;
+// FIXME this class should extend HtmlPanel instead (duplicated code in here)
public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{
private UploadStrategySpecification spec = new UploadStrategySpecification();
private int numObjects;
- private JEditorPane jepMessage;
+ private JosmEditorPane jepMessage;
private JLabel lblWarning;
private Changeset selectedChangeset;
@@ -102,7 +103,7 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkList
}
protected void build() {
- jepMessage = new JEditorPane("text/html", "");
+ jepMessage = new JosmEditorPane("text/html", "");
jepMessage.setOpaque(false);
jepMessage.setEditable(false);
jepMessage.addHyperlinkListener(this);
@@ -126,7 +127,7 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkList
rule = "strong {" + rule + "}";
ss.addRule(rule);
ss.addRule("a {text-decoration: underline; color: blue}");
- HTMLEditorKit kit = new HTMLEditorKit();
+ JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
kit.setStyleSheet(ss);
jepMessage.setEditorKit(kit);
@@ -141,6 +142,9 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkList
add(pnl, BorderLayout.WEST);
}
+ /**
+ * Constructs a new {@code UploadParameterSummaryPanel}.
+ */
public UploadParameterSummaryPanel() {
build();
updateSummary();
@@ -178,6 +182,7 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkList
/* --------------------------------------------------------------------- */
/* Interface HyperlinkListener
/* --------------------------------------------------------------------- */
+ @Override
public void hyperlinkUpdate(HyperlinkEvent e) {
if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) {
if (e.getDescription() == null || configHandler == null)
@@ -193,6 +198,7 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkList
/* --------------------------------------------------------------------- */
/* Interface PropertyChangeListener
/* --------------------------------------------------------------------- */
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
selectedChangeset = (Changeset)evt.getNewValue();
diff --git a/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
index 7c71c9e..352153a 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
@@ -9,6 +9,7 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.HashSet;
+import java.util.Set;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
@@ -25,6 +26,7 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -48,7 +50,7 @@ public class UploadPrimitivesTask extends AbstractUploadTask {
private OsmServerWriter writer;
private OsmDataLayer layer;
private Changeset changeset;
- private HashSet<IPrimitive> processedPrimitives;
+ private Set<IPrimitive> processedPrimitives;
private UploadStrategySpecification strategy;
/**
@@ -203,7 +205,7 @@ public class UploadPrimitivesTask extends AbstractUploadTask {
msg = tr("Object ''{0}'' is already deleted. Skipping object in upload.", displayName);
}
monitor.appendLogMessage(msg);
- System.out.println(tr("Warning: {0}", msg));
+ Main.warn(msg);
processedPrimitives.addAll(writer.getProcessedPrimitives());
processedPrimitives.add(p);
toUpload.removeProcessed(processedPrimitives);
@@ -220,6 +222,7 @@ public class UploadPrimitivesTask extends AbstractUploadTask {
// partially uploaded. Better run on EDT.
//
Runnable r = new Runnable() {
+ @Override
public void run() {
layer.cleanupAfterUpload(processedPrimitives);
layer.onPostUploadToServer();
@@ -297,7 +300,7 @@ public class UploadPrimitivesTask extends AbstractUploadTask {
}
} catch (Exception e) {
if (uploadCanceled) {
- System.out.println(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString()));
+ Main.info(tr("Ignoring caught exception because upload is canceled. Exception is: {0}", e.toString()));
} else {
lastException = e;
}
@@ -317,6 +320,7 @@ public class UploadPrimitivesTask extends AbstractUploadTask {
// - to the Upload Dialog
// - to map editing
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
// if the changeset is still open after this upload we want it to
// be selected on the next upload
@@ -325,8 +329,13 @@ public class UploadPrimitivesTask extends AbstractUploadTask {
if (changeset != null && changeset.isOpen()) {
UploadDialog.getUploadDialog().setSelectedChangesetForNextUpload(changeset);
}
- if (lastException == null)
+ if (lastException == null) {
+ new Notification(
+ "<h3>" + tr("Upload successful!") + "</h3>")
+ .setIcon(ImageProvider.get("misc", "check_large"))
+ .show();
return;
+ }
if (lastException instanceof ChangesetClosedException) {
ChangesetClosedException e = (ChangesetClosedException)lastException;
if (e.getSource().equals(ChangesetClosedException.Source.UPDATE_CHANGESET)) {
diff --git a/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java b/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
index 1d4d57d..6e4dd40 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
@@ -149,11 +149,7 @@ public class UploadSelectionDialog extends JDialog {
}
public List<OsmPrimitive> getSelectedPrimitives() {
- ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
- System.out.println("selected length:" +lstSelectedPrimitives.getSelectedIndices().length);
- for (int i=0; i< lstSelectedPrimitives.getSelectedIndices().length;i++) {
- System.out.println("selected:" +lstSelectedPrimitives.getSelectedIndices()[i]);
- }
+ List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
ret.addAll(lstSelectedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstSelectedPrimitives.getSelectedIndices()));
ret.addAll(lstDeletedPrimitives.getOsmPrimitiveListModel().getPrimitives(lstDeletedPrimitives.getSelectedIndices()));
return ret;
@@ -169,7 +165,7 @@ public class UploadSelectionDialog extends JDialog {
new Dimension(200,400)
)
).applySafe(this);
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
@@ -209,6 +205,7 @@ public class UploadSelectionDialog extends JDialog {
data,
new Comparator<OsmPrimitive>() {
private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
+ @Override
public int compare(OsmPrimitive o1, OsmPrimitive o2) {
int ret = OsmPrimitiveType.from(o1).compareTo(OsmPrimitiveType.from(o2));
if (ret != 0) return ret;
@@ -232,12 +229,14 @@ public class UploadSelectionDialog extends JDialog {
}
}
+ @Override
public Object getElementAt(int index) {
if (data == null)
return null;
return data.get(index);
}
+ @Override
public int getSize() {
if (data == null)
return 0;
@@ -247,7 +246,7 @@ public class UploadSelectionDialog extends JDialog {
public List<OsmPrimitive> getPrimitives(int [] indices) {
if (indices == null || indices.length == 0)
return Collections.emptyList();
- ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(indices.length);
+ List<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(indices.length);
for (int i: indices) {
if (i < 0) {
continue;
@@ -263,12 +262,13 @@ public class UploadSelectionDialog extends JDialog {
putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading"));
putValue(Action.NAME, tr("Cancel"));
putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
- .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
+ getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+ .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
getRootPane().getActionMap().put("ESCAPE", this);
setEnabled(true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
setCanceled(true);
setVisible(false);
@@ -283,6 +283,7 @@ public class UploadSelectionDialog extends JDialog {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
setCanceled(false);
setVisible(false);
@@ -293,6 +294,7 @@ public class UploadSelectionDialog extends JDialog {
|| lstDeletedPrimitives.getSelectedIndex() >= 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadStrategy.java b/src/org/openstreetmap/josm/gui/io/UploadStrategy.java
index 925a170..c5749db 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadStrategy.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadStrategy.java
@@ -85,7 +85,7 @@ public enum UploadStrategy {
}
UploadStrategy strategy = fromPreference(v);
if (strategy == null) {
- System.err.println(tr("Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''", "osm-server.upload-strategy", v ));
+ Main.warn(tr("Unexpected value for key ''{0}'' in preferences, got ''{1}''", "osm-server.upload-strategy", v ));
return DEFAULT_UPLOAD_STRATEGY;
}
return strategy;
diff --git a/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java b/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
index bd94731..df8082e 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
@@ -24,15 +24,15 @@ import javax.swing.ButtonGroup;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import javax.swing.UIManager;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* UploadStrategySelectionPanel is a panel for selecting an upload strategy.
@@ -50,12 +50,10 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
private static final Color BG_COLOR_ERROR = new Color(255,224,224);
- private ButtonGroup bgStrategies;
- private ButtonGroup bgMultiChangesetPolicies;
private Map<UploadStrategy, JRadioButton> rbStrategy;
private Map<UploadStrategy, JLabel> lblNumRequests;
private Map<UploadStrategy, JMultilineLabel> lblStrategies;
- private JTextField tfChunkSize;
+ private JosmTextField tfChunkSize;
private JPanel pnlMultiChangesetPolicyPanel;
private JRadioButton rbFillOneChangeset;
private JRadioButton rbUseMultipleChangesets;
@@ -63,6 +61,9 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
private long numUploadedObjects = 0;
+ /**
+ * Constructs a new {@code UploadStrategySelectionPanel}.
+ */
public UploadStrategySelectionPanel() {
build();
}
@@ -70,7 +71,7 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
protected JPanel buildUploadStrategyPanel() {
JPanel pnl = new JPanel();
pnl.setLayout(new GridBagLayout());
- bgStrategies = new ButtonGroup();
+ ButtonGroup bgStrategies = new ButtonGroup();
rbStrategy = new HashMap<UploadStrategy, JRadioButton>();
lblStrategies = new HashMap<UploadStrategy, JMultilineLabel>();
lblNumRequests = new HashMap<UploadStrategy, JLabel>();
@@ -135,7 +136,7 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
gc.weightx = 0.0;
gc.weighty = 0.0;
gc.gridwidth = 1;
- pnl.add(tfChunkSize = new JTextField(4), gc);
+ pnl.add(tfChunkSize = new JosmTextField(4), gc);
gc.gridx = 3;
gc.gridy = 2;
gc.weightx = 1.0;
@@ -192,7 +193,7 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
gc.gridy = 2;
pnlMultiChangesetPolicyPanel.add(rbUseMultipleChangesets = new JRadioButton(tr("Open and use as many new changesets as necessary")),gc);
- bgMultiChangesetPolicies = new ButtonGroup();
+ ButtonGroup bgMultiChangesetPolicies = new ButtonGroup();
bgMultiChangesetPolicies.add(rbFillOneChangeset);
bgMultiChangesetPolicies.add(rbUseMultipleChangesets);
return pnlMultiChangesetPolicyPanel;
@@ -373,6 +374,7 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
tfChunkSize.requestFocusInWindow();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(UploadedObjectsSummaryPanel.NUM_OBJECTS_TO_UPLOAD_PROP)) {
setNumUploadedObjects((Integer)evt.getNewValue());
@@ -380,24 +382,26 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
}
static class TextFieldFocusHandler implements FocusListener {
+ @Override
public void focusGained(FocusEvent e) {
Component c = e.getComponent();
- if (c instanceof JTextField) {
- JTextField tf = (JTextField)c;
+ if (c instanceof JosmTextField) {
+ JosmTextField tf = (JosmTextField)c;
tf.selectAll();
}
}
+ @Override
public void focusLost(FocusEvent e) {}
}
class ChunkSizeInputVerifier implements DocumentListener, PropertyChangeListener {
- protected void setErrorFeedback(JTextField tf, String message) {
+ protected void setErrorFeedback(JosmTextField tf, String message) {
tf.setBorder(BorderFactory.createLineBorder(Color.RED, 1));
tf.setToolTipText(message);
tf.setBackground(BG_COLOR_ERROR);
}
- protected void clearErrorFeedback(JTextField tf, String message) {
+ protected void clearErrorFeedback(JosmTextField tf, String message) {
tf.setBorder(UIManager.getBorder("TextField.border"));
tf.setToolTipText(message);
tf.setBackground(UIManager.getColor("TextField.background"));
@@ -425,18 +429,22 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
}
}
+ @Override
public void changedUpdate(DocumentEvent arg0) {
valiateChunkSize();
}
+ @Override
public void insertUpdate(DocumentEvent arg0) {
valiateChunkSize();
}
+ @Override
public void removeUpdate(DocumentEvent arg0) {
valiateChunkSize();
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getSource() == tfChunkSize
&& evt.getPropertyName().equals("enabled")
@@ -453,6 +461,7 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
firePropertyChange(UPLOAD_STRATEGY_SPECIFICATION_PROP, null, getUploadStrategySpecification());
}
+ @Override
public void itemStateChanged(ItemEvent e) {
UploadStrategy strategy = getUploadStrategy();
if (strategy == null) return;
@@ -467,12 +476,15 @@ public class UploadStrategySelectionPanel extends JPanel implements PropertyChan
notifyStrategy();
}
+ @Override
public void focusGained(FocusEvent arg0) {}
+ @Override
public void focusLost(FocusEvent arg0) {
notifyStrategy();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
notifyStrategy();
}
diff --git a/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java b/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java
index e035a42..3646497 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java
@@ -3,7 +3,7 @@ package org.openstreetmap.josm.gui.io;
/**
* An UploadStrategySpecification consists of the parameter describing the strategy
- * for uploading a collection of {@link OsmPrimitive}.
+ * for uploading a collection of {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
*
* This includes:
* <ul>
@@ -11,8 +11,6 @@ package org.openstreetmap.josm.gui.io;
* <li>the upload chunk size</li>
* <li>whether to close the changeset used after the upload</li>
* </ul>
- *
- *
*/
public class UploadStrategySpecification {
/** indicates that the chunk size isn't specified */
@@ -49,7 +47,7 @@ public class UploadStrategySpecification {
/**
* Replies the upload strategy
- * @return
+ * @return the upload strategy
*/
public UploadStrategy getStrategy() {
return strategy;
diff --git a/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java b/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java
index ae558d4..db83449 100644
--- a/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java
+++ b/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java
@@ -173,11 +173,13 @@ public class UploadedObjectsSummaryPanel extends JPanel {
fireContentsChanged(this,0,getSize());
}
+ @Override
public Object getElementAt(int index) {
if (primitives == null) return null;
return primitives.get(index);
}
+ @Override
public int getSize() {
if (primitives == null) return 0;
return primitives.size();
diff --git a/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java b/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
index 4b88e78..ade224e 100644
--- a/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
+++ b/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java
@@ -7,17 +7,16 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Component;
import java.awt.event.ActionEvent;
+import java.util.LinkedList;
+import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.JColorChooser;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
-import java.util.LinkedList;
-import java.util.List;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
import org.openstreetmap.josm.gui.layer.Layer.MultiLayerAction;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -33,7 +32,7 @@ public class CustomizeColor extends AbstractAction implements LayerAction, Multi
public CustomizeColor(Layer l) {
this();
layers = new LinkedList<Layer>();
- layers.add(l);
+ layers.add(l);
}
private CustomizeColor() {
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index c40e1ea..1d40f3f 100644
--- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
@@ -16,6 +16,7 @@ import java.awt.Stroke;
import java.io.File;
import java.text.DateFormat;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -112,28 +113,32 @@ public class GpxLayer extends Layer {
if (earliest==null || latest==null) return null;
return new Date[]{earliest.getTime(), latest.getTime()};
}
-
+
/**
- * returns minimum and maximum timestamps for all tracks
+ * Returns minimum and maximum timestamps for all tracks
+ * Warning: there are lot of track with broken timestamps,
+ * so we just ingore points from future and from year before 1970 in this method
+ * works correctly @since 5815
*/
public Date[] getMinMaxTimeForAllTracks() {
- double min=Double.MIN_VALUE, max=Double.MAX_VALUE, t;
+ double min=1e100, max=-1e100, t;
+ double now = System.currentTimeMillis()/1000.0;
for (GpxTrack trk: data.tracks) {
for (GpxTrackSegment seg : trk.getSegments()) {
for (WayPoint pnt : seg.getWayPoints()) {
t = pnt.time;
- if (t!=0) {
+ if (t>0 && t<=now) {
if (t>max) max=t;
if (t<min) min=t;
}
}
}
}
- if (min==Double.MIN_VALUE || max==Double.MAX_VALUE) return null;
+ if (min==1e100 || max==-1e100) return null;
return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000)), };
}
-
-
+
+
/**
* returns a human readable string that shows the timespan of the given track
*/
@@ -154,7 +159,7 @@ public class GpxLayer extends Layer {
ts += dtf.format(bounds[0]) + " - " + dtf.format(bounds[1]);
}
- int diff = (int) (bounds[1].getTime() - bounds[0].getTime());
+ int diff = (int) (bounds[1].getTime() - bounds[0].getTime()) / 1000;
ts += String.format(" (%d:%02d)", diff / 3600, (diff % 3600) / 60);
}
return ts;
@@ -177,7 +182,7 @@ public class GpxLayer extends Layer {
info.append(tr("Description: {0}", data.attr.get(GpxConstants.META_DESC))).append("<br>");
}
- if (data.tracks.size() > 0) {
+ if (!data.tracks.isEmpty()) {
info.append("<table><thead align='center'><tr><td colspan='5'>"
+ trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size())
+ "</td></tr><tr align='center'><td>" + tr("Name") + "</td><td>"
@@ -237,6 +242,7 @@ public class GpxLayer extends Layer {
int i=Main.pref.getInteger("draw.rawgps.colors", "layer " + getName(), 0);
return colorModes.values()[i];
} catch (Exception e) {
+ Main.warn(e);
}
return colorModes.none;
}
@@ -282,7 +288,7 @@ public class GpxLayer extends Layer {
SeparatorLayerAction.INSTANCE,
new LayerListPopup.InfoAction(this) };
}
-
+
public boolean isLocalFile() {
return isLocalFile;
}
@@ -329,14 +335,14 @@ public class GpxLayer extends Layer {
else
return true;
}
-
+
public void filterTracksByDate(Date fromDate, Date toDate, boolean showWithoutDate) {
int i = 0;
long from = fromDate.getTime();
long to = toDate.getTime();
for (GpxTrack trk : data.tracks) {
Date[] t = GpxLayer.getMinMaxTimeForTrack(trk);
-
+
if (t==null) continue;
long tm = t[1].getTime();
trackVisibility[i]= (tm==0 && showWithoutDate) || (from<=tm && tm <= to);
@@ -418,7 +424,6 @@ public class GpxLayer extends Layer {
/****************************************************************
********** STEP 1 - GET CONFIG VALUES **************************
****************************************************************/
- // Long startTime = System.currentTimeMillis();
Color neutralColor = getColor(true);
String spec="layer "+getName();
@@ -483,43 +488,39 @@ public class GpxLayer extends Layer {
WayPoint oldWp = null;
if (colorModeDynamic) {
if (colored == colorModes.velocity) {
- for (GpxTrack trk : data.tracks) {
- for (GpxTrackSegment segment : trk.getSegments()) {
- if(!forceLines) {
- oldWp = null;
+ for (Collection<WayPoint> segment : data.getLinesIterable(null)) {
+ if(!forceLines) {
+ oldWp = null;
+ }
+ for (WayPoint trkPnt : segment) {
+ LatLon c = trkPnt.getCoor();
+ if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) {
+ continue;
}
- for (WayPoint trkPnt : segment.getWayPoints()) {
- LatLon c = trkPnt.getCoor();
- if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) {
- continue;
+ if (oldWp != null && trkPnt.time > oldWp.time) {
+ double vel = c.greatCircleDistance(oldWp.getCoor())
+ / (trkPnt.time - oldWp.time);
+ if(vel > maxval) {
+ maxval = vel;
}
- if (oldWp != null && trkPnt.time > oldWp.time) {
- double vel = c.greatCircleDistance(oldWp.getCoor())
- / (trkPnt.time - oldWp.time);
- if(vel > maxval) {
- maxval = vel;
- }
- if(vel < minval) {
- minval = vel;
- }
+ if(vel < minval) {
+ minval = vel;
}
- oldWp = trkPnt;
}
+ oldWp = trkPnt;
}
}
} else if (colored == colorModes.dilution) {
- for (GpxTrack trk : data.tracks) {
- for (GpxTrackSegment segment : trk.getSegments()) {
- for (WayPoint trkPnt : segment.getWayPoints()) {
- Object val = trkPnt.attr.get("hdop");
- if (val != null) {
- double hdop = ((Float) val).doubleValue();
- if(hdop > maxval) {
- maxval = hdop;
- }
- if(hdop < minval) {
- minval = hdop;
- }
+ for (Collection<WayPoint> segment : data.getLinesIterable(null)) {
+ for (WayPoint trkPnt : segment) {
+ Object val = trkPnt.attr.get("hdop");
+ if (val != null) {
+ double hdop = ((Float) val).doubleValue();
+ if(hdop > maxval) {
+ maxval = hdop;
+ }
+ if(hdop < minval) {
+ minval = hdop;
}
}
}
@@ -527,90 +528,81 @@ public class GpxLayer extends Layer {
}
oldWp = null;
}
+ double now = System.currentTimeMillis()/1000.0;
if (colored == colorModes.time) {
- for (GpxTrack trk : data.tracks) {
- for (GpxTrackSegment segment : trk.getSegments()) {
- for (WayPoint trkPnt : segment.getWayPoints()) {
- double t=trkPnt.time;
- if (t==0) {
- continue; // skip non-dated trackpoints
- }
- if(t > maxval) {
- maxval = t;
- }
- if(t < minval) {
- minval = t;
- }
- }
- }
+ Date[] bounds = getMinMaxTimeForAllTracks();
+ if (bounds!=null) {
+ minval = bounds[0].getTime()/1000.0;
+ maxval = bounds[1].getTime()/1000.0;
+ } else {
+ minval = 0; maxval=now;
}
}
- for (GpxTrack trk : data.tracks) {
- for (GpxTrackSegment segment : trk.getSegments()) {
- if (!forceLines) { // don't draw lines between segments, unless forced to
- oldWp = null;
+ for (Collection<WayPoint> segment : data.getLinesIterable(null)) {
+ if (!forceLines) { // don't draw lines between segments, unless forced to
+ oldWp = null;
+ }
+ for (WayPoint trkPnt : segment) {
+ LatLon c = trkPnt.getCoor();
+ if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) {
+ continue;
}
- for (WayPoint trkPnt : segment.getWayPoints()) {
- LatLon c = trkPnt.getCoor();
- if (Double.isNaN(c.lat()) || Double.isNaN(c.lon())) {
- continue;
- }
- trkPnt.customColoring = neutralColor;
- if(colored == colorModes.dilution && trkPnt.attr.get("hdop") != null) {
- float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue();
- int hdoplvl =(int) Math.round(colorModeDynamic ? ((hdop-minval)*255/(maxval-minval))
- : (hdop <= 0 ? 0 : hdop * hdopfactor));
- // High hdop is bad, but high values in colors are green.
- // Therefore inverse the logic
- int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl);
- trkPnt.customColoring = colors[hdopcolor];
- }
- if (oldWp != null) {
- double dist = c.greatCircleDistance(oldWp.getCoor());
- boolean noDraw=false;
- switch (colored) {
- case velocity:
- double dtime = trkPnt.time - oldWp.time;
- if(dtime > 0) {
- float vel = (float) (dist / dtime);
- int velColor =(int) Math.round(colorModeDynamic ? ((vel-minval)*255/(maxval-minval))
- : (vel <= 0 ? 0 : vel / colorTracksTune * 255));
- trkPnt.customColoring = colors[Math.max(0, Math.min(velColor, 255))];
- } else {
- trkPnt.customColoring = colors[255];
- }
- break;
- case direction:
- double dirColor = oldWp.getCoor().heading(trkPnt.getCoor()) / (2.0 * Math.PI) * 256;
- // Bad case first
- if (dirColor != dirColor || dirColor < 0.0 || dirColor >= 256.0) {
- trkPnt.customColoring = colors_cyclic[0];
- } else {
- trkPnt.customColoring = colors_cyclic[(int) (dirColor)];
- }
- break;
- case time:
- if (trkPnt.time>0){
- int tColor = (int) Math.round((trkPnt.time-minval)*255/(maxval-minval));
- trkPnt.customColoring = colors[tColor];
- } else {
- trkPnt.customColoring = neutralColor;
- }
- break;
+ trkPnt.customColoring = neutralColor;
+ if(colored == colorModes.dilution && trkPnt.attr.get("hdop") != null) {
+ float hdop = ((Float) trkPnt.attr.get("hdop")).floatValue();
+ int hdoplvl =(int) Math.round(colorModeDynamic ? ((hdop-minval)*255/(maxval-minval))
+ : (hdop <= 0 ? 0 : hdop * hdopfactor));
+ // High hdop is bad, but high values in colors are green.
+ // Therefore inverse the logic
+ int hdopcolor = 255 - (hdoplvl > 255 ? 255 : hdoplvl);
+ trkPnt.customColoring = colors[hdopcolor];
+ }
+ if (oldWp != null) {
+ double dist = c.greatCircleDistance(oldWp.getCoor());
+ boolean noDraw=false;
+ switch (colored) {
+ case velocity:
+ double dtime = trkPnt.time - oldWp.time;
+ if(dtime > 0) {
+ float vel = (float) (dist / dtime);
+ int velColor =(int) Math.round(colorModeDynamic ? ((vel-minval)*255/(maxval-minval))
+ : (vel <= 0 ? 0 : vel / colorTracksTune * 255));
+ trkPnt.customColoring = colors[Math.max(0, Math.min(velColor, 255))];
+ } else {
+ trkPnt.customColoring = colors[255];
}
-
- if (!noDraw && (maxLineLength == -1 || dist <= maxLineLength)) {
- trkPnt.drawLine = true;
- trkPnt.dir = (int) oldWp.getCoor().heading(trkPnt.getCoor());
+ break;
+ case direction:
+ double dirColor = oldWp.getCoor().heading(trkPnt.getCoor()) / (2.0 * Math.PI) * 256;
+ // Bad case first
+ if (dirColor != dirColor || dirColor < 0.0 || dirColor >= 256.0) {
+ trkPnt.customColoring = colors_cyclic[0];
} else {
- trkPnt.drawLine = false;
+ trkPnt.customColoring = colors_cyclic[(int) (dirColor)];
}
- } else { // make sure we reset outdated data
+ break;
+ case time:
+ double t=trkPnt.time;
+ if (t>0 && t<=now){ // skip bad timestamps
+ int tColor = (int) Math.round((t-minval)*255/(maxval-minval));
+ trkPnt.customColoring = colors[tColor];
+ } else {
+ trkPnt.customColoring = neutralColor;
+ }
+ break;
+ }
+
+ if (!noDraw && (maxLineLength == -1 || dist <= maxLineLength)) {
+ trkPnt.drawLine = true;
+ trkPnt.dir = (int) oldWp.getCoor().heading(trkPnt.getCoor());
+ } else {
trkPnt.drawLine = false;
}
- oldWp = trkPnt;
+ } else { // make sure we reset outdated data
+ trkPnt.drawLine = false;
}
+ oldWp = trkPnt;
}
}
computeCacheInSync = true;
@@ -618,38 +610,31 @@ public class GpxLayer extends Layer {
LinkedList<WayPoint> visibleSegments = new LinkedList<WayPoint>();
WayPoint last = null;
- int i = 0;
ensureTrackVisibilityLength();
- for (GpxTrack trk: data.tracks) {
- // hide tracks that were de-selected in ChooseTrackVisibilityAction
- if(!trackVisibility[i++]) {
- continue;
- }
-
- for (GpxTrackSegment trkSeg: trk.getSegments()) {
- for(WayPoint pt : trkSeg.getWayPoints())
+ for (Collection<WayPoint> segment : data.getLinesIterable(trackVisibility)) {
+
+ for(WayPoint pt : segment)
+ {
+ Bounds b = new Bounds(pt.getCoor());
+ // last should never be null when this is true!
+ if(pt.drawLine) {
+ b.extend(last.getCoor());
+ }
+ if(b.intersects(box))
{
- Bounds b = new Bounds(pt.getCoor());
- // last should never be null when this is true!
- if(pt.drawLine) {
- b.extend(last.getCoor());
- }
- if(b.intersects(box))
- {
- if(last != null && (visibleSegments.isEmpty()
- || visibleSegments.getLast() != last)) {
- if(last.drawLine) {
- WayPoint l = new WayPoint(last);
- l.drawLine = false;
- visibleSegments.add(l);
- } else {
- visibleSegments.add(last);
- }
+ if(last != null && (visibleSegments.isEmpty()
+ || visibleSegments.getLast() != last)) {
+ if(last.drawLine) {
+ WayPoint l = new WayPoint(last);
+ l.drawLine = false;
+ visibleSegments.add(l);
+ } else {
+ visibleSegments.add(last);
}
- visibleSegments.add(pt);
}
- last = pt;
+ visibleSegments.add(pt);
}
+ last = pt;
}
}
if(visibleSegments.isEmpty())
@@ -801,8 +786,6 @@ public class GpxLayer extends Layer {
{
g.setStroke(storedStroke);
}
- // Long duration = System.currentTimeMillis() - startTime;
- // System.out.println(duration);
} // end paint
@Override
@@ -830,9 +813,7 @@ public class GpxLayer extends Layer {
final boolean[] back = trackVisibility.clone();
final int m = Math.min(l, back.length);
trackVisibility = new boolean[l];
- for(int i=0; i < m; i++) {
- trackVisibility[i] = back[i];
- }
+ System.arraycopy(back, 0, trackVisibility, 0, m);
for(int i=m; i < l; i++) {
trackVisibility[i] = true;
}
@@ -881,5 +862,5 @@ public class GpxLayer extends Layer {
public File createAndOpenSaveFileChooser() {
return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), GpxImporter.FILE_FILTER);
}
-
+
}
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 0ec90a9..47046cf 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -9,6 +9,7 @@ import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.Graphics;
+import java.awt.GridBagLayout;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
@@ -21,24 +22,24 @@ import javax.swing.AbstractAction;
import javax.swing.Icon;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
+import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
+import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
-import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ImageryAdjustAction;
import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
import org.openstreetmap.josm.data.imagery.OffsetBookmark;
import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.MenuScroller;
-import org.openstreetmap.josm.io.imagery.OffsetServer;
-import org.openstreetmap.josm.io.imagery.OsmosnimkiOffsetServer;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
public abstract class ImageryLayer extends Layer {
@@ -65,22 +66,7 @@ public abstract class ImageryLayer extends Layer {
protected int sharpenLevel;
- protected boolean offsetServerSupported;
- protected boolean offsetServerUsed;
- protected OffsetServerThread offsetServerThread;
-
private final ImageryAdjustAction adjustAction = new ImageryAdjustAction(this);
- private final AbstractAction useServerOffsetAction = new AbstractAction(tr("(use server offset)")) {
- @Override
- public void actionPerformed(ActionEvent e) {
- enableOffsetServer(true);
- }
- };
-
- protected OffsetServerThread createoffsetServerThread() {
- return new OffsetServerThread(new OsmosnimkiOffsetServer(
- OsmosnimkiOffsetServer.PROP_SERVER_URL.get()));
- }
public ImageryLayer(ImageryInfo info) {
super(info.getName());
@@ -93,14 +79,10 @@ public abstract class ImageryLayer extends Layer {
icon = ImageProvider.get("imagery_small");
}
this.sharpenLevel = PROP_SHARPEN_LEVEL.get();
- if (OffsetServer.PROP_SERVER_ENABLED.get()) {
- offsetServerThread = createoffsetServerThread();
- offsetServerThread.start();
- }
}
public double getPPD(){
- if (Main.map == null || Main.map.mapView == null) return Main.getProjection().getDefaultZoomInPPD();
+ if (!Main.isDisplayingMapView()) return Main.getProjection().getDefaultZoomInPPD();
ProjectionBounds bounds = Main.map.mapView.getProjectionBounds();
return Main.map.mapView.getWidth() / (bounds.maxEast - bounds.minEast);
}
@@ -142,7 +124,19 @@ public abstract class ImageryLayer extends Layer {
@Override
public Object getInfoComponent() {
- return getToolTipText();
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(new JLabel(getToolTipText()), GBC.eol());
+ if (info != null) {
+ String url = info.getUrl();
+ if (url != null) {
+ panel.add(new JLabel(tr("URL: ")), GBC.std().insets(0, 5, 2, 0));
+ panel.add(new UrlLabel(url), GBC.eol().insets(2, 5, 10, 0));
+ }
+ if (dx != 0.0 || dy != 0.0) {
+ panel.add(new JLabel(tr("Offset: ") + dx + ";" + dy), GBC.eol().insets(0, 5, 10, 0));
+ }
+ }
+ return panel;
}
public static ImageryLayer create(ImageryInfo info) {
@@ -163,7 +157,6 @@ public abstract class ImageryLayer extends Layer {
@Override
public void actionPerformed(ActionEvent ev) {
setOffset(b.dx, b.dy);
- enableOffsetServer(false);
Main.main.menu.imageryMenu.refreshOffsetMenu();
Main.map.repaint();
}
@@ -185,14 +178,6 @@ public abstract class ImageryLayer extends Layer {
}
}
- public void enableOffsetServer(boolean enable) {
- offsetServerUsed = enable;
- if (offsetServerUsed && !offsetServerThread.isAlive()) {
- offsetServerThread = createoffsetServerThread();
- offsetServerThread.start();
- }
- }
-
public JMenuItem getOffsetMenuItem() {
JMenu subMenu = new JMenu(trc("layer", "Offset"));
subMenu.setIcon(ImageProvider.get("mapmode", "adjustimg"));
@@ -201,16 +186,9 @@ public abstract class ImageryLayer extends Layer {
public JComponent getOffsetMenuItem(JComponent subMenu) {
JMenuItem adjustMenuItem = new JMenuItem(adjustAction);
- if (OffsetBookmark.allBookmarks.isEmpty() && !offsetServerSupported) return adjustMenuItem;
+ if (OffsetBookmark.allBookmarks.isEmpty()) return adjustMenuItem;
subMenu.add(adjustMenuItem);
- if (offsetServerSupported) {
- JCheckBoxMenuItem item = new JCheckBoxMenuItem(useServerOffsetAction);
- if (offsetServerUsed) {
- item.setSelected(true);
- }
- subMenu.add(item);
- }
subMenu.add(new JSeparator());
boolean hasBookmarks = false;
int menuItemHeight = 0;
@@ -219,7 +197,7 @@ public abstract class ImageryLayer extends Layer {
continue;
}
JCheckBoxMenuItem item = new JCheckBoxMenuItem(new ApplyOffsetAction(b));
- if (b.dx == dx && b.dy == dy && !offsetServerUsed) {
+ if (b.dx == dx && b.dy == dy) {
item.setSelected(true);
}
subMenu.add(item);
@@ -234,7 +212,7 @@ public abstract class ImageryLayer extends Layer {
MenuScroller.setScrollerFor((JPopupMenu)subMenu, scrollcount);
}
}
- return (hasBookmarks || offsetServerSupported) ? subMenu : adjustMenuItem;
+ return hasBookmarks ? subMenu : adjustMenuItem;
}
public BufferedImage sharpenImage(BufferedImage img) {
@@ -264,51 +242,6 @@ public abstract class ImageryLayer extends Layer {
g.drawString(text, (img.getWidth() + g.getFontMetrics().stringWidth(text)) / 2, img.getHeight()/2);
}
- protected class OffsetServerThread extends Thread {
- OffsetServer offsetServer;
- EastNorth oldCenter = new EastNorth(Double.NaN, Double.NaN);
-
- public OffsetServerThread(OffsetServer offsetServer) {
- this.offsetServer = offsetServer;
- setDaemon(true);
- }
-
- private void updateOffset() {
- if (Main.map == null || Main.map.mapView == null) return;
- EastNorth center = Main.map.mapView.getCenter();
- if (center.equals(oldCenter)) return;
- oldCenter = center;
-
- EastNorth offset = offsetServer.getOffset(getInfo(), center);
- if (offset != null) {
- setOffset(offset.east(),offset.north());
- }
- }
-
- @Override
- public void run() {
- if (!offsetServerSupported) {
- if (!offsetServer.isLayerSupported(info)) return;
- offsetServerSupported = true;
- }
- offsetServerUsed = true;
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- Main.main.menu.imageryMenu.refreshOffsetMenu();
- }
- });
- try {
- while (offsetServerUsed) {
- updateOffset();
- Thread.sleep(1000);
- }
- } catch (InterruptedException e) {
- }
- offsetServerUsed = false;
- }
- }
-
/* (non-Javadoc)
* @see org.openstreetmap.josm.gui.layer.Layer#destroy()
*/
diff --git a/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java b/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
index b8ab255..130c9c8 100644
--- a/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
+++ b/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
@@ -15,12 +15,16 @@ import org.openstreetmap.josm.tools.MultikeyActionsHandler;
import org.openstreetmap.josm.tools.MultikeyShortcutAction;
import org.openstreetmap.josm.tools.Shortcut;
-public class JumpToMarkerActions {
+public final class JumpToMarkerActions {
public interface JumpToMarkerLayer {
void jumpToNextMarker();
void jumpToPreviousMarker();
}
+
+ private JumpToMarkerActions() {
+ // Hide default constructor for utils classes
+ }
private static JumpToNextMarker jumpToNextMarkerAction;
private static JumpToPreviousMarker jumpToPreviousMarkerAction;
@@ -37,20 +41,20 @@ public class JumpToMarkerActions {
MultikeyActionsHandler.getInstance().removeAction(jumpToPreviousMarkerAction);
}
- public static final class JumpToNextMarker extends AbstractAction implements MultikeyShortcutAction {
+ private static abstract class JumpToMarker extends AbstractAction implements MultikeyShortcutAction {
private final Layer layer;
+ private final Shortcut multikeyShortcut;
private WeakReference<Layer> lastLayer;
- private Shortcut multikeyShortcut;
-
- public JumpToNextMarker(JumpToMarkerLayer layer) {
- multikeyShortcut = Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
- KeyEvent.VK_J, Shortcut.ALT_CTRL);
- multikeyShortcut.setAccelerator(this);
- putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
- putValue(NAME, tr("Jump to next marker"));
-
- this.layer = (Layer)layer;
+
+ public JumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) {
+ this.layer = (Layer) layer;
+ this.multikeyShortcut = shortcut;
+ this.multikeyShortcut.setAccelerator(this);
+ }
+
+ protected final void setLastLayer(Layer l) {
+ lastLayer = new WeakReference<Layer>(l);
}
@Override
@@ -78,16 +82,13 @@ public class JumpToMarkerActions {
}
}
- private void execute(Layer l) {
- ((JumpToMarkerLayer)l).jumpToNextMarker();
- lastLayer = new WeakReference<Layer>(l);
- }
+ protected abstract void execute(Layer l);
@Override
public List<MultikeyInfo> getMultikeyCombinations() {
return LayerListDialog.getLayerInfoByClass(JumpToMarkerLayer.class);
}
-
+
@Override
public MultikeyInfo getLastMultikeyAction() {
if (lastLayer != null)
@@ -95,66 +96,37 @@ public class JumpToMarkerActions {
else
return null;
}
-
}
- public static final class JumpToPreviousMarker extends AbstractAction implements MultikeyShortcutAction {
-
- private WeakReference<Layer> lastLayer;
- private final Layer layer;
- private Shortcut multikeyShortcut;
+ public static final class JumpToNextMarker extends JumpToMarker {
- public JumpToPreviousMarker(JumpToMarkerLayer layer) {
- this.layer = (Layer)layer;
-
- multikeyShortcut = Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previos marker")),
- KeyEvent.VK_P, Shortcut.ALT_CTRL);
- multikeyShortcut.setAccelerator(this);
- putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
- putValue(NAME, tr("Jump to previous marker"));
- }
-
- @Override
- public Shortcut getMultikeyShortcut() {
- return multikeyShortcut;
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- execute(layer);
+ public JumpToNextMarker(JumpToMarkerLayer layer) {
+ super(layer, Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
+ KeyEvent.VK_J, Shortcut.ALT_CTRL));
+ putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
+ putValue(NAME, tr("Jump to next marker"));
}
@Override
- public void executeMultikeyAction(int index, boolean repeat) {
- Layer l = LayerListDialog.getLayerForIndex(index);
- if (l != null) {
- if (l instanceof JumpToMarkerLayer) {
- execute(l);
- }
- } else if (repeat && lastLayer != null) {
- l = lastLayer.get();
- if (LayerListDialog.isLayerValid(l)) {
- execute(l);
- }
- }
+ protected void execute(Layer l) {
+ ((JumpToMarkerLayer)l).jumpToNextMarker();
+ setLastLayer(l);
}
+ }
- private void execute(Layer l) {
- ((JumpToMarkerLayer) l).jumpToPreviousMarker();
- lastLayer = new WeakReference<Layer>(l);
- }
+ public static final class JumpToPreviousMarker extends JumpToMarker {
- @Override
- public List<MultikeyInfo> getMultikeyCombinations() {
- return LayerListDialog.getLayerInfoByClass(JumpToMarkerLayer.class);
+ public JumpToPreviousMarker(JumpToMarkerLayer layer) {
+ super(layer, Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previous marker")),
+ KeyEvent.VK_P, Shortcut.ALT_CTRL));
+ putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
+ putValue(NAME, tr("Jump to previous marker"));
}
@Override
- public MultikeyInfo getLastMultikeyAction() {
- if (lastLayer != null)
- return LayerListDialog.getLayerInfo(lastLayer.get());
- else
- return null;
+ protected void execute(Layer l) {
+ ((JumpToMarkerLayer) l).jumpToPreviousMarker();
+ setLastLayer(l);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/Layer.java b/src/org/openstreetmap/josm/gui/layer/Layer.java
index 7b2f625..cde94d9 100644
--- a/src/org/openstreetmap/josm/gui/layer/Layer.java
+++ b/src/org/openstreetmap/josm/gui/layer/Layer.java
@@ -378,6 +378,7 @@ abstract public class Layer implements Destroyable, MapViewPaintable, Projection
this.layer = layer;
}
+ @Override
public void actionPerformed(ActionEvent e) {
SaveAction.getInstance().doSave(layer);
}
@@ -393,6 +394,7 @@ abstract public class Layer implements Destroyable, MapViewPaintable, Projection
this.layer = layer;
}
+ @Override
public void actionPerformed(ActionEvent e) {
SaveAsAction.getInstance().doSave(layer);
}
@@ -408,6 +410,7 @@ abstract public class Layer implements Destroyable, MapViewPaintable, Projection
this.layer = layer;
}
+ @Override
public void actionPerformed(ActionEvent e) {
new GpxExportAction().export(layer);
}
@@ -435,7 +438,7 @@ abstract public class Layer implements Destroyable, MapViewPaintable, Projection
public void onPostLoadFromFile() {
// To be overriden if needed
}
-
+
/**
* Replies the savable state of this layer (i.e if it can be saved through a "File->Save" dialog).
* @return true if this layer can be saved to a file
@@ -444,7 +447,7 @@ abstract public class Layer implements Destroyable, MapViewPaintable, Projection
public boolean isSavable() {
return false;
}
-
+
/**
* Checks whether it is ok to launch a save (whether we have data, there is no conflict etc.)
* @return <code>true</code>, if it is safe to save.
@@ -453,7 +456,7 @@ abstract public class Layer implements Destroyable, MapViewPaintable, Projection
public boolean checkSaveConditions() {
return true;
}
-
+
/**
* Creates a new "Save" dialog for this layer and makes it visible.<br/>
* When the user has chosen a file, checks the file extension, and confirms overwrite if needed.
diff --git a/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java b/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
index b4f3d70..5b29a27 100644
--- a/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
+++ b/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer;
import java.awt.Graphics2D;
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index c75fee7..e2d1d5a 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -37,7 +37,6 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExpertToggleAction;
@@ -73,14 +72,12 @@ import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.DateUtils;
import org.openstreetmap.josm.tools.FilteredCollection;
import org.openstreetmap.josm.tools.GBC;
@@ -101,7 +98,11 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
private boolean isChanged = true;
private int highlightUpdateCount;
- public List<TestError> validationErrors = new ArrayList<TestError>();
+ /**
+ * List of validation errors in this layer.
+ * @since 3669
+ */
+ public final List<TestError> validationErrors = new ArrayList<TestError>();
protected void setRequiresSaveToFile(boolean newValue) {
boolean oldValue = requiresSaveToFile;
@@ -140,6 +141,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
public int deletedWays;
public int deletedRelations;
+ @Override
public void visit(final Node n) {
nodes++;
if (n.isDeleted()) {
@@ -147,6 +149,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
}
}
+ @Override
public void visit(final Way w) {
ways++;
if (w.isDeleted()) {
@@ -154,6 +157,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
}
}
+ @Override
public void visit(final Relation r) {
relations++;
if (r.isDeleted()) {
@@ -165,7 +169,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
public interface CommandQueueListener {
void commandChanged(int queueSize, int redoSize);
}
-
+
/**
* Listener called when a state of this layer has changed.
*/
@@ -177,9 +181,9 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
*/
void uploadDiscouragedChanged(OsmDataLayer layer, boolean newValue);
}
-
+
private final CopyOnWriteArrayList<LayerStateChangeListener> layerStateChangeListeners = new CopyOnWriteArrayList<LayerStateChangeListener>();
-
+
/**
* Adds a layer state change listener
*
@@ -191,7 +195,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
layerStateChangeListeners.addIfAbsent(listener);
}
}
-
+
/**
* Removes a layer property change listener
*
@@ -261,7 +265,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
protected Icon getBaseIcon() {
return ImageProvider.get("layer", "osmdata_small");
}
-
+
/**
* TODO: @return Return a dynamic drawn icon of the map data. The icon is
* updated by a background thread to not disturb the running programm.
@@ -357,12 +361,13 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
public void mergeFrom(final DataSet from) {
mergeFrom(from, null);
}
-
+
/**
* merges the primitives in dataset <code>from</code> into the dataset of
* this layer
*
* @param from the source data set
+ * @param progressMonitor the progress monitor, can be {@code null}
*/
public void mergeFrom(final DataSet from, ProgressMonitor progressMonitor) {
final DataSetMerger visitor = new DataSetMerger(data,from);
@@ -381,9 +386,8 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
Area a = data.getDataSourceArea();
- // copy the merged layer's data source info;
- // only add source rectangles if they are not contained in the
- // layer already.
+ // copy the merged layer's data source info.
+ // only add source rectangles if they are not contained in the layer already.
for (DataSource src : from.dataSources) {
if (a == null || !a.contains(src.bounds.asRect())) {
data.dataSources.add(src);
@@ -394,7 +398,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
if (data.getVersion() == null) {
data.setVersion(from.getVersion());
} else if ("0.5".equals(data.getVersion()) ^ "0.5".equals(from.getVersion())) {
- System.err.println(tr("Warning: mixing 0.6 and 0.5 data results in version 0.5"));
+ Main.warn(tr("Mixing 0.6 and 0.5 data results in version 0.5"));
data.setVersion("0.5");
}
@@ -406,61 +410,17 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
}
}
// repaint to make sure new data is displayed properly.
- if (Main.map != null && Main.map.mapView != null) {
+ if (Main.isDisplayingMapView()) {
Main.map.mapView.repaint();
}
- warnNumNewConflicts(numNewConflicts);
- }
-
- /**
- * Warns the user about the number of detected conflicts
- *
- * @param numNewConflicts the number of detected conflicts
- */
- protected void warnNumNewConflicts(int numNewConflicts) {
- if (numNewConflicts == 0) return;
-
- String msg1 = trn(
- "There was {0} conflict detected.",
- "There were {0} conflicts detected.",
- numNewConflicts,
- numNewConflicts
- );
-
- final StringBuffer sb = new StringBuffer();
- sb.append("<html>").append(msg1).append("</html>");
- if (numNewConflicts > 0) {
- final ButtonSpec[] options = new ButtonSpec[] {
- new ButtonSpec(
- tr("OK"),
- ImageProvider.get("ok"),
- tr("Click to close this dialog and continue editing"),
- null /* no specific help */
- )
- };
- GuiHelper.runInEDT(new Runnable() {
- @Override
- public void run() {
- HelpAwareOptionPane.showOptionDialog(
- Main.parent,
- sb.toString(),
- tr("Conflicts detected"),
- JOptionPane.WARNING_MESSAGE,
- null, /* no icon */
- options,
- options[0],
- ht("/Concepts/Conflict#WarningAboutDetectedConflicts")
- );
- Main.map.conflictDialog.unfurlDialog();
- Main.map.repaint();
- }
- });
+ // warn about new conflicts
+ if (numNewConflicts > 0 && Main.map != null && Main.map.conflictDialog != null) {
+ Main.map.conflictDialog.warnNumNewConflicts(numNewConflicts);
}
}
-
@Override public boolean isMergable(final Layer other) {
- // isUploadDiscouraged commented to allow merging between normal layers and discouraged layers with a warning (see #7684)
+ // isUploadDiscouraged commented to allow merging between normal layers and discouraged layers with a warning (see #7684)
return other instanceof OsmDataLayer;// && (isUploadDiscouraged() == ((OsmDataLayer)other).isUploadDiscouraged());
}
@@ -500,7 +460,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
@Override public Object getInfoComponent() {
final DataCountVisitor counter = new DataCountVisitor();
for (final OsmPrimitive osm : data.allPrimitives()) {
- osm.visit(counter);
+ osm.accept(counter);
}
final JPanel p = new JPanel(new GridBagLayout());
@@ -544,7 +504,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
new ConsistencyTestAction(),
SeparatorLayerAction.INSTANCE,
new LayerListPopup.InfoAction(this)};
- ArrayList<Action> actions = new ArrayList<Action>();
+ List<Action> actions = new ArrayList<Action>();
actions.addAll(Arrays.asList(new Action[]{
LayerListDialog.getInstance().createActivateLayerAction(this),
LayerListDialog.getInstance().createShowHideLayerAction(),
@@ -553,8 +513,13 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
LayerListDialog.getInstance().createMergeLayerAction(this),
new LayerSaveAction(this),
new LayerSaveAsAction(this),
- new LayerGpxExportAction(this),
- new ConvertToGpxLayerAction(),
+ }));
+ if (ExpertToggleAction.isExpert()) {
+ actions.addAll(Arrays.asList(new Action[]{
+ new LayerGpxExportAction(this),
+ new ConvertToGpxLayerAction()}));
+ }
+ actions.addAll(Arrays.asList(new Action[]{
SeparatorLayerAction.INSTANCE,
new RenameLayerAction(getAssociatedFile(), this)}));
if (ExpertToggleAction.isExpert() && Main.pref.getBoolean("data.layer.upload_discouragement.menu_item", false)) {
@@ -564,7 +529,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
new ConsistencyTestAction(),
SeparatorLayerAction.INSTANCE,
new LayerListPopup.InfoAction(this)}));
- return actions.toArray(new Action[0]);
+ return actions.toArray(new Action[actions.size()]);
}
public static GpxData toGpxData(DataSet data, File file) {
@@ -610,12 +575,11 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
if (n.isIncomplete() || n.isDeleted() || doneNodes.contains(n)) {
continue;
}
+ WayPoint wpt = new WayPoint(n.getCoor());
String name = n.get("name");
- if (name == null) {
- continue;
+ if (name != null) {
+ wpt.attr.put("name", name);
}
- WayPoint wpt = new WayPoint(n.getCoor());
- wpt.attr.put("name", name);
if (!n.isTimestampEmpty()) {
wpt.attr.put("time", DateUtils.fromDate(n.getTimestamp()));
wpt.setTime();
@@ -639,6 +603,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
super(tr("Convert to GPX layer"), ImageProvider.get("converttogpx"));
putValue("help", ht("/Action/ConvertToGpxLayer"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
Main.main.addLayer(new GpxLayer(toGpxData(), tr("Converted from: {0}", getName())));
Main.main.removeLayer(OsmDataLayer.this);
@@ -735,6 +700,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
super(tr("Dataset consistency test"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
String result = DatasetConsistencyTest.runTests(data);
if (result.length() == 0) {
@@ -742,7 +708,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
} else {
JPanel p = new JPanel(new GridBagLayout());
p.add(new JLabel(tr("Following problems found:")), GBC.eol());
- JTextArea info = new JTextArea(result, 20, 60);
+ JosmTextArea info = new JosmTextArea(result, 20, 60);
info.setCaretPosition(0);
info.setEditable(false);
p.add(new JScrollPane(info), GBC.eop());
@@ -757,12 +723,14 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
DataSet.removeSelectionListener(this);
}
+ @Override
public void processDatasetEvent(AbstractDatasetChangedEvent event) {
isChanged = true;
setRequiresSaveToFile(true);
setRequiresUploadToServer(true);
}
+ @Override
public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
isChanged = true;
}
@@ -822,7 +790,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
}
return true;
}
-
+
/**
* Check the data set if it would be empty on save. It is empty, if it contains
* no objects (after all objects that are created and deleted without being
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index ff8abfd..f80a6c5 100644
--- a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Scanner;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -43,10 +44,11 @@ import org.openstreetmap.gui.jmapviewer.Coordinate;
import org.openstreetmap.gui.jmapviewer.JobDispatcher;
import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
-import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader.TileClearController;
import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
@@ -56,6 +58,7 @@ import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.RenameLayerAction;
import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -76,6 +79,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
import org.openstreetmap.josm.io.CacheCustomContent;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -111,17 +115,47 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
try {
defPath = OsmFileCacheTileLoader.getDefaultCacheDir().getAbsolutePath();
} catch (SecurityException e) {
+ Main.warn(e);
}
PROP_TILECACHE_DIR = new StringProperty(PREFERENCE_PREFIX + ".tilecache_path", defPath);
}
/*boolean debug = true;*/
+ public interface TileLoaderFactory {
+ OsmTileLoader makeTileLoader(TileLoaderListener listener);
+ }
+
protected MemoryTileCache tileCache;
protected TileSource tileSource;
protected OsmTileLoader tileLoader;
- HashSet<Tile> tileRequestsOutstanding = new HashSet<Tile>();
+ public static TileLoaderFactory loaderFactory = new TileLoaderFactory() {
+ @Override
+ public OsmTileLoader makeTileLoader(TileLoaderListener listener) {
+ String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
+ if (cachePath != null && !cachePath.isEmpty()) {
+ try {
+ OsmFileCacheTileLoader loader = new OsmFileCacheTileLoader(listener, new File(cachePath));
+ loader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
+ return loader;
+ } catch (IOException e) {
+ Main.warn(e);
+ }
+ }
+ return null;
+ }
+ };
+
+ /**
+ * Plugins that wish to set custom tile loader should call this method
+ */
+ public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) {
+ TMSLayer.loaderFactory = loaderFactory;
+ }
+
+ private Set<Tile> tileRequestsOutstanding = new HashSet<Tile>();
+
@Override
public synchronized void tileLoadingFinished(Tile tile, boolean success) {
if (tile.hasError()) {
@@ -139,17 +173,17 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
Main.debug("tileLoadingFinished() tile: " + tile + " success: " + success);
}*/
}
-
+
@Override
public TileCache getTileCache() {
return tileCache;
}
-
+
private class TmsTileClearController implements TileClearController, CancelListener {
private final ProgressMonitor monitor;
private boolean cancel = false;
-
+
public TmsTileClearController(ProgressMonitor monitor) {
this.monitor = monitor;
this.monitor.addCancelListener(this);
@@ -188,19 +222,19 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
/**
* Clears the tile cache.
- *
- * If the current tileLoader is an instance of OsmTileLoader, a new
- * TmsTileClearController is created and passed to the according clearCache
+ *
+ * If the current tileLoader is an instance of OsmTileLoader, a new
+ * TmsTileClearController is created and passed to the according clearCache
* method.
- *
- * @param monitor
+ *
+ * @param monitor
* @see MemoryTileCache#clear()
- * @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader.TileClearController)
+ * @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader.TileClearController)
*/
void clearTileCache(ProgressMonitor monitor) {
tileCache.clear();
- if (tileLoader instanceof OsmFileCacheTileLoader) {
- ((OsmFileCacheTileLoader)tileLoader).clearCache(tileSource, new TmsTileClearController(monitor));
+ if (tileLoader instanceof CachedTileLoader) {
+ ((CachedTileLoader)tileLoader).clearCache(tileSource, new TmsTileClearController(monitor));
}
}
@@ -226,9 +260,9 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
/**
* Initiates a repaint of Main.map
- *
+ *
* @see Main#map
- * @see MapFrame#repaint()
+ * @see MapFrame#repaint()
*/
void redraw() {
needRedraw = true;
@@ -295,9 +329,10 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
@Override
protected byte[] updateData() throws IOException {
URL u = getAttributionUrl();
- UTFInputStreamReader in = UTFInputStreamReader.create(u.openStream(), "utf-8");
+ UTFInputStreamReader in = UTFInputStreamReader.create(Utils.openURL(u), "utf-8");
String r = new Scanner(in).useDelimiter("\\A").next();
- System.out.println("Successfully loaded Bing attribution data.");
+ Utils.close(in);
+ Main.info("Successfully loaded Bing attribution data.");
return r.getBytes("utf-8");
}
}
@@ -315,7 +350,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
String xml = attributionLoader.updateIfRequiredString();
return parseAttributionText(new InputSource(new StringReader((xml))));
} catch (IOException ex) {
- System.err.println("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
+ Main.warn("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
Thread.sleep(waitTimeSec * 1000L);
waitTimeSec *= 2;
}
@@ -328,14 +363,14 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
/**
* Creates and returns a new TileSource instance depending on the {@link ImageryType}
* of the passed ImageryInfo object.
- *
+ *
* If no appropriate TileSource is found, null is returned.
- * Currently supported ImageryType are {@link ImageryType#TMS},
+ * Currently supported ImageryType are {@link ImageryType#TMS},
* {@link ImageryType#BING}, {@link ImageryType#SCANEX}.
- *
+ *
* @param info
* @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
- * @throws IllegalArgumentException
+ * @throws IllegalArgumentException
*/
public static TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException {
if (info.getImageryType() == ImageryType.TMS) {
@@ -379,14 +414,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
tileCache = new MemoryTileCache();
- String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
- tileLoader = null;
- if (cachePath != null && !cachePath.isEmpty()) {
- try {
- tileLoader = new OsmFileCacheTileLoader(this, new File(cachePath));
- } catch (IOException e) {
- }
- }
+ tileLoader = loaderFactory.makeTileLoader(this);
if (tileLoader == null) {
tileLoader = new OsmTileLoader(this);
}
@@ -397,6 +425,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
tileLoader.headers.put(e.getKey(), e.getValue());
}
}
+ tileLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
}
@Override
@@ -409,7 +438,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
* Returns average number of screen pixels per tile pixel for current mapview
*/
private double getScaleFactor(int zoom) {
- if (Main.map == null || Main.map.mapView == null) return 1;
+ if (!Main.isDisplayingMapView()) return 1;
MapView mv = Main.map.mapView;
LatLon topLeft = mv.getLatLon(0, 0);
LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());
@@ -444,7 +473,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
* in preferences.
*/
static public void setMaxWorkers() {
- JobDispatcher.getInstance().setMaxWorkers(PROP_TMS_JOBS.get());
+ JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get());
JobDispatcher.getInstance().setLIFO(true);
}
@@ -680,7 +709,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
}*/
return zia;
}
-
+
public boolean increaseZoomLevel() {
if (zoomIncreaseAllowed()) {
currentZoomLevel++;
@@ -713,10 +742,10 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
public boolean zoomDecreaseAllowed() {
return currentZoomLevel > this.getMinZoomLvl();
}
-
+
/**
* Zoom out from map.
- *
+ *
* @return true, if zoom increasing was successfull, false othervise
*/
public boolean decreaseZoomLevel() {
@@ -748,7 +777,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
return tile;
return new Tile(tileSource, x, y, zoom);
}
-
+
synchronized Tile getOrCreateTile(int x, int y, int zoom) {
Tile tile = getTile(x, y, zoom);
if (tile == null) {
@@ -826,7 +855,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
Main.map.repaint(done ? 0 : 100);
return !done;
}
-
+
boolean imageLoaded(Image i) {
if (i == null)
return false;
@@ -835,11 +864,11 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
return true;
return false;
}
-
+
/**
- * Returns the image for the given tile if both tile and image are loaded.
+ * Returns the image for the given tile if both tile and image are loaded.
* Otherwise returns null.
- *
+ *
* @param tile the Tile for which the image should be returned
* @return the image of the tile or null.
*/
@@ -927,7 +956,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
target.width, target.height);
}
}
-
+
// This function is called for several zoom levels, not just
// the current one. It should not trigger any tiles to be
// downloaded. It should also avoid polluting the tile cache
@@ -1047,17 +1076,17 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
private Point pixelPos(LatLon ll) {
return Main.map.mapView.getPoint(Main.getProjection().latlon2eastNorth(ll).add(getDx(), getDy()));
}
-
+
private Point pixelPos(Tile t) {
double lon = tileSource.tileXToLon(t.getXtile(), t.getZoom());
LatLon tmpLL = new LatLon(tileSource.tileYToLat(t.getYtile(), t.getZoom()), lon);
return pixelPos(tmpLL);
}
-
+
private LatLon getShiftedLatLon(EastNorth en) {
return Main.getProjection().eastNorth2latlon(en.add(-getDx(), -getDy()));
}
-
+
private Coordinate getShiftedCoord(EastNorth en) {
LatLon ll = getShiftedLatLon(en);
return new Coordinate(ll.lat(),ll.lon());
@@ -1112,19 +1141,19 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
y1 = tileMax;
}
}
-
+
boolean tooSmall() {
return this.tilesSpanned() < 2.1;
}
-
+
boolean tooLarge() {
return this.tilesSpanned() > 10;
}
-
+
boolean insane() {
return this.tilesSpanned() > 100;
}
-
+
double tilesSpanned() {
return Math.sqrt(1.0 * this.size());
}
@@ -1142,11 +1171,11 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
List<Tile> allExistingTiles() {
return this.__allTiles(false);
}
-
+
List<Tile> allTilesCreate() {
return this.__allTiles(true);
}
-
+
private List<Tile> __allTiles(boolean create) {
// Tileset is either empty or too large
if (zoom == 0 || this.insane())
@@ -1167,7 +1196,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
}
return ret;
}
-
+
private List<Tile> allLoadedTiles() {
List<Tile> ret = new ArrayList<Tile>();
for (Tile t : this.allExistingTiles()) {
@@ -1336,7 +1365,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
g.setColor(Color.DARK_GRAY);
List<Tile> missedTiles = this.paintTileImages(g, ts, displayZoomLevel, null);
- int otherZooms[] = { -1, 1, -2, 2, -3, -4, -5};
+ int[] otherZooms = { -1, 1, -2, 2, -3, -4, -5};
for (int zoomOffset : otherZooms) {
if (!autoZoom) {
break;
@@ -1361,7 +1390,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
TileSet ts2 = new TileSet(topLeft2, botRight2, newzoom);
// Instantiating large TileSets is expensive. If there
// are no loaded tiles, don't bother even trying.
- if (ts2.allLoadedTiles().size() == 0) {
+ if (ts2.allLoadedTiles().isEmpty()) {
newlyMissedTiles.add(missed);
continue;
}
@@ -1462,7 +1491,7 @@ public class TMSLayer extends ImageryLayer implements ImageObserver, TileLoaderL
@Override
public String getToolTipText() {
- return null;
+ return tr("TMS layer ({0}), downloading in zoom {1}", getName(), currentZoomLevel);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
index 72d2596..d3dfc7d 100644
--- a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
@@ -63,7 +63,7 @@ public class ValidatorLayer extends Layer implements LayerChangeListener {
DefaultMutableTreeNode root = Main.map.validatorDialog.tree.getRoot();
if (root == null || root.getChildCount() == 0)
return;
-
+
PaintVisitor paintVisitor = new PaintVisitor(g, mv);
DefaultMutableTreeNode severity = (DefaultMutableTreeNode) root.getLastChild();
@@ -79,7 +79,7 @@ public class ValidatorLayer extends Layer implements LayerChangeListener {
// Severities in inverse order
severity = severity.getPreviousSibling();
}
-
+
paintVisitor.clearPaintedObjects();
}
@@ -155,8 +155,8 @@ public class ValidatorLayer extends Layer implements LayerChangeListener {
*/
@Override
public void layerRemoved(Layer oldLayer) {
- if (oldLayer instanceof OsmDataLayer && Main.map.mapView.getEditLayer() == null) {
- Main.map.mapView.removeLayer(this);
+ if (oldLayer instanceof OsmDataLayer && Main.isDisplayingMapView() && !Main.main.hasEditLayer()) {
+ Main.main.removeLayer(this);
} else if (oldLayer == this) {
MapView.removeLayerChangeListener(this);
OsmValidator.errorLayer = null;
diff --git a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
index 000e6a1..8af1347 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
@@ -96,7 +96,13 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
}
}
- private static final ObjectFactory OBJECT_FACTORY = null; // Fake reference to keep build scripts from removing ObjectFactory class. This class is not used directly but it's necessary for jaxb to work
+ // Fake reference to keep build scripts from removing ObjectFactory class. This class is not used directly but it's necessary for jaxb to work
+ private static final ObjectFactory OBJECT_FACTORY = null;
+
+ // these values correspond to the zoom levels used throughout OSM and are in meters/pixel from zoom level 0 to 18.
+ // taken from http://wiki.openstreetmap.org/wiki/Zoom_levels
+ private static final Double[] snapLevels = { 156412.0, 78206.0, 39103.0, 19551.0, 9776.0, 4888.0,
+ 2444.0, 1222.0, 610.984, 305.492, 152.746, 76.373, 38.187, 19.093, 9.547, 4.773, 2.387, 1.193, 0.596 };
public static final BooleanProperty PROP_ALPHA_CHANNEL = new BooleanProperty("imagery.wms.alpha_channel", true);
public static final IntegerProperty PROP_SIMULTANEOUS_CONNECTIONS = new IntegerProperty("imagery.wms.simultaneousConnections", 3);
@@ -104,9 +110,11 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
public static final IntegerProperty PROP_OVERLAP_EAST = new IntegerProperty("imagery.wms.overlapEast", 14);
public static final IntegerProperty PROP_OVERLAP_NORTH = new IntegerProperty("imagery.wms.overlapNorth", 4);
public static final IntegerProperty PROP_IMAGE_SIZE = new IntegerProperty("imagery.wms.imageSize", 500);
+ public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty("imagery.wms.default_autozoom", true);
public int messageNum = 5; //limit for messages per layer
- protected String resolution;
+ protected double resolution;
+ protected String resolutionText;
protected int imageSize;
protected int dax = 10;
protected int day = 10;
@@ -114,10 +122,10 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
protected int minZoom = 3;
protected GeorefImage[][] images;
- protected final int serializeFormatVersion = 5;
+ protected static final int serializeFormatVersion = 5;
protected boolean autoDownloadEnabled = true;
+ protected boolean autoResolutionEnabled = PROP_DEFAULT_AUTOZOOM.get();
protected boolean settingsChanged;
- protected ImageryInfo info;
public WmsCache cache;
private AttributionSupport attribution = new AttributionSupport();
@@ -140,8 +148,6 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
private final Condition queueEmpty = requestQueueLock.newCondition();
private final List<Grabber> grabbers = new ArrayList<Grabber>();
private final List<Thread> grabberThreads = new ArrayList<Thread>();
- private int threadCount;
- private int workingThreadCount;
private boolean canceled;
/** set to true if this layer uses an invalid base url */
@@ -158,20 +164,17 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
imageSize = PROP_IMAGE_SIZE.get();
setBackgroundLayer(true); /* set global background variable */
initializeImages();
- this.info = new ImageryInfo(info);
attribution.initialize(this.info);
- if(info.getUrl() != null) {
- startGrabberThreads();
- }
-
Main.pref.addPreferenceChangeListener(this);
}
@Override
public void hookUpMapView() {
if (info.getUrl() != null) {
+ startGrabberThreads();
+
for (WMSLayer layer: Main.map.mapView.getLayersOfType(WMSLayer.class)) {
if (layer.getInfo().getUrl().equals(info.getUrl())) {
cache = layer.cache;
@@ -183,10 +186,11 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
cache.loadIndex();
}
}
- if(this.info.getPixelPerDegree() == 0.0) {
- this.info.setPixelPerDegree(getPPD());
- }
- resolution = Main.map.mapView.getDist100PixelText();
+
+ // if automatic resolution is enabled, ensure that the first zoom level
+ // is already snapped. Otherwise it may load tiles that will never get
+ // used again when zooming.
+ updateResolutionSetting(this, autoResolutionEnabled);
final MouseAdapter adapter = new MouseAdapter() {
@Override
@@ -268,10 +272,9 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
GeorefImage[][] old = images;
images = new GeorefImage[dax][day];
if (old != null) {
- for (int i=0; i<old.length; i++) {
- for (int k=0; k<old[i].length; k++) {
- GeorefImage o = old[i][k];
- images[modulo(o.getXIndex(),dax)][modulo(o.getYIndex(),day)] = old[i][k];
+ for (GeorefImage[] row : old) {
+ for (GeorefImage image : row) {
+ images[modulo(image.getXIndex(), dax)][modulo(image.getYIndex(), day)] = image;
}
}
}
@@ -290,9 +293,9 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
@Override public String getToolTipText() {
if(autoDownloadEnabled)
- return tr("WMS layer ({0}), automatically downloading in zoom {1}", getName(), resolution);
+ return tr("WMS layer ({0}), automatically downloading in zoom {1}", getName(), resolutionText);
else
- return tr("WMS layer ({0}), downloading in zoom {1}", getName(), resolution);
+ return tr("WMS layer ({0}), downloading in zoom {1}", getName(), resolutionText);
}
private int modulo (int a, int b) {
@@ -307,6 +310,10 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
@Override public void paint(Graphics2D g, final MapView mv, Bounds b) {
if(info.getUrl() == null || (usesInvalidUrl && !isInvalidUrlConfirmed)) return;
+ if (autoResolutionEnabled && getBestZoom() != mv.getDist100Pixel()) {
+ changeResolution(this, true);
+ }
+
settingsChanged = false;
ProjectionBounds bounds = mv.getProjectionBounds();
@@ -481,10 +488,11 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
new LayerSaveAsAction(this),
new BookmarkWmsAction(),
SeparatorLayerAction.INSTANCE,
- new ZoomToNativeResolution(),
new StartStopAction(),
new ToggleAlphaAction(),
+ new ToggleAutoResolutionAction(),
new ChangeResolutionAction(),
+ new ZoomToNativeResolution(),
new ReloadErrorTilesAction(),
new DownloadAction(),
SeparatorLayerAction.INSTANCE,
@@ -559,19 +567,16 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
public WMSRequest getRequest(boolean localOnly) {
requestQueueLock.lock();
try {
- workingThreadCount--;
-
sortRequests(localOnly);
while (!canceled && (requestQueue.isEmpty() || (localOnly && !requestQueue.get(0).hasExactMatch()))) {
try {
queueEmpty.await();
sortRequests(localOnly);
} catch (InterruptedException e) {
- // Shouldn't happen
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" during WMS request");
}
}
- workingThreadCount++;
if (canceled)
return null;
else {
@@ -599,7 +604,7 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
processingRequests.remove(request);
if (request.getState() != null && !request.isPrecacheOnly()) {
finishedRequests.add(request);
- if (Main.map != null && Main.map.mapView != null) {
+ if (Main.isDisplayingMapView()) {
Main.map.mapView.repaint();
}
}
@@ -670,31 +675,81 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
}
}
- public static class ChangeResolutionAction extends AbstractAction implements LayerAction {
- public ChangeResolutionAction() {
- super(tr("Change resolution"));
+ /**
+ * Finds the most suitable resolution for the current zoom level, but prefers
+ * higher resolutions. Snaps to values defined in snapLevels.
+ * @return
+ */
+ private static double getBestZoom() {
+ // not sure why getDist100Pixel returns values corresponding to
+ // the snapLevels, which are in meters per pixel. It works, though.
+ double dist = Main.map.mapView.getDist100Pixel();
+ for(int i = snapLevels.length-2; i >= 0; i--) {
+ if(snapLevels[i+1]/3 + snapLevels[i]*2/3 > dist)
+ return snapLevels[i+1];
+ }
+ return snapLevels[0];
+ }
+
+ /**
+ * Updates the given layer’s resolution settings to the current zoom level. Does
+ * not update existing tiles, only new ones will be subject to the new settings.
+ *
+ * @param layer
+ * @param snap Set to true if the resolution should snap to certain values instead of
+ * matching the current zoom level perfectly
+ */
+ private static void updateResolutionSetting(WMSLayer layer, boolean snap) {
+ if(snap) {
+ layer.resolution = getBestZoom();
+ layer.resolutionText = MapView.getDistText(layer.resolution);
+ } else {
+ layer.resolution = Main.map.mapView.getDist100Pixel();
+ layer.resolutionText = Main.map.mapView.getDist100PixelText();
}
+ layer.info.setPixelPerDegree(layer.getPPD());
+ }
+
+ /**
+ * Updates the given layer’s resolution settings to the current zoom level and
+ * updates existing tiles. If round is true, tiles will be updated gradually, if
+ * false they will be removed instantly (and redrawn only after the new resolution
+ * image has been loaded).
+ * @param layer
+ * @param snap Set to true if the resolution should snap to certain values instead of
+ * matching the current zoom level perfectly
+ */
+ private static void changeResolution(WMSLayer layer, boolean snap) {
+ updateResolutionSetting(layer, snap);
- private void changeResolution(WMSLayer layer) {
- layer.resolution = Main.map.mapView.getDist100PixelText();
- layer.info.setPixelPerDegree(layer.getPPD());
- layer.settingsChanged = true;
+ layer.settingsChanged = true;
+
+ // Don’t move tiles off screen when the resolution is rounded. This
+ // prevents some flickering when zooming with auto-resolution enabled
+ // and instead gradually updates each tile.
+ if(!snap) {
for(int x = 0; x<layer.dax; ++x) {
for(int y = 0; y<layer.day; ++y) {
layer.images[x][y].changePosition(-1, -1);
}
}
}
+ }
+
+ public static class ChangeResolutionAction extends AbstractAction implements LayerAction {
+
+ /**
+ * Constructs a new {@code ChangeResolutionAction}
+ */
+ public ChangeResolutionAction() {
+ super(tr("Change resolution"));
+ }
@Override
public void actionPerformed(ActionEvent ev) {
-
- if (LayerListDialog.getInstance() == null)
- return;
-
List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
for (Layer l: layers) {
- changeResolution((WMSLayer) l);
+ changeResolution((WMSLayer) l, false);
}
Main.map.mapView.repaint();
}
@@ -726,7 +781,7 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
@Override
public void actionPerformed(ActionEvent ev) {
// Delete small files, because they're probably blank tiles.
- // See https://josm.openstreetmap.de/ticket/2307
+ // See #2307
cache.cleanSmallFiles(4096);
for (int x = 0; x < dax; ++x) {
@@ -771,6 +826,31 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
}
}
+
+ public class ToggleAutoResolutionAction extends AbstractAction implements LayerAction {
+ public ToggleAutoResolutionAction() {
+ super(tr("Automatically change resolution"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ev) {
+ JCheckBoxMenuItem checkbox = (JCheckBoxMenuItem) ev.getSource();
+ autoResolutionEnabled = checkbox.isSelected();
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+ item.setSelected(autoResolutionEnabled);
+ return item;
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ return layers.size() == 1 && layers.get(0) instanceof WMSLayer;
+ }
+ }
+
/**
* This action will add a WMS layer menu entry with the current WMS layer
* URL and name extended by the current resolution.
@@ -850,8 +930,7 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
try {
t.join();
} catch (InterruptedException e) {
- // Shouldn't happen
- e.printStackTrace();
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" while cancelling grabber threads");
}
}
}
@@ -872,8 +951,6 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
t.start();
grabberThreads.add(t);
}
- this.workingThreadCount = grabbers.size();
- this.threadCount = grabbers.size();
} finally {
requestQueueLock.unlock();
}
@@ -891,7 +968,7 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
@Override
public void preferenceChanged(PreferenceChangeEvent event) {
- if (event.getKey().equals(PROP_SIMULTANEOUS_CONNECTIONS.getKey())) {
+ if (event.getKey().equals(PROP_SIMULTANEOUS_CONNECTIONS.getKey()) && info.getUrl() != null) {
cancelGrabberThreads(true);
startGrabberThreads();
} else if (
@@ -945,12 +1022,12 @@ public class WMSLayer extends ImageryLayer implements ImageObserver, PreferenceC
@Override
public String nameSupportedProjections() {
- String res = "";
- for(String p : info.getServerProjections()) {
- if(!res.isEmpty()) {
- res += ", ";
+ StringBuilder res = new StringBuilder();
+ for (String p : info.getServerProjections()) {
+ if (res.length() > 0) {
+ res.append(", ");
}
- res += p;
+ res.append(p);
}
return tr("Supported projections are: {0}", res);
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
index 4b98194..149d219 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
@@ -1,7 +1,4 @@
// License: GPL. See LICENSE file for details.
-// Copyright 2007 by Christian Gallioz (aka khris78)
-// Parts of code from Geotagged plugin (by Rob Neild)
-
package org.openstreetmap.josm.gui.layer.geoimage;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -32,11 +29,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
+import java.util.Dictionary;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.TimeZone;
-import java.util.Vector;
import java.util.zip.GZIPInputStream;
import javax.swing.AbstractAction;
@@ -52,7 +48,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JSlider;
-import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
@@ -74,6 +69,7 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.io.GpxReader;
import org.openstreetmap.josm.tools.ExifReader;
import org.openstreetmap.josm.tools.GBC;
@@ -81,7 +77,8 @@ import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.PrimaryDateParser;
import org.xml.sax.SAXException;
-/** This class displays the window to select the GPX file and the offset (timezone + delta).
+/**
+ * This class displays the window to select the GPX file and the offset (timezone + delta).
* Then it correlates the images of the layer with that GPX file.
*/
public class CorrelateGpxWithImages extends AbstractAction {
@@ -115,11 +112,11 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
ExtendedDialog syncDialog;
- Vector<GpxDataWrapper> gpxLst = new Vector<GpxDataWrapper>();
+ List<GpxDataWrapper> gpxLst = new ArrayList<GpxDataWrapper>();
JPanel outerPanel;
JosmComboBox cbGpx;
- JTextField tfTimezone;
- JTextField tfOffset;
+ JosmTextField tfTimezone;
+ JosmTextField tfOffset;
JCheckBox cbExifImg;
JCheckBox cbTaggedImg;
JCheckBox cbShowThumbs;
@@ -133,6 +130,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
*/
private class LoadGpxDataActionListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent arg0) {
FileFilter filter = new FileFilter(){
@Override public boolean accept(File f) {
@@ -223,11 +221,12 @@ public class CorrelateGpxWithImages extends AbstractAction {
private class SetOffsetActionListener implements ActionListener {
JPanel panel;
JLabel lbExifTime;
- JTextField tfGpsTime;
+ JosmTextField tfGpsTime;
JosmComboBox cbTimezones;
ImageDisplay imgDisp;
JList imgList;
+ @Override
public void actionPerformed(ActionEvent arg0) {
SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
@@ -268,7 +267,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
gc.anchor = GridBagConstraints.WEST;
panelTf.add(new JLabel(tr("Gps time (read from the above photo): ")), gc);
- tfGpsTime = new JTextField(12);
+ tfGpsTime = new JosmTextField(12);
tfGpsTime.setEnabled(false);
tfGpsTime.setMinimumSize(new Dimension(155, tfGpsTime.getMinimumSize().height));
gc.gridx = 1;
@@ -288,8 +287,8 @@ public class CorrelateGpxWithImages extends AbstractAction {
gc.anchor = GridBagConstraints.WEST;
panelTf.add(new JLabel(tr("I am in the timezone of: ")), gc);
- Vector<String> vtTimezones = new Vector<String>();
String[] tmp = TimeZone.getAvailableIDs();
+ List<String> vtTimezones = new ArrayList<String>(tmp.length);
for (String tzStr : tmp) {
TimeZone tz = TimeZone.getTimeZone(tzStr);
@@ -302,7 +301,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
Collections.sort(vtTimezones);
- cbTimezones = new JosmComboBox(vtTimezones);
+ cbTimezones = new JosmComboBox(vtTimezones.toArray());
String tzId = Main.pref.get("geoimage.timezoneid", "");
TimeZone defaultTz;
@@ -328,10 +327,12 @@ public class CorrelateGpxWithImages extends AbstractAction {
panelLst.setLayout(new BorderLayout());
imgList = new JList(new AbstractListModel() {
+ @Override
public Object getElementAt(int i) {
return yLayer.data.get(i).getFile().getName();
}
+ @Override
public int getSize() {
return yLayer.data.size();
}
@@ -339,12 +340,14 @@ public class CorrelateGpxWithImages extends AbstractAction {
imgList.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
imgList.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ @Override
public void valueChanged(ListSelectionEvent arg0) {
int index = imgList.getSelectedIndex();
Integer orientation = null;
try {
orientation = ExifReader.readOrientation(yLayer.data.get(index).getFile());
} catch (Exception e) {
+ Main.warn(e);
}
imgDisp.setImage(yLayer.data.get(index).getFile(), orientation);
Date date = yLayer.data.get(index).getExifTime();
@@ -367,6 +370,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
JButton openButton = new JButton(tr("Open another photo"));
openButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent arg0) {
JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, JpegFileFilter.getInstance(), JFileChooser.FILES_ONLY, "geoimage.lastdirectory");
if (fc == null)
@@ -377,6 +381,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
try {
orientation = ExifReader.readOrientation(sel);
} catch (Exception e) {
+ Main.warn(e);
}
imgDisp.setImage(sel, orientation);
@@ -384,6 +389,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
try {
date = ExifReader.readTime(sel);
} catch (Exception e) {
+ Main.warn(e);
}
if (date != null) {
lbExifTime.setText(new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(date));
@@ -440,13 +446,12 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
// Construct the list of loaded GPX tracks
Collection<Layer> layerLst = Main.map.mapView.getAllLayers();
GpxDataWrapper defaultItem = null;
- Iterator<Layer> iterLayer = layerLst.iterator();
- while (iterLayer.hasNext()) {
- Layer cur = iterLayer.next();
+ for (Layer cur : layerLst) {
if (cur instanceof GpxLayer) {
GpxLayer curGpx = (GpxLayer) cur;
GpxDataWrapper gdw = new GpxDataWrapper(curGpx.getName(), curGpx.data, curGpx.data.storageFile);
@@ -462,7 +467,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
data.storageFile));
}
- if (gpxLst.size() == 0) {
+ if (gpxLst.isEmpty()) {
gpxLst.add(new GpxDataWrapper(tr("<No GPX track loaded yet>"), null, null));
}
@@ -470,7 +475,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
panelCb.add(new JLabel(tr("GPX track: ")));
- cbGpx = new JosmComboBox(gpxLst);
+ cbGpx = new JosmComboBox(gpxLst.toArray());
if (defaultItem != null) {
cbGpx.setSelectedItem(defaultItem);
}
@@ -494,7 +499,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
timezone = 0;
}
- tfTimezone = new JTextField(10);
+ tfTimezone = new JosmTextField(10);
tfTimezone.setText(formatTimezone(timezone));
try {
@@ -504,7 +509,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
delta = delta / 1000; // milliseconds -> seconds
- tfOffset = new JTextField(10);
+ tfOffset = new JosmTextField(10);
tfOffset.setText(Long.toString(delta));
JButton buttonViewGpsPhoto = new JButton(tr("<html>Use photo of an accurate clock,<br>"
@@ -536,14 +541,6 @@ public class CorrelateGpxWithImages extends AbstractAction {
boolean ticked = yLayer.thumbsLoaded || Main.pref.getBoolean("geoimage.showThumbs", false);
cbShowThumbs = new JCheckBox(tr("Show Thumbnail images on the map"), ticked);
cbShowThumbs.setEnabled(!yLayer.thumbsLoaded);
- /*cbShowThumbs.addItemListener(new ItemListener() {
- public void itemStateChanged(ItemEvent e) {
- if (e.getStateChange() == ItemEvent.SELECTED) {
- yLayer.loadThumbs();
- } else {
- }
- }
- });*/
int y=0;
GBC gbc = GBC.eol();
@@ -770,17 +767,22 @@ public class CorrelateGpxWithImages extends AbstractAction {
this.doRepaint = doRepaint;
}
+ @Override
public void insertUpdate(DocumentEvent ev) {
updateStatusBar();
}
+ @Override
public void removeUpdate(DocumentEvent ev) {
updateStatusBar();
}
+ @Override
public void changedUpdate(DocumentEvent ev) {
}
+ @Override
public void itemStateChanged(ItemEvent e) {
updateStatusBar();
}
+ @Override
public void actionPerformed(ActionEvent e) {
updateStatusBar();
}
@@ -807,7 +809,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
// Construct a list of images that have a date, and sort them on the date.
- ArrayList<ImageEntry> dateImgLst = getSortedImgList();
+ List<ImageEntry> dateImgLst = getSortedImgList();
// Create a temporary copy for each image
for (ImageEntry ie : dateImgLst) {
ie.cleanTmp();
@@ -828,9 +830,11 @@ public class CorrelateGpxWithImages extends AbstractAction {
RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
private class RepaintTheMapListener implements FocusListener {
+ @Override
public void focusGained(FocusEvent e) { // do nothing
}
+ @Override
public void focusLost(FocusEvent e) {
yLayer.updateBufferAndRepaint();
}
@@ -841,6 +845,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
*/
private class AdjustActionListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent arg0) {
long diff = delta + Math.round(timezone*60*60);
@@ -849,7 +854,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
// Find day difference
final int dayOffset = (int)Math.round(diffInH / 24); // days
- double tmz = diff - dayOffset*24*60*60l; // seconds
+ double tmz = diff - dayOffset*24*60*60L; // seconds
// In hours, rounded to two decimal places
tmz = (double)Math.round(tmz*100/(60*60)) / 100;
@@ -868,7 +873,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
final JLabel lblTimezone = new JLabel();
final JSlider sldTimezone = new JSlider(-24, 24, 0);
sldTimezone.setPaintLabels(true);
- Hashtable<Integer,JLabel> labelTable = new Hashtable<Integer, JLabel>();
+ Dictionary<Integer,JLabel> labelTable = new Hashtable<Integer, JLabel>();
labelTable.put(-24, new JLabel("-12:00"));
labelTable.put(-12, new JLabel( "-6:00"));
labelTable.put( 0, new JLabel( "0:00"));
@@ -890,7 +895,8 @@ public class CorrelateGpxWithImages extends AbstractAction {
// This is called whenever one of the sliders is moved.
// It updates the labels and also calls the "match photos" code
- class sliderListener implements ChangeListener {
+ class SliderListener implements ChangeListener {
+ @Override
public void stateChanged(ChangeEvent e) {
// parse slider position into real timezone
double tz = Math.abs(sldTimezone.getValue());
@@ -955,12 +961,12 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
// Call the sliderListener once manually so labels get adjusted
- new sliderListener().stateChanged(null);
+ new SliderListener().stateChanged(null);
// Listeners added here, otherwise it tries to match three times
// (when setting the default values)
- sldTimezone.addChangeListener(new sliderListener());
- sldMinutes.addChangeListener(new sliderListener());
- sldSeconds.addChangeListener(new sliderListener());
+ sldTimezone.addChangeListener(new SliderListener());
+ sldMinutes.addChangeListener(new SliderListener());
+ sldSeconds.addChangeListener(new SliderListener());
// There is no way to cancel this dialog, all changes get applied
// immediately. Therefore "Close" is marked with an "OK" icon.
@@ -974,13 +980,14 @@ public class CorrelateGpxWithImages extends AbstractAction {
private class AutoGuessActionListener implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent arg0) {
GpxDataWrapper gpxW = selectedGPX(true);
if (gpxW == null)
return;
GpxData gpx = gpxW.data;
- ArrayList<ImageEntry> imgs = getSortedImgList();
+ List<ImageEntry> imgs = getSortedImgList();
PrimaryDateParser dateParser = new PrimaryDateParser();
// no images found, exit
@@ -1027,7 +1034,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
// Find day difference
int dayOffset = (int)Math.round(diffInH / 24); // days
- double tz = diff - dayOffset*24*60*60l; // seconds
+ double tz = diff - dayOffset*24*60*60L; // seconds
// In hours, rounded to two decimal places
tz = (double)Math.round(tz*100/(60*60)) / 100;
@@ -1037,15 +1044,6 @@ public class CorrelateGpxWithImages extends AbstractAction {
timezone = (double)Math.round(tz * 2)/2; // hours, rounded to one decimal place
delta = Math.round(diff - timezone*60*60); // seconds
- /*System.out.println("phto " + firstExifDate);
- System.out.println("gpx " + firstGPXDate);
- System.out.println("diff " + diff);
- System.out.println("difh " + diffInH);
- System.out.println("days " + dayOffset);
- System.out.println("time " + tz);
- System.out.println("fix " + timezone);
- System.out.println("offt " + delta);*/
-
tfTimezone.getDocument().removeDocumentListener(statusBarUpdater);
tfOffset.getDocument().removeDocumentListener(statusBarUpdater);
@@ -1061,24 +1059,21 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
}
- private ArrayList<ImageEntry> getSortedImgList() {
+ private List<ImageEntry> getSortedImgList() {
return getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected());
}
/**
* Returns a list of images that fulfill the given criteria.
* Default setting is to return untagged images, but may be overwritten.
- * @param boolean all -- returns all available images
- * @param boolean noexif -- returns untagged images without EXIF-GPS coords
- * this parameter is irrelevant if <code>all</code> is true
- * @param boolean exif -- also returns images with exif-gps info
- * @param boolean tagged -- also returns tagged images
- * @return ArrayList<ImageEntry> matching images
+ * @param exif also returns images with exif-gps info
+ * @param tagged also returns tagged images
+ * @return matching images
*/
- private ArrayList<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {
- ArrayList<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size());
+ private List<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {
+ List<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size());
for (ImageEntry e : yLayer.data) {
- if (e.getExifTime() == null) {
+ if (!e.hasExifTime()) {
continue;
}
@@ -1098,6 +1093,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
Collections.sort(dateImgLst, new Comparator<ImageEntry>() {
+ @Override
public int compare(ImageEntry arg0, ImageEntry arg1) {
return arg0.getExifTime().compareTo(arg1.getExifTime());
}
@@ -1123,7 +1119,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
* Match a list of photos to a gpx track with a given offset.
* All images need a exifTime attribute and the List must be sorted according to these times.
*/
- private int matchGpxTrack(ArrayList<ImageEntry> images, GpxData selectedGpx, long offset) {
+ private int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) {
int ret = 0;
PrimaryDateParser dateParser = new PrimaryDateParser();
@@ -1147,7 +1143,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
prevWpTime = curWpTime;
} catch(ParseException e) {
- System.err.println("Error while parsing date \"" + curWpTimeStr + '"');
+ Main.error("Error while parsing date \"" + curWpTimeStr + '"');
e.printStackTrace();
prevWp = null;
prevWpTime = 0;
@@ -1162,7 +1158,19 @@ public class CorrelateGpxWithImages extends AbstractAction {
return ret;
}
- private int matchPoints(ArrayList<ImageEntry> images, WayPoint prevWp, long prevWpTime,
+ private static Double getElevation(WayPoint wp) {
+ String value = (String) wp.attr.get("ele");
+ if (value != null) {
+ try {
+ return new Double(value);
+ } catch (NumberFormatException e) {
+ Main.warn(e);
+ }
+ }
+ return null;
+ }
+
+ private int matchPoints(List<ImageEntry> images, WayPoint prevWp, long prevWpTime,
WayPoint curWp, long curWpTime, long offset) {
// Time between the track point and the previous one, 5 sec if first point, i.e. photos take
// 5 sec before the first track point can be assumed to be take at the starting position
@@ -1178,7 +1186,6 @@ public class CorrelateGpxWithImages extends AbstractAction {
Double speed = null;
Double prevElevation = null;
- Double curElevation = null;
if (prevWp != null) {
double distance = prevWp.getCoor().greatCircleDistance(curWp.getCoor());
@@ -1186,32 +1193,29 @@ public class CorrelateGpxWithImages extends AbstractAction {
if (curWpTime > prevWpTime) {
speed = 3600 * distance / (curWpTime - prevWpTime);
}
- try {
- prevElevation = new Double((String) prevWp.attr.get("ele"));
- } catch(Exception e) {}
+ prevElevation = getElevation(prevWp);
}
- try {
- curElevation = new Double((String) curWp.attr.get("ele"));
- } catch (Exception e) {}
+ Double curElevation = getElevation(curWp);
// First trackpoint, then interval is set to five seconds, i.e. photos up to five seconds
// before the first point will be geotagged with the starting point
- if(prevWpTime == 0 || curWpTime <= prevWpTime) {
+ if (prevWpTime == 0 || curWpTime <= prevWpTime) {
while (true) {
if (i < 0) {
break;
}
final ImageEntry curImg = images.get(i);
- if (curImg.getExifTime().getTime() > curWpTime
- || curImg.getExifTime().getTime() < curWpTime - interval) {
+ long time = curImg.getExifTime().getTime();
+ if (time > curWpTime || time < curWpTime - interval) {
break;
}
- if(curImg.tmp.getPos() == null) {
+ if (curImg.tmp.getPos() == null) {
curImg.tmp.setPos(curWp.getCoor());
curImg.tmp.setSpeed(speed);
curImg.tmp.setElevation(curElevation);
curImg.tmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));
+ curImg.flagNewGpsData();
ret++;
}
i--;
@@ -1231,9 +1235,8 @@ public class CorrelateGpxWithImages extends AbstractAction {
break;
}
- if(curImg.tmp.getPos() == null) {
- // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless
- // variable
+ if (curImg.tmp.getPos() == null) {
+ // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless variable
double timeDiff = (double)(imgTime - prevWpTime) / interval;
curImg.tmp.setPos(prevWp.getCoor().interpolate(curWp.getCoor(), timeDiff));
curImg.tmp.setSpeed(speed);
@@ -1241,6 +1244,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
curImg.tmp.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff);
}
curImg.tmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));
+ curImg.flagNewGpsData();
ret++;
}
@@ -1249,7 +1253,7 @@ public class CorrelateGpxWithImages extends AbstractAction {
return ret;
}
- private int getLastIndexOfListBefore(ArrayList<ImageEntry> images, long searchedTime) {
+ private int getLastIndexOfListBefore(List<ImageEntry> images, long searchedTime) {
int lstSize= images.size();
// No photos or the first photo taken is later than the search period
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index 017aab5..2ef6059 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -1,7 +1,4 @@
// License: GPL. See LICENSE file for details.
-// Copyright 2007 by Christian Gallioz (aka khris78)
-// Parts of code from Geotagged plugin (by Rob Neild)
-// and the core JOSM source code (by Immanuel Scholz and others)
package org.openstreetmap.josm.gui.layer.geoimage;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -25,12 +22,16 @@ import java.io.IOException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
+import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
+import java.util.TimeZone;
import javax.swing.Action;
import javax.swing.Icon;
@@ -64,13 +65,15 @@ import org.openstreetmap.josm.tools.ImageProvider;
import com.drew.imaging.jpeg.JpegMetadataReader;
import com.drew.lang.CompoundException;
-import com.drew.lang.Rational;
import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
-import com.drew.metadata.exif.ExifDirectory;
+import com.drew.metadata.exif.ExifIFD0Directory;
import com.drew.metadata.exif.GpsDirectory;
+/**
+ * Layer displaying geottaged pictures.
+ */
public class GeoImageLayer extends Layer implements PropertyChangeListener, JumpToMarkerLayer {
List<ImageEntry> data;
@@ -97,8 +100,8 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
private boolean canceled = false;
private GeoImageLayer layer;
private Collection<File> selection;
- private HashSet<String> loadedDirectories = new HashSet<String>();
- private LinkedHashSet<String> errorMessages;
+ private Set<String> loadedDirectories = new HashSet<String>();
+ private Set<String> errorMessages;
private GpxLayer gpxLayer;
protected void rememberError(String message) {
@@ -118,8 +121,8 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
Collection<File> files = new ArrayList<File>();
try {
addRecursiveFiles(files, selection);
- } catch(NullPointerException npe) {
- rememberError(tr("One of the selected files was null"));
+ } catch (IllegalStateException e) {
+ rememberError(e.getMessage());
}
if (canceled)
@@ -149,7 +152,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
try {
e.setExifTime(ExifReader.readTime(f));
- } catch (ParseException e1) {
+ } catch (ParseException ex) {
e.setExifTime(null);
}
e.setFile(f);
@@ -188,11 +191,11 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
loadedDirectories.add(canonical);
}
- Collection<File> children = Arrays.asList(f.listFiles(JpegFileFilter.getInstance()));
+ File[] children = f.listFiles(JpegFileFilter.getInstance());
if (children != null) {
progressMonitor.subTask(tr("Scanning directory {0}", f.getPath()));
try {
- addRecursiveFiles(files, children);
+ addRecursiveFiles(files, Arrays.asList(children));
} catch(NullPointerException npe) {
npe.printStackTrace();
rememberError(tr("Found null file in directory {0}\n", f.getPath()));
@@ -206,8 +209,9 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
}
- if (nullFile)
- throw new NullPointerException();
+ if (nullFile) {
+ throw new IllegalStateException(tr("One of the selected files was null"));
+ }
}
protected String formatErrorMessages() {
@@ -238,7 +242,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
if (layer != null) {
Main.main.addLayer(layer);
- if (! canceled && layer.data.size() > 0) {
+ if (!canceled && !layer.data.isEmpty()) {
boolean noGeotagFound = true;
for (ImageEntry e : layer.data) {
if (e.getPos() != null) {
@@ -262,13 +266,51 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
Main.worker.execute(loader);
}
+ /**
+ * Constructs a new {@code GeoImageLayer}.
+ * @param data The list of images to display
+ * @param gpxLayer The associated GPX layer
+ */
public GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer) {
+ this(data, gpxLayer, null, false);
+ }
+
+ /**
+ * Constructs a new {@code GeoImageLayer}.
+ * @param data The list of images to display
+ * @param gpxLayer The associated GPX layer
+ * @param name Layer name
+ * @since 6392
+ */
+ public GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer, final String name) {
+ this(data, gpxLayer, name, false);
+ }
- super(tr("Geotagged Images"));
+ /**
+ * Constructs a new {@code GeoImageLayer}.
+ * @param data The list of images to display
+ * @param gpxLayer The associated GPX layer
+ * @param useThumbs Thumbnail display flag
+ * @since 6392
+ */
+ public GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer, boolean useThumbs) {
+ this(data, gpxLayer, null, useThumbs);
+ }
+ /**
+ * Constructs a new {@code GeoImageLayer}.
+ * @param data The list of images to display
+ * @param gpxLayer The associated GPX layer
+ * @param name Layer name
+ * @param useThumbs Thumbnail display flag
+ * @since 6392
+ */
+ public GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer, final String name, boolean useThumbs) {
+ super(name != null ? name : tr("Geotagged Images"));
Collections.sort(data);
this.data = data;
this.gpxLayer = gpxLayer;
+ this.useThumbs = useThumbs;
}
@Override
@@ -300,7 +342,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
entries.add(SeparatorLayerAction.INSTANCE);
entries.add(new LayerListPopup.InfoAction(this));
- return entries.toArray(new Action[0]);
+ return entries.toArray(new Action[entries.size()]);
}
@@ -393,10 +435,14 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
@Override
public void paint(Graphics2D g, MapView mv, Bounds bounds) {
- int width = Main.map.mapView.getWidth();
- int height = Main.map.mapView.getHeight();
+ int width = mv.getWidth();
+ int height = mv.getHeight();
Rectangle clip = g.getClipBounds();
if (useThumbs) {
+ if (!thumbsLoaded) {
+ loadThumbs();
+ }
+
if (null == offscreenBuffer || offscreenBuffer.getWidth() != width // reuse the old buffer if possible
|| offscreenBuffer.getHeight() != height) {
offscreenBuffer = new BufferedImage(width, height,
@@ -452,7 +498,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
if (e.getPos() != null) {
Point p = mv.getPoint(e.getPos());
- if (e.thumbnail != null) {
+ if (useThumbs && e.thumbnail != null) {
Dimension d = scaledDimension(e.thumbnail);
g.setColor(new Color(128, 0, 0, 122));
g.fillRect(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
@@ -498,39 +544,47 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
}
- /*
- * Extract gps from image exif
+ /**
+ * Extract GPS metadata from image EXIF
*
- * If successful, fills in the LatLon and EastNorth attributes of passed in
- * image;
+ * If successful, fills in the LatLon and EastNorth attributes of passed in image
*/
-
private static void extractExif(ImageEntry e) {
- double deg;
- double min, sec;
- double lon, lat;
- Metadata metadata = null;
- Directory dirExif = null, dirGps = null;
+ Metadata metadata;
+ Directory dirExif;
+ GpsDirectory dirGps;
try {
metadata = JpegMetadataReader.readMetadata(e.getFile());
- dirExif = metadata.getDirectory(ExifDirectory.class);
+ dirExif = metadata.getDirectory(ExifIFD0Directory.class);
dirGps = metadata.getDirectory(GpsDirectory.class);
} catch (CompoundException p) {
e.setExifCoor(null);
e.setPos(null);
return;
+ } catch (IOException p) {
+ e.setExifCoor(null);
+ e.setPos(null);
+ return;
}
try {
- int orientation = dirExif.getInt(ExifDirectory.TAG_ORIENTATION);
- e.setExifOrientation(orientation);
+ if (dirExif != null) {
+ int orientation = dirExif.getInt(ExifIFD0Directory.TAG_ORIENTATION);
+ e.setExifOrientation(orientation);
+ }
} catch (MetadataException ex) {
}
+ if (dirGps == null) {
+ e.setExifCoor(null);
+ e.setPos(null);
+ return;
+ }
+
try {
- double ele=dirGps.getDouble(GpsDirectory.TAG_GPS_ALTITUDE);
+ double ele = dirGps.getDouble(GpsDirectory.TAG_GPS_ALTITUDE);
int d = dirGps.getInt(GpsDirectory.TAG_GPS_ALTITUDE_REF);
if (d == 1) {
ele *= -1;
@@ -540,82 +594,60 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
try {
- // longitude
-
- Rational[] components = dirGps.getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
-
- deg = components[0].doubleValue();
- min = components[1].doubleValue();
- sec = components[2].doubleValue();
-
- if (Double.isNaN(deg) && Double.isNaN(min) && Double.isNaN(sec))
- throw new IllegalArgumentException();
-
- lon = (Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600)));
-
- if (dirGps.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF).charAt(0) == 'W') {
- lon = -lon;
- }
-
- // latitude
-
- components = dirGps.getRationalArray(GpsDirectory.TAG_GPS_LATITUDE);
-
- deg = components[0].doubleValue();
- min = components[1].doubleValue();
- sec = components[2].doubleValue();
-
- if (Double.isNaN(deg) && Double.isNaN(min) && Double.isNaN(sec))
- throw new IllegalArgumentException();
-
- lat = (Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600)));
-
- if (Double.isNaN(lat))
- throw new IllegalArgumentException();
-
- if (dirGps.getString(GpsDirectory.TAG_GPS_LATITUDE_REF).charAt(0) == 'S') {
- lat = -lat;
- }
-
- // Store values
-
- e.setExifCoor(new LatLon(lat, lon));
+ LatLon latlon = ExifReader.readLatLon(dirGps);
+ e.setExifCoor(latlon);
e.setPos(e.getExifCoor());
- } catch (CompoundException p) {
- // Try to read lon/lat as double value (Nonstandard, created by some cameras -> #5220)
- try {
- Double longitude = dirGps.getDouble(GpsDirectory.TAG_GPS_LONGITUDE);
- Double latitude = dirGps.getDouble(GpsDirectory.TAG_GPS_LATITUDE);
- if (longitude == null || latitude == null)
- throw new CompoundException("");
-
- // Store values
-
- e.setExifCoor(new LatLon(latitude, longitude));
- e.setPos(e.getExifCoor());
- } catch (CompoundException ex) {
- e.setExifCoor(null);
- e.setPos(null);
- }
} catch (Exception ex) { // (other exceptions, e.g. #5271)
- System.err.println("Error reading EXIF from file: "+ex);
+ Main.error("Error reading EXIF from file: "+ex);
e.setExifCoor(null);
e.setPos(null);
}
- // compass direction value
-
- Rational direction = null;
-
try {
- direction = dirGps.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
+ Double direction = ExifReader.readDirection(dirGps);
if (direction != null) {
e.setExifImgDir(direction.doubleValue());
}
} catch (Exception ex) { // (CompoundException and other exceptions, e.g. #5271)
// Do nothing
}
+
+ // Time and date. We can have these cases:
+ // 1) GPS_TIME_STAMP not set -> date/time will be null
+ // 2) GPS_DATE_STAMP not set -> use EXIF date or set to default
+ // 3) GPS_TIME_STAMP and GPS_DATE_STAMP are set
+ int[] timeStampComps = dirGps.getIntArray(GpsDirectory.TAG_GPS_TIME_STAMP);
+ if (timeStampComps != null) {
+ int gpsHour = timeStampComps[0];
+ int gpsMin = timeStampComps[1];
+ int gpsSec = timeStampComps[2];
+ Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+
+ // We have the time. Next step is to check if the GPS date stamp is set.
+ // dirGps.getString() always succeeds, but the return value might be null.
+ String dateStampStr = dirGps.getString(GpsDirectory.TAG_GPS_DATE_STAMP);
+ if (dateStampStr != null && dateStampStr.matches("^\\d+:\\d+:\\d+$")) {
+ String[] dateStampComps = dateStampStr.split(":");
+ cal.set(Calendar.YEAR, Integer.parseInt(dateStampComps[0]));
+ cal.set(Calendar.MONTH, Integer.parseInt(dateStampComps[1]) - 1);
+ cal.set(Calendar.DAY_OF_MONTH, Integer.parseInt(dateStampComps[2]));
+ }
+ else {
+ // No GPS date stamp in EXIF data. Copy it from EXIF time.
+ // Date is not set if EXIF time is not available.
+ if (e.hasExifTime()) {
+ // Time not set yet, so we can copy everything, not just date.
+ cal.setTime(e.getExifTime());
+ }
+ }
+
+ cal.set(Calendar.HOUR_OF_DAY, gpsHour);
+ cal.set(Calendar.MINUTE, gpsMin);
+ cal.set(Calendar.SECOND, gpsSec);
+
+ e.setExifGpsTime(cal.getTime());
+ }
}
public void showNextPhoto() {
@@ -632,7 +664,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
public void showPreviousPhoto() {
- if (data != null && data.size() > 0) {
+ if (data != null && !data.isEmpty()) {
currentPhoto--;
if (currentPhoto < 0) {
currentPhoto = 0;
@@ -644,6 +676,26 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
Main.map.repaint();
}
+ public void showFirstPhoto() {
+ if (data != null && data.size() > 0) {
+ currentPhoto = 0;
+ ImageViewerDialog.showImage(this, data.get(currentPhoto));
+ } else {
+ currentPhoto = -1;
+ }
+ Main.map.repaint();
+ }
+
+ public void showLastPhoto() {
+ if (data != null && data.size() > 0) {
+ currentPhoto = data.size() - 1;
+ ImageViewerDialog.showImage(this, data.get(currentPhoto));
+ } else {
+ currentPhoto = -1;
+ }
+ Main.map.repaint();
+ }
+
public void checkPreviousNextButtons() {
ImageViewerDialog.setNextEnabled(currentPhoto < data.size() - 1);
ImageViewerDialog.setPreviousEnabled(currentPhoto > 0);
@@ -696,7 +748,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
if (toDelete.getFile().delete()) {
- System.out.println("File "+toDelete.getFile().toString()+" deleted. ");
+ Main.info("File "+toDelete.getFile().toString()+" deleted. ");
} else {
JOptionPane.showMessageDialog(
Main.parent,
@@ -712,6 +764,107 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
}
+ /**
+ * Removes a photo from the list of images by index.
+ * @param idx Image index
+ * @since 6392
+ */
+ public void removePhotoByIdx(int idx) {
+ if (idx >= 0 && data != null && idx < data.size()) {
+ data.remove(idx);
+ }
+ }
+
+ /**
+ * Returns the image that matches the position of the mouse event.
+ * @param evt Mouse event
+ * @return Image at mouse position, or {@code null} if there is no image at the mouse position
+ * @since 6392
+ */
+ public ImageEntry getPhotoUnderMouse(MouseEvent evt) {
+ if (data != null) {
+ for (int idx = data.size() - 1; idx >= 0; --idx) {
+ ImageEntry img = data.get(idx);
+ if (img.getPos() == null) {
+ continue;
+ }
+ Point p = Main.map.mapView.getPoint(img.getPos());
+ Rectangle r;
+ if (useThumbs && img.thumbnail != null) {
+ Dimension d = scaledDimension(img.thumbnail);
+ r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+ } else {
+ r = new Rectangle(p.x - icon.getIconWidth() / 2,
+ p.y - icon.getIconHeight() / 2,
+ icon.getIconWidth(),
+ icon.getIconHeight());
+ }
+ if (r.contains(evt.getPoint())) {
+ return img;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Clears the currentPhoto, i.e. remove select marker, and optionally repaint.
+ * @param repaint Repaint flag
+ * @since 6392
+ */
+ public void clearCurrentPhoto(boolean repaint) {
+ currentPhoto = -1;
+ if (repaint) {
+ updateBufferAndRepaint();
+ }
+ }
+
+ /**
+ * Clears the currentPhoto of the other GeoImageLayer's. Otherwise there could be multiple selected photos.
+ */
+ private void clearOtherCurrentPhotos() {
+ for (GeoImageLayer layer:
+ Main.map.mapView.getLayersOfType(GeoImageLayer.class)) {
+ if (layer != this) {
+ layer.clearCurrentPhoto(false);
+ }
+ }
+ }
+
+ private static List<MapMode> supportedMapModes = null;
+
+ /**
+ * Registers a map mode for which the functionality of this layer should be available.
+ * @param mapMode Map mode to be registered
+ * @since 6392
+ */
+ public static void registerSupportedMapMode(MapMode mapMode) {
+ if (supportedMapModes == null) {
+ supportedMapModes = new ArrayList<MapMode>();
+ }
+ supportedMapModes.add(mapMode);
+ }
+
+ /**
+ * Determines if the functionality of this layer is available in
+ * the specified map mode. SelectAction is supported by default,
+ * other map modes can be registered.
+ * @param mapMode Map mode to be checked
+ * @return {@code true} if the map mode is supported,
+ * {@code false} otherwise
+ */
+ private static final boolean isSupportedMapMode(MapMode mapMode) {
+ if (mapMode instanceof SelectAction) return true;
+ if (supportedMapModes != null) {
+ for (MapMode supmmode: supportedMapModes) {
+ if (mapMode == supmmode) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
private MouseAdapter mouseAdapter = null;
private MapModeChangeListener mapModeListener = null;
@@ -719,7 +872,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
public void hookUpMapView() {
mouseAdapter = new MouseAdapter() {
private final boolean isMapModeOk() {
- return Main.map.mapMode == null || Main.map.mapMode instanceof SelectAction;
+ return Main.map.mapMode == null || isSupportedMapMode(Main.map.mapMode);
}
@Override public void mousePressed(MouseEvent e) {
@@ -743,7 +896,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
Point p = Main.map.mapView.getPoint(e.getPos());
Rectangle r;
- if (e.thumbnail != null) {
+ if (useThumbs && e.thumbnail != null) {
Dimension d = scaledDimension(e.thumbnail);
r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
} else {
@@ -753,6 +906,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
icon.getIconHeight());
}
if (r.contains(ev.getPoint())) {
+ clearOtherCurrentPhotos();
currentPhoto = i;
ImageViewerDialog.showImage(GeoImageLayer.this, e);
Main.map.repaint();
@@ -763,8 +917,9 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
};
mapModeListener = new MapModeChangeListener() {
+ @Override
public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) {
- if (newMapMode == null || (newMapMode instanceof org.openstreetmap.josm.actions.mapmode.SelectAction)) {
+ if (newMapMode == null || isSupportedMapMode(newMapMode)) {
Main.map.mapView.addMouseListener(mouseAdapter);
} else {
Main.map.mapView.removeMouseListener(mouseAdapter);
@@ -776,6 +931,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
mapModeListener.mapModeChange(null, Main.map.mapMode);
MapView.addLayerChangeListener(new LayerChangeListener() {
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
if (newLayer == GeoImageLayer.this) {
// only in select mode it is possible to click the images
@@ -783,9 +939,11 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
}
+ @Override
public void layerAdded(Layer newLayer) {
}
+ @Override
public void layerRemoved(Layer oldLayer) {
if (oldLayer == GeoImageLayer.this) {
if (thumbsloader != null) {
@@ -809,6 +967,7 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (NavigatableComponent.PROPNAME_CENTER.equals(evt.getPropertyName()) || NavigatableComponent.PROPNAME_SCALE.equals(evt.getPropertyName())) {
updateOffscreenBuffer = true;
@@ -831,22 +990,50 @@ public class GeoImageLayer extends Layer implements PropertyChangeListener, Jump
}
public List<ImageEntry> getImages() {
- List<ImageEntry> copy = new ArrayList<ImageEntry>();
+ List<ImageEntry> copy = new ArrayList<ImageEntry>(data.size());
for (ImageEntry ie : data) {
copy.add(ie.clone());
}
return copy;
}
+ /**
+ * Returns the associated GPX layer.
+ * @return The associated GPX layer
+ */
public GpxLayer getGpxLayer() {
return gpxLayer;
}
+ @Override
public void jumpToNextMarker() {
showNextPhoto();
}
+ @Override
public void jumpToPreviousMarker() {
showPreviousPhoto();
}
+
+ /**
+ * Returns the current thumbnail display status.
+ * {@code true}: thumbnails are displayed, {@code false}: an icon is displayed instead of thumbnails.
+ * @return Current thumbnail display status
+ * @since 6392
+ */
+ public boolean isUseThumbs() {
+ return useThumbs;
+ }
+
+ /**
+ * Enables or disables the display of thumbnails. Does not update the display.
+ * @param useThumbs New thumbnail display status
+ * @since 6392
+ */
+ public void setUseThumbs(boolean useThumbs) {
+ this.useThumbs = useThumbs;
+ if (useThumbs && !thumbsLoaded) {
+ loadThumbs();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
index c7250c1..3a080c1 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
@@ -1,6 +1,4 @@
// License: GPL. See LICENSE file for details.
-// Copyright 2007 by Christian Gallioz (aka khris78)
-
package org.openstreetmap.josm.gui.layer.geoimage;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -36,7 +34,7 @@ public class ImageDisplay extends JComponent {
/** The image currently displayed */
private Image image = null;
-
+
/** The image currently displayed */
private boolean errorLoading = false;
@@ -66,6 +64,7 @@ public class ImageDisplay extends JComponent {
this.orientation = orientation == null ? -1 : orientation;
}
+ @Override
public void run() {
Image img = Toolkit.getDefaultToolkit().createImage(file.getPath());
tracker.addImage(img, 1);
@@ -80,6 +79,7 @@ public class ImageDisplay extends JComponent {
try {
Thread.sleep(5);
} catch (InterruptedException e) {
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" while loading image "+file.getPath());
}
}
@@ -98,10 +98,10 @@ public class ImageDisplay extends JComponent {
if (!error) {
ImageDisplay.this.image = img;
visibleRect = new Rectangle(0, 0, img.getWidth(null), img.getHeight(null));
-
+
final int w = (int) visibleRect.getWidth();
final int h = (int) visibleRect.getHeight();
-
+
outer: {
final int hh, ww, q;
final double ax, ay;
@@ -130,13 +130,13 @@ public class ImageDisplay extends JComponent {
default:
break outer;
}
-
+
final BufferedImage rot = new BufferedImage(ww, hh, BufferedImage.TYPE_INT_RGB);
final AffineTransform xform = AffineTransform.getQuadrantRotateInstance(q, ax, ay);
final Graphics2D g = rot.createGraphics();
g.drawImage(image, xform, null);
g.dispose();
-
+
visibleRect.setSize(ww, hh);
image.flush();
ImageDisplay.this.image = rot;
@@ -154,11 +154,12 @@ public class ImageDisplay extends JComponent {
private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
boolean mouseIsDragging = false;
- long lastTimeForMousePoint = 0l;
+ long lastTimeForMousePoint = 0L;
Point mousePointInImg = null;
/** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor
* at the same place */
+ @Override
public void mouseWheelMoved(MouseWheelEvent e) {
File file;
Image image;
@@ -231,6 +232,7 @@ public class ImageDisplay extends JComponent {
}
/** Center the display on the point that has been clicked */
+ @Override
public void mouseClicked(MouseEvent e) {
// Move the center to the clicked point.
File file;
@@ -268,6 +270,7 @@ public class ImageDisplay extends JComponent {
/** Initialize the dragging, either with button 1 (simple dragging) or button 3 (selection of
* a picture part) */
+ @Override
public void mousePressed(MouseEvent e) {
if (image == null) {
mouseIsDragging = false;
@@ -302,6 +305,7 @@ public class ImageDisplay extends JComponent {
}
}
+ @Override
public void mouseDragged(MouseEvent e) {
if (! mouseIsDragging && selectedRect == null)
return;
@@ -350,6 +354,7 @@ public class ImageDisplay extends JComponent {
}
+ @Override
public void mouseReleased(MouseEvent e) {
if (! mouseIsDragging && selectedRect == null)
return;
@@ -413,12 +418,15 @@ public class ImageDisplay extends JComponent {
}
}
+ @Override
public void mouseEntered(MouseEvent e) {
}
+ @Override
public void mouseExited(MouseEvent e) {
}
+ @Override
public void mouseMoved(MouseEvent e) {
}
@@ -529,7 +537,7 @@ public class ImageDisplay extends JComponent {
int ascent = metrics.getAscent();
Color bkground = new Color(255, 255, 255, 128);
int lastPos = 0;
- int pos = osdText.indexOf("\n");
+ int pos = osdText.indexOf('\n');
int x = 3;
int y = 3;
String line;
@@ -542,7 +550,7 @@ public class ImageDisplay extends JComponent {
g.drawString(line, x, y + ascent);
y += (int) lineSize.getHeight();
lastPos = pos + 1;
- pos = osdText.indexOf("\n", lastPos);
+ pos = osdText.indexOf('\n', lastPos);
}
line = osdText.substring(lastPos);
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
index 80ed2fc..e100f25 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
@@ -1,8 +1,4 @@
// License: GPL. See LICENSE file for details.
-// Copyright 2007 by Christian Gallioz (aka khris78)
-// Parts of code from Geotagged plugin (by Rob Neild)
-// and the core JOSM source code (by Immanuel Scholz and others)
-
package org.openstreetmap.josm.gui.layer.geoimage;
import java.awt.Image;
@@ -12,19 +8,29 @@ import java.util.Date;
import org.openstreetmap.josm.data.coor.CachedLatLon;
import org.openstreetmap.josm.data.coor.LatLon;
-/*
+/**
* Stores info about each image
*/
-
final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
private File file;
private Integer exifOrientation;
private LatLon exifCoor;
private Double exifImgDir;
private Date exifTime;
+ /**
+ * Flag isNewGpsData indicates that the GPS data of the image is new or has changed.
+ * GPS data includes the position, speed, elevation, time (e.g. as extracted from the GPS track).
+ * The flag can used to decide for which image file the EXIF GPS data is (re-)written.
+ */
+ private boolean isNewGpsData = false;
+ /** Temporary source of GPS time if not correlated with GPX track. */
+ private Date exifGpsTime = null;
Image thumbnail;
- /** The following values are computed from the correlation with the gpx track */
+ /**
+ * The following values are computed from the correlation with the gpx track
+ * or extracted from the image EXIF data.
+ */
private CachedLatLon pos;
/** Speed in kilometer per second */
private Double speed;
@@ -34,7 +40,7 @@ final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
private Date gpsTime;
/**
- * When the corralation dialog is open, we like to show the image position
+ * When the correlation dialog is open, we like to show the image position
* for the current time offset on the map in real time.
* On the other hand, when the user aborts this operation, the old values
* should be restored. We have a temprary copy, that overrides
@@ -61,10 +67,20 @@ final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
return tmp.elevation;
return elevation;
}
+
public Date getGpsTime() {
if (tmp != null)
- return tmp.gpsTime;
- return gpsTime;
+ return getDefensiveDate(tmp.gpsTime);
+ return getDefensiveDate(gpsTime);
+ }
+
+ /**
+ * Convenient way to determine if this entry has a GPS time, without the cost of building a defensive copy.
+ * @return {@code true} if this entry has a GPS time
+ * @since 6450
+ */
+ public final boolean hasGpsTime() {
+ return (tmp != null && tmp.gpsTime != null) || gpsTime != null;
}
/**
@@ -77,8 +93,42 @@ final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
return exifOrientation;
}
public Date getExifTime() {
- return exifTime;
+ return getDefensiveDate(exifTime);
+ }
+
+ /**
+ * Convenient way to determine if this entry has a EXIF time, without the cost of building a defensive copy.
+ * @return {@code true} if this entry has a EXIF time
+ * @since 6450
+ */
+ public final boolean hasExifTime() {
+ return exifTime != null;
}
+
+ /**
+ * Returns the EXIF GPS time.
+ * @return the EXIF GPS time
+ * @since 6392
+ */
+ public final Date getExifGpsTime() {
+ return getDefensiveDate(exifGpsTime);
+ }
+
+ /**
+ * Convenient way to determine if this entry has a EXIF GPS time, without the cost of building a defensive copy.
+ * @return {@code true} if this entry has a EXIF GPS time
+ * @since 6450
+ */
+ public final boolean hasExifGpsTime() {
+ return exifGpsTime != null;
+ }
+
+ private static Date getDefensiveDate(Date date) {
+ if (date == null)
+ return null;
+ return new Date(date.getTime());
+ }
+
public LatLon getExifCoor() {
return exifCoor;
}
@@ -112,10 +162,20 @@ final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
this.exifOrientation = exifOrientation;
}
public void setExifTime(Date exifTime) {
- this.exifTime = exifTime;
+ this.exifTime = getDefensiveDate(exifTime);
}
+
+ /**
+ * Sets the EXIF GPS time.
+ * @param exifGpsTime the EXIF GPS time
+ * @since 6392
+ */
+ public final void setExifGpsTime(Date exifGpsTime) {
+ this.exifGpsTime = getDefensiveDate(exifGpsTime);
+ }
+
public void setGpsTime(Date gpsTime) {
- this.gpsTime = gpsTime;
+ this.gpsTime = getDefensiveDate(gpsTime);
}
public void setExifCoor(LatLon exifCoor) {
this.exifCoor = exifCoor;
@@ -135,6 +195,7 @@ final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
return (ImageEntry) c;
}
+ @Override
public int compareTo(ImageEntry image) {
if (exifTime != null && image.exifTime != null)
return exifTime.compareTo(image.exifTime);
@@ -187,4 +248,41 @@ final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
" [tmp] pos = "+tmp.pos+"");
return result;
}
+
+ /**
+ * Indicates that the image has new GPS data.
+ * That flag is used e.g. by the photo_geotagging plugin to decide for which image
+ * file the EXIF GPS data needs to be (re-)written.
+ * @since 6392
+ */
+ public void flagNewGpsData() {
+ isNewGpsData = true;
+ // We need to set the GPS time to tell the system (mainly the photo_geotagging plug-in)
+ // that the GPS data has changed. Check for existing GPS time and take EXIF time otherwise.
+ // This can be removed once isNewGpsData is used instead of the GPS time.
+ if (gpsTime == null) {
+ Date time = getExifGpsTime();
+ if (time == null) {
+ time = getExifTime();
+ if (time == null) {
+ // Time still not set, take the current time.
+ time = new Date();
+ }
+ }
+ gpsTime = time;
+ }
+ if (tmp != null && !tmp.hasGpsTime()) {
+ // tmp.gpsTime overrides gpsTime, so we set it too.
+ tmp.gpsTime = gpsTime;
+ }
+ }
+
+ /**
+ * Queries whether the GPS data changed.
+ * @return {@code true} if GPS data changed, {@code false} otherwise
+ * @since 6392
+ */
+ public boolean hasNewGpsData() {
+ return isNewGpsData;
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index 1c75cd6..89c338a 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -1,8 +1,4 @@
// License: GPL. See LICENSE file for details.
-// Copyright 2007 by Christian Gallioz (aka khris78)
-// Parts of code from Geotagged plugin (by Rob Neild)
-// and the core JOSM source code (by Immanuel Scholz and others)
-
package org.openstreetmap.josm.gui.layer.geoimage;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -26,12 +22,12 @@ import javax.swing.JPanel;
import javax.swing.JToggleButton;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
+import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Shortcut;
-public class ImageViewerDialog extends ToggleDialog {
+public final class ImageViewerDialog extends ToggleDialog {
private static final String COMMAND_ZOOM = "zoom";
private static final String COMMAND_CENTERVIEW = "centre";
@@ -40,6 +36,8 @@ public class ImageViewerDialog extends ToggleDialog {
private static final String COMMAND_REMOVE_FROM_DISK = "removefromdisk";
private static final String COMMAND_PREVIOUS = "previous";
private static final String COMMAND_COLLAPSE = "collapse";
+ private static final String COMMAND_FIRST = "first";
+ private static final String COMMAND_LAST = "last";
private ImageDisplay imgDisplay = new ImageDisplay();
private boolean centerView = false;
@@ -55,7 +53,7 @@ public class ImageViewerDialog extends ToggleDialog {
public static ImageViewerDialog getInstance() {
if (dialog == null)
- throw new AssertionError(); // a new instance needs to be created first
+ throw new AssertionError("a new instance needs to be created first");
return dialog;
}
@@ -67,7 +65,7 @@ public class ImageViewerDialog extends ToggleDialog {
super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
- /* Don't show a detached dialog right from the start. */
+ // Don't show a detached dialog right from the start.
if (isShowing && !isDocked) {
setIsShowing(false);
}
@@ -119,6 +117,17 @@ public class ImageViewerDialog extends ToggleDialog {
btnNext.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scNext.getKeyStroke(), ANEXT);
btnNext.getActionMap().put(ANEXT, nextAction);
+ Main.registerActionShortcut(
+ new ImageAction(COMMAND_FIRST, null, null),
+ Shortcut.registerShortcut(
+ "geoimage:first", tr("Geoimage: {0}", tr("Show first Image")), KeyEvent.VK_HOME, Shortcut.DIRECT)
+ );
+ Main.registerActionShortcut(
+ new ImageAction(COMMAND_LAST, null, null),
+ Shortcut.registerShortcut(
+ "geoimage:last", tr("Geoimage: {0}", tr("Show last Image")), KeyEvent.VK_END, Shortcut.DIRECT)
+ );
+
JToggleButton tbCentre = new JToggleButton(new ImageAction(COMMAND_CENTERVIEW, ImageProvider.get("dialogs", "centreview"), tr("Center view")));
tbCentre.setPreferredSize(buttonDim);
@@ -167,6 +176,7 @@ public class ImageViewerDialog extends ToggleDialog {
putValue(SMALL_ICON, icon);
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (COMMAND_NEXT.equals(action)) {
if (currentLayer != null) {
@@ -176,6 +186,10 @@ public class ImageViewerDialog extends ToggleDialog {
if (currentLayer != null) {
currentLayer.showPreviousPhoto();
}
+ } else if (COMMAND_FIRST.equals(action) && currentLayer != null) {
+ currentLayer.showFirstPhoto();
+ } else if (COMMAND_LAST.equals(action) && currentLayer != null) {
+ currentLayer.showLastPhoto();
} else if (COMMAND_CENTERVIEW.equals(action)) {
centerView = ((JToggleButton) e.getSource()).isSelected();
@@ -216,11 +230,12 @@ public class ImageViewerDialog extends ToggleDialog {
private ImageEntry currentEntry = null;
public void displayImage(GeoImageLayer layer, ImageEntry entry) {
+ boolean imageChanged;
+
synchronized(this) {
- // if (currentLayer == layer && currentEntry == entry) {
- // repaint();
- // return;
- // } TODO: pop up image dialog but don't load image again
+ // TODO: pop up image dialog but don't load image again
+
+ imageChanged = currentEntry != entry;
if (centerView && Main.isDisplayingMapView() && entry != null && entry.getPos() != null) {
Main.map.mapView.zoomTo(entry.getPos());
@@ -231,7 +246,11 @@ public class ImageViewerDialog extends ToggleDialog {
}
if (entry != null) {
- imgDisplay.setImage(entry.getFile(), entry.getExifOrientation());
+ if (imageChanged) {
+ // Set only if the image is new to preserve zoom and position if the same image is redisplayed
+ // (e.g. to update the OSD).
+ imgDisplay.setImage(entry.getFile(), entry.getExifOrientation());
+ }
setTitle("Geotagged Images" + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
StringBuffer osd = new StringBuffer(entry.getFile() != null ? entry.getFile().getName() : "");
if (entry.getElevation() != null) {
@@ -243,15 +262,11 @@ public class ImageViewerDialog extends ToggleDialog {
if (entry.getExifImgDir() != null) {
osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir())));
}
- //if (entry.getPos() != null) {
- // osd.append(tr("\nlat: {0}, lon: {1}", Double.toString(entry.getPos().lat()), Double.toString(entry.getPos().lon())));
- //}
- //osd.append(tr("\nfile mtime: {0}", Long.toString(entry.getFile().lastModified())));
DateFormat dtf = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
- if (entry.getExifTime() != null) {
+ if (entry.hasExifTime()) {
osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifTime())));
}
- if (entry.getGpsTime() != null) {
+ if (entry.hasGpsTime()) {
osd.append(tr("\nGPS time: {0}", dtf.format(entry.getGpsTime())));
}
@@ -311,4 +326,22 @@ public class ImageViewerDialog extends ToggleDialog {
public boolean hasImage() {
return currentEntry != null;
}
+
+ /**
+ * Returns the currently displayed image.
+ * @return Currently displayed image or {@code null}
+ * @since 6392
+ */
+ public static ImageEntry getCurrentImage() {
+ return getInstance().currentEntry;
+ }
+
+ /**
+ * Returns the layer associated with the image.
+ * @return Layer associated with the image
+ * @since 6392
+ */
+ public static GeoImageLayer getCurrentLayer() {
+ return getInstance().currentLayer;
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java b/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java
index 290e908..02f1eab 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java
@@ -1,13 +1,8 @@
// License: GPL. See LICENSE file for details.
-// Copyright 2007 by Christian Gallioz (aka khris78)
-// Parts of code from Geotagged plugin (by Rob Neild)
-// and the core JOSM source code (by Immanuel Scholz and others)
-
package org.openstreetmap.josm.gui.layer.geoimage;
import static org.openstreetmap.josm.tools.I18n.tr;
-//import javax.swing.JFileChooser;
import java.io.File;
class JpegFileFilter extends javax.swing.filechooser.FileFilter
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
index aa33cc7..10e51ac 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
@@ -1,5 +1,4 @@
// License: GPL. See LICENSE file for details.
-
package org.openstreetmap.josm.gui.layer.geoimage;
import java.awt.Graphics2D;
@@ -34,8 +33,9 @@ public class ThumbsLoader implements Runnable {
}
}
+ @Override
public void run() {
- System.err.println("Load Thumbnails");
+ Main.debug("Load Thumbnails");
tracker = new MediaTracker(Main.map.mapView);
for (int i = 0; i < data.size(); i++) {
if (stop) return;
@@ -51,17 +51,6 @@ public class ThumbsLoader implements Runnable {
}
layer.updateOffscreenBuffer = true;
Main.map.mapView.repaint();
- (new Thread() { // clean up the garbage - shouldn't hurt
- @Override
- public void run() {
- try {
- Thread.sleep(200);
- }
- catch (InterruptedException ie) {}
- System.gc();
- }
- }).start();
-
}
private BufferedImage loadThumb(ImageEntry entry) {
@@ -69,8 +58,8 @@ public class ThumbsLoader implements Runnable {
if (!cacheOff) {
BufferedImage cached = cache.getImg(cacheIdent);
- if(cached != null) {
- System.err.println(" from cache");
+ if (cached != null) {
+ Main.debug(" from cache");
return cached;
}
}
@@ -80,11 +69,11 @@ public class ThumbsLoader implements Runnable {
try {
tracker.waitForID(0);
} catch (InterruptedException e) {
- System.err.println(" InterruptedException");
+ Main.error(" InterruptedException while loading thumb");
return null;
}
if (tracker.isErrorID(1) || img.getWidth(null) <= 0 || img.getHeight(null) <= 0) {
- System.err.println(" Invalid image");
+ Main.error(" Invalid image");
return null;
}
Rectangle targetSize = ImageDisplay.calculateDrawImageRectangle(
@@ -92,17 +81,18 @@ public class ThumbsLoader implements Runnable {
new Rectangle(0, 0, maxSize, maxSize));
BufferedImage scaledBI = new BufferedImage(targetSize.width, targetSize.height, BufferedImage.TYPE_INT_RGB);
Graphics2D g = scaledBI.createGraphics();
- while (!g.drawImage(img, 0, 0, targetSize.width, targetSize.height, null))
- {
+ while (!g.drawImage(img, 0, 0, targetSize.width, targetSize.height, null)) {
try {
Thread.sleep(10);
- } catch(InterruptedException ie) {}
+ } catch(InterruptedException ie) {
+ Main.warn("InterruptedException while drawing thumb");
+ }
}
g.dispose();
tracker.removeImage(img);
if (scaledBI.getWidth() <= 0 || scaledBI.getHeight() <= 0) {
- System.err.println(" Invalid image");
+ Main.error(" Invalid image");
return null;
}
@@ -110,7 +100,6 @@ public class ThumbsLoader implements Runnable {
cache.saveImg(cacheIdent, scaledBI);
}
- System.err.println("");
return scaledBI;
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
index 2e30225..07a632c 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
@@ -1,60 +1,55 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
-import org.openstreetmap.josm.gui.layer.GpxLayer;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.Component;
import java.awt.Dimension;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.Map;
+
import javax.swing.AbstractAction;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JSlider;
-import javax.swing.JSpinner;
import javax.swing.JTable;
+import javax.swing.JToggleButton;
import javax.swing.ListSelectionModel;
-import javax.swing.SpinnerDateModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableCellRenderer;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.WindowGeometry;
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-
/**
* allows the user to choose which of the downloaded tracks should be displayed.
* they can be chosen from the gpx layer context menu.
*/
public class ChooseTrackVisibilityAction extends AbstractAction {
private final GpxLayer layer;
-
+
+ DateFilterPanel dateFilter;
JTable table;
- JDateWithSlider dateFrom = new JDateWithSlider(tr("From"));
- JDateWithSlider dateTo = new JDateWithSlider(tr("To"));
- JCheckBox checkBox = new JCheckBox(tr("No timestamp"));
- private boolean showNoTimestamp;
-
+
+ /**
+ * Constructs a new {@code ChooseTrackVisibilityAction}.
+ * @param layer The associated GPX layer
+ */
public ChooseTrackVisibilityAction(final GpxLayer layer) {
super(tr("Choose visible tracks"), ImageProvider.get("dialogs/filter"));
this.layer = layer;
@@ -83,7 +78,8 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
/**
* Builds an non-editable table whose 5th column will open a browser when double clicked.
* The table will fill its parent. */
- private JTable buildTable(String[] headers, Object[][] content) {
+ private JTable buildTable(Object[][] content) {
+ final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")};
final JTable t = new JTable(content, headers) {
@Override
public Component prepareRenderer(TableCellRenderer renderer, int row, int col) {
@@ -126,18 +122,15 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
OpenBrowser.displayUrl(url);
}
};
+ t.setAutoCreateRowSorter(true);
t.addMouseListener(urlOpener);
t.setFillsViewportHeight(true);
return t;
}
-
+
boolean noUpdates=false;
-
- private void filterTracksByDate() {
- layer.filterTracksByDate(dateFrom.getDate(), dateTo.getDate(), checkBox.isSelected());
- }
-
- /** selects all rows (=tracks) in the table that are currently visible */
+
+ /** selects all rows (=tracks) in the table that are currently visible on the layer*/
private void selectVisibleTracksInTable() {
// don't select any tracks if the layer is not visible
if (!layer.isVisible()) {
@@ -157,79 +150,63 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
table.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
- if (!(e.getSource() instanceof ListSelectionModel)) {
+ if (noUpdates || !(e.getSource() instanceof ListSelectionModel)) {
return;
}
- if (!noUpdates) updateVisibilityFromTable();
+ updateVisibilityFromTable();
}
});
}
-
+
private void updateVisibilityFromTable() {
- ListSelectionModel s = (ListSelectionModel) table.getSelectionModel();
+ ListSelectionModel s = table.getSelectionModel();
for (int i = 0; i < layer.trackVisibility.length; i++) {
- layer.trackVisibility[i] = s.isSelectedIndex(i);
- System.out.printf("changed %d:=%s", i, ""+layer.trackVisibility[i]);
+ layer.trackVisibility[table.convertRowIndexToModel(i)] = s.isSelectedIndex(i);
}
Main.map.mapView.preferenceChanged(null);
Main.map.repaint(100);
}
-
- private static final String PREF_DATE0 = "gpx.traces.showzerotimestamp";
- private static final String PREF_DATE1 = "gpx.traces.mintime";
- private static final String PREF_DATE2 = "gpx.traces.maxtime";
-
+
@Override
public void actionPerformed(ActionEvent arg0) {
final JPanel msg = new JPanel(new GridBagLayout());
-
- final Date startTime, endTime;
- Date[] bounds = layer.getMinMaxTimeForAllTracks();
-
- startTime = (bounds==null) ? new GregorianCalendar(2000, 1, 1).getTime():bounds[0];
- endTime = (bounds==null) ? new Date() : bounds[2];
- long d1 = Main.pref.getLong(PREF_DATE1, 0);
- if (d1==0) d1=new GregorianCalendar(2000, 1, 1).getTime().getTime();
- long d2 = Main.pref.getLong(PREF_DATE2, 0);
- if (d2==0) d2=System.currentTimeMillis();
-
- dateFrom.setValue(new Date(d1));
- dateTo.setValue(new Date(d2));
- dateFrom.setRange(startTime, endTime);
- dateTo.setRange(startTime, endTime);
- checkBox.setSelected(Main.pref.getBoolean(PREF_DATE0, true));
-
- JButton selectDate = new JButton();
- msg.add(selectDate, GBC.std().grid(1,1).insets(0, 0, 20, 0));
- msg.add(checkBox, GBC.std().grid(2,1).insets(0, 0, 20, 0));
- msg.add(dateFrom, GBC.std().grid(3,1).fill(GBC.HORIZONTAL));
- msg.add(dateTo, GBC.eol().grid(4,1).fill(GBC.HORIZONTAL));
- msg.add(new JLabel(tr("<html>Select all tracks that you want to be displayed. You can drag select a " + "range of tracks or use CTRL+Click to select specific ones. The map is updated live in the " + "background. Open the URLs by double clicking them.</html>")), GBC.eol().fill(GBC.HORIZONTAL));
+ dateFilter = new DateFilterPanel(layer, "gpx.traces", false);
+ dateFilter.setFilterAppliedListener(new ActionListener(){
+ @Override public void actionPerformed(ActionEvent e) {
+ noUpdates = true;
+ selectVisibleTracksInTable();
+ noUpdates = false;
+ Main.map.mapView.preferenceChanged(null);
+ Main.map.repaint(100);
+ }
+ });
+ dateFilter.loadFromPrefs();
+
+ final JToggleButton b = new JToggleButton(new AbstractAction(tr("Select by date")) {
+ @Override public void actionPerformed(ActionEvent e) {
+ if (((JToggleButton) e.getSource()).isSelected()) {
+ dateFilter.setEnabled(true);
+ dateFilter.applyFilter();
+ } else {
+ dateFilter.setEnabled(false);
+ }
+ }
+ });
+ dateFilter.setEnabled(false);
+ msg.add(b, GBC.std().insets(0,0,5,0));
+ msg.add(dateFilter, GBC.eol().insets(0,0,10,0).fill(GBC.HORIZONTAL));
+
+ msg.add(new JLabel(tr("<html>Select all tracks that you want to be displayed. You can drag select a " + "range of tracks or use CTRL+Click to select specific ones. The map is updated live in the " + "background. Open the URLs by double clicking them.</html>")), GBC.eop().fill(GBC.HORIZONTAL));
// build table
final boolean[] trackVisibilityBackup = layer.trackVisibility.clone();
- final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")};
- table = buildTable(headers, buildTableContents());
+ table = buildTable(buildTableContents());
selectVisibleTracksInTable();
listenToSelectionChanges();
// make the table scrollable
JScrollPane scrollPane = new JScrollPane(table);
msg.add(scrollPane, GBC.eol().fill(GBC.BOTH));
-
- selectDate.setAction(new AbstractAction(tr("Select by date")) {
- @Override
- public void actionPerformed(ActionEvent e) {
- Main.pref.putLong(PREF_DATE1, dateFrom.getDate().getTime());
- Main.pref.putLong(PREF_DATE2, dateTo.getDate().getTime());
- Main.pref.put(PREF_DATE0, checkBox.isSelected());
- noUpdates = true;
- filterTracksByDate();
- selectVisibleTracksInTable();
- noUpdates = false;
- updateVisibilityFromTable();
- }
- });
-
+
// build dialog
ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Set track visibility for {0}", layer.getName()), new String[]{tr("Show all"), tr("Show selected only"), tr("Cancel")});
ed.setButtonIcons(new String[]{"dialogs/layerlist/eye", "dialogs/filter", "cancel"});
@@ -239,12 +216,11 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
ed.configureContextsensitiveHelp("/Action/ChooseTrackVisibility", true);
ed.setRememberWindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent, new Dimension(1000, 500)));
ed.showDialog();
+ dateFilter.saveInPrefs();
int v = ed.getValue();
// cancel for unknown buttons and copy back original settings
if (v != 1 && v != 2) {
- for (int i = 0; i < layer.trackVisibility.length; i++) {
- layer.trackVisibility[i] = trackVisibilityBackup[i];
- }
+ System.arraycopy(trackVisibilityBackup, 0, layer.trackVisibility, 0, layer.trackVisibility.length);
Main.map.repaint();
return;
}
@@ -253,61 +229,13 @@ public class ChooseTrackVisibilityAction extends AbstractAction {
ListSelectionModel s = table.getSelectionModel();
final boolean all = v == 1 || s.isSelectionEmpty();
for (int i = 0; i < layer.trackVisibility.length; i++) {
- layer.trackVisibility[i] = all || s.isSelectedIndex(i);
+ layer.trackVisibility[table.convertRowIndexToModel(i)] = all || s.isSelectedIndex(i);
}
// ...sync with layer visibility instead to avoid having two ways to hide everything
layer.setVisible(v == 1 || !s.isSelectionEmpty());
+
+ Main.map.mapView.preferenceChanged(null);
Main.map.repaint();
}
-
-
- public static class JDateWithSlider extends JPanel {
- private JSpinner spinner;
- private JSlider slider;
- private Date dateMin;
- private Date dateMax;
- private static final int MAX_SLIDER=300;
- public JDateWithSlider(String msg) {
- super(new GridBagLayout());
- spinner = new JSpinner( new SpinnerDateModel() );
- String pattern = ((SimpleDateFormat)DateFormat.getDateInstance()).toPattern();
- JSpinner.DateEditor timeEditor = new JSpinner.DateEditor(spinner,pattern);
- spinner.setEditor(timeEditor);
- slider = new JSlider(0,MAX_SLIDER);
- slider.addChangeListener(new ChangeListener() {
- public void stateChanged(ChangeEvent e) {
- spinner.setValue(dateFromInt(slider.getValue()));
- }
- });
- add(new JLabel(msg),GBC.std());
- add(spinner,GBC.std().insets(10,0,0,0));
- add(slider,GBC.eol().insets(10,0,0,0).fill(GBC.HORIZONTAL));
-
- dateMin = new Date(0); dateMax =new Date();
- }
-
- private Date dateFromInt(int value) {
- double k = 1.0*value/MAX_SLIDER;
- return new Date((long)(dateMax.getTime()*k+ dateMin.getTime()*(1-k)));
- }
- private int intFromDate(Date date) {
- return (int)(300.0*(date.getTime()-dateMin.getTime()) /
- (dateMax.getTime()-dateMin.getTime()));
- }
-
- private void setRange(Date dateMin, Date dateMax) {
- this.dateMin = dateMin;
- this.dateMax = dateMax;
- }
-
- private void setValue(Date date) {
- spinner.setValue(date);
- }
-
- private Date getDate() {
- return (Date) spinner.getValue();
- }
- }
-
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
index c65b03e..7f2bdcd 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
@@ -1,13 +1,19 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.List;
+
import javax.swing.AbstractAction;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
@@ -16,15 +22,12 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.tools.DateUtils;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.UrlLabel;
-
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.tr;
public class ConvertToDataLayerAction extends AbstractAction {
private final GpxLayer layer;
@@ -39,7 +42,7 @@ public class ConvertToDataLayerAction extends AbstractAction {
public void actionPerformed(ActionEvent e) {
JPanel msg = new JPanel(new GridBagLayout());
msg.add(new JLabel(tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")), GBC.eol());
- msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces"), 2), GBC.eop());
+ msg.add(new UrlLabel(Main.OSM_WEBSITE + "/traces", 2), GBC.eop());
if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, JOptionPane.OK_OPTION)) {
return;
}
@@ -64,5 +67,5 @@ public class ConvertToDataLayerAction extends AbstractAction {
Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", layer.getName()), layer.getAssociatedFile()));
Main.main.removeLayer(layer);
}
-
+
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java
index 78dc3c2..ff880c2 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java
@@ -1,17 +1,23 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.util.LinkedList;
import java.util.List;
+
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.Layer;
@@ -20,9 +26,6 @@ import org.openstreetmap.josm.gui.layer.Layer.MultiLayerAction;
import org.openstreetmap.josm.gui.preferences.display.GPXSettingsPanel;
import org.openstreetmap.josm.tools.ImageProvider;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
public class CustomizeDrawingAction extends AbstractAction implements LayerAction, MultiLayerAction {
List<Layer> layers;
@@ -97,5 +100,5 @@ public class CustomizeDrawingAction extends AbstractAction implements LayerActio
}
Main.map.repaint();
}
-
+
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java b/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
new file mode 100644
index 0000000..7e5d21a
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
@@ -0,0 +1,141 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.gui.layer.gpx;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+import javax.swing.Timer;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.widgets.DateEditorWithSlider;
+import org.openstreetmap.josm.tools.GBC;
+
+public class DateFilterPanel extends JPanel {
+ DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From"));
+ DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To"));
+ JCheckBox noTimestampCb = new JCheckBox(tr("No timestamp"));
+ GpxLayer layer;
+
+ ActionListener filterAppliedListener;
+
+ final String PREF_DATE_0;
+ final String PREF_DATE_MIN;
+ final String PREF_DATE_MAX;
+
+ /**
+ * Create the panel to filter tracks on GPX layer @param layer by date
+ * Preferences will be stored in @param preferencePrefix
+ * If @param enabled = true, the the panel is created as active and filtering occurs immediately.
+ */
+ public DateFilterPanel(GpxLayer layer, String preferencePrefix, boolean enabled) {
+ super(new GridBagLayout());
+ PREF_DATE_0 = preferencePrefix+".showzerotimestamp";
+ PREF_DATE_MIN = preferencePrefix+".mintime";
+ PREF_DATE_MAX = preferencePrefix+".maxtime";
+ this.layer = layer;
+
+ final Date startTime, endTime;
+ Date[] bounds = layer.getMinMaxTimeForAllTracks();
+ startTime = (bounds==null) ? new GregorianCalendar(2000, 1, 1).getTime():bounds[0];
+ endTime = (bounds==null) ? new Date() : bounds[1];
+
+ dateFrom.setDate(startTime);
+ dateTo.setDate(endTime);
+ dateFrom.setRange(startTime, endTime);
+ dateTo.setRange(startTime, endTime);
+
+ add(noTimestampCb, GBC.std().grid(1,1).insets(0, 0, 5, 0));
+ add(dateFrom, GBC.std().grid(2,1).fill(GBC.HORIZONTAL));
+ add(dateTo, GBC.eol().grid(3,1).fill(GBC.HORIZONTAL));
+
+ setEnabled(enabled);
+
+ dateFrom.addDateListener(changeListener);
+ dateTo.addDateListener(changeListener);
+ noTimestampCb.addChangeListener(changeListener);
+ }
+
+ private ChangeListener changeListener = new ChangeListener() {
+ @Override public void stateChanged(ChangeEvent e) {
+ if (isEnabled()) applyFilterWithDelay();
+ }
+ };
+
+ private Timer t = new Timer(200 , new ActionListener() {
+ @Override public void actionPerformed(ActionEvent e) {
+ applyFilter();
+ }
+ });
+
+ /**
+ * Do filtering but little bit later (to reduce cpu load)
+ */
+ public void applyFilterWithDelay() {
+ if (t.isRunning()) {
+ t.restart();
+ } else {
+ t.start();
+ }
+ }
+
+ public void applyFilter() {
+ t.stop();
+ filterTracksByDate();
+ if (filterAppliedListener!=null)
+ filterAppliedListener.actionPerformed(null);
+ }
+
+ /**
+ * Called by other components when it is correct time to save date filtering parameters
+ */
+ public void saveInPrefs() {
+ Main.pref.putLong(PREF_DATE_MIN, dateFrom.getDate().getTime());
+ Main.pref.putLong(PREF_DATE_MAX, dateTo.getDate().getTime());
+ Main.pref.put(PREF_DATE_0, noTimestampCb.isSelected());
+ }
+
+ /**
+ * If possible, load date ragne and "zero timestamp" option from preferences
+ * Called by other components when it is needed.
+ */
+ public void loadFromPrefs() {
+ long t1 =Main.pref.getLong(PREF_DATE_MIN, 0);
+ if (t1!=0) dateFrom.setDate(new Date(t1));
+ long t2 =Main.pref.getLong(PREF_DATE_MAX, 0);
+ if (t2!=0) dateTo.setDate(new Date(t2));
+ noTimestampCb.setSelected(Main.pref.getBoolean(PREF_DATE_0, false));
+ }
+
+ public void setFilterAppliedListener(ActionListener filterAppliedListener) {
+ this.filterAppliedListener = filterAppliedListener;
+ }
+
+ private void filterTracksByDate() {
+ Date from = dateFrom.getDate();
+ Date to = dateTo.getDate();
+ layer.filterTracksByDate(from, to, noTimestampCb.isSelected());
+ }
+
+ @Override
+ public void setEnabled(boolean enabled) {
+ super.setEnabled(enabled);
+ for (Component c: getComponents()) {
+ c.setEnabled(enabled);
+ }
+ }
+
+
+
+
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
new file mode 100644
index 0000000..c26f2e4
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
@@ -0,0 +1,219 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.gpx;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
+
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Panel displayed in "Download along..." dialogs
+ * @since 6054
+ */
+public class DownloadAlongPanel extends JPanel {
+
+ // Preferences keys
+ private final String prefOsm;
+ private final String prefGps;
+ private final String prefDist;
+ private final String prefArea;
+ private final String prefNear;
+
+ // Data types to download
+ private final JCheckBox cbDownloadOsmData;
+ private final JCheckBox cbDownloadGpxData;
+
+ // Legacy list of values
+ private static final Integer[] dist = { 5000, 500, 50 };
+ private static final Integer[] area = { 20, 10, 5, 1 };
+
+ private final JList buffer;
+ private final JList maxRect;
+ private final JList downloadNear;
+
+ /**
+ * Constructs a new {@code DownloadPanel}.
+ * @param prefOsm Preference key determining if OSM data should be downloaded
+ * @param prefGps Preference key determining if GPS data should be downloaded
+ * @param prefDist Preference key determining maximum distance
+ * @param prefArea Preference key determining maximum area
+ * @param prefNear Preference key determining "near" parameter. Can be {@code null}
+ */
+ public DownloadAlongPanel(String prefOsm, String prefGps, String prefDist, String prefArea, String prefNear) {
+ super(new GridBagLayout());
+
+ this.prefOsm = prefOsm;
+ this.prefGps = prefGps;
+ this.prefDist = prefDist;
+ this.prefArea = prefArea;
+ this.prefNear = prefNear;
+
+ cbDownloadOsmData = new JCheckBox(tr("OpenStreetMap data"), Main.pref.getBoolean(prefOsm, true));
+ cbDownloadOsmData.setToolTipText(tr("Select to download OSM data."));
+ add(cbDownloadOsmData, GBC.std().insets(1,5,1,5));
+ cbDownloadGpxData = new JCheckBox(tr("Raw GPS data"), Main.pref.getBoolean(prefGps, false));
+ cbDownloadGpxData.setToolTipText(tr("Select to download GPS traces."));
+ add(cbDownloadGpxData, GBC.eol().insets(5,5,1,5));
+
+ add(new JLabel(tr("Download everything within:")), GBC.eol());
+ String[] s = new String[dist.length];
+ for (int i = 0; i < dist.length; ++i) {
+ s[i] = tr("{0} meters", dist[i]);
+ }
+ buffer = new JList(s);
+
+ double distanceValue = Main.pref.getDouble(prefDist, dist[0]);
+ int distanceLegacyIndex = 0;
+ for (int i = 0; i < dist.length; i++) {
+ if (dist[i] == (int)distanceValue) {
+ distanceLegacyIndex = i;
+ break;
+ }
+ }
+
+ buffer.setSelectedIndex(distanceLegacyIndex);
+ add(buffer, GBC.eol());
+
+ add(new JLabel(tr("Maximum area per request:")), GBC.eol());
+ s = new String[area.length];
+ for (int i = 0; i < area.length; ++i) {
+ s[i] = tr("{0} sq km", area[i]);
+ }
+ maxRect = new JList(s);
+
+ double areaValue = Main.pref.getDouble(prefArea, area[0]);
+ int areaLegacyIndex = 0;
+ for (int i = 0; i < area.length; i++) {
+ if (area[i] == (int)areaValue) {
+ areaLegacyIndex = i;
+ break;
+ }
+ }
+
+ maxRect.setSelectedIndex(areaLegacyIndex);
+ add(maxRect, GBC.eol());
+
+ if (prefNear != null) {
+ add(new JLabel(tr("Download near:")), GBC.eol());
+ downloadNear = new JList(new String[]{tr("track only"), tr("waypoints only"), tr("track and waypoints")});
+ downloadNear.setSelectedIndex(Main.pref.getInteger(prefNear, 0));
+ add(downloadNear, GBC.eol());
+ } else {
+ downloadNear = null;
+ }
+ }
+
+ /**
+ * Gets the maximum distance in meters
+ * @return The maximum distance, in meters
+ */
+ public final double getDistance() {
+ return dist[buffer.getSelectedIndex()];
+ }
+
+ /**
+ * Gets the maximum area in squared kilometers
+ * @return The maximum distance, in squared kilometers
+ */
+ public final double getArea() {
+ return area[maxRect.getSelectedIndex()];
+ }
+
+ /**
+ * Gets the "download near" choosen value
+ * @return the "download near" choosen value (0: track only, 1: waypoints only, 2: both)
+ */
+ public final int getNear() {
+ return downloadNear.getSelectedIndex();
+ }
+
+ /**
+ * Replies true if the user selected to download OSM data
+ *
+ * @return true if the user selected to download OSM data
+ */
+ public boolean isDownloadOsmData() {
+ return cbDownloadOsmData.isSelected();
+ }
+
+ /**
+ * Replies true if the user selected to download GPX data
+ *
+ * @return true if the user selected to download GPX data
+ */
+ public boolean isDownloadGpxData() {
+ return cbDownloadGpxData.isSelected();
+ }
+
+ /**
+ * Remembers the current settings in the download panel
+ */
+ protected final void rememberSettings() {
+ Main.pref.put(prefOsm, isDownloadOsmData());
+ Main.pref.put(prefGps, isDownloadGpxData());
+ Main.pref.putDouble(prefDist, getDistance());
+ Main.pref.putDouble(prefArea, getArea());
+ if (prefNear != null) {
+ Main.pref.putInteger(prefNear, getNear());
+ }
+ }
+
+ /**
+ * Adds a change listener to comboboxes
+ * @param listener The listener that will be notified of each combobox change
+ */
+ protected final void addChangeListener(ChangeListener listener) {
+ cbDownloadGpxData.addChangeListener(listener);
+ cbDownloadOsmData.addChangeListener(listener);
+ }
+
+ /**
+ * Show this panel in a new "Download along" help-aware dialog
+ * @param title The dialog title
+ * @param helpTopic The dialog help topic
+ * @return The selected button index (0 for download, 1 for cancel, 2 for dialog closure)
+ */
+ public int showInDownloadDialog(String title, String helpTopic) {
+ final ButtonSpec[] options = new ButtonSpec[] {
+ new ButtonSpec(
+ tr("Download"),
+ ImageProvider.get("download"),
+ tr("Click to download"),
+ null // no specific help text
+ ),
+ new ButtonSpec(
+ tr("Cancel"),
+ ImageProvider.get("cancel"),
+ tr("Click to cancel"),
+ null // no specific help text
+ )
+ };
+
+ addChangeListener(new ChangeListener() {
+ @Override public void stateChanged(ChangeEvent e) {
+ options[0].setEnabled(isDownloadOsmData() || isDownloadGpxData());
+ }
+ });
+
+ int ret = HelpAwareOptionPane.showOptionDialog(Main.parent, this, title,
+ JOptionPane.QUESTION_MESSAGE, null, options, options[0], helpTopic);
+ if (0 == ret) {
+ rememberSettings();
+ }
+
+ return ret;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
index d155417..070c120 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
@@ -1,96 +1,65 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
-import java.awt.GridBagLayout;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.event.ActionEvent;
import java.awt.geom.Area;
import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Future;
-import javax.swing.AbstractAction;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
+
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList;
+import org.openstreetmap.josm.actions.DownloadAlongAction;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.tools.GBC;
-import static org.openstreetmap.josm.tools.I18n.tr;
-import org.openstreetmap.josm.tools.ImageProvider;
/**
* Action that issues a series of download requests to the API, following the GPX track.
*
* @author fred
*/
-public class DownloadAlongTrackAction extends AbstractAction {
+public class DownloadAlongTrackAction extends DownloadAlongAction {
+
static final int NEAR_TRACK = 0;
static final int NEAR_WAYPOINTS = 1;
static final int NEAR_BOTH = 2;
-
- private static final String PREF_DOWNLOAD_ALONG_TRACK_DISTANCE = "gpxLayer.downloadAlongTrack.distance";
- private static final String PREF_DOWNLOAD_ALONG_TRACK_AREA = "gpxLayer.downloadAlongTrack.area";
- private static final String PREF_DOWNLOAD_ALONG_TRACK_NEAR = "gpxLayer.downloadAlongTrack.near";
-
- private final Integer[] dist = {5000, 500, 50};
- private final Integer[] area = {20, 10, 5, 1};
-
+ private static final String PREF_DOWNLOAD_ALONG_TRACK_OSM = "downloadAlongTrack.download.osm";
+ private static final String PREF_DOWNLOAD_ALONG_TRACK_GPS = "downloadAlongTrack.download.gps";
+
+ private static final String PREF_DOWNLOAD_ALONG_TRACK_DISTANCE = "downloadAlongTrack.distance";
+ private static final String PREF_DOWNLOAD_ALONG_TRACK_AREA = "downloadAlongTrack.area";
+ private static final String PREF_DOWNLOAD_ALONG_TRACK_NEAR = "downloadAlongTrack.near";
+
private final GpxData data;
+ /**
+ * Constructs a new {@code DownloadAlongTrackAction}
+ * @param data The GPX data used to download along
+ */
public DownloadAlongTrackAction(GpxData data) {
- super(tr("Download from OSM along this track"), ImageProvider.get("downloadalongtrack"));
+ super(tr("Download from OSM along this track"), "downloadalongtrack", null, null, true);
this.data = data;
}
@Override
public void actionPerformed(ActionEvent e) {
- /*
- * build selection dialog
- */
- JPanel msg = new JPanel(new GridBagLayout());
- msg.add(new JLabel(tr("Download everything within:")), GBC.eol());
- String[] s = new String[dist.length];
- for (int i = 0; i < dist.length; ++i) {
- s[i] = tr("{0} meters", dist[i]);
- }
- JList buffer = new JList(s);
- buffer.setSelectedIndex(Main.pref.getInteger(PREF_DOWNLOAD_ALONG_TRACK_DISTANCE, 0));
- msg.add(buffer, GBC.eol());
- msg.add(new JLabel(tr("Maximum area per request:")), GBC.eol());
- s = new String[area.length];
- for (int i = 0; i < area.length; ++i) {
- s[i] = tr("{0} sq km", area[i]);
- }
- JList maxRect = new JList(s);
- maxRect.setSelectedIndex(Main.pref.getInteger(PREF_DOWNLOAD_ALONG_TRACK_AREA, 0));
- msg.add(maxRect, GBC.eol());
- msg.add(new JLabel(tr("Download near:")), GBC.eol());
- JList downloadNear = new JList(new String[]{tr("track only"), tr("waypoints only"), tr("track and waypoints")});
- downloadNear.setSelectedIndex(Main.pref.getInteger(PREF_DOWNLOAD_ALONG_TRACK_NEAR, 0));
- msg.add(downloadNear, GBC.eol());
- int ret = JOptionPane.showConfirmDialog(Main.parent, msg, tr("Download from OSM along this track"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
- switch (ret) {
- case JOptionPane.CANCEL_OPTION:
- case JOptionPane.CLOSED_OPTION:
- return;
- default:
- // continue
+
+ final DownloadAlongPanel panel = new DownloadAlongPanel(
+ PREF_DOWNLOAD_ALONG_TRACK_OSM, PREF_DOWNLOAD_ALONG_TRACK_GPS,
+ PREF_DOWNLOAD_ALONG_TRACK_DISTANCE, PREF_DOWNLOAD_ALONG_TRACK_AREA, PREF_DOWNLOAD_ALONG_TRACK_NEAR);
+
+ if (0 != panel.showInDownloadDialog(tr("Download from OSM along this track"), HelpUtil.ht("/Action/DownloadAlongTrack"))) {
+ return;
}
- Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_DISTANCE, buffer.getSelectedIndex());
- Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_AREA, maxRect.getSelectedIndex());
- final int near = downloadNear.getSelectedIndex();
- Main.pref.putInteger(PREF_DOWNLOAD_ALONG_TRACK_NEAR, near);
+
+ final int near = panel.getNear();
+
/*
* Find the average latitude for the data we're contemplating, so we can know how many
* metres per degree of longitude we have.
@@ -121,10 +90,8 @@ public class DownloadAlongTrackAction extends AbstractAction {
* soon as you touch any built-up area, that kind of bounding box will download forever
* and then stop because it has more than 50k nodes.
*/
- Integer i = buffer.getSelectedIndex();
- final int buffer_dist = dist[i < 0 ? 0 : i];
- i = maxRect.getSelectedIndex();
- final double max_area = area[i < 0 ? 0 : i] / 10000.0 / scale;
+ final double buffer_dist = panel.getDistance();
+ final double max_area = panel.getArea() / 10000.0 / scale;
final double buffer_y = buffer_dist / 100000.0;
final double buffer_x = buffer_y / scale;
final int totalTicks = latcnt;
@@ -156,7 +123,8 @@ public class DownloadAlongTrackAction extends AbstractAction {
if (cancel) {
return;
}
- confirmAndDownloadAreas(a, max_area, progressMonitor);
+ confirmAndDownloadAreas(a, max_area, panel.isDownloadOsmData(), panel.isDownloadGpxData(),
+ tr("Download from OSM along this track"), progressMonitor);
}
/**
@@ -218,86 +186,4 @@ public class DownloadAlongTrackAction extends AbstractAction {
}
Main.worker.submit(new CalculateDownloadArea());
}
-
- /**
- * Area "a" contains the hull that we would like to download data for. however we
- * can only download rectangles, so the following is an attempt at finding a number of
- * rectangles to download.
- *
- * The idea is simply: Start out with the full bounding box. If it is too large, then
- * split it in half and repeat recursively for each half until you arrive at something
- * small enough to download. The algorithm is improved by always using the intersection
- * between the rectangle and the actual desired area. For example, if you have a track
- * that goes like this: +----+ | /| | / | | / | |/ | +----+ then we would first look at
- * downloading the whole rectangle (assume it's too big), after that we split it in half
- * (upper and lower half), but we donot request the full upper and lower rectangle, only
- * the part of the upper/lower rectangle that actually has something in it.
- *
- * This functions calculates the rectangles, asks the user to continue and downloads
- * the areas if applicable.
- */
- private void confirmAndDownloadAreas(Area a, double max_area, ProgressMonitor progressMonitor) {
- List<Rectangle2D> toDownload = new ArrayList<Rectangle2D>();
- addToDownload(a, a.getBounds(), toDownload, max_area);
- if (toDownload.isEmpty()) {
- return;
- }
- JPanel msg = new JPanel(new GridBagLayout());
- msg.add(new JLabel(tr("<html>This action will require {0} individual<br>" + "download requests. Do you wish<br>to continue?</html>", toDownload.size())), GBC.eol());
- if (toDownload.size() > 1) {
- int ret = JOptionPane.showConfirmDialog(Main.parent, msg, tr("Download from OSM along this track"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
- switch (ret) {
- case JOptionPane.CANCEL_OPTION:
- case JOptionPane.CLOSED_OPTION:
- return;
- default:
- // continue
- }
- }
- final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
- final Future<?> future = new DownloadOsmTaskList().download(false, toDownload, monitor);
- Main.worker.submit(new Runnable() {
- @Override
- public void run() {
- try {
- future.get();
- } catch (Exception e) {
- e.printStackTrace();
- return;
- }
- monitor.close();
- }
- });
- }
-
- private static void addToDownload(Area a, Rectangle2D r, Collection<Rectangle2D> results, double max_area) {
- Area tmp = new Area(r);
- // intersect with sought-after area
- tmp.intersect(a);
- if (tmp.isEmpty()) {
- return;
- }
- Rectangle2D bounds = tmp.getBounds2D();
- if (bounds.getWidth() * bounds.getHeight() > max_area) {
- // the rectangle gets too large; split it and make recursive call.
- Rectangle2D r1;
- Rectangle2D r2;
- if (bounds.getWidth() > bounds.getHeight()) {
- // rectangles that are wider than high are split into a left and right half,
- r1 = new Rectangle2D.Double(bounds.getX(), bounds.getY(), bounds.getWidth() / 2, bounds.getHeight());
- r2 = new Rectangle2D.Double(bounds.getX() + bounds.getWidth() / 2, bounds.getY(),
- bounds.getWidth() / 2, bounds.getHeight());
- } else {
- // others into a top and bottom half.
- r1 = new Rectangle2D.Double(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight() / 2);
- r2 = new Rectangle2D.Double(bounds.getX(), bounds.getY() + bounds.getHeight() / 2, bounds.getWidth(),
- bounds.getHeight() / 2);
- }
- addToDownload(a, r1, results, max_area);
- addToDownload(a, r2, results, max_area);
- } else {
- results.add(bounds);
- }
- }
-
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
index 2d5973e..79b85b7 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
@@ -1,10 +1,14 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+
import javax.swing.AbstractAction;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
@@ -29,17 +33,16 @@ import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.xml.sax.SAXException;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
public class DownloadWmsAlongTrackAction extends AbstractAction {
private final GpxData data;
-
+
public DownloadWmsAlongTrackAction(final GpxData data) {
super(tr("Precache imagery tiles along this track"), ImageProvider.get("downloadalongtrack"));
this.data = data;
}
+ @Override
public void actionPerformed(ActionEvent e) {
final List<LatLon> points = new ArrayList<LatLon>();
for (GpxTrack trk : data.tracks) {
@@ -66,7 +69,7 @@ public class DownloadWmsAlongTrackAction extends AbstractAction {
try {
wait(200);
} catch (InterruptedException e) {
- e.printStackTrace();
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" while precaching WMS");
}
}
}
@@ -115,5 +118,5 @@ public class DownloadWmsAlongTrackAction extends AbstractAction {
protected void warnNoImageryLayers() {
JOptionPane.showMessageDialog(Main.parent, tr("There are no imagery layers."), tr("No imagery layers"), JOptionPane.WARNING_MESSAGE);
}
-
+
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
index d4931be..c4dcf2b 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
@@ -1,5 +1,9 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.event.ActionEvent;
import java.io.File;
import java.net.MalformedURLException;
@@ -9,6 +13,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+
import javax.swing.AbstractAction;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
@@ -21,23 +26,28 @@ import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.tools.AudioUtil;
import org.openstreetmap.josm.tools.ImageProvider;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
+/**
+ * Import audio files into a GPX layer to enable audio playback functions.
+ * @since 5715
+ */
public class ImportAudioAction extends AbstractAction {
private final GpxLayer layer;
-
+
private static class Markers {
public boolean timedMarkersOmitted = false;
public boolean untimedMarkersOmitted = false;
}
+ /**
+ * Constructs a new {@code ImportAudioAction}.
+ * @param layer The associated GPX layer
+ */
public ImportAudioAction(final GpxLayer layer) {
super(tr("Import Audio"), ImageProvider.get("importaudio"));
this.layer = layer;
@@ -80,13 +90,13 @@ public class ImportAudioAction extends AbstractAction {
});
}
String names = null;
- for (int i = 0; i < sel.length; i++) {
+ for (File file : sel) {
if (names == null) {
names = " (";
} else {
names += ", ";
}
- names += sel[i].getName();
+ names += file.getName();
}
if (names != null) {
names += ")";
@@ -96,15 +106,15 @@ public class ImportAudioAction extends AbstractAction {
MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", layer.getName()) + names, layer.getAssociatedFile(), layer);
double firstStartTime = sel[0].lastModified() / 1000.0 - AudioUtil.getCalibratedDuration(sel[0]);
Markers m = new Markers();
- for (int i = 0; i < sel.length; i++) {
- importAudio(sel[i], ml, firstStartTime, m);
+ for (File file : sel) {
+ importAudio(file, ml, firstStartTime, m);
}
Main.main.addLayer(ml);
Main.map.repaint();
}
}
-
- /**
+
+ /**
* Makes a new marker layer derived from this GpxLayer containing at least one audio marker
* which the given audio file is associated with. Markers are derived from the following (a)
* explict waypoints in the GPX layer, or (b) named trackpoints in the GPX layer, or (d)
@@ -120,7 +130,7 @@ public class ImportAudioAction extends AbstractAction {
try {
url = wavFile.toURI().toURL();
} catch (MalformedURLException e) {
- System.err.println("Unable to convert filename " + wavFile.getAbsolutePath() + " to URL");
+ Main.error("Unable to convert filename " + wavFile.getAbsolutePath() + " to URL");
}
Collection<WayPoint> waypoints = new ArrayList<WayPoint>();
boolean timedMarkersOmitted = false;
@@ -212,7 +222,7 @@ public class ImportAudioAction extends AbstractAction {
double duration = AudioUtil.getCalibratedDuration(wavFile);
double startTime = lastModified - duration;
startTime = firstStartTime + (startTime - firstStartTime)
- / Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */);
+ / Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
WayPoint w1 = null;
WayPoint w2 = null;
@@ -238,7 +248,7 @@ public class ImportAudioAction extends AbstractAction {
(startTime - w1.time) / (w2.time - w1.time)));
wayPointFromTimeStamp.time = startTime;
String name = wavFile.getName();
- int dot = name.lastIndexOf(".");
+ int dot = name.lastIndexOf('.');
if (dot > 0) {
name = name.substring(0, dot);
}
@@ -313,6 +323,4 @@ public class ImportAudioAction extends AbstractAction {
markers.untimedMarkersOmitted = untimedMarkersOmitted;
}
}
-
-
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
index ff17f52..396e2d9 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
@@ -1,8 +1,14 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.event.ActionEvent;
import java.io.File;
import java.util.LinkedList;
+import java.util.List;
+
import javax.swing.AbstractAction;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
@@ -15,9 +21,6 @@ import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
import org.openstreetmap.josm.io.JpgImporter;
import org.openstreetmap.josm.tools.ImageProvider;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
public class ImportImagesAction extends AbstractAction {
private final GpxLayer layer;
@@ -32,7 +35,7 @@ public class ImportImagesAction extends AbstractAction {
HelpAwareOptionPane.showOptionDialog(Main.parent, msg, tr("Import not possible"), JOptionPane.WARNING_MESSAGE, ht("/Action/ImportImages#CantImportIntoGpxLayerFromServer"));
}
- private void addRecursiveFiles(LinkedList<File> files, File[] sel) {
+ private void addRecursiveFiles(List<File> files, File[] sel) {
for (File f : sel) {
if (f.isDirectory()) {
addRecursiveFiles(files, f.listFiles());
@@ -59,5 +62,5 @@ public class ImportImagesAction extends AbstractAction {
}
}
}
-
+
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
index 2299dfb..df925a0 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
@@ -1,6 +1,11 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.gpx;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.event.ActionEvent;
+
import javax.swing.AbstractAction;
import org.openstreetmap.josm.Main;
@@ -8,14 +13,10 @@ import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxTrack;
import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.tools.ImageProvider;
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-
-
public class MarkersFromNamedPointsAction extends AbstractAction {
private final GpxLayer layer;
@@ -38,9 +39,9 @@ public class MarkersFromNamedPointsAction extends AbstractAction {
}
}
MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer);
- if (ml.data.size() > 0) {
+ if (!ml.data.isEmpty()) {
Main.main.addLayer(ml);
}
}
-
+
}
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
index 95ef769..5f31b34 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.markerlayer;
import java.awt.event.ActionEvent;
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
index 0cc5ebb..138117a 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.markerlayer;
import java.awt.Graphics;
@@ -48,7 +48,7 @@ public class ButtonMarker extends Marker {
}
Point screen = mv.getPoint(getEastNorth());
buttonRectangle.setLocation(screen.x+4, screen.y+2);
- symbol.paintIcon(mv, g, screen.x+4, screen.y+2);
+ paintIcon(mv, g, screen.x+4, screen.y+2);
Border b;
Point mousePosition = mv.getMousePosition();
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
index 7b45a22..bac0d97 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.markerlayer;
import java.awt.BorderLayout;
@@ -54,6 +54,7 @@ public class ImageMarker extends ButtonMarker {
p2.add(scale);
p.add(p2, BorderLayout.SOUTH);
scale.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent ev) {
p.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
if (scale.getModel().isSelected()) {
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
index b1b44f3..7b98f48 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
@@ -1,9 +1,13 @@
-// License: GPL. Copyright 2008 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.markerlayer;
+import java.awt.AlphaComposite;
+import java.awt.Color;
import java.awt.Graphics;
+import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.event.ActionEvent;
+import java.awt.image.BufferedImage;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
@@ -18,7 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import javax.swing.Icon;
+import javax.swing.ImageIcon;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
@@ -76,7 +80,7 @@ import org.openstreetmap.josm.tools.template_engine.TemplateParser;
*/
public class Marker implements TemplateEngineDataProvider {
- public static class TemplateEntryProperty extends CachedProperty<TemplateEntry> {
+ public static final class TemplateEntryProperty extends CachedProperty<TemplateEntry> {
// This class is a bit complicated because it supports both global and per layer settings. I've added per layer settings because
// GPXSettingsPanel had possibility to set waypoint label but then I've realized that markers use different layer then gpx data
// so per layer settings is useless. Anyway it's possible to specify marker layer pattern in Einstein preferences and maybe somebody
@@ -228,7 +232,9 @@ public class Marker implements TemplateEngineDataProvider {
try {
double syncOffset = Double.parseDouble(exts.get("sync-offset"));
audioMarker.syncOffset = syncOffset;
- } catch (NumberFormatException nfe) {}
+ } catch (NumberFormatException nfe) {
+ Main.warn(nfe);
+ }
}
return audioMarker;
} else if (url.toString().endsWith(".png") || url.toString().endsWith(".jpg") || url.toString().endsWith(".jpeg") || url.toString().endsWith(".gif")) {
@@ -278,23 +284,25 @@ public class Marker implements TemplateEngineDataProvider {
private final TemplateEngineDataProvider dataProvider;
private final String text;
- public final Icon symbol;
+ protected final ImageIcon symbol;
+ private BufferedImage redSymbol = null;
public final MarkerLayer parentLayer;
- public double time; /* absolute time of marker in seconds since epoch */
- public double offset; /* time offset in seconds from the gpx point from which it was derived,
- may be adjusted later to sync with other data, so not final */
+ /** Absolute time of marker in seconds since epoch */
+ public double time;
+ /** Time offset in seconds from the gpx point from which it was derived, may be adjusted later to sync with other data, so not final */
+ public double offset;
private String cachedText;
private int textVersion = -1;
private CachedLatLon coor;
+
+ private boolean erroneous = false;
public Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String iconName, MarkerLayer parentLayer, double time, double offset) {
setCoor(ll);
this.offset = offset;
this.time = time;
- // /* ICON(markers/) */"Bridge"
- // /* ICON(markers/) */"Crossing"
this.symbol = iconName != null ? ImageProvider.getIfAvailable("markers",iconName) : null;
this.parentLayer = parentLayer;
@@ -307,8 +315,6 @@ public class Marker implements TemplateEngineDataProvider {
this.offset = offset;
this.time = time;
- // /* ICON(markers/) */"Bridge"
- // /* ICON(markers/) */"Crossing"
this.symbol = iconName != null ? ImageProvider.getIfAvailable("markers",iconName) : null;
this.parentLayer = parentLayer;
@@ -320,7 +326,7 @@ public class Marker implements TemplateEngineDataProvider {
* Convert Marker to WayPoint so it can be exported to a GPX file.
*
* Override in subclasses to add all necessary attributes.
- *
+ *
* @return the corresponding WayPoint with all relevant attributes
*/
public WayPoint convertToWayPoint() {
@@ -339,27 +345,38 @@ public class Marker implements TemplateEngineDataProvider {
return wpt;
}
+ /**
+ * Sets the marker's coordinates.
+ * @param coor The marker's coordinates (lat/lon)
+ */
public final void setCoor(LatLon coor) {
- if(this.coor == null) {
- this.coor = new CachedLatLon(coor);
- } else {
- this.coor.setCoor(coor);
- }
+ this.coor = new CachedLatLon(coor);
}
+ /**
+ * Returns the marker's coordinates.
+ * @return The marker's coordinates (lat/lon)
+ */
public final LatLon getCoor() {
return coor;
}
+ /**
+ * Sets the marker's projected coordinates.
+ * @param eastNorth The marker's projected coordinates (easting/northing)
+ */
public final void setEastNorth(EastNorth eastNorth) {
- coor.setEastNorth(eastNorth);
+ this.coor = new CachedLatLon(eastNorth);
}
+ /**
+ * Returns the marker's projected coordinates.
+ * @return The marker's projected coordinates (easting/northing)
+ */
public final EastNorth getEastNorth() {
return coor.getEastNorth();
}
-
/**
* Checks whether the marker display area contains the given point.
* Markers not interested in mouse clicks may always return false.
@@ -380,7 +397,6 @@ public class Marker implements TemplateEngineDataProvider {
public void actionPerformed(ActionEvent ev) {
}
-
/**
* Paints the marker.
* @param g graphics context
@@ -391,7 +407,7 @@ public class Marker implements TemplateEngineDataProvider {
public void paint(Graphics g, MapView mv, boolean mousePressed, boolean showTextOrIcon) {
Point screen = mv.getPoint(getEastNorth());
if (symbol != null && showTextOrIcon) {
- symbol.paintIcon(mv, g, screen.x-symbol.getIconWidth()/2, screen.y-symbol.getIconHeight()/2);
+ paintIcon(mv, g, screen.x-symbol.getIconWidth()/2, screen.y-symbol.getIconHeight()/2);
} else {
g.drawLine(screen.x-2, screen.y-2, screen.x+2, screen.y+2);
g.drawLine(screen.x+2, screen.y-2, screen.x-2, screen.y+2);
@@ -402,7 +418,26 @@ public class Marker implements TemplateEngineDataProvider {
g.drawString(labelText, screen.x+4, screen.y+2);
}
}
-
+
+ protected void paintIcon(MapView mv, Graphics g, int x, int y) {
+ if (!erroneous) {
+ symbol.paintIcon(mv, g, x, y);
+ } else {
+ if (redSymbol == null) {
+ int width = symbol.getIconWidth();
+ int height = symbol.getIconHeight();
+
+ redSymbol = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+ Graphics2D gbi = redSymbol.createGraphics();
+ gbi.drawImage(symbol.getImage(), 0, 0, null);
+ gbi.setColor(Color.RED);
+ gbi.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, 0.666f));
+ gbi.fillRect(0, 0, width, height);
+ gbi.dispose();
+ }
+ g.drawImage(redSymbol, x, y, mv);
+ }
+ }
protected TemplateEntryProperty getTextTemplate() {
return TemplateEntryProperty.forMarker(parentLayer.getName());
@@ -468,4 +503,25 @@ public class Marker implements TemplateEngineDataProvider {
public boolean evaluateCondition(Match condition) {
throw new UnsupportedOperationException();
}
+
+ /**
+ * Determines if this marker is erroneous.
+ * @return {@code true} if this markers has any kind of error, {@code false} otherwise
+ * @since 6299
+ */
+ public final boolean isErroneous() {
+ return erroneous;
+ }
+
+ /**
+ * Sets this marker erroneous or not.
+ * @param erroneous {@code true} if this markers has any kind of error, {@code false} otherwise
+ * @since 6299
+ */
+ public final void setErroneous(boolean erroneous) {
+ this.erroneous = erroneous;
+ if (!erroneous) {
+ redSymbol = null;
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
index 0c30d00..d447be4 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.markerlayer;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -14,7 +14,8 @@ import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.File;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -70,11 +71,6 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
public GpxLayer fromLayer = null;
private Marker currentMarker;
- @Deprecated
- public MarkerLayer(GpxData indata, String name, File associatedFile, GpxLayer fromLayer, boolean addMouseHandlerInConstructor) {
- this(indata, name, associatedFile, fromLayer);
- }
-
public MarkerLayer(GpxData indata, String name, File associatedFile, GpxLayer fromLayer) {
super(name);
this.setAssociatedFile(associatedFile);
@@ -118,7 +114,9 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
if (exts != null && exts.containsKey("offset")) {
try {
offset = Double.parseDouble(exts.get("offset"));
- } catch (NumberFormatException nfe) {}
+ } catch (NumberFormatException nfe) {
+ Main.warn(nfe);
+ }
}
if (offset == null) {
offset = time - firstTime;
@@ -256,7 +254,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
components.add(new RenameLayerAction(getAssociatedFile(), this));
components.add(SeparatorLayerAction.INSTANCE);
components.add(new LayerListPopup.InfoAction(this));
- return components.toArray(new Action[0]);
+ return components.toArray(new Action[components.size()]);
}
public boolean synchronizeAudioMarkers(AudioMarker startMarker) {
@@ -278,17 +276,23 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
// apply adjustment to all subsequent audio markers in the layer
double adjustment = AudioPlayer.position() - startMarker.offset; // in seconds
boolean seenStart = false;
- URL url = startMarker.url();
- for (Marker m : data) {
- if (m == startMarker) {
- seenStart = true;
- }
- if (seenStart) {
- AudioMarker ma = (AudioMarker) m; // it must be an AudioMarker
- if (ma.url().equals(url)) {
- ma.adjustOffset(adjustment);
+ try {
+ URI uri = startMarker.url().toURI();
+ for (Marker m : data) {
+ if (m == startMarker) {
+ seenStart = true;
+ }
+ if (seenStart && m instanceof AudioMarker) {
+ AudioMarker ma = (AudioMarker) m;
+ // Do not ever call URL.equals but use URI.equals instead to avoid Internet connection
+ // See http://michaelscharf.blogspot.fr/2006/11/javaneturlequals-and-hashcode-make.html for details
+ if (ma.url().toURI().equals(uri)) {
+ ma.adjustOffset(adjustment);
+ }
}
}
+ } catch (URISyntaxException e) {
+ Main.warn(e);
}
return true;
}
@@ -347,6 +351,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
return ret;
}
+ @Override
public void jumpToNextMarker() {
if (currentMarker == null) {
currentMarker = data.get(0);
@@ -364,6 +369,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
Main.map.mapView.zoomTo(currentMarker.getEastNorth());
}
+ @Override
public void jumpToPreviousMarker() {
if (currentMarker == null) {
currentMarker = data.get(data.size() - 1);
@@ -425,7 +431,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
private static void playAdjacentMarker(Marker startMarker, boolean next) {
Marker m = null;
- if (Main.map == null || Main.map.mapView == null)
+ if (!Main.isDisplayingMapView())
return;
Layer l = Main.map.mapView.getActiveLayer();
if(l != null) {
@@ -466,6 +472,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
}
+ @Override
public void actionPerformed(ActionEvent e) {
Main.pref.put("marker.show "+layer.getName(), layer.isTextOrIconShown() ? "hide" : "show");
Main.map.mapView.repaint();
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
index 6113657..d3b3980 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.markerlayer;
import java.io.File;
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
index 29fb6ce..864b5f0 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
@@ -31,14 +31,12 @@ import org.openstreetmap.josm.tools.AudioPlayer;
* Singleton marker class to track position of audio.
*
* @author David Earl<david at frankieandshadow.com>
- *
+ * @since 572
*/
-public class PlayHeadMarker extends Marker {
+public final class PlayHeadMarker extends Marker {
private Timer timer = null;
private double animationInterval = 0.0; // seconds
- // private Rectangle audioTracer = null;
- // private Icon audioTracerIcon = null;
static private PlayHeadMarker playHead = null;
private MapMode oldMode = null;
private LatLon oldCoor;
@@ -46,6 +44,10 @@ public class PlayHeadMarker extends Marker {
private boolean wasPlaying = false;
private int dropTolerance; /* pixels */
+ /**
+ * Returns the unique instance of {@code PlayHeadMarker}.
+ * @return The unique instance of {@code PlayHeadMarker}.
+ */
public static PlayHeadMarker create() {
if (playHead == null) {
try {
@@ -263,17 +265,26 @@ public class PlayHeadMarker extends Marker {
}
}
- public void paint(Graphics g, MapView mv /*, boolean mousePressed */) {
+ /**
+ * Paint the marker icon in the given graphics context.
+ * @param g The graphics context
+ * @param mv The map
+ */
+ public void paint(Graphics g, MapView mv) {
if (time < 0.0) return;
Point screen = mv.getPoint(getEastNorth());
- symbol.paintIcon(mv, g, screen.x, screen.y);
+ paintIcon(mv, g, screen.x, screen.y);
}
+ /**
+ * Animates the marker along the track.
+ */
public void animate() {
if (! enabled) return;
if (timer == null) {
- animationInterval = Double.parseDouble(Main.pref.get("marker.audioanimationinterval", "1")); //milliseconds
+ animationInterval = Main.pref.getDouble("marker.audioanimationinterval", 1.0); //milliseconds
timer = new Timer((int)(animationInterval * 1000.0), new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
timerAction();
}
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
index d2b2399..0ed79b4 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
@@ -1,9 +1,10 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.markerlayer;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
+import java.io.File;
import java.net.URL;
import java.util.Collections;
@@ -14,6 +15,8 @@ import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.gpx.GpxConstants;
import org.openstreetmap.josm.data.gpx.GpxLink;
import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.OpenBrowser;
/**
@@ -24,21 +27,26 @@ import org.openstreetmap.josm.tools.OpenBrowser;
*/
public class WebMarker extends ButtonMarker {
- public final URL webUrl;
+ private final URL webUrl;
public WebMarker(LatLon ll, URL webUrl, MarkerLayer parentLayer, double time, double offset) {
super(ll, "web.png", parentLayer, time, offset);
+ CheckParameterUtil.ensureParameterNotNull(webUrl, "webUrl");
this.webUrl = webUrl;
}
@Override public void actionPerformed(ActionEvent ev) {
String error = OpenBrowser.displayUrl(webUrl.toString());
if (error != null) {
- JOptionPane.showMessageDialog(Main.parent,
- "<html><b>" +
- tr("There was an error while trying to display the URL for this marker") +
- "</b><br>" + tr("(URL was: ") + webUrl.toString() + ")" + "<br>" + error,
- tr("Error displaying URL"), JOptionPane.ERROR_MESSAGE);
+ setErroneous(true);
+ new Notification(
+ "<b>" + tr("There was an error while trying to display the URL for this marker") + "</b><br>" +
+ tr("(URL was: ") + webUrl.toString() + ")" + "<br>" + error)
+ .setIcon(JOptionPane.ERROR_MESSAGE)
+ .setDuration(Notification.TIME_LONG)
+ .show();
+ } else {
+ updateErroneous();
}
}
@@ -50,4 +58,18 @@ public class WebMarker extends ButtonMarker {
wpt.attr.put(GpxConstants.META_LINKS, Collections.singleton(link));
return wpt;
}
+
+ private final void updateErroneous() {
+ if ("file".equals(webUrl.getProtocol())) {
+ String path = webUrl.getPath();
+ try {
+ setErroneous(path.isEmpty() || !new File(path).exists());
+ } catch (Exception e) {
+ Main.warn(e);
+ setErroneous(true);
+ }
+ } else {
+ setErroneous(false);
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
index d3d460d..1e61ef0 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
@@ -68,7 +68,7 @@ public class BoxTextElemStyle extends ElemStyle {
@Override
public boolean equals(Object obj) {
- if (obj == null || !(obj instanceof BoxProvider))
+ if (!(obj instanceof BoxProvider))
return false;
final BoxProvider other = (BoxProvider) obj;
BoxProviderResult resultOther = other.get();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/Cascade.java b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
index fb4b838..0a9107a 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
@@ -10,15 +10,15 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
-import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
import org.openstreetmap.josm.tools.Utils;
/**
* Simple map of properties with dynamic typing.
*/
-public class Cascade implements Cloneable {
-
+public final class Cascade implements Cloneable {
+
public static final Cascade EMPTY_CASCADE = new Cascade();
protected Map<String, Object> prop = new HashMap<String, Object>();
@@ -28,7 +28,7 @@ public class Cascade implements Cloneable {
public <T> T get(String key, T def, Class<T> klass) {
return get(key, def, klass, false);
}
-
+
/**
* Get value for the given key
* @param <T> the expected type
@@ -49,7 +49,7 @@ public class Cascade implements Cloneable {
T res = convertTo(o, klass);
if (res == null) {
if (!suppressWarnings) {
- System.err.println(String.format("Warning: unable to convert property %s to type %s: found %s of type %s!", key, klass, o, o.getClass()));
+ Main.warn(String.format("Unable to convert property %s to type %s: found %s of type %s!", key, klass, o, o.getClass()));
}
return def;
} else
@@ -120,11 +120,11 @@ public class Cascade implements Cloneable {
return new Float((Double) o);
if (o instanceof Integer)
return new Float((Integer) o);
- if (o instanceof String) {
+ if (o instanceof String && !((String) o).isEmpty()) {
try {
- float f = Float.parseFloat((String) o);
- return f;
+ return Float.parseFloat((String) o);
} catch (NumberFormatException e) {
+ Main.debug("'"+o+"' cannot be converted to float");
}
}
return null;
@@ -147,7 +147,7 @@ public class Cascade implements Cloneable {
if (o instanceof float[])
return (float[]) o;
if (o instanceof List) {
- List l = (List) o;
+ List<?> l = (List<?>) o;
float[] a = new float[l.size()];
for (int i=0; i<l.size(); ++i) {
Float f = toFloat(l.get(i));
@@ -182,7 +182,7 @@ public class Cascade implements Cloneable {
@Override
public Cascade clone() {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
HashMap<String, Object> clonedProp = (HashMap) ((HashMap) this.prop).clone();
Cascade c = new Cascade();
c.prop = clonedProp;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
index a020b5a..bfce617 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
@@ -15,6 +15,9 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
abstract public class ElemStyle implements StyleKeys {
+ protected static final String[] ICON_KEYS = {"icon-image", "icon-width", "icon-height", "icon-opacity"};
+ protected static final String[] REPEAT_IMAGE_KEYS = {"repeat-image", "repeat-image-width", "repeat-image-height", "repeat-image-opacity"};
+
public float major_z_index;
public float z_index;
public float object_z_index;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
index db84c96..da36e0b 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
@@ -29,8 +29,10 @@ public class ElemStyles {
private boolean defaultNodes, defaultLines;
private int defaultNodesIdx, defaultLinesIdx;
- public ElemStyles()
- {
+ /**
+ * Constructs a new {@code ElemStyles}.
+ */
+ public ElemStyles() {
styleSources = new ArrayList<StyleSource>();
}
@@ -47,8 +49,8 @@ public class ElemStyles {
*
* @param osm the primitive
* @param scale the scale (in meters per 100 pixel)
- * @param nc
- * @return
+ * @param nc display component
+ * @return list of styles
*/
public StyleList get(OsmPrimitive osm, double scale, NavigatableComponent nc) {
return getStyleCacheWithRange(osm, scale, nc).a;
@@ -111,7 +113,15 @@ public class ElemStyles {
p.a = new StyleList(p.a, line);
}
}
- osm.mappaintStyle = osm.mappaintStyle.put(p.a, p.b);
+ StyleCache style = osm.mappaintStyle != null ? osm.mappaintStyle : StyleCache.EMPTY_STYLECACHE;
+ try {
+ osm.mappaintStyle = style.put(p.a, p.b);
+ } catch (StyleCache.RangeViolatedError e) {
+ AssertionError error = new AssertionError("Range violated. object: " + osm.getPrimitiveId() + ", current style: "+osm.mappaintStyle
+ + ", scale: " + scale + ", new stylelist: " + p.a + ", new range: " + p.b);
+ error.initCause(e);
+ throw error;
+ }
osm.mappaintCacheIdx = cacheIdx;
return p;
}
@@ -234,6 +244,7 @@ public class ElemStyles {
for (ElemStyle s : p.a) {
if (s.isProperLineStyle() || s instanceof AreaElemStyle) {
hasIndependentElemStyle = true;
+ break;
}
}
if (!hasIndependentElemStyle && !multipolygon.getOuterWays().isEmpty()) {
@@ -312,6 +323,7 @@ public class ElemStyles {
if (osm instanceof Way) {
addIfNotNull(sl, AreaElemStyle.create(c));
addIfNotNull(sl, LinePatternElemStyle.create(env));
+ addIfNotNull(sl, RepeatImageElemStyle.create(env));
addIfNotNull(sl, LineElemStyle.createLine(env));
addIfNotNull(sl, LineElemStyle.createLeftCasing(env));
addIfNotNull(sl, LineElemStyle.createRightCasing(env));
@@ -329,6 +341,7 @@ public class ElemStyles {
if (((Relation)osm).isMultipolygon()) {
addIfNotNull(sl, AreaElemStyle.create(c));
addIfNotNull(sl, LinePatternElemStyle.create(env));
+ addIfNotNull(sl, RepeatImageElemStyle.create(env));
addIfNotNull(sl, LineElemStyle.createLine(env));
addIfNotNull(sl, LineElemStyle.createCasing(env));
addIfNotNull(sl, LineTextElemStyle.create(env));
@@ -436,7 +449,7 @@ public class ElemStyles {
* @param pretendWayIsClosed For styles that require the way to be closed,
* we pretend it is. This is useful for generating area styles from the (segmented)
* outer ways of a multipolygon.
- * @return {@code true} iff primitive has an AreaElemStyle
+ * @return {@code true} if primitive has an AreaElemStyle
*/
public static boolean hasAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
return getAreaElemStyle(p, pretendWayIsClosed) != null;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/Environment.java b/src/org/openstreetmap/josm/gui/mappaint/Environment.java
index ade1c24..00794e3 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/Environment.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/Environment.java
@@ -22,10 +22,11 @@ public class Environment {
private Context context = Context.PRIMITIVE;
/**
- * If not null, this is the matching parent object if an condition or an expression
+ * If not null, this is the matching parent object if a condition or an expression
* is evaluated in a {@link LinkSelector} (within a child selector)
*/
public OsmPrimitive parent;
+
/**
* The same for parent selector. Only one of the 2 fields (parent or child) is not null in any environment.
*/
@@ -37,10 +38,13 @@ public class Environment {
public Integer index = null;
/**
- * Creates a new uninitialized environment
+ * Creates a new uninitialized environment.
*/
public Environment() {}
+ /**
+ * Creates a new environment.
+ */
public Environment(OsmPrimitive osm, MultiCascade mc, String layer, StyleSource source) {
this.osm = osm;
this.mc = mc;
@@ -49,11 +53,12 @@ public class Environment {
}
/**
- * Creates a clone of the environment {@code other}
- *
+ * Creates a clone of the environment {@code other}.
+ *
* @param other the other environment. Must not be null.
+ * @throws IllegalArgumentException if {@code param} is {@code null}
*/
- public Environment(Environment other) throws IllegalArgumentException{
+ public Environment(Environment other) throws IllegalArgumentException {
CheckParameterUtil.ensureParameterNotNull(other);
this.osm = other.osm;
this.mc = other.mc;
@@ -65,53 +70,127 @@ public class Environment {
this.context = other.getContext();
}
+ /**
+ * Creates a clone of this environment, with the specified primitive.
+ * @return A clone of this environment, with the specified primitive
+ * @see #osm
+ */
public Environment withPrimitive(OsmPrimitive osm) {
Environment e = new Environment(this);
e.osm = osm;
return e;
}
+ /**
+ * Creates a clone of this environment, with the specified parent.
+ * @param parent the matching parent object
+ * @return A clone of this environment, with the specified parent
+ * @see #parent
+ */
public Environment withParent(OsmPrimitive parent) {
Environment e = new Environment(this);
e.parent = parent;
return e;
}
+ /**
+ * Creates a clone of this environment, with the specified parent, index, and context set to {@link Context#LINK}.
+ * @param parent the matching parent object
+ * @param index index of node in parent way or member in parent relation
+ * @return A clone of this environment, with the specified parent, index, and context set to {@link Context#LINK}
+ * @since 6175
+ * @see #parent
+ * @see #index
+ */
+ public Environment withParentAndIndexAndLinkContext(OsmPrimitive parent, int index) {
+ Environment e = new Environment(this);
+ e.parent = parent;
+ e.index = index;
+ e.context = Context.LINK;
+ return e;
+ }
+
+ /**
+ * Creates a clone of this environment, with the specified child.
+ * @param child the matching child object
+ * @return A clone of this environment, with the specified child
+ * @see #child
+ */
public Environment withChild(OsmPrimitive child) {
Environment e = new Environment(this);
e.child = child;
return e;
}
+ /**
+ * Creates a clone of this environment, with the specified child, index, and context set to {@link Context#LINK}.
+ * @param child the matching child object
+ * @param index index of node in parent way or member in parent relation
+ * @return A clone of this environment, with the specified child, index, and context set to {@code Context#LINK}
+ * @since 6175
+ * @see #child
+ * @see #index
+ */
+ public Environment withChildAndIndexAndLinkContext(OsmPrimitive child, int index) {
+ Environment e = new Environment(this);
+ e.child = child;
+ e.index = index;
+ e.context = Context.LINK;
+ return e;
+ }
+
+ /**
+ * Creates a clone of this environment, with the specified index.
+ * @param index index of node in parent way or member in parent relation
+ * @return A clone of this environment, with the specified index
+ * @see #index
+ */
public Environment withIndex(int index) {
Environment e = new Environment(this);
e.index = index;
return e;
}
+ /**
+ * Creates a clone of this environment, with the specified {@link Context}.
+ * @return A clone of this environment, with the specified {@code Context}
+ */
public Environment withContext(Context context) {
Environment e = new Environment(this);
e.context = context == null ? Context.PRIMITIVE : context;
return e;
}
+ /**
+ * Creates a clone of this environment, with context set to {@link Context#LINK}.
+ * @return A clone of this environment, with context set to {@code Context#LINK}
+ */
public Environment withLinkContext() {
Environment e = new Environment(this);
e.context = Context.LINK;
return e;
}
+ /**
+ * Determines if the context of this environment is {@link Context#LINK}.
+ * @return {@code true} if the context of this environment is {@code Context#LINK}, {@code false} otherwise
+ */
public boolean isLinkContext() {
return Context.LINK.equals(context);
}
+ /**
+ * Determines if this environment has a relation as parent.
+ * @return {@code true} if this environment has a relation as parent, {@code false} otherwise
+ * @see #parent
+ */
public boolean hasParentRelation() {
- return parent != null && parent instanceof Relation;
+ return parent instanceof Relation;
}
/**
* Replies the current context.
- *
+ *
* @return the current context
*/
public Context getContext() {
@@ -122,7 +201,7 @@ public class Environment {
if (getContext().equals(Context.PRIMITIVE))
return null;
- if (parent != null && parent instanceof Relation)
+ if (parent instanceof Relation)
return ((Relation) parent).getMember(index).getRole();
if (child != null && osm instanceof Relation)
return ((Relation) osm).getMember(index).getRole();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java b/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
index 94e4a4b..0a0020b 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
@@ -14,15 +14,15 @@ import org.openstreetmap.josm.tools.LanguageInfo;
* <p>Provides an abstract parent class and three concrete sub classes for various
* strategies on how to compose the text label which can be rendered close to a node
* or within an area in an OSM map.</p>
- *
+ *
* <p>The three strategies below support three rules for composing a label:
* <ul>
* <li>{@link StaticLabelCompositionStrategy} - the label is given by a static text
* specified in the MapCSS style file</li>
- *
+ *
* <li>{@link TagLookupCompositionStrategy} - the label is given by the content of a
* tag whose name specified in the MapCSS style file</li>
- *
+ *
* <li>{@link DeriveLabelFromNameTagsCompositionStrategy} - the label is given by the value
* of one
* of the configured "name tags". The list of relevant name tags can be configured
@@ -166,11 +166,11 @@ public abstract class LabelCompositionStrategy {
/**
* <p>Creates the strategy and initializes its name tags from the preferences.</p>
- *
+ *
* <p><strong>Note:</strong> If the list of name tags in the preferences changes, strategy instances
* are not notified. It's up to the client to listen to preference changes and
* invoke {@link #initNameTagsFromPreferences()} accordingly.</p>
- *
+ *
*/
public DeriveLabelFromNameTagsCompositionStrategy() {
initNameTagsFromPreferences();
@@ -178,7 +178,7 @@ public abstract class LabelCompositionStrategy {
/**
* Sets the name tags to be looked up in order to build up the label
- *
+ *
* @param nameTags the name tags. null values are ignore.
*/
public void setNameTags(List<String> nameTags){
@@ -200,7 +200,7 @@ public abstract class LabelCompositionStrategy {
/**
* Replies an unmodifiable list of the name tags used to compose the label.
- *
+ *
* @return the list of name tags
*/
public List<String> getNameTags() {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
index 0ac0e05..2f75921 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
@@ -7,12 +7,13 @@ import java.awt.BasicStroke;
import java.awt.Color;
import java.util.Arrays;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
-import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
import org.openstreetmap.josm.tools.Utils;
@@ -136,14 +137,14 @@ public class LineElemStyle extends ElemStyle {
/* if we have a "width" tag, try use it */
String widthTag = env.osm.get("width");
- if(widthTag == null) {
+ if (widthTag == null) {
widthTag = env.osm.get("est_width");
}
- if(widthTag != null) {
+ if (widthTag != null) {
try {
realWidth = Float.valueOf(widthTag);
- }
- catch(NumberFormatException nfe) {
+ } catch(NumberFormatException nfe) {
+ Main.warn(nfe);
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.java
index 9e43ee1..8f720aa 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.java
@@ -8,8 +8,11 @@ import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
/**
- * similar to mapnik's LinePatternSymbolizer
+ * Similar to mapnik's LinePatternSymbolizer.
+ *
+ * @deprecated superseded by #{@link RepeatImageElemStyle}
*/
+ at Deprecated
public class LinePatternElemStyle extends ElemStyle {
public MapImage pattern;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapImage.java b/src/org/openstreetmap/josm/gui/mappaint/MapImage.java
index f5dea11..ab657bb 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapImage.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapImage.java
@@ -18,6 +18,9 @@ import org.openstreetmap.josm.tools.ImageProvider.ImageCallback;
import org.openstreetmap.josm.tools.Utils;
public class MapImage {
+
+ private static final int MAX_SIZE = 48;
+
/**
* ImageIcon can change while the image is loading.
*/
@@ -57,6 +60,7 @@ public class MapImage {
.setDirs(MapPaintStyles.getIconSourceDirs(source))
.setId("mappaint."+source.getPrefName())
.setArchive(source.zipIcons)
+ .setInArchiveDir(source.getZipEntryDirName())
.setWidth(width)
.setHeight(height)
.setOptional(true)
@@ -115,6 +119,10 @@ public class MapImage {
private Rectangle box() {
int w = getWidth(), h = getHeight();
+ if (mustRescale(getImage())) {
+ w = 16;
+ h = 16;
+ }
return new Rectangle(-w/2, -h/2, w, h);
}
@@ -129,7 +137,7 @@ public class MapImage {
@Override
public boolean equals(Object obj) {
- if (obj == null || !(obj instanceof BoxProvider))
+ if (!(obj instanceof BoxProvider))
return false;
if (obj instanceof MapImageBoxProvider) {
MapImageBoxProvider other = (MapImageBoxProvider) obj;
@@ -148,6 +156,27 @@ public class MapImage {
public BoxProvider getBoxProvider() {
return new MapImageBoxProvider();
}
+
+ /**
+ * Returns the really displayed node icon for this {@code MapImage}.
+ * @param disabled {@code} true to request disabled version, {@code false} for the standard version
+ * @return The scaled down version to 16x16 pixels if the image height and width exceeds 48 pixels and no size has been explicitely specified
+ * @since 6174
+ */
+ public Image getDisplayedNodeIcon(boolean disabled) {
+ final Image image = disabled ? getDisabled() : getImage();
+ // Scale down large (.svg) images to 16x16 pixels if no size is explicitely specified
+ if (mustRescale(image)) {
+ return ImageProvider.createBoundedImage(image, 16);
+ } else {
+ return image;
+ }
+ }
+
+ private boolean mustRescale(Image image) {
+ return ((width == -1 && image.getWidth(null) > MAX_SIZE)
+ && (height == -1 && image.getHeight(null) > MAX_SIZE));
+ }
@Override
public boolean equals(Object obj) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
index be9b88e..9dcef23 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.mappaint;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -5,16 +6,24 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.util.HashMap;
import java.util.Map;
+
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JMenu;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
-import org.openstreetmap.josm.gui.dialogs.MapPaintDialog.LaunchMapPaintPreferencesAction;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
import org.openstreetmap.josm.gui.util.StayOpenCheckBoxMenuItem;
import org.openstreetmap.josm.tools.ImageProvider;
+/**
+ * The View -> Map Paint Styles menu
+ * @since 5086
+ */
public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
private static class MapPaintAction extends JosmAction {
@@ -54,17 +63,23 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
@Override
public void updateEnabledState() {
- setEnabled(Main.isDisplayingMapView() && Main.main.getEditLayer() != null);
+ setEnabled(Main.isDisplayingMapView() && (Main.main.hasEditLayer() || mapHasGpxorMarkerLayer()));
}
- }
- private final Map<String, MapPaintAction> actions = new HashMap<String, MapPaintAction>();
- private final LaunchMapPaintPreferencesAction mapPaintPreferencesAction = new MapPaintDialog.LaunchMapPaintPreferencesAction() {
- {
- putValue("toolbar", "mappaintpreference");
+ private boolean mapHasGpxorMarkerLayer() {
+ for (Layer layer : Main.map.mapView.getAllLayers()) {
+ if (layer instanceof GpxLayer || layer instanceof MarkerLayer) {
+ return true;
+ }
+ }
+ return false;
}
- };
+ }
+ private final Map<String, MapPaintAction> actions = new HashMap<String, MapPaintAction>();
+ /**
+ * Constructs a new {@code MapPaintMenu}
+ */
public MapPaintMenu() {
super(tr("Map Paint Styles"));
setIcon(ImageProvider.get("dialogs", "mapstyle"));
@@ -87,7 +102,7 @@ public class MapPaintMenu extends JMenu implements MapPaintSylesUpdateListener {
}
}
addSeparator();
- add(mapPaintPreferencesAction);
+ add(MapPaintDialog.PREFERENCE_ACTION);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
index 1712af5..a718c89 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
@@ -5,12 +5,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -30,6 +28,7 @@ import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference.MapPaintPre
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
/**
* This class manages the ElemStyles instance. The object you get with
@@ -38,14 +37,17 @@ import org.openstreetmap.josm.tools.ImageProvider;
*
* On change, mapPaintSylesUpdated() is fired for all listeners.
*/
-public class MapPaintStyles {
+public final class MapPaintStyles {
private static ElemStyles styles = new ElemStyles();
- public static ElemStyles getStyles()
- {
+ public static ElemStyles getStyles() {
return styles;
}
+
+ private MapPaintStyles() {
+ // Hide default constructor for utils classes
+ }
/**
* Value holder for a reference to a tag name. A style instruction
@@ -57,7 +59,7 @@ public class MapPaintStyles {
*/
public static class TagKeyReference {
public final String key;
- public TagKeyReference(String key){
+ public TagKeyReference(String key) {
this.key = key;
}
@@ -96,12 +98,12 @@ public class MapPaintStyles {
.setDirs(getIconSourceDirs(ref.source))
.setId("mappaint."+namespace)
.setArchive(ref.source.zipIcons)
+ .setInArchiveDir(ref.source.getZipEntryDirName())
.setWidth(width)
.setHeight(height)
.setOptional(true).get();
- if(i == null)
- {
- System.out.println("Mappaint style \""+namespace+"\" ("+ref.source.getDisplayString()+") icon \"" + ref.iconName + "\" not found.");
+ if (i == null) {
+ Main.warn("Mappaint style \""+namespace+"\" ("+ref.source.getDisplayString()+") icon \"" + ref.iconName + "\" not found.");
return null;
}
return i;
@@ -120,26 +122,26 @@ public class MapPaintStyles {
.setDirs(getIconSourceDirs(source))
.setId("mappaint."+source.getPrefName())
.setArchive(source.zipIcons)
+ .setInArchiveDir(source.getZipEntryDirName())
.setOptional(true).get();
}
-
+
public static ImageIcon getNodeIcon(Tag tag) {
return getNodeIcon(tag, true);
}
-
+
public static ImageIcon getNodeIcon(Tag tag, boolean includeDeprecatedIcon) {
if (tag != null) {
Node virtualNode = new Node();
virtualNode.put(tag.getKey(), tag.getValue());
StyleList styleList = getStyles().generateStyles(virtualNode, 0.5, null, false).a;
if (styleList != null) {
- for (Iterator<ElemStyle> it = styleList.iterator(); it.hasNext(); ) {
- ElemStyle style = it.next();
+ for (ElemStyle style : styleList) {
if (style instanceof NodeElemStyle) {
MapImage mapImage = ((NodeElemStyle) style).mapImage;
if (mapImage != null) {
if (includeDeprecatedIcon || mapImage.name == null || !mapImage.name.equals("misc/deprecated.png")) {
- return new ImageIcon(mapImage.getImage());
+ return new ImageIcon(mapImage.getDisplayedNodeIcon(false));
} else {
return null; // Deprecated icon found but not wanted
}
@@ -163,7 +165,7 @@ public class MapPaintStyles {
for(String fileset : prefIconDirs)
{
String[] a;
- if(fileset.indexOf("=") >= 0) {
+ if(fileset.indexOf('=') >= 0) {
a = fileset.split("=", 2);
} else {
a = new String[] {"", fileset};
@@ -211,47 +213,49 @@ public class MapPaintStyles {
MirroredInputStream in = null;
try {
in = new MirroredInputStream(entry.url);
- InputStream zip = in.getZipEntry("xml", "style");
- if (zip != null)
- return new XmlStyleSource(entry);
- zip = in.getZipEntry("mapcss", "style");
- if (zip != null)
+ String zipEntryPath = in.findZipEntryPath("mapcss", "style");
+ if (zipEntryPath != null) {
+ entry.isZip = true;
+ entry.zipEntryPath = zipEntryPath;
return new MapCSSStyleSource(entry);
+ }
+ zipEntryPath = in.findZipEntryPath("xml", "style");
+ if (zipEntryPath != null)
+ return new XmlStyleSource(entry);
if (entry.url.toLowerCase().endsWith(".mapcss"))
return new MapCSSStyleSource(entry);
if (entry.url.toLowerCase().endsWith(".xml"))
return new XmlStyleSource(entry);
else {
InputStreamReader reader = new InputStreamReader(in);
- WHILE: while (true) {
- int c = reader.read();
- switch (c) {
- case -1:
- break WHILE;
- case ' ':
- case '\t':
- case '\n':
- case '\r':
- continue;
- case '<':
- return new XmlStyleSource(entry);
- default:
- return new MapCSSStyleSource(entry);
+ try {
+ WHILE: while (true) {
+ int c = reader.read();
+ switch (c) {
+ case -1:
+ break WHILE;
+ case ' ':
+ case '\t':
+ case '\n':
+ case '\r':
+ continue;
+ case '<':
+ return new XmlStyleSource(entry);
+ default:
+ return new MapCSSStyleSource(entry);
+ }
}
+ } finally {
+ reader.close();
}
- System.err.println("Warning: Could not detect style type. Using default (xml).");
+ Main.warn("Could not detect style type. Using default (xml).");
return new XmlStyleSource(entry);
}
} catch (IOException e) {
- System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", entry.url, e.toString()));
+ Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", entry.url, e.toString()));
e.printStackTrace();
} finally {
- try {
- if (in != null) {
- in.close();
- }
- } catch (IOException ex) {
- }
+ Utils.close(in);
}
return null;
}
@@ -313,7 +317,7 @@ public class MapPaintStyles {
/**
* Move position of entries in the current list of StyleSources
- * @param sele The indices of styles to be moved.
+ * @param sel The indices of styles to be moved.
* @param delta The number of lines it should move. positive int moves
* down and negative moves up.
*/
diff --git a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
index d0873b8..30dbad3 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.Utils.equal;
import java.awt.BasicStroke;
import java.awt.Color;
+import java.awt.Image;
import java.awt.Rectangle;
import java.awt.Stroke;
@@ -23,9 +24,15 @@ import org.openstreetmap.josm.tools.Utils;
/**
* applies for Nodes and turn restriction relations
*/
-public class NodeElemStyle extends ElemStyle {
- public MapImage mapImage;
- public Symbol symbol;
+public class NodeElemStyle extends ElemStyle implements StyleKeys {
+ public final MapImage mapImage;
+ public final Symbol symbol;
+
+ private Image enabledNodeIcon;
+ private Image disabledNodeIcon;
+
+ private boolean enabledNodeIconIsTemporary;
+ private boolean disabledNodeIconIsTemporary;
public enum SymbolShape { SQUARE, CIRCLE, TRIANGLE, PENTAGON, HEXAGON, HEPTAGON, OCTAGON, NONAGON, DECAGON }
@@ -82,7 +89,7 @@ public class NodeElemStyle extends ElemStyle {
public static final NodeElemStyle SIMPLE_NODE_ELEMSTYLE;
static {
MultiCascade mc = new MultiCascade();
- Cascade c = mc.getOrCreateCascade("default");
+ mc.getOrCreateCascade("default");
SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), 4.1f, true);
if (SIMPLE_NODE_ELEMSTYLE == null) throw new AssertionError();
}
@@ -103,7 +110,7 @@ public class NodeElemStyle extends ElemStyle {
private static NodeElemStyle create(Environment env, float default_major_z_index, boolean allowDefault) {
Cascade c = env.mc.getCascade(env.layer);
- MapImage mapImage = createIcon(env);
+ MapImage mapImage = createIcon(env, ICON_KEYS);
Symbol symbol = null;
if (mapImage == null) {
symbol = createSymbol(env);
@@ -117,25 +124,26 @@ public class NodeElemStyle extends ElemStyle {
return new NodeElemStyle(c, mapImage, symbol, default_major_z_index);
}
- private static MapImage createIcon(Environment env) {
+ public static MapImage createIcon(final Environment env, final String[] keys) {
Cascade c = env.mc.getCascade(env.layer);
- Cascade c_def = env.mc.getCascade("default");
- final IconReference iconRef = c.get(ICON_IMAGE, null, IconReference.class);
+ final IconReference iconRef = c.get(keys[ICON_IMAGE_IDX], null, IconReference.class);
if (iconRef == null)
return null;
- Float widthOnDefault = c_def.get("icon-width", null, Float.class);
+ Cascade c_def = env.mc.getCascade("default");
+
+ Float widthOnDefault = c_def.get(keys[ICON_WIDTH_IDX], null, Float.class);
if (widthOnDefault != null && widthOnDefault <= 0) {
widthOnDefault = null;
}
- Float widthF = getWidth(c, "icon-width", widthOnDefault);
+ Float widthF = getWidth(c, keys[ICON_WIDTH_IDX], widthOnDefault);
- Float heightOnDefault = c_def.get("icon-height", null, Float.class);
+ Float heightOnDefault = c_def.get(keys[ICON_HEIGHT_IDX], null, Float.class);
if (heightOnDefault != null && heightOnDefault <= 0) {
heightOnDefault = null;
}
- Float heightF = getWidth(c, "icon-height", heightOnDefault);
+ Float heightF = getWidth(c, keys[ICON_HEIGHT_IDX], heightOnDefault);
int width = widthF == null ? -1 : Math.round(widthF);
int height = heightF == null ? -1 : Math.round(heightF);
@@ -146,7 +154,7 @@ public class NodeElemStyle extends ElemStyle {
mapImage.height = height;
mapImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.icon-image-alpha", 255))));
- Integer pAlpha = Utils.color_float2int(c.get("icon-opacity", null, float.class));
+ Integer pAlpha = Utils.color_float2int(c.get(keys[ICON_OPACITY_IDX], null, float.class));
if (pAlpha != null) {
mapImage.alpha = pAlpha;
}
@@ -233,8 +241,21 @@ public class NodeElemStyle extends ElemStyle {
if (primitive instanceof Node) {
Node n = (Node) primitive;
if (mapImage != null && painter.isShowIcons()) {
- painter.drawNodeIcon(n, (painter.isInactiveMode() || n.isDisabled()) ? mapImage.getDisabled() : mapImage.getImage(),
- Utils.color_int2float(mapImage.alpha), selected, member);
+ final Image nodeIcon;
+ if (painter.isInactiveMode() || n.isDisabled()) {
+ if (disabledNodeIcon == null || disabledNodeIconIsTemporary) {
+ disabledNodeIcon = mapImage.getDisplayedNodeIcon(true);
+ disabledNodeIconIsTemporary = mapImage.isTemporary();
+ }
+ nodeIcon = disabledNodeIcon;
+ } else {
+ if (enabledNodeIcon == null || enabledNodeIconIsTemporary) {
+ enabledNodeIcon = mapImage.getDisplayedNodeIcon(false);
+ enabledNodeIconIsTemporary = mapImage.isTemporary();
+ }
+ nodeIcon = enabledNodeIcon;
+ }
+ painter.drawNodeIcon(n, nodeIcon, Utils.color_int2float(mapImage.alpha), selected, member);
} else if (symbol != null) {
Color fillColor = symbol.fillColor;
if (fillColor != null) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java b/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java
new file mode 100644
index 0000000..236c16c
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/mappaint/RepeatImageElemStyle.java
@@ -0,0 +1,96 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.mappaint;
+
+import static org.openstreetmap.josm.tools.Utils.equal;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+
+public class RepeatImageElemStyle extends ElemStyle implements StyleKeys {
+
+ public enum LineImageAlignment { TOP, CENTER, BOTTOM }
+
+ public MapImage pattern;
+ public float offset;
+ public float spacing;
+ public float phase;
+ public LineImageAlignment align;
+
+ public RepeatImageElemStyle(Cascade c, MapImage pattern, float offset, float spacing, float phase, LineImageAlignment align) {
+ super(c, 2.9f);
+ CheckParameterUtil.ensureParameterNotNull(pattern);
+ CheckParameterUtil.ensureParameterNotNull(align);
+ this.pattern = pattern;
+ this.offset = offset;
+ this.spacing = spacing;
+ this.phase = phase;
+ this.align = align;
+ }
+
+ public static RepeatImageElemStyle create(Environment env) {
+ MapImage pattern = NodeElemStyle.createIcon(env, REPEAT_IMAGE_KEYS);
+ if (pattern == null)
+ return null;
+ Cascade c = env.mc.getCascade(env.layer);
+ float offset = c.get(REPEAT_IMAGE_OFFSET, 0f, Float.class);
+ float spacing = c.get(REPEAT_IMAGE_SPACING, 0f, Float.class);
+ float phase = - c.get(REPEAT_IMAGE_PHASE, 0f, Float.class);
+
+ LineImageAlignment align = LineImageAlignment.CENTER;
+ Keyword alignKW = c.get(REPEAT_IMAGE_ALIGN, Keyword.CENTER, Keyword.class);
+ if (equal(alignKW.val, "top")) {
+ align = LineImageAlignment.TOP;
+ } else if (equal(alignKW.val, "bottom")) {
+ align = LineImageAlignment.BOTTOM;
+ }
+
+ return new RepeatImageElemStyle(c, pattern, offset, spacing, phase, align);
+ }
+
+ @Override
+ public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
+ Way w = (Way) primitive;
+ painter.drawRepeatImage(w, pattern.getImage(), offset, spacing, phase, align);
+ }
+
+ @Override
+ public boolean isProperLineStyle() {
+ return true;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null || getClass() != obj.getClass())
+ return false;
+ if (!super.equals(obj))
+ return false;
+ final RepeatImageElemStyle other = (RepeatImageElemStyle) obj;
+ if (!this.pattern.equals(other.pattern)) return false;
+ if (this.offset != other.offset) return false;
+ if (this.spacing != other.spacing) return false;
+ if (this.phase != other.phase) return false;
+ if (this.align != other.align) return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 83 * hash + this.pattern.hashCode();
+ hash = 83 * hash + Float.floatToIntBits(this.offset);
+ hash = 83 * hash + Float.floatToIntBits(this.spacing);
+ hash = 83 * hash + Float.floatToIntBits(this.phase);
+ hash = 83 * hash + this.align.hashCode();
+ return hash;
+ }
+
+ @Override
+ public String toString() {
+ return "RepeatImageStyle{" + super.toString() + "pattern=[" + pattern +
+ "], offset=" + offset + ", spacing=" + spacing +
+ ", phase=" + (-phase) + ", align=" + align + "}";
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
index 57302b1..e3fe172 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
@@ -13,21 +13,21 @@ import org.openstreetmap.josm.tools.Utils;
/**
* Caches styles for a single primitive.
- * Splits the range of possible scale values (0 < scale < +Infinity) into multiple
+ * Splits the range of possible scale values (0 < scale < +Infinity) into multiple
* subranges, for each scale range it keeps a list of styles.
* Immutable class, equals & hashCode is required (the same for StyleList, ElemStyle
* and its subclasses).
*/
-public class StyleCache {
+public final class StyleCache {
/* list of boundaries for the scale ranges */
- ArrayList<Double> bd;
+ private final List<Double> bd;
/* styles for each scale range */
- ArrayList<StyleList> data;
+ private final List<StyleList> data;
private final static Storage<StyleCache> internPool = new Storage<StyleCache>(); // TODO: clean up the intern pool from time to time (after purge or layer removal)
public final static StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern();
-
+
private StyleCache() {
bd = new ArrayList<Double>();
bd.add(0.0);
@@ -141,6 +141,11 @@ public class StyleCache {
return s.intern();
}
+ // this exception type is for debugging #8997 and can later be replaced
+ // by AssertionError
+ public static class RangeViolatedError extends Error {
+ }
+
/**
* ASCII-art explanation:
*
@@ -158,7 +163,7 @@ public class StyleCache {
}
if (bd.get(i) == lower) {
if (upper > bd.get(i+1))
- throw new AssertionError("the new range must be within a single subrange");
+ throw new RangeViolatedError();
if (data.get(i) != null)
throw new AssertionError("the new range must be within a subrange that has no data");
@@ -188,7 +193,7 @@ public class StyleCache {
// (----]
bd.add(i, lower);
data.add(i, sl);
-
+
// --|--|----|--------|--
// i-1 i i+1 i+2
// (--]
@@ -199,7 +204,7 @@ public class StyleCache {
return;
}
}
-
+
public void consistencyTest() {
if (bd.size() < 2) throw new AssertionError();
if (data.size() < 1) throw new AssertionError();
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
index 6f212b2..ee706ab 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleKeys.java
@@ -3,22 +3,32 @@ package org.openstreetmap.josm.gui.mappaint;
public interface StyleKeys {
- public static final String COLOR = "color";
- public static final String DASHES = "dashes";
- public static final String DASHES_BACKGROUND_COLOR = "dashes-background-color";
- public static final String DASHES_BACKGROUND_OPACITY = "dashes-background-opacity";
- public static final String DASHES_OFFSET = "dashes-offset";
- public static final String FILL_COLOR = "fill-color";
- public static final String FILL_IMAGE = "fill-image";
- public static final String FILL_OPACITY = "fill-opacity";
- public static final String ICON_IMAGE = "icon-image";
- public static final String MODIFIER = "modifier";
- public static final String OBJECT_Z_INDEX = "object-z-index";
- public static final String OFFSET = "offset";
- public static final String OPACITY = "opacity";
- public static final String REAL_WIDTH = "real-width";
- public static final String TEXT_POSITION = "text-position";
- public static final String TEXT = "text";
- public static final String WIDTH = "width";
- public static final String Z_INDEX = "z-index";
+ String COLOR = "color";
+ String DASHES = "dashes";
+ String DASHES_BACKGROUND_COLOR = "dashes-background-color";
+ String DASHES_BACKGROUND_OPACITY = "dashes-background-opacity";
+ String DASHES_OFFSET = "dashes-offset";
+ String FILL_COLOR = "fill-color";
+ String FILL_IMAGE = "fill-image";
+ String FILL_OPACITY = "fill-opacity";
+ String ICON_IMAGE = "icon-image";
+ String MODIFIER = "modifier";
+ String OBJECT_Z_INDEX = "object-z-index";
+ String OFFSET = "offset";
+ String OPACITY = "opacity";
+ String REAL_WIDTH = "real-width";
+ String TEXT_POSITION = "text-position";
+ String TEXT = "text";
+ String WIDTH = "width";
+ String Z_INDEX = "z-index";
+ String REPEAT_IMAGE = "repeat-image";
+ String REPEAT_IMAGE_OFFSET = "repeat-image-offset";
+ String REPEAT_IMAGE_SPACING = "repeat-image-spacing";
+ String REPEAT_IMAGE_PHASE = "repeat-image-phase";
+ String REPEAT_IMAGE_ALIGN = "repeat-image-align";
+
+ int ICON_IMAGE_IDX = 0;
+ int ICON_WIDTH_IDX = 1;
+ int ICON_HEIGHT_IDX = 2;
+ int ICON_OPACITY_IDX = 3;
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
index d746ad7..9a47963 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
import org.openstreetmap.josm.gui.preferences.SourceEntry;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
abstract public class StyleSource extends SourceEntry {
@@ -25,7 +26,7 @@ abstract public class StyleSource extends SourceEntry {
public File zipIcons;
private ImageIcon imageIcon;
- private long lastMTime = 0l;
+ private long lastMTime = 0L;
/******
* The following fields is additional information found in the header
@@ -39,15 +40,31 @@ abstract public class StyleSource extends SourceEntry {
}
public StyleSource(SourceEntry entry) {
- super(entry.url, entry.name, entry.title, entry.active);
+ super(entry);
}
abstract public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed);
abstract public void loadStyleSource();
+ /**
+ * Returns a new {@code InputStream} to the style source. When finished, {@link #closeSourceInputStream(InputStream)} must be called.
+ * @return A new {@code InputStream} to the style source that must be closed by the caller
+ * @throws IOException if any I/O error occurs.
+ * @see #closeSourceInputStream(InputStream)
+ */
abstract public InputStream getSourceInputStream() throws IOException;
+ /**
+ * Closes the source input stream previously returned by {@link #getSourceInputStream()} and other linked resources, if applicable.
+ * @param is The source input stream that must be closed
+ * @since 6289
+ * @see #getSourceInputStream()
+ */
+ public void closeSourceInputStream(InputStream is) {
+ Utils.close(is);
+ }
+
public void logError(Throwable e) {
errors.add(e);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/TextElement.java b/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
index d7b08d3..c8830db 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
@@ -35,7 +35,7 @@ public class TextElement implements StyleKeys {
/**
* Creates a new text element
- *
+ *
* @param strategy the strategy indicating how the text is composed for a specific {@link OsmPrimitive} to be rendered.
* If null, no label is rendered.
* @param font the font to be used. Must not be null.
@@ -59,7 +59,7 @@ public class TextElement implements StyleKeys {
/**
* Copy constructor
- *
+ *
* @param other the other element.
*/
public TextElement(TextElement other) {
@@ -75,7 +75,7 @@ public class TextElement implements StyleKeys {
/**
* Derives a suitable label composition strategy from the style properties in
* {@code c}.
- *
+ *
* @param c the style properties
* @return the label composition strategy
*/
@@ -108,7 +108,7 @@ public class TextElement implements StyleKeys {
/**
* Builds a text element from style properties in {@code c} and the
* default text color {@code defaultTextColor}
- *
+ *
* @param c the style properties
* @param defaultTextColor the default text color. Must not be null.
* @param defaultAnnotate true, if a text label shall be rendered by default, even if the style sheet
@@ -160,7 +160,7 @@ public class TextElement implements StyleKeys {
/**
* Replies the label to be rendered for the primitive {@code osm}.
- *
+ *
* @param osm the OSM object
* @return the label, or null, if {@code osm} is null or if no label can be
* derived for {@code osm}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
index 20aff60..be20169 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
@@ -5,7 +5,7 @@ import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
-public class CSSColors {
+public final class CSSColors {
private final static Map<String, Color> CSS_COLORS = new HashMap<String, Color>();
static {
Object[][] CSSCOLORS_INIT = new Object[][] {
@@ -162,7 +162,16 @@ public class CSSColors {
}
}
+ /**
+ * Returns the CSS color for the given key
+ * @param key The key to find
+ * @return The color for {@code key}
+ */
public static Color get(String key) {
return CSS_COLORS.get(key);
}
+
+ private CSSColors() {
+ // Hide default constructor for utils classes
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
index f7f9447..d4702db 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
@@ -63,7 +63,7 @@ abstract public class Condition {
public static enum Op {
EQ, NEQ, GREATER_OR_EQUAL, GREATER, LESS_OR_EQUAL, LESS,
- REGEX, ONE_OF, BEGINS_WITH, ENDS_WITH, CONTAINS;
+ REGEX, NREGEX, ONE_OF, BEGINS_WITH, ENDS_WITH, CONTAINS;
public boolean eval(String testString, String prototypeString) {
if (testString == null && this != NEQ)
@@ -74,9 +74,10 @@ abstract public class Condition {
case NEQ:
return !equal(testString, prototypeString);
case REGEX:
+ case NREGEX:
Pattern p = Pattern.compile(prototypeString);
Matcher m = p.matcher(testString);
- return m.find();
+ return REGEX.equals(this) ? m.find() : !m.find();
case ONE_OF:
String[] parts = testString.split(";");
for (String part : parts) {
@@ -135,7 +136,7 @@ abstract public class Condition {
/**
* <p>Represents a key/value condition which is either applied to a primitive.</p>
- *
+ *
*/
public static class KeyValueCondition extends Condition {
@@ -145,7 +146,7 @@ abstract public class Condition {
/**
* <p>Creates a key/value-condition.</p>
- *
+ *
* @param k the key
* @param v the value
* @param op the operation
@@ -207,7 +208,7 @@ abstract public class Condition {
* ["a label"] PRIMITIVE: the primitive has a tag "a label"
* LINK: the parent is a relation and it has at least one member with the role
* "a label" referring to the child
- *
+ *
* [!"a label"] PRIMITIVE: the primitive doesn't have a tag "a label"
* LINK: the parent is a relation but doesn't have a member with the role
* "a label" referring to the child
@@ -223,7 +224,7 @@ abstract public class Condition {
private boolean questionMarkPresent;
/**
- *
+ *
* @param label
* @param exclamationMarkPresent
* @param questionMarkPresent
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
index ed7a062..e546ddb 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
@@ -28,7 +28,7 @@ import org.openstreetmap.josm.tools.Utils;
*
* See {@link #createFunctionExpression}.
*/
-public class ExpressionFactory {
+public final class ExpressionFactory {
private static final List<Method> arrayFunctions;
private static final List<Method> parameterFunctions;
@@ -73,6 +73,10 @@ public class ExpressionFactory {
throw new RuntimeException(ex);
}
}
+
+ private ExpressionFactory() {
+ // Hide default constructor for utils classes
+ }
public static class Functions {
@@ -130,7 +134,7 @@ public class ExpressionFactory {
return Arrays.asList(args);
}
- public static Object get(List objects, float index) {
+ public static Object get(List<? extends Object> objects, float index) {
int idx = Math.round(index);
if (idx >= 0 && idx < objects.size()) {
return objects.get(idx);
@@ -138,7 +142,7 @@ public class ExpressionFactory {
return null;
}
- public static List split(String sep, String toSplit) {
+ public static List<String> split(String sep, String toSplit) {
return Arrays.asList(toSplit.split(Pattern.quote(sep), -1));
}
@@ -264,11 +268,10 @@ public class ExpressionFactory {
return a < b;
}
- @SuppressWarnings(value = "unchecked")
public static boolean equal(Object a, Object b) {
// make sure the casts are done in a meaningful way, so
// the 2 objects really can be considered equal
- for (Class klass : new Class[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
+ for (Class<?> klass : new Class[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
Object a2 = Cascade.convertTo(a, klass);
Object b2 = Cascade.convertTo(b, klass);
if (a2 != null && b2 != null && a2.equals(b2)) {
@@ -316,7 +319,7 @@ public class ExpressionFactory {
return Pattern.compile(pattern, f).matcher(target).matches();
}
- public static List regexp_match(String pattern, String target, String flags) {
+ public static List<String> regexp_match(String pattern, String target, String flags) {
int f = 0;
if (flags.contains("i")) {
f |= Pattern.CASE_INSENSITIVE;
@@ -339,7 +342,7 @@ public class ExpressionFactory {
}
}
- public static List regexp_match(String pattern, String target) {
+ public static List<String> regexp_match(String pattern, String target) {
Matcher m = Pattern.compile(pattern).matcher(target);
if (m.matches()) {
List<String> result = new ArrayList<String>(m.groupCount() + 1);
@@ -479,7 +482,7 @@ public class ExpressionFactory {
@Override
public Object evaluate(Environment env) {
- List l = Cascade.convertTo(arg.evaluate(env), List.class);
+ List<?> l = Cascade.convertTo(arg.evaluate(env), List.class);
if (l != null)
return l.size();
String s = Cascade.convertTo(arg.evaluate(env), String.class);
@@ -525,7 +528,7 @@ public class ExpressionFactory {
} catch (IllegalArgumentException ex) {
throw new RuntimeException(ex);
} catch (InvocationTargetException ex) {
- System.err.println(ex);
+ Main.error(ex);
return null;
}
return result;
@@ -574,7 +577,7 @@ public class ExpressionFactory {
} catch (IllegalArgumentException ex) {
throw new RuntimeException(ex);
} catch (InvocationTargetException ex) {
- System.err.println(ex);
+ Main.error(ex);
return null;
}
return result;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
index 54f8ed4..ae5c3f9 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
@@ -37,10 +37,10 @@ abstract public class Instruction implements StyleKeys {
Object litValue = ((LiteralExpression) val).evaluate(null);
if (key.equals(TEXT)) {
/* Special case for declaration 'text: ...'
- *
+ *
* - Treat the value 'auto' as keyword.
* - Treat any other literal value 'litval' as as reference to tag with key 'litval'
- *
+ *
* - Accept function expressions as is. This allows for
* tag(a_tag_name) value of a tag
* eval("a static text") a static text
@@ -72,7 +72,7 @@ abstract public class Instruction implements StyleKeys {
} else {
value = val;
}
- if (key.equals(ICON_IMAGE) || key.equals(FILL_IMAGE) || key.equals("pattern-image")) {
+ if (key.equals(ICON_IMAGE) || key.equals(FILL_IMAGE) || key.equals("pattern-image") || key.equals(REPEAT_IMAGE)) {
if (value instanceof String) {
value = new IconReference((String) value, env.source);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
index 79e30e7..5f54a98 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
@@ -6,7 +6,7 @@ public class MapCSSException extends RuntimeException {
protected String specialmessage;
protected Integer line;
protected Integer column;
-
+
public MapCSSException(String specialmessage) {
this.specialmessage = specialmessage;
}
@@ -18,7 +18,7 @@ public class MapCSSException extends RuntimeException {
public void setLine(int line) {
this.line = line;
}
-
+
@Override
public String getMessage() {
if (line == null || column == null)
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
index 4ecac08..6a28584 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
@@ -26,6 +26,7 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.LinkSelector;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.Main;
public class MapCSSParser {
MapCSSStyleSource sheet;
@@ -366,6 +367,9 @@ Condition simple_key_value_condition(Context context) :
LOOKAHEAD(2)
<EQUAL> <TILDE> { op=Condition.Op.REGEX; } s() val=regex()
|
+ LOOKAHEAD(2)
+ <EXCLAMATION> <TILDE> { op=Condition.Op.NREGEX; } s() val=regex()
+ |
(
<EXCLAMATION> <EQUAL> { op=Condition.Op.NEQ; }
|
@@ -572,8 +576,8 @@ void error_skipto(int kind, MapCSSException me) {
e = new ParseException(pe.getMessage()); // prevent memory leak
}
- System.err.println("Skipping to the next rule, because of an error:");
- System.err.println(e);
+ Main.error("Skipping to the next rule, because of an error:");
+ Main.error(e);
if (sheet != null) {
sheet.logError(e);
}
@@ -597,7 +601,7 @@ String readRaw() {
if ((t.kind == S || t.kind == STRING || t.kind == UNEXPECTED_CHAR) &&
t.image.contains("\n")) {
ParseException e = new ParseException(String.format("Warning: end of line while reading an unquoted string at line %s column %s.", t.beginLine, t.beginColumn));
- System.err.println(e);
+ Main.error(e);
if (sheet != null) {
sheet.logError(e);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java
index e3615da..aaa66a6 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java
@@ -7,7 +7,7 @@ import org.openstreetmap.josm.gui.mappaint.Environment;
import org.openstreetmap.josm.tools.Utils;
public class MapCSSRule {
-
+
public List<Selector> selectors;
public List<Instruction> declaration;
@@ -18,7 +18,7 @@ public class MapCSSRule {
/**
* <p>Executes the instructions against the environment {@code env}</p>
- *
+ *
* @param env the environment
*/
public void execute(Environment env) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
index cfcc8e4..b623e71 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
@@ -5,12 +5,16 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.mappaint.Cascade;
@@ -32,6 +36,7 @@ public class MapCSSStyleSource extends StyleSource {
final public List<MapCSSRule> rules;
private Color backgroundColorOverride;
private String css = null;
+ private ZipFile zipFile;
public MapCSSStyleSource(String url, String name, String shortdescription) {
super(url, name, shortdescription);
@@ -46,7 +51,7 @@ public class MapCSSStyleSource extends StyleSource {
/**
* <p>Creates a new style source from the MapCSS styles supplied in
* {@code css}</p>
- *
+ *
* @param css the MapCSS style declaration. Must not be null.
* @throws IllegalArgumentException thrown if {@code css} is null
*/
@@ -62,20 +67,25 @@ public class MapCSSStyleSource extends StyleSource {
init();
rules.clear();
try {
- MapCSSParser parser = new MapCSSParser(getSourceInputStream(), "UTF-8");
- parser.sheet(this);
- loadMeta();
- loadCanvas();
- } catch(IOException e) {
- System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
+ InputStream in = getSourceInputStream();
+ try {
+ MapCSSParser parser = new MapCSSParser(in, "UTF-8");
+ parser.sheet(this);
+ loadMeta();
+ loadCanvas();
+ } finally {
+ closeSourceInputStream(in);
+ }
+ } catch (IOException e) {
+ Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
e.printStackTrace();
logError(e);
} catch (TokenMgrError e) {
- System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
+ Main.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
e.printStackTrace();
logError(e);
} catch (ParseException e) {
- System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
+ Main.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
e.printStackTrace();
logError(new ParseException(e.getMessage())); // allow e to be garbage collected, it links to the entire token stream
}
@@ -83,20 +93,32 @@ public class MapCSSStyleSource extends StyleSource {
@Override
public InputStream getSourceInputStream() throws IOException {
- if (css != null)
+ if (css != null) {
return new ByteArrayInputStream(css.getBytes("UTF-8"));
-
+ }
MirroredInputStream in = new MirroredInputStream(url);
- InputStream zip = in.getZipEntry("mapcss", "style");
- if (zip != null) {
- zipIcons = in.getFile();
- return zip;
+ if (isZip) {
+ File file = in.getFile();
+ Utils.close(in);
+ zipFile = new ZipFile(file);
+ zipIcons = file;
+ ZipEntry zipEntry = zipFile.getEntry(zipEntryPath);
+ return zipFile.getInputStream(zipEntry);
} else {
+ zipFile = null;
zipIcons = null;
return in;
}
}
+ @Override
+ public void closeSourceInputStream(InputStream is) {
+ super.closeSourceInputStream(is);
+ if (isZip) {
+ Utils.close(zipFile);
+ }
+ }
+
/**
* load meta info from a selector "meta"
*/
@@ -166,8 +188,7 @@ public class MapCSSStyleSource extends StyleSource {
if (sub == null) {
sub = "default";
}
-
- if (sub.equals("*")) {
+ else if ("*".equals(sub)) {
for (Entry<String, Cascade> entry : mc.getLayers()) {
env.layer = entry.getKey();
if (Utils.equal(env.layer, "*")) {
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
index cb16653..52ac91a 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
@@ -2,10 +2,11 @@
package org.openstreetmap.josm.gui.mappaint.mapcss;
import java.util.List;
+import java.util.regex.PatternSyntaxException;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
@@ -33,13 +34,13 @@ public interface Selector {
/**
* <p>Represents a child selector or a parent selector.</p>
- *
+ *
* <p>In addition to the standard CSS notation for child selectors, JOSM also supports
* an "inverse" notation:</p>
* <pre>
* selector_a > selector_b { ... } // the standard notation (child selector)
* relation[type=route] > way { ... } // example (all ways of a route)
- *
+ *
* selector_a < selector_b { ... } // the inverse notation (parent selector)
* node[traffic_calming] < way { ... } // example (way that has a traffic calming node)
* </pre>
@@ -54,7 +55,7 @@ public interface Selector {
private final boolean parentSelector;
/**
- *
+ *
* @param a the first selector
* @param b the second selector
* @param parentSelector if true, this is a parent selector; otherwise a child selector
@@ -68,11 +69,11 @@ public interface Selector {
/**
* <p>Finds the first referrer matching {@link #left}</p>
- *
+ *
* <p>The visitor works on an environment and it saves the matching
* referrer in {@code e.parent} and its relative position in the
* list referrers "child list" in {@code e.index}.</p>
- *
+ *
* <p>If after execution {@code e.parent} is null, no matching
* referrer was found.</p>
*
@@ -107,7 +108,7 @@ public interface Selector {
for (int i=0; i<w.getNodesCount(); i++) {
Node n = w.getNode(i);
if (n.equals(e.osm)) {
- if (link.matches(e.withParent(w).withIndex(i).withLinkContext())) {
+ if (link.matches(e.withParentAndIndexAndLinkContext(w, i))) {
e.parent = w;
e.index = i;
return;
@@ -129,7 +130,7 @@ public interface Selector {
for (int i=0; i < r.getMembersCount(); i++) {
RelationMember m = r.getMember(i);
if (m.getMember().equals(e.osm)) {
- if (link.matches(e.withParent(r).withIndex(i).withLinkContext())) {
+ if (link.matches(e.withParentAndIndexAndLinkContext(r, i))) {
e.parent = r;
e.index = i;
return;
@@ -155,7 +156,7 @@ public interface Selector {
for (int i=0; i<wayNodes.size(); i++) {
Node n = wayNodes.get(i);
if (left.matches(e.withPrimitive(n))) {
- if (link.matches(e.withChild(n).withIndex(i).withLinkContext())) {
+ if (link.matches(e.withChildAndIndexAndLinkContext(n, i))) {
e.child = n;
e.index = i;
return true;
@@ -168,7 +169,7 @@ public interface Selector {
for (int i=0; i<members.size(); i++) {
OsmPrimitive member = members.get(i).getMember();
if (left.matches(e.withPrimitive(member))) {
- if (link.matches(e.withChild(member).withIndex(i).withLinkContext())) {
+ if (link.matches(e.withChildAndIndexAndLinkContext(member, i))) {
e.child = member;
e.index = i;
return true;
@@ -196,20 +197,51 @@ public interface Selector {
}
}
- public static class LinkSelector implements Selector {
- protected List<Condition> conditions;
+ /**
+ * Super class of {@link GeneralSelector} and {@link LinkSelector}
+ * @since 5841
+ */
+ public static abstract class AbstractSelector implements Selector {
+
+ protected final List<Condition> conds;
+
+ protected AbstractSelector(List<Condition> conditions) {
+ if (conditions == null || conditions.isEmpty()) {
+ this.conds = null;
+ } else {
+ this.conds = conditions;
+ }
+ }
+
+ /**
+ * Determines if all conditions match the given environment.
+ * @param env The environment to check
+ * @return {@code true} if all conditions apply, false otherwise.
+ */
+ public final boolean matchesConditions(Environment env) {
+ if (conds == null) return true;
+ for (Condition c : conds) {
+ try {
+ if (!c.applies(env)) return false;
+ } catch (PatternSyntaxException e) {
+ Main.error("PatternSyntaxException while applying condition" + c +": "+e.getMessage());
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+
+ public static class LinkSelector extends AbstractSelector {
public LinkSelector(List<Condition> conditions) {
- this.conditions = conditions;
+ super(conditions);
}
@Override
public boolean matches(Environment env) {
Utils.ensure(env.isLinkContext(), "Requires LINK context in environment, got ''{0}''", env.getContext());
- for (Condition c: conditions) {
- if (!c.applies(env)) return false;
- }
- return true;
+ return matchesConditions(env);
}
@Override
@@ -224,17 +256,17 @@ public interface Selector {
@Override
public String toString() {
- return "LinkSelector{" + "conditions=" + conditions + '}';
+ return "LinkSelector{" + "conditions=" + conds + '}';
}
}
- public static class GeneralSelector implements Selector {
+ public static class GeneralSelector extends AbstractSelector {
private String base;
public Range range;
- private List<Condition> conds;
private String subpart;
public GeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, String subpart) {
+ super(conds);
this.base = base;
if (zoom != null) {
int a = zoom.a == null ? 0 : zoom.a;
@@ -246,11 +278,6 @@ public interface Selector {
if (range == null) {
range = new Range();
}
- if (conds == null || conds.isEmpty()) {
- this.conds = null;
- } else {
- this.conds = conds;
- }
this.subpart = subpart;
}
@@ -280,15 +307,6 @@ public interface Selector {
return false;
}
- public boolean matchesConditions(Environment e){
- if (conds == null) return true;
- for (Condition c : conds) {
- if (!c.applies(e))
- return false;
- }
- return true;
- }
-
@Override
public boolean matches(Environment e) {
if (!matchesBase(e)) return false;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java b/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java
index 7bb37c4..3b921a7 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java
@@ -5,7 +5,7 @@ import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
import org.openstreetmap.josm.gui.mappaint.Range;
public class IconPrototype extends Prototype {
-
+
public IconReference icon;
public Boolean annotate;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java b/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java
index 851d29f..289b019 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.gui.mappaint.xml;
import java.awt.Color;
import java.util.List;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
import org.openstreetmap.josm.gui.mappaint.Range;
@@ -61,7 +62,7 @@ public class LinePrototype extends Prototype {
found = true;
}
if (f < 0) {
- System.err.println(I18n.tr("Illegal dash pattern, values must be positive"));
+ Main.error(I18n.tr("Illegal dash pattern, values must be positive"));
this.dashed = null;
return;
}
@@ -69,7 +70,7 @@ public class LinePrototype extends Prototype {
if (found) {
this.dashed = dashed;
} else {
- System.err.println(I18n.tr("Illegal dash pattern, at least one value must be > 0"));
+ Main.error(I18n.tr("Illegal dash pattern, at least one value must be > 0"));
}
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
index d597068..e2075a3 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java
@@ -3,14 +3,15 @@ package org.openstreetmap.josm.gui.mappaint.xml;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Node;
@@ -33,14 +34,14 @@ import org.xml.sax.SAXParseException;
public class XmlStyleSource extends StyleSource implements StyleKeys {
- protected final HashMap<String, IconPrototype> icons = new HashMap<String, IconPrototype>();
- protected final HashMap<String, LinePrototype> lines = new HashMap<String, LinePrototype>();
- protected final HashMap<String, LinemodPrototype> modifiers = new HashMap<String, LinemodPrototype>();
- protected final HashMap<String, AreaPrototype> areas = new HashMap<String, AreaPrototype>();
- protected final LinkedList<IconPrototype> iconsList = new LinkedList<IconPrototype>();
- protected final LinkedList<LinePrototype> linesList = new LinkedList<LinePrototype>();
- protected final LinkedList<LinemodPrototype> modifiersList = new LinkedList<LinemodPrototype>();
- protected final LinkedList<AreaPrototype> areasList = new LinkedList<AreaPrototype>();
+ protected final Map<String, IconPrototype> icons = new HashMap<String, IconPrototype>();
+ protected final Map<String, LinePrototype> lines = new HashMap<String, LinePrototype>();
+ protected final Map<String, LinemodPrototype> modifiers = new HashMap<String, LinemodPrototype>();
+ protected final Map<String, AreaPrototype> areas = new HashMap<String, AreaPrototype>();
+ protected final List<IconPrototype> iconsList = new LinkedList<IconPrototype>();
+ protected final List<LinePrototype> linesList = new LinkedList<LinePrototype>();
+ protected final List<LinemodPrototype> modifiersList = new LinkedList<LinemodPrototype>();
+ protected final List<AreaPrototype> areasList = new LinkedList<AreaPrototype>();
public XmlStyleSource(String url, String name, String shortdescription) {
super(url, name, shortdescription);
@@ -50,6 +51,7 @@ public class XmlStyleSource extends StyleSource implements StyleKeys {
super(entry);
}
+ @Override
protected void init() {
super.init();
icons.clear();
@@ -66,32 +68,37 @@ public class XmlStyleSource extends StyleSource implements StyleKeys {
public void loadStyleSource() {
init();
try {
- InputStreamReader reader = new InputStreamReader(getSourceInputStream());
- XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this));
- parser.startWithValidation(reader,
- "http://josm.openstreetmap.de/mappaint-style-1.0",
- "resource://data/mappaint-style.xsd");
- while(parser.hasNext()) {
+ InputStream in = getSourceInputStream();
+ try {
+ InputStreamReader reader = new InputStreamReader(in);
+ XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this));
+ parser.startWithValidation(reader,
+ Main.JOSM_WEBSITE+"/mappaint-style-1.0",
+ "resource://data/mappaint-style.xsd");
+ while (parser.hasNext());
+ } finally {
+ closeSourceInputStream(in);
}
- } catch(IOException e) {
- System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
+ } catch (IOException e) {
+ Main.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
e.printStackTrace();
logError(e);
- } catch(SAXParseException e) {
- System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}", url, e.getLineNumber(), e.getColumnNumber(), e.getMessage()));
+ } catch (SAXParseException e) {
+ Main.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: [{1}:{2}] {3}", url, e.getLineNumber(), e.getColumnNumber(), e.getMessage()));
e.printStackTrace();
logError(e);
- } catch(SAXException e) {
- System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
+ } catch (SAXException e) {
+ Main.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
e.printStackTrace();
logError(e);
}
}
+ @Override
public InputStream getSourceInputStream() throws IOException {
MirroredInputStream in = new MirroredInputStream(url);
- InputStream zip = in.getZipEntry("xml", "style");
+ InputStream zip = in.findZipEntryInputStream("xml", "style");
if (zip != null) {
zipIcons = in.getFile();
return zip;
@@ -320,8 +327,8 @@ public class XmlStyleSource extends StyleSource implements StyleKeys {
if (refWidth != null && p.linemods != null) {
int numOver = 0, numUnder = 0;
- while (mc.hasLayer(String.format("over_%d", ++numOver))) {}
- while (mc.hasLayer(String.format("under_%d", ++numUnder))) {}
+ while (mc.hasLayer(String.format("over_%d", ++numOver)));
+ while (mc.hasLayer(String.format("under_%d", ++numUnder)));
for (LinemodPrototype mod : p.linemods) {
Cascade c;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java b/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java
index 4c4aa08..77f29c0 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java
@@ -30,8 +30,7 @@ public class XmlStyleSourceHandler extends DefaultHandler
LinemodPrototype linemod = new LinemodPrototype();
AreaPrototype area = new AreaPrototype();
IconPrototype icon = new IconPrototype();
- public void init()
- {
+ public void init() {
conditions = null;
scaleMax = Double.POSITIVE_INFINITY;
scaleMin = 0;
@@ -49,9 +48,8 @@ public class XmlStyleSourceHandler extends DefaultHandler
rule.init();
}
- Color convertColor(String colString)
- {
- int i = colString.indexOf("#");
+ Color convertColor(String colString) {
+ int i = colString.indexOf('#');
Color ret;
if (i < 0) {
ret = Main.pref.getColor("mappaint."+style.getPrefName()+"."+colString, Color.red);
@@ -74,21 +72,18 @@ public class XmlStyleSourceHandler extends DefaultHandler
private void error(String message) {
String warning = style.getDisplayString() + " (" + rule.cond.key + "=" + rule.cond.value + "): " + message;
- System.err.println(warning);
+ Main.warn(warning);
style.logError(new Exception(warning));
}
private void startElementLine(String qName, Attributes atts, LinePrototype line) {
- for (int count=0; count<atts.getLength(); count++)
- {
- if(atts.getQName(count).equals("width"))
- {
+ for (int count=0; count<atts.getLength(); count++) {
+ if(atts.getQName(count).equals("width")) {
String val = atts.getValue(count);
if (! (val.startsWith("+") || val.startsWith("-") || val.endsWith("%"))) {
line.setWidth(Integer.parseInt(val));
}
- }
- else if (atts.getQName(count).equals("colour")) {
+ } else if (atts.getQName(count).equals("colour")) {
line.color=convertColor(atts.getValue(count));
} else if (atts.getQName(count).equals("realwidth")) {
line.realWidth=Integer.parseInt(atts.getValue(count));
@@ -121,23 +116,16 @@ public class XmlStyleSourceHandler extends DefaultHandler
private void startElementLinemod(String qName, Attributes atts, LinemodPrototype line) {
startElementLine(qName, atts, line);
- for (int count=0; count<atts.getLength(); count++)
- {
- if(atts.getQName(count).equals("width"))
- {
+ for (int count=0; count<atts.getLength(); count++) {
+ if (atts.getQName(count).equals("width")) {
String val = atts.getValue(count);
- if(val.startsWith("+"))
- {
+ if (val.startsWith("+")) {
line.setWidth(Integer.parseInt(val.substring(1)));
line.widthMode = LinemodPrototype.WidthMode.OFFSET;
- }
- else if(val.startsWith("-"))
- {
+ } else if(val.startsWith("-")) {
line.setWidth(Integer.parseInt(val));
line.widthMode = LinemodPrototype.WidthMode.OFFSET;
- }
- else if(val.endsWith("%"))
- {
+ } else if(val.endsWith("%")) {
line.setWidth(Integer.parseInt(val.substring(0, val.length()-1)));
line.widthMode = LinemodPrototype.WidthMode.PERCENT;
} else {
@@ -150,12 +138,10 @@ public class XmlStyleSourceHandler extends DefaultHandler
}
@Override public void startElement(String uri,String name, String qName, Attributes atts) {
- if (inDoc==true)
- {
+ if (inDoc) {
if (qName.equals("rule")) {
inRule=true;
- } else if (qName.equals("rules"))
- {
+ } else if (qName.equals("rules")) {
if (style.name == null) {
style.name = atts.getValue("name");
}
@@ -165,17 +151,14 @@ public class XmlStyleSourceHandler extends DefaultHandler
if (style.icon == null) {
style.icon = atts.getValue("icon");
}
- }
- else if (qName.equals("scale_max")) {
+ } else if (qName.equals("scale_max")) {
inScaleMax = true;
} else if (qName.equals("scale_min")) {
inScaleMin = true;
- } else if (qName.equals("condition") && inRule)
- {
+ } else if (qName.equals("condition") && inRule) {
inCondition=true;
XmlCondition c = rule.cond;
- if(c.key != null)
- {
+ if (c.key != null) {
if(rule.conditions == null) {
rule.conditions = new LinkedList<XmlCondition>();
}
@@ -183,11 +166,10 @@ public class XmlStyleSourceHandler extends DefaultHandler
c = new XmlCondition();
rule.conditions.add(c);
}
- for (int count=0; count<atts.getLength(); count++)
- {
- if(atts.getQName(count).equals("k")) {
+ for (int count=0; count<atts.getLength(); count++) {
+ if (atts.getQName(count).equals("k")) {
c.key = atts.getValue(count);
- } else if(atts.getQName(count).equals("v")) {
+ } else if (atts.getQName(count).equals("v")) {
c.value = atts.getValue(count);
} else if(atts.getQName(count).equals("b")) {
c.boolValue = atts.getValue(count);
@@ -198,22 +180,15 @@ public class XmlStyleSourceHandler extends DefaultHandler
if(c.key == null) {
error("The condition has no key!");
}
- }
- else if (qName.equals("line"))
- {
+ } else if (qName.equals("line")) {
hadLine = inLine = true;
startElementLine(qName, atts, rule.line);
- }
- else if (qName.equals("linemod"))
- {
+ } else if (qName.equals("linemod")) {
hadLineMod = inLineMod = true;
startElementLinemod(qName, atts, rule.linemod);
- }
- else if (qName.equals("icon"))
- {
+ } else if (qName.equals("icon")) {
inIcon = true;
- for (int count=0; count<atts.getLength(); count++)
- {
+ for (int count=0; count<atts.getLength(); count++) {
if (atts.getQName(count).equals("src")) {
IconReference icon = new IconReference(atts.getValue(count), style);
hadIcon = (icon != null);
@@ -226,9 +201,7 @@ public class XmlStyleSourceHandler extends DefaultHandler
error("The element \"" + qName + "\" has unknown attribute \"" + atts.getQName(count) + "\"!");
}
}
- }
- else if (qName.equals("area"))
- {
+ } else if (qName.equals("area")) {
hadArea = inArea = true;
for (int count=0; count<atts.getLength(); count++)
{
@@ -250,24 +223,22 @@ public class XmlStyleSourceHandler extends DefaultHandler
@Override public void endElement(String uri,String name, String qName)
{
- if (inRule && qName.equals("rule"))
- {
- if(hadLine)
- {
+ if (inRule && qName.equals("rule")) {
+ if (hadLine) {
style.add(rule.cond, rule.conditions,
new LinePrototype(rule.line, new Range(rule.scaleMin, rule.scaleMax)));
}
- if(hadLineMod)
+ if (hadLineMod)
{
style.add(rule.cond, rule.conditions,
new LinemodPrototype(rule.linemod, new Range(rule.scaleMin, rule.scaleMax)));
}
- if(hadIcon)
+ if (hadIcon)
{
style.add(rule.cond, rule.conditions,
new IconPrototype(rule.icon, new Range(rule.scaleMin, rule.scaleMax)));
}
- if(hadArea)
+ if (hadArea)
{
style.add(rule.cond, rule.conditions,
new AreaPrototype(rule.area, new Range(rule.scaleMin, rule.scaleMax)));
@@ -275,8 +246,7 @@ public class XmlStyleSourceHandler extends DefaultHandler
inRule = false;
hadLine = hadLineMod = hadIcon = hadArea = false;
rule.init();
- }
- else if (inCondition && qName.equals("condition")) {
+ } else if (inCondition && qName.equals("condition")) {
inCondition = false;
} else if (inLine && qName.equals("line")) {
inLine = false;
@@ -293,11 +263,10 @@ public class XmlStyleSourceHandler extends DefaultHandler
}
}
- @Override public void characters(char ch[], int start, int length)
- {
- if (inScaleMax == true) {
+ @Override public void characters(char[] ch, int start, int length) {
+ if (inScaleMax) {
rule.scaleMax = Long.parseLong(new String(ch, start, length));
- } else if (inScaleMin == true) {
+ } else if (inScaleMin) {
rule.scaleMin = Long.parseLong(new String(ch, start, length));
}
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java b/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java
index 04c6783..6283a51 100644
--- a/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java
@@ -10,10 +10,10 @@ import java.awt.Insets;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import org.openstreetmap.josm.data.oauth.OAuthToken;
import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* Displays the key and the secret of an OAuth Access Token.
@@ -21,8 +21,8 @@ import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
*/
public class AccessTokenInfoPanel extends JPanel {
- private JTextField tfAccessTokenKey;
- private JTextField tfAccessTokenSecret;
+ private JosmTextField tfAccessTokenKey;
+ private JosmTextField tfAccessTokenSecret;
private JCheckBox cbSaveAccessTokenInPreferences;
protected void build() {
@@ -38,7 +38,7 @@ public class AccessTokenInfoPanel extends JPanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfAccessTokenKey = new JTextField(), gc);
+ add(tfAccessTokenKey = new JosmTextField(), gc);
tfAccessTokenKey.setEditable(false);
// the access token secret
@@ -50,7 +50,7 @@ public class AccessTokenInfoPanel extends JPanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfAccessTokenSecret = new JTextField(), gc);
+ add(tfAccessTokenSecret = new JosmTextField(), gc);
tfAccessTokenSecret.setEditable(false);
// the checkbox
diff --git a/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java b/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
index d2e500b..930fdbc 100644
--- a/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
@@ -14,7 +14,6 @@ import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
-import javax.swing.JTextField;
import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.oauth.OAuthParameters;
@@ -25,6 +24,7 @@ import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* Panel allowing the user to setup advanced OAuth parameters:
@@ -33,18 +33,18 @@ import org.openstreetmap.josm.tools.ImageProvider;
* <li>Request token URL</li>
* <li>Access token URL</li>
* <li>Authorize URL</li>
- *
+ *
* @see OAuthParameters
* @since 2746
*/
public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
private JCheckBox cbUseDefaults;
- private JTextField tfConsumerKey;
- private JTextField tfConsumerSecret;
- private JTextField tfRequestTokenURL;
- private JTextField tfAccessTokenURL;
- private JTextField tfAuthoriseURL;
+ private JosmTextField tfConsumerKey;
+ private JosmTextField tfConsumerSecret;
+ private JosmTextField tfRequestTokenURL;
+ private JosmTextField tfAccessTokenURL;
+ private JosmTextField tfAuthoriseURL;
private UseDefaultItemListener ilUseDefault;
private String apiUrl;
@@ -69,7 +69,7 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfConsumerKey = new JTextField(), gc);
+ add(tfConsumerKey = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfConsumerKey);
// -- consumer secret
@@ -80,7 +80,7 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfConsumerSecret = new JTextField(), gc);
+ add(tfConsumerSecret = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfConsumerSecret);
// -- request token URL
@@ -91,7 +91,7 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfRequestTokenURL = new JTextField(), gc);
+ add(tfRequestTokenURL = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfRequestTokenURL);
// -- access token URL
@@ -102,7 +102,7 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfAccessTokenURL = new JTextField(), gc);
+ add(tfAccessTokenURL = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfAccessTokenURL);
@@ -114,7 +114,7 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfAuthoriseURL = new JTextField(), gc);
+ add(tfAuthoriseURL = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfAuthoriseURL);
cbUseDefaults.addItemListener(ilUseDefault = new UseDefaultItemListener());
@@ -176,7 +176,7 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
protected void setChildComponentsEnabled(boolean enabled){
for (Component c: getComponents()) {
- if (c instanceof JTextField || c instanceof JLabel) {
+ if (c instanceof JosmTextField || c instanceof JLabel) {
c.setEnabled(enabled);
}
}
@@ -280,6 +280,7 @@ public class AdvancedOAuthPropertiesPanel extends VerticallyScrollablePanel {
class UseDefaultItemListener implements ItemListener {
private boolean enabled;
+ @Override
public void itemStateChanged(ItemEvent e) {
if (!enabled) return;
switch (e.getStateChange()) {
diff --git a/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java b/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
index e3d0f2f..38b63b7 100644
--- a/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
+++ b/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
@@ -75,6 +75,7 @@ public class AuthorizationProcedureComboBox extends JosmComboBox {
}
}
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int idx, boolean isSelected, boolean hasFocus) {
AuthorizationProcedure procedure = (AuthorizationProcedure)value;
renderColors(isSelected);
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
index ae87969..74cb15d 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
@@ -12,17 +12,15 @@ import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.io.IOException;
-import java.net.PasswordAuthentication;
import java.net.Authenticator.RequestorType;
+import java.net.PasswordAuthentication;
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JPasswordField;
import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.JTextComponent;
@@ -32,14 +30,15 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.oauth.OAuthToken;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.io.OsmApi;
@@ -58,8 +57,8 @@ import org.xml.sax.SAXException;
*/
public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
- private JTextField tfUserName;
- private JPasswordField tfPassword;
+ private JosmTextField tfUserName;
+ private JosmPasswordField tfPassword;
private UserNameValidator valUserName;
private PasswordValidator valPassword;
private AccessTokenInfoPanel pnlAccessTokenInfo;
@@ -71,7 +70,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Builds the panel with the three privileges the user can grant JOSM
*
- * @return
+ * @return constructed panel for the privileges
*/
protected VerticallyScrollablePanel buildGrantsPanel() {
pnlOsmPrivileges = new OsmPrivilegesPanel();
@@ -81,7 +80,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Builds the panel for entering the username and password
*
- * @return
+ * @return constructed panel for the creditentials
*/
protected VerticallyScrollablePanel buildUserNamePasswordPanel() {
VerticallyScrollablePanel pnl = new VerticallyScrollablePanel(new GridBagLayout());
@@ -115,7 +114,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfUserName = new JTextField(), gc);
+ pnl.add(tfUserName = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfUserName);
valUserName = new UserNameValidator(tfUserName);
valUserName.validate();
@@ -180,6 +179,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Initializes the panel with values from the preferences
+ * @param pref Preferences structure
*/
@Override
public void initFromPreferences(Preferences pref) {
@@ -204,7 +204,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Builds the panel with the action button for starting the authorisation
*
- * @return
+ * @return constructed button panel
*/
protected JPanel buildActionButtonPanel() {
JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
@@ -219,7 +219,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
/**
* Builds the panel which displays the generated Access Token.
*
- * @return
+ * @return constructed panel for the results
*/
protected JPanel buildResultsPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
@@ -339,6 +339,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent evt) {
Main.worker.submit(new FullyAutomaticAuthorisationTask(FullyAutomaticAuthorizationUI.this));
}
@@ -347,14 +348,17 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
setEnabled(valPassword.isValid() && valUserName.isValid());
}
+ @Override
public void changedUpdate(DocumentEvent e) {
updateEnabledState();
}
+ @Override
public void insertUpdate(DocumentEvent e) {
updateEnabledState();
}
+ @Override
public void removeUpdate(DocumentEvent e) {
updateEnabledState();
}
@@ -370,6 +374,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
prepareUIForEnteringRequest();
}
@@ -381,10 +386,10 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
class TestAccessTokenAction extends AbstractAction {
public TestAccessTokenAction() {
putValue(NAME, tr("Test Access Token"));
- /* putValue(SHORT_DESCRIPTION, ""); */
putValue(SMALL_ICON, ImageProvider.get("about"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
Main.worker.submit(new TestAccessTokenTask(
FullyAutomaticAuthorizationUI.this,
@@ -510,6 +515,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
protected void handleException(final OsmOAuthAuthorizationException e) {
Runnable r = new Runnable() {
+ @Override
public void run() {
if (e instanceof OsmLoginFailedException) {
alertLoginFailed((OsmLoginFailedException)e);
@@ -549,6 +555,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
getProgressMonitor().worked(1);
if (canceled)return;
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
prepareUIForResultDisplay();
setAccessToken(accessToken);
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
index 3dfabb5..d92a16b 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
@@ -8,27 +8,19 @@ import java.awt.GridBagLayout;
import java.awt.Insets;
import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
public class FullyAutomaticPropertiesPanel extends JPanel {
- private JTextField tfUserName;
- private JPasswordField tfPassword;
- private UserNameValidator valUserName;
-
- private JCheckBox cbWriteMapData;
- private JCheckBox cbWriteGpsTraces;
- private JCheckBox cbReadGpsTraces;
-
+ private JosmTextField tfUserName;
+ private JosmPasswordField tfPassword;
protected JPanel buildUserNamePasswordPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
@@ -42,9 +34,9 @@ public class FullyAutomaticPropertiesPanel extends JPanel {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfUserName = new JTextField(), gc);
+ pnl.add(tfUserName = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfUserName);
- valUserName = new UserNameValidator(tfUserName);
+ UserNameValidator valUserName = new UserNameValidator(tfUserName);
valUserName.validate();
gc.anchor = GridBagConstraints.NORTHWEST;
diff --git a/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
index 0ef3879..51d0c7c 100644
--- a/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
@@ -18,7 +18,6 @@ import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.JTextComponent;
@@ -31,6 +30,7 @@ import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* This is an UI which supports a JOSM user to get an OAuth Access Token in a fully
@@ -40,9 +40,9 @@ import org.openstreetmap.josm.tools.ImageProvider;
*/
public class ManualAuthorizationUI extends AbstractAuthorizationUI{
- private JTextField tfAccessTokenKey;
+ private JosmTextField tfAccessTokenKey;
private AccessTokenKeyValidator valAccessTokenKey;
- private JTextField tfAccessTokenSecret;
+ private JosmTextField tfAccessTokenSecret;
private AccessTokenSecretValidator valAccessTokenSecret;
private JCheckBox cbSaveToPreferences;
private HtmlPanel pnlMessage;
@@ -75,7 +75,7 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfAccessTokenKey = new JTextField(), gc);
+ pnl.add(tfAccessTokenKey = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfAccessTokenKey);
valAccessTokenKey = new AccessTokenKeyValidator(tfAccessTokenKey);
valAccessTokenKey.validate();
@@ -89,7 +89,7 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfAccessTokenSecret = new JTextField(), gc);
+ pnl.add(tfAccessTokenSecret = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfAccessTokenSecret);
valAccessTokenSecret = new AccessTokenSecretValidator(tfAccessTokenSecret);
valAccessTokenSecret.validate();
@@ -142,7 +142,7 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
@Override
public void setApiUrl(String apiUrl) {
super.setApiUrl(apiUrl);
- if (pnlMessage != null) {
+ if (pnlMessage != null) {
pnlMessage.setText(tr("<html><body>"
+ "Please enter an OAuth Access Token which is authorized to access the OSM server "
+ "''{0}''."
@@ -182,7 +182,7 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
@Override
public boolean isValid() {
- return ! getComponent().getText().trim().equals("");
+ return !getComponent().getText().trim().isEmpty();
}
@Override
@@ -202,7 +202,7 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
@Override
public boolean isValid() {
- return ! getComponent().getText().trim().equals("");
+ return !getComponent().getText().trim().isEmpty();
}
@Override
@@ -224,14 +224,17 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
setAccessToken(new OAuthToken(tfAccessTokenKey.getText().trim(), tfAccessTokenSecret.getText().trim()));
}
}
+ @Override
public void changedUpdate(DocumentEvent e) {
build();
}
+ @Override
public void insertUpdate(DocumentEvent e) {
build();
}
+ @Override
public void removeUpdate(DocumentEvent e) {
build();
}
@@ -248,6 +251,7 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent evt) {
TestAccessTokenTask task = new TestAccessTokenTask(
ManualAuthorizationUI.this,
@@ -262,6 +266,7 @@ public class ManualAuthorizationUI extends AbstractAuthorizationUI{
setEnabled(hasAccessToken());
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (! evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP))
return;
diff --git a/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java b/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
index 66579e5..c18ad75 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
@@ -55,7 +55,6 @@ import org.openstreetmap.josm.tools.WindowGeometry;
*
*/
public class OAuthAuthorizationWizard extends JDialog {
- private HtmlPanel pnlMessage;
private boolean canceled;
private final String apiUrl;
@@ -68,7 +67,7 @@ public class OAuthAuthorizationWizard extends JDialog {
/**
* Builds the row with the action buttons
*
- * @return
+ * @return panel with buttons
*/
protected JPanel buildButtonRow(){
JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
@@ -88,7 +87,7 @@ public class OAuthAuthorizationWizard extends JDialog {
/**
* Builds the panel with general information in the header
*
- * @return
+ * @return panel woth information display
*/
protected JPanel buildHeaderInfoPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
@@ -108,7 +107,7 @@ public class OAuthAuthorizationWizard extends JDialog {
// OAuth in a nutshell ...
gc.gridy = 1;
gc.insets = new Insets(5,0,0,5);
- pnlMessage = new HtmlPanel();
+ HtmlPanel pnlMessage = new HtmlPanel();
pnlMessage.setText("<html><body>"
+ tr("With OAuth you grant JOSM the right to upload map data and GPS tracks "
+ "on your behalf (<a href=\"{0}\">more info...</a>).", "http://oauth.net/")
@@ -175,15 +174,19 @@ public class OAuthAuthorizationWizard extends JDialog {
spAuthorisationProcedureUI.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
spAuthorisationProcedureUI.getVerticalScrollBar().addComponentListener(
new ComponentListener() {
+ @Override
public void componentShown(ComponentEvent e) {
spAuthorisationProcedureUI.setBorder(UIManager.getBorder("ScrollPane.border"));
}
+ @Override
public void componentHidden(ComponentEvent e) {
spAuthorisationProcedureUI.setBorder(null);
}
+ @Override
public void componentResized(ComponentEvent e) {}
+ @Override
public void componentMoved(ComponentEvent e) {}
}
);
@@ -294,7 +297,7 @@ public class OAuthAuthorizationWizard extends JDialog {
)
).applySafe(this);
initFromPreferences();
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
@@ -305,6 +308,7 @@ public class OAuthAuthorizationWizard extends JDialog {
}
class AuthorisationProcedureChangeListener implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent arg0) {
refreshAuthorisationProcedurePanel();
}
@@ -322,6 +326,7 @@ public class OAuthAuthorizationWizard extends JDialog {
setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent evt) {
cancel();
}
@@ -337,6 +342,7 @@ public class OAuthAuthorizationWizard extends JDialog {
updateEnabledState(null);
}
+ @Override
public void actionPerformed(ActionEvent evt) {
setCanceled(false);
setVisible(false);
@@ -346,6 +352,7 @@ public class OAuthAuthorizationWizard extends JDialog {
setEnabled(token != null);
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (!evt.getPropertyName().equals(AbstractAuthorizationUI.ACCESS_TOKEN_PROP))
return;
@@ -362,6 +369,7 @@ public class OAuthAuthorizationWizard extends JDialog {
}
static class ExternalBrowserLauncher implements HyperlinkListener {
+ @Override
public void hyperlinkUpdate(HyperlinkEvent e) {
if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
OpenBrowser.displayUrl(e.getDescription());
diff --git a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
index a3e9339..911b1a1 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
@@ -39,7 +39,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Utils;
/**
- * An OAuth 1.0 authorization client.
+ * An OAuth 1.0 authorization client.
* @since 2746
*/
public class OsmOAuthAuthorizationClient {
@@ -109,15 +109,15 @@ public class OsmOAuthAuthorizationClient {
if (con != null) {
con.disconnect();
}
- } catch(NoSuchFieldException e) {
+ } catch (NoSuchFieldException e) {
e.printStackTrace();
- System.err.println(tr("Warning: failed to cancel running OAuth operation"));
- } catch(SecurityException e) {
+ Main.warn(tr("Failed to cancel running OAuth operation"));
+ } catch (SecurityException e) {
e.printStackTrace();
- System.err.println(tr("Warning: failed to cancel running OAuth operation"));
- } catch(IllegalAccessException e) {
+ Main.warn(tr("Failed to cancel running OAuth operation"));
+ } catch (IllegalAccessException e) {
e.printStackTrace();
- System.err.println(tr("Warning: failed to cancel running OAuth operation"));
+ Main.warn(tr("Failed to cancel running OAuth operation"));
}
}
synchronized(this) {
@@ -211,17 +211,22 @@ public class OsmOAuthAuthorizationClient {
}
protected String extractToken(HttpURLConnection connection) {
+ BufferedReader r = null;
try {
- BufferedReader r = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ r = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String c;
Pattern p = Pattern.compile(".*authenticity_token.*value=\"([^\"]+)\".*");
- while((c = r.readLine()) != null) {
+ while ((c = r.readLine()) != null) {
Matcher m = p.matcher(c);
- if(m.find())
+ if (m.find()) {
return m.group(1);
+ }
}
} catch (IOException e) {
+ Main.error(e);
return null;
+ } finally {
+ Utils.close(r);
}
return null;
}
@@ -404,7 +409,7 @@ public class OsmOAuthAuthorizationClient {
dout = new DataOutputStream(connection.getOutputStream());
dout.writeBytes(request);
dout.flush();
- dout.close();
+ Utils.close(dout);
// after a successful login the OSM website sends a redirect to a follow up page. Everything
// else, including a 200 OK, is a failed login. A 200 OK is replied if the login form with
@@ -418,11 +423,7 @@ public class OsmOAuthAuthorizationClient {
} catch(IOException e) {
throw new OsmLoginFailedException(e);
} finally {
- if (dout != null) {
- try {
- dout.close();
- } catch(IOException e) { /* ignore */ }
- }
+ Utils.close(dout);
synchronized(this) {
connection = null;
}
@@ -471,6 +472,9 @@ public class OsmOAuthAuthorizationClient {
if (privileges.isAllowReadPrefs()) {
parameters.put("allow_read_prefs", "yes");
}
+ if(privileges.isAllowModifyNotes()) {
+ parameters.put("allow_write_notes", "yes");
+ }
parameters.put("commit", "Save changes");
@@ -495,7 +499,6 @@ public class OsmOAuthAuthorizationClient {
dout = new DataOutputStream(connection.getOutputStream());
dout.writeBytes(request);
dout.flush();
- dout.close();
int retCode = connection.getResponseCode();
if (retCode != HttpURLConnection.HTTP_OK)
@@ -505,11 +508,7 @@ public class OsmOAuthAuthorizationClient {
} catch(IOException e) {
throw new OsmOAuthAuthorizationException(e);
} finally {
- if (dout != null) {
- try {
- dout.close();
- } catch(IOException e) { /* ignore */ }
- }
+ Utils.close(dout);
synchronized(this) {
connection = null;
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java b/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
index 60b51d4..0fc9232 100644
--- a/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
+++ b/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java
@@ -21,6 +21,7 @@ public class OsmPrivilegesPanel extends VerticallyScrollablePanel{
private JCheckBox cbReadGpx;
private JCheckBox cbWritePrefs;
private JCheckBox cbReadPrefs;
+ private JCheckBox cbModifyNotes;
protected void build() {
setLayout(new GridBagLayout());
@@ -70,8 +71,14 @@ public class OsmPrivilegesPanel extends VerticallyScrollablePanel{
cbWritePrefs.setToolTipText(tr("Select to grant JOSM the right to write your server preferences"));
cbWritePrefs.setSelected(true);
- // filler - grab remaining space
gc.gridy = 5;
+ add(cbModifyNotes = new JCheckBox(), gc);
+ cbModifyNotes.setText(tr("Allow modifications of notes"));
+ cbModifyNotes.setToolTipText(tr("Select to grant JOSM the right to modify notes on your behalf"));
+ cbModifyNotes.setSelected(true);
+
+ // filler - grab remaining space
+ gc.gridy = 6;
gc.fill = GridBagConstraints.BOTH;
gc.weightx = 1.0;
gc.weighty = 1.0;
@@ -94,6 +101,7 @@ public class OsmPrivilegesPanel extends VerticallyScrollablePanel{
privileges.setAllowReadGpx(cbReadGpx.isSelected());
privileges.setAllowWritePrefs(cbWritePrefs.isSelected());
privileges.setAllowReadPrefs(cbReadPrefs.isSelected());
+ privileges.setAllowModifyNotes(cbModifyNotes.isSelected());
return privileges;
}
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java b/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java
index 3319d5c..3adb088 100644
--- a/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java
+++ b/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java
@@ -99,7 +99,7 @@ public class RetrieveAccessTokenTask extends PleaseWaitRunnable {
/**
* Replies true if the task was canceled.
*
- * @return
+ * @return {@code true} if user aborted operation
*/
public boolean isCanceled() {
return canceled;
diff --git a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
index 9be20aa..cf75879 100644
--- a/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
@@ -19,24 +19,24 @@ import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* This is the UI for running a semic-automic authorisation procedure.
*
* In contrast to the fully-automatic procedure the user is dispatched to an
* external browser for login and authorisation.
- *
+ *
* @since 2746
*/
public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
@@ -127,6 +127,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
cbShowAdvancedParameters.setSelected(false);
cbShowAdvancedParameters.addItemListener(
new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent evt) {
getAdvancedPropertiesPanel().setVisible(evt.getStateChange() == ItemEvent.SELECTED);
}
@@ -206,7 +207,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
*/
private class RetrieveAccessTokenPanel extends JPanel {
- private JTextField tfAuthoriseUrl;
+ private JosmTextField tfAuthoriseUrl;
protected JPanel buildTitlePanel() {
JPanel pnl = new JPanel(new BorderLayout());
@@ -245,7 +246,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfAuthoriseUrl = new JTextField(), gc);
+ pnl.add(tfAuthoriseUrl = new JosmTextField(), gc);
tfAuthoriseUrl.setEditable(false);
return pnl;
@@ -284,6 +285,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
transitionToRetrieveRequestToken();
}
@@ -358,6 +360,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
transitionToRetrieveRequestToken();
}
@@ -379,6 +382,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
putValue(SHORT_DESCRIPTION, tr("Click to retrieve a Request Token"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
final RetrieveRequestTokenTask task = new RetrieveRequestTokenTask(
SemiAutomaticAuthorizationUI.this,
@@ -386,11 +390,13 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
);
Main.worker.submit(task);
Runnable r = new Runnable() {
+ @Override
public void run() {
if (task.isCanceled()) return;
if (task.getRequestToken() == null) return;
requestToken = task.getRequestToken();
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
transitionToRetrieveAccessToken();
}
@@ -412,6 +418,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
putValue(SHORT_DESCRIPTION, tr("Click to retrieve an Access Token"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
final RetrieveAccessTokenTask task = new RetrieveAccessTokenTask(
SemiAutomaticAuthorizationUI.this,
@@ -420,11 +427,13 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
);
Main.worker.submit(task);
Runnable r = new Runnable() {
+ @Override
public void run() {
if (task.isCanceled()) return;
if (task.getAccessToken() == null) return;
setAccessToken(task.getAccessToken());
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
transitionToShowAccessToken();
}
@@ -446,6 +455,7 @@ public class SemiAutomaticAuthorizationUI extends AbstractAuthorizationUI {
putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
TestAccessTokenTask task = new TestAccessTokenTask(
SemiAutomaticAuthorizationUI.this,
diff --git a/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java b/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
index 511ec7e..ad26902 100644
--- a/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
+++ b/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
@@ -91,7 +91,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
// remove trailing slashes
while(url.endsWith("/")) {
- url = url.substring(0, url.lastIndexOf("/"));
+ url = url.substring(0, url.lastIndexOf('/'));
}
return url;
}
@@ -137,7 +137,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
}
protected void notifySuccess(UserInfo userInfo) {
- HelpAwareOptionPane.showOptionDialog(
+ HelpAwareOptionPane.showMessageDialogInEDT(
parent,
tr("<html>"
+ "Successfully used the Access Token ''{0}'' to<br>"
@@ -156,7 +156,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
}
protected void alertFailedAuthentication() {
- HelpAwareOptionPane.showOptionDialog(
+ HelpAwareOptionPane.showMessageDialogInEDT(
parent,
tr("<html>"
+ "Failed to access the OSM server ''{0}''<br>"
@@ -174,7 +174,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
}
protected void alertFailedAuthorisation() {
- HelpAwareOptionPane.showOptionDialog(
+ HelpAwareOptionPane.showMessageDialogInEDT(
parent,
tr("<html>"
+ "The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>"
@@ -192,7 +192,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
}
protected void alertFailedConnection() {
- HelpAwareOptionPane.showOptionDialog(
+ HelpAwareOptionPane.showMessageDialogInEDT(
parent,
tr("<html>"
+ "Failed to retrieve information about the current user"
@@ -211,7 +211,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
}
protected void alertFailedSigning() {
- HelpAwareOptionPane.showOptionDialog(
+ HelpAwareOptionPane.showMessageDialogInEDT(
parent,
tr("<html>"
+ "Failed to sign the request for the OSM server ''{0}'' with the "
@@ -228,7 +228,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
}
protected void alertInternalError() {
- HelpAwareOptionPane.showOptionDialog(
+ HelpAwareOptionPane.showMessageDialogInEDT(
parent,
tr("<html>"
+ "The test failed because the server responded with an internal error.<br>"
@@ -260,7 +260,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
if (e.getResponseCode() == HttpURLConnection.HTTP_INTERNAL_ERROR) {
alertInternalError();
return;
- } if (e.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
+ } else if (e.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
alertFailedAuthentication();
return;
} else if (e.getResponseCode() == HttpURLConnection.HTTP_FORBIDDEN) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java b/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java
index 97fb826..a6402e6 100644
--- a/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java
@@ -9,9 +9,9 @@ import javax.swing.Box;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
/*
@@ -26,14 +26,15 @@ import org.openstreetmap.josm.tools.GBC;
* audio.toolbar ??
*/
-public class AudioPreference extends DefaultTabPreferenceSetting {
+public final class AudioPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new AudioPreference();
}
}
-
+
private AudioPreference() {
super("audio", tr("Audio Settings"), tr("Settings for the audio player and audio markers."));
}
@@ -49,14 +50,15 @@ public class AudioPreference extends DefaultTabPreferenceSetting {
private JCheckBox audioMarkersFromWavTimestamps = new JCheckBox(tr("Modified times (time stamps) of audio files."));
private JCheckBox audioMarkersFromStart = new JCheckBox(tr("Start of track (will always do this if no other markers available)."));
- private JTextField audioLeadIn = new JTextField(8);
- private JTextField audioForwardBackAmount = new JTextField(8);
- private JTextField audioFastForwardMultiplier = new JTextField(8);
- private JTextField audioCalibration = new JTextField(8);
+ private JosmTextField audioLeadIn = new JosmTextField(8);
+ private JosmTextField audioForwardBackAmount = new JosmTextField(8);
+ private JosmTextField audioFastForwardMultiplier = new JosmTextField(8);
+ private JosmTextField audioCalibration = new JosmTextField(8);
+ @Override
public void addGui(PreferenceTabbedPane gui) {
JPanel audio = new JPanel(new GridBagLayout());
-
+
// audioMenuVisible
audioMenuVisible.setSelected(! Main.pref.getBoolean("audio.menuinvisible"));
audioMenuVisible.setToolTipText(tr("Show or hide the audio menu entry on the main menu bar."));
@@ -124,6 +126,7 @@ public class AudioPreference extends DefaultTabPreferenceSetting {
createPreferenceTabWithScrollPane(gui, audio);
}
+ @Override
public boolean ok() {
Main.pref.put("audio.menuinvisible", ! audioMenuVisible.isSelected());
Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected());
diff --git a/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java b/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
index 4c1c085..90b1ba3 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -29,7 +29,6 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.DocumentEvent;
@@ -45,6 +44,7 @@ import org.openstreetmap.josm.gui.preferences.plugin.PluginListPanel;
import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferencesModel;
import org.openstreetmap.josm.gui.preferences.plugin.PluginUpdatePolicyPanel;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.plugins.PluginDownloadTask;
import org.openstreetmap.josm.plugins.PluginInformation;
@@ -53,8 +53,9 @@ import org.openstreetmap.josm.plugins.ReadRemotePluginInformationTask;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
-public class PluginPreference extends DefaultTabPreferenceSetting {
+public final class PluginPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new PluginPreference();
}
@@ -97,7 +98,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
return sb.toString();
}
- private JTextField tfFilter;
+ private JosmTextField tfFilter;
private PluginListPanel pnlPluginPreferences;
private PluginPreferencesModel model;
private JScrollPane spPluginPreferences;
@@ -122,7 +123,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfFilter = new JTextField(), gc);
+ pnl.add(tfFilter = new JosmTextField(), gc);
tfFilter.setToolTipText(tr("Enter a search expression"));
SelectAllOnFocusGainedDecorator.decorate(tfFilter);
tfFilter.getDocument().addDocumentListener(new SearchFieldAdapter());
@@ -170,6 +171,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
return pane;
}
+ @Override
public void addGui(final PreferenceTabbedPane gui) {
GridBagConstraints gc = new GridBagConstraints();
gc.weightx = 1.0;
@@ -224,6 +226,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
return model != null ? model.getPluginsScheduledForUpdateOrDownload() : null;
}
+ @Override
public boolean ok() {
if (! pluginPreferencesActivated)
return false;
@@ -246,9 +249,11 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
public void readLocalPluginInformation() {
final ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask();
Runnable r = new Runnable() {
+ @Override
public void run() {
if (task.isCanceled()) return;
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
model.setAvailablePlugins(task.getAvailablePlugins());
pnlPluginPreferences.refreshView();
@@ -272,12 +277,15 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
putValue(SMALL_ICON, ImageProvider.get("download"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
final ReadRemotePluginInformationTask task = new ReadRemotePluginInformationTask(Main.pref.getPluginSites());
Runnable continuation = new Runnable() {
+ @Override
public void run() {
if (task.isCanceled()) return;
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
model.updateAvailablePlugins(task.getAvailablePlugins());
pnlPluginPreferences.refreshView();
@@ -329,6 +337,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
protected void alertNothingToUpdate() {
try {
SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
public void run() {
HelpAwareOptionPane.showOptionDialog(
pnlPluginPreferences,
@@ -337,13 +346,14 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
JOptionPane.INFORMATION_MESSAGE,
null // FIXME: provide help context
);
- };
+ }
});
} catch (Exception e) {
e.printStackTrace();
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
final List<PluginInformation> toUpdate = model.getSelectedPlugins();
// the async task for downloading plugins
@@ -358,6 +368,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
// to be run asynchronously after the plugin download
//
final Runnable pluginDownloadContinuation = new Runnable() {
+ @Override
public void run() {
if (pluginDownloadTask.isCanceled())
return;
@@ -375,6 +386,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
// to be run asynchronously after the plugin list download
//
final Runnable pluginInfoDownloadContinuation = new Runnable() {
+ @Override
public void run() {
if (pluginInfoDownloadTask.isCanceled())
return;
@@ -415,6 +427,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "settings"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
configureSites();
}
@@ -427,21 +440,24 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
class SearchFieldAdapter implements DocumentListener {
public void filter() {
String expr = tfFilter.getText().trim();
- if (expr.equals("")) {
+ if (expr.isEmpty()) {
expr = null;
}
model.filterDisplayedPlugins(expr);
pnlPluginPreferences.refreshView();
}
+ @Override
public void changedUpdate(DocumentEvent arg0) {
filter();
}
+ @Override
public void insertUpdate(DocumentEvent arg0) {
filter();
}
+ @Override
public void removeUpdate(DocumentEvent arg0) {
filter();
}
@@ -462,6 +478,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
add(new JScrollPane(list), GBC.std().fill());
JPanel buttons = new JPanel(new GridBagLayout());
buttons.add(new JButton(new AbstractAction(tr("Add")){
+ @Override
public void actionPerformed(ActionEvent e) {
String s = JOptionPane.showInputDialog(
JOptionPane.getFrameForComponent(PluginConfigurationSitesPanel.this),
@@ -475,6 +492,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
}
}), GBC.eol().fill(GBC.HORIZONTAL));
buttons.add(new JButton(new AbstractAction(tr("Edit")){
+ @Override
public void actionPerformed(ActionEvent e) {
if (list.getSelectedValue() == null) {
JOptionPane.showMessageDialog(
@@ -500,6 +518,7 @@ public class PluginPreference extends DefaultTabPreferenceSetting {
}
}), GBC.eol().fill(GBC.HORIZONTAL));
buttons.add(new JButton(new AbstractAction(tr("Delete")){
+ @Override
public void actionPerformed(ActionEvent event) {
if (list.getSelectedValue() == null) {
JOptionPane.showMessageDialog(
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
index aa6589b..1b7965d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
@@ -31,7 +31,6 @@ import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
-import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -47,6 +46,7 @@ public class PreferenceDialog extends JDialog {
JCheckBox expert = new JCheckBox(tr("Expert mode"));
expert.setSelected(ExpertToggleAction.isExpert());
expert.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
ExpertToggleAction.getInstance().actionPerformed(null);
}
@@ -85,7 +85,7 @@ public class PreferenceDialog extends JDialog {
// smaller screen than before, this will reset the stored preference.
this.setMaximumSize( Toolkit.getDefaultToolkit().getScreenSize());
}
-
+
/**
* Replies the preferences tabbed pane.
* @return The preferences tabbed pane, or null if the dialog is not yet initialized.
@@ -120,7 +120,7 @@ public class PreferenceDialog extends JDialog {
p
)
).applySafe(this);
- } else if (!visible && isShowing()){
+ } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
new WindowGeometry(this).remember(getClass().getName() + ".geometry");
}
super.setVisible(visible);
@@ -151,6 +151,7 @@ public class PreferenceDialog extends JDialog {
tpPreferences.validationListeners.clear();
}
+ @Override
public void actionPerformed(ActionEvent evt) {
cancel();
}
@@ -163,6 +164,7 @@ public class PreferenceDialog extends JDialog {
putValue(SHORT_DESCRIPTION, tr("Save the preferences and close the dialog"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
for (ValidationListener listener: tpPreferences.validationListeners) {
if (!listener.validatePreferences())
@@ -182,8 +184,4 @@ public class PreferenceDialog extends JDialog {
new CancelAction().cancel();
}
}
-
- public void selectMapPaintPreferenceTab() {
- tpPreferences.selectSubTabByPref(MapPaintPreference.class);
- }
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
index d61dca3..89ffe75 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
@@ -1,8 +1,8 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
/**
- * Base interface of Preferences settings, should not be directly implemented,
+ * Base interface of Preferences settings, should not be directly implemented,
* see {@link TabPreferenceSetting} and {@link SubPreferenceSetting}.
*/
public interface PreferenceSetting {
@@ -17,7 +17,7 @@ public interface PreferenceSetting {
* Return true when restart is required.
*/
boolean ok();
-
+
/**
* Called to know if the preferences tab has only to be displayed in expert mode.
* @return true if the tab has only to be displayed in expert mode, false otherwise.
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index 727d16a..50fffcd 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -29,6 +29,9 @@ import javax.swing.event.ChangeListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExpertToggleAction;
import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
+import org.openstreetmap.josm.actions.RestartAction;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference;
import org.openstreetmap.josm.gui.preferences.display.ColorPreference;
import org.openstreetmap.josm.gui.preferences.display.DisplayPreference;
@@ -55,7 +58,8 @@ import org.openstreetmap.josm.tools.ImageProvider;
*
* @author imi
*/
-public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener, ExpertModeChangeListener, ChangeListener {
+public final class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener, ExpertModeChangeListener, ChangeListener {
+
/**
* Allows PreferenceSettings to do validation of entered values when ok was pressed.
* If data is invalid then event can return false to cancel closing of preferences dialog.
@@ -74,7 +78,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
public Component getComponent();
}
- public static class PreferencePanel extends JPanel implements PreferenceTab {
+ public static final class PreferencePanel extends JPanel implements PreferenceTab {
private final TabPreferenceSetting preferenceSetting;
private PreferencePanel(TabPreferenceSetting preferenceSetting) {
@@ -104,7 +108,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
}
}
- public static class PreferenceScrollPane extends JScrollPane implements PreferenceTab {
+ public static final class PreferenceScrollPane extends JScrollPane implements PreferenceTab {
private final TabPreferenceSetting preferenceSetting;
private PreferenceScrollPane(Component view, TabPreferenceSetting preferenceSetting) {
@@ -113,8 +117,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
}
private PreferenceScrollPane(PreferencePanel preferencePanel) {
- super(preferencePanel.getComponent());
- this.preferenceSetting = preferencePanel.getTabPreferenceSetting();
+ this(preferencePanel.getComponent(), preferencePanel.getTabPreferenceSetting());
}
@Override
@@ -197,7 +200,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
selectTabBy(new TabIdentifier(){
@Override
public boolean identify(TabPreferenceSetting tps, Object name) {
- return tps.getIconName().equals(name);
+ return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName());
}}, name);
}
@@ -208,7 +211,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
return tps.getClass().isAssignableFrom((Class<?>) clazz);
}}, clazz);
}
-
+
public boolean selectSubTabByPref(Class<? extends SubPreferenceSetting> clazz) {
for (PreferenceSetting setting : settings) {
if (clazz.isInstance(setting)) {
@@ -241,6 +244,10 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
return getSetting(ImageryPreference.class);
}
+ public final ShortcutPreference getShortcutPreference() {
+ return getSetting(ShortcutPreference.class);
+ }
+
public void savePreferences() {
if(Main.applet)
return;
@@ -259,6 +266,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
// this is the task which will run *after* the plugins are downloaded
//
final Runnable continuation = new Runnable() {
+ @Override
public void run() {
boolean requiresRestart = false;
if (task != null && !task.isCanceled()) {
@@ -284,12 +292,28 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
}
if (requiresRestart) {
sb.append(tr("You have to restart JOSM for some settings to take effect."));
+ sb.append("<br/><br/>");
+ sb.append(tr("Would you like to restart now?"));
}
sb.append("</html>");
// display the message, if necessary
//
- if ((task != null && !task.isCanceled()) || requiresRestart) {
+ if (requiresRestart) {
+ final ButtonSpec [] options = RestartAction.getButtonSpecs();
+ if (0 == HelpAwareOptionPane.showOptionDialog(
+ Main.parent,
+ sb.toString(),
+ tr("Restart"),
+ JOptionPane.INFORMATION_MESSAGE,
+ null, /* no special icon */
+ options,
+ options[0],
+ null /* no special help */
+ )) {
+ Main.main.menu.restart.actionPerformed(null);
+ }
+ } else if (task != null && !task.isCanceled()) {
JOptionPane.showMessageDialog(
Main.parent,
sb.toString(),
@@ -308,6 +332,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
Main.worker.submit(task);
Main.worker.submit(
new Runnable() {
+ @Override
public void run() {
SwingUtilities.invokeLater(continuation);
}
@@ -385,13 +410,17 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
addTab(null, icon, new PreferencePanel(tps), tps.getTooltip());
}
}
+ } else if (!(setting instanceof SubPreferenceSetting)) {
+ Main.warn("Ignoring preferences "+setting);
}
}
try {
if (sel != null) {
setSelectedComponent(sel);
}
- } catch (IllegalArgumentException e) {}
+ } catch (IllegalArgumentException e) {
+ Main.warn(e);
+ }
}
@Override
@@ -445,6 +474,7 @@ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListe
* This mouse wheel listener reacts when a scroll is carried out over the
* tab strip and scrolls one tab/down or up, selecting it immediately.
*/
+ @Override
public void mouseWheelMoved(MouseWheelEvent wev) {
// Ensure the cursor is over the tab strip
if(super.indexAtLocation(wev.getPoint().x, wev.getPoint().y) < 0)
diff --git a/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java b/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java
index ef636b0..145fed0 100644
--- a/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java
@@ -31,8 +31,11 @@ import org.openstreetmap.josm.tools.GBC;
*
* @author Frederik Ramm
*/
-public class RemoteControlPreference extends DefaultTabPreferenceSetting {
+public final class RemoteControlPreference extends DefaultTabPreferenceSetting {
+ /**
+ * Factory used to build a new instance of this preference setting
+ */
public static class Factory implements PreferenceSettingFactory {
@Override
@@ -119,6 +122,13 @@ public class RemoteControlPreference extends DefaultTabPreferenceSetting {
Main.pref.put(RequestHandler.loadInNewLayerKey, loadInNewLayer.isSelected());
Main.pref.put(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected());
}
- return changed;
+ if (changed) {
+ if (enabled) {
+ RemoteControl.start();
+ } else {
+ RemoteControl.stop();
+ }
+ }
+ return false;
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java b/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
index 1e5448f..6ff39bd 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17,14 +17,16 @@ import org.openstreetmap.josm.gui.preferences.server.AuthenticationPreferencesPa
import org.openstreetmap.josm.gui.preferences.server.OsmApiUrlInputPanel;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
-public class ServerAccessPreference extends DefaultTabPreferenceSetting {
+
+public final class ServerAccessPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new ServerAccessPreference();
}
}
-
+
private ServerAccessPreference() {
super("connection", tr("Connection Settings"), tr("Connection Settings for the OSM server."), false, new JTabbedPane());
}
@@ -36,7 +38,6 @@ public class ServerAccessPreference extends DefaultTabPreferenceSetting {
private AuthenticationPreferencesPanel pnlAuthPreferences;
/** panel for configuring proxy preferences */
private ProxyPreferencesPanel pnlProxyPreferences;
- /** panel for backup preferences */
/**
* Embeds a vertically scrollable panel in a {@link JScrollPane}
@@ -53,7 +54,7 @@ public class ServerAccessPreference extends DefaultTabPreferenceSetting {
/**
* Builds the tabbed pane with the server preferences
*
- * @return
+ * @return panel with server preferences tabs
*/
protected JPanel buildTabbedServerPreferences() {
JPanel pnl = new JPanel(new BorderLayout());
@@ -76,7 +77,7 @@ public class ServerAccessPreference extends DefaultTabPreferenceSetting {
/**
* Builds the panel for entering the server access preferences
*
- * @return
+ * @return preferences panel for server settings
*/
protected JPanel buildContentPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
@@ -105,6 +106,7 @@ public class ServerAccessPreference extends DefaultTabPreferenceSetting {
return pnl;
}
+ @Override
public void addGui(PreferenceTabbedPane gui) {
GridBagConstraints gc = new GridBagConstraints();
gc.fill = GridBagConstraints.BOTH;
@@ -128,6 +130,7 @@ public class ServerAccessPreference extends DefaultTabPreferenceSetting {
/**
* Saves the values to the preferences
*/
+ @Override
public boolean ok() {
pnlApiUrlPreferences.saveToPreferences();
pnlAuthPreferences.saveToPreferences();
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
index 5584007..29865a0 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -58,7 +58,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
import javax.swing.ListCellRenderer;
@@ -73,7 +72,6 @@ import javax.swing.filechooser.FileFilter;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -82,7 +80,9 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
+import org.openstreetmap.josm.gui.util.TableHelper;
import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.GBC;
@@ -153,7 +153,7 @@ public abstract class SourceEditor extends JPanel {
// Yes, this is a little ugly, but should work
@Override
public void tableChanged(TableModelEvent e) {
- adjustColumnWidth(tblActiveSources, isMapPaint ? 1 : 0);
+ TableHelper.adjustColumnWidth(tblActiveSources, isMapPaint ? 1 : 0, 800);
}
});
activeSourcesModel.setActiveSources(getInitialSourcesList());
@@ -387,21 +387,6 @@ public abstract class SourceEditor extends JPanel {
LOADING_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM, FAILED_TO_LOAD_SOURCES_FROM_HELP_TOPIC,
ILLEGAL_FORMAT_OF_ENTRY }
- /**
- * adjust the preferred width of column col to the maximum preferred width of the cells
- * requires JTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- */
- private static void adjustColumnWidth(JTable tbl, int col) {
- int maxwidth = 0;
- for (int row=0; row<tbl.getRowCount(); row++) {
- TableCellRenderer tcr = tbl.getCellRenderer(row, col);
- Object val = tbl.getValueAt(row, col);
- Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, row, col);
- maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
- }
- tbl.getColumnModel().getColumn(col).setPreferredWidth(maxwidth);
- }
-
public boolean hasActiveSourcesChanged() {
Collection<? extends SourceEntry> prev = getInitialSourcesList();
List<SourceEntry> cur = activeSourcesModel.getSources();
@@ -438,7 +423,7 @@ public abstract class SourceEditor extends JPanel {
}
protected static class AvailableSourcesListModel extends DefaultListModel {
- private ArrayList<ExtendedSourceEntry> data;
+ private List<ExtendedSourceEntry> data;
private DefaultListSelectionModel selectionModel;
public AvailableSourcesListModel(DefaultListSelectionModel selectionModel) {
@@ -479,7 +464,7 @@ public abstract class SourceEditor extends JPanel {
}
public List<ExtendedSourceEntry> getSelected() {
- ArrayList<ExtendedSourceEntry> ret = new ArrayList<ExtendedSourceEntry>();
+ List<ExtendedSourceEntry> ret = new ArrayList<ExtendedSourceEntry>();
for(int i=0; i<data.size();i++) {
if (selectionModel.isSelectedIndex(i)) {
ret.add(data.get(i));
@@ -498,10 +483,12 @@ public abstract class SourceEditor extends JPanel {
this.data = new ArrayList<SourceEntry>();
}
+ @Override
public int getColumnCount() {
return isMapPaint ? 2 : 1;
}
+ @Override
public int getRowCount() {
return data == null ? 0 : data.size();
}
@@ -693,8 +680,8 @@ public abstract class SourceEditor extends JPanel {
protected class EditSourceEntryDialog extends ExtendedDialog {
- private JTextField tfTitle;
- private JTextField tfURL;
+ private JosmTextField tfTitle;
+ private JosmTextField tfURL;
private JCheckBox cbActive;
public EditSourceEntryDialog(Component parent, String title, SourceEntry e) {
@@ -704,11 +691,11 @@ public abstract class SourceEditor extends JPanel {
JPanel p = new JPanel(new GridBagLayout());
- tfTitle = new JTextField(60);
+ tfTitle = new JosmTextField(60);
p.add(new JLabel(tr("Name (optional):")), GBC.std().insets(15, 0, 5, 5));
p.add(tfTitle, GBC.eol().insets(0, 0, 5, 5));
- tfURL = new JTextField(60);
+ tfURL = new JosmTextField(60);
p.add(new JLabel(tr("URL / File:")), GBC.std().insets(15, 0, 5, 0));
p.add(tfURL, GBC.std().insets(0, 0, 5, 5));
JButton fileChooser = new JButton(new LaunchFileChooserAction());
@@ -762,6 +749,7 @@ public abstract class SourceEditor extends JPanel {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
FileFilter ff;
if (isMapPaint) {
@@ -802,6 +790,7 @@ public abstract class SourceEditor extends JPanel {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
EditSourceEntryDialog editEntryDialog = new EditSourceEntryDialog(
SourceEditor.this,
@@ -834,10 +823,12 @@ public abstract class SourceEditor extends JPanel {
setEnabled(tblActiveSources.getSelectedRowCount() > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
activeSourcesModel.removeSelected();
}
@@ -855,10 +846,12 @@ public abstract class SourceEditor extends JPanel {
setEnabled(tblActiveSources.getSelectedRowCount() == 1);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent evt) {
int pos = tblActiveSources.getSelectedRow();
if (pos < 0 || pos >= tblActiveSources.getRowCount())
@@ -906,10 +899,12 @@ public abstract class SourceEditor extends JPanel {
activeSourcesModel.move(increment);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void tableChanged(TableModelEvent e) {
updateEnabledState();
}
@@ -926,10 +921,12 @@ public abstract class SourceEditor extends JPanel {
setEnabled(lstAvailableSources.getSelectedIndices().length > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
List<ExtendedSourceEntry> sources = availableSourcesModel.getSelected();
int josmVersion = Version.getInstance().getVersion();
@@ -975,6 +972,7 @@ public abstract class SourceEditor extends JPanel {
putValue(SMALL_ICON, ImageProvider.get("preferences", "reset"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
activeSourcesModel.setActiveSources(getDefault());
}
@@ -991,6 +989,7 @@ public abstract class SourceEditor extends JPanel {
this.sourceProviders = sourceProviders;
}
+ @Override
public void actionPerformed(ActionEvent e) {
MirroredInputStream.cleanup(url);
reloadAvailableSources(url, sourceProviders);
@@ -998,7 +997,7 @@ public abstract class SourceEditor extends JPanel {
}
protected static class IconPathTableModel extends AbstractTableModel {
- private ArrayList<String> data;
+ private List<String> data;
private DefaultListSelectionModel selectionModel;
public IconPathTableModel(DefaultListSelectionModel selectionModel) {
@@ -1006,14 +1005,17 @@ public abstract class SourceEditor extends JPanel {
this.data = new ArrayList<String>();
}
+ @Override
public int getColumnCount() {
return 1;
}
+ @Override
public int getRowCount() {
return data == null ? 0 : data.size();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
return data.get(rowIndex);
}
@@ -1078,11 +1080,12 @@ public abstract class SourceEditor extends JPanel {
Collections.sort(
data,
new Comparator<String>() {
+ @Override
public int compare(String o1, String o2) {
- if (o1.equals("") && o2.equals(""))
+ if (o1.isEmpty() && o2.isEmpty())
return 0;
- if (o1.equals("")) return 1;
- if (o2.equals("")) return -1;
+ if (o1.isEmpty()) return 1;
+ if (o2.isEmpty()) return -1;
return o1.compareTo(o2);
}
}
@@ -1101,6 +1104,7 @@ public abstract class SourceEditor extends JPanel {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
}
+ @Override
public void actionPerformed(ActionEvent e) {
iconPathsModel.addPath("");
tblIconPaths.editCellAt(iconPathsModel.getRowCount() -1,0);
@@ -1119,10 +1123,12 @@ public abstract class SourceEditor extends JPanel {
setEnabled(tblIconPaths.getSelectedRowCount() > 0);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
iconPathsModel.removeSelected();
}
@@ -1140,10 +1146,12 @@ public abstract class SourceEditor extends JPanel {
setEnabled(tblIconPaths.getSelectedRowCount() == 1);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
int row = tblIconPaths.getSelectedRow();
tblIconPaths.editCellAt(row, 0);
@@ -1151,6 +1159,7 @@ public abstract class SourceEditor extends JPanel {
}
static class SourceEntryListCellRenderer extends JLabel implements ListCellRenderer {
+ @Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
boolean cellHasFocus) {
String s = value.toString();
@@ -1187,16 +1196,9 @@ public abstract class SourceEditor extends JPanel {
@Override
protected void cancel() {
canceled = true;
- if (reader!= null) {
- try {
- reader.close();
- } catch(IOException e) {
- // ignore
- }
- }
+ Utils.close(reader);
}
-
protected void warn(Exception e) {
String emsg = e.getMessage() != null ? e.getMessage() : e.toString();
emsg = emsg.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">");
@@ -1238,13 +1240,13 @@ public abstract class SourceEditor extends JPanel {
ExtendedSourceEntry last = null;
while ((line = reader.readLine()) != null && !canceled) {
- if (line.trim().equals("")) {
+ if (line.trim().isEmpty()) {
continue; // skip empty lines
}
if (line.startsWith("\t")) {
Matcher m = Pattern.compile("^\t([^:]+): *(.+)$").matcher(line);
if (! m.matches()) {
- System.err.println(tr(getStr(I18nString.ILLEGAL_FORMAT_OF_ENTRY), url, line));
+ Main.error(tr(getStr(I18nString.ILLEGAL_FORMAT_OF_ENTRY), url, line));
continue;
}
if (last != null) {
@@ -1288,7 +1290,7 @@ public abstract class SourceEditor extends JPanel {
if (m.matches()) {
sources.add(last = new ExtendedSourceEntry(m.group(1), m.group(2)));
} else {
- System.err.println(tr(getStr(I18nString.ILLEGAL_FORMAT_OF_ENTRY), url, line));
+ Main.error(tr(getStr(I18nString.ILLEGAL_FORMAT_OF_ENTRY), url, line));
}
}
}
@@ -1338,7 +1340,7 @@ public abstract class SourceEditor extends JPanel {
}
class FileOrUrlCellEditor extends JPanel implements TableCellEditor {
- private JTextField tfFileName;
+ private JosmTextField tfFileName;
private CopyOnWriteArrayList<CellEditorListener> listeners;
private String value;
private boolean isFile;
@@ -1354,7 +1356,7 @@ public abstract class SourceEditor extends JPanel {
gc.fill = GridBagConstraints.BOTH;
gc.weightx = 1.0;
gc.weighty = 1.0;
- add(tfFileName = new JTextField(), gc);
+ add(tfFileName = new JosmTextField(), gc);
gc.gridx = 1;
gc.gridy = 0;
@@ -1379,6 +1381,7 @@ public abstract class SourceEditor extends JPanel {
build();
}
+ @Override
public void addCellEditorListener(CellEditorListener l) {
if (l != null) {
listeners.addIfAbsent(l);
@@ -1397,28 +1400,34 @@ public abstract class SourceEditor extends JPanel {
}
}
+ @Override
public void cancelCellEditing() {
fireEditingCanceled();
}
+ @Override
public Object getCellEditorValue() {
return value;
}
+ @Override
public boolean isCellEditable(EventObject anEvent) {
if (anEvent instanceof MouseEvent)
return ((MouseEvent)anEvent).getClickCount() >= 2;
return true;
}
+ @Override
public void removeCellEditorListener(CellEditorListener l) {
listeners.remove(l);
}
+ @Override
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
+ @Override
public boolean stopCellEditing() {
value = tfFileName.getText();
fireEditingStopped();
@@ -1434,6 +1443,7 @@ public abstract class SourceEditor extends JPanel {
}
}
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
setInitialValue((String)value);
tfFileName.selectAll();
@@ -1472,6 +1482,7 @@ public abstract class SourceEditor extends JPanel {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
JFileChooserManager fcm = new JFileChooserManager(true).createFileChooser();
if (!isFile) {
@@ -1488,12 +1499,10 @@ public abstract class SourceEditor extends JPanel {
abstract public static class SourcePrefHelper {
- private final String prefOld;
private final String pref;
- public SourcePrefHelper(String pref, String prefOld) {
+ public SourcePrefHelper(String pref) {
this.pref = pref;
- this.prefOld = prefOld;
}
abstract public Collection<ExtendedSourceEntry> getDefault();
@@ -1502,23 +1511,9 @@ public abstract class SourceEditor extends JPanel {
abstract public SourceEntry deserialize(Map<String, String> entryStr);
- // migration can be removed end 2012
- abstract public Map<String, String> migrate(Collection<String> old);
-
public List<SourceEntry> get() {
- boolean migration = false;
Collection<Map<String, String>> src = Main.pref.getListOfStructs(pref, (Collection<Map<String, String>>) null);
- if (src == null) {
- Collection<Collection<String>> srcOldPrefFormat = Main.pref.getArray(prefOld, null);
- if (srcOldPrefFormat != null) {
- migration = true;
- src = new ArrayList<Map<String, String>>();
- for (Collection<String> p : srcOldPrefFormat) {
- src.add(migrate(p));
- }
- }
- }
if (src == null)
return new ArrayList<SourceEntry>(getDefault());
@@ -1529,14 +1524,11 @@ public abstract class SourceEditor extends JPanel {
entries.add(e);
}
}
- if (migration) {
- put(entries);
- }
return entries;
}
public boolean put(Collection<? extends SourceEntry> entries) {
- Collection<Map<String, String>> setting = new ArrayList<Map<String, String>>();
+ Collection<Map<String, String>> setting = new ArrayList<Map<String, String>>(entries.size());
for (SourceEntry e : entries) {
setting.add(serialize(e));
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java b/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
index f3ba00d..3b06e78 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
@@ -1,14 +1,16 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
+import static org.openstreetmap.josm.tools.Utils.equal;
+
import java.io.File;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static org.openstreetmap.josm.tools.Utils.equal;
+import org.openstreetmap.josm.Main;
/**
- * A source entry primarily used to save the user's selection of mappaint styles,
+ * A source entry primarily used to save the user's selection of mappaint styles,
* but also for preset sources.
*/
public class SourceEntry {
@@ -20,6 +22,17 @@ public class SourceEntry {
public String url;
/**
+ * Indicates, that {@link #url} is a zip file and the resource is
+ * inside the zip file.
+ */
+ public boolean isZip;
+
+ /**
+ * If {@link #isZip} is true, denotes the path inside the zip file.
+ */
+ public String zipEntryPath;
+
+ /**
* Name is used as a namespace for color preferences and (currently) only
* one file with a name can be loaded at a time. Additional styles must
* either have the same name as the main style or no name at all.
@@ -41,15 +54,23 @@ public class SourceEntry {
*/
public boolean active;
- public SourceEntry(String url, String name, String title, Boolean active) {
+ public SourceEntry(String url, boolean isZip, String zipEntryPath, String name, String title, boolean active) {
this.url = url;
+ this.isZip = isZip;
+ this.zipEntryPath = equal(zipEntryPath, "") ? null : zipEntryPath;
this.name = equal(name, "") ? null : name;
this.title = equal(title, "") ? null : title;
this.active = active;
}
+ public SourceEntry(String url, String name, String title, Boolean active) {
+ this(url, false, null, name, title, active);
+ }
+
public SourceEntry(SourceEntry e) {
this.url = e.url;
+ this.isZip = e.isZip;
+ this.zipEntryPath = e.zipEntryPath;
this.name = e.name;
this.title = e.title;
this.active = e.active;
@@ -60,7 +81,9 @@ public class SourceEntry {
if (obj == null || getClass() != obj.getClass())
return false;
final SourceEntry other = (SourceEntry) obj;
- return equal(other.url, url) &&
+ return equal(other.url, url) &&
+ other.isZip == isZip &&
+ equal(other.zipEntryPath, zipEntryPath) &&
equal(other.name, name) &&
equal(other.title, title) &&
other.active == active;
@@ -70,6 +93,8 @@ public class SourceEntry {
public int hashCode() {
int hash = 5;
hash = 89 * hash + (this.url != null ? this.url.hashCode() : 0);
+ hash = 89 * hash + (this.isZip ? 1 : 0);
+ hash = 89 * hash + (this.zipEntryPath != null ? this.zipEntryPath.hashCode() : 0);
hash = 89 * hash + (this.name != null ? this.name.hashCode() : 0);
hash = 89 * hash + (this.title != null ? this.title.hashCode() : 0);
hash = 89 * hash + (this.active ? 1 : 0);
@@ -103,7 +128,7 @@ public class SourceEntry {
if (m.find()) {
return m.group(1);
} else {
- System.err.println("Warning: Unexpected URL format: "+url);
+ Main.warn("Unexpected URL format: "+url);
return url;
}
}
@@ -132,4 +157,22 @@ public class SourceEntry {
return null;
return dir.getPath();
}
+
+ /**
+ * Returns the parent directory of the resource inside the zip file.
+ *
+ * @return the parent directory of the resource inside the zip file,
+ * "." if zipEntryPath is a top level file; null, if zipEntryPath is null
+ */
+ public String getZipEntryDirName() {
+ if (zipEntryPath == null) return null;
+ File file = new File(zipEntryPath);
+ File dir = file.getParentFile();
+ if (dir == null) return ".";
+ String path = dir.getPath();
+ if (!"/".equals(File.separator)) {
+ path = path.replace(File.separator, "/");
+ }
+ return path;
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java b/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
index 3473c81..32cecb3 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SubPreferenceSetting.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java b/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java
index 6767c97..9452ee5 100644
--- a/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java
+++ b/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
import java.awt.Component;
diff --git a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
index 3adeda9..4e738fd 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -16,6 +16,7 @@ import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.IOException;
@@ -28,12 +29,14 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.DefaultListCellRenderer;
import javax.swing.DefaultListModel;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JList;
@@ -49,6 +52,8 @@ import javax.swing.MenuElement;
import javax.swing.TransferHandler;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.table.AbstractTableModel;
@@ -60,16 +65,16 @@ import javax.swing.tree.TreePath;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ActionParameter;
import org.openstreetmap.josm.actions.AdaptableAction;
+import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.actions.ParameterizedAction;
import org.openstreetmap.josm.actions.ParameterizedActionDecorator;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
public class ToolbarPreferences implements PreferenceSettingFactory {
-
private static final String EMPTY_TOOLBAR_MARKER = "<!-empty-!>";
public static class ActionDefinition {
@@ -141,6 +146,14 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
public static ActionDefinition getSeparator() {
return new ActionDefinition(null);
}
+
+ public boolean hasParameters() {
+ if (!(getAction() instanceof ParameterizedAction)) return false;
+ for (Object o: parameters.values()) {
+ if (o!=null) return true;
+ }
+ return false;
+ }
}
public static class ActionParser {
@@ -216,10 +229,11 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
String paramName = readTillChar('=', '=');
skip('=');
String paramValue = readTillChar(',','}');
- if ("icon".equals(paramName) && paramValue.length() > 0)
+ if ("icon".equals(paramName) && paramValue.length() > 0) {
result.setIcon(paramValue);
- else if("name".equals(paramName) && paramValue.length() > 0)
+ } else if("name".equals(paramName) && paramValue.length() > 0) {
result.setName(paramValue);
+ }
skip(',');
}
skip('}');
@@ -282,9 +296,10 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
escape(tmp);
first = false;
}
- if(!first)
+ if(!first) {
result.append('}');
}
+ }
return result.toString();
}
@@ -294,10 +309,12 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
private ActionDefinition currentAction = ActionDefinition.getSeparator();
+ @Override
public int getColumnCount() {
return 2;
}
+ @Override
public int getRowCount() {
int adaptable = ((currentAction.getAction() instanceof AdaptableAction) ? 2 : 0);
if (currentAction.isSeparator() || !(currentAction.getAction() instanceof ParameterizedAction))
@@ -312,6 +329,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
return (ActionParameter<Object>) pa.getActionParameters().get(index);
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
if(currentAction.getAction() instanceof AdaptableAction)
{
@@ -324,9 +342,10 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
default:
return null;
}
- } else
+ } else {
rowIndex -= 2;
}
+ }
ActionParameter<Object> param = getParam(rowIndex);
switch (columnIndex) {
case 0:
@@ -353,9 +372,10 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
} else if (rowIndex == 1) {
currentAction.setIcon((String)aValue);
return;
- } else
+ } else {
rowIndex -= 2;
}
+ }
ActionParameter<Object> param = getParam(rowIndex);
currentAction.getParameters().put(param.getName(), param.readFromString((String)aValue));
}
@@ -368,36 +388,82 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
}
- private static class ToolbarPopupMenu extends JPopupMenu {
- public ToolbarPopupMenu(final ActionDefinition action) {
+ private class ToolbarPopupMenu extends JPopupMenu {
+ ActionDefinition act;
+
+ private void setActionAndAdapt(ActionDefinition action) {
+ this.act = action;
+ doNotHide.setSelected(Main.pref.getBoolean("toolbar.always-visible", true));
+ remove.setVisible(act!=null);
+ shortcutEdit.setVisible(act!=null);
+ }
- if(action != null) {
- add(tr("Remove from toolbar",action.getDisplayName()))
- .addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
Collection<String> t = new LinkedList<String>(getToolString());
ActionParser parser = new ActionParser(null);
// get text definition of current action
- String res = parser.saveAction(action);
+ String res = parser.saveAction(act);
// remove the button from toolbar preferences
t.remove( res );
Main.pref.putCollection("toolbar", t);
Main.toolbar.refreshToolbarControl();
}
});
- }
-
- add(tr("Configure toolbar")).addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+
+ JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
final PreferenceDialog p =new PreferenceDialog(Main.parent);
p.selectPreferencesTabByName("toolbar");
p.setVisible(true);
}
});
-
+
+ JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ final PreferenceDialog p =new PreferenceDialog(Main.parent);
+ p.getTabbedPane().getShortcutPreference().setDefaultFilter(act.getDisplayName());
+ p.selectPreferencesTabByName("shortcuts");
+ p.setVisible(true);
+ // refresh toolbar to try using changed shortcuts without restart
+ Main.toolbar.refreshToolbarControl();
+ }
+ });
+
+ JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
+ Main.pref.put("toolbar.always-visible", sel);
+ Main.pref.put("menu.always-visible", sel);
+ }
+ });
+ {
+ addPopupMenuListener(new PopupMenuListener() {
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ setActionAndAdapt(buttonActions.get(
+ ((JPopupMenu)e.getSource()).getInvoker()
+ ));
+ }
+ @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
+
+ @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {}
+ });
+ add(remove);
+ add(configure);
+ add(shortcutEdit);
+ add(doNotHide);
}
}
+ private ToolbarPopupMenu popupMenu = new ToolbarPopupMenu();
+
/**
* Key: Registered name (property "toolbar" of action).
* Value: The action to execute.
@@ -408,7 +474,9 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
private DefaultMutableTreeNode rootActionsNode = new DefaultMutableTreeNode(tr("Actions"));
public JToolBar control = new JToolBar();
+ private Map<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new Settings(rootActionsNode);
}
@@ -416,6 +484,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
public class Settings extends DefaultTabPreferenceSetting {
private final class Move implements ActionListener {
+ @Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals("<") && actionsTree.getSelectionCount() > 0) {
@@ -467,14 +536,17 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
this.actions = actions;
}
+ @Override
public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
return actions;
}
+ @Override
public DataFlavor[] getTransferDataFlavors() {
return flavors;
}
+ @Override
public boolean isDataFlavorSupported(DataFlavor flavor) {
return flavors[0] == flavor;
}
@@ -527,6 +599,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
addButton.setEnabled(actionsTree.getSelectionCount() > 0);
}
+ @Override
public void addGui(PreferenceTabbedPane gui) {
actionsTree.setCellRenderer(new DefaultTreeCellRenderer() {
@Override
@@ -567,6 +640,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
};
selectedList.setCellRenderer(renderer);
selectedList.addListSelectionListener(new ListSelectionListener(){
+ @Override
public void valueChanged(ListSelectionEvent e) {
boolean sel = selectedList.getSelectedIndex() != -1;
if (sel) {
@@ -714,7 +788,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
});
actionsTree.setDragEnabled(true);
actionsTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
- public void valueChanged(TreeSelectionEvent e) {
+ @Override public void valueChanged(TreeSelectionEvent e) {
updateEnabledState();
}
});
@@ -736,19 +810,24 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
final JPanel p = new JPanel();
p.setLayout(new LayoutManager(){
+ @Override
public void addLayoutComponent(String name, Component comp) {}
+ @Override
public void removeLayoutComponent(Component comp) {}
+ @Override
public Dimension minimumLayoutSize(Container parent) {
Dimension l = left.getMinimumSize();
Dimension r = right.getMinimumSize();
Dimension b = buttons.getMinimumSize();
return new Dimension(l.width+b.width+10+r.width,l.height+b.height+10+r.height);
}
+ @Override
public Dimension preferredLayoutSize(Container parent) {
- Dimension l = new Dimension(200, 200); //left.getPreferredSize();
- Dimension r = new Dimension(200, 200); //right.getPreferredSize();
+ Dimension l = new Dimension(200, 200);
+ Dimension r = new Dimension(200, 200);
return new Dimension(l.width+r.width+10+buttons.getPreferredSize().width,Math.max(l.height, r.height));
}
+ @Override
public void layoutContainer(Container parent) {
Dimension d = p.getSize();
Dimension b = buttons.getPreferredSize();
@@ -779,6 +858,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
}
}
+ @Override
public boolean ok() {
Collection<String> t = new LinkedList<String>();
ActionParser parser = new ActionParser(null);
@@ -788,10 +868,11 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
t.add("|");
} else {
String res = parser.saveAction(action);
- if(res != null)
+ if(res != null) {
t.add(res);
}
}
+ }
if (t.isEmpty()) {
t = Collections.singletonList(EMPTY_TOOLBAR_MARKER);
}
@@ -804,7 +885,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
public ToolbarPreferences() {
control.setFloatable(false);
- control.addMouseListener(new PopupMenuLauncher(new ToolbarPopupMenu(null)));
+ control.setComponentPopupMenu(popupMenu);
}
private void loadAction(DefaultMutableTreeNode node, MenuElement menu) {
@@ -822,12 +903,12 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
userObject = action;
Object tb = action.getValue("toolbar");
if(tb == null) {
- System.out.println(tr("Toolbar action without name: {0}",
+ Main.info(tr("Toolbar action without name: {0}",
action.getClass().getName()));
continue;
} else if (!(tb instanceof String)) {
if(!(tb instanceof Boolean) || (Boolean)tb) {
- System.out.println(tr("Strange toolbar value: {0}",
+ Main.info(tr("Strange toolbar value: {0}",
action.getClass().getName()));
}
continue;
@@ -835,7 +916,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
String toolbar = (String) tb;
Action r = actions.get(toolbar);
if(r != null && r != action && !toolbar.startsWith("imagery_")) {
- System.out.println(tr("Toolbar action {0} overwritten: {1} gets {2}",
+ Main.info(tr("Toolbar action {0} overwritten: {1} gets {2}",
toolbar, r.getClass().getName(), action.getClass().getName()));
}
actions.put(toolbar, action);
@@ -883,7 +964,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
public static Collection<String> getToolString() {
Collection<String> toolStr = Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));
- if (toolStr == null || toolStr.size() == 0) {
+ if (toolStr == null || toolStr.isEmpty()) {
toolStr = Arrays.asList(deftoolbar);
}
return toolStr;
@@ -906,7 +987,7 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
if(a != null) {
result.add(a);
} else {
- System.out.println("Could not load tool definition "+s);
+ Main.info("Could not load tool definition "+s);
}
}
}
@@ -919,13 +1000,13 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
*/
public Action register(Action action) {
String toolbar = (String) action.getValue("toolbar");
- if(toolbar == null) {
- System.out.println(tr("Registered toolbar action without name: {0}",
+ if (toolbar == null) {
+ Main.info(tr("Registered toolbar action without name: {0}",
action.getClass().getName()));
} else {
Action r = regactions.get(toolbar);
- if(r != null) {
- System.out.println(tr("Registered toolbar action {0} overwritten: {1} gets {2}",
+ if (r != null) {
+ Main.info(tr("Registered toolbar action {0} overwritten: {1} gets {2}",
toolbar, r.getClass().getName(), action.getClass().getName()));
}
}
@@ -941,15 +1022,16 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
*/
public void refreshToolbarControl() {
control.removeAll();
+ buttonActions.clear();
+ boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null;
for (ActionDefinition action : getDefinedActions()) {
if (action.isSeparator()) {
control.addSeparator();
} else {
- final JButton b = control.add(action.getParametrizedAction());
- String tt = action.getDisplayTooltip();
- if (tt != null && !tt.isEmpty())
- b.setToolTipText(tt);
+ final JButton b = addButtonAndShortcut(action);
+ buttonActions.put(b, action);
+
Icon i = action.getDisplayIcon();
if (i != null) {
b.setIcon(i);
@@ -965,12 +1047,65 @@ public class ToolbarPreferences implements PreferenceSettingFactory {
}
});
}
- b.addMouseListener(new PopupMenuLauncher( new ToolbarPopupMenu(action)));
+ b.setInheritsPopupMenu(true);
+ b.setFocusTraversalKeysEnabled(!unregisterTab);
}
}
+ control.setFocusTraversalKeysEnabled(!unregisterTab);
control.setVisible(control.getComponentCount() != 0);
}
+ private JButton addButtonAndShortcut(ActionDefinition action) {
+ Action act = action.getParametrizedAction();
+ JButton b = control.add(act);
+
+ Shortcut sc = null;
+ if (action.getAction() instanceof JosmAction) {
+ sc = ((JosmAction) action.getAction()).getShortcut();
+ if (sc.getAssignedKey() == KeyEvent.CHAR_UNDEFINED) {
+ sc = null;
+ }
+ }
+
+ long paramCode = 0;
+ if (action.hasParameters()) {
+ paramCode = action.parameters.hashCode();
+ }
+
+ String tt = action.getDisplayTooltip();
+ if (tt==null) {
+ tt="";
+ }
+
+ if (sc == null || paramCode != 0) {
+ String name = (String) action.getAction().getValue("toolbar");
+ if (name==null) {
+ name=action.getDisplayName();
+ }
+ if (paramCode!=0) {
+ name = name+paramCode;
+ }
+ String desc = action.getDisplayName() + ((paramCode==0)?"":action.parameters.toString());
+ sc = Shortcut.registerShortcut("toolbar:"+name, tr("Toolbar: {0}", desc),
+ KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
+ Main.unregisterShortcut(sc);
+ Main.registerActionShortcut(act, sc);
+
+ // add shortcut info to the tooltip if needed
+ if (sc.getAssignedUser()) {
+ if (tt.startsWith("<html>") && tt.endsWith("</html>")) {
+ tt = tt.substring(6,tt.length()-6);
+ }
+ tt = Main.platform.makeTooltip(tt, sc);
+ }
+ }
+
+ if (!tt.isEmpty()) {
+ b.setToolTipText(tt);
+ }
+ return b;
+ }
+
private static DataFlavor ACTION_FLAVOR = new DataFlavor(
ActionDefinition.class, "ActionItem");
diff --git a/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java b/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java
index f302614..55cc493 100644
--- a/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java
@@ -23,7 +23,7 @@ import org.openstreetmap.josm.tools.GBC;
*
* @author frsantos
*/
-public class ValidatorPreference extends DefaultTabPreferenceSetting {
+public final class ValidatorPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
@Override
@@ -31,9 +31,9 @@ public class ValidatorPreference extends DefaultTabPreferenceSetting {
return new ValidatorPreference();
}
}
-
+
private ValidatorPreference() {
- super("validator", tr("Data validator"),
+ super("validator", tr("Data validator"),
tr("An OSM data validator that checks for common errors made by users and editor programs."));
}
@@ -95,6 +95,7 @@ public class ValidatorPreference extends DefaultTabPreferenceSetting {
testPanel.add(prefOtherUpload, GBC.eol());
ActionListener otherUploadEnabled = new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
prefOtherUpload.setEnabled(prefOther.isSelected());
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java b/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
index a4cc30d..1f6291a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
@@ -1,67 +1,56 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.advanced;
import static org.openstreetmap.josm.tools.I18n.marktr;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.Color;
-import java.awt.Component;
import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import javax.swing.AbstractAction;
import javax.swing.Box;
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultCellEditor;
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
+import javax.swing.JMenu;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JRadioButton;
+import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
import javax.swing.filechooser.FileFilter;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.DefaultTableModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.DiskAccessAction;
import org.openstreetmap.josm.data.CustomConfigurator;
import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.Preferences.ListListSetting;
-import org.openstreetmap.josm.data.Preferences.ListSetting;
-import org.openstreetmap.josm.data.Preferences.MapListSetting;
import org.openstreetmap.josm.data.Preferences.Setting;
-import org.openstreetmap.josm.data.Preferences.StringSetting;
-import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.actionsupport.LogShowDialog;
import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Utils;
-public class AdvancedPreference extends DefaultTabPreferenceSetting {
+public final class AdvancedPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new AdvancedPreference();
}
@@ -76,79 +65,16 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
return true;
}
- public static class PrefEntry implements Comparable<PrefEntry> {
- private String key;
- private Setting value;
- private Setting defaultValue;
- private boolean isDefault;
- private boolean changed;
-
- public PrefEntry(String key, Setting value, Setting defaultValue, boolean isDefault) {
- CheckParameterUtil.ensureParameterNotNull(key);
- CheckParameterUtil.ensureParameterNotNull(value);
- CheckParameterUtil.ensureParameterNotNull(defaultValue);
- this.key = key;
- this.value = value;
- this.defaultValue = defaultValue;
- this.isDefault = isDefault;
- }
-
- public String getKey() {
- return key;
- }
-
- public Setting getValue() {
- return value;
- }
-
- public Setting getDefaultValue() {
- return defaultValue;
- }
-
- public void setValue(Setting value) {
- this.value = value;
- changed = true;
- isDefault = false;
- }
-
- public boolean isDefault() {
- return isDefault;
- }
-
- public boolean isChanged() {
- return changed;
- }
-
- private void markAsChanged() {
- changed = true;
- }
-
- public void reset() {
- value = defaultValue;
- changed = true;
- isDefault = true;
- }
-
- @Override
- public int compareTo(PrefEntry other) {
- return key.compareTo(other.key);
- }
-
- @Override
- public String toString() {
- return value.toString();
- }
- }
-
- private AllSettingsTableModel model;
- protected List<PrefEntry> data;
- protected List<PrefEntry> displayData;
- protected JTextField txtFilter;
+ protected List<PrefEntry> allData;
+ protected List<PrefEntry> displayData = new ArrayList<PrefEntry>();
+ protected JosmTextField txtFilter;
+ protected PreferencesTable table;
+ @Override
public void addGui(final PreferenceTabbedPane gui) {
JPanel p = gui.createPreferenceTab(this);
- txtFilter = new JTextField();
+ txtFilter = new JosmTextField();
JLabel lbFilter = new JLabel(tr("Search: "));
lbFilter.setLabelFor(txtFilter);
p.add(lbFilter);
@@ -168,15 +94,10 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
}
});
readPreferences(Main.pref);
- model = new AllSettingsTableModel();
- applyFilter();
-
- final JTable list = new JTable(model);
- list.putClientProperty("terminateEditOnFocusLost", true);
- list.getColumnModel().getColumn(1).setCellRenderer(new SettingCellRenderer());
- list.getColumnModel().getColumn(1).setCellEditor(new SettingCellEditor());
- JScrollPane scroll = new JScrollPane(list);
+ applyFilter();
+ table = new PreferencesTable(displayData);
+ JScrollPane scroll = new JScrollPane(table);
p.add(scroll, GBC.eol().fill(GBC.BOTH));
scroll.setPreferredSize(new Dimension(400,200));
@@ -184,112 +105,55 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
p.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
p.add(add, GBC.std().insets(0,5,0,0));
add.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- addPreference(gui);
+ @Override public void actionPerformed(ActionEvent e) {
+ PrefEntry pe = table.addPreference(gui);
+ if (pe!=null) {
+ allData.add(pe);
+ Collections.sort(allData);
+ applyFilter();
+ }
}
});
JButton edit = new JButton(tr("Edit"));
p.add(edit, GBC.std().insets(5,5,5,0));
edit.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- editPreference(gui, list);
+ @Override public void actionPerformed(ActionEvent e) {
+ boolean ok = table.editPreference(gui);
+ if (ok) applyFilter();
}
});
JButton reset = new JButton(tr("Reset"));
p.add(reset, GBC.std().insets(0,5,0,0));
reset.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- resetPreference(gui, list);
+ @Override public void actionPerformed(ActionEvent e) {
+ table.resetPreferences(gui);
}
});
JButton read = new JButton(tr("Read from file"));
p.add(read, GBC.std().insets(5,5,0,0));
read.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- File[] files = askUserForCustomSettingsFiles(false, tr("Open JOSM customization file"));
- if (files.length==0) return;
-
- Preferences tmpPrefs = CustomConfigurator.clonePreferences(Main.pref);
-
- StringBuilder log = new StringBuilder();
- log.append("<html>");
- for (File f: files) {
- CustomConfigurator.readXML(f, tmpPrefs);
- log.append(CustomConfigurator.getLog());
- }
- //try { Main.pref.save(); } catch (IOException ex) { }
- log.append("</html>");
- String msg = log.toString().replace("\n", "<br/>");
-
- new LogShowDialog(tr("Import log"), tr("<html>Here is file import summary. <br/>"
- + "You can reject preferences changes by pressing \"Cancel\" in preferences dialog <br/>"
- + "To activate some changes JOSM restart may be needed.</html>"), msg).showDialog();
-
- //JOptionPane.showMessageDialog(Main.parent,
- // tr("Installed plugins and some changes in preferences will start to work after JOSM restart"), tr("Warning"), JOptionPane.WARNING_MESSAGE);
-
- readPreferences(tmpPrefs);
- // sorting after modification - first modified, then non-default, then default entries
- Collections.sort(data, new Comparator<PrefEntry>() {
- @Override
- public int compare(PrefEntry o1, PrefEntry o2) {
- if (o1.changed && !o2.changed) return -1;
- if (o2.changed && !o1.changed) return 1;
- if (!(o1.isDefault) && o2.isDefault) return -1;
- if (!(o2.isDefault) && o1.isDefault) return 1;
- return o1.key.compareTo(o2.key);
- }
- });
-
- applyFilter();
- ((AllSettingsTableModel) list.getModel()).fireTableDataChanged();
+ @Override public void actionPerformed(ActionEvent e) {
+ readPreferencesFromXML();
}
-
});
-
+
JButton export = new JButton(tr("Export selected items"));
p.add(export, GBC.std().insets(5,5,0,0));
export.addActionListener(new ActionListener(){
- public void actionPerformed(ActionEvent e) {
- ArrayList<String> keys = new ArrayList<String>();
- boolean hasLists = false;
- for (int row : list.getSelectedRows()) {
- PrefEntry p = (PrefEntry) model.getValueAt(row, -1);
- if (!p.isDefault()) {
- // preferences with default values are not saved
- if (!(p.getValue() instanceof StringSetting)) hasLists=true; // => append and replace differs
- keys.add(p.getKey());
- }
- }
- if (keys.size()==0) {
- JOptionPane.showMessageDialog(Main.parent,
- tr("Please select some preference keys not marked as default"), tr("Warning"), JOptionPane.WARNING_MESSAGE);
- return;
- }
-
- File[] files = askUserForCustomSettingsFiles(true, tr("Export preferences keys to JOSM customization file"));
- if (files.length==0) return;
-
- int answer = 0;
- if (hasLists) {
- answer = JOptionPane.showOptionDialog(
- Main.parent, tr("What to do with preference lists when this file is to be imported?"), tr("Question"),
- JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null,
- new String[]{tr("Append preferences from file to existing values"), tr("Replace existing values")}, 0);
- }
- CustomConfigurator.exportPreferencesKeysToFile(files[0].getAbsolutePath(), answer==0, keys);
+ @Override public void actionPerformed(ActionEvent e) {
+ exportSelectedToXML();
}
});
-
- list.addMouseListener(new MouseAdapter(){
- @Override public void mouseClicked(MouseEvent e) {
- if (e.getClickCount() == 2) {
- editPreference(gui, list);
- }
+ final JButton more = new JButton(tr("More..."));
+ p.add(more, GBC.std().insets(5,5,0,0));
+ more.addActionListener(new ActionListener() {
+ JPopupMenu menu = buildPopupMenu();
+ @Override public void actionPerformed(ActionEvent ev) {
+ menu.show(more, 0, 0);
}
});
}
@@ -311,9 +175,9 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
} else {
loaded = orig;
}
- prepareData(loaded, orig, defaults);
+ allData = prepareData(loaded, orig, defaults);
}
-
+
private File[] askUserForCustomSettingsFiles(boolean saveFileFlag, String title) {
FileFilter filter = new FileFilter() {
@Override
@@ -327,15 +191,86 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
};
JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(!saveFileFlag, !saveFileFlag, title, filter, JFileChooser.FILES_ONLY, "customsettings.lastDirectory");
if (fc != null) {
- File sel[] = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()});
+ File[] sel = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()});
if (sel.length==1 && !sel[0].getName().contains(".")) sel[0]=new File(sel[0].getAbsolutePath()+".xml");
return sel;
- }
+ }
return new File[0];
}
-
- private void prepareData(Map<String, Setting> loaded, Map<String, Setting> orig, Map<String, Setting> defaults) {
- data = new ArrayList<PrefEntry>();
+
+ private void exportSelectedToXML() {
+ List<String> keys = new ArrayList<String>();
+ boolean hasLists = false;
+
+ for (PrefEntry p: table.getSelectedItems()) {
+ // preferences with default values are not saved
+ if (!(p.getValue() instanceof Preferences.StringSetting)) {
+ hasLists = true; // => append and replace differs
+ }
+ if (!p.isDefault()) {
+ keys.add(p.getKey());
+ }
+ }
+
+ if (keys.isEmpty()) {
+ JOptionPane.showMessageDialog(Main.parent,
+ tr("Please select some preference keys not marked as default"), tr("Warning"), JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+
+ File[] files = askUserForCustomSettingsFiles(true, tr("Export preferences keys to JOSM customization file"));
+ if (files.length == 0) {
+ return;
+ }
+
+ int answer = 0;
+ if (hasLists) {
+ answer = JOptionPane.showOptionDialog(
+ Main.parent, tr("What to do with preference lists when this file is to be imported?"), tr("Question"),
+ JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null,
+ new String[]{tr("Append preferences from file to existing values"), tr("Replace existing values")}, 0);
+ }
+ CustomConfigurator.exportPreferencesKeysToFile(files[0].getAbsolutePath(), answer == 0, keys);
+ }
+
+ private void readPreferencesFromXML() {
+ File[] files = askUserForCustomSettingsFiles(false, tr("Open JOSM customization file"));
+ if (files.length == 0) return;
+
+ Preferences tmpPrefs = CustomConfigurator.clonePreferences(Main.pref);
+
+ StringBuilder log = new StringBuilder();
+ log.append("<html>");
+ for (File f : files) {
+ CustomConfigurator.readXML(f, tmpPrefs);
+ log.append(CustomConfigurator.getLog());
+ }
+ log.append("</html>");
+ String msg = log.toString().replace("\n", "<br/>");
+
+ new LogShowDialog(tr("Import log"), tr("<html>Here is file import summary. <br/>"
+ + "You can reject preferences changes by pressing \"Cancel\" in preferences dialog <br/>"
+ + "To activate some changes JOSM restart may be needed.</html>"), msg).showDialog();
+
+ readPreferences(tmpPrefs);
+ // sorting after modification - first modified, then non-default, then default entries
+ Collections.sort(allData, customComparator);
+ applyFilter();
+ }
+
+ private Comparator<PrefEntry> customComparator = new Comparator<PrefEntry>() {
+ @Override
+ public int compare(PrefEntry o1, PrefEntry o2) {
+ if (o1.isChanged() && !o2.isChanged()) return -1;
+ if (o2.isChanged() && !o1.isChanged()) return 1;
+ if (!(o1.isDefault()) && o2.isDefault()) return -1;
+ if (!(o2.isDefault()) && o1.isDefault()) return 1;
+ return o1.compareTo(o2);
+ }
+ };
+
+ private List<PrefEntry> prepareData(Map<String, Setting> loaded, Map<String, Setting> orig, Map<String, Setting> defaults) {
+ List<PrefEntry> data = new ArrayList<PrefEntry>();
for (Entry<String, Setting> e : loaded.entrySet()) {
Setting value = e.getValue();
Setting old = orig.get(e.getKey());
@@ -362,117 +297,118 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
}
}
Collections.sort(data);
- displayData = new ArrayList<PrefEntry>(data);
+ displayData.clear();
+ displayData.addAll(data);
+ return data;
}
- class AllSettingsTableModel extends DefaultTableModel {
+ Map<String,String> profileTypes = new LinkedHashMap<String, String>();
- public AllSettingsTableModel() {
- setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
- }
+ private JPopupMenu buildPopupMenu() {
+ JPopupMenu menu = new JPopupMenu();
+ profileTypes.put(marktr("shortcut"), "shortcut\\..*");
+ profileTypes.put(marktr("color"), "color\\..*");
+ profileTypes.put(marktr("toolbar"), "toolbar.*");
+ profileTypes.put(marktr("imagery"), "imagery.*");
- @Override
- public boolean isCellEditable(int row, int column) {
- return column == 1 && (displayData.get(row).getValue() instanceof StringSetting);
+ for (Entry<String,String> e: profileTypes.entrySet()) {
+ menu.add(new ExportProfileAction(Main.pref, e.getKey(), e.getValue()));
}
- @Override
- public int getRowCount() {
- return displayData.size();
- }
-
- @Override
- public Object getValueAt(int row, int column) {
- if (column == 0)
- return displayData.get(row).getKey();
- else
- return displayData.get(row);
- }
-
- @Override
- public void setValueAt(Object o, int row, int column) {
- PrefEntry pe = displayData.get(row);
- String s = (String) o;
- if (!s.equals(pe.getValue().getValue())) {
- pe.setValue(new StringSetting(s));
- fireTableCellUpdated(row, column);
+ menu.addSeparator();
+ menu.add(getProfileMenu());
+ menu.addSeparator();
+ menu.add(new AbstractAction(tr("Reset preferences")) {
+ @Override public void actionPerformed(ActionEvent ae) {
+ if (!GuiHelper.warnUser(tr("Reset preferences"),
+ "<html>"+
+ tr("You are about to clear all preferences to their default values<br />"+
+ "All your settings will be deleted: plugins, imagery, filters, toolbar buttons, keyboard, etc. <br />"+
+ "Are you sure you want to continue?")
+ +"</html>", null, "")) {
+ Main.pref.resetToDefault();
+ try {
+ Main.pref.save();
+ } catch (IOException e) {
+ Main.warn("IOException while saving preferences: "+e.getMessage());
+ }
+ readPreferences(Main.pref);
+ applyFilter();
+ }
}
- }
+ });
+ return menu;
}
- private static class SettingCellRenderer extends DefaultTableCellRenderer {
- private Color backgroundColor = Main.pref.getUIColor("Table.background");
- private Color changedColor = Main.pref.getColor(
- marktr("Advanced Background: Changed"),
- new Color(200,255,200));
- private Color foregroundColor = Main.pref.getUIColor("Table.foreground");
- private Color nonDefaultColor = Main.pref.getColor(
- marktr("Advanced Background: NonDefalut"),
- new Color(255,255,200));
-
- @Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
- if (value == null)
- return this;
- PrefEntry pe = (PrefEntry) value;
- Setting setting = pe.getValue();
- Object val = setting.getValue();
- String display = val != null ? val.toString() : "<html><i><"+tr("unset")+"></i></html>";
-
- JLabel label = (JLabel)super.getTableCellRendererComponent(table,
- display, isSelected, hasFocus, row, column);
-
- label.setBackground(backgroundColor);
- if (isSelected) {
- label.setForeground(foregroundColor);
- }
- if(pe.isChanged()) {
- label.setBackground(changedColor);
- } else if(!pe.isDefault()) {
- label.setBackground(nonDefaultColor);
- }
-
- if (!pe.isDefault()) {
- label.setFont(label.getFont().deriveFont(Font.BOLD));
- }
- val = pe.getDefaultValue().getValue();
- if(val != null)
- {
- if(pe.isDefault()) {
- label.setToolTipText(tr("Current value is default."));
- } else {
- label.setToolTipText(tr("Default value is ''{0}''.", val));
+ private JMenu getProfileMenu() {
+ final JMenu p =new JMenu(tr("Load profile"));
+ p.addMenuListener(new MenuListener() {
+ @Override
+ public void menuSelected(MenuEvent me) {
+ p.removeAll();
+ for (File f: new File(".").listFiles()) {
+ String s = f.getName();
+ int idx = s.indexOf('_');
+ if (idx>=0) {
+ String t=s.substring(0,idx);
+ if (profileTypes.containsKey(t)) {
+ p.add(new ImportProfileAction(s, f, t));
+ }
+ }
+ }
+ for (File f: Main.pref.getPreferencesDirFile().listFiles()) {
+ String s = f.getName();
+ int idx = s.indexOf('_');
+ if (idx>=0) {
+ String t=s.substring(0,idx);
+ if (profileTypes.containsKey(t)) {
+ p.add(new ImportProfileAction(s, f, t));
+ }
+ }
}
- } else {
- label.setToolTipText(tr("Default value currently unknown (setting has not been used yet)."));
}
- return label;
- }
+ @Override public void menuDeselected(MenuEvent me) { }
+ @Override public void menuCanceled(MenuEvent me) { }
+ });
+ return p;
}
- private static class SettingCellEditor extends DefaultCellEditor {
- public SettingCellEditor() {
- super(new JTextField());
+ private class ImportProfileAction extends AbstractAction {
+ private final File file;
+ private final String type;
+
+ public ImportProfileAction(String name, File file, String type) {
+ super(name);
+ this.file = file;
+ this.type = type;
}
@Override
- public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
- PrefEntry pe = (PrefEntry) value;
- StringSetting stg = (StringSetting) pe.getValue();
- String s = stg.getValue() == null ? "" : stg.getValue();
- return super.getTableCellEditorComponent(table, s, isSelected, row, column);
+ public void actionPerformed(ActionEvent ae) {
+ Preferences tmpPrefs = CustomConfigurator.clonePreferences(Main.pref);
+ CustomConfigurator.readXML(file, tmpPrefs);
+ readPreferences(tmpPrefs);
+ String prefRegex = profileTypes.get(type);
+ // clean all the preferences from the chosen group
+ for (PrefEntry p : allData) {
+ if (p.getKey().matches(prefRegex) && !p.isDefault()) {
+ p.reset();
+ }
+ }
+ // allow user to review the changes in table
+ Collections.sort(allData, customComparator);
+ applyFilter();
}
}
private void applyFilter() {
displayData.clear();
- for (PrefEntry e : data) {
-
+ for (PrefEntry e : allData) {
String prefKey = e.getKey();
Setting valueSetting = e.getValue();
String prefValue = valueSetting.getValue() == null ? "" : valueSetting.getValue().toString();
- String input[] = txtFilter.getText().split("\\s+");
+ String[] input = txtFilter.getText().split("\\s+");
boolean canHas = true;
// Make 'wmsplugin cache' search for e.g. 'cache.wmsplugin'
@@ -489,181 +425,16 @@ public class AdvancedPreference extends DefaultTabPreferenceSetting {
displayData.add(e);
}
}
- model.fireTableDataChanged();
+ if (table!=null) table.fireDataChanged();
}
@Override
public boolean ok() {
- for (PrefEntry e : data) {
+ for (PrefEntry e : allData) {
if (e.isChanged()) {
Main.pref.putSetting(e.getKey(), e.getValue());
}
}
return false;
}
-
- private void resetPreference(final PreferenceTabbedPane gui, final JTable list) {
- if (list.getSelectedRowCount() == 0) {
- JOptionPane.showMessageDialog(
- gui,
- tr("Please select the row to delete."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
- return;
- }
- for (int row : list.getSelectedRows()) {
- PrefEntry e = displayData.get(row);
- e.reset();
- }
- model.fireTableDataChanged();
- }
-
- private void addPreference(final PreferenceTabbedPane gui) {
- JPanel p = new JPanel(new GridBagLayout());
- p.add(new JLabel(tr("Key")), GBC.std().insets(0,0,5,0));
- JTextField tkey = new JTextField("", 50);
- p.add(tkey, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
-
- p.add(new JLabel(tr("Select Setting Type:")), GBC.eol().insets(5,15,5,0));
-
- JRadioButton rbString = new JRadioButton(tr("Simple"));
- JRadioButton rbList = new JRadioButton(tr("List"));
- JRadioButton rbListList = new JRadioButton(tr("List of lists"));
- JRadioButton rbMapList = new JRadioButton(tr("List of maps"));
-
- ButtonGroup group = new ButtonGroup();
- group.add(rbString);
- group.add(rbList);
- group.add(rbListList);
- group.add(rbMapList);
-
- p.add(rbString, GBC.eol());
- p.add(rbList, GBC.eol());
- p.add(rbListList, GBC.eol());
- p.add(rbMapList, GBC.eol());
-
- rbString.setSelected(true);
-
- ExtendedDialog dlg = new ExtendedDialog(gui, tr("Add setting"), new String[] {tr("OK"), tr("Cancel")});
- dlg.setButtonIcons(new String[] {"ok.png", "cancel.png"});
- dlg.setContent(p);
- dlg.showDialog();
-
- PrefEntry pe = null;
- boolean ok = false;
- if (dlg.getValue() == 1) {
- if (rbString.isSelected()) {
- StringSetting sSetting = new StringSetting(null);
- pe = new PrefEntry(tkey.getText(), sSetting, sSetting, false);
- StringEditor sEditor = new StringEditor(gui, pe, sSetting);
- sEditor.showDialog();
- if (sEditor.getValue() == 1) {
- String data = sEditor.getData();
- if (!Utils.equal(sSetting.getValue(), data)) {
- pe.setValue(new StringSetting(data));
- ok = true;
- }
- }
- } else if (rbList.isSelected()) {
- ListSetting lSetting = new ListSetting(null);
- pe = new PrefEntry(tkey.getText(), lSetting, lSetting, false);
- ListEditor lEditor = new ListEditor(gui, pe, lSetting);
- lEditor.showDialog();
- if (lEditor.getValue() == 1) {
- List<String> data = lEditor.getData();
- if (!Preferences.equalCollection(lSetting.getValue(), data)) {
- pe.setValue(new ListSetting(data));
- ok = true;
- }
- }
- } else if (rbListList.isSelected()) {
- ListListSetting llSetting = new ListListSetting(null);
- pe = new PrefEntry(tkey.getText(), llSetting, llSetting, false);
- ListListEditor llEditor = new ListListEditor(gui, pe, llSetting);
- llEditor.showDialog();
- if (llEditor.getValue() == 1) {
- List<List<String>> data = llEditor.getData();
- @SuppressWarnings("unchecked")
- Collection<Collection<String>> llSettingValue = (Collection) llSetting.getValue();
- if (!Preferences.equalArray(llSettingValue, data)) {
- pe.setValue(new ListListSetting(data));
- ok = true;
- }
- }
- } else if (rbMapList.isSelected()) {
- MapListSetting mlSetting = new MapListSetting(null);
- pe = new PrefEntry(tkey.getText(), mlSetting, mlSetting, false);
- MapListEditor mlEditor = new MapListEditor(gui, pe, mlSetting);
- mlEditor.showDialog();
- if (mlEditor.getValue() == 1) {
- List<Map<String, String>> data = mlEditor.getData();
- if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
- pe.setValue(new MapListSetting(data));
- ok = true;
- }
- }
- }
- if (ok) {
- data.add(pe);
- Collections.sort(data);
- applyFilter();
- }
- }
- }
-
- private void editPreference(final PreferenceTabbedPane gui, final JTable list) {
- if (list.getSelectedRowCount() != 1) {
- JOptionPane.showMessageDialog(
- gui,
- tr("Please select the row to edit."),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
- return;
- }
- final PrefEntry e = (PrefEntry) model.getValueAt(list.getSelectedRow(), 1);
- Setting stg = e.getValue();
- if (stg instanceof StringSetting) {
- list.editCellAt(list.getSelectedRow(), 1);
- Component editor = list.getEditorComponent();
- if (editor != null) {
- editor.requestFocus();
- }
- } else if (stg instanceof ListSetting) {
- ListSetting lSetting = (ListSetting) stg;
- ListEditor lEditor = new ListEditor(gui, e, lSetting);
- lEditor.showDialog();
- if (lEditor.getValue() == 1) {
- List<String> data = lEditor.getData();
- if (!Preferences.equalCollection(lSetting.getValue(), data)) {
- e.setValue(new ListSetting(data));
- applyFilter();
- }
- }
- } else if (stg instanceof ListListSetting) {
- ListListEditor llEditor = new ListListEditor(gui, e, (ListListSetting) stg);
- llEditor.showDialog();
- if (llEditor.getValue() == 1) {
- List<List<String>> data = llEditor.getData();
- @SuppressWarnings("unchecked")
- Collection<Collection<String>> stgValue = (Collection) stg.getValue();
- if (!Preferences.equalArray(stgValue, data)) {
- e.setValue(new ListListSetting(data));
- applyFilter();
- }
- }
- } else if (stg instanceof MapListSetting) {
- MapListSetting mlSetting = (MapListSetting) stg;
- MapListEditor mlEditor = new MapListEditor(gui, e, mlSetting);
- mlEditor.showDialog();
- if (mlEditor.getValue() == 1) {
- List<Map<String, String>> data = mlEditor.getData();
- if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
- e.setValue(new MapListSetting(data));
- applyFilter();
- }
- }
- }
- }
-}
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java b/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java
new file mode 100644
index 0000000..659c0ef
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java
@@ -0,0 +1,81 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.gui.preferences.advanced;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.AbstractAction;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.filechooser.FileFilter;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.DiskAccessAction;
+import org.openstreetmap.josm.data.CustomConfigurator;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.Preferences.Setting;
+
+/**
+ * Action that exports some fragment of settings to custom configuration file
+ */
+public class ExportProfileAction extends AbstractAction {
+ private final String prefPattern;
+ private final String schemaKey;
+ private final Preferences prefs;
+
+ public ExportProfileAction(Preferences prefs, String schemaKey, String prefPattern) {
+ super(tr("Save {0} profile", tr(schemaKey)));
+ this.prefs = prefs;
+ this.prefPattern = prefPattern;
+ this.schemaKey = schemaKey;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ List<String> keys = new ArrayList<String>();
+ Map<String, Setting> all = prefs.getAllSettings();
+ for (String key: all.keySet()) {
+ if (key.matches(prefPattern)) {
+ keys.add(key);
+ }
+ }
+ if (keys.isEmpty()) {
+ JOptionPane.showMessageDialog(Main.parent,
+ tr("All the preferences of this group are default, nothing to save"), tr("Warning"), JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+ File f = askUserForCustomSettingsFile();
+ if (f!=null)
+ CustomConfigurator.exportPreferencesKeysToFile(f.getAbsolutePath(), false, keys);
+ }
+
+ private File askUserForCustomSettingsFile() {
+ String title = tr("Choose profile file");
+
+ FileFilter filter = new FileFilter() {
+ @Override
+ public boolean accept(File f) {
+ return f.isDirectory() || f.getName().toLowerCase().endsWith(".xml") && f.getName().toLowerCase().startsWith(schemaKey);
+ }
+ @Override
+ public String getDescription() {
+ return tr("JOSM custom settings files (*.xml)");
+ }
+ };
+ JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(false, false, title, filter, JFileChooser.FILES_ONLY, "customsettings.lastDirectory");
+ if (fc != null) {
+ File sel = fc.getSelectedFile();
+ if (!sel.getName().endsWith(".xml")) sel=new File(sel.getAbsolutePath()+".xml");
+ if (!sel.getName().startsWith(schemaKey)) {
+ sel = new File(sel.getParentFile().getAbsolutePath()+"/"+schemaKey+"_"+sel.getName());
+ }
+ return sel;
+ }
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java b/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
index 5c58d36..da5c715 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java
@@ -9,18 +9,19 @@ import java.util.ArrayList;
import java.util.List;
import javax.swing.DefaultCellEditor;
+import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.table.AbstractTableModel;
import org.openstreetmap.josm.data.Preferences.ListSetting;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference.PrefEntry;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
public class ListEditor extends ExtendedDialog {
@@ -28,7 +29,10 @@ public class ListEditor extends ExtendedDialog {
List<String> data;
PrefEntry entry;
- public ListEditor(final PreferenceTabbedPane gui, PrefEntry entry, ListSetting setting) {
+ /**
+ * Constructs a new {@code ListEditor}.
+ */
+ public ListEditor(final JComponent gui, PrefEntry entry, ListSetting setting) {
super(gui, tr("Change list setting"), new String[] {tr("OK"), tr("Cancel")});
this.entry = entry;
List<String> orig = setting.getValue();
@@ -42,8 +46,17 @@ public class ListEditor extends ExtendedDialog {
setContent(build(), false);
}
+ /**
+ * Returns the list of values.
+ * @return The list of values.
+ */
public List<String> getData() {
- return data;
+ return new ArrayList<String>(Utils.filter(data, new Predicate<String>() {
+ @Override
+ public boolean evaluate(String object) {
+ return object != null && !object.isEmpty();
+ }
+ }));
}
protected JPanel build() {
@@ -54,7 +67,7 @@ public class ListEditor extends ExtendedDialog {
table.putClientProperty("terminateEditOnFocusLost", true);
table.setTableHeader(null);
- DefaultCellEditor editor = new DefaultCellEditor(new JTextField());
+ DefaultCellEditor editor = new DefaultCellEditor(new JosmTextField());
editor.setClickCountToStart(1);
table.setDefaultEditor(table.getColumnClass(0), editor);
@@ -101,5 +114,4 @@ public class ListEditor extends ExtendedDialog {
return true;
}
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java b/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
index 6d91dab..068d15c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
@@ -13,22 +13,21 @@ import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.AbstractListModel;
import javax.swing.DefaultCellEditor;
+import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.table.TableCellEditor;
import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableCellEditor;
import org.openstreetmap.josm.data.Preferences.ListListSetting;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference.PrefEntry;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -45,7 +44,7 @@ public class ListListEditor extends ExtendedDialog {
ListTableModel tableModel;
- public ListListEditor(final PreferenceTabbedPane gui, PrefEntry entry, ListListSetting setting) {
+ public ListListEditor(final JComponent gui, PrefEntry entry, ListListSetting setting) {
super(gui, tr("Change list of lists setting"), new String[] {tr("OK"), tr("Cancel")});
this.entry = entry;
List<List<String>> orig = setting.getValue();
@@ -94,7 +93,7 @@ public class ListListEditor extends ExtendedDialog {
table.putClientProperty("terminateEditOnFocusLost", true);
table.setTableHeader(null);
- DefaultCellEditor editor = new DefaultCellEditor(new JTextField());
+ DefaultCellEditor editor = new DefaultCellEditor(new JosmTextField());
editor.setClickCountToStart(1);
table.setDefaultEditor(table.getColumnClass(0), editor);
@@ -105,10 +104,12 @@ public class ListListEditor extends ExtendedDialog {
}
class EntryListModel extends AbstractListModel {
+ @Override
public Object getElementAt(int index) {
return (index+1) + ": " + data.get(index).toString();
}
+ @Override
public int getSize() {
return data.size();
}
@@ -131,6 +132,7 @@ public class ListListEditor extends ExtendedDialog {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
entryModel.add(new ArrayList<String>());
}
@@ -148,10 +150,12 @@ public class ListListEditor extends ExtendedDialog {
setEnabled(entryList.getSelectedIndices().length == 1);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
int idx = entryList.getSelectedIndices()[0];
entryModel.remove(idx);
@@ -159,6 +163,7 @@ public class ListListEditor extends ExtendedDialog {
}
class EntryListener implements ListSelectionListener {
+ @Override
public void valueChanged(ListSelectionEvent e) {
TableCellEditor editor = table.getCellEditor();
if (editor != null) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java b/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
index f5ffe8a..bfe5b53 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
@@ -17,22 +17,21 @@ import java.util.Map.Entry;
import javax.swing.AbstractAction;
import javax.swing.AbstractListModel;
import javax.swing.DefaultCellEditor;
+import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.table.TableCellEditor;
import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableCellEditor;
import org.openstreetmap.josm.data.Preferences.MapListSetting;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference.PrefEntry;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -50,7 +49,7 @@ public class MapListEditor extends ExtendedDialog {
List<List<String>> dataValues;
Integer entryIdx;
- public MapListEditor(PreferenceTabbedPane gui, PrefEntry entry, MapListSetting setting) {
+ public MapListEditor(JComponent gui, PrefEntry entry, MapListSetting setting) {
super(gui, tr("Change list of maps setting"), new String[] {tr("OK"), tr("Cancel")});
this.entry = entry;
List<Map<String, String>> orig = setting.getValue();
@@ -116,7 +115,7 @@ public class MapListEditor extends ExtendedDialog {
table.putClientProperty("terminateEditOnFocusLost", true);
table.getTableHeader().getColumnModel().getColumn(0).setHeaderValue(tr("Key"));
table.getTableHeader().getColumnModel().getColumn(1).setHeaderValue(tr("Value"));
- DefaultCellEditor editor = new DefaultCellEditor(new JTextField());
+ DefaultCellEditor editor = new DefaultCellEditor(new JosmTextField());
editor.setClickCountToStart(1);
table.setDefaultEditor(table.getColumnClass(0), editor);
@@ -127,10 +126,12 @@ public class MapListEditor extends ExtendedDialog {
}
class EntryListModel extends AbstractListModel {
+ @Override
public Object getElementAt(int index) {
return tr("Entry {0}", index+1);
}
+ @Override
public int getSize() {
return dataKeys.size();
}
@@ -155,6 +156,7 @@ public class MapListEditor extends ExtendedDialog {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
entryModel.add();
}
@@ -172,10 +174,12 @@ public class MapListEditor extends ExtendedDialog {
setEnabled(entryList.getSelectedIndices().length == 1);
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
int idx = entryList.getSelectedIndices()[0];
entryModel.remove(idx);
@@ -183,6 +187,7 @@ public class MapListEditor extends ExtendedDialog {
}
class EntryListener implements ListSelectionListener {
+ @Override
public void valueChanged(ListSelectionEvent e) {
TableCellEditor editor = table.getCellEditor();
if (editor != null) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java b/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java
new file mode 100644
index 0000000..a8b92c6
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java
@@ -0,0 +1,73 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.gui.preferences.advanced;
+
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+
+/**
+ * Class to store single preference line for the table
+ * @since 6021 : extracted from AdvancedPreference class
+ */
+public class PrefEntry implements Comparable<PrefEntry> {
+ private String key;
+ private Preferences.Setting value;
+ private Preferences.Setting defaultValue;
+ private boolean isDefault;
+ private boolean changed;
+
+ public PrefEntry(String key, Preferences.Setting value, Preferences.Setting defaultValue, boolean isDefault) {
+ CheckParameterUtil.ensureParameterNotNull(key);
+ CheckParameterUtil.ensureParameterNotNull(value);
+ CheckParameterUtil.ensureParameterNotNull(defaultValue);
+ this.key = key;
+ this.value = value;
+ this.defaultValue = defaultValue;
+ this.isDefault = isDefault;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public Preferences.Setting getValue() {
+ return value;
+ }
+
+ public Preferences.Setting getDefaultValue() {
+ return defaultValue;
+ }
+
+ public void setValue(Preferences.Setting value) {
+ this.value = value;
+ changed = true;
+ isDefault = false;
+ }
+
+ public boolean isDefault() {
+ return isDefault;
+ }
+
+ public boolean isChanged() {
+ return changed;
+ }
+
+ public void markAsChanged() {
+ changed = true;
+ }
+
+ public void reset() {
+ value = defaultValue;
+ changed = true;
+ isDefault = true;
+ }
+
+ @Override
+ public int compareTo(PrefEntry other) {
+ return key.compareTo(other.key);
+ }
+
+ @Override
+ public String toString() {
+ return value.toString();
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
new file mode 100644
index 0000000..90e4700
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
@@ -0,0 +1,356 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.gui.preferences.advanced;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.GridBagLayout;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import javax.swing.ButtonGroup;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.DefaultTableModel;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.tools.GBC;
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Component for editing list of preferences as a table
+ * @since 6021 : extracted from AdvancedPreference class
+ */
+public class PreferencesTable extends JTable {
+ private AllSettingsTableModel model;
+ private final List<PrefEntry> displayData;
+
+ public PreferencesTable(List<PrefEntry> displayData) {
+ this.displayData = displayData;
+ model = new AllSettingsTableModel();
+ setModel(model);
+ putClientProperty("terminateEditOnFocusLost", true);
+ getColumnModel().getColumn(1).setCellRenderer(new SettingCellRenderer());
+ getColumnModel().getColumn(1).setCellEditor(new SettingCellEditor());
+
+ addMouseListener(new MouseAdapter(){
+ @Override public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount() == 2) {
+ editPreference(PreferencesTable.this);
+ }
+ }
+ });
+ }
+
+ /**
+ * This method should be called when displayed data was changed form external code
+ */
+ public void fireDataChanged() {
+ model.fireTableDataChanged();
+ }
+
+
+ /**
+ * The list of currently selected rows
+ * @return newly created list of PrefEntry
+ */
+ public List<PrefEntry> getSelectedItems() {
+ List<PrefEntry> entries = new ArrayList<PrefEntry>();
+ for (int row : getSelectedRows()) {
+ PrefEntry p = (PrefEntry) model.getValueAt(row, -1);
+ entries.add(p);
+ }
+ return entries;
+ }
+
+ /**
+ * Call this to edit selected row in preferences table
+ * @param gui - parent component for messagebox
+ * @return true if editing was actually performed during this call
+ */
+ public boolean editPreference(final JComponent gui) {
+ if (getSelectedRowCount() != 1) {
+ JOptionPane.showMessageDialog(
+ gui,
+ tr("Please select the row to edit."),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE
+ );
+ return false;
+ }
+ final PrefEntry e = (PrefEntry) model.getValueAt(getSelectedRow(), 1);
+ Preferences.Setting stg = e.getValue();
+ if (stg instanceof Preferences.StringSetting) {
+ editCellAt(getSelectedRow(), 1);
+ Component editor = getEditorComponent();
+ if (editor != null) {
+ editor.requestFocus();
+ }
+ } else if (stg instanceof Preferences.ListSetting) {
+ Preferences.ListSetting lSetting = (Preferences.ListSetting) stg;
+ ListEditor lEditor = new ListEditor(gui, e, lSetting);
+ lEditor.showDialog();
+ if (lEditor.getValue() == 1) {
+ List<String> data = lEditor.getData();
+ if (!Preferences.equalCollection(lSetting.getValue(), data)) {
+ e.setValue(new Preferences.ListSetting(data));
+ return true;
+ }
+ }
+ } else if (stg instanceof Preferences.ListListSetting) {
+ ListListEditor llEditor = new ListListEditor(gui, e, (Preferences.ListListSetting) stg);
+ llEditor.showDialog();
+ if (llEditor.getValue() == 1) {
+ List<List<String>> data = llEditor.getData();
+ @SuppressWarnings("unchecked")
+ Collection<Collection<String>> stgValue = (Collection<Collection<String>>) stg.getValue();
+ if (!Preferences.equalArray(stgValue, data)) {
+ e.setValue(new Preferences.ListListSetting(data));
+ return true;
+ }
+ }
+ } else if (stg instanceof Preferences.MapListSetting) {
+ Preferences.MapListSetting mlSetting = (Preferences.MapListSetting) stg;
+ MapListEditor mlEditor = new MapListEditor(gui, e, mlSetting);
+ mlEditor.showDialog();
+ if (mlEditor.getValue() == 1) {
+ List<Map<String, String>> data = mlEditor.getData();
+ if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
+ e.setValue(new Preferences.MapListSetting(data));
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Add new preference to the table
+ * @param gui - parent component for asking dialogs
+ * @return newly created entry or null if adding was cancelled
+ */
+ public PrefEntry addPreference(final JComponent gui) {
+ JPanel p = new JPanel(new GridBagLayout());
+ p.add(new JLabel(tr("Key")), GBC.std().insets(0,0,5,0));
+ JosmTextField tkey = new JosmTextField("", 50);
+ p.add(tkey, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
+
+ p.add(new JLabel(tr("Select Setting Type:")), GBC.eol().insets(5,15,5,0));
+
+ JRadioButton rbString = new JRadioButton(tr("Simple"));
+ JRadioButton rbList = new JRadioButton(tr("List"));
+ JRadioButton rbListList = new JRadioButton(tr("List of lists"));
+ JRadioButton rbMapList = new JRadioButton(tr("List of maps"));
+
+ ButtonGroup group = new ButtonGroup();
+ group.add(rbString);
+ group.add(rbList);
+ group.add(rbListList);
+ group.add(rbMapList);
+
+ p.add(rbString, GBC.eol());
+ p.add(rbList, GBC.eol());
+ p.add(rbListList, GBC.eol());
+ p.add(rbMapList, GBC.eol());
+
+ rbString.setSelected(true);
+
+ ExtendedDialog dlg = new ExtendedDialog(gui, tr("Add setting"), new String[] {tr("OK"), tr("Cancel")});
+ dlg.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+ dlg.setContent(p);
+ dlg.showDialog();
+
+ PrefEntry pe = null;
+ boolean ok = false;
+ if (dlg.getValue() == 1) {
+ if (rbString.isSelected()) {
+ Preferences.StringSetting sSetting = new Preferences.StringSetting(null);
+ pe = new PrefEntry(tkey.getText(), sSetting, sSetting, false);
+ StringEditor sEditor = new StringEditor(gui, pe, sSetting);
+ sEditor.showDialog();
+ if (sEditor.getValue() == 1) {
+ String data = sEditor.getData();
+ if (!Utils.equal(sSetting.getValue(), data)) {
+ pe.setValue(new Preferences.StringSetting(data));
+ ok = true;
+ }
+ }
+ } else if (rbList.isSelected()) {
+ Preferences.ListSetting lSetting = new Preferences.ListSetting(null);
+ pe = new PrefEntry(tkey.getText(), lSetting, lSetting, false);
+ ListEditor lEditor = new ListEditor(gui, pe, lSetting);
+ lEditor.showDialog();
+ if (lEditor.getValue() == 1) {
+ List<String> data = lEditor.getData();
+ if (!Preferences.equalCollection(lSetting.getValue(), data)) {
+ pe.setValue(new Preferences.ListSetting(data));
+ ok = true;
+ }
+ }
+ } else if (rbListList.isSelected()) {
+ Preferences.ListListSetting llSetting = new Preferences.ListListSetting(null);
+ pe = new PrefEntry(tkey.getText(), llSetting, llSetting, false);
+ ListListEditor llEditor = new ListListEditor(gui, pe, llSetting);
+ llEditor.showDialog();
+ if (llEditor.getValue() == 1) {
+ List<List<String>> data = llEditor.getData();
+ @SuppressWarnings("unchecked")
+ Collection<Collection<String>> llSettingValue = (Collection) llSetting.getValue();
+ if (!Preferences.equalArray(llSettingValue, data)) {
+ pe.setValue(new Preferences.ListListSetting(data));
+ ok = true;
+ }
+ }
+ } else if (rbMapList.isSelected()) {
+ Preferences.MapListSetting mlSetting = new Preferences.MapListSetting(null);
+ pe = new PrefEntry(tkey.getText(), mlSetting, mlSetting, false);
+ MapListEditor mlEditor = new MapListEditor(gui, pe, mlSetting);
+ mlEditor.showDialog();
+ if (mlEditor.getValue() == 1) {
+ List<Map<String, String>> data = mlEditor.getData();
+ if (!Preferences.equalListOfStructs(mlSetting.getValue(), data)) {
+ pe.setValue(new Preferences.MapListSetting(data));
+ ok = true;
+ }
+ }
+ }
+ }
+ if (ok)
+ return pe;
+ else
+ return null;
+ }
+
+ /**
+ * Reset selected preferences to their default values
+ * @param gui - parent component to display warning messages
+ */
+ public void resetPreferences(final JComponent gui) {
+ if (getSelectedRowCount() == 0) {
+ JOptionPane.showMessageDialog(
+ gui,
+ tr("Please select the row to delete."),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE
+ );
+ return;
+ }
+ for (int row : getSelectedRows()) {
+ PrefEntry e = displayData.get(row);
+ e.reset();
+ }
+ fireDataChanged();
+ }
+
+ private class AllSettingsTableModel extends DefaultTableModel {
+
+ public AllSettingsTableModel() {
+ setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ return column == 1 && (displayData.get(row).getValue() instanceof Preferences.StringSetting);
+ }
+
+ @Override
+ public int getRowCount() {
+ return displayData.size();
+ }
+
+ @Override
+ public Object getValueAt(int row, int column) {
+ if (column == 0)
+ return displayData.get(row).getKey();
+ else
+ return displayData.get(row);
+ }
+
+ @Override
+ public void setValueAt(Object o, int row, int column) {
+ PrefEntry pe = displayData.get(row);
+ String s = (String) o;
+ if (!s.equals(pe.getValue().getValue())) {
+ pe.setValue(new Preferences.StringSetting(s));
+ fireTableCellUpdated(row, column);
+ }
+ }
+ }
+
+ private static class SettingCellRenderer extends DefaultTableCellRenderer {
+ private Color backgroundColor = Main.pref.getUIColor("Table.background");
+ private Color changedColor = Main.pref.getColor(
+ marktr("Advanced Background: Changed"),
+ new Color(200,255,200));
+ private Color foregroundColor = Main.pref.getUIColor("Table.foreground");
+ private Color nonDefaultColor = Main.pref.getColor(
+ marktr("Advanced Background: NonDefault"),
+ new Color(255,255,200));
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+ if (value == null)
+ return this;
+ PrefEntry pe = (PrefEntry) value;
+ Preferences.Setting setting = pe.getValue();
+ Object val = setting.getValue();
+ String display = val != null ? val.toString() : "<html><i><"+tr("unset")+"></i></html>";
+
+ JLabel label = (JLabel)super.getTableCellRendererComponent(table,
+ display, isSelected, hasFocus, row, column);
+
+ label.setBackground(backgroundColor);
+ if (isSelected) {
+ label.setForeground(foregroundColor);
+ }
+ if(pe.isChanged()) {
+ label.setBackground(changedColor);
+ } else if(!pe.isDefault()) {
+ label.setBackground(nonDefaultColor);
+ }
+
+ if (!pe.isDefault()) {
+ label.setFont(label.getFont().deriveFont(Font.BOLD));
+ }
+ val = pe.getDefaultValue().getValue();
+ if(val != null)
+ {
+ if(pe.isDefault()) {
+ label.setToolTipText(tr("Current value is default."));
+ } else {
+ label.setToolTipText(tr("Default value is ''{0}''.", val));
+ }
+ } else {
+ label.setToolTipText(tr("Default value currently unknown (setting has not been used yet)."));
+ }
+ return label;
+ }
+ }
+
+ private static class SettingCellEditor extends DefaultCellEditor {
+ public SettingCellEditor() {
+ super(new JosmTextField());
+ }
+
+ @Override
+ public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+ PrefEntry pe = (PrefEntry) value;
+ Preferences.StringSetting stg = (Preferences.StringSetting) pe.getValue();
+ String s = stg.getValue() == null ? "" : stg.getValue();
+ return super.getTableCellEditorComponent(table, s, isSelected, row, column);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java b/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java
index 170ceb4..50e9a7a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java
@@ -4,23 +4,22 @@ package org.openstreetmap.josm.gui.preferences.advanced;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.GridBagLayout;
+import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import org.openstreetmap.josm.data.Preferences.StringSetting;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import org.openstreetmap.josm.gui.preferences.advanced.AdvancedPreference.PrefEntry;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
public class StringEditor extends ExtendedDialog {
PrefEntry entry;
- JTextField tvalue;
+ JosmTextField tvalue;
- public StringEditor(final PreferenceTabbedPane gui, PrefEntry entry, StringSetting setting) {
+ public StringEditor(final JComponent gui, PrefEntry entry, StringSetting setting) {
super(gui, tr("Change string setting"), new String[] {tr("OK"), tr("Cancel")});
this.entry = entry;
setButtonIcons(new String[] {"ok.png", "cancel.png"});
@@ -36,7 +35,7 @@ public class StringEditor extends ExtendedDialog {
p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0,0,5,0));
p.add(new JLabel(tr("Value: ")), GBC.std());
- tvalue = new JTextField(orig, 50);
+ tvalue = new JosmTextField(orig, 50);
p.add(tvalue, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
return p;
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
index c5e8c05..8efa1aa 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.display;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11,6 +11,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
@@ -51,6 +52,7 @@ import org.openstreetmap.josm.tools.GBC;
public class ColorPreference implements SubPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new ColorPreference();
}
@@ -58,7 +60,7 @@ public class ColorPreference implements SubPreferenceSetting {
private DefaultTableModel tableModel;
private JTable colors;
- private ArrayList<String> del = new ArrayList<String>();
+ private List<String> del = new ArrayList<String>();
JButton colorEdit;
JButton defaultSet;
@@ -140,12 +142,14 @@ public class ColorPreference implements SubPreferenceSetting {
return Main.pref.getColorName(o);
}
+ @Override
public void addGui(final PreferenceTabbedPane gui) {
fixColorPrefixes();
setColorModel(Main.pref.getAllColors());
colorEdit = new JButton(tr("Choose"));
colorEdit.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
int sel = colors.getSelectedRow();
JColorChooser chooser = new JColorChooser((Color)colors.getValueAt(sel, 1));
@@ -161,6 +165,7 @@ public class ColorPreference implements SubPreferenceSetting {
});
defaultSet = new JButton(tr("Set to default"));
defaultSet.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
int sel = colors.getSelectedRow();
String name = (String)colors.getValueAt(sel, 0);
@@ -172,6 +177,7 @@ public class ColorPreference implements SubPreferenceSetting {
});
JButton defaultAll = new JButton(tr("Set all to default"));
defaultAll.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
for(int i = 0; i < colors.getRowCount(); ++i)
{
@@ -185,6 +191,7 @@ public class ColorPreference implements SubPreferenceSetting {
});
remove = new JButton(tr("Remove"));
remove.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
int sel = colors.getSelectedRow();
del.add((String)colors.getValueAt(sel, 0));
@@ -210,6 +217,7 @@ public class ColorPreference implements SubPreferenceSetting {
colors.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
final TableCellRenderer oldColorsRenderer = colors.getDefaultRenderer(Object.class);
colors.setDefaultRenderer(Object.class, new TableCellRenderer(){
+ @Override
public Component getTableCellRendererComponent(JTable t, Object o, boolean selected, boolean focus, int row, int column) {
if (o == null)
return new JLabel();
@@ -261,6 +269,7 @@ public class ColorPreference implements SubPreferenceSetting {
ConflictDialog.getColor();
}
+ @Override
public boolean ok() {
Boolean ret = false;
for(String d : del) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
index 4d62864..af34b48 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.display;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11,8 +11,9 @@ import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
import org.openstreetmap.josm.tools.GBC;
-public class DisplayPreference extends DefaultTabPreferenceSetting {
+public final class DisplayPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new DisplayPreference();
}
@@ -20,14 +21,8 @@ public class DisplayPreference extends DefaultTabPreferenceSetting {
private DisplayPreference() {
super("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."), false, new JTabbedPane());
- displaycontent = getTabPane();
}
- /**
- * @deprecated Use {@link #getTabPane()} instead. This field will be removed mid-2013.
- */
- public final JTabbedPane displaycontent;
-
@Override
public boolean ok() {
return false;
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
index 6d1d642..dc37128 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.display;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -26,6 +26,7 @@ import org.openstreetmap.josm.tools.GBC;
public class DrawingPreference implements SubPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new DrawingPreference();
}
@@ -39,6 +40,7 @@ public class DrawingPreference implements SubPreferenceSetting {
private JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
private JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
+ private JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys"));
// Options that affect performance
private JCheckBox useHighlighting = new JCheckBox(tr("Highlight target ways and nodes"));
@@ -47,8 +49,8 @@ public class DrawingPreference implements SubPreferenceSetting {
private JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)"));
private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
+ @Override
public void addGui(PreferenceTabbedPane gui) {
- //gui.display.setPreferredSize(new Dimension(400,600));
gpxPanel = new GPXSettingsPanel();
gui.addValidationListener(gpxPanel);
JPanel panel = gpxPanel;
@@ -61,6 +63,7 @@ public class DrawingPreference implements SubPreferenceSetting {
// directionHint
directionHint.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
if (directionHint.isSelected()){
headArrow.setSelected(Main.pref.getBoolean("draw.segment.head_only", false));
@@ -114,9 +117,13 @@ public class DrawingPreference implements SubPreferenceSetting {
drawHelperLine.setSelected(Main.pref.getBoolean("draw.helper-line", true));
// outlineOnly
- outlineOnly.setSelected(Main.pref.getBoolean("draw.data.area_outline_only", false));
outlineOnly.setToolTipText(tr("This option suppresses the filling of areas, overriding anything specified in the selected style."));
+ outlineOnly.setSelected(Main.pref.getBoolean("draw.data.area_outline_only", false));
+ // discardable keys
+ discardableKeys.setToolTipText(tr("Display keys which have been deemed uninteresting to the point that they can be silently removed."));
+ discardableKeys.setSelected(Main.pref.getBoolean("display.discardable-keys", false));
+
JLabel performanceLabel = new JLabel(tr("Options that affect drawing performance"));
panel.add(new JLabel(tr("Segment drawing options")),
@@ -125,28 +132,30 @@ public class DrawingPreference implements SubPreferenceSetting {
panel.add(headArrow, GBC.eop().insets(40, 0, 0, 0));
panel.add(onewayArrow, GBC.eop().insets(20,0,0,0));
panel.add(segmentOrderNumber, GBC.eop().insets(20,0,0,0));
-
+
panel.add(new JLabel(tr("Select and draw mode options")),
GBC.eop().insets(5,10,0,0));
panel.add(virtualNodes, GBC.eop().insets(20,0,0,0));
panel.add(drawHelperLine, GBC.eop().insets(20, 0, 0, 0));
-
+
panel.add(performanceLabel, GBC.eop().insets(5,10,0,0));
panel.add(useAntialiasing, GBC.eop().insets(20,0,0,0));
panel.add(useWireframeAntialiasing, GBC.eop().insets(20, 0, 0, 0));
panel.add(useHighlighting, GBC.eop().insets(20,0,0,0));
panel.add(outlineOnly, GBC.eol().insets(20,0,0,0));
-
+
panel.add(new JLabel(tr("Other options")),
GBC.eop().insets(5,10,0,0));
panel.add(sourceBounds, GBC.eop().insets(20,0,0,0));
panel.add(inactive, GBC.eop().insets(20,0,0,0));
-
+ panel.add(discardableKeys, GBC.eop().insets(20,0,0,0));
+
ExpertToggleAction.addVisibilitySwitcher(performanceLabel);
ExpertToggleAction.addVisibilitySwitcher(useAntialiasing);
ExpertToggleAction.addVisibilitySwitcher(useWireframeAntialiasing);
ExpertToggleAction.addVisibilitySwitcher(useHighlighting);
ExpertToggleAction.addVisibilitySwitcher(outlineOnly);
+ ExpertToggleAction.addVisibilitySwitcher(discardableKeys);
panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
scrollpane = new JScrollPane(panel);
@@ -154,6 +163,7 @@ public class DrawingPreference implements SubPreferenceSetting {
gui.getDisplayPreference().addSubTab(this, tr("OSM Data"), scrollpane);
}
+ @Override
public boolean ok() {
gpxPanel.savePreferences();
Main.pref.put("draw.data.area_outline_only", outlineOnly.isSelected());
@@ -167,6 +177,7 @@ public class DrawingPreference implements SubPreferenceSetting {
Main.pref.put("mappaint.wireframe.use-antialiasing", useWireframeAntialiasing.isSelected());
Main.pref.put("draw.target-highlight", useHighlighting.isSelected());
Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
+ Main.pref.put("display.discardable-keys", discardableKeys.isSelected());
int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
if (virtualNodes.isSelected()) {
if (vn < 1) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
index 6db1f52..bfe8897 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.display;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -16,7 +17,6 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.template_engine.ParseError;
import org.openstreetmap.josm.tools.template_engine.TemplateParser;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
public class GPXSettingsPanel extends JPanel implements ValidationListener {
@@ -44,13 +45,12 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
private JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files"));
private JRadioButton drawRawGpsLinesNone = new JRadioButton(tr("None"));
private ActionListener drawRawGpsLinesActionListener;
- private JTextField drawRawGpsMaxLineLength = new JTextField(8);
- private JTextField drawRawGpsMaxLineLengthLocal = new JTextField(8);
- private JTextField drawLineWidth = new JTextField(2);
+ private JosmTextField drawRawGpsMaxLineLength = new JosmTextField(8);
+ private JosmTextField drawRawGpsMaxLineLengthLocal = new JosmTextField(8);
+ private JosmTextField drawLineWidth = new JosmTextField(2);
private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported"));
private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points"));
private JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle from HDOP value"));
- private ButtonGroup colorGroup;
private JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)"));
private JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)"));
private JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)"));
@@ -61,12 +61,12 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX"));
private JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows"));
private JCheckBox drawGpsArrowsFast = new JCheckBox(tr("Fast drawing (looks uglier)"));
- private JTextField drawGpsArrowsMinDist = new JTextField(8);
+ private JosmTextField drawGpsArrowsMinDist = new JosmTextField(8);
private JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits"));
private JosmComboBox waypointLabel = new JosmComboBox(LABEL_PATTERN_DESC);
- private JTextField waypointLabelPattern = new JTextField();
+ private JosmTextField waypointLabelPattern = new JosmTextField();
private JosmComboBox audioWaypointLabel = new JosmComboBox(LABEL_PATTERN_DESC);
- private JTextField audioWaypointLabelPattern = new JTextField();
+ private JosmTextField audioWaypointLabelPattern = new JosmTextField();
private JCheckBox useGpsAntialiasing = new JCheckBox(tr("Smooth GPX graphics (antialiasing)"));
private String layerName;
@@ -126,6 +126,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
ExpertToggleAction.addVisibilitySwitcher(drawRawGpsLinesAll);
drawRawGpsLinesActionListener = new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
boolean f=drawRawGpsLinesNone.isSelected()||drawRawGpsLinesGlobal.isSelected();
forceRawGpsLines.setEnabled(!f);
@@ -165,6 +166,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
// drawGpsArrows
drawGpsArrows.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
drawGpsArrowsFast.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
drawGpsArrowsMinDist.setEnabled(drawGpsArrows.isSelected() && drawGpsArrows.isEnabled());
@@ -203,7 +205,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
ExpertToggleAction.addVisibilitySwitcher(useGpsAntialiasing);
// colorTracks
- colorGroup = new ButtonGroup();
+ ButtonGroup colorGroup = new ButtonGroup();
if (layerName!=null) {
colorGroup.add(colorTypeGlobal);
}
@@ -214,12 +216,14 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
colorGroup.add(colorTypeTime);
colorTypeVelocity.addChangeListener(new ChangeListener(){
+ @Override
public void stateChanged(ChangeEvent e) {
colorTypeVelocityTune.setEnabled(colorTypeVelocity.isSelected());
colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected());
}
});
colorTypeDilution.addChangeListener(new ChangeListener(){
+ @Override
public void stateChanged(ChangeEvent e) {
colorDynamic.setEnabled(colorTypeVelocity.isSelected() || colorTypeDilution.isSelected());
}
@@ -421,7 +425,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
savePreferences(null, false);
}
- private void updateWaypointLabelCombobox(JosmComboBox cb, JTextField tf, TemplateEntryProperty property) {
+ private void updateWaypointLabelCombobox(JosmComboBox cb, JosmTextField tf, TemplateEntryProperty property) {
String labelPattern = property.getAsString();
boolean found = false;
for (int i=0; i<LABEL_PATTERN_TEMPLATE.length; i++) {
@@ -438,7 +442,7 @@ public class GPXSettingsPanel extends JPanel implements ValidationListener {
}
}
- private void updateWaypointPattern(JosmComboBox cb, JTextField tf) {
+ private void updateWaypointPattern(JosmComboBox cb, JosmTextField tf) {
if (cb.getSelectedIndex() == WAYPOINT_LABEL_CUSTOM) {
tf.setEnabled(true);
} else {
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java b/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
index 178a1c9..e1d974c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.display;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -31,6 +31,7 @@ import org.openstreetmap.josm.tools.GBC;
public class LafPreference implements SubPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new LafPreference();
}
@@ -47,6 +48,7 @@ public class LafPreference implements SubPreferenceSetting {
private JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)"));
private JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus"));
+ @Override
public void addGui(PreferenceTabbedPane gui) {
lafCombo = new JosmComboBox(UIManager.getInstalledLookAndFeels());
@@ -59,8 +61,8 @@ public class LafPreference implements SubPreferenceSetting {
new UIManager.LookAndFeelInfo(((javax.swing.LookAndFeel)Oquaqua).getName(), "ch.randelshofer.quaqua.QuaquaLookAndFeel")
);
} catch (Exception ex) {
- // just ignore, Quaqua may not even be installed...
- //System.out.println("Failed to load Quaqua: " + ex);
+ // just debug, Quaqua may not even be installed...
+ Main.debug(ex.getMessage());
}
String laf = Main.pref.get("laf", Main.platform.getDefaultStyle());
@@ -118,6 +120,7 @@ public class LafPreference implements SubPreferenceSetting {
gui.getDisplayPreference().addSubTab(this, tr("Look and Feel"), scrollpane);
}
+ @Override
public boolean ok() {
boolean mod = false;
Main.pref.put("draw.splashscreen", showSplashScreen.isSelected());
diff --git a/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java b/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
index c90d1f3..b9a3ece 100644
--- a/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.tools.I18n;
public class LanguagePreference implements SubPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new LanguagePreference();
}
@@ -39,10 +40,11 @@ public class LanguagePreference implements SubPreferenceSetting {
/** the model for the combo box */
private LanguageComboBoxModel model;
+ @Override
public void addGui(final PreferenceTabbedPane gui) {
model = new LanguageComboBoxModel();
// Selecting the language BEFORE the JComboBox listens to model changes speed up initialization by ~35ms (see #7386)
- // See http://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
+ // See http://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
model.selectLanguage(Main.pref.get("language"));
langCombo = new JosmComboBox(model);
langCombo.setRenderer(new LanguageCellRenderer(langCombo.getRenderer()));
@@ -53,11 +55,12 @@ public class LanguagePreference implements SubPreferenceSetting {
panel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
panel.add(langCombo, GBC.eol().fill(GBC.HORIZONTAL));
panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-
+
TabPreferenceSetting tabPref = lafPreference.getTabPreferenceSetting(gui);
tabPref.registerSubTab(this, tabPref.getSubTab(lafPreference));
}
+ @Override
public boolean ok() {
if(langCombo.getSelectedItem() == null)
return Main.pref.put("language", null);
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
index ea8b359..f407b37 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java
@@ -8,8 +8,6 @@ import java.util.Collection;
import javax.swing.AbstractButton;
import javax.swing.JPanel;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
@@ -17,6 +15,8 @@ import javax.swing.event.DocumentListener;
import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* An abstract imagery panel used to add WMS/TMS imagery sources. See implementations.
@@ -26,18 +26,18 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo;
*/
public abstract class AddImageryPanel extends JPanel {
- protected final JTextArea rawUrl = new JTextArea(3, 40);
- protected final JTextField name = new JTextField();
-
+ protected final JosmTextArea rawUrl = new JosmTextArea(3, 40);
+ protected final JosmTextField name = new JosmTextField();
+
protected final Collection<ContentValidationListener> listeners = new ArrayList<ContentValidationListener>();
-
+
/**
* A listener notified when the validation status of this panel change.
*/
public interface ContentValidationListener {
/**
* Called when the validation status of this panel changed
- * @param isValid true if the conditions required to close this panel are met
+ * @param isValid true if the conditions required to close this panel are met
*/
public void contentChanged(boolean isValid);
}
@@ -70,7 +70,7 @@ public abstract class AddImageryPanel extends JPanel {
protected static String sanitize(String s) {
return s.replaceAll("[\r\n]+", "").trim();
}
-
+
protected final String getImageryName() {
return sanitize(name.getText());
}
@@ -78,7 +78,7 @@ public abstract class AddImageryPanel extends JPanel {
protected final String getImageryRawUrl() {
return sanitize(rawUrl.getText());
}
-
+
protected abstract boolean isImageryValid();
/**
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
index 16edb38..6750a0d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
@@ -9,18 +9,18 @@ import java.awt.event.KeyEvent;
import java.util.Arrays;
import javax.swing.JLabel;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
import javax.swing.text.View;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Utils;
public class AddTMSLayerPanel extends AddImageryPanel {
- private final JTextField tmsZoom = new JTextField();
- private final JTextArea tmsUrl = new JTextArea(3, 40);
+ private final JosmTextField tmsZoom = new JosmTextField();
+ private final JosmTextArea tmsUrl = new JosmTextArea(3, 40);
private final KeyAdapter keyAdapter = new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
@@ -28,6 +28,9 @@ public class AddTMSLayerPanel extends AddImageryPanel {
}
};
+ /**
+ * Constructs a new {@code AddTMSLayerPanel}.
+ */
public AddTMSLayerPanel() {
add(new JLabel(tr("1. Enter URL")), GBC.eol());
@@ -85,11 +88,12 @@ public class AddTMSLayerPanel extends AddImageryPanel {
(int) Math.ceil(view.getPreferredSpan(View.X_AXIS)),
(int) Math.ceil(view.getPreferredSpan(View.Y_AXIS)));
}
-
+
protected final String getTmsUrl() {
return sanitize(tmsUrl.getText());
}
+ @Override
protected boolean isImageryValid() {
return !getImageryName().isEmpty() && !getTmsUrl().isEmpty();
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
index 58d4a4f..a35c22c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
@@ -11,16 +11,20 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URL;
+import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.io.imagery.WMSImagery;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Utils;
@@ -30,10 +34,14 @@ public class AddWMSLayerPanel extends AddImageryPanel {
private final WMSImagery wms = new WMSImagery();
private final JCheckBox endpoint = new JCheckBox(tr("Store WMS endpoint only, select layers at usage"));
private final WMSLayerTree tree = new WMSLayerTree();
+ private final JComboBox formats = new JComboBox();
private final JLabel wmsInstruction;
- private final JTextArea wmsUrl = new JTextArea(3, 40);
+ private final JosmTextArea wmsUrl = new JosmTextArea(3, 40);
private final JButton showBounds = new JButton(tr("Show bounds"));
+ /**
+ * Constructs a new {@code AddWMSLayerPanel}.
+ */
public AddWMSLayerPanel() {
add(new JLabel(tr("1. Enter service URL")), GBC.eol());
@@ -49,11 +57,14 @@ public class AddWMSLayerPanel extends AddImageryPanel {
showBounds.setEnabled(false);
add(new JScrollPane(showBounds), GBC.eop().fill());
- add(wmsInstruction = new JLabel(tr("3. Verify generated WMS URL")), GBC.eol());
+ add(new JLabel(tr("3. Select image format")), GBC.eol());
+ add(formats, GBC.eol().fill());
+
+ add(wmsInstruction = new JLabel(tr("4. Verify generated WMS URL")), GBC.eol());
add(wmsUrl, GBC.eop().fill());
wmsUrl.setLineWrap(true);
- add(new JLabel(tr("4. Enter name for this layer")), GBC.eol());
+ add(new JLabel(tr("5. Enter name for this layer")), GBC.eol());
add(name, GBC.eop().fill());
getLayers.addActionListener(new ActionListener() {
@@ -62,6 +73,7 @@ public class AddWMSLayerPanel extends AddImageryPanel {
try {
wms.attemptGetCapabilities(rawUrl.getText());
tree.updateTree(wms);
+ formats.setModel(new DefaultComboBoxModel(wms.getFormats().toArray()));
} catch (MalformedURLException ex) {
JOptionPane.showMessageDialog(getParent(), tr("Invalid service URL."),
tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
@@ -71,8 +83,7 @@ public class AddWMSLayerPanel extends AddImageryPanel {
} catch (WMSImagery.WMSGetCapabilitiesException ex) {
JOptionPane.showMessageDialog(getParent(), tr("Could not parse WMS layer list."),
tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
- System.err.println("Could not parse WMS layer list. Incoming data:");
- System.err.println(ex.getIncomingData());
+ Main.error("Could not parse WMS layer list. Incoming data:\n"+ex.getIncomingData());
}
}
});
@@ -83,9 +94,13 @@ public class AddWMSLayerPanel extends AddImageryPanel {
tree.getLayerTree().setEnabled(!endpoint.isSelected());
showBounds.setEnabled(!endpoint.isSelected());
wmsInstruction.setEnabled(!endpoint.isSelected());
+ formats.setEnabled(!endpoint.isSelected());
wmsUrl.setEnabled(!endpoint.isSelected());
if (endpoint.isSelected()) {
- name.setText(wms.getServiceUrl().getHost());
+ URL url = wms.getServiceUrl();
+ if (url != null) {
+ name.setText(url.getHost());
+ }
} else {
onLayerSelectionChanged();
}
@@ -94,7 +109,14 @@ public class AddWMSLayerPanel extends AddImageryPanel {
tree.getLayerTree().addPropertyChangeListener("selectedLayers", new PropertyChangeListener() {
@Override
- public void propertyChange(PropertyChangeEvent evt) {
+ public void propertyChange(PropertyChangeEvent evt) {
+ onLayerSelectionChanged();
+ }
+ });
+
+ formats.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
onLayerSelectionChanged();
}
});
@@ -112,15 +134,15 @@ public class AddWMSLayerPanel extends AddImageryPanel {
}
}
});
-
+
registerValidableComponent(endpoint);
registerValidableComponent(rawUrl);
registerValidableComponent(wmsUrl);
}
-
+
protected final void onLayerSelectionChanged() {
if (wms.getServiceUrl() != null) {
- wmsUrl.setText(wms.buildGetMapUrl(tree.getSelectedLayers()));
+ wmsUrl.setText(wms.buildGetMapUrl(tree.getSelectedLayers(), (String) formats.getSelectedItem()));
name.setText(wms.getServiceUrl().getHost() + ": " + Utils.join(", ", tree.getSelectedLayers()));
}
showBounds.setEnabled(tree.getSelectedLayers().size() == 1);
@@ -138,11 +160,12 @@ public class AddWMSLayerPanel extends AddImageryPanel {
}
return info;
}
-
+
protected final String getWmsUrl() {
return sanitize(wmsUrl.getText());
}
-
+
+ @Override
protected boolean isImageryValid() {
if (getImageryName().isEmpty()) {
return false;
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java
index 4475a04..20c1a74 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java
@@ -9,20 +9,14 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
import javax.swing.JColorChooser;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JSlider;
-import javax.swing.JTextField;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import org.openstreetmap.josm.gui.layer.ImageryLayer;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
-import org.openstreetmap.josm.io.imagery.OffsetServer;
-import org.openstreetmap.josm.io.imagery.OsmosnimkiOffsetServer;
import org.openstreetmap.josm.tools.ColorHelper;
import org.openstreetmap.josm.tools.GBC;
@@ -36,8 +30,6 @@ public class CommonSettingsPanel extends JPanel {
private final JButton btnFadeColor;
private final JSlider fadeAmount = new JSlider(0, 100);
private final JosmComboBox sharpen;
- private final JCheckBox useOffsetServer;
- private final JTextField offsetServerUrl;
/**
* Constructs a new {@code CommonSettingsPanel}.
@@ -79,18 +71,6 @@ public class CommonSettingsPanel extends JPanel {
add(new JLabel(tr("Sharpen (requires layer re-add): ")));
add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
add(this.sharpen, GBC.eol().fill(GBC.HORIZONTAL));
-
- this.useOffsetServer = new JCheckBox(tr("Use offset server: "));
- this.offsetServerUrl = new JTextField();
- this.useOffsetServer.addChangeListener(new ChangeListener() {
- @Override
- public void stateChanged(ChangeEvent e) {
- offsetServerUrl.setEnabled(useOffsetServer.isSelected());
- }
- });
- offsetServerUrl.setEnabled(useOffsetServer.isSelected());
- add(this.useOffsetServer, GBC.eol().fill(GBC.HORIZONTAL));
- add(this.offsetServerUrl, GBC.eol().fill(GBC.HORIZONTAL));
}
/**
@@ -102,8 +82,6 @@ public class CommonSettingsPanel extends JPanel {
this.btnFadeColor.setText(ColorHelper.color2html(colFadeColor));
this.fadeAmount.setValue(ImageryLayer.PROP_FADE_AMOUNT.get());
this.sharpen.setSelectedIndex(Math.max(0, Math.min(2, ImageryLayer.PROP_SHARPEN_LEVEL.get())));
- this.useOffsetServer.setSelected(OffsetServer.PROP_SERVER_ENABLED.get());
- this.offsetServerUrl.setText(OsmosnimkiOffsetServer.PROP_SERVER_URL.get());
}
/**
@@ -111,9 +89,6 @@ public class CommonSettingsPanel extends JPanel {
* @return true when restart is required
*/
public boolean saveSettings() {
- OffsetServer.PROP_SERVER_ENABLED.put(useOffsetServer.isSelected());
- OsmosnimkiOffsetServer.PROP_SERVER_URL.put(offsetServerUrl.getText());
-
ImageryLayer.PROP_FADE_AMOUNT.put(this.fadeAmount.getValue());
ImageryLayer.PROP_FADE_COLOR.put(this.btnFadeColor.getBackground());
ImageryLayer.PROP_SHARPEN_LEVEL.put(sharpen.getSelectedIndex());
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index a75ae78..cd4ea41 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -28,7 +28,6 @@ import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.JButton;
-import javax.swing.JEditorPane;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
@@ -57,15 +56,17 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
import org.openstreetmap.josm.data.imagery.OffsetBookmark;
import org.openstreetmap.josm.data.imagery.Shape;
+import org.openstreetmap.josm.gui.download.DownloadDialog;
import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.LanguageInfo;
-public class ImageryPreference extends DefaultTabPreferenceSetting {
+public final class ImageryPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
@Override
public PreferenceSetting createPreferenceSetting() {
@@ -87,7 +88,7 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
private void addSettingsSection(final JPanel p, String name, JPanel section) {
addSettingsSection(p, name, section, GBC.eol());
}
-
+
private void addSettingsSection(final JPanel p, String name, JPanel section, GBC gbc) {
final JLabel lbl = new JLabel(name);
lbl.setFont(lbl.getFont().deriveFont(Font.BOLD));
@@ -96,7 +97,7 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
p.add(section, gbc.insets(20,5,0,10));
}
- private Component buildSettingsPanel(final PreferenceTabbedPane gui) {
+ private Component buildSettingsPanel() {
final JPanel p = new JPanel(new GridBagLayout());
p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -117,7 +118,7 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
layerInfo = new ImageryLayerInfo(ImageryLayerInfo.instance);
imageryProviders = new ImageryProvidersPanel(gui, layerInfo);
pane.addTab(tr("Imagery providers"), imageryProviders);
- pane.addTab(tr("Settings"), buildSettingsPanel(gui));
+ pane.addTab(tr("Settings"), buildSettingsPanel());
pane.addTab(tr("Offset bookmarks"), new OffsetBookmarksPanel(gui));
loadSettings();
p.add(pane,GBC.std().fill(GBC.BOTH));
@@ -140,6 +141,8 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
ImageryLayerInfo.instance.load();
Main.main.menu.imageryMenu.refreshOffsetMenu();
OffsetBookmark.saveBookmarks();
+
+ DownloadDialog.getInstance().refreshTileSources();
boolean commonRestartRequired = commonSettings.saveSettings();
boolean wmsRestartRequired = wmsSettings.saveSettings();
@@ -398,8 +401,8 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
if (defaultTable.getSelectionModel().isSelectedIndex(i)) {
if (!mapRectangles.containsKey(i)) {
// Add new map rectangle
- Coordinate topLeft = new Coordinate(bounds.getMax().lat(), bounds.getMin().lon());
- Coordinate bottomRight = new Coordinate(bounds.getMin().lat(), bounds.getMax().lon());
+ Coordinate topLeft = new Coordinate(bounds.getMaxLat(), bounds.getMinLon());
+ Coordinate bottomRight = new Coordinate(bounds.getMinLat(), bounds.getMaxLon());
MapRectangle rectangle = new MapRectangleImpl(topLeft, bottomRight);
mapRectangles.put(i, rectangle);
defaultMap.addMapRectangle(rectangle);
@@ -426,6 +429,7 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
this.type = type;
}
+ @Override
public void actionPerformed(ActionEvent evt) {
final AddImageryPanel p;
if (ImageryInfo.ImageryType.WMS.equals(type)) {
@@ -435,10 +439,10 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
} else {
throw new IllegalStateException("Type " + type + " not supported");
}
-
+
final AddImageryDialog addDialog = new AddImageryDialog(gui, p);
addDialog.showDialog();
-
+
if (addDialog.getValue() == 1) {
try {
activeModel.addRow(p.getImageryInfo());
@@ -454,7 +458,7 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
}
}
}
-
+
private class RemoveEntryAction extends AbstractAction implements ListSelectionListener {
public RemoveEntryAction() {
@@ -512,8 +516,9 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
Set<String> acceptedEulas = new HashSet<String>();
- outer: for (int i = 0; i < lines.length; i++) {
- ImageryInfo info = defaultModel.getRow(lines[i]);
+ outer:
+ for (int line : lines) {
+ ImageryInfo info = defaultModel.getRow(line);
// Check if an entry with exactly the same values already
// exists
@@ -551,6 +556,7 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
}
+ @Override
public void actionPerformed(ActionEvent evt) {
layerInfo.loadDefaults(true);
defaultModel.fireTableDataChanged();
@@ -662,14 +668,14 @@ public class ImageryPreference extends DefaultTabPreferenceSetting {
URL url = null;
try {
url = new URL(eulaUrl.replaceAll("\\{lang\\}", LanguageInfo.getWikiLanguagePrefix()));
- JEditorPane htmlPane = null;
+ JosmEditorPane htmlPane = null;
try {
- htmlPane = new JEditorPane(url);
+ htmlPane = new JosmEditorPane(url);
} catch (IOException e1) {
// give a second chance with a default Locale 'en'
try {
url = new URL(eulaUrl.replaceAll("\\{lang\\}", ""));
- htmlPane = new JEditorPane(url);
+ htmlPane = new JosmEditorPane(url);
} catch (IOException e2) {
JOptionPane.showMessageDialog(gui ,tr("EULA license URL not available: {0}", eulaUrl));
return false;
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java
index a464b25..f16c209 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java
@@ -9,11 +9,11 @@ import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
-import javax.swing.JTextField;
import javax.swing.SpinnerNumberModel;
import org.openstreetmap.josm.gui.layer.TMSLayer;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* {@code JPanel} giving access to TMS settings.
@@ -27,7 +27,7 @@ public class TMSSettingsPanel extends JPanel {
private final JSpinner minZoomLvl;
private final JSpinner maxZoomLvl;
private final JCheckBox addToSlippyMapChosser = new JCheckBox();
- private final JTextField tilecacheDir = new JTextField();
+ private final JosmTextField tilecacheDir = new JosmTextField();
/**
* Constructs a new {@code TMSSettingsPanel}.
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java b/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java
index fd35c81..b9e29e2 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java
@@ -1,11 +1,12 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.imagery;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
-import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
+
import javax.swing.JOptionPane;
import javax.swing.JTree;
import javax.swing.event.TreeSelectionEvent;
@@ -15,9 +16,10 @@ import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreePath;
+
import org.openstreetmap.josm.io.imagery.WMSImagery;
-public class WMSLayerTree implements Serializable {
+public class WMSLayerTree {
private final MutableTreeNode treeRootNode = new DefaultMutableTreeNode();
private final DefaultTreeModel treeData = new DefaultTreeModel(treeRootNode);
private final JTree layerTree = new JTree(treeData);
@@ -36,10 +38,12 @@ public class WMSLayerTree implements Serializable {
return selectedLayers;
}
+ /**
+ * Constructs a new {@code WMSLayerTree}.
+ */
public WMSLayerTree() {
layerTree.setCellRenderer(new LayerTreeCellRenderer());
layerTree.addTreeSelectionListener(new WMSTreeSelectionListener());
-
}
void addLayersToTreeData(MutableTreeNode parent, List<WMSImagery.LayerDetails> layers) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java
index 3885be7..8e207f7 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java
@@ -25,6 +25,7 @@ import org.openstreetmap.josm.tools.GBC;
public class WMSSettingsPanel extends JPanel {
// WMS Settings
+ private final JCheckBox autozoomActive;
private final JosmComboBox browser;
private final JCheckBox overlapCheckBox;
private final JSpinner spinEast;
@@ -36,7 +37,13 @@ public class WMSSettingsPanel extends JPanel {
*/
public WMSSettingsPanel() {
super(new GridBagLayout());
-
+
+ // Auto zoom
+ autozoomActive = new JCheckBox();
+ add(new JLabel(tr("Auto zoom by default: ")), GBC.std());
+ add(GBC.glue(5, 0), GBC.std());
+ add(autozoomActive, GBC.eol().fill(GBC.HORIZONTAL));
+
// Downloader
browser = new JosmComboBox(new String[] {
"webkit-image {0}",
@@ -79,6 +86,7 @@ public class WMSSettingsPanel extends JPanel {
* Loads the WMS settings.
*/
public void loadSettings() {
+ this.autozoomActive.setSelected(WMSLayer.PROP_DEFAULT_AUTOZOOM.get());
this.browser.setSelectedItem(HTMLGrabber.PROP_BROWSER.get());
this.overlapCheckBox.setSelected(WMSLayer.PROP_OVERLAP.get());
this.spinEast.setValue(WMSLayer.PROP_OVERLAP_EAST.get());
@@ -91,6 +99,7 @@ public class WMSSettingsPanel extends JPanel {
* @return true when restart is required
*/
public boolean saveSettings() {
+ WMSLayer.PROP_DEFAULT_AUTOZOOM.put(this.autozoomActive.isSelected());
WMSLayer.PROP_OVERLAP.put(overlapCheckBox.getModel().isSelected());
WMSLayer.PROP_OVERLAP_EAST.put((Integer) spinEast.getModel().getValue());
WMSLayer.PROP_OVERLAP_NORTH.put((Integer) spinNorth.getModel().getValue());
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java
index 81dea20..cce94be 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java
@@ -14,7 +14,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
-import javax.swing.JTextField;
import org.openstreetmap.josm.data.AutosaveTask;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -23,6 +22,7 @@ import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.tools.GBC;
@@ -35,10 +35,11 @@ public class BackupPreference implements SubPreferenceSetting {
}
}
private static final BooleanProperty PROP_KEEP_BACKUP = new BooleanProperty("save.keepbackup", false);
+ private JCheckBox notification;
private JCheckBox keepBackup;
private JCheckBox autosave;
- private final JTextField autosaveInterval = new JTextField(8);
- private final JTextField backupPerLayer = new JTextField(8);
+ private final JosmTextField autosaveInterval = new JosmTextField(8);
+ private final JosmTextField backupPerLayer = new JosmTextField(8);
@Override
public void addGui(PreferenceTabbedPane gui) {
@@ -83,7 +84,15 @@ public class BackupPreference implements SubPreferenceSetting {
"It appends ''~'' to the file name and saves it in the same folder.)</i>")),
GBC.eop().fill(GBC.HORIZONTAL).insets(5,0,0,0));
+ panel.add(new JSeparator(), GBC.eop().fill(GBC.HORIZONTAL));
+
+ notification = new JCheckBox(tr("Notification at each save"));
+ notification.setSelected(AutosaveTask.PROP_NOTIFICATION.get());
+ notification.setToolTipText(tr("When saving, display a small notification"));
+ panel.add(notification, GBC.eop());
+
ActionListener autosaveEnabled = new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
boolean enabled = autosave.isSelected();
autosaveIntervalLabel.setEnabled(enabled);
@@ -111,6 +120,7 @@ public class BackupPreference implements SubPreferenceSetting {
restartRequired |= AutosaveTask.PROP_AUTOSAVE_ENABLED.put(autosave.isSelected());
restartRequired |= AutosaveTask.PROP_INTERVAL.parseAndPut(autosaveInterval.getText());
AutosaveTask.PROP_FILES_PER_LAYER.parseAndPut(backupPerLayer.getText());
+ AutosaveTask.PROP_NOTIFICATION.put(notification.isSelected());
return restartRequired;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
index 7009d64..09c9a7e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.map;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -40,18 +40,20 @@ public class MapPaintPreference implements SubPreferenceSetting {
private static final List<SourceProvider> styleSourceProviders = new ArrayList<SourceProvider>();
- public static final boolean registerSourceProvider(SourceProvider provider) {
+ public static boolean registerSourceProvider(SourceProvider provider) {
if (provider != null)
return styleSourceProviders.add(provider);
return false;
}
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new MapPaintPreference();
}
}
+ @Override
public void addGui(final PreferenceTabbedPane gui) {
enableIconDefault = new JCheckBox(tr("Enable built-in icon defaults"),
Main.pref.getBoolean("mappaint.icon.enable-defaults", true));
@@ -71,6 +73,7 @@ public class MapPaintPreference implements SubPreferenceSetting {
//
gui.getMapPreference().getTabPane().addChangeListener(
new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
if (gui.getMapPreference().getTabPane().getSelectedComponent() == panel) {
sources.initiallyLoadAvailableSources();
@@ -82,10 +85,10 @@ public class MapPaintPreference implements SubPreferenceSetting {
static class MapPaintSourceEditor extends SourceEditor {
- final private String iconpref = "mappaint.icon.sources";
+ private static final String iconpref = "mappaint.icon.sources";
public MapPaintSourceEditor() {
- super(true, "http://josm.openstreetmap.de/styles", styleSourceProviders);
+ super(true, Main.JOSM_WEBSITE+"/styles", styleSourceProviders);
}
@Override
@@ -159,14 +162,14 @@ public class MapPaintPreference implements SubPreferenceSetting {
}
+ @Override
public boolean ok() {
boolean reload = Main.pref.put("mappaint.icon.enable-defaults", enableIconDefault.isSelected());
reload |= sources.finish();
if (reload) {
MapPaintStyles.readFromPreferences();
}
- if (Main.isDisplayingMapView())
- {
+ if (Main.isDisplayingMapView()) {
MapPaintStyles.getStyles().clearCached();
}
return false;
@@ -181,10 +184,16 @@ public class MapPaintPreference implements SubPreferenceSetting {
public static class MapPaintPrefHelper extends SourceEditor.SourcePrefHelper {
+ /**
+ * The unique instance.
+ */
public final static MapPaintPrefHelper INSTANCE = new MapPaintPrefHelper();
+ /**
+ * Constructs a new {@code MapPaintPrefHelper}.
+ */
public MapPaintPrefHelper() {
- super("mappaint.style.entries", "mappaint.style.sources-list");
+ super("mappaint.style.entries");
}
@Override
@@ -267,19 +276,6 @@ public class MapPaintPreference implements SubPreferenceSetting {
public SourceEntry deserialize(Map<String, String> s) {
return new SourceEntry(s.get("url"), s.get("ptoken"), s.get("title"), Boolean.parseBoolean(s.get("active")));
}
-
- @Override
- public Map<String, String> migrate(Collection<String> old) {
- List<String> entryStr = new ArrayList<String>(old);
- if (entryStr.size() < 4)
- return null;
- Map<String, String> res = new HashMap<String, String>();
- res.put("url", entryStr.get(0));
- res.put("ptoken", entryStr.get(1));
- res.put("title", entryStr.get(2));
- res.put("active", entryStr.get(3));
- return res;
- }
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
index 43f51e2..60263a1 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.map;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11,8 +11,9 @@ import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
import org.openstreetmap.josm.tools.GBC;
-public class MapPreference extends DefaultTabPreferenceSetting {
+public final class MapPreference extends DefaultTabPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new MapPreference();
}
@@ -20,14 +21,8 @@ public class MapPreference extends DefaultTabPreferenceSetting {
private MapPreference() {
super("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."), false, new JTabbedPane());
- mapcontent = getTabPane();
}
- /**
- * @deprecated Use {@link #getTabPane()} instead. This field will be removed mid-2013.
- */
- public final JTabbedPane mapcontent; // FIXME remove it mid 2013
-
@Override
public boolean ok() {
return false;
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
index 30f7275..5aaf774 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.map;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -38,15 +38,17 @@ import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
import org.openstreetmap.josm.gui.tagging.TaggingPresetSeparator;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
import org.openstreetmap.josm.tools.GBC;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-public class TaggingPresetPreference implements SubPreferenceSetting {
+public final class TaggingPresetPreference implements SubPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new TaggingPresetPreference();
}
@@ -68,6 +70,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
}
private ValidationListener validationListener = new ValidationListener() {
+ @Override
public boolean validatePreferences() {
if (sources.hasActiveSourcesChanged()) {
List<Integer> sourcesToRemove = new ArrayList<Integer>();
@@ -77,10 +80,10 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
i++;
boolean canLoad = false;
try {
- TaggingPreset.readAll(source.url, false);
+ TaggingPresetReader.readAll(source.url, false);
canLoad = true;
} catch (IOException e) {
- System.err.println(tr("Warning: Could not read tagging preset source: {0}", source));
+ Main.warn(tr("Could not read tagging preset source: {0}", source));
ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Error"),
new String[] {tr("Yes"), tr("No"), tr("Cancel")});
ed.setContent(tr("Could not read tagging preset source: {0}\nDo you want to keep it?", source));
@@ -100,11 +103,11 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
String errorMessage = null;
try {
- TaggingPreset.readAll(source.url, true);
+ TaggingPresetReader.readAll(source.url, true);
} catch (IOException e) {
// Should not happen, but at least show message
String msg = tr("Could not read tagging preset source {0}", source);
- System.err.println(msg);
+ Main.error(msg);
JOptionPane.showMessageDialog(Main.parent, msg);
return false;
} catch (SAXParseException e) {
@@ -131,7 +134,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
}
if (errorMessage != null) {
- System.err.println("Error: "+errorMessage);
+ Main.error(errorMessage);
int result = JOptionPane.showConfirmDialog(Main.parent, new JLabel(errorMessage), tr("Error"),
JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE);
@@ -153,6 +156,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
}
};
+ @Override
public void addGui(final PreferenceTabbedPane gui) {
sortMenu = new JCheckBox(tr("Sort presets menu"),
Main.pref.getBoolean("taggingpreset.sortmenu", false));
@@ -169,6 +173,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
//
gui.getMapPreference().getTabPane().addChangeListener(
new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent e) {
if (gui.getMapPreference().getTabPane().getSelectedComponent() == panel) {
sources.initiallyLoadAvailableSources();
@@ -181,10 +186,10 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
static class TaggingPresetSourceEditor extends SourceEditor {
- final private String iconpref = "taggingpreset.icon.sources";
+ private static final String iconpref = "taggingpreset.icon.sources";
public TaggingPresetSourceEditor() {
- super(false, "http://josm.openstreetmap.de/presets", presetSourceProviders);
+ super(false, Main.JOSM_WEBSITE+"/presets", presetSourceProviders);
}
@Override
@@ -257,6 +262,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
}
}
+ @Override
public boolean ok() {
boolean restart = Main.pref.put("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null);
restart |= sources.finish();
@@ -268,7 +274,7 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
* Initialize the tagging presets (load and may display error)
*/
public static void initialize() {
- taggingPresets = TaggingPreset.readFromPreferences(false);
+ taggingPresets = TaggingPresetReader.readFromPreferences(false);
for (TaggingPreset tp: taggingPresets) {
if (!(tp instanceof TaggingPresetSeparator)) {
Main.toolbar.register(tp);
@@ -276,43 +282,43 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
}
if (taggingPresets.isEmpty()) {
Main.main.menu.presetsMenu.setVisible(false);
- }
- else
- {
+ } else {
AutoCompletionManager.cachePresets(taggingPresets);
HashMap<TaggingPresetMenu,JMenu> submenus = new HashMap<TaggingPresetMenu,JMenu>();
- for (final TaggingPreset p : taggingPresets)
- {
+ for (final TaggingPreset p : taggingPresets) {
JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;
if (p instanceof TaggingPresetSeparator) {
m.add(new JSeparator());
- } else if (p instanceof TaggingPresetMenu)
- {
+ } else if (p instanceof TaggingPresetMenu) {
JMenu submenu = new JMenu(p);
submenu.setText(p.getLocaleName());
((TaggingPresetMenu)p).menu = submenu;
submenus.put((TaggingPresetMenu)p, submenu);
m.add(submenu);
- }
- else
- {
+ } else {
JMenuItem mi = new JMenuItem(p);
mi.setText(p.getLocaleName());
m.add(mi);
}
}
}
- if(Main.pref.getBoolean("taggingpreset.sortmenu")) {
+ if (Main.pref.getBoolean("taggingpreset.sortmenu")) {
TaggingPresetMenu.sortMenu(Main.main.menu.presetsMenu);
}
}
public static class PresetPrefHelper extends SourceEditor.SourcePrefHelper {
+ /**
+ * The unique instance.
+ */
public final static PresetPrefHelper INSTANCE = new PresetPrefHelper();
+ /**
+ * Constructs a new {@code PresetPrefHelper}.
+ */
public PresetPrefHelper() {
- super("taggingpreset.entries", "taggingpreset.sources-list");
+ super("taggingpreset.entries");
}
@Override
@@ -335,18 +341,6 @@ public class TaggingPresetPreference implements SubPreferenceSetting {
public SourceEntry deserialize(Map<String, String> s) {
return new SourceEntry(s.get("url"), null, s.get("title"), true);
}
-
- @Override
- public Map<String, String> migrate(Collection<String> old) {
- List<String> entryStr = new ArrayList<String>(old);
- if (entryStr.size() < 2)
- return null;
- Map<String, String> res = new HashMap<String, String>();
- res.put("url", entryStr.get(0));
- res.put("title", entryStr.get(1));
- return res;
- }
-
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
index 7a3a451..5f6d82a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
@@ -44,7 +44,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
protected String formatPluginRemoteVersion(PluginInformation pi) {
StringBuilder sb = new StringBuilder();
- if (pi.version == null || pi.version.trim().equals("")) {
+ if (pi.version == null || pi.version.trim().isEmpty()) {
sb.append(tr("unknown"));
} else {
sb.append(pi.version);
@@ -57,7 +57,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
protected String formatPluginLocalVersion(PluginInformation pi) {
if (pi == null) return tr("unknown");
- if (pi.localversion == null || pi.localversion.trim().equals(""))
+ if (pi.localversion == null || pi.localversion.trim().isEmpty())
return tr("unknown");
return pi.localversion;
}
@@ -87,7 +87,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
);
add(hint, gbc);
}
-
+
/**
* A plugin checkbox.
*
@@ -101,7 +101,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
addActionListener(new PluginCbActionListener(this));
}
}
-
+
/**
* Listener called when the user selects/unselects a plugin checkbox.
*
@@ -121,6 +121,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
}
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
// Select/unselect corresponding plugin in the model
model.setPluginSelected(cb.pi.getName(), cb.isSelected());
@@ -138,7 +139,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
if (!pi.equals(cb.pi) && pi.requires != null && model.isSelectedPlugin(pi.getName())) {
for (String s : pi.getRequiredPlugins()) {
if (s.equals(cb.pi.getName())) {
- otherPlugins.add(pi.getName());
+ otherPlugins.add(pi.getName());
break;
}
}
@@ -149,8 +150,8 @@ public class PluginListPanel extends VerticallyScrollablePanel{
}
}
}
- };
-
+ }
+
/**
* Alerts the user if an unselected plugin is still required by another plugins
@@ -227,6 +228,7 @@ public class PluginListPanel extends VerticallyScrollablePanel{
HtmlPanel description = new HtmlPanel();
description.setText(pi.getDescriptionAsHtml());
description.getEditorPane().addHyperlinkListener(new HyperlinkListener() {
+ @Override
public void hyperlinkUpdate(HyperlinkEvent e) {
if(e.getEventType() == EventType.ACTIVATED) {
OpenBrowser.displayUrl(e.getURL().toString());
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
index 8dec8db..bbd8b2b 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
@@ -10,6 +10,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Observable;
import java.util.Set;
import java.util.Map.Entry;
@@ -20,13 +21,16 @@ import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.plugins.PluginInformation;
public class PluginPreferencesModel extends Observable{
- private final ArrayList<PluginInformation> availablePlugins = new ArrayList<PluginInformation>();
- private final ArrayList<PluginInformation> displayedPlugins = new ArrayList<PluginInformation>();
- private final HashMap<PluginInformation, Boolean> selectedPluginsMap = new HashMap<PluginInformation, Boolean>();
+ private final List<PluginInformation> availablePlugins = new ArrayList<PluginInformation>();
+ private final List<PluginInformation> displayedPlugins = new ArrayList<PluginInformation>();
+ private final Map<PluginInformation, Boolean> selectedPluginsMap = new HashMap<PluginInformation, Boolean>();
private Set<String> pendingDownloads = new HashSet<String>();
private String filterExpression;
private Set<String> currentActivePlugins;
+ /**
+ * Constructs a new {@code PluginPreferencesModel}.
+ */
public PluginPreferencesModel() {
currentActivePlugins = new HashSet<String>();
currentActivePlugins.addAll(Main.pref.getCollection("plugins", currentActivePlugins));
@@ -143,6 +147,7 @@ public class PluginPreferencesModel extends Observable{
Collections.sort(
availablePlugins,
new Comparator<PluginInformation>() {
+ @Override
public int compare(PluginInformation o1, PluginInformation o2) {
String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase();
String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase();
@@ -294,7 +299,7 @@ public class PluginPreferencesModel extends Observable{
}
return ret;
}
-
+
/**
* Replies the set of all available plugins.
*
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
index 1d954fa..601ed1c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
@@ -14,14 +14,14 @@ import javax.swing.ButtonGroup;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* A panel for configuring whether JOSM shall update plugins at startup.
@@ -54,11 +54,9 @@ public class PluginUpdatePolicyPanel extends JPanel {
}
}
- private ButtonGroup bgVersionBasedUpdatePolicy;
- private ButtonGroup bgTimeBasedUpdatePolicy;
private Map<Policy, JRadioButton> rbVersionBasedUpatePolicy;
private Map<Policy, JRadioButton> rbTimeBasedUpatePolicy;
- private JTextField tfUpdateInterval;
+ private JosmTextField tfUpdateInterval;
private JLabel lblUpdateInterval;
protected JPanel buildVersionBasedUpdatePolicyPanel() {
@@ -68,7 +66,7 @@ public class PluginUpdatePolicyPanel extends JPanel {
gc.fill = GridBagConstraints.HORIZONTAL;
gc.weightx =1.0;
- bgVersionBasedUpdatePolicy = new ButtonGroup();
+ ButtonGroup bgVersionBasedUpdatePolicy = new ButtonGroup();
rbVersionBasedUpatePolicy = new HashMap<Policy, JRadioButton>();
JRadioButton btn = new JRadioButton(tr("Ask before updating"));
rbVersionBasedUpatePolicy.put(Policy.ASK, btn);
@@ -95,7 +93,7 @@ public class PluginUpdatePolicyPanel extends JPanel {
protected JPanel buildUpdateIntervalPanel() {
JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
pnl.add(lblUpdateInterval = new JLabel(tr("Update interval (in days):")));
- pnl.add(tfUpdateInterval = new JTextField(5));
+ pnl.add(tfUpdateInterval = new JosmTextField(5));
SelectAllOnFocusGainedDecorator.decorate(tfUpdateInterval);
return pnl;
}
@@ -109,7 +107,7 @@ public class PluginUpdatePolicyPanel extends JPanel {
TimeBasedPolicyChangeListener changeListener = new TimeBasedPolicyChangeListener();
- bgTimeBasedUpdatePolicy = new ButtonGroup();
+ ButtonGroup bgTimeBasedUpdatePolicy = new ButtonGroup();
rbTimeBasedUpatePolicy = new HashMap<Policy, JRadioButton>();
JRadioButton btn = new JRadioButton(tr("Ask before updating"));
btn.addChangeListener(changeListener);
@@ -156,6 +154,9 @@ public class PluginUpdatePolicyPanel extends JPanel {
add(new JPanel(), gc);
}
+ /**
+ * Constructs a new {@code PluginUpdatePolicyPanel}.
+ */
public PluginUpdatePolicyPanel() {
build();
initFromPreferences();
@@ -239,6 +240,7 @@ public class PluginUpdatePolicyPanel extends JPanel {
}
class TimeBasedPolicyChangeListener implements ChangeListener {
+ @Override
public void stateChanged(ChangeEvent e) {
lblUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected());
tfUpdateInterval.setEnabled(!rbTimeBasedUpatePolicy.get(Policy.NEVER).isSelected());
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
index 83e4402..128d646 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
@@ -6,7 +6,7 @@ import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.Projections;
abstract public class AbstractProjectionChoice implements ProjectionChoice {
-
+
protected String name;
protected String id;
protected String cacheDir;
@@ -51,7 +51,7 @@ abstract public class AbstractProjectionChoice implements ProjectionChoice {
}
abstract public String getCurrentCode();
-
+
abstract public String getProjectionName();
@Override
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
index 63b5a42..8cb27c4 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
@@ -18,7 +18,6 @@ import javax.swing.AbstractListModel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
@@ -27,6 +26,7 @@ import javax.swing.event.ListSelectionListener;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* Projection choice that lists all known projects by code.
@@ -35,18 +35,21 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
String code;
+ /**
+ * Constructs a new {@code CodeProjectionChoice}.
+ */
public CodeProjectionChoice() {
super(tr("By Code (EPSG)"), "core:code");
}
private class CodeSelectionPanel extends JPanel implements ListSelectionListener, DocumentListener {
- public JTextField filter;
+ public JosmTextField filter;
private ProjectionCodeListModel model;
public JList selectionList;
List<String> data;
List<String> filteredData;
- final String DEFAULT_CODE = "EPSG:3857";
+ static final String DEFAULT_CODE = "EPSG:3857";
String lastCode = DEFAULT_CODE;
ActionListener listener;
@@ -75,7 +78,7 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
if (cmp1 != 0) return cmp1;
int num1 = Integer.parseInt(matcher1.group(2));
int num2 = Integer.parseInt(matcher2.group(2));
- return new Integer(num1).compareTo(num2);
+ return Integer.valueOf(num1).compareTo(num2);
} else
return -1;
} else if (matcher2.matches())
@@ -107,7 +110,7 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
}
private void build() {
- filter = new JTextField(30);
+ filter = new JosmTextField(30);
filter.setColumns(10);
filter.getDocument().addDocumentListener(this);
@@ -209,8 +212,11 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements Su
}
@Override
- public Collection<String> getPreferences(JPanel pnl) {
- CodeSelectionPanel csPanel = (CodeSelectionPanel) pnl;
+ public Collection<String> getPreferences(JPanel panel) {
+ if (!(panel instanceof CodeSelectionPanel)) {
+ throw new IllegalArgumentException();
+ }
+ CodeSelectionPanel csPanel = (CodeSelectionPanel) panel;
return Collections.singleton(csPanel.getCode());
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
index 3c1d2cb..e6325cb 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
@@ -20,7 +20,6 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.plaf.basic.BasicComboBoxEditor;
import org.openstreetmap.josm.Main;
@@ -36,18 +35,22 @@ import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
public class CustomProjectionChoice extends AbstractProjectionChoice implements SubPrefsOptions {
private String pref;
+ /**
+ * Constructs a new {@code CustomProjectionChoice}.
+ */
public CustomProjectionChoice() {
super(tr("Custom Projection"), "core:custom");
}
private static class PreferencePanel extends JPanel {
- public JTextField input;
+ public JosmTextField input;
private HistoryComboBox cbInput;
public PreferencePanel(String initialText, ActionListener listener) {
@@ -55,12 +58,12 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
}
private void build(String initialText, final ActionListener listener) {
- input = new JTextField(30);
+ input = new JosmTextField(30);
cbInput = new HistoryComboBox();
cbInput.setPrototypeDisplayValue(new AutoCompletionListItem("xxxx"));
cbInput.setEditor(new BasicComboBoxEditor() {
@Override
- protected JTextField createEditorComponent() {
+ protected JosmTextField createEditorComponent() {
return input;
}
});
@@ -155,6 +158,9 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
public static class ParameterInfoDialog extends ExtendedDialog {
+ /**
+ * Constructs a new {@code ParameterInfoDialog}.
+ */
public ParameterInfoDialog() {
super(null, tr("Parameter information"), new String[] { tr("Close") }, false);
setContent(build());
@@ -208,7 +214,7 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
@Override
public String getCurrentCode() {
// not needed - getProjection() is overridden
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
@Override
@@ -224,6 +230,9 @@ public class CustomProjectionChoice extends AbstractProjectionChoice implements
@Override
public Collection<String> getPreferences(JPanel panel) {
+ if (!(panel instanceof PreferencePanel)) {
+ throw new IllegalArgumentException();
+ }
PreferencePanel prefPanel = (PreferencePanel) panel;
String pref = prefPanel.input.getText();
prefPanel.rememberHistory();
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
index 843d433..330da5c 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
@@ -6,10 +6,15 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
import java.util.Collections;
+import org.openstreetmap.josm.Main;
+
public class GaussKruegerProjectionChoice extends ListProjectionChoice {
private static String[] zones = { "2", "3", "4", "5" };
+ /**
+ * Constructs a new {@code GaussKruegerProjectionChoice}.
+ */
public GaussKruegerProjectionChoice() {
super(tr("Gau\u00DF-Kr\u00FCger"), "core:gauss-krueger", zones, tr("GK Zone"));
}
@@ -28,7 +33,9 @@ public class GaussKruegerProjectionChoice extends ListProjectionChoice {
protected int zoneToIndex(String zone) {
try {
return Integer.parseInt(zone) - 2;
- } catch(NumberFormatException e) {}
+ } catch(NumberFormatException e) {
+ Main.warn(e);
+ }
return defaultIndex;
}
@@ -42,8 +49,7 @@ public class GaussKruegerProjectionChoice extends ListProjectionChoice {
}
@Override
- public Collection<String> getPreferencesFromCode(String code)
- {
+ public Collection<String> getPreferencesFromCode(String code) {
//zone 2 = EPSG:31466 up to zone 5 = EPSG:31469
for (int zone = 2; zone <= 5; zone++) {
String epsg = "EPSG:" + (31464 + zone);
@@ -52,7 +58,7 @@ public class GaussKruegerProjectionChoice extends ListProjectionChoice {
}
return null;
}
-
+
@Override
public String getProjectionName() {
return tr("Gau\u00DF-Kr\u00FCger Zone {0}", index + 2);
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
index 421d72e..96fed0b 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
@@ -27,6 +27,9 @@ public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice {
tr("{0} ({1} to {2} degrees)", 9,49,51)
};
+ /**
+ * Constructs a new {@code LambertCC9ZonesProjectionChoice}.
+ */
public LambertCC9ZonesProjectionChoice() {
super(tr("Lambert CC9 Zone (France)"), "core:lambertcc9", lambert9zones, tr("Lambert CC Zone"));
}
@@ -76,7 +79,7 @@ public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice {
}
return null;
}
-
+
@Override
protected String indexToZone(int index) {
return Integer.toString(index + 1);
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
index f7aad6d..1fa5867 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
@@ -15,13 +15,16 @@ import org.openstreetmap.josm.tools.ImageProvider;
public class LambertProjectionChoice extends ListProjectionChoice {
- public static String[] lambert4zones = {
+ private static final String[] lambert4zones = {
tr("{0} ({1} to {2} degrees)", 1,"51.30","48.15"),
tr("{0} ({1} to {2} degrees)", 2,"48.15","45.45"),
tr("{0} ({1} to {2} degrees)", 3,"45.45","42.76"),
tr("{0} (Corsica)", 4)
};
+ /**
+ * Constructs a new {@code LambertProjectionChoice}.
+ */
public LambertProjectionChoice() {
super(tr("Lambert 4 Zones (France)"), "core:lambert", lambert4zones, tr("Lambert CC Zone"));
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
index d57be60..2a8aedf 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java
@@ -11,6 +11,7 @@ import javax.swing.JPanel;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
/**
* A projection choice, that offers a list of projections in a combo-box.
@@ -23,7 +24,7 @@ abstract public class ListProjectionChoice extends AbstractProjectionChoice {
protected String label;
/**
- * Constructor
+ * Constructs a new {@code ListProjectionChoice}.
*
* @param name the display name
* @param id the unique id for this ProjectionChoice
@@ -33,11 +34,18 @@ abstract public class ListProjectionChoice extends AbstractProjectionChoice {
*/
public ListProjectionChoice(String name, String id, Object[] entries, String label, int defaultIndex) {
super(name, id);
- this.entries = entries;
+ this.entries = Utils.copyArray(entries);
this.label = label;
this.defaultIndex = defaultIndex;
}
+ /**
+ * Constructs a new {@code ListProjectionChoice}.
+ * @param name the display name
+ * @param id the unique id for this ProjectionChoice
+ * @param entries the list of display entries for the combo-box
+ * @param label a label shown left to the combo-box
+ */
public ListProjectionChoice(String name, String id, Object[] entries, String label) {
this(name, id, entries, label, 0);
}
@@ -96,6 +104,9 @@ abstract public class ListProjectionChoice extends AbstractProjectionChoice {
@Override
public Collection<String> getPreferences(JPanel panel) {
+ if (!(panel instanceof CBPanel)) {
+ throw new IllegalArgumentException();
+ }
CBPanel p = (CBPanel) panel;
int index = p.prefcb.getSelectedIndex();
return Collections.singleton(indexToZone(index));
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java
index 4bb86a6..dffa146 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionChoice.java
@@ -19,7 +19,7 @@ public interface ProjectionChoice {
* Get a unique id for the projection choice.
*
* Will be used to save the user selection to the preference file.
- *
+ *
* @return the string identifier
*/
String getId();
@@ -66,7 +66,7 @@ public interface ProjectionChoice {
/**
* Get Preferences from projection code.
- *
+ *
* @return null when code is not part of this projection choice.
* An empty Collection as return value indicates, that the code is supported,
* but no preferences are required to set it up.
@@ -75,7 +75,7 @@ public interface ProjectionChoice {
/**
* Short name of the projection choice as shown in the GUI (combo box).
- *
+ *
* @return the name
*/
String toString();
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
index ffc0a3c..135389b 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.projection;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -43,10 +43,10 @@ import org.openstreetmap.josm.tools.GBC;
* How to add new Projections:
* - Find EPSG code for the projection.
* - Look up the parameter string for Proj4, e.g. on http://spatialreference.org/
- * and add it to the file 'data/epsg' in JOSM trunk
+ * and add it to the file 'data/projection/epsg' in JOSM trunk
* - Search for official references and verify the parameter values. These
* documents are often available in the local language only.
- * - Use {@link #registerProjectionChoice()}, to make the entry known to JOSM.
+ * - Use {@link #registerProjectionChoice}, to make the entry known to JOSM.
*
* In case there is no EPSG code:
* - override {@link AbstractProjectionChoice#getProjection()} and provide
@@ -56,6 +56,7 @@ import org.openstreetmap.josm.tools.GBC;
public class ProjectionPreference implements SubPreferenceSetting {
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new ProjectionPreference();
}
@@ -89,9 +90,9 @@ public class ProjectionPreference implements SubPreferenceSetting {
* initially EPSG used 3785 but that has been superseded by 3857,
* see http://www.epsg-registry.org/
*/
- mercator = registerProjectionChoice(tr("Mercator"), "core:mercator",
+ mercator = registerProjectionChoice(tr("Mercator"), "core:mercator",
3857);
-
+
/**
* UTM.
*/
@@ -154,7 +155,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
registerProjectionChoice(lambert = new LambertProjectionChoice()); // FR
/**
* Lambert 93 projection.
- *
+ *
* As specified by the IGN in this document
* http://professionnels.ign.fr/DISPLAY/000/526/702/5267026/NTG_87.pdf
* @author Don-vip
@@ -173,7 +174,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
*
* Using the UTM transvers Mercator projection and specific geodesic settings.
*/
- registerProjectionChoice(utm_france_dom = new UTM_France_DOM_ProjectionChoice()); // FR
+ registerProjectionChoice(utm_france_dom = new UTMFranceDOMProjectionChoice()); // FR
/**
* LKS-92/ Latvia TM projection.
@@ -286,6 +287,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
*/
static private GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0);
+ @Override
public void addGui(PreferenceTabbedPane gui) {
ProjectionChoice pc = setupProjectionCombo();
@@ -370,7 +372,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
}
int i = unitsCombo.getSelectedIndex();
- PROP_SYSTEM_OF_MEASUREMENT.put(unitsValues[i]);
+ NavigatableComponent.setSystemOfMeasurement(unitsValues[i]);
return false;
}
@@ -404,7 +406,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
/**
* Handles all the work related to update the projection-specific
* preferences
- * @param proj
+ * @param pc the choice class representing user selection
*/
private void selectedProjectionChanged(final ProjectionChoice pc) {
// Don't try to update if we're still starting up
@@ -430,6 +432,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
/**
* Sets up projection combobox with default values and action listener
+ * @return the choice class for user selection
*/
private ProjectionChoice setupProjectionCombo() {
ProjectionChoice pc = null;
@@ -448,6 +451,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
throw new RuntimeException("Couldn't find the current projection in the list of available projections!");
projectionCombo.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
ProjectionChoice pc = (ProjectionChoice) projectionCombo.getSelectedItem();
selectedProjectionChanged(pc);
@@ -469,7 +473,7 @@ public class ProjectionPreference implements SubPreferenceSetting {
public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
return gui.getMapPreference();
}
-
+
/**
* Selects the given projection.
* @param projection The projection to select.
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
index 16a9036..a70caeb 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java
@@ -23,6 +23,9 @@ public class PuwgProjectionChoice extends ListProjectionChoice {
tr("PUWG 2000 Zone {0} (Poland)", 8)
};
+ /**
+ * Constructs a new {@code PuwgProjectionChoice}.
+ */
public PuwgProjectionChoice() {
super(tr("PUWG (Poland)"), "core:puwg", NAMES, tr("PUWG Zone"));
}
@@ -41,9 +44,7 @@ public class PuwgProjectionChoice extends ListProjectionChoice {
@Override
public String[] allCodes() {
String[] zones = new String[CODES.length];
- for (int idx = 0; idx < CODES.length; idx++) {
- zones[idx] = CODES[idx];
- }
+ System.arraycopy(CODES, 0, zones, 0, CODES.length);
return zones;
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
index 3812643..def4b7e 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java
@@ -14,6 +14,9 @@ import org.openstreetmap.josm.tools.GBC;
public class SwissGridProjectionChoice extends SingleProjectionChoice {
+ /**
+ * Constructs a new {@code SwissGridProjectionChoice}.
+ */
public SwissGridProjectionChoice() {
super(tr("Swiss Grid (Switzerland)"), "core:swissgrid", "EPSG:21781");
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
similarity index 92%
rename from src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java
rename to src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
index 5cdef6f..7c1fe32 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java
@@ -6,7 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
import java.util.Collections;
-public class UTM_France_DOM_ProjectionChoice extends ListProjectionChoice {
+public class UTMFranceDOMProjectionChoice extends ListProjectionChoice {
private final static String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949");
private final static String SainteAnneName = tr("Guadeloupe Ste-Anne 1948");
@@ -22,7 +22,10 @@ public class UTM_France_DOM_ProjectionChoice extends ListProjectionChoice {
private final static Integer GuyaneEPSG = 2972;
private final static Integer[] utmEPSGs = { FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG };
- public UTM_France_DOM_ProjectionChoice() {
+ /**
+ * Constructs a new {@code UTMFranceDOMProjectionChoice}.
+ */
+ public UTMFranceDOMProjectionChoice() {
super(tr("UTM France (DOM)"), "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system"));
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
index cb0eb4a..0d5021d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
+++ b/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
@@ -24,7 +24,7 @@ public class UTMProjectionChoice extends ListProjectionChoice {
private static final Hemisphere DEFAULT_HEMISPHERE = Hemisphere.North;
private Hemisphere hemisphere;
-
+
private final static List<String> cbEntries = new ArrayList<String>();
static {
for (int i = 1; i <= 60; i++) {
@@ -32,6 +32,9 @@ public class UTMProjectionChoice extends ListProjectionChoice {
}
}
+ /**
+ * Constructs a new {@code UTMProjectionChoice}.
+ */
public UTMProjectionChoice() {
super(tr("UTM"), "core:utm", cbEntries.toArray(), tr("UTM Zone"));
}
@@ -95,6 +98,9 @@ public class UTMProjectionChoice extends ListProjectionChoice {
@Override
public Collection<String> getPreferences(JPanel panel) {
+ if (!(panel instanceof UTMPanel)) {
+ throw new IllegalArgumentException();
+ }
UTMPanel p = (UTMPanel) panel;
int index = p.prefcb.getSelectedIndex();
Hemisphere hemisphere = p.south.isSelected()?Hemisphere.South:Hemisphere.North;
@@ -103,13 +109,13 @@ public class UTMProjectionChoice extends ListProjectionChoice {
@Override
public String[] allCodes() {
- ArrayList<String> projections = new ArrayList<String>(60*4);
+ List<String> projections = new ArrayList<String>(60*4);
for (int zone = 1;zone <= 60; zone++) {
for (Hemisphere hemisphere : Hemisphere.values()) {
projections.add("EPSG:" + (32600 + zone + (hemisphere == Hemisphere.South?100:0)));
}
}
- return projections.toArray(new String[0]);
+ return projections.toArray(new String[projections.size()]);
}
@Override
@@ -132,8 +138,8 @@ public class UTMProjectionChoice extends ListProjectionChoice {
super.setPreferences(args);
Hemisphere hemisphere = DEFAULT_HEMISPHERE;
- if(args != null) {
- String[] array = args.toArray(new String[0]);
+ if (args != null) {
+ String[] array = args.toArray(new String[args.size()]);
if (array.length > 1) {
hemisphere = Hemisphere.valueOf(array[1]);
@@ -154,5 +160,4 @@ public class UTMProjectionChoice extends ListProjectionChoice {
} catch(NumberFormatException e) {}
return defaultIndex;
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java b/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java
index b4d7a5e..b09b1af 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java
@@ -13,7 +13,6 @@ import java.net.URL;
import javax.swing.JOptionPane;
-import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -157,7 +156,7 @@ public class ApiUrlTestTask extends PleaseWaitRunnable{
protected String getNormalizedApiUrl() {
String apiUrl = url.trim();
while(apiUrl.endsWith("/")) {
- apiUrl = apiUrl.substring(0, apiUrl.lastIndexOf("/"));
+ apiUrl = apiUrl.substring(0, apiUrl.lastIndexOf('/'));
}
return apiUrl;
}
@@ -215,11 +214,7 @@ public class ApiUrlTestTask extends PleaseWaitRunnable{
alertConnectionFailed();
return;
} finally {
- if (bin != null) {
- try {
- bin.close();
- } catch(IOException e){/* ignore */}
- }
+ Utils.close(bin);
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
index 2ba0c4d..39f1001 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
@@ -40,6 +40,8 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
private BasicAuthenticationPreferencesPanel pnlBasicAuthPreferences;
/** the panel for the OAuth authentication parameters */
private OAuthAuthenticationPreferencesPanel pnlOAuthPreferences;
+ /** the panel for messages notifier preferences */
+ private MessagesNotifierPanel pnlMessagesPreferences;
/**
* builds the UI
@@ -48,7 +50,7 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
setLayout(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
- AuthenticationMethodChangeListener authChangeListener = new AuthenticationMethodChangeListener();
+ AuthenticationMethodChangeListener authChangeListener = new AuthenticationMethodChangeListener();
// -- radio button for basic authentication
gc.anchor = GridBagConstraints.NORTHWEST;
@@ -73,29 +75,42 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
bg.add(rbBasicAuthentication);
bg.add(rbOAuth);
- //-- add the panel which will hld the authentication parameters
+ //-- add the panel which will hold the authentication parameters
gc.gridx = 0;
gc.gridy = 1;
gc.gridwidth = 2;
gc.fill = GridBagConstraints.BOTH;
gc.weightx = 1.0;
gc.weighty = 1.0;
- add(pnlAuthenticationParameteters = new JPanel(), gc);
+ pnlAuthenticationParameteters = new JPanel();
+ add(pnlAuthenticationParameteters, gc);
pnlAuthenticationParameteters.setLayout(new BorderLayout());
- //-- the two panel for authentication parameters
+ //-- the two panels for authentication parameters
pnlBasicAuthPreferences = new BasicAuthenticationPreferencesPanel();
pnlOAuthPreferences = new OAuthAuthenticationPreferencesPanel();
rbBasicAuthentication.setSelected(true);
pnlAuthenticationParameteters.add(pnlBasicAuthPreferences, BorderLayout.CENTER);
+
+ //-- the panel for messages preferences
+ gc.gridy = 2;
+ gc.fill = GridBagConstraints.NONE;
+ pnlMessagesPreferences = new MessagesNotifierPanel();
+ add(pnlMessagesPreferences, gc);
}
+ /**
+ * Constructs a new {@code AuthenticationPreferencesPanel}.
+ */
public AuthenticationPreferencesPanel() {
build();
HelpUtil.setHelpContext(this, HelpUtil.ht("/Preferences/Connection#AuthenticationSettings"));
}
+ /**
+ * Initializes the panel from preferences
+ */
public void initFromPreferences() {
String authMethod = Main.pref.get("osm-server.auth-method", "basic");
if (authMethod.equals("basic")) {
@@ -103,13 +118,17 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
} else if (authMethod.equals("oauth")) {
rbOAuth.setSelected(true);
} else {
- System.err.println(tr("Warning: Unsupported value in preference ''{0}'', got ''{1}''. Using authentication method ''Basic Authentication''.", "osm-server.auth-method", authMethod));
+ Main.warn(tr("Unsupported value in preference ''{0}'', got ''{1}''. Using authentication method ''Basic Authentication''.", "osm-server.auth-method", authMethod));
rbBasicAuthentication.setSelected(true);
}
pnlBasicAuthPreferences.initFromPreferences();
pnlOAuthPreferences.initFromPreferences();
+ pnlMessagesPreferences.initFromPreferences();
}
+ /**
+ * Saves the current values to preferences
+ */
public void saveToPreferences() {
// save the authentication method
String authMethod;
@@ -130,12 +149,15 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
pnlBasicAuthPreferences.saveToPreferences();
pnlOAuthPreferences.saveToPreferences();
}
+ // save message notifications preferences. To be done after authentication preferences.
+ pnlMessagesPreferences.saveToPreferences();
}
/**
* Listens to changes in the authentication method
*/
class AuthenticationMethodChangeListener implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
if (rbBasicAuthentication.isSelected()) {
pnlAuthenticationParameteters.removeAll();
@@ -150,6 +172,7 @@ public class AuthenticationPreferencesPanel extends VerticallyScrollablePanel im
}
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (pnlOAuthPreferences != null) {
pnlOAuthPreferences.propertyChange(evt);
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
index c5a2367..8298d5a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java
@@ -7,21 +7,21 @@ import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.net.PasswordAuthentication;
import java.net.Authenticator.RequestorType;
+import java.net.PasswordAuthentication;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.auth.CredentialsAgent;
import org.openstreetmap.josm.io.auth.CredentialsAgentException;
import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.io.OsmApi;
/**
* The preferences panel for parameters necessary for the Basic Authentication
@@ -31,10 +31,9 @@ import org.openstreetmap.josm.io.OsmApi;
public class BasicAuthenticationPreferencesPanel extends JPanel {
/** the OSM user name */
- private JTextField tfOsmUserName;
- private UserNameValidator valUserName;
+ private JosmTextField tfOsmUserName;
/** the OSM password */
- private JPasswordField tfOsmPassword;
+ private JosmPasswordField tfOsmPassword;
/** a panel with further information, e.g. some warnings */
private JPanel decorationPanel;
@@ -55,9 +54,9 @@ public class BasicAuthenticationPreferencesPanel extends JPanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfOsmUserName = new JTextField(), gc);
+ add(tfOsmUserName = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfOsmUserName);
- valUserName = new UserNameValidator(tfOsmUserName);
+ UserNameValidator valUserName = new UserNameValidator(tfOsmUserName);
valUserName.validate();
// -- OSM password
@@ -103,8 +102,8 @@ public class BasicAuthenticationPreferencesPanel extends JPanel {
}
} catch(CredentialsAgentException e) {
e.printStackTrace();
- System.err.println(tr("Warning: failed to retrieve OSM credentials from credential manager."));
- System.err.println(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
+ Main.warn(tr("Failed to retrieve OSM credentials from credential manager."));
+ Main.warn(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
tfOsmUserName.setText("");
tfOsmPassword.setText("");
}
@@ -118,10 +117,10 @@ public class BasicAuthenticationPreferencesPanel extends JPanel {
tfOsmPassword.getPassword()
);
cm.store(RequestorType.SERVER, OsmApi.getOsmApi().getHost(), pa);
- } catch(CredentialsAgentException e) {
+ } catch (CredentialsAgentException e) {
e.printStackTrace();
- System.err.println(tr("Warning: failed to save OSM credentials to credential manager."));
- System.err.println(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
+ Main.warn(tr("Failed to save OSM credentials to credential manager."));
+ Main.warn(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/MessagesNotifierPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/MessagesNotifierPanel.java
new file mode 100644
index 0000000..58f92ec
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/preferences/server/MessagesNotifierPanel.java
@@ -0,0 +1,98 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.preferences.server;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagLayout;
+
+import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.io.MessageNotifier;
+import org.openstreetmap.josm.tools.GBC;
+
+/**
+ * Preferences panel for OSM messages notifier.
+ * @since 6349
+ */
+public class MessagesNotifierPanel extends JPanel {
+
+ private JCheckBox notifier;
+ private JLabel intervalLabel;
+ private final JosmTextField notifierInterval = new JosmTextField(4);
+
+ /**
+ * Constructs a new {@code MessagesNotifierPanel}.
+ */
+ public MessagesNotifierPanel() {
+ build();
+ initFromPreferences();
+ updateEnabledState();
+ }
+
+ private void build() {
+ setLayout(new GridBagLayout());
+ setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+
+ notifier = new JCheckBox(tr("Periodically check for new messages"));
+ add(notifier, GBC.eol());
+ notifier.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ updateEnabledState();
+ }
+ });
+
+ intervalLabel = new JLabel(tr("Check interval (minutes):"));
+ add(intervalLabel, GBC.std().insets(25,0,0,0));
+
+ notifierInterval.setToolTipText(tr("Default value: {0}", MessageNotifier.PROP_INTERVAL.getDefaultValue()));
+ notifierInterval.setMinimumSize(notifierInterval.getPreferredSize());
+ add(notifierInterval, GBC.eol().insets(5,0,0,0));
+ }
+
+ private void updateEnabledState() {
+ boolean enabled = notifier.isSelected();
+ intervalLabel.setEnabled(enabled);
+ notifierInterval.setEnabled(enabled);
+ notifierInterval.setEditable(enabled);
+ }
+
+ /**
+ * Initializes the panel from preferences
+ */
+ public final void initFromPreferences() {
+ notifier.setSelected(MessageNotifier.PROP_NOTIFIER_ENABLED.get());
+ notifierInterval.setText(Integer.toString(MessageNotifier.PROP_INTERVAL.get()));
+ }
+
+ /**
+ * Saves the current values to preferences
+ */
+ public void saveToPreferences() {
+ final boolean enabled = notifier.isSelected();
+ boolean changed = MessageNotifier.PROP_NOTIFIER_ENABLED.put(enabled);
+ changed |= MessageNotifier.PROP_INTERVAL.parseAndPut(notifierInterval.getText());
+ // If parameters have changed, restart notifier
+ if (changed) {
+ MessageNotifier.stop();
+ if (enabled) {
+ MessageNotifier.start();
+ }
+ // Even if they have not changed,
+ } else {
+ // notifier should be stopped if user is no more identified enough
+ if (!MessageNotifier.isUserEnoughIdentified()) {
+ MessageNotifier.stop();
+ // or restarted if user is again identified and notifier was enabled in preferences
+ } else if (enabled && !MessageNotifier.isRunning()) {
+ MessageNotifier.start();
+ }
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
index a555a12..aaa0226 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.gui.preferences.server;
import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.oauth.OAuthToken;
import org.openstreetmap.josm.io.auth.CredentialsAgent;
@@ -143,8 +144,8 @@ public class OAuthAccessTokenHolder {
token = cm.lookupOAuthAccessToken();
} catch(CredentialsAgentException e) {
e.printStackTrace();
- System.err.println(tr("Warning: Failed to retrieve OAuth Access Token from credential manager"));
- System.err.println(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
+ Main.warn(tr("Failed to retrieve OAuth Access Token from credential manager"));
+ Main.warn(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
}
saveToPreferences = pref.getBoolean("oauth.access-token.save-to-preferences", true);
if (token != null) {
@@ -174,8 +175,8 @@ public class OAuthAccessTokenHolder {
}
} catch(CredentialsAgentException e){
e.printStackTrace();
- System.err.println(tr("Warning: Failed to store OAuth Access Token to credentials manager"));
- System.err.println(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
+ Main.warn(tr("Failed to store OAuth Access Token to credentials manager"));
+ Main.warn(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
index 12405ec..b1e2b87 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
@@ -21,18 +21,18 @@ import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.oauth.OAuthParameters;
import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.oauth.AdvancedOAuthPropertiesPanel;
import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
import org.openstreetmap.josm.gui.oauth.TestAccessTokenTask;
import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* The preferences panel for the OAuth preferences. This just a summary panel
@@ -54,7 +54,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
/**
* Builds the panel for entering the advanced OAuth parameters
*
- * @return
+ * @return panel with advanced settings
*/
protected JPanel buildAdvancedPropertiesPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
@@ -68,6 +68,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
cbShowAdvancedParameters.setSelected(false);
cbShowAdvancedParameters.addItemListener(
new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent evt) {
pnlAdvancedProperties.setVisible(evt.getStateChange() == ItemEvent.SELECTED);
}
@@ -213,8 +214,8 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
*
*/
private class AlreadyAuthorisedPanel extends JPanel {
- private JTextField tfAccessTokenKey;
- private JTextField tfAccessTokenSecret;
+ private JosmTextField tfAccessTokenKey;
+ private JosmTextField tfAccessTokenSecret;
protected void build() {
setLayout(new GridBagLayout());
@@ -237,7 +238,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfAccessTokenKey = new JTextField(), gc);
+ add(tfAccessTokenKey = new JosmTextField(), gc);
tfAccessTokenKey.setEditable(false);
// -- access token secret
@@ -249,7 +250,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfAccessTokenSecret = new JTextField(), gc);
+ add(tfAccessTokenSecret = new JosmTextField(), gc);
tfAccessTokenSecret.setEditable(false);
// -- access token secret
@@ -310,6 +311,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
OAuthAuthenticationPreferencesPanel.this,
@@ -335,6 +337,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
OAuthAuthenticationPreferencesPanel.this,
@@ -361,6 +364,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
}
+ @Override
public void actionPerformed(ActionEvent evt) {
OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
OAuthParameters parameters = OAuthParameters.createFromPreferences(Main.pref);
@@ -374,6 +378,7 @@ public class OAuthAuthenticationPreferencesPanel extends JPanel implements Prope
}
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (! evt.getPropertyName().equals(OsmApiUrlInputPanel.API_URL_PROP))
return;
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
index 3aa25cf..2080500 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
@@ -20,7 +20,6 @@ import javax.swing.AbstractAction;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
@@ -33,13 +32,14 @@ import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
public class OsmApiUrlInputPanel extends JPanel {
static public final String API_URL_PROP = OsmApiUrlInputPanel.class.getName() + ".apiUrl";
private JLabel lblValid;
private JLabel lblApiUrl;
- private JTextField tfOsmServerUrl;
+ private JosmTextField tfOsmServerUrl;
private ApiUrlValidator valOsmServerUrl;
private SideButton btnTest;
/** indicates whether to use the default OSM URL or not */
@@ -89,7 +89,7 @@ public class OsmApiUrlInputPanel extends JPanel {
gc.gridx = 1;
gc.weightx = 1.0;
- add(tfOsmServerUrl = new JTextField(), gc);
+ add(tfOsmServerUrl = new JosmTextField(), gc);
SelectAllOnFocusGainedDecorator.decorate(tfOsmServerUrl);
valOsmServerUrl = new ApiUrlValidator(tfOsmServerUrl);
valOsmServerUrl.validate();
@@ -108,6 +108,9 @@ public class OsmApiUrlInputPanel extends JPanel {
add(btnTest = new SideButton(actTest), gc);
}
+ /**
+ * Constructs a new {@code OsmApiUrlInputPanel}.
+ */
public OsmApiUrlInputPanel() {
build();
HelpUtil.setHelpContext(this, HelpUtil.ht("/Preferences/Connection#ApiUrl"));
@@ -151,7 +154,7 @@ public class OsmApiUrlInputPanel extends JPanel {
try {
OsmApi.getOsmApi().initialize(null);
} catch (Exception x) {
- // ignore;
+ Main.warn(x);
}
}
}
@@ -165,15 +168,18 @@ public class OsmApiUrlInputPanel extends JPanel {
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent arg0) {
final String url = tfOsmServerUrl.getText().trim();
final ApiUrlTestTask task = new ApiUrlTestTask(OsmApiUrlInputPanel.this, url);
Main.worker.submit(task);
Runnable r = new Runnable() {
+ @Override
public void run() {
if (task.isCanceled())
return;
Runnable r = new Runnable() {
+ @Override
public void run() {
if (task.isSuccess()) {
lblValid.setIcon(ImageProvider.get("dialogs/changeset", "valid"));
@@ -194,7 +200,7 @@ public class OsmApiUrlInputPanel extends JPanel {
protected void updateEnabledState() {
boolean enabled =
- !tfOsmServerUrl.getText().trim().equals("")
+ !tfOsmServerUrl.getText().trim().isEmpty()
&& !tfOsmServerUrl.getText().trim().equals(lastTestedUrl);
if (enabled) {
lblValid.setIcon(null);
@@ -202,14 +208,17 @@ public class OsmApiUrlInputPanel extends JPanel {
setEnabled(enabled);
}
+ @Override
public void changedUpdate(DocumentEvent arg0) {
updateEnabledState();
}
+ @Override
public void insertUpdate(DocumentEvent arg0) {
updateEnabledState();
}
+ @Override
public void removeUpdate(DocumentEvent arg0) {
updateEnabledState();
}
@@ -229,7 +238,7 @@ public class OsmApiUrlInputPanel extends JPanel {
@Override
public boolean isValid() {
- if (getComponent().getText().trim().equals(""))
+ if (getComponent().getText().trim().isEmpty())
return false;
try {
@@ -242,7 +251,7 @@ public class OsmApiUrlInputPanel extends JPanel {
@Override
public void validate() {
- if (getComponent().getText().trim().equals("")) {
+ if (getComponent().getText().trim().isEmpty()) {
feedbackInvalid(tr("OSM API URL must not be empty. Please enter the OSM API URL."));
return;
}
@@ -258,6 +267,7 @@ public class OsmApiUrlInputPanel extends JPanel {
* Handles changes in the default URL
*/
class UseDefaultServerUrlChangeHandler implements ItemListener {
+ @Override
public void itemStateChanged(ItemEvent e) {
switch(e.getStateChange()) {
case ItemEvent.SELECTED:
@@ -279,6 +289,7 @@ public class OsmApiUrlInputPanel extends JPanel {
firePropertyChange(API_URL_PROP, null, tfOsmServerUrl.getText());
}
+ @Override
public void actionPerformed(ActionEvent e) {
propagate();
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java b/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
index 5cd59a1..778392a 100644
--- a/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
@@ -11,9 +11,9 @@ import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+import java.net.Authenticator.RequestorType;
import java.net.PasswordAuthentication;
import java.net.ProxySelector;
-import java.net.Authenticator.RequestorType;
import java.util.HashMap;
import java.util.Map;
@@ -21,14 +21,13 @@ import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JPasswordField;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.io.DefaultProxySelector;
import org.openstreetmap.josm.io.auth.CredentialsAgent;
@@ -72,14 +71,13 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
public static final String PROXY_USER = "proxy.user";
public static final String PROXY_PASS = "proxy.pass";
- private ButtonGroup bgProxyPolicy;
private Map<ProxyPolicy, JRadioButton> rbProxyPolicy;
- private JTextField tfProxyHttpHost;
- private JTextField tfProxyHttpPort;
- private JTextField tfProxySocksHost;
- private JTextField tfProxySocksPort;
- private JTextField tfProxyHttpUser;
- private JPasswordField tfProxyHttpPassword;
+ private JosmTextField tfProxyHttpHost;
+ private JosmTextField tfProxyHttpPort;
+ private JosmTextField tfProxySocksHost;
+ private JosmTextField tfProxySocksPort;
+ private JosmTextField tfProxyHttpUser;
+ private JosmPasswordField tfProxyHttpPassword;
private JPanel pnlHttpProxyConfigurationPanel;
private JPanel pnlSocksProxyConfigurationPanel;
@@ -87,7 +85,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
/**
* Builds the panel for the HTTP proxy configuration
*
- * @return
+ * @return panel with HTTP proxy configuration
*/
protected JPanel buildHttpProxyConfigurationPanel() {
JPanel pnl = new JPanel(new GridBagLayout()) {
@@ -106,7 +104,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfProxyHttpHost = new JTextField(),gc);
+ pnl.add(tfProxyHttpHost = new JosmTextField(),gc);
gc.gridy = 1;
gc.gridx = 0;
@@ -116,7 +114,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfProxyHttpPort = new JTextField(5),gc);
+ pnl.add(tfProxyHttpPort = new JosmTextField(5),gc);
tfProxyHttpPort.setMinimumSize(tfProxyHttpPort.getPreferredSize());
gc.gridy = 2;
@@ -136,7 +134,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
gc.gridy = 3;
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfProxyHttpUser = new JTextField(20),gc);
+ pnl.add(tfProxyHttpUser = new JosmTextField(20),gc);
tfProxyHttpUser.setMinimumSize(tfProxyHttpUser.getPreferredSize());
gc.gridy = 4;
@@ -163,7 +161,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
/**
* Builds the panel for the SOCKS proxy configuration
*
- * @return
+ * @return panel with SOCKS proxy configuration
*/
protected JPanel buildSocksProxyConfigurationPanel() {
JPanel pnl = new JPanel(new GridBagLayout()) {
@@ -181,7 +179,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfProxySocksHost = new JTextField(20),gc);
+ pnl.add(tfProxySocksHost = new JosmTextField(20),gc);
gc.gridy = 1;
gc.gridx = 0;
@@ -191,7 +189,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
gc.gridx = 1;
gc.weightx = 1.0;
- pnl.add(tfProxySocksPort = new JTextField(5), gc);
+ pnl.add(tfProxySocksPort = new JosmTextField(5), gc);
tfProxySocksPort.setMinimumSize(tfProxySocksPort.getPreferredSize());
// add an extra spacer, otherwise the layout is broken
@@ -209,7 +207,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
JPanel pnl = new JPanel(new GridBagLayout());
GridBagConstraints gc = new GridBagConstraints();
- bgProxyPolicy = new ButtonGroup();
+ ButtonGroup bgProxyPolicy = new ButtonGroup();
rbProxyPolicy = new HashMap<ProxyPolicy, JRadioButton>();
ProxyPolicyChangeListener policyChangeListener = new ProxyPolicyChangeListener();
for (ProxyPolicy pp: ProxyPolicy.values()) {
@@ -316,7 +314,7 @@ public class ProxyPreferencesPanel extends VerticallyScrollablePanel {
tfProxySocksPort.setText(Main.pref.get(PROXY_SOCKS_PORT, ""));
if (pp.equals(ProxyPolicy.USE_SYSTEM_SETTINGS) && ! DefaultProxySelector.willJvmRetrieveSystemProxies()) {
- System.err.println(tr("Warning: JOSM is configured to use proxies from the system setting, but the JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"));
+ Main.warn(tr("JOSM is configured to use proxies from the system setting, but the JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"));
pp = ProxyPolicy.NO_PROXY;
rbProxyPolicy.get(pp).setSelected(true);
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
index 5a5a0fe..53c294d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.shortcut;
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
@@ -8,17 +11,14 @@ import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.Toolkit;
-
-import static org.openstreetmap.josm.tools.I18n.marktr;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
import java.awt.event.KeyEvent;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
-
import java.util.regex.PatternSyntaxException;
+
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
@@ -28,7 +28,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
import javax.swing.RowFilter;
@@ -38,13 +37,14 @@ import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableColumnModel;
-
+import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.tools.Shortcut;
@@ -56,40 +56,6 @@ public class PrefJPanel extends JPanel {
// table of shortcuts
private AbstractTableModel model;
- // comboboxes of modifier groups, mapping selectedIndex to real data
- private static int[] modifInts = new int[]{
- -1,
- 0,
- KeyEvent.SHIFT_DOWN_MASK,
- KeyEvent.CTRL_DOWN_MASK,
- KeyEvent.ALT_DOWN_MASK,
- KeyEvent.META_DOWN_MASK,
- KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK,
- KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK,
- KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK,
- KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK,
- KeyEvent.CTRL_DOWN_MASK | KeyEvent.META_DOWN_MASK,
- KeyEvent.ALT_DOWN_MASK | KeyEvent.META_DOWN_MASK,
- KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK,
- KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK
- };
- // and here are the texts fro the comboboxes
- private static String[] modifList = new String[] {
- tr("disabled"),
- tr("no modifier"),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[2]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[3]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[4]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[5]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[6]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[7]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[8]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[9]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[10]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[11]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[12]).getModifiers()),
- KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[13]).getModifiers())
- };
// this are the display(!) texts for the checkboxes. Let the JVM do the i18n for us <g>.
// Ok, there's a real reason for this: The JVM should know best how the keys are labelled
// on the physical keyboard. What language pack is installed in JOSM is completely
@@ -116,7 +82,6 @@ public class PrefJPanel extends JPanel {
String s = KeyEvent.getKeyText(i);
if (s != null && s.length() > 0 && !s.contains(unknown)) {
list.put(Integer.valueOf(i), s);
- //System.out.println(i+": "+s);
}
} catch (Exception e) {
e.printStackTrace();
@@ -137,15 +102,21 @@ public class PrefJPanel extends JPanel {
JTable shortcutTable = new JTable();
- private JTextField filterField = new JTextField();
+ private JosmTextField filterField = new JosmTextField();
/** Creates new form prefJPanel */
- // Ain't those auto-generated comments helpful or what? <g>
public PrefJPanel(AbstractTableModel model) {
this.model = model;
initComponents();
}
+ /**
+ * Show only shortcuts with descriptions coontaing given substring
+ */
+ public void filter(String substring) {
+ filterField.setText(substring);
+ }
+
private class ShortcutTableCellRenderer extends DefaultTableCellRenderer {
private boolean name;
@@ -153,7 +124,7 @@ public class PrefJPanel extends JPanel {
public ShortcutTableCellRenderer(boolean name) {
this.name = name;
}
-
+
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean
isSelected, boolean hasFocus, int row, int column) {
@@ -178,7 +149,7 @@ public class PrefJPanel extends JPanel {
return label;
}
}
-
+
private void initComponents() {
JPanel listPane = new JPanel();
JScrollPane listScrollPane = new JScrollPane();
@@ -283,6 +254,7 @@ public class PrefJPanel extends JPanel {
public CbAction (PrefJPanel panel) {
this.panel = panel;
}
+ @Override
public void valueChanged(ListSelectionEvent e) {
ListSelectionModel lsm = panel.shortcutTable.getSelectionModel(); // can't use e here
if (!lsm.isSelectionEmpty()) {
@@ -312,6 +284,7 @@ public class PrefJPanel extends JPanel {
panel.tfKey.setEnabled(false);
}
}
+ @Override
public void actionPerformed(java.awt.event.ActionEvent e) {
ListSelectionModel lsm = panel.shortcutTable.getSelectionModel();
if (lsm != null && !lsm.isSelectionEmpty()) {
@@ -365,7 +338,7 @@ public class PrefJPanel extends JPanel {
} else {
expr = expr.replace("+", "\\+");
// split search string on whitespace, do case-insensitive AND search
- ArrayList<RowFilter<Object, Object>> andFilters = new ArrayList<RowFilter<Object, Object>>();
+ List<RowFilter<Object, Object>> andFilters = new ArrayList<RowFilter<Object, Object>>();
for (String word : expr.split("\\s+")) {
andFilters.add(RowFilter.regexFilter("(?i)" + word));
}
@@ -377,8 +350,11 @@ public class PrefJPanel extends JPanel {
catch (ClassCastException ex2) { /* eliminate warning */ }
}
+ @Override
public void changedUpdate(DocumentEvent arg0) { filter(); }
+ @Override
public void insertUpdate(DocumentEvent arg0) { filter(); }
+ @Override
public void removeUpdate(DocumentEvent arg0) { filter(); }
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java b/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
index 07fdaad..87f3777 100644
--- a/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.preferences.shortcut;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -15,14 +15,17 @@ import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
-public class ShortcutPreference extends DefaultTabPreferenceSetting {
+public final class ShortcutPreference extends DefaultTabPreferenceSetting {
+
+ private String defaultFilter;
public static class Factory implements PreferenceSettingFactory {
+ @Override
public PreferenceSetting createPreferenceSetting() {
return new ShortcutPreference();
}
}
-
+
private ShortcutPreference() {
// icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
// icon licence: GPL
@@ -33,29 +36,37 @@ public class ShortcutPreference extends DefaultTabPreferenceSetting {
super("shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually."));
}
+ @Override
public void addGui(PreferenceTabbedPane gui) {
JPanel p = gui.createPreferenceTab(this);
- PrefJPanel prefpanel = new PrefJPanel(new scListModel());
+ PrefJPanel prefpanel = new PrefJPanel(new ScListModel());
p.add(prefpanel, GBC.eol().fill(GBC.BOTH));
-
+ if (defaultFilter!=null) prefpanel.filter(defaultFilter);
}
+ @Override
public boolean ok() {
return Shortcut.savePrefs();
}
+ public void setDefaultFilter(String substring) {
+ defaultFilter = substring;
+ }
+
// Maybe move this to prefPanel? There's no need for it to be here.
- private static class scListModel extends AbstractTableModel {
+ private static class ScListModel extends AbstractTableModel {
private String[] columnNames = new String[]{tr("Action"), tr("Shortcut")};
private List<Shortcut> data;
- public scListModel() {
+ public ScListModel() {
data = Shortcut.listAll();
}
+ @Override
public int getColumnCount() {
return columnNames.length;
}
+ @Override
public int getRowCount() {
return data.size();
}
@@ -63,6 +74,7 @@ public class ShortcutPreference extends DefaultTabPreferenceSetting {
public String getColumnName(int col) {
return columnNames[col];
}
+ @Override
public Object getValueAt(int row, int col) {
return (col==0)? data.get(row).getLongText() : data.get(row);
}
diff --git a/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
index ebdce70..c0077a4 100644
--- a/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
@@ -64,10 +64,12 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
* Tasks
=======*/
+ @Override
public void beginTask(String title) {
beginTask(title, DEFAULT_TICKS);
}
+ @Override
public synchronized void beginTask(String title, int ticks) {
this.taskTitle = title;
checkState(State.INIT);
@@ -77,6 +79,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
resetState();
}
+ @Override
public synchronized void finishTask() {
if (state != State.FINISHED) {
@@ -90,6 +93,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
}
}
+ @Override
public synchronized void invalidate() {
if (state == State.INIT) {
state = State.FINISHED;
@@ -97,6 +101,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
}
}
+ @Override
public synchronized void subTask(final String title) {
if (state == State.IN_SUBTASK) {
if (title != null) {
@@ -114,6 +119,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
}
}
+ @Override
public synchronized void indeterminateSubTask(String title) {
if (state == State.IN_SUBTASK) {
if (title != null) {
@@ -131,6 +137,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
}
}
+ @Override
public synchronized void setCustomText(String text) {
if (state == State.IN_SUBTASK) {
requestedState.customText = text;
@@ -140,6 +147,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
}
}
+ @Override
public synchronized void setExtraText(String text) {
if (state == State.IN_SUBTASK) {
requestedState.extraText = text;
@@ -152,6 +160,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
/**
* Default implementation is empty. Override in subclasses to display the log messages.
*/
+ @Override
public void appendLogMessage(String message) {
// do nothing
}
@@ -176,18 +185,22 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
doSetIntermediate(intermediateTask);
}
+ @Override
public void cancel() {
cancelHandler.cancel();
}
+ @Override
public boolean isCanceled() {
return cancelHandler.isCanceled();
}
+ @Override
public void addCancelListener(CancelListener listener) {
cancelHandler.addCancelListener(listener);
}
+ @Override
public void removeCancelListener(CancelListener listener) {
cancelHandler.removeCancelListener(listener);
}
@@ -198,6 +211,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
abstract void updateProgress(double value);
+ @Override
public synchronized void setTicks(int ticks) {
if (ticks >= ticksCount) {
ticks = ticksCount - 1;
@@ -206,11 +220,13 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
internalUpdateProgress(0);
}
+ @Override
public synchronized void setTicksCount(int ticks) {
this.ticksCount = ticks;
internalUpdateProgress(0);
}
+ @Override
public void worked(int ticks) {
if (ticks == ALL_TICKS) {
setTicks(this.ticksCount - 1);
@@ -227,10 +243,12 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
updateProgress(ticksCount == 0?0:(ticks + childProgress * childTicks) / ticksCount);
}
+ @Override
public synchronized int getTicks() {
return ticks;
}
+ @Override
public synchronized int getTicksCount() {
return ticksCount;
}
@@ -239,6 +257,7 @@ public abstract class AbstractProgressMonitor implements ProgressMonitor {
* Subtasks
==========*/
+ @Override
public synchronized ProgressMonitor createSubTaskMonitor(int ticks, boolean internal) {
if (ticks == ALL_TICKS) {
ticks = ticksCount - this.ticks;
diff --git a/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
index 13f64d7..9c08bf6 100644
--- a/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
@@ -5,7 +5,7 @@ import java.awt.Component;
import org.openstreetmap.josm.Main;
-public class NullProgressMonitor implements ProgressMonitor {
+public final class NullProgressMonitor implements ProgressMonitor {
public static final ProgressMonitor INSTANCE = new NullProgressMonitor();
@@ -13,22 +13,28 @@ public class NullProgressMonitor implements ProgressMonitor {
}
+ @Override
public void addCancelListener(CancelListener listener) {
}
+ @Override
public void beginTask(String title) {
}
+ @Override
public void beginTask(String title, int ticks) {
}
+ @Override
public void cancel() {
}
+ @Override
public ProgressMonitor createSubTaskMonitor(int ticks, boolean internal) {
return INSTANCE;
}
+ @Override
public void finishTask() {
}
@@ -36,50 +42,63 @@ public class NullProgressMonitor implements ProgressMonitor {
return null;
}
+ @Override
public int getTicks() {
return 0;
}
+ @Override
public void indeterminateSubTask(String title) {
}
+ @Override
public void invalidate() {
}
+ @Override
public boolean isCanceled() {
return false;
}
+ @Override
public void removeCancelListener(CancelListener listener) {
}
+ @Override
public void setCustomText(String text) {
}
public void setErrorMessage(String message) {
}
+ @Override
public void setExtraText(String text) {
}
+ @Override
public void appendLogMessage(String message) {
}
public void setSilent(boolean value) {
}
+ @Override
public void setTicks(int ticks) {
}
+ @Override
public void setTicksCount(int ticks) {
}
+ @Override
public void subTask(String title) {
}
+ @Override
public void worked(int ticks) {
}
+ @Override
public int getTicksCount() {
return 0;
}
diff --git a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
index 3c84a5f..8ca4620 100644
--- a/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
@@ -115,6 +115,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
}
private ActionListener cancelListener = new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
cancel();
}
@@ -149,6 +150,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
@Override
public void doBeginTask() {
doInEDT(new Runnable() {
+ @Override
public void run() {
Main.currentProgressMonitor = PleaseWaitProgressMonitor.this;
if (dialogParent instanceof Frame && dialog == null) {
@@ -183,6 +185,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
if (newValue != currentProgressValue) {
currentProgressValue = newValue;
doInEDT(new Runnable() {
+ @Override
public void run() {
ProgressMonitorDialog dialog = getDialog();
if (dialog != null) {
@@ -198,6 +201,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
checkState(State.IN_TASK, State.IN_SUBTASK);
this.customText = title;
doInEDT(new Runnable() {
+ @Override
public void run() {
ProgressMonitorDialog dialog = getDialog();
if (dialog != null) {
@@ -212,6 +216,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
checkState(State.IN_TASK, State.IN_SUBTASK);
this.title = title;
doInEDT(new Runnable() {
+ @Override
public void run() {
ProgressMonitorDialog dialog = getDialog();
if (dialog != null) {
@@ -225,6 +230,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
protected void doSetIntermediate(final boolean value) {
this.indeterminate = value;
doInEDT(new Runnable() {
+ @Override
public void run() {
// Enable only if progress is at the beginning. Doing intermediate progress in the middle
// will hide already reached progress
@@ -239,6 +245,7 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
@Override
public void appendLogMessage(final String message) {
doInEDT(new Runnable() {
+ @Override
public void run() {
ProgressMonitorDialog dialog = getDialog();
if (dialog != null) {
@@ -311,7 +318,9 @@ public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
doInEDT(new Runnable() {
@Override
public void run() {
- dialog.setInBackgroundPossible(PleaseWaitProgressMonitor.this.taskId != null && Main.isDisplayingMapView());
+ if (dialog != null) {
+ dialog.setInBackgroundPossible(PleaseWaitProgressMonitor.this.taskId != null && Main.isDisplayingMapView());
+ }
}
});
}
diff --git a/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
index 9dd852f..09080c1 100644
--- a/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
@@ -35,6 +35,7 @@ public interface ProgressMonitor {
void operationCanceled();
}
+ /** Ticks count used, when no other value is supplied */
public final int DEFAULT_TICKS = 10000;
/**
@@ -43,12 +44,17 @@ public interface ProgressMonitor {
*/
public final int ALL_TICKS = -1;
+ /**
+ * Starts this progress monitor. Must be called exactly once
+ * Ticks count is set to default value
+ * @param title title text of the task
+ */
void beginTask(String title);
/**
* Starts this progress monitor. Must be called exactly once
- * @param title
- * @param ticks
+ * @param title title text of the task
+ * @param ticks number of work units (see {@link #setTicksCount(int ticks)})
*/
void beginTask(String title, int ticks);
@@ -57,8 +63,8 @@ public interface ProgressMonitor {
* that it can continue with other tasks. Must be called at least once (if called multiply times
* then further calls are ignored)
*/
-
void finishTask();
+
/**
* Can be used if method receive ProgressMonitor but it's not interested progress monitoring.
* Basically replaces {@link #beginTask(String)} and {@link #finishTask()}
@@ -70,38 +76,51 @@ public interface ProgressMonitor {
void invalidate();
/**
- *
+ * Set the total number of work units
* @param ticks Number of total work units
*/
void setTicksCount(int ticks);
+
/**
- *
+ * Get the total number of work units
+ * @return Number of total work units
+ */
+ int getTicksCount();
+
+ /**
+ * Set the current number of work units
* @param ticks Number of work units already done
*/
void setTicks(int ticks);
+ /**
+ * Get the current number of work units
+ * @return Number of work units already done
+ */
int getTicks();
- int getTicksCount();
/**
* Increase number of already done work units by ticks
- * @param ticks
+ * @param ticks number of ticks to add
*/
void worked(int ticks);
/**
* Subtask that will show progress running back and forth
- * @param title Can be null, in that case task title is not changed
+ * @param title Can be {@code null}, in that case task title is not changed
*/
void indeterminateSubTask(String title);
+
/**
* Normal subtask
- * @param title Can be null, in that case task title is not changed
+ * @param title Can be {@code null}, in that case task title is not changed
*/
+
void subTask(String title);
/**
* Shows additional text
*/
+
void setCustomText(String text);
/**
* Show extra text after normal task title. Hack for ProgressInputStream to show number of kB
@@ -114,13 +133,30 @@ public interface ProgressMonitor {
* Creates subtasks monitor.
* @param ticks Number of work units that should be done when subtask finishes
* @param internal If true then subtask can't modify task title/custom text
- * @return
*/
ProgressMonitor createSubTaskMonitor(int ticks, boolean internal);
+ /**
+ * Returns the state of user aborts
+ * @return {@code true} if user aborted operation
+ */
boolean isCanceled();
+
+ /**
+ * Abort current operation, usually called when user somehow requested an abort
+ */
void cancel();
+
+ /**
+ * Add listener for user abort action
+ * @param listener the listener for cancel operation
+ */
void addCancelListener(CancelListener listener);
+
+ /**
+ * Remove listener for user abort action
+ * @param listener the listener for cancel operation
+ */
void removeCancelListener(CancelListener listener);
/**
@@ -131,19 +167,21 @@ public interface ProgressMonitor {
void appendLogMessage(String message);
/**
- * Should be used only by PleaseWaitRunnable. If taskId <> null then "In background" button will be shown
- * @param taskId
+ * Set the task ID of the progress dialog
+ * Should be used only by PleaseWaitRunnable. If taskId {@code <> null} then "In background" button will be shown
+ * @param taskId the task ID
*/
void setProgressTaskId(ProgressTaskId taskId);
/**
+ * Returns the task ID of the progress dialog
* Should be used only by PleaseWaitRunnable
- * @param taskId
+ * @return the task ID
*/
ProgressTaskId getProgressTaskId();
/**
- *
+ * Return the parent windows of progress dialog
* @return component suitable as parent for dialogs that wants to be shown in front of progress dialog
*/
Component getWindowParent();
diff --git a/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java b/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
index 614a1c3..af0b5fe 100644
--- a/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
+++ b/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
@@ -33,6 +33,7 @@ public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
@Override
public void doBeginTask() {
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
delegate.setCustomText("");
delegate.setMaximum(PROGRESS_BAR_MAX);
@@ -51,6 +52,7 @@ public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
if (newValue != currentProgressValue) {
currentProgressValue = newValue;
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
delegate.setValue(currentProgressValue);
}
@@ -62,6 +64,7 @@ public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
protected void doSetCustomText(final String title) {
checkState(State.IN_TASK, State.IN_SUBTASK);
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
delegate.setCustomText(title);
}
@@ -72,6 +75,7 @@ public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
protected void doSetTitle(final String title) {
checkState(State.IN_TASK, State.IN_SUBTASK);
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
delegate.setTaskTitle(title);
}
@@ -81,6 +85,7 @@ public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
@Override
protected void doSetIntermediate(final boolean value) {
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
delegate.setIndeterminate(value);
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java b/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
index 5a32780..c5b0474 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
@@ -85,6 +85,7 @@ public class TagCellEditor extends AbstractCellEditor implements TableCellEditor
/**
* replies the table cell editor
*/
+ @Override
public Component getTableCellEditorComponent(JTable table,
Object value, boolean isSelected, int row, int column) {
currentTag = (TagModel) value;
@@ -114,6 +115,7 @@ public class TagCellEditor extends AbstractCellEditor implements TableCellEditor
}
}
+ @Override
public Object getCellEditorValue() {
return editor.getText();
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java b/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
index 1b7ece4..e9bafa7 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
@@ -81,6 +81,7 @@ public class TagCellRenderer extends JLabel implements TableCellRenderer {
*
* @return the renderer component
*/
+ @Override
public Component getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int rowIndex, int vColIndex) {
resetRenderer();
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
index 850fc57..15791b6 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
@@ -12,6 +12,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.swing.DefaultListSelectionModel;
import javax.swing.table.AbstractTableModel;
@@ -20,6 +21,7 @@ import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.osm.TagCollection;
import org.openstreetmap.josm.data.osm.Tagged;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -33,7 +35,7 @@ public class TagEditorModel extends AbstractTableModel {
static public final String PROP_DIRTY = TagEditorModel.class.getName() + ".dirty";
/** the list holding the tags */
- protected final ArrayList<TagModel> tags =new ArrayList<TagModel>();
+ protected final List<TagModel> tags =new ArrayList<TagModel>();
/** indicates whether the model is dirty */
private boolean dirty = false;
@@ -46,7 +48,7 @@ public class TagEditorModel extends AbstractTableModel {
* Creates a new tag editor model. Internally allocates two selection models
* for row selection and column selection.
*
- * To create a {@link JTable} with this model:
+ * To create a {@link javax.swing.JTable} with this model:
* <pre>
* TagEditorModel model = new TagEditorModel();
* TagTable tbl = new TagTabel(model);
@@ -112,14 +114,17 @@ public class TagEditorModel extends AbstractTableModel {
}
}
+ @Override
public int getColumnCount() {
return 2;
}
+ @Override
public int getRowCount() {
return tags.size();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
if (rowIndex >= getRowCount())
throw new IndexOutOfBoundsException("unexpected rowIndex: rowIndex=" + rowIndex);
@@ -145,7 +150,7 @@ public class TagEditorModel extends AbstractTableModel {
break;
case 1:
String v = (String)value;
- if (tag.getValueCount() > 1 && ! v.equals("")) {
+ if (tag.getValueCount() > 1 && !v.isEmpty()) {
updateTagValue(tag, v);
} else if (tag.getValueCount() <= 1) {
updateTagValue(tag, v);
@@ -334,7 +339,7 @@ public class TagEditorModel extends AbstractTableModel {
* makes sure the model includes at least one (empty) tag
*/
public void ensureOneTag() {
- if (tags.size() == 0) {
+ if (tags.isEmpty()) {
appendNewTag();
}
}
@@ -358,15 +363,14 @@ public class TagEditorModel extends AbstractTableModel {
}
/**
- * initializes the model with the tags of an OSM primitive
+ * Initializes the model with the tags of an OSM primitive
*
- * @param primitive the OSM primitive
+ * @param tags the tags of an OSM primitive
*/
public void initFromTags(Map<String,String> tags) {
this.tags.clear();
- for (String key : tags.keySet()) {
- String value = tags.get(key);
- this.tags.add(new TagModel(key,value));
+ for (Entry<String, String> entry : tags.entrySet()) {
+ this.tags.add(new TagModel(entry.getKey(), entry.getValue()));
}
sort();
TagModel tag = new TagModel();
@@ -405,7 +409,7 @@ public class TagEditorModel extends AbstractTableModel {
*/
public void applyToPrimitive(Tagged primitive) {
Map<String,String> tags = primitive.getKeys();
- applyToTags(tags);
+ applyToTags(tags, false);
primitive.setKeys(tags);
}
@@ -415,7 +419,7 @@ public class TagEditorModel extends AbstractTableModel {
* @param tags the map of key/value pairs
*
*/
- public void applyToTags(Map<String, String> tags) {
+ public void applyToTags(Map<String, String> tags, boolean keepEmpty) {
tags.clear();
for (TagModel tag: this.tags) {
// tag still holds an unchanged list of different values for the same key.
@@ -426,7 +430,7 @@ public class TagEditorModel extends AbstractTableModel {
// tag name holds an empty key. Don't apply it to the selection.
//
- if (tag.getName().trim().equals("") || tag.getValue().trim().equals("")) {
+ if (!keepEmpty && (tag.getName().trim().isEmpty() || tag.getValue().trim().isEmpty())) {
continue;
}
tags.put(tag.getName().trim(), tag.getValue().trim());
@@ -434,8 +438,12 @@ public class TagEditorModel extends AbstractTableModel {
}
public Map<String,String> getTags() {
+ return getTags(false);
+ }
+
+ public Map<String,String> getTags(boolean keepEmpty) {
Map<String,String> tags = new HashMap<String, String>();
- applyToTags(tags);
+ applyToTags(tags, keepEmpty);
return tags;
}
@@ -472,7 +480,7 @@ public class TagEditorModel extends AbstractTableModel {
// tag name holds an empty key. Don't apply it to the selection.
//
- if (tag.getName().trim().equals(""))
+ if (tag.getName().trim().isEmpty())
return null;
String newkey = tag.getName();
@@ -513,7 +521,7 @@ public class TagEditorModel extends AbstractTableModel {
public List<String> getKeys() {
ArrayList<String> keys = new ArrayList<String>();
for (TagModel tag: tags) {
- if (!tag.getName().trim().equals("")) {
+ if (!tag.getName().trim().isEmpty()) {
keys.add(tag.getName());
}
}
@@ -527,6 +535,7 @@ public class TagEditorModel extends AbstractTableModel {
java.util.Collections.sort(
tags,
new Comparator<TagModel>() {
+ @Override
public int compare(TagModel self, TagModel other) {
return self.getName().compareTo(other.getName());
}
@@ -571,6 +580,36 @@ public class TagEditorModel extends AbstractTableModel {
}
/**
+ * Load tags from given list
+ * @param tags - the list
+ */
+ public void updateTags(List<Tag> tags) {
+ if (tags.isEmpty())
+ return;
+
+ Map<String, TagModel> modelTags = new HashMap<String, TagModel>();
+ for (int i=0; i<getRowCount(); i++) {
+ TagModel tagModel = get(i);
+ modelTags.put(tagModel.getName(), tagModel);
+ }
+ for (Tag tag: tags) {
+ TagModel existing = modelTags.get(tag.getKey());
+
+ if (tag.getValue().isEmpty()) {
+ if (existing != null) {
+ delete(tag.getKey());
+ }
+ } else {
+ if (existing != null) {
+ updateTagValue(existing, tag.getValue());
+ } else {
+ add(tag.getKey(), tag.getValue());
+ }
+ }
+ }
+ }
+
+ /**
* replies true, if this model has been updated
*
* @return true, if this model has been updated
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java b/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
index bf8f1fb..011f26c 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
@@ -2,10 +2,14 @@
package org.openstreetmap.josm.gui.tagging;
import java.awt.BorderLayout;
+import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
import java.util.EnumSet;
+import javax.swing.AbstractAction;
import javax.swing.BoxLayout;
import javax.swing.JButton;
@@ -38,7 +42,6 @@ public class TagEditorPanel extends JPanel {
private final PresetHandler presetHandler;
private AutoCompletionManager autocomplete;
- private AutoCompletionList acList;
/**
* builds the panel with the table for editing tags
@@ -57,6 +60,10 @@ public class TagEditorPanel extends JPanel {
return pnl;
}
+ public void setNextFocusComponent(Component nextFocusComponent) {
+ tagTable.setNextFocusComponent(nextFocusComponent);
+ }
+
/**
* builds the panel with the button row
*
@@ -77,9 +84,18 @@ public class TagEditorPanel extends JPanel {
pnl.add(btn = new JButton(tagTable.getDeleteAction()));
btn.setMargin(new Insets(0,0,0,0));
tagTable.addComponentNotStoppingCellEditing(btn);
+
+ // paste action
+ pnl.add(btn = new JButton(tagTable.getPasteAction()));
+ btn.setMargin(new Insets(0,0,0,0));
+ tagTable.addComponentNotStoppingCellEditing(btn);
return pnl;
}
+ public AbstractAction getPasteAction() {
+ return tagTable.getPasteAction();
+ }
+
/**
* builds the GUI
*/
@@ -115,6 +131,12 @@ public class TagEditorPanel extends JPanel {
}
});
}
+
+ addFocusListener(new FocusAdapter() {
+ @Override public void focusGained(FocusEvent e) {
+ tagTable.requestFocusInCell(0, 0);
+ }
+ });
}
/**
@@ -161,7 +183,7 @@ public class TagEditorPanel extends JPanel {
CheckParameterUtil.ensureParameterNotNull(layer, "layer");
autocomplete = layer.data.getAutoCompletionManager();
- acList = new AutoCompletionList();
+ AutoCompletionList acList = new AutoCompletionList();
TagCellEditor editor = ((TagCellEditor) tagTable.getColumnModel().getColumn(0).getCellEditor());
editor.setAutoCompletionManager(autocomplete);
@@ -179,7 +201,7 @@ public class TagEditorPanel extends JPanel {
private void updatePresets() {
presetListPanel.updatePresets(
- EnumSet.of(TaggingPreset.PresetType.RELATION),
+ EnumSet.of(TaggingPresetType.RELATION),
model.getTags(), presetHandler);
validate();
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagModel.java b/src/org/openstreetmap/josm/gui/tagging/TagModel.java
index 9c90c78..3ddbf8c 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagModel.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagModel.java
@@ -10,7 +10,7 @@ public class TagModel {
private String name = null;
/** the list of values */
- private ArrayList<String> values = null;
+ private List<String> values = null;
/**
* constructor
diff --git a/src/org/openstreetmap/josm/gui/tagging/TagTable.java b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
index cae005f..1bdd9f4 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TagTable.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TagTable.java
@@ -4,23 +4,21 @@ package org.openstreetmap.josm.gui.tagging;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.applet.Applet;
-import java.awt.AWTException;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.KeyboardFocusManager;
-import java.awt.MouseInfo;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Robot;
import java.awt.Window;
import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.EventObject;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.AbstractAction;
@@ -36,11 +34,22 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableColumnModel;
import javax.swing.table.TableColumn;
-
+import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.CopyAction;
+import org.openstreetmap.josm.actions.PasteTagsAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.gui.dialogs.relation.RunnableAction;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.TextTagParser;
+import org.openstreetmap.josm.tools.Utils;
/**
* This is the tabular editor component for OSM tags.
@@ -49,6 +58,8 @@ import org.openstreetmap.josm.tools.ImageProvider;
public class TagTable extends JTable {
/** the table cell editor used by this table */
private TagCellEditor editor = null;
+ private final TagEditorModel model;
+ private Component nextFocusComponent;
/** a list of components to which focus can be transferred without stopping
* cell editing this table.
@@ -95,6 +106,7 @@ public class TagTable extends JTable {
*
*/
class SelectNextColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
@@ -106,6 +118,11 @@ public class TagTable extends JTable {
getCellEditor().stopCellEditing();
}
+ if (row==-1 && col==-1) {
+ requestFocusInCell(0, 0);
+ return;
+ }
+
if (col == 0) {
col++;
} else if (col == 1 && row < getRowCount()-1) {
@@ -114,12 +131,18 @@ public class TagTable extends JTable {
} else if (col == 1 && row == getRowCount()-1){
// we are at the end. Append an empty row and move the focus
// to its second column
- TagEditorModel model = (TagEditorModel)getModel();
- model.appendNewTag();
- col=0;
- row++;
+ String key = ((TagModel)model.getValueAt(row, 0)).getName();
+ if (!key.trim().isEmpty()) {
+ model.appendNewTag();
+ col=0;
+ row++;
+ } else {
+ clearSelection();
+ if (nextFocusComponent!=null)
+ nextFocusComponent.requestFocusInWindow();
+ return;
+ }
}
- changeSelection(row, col, false, false);
requestFocusInCell(row,col);
}
}
@@ -131,6 +154,7 @@ public class TagTable extends JTable {
*/
class SelectPreviousColumnCellAction extends AbstractAction {
+ @Override
public void actionPerformed(ActionEvent e) {
int col = getSelectedColumn();
int row = getSelectedRow();
@@ -146,7 +170,6 @@ public class TagTable extends JTable {
col = 1;
row--;
}
- changeSelection(row, col, false, false);
requestFocusInCell(row,col);
}
}
@@ -187,7 +210,6 @@ public class TagTable extends JTable {
*/
protected void deleteTagNames() {
int[] rows = getSelectedRows();
- TagEditorModel model = (TagEditorModel)getModel();
model.deleteTagNames(rows);
}
@@ -196,7 +218,6 @@ public class TagTable extends JTable {
*/
protected void deleteTagValues() {
int[] rows = getSelectedRows();
- TagEditorModel model = (TagEditorModel)getModel();
model.deleteTagValues(rows);
}
@@ -205,7 +226,6 @@ public class TagTable extends JTable {
*/
protected void deleteTags() {
int[] rows = getSelectedRows();
- TagEditorModel model = (TagEditorModel)getModel();
model.deleteTags(rows);
}
@@ -233,7 +253,6 @@ public class TagTable extends JTable {
}
}
- TagEditorModel model = (TagEditorModel)getModel();
if (model.getRowCount() == 0) {
model.ensureOneTag();
requestFocusInCell(0, 0);
@@ -243,6 +262,7 @@ public class TagTable extends JTable {
/**
* listens to the table selection model
*/
+ @Override
public void valueChanged(ListSelectionEvent e) {
updateEnabledState();
}
@@ -279,26 +299,82 @@ public class TagTable extends JTable {
if (editor != null) {
getCellEditor().stopCellEditing();
}
- ((TagEditorModel)getModel()).appendNewTag();
- final int rowIdx = getModel().getRowCount()-1;
- requestFocusInCell(rowIdx, 0);
+ final int rowIdx = model.getRowCount()-1;
+ String key = ((TagModel)model.getValueAt(rowIdx, 0)).getName();
+ if (!key.trim().isEmpty()) {
+ model.appendNewTag();
+ }
+ requestFocusInCell(model.getRowCount()-1, 0);
}
protected void updateEnabledState() {
setEnabled(TagTable.this.isEnabled());
}
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
updateEnabledState();
}
}
+ /**
+ * Action to be run when the user wants to paste tags from buffer
+ */
+ class PasteAction extends RunnableAction implements PropertyChangeListener{
+ public PasteAction() {
+ putValue(SMALL_ICON, ImageProvider.get("","pastetags"));
+ putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer"));
+ TagTable.this.addPropertyChangeListener(this);
+ updateEnabledState();
+ }
+
+ @Override
+ public void run() {
+ Relation relation = new Relation();
+ model.applyToPrimitive(relation);
+
+ String buf = Utils.getClipboardContent();
+ if (buf == null || buf.isEmpty() || buf.matches(CopyAction.CLIPBOARD_REGEXP)) {
+ List<PrimitiveData> directlyAdded = Main.pasteBuffer.getDirectlyAdded();
+ if (directlyAdded==null || directlyAdded.isEmpty()) return;
+ PasteTagsAction.TagPaster tagPaster = new PasteTagsAction.TagPaster(directlyAdded, Collections.<OsmPrimitive>singletonList(relation));
+ model.updateTags(tagPaster.execute());
+ } else {
+ // Paste tags from arbitrary text
+ Map<String, String> tags = TextTagParser.readTagsFromText(buf);
+ if (tags==null || tags.isEmpty()) {
+ TextTagParser.showBadBufferMessage(ht("/Action/PasteTags"));
+ } else if (TextTagParser.validateTags(tags)) {
+ List<Tag> newTags = new ArrayList<Tag>();
+ for (Map.Entry<String, String> entry: tags.entrySet()) {
+ String k = entry.getKey();
+ String v = entry.getValue();
+ newTags.add(new Tag(k,v));
+ }
+ model.updateTags(newTags);
+ }
+ }
+ }
+
+ protected void updateEnabledState() {
+ setEnabled(TagTable.this.isEnabled());
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ updateEnabledState();
+ }
+ }
+
/** the delete action */
private RunnableAction deleteAction = null;
/** the add action */
private RunnableAction addAction = null;
+ /** the tag paste action */
+ private RunnableAction pasteAction = null;
+
/**
*
* @return the delete action used by this table
@@ -311,12 +387,15 @@ public class TagTable extends JTable {
return addAction;
}
+ public RunnableAction getPasteAction() {
+ return pasteAction;
+ }
+
/**
* initialize the table
*/
protected void init() {
setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- //setCellSelectionEnabled(true);
setRowSelectionAllowed(true);
setColumnSelectionAllowed(true);
setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
@@ -343,6 +422,8 @@ public class TagTable extends JTable {
.put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_MASK), "addTag");
getActionMap().put("addTag", addAction);
+ pasteAction = new PasteAction();
+
// create the table cell editor and set it to key and value columns
//
TagCellEditor tmpEditor = new TagCellEditor();
@@ -357,6 +438,7 @@ public class TagTable extends JTable {
*/
public TagTable(TagEditorModel model) {
super(model, new TagTableColumnModel(model.getColumnSelectionModel()), model.getRowSelectionModel());
+ this.model = model;
init();
}
@@ -404,7 +486,7 @@ public class TagTable extends JTable {
public void setAutoCompletionManager(AutoCompletionManager autocomplete) {
if (autocomplete == null) {
- System.out.println("argument autocomplete should not be null. Aborting.");
+ Main.warn("argument autocomplete should not be null. Aborting.");
Thread.dumpStack();
return;
}
@@ -420,6 +502,10 @@ public class TagTable extends JTable {
return null;
}
+ public void setNextFocusComponent(Component nextFocusComponent) {
+ this.nextFocusComponent = nextFocusComponent;
+ }
+
public TagCellEditor getTableCellEditor() {
return editor;
}
@@ -446,36 +532,18 @@ public class TagTable extends JTable {
}
public void requestFocusInCell(final int row, final int col) {
-
- // the following code doesn't work reliably. If a table cell
- // gains focus using editCellAt() and requestFocusInWindow()
- // it isn't possible to tab to the next table cell using TAB or
- // ENTER. Don't know why.
- //
- // tblTagEditor.editCellAt(row, col);
- // if (tblTagEditor.getEditorComponent() != null) {
- // tblTagEditor.getEditorComponent().requestFocusInWindow();
- // }
-
- // this is a workaround. We move the focus to the respective cell
- // using a simulated mouse click. In this case one can tab out of
- // the cell using TAB and ENTER.
- //
- Rectangle r = getCellRect(row,col, false);
- Point p = new Point(r.x + r.width/2, r.y + r.height/2);
- SwingUtilities.convertPointToScreen(p, this);
- Point before = MouseInfo.getPointerInfo().getLocation();
-
- try {
- Robot robot = new Robot();
- robot.mouseMove(p.x,p.y);
- robot.mousePress(InputEvent.BUTTON1_MASK);
- robot.mouseRelease(InputEvent.BUTTON1_MASK);
- robot.mouseMove(before.x, before.y);
- } catch(AWTException e) {
- System.out.println("Failed to simulate mouse click event at (" + r.x + "," + r.y + "). Exception: " + e.toString());
- return;
+ changeSelection(row, col, false, false);
+ editCellAt(row, col);
+ Component c = getEditorComponent();
+ if (c!=null) {
+ c.requestFocusInWindow();
+ if ( c instanceof JTextComponent ) {
+ ( (JTextComponent)c ).selectAll();
+ }
}
+ // there was a bug here - on older 1.6 Java versions Tab was not working
+ // after such activation. In 1.7 it works OK,
+ // previous solution of usint awt.Robot was resetting mouse speed on Windows
}
public void addComponentNotStoppingCellEditing(Component component) {
@@ -552,6 +620,7 @@ public class TagTable extends JTable {
this.focusManager = fm;
}
+ @Override
public void propertyChange(PropertyChangeEvent ev) {
if (!isEditing())
return;
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
index a38f129..970b1ec 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.tagging;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -7,48 +7,22 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.text.NumberFormat;
-import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.TreeSet;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import javax.swing.ButtonGroup;
import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.JToggleButton;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListModel;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
@@ -59,34 +33,23 @@ import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Tag;
import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.QuadStateCheckBox;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.preferences.SourceEntry;
import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Roles;
import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.JosmComboBox;
-import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Predicate;
-import org.openstreetmap.josm.tools.UrlLabel;
import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.XmlObjectParser;
import org.openstreetmap.josm.tools.template_engine.ParseError;
import org.openstreetmap.josm.tools.template_engine.TemplateEntry;
import org.openstreetmap.josm.tools.template_engine.TemplateParser;
@@ -98,101 +61,10 @@ import org.xml.sax.SAXException;
* in the config directory.
*
* It is also able to construct dialogs out of preset definitions.
+ * @since 294
*/
public class TaggingPreset extends AbstractAction implements MapView.LayerChangeListener {
- public enum PresetType {
- NODE(/* ICON */"Mf_node", "node"),
- WAY(/* ICON */"Mf_way", "way"),
- RELATION(/* ICON */"Mf_relation", "relation"),
- CLOSEDWAY(/* ICON */"Mf_closedway", "closedway");
-
- private final String iconName;
- private final String name;
-
- PresetType(String iconName, String name) {
- this.iconName = iconName;
- this.name = name;
- }
-
- public String getIconName() {
- return iconName;
- }
-
- public String getName() {
- return name;
- }
-
- public static PresetType forPrimitive(OsmPrimitive p) {
- return forPrimitiveType(p.getDisplayType());
- }
-
- public static PresetType forPrimitiveType(OsmPrimitiveType type) {
- switch (type) {
- case NODE:
- return NODE;
- case WAY:
- return WAY;
- case CLOSEDWAY:
- return CLOSEDWAY;
- case RELATION:
- case MULTIPOLYGON:
- return RELATION;
- default:
- throw new IllegalArgumentException("Unexpected primitive type: " + type);
- }
- }
-
- public static PresetType fromString(String type) {
- for (PresetType t : PresetType.values()) {
- if (t.getName().equals(type))
- return t;
- }
- return null;
- }
- }
-
- /**
- * Enum denoting how a match (see {@link Item#matches}) is performed.
- */
- private enum MatchType {
-
- /**
- * Neutral, i.e., do not consider this item for matching.
- */
- NONE("none"),
- /**
- * Positive if key matches, neutral otherwise.
- */
- KEY("key"),
- /**
- * Positive if key matches, negative otherwise.
- */
- KEY_REQUIRED("key!"),
- /**
- * Positive if key and value matches, negative otherwise.
- */
- KEY_VALUE("keyvalue");
-
- private final String value;
-
- private MatchType(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-
- public static MatchType ofString(String type) {
- for (MatchType i : EnumSet.allOf(MatchType.class)) {
- if (i.getValue().equals(type))
- return i;
- }
- throw new IllegalArgumentException(type + " is not allowed");
- }
- }
-
public static final int DIALOG_ANSWER_APPLY = 1;
public static final int DIALOG_ANSWER_NEW_RELATION = 2;
public static final int DIALOG_ANSWER_CANCEL = 3;
@@ -202,1141 +74,15 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public String name_context;
public String locale_name;
public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
- private static File zipIcons = null;
- private static final BooleanProperty PROP_FILL_DEFAULT = new BooleanProperty("taggingpreset.fill-default-for-tagged-primitives", false);
-
- public static abstract class Item {
-
- protected void initAutoCompletionField(AutoCompletingTextField field, String key) {
- OsmDataLayer layer = Main.main.getEditLayer();
- if (layer == null)
- return;
- AutoCompletionList list = new AutoCompletionList();
- Main.main.getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, key);
- field.setAutoCompletionList(list);
- }
-
- abstract boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel);
-
- abstract void addCommands(List<Tag> changedTags);
-
- boolean requestFocusInWindow() {
- return false;
- }
-
- /**
- * Tests whether the tags match this item.
- * Note that for a match, at least one positive and no negative is required.
- * @param tags the tags of an {@link OsmPrimitive}
- * @return {@code true} if matches (positive), {@code null} if neutral, {@code false} if mismatches (negative).
- */
- Boolean matches(Map<String, String> tags) {
- return null;
- }
- }
-
- public static abstract class KeyedItem extends Item {
-
- public String key;
- public String text;
- public String text_context;
- public String match = getDefaultMatch().getValue();
-
- public abstract MatchType getDefaultMatch();
- public abstract Collection<String> getValues();
-
- @Override
- Boolean matches(Map<String, String> tags) {
- switch (MatchType.ofString(match)) {
- case NONE:
- return null;
- case KEY:
- return tags.containsKey(key) ? true : null;
- case KEY_REQUIRED:
- return tags.containsKey(key);
- case KEY_VALUE:
- return tags.containsKey(key) && (getValues().contains(tags.get(key)));
- default:
- throw new IllegalStateException();
- }
- }
-
- }
-
- public static class Usage {
- TreeSet<String> values;
- boolean hadKeys = false;
- boolean hadEmpty = false;
- public boolean hasUniqueValue() {
- return values.size() == 1 && !hadEmpty;
- }
-
- public boolean unused() {
- return values.isEmpty();
- }
- public String getFirst() {
- return values.first();
- }
-
- public boolean hadKeys() {
- return hadKeys;
- }
- }
-
- public static final String DIFFERENT = tr("<different>");
-
- static Usage determineTextUsage(Collection<OsmPrimitive> sel, String key) {
- Usage returnValue = new Usage();
- returnValue.values = new TreeSet<String>();
- for (OsmPrimitive s : sel) {
- String v = s.get(key);
- if (v != null) {
- returnValue.values.add(v);
- } else {
- returnValue.hadEmpty = true;
- }
- if(s.hasKeys()) {
- returnValue.hadKeys = true;
- }
- }
- return returnValue;
- }
-
- static Usage determineBooleanUsage(Collection<OsmPrimitive> sel, String key) {
-
- Usage returnValue = new Usage();
- returnValue.values = new TreeSet<String>();
- for (OsmPrimitive s : sel) {
- String booleanValue = OsmUtils.getNamedOsmBoolean(s.get(key));
- if (booleanValue != null) {
- returnValue.values.add(booleanValue);
- }
- }
- return returnValue;
- }
-
- public static class PresetListEntry {
- public String value;
- public String value_context;
- public String display_value;
- public String short_description;
- public String icon;
- public String icon_size;
- public String locale_display_value;
- public String locale_short_description;
- private final File zipIcons = TaggingPreset.zipIcons;
-
- // Cached size (currently only for Combo) to speed up preset dialog initialization
- private int prefferedWidth = -1;
- private int prefferedHeight = -1;
-
- public String getListDisplay() {
- if (value.equals(DIFFERENT))
- return "<b>"+DIFFERENT.replaceAll("<", "<").replaceAll(">", ">")+"</b>";
-
- if (value.equals(""))
- return " ";
-
- final StringBuilder res = new StringBuilder("<b>");
- res.append(getDisplayValue(true));
- res.append("</b>");
- if (getShortDescription(true) != null) {
- // wrap in table to restrict the text width
- res.append("<div style=\"width:300px; padding:0 0 5px 5px\">");
- res.append(getShortDescription(true));
- res.append("</div>");
- }
- return res.toString();
- }
-
- public ImageIcon getIcon() {
- return icon == null ? null : loadImageIcon(icon, zipIcons, parseInteger(icon_size));
- }
-
- private Integer parseInteger(String str) {
- if (str == null || "".equals(str))
- return null;
- try {
- return Integer.parseInt(str);
- } catch (Exception e) {
- //
- }
- return null;
- }
-
- public PresetListEntry() {
- }
-
- public PresetListEntry(String value) {
- this.value = value;
- }
-
- public String getDisplayValue(boolean translated) {
- return translated
- ? Utils.firstNonNull(locale_display_value, tr(display_value), trc(value_context, value))
- : Utils.firstNonNull(display_value, value);
- }
-
- public String getShortDescription(boolean translated) {
- return translated
- ? Utils.firstNonNull(locale_short_description, tr(short_description))
- : short_description;
- }
-
- // toString is mainly used to initialize the Editor
- @Override
- public String toString() {
- if (value.equals(DIFFERENT))
- return DIFFERENT;
- return getDisplayValue(true).replaceAll("<.*>", ""); // remove additional markup, e.g. <br>
- }
- }
-
- public static class Text extends KeyedItem {
-
- public String locale_text;
- public String default_;
- public String originalValue;
- public String use_last_as_default = "false";
- public String auto_increment;
- public String length;
-
- private JComponent value;
-
- @Override public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-
- // find out if our key is already used in the selection.
- Usage usage = determineTextUsage(sel, key);
- AutoCompletingTextField textField = new AutoCompletingTextField();
- initAutoCompletionField(textField, key);
- if (length != null && !length.isEmpty()) {
- textField.setMaxChars(new Integer(length));
- }
- if (usage.unused()){
- if (auto_increment_selected != 0 && auto_increment != null) {
- try {
- textField.setText(Integer.toString(Integer.parseInt(lastValue.get(key)) + auto_increment_selected));
- } catch (NumberFormatException ex) {
- // Ignore - cannot auto-increment if last was non-numeric
- }
- }
- else if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
- // selected osm primitives are untagged or filling default values feature is enabled
- if (!"false".equals(use_last_as_default) && lastValue.containsKey(key)) {
- textField.setText(lastValue.get(key));
- } else {
- textField.setText(default_);
- }
- } else {
- // selected osm primitives are tagged and filling default values feature is disabled
- textField.setText("");
- }
- value = textField;
- originalValue = null;
- } else if (usage.hasUniqueValue()) {
- // all objects use the same value
- textField.setText(usage.getFirst());
- value = textField;
- originalValue = usage.getFirst();
- } else {
- // the objects have different values
- JosmComboBox comboBox = new JosmComboBox(usage.values.toArray());
- comboBox.setEditable(true);
- comboBox.setEditor(textField);
- comboBox.getEditor().setItem(DIFFERENT);
- value=comboBox;
- originalValue = DIFFERENT;
- }
- if (locale_text == null) {
- if (text != null) {
- if (text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- }
-
- // if there's an auto_increment setting, then wrap the text field
- // into a panel, appending a number of buttons.
- // auto_increment has a format like -2,-1,1,2
- // the text box being the first component in the panel is relied
- // on in a rather ugly fashion further down.
- if (auto_increment != null) {
- ButtonGroup bg = new ButtonGroup();
- JPanel pnl = new JPanel(new GridBagLayout());
- pnl.add(value, GBC.std().fill(GBC.HORIZONTAL));
-
- // first, one button for each auto_increment value
- for (final String ai : auto_increment.split(",")) {
- JToggleButton aibutton = new JToggleButton(ai);
- aibutton.setToolTipText(tr("Select auto-increment of {0} for this field", ai));
- aibutton.setMargin(new java.awt.Insets(0,0,0,0));
- bg.add(aibutton);
- try {
- // TODO there must be a better way to parse a number like "+3" than this.
- final int buttonvalue = ((Number)NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
- if (auto_increment_selected == buttonvalue) aibutton.setSelected(true);
- aibutton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- auto_increment_selected = buttonvalue;
- }
- });
- pnl.add(aibutton, GBC.std());
- } catch (ParseException x) {
- System.err.println("Cannot parse auto-increment value of '" + ai + "' into an integer");
- }
- }
-
- // an invisible toggle button for "release" of the button group
- final JToggleButton clearbutton = new JToggleButton("X");
- clearbutton.setVisible(false);
- bg.add(clearbutton);
- // and its visible counterpart. - this mechanism allows us to
- // have *no* button selected after the X is clicked, instead
- // of the X remaining selected
- JButton releasebutton = new JButton("X");
- releasebutton.setToolTipText(tr("Cancel auto-increment for this field"));
- releasebutton.setMargin(new java.awt.Insets(0,0,0,0));
- releasebutton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- auto_increment_selected = 0;
- clearbutton.setSelected(true);
- }
- });
- pnl.add(releasebutton, GBC.std().eol());
- value = pnl;
- }
- p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
- p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
- return true;
- }
-
- private static String getValue(Component comp) {
- if (comp instanceof JosmComboBox) {
- return ((JosmComboBox) comp).getEditor().getItem().toString();
- } else if (comp instanceof JTextField) {
- return ((JTextField) comp).getText();
- } else if (comp instanceof JPanel) {
- return getValue(((JPanel)comp).getComponent(0));
- } else {
- return null;
- }
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
-
- // return if unchanged
- String v = getValue(value);
- if (v == null) {
- System.err.println("No 'last value' support for component " + value);
- return;
- }
-
- v = v.trim();
-
- if (!"false".equals(use_last_as_default) || auto_increment != null) {
- lastValue.put(key, v);
- }
- if (v.equals(originalValue) || (originalValue == null && v.length() == 0))
- return;
-
- changedTags.add(new Tag(key, v));
- }
-
- @Override
- boolean requestFocusInWindow() {
- return value.requestFocusInWindow();
- }
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.NONE;
- }
-
- @Override
- public Collection<String> getValues() {
- if (default_ == null || default_.isEmpty())
- return Collections.emptyList();
- return Collections.singleton(default_);
- }
- }
-
- public static class Check extends KeyedItem {
-
- public String locale_text;
- public String value_on = OsmUtils.trueval;
- public String value_off = OsmUtils.falseval;
- public boolean default_ = false; // only used for tagless objects
-
- private QuadStateCheckBox check;
- private QuadStateCheckBox.State initialState;
- private boolean def;
-
- @Override public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-
- // find out if our key is already used in the selection.
- Usage usage = determineBooleanUsage(sel, key);
- def = default_;
-
- if(locale_text == null) {
- if(text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
-
- String oneValue = null;
- for (String s : usage.values) {
- oneValue = s;
- }
- if (usage.values.size() < 2 && (oneValue == null || value_on.equals(oneValue) || value_off.equals(oneValue))) {
- if (def && !PROP_FILL_DEFAULT.get()) {
- // default is set and filling default values feature is disabled - check if all primitives are untagged
- for (OsmPrimitive s : sel)
- if(s.hasKeys()) {
- def = false;
- }
- }
-
- // all selected objects share the same value which is either true or false or unset,
- // we can display a standard check box.
- initialState = value_on.equals(oneValue) ?
- QuadStateCheckBox.State.SELECTED :
- value_off.equals(oneValue) ?
- QuadStateCheckBox.State.NOT_SELECTED :
- def ? QuadStateCheckBox.State.SELECTED
- : QuadStateCheckBox.State.UNSET;
- check = new QuadStateCheckBox(locale_text, initialState,
- new QuadStateCheckBox.State[] {
- QuadStateCheckBox.State.SELECTED,
- QuadStateCheckBox.State.NOT_SELECTED,
- QuadStateCheckBox.State.UNSET });
- } else {
- def = false;
- // the objects have different values, or one or more objects have something
- // else than true/false. we display a quad-state check box
- // in "partial" state.
- initialState = QuadStateCheckBox.State.PARTIAL;
- check = new QuadStateCheckBox(locale_text, QuadStateCheckBox.State.PARTIAL,
- new QuadStateCheckBox.State[] {
- QuadStateCheckBox.State.PARTIAL,
- QuadStateCheckBox.State.SELECTED,
- QuadStateCheckBox.State.NOT_SELECTED,
- QuadStateCheckBox.State.UNSET });
- }
- p.add(check, GBC.eol().fill(GBC.HORIZONTAL));
- return true;
- }
-
- @Override public void addCommands(List<Tag> changedTags) {
- // if the user hasn't changed anything, don't create a command.
- if (check.getState() == initialState && !def) return;
-
- // otherwise change things according to the selected value.
- changedTags.add(new Tag(key,
- check.getState() == QuadStateCheckBox.State.SELECTED ? value_on :
- check.getState() == QuadStateCheckBox.State.NOT_SELECTED ? value_off :
- null));
- }
- @Override boolean requestFocusInWindow() {return check.requestFocusInWindow();}
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.NONE;
- }
-
- @Override
- public Collection<String> getValues() {
- return Arrays.asList(value_on, value_off);
- }
- }
-
- public static abstract class ComboMultiSelect extends KeyedItem {
-
- public String locale_text;
- public String values;
- public String values_context;
- public String display_values;
- public String locale_display_values;
- public String short_descriptions;
- public String locale_short_descriptions;
- public String default_;
- public String delimiter = ";";
- public String use_last_as_default = "false";
-
- protected JComponent component;
- protected Map<String, PresetListEntry> lhm = new LinkedHashMap<String, PresetListEntry>();
- private boolean initialized = false;
- protected Usage usage;
- protected Object originalValue;
-
- protected abstract Object getSelectedItem();
- protected abstract void addToPanelAnchor(JPanel p, String def);
-
- protected char getDelChar() {
- return delimiter.isEmpty() ? ';' : delimiter.charAt(0);
- }
-
- @Override
- public Collection<String> getValues() {
- initListEntries();
- return lhm.keySet();
- }
-
- public Collection<String> getDisplayValues() {
- initListEntries();
- return Utils.transform(lhm.values(), new Utils.Function<PresetListEntry, String>() {
-
- @Override
- public String apply(PresetListEntry x) {
- return x.getDisplayValue(true);
- }
- });
- }
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-
- initListEntries();
-
- // find out if our key is already used in the selection.
- usage = determineTextUsage(sel, key);
- if (!usage.hasUniqueValue() && !usage.unused()) {
- lhm.put(DIFFERENT, new PresetListEntry(DIFFERENT));
- }
-
- p.add(new JLabel(tr("{0}:", locale_text)), GBC.std().insets(0, 0, 10, 0));
- addToPanelAnchor(p, default_);
-
- return true;
-
- }
-
- private void initListEntries() {
- if (initialized) {
- lhm.remove(DIFFERENT); // possibly added in #addToPanel
- return;
- } else if (lhm.isEmpty()) {
- initListEntriesFromAttributes();
- } else {
- if (values != null) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
- + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
- key, text, "values", "list_entry"));
- }
- if (display_values != null || locale_display_values != null) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
- + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
- key, text, "display_values", "list_entry"));
- }
- if (short_descriptions != null || locale_short_descriptions != null) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
- + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
- key, text, "short_descriptions", "list_entry"));
- }
- for (PresetListEntry e : lhm.values()) {
- if (e.value_context == null) {
- e.value_context = values_context;
- }
- }
- }
- if (locale_text == null) {
- locale_text = trc(text_context, fixPresetString(text));
- }
- initialized = true;
- }
-
- private String[] initListEntriesFromAttributes() {
- char delChar = getDelChar();
-
- String[] value_array = splitEscaped(delChar, values);
-
- final String displ = Utils.firstNonNull(locale_display_values, display_values);
- String[] display_array = displ == null ? value_array : splitEscaped(delChar, displ);
-
- final String descr = Utils.firstNonNull(locale_short_descriptions, short_descriptions);
- String[] short_descriptions_array = descr == null ? null : splitEscaped(delChar, descr);
-
- if (display_array.length != value_array.length) {
- System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' must be the same as in ''values''", key, text));
- display_array = value_array;
- }
-
- if (short_descriptions_array != null && short_descriptions_array.length != value_array.length) {
- System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''short_descriptions'' must be the same as in ''values''", key, text));
- short_descriptions_array = null;
- }
-
- for (int i = 0; i < value_array.length; i++) {
- final PresetListEntry e = new PresetListEntry(value_array[i]);
- e.locale_display_value = locale_display_values != null
- ? display_array[i]
- : trc(values_context, fixPresetString(display_array[i]));
- if (short_descriptions_array != null) {
- e.locale_short_description = locale_short_descriptions != null
- ? short_descriptions_array[i]
- : tr(fixPresetString(short_descriptions_array[i]));
- }
- lhm.put(value_array[i], e);
- display_array[i] = e.getDisplayValue(true);
- }
-
- return display_array;
- }
-
- protected String getDisplayIfNull(String display) {
- return display;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- Object obj = getSelectedItem();
- String display = (obj == null) ? null : obj.toString();
- String value = null;
- if (display == null) {
- display = getDisplayIfNull(display);
- }
-
- if (display != null) {
- for (String key : lhm.keySet()) {
- String k = lhm.get(key).toString();
- if (k != null && k.equals(display)) {
- value = key;
- break;
- }
- }
- if (value == null) {
- value = display;
- }
- } else {
- value = "";
- }
- value = value.trim();
-
- // no change if same as before
- if (originalValue == null) {
- if (value.length() == 0)
- return;
- } else if (value.equals(originalValue.toString()))
- return;
-
- if (!"false".equals(use_last_as_default)) {
- lastValue.put(key, value);
- }
- changedTags.add(new Tag(key, value));
- }
-
- public void addListEntry(PresetListEntry e) {
- lhm.put(e.value, e);
- }
-
- public void addListEntries(Collection<PresetListEntry> e) {
- for (PresetListEntry i : e) {
- addListEntry(i);
- }
- }
-
- @Override
- boolean requestFocusInWindow() {
- return component.requestFocusInWindow();
- }
-
- private static ListCellRenderer RENDERER = new ListCellRenderer() {
-
- JLabel lbl = new JLabel();
-
- public Component getListCellRendererComponent(
- JList list,
- Object value,
- int index,
- boolean isSelected,
- boolean cellHasFocus) {
- PresetListEntry item = (PresetListEntry) value;
-
- // Only return cached size, item is not shown
- if (!list.isShowing() && item.prefferedWidth != -1 && item.prefferedHeight != -1) {
- if (index == -1) {
- lbl.setPreferredSize(new Dimension(item.prefferedWidth, 10));
- } else {
- lbl.setPreferredSize(new Dimension(item.prefferedWidth, item.prefferedHeight));
- }
- return lbl;
- }
-
- lbl.setPreferredSize(null);
-
-
- if (isSelected) {
- lbl.setBackground(list.getSelectionBackground());
- lbl.setForeground(list.getSelectionForeground());
- } else {
- lbl.setBackground(list.getBackground());
- lbl.setForeground(list.getForeground());
- }
-
- lbl.setOpaque(true);
- lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
- lbl.setText("<html>" + item.getListDisplay() + "</html>");
- lbl.setIcon(item.getIcon());
- lbl.setEnabled(list.isEnabled());
-
- // Cache size
- item.prefferedWidth = lbl.getPreferredSize().width;
- item.prefferedHeight = lbl.getPreferredSize().height;
-
- // We do not want the editor to have the maximum height of all
- // entries. Return a dummy with bogus height.
- if (index == -1) {
- lbl.setPreferredSize(new Dimension(lbl.getPreferredSize().width, 10));
- }
- return lbl;
- }
- };
-
-
- protected ListCellRenderer getListCellRenderer() {
- return RENDERER;
- }
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.NONE;
- }
- }
-
- public static class Combo extends ComboMultiSelect {
-
- public boolean editable = true;
- protected JosmComboBox combo;
-
- public Combo() {
- delimiter = ",";
- }
-
- @Override
- protected void addToPanelAnchor(JPanel p, String def) {
- if (!usage.unused()) {
- for (String s : usage.values) {
- if (!lhm.containsKey(s)) {
- lhm.put(s, new PresetListEntry(s));
- }
- }
- }
- if (def != null && !lhm.containsKey(def)) {
- lhm.put(def, new PresetListEntry(def));
- }
- lhm.put("", new PresetListEntry(""));
-
- combo = new JosmComboBox(lhm.values().toArray());
- component = combo;
- combo.setRenderer(getListCellRenderer());
- combo.setEditable(editable);
- combo.reinitialize(lhm.values());
- AutoCompletingTextField tf = new AutoCompletingTextField();
- initAutoCompletionField(tf, key);
- AutoCompletionList acList = tf.getAutoCompletionList();
- if (acList != null) {
- acList.add(getDisplayValues(), AutoCompletionItemPritority.IS_IN_STANDARD);
- }
- combo.setEditor(tf);
-
- if (usage.hasUniqueValue()) {
- // all items have the same value (and there were no unset items)
- originalValue = lhm.get(usage.getFirst());
- combo.setSelectedItem(originalValue);
- } else if (def != null && usage.unused()) {
- // default is set and all items were unset
- if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
- // selected osm primitives are untagged or filling default feature is enabled
- combo.setSelectedItem(lhm.get(def).getDisplayValue(true));
- } else {
- // selected osm primitives are tagged and filling default feature is disabled
- combo.setSelectedItem("");
- }
- originalValue = lhm.get(DIFFERENT);
- } else if (usage.unused()) {
- // all items were unset (and so is default)
- originalValue = lhm.get("");
- if ("force".equals(use_last_as_default) && lastValue.containsKey(key)) {
- combo.setSelectedItem(lhm.get(lastValue.get(key)));
- } else {
- combo.setSelectedItem(originalValue);
- }
- } else {
- originalValue = lhm.get(DIFFERENT);
- combo.setSelectedItem(originalValue);
- }
- p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
-
- }
-
- @Override
- protected Object getSelectedItem() {
- return combo.getSelectedItem();
-
- }
-
- @Override
- protected String getDisplayIfNull(String display) {
- if (combo.isEditable())
- return combo.getEditor().getItem().toString();
- else
- return display;
-
- }
- }
-
- /**
- * Class that allows list values to be assigned and retrieved as a comma-delimited
- * string.
- */
- public static class ConcatenatingJList extends JList {
- private String delimiter;
- public ConcatenatingJList(String del, Object[] o) {
- super(o);
- delimiter = del;
- }
- public void setSelectedItem(Object o) {
- if (o == null) {
- clearSelection();
- } else {
- String s = o.toString();
- HashSet<String> parts = new HashSet<String>(Arrays.asList(s.split(delimiter)));
- ListModel lm = getModel();
- int[] intParts = new int[lm.getSize()];
- int j = 0;
- for (int i = 0; i < lm.getSize(); i++) {
- if (parts.contains((((PresetListEntry)lm.getElementAt(i)).value))) {
- intParts[j++]=i;
- }
- }
- setSelectedIndices(Arrays.copyOf(intParts, j));
- // check if we have actually managed to represent the full
- // value with our presets. if not, cop out; we will not offer
- // a selection list that threatens to ruin the value.
- setEnabled(s.equals(getSelectedItem()));
- }
- }
- public String getSelectedItem() {
- ListModel lm = getModel();
- int[] si = getSelectedIndices();
- StringBuilder builder = new StringBuilder();
- for (int i=0; i<si.length; i++) {
- if (i>0) {
- builder.append(delimiter);
- }
- builder.append(((PresetListEntry)lm.getElementAt(si[i])).value);
- }
- return builder.toString();
- }
- }
-
- public static class MultiSelect extends ComboMultiSelect {
-
- public long rows = -1;
- protected ConcatenatingJList list;
-
- @Override
- protected void addToPanelAnchor(JPanel p, String def) {
- list = new ConcatenatingJList(delimiter, lhm.values().toArray());
- component = list;
- ListCellRenderer renderer = getListCellRenderer();
- list.setCellRenderer(renderer);
-
- if (usage.hasUniqueValue() && !usage.unused()) {
- originalValue = usage.getFirst();
- list.setSelectedItem(originalValue);
- } else if (def != null && !usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
- originalValue = DIFFERENT;
- list.setSelectedItem(def);
- } else if (usage.unused()) {
- originalValue = null;
- list.setSelectedItem(originalValue);
- } else {
- originalValue = DIFFERENT;
- list.setSelectedItem(originalValue);
- }
-
- JScrollPane sp = new JScrollPane(list);
- // if a number of rows has been specified in the preset,
- // modify preferred height of scroll pane to match that row count.
- if (rows != -1) {
- double height = renderer.getListCellRendererComponent(list,
- new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows;
- sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height));
- }
- p.add(sp, GBC.eol().fill(GBC.HORIZONTAL));
-
-
- }
-
- @Override
- protected Object getSelectedItem() {
- return list.getSelectedItem();
- }
- }
-
- /**
- * allow escaped comma in comma separated list:
- * "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
- * @param delimiter the delimiter, e.g. a comma. separates the entries and
- * must be escaped within one entry
- * @param s the string
- */
- private static String[] splitEscaped(char delimiter, String s) {
- if (s == null)
- return new String[0];
- List<String> result = new ArrayList<String>();
- boolean backslash = false;
- StringBuilder item = new StringBuilder();
- for (int i=0; i<s.length(); i++) {
- char ch = s.charAt(i);
- if (backslash) {
- item.append(ch);
- backslash = false;
- } else if (ch == '\\') {
- backslash = true;
- } else if (ch == delimiter) {
- result.add(item.toString());
- item.setLength(0);
- } else {
- item.append(ch);
- }
- }
- if (item.length() > 0) {
- result.add(item.toString());
- }
- return result.toArray(new String[result.size()]);
- }
-
- public static class Label extends Item {
-
- public String text;
- public String text_context;
- public String locale_text;
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- if (locale_text == null) {
- if (text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- p.add(new JLabel(locale_text), GBC.eol());
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Link extends Item {
-
- public String href;
- public String text;
- public String text_context;
- public String locale_text;
- public String locale_href;
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- if (locale_text == null) {
- if (text == null) {
- locale_text = tr("More information about this feature");
- } else if (text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- String url = locale_href;
- if (url == null) {
- url = href;
- }
- if (url != null) {
- p.add(new UrlLabel(url, locale_text, 2), GBC.eol().anchor(GBC.WEST));
- }
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Role {
- public EnumSet<PresetType> types;
- public String key;
- public String text;
- public String text_context;
- public String locale_text;
- public Match memberExpression;
-
- public boolean required = false;
- public long count = 0;
-
- public void setType(String types) throws SAXException {
- this.types = TaggingPreset.getType(types);
- }
-
- public void setRequisite(String str) throws SAXException {
- if("required".equals(str)) {
- required = true;
- } else if(!"optional".equals(str))
- throw new SAXException(tr("Unknown requisite: {0}", str));
- }
-
- public void setMember_expression(String member_expression) throws SAXException {
- try {
- this.memberExpression = SearchCompiler.compile(member_expression, true, true);
- } catch (SearchCompiler.ParseError ex) {
- throw new SAXException(tr("Illegal member expression: {0}", ex.getMessage()), ex);
- }
- }
-
- /* return either argument, the highest possible value or the lowest
- allowed value */
- public long getValidCount(long c)
- {
- if(count > 0 && !required)
- return c != 0 ? count : 0;
- else if(count > 0)
- return count;
- else if(!required)
- return c != 0 ? c : 0;
- else
- return c != 0 ? c : 1;
- }
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- String cstring;
- if(count > 0 && !required) {
- cstring = "0,"+String.valueOf(count);
- } else if(count > 0) {
- cstring = String.valueOf(count);
- } else if(!required) {
- cstring = "0-...";
- } else {
- cstring = "1-...";
- }
- if(locale_text == null) {
- if (text != null) {
- if(text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- }
- p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
- p.add(new JLabel(key), GBC.std().insets(0,0,10,0));
- p.add(new JLabel(cstring), types == null ? GBC.eol() : GBC.std().insets(0,0,10,0));
- if(types != null){
- JPanel pp = new JPanel();
- for(PresetType t : types) {
- pp.add(new JLabel(ImageProvider.get(t.getIconName())));
- }
- p.add(pp, GBC.eol());
- }
- return true;
- }
- }
-
- public static class Roles extends Item {
-
- public final List<Role> roles = new LinkedList<Role>();
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- p.add(new JLabel(" "), GBC.eol()); // space
- if (roles.size() > 0) {
- JPanel proles = new JPanel(new GridBagLayout());
- proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0, 0, 10, 0));
- proles.add(new JLabel(tr("role")), GBC.std().insets(0, 0, 10, 0));
- proles.add(new JLabel(tr("count")), GBC.std().insets(0, 0, 10, 0));
- proles.add(new JLabel(tr("elements")), GBC.eol());
- for (Role i : roles) {
- i.addToPanel(proles, sel);
- }
- p.add(proles, GBC.eol());
- }
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Optional extends Item {
-
- // TODO: Draw a box around optional stuff
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- p.add(new JLabel(" "), GBC.eol()); // space
- p.add(new JLabel(tr("Optional Attributes:")), GBC.eol());
- p.add(new JLabel(" "), GBC.eol()); // space
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Space extends Item {
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- p.add(new JLabel(" "), GBC.eol()); // space
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Key extends KeyedItem {
-
- public String value;
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- changedTags.add(new Tag(key, value));
- }
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.KEY_VALUE;
- }
-
- @Override
- public Collection<String> getValues() {
- return Collections.singleton(value);
- }
- }
/**
* The types as preparsed collection.
*/
- public EnumSet<PresetType> types;
- public List<Item> data = new LinkedList<Item>();
+ public EnumSet<TaggingPresetType> types;
+ public List<TaggingPresetItem> data = new LinkedList<TaggingPresetItem>();
public Roles roles;
public TemplateEntry nameTemplate;
public Match nameTemplateFilter;
- private static final HashMap<String,String> lastValue = new HashMap<String,String>();
- private static int auto_increment_selected = 0;
/**
* Create an empty tagging preset. This will not have any items and
@@ -1362,9 +108,9 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public String getLocaleName() {
if(locale_name == null) {
if(name_context != null) {
- locale_name = trc(name_context, fixPresetString(name));
+ locale_name = trc(name_context, TaggingPresetItems.fixPresetString(name));
} else {
- locale_name = tr(fixPresetString(name));
+ locale_name = tr(TaggingPresetItems.fixPresetString(name));
}
}
return locale_name;
@@ -1376,17 +122,21 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public String getRawName() {
return group != null ? group.getRawName() + "/" + name : name;
}
-
- protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
- final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
- ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
- if (maxSize != null) {
- imgProv.setMaxSize(maxSize);
+
+ /**
+ * Returns the preset icon.
+ * @return The preset icon, or {@code null} if none defined
+ * @since 6403
+ */
+ public final ImageIcon getIcon() {
+ Object icon = getValue(Action.SMALL_ICON);
+ if (icon instanceof ImageIcon) {
+ return (ImageIcon) icon;
}
- return imgProv.get();
+ return null;
}
- /*
+ /**
* Called from the XML parser to set the icon.
* This task is performed in the background in order to speedup startup.
*
@@ -1398,7 +148,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
imgProv.setDirs(s);
imgProv.setId("presets");
- imgProv.setArchive(TaggingPreset.zipIcons);
+ imgProv.setArchive(TaggingPresetReader.getZipIcons());
imgProv.setOptional(true);
imgProv.setMaxWidth(16).setMaxHeight(16);
imgProv.getInBackground(new ImageProvider.ImageCallback() {
@@ -1412,44 +162,24 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
}
});
} else {
- System.out.println("Could not get presets icon " + iconName);
+ Main.warn("Could not get presets icon " + iconName);
}
}
});
}
- // cache the parsing of types using a LRU cache (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
- private static final Map<String,EnumSet<PresetType>> typeCache =
- new LinkedHashMap<String, EnumSet<PresetType>>(16, 1.1f, true);
-
- static public EnumSet<PresetType> getType(String types) throws SAXException {
- if (typeCache.containsKey(types))
- return typeCache.get(types);
- EnumSet<PresetType> result = EnumSet.noneOf(PresetType.class);
- for (String type : Arrays.asList(types.split(","))) {
- try {
- PresetType presetType = PresetType.fromString(type);
- result.add(presetType);
- } catch (IllegalArgumentException e) {
- throw new SAXException(tr("Unknown type: {0}", type));
- }
- }
- typeCache.put(types, result);
- return result;
- }
-
- /*
+ /**
* Called from the XML parser to set the types this preset affects.
*/
public void setType(String types) throws SAXException {
- this.types = getType(types);
+ this.types = TaggingPresetItems.getType(types);
}
public void setName_template(String pattern) throws SAXException {
try {
this.nameTemplate = new TemplateParser(pattern).parse();
} catch (ParseError e) {
- System.err.println("Error while parsing " + pattern + ": " + e.getMessage());
+ Main.error("Error while parsing " + pattern + ": " + e.getMessage());
throw new SAXException(e);
}
}
@@ -1458,162 +188,11 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
try {
this.nameTemplateFilter = SearchCompiler.compile(filter, false, false);
} catch (org.openstreetmap.josm.actions.search.SearchCompiler.ParseError e) {
- System.err.println("Error while parsing" + filter + ": " + e.getMessage());
+ Main.error("Error while parsing" + filter + ": " + e.getMessage());
throw new SAXException(e);
}
}
-
- public static List<TaggingPreset> readAll(Reader in, boolean validate) throws SAXException {
- XmlObjectParser parser = new XmlObjectParser();
- parser.mapOnStart("item", TaggingPreset.class);
- parser.mapOnStart("separator", TaggingPresetSeparator.class);
- parser.mapBoth("group", TaggingPresetMenu.class);
- parser.map("text", Text.class);
- parser.map("link", Link.class);
- parser.mapOnStart("optional", Optional.class);
- parser.mapOnStart("roles", Roles.class);
- parser.map("role", Role.class);
- parser.map("check", Check.class);
- parser.map("combo", Combo.class);
- parser.map("multiselect", MultiSelect.class);
- parser.map("label", Label.class);
- parser.map("space", Space.class);
- parser.map("key", Key.class);
- parser.map("list_entry", PresetListEntry.class);
- LinkedList<TaggingPreset> all = new LinkedList<TaggingPreset>();
- TaggingPresetMenu lastmenu = null;
- Roles lastrole = null;
- List<PresetListEntry> listEntries = new LinkedList<PresetListEntry>();
-
- if (validate) {
- parser.startWithValidation(in, "http://josm.openstreetmap.de/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
- } else {
- parser.start(in);
- }
- while(parser.hasNext()) {
- Object o = parser.next();
- if (o instanceof TaggingPresetMenu) {
- TaggingPresetMenu tp = (TaggingPresetMenu) o;
- if(tp == lastmenu) {
- lastmenu = tp.group;
- } else
- {
- tp.group = lastmenu;
- tp.setDisplayName();
- lastmenu = tp;
- all.add(tp);
-
- }
- lastrole = null;
- } else if (o instanceof TaggingPresetSeparator) {
- TaggingPresetSeparator tp = (TaggingPresetSeparator) o;
- tp.group = lastmenu;
- all.add(tp);
- lastrole = null;
- } else if (o instanceof TaggingPreset) {
- TaggingPreset tp = (TaggingPreset) o;
- tp.group = lastmenu;
- tp.setDisplayName();
- all.add(tp);
- lastrole = null;
- } else {
- if (all.size() != 0) {
- if (o instanceof Roles) {
- all.getLast().data.add((Item) o);
- if (all.getLast().roles != null) {
- throw new SAXException(tr("Roles cannot appear more than once"));
- }
- all.getLast().roles = (Roles) o;
- lastrole = (Roles) o;
- } else if (o instanceof Role) {
- if (lastrole == null)
- throw new SAXException(tr("Preset role element without parent"));
- lastrole.roles.add((Role) o);
- } else if (o instanceof PresetListEntry) {
- listEntries.add((PresetListEntry) o);
- } else {
- all.getLast().data.add((Item) o);
- if (o instanceof ComboMultiSelect) {
- ((ComboMultiSelect) o).addListEntries(listEntries);
- }
- listEntries = new LinkedList<PresetListEntry>();
- lastrole = null;
- }
- } else
- throw new SAXException(tr("Preset sub element without parent"));
- }
- }
- return all;
- }
-
- public static Collection<TaggingPreset> readAll(String source, boolean validate) throws SAXException, IOException {
- Collection<TaggingPreset> tp;
- MirroredInputStream s = new MirroredInputStream(source);
- try {
- InputStream zip = s.getZipEntry("xml","preset");
- if(zip != null) {
- zipIcons = s.getFile();
- }
- InputStreamReader r;
- try {
- r = new InputStreamReader(zip == null ? s : zip, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- r = new InputStreamReader(zip == null ? s: zip);
- }
- try {
- tp = TaggingPreset.readAll(new BufferedReader(r), validate);
- } finally {
- r.close();
- }
- } finally {
- s.close();
- }
- return tp;
- }
-
- public static Collection<TaggingPreset> readAll(Collection<String> sources, boolean validate) {
- LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
- for(String source : sources) {
- try {
- allPresets.addAll(TaggingPreset.readAll(source, validate));
- } catch (IOException e) {
- System.err.println(e.getClass().getName()+": "+e.getMessage());
- System.err.println(source);
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Could not read tagging preset source: {0}",source),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- } catch (SAXException e) {
- System.err.println(e.getClass().getName()+": "+e.getMessage());
- System.err.println(source);
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Error parsing {0}: ", source)+e.getMessage(),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- }
- return allPresets;
- }
-
- public static LinkedList<String> getPresetSources() {
- LinkedList<String> sources = new LinkedList<String>();
-
- for (SourceEntry e : (new PresetPrefHelper()).get()) {
- sources.add(e.url);
- }
-
- return sources;
- }
-
- public static Collection<TaggingPreset> readFromPreferences(boolean validate) {
- return readAll(getPresetSources(), validate);
- }
-
private static class PresetPanel extends JPanel {
boolean hasElements = false;
PresetPanel()
@@ -1626,10 +205,10 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
if (data == null)
return null;
PresetPanel p = new PresetPanel();
- LinkedList<Item> l = new LinkedList<Item>();
+ LinkedList<TaggingPresetItem> l = new LinkedList<TaggingPresetItem>();
if(types != null){
JPanel pp = new JPanel();
- for(PresetType t : types){
+ for(TaggingPresetType t : types){
JLabel la = new JLabel(ImageProvider.get(t.getIconName()));
la.setToolTipText(tr("Elements of type {0} are supported.", tr(t.getName())));
pp.add(la);
@@ -1638,7 +217,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
}
JPanel items = new JPanel(new GridBagLayout());
- for (Item i : data){
+ for (TaggingPresetItem i : data){
if(i instanceof Link) {
l.add(i);
} else {
@@ -1648,11 +227,11 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
}
}
p.add(items, GBC.eol().fill());
- if (selected.size() == 0 && !supportsRelation()) {
+ if (selected.isEmpty() && !supportsRelation()) {
GuiHelper.setEnabledRec(items, false);
}
- for(Item link : l) {
+ for(TaggingPresetItem link : l) {
link.addToPanel(p, selected);
}
@@ -1661,9 +240,9 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public boolean isShowable()
{
- for(Item i : data)
+ for(TaggingPresetItem i : data)
{
- if(!(i instanceof Optional || i instanceof Space || i instanceof Key))
+ if(!(i instanceof TaggingPresetItems.Optional || i instanceof TaggingPresetItems.Space || i instanceof TaggingPresetItems.Key))
return true;
}
return false;
@@ -1672,8 +251,8 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public String suggestRoleForOsmPrimitive(OsmPrimitive osm) {
if (roles != null && osm != null) {
for (Role i : roles.roles) {
- if (i.memberExpression != null && i.memberExpression.match(osm)
- && (i.types == null || i.types.isEmpty() || i.types.contains(PresetType.forPrimitive(osm)) )) {
+ if (i.memberExpression != null && i.memberExpression.match(osm)
+ && (i.types == null || i.types.isEmpty() || i.types.contains(TaggingPresetType.forPrimitive(osm)) )) {
return i.key;
}
}
@@ -1681,6 +260,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
return null;
}
+ @Override
public void actionPerformed(ActionEvent e) {
if (Main.main == null) return;
if (Main.main.getCurrentDataSet() == null) return;
@@ -1688,7 +268,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
Collection<OsmPrimitive> sel = createSelection(Main.main.getCurrentDataSet().getSelected());
int answer = showDialog(sel, supportsRelation());
- if (sel.size() != 0 && answer == DIALOG_ANSWER_APPLY) {
+ if (!sel.isEmpty() && answer == DIALOG_ANSWER_APPLY) {
Command cmd = createCommand(sel, getChangedTags());
if (cmd != null) {
Main.main.undoRedo.add(cmd);
@@ -1722,9 +302,9 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
return DIALOG_ANSWER_CANCEL;
int answer = 1;
- if (p.getComponentCount() != 0 && (sel.size() == 0 || p.hasElements)) {
+ if (p.getComponentCount() != 0 && (sel.isEmpty() || p.hasElements)) {
String title = trn("Change {0} object", "Change {0} objects", sel.size(), sel.size());
- if(sel.size() == 0) {
+ if(sel.isEmpty()) {
if(originalSelectionEmpty) {
title = tr("Nothing selected!");
} else {
@@ -1733,13 +313,15 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
}
class PresetDialog extends ExtendedDialog {
- public PresetDialog(Component content, String title, boolean disableApply) {
+ public PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply) {
super(Main.parent,
title,
showNewRelation?
new String[] { tr("Apply Preset"), tr("New relation"), tr("Cancel") }:
new String[] { tr("Apply Preset"), tr("Cancel") },
true);
+ if (icon != null)
+ setIconImage(icon.getImage());
contentInsets = new Insets(10,5,0,5);
if (showNewRelation) {
setButtonIcons(new String[] {"ok.png", "dialogs/addrelation.png", "cancel.png" });
@@ -1761,7 +343,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
}
}
- answer = new PresetDialog(p, title, (sel.size() == 0)).getValue();
+ answer = new PresetDialog(p, title, (ImageIcon) getValue(Action.SMALL_ICON), sel.isEmpty()).getValue();
}
if (!showNewRelation && answer == 2)
return DIALOG_ANSWER_CANCEL;
@@ -1780,7 +362,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
* @return Cleaned list with suitable OsmPrimitives only
*/
public Collection<OsmPrimitive> createSelection(Collection<OsmPrimitive> participants) {
- originalSelectionEmpty = participants.size() == 0;
+ originalSelectionEmpty = participants.isEmpty();
Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
for (OsmPrimitive osm : participants)
{
@@ -1788,21 +370,21 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
{
if(osm instanceof Relation)
{
- if(!types.contains(PresetType.RELATION) &&
- !(types.contains(PresetType.CLOSEDWAY) && ((Relation)osm).isMultipolygon())) {
+ if(!types.contains(TaggingPresetType.RELATION) &&
+ !(types.contains(TaggingPresetType.CLOSEDWAY) && ((Relation)osm).isMultipolygon())) {
continue;
}
}
else if(osm instanceof Node)
{
- if(!types.contains(PresetType.NODE)) {
+ if(!types.contains(TaggingPresetType.NODE)) {
continue;
}
}
else if(osm instanceof Way)
{
- if(!types.contains(PresetType.WAY) &&
- !(types.contains(PresetType.CLOSEDWAY) && ((Way)osm).isClosed())) {
+ if(!types.contains(TaggingPresetType.WAY) &&
+ !(types.contains(TaggingPresetType.CLOSEDWAY) && ((Way)osm).isClosed())) {
continue;
}
}
@@ -1814,16 +396,12 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public List<Tag> getChangedTags() {
List<Tag> result = new ArrayList<Tag>();
- for (Item i: data) {
+ for (TaggingPresetItem i: data) {
i.addCommands(result);
}
return result;
}
- private static String fixPresetString(String s) {
- return s == null ? s : s.replaceAll("'","''");
- }
-
public static Command createCommand(Collection<OsmPrimitive> sel, List<Tag> changedTags) {
List<Command> cmds = new ArrayList<Command>();
for (Tag tag: changedTags) {
@@ -1835,25 +413,28 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
else if (cmds.size() == 1)
return cmds.get(0);
else
- return new SequenceCommand(tr("Change Properties"), cmds);
+ return new SequenceCommand(tr("Change Tags"), cmds);
}
private boolean supportsRelation() {
- return types == null || types.contains(PresetType.RELATION);
+ return types == null || types.contains(TaggingPresetType.RELATION);
}
protected void updateEnabledState() {
setEnabled(Main.main != null && Main.main.getCurrentDataSet() != null);
}
+ @Override
public void activeLayerChange(Layer oldLayer, Layer newLayer) {
updateEnabledState();
}
+ @Override
public void layerAdded(Layer newLayer) {
updateEnabledState();
}
+ @Override
public void layerRemoved(Layer oldLayer) {
updateEnabledState();
}
@@ -1863,17 +444,17 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
return (types == null?"":types) + " " + name;
}
- public boolean typeMatches(Collection<PresetType> t) {
+ public boolean typeMatches(Collection<TaggingPresetType> t) {
return t == null || types == null || types.containsAll(t);
}
- public boolean matches(Collection<PresetType> t, Map<String, String> tags, boolean onlyShowable) {
+ public boolean matches(Collection<TaggingPresetType> t, Map<String, String> tags, boolean onlyShowable) {
if (onlyShowable && !isShowable())
return false;
else if (!typeMatches(t))
return false;
boolean atLeastOnePositiveMatch = false;
- for (Item item : data) {
+ for (TaggingPresetItem item : data) {
Boolean m = item.matches(tags);
if (m != null && !m)
return false;
@@ -1884,7 +465,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
return atLeastOnePositiveMatch;
}
- public static Collection<TaggingPreset> getMatchingPresets(final Collection<PresetType> t, final Map<String, String> tags, final boolean onlyShowable) {
+ public static Collection<TaggingPreset> getMatchingPresets(final Collection<TaggingPresetType> t, final Map<String, String> tags, final boolean onlyShowable) {
return Utils.filter(TaggingPresetPreference.taggingPresets, new Predicate<TaggingPreset>() {
@Override
public boolean evaluate(TaggingPreset object) {
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java
new file mode 100644
index 0000000..3b66147
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java
@@ -0,0 +1,62 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+
+/**
+ * Class that represents single part of a preset - one field or text label that is shown to user
+ * @since 6068
+ */
+public abstract class TaggingPresetItem {
+
+ protected void initAutoCompletionField(AutoCompletingTextField field, String key) {
+ if (Main.main == null) return;
+ OsmDataLayer layer = Main.main.getEditLayer();
+ if (layer == null) {
+ return;
+ }
+ AutoCompletionList list = new AutoCompletionList();
+ layer.data.getAutoCompletionManager().populateWithTagValues(list, key);
+ field.setAutoCompletionList(list);
+ }
+
+ /**
+ * Called by {@link TaggingPreset#createPanel} during tagging preset panel creation.
+ * All components defining this tagging preset item must be added to given panel.
+ * @param p The panel where components must be added
+ * @param sel The related selected OSM primitives
+ * @return {@code true} if this item adds semantic tagging elements, {@code false} otherwise.
+ */
+ abstract boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel);
+
+ /**
+ * Adds the new tags to apply to selected OSM primitives when the preset holding this item is applied.
+ * @param changedTags The list of changed tags to modify if needed
+ */
+ abstract void addCommands(List<Tag> changedTags);
+
+ boolean requestFocusInWindow() {
+ return false;
+ }
+
+ /**
+ * Tests whether the tags match this item.
+ * Note that for a match, at least one positive and no negative is required.
+ * @param tags the tags of an {@link OsmPrimitive}
+ * @return {@code true} if matches (positive), {@code null} if neutral, {@code false} if mismatches (negative).
+ */
+ Boolean matches(Map<String, String> tags) {
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
similarity index 60%
copy from src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
copy to src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
index a38f129..a5aac00 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
@@ -1,1895 +1,1411 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.gui.tagging;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trc;
-import static org.openstreetmap.josm.tools.I18n.trn;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.JToggleButton;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListModel;
-import javax.swing.SwingUtilities;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.search.SearchCompiler;
-import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
-import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.OsmUtils;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.QuadStateCheckBox;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.preferences.SourceEntry;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.JosmComboBox;
-import org.openstreetmap.josm.io.MirroredInputStream;
-import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Predicate;
-import org.openstreetmap.josm.tools.UrlLabel;
-import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.XmlObjectParser;
-import org.openstreetmap.josm.tools.template_engine.ParseError;
-import org.openstreetmap.josm.tools.template_engine.TemplateEntry;
-import org.openstreetmap.josm.tools.template_engine.TemplateParser;
-import org.xml.sax.SAXException;
-
-/**
- * This class read encapsulate one tagging preset. A class method can
- * read in all predefined presets, either shipped with JOSM or that are
- * in the config directory.
- *
- * It is also able to construct dialogs out of preset definitions.
- */
-public class TaggingPreset extends AbstractAction implements MapView.LayerChangeListener {
-
- public enum PresetType {
- NODE(/* ICON */"Mf_node", "node"),
- WAY(/* ICON */"Mf_way", "way"),
- RELATION(/* ICON */"Mf_relation", "relation"),
- CLOSEDWAY(/* ICON */"Mf_closedway", "closedway");
-
- private final String iconName;
- private final String name;
-
- PresetType(String iconName, String name) {
- this.iconName = iconName;
- this.name = name;
- }
-
- public String getIconName() {
- return iconName;
- }
-
- public String getName() {
- return name;
- }
-
- public static PresetType forPrimitive(OsmPrimitive p) {
- return forPrimitiveType(p.getDisplayType());
- }
-
- public static PresetType forPrimitiveType(OsmPrimitiveType type) {
- switch (type) {
- case NODE:
- return NODE;
- case WAY:
- return WAY;
- case CLOSEDWAY:
- return CLOSEDWAY;
- case RELATION:
- case MULTIPOLYGON:
- return RELATION;
- default:
- throw new IllegalArgumentException("Unexpected primitive type: " + type);
- }
- }
-
- public static PresetType fromString(String type) {
- for (PresetType t : PresetType.values()) {
- if (t.getName().equals(type))
- return t;
- }
- return null;
- }
- }
-
- /**
- * Enum denoting how a match (see {@link Item#matches}) is performed.
- */
- private enum MatchType {
-
- /**
- * Neutral, i.e., do not consider this item for matching.
- */
- NONE("none"),
- /**
- * Positive if key matches, neutral otherwise.
- */
- KEY("key"),
- /**
- * Positive if key matches, negative otherwise.
- */
- KEY_REQUIRED("key!"),
- /**
- * Positive if key and value matches, negative otherwise.
- */
- KEY_VALUE("keyvalue");
-
- private final String value;
-
- private MatchType(String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-
- public static MatchType ofString(String type) {
- for (MatchType i : EnumSet.allOf(MatchType.class)) {
- if (i.getValue().equals(type))
- return i;
- }
- throw new IllegalArgumentException(type + " is not allowed");
- }
- }
-
- public static final int DIALOG_ANSWER_APPLY = 1;
- public static final int DIALOG_ANSWER_NEW_RELATION = 2;
- public static final int DIALOG_ANSWER_CANCEL = 3;
-
- public TaggingPresetMenu group = null;
- public String name;
- public String name_context;
- public String locale_name;
- public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
- private static File zipIcons = null;
- private static final BooleanProperty PROP_FILL_DEFAULT = new BooleanProperty("taggingpreset.fill-default-for-tagged-primitives", false);
-
- public static abstract class Item {
-
- protected void initAutoCompletionField(AutoCompletingTextField field, String key) {
- OsmDataLayer layer = Main.main.getEditLayer();
- if (layer == null)
- return;
- AutoCompletionList list = new AutoCompletionList();
- Main.main.getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, key);
- field.setAutoCompletionList(list);
- }
-
- abstract boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel);
-
- abstract void addCommands(List<Tag> changedTags);
-
- boolean requestFocusInWindow() {
- return false;
- }
-
- /**
- * Tests whether the tags match this item.
- * Note that for a match, at least one positive and no negative is required.
- * @param tags the tags of an {@link OsmPrimitive}
- * @return {@code true} if matches (positive), {@code null} if neutral, {@code false} if mismatches (negative).
- */
- Boolean matches(Map<String, String> tags) {
- return null;
- }
- }
-
- public static abstract class KeyedItem extends Item {
-
- public String key;
- public String text;
- public String text_context;
- public String match = getDefaultMatch().getValue();
-
- public abstract MatchType getDefaultMatch();
- public abstract Collection<String> getValues();
-
- @Override
- Boolean matches(Map<String, String> tags) {
- switch (MatchType.ofString(match)) {
- case NONE:
- return null;
- case KEY:
- return tags.containsKey(key) ? true : null;
- case KEY_REQUIRED:
- return tags.containsKey(key);
- case KEY_VALUE:
- return tags.containsKey(key) && (getValues().contains(tags.get(key)));
- default:
- throw new IllegalStateException();
- }
- }
-
- }
-
- public static class Usage {
- TreeSet<String> values;
- boolean hadKeys = false;
- boolean hadEmpty = false;
- public boolean hasUniqueValue() {
- return values.size() == 1 && !hadEmpty;
- }
-
- public boolean unused() {
- return values.isEmpty();
- }
- public String getFirst() {
- return values.first();
- }
-
- public boolean hadKeys() {
- return hadKeys;
- }
- }
-
- public static final String DIFFERENT = tr("<different>");
-
- static Usage determineTextUsage(Collection<OsmPrimitive> sel, String key) {
- Usage returnValue = new Usage();
- returnValue.values = new TreeSet<String>();
- for (OsmPrimitive s : sel) {
- String v = s.get(key);
- if (v != null) {
- returnValue.values.add(v);
- } else {
- returnValue.hadEmpty = true;
- }
- if(s.hasKeys()) {
- returnValue.hadKeys = true;
- }
- }
- return returnValue;
- }
-
- static Usage determineBooleanUsage(Collection<OsmPrimitive> sel, String key) {
-
- Usage returnValue = new Usage();
- returnValue.values = new TreeSet<String>();
- for (OsmPrimitive s : sel) {
- String booleanValue = OsmUtils.getNamedOsmBoolean(s.get(key));
- if (booleanValue != null) {
- returnValue.values.add(booleanValue);
- }
- }
- return returnValue;
- }
-
- public static class PresetListEntry {
- public String value;
- public String value_context;
- public String display_value;
- public String short_description;
- public String icon;
- public String icon_size;
- public String locale_display_value;
- public String locale_short_description;
- private final File zipIcons = TaggingPreset.zipIcons;
-
- // Cached size (currently only for Combo) to speed up preset dialog initialization
- private int prefferedWidth = -1;
- private int prefferedHeight = -1;
-
- public String getListDisplay() {
- if (value.equals(DIFFERENT))
- return "<b>"+DIFFERENT.replaceAll("<", "<").replaceAll(">", ">")+"</b>";
-
- if (value.equals(""))
- return " ";
-
- final StringBuilder res = new StringBuilder("<b>");
- res.append(getDisplayValue(true));
- res.append("</b>");
- if (getShortDescription(true) != null) {
- // wrap in table to restrict the text width
- res.append("<div style=\"width:300px; padding:0 0 5px 5px\">");
- res.append(getShortDescription(true));
- res.append("</div>");
- }
- return res.toString();
- }
-
- public ImageIcon getIcon() {
- return icon == null ? null : loadImageIcon(icon, zipIcons, parseInteger(icon_size));
- }
-
- private Integer parseInteger(String str) {
- if (str == null || "".equals(str))
- return null;
- try {
- return Integer.parseInt(str);
- } catch (Exception e) {
- //
- }
- return null;
- }
-
- public PresetListEntry() {
- }
-
- public PresetListEntry(String value) {
- this.value = value;
- }
-
- public String getDisplayValue(boolean translated) {
- return translated
- ? Utils.firstNonNull(locale_display_value, tr(display_value), trc(value_context, value))
- : Utils.firstNonNull(display_value, value);
- }
-
- public String getShortDescription(boolean translated) {
- return translated
- ? Utils.firstNonNull(locale_short_description, tr(short_description))
- : short_description;
- }
-
- // toString is mainly used to initialize the Editor
- @Override
- public String toString() {
- if (value.equals(DIFFERENT))
- return DIFFERENT;
- return getDisplayValue(true).replaceAll("<.*>", ""); // remove additional markup, e.g. <br>
- }
- }
-
- public static class Text extends KeyedItem {
-
- public String locale_text;
- public String default_;
- public String originalValue;
- public String use_last_as_default = "false";
- public String auto_increment;
- public String length;
-
- private JComponent value;
-
- @Override public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-
- // find out if our key is already used in the selection.
- Usage usage = determineTextUsage(sel, key);
- AutoCompletingTextField textField = new AutoCompletingTextField();
- initAutoCompletionField(textField, key);
- if (length != null && !length.isEmpty()) {
- textField.setMaxChars(new Integer(length));
- }
- if (usage.unused()){
- if (auto_increment_selected != 0 && auto_increment != null) {
- try {
- textField.setText(Integer.toString(Integer.parseInt(lastValue.get(key)) + auto_increment_selected));
- } catch (NumberFormatException ex) {
- // Ignore - cannot auto-increment if last was non-numeric
- }
- }
- else if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
- // selected osm primitives are untagged or filling default values feature is enabled
- if (!"false".equals(use_last_as_default) && lastValue.containsKey(key)) {
- textField.setText(lastValue.get(key));
- } else {
- textField.setText(default_);
- }
- } else {
- // selected osm primitives are tagged and filling default values feature is disabled
- textField.setText("");
- }
- value = textField;
- originalValue = null;
- } else if (usage.hasUniqueValue()) {
- // all objects use the same value
- textField.setText(usage.getFirst());
- value = textField;
- originalValue = usage.getFirst();
- } else {
- // the objects have different values
- JosmComboBox comboBox = new JosmComboBox(usage.values.toArray());
- comboBox.setEditable(true);
- comboBox.setEditor(textField);
- comboBox.getEditor().setItem(DIFFERENT);
- value=comboBox;
- originalValue = DIFFERENT;
- }
- if (locale_text == null) {
- if (text != null) {
- if (text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- }
-
- // if there's an auto_increment setting, then wrap the text field
- // into a panel, appending a number of buttons.
- // auto_increment has a format like -2,-1,1,2
- // the text box being the first component in the panel is relied
- // on in a rather ugly fashion further down.
- if (auto_increment != null) {
- ButtonGroup bg = new ButtonGroup();
- JPanel pnl = new JPanel(new GridBagLayout());
- pnl.add(value, GBC.std().fill(GBC.HORIZONTAL));
-
- // first, one button for each auto_increment value
- for (final String ai : auto_increment.split(",")) {
- JToggleButton aibutton = new JToggleButton(ai);
- aibutton.setToolTipText(tr("Select auto-increment of {0} for this field", ai));
- aibutton.setMargin(new java.awt.Insets(0,0,0,0));
- bg.add(aibutton);
- try {
- // TODO there must be a better way to parse a number like "+3" than this.
- final int buttonvalue = ((Number)NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
- if (auto_increment_selected == buttonvalue) aibutton.setSelected(true);
- aibutton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- auto_increment_selected = buttonvalue;
- }
- });
- pnl.add(aibutton, GBC.std());
- } catch (ParseException x) {
- System.err.println("Cannot parse auto-increment value of '" + ai + "' into an integer");
- }
- }
-
- // an invisible toggle button for "release" of the button group
- final JToggleButton clearbutton = new JToggleButton("X");
- clearbutton.setVisible(false);
- bg.add(clearbutton);
- // and its visible counterpart. - this mechanism allows us to
- // have *no* button selected after the X is clicked, instead
- // of the X remaining selected
- JButton releasebutton = new JButton("X");
- releasebutton.setToolTipText(tr("Cancel auto-increment for this field"));
- releasebutton.setMargin(new java.awt.Insets(0,0,0,0));
- releasebutton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- auto_increment_selected = 0;
- clearbutton.setSelected(true);
- }
- });
- pnl.add(releasebutton, GBC.std().eol());
- value = pnl;
- }
- p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
- p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
- return true;
- }
-
- private static String getValue(Component comp) {
- if (comp instanceof JosmComboBox) {
- return ((JosmComboBox) comp).getEditor().getItem().toString();
- } else if (comp instanceof JTextField) {
- return ((JTextField) comp).getText();
- } else if (comp instanceof JPanel) {
- return getValue(((JPanel)comp).getComponent(0));
- } else {
- return null;
- }
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
-
- // return if unchanged
- String v = getValue(value);
- if (v == null) {
- System.err.println("No 'last value' support for component " + value);
- return;
- }
-
- v = v.trim();
-
- if (!"false".equals(use_last_as_default) || auto_increment != null) {
- lastValue.put(key, v);
- }
- if (v.equals(originalValue) || (originalValue == null && v.length() == 0))
- return;
-
- changedTags.add(new Tag(key, v));
- }
-
- @Override
- boolean requestFocusInWindow() {
- return value.requestFocusInWindow();
- }
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.NONE;
- }
-
- @Override
- public Collection<String> getValues() {
- if (default_ == null || default_.isEmpty())
- return Collections.emptyList();
- return Collections.singleton(default_);
- }
- }
-
- public static class Check extends KeyedItem {
-
- public String locale_text;
- public String value_on = OsmUtils.trueval;
- public String value_off = OsmUtils.falseval;
- public boolean default_ = false; // only used for tagless objects
-
- private QuadStateCheckBox check;
- private QuadStateCheckBox.State initialState;
- private boolean def;
-
- @Override public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-
- // find out if our key is already used in the selection.
- Usage usage = determineBooleanUsage(sel, key);
- def = default_;
-
- if(locale_text == null) {
- if(text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
-
- String oneValue = null;
- for (String s : usage.values) {
- oneValue = s;
- }
- if (usage.values.size() < 2 && (oneValue == null || value_on.equals(oneValue) || value_off.equals(oneValue))) {
- if (def && !PROP_FILL_DEFAULT.get()) {
- // default is set and filling default values feature is disabled - check if all primitives are untagged
- for (OsmPrimitive s : sel)
- if(s.hasKeys()) {
- def = false;
- }
- }
-
- // all selected objects share the same value which is either true or false or unset,
- // we can display a standard check box.
- initialState = value_on.equals(oneValue) ?
- QuadStateCheckBox.State.SELECTED :
- value_off.equals(oneValue) ?
- QuadStateCheckBox.State.NOT_SELECTED :
- def ? QuadStateCheckBox.State.SELECTED
- : QuadStateCheckBox.State.UNSET;
- check = new QuadStateCheckBox(locale_text, initialState,
- new QuadStateCheckBox.State[] {
- QuadStateCheckBox.State.SELECTED,
- QuadStateCheckBox.State.NOT_SELECTED,
- QuadStateCheckBox.State.UNSET });
- } else {
- def = false;
- // the objects have different values, or one or more objects have something
- // else than true/false. we display a quad-state check box
- // in "partial" state.
- initialState = QuadStateCheckBox.State.PARTIAL;
- check = new QuadStateCheckBox(locale_text, QuadStateCheckBox.State.PARTIAL,
- new QuadStateCheckBox.State[] {
- QuadStateCheckBox.State.PARTIAL,
- QuadStateCheckBox.State.SELECTED,
- QuadStateCheckBox.State.NOT_SELECTED,
- QuadStateCheckBox.State.UNSET });
- }
- p.add(check, GBC.eol().fill(GBC.HORIZONTAL));
- return true;
- }
-
- @Override public void addCommands(List<Tag> changedTags) {
- // if the user hasn't changed anything, don't create a command.
- if (check.getState() == initialState && !def) return;
-
- // otherwise change things according to the selected value.
- changedTags.add(new Tag(key,
- check.getState() == QuadStateCheckBox.State.SELECTED ? value_on :
- check.getState() == QuadStateCheckBox.State.NOT_SELECTED ? value_off :
- null));
- }
- @Override boolean requestFocusInWindow() {return check.requestFocusInWindow();}
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.NONE;
- }
-
- @Override
- public Collection<String> getValues() {
- return Arrays.asList(value_on, value_off);
- }
- }
-
- public static abstract class ComboMultiSelect extends KeyedItem {
-
- public String locale_text;
- public String values;
- public String values_context;
- public String display_values;
- public String locale_display_values;
- public String short_descriptions;
- public String locale_short_descriptions;
- public String default_;
- public String delimiter = ";";
- public String use_last_as_default = "false";
-
- protected JComponent component;
- protected Map<String, PresetListEntry> lhm = new LinkedHashMap<String, PresetListEntry>();
- private boolean initialized = false;
- protected Usage usage;
- protected Object originalValue;
-
- protected abstract Object getSelectedItem();
- protected abstract void addToPanelAnchor(JPanel p, String def);
-
- protected char getDelChar() {
- return delimiter.isEmpty() ? ';' : delimiter.charAt(0);
- }
-
- @Override
- public Collection<String> getValues() {
- initListEntries();
- return lhm.keySet();
- }
-
- public Collection<String> getDisplayValues() {
- initListEntries();
- return Utils.transform(lhm.values(), new Utils.Function<PresetListEntry, String>() {
-
- @Override
- public String apply(PresetListEntry x) {
- return x.getDisplayValue(true);
- }
- });
- }
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-
- initListEntries();
-
- // find out if our key is already used in the selection.
- usage = determineTextUsage(sel, key);
- if (!usage.hasUniqueValue() && !usage.unused()) {
- lhm.put(DIFFERENT, new PresetListEntry(DIFFERENT));
- }
-
- p.add(new JLabel(tr("{0}:", locale_text)), GBC.std().insets(0, 0, 10, 0));
- addToPanelAnchor(p, default_);
-
- return true;
-
- }
-
- private void initListEntries() {
- if (initialized) {
- lhm.remove(DIFFERENT); // possibly added in #addToPanel
- return;
- } else if (lhm.isEmpty()) {
- initListEntriesFromAttributes();
- } else {
- if (values != null) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
- + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
- key, text, "values", "list_entry"));
- }
- if (display_values != null || locale_display_values != null) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
- + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
- key, text, "display_values", "list_entry"));
- }
- if (short_descriptions != null || locale_short_descriptions != null) {
- System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
- + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
- key, text, "short_descriptions", "list_entry"));
- }
- for (PresetListEntry e : lhm.values()) {
- if (e.value_context == null) {
- e.value_context = values_context;
- }
- }
- }
- if (locale_text == null) {
- locale_text = trc(text_context, fixPresetString(text));
- }
- initialized = true;
- }
-
- private String[] initListEntriesFromAttributes() {
- char delChar = getDelChar();
-
- String[] value_array = splitEscaped(delChar, values);
-
- final String displ = Utils.firstNonNull(locale_display_values, display_values);
- String[] display_array = displ == null ? value_array : splitEscaped(delChar, displ);
-
- final String descr = Utils.firstNonNull(locale_short_descriptions, short_descriptions);
- String[] short_descriptions_array = descr == null ? null : splitEscaped(delChar, descr);
-
- if (display_array.length != value_array.length) {
- System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' must be the same as in ''values''", key, text));
- display_array = value_array;
- }
-
- if (short_descriptions_array != null && short_descriptions_array.length != value_array.length) {
- System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''short_descriptions'' must be the same as in ''values''", key, text));
- short_descriptions_array = null;
- }
-
- for (int i = 0; i < value_array.length; i++) {
- final PresetListEntry e = new PresetListEntry(value_array[i]);
- e.locale_display_value = locale_display_values != null
- ? display_array[i]
- : trc(values_context, fixPresetString(display_array[i]));
- if (short_descriptions_array != null) {
- e.locale_short_description = locale_short_descriptions != null
- ? short_descriptions_array[i]
- : tr(fixPresetString(short_descriptions_array[i]));
- }
- lhm.put(value_array[i], e);
- display_array[i] = e.getDisplayValue(true);
- }
-
- return display_array;
- }
-
- protected String getDisplayIfNull(String display) {
- return display;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- Object obj = getSelectedItem();
- String display = (obj == null) ? null : obj.toString();
- String value = null;
- if (display == null) {
- display = getDisplayIfNull(display);
- }
-
- if (display != null) {
- for (String key : lhm.keySet()) {
- String k = lhm.get(key).toString();
- if (k != null && k.equals(display)) {
- value = key;
- break;
- }
- }
- if (value == null) {
- value = display;
- }
- } else {
- value = "";
- }
- value = value.trim();
-
- // no change if same as before
- if (originalValue == null) {
- if (value.length() == 0)
- return;
- } else if (value.equals(originalValue.toString()))
- return;
-
- if (!"false".equals(use_last_as_default)) {
- lastValue.put(key, value);
- }
- changedTags.add(new Tag(key, value));
- }
-
- public void addListEntry(PresetListEntry e) {
- lhm.put(e.value, e);
- }
-
- public void addListEntries(Collection<PresetListEntry> e) {
- for (PresetListEntry i : e) {
- addListEntry(i);
- }
- }
-
- @Override
- boolean requestFocusInWindow() {
- return component.requestFocusInWindow();
- }
-
- private static ListCellRenderer RENDERER = new ListCellRenderer() {
-
- JLabel lbl = new JLabel();
-
- public Component getListCellRendererComponent(
- JList list,
- Object value,
- int index,
- boolean isSelected,
- boolean cellHasFocus) {
- PresetListEntry item = (PresetListEntry) value;
-
- // Only return cached size, item is not shown
- if (!list.isShowing() && item.prefferedWidth != -1 && item.prefferedHeight != -1) {
- if (index == -1) {
- lbl.setPreferredSize(new Dimension(item.prefferedWidth, 10));
- } else {
- lbl.setPreferredSize(new Dimension(item.prefferedWidth, item.prefferedHeight));
- }
- return lbl;
- }
-
- lbl.setPreferredSize(null);
-
-
- if (isSelected) {
- lbl.setBackground(list.getSelectionBackground());
- lbl.setForeground(list.getSelectionForeground());
- } else {
- lbl.setBackground(list.getBackground());
- lbl.setForeground(list.getForeground());
- }
-
- lbl.setOpaque(true);
- lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
- lbl.setText("<html>" + item.getListDisplay() + "</html>");
- lbl.setIcon(item.getIcon());
- lbl.setEnabled(list.isEnabled());
-
- // Cache size
- item.prefferedWidth = lbl.getPreferredSize().width;
- item.prefferedHeight = lbl.getPreferredSize().height;
-
- // We do not want the editor to have the maximum height of all
- // entries. Return a dummy with bogus height.
- if (index == -1) {
- lbl.setPreferredSize(new Dimension(lbl.getPreferredSize().width, 10));
- }
- return lbl;
- }
- };
-
-
- protected ListCellRenderer getListCellRenderer() {
- return RENDERER;
- }
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.NONE;
- }
- }
-
- public static class Combo extends ComboMultiSelect {
-
- public boolean editable = true;
- protected JosmComboBox combo;
-
- public Combo() {
- delimiter = ",";
- }
-
- @Override
- protected void addToPanelAnchor(JPanel p, String def) {
- if (!usage.unused()) {
- for (String s : usage.values) {
- if (!lhm.containsKey(s)) {
- lhm.put(s, new PresetListEntry(s));
- }
- }
- }
- if (def != null && !lhm.containsKey(def)) {
- lhm.put(def, new PresetListEntry(def));
- }
- lhm.put("", new PresetListEntry(""));
-
- combo = new JosmComboBox(lhm.values().toArray());
- component = combo;
- combo.setRenderer(getListCellRenderer());
- combo.setEditable(editable);
- combo.reinitialize(lhm.values());
- AutoCompletingTextField tf = new AutoCompletingTextField();
- initAutoCompletionField(tf, key);
- AutoCompletionList acList = tf.getAutoCompletionList();
- if (acList != null) {
- acList.add(getDisplayValues(), AutoCompletionItemPritority.IS_IN_STANDARD);
- }
- combo.setEditor(tf);
-
- if (usage.hasUniqueValue()) {
- // all items have the same value (and there were no unset items)
- originalValue = lhm.get(usage.getFirst());
- combo.setSelectedItem(originalValue);
- } else if (def != null && usage.unused()) {
- // default is set and all items were unset
- if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
- // selected osm primitives are untagged or filling default feature is enabled
- combo.setSelectedItem(lhm.get(def).getDisplayValue(true));
- } else {
- // selected osm primitives are tagged and filling default feature is disabled
- combo.setSelectedItem("");
- }
- originalValue = lhm.get(DIFFERENT);
- } else if (usage.unused()) {
- // all items were unset (and so is default)
- originalValue = lhm.get("");
- if ("force".equals(use_last_as_default) && lastValue.containsKey(key)) {
- combo.setSelectedItem(lhm.get(lastValue.get(key)));
- } else {
- combo.setSelectedItem(originalValue);
- }
- } else {
- originalValue = lhm.get(DIFFERENT);
- combo.setSelectedItem(originalValue);
- }
- p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
-
- }
-
- @Override
- protected Object getSelectedItem() {
- return combo.getSelectedItem();
-
- }
-
- @Override
- protected String getDisplayIfNull(String display) {
- if (combo.isEditable())
- return combo.getEditor().getItem().toString();
- else
- return display;
-
- }
- }
-
- /**
- * Class that allows list values to be assigned and retrieved as a comma-delimited
- * string.
- */
- public static class ConcatenatingJList extends JList {
- private String delimiter;
- public ConcatenatingJList(String del, Object[] o) {
- super(o);
- delimiter = del;
- }
- public void setSelectedItem(Object o) {
- if (o == null) {
- clearSelection();
- } else {
- String s = o.toString();
- HashSet<String> parts = new HashSet<String>(Arrays.asList(s.split(delimiter)));
- ListModel lm = getModel();
- int[] intParts = new int[lm.getSize()];
- int j = 0;
- for (int i = 0; i < lm.getSize(); i++) {
- if (parts.contains((((PresetListEntry)lm.getElementAt(i)).value))) {
- intParts[j++]=i;
- }
- }
- setSelectedIndices(Arrays.copyOf(intParts, j));
- // check if we have actually managed to represent the full
- // value with our presets. if not, cop out; we will not offer
- // a selection list that threatens to ruin the value.
- setEnabled(s.equals(getSelectedItem()));
- }
- }
- public String getSelectedItem() {
- ListModel lm = getModel();
- int[] si = getSelectedIndices();
- StringBuilder builder = new StringBuilder();
- for (int i=0; i<si.length; i++) {
- if (i>0) {
- builder.append(delimiter);
- }
- builder.append(((PresetListEntry)lm.getElementAt(si[i])).value);
- }
- return builder.toString();
- }
- }
-
- public static class MultiSelect extends ComboMultiSelect {
-
- public long rows = -1;
- protected ConcatenatingJList list;
-
- @Override
- protected void addToPanelAnchor(JPanel p, String def) {
- list = new ConcatenatingJList(delimiter, lhm.values().toArray());
- component = list;
- ListCellRenderer renderer = getListCellRenderer();
- list.setCellRenderer(renderer);
-
- if (usage.hasUniqueValue() && !usage.unused()) {
- originalValue = usage.getFirst();
- list.setSelectedItem(originalValue);
- } else if (def != null && !usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
- originalValue = DIFFERENT;
- list.setSelectedItem(def);
- } else if (usage.unused()) {
- originalValue = null;
- list.setSelectedItem(originalValue);
- } else {
- originalValue = DIFFERENT;
- list.setSelectedItem(originalValue);
- }
-
- JScrollPane sp = new JScrollPane(list);
- // if a number of rows has been specified in the preset,
- // modify preferred height of scroll pane to match that row count.
- if (rows != -1) {
- double height = renderer.getListCellRendererComponent(list,
- new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows;
- sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height));
- }
- p.add(sp, GBC.eol().fill(GBC.HORIZONTAL));
-
-
- }
-
- @Override
- protected Object getSelectedItem() {
- return list.getSelectedItem();
- }
- }
-
- /**
- * allow escaped comma in comma separated list:
- * "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
- * @param delimiter the delimiter, e.g. a comma. separates the entries and
- * must be escaped within one entry
- * @param s the string
- */
- private static String[] splitEscaped(char delimiter, String s) {
- if (s == null)
- return new String[0];
- List<String> result = new ArrayList<String>();
- boolean backslash = false;
- StringBuilder item = new StringBuilder();
- for (int i=0; i<s.length(); i++) {
- char ch = s.charAt(i);
- if (backslash) {
- item.append(ch);
- backslash = false;
- } else if (ch == '\\') {
- backslash = true;
- } else if (ch == delimiter) {
- result.add(item.toString());
- item.setLength(0);
- } else {
- item.append(ch);
- }
- }
- if (item.length() > 0) {
- result.add(item.toString());
- }
- return result.toArray(new String[result.size()]);
- }
-
- public static class Label extends Item {
-
- public String text;
- public String text_context;
- public String locale_text;
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- if (locale_text == null) {
- if (text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- p.add(new JLabel(locale_text), GBC.eol());
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Link extends Item {
-
- public String href;
- public String text;
- public String text_context;
- public String locale_text;
- public String locale_href;
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- if (locale_text == null) {
- if (text == null) {
- locale_text = tr("More information about this feature");
- } else if (text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- String url = locale_href;
- if (url == null) {
- url = href;
- }
- if (url != null) {
- p.add(new UrlLabel(url, locale_text, 2), GBC.eol().anchor(GBC.WEST));
- }
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Role {
- public EnumSet<PresetType> types;
- public String key;
- public String text;
- public String text_context;
- public String locale_text;
- public Match memberExpression;
-
- public boolean required = false;
- public long count = 0;
-
- public void setType(String types) throws SAXException {
- this.types = TaggingPreset.getType(types);
- }
-
- public void setRequisite(String str) throws SAXException {
- if("required".equals(str)) {
- required = true;
- } else if(!"optional".equals(str))
- throw new SAXException(tr("Unknown requisite: {0}", str));
- }
-
- public void setMember_expression(String member_expression) throws SAXException {
- try {
- this.memberExpression = SearchCompiler.compile(member_expression, true, true);
- } catch (SearchCompiler.ParseError ex) {
- throw new SAXException(tr("Illegal member expression: {0}", ex.getMessage()), ex);
- }
- }
-
- /* return either argument, the highest possible value or the lowest
- allowed value */
- public long getValidCount(long c)
- {
- if(count > 0 && !required)
- return c != 0 ? count : 0;
- else if(count > 0)
- return count;
- else if(!required)
- return c != 0 ? c : 0;
- else
- return c != 0 ? c : 1;
- }
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- String cstring;
- if(count > 0 && !required) {
- cstring = "0,"+String.valueOf(count);
- } else if(count > 0) {
- cstring = String.valueOf(count);
- } else if(!required) {
- cstring = "0-...";
- } else {
- cstring = "1-...";
- }
- if(locale_text == null) {
- if (text != null) {
- if(text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
- }
- }
- }
- p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
- p.add(new JLabel(key), GBC.std().insets(0,0,10,0));
- p.add(new JLabel(cstring), types == null ? GBC.eol() : GBC.std().insets(0,0,10,0));
- if(types != null){
- JPanel pp = new JPanel();
- for(PresetType t : types) {
- pp.add(new JLabel(ImageProvider.get(t.getIconName())));
- }
- p.add(pp, GBC.eol());
- }
- return true;
- }
- }
-
- public static class Roles extends Item {
-
- public final List<Role> roles = new LinkedList<Role>();
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- p.add(new JLabel(" "), GBC.eol()); // space
- if (roles.size() > 0) {
- JPanel proles = new JPanel(new GridBagLayout());
- proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0, 0, 10, 0));
- proles.add(new JLabel(tr("role")), GBC.std().insets(0, 0, 10, 0));
- proles.add(new JLabel(tr("count")), GBC.std().insets(0, 0, 10, 0));
- proles.add(new JLabel(tr("elements")), GBC.eol());
- for (Role i : roles) {
- i.addToPanel(proles, sel);
- }
- p.add(proles, GBC.eol());
- }
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Optional extends Item {
-
- // TODO: Draw a box around optional stuff
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- p.add(new JLabel(" "), GBC.eol()); // space
- p.add(new JLabel(tr("Optional Attributes:")), GBC.eol());
- p.add(new JLabel(" "), GBC.eol()); // space
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Space extends Item {
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- p.add(new JLabel(" "), GBC.eol()); // space
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- }
- }
-
- public static class Key extends KeyedItem {
-
- public String value;
-
- @Override
- public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
- return false;
- }
-
- @Override
- public void addCommands(List<Tag> changedTags) {
- changedTags.add(new Tag(key, value));
- }
-
- @Override
- public MatchType getDefaultMatch() {
- return MatchType.KEY_VALUE;
- }
-
- @Override
- public Collection<String> getValues() {
- return Collections.singleton(value);
- }
- }
-
- /**
- * The types as preparsed collection.
- */
- public EnumSet<PresetType> types;
- public List<Item> data = new LinkedList<Item>();
- public Roles roles;
- public TemplateEntry nameTemplate;
- public Match nameTemplateFilter;
- private static final HashMap<String,String> lastValue = new HashMap<String,String>();
- private static int auto_increment_selected = 0;
-
- /**
- * Create an empty tagging preset. This will not have any items and
- * will be an empty string as text. createPanel will return null.
- * Use this as default item for "do not select anything".
- */
- public TaggingPreset() {
- MapView.addLayerChangeListener(this);
- updateEnabledState();
- }
-
- /**
- * Change the display name without changing the toolbar value.
- */
- public void setDisplayName() {
- putValue(Action.NAME, getName());
- putValue("toolbar", "tagging_" + getRawName());
- putValue(OPTIONAL_TOOLTIP_TEXT, (group != null ?
- tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
- tr("Use preset ''{0}''", getLocaleName())));
- }
-
- public String getLocaleName() {
- if(locale_name == null) {
- if(name_context != null) {
- locale_name = trc(name_context, fixPresetString(name));
- } else {
- locale_name = tr(fixPresetString(name));
- }
- }
- return locale_name;
- }
-
- public String getName() {
- return group != null ? group.getName() + "/" + getLocaleName() : getLocaleName();
- }
- public String getRawName() {
- return group != null ? group.getRawName() + "/" + name : name;
- }
-
- protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
- final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
- ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
- if (maxSize != null) {
- imgProv.setMaxSize(maxSize);
- }
- return imgProv.get();
- }
-
- /*
- * Called from the XML parser to set the icon.
- * This task is performed in the background in order to speedup startup.
- *
- * FIXME for Java 1.6 - use 24x24 icons for LARGE_ICON_KEY (button bar)
- * and the 16x16 icons for SMALL_ICON.
- */
- public void setIcon(final String iconName) {
- ImageProvider imgProv = new ImageProvider(iconName);
- final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
- imgProv.setDirs(s);
- imgProv.setId("presets");
- imgProv.setArchive(TaggingPreset.zipIcons);
- imgProv.setOptional(true);
- imgProv.setMaxWidth(16).setMaxHeight(16);
- imgProv.getInBackground(new ImageProvider.ImageCallback() {
- @Override
- public void finished(final ImageIcon result) {
- if (result != null) {
- GuiHelper.runInEDT(new Runnable() {
- @Override
- public void run() {
- putValue(Action.SMALL_ICON, result);
- }
- });
- } else {
- System.out.println("Could not get presets icon " + iconName);
- }
- }
- });
- }
-
- // cache the parsing of types using a LRU cache (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
- private static final Map<String,EnumSet<PresetType>> typeCache =
- new LinkedHashMap<String, EnumSet<PresetType>>(16, 1.1f, true);
-
- static public EnumSet<PresetType> getType(String types) throws SAXException {
- if (typeCache.containsKey(types))
- return typeCache.get(types);
- EnumSet<PresetType> result = EnumSet.noneOf(PresetType.class);
- for (String type : Arrays.asList(types.split(","))) {
- try {
- PresetType presetType = PresetType.fromString(type);
- result.add(presetType);
- } catch (IllegalArgumentException e) {
- throw new SAXException(tr("Unknown type: {0}", type));
- }
- }
- typeCache.put(types, result);
- return result;
- }
-
- /*
- * Called from the XML parser to set the types this preset affects.
- */
- public void setType(String types) throws SAXException {
- this.types = getType(types);
- }
-
- public void setName_template(String pattern) throws SAXException {
- try {
- this.nameTemplate = new TemplateParser(pattern).parse();
- } catch (ParseError e) {
- System.err.println("Error while parsing " + pattern + ": " + e.getMessage());
- throw new SAXException(e);
- }
- }
-
- public void setName_template_filter(String filter) throws SAXException {
- try {
- this.nameTemplateFilter = SearchCompiler.compile(filter, false, false);
- } catch (org.openstreetmap.josm.actions.search.SearchCompiler.ParseError e) {
- System.err.println("Error while parsing" + filter + ": " + e.getMessage());
- throw new SAXException(e);
- }
- }
-
-
- public static List<TaggingPreset> readAll(Reader in, boolean validate) throws SAXException {
- XmlObjectParser parser = new XmlObjectParser();
- parser.mapOnStart("item", TaggingPreset.class);
- parser.mapOnStart("separator", TaggingPresetSeparator.class);
- parser.mapBoth("group", TaggingPresetMenu.class);
- parser.map("text", Text.class);
- parser.map("link", Link.class);
- parser.mapOnStart("optional", Optional.class);
- parser.mapOnStart("roles", Roles.class);
- parser.map("role", Role.class);
- parser.map("check", Check.class);
- parser.map("combo", Combo.class);
- parser.map("multiselect", MultiSelect.class);
- parser.map("label", Label.class);
- parser.map("space", Space.class);
- parser.map("key", Key.class);
- parser.map("list_entry", PresetListEntry.class);
- LinkedList<TaggingPreset> all = new LinkedList<TaggingPreset>();
- TaggingPresetMenu lastmenu = null;
- Roles lastrole = null;
- List<PresetListEntry> listEntries = new LinkedList<PresetListEntry>();
-
- if (validate) {
- parser.startWithValidation(in, "http://josm.openstreetmap.de/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
- } else {
- parser.start(in);
- }
- while(parser.hasNext()) {
- Object o = parser.next();
- if (o instanceof TaggingPresetMenu) {
- TaggingPresetMenu tp = (TaggingPresetMenu) o;
- if(tp == lastmenu) {
- lastmenu = tp.group;
- } else
- {
- tp.group = lastmenu;
- tp.setDisplayName();
- lastmenu = tp;
- all.add(tp);
-
- }
- lastrole = null;
- } else if (o instanceof TaggingPresetSeparator) {
- TaggingPresetSeparator tp = (TaggingPresetSeparator) o;
- tp.group = lastmenu;
- all.add(tp);
- lastrole = null;
- } else if (o instanceof TaggingPreset) {
- TaggingPreset tp = (TaggingPreset) o;
- tp.group = lastmenu;
- tp.setDisplayName();
- all.add(tp);
- lastrole = null;
- } else {
- if (all.size() != 0) {
- if (o instanceof Roles) {
- all.getLast().data.add((Item) o);
- if (all.getLast().roles != null) {
- throw new SAXException(tr("Roles cannot appear more than once"));
- }
- all.getLast().roles = (Roles) o;
- lastrole = (Roles) o;
- } else if (o instanceof Role) {
- if (lastrole == null)
- throw new SAXException(tr("Preset role element without parent"));
- lastrole.roles.add((Role) o);
- } else if (o instanceof PresetListEntry) {
- listEntries.add((PresetListEntry) o);
- } else {
- all.getLast().data.add((Item) o);
- if (o instanceof ComboMultiSelect) {
- ((ComboMultiSelect) o).addListEntries(listEntries);
- }
- listEntries = new LinkedList<PresetListEntry>();
- lastrole = null;
- }
- } else
- throw new SAXException(tr("Preset sub element without parent"));
- }
- }
- return all;
- }
-
- public static Collection<TaggingPreset> readAll(String source, boolean validate) throws SAXException, IOException {
- Collection<TaggingPreset> tp;
- MirroredInputStream s = new MirroredInputStream(source);
- try {
- InputStream zip = s.getZipEntry("xml","preset");
- if(zip != null) {
- zipIcons = s.getFile();
- }
- InputStreamReader r;
- try {
- r = new InputStreamReader(zip == null ? s : zip, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- r = new InputStreamReader(zip == null ? s: zip);
- }
- try {
- tp = TaggingPreset.readAll(new BufferedReader(r), validate);
- } finally {
- r.close();
- }
- } finally {
- s.close();
- }
- return tp;
- }
-
- public static Collection<TaggingPreset> readAll(Collection<String> sources, boolean validate) {
- LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
- for(String source : sources) {
- try {
- allPresets.addAll(TaggingPreset.readAll(source, validate));
- } catch (IOException e) {
- System.err.println(e.getClass().getName()+": "+e.getMessage());
- System.err.println(source);
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Could not read tagging preset source: {0}",source),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- } catch (SAXException e) {
- System.err.println(e.getClass().getName()+": "+e.getMessage());
- System.err.println(source);
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Error parsing {0}: ", source)+e.getMessage(),
- tr("Error"),
- JOptionPane.ERROR_MESSAGE
- );
- }
- }
- return allPresets;
- }
-
- public static LinkedList<String> getPresetSources() {
- LinkedList<String> sources = new LinkedList<String>();
-
- for (SourceEntry e : (new PresetPrefHelper()).get()) {
- sources.add(e.url);
- }
-
- return sources;
- }
-
- public static Collection<TaggingPreset> readFromPreferences(boolean validate) {
- return readAll(getPresetSources(), validate);
- }
-
- private static class PresetPanel extends JPanel {
- boolean hasElements = false;
- PresetPanel()
- {
- super(new GridBagLayout());
- }
- }
-
- public PresetPanel createPanel(Collection<OsmPrimitive> selected) {
- if (data == null)
- return null;
- PresetPanel p = new PresetPanel();
- LinkedList<Item> l = new LinkedList<Item>();
- if(types != null){
- JPanel pp = new JPanel();
- for(PresetType t : types){
- JLabel la = new JLabel(ImageProvider.get(t.getIconName()));
- la.setToolTipText(tr("Elements of type {0} are supported.", tr(t.getName())));
- pp.add(la);
- }
- p.add(pp, GBC.eol());
- }
-
- JPanel items = new JPanel(new GridBagLayout());
- for (Item i : data){
- if(i instanceof Link) {
- l.add(i);
- } else {
- if(i.addToPanel(items, selected)) {
- p.hasElements = true;
- }
- }
- }
- p.add(items, GBC.eol().fill());
- if (selected.size() == 0 && !supportsRelation()) {
- GuiHelper.setEnabledRec(items, false);
- }
-
- for(Item link : l) {
- link.addToPanel(p, selected);
- }
-
- return p;
- }
-
- public boolean isShowable()
- {
- for(Item i : data)
- {
- if(!(i instanceof Optional || i instanceof Space || i instanceof Key))
- return true;
- }
- return false;
- }
-
- public String suggestRoleForOsmPrimitive(OsmPrimitive osm) {
- if (roles != null && osm != null) {
- for (Role i : roles.roles) {
- if (i.memberExpression != null && i.memberExpression.match(osm)
- && (i.types == null || i.types.isEmpty() || i.types.contains(PresetType.forPrimitive(osm)) )) {
- return i.key;
- }
- }
- }
- return null;
- }
-
- public void actionPerformed(ActionEvent e) {
- if (Main.main == null) return;
- if (Main.main.getCurrentDataSet() == null) return;
-
- Collection<OsmPrimitive> sel = createSelection(Main.main.getCurrentDataSet().getSelected());
- int answer = showDialog(sel, supportsRelation());
-
- if (sel.size() != 0 && answer == DIALOG_ANSWER_APPLY) {
- Command cmd = createCommand(sel, getChangedTags());
- if (cmd != null) {
- Main.main.undoRedo.add(cmd);
- }
- } else if (answer == DIALOG_ANSWER_NEW_RELATION) {
- final Relation r = new Relation();
- final Collection<RelationMember> members = new HashSet<RelationMember>();
- for(Tag t : getChangedTags()) {
- r.put(t.getKey(), t.getValue());
- }
- for (OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) {
- String role = suggestRoleForOsmPrimitive(osm);
- RelationMember rm = new RelationMember(role == null ? "" : role, osm);
- r.addMember(rm);
- members.add(rm);
- }
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- RelationEditor.getEditor(Main.main.getEditLayer(), r, members).setVisible(true);
- }
- });
- }
- Main.main.getCurrentDataSet().setSelected(Main.main.getCurrentDataSet().getSelected()); // force update
-
- }
-
- public int showDialog(Collection<OsmPrimitive> sel, final boolean showNewRelation) {
- PresetPanel p = createPanel(sel);
- if (p == null)
- return DIALOG_ANSWER_CANCEL;
-
- int answer = 1;
- if (p.getComponentCount() != 0 && (sel.size() == 0 || p.hasElements)) {
- String title = trn("Change {0} object", "Change {0} objects", sel.size(), sel.size());
- if(sel.size() == 0) {
- if(originalSelectionEmpty) {
- title = tr("Nothing selected!");
- } else {
- title = tr("Selection unsuitable!");
- }
- }
-
- class PresetDialog extends ExtendedDialog {
- public PresetDialog(Component content, String title, boolean disableApply) {
- super(Main.parent,
- title,
- showNewRelation?
- new String[] { tr("Apply Preset"), tr("New relation"), tr("Cancel") }:
- new String[] { tr("Apply Preset"), tr("Cancel") },
- true);
- contentInsets = new Insets(10,5,0,5);
- if (showNewRelation) {
- setButtonIcons(new String[] {"ok.png", "dialogs/addrelation.png", "cancel.png" });
- } else {
- setButtonIcons(new String[] {"ok.png", "cancel.png" });
- }
- setContent(content);
- setDefaultButton(1);
- setupDialog();
- buttons.get(0).setEnabled(!disableApply);
- buttons.get(0).setToolTipText(title);
- // Prevent dialogs of being too narrow (fix #6261)
- Dimension d = getSize();
- if (d.width < 350) {
- d.width = 350;
- setSize(d);
- }
- showDialog();
- }
- }
-
- answer = new PresetDialog(p, title, (sel.size() == 0)).getValue();
- }
- if (!showNewRelation && answer == 2)
- return DIALOG_ANSWER_CANCEL;
- else
- return answer;
- }
-
- /**
- * True whenever the original selection given into createSelection was empty
- */
- private boolean originalSelectionEmpty = false;
-
- /**
- * Removes all unsuitable OsmPrimitives from the given list
- * @param participants List of possible OsmPrimitives to tag
- * @return Cleaned list with suitable OsmPrimitives only
- */
- public Collection<OsmPrimitive> createSelection(Collection<OsmPrimitive> participants) {
- originalSelectionEmpty = participants.size() == 0;
- Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
- for (OsmPrimitive osm : participants)
- {
- if (types != null)
- {
- if(osm instanceof Relation)
- {
- if(!types.contains(PresetType.RELATION) &&
- !(types.contains(PresetType.CLOSEDWAY) && ((Relation)osm).isMultipolygon())) {
- continue;
- }
- }
- else if(osm instanceof Node)
- {
- if(!types.contains(PresetType.NODE)) {
- continue;
- }
- }
- else if(osm instanceof Way)
- {
- if(!types.contains(PresetType.WAY) &&
- !(types.contains(PresetType.CLOSEDWAY) && ((Way)osm).isClosed())) {
- continue;
- }
- }
- }
- sel.add(osm);
- }
- return sel;
- }
-
- public List<Tag> getChangedTags() {
- List<Tag> result = new ArrayList<Tag>();
- for (Item i: data) {
- i.addCommands(result);
- }
- return result;
- }
-
- private static String fixPresetString(String s) {
- return s == null ? s : s.replaceAll("'","''");
- }
-
- public static Command createCommand(Collection<OsmPrimitive> sel, List<Tag> changedTags) {
- List<Command> cmds = new ArrayList<Command>();
- for (Tag tag: changedTags) {
- cmds.add(new ChangePropertyCommand(sel, tag.getKey(), tag.getValue()));
- }
-
- if (cmds.size() == 0)
- return null;
- else if (cmds.size() == 1)
- return cmds.get(0);
- else
- return new SequenceCommand(tr("Change Properties"), cmds);
- }
-
- private boolean supportsRelation() {
- return types == null || types.contains(PresetType.RELATION);
- }
-
- protected void updateEnabledState() {
- setEnabled(Main.main != null && Main.main.getCurrentDataSet() != null);
- }
-
- public void activeLayerChange(Layer oldLayer, Layer newLayer) {
- updateEnabledState();
- }
-
- public void layerAdded(Layer newLayer) {
- updateEnabledState();
- }
-
- public void layerRemoved(Layer oldLayer) {
- updateEnabledState();
- }
-
- @Override
- public String toString() {
- return (types == null?"":types) + " " + name;
- }
-
- public boolean typeMatches(Collection<PresetType> t) {
- return t == null || types == null || types.containsAll(t);
- }
-
- public boolean matches(Collection<PresetType> t, Map<String, String> tags, boolean onlyShowable) {
- if (onlyShowable && !isShowable())
- return false;
- else if (!typeMatches(t))
- return false;
- boolean atLeastOnePositiveMatch = false;
- for (Item item : data) {
- Boolean m = item.matches(tags);
- if (m != null && !m)
- return false;
- else if (m != null) {
- atLeastOnePositiveMatch = true;
- }
- }
- return atLeastOnePositiveMatch;
- }
-
- public static Collection<TaggingPreset> getMatchingPresets(final Collection<PresetType> t, final Map<String, String> tags, final boolean onlyShowable) {
- return Utils.filter(TaggingPresetPreference.taggingPresets, new Predicate<TaggingPreset>() {
- @Override
- public boolean evaluate(TaggingPreset object) {
- return object.matches(t, tags, onlyShowable);
- }
- });
- }
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JToggleButton;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListModel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import org.openstreetmap.josm.gui.widgets.QuadStateCheckBox;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
+import org.xml.sax.SAXException;
+
+/**
+ * Class that contains all subtypes of TaggingPresetItem, static supplementary data, types and methods
+ * @since 6068
+ */
+public final class TaggingPresetItems {
+ private TaggingPresetItems() { }
+
+ private static int auto_increment_selected = 0;
+ public static final String DIFFERENT = tr("<different>");
+
+ private static final BooleanProperty PROP_FILL_DEFAULT = new BooleanProperty("taggingpreset.fill-default-for-tagged-primitives", false);
+
+ // cache the parsing of types using a LRU cache (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
+ private static final Map<String,EnumSet<TaggingPresetType>> typeCache =
+ new LinkedHashMap<String, EnumSet<TaggingPresetType>>(16, 1.1f, true);
+
+ /**
+ * Last value of each key used in presets, used for prefilling corresponding fields
+ */
+ private static final Map<String,String> lastValue = new HashMap<String,String>();
+
+ public static class PresetListEntry {
+ public String value;
+ public String value_context;
+ public String display_value;
+ public String short_description;
+ public String icon;
+ public String icon_size;
+ public String locale_display_value;
+ public String locale_short_description;
+ private final File zipIcons = TaggingPresetReader.getZipIcons();
+
+ // Cached size (currently only for Combo) to speed up preset dialog initialization
+ private int prefferedWidth = -1;
+ private int prefferedHeight = -1;
+
+ public String getListDisplay() {
+ if (value.equals(DIFFERENT))
+ return "<b>"+DIFFERENT.replaceAll("<", "<").replaceAll(">", ">")+"</b>";
+
+ if (value.isEmpty())
+ return " ";
+
+ final StringBuilder res = new StringBuilder("<b>");
+ res.append(getDisplayValue(true));
+ res.append("</b>");
+ if (getShortDescription(true) != null) {
+ // wrap in table to restrict the text width
+ res.append("<div style=\"width:300px; padding:0 0 5px 5px\">");
+ res.append(getShortDescription(true));
+ res.append("</div>");
+ }
+ return res.toString();
+ }
+
+ public ImageIcon getIcon() {
+ return icon == null ? null : loadImageIcon(icon, zipIcons, parseInteger(icon_size));
+ }
+
+ private Integer parseInteger(String str) {
+ if (str == null || str.isEmpty())
+ return null;
+ try {
+ return Integer.parseInt(str);
+ } catch (Exception e) {
+ //
+ }
+ return null;
+ }
+
+ public PresetListEntry() {
+ }
+
+ public PresetListEntry(String value) {
+ this.value = value;
+ }
+
+ public String getDisplayValue(boolean translated) {
+ return translated
+ ? Utils.firstNonNull(locale_display_value, tr(display_value), trc(value_context, value))
+ : Utils.firstNonNull(display_value, value);
+ }
+
+ public String getShortDescription(boolean translated) {
+ return translated
+ ? Utils.firstNonNull(locale_short_description, tr(short_description))
+ : short_description;
+ }
+
+ // toString is mainly used to initialize the Editor
+ @Override
+ public String toString() {
+ if (value.equals(DIFFERENT))
+ return DIFFERENT;
+ return getDisplayValue(true).replaceAll("<.*>", ""); // remove additional markup, e.g. <br>
+ }
+ }
+
+ public static class Role {
+ public EnumSet<TaggingPresetType> types;
+ public String key;
+ public String text;
+ public String text_context;
+ public String locale_text;
+ public SearchCompiler.Match memberExpression;
+
+ public boolean required = false;
+ public long count = 0;
+
+ public void setType(String types) throws SAXException {
+ this.types = getType(types);
+ }
+
+ public void setRequisite(String str) throws SAXException {
+ if("required".equals(str)) {
+ required = true;
+ } else if(!"optional".equals(str))
+ throw new SAXException(tr("Unknown requisite: {0}", str));
+ }
+
+ public void setMember_expression(String member_expression) throws SAXException {
+ try {
+ this.memberExpression = SearchCompiler.compile(member_expression, true, true);
+ } catch (SearchCompiler.ParseError ex) {
+ throw new SAXException(tr("Illegal member expression: {0}", ex.getMessage()), ex);
+ }
+ }
+
+ /* return either argument, the highest possible value or the lowest
+ allowed value */
+ public long getValidCount(long c)
+ {
+ if(count > 0 && !required)
+ return c != 0 ? count : 0;
+ else if(count > 0)
+ return count;
+ else if(!required)
+ return c != 0 ? c : 0;
+ else
+ return c != 0 ? c : 1;
+ }
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ String cstring;
+ if(count > 0 && !required) {
+ cstring = "0,"+count;
+ } else if(count > 0) {
+ cstring = String.valueOf(count);
+ } else if(!required) {
+ cstring = "0-...";
+ } else {
+ cstring = "1-...";
+ }
+ if(locale_text == null) {
+ if (text != null) {
+ if(text_context != null) {
+ locale_text = trc(text_context, fixPresetString(text));
+ } else {
+ locale_text = tr(fixPresetString(text));
+ }
+ }
+ }
+ p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
+ p.add(new JLabel(key), GBC.std().insets(0,0,10,0));
+ p.add(new JLabel(cstring), types == null ? GBC.eol() : GBC.std().insets(0,0,10,0));
+ if(types != null){
+ JPanel pp = new JPanel();
+ for(TaggingPresetType t : types) {
+ pp.add(new JLabel(ImageProvider.get(t.getIconName())));
+ }
+ p.add(pp, GBC.eol());
+ }
+ return true;
+ }
+ }
+
+ /**
+ * Enum denoting how a match (see {@link Item#matches}) is performed.
+ */
+ public static enum MatchType {
+
+ /**
+ * Neutral, i.e., do not consider this item for matching.
+ */
+ NONE("none"),
+ /**
+ * Positive if key matches, neutral otherwise.
+ */
+ KEY("key"),
+ /**
+ * Positive if key matches, negative otherwise.
+ */
+ KEY_REQUIRED("key!"),
+ /**
+ * Positive if key and value matches, negative otherwise.
+ */
+ KEY_VALUE("keyvalue");
+
+ private final String value;
+
+ private MatchType(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public static MatchType ofString(String type) {
+ for (MatchType i : EnumSet.allOf(MatchType.class)) {
+ if (i.getValue().equals(type))
+ return i;
+ }
+ throw new IllegalArgumentException(type + " is not allowed");
+ }
+ }
+
+ public static class Usage {
+ TreeSet<String> values;
+ boolean hadKeys = false;
+ boolean hadEmpty = false;
+ public boolean hasUniqueValue() {
+ return values.size() == 1 && !hadEmpty;
+ }
+
+ public boolean unused() {
+ return values.isEmpty();
+ }
+ public String getFirst() {
+ return values.first();
+ }
+
+ public boolean hadKeys() {
+ return hadKeys;
+ }
+ }
+
+ /**
+ * A tagging preset item displaying a localizable text.
+ * @since 6190
+ */
+ public static abstract class TaggingPresetTextItem extends TaggingPresetItem {
+
+ /**
+ * The text to display
+ */
+ public String text;
+
+ /**
+ * The context used for translating {@link #text}
+ */
+ public String text_context;
+
+ /**
+ * The localized version of {@link #text}
+ */
+ public String locale_text;
+
+ protected final void initializeLocaleText(String defaultText) {
+ if (locale_text == null) {
+ if (text == null) {
+ locale_text = defaultText;
+ } else if (text_context != null) {
+ locale_text = trc(text_context, fixPresetString(text));
+ } else {
+ locale_text = tr(fixPresetString(text));
+ }
+ }
+ }
+
+ @Override
+ void addCommands(List<Tag> changedTags) {
+ }
+
+ protected String fieldsToString() {
+ return (text != null ? "text=" + text + ", " : "")
+ + (text_context != null ? "text_context=" + text_context + ", " : "")
+ + (locale_text != null ? "locale_text=" + locale_text : "");
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + " [" + fieldsToString() + "]";
+ }
+ }
+
+ public static class Label extends TaggingPresetTextItem {
+
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ initializeLocaleText(null);
+ p.add(new JLabel(locale_text), GBC.eol());
+ return false;
+ }
+ }
+
+ public static class Link extends TaggingPresetTextItem {
+
+ /**
+ * The link to display
+ */
+ public String href;
+
+ /**
+ * The localized version of {@link #href}
+ */
+ public String locale_href;
+
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ initializeLocaleText(tr("More information about this feature"));
+ String url = locale_href;
+ if (url == null) {
+ url = href;
+ }
+ if (url != null) {
+ p.add(new UrlLabel(url, locale_text, 2), GBC.eol().anchor(GBC.WEST));
+ }
+ return false;
+ }
+
+ @Override
+ protected String fieldsToString() {
+ return super.fieldsToString()
+ + (href != null ? "href=" + href + ", " : "")
+ + (locale_href != null ? "locale_href=" + locale_href + ", " : "");
+ }
+ }
+
+ public static class Roles extends TaggingPresetItem {
+
+ public final List<Role> roles = new LinkedList<Role>();
+
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ p.add(new JLabel(" "), GBC.eol()); // space
+ if (!roles.isEmpty()) {
+ JPanel proles = new JPanel(new GridBagLayout());
+ proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0, 0, 10, 0));
+ proles.add(new JLabel(tr("role")), GBC.std().insets(0, 0, 10, 0));
+ proles.add(new JLabel(tr("count")), GBC.std().insets(0, 0, 10, 0));
+ proles.add(new JLabel(tr("elements")), GBC.eol());
+ for (Role i : roles) {
+ i.addToPanel(proles, sel);
+ }
+ p.add(proles, GBC.eol());
+ }
+ return false;
+ }
+
+ @Override
+ public void addCommands(List<Tag> changedTags) {
+ }
+ }
+
+ public static class Optional extends TaggingPresetTextItem {
+
+ // TODO: Draw a box around optional stuff
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ initializeLocaleText(tr("Optional Attributes:"));
+ p.add(new JLabel(" "), GBC.eol()); // space
+ p.add(new JLabel(locale_text), GBC.eol());
+ p.add(new JLabel(" "), GBC.eol()); // space
+ return false;
+ }
+ }
+
+ public static class Space extends TaggingPresetItem {
+
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ p.add(new JLabel(" "), GBC.eol()); // space
+ return false;
+ }
+
+ @Override
+ public void addCommands(List<Tag> changedTags) {
+ }
+
+ @Override
+ public String toString() {
+ return "Space";
+ }
+ }
+
+ /**
+ * Class used to represent a {@link JSeparator} inside tagging preset window.
+ * @since 6198
+ */
+ public static class ItemSeparator extends TaggingPresetItem {
+
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ p.add(new JSeparator(), GBC.eol().fill(GBC.HORIZONTAL).insets(0, 5, 0, 5));
+ return false;
+ }
+
+ @Override
+ public void addCommands(List<Tag> changedTags) {
+ }
+
+ @Override
+ public String toString() {
+ return "ItemSeparator";
+ }
+ }
+
+ public static abstract class KeyedItem extends TaggingPresetItem {
+
+ public String key;
+ public String text;
+ public String text_context;
+ public String match = getDefaultMatch().getValue();
+
+ public abstract MatchType getDefaultMatch();
+ public abstract Collection<String> getValues();
+
+ @Override
+ Boolean matches(Map<String, String> tags) {
+ switch (MatchType.ofString(match)) {
+ case NONE:
+ return null;
+ case KEY:
+ return tags.containsKey(key) ? true : null;
+ case KEY_REQUIRED:
+ return tags.containsKey(key);
+ case KEY_VALUE:
+ return tags.containsKey(key) && (getValues().contains(tags.get(key)));
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "KeyedItem [key=" + key + ", text=" + text
+ + ", text_context=" + text_context + ", match=" + match
+ + "]";
+ }
+ }
+
+ public static class Key extends KeyedItem {
+
+ public String value;
+
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ return false;
+ }
+
+ @Override
+ public void addCommands(List<Tag> changedTags) {
+ changedTags.add(new Tag(key, value));
+ }
+
+ @Override
+ public MatchType getDefaultMatch() {
+ return MatchType.KEY_VALUE;
+ }
+
+ @Override
+ public Collection<String> getValues() {
+ return Collections.singleton(value);
+ }
+
+ @Override
+ public String toString() {
+ return "Key [key=" + key + ", value=" + value + ", text=" + text
+ + ", text_context=" + text_context + ", match=" + match
+ + "]";
+ }
+ }
+
+ public static class Text extends KeyedItem {
+
+ public String locale_text;
+ public String default_;
+ public String originalValue;
+ public String use_last_as_default = "false";
+ public String auto_increment;
+ public String length;
+
+ private JComponent value;
+
+ @Override public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+
+ // find out if our key is already used in the selection.
+ Usage usage = determineTextUsage(sel, key);
+ AutoCompletingTextField textField = new AutoCompletingTextField();
+ initAutoCompletionField(textField, key);
+ if (length != null && !length.isEmpty()) {
+ textField.setMaxChars(Integer.valueOf(length));
+ }
+ if (usage.unused()){
+ if (auto_increment_selected != 0 && auto_increment != null) {
+ try {
+ textField.setText(Integer.toString(Integer.parseInt(lastValue.get(key)) + auto_increment_selected));
+ } catch (NumberFormatException ex) {
+ // Ignore - cannot auto-increment if last was non-numeric
+ }
+ }
+ else if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
+ // selected osm primitives are untagged or filling default values feature is enabled
+ if (!"false".equals(use_last_as_default) && lastValue.containsKey(key)) {
+ textField.setText(lastValue.get(key));
+ } else {
+ textField.setText(default_);
+ }
+ } else {
+ // selected osm primitives are tagged and filling default values feature is disabled
+ textField.setText("");
+ }
+ value = textField;
+ originalValue = null;
+ } else if (usage.hasUniqueValue()) {
+ // all objects use the same value
+ textField.setText(usage.getFirst());
+ value = textField;
+ originalValue = usage.getFirst();
+ } else {
+ // the objects have different values
+ JosmComboBox comboBox = new JosmComboBox(usage.values.toArray());
+ comboBox.setEditable(true);
+ comboBox.setEditor(textField);
+ comboBox.getEditor().setItem(DIFFERENT);
+ value=comboBox;
+ originalValue = DIFFERENT;
+ }
+ if (locale_text == null) {
+ if (text != null) {
+ if (text_context != null) {
+ locale_text = trc(text_context, fixPresetString(text));
+ } else {
+ locale_text = tr(fixPresetString(text));
+ }
+ }
+ }
+
+ // if there's an auto_increment setting, then wrap the text field
+ // into a panel, appending a number of buttons.
+ // auto_increment has a format like -2,-1,1,2
+ // the text box being the first component in the panel is relied
+ // on in a rather ugly fashion further down.
+ if (auto_increment != null) {
+ ButtonGroup bg = new ButtonGroup();
+ JPanel pnl = new JPanel(new GridBagLayout());
+ pnl.add(value, GBC.std().fill(GBC.HORIZONTAL));
+
+ // first, one button for each auto_increment value
+ for (final String ai : auto_increment.split(",")) {
+ JToggleButton aibutton = new JToggleButton(ai);
+ aibutton.setToolTipText(tr("Select auto-increment of {0} for this field", ai));
+ aibutton.setMargin(new java.awt.Insets(0,0,0,0));
+ aibutton.setFocusable(false);
+ bg.add(aibutton);
+ try {
+ // TODO there must be a better way to parse a number like "+3" than this.
+ final int buttonvalue = (NumberFormat.getIntegerInstance().parse(ai.replace("+", ""))).intValue();
+ if (auto_increment_selected == buttonvalue) aibutton.setSelected(true);
+ aibutton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ auto_increment_selected = buttonvalue;
+ }
+ });
+ pnl.add(aibutton, GBC.std());
+ } catch (ParseException x) {
+ Main.error("Cannot parse auto-increment value of '" + ai + "' into an integer");
+ }
+ }
+
+ // an invisible toggle button for "release" of the button group
+ final JToggleButton clearbutton = new JToggleButton("X");
+ clearbutton.setVisible(false);
+ clearbutton.setFocusable(false);
+ bg.add(clearbutton);
+ // and its visible counterpart. - this mechanism allows us to
+ // have *no* button selected after the X is clicked, instead
+ // of the X remaining selected
+ JButton releasebutton = new JButton("X");
+ releasebutton.setToolTipText(tr("Cancel auto-increment for this field"));
+ releasebutton.setMargin(new java.awt.Insets(0,0,0,0));
+ releasebutton.setFocusable(false);
+ releasebutton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ auto_increment_selected = 0;
+ clearbutton.setSelected(true);
+ }
+ });
+ pnl.add(releasebutton, GBC.eol());
+ value = pnl;
+ }
+ p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0));
+ p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
+ return true;
+ }
+
+ private static String getValue(Component comp) {
+ if (comp instanceof JosmComboBox) {
+ return ((JosmComboBox) comp).getEditor().getItem().toString();
+ } else if (comp instanceof JosmTextField) {
+ return ((JosmTextField) comp).getText();
+ } else if (comp instanceof JPanel) {
+ return getValue(((JPanel)comp).getComponent(0));
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public void addCommands(List<Tag> changedTags) {
+
+ // return if unchanged
+ String v = getValue(value);
+ if (v == null) {
+ Main.error("No 'last value' support for component " + value);
+ return;
+ }
+
+ v = v.trim();
+
+ if (!"false".equals(use_last_as_default) || auto_increment != null) {
+ lastValue.put(key, v);
+ }
+ if (v.equals(originalValue) || (originalValue == null && v.length() == 0))
+ return;
+
+ changedTags.add(new Tag(key, v));
+ }
+
+ @Override
+ boolean requestFocusInWindow() {
+ return value.requestFocusInWindow();
+ }
+
+ @Override
+ public MatchType getDefaultMatch() {
+ return MatchType.NONE;
+ }
+
+ @Override
+ public Collection<String> getValues() {
+ if (default_ == null || default_.isEmpty())
+ return Collections.emptyList();
+ return Collections.singleton(default_);
+ }
+ }
+
+ /**
+ * A group of {@link Check}s.
+ * @since 6114
+ */
+ public static class CheckGroup extends TaggingPresetItem {
+
+ /**
+ * Number of columns (positive integer)
+ */
+ public String columns;
+
+ /**
+ * List of checkboxes
+ */
+ public final List<Check> checks = new LinkedList<Check>();
+
+ @Override
+ boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+ Integer cols = Integer.valueOf(columns);
+ int rows = (int) Math.ceil(checks.size()/cols.doubleValue());
+ JPanel panel = new JPanel(new GridLayout(rows, cols));
+
+ for (Check check : checks) {
+ check.addToPanel(panel, sel);
+ }
+
+ p.add(panel, GBC.eol());
+ return false;
+ }
+
+ @Override
+ void addCommands(List<Tag> changedTags) {
+ for (Check check : checks) {
+ check.addCommands(changedTags);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "CheckGroup [columns=" + columns + "]";
+ }
+ }
+
+ public static class Check extends KeyedItem {
+
+ public String locale_text;
+ public String value_on = OsmUtils.trueval;
+ public String value_off = OsmUtils.falseval;
+ public boolean default_ = false; // only used for tagless objects
+
+ private QuadStateCheckBox check;
+ private QuadStateCheckBox.State initialState;
+ private boolean def;
+
+ @Override public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+
+ // find out if our key is already used in the selection.
+ Usage usage = determineBooleanUsage(sel, key);
+ def = default_;
+
+ if(locale_text == null) {
+ if(text_context != null) {
+ locale_text = trc(text_context, fixPresetString(text));
+ } else {
+ locale_text = tr(fixPresetString(text));
+ }
+ }
+
+ String oneValue = null;
+ for (String s : usage.values) {
+ oneValue = s;
+ }
+ if (usage.values.size() < 2 && (oneValue == null || value_on.equals(oneValue) || value_off.equals(oneValue))) {
+ if (def && !PROP_FILL_DEFAULT.get()) {
+ // default is set and filling default values feature is disabled - check if all primitives are untagged
+ for (OsmPrimitive s : sel)
+ if(s.hasKeys()) {
+ def = false;
+ }
+ }
+
+ // all selected objects share the same value which is either true or false or unset,
+ // we can display a standard check box.
+ initialState = value_on.equals(oneValue) ?
+ QuadStateCheckBox.State.SELECTED :
+ value_off.equals(oneValue) ?
+ QuadStateCheckBox.State.NOT_SELECTED :
+ def ? QuadStateCheckBox.State.SELECTED
+ : QuadStateCheckBox.State.UNSET;
+ check = new QuadStateCheckBox(locale_text, initialState,
+ new QuadStateCheckBox.State[] {
+ QuadStateCheckBox.State.SELECTED,
+ QuadStateCheckBox.State.NOT_SELECTED,
+ QuadStateCheckBox.State.UNSET });
+ } else {
+ def = false;
+ // the objects have different values, or one or more objects have something
+ // else than true/false. we display a quad-state check box
+ // in "partial" state.
+ initialState = QuadStateCheckBox.State.PARTIAL;
+ check = new QuadStateCheckBox(locale_text, QuadStateCheckBox.State.PARTIAL,
+ new QuadStateCheckBox.State[] {
+ QuadStateCheckBox.State.PARTIAL,
+ QuadStateCheckBox.State.SELECTED,
+ QuadStateCheckBox.State.NOT_SELECTED,
+ QuadStateCheckBox.State.UNSET });
+ }
+ p.add(check, GBC.eol().fill(GBC.HORIZONTAL));
+ return true;
+ }
+
+ @Override public void addCommands(List<Tag> changedTags) {
+ // if the user hasn't changed anything, don't create a command.
+ if (check.getState() == initialState && !def) return;
+
+ // otherwise change things according to the selected value.
+ changedTags.add(new Tag(key,
+ check.getState() == QuadStateCheckBox.State.SELECTED ? value_on :
+ check.getState() == QuadStateCheckBox.State.NOT_SELECTED ? value_off :
+ null));
+ }
+ @Override boolean requestFocusInWindow() {return check.requestFocusInWindow();}
+
+ @Override
+ public MatchType getDefaultMatch() {
+ return MatchType.NONE;
+ }
+
+ @Override
+ public Collection<String> getValues() {
+ return Arrays.asList(value_on, value_off);
+ }
+
+ @Override
+ public String toString() {
+ return "Check ["
+ + (locale_text != null ? "locale_text=" + locale_text + ", " : "")
+ + (value_on != null ? "value_on=" + value_on + ", " : "")
+ + (value_off != null ? "value_off=" + value_off + ", " : "")
+ + "default_=" + default_ + ", "
+ + (check != null ? "check=" + check + ", " : "")
+ + (initialState != null ? "initialState=" + initialState
+ + ", " : "") + "def=" + def + "]";
+ }
+ }
+
+ public static abstract class ComboMultiSelect extends KeyedItem {
+
+ public String locale_text;
+ public String values;
+ public String values_from;
+ public String values_context;
+ public String display_values;
+ public String locale_display_values;
+ public String short_descriptions;
+ public String locale_short_descriptions;
+ public String default_;
+ public String delimiter = ";";
+ public String use_last_as_default = "false";
+ /** whether to use values for search via {@link TaggingPresetSelector} */
+ public String values_searchable = "false";
+
+ protected JComponent component;
+ protected final Map<String, PresetListEntry> lhm = new LinkedHashMap<String, PresetListEntry>();
+ private boolean initialized = false;
+ protected Usage usage;
+ protected Object originalValue;
+
+ protected abstract Object getSelectedItem();
+ protected abstract void addToPanelAnchor(JPanel p, String def);
+
+ protected char getDelChar() {
+ return delimiter.isEmpty() ? ';' : delimiter.charAt(0);
+ }
+
+ @Override
+ public Collection<String> getValues() {
+ initListEntries();
+ return lhm.keySet();
+ }
+
+ public Collection<String> getDisplayValues() {
+ initListEntries();
+ return Utils.transform(lhm.values(), new Utils.Function<PresetListEntry, String>() {
+ @Override
+ public String apply(PresetListEntry x) {
+ return x.getDisplayValue(true);
+ }
+ });
+ }
+
+ @Override
+ public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+
+ initListEntries();
+
+ // find out if our key is already used in the selection.
+ usage = determineTextUsage(sel, key);
+ if (!usage.hasUniqueValue() && !usage.unused()) {
+ lhm.put(DIFFERENT, new PresetListEntry(DIFFERENT));
+ }
+
+ p.add(new JLabel(tr("{0}:", locale_text)), GBC.std().insets(0, 0, 10, 0));
+ addToPanelAnchor(p, default_);
+
+ return true;
+
+ }
+
+ private void initListEntries() {
+ if (initialized) {
+ lhm.remove(DIFFERENT); // possibly added in #addToPanel
+ return;
+ } else if (lhm.isEmpty()) {
+ initListEntriesFromAttributes();
+ } else {
+ if (values != null) {
+ Main.warn(tr("Warning in tagging preset \"{0}-{1}\": "
+ + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
+ key, text, "values", "list_entry"));
+ }
+ if (display_values != null || locale_display_values != null) {
+ Main.warn(tr("Warning in tagging preset \"{0}-{1}\": "
+ + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
+ key, text, "display_values", "list_entry"));
+ }
+ if (short_descriptions != null || locale_short_descriptions != null) {
+ Main.warn(tr("Warning in tagging preset \"{0}-{1}\": "
+ + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
+ key, text, "short_descriptions", "list_entry"));
+ }
+ for (PresetListEntry e : lhm.values()) {
+ if (e.value_context == null) {
+ e.value_context = values_context;
+ }
+ }
+ }
+ if (locale_text == null) {
+ locale_text = trc(text_context, fixPresetString(text));
+ }
+ initialized = true;
+ }
+
+ private String[] initListEntriesFromAttributes() {
+ char delChar = getDelChar();
+
+ String[] value_array = null;
+
+ if (values_from != null) {
+ String[] class_method = values_from.split("#");
+ if (class_method != null && class_method.length == 2) {
+ try {
+ Method method = Class.forName(class_method[0]).getMethod(class_method[1]);
+ // Check method is public static String[] methodName()
+ int mod = method.getModifiers();
+ if (Modifier.isPublic(mod) && Modifier.isStatic(mod)
+ && method.getReturnType().equals(String[].class) && method.getParameterTypes().length == 0) {
+ value_array = (String[]) method.invoke(null);
+ } else {
+ Main.error(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is not \"{2}\"", key, text,
+ "public static String[] methodName()"));
+ }
+ } catch (Exception e) {
+ Main.error(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' threw {2} ({3})", key, text,
+ e.getClass().getName(), e.getMessage()));
+ }
+ }
+ }
+
+ if (value_array == null) {
+ value_array = splitEscaped(delChar, values);
+ }
+
+ final String displ = Utils.firstNonNull(locale_display_values, display_values);
+ String[] display_array = displ == null ? value_array : splitEscaped(delChar, displ);
+
+ final String descr = Utils.firstNonNull(locale_short_descriptions, short_descriptions);
+ String[] short_descriptions_array = descr == null ? null : splitEscaped(delChar, descr);
+
+ if (display_array.length != value_array.length) {
+ Main.error(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' must be the same as in ''values''", key, text));
+ display_array = value_array;
+ }
+
+ if (short_descriptions_array != null && short_descriptions_array.length != value_array.length) {
+ Main.error(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''short_descriptions'' must be the same as in ''values''", key, text));
+ short_descriptions_array = null;
+ }
+
+ for (int i = 0; i < value_array.length; i++) {
+ final PresetListEntry e = new PresetListEntry(value_array[i]);
+ e.locale_display_value = locale_display_values != null
+ ? display_array[i]
+ : trc(values_context, fixPresetString(display_array[i]));
+ if (short_descriptions_array != null) {
+ e.locale_short_description = locale_short_descriptions != null
+ ? short_descriptions_array[i]
+ : tr(fixPresetString(short_descriptions_array[i]));
+ }
+ lhm.put(value_array[i], e);
+ display_array[i] = e.getDisplayValue(true);
+ }
+
+ return display_array;
+ }
+
+ protected String getDisplayIfNull() {
+ return null;
+ }
+
+ @Override
+ public void addCommands(List<Tag> changedTags) {
+ Object obj = getSelectedItem();
+ String display = (obj == null) ? null : obj.toString();
+ String value = null;
+ if (display == null) {
+ display = getDisplayIfNull();
+ }
+
+ if (display != null) {
+ for (String val : lhm.keySet()) {
+ String k = lhm.get(val).toString();
+ if (k != null && k.equals(display)) {
+ value = val;
+ break;
+ }
+ }
+ if (value == null) {
+ value = display;
+ }
+ } else {
+ value = "";
+ }
+ value = value.trim();
+
+ // no change if same as before
+ if (originalValue == null) {
+ if (value.length() == 0)
+ return;
+ } else if (value.equals(originalValue.toString()))
+ return;
+
+ if (!"false".equals(use_last_as_default)) {
+ lastValue.put(key, value);
+ }
+ changedTags.add(new Tag(key, value));
+ }
+
+ public void addListEntry(PresetListEntry e) {
+ lhm.put(e.value, e);
+ }
+
+ public void addListEntries(Collection<PresetListEntry> e) {
+ for (PresetListEntry i : e) {
+ addListEntry(i);
+ }
+ }
+
+ @Override
+ boolean requestFocusInWindow() {
+ return component.requestFocusInWindow();
+ }
+
+ private static ListCellRenderer RENDERER = new ListCellRenderer() {
+
+ JLabel lbl = new JLabel();
+
+ @Override
+ public Component getListCellRendererComponent(
+ JList list,
+ Object value,
+ int index,
+ boolean isSelected,
+ boolean cellHasFocus) {
+ PresetListEntry item = (PresetListEntry) value;
+
+ // Only return cached size, item is not shown
+ if (!list.isShowing() && item.prefferedWidth != -1 && item.prefferedHeight != -1) {
+ if (index == -1) {
+ lbl.setPreferredSize(new Dimension(item.prefferedWidth, 10));
+ } else {
+ lbl.setPreferredSize(new Dimension(item.prefferedWidth, item.prefferedHeight));
+ }
+ return lbl;
+ }
+
+ lbl.setPreferredSize(null);
+
+
+ if (isSelected) {
+ lbl.setBackground(list.getSelectionBackground());
+ lbl.setForeground(list.getSelectionForeground());
+ } else {
+ lbl.setBackground(list.getBackground());
+ lbl.setForeground(list.getForeground());
+ }
+
+ lbl.setOpaque(true);
+ lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
+ lbl.setText("<html>" + item.getListDisplay() + "</html>");
+ lbl.setIcon(item.getIcon());
+ lbl.setEnabled(list.isEnabled());
+
+ // Cache size
+ item.prefferedWidth = lbl.getPreferredSize().width;
+ item.prefferedHeight = lbl.getPreferredSize().height;
+
+ // We do not want the editor to have the maximum height of all
+ // entries. Return a dummy with bogus height.
+ if (index == -1) {
+ lbl.setPreferredSize(new Dimension(lbl.getPreferredSize().width, 10));
+ }
+ return lbl;
+ }
+ };
+
+
+ protected ListCellRenderer getListCellRenderer() {
+ return RENDERER;
+ }
+
+ @Override
+ public MatchType getDefaultMatch() {
+ return MatchType.NONE;
+ }
+ }
+
+ public static class Combo extends ComboMultiSelect {
+
+ public boolean editable = true;
+ protected JosmComboBox combo;
+ public String length;
+
+ public Combo() {
+ delimiter = ",";
+ }
+
+ @Override
+ protected void addToPanelAnchor(JPanel p, String def) {
+ if (!usage.unused()) {
+ for (String s : usage.values) {
+ if (!lhm.containsKey(s)) {
+ lhm.put(s, new PresetListEntry(s));
+ }
+ }
+ }
+ if (def != null && !lhm.containsKey(def)) {
+ lhm.put(def, new PresetListEntry(def));
+ }
+ lhm.put("", new PresetListEntry(""));
+
+ combo = new JosmComboBox(lhm.values().toArray());
+ component = combo;
+ combo.setRenderer(getListCellRenderer());
+ combo.setEditable(editable);
+ combo.reinitialize(lhm.values());
+ AutoCompletingTextField tf = new AutoCompletingTextField();
+ initAutoCompletionField(tf, key);
+ if (length != null && !length.isEmpty()) {
+ tf.setMaxChars(Integer.valueOf(length));
+ }
+ AutoCompletionList acList = tf.getAutoCompletionList();
+ if (acList != null) {
+ acList.add(getDisplayValues(), AutoCompletionItemPriority.IS_IN_STANDARD);
+ }
+ combo.setEditor(tf);
+
+ if (usage.hasUniqueValue()) {
+ // all items have the same value (and there were no unset items)
+ originalValue = lhm.get(usage.getFirst());
+ combo.setSelectedItem(originalValue);
+ } else if (def != null && usage.unused()) {
+ // default is set and all items were unset
+ if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
+ // selected osm primitives are untagged or filling default feature is enabled
+ combo.setSelectedItem(lhm.get(def).getDisplayValue(true));
+ } else {
+ // selected osm primitives are tagged and filling default feature is disabled
+ combo.setSelectedItem("");
+ }
+ originalValue = lhm.get(DIFFERENT);
+ } else if (usage.unused()) {
+ // all items were unset (and so is default)
+ originalValue = lhm.get("");
+ if ("force".equals(use_last_as_default) && lastValue.containsKey(key)) {
+ combo.setSelectedItem(lhm.get(lastValue.get(key)));
+ } else {
+ combo.setSelectedItem(originalValue);
+ }
+ } else {
+ originalValue = lhm.get(DIFFERENT);
+ combo.setSelectedItem(originalValue);
+ }
+ p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
+
+ }
+
+ @Override
+ protected Object getSelectedItem() {
+ return combo.getSelectedItem();
+
+ }
+
+ @Override
+ protected String getDisplayIfNull() {
+ if (combo.isEditable())
+ return combo.getEditor().getItem().toString();
+ else
+ return null;
+ }
+ }
+ public static class MultiSelect extends ComboMultiSelect {
+
+ public long rows = -1;
+ protected ConcatenatingJList list;
+
+ @Override
+ protected void addToPanelAnchor(JPanel p, String def) {
+ list = new ConcatenatingJList(delimiter, lhm.values().toArray());
+ component = list;
+ ListCellRenderer renderer = getListCellRenderer();
+ list.setCellRenderer(renderer);
+
+ if (usage.hasUniqueValue() && !usage.unused()) {
+ originalValue = usage.getFirst();
+ list.setSelectedItem(originalValue);
+ } else if (def != null && !usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
+ originalValue = DIFFERENT;
+ list.setSelectedItem(def);
+ } else if (usage.unused()) {
+ originalValue = null;
+ list.setSelectedItem(originalValue);
+ } else {
+ originalValue = DIFFERENT;
+ list.setSelectedItem(originalValue);
+ }
+
+ JScrollPane sp = new JScrollPane(list);
+ // if a number of rows has been specified in the preset,
+ // modify preferred height of scroll pane to match that row count.
+ if (rows != -1) {
+ double height = renderer.getListCellRendererComponent(list,
+ new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows;
+ sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height));
+ }
+ p.add(sp, GBC.eol().fill(GBC.HORIZONTAL));
+
+
+ }
+
+ @Override
+ protected Object getSelectedItem() {
+ return list.getSelectedItem();
+ }
+
+ @Override
+ public void addCommands(List<Tag> changedTags) {
+ // Do not create any commands if list has been disabled because of an unknown value (fix #8605)
+ if (list.isEnabled()) {
+ super.addCommands(changedTags);
+ }
+ }
+ }
+
+ /**
+ * Class that allows list values to be assigned and retrieved as a comma-delimited
+ * string (extracted from TaggingPreset)
+ */
+ private static class ConcatenatingJList extends JList {
+ private String delimiter;
+ public ConcatenatingJList(String del, Object[] o) {
+ super(o);
+ delimiter = del;
+ }
+
+ public void setSelectedItem(Object o) {
+ if (o == null) {
+ clearSelection();
+ } else {
+ String s = o.toString();
+ TreeSet<String> parts = new TreeSet<String>(Arrays.asList(s.split(delimiter)));
+ ListModel lm = getModel();
+ int[] intParts = new int[lm.getSize()];
+ int j = 0;
+ for (int i = 0; i < lm.getSize(); i++) {
+ if (parts.contains((((PresetListEntry)lm.getElementAt(i)).value))) {
+ intParts[j++]=i;
+ }
+ }
+ setSelectedIndices(Arrays.copyOf(intParts, j));
+ // check if we have actually managed to represent the full
+ // value with our presets. if not, cop out; we will not offer
+ // a selection list that threatens to ruin the value.
+ setEnabled(Utils.join(delimiter, parts).equals(getSelectedItem()));
+ }
+ }
+
+ public String getSelectedItem() {
+ ListModel lm = getModel();
+ int[] si = getSelectedIndices();
+ StringBuilder builder = new StringBuilder();
+ for (int i=0; i<si.length; i++) {
+ if (i>0) {
+ builder.append(delimiter);
+ }
+ builder.append(((PresetListEntry)lm.getElementAt(si[i])).value);
+ }
+ return builder.toString();
+ }
+ }
+ static public EnumSet<TaggingPresetType> getType(String types) throws SAXException {
+ if (typeCache.containsKey(types))
+ return typeCache.get(types);
+ EnumSet<TaggingPresetType> result = EnumSet.noneOf(TaggingPresetType.class);
+ for (String type : Arrays.asList(types.split(","))) {
+ try {
+ TaggingPresetType presetType = TaggingPresetType.fromString(type);
+ result.add(presetType);
+ } catch (IllegalArgumentException e) {
+ throw new SAXException(tr("Unknown type: {0}", type));
+ }
+ }
+ typeCache.put(types, result);
+ return result;
+ }
+
+ static String fixPresetString(String s) {
+ return s == null ? s : s.replaceAll("'","''");
+ }
+
+ /**
+ * allow escaped comma in comma separated list:
+ * "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
+ * @param delimiter the delimiter, e.g. a comma. separates the entries and
+ * must be escaped within one entry
+ * @param s the string
+ */
+ private static String[] splitEscaped(char delimiter, String s) {
+ if (s == null)
+ return new String[0];
+ List<String> result = new ArrayList<String>();
+ boolean backslash = false;
+ StringBuilder item = new StringBuilder();
+ for (int i=0; i<s.length(); i++) {
+ char ch = s.charAt(i);
+ if (backslash) {
+ item.append(ch);
+ backslash = false;
+ } else if (ch == '\\') {
+ backslash = true;
+ } else if (ch == delimiter) {
+ result.add(item.toString());
+ item.setLength(0);
+ } else {
+ item.append(ch);
+ }
+ }
+ if (item.length() > 0) {
+ result.add(item.toString());
+ }
+ return result.toArray(new String[result.size()]);
+ }
+
+
+ static Usage determineTextUsage(Collection<OsmPrimitive> sel, String key) {
+ Usage returnValue = new Usage();
+ returnValue.values = new TreeSet<String>();
+ for (OsmPrimitive s : sel) {
+ String v = s.get(key);
+ if (v != null) {
+ returnValue.values.add(v);
+ } else {
+ returnValue.hadEmpty = true;
+ }
+ if(s.hasKeys()) {
+ returnValue.hadKeys = true;
+ }
+ }
+ return returnValue;
+ }
+ static Usage determineBooleanUsage(Collection<OsmPrimitive> sel, String key) {
+
+ Usage returnValue = new Usage();
+ returnValue.values = new TreeSet<String>();
+ for (OsmPrimitive s : sel) {
+ String booleanValue = OsmUtils.getNamedOsmBoolean(s.get(key));
+ if (booleanValue != null) {
+ returnValue.values.add(booleanValue);
+ }
+ }
+ return returnValue;
+ }
+ protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
+ final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
+ ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
+ if (maxSize != null) {
+ imgProv.setMaxSize(maxSize);
+ }
+ return imgProv.get();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
index a986f8e..1eb0b98 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
@@ -1,12 +1,15 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.tagging;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
+import java.awt.MouseInfo;
+import java.awt.Point;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import javax.swing.Action;
import javax.swing.JMenu;
@@ -14,10 +17,13 @@ import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.PresetTextComparator;
public class TaggingPresetMenu extends TaggingPreset {
public JMenu menu = null; // set by TaggingPresetPreferences
+
+ @Override
public void setDisplayName() {
putValue(Action.NAME, getName());
/** Tooltips should be shown for the toolbar buttons, but not in the menu. */
@@ -26,9 +32,6 @@ public class TaggingPresetMenu extends TaggingPreset {
tr("Preset group {0}", getLocaleName())));
putValue("toolbar", "tagginggroup_" + getRawName());
}
- public void setIcon(String iconName) {
- super.setIcon(iconName);
- }
private Component copyMenuComponent(Component menuComponent) {
if (menuComponent instanceof JMenu) {
@@ -51,18 +54,19 @@ public class TaggingPresetMenu extends TaggingPreset {
}
}
+ @Override
public void actionPerformed(ActionEvent e) {
Object s = e.getSource();
- if(menu != null && s instanceof Component)
- {
- Component co = (Component)s;
+ if (menu != null && s instanceof Component) {
JPopupMenu pm = new JPopupMenu(getName());
for (Component c : menu.getMenuComponents()) {
pm.add(copyMenuComponent(c));
}
- pm.show(co, co.getWidth()/2, co.getHeight()/2);
+ Point p = MouseInfo.getPointerInfo().getLocation();
+ pm.show(Main.parent, p.x-Main.parent.getX(), p.y-Main.parent.getY());
}
}
+
/**
* Sorts the menu items using the translated item text
*/
@@ -76,7 +80,7 @@ public class TaggingPresetMenu extends TaggingPreset {
public static void sortMenu(JMenu menu){
Component[] items = menu.getMenuComponents();
PresetTextComparator comp = new PresetTextComparator();
- ArrayList<JMenuItem> sortarray = new ArrayList<JMenuItem>();
+ List<JMenuItem> sortarray = new ArrayList<JMenuItem>();
int lastSeparator = 0;
for (int i = 0; i < items.length; i++) {
Object item = items[i];
@@ -90,9 +94,9 @@ public class TaggingPresetMenu extends TaggingPreset {
int pos = 0;
for (JMenuItem menuItem : sortarray) {
int oldPos;
- if(lastSeparator == 0){
+ if (lastSeparator == 0){
oldPos=pos;
- }else {
+ } else {
oldPos = pos+lastSeparator+1;
}
menu.add(menuItem, oldPos);
@@ -101,7 +105,7 @@ public class TaggingPresetMenu extends TaggingPreset {
sortarray = new ArrayList<JMenuItem>();
lastSeparator = 0;
}
- }else if (item instanceof JSeparator){
+ } else if (item instanceof JSeparator){
Collections.sort(sortarray, comp);
int pos = 0;
for (JMenuItem menuItem : sortarray) {
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
new file mode 100644
index 0000000..0efe5fe
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
@@ -0,0 +1,216 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.XmlObjectParser;
+import org.xml.sax.SAXException;
+
+/**
+ * The tagging presets reader.
+ * @since 6068
+ */
+public final class TaggingPresetReader {
+
+ private TaggingPresetReader() {
+ // Hide default constructor for utils classes
+ }
+
+ private static File zipIcons = null;
+
+ public static List<String> getPresetSources() {
+ LinkedList<String> sources = new LinkedList<String>();
+
+ for (SourceEntry e : (new TaggingPresetPreference.PresetPrefHelper()).get()) {
+ sources.add(e.url);
+ }
+
+ return sources;
+ }
+
+ public static List<TaggingPreset> readAll(Reader in, boolean validate) throws SAXException {
+ XmlObjectParser parser = new XmlObjectParser();
+ parser.mapOnStart("item", TaggingPreset.class);
+ parser.mapOnStart("separator", TaggingPresetSeparator.class);
+ parser.mapBoth("group", TaggingPresetMenu.class);
+ parser.map("text", TaggingPresetItems.Text.class);
+ parser.map("link", TaggingPresetItems.Link.class);
+ parser.mapOnStart("optional", TaggingPresetItems.Optional.class);
+ parser.mapOnStart("roles", TaggingPresetItems.Roles.class);
+ parser.map("role", TaggingPresetItems.Role.class);
+ parser.map("checkgroup", TaggingPresetItems.CheckGroup.class);
+ parser.map("check", TaggingPresetItems.Check.class);
+ parser.map("combo", TaggingPresetItems.Combo.class);
+ parser.map("multiselect", TaggingPresetItems.MultiSelect.class);
+ parser.map("label", TaggingPresetItems.Label.class);
+ parser.map("space", TaggingPresetItems.Space.class);
+ parser.map("key", TaggingPresetItems.Key.class);
+ parser.map("list_entry", TaggingPresetItems.PresetListEntry.class);
+ parser.map("item_separator", TaggingPresetItems.ItemSeparator.class);
+
+ LinkedList<TaggingPreset> all = new LinkedList<TaggingPreset>();
+ TaggingPresetMenu lastmenu = null;
+ TaggingPresetItems.Roles lastrole = null;
+ final List<TaggingPresetItems.Check> checks = new LinkedList<TaggingPresetItems.Check>();
+ List<TaggingPresetItems.PresetListEntry> listEntries = new LinkedList<TaggingPresetItems.PresetListEntry>();
+
+ if (validate) {
+ parser.startWithValidation(in, Main.JOSM_WEBSITE+"/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
+ } else {
+ parser.start(in);
+ }
+ while (parser.hasNext()) {
+ Object o = parser.next();
+ if (!(o instanceof TaggingPresetItem) && !checks.isEmpty()) {
+ all.getLast().data.addAll(checks);
+ checks.clear();
+ }
+ if (o instanceof TaggingPresetMenu) {
+ TaggingPresetMenu tp = (TaggingPresetMenu) o;
+ if (tp == lastmenu) {
+ lastmenu = tp.group;
+ } else {
+ tp.group = lastmenu;
+ tp.setDisplayName();
+ lastmenu = tp;
+ all.add(tp);
+ }
+ lastrole = null;
+ } else if (o instanceof TaggingPresetSeparator) {
+ TaggingPresetSeparator tp = (TaggingPresetSeparator) o;
+ tp.group = lastmenu;
+ all.add(tp);
+ lastrole = null;
+ } else if (o instanceof TaggingPreset) {
+ TaggingPreset tp = (TaggingPreset) o;
+ tp.group = lastmenu;
+ tp.setDisplayName();
+ all.add(tp);
+ lastrole = null;
+ } else {
+ if (!all.isEmpty()) {
+ if (o instanceof TaggingPresetItems.Roles) {
+ all.getLast().data.add((TaggingPresetItem) o);
+ if (all.getLast().roles != null) {
+ throw new SAXException(tr("Roles cannot appear more than once"));
+ }
+ all.getLast().roles = (TaggingPresetItems.Roles) o;
+ lastrole = (TaggingPresetItems.Roles) o;
+ } else if (o instanceof TaggingPresetItems.Role) {
+ if (lastrole == null)
+ throw new SAXException(tr("Preset role element without parent"));
+ lastrole.roles.add((TaggingPresetItems.Role) o);
+ } else if (o instanceof TaggingPresetItems.Check) {
+ checks.add((TaggingPresetItems.Check) o);
+ } else if (o instanceof TaggingPresetItems.PresetListEntry) {
+ listEntries.add((TaggingPresetItems.PresetListEntry) o);
+ } else if (o instanceof TaggingPresetItems.CheckGroup) {
+ all.getLast().data.add((TaggingPresetItem) o);
+ ((TaggingPresetItems.CheckGroup) o).checks.addAll(checks);
+ checks.clear();
+ } else {
+ if (!checks.isEmpty()) {
+ all.getLast().data.addAll(checks);
+ checks.clear();
+ }
+ all.getLast().data.add((TaggingPresetItem) o);
+ if (o instanceof TaggingPresetItems.ComboMultiSelect) {
+ ((TaggingPresetItems.ComboMultiSelect) o).addListEntries(listEntries);
+ } else if (o instanceof TaggingPresetItems.Key) {
+ if (((TaggingPresetItems.Key) o).value == null) {
+ ((TaggingPresetItems.Key) o).value = ""; // Fix #8530
+ }
+ }
+ listEntries = new LinkedList<TaggingPresetItems.PresetListEntry>();
+ lastrole = null;
+ }
+ } else
+ throw new SAXException(tr("Preset sub element without parent"));
+ }
+ }
+ if (!all.isEmpty() && !checks.isEmpty()) {
+ all.getLast().data.addAll(checks);
+ checks.clear();
+ }
+ return all;
+ }
+
+ public static Collection<TaggingPreset> readAll(String source, boolean validate) throws SAXException, IOException {
+ Collection<TaggingPreset> tp;
+ MirroredInputStream s = new MirroredInputStream(source);
+ try {
+ InputStream zip = s.findZipEntryInputStream("xml","preset");
+ if(zip != null) {
+ zipIcons = s.getFile();
+ }
+ InputStreamReader r;
+ try {
+ r = new InputStreamReader(zip == null ? s : zip, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ r = new InputStreamReader(zip == null ? s: zip);
+ }
+ try {
+ tp = readAll(new BufferedReader(r), validate);
+ } finally {
+ Utils.close(r);
+ }
+ } finally {
+ Utils.close(s);
+ }
+ return tp;
+ }
+
+ public static Collection<TaggingPreset> readAll(Collection<String> sources, boolean validate) {
+ LinkedList<TaggingPreset> allPresets = new LinkedList<TaggingPreset>();
+ for(String source : sources) {
+ try {
+ allPresets.addAll(readAll(source, validate));
+ } catch (IOException e) {
+ Main.error(e);
+ Main.error(source);
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ tr("Could not read tagging preset source: {0}",source),
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
+ } catch (SAXException e) {
+ Main.error(e);
+ Main.error(source);
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ "<html>" + tr("Error parsing {0}: ", source) + "<br><br><table width=600>" + e.getMessage() + "</table></html>",
+ tr("Error"),
+ JOptionPane.ERROR_MESSAGE
+ );
+ }
+ }
+ return allPresets;
+ }
+
+ public static Collection<TaggingPreset> readFromPreferences(boolean validate) {
+ return readAll(getPresetSources(), validate);
+ }
+
+ public static File getZipIcons() {
+ return zipIcons;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java
index 591ec95..940a4de 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java
@@ -10,8 +10,15 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.tools.Shortcut;
+/**
+ * The tagging presets search action (F3).
+ * @since 3388
+ */
public class TaggingPresetSearchAction extends JosmAction {
+ /**
+ * Constructs a new {@code TaggingPresetSearchAction}.
+ */
public TaggingPresetSearchAction() {
super(tr("Search preset"), "dialogs/search", tr("Show preset search dialog"),
Shortcut.registerShortcut("preset:search", tr("Search presets"), KeyEvent.VK_F3, Shortcut.DIRECT), false);
@@ -25,8 +32,6 @@ public class TaggingPresetSearchAction extends JosmAction {
if (!Main.main.hasEditLayer())
return;
- TaggingPresetSearchDialog dialog = TaggingPresetSearchDialog.getInstance();
- dialog.showDialog();
+ TaggingPresetSearchDialog.getInstance().showDialog();
}
-
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
index 9a872b0..75baaaf 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
@@ -3,470 +3,64 @@ package org.openstreetmap.josm.gui.tagging;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
import java.awt.event.ActionEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.swing.AbstractListModel;
-import javax.swing.Action;
-import javax.swing.BoxLayout;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.Icon;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
+import java.awt.event.ActionListener;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.SelectionChangedListener;
import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Item;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Key;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Role;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Roles;
-
-public class TaggingPresetSearchDialog extends ExtendedDialog implements SelectionChangedListener {
-
- private static final int CLASSIFICATION_IN_FAVORITES = 300;
- private static final int CLASSIFICATION_NAME_MATCH = 300;
- private static final int CLASSIFICATION_GROUP_MATCH = 200;
- private static final int CLASSIFICATION_TAGS_MATCH = 100;
-
- private static final BooleanProperty SEARCH_IN_TAGS = new BooleanProperty("taggingpreset.dialog.search-in-tags", true);
- private static final BooleanProperty ONLY_APPLICABLE = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true);
-
- private static class ResultListCellRenderer extends DefaultListCellRenderer {
- @Override
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
- boolean cellHasFocus) {
- JLabel result = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
- TaggingPreset tp = (TaggingPreset)value;
- result.setText(tp.getName());
- result.setIcon((Icon) tp.getValue(Action.SMALL_ICON));
- return result;
- }
- }
-
- private static class ResultListModel extends AbstractListModel {
-
- private List<PresetClasification> presets = new ArrayList<PresetClasification>();
-
- public void setPresets(List<PresetClasification> presets) {
- this.presets = presets;
- fireContentsChanged(this, 0, Integer.MAX_VALUE);
- }
-
- public List<PresetClasification> getPresets() {
- return presets;
- }
-
- @Override
- public Object getElementAt(int index) {
- return presets.get(index).preset;
- }
-
- @Override
- public int getSize() {
- return presets.size();
- }
-
- }
-
- private static class PresetClasification implements Comparable<PresetClasification> {
- public final TaggingPreset preset;
- public int classification;
- public int favoriteIndex;
- private final Collection<String> groups = new HashSet<String>();
- private final Collection<String> names = new HashSet<String>();
- private final Collection<String> tags = new HashSet<String>();
-
- PresetClasification(TaggingPreset preset) {
- this.preset = preset;
- TaggingPreset group = preset.group;
- while (group != null) {
- for (String word: group.getLocaleName().toLowerCase().split("\\s")) {
- groups.add(word);
- }
- group = group.group;
- }
- for (String word: preset.getLocaleName().toLowerCase().split("\\s")) {
- names.add(word);
- }
- for (Item item: preset.data) {
- if (item instanceof TaggingPreset.KeyedItem) {
- tags.add(((TaggingPreset.KeyedItem) item).key);
- // Should combo values also be added?
- if (item instanceof Key && ((Key) item).value != null) {
- tags.add(((Key) item).value);
- }
- } else if (item instanceof Roles) {
- for (Role role : ((Roles) item).roles) {
- tags.add(role.key);
- }
- }
- }
- }
-
- private int isMatching(Collection<String> values, String[] searchString) {
- int sum = 0;
- for (String word: searchString) {
- boolean found = false;
- boolean foundFirst = false;
- for (String value: values) {
- int index = value.indexOf(word);
- if (index == 0) {
- foundFirst = true;
- break;
- } else if (index > 0) {
- found = true;
- }
- }
- if (foundFirst) {
- sum += 2;
- } else if (found) {
- sum += 1;
- } else
- return 0;
- }
- return sum;
- }
-
- int isMatchingGroup(String[] words) {
- return isMatching(groups, words);
- }
-
- int isMatchingName(String[] words) {
- return isMatching(names, words);
- }
-
- int isMatchingTags(String[] words) {
- return isMatching(tags, words);
- }
- @Override
- public int compareTo(PresetClasification o) {
- int result = o.classification - classification;
- if (result == 0)
- return preset.getName().compareTo(o.preset.getName());
- else
- return result;
- }
+/**
+ * The tagging presets search dialog (F3).
+ * @since 3388
+ */
+public final class TaggingPresetSearchDialog extends ExtendedDialog {
- @Override
- public String toString() {
- return classification + " " + preset.toString();
- }
- }
+ private TaggingPresetSelector selector;
private static TaggingPresetSearchDialog instance;
+
+ /**
+ * Returns the unique instance of {@code TaggingPresetSearchDialog}.
+ * @return the unique instance of {@code TaggingPresetSearchDialog}.
+ */
public static TaggingPresetSearchDialog getInstance() {
if (instance == null) {
instance = new TaggingPresetSearchDialog();
}
return instance;
}
-
- private JTextField edSearchText;
- private JList lsResult;
- private JCheckBox ckOnlyApplicable;
- private JCheckBox ckSearchInTags;
- private final EnumSet<PresetType> typesInSelection = EnumSet.noneOf(PresetType.class);
- private boolean typesInSelectionDirty = true;
- private final List<PresetClasification> classifications = new ArrayList<PresetClasification>();
- private ResultListModel lsResultModel = new ResultListModel();
-
+
private TaggingPresetSearchDialog() {
super(Main.parent, tr("Presets"), new String[] {tr("Select"), tr("Cancel")});
- DataSet.addSelectionListener(this);
-
- for (TaggingPreset preset: TaggingPresetPreference.taggingPresets) {
- if (preset instanceof TaggingPresetSeparator || preset instanceof TaggingPresetMenu) {
- continue;
+ selector = new TaggingPresetSelector();
+ setContent(selector);
+ DataSet.addSelectionListener(selector);
+ selector.setDblClickListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ buttonAction(0, null);
}
-
- classifications.add(new PresetClasification(preset));
- }
-
- build();
- filterPresets();
- }
-
- @Override
- public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
- typesInSelectionDirty = true;
+ });
}
@Override
public ExtendedDialog showDialog() {
-
- ckOnlyApplicable.setEnabled(!getTypesInSelection().isEmpty());
- ckOnlyApplicable.setSelected(!getTypesInSelection().isEmpty() && ONLY_APPLICABLE.get());
- edSearchText.setText("");
- filterPresets();
-
+ selector.init();
super.showDialog();
- lsResult.getSelectionModel().clearSelection();
+ selector.clearSelection();
return this;
}
- private void build() {
- JPanel content = new JPanel();
- content.setLayout(new BorderLayout());
-
- edSearchText = new JTextField();
- edSearchText.getDocument().addDocumentListener(new DocumentListener() {
-
- @Override
- public void removeUpdate(DocumentEvent e) {
- filterPresets();
- }
-
- @Override
- public void insertUpdate(DocumentEvent e) {
- filterPresets();
-
- }
-
- @Override
- public void changedUpdate(DocumentEvent e) {
- filterPresets();
-
- }
- });
- edSearchText.addKeyListener(new KeyAdapter() {
- @Override
- public void keyPressed(KeyEvent e) {
- switch (e.getKeyCode()) {
- case KeyEvent.VK_DOWN:
- selectPreset(lsResult.getSelectedIndex() + 1);
- break;
- case KeyEvent.VK_UP:
- selectPreset(lsResult.getSelectedIndex() - 1);
- break;
- case KeyEvent.VK_PAGE_DOWN:
- selectPreset(lsResult.getSelectedIndex() + 10);
- break;
- case KeyEvent.VK_PAGE_UP:
- selectPreset(lsResult.getSelectedIndex() - 10);
- break;
- case KeyEvent.VK_HOME:
- selectPreset(0);
- break;
- case KeyEvent.VK_END:
- selectPreset(lsResultModel.getSize());
- break;
- }
- }
- });
- content.add(edSearchText, BorderLayout.NORTH);
-
- lsResult = new JList();
- lsResult.setModel(lsResultModel);
- lsResult.setCellRenderer(new ResultListCellRenderer());
- lsResult.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- if (e.getClickCount()>1) {
- buttonAction(0, null);
- }
- }
- });
- content.add(new JScrollPane(lsResult), BorderLayout.CENTER);
-
- JPanel pnChecks = new JPanel();
- pnChecks.setLayout(new BoxLayout(pnChecks, BoxLayout.Y_AXIS));
-
- ckOnlyApplicable = new JCheckBox();
- ckOnlyApplicable.setText(tr("Show only applicable to selection"));
- pnChecks.add(ckOnlyApplicable);
- ckOnlyApplicable.addItemListener(new ItemListener() {
- @Override
- public void itemStateChanged(ItemEvent e) {
- filterPresets();
- }
- });
-
- ckSearchInTags = new JCheckBox();
- ckSearchInTags.setText(tr("Search in tags"));
- ckSearchInTags.setSelected(SEARCH_IN_TAGS.get());
- ckSearchInTags.addItemListener(new ItemListener() {
- @Override
- public void itemStateChanged(ItemEvent e) {
- filterPresets();
- }
- });
- pnChecks.add(ckSearchInTags);
-
- content.add(pnChecks, BorderLayout.SOUTH);
-
- content.setPreferredSize(new Dimension(400, 300));
- setContent(content);
- }
-
- private void selectPreset(int newIndex) {
- if (newIndex < 0) {
- newIndex = 0;
- }
- if (newIndex > lsResultModel.getSize() - 1) {
- newIndex = lsResultModel.getSize() - 1;
- }
- lsResult.setSelectedIndex(newIndex);
- lsResult.ensureIndexIsVisible(newIndex);
- }
-
- /**
- * Search expression can be in form: "group1/group2/name" where names can contain multiple words
- *
- * When groups are given,
- *
- *
- * @param text
- */
- private void filterPresets() {
- //TODO Save favorites to file
- String text = edSearchText.getText().toLowerCase();
-
- String[] groupWords;
- String[] nameWords;
-
- if (text.contains("/")) {
- groupWords = text.substring(0, text.lastIndexOf('/')).split("[\\s/]");
- nameWords = text.substring(text.indexOf('/') + 1).split("\\s");
- } else {
- groupWords = null;
- nameWords = text.split("\\s");
- }
-
- boolean onlyApplicable = ckOnlyApplicable.isSelected();
- boolean inTags = ckSearchInTags.isSelected();
-
- List<PresetClasification> result = new ArrayList<PresetClasification>();
- PRESET_LOOP:
- for (PresetClasification presetClasification: classifications) {
- TaggingPreset preset = presetClasification.preset;
- presetClasification.classification = 0;
-
- if (onlyApplicable && preset.types != null) {
- boolean found = false;
- for (PresetType type: preset.types) {
- if (getTypesInSelection().contains(type)) {
- found = true;
- break;
- }
- }
- if (!found) {
- continue;
- }
- }
-
-
-
- if (groupWords != null && presetClasification.isMatchingGroup(groupWords) == 0) {
- continue PRESET_LOOP;
- }
-
- int matchName = presetClasification.isMatchingName(nameWords);
-
- if (matchName == 0) {
- if (groupWords == null) {
- int groupMatch = presetClasification.isMatchingGroup(nameWords);
- if (groupMatch > 0) {
- presetClasification.classification = CLASSIFICATION_GROUP_MATCH + groupMatch;
- }
- }
- if (presetClasification.classification == 0 && inTags) {
- int tagsMatch = presetClasification.isMatchingTags(nameWords);
- if (tagsMatch > 0) {
- presetClasification.classification = CLASSIFICATION_TAGS_MATCH + tagsMatch;
- }
- }
- } else {
- presetClasification.classification = CLASSIFICATION_NAME_MATCH + matchName;
- }
-
- if (presetClasification.classification > 0) {
- presetClasification.classification += presetClasification.favoriteIndex;
- result.add(presetClasification);
- }
- }
-
- Collections.sort(result);
- lsResultModel.setPresets(result);
- if (!buttons.isEmpty()) {
- buttons.get(0).setEnabled(!result.isEmpty());
- }
- }
-
- private EnumSet<PresetType> getTypesInSelection() {
- if (typesInSelectionDirty) {
- synchronized (typesInSelection) {
- typesInSelectionDirty = false;
- typesInSelection.clear();
- for (OsmPrimitive primitive : Main.main.getCurrentDataSet().getSelected()) {
- if (primitive instanceof Node) {
- typesInSelection.add(PresetType.NODE);
- } else if (primitive instanceof Way) {
- typesInSelection.add(PresetType.WAY);
- if (((Way) primitive).isClosed()) {
- typesInSelection.add(PresetType.CLOSEDWAY);
- }
- } else if (primitive instanceof Relation) {
- typesInSelection.add(PresetType.RELATION);
- }
- }
- }
- }
- return typesInSelection;
- }
-
@Override
protected void buttonAction(int buttonIndex, ActionEvent evt) {
super.buttonAction(buttonIndex, evt);
if (buttonIndex == 0) {
- int selectPreset = lsResult.getSelectedIndex();
- if (selectPreset == -1) {
- selectPreset = 0;
- }
- TaggingPreset preset = lsResultModel.getPresets().get(selectPreset).preset;
- for (PresetClasification pc: classifications) {
- if (pc.preset == preset) {
- pc.favoriteIndex = CLASSIFICATION_IN_FAVORITES;
- } else if (pc.favoriteIndex > 0) {
- pc.favoriteIndex--;
- }
+ TaggingPreset preset = selector.getSelectedPreset();
+ if (preset != null) {
+ preset.actionPerformed(null);
}
- preset.actionPerformed(null);
- }
-
- SEARCH_IN_TAGS.put(ckSearchInTags.isSelected());
- if (ckOnlyApplicable.isEnabled()) {
- ONLY_APPLICABLE.put(ckOnlyApplicable.isSelected());
}
+ selector.savePreferences();
}
-
-}
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
similarity index 65%
copy from src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
copy to src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
index 9a872b0..29c8383 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
@@ -1,472 +1,487 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.tagging;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.swing.AbstractListModel;
-import javax.swing.Action;
-import javax.swing.BoxLayout;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.Icon;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Item;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Key;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Role;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.Roles;
-
-public class TaggingPresetSearchDialog extends ExtendedDialog implements SelectionChangedListener {
-
- private static final int CLASSIFICATION_IN_FAVORITES = 300;
- private static final int CLASSIFICATION_NAME_MATCH = 300;
- private static final int CLASSIFICATION_GROUP_MATCH = 200;
- private static final int CLASSIFICATION_TAGS_MATCH = 100;
-
- private static final BooleanProperty SEARCH_IN_TAGS = new BooleanProperty("taggingpreset.dialog.search-in-tags", true);
- private static final BooleanProperty ONLY_APPLICABLE = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true);
-
- private static class ResultListCellRenderer extends DefaultListCellRenderer {
- @Override
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
- boolean cellHasFocus) {
- JLabel result = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
- TaggingPreset tp = (TaggingPreset)value;
- result.setText(tp.getName());
- result.setIcon((Icon) tp.getValue(Action.SMALL_ICON));
- return result;
- }
- }
-
- private static class ResultListModel extends AbstractListModel {
-
- private List<PresetClasification> presets = new ArrayList<PresetClasification>();
-
- public void setPresets(List<PresetClasification> presets) {
- this.presets = presets;
- fireContentsChanged(this, 0, Integer.MAX_VALUE);
- }
-
- public List<PresetClasification> getPresets() {
- return presets;
- }
-
- @Override
- public Object getElementAt(int index) {
- return presets.get(index).preset;
- }
-
- @Override
- public int getSize() {
- return presets.size();
- }
-
- }
-
- private static class PresetClasification implements Comparable<PresetClasification> {
- public final TaggingPreset preset;
- public int classification;
- public int favoriteIndex;
- private final Collection<String> groups = new HashSet<String>();
- private final Collection<String> names = new HashSet<String>();
- private final Collection<String> tags = new HashSet<String>();
-
- PresetClasification(TaggingPreset preset) {
- this.preset = preset;
- TaggingPreset group = preset.group;
- while (group != null) {
- for (String word: group.getLocaleName().toLowerCase().split("\\s")) {
- groups.add(word);
- }
- group = group.group;
- }
- for (String word: preset.getLocaleName().toLowerCase().split("\\s")) {
- names.add(word);
- }
- for (Item item: preset.data) {
- if (item instanceof TaggingPreset.KeyedItem) {
- tags.add(((TaggingPreset.KeyedItem) item).key);
- // Should combo values also be added?
- if (item instanceof Key && ((Key) item).value != null) {
- tags.add(((Key) item).value);
- }
- } else if (item instanceof Roles) {
- for (Role role : ((Roles) item).roles) {
- tags.add(role.key);
- }
- }
- }
- }
-
- private int isMatching(Collection<String> values, String[] searchString) {
- int sum = 0;
- for (String word: searchString) {
- boolean found = false;
- boolean foundFirst = false;
- for (String value: values) {
- int index = value.indexOf(word);
- if (index == 0) {
- foundFirst = true;
- break;
- } else if (index > 0) {
- found = true;
- }
- }
- if (foundFirst) {
- sum += 2;
- } else if (found) {
- sum += 1;
- } else
- return 0;
- }
- return sum;
- }
-
- int isMatchingGroup(String[] words) {
- return isMatching(groups, words);
- }
-
- int isMatchingName(String[] words) {
- return isMatching(names, words);
- }
-
- int isMatchingTags(String[] words) {
- return isMatching(tags, words);
- }
-
- @Override
- public int compareTo(PresetClasification o) {
- int result = o.classification - classification;
- if (result == 0)
- return preset.getName().compareTo(o.preset.getName());
- else
- return result;
- }
-
- @Override
- public String toString() {
- return classification + " " + preset.toString();
- }
- }
-
- private static TaggingPresetSearchDialog instance;
- public static TaggingPresetSearchDialog getInstance() {
- if (instance == null) {
- instance = new TaggingPresetSearchDialog();
- }
- return instance;
- }
-
- private JTextField edSearchText;
- private JList lsResult;
- private JCheckBox ckOnlyApplicable;
- private JCheckBox ckSearchInTags;
- private final EnumSet<PresetType> typesInSelection = EnumSet.noneOf(PresetType.class);
- private boolean typesInSelectionDirty = true;
- private final List<PresetClasification> classifications = new ArrayList<PresetClasification>();
- private ResultListModel lsResultModel = new ResultListModel();
-
- private TaggingPresetSearchDialog() {
- super(Main.parent, tr("Presets"), new String[] {tr("Select"), tr("Cancel")});
- DataSet.addSelectionListener(this);
-
- for (TaggingPreset preset: TaggingPresetPreference.taggingPresets) {
- if (preset instanceof TaggingPresetSeparator || preset instanceof TaggingPresetMenu) {
- continue;
- }
-
- classifications.add(new PresetClasification(preset));
- }
-
- build();
- filterPresets();
- }
-
- @Override
- public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
- typesInSelectionDirty = true;
- }
-
- @Override
- public ExtendedDialog showDialog() {
-
- ckOnlyApplicable.setEnabled(!getTypesInSelection().isEmpty());
- ckOnlyApplicable.setSelected(!getTypesInSelection().isEmpty() && ONLY_APPLICABLE.get());
- edSearchText.setText("");
- filterPresets();
-
- super.showDialog();
- lsResult.getSelectionModel().clearSelection();
- return this;
- }
-
- private void build() {
- JPanel content = new JPanel();
- content.setLayout(new BorderLayout());
-
- edSearchText = new JTextField();
- edSearchText.getDocument().addDocumentListener(new DocumentListener() {
-
- @Override
- public void removeUpdate(DocumentEvent e) {
- filterPresets();
- }
-
- @Override
- public void insertUpdate(DocumentEvent e) {
- filterPresets();
-
- }
-
- @Override
- public void changedUpdate(DocumentEvent e) {
- filterPresets();
-
- }
- });
- edSearchText.addKeyListener(new KeyAdapter() {
- @Override
- public void keyPressed(KeyEvent e) {
- switch (e.getKeyCode()) {
- case KeyEvent.VK_DOWN:
- selectPreset(lsResult.getSelectedIndex() + 1);
- break;
- case KeyEvent.VK_UP:
- selectPreset(lsResult.getSelectedIndex() - 1);
- break;
- case KeyEvent.VK_PAGE_DOWN:
- selectPreset(lsResult.getSelectedIndex() + 10);
- break;
- case KeyEvent.VK_PAGE_UP:
- selectPreset(lsResult.getSelectedIndex() - 10);
- break;
- case KeyEvent.VK_HOME:
- selectPreset(0);
- break;
- case KeyEvent.VK_END:
- selectPreset(lsResultModel.getSize());
- break;
- }
- }
- });
- content.add(edSearchText, BorderLayout.NORTH);
-
- lsResult = new JList();
- lsResult.setModel(lsResultModel);
- lsResult.setCellRenderer(new ResultListCellRenderer());
- lsResult.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent e) {
- if (e.getClickCount()>1) {
- buttonAction(0, null);
- }
- }
- });
- content.add(new JScrollPane(lsResult), BorderLayout.CENTER);
-
- JPanel pnChecks = new JPanel();
- pnChecks.setLayout(new BoxLayout(pnChecks, BoxLayout.Y_AXIS));
-
- ckOnlyApplicable = new JCheckBox();
- ckOnlyApplicable.setText(tr("Show only applicable to selection"));
- pnChecks.add(ckOnlyApplicable);
- ckOnlyApplicable.addItemListener(new ItemListener() {
- @Override
- public void itemStateChanged(ItemEvent e) {
- filterPresets();
- }
- });
-
- ckSearchInTags = new JCheckBox();
- ckSearchInTags.setText(tr("Search in tags"));
- ckSearchInTags.setSelected(SEARCH_IN_TAGS.get());
- ckSearchInTags.addItemListener(new ItemListener() {
- @Override
- public void itemStateChanged(ItemEvent e) {
- filterPresets();
- }
- });
- pnChecks.add(ckSearchInTags);
-
- content.add(pnChecks, BorderLayout.SOUTH);
-
- content.setPreferredSize(new Dimension(400, 300));
- setContent(content);
- }
-
- private void selectPreset(int newIndex) {
- if (newIndex < 0) {
- newIndex = 0;
- }
- if (newIndex > lsResultModel.getSize() - 1) {
- newIndex = lsResultModel.getSize() - 1;
- }
- lsResult.setSelectedIndex(newIndex);
- lsResult.ensureIndexIsVisible(newIndex);
- }
-
- /**
- * Search expression can be in form: "group1/group2/name" where names can contain multiple words
- *
- * When groups are given,
- *
- *
- * @param text
- */
- private void filterPresets() {
- //TODO Save favorites to file
- String text = edSearchText.getText().toLowerCase();
-
- String[] groupWords;
- String[] nameWords;
-
- if (text.contains("/")) {
- groupWords = text.substring(0, text.lastIndexOf('/')).split("[\\s/]");
- nameWords = text.substring(text.indexOf('/') + 1).split("\\s");
- } else {
- groupWords = null;
- nameWords = text.split("\\s");
- }
-
- boolean onlyApplicable = ckOnlyApplicable.isSelected();
- boolean inTags = ckSearchInTags.isSelected();
-
- List<PresetClasification> result = new ArrayList<PresetClasification>();
- PRESET_LOOP:
- for (PresetClasification presetClasification: classifications) {
- TaggingPreset preset = presetClasification.preset;
- presetClasification.classification = 0;
-
- if (onlyApplicable && preset.types != null) {
- boolean found = false;
- for (PresetType type: preset.types) {
- if (getTypesInSelection().contains(type)) {
- found = true;
- break;
- }
- }
- if (!found) {
- continue;
- }
- }
-
-
-
- if (groupWords != null && presetClasification.isMatchingGroup(groupWords) == 0) {
- continue PRESET_LOOP;
- }
-
- int matchName = presetClasification.isMatchingName(nameWords);
-
- if (matchName == 0) {
- if (groupWords == null) {
- int groupMatch = presetClasification.isMatchingGroup(nameWords);
- if (groupMatch > 0) {
- presetClasification.classification = CLASSIFICATION_GROUP_MATCH + groupMatch;
- }
- }
- if (presetClasification.classification == 0 && inTags) {
- int tagsMatch = presetClasification.isMatchingTags(nameWords);
- if (tagsMatch > 0) {
- presetClasification.classification = CLASSIFICATION_TAGS_MATCH + tagsMatch;
- }
- }
- } else {
- presetClasification.classification = CLASSIFICATION_NAME_MATCH + matchName;
- }
-
- if (presetClasification.classification > 0) {
- presetClasification.classification += presetClasification.favoriteIndex;
- result.add(presetClasification);
- }
- }
-
- Collections.sort(result);
- lsResultModel.setPresets(result);
- if (!buttons.isEmpty()) {
- buttons.get(0).setEnabled(!result.isEmpty());
- }
- }
-
- private EnumSet<PresetType> getTypesInSelection() {
- if (typesInSelectionDirty) {
- synchronized (typesInSelection) {
- typesInSelectionDirty = false;
- typesInSelection.clear();
- for (OsmPrimitive primitive : Main.main.getCurrentDataSet().getSelected()) {
- if (primitive instanceof Node) {
- typesInSelection.add(PresetType.NODE);
- } else if (primitive instanceof Way) {
- typesInSelection.add(PresetType.WAY);
- if (((Way) primitive).isClosed()) {
- typesInSelection.add(PresetType.CLOSEDWAY);
- }
- } else if (primitive instanceof Relation) {
- typesInSelection.add(PresetType.RELATION);
- }
- }
- }
- }
- return typesInSelection;
- }
-
- @Override
- protected void buttonAction(int buttonIndex, ActionEvent evt) {
- super.buttonAction(buttonIndex, evt);
- if (buttonIndex == 0) {
- int selectPreset = lsResult.getSelectedIndex();
- if (selectPreset == -1) {
- selectPreset = 0;
- }
- TaggingPreset preset = lsResultModel.getPresets().get(selectPreset).preset;
- for (PresetClasification pc: classifications) {
- if (pc.preset == preset) {
- pc.favoriteIndex = CLASSIFICATION_IN_FAVORITES;
- } else if (pc.favoriteIndex > 0) {
- pc.favoriteIndex--;
- }
- }
- preset.actionPerformed(null);
- }
-
- SEARCH_IN_TAGS.put(ckSearchInTags.isSelected());
- if (ckOnlyApplicable.isEnabled()) {
- ONLY_APPLICABLE.put(ckOnlyApplicable.isSelected());
- }
- }
-
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import javax.swing.AbstractListModel;
+import javax.swing.Action;
+import javax.swing.BoxLayout;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.Icon;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Key;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.KeyedItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Roles;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+/**
+ * GUI component to select tagging preset: the list with filter and two checkboxes
+ * @since 6068
+ */
+public class TaggingPresetSelector extends JPanel implements SelectionChangedListener {
+
+ private static final int CLASSIFICATION_IN_FAVORITES = 300;
+ private static final int CLASSIFICATION_NAME_MATCH = 300;
+ private static final int CLASSIFICATION_GROUP_MATCH = 200;
+ private static final int CLASSIFICATION_TAGS_MATCH = 100;
+
+ private static final BooleanProperty SEARCH_IN_TAGS = new BooleanProperty("taggingpreset.dialog.search-in-tags", true);
+ private static final BooleanProperty ONLY_APPLICABLE = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true);
+
+
+ private JosmTextField edSearchText;
+ private JList lsResult;
+ private JCheckBox ckOnlyApplicable;
+ private JCheckBox ckSearchInTags;
+ private final EnumSet<TaggingPresetType> typesInSelection = EnumSet.noneOf(TaggingPresetType.class);
+ private boolean typesInSelectionDirty = true;
+ private final List<PresetClassification> classifications = new ArrayList<PresetClassification>();
+ private ResultListModel lsResultModel = new ResultListModel();
+
+ private ActionListener dblClickListener;
+ private ActionListener clickListener;
+
+ private static class ResultListCellRenderer extends DefaultListCellRenderer {
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
+ boolean cellHasFocus) {
+ JLabel result = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+ TaggingPreset tp = (TaggingPreset)value;
+ result.setText(tp.getName());
+ result.setIcon((Icon) tp.getValue(Action.SMALL_ICON));
+ return result;
+ }
+ }
+
+ private static class ResultListModel extends AbstractListModel {
+
+ private List<PresetClassification> presets = new ArrayList<PresetClassification>();
+
+ public void setPresets(List<PresetClassification> presets) {
+ this.presets = presets;
+ fireContentsChanged(this, 0, Integer.MAX_VALUE);
+ }
+
+ public List<PresetClassification> getPresets() {
+ return presets;
+ }
+
+ @Override
+ public Object getElementAt(int index) {
+ return presets.get(index).preset;
+ }
+
+ @Override
+ public int getSize() {
+ return presets.size();
+ }
+
+ }
+
+ private static class PresetClassification implements Comparable<PresetClassification> {
+ public final TaggingPreset preset;
+ public int classification;
+ public int favoriteIndex;
+ private final Collection<String> groups = new HashSet<String>();
+ private final Collection<String> names = new HashSet<String>();
+ private final Collection<String> tags = new HashSet<String>();
+
+ PresetClassification(TaggingPreset preset) {
+ this.preset = preset;
+ TaggingPreset group = preset.group;
+ while (group != null) {
+ Collections.addAll(groups, group.getLocaleName().toLowerCase().split("\\s"));
+ group = group.group;
+ }
+ Collections.addAll(names, preset.getLocaleName().toLowerCase().split("\\s"));
+ for (TaggingPresetItem item: preset.data) {
+ if (item instanceof KeyedItem) {
+ tags.add(((KeyedItem) item).key);
+ if (item instanceof TaggingPresetItems.ComboMultiSelect) {
+ final TaggingPresetItems.ComboMultiSelect cms = (TaggingPresetItems.ComboMultiSelect) item;
+ if (Boolean.parseBoolean(cms.values_searchable)) {
+ tags.addAll(cms.getDisplayValues());
+ }
+ }
+ if (item instanceof Key && ((Key) item).value != null) {
+ tags.add(((Key) item).value);
+ }
+ } else if (item instanceof Roles) {
+ for (Role role : ((Roles) item).roles) {
+ tags.add(role.key);
+ }
+ }
+ }
+ }
+
+ private int isMatching(Collection<String> values, String[] searchString) {
+ int sum = 0;
+ for (String word: searchString) {
+ boolean found = false;
+ boolean foundFirst = false;
+ for (String value: values) {
+ int index = value.toLowerCase().indexOf(word);
+ if (index == 0) {
+ foundFirst = true;
+ break;
+ } else if (index > 0) {
+ found = true;
+ }
+ }
+ if (foundFirst) {
+ sum += 2;
+ } else if (found) {
+ sum += 1;
+ } else
+ return 0;
+ }
+ return sum;
+ }
+
+ int isMatchingGroup(String[] words) {
+ return isMatching(groups, words);
+ }
+
+ int isMatchingName(String[] words) {
+ return isMatching(names, words);
+ }
+
+ int isMatchingTags(String[] words) {
+ return isMatching(tags, words);
+ }
+
+ @Override
+ public int compareTo(PresetClassification o) {
+ int result = o.classification - classification;
+ if (result == 0)
+ return preset.getName().compareTo(o.preset.getName());
+ else
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return classification + " " + preset.toString();
+ }
+ }
+
+ /**
+ * Constructs a new {@code TaggingPresetSelector}.
+ */
+ public TaggingPresetSelector() {
+ super(new BorderLayout());
+ if (TaggingPresetPreference.taggingPresets!=null) {
+ loadPresets(TaggingPresetPreference.taggingPresets);
+ }
+
+ edSearchText = new JosmTextField();
+ edSearchText.getDocument().addDocumentListener(new DocumentListener() {
+ @Override public void removeUpdate(DocumentEvent e) { filterPresets(); }
+ @Override public void insertUpdate(DocumentEvent e) { filterPresets(); }
+ @Override public void changedUpdate(DocumentEvent e) { filterPresets(); }
+ });
+ edSearchText.addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyPressed(KeyEvent e) {
+ switch (e.getKeyCode()) {
+ case KeyEvent.VK_DOWN:
+ selectPreset(lsResult.getSelectedIndex() + 1);
+ break;
+ case KeyEvent.VK_UP:
+ selectPreset(lsResult.getSelectedIndex() - 1);
+ break;
+ case KeyEvent.VK_PAGE_DOWN:
+ selectPreset(lsResult.getSelectedIndex() + 10);
+ break;
+ case KeyEvent.VK_PAGE_UP:
+ selectPreset(lsResult.getSelectedIndex() - 10);
+ break;
+ case KeyEvent.VK_HOME:
+ selectPreset(0);
+ break;
+ case KeyEvent.VK_END:
+ selectPreset(lsResultModel.getSize());
+ break;
+ }
+ }
+ });
+ add(edSearchText, BorderLayout.NORTH);
+
+ lsResult = new JList();
+ lsResult.setModel(lsResultModel);
+ lsResult.setCellRenderer(new ResultListCellRenderer());
+ lsResult.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount()>1) {
+ if (dblClickListener!=null)
+ dblClickListener.actionPerformed(null);
+ } else {
+ if (clickListener!=null)
+ clickListener.actionPerformed(null);
+ }
+ }
+ });
+ add(new JScrollPane(lsResult), BorderLayout.CENTER);
+
+ JPanel pnChecks = new JPanel();
+ pnChecks.setLayout(new BoxLayout(pnChecks, BoxLayout.Y_AXIS));
+
+ ckOnlyApplicable = new JCheckBox();
+ ckOnlyApplicable.setText(tr("Show only applicable to selection"));
+ pnChecks.add(ckOnlyApplicable);
+ ckOnlyApplicable.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ filterPresets();
+ }
+ });
+
+ ckSearchInTags = new JCheckBox();
+ ckSearchInTags.setText(tr("Search in tags"));
+ ckSearchInTags.setSelected(SEARCH_IN_TAGS.get());
+ ckSearchInTags.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ filterPresets();
+ }
+ });
+ pnChecks.add(ckSearchInTags);
+
+ add(pnChecks, BorderLayout.SOUTH);
+
+ setPreferredSize(new Dimension(400, 300));
+
+ filterPresets();
+ }
+
+ private void selectPreset(int newIndex) {
+ if (newIndex < 0) {
+ newIndex = 0;
+ }
+ if (newIndex > lsResultModel.getSize() - 1) {
+ newIndex = lsResultModel.getSize() - 1;
+ }
+ lsResult.setSelectedIndex(newIndex);
+ lsResult.ensureIndexIsVisible(newIndex);
+ }
+
+ /**
+ * Search expression can be in form: "group1/group2/name" where names can contain multiple words
+ */
+ private void filterPresets() {
+ //TODO Save favorites to file
+ String text = edSearchText.getText().toLowerCase();
+
+ String[] groupWords;
+ String[] nameWords;
+
+ if (text.contains("/")) {
+ groupWords = text.substring(0, text.lastIndexOf('/')).split("[\\s/]");
+ nameWords = text.substring(text.indexOf('/') + 1).split("\\s");
+ } else {
+ groupWords = null;
+ nameWords = text.split("\\s");
+ }
+
+ boolean onlyApplicable = ckOnlyApplicable.isSelected();
+ boolean inTags = ckSearchInTags.isSelected();
+
+ List<PresetClassification> result = new ArrayList<PresetClassification>();
+ PRESET_LOOP:
+ for (PresetClassification presetClasification: classifications) {
+ TaggingPreset preset = presetClasification.preset;
+ presetClasification.classification = 0;
+
+ if (onlyApplicable && preset.types != null) {
+ boolean found = false;
+ for (TaggingPresetType type: preset.types) {
+ if (getTypesInSelection().contains(type)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ continue;
+ }
+ }
+
+ if (groupWords != null && presetClasification.isMatchingGroup(groupWords) == 0) {
+ continue PRESET_LOOP;
+ }
+
+ int matchName = presetClasification.isMatchingName(nameWords);
+
+ if (matchName == 0) {
+ if (groupWords == null) {
+ int groupMatch = presetClasification.isMatchingGroup(nameWords);
+ if (groupMatch > 0) {
+ presetClasification.classification = CLASSIFICATION_GROUP_MATCH + groupMatch;
+ }
+ }
+ if (presetClasification.classification == 0 && inTags) {
+ int tagsMatch = presetClasification.isMatchingTags(nameWords);
+ if (tagsMatch > 0) {
+ presetClasification.classification = CLASSIFICATION_TAGS_MATCH + tagsMatch;
+ }
+ }
+ } else {
+ presetClasification.classification = CLASSIFICATION_NAME_MATCH + matchName;
+ }
+
+ if (presetClasification.classification > 0) {
+ presetClasification.classification += presetClasification.favoriteIndex;
+ result.add(presetClasification);
+ }
+ }
+
+ Collections.sort(result);
+ lsResultModel.setPresets(result);
+
+ }
+
+ private EnumSet<TaggingPresetType> getTypesInSelection() {
+ if (typesInSelectionDirty) {
+ synchronized (typesInSelection) {
+ typesInSelectionDirty = false;
+ typesInSelection.clear();
+ if (Main.main==null || Main.main.getCurrentDataSet() == null) return typesInSelection;
+ for (OsmPrimitive primitive : Main.main.getCurrentDataSet().getSelected()) {
+ if (primitive instanceof Node) {
+ typesInSelection.add(TaggingPresetType.NODE);
+ } else if (primitive instanceof Way) {
+ typesInSelection.add(TaggingPresetType.WAY);
+ if (((Way) primitive).isClosed()) {
+ typesInSelection.add(TaggingPresetType.CLOSEDWAY);
+ }
+ } else if (primitive instanceof Relation) {
+ typesInSelection.add(TaggingPresetType.RELATION);
+ }
+ }
+ }
+ }
+ return typesInSelection;
+ }
+
+ @Override
+ public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+ typesInSelectionDirty = true;
+ }
+
+ public void init() {
+ ckOnlyApplicable.setEnabled(!getTypesInSelection().isEmpty());
+ ckOnlyApplicable.setSelected(!getTypesInSelection().isEmpty() && ONLY_APPLICABLE.get());
+ edSearchText.setText("");
+ filterPresets();
+ }
+
+ public void init(Collection<TaggingPreset> presets) {
+ classifications.clear();
+ loadPresets(presets);
+ init();
+ }
+
+
+ public void clearSelection() {
+ lsResult.getSelectionModel().clearSelection();
+ }
+
+ /**
+ * Save checkbox values in preferences for future reuse
+ */
+ public void savePreferences() {
+ SEARCH_IN_TAGS.put(ckSearchInTags.isSelected());
+ if (ckOnlyApplicable.isEnabled()) {
+ ONLY_APPLICABLE.put(ckOnlyApplicable.isSelected());
+ }
+ }
+
+ /**
+ * Determines, which preset is selected at the current moment
+ * @return selected preset (as action)
+ */
+ public TaggingPreset getSelectedPreset() {
+ List<PresetClassification> presets = lsResultModel.getPresets();
+ if (presets.isEmpty()) return null;
+ int idx = lsResult.getSelectedIndex();
+ if (idx == -1) {
+ idx = 0;
+ }
+ TaggingPreset preset = presets.get(idx).preset;
+ for (PresetClassification pc: classifications) {
+ if (pc.preset == preset) {
+ pc.favoriteIndex = CLASSIFICATION_IN_FAVORITES;
+ } else if (pc.favoriteIndex > 0) {
+ pc.favoriteIndex--;
+ }
+ }
+ return preset;
+ }
+
+ private void loadPresets(Collection<TaggingPreset> presets) {
+ for (TaggingPreset preset: presets) {
+ if (preset instanceof TaggingPresetSeparator || preset instanceof TaggingPresetMenu) {
+ continue;
+ }
+ classifications.add(new PresetClassification(preset));
+ }
+ }
+
+ public void setSelectedPreset(TaggingPreset p) {
+ lsResult.setSelectedValue(p, true);
+ }
+
+ public int getItemCount() {
+ return lsResultModel.getSize();
+ }
+
+ public void setDblClickListener(ActionListener dblClickListener) {
+ this.dblClickListener = dblClickListener;
+ }
+
+ public void setClickListener(ActionListener clickListener) {
+ this.clickListener = clickListener;
+ }
+
+ public void addSelectionListener(final ActionListener selectListener) {
+ lsResult.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ if (!e.getValueIsAdjusting())
+ selectListener.actionPerformed(null);
+ }
+ });
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java
index efd7fa0..5536af8 100644
--- a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java
@@ -1,6 +1,11 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.tagging;
+/**
+ * Class used to represent a {@link javax.swing.JSeparator} inside tagging preset menu.
+ * @since 895
+ */
public class TaggingPresetSeparator extends TaggingPreset {
+ @Override
public void setDisplayName() {}
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java
new file mode 100644
index 0000000..54b3df1
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java
@@ -0,0 +1,51 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+
+/**
+ * Enumeration of OSM primitive types associated with names and icons
+ * @since 6068
+ */
+public enum TaggingPresetType {
+ NODE("Mf_node", "node"), WAY("Mf_way", "way"), RELATION("Mf_relation", "relation"), CLOSEDWAY("Mf_closedway", "closedway");
+ private final String iconName;
+ private final String name;
+
+ TaggingPresetType(String iconName, String name) {
+ this.iconName = iconName;
+ this.name = name;
+ }
+
+ public String getIconName() {
+ return iconName;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public static TaggingPresetType forPrimitive(OsmPrimitive p) {
+ return forPrimitiveType(p.getDisplayType());
+ }
+
+ public static TaggingPresetType forPrimitiveType(OsmPrimitiveType type) {
+ if (type == OsmPrimitiveType.NODE) return NODE;
+ if (type == OsmPrimitiveType.WAY) return WAY;
+ if (type == OsmPrimitiveType.CLOSEDWAY) return CLOSEDWAY;
+ if (type == OsmPrimitiveType.RELATION || type == OsmPrimitiveType.MULTIPOLYGON)
+ return RELATION;
+ throw new IllegalArgumentException("Unexpected primitive type: " + type);
+ }
+
+ public static TaggingPresetType fromString(String type) {
+ for (TaggingPresetType t : TaggingPresetType.values()) {
+ if (t.getName().equals(type)) {
+ return t;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
index aa1cf67..cde4d63 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.tagging.ac;
import java.awt.Component;
@@ -168,8 +168,10 @@ public class AutoCompletingComboBox extends JosmComboBox {
editor.setDocument(new AutoCompletingComboBoxDocument(this));
editor.addFocusListener(
new FocusListener() {
+ @Override
public void focusLost(FocusEvent e) {
}
+ @Override
public void focusGained(FocusEvent e) {
// save unix system selection (middle mouse paste)
Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
@@ -227,7 +229,7 @@ public class AutoCompletingComboBox extends JosmComboBox {
return;
}
}
- super.setSelectedItem(new AutoCompletionListItem(s, AutoCompletionItemPritority.UNKNOWN));
+ super.setSelectedItem(new AutoCompletionListItem(s, AutoCompletionItemPriority.UNKNOWN));
} else
throw new IllegalArgumentException();
}
@@ -240,7 +242,7 @@ public class AutoCompletingComboBox extends JosmComboBox {
Object oldValue = this.getEditor().getItem(); // Do not use getSelectedItem(); (fix #8013)
model.removeAllElements();
for (String elem : elems) {
- model.addElement(new AutoCompletionListItem(elem, AutoCompletionItemPritority.UNKNOWN));
+ model.addElement(new AutoCompletionListItem(elem, AutoCompletionItemPriority.UNKNOWN));
}
// disable autocomplete to prevent unnecessary actions in
// AutoCompletingComboBoxDocument#insertString
@@ -285,7 +287,7 @@ public class AutoCompletingComboBox extends JosmComboBox {
}
private static InputContext privateInputContext = InputContext.getInstance();
-
+
@Override
public InputContext getInputContext() {
if (useFixedLocale) {
@@ -304,6 +306,7 @@ public class AutoCompletingComboBox extends JosmComboBox {
setOpaque(true);
}
+ @Override
public Component getListCellRendererComponent(
JList list,
Object value,
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
index 1220f07..8b1a283 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
@@ -10,7 +10,6 @@ import java.util.EventObject;
import javax.swing.ComboBoxEditor;
import javax.swing.JTable;
-import javax.swing.JTextField;
import javax.swing.event.CellEditorListener;
import javax.swing.table.TableCellEditor;
import javax.swing.text.AttributeSet;
@@ -21,6 +20,8 @@ import javax.swing.text.StyleConstants;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.util.TableCellEditorSupport;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
+
/**
* AutoCompletingTextField is an text field with autocompletion behaviour. It
@@ -31,10 +32,10 @@ import org.openstreetmap.josm.gui.util.TableCellEditorSupport;
*
*
*/
-public class AutoCompletingTextField extends JTextField implements ComboBoxEditor, TableCellEditor {
+public class AutoCompletingTextField extends JosmTextField implements ComboBoxEditor, TableCellEditor {
private Integer maxChars;
-
+
/**
* The document model for the editor
*/
@@ -46,7 +47,7 @@ public class AutoCompletingTextField extends JTextField implements ComboBoxEdito
*/
@Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
-
+
// If a maximum number of characters is specified, avoid to exceed it
if (maxChars != null && str != null && getLength() + str.length() > maxChars) {
int allowedLength = maxChars-getLength();
@@ -56,7 +57,7 @@ public class AutoCompletingTextField extends JTextField implements ComboBoxEdito
return;
}
}
-
+
if (autoCompletionList == null) {
super.insertString(offs, str, a);
return;
@@ -148,7 +149,7 @@ public class AutoCompletingTextField extends JTextField implements ComboBoxEdito
@Override
public void keyReleased(KeyEvent e) {
- if (getText().equals("")) {
+ if (getText().isEmpty()) {
applyFilter("");
}
}
@@ -192,14 +193,17 @@ public class AutoCompletingTextField extends JTextField implements ComboBoxEdito
this.autoCompletionList = autoCompletionList;
}
+ @Override
public Component getEditorComponent() {
return this;
}
+ @Override
public Object getItem() {
return getText();
}
+ @Override
public void setItem(Object anObject) {
if (anObject == null) {
setText("");
@@ -224,6 +228,7 @@ public class AutoCompletingTextField extends JTextField implements ComboBoxEdito
private TableCellEditorSupport tableCellEditorSupport;
private String originalValue;
+ @Override
public void addCellEditorListener(CellEditorListener l) {
tableCellEditorSupport.addCellEditorListener(l);
}
@@ -236,32 +241,39 @@ public class AutoCompletingTextField extends JTextField implements ComboBoxEdito
setText(originalValue);
}
+ @Override
public void removeCellEditorListener(CellEditorListener l) {
tableCellEditorSupport.removeCellEditorListener(l);
}
+ @Override
public void cancelCellEditing() {
restoreOriginalValue();
tableCellEditorSupport.fireEditingCanceled();
}
+ @Override
public Object getCellEditorValue() {
return getText();
}
+ @Override
public boolean isCellEditable(EventObject anEvent) {
return true;
}
+ @Override
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
+ @Override
public boolean stopCellEditing() {
tableCellEditorSupport.fireEditingStopped();
return true;
}
+ @Override
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
setText( value == null ? "" : value.toString());
rememberOriginalValue(getText());
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
similarity index 69%
rename from src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java
rename to src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
index f616fb4..6ffe16f 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
@@ -7,40 +7,40 @@ package org.openstreetmap.josm.gui.tagging.ac;
*
* Instances of this class are not modifiable.
*/
-public class AutoCompletionItemPritority implements Comparable<AutoCompletionItemPritority> {
+public class AutoCompletionItemPriority implements Comparable<AutoCompletionItemPriority> {
/**
* Indicates, that the value is standard and it is found in the data.
* This has higher priority than some arbitrary standard value that is
* usually not used by the user.
*/
- public static final AutoCompletionItemPritority IS_IN_STANDARD_AND_IN_DATASET = new AutoCompletionItemPritority(true, true, false);
+ public static final AutoCompletionItemPriority IS_IN_STANDARD_AND_IN_DATASET = new AutoCompletionItemPriority(true, true, false);
/**
* Indicates that this is an arbitrary value from the data set, i.e.
* the value of a tag name=*.
*/
- public static final AutoCompletionItemPritority IS_IN_DATASET = new AutoCompletionItemPritority(true, false, false);
+ public static final AutoCompletionItemPriority IS_IN_DATASET = new AutoCompletionItemPriority(true, false, false);
/**
* Indicates that this is a standard value, i.e. a standard tag name
* or a standard value for a given tag name (from the presets).
*/
- public static final AutoCompletionItemPritority IS_IN_STANDARD = new AutoCompletionItemPritority(false, true, false);
+ public static final AutoCompletionItemPriority IS_IN_STANDARD = new AutoCompletionItemPriority(false, true, false);
/**
* Indicates that this is a value from a selected object.
*/
- public static final AutoCompletionItemPritority IS_IN_SELECTION = new AutoCompletionItemPritority(false, false, true);
+ public static final AutoCompletionItemPriority IS_IN_SELECTION = new AutoCompletionItemPriority(false, false, true);
/** Unknown priority. This is the lowest priority. */
- public static final AutoCompletionItemPritority UNKNOWN = new AutoCompletionItemPritority(false, false, false);
+ public static final AutoCompletionItemPriority UNKNOWN = new AutoCompletionItemPriority(false, false, false);
private final boolean inDataSet;
private final boolean inStandard;
private final boolean selected;
- public AutoCompletionItemPritority(boolean inDataSet, boolean inStandard, boolean selected) {
+ public AutoCompletionItemPriority(boolean inDataSet, boolean inStandard, boolean selected) {
this.inDataSet = inDataSet;
this.inStandard = inStandard;
this.selected = selected;
@@ -62,7 +62,8 @@ public class AutoCompletionItemPritority implements Comparable<AutoCompletionIte
* Imposes an ordering on the priorities.
* Currently, being in the current DataSet is worth more than being in the Presets.
*/
- public int compareTo(AutoCompletionItemPritority other) {
+ @Override
+ public int compareTo(AutoCompletionItemPriority other) {
int sel = Boolean.valueOf(selected).compareTo(other.selected);
if (sel != 0) return sel;
@@ -79,8 +80,8 @@ public class AutoCompletionItemPritority implements Comparable<AutoCompletionIte
* Merges two priorities.
* The resulting priority is always >= the original ones.
*/
- public AutoCompletionItemPritority mergeWith(AutoCompletionItemPritority other) {
- return new AutoCompletionItemPritority(
+ public AutoCompletionItemPriority mergeWith(AutoCompletionItemPriority other) {
+ return new AutoCompletionItemPriority(
inDataSet || other.inDataSet,
inStandard || other.inStandard,
selected || other.selected);
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
index 0142307..5d18bb7 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
@@ -30,7 +30,7 @@ import javax.swing.table.AbstractTableModel;
public class AutoCompletionList extends AbstractTableModel {
/** the bare list of AutoCompletionItems */
- private ArrayList<AutoCompletionListItem> list = null;
+ private List<AutoCompletionListItem> list = null;
/** the filtered list of AutoCompletionItems */
private ArrayList<AutoCompletionListItem> filtered = null;
/** the filter expression */
@@ -131,10 +131,10 @@ public class AutoCompletionList extends AbstractTableModel {
* adds a list of strings to this list. Only strings which
* are not null and which do not exist yet in the list are added.
*
- * @param value a list of strings to add
+ * @param values a list of strings to add
* @param priority the priority to use
*/
- public void add(Collection<String> values, AutoCompletionItemPritority priority) {
+ public void add(Collection<String> values, AutoCompletionItemPriority priority) {
if (values == null) return;
for (String value: values) {
if (value == null) {
@@ -257,7 +257,7 @@ public class AutoCompletionList extends AbstractTableModel {
return filtered.get(idx);
}
- ArrayList<AutoCompletionListItem> getList() {
+ List<AutoCompletionListItem> getList() {
return list;
}
@@ -275,24 +275,19 @@ public class AutoCompletionList extends AbstractTableModel {
fireTableDataChanged();
}
+ @Override
public int getColumnCount() {
return 1;
}
+ @Override
public int getRowCount() {
return list == null ? 0 : getFilteredSize();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
return list == null ? null : getFilteredItem(rowIndex);
}
-
- public void dump() {
- System.out.println("---------------------------------");
- for (AutoCompletionListItem item: list) {
- System.out.println(item);
- }
- System.out.println("---------------------------------");
- }
}
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
index 1cafa48..108b50a 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
@@ -9,7 +9,7 @@ package org.openstreetmap.josm.gui.tagging.ac;
* The priority helps to sort the auto completion items according to their importance. For instance,
* in an auto completion list for tag names, standard tag names would be assigned a higher
* priority than arbitrary tag names present in the current data set. There are three priority levels,
- * {@link AutoCompletionItemPritority}.
+ * {@link AutoCompletionItemPriority}.
*
* The value is a string which will be displayed in the auto completion list.
*
@@ -17,47 +17,55 @@ package org.openstreetmap.josm.gui.tagging.ac;
public class AutoCompletionListItem implements Comparable<AutoCompletionListItem>{
/** the pritority of this item */
- private AutoCompletionItemPritority priority;
+ private AutoCompletionItemPriority priority;
/** the value of this item */
private String value;
/**
- * constructor
+ * Constructs a new {@code AutoCompletionListItem} with the given value and priority.
+ * @param value The value
+ * @param priority The priority
*/
- public AutoCompletionListItem(String value, AutoCompletionItemPritority priority) {
+ public AutoCompletionListItem(String value, AutoCompletionItemPriority priority) {
this.value = value;
this.priority = priority;
}
+ /**
+ * Constructs a new {@code AutoCompletionListItem} with the given value and unknown priority.
+ * @param value The value
+ */
public AutoCompletionListItem(String value) {
this.value = value;
- priority = AutoCompletionItemPritority.UNKNOWN;
+ priority = AutoCompletionItemPriority.UNKNOWN;
}
+ /**
+ * Constructs a new {@code AutoCompletionListItem}.
+ */
public AutoCompletionListItem() {
value = "";
- priority = AutoCompletionItemPritority.UNKNOWN;
+ priority = AutoCompletionItemPriority.UNKNOWN;
}
-
/**
- *
+ * Returns the priority.
* @return the priority
*/
- public AutoCompletionItemPritority getPriority() {
+ public AutoCompletionItemPriority getPriority() {
return priority;
}
/**
- * sets the priority
+ * Sets the priority.
* @param priority the priority
*/
- public void setPriority(AutoCompletionItemPritority priority) {
+ public void setPriority(AutoCompletionItemPriority priority) {
this.priority = priority;
}
/**
- *
+ * Returns the value.
* @return the value
*/
public String getValue() {
@@ -115,6 +123,7 @@ public class AutoCompletionListItem implements Comparable<AutoCompletionListItem
return true;
}
+ @Override
public int compareTo(AutoCompletionListItem other) {
int ret = other.priority.compareTo(priority); // higher priority items come first in the list
if (ret != 0)
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
index 2868f84..c75963c 100644
--- a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
+++ b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
@@ -11,9 +11,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmUtils;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -26,6 +26,8 @@ import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetItems;
import org.openstreetmap.josm.tools.MultiMap;
/**
@@ -147,16 +149,19 @@ public class AutoCompletionManager implements DataSetListener {
*/
public static void cachePresets(Collection<TaggingPreset> presets) {
for (final TaggingPreset p : presets) {
- for (TaggingPreset.Item item : p.data) {
- if (item instanceof TaggingPreset.KeyedItem) {
- TaggingPreset.KeyedItem ki = (TaggingPreset.KeyedItem) item;
- if (ki.key == null) {
- continue;
+ for (TaggingPresetItem item : p.data) {
+ if (item instanceof TaggingPresetItems.KeyedItem) {
+ TaggingPresetItems.KeyedItem ki = (TaggingPresetItems.KeyedItem) item;
+ if (ki.key != null && ki.getValues() != null) {
+ try {
+ presetTagCache.putAll(ki.key, ki.getValues());
+ } catch (NullPointerException e) {
+ Main.error(p+": Unable to cache "+ki);
+ }
}
- presetTagCache.putAll(ki.key, ki.getValues());
- } else if (item instanceof TaggingPreset.Roles) {
- TaggingPreset.Roles r = (TaggingPreset.Roles) item;
- for (TaggingPreset.Role i : r.roles) {
+ } else if (item instanceof TaggingPresetItems.Roles) {
+ TaggingPresetItems.Roles r = (TaggingPresetItems.Roles) item;
+ for (TaggingPresetItems.Role i : r.roles) {
if (i.key != null) {
presetRoleCache.add(i.key);
}
@@ -210,19 +215,19 @@ public class AutoCompletionManager implements DataSetListener {
* @param list the list to populate
*/
public void populateWithMemberRoles(AutoCompletionList list) {
- list.add(presetRoleCache, AutoCompletionItemPritority.IS_IN_STANDARD);
- list.add(getRoleCache(), AutoCompletionItemPritority.IS_IN_DATASET);
+ list.add(presetRoleCache, AutoCompletionItemPriority.IS_IN_STANDARD);
+ list.add(getRoleCache(), AutoCompletionItemPriority.IS_IN_DATASET);
}
/**
- * Populates the an {@link AutoCompletionList} with the currently cached
- * tag keys
+ * Populates the an {@link AutoCompletionList} with the currently cached tag keys
*
* @param list the list to populate
*/
public void populateWithKeys(AutoCompletionList list) {
- list.add(getPresetKeys(), AutoCompletionItemPritority.IS_IN_STANDARD);
- list.add(getDataKeys(), AutoCompletionItemPritority.IS_IN_DATASET);
+ list.add(getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD);
+ list.add(new AutoCompletionListItem("source", AutoCompletionItemPriority.IS_IN_STANDARD));
+ list.add(getDataKeys(), AutoCompletionItemPriority.IS_IN_DATASET);
}
/**
@@ -245,8 +250,8 @@ public class AutoCompletionManager implements DataSetListener {
*/
public void populateWithTagValues(AutoCompletionList list, List<String> keys) {
for (String key : keys) {
- list.add(getPresetValues(key), AutoCompletionItemPritority.IS_IN_STANDARD);
- list.add(getDataValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
+ list.add(getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD);
+ list.add(getDataValues(key), AutoCompletionItemPriority.IS_IN_DATASET);
}
}
@@ -285,16 +290,19 @@ public class AutoCompletionManager implements DataSetListener {
*
**/
+ @Override
public void primitivesAdded(PrimitivesAddedEvent event) {
if (dirty)
return;
cachePrimitives(event.getPrimitives());
}
+ @Override
public void primitivesRemoved(PrimitivesRemovedEvent event) {
dirty = true;
}
+ @Override
public void tagsChanged(TagsChangedEvent event) {
if (dirty)
return;
@@ -316,16 +324,21 @@ public class AutoCompletionManager implements DataSetListener {
}
}
+ @Override
public void nodeMoved(NodeMovedEvent event) {/* ignored */}
+ @Override
public void wayNodesChanged(WayNodesChangedEvent event) {/* ignored */}
+ @Override
public void relationMembersChanged(RelationMembersChangedEvent event) {
dirty = true; // TODO: not necessary to rebuid if a member is added
}
+ @Override
public void otherDatasetChange(AbstractDatasetChangedEvent event) {/* ignored */}
+ @Override
public void dataChanged(DataChangedEvent event) {
dirty = true;
}
diff --git a/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java b/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
similarity index 82%
rename from src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java
rename to src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
index 56241aa..3aa39c1 100644
--- a/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java
+++ b/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
@@ -1,5 +1,5 @@
// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.history;
+package org.openstreetmap.josm.gui.util;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10,6 +10,8 @@ import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Observable;
import java.util.Observer;
@@ -18,19 +20,21 @@ import javax.swing.JCheckBox;
import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
- * Synchronizes scrollbar adjustments between a set of
- * {@link Adjustable}s. Whenever the adjustment of one of
- * the registerd Adjustables is updated the adjustment of
- * the other registered Adjustables is adjusted too.
- *
+ * Synchronizes scrollbar adjustments between a set of {@link Adjustable}s.
+ * Whenever the adjustment of one of the registered Adjustables is updated
+ * the adjustment of the other registered Adjustables is adjusted too.
+ * @since 6147
*/
public class AdjustmentSynchronizer implements AdjustmentListener {
- private final ArrayList<Adjustable> synchronizedAdjustables;
- private final HashMap<Adjustable, Boolean> enabledMap;
+ private final List<Adjustable> synchronizedAdjustables;
+ private final Map<Adjustable, Boolean> enabledMap;
private final Observable observable;
+ /**
+ * Constructs a new {@code AdjustmentSynchronizer}
+ */
public AdjustmentSynchronizer() {
synchronizedAdjustables = new ArrayList<Adjustable>();
enabledMap = new HashMap<Adjustable, Boolean>();
@@ -38,8 +42,7 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
}
/**
- * registers an {@link Adjustable} for participation in synchronized
- * scrolling.
+ * Registers an {@link Adjustable} for participation in synchronized scrolling.
*
* @param adjustable the adjustable
*/
@@ -54,9 +57,9 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
}
/**
- * event handler for {@link AdjustmentEvent}s
- *
+ * Event handler for {@link AdjustmentEvent}s
*/
+ @Override
public void adjustmentValueChanged(AdjustmentEvent e) {
if (! enabledMap.get(e.getAdjustable()))
return;
@@ -68,8 +71,7 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
}
/**
- * sets whether adjustable participates in adjustment synchronization
- * or not
+ * Sets whether adjustable participates in adjustment synchronization or not
*
* @param adjustable the adjustable
*/
@@ -83,7 +85,7 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
}
/**
- * returns true if an adjustable is participating in synchronized scrolling
+ * Returns true if an adjustable is participating in synchronized scrolling
*
* @param adjustable the adjustable
* @return true, if the adjustable is participating in synchronized scrolling, false otherwise
@@ -97,7 +99,7 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
}
/**
- * wires a {@link JCheckBox} to the adjustment synchronizer, in such a way that:
+ * Wires a {@link JCheckBox} to the adjustment synchronizer, in such a way that:
* <li>
* <ol>state changes in the checkbox control whether the adjustable participates
* in synchronized adjustment</ol>
@@ -105,14 +107,12 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
* {@link JCheckBox}</ol>
* </li>
*
- *
- * @param view the checkbox to control whether an adjustable participates in synchronized
- * adjustment
+ * @param view the checkbox to control whether an adjustable participates in synchronized adjustment
* @param adjustable the adjustable
* @exception IllegalArgumentException thrown, if view is null
* @exception IllegalArgumentException thrown, if adjustable is null
*/
- protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalStateException {
+ public void adapt(final JCheckBox view, final Adjustable adjustable) {
CheckParameterUtil.ensureParameterNotNull(adjustable, "adjustable");
CheckParameterUtil.ensureParameterNotNull(view, "view");
@@ -123,6 +123,7 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
// register an item lister with the check box
//
view.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent e) {
switch(e.getStateChange()) {
case ItemEvent.SELECTED:
@@ -141,6 +142,7 @@ public class AdjustmentSynchronizer implements AdjustmentListener {
observable.addObserver(
new Observer() {
+ @Override
public void update(Observable o, Object arg) {
boolean sync = isParticipatingInSynchronizedScrolling(adjustable);
if (view.isSelected() != sync) {
diff --git a/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java b/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
index 7db5fc3..76538d0 100644
--- a/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
+++ b/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java
@@ -11,7 +11,7 @@ import javax.swing.filechooser.FileFilter;
* A FileFilter that accepts all files.
*/
public class FileFilterAllFiles extends FileFilter {
-
+
private static FileFilterAllFiles INSTANCE;
public static FileFilterAllFiles getInstance() {
diff --git a/src/org/openstreetmap/josm/gui/util/GuiHelper.java b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
index c46cfdb..30b4e0b 100644
--- a/src/org/openstreetmap/josm/gui/util/GuiHelper.java
+++ b/src/org/openstreetmap/josm/gui/util/GuiHelper.java
@@ -1,13 +1,15 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.util;
-import java.awt.BasicStroke;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.BasicStroke;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dialog;
import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
import java.awt.Image;
import java.awt.Stroke;
import java.awt.Toolkit;
@@ -17,6 +19,8 @@ import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
import java.awt.image.FilteredImageSource;
import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.List;
import javax.swing.GrayFilter;
import javax.swing.Icon;
@@ -32,7 +36,12 @@ import org.openstreetmap.josm.tools.ImageProvider;
/**
* basic gui utils
*/
-public class GuiHelper {
+public final class GuiHelper {
+
+ private GuiHelper() {
+ // Hide default constructor for utils classes
+ }
+
/**
* disable / enable a component and all its child components
*/
@@ -48,6 +57,15 @@ public class GuiHelper {
}
}
+ public static void executeByMainWorkerInEDT(final Runnable task) {
+ Main.worker.submit(new Runnable() {
+ @Override
+ public void run() {
+ runInEDTAndWait(task);
+ }
+ });
+ }
+
public static void runInEDT(Runnable task) {
if (SwingUtilities.isEventDispatchThread()) {
task.run();
@@ -69,7 +87,7 @@ public class GuiHelper {
}
}
}
-
+
/**
* returns true if the user wants to cancel, false if they
* want to continue
@@ -91,7 +109,7 @@ public class GuiHelper {
dlg.setCancelButton(1);
return dlg.showDialog().getValue() != 2;
}
-
+
/**
* Replies the disabled (grayed) version of the specified image.
* @param image The image to disable
@@ -112,7 +130,7 @@ public class GuiHelper {
public static final ImageIcon getDisabledIcon(ImageIcon icon) {
return new ImageIcon(getDisabledImage(icon.getImage()));
}
-
+
/**
* Attaches a {@code HierarchyListener} to the specified {@code Component} that
* will set its parent dialog resizeable. Use it before a call to JOptionPane#showXXXXDialog
@@ -125,6 +143,7 @@ public class GuiHelper {
public static final Component prepareResizeableOptionPane(final Component pane, final Dimension minDimension) {
if (pane != null) {
pane.addHierarchyListener(new HierarchyListener() {
+ @Override
public void hierarchyChanged(HierarchyEvent e) {
Window window = SwingUtilities.getWindowAncestor(pane);
if (window instanceof Dialog) {
@@ -141,7 +160,7 @@ public class GuiHelper {
}
return pane;
}
-
+
/**
* Schedules a new Timer to be run in the future (once or several times).
* @param initialDelay milliseconds for the initial and between-event delay if repeatable
@@ -156,16 +175,16 @@ public class GuiHelper {
timer.start();
return timer;
}
-
+
/**
* Return s new BasicStroke object with given thickness and style
- * @param code = 3.5 -> thickness=3.5px
- * @param code = 3.5 10 5 -> thickness=3.5px, dashed: 10px filled + 5px empty
+ * @param code = 3.5 -> thickness=3.5px; 3.5 10 5 -> thickness=3.5px, dashed: 10px filled + 5px empty
+ * @return stroke for drawing
*/
public static Stroke getCustomizedStroke(String code) {
String[] s = code.trim().split("[^\\.0-9]+");
-
- if (s.length==0) return new BasicStroke();
+
+ if (s.length==0) return new BasicStroke();
float w;
try {
w = Float.parseFloat(s[0]);
@@ -173,8 +192,7 @@ public class GuiHelper {
w = 1.0f;
}
if (s.length>1) {
- float dash[]= new float[s.length-1];
- boolean error = false;
+ float[] dash= new float[s.length-1];
float sumAbs = 0;
try {
for (int i=0; i<s.length-1; i++) {
@@ -182,11 +200,11 @@ public class GuiHelper {
sumAbs += Math.abs(dash[i]);
}
} catch (NumberFormatException ex) {
- System.err.println("Error in stroke preference format: "+code);
+ Main.error("Error in stroke preference format: "+code);
dash = new float[]{5.0f};
}
if (sumAbs < 1e-1) {
- System.err.println("Error in stroke dash fomat (all zeros): "+code);
+ Main.error("Error in stroke dash fomat (all zeros): "+code);
return new BasicStroke(w);
}
// dashed stroke
@@ -202,5 +220,30 @@ public class GuiHelper {
}
}
}
-
+
+ /**
+ * Gets the font used to display JOSM title in about dialog and splash screen.
+ * @return By order or priority, the first font available in local fonts:
+ * 1. Helvetica Bold 20
+ * 2. Calibri Bold 23
+ * 3. Arial Bold 20
+ * 4. SansSerif Bold 20
+ * @since 5797
+ */
+ public static Font getTitleFont() {
+ List<String> fonts = Arrays.asList(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
+ // Helvetica is the preferred choice but is not available by default on Windows
+ // (http://www.microsoft.com/typography/fonts/product.aspx?pid=161)
+ if (fonts.contains("Helvetica")) {
+ return new Font("Helvetica", Font.BOLD, 20);
+ // Calibri is the default Windows font since Windows Vista but is not available on older versions of Windows, where Arial is preferred
+ } else if (fonts.contains("Calibri")) {
+ return new Font("Calibri", Font.BOLD, 23);
+ } else if (fonts.contains("Arial")) {
+ return new Font("Arial", Font.BOLD, 20);
+ // No luck, nothing found, fallback to one of the 5 fonts provided with Java (Serif, SansSerif, Monospaced, Dialog, and DialogInput)
+ } else {
+ return new Font("SansSerif", Font.BOLD, 20);
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/util/HighlightHelper.java b/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
new file mode 100644
index 0000000..7752025
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
@@ -0,0 +1,136 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+
+/**
+ * This class stores the set of highlited primitives and
+ * allows easy and fast change of highlighting
+ */
+public class HighlightHelper {
+ Set<OsmPrimitive> highlightedPrimitives = new HashSet<OsmPrimitive>();
+
+ /**
+ * Highlight and remember given primitives
+ * @param prims - primitives to highlight/unhighlight
+ */
+ public boolean highlight(Collection <? extends OsmPrimitive> prims) {
+ return highlight(prims, false);
+ }
+
+ /**
+ * Highlight and remember given primitives
+ * @param prims - primitives to highlight/unhighlight
+ * @param only - remove previous highlighting
+ */
+ public boolean highlight(Collection <? extends OsmPrimitive> prims, boolean only) {
+ boolean needsRepaint = false;
+ if (only) {
+ Iterator<OsmPrimitive> it = highlightedPrimitives.iterator();
+ while (it.hasNext()) {
+ OsmPrimitive p = it.next();
+ if (!prims.contains(p)) {
+ p.setHighlighted(false);
+ it.remove();
+ needsRepaint = true;
+ }
+ }
+ }
+ for (OsmPrimitive p: prims) {
+ needsRepaint |= setHighlight(p, true);
+ }
+
+ return needsRepaint;
+ }
+
+ /**
+ * Highlight and remember given primitives, forgetting previously highlighted by this instance
+ * @param prims - primitives to highlight/unhighlight
+ */
+ public boolean highlightOnly(Collection <? extends OsmPrimitive> prims) {
+ return highlight(prims, true);
+ }
+
+ /**
+ * Highlight and remember given primitive, forgetting previously highlighted by this instance
+ * @param p - primitives to highlight/unhighlight
+ */
+ public boolean highlightOnly(OsmPrimitive p) {
+ return highlight(Collections.singleton(p), true);
+ }
+
+ /**
+ * Highlight and remember given primitive
+ * @param prims - primitives to highlight/unhighlight
+ * @param flag - true to highlight
+ */
+ public boolean setHighlight(OsmPrimitive p, boolean flag) {
+ return setHighlight(p, flag, new HashSet<Relation>());
+ }
+
+ private boolean setHighlight(OsmPrimitive p, boolean flag, Set<Relation> seenRelations) {
+ if (p instanceof Relation) {
+ Relation r = (Relation) p;
+ seenRelations.add(r);
+ boolean needRepaint = false;
+ for (OsmPrimitive m : r.getMemberPrimitives()) {
+ if (!(m instanceof Relation) || !seenRelations.contains(m)) {
+ needRepaint |= setHighlight(m, flag, seenRelations);
+ }
+ }
+ return needRepaint;
+ } else if (flag) {
+ if (highlightedPrimitives.add(p)) {
+ p.setHighlighted(true);
+ return true;
+ }
+ } else {
+ if (highlightedPrimitives.remove(p)) {
+ p.setHighlighted(false);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Clear highlighting of all remembered primitives
+ */
+ public void clear() {
+ for (OsmPrimitive p: highlightedPrimitives) {
+ p.setHighlighted(false);
+ }
+ highlightedPrimitives.clear();
+ }
+
+ /**
+ * Slow method to import all currently highlighted primitives into this instance
+ */
+ public void findAllHighlighted() {
+ DataSet ds = Main.main.getCurrentDataSet();
+ if (ds!=null) {
+ highlightedPrimitives.addAll( ds.allNonDeletedPrimitives() );
+ }
+ }
+
+ /**
+ * Slow method to remove highlights from all primitives
+ */
+ public static void clearAllHighlighted() {
+ DataSet ds = Main.main.getCurrentDataSet();
+ if (ds!=null) {
+ for (OsmPrimitive p: ds.allNonDeletedPrimitives()) {
+ p.setHighlighted(false);
+ }
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/util/RedirectInputMap.java b/src/org/openstreetmap/josm/gui/util/RedirectInputMap.java
index b062708..4fc5447 100644
--- a/src/org/openstreetmap/josm/gui/util/RedirectInputMap.java
+++ b/src/org/openstreetmap/josm/gui/util/RedirectInputMap.java
@@ -6,8 +6,6 @@ import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.KeyStroke;
-import org.openstreetmap.josm.Main;
-
/**
* Make shortcuts from main window work in dialog windows.
*
diff --git a/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java b/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java
index e6013b3..4b989f1 100644
--- a/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java
+++ b/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java
@@ -41,7 +41,7 @@ public class StayOpenRadioButtonMenuItem extends JRadioButtonMenuItem {
* @see JRadioButtonMenuItem#JRadioButtonMenuItem(Action)
*/
public StayOpenRadioButtonMenuItem(Action a) {
- super();
+ super(a);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java b/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java
index bd1ef0e..63fbbba 100644
--- a/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java
+++ b/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java
@@ -10,7 +10,7 @@ import javax.swing.event.ChangeEvent;
public class TableCellEditorSupport {
private Object editor;
- private LinkedList<CellEditorListener> listeners;
+ private List<CellEditorListener> listeners;
public TableCellEditorSupport(Object editor) {
this.editor = editor;
diff --git a/src/org/openstreetmap/josm/gui/util/TableHelper.java b/src/org/openstreetmap/josm/gui/util/TableHelper.java
new file mode 100644
index 0000000..5d7043c
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/util/TableHelper.java
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.util;
+
+import java.awt.Component;
+
+import javax.swing.JTable;
+import javax.swing.table.TableCellRenderer;
+
+/**
+ * The class that provide common JTable customization methods
+ */
+public final class TableHelper {
+
+ private TableHelper() {
+ // Hide default constructor for utils classes
+ }
+
+ /**
+ * (originally from @class org.openstreetmap.josm.gui.preferences.SourceEditor)
+ * adjust the preferred width of column col to the maximum preferred width of the cells
+ * requires JTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ */
+ public static void adjustColumnWidth(JTable tbl, int col, int maxColumnWidth) {
+ int maxwidth = 0;
+ for (int row=0; row<tbl.getRowCount(); row++) {
+ TableCellRenderer tcr = tbl.getCellRenderer(row, col);
+ Object val = tbl.getValueAt(row, col);
+ Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, row, col);
+ maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
+ }
+ tbl.getColumnModel().getColumn(col).setPreferredWidth(Math.min(maxwidth+10, maxColumnWidth));
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java b/src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java
new file mode 100644
index 0000000..7b7028b
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java
@@ -0,0 +1,89 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import javax.swing.text.JTextComponent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * An abstract class for ID text fields.
+ *
+ * @param <T> The ID validator class
+ * @since 5765
+ */
+public abstract class AbstractIdTextField<T extends AbstractTextComponentValidator> extends JosmTextField {
+
+ protected final T validator;
+
+ /**
+ * Constructs a new {@link AbstractIdTextField}
+ * @param klass The validator class
+ */
+ public AbstractIdTextField(Class<T> klass) {
+ this(klass, 0);
+ }
+
+ /**
+ * Constructs a new {@link AbstractIdTextField}
+ * @param klass The validator class
+ * @param columns The number of columns to use to calculate the preferred width
+ * @see JosmTextField#JosmTextField(int)
+ */
+ public AbstractIdTextField(Class<T> klass, int columns) {
+ super(columns);
+ T validator = null;
+ try {
+ if (klass != null) {
+ validator = klass.getConstructor(JTextComponent.class).newInstance(this);
+ }
+ } catch (Exception e) {
+ Main.error(e);
+ } finally {
+ this.validator = validator;
+ }
+ }
+
+ /**
+ * Performs the field validation
+ */
+ public final void performValidation() {
+ validator.validate();
+ }
+
+ /**
+ * Clears field if content is invalid
+ */
+ public final void clearTextIfInvalid() {
+ if (!validator.isValid())
+ setText("");
+ validator.validate();
+ }
+
+ /**
+ * Reads the id(s).
+ * @return true if at least a valid id has been successfully read, false otherwise
+ */
+ public abstract boolean readIds();
+
+ /**
+ * Tries to set text from clipboard (no effect with invalid or empty clipboard)
+ */
+ public void tryToPasteFromClipboard() {
+ tryToPasteFrom(Utils.getClipboardContent());
+ }
+
+ /**
+ * Tries to set text from given contents (no effect with invalid or empty contents)
+ * @param contents The text to interprete as ID(s)
+ * @return true if text has been pasted and valid ids have been read
+ */
+ public boolean tryToPasteFrom(String contents) {
+ if (contents != null && !contents.trim().isEmpty()) {
+ setText(contents.trim());
+ clearTextIfInvalid();
+ return readIds();
+ }
+ return false;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java b/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
index 5206043..249213a 100644
--- a/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
+++ b/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
@@ -10,7 +10,6 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.BorderFactory;
-import javax.swing.JTextField;
import javax.swing.UIManager;
import javax.swing.border.Border;
import javax.swing.event.DocumentEvent;
@@ -27,7 +26,7 @@ import org.openstreetmap.josm.tools.Utils;
* <ul>
* <li>the content of the text component changes (the validator is a {@link DocumentListener})</li>
* <li>the text component loses focus (the validator is a {@link FocusListener})</li>
- * <li>the text component is a {@link JTextField} and an {@link ActionEvent} is detected</li>
+ * <li>the text component is a {@link JosmTextField} and an {@link ActionEvent} is detected</li>
* </ul>
*
*
@@ -109,8 +108,8 @@ public abstract class AbstractTextComponentValidator implements ActionListener,
tc.getDocument().addDocumentListener(this);
}
if (addActionListener) {
- if (tc instanceof JTextField) {
- JTextField tf = (JTextField)tc;
+ if (tc instanceof JosmTextField) {
+ JosmTextField tf = (JosmTextField)tc;
tf.addActionListener(this);
}
}
@@ -134,8 +133,10 @@ public abstract class AbstractTextComponentValidator implements ActionListener,
/* -------------------------------------------------------------------------------- */
/* interface FocusListener */
/* -------------------------------------------------------------------------------- */
+ @Override
public void focusGained(FocusEvent arg0) {}
+ @Override
public void focusLost(FocusEvent arg0) {
validate();
}
@@ -143,6 +144,7 @@ public abstract class AbstractTextComponentValidator implements ActionListener,
/* -------------------------------------------------------------------------------- */
/* interface ActionListener */
/* -------------------------------------------------------------------------------- */
+ @Override
public void actionPerformed(ActionEvent arg0) {
validate();
}
@@ -150,14 +152,17 @@ public abstract class AbstractTextComponentValidator implements ActionListener,
/* -------------------------------------------------------------------------------- */
/* interface DocumentListener */
/* -------------------------------------------------------------------------------- */
+ @Override
public void changedUpdate(DocumentEvent arg0) {
validate();
}
+ @Override
public void insertUpdate(DocumentEvent arg0) {
validate();
}
+ @Override
public void removeUpdate(DocumentEvent arg0) {
validate();
}
@@ -165,6 +170,7 @@ public abstract class AbstractTextComponentValidator implements ActionListener,
/* -------------------------------------------------------------------------------- */
/* interface PropertyChangeListener */
/* -------------------------------------------------------------------------------- */
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals("enabled")) {
boolean enabled = (Boolean)evt.getNewValue();
diff --git a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
index dc65089..96f6693 100644
--- a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -7,18 +7,10 @@ import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.awt.Toolkit;
-import java.awt.datatransfer.FlavorEvent;
-import java.awt.datatransfer.FlavorListener;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseEvent;
-import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.JTextComponent;
@@ -26,11 +18,8 @@ import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.CoordinateFormat;
import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.OsmUrlToBounds;
-import org.openstreetmap.josm.tools.Utils;
/**
*
@@ -38,14 +27,14 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class BoundingBoxSelectionPanel extends JPanel {
- private JTextField[] tfLatLon = null;
- private final JTextField tfOsmUrl = new JTextField();
+ private JosmTextField[] tfLatLon = null;
+ private final JosmTextField tfOsmUrl = new JosmTextField();
protected void buildInputFields() {
- tfLatLon = new JTextField[4];
+ tfLatLon = new JosmTextField[4];
for(int i=0; i< 4; i++) {
- tfLatLon[i] = new JTextField(11);
- tfLatLon[i].setMinimumSize(new Dimension(100,new JTextField().getMinimumSize().height));
+ tfLatLon[i] = new JosmTextField(11);
+ tfLatLon[i].setMinimumSize(new Dimension(100,new JosmTextField().getMinimumSize().height));
SelectAllOnFocusGainedDecorator.decorate(tfLatLon[i]);
}
LatitudeValidator.decorate(tfLatLon[0]);
@@ -86,13 +75,6 @@ public class BoundingBoxSelectionPanel extends JPanel {
gc.gridy = 3;
gc.insets = new Insets(3,0,0,3);
add(tfOsmUrl, gc);
- tfOsmUrl.addMouseListener(new PopupMenuLauncher() {
- @Override
- public void launch(MouseEvent e) {
- OsmUrlPopup popup = new OsmUrlPopup();
- popup.show(tfOsmUrl, e.getX(), e.getY());
- }
- });
}
public BoundingBoxSelectionPanel() {
@@ -219,39 +201,11 @@ public class BoundingBoxSelectionPanel extends JPanel {
}
class OsmUrlRefresher implements DocumentListener {
+ @Override
public void changedUpdate(DocumentEvent e) { parseURL(); }
+ @Override
public void insertUpdate(DocumentEvent e) { parseURL(); }
+ @Override
public void removeUpdate(DocumentEvent e) { parseURL(); }
}
-
- class PasteUrlAction extends AbstractAction implements FlavorListener {
-
- public PasteUrlAction() {
- putValue(NAME, tr("Paste"));
- putValue(SMALL_ICON, ImageProvider.get("paste"));
- putValue(SHORT_DESCRIPTION, tr("Paste URL from clipboard"));
- Toolkit.getDefaultToolkit().getSystemClipboard().addFlavorListener(this);
- }
-
- public void actionPerformed(ActionEvent e) {
- String content = Utils.getClipboardContent();
- if (content != null) {
- tfOsmUrl.setText(content);
- }
- }
-
- protected void updateEnabledState() {
- setEnabled(Utils.getClipboardContent() != null);
- }
-
- public void flavorsChanged(FlavorEvent e) {
- updateEnabledState();
- }
- }
-
- class OsmUrlPopup extends JPopupMenu {
- public OsmUrlPopup() {
- add(new PasteUrlAction());
- }
- }
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java b/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java
new file mode 100644
index 0000000..6b6bc05
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java
@@ -0,0 +1,89 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import javax.swing.text.JTextComponent;
+
+/**
+ * A text field designed to enter a single OSM changeset ID.
+ * @since 5765
+ */
+public class ChangesetIdTextField extends AbstractIdTextField<ChangesetIdTextField.ChangesetIdValidator> {
+
+ /**
+ * Constructs a new {@link ChangesetIdTextField}
+ */
+ public ChangesetIdTextField() {
+ super(ChangesetIdValidator.class, 10);
+ }
+
+ /**
+ * Gets the entered changeset id.
+ * @return The entered changeset id
+ */
+ public final int getChangesetId() {
+ return validator.id;
+ }
+
+ /**
+ * Reads the changeset id.
+ * @return true if a valid changeset id has been successfully read, false otherwise
+ * @see ChangesetIdValidator#readChangesetId
+ */
+ @Override
+ public boolean readIds() {
+ return validator.readChangesetId();
+ }
+
+ /**
+ * Validator for a changeset ID entered in a {@link JTextComponent}.
+ */
+ public static class ChangesetIdValidator extends AbstractTextComponentValidator {
+
+ private int id = 0;
+
+ /**
+ * Constructs a new {@link ChangesetIdValidator}
+ * @param tc The text component to validate
+ */
+ public ChangesetIdValidator(JTextComponent tc) {
+ super(tc);
+ }
+
+ @Override
+ public boolean isValid() {
+ return readChangesetId();
+ }
+
+ @Override
+ public void validate() {
+ if (!isValid()) {
+ feedbackInvalid(tr("The current value is not a valid changeset ID. Please enter an integer value > 0"));
+ } else {
+ feedbackValid(tr("Please enter an integer value > 0"));
+ }
+ }
+
+ /**
+ * Reads the changeset id.
+ * @return true if a valid changeset id has been successfully read, false otherwise
+ */
+ public boolean readChangesetId() {
+ String value = getComponent().getText();
+ if (value != null && !value.trim().isEmpty()) {
+ id = 0;
+ try {
+ int changesetId = Integer.parseInt(value.trim());
+ if (changesetId > 0) {
+ id = changesetId;
+ return true;
+ }
+ } catch(NumberFormatException e) {
+ // Ignored
+ }
+ }
+ return false;
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java b/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
index 43e0233..7028074 100644
--- a/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
+++ b/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
@@ -1,30 +1,4 @@
-/* Copyright (c) 2008, Henrik Niehaus
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
import java.util.ArrayList;
@@ -79,21 +53,25 @@ public class ComboBoxHistory extends DefaultComboBoxModel implements Iterable<Au
fireHistoryChanged();
}
+ @Override
public Iterator<AutoCompletionListItem> iterator() {
return new Iterator<AutoCompletionListItem>() {
private int position = -1;
+ @Override
public void remove() {
removeElementAt(position);
}
+ @Override
public boolean hasNext() {
if(position < getSize()-1 && getSize()>0)
return true;
return false;
}
+ @Override
public AutoCompletionListItem next() {
position++;
return (AutoCompletionListItem)getElementAt(position);
diff --git a/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java b/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java
new file mode 100644
index 0000000..4e9a316
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java
@@ -0,0 +1,121 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSlider;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerDateModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import org.openstreetmap.josm.tools.GBC;
+
+
+/**
+ * Widget originally created for date filtering of GPX tracks.
+ * Allows to enter the date or choose it by using slider
+ */
+public class DateEditorWithSlider extends JPanel {
+ private JSpinner spinner;
+ private JSlider slider;
+ private Date dateMin;
+ private Date dateMax;
+ private static final int MAX_SLIDER=300;
+ private boolean watchSlider = true;
+
+ private List<ChangeListener> listeners = new ArrayList<ChangeListener>();
+
+ public DateEditorWithSlider(String labelText) {
+ super(new GridBagLayout());
+ spinner = new JSpinner( new SpinnerDateModel() );
+ String pattern = ((SimpleDateFormat)DateFormat.getDateInstance()).toPattern();
+ JSpinner.DateEditor timeEditor = new JSpinner.DateEditor(spinner,pattern);
+ spinner.setEditor(timeEditor);
+
+
+ spinner.setPreferredSize(new Dimension(spinner.getPreferredSize().width+5,
+ spinner.getPreferredSize().height));
+
+ slider = new JSlider(0,MAX_SLIDER);
+ spinner.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ int i = slider.getValue();
+ Date d = (Date) spinner.getValue();
+ int j = intFromDate(d);
+ if (i!=j) {
+ watchSlider=false;
+ slider.setValue(j);
+ watchSlider=true;
+ }
+ for (ChangeListener l : listeners) {
+ l.stateChanged(e);
+ }
+ }
+ });
+ slider.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ if (!watchSlider) return;
+ Date d = (Date) spinner.getValue();
+ Date d1 = dateFromInt(slider.getValue());
+ if (!d.equals(d1)) {
+ spinner.setValue(d1);
+ }
+ }
+ });
+ add(new JLabel(labelText),GBC.std());
+ add(spinner,GBC.std().insets(10,0,0,0));
+ add(slider,GBC.eol().insets(10,0,0,0).fill(GBC.HORIZONTAL));
+
+ dateMin = new Date(0); dateMax =new Date();
+ }
+
+ protected Date dateFromInt(int value) {
+ double k = 1.0*value/MAX_SLIDER;
+ return new Date((long)(dateMax.getTime()*k+ dateMin.getTime()*(1-k)));
+ }
+
+ protected int intFromDate(Date date) {
+ return (int)(300.0*(date.getTime()-dateMin.getTime()) /
+ (dateMax.getTime()-dateMin.getTime()));
+ }
+
+ public void setRange(Date dateMin, Date dateMax) {
+ this.dateMin = dateMin;
+ this.dateMax = dateMax;
+ }
+
+ public void setDate(Date date) {
+ spinner.setValue(date);
+ }
+
+ public Date getDate() {
+ return (Date) spinner.getValue();
+ }
+
+ public void addDateListener(ChangeListener l) {
+ listeners.add(l);
+ }
+
+ public void removeDateListener(ChangeListener l) {
+ listeners.remove(l);
+ }
+
+ @Override
+ public void setEnabled(boolean enabled) {
+ super.setEnabled(enabled);
+ for (Component c: getComponents()) {
+ c.setEnabled(enabled);
+ }
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java b/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
index 605b15a..e544ebe 100644
--- a/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
import java.awt.event.FocusEvent;
@@ -11,7 +12,6 @@ import java.util.Set;
import javax.swing.Action;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
-import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.text.Document;
@@ -26,7 +26,7 @@ import org.openstreetmap.josm.tools.Shortcut;
* This allows to include text fields in toggle dialogs (needed for relation filter).
* @since 5696
*/
-public class DisableShortcutsOnFocusGainedTextField extends JTextField implements FocusListener {
+public class DisableShortcutsOnFocusGainedTextField extends JosmTextField implements FocusListener {
/**
* Constructs a new <code>TextField</code>. A default model is created,
diff --git a/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java b/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java
index 1ad66bc..f7481fb 100644
--- a/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java
+++ b/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java
@@ -1,30 +1,4 @@
-/* Copyright (c) 2008, Henrik Niehaus
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
import java.util.List;
diff --git a/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java b/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java
index e714620..932376e 100644
--- a/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java
@@ -8,24 +8,23 @@ import java.text.MessageFormat;
import javax.swing.JEditorPane;
import javax.swing.JPanel;
import javax.swing.UIManager;
-import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.StyleSheet;
/**
* This panel can be used to display larger sections of formatted text in
* HTML.
*
- * It displays HTML text in the same font as {@link JLabel}. Hyperlinks are rendered in
+ * It displays HTML text in the same font as {@link javax.swing.JLabel}. Hyperlinks are rendered in
* blue and they are underlined. There is also a CSS rule for the HTML tag <strong>
* configured.
- *
+ * @since 2688
*/
public class HtmlPanel extends JPanel {
- private JEditorPane jepMessage;
+ private JosmEditorPane jepMessage;
protected void build() {
setLayout(new BorderLayout());
- jepMessage = new JEditorPane("text/html", "");
+ jepMessage = new JosmEditorPane("text/html", "");
jepMessage.setOpaque(false);
jepMessage.setEditable(false);
Font f = UIManager.getFont("Label.font");
@@ -49,17 +48,24 @@ public class HtmlPanel extends JPanel {
ss.addRule(rule);
ss.addRule("a {text-decoration: underline; color: blue}");
ss.addRule("ul {margin-left: 1cm; list-style-type: disc}");
- HTMLEditorKit kit = new HTMLEditorKit();
+ JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
kit.setStyleSheet(ss);
jepMessage.setEditorKit(kit);
add(jepMessage, BorderLayout.CENTER);
}
+ /**
+ * Constructs a new {@code HtmlPanel}.
+ */
public HtmlPanel() {
build();
}
+ /**
+ * Constructs a new {@code HtmlPanel} with the given HTML text.
+ * @param text the text to display
+ */
public HtmlPanel(String text) {
this();
setText(text);
diff --git a/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java b/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java
new file mode 100644
index 0000000..f5f86cc
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java
@@ -0,0 +1,44 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.gui.widgets;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+
+/**
+ * A small user interface component that consists of an image label and
+ * a fixed text content to the right of the image.
+ * Moved from @link org.openstreetmap.josm.gui.MapStatus @since 5965
+ */
+public class ImageLabel extends JPanel {
+ public static final Color backColor = Color.decode("#b8cfe5");
+ public static final Color backColorActive = Color.decode("#aaff5e");
+
+ private JLabel tf;
+ private int charCount;
+
+ public ImageLabel(String img, String tooltip, int charCount) {
+ super();
+ setLayout(new GridBagLayout());
+ setBackground(backColor);
+ add(new JLabel(ImageProvider.get("statusline/"+img+".png")), GBC.std().anchor(GBC.WEST).insets(0,1,1,0));
+ add(tf = new JLabel(), GBC.std().fill(GBC.BOTH).anchor(GBC.WEST).insets(2,1,1,0));
+ setToolTipText(tooltip);
+ this.charCount = charCount;
+ }
+
+ public void setText(String t) {
+ tf.setText(t);
+ }
+ @Override public Dimension getPreferredSize() {
+ return new Dimension(25 + charCount*tf.getFontMetrics(tf.getFont()).charWidth('0'), super.getPreferredSize().height);
+ }
+ @Override public Dimension getMinimumSize() {
+ return new Dimension(25 + charCount*tf.getFontMetrics(tf.getFont()).charWidth('0'), super.getMinimumSize().height);
+ }
+}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java b/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java
index 59b74c5..c03a3c4 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
import java.awt.Component;
diff --git a/src/org/openstreetmap/josm/gui/JMultilineLabel.java b/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java
similarity index 80%
rename from src/org/openstreetmap/josm/gui/JMultilineLabel.java
rename to src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java
index f16c16d..b7b6362 100644
--- a/src/org/openstreetmap/josm/gui/JMultilineLabel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java
@@ -1,6 +1,5 @@
// License: GPL. For details, see LICENSE file.
-
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.gui.widgets;
import java.awt.Dimension;
import java.awt.Rectangle;
@@ -16,10 +15,11 @@ import javax.swing.text.View;
*
* Note that this won't work if JMultilineLabel is put into a JScrollBox or
* similar as the bounds will never change. Instead scrollbars will be displayed.
+ *
+ * @since 6340
*/
public class JMultilineLabel extends JLabel {
private int maxWidth = Integer.MAX_VALUE;
- private Dimension superPreferred = null;
private Rectangle oldbounds = null;
private Dimension oldPreferred = null;
@@ -29,16 +29,15 @@ public class JMultilineLabel extends JLabel {
* <code><br></code> to insert new lines.
*
* Use setMaxWidth to limit the width of the label.
- * @param text
+ * @param text The text to display
*/
- public JMultilineLabel(String text)
- {
+ public JMultilineLabel(String text) {
super();
- text = text.trim().replaceAll("\n", "<br>");
- if(!text.startsWith("<html>")) {
- text = "<html>" + text + "</html>";
+ String html = text.trim().replaceAll("\n", "<br>");
+ if (!html.startsWith("<html>")) {
+ html = "<html>" + html + "</html>";
}
- super.setText(text);
+ super.setText(html);
}
/**
@@ -56,24 +55,25 @@ public class JMultilineLabel extends JLabel {
* that dimension.
*/
@Override
- public Dimension getPreferredSize()
- {
+ public Dimension getPreferredSize() {
// Without this check it will result in an infinite loop calling
// getPreferredSize. Remember the old bounds and only recalculate if
// the size actually changed.
- if(this.getBounds().equals(oldbounds) && oldPreferred != null)
+ if (this.getBounds().equals(oldbounds) && oldPreferred != null) {
return oldPreferred;
+ }
oldbounds = this.getBounds();
- this.superPreferred = super.getPreferredSize();
+ Dimension superPreferred = super.getPreferredSize();
// Make it not larger than required
int width = Math.min(superPreferred.width, maxWidth);
// Calculate suitable width and height
final View v = (View) super.getClientProperty(BasicHTML.propertyKey);
- if(v == null)
+ if (v == null) {
return superPreferred;
+ }
v.setSize(width, 0);
int w = (int) Math.ceil(v.getPreferredSpan(View.X_AXIS));
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java b/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
index 6d6dee6..00c60f6 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
@@ -4,17 +4,23 @@ package org.openstreetmap.josm.gui.widgets;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Toolkit;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Vector;
+import java.util.List;
import javax.accessibility.Accessible;
+import javax.swing.ComboBoxEditor;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JList;
import javax.swing.plaf.basic.ComboPopup;
+import javax.swing.text.JTextComponent;
/**
* Class overriding each {@link JComboBox} in JOSM to control consistently the number of displayed items at once.<br/>
@@ -74,7 +80,7 @@ public class JosmComboBox extends JComboBox {
*/
public JosmComboBox(ComboBoxModel aModel) {
super(aModel);
- ArrayList<Object> list = new ArrayList<Object>(aModel.getSize());
+ List<Object> list = new ArrayList<Object>(aModel.getSize());
for (int i = 0; i<aModel.getSize(); i++) {
list.add(aModel.getElementAt(i));
}
@@ -93,19 +99,6 @@ public class JosmComboBox extends JComboBox {
super(items);
init(findPrototypeDisplayValue(Arrays.asList(items)));
}
-
- /**
- * Creates a <code>JosmComboBox</code> that contains the elements
- * in the specified Vector. By default the first item in the vector
- * (and therefore the data model) becomes selected.
- *
- * @param items an array of vectors to insert into the combo box
- * @see DefaultComboBoxModel
- */
- public JosmComboBox(Vector<?> items) {
- super(items);
- init(findPrototypeDisplayValue(items));
- }
/**
* Finds the prototype display value to use among the given possible candidates.
@@ -126,11 +119,8 @@ public class JosmComboBox extends JComboBox {
int i = 0;
for (Object value : possibleValues) {
if (value != null) {
- // These two lines work with a "classic" renderer,
+ // With a "classic" renderer, we could call setPrototypeDisplayValue(value) + getPreferredSize()
// but not with TaggingPreset custom renderer that return a dummy height if index is equal to -1
- //setPrototypeDisplayValue(value);
- //Dimension dim = getPreferredSize();
-
// So we explicitely call the renderer by simulating a correct index for the current value
Component c = getRenderer().getListCellRendererComponent(list, value, i, true, true);
if (c != null) {
@@ -184,6 +174,66 @@ public class JosmComboBox extends JComboBox {
}
setMaximumRowCount(Math.max(getMaximumRowCount(), maxsize));
}
+ // Handle text contextual menus for editable comboboxes
+ ContextMenuHandler handler = new ContextMenuHandler();
+ addPropertyChangeListener("editable", handler);
+ addPropertyChangeListener("editor", handler);
+ }
+
+ protected class ContextMenuHandler extends MouseAdapter implements PropertyChangeListener {
+
+ private JTextComponent component;
+ private PopupMenuLauncher launcher;
+
+ @Override public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getPropertyName().equals("editable")) {
+ if (evt.getNewValue().equals(true)) {
+ enableMenu();
+ } else {
+ disableMenu();
+ }
+ } else if (evt.getPropertyName().equals("editor")) {
+ disableMenu();
+ if (isEditable()) {
+ enableMenu();
+ }
+ }
+ }
+
+ private void enableMenu() {
+ if (launcher == null) {
+ ComboBoxEditor editor = getEditor();
+ if (editor != null) {
+ Component editorComponent = editor.getEditorComponent();
+ if (editorComponent instanceof JTextComponent) {
+ component = (JTextComponent) editorComponent;
+ component.addMouseListener(this);
+ launcher = TextContextualPopupMenu.enableMenuFor(component);
+ }
+ }
+ }
+ }
+
+ private void disableMenu() {
+ if (launcher != null) {
+ TextContextualPopupMenu.disableMenuFor(component, launcher);
+ launcher = null;
+ component.removeMouseListener(this);
+ component = null;
+ }
+ }
+
+ @Override public void mousePressed(MouseEvent e) { processEvent(e); }
+ @Override public void mouseClicked(MouseEvent e) { processEvent(e); }
+ @Override public void mouseReleased(MouseEvent e) { processEvent(e); }
+
+ private void processEvent(MouseEvent e) {
+ if (launcher != null && !e.isPopupTrigger()) {
+ if (launcher.getMenu().isShowing()) {
+ launcher.getMenu().setVisible(false);
+ }
+ }
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java b/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java
new file mode 100644
index 0000000..be0b63f
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java
@@ -0,0 +1,77 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+import javax.swing.JEditorPane;
+
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Subclass of {@link JEditorPane} that adds a "native" context menu (cut/copy/paste/select all)
+ * and effectively uses JOSM user agent when performing HTTP request in {@link #setPage(URL)} method.
+ * @since 5886
+ */
+public class JosmEditorPane extends JEditorPane {
+
+ /**
+ * Creates a new <code>JosmEditorPane</code>.
+ * The document model is set to <code>null</code>.
+ */
+ public JosmEditorPane() {
+ TextContextualPopupMenu.enableMenuFor(this);
+ }
+
+ /**
+ * Creates a <code>JosmEditorPane</code> based on a specified URL for input.
+ *
+ * @param initialPage the URL
+ * @exception IOException if the URL is <code>null</code> or cannot be accessed
+ */
+ public JosmEditorPane(URL initialPage) throws IOException {
+ this();
+ setPage(initialPage);
+ }
+
+ /**
+ * Creates a <code>JosmEditorPane</code> based on a string containing
+ * a URL specification.
+ *
+ * @param url the URL
+ * @exception IOException if the URL is <code>null</code> or cannot be accessed
+ */
+ public JosmEditorPane(String url) throws IOException {
+ this();
+ setPage(url);
+ }
+
+ /**
+ * Creates a <code>JosmEditorPane</code> that has been initialized
+ * to the given text. This is a convenience constructor that calls the
+ * <code>setContentType</code> and <code>setText</code> methods.
+ *
+ * @param type mime type of the given text
+ * @param text the text to initialize with; may be <code>null</code>
+ * @exception NullPointerException if the <code>type</code> parameter
+ * is <code>null</code>
+ */
+ public JosmEditorPane(String type, String text) {
+ this();
+ setContentType(type);
+ setText(text);
+ }
+
+ @Override
+ protected InputStream getStream(URL page) throws IOException {
+ URLConnection conn = Utils.setupURLConnection(page.openConnection());
+ InputStream result = conn.getInputStream();
+ String type = conn.getContentType();
+ if (type != null) {
+ setContentType(type);
+ }
+ return result;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmHTMLEditorKit.java b/src/org/openstreetmap/josm/gui/widgets/JosmHTMLEditorKit.java
new file mode 100644
index 0000000..38bebd9
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmHTMLEditorKit.java
@@ -0,0 +1,50 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.StyleSheet;
+
+/**
+ * A subclass of {@link HTMLEditorKit} that fixes an uncommon design choice that shares the set stylesheet between all instances.
+ * This class stores a single stylesheet per instance, as it should have be done by Sun in the first place.
+ * @since 6040
+ */
+public class JosmHTMLEditorKit extends HTMLEditorKit {
+
+ /**
+ * Constructs a new {@code JosmHTMLEditorKit}
+ */
+ public JosmHTMLEditorKit() {
+ }
+
+ protected StyleSheet ss = super.getStyleSheet();
+
+ /**
+ * Set the set of styles to be used to render the various HTML elements.
+ * These styles are specified in terms of CSS specifications.
+ * Each document produced by the kit will have a copy of the sheet which
+ * it can add the document specific styles to.
+ *
+ * Unlike the base implementation, the StyleSheet specified is NOT shared
+ * by all HTMLEditorKit instances, to provide a finer granularity.
+
+ * @see #getStyleSheet
+ */
+ @Override
+ public void setStyleSheet(StyleSheet s) {
+ ss = s;
+ }
+
+ /**
+ * Get the set of styles currently being used to render the HTML elements.
+ *
+ * Unlike the base implementation, the StyleSheet specified is NOT shared
+ * by all HTMLEditorKit instances, to provide a finer granularity.
+ *
+ * @see #setStyleSheet
+ */
+ @Override
+ public StyleSheet getStyleSheet() {
+ return ss;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
index 3d4f549..7cc39ff 100644
--- a/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
import java.awt.event.ActionEvent;
@@ -9,6 +10,8 @@ import javax.swing.TransferHandler;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
+import org.openstreetmap.josm.Main;
+
/**
* A subclass of {@link JPasswordField} to implement a workaround to
* <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6322854">JDK bug 6322854</a>.
@@ -101,7 +104,7 @@ public class JosmPasswordField extends JPasswordField {
try {
pasteAction.actionPerformed(e);
} catch (NullPointerException npe) {
- System.err.println("NullPointerException occured because of JDK bug 6322854. "
+ Main.error("NullPointerException occured because of JDK bug 6322854. "
+"Copy/Paste operation has not been performed. Please complain to Oracle: "+
"http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6322854");
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java b/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
new file mode 100644
index 0000000..f566941
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
@@ -0,0 +1,85 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import javax.swing.JTextArea;
+import javax.swing.text.Document;
+
+/**
+ * Subclass of {@link JTextArea} that adds a "native" context menu (cut/copy/paste/select all).
+ * @since 5886
+ */
+public class JosmTextArea extends JTextArea {
+
+ /**
+ * Constructs a new {@code JosmTextArea}. A default model is set, the initial string
+ * is null, and rows/columns are set to 0.
+ */
+ public JosmTextArea() {
+ this(null, null, 0, 0);
+ }
+
+ /**
+ * Constructs a new {@code JosmTextArea} with the specified text displayed.
+ * A default model is created and rows/columns are set to 0.
+ *
+ * @param text the text to be displayed, or null
+ */
+ public JosmTextArea(String text) {
+ this(null, text, 0, 0);
+ }
+
+ /**
+ * Constructs a new {@code JosmTextArea} with the given document model, and defaults
+ * for all of the other arguments (null, 0, 0).
+ *
+ * @param doc the model to use
+ */
+ public JosmTextArea(Document doc) {
+ this(doc, null, 0, 0);
+ }
+
+ /**
+ * Constructs a new empty {@code JosmTextArea} with the specified number of
+ * rows and columns. A default model is created, and the initial
+ * string is null.
+ *
+ * @param rows the number of rows >= 0
+ * @param columns the number of columns >= 0
+ * @exception IllegalArgumentException if the rows or columns
+ * arguments are negative.
+ */
+ public JosmTextArea(int rows, int columns) {
+ this(null, null, rows, columns);
+ }
+
+ /**
+ * Constructs a new {@code JosmTextArea} with the specified text and number
+ * of rows and columns. A default model is created.
+ *
+ * @param text the text to be displayed, or null
+ * @param rows the number of rows >= 0
+ * @param columns the number of columns >= 0
+ * @exception IllegalArgumentException if the rows or columns
+ * arguments are negative.
+ */
+ public JosmTextArea(String text, int rows, int columns) {
+ this(null, text, rows, columns);
+ }
+
+ /**
+ * Constructs a new {@code JosmTextArea} with the specified number of rows
+ * and columns, and the given model. All of the constructors
+ * feed through this constructor.
+ *
+ * @param doc the model to use, or create a default one if null
+ * @param text the text to be displayed, null if none
+ * @param rows the number of rows >= 0
+ * @param columns the number of columns >= 0
+ * @exception IllegalArgumentException if the rows or columns
+ * arguments are negative.
+ */
+ public JosmTextArea(Document doc, String text, int rows, int columns) {
+ super(doc, text, rows, columns);
+ TextContextualPopupMenu.enableMenuFor(this);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java b/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
new file mode 100644
index 0000000..2689f89
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
@@ -0,0 +1,82 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import javax.swing.JTextField;
+import javax.swing.text.Document;
+
+/**
+ * Subclass of {@link JTextField} that adds a "native" context menu (cut/copy/paste/select all).
+ * @since 5886
+ */
+public class JosmTextField extends JTextField {
+
+ /**
+ * Constructs a new <code>JosmTextField</code> that uses the given text
+ * storage model and the given number of columns.
+ * This is the constructor through which the other constructors feed.
+ * If the document is <code>null</code>, a default model is created.
+ *
+ * @param doc the text storage to use; if this is <code>null</code>,
+ * a default will be provided by calling the
+ * <code>createDefaultModel</code> method
+ * @param text the initial string to display, or <code>null</code>
+ * @param columns the number of columns to use to calculate
+ * the preferred width >= 0; if <code>columns</code>
+ * is set to zero, the preferred width will be whatever
+ * naturally results from the component implementation
+ * @exception IllegalArgumentException if <code>columns</code> < 0
+ */
+ public JosmTextField(Document doc, String text, int columns) {
+ super(doc, text, columns);
+ TextContextualPopupMenu.enableMenuFor(this);
+ }
+
+ /**
+ * Constructs a new <code>JosmTextField</code> initialized with the
+ * specified text and columns. A default model is created.
+ *
+ * @param text the text to be displayed, or <code>null</code>
+ * @param columns the number of columns to use to calculate
+ * the preferred width; if columns is set to zero, the
+ * preferred width will be whatever naturally results from
+ * the component implementation
+ */
+ public JosmTextField(String text, int columns) {
+ this(null, text, columns);
+ }
+
+ /**
+ * Constructs a new <code>JosmTextField</code> initialized with the
+ * specified text. A default model is created and the number of
+ * columns is 0.
+ *
+ * @param text the text to be displayed, or <code>null</code>
+ */
+ public JosmTextField(String text) {
+ this(null, text, 0);
+ }
+
+ /**
+ * Constructs a new empty <code>JosmTextField</code> with the specified
+ * number of columns.
+ * A default model is created and the initial string is set to
+ * <code>null</code>.
+ *
+ * @param columns the number of columns to use to calculate
+ * the preferred width; if columns is set to zero, the
+ * preferred width will be whatever naturally results from
+ * the component implementation
+ */
+ public JosmTextField(int columns) {
+ this(null, null, columns);
+ }
+
+ /**
+ * Constructs a new <code>JosmTextField</code>. A default model is created,
+ * the initial string is <code>null</code>,
+ * and the number of columns is set to 0.
+ */
+ public JosmTextField() {
+ this(null, null, 0);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java b/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java
index 807c1fc..e9619bb 100644
--- a/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java
+++ b/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java
@@ -12,7 +12,7 @@ import javax.swing.event.ListSelectionListener;
*
*/
public class ListPopupMenu extends JPopupMenu {
-
+
private JList[] lists;
public ListPopupMenu(JList ... lists) {
diff --git a/src/org/openstreetmap/josm/gui/MultiSplitLayout.java b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
similarity index 98%
rename from src/org/openstreetmap/josm/gui/MultiSplitLayout.java
rename to src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
index 565b3da..6d4e4f0 100644
--- a/src/org/openstreetmap/josm/gui/MultiSplitLayout.java
+++ b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
@@ -18,9 +18,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-//package org.jdesktop.swingx;
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.gui.widgets;
import java.awt.Component;
import java.awt.Container;
@@ -30,7 +28,6 @@ import java.awt.LayoutManager;
import java.awt.Rectangle;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.io.IOException;
import java.io.Reader;
import java.io.StreamTokenizer;
import java.io.StringReader;
@@ -44,6 +41,9 @@ import java.util.Map;
import javax.swing.UIManager;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
+
/**
* The MultiSplitLayout layout manager recursively arranges its
* components in row and column groups called "Splits". Elements of
@@ -67,10 +67,9 @@ import javax.swing.UIManager;
* All properties in this class are bound: when a properties value
* is changed, all PropertyChangeListeners are fired.
*
- * @author Hans Muller
+ * @author Hans Muller - SwingX
* @see MultiSplitPane
*/
-
public class MultiSplitLayout implements LayoutManager {
private final Map<String, Component> childMap = new HashMap<String, Component>();
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
@@ -209,6 +208,7 @@ public class MultiSplitLayout implements LayoutManager {
* @param child the component to be added
* @see #removeLayoutComponent
*/
+ @Override
public void addLayoutComponent(String name, Component child) {
if (name == null)
throw new IllegalArgumentException("name not specified");
@@ -221,6 +221,7 @@ public class MultiSplitLayout implements LayoutManager {
* @param child the component to be removed
* @see #addLayoutComponent
*/
+ @Override
public void removeLayoutComponent(Component child) {
String name = child.getName();
if (name != null) {
@@ -318,11 +319,13 @@ public class MultiSplitLayout implements LayoutManager {
return new Dimension(width, height);
}
+ @Override
public Dimension preferredLayoutSize(Container parent) {
Dimension size = preferredNodeSize(getModel());
return sizeWithInsets(parent, size);
}
+ @Override
public Dimension minimumLayoutSize(Container parent) {
Dimension size = minimumNodeSize(getModel());
return sizeWithInsets(parent, size);
@@ -757,6 +760,7 @@ public class MultiSplitLayout implements LayoutManager {
* the layout model, and then set the bounds of each child component
* with a matching Leaf Node.
*/
+ @Override
public void layoutContainer(Container parent) {
checkLayout(getModel());
Insets insets = parent.getInsets();
@@ -941,7 +945,7 @@ public class MultiSplitLayout implements LayoutManager {
*
* @return the Node that comes after this one in the parent's list of children.
* @see #previousSibling
- * @see #getParent
+ * @see #parent_get
*/
public Node nextSibling() {
return siblingAtOffset(+1);
@@ -954,7 +958,7 @@ public class MultiSplitLayout implements LayoutManager {
*
* @return the Node that comes before this one in the parent's list of children.
* @see #nextSibling
- * @see #getParent
+ * @see #parent_get
*/
public Node previousSibling() {
return siblingAtOffset(-1);
@@ -1185,7 +1189,7 @@ public class MultiSplitLayout implements LayoutManager {
private static void addSplitChild(Split parent, Node child) {
List<Node> children = new ArrayList<Node>(parent.getChildren());
- if (children.size() == 0) {
+ if (children.isEmpty()) {
children.add(child);
}
else {
@@ -1255,10 +1259,10 @@ public class MultiSplitLayout implements LayoutManager {
return root.getChildren().get(0);
}
catch (Exception e) {
- System.err.println(e);
+ Main.error(e);
}
finally {
- try { r.close(); } catch (IOException ignore) {}
+ Utils.close(r);
}
return null;
}
@@ -1312,24 +1316,4 @@ public class MultiSplitLayout implements LayoutManager {
public static Node parseModel(String s) {
return parseModel(new StringReader(s));
}
-
- private static void printModel(String indent, Node root) {
- if (root instanceof Split) {
- Split split = (Split)root;
- System.out.println(indent + split);
- for(Node child : split.getChildren()) {
- printModel(indent + " ", child);
- }
- }
- else {
- System.out.println(indent + root);
- }
- }
-
- /**
- * Print the tree with enough detail for simple debugging.
- */
- public static void printModel(Node root) {
- printModel("", root);
- }
}
diff --git a/src/org/openstreetmap/josm/gui/MultiSplitPane.java b/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
similarity index 96%
rename from src/org/openstreetmap/josm/gui/MultiSplitPane.java
rename to src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
index 339a025..8382486 100644
--- a/src/org/openstreetmap/josm/gui/MultiSplitPane.java
+++ b/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java
@@ -18,9 +18,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-//package org.jdesktop.swingx;
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.gui.widgets;
import java.awt.Color;
import java.awt.Cursor;
@@ -30,13 +28,14 @@ import java.awt.Rectangle;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.awt.event.MouseEvent;
+
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
import javax.swing.JPanel;
import javax.swing.event.MouseInputAdapter;
-import org.openstreetmap.josm.gui.MultiSplitLayout.Divider;
-import org.openstreetmap.josm.gui.MultiSplitLayout.Node;
+import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Divider;
+import org.openstreetmap.josm.gui.widgets.MultiSplitLayout.Node;
/**
*
@@ -44,7 +43,7 @@ import org.openstreetmap.josm.gui.MultiSplitLayout.Node;
* All properties in this class are bound: when a properties value
* is changed, all PropertyChangeListeners are fired.
*
- * @author Hans Muller
+ * @author Hans Muller - SwingX
*/
public class MultiSplitPane extends JPanel {
private AccessibleContext accessibleContext = null;
@@ -156,6 +155,7 @@ public class MultiSplitPane extends JPanel {
}
private class DefaultDividerPainter extends DividerPainter {
+ @Override
public void paint(Graphics g, Divider divider) {
if ((divider == activeDivider()) && !isContinuousLayout()) {
Graphics2D g2d = (Graphics2D)g;
@@ -201,6 +201,7 @@ public class MultiSplitPane extends JPanel {
* <p>
* {@inheritDoc}
*/
+ @Override
protected void paintChildren(Graphics g) {
super.paintChildren(g);
DividerPainter dp = getDividerPainter();
@@ -352,36 +353,46 @@ public class MultiSplitPane extends JPanel {
private class InputHandler extends MouseInputAdapter implements KeyListener {
+ @Override
public void mouseEntered(MouseEvent e) {
updateCursor(e.getX(), e.getY(), true);
}
+ @Override
public void mouseMoved(MouseEvent e) {
updateCursor(e.getX(), e.getY(), true);
}
+ @Override
public void mouseExited(MouseEvent e) {
updateCursor(e.getX(), e.getY(), false);
}
+ @Override
public void mousePressed(MouseEvent e) {
startDrag(e.getX(), e.getY());
}
+ @Override
public void mouseReleased(MouseEvent e) {
finishDrag(e.getX(), e.getY());
}
+ @Override
public void mouseDragged(MouseEvent e) {
updateDrag(e.getX(), e.getY());
}
+ @Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
cancelDrag();
}
}
+ @Override
public void keyReleased(KeyEvent e) { }
+ @Override
public void keyTyped(KeyEvent e) { }
}
+ @Override
public AccessibleContext getAccessibleContext() {
if( accessibleContext == null ) {
accessibleContext = new AccessibleMultiSplitPane();
@@ -390,6 +401,7 @@ public class MultiSplitPane extends JPanel {
}
protected class AccessibleMultiSplitPane extends AccessibleJPanel {
+ @Override
public AccessibleRole getAccessibleRole() {
return AccessibleRole.SPLIT_PANE;
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java b/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java
index 737eb86..b840aa3 100644
--- a/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java
+++ b/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java
@@ -7,7 +7,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import javax.swing.JTextField;
import javax.swing.text.JTextComponent;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -15,16 +14,25 @@ import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
/**
+ * A text field designed to enter one or several OSM primitive IDs.
* @author Matthias Julius
*/
-public class OsmIdTextField extends JTextField {
-
- private OsmIdValidator validator;
+public class OsmIdTextField extends AbstractIdTextField<OsmIdTextField.OsmIdValidator> {
+ /**
+ * Constructs a new {@link OsmIdTextField}
+ */
public OsmIdTextField() {
- validator = OsmIdValidator.decorate(this);
+ super(OsmIdValidator.class);
}
+ /**
+ * Sets the type of primitive object
+ * @param type The type of primitive object (
+ * {@link OsmPrimitiveType#NODE NODE},
+ * {@link OsmPrimitiveType#WAY WAY},
+ * {@link OsmPrimitiveType#RELATION RELATION})
+ */
public void setType(OsmPrimitiveType type) {
validator.type = type;
}
@@ -33,37 +41,32 @@ public class OsmIdTextField extends JTextField {
* Get entered ID list - supports "1,2,3" "1 2 ,3" or even "1 2 3 v2 6 v8"
* @return list of id's
*/
- public List<PrimitiveId> getIds() {
- return validator.ids;
+ public final List<PrimitiveId> getIds() {
+ return new ArrayList<PrimitiveId>(validator.ids);
}
- public boolean readOsmIds() {
+ /**
+ * Reads the OSM primitive id(s)
+ * @return true if valid OSM objects IDs have been read, false otherwise
+ * @see OsmIdValidator#readOsmIds
+ */
+ @Override
+ public boolean readIds() {
return validator.readOsmIds();
}
- public void performValidation() {
- validator.validate();
- }
-
- public void clearTextIfInvalid() {
- if (!validator.isValid())
- setText("");
- validator.validate();
- }
-
/**
- * Validator for a changeset ID entered in a {@link JTextComponent}.
- *
+ * Validator for an OSM primitive ID entered in a {@link JTextComponent}.
*/
- static private class OsmIdValidator extends AbstractTextComponentValidator {
-
- static public OsmIdValidator decorate(JTextComponent tc) {
- return new OsmIdValidator(tc);
- }
+ public static class OsmIdValidator extends AbstractTextComponentValidator {
- private List<PrimitiveId> ids = new ArrayList<PrimitiveId>();
+ private final List<PrimitiveId> ids = new ArrayList<PrimitiveId>();
private OsmPrimitiveType type;
+ /**
+ * Constructs a new {@link OsmIdValidator}
+ * @param tc The text component to validate
+ */
public OsmIdValidator(JTextComponent tc) {
super(tc, false);
}
@@ -82,10 +85,14 @@ public class OsmIdTextField extends JTextField {
}
}
+ /**
+ * Reads the OSM primitive id(s)
+ * @return true if valid OSM objects IDs have been read, false otherwise
+ */
public boolean readOsmIds() {
String value = getComponent().getText();
char c;
- if (value == null || value.trim().length() == 0) {
+ if (value == null || value.trim().isEmpty()) {
return false;
}
ids.clear();
@@ -107,9 +114,9 @@ public class OsmIdTextField extends JTextField {
return false;
} else if (type == OsmPrimitiveType.NODE) {
ids.add(new SimplePrimitiveId(id, OsmPrimitiveType.NODE));
- } else if (type == OsmPrimitiveType.WAY) {
+ } else if (type == OsmPrimitiveType.WAY || type == OsmPrimitiveType.CLOSEDWAY) {
ids.add(new SimplePrimitiveId(id, OsmPrimitiveType.WAY));
- } else if (type == OsmPrimitiveType.RELATION) {
+ } else if (type == OsmPrimitiveType.RELATION || type == OsmPrimitiveType.MULTIPOLYGON) {
ids.add(new SimplePrimitiveId(id, OsmPrimitiveType.RELATION));
} else {
return false;
diff --git a/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java b/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java
index 0968f2c..167bac1 100644
--- a/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java
+++ b/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java
@@ -36,7 +36,7 @@ public abstract class OsmPrimitivesTable extends JTable {
public OsmPrimitivesTable(OsmPrimitivesTableModel dm, TableColumnModel cm, ListSelectionModel sm) {
super(dm, cm, sm);
- addMouseListener(new PopupListener());
+ addMouseListener(new PopupMenuLauncher(getPopUpMenu()));
addMouseListener(new DblClickHandler());
}
@@ -75,24 +75,6 @@ public abstract class OsmPrimitivesTable extends JTable {
return getOsmPrimitivesTableModel().getReferredPrimitive(row);
}
- protected class PopupListener extends MouseAdapter {
- @Override
- public void mousePressed(MouseEvent e) {
- showPopup(e);
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- showPopup(e);
- }
-
- private void showPopup(MouseEvent e) {
- if (e.isPopupTrigger()) {
- getPopUpMenu().show(e.getComponent(), e.getX(), e.getY());
- }
- }
- }
-
protected class DblClickHandler extends MouseAdapter {
protected void setSelection(MouseEvent e) {
diff --git a/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java b/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java
index b20364d..1b241c6 100644
--- a/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java
+++ b/src/org/openstreetmap/josm/gui/widgets/PopupMenuLauncher.java
@@ -1,45 +1,144 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.widgets;
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import javax.swing.JList;
import javax.swing.JPopupMenu;
+import javax.swing.JTable;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreePath;
+/**
+ * Utility class that helps to display popup menus on mouse events.
+ * @since 2688
+ */
public class PopupMenuLauncher extends MouseAdapter {
- private JPopupMenu menu;
+ protected JPopupMenu menu;
+ private final boolean checkEnabled;
+ /**
+ * Creates a new {@link PopupMenuLauncher} with no defined menu.
+ * It is then needed to override the {@link #launch} method.
+ * @see #launch(MouseEvent)
+ */
public PopupMenuLauncher() {
- menu = null;
+ this(null);
}
+
+ /**
+ * Creates a new {@link PopupMenuLauncher} with the given menu.
+ * @param menu The popup menu to display
+ */
public PopupMenuLauncher(JPopupMenu menu) {
+ this(menu, false);
+ }
+
+ /**
+ * Creates a new {@link PopupMenuLauncher} with the given menu.
+ * @param menu The popup menu to display
+ * @param checkEnabled if {@code true}, the popup menu will only be displayed if the component triggering the mouse event is enabled
+ * @since 5886
+ */
+ public PopupMenuLauncher(JPopupMenu menu, boolean checkEnabled) {
this.menu = menu;
+ this.checkEnabled = checkEnabled;
}
- @Override
- public void mousePressed(MouseEvent e) {
- if (e.isPopupTrigger()) {
+ @Override public void mousePressed(MouseEvent e) { processEvent(e); }
+ @Override public void mouseClicked(MouseEvent e) {}
+ @Override public void mouseReleased(MouseEvent e) { processEvent(e); }
+
+ private void processEvent(MouseEvent e) {
+ if (e.isPopupTrigger() && (!checkEnabled || e.getComponent().isEnabled())) {
launch(e);
}
}
- @Override
- public void mouseClicked(MouseEvent e) {
- if (e.isPopupTrigger()) {
- launch(e);
+ /**
+ * Launches the popup menu according to the given mouse event.
+ * This method needs to be overriden if the default constructor has been called.
+ * @param evt A mouse event
+ */
+ public void launch(final MouseEvent evt) {
+ if (evt != null) {
+ final Component component = evt.getComponent();
+ if (checkSelection(component, evt.getPoint())) {
+ checkFocusAndShowMenu(component, evt);
+ }
}
}
- @Override
- public void mouseReleased(MouseEvent e) {
- if (e.isPopupTrigger()) {
- launch(e);
+ protected boolean checkSelection(Component component, Point p) {
+ if (component instanceof JList) {
+ return checkListSelection((JList) component, p) > -1;
+ } else if (component instanceof JTable) {
+ return checkTableSelection((JTable) component, p) > -1;
+ } else if (component instanceof JTree) {
+ return checkTreeSelection((JTree) component, p) != null;
+ }
+ return true;
+ }
+
+ protected void checkFocusAndShowMenu(final Component component, final MouseEvent evt) {
+ if (component != null && component.isFocusable() && !component.hasFocus() && component.requestFocusInWindow()) {
+ component.addFocusListener(new FocusListener() {
+ @Override public void focusLost(FocusEvent e) {}
+ @Override public void focusGained(FocusEvent e) {
+ showMenu(evt);
+ component.removeFocusListener(this);
+ }
+ });
+ } else {
+ showMenu(evt);
+ }
+ }
+
+ protected void showMenu(MouseEvent evt) {
+ if (menu != null && evt != null) {
+ menu.show(evt.getComponent(), evt.getX(), evt.getY());
+ }
+ }
+
+ protected int checkListSelection(JList list, Point p) {
+ int idx = list.locationToIndex(p);
+ if (idx >= 0 && idx < list.getModel().getSize() && list.getSelectedIndices().length < 2 && !list.isSelectedIndex(idx)) {
+ list.setSelectedIndex(idx);
}
+ return idx;
}
- public void launch(MouseEvent evt) {
- if (menu != null) {
- menu.show(evt.getComponent(), evt.getX(),evt.getY());
+ protected int checkTableSelection(JTable table, Point p) {
+ int row = table.rowAtPoint(p);
+ if (row >= 0 && row < table.getRowCount() && table.getSelectedRowCount() < 2 && table.getSelectedRow() != row) {
+ table.getSelectionModel().setSelectionInterval(row, row);
}
+ return row;
+ }
+
+ protected TreePath checkTreeSelection(JTree tree, Point p) {
+ TreePath path = tree.getPathForLocation(p.x, p.y);
+ if (path != null && tree.getSelectionCount() < 2 && !tree.isPathSelected(path)) {
+ tree.setSelectionPath(path);
+ }
+ return path;
+ }
+
+ protected static boolean isDoubleClick(MouseEvent e) {
+ return e != null && SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2;
+ }
+
+ /**
+ * @return the popup menu if defined, {@code null} otherwise.
+ * @since 5884
+ */
+ public final JPopupMenu getMenu() {
+ return menu;
}
}
diff --git a/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
similarity index 61%
rename from src/org/openstreetmap/josm/gui/QuadStateCheckBox.java
rename to src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
index 18b8023..d09b446 100644
--- a/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java
+++ b/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
@@ -1,5 +1,5 @@
-// License: GPL. Copyright 2008 by Frederik Ramm and others
-package org.openstreetmap.josm.gui;
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -20,16 +20,41 @@ import javax.swing.SwingUtilities;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.ActionMapUIResource;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * A four-state checkbox. The states are enumerated in {@link State}.
+ * @since 591
+ */
public class QuadStateCheckBox extends JCheckBox {
- public enum State { NOT_SELECTED, SELECTED, UNSET, PARTIAL }
+ /**
+ * The 4 possible states of this checkbox.
+ */
+ public enum State {
+ /** Not selected: the property is explicitly switched off */
+ NOT_SELECTED,
+ /** Selected: the property is explicitly switched on */
+ SELECTED,
+ /** Unset: do not set this property on the selected objects */
+ UNSET,
+ /** Partial: different selected objects have different values, do not change */
+ PARTIAL
+ }
private final QuadStateDecorator model;
private State[] allowed;
+ /**
+ * Constructs a new {@code QuadStateCheckBox}.
+ * @param text the text of the check box
+ * @param icon the Icon image to display
+ * @param initial The initial state
+ * @param allowed The allowed states
+ */
public QuadStateCheckBox(String text, Icon icon, State initial, State[] allowed) {
super(text, icon);
- this.allowed = allowed;
+ this.allowed = Utils.copyArray(allowed);
// Add a listener for when the mouse is pressed
super.addMouseListener(new MouseAdapter() {
@Override public void mousePressed(MouseEvent e) {
@@ -40,6 +65,7 @@ public class QuadStateCheckBox extends JCheckBox {
// Reset the keyboard action map
ActionMap map = new ActionMapUIResource();
map.put("pressed", new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
grabFocus();
model.nextState();
@@ -52,20 +78,38 @@ public class QuadStateCheckBox extends JCheckBox {
setModel(model);
setState(initial);
}
+
+ /**
+ * Constructs a new {@code QuadStateCheckBox}.
+ * @param text the text of the check box
+ * @param initial The initial state
+ * @param allowed The allowed states
+ */
public QuadStateCheckBox(String text, State initial, State[] allowed) {
this(text, null, initial, allowed);
}
/** Do not let anyone add mouse listeners */
@Override public void addMouseListener(MouseListener l) { }
+
/**
* Set the new state.
+ * @param state The new state
*/
- public void setState(State state) { model.setState(state); }
- /** Return the current state, which is determined by the
- * selection status of the model. */
- public State getState() { return model.getState(); }
- @Override public void setSelected(boolean b) {
+ public void setState(State state) {
+ model.setState(state);
+ }
+
+ /**
+ * Return the current state, which is determined by the selection status of the model.
+ * @return The current state
+ */
+ public State getState() {
+ return model.getState();
+ }
+
+ @Override
+ public void setSelected(boolean b) {
if (b) {
setState(State.SELECTED);
} else {
@@ -73,11 +117,13 @@ public class QuadStateCheckBox extends JCheckBox {
}
}
- private class QuadStateDecorator implements ButtonModel {
+ private final class QuadStateDecorator implements ButtonModel {
private final ButtonModel other;
+
private QuadStateDecorator(ButtonModel other) {
this.other = other;
}
+
private void setState(State state) {
if (state == State.NOT_SELECTED) {
other.setArmed(false);
@@ -101,6 +147,7 @@ public class QuadStateCheckBox extends JCheckBox {
setToolTipText(tr("unset: do not set this property on the selected objects"));
}
}
+
/**
* The current state is embedded in the selection / armed
* state of the model.
@@ -134,53 +181,52 @@ public class QuadStateCheckBox extends JCheckBox {
}
}
/** Filter: No one may change the armed/selected/pressed status except us. */
- public void setArmed(boolean b) { }
- public void setSelected(boolean b) { }
- public void setPressed(boolean b) { }
- /** We disable focusing on the component when it is not
- * enabled. */
- public void setEnabled(boolean b) {
+ @Override public void setArmed(boolean b) { }
+ @Override public void setSelected(boolean b) { }
+ @Override public void setPressed(boolean b) { }
+ /** We disable focusing on the component when it is not enabled. */
+ @Override public void setEnabled(boolean b) {
setFocusable(b);
other.setEnabled(b);
}
/** All these methods simply delegate to the "other" model
* that is being decorated. */
- public boolean isArmed() { return other.isArmed(); }
- public boolean isSelected() { return other.isSelected(); }
- public boolean isEnabled() { return other.isEnabled(); }
- public boolean isPressed() { return other.isPressed(); }
- public boolean isRollover() { return other.isRollover(); }
- public void setRollover(boolean b) { other.setRollover(b); }
- public void setMnemonic(int key) { other.setMnemonic(key); }
- public int getMnemonic() { return other.getMnemonic(); }
- public void setActionCommand(String s) {
+ @Override public boolean isArmed() { return other.isArmed(); }
+ @Override public boolean isSelected() { return other.isSelected(); }
+ @Override public boolean isEnabled() { return other.isEnabled(); }
+ @Override public boolean isPressed() { return other.isPressed(); }
+ @Override public boolean isRollover() { return other.isRollover(); }
+ @Override public void setRollover(boolean b) { other.setRollover(b); }
+ @Override public void setMnemonic(int key) { other.setMnemonic(key); }
+ @Override public int getMnemonic() { return other.getMnemonic(); }
+ @Override public void setActionCommand(String s) {
other.setActionCommand(s);
}
- public String getActionCommand() {
+ @Override public String getActionCommand() {
return other.getActionCommand();
}
- public void setGroup(ButtonGroup group) {
+ @Override public void setGroup(ButtonGroup group) {
other.setGroup(group);
}
- public void addActionListener(ActionListener l) {
+ @Override public void addActionListener(ActionListener l) {
other.addActionListener(l);
}
- public void removeActionListener(ActionListener l) {
+ @Override public void removeActionListener(ActionListener l) {
other.removeActionListener(l);
}
- public void addItemListener(ItemListener l) {
+ @Override public void addItemListener(ItemListener l) {
other.addItemListener(l);
}
- public void removeItemListener(ItemListener l) {
+ @Override public void removeItemListener(ItemListener l) {
other.removeItemListener(l);
}
- public void addChangeListener(ChangeListener l) {
+ @Override public void addChangeListener(ChangeListener l) {
other.addChangeListener(l);
}
- public void removeChangeListener(ChangeListener l) {
+ @Override public void removeChangeListener(ChangeListener l) {
other.removeChangeListener(l);
}
- public Object[] getSelectedObjects() {
+ @Override public Object[] getSelectedObjects() {
return other.getSelectedObjects();
}
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java b/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java
new file mode 100644
index 0000000..d1381ff
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java
@@ -0,0 +1,185 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.event.UndoableEditEvent;
+import javax.swing.event.UndoableEditListener;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.JTextComponent;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoManager;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * A popup menu designed for text components. It displays the following actions:
+ * <ul>
+ * <li>Undo</li>
+ * <li>Cut</li>
+ * <li>Copy</li>
+ * <li>Paste</li>
+ * <li>Delete</li>
+ * <li>Select All</li>
+ * </ul>
+ * @since 5886
+ */
+public class TextContextualPopupMenu extends JPopupMenu {
+
+ protected JTextComponent component = null;
+ protected UndoAction undoAction = null;
+
+ protected final PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
+ @Override public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getPropertyName().equals("editable")) {
+ removeAll();
+ addMenuEntries();
+ }
+ }
+ };
+
+ /**
+ * Creates a new {@link TextContextualPopupMenu}.
+ */
+ protected TextContextualPopupMenu() {
+ }
+
+ /**
+ * Attaches this contextual menu to the given text component.
+ * A menu can only be attached to a single component.
+ * @param component The text component that will display the menu and handle its actions.
+ * @return {@code this}
+ * @see #detach()
+ */
+ protected TextContextualPopupMenu attach(JTextComponent component) {
+ if (component != null && !isAttached()) {
+ this.component = component;
+ if (component.isEditable()) {
+ undoAction = new UndoAction();
+ component.getDocument().addUndoableEditListener(undoAction);
+ }
+ addMenuEntries();
+ component.addPropertyChangeListener("editable", propertyChangeListener);
+ }
+ return this;
+ }
+
+ private void addMenuEntries() {
+ if (component.isEditable()) {
+ add(new JMenuItem(undoAction));
+ addSeparator();
+ addMenuEntry(component, tr("Cut"), DefaultEditorKit.cutAction, null);
+ }
+ addMenuEntry(component, tr("Copy"), DefaultEditorKit.copyAction, "copy");
+ if (component.isEditable()) {
+ addMenuEntry(component, tr("Paste"), DefaultEditorKit.pasteAction, "paste");
+ addMenuEntry(component, tr("Delete"), DefaultEditorKit.deleteNextCharAction, null);
+ }
+ addSeparator();
+ addMenuEntry(component, tr("Select All"), DefaultEditorKit.selectAllAction, null);
+ }
+
+ /**
+ * Detaches this contextual menu from its text component.
+ * @return {@code this}
+ * @see #attach(JTextComponent)
+ */
+ protected TextContextualPopupMenu detach() {
+ if (isAttached()) {
+ component.removePropertyChangeListener("editable", propertyChangeListener);
+ removeAll();
+ if (undoAction != null) {
+ component.getDocument().removeUndoableEditListener(undoAction);
+ undoAction = null;
+ }
+ this.component = null;
+ }
+ return this;
+ }
+
+ /**
+ * Creates a new {@link TextContextualPopupMenu} and enables it for the given text component.
+ * @param component The component that will display the menu and handle its actions.
+ * @return The {@link PopupMenuLauncher} responsible of displaying the popup menu.
+ * Call {@link #disableMenuFor} with this object if you want to disable the menu later.
+ * @see #disableMenuFor(JTextComponent, PopupMenuLauncher)
+ */
+ public static PopupMenuLauncher enableMenuFor(JTextComponent component) {
+ PopupMenuLauncher launcher = new PopupMenuLauncher(new TextContextualPopupMenu().attach(component), true);
+ component.addMouseListener(launcher);
+ return launcher;
+ }
+
+ /**
+ * Disables the {@link TextContextualPopupMenu} attached to the given popup menu launcher and text component.
+ * @param component The component that currently displays the menu and handles its actions.
+ * @param launcher The {@link PopupMenuLauncher} obtained via {@link #enableMenuFor}.
+ * @see #enableMenuFor(JTextComponent)
+ */
+ public static void disableMenuFor(JTextComponent component, PopupMenuLauncher launcher) {
+ if (launcher.getMenu() instanceof TextContextualPopupMenu) {
+ ((TextContextualPopupMenu) launcher.getMenu()).detach();
+ component.removeMouseListener(launcher);
+ }
+ }
+
+ /**
+ * Determines if this popup is currently attached to a component.
+ * @return {@code true} if this popup is currently attached to a component, {@code false} otherwise.
+ */
+ public final boolean isAttached() {
+ return component != null;
+ }
+
+ protected void addMenuEntry(JTextComponent component, String label, String actionName, String iconName) {
+ Action action = component.getActionMap().get(actionName);
+ if (action != null) {
+ JMenuItem mi = new JMenuItem(action);
+ mi.setText(label);
+ if (iconName != null && Main.pref.getBoolean("text.popupmenu.useicons", true)) {
+ ImageIcon icon = new ImageProvider(iconName).setWidth(16).get();
+ if (icon != null) {
+ mi.setIcon(icon);
+ }
+ }
+ add(mi);
+ }
+ }
+
+ protected class UndoAction extends AbstractAction implements UndoableEditListener {
+
+ private final UndoManager undoManager = new UndoManager();
+
+ public UndoAction() {
+ super(tr("Undo"));
+ setEnabled(false);
+ }
+
+ @Override
+ public void undoableEditHappened(UndoableEditEvent e) {
+ undoManager.addEdit(e.getEdit());
+ setEnabled(undoManager.canUndo());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ try {
+ undoManager.undo();
+ } catch (CannotUndoException ex) {
+ // Ignored
+ } finally {
+ setEnabled(undoManager.canUndo());
+ }
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/UrlLabel.java b/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
similarity index 55%
rename from src/org/openstreetmap/josm/tools/UrlLabel.java
rename to src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
index 0ffd878..ef4d6e5 100644
--- a/src/org/openstreetmap/josm/tools/UrlLabel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java
@@ -1,51 +1,78 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.tools;
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
+
import javax.swing.JLabel;
import javax.swing.SwingUtilities;
+
+import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.Utils;
+
import static org.openstreetmap.josm.tools.I18n.tr;
/**
* Label that contains a clickable link.
- * @author Imi
- * 5050: Simplifications by Zverikk included by akks
+ * @since 6340
*/
public class UrlLabel extends JLabel implements MouseListener {
private String url = "";
private String description = "";
- private int fontPlus;
+ /**
+ * Constructs a new empty {@code UrlLabel}.
+ */
public UrlLabel() {
addMouseListener(this);
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
}
+ /**
+ * Constructs a new {@code UrlLabel} for the given URL.
+ * @param url The URL to use, also used as description
+ */
public UrlLabel(String url) {
this (url, url, 0);
}
-
+
+ /**
+ * Constructs a new {@code UrlLabel} for the given URL and font increase.
+ * @param url The URL to use, also used as description
+ * @param fontPlus The font increase in 1/72 of an inch units.
+ */
public UrlLabel(String url, int fontPlus) {
this (url, url, fontPlus);
}
+ /**
+ * Constructs a new {@code UrlLabel} for the given URL and description.
+ * @param url The URL to use
+ * @param description The description to display
+ */
public UrlLabel(String url, String description) {
- this (url, url, 0);
+ this (url, description, 0);
}
-
+
+ /**
+ * Constructs a new {@code UrlLabel} for the given URL, description and font increase.
+ * @param url The URL to use
+ * @param description The description to display
+ * @param fontPlus The font increase in 1/72 of an inch units.
+ */
public UrlLabel(String url, String description, int fontPlus) {
this();
setUrl(url);
setDescription(description);
- this.fontPlus = fontPlus;
- if (fontPlus!=0) setFont(getFont().deriveFont(0, getFont().getSize()+fontPlus));
+ if (fontPlus!=0) {
+ setFont(getFont().deriveFont(0, getFont().getSize()+fontPlus));
+ }
refresh();
}
- protected void refresh() {
+ protected final void refresh() {
if (url != null) {
setText("<html><a href=\""+url+"\">"+description+"</a></html>");
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
@@ -63,7 +90,7 @@ public class UrlLabel extends JLabel implements MouseListener {
*
* @param url the url. Can be null.
*/
- public void setUrl(String url) {
+ public final void setUrl(String url) {
this.url = url;
refresh();
}
@@ -73,7 +100,7 @@ public class UrlLabel extends JLabel implements MouseListener {
*
* @param description the description
*/
- public void setDescription(String description) {
+ public final void setDescription(String description) {
this.description = description == null? "" : description;
this.description = this.description.replace("&", "&").replace(">", ">").replace("<", "<");
refresh();
@@ -81,19 +108,30 @@ public class UrlLabel extends JLabel implements MouseListener {
@Override
public void mouseClicked(MouseEvent e) {
- if( SwingUtilities.isLeftMouseButton(e) ) {
+ if (SwingUtilities.isLeftMouseButton(e)) {
OpenBrowser.displayUrl(url);
- } else if( SwingUtilities.isRightMouseButton(e) ) {
+ } else if (SwingUtilities.isRightMouseButton(e)) {
Utils.copyToClipboard(url);
}
}
+
@Override
- public void mousePressed(MouseEvent e) { }
+ public void mousePressed(MouseEvent e) {
+ // Ignored
+ }
+
@Override
- public void mouseEntered(MouseEvent e) { }
+ public void mouseEntered(MouseEvent e) {
+ // Ignored
+ }
+
@Override
- public void mouseExited(MouseEvent e) { }
+ public void mouseExited(MouseEvent e) {
+ // Ignored
+ }
+
@Override
- public void mouseReleased(MouseEvent e) { }
-
+ public void mouseReleased(MouseEvent e) {
+ // Ignored
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java b/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java
index a290060..cd52092 100644
--- a/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java
@@ -34,22 +34,27 @@ public class VerticallyScrollablePanel extends JPanel implements Scrollable {
super(layout);
}
+ @Override
public Dimension getPreferredScrollableViewportSize() {
return getPreferredSize();
}
+ @Override
public int getScrollableBlockIncrement(Rectangle arg0, int arg1, int arg2) {
return 20;
}
+ @Override
public boolean getScrollableTracksViewportHeight() {
return false;
}
+ @Override
public boolean getScrollableTracksViewportWidth() {
return true;
}
+ @Override
public int getScrollableUnitIncrement(Rectangle arg0, int arg1, int arg2) {
return 10;
}
diff --git a/src/org/openstreetmap/josm/io/AbstractParser.java b/src/org/openstreetmap/josm/io/AbstractParser.java
new file mode 100644
index 0000000..b4abe2e
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/AbstractParser.java
@@ -0,0 +1,207 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Date;
+
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.RelationMemberData;
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.history.HistoryNode;
+import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.data.osm.history.HistoryRelation;
+import org.openstreetmap.josm.data.osm.history.HistoryWay;
+import org.openstreetmap.josm.tools.DateUtils;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Base class of {@link OsmChangesetContentParser} and {@link OsmHistoryReader} internal parsers.
+ * @since 6201
+ */
+public abstract class AbstractParser extends DefaultHandler {
+
+ /** the current primitive to be read */
+ protected HistoryOsmPrimitive currentPrimitive;
+ protected Locator locator;
+
+ @Override
+ public void setDocumentLocator(Locator locator) {
+ this.locator = locator;
+ }
+
+ protected abstract void throwException(String message) throws SAXException;
+
+ protected final long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException {
+ String v = attr.getValue(name);
+ if (v == null) {
+ throwException(tr("Missing mandatory attribute ''{0}''.", name));
+ }
+ Long l = 0L;
+ try {
+ l = Long.parseLong(v);
+ } catch(NumberFormatException e) {
+ throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
+ }
+ if (l < 0) {
+ throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
+ }
+ return l;
+ }
+
+ protected final Long getAttributeLong(Attributes attr, String name) throws SAXException {
+ String v = attr.getValue(name);
+ if (v == null)
+ return null;
+ Long l = 0L;
+ try {
+ l = Long.parseLong(v);
+ } catch(NumberFormatException e) {
+ throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
+ }
+ if (l < 0) {
+ throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
+ }
+ return l;
+ }
+
+ protected final Double getAttributeDouble(Attributes attr, String name) throws SAXException {
+ String v = attr.getValue(name);
+ if (v == null) {
+ return null;
+ }
+ double d = 0.0;
+ try {
+ d = Double.parseDouble(v);
+ } catch(NumberFormatException e) {
+ throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v));
+ }
+ return d;
+ }
+
+ protected final String getMandatoryAttributeString(Attributes attr, String name) throws SAXException {
+ String v = attr.getValue(name);
+ if (v == null) {
+ throwException(tr("Missing mandatory attribute ''{0}''.", name));
+ }
+ return v;
+ }
+
+ protected boolean getMandatoryAttributeBoolean(Attributes attr, String name) throws SAXException {
+ String v = attr.getValue(name);
+ if (v == null) {
+ throwException(tr("Missing mandatory attribute ''{0}''.", name));
+ }
+ if ("true".equals(v)) return true;
+ if ("false".equals(v)) return false;
+ throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
+ return false; // not reached
+ }
+
+ protected final HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
+ long id = getMandatoryAttributeLong(atts,"id");
+ long version = getMandatoryAttributeLong(atts,"version");
+ long changesetId = getMandatoryAttributeLong(atts,"changeset");
+ boolean visible= getMandatoryAttributeBoolean(atts, "visible");
+
+ Long uid = getAttributeLong(atts, "uid");
+ String userStr = atts.getValue("user");
+ User user;
+ if (userStr != null) {
+ if (uid != null) {
+ user = User.createOsmUser(uid, userStr);
+ } else {
+ user = User.createLocalUser(userStr);
+ }
+ } else {
+ user = User.getAnonymous();
+ }
+
+ String v = getMandatoryAttributeString(atts, "timestamp");
+ Date timestamp = DateUtils.fromString(v);
+ HistoryOsmPrimitive primitive = null;
+ if (type.equals(OsmPrimitiveType.NODE)) {
+ Double lat = getAttributeDouble(atts, "lat");
+ Double lon = getAttributeDouble(atts, "lon");
+ LatLon coor = (lat != null && lon != null) ? new LatLon(lat,lon) : null;
+ primitive = new HistoryNode(
+ id,version,visible,user,changesetId,timestamp,coor
+ );
+
+ } else if (type.equals(OsmPrimitiveType.WAY)) {
+ primitive = new HistoryWay(
+ id,version,visible,user,changesetId,timestamp
+ );
+ } else if (type.equals(OsmPrimitiveType.RELATION)) {
+ primitive = new HistoryRelation(
+ id,version,visible,user,changesetId,timestamp
+ );
+ }
+ return primitive;
+ }
+
+ protected final void startNode(Attributes atts) throws SAXException {
+ currentPrimitive = createPrimitive(atts, OsmPrimitiveType.NODE);
+ }
+
+ protected final void startWay(Attributes atts) throws SAXException {
+ currentPrimitive = createPrimitive(atts, OsmPrimitiveType.WAY);
+ }
+
+ protected final void startRelation(Attributes atts) throws SAXException {
+ currentPrimitive = createPrimitive(atts, OsmPrimitiveType.RELATION);
+ }
+
+ protected final void handleTag(Attributes atts) throws SAXException {
+ String key = getMandatoryAttributeString(atts, "k");
+ String value = getMandatoryAttributeString(atts, "v");
+ currentPrimitive.put(key,value);
+ }
+
+ protected final void handleNodeReference(Attributes atts) throws SAXException {
+ long ref = getMandatoryAttributeLong(atts, "ref");
+ ((HistoryWay)currentPrimitive).addNode(ref);
+ }
+
+ protected void handleMember(Attributes atts) throws SAXException {
+ long ref = getMandatoryAttributeLong(atts, "ref");
+ String v = getMandatoryAttributeString(atts, "type");
+ OsmPrimitiveType type = null;
+ try {
+ type = OsmPrimitiveType.fromApiTypeName(v);
+ } catch(IllegalArgumentException e) {
+ throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v));
+ }
+ String role = getMandatoryAttributeString(atts, "role");
+ RelationMemberData member = new RelationMemberData(role, type,ref);
+ ((HistoryRelation)currentPrimitive).addMember(member);
+ }
+
+ protected final boolean doStartElement(String qName, Attributes atts) throws SAXException {
+ if (qName.equals("node")) {
+ startNode(atts);
+ return true;
+ } else if (qName.equals("way")) {
+ startWay(atts);
+ return true;
+ } else if (qName.equals("relation")) {
+ startRelation(atts);
+ return true;
+ } else if (qName.equals("tag")) {
+ handleTag(atts);
+ return true;
+ } else if (qName.equals("nd")) {
+ handleNodeReference(atts);
+ return true;
+ } else if (qName.equals("member")) {
+ handleMember(atts);
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/AbstractReader.java b/src/org/openstreetmap/josm/io/AbstractReader.java
index bf41dce..8394851 100644
--- a/src/org/openstreetmap/josm/io/AbstractReader.java
+++ b/src/org/openstreetmap/josm/io/AbstractReader.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
@@ -100,14 +101,14 @@ public abstract class AbstractReader {
}
}
if (n.isDeleted()) {
- System.out.println(tr("Deleted node {0} is part of way {1}", id, w.getId()));
+ Main.info(tr("Deleted node {0} is part of way {1}", id, w.getId()));
} else {
wayNodes.add(n);
}
}
w.setNodes(wayNodes);
if (w.hasIncompleteNodes()) {
- System.out.println(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.",
+ Main.info(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.",
externalWayId, w.getNodesCount()));
}
ds.addPrimitive(w);
@@ -173,7 +174,7 @@ public abstract class AbstractReader {
}
}
if (primitive.isDeleted()) {
- System.out.println(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId()));
+ Main.info(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId()));
} else {
relationMembers.add(new RelationMember(rm.getRole(), primitive));
}
diff --git a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
index c314151..b9edef2 100644
--- a/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
+++ b/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10,8 +10,14 @@ import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
+/**
+ * Read content from OSM server for a given bounding box
+ * @since 627
+ */
public class BoundingBoxDownloader extends OsmServerReader {
/**
@@ -23,11 +29,16 @@ public class BoundingBoxDownloader extends OsmServerReader {
protected final double lon2;
protected final boolean crosses180th;
+ /**
+ * Constructs a new {@code BoundingBoxDownloader}.
+ * @param downloadArea The area to download
+ */
public BoundingBoxDownloader(Bounds downloadArea) {
- this.lat1 = downloadArea.getMin().lat();
- this.lon1 = downloadArea.getMin().lon();
- this.lat2 = downloadArea.getMax().lat();
- this.lon2 = downloadArea.getMax().lon();
+ CheckParameterUtil.ensureParameterNotNull(downloadArea, "downloadArea");
+ this.lat1 = downloadArea.getMinLat();
+ this.lon1 = downloadArea.getMinLon();
+ this.lat2 = downloadArea.getMaxLat();
+ this.lon2 = downloadArea.getMaxLon();
this.crosses180th = downloadArea.crosses180thMeridian();
}
@@ -51,19 +62,13 @@ public class BoundingBoxDownloader extends OsmServerReader {
} else{
done = true;
}
- in.close();
+ Utils.close(in);
activeConnection = null;
}
result.fromServer = true;
return result;
}
-
- /**
- * Retrieve raw gps waypoints from the server API.
- * @return A list of all primitives retrieved. Currently, the list of lists
- * contain only one list, since the server cannot distinguish between
- * ways.
- */
+
@Override
public GpxData parseRawGps(ProgressMonitor progressMonitor) throws OsmTransferException {
progressMonitor.beginTask("", 1);
@@ -104,10 +109,6 @@ public class BoundingBoxDownloader extends OsmServerReader {
return "map?bbox=" + lon1 + "," + lat1 + "," + lon2 + "," + lat2;
}
- /**
- * Read the data from the osm server address.
- * @return A data set containing all data retrieved from that url
- */
@Override
public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
progressMonitor.beginTask(tr("Contacting OSM Server..."), 10);
@@ -129,7 +130,7 @@ public class BoundingBoxDownloader extends OsmServerReader {
if (ds2 == null)
return null;
ds.mergeFrom(ds2);
-
+
} else {
// Simple request
in = getInputStream(getRequestForBbox(lon1, lat1, lon2, lat2), progressMonitor.createSubTaskMonitor(9, false));
@@ -144,9 +145,7 @@ public class BoundingBoxDownloader extends OsmServerReader {
throw new OsmTransferException(e);
} finally {
progressMonitor.finishTask();
- if (in != null) {
- try {in.close();} catch(IOException e) {}
- }
+ Utils.close(in);
activeConnection = null;
}
}
diff --git a/src/org/openstreetmap/josm/io/CacheCustomContent.java b/src/org/openstreetmap/josm/io/CacheCustomContent.java
index dbb2ec3..13d326f 100644
--- a/src/org/openstreetmap/josm/io/CacheCustomContent.java
+++ b/src/org/openstreetmap/josm/io/CacheCustomContent.java
@@ -8,9 +8,9 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.util.Date;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
/**
* Use this class if you want to cache and store a single file that gets updated regularly.
@@ -85,7 +85,7 @@ public abstract class CacheCustomContent<T extends Throwable> {
* @return Returns the data
*/
public byte[] updateIfRequired() throws T {
- if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/1000
+ if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < System.currentTimeMillis()/1000
|| !isCacheValid())
return updateForce();
return getData();
@@ -96,7 +96,7 @@ public abstract class CacheCustomContent<T extends Throwable> {
* @return Returns the data as string
*/
public String updateIfRequiredString() throws T {
- if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < new Date().getTime()/1000
+ if (Main.pref.getInteger("cache." + ident, 0) + updateInterval < System.currentTimeMillis()/1000
|| !isCacheValid())
return updateForceString();
return getDataString();
@@ -109,7 +109,7 @@ public abstract class CacheCustomContent<T extends Throwable> {
public byte[] updateForce() throws T {
this.data = updateData();
saveToDisk();
- Main.pref.putInteger("cache." + ident, (int)(new Date().getTime()/1000));
+ Main.pref.putInteger("cache." + ident, (int)(System.currentTimeMillis()/1000));
return data;
}
@@ -158,13 +158,15 @@ public abstract class CacheCustomContent<T extends Throwable> {
if (Main.applet)
this.data = updateForce();
else {
+ BufferedInputStream input = null;
try {
- BufferedInputStream input = new BufferedInputStream(new FileInputStream(path));
+ input = new BufferedInputStream(new FileInputStream(path));
this.data = new byte[input.available()];
input.read(this.data);
- input.close();
} catch (IOException e) {
this.data = updateForce();
+ } finally {
+ Utils.close(input);
}
}
}
@@ -175,13 +177,15 @@ public abstract class CacheCustomContent<T extends Throwable> {
private void saveToDisk() {
if (Main.applet)
return;
+ BufferedOutputStream output = null;
try {
- BufferedOutputStream output = new BufferedOutputStream(new FileOutputStream(path));
+ output = new BufferedOutputStream(new FileOutputStream(path));
output.write(this.data);
output.flush();
- output.close();
} catch(Exception e) {
e.printStackTrace();
+ } finally {
+ Utils.close(output);
}
}
diff --git a/src/org/openstreetmap/josm/io/CacheFiles.java b/src/org/openstreetmap/josm/io/CacheFiles.java
index 3e72948..8e87dcc 100644
--- a/src/org/openstreetmap/josm/io/CacheFiles.java
+++ b/src/org/openstreetmap/josm/io/CacheFiles.java
@@ -6,7 +6,6 @@ import java.io.File;
import java.io.RandomAccessFile;
import java.math.BigInteger;
import java.security.MessageDigest;
-import java.util.Date;
import java.util.Iterator;
import java.util.Set;
import java.util.TreeMap;
@@ -14,6 +13,7 @@ import java.util.TreeMap;
import javax.imageio.ImageIO;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
/**
* Use this class if you want to cache a lot of files that shouldn't be kept in memory. You can
@@ -50,15 +50,21 @@ public class CacheFiles {
/**
* Creates a new cache class. The ident will be used to store the files on disk and to save
- * expire/space settings.
- * @param ident
+ * expire/space settings. Set plugin state to <code>true</code>.
+ * @param ident cache identifier
*/
public CacheFiles(String ident) {
this(ident, true);
}
+ /**
+ * Creates a new cache class. The ident will be used to store the files on disk and to save
+ * expire/space settings.
+ * @param ident cache identifier
+ * @param isPlugin Whether this is a plugin or not (changes cache path)
+ */
public CacheFiles(String ident, boolean isPlugin) {
- String pref = isPlugin ?
+ String pref = isPlugin ?
Main.pref.getPluginsDirectory().getPath() + File.separator + "cache" :
Main.pref.getCacheDirectory().getPath();
@@ -86,8 +92,8 @@ public class CacheFiles {
/**
* Loads the data for the given ident as an byte array. Returns null if data not available.
- * @param ident
- * @return
+ * @param ident cache identifier
+ * @return stored data
*/
public byte[] getData(String ident) {
if(!enabled) return null;
@@ -103,34 +109,39 @@ public class CacheFiles {
// Update last mod time so we don't expire recently used data
if(updateModTime) {
- data.setLastModified(new Date().getTime());
+ data.setLastModified(System.currentTimeMillis());
}
byte[] bytes = new byte[(int) data.length()];
new RandomAccessFile(data, "r").readFully(bytes);
return bytes;
- } catch(Exception e) {
- System.out.println(e.getMessage());
+ } catch (Exception e) {
+ Main.warn(e);
}
return null;
}
/**
* Writes an byte-array to disk
- * @param ident
- * @param data
+ * @param ident cache identifier
+ * @param data data to store
*/
public void saveData(String ident, byte[] data) {
if(!enabled) return;
try {
File f = getPath(ident);
- if(f.exists()) {
+ if (f.exists()) {
f.delete();
}
// rws also updates the file meta-data, i.e. last mod time
- new RandomAccessFile(f, "rws").write(data);
- } catch(Exception e){
- System.out.println(e.getMessage());
+ RandomAccessFile raf = new RandomAccessFile(f, "rws");
+ try {
+ raf.write(data);
+ } finally {
+ Utils.close(raf);
+ }
+ } catch (Exception e) {
+ Main.warn(e);
}
writes++;
@@ -139,7 +150,7 @@ public class CacheFiles {
/**
* Loads the data for the given ident as an image. If no image is found, null is returned
- * @param ident Identifier
+ * @param ident cache identifier
* @return BufferedImage or null
*/
public BufferedImage getImg(String ident) {
@@ -155,26 +166,26 @@ public class CacheFiles {
}
// Update last mod time so we don't expire recently used images
if(updateModTime) {
- img.setLastModified(new Date().getTime());
+ img.setLastModified(System.currentTimeMillis());
}
return ImageIO.read(img);
- } catch(Exception e) {
- System.out.println(e.getMessage());
+ } catch (Exception e) {
+ Main.warn(e);
}
return null;
}
/**
* Saves a given image and ident to the cache
- * @param ident
- * @param image
+ * @param ident cache identifier
+ * @param image imaga data for storage
*/
public void saveImg(String ident, BufferedImage image) {
- if(!enabled) return;
+ if (!enabled) return;
try {
ImageIO.write(image, "png", getPath(ident, "png"));
- } catch(Exception e){
- System.out.println(e.getMessage());
+ } catch (Exception e) {
+ Main.warn(e);
}
writes++;
@@ -210,9 +221,9 @@ public class CacheFiles {
}
/**
- * Call this with true to update the last modification time when a file it is read.
- * Call this with false to not update the last modification time when a file is read.
- * @param to
+ * Call this with <code>true</code> to update the last modification time when a file it is read.
+ * Call this with <code>false</code> to not update the last modification time when a file is read.
+ * @param to update state
*/
public void setUpdateModTime(boolean to) {
updateModTime = to;
@@ -322,9 +333,9 @@ public class CacheFiles {
/**
* Gets file path for ident with customizable file-ending
- * @param ident
- * @param ending
- * @return File
+ * @param ident cache identifier
+ * @param ending file extension
+ * @return file structure
*/
private File getPath(String ident, String ending) {
return new File(dir, getUniqueFilename(ident) + "." + ending);
@@ -332,9 +343,8 @@ public class CacheFiles {
/**
* Gets file path for ident
- * @param ident
- * @param ending
- * @return File
+ * @param ident cache identifier
+ * @return file structure
*/
private File getPath(String ident) {
return new File(dir, getUniqueFilename(ident));
@@ -342,12 +352,12 @@ public class CacheFiles {
/**
* Checks whether a given file is expired
- * @param file
- * @return expired?
+ * @param file file description structure
+ * @return expired state
*/
private boolean isExpired(File file) {
if(CacheFiles.EXPIRE_NEVER == this.expire)
return false;
- return (file.lastModified() < (new Date().getTime() - expire*1000));
+ return (file.lastModified() < (System.currentTimeMillis() - expire*1000));
}
}
diff --git a/src/org/openstreetmap/josm/io/Capabilities.java b/src/org/openstreetmap/josm/io/Capabilities.java
index eff8efc..b30d90b 100644
--- a/src/org/openstreetmap/josm/io/Capabilities.java
+++ b/src/org/openstreetmap/josm/io/Capabilities.java
@@ -7,12 +7,15 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
+import org.openstreetmap.josm.Main;
/**
* Represents the server capabilities
*
* Example capabilites document:
- *
+ *
* <osm version="0.6" generator="OpenStreetMap server">
* <api>
* <version minimum="0.6" maximum="0.6"/>
@@ -31,7 +34,7 @@ import java.util.List;
* </imagery>
* </policy>
* </osm>
- *
+ *
* This class is used in conjunction with a very primitive parser
* and simply stuffs the each tag and its attributes into a hash
* of hashes, with the exception of the "blacklist" tag which gets
@@ -39,9 +42,12 @@ import java.util.List;
*/
public class Capabilities {
- private HashMap<String, HashMap<String,String>> capabilities;
- private ArrayList<String> imageryBlacklist;
+ private Map<String, HashMap<String,String>> capabilities;
+ private List<String> imageryBlacklist;
+ /**
+ * Constructs new {@code Capabilities}.
+ */
public Capabilities() {
clear();
}
@@ -119,12 +125,12 @@ public class Capabilities {
try {
int n = Integer.parseInt(v);
if (n <= 0) {
- System.err.println(tr("Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server capabilities. Got ''{2}''", "changesets", "maximum_elements", n ));
+ Main.warn(tr("Illegal value of attribute ''{0}'' of element ''{1}'' in server capabilities. Got ''{2}''", "changesets", "maximum_elements", n ));
return -1;
}
return n;
- } catch(NumberFormatException e) {
- System.err.println(tr("Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server capabilities. Got ''{2}''", "changesets", "maximum_elements", v ));
+ } catch (NumberFormatException e) {
+ Main.warn(tr("Illegal value of attribute ''{0}'' of element ''{1}'' in server capabilities. Got ''{2}''", "changesets", "maximum_elements", v ));
return -1;
}
}
diff --git a/src/org/openstreetmap/josm/io/ChangesetClosedException.java b/src/org/openstreetmap/josm/io/ChangesetClosedException.java
index 5bcb646..c1a28fc 100644
--- a/src/org/openstreetmap/josm/io/ChangesetClosedException.java
+++ b/src/org/openstreetmap/josm/io/ChangesetClosedException.java
@@ -11,6 +11,8 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.openstreetmap.josm.Main;
+
/**
* A ChangesetClosedException is thrown if the server replies with a HTTP
* return code 409 (Conflict) with the error header {@link #ERROR_HEADER_PATTERN}.
@@ -80,11 +82,11 @@ public class ChangesetClosedException extends OsmTransferException {
try {
closedOn = formatter.parse(m.group(2));
} catch(ParseException ex) {
- System.err.println(tr("Failed to parse date ''{0}'' replied by server.", m.group(2)));
+ Main.error(tr("Failed to parse date ''{0}'' replied by server.", m.group(2)));
ex.printStackTrace();
}
} else {
- System.err.println(tr("Unexpected format of error header for conflict in changeset update. Got ''{0}''", errorHeader));
+ Main.error(tr("Unexpected format of error header for conflict in changeset update. Got ''{0}''", errorHeader));
}
}
diff --git a/src/org/openstreetmap/josm/io/ChangesetQuery.java b/src/org/openstreetmap/josm/io/ChangesetQuery.java
index 24075f5..a2ef100 100644
--- a/src/org/openstreetmap/josm/io/ChangesetQuery.java
+++ b/src/org/openstreetmap/josm/io/ChangesetQuery.java
@@ -9,13 +9,19 @@ import java.text.DateFormat;
import java.text.MessageFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Map.Entry;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
public class ChangesetQuery {
@@ -45,6 +51,8 @@ public class ChangesetQuery {
private Boolean open = null;
/** indicates whether only closed changesets are queried. null, if no restrictions regarding open changesets apply */
private Boolean closed = null;
+ /** a collection of changeset ids to query for */
+ private Collection<Long> changesetIds = null;
public ChangesetQuery() {}
@@ -225,6 +233,19 @@ public class ChangesetQuery {
}
/**
+ * Restricts the query to the given changeset ids (which are added to previously added ones).
+ *
+ * @param changesetIds the changeset ids
+ * @return the query object with the applied restriction
+ * @throws IllegalArgumentException thrown if changesetIds is null.
+ */
+ public ChangesetQuery forChangesetIds(Collection<Long> changesetIds) {
+ CheckParameterUtil.ensureParameterNotNull(changesetIds, "changesetIds");
+ this.changesetIds = changesetIds;
+ return this;
+ }
+
+ /**
* Replies the query string to be used in a query URL for the OSM API.
*
* @return the query string
@@ -271,6 +292,12 @@ public class ChangesetQuery {
sb.append("&");
}
sb.append("closed=").append(Boolean.toString(closed));
+ } else if (changesetIds != null) {
+ // since 2013-12-05, see https://github.com/openstreetmap/openstreetmap-website/commit/1d1f194d598e54a5d6fb4f38fb569d4138af0dc8
+ if (sb.length() > 0) {
+ sb.append("&");
+ }
+ sb.append("changesets=").append(Utils.join(",", changesetIds));
}
return sb.toString();
}
@@ -301,7 +328,7 @@ public class ChangesetQuery {
public static class ChangesetQueryUrlParser {
protected int parseUid(String value) throws ChangesetQueryUrlException {
- if (value == null || value.trim().equals(""))
+ if (value == null || value.trim().isEmpty())
throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "uid",value));
int id;
try {
@@ -315,7 +342,7 @@ public class ChangesetQuery {
}
protected boolean parseOpen(String value) throws ChangesetQueryUrlException {
- if (value == null || value.trim().equals(""))
+ if (value == null || value.trim().isEmpty())
throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "open",value));
if (value.equals("true"))
return true;
@@ -326,7 +353,7 @@ public class ChangesetQuery {
}
protected boolean parseBoolean(String value, String parameter) throws ChangesetQueryUrlException {
- if (value == null || value.trim().equals(""))
+ if (value == null || value.trim().isEmpty())
throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter,value));
if (value.equals("true"))
return true;
@@ -337,7 +364,7 @@ public class ChangesetQuery {
}
protected Date parseDate(String value, String parameter) throws ChangesetQueryUrlException {
- if (value == null || value.trim().equals(""))
+ if (value == null || value.trim().isEmpty())
throw new ChangesetQueryUrlException(tr("Unexpected value for ''{0}'' in changeset query url, got {1}", parameter,value));
if (value.endsWith("Z")) {
// OSM API generates date strings we time zone abbreviation "Z" which Java SimpleDateFormat
@@ -364,10 +391,22 @@ public class ChangesetQuery {
return null;
}
- protected ChangesetQuery crateFromMap(Map<String,String> queryParams) throws ChangesetQueryUrlException {
+ protected Collection<Long> parseLongs(String value) {
+ return value == null || value.isEmpty()
+ ? Collections.<Long>emptySet() :
+ new HashSet<Long>(Utils.transform(Arrays.asList(value.split(",")), new Utils.Function<String, Long>() {
+ @Override
+ public Long apply(String x) {
+ return Long.valueOf(x);
+ }
+ }));
+ }
+
+ protected ChangesetQuery createFromMap(Map<String, String> queryParams) throws ChangesetQueryUrlException {
ChangesetQuery csQuery = new ChangesetQuery();
- for (String k: queryParams.keySet()) {
+ for (Entry<String, String> entry: queryParams.entrySet()) {
+ String k = entry.getKey();
if (k.equals("uid")) {
if (queryParams.containsKey("display_name"))
throw new ChangesetQueryUrlException(tr("Cannot create a changeset query including both the query parameters ''uid'' and ''display_name''"));
@@ -377,13 +416,13 @@ public class ChangesetQuery {
throw new ChangesetQueryUrlException(tr("Cannot create a changeset query including both the query parameters ''uid'' and ''display_name''"));
csQuery.forUser(queryParams.get("display_name"));
} else if (k.equals("open")) {
- boolean b = parseBoolean(queryParams.get(k), "open");
+ boolean b = parseBoolean(entry.getValue(), "open");
csQuery.beingOpen(b);
} else if (k.equals("closed")) {
- boolean b = parseBoolean(queryParams.get(k), "closed");
+ boolean b = parseBoolean(entry.getValue(), "closed");
csQuery.beingClosed(b);
} else if (k.equals("time")) {
- Date[] dates = parseTime(queryParams.get(k));
+ Date[] dates = parseTime(entry.getValue());
switch(dates.length) {
case 1:
csQuery.closedAfter(dates[0]);
@@ -394,12 +433,18 @@ public class ChangesetQuery {
}
} else if (k.equals("bbox")) {
try {
- csQuery.inBbox(new Bounds(queryParams.get(k), ","));
+ csQuery.inBbox(new Bounds(entry.getValue(), ","));
} catch(IllegalArgumentException e) {
throw new ChangesetQueryUrlException(e);
}
+ } else if (k.equals("changesets")) {
+ try {
+ csQuery.forChangesetIds(parseLongs(entry.getValue()));
+ } catch (NumberFormatException e) {
+ throw new ChangesetQueryUrlException(e);
+ }
} else
- throw new ChangesetQueryUrlException(tr("Unsupported parameter ''{0}'' in changeset query string",k ));
+ throw new ChangesetQueryUrlException(tr("Unsupported parameter ''{0}'' in changeset query string", k));
}
return csQuery;
}
@@ -409,7 +454,7 @@ public class ChangesetQuery {
String[] keyValuePairs = query.split("&");
for (String keyValuePair: keyValuePairs) {
String[] kv = keyValuePair.split("=");
- queryParams.put(kv[0], kv[1]);
+ queryParams.put(kv[0], kv.length > 1 ? kv[1] : "");
}
return queryParams;
}
@@ -435,10 +480,10 @@ public class ChangesetQuery {
if (query == null)
return new ChangesetQuery();
query = query.trim();
- if (query.equals(""))
+ if (query.isEmpty())
return new ChangesetQuery();
Map<String,String> queryParams = createMapFromQueryString(query);
- return crateFromMap(queryParams);
+ return createFromMap(queryParams);
}
}
}
diff --git a/src/org/openstreetmap/josm/io/DefaultProxySelector.java b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
index 1adc766..11c26de 100644
--- a/src/org/openstreetmap/josm/io/DefaultProxySelector.java
+++ b/src/org/openstreetmap/josm/io/DefaultProxySelector.java
@@ -6,10 +6,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Proxy;
+import java.net.Proxy.Type;
import java.net.ProxySelector;
import java.net.SocketAddress;
import java.net.URI;
-import java.net.Proxy.Type;
import java.util.Collections;
import java.util.List;
@@ -31,7 +31,7 @@ public class DefaultProxySelector extends ProxySelector {
* We therefore read the property at class loading time and remember it's value.
*/
private static boolean JVM_WILL_USE_SYSTEM_PROXIES = false;
- {
+ static {
String v = System.getProperty("java.net.useSystemProxies");
if (v != null && v.equals(Boolean.TRUE.toString())) {
JVM_WILL_USE_SYSTEM_PROXIES = true;
@@ -78,13 +78,13 @@ public class DefaultProxySelector extends ProxySelector {
try {
port = Integer.parseInt(value);
} catch (NumberFormatException e) {
- System.err.println(tr("Unexpected format for port number in in preference ''{0}''. Got ''{1}''.", property, value));
- System.err.println(tr("The proxy will not be used."));
+ Main.error(tr("Unexpected format for port number in in preference ''{0}''. Got ''{1}''.", property, value));
+ Main.error(tr("The proxy will not be used."));
return 0;
}
if (port <= 0 || port > 65535) {
- System.err.println(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port));
- System.err.println(tr("The proxy will not be used."));
+ Main.error(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port));
+ Main.error(tr("The proxy will not be used."));
return 0;
}
return port;
@@ -99,43 +99,42 @@ public class DefaultProxySelector extends ProxySelector {
if (value.length() == 0) {
proxyPolicy = ProxyPolicy.NO_PROXY;
} else {
- proxyPolicy= ProxyPolicy.fromName(value);
+ proxyPolicy = ProxyPolicy.fromName(value);
if (proxyPolicy == null) {
- System.err.println(tr("Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no proxy.", ProxyPreferencesPanel.PROXY_POLICY, value));
+ Main.warn(tr("Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no proxy.", ProxyPreferencesPanel.PROXY_POLICY, value));
proxyPolicy = ProxyPolicy.NO_PROXY;
}
}
String host = Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_HOST, null);
int port = parseProxyPortValue(ProxyPreferencesPanel.PROXY_HTTP_PORT, Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_PORT, null));
- if (host != null && ! host.trim().equals("") && port > 0) {
- httpProxySocketAddress = new InetSocketAddress(host,port);
- } else {
- httpProxySocketAddress = null;
- if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
- System.err.println(tr("Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''.", host, port));
- System.err.println(tr("The proxy will not be used."));
+ httpProxySocketAddress = null;
+ if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
+ if (host != null && !host.trim().isEmpty() && port > 0) {
+ httpProxySocketAddress = new InetSocketAddress(host, port);
+ } else {
+ Main.warn(tr("Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''.", host, port));
+ Main.warn(tr("The proxy will not be used."));
}
}
host = Main.pref.get(ProxyPreferencesPanel.PROXY_SOCKS_HOST, null);
port = parseProxyPortValue(ProxyPreferencesPanel.PROXY_SOCKS_PORT, Main.pref.get(ProxyPreferencesPanel.PROXY_SOCKS_PORT, null));
- if (host != null && ! host.trim().equals("") && port > 0) {
- socksProxySocketAddress = new InetSocketAddress(host,port);
- } else {
- socksProxySocketAddress = null;
- if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
- System.err.println(tr("Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''.", host, port));
- System.err.println(tr("The proxy will not be used."));
+ socksProxySocketAddress = null;
+ if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
+ if (host != null && !host.trim().isEmpty() && port > 0) {
+ socksProxySocketAddress = new InetSocketAddress(host,port);
+ } else {
+ Main.warn(tr("Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''.", host, port));
+ Main.warn(tr("The proxy will not be used."));
}
}
}
@Override
public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
- // Just log something. The network stack will also throw an exception which will be caught
- // somewhere else
+ // Just log something. The network stack will also throw an exception which will be caught somewhere else
//
- System.out.println(tr("Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}", sa.toString(), uri.toString(), ioe.toString()));
+ Main.error(tr("Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}", sa.toString(), uri.toString(), ioe.toString()));
}
@Override
@@ -144,7 +143,7 @@ public class DefaultProxySelector extends ProxySelector {
switch(proxyPolicy) {
case USE_SYSTEM_SETTINGS:
if (!JVM_WILL_USE_SYSTEM_PROXIES) {
- System.err.println(tr("Warning: the JVM is not configured to lookup proxies from the system settings. The property ''java.net.useSystemProxies'' was missing at startup time. Will not use a proxy."));
+ Main.warn(tr("The JVM is not configured to lookup proxies from the system settings. The property ''java.net.useSystemProxies'' was missing at startup time. Will not use a proxy."));
return Collections.singletonList(Proxy.NO_PROXY);
}
// delegate to the former proxy selector
diff --git a/src/org/openstreetmap/josm/io/DiffResultProcessor.java b/src/org/openstreetmap/josm/io/DiffResultProcessor.java
index 73314f3..8fbcd81 100644
--- a/src/org/openstreetmap/josm/io/DiffResultProcessor.java
+++ b/src/org/openstreetmap/josm/io/DiffResultProcessor.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
diff --git a/src/org/openstreetmap/josm/io/FileExporter.java b/src/org/openstreetmap/josm/io/FileExporter.java
index b74c8fa..0056333 100644
--- a/src/org/openstreetmap/josm/io/FileExporter.java
+++ b/src/org/openstreetmap/josm/io/FileExporter.java
@@ -11,7 +11,7 @@ import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
import org.openstreetmap.josm.gui.layer.Layer;
public abstract class FileExporter implements LayerChangeListener {
-
+
public final ExtensionFileFilter filter;
private boolean enabled;
@@ -30,7 +30,7 @@ public abstract class FileExporter implements LayerChangeListener {
}
/**
- * Returns the enabled state of this {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
+ * Returns the enabled state of this {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
* @return true if this {@code FileExporter} is enabled
* @since 5459
*/
diff --git a/src/org/openstreetmap/josm/io/FileImporter.java b/src/org/openstreetmap/josm/io/FileImporter.java
index bda01cc..50590f3 100644
--- a/src/org/openstreetmap/josm/io/FileImporter.java
+++ b/src/org/openstreetmap/josm/io/FileImporter.java
@@ -23,7 +23,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
public abstract class FileImporter implements Comparable<FileImporter>, LayerChangeListener {
public final ExtensionFileFilter filter;
-
+
private boolean enabled;
public FileImporter(ExtensionFileFilter filter) {
@@ -62,7 +62,7 @@ public abstract class FileImporter implements Comparable<FileImporter>, LayerCha
*/
public boolean importDataHandleExceptions(File f, ProgressMonitor progressMonitor) {
try {
- System.out.println("Open file: " + f.getAbsolutePath() + " (" + f.length() + " bytes)");
+ Main.info("Open file: " + f.getAbsolutePath() + " (" + f.length() + " bytes)");
importData(f, progressMonitor);
return true;
} catch (Exception e) {
@@ -78,7 +78,7 @@ public abstract class FileImporter implements Comparable<FileImporter>, LayerCha
}
public boolean importDataHandleExceptions(List<File> files, ProgressMonitor progressMonitor) {
try {
- System.out.println("Open "+files.size()+" files");
+ Main.info("Open "+files.size()+" files");
importData(files, progressMonitor);
return true;
} catch (Exception e) {
@@ -102,10 +102,11 @@ public abstract class FileImporter implements Comparable<FileImporter>, LayerCha
return 0;
}
+ @Override
public int compareTo(FileImporter other) {
- return (new Double(this.getPriority())).compareTo(other.getPriority());
+ return Double.compare(this.getPriority(), other.getPriority());
}
-
+
public static CBZip2InputStream getBZip2InputStream(InputStream in) throws IOException {
if (in == null) {
return null;
@@ -128,7 +129,7 @@ public abstract class FileImporter implements Comparable<FileImporter>, LayerCha
}
/**
- * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
+ * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
* @return true if this {@code FileImporter} is enabled
* @since 5459
*/
diff --git a/src/org/openstreetmap/josm/io/GeoJSONExporter.java b/src/org/openstreetmap/josm/io/GeoJSONExporter.java
index eb89f50..9ad4880 100644
--- a/src/org/openstreetmap/josm/io/GeoJSONExporter.java
+++ b/src/org/openstreetmap/josm/io/GeoJSONExporter.java
@@ -13,12 +13,13 @@ import java.io.Writer;
import org.openstreetmap.josm.actions.ExtensionFileFilter;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Utils;
public class GeoJSONExporter extends FileExporter {
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"json,geojson", "json", tr("GeoJSON Files") + " (*.json *.geojson)");
-
+
public GeoJSONExporter() {
super(FILE_FILTER);
}
@@ -31,7 +32,7 @@ public class GeoJSONExporter extends FileExporter {
try {
out.write(json);
} finally {
- out.close();
+ Utils.close(out);
}
} else {
throw new IllegalArgumentException(tr("Layer ''{0}'' not supported", layer.getClass().toString()));
diff --git a/src/org/openstreetmap/josm/io/GeoJSONWriter.java b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
index 35b86cc..ab6e840 100644
--- a/src/org/openstreetmap/josm/io/GeoJSONWriter.java
+++ b/src/org/openstreetmap/josm/io/GeoJSONWriter.java
@@ -1,8 +1,12 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
+import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
+
+import org.json.JSONStringer;
+import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.Node;
@@ -15,46 +19,42 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
public class GeoJSONWriter implements Visitor {
private OsmDataLayer layer;
- private StringBuilder out;
- private final boolean skipEmptyNodes = true;
- private boolean insertComma = false;
+ private JSONStringer out;
+ private static final boolean skipEmptyNodes = true;
public GeoJSONWriter(OsmDataLayer layer) {
this.layer = layer;
}
public String write() {
- out = new StringBuilder(1 << 12);
- out.append("{\"type\": \"FeatureCollection\",\n");
- out.append("\"features\": [\n");
+ out = new JSONStringer();
+ out.object().key("type").value("FeatureCollection");
+ out.key("generator").value("JOSM");
+ appendLayerBounds();
+ out.key("features").array();
for (Node n : layer.data.getNodes()) {
appendPrimitive(n);
}
for (Way w : layer.data.getWays()) {
appendPrimitive(w);
}
- out.append("\n]\n}");
+ out.endArray().endObject();
return out.toString();
}
@Override
public void visit(Node n) {
- out.append("\"type\": \"Point\", \"coordinates\": ");
+ out.key("type").value("Point").key("coordinates");
appendCoord(n.getCoor());
}
@Override
public void visit(Way w) {
- out.append("\"type\": \"LineString\", \"coordinates\": [");
- boolean insertCommaCoords = false;
+ out.key("type").value("LineString").key("coordinates").array();
for (Node n : w.getNodes()) {
- if (insertCommaCoords) {
- out.append(", ");
- }
- insertCommaCoords = true;
appendCoord(n.getCoor());
}
- out.append("]");
+ out.endArray();
}
@Override
@@ -65,48 +65,48 @@ public class GeoJSONWriter implements Visitor {
public void visit(Changeset cs) {
}
- protected String escape(String s) {
- return s.replace("\"", "\\\"").replace("\\", "\\\\").replace("\n", "\\n");
- }
-
protected void appendPrimitive(OsmPrimitive p) {
if (p.isIncomplete()) {
return;
} else if (skipEmptyNodes && p instanceof Node && p.getKeys().isEmpty()) {
return;
}
- if (insertComma) {
- out.append(",\n");
- }
- insertComma = true;
- out.append("{\"type\": \"Feature\",\n");
+ out.object().key("type").value("Feature");
Map<String, String> tags = p.getKeys();
- if (!tags.isEmpty()) {
- out.append("\t\"properties\": {\n");
- boolean insertCommaTags = false;
- for (Entry<String, String> t : tags.entrySet()) {
- if (insertCommaTags) {
- out.append(",\n");
- }
- insertCommaTags = true;
- out.append("\t\t\"").append(escape(t.getKey())).append("\": ");
- out.append("\"").append(escape(t.getValue())).append("\"");
- }
- out.append("\n\t},\n");
- } else {
- out.append("\t\"properties\": {},\n");
- }
- { // append primitive specific
- out.append("\t\"geometry\": {");
- p.visit(this);
- out.append("}");
+ out.key("properties").object();
+ for (Entry<String, String> t : tags.entrySet()) {
+ out.key(t.getKey()).value(t.getValue());
}
- out.append("}");
+ out.endObject();
+ // append primitive specific
+ out.key("geometry").object();
+ p.accept(this);
+ out.endObject();
+ out.endObject();
}
protected void appendCoord(LatLon c) {
if (c != null) {
- out.append("[").append(c.lon()).append(", ").append(c.lat()).append("]");
+ out.array().value(c.lon()).value(c.lat()).endArray();
+ }
+ }
+
+ protected void appendLayerBounds() {
+ Iterator<Bounds> it = layer.data.getDataSourceBounds().iterator();
+ if (it.hasNext()) {
+ Bounds b = new Bounds(it.next());
+ while (it.hasNext()) {
+ b.extend(it.next());
+ }
+ appendBounds(b);
+ }
+ }
+
+ protected void appendBounds(Bounds b) {
+ if (b != null) {
+ out.key("bbox").array()
+ .value(b.getMinLon()).value(b.getMinLat())
+ .value(b.getMaxLon()).value(b.getMaxLat()).endArray();
}
}
}
diff --git a/src/org/openstreetmap/josm/io/GpxExporter.java b/src/org/openstreetmap/josm/io/GpxExporter.java
index 82db7c1..25ef921 100644
--- a/src/org/openstreetmap/josm/io/GpxExporter.java
+++ b/src/org/openstreetmap/josm/io/GpxExporter.java
@@ -21,8 +21,6 @@ import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
import org.openstreetmap.josm.Main;
@@ -33,13 +31,19 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
public class GpxExporter extends FileExporter implements GpxConstants {
private final static String warningGpl = "<html><font color='red' size='-2'>"
+ tr("Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks.") + "</html>";
+ /**
+ * Constructs a new {@code GpxExporter}.
+ */
public GpxExporter() {
super(GpxImporter.FILE_FILTER);
}
@@ -79,7 +83,7 @@ public class GpxExporter extends FileExporter implements GpxConstants {
}
p.add(new JLabel(tr("GPS track description")), GBC.eol());
- JTextArea desc = new JTextArea(3, 40);
+ JosmTextArea desc = new JosmTextArea(3, 40);
desc.setWrapStyleWord(true);
desc.setLineWrap(true);
desc.setText((String) gpxData.attr.get(META_DESC));
@@ -89,21 +93,21 @@ public class GpxExporter extends FileExporter implements GpxConstants {
p.add(author, GBC.eol());
JLabel nameLabel = new JLabel(tr("Real name"));
p.add(nameLabel, GBC.std().insets(10, 0, 5, 0));
- JTextField authorName = new JTextField();
+ JosmTextField authorName = new JosmTextField();
p.add(authorName, GBC.eol().fill(GBC.HORIZONTAL));
JLabel emailLabel = new JLabel(tr("E-Mail"));
p.add(emailLabel, GBC.std().insets(10, 0, 5, 0));
- JTextField email = new JTextField();
+ JosmTextField email = new JosmTextField();
p.add(email, GBC.eol().fill(GBC.HORIZONTAL));
JLabel copyrightLabel = new JLabel(tr("Copyright (URL)"));
p.add(copyrightLabel, GBC.std().insets(10, 0, 5, 0));
- JTextField copyright = new JTextField();
+ JosmTextField copyright = new JosmTextField();
p.add(copyright, GBC.std().fill(GBC.HORIZONTAL));
JButton predefined = new JButton(tr("Predefined"));
p.add(predefined, GBC.eol().insets(5, 0, 0, 0));
JLabel copyrightYearLabel = new JLabel(tr("Copyright year"));
p.add(copyrightYearLabel, GBC.std().insets(10, 0, 5, 5));
- JTextField copyrightYear = new JTextField("");
+ JosmTextField copyrightYear = new JosmTextField("");
p.add(copyrightYear, GBC.eol().fill(GBC.HORIZONTAL));
JLabel warning = new JLabel("<html><font size='-2'> </html");
p.add(warning, GBC.eol().fill(GBC.HORIZONTAL).insets(15, 0, 0, 0));
@@ -111,7 +115,7 @@ public class GpxExporter extends FileExporter implements GpxConstants {
copyrightLabel, copyrightYearLabel, warning);
p.add(new JLabel(tr("Keywords")), GBC.eol());
- JTextField keywords = new JTextField();
+ JosmTextField keywords = new JosmTextField();
keywords.setText((String) gpxData.attr.get(META_KEYWORDS));
p.add(keywords, GBC.eop().fill(GBC.HORIZONTAL));
@@ -168,21 +172,22 @@ public class GpxExporter extends FileExporter implements GpxConstants {
gpxData.attr.put(META_KEYWORDS, keywords.getText());
}
+ FileOutputStream fo = null;
try {
- FileOutputStream fo = new FileOutputStream(file);
+ fo = new FileOutputStream(file);
new GpxWriter(fo).write(gpxData);
fo.flush();
- fo.close();
} catch (IOException x) {
x.printStackTrace();
JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}:\n{1}", fn, x.getMessage()),
tr("Error"), JOptionPane.ERROR_MESSAGE);
+ } finally {
+ Utils.close(fo);
}
-
}
- private static void enableCopyright(final GpxData data, final JTextField copyright, final JButton predefined,
- final JTextField copyrightYear, final JLabel copyrightLabel, final JLabel copyrightYearLabel,
+ private static void enableCopyright(final GpxData data, final JosmTextField copyright, final JButton predefined,
+ final JosmTextField copyrightYear, final JLabel copyrightLabel, final JLabel copyrightYearLabel,
final JLabel warning, boolean enable) {
copyright.setEnabled(enable);
predefined.setEnabled(enable);
@@ -224,11 +229,11 @@ public class GpxExporter extends FileExporter implements GpxConstants {
private static void addDependencies(
final GpxData data,
final JCheckBox author,
- final JTextField authorName,
- final JTextField email,
- final JTextField copyright,
+ final JosmTextField authorName,
+ final JosmTextField email,
+ final JosmTextField copyright,
final JButton predefined,
- final JTextField copyrightYear,
+ final JosmTextField copyrightYear,
final JLabel nameLabel,
final JLabel emailLabel,
final JLabel copyrightLabel,
@@ -236,6 +241,7 @@ public class GpxExporter extends FileExporter implements GpxConstants {
final JLabel warning) {
ActionListener authorActionListener = new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
boolean b = author.isSelected();
authorName.setEnabled(b);
@@ -272,6 +278,7 @@ public class GpxExporter extends FileExporter implements GpxConstants {
authorName.addKeyListener(authorNameListener);
predefined.addActionListener(new ActionListener(){
+ @Override
public void actionPerformed(ActionEvent e) {
final String[] licenses = {
"Creative Commons By-SA",
diff --git a/src/org/openstreetmap/josm/io/GpxImporter.java b/src/org/openstreetmap/josm/io/GpxImporter.java
index 87980db..cf9497d 100644
--- a/src/org/openstreetmap/josm/io/GpxImporter.java
+++ b/src/org/openstreetmap/josm/io/GpxImporter.java
@@ -31,9 +31,9 @@ public class GpxImporter extends FileImporter {
*/
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"gpx,gpx.gz", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz)");
-
+
/**
- * Utility class containing imported GPX and marker layers, and a task to run after they are added to MapView.
+ * Utility class containing imported GPX and marker layers, and a task to run after they are added to MapView.
*/
public static class GpxImporterData {
/**
@@ -84,7 +84,7 @@ public class GpxImporter extends FileImporter {
is = new FileInputStream(file);
}
String fileName = file.getName();
-
+
try {
GpxReader r = new GpxReader(is);
boolean parsedProperly = r.parse(true);
@@ -95,7 +95,7 @@ public class GpxImporter extends FileImporter {
throw new IOException(tr("Parsing data for layer ''{0}'' failed", fileName));
}
}
-
+
/**
* Adds the specified GPX and marker layers to Map.main
* @param data The layers to add
@@ -104,6 +104,7 @@ public class GpxImporter extends FileImporter {
public static void addLayers(final GpxImporterData data) {
// FIXME: remove UI stuff from the IO subsystem
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
if (data.markerLayer != null) {
Main.main.addLayer(data.markerLayer);
@@ -125,7 +126,7 @@ public class GpxImporter extends FileImporter {
* @return the new GPX and marker layers corresponding to the specified GPX data, to be used with {@link #addLayers}
* @see #addLayers
*/
- public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
+ public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
final String gpxLayerName, String markerLayerName) {
GpxLayer gpxLayer = null;
MarkerLayer markerLayer = null;
diff --git a/src/org/openstreetmap/josm/io/GpxReader.java b/src/org/openstreetmap/josm/io/GpxReader.java
index a727954..d54e272 100644
--- a/src/org/openstreetmap/josm/io/GpxReader.java
+++ b/src/org/openstreetmap/josm/io/GpxReader.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
//TODO: this is far from complete, but can emulate old RawGps behaviour
package org.openstreetmap.josm.io;
@@ -7,6 +7,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Reader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -18,6 +19,7 @@ import java.util.Stack;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.gpx.Extensions;
import org.openstreetmap.josm.data.gpx.GpxConstants;
@@ -29,11 +31,12 @@ import org.openstreetmap.josm.data.gpx.WayPoint;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
/**
* Read a gpx file.
- *
+ *
* Bounds are not read, as we caluclate them. @see GpxData.recalculateBounds()
* Both GPX version 1.0 and 1.1 are supported.
*
@@ -404,8 +407,8 @@ public class GpxReader implements GpxConstants {
}
GpxLink link = new GpxLink(url);
link.text = urlname;
- @SuppressWarnings("unchecked")
- Collection<GpxLink> links = (Collection) attr.get(META_LINKS);
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ Collection<GpxLink> links = (Collection<GpxLink>) attr.get(META_LINKS);
links.add(link);
}
}
@@ -422,14 +425,22 @@ public class GpxReader implements GpxConstants {
/**
* Parse the input stream and store the result in trackData and markerData
*
+ * @param source the source input stream
+ * @throws IOException if an IO error occurs, e.g. the input stream is closed.
*/
public GpxReader(InputStream source) throws IOException {
- this.inputSource = new InputSource(UTFInputStreamReader.create(source, "UTF-8"));
+ Reader utf8stream = UTFInputStreamReader.create(source, "UTF-8");
+ Reader filtered = new InvalidXmlCharacterFilter(utf8stream);
+ this.inputSource = new InputSource(filtered);
}
/**
+ * Parse the GPX data.
*
- * @return True if file was properly parsed, false if there was error during parsing but some data were parsed anyway
+ * @param tryToFinish true, if the reader should return at least part of the GPX
+ * data in case of an error.
+ * @return true if file was properly parsed, false if there was error during
+ * parsing but some data were parsed anyway
* @throws SAXException
* @throws IOException
*/
@@ -445,6 +456,12 @@ public class GpxReader implements GpxConstants {
parser.tryToFinish();
if (parser.data.isEmpty())
throw e;
+ String message = e.getMessage();
+ if (e instanceof SAXParseException) {
+ SAXParseException spe = ((SAXParseException)e);
+ message += " " + tr("(at line {0}, column {1})", spe.getLineNumber(), spe.getColumnNumber());
+ }
+ Main.warn(message);
return false;
} else
throw e;
@@ -454,6 +471,10 @@ public class GpxReader implements GpxConstants {
}
}
+ /**
+ * Replies the GPX data.
+ * @return The GPX data
+ */
public GpxData getGpxData() {
return gpxData;
}
diff --git a/src/org/openstreetmap/josm/io/GpxWriter.java b/src/org/openstreetmap/josm/io/GpxWriter.java
index 8aefbaf..49c92a1 100644
--- a/src/org/openstreetmap/josm/io/GpxWriter.java
+++ b/src/org/openstreetmap/josm/io/GpxWriter.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -37,14 +37,8 @@ public class GpxWriter extends XmlWriter implements GpxConstants {
super(new PrintWriter(new BufferedWriter(new OutputStreamWriter(out, "UTF-8"))));
}
- public GpxWriter() {
- super(null);
- //sorry for this one here, this will be cleaned up once the new scheme works
- }
-
private GpxData data;
private String indent = "";
- public String creator = "JOSM GPX export";
private final static int WAY_POINT = 0;
private final static int ROUTE_POINT = 1;
@@ -68,10 +62,10 @@ public class GpxWriter extends XmlWriter implements GpxConstants {
}
}
}
-
+
out.println("<?xml version='1.0' encoding='UTF-8'?>");
out.println("<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
- (hasExtensions ? String.format(" xmlns:josm=\"%s\"\n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
+ (hasExtensions ? String.format(" xmlns:josm=\"%s\"%n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
" xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">");
indent = " ";
@@ -87,7 +81,7 @@ public class GpxWriter extends XmlWriter implements GpxConstants {
for (String key : WPT_KEYS) {
if (key.equals(META_LINKS)) {
@SuppressWarnings("unchecked")
- Collection<GpxLink> lValue = obj.getCollection(key);
+ Collection<GpxLink> lValue = (Collection<GpxLink>) obj.getCollection(key);
if (lValue != null) {
for (GpxLink link : lValue) {
gpxLink(link);
@@ -162,8 +156,8 @@ public class GpxWriter extends XmlWriter implements GpxConstants {
Bounds bounds = data.recalculateBounds();
if (bounds != null) {
- String b = "minlat=\"" + bounds.getMin().lat() + "\" minlon=\"" + bounds.getMin().lon() +
- "\" maxlat=\"" + bounds.getMax().lat() + "\" maxlon=\"" + bounds.getMax().lon() + "\"" ;
+ String b = "minlat=\"" + bounds.getMinLat() + "\" minlon=\"" + bounds.getMinLon() +
+ "\" maxlat=\"" + bounds.getMaxLat() + "\" maxlon=\"" + bounds.getMaxLon() + "\"" ;
inline("bounds", b);
}
diff --git a/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java b/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java
new file mode 100644
index 0000000..ea13ea3
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java
@@ -0,0 +1,70 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import java.io.IOException;
+import java.io.Reader;
+
+import org.openstreetmap.josm.Main;
+
+/**
+ * FilterInputStream that gets rid of characters that are invalid in an XML 1.0
+ * document.
+ *
+ * Although these characters are forbidden, in the real wold they still appear
+ * in XML files. Java's SAX parser throws an exception, so we have to filter
+ * at a lower level.
+ *
+ * Only handles control characters (<0x20). Invalid characters are replaced
+ * by space (0x20).
+ */
+public class InvalidXmlCharacterFilter extends Reader {
+
+ private Reader reader;
+
+ public static boolean firstWarning = true;
+
+ public static final boolean[] INVALID_CHARS;
+
+ static {
+ INVALID_CHARS = new boolean[0x20];
+ for (int i = 0; i < INVALID_CHARS.length; ++i) {
+ INVALID_CHARS[i] = true;
+ }
+ INVALID_CHARS[0x9] = false; // tab
+ INVALID_CHARS[0xA] = false; // LF
+ INVALID_CHARS[0xD] = false; // CR
+ }
+
+ public InvalidXmlCharacterFilter(Reader reader) {
+ this.reader = reader;
+ }
+
+ @Override
+ public int read(char[] b, int off, int len) throws IOException {
+ int n = reader.read(b, off, len);
+ if (n == -1) {
+ return -1;
+ }
+ for (int i = off; i < off + n; ++i) {
+ b[i] = filter(b[i]);
+ }
+ return n;
+ }
+
+ @Override
+ public void close() throws IOException {
+ reader.close();
+ }
+
+ private char filter(char in) {
+ if (in < 0x20 && in >= 0 && INVALID_CHARS[in]) {
+ if (firstWarning) {
+ Main.warn("Invalid xml character encountered.");
+ firstWarning = false;
+ }
+ return 0x20;
+ }
+ return in;
+ }
+
+}
diff --git a/src/org/openstreetmap/josm/io/JpgImporter.java b/src/org/openstreetmap/josm/io/JpgImporter.java
index cb31f65..ecf878c 100644
--- a/src/org/openstreetmap/josm/io/JpgImporter.java
+++ b/src/org/openstreetmap/josm/io/JpgImporter.java
@@ -22,13 +22,13 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
*/
public class JpgImporter extends FileImporter {
private GpxLayer gpx;
-
+
/**
* The default file filter (only *.jpg files).
*/
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"jpg", "jpg", tr("Image Files") + " (*.jpg)");
-
+
/**
* An alternate file filter that also includes folders.
* @since 5438
diff --git a/src/org/openstreetmap/josm/io/MessageNotifier.java b/src/org/openstreetmap/josm/io/MessageNotifier.java
new file mode 100644
index 0000000..12bb3d0
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/MessageNotifier.java
@@ -0,0 +1,150 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
+
+import java.awt.GridBagLayout;
+import java.net.Authenticator.RequestorType;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.UserInfo;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.io.auth.CredentialsAgentException;
+import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
+import org.openstreetmap.josm.io.auth.CredentialsManager;
+import org.openstreetmap.josm.io.auth.JosmPreferencesCredentialAgent;
+import org.openstreetmap.josm.tools.GBC;
+
+/**
+ * Notifies user periodically of new received (unread) messages
+ * @since 6349
+ */
+public final class MessageNotifier {
+
+ private MessageNotifier() {
+ // Hide default constructor for utils classes
+ }
+
+ /** Property defining if this task is enabled or not */
+ public static final BooleanProperty PROP_NOTIFIER_ENABLED = new BooleanProperty("message.notifier.enabled", true);
+ /** Property defining the update interval in minutes */
+ public static final IntegerProperty PROP_INTERVAL = new IntegerProperty("message.notifier.interval", 5);
+
+ private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
+
+ private static final Runnable WORKER = new Worker();
+
+ private static ScheduledFuture<?> task = null;
+
+ private static class Worker implements Runnable {
+
+ private int lastUnreadCount = 0;
+
+ @Override
+ public void run() {
+ try {
+ final UserInfo userInfo = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE);
+ final int unread = userInfo.getUnreadMessages();
+ if (unread > 0 && unread != lastUnreadCount) {
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
+ public void run() {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)), GBC.eol());
+ panel.add(new UrlLabel(Main.OSM_WEBSITE + "/user/"+userInfo.getDisplayName()+"/inbox", tr("Click here to see your inbox.")), GBC.eol());
+ panel.setOpaque(false);
+ new Notification().setContent(panel)
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_LONG)
+ .show();
+ }
+ });
+ lastUnreadCount = unread;
+ }
+ } catch (OsmTransferException e) {
+ Main.warn(e);
+ }
+ }
+ }
+
+ /**
+ * Starts the message notifier task if not already started and if user is fully identified
+ */
+ public static void start() {
+ int interval = PROP_INTERVAL.get();
+ if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {
+ task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval * 60, TimeUnit.SECONDS);
+ Main.info("Message notifier active (checks every "+interval+" minute"+(interval>1?"s":"")+")");
+ }
+ }
+
+ /**
+ * Stops the message notifier task if started
+ */
+ public static void stop() {
+ if (isRunning()) {
+ task.cancel(false);
+ Main.info("Message notifier inactive");
+ task = null;
+ }
+ }
+
+ /**
+ * Determines if the message notifier is currently running
+ * @return {@code true} if the notifier is running, {@code false} otherwise
+ */
+ public static boolean isRunning() {
+ return task != null;
+ }
+
+ /**
+ * Determines if user set enough information in JOSM preferences to make the request to OSM API without
+ * prompting him for a password.
+ * @return {@code true} if user chose an OAuth token or supplied both its username and password, {@code false otherwise}
+ */
+ public static boolean isUserEnoughIdentified() {
+ JosmUserIdentityManager identManager = JosmUserIdentityManager.getInstance();
+ if (identManager.isFullyIdentified()) {
+ return true;
+ } else {
+ CredentialsManager credManager = CredentialsManager.getInstance();
+ try {
+ if (JosmPreferencesCredentialAgent.class.equals(credManager.getCredentialsAgentClass())) {
+ if (OsmApi.isUsingOAuth()) {
+ return credManager.lookupOAuthAccessToken() != null;
+ } else {
+ String username = Main.pref.get("osm-server.username", null);
+ String password = Main.pref.get("osm-server.password", null);
+ return username != null && !username.isEmpty() && password != null && !password.isEmpty();
+ }
+ } else {
+ CredentialsAgentResponse credentials = credManager.getCredentials(
+ RequestorType.SERVER, OsmApi.getOsmApi().getHost(), false);
+ if (credentials != null) {
+ String username = credentials.getUsername();
+ char[] password = credentials.getPassword();
+ return username != null && !username.isEmpty() && password != null && password.length > 0;
+ }
+ }
+ } catch (CredentialsAgentException e) {
+ Main.warn("Unable to get credentials: "+e.getMessage());
+ }
+ }
+ return false;
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/MirroredInputStream.java b/src/org/openstreetmap/josm/io/MirroredInputStream.java
index e87a472..5b23bb5 100644
--- a/src/org/openstreetmap/josm/io/MirroredInputStream.java
+++ b/src/org/openstreetmap/josm/io/MirroredInputStream.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -13,16 +13,15 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -34,7 +33,7 @@ public class MirroredInputStream extends InputStream {
InputStream fs = null;
File file = null;
- public final static long DEFAULT_MAXTIME = -1l;
+ public final static long DEFAULT_MAXTIME = -1L;
public MirroredInputStream(String name) throws IOException {
this(name, null, DEFAULT_MAXTIME);
@@ -70,10 +69,7 @@ public class MirroredInputStream extends InputStream {
}
} else {
if (Main.applet) {
- URLConnection conn = url.openConnection();
- conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
- conn.setReadTimeout(Main.pref.getInteger("socket.timeout.read",30)*1000);
- fs = new BufferedInputStream(conn.getInputStream());
+ fs = new BufferedInputStream(Utils.openURL(url));
file = new File(url.getFile());
} else {
file = checkLocal(url, destDir, maxTime);
@@ -95,20 +91,43 @@ public class MirroredInputStream extends InputStream {
}
/**
- * Replies an input stream for a file in a ZIP-file. Replies a file in the top
- * level directory of the ZIP file which has an extension <code>extension</code>. If more
- * than one files have this extension, the last file whose name includes <code>namepart</code>
+ * Looks for a certain entry inside a zip file and returns the entry path.
+ *
+ * Replies a file in the top level directory of the ZIP file which has an
+ * extension <code>extension</code>. If more than one files have this
+ * extension, the last file whose name includes <code>namepart</code>
* is opened.
*
* @param extension the extension of the file we're looking for
* @param namepart the name part
- * @return an input stream. Null if this mirrored input stream doesn't represent a zip file or if
- * there was no matching file in the ZIP file
+ * @return The zip entry path of the matching file. Null if this mirrored
+ * input stream doesn't represent a zip file or if there was no matching
+ * file in the ZIP file.
+ */
+ public String findZipEntryPath(String extension, String namepart) {
+ Pair<String, InputStream> ze = findZipEntryImpl(extension, namepart);
+ if (ze == null) return null;
+ return ze.a;
+ }
+
+ /**
+ * Like {@link #findZipEntryPath}, but returns the corresponding InputStream.
*/
+ public InputStream findZipEntryInputStream(String extension, String namepart) {
+ Pair<String, InputStream> ze = findZipEntryImpl(extension, namepart);
+ if (ze == null) return null;
+ return ze.b;
+ }
+
+ @Deprecated // use findZipEntryInputStream
public InputStream getZipEntry(String extension, String namepart) {
+ return findZipEntryInputStream(extension, namepart);
+ }
+
+ private Pair<String, InputStream> findZipEntryImpl(String extension, String namepart) {
if (file == null)
return null;
- InputStream res = null;
+ Pair<String, InputStream> res = null;
try {
ZipFile zipFile = new ZipFile(file);
ZipEntry resentry = null;
@@ -124,35 +143,33 @@ public class MirroredInputStream extends InputStream {
}
}
if (resentry != null) {
- res = zipFile.getInputStream(resentry);
+ InputStream is = zipFile.getInputStream(resentry);
+ res = Pair.create(resentry.getName(), is);
} else {
- zipFile.close();
+ Utils.close(zipFile);
}
} catch (Exception e) {
- if(file.getName().endsWith(".zip")) {
- System.err.println(tr("Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}",
+ if (file.getName().endsWith(".zip")) {
+ Main.warn(tr("Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}",
file.getName(), e.toString(), extension, namepart));
}
}
return res;
}
- public File getFile()
- {
+ public File getFile() {
return file;
}
- static public void cleanup(String name)
- {
+ public static void cleanup(String name) {
cleanup(name, null);
}
- static public void cleanup(String name, String destDir)
- {
+
+ public static void cleanup(String name, String destDir) {
URL url;
try {
url = new URL(name);
- if (!url.getProtocol().equals("file"))
- {
+ if (!url.getProtocol().equals("file")) {
String prefKey = getPrefKey(url, destDir);
List<String> localPath = new ArrayList<String>(Main.pref.getCollection(prefKey));
if (localPath.size() == 2) {
@@ -163,7 +180,9 @@ public class MirroredInputStream extends InputStream {
}
Main.pref.putCollection(prefKey, null);
}
- } catch (java.net.MalformedURLException e) {}
+ } catch (MalformedURLException e) {
+ Main.warn(e);
+ }
}
/**
@@ -226,23 +245,22 @@ public class MirroredInputStream extends InputStream {
while ((length = bis.read(buffer)) > -1) {
bos.write(buffer, 0, length);
}
- bos.close();
+ Utils.close(bos);
bos = null;
/* close fos as well to be sure! */
- fos.close();
+ Utils.close(fos);
fos = null;
localFile = new File(destDir, localPath);
if(Main.platform.rename(destDirFile, localFile)) {
Main.pref.putCollection(prefKey, Arrays.asList(new String[]
{Long.toString(System.currentTimeMillis()), localFile.toString()}));
} else {
- System.out.println(tr("Failed to rename file {0} to {1}.",
+ Main.warn(tr("Failed to rename file {0} to {1}.",
destDirFile.getPath(), localFile.getPath()));
}
} catch (IOException e) {
if (age >= maxTime*1000 && age < maxTime*1000*2) {
- System.out.println(tr("Failed to load {0}, use cached file and retry next time: {1}",
- url, e));
+ Main.warn(tr("Failed to load {0}, use cached file and retry next time: {1}", url, e));
return localFile;
} else {
throw e;
@@ -263,8 +281,14 @@ public class MirroredInputStream extends InputStream {
* is going from a http to a https URL, see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4620571">bug report</a>.
* <p>
* This can causes problems when downloading from certain GitHub URLs.
+ *
+ * @param downloadUrl The resource URL to download
+ * @return The HTTP connection effectively linked to the resource, after all potential redirections
+ * @throws MalformedURLException If a redirected URL is wrong
+ * @throws IOException If any I/O operation goes wrong
+ * @since 6073
*/
- protected HttpURLConnection connectFollowingRedirect(URL downloadUrl) throws MalformedURLException, IOException {
+ public static HttpURLConnection connectFollowingRedirect(URL downloadUrl) throws MalformedURLException, IOException {
HttpURLConnection con = null;
int numRedirects = 0;
while(true) {
@@ -292,7 +316,7 @@ public class MirroredInputStream extends InputStream {
String msg = tr("Too many redirects to the download URL detected. Aborting.");
throw new IOException(msg);
}
- System.out.println(tr("Download redirected to ''{0}''", downloadUrl));
+ Main.info(tr("Download redirected to ''{0}''", downloadUrl));
break;
default:
String msg = tr("Failed to read from ''{0}''. Server responded with status code {1}.", downloadUrl, con.getResponseCode());
@@ -306,7 +330,7 @@ public class MirroredInputStream extends InputStream {
{ return fs.available(); }
@Override
public void close() throws IOException
- { fs.close(); }
+ { Utils.close(fs); }
@Override
public int read() throws IOException
{ return fs.read(); }
diff --git a/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java b/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
index 69e6c96..11452c5 100644
--- a/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
+++ b/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
@@ -48,10 +48,10 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
* .append(new Node(72343));
* reader.parseOsm();
* if (!reader.getMissingPrimitives().isEmpty()) {
- * System.out.println("There are missing primitives: " + reader.getMissingPrimitives());
+ * Main.info("There are missing primitives: " + reader.getMissingPrimitives());
* }
* if (!reader.getSkippedWays().isEmpty()) {
- * System.out.println("There are skipped ways: " + reader.getMissingPrimitives());
+ * Main.info("There are skipped ways: " + reader.getMissingPrimitives());
* }
* </pre>
*/
@@ -123,7 +123,7 @@ public class MultiFetchServerObjectReader extends OsmServerReader{
/**
* appends a {@link OsmPrimitive} id to the list of ids which will be fetched from the server.
- *
+ *
* @param ds the {@link DataSet} to which the primitive belongs
* @param id the primitive id
* @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY}, {@link OsmPrimitiveType#RELATION RELATION}
@@ -415,23 +415,23 @@ public class MultiFetchServerObjectReader extends OsmServerReader{
public Set<PrimitiveId> getMissingPrimitives() {
return missingPrimitives;
}
-
+
/**
- * The class holding the results given by {@link Fetcher}.
+ * The class holding the results given by {@link Fetcher}.
* It is only a wrapper of the resulting {@link DataSet} and the collection of {@link PrimitiveId} that could not have been loaded.
*/
protected static class FetchResult {
-
+
/**
* The resulting data set
*/
public final DataSet dataSet;
-
+
/**
* The collection of primitive ids that could not have been loaded
*/
public final Set<PrimitiveId> missingPrimitives;
-
+
/**
* Constructs a {@code FetchResult}
* @param dataSet The resulting data set
@@ -442,7 +442,7 @@ public class MultiFetchServerObjectReader extends OsmServerReader{
this.missingPrimitives = missingPrimitives;
}
}
-
+
/**
* The class that actually download data from OSM API. Several instances of this class are used by {@link MultiFetchServerObjectReader} (one per set of primitives to fetch).
* The inheritance of {@link OsmServerReader} is only explained by the need to have a distinct OSM connection by {@code Fetcher} instance.
@@ -471,12 +471,12 @@ public class MultiFetchServerObjectReader extends OsmServerReader{
// This method is implemented because of the OsmServerReader inheritance, but not used, as the main target of this class is the call() method.
return fetch(progressMonitor).dataSet;
}
-
+
@Override
public FetchResult call() throws Exception {
return fetch(progressMonitor);
}
-
+
/**
* fetches the requested primitives and updates the specified progress monitor.
* @param progressMonitor the progress monitor
@@ -488,14 +488,14 @@ public class MultiFetchServerObjectReader extends OsmServerReader{
return multiGetIdPackage(type, pkg, progressMonitor);
} catch (OsmApiException e) {
if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
- System.out.println(tr("Server replied with response code 404, retrying with an individual request for each object."));
+ Main.info(tr("Server replied with response code 404, retrying with an individual request for each object."));
return singleGetIdPackage(type, pkg, progressMonitor);
} else {
throw e;
}
}
}
-
+
/**
* invokes a Multi Get for a set of ids and a given {@link OsmPrimitiveType}.
* The retrieved primitives are merged to {@link #outputDataSet}.
@@ -566,7 +566,7 @@ public class MultiFetchServerObjectReader extends OsmServerReader{
result.dataSet.mergeFrom(singleGetId(type, id, progressMonitor));
} catch (OsmApiException e) {
if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
- System.out.println(tr("Server replied with response code 404 for id {0}. Skipping.", Long.toString(id)));
+ Main.info(tr("Server replied with response code 404 for id {0}. Skipping.", Long.toString(id)));
result.missingPrimitives.add(new SimplePrimitiveId(id, type));
} else {
throw e;
diff --git a/src/org/openstreetmap/josm/io/NMEAImporter.java b/src/org/openstreetmap/josm/io/NMEAImporter.java
index 517c320..2162168 100644
--- a/src/org/openstreetmap/josm/io/NMEAImporter.java
+++ b/src/org/openstreetmap/josm/io/NMEAImporter.java
@@ -8,10 +8,12 @@ import java.io.FileInputStream;
import java.io.IOException;
import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExtensionFileFilter;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -21,7 +23,7 @@ public class NMEAImporter extends FileImporter {
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files") + " (*.nmea *.nme *.nma *.log *.txt)");
-
+
public NMEAImporter() {
super(FILE_FILTER);
}
@@ -35,11 +37,12 @@ public class NMEAImporter extends FileImporter {
final File fileFinal = file;
GuiHelper.runInEDT(new Runnable() {
+ @Override
public void run() {
Main.main.addLayer(gpxLayer);
if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer);
- if (ml.data.size() > 0) {
+ if (!ml.data.isEmpty()) {
Main.main.addLayer(ml);
}
}
@@ -60,11 +63,15 @@ public class NMEAImporter extends FileImporter {
msg.append(tr("Zero coordinates: {0}", r.getParserZeroCoordinates()));
msg.append("</html>");
if (success) {
- HelpAwareOptionPane.showMessageDialogInEDT(
- Main.parent,
- msg.toString(),
- tr("NMEA import success"),
- JOptionPane.INFORMATION_MESSAGE, null);
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ new Notification(
+ "<h3>" + tr("NMEA import success:") + "</h3>" + msg.toString())
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .show();
+ }
+ });
} else {
HelpAwareOptionPane.showMessageDialogInEDT(
Main.parent,
diff --git a/src/org/openstreetmap/josm/io/NmeaReader.java b/src/org/openstreetmap/josm/io/NmeaReader.java
index 563e566..ee8a2f4 100644
--- a/src/org/openstreetmap/josm/io/NmeaReader.java
+++ b/src/org/openstreetmap/josm/io/NmeaReader.java
@@ -1,10 +1,8 @@
-//License: GPL. Copyright 2008 by Christoph Brill
-
+//License: GPL. See README for details.
package org.openstreetmap.josm.io;
import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.ParsePosition;
@@ -14,11 +12,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.tools.DateUtils;
+import org.openstreetmap.josm.tools.Utils;
/**
* Read a nmea file. Based on information from
@@ -175,9 +175,9 @@ public class NmeaReader {
data = new GpxData();
Collection<Collection<WayPoint>> currentTrack = new ArrayList<Collection<WayPoint>>();
+ BufferedReader rd = null;
try {
- BufferedReader rd =
- new BufferedReader(new InputStreamReader(source));
+ rd = new BufferedReader(new InputStreamReader(source));
StringBuffer sb = new StringBuffer(1024);
int loopstart_char = rd.read();
@@ -194,23 +194,24 @@ public class NmeaReader {
}
int c = rd.read();
if(c=='$') {
- ParseNMEASentence(sb.toString(), ps);
+ parseNMEASentence(sb.toString(), ps);
sb.delete(0, sb.length());
sb.append('$');
} else if(c == -1) {
// EOF: add last WayPoint if it works out
- ParseNMEASentence(sb.toString(),ps);
+ parseNMEASentence(sb.toString(),ps);
break;
} else {
sb.append((char)c);
}
}
- rd.close();
currentTrack.add(ps.waypoints);
data.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
- } catch (final IOException e) {
- // TODO tell user about the problem?
+ } catch (Exception e) {
+ Main.warn(e);
+ } finally {
+ Utils.close(rd);
}
}
private static class NMEAParserState {
@@ -230,13 +231,14 @@ public class NmeaReader {
// Parses split up sentences into WayPoints which are stored
// in the collection in the NMEAParserState object.
// Returns true if the input made sence, false otherwise.
- private boolean ParseNMEASentence(String s, NMEAParserState ps) {
+ private boolean parseNMEASentence(String s, NMEAParserState ps) throws IllegalDataException {
try {
- if (s.equals(""))
- throw new NullPointerException();
+ if (s.isEmpty()) {
+ throw new IllegalArgumentException("s is empty");
+ }
// checksum check:
- // the bytes between the $ and the * are xored;
+ // the bytes between the $ and the * are xored
// if there is no * or other meanities it will throw
// and result in a malformed packet.
String[] chkstrings = s.split("\\*");
@@ -244,11 +246,10 @@ public class NmeaReader {
{
byte[] chb = chkstrings[0].getBytes();
int chk=0;
- for(int i = 1; i < chb.length; i++) {
+ for (int i = 1; i < chb.length; i++) {
chk ^= chb[i];
}
- if(Integer.parseInt(chkstrings[1].substring(0,2),16) != chk) {
- //System.out.println("Checksum error");
+ if (Integer.parseInt(chkstrings[1].substring(0,2),16) != chk) {
ps.checksum_errors++;
ps.p_Wp=null;
return false;
@@ -272,10 +273,11 @@ public class NmeaReader {
e[GPGGA.LATITUDE.position],
e[GPGGA.LONGITUDE.position]
);
- if(latLon==null)
- throw new NullPointerException(); // malformed
+ if (latLon==null) {
+ throw new IllegalDataException("Malformed lat/lon");
+ }
- if((latLon.lat()==0.0) && (latLon.lon()==0.0)) {
+ if ((latLon.lat()==0.0) && (latLon.lon()==0.0)) {
ps.zero_coord++;
return false;
}
@@ -301,11 +303,11 @@ public class NmeaReader {
if(accu.equals("M")) {
// Ignore heights that are not in meters for now
accu=e[GPGGA.HEIGHT.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
Double.parseDouble(accu);
// if it throws it's malformed; this should only happen if the
// device sends nonstandard data.
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) { // FIX ? same check
currentwp.attr.put("ele", accu);
}
}
@@ -313,18 +315,18 @@ public class NmeaReader {
// number of sattelites
accu=e[GPGGA.SATELLITE_COUNT.position];
int sat = 0;
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
sat = Integer.parseInt(accu);
currentwp.attr.put("sat", accu);
}
// h-dilution
accu=e[GPGGA.HDOP.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
currentwp.attr.put("hdop", Float.parseFloat(accu));
}
// fix
accu=e[GPGGA.QUALITY.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
int fixtype = Integer.parseInt(accu);
switch(fixtype) {
case 0:
@@ -350,7 +352,7 @@ public class NmeaReader {
if(accu.equals("T")) {
// other values than (T)rue are ignored
accu = e[GPVTG.COURSE.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
Double.parseDouble(accu);
currentwp.attr.put("course", accu);
}
@@ -359,7 +361,7 @@ public class NmeaReader {
accu = e[GPVTG.SPEED_KMH_UNIT.position];
if(accu.startsWith("K")) {
accu = e[GPVTG.SPEED_KMH.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
double speed = Double.parseDouble(accu);
speed /= 3.6; // speed in m/s
currentwp.attr.put("speed", Double.toString(speed));
@@ -368,17 +370,17 @@ public class NmeaReader {
} else if(e[0].equals("$GPGSA") || e[0].equals("$GNGSA")) {
// vdop
accu=e[GPGSA.VDOP.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
currentwp.attr.put("vdop", Float.parseFloat(accu));
}
// hdop
accu=e[GPGSA.HDOP.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
currentwp.attr.put("hdop", Float.parseFloat(accu));
}
// pdop
accu=e[GPGSA.PDOP.position];
- if(!accu.equals("")) {
+ if(!accu.isEmpty()) {
currentwp.attr.put("pdop", Float.parseFloat(accu));
}
}
@@ -409,14 +411,14 @@ public class NmeaReader {
currentwp.attr.put("time", DateUtils.fromDate(d));
// speed
accu = e[GPRMC.SPEED.position];
- if(!accu.equals("") && !currentwp.attr.containsKey("speed")) {
+ if(!accu.isEmpty() && !currentwp.attr.containsKey("speed")) {
double speed = Double.parseDouble(accu);
speed *= 0.514444444; // to m/s
currentwp.attr.put("speed", Double.toString(speed));
}
// course
accu = e[GPRMC.COURSE.position];
- if(!accu.equals("") && !currentwp.attr.containsKey("course")) {
+ if(!accu.isEmpty() && !currentwp.attr.containsKey("course")) {
Double.parseDouble(accu);
currentwp.attr.put("course", accu);
}
@@ -444,10 +446,8 @@ public class NmeaReader {
}
return true;
- } catch(RuntimeException x) {
+ } catch (RuntimeException x) {
// out of bounds and such
- // x.printStackTrace();
- // System.out.println("Malformed line: "+s.toString().trim());
ps.malformed++;
ps.p_Wp=null;
return false;
@@ -461,7 +461,7 @@ public class NmeaReader {
// return a zero latlon instead of null so it is logged as zero coordinate
// instead of malformed sentence
- if(widthNorth.equals("")&&lengthEast.equals("")) return new LatLon(0.0,0.0);
+ if(widthNorth.isEmpty() && lengthEast.isEmpty()) return new LatLon(0.0,0.0);
// The format is xxDDLL.LLLL
// xx optional whitespace
diff --git a/src/org/openstreetmap/josm/io/OsmApi.java b/src/org/openstreetmap/josm/io/OsmApi.java
index 2212494..97580fb 100644
--- a/src/org/openstreetmap/josm/io/OsmApi.java
+++ b/src/org/openstreetmap/josm/io/OsmApi.java
@@ -23,6 +23,7 @@ import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
@@ -53,28 +54,28 @@ import org.xml.sax.helpers.DefaultHandler;
*
*/
public class OsmApi extends OsmConnection {
-
- /**
- * Maximum number of retries to send a request in case of HTTP 500 errors or timeouts
+
+ /**
+ * Maximum number of retries to send a request in case of HTTP 500 errors or timeouts
*/
static public final int DEFAULT_MAX_NUM_RETRIES = 5;
/**
- * Maximum number of concurrent download threads, imposed by
+ * Maximum number of concurrent download threads, imposed by
* <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy#Technical_Usage_Requirements">
* OSM API usage policy.</a>
* @since 5386
*/
static public final int MAX_DOWNLOAD_THREADS = 2;
-
+
/**
- * Default URL of the standard OSM API.
+ * Default URL of the standard OSM API.
* @since 5422
*/
static public final String DEFAULT_API_URL = "http://api.openstreetmap.org/api";
// The collection of instantiated OSM APIs
- private static HashMap<String, OsmApi> instances = new HashMap<String, OsmApi>();
+ private static Map<String, OsmApi> instances = new HashMap<String, OsmApi>();
/**
* Replies the {@link OsmApi} for a given server URL
@@ -92,7 +93,7 @@ public class OsmApi extends OsmConnection {
}
return api;
}
-
+
/**
* Replies the {@link OsmApi} for the URL given by the preference <code>osm-server.url</code>
*
@@ -186,7 +187,7 @@ public class OsmApi extends OsmConnection {
this.monitor = monitor;
this.fastFail = fastFail;
}
-
+
@Override
protected byte[] updateData() throws OsmTransferException {
return sendRequest("GET", "capabilities", null, monitor, false, fastFail).getBytes();
@@ -195,7 +196,7 @@ public class OsmApi extends OsmConnection {
/**
* Initializes this component by negotiating a protocol version with the server.
- *
+ *
* @param monitor the progress monitor
* @throws OsmTransferCanceledException If the initialisation has been cancelled by user.
* @throws OsmApiInitializationException If any other exception occurs. Use getCause() to get the original exception.
@@ -203,9 +204,9 @@ public class OsmApi extends OsmConnection {
public void initialize(ProgressMonitor monitor) throws OsmTransferCanceledException, OsmApiInitializationException {
initialize(monitor, false);
}
-
+
/**
- * Initializes this component by negotiating a protocol version with the server, with the ability to control the timeout.
+ * Initializes this component by negotiating a protocol version with the server, with the ability to control the timeout.
*
* @param monitor the progress monitor
* @param fastFail true to request quick initialisation with a small timeout (more likely to throw exception)
@@ -228,8 +229,8 @@ public class OsmApi extends OsmConnection {
if (capabilities.supportsVersion("0.6")) {
version = "0.6";
} else {
- System.err.println(tr("This version of JOSM is incompatible with the configured server."));
- System.err.println(tr("It supports protocol version 0.6, while the server says it supports {0} to {1}.",
+ Main.error(tr("This version of JOSM is incompatible with the configured server."));
+ Main.error(tr("It supports protocol version 0.6, while the server says it supports {0} to {1}.",
capabilities.get("version", "minimum"), capabilities.get("version", "maximum")));
initialized = false; // FIXME gets overridden by next assignment
}
@@ -255,7 +256,7 @@ public class OsmApi extends OsmConnection {
if (Main.isDisplayingMapView()) {
for (Layer l : Main.map.mapView.getLayersOfType(ImageryLayer.class)) {
if (((ImageryLayer) l).getInfo().isBlacklisted()) {
- System.out.println(tr("Removed layer {0} because it is not allowed by the configured API.", l.getName()));
+ Main.info(tr("Removed layer {0} because it is not allowed by the configured API.", l.getName()));
Main.main.removeLayer(l);
}
}
@@ -268,7 +269,7 @@ public class OsmApi extends OsmConnection {
throw new OsmApiInitializationException(e);
}
}
-
+
private void initializeCapabilities(String xml) throws SAXException, IOException, ParserConfigurationException {
InputSource inputSource = new InputSource(new StringReader(xml));
SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new CapabilitiesParser());
@@ -287,7 +288,7 @@ public class OsmApi extends OsmConnection {
osmWriter.setWithBody(addBody);
osmWriter.setChangeset(changeset);
osmWriter.header();
- o.visit(osmWriter);
+ o.accept(osmWriter);
osmWriter.footer();
osmWriter.flush();
return swriter.toString();
@@ -295,8 +296,7 @@ public class OsmApi extends OsmConnection {
/**
* Makes an XML string from an OSM primitive. Uses the OsmWriter class.
- * @param o the OSM primitive
- * @param addBody true to generate the full XML, false to only generate the encapsulating tag
+ * @param s the changeset
* @return XML string
*/
private String toXml(Changeset s) {
@@ -537,8 +537,8 @@ public class OsmApi extends OsmConnection {
}
private void sleepAndListen(int retry, ProgressMonitor monitor) throws OsmTransferCanceledException {
- System.out.print(tr("Waiting 10 seconds ... "));
- for(int i=0; i < 10; i++) {
+ Main.info(tr("Waiting 10 seconds ... "));
+ for (int i=0; i < 10; i++) {
if (monitor != null) {
monitor.setCustomText(tr("Starting retry {0} of {1} in {2} seconds ...", getMaxRetries() - retry,getMaxRetries(), 10-i));
}
@@ -546,9 +546,11 @@ public class OsmApi extends OsmConnection {
throw new OsmTransferCanceledException();
try {
Thread.sleep(1000);
- } catch (InterruptedException ex) {}
+ } catch (InterruptedException ex) {
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" during sleep");
+ }
}
- System.out.println(tr("OK - trying again."));
+ Main.info(tr("OK - trying again."));
}
/**
@@ -561,9 +563,13 @@ public class OsmApi extends OsmConnection {
return Math.max(ret,0);
}
- protected boolean isUsingOAuth() {
- String authMethod = Main.pref.get("osm-server.auth-method", "basic");
- return authMethod.equals("oauth");
+ /**
+ * Determines if JOSM is configured to access OSM API via OAuth
+ * @return {@code true} if JOSM is configured to access OSM API via OAuth, {@code false} otherwise
+ * @since 6349
+ */
+ public static final boolean isUsingOAuth() {
+ return "oauth".equals(Main.pref.get("osm-server.auth-method", "basic"));
}
private String sendRequest(String requestMethod, String urlSuffix,String requestBody, ProgressMonitor monitor) throws OsmTransferException {
@@ -621,20 +627,24 @@ public class OsmApi extends OsmConnection {
// even if there is no payload.
if (requestBody != null) {
BufferedWriter bwr = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
- bwr.write(requestBody);
- bwr.flush();
+ try {
+ bwr.write(requestBody);
+ bwr.flush();
+ } finally {
+ bwr.close();
+ }
}
- out.close();
+ Utils.close(out);
}
activeConnection.connect();
- System.out.println(activeConnection.getResponseMessage());
+ Main.info(activeConnection.getResponseMessage());
int retCode = activeConnection.getResponseCode();
if (retCode >= 500) {
if (retries-- > 0) {
sleepAndListen(retries, monitor);
- System.out.println(tr("Starting retry {0} of {1}.", getMaxRetries() - retries,getMaxRetries()));
+ Main.info(tr("Starting retry {0} of {1}.", getMaxRetries() - retries,getMaxRetries()));
continue;
}
}
@@ -657,18 +667,22 @@ public class OsmApi extends OsmConnection {
//
BufferedReader in = new BufferedReader(new InputStreamReader(i));
String s;
- while((s = in.readLine()) != null) {
- responseBody.append(s);
- responseBody.append("\n");
+ try {
+ while((s = in.readLine()) != null) {
+ responseBody.append(s);
+ responseBody.append("\n");
+ }
+ } finally {
+ in.close();
}
}
String errorHeader = null;
// Look for a detailed error message from the server
if (activeConnection.getHeaderField("Error") != null) {
errorHeader = activeConnection.getHeaderField("Error");
- System.err.println("Error header: " + errorHeader);
+ Main.error("Error header: " + errorHeader);
} else if (retCode != 200 && responseBody.length()>0) {
- System.err.println("Error body: " + responseBody);
+ Main.error("Error body: " + responseBody);
}
activeConnection.disconnect();
@@ -734,7 +748,7 @@ public class OsmApi extends OsmConnection {
if (changeset.getId() <= 0)
throw new OsmTransferException(tr("ID of current changeset > 0 required. Current ID is {0}.", changeset.getId()));
}
-
+
/**
* Replies the changeset data uploads are currently directed to
*
diff --git a/src/org/openstreetmap/josm/io/OsmApiException.java b/src/org/openstreetmap/josm/io/OsmApiException.java
index 8161aae..bb80c45 100644
--- a/src/org/openstreetmap/josm/io/OsmApiException.java
+++ b/src/org/openstreetmap/josm/io/OsmApiException.java
@@ -27,7 +27,7 @@ public class OsmApiException extends OsmTransferException {
this.errorBody = errorBody;
this.accessedUrl = accessedUrl;
}
-
+
/**
* Constructs an {@code OsmApiException} with the specified response code, error header and error body
* @param responseCode The HTTP response code replied by the OSM server. See {@link java.net.HttpURLConnection HttpURLConnection} for predefined HTTP response code values
@@ -51,11 +51,11 @@ public class OsmApiException extends OsmTransferException {
}
/**
- * Constructs an {@code OsmApiException} with the specified cause and a detail message of
- * <tt>(cause==null ? null : cause.toString())</tt>
+ * Constructs an {@code OsmApiException} with the specified cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt>
* (which typically contains the class and detail message of <tt>cause</tt>).
*
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
* A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or unknown.
*/
public OsmApiException(Throwable cause) {
@@ -65,7 +65,7 @@ public class OsmApiException extends OsmTransferException {
/**
* Constructs an {@code OsmApiException} with the specified detail message and cause.
*
- * <p> Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated
+ * <p> Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated
* into this exception's detail message.
*
* @param message The detail message (which is saved for later retrieval by the {@link #getMessage} method)
@@ -169,7 +169,7 @@ public class OsmApiException extends OsmTransferException {
if (errorHeader != null) {
sb.append(tr(errorHeader));
sb.append(tr("(Code={0})", responseCode));
- } else if (errorBody != null && !errorBody.trim().equals("")) {
+ } else if (errorBody != null && !errorBody.trim().isEmpty()) {
errorBody = errorBody.trim();
sb.append(tr(errorBody));
sb.append(tr("(Code={0})", responseCode));
diff --git a/src/org/openstreetmap/josm/io/OsmApiInitializationException.java b/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
index aa50a97..faf48bb 100644
--- a/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
+++ b/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
@@ -18,11 +18,11 @@ public class OsmApiInitializationException extends OsmTransferException {
}
/**
- * Constructs an {@code OsmApiInitializationException} with the specified cause and a detail message of
- * <tt>(cause==null ? null : cause.toString())</tt>
+ * Constructs an {@code OsmApiInitializationException} with the specified cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt>
* (which typically contains the class and detail message of <tt>cause</tt>).
*
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
* A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or unknown.
*/
public OsmApiInitializationException(Throwable cause) {
@@ -32,7 +32,7 @@ public class OsmApiInitializationException extends OsmTransferException {
/**
* Constructs an {@code OsmApiInitializationException} with the specified detail message and cause.
*
- * <p> Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated
+ * <p> Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated
* into this exception's detail message.
*
* @param message The detail message (which is saved for later retrieval by the {@link #getMessage} method)
diff --git a/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java b/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java
index c3a2bb9..7c8cf7c 100644
--- a/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java
+++ b/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java
@@ -8,8 +8,13 @@ import java.io.IOException;
import java.io.OutputStream;
import org.apache.tools.bzip2.CBZip2OutputStream;
+import org.openstreetmap.josm.tools.Utils;
+
public class OsmBzip2Exporter extends OsmExporter {
+ /**
+ * Constructs a new {@code OsmBzip2Exporter}.
+ */
public OsmBzip2Exporter() {
super(OsmBzip2Importer.FILE_FILTER);
}
@@ -17,9 +22,13 @@ public class OsmBzip2Exporter extends OsmExporter {
@Override
protected OutputStream getOutputStream(File file) throws FileNotFoundException, IOException {
OutputStream out = new FileOutputStream(file);
- out.write('B');
- out.write('Z');
- out = new CBZip2OutputStream(out);
- return out;
+ try {
+ out.write('B');
+ out.write('Z');
+ return new CBZip2OutputStream(out);
+ } catch (IOException e) {
+ Utils.close(out);
+ throw e;
+ }
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmBzip2Importer.java b/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
index 4d8b199..81f69f0 100644
--- a/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
+++ b/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
@@ -14,13 +14,13 @@ public class OsmBzip2Importer extends OsmImporter {
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed") + " (*.osm.bz2 *.osm.bz)");
-
+
public OsmBzip2Importer() {
super(FILE_FILTER);
}
@Override
public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
- importData(getBZip2InputStream(new FileInputStream(file)), file);
+ importData(getBZip2InputStream(new FileInputStream(file)), file, progressMonitor);
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmChangeBuilder.java b/src/org/openstreetmap/josm/io/OsmChangeBuilder.java
index 11695c7..ca2c755 100644
--- a/src/org/openstreetmap/josm/io/OsmChangeBuilder.java
+++ b/src/org/openstreetmap/josm/io/OsmChangeBuilder.java
@@ -42,11 +42,11 @@ public class OsmChangeBuilder {
if (p.isDeleted()) {
switchMode("delete");
osmwriter.setWithBody(false);
- p.visit(osmwriter);
+ p.accept(osmwriter);
} else {
switchMode(p.isNew() ? "create" : "modify");
osmwriter.setWithBody(true);
- p.visit(osmwriter);
+ p.accept(osmwriter);
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmChangeImporter.java b/src/org/openstreetmap/josm/io/OsmChangeImporter.java
index a802491..9afdfe9 100644
--- a/src/org/openstreetmap/josm/io/OsmChangeImporter.java
+++ b/src/org/openstreetmap/josm/io/OsmChangeImporter.java
@@ -23,7 +23,7 @@ public class OsmChangeImporter extends FileImporter {
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osc,osc.bz2,osc.bz,osc.gz", "osc", tr("OsmChange File") + " (*.osc *.osc.bz2 *.osc.bz *.osc.gz)");
-
+
public OsmChangeImporter() {
super(FILE_FILTER);
}
@@ -35,15 +35,15 @@ public class OsmChangeImporter extends FileImporter {
@Override public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
try {
FileInputStream in = new FileInputStream(file);
-
+
if (file.getName().endsWith(".osc")) {
- importData(in, file);
+ importData(in, file, progressMonitor);
} else if (file.getName().endsWith(".gz")) {
- importData(getGZipInputStream(in), file);
+ importData(getGZipInputStream(in), file, progressMonitor);
} else {
- importData(getBZip2InputStream(in), file);
+ importData(getBZip2InputStream(in), file, progressMonitor);
}
-
+
} catch (FileNotFoundException e) {
e.printStackTrace();
throw new IOException(tr("File ''{0}'' does not exist.", file.getName()));
@@ -51,12 +51,16 @@ public class OsmChangeImporter extends FileImporter {
}
protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
- final DataSet dataSet = OsmChangeReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
+ importData(in, associatedFile, NullProgressMonitor.INSTANCE);
+ }
+
+ protected void importData(InputStream in, final File associatedFile, ProgressMonitor progressMonitor) throws IllegalDataException {
+ final DataSet dataSet = OsmChangeReader.parseDataSet(in, progressMonitor);
final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
- addDataLayer(dataSet, layer, associatedFile.getPath());
+ addDataLayer(dataSet, layer, associatedFile.getPath());
}
-
- protected void addDataLayer(final DataSet dataSet, final OsmDataLayer layer, final String filePath) {
+
+ protected void addDataLayer(final DataSet dataSet, final OsmDataLayer layer, final String filePath) {
// FIXME: remove UI stuff from IO subsystem
//
GuiHelper.runInEDT(new Runnable() {
diff --git a/src/org/openstreetmap/josm/io/OsmChangeReader.java b/src/org/openstreetmap/josm/io/OsmChangeReader.java
index 3e5c53d..7facb52 100644
--- a/src/org/openstreetmap/josm/io/OsmChangeReader.java
+++ b/src/org/openstreetmap/josm/io/OsmChangeReader.java
@@ -1,3 +1,4 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -19,7 +20,7 @@ public class OsmChangeReader extends OsmReader {
/**
* constructor (for private and subclasses use only)
*
- * @see #parseDataSet(InputStream, DataSet, ProgressMonitor)
+ * @see #parseDataSet(InputStream, ProgressMonitor)
*/
protected OsmChangeReader() {
}
@@ -89,12 +90,13 @@ public class OsmChangeReader extends OsmReader {
/**
* Parse the given input source and return the dataset.
*
- * @param source the source input stream. Must not be null.
- * @param progressMonitor the progress monitor. If null, {@link NullProgressMonitor#INSTANCE} is assumed
+ * @param source the source input stream. Must not be <code>null</code>.
+ * @param progressMonitor the progress monitor. If <code>null</code>,
+ * {@link org.openstreetmap.josm.gui.progress.NullProgressMonitor#INSTANCE} is assumed
*
* @return the dataset with the parsed data
* @throws IllegalDataException thrown if the an error was found while parsing the data from the source
- * @throws IllegalArgumentException thrown if source is null
+ * @throws IllegalArgumentException thrown if source is <code>null</code>
*/
public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
return new OsmChangeReader().doParseDataSet(source, progressMonitor);
diff --git a/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java b/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
index 690f07f..b392daf 100644
--- a/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
+++ b/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -8,226 +8,46 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
-import java.util.Date;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.osm.ChangesetDataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.RelationMemberData;
-import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
-import org.openstreetmap.josm.data.osm.history.HistoryNode;
-import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
-import org.openstreetmap.josm.data.osm.history.HistoryRelation;
-import org.openstreetmap.josm.data.osm.history.HistoryWay;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.DateUtils;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
/**
* Parser for OSM changeset content.
- *
+ * @since 2688
*/
public class OsmChangesetContentParser {
private InputSource source;
- private ChangesetDataSet data;
+ private final ChangesetDataSet data = new ChangesetDataSet();
- // FIXME: this class has many similarities with OsmHistoryReader.Parser and should be merged
- private class Parser extends DefaultHandler {
+ private class Parser extends AbstractParser {
- /** the current primitive to be read */
- private HistoryOsmPrimitive currentPrimitive;
/** the current change modification type */
private ChangesetDataSet.ChangesetModificationType currentModificationType;
- private Locator locator;
-
- @Override
- public void setDocumentLocator(Locator locator) {
- this.locator = locator;
- }
-
protected void throwException(String message) throws OsmDataParsingException {
- throw new OsmDataParsingException(
- message
- ).rememberLocation(locator);
+ throw new OsmDataParsingException(message).rememberLocation(locator);
}
protected void throwException(Exception e) throws OsmDataParsingException {
- throw new OsmDataParsingException(
- e
- ).rememberLocation(locator);
- }
-
- protected long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- throwException(tr("Missing mandatory attribute ''{0}''.", name));
- }
- Long l = 0l;
- try {
- l = Long.parseLong(v);
- } catch(NumberFormatException e) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
- }
- if (l < 0) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
- }
- return l;
- }
-
- protected Long getAttributeLong(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null)
- return null;
- Long l = null;
- try {
- l = Long.parseLong(v);
- } catch(NumberFormatException e) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
- }
- if (l < 0) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
- }
- return l;
- }
-
- protected Double getAttributeDouble(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- return null;
- }
- double d = 0.0;
- try {
- d = Double.parseDouble(v);
- } catch(NumberFormatException e) {
- throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v));
- }
- return d;
- }
-
- protected String getMandatoryAttributeString(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- throwException(tr("Missing mandatory attribute ''{0}''.", name));
- }
- return v;
- }
-
- protected boolean getMandatoryAttributeBoolean(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- throwException(tr("Missing mandatory attribute ''{0}''.", name));
- }
- if ("true".equals(v)) return true;
- if ("false".equals(v)) return false;
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
- // not reached
- return false;
- }
-
- protected HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
- long id = getMandatoryAttributeLong(atts,"id");
- long version = getMandatoryAttributeLong(atts,"version");
- long changesetId = getMandatoryAttributeLong(atts,"changeset");
- boolean visible= getMandatoryAttributeBoolean(atts, "visible");
-
- Long uid = getAttributeLong(atts, "uid");
- String userStr = atts.getValue("user");
- User user;
- if (userStr != null) {
- if (uid != null) {
- user = User.createOsmUser(uid, userStr);
- } else {
- user = User.createLocalUser(userStr);
- }
- } else {
- user = User.getAnonymous();
- }
-
- String v = getMandatoryAttributeString(atts, "timestamp");
- Date timestamp = DateUtils.fromString(v);
- HistoryOsmPrimitive primitive = null;
- if (type.equals(OsmPrimitiveType.NODE)) {
- Double lat = getAttributeDouble(atts, "lat");
- Double lon = getAttributeDouble(atts, "lon");
- LatLon coor = (lat != null && lon != null) ? new LatLon(lat,lon) : null;
- primitive = new HistoryNode(
- id,version,visible,user,changesetId,timestamp,coor
- );
-
- } else if (type.equals(OsmPrimitiveType.WAY)) {
- primitive = new HistoryWay(
- id,version,visible,user,changesetId,timestamp
- );
- }if (type.equals(OsmPrimitiveType.RELATION)) {
- primitive = new HistoryRelation(
- id,version,visible,user,changesetId,timestamp
- );
- }
- return primitive;
- }
-
- protected void startNode(Attributes atts) throws SAXException {
- currentPrimitive= createPrimitive(atts, OsmPrimitiveType.NODE);
- }
-
- protected void startWay(Attributes atts) throws SAXException {
- currentPrimitive= createPrimitive(atts, OsmPrimitiveType.WAY);
- }
- protected void startRelation(Attributes atts) throws SAXException {
- currentPrimitive= createPrimitive(atts, OsmPrimitiveType.RELATION);
- }
-
- protected void handleTag(Attributes atts) throws SAXException {
- String key= getMandatoryAttributeString(atts, "k");
- String value= getMandatoryAttributeString(atts, "v");
- currentPrimitive.put(key,value);
- }
-
- protected void handleNodeReference(Attributes atts) throws SAXException {
- long ref = getMandatoryAttributeLong(atts, "ref");
- ((HistoryWay)currentPrimitive).addNode(ref);
- }
-
- protected void handleMember(Attributes atts) throws SAXException {
- long ref = getMandatoryAttributeLong(atts, "ref");
- String v = getMandatoryAttributeString(atts, "type");
- OsmPrimitiveType type = null;
- try {
- type = OsmPrimitiveType.fromApiTypeName(v);
- } catch(IllegalArgumentException e) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v));
- }
- String role = getMandatoryAttributeString(atts, "role");
- RelationMemberData member = new RelationMemberData(role, type,ref);
- ((HistoryRelation)currentPrimitive).addMember(member);
+ throw new OsmDataParsingException(e).rememberLocation(locator);
}
@Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
- if (qName.equals("node")) {
- startNode(atts);
- } else if (qName.equals("way")) {
- startWay(atts);
- } else if (qName.equals("relation")) {
- startRelation(atts);
- } else if (qName.equals("tag")) {
- handleTag(atts);
- } else if (qName.equals("nd")) {
- handleNodeReference(atts);
- } else if (qName.equals("member")) {
- handleMember(atts);
+ if (super.doStartElement(qName, atts)) {
+ // done
} else if (qName.equals("osmChange")) {
// do nothing
} else if (qName.equals("create")) {
@@ -237,7 +57,7 @@ public class OsmChangesetContentParser {
} else if (qName.equals("delete")) {
currentModificationType = ChangesetModificationType.DELETED;
} else {
- System.err.println(tr("Warning: unsupported start element ''{0}'' in changeset content at position ({1},{2}). Skipping.", qName, locator.getLineNumber(), locator.getColumnNumber()));
+ Main.warn(tr("Unsupported start element ''{0}'' in changeset content at position ({1},{2}). Skipping.", qName, locator.getLineNumber(), locator.getColumnNumber()));
}
}
@@ -265,7 +85,7 @@ public class OsmChangesetContentParser {
} else if (qName.equals("member")) {
// do nothing
} else {
- System.err.println(tr("Warning: unsupported end element ''{0}'' in changeset content at position ({1},{2}). Skipping.", qName, locator.getLineNumber(), locator.getColumnNumber()));
+ Main.warn(tr("Unsupported end element ''{0}'' in changeset content at position ({1},{2}). Skipping.", qName, locator.getLineNumber(), locator.getColumnNumber()));
}
}
@@ -281,28 +101,32 @@ public class OsmChangesetContentParser {
}
/**
- * Create a parser
+ * Constructs a new {@code OsmChangesetContentParser}.
*
* @param source the input stream with the changeset content as XML document. Must not be null.
- * @throws IllegalArgumentException thrown if source is null.
+ * @throws UnsupportedEncodingException if {@code UTF-8} charset is missing
+ * @throws IllegalArgumentException if source is {@code null}.
*/
public OsmChangesetContentParser(InputStream source) throws UnsupportedEncodingException {
CheckParameterUtil.ensureParameterNotNull(source, "source");
this.source = new InputSource(new InputStreamReader(source, "UTF-8"));
- data = new ChangesetDataSet();
}
+ /**
+ * Constructs a new {@code OsmChangesetContentParser}.
+ *
+ * @param source the input stream with the changeset content as XML document. Must not be null.
+ * @throws IllegalArgumentException if source is {@code null}.
+ */
public OsmChangesetContentParser(String source) {
CheckParameterUtil.ensureParameterNotNull(source, "source");
this.source = new InputSource(new StringReader(source));
- data = new ChangesetDataSet();
}
/**
- * Parses the content
+ * Parses the content.
*
- * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE}
- * if null
+ * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
* @return the parsed data
* @throws OsmDataParsingException thrown if something went wrong. Check for chained
* exceptions.
diff --git a/src/org/openstreetmap/josm/io/OsmChangesetParser.java b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
index 277f26d..e725384 100644
--- a/src/org/openstreetmap/josm/io/OsmChangesetParser.java
+++ b/src/org/openstreetmap/josm/io/OsmChangesetParser.java
@@ -37,7 +37,7 @@ import org.xml.sax.helpers.DefaultHandler;
* </pre>
*
*/
-public class OsmChangesetParser {
+public final class OsmChangesetParser {
private List<Changeset> changesets;
private OsmChangesetParser() {
diff --git a/src/org/openstreetmap/josm/io/OsmConnection.java b/src/org/openstreetmap/josm/io/OsmConnection.java
index 13a4a4d..b5188f1 100644
--- a/src/org/openstreetmap/josm/io/OsmConnection.java
+++ b/src/org/openstreetmap/josm/io/OsmConnection.java
@@ -1,10 +1,10 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.net.HttpURLConnection;
import java.net.Authenticator.RequestorType;
+import java.net.HttpURLConnection;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.CharacterCodingException;
@@ -18,8 +18,8 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.oauth.OAuthParameters;
import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.io.auth.CredentialsAgentException;
-import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
+import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.tools.Base64;
/**
@@ -55,6 +55,7 @@ public class OsmConnection {
try {
Thread.sleep(100);
} catch (InterruptedException ex) {
+ Main.warn("InterruptedException in "+getClass().getSimpleName()+" during cancel");
}
synchronized (this) {
@@ -131,8 +132,8 @@ public class OsmConnection {
} else if (authMethod.equals("oauth")) {
addOAuthAuthorizationHeader(connection);
} else {
- String msg = tr("Warning: unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
- System.err.println(msg);
+ String msg = tr("Unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
+ Main.warn(msg);
throw new OsmTransferException(msg);
}
}
@@ -141,7 +142,6 @@ public class OsmConnection {
* Replies true if this connection is canceled
*
* @return true if this connection is canceled
- * @return
*/
public boolean isCanceled() {
return cancel;
diff --git a/src/org/openstreetmap/josm/io/OsmExporter.java b/src/org/openstreetmap/josm/io/OsmExporter.java
index b3f4e64..7e2b347 100644
--- a/src/org/openstreetmap/josm/io/OsmExporter.java
+++ b/src/org/openstreetmap/josm/io/OsmExporter.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -20,6 +19,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExtensionFileFilter;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Utils;
public class OsmExporter extends FileExporter {
@@ -63,7 +63,7 @@ public class OsmExporter extends FileExporter {
// a truncated file. That can destroy lots of work.
if (file.exists()) {
tmpFile = new File(file.getPath() + "~");
- copy(file, tmpFile);
+ Utils.copyFile(file, tmpFile);
}
// create outputstream and wrap it with gzip or bzip, if necessary
@@ -74,8 +74,8 @@ public class OsmExporter extends FileExporter {
layer.data.getReadLock().lock();
try {
w.writeLayer(layer);
- w.close();
} finally {
+ Utils.close(w);
layer.data.getReadLock().unlock();
}
// FIXME - how to close?
@@ -98,7 +98,7 @@ public class OsmExporter extends FileExporter {
// if the file save failed, then the tempfile will not
// be deleted. So, restore the backup if we made one.
if (tmpFile != null && tmpFile.exists()) {
- copy(tmpFile, file);
+ Utils.copyFile(tmpFile, file);
}
} catch (IOException e2) {
e2.printStackTrace();
@@ -111,25 +111,4 @@ public class OsmExporter extends FileExporter {
}
}
}
-
- private void copy(File src, File dst) throws IOException {
- FileInputStream srcStream;
- FileOutputStream dstStream;
- try {
- srcStream = new FileInputStream(src);
- dstStream = new FileOutputStream(dst);
- } catch (FileNotFoundException e) {
- JOptionPane.showMessageDialog(Main.parent, tr("Could not back up file. Exception is: {0}", e
- .getMessage()), tr("Error"), JOptionPane.ERROR_MESSAGE);
- return;
- }
- byte buf[] = new byte[1 << 16];
- int len;
- while ((len = srcStream.read(buf)) != -1) {
- dstStream.write(buf, 0, len);
- }
- srcStream.close();
- dstStream.close();
- }
-
}
diff --git a/src/org/openstreetmap/josm/io/OsmGzipImporter.java b/src/org/openstreetmap/josm/io/OsmGzipImporter.java
index 512375a..b123032 100644
--- a/src/org/openstreetmap/josm/io/OsmGzipImporter.java
+++ b/src/org/openstreetmap/josm/io/OsmGzipImporter.java
@@ -14,13 +14,13 @@ public class OsmGzipImporter extends OsmImporter {
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)");
-
+
public OsmGzipImporter() {
super(FILE_FILTER);
}
@Override
public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
- importData(getGZipInputStream(new FileInputStream(file)), file);
+ importData(getGZipInputStream(new FileInputStream(file)), file, progressMonitor);
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmHistoryReader.java b/src/org/openstreetmap/josm/io/OsmHistoryReader.java
index bcae4fe..8c5937c 100644
--- a/src/org/openstreetmap/josm/io/OsmHistoryReader.java
+++ b/src/org/openstreetmap/josm/io/OsmHistoryReader.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -6,52 +6,33 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Date;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.RelationMemberData;
-import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
-import org.openstreetmap.josm.data.osm.history.HistoryNode;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
-import org.openstreetmap.josm.data.osm.history.HistoryRelation;
-import org.openstreetmap.josm.data.osm.history.HistoryWay;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.tools.DateUtils;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
/**
* Parser for OSM history data.
*
* It is slightly different from {@link OsmReader} because we don't build an internal graph of
- * {@link OsmPrimitive}s. We use objects derived from {@link HistoryOsmPrimitive} instead and we
- * keep the data in a dedicated {@link HistoryDataSet}.
- *
+ * {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s. We use objects derived from
+ * {@link HistoryOsmPrimitive} instead and we keep the data in a dedicated {@link HistoryDataSet}.
+ * @since 1670
*/
public class OsmHistoryReader {
private final InputStream in;
private final HistoryDataSet data;
- // FIXME: this class has many similarities with OsmChangesetContentParser.Parser and should be merged
- private class Parser extends DefaultHandler {
-
- /** the current primitive to be read */
- private HistoryOsmPrimitive current;
- private Locator locator;
-
- @Override
- public void setDocumentLocator(Locator locator) {
- this.locator = locator;
- }
+ private class Parser extends AbstractParser {
protected String getCurrentPosition() {
if (locator == null)
@@ -60,169 +41,12 @@ public class OsmHistoryReader {
}
protected void throwException(String message) throws SAXException {
- throw new SAXException(
- getCurrentPosition()
- + message
- );
- }
-
- protected long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- throwException(tr("Missing mandatory attribute ''{0}''.", name));
- }
- Long l = 0l;
- try {
- l = Long.parseLong(v);
- } catch(NumberFormatException e) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
- }
- if (l < 0) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
- }
- return l;
- }
-
- protected Long getAttributeLong(Attributes attr, String name) throws SAXException {
- String v = attr.getValue(name);
- if (v == null)
- return null;
- Long l = null;
- try {
- l = Long.parseLong(v);
- } catch(NumberFormatException e) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
- }
- if (l < 0) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
- }
- return l;
+ throw new SAXException(getCurrentPosition() + message);
}
- protected Double getAttributeDouble(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- return null;
- }
- double d = 0.0;
- try {
- d = Double.parseDouble(v);
- } catch(NumberFormatException e) {
- throwException(tr("Illegal value for attribute ''{0}'' of type double. Got ''{1}''.", name, v));
- }
- return d;
- }
-
- protected String getMandatoryAttributeString(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- throwException(tr("Missing mandatory attribute ''{0}''.", name));
- }
- return v;
- }
-
- protected boolean getMandatoryAttributeBoolean(Attributes attr, String name) throws SAXException{
- String v = attr.getValue(name);
- if (v == null) {
- throwException(tr("Missing mandatory attribute ''{0}''.", name));
- }
- if ("true".equals(v)) return true;
- if ("false".equals(v)) return false;
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
- // not reached
- return false;
- }
-
- protected HistoryOsmPrimitive createPrimitive(Attributes atts, OsmPrimitiveType type) throws SAXException {
- long id = getMandatoryAttributeLong(atts,"id");
- long version = getMandatoryAttributeLong(atts,"version");
- long changesetId = getMandatoryAttributeLong(atts,"changeset");
- boolean visible= getMandatoryAttributeBoolean(atts, "visible");
- Long uid = getAttributeLong(atts, "uid");
- String userStr = atts.getValue("user");
- User user;
- if (userStr != null) {
- if (uid != null) {
- user = User.createOsmUser(uid, userStr);
- } else {
- user = User.createLocalUser(userStr);
- }
- } else {
- user = User.getAnonymous();
- }
- String v = getMandatoryAttributeString(atts, "timestamp");
- Date timestamp = DateUtils.fromString(v);
- HistoryOsmPrimitive primitive = null;
- if (type.equals(OsmPrimitiveType.NODE)) {
- Double lat = getAttributeDouble(atts, "lat");
- Double lon = getAttributeDouble(atts, "lon");
- LatLon coord = (lat != null && lon != null) ? new LatLon(lat,lon) : null;
- primitive = new HistoryNode(
- id,version,visible,user,changesetId,timestamp,coord
- );
-
- } else if (type.equals(OsmPrimitiveType.WAY)) {
- primitive = new HistoryWay(
- id,version,visible,user,changesetId,timestamp
- );
- }if (type.equals(OsmPrimitiveType.RELATION)) {
- primitive = new HistoryRelation(
- id,version,visible,user,changesetId,timestamp
- );
- }
- return primitive;
- }
-
- protected void startNode(Attributes atts) throws SAXException {
- current= createPrimitive(atts, OsmPrimitiveType.NODE);
- }
-
- protected void startWay(Attributes atts) throws SAXException {
- current= createPrimitive(atts, OsmPrimitiveType.WAY);
- }
- protected void startRelation(Attributes atts) throws SAXException {
- current= createPrimitive(atts, OsmPrimitiveType.RELATION);
- }
-
- protected void handleTag(Attributes atts) throws SAXException {
- String key= getMandatoryAttributeString(atts, "k");
- String value= getMandatoryAttributeString(atts, "v");
- current.put(key,value);
- }
-
- protected void handleNodeReference(Attributes atts) throws SAXException {
- long ref = getMandatoryAttributeLong(atts, "ref");
- ((HistoryWay)current).addNode(ref);
- }
-
- protected void handleMember(Attributes atts) throws SAXException {
- long ref = getMandatoryAttributeLong(atts, "ref");
- String v = getMandatoryAttributeString(atts, "type");
- OsmPrimitiveType type = null;
- try {
- type = OsmPrimitiveType.fromApiTypeName(v);
- } catch(IllegalArgumentException e) {
- throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v));
- }
- String role = getMandatoryAttributeString(atts, "role");
- RelationMemberData member = new RelationMemberData(role, type,ref);
- ((HistoryRelation)current).addMember(member);
- }
-
- @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
- if (qName.equals("node")) {
- startNode(atts);
- } else if (qName.equals("way")) {
- startWay(atts);
- } else if (qName.equals("relation")) {
- startRelation(atts);
- } else if (qName.equals("tag")) {
- handleTag(atts);
- } else if (qName.equals("nd")) {
- handleNodeReference(atts);
- } else if (qName.equals("member")) {
- handleMember(atts);
- }
+ @Override
+ public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+ doStartElement(qName, atts);
}
@Override
@@ -230,24 +54,38 @@ public class OsmHistoryReader {
if (qName.equals("node")
|| qName.equals("way")
|| qName.equals("relation")) {
- data.put(current);
+ data.put(currentPrimitive);
}
}
}
+ /**
+ * Constructs a new {@code OsmHistoryReader}.
+ *
+ * @param source the input stream with the history content as XML document. Must not be null.
+ * @throws IllegalArgumentException if source is {@code null}.
+ */
public OsmHistoryReader(InputStream source) {
+ CheckParameterUtil.ensureParameterNotNull(source, "source");
this.in = source;
this.data = new HistoryDataSet();
}
+ /**
+ * Parses the content.
+ * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
+ * @return the parsed data
+ * @throws SAXException If any SAX errors occur during processing.
+ * @throws IOException If any IO errors occur.
+ */
public HistoryDataSet parse(ProgressMonitor progressMonitor) throws SAXException, IOException {
InputSource inputSource = new InputSource(new InputStreamReader(in, "UTF-8"));
progressMonitor.beginTask(tr("Parsing OSM history data ..."));
try {
SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new Parser());
- } catch (ParserConfigurationException e1) {
- e1.printStackTrace(); // broken SAXException chaining
- throw new SAXException(e1);
+ } catch (ParserConfigurationException e) {
+ e.printStackTrace(); // broken SAXException chaining
+ throw new SAXException(e);
} finally {
progressMonitor.finishTask();
}
diff --git a/src/org/openstreetmap/josm/io/OsmImporter.java b/src/org/openstreetmap/josm/io/OsmImporter.java
index af23e69..ea9f378 100644
--- a/src/org/openstreetmap/josm/io/OsmImporter.java
+++ b/src/org/openstreetmap/josm/io/OsmImporter.java
@@ -18,12 +18,13 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Utils;
public class OsmImporter extends FileImporter {
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)");
-
+
public static class OsmImporterData {
private OsmDataLayer layer;
@@ -51,25 +52,43 @@ public class OsmImporter extends FileImporter {
super(filter);
}
+ /**
+ * Imports OSM data from file
+ * @param file file to read data from
+ * @param progressMonitor handler for progress monitoring and canceling
+ */
@Override
public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
FileInputStream in = null;
try {
in = new FileInputStream(file);
- importData(in, file);
+ importData(in, file, progressMonitor);
} catch (FileNotFoundException e) {
e.printStackTrace();
throw new IOException(tr("File ''{0}'' does not exist.", file.getName()));
} finally {
- if (in != null) {
- in.close();
- }
+ Utils.close(in);
}
}
+ /**
+ * Imports OSM data from stream
+ * @param in input stream
+ * @param associatedFile filename of data
+ */
protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
+ importData(in, associatedFile, NullProgressMonitor.INSTANCE);
+ }
+
+ /**
+ * Imports OSM data from stream
+ * @param in input stream
+ * @param associatedFile filename of data (layer name will be generated from name of file)
+ * @param pm handler for progress monitoring and canceling
+ */
+ protected void importData(InputStream in, final File associatedFile, ProgressMonitor pm) throws IllegalDataException {
final OsmImporterData data = loadLayer(in, associatedFile,
- associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName(), NullProgressMonitor.INSTANCE);
+ associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName(), pm);
// FIXME: remove UI stuff from IO subsystem
GuiHelper.runInEDT(new Runnable() {
@@ -84,7 +103,10 @@ public class OsmImporter extends FileImporter {
/**
* Load osm data layer from InputStream.
- * associatedFile can be null if the stream does not come from a file.
+ * @param in input stream
+ * @param associatedFile filename of data (can be <code>null</code> if the stream does not come from a file)
+ * @param layerName name of generated layer
+ * @param progressMonitor handler for progress monitoring and canceling
*/
public OsmImporterData loadLayer(InputStream in, final File associatedFile, final String layerName, ProgressMonitor progressMonitor) throws IllegalDataException {
final DataSet dataSet = parseDataSet(in, progressMonitor);
diff --git a/src/org/openstreetmap/josm/io/OsmReader.java b/src/org/openstreetmap/josm/io/OsmReader.java
index 24977c6..70c9edb 100644
--- a/src/org/openstreetmap/josm/io/OsmReader.java
+++ b/src/org/openstreetmap/josm/io/OsmReader.java
@@ -8,6 +8,7 @@ import java.io.InputStreamReader;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -17,6 +18,7 @@ import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Changeset;
@@ -49,8 +51,10 @@ public class OsmReader extends AbstractReader {
protected XMLStreamReader parser;
+ protected boolean cancel;
+
/** Used by plugins to register themselves as data postprocessors. */
- public static ArrayList<OsmServerReadPostprocessor> postprocessors;
+ public static List<OsmServerReadPostprocessor> postprocessors;
/** register a new postprocessor */
public static void registerPostprocessor(OsmServerReadPostprocessor pp) {
@@ -70,7 +74,7 @@ public class OsmReader extends AbstractReader {
/**
* constructor (for private and subclasses use only)
*
- * @see #parseDataSet(InputStream, DataSet, ProgressMonitor)
+ * @see #parseDataSet(InputStream, ProgressMonitor)
*/
protected OsmReader() {
}
@@ -127,6 +131,12 @@ public class OsmReader extends AbstractReader {
}
while (true) {
int event = parser.next();
+
+ if (cancel) {
+ cancel = false;
+ throwException(tr("Reading was canceled"));
+ }
+
if (event == XMLStreamConstants.START_ELEMENT) {
if (parser.getLocalName().equals("bounds")) {
parseBounds(generator);
@@ -162,7 +172,7 @@ public class OsmReader extends AbstractReader {
if (bounds.isOutOfTheWorld()) {
Bounds copy = new Bounds(bounds);
bounds.normalize();
- System.out.println("Bbox " + copy + " is out of the world, normalized to " + bounds);
+ Main.info("Bbox " + copy + " is out of the world, normalized to " + bounds);
}
DataSource src = new DataSource(bounds, origin);
ds.dataSources.add(src);
@@ -223,8 +233,8 @@ public class OsmReader extends AbstractReader {
break;
}
}
- if (w.isDeleted() && nodeIds.size() > 0) {
- System.out.println(tr("Deleted way {0} contains nodes", w.getUniqueId()));
+ if (w.isDeleted() && !nodeIds.isEmpty()) {
+ Main.info(tr("Deleted way {0} contains nodes", w.getUniqueId()));
nodeIds = new ArrayList<Long>();
}
ways.put(wd.getUniqueId(), nodeIds);
@@ -270,8 +280,8 @@ public class OsmReader extends AbstractReader {
break;
}
}
- if (r.isDeleted() && members.size() > 0) {
- System.out.println(tr("Deleted relation {0} contains members", r.getUniqueId()));
+ if (r.isDeleted() && !members.isEmpty()) {
+ Main.info(tr("Deleted relation {0} contains members", r.getUniqueId()));
members = new ArrayList<RelationMemberData>();
}
relations.put(rd.getUniqueId(), members);
@@ -311,10 +321,14 @@ public class OsmReader extends AbstractReader {
}
private void parseChangeset(Long uploadChangesetId) throws XMLStreamException {
- long id = getLong("id");
- if (id == uploadChangesetId) {
- uploadChangeset = new Changeset((int) getLong("id"));
+ Long id = null;
+ if (parser.getAttributeValue(null, "id") != null) {
+ id = getLong("id");
+ }
+ // Read changeset info if neither upload-changeset nor id are set, or if they are both set to the same value
+ if (id == uploadChangesetId || (id != null && id.equals(uploadChangesetId))) {
+ uploadChangeset = new Changeset(id != null ? id.intValue() : 0);
while (true) {
int event = parser.next();
if (event == XMLStreamConstants.START_ELEMENT) {
@@ -343,7 +357,7 @@ public class OsmReader extends AbstractReader {
protected void parseUnknown(boolean printWarning) throws XMLStreamException {
if (printWarning) {
- System.out.println(tr("Undefined element ''{0}'' found in input stream. Skipping.", parser.getLocalName()));
+ Main.info(tr("Undefined element ''{0}'' found in input stream. Skipping.", parser.getLocalName()));
}
while (true) {
int event = parser.next();
@@ -432,15 +446,15 @@ public class OsmReader extends AbstractReader {
if (version <= 0 && current.getUniqueId() > 0) {
throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.getUniqueId()), versionString));
} else if (version < 0 && current.getUniqueId() <= 0) {
- System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.6"));
+ Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.6"));
version = 0;
}
} else if (ds.getVersion().equals("0.5")) {
if (version <= 0 && current.getUniqueId() > 0) {
- System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
+ Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
version = 1;
} else if (version < 0 && current.getUniqueId() <= 0) {
- System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.5"));
+ Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.5"));
version = 0;
}
} else {
@@ -454,7 +468,7 @@ public class OsmReader extends AbstractReader {
throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.getUniqueId())));
} else if (current.getUniqueId() > 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
// default version in 0.5 files for existing primitives
- System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
+ Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
version= 1;
} else if (current.getUniqueId() <= 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
// default version in 0.5 files for new primitives, no warning necessary. This is
@@ -483,7 +497,7 @@ public class OsmReader extends AbstractReader {
} catch(NumberFormatException e) {
if (current.getUniqueId() <= 0) {
// for a new primitive we just log a warning
- System.out.println(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+ Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
current.setChangesetId(0);
} else {
// for an existing primitive this is a problem
@@ -493,7 +507,7 @@ public class OsmReader extends AbstractReader {
if (current.getChangesetId() <=0) {
if (current.getUniqueId() <= 0) {
// for a new primitive we just log a warning
- System.out.println(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+ Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
current.setChangesetId(0);
} else {
// for an existing primitive this is a problem
@@ -560,6 +574,12 @@ public class OsmReader extends AbstractReader {
if (progressMonitor == null) {
progressMonitor = NullProgressMonitor.INSTANCE;
}
+ ProgressMonitor.CancelListener cancelListener = new ProgressMonitor.CancelListener() {
+ @Override public void operationCanceled() {
+ cancel = true;
+ }
+ };
+ progressMonitor.addCancelListener(cancelListener);
CheckParameterUtil.ensureParameterNotNull(source, "source");
try {
progressMonitor.beginTask(tr("Prepare OSM data...", 2));
@@ -602,6 +622,7 @@ public class OsmReader extends AbstractReader {
throw new IllegalDataException(e);
} finally {
progressMonitor.finishTask();
+ progressMonitor.removeCancelListener(cancelListener);
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java b/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
index 1534c41..b8953f5 100644
--- a/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
@@ -17,10 +17,11 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
/**
* OsmServerBackreferenceReader fetches the primitives from the OSM server which
- * refer to a specific primitive. For a {@link Node}, ways and relations are retrieved
+ * refer to a specific primitive. For a {@link org.openstreetmap.josm.data.osm.Node Node}, ways and relations are retrieved
* which refer to the node. For a {@link Way} or a {@link Relation}, only relations are
* read.
*
@@ -77,10 +78,10 @@ public class OsmServerBackreferenceReader extends OsmServerReader {
}
/**
- * constructor
+ * Creates a back reference reader for given primitive
*
- * @param id the id of the primitive. > 0 expected
- * @param readFull true, if referers should be read fully (i.e. including their immediate children)
+ * @param primitive the primitive
+ * @param readFull <code>true</code>, if referers should be read fully (i.e. including their immediate children)
*
*/
public OsmServerBackreferenceReader(OsmPrimitive primitive, boolean readFull) {
@@ -89,9 +90,10 @@ public class OsmServerBackreferenceReader extends OsmServerReader {
}
/**
- * constructor
+ * Creates a back reference reader for given primitive id
*
- * @param primitive the primitive whose referers are to be read
+ * @param id the id of the primitive whose referers are to be read
+ * @param type the type of the primitive
* @param readFull true, if referers should be read fully (i.e. including their immediate children)
*
* @exception IllegalArgumentException thrown if id <= 0
@@ -100,7 +102,7 @@ public class OsmServerBackreferenceReader extends OsmServerReader {
*/
public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) throws IllegalArgumentException {
this(id, type);
- this.readFull = false;
+ this.readFull = readFull;
}
/**
@@ -149,12 +151,8 @@ public class OsmServerBackreferenceReader extends OsmServerReader {
throw new OsmTransferException(e);
} finally {
progressMonitor.finishTask();
- if (in != null) {
- try {
- in.close();
- } catch(Exception e) {}
- activeConnection = null;
- }
+ Utils.close(in);
+ activeConnection = null;
}
}
@@ -187,12 +185,8 @@ public class OsmServerBackreferenceReader extends OsmServerReader {
throw new OsmTransferException(e);
} finally {
progressMonitor.finishTask();
- if (in != null) {
- try {
- in.close();
- } catch(Exception e) {}
- activeConnection = null;
- }
+ Utils.close(in);
+ activeConnection = null;
}
}
@@ -202,7 +196,7 @@ public class OsmServerBackreferenceReader extends OsmServerReader {
* request.
*
* <ul>
- * <li>if this reader reads referers for a {@link Node}, referring ways are always
+ * <li>if this reader reads referers for a {@link org.openstreetmap.josm.data.osm.Node}, referring ways are always
* read individually from the server</li>
* <li>if this reader reads referers for an {@link Way} or a {@link Relation}, referring relations
* are only read fully if {@link #setReadFull(boolean)} is set to true.</li>
diff --git a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
index a36df89..11284e5 100644
--- a/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
@@ -10,7 +10,6 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import org.openstreetmap.josm.data.osm.Changeset;
@@ -21,7 +20,7 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
- * Reads the history of an {@link OsmPrimitive} from the OSM API server.
+ * Reads the history of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} from the OSM API server.
*
*/
public class OsmServerChangesetReader extends OsmServerReader {
@@ -131,8 +130,7 @@ public class OsmServerChangesetReader extends OsmServerReader {
monitor.setTicksCount(ids.size());
List<Changeset> ret = new ArrayList<Changeset>();
int i=0;
- for (Iterator<Integer> it = ids.iterator(); it.hasNext(); ) {
- int id = it.next();
+ for (int id : ids) {
if (id <= 0) {
continue;
}
@@ -142,7 +140,7 @@ public class OsmServerChangesetReader extends OsmServerReader {
InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true));
if (in == null)
return null;
- monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2} ...", i,ids.size(), id));
+ monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2} ...", i, ids.size(), id));
List<Changeset> changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
if (changesets == null || changesets.isEmpty()) {
continue;
diff --git a/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java b/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
index 6b5c223..9a373dc 100644
--- a/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
@@ -11,9 +11,10 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
/**
- * Reads the history of an {@link OsmPrimitive} from the OSM API server.
+ * Reads the history of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} from the OSM API server.
*
*/
public class OsmServerHistoryReader extends OsmServerReader {
@@ -77,12 +78,8 @@ public class OsmServerHistoryReader extends OsmServerReader {
throw new OsmTransferException(e);
} finally {
progressMonitor.finishTask();
- if (in != null) {
- try {
- in.close();
- } catch(Exception e) {}
- activeConnection = null;
- }
+ Utils.close(in);
+ activeConnection = null;
}
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
index 4669a79..ede171d 100644
--- a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
@@ -5,25 +5,49 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
-import org.apache.tools.bzip2.CBZip2InputStream;
import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
+/**
+ * Read content from OSM server for a given URL
+ * @since 1146
+ */
public class OsmServerLocationReader extends OsmServerReader {
protected final String url;
+ /**
+ * Constructs a new {@code OsmServerLocationReader}.
+ * @param url The URL to fetch
+ */
public OsmServerLocationReader(String url) {
this.url = url;
}
protected abstract class Parser<T> {
- public InputStream in = null;
+ protected final ProgressMonitor progressMonitor;
+ protected final Compression compression;
+ protected InputStream in = null;
+
+ public Parser(ProgressMonitor progressMonitor, Compression compression) {
+ this.progressMonitor = progressMonitor;
+ this.compression = compression;
+ }
+
+ protected final InputStream getUncompressedInputStream() throws IOException {
+ switch (compression) {
+ case BZIP2: return FileImporter.getBZip2InputStream(in);
+ case GZIP: return FileImporter.getGZipInputStream(in);
+ case NONE:
+ default: return in;
+ }
+ }
+
public abstract T parse() throws OsmTransferException, IllegalDataException, IOException, SAXException;
}
@@ -39,138 +63,98 @@ public class OsmServerLocationReader extends OsmServerReader {
throw new OsmTransferException(e);
} finally {
progressMonitor.finishTask();
- try {
- activeConnection = null;
- if (parser.in != null) {
- parser.in.close();
- parser.in = null;
- }
- } catch(Exception e) {/* ignore it */}
+ activeConnection = null;
+ Utils.close(parser.in);
+ parser.in = null;
}
}
- /**
- * Method to download OSM files from somewhere
- */
@Override
public DataSet parseOsm(final ProgressMonitor progressMonitor) throws OsmTransferException {
- return doParse(new Parser<DataSet>() {
- @Override
- public DataSet parse() throws OsmTransferException, IllegalDataException {
- in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
- if (in == null)
- return null;
- progressMonitor.subTask(tr("Downloading OSM data..."));
- return OsmReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
- }
- }, progressMonitor);
+ return doParse(new OsmParser(progressMonitor, Compression.NONE), progressMonitor);
}
- /**
- * Method to download BZip2-compressed OSM files from somewhere
- */
@Override
public DataSet parseOsmBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
- return doParse(new Parser<DataSet>() {
- @Override
- public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
- in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
- if (in == null)
- return null;
- CBZip2InputStream bzin = FileImporter.getBZip2InputStream(in);
- progressMonitor.subTask(tr("Downloading OSM data..."));
- return OsmReader.parseDataSet(bzin, progressMonitor.createSubTaskMonitor(1, false));
- }
- }, progressMonitor);
+ return doParse(new OsmParser(progressMonitor, Compression.BZIP2), progressMonitor);
}
-
- /**
- * Method to download GZip-compressed OSM files from somewhere
- */
+
@Override
public DataSet parseOsmGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
- return doParse(new Parser<DataSet>() {
- @Override
- public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
- in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
- if (in == null)
- return null;
- GZIPInputStream gzin = FileImporter.getGZipInputStream(in);
- progressMonitor.subTask(tr("Downloading OSM data..."));
- return OsmReader.parseDataSet(gzin, progressMonitor.createSubTaskMonitor(1, false));
- }
- }, progressMonitor);
+ return doParse(new OsmParser(progressMonitor, Compression.GZIP), progressMonitor);
}
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.io.OsmServerReader#parseOsmChange(org.openstreetmap.josm.gui.progress.ProgressMonitor)
- */
@Override
- public DataSet parseOsmChange(final ProgressMonitor progressMonitor)
- throws OsmTransferException {
- return doParse(new Parser<DataSet>() {
- @Override
- public DataSet parse() throws OsmTransferException, IllegalDataException {
- in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
- if (in == null)
- return null;
- progressMonitor.subTask(tr("Downloading OSM data..."));
- return OsmChangeReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
- }
- }, progressMonitor);
+ public DataSet parseOsmChange(final ProgressMonitor progressMonitor) throws OsmTransferException {
+ return doParse(new OsmChangeParser(progressMonitor, Compression.NONE), progressMonitor);
}
-
- /**
- * Method to download BZip2-compressed OSM Change files from somewhere
- */
+
@Override
public DataSet parseOsmChangeBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
- return doParse(new Parser<DataSet>() {
- @Override
- public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
- in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
- if (in == null)
- return null;
- CBZip2InputStream bzin = FileImporter.getBZip2InputStream(in);
- progressMonitor.subTask(tr("Downloading OSM data..."));
- return OsmChangeReader.parseDataSet(bzin, progressMonitor.createSubTaskMonitor(1, false));
- }
- }, progressMonitor);
+ return doParse(new OsmChangeParser(progressMonitor, Compression.BZIP2), progressMonitor);
}
-
- /**
- * Method to download GZip-compressed OSM Change files from somewhere
- */
+
@Override
public DataSet parseOsmChangeGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
- return doParse(new Parser<DataSet>() {
- @Override
- public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
- in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
- if (in == null)
- return null;
- GZIPInputStream gzin = FileImporter.getGZipInputStream(in);
- progressMonitor.subTask(tr("Downloading OSM data..."));
- return OsmChangeReader.parseDataSet(gzin, progressMonitor.createSubTaskMonitor(1, false));
- }
- }, progressMonitor);
+ return doParse(new OsmChangeParser(progressMonitor, Compression.GZIP), progressMonitor);
}
@Override
public GpxData parseRawGps(final ProgressMonitor progressMonitor) throws OsmTransferException {
- return doParse(new Parser<GpxData>() {
- @Override
- public GpxData parse() throws OsmTransferException, IllegalDataException, IOException, SAXException {
- in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(1, true));
- if (in == null)
- return null;
- progressMonitor.subTask(tr("Downloading OSM data..."));
- GpxReader reader = new GpxReader(in);
- gpxParsedProperly = reader.parse(false);
- GpxData result = reader.getGpxData();
- result.fromServer = DownloadGpsTask.isFromServer(url);
- return result;
- }
- }, progressMonitor);
+ return doParse(new GpxParser(progressMonitor, Compression.NONE), progressMonitor);
+ }
+
+ @Override
+ public GpxData parseRawGpsBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
+ return doParse(new GpxParser(progressMonitor, Compression.BZIP2), progressMonitor);
+ }
+
+ protected class OsmParser extends Parser<DataSet> {
+ protected OsmParser(ProgressMonitor progressMonitor, Compression compression) {
+ super(progressMonitor, compression);
+ }
+
+ @Override
+ public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
+ in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
+ if (in == null)
+ return null;
+ progressMonitor.subTask(tr("Downloading OSM data..."));
+ return OsmReader.parseDataSet(getUncompressedInputStream(), progressMonitor.createSubTaskMonitor(1, false));
+ }
+ }
+
+ protected class OsmChangeParser extends Parser<DataSet> {
+ protected OsmChangeParser(ProgressMonitor progressMonitor, Compression compression) {
+ super(progressMonitor, compression);
+ }
+
+ @Override
+ public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
+ in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
+ if (in == null)
+ return null;
+ progressMonitor.subTask(tr("Downloading OSM data..."));
+ return OsmChangeReader.parseDataSet(getUncompressedInputStream(), progressMonitor.createSubTaskMonitor(1, false));
+ }
+ }
+
+ protected class GpxParser extends Parser<GpxData> {
+ protected GpxParser(ProgressMonitor progressMonitor, Compression compression) {
+ super(progressMonitor, compression);
+ }
+
+ @Override
+ public GpxData parse() throws OsmTransferException, IllegalDataException, IOException, SAXException {
+ in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(1, true));
+ if (in == null)
+ return null;
+ progressMonitor.subTask(tr("Downloading OSM data..."));
+ GpxReader reader = new GpxReader(getUncompressedInputStream());
+ gpxParsedProperly = reader.parse(false);
+ GpxData result = reader.getGpxData();
+ result.fromServer = DownloadGpsTask.isFromServer(url);
+ return result;
+ }
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerObjectReader.java b/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
index 1a7797b..2ad5d0a 100644
--- a/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.io.IOException;
import java.io.InputStream;
import java.text.MessageFormat;
@@ -14,14 +13,14 @@ import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.xml.sax.SAXException;
+import org.openstreetmap.josm.tools.Utils;
/**
* OsmServerObjectReader reads an individual object from the OSM server.
*
* It can either download the object including or not including its immediate children.
* The former case is called a "full download".
- *
+ *
* It can also download a specific version of the object (however, "full" download is not possible
* in that case).
*
@@ -108,8 +107,7 @@ public class OsmServerObjectReader extends OsmServerReader {
* @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if
* null
* @return the downloaded data
- * @throws SAXException
- * @throws IOException
+ * @throws OsmTransferException
*/
@Override
public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
@@ -127,7 +125,7 @@ public class OsmServerObjectReader extends OsmServerReader {
if (full && ! id.getType().equals(OsmPrimitiveType.NODE)) {
sb.append("/full");
} else if (version > 0) {
- sb.append("/"+version);
+ sb.append("/").append(version);
}
in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true));
@@ -143,11 +141,7 @@ public class OsmServerObjectReader extends OsmServerReader {
throw new OsmTransferException(e);
} finally {
progressMonitor.finishTask();
- if (in!=null) {
- try {
- in.close();
- } catch(Exception e) {/* ignore this exception */}
- }
+ Utils.close(in);
activeConnection = null;
}
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerReader.java b/src/org/openstreetmap/josm/io/OsmServerReader.java
index 432a882..019dbd5 100644
--- a/src/org/openstreetmap/josm/io/OsmServerReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerReader.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -33,13 +33,21 @@ public abstract class OsmServerReader extends OsmConnection {
private OsmApi api = OsmApi.getOsmApi();
private boolean doAuthenticate = false;
protected boolean gpxParsedProperly;
+
+ protected enum Compression {
+ NONE,
+ BZIP2,
+ GZIP
+ }
/**
* Open a connection to the given url and return a reader on the input stream
* from that connection. In case of user cancel, return <code>null</code>.
- * @param urlStr The exact url to connect to.
- * @param pleaseWaitDlg
+ * Relative URL's are directed to API base URL.
+ * @param urlStr The url to connect to.
+ * @param progressMonitor progress monitoring and abort handler
* @return An reader reading the input stream (servers answer) or <code>null</code>.
+ * @throws OsmTransferException thrown if data transfer errors occur
*/
protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException {
try {
@@ -51,10 +59,22 @@ public abstract class OsmServerReader extends OsmConnection {
}
}
+ /**
+ * Retrun the base URL for relative URL requests
+ * @return base url of API
+ */
protected String getBaseUrl() {
return api.getBaseUrl();
}
+ /**
+ * Open a connection to the given url and return a reader on the input stream
+ * from that connection. In case of user cancel, return <code>null</code>.
+ * @param urlStr The exact url to connect to.
+ * @param progressMonitor progress monitoring and abort handler
+ * @return An reader reading the input stream (servers answer) or <code>null</code>.
+ * @throws OsmTransferException thrown if data transfer errors occur
+ */
protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException {
try {
URL url = null;
@@ -86,7 +106,7 @@ public abstract class OsmServerReader extends OsmConnection {
activeConnection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
try {
- System.out.println("GET " + url);
+ Main.info("GET " + url);
activeConnection.connect();
} catch (Exception e) {
e.printStackTrace();
@@ -125,11 +145,10 @@ public abstract class OsmServerReader extends OsmConnection {
}
return FixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
- } catch(Exception e) {
- if (e instanceof OsmTransferException)
- throw (OsmTransferException)e;
- else
- throw new OsmTransferException(e);
+ } catch (OsmTransferException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new OsmTransferException(e);
}
} finally {
progressMonitor.invalidate();
@@ -138,37 +157,90 @@ public abstract class OsmServerReader extends OsmConnection {
private InputStream FixEncoding(InputStream stream, String encoding) throws IOException
{
- if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
+ if ("gzip".equalsIgnoreCase(encoding)) {
stream = new GZIPInputStream(stream);
}
- else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
+ else if ("deflate".equalsIgnoreCase(encoding)) {
stream = new InflaterInputStream(stream, new Inflater(true));
}
return stream;
}
+ /**
+ * Download OSM files from somewhere
+ * @param progressMonitor The progress monitor
+ * @return The corresponding dataset
+ * @throws OsmTransferException if any error occurs
+ */
public abstract DataSet parseOsm(final ProgressMonitor progressMonitor) throws OsmTransferException;
+ /**
+ * Download OSM Change files from somewhere
+ * @param progressMonitor The progress monitor
+ * @return The corresponding dataset
+ * @throws OsmTransferException if any error occurs
+ */
public DataSet parseOsmChange(final ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
+ /**
+ * Download BZip2-compressed OSM Change files from somewhere
+ * @param progressMonitor The progress monitor
+ * @return The corresponding dataset
+ * @throws OsmTransferException if any error occurs
+ */
public DataSet parseOsmChangeBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
+ /**
+ * Download GZip-compressed OSM Change files from somewhere
+ * @param progressMonitor The progress monitor
+ * @return The corresponding dataset
+ * @throws OsmTransferException if any error occurs
+ */
public DataSet parseOsmChangeGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
+ /**
+ * Retrieve raw gps waypoints from the server API.
+ * @param progressMonitor The progress monitor
+ * @return The corresponding GPX tracks
+ * @throws OsmTransferException if any error occurs
+ */
public GpxData parseRawGps(final ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
+ /**
+ * Retrieve BZip2-compressed GPX files from somewhere.
+ * @param progressMonitor The progress monitor
+ * @return The corresponding GPX tracks
+ * @throws OsmTransferException if any error occurs
+ * @since 6244
+ */
+ public GpxData parseRawGpsBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
+ return null;
+ }
+
+ /**
+ * Download BZip2-compressed OSM files from somewhere
+ * @param progressMonitor The progress monitor
+ * @return The corresponding dataset
+ * @throws OsmTransferException if any error occurs
+ */
public DataSet parseOsmBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
+ /**
+ * Download GZip-compressed OSM files from somewhere
+ * @param progressMonitor The progress monitor
+ * @return The corresponding dataset
+ * @throws OsmTransferException if any error occurs
+ */
public DataSet parseOsmGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
return null;
}
@@ -194,7 +266,7 @@ public abstract class OsmServerReader extends OsmConnection {
public void setDoAuthenticate(boolean doAuthenticate) {
this.doAuthenticate = doAuthenticate;
}
-
+
/**
* Determines if the GPX data has been parsed properly.
* @return true if the GPX data has been parsed properly, false otherwise
diff --git a/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java b/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
index d36217f..01ddf2c 100644
--- a/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
@@ -28,7 +28,13 @@ public class OsmServerUserInfoReader extends OsmServerReader {
return node.getAttributes().getNamedItem(name).getNodeValue();
}
- static public UserInfo buildFromXML(Document document) throws OsmDataParsingException{
+ /**
+ * Parses the given XML data and returns the associated user info.
+ * @param document The XML contents
+ * @return The user info
+ * @throws OsmDataParsingException if parsing goes wrong
+ */
+ static public UserInfo buildFromXML(Document document) throws OsmDataParsingException {
try {
XPathFactory factory = XPathFactory.newInstance();
XPath xpath = factory.newXPath();
@@ -104,12 +110,29 @@ public class OsmServerUserInfoReader extends OsmServerReader {
}
userInfo.setLanguages(languages);
}
+
+ // -- messages
+ xmlNode = (Node)xpath.compile("/osm/user[1]/messages/received").evaluate(document, XPathConstants.NODE);
+ if (xmlNode != null) {
+ v = getAttribute(xmlNode, "unread");
+ if (v == null)
+ throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "unread", "received"));
+ try {
+ userInfo.setUnreadMessages(Integer.parseInt(v));
+ } catch(NumberFormatException e) {
+ throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "unread", "received", v), e);
+ }
+ }
+
return userInfo;
} catch(XPathException e) {
throw new OsmDataParsingException(e);
}
}
+ /**
+ * Constructs a new {@code OsmServerUserInfoReader}.
+ */
public OsmServerUserInfoReader() {
setDoAuthenticate(true);
}
diff --git a/src/org/openstreetmap/josm/io/OsmServerWriter.java b/src/org/openstreetmap/josm/io/OsmServerWriter.java
index f3572ce..3620949 100644
--- a/src/org/openstreetmap/josm/io/OsmServerWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmServerWriter.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -36,7 +36,7 @@ public class OsmServerWriter {
*/
private Collection<IPrimitive> processed;
- private static ArrayList<OsmServerWritePostprocessor> postprocessors;
+ private static List<OsmServerWritePostprocessor> postprocessors;
public static void registerPostprocessor(OsmServerWritePostprocessor pp) {
if (postprocessors == null) {
postprocessors = new ArrayList<OsmServerWritePostprocessor>();
diff --git a/src/org/openstreetmap/josm/io/OsmTransferException.java b/src/org/openstreetmap/josm/io/OsmTransferException.java
index efb960d..d79e9f3 100644
--- a/src/org/openstreetmap/josm/io/OsmTransferException.java
+++ b/src/org/openstreetmap/josm/io/OsmTransferException.java
@@ -26,11 +26,11 @@ public class OsmTransferException extends Exception {
}
/**
- * Constructs an {@code OsmTransferException} with the specified cause and a detail message of
- * <tt>(cause==null ? null : cause.toString())</tt>
+ * Constructs an {@code OsmTransferException} with the specified cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt>
* (which typically contains the class and detail message of <tt>cause</tt>).
*
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause} method).
* A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or unknown.
*/
public OsmTransferException(Throwable cause) {
@@ -40,7 +40,7 @@ public class OsmTransferException extends Exception {
/**
* Constructs an {@code OsmTransferException} with the specified detail message and cause.
*
- * <p> Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated
+ * <p> Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated
* into this exception's detail message.
*
* @param message The detail message (which is saved for later retrieval by the {@link #getMessage} method)
diff --git a/src/org/openstreetmap/josm/io/OsmWriter.java b/src/org/openstreetmap/josm/io/OsmWriter.java
index dd111a5..5ccc0f1 100644
--- a/src/org/openstreetmap/josm/io/OsmWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmWriter.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -70,6 +70,7 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
public void header() {
header(null);
}
+
public void header(Boolean upload) {
out.println("<?xml version='1.0' encoding='UTF-8'?>");
out.print("<osm version='");
@@ -80,6 +81,7 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
}
out.println("' generator='JOSM'>");
}
+
public void footer() {
out.println("</osm>");
}
@@ -96,7 +98,7 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
Collections.sort(result, byIdComparator);
return result;
}
-
+
public void writeLayer(OsmDataLayer layer) {
header(!layer.isUploadDiscouraged());
writeDataSources(layer.data);
@@ -113,7 +115,7 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
writeWays(ds.getWays());
writeRelations(ds.getRelations());
}
-
+
/**
* Writes the given nodes sorted by id
* @param nodes The nodes to write
@@ -126,7 +128,7 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
}
}
}
-
+
/**
* Writes the given ways sorted by id
* @param ways The ways to write
@@ -139,7 +141,7 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
}
}
}
-
+
/**
* Writes the given relations sorted by id
* @param relations The relations to write
@@ -160,10 +162,10 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
public void writeDataSources(DataSet ds) {
for (DataSource s : ds.dataSources) {
out.println(" <bounds minlat='"
- + s.bounds.getMin().lat()+"' minlon='"
- + s.bounds.getMin().lon()+"' maxlat='"
- + s.bounds.getMax().lat()+"' maxlon='"
- + s.bounds.getMax().lon()
+ + s.bounds.getMinLat()+"' minlon='"
+ + s.bounds.getMinLon()+"' maxlat='"
+ + s.bounds.getMaxLat()+"' maxlon='"
+ + s.bounds.getMaxLon()
+"' origin='"+XmlWriter.encode(s.origin)+"' />");
}
}
@@ -312,13 +314,4 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
out.print(" changeset='"+osm.getChangesetId()+"'" );
}
}
-
- public void close() {
- out.close();
- }
-
- @Override
- public void flush() {
- out.flush();
- }
}
diff --git a/src/org/openstreetmap/josm/io/OsmWriterFactory.java b/src/org/openstreetmap/josm/io/OsmWriterFactory.java
index fa8968d..d6272a7 100644
--- a/src/org/openstreetmap/josm/io/OsmWriterFactory.java
+++ b/src/org/openstreetmap/josm/io/OsmWriterFactory.java
@@ -6,11 +6,11 @@ import java.io.PrintWriter;
/**
* This factory is called by everyone who needs an OsmWriter object,
* instead of directly calling the OsmWriter constructor.
- *
+ *
* This enables plugins to substitute the original OsmWriter with
* their own version, altering the way JOSM writes objects to the
* server, and to disk.
- *
+ *
* @author Frederik Ramm
*
*/
diff --git a/src/org/openstreetmap/josm/io/ProgressInputStream.java b/src/org/openstreetmap/josm/io/ProgressInputStream.java
index 3bc80de..580146b 100644
--- a/src/org/openstreetmap/josm/io/ProgressInputStream.java
+++ b/src/org/openstreetmap/josm/io/ProgressInputStream.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -48,8 +48,11 @@ public class ProgressInputStream extends InputStream {
}
@Override public void close() throws IOException {
- in.close();
- progressMonitor.finishTask();
+ try {
+ in.close();
+ } finally {
+ progressMonitor.finishTask();
+ }
}
@Override public int read(byte[] b, int off, int len) throws IOException {
diff --git a/src/org/openstreetmap/josm/io/UTFInputStreamReader.java b/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
index ec780aa..294765e 100644
--- a/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
+++ b/src/org/openstreetmap/josm/io/UTFInputStreamReader.java
@@ -1,23 +1,24 @@
// License: GPL. See LICENSE file for details.
package org.openstreetmap.josm.io;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
import java.io.PushbackInputStream;
import java.io.UnsupportedEncodingException;
/**
* Detects the different UTF encodings from byte order mark
*/
-public class UTFInputStreamReader extends InputStreamReader {
+public final class UTFInputStreamReader extends InputStreamReader {
+
/**
* converts input stream to reader
* @param defaultEncoding Used, when no BOM was recognized. Can be null.
* @return A reader with the correct encoding. Starts to read after the BOM.
*/
public static UTFInputStreamReader create(InputStream input, String defaultEncoding) throws IOException {
- byte bom[] = new byte[4];
+ byte[] bom = new byte[4];
String encoding = defaultEncoding;
int unread;
PushbackInputStream pushbackStream = new PushbackInputStream(input, 4);
diff --git a/src/org/openstreetmap/josm/io/WMSLayerExporter.java b/src/org/openstreetmap/josm/io/WMSLayerExporter.java
index 413465d..7bf9041 100644
--- a/src/org/openstreetmap/josm/io/WMSLayerExporter.java
+++ b/src/org/openstreetmap/josm/io/WMSLayerExporter.java
@@ -9,10 +9,11 @@ import java.io.ObjectOutputStream;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.WMSLayer;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
/**
- * Export a WMS layer to a serialized binary file that can be imported later via {@link WMSLayerImporter}.
- *
+ * Export a WMS layer to a serialized binary file that can be imported later via {@link WMSLayerImporter}.
+ *
* @since 5457
*/
public class WMSLayerExporter extends FileExporter {
@@ -33,7 +34,7 @@ public class WMSLayerExporter extends FileExporter {
try {
((WMSLayer)layer).writeExternal(oos);
} finally {
- oos.close();
+ Utils.close(oos);
}
}
}
diff --git a/src/org/openstreetmap/josm/io/WMSLayerImporter.java b/src/org/openstreetmap/josm/io/WMSLayerImporter.java
index 4733896..120e313 100644
--- a/src/org/openstreetmap/josm/io/WMSLayerImporter.java
+++ b/src/org/openstreetmap/josm/io/WMSLayerImporter.java
@@ -14,6 +14,7 @@ import org.openstreetmap.josm.gui.layer.WMSLayer;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
/**
* Import a WMS layer from a serialized binary file previously exported via {@link WMSLayerExporter}.
@@ -26,7 +27,7 @@ public class WMSLayerImporter extends FileImporter {
*/
public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
"wms", "wms", tr("WMS Files (*.wms)"));
-
+
private final WMSLayer wmsLayer;
/**
@@ -54,9 +55,9 @@ public class WMSLayerImporter extends FileImporter {
} catch (ClassNotFoundException e) {
throw new IllegalDataException(e);
} finally {
- ois.close();
+ Utils.close(ois);
}
-
+
// FIXME: remove UI stuff from IO subsystem
GuiHelper.runInEDT(new Runnable() {
@Override
diff --git a/src/org/openstreetmap/josm/io/XmlWriter.java b/src/org/openstreetmap/josm/io/XmlWriter.java
index 0f06197..70b37af 100644
--- a/src/org/openstreetmap/josm/io/XmlWriter.java
+++ b/src/org/openstreetmap/josm/io/XmlWriter.java
@@ -1,24 +1,32 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io;
+import java.io.Closeable;
+import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashMap;
+import java.util.Map;
/**
* Helper class to use for xml outputting classes.
*
* @author imi
*/
-public class XmlWriter {
+public class XmlWriter implements Closeable {
- protected PrintWriter out;
+ protected final PrintWriter out;
public XmlWriter(PrintWriter out) {
this.out = out;
}
+ /**
+ * Flushes the stream.
+ */
public void flush() {
- out.flush();
+ if (out != null) {
+ out.flush();
+ }
}
public static String encode(String unencoded) {
@@ -57,7 +65,7 @@ public class XmlWriter {
/**
* The output writer to save the values to.
*/
- final private static HashMap<Character, String> encoding = new HashMap<Character, String>();
+ private static final Map<Character, String> encoding = new HashMap<Character, String>();
static {
encoding.put('<', "<");
encoding.put('>', ">");
@@ -68,4 +76,11 @@ public class XmlWriter {
encoding.put('\r', "
");
encoding.put('\t', "	");
}
+
+ @Override
+ public void close() throws IOException {
+ if (out != null) {
+ out.close();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java b/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
index e9bee4e..71cb9d8 100644
--- a/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
+++ b/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
@@ -14,7 +14,7 @@ abstract public class AbstractCredentialsAgent implements CredentialsAgent {
protected Map<RequestorType, PasswordAuthentication> memoryCredentialsCache = new HashMap<RequestorType, PasswordAuthentication>();
/**
- * @see CredentialsAgent#getCredentials(RequestorType, String, boolean)
+ * @see CredentialsAgent#getCredentials
*/
@Override
public CredentialsAgentResponse getCredentials(final RequestorType requestorType, final String host, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
@@ -44,15 +44,15 @@ abstract public class AbstractCredentialsAgent implements CredentialsAgent {
* file (username=="") and each time after authentication failed
* (noSuccessWithLastResponse == true).
*/
- } else if (noSuccessWithLastResponse || username.equals("") || password.equals("")) {
+ } else if (noSuccessWithLastResponse || username.isEmpty() || password.isEmpty()) {
GuiHelper.runInEDTAndWait(new Runnable() {
@Override
public void run() {
CredentialDialog dialog = null;
- switch(requestorType) {
- case SERVER: dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
- case PROXY: dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
- }
+ if (requestorType.equals(RequestorType.PROXY))
+ dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
+ else
+ dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
dialog.setVisible(true);
response.setCanceled(dialog.isCanceled());
if (dialog.isCanceled())
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java b/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
index 4bf0078..f4fdeba 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
@@ -23,8 +23,9 @@ public interface CredentialsAgent {
/**
* Looks up the credentials for a given type.
*
- * @param the type of service. {@link RequestorType#SERVER} for the OSM API server, {@link RequestorType#PROXY}
+ * @param requestorType the type of service. {@link RequestorType#SERVER} for the OSM API server, {@link RequestorType#PROXY}
* for a proxy server
+ * @param host the hostname for these credentials
* @return the credentials
* @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface
*/
@@ -33,8 +34,9 @@ public interface CredentialsAgent {
/**
* Saves the credentials in <code>credentials</code> for the given service type.
*
- * @param the type of service. {@link RequestorType#SERVER} for the OSM API server, {@link RequestorType#PROXY}
+ * @param requestorType the type of service. {@link RequestorType#SERVER} for the OSM API server, {@link RequestorType#PROXY}
* for a proxy server
+ * @param host the hostname for these credentials
* @param credentials the credentials
* @throws CredentialsManagerException thrown if a problem occurs in a implementation of this interface
*/
@@ -42,8 +44,9 @@ public interface CredentialsAgent {
/**
*
- * @param requestorType the type of service. {@link RequestorType#SERVER} for the OSM API server, {@link RequestorType#PROXY}
+ * @param requestorType the type of service. {@link RequestorType#SERVER} for the OSM API server, {@link RequestorType#PROXY}
* for a proxy server
+ * @param host the hostname for these credentials
* @param noSuccessWithLastResponse true, if the last request with the supplied credentials failed; false otherwise.
* If true, implementations of this interface are advised to prompt the user for new credentials.
* @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java b/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
index 8cd230c..9bb18ff 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io.auth;
+import org.openstreetmap.josm.tools.Utils;
+
/**
* CredentialsAgentResponse represents the response from {@link CredentialsAgent#getCredentials(java.net.Authenticator.RequestorType, String, boolean)}.
*
@@ -41,7 +43,7 @@ public class CredentialsAgentResponse {
* @param password The password in plain text
*/
public void setPassword(char[] password) {
- this.password = password;
+ this.password = Utils.copyArray(password);
}
/**
* Determines if authentication request has been canceled by user
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsManager.java b/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
index 27b0d59..eb9a485 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
@@ -8,16 +8,17 @@ import java.net.PasswordAuthentication;
import org.openstreetmap.josm.data.oauth.OAuthToken;
import org.openstreetmap.josm.gui.JosmUserIdentityManager;
import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Utils;
/**
* CredentialManager is a factory for the single credential agent used.
*
* Currently, it defaults to replying an instance of {@link JosmPreferencesCredentialAgent}.
- *
+ * @since 2641
*/
public class CredentialsManager implements CredentialsAgent {
-
+
private static CredentialsManager instance;
/**
@@ -37,13 +38,13 @@ public class CredentialsManager implements CredentialsAgent {
}
return instance;
}
-
+
private static CredentialsAgentFactory agentFactory;
public interface CredentialsAgentFactory {
CredentialsAgent getCredentialsAgent();
}
-
+
/**
* Plugins can register a CredentialsAgentFactory, thereby overriding
* JOSM's default credentials agent.
@@ -55,20 +56,43 @@ public class CredentialsManager implements CredentialsAgent {
CredentialsManager.instance = null;
}
- /*****
- * non-static fields and methods
+ /* non-static fields and methods */
+
+ /**
+ * The credentials agent doing the real stuff
*/
-
private CredentialsAgent delegate;
+ /**
+ * Constructs a new {@code CredentialsManager}.
+ * @param delegate The credentials agent backing this credential manager. Must not be {@code null}
+ */
public CredentialsManager(CredentialsAgent delegate) {
+ CheckParameterUtil.ensureParameterNotNull(delegate, "delegate");
this.delegate = delegate;
}
+
+ /**
+ * Returns type of credentials agent backing this credentials manager.
+ * @return The type of credentials agent
+ */
+ public final Class<? extends CredentialsAgent> getCredentialsAgentClass () {
+ return delegate.getClass();
+ }
+ /**
+ * Returns the username for OSM API
+ * @return the username for OSM API
+ */
public String getUsername() {
return getUsername(OsmApi.getOsmApi().getHost());
}
+ /**
+ * Returns the username for a given host
+ * @param host The host for which username is wanted
+ * @return The username for {@code host}
+ */
public String getUsername(String host) {
String username = null;
try {
diff --git a/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java b/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
index a6179ed..ceb6352 100644
--- a/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
+++ b/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
@@ -6,21 +6,27 @@ import java.net.PasswordAuthentication;
import java.util.HashMap;
import java.util.Map;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.OsmApi;
/**
* This is the default authenticator used in JOSM. It delegates lookup of credentials
- * for the OSM API and an optional proxy server to the currently configured
- * {@link CredentialsManager}.
- *
+ * for the OSM API and an optional proxy server to the currently configured {@link CredentialsManager}.
+ * @since 2641
*/
-public class DefaultAuthenticator extends Authenticator {
+public final class DefaultAuthenticator extends Authenticator {
private static DefaultAuthenticator instance;
+ /**
+ * Returns the unique instance
+ * @return The unique instance
+ */
public static DefaultAuthenticator getInstance() {
return instance;
}
+ /**
+ * Creates the unique instance
+ */
public static void createInstance() {
instance = new DefaultAuthenticator();
}
@@ -32,20 +38,16 @@ public class DefaultAuthenticator extends Authenticator {
}
/**
- * Called by the Java http stack when either the OSM API server or a proxy requires
- * authentication.
- *
+ * Called by the Java HTTP stack when either the OSM API server or a proxy requires authentication.
*/
- @Override protected PasswordAuthentication getPasswordAuthentication() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
if (!enabled)
return null;
try {
- if (getRequestorType().equals(Authenticator.RequestorType.SERVER)) {
+ if (getRequestorType().equals(Authenticator.RequestorType.SERVER) && OsmApi.isUsingOAuth()) {
// if we are working with OAuth we don't prompt for a password
- //
- String authMethod = Main.pref.get("osm-server.auth-method", "basic");
- if (authMethod.equals("oauth"))
- return null;
+ return null;
}
boolean tried = credentialsTried.get(getRequestorType()) != null;
CredentialsAgentResponse response = CredentialsManager.getInstance().getCredentials(getRequestorType(), getRequestingHost(), tried);
diff --git a/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java b/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java
index 15dc373..d63fc6f 100644
--- a/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java
+++ b/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java
@@ -24,7 +24,7 @@ import org.openstreetmap.josm.tools.Utils;
public class JosmPreferencesCredentialAgent extends AbstractCredentialsAgent {
/**
- * @see CredentialsAgent#lookup(RequestorType)
+ * @see CredentialsAgent#lookup
*/
@Override
public PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException{
@@ -58,7 +58,7 @@ public class JosmPreferencesCredentialAgent extends AbstractCredentialsAgent {
}
/**
- * @see CredentialsAgent#store(RequestorType, PasswordAuthentication)
+ * @see CredentialsAgent#store
*/
@Override
public void store(RequestorType requestorType, String host, PasswordAuthentication credentials) throws CredentialsAgentException {
@@ -144,10 +144,10 @@ public class JosmPreferencesCredentialAgent extends AbstractCredentialsAgent {
);
return pnlMessage;
}
-
+
@Override
public String getSaveUsernameAndPasswordCheckboxText() {
return tr("Save user and password (unencrypted)");
}
-
+
}
diff --git a/src/org/openstreetmap/josm/io/imagery/Grabber.java b/src/org/openstreetmap/josm/io/imagery/Grabber.java
index b994438..5b04970 100644
--- a/src/org/openstreetmap/josm/io/imagery/Grabber.java
+++ b/src/org/openstreetmap/josm/io/imagery/Grabber.java
@@ -65,8 +65,9 @@ abstract public class Grabber implements Runnable {
} catch (Exception e) {
try { // sleep some time and then ask the server again
Thread.sleep(random(1000, 2000));
- } catch (InterruptedException e1) {}
-
+ } catch (InterruptedException e1) {
+ Main.debug("InterruptedException in "+getClass().getSimpleName()+" during WMS request");
+ }
if(i == maxTries) {
e.printStackTrace();
request.finish(State.FAILED, null);
diff --git a/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java b/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java
index 6a5be93..3e574b8 100644
--- a/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java
+++ b/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java
@@ -8,6 +8,7 @@ import java.io.IOException;
import java.net.URL;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
import javax.imageio.ImageIO;
@@ -29,11 +30,11 @@ public class HTMLGrabber extends WMSGrabber {
protected BufferedImage grab(WMSRequest request, URL url, int attempt) throws IOException {
String urlstring = url.toExternalForm();
- System.out.println("Grabbing HTML " + (attempt > 1? "(attempt " + attempt + ") ":"") + url);
+ Main.info("Grabbing HTML " + (attempt > 1? "(attempt " + attempt + ") ":"") + url);
- ArrayList<String> cmdParams = new ArrayList<String>();
+ List<String> cmdParams = new ArrayList<String>();
StringTokenizer st = new StringTokenizer(MessageFormat.format(PROP_BROWSER.get(), urlstring));
- while( st.hasMoreTokens() ) {
+ while (st.hasMoreTokens()) {
cmdParams.add(st.nextToken());
}
@@ -42,7 +43,7 @@ public class HTMLGrabber extends WMSGrabber {
Process browser;
try {
browser = builder.start();
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
throw new IOException( "Could not start browser. Please check that the executable path is correct.\n" + ioe.getMessage() );
}
diff --git a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
index 4884dae..2ef142c 100644
--- a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
+++ b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
@@ -257,7 +257,6 @@ public class ImageryReader {
entry.setCountryCode(accumulator.toString());
} else if (qName.equals("icon")) {
entry.setIcon(accumulator.toString());
- } else {
}
break;
case BOUNDS:
diff --git a/src/org/openstreetmap/josm/io/imagery/OffsetServer.java b/src/org/openstreetmap/josm/io/imagery/OffsetServer.java
deleted file mode 100644
index 3eddc39..0000000
--- a/src/org/openstreetmap/josm/io/imagery/OffsetServer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.imagery;
-
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.data.preferences.BooleanProperty;
-
-public interface OffsetServer {
- public static BooleanProperty PROP_SERVER_ENABLED = new BooleanProperty("imagery.offsetserver.enabled",false);
- abstract boolean isLayerSupported(ImageryInfo info);
- abstract EastNorth getOffset(ImageryInfo info, EastNorth en);
-}
diff --git a/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java b/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java
deleted file mode 100644
index 90b6839..0000000
--- a/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.imagery;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLEncoder;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.data.preferences.StringProperty;
-import org.openstreetmap.josm.tools.Utils;
-
-public class OsmosnimkiOffsetServer implements OffsetServer {
- public static final StringProperty PROP_SERVER_URL = new StringProperty("imagery.offsetserver.url","http://offset.osmosnimki.ru/offset/v0?");
- private String url;
-
- public OsmosnimkiOffsetServer(String url) {
- this.url = url;
- }
-
- @Override
- public boolean isLayerSupported(ImageryInfo info) {
- try {
- URL url = new URL(this.url + "action=CheckAvailability&id=" + URLEncoder.encode(info.getUrl(), "UTF-8"));
- System.out.println(tr("Querying offset availability: {0}", url));
- final BufferedReader rdr = new BufferedReader(new InputStreamReader(Utils.openHttpConnection(url).getInputStream(), "UTF-8"));
- String response = rdr.readLine();
- System.out.println(tr("Offset server response: {0}", response));
- if (response == null)
- return false;
- if (response.contains("\"offsets_available\": true")) return true;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
- @Override
- public EastNorth getOffset(ImageryInfo info, EastNorth en) {
- LatLon ll = Main.getProjection().eastNorth2latlon(en);
- try {
- URL url = new URL(this.url + "action=GetOffsetForPoint&lat=" + ll.lat() + "&lon=" + ll.lon() + "&id=" + URLEncoder.encode(info.getUrl(), "UTF-8"));
- System.out.println(tr("Querying offset: {0}", url.toString()));
- final BufferedReader rdr = new BufferedReader(new InputStreamReader(Utils.openHttpConnection(url).getInputStream(), "UTF-8"));
- String s = rdr.readLine();
- if (s == null)
- return null;
- int i = s.indexOf(',');
- if (i == -1) return null;
- String sLon = s.substring(1,i);
- String sLat = s.substring(i+1,s.length()-1);
- return Main.getProjection().latlon2eastNorth(new LatLon(Double.valueOf(sLat),Double.valueOf(sLon))).sub(en);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
-}
diff --git a/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java b/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
index 1f00e84..8270682 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
@@ -25,7 +25,6 @@ import java.util.regex.Pattern;
import javax.imageio.ImageIO;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.imagery.GeorefImage.State;
@@ -47,10 +46,9 @@ public class WMSGrabber extends Grabber {
super(mv, layer, localOnly);
this.info = layer.getInfo();
this.baseURL = info.getUrl();
- if(layer.getInfo().getCookies() != null && !layer.getInfo().getCookies().equals("")) {
+ if(layer.getInfo().getCookies() != null && !layer.getInfo().getCookies().isEmpty()) {
props.put("Cookie", layer.getInfo().getCookies());
}
- props.put("User-Agent", Main.pref.get("imagery.wms.user_agent", Version.getInstance().getAgentString()));
Pattern pattern = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
StringBuffer output = new StringBuffer();
Matcher matcher = pattern.matcher(this.baseURL);
@@ -159,7 +157,7 @@ public class WMSGrabber extends Grabber {
}
protected BufferedImage grab(WMSRequest request, URL url, int attempt) throws IOException, OsmTransferException {
- System.out.println("Grabbing WMS " + (attempt > 1? "(attempt " + attempt + ") ":"") + url);
+ Main.info("Grabbing WMS " + (attempt > 1? "(attempt " + attempt + ") ":"") + url);
HttpURLConnection conn = Utils.openHttpConnection(url);
for(Entry<String, String> e : props.entrySet()) {
@@ -178,7 +176,7 @@ public class WMSGrabber extends Grabber {
try {
Utils.copyStream(is, baos);
} finally {
- is.close();
+ Utils.close(is);
}
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
@@ -201,7 +199,7 @@ public class WMSGrabber extends Grabber {
}
return exception.toString();
} finally {
- br.close();
+ Utils.close(br);
}
}
}
diff --git a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
index 4ea26af..4bdefcd 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
@@ -9,9 +9,9 @@ import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
@@ -19,6 +19,7 @@ import java.util.regex.Pattern;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.imagery.ImageryInfo;
import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;
@@ -50,6 +51,7 @@ public class WMSImagery {
private List<LayerDetails> layers;
private URL serviceUrl;
+ private List<String> formats;
public List<LayerDetails> getLayers() {
return layers;
@@ -59,9 +61,13 @@ public class WMSImagery {
return serviceUrl;
}
+ public List<String> getFormats() {
+ return formats;
+ }
+
String buildRootUrl() {
if (serviceUrl == null) {
- return null;
+ return null;
}
StringBuilder a = new StringBuilder(serviceUrl.getProtocol());
a.append("://");
@@ -82,8 +88,12 @@ public class WMSImagery {
}
public String buildGetMapUrl(Collection<LayerDetails> selectedLayers) {
+ return buildGetMapUrl(selectedLayers, "image/jpeg");
+ }
+
+ public String buildGetMapUrl(Collection<LayerDetails> selectedLayers, String format) {
return buildRootUrl()
- + "FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS="
+ + "FORMAT=" + format + "&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS="
+ Utils.join(",", Utils.transform(selectedLayers, new Utils.Function<LayerDetails, String>() {
@Override
public String apply(LayerDetails x) {
@@ -117,19 +127,22 @@ public class WMSImagery {
return;
}
- System.out.println("GET " + getCapabilitiesUrl.toString());
+ Main.info("GET " + getCapabilitiesUrl.toString());
URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl);
InputStream inputStream = openConnection.getInputStream();
BufferedReader br = new BufferedReader(UTFInputStreamReader.create(inputStream, "UTF-8"));
String line;
StringBuilder ba = new StringBuilder();
- while ((line = br.readLine()) != null) {
- ba.append(line);
- ba.append("\n");
+ try {
+ while ((line = br.readLine()) != null) {
+ ba.append(line);
+ ba.append("\n");
+ }
+ } finally {
+ br.close();
}
String incomingData = ba.toString();
- //System.out.println("WMS capabilities:\n"+incomingData+"\n");
try {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setValidating(false);
@@ -139,7 +152,7 @@ public class WMSImagery {
builder.setEntityResolver(new EntityResolver() {
@Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
- System.out.println("Ignoring DTD " + publicId + ", " + systemId);
+ Main.info("Ignoring DTD " + publicId + ", " + systemId);
return new InputSource(new StringReader(""));
}
});
@@ -150,6 +163,14 @@ public class WMSImagery {
Element child = getChild(document.getDocumentElement(), "Capability");
child = getChild(child, "Request");
child = getChild(child, "GetMap");
+
+ formats = new ArrayList<String>(Utils.transform(getChildren(child, "Format"), new Utils.Function<Element, String>() {
+ @Override
+ public String apply(Element x) {
+ return x.getTextContent();
+ }
+ }));
+
child = getChild(child, "DCPType");
child = getChild(child, "HTTP");
child = getChild(child, "Get");
@@ -157,7 +178,7 @@ public class WMSImagery {
if (child != null) {
String baseURL = child.getAttribute("xlink:href");
if (baseURL != null && !baseURL.equals(serviceUrlStr)) {
- System.out.println("GetCapabilities specifies a different service URL: " + baseURL);
+ Main.info("GetCapabilities specifies a different service URL: " + baseURL);
serviceUrl = new URL(baseURL);
}
}
@@ -184,7 +205,7 @@ public class WMSImagery {
}
private List<LayerDetails> parseLayers(List<Element> children, Set<String> parentCrs) {
- List<LayerDetails> details = new LinkedList<LayerDetails>();
+ List<LayerDetails> details = new ArrayList<LayerDetails>(children.size());
for (Element element : children) {
details.add(parseLayer(element, parentCrs));
}
@@ -206,7 +227,7 @@ public class WMSImagery {
crsChildren.addAll(getChildren(element, "SRS"));
for (Element child : crsChildren) {
String crs = (String) getContent(child);
- if (crs != null) {
+ if (!crs.isEmpty()) {
String upperCase = crs.trim().toUpperCase();
crsList.add(upperCase);
}
@@ -258,7 +279,7 @@ public class WMSImagery {
return missing;
else {
String content = (String) getContent(child);
- return (content != null) ? content : empty;
+ return (!content.isEmpty()) ? content : empty;
}
}
@@ -280,7 +301,7 @@ public class WMSImagery {
}
private static List<Element> getChildren(Element parent, String name) {
- List<Element> retVal = new LinkedList<Element>();
+ List<Element> retVal = new ArrayList<Element>();
for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
if (child instanceof Element && name.equals(child.getNodeName())) {
retVal.add((Element) child);
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
index 8bf636c..6ece8b8 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
@@ -5,18 +5,26 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import javax.swing.AbstractAction;
+import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.KeyStroke;
import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
@@ -26,12 +34,14 @@ import org.openstreetmap.josm.data.SelectionChangedListener;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
import org.openstreetmap.josm.tools.GBC;
/**
- *
+ *
* @author master
- *
+ *
* Dialog to add tags as part of the remotecontrol
* Existing Keys get grey color and unchecked selectboxes so they will not overwrite the old Key-Value-Pairs by default.
* You can choose the tags you want to add by selectboxes. You can edit the tags before you apply them.
@@ -40,10 +50,19 @@ import org.openstreetmap.josm.tools.GBC;
public class AddTagsDialog extends ExtendedDialog implements SelectionChangedListener {
+ /** initially given tags **/
+ String[][] tags;
+
private final JTable propertyTable;
private Collection<? extends OsmPrimitive> sel;
int[] count;
+ String sender;
+ static Set<String> trustedSenders = new HashSet<String>();
+
+ /**
+ * Class for displaying "delete from ... objects" in the table
+ */
static class DeleteTagMarker {
int num;
public DeleteTagMarker(int num) {
@@ -53,42 +72,96 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
return tr("<delete from {0} objects>", num);
}
}
-
-
- public AddTagsDialog(String[][] tags) {
+
+ /**
+ * Class for displaying list of existing tag values in the table
+ */
+ static class ExistingValues {
+ String tag;
+ Map<String, Integer> valueCount;
+ public ExistingValues(String tag) {
+ this.tag=tag; valueCount=new HashMap<String, Integer>();
+ }
+
+ int addValue(String val) {
+ Integer c = valueCount.get(val);
+ int r = c==null? 1 : (c.intValue()+1);
+ valueCount.put(val, r);
+ return r;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb=new StringBuilder();
+ for (String k: valueCount.keySet()) {
+ if (sb.length()>0) sb.append(", ");
+ sb.append(k);
+ }
+ return sb.toString();
+ }
+
+ private String getToolTip() {
+ StringBuilder sb=new StringBuilder();
+ sb.append("<html>");
+ sb.append(tr("Old values of"));
+ sb.append(" <b>");
+ sb.append(tag);
+ sb.append("</b><br/>");
+ for (String k: valueCount.keySet()) {
+ sb.append("<b>");
+ sb.append(valueCount.get(k));
+ sb.append(" x </b>");
+ sb.append(k);
+ sb.append("<br/>");
+ }
+ sb.append("</html>");
+ return sb.toString();
+
+ }
+ }
+
+ public AddTagsDialog(String[][] tags, String senderName) {
super(Main.parent, tr("Add tags to selected objects"), new String[] { tr("Add selected tags"), tr("Add all tags"), tr("Cancel")},
false,
true);
setToolTipTexts(new String[]{tr("Add checked tags to selected objects"), tr("Shift+Enter: Add all tags to selected objects"), ""});
-
+
+ this.sender = senderName;
+
DataSet.addSelectionListener(this);
- DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value")}, tags.length) {
+ final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) {
+ final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
@Override
- public Class getColumnClass(int c) {
- return getValueAt(0, c).getClass();
+ public Class<?> getColumnClass(int c) {
+ return types[c];
}
-
};
sel = Main.main.getCurrentDataSet().getSelected();
count = new int[tags.length];
-
+
for (int i = 0; i<tags.length; i++) {
count[i] = 0;
String key = tags[i][0];
+ String value = tags[i][1], oldValue;
Boolean b = Boolean.TRUE;
+ ExistingValues old = new ExistingValues(key);
for (OsmPrimitive osm : sel) {
- if (osm.keySet().contains(key)) {
- b = Boolean.FALSE;
- count[i]++;
- break;
+ oldValue = osm.get(key);
+ if (oldValue!=null) {
+ old.addValue(oldValue);
+ if (!oldValue.equals(value)) {
+ b = Boolean.FALSE;
+ count[i]++;
+ }
}
}
tm.setValueAt(b, i, 0);
tm.setValueAt(tags[i][0], i, 1);
tm.setValueAt(tags[i][1].isEmpty() ? new DeleteTagMarker(count[i]) : tags[i][1], i, 2);
+ tm.setValueAt(old , i, 3);
}
propertyTable = new JTable(tm) {
@@ -107,15 +180,38 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
}
return c;
}
+
+ @Override
+ public TableCellEditor getCellEditor(int row, int column) {
+ Object value = getValueAt(row,column);
+ if (value instanceof DeleteTagMarker) return null;
+ if (value instanceof ExistingValues) return null;
+ return getDefaultEditor(value.getClass());
+ }
+
+ @Override
+ public String getToolTipText(MouseEvent event) {
+ int r = rowAtPoint(event.getPoint());
+ int c = columnAtPoint(event.getPoint());
+ Object o = getValueAt(r, c);
+ if (c==1 || c==2) return o.toString();
+ if (c==3) return ((ExistingValues)o).getToolTip();
+ return tr("Enable the checkbox to accept the value");
+ }
+
};
-
+
+ propertyTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
// a checkbox has a size of 15 px
propertyTable.getColumnModel().getColumn(0).setMaxWidth(15);
+ TableHelper.adjustColumnWidth(propertyTable, 1, 150);
+ TableHelper.adjustColumnWidth(propertyTable, 2, 400);
+ TableHelper.adjustColumnWidth(propertyTable, 3, 300);
// get edit results if the table looses the focus, for example if a user clicks "add tags"
propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_MASK), "shiftenter");
propertyTable.getActionMap().put("shiftenter", new AbstractAction() {
- @Override public void actionPerformed(ActionEvent e) {
+ @Override public void actionPerformed(ActionEvent e) {
buttonAction(1, e); // add all tags on Shift-Enter
}
});
@@ -125,10 +221,20 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
tablePanel.setLayout(new GridBagLayout());
tablePanel.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
tablePanel.add(propertyTable, GBC.eol().fill(GBC.BOTH));
+ if (!sender.isEmpty() && !trustedSenders.contains(sender)) {
+ final JCheckBox c = new JCheckBox();
+ c.setAction(new AbstractAction(tr("Accept all tags from {0} for this session", sender) ) {
+ @Override public void actionPerformed(ActionEvent e) {
+ if (c.isSelected())
+ trustedSenders.add(sender);
+ else
+ trustedSenders.remove(sender);
+ }
+ } );
+ tablePanel.add(c , GBC.eol().insets(20,10,0,0));
+ }
setContent(tablePanel);
setDefaultButton(2);
- // set the default Dimensions and show the dialog
- setPreferredSize(new Dimension(400,tablePanel.getPreferredSize().height+100));
}
/**
@@ -138,9 +244,10 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
TableModel tm = propertyTable.getModel();
for (int i=0; i<tm.getRowCount(); i++) {
String key = (String)tm.getValueAt(i, 1);
+ String value = (String)tm.getValueAt(i, 1);
count[i] = 0;
for (OsmPrimitive osm : sel) {
- if (osm.keySet().contains(key)) {
+ if (osm.keySet().contains(key) && !osm.get(key).equals(value)) {
count[i]++;
break;
}
@@ -155,7 +262,8 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
*/
@Override
protected void buttonAction(int buttonIndex, ActionEvent evt) {
- if (buttonIndex != 2) {
+ // if layer all layers were closed, ignore all actions
+ if (Main.main.getCurrentDataSet() != null && buttonIndex != 2) {
TableModel tm = propertyTable.getModel();
for (int i=0; i<tm.getRowCount(); i++) {
if (buttonIndex==1 || (Boolean)tm.getValueAt(i, 0)) {
@@ -166,6 +274,9 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
}
}
}
+ if (buttonIndex == 2) {
+ trustedSenders.remove(sender);
+ }
setVisible(false);
}
@@ -175,4 +286,62 @@ public class AddTagsDialog extends ExtendedDialog implements SelectionChangedLis
findExistingTags();
}
+ /**
+ * parse addtags parameters Example URL (part):
+ * addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle
+ */
+ public static void addTags(final Map<String, String> args, final String sender) {
+ if (args.containsKey("addtags")) {
+ GuiHelper.executeByMainWorkerInEDT(new Runnable() {
+
+ @Override
+ public void run() {
+ String[] tags = null;
+ try {
+ tags = URLDecoder.decode(args.get("addtags"), "UTF-8").split("\\|");
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException();
+ }
+ Set<String> tagSet = new HashSet<String>();
+ for (String tag : tags) {
+ if (!tag.trim().isEmpty() && tag.contains("=")) {
+ tagSet.add(tag.trim());
+ }
+ }
+ if (!tagSet.isEmpty()) {
+ String[][] keyValue = new String[tagSet.size()][2];
+ int i = 0;
+ for (String tag : tagSet) {
+ // support a = b===c as "a"="b===c"
+ String [] pair = tag.split("\\s*=\\s*",2);
+ keyValue[i][0] = pair[0];
+ keyValue[i][1] = pair.length<2 ? "": pair[1];
+ i++;
+ }
+ addTags(keyValue, sender);
+ }
+ }
+
+
+ });
+ }
+ }
+
+ /**
+ * Ask user and add the tags he confirm
+ * @param keyValue is a table or {{tag1,val1},{tag2,val2},...}
+ * @param sender is a string for skipping confirmations. Use epmty string for always confirmed adding.
+ */
+ public static void addTags(String[][] keyValue, String sender) {
+ if (trustedSenders.contains(sender)) {
+ if (Main.main.getCurrentDataSet() != null) {
+ Collection<OsmPrimitive> s = Main.main.getCurrentDataSet().getSelected();
+ for (String[] row : keyValue) {
+ Main.main.undoRedo.add(new ChangePropertyCommand(s, row[0], row[1]));
+ }
+ }
+ } else {
+ new AddTagsDialog(keyValue, sender).showDialog();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
index 4c56192..a3df772 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java
@@ -13,7 +13,7 @@ import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
public class RemoteControl
{
/**
- * If the remote cotrol feature is enabled or disabled. If disabled,
+ * If the remote control feature is enabled or disabled. If disabled,
* it should not start the server.
*/
public static final BooleanProperty PROP_REMOTECONTROL_ENABLED = new BooleanProperty("remotecontrol.enabled", false);
@@ -34,14 +34,21 @@ public class RemoteControl
}
/**
+ * Stops the remote control server
+ * @since 5861
+ */
+ public static void stop() {
+ RemoteControlHttpServer.stopRemoteControlHttpServer();
+ }
+
+ /**
* Adds external request handler.
* Can be used by plugins that want to use remote control.
- *
+ *
* @param command The command name.
* @param handlerClass The additional request handler.
*/
- public void addRequestHandler(String command, Class<? extends RequestHandler> handlerClass)
- {
+ public void addRequestHandler(String command, Class<? extends RequestHandler> handlerClass) {
RequestProcessor.addRequestHandlerClass(command, handlerClass);
}
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
index 2997dd3..9a37cae 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
@@ -1,14 +1,16 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io.remotecontrol;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.marktr;
import java.io.IOException;
import java.net.BindException;
+import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
-import java.net.InetAddress;
+
+import org.openstreetmap.josm.Main;
/**
* Simple HTTP server that spawns a {@link RequestProcessor} for every
@@ -18,9 +20,6 @@ import java.net.InetAddress;
*/
public class RemoteControlHttpServer extends Thread {
- /** Default port for the HTTP server */
- public static final int DEFAULT_PORT = 8111;
-
/** The server socket */
private ServerSocket server;
@@ -30,22 +29,36 @@ public class RemoteControlHttpServer extends Thread {
* Starts or restarts the HTTP server
*/
public static void restartRemoteControlHttpServer() {
+ int port = Main.pref.getInteger("remote.control.port", 8111);
try {
- if (instance != null) {
- instance.stopServer();
- }
+ stopRemoteControlHttpServer();
- instance = new RemoteControlHttpServer(DEFAULT_PORT);
+ instance = new RemoteControlHttpServer(port);
instance.start();
} catch (BindException ex) {
- System.err.println(tr("Warning: Cannot start remotecontrol server on port {0}: {1}",
- Integer.toString(DEFAULT_PORT), ex.getLocalizedMessage()));
+ Main.warn(marktr("Cannot start remotecontrol server on port {0}: {1}"),
+ Integer.toString(port), ex.getLocalizedMessage());
} catch (IOException ioe) {
ioe.printStackTrace();
}
}
/**
+ * Stops the HTTP server
+ * @since 5861
+ */
+ public static void stopRemoteControlHttpServer() {
+ if (instance != null) {
+ try {
+ instance.stopServer();
+ instance = null;
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ }
+ }
+
+ /**
* Constructor
* @param port The port this server will listen on
* @throws IOException when connection errors
@@ -58,16 +71,19 @@ public class RemoteControlHttpServer extends Thread {
// Start the server socket with only 1 connection.
// Also make sure we only listen
// on the local interface so nobody from the outside can connect!
+ // NOTE: On a dual stack machine with old Windows OS this may not listen on both interfaces!
this.server = new ServerSocket(port, 1,
- InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }));
+ InetAddress.getByName(Main.pref.get("remote.control.host", "localhost")));
}
/**
* The main loop, spawns a {@link RequestProcessor} for each connection
*/
+ @Override
public void run()
{
- System.out.println("RemoteControl::Accepting connections on port " + server.getLocalPort());
+ Main.info(marktr("RemoteControl::Accepting connections on port {0}"),
+ Integer.toString(server.getLocalPort()));
while (true)
{
try
@@ -95,5 +111,6 @@ public class RemoteControlHttpServer extends Thread {
public void stopServer() throws IOException
{
server.close();
+ Main.info(marktr("RemoteControl::Server stopped."));
}
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
index de21eae..30c3acd 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
@@ -1,341 +1,476 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.Socket;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-
-import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.AddWayHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.ImageryHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.ImportHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.LoadAndZoomHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.LoadObjectHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.OpenFileHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
-import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
-import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerErrorException;
-import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerForbiddenException;
-import org.openstreetmap.josm.io.remotecontrol.handler.VersionHandler;
-import org.openstreetmap.josm.tools.Utils;
-
-/**
- * Processes HTTP "remote control" requests.
- */
-public class RequestProcessor extends Thread {
- /**
- * RemoteControl protocol version. Change minor number for compatible
- * interface extensions. Change major number in case of incompatible
- * changes.
- */
- public static final String PROTOCOLVERSION = "{\"protocolversion\": {\"major\": " +
- RemoteControl.protocolMajorVersion + ", \"minor\": " +
- RemoteControl.protocolMinorVersion +
- "}, \"application\": \"JOSM RemoteControl\"}";
-
- /** The socket this processor listens on */
- private Socket request;
-
- /**
- * Collection of request handlers.
- * Will be initialized with default handlers here. Other plug-ins
- * can extend this list by using @see addRequestHandler
- */
- private static Map<String, Class<? extends RequestHandler>> handlers = new TreeMap<String, Class<? extends RequestHandler>>();
-
- /**
- * Constructor
- *
- * @param request A socket to read the request.
- */
- public RequestProcessor(Socket request) {
- super("RemoteControl request processor");
- this.setDaemon(true);
- this.request = request;
- }
-
- /**
- * Spawns a new thread for the request
- */
- public static void processRequest(Socket request) {
- RequestProcessor processor = new RequestProcessor(request);
- processor.start();
- }
-
- /**
- * Add external request handler. Can be used by other plug-ins that
- * want to use remote control.
- *
- * @param command The command to handle.
- * @param handler The additional request handler.
- */
- static void addRequestHandlerClass(String command,
- Class<? extends RequestHandler> handler) {
- addRequestHandlerClass(command, handler, false);
- }
-
- /**
- * Add external request handler. Message can be suppressed.
- * (for internal use)
- *
- * @param command The command to handle.
- * @param handler The additional request handler.
- * @param silent Don't show message if true.
- */
- private static void addRequestHandlerClass(String command,
- Class<? extends RequestHandler> handler, boolean silent) {
- if(command.charAt(0) == '/')
- {
- command = command.substring(1);
- }
- String commandWithSlash = "/" + command;
- if (handlers.get(commandWithSlash) != null) {
- System.out.println("RemoteControl: ignoring duplicate command " + command
- + " with handler " + handler.getName());
- } else {
- if (!silent) {
- System.out.println("RemoteControl: adding command \"" +
- command + "\" (handled by " + handler.getSimpleName() + ")");
- }
- handlers.put(commandWithSlash, handler);
- }
- }
-
- /** Add default request handlers */
- static {
- addRequestHandlerClass(LoadAndZoomHandler.command, LoadAndZoomHandler.class, true);
- addRequestHandlerClass(LoadAndZoomHandler.command2, LoadAndZoomHandler.class, true);
- addRequestHandlerClass(ImageryHandler.command, ImageryHandler.class, true);
- addRequestHandlerClass(AddNodeHandler.command, AddNodeHandler.class, true);
- addRequestHandlerClass(AddWayHandler.command, AddWayHandler.class, true);
- addRequestHandlerClass(ImportHandler.command, ImportHandler.class, true);
- addRequestHandlerClass(VersionHandler.command, VersionHandler.class, true);
- addRequestHandlerClass(LoadObjectHandler.command, LoadObjectHandler.class, true);
- addRequestHandlerClass(OpenFileHandler.command, OpenFileHandler.class, true);
- }
-
- /**
- * The work is done here.
- */
- public void run() {
- Writer out = null;
- try {
- OutputStream raw = new BufferedOutputStream(
- request.getOutputStream());
- out = new OutputStreamWriter(raw);
- Reader in = new InputStreamReader(new BufferedInputStream(
- request.getInputStream()), "ASCII");
-
- StringBuffer requestLine = new StringBuffer();
- while (requestLine.length() < 1024 * 1024) {
- int c = in.read();
- if (c == -1 || c == '\r' || c == '\n')
- break;
- requestLine.append((char) c);
- }
-
- System.out.println("RemoteControl received: " + requestLine);
- String get = requestLine.toString();
- StringTokenizer st = new StringTokenizer(get);
- if (!st.hasMoreTokens()) {
- sendError(out);
- return;
- }
- String method = st.nextToken();
- if (!st.hasMoreTokens()) {
- sendError(out);
- return;
- }
- String url = st.nextToken();
-
- if (!method.equals("GET")) {
- sendNotImplemented(out);
- return;
- }
-
- String command = null;
- int questionPos = url.indexOf('?');
- if(questionPos < 0)
- {
- command = url;
- }
- else
- {
- command = url.substring(0, questionPos);
- }
-
- // find a handler for this command
- Class<? extends RequestHandler> handlerClass = handlers.get(command);
- if (handlerClass == null) {
- // no handler found
- StringBuilder usage = new StringBuilder(1024);
- for (Entry<String, Class<? extends RequestHandler>> handler : handlers.entrySet()) {
- String[] mandatory = handler.getValue().newInstance().getMandatoryParams();
- usage.append("<li>");
- usage.append(handler.getKey());
- if (mandatory != null) {
- usage.append("<br/>mandatory parameter: ").append(Utils.join(", ", Arrays.asList(mandatory)));
- }
- usage.append("</li>");
- }
- String help = "No command specified! The following commands are available:<ul>"
- + usage.toString()
- + "</ul>";
- sendBadRequest(out, help);
- } else {
- // create handler object
- RequestHandler handler = handlerClass.newInstance();
- try {
- handler.setCommand(command);
- handler.setUrl(url);
- handler.handle();
- sendHeader(out, "200 OK", handler.getContentType(), false);
- out.write("Content-length: " + handler.getContent().length()
- + "\r\n");
- out.write("\r\n");
- out.write(handler.getContent());
- out.flush();
- } catch (RequestHandlerErrorException ex) {
- sendError(out);
- } catch (RequestHandlerBadRequestException ex) {
- sendBadRequest(out, ex.getMessage());
- } catch (RequestHandlerForbiddenException ex) {
- sendForbidden(out, ex.getMessage());
- }
- }
-
- } catch (IOException ioe) {
- } catch (Exception e) {
- e.printStackTrace();
- try {
- sendError(out);
- } catch (IOException e1) {
- }
- } finally {
- try {
- request.close();
- } catch (IOException e) {
- }
- }
- }
-
- /**
- * Sends a 500 error: server error
- *
- * @param out
- * The writer where the error is written
- * @throws IOException
- * If the error can not be written
- */
- private void sendError(Writer out) throws IOException {
- sendHeader(out, "500 Internal Server Error", "text/html", true);
- out.write("<HTML>\r\n");
- out.write("<HEAD><TITLE>Internal Error</TITLE>\r\n");
- out.write("</HEAD>\r\n");
- out.write("<BODY>");
- out.write("<H1>HTTP Error 500: Internal Server Error</h2>\r\n");
- out.write("</BODY></HTML>\r\n");
- out.flush();
- }
-
- /**
- * Sends a 501 error: not implemented
- *
- * @param out
- * The writer where the error is written
- * @throws IOException
- * If the error can not be written
- */
- private void sendNotImplemented(Writer out) throws IOException {
- sendHeader(out, "501 Not Implemented", "text/html", true);
- out.write("<HTML>\r\n");
- out.write("<HEAD><TITLE>Not Implemented</TITLE>\r\n");
- out.write("</HEAD>\r\n");
- out.write("<BODY>");
- out.write("<H1>HTTP Error 501: Not Implemented</h2>\r\n");
- out.write("</BODY></HTML>\r\n");
- out.flush();
- }
-
- /**
- * Sends a 403 error: forbidden
- *
- * @param out
- * The writer where the error is written
- * @throws IOException
- * If the error can not be written
- */
- private void sendForbidden(Writer out, String help) throws IOException {
- sendHeader(out, "403 Forbidden", "text/html", true);
- out.write("<HTML>\r\n");
- out.write("<HEAD><TITLE>Forbidden</TITLE>\r\n");
- out.write("</HEAD>\r\n");
- out.write("<BODY>");
- out.write("<H1>HTTP Error 403: Forbidden</h2>\r\n");
- if (help != null) {
- out.write(help);
- }
- out.write("</BODY></HTML>\r\n");
- out.flush();
- }
-
- /**
- * Sends a 403 error: forbidden
- *
- * @param out
- * The writer where the error is written
- * @throws IOException
- * If the error can not be written
- */
- private void sendBadRequest(Writer out, String help) throws IOException {
- sendHeader(out, "400 Bad Request", "text/html", true);
- out.write("<HTML>\r\n");
- out.write("<HEAD><TITLE>Bad Request</TITLE>\r\n");
- out.write("</HEAD>\r\n");
- out.write("<BODY>");
- out.write("<H1>HTTP Error 400: Bad Request</h2>\r\n");
- if (help != null) {
- out.write(help);
- }
- out.write("</BODY></HTML>\r\n");
- out.flush();
- }
-
- /**
- * Send common HTTP headers to the client.
- *
- * @param out
- * The Writer
- * @param status
- * The status string ("200 OK", "500", etc)
- * @param contentType
- * The content type of the data sent
- * @param endHeaders
- * If true, adds a new line, ending the headers.
- * @throws IOException
- * When error
- */
- private void sendHeader(Writer out, String status, String contentType,
- boolean endHeaders) throws IOException {
- out.write("HTTP/1.1 " + status + "\r\n");
- Date now = new Date();
- out.write("Date: " + now + "\r\n");
- out.write("Server: JOSM RemoteControl\r\n");
- out.write("Content-type: " + contentType + "\r\n");
- out.write("Access-Control-Allow-Origin: *\r\n");
- if (endHeaders)
- out.write("\r\n");
- }
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.AddWayHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.FeaturesHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.ImageryHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.ImportHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.LoadAndZoomHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.LoadObjectHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.OpenFileHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerErrorException;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerForbiddenException;
+import org.openstreetmap.josm.io.remotecontrol.handler.VersionHandler;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Processes HTTP "remote control" requests.
+ */
+public class RequestProcessor extends Thread {
+ /**
+ * RemoteControl protocol version. Change minor number for compatible
+ * interface extensions. Change major number in case of incompatible
+ * changes.
+ */
+ public static final String PROTOCOLVERSION = "{\"protocolversion\": {\"major\": " +
+ RemoteControl.protocolMajorVersion + ", \"minor\": " +
+ RemoteControl.protocolMinorVersion +
+ "}, \"application\": \"JOSM RemoteControl\"}";
+
+ /** The socket this processor listens on */
+ private Socket request;
+
+ /**
+ * Collection of request handlers.
+ * Will be initialized with default handlers here. Other plug-ins
+ * can extend this list by using @see addRequestHandler
+ */
+ private static Map<String, Class<? extends RequestHandler>> handlers = new TreeMap<String, Class<? extends RequestHandler>>();
+
+ /**
+ * Constructor
+ *
+ * @param request A socket to read the request.
+ */
+ public RequestProcessor(Socket request) {
+ super("RemoteControl request processor");
+ this.setDaemon(true);
+ this.request = request;
+ }
+
+ /**
+ * Spawns a new thread for the request
+ * @param request The request to process
+ */
+ public static void processRequest(Socket request) {
+ RequestProcessor processor = new RequestProcessor(request);
+ processor.start();
+ }
+
+ /**
+ * Add external request handler. Can be used by other plug-ins that
+ * want to use remote control.
+ *
+ * @param command The command to handle.
+ * @param handler The additional request handler.
+ */
+ static void addRequestHandlerClass(String command,
+ Class<? extends RequestHandler> handler) {
+ addRequestHandlerClass(command, handler, false);
+ }
+
+ /**
+ * Add external request handler. Message can be suppressed.
+ * (for internal use)
+ *
+ * @param command The command to handle.
+ * @param handler The additional request handler.
+ * @param silent Don't show message if true.
+ */
+ private static void addRequestHandlerClass(String command,
+ Class<? extends RequestHandler> handler, boolean silent) {
+ if(command.charAt(0) == '/')
+ {
+ command = command.substring(1);
+ }
+ String commandWithSlash = "/" + command;
+ if (handlers.get(commandWithSlash) != null) {
+ Main.info("RemoteControl: ignoring duplicate command " + command
+ + " with handler " + handler.getName());
+ } else {
+ if (!silent) {
+ Main.info("RemoteControl: adding command \"" +
+ command + "\" (handled by " + handler.getSimpleName() + ")");
+ }
+ handlers.put(commandWithSlash, handler);
+ }
+ }
+
+ /** Add default request handlers */
+ static {
+ addRequestHandlerClass(LoadAndZoomHandler.command, LoadAndZoomHandler.class, true);
+ addRequestHandlerClass(LoadAndZoomHandler.command2, LoadAndZoomHandler.class, true);
+ addRequestHandlerClass(ImageryHandler.command, ImageryHandler.class, true);
+ addRequestHandlerClass(AddNodeHandler.command, AddNodeHandler.class, true);
+ addRequestHandlerClass(AddWayHandler.command, AddWayHandler.class, true);
+ addRequestHandlerClass(ImportHandler.command, ImportHandler.class, true);
+ addRequestHandlerClass(VersionHandler.command, VersionHandler.class, true);
+ addRequestHandlerClass(LoadObjectHandler.command, LoadObjectHandler.class, true);
+ addRequestHandlerClass(OpenFileHandler.command, OpenFileHandler.class, true);
+ addRequestHandlerClass(FeaturesHandler.command, FeaturesHandler.class, true);
+ }
+
+ /**
+ * The work is done here.
+ */
+ @Override
+ public void run() {
+ Writer out = null;
+ try {
+ OutputStream raw = new BufferedOutputStream(request.getOutputStream());
+ out = new OutputStreamWriter(raw);
+ BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "ASCII"));
+
+ String get = in.readLine();
+ if (get == null) {
+ sendError(out);
+ return;
+ }
+ Main.info("RemoteControl received: " + get);
+
+ StringTokenizer st = new StringTokenizer(get);
+ if (!st.hasMoreTokens()) {
+ sendError(out);
+ return;
+ }
+ String method = st.nextToken();
+ if (!st.hasMoreTokens()) {
+ sendError(out);
+ return;
+ }
+ String url = st.nextToken();
+
+ if (!method.equals("GET")) {
+ sendNotImplemented(out);
+ return;
+ }
+
+ int questionPos = url.indexOf('?');
+
+ String command = questionPos < 0 ? url : url.substring(0, questionPos);
+
+ Map <String,String> headers = new HashMap<String, String>();
+ int k=0, MAX_HEADERS=20;
+ while (k<MAX_HEADERS) {
+ get=in.readLine();
+ if (get==null) break;
+ k++;
+ String[] h = get.split(": ", 2);
+ if (h.length==2) {
+ headers.put(h[0], h[1]);
+ } else break;
+ }
+
+ // Who sent the request: trying our best to detect
+ // not from localhost => sender = IP
+ // from localhost: sender = referer header, if exists
+ String sender = null;
+
+ if (!request.getInetAddress().isLoopbackAddress()) {
+ sender = request.getInetAddress().getHostAddress();
+ } else {
+ String ref = headers.get("Referer");
+ Pattern r = Pattern.compile("(https?://)?([^/]*)");
+ if (ref!=null) {
+ Matcher m = r.matcher(ref);
+ if (m.find()) {
+ sender = m.group(2);
+ }
+ }
+ if (sender == null) {
+ sender = "localhost";
+ }
+ }
+
+ // find a handler for this command
+ Class<? extends RequestHandler> handlerClass = handlers.get(command);
+ if (handlerClass == null) {
+ String usage = getUsageAsHtml();
+ String websiteDoc = HelpUtil.getWikiBaseHelpUrl() +"/Help/Preferences/RemoteControl";
+ String help = "No command specified! The following commands are available:<ul>" + usage
+ + "</ul>" + "See <a href=\""+websiteDoc+"\">"+websiteDoc+"</a> for complete documentation.";
+ sendBadRequest(out, help);
+ } else {
+ // create handler object
+ RequestHandler handler = handlerClass.newInstance();
+ try {
+ handler.setCommand(command);
+ handler.setUrl(url);
+ handler.setSender(sender);
+ handler.handle();
+ sendHeader(out, "200 OK", handler.getContentType(), false);
+ out.write("Content-length: " + handler.getContent().length()
+ + "\r\n");
+ out.write("\r\n");
+ out.write(handler.getContent());
+ out.flush();
+ } catch (RequestHandlerErrorException ex) {
+ sendError(out);
+ } catch (RequestHandlerBadRequestException ex) {
+ sendBadRequest(out, ex.getMessage());
+ } catch (RequestHandlerForbiddenException ex) {
+ sendForbidden(out, ex.getMessage());
+ }
+ }
+
+ } catch (IOException ioe) {
+ } catch (Exception e) {
+ e.printStackTrace();
+ try {
+ sendError(out);
+ } catch (IOException e1) {
+ }
+ } finally {
+ try {
+ request.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+
+ /**
+ * Sends a 500 error: server error
+ *
+ * @param out
+ * The writer where the error is written
+ * @throws IOException
+ * If the error can not be written
+ */
+ private void sendError(Writer out) throws IOException {
+ sendHeader(out, "500 Internal Server Error", "text/html", true);
+ out.write("<HTML>\r\n");
+ out.write("<HEAD><TITLE>Internal Error</TITLE>\r\n");
+ out.write("</HEAD>\r\n");
+ out.write("<BODY>");
+ out.write("<H1>HTTP Error 500: Internal Server Error</h2>\r\n");
+ out.write("</BODY></HTML>\r\n");
+ out.flush();
+ }
+
+ /**
+ * Sends a 501 error: not implemented
+ *
+ * @param out
+ * The writer where the error is written
+ * @throws IOException
+ * If the error can not be written
+ */
+ private void sendNotImplemented(Writer out) throws IOException {
+ sendHeader(out, "501 Not Implemented", "text/html", true);
+ out.write("<HTML>\r\n");
+ out.write("<HEAD><TITLE>Not Implemented</TITLE>\r\n");
+ out.write("</HEAD>\r\n");
+ out.write("<BODY>");
+ out.write("<H1>HTTP Error 501: Not Implemented</h2>\r\n");
+ out.write("</BODY></HTML>\r\n");
+ out.flush();
+ }
+
+ /**
+ * Sends a 403 error: forbidden
+ *
+ * @param out
+ * The writer where the error is written
+ * @throws IOException
+ * If the error can not be written
+ */
+ private void sendForbidden(Writer out, String help) throws IOException {
+ sendHeader(out, "403 Forbidden", "text/html", true);
+ out.write("<HTML>\r\n");
+ out.write("<HEAD><TITLE>Forbidden</TITLE>\r\n");
+ out.write("</HEAD>\r\n");
+ out.write("<BODY>");
+ out.write("<H1>HTTP Error 403: Forbidden</h2>\r\n");
+ if (help != null) {
+ out.write(help);
+ }
+ out.write("</BODY></HTML>\r\n");
+ out.flush();
+ }
+
+ /**
+ * Sends a 403 error: forbidden
+ *
+ * @param out
+ * The writer where the error is written
+ * @throws IOException
+ * If the error can not be written
+ */
+ private void sendBadRequest(Writer out, String help) throws IOException {
+ sendHeader(out, "400 Bad Request", "text/html", true);
+ out.write("<HTML>\r\n");
+ out.write("<HEAD><TITLE>Bad Request</TITLE>\r\n");
+ out.write("</HEAD>\r\n");
+ out.write("<BODY>");
+ out.write("<H1>HTTP Error 400: Bad Request</h2>\r\n");
+ if (help != null) {
+ out.write(help);
+ }
+ out.write("</BODY></HTML>\r\n");
+ out.flush();
+ }
+
+ /**
+ * Send common HTTP headers to the client.
+ *
+ * @param out
+ * The Writer
+ * @param status
+ * The status string ("200 OK", "500", etc)
+ * @param contentType
+ * The content type of the data sent
+ * @param endHeaders
+ * If true, adds a new line, ending the headers.
+ * @throws IOException
+ * When error
+ */
+ private void sendHeader(Writer out, String status, String contentType,
+ boolean endHeaders) throws IOException {
+ out.write("HTTP/1.1 " + status + "\r\n");
+ Date now = new Date();
+ out.write("Date: " + now + "\r\n");
+ out.write("Server: JOSM RemoteControl\r\n");
+ out.write("Content-type: " + contentType + "\r\n");
+ out.write("Access-Control-Allow-Origin: *\r\n");
+ if (endHeaders)
+ out.write("\r\n");
+ }
+
+ public static String getHandlersInfoAsJSON() {
+ StringBuilder r = new StringBuilder();
+ boolean first = true;
+ r.append("[");
+
+ for (Entry<String, Class<? extends RequestHandler>> p : handlers.entrySet()) {
+ if (first) {
+ first = false;
+ } else {
+ r.append(", ");
+ }
+ r.append(getHandlerInfoAsJSON(p.getKey()));
+ }
+ r.append("]");
+
+ return r.toString();
+ }
+
+ public static String getHandlerInfoAsJSON(String cmd) {
+ StringWriter w = new StringWriter();
+ PrintWriter r = new PrintWriter(w);
+ RequestHandler handler = null;
+ try {
+ Class<?> c = handlers.get(cmd);
+ if (c==null) return null;
+ handler = handlers.get(cmd).newInstance();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ return null;
+ }
+
+ r.printf("{ \"request\" : \"%s\"", cmd);
+ r.append(", \"parameters\" : [");
+
+ String[] params = handler.getMandatoryParams();
+ if (params != null) {
+ for (int i = 0; i < params.length; i++) {
+ if (i == 0) {
+ r.append('\"');
+ } else {
+ r.append(", \"");
+ }
+ r.append(params[i]).append('\"');
+ }
+ }
+ r.append("], \"optional\" : [");
+ String[] optional = handler.getOptionalParams();
+ if (optional != null) {
+ for (int i = 0; i < optional.length; i++) {
+ if (i == 0) {
+ r.append('\"');
+ } else {
+ r.append(", \"");
+ }
+ r.append(optional[i]).append('\"');
+ }
+ }
+
+ r.append("], \"examples\" : [");
+ String[] examples = handler.getUsageExamples(cmd.substring(1));
+ if (examples != null) {
+ for (int i = 0; i < examples.length; i++) {
+ if (i == 0) {
+ r.append('\"');
+ } else {
+ r.append(", \"");
+ }
+ r.append(examples[i]).append('\"');
+ }
+ }
+ r.append("]}");
+ try {
+ return w.toString();
+ } finally {
+ try {
+ w.close();
+ } catch (IOException ex) {
+ }
+ }
+ }
+
+ /**
+ * Reports HTML message with the description of all available commands
+ * @return HTML message with the description of all available commands
+ * @throws IllegalAccessException
+ * @throws InstantiationException
+ */
+ public static String getUsageAsHtml() throws IllegalAccessException, InstantiationException {
+ StringBuilder usage = new StringBuilder(1024);
+ for (Entry<String, Class<? extends RequestHandler>> handler : handlers.entrySet()) {
+ RequestHandler sample = handler.getValue().newInstance();
+ String[] mandatory = sample.getMandatoryParams();
+ String[] optional = sample.getOptionalParams();
+ String[] examples = sample.getUsageExamples(handler.getKey().substring(1));
+ usage.append("<li>");
+ usage.append(handler.getKey());
+ if (mandatory != null) {
+ usage.append("<br/>mandatory parameters: ").append(Utils.join(", ", Arrays.asList(mandatory)));
+ }
+ if (optional != null) {
+ usage.append("<br/>optional parameters: ").append(Utils.join(", ", Arrays.asList(optional)));
+ }
+ if (examples != null) {
+ usage.append("<br/>examples: ");
+ for (String ex: examples) {
+ usage.append("<br/> <a href=\"http://localhost:8111"+ex+"\">"+ex+"</a>");
+ }
+ }
+ usage.append("</li>");
+ }
+ return usage.toString();
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
index c492ee2..b8697d5 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
@@ -1,87 +1,122 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol.handler;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.util.HashMap;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AutoScaleAction;
-import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
-
-/**
- * Handler for add_node request.
- */
-public class AddNodeHandler extends RequestHandler {
-
- /**
- * The remote control command name used to add a node.
- */
- public static final String command = "add_node";
-
- private double lat;
- private double lon;
-
- @Override
- protected void handleRequest() {
- addNode(args);
- }
-
- @Override
- public String[] getMandatoryParams()
- {
- return new String[] { "lat", "lon" };
- }
-
- @Override
- public String getPermissionMessage() {
- return tr("Remote Control has been asked to create a new node.") +
- "<br>" + tr("Coordinates: ") + args.get("lat") + ", " + args.get("lon");
- }
-
- @Override
- public PermissionPrefWithDefault getPermissionPref() {
- return PermissionPrefWithDefault.CREATE_OBJECTS;
- }
-
- /**
- * Adds a node, implements the GET /add_node?lon=...&lat=... request.
- * @param args
- */
- private void addNode(HashMap<String, String> args){
-
- // Parse the arguments
- System.out.println("Adding node at (" + lat + ", " + lon + ")");
-
- // Create a new node
- LatLon ll = new LatLon(lat, lon);
- Node nnew = new Node(ll);
-
- // Now execute the commands to add this node.
- Main.main.undoRedo.add(new AddCommand(nnew));
- Main.main.getCurrentDataSet().setSelected(nnew);
- if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
- AutoScaleAction.autoScale("selection");
- } else {
- Main.map.mapView.repaint();
- }
- // parse parameter addtags=tag1=value1|tag2=vlaue2
- LoadAndZoomHandler.addTags(args);
- }
-
- @Override
- protected void validateRequest() throws RequestHandlerBadRequestException {
- try {
- lat = Double.parseDouble(args.get("lat"));
- lon = Double.parseDouble(args.get("lon"));
- } catch (NumberFormatException e) {
- throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
- }
- if (!Main.main.hasEditLayer()) {
- throw new RequestHandlerBadRequestException(tr("There is no layer opened to add node"));
- }
- }
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Point;
+import java.util.Map;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+
+/**
+ * Handler for add_node request.
+ */
+public class AddNodeHandler extends RequestHandler {
+
+ /**
+ * The remote control command name used to add a node.
+ */
+ public static final String command = "add_node";
+
+ private double lat;
+ private double lon;
+
+ @Override
+ protected void handleRequest() {
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ addNode(args);
+ }
+ });
+ }
+
+ @Override
+ public String[] getMandatoryParams()
+ {
+ return new String[] { "lat", "lon" };
+ }
+
+ @Override
+ public String[] getOptionalParams()
+ {
+ return new String[] { "addtags" };
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return new String[] {
+ "/add_node?lat=11&lon=22",
+ "/add_node?lon=13.3&lat=53.2&addtags=natural=tree|name=%20%20%20==Great%20Oak=="
+ };
+ }
+
+ @Override
+ public String getPermissionMessage() {
+ return tr("Remote Control has been asked to create a new node.") +
+ "<br>" + tr("Coordinates: ") + args.get("lat") + ", " + args.get("lon");
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ return PermissionPrefWithDefault.CREATE_OBJECTS;
+ }
+
+ /**
+ * Adds a node, implements the GET /add_node?lon=...&lat=... request.
+ * @param args
+ */
+ private void addNode(Map<String, String> args){
+
+ // Parse the arguments
+ Main.info("Adding node at (" + lat + ", " + lon + ")");
+
+ // Create a new node
+ LatLon ll = new LatLon(lat, lon);
+
+ Node nd = null;
+
+ if (Main.isDisplayingMapView()) {
+ Point p = Main.map.mapView.getPoint(ll);
+ nd = Main.map.mapView.getNearestNode(p, OsmPrimitive.isUsablePredicate);
+ if (nd!=null && nd.getCoor().greatCircleDistance(ll) > Main.pref.getDouble("remotecontrol.tolerance", 0.1)) {
+ nd = null; // node is too far
+ }
+ }
+
+ if (nd==null) {
+ nd = new Node(ll);
+ // Now execute the commands to add this node.
+ Main.main.undoRedo.add(new AddCommand(nd));
+ }
+
+ Main.main.getCurrentDataSet().setSelected(nd);
+ if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
+ AutoScaleAction.autoScale("selection");
+ } else {
+ Main.map.mapView.repaint();
+ }
+ // parse parameter addtags=tag1=value1|tag2=vlaue2
+ AddTagsDialog.addTags(args, sender);
+ }
+
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ try {
+ lat = Double.parseDouble(args.get("lat"));
+ lon = Double.parseDouble(args.get("lon"));
+ } catch (NumberFormatException e) {
+ throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
+ }
+ if (!Main.main.hasEditLayer()) {
+ throw new RequestHandlerBadRequestException(tr("There is no layer opened to add node"));
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
index 6897595..b8c1b62 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
@@ -1,11 +1,15 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io.remotecontrol.handler;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.Point;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.AutoScaleAction;
@@ -14,9 +18,11 @@ import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
/**
* Adds a way to the current dataset. For instance, {@code /add_way?way=lat1,lon2;lat2,lon2}.
@@ -27,34 +33,41 @@ public class AddWayHandler extends RequestHandler {
* The remote control command name used to add a way.
*/
public static final String command = "add_way";
-
+
private final List<LatLon> allCoordinates = new ArrayList<LatLon>();
+ /**
+ * The place to remeber already added nodes (they are reused if needed @since 5845
+ */
+ Map<LatLon, Node> addedNodes;
+
@Override
public String[] getMandatoryParams() {
return new String[]{"way"};
}
+
+ @Override
+ public String[] getOptionalParams() {
+ return new String[] { "addtags" };
+ }
@Override
+ public String[] getUsageExamples() {
+ return new String[] {
+ "/add_way?way=53.2,13.3;53.3,13.3;53.3,13.2",
+ "/add_way?&addtags=building=yes&way=45.437213,-2.810792;45.437988,-2.455983;45.224080,-2.455036;45.223302,-2.809845;45.437213,-2.810792"
+ };
+ }
+
+ @Override
protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
- Way way = new Way();
- List<Command> commands = new LinkedList<Command>();
- for (LatLon ll : allCoordinates) {
- Node node = new Node(ll);
- way.addNode(node);
- commands.add(new AddCommand(node));
- }
- allCoordinates.clear();
- commands.add(new AddCommand(way));
- Main.main.undoRedo.add(new SequenceCommand(tr("Add way"), commands));
- Main.main.getCurrentDataSet().setSelected(way);
- if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
- AutoScaleAction.autoScale("selection");
- } else {
- Main.map.mapView.repaint();
- }
- // parse parameter addtags=tag1=value1|tag2=vlaue2
- LoadAndZoomHandler.addTags(args);
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ addWay();
+ }
+ });
+ // parse parameter addtags=tag1=value1|tag2=value2
+ AddTagsDialog.addTags(args, sender);
}
@Override
@@ -93,4 +106,60 @@ public class AddWayHandler extends RequestHandler {
throw new RequestHandlerBadRequestException(tr("There is no layer opened to add way"));
}
}
+
+ /**
+ * Find the node with almost the same ccords in dataset or in already added nodes
+ * @since 5845
+ **/
+ Node findOrCreateNode(LatLon ll, List<Command> commands) {
+ Node nd = null;
+
+ if (Main.isDisplayingMapView()) {
+ Point p = Main.map.mapView.getPoint(ll);
+ nd = Main.map.mapView.getNearestNode(p, OsmPrimitive.isUsablePredicate);
+ if (nd!=null && nd.getCoor().greatCircleDistance(ll) > Main.pref.getDouble("remote.tolerance", 0.1)) {
+ nd = null; // node is too far
+ }
+ }
+
+ Node prev = null;
+ for (LatLon lOld: addedNodes.keySet()) {
+ if (lOld.greatCircleDistance(ll) < Main.pref.getDouble("remotecontrol.tolerance", 0.1)) {
+ prev = addedNodes.get(lOld);
+ break;
+ }
+ }
+
+ if (prev!=null) {
+ nd = prev;
+ } else if (nd==null) {
+ nd = new Node(ll);
+ // Now execute the commands to add this node.
+ commands.add(new AddCommand(nd));
+ addedNodes.put(ll, nd);
+ }
+ return nd;
+ }
+
+ /*
+ * This function creates the way with given coordinates of nodes
+ */
+ private void addWay() {
+ addedNodes = new HashMap<LatLon, Node>();
+ Way way = new Way();
+ List<Command> commands = new LinkedList<Command>();
+ for (LatLon ll : allCoordinates) {
+ Node node = findOrCreateNode(ll, commands);
+ way.addNode(node);
+ }
+ allCoordinates.clear();
+ commands.add(new AddCommand(way));
+ Main.main.undoRedo.add(new SequenceCommand(tr("Add way"), commands));
+ Main.main.getCurrentDataSet().setSelected(way);
+ if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
+ AutoScaleAction.autoScale("selection");
+ } else {
+ Main.map.mapView.repaint();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
new file mode 100644
index 0000000..fbedc54
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
@@ -0,0 +1,83 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import org.openstreetmap.josm.Main;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.io.remotecontrol.RequestProcessor;
+
+/**
+ * Reports avalable commands, their parameters and examples
+ * @since 6091
+ */
+public class FeaturesHandler extends RequestHandler {
+
+ /**
+ * The remote control command name used to reply version.
+ */
+ public static final String command = "features";
+
+ @Override
+ protected void handleRequest() throws RequestHandlerErrorException,
+ RequestHandlerBadRequestException {
+ StringBuilder buf = new StringBuilder();
+ String q=args.get("q");
+ if (q!=null) {
+ buf.append("[");
+ boolean first = true;
+ for (String s: q.split("[,\\s]+")) {
+ if (first) {
+ first = false;
+ } else {
+ buf.append(", ");
+ }
+ String info = RequestProcessor.getHandlerInfoAsJSON("/"+s);
+ if (info!=null) {
+ buf.append(info);
+ } else {
+ Main.warn("Unknown handler {0} passed to /features request", s);
+ }
+ }
+ buf.append("]");
+ } else {
+ buf.append(RequestProcessor.getHandlersInfoAsJSON());
+ }
+
+ content = buf.toString();
+ contentType = "application/json";
+ if (args.containsKey("jsonp")) {
+ content = args.get("jsonp") + " && " + args.get("jsonp") + "(" + content + ")";
+ }
+ }
+
+ @Override
+ public String getPermissionMessage() {
+ return tr("Remote Control has been asked to report its supported features. This enables web sites to guess a running JOSM version");
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ return PermissionPrefWithDefault.READ_PROTOCOL_VERSION;
+ }
+
+ @Override
+ public String[] getMandatoryParams() {
+ return null;
+ }
+
+ @Override
+ public String[] getOptionalParams() {
+ return new String[]{"jsonp", "q"};
+ }
+
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ // Nothing to do
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return new String[] {"/features", "/features?q=import,add_node"};
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
index ec71639..4d15935 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
@@ -1,106 +1,127 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol.handler;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.util.HashMap;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
-import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-
-/**
- * Adds an imagery (WMS/TMS) layer. For instance, {@code /imagery?title=...&type=...&url=...}.
- * @since 3715
- */
-public class ImageryHandler extends RequestHandler {
-
- /**
- * The remote control command name used to add an imagery layer.
- */
- public static final String command = "imagery";
-
- @Override
- public String getPermissionMessage() {
- return tr("Remote Control has been asked to load an imagery layer from the following URL:")
- + "<br>" + args.get("url");
- }
-
- @Override
- public String[] getMandatoryParams() {
- return new String[]{"url"};
- }
-
- @Override
- public PermissionPrefWithDefault getPermissionPref() {
- return PermissionPrefWithDefault.LOAD_IMAGERY;
- }
-
- @Override
- protected void handleRequest() throws RequestHandlerErrorException {
- if (Main.map == null) //Avoid exception when creating ImageryLayer with null MapFrame
- {
- throw new RequestHandlerErrorException();
- }
- String url = args.get("url");
- String title = args.get("title");
- String type = args.get("type");
- if ((title == null) || (title.isEmpty())) {
- title = tr("Remote imagery");
- }
- String cookies = args.get("cookies");
- ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies);
- String min_zoom = args.get("min_zoom");
- if (min_zoom != null && !min_zoom.isEmpty()) {
- try {
- imgInfo.setDefaultMinZoom(Integer.parseInt(min_zoom));
- } catch (NumberFormatException e) {
- System.err.println("NumberFormatException ("+e.getMessage()+")");
- }
- }
- String max_zoom = args.get("max_zoom");
- if (max_zoom != null && !max_zoom.isEmpty()) {
- try {
- imgInfo.setDefaultMaxZoom(Integer.parseInt(max_zoom));
- } catch (NumberFormatException e) {
- System.err.println("NumberFormatException ("+e.getMessage()+")");
- }
- }
- Main.main.addLayer(ImageryLayer.create(imgInfo));
- }
-
- @Override
- protected void parseArgs() {
- HashMap<String, String> args = new HashMap<String, String>();
- if (request.indexOf('?') != -1) {
- String query = request.substring(request.indexOf('?') + 1);
- if (query.indexOf("url=") == 0) {
- args.put("url", decodeParam(query.substring(4)));
- } else {
- int urlIdx = query.indexOf("&url=");
- if (urlIdx != -1) {
- args.put("url", decodeParam(query.substring(urlIdx + 5)));
- query = query.substring(0, urlIdx);
- } else {
- if (query.indexOf('#') != -1) {
- query = query.substring(0, query.indexOf('#'));
- }
- }
- String[] params = query.split("&", -1);
- for (String param : params) {
- int eq = param.indexOf('=');
- if (eq != -1) {
- args.put(param.substring(0, eq), decodeParam(param.substring(eq + 1)));
- }
- }
- }
- }
- this.args = args;
- }
-
- @Override
- protected void validateRequest() throws RequestHandlerBadRequestException {
- // Nothing to do
- }
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Arrays;
+import java.util.HashMap;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Adds an imagery (WMS/TMS) layer. For instance, {@code /imagery?title=...&type=...&url=...}.
+ * @since 3715
+ */
+public class ImageryHandler extends RequestHandler {
+
+ /**
+ * The remote control command name used to add an imagery layer.
+ */
+ public static final String command = "imagery";
+
+ @Override
+ public String getPermissionMessage() {
+ return tr("Remote Control has been asked to load an imagery layer from the following URL:")
+ + "<br>" + args.get("url");
+ }
+
+ @Override
+ public String[] getMandatoryParams() {
+ return new String[]{"url"};
+ }
+
+ @Override
+ public String[] getOptionalParams() {
+ return new String[] { "title", "type", "cookies", "min_zoom", "max_zoom"};
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ return PermissionPrefWithDefault.LOAD_IMAGERY;
+ }
+
+ @Override
+ protected void handleRequest() throws RequestHandlerErrorException {
+ String url = args.get("url");
+ String title = args.get("title");
+ String type = args.get("type");
+ if ((title == null) || (title.isEmpty())) {
+ title = tr("Remote imagery");
+ }
+ String cookies = args.get("cookies");
+ final ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies);
+ String min_zoom = args.get("min_zoom");
+ if (min_zoom != null && !min_zoom.isEmpty()) {
+ try {
+ imgInfo.setDefaultMinZoom(Integer.parseInt(min_zoom));
+ } catch (NumberFormatException e) {
+ Main.error(e);
+ }
+ }
+ String max_zoom = args.get("max_zoom");
+ if (max_zoom != null && !max_zoom.isEmpty()) {
+ try {
+ imgInfo.setDefaultMaxZoom(Integer.parseInt(max_zoom));
+ } catch (NumberFormatException e) {
+ Main.error(e);
+ }
+ }
+ GuiHelper.runInEDT(new Runnable() {
+ @Override public void run() {
+ Main.main.addLayer(ImageryLayer.create(imgInfo));
+ }
+ });
+ }
+
+ @Override
+ protected void parseArgs() {
+ HashMap<String, String> args = new HashMap<String, String>();
+ if (request.indexOf('?') != -1) {
+ String query = request.substring(request.indexOf('?') + 1);
+ if (query.indexOf("url=") == 0) {
+ args.put("url", decodeParam(query.substring(4)));
+ } else {
+ int urlIdx = query.indexOf("&url=");
+ if (urlIdx != -1) {
+ args.put("url", decodeParam(query.substring(urlIdx + 5)));
+ query = query.substring(0, urlIdx);
+ } else {
+ if (query.indexOf('#') != -1) {
+ query = query.substring(0, query.indexOf('#'));
+ }
+ }
+ String[] params = query.split("&", -1);
+ for (String param : params) {
+ int eq = param.indexOf('=');
+ if (eq != -1) {
+ args.put(param.substring(0, eq), decodeParam(param.substring(eq + 1)));
+ }
+ }
+ }
+ }
+ this.args = args;
+ }
+
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ // Nothing to do
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ final String types = Utils.join("|", Utils.transform(Arrays.asList(ImageryInfo.ImageryType.values()), new Utils.Function<ImageryInfo.ImageryType, String>() {
+ @Override
+ public String apply(ImageryInfo.ImageryType x) {
+ return x.getUrlString();
+ }
+ }));
+ return new String[] { "/imagery?title=osm&type=tms&url=http://tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
+ "/imagery?title=landsat&type=wms&url=http://irs.gis-lab.info/?layers=landsat&SRS=%7Bproj%7D&WIDTH=%7Bwidth%7D&HEIGHT=%7Bheight%7D&BBOX=%7Bbbox%7D",
+ "/imagery?title=...&type={"+types+"}&url=....[&cookies=...][&min_zoom=...][&max_zoom=...]"};
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
index 5874161..fe853d7 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
@@ -1,117 +1,125 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol.handler;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
-import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-
-/**
- * Handler for import request
- */
-public class ImportHandler extends RequestHandler {
-
- /**
- * The remote control command name used to import data.
- */
- public static final String command = "import";
-
- private URL url;
- private Collection<DownloadTask> suitableDownloadTasks;
-
- @Override
- protected void handleRequest() throws RequestHandlerErrorException {
- try {
- if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
- // TODO: add new_layer parameter
- // TODO: handle multiple suitable download tasks ?
- suitableDownloadTasks.iterator().next().loadUrl(false, url.toExternalForm(), null);
- }
- } catch (Exception ex) {
- System.out.println("RemoteControl: Error parsing import remote control request:");
- ex.printStackTrace();
- throw new RequestHandlerErrorException();
- }
- }
-
- @Override
- public String[] getMandatoryParams() {
- return new String[]{"url"};
- }
-
- @Override
- public String getPermissionMessage() {
- // URL can be any suitable URL giving back OSM data, including OSM API calls, even if calls to the main API
- // should rather be passed to LoadAndZoomHandler or LoadObjectHandler.
- // Other API instances will however use the import handler to force JOSM to make requests to this API instance.
- // (Example with OSM-FR website that makes calls to the OSM-FR API)
- // For user-friendliness, let's try to decode these OSM API calls to give a better confirmation message.
- String taskMessage = null;
- if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
- // TODO: handle multiple suitable download tasks ?
- taskMessage = suitableDownloadTasks.iterator().next().getConfirmationMessage(url);
- }
- return tr("Remote Control has been asked to import data from the following URL:")
- + "<br>" + (taskMessage == null ? url.toString() : taskMessage);
- }
-
- @Override
- public PermissionPrefWithDefault getPermissionPref() {
- return PermissionPrefWithDefault.IMPORT_DATA;
- }
-
- @Override
- protected void parseArgs() {
- HashMap<String, String> args = new HashMap<String, String>();
- if (request.indexOf('?') != -1) {
- String query = request.substring(request.indexOf('?') + 1);
- if (query.indexOf("url=") == 0) {
- args.put("url", decodeParam(query.substring(4)));
- } else {
- int urlIdx = query.indexOf("&url=");
- if (urlIdx != -1) {
- /*String url =*/ query.substring(urlIdx + 1);
- args.put("url", decodeParam(query.substring(urlIdx + 5)));
- query = query.substring(0, urlIdx);
- } else {
- if (query.indexOf('#') != -1) {
- query = query.substring(0, query.indexOf('#'));
- }
- }
- String[] params = query.split("&", -1);
- for (String param : params) {
- int eq = param.indexOf('=');
- if (eq != -1) {
- args.put(param.substring(0, eq), param.substring(eq + 1));
- }
- }
- }
- }
- this.args = args;
- }
-
- @Override
- protected void validateRequest() throws RequestHandlerBadRequestException {
- final String urlString = args.get("url");
- try {
- // Ensure the URL is valid
- url = new URL(urlString);
- } catch (MalformedURLException e) {
- throw new RequestHandlerBadRequestException("MalformedURLException: "+e.getMessage());
- }
- // Find download tasks for the given URL
- suitableDownloadTasks = Main.main.menu.openLocation.findDownloadTasks(urlString);
- if (suitableDownloadTasks.isEmpty()) {
- // It should maybe be better to reject the request in that case ?
- // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask
- suitableDownloadTasks.add(new DownloadOsmTask());
- }
- }
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+
+/**
+ * Handler for import request
+ */
+public class ImportHandler extends RequestHandler {
+
+ /**
+ * The remote control command name used to import data.
+ */
+ public static final String command = "import";
+
+ private URL url;
+ private Collection<DownloadTask> suitableDownloadTasks;
+
+ @Override
+ protected void handleRequest() throws RequestHandlerErrorException {
+ try {
+ if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
+ // TODO: handle multiple suitable download tasks ?
+ suitableDownloadTasks.iterator().next().loadUrl(isLoadInNewLayer(), url.toExternalForm(), null);
+ }
+ } catch (Exception ex) {
+ Main.warn("RemoteControl: Error parsing import remote control request:");
+ ex.printStackTrace();
+ throw new RequestHandlerErrorException();
+ }
+ }
+
+ @Override
+ public String[] getMandatoryParams() {
+ return new String[]{"url"};
+ }
+
+ @Override
+ public String[] getOptionalParams() {
+ return new String[] {"new_layer"};
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return new String[] { "/import?url="+Main.JOSM_WEBSITE+"/browser/josm/trunk/data_nodist/direction-arrows.osm" };
+ }
+
+ @Override
+ public String getPermissionMessage() {
+ // URL can be any suitable URL giving back OSM data, including OSM API calls, even if calls to the main API
+ // should rather be passed to LoadAndZoomHandler or LoadObjectHandler.
+ // Other API instances will however use the import handler to force JOSM to make requests to this API instance.
+ // (Example with OSM-FR website that makes calls to the OSM-FR API)
+ // For user-friendliness, let's try to decode these OSM API calls to give a better confirmation message.
+ String taskMessage = null;
+ if (suitableDownloadTasks != null && !suitableDownloadTasks.isEmpty()) {
+ // TODO: handle multiple suitable download tasks ?
+ taskMessage = suitableDownloadTasks.iterator().next().getConfirmationMessage(url);
+ }
+ return tr("Remote Control has been asked to import data from the following URL:")
+ + "<br>" + (taskMessage == null ? url.toString() : taskMessage);
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ return PermissionPrefWithDefault.IMPORT_DATA;
+ }
+
+ @Override
+ protected void parseArgs() {
+ HashMap<String, String> args = new HashMap<String, String>();
+ if (request.indexOf('?') != -1) {
+ String query = request.substring(request.indexOf('?') + 1);
+ if (query.indexOf("url=") == 0) {
+ args.put("url", decodeParam(query.substring(4)));
+ } else {
+ int urlIdx = query.indexOf("&url=");
+ if (urlIdx != -1) {
+ args.put("url", decodeParam(query.substring(urlIdx + 5)));
+ query = query.substring(0, urlIdx);
+ } else {
+ if (query.indexOf('#') != -1) {
+ query = query.substring(0, query.indexOf('#'));
+ }
+ }
+ String[] params = query.split("&", -1);
+ for (String param : params) {
+ int eq = param.indexOf('=');
+ if (eq != -1) {
+ args.put(param.substring(0, eq), param.substring(eq + 1));
+ }
+ }
+ }
+ }
+ this.args = args;
+ }
+
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ final String urlString = args.get("url");
+ try {
+ // Ensure the URL is valid
+ url = new URL(urlString);
+ } catch (MalformedURLException e) {
+ throw new RequestHandlerBadRequestException("MalformedURLException: "+e.getMessage());
+ }
+ // Find download tasks for the given URL
+ suitableDownloadTasks = Main.main.menu.openLocation.findDownloadTasks(urlString);
+ if (suitableDownloadTasks.isEmpty()) {
+ // It should maybe be better to reject the request in that case ?
+ // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask
+ suitableDownloadTasks.add(new DownloadOsmTask());
+ }
+ }
}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
index ac3eb95..628f504 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
@@ -1,292 +1,279 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol.handler;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Future;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AutoScaleAction;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
-import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
-import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-import org.openstreetmap.josm.tools.Utils;
-
-/**
- * Handler for load_and_zoom request.
- */
-public class LoadAndZoomHandler extends RequestHandler
-{
- /**
- * The remote control command name used to load data and zoom.
- */
- public static final String command = "load_and_zoom";
-
- /**
- * The remote control command name used to zoom.
- */
- public static final String command2 = "zoom";
-
- // Mandatory arguments
- private double minlat;
- private double maxlat;
- private double minlon;
- private double maxlon;
-
- // Optional argument 'select'
- private final Set<Long> ways = new HashSet<Long>();
- private final Set<Long> nodes = new HashSet<Long>();
- private final Set<Long> relations = new HashSet<Long>();
-
- @Override
- public String getPermissionMessage()
- {
- String msg = tr("Remote Control has been asked to load data from the API.") +
- "<br>" + tr("Bounding box: ") + new BBox(minlon, minlat, maxlon, maxlat).toStringCSV(", ");
- if (args.containsKey("select") && ways.size()+nodes.size()+relations.size() > 0) {
- msg += "<br>" + tr("Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}", relations.size(), ways.size(), nodes.size());
- }
- return msg;
- }
-
- @Override
- public String[] getMandatoryParams()
- {
- return new String[] { "bottom", "top", "left", "right" };
- }
-
- @Override
- protected void handleRequest() throws RequestHandlerErrorException
- {
- DownloadTask osmTask = new DownloadOsmTask();
- try {
- boolean newLayer = isLoadInNewLayer();
-
- if(command.equals(myCommand))
- {
- if (!PermissionPrefWithDefault.LOAD_DATA.isAllowed())
- {
- System.out.println("RemoteControl: download forbidden by preferences");
- }
- else
- {
- Area toDownload = null;
- if (!newLayer) {
- // find out whether some data has already been downloaded
- Area present = null;
- DataSet ds = Main.main.getCurrentDataSet();
- if (ds != null) {
- present = ds.getDataSourceArea();
- }
- if (present != null && !present.isEmpty()) {
- toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
- toDownload.subtract(present);
- if (!toDownload.isEmpty())
- {
- // the result might not be a rectangle (L shaped etc)
- Rectangle2D downloadBounds = toDownload.getBounds2D();
- minlat = downloadBounds.getMinY();
- minlon = downloadBounds.getMinX();
- maxlat = downloadBounds.getMaxY();
- maxlon = downloadBounds.getMaxX();
- }
- }
- }
- if (toDownload != null && toDownload.isEmpty())
- {
- System.out.println("RemoteControl: no download necessary");
- }
- else
- {
- Future<?> future = osmTask.download(newLayer, new Bounds(minlat,minlon,maxlat,maxlon), null /* let the task manage the progress monitor */);
- Main.worker.submit(new PostDownloadHandler(osmTask, future));
- }
- }
- }
- } catch (Exception ex) {
- System.out.println("RemoteControl: Error parsing load_and_zoom remote control request:");
- ex.printStackTrace();
- throw new RequestHandlerErrorException();
- }
-
- /**
- * deselect objects if parameter addtags given
- */
- if (args.containsKey("addtags")) {
- Main.worker.execute(new Runnable() {
- public void run() {
- DataSet ds = Main.main.getCurrentDataSet();
- if(ds == null) // e.g. download failed
- return;
- ds.clearSelection();
- }
- });
- }
-
- final Bounds bbox = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
- if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
- // select objects after downloading, zoom to selection.
- Main.worker.execute(new Runnable() {
- public void run() {
- HashSet<OsmPrimitive> newSel = new HashSet<OsmPrimitive>();
- DataSet ds = Main.main.getCurrentDataSet();
- if(ds == null) // e.g. download failed
- return;
- for (Way w : ds.getWays()) {
- if (ways.contains(w.getId())) {
- newSel.add(w);
- }
- }
- ways.clear();
- for (Node n : ds.getNodes()) {
- if (nodes.contains(n.getId())) {
- newSel.add(n);
- }
- }
- nodes.clear();
- for (Relation r : ds.getRelations()) {
- if (relations.contains(r.getId())) {
- newSel.add(r);
- }
- }
- relations.clear();
- ds.setSelected(newSel);
- if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
- // zoom_mode=(download|selection), defaults to selection
- if (!"download".equals(args.get("zoom_mode")) && !newSel.isEmpty()) {
- AutoScaleAction.autoScale("selection");
- } else {
- zoom(bbox);
- }
- }
- if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) {
- Main.map.relationListDialog.selectRelations(null); // unselect all relations to fix #7342
- Main.map.relationListDialog.dataChanged(null);
- Main.map.relationListDialog.selectRelations(Utils.filteredCollection(newSel, Relation.class));
- }
- }
- });
- } else if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
- // after downloading, zoom to downloaded area.
- zoom(bbox);
- }
-
- addTags(args);
- }
-
- /*
- * parse addtags parameters Example URL (part):
- * addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle
- */
- static void addTags(final Map<String, String> args) {
- if (args.containsKey("addtags")) {
- Main.worker.execute(new Runnable() {
-
- public void run() {
- String[] tags = null;
- try {
- tags = URLDecoder.decode(args.get("addtags"), "UTF-8").split("\\|");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException();
- }
- Set<String> tagSet = new HashSet<String>();
- for (String tag : tags) {
- if (!tag.trim().isEmpty() && tag.contains("=")) {
- tagSet.add(tag.trim());
- }
- }
- if (!tagSet.isEmpty()) {
- String[][] keyValue = new String[tagSet.size()][2];
- int i = 0;
- for (String tag : tagSet) {
- // support a = b===c as "a"="b===c"
- String [] pair = tag.split("\\s*=\\s*",2);
- keyValue[i][0] = pair[0];
- keyValue[i][1] = pair.length<2 ? "": pair[1];
- i++;
- }
-
- new AddTagsDialog(keyValue).showDialog();
- }
- }
- });
- }
- }
-
- protected void zoom(final Bounds bounds) {
- // make sure this isn't called unless there *is* a MapView
- if (Main.isDisplayingMapView()) {
- Main.worker.execute(new Runnable() {
- public void run() {
- BoundingXYVisitor bbox = new BoundingXYVisitor();
- bbox.visit(bounds);
- Main.map.mapView.recalculateCenterScale(bbox);
- }
- });
- }
- }
-
- @Override
- public PermissionPrefWithDefault getPermissionPref() {
- return null;
- }
-
- @Override
- protected void validateRequest() throws RequestHandlerBadRequestException {
- // Process mandatory arguments
- minlat = 0;
- maxlat = 0;
- minlon = 0;
- maxlon = 0;
- try {
- minlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("bottom")));
- maxlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("top")));
- minlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("left")));
- maxlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("right")));
- } catch (NumberFormatException e) {
- throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
- }
-
- // Process optional argument 'select'
- if (args.containsKey("select")) {
- ways.clear();
- nodes.clear();
- relations.clear();
- for (String item : args.get("select").split(",")) {
- try {
- if (item.startsWith("way")) {
- ways.add(Long.parseLong(item.substring(3)));
- } else if (item.startsWith("node")) {
- nodes.add(Long.parseLong(item.substring(4)));
- } else if (item.startsWith("relation")) {
- relations.add(Long.parseLong(item.substring(8)));
- } else if (item.startsWith("rel")) {
- relations.add(Long.parseLong(item.substring(3)));
- } else {
- System.out.println("RemoteControl: invalid selection '"+item+"' ignored");
- }
- } catch (NumberFormatException e) {
- System.out.println("RemoteControl: invalid selection '"+item+"' ignored");
- }
- }
- }
- }
-}
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Future;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Handler for {@code load_and_zoom} and {@code zoom} requests.
+ * @since 3707
+ */
+public class LoadAndZoomHandler extends RequestHandler {
+
+ /**
+ * The remote control command name used to load data and zoom.
+ */
+ public static final String command = "load_and_zoom";
+
+ /**
+ * The remote control command name used to zoom.
+ */
+ public static final String command2 = "zoom";
+
+ // Mandatory arguments
+ private double minlat;
+ private double maxlat;
+ private double minlon;
+ private double maxlon;
+
+ // Optional argument 'select'
+ private final Set<Long> ways = new HashSet<Long>();
+ private final Set<Long> nodes = new HashSet<Long>();
+ private final Set<Long> relations = new HashSet<Long>();
+
+ @Override
+ public String getPermissionMessage() {
+ String msg = tr("Remote Control has been asked to load data from the API.") +
+ "<br>" + tr("Bounding box: ") + new BBox(minlon, minlat, maxlon, maxlat).toStringCSV(", ");
+ if (args.containsKey("select") && ways.size()+nodes.size()+relations.size() > 0) {
+ msg += "<br>" + tr("Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}", relations.size(), ways.size(), nodes.size());
+ }
+ return msg;
+ }
+
+ @Override
+ public String[] getMandatoryParams() {
+ return new String[] { "bottom", "top", "left", "right" };
+ }
+
+ @Override
+ public String[] getOptionalParams() {
+ return new String[] {"new_layer", "addtags", "select", "zoom_mode"};
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return getUsageExamples(myCommand);
+ }
+
+ @Override
+ public String[] getUsageExamples(String cmd) {
+ if (command.equals(cmd)) {
+ return new String[] {
+ "/load_and_zoom?addtags=wikipedia:de=Wei%C3%9Fe_Gasse|maxspeed=5&select=way23071688,way23076176,way23076177,&left=13.740&right=13.741&top=51.05&bottom=51.049",
+ "/load_and_zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999&new_layer=true"};
+ } else {
+ return new String[] {
+ "/zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999"};
+ }
+ }
+
+ @Override
+ protected void handleRequest() throws RequestHandlerErrorException {
+ DownloadTask osmTask = new DownloadOsmTask();
+ try {
+ boolean newLayer = isLoadInNewLayer();
+
+ if (command.equals(myCommand)) {
+ if (!PermissionPrefWithDefault.LOAD_DATA.isAllowed()) {
+ Main.info("RemoteControl: download forbidden by preferences");
+ } else {
+ Area toDownload = null;
+ if (!newLayer) {
+ // find out whether some data has already been downloaded
+ Area present = null;
+ DataSet ds = Main.main.getCurrentDataSet();
+ if (ds != null) {
+ present = ds.getDataSourceArea();
+ }
+ if (present != null && !present.isEmpty()) {
+ toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
+ toDownload.subtract(present);
+ if (!toDownload.isEmpty()) {
+ // the result might not be a rectangle (L shaped etc)
+ Rectangle2D downloadBounds = toDownload.getBounds2D();
+ minlat = downloadBounds.getMinY();
+ minlon = downloadBounds.getMinX();
+ maxlat = downloadBounds.getMaxY();
+ maxlon = downloadBounds.getMaxX();
+ }
+ }
+ }
+ if (toDownload != null && toDownload.isEmpty()) {
+ Main.info("RemoteControl: no download necessary");
+ } else {
+ Future<?> future = osmTask.download(newLayer, new Bounds(minlat,minlon,maxlat,maxlon), null /* let the task manage the progress monitor */);
+ Main.worker.submit(new PostDownloadHandler(osmTask, future));
+ }
+ }
+ }
+ } catch (Exception ex) {
+ Main.warn("RemoteControl: Error parsing load_and_zoom remote control request:");
+ ex.printStackTrace();
+ throw new RequestHandlerErrorException();
+ }
+
+ /**
+ * deselect objects if parameter addtags given
+ */
+ if (args.containsKey("addtags")) {
+ GuiHelper.executeByMainWorkerInEDT(new Runnable() {
+ @Override
+ public void run() {
+ DataSet ds = Main.main.getCurrentDataSet();
+ if(ds == null) // e.g. download failed
+ return;
+ ds.clearSelection();
+ }
+ });
+ }
+
+ final Bounds bbox = new Bounds(minlat, minlon, maxlat, maxlon);
+ if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
+ // select objects after downloading, zoom to selection.
+ GuiHelper.executeByMainWorkerInEDT(new Runnable() {
+ @Override
+ public void run() {
+ HashSet<OsmPrimitive> newSel = new HashSet<OsmPrimitive>();
+ DataSet ds = Main.main.getCurrentDataSet();
+ if(ds == null) // e.g. download failed
+ return;
+ for (Way w : ds.getWays()) {
+ if (ways.contains(w.getId())) {
+ newSel.add(w);
+ }
+ }
+ ways.clear();
+ for (Node n : ds.getNodes()) {
+ if (nodes.contains(n.getId())) {
+ newSel.add(n);
+ }
+ }
+ nodes.clear();
+ for (Relation r : ds.getRelations()) {
+ if (relations.contains(r.getId())) {
+ newSel.add(r);
+ }
+ }
+ relations.clear();
+ ds.setSelected(newSel);
+ if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
+ // zoom_mode=(download|selection), defaults to selection
+ if (!"download".equals(args.get("zoom_mode")) && !newSel.isEmpty()) {
+ AutoScaleAction.autoScale("selection");
+ } else {
+ zoom(bbox);
+ }
+ }
+ if (Main.isDisplayingMapView() && Main.map.relationListDialog != null) {
+ Main.map.relationListDialog.selectRelations(null); // unselect all relations to fix #7342
+ Main.map.relationListDialog.dataChanged(null);
+ Main.map.relationListDialog.selectRelations(Utils.filteredCollection(newSel, Relation.class));
+ }
+ }
+ });
+ } else if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
+ // after downloading, zoom to downloaded area.
+ zoom(bbox);
+ }
+
+ AddTagsDialog.addTags(args, sender);
+ }
+
+ protected void zoom(final Bounds bounds) {
+ // make sure this isn't called unless there *is* a MapView
+ if (Main.isDisplayingMapView()) {
+ GuiHelper.executeByMainWorkerInEDT(new Runnable() {
+ @Override
+ public void run() {
+ BoundingXYVisitor bbox = new BoundingXYVisitor();
+ bbox.visit(bounds);
+ Main.map.mapView.recalculateCenterScale(bbox);
+ }
+ });
+ }
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ return null;
+ }
+
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ // Process mandatory arguments
+ minlat = 0;
+ maxlat = 0;
+ minlon = 0;
+ maxlon = 0;
+ try {
+ minlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("bottom")));
+ maxlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("top")));
+ minlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("left")));
+ maxlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("right")));
+ } catch (NumberFormatException e) {
+ throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+")");
+ }
+
+ // Current API 0.6 check: "The latitudes must be between -90 and 90"
+ if (!LatLon.isValidLat(minlat) || !LatLon.isValidLat(maxlat)) {
+ throw new RequestHandlerBadRequestException(tr("The latitudes must be between {0} and {1}", -90d, 90d));
+ }
+ // Current API 0.6 check: "longitudes between -180 and 180"
+ if (!LatLon.isValidLon(minlon) || !LatLon.isValidLon(maxlon)) {
+ throw new RequestHandlerBadRequestException(tr("The longitudes must be between {0} and {1}", -180d, 180d));
+ }
+ // Current API 0.6 check: "the minima must be less than the maxima"
+ if (minlat > maxlat || minlon > maxlon) {
+ throw new RequestHandlerBadRequestException(tr("The minima must be less than the maxima"));
+ }
+
+ // Process optional argument 'select'
+ if (args.containsKey("select")) {
+ ways.clear();
+ nodes.clear();
+ relations.clear();
+ for (String item : args.get("select").split(",")) {
+ try {
+ if (item.startsWith("way")) {
+ ways.add(Long.parseLong(item.substring(3)));
+ } else if (item.startsWith("node")) {
+ nodes.add(Long.parseLong(item.substring(4)));
+ } else if (item.startsWith("relation")) {
+ relations.add(Long.parseLong(item.substring(8)));
+ } else if (item.startsWith("rel")) {
+ relations.add(Long.parseLong(item.substring(3)));
+ } else {
+ Main.warn("RemoteControl: invalid selection '"+item+"' ignored");
+ }
+ } catch (NumberFormatException e) {
+ Main.warn("RemoteControl: invalid selection '"+item+"' ignored");
+ }
+ }
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
index efa2a19..592e672 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
@@ -1,13 +1,17 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io.remotecontrol.handler;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.LinkedList;
import java.util.List;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
/**
@@ -21,29 +25,45 @@ public class LoadObjectHandler extends RequestHandler {
* The remote control command name used to load objects using their ID.
*/
public static final String command = "load_object";
-
+
private final List<PrimitiveId> ps = new LinkedList<PrimitiveId>();
@Override
public String[] getMandatoryParams() {
return new String[]{"objects"};
}
+
+ @Override
+ public String[] getOptionalParams()
+ {
+ return new String[] {"new_layer", "addtags"};
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return new String[] {"/load_object?new_layer=true&objects=w106159509",
+ "/load_object?new_layer=true&objects=r2263653&relation_members=true"
+ };
+ }
@Override
protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
if (!PermissionPrefWithDefault.LOAD_DATA.isAllowed()) {
- System.out.println("RemoteControl: download forbidden by preferences");
+ Main.info("RemoteControl: download forbidden by preferences");
}
if (!ps.isEmpty()) {
- boolean newLayer = isLoadInNewLayer();
- boolean relationMembers = Boolean.parseBoolean(args.get("relation_members"));
- DownloadPrimitiveAction.processItems(newLayer, ps, true, relationMembers);
- Main.worker.submit(new Runnable() {
-
+ final boolean newLayer = isLoadInNewLayer();
+ final boolean relationMembers = Boolean.parseBoolean(args.get("relation_members"));
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ DownloadPrimitiveAction.processItems(newLayer, ps, true, relationMembers);
+ }
+ });
+ GuiHelper.executeByMainWorkerInEDT(new Runnable() {
@Override
public void run() {
Main.main.getCurrentDataSet().setSelected(ps);
- LoadAndZoomHandler.addTags(args);
+ AddTagsDialog.addTags(args, sender);
ps.clear();
}
});
@@ -67,7 +87,7 @@ public class LoadObjectHandler extends RequestHandler {
try {
ps.add(SimplePrimitiveId.fromString(i));
} catch (IllegalArgumentException e) {
- System.out.println("RemoteControl: invalid selection '"+i+"' ignored");
+ Main.warn("RemoteControl: invalid selection '"+i+"' ignored");
}
}
}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java
index 22d73fe..f163e9e 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/OpenFileHandler.java
@@ -1,10 +1,14 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.io.remotecontrol.handler;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.io.File;
import java.util.Arrays;
+
import org.openstreetmap.josm.actions.OpenFileAction;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-import static org.openstreetmap.josm.tools.I18n.tr;
/**
* Opens a local file
@@ -20,6 +24,16 @@ public class OpenFileHandler extends RequestHandler {
public String[] getMandatoryParams() {
return new String[]{"filename"};
}
+
+ @Override
+ public String[] getOptionalParams() {
+ return null;
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return new String[] {"/open_file?filename=/tmp/test.osm"};
+ }
@Override
public PermissionPrefWithDefault getPermissionPref() {
@@ -28,7 +42,11 @@ public class OpenFileHandler extends RequestHandler {
@Override
protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException {
- OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename"))));
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ OpenFileAction.openFiles(Arrays.asList(new File(args.get("filename"))));
+ }
+ });
}
@Override
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
index 2ac2a55..cfdffd0 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
@@ -1,271 +1,310 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol.handler;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-import org.openstreetmap.josm.tools.Utils;
-
-/**
- * This is the parent of all classes that handle a specific remote control command
- *
- * @author Bodo Meissner
- */
-public abstract class RequestHandler {
-
- public static final String globalConfirmationKey = "remotecontrol.always-confirm";
- public static final boolean globalConfirmationDefault = false;
- public static final String loadInNewLayerKey = "remotecontrol.new-layer";
- public static final boolean loadInNewLayerDefault = false;
-
- /** The GET request arguments */
- protected HashMap<String,String> args;
-
- /** The request URL without "GET". */
- protected String request;
-
- /** default response */
- protected String content = "OK\r\n";
- /** default content type */
- protected String contentType = "text/plain";
-
- /** will be filled with the command assigned to the subclass */
- protected String myCommand;
-
- /**
- * Check permission and parameters and handle request.
- *
- * @throws RequestHandlerForbiddenException
- * @throws RequestHandlerBadRequestException
- * @throws RequestHandlerErrorException
- */
- public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException
- {
- checkMandatoryParams();
- validateRequest();
- checkPermission();
- handleRequest();
- }
-
- /**
- * Validates the request before attempting to perform it.
- * @throws RequestHandlerBadRequestException
- * @since 5678
- */
- protected abstract void validateRequest() throws RequestHandlerBadRequestException;
-
- /**
- * Handle a specific command sent as remote control.
- *
- * This method of the subclass will do the real work.
- *
- * @throws RequestHandlerErrorException
- * @throws RequestHandlerBadRequestException
- */
- protected abstract void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException;
-
- /**
- * Get a specific message to ask the user for permission for the operation
- * requested via remote control.
- *
- * This message will be displayed to the user if the preference
- * remotecontrol.always-confirm is true.
- *
- * @return the message
- */
- abstract public String getPermissionMessage();
-
- /**
- * Get a PermissionPref object containing the name of a special permission
- * preference to individually allow the requested operation and an error
- * message to be displayed when a disabled operation is requested.
- *
- * Default is not to check any special preference. Override this in a
- * subclass to define permission preference and error message.
- *
- * @return the preference name and error message or null
- */
- abstract public PermissionPrefWithDefault getPermissionPref();
-
- abstract public String[] getMandatoryParams();
-
- /**
- * Check permissions in preferences and display error message
- * or ask for permission.
- *
- * @throws RequestHandlerForbiddenException
- */
- final public void checkPermission() throws RequestHandlerForbiddenException
- {
- /*
- * If the subclass defines a specific preference and if this is set
- * to false, abort with an error message.
- *
- * Note: we use the deprecated class here for compatibility with
- * older versions of WMSPlugin.
- */
- PermissionPrefWithDefault permissionPref = getPermissionPref();
- if((permissionPref != null) && (permissionPref.pref != null))
- {
- if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
- String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);
- System.out.println(err);
- throw new RequestHandlerForbiddenException(err);
- }
- }
-
- /* Does the user want to confirm everything?
- * If yes, display specific confirmation message.
- */
- if (Main.pref.getBoolean(globalConfirmationKey, globalConfirmationDefault)) {
- // Ensure dialog box does not exceed main window size
- Integer maxWidth = (int) Math.max(200, Main.parent.getWidth()*0.6);
- String message = "<html><div>" + getPermissionMessage() +
- "<br/>" + tr("Do you want to allow this?") + "</div></html>";
- JLabel label = new JLabel(message);
- if (label.getPreferredSize().width > maxWidth) {
- label.setText(message.replaceFirst("<div>", "<div style=\"width:" + maxWidth + "px;\">"));
- }
- if (JOptionPane.showConfirmDialog(Main.parent, label,
- tr("Confirm Remote Control action"),
- JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
- String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by user''s choice", myCommand);
- throw new RequestHandlerForbiddenException(err);
- }
- }
- }
-
- /**
- * Set request URL and parse args.
- *
- * @param url The request URL.
- */
- public void setUrl(String url) {
- this.request = url;
- parseArgs();
- }
-
- /**
- * Parse the request parameters as key=value pairs.
- * The result will be stored in {@code this.args}.
- *
- * Can be overridden by subclass.
- */
- protected void parseArgs() {
- try {
- String req = URLDecoder.decode(this.request, "UTF-8");
- HashMap<String, String> args = new HashMap<String, String>();
- if (req.indexOf('?') != -1) {
- String query = req.substring(req.indexOf('?') + 1);
- if (query.indexOf('#') != -1) {
- query = query.substring(0, query.indexOf('#'));
- }
- String[] params = query.split("&", -1);
- for (String param : params) {
- int eq = param.indexOf('=');
- if (eq != -1) {
- args.put(param.substring(0, eq), param.substring(eq + 1));
- }
- }
- }
- this.args = args;
- } catch (UnsupportedEncodingException ex) {
- throw new IllegalStateException(ex);
- }
- }
-
- void checkMandatoryParams() throws RequestHandlerBadRequestException {
- String[] mandatory = getMandatoryParams();
- if(mandatory == null) return;
-
- List<String> missingKeys = new LinkedList<String>();
- boolean error = false;
- for (String key : mandatory) {
- String value = args.get(key);
- if ((value == null) || (value.length() == 0)) {
- error = true;
- System.out.println("'" + myCommand + "' remote control request must have '" + key + "' parameter");
- missingKeys.add(key);
- }
- }
- if (error) {
- throw new RequestHandlerBadRequestException(
- "The following keys are mandatory, but have not been provided: "
- + Utils.join(", ", missingKeys));
- }
- }
-
- /**
- * Save command associated with this handler.
- *
- * @param command The command.
- */
- public void setCommand(String command)
- {
- if (command.charAt(0) == '/') {
- command = command.substring(1);
- }
- myCommand = command;
- }
-
- public String getContent() {
- return content;
- }
-
- public String getContentType() {
- return contentType;
- }
-
- protected boolean isLoadInNewLayer() {
- return args.get("new_layer") != null && !args.get("new_layer").isEmpty()
- ? Boolean.parseBoolean(args.get("new_layer"))
- : Main.pref.getBoolean(loadInNewLayerKey, loadInNewLayerDefault);
- }
-
- protected final String decodeParam(String param) {
- try {
- return URLDecoder.decode(param, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException();
- }
- }
-
- public static class RequestHandlerException extends Exception {
-
- public RequestHandlerException(String message) {
- super(message);
- }
-
- public RequestHandlerException() {
- }
- }
-
- public static class RequestHandlerErrorException extends RequestHandlerException {
- }
-
- public static class RequestHandlerBadRequestException extends RequestHandlerException {
-
- public RequestHandlerBadRequestException(String message) {
- super(message);
- }
- }
-
- public static class RequestHandlerForbiddenException extends RequestHandlerException {
- private static final long serialVersionUID = 2263904699747115423L;
-
- public RequestHandlerForbiddenException(String message) {
- super(message);
- }
- }
-}
\ No newline at end of file
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * This is the parent of all classes that handle a specific remote control command
+ *
+ * @author Bodo Meissner
+ */
+public abstract class RequestHandler {
+
+ public static final String globalConfirmationKey = "remotecontrol.always-confirm";
+ public static final boolean globalConfirmationDefault = false;
+ public static final String loadInNewLayerKey = "remotecontrol.new-layer";
+ public static final boolean loadInNewLayerDefault = false;
+
+ /** The GET request arguments */
+ protected Map<String,String> args;
+
+ /** The request URL without "GET". */
+ protected String request;
+
+ /** default response */
+ protected String content = "OK\r\n";
+ /** default content type */
+ protected String contentType = "text/plain";
+
+ /** will be filled with the command assigned to the subclass */
+ protected String myCommand;
+
+ /**
+ * who send th request?
+ * the host from refrerer header or IP of request sender
+ */
+ protected String sender;
+
+ /**
+ * Check permission and parameters and handle request.
+ *
+ * @throws RequestHandlerForbiddenException
+ * @throws RequestHandlerBadRequestException
+ * @throws RequestHandlerErrorException
+ */
+ public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException
+ {
+ checkMandatoryParams();
+ validateRequest();
+ checkPermission();
+ handleRequest();
+ }
+
+ /**
+ * Validates the request before attempting to perform it.
+ * @throws RequestHandlerBadRequestException
+ * @since 5678
+ */
+ protected abstract void validateRequest() throws RequestHandlerBadRequestException;
+
+ /**
+ * Handle a specific command sent as remote control.
+ *
+ * This method of the subclass will do the real work.
+ *
+ * @throws RequestHandlerErrorException
+ * @throws RequestHandlerBadRequestException
+ */
+ protected abstract void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException;
+
+ /**
+ * Get a specific message to ask the user for permission for the operation
+ * requested via remote control.
+ *
+ * This message will be displayed to the user if the preference
+ * remotecontrol.always-confirm is true.
+ *
+ * @return the message
+ */
+ abstract public String getPermissionMessage();
+
+ /**
+ * Get a PermissionPref object containing the name of a special permission
+ * preference to individually allow the requested operation and an error
+ * message to be displayed when a disabled operation is requested.
+ *
+ * Default is not to check any special preference. Override this in a
+ * subclass to define permission preference and error message.
+ *
+ * @return the preference name and error message or null
+ */
+ abstract public PermissionPrefWithDefault getPermissionPref();
+
+ abstract public String[] getMandatoryParams();
+
+ public String[] getOptionalParams() {
+ return null;
+ }
+
+ public String[] getUsageExamples() {
+ return null;
+ }
+
+ /**
+ * Returns usage examples for the given command. To be overriden only my handlers that define several commands.
+ * @param cmd The command asked
+ * @return Usage examples for the given command
+ * @since 6332
+ */
+ public String[] getUsageExamples(String cmd) {
+ return getUsageExamples();
+ }
+
+ /**
+ * Check permissions in preferences and display error message
+ * or ask for permission.
+ *
+ * @throws RequestHandlerForbiddenException
+ */
+ final public void checkPermission() throws RequestHandlerForbiddenException
+ {
+ /*
+ * If the subclass defines a specific preference and if this is set
+ * to false, abort with an error message.
+ *
+ * Note: we use the deprecated class here for compatibility with
+ * older versions of WMSPlugin.
+ */
+ PermissionPrefWithDefault permissionPref = getPermissionPref();
+ if((permissionPref != null) && (permissionPref.pref != null))
+ {
+ if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
+ String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);
+ Main.info(err);
+ throw new RequestHandlerForbiddenException(err);
+ }
+ }
+
+ /* Does the user want to confirm everything?
+ * If yes, display specific confirmation message.
+ */
+ if (Main.pref.getBoolean(globalConfirmationKey, globalConfirmationDefault)) {
+ // Ensure dialog box does not exceed main window size
+ Integer maxWidth = (int) Math.max(200, Main.parent.getWidth()*0.6);
+ String message = "<html><div>" + getPermissionMessage() +
+ "<br/>" + tr("Do you want to allow this?") + "</div></html>";
+ JLabel label = new JLabel(message);
+ if (label.getPreferredSize().width > maxWidth) {
+ label.setText(message.replaceFirst("<div>", "<div style=\"width:" + maxWidth + "px;\">"));
+ }
+ if (JOptionPane.showConfirmDialog(Main.parent, label,
+ tr("Confirm Remote Control action"),
+ JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
+ String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by user''s choice", myCommand);
+ throw new RequestHandlerForbiddenException(err);
+ }
+ }
+ }
+
+ /**
+ * Set request URL and parse args.
+ *
+ * @param url The request URL.
+ */
+ public void setUrl(String url) {
+ this.request = url;
+ parseArgs();
+ }
+
+ /**
+ * Parse the request parameters as key=value pairs.
+ * The result will be stored in {@code this.args}.
+ *
+ * Can be overridden by subclass.
+ */
+ protected void parseArgs() {
+ try {
+ String req = URLDecoder.decode(this.request, "UTF-8");
+ HashMap<String, String> args = new HashMap<String, String>();
+ if (req.indexOf('?') != -1) {
+ String query = req.substring(req.indexOf('?') + 1);
+ if (query.indexOf('#') != -1) {
+ query = query.substring(0, query.indexOf('#'));
+ }
+ String[] params = query.split("&", -1);
+ for (String param : params) {
+ int eq = param.indexOf('=');
+ if (eq != -1) {
+ args.put(param.substring(0, eq), param.substring(eq + 1));
+ }
+ }
+ }
+ this.args = args;
+ } catch (UnsupportedEncodingException ex) {
+ throw new IllegalStateException(ex);
+ }
+ }
+
+ void checkMandatoryParams() throws RequestHandlerBadRequestException {
+ String[] mandatory = getMandatoryParams();
+ String[] optional = getOptionalParams();
+ List<String> missingKeys = new LinkedList<String>();
+ boolean error = false;
+ if(mandatory != null) for (String key : mandatory) {
+ String value = args.get(key);
+ if ((value == null) || (value.length() == 0)) {
+ error = true;
+ Main.warn("'" + myCommand + "' remote control request must have '" + key + "' parameter");
+ missingKeys.add(key);
+ }
+ }
+ HashSet<String> knownParams = new HashSet<String>();
+ if (mandatory != null) Collections.addAll(knownParams, mandatory);
+ if (optional != null) Collections.addAll(knownParams, optional);
+ for (String par: args.keySet()) {
+ if (!knownParams.contains(par)) {
+ Main.warn("Unknown remote control parameter {0}, skipping it", par);
+ }
+ }
+ if (error) {
+ throw new RequestHandlerBadRequestException(
+ "The following keys are mandatory, but have not been provided: "
+ + Utils.join(", ", missingKeys));
+ }
+
+ }
+
+ /**
+ * Save command associated with this handler.
+ *
+ * @param command The command.
+ */
+ public void setCommand(String command)
+ {
+ if (command.charAt(0) == '/') {
+ command = command.substring(1);
+ }
+ myCommand = command;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ protected boolean isLoadInNewLayer() {
+ return args.get("new_layer") != null && !args.get("new_layer").isEmpty()
+ ? Boolean.parseBoolean(args.get("new_layer"))
+ : Main.pref.getBoolean(loadInNewLayerKey, loadInNewLayerDefault);
+ }
+
+ protected final String decodeParam(String param) {
+ try {
+ return URLDecoder.decode(param, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException();
+ }
+ }
+
+ public void setSender(String sender) {
+ this.sender = sender;
+ }
+
+ public static class RequestHandlerException extends Exception {
+
+ public RequestHandlerException(String message) {
+ super(message);
+ }
+
+ public RequestHandlerException() {
+ }
+ }
+
+ public static class RequestHandlerErrorException extends RequestHandlerException {
+ }
+
+ public static class RequestHandlerBadRequestException extends RequestHandlerException {
+
+ public RequestHandlerBadRequestException(String message) {
+ super(message);
+ }
+ }
+
+ public static class RequestHandlerForbiddenException extends RequestHandlerException {
+ private static final long serialVersionUID = 2263904699747115423L;
+
+ public RequestHandlerForbiddenException(String message) {
+ super(message);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java
index 3b9aadb..b7c6e68 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java
@@ -1,48 +1,58 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.remotecontrol.handler;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
-import org.openstreetmap.josm.io.remotecontrol.RequestProcessor;
-
-/**
- * Handler for version request.
- */
-public class VersionHandler extends RequestHandler {
-
- /**
- * The remote control command name used to reply version.
- */
- public static final String command = "version";
-
- @Override
- protected void handleRequest() throws RequestHandlerErrorException,
- RequestHandlerBadRequestException {
- content = RequestProcessor.PROTOCOLVERSION;
- contentType = "application/json";
- if (args.containsKey("jsonp")) {
- content = args.get("jsonp") + " && " + args.get("jsonp") + "(" + content + ")";
- }
- }
-
- @Override
- public String getPermissionMessage() {
- return tr("Remote Control has been asked to report its protocol version. This enables web sites to detect a running JOSM.");
- }
-
- @Override
- public PermissionPrefWithDefault getPermissionPref() {
- return PermissionPrefWithDefault.READ_PROTOCOL_VERSION;
- }
-
- @Override
- public String[] getMandatoryParams() {
- return null;
- }
-
- @Override
- protected void validateRequest() throws RequestHandlerBadRequestException {
- // Nothing to do
- }
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.io.remotecontrol.RequestProcessor;
+
+/**
+ * Handler for version request.
+ */
+public class VersionHandler extends RequestHandler {
+
+ /**
+ * The remote control command name used to reply version.
+ */
+ public static final String command = "version";
+
+ @Override
+ protected void handleRequest() throws RequestHandlerErrorException,
+ RequestHandlerBadRequestException {
+ content = RequestProcessor.PROTOCOLVERSION;
+ contentType = "application/json";
+ if (args.containsKey("jsonp")) {
+ content = args.get("jsonp") + " && " + args.get("jsonp") + "(" + content + ")";
+ }
+ }
+
+ @Override
+ public String getPermissionMessage() {
+ return tr("Remote Control has been asked to report its protocol version. This enables web sites to detect a running JOSM.");
+ }
+
+ @Override
+ public PermissionPrefWithDefault getPermissionPref() {
+ return PermissionPrefWithDefault.READ_PROTOCOL_VERSION;
+ }
+
+ @Override
+ public String[] getMandatoryParams() {
+ return null;
+ }
+
+ @Override
+ public String[] getOptionalParams() {
+ return new String[]{"jsonp"};
+ }
+
+ @Override
+ protected void validateRequest() throws RequestHandlerBadRequestException {
+ // Nothing to do
+ }
+
+ @Override
+ public String[] getUsageExamples() {
+ return new String[] { "/version", "/version?jsonp=test"};
+ }
}
\ No newline at end of file
diff --git a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
index e78e648..68252d2 100644
--- a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
@@ -65,9 +65,10 @@ public class GeoImageSessionExporter implements SessionLayerExporter {
Element layerElem = support.createElement("layer");
layerElem.setAttribute("type", "geoimage");
layerElem.setAttribute("version", "0.1");
+ addAttr("show-thumbnails", Boolean.toString(layer.isUseThumbs()), layerElem, support);
for (ImageEntry entry : layer.getImages()) {
-
+
Element imgElem = support.createElement("geoimage");
if (entry.getFile() == null) {
@@ -91,15 +92,18 @@ public class GeoImageSessionExporter implements SessionLayerExporter {
if (entry.getElevation() != null) {
addAttr("elevation", entry.getElevation().toString(), imgElem, support);
}
- if (entry.getGpsTime() != null) {
+ if (entry.hasGpsTime()) {
addAttr("gps-time", Long.toString(entry.getGpsTime().getTime()), imgElem, support);
}
if (entry.getExifOrientation() != null) {
addAttr("exif-orientation", Integer.toString(entry.getExifOrientation()), imgElem, support);
}
- if (entry.getExifTime() != null) {
+ if (entry.hasExifTime()) {
addAttr("exif-time", Long.toString(entry.getExifTime().getTime()), imgElem, support);
}
+ if (entry.hasExifGpsTime()) {
+ addAttr("exif-gps-time", Long.toString(entry.getExifGpsTime().getTime()), imgElem, support);
+ }
if (entry.getExifCoor() != null) {
Element posElem = support.createElement("exif-coordinates");
posElem.setAttribute("lat", Double.toString(entry.getExifCoor().lat()));
@@ -109,6 +113,9 @@ public class GeoImageSessionExporter implements SessionLayerExporter {
if (entry.getExifImgDir() != null) {
addAttr("exif-image-direction", entry.getExifImgDir().toString(), imgElem, support);
}
+ if (entry.hasNewGpsData()) {
+ addAttr("is-new-gps-data", Boolean.toString(entry.hasNewGpsData()), imgElem, support);
+ }
layerElem.appendChild(imgElem);
}
diff --git a/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java b/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java
index 725dab4..26495fa 100644
--- a/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java
+++ b/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java
@@ -31,6 +31,7 @@ public class GeoImageSessionImporter implements SessionLayerImporter {
List<ImageEntry> entries = new ArrayList<ImageEntry>();
NodeList imgNodes = elem.getChildNodes();
+ boolean useThumbs = false;
for (int i=0; i<imgNodes.getLength(); ++i) {
Node imgNode = imgNodes.item(i);
if (imgNode.getNodeType() == Node.ELEMENT_NODE) {
@@ -55,16 +56,20 @@ public class GeoImageSessionImporter implements SessionLayerImporter {
entry.setElevation(Double.parseDouble(attrElem.getTextContent()));
} else if (attrElem.getTagName().equals("gps-time")) {
entry.setGpsTime(new Date(Long.parseLong(attrElem.getTextContent())));
- } else if (attrElem.getTagName().equals("gps-orientation")) {
+ } else if (attrElem.getTagName().equals("exif-orientation")) {
entry.setExifOrientation(Integer.parseInt(attrElem.getTextContent()));
} else if (attrElem.getTagName().equals("exif-time")) {
entry.setExifTime(new Date(Long.parseLong(attrElem.getTextContent())));
+ } else if (attrElem.getTagName().equals("exif-gps-time")) {
+ entry.setExifGpsTime(new Date(Long.parseLong(attrElem.getTextContent())));
} else if (attrElem.getTagName().equals("exif-coordinates")) {
double lat = Double.parseDouble(attrElem.getAttribute("lat"));
double lon = Double.parseDouble(attrElem.getAttribute("lon"));
entry.setExifCoor(new LatLon(lat, lon));
} else if (attrElem.getTagName().equals("exif-image-direction")) {
entry.setExifImgDir(Double.parseDouble(attrElem.getTextContent()));
+ } else if (attrElem.getTagName().equals("is-new-gps-data") && Boolean.parseBoolean(attrElem.getTextContent())) {
+ entry.flagNewGpsData();
}
// TODO: handle thumbnail loading
} catch (NumberFormatException e) {
@@ -73,20 +78,22 @@ public class GeoImageSessionImporter implements SessionLayerImporter {
}
}
entries.add(entry);
+ } else if (imgElem.getTagName().equals("show-thumbnails")) {
+ useThumbs = Boolean.parseBoolean(imgElem.getTextContent());
}
}
}
GpxLayer gpxLayer = null;
List<SessionReader.LayerDependency> deps = support.getLayerDependencies();
- if (deps.size() > 0) {
+ if (!deps.isEmpty()) {
Layer layer = deps.iterator().next().getLayer();
if (layer instanceof GpxLayer) {
gpxLayer = (GpxLayer) layer;
}
}
-
- return new GeoImageLayer(entries, gpxLayer);
+
+ return new GeoImageLayer(entries, gpxLayer, useThumbs);
}
}
diff --git a/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java b/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
index ad3e101..127d312 100644
--- a/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java
@@ -29,12 +29,12 @@ import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import javax.swing.SwingConstants;
import org.openstreetmap.josm.gui.layer.GpxLayer;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.io.GpxWriter;
import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
import org.openstreetmap.josm.tools.GBC;
@@ -67,9 +67,9 @@ public class GpxTracksSessionExporter implements SessionLayerExporter {
JLabel lblData = new JLabel(tr("Data:"));
/* I18n: Refer to a OSM data file in session file */ link = new JRadioButton(tr("local file"));
link.putClientProperty("actionname", "link");
- link.setToolTipText(tr("Link to a OSM data file on your local disk."));
+ link.setToolTipText(tr("Link to a GPX file on your local disk."));
/* I18n: Include OSM data in session file */ include = new JRadioButton(tr("include"));
- include.setToolTipText(tr("Include OSM data in the .joz session file."));
+ include.setToolTipText(tr("Include GPX data in the .joz session file."));
include.putClientProperty("actionname", "include");
ButtonGroup group = new ButtonGroup();
group.add(link);
@@ -78,7 +78,7 @@ public class GpxTracksSessionExporter implements SessionLayerExporter {
JPanel cardLink = new JPanel(new GridBagLayout());
final File file = layer.getAssociatedFile();
if (file != null) {
- JTextField tf = new JTextField();
+ JosmTextField tf = new JosmTextField();
tf.setText(file.getPath());
tf.setEditable(false);
cardLink.add(tf, GBC.std());
@@ -87,7 +87,7 @@ public class GpxTracksSessionExporter implements SessionLayerExporter {
}
JPanel cardInclude = new JPanel(new GridBagLayout());
- JLabel lblIncl = new JLabel(tr("OSM data will be included in the session file."));
+ JLabel lblIncl = new JLabel(tr("GPX data will be included in the session file."));
lblIncl.setFont(lblIncl.getFont().deriveFont(Font.PLAIN));
cardInclude.add(lblIncl, GBC.eol().fill(GBC.HORIZONTAL));
@@ -106,11 +106,13 @@ public class GpxTracksSessionExporter implements SessionLayerExporter {
}
link.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
cl.show(cards, "link");
}
});
include.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
cl.show(cards, "include");
}
@@ -126,6 +128,7 @@ public class GpxTracksSessionExporter implements SessionLayerExporter {
p.add(cards, GBC.eol().insets(15,0,3,3));
export.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.DESELECTED) {
GuiHelper.setEnabledRec(p, false);
diff --git a/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java b/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java
index 62dd3f0..15157bb 100644
--- a/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java
+++ b/src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java
@@ -32,7 +32,7 @@ public class GpxTracksSessionImporter implements SessionLayerImporter {
XPath xpath = xPathFactory.newXPath();
XPathExpression fileExp = xpath.compile("file/text()");
String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
- if (fileStr == null || fileStr.equals("")) {
+ if (fileStr == null || fileStr.isEmpty()) {
throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
}
diff --git a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
index db8231c..f27f9e4 100644
--- a/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
@@ -30,7 +30,7 @@ public class ImagerySessionExporter implements SessionLayerExporter {
private ImageryLayer layer;
private JCheckBox export;
-
+
public ImagerySessionExporter(ImageryLayer layer) {
this.layer = layer;
}
diff --git a/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java b/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
index 15a3d20..7148c0a 100644
--- a/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
+++ b/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
@@ -47,5 +47,5 @@ public class ImagerySessionImporter implements SessionLayerImporter {
final ImageryLayer layer = ImageryLayer.create(i);
return layer;
}
-
+
}
diff --git a/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java b/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java
index 75df799..21fc31f 100644
--- a/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java
@@ -100,7 +100,6 @@ public class MarkerSessionExporter implements SessionLayerExporter {
public MarkerWriter(PrintWriter out) {
super(out);
- creator = "JOSM Marker export";
}
public void write(MarkerLayer layer) {
diff --git a/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java b/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java
index 4dd8e22..6cc12a2 100644
--- a/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java
+++ b/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java
@@ -36,7 +36,7 @@ public class MarkerSessionImporter implements SessionLayerImporter {
XPath xpath = xPathFactory.newXPath();
XPathExpression fileExp = xpath.compile("file/text()");
String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
- if (fileStr == null || fileStr.equals("")) {
+ if (fileStr == null || fileStr.isEmpty()) {
throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
}
@@ -47,7 +47,7 @@ public class MarkerSessionImporter implements SessionLayerImporter {
GpxLayer gpxLayer = null;
List<SessionReader.LayerDependency> deps = support.getLayerDependencies();
- if (deps.size() > 0) {
+ if (!deps.isEmpty()) {
Layer layer = deps.iterator().next().getLayer();
if (layer instanceof GpxLayer) {
gpxLayer = (GpxLayer) layer;
@@ -56,7 +56,7 @@ public class MarkerSessionImporter implements SessionLayerImporter {
MarkerLayer markerLayer = importData.getMarkerLayer();
markerLayer.fromLayer = gpxLayer;
-
+
return markerLayer;
} catch (XPathExpressionException e) {
diff --git a/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java b/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
index a6938f0..c2d3cdf 100644
--- a/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
+++ b/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
@@ -31,7 +31,6 @@ import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
-import javax.swing.JTextField;
import javax.swing.SwingConstants;
import org.w3c.dom.Element;
@@ -40,6 +39,7 @@ import org.openstreetmap.josm.actions.SaveAction;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.io.OsmWriter;
import org.openstreetmap.josm.io.OsmWriterFactory;
import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
@@ -67,12 +67,13 @@ public class OsmDataSessionExporter implements SessionLayerExporter {
private class LayerSaveAction extends AbstractAction {
public LayerSaveAction() {
putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get());
- putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ?
+ putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ?
tr("Layer contains unsaved data - save to file.") :
tr("Layer does not contain unsaved data."));
updateEnabledState();
}
+ @Override
public void actionPerformed(ActionEvent e) {
SaveAction.getInstance().doSave(layer);
updateEnabledState();
@@ -108,7 +109,7 @@ public class OsmDataSessionExporter implements SessionLayerExporter {
final LayerSaveAction saveAction = new LayerSaveAction();
final JButton save = new JButton(saveAction);
if (file != null) {
- JTextField tf = new JTextField();
+ JosmTextField tf = new JosmTextField();
tf.setText(file.getPath());
tf.setEditable(false);
cardLink.add(tf, GBC.std());
@@ -138,11 +139,13 @@ public class OsmDataSessionExporter implements SessionLayerExporter {
}
link.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
cl.show(cards, "link");
}
});
include.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
cl.show(cards, "include");
}
@@ -158,6 +161,7 @@ public class OsmDataSessionExporter implements SessionLayerExporter {
p.add(cards, GBC.eol().insets(15,0,3,3));
export.addItemListener(new ItemListener() {
+ @Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.DESELECTED) {
GuiHelper.setEnabledRec(p, false);
diff --git a/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java b/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java
index 4ed549f..54c63a9 100644
--- a/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java
+++ b/src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java
@@ -33,7 +33,7 @@ public class OsmDataSessionImporter implements SessionLayerImporter {
XPath xpath = xPathFactory.newXPath();
XPathExpression fileExp = xpath.compile("file/text()");
String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
- if (fileStr == null || fileStr.equals("")) {
+ if (fileStr == null || fileStr.isEmpty()) {
throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
}
diff --git a/src/org/openstreetmap/josm/io/session/SessionImporter.java b/src/org/openstreetmap/josm/io/session/SessionImporter.java
new file mode 100644
index 0000000..ee34dbf
--- /dev/null
+++ b/src/org/openstreetmap/josm/io/session/SessionImporter.java
@@ -0,0 +1,40 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.session;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.actions.SessionLoadAction.Loader;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.FileImporter;
+import org.openstreetmap.josm.io.IllegalDataException;
+
+/**
+ * File importer allowing to import session files (*.jos/joz files).
+ * @since 6245
+ */
+public class SessionImporter extends FileImporter {
+
+ /**
+ * The file filter used to load JOSM session files
+ */
+ public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+ "jos,joz", "jos", tr("Session file (*.jos, *.joz)"));
+
+ /**
+ * Constructs a new {@code SessionImporter}.
+ */
+ public SessionImporter() {
+ super(FILE_FILTER);
+ }
+
+ @Override
+ public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
+ boolean zip = file.getName().toLowerCase().endsWith(".joz");
+ Main.worker.submit(new Loader(file, zip));
+ }
+}
diff --git a/src/org/openstreetmap/josm/io/session/SessionReader.java b/src/org/openstreetmap/josm/io/session/SessionReader.java
index e51c3d6..47fcb98 100644
--- a/src/org/openstreetmap/josm/io/session/SessionReader.java
+++ b/src/org/openstreetmap/josm/io/session/SessionReader.java
@@ -84,10 +84,11 @@ public class SessionReader {
return importer;
}
- private File sessionFile;
- private boolean zip; /* true, if session file is a .joz file; false if it is a .jos file */
+ private URI sessionFileURI;
+ private boolean zip; // true, if session file is a .joz file; false if it is a .jos file
private ZipFile zipFile;
private List<Layer> layers = new ArrayList<Layer>();
+ private int active = -1;
private List<Runnable> postLoadTasks = new ArrayList<Runnable>();
private ViewportData viewport;
@@ -99,6 +100,15 @@ public class SessionReader {
}
/**
+ * @return active layer, or {@code null} if not set
+ * @since 6271
+ */
+ public Layer getActive() {
+ // layers is in reverse order because of the way TreeMap is built
+ return (active >= 0 && active < layers.size()) ? layers.get(layers.size()-1-active) : null;
+ }
+
+ /**
* @return actions executed in EDT after layers have been added (message dialog, etc.)
*/
public List<Runnable> getPostLoadTasks() {
@@ -207,14 +217,14 @@ public class SessionReader {
if (uri.getPath().startsWith("../")) {
// relative to session file - "../" step out of the archive
String relPath = uri.getPath().substring(3);
- return new File(sessionFile.toURI().resolve(relPath));
+ return new File(sessionFileURI.resolve(relPath));
} else {
// file inside zip archive
inZipPath = uriStr;
return null;
}
} else
- return new File(sessionFile.toURI().resolve(uri));
+ return new File(sessionFileURI.resolve(uri));
}
} else
throw new IOException(tr("Unsupported scheme ''{0}'' in URI ''{1}''.", uri.getScheme(), uriStr));
@@ -224,7 +234,8 @@ public class SessionReader {
}
/**
- * Returns true if we are reading from a .joz file.
+ * Determines if we are reading from a .joz file.
+ * @return {@code true} if we are reading from a .joz file, {@code false} otherwise
*/
public boolean isZip() {
return zip;
@@ -277,7 +288,7 @@ public class SessionReader {
}
}
- private void error(String msg) throws IllegalDataException {
+ private static void error(String msg) throws IllegalDataException {
throw new IllegalDataException(msg);
}
@@ -325,6 +336,14 @@ public class SessionReader {
Element layersEl = getElementByTagName(root, "layers");
if (layersEl == null) return;
+ String activeAtt = layersEl.getAttribute("active");
+ try {
+ active = (activeAtt != null && !activeAtt.isEmpty()) ? Integer.parseInt(activeAtt)-1 : -1;
+ } catch (NumberFormatException e) {
+ Main.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
+ active = -1;
+ }
+
MultiMap<Integer, Integer> deps = new MultiMap<Integer, Integer>();
Map<Integer, Element> elems = new HashMap<Integer, Element>();
@@ -358,7 +377,9 @@ public class SessionReader {
Integer d = null;
try {
d = Integer.parseInt(sd);
- } catch (NumberFormatException ex) {}
+ } catch (NumberFormatException ex) {
+ Main.warn(ex);
+ }
if (d != null) {
deps.put(idx, d);
}
@@ -472,7 +493,9 @@ public class SessionReader {
try {
double opacity = Double.parseDouble(el.getAttribute("opacity"));
layer.setOpacity(opacity);
- } catch (NumberFormatException ex) {}
+ } catch (NumberFormatException ex) {
+ Main.warn(ex);
+ }
}
}
for (Entry<Integer, Layer> e : layersMap.entrySet()) {
@@ -529,27 +552,13 @@ public class SessionReader {
if (progressMonitor == null) {
progressMonitor = NullProgressMonitor.INSTANCE;
}
- this.sessionFile = sessionFile;
- this.zip = zip;
InputStream josIS = null;
if (zip) {
try {
zipFile = new ZipFile(sessionFile);
- ZipEntry josEntry = null;
- Enumeration<? extends ZipEntry> entries = zipFile.entries();
- while (entries.hasMoreElements()) {
- ZipEntry entry = entries.nextElement();
- if (entry.getName().toLowerCase().endsWith(".jos")) {
- josEntry = entry;
- break;
- }
- }
- if (josEntry == null) {
- error(tr("expected .jos file inside .joz archive"));
- }
- josIS = zipFile.getInputStream(josEntry);
+ josIS = getZipInputStream(zipFile);
} catch (ZipException ze) {
throw new IOException(ze);
}
@@ -561,6 +570,30 @@ public class SessionReader {
}
}
+ loadSession(josIS, sessionFile.toURI(), zip, progressMonitor);
+ }
+
+ private static InputStream getZipInputStream(ZipFile zipFile) throws ZipException, IOException, IllegalDataException {
+ ZipEntry josEntry = null;
+ Enumeration<? extends ZipEntry> entries = zipFile.entries();
+ while (entries.hasMoreElements()) {
+ ZipEntry entry = entries.nextElement();
+ if (entry.getName().toLowerCase().endsWith(".jos")) {
+ josEntry = entry;
+ break;
+ }
+ }
+ if (josEntry == null) {
+ error(tr("expected .jos file inside .joz archive"));
+ }
+ return zipFile.getInputStream(josEntry);
+ }
+
+ private void loadSession(InputStream josIS, URI sessionFileURI, boolean zip, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
+
+ this.sessionFileURI = sessionFileURI;
+ this.zip = zip;
+
try {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setValidating(false);
@@ -580,5 +613,4 @@ public class SessionReader {
if (els.getLength() == 0) return null;
return (Element) els.item(0);
}
-
}
diff --git a/src/org/openstreetmap/josm/io/session/SessionWriter.java b/src/org/openstreetmap/josm/io/session/SessionWriter.java
index 55f3d5b..753205d 100644
--- a/src/org/openstreetmap/josm/io/session/SessionWriter.java
+++ b/src/org/openstreetmap/josm/io/session/SessionWriter.java
@@ -72,24 +72,33 @@ public class SessionWriter {
Class<? extends SessionLayerExporter> exporterClass = sessionLayerExporters.get(layerClass);
if (exporterClass == null) return null;
try {
- @SuppressWarnings("unchecked")
- Constructor<? extends SessionLayerExporter> constructor = (Constructor) exporterClass.getConstructor(layerClass);
+ Constructor<? extends SessionLayerExporter> constructor = exporterClass.getConstructor(layerClass);
return constructor.newInstance(layer);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
- private List<Layer> layers;
- private Map<Layer, SessionLayerExporter> exporters;
- private MultiMap<Layer, Layer> dependencies;
- private boolean zip;
+ private final List<Layer> layers;
+ private final int active;
+ private final Map<Layer, SessionLayerExporter> exporters;
+ private final MultiMap<Layer, Layer> dependencies;
+ private final boolean zip;
private ZipOutputStream zipOut;
- public SessionWriter(List<Layer> layers, Map<Layer, SessionLayerExporter> exporters,
+ /**
+ * Constructs a new {@code SessionWriter}.
+ * @param layers The ordered list of layers to save
+ * @param active The index of active layer in {@code layers} (starts to 0). Ignored if set to -1
+ * @param exporters The exprters to use to save layers
+ * @param zip {@code true} if a joz archive has to be created, {@code false otherwise}
+ * @since 6271
+ */
+ public SessionWriter(List<Layer> layers, int active, Map<Layer, SessionLayerExporter> exporters,
MultiMap<Layer, Layer> dependencies, boolean zip) {
this.layers = layers;
+ this.active = active;
this.exporters = exporters;
this.dependencies = dependencies;
this.zip = zip;
@@ -182,6 +191,9 @@ public class SessionWriter {
scale.setAttribute("meter-per-pixel", Double.toString(dist100px / 100));
Element layersEl = doc.createElement("layers");
+ if (active >= 0) {
+ layersEl.setAttribute("active", Integer.toString(active+1));
+ }
root.appendChild(layersEl);
for (int index=0; index<layers.size(); ++index) {
@@ -196,7 +208,7 @@ public class SessionWriter {
el.setAttribute("opacity", Double.toString(layer.getOpacity()));
}
Set<Layer> deps = dependencies.get(layer);
- if (deps.size() > 0) {
+ if (!deps.isEmpty()) {
List<Integer> depsInt = new ArrayList<Integer>();
for (Layer depLayer : deps) {
int depIndex = layers.indexOf(depLayer);
@@ -246,7 +258,7 @@ public class SessionWriter {
ZipEntry entry = new ZipEntry("session.jos");
zipOut.putNextEntry(entry);
writeJos(doc, zipOut);
- zipOut.close();
+ Utils.close(zipOut);
} else {
writeJos(doc, new BufferedOutputStream(out));
}
diff --git a/src/org/openstreetmap/josm/plugins/Plugin.java b/src/org/openstreetmap/josm/plugins/Plugin.java
index ecba29c..a2af2e9 100644
--- a/src/org/openstreetmap/josm/plugins/Plugin.java
+++ b/src/org/openstreetmap/josm/plugins/Plugin.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins;
import java.io.File;
@@ -8,12 +8,16 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.List;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrameListener;
import org.openstreetmap.josm.gui.download.DownloadSelection;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.tools.Utils;
/**
* For all purposes of loading dynamic resources, the Plugin's class loader should be used
@@ -36,7 +40,7 @@ import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
*
* @author Immanuel.Scholz
*/
-public abstract class Plugin {
+public abstract class Plugin implements MapFrameListener {
/**
* This is the info available for this plugin. You can access this from your
@@ -68,7 +72,7 @@ public abstract class Plugin {
/**
* Sets the plugin information object for this plugin
*
- * @parma info the plugin information object
+ * @param info the plugin information object
*/
public void setPluginInformation(PluginInformation info) {
this.info = info;
@@ -81,11 +85,7 @@ public abstract class Plugin {
return new File(Main.pref.getPluginsDirectory(), info.name).getPath();
}
- /**
- * Called after Main.mapFrame is initalized. (After the first data is loaded).
- * You can use this callback to tweak the newFrame to your needs, as example install
- * an alternative Painter.
- */
+ @Override
public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {}
/**
@@ -109,14 +109,22 @@ public abstract class Plugin {
if (!pluginDir.exists()) {
pluginDir.mkdirs();
}
- FileOutputStream out = new FileOutputStream(new File(pluginDirName, to));
- InputStream in = getClass().getResourceAsStream(from);
- byte[] buffer = new byte[8192];
- for(int len = in.read(buffer); len > 0; len = in.read(buffer)) {
- out.write(buffer, 0, len);
+ FileOutputStream out = null;
+ InputStream in = null;
+ try {
+ out = new FileOutputStream(new File(pluginDirName, to));
+ in = getClass().getResourceAsStream(from);
+ if (in == null) {
+ throw new IOException("Resource not found: "+from);
+ }
+ byte[] buffer = new byte[8192];
+ for(int len = in.read(buffer); len > 0; len = in.read(buffer)) {
+ out.write(buffer, 0, len);
+ }
+ } finally {
+ Utils.close(in);
+ Utils.close(out);
}
- in.close();
- out.close();
}
/**
@@ -135,8 +143,11 @@ public abstract class Plugin {
public ClassLoader getPluginResourceClassLoader() {
File pluginDir = Main.pref.getPluginsDirectory();
File pluginJar = new File(pluginDir, info.name + ".jar");
- URL pluginJarUrl = PluginInformation.fileToURL(pluginJar);
- URLClassLoader pluginClassLoader = new URLClassLoader(new URL[] { pluginJarUrl } , Main.class.getClassLoader());
- return pluginClassLoader;
+ final URL pluginJarUrl = PluginInformation.fileToURL(pluginJar);
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return new URLClassLoader(new URL[] {pluginJarUrl}, Main.class.getClassLoader());
+ }
+ });
}
}
diff --git a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
index aef819d..6e7e360 100644
--- a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
+++ b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
@@ -21,6 +21,7 @@ import org.openstreetmap.josm.gui.ExtendedDialog;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
@@ -44,9 +45,9 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
/**
* Creates the download task
*
- * @param parent the parent component relative to which the {@link PleaseWaitDialog} is displayed
+ * @param parent the parent component relative to which the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} is displayed
* @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null.
- * @param title the title to display in the {@link PleaseWaitDialog}
+ * @param title the title to display in the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}
* @throws IllegalArgumentException thrown if toUpdate is null
*/
public PluginDownloadTask(Component parent, Collection<PluginInformation> toUpdate, String title) throws IllegalArgumentException{
@@ -60,7 +61,7 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
*
* @param monitor a progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null
* @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null.
- * @param title the title to display in the {@link PleaseWaitDialog}
+ * @param title the title to display in the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}
* @throws IllegalArgumentException thrown if toUpdate is null
*/
public PluginDownloadTask(ProgressMonitor monitor, Collection<PluginInformation> toUpdate, String title) {
@@ -95,7 +96,7 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
protected void download(PluginInformation pi, File file) throws PluginDownloadException{
if (pi.mainversion > Version.getInstance().getVersion()) {
ExtendedDialog dialog = new ExtendedDialog(
- Main.parent,
+ progressMonitor.getWindowParent(),
tr("Skip download"),
new String[] {
tr("Download Plugin"),
@@ -112,15 +113,13 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
InputStream in = null;
try {
if (pi.downloadlink == null) {
- String msg = tr("Warning: Cannot download plugin ''{0}''. Its download link is not known. Skipping download.", pi.name);
- System.err.println(msg);
+ String msg = tr("Cannot download plugin ''{0}''. Its download link is not known. Skipping download.", pi.name);
+ Main.warn(msg);
throw new PluginDownloadException(msg);
}
URL url = new URL(pi.downloadlink);
synchronized(this) {
- downloadConnection = Utils.openHttpConnection(url);
- downloadConnection.setRequestProperty("Cache-Control", "no-cache");
- downloadConnection.connect();
+ downloadConnection = MirroredInputStream.connectFollowingRedirect(url);
}
in = downloadConnection.getInputStream();
out = new FileOutputStream(file);
@@ -128,11 +127,9 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
out.write(buffer, 0, read);
}
- out.close();
- in.close();
- } catch(MalformedURLException e) {
- String msg = tr("Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid URL. Skipping download.", pi.name, pi.downloadlink);
- System.err.println(msg);
+ } catch (MalformedURLException e) {
+ String msg = tr("Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid URL. Skipping download.", pi.name, pi.downloadlink);
+ Main.warn(msg);
throw new PluginDownloadException(msg);
} catch (IOException e) {
if (canceled)
@@ -177,7 +174,7 @@ public class PluginDownloadTask extends PleaseWaitRunnable{
/**
* Replies true if the task was canceled by the user
*
- * @return
+ * @return <code>true</code> if the task was stopped by the user
*/
public boolean isCanceled() {
return canceled;
diff --git a/src/org/openstreetmap/josm/plugins/PluginException.java b/src/org/openstreetmap/josm/plugins/PluginException.java
index 72dd195..d4ae8bb 100644
--- a/src/org/openstreetmap/josm/plugins/PluginException.java
+++ b/src/org/openstreetmap/josm/plugins/PluginException.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins;
import static org.openstreetmap.josm.tools.I18n.tr;
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index 8620f6f..40ee1c7 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -15,6 +15,8 @@ import java.io.File;
import java.io.FilenameFilter;
import java.net.URL;
import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -44,20 +46,19 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import javax.swing.UIManager;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
-import org.openstreetmap.josm.gui.JMultilineLabel;
-import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.download.DownloadSelection;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.I18n;
@@ -66,12 +67,12 @@ import org.openstreetmap.josm.tools.ImageProvider;
/**
* PluginHandler is basically a collection of static utility functions used to bootstrap
* and manage the loaded plugins.
- *
+ * @since 1326
*/
-public class PluginHandler {
+public final class PluginHandler {
/**
- * deprecated plugins that are removed on start
+ * Deprecated plugins that are removed on start
*/
public final static Collection<DeprecatedPlugin> DEPRECATED_PLUGINS;
static {
@@ -102,6 +103,7 @@ public class PluginHandler {
new DeprecatedPlugin("ghost", IN_CORE),
new DeprecatedPlugin("validator", IN_CORE),
new DeprecatedPlugin("multipoly", IN_CORE),
+ new DeprecatedPlugin("multipoly-convert", IN_CORE),
new DeprecatedPlugin("remotecontrol", IN_CORE),
new DeprecatedPlugin("imagery", IN_CORE),
new DeprecatedPlugin("slippymap", IN_CORE),
@@ -112,44 +114,74 @@ public class PluginHandler {
new DeprecatedPlugin("Curves", tr("replaced by new {0} plugin","utilsplugin2")),
new DeprecatedPlugin("epsg31287", tr("replaced by new {0} plugin", "proj4j")),
new DeprecatedPlugin("licensechange", tr("no longer required")),
+ new DeprecatedPlugin("restart", IN_CORE)
});
}
+
+ private PluginHandler() {
+ // Hide default constructor for utils classes
+ }
+ /**
+ * Description of a deprecated plugin
+ */
public static class DeprecatedPlugin implements Comparable<DeprecatedPlugin> {
- public String name;
- // short explanation, can be null
- public String reason;
- // migration, can be null
- private Runnable migration;
-
+ /** Plugin name */
+ public final String name;
+ /** Short explanation about deprecation, can be {@code null} */
+ public final String reason;
+ /** Code to run to perform migration, can be {@code null} */
+ private final Runnable migration;
+
+ /**
+ * Constructs a new {@code DeprecatedPlugin}.
+ * @param name The plugin name
+ */
public DeprecatedPlugin(String name) {
- this.name = name;
+ this(name, null, null);
}
+ /**
+ * Constructs a new {@code DeprecatedPlugin} with a given reason.
+ * @param name The plugin name
+ * @param reason The reason about deprecation
+ */
public DeprecatedPlugin(String name, String reason) {
- this.name = name;
- this.reason = reason;
+ this(name, reason, null);
}
+ /**
+ * Constructs a new {@code DeprecatedPlugin}.
+ * @param name The plugin name
+ * @param reason The reason about deprecation
+ * @param migration The code to run to perform migration
+ */
public DeprecatedPlugin(String name, String reason, Runnable migration) {
this.name = name;
this.reason = reason;
this.migration = migration;
}
+ /**
+ * Performs migration.
+ */
public void migrate() {
if (migration != null) {
migration.run();
}
}
+ @Override
public int compareTo(DeprecatedPlugin o) {
return name.compareTo(o.name);
}
}
+ /**
+ * List of unmaintained plugins. Not really up-to-date as the vast majority of plugins are not really maintained after a few months, sadly...
+ */
final public static String [] UNMAINTAINED_PLUGINS = new String[] {"gpsbabelgui", "Intersect_way"};
-
+
/**
* Default time-based update interval, in days (pluginmanager.time-based-update.interval)
*/
@@ -278,7 +310,7 @@ public class PluginHandler {
long tim = System.currentTimeMillis();
long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
Integer maxTime = Main.pref.getInteger("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL);
- long d = (tim - last) / (24 * 60 * 60 * 1000l);
+ long d = (tim - last) / (24 * 60 * 60 * 1000L);
if ((last <= 0) || (maxTime <= 0)) {
Main.pref.put("pluginmanager.lastupdate", Long.toString(tim));
} else if (d > maxTime) {
@@ -316,24 +348,24 @@ public class PluginHandler {
policy = policy.trim().toLowerCase();
if (policy.equals("never")) {
if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
- System.out.println(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."));
+ Main.info(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."));
} else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
- System.out.println(tr("Skipping plugin update after elapsed update interval. Automatic update at startup is disabled."));
+ Main.info(tr("Skipping plugin update after elapsed update interval. Automatic update at startup is disabled."));
}
return false;
}
if (policy.equals("always")) {
if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
- System.out.println(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled."));
+ Main.info(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled."));
} else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
- System.out.println(tr("Running plugin update after elapsed update interval. Automatic update at startup is disabled."));
+ Main.info(tr("Running plugin update after elapsed update interval. Automatic update at startup is disabled."));
}
return true;
}
if (!policy.equals("ask")) {
- System.err.println(tr("Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''.", policy, togglePreferenceKey));
+ Main.warn(tr("Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''.", policy, togglePreferenceKey));
}
int ret = HelpAwareOptionPane.showOptionDialog(
parent,
@@ -424,7 +456,13 @@ public class PluginHandler {
return false;
}
- return checkRequiredPluginsPreconditions(parent, plugins, plugin, true);
+ // Add all plugins already loaded (to include early plugins when checking late ones)
+ Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
+ for (PluginProxy proxy : pluginList) {
+ allPlugins.add(proxy.getPluginInformation());
+ }
+
+ return checkRequiredPluginsPreconditions(parent, allPlugins, plugin, true);
}
/**
@@ -441,7 +479,7 @@ public class PluginHandler {
public static boolean checkRequiredPluginsPreconditions(Component parent, Collection<PluginInformation> plugins, PluginInformation plugin, boolean local) {
String requires = local ? plugin.localrequires : plugin.requires;
-
+
// make sure the dependencies to other plugins are not broken
//
if (requires != null) {
@@ -475,7 +513,14 @@ public class PluginHandler {
// iterate all plugins and collect all libraries of all plugins:
List<URL> allPluginLibraries = new LinkedList<URL>();
File pluginDir = Main.pref.getPluginsDirectory();
- for (PluginInformation info : plugins) {
+
+ // Add all plugins already loaded (to include early plugins in the classloader, allowing late plugins to rely on early ones)
+ Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
+ for (PluginProxy proxy : pluginList) {
+ allPlugins.add(proxy.getPluginInformation());
+ }
+
+ for (PluginInformation info : allPlugins) {
if (info.libraries == null) {
continue;
}
@@ -487,16 +532,19 @@ public class PluginHandler {
}
// create a classloader for all plugins:
- URL[] jarUrls = new URL[allPluginLibraries.size()];
- jarUrls = allPluginLibraries.toArray(jarUrls);
- URLClassLoader pluginClassLoader = new URLClassLoader(jarUrls, Main.class.getClassLoader());
- return pluginClassLoader;
+ final URL[] jarUrls = allPluginLibraries.toArray(new URL[allPluginLibraries.size()]);
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return new URLClassLoader(jarUrls, Main.class.getClassLoader());
+ }
+ });
}
/**
* Loads and instantiates the plugin described by <code>plugin</code> using
* the class loader <code>pluginClassLoader</code>.
*
+ * @param parent The parent component to be used for the displayed dialog
* @param plugin the plugin
* @param pluginClassLoader the plugin class loader
*/
@@ -505,17 +553,23 @@ public class PluginHandler {
try {
Class<?> klass = plugin.loadClass(pluginClassLoader);
if (klass != null) {
- System.out.println(tr("loading plugin ''{0}'' (version {1})", plugin.name, plugin.localversion));
- pluginList.add(plugin.load(klass));
+ Main.info(tr("loading plugin ''{0}'' (version {1})", plugin.name, plugin.localversion));
+ PluginProxy pluginProxy = plugin.load(klass);
+ pluginList.add(pluginProxy);
+ Main.addMapFrameListener(pluginProxy);
}
msg = null;
} catch (PluginException e) {
- System.err.print(e.getMessage());
+ Main.error(e.getMessage());
Throwable cause = e.getCause();
if (cause != null) {
- System.err.print(". " + cause.getClass().getName() + ": " + cause.getLocalizedMessage());
+ msg = cause.getLocalizedMessage();
+ if (msg != null) {
+ Main.error("Cause: " + cause.getClass().getName()+": " + msg);
+ } else {
+ cause.printStackTrace();
+ }
}
- System.err.println();
if (e.getCause() instanceof ClassNotFoundException) {
msg = tr("<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was not found.<br>"
+ "Delete from preferences?</html>", plugin.name, plugin.className);
@@ -523,7 +577,7 @@ public class PluginHandler {
} catch (Throwable e) {
e.printStackTrace();
}
- if(msg != null && confirmDisablePlugin(parent, msg, plugin.name)) {
+ if (msg != null && confirmDisablePlugin(parent, msg, plugin.name)) {
Main.pref.removeFromCollection("plugins", plugin.name);
}
}
@@ -532,6 +586,7 @@ public class PluginHandler {
* Loads the plugin in <code>plugins</code> from locally available jar files into
* memory.
*
+ * @param parent The parent component to be used for the displayed dialog
* @param plugins the list of plugins
* @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null.
*/
@@ -554,6 +609,7 @@ public class PluginHandler {
Collections.sort(
toLoad,
new Comparator<PluginInformation>() {
+ @Override
public int compare(PluginInformation o1, PluginInformation o2) {
if (o1.stage < o2.stage) return -1;
if (o1.stage == o2.stage) return 0;
@@ -598,6 +654,7 @@ public class PluginHandler {
* Loads plugins from <code>plugins</code> which have the flag {@link PluginInformation#early}
* set to false.
*
+ * @param parent The parent component to be used for the displayed dialog
* @param plugins the collection of plugins
* @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null.
*/
@@ -633,7 +690,7 @@ public class PluginHandler {
e.printStackTrace();
return null;
} catch(InterruptedException e) {
- e.printStackTrace();
+ Main.warn("InterruptedException in "+PluginHandler.class.getSimpleName()+" while loading locally available plugin information");
return null;
}
HashMap<String, PluginInformation> ret = new HashMap<String, PluginInformation>();
@@ -675,6 +732,7 @@ public class PluginHandler {
* out. This involves user interaction. This method displays alert and confirmation
* messages.
*
+ * @param parent The parent component to be used for the displayed dialog
* @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null.
* @return the set of plugins to load (as set of plugin names)
*/
@@ -739,7 +797,7 @@ public class PluginHandler {
HelpUtil.ht("/Plugin/Loading#FailedPluginUpdated")
);
}
-
+
private static Set<PluginInformation> findRequiredPluginsToDownload(
Collection<PluginInformation> pluginsToUpdate, List<PluginInformation> allPlugins, Set<PluginInformation> pluginsToDownload) {
Set<PluginInformation> result = new HashSet<PluginInformation>();
@@ -762,7 +820,7 @@ public class PluginHandler {
}
}
} catch (PluginException e) {
- System.out.println(tr("Warning: failed to find plugin {0}", name));
+ Main.warn(tr("Failed to find plugin {0}", name));
e.printStackTrace();
}
}
@@ -778,7 +836,7 @@ public class PluginHandler {
* @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null.
* @throws IllegalArgumentException thrown if plugins is null
*/
- public static List<PluginInformation> updatePlugins(Component parent,
+ public static List<PluginInformation> updatePlugins(Component parent,
List<PluginInformation> plugins, ProgressMonitor monitor)
throws IllegalArgumentException{
CheckParameterUtil.ensureParameterNotNull(plugins, "plugins");
@@ -797,40 +855,39 @@ public class PluginHandler {
);
Future<?> future = service.submit(task1);
List<PluginInformation> allPlugins = null;
-
+
try {
future.get();
allPlugins = task1.getAvailablePlugins();
plugins = buildListOfPluginsToLoad(parent,monitor.createSubTaskMonitor(1, false));
- } catch(ExecutionException e) {
- System.out.println(tr("Warning: failed to download plugin information list"));
+ } catch (ExecutionException e) {
+ Main.warn(tr("Failed to download plugin information list")+": ExecutionException");
e.printStackTrace();
// don't abort in case of error, continue with downloading plugins below
- } catch(InterruptedException e) {
- System.out.println(tr("Warning: failed to download plugin information list"));
- e.printStackTrace();
+ } catch (InterruptedException e) {
+ Main.warn(tr("Failed to download plugin information list")+": InterruptedException");
// don't abort in case of error, continue with downloading plugins below
}
// filter plugins which actually have to be updated
//
Collection<PluginInformation> pluginsToUpdate = new ArrayList<PluginInformation>();
- for(PluginInformation pi: plugins) {
+ for (PluginInformation pi: plugins) {
if (pi.isUpdateRequired()) {
pluginsToUpdate.add(pi);
}
}
-
+
if (!pluginsToUpdate.isEmpty()) {
-
+
Set<PluginInformation> pluginsToDownload = new HashSet<PluginInformation>(pluginsToUpdate);
-
+
if (allPlugins != null) {
// Updated plugins may need additional plugin dependencies currently not installed
//
Set<PluginInformation> additionalPlugins = findRequiredPluginsToDownload(pluginsToUpdate, allPlugins, pluginsToDownload);
pluginsToDownload.addAll(additionalPlugins);
-
+
// Iterate on required plugins, if they need themselves another plugins (i.e A needs B, but B needs C)
while (!additionalPlugins.isEmpty()) {
// Install the additional plugins to load them later
@@ -856,15 +913,15 @@ public class PluginHandler {
alertFailedPluginUpdate(parent, pluginsToUpdate);
return plugins;
} catch(InterruptedException e) {
- e.printStackTrace();
+ Main.warn("InterruptedException in "+PluginHandler.class.getSimpleName()+" while updating plugins");
alertFailedPluginUpdate(parent, pluginsToUpdate);
return plugins;
}
-
+
// Update Plugin info for downloaded plugins
//
refreshLocalUpdatedPluginInfo(task2.getDownloadedPlugins());
-
+
// notify user if downloading a locally installed plugin failed
//
if (! task2.getFailedPlugins().isEmpty()) {
@@ -884,7 +941,8 @@ public class PluginHandler {
/**
* Ask the user for confirmation that a plugin shall be disabled.
- *
+ *
+ * @param parent The parent component to be used for the displayed dialog
* @param reason the reason for disabling the plugin
* @param name the plugin name
* @return true, if the plugin shall be disabled; false, otherwise
@@ -918,20 +976,13 @@ public class PluginHandler {
}
/**
- * Notified loaded plugins about a new map frame
- *
- * @param old the old map frame
- * @param map the new map frame
+ * Returns the plugin of the specified name.
+ * @param name The plugin name
+ * @return The plugin of the specified name, if installed and loaded, or {@code null} otherwise.
*/
- public static void notifyMapFrameChanged(MapFrame old, MapFrame map) {
- for (PluginProxy plugin : pluginList) {
- plugin.mapFrameInitialized(old, map);
- }
- }
-
public static Object getPlugin(String name) {
for (PluginProxy plugin : pluginList)
- if(plugin.getPluginInformation().name.equals(name))
+ if (plugin.getPluginInformation().name.equals(name))
return plugin.plugin;
return null;
}
@@ -964,6 +1015,7 @@ public class PluginHandler {
return;
final File[] files = pluginDir.listFiles(new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return name.endsWith(".jar.new");
}});
@@ -974,8 +1026,8 @@ public class PluginHandler {
String pluginName = updatedPlugin.getName().substring(0, updatedPlugin.getName().length() - 8);
if (plugin.exists()) {
if (!plugin.delete() && dowarn) {
- System.err.println(tr("Warning: failed to delete outdated plugin ''{0}''.", plugin.toString()));
- System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
+ Main.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
+ Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
continue;
}
}
@@ -984,19 +1036,19 @@ public class PluginHandler {
new JarFile(updatedPlugin).close();
} catch (Exception e) {
if (dowarn) {
- System.err.println(tr("Warning: failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}", plugin.toString(), updatedPlugin.toString(), e.getLocalizedMessage()));
+ Main.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}", plugin.toString(), updatedPlugin.toString(), e.getLocalizedMessage()));
}
continue;
}
// Install plugin
if (!updatedPlugin.renameTo(plugin) && dowarn) {
- System.err.println(tr("Warning: failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.", plugin.toString(), updatedPlugin.toString()));
- System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
+ Main.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.", plugin.toString(), updatedPlugin.toString()));
+ Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
}
}
return;
}
-
+
/**
* Determines if the specified file is a valid and accessible JAR file.
* @param jar The fil to check
@@ -1014,7 +1066,7 @@ public class PluginHandler {
}
return false;
}
-
+
/**
* Replies the updated jar file for the given plugin name.
* @param name The plugin name to find.
@@ -1034,7 +1086,7 @@ public class PluginHandler {
}
return downloadedPluginFile;
}
-
+
/**
* Refreshes the given PluginInformation objects with new contents read from their corresponding jar file.
* @param updatedPlugins The PluginInformation objects to update.
@@ -1111,7 +1163,7 @@ public class PluginHandler {
int pos = stack.length;
for (PluginProxy p : pluginList) {
String baseClass = p.getPluginInformation().className;
- baseClass = baseClass.substring(0, baseClass.lastIndexOf("."));
+ baseClass = baseClass.substring(0, baseClass.lastIndexOf('.'));
for (int elpos = 0; elpos < pos; ++elpos) {
if (stack[elpos].getClassName().startsWith(baseClass)) {
pos = elpos;
@@ -1165,31 +1217,40 @@ public class PluginHandler {
return;
}
+ /**
+ * Returns the list of loaded plugins as a {@code String} to be displayed in status report. Useful for bug reports.
+ * @return The list of loaded plugins (one plugin per line)
+ */
public static String getBugReportText() {
- String text = "";
+ StringBuilder text = new StringBuilder();
LinkedList <String> pl = new LinkedList<String>(Main.pref.getCollection("plugins", new LinkedList<String>()));
for (final PluginProxy pp : pluginList) {
PluginInformation pi = pp.getPluginInformation();
pl.remove(pi.name);
- pl.add(pi.name + " (" + (pi.localversion != null && !pi.localversion.equals("")
+ pl.add(pi.name + " (" + (pi.localversion != null && !pi.localversion.isEmpty()
? pi.localversion : "unknown") + ")");
}
Collections.sort(pl);
for (String s : pl) {
- text += "Plugin: " + s + "\n";
+ text.append("Plugin: ").append(s).append("\n");
}
- return text;
+ return text.toString();
}
+ /**
+ * Returns the list of loaded plugins as a {@code JPanel} to be displayed in About dialog.
+ * @return The list of loaded plugins (one "line" of Swing components per plugin)
+ */
public static JPanel getInfoPanel() {
JPanel pluginTab = new JPanel(new GridBagLayout());
for (final PluginProxy p : pluginList) {
final PluginInformation info = p.getPluginInformation();
String name = info.name
- + (info.version != null && !info.version.equals("") ? " Version: " + info.version : "");
+ + (info.version != null && !info.version.isEmpty() ? " Version: " + info.version : "");
pluginTab.add(new JLabel(name), GBC.std());
pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
pluginTab.add(new JButton(new AbstractAction(tr("Information")) {
+ @Override
public void actionPerformed(ActionEvent event) {
StringBuilder b = new StringBuilder();
for (Entry<String, String> e : info.attr.entrySet()) {
@@ -1198,7 +1259,7 @@ public class PluginHandler {
b.append(e.getValue());
b.append("\n");
}
- JTextArea a = new JTextArea(10, 40);
+ JosmTextArea a = new JosmTextArea(10, 40);
a.setEditable(false);
a.setText(b.toString());
a.setCaretPosition(0);
@@ -1207,7 +1268,7 @@ public class PluginHandler {
}
}), GBC.eol());
- JTextArea description = new JTextArea((info.description == null ? tr("no description available")
+ JosmTextArea description = new JosmTextArea((info.description == null ? tr("no description available")
: info.description));
description.setEditable(false);
description.setFont(new JLabel().getFont().deriveFont(Font.ITALIC));
diff --git a/src/org/openstreetmap/josm/plugins/PluginInformation.java b/src/org/openstreetmap/josm/plugins/PluginInformation.java
index 9b17066..6510425 100644
--- a/src/org/openstreetmap/josm/plugins/PluginInformation.java
+++ b/src/org/openstreetmap/josm/plugins/PluginInformation.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -22,12 +22,14 @@ import java.util.TreeMap;
import java.util.jar.Attributes;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
+
import javax.swing.ImageIcon;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.Utils;
/**
* Encapsulate general information about a plugin. This information is available
@@ -56,7 +58,7 @@ public class PluginInformation {
public ImageIcon icon;
public List<URL> libraries = new LinkedList<URL>();
public final Map<String, String> attr = new TreeMap<String, String>();
-
+
private static final ImageIcon emptyIcon = new ImageIcon(new BufferedImage(24, 24, BufferedImage.TYPE_INT_ARGB));
/**
@@ -99,16 +101,8 @@ public class PluginInformation {
} catch (IOException e) {
throw new PluginException(name, e);
} finally {
- if (jar != null) {
- try {
- jar.close();
- } catch(IOException e) { /* ignore */ }
- }
- if (fis != null) {
- try {
- fis.close();
- } catch(IOException e) { /* ignore */ }
- }
+ Utils.close(jar);
+ Utils.close(fis);
}
}
@@ -160,7 +154,7 @@ public class PluginInformation {
this.attr.clear();
this.attr.putAll(other.attr);
}
-
+
/**
* Updates the plugin information of this plugin information object with the
* plugin information in a plugin information object retrieved from a plugin
@@ -179,7 +173,7 @@ public class PluginInformation {
this.libraries = other.libraries;
this.stage = other.stage;
}
-
+
private void scanManifest(Manifest manifest, boolean oldcheck){
String lang = LanguageInfo.getLanguageCodeManifest();
Attributes attr = manifest.getMainAttributes();
@@ -190,9 +184,9 @@ public class PluginInformation {
}
if(s != null) {
try {
- URL url = new URL(s);
+ new URL(s);
} catch (MalformedURLException e) {
- System.out.println(tr("Invalid URL ''{0}'' in plugin {1}", s, name));
+ Main.info(tr("Invalid URL ''{0}'' in plugin {1}", s, name));
s = null;
}
}
@@ -206,7 +200,7 @@ public class PluginInformation {
try {
s = tr(s);
} catch (IllegalArgumentException e) {
- System.out.println(tr("Invalid plugin description ''{0}'' in plugin {1}", s, name));
+ Main.info(tr("Invalid plugin description ''{0}'' in plugin {1}", s, name));
}
}
}
@@ -215,8 +209,11 @@ public class PluginInformation {
String stageStr = attr.getValue("Plugin-Stage");
stage = stageStr == null ? 50 : Integer.parseInt(stageStr);
version = attr.getValue("Plugin-Version");
- try { mainversion = Integer.parseInt(attr.getValue("Plugin-Mainversion")); }
- catch(NumberFormatException e) {}
+ try {
+ mainversion = Integer.parseInt(attr.getValue("Plugin-Mainversion"));
+ } catch(NumberFormatException e) {
+ Main.warn(e);
+ }
author = attr.getValue("Author");
iconPath = attr.getValue("Plugin-Icon");
if (iconPath != null && file != null) {
@@ -236,7 +233,7 @@ public class PluginInformation {
if(mv <= myv && (mv > mainversion || mainversion > myv))
{
String v = (String)entry.getValue();
- int i = v.indexOf(";");
+ int i = v.indexOf(';');
if(i > 0)
{
downloadlink = v.substring(i+1);
@@ -293,7 +290,7 @@ public class PluginInformation {
/**
* Load and instantiate the plugin
*
- * @param the plugin class
+ * @param klass the plugin class
* @return the instantiated and initialized plugin
*/
public PluginProxy load(Class<?> klass) throws PluginException{
@@ -448,7 +445,7 @@ public class PluginInformation {
*/
public boolean matches(String filter) {
if (filter == null) return true;
- String words[] = filter.split("\\s+");
+ String[] words = filter.split("\\s+");
for (String word: words) {
if (matches(word, name)
|| matches(word, description)
@@ -501,28 +498,28 @@ public class PluginInformation {
}
return requiredPlugins;
}
-
+
/**
- * Replies the list of plugins required by the up-to-date version of this plugin.
+ * Replies the list of plugins required by the up-to-date version of this plugin.
* @return List of plugins required. Empty if no plugin is required.
* @since 5601
*/
public List<String> getRequiredPlugins() {
return getRequiredPlugins(requires);
}
-
+
/**
- * Replies the list of plugins required by the local instance of this plugin.
+ * Replies the list of plugins required by the local instance of this plugin.
* @return List of plugins required. Empty if no plugin is required.
* @since 5601
*/
public List<String> getLocalRequiredPlugins() {
return getRequiredPlugins(localrequires);
}
-
+
/**
- * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires})
- * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires})
+ * Updates the local fields ({@link #localversion}, {@link #localmainversion}, {@link #localrequires})
+ * to values contained in the up-to-date fields ({@link #version}, {@link #mainversion}, {@link #requires})
* of the given PluginInformation.
* @param info The plugin information to get the data from.
* @since 5601
diff --git a/src/org/openstreetmap/josm/plugins/PluginListParser.java b/src/org/openstreetmap/josm/plugins/PluginListParser.java
index ecf1043..e1a975e 100644
--- a/src/org/openstreetmap/josm/plugins/PluginListParser.java
+++ b/src/org/openstreetmap/josm/plugins/PluginListParser.java
@@ -37,7 +37,7 @@ public class PluginListParser {
new ByteArrayInputStream(manifest.getBytes("utf-8")),
name.substring(0, name.length() - 4),
url
- );
+ );
} catch(UnsupportedEncodingException e) {
throw new PluginListParseException(tr("Failed to create plugin information from manifest for plugin ''{0}''", name), e);
} catch (PluginException e) {
@@ -64,15 +64,6 @@ public class PluginListParser {
String name = null;
String url = null;
StringBuilder manifest = new StringBuilder();
- /*
- code structure:
- for () {
- A;
- B;
- C;
- }
- B;
- */
for (String line = r.readLine(); line != null; line = r.readLine()) {
if (line.startsWith("\t")) {
line = line.substring(1);
@@ -84,9 +75,9 @@ public class PluginListParser {
continue;
}
addPluginInformation(ret, name, url, manifest.toString());
- String x[] = line.split(";");
+ String[] x = line.split(";");
if(x.length != 2)
- throw new IOException(tr("Illegal entry in plugin list."));
+ throw new IOException(tr("Illegal entry in plugin list."));
name = x[0];
url = x[1];
manifest = new StringBuilder();
@@ -102,7 +93,7 @@ public class PluginListParser {
private static void addPluginInformation(List<PluginInformation> ret, String name, String url, String manifest) {
try {
if (name != null) {
- PluginInformation info = createInfo(name, url, manifest.toString());
+ PluginInformation info = createInfo(name, url, manifest);
if (info != null) {
for (PluginProxy plugin : PluginHandler.pluginList) {
if (plugin.getPluginInformation().name.equals(info.getName())) {
diff --git a/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java b/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java
index 624e651..4b92b9a 100644
--- a/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java
+++ b/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java
@@ -12,6 +12,7 @@ public class PluginPreferenceFactory implements PreferenceSettingFactory {
this.plugin = plugin;
}
+ @Override
public PreferenceSetting createPreferenceSetting() {
return plugin.getPreferenceSetting();
}
diff --git a/src/org/openstreetmap/josm/plugins/PluginProxy.java b/src/org/openstreetmap/josm/plugins/PluginProxy.java
index 9d2e094..cdb0fe5 100644
--- a/src/org/openstreetmap/josm/plugins/PluginProxy.java
+++ b/src/org/openstreetmap/josm/plugins/PluginProxy.java
@@ -1,8 +1,9 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.plugins;
import java.util.List;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.download.DownloadSelection;
import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -28,6 +29,7 @@ public class PluginProxy extends Plugin {
try {
plugin.getClass().getMethod("mapFrameInitialized", MapFrame.class, MapFrame.class).invoke(plugin, oldFrame, newFrame);
} catch (NoSuchMethodException e) {
+ Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
} catch (Exception e) {
BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
}
@@ -37,6 +39,7 @@ public class PluginProxy extends Plugin {
try {
return (PreferenceSetting)plugin.getClass().getMethod("getPreferenceSetting").invoke(plugin);
} catch (NoSuchMethodException e) {
+ Main.debug("Plugin "+plugin+" does not define getPreferenceSetting");
return null;
} catch (Exception e) {
BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
@@ -48,7 +51,7 @@ public class PluginProxy extends Plugin {
try {
plugin.getClass().getMethod("addDownloadSelection", List.class).invoke(plugin, list);
} catch (NoSuchMethodException e) {
- // ignore
+ Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
} catch (Exception e) {
BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
}
diff --git a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
index 735e328..e69648c 100644
--- a/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
+++ b/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java
@@ -13,6 +13,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.OsmTransferException;
@@ -24,7 +25,7 @@ import org.xml.sax.SAXException;
* This is an asynchronous task for reading plugin information from the files
* in the local plugin repositories.
*
- * It scans the files in the local plugins repository (see {@link Preferences#getPluginsDirectory()}
+ * It scans the files in the local plugins repository (see {@link org.openstreetmap.josm.data.Preferences#getPluginsDirectory()}
* and extracts plugin information from three kind of files:
* <ul>
* <li>.jar files, assuming that they represent plugin jars</li>
@@ -73,6 +74,7 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
protected void scanSiteCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
File[] siteCacheFiles = pluginsDirectory.listFiles(
new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return name.matches("^([0-9]+-)?site.*\\.txt$");
}
@@ -88,7 +90,7 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
try {
processLocalPluginInformationFile(f);
} catch(PluginListParseException e) {
- System.err.println(tr("Warning: Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
+ Main.warn(tr("Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
e.printStackTrace();
}
monitor.worked(1);
@@ -98,6 +100,7 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
protected void scanIconCacheFiles(ProgressMonitor monitor, File pluginsDirectory) {
File[] siteCacheFiles = pluginsDirectory.listFiles(
new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return name.matches("^([0-9]+-)?site.*plugin-icons\\.zip$");
}
@@ -126,6 +129,7 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
protected void scanPluginFiles(ProgressMonitor monitor, File pluginsDirectory) {
File[] pluginFiles = pluginsDirectory.listFiles(
new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return name.endsWith(".jar") || name.endsWith(".jar.new");
}
@@ -147,8 +151,8 @@ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
processJarFile(f, pluginName);
}
} catch (PluginException e){
- System.err.println(e.getMessage());
- System.err.println(tr("Warning: Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
+ Main.warn("PluginException: "+e.getMessage());
+ Main.warn(tr("Failed to scan file ''{0}'' for plugin information. Skipping.", fname));
}
monitor.worked(1);
}
diff --git a/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java b/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
index c8443ff..00acde0 100644
--- a/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
+++ b/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
@@ -3,6 +3,8 @@ package org.openstreetmap.josm.plugins;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -26,22 +28,28 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Version;
import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
/**
- * An asynchronous task for downloading plugin lists from the configured plugin download
- * sites.
- *
+ * An asynchronous task for downloading plugin lists from the configured plugin download sites.
+ * @since 2817
*/
-public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
+public class ReadRemotePluginInformationTask extends PleaseWaitRunnable {
private Collection<String> sites;
private boolean canceled;
@@ -143,9 +151,9 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
* @param monitor a progress monitor
* @return the downloaded list
*/
- protected String downloadPluginList(String site, ProgressMonitor monitor) {
+ protected String downloadPluginList(String site, final ProgressMonitor monitor) {
BufferedReader in = null;
- StringBuilder sb = new StringBuilder();
+ String line;
try {
/* replace %<x> with empty string or x=plugins (separated with comma) */
String pl = Utils.join(",", Main.pref.getCollection("plugins"));
@@ -166,18 +174,18 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
connection.setRequestProperty("Accept-Charset", "utf-8");
}
in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
- String line;
- while((line = in.readLine()) != null) {
+ StringBuilder sb = new StringBuilder();
+ while ((line = in.readLine()) != null) {
sb.append(line).append("\n");
}
return sb.toString();
- } catch(MalformedURLException e) {
+ } catch (MalformedURLException e) {
if (canceled) return null;
e.printStackTrace();
return null;
- } catch(IOException e) {
+ } catch (IOException e) {
if (canceled) return null;
- e.printStackTrace();
+ handleIOException(monitor, e, tr("Plugin list download error"), tr("JOSM failed to download plugin list:"));
return null;
} finally {
synchronized(this) {
@@ -190,6 +198,52 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
monitor.finishTask();
}
}
+
+ private void handleIOException(final ProgressMonitor monitor, IOException e, final String title, String firstMessage) {
+ InputStream errStream = connection.getErrorStream();
+ StringBuilder sb = new StringBuilder();
+ if (errStream != null) {
+ BufferedReader err = null;
+ try {
+ String line;
+ err = new BufferedReader(new InputStreamReader(errStream, "UTF-8"));
+ while ((line = err.readLine()) != null) {
+ sb.append(line).append("\n");
+ }
+ } catch (Exception ex) {
+ Main.error(e);
+ Main.error(ex);
+ } finally {
+ Utils.close(err);
+ }
+ }
+ final String msg = e.getMessage();
+ final String details = sb.toString();
+ Main.error(details.isEmpty() ? msg : msg + " - Details:\n" + details);
+
+ GuiHelper.runInEDTAndWait(new Runnable() {
+ @Override public void run() {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(new JLabel(tr("JOSM failed to download plugin list:")), GBC.eol().insets(0, 0, 0, 10));
+ StringBuilder b = new StringBuilder();
+ for (String part : msg.split("(?<=\\G.{200})")) {
+ b.append(part).append("\n");
+ }
+ panel.add(new JLabel("<html><body width=\"500\"><b>"+b.toString().trim()+"</b></body></html>"), GBC.eol().insets(0, 0, 0, 10));
+ if (!details.isEmpty()) {
+ panel.add(new JLabel(tr("Details:")), GBC.eol().insets(0, 0, 0, 10));
+ JosmTextArea area = new JosmTextArea(details);
+ area.setEditable(false);
+ area.setLineWrap(true);
+ area.setWrapStyleWord(true);
+ JScrollPane scrollPane = new JScrollPane(area);
+ scrollPane.setPreferredSize(new Dimension(500, 300));
+ panel.add(scrollPane, GBC.eol().fill());
+ }
+ JOptionPane.showMessageDialog(monitor.getWindowParent(), panel, title, JOptionPane.ERROR_MESSAGE);
+ }
+ });
+ }
/**
* Downloads the icon archive from a remote location
@@ -217,17 +271,16 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
out.write(buffer, 0, read);
}
- out.close();
- in.close();
- } catch(MalformedURLException e) {
+ } catch (MalformedURLException e) {
if (canceled) return;
e.printStackTrace();
return;
- } catch(IOException e) {
+ } catch (IOException e) {
if (canceled) return;
- e.printStackTrace();
+ handleIOException(monitor, e, tr("Plugin icons download error"), tr("JOSM failed to download plugin icons:"));
return;
} finally {
+ Utils.close(out);
synchronized(this) {
if (connection != null) {
connection.disconnect();
@@ -260,7 +313,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
File pluginDir = Main.pref.getPluginsDirectory();
if (!pluginDir.exists()) {
if (! pluginDir.mkdirs()) {
- System.err.println(tr("Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
+ Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
}
}
File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);
@@ -273,7 +326,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
} finally {
if (writer != null) {
writer.flush();
- writer.close();
+ Utils.close(writer);
}
}
}
@@ -312,11 +365,11 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
InputStream in = new ByteArrayInputStream(doc.getBytes("UTF-8"));
List<PluginInformation> pis = new PluginListParser().parse(in);
availablePlugins.addAll(filterDeprecatedPlugins(pis));
- } catch(UnsupportedEncodingException e) {
- System.err.println(tr("Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));
+ } catch (UnsupportedEncodingException e) {
+ Main.error(tr("Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));
e.printStackTrace();
- } catch(PluginListParseException e) {
- System.err.println(tr("Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));
+ } catch (PluginListParseException e) {
+ Main.error(tr("Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));
e.printStackTrace();
}
}
@@ -332,6 +385,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
for (String location : PluginInformation.getPluginLocations()) {
File [] f = new File(location).listFiles(
new FilenameFilter() {
+ @Override
public boolean accept(File dir, String name) {
return name.matches("^([0-9]+-)?site.*\\.txt$") ||
name.matches("^([0-9]+-)?site.*-icons\\.zip$");
@@ -371,7 +425,7 @@ public class ReadRemotePluginInformationTask extends PleaseWaitRunnable{
/**
* Replies true if the task was canceled
- * @return
+ * @return <code>true</code> if the task was stopped by the user
*/
public boolean isCanceled() {
return canceled;
diff --git a/src/org/openstreetmap/josm/tools/AlphanumComparator.java b/src/org/openstreetmap/josm/tools/AlphanumComparator.java
index b286879..c9fa90a 100644
--- a/src/org/openstreetmap/josm/tools/AlphanumComparator.java
+++ b/src/org/openstreetmap/josm/tools/AlphanumComparator.java
@@ -22,7 +22,9 @@ package org.openstreetmap.josm.tools;
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+import java.text.Collator;
import java.util.Comparator;
+import java.util.Locale;
/**
* The Alphanum Algorithm is an improved sorting algorithm for strings
@@ -30,9 +32,9 @@ import java.util.Comparator;
* sort, this algorithm sorts numbers in numeric order.
*
* The Alphanum Algorithm is discussed at http://www.DaveKoelle.com
- *
+ *
* This is an updated version with enhancements made by Daniel Migowski, Andre
- * Bogus, and David Koelle.
+ * Bogus, and David Koelle and others.
*
*/
public class AlphanumComparator implements Comparator<String> {
@@ -106,7 +108,11 @@ public class AlphanumComparator implements Comparator<String> {
}
}
} else {
- result = thisChunk.compareTo(thatChunk);
+ // Instantiate the collator
+ Collator compareOperator = Collator.getInstance(Locale.getDefault());
+ // Compare regardless of accented letters
+ compareOperator.setStrength(Collator.SECONDARY);
+ result = compareOperator.compare(thisChunk, thatChunk);
}
if (result != 0) {
diff --git a/src/org/openstreetmap/josm/tools/AudioPlayer.java b/src/org/openstreetmap/josm/tools/AudioPlayer.java
index 14a0367..602bc4e 100644
--- a/src/org/openstreetmap/josm/tools/AudioPlayer.java
+++ b/src/org/openstreetmap/josm/tools/AudioPlayer.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2008 by David Earl and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -19,9 +19,9 @@ import org.openstreetmap.josm.Main;
* Creates and controls a separate audio player thread.
*
* @author David Earl <david at frankieandshadow.com>
- *
+ * @since 547
*/
-public class AudioPlayer extends Thread {
+public final class AudioPlayer extends Thread {
private static AudioPlayer audioPlayer = null;
@@ -103,7 +103,7 @@ public class AudioPlayer extends Thread {
* Plays a WAV audio file from the beginning. See also the variant which doesn't
* start at the beginning of the stream
* @param url The resource to play, which must be a WAV file or stream
- * @throws audio fault exception, e.g. can't open stream, unhandleable audio format
+ * @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void play(URL url) throws Exception {
AudioPlayer.get().command.play(url, 0.0, 1.0);
@@ -113,7 +113,7 @@ public class AudioPlayer extends Thread {
* Plays a WAV audio file from a specified position.
* @param url The resource to play, which must be a WAV file or stream
* @param seconds The number of seconds into the audio to start playing
- * @throws audio fault exception, e.g. can't open stream, unhandleable audio format
+ * @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void play(URL url, double seconds) throws Exception {
AudioPlayer.get().command.play(url, seconds, 1.0);
@@ -124,7 +124,7 @@ public class AudioPlayer extends Thread {
* @param url The resource to play, which must be a WAV file or stream
* @param seconds The number of seconds into the audio to start playing
* @param speed Rate at which audio playes (1.0 = real time, > 1 is faster)
- * @throws audio fault exception, e.g. can't open stream, unhandleable audio format
+ * @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void play(URL url, double seconds, double speed) throws Exception {
AudioPlayer.get().command.play(url, seconds, speed);
@@ -132,7 +132,7 @@ public class AudioPlayer extends Thread {
/**
* Pauses the currently playing audio stream. Does nothing if nothing playing.
- * @throws audio fault exception, e.g. can't open stream, unhandleable audio format
+ * @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
public static void pause() throws Exception {
AudioPlayer.get().command.pause();
@@ -193,12 +193,16 @@ public class AudioPlayer extends Thread {
}
}
+ /**
+ * Resets the audio player.
+ */
public static void reset() {
- if(audioPlayer != null)
- {
+ if(audioPlayer != null) {
try {
pause();
- } catch(Exception e) {}
+ } catch(Exception e) {
+ Main.warn(e);
+ }
audioPlayer.playingUrl = null;
}
}
@@ -207,8 +211,8 @@ public class AudioPlayer extends Thread {
state = State.INITIALIZING;
command = new Execute();
playingUrl = null;
- leadIn = Main.pref.getDouble("audio.leadin", "1.0" /* default, seconds */);
- calibration = Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */);
+ leadIn = Main.pref.getDouble("audio.leadin", 1.0 /* default, seconds */);
+ calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
start();
while (state == State.INITIALIZING) { yield(); }
}
@@ -252,7 +256,7 @@ public class AudioPlayer extends Thread {
audioOutputLine.drain();
audioOutputLine.close();
audioOutputLine = null;
- audioInputStream.close();
+ Utils.close(audioInputStream);
audioInputStream = null;
playingUrl = null;
state = State.NOTPLAYING;
@@ -273,7 +277,7 @@ public class AudioPlayer extends Thread {
offset != 0.0)
{
if (audioInputStream != null) {
- audioInputStream.close();
+ Utils.close(audioInputStream);
audioInputStream = null;
}
playingUrl = command.url();
@@ -301,8 +305,14 @@ public class AudioPlayer extends Thread {
throw new IOException(tr("This is after the end of the recording"));
bytesToSkip -= nBytesRead;
}
- if (bytesToSkip > 0) {
- audioInputStream.skip(bytesToSkip);
+ while (bytesToSkip > 0) {
+ long skippedBytes = audioInputStream.skip(bytesToSkip);
+ bytesToSkip -= skippedBytes;
+ if (skippedBytes == 0) {
+ // Avoid inifinite loop
+ Main.warn("Unable to skip bytes from audio input stream");
+ bytesToSkip = 0;
+ }
}
position = offset;
}
@@ -337,6 +347,10 @@ public class AudioPlayer extends Thread {
}
}
+ /**
+ * Shows a popup audio error message for the given exception.
+ * @param ex The exception used as error reason. Cannot be {@code null}.
+ */
public static void audioMalfunction(Exception ex) {
String msg = ex.getMessage();
if(msg == null)
diff --git a/src/org/openstreetmap/josm/tools/AudioUtil.java b/src/org/openstreetmap/josm/tools/AudioUtil.java
index 7a62c77..75b360c 100644
--- a/src/org/openstreetmap/josm/tools/AudioUtil.java
+++ b/src/org/openstreetmap/josm/tools/AudioUtil.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2009 by David Earl and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.io.File;
@@ -11,12 +11,22 @@ import javax.sound.sampled.AudioSystem;
import org.openstreetmap.josm.Main;
/**
- * Returns calibrated length of recording in seconds.
+ * Utils functions for audio.
*
* @author David Earl <david at frankieandshadow.com>
- *
+ * @since 1462
*/
-public class AudioUtil {
+public final class AudioUtil {
+
+ private AudioUtil() {
+ // Hide default constructor for utils classes
+ }
+
+ /**
+ * Returns calibrated length of recording in seconds.
+ * @param wavFile the recording file (WAV format)
+ * @return the calibrated length of recording in seconds.
+ */
static public double getCalibratedDuration(File wavFile) {
try {
AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(
@@ -26,8 +36,8 @@ public class AudioUtil {
double bytesPerSecond = audioFormat.getFrameRate() /* frames per second */
* audioFormat.getFrameSize() /* bytes per frame */;
double naturalLength = filesize / bytesPerSecond;
- audioInputStream.close();
- double calibration = Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */);
+ Utils.close(audioInputStream);
+ double calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
return naturalLength / calibration;
} catch (Exception e) {
return 0.0;
diff --git a/src/org/openstreetmap/josm/tools/Base64.java b/src/org/openstreetmap/josm/tools/Base64.java
index 7cf96ce..6bedbf0 100644
--- a/src/org/openstreetmap/josm/tools/Base64.java
+++ b/src/org/openstreetmap/josm/tools/Base64.java
@@ -1,10 +1,14 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.nio.ByteBuffer;
-public class Base64 {
+public final class Base64 {
+ private Base64() {
+ // Hide default constructor for utils classes
+ }
+
private static String encDefault = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
private static String encUrlSafe = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
diff --git a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
index e14cc42..1b6d029 100644
--- a/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ b/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
@@ -1,27 +1,31 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.awt.GridBagLayout;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
import java.nio.ByteBuffer;
+import java.util.zip.GZIPOutputStream;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ShowStatusReportAction;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.plugins.PluginHandler;
/**
@@ -35,15 +39,24 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
private static int exceptionCounter = 0;
private static boolean suppressExceptionDialogs = false;
+ @Override
public void uncaughtException(Thread t, Throwable e) {
handleException(e);
}
//http://stuffthathappens.com/blog/2007/10/15/one-more-note-on-uncaught-exception-handlers/
+ /**
+ * Handles the given throwable object
+ * @param t The throwable object
+ */
public void handle(Throwable t) {
handleException(t);
}
+ /**
+ * Handles the given exception
+ * @param e the exception
+ */
public static void handleException(final Throwable e) {
if (handlingInProgress)
return; // we do not handle secondary exceptions, this gets too messy
@@ -110,7 +123,7 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
if(urltext.length() > maxlen)
{
urltext = urltext.substring(0,maxlen);
- int idx = urltext.lastIndexOf("\n");
+ int idx = urltext.lastIndexOf('\n');
/* cut whole line when not loosing too much */
if(maxlen-idx < 200) {
urltext = urltext.substring(0,idx+1);
@@ -118,18 +131,15 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
urltext += "...<snip>...\n";
}
- URL url = new URL("http://josm.openstreetmap.de/josmticket?" +
- "tdata="+Base64.encode(ByteBuffer.wrap(urltext.getBytes("UTF8")), true));
-
JPanel p = new JPanel(new GridBagLayout());
p.add(new JMultilineLabel(
tr("You have encountered an error in JOSM. Before you file a bug report " +
"make sure you have updated to the latest version of JOSM here:")), GBC.eol());
- p.add(new UrlLabel("http://josm.openstreetmap.de/#Download",2), GBC.eop().insets(8,0,0,0));
+ p.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eop().insets(8,0,0,0));
p.add(new JMultilineLabel(
tr("You should also update your plugins. If neither of those help please " +
"file a bug report in our bugtracker using this link:")), GBC.eol());
- p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...",2), GBC.eop().insets(8,0,0,0));
+ p.add(getBugReportUrlLabel(urltext), GBC.eop().insets(8,0,0,0));
p.add(new JMultilineLabel(
tr("There the error information provided below should already be " +
"filled in for you. Please include information on how to reproduce " +
@@ -137,12 +147,12 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
p.add(new JMultilineLabel(
tr("Alternatively, if that does not work you can manually fill in the information " +
"below at this URL:")), GBC.eol());
- p.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eop().insets(8,0,0,0));
+ p.add(new UrlLabel(Main.JOSM_WEBSITE+"/newticket",2), GBC.eop().insets(8,0,0,0));
if (Utils.copyToClipboard(text)) {
p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());
}
- JTextArea info = new JTextArea(text, 18, 60);
+ JosmTextArea info = new JosmTextArea(text, 18, 60);
info.setCaretPosition(0);
info.setEditable(false);
p.add(new JScrollPane(info), GBC.eop());
@@ -164,7 +174,47 @@ public final class BugReportExceptionHandler implements Thread.UncaughtException
handlingInProgress = false;
}
}
+
+ /**
+ * Determines if an exception is currently being handled
+ * @return {@code true} if an exception is currently being handled, {@code false} otherwise
+ */
public static boolean exceptionHandlingInProgress() {
return handlingInProgress;
}
+
+ /**
+ * Replies the URL to create a JOSM bug report with the given debug text
+ * @param debugText The debug text to provide us
+ * @return The URL to create a JOSM bug report with the given debug text
+ * @since 5849
+ */
+ public static URL getBugReportUrl(String debugText) {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ GZIPOutputStream gzip = new GZIPOutputStream(out);
+ gzip.write(debugText.getBytes("UTF-8"));
+ Utils.close(gzip);
+
+ return new URL(Main.JOSM_WEBSITE+"/josmticket?" +
+ "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ /**
+ * Replies the URL label to create a JOSM bug report with the given debug text
+ * @param debugText The debug text to provide us
+ * @return The URL label to create a JOSM bug report with the given debug text
+ * @since 5849
+ */
+ public static final UrlLabel getBugReportUrlLabel(String debugText) {
+ URL url = getBugReportUrl(debugText);
+ if (url != null) {
+ return new UrlLabel(url.toString(), Main.JOSM_WEBSITE+"/josmticket?...", 2);
+ }
+ return null;
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/CheckParameterUtil.java b/src/org/openstreetmap/josm/tools/CheckParameterUtil.java
index 2f3879e..05bd837 100644
--- a/src/org/openstreetmap/josm/tools/CheckParameterUtil.java
+++ b/src/org/openstreetmap/josm/tools/CheckParameterUtil.java
@@ -3,38 +3,89 @@ package org.openstreetmap.josm.tools;
import java.text.MessageFormat;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveId;
/**
* This utility class provides a collection of static helper methods for checking
* parameters at run-time.
- *
+ * @since 2711
*/
-public class CheckParameterUtil {
+public final class CheckParameterUtil {
- private CheckParameterUtil(){}
+ private CheckParameterUtil() {
+ // Hide default constructor for utils classes
+ }
+ /**
+ * Ensures an OSM primitive ID is valid
+ * @param id The id to check
+ * @param parameterName The parameter name
+ * @throws IllegalArgumentException if the primitive ID is not valid (negative or zero)
+ */
public static void ensureValidPrimitiveId(PrimitiveId id, String parameterName) throws IllegalArgumentException {
ensureParameterNotNull(id, parameterName);
if (id.getUniqueId() <= 0)
throw new IllegalArgumentException(MessageFormat.format("Expected unique id > 0 for primitive ''{1}'', got {0}", id.getUniqueId(), parameterName));
}
+ /**
+ * Ensures lat/lon coordinates are valid
+ * @param latlon The lat/lon to check
+ * @param parameterName The parameter name
+ * @throws IllegalArgumentException if the lat/lon are {@code null} or not valid
+ * @since 5980
+ */
+ public static void ensureValidCoordinates(LatLon latlon, String parameterName) throws IllegalArgumentException {
+ ensureParameterNotNull(latlon, parameterName);
+ if (!latlon.isValid())
+ throw new IllegalArgumentException(MessageFormat.format("Expected valid lat/lon for parameter ''{0}'', got {1}", parameterName, latlon));
+ }
+
+ /**
+ * Ensures east/north coordinates are valid
+ * @param eastnorth The east/north to check
+ * @param parameterName The parameter name
+ * @throws IllegalArgumentException if the east/north are {@code null} or not valid
+ * @since 5980
+ */
+ public static void ensureValidCoordinates(EastNorth eastnorth, String parameterName) throws IllegalArgumentException {
+ ensureParameterNotNull(eastnorth, parameterName);
+ if (!eastnorth.isValid())
+ throw new IllegalArgumentException(MessageFormat.format("Expected valid east/north for parameter ''{0}'', got {1}", parameterName, eastnorth));
+ }
+
+ /**
+ * Ensures a version number is valid
+ * @param version The version to check
+ * @param parameterName The parameter name
+ * @throws IllegalArgumentException if the version is not valid (negative)
+ */
public static void ensureValidVersion(long version, String parameterName) throws IllegalArgumentException {
if (version < 0)
throw new IllegalArgumentException(MessageFormat.format("Expected value of type long > 0 for parameter ''{0}'', got {1}", parameterName, version));
}
- public static void ensureParameterNotNull(Object value, String parameterName) {
+ /**
+ * Ensures a parameter is not {@code null}
+ * @param value The parameter to check
+ * @param parameterName The parameter name
+ * @throws IllegalArgumentException if the parameter is {@code null}
+ */
+ public static void ensureParameterNotNull(Object value, String parameterName) throws IllegalArgumentException {
if (value == null)
throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' must not be null", parameterName));
}
/**
- * can find line number in the stack trace, so parameter name is optional
+ * Ensures a parameter is not {@code null}. Can find line number in the stack trace, so parameter name is optional
+ * @param value The parameter to check
+ * @throws IllegalArgumentException if the parameter is {@code null}
+ * @since 3871
*/
- public static void ensureParameterNotNull(Object value) {
+ public static void ensureParameterNotNull(Object value) throws IllegalArgumentException {
if (value == null)
throw new IllegalArgumentException("Parameter must not be null");
}
diff --git a/src/org/openstreetmap/josm/tools/ColorHelper.java b/src/org/openstreetmap/josm/tools/ColorHelper.java
index 01a3d23..062612a 100644
--- a/src/org/openstreetmap/josm/tools/ColorHelper.java
+++ b/src/org/openstreetmap/josm/tools/ColorHelper.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.awt.Color;
@@ -6,8 +6,12 @@ import java.awt.Color;
/**
* Helper to convert from color to html string and back
*/
-public class ColorHelper {
+public final class ColorHelper {
+ private ColorHelper() {
+ // Hide default constructor for utils classes
+ }
+
public static Color html2color(String html) {
if (html.length() > 0 && html.charAt(0) == '#')
html = html.substring(1);
diff --git a/src/org/openstreetmap/josm/tools/CopyList.java b/src/org/openstreetmap/josm/tools/CopyList.java
index b42f3e4..136b7d4 100644
--- a/src/org/openstreetmap/josm/tools/CopyList.java
+++ b/src/org/openstreetmap/josm/tools/CopyList.java
@@ -1,23 +1,4 @@
-/*
- * JOSMng - a Java Open Street Map editor, the next generation.
- *
- * Copyright (C) 2008 Petr Nejedly <P.Nejedly at sh.cvut.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.util.AbstractList;
@@ -55,17 +36,20 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
}
// read-only access:
- public @Override E get(int index) {
+ @Override
+ public E get(int index) {
rangeCheck(index);
return array[index];
}
- public @Override int size() {
+ @Override
+ public int size() {
return size;
}
// modification:
- public @Override E set(int index, E element) {
+ @Override
+ public E set(int index, E element) {
rangeCheck(index);
changeCheck();
@@ -75,7 +59,8 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
}
// full resizable semantics:
- public @Override void add(int index, E element) {
+ @Override
+ public void add(int index, E element) {
// range check
ensureCapacity(size+1);
changeCheck();
@@ -85,7 +70,8 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
size++;
}
- public @Override E remove(int index) {
+ @Override
+ public E remove(int index) {
rangeCheck(index);
changeCheck();
@@ -101,14 +87,16 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
}
// speed optimizations:
- public @Override boolean add(E element) {
+ @Override
+ public boolean add(E element) {
ensureCapacity(size+1);
changeCheck();
array[size++] = element;
return true;
}
- public @Override void clear() {
+ @Override
+ public void clear() {
modCount++;
// clean up the array
@@ -124,7 +112,8 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
*
* @return a clone of this <tt>CopyList</tt> instance
*/
- public @Override Object clone() {
+ @Override
+ public Object clone() {
return new CopyList<E>(array, size);
}
@@ -177,10 +166,12 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
*/
int expectedModCount = modCount;
+ @Override
public boolean hasNext() {
return cursor != size;
}
+ @Override
public E next() {
checkForComodification();
try {
@@ -193,6 +184,7 @@ public final class CopyList<E> extends AbstractList<E> implements RandomAccess,
}
}
+ @Override
public void remove() {
if (lastRet == -1)
throw new IllegalStateException();
diff --git a/src/org/openstreetmap/josm/tools/DateParser.java b/src/org/openstreetmap/josm/tools/DateParser.java
index 3ab6705..2c9c228 100644
--- a/src/org/openstreetmap/josm/tools/DateParser.java
+++ b/src/org/openstreetmap/josm/tools/DateParser.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.text.ParseException;
@@ -9,7 +9,12 @@ import java.util.Date;
*
* @author Immanuel.Scholz
*/
-public class DateParser {
+public final class DateParser {
+
+ private DateParser() {
+ // Hide default constructor for utils classes
+ }
+
public static Date parse(String d) throws ParseException {
return new PrimaryDateParser().parse(d);
}
diff --git a/src/org/openstreetmap/josm/tools/DateUtils.java b/src/org/openstreetmap/josm/tools/DateUtils.java
index 7de710c..47e937a 100644
--- a/src/org/openstreetmap/josm/tools/DateUtils.java
+++ b/src/org/openstreetmap/josm/tools/DateUtils.java
@@ -1,21 +1,4 @@
-/*
- * Copyright (C) 2008 Petr Nejedly <P.Nejedly at sh.cvut.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.text.ParsePosition;
diff --git a/src/org/openstreetmap/josm/tools/Destroyable.java b/src/org/openstreetmap/josm/tools/Destroyable.java
index 3ca9b82..b763e11 100644
--- a/src/org/openstreetmap/josm/tools/Destroyable.java
+++ b/src/org/openstreetmap/josm/tools/Destroyable.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
/**
diff --git a/src/org/openstreetmap/josm/tools/Diff.java b/src/org/openstreetmap/josm/tools/Diff.java
index f5b74ce..6060201 100644
--- a/src/org/openstreetmap/josm/tools/Diff.java
+++ b/src/org/openstreetmap/josm/tools/Diff.java
@@ -1,3 +1,4 @@
+// License: GPL.
package org.openstreetmap.josm.tools;
//// Taken from http://www.bmsi.com/java/#diff
@@ -6,6 +7,25 @@ package org.openstreetmap.josm.tools;
/*
* $Log: Diff.java,v $
+ * Revision 1.15 2013/04/01 16:27:31 stuart
+ * Fix DiffPrint unified format with test cases.
+ * Begin porting some diff-2.7 features.
+ *
+ * Revision 1.14 2010/03/03 21:21:25 stuart
+ * Test new direct equivalence API
+ *
+ * Revision 1.13 2009/12/07 17:43:17 stuart
+ * Compute equiv_max for int[] ctor
+ *
+ * Revision 1.12 2009/12/07 17:34:46 stuart
+ * Ctor with int[].
+ *
+ * Revision 1.11 2009/11/15 01:11:54 stuart
+ * Diff doesn't need to be generic
+ *
+ * Revision 1.10 2009/11/15 00:54:03 stuart
+ * Update to Java 5 containers
+ *
* Revision 1.7 2009/01/19 03:05:26 stuart
* Fix StackOverflow bug with heuristic on reported by Jimmy Han.
*
@@ -26,7 +46,8 @@ package org.openstreetmap.josm.tools;
*
*/
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
/** A class to compare vectors of objects. The result of comparison
is a list of <code>change</code> objects which form an
@@ -73,10 +94,9 @@ public class Diff {
be needed again later to print the results of the comparison as
an edit script, if desired.
*/
- public Diff(Object[] a,Object[] b) {
- Hashtable<Object, Integer> h = new Hashtable<Object, Integer>(a.length + b.length);
- filevec[0] = new file_data(a,h);
- filevec[1] = new file_data(b,h);
+ public Diff(Object[] a, Object[] b) {
+ Map<Object,Integer> h = new HashMap<Object,Integer>(a.length + b.length);
+ filevec = new FileData[] { new FileData(a,h),new FileData(b,h) };
}
/** 1 more than the maximum equivalence value used for this or its
@@ -102,7 +122,7 @@ public class Diff {
along the given diagonal in the backward
search of the edit matrix. */
private int fdiagoff, bdiagoff;
- private final file_data[] filevec = new file_data[2];
+ private final FileData[] filevec;
private int cost;
/** Snakes bigger than this are considered "big". */
private static final int SNAKE_LIMIT = 20;
@@ -251,8 +271,8 @@ public class Diff {
&& xoff + SNAKE_LIMIT <= x && x < xlim
&& yoff + SNAKE_LIMIT <= y && y < ylim)
{
- /* We have a good enough best diagonal;
- now insist that it end with a significant snake. */
+ /* We have a good enough best diagonal.
+ now insist that it end with a significant snake. */
int k;
for (k = 1; xvec[x - k] == yvec[y - k]; k++)
@@ -284,8 +304,8 @@ public class Diff {
&& xoff < x && x <= xlim - SNAKE_LIMIT
&& yoff < y && y <= ylim - SNAKE_LIMIT)
{
- /* We have a good enough best diagonal;
- now insist that it end with a significant snake. */
+ /* We have a good enough best diagonal.
+ now insist that it end with a significant snake. */
int k;
for (k = 0; xvec[x + k] == yvec[y + k]; k++)
@@ -337,29 +357,27 @@ public class Diff {
while (xoff < xlim) {
filevec[0].changed_flag[1+filevec[0].realindexes[xoff++]] = true;
}
- } else
- {
+ } else {
/* Find a point of correspondence in the middle of the files. */
int d = diag (xoff, xlim, yoff, ylim);
int c = cost;
- //int f = fdiag[fdiagoff + d];
int b = bdiag[bdiagoff + d];
if (c == 1)
/* This should be impossible, because it implies that
- one of the two subsequences is empty,
- and that case was handled above without calling `diag'.
- Let's verify that this is true. */
+ one of the two subsequences is empty,
+ and that case was handled above without calling `diag'.
+ Let's verify that this is true. */
throw new IllegalArgumentException("Empty subsequence");
else
{
/* Use that point to split this problem into two subproblems. */
compareseq (xoff, b, yoff, b - d);
/* This used to use f instead of b,
- but that is incorrect!
- It is not necessarily the case that diagonal d
- has a snake from b to f. */
+ but that is incorrect!
+ It is not necessarily the case that diagonal d
+ has a snake from b to f. */
compareseq (b, xlim, b - d, ylim);
}
}
@@ -367,7 +385,6 @@ public class Diff {
/** Discard lines from one file that have no matches in the other file.
*/
-
private void discard_confusing_lines() {
filevec[0].discard_confusing_lines(filevec[1]);
filevec[1].discard_confusing_lines(filevec[0]);
@@ -376,9 +393,8 @@ public class Diff {
private boolean inhibit = false;
/** Adjust inserts/deletes of blank lines to join changes
- as much as possible.
+ as much as possible.
*/
-
private void shift_boundaries() {
if (inhibit)
return;
@@ -388,14 +404,14 @@ public class Diff {
public interface ScriptBuilder {
/** Scan the tables of which lines are inserted and deleted,
- producing an edit script.
- @param changed0 true for lines in first file which do not match 2nd
- @param len0 number of lines in first file
- @param changed1 true for lines in 2nd file which do not match 1st
- @param len1 number of lines in 2nd file
- @return a linked list of changes - or null
+ producing an edit script.
+ @param changed0 true for lines in first file which do not match 2nd
+ @param len0 number of lines in first file
+ @param changed1 true for lines in 2nd file which do not match 1st
+ @param len1 number of lines in 2nd file
+ @return a linked list of changes - or null
*/
- public change build_script(
+ public Change build_script(
boolean[] changed0,int len0,
boolean[] changed1,int len1
);
@@ -405,11 +421,12 @@ public class Diff {
producing an edit script in reverse order. */
static class ReverseScript implements ScriptBuilder {
- public change build_script(
+ @Override
+ public Change build_script(
final boolean[] changed0,int len0,
final boolean[] changed1,int len1)
{
- change script = null;
+ Change script = null;
int i0 = 0, i1 = 0;
while (i0 < len0 || i1 < len1) {
if (changed0[1+i0] || changed1[1+i1]) {
@@ -424,7 +441,7 @@ public class Diff {
}
/* Record this change. */
- script = new change(line0, line1, i0 - line0, i1 - line1, script);
+ script = new Change(line0, line1, i0 - line0, i1 - line1, script);
}
/* We have reached lines in the two files that match each other. */
@@ -437,12 +454,13 @@ public class Diff {
static class ForwardScript implements ScriptBuilder {
/** Scan the tables of which lines are inserted and deleted,
- producing an edit script in forward order. */
- public change build_script(
+ producing an edit script in forward order. */
+ @Override
+ public Change build_script(
final boolean[] changed0,int len0,
final boolean[] changed1,int len1)
{
- change script = null;
+ Change script = null;
int i0 = len0, i1 = len1;
while (i0 >= 0 || i1 >= 0)
@@ -460,7 +478,7 @@ public class Diff {
}
/* Record this change. */
- script = new change(i0, i1, line0 - i0, line1 - i1, script);
+ script = new Change(i0, i1, line0 - i0, line1 - i1, script);
}
/* We have reached lines in the two files that match each other. */
@@ -476,9 +494,9 @@ public class Diff {
forwardScript = new ForwardScript(),
reverseScript = new ReverseScript();
- /* Report the differences of two files. DEPTH is the current directory
- depth. */
- public final change diff_2(final boolean reverse) {
+ /** Report the differences of two files. DEPTH is the current directory
+ depth. */
+ public final Change diff_2(final boolean reverse) {
return diff(reverse ? reverseScript : forwardScript);
}
@@ -490,7 +508,7 @@ public class Diff {
@param bld an object to build the script from change flags
@return the head of a list of changes
*/
- public change diff(final ScriptBuilder bld) {
+ public Change diff(final ScriptBuilder bld) {
/* Some lines are obviously insertions or deletions
because they don't match anything. Detect them now,
@@ -543,9 +561,9 @@ public class Diff {
If DELETED is 0 then LINE0 is the number of the line before
which the insertion was done; vice versa for INSERTED and LINE1. */
- public static class change {
+ public static class Change {
/** Previous or next edit command. */
- public change link;
+ public Change link;
/** # lines of file 1 changed here. */
public final int inserted;
/** # lines of file 0 changed here. */
@@ -562,32 +580,36 @@ public class Diff {
If DELETED is 0 then LINE0 is the number of the line before
which the insertion was done; vice versa for INSERTED and LINE1. */
- public change(int line0, int line1, int deleted, int inserted, change old) {
+ public Change(int line0, int line1, int deleted, int inserted, Change old) {
this.line0 = line0;
this.line1 = line1;
this.inserted = inserted;
this.deleted = deleted;
this.link = old;
- //System.err.println(line0+","+line1+","+inserted+","+deleted);
}
+
+ public String toString() {
+ String s = String.format("%d -%d +%d %d",line0,deleted,inserted,line1);
+ return (link != null) ? s = s + '\n' + link : s;
+ }
}
/** Data on one input file being compared.
*/
- class file_data {
+ class FileData {
/** Allocate changed array for the results of comparison. */
void clear() {
/* Allocate a flag for each line of each file, saying whether that line
- is an insertion or deletion.
- Allocate an extra element, always zero, at each end of each vector.
+ is an insertion or deletion.
+ Allocate an extra element, always zero, at each end of each vector.
*/
changed_flag = new boolean[buffered_lines + 2];
}
/** Return equiv_count[I] as the number of lines in this file
- that fall in equivalence class I.
+ that fall in equivalence class I.
@return the array of equivalence class counts.
*/
int[] equivCount() {
@@ -611,7 +633,7 @@ public class Diff {
so that it will be printed in the output.
@param f the other file
*/
- void discard_confusing_lines(file_data f) {
+ void discard_confusing_lines(FileData f) {
clear();
/* Set up table of which lines are going to be discarded. */
final byte[] discarded = discardable(f.equivCount());
@@ -625,14 +647,14 @@ public class Diff {
discard(discarded);
}
- /** Mark to be discarded each line that matches no line of another file.
- If a line matches many lines, mark it as provisionally discardable.
- @see equivCount()
- @param counts The count of each equivalence number for the other file.
- @return 0=nondiscardable, 1=discardable or 2=provisionally discardable
- for each line
+ /**
+ * Mark to be discarded each line that matches no line of another file.
+ * If a line matches many lines, mark it as provisionally discardable.
+ * @see #equivCount()
+ * @param counts The count of each equivalence number for the other file.
+ * @return 0=nondiscardable, 1=discardable or 2=provisionally discardable
+ * for each line
*/
-
private byte[] discardable(final int[] counts) {
final int end = buffered_lines;
final byte[] discards = new byte[end];
@@ -641,7 +663,7 @@ public class Diff {
int tem = end / 64;
/* Multiply MANY by approximate square root of number of lines.
- That is the threshold for provisionally discardable lines. */
+ That is the threshold for provisionally discardable lines. */
while ((tem = tem >> 2) > 0) {
many *= 2;
}
@@ -662,10 +684,11 @@ public class Diff {
return discards;
}
- /** Don't really discard the provisional lines except when they occur
- in a run of discardables, with nonprovisionals at the beginning
- and end. */
-
+ /**
+ * Don't really discard the provisional lines except when they occur
+ * in a run of discardables, with nonprovisionals at the beginning
+ * and end.
+ */
private void filterDiscards(final byte[] discards) {
final int end = buffered_lines;
@@ -682,7 +705,7 @@ public class Diff {
int provisional = 0;
/* Find end of this run of discardable lines.
- Count how many are provisionally discardable. */
+ Count how many are provisionally discardable. */
for (j = i; j < end; j++)
{
if (discards[j] == 0) {
@@ -699,35 +722,32 @@ public class Diff {
}
/* Now we have the length of a run of discardable lines
- whose first and last are not provisional. */
+ whose first and last are not provisional. */
length = j - i;
/* If 1/4 of the lines in the run are provisional,
- cancel discarding of all provisional lines in the run. */
- if (provisional * 4 > length)
- {
+ cancel discarding of all provisional lines in the run. */
+ if (provisional * 4 > length) {
while (j > i)
if (discards[--j] == 2) {
discards[j] = 0;
}
- }
- else
- {
+ } else {
int consec;
int minimum = 1;
int tem = length / 4;
/* MINIMUM is approximate square root of LENGTH/4.
- A subrun of two or more provisionals can stand
- when LENGTH is at least 16.
- A subrun of 4 or more can stand when LENGTH >= 64. */
+ A subrun of two or more provisionals can stand
+ when LENGTH is at least 16.
+ A subrun of 4 or more can stand when LENGTH >= 64. */
while ((tem = tem >> 2) > 0) {
minimum *= 2;
}
minimum++;
/* Cancel any subrun of MINIMUM or more provisionals
- within the larger run. */
+ within the larger run. */
for (j = 0, consec = 0; j < length; j++)
if (discards[i + j] != 2) {
consec = 0;
@@ -739,9 +759,9 @@ public class Diff {
}
/* Scan from beginning of run
- until we find 3 or more nonprovisionals in a row
- or until the first nonprovisional at least 8 lines in.
- Until that point, cancel any provisionals. */
+ until we find 3 or more nonprovisionals in a row
+ or until the first nonprovisional at least 8 lines in.
+ Until that point, cancel any provisionals. */
for (j = 0, consec = 0; j < length; j++)
{
if (j >= 8 && discards[i + j] == 1) {
@@ -787,7 +807,7 @@ public class Diff {
}
/** Actually discard the lines.
- @param discards flags lines to be discarded
+ @param discards flags lines to be discarded
*/
private void discard(final byte[] discards) {
final int end = buffered_lines;
@@ -803,17 +823,20 @@ public class Diff {
nondiscarded_lines = j;
}
- file_data(Object[] data,Hashtable<Object, Integer> h) {
- buffered_lines = data.length;
-
- equivs = new int[buffered_lines];
+ FileData(int length) {
+ buffered_lines = length;
+ equivs = new int[length];
undiscarded = new int[buffered_lines];
realindexes = new int[buffered_lines];
-
+ }
+
+ FileData(Object[] data, Map<Object,Integer> h) {
+ this(data.length);
+ // FIXME: diff 2.7 removes common prefix and common suffix
for (int i = 0; i < data.length; ++i) {
- Integer ir = (Integer)h.get(data[i]);
+ Integer ir = h.get(data[i]);
if (ir == null) {
- h.put(data[i],new Integer(equivs[i] = equiv_max++));
+ h.put(data[i],equivs[i] = equiv_max++);
} else {
equivs[i] = ir.intValue();
}
@@ -833,7 +856,7 @@ public class Diff {
@param f the file being compared against
*/
- void shift_boundaries(file_data f) {
+ void shift_boundaries(FileData f) {
final boolean[] changed = changed_flag;
final boolean[] other_changed = f.changed_flag;
int i = 0;
@@ -847,13 +870,13 @@ public class Diff {
int start, end, other_start;
/* Scan forwards to find beginning of another run of changes.
- Also keep track of the corresponding point in the other file. */
+ Also keep track of the corresponding point in the other file. */
while (i < i_end && !changed[1+i])
{
while (other_changed[1+j++]) {
/* Non-corresponding lines in the other file
- will count as the preceding batch of changes. */
+ will count as the preceding batch of changes. */
other_preceding = j;
}
i++;
@@ -876,13 +899,13 @@ public class Diff {
end = i;
/* If the first changed line matches the following unchanged one,
- and this run does not follow right after a previous run,
- and there are no lines deleted from the other file here,
- then classify the first changed line as unchanged
- and the following line as changed in its place. */
+ and this run does not follow right after a previous run,
+ and there are no lines deleted from the other file here,
+ then classify the first changed line as unchanged
+ and the following line as changed in its place. */
/* You might ask, how could this run follow right after another?
- Only because the previous run was shifted here. */
+ Only because the previous run was shifted here. */
if (end != i_end
&& equivs[start] == equivs[end]
@@ -896,8 +919,8 @@ public class Diff {
changed[1+start++] = false;
++i;
/* Since one line-that-matches is now before this run
- instead of after, we must advance in the other file
- to keep in synch. */
+ instead of after, we must advance in the other file
+ to keep in synch. */
++j;
} else {
break;
@@ -913,25 +936,24 @@ public class Diff {
final int buffered_lines;
/** Vector, indexed by line number, containing an equivalence code for
- each line. It is this vector that is actually compared with that
- of another file to generate differences. */
+ each line. It is this vector that is actually compared with that
+ of another file to generate differences. */
private final int[] equivs;
/** Vector, like the previous one except that
- the elements for discarded lines have been squeezed out. */
+ the elements for discarded lines have been squeezed out. */
final int[] undiscarded;
/** Vector mapping virtual line numbers (not counting discarded lines)
- to real ones (counting those lines). Both are origin-0. */
+ to real ones (counting those lines). Both are origin-0. */
final int[] realindexes;
/** Total number of nondiscarded lines. */
int nondiscarded_lines;
/** Array, indexed by real origin-1 line number,
- containing true for a line that is an insertion or a deletion.
- The results of comparison are stored here. */
+ containing true for a line that is an insertion or a deletion.
+ The results of comparison are stored here. */
boolean[] changed_flag;
-
}
}
diff --git a/src/org/openstreetmap/josm/tools/ExceptionUtil.java b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
index 8581d7a..a1cb90b 100644
--- a/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+++ b/src/org/openstreetmap/josm/tools/ExceptionUtil.java
@@ -36,8 +36,10 @@ import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.io.auth.CredentialsManager;
@SuppressWarnings("CallToThreadDumpStack")
-public class ExceptionUtil {
+public final class ExceptionUtil {
+
private ExceptionUtil() {
+ // Hide default constructor for utils classes
}
/**
@@ -127,7 +129,6 @@ public class ExceptionUtil {
*/
public static String explainPreconditionFailed(OsmApiException e) {
e.printStackTrace();
- String msg = e.getErrorHeader();
Pair<OsmPrimitive, Collection<OsmPrimitive>> conflict = parsePreconditionFailed(e.getErrorHeader());
if (conflict != null) {
OsmPrimitive firstRefs = conflict.b.iterator().next();
@@ -278,7 +279,7 @@ public class ExceptionUtil {
} else {
msg = body;
}
-
+
if (msg != null && !msg.isEmpty()) {
return tr("<html>"
+ "Authorisation at the OSM server failed.<br>"
@@ -370,8 +371,8 @@ public class ExceptionUtil {
Date closeDate = null;
try {
closeDate = formatter.parse(m.group(2));
- } catch(ParseException ex) {
- System.err.println(tr("Failed to parse date ''{0}'' replied by server.", m.group(2)));
+ } catch (ParseException ex) {
+ Main.error(tr("Failed to parse date ''{0}'' replied by server.", m.group(2)));
ex.printStackTrace();
}
if (closeDate == null) {
@@ -428,7 +429,7 @@ public class ExceptionUtil {
*/
public static String explainGeneric(Exception e) {
String msg = e.getMessage();
- if (msg == null || msg.trim().equals("")) {
+ if (msg == null || msg.trim().isEmpty()) {
msg = e.toString();
}
e.printStackTrace();
@@ -545,10 +546,10 @@ public class ExceptionUtil {
e.printStackTrace();
return message;
}
-
+
/**
* Explains a {@link OsmApiException} which was thrown because of
- * bandwidth limit exceeded (HTTP error 509)
+ * bandwidth limit exceeded (HTTP error 509)
*
* @param e the exception
*/
@@ -558,7 +559,7 @@ public class ExceptionUtil {
e.printStackTrace();
return message;
}
-
+
/**
* Explains a {@link OsmApiException} which was thrown because a resource wasn't found.
@@ -693,7 +694,7 @@ public class ExceptionUtil {
e.printStackTrace();
return msg;
}
-
+
/**
* Replaces some HTML reserved characters (<, > and &) by their equivalent entity (<, > and &);
* @param s The unescaped string
diff --git a/src/org/openstreetmap/josm/tools/ExifReader.java b/src/org/openstreetmap/josm/tools/ExifReader.java
index 4fa477a..94b6861 100644
--- a/src/org/openstreetmap/josm/tools/ExifReader.java
+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
@@ -1,39 +1,54 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.io.File;
+import java.io.IOException;
import java.text.ParseException;
import java.util.Date;
-import java.util.Iterator;
+
+import org.openstreetmap.josm.data.coor.LatLon;
import com.drew.imaging.jpeg.JpegMetadataReader;
import com.drew.imaging.jpeg.JpegProcessingException;
+import com.drew.lang.Rational;
import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
import com.drew.metadata.Tag;
-import com.drew.metadata.exif.ExifDirectory;
+import com.drew.metadata.exif.ExifIFD0Directory;
+import com.drew.metadata.exif.ExifSubIFDDirectory;
+import com.drew.metadata.exif.GpsDirectory;
/**
- * Read out exif file information from a jpeg file
+ * Read out EXIF information from a JPEG file
* @author Imi
+ * @since 99
*/
-public class ExifReader {
+public final class ExifReader {
- @SuppressWarnings("unchecked") public static Date readTime(File filename) throws ParseException {
+ private ExifReader() {
+ // Hide default constructor for utils classes
+ }
+
+ /**
+ * Returns the date/time from the given JPEG file.
+ * @param filename The JPEG file to read
+ * @return The date/time read in the EXIF section, or {@code null} if not found
+ * @throws ParseException if {@link DateParser#parse} fails to parse date/time
+ */
+ public static Date readTime(File filename) throws ParseException {
try {
Metadata metadata = JpegMetadataReader.readMetadata(filename);
String dateStr = null;
OUTER:
- for (Iterator<Directory> dirIt = metadata.getDirectoryIterator(); dirIt.hasNext();) {
- for (Iterator<Tag> tagIt = dirIt.next().getTagIterator(); tagIt.hasNext();) {
- Tag tag = tagIt.next();
- if (tag.getTagType() == ExifDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */) {
+ for (Directory dirIt : metadata.getDirectories()) {
+ for (Tag tag : dirIt.getTags()) {
+ if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */) {
dateStr = tag.getDescription();
break OUTER; // prefer this tag
}
- if (tag.getTagType() == ExifDirectory.TAG_DATETIME /* 0x0132 */ ||
- tag.getTagType() == ExifDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
+ if (tag.getTagType() == ExifIFD0Directory.TAG_DATETIME /* 0x0132 */ ||
+ tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
dateStr = tag.getDescription();
}
}
@@ -50,18 +65,128 @@ public class ExifReader {
return null;
}
- @SuppressWarnings("unchecked") public static Integer readOrientation(File filename) throws ParseException {
- Integer orientation = null;
+ /**
+ * Returns the image orientation of the given JPEG file.
+ * @param filename The JPEG file to read
+ * @return The image orientation as an {@code int}. Default value is 1. Possible values are listed in EXIF spec as follows:<br>
+ * <ul>1. The 0th row is at the visual top of the image, and the 0th column is the visual left-hand side.</ul>
+ * <ul>2. The 0th row is at the visual top of the image, and the 0th column is the visual right-hand side.</ul>
+ * <ul>3. The 0th row is at the visual bottom of the image, and the 0th column is the visual right-hand side.</ul>
+ * <ul>4. The 0th row is at the visual bottom of the image, and the 0th column is the visual left-hand side.</ul>
+ * <ul>5. The 0th row is the visual left-hand side of the image, and the 0th column is the visual top.</ul>
+ * <ul>6. The 0th row is the visual right-hand side of the image, and the 0th column is the visual top.</ul>
+ * <ul>7. The 0th row is the visual right-hand side of the image, and the 0th column is the visual bottom.</ul>
+ * <ul>8. The 0th row is the visual left-hand side of the image, and the 0th column is the visual bottom.</ul>
+ * @see <a href="http://www.impulseadventure.com/photo/exif-orientation.html">http://www.impulseadventure.com/photo/exif-orientation.html</a>
+ * @see <a href="http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto">http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto</a>
+ */
+ public static Integer readOrientation(File filename) {
try {
final Metadata metadata = JpegMetadataReader.readMetadata(filename);
- final Directory dir = metadata.getDirectory(ExifDirectory.class);
- orientation = dir.getInt(ExifDirectory.TAG_ORIENTATION);
+ final Directory dir = metadata.getDirectory(ExifIFD0Directory.class);
+ return dir.getInt(ExifIFD0Directory.TAG_ORIENTATION);
} catch (JpegProcessingException e) {
e.printStackTrace();
} catch (MetadataException e) {
e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the geolocation of the given JPEG file.
+ * @param filename The JPEG file to read
+ * @return The lat/lon read in the EXIF section, or {@code null} if not found
+ * @since 6209
+ */
+ public static LatLon readLatLon(File filename) {
+ try {
+ final Metadata metadata = JpegMetadataReader.readMetadata(filename);
+ final GpsDirectory dirGps = metadata.getDirectory(GpsDirectory.class);
+ return readLatLon(dirGps);
+ } catch (JpegProcessingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (MetadataException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the geolocation of the given EXIF GPS directory.
+ * @param dirGps The EXIF GPS directory
+ * @return The lat/lon read in the EXIF section, or {@code null} if {@code dirGps} is null
+ * @throws MetadataException
+ * @since 6209
+ */
+ public static LatLon readLatLon(GpsDirectory dirGps) throws MetadataException {
+ if (dirGps != null) {
+ double lat = readAxis(dirGps, GpsDirectory.TAG_GPS_LATITUDE, GpsDirectory.TAG_GPS_LATITUDE_REF, 'S');
+ double lon = readAxis(dirGps, GpsDirectory.TAG_GPS_LONGITUDE, GpsDirectory.TAG_GPS_LONGITUDE_REF, 'W');
+ return new LatLon(lat, lon);
+ }
+ return null;
+ }
+
+ /**
+ * Returns the direction of the given JPEG file.
+ * @param filename The JPEG file to read
+ * @return The direction of the image when it was captures (in degrees between 0.0 and 359.99), or {@code null} if missing or if {@code dirGps} is null
+ * @since 6209
+ */
+ public static Double readDirection(File filename) {
+ try {
+ final Metadata metadata = JpegMetadataReader.readMetadata(filename);
+ final GpsDirectory dirGps = metadata.getDirectory(GpsDirectory.class);
+ return readDirection(dirGps);
+ } catch (JpegProcessingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
- return orientation;
+ return null;
+ }
+
+ /**
+ * Returns the direction of the given EXIF GPS directory.
+ * @param dirGps The EXIF GPS directory
+ * @return The direction of the image when it was captures (in degrees between 0.0 and 359.99), or {@code null} if missing or if {@code dirGps} is null
+ * @since 6209
+ */
+ public static Double readDirection(GpsDirectory dirGps) {
+ if (dirGps != null) {
+ Rational direction = dirGps.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
+ if (direction != null) {
+ return direction.doubleValue();
+ }
+ }
+ return null;
}
+ private static double readAxis(GpsDirectory dirGps, int gpsTag, int gpsTagRef, char cRef) throws MetadataException {
+ double value;
+ Rational[] components = dirGps.getRationalArray(gpsTag);
+ if (components != null) {
+ double deg = components[0].doubleValue();
+ double min = components[1].doubleValue();
+ double sec = components[2].doubleValue();
+
+ if (Double.isNaN(deg) && Double.isNaN(min) && Double.isNaN(sec))
+ throw new IllegalArgumentException();
+
+ value = (Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600)));
+
+ if (dirGps.getString(gpsTagRef).charAt(0) == cRef) {
+ value = -value;
+ }
+ } else {
+ // Try to read lon/lat as double value (Nonstandard, created by some cameras -> #5220)
+ value = dirGps.getDouble(gpsTag);
+ }
+ return value;
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/FallbackDateParser.java b/src/org/openstreetmap/josm/tools/FallbackDateParser.java
index 54a63c3..313a87b 100644
--- a/src/org/openstreetmap/josm/tools/FallbackDateParser.java
+++ b/src/org/openstreetmap/josm/tools/FallbackDateParser.java
@@ -42,8 +42,8 @@ public class FallbackDateParser {
public FallbackDateParser() {
// Build a list of candidate date parsers.
dateParsers = new ArrayList<DateFormat>(formats.length);
- for (int i = 0; i < formats.length; i++) {
- dateParsers.add(new SimpleDateFormat(formats[i]));
+ for (String format : formats) {
+ dateParsers.add(new SimpleDateFormat(format));
}
// We haven't selected a date parser yet.
diff --git a/src/org/openstreetmap/josm/tools/GBC.java b/src/org/openstreetmap/josm/tools/GBC.java
index 3ad63ae..6c1190d 100644
--- a/src/org/openstreetmap/josm/tools/GBC.java
+++ b/src/org/openstreetmap/josm/tools/GBC.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.awt.Component;
@@ -14,7 +14,7 @@ import javax.swing.Box;
*
* @author imi
*/
-public class GBC extends GridBagConstraints {
+public final class GBC extends GridBagConstraints {
/**
* Use public static creator functions to create an GBC.
diff --git a/src/org/openstreetmap/josm/tools/Geometry.java b/src/org/openstreetmap/josm/tools/Geometry.java
index 32c9ed9..301695f 100644
--- a/src/org/openstreetmap/josm/tools/Geometry.java
+++ b/src/org/openstreetmap/josm/tools/Geometry.java
@@ -29,7 +29,12 @@ import org.openstreetmap.josm.data.osm.Way;
*
* @author viesturs
*/
-public class Geometry {
+public final class Geometry {
+
+ private Geometry() {
+ // Hide default constructor for utils classes
+ }
+
public enum PolygonIntersection {FIRST_INSIDE_SECOND, SECOND_INSIDE_FIRST, OUTSIDE, CROSSING}
/**
@@ -38,7 +43,7 @@ public class Geometry {
* And makes commands to add the intersection points to ways.
*
* Prerequisite: no two nodes have the same coordinates.
- *
+ *
* @param ways a list of ways to test
* @param test if false, do not build list of Commands, just return nodes
* @param cmds list of commands, typically empty when handed to this method.
@@ -48,16 +53,16 @@ public class Geometry {
*/
public static Set<Node> addIntersections(List<Way> ways, boolean test, List<Command> cmds) {
- //stupid java, cannot instantiate array of generic classes..
+ int n = ways.size();
@SuppressWarnings("unchecked")
- ArrayList<Node>[] newNodes = new ArrayList[ways.size()];
- BBox[] wayBounds = new BBox[ways.size()];
- boolean[] changedWays = new boolean[ways.size()];
+ List<Node>[] newNodes = new ArrayList[n];
+ BBox[] wayBounds = new BBox[n];
+ boolean[] changedWays = new boolean[n];
Set<Node> intersectionNodes = new LinkedHashSet<Node>();
//copy node arrays for local usage.
- for (int pos = 0; pos < ways.size(); pos ++) {
+ for (int pos = 0; pos < n; pos ++) {
newNodes[pos] = new ArrayList<Node>(ways.get(pos).getNodes());
wayBounds[pos] = getNodesBounds(newNodes[pos]);
changedWays[pos] = false;
@@ -65,17 +70,16 @@ public class Geometry {
//iterate over all way pairs and introduce the intersections
Comparator<Node> coordsComparator = new NodePositionComparator();
-
- WayLoop: for (int seg1Way = 0; seg1Way < ways.size(); seg1Way ++) {
- for (int seg2Way = seg1Way; seg2Way < ways.size(); seg2Way ++) {
+ for (int seg1Way = 0; seg1Way < n; seg1Way ++) {
+ for (int seg2Way = seg1Way; seg2Way < n; seg2Way ++) {
//do not waste time on bounds that do not intersect
if (!wayBounds[seg1Way].intersects(wayBounds[seg2Way])) {
continue;
}
- ArrayList<Node> way1Nodes = newNodes[seg1Way];
- ArrayList<Node> way2Nodes = newNodes[seg2Way];
+ List<Node> way1Nodes = newNodes[seg1Way];
+ List<Node> way2Nodes = newNodes[seg2Way];
//iterate over primary segmemt
for (int seg1Pos = 0; seg1Pos + 1 < way1Nodes.size(); seg1Pos ++) {
@@ -127,7 +131,6 @@ public class Geometry {
Node intNode = newNode;
boolean insertInSeg1 = false;
boolean insertInSeg2 = false;
-
//find if the intersection point is at end point of one of the segments, if so use that point
//segment 1
@@ -173,7 +176,7 @@ public class Geometry {
}
}
}
- else if (test && intersectionNodes.size() > 0)
+ else if (test && !intersectionNodes.isEmpty())
return intersectionNodes;
}
}
@@ -182,7 +185,7 @@ public class Geometry {
for (int pos = 0; pos < ways.size(); pos ++) {
- if (changedWays[pos] == false) {
+ if (!changedWays[pos]) {
continue;
}
@@ -196,10 +199,10 @@ public class Geometry {
return intersectionNodes;
}
- private static BBox getNodesBounds(ArrayList<Node> nodes) {
+ private static BBox getNodesBounds(List<Node> nodes) {
BBox bounds = new BBox(nodes.get(0));
- for(Node n: nodes) {
+ for (Node n: nodes) {
bounds.add(n.getCoor());
}
return bounds;
@@ -246,9 +249,13 @@ public class Geometry {
* Finds the intersection of two line segments
* @return EastNorth null if no intersection was found, the EastNorth coordinates of the intersection otherwise
*/
- public static EastNorth getSegmentSegmentIntersection(
- EastNorth p1, EastNorth p2,
- EastNorth p3, EastNorth p4) {
+ public static EastNorth getSegmentSegmentIntersection(EastNorth p1, EastNorth p2, EastNorth p3, EastNorth p4) {
+
+ CheckParameterUtil.ensureValidCoordinates(p1, "p1");
+ CheckParameterUtil.ensureValidCoordinates(p2, "p2");
+ CheckParameterUtil.ensureValidCoordinates(p3, "p3");
+ CheckParameterUtil.ensureValidCoordinates(p4, "p4");
+
double x1 = p1.getX();
double y1 = p1.getY();
double x2 = p2.getX();
@@ -259,33 +266,58 @@ public class Geometry {
double y4 = p4.getY();
//TODO: do this locally.
+ //TODO: remove this check after careful testing
if (!Line2D.linesIntersect(x1, y1, x2, y2, x3, y3, x4, y4)) return null;
- // Convert line from (point, point) form to ax+by=c
- double a1 = y2 - y1;
- double b1 = x1 - x2;
- double c1 = x2*y1 - x1*y2;
+ // solve line-line intersection in parametric form:
+ // (x1,y1) + (x2-x1,y2-y1)* u = (x3,y3) + (x4-x3,y4-y3)* v
+ // (x2-x1,y2-y1)*u - (x4-x3,y4-y3)*v = (x3-x1,y3-y1)
+ // if 0<= u,v <=1, intersection exists at ( x1+ (x2-x1)*u, y1 + (y2-y1)*u )
+
+ double a1 = x2 - x1;
+ double b1 = x3 - x4;
+ double c1 = x3 - x1;
- double a2 = y4 - y3;
- double b2 = x3 - x4;
- double c2 = x4*y3 - x3*y4;
+ double a2 = y2 - y1;
+ double b2 = y3 - y4;
+ double c2 = y3 - y1;
// Solve the equations
double det = a1*b2 - a2*b1;
- if (det == 0) return null; // Lines are parallel
- double x = (b1*c2 - b2*c1)/det;
- double y = (a2*c1 -a1*c2)/det;
+ double uu = b2*c1 - b1*c2 ;
+ double vv = a1*c2 - a2*c1;
+ double mag = Math.abs(uu)+Math.abs(vv);
- return new EastNorth(x, y);
+ if (Math.abs(det) > 1e-12 * mag) {
+ double u = uu/det, v = vv/det;
+ if (u>-1e-8 && u < 1+1e-8 && v>-1e-8 && v < 1+1e-8 ) {
+ if (u<0) u=0;
+ if (u>1) u=1.0;
+ return new EastNorth(x1+a1*u, y1+a2*u);
+ } else {
+ return null;
+ }
+ } else {
+ // parallel lines
+ return null;
+ }
}
/**
* Finds the intersection of two lines of infinite length.
* @return EastNorth null if no intersection was found, the coordinates of the intersection otherwise
+ * @throws IllegalArgumentException if a parameter is null or without valid coordinates
*/
public static EastNorth getLineLineIntersection(EastNorth p1, EastNorth p2, EastNorth p3, EastNorth p4) {
+ CheckParameterUtil.ensureValidCoordinates(p1, "p1");
+ CheckParameterUtil.ensureValidCoordinates(p2, "p2");
+ CheckParameterUtil.ensureValidCoordinates(p3, "p3");
+ CheckParameterUtil.ensureValidCoordinates(p4, "p4");
+
+ if (!p1.isValid()) throw new IllegalArgumentException();
+
// Convert line from (point, point) form to ax+by=c
double a1 = p2.getY() - p1.getY();
double b1 = p1.getX() - p2.getX();
@@ -304,6 +336,12 @@ public class Geometry {
}
public static boolean segmentsParallel(EastNorth p1, EastNorth p2, EastNorth p3, EastNorth p4) {
+
+ CheckParameterUtil.ensureValidCoordinates(p1, "p1");
+ CheckParameterUtil.ensureValidCoordinates(p2, "p2");
+ CheckParameterUtil.ensureValidCoordinates(p3, "p3");
+ CheckParameterUtil.ensureValidCoordinates(p4, "p4");
+
// Convert line from (point, point) form to ax+by=c
double a1 = p2.getY() - p1.getY();
double b1 = p1.getX() - p2.getX();
@@ -341,7 +379,7 @@ public class Geometry {
else
return new EastNorth(p1.getX() + ldx * offset, p1.getY() + ldy * offset);
}
-
+
/**
* Calculates closest point to a line segment.
* @param segmentP1 First point determining line segment
@@ -383,6 +421,11 @@ public class Geometry {
* @return true if first vector is clockwise before second vector.
*/
public static boolean angleIsClockwise(EastNorth commonNode, EastNorth firstNode, EastNorth secondNode) {
+
+ CheckParameterUtil.ensureValidCoordinates(commonNode, "commonNode");
+ CheckParameterUtil.ensureValidCoordinates(firstNode, "firstNode");
+ CheckParameterUtil.ensureValidCoordinates(secondNode, "secondNode");
+
double dy1 = (firstNode.getY() - commonNode.getY());
double dy2 = (secondNode.getY() - commonNode.getY());
double dx1 = (firstNode.getX() - commonNode.getX());
@@ -406,10 +449,10 @@ public class Geometry {
if (!begin) {
path.closePath();
}
-
+
return new Area(path);
}
-
+
/**
* Tests if two polygons intersect.
* @param first
@@ -417,15 +460,15 @@ public class Geometry {
* @return intersection kind
*/
public static PolygonIntersection polygonIntersection(List<Node> first, List<Node> second) {
-
+
Area a1 = getArea(first);
Area a2 = getArea(second);
-
+
Area inter = new Area(a1);
inter.intersect(a2);
-
+
Rectangle bounds = inter.getBounds();
-
+
if (inter.isEmpty() || bounds.getHeight()*bounds.getWidth() <= 1.0) {
return PolygonIntersection.OUTSIDE;
} else if (inter.equals(a1)) {
@@ -459,7 +502,7 @@ public class Geometry {
continue;
}
- //order points so p1.lat <= p2.lat;
+ //order points so p1.lat <= p2.lat
if (newPoint.getEastNorth().getY() > oldPoint.getEastNorth().getY()) {
p1 = oldPoint;
p2 = newPoint;
@@ -582,6 +625,10 @@ public class Geometry {
* @return Angle in radians (-pi, pi]
*/
public static double getSegmentAngle(EastNorth p1, EastNorth p2) {
+
+ CheckParameterUtil.ensureValidCoordinates(p1, "p1");
+ CheckParameterUtil.ensureValidCoordinates(p2, "p2");
+
return Math.atan2(p2.north() - p1.north(), p2.east() - p1.east());
}
@@ -594,6 +641,11 @@ public class Geometry {
* @return Angle in radians (-pi, pi]
*/
public static double getCornerAngle(EastNorth p1, EastNorth p2, EastNorth p3) {
+
+ CheckParameterUtil.ensureValidCoordinates(p1, "p1");
+ CheckParameterUtil.ensureValidCoordinates(p2, "p2");
+ CheckParameterUtil.ensureValidCoordinates(p3, "p3");
+
Double result = getSegmentAngle(p2, p1) - getSegmentAngle(p2, p3);
if (result <= -Math.PI) {
result += 2 * Math.PI;
@@ -605,29 +657,35 @@ public class Geometry {
return result;
}
-
+
+ /**
+ * Compute the centroid of nodes
+ * @param nodes Nodes for which the centroid is wanted
+ * @return the centroid of nodes
+ */
public static EastNorth getCentroid(List<Node> nodes) {
- // Compute the centroid of nodes
- BigDecimal area = new BigDecimal(0);
- BigDecimal north = new BigDecimal(0);
- BigDecimal east = new BigDecimal(0);
+ BigDecimal area = BigDecimal.ZERO;
+ BigDecimal north = BigDecimal.ZERO;
+ BigDecimal east = BigDecimal.ZERO;
// See http://en.wikipedia.org/w/index.php?title=Centroid&oldid=294224857#Centroid_of_polygon for the equation used here
for (int i = 0; i < nodes.size(); i++) {
EastNorth n0 = nodes.get(i).getEastNorth();
EastNorth n1 = nodes.get((i+1) % nodes.size()).getEastNorth();
- BigDecimal x0 = new BigDecimal(n0.east());
- BigDecimal y0 = new BigDecimal(n0.north());
- BigDecimal x1 = new BigDecimal(n1.east());
- BigDecimal y1 = new BigDecimal(n1.north());
+ if (n0.isValid() && n1.isValid()) {
+ BigDecimal x0 = new BigDecimal(n0.east());
+ BigDecimal y0 = new BigDecimal(n0.north());
+ BigDecimal x1 = new BigDecimal(n1.east());
+ BigDecimal y1 = new BigDecimal(n1.north());
- BigDecimal k = x0.multiply(y1, MathContext.DECIMAL128).subtract(y0.multiply(x1, MathContext.DECIMAL128));
+ BigDecimal k = x0.multiply(y1, MathContext.DECIMAL128).subtract(y0.multiply(x1, MathContext.DECIMAL128));
- area = area.add(k, MathContext.DECIMAL128);
- east = east.add(k.multiply(x0.add(x1, MathContext.DECIMAL128), MathContext.DECIMAL128));
- north = north.add(k.multiply(y0.add(y1, MathContext.DECIMAL128), MathContext.DECIMAL128));
+ area = area.add(k, MathContext.DECIMAL128);
+ east = east.add(k.multiply(x0.add(x1, MathContext.DECIMAL128), MathContext.DECIMAL128));
+ north = north.add(k.multiply(y0.add(y1, MathContext.DECIMAL128), MathContext.DECIMAL128));
+ }
}
BigDecimal d = new BigDecimal(3, MathContext.DECIMAL128); // 1/2 * 6 = 3
@@ -650,8 +708,12 @@ public class Geometry {
* @param ap
* @return Intersection coordinate or null
*/
- public static EastNorth getSegmentAltituteIntersection(EastNorth sp1,
- EastNorth sp2, EastNorth ap) {
+ public static EastNorth getSegmentAltituteIntersection(EastNorth sp1, EastNorth sp2, EastNorth ap) {
+
+ CheckParameterUtil.ensureValidCoordinates(sp1, "sp1");
+ CheckParameterUtil.ensureValidCoordinates(sp2, "sp2");
+ CheckParameterUtil.ensureValidCoordinates(ap, "ap");
+
Double segmentLenght = sp1.distance(sp2);
Double altitudeAngle = getSegmentAngle(sp1, sp2) + Math.PI / 2;
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 28be5ca..dafda2f 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -1,11 +1,11 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -13,9 +13,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
import java.util.jar.JarInputStream;
import java.util.zip.ZipEntry;
-import java.util.Locale;
import javax.swing.JColorChooser;
import javax.swing.JFileChooser;
@@ -29,7 +30,12 @@ import org.openstreetmap.josm.Main;
*
* @author Immanuel.Scholz
*/
-public class I18n {
+public final class I18n {
+
+ private I18n() {
+ // Hide default constructor for utils classes
+ }
+
private enum PluralMode { MODE_NOTONE, MODE_NONE, MODE_GREATERONE,
MODE_CS/*, MODE_AR*/, MODE_PL/*, MODE_RO*/, MODE_RU, MODE_SK/*, MODE_SL*/}
private static PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
@@ -120,9 +126,9 @@ public class I18n {
"OptionPane.noButtonText",
"OptionPane.cancelButtonText"
};
- private static HashMap<String, String> strings = null;
- private static HashMap<String, String[]> pstrings = null;
- private static HashMap<String, PluralMode> languages = new HashMap<String, PluralMode>();
+ private static Map<String, String> strings = null;
+ private static Map<String, String[]> pstrings = null;
+ private static Map<String, PluralMode> languages = new HashMap<String, PluralMode>();
/**
* Translates some text for the current locale.
@@ -254,7 +260,7 @@ public class I18n {
private static final String gettext(String text, String ctx, boolean lazy)
{
int i;
- if(ctx == null && text.startsWith("_:") && (i = text.indexOf("\n")) >= 0)
+ if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0)
{
ctx = text.substring(2,i-1);
text = text.substring(i+1);
@@ -286,7 +292,7 @@ public class I18n {
private static final String gettextn(String text, String plural, String ctx, long num)
{
int i;
- if(ctx == null && text.startsWith("_:") && (i = text.indexOf("\n")) >= 0)
+ if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0)
{
ctx = text.substring(2,i-1);
text = text.substring(i+1);
@@ -329,6 +335,7 @@ public class I18n {
Locale[] l = new Locale[v.size()];
l = v.toArray(l);
Arrays.sort(l, new Comparator<Locale>() {
+ @Override
public int compare(Locale o1, Locale o2) {
return o1.toString().compareTo(o2.toString());
}
@@ -421,26 +428,13 @@ public class I18n {
if(found)
load(jar, jarTrans, true);
}
- }
- catch(IOException e)
- {
- }
- finally
- {
- try
- {
- if(jar != null)
- jar.close();
- if(fis != null)
- fis.close();
- if(jarTrans != null)
- jarTrans.close();
- if(fisTrans != null)
- fisTrans.close();
- }
- catch(IOException e)
- {
- }
+ } catch(IOException e) {
+ // Ignore
+ } finally {
+ Utils.close(jar);
+ Utils.close(fis);
+ Utils.close(jarTrans);
+ Utils.close(fisTrans);
}
}
@@ -468,32 +462,32 @@ public class I18n {
if(tr == null || !languages.containsKey(l))
return false;
}
- try
- {
- if(load(en.openStream(), tr.openStream(), false))
- {
+ InputStream enStream = null;
+ InputStream trStream = null;
+ try {
+ enStream = en.openStream();
+ trStream = tr.openStream();
+ if (load(enStream, trStream, false)) {
pluralMode = languages.get(l);
loadedCode = l;
return true;
}
- }
- catch(IOException e)
- {
+ } catch(IOException e) {
+ // Ignore exception
+ } finally {
+ Utils.close(trStream);
+ Utils.close(enStream);
}
return false;
}
- private static boolean load(InputStream en, InputStream tr, boolean add)
- {
- HashMap<String, String> s;
- HashMap<String, String[]> p;
- if(add)
- {
+ private static boolean load(InputStream en, InputStream tr, boolean add) {
+ Map<String, String> s;
+ Map<String, String[]> p;
+ if (add) {
s = strings;
p = pstrings;
- }
- else
- {
+ } else {
s = new HashMap<String, String>();
p = new HashMap<String, String[]>();
}
@@ -648,7 +642,7 @@ public class I18n {
Locale.setDefault(l);
} else {
if (!l.getLanguage().equals("en")) {
- System.out.println(tr("Unable to find translation for the locale {0}. Reverting to {1}.",
+ Main.info(tr("Unable to find translation for the locale {0}. Reverting to {1}.",
l.getDisplayName(), Locale.getDefault().getDisplayName()));
} else {
strings = null;
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index d0d3859..1cc12f1 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -1,9 +1,8 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.Component;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Graphics;
@@ -82,9 +81,14 @@ public class ImageProvider {
NORTHWEST, NORTHEAST, SOUTHWEST, SOUTHEAST
}
+ /**
+ * Supported image types
+ */
public static enum ImageType {
- SVG, // scalable vector graphics
- OTHER // everything else, e.g. png, gif (must be supported by Java)
+ /** Scalable vector graphics */
+ SVG,
+ /** Everything else, e.g. png, gif (must be supported by Java) */
+ OTHER
}
protected Collection<String> dirs;
@@ -92,6 +96,7 @@ public class ImageProvider {
protected String subdir;
protected String name;
protected File archive;
+ protected String inArchiveDir;
protected int width = -1;
protected int height = -1;
protected int maxWidth = -1;
@@ -105,15 +110,21 @@ public class ImageProvider {
/**
* The icon cache
*/
- private static Map<String, ImageResource> cache = new HashMap<String, ImageResource>();
+ private static final Map<String, ImageResource> cache = new HashMap<String, ImageResource>();
+
+ /**
+ * Caches the image data for rotated versions of the same image.
+ */
+ private static final Map<Image, Map<Long, ImageResource>> ROTATE_CACHE = new HashMap<Image, Map<Long, ImageResource>>();
- private final static ExecutorService imageFetcher = Executors.newSingleThreadExecutor();
+ private static final ExecutorService IMAGE_FETCHER = Executors.newSingleThreadExecutor();
public interface ImageCallback {
void finished(ImageIcon result);
}
/**
+ * Constructs a new {@code ImageProvider} from a filename in a given directory.
* @param subdir subdirectory the image lies in
* @param name the name of the image. If it does not end with '.png' or '.svg',
* both extensions are tried.
@@ -123,12 +134,19 @@ public class ImageProvider {
this.name = name;
}
+ /**
+ * Constructs a new {@code ImageProvider} from a filename.
+ * @param name the name of the image. If it does not end with '.png' or '.svg',
+ * both extensions are tried.
+ */
public ImageProvider(String name) {
this.name = name;
}
/**
* Directories to look for the image.
+ * @param dirs The directories to look for.
+ * @return the current object, for convenience
*/
public ImageProvider setDirs(Collection<String> dirs) {
this.dirs = dirs;
@@ -139,6 +157,7 @@ public class ImageProvider {
* Set an id used for caching.
* If name starts with <tt>http://</tt> Id is not used for the cache.
* (A URL is unique anyway.)
+ * @return the current object, for convenience
*/
public ImageProvider setId(String id) {
this.id = id;
@@ -149,6 +168,7 @@ public class ImageProvider {
* Specify a zip file where the image is located.
*
* (optional)
+ * @return the current object, for convenience
*/
public ImageProvider setArchive(File archive) {
this.archive = archive;
@@ -156,11 +176,25 @@ public class ImageProvider {
}
/**
+ * Specify a base path inside the zip file.
+ *
+ * The subdir and name will be relative to this path.
+ *
+ * (optional)
+ * @return the current object, for convenience
+ */
+ public ImageProvider setInArchiveDir(String inArchiveDir) {
+ this.inArchiveDir = inArchiveDir;
+ return this;
+ }
+
+ /**
* Set the dimensions of the image.
*
* If not specified, the original size of the image is used.
* The width part of the dimension can be -1. Then it will only set the height but
* keep the aspect ratio. (And the other way around.)
+ * @return the current object, for convenience
*/
public ImageProvider setSize(Dimension size) {
this.width = size.width;
@@ -170,6 +204,7 @@ public class ImageProvider {
/**
* @see #setSize
+ * @return the current object, for convenience
*/
public ImageProvider setWidth(int width) {
this.width = width;
@@ -178,6 +213,7 @@ public class ImageProvider {
/**
* @see #setSize
+ * @return the current object, for convenience
*/
public ImageProvider setHeight(int height) {
this.height = height;
@@ -191,15 +227,17 @@ public class ImageProvider {
* The given width or height can be -1 which means this direction is not bounded.
*
* 'size' and 'maxSize' are not compatible, you should set only one of them.
+ * @return the current object, for convenience
*/
public ImageProvider setMaxSize(Dimension maxSize) {
this.maxWidth = maxSize.width;
this.maxHeight = maxSize.height;
return this;
}
-
+
/**
* Convenience method, see {@link #setMaxSize(Dimension)}.
+ * @return the current object, for convenience
*/
public ImageProvider setMaxSize(int maxSize) {
return this.setMaxSize(new Dimension(maxSize, maxSize));
@@ -207,6 +245,7 @@ public class ImageProvider {
/**
* @see #setMaxSize
+ * @return the current object, for convenience
*/
public ImageProvider setMaxWidth(int maxWidth) {
this.maxWidth = maxWidth;
@@ -215,6 +254,7 @@ public class ImageProvider {
/**
* @see #setMaxSize
+ * @return the current object, for convenience
*/
public ImageProvider setMaxHeight(int maxHeight) {
this.maxHeight = maxHeight;
@@ -239,6 +279,7 @@ public class ImageProvider {
* Suppresses warning on the command line in case the image cannot be found.
*
* In combination with setOptional(true);
+ * @return the current object, for convenience
*/
public ImageProvider setSuppressWarnings(boolean suppressWarnings) {
this.suppressWarnings = suppressWarnings;
@@ -247,6 +288,7 @@ public class ImageProvider {
/**
* Add a collection of additional class loaders to search image for.
+ * @return the current object, for convenience
*/
public ImageProvider setAdditionalClassLoaders(Collection<ClassLoader> additionalClassLoaders) {
this.additionalClassLoaders = additionalClassLoaders;
@@ -265,7 +307,7 @@ public class ImageProvider {
throw new RuntimeException(tr("Fatal: failed to locate image ''{0}''. This is a serious configuration problem. JOSM will stop working.", name + ext));
} else {
if (!suppressWarnings) {
- System.err.println(tr("Failed to locate image ''{0}''", name));
+ Main.error(tr("Failed to locate image ''{0}''", name));
}
return null;
}
@@ -296,7 +338,7 @@ public class ImageProvider {
callback.finished(result);
}
};
- imageFetcher.submit(fetch);
+ IMAGE_FETCHER.submit(fetch);
} else {
ImageIcon result = get();
callback.finished(result);
@@ -340,7 +382,7 @@ public class ImageProvider {
/**
* {@code data:[<mediatype>][;base64],<data>}
- * @see RFC2397
+ * @see <a href="http://tools.ietf.org/html/rfc2397">RFC2397</a>
*/
private static final Pattern dataUrlPattern = Pattern.compile(
"^data:([a-zA-Z]+/[a-zA-Z+]+)?(;base64)?,(.+)$");
@@ -369,14 +411,14 @@ public class ImageProvider {
} else {
try {
return new ImageResource(ImageIO.read(new ByteArrayInputStream(bytes)));
- } catch (IOException e) {}
+ } catch (IOException e) {
+ Main.warn("IOException while reading image: "+e.getMessage());
+ }
}
}
}
} catch (UnsupportedEncodingException ex) {
throw new RuntimeException(ex.getMessage(), ex);
- } catch (IOException ex) {
- throw new RuntimeException(ex.getMessage(), ex);
}
ImageType type = name.toLowerCase().endsWith(".svg") ? ImageType.SVG : ImageType.OTHER;
@@ -402,7 +444,7 @@ public class ImageProvider {
if (subdir == null) {
subdir = "";
- } else if (!subdir.equals("")) {
+ } else if (!subdir.isEmpty()) {
subdir += "/";
}
String[] extensions;
@@ -424,7 +466,7 @@ public class ImageProvider {
String full_name = subdir + name + ext;
String cache_name = full_name;
/* cache separately */
- if (dirs != null && dirs.size() > 0) {
+ if (dirs != null && !dirs.isEmpty()) {
cache_name = "id:" + id + ":" + full_name;
if(archive != null) {
cache_name += ":" + archive.getName();
@@ -437,7 +479,7 @@ public class ImageProvider {
switch (place) {
case ARCHIVE:
if (archive != null) {
- ir = getIfAvailableZip(full_name, archive, type);
+ ir = getIfAvailableZip(full_name, archive, inArchiveDir, type);
if (ir != null) {
cache.put(cache_name, ir);
return ir;
@@ -468,8 +510,9 @@ public class ImageProvider {
}
private static ImageResource getIfAvailableHttp(String url, ImageType type) {
+ MirroredInputStream is = null;
try {
- MirroredInputStream is = new MirroredInputStream(url,
+ is = new MirroredInputStream(url,
new File(Main.pref.getCacheDirectory(), "images").getPath());
switch (type) {
case SVG:
@@ -480,13 +523,17 @@ public class ImageProvider {
BufferedImage img = null;
try {
img = ImageIO.read(is.getFile().toURI().toURL());
- } catch (IOException e) {}
+ } catch (IOException e) {
+ Main.warn("IOException while reading HTTP image: "+e.getMessage());
+ }
return img == null ? null : new ImageResource(img);
default:
throw new AssertionError();
}
} catch (IOException e) {
return null;
+ } finally {
+ Utils.close(is);
}
}
@@ -520,12 +567,18 @@ public class ImageProvider {
return result;
}
- private static ImageResource getIfAvailableZip(String full_name, File archive, ImageType type) {
+ private static ImageResource getIfAvailableZip(String full_name, File archive, String inArchiveDir, ImageType type) {
ZipFile zipFile = null;
try
{
zipFile = new ZipFile(archive);
- ZipEntry entry = zipFile.getEntry(full_name);
+ if (inArchiveDir == null || inArchiveDir.equals(".")) {
+ inArchiveDir = "";
+ } else if (!inArchiveDir.isEmpty()) {
+ inArchiveDir += "/";
+ }
+ String entry_name = inArchiveDir + full_name;
+ ZipEntry entry = zipFile.getEntry(entry_name);
if(entry != null)
{
int size = (int)entry.getSize();
@@ -536,7 +589,7 @@ public class ImageProvider {
is = zipFile.getInputStream(entry);
switch (type) {
case SVG:
- URI uri = getSvgUniverse().loadSVG(is, full_name);
+ URI uri = getSvgUniverse().loadSVG(is, entry_name);
SVGDiagram svg = getSvgUniverse().getDiagram(uri);
return svg == null ? null : new ImageResource(svg);
case OTHER:
@@ -549,26 +602,21 @@ public class ImageProvider {
BufferedImage img = null;
try {
img = ImageIO.read(new ByteArrayInputStream(buf));
- } catch (IOException e) {}
+ } catch (IOException e) {
+ Main.warn(e);
+ }
return img == null ? null : new ImageResource(img);
default:
throw new AssertionError();
}
} finally {
- if (is != null) {
- is.close();
- }
+ Utils.close(is);
}
}
} catch (Exception e) {
- System.err.println(tr("Warning: failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
+ Main.warn(tr("Failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
} finally {
- if (zipFile != null) {
- try {
- zipFile.close();
- } catch (IOException ex) {
- }
- }
+ Utils.close(zipFile);
}
return null;
}
@@ -583,7 +631,9 @@ public class ImageProvider {
BufferedImage img = null;
try {
img = ImageIO.read(path);
- } catch (IOException e) {}
+ } catch (IOException e) {
+ Main.warn(e);
+ }
return img == null ? null : new ImageResource(img);
default:
throw new AssertionError();
@@ -605,9 +655,10 @@ public class ImageProvider {
} else {
try {
File f = new File(path, name);
- if (f.exists())
+ if ((path != null || f.isAbsolute()) && f.exists())
return f.toURI().toURL();
} catch (MalformedURLException e) {
+ Main.warn(e);
}
}
return null;
@@ -624,8 +675,8 @@ public class ImageProvider {
if (u != null)
return u;
} catch (SecurityException e) {
- System.out.println(tr(
- "Warning: failed to access directory ''{0}'' for security reasons. Exception was: {1}",
+ Main.warn(tr(
+ "Failed to access directory ''{0}'' for security reasons. Exception was: {1}",
name, e.toString()));
}
@@ -638,8 +689,8 @@ public class ImageProvider {
if (u != null)
return u;
} catch (SecurityException e) {
- System.out.println(tr(
- "Warning: failed to access directory ''{0}'' for security reasons. Exception was: {1}", dir, e
+ Main.warn(tr(
+ "Failed to access directory ''{0}'' for security reasons. Exception was: {1}", dir, e
.toString()));
}
@@ -689,7 +740,6 @@ public class ImageProvider {
parser.setContentHandler(new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
- System.out.println();
if (localName.equalsIgnoreCase("img")) {
String val = atts.getValue("src");
if (val.endsWith(fn))
@@ -699,6 +749,7 @@ public class ImageProvider {
});
parser.setEntityResolver(new EntityResolver() {
+ @Override
public InputSource resolveEntity (String publicId, String systemId) {
return new InputSource(new ByteArrayInputStream(new byte[0]));
}
@@ -711,10 +762,10 @@ public class ImageProvider {
} catch (SAXReturnException r) {
return r.getResult();
} catch (Exception e) {
- System.out.println("INFO: parsing " + base + fn + " failed:\n" + e);
+ Main.warn("Parsing " + base + fn + " failed:\n" + e);
return null;
}
- System.out.println("INFO: parsing " + base + fn + " failed: Unexpected content.");
+ Main.warn("Parsing " + base + fn + " failed: Unexpected content.");
return null;
}
@@ -728,11 +779,6 @@ public class ImageProvider {
return c;
}
- @Deprecated
- public static ImageIcon overlay(Icon ground, String overlayImage, OverlayPosition pos) {
- return overlay(ground, ImageProvider.get(overlayImage), pos);
- }
-
/**
* Decorate one icon with an overlay icon.
*
@@ -782,62 +828,107 @@ public class ImageProvider {
/**
* Creates a rotated version of the input image.
*
- * @param c The component to get properties useful for painting, e.g. the foreground or
- * background color.
* @param img the image to be rotated.
* @param rotatedAngle the rotated angle, in degree, clockwise. It could be any double but we
- * will mod it with 360 before using it.
+ * will mod it with 360 before using it. More over for caching performance, it will be rounded to
+ * an entire value between 0 and 360.
*
* @return the image after rotating.
+ * @since 6172
*/
- public static Image createRotatedImage(Component c, Image img, double rotatedAngle) {
- // convert rotatedAngle to a value from 0 to 360
- double originalAngle = rotatedAngle % 360;
+ public static Image createRotatedImage(Image img, double rotatedAngle) {
+ return createRotatedImage(img, rotatedAngle, ImageResource.DEFAULT_DIMENSION);
+ }
+
+ /**
+ * Creates a rotated version of the input image, scaled to the given dimension.
+ *
+ * @param img the image to be rotated.
+ * @param rotatedAngle the rotated angle, in degree, clockwise. It could be any double but we
+ * will mod it with 360 before using it. More over for caching performance, it will be rounded to
+ * an entire value between 0 and 360.
+ * @param dimension The requested dimensions. Use (-1,-1) for the original size
+ * and (width, -1) to set the width, but otherwise scale the image proportionally.
+ * @return the image after rotating and scaling.
+ * @since 6172
+ */
+ public static Image createRotatedImage(Image img, double rotatedAngle, Dimension dimension) {
+ CheckParameterUtil.ensureParameterNotNull(img, "img");
+
+ // convert rotatedAngle to an integer value from 0 to 360
+ Long originalAngle = Math.round(rotatedAngle % 360);
if (rotatedAngle != 0 && originalAngle == 0) {
- originalAngle = 360.0;
+ originalAngle = 360L;
}
+
+ ImageResource imageResource = null;
- // convert originalAngle to a value from 0 to 90
- double angle = originalAngle % 90;
- if (originalAngle != 0.0 && angle == 0.0) {
- angle = 90.0;
- }
-
- double radian = Math.toRadians(angle);
-
- new ImageIcon(img); // load completely
- int iw = img.getWidth(null);
- int ih = img.getHeight(null);
- int w;
- int h;
-
- if ((originalAngle >= 0 && originalAngle <= 90) || (originalAngle > 180 && originalAngle <= 270)) {
- w = (int) (iw * Math.sin(DEGREE_90 - radian) + ih * Math.sin(radian));
- h = (int) (iw * Math.sin(radian) + ih * Math.sin(DEGREE_90 - radian));
- } else {
- w = (int) (ih * Math.sin(DEGREE_90 - radian) + iw * Math.sin(radian));
- h = (int) (ih * Math.sin(radian) + iw * Math.sin(DEGREE_90 - radian));
+ synchronized (ROTATE_CACHE) {
+ Map<Long, ImageResource> cacheByAngle = ROTATE_CACHE.get(img);
+ if (cacheByAngle == null) {
+ ROTATE_CACHE.put(img, cacheByAngle = new HashMap<Long, ImageResource>());
+ }
+
+ imageResource = cacheByAngle.get(originalAngle);
+
+ if (imageResource == null) {
+ // convert originalAngle to a value from 0 to 90
+ double angle = originalAngle % 90;
+ if (originalAngle != 0.0 && angle == 0.0) {
+ angle = 90.0;
+ }
+
+ double radian = Math.toRadians(angle);
+
+ new ImageIcon(img); // load completely
+ int iw = img.getWidth(null);
+ int ih = img.getHeight(null);
+ int w;
+ int h;
+
+ if ((originalAngle >= 0 && originalAngle <= 90) || (originalAngle > 180 && originalAngle <= 270)) {
+ w = (int) (iw * Math.sin(DEGREE_90 - radian) + ih * Math.sin(radian));
+ h = (int) (iw * Math.sin(radian) + ih * Math.sin(DEGREE_90 - radian));
+ } else {
+ w = (int) (ih * Math.sin(DEGREE_90 - radian) + iw * Math.sin(radian));
+ h = (int) (ih * Math.sin(radian) + iw * Math.sin(DEGREE_90 - radian));
+ }
+ Image image = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
+ cacheByAngle.put(originalAngle, imageResource = new ImageResource(image));
+ Graphics g = image.getGraphics();
+ Graphics2D g2d = (Graphics2D) g.create();
+
+ // calculate the center of the icon.
+ int cx = iw / 2;
+ int cy = ih / 2;
+
+ // move the graphics center point to the center of the icon.
+ g2d.translate(w / 2, h / 2);
+
+ // rotate the graphics about the center point of the icon
+ g2d.rotate(Math.toRadians(originalAngle));
+
+ g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ g2d.drawImage(img, -cx, -cy, null);
+
+ g2d.dispose();
+ new ImageIcon(image); // load completely
+ }
+ return imageResource.getImageIcon(dimension).getImage();
}
- BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
- Graphics g = image.getGraphics();
- Graphics2D g2d = (Graphics2D) g.create();
-
- // calculate the center of the icon.
- int cx = iw / 2;
- int cy = ih / 2;
-
- // move the graphics center point to the center of the icon.
- g2d.translate(w / 2, h / 2);
-
- // rotate the graphics about the center point of the icon
- g2d.rotate(Math.toRadians(originalAngle));
-
- g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
- g2d.drawImage(img, -cx, -cy, c);
-
- g2d.dispose();
- new ImageIcon(image); // load completely
- return image;
+ }
+
+ /**
+ * Creates a scaled down version of the input image to fit maximum dimensions. (Keeps aspect ratio)
+ *
+ * @param img the image to be scaled down.
+ * @param maxSize the maximum size in pixels (both for width and height)
+ *
+ * @return the image after scaling.
+ * @since 6172
+ */
+ public static Image createBoundedImage(Image img, int maxSize) {
+ return new ImageResource(img).getImageIconBounded(new Dimension(maxSize, maxSize)).getImage();
}
/**
@@ -871,10 +962,13 @@ public class ImageProvider {
scaleX = scaleY = (double) height / realHeight;
width = (int) Math.round(realWidth * scaleX);
}
+ if (width == 0 || height == 0) {
+ return null;
+ }
BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
Graphics2D g = img.createGraphics();
g.setClip(0, 0, width, height);
- if (scaleX != null) {
+ if (scaleX != null && scaleY != null) {
g.scale(scaleX, scaleY);
}
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
diff --git a/src/org/openstreetmap/josm/tools/ImageResource.java b/src/org/openstreetmap/josm/tools/ImageResource.java
index 1a7c3b1..e439806 100644
--- a/src/org/openstreetmap/josm/tools/ImageResource.java
+++ b/src/org/openstreetmap/josm/tools/ImageResource.java
@@ -1,31 +1,34 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
-import com.kitfox.svg.SVGDiagram;
-
import java.awt.Dimension;
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.util.HashMap;
+import java.util.Map;
+
import javax.swing.ImageIcon;
+import com.kitfox.svg.SVGDiagram;
+
/**
* Holds data for one particular image.
* It can be backed by a svg or raster image.
- *
- * In the first case, 'svg' is not null and in the latter case, 'imgCache' has
+ *
+ * In the first case, 'svg' is not null and in the latter case, 'imgCache' has
* at least one entry for the key DEFAULT_DIMENSION.
+ * @since 4271
*/
class ImageResource {
-
+
/**
* Caches the image data for resized versions of the same image.
*/
- private HashMap<Dimension, BufferedImage> imgCache = new HashMap<Dimension, BufferedImage>();
+ private Map<Dimension, Image> imgCache = new HashMap<Dimension, Image>();
private SVGDiagram svg;
public static final Dimension DEFAULT_DIMENSION = new Dimension(-1, -1);
-
- public ImageResource(BufferedImage img) {
+
+ public ImageResource(Image img) {
CheckParameterUtil.ensureParameterNotNull(img);
imgCache.put(DEFAULT_DIMENSION, img);
}
@@ -44,29 +47,33 @@ class ImageResource {
* @param dim The requested dimensions. Use (-1,-1) for the original size
* and (width, -1) to set the width, but otherwise scale the image
* proportionally.
+ * @return ImageIcon object for the image of this resource, scaled according to dim
*/
public ImageIcon getImageIcon(Dimension dim) {
if (dim.width < -1 || dim.width == 0 || dim.height < -1 || dim.height == 0)
throw new IllegalArgumentException();
- BufferedImage img = imgCache.get(dim);
+ Image img = imgCache.get(dim);
if (img != null) {
return new ImageIcon(img);
}
if (svg != null) {
img = ImageProvider.createImageFromSvg(svg, dim);
+ if (img == null) {
+ return null;
+ }
imgCache.put(dim, img);
return new ImageIcon(img);
} else {
- BufferedImage base = imgCache.get(DEFAULT_DIMENSION);
+ Image base = imgCache.get(DEFAULT_DIMENSION);
if (base == null) throw new AssertionError();
-
+
int width = dim.width;
int height = dim.height;
ImageIcon icon = new ImageIcon(base);
if (width == -1) {
- width = icon.getIconWidth() * height / icon.getIconHeight();
+ width = Math.max(1, icon.getIconWidth() * height / icon.getIconHeight());
} else if (height == -1) {
- height = icon.getIconHeight() * width / icon.getIconWidth();
+ height = Math.max(1, icon.getIconHeight() * width / icon.getIconWidth());
}
Image i = icon.getImage().getScaledInstance(width, height, Image.SCALE_SMOOTH);
img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
@@ -82,6 +89,7 @@ class ImageResource {
*
* @param maxSize The maximum size. One of the dimensions (widht or height) can be -1,
* which means it is not bounded.
+ * @return ImageIcon object for the image of this resource, scaled down if needed, according to maxSize
*/
public ImageIcon getImageIconBounded(Dimension maxSize) {
if (maxSize.width < -1 || maxSize.width == 0 || maxSize.height < -1 || maxSize.height == 0)
@@ -92,7 +100,7 @@ class ImageResource {
realWidth = svg.getWidth();
realHeight = svg.getHeight();
} else {
- BufferedImage base = imgCache.get(DEFAULT_DIMENSION);
+ Image base = imgCache.get(DEFAULT_DIMENSION);
if (base == null) throw new AssertionError();
ImageIcon icon = new ImageIcon(base);
realWidth = icon.getIconWidth();
diff --git a/src/org/openstreetmap/josm/tools/InputMapUtils.java b/src/org/openstreetmap/josm/tools/InputMapUtils.java
index 1ee4407..c8e964f 100644
--- a/src/org/openstreetmap/josm/tools/InputMapUtils.java
+++ b/src/org/openstreetmap/josm/tools/InputMapUtils.java
@@ -1,7 +1,9 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
+
import javax.swing.Action;
import javax.swing.InputMap;
import javax.swing.JButton;
@@ -10,37 +12,40 @@ import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
/**
- * Tools to work with Swing InputMap
+ * Tools to work with Swing InputMap
*
*/
-public class InputMapUtils {
- public static void unassignCtrlShiftUpDown(JComponent cmp, int condition) {
+public final class InputMapUtils {
+
+ private InputMapUtils() {
+ // Hide default constructor for utils classes
+ }
+
+ public static void unassignCtrlShiftUpDown(JComponent cmp, int condition) {
InputMap inputMap=SwingUtilities.getUIInputMap(cmp, condition);
inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP,InputEvent.CTRL_MASK|InputEvent.SHIFT_MASK));
inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN,InputEvent.CTRL_MASK|InputEvent.SHIFT_MASK));
inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_UP,InputEvent.ALT_MASK|InputEvent.SHIFT_MASK));
inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN,InputEvent.ALT_MASK|InputEvent.SHIFT_MASK));
SwingUtilities.replaceUIInputMap(cmp,JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,inputMap);
- }
-
-
- /**
- * Enable activating button on Enter (which is replaced with spacebar for certain Look-And-Feels)
- */
- public static void enableEnter(JButton b) {
+ }
+
+ /**
+ * Enable activating button on Enter (which is replaced with spacebar for certain Look-And-Feels)
+ */
+ public static void enableEnter(JButton b) {
b.setFocusable(true);
b.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");
b.getActionMap().put("enter",b.getAction());
- }
-
- public static void addEnterAction(JComponent c, Action a) {
+ }
+
+ public static void addEnterAction(JComponent c, Action a) {
c.getActionMap().put("enter", a);
c.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");
- }
-
- public static void addSpacebarAction(JComponent c, Action a) {
+ }
+
+ public static void addSpacebarAction(JComponent c, Action a) {
c.getActionMap().put("spacebar", a);
c.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0), "spacebar");
- }
-
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/LanguageInfo.java b/src/org/openstreetmap/josm/tools/LanguageInfo.java
index f46a7af..e9abed1 100644
--- a/src/org/openstreetmap/josm/tools/LanguageInfo.java
+++ b/src/org/openstreetmap/josm/tools/LanguageInfo.java
@@ -1,33 +1,54 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
import java.util.Locale;
-public class LanguageInfo {
+public final class LanguageInfo {
+
+ private LanguageInfo() {
+ // Hide default constructor for utils classes
+ }
+
+ /**
+ * Type of the locale to use
+ * @since 5915
+ */
+ public enum LocaleType {
+ /** The current default language */
+ DEFAULT,
+ /** The current default language, but not english */
+ DEFAULTNOTENGLISH,
+ /** The base language (i.e. pt for pt_BR) */
+ BASELANGUAGE,
+ /** The standard english texts */
+ ENGLISH
+ }
/**
* Replies the wiki language prefix for the given locale. The wiki language
* prefix has the form 'Xy:' where 'Xy' is a ISO 639 language code in title
- * case.
+ * case (or Xy_AB: for sub languages).
*
- * @param locale the locale
- * @return the wiki language prefix
+ * @param type the type
+ * @return the wiki language prefix or {@code null} for {@link LocaleType#BASELANGUAGE}, when
+ * base language is identical to default or english
+ * @since 5915
*/
- static public String getWikiLanguagePrefix(Locale locale) {
- String code = getJOSMLocaleCode(locale);
- if (code.length() == 2) {
- if (code.equals("en")) return "";
- } else if (code.equals("zh_TW") || code.equals("zh_CN")) {
- /* do nothing */
- } else if (code.matches("[^_]+_[^_]+")) {
- code = code.substring(0,2);
- if (code.equals("en")) return "";
- } else {
- System.err.println(tr("Warning: failed to derive wiki language prefix from JOSM locale code ''{0}''. Using default code ''en''.", code));
- return "";
- }
+ static public String getWikiLanguagePrefix(LocaleType type) {
+ if(type == LocaleType.ENGLISH)
+ return "";
+
+ String code = getJOSMLocaleCode();
+ if(type == LocaleType.BASELANGUAGE) {
+ if(code.matches("[^_]+_[^_]+")) {
+ code = code.substring(0,2);
+ if ("en".equals(code))
+ return null;
+ } else {
+ return null;
+ }
+ } else if(type == LocaleType.DEFAULTNOTENGLISH && "en".equals(code))
+ return null;
return code.substring(0,1).toUpperCase() + code.substring(1) + ":";
}
@@ -36,10 +57,10 @@ public class LanguageInfo {
*
* @return the wiki language prefix
* @see Locale#getDefault()
- * @see #getWikiLanguagePrefix(Locale)
+ * @see #getWikiLanguagePrefix(LocaleType)
*/
static public String getWikiLanguagePrefix() {
- return getWikiLanguagePrefix(Locale.getDefault());
+ return getWikiLanguagePrefix(LocaleType.DEFAULT);
}
/**
@@ -69,10 +90,10 @@ public class LanguageInfo {
return "he";
else if (full.equals("in"))
return "id";
- else if (I18n.hasCode(full)) /* catch all non-single codes */
+ else if (I18n.hasCode(full)) // catch all non-single codes
return full;
- /* return single code */
+ // return single code
return locale.getLanguage();
}
@@ -101,12 +122,11 @@ public class LanguageInfo {
return l;
}
- static public String getLanguageCodeXML()
- {
+ static public String getLanguageCodeXML() {
return getJOSMLocaleCode()+".";
}
- static public String getLanguageCodeManifest()
- {
+
+ static public String getLanguageCodeManifest() {
return getJOSMLocaleCode()+"_";
}
}
diff --git a/src/org/openstreetmap/josm/tools/MultiMap.java b/src/org/openstreetmap/josm/tools/MultiMap.java
index 889d88b..bdfc5ff 100644
--- a/src/org/openstreetmap/josm/tools/MultiMap.java
+++ b/src/org/openstreetmap/josm/tools/MultiMap.java
@@ -19,14 +19,14 @@ import java.util.Set;
*/
public class MultiMap<A, B> {
- private final Map<A, LinkedHashSet<B>> map;
+ private final Map<A, Set<B>> map;
public MultiMap() {
- map = new HashMap<A, LinkedHashSet<B>>();
+ map = new HashMap<A, Set<B>>();
}
public MultiMap(int capacity) {
- map = new HashMap<A, LinkedHashSet<B>>(capacity);
+ map = new HashMap<A, Set<B>>(capacity);
}
/**
@@ -35,7 +35,7 @@ public class MultiMap<A, B> {
* Can be called multiple times with the same key, but different value.
*/
public void put(A key, B value) {
- LinkedHashSet<B> vals = map.get(key);
+ Set<B> vals = map.get(key);
if (vals == null) {
vals = new LinkedHashSet<B>();
map.put(key, vals);
@@ -61,7 +61,7 @@ public class MultiMap<A, B> {
* Adds to the mappings that are already there.
*/
public void putAll(A key, Collection<B> values) {
- LinkedHashSet<B> vals = map.get(key);
+ Set<B> vals = map.get(key);
if (vals == null) {
vals = new LinkedHashSet<B>(values);
map.put(key, vals);
@@ -90,7 +90,7 @@ public class MultiMap<A, B> {
/**
* Like get, but returns an empty Set if nothing has been mapped to the key.
*/
- public LinkedHashSet<B> getValues(A key) {
+ public Set<B> getValues(A key) {
if (!map.containsKey(key))
return new LinkedHashSet<B>();
return map.get(key);
@@ -120,7 +120,7 @@ public class MultiMap<A, B> {
map.clear();
}
- public Set<Entry<A, LinkedHashSet<B>>> entrySet() {
+ public Set<Entry<A, Set<B>>> entrySet() {
return map.entrySet();
}
@@ -134,7 +134,7 @@ public class MultiMap<A, B> {
/**
* Returns a collection of all value sets.
*/
- public Collection<LinkedHashSet<B>> values() {
+ public Collection<Set<B>> values() {
return map.values();
}
@@ -154,10 +154,11 @@ public class MultiMap<A, B> {
/**
* Removes all mappings for a certain key.
*/
- public LinkedHashSet<B> remove(A key) {
+ public Set<B> remove(A key) {
return map.remove(key);
}
+ @Override
public String toString() {
List<String> entries = new ArrayList<String>(map.size());
for (A key : map.keySet()) {
diff --git a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
index 149ddf9..b1163b4 100644
--- a/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
+++ b/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
@@ -26,10 +26,10 @@ import javax.swing.event.PopupMenuListener;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo;
-public class MultikeyActionsHandler {
+public final class MultikeyActionsHandler {
private static final long DIALOG_DELAY = 1000;
- private static final String STATUS_BAR_ID = new String("multikeyShortcut");
+ private static final String STATUS_BAR_ID = "multikeyShortcut";
private Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<MultikeyShortcutAction,MyAction>();
@@ -119,6 +119,10 @@ public class MultikeyActionsHandler {
private static MultikeyActionsHandler instance;
+ /**
+ * Replies the unique instance of this class.
+ * @return The unique instance of this class
+ */
public static MultikeyActionsHandler getInstance() {
if (instance == null) {
instance = new MultikeyActionsHandler();
@@ -202,15 +206,22 @@ public class MultikeyActionsHandler {
});
}
+ /**
+ * Registers an action and its shortcut
+ * @param action The action to add
+ */
public void addAction(MultikeyShortcutAction action) {
- if(action.getMultikeyShortcut() != null) {
+ if (action.getMultikeyShortcut() != null) {
MyAction myAction = new MyAction(action);
myActions.put(action, myAction);
Main.registerActionShortcut(myAction, myAction.shortcut);
}
}
- // unregister action and its shortcut completely
+ /**
+ * Unregisters an action and its shortcut completely
+ * @param action The action to remove
+ */
public void removeAction(MultikeyShortcutAction action) {
MyAction a = myActions.get(action);
if (a!=null) {
diff --git a/src/org/openstreetmap/josm/tools/OpenBrowser.java b/src/org/openstreetmap/josm/tools/OpenBrowser.java
index 5629c15..7dabace 100644
--- a/src/org/openstreetmap/josm/tools/OpenBrowser.java
+++ b/src/org/openstreetmap/josm/tools/OpenBrowser.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -19,20 +19,28 @@ import org.openstreetmap.josm.Main;
*
* @author Imi
*/
-public class OpenBrowser {
+public final class OpenBrowser {
+ private OpenBrowser() {
+ // Hide default constructor for utils classes
+ }
+
private static void displayUrlFallback(URI uri) throws IOException {
if (Main.platform == null)
throw new IllegalStateException(tr("Failed to open URL. There is currently no platform set. Please set a platform first."));
Main.platform.openUrl(uri.toString());
}
-
+
/**
+ * Displays an external URI using platform associated software.
+ * A web resource will launch platform's browser, an audio file URI will launch audio player, etc.
+ * @param uri The URI to display
* @return <code>null</code> for success or a string in case of an error.
* @throws IllegalStateException thrown if no platform is set to which opening the URL can be dispatched,
* {@link Main#platform}
*/
public static String displayUrl(URI uri) {
+ CheckParameterUtil.ensureParameterNotNull(uri, "uri");
if (Main.applet) {
try {
JApplet applet = (JApplet) Main.parent;
@@ -42,24 +50,32 @@ public class OpenBrowser {
return mue.getMessage();
}
}
+
+ Main.info(tr("Opening URL: {0}", uri));
if (Desktop.isDesktopSupported()) {
try {
- try {
+ if (Main.platform instanceof PlatformHookWindows) {
+ // Desktop API works fine under Windows, so we don't try any fallback in case of I/O exceptions because it's not API's fault
Desktop.getDesktop().browse(uri);
- } catch (IOException e) {
- // Workaround for KDE (Desktop API is severely flawed)
- // see http://bugs.sun.com/view_bug.do?bug_id=6486393
- System.err.println("Warning: Desktop class failed. Platform dependent fall back for open url in browser.");
- displayUrlFallback(uri);
+ } else {
+ // This is not the case with some Linux environments (see below), and not sure about Mac OS X, so we need to handle API failure
+ try {
+ Desktop.getDesktop().browse(uri);
+ } catch (IOException e) {
+ // Workaround for KDE (Desktop API is severely flawed)
+ // see https://bugs.openjdk.java.net/browse/JDK-6486393
+ Main.warn("Desktop class failed. Platform dependent fall back for open url in browser.");
+ displayUrlFallback(uri);
+ }
}
} catch (Exception e) {
- e.printStackTrace();
+ Main.warn(e);
return e.getMessage();
}
} else {
try {
- System.err.println("Warning: Desktop class is not supported. Platform dependent fall back for open url in browser.");
+ Main.warn("Desktop class is not supported. Platform dependent fall back for open url in browser.");
displayUrlFallback(uri);
} catch (IOException e) {
return e.getMessage();
@@ -68,6 +84,14 @@ public class OpenBrowser {
return null;
}
+ /**
+ * Displays an external URL using platform associated software.
+ * A web resource will launch platform's browser, an audio file URL will launch audio player, etc.
+ * @param url The URL to display
+ * @return <code>null</code> for success or a string in case of an error.
+ * @throws IllegalStateException thrown if no platform is set to which opening the URL can be dispatched,
+ * {@link Main#platform}
+ */
public static String displayUrl(String url) {
try {
return displayUrl(new URI(url));
diff --git a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
index 8120f1c..fbc7d1a 100644
--- a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
+++ b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
@@ -1,6 +1,9 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.HeadlessException;
import java.awt.Toolkit;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -11,24 +14,36 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
-public class OsmUrlToBounds {
+public final class OsmUrlToBounds {
private static final String SHORTLINK_PREFIX = "http://osm.org/go/";
- public static Bounds parse(String url) {
+ private OsmUrlToBounds() {
+ // Hide default constructor for utils classes
+ }
+
+ public static Bounds parse(String url) throws IllegalArgumentException {
try {
// a percent sign indicates an encoded URL (RFC 1738).
if (url.contains("%")) {
url = URLDecoder.decode(url, "UTF-8");
}
} catch (UnsupportedEncodingException x) {
+ Main.error(x);
} catch (IllegalArgumentException x) {
+ Main.error(x);
}
Bounds b = parseShortLink(url);
if (b != null)
return b;
- int i = url.indexOf('?');
- if (i == -1)
+ int i = url.indexOf("#map");
+ if (i >= 0) {
+ // probably it's a URL following the new scheme?
+ return parseHashURLs(url);
+ }
+ i = url.indexOf('?');
+ if (i == -1) {
return null;
+ }
String[] args = url.substring(i+1).split("&");
HashMap<String, String> map = new HashMap<String, String>();
for (String arg : args) {
@@ -40,20 +55,16 @@ public class OsmUrlToBounds {
try {
if (map.containsKey("bbox")) {
- String bbox[] = map.get("bbox").split(",");
+ String[] bbox = map.get("bbox").split(",");
b = new Bounds(
- new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
- new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
+ Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0]),
+ Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2]));
} else if (map.containsKey("minlat")) {
- String s = map.get("minlat");
- Double minlat = Double.parseDouble(s);
- s = map.get("minlon");
- Double minlon = Double.parseDouble(s);
- s = map.get("maxlat");
- Double maxlat = Double.parseDouble(s);
- s = map.get("maxlon");
- Double maxlon = Double.parseDouble(s);
- b = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
+ double minlat = Double.parseDouble(map.get("minlat"));
+ double minlon = Double.parseDouble(map.get("minlon"));
+ double maxlat = Double.parseDouble(map.get("maxlat"));
+ double maxlon = Double.parseDouble(map.get("maxlon"));
+ b = new Bounds(minlat, minlon, maxlat, maxlon);
} else {
String z = map.get("zoom");
b = positionToBounds(parseDouble(map, "lat"),
@@ -70,7 +81,45 @@ public class OsmUrlToBounds {
return b;
}
- private static double parseDouble(HashMap<String, String> map, String key) {
+ /**
+ * Openstreetmap.org changed it's URL scheme in August 2013, which breaks the URL parsing.
+ * The following function, called by the old parse function if necessary, provides parsing new URLs
+ * the new URLs follow the scheme http://www.openstreetmap.org/#map=18/51.71873/8.76164&layers=CN
+ * @param url string for parsing
+ * @return Bounds if hashurl, {@code null} otherwise
+ * @throws IllegalArgumentException if URL is invalid
+ */
+ private static Bounds parseHashURLs(String url) throws IllegalArgumentException {
+ int startIndex = url.indexOf("#map=");
+ if (startIndex == -1) return null;
+ int endIndex = url.indexOf('&', startIndex);
+ if (endIndex == -1) endIndex = url.length();
+ String coordPart = url.substring(startIndex+5, endIndex);
+ String[] parts = coordPart.split("/");
+ if (parts.length < 3) {
+ throw new IllegalArgumentException(tr("URL does not contain {0}/{1}/{2}", tr("zoom"), tr("latitude"), tr("longitude")));
+ }
+ int zoom;
+ double lat, lon;
+ try {
+ zoom = Integer.parseInt(parts[0]);
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException(tr("URL does not contain valid {0}", tr("zoom")), e);
+ }
+ try {
+ lat = Double.parseDouble(parts[1]);
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException(tr("URL does not contain valid {0}", tr("latitude")), e);
+ }
+ try {
+ lon = Double.parseDouble(parts[2]);
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException(tr("URL does not contain valid {0}", tr("longitude")), e);
+ }
+ return positionToBounds(lat, lon, zoom);
+ }
+
+ private static double parseDouble(Map<String, String> map, String key) {
if (map.containsKey(key))
return Double.parseDouble(map.get(key));
return Double.parseDouble(map.get("m"+key));
@@ -88,13 +137,11 @@ public class OsmUrlToBounds {
};
/**
- * p
+ * Parse OSM short link
*
* @param url string for parsing
- *
* @return Bounds if shortlink, null otherwise
- *
- * @see http://trac.openstreetmap.org/browser/sites/rails_port/lib/short_link.rb
+ * @see <a href="http://trac.openstreetmap.org/browser/sites/rails_port/lib/short_link.rb">short_link.rb</a>
*/
private static Bounds parseShortLink(final String url) {
if (!url.startsWith(SHORTLINK_PREFIX))
@@ -145,15 +192,24 @@ public class OsmUrlToBounds {
zoom - 8 - (zoomOffset % 3) - 2);
}
+ /** radius of the earth */
public static final double R = 6378137.0;
public static Bounds positionToBounds(final double lat, final double lon, final int zoom) {
int tileSizeInPixels = 256;
- int height = Toolkit.getDefaultToolkit().getScreenSize().height;
- int width = Toolkit.getDefaultToolkit().getScreenSize().width;
- if (Main.isDisplayingMapView()) {
- height = Main.map.mapView.getHeight();
- width = Main.map.mapView.getWidth();
+ int height;
+ int width;
+ try {
+ height = Toolkit.getDefaultToolkit().getScreenSize().height;
+ width = Toolkit.getDefaultToolkit().getScreenSize().width;
+ if (Main.isDisplayingMapView()) {
+ height = Main.map.mapView.getHeight();
+ width = Main.map.mapView.getWidth();
+ }
+ } catch (HeadlessException he) {
+ // in headless mode, when running tests
+ height = 480;
+ width = 640;
}
double scale = (1 << zoom) * tileSizeInPixels / (2 * Math.PI * R);
double deltaX = width / 2.0 / scale;
@@ -184,11 +240,17 @@ public class OsmUrlToBounds {
return new LatLon(lat, lon);
}
+ /**
+ * Return OSM Zoom level for a given area
+ *
+ * @param b bounds of the area
+ * @return matching zoom level for area
+ */
static public int getZoom(Bounds b) {
// convert to mercator (for calculation of zoom only)
- double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMin().lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
- double latMax = Math.log(Math.tan(Math.PI/4.0+b.getMax().lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
- double size = Math.max(Math.abs(latMax-latMin), Math.abs(b.getMax().lon()-b.getMin().lon()));
+ double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMinLat()/180.0*Math.PI/2.0))*180.0/Math.PI;
+ double latMax = Math.log(Math.tan(Math.PI/4.0+b.getMaxLat()/180.0*Math.PI/2.0))*180.0/Math.PI;
+ double size = Math.max(Math.abs(latMax-latMin), Math.abs(b.getMaxLon()-b.getMinLon()));
int zoom = 0;
while (zoom <= 20) {
if (size >= 180) {
@@ -200,17 +262,44 @@ public class OsmUrlToBounds {
return zoom;
}
- static public String getURL(Bounds b) {
+ /**
+ * Return OSM URL for given area.
+ *
+ * @param b bounds of the area
+ * @return link to display that area in OSM map
+ */
+ public static String getURL(Bounds b) {
return getURL(b.getCenter(), getZoom(b));
}
- static public String getURL(LatLon pos, int zoom) {
+ /**
+ * Return OSM URL for given position and zoom.
+ *
+ * @param pos center position of area
+ * @param zoom zoom depth of display
+ * @return link to display that area in OSM map
+ */
+ public static String getURL(LatLon pos, int zoom) {
+ return getURL(pos.lat(), pos.lon(), zoom);
+ }
+
+ /**
+ * Return OSM URL for given lat/lon and zoom.
+ *
+ * @param dlat center latitude of area
+ * @param dlon center longitude of area
+ * @param zoom zoom depth of display
+ * @return link to display that area in OSM map
+ *
+ * @since 6453
+ */
+ public static String getURL(double dlat, double dlon, int zoom) {
// Truncate lat and lon to something more sensible
int decimals = (int) Math.pow(10, (zoom / 3));
- double lat = (Math.round(pos.lat() * decimals));
+ double lat = (Math.round(dlat * decimals));
lat /= decimals;
- double lon = (Math.round(pos.lon() * decimals));
+ double lon = (Math.round(dlon * decimals));
lon /= decimals;
- return "http://www.openstreetmap.org/?lat="+lat+"&lon="+lon+"&zoom="+zoom;
+ return Main.OSM_WEBSITE + "/#map="+zoom+"/"+lat+"/"+lon;
}
}
diff --git a/src/org/openstreetmap/josm/tools/Pair.java b/src/org/openstreetmap/josm/tools/Pair.java
index 4c1d57f..ca345f9 100644
--- a/src/org/openstreetmap/josm/tools/Pair.java
+++ b/src/org/openstreetmap/josm/tools/Pair.java
@@ -3,12 +3,28 @@ package org.openstreetmap.josm.tools;
import java.util.ArrayList;
/**
- * A pair.
+ * A pair of objects.
+ * @param <A> Type of first item
+ * @param <B> Type of second item
+ * @since 429
*/
public final class Pair<A,B> {
+
+ /**
+ * The first item
+ */
public A a;
+
+ /**
+ * The second item
+ */
public B b;
+ /**
+ * Constructs a new {@code Pair}.
+ * @param a The first item
+ * @param b The second item
+ */
public Pair(A a, B b) {
this.a = a;
this.b = b;
@@ -47,7 +63,12 @@ public final class Pair<A,B> {
return "<"+a+","+b+">";
}
- /* convenience constructor method */
+ /**
+ * Convenient constructor method
+ * @param u The first item
+ * @param v The second item
+ * @return The newly created Pair(u,v)
+ */
public static <U,V> Pair<U,V> create(U u, V v) {
return new Pair<U,V>(u,v);
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHook.java b/src/org/openstreetmap/josm/tools/PlatformHook.java
index a93a93b..da574cb 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHook.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHook.java
@@ -1,39 +1,22 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
/**
- * This interface allows platfrom (operating system) dependent code
+ * This interface allows platform (operating system) dependent code
* to be bundled into self-contained classes.
- *
- * For plugin authors:
- * To implement your own PlatformHook class, implement this interface,
- * then create the class when your plugin is loaded and store it in
- * Main.platform. Please not that the two "startup" hooks will be
- * called _before_ your plugin is loaded. If you need to hook there,
- * split your class into two (one containing only the startup hooks,
- * and one with the remainder) and send the startup class, together
- * with propper OS detection code (see Main) for inclusion with
- * JOSM to the JOSM team.
- *
- * Also, it might be a good idea to extend PlatformHookUnixoid.
- * That class has a more or less neutral behaviour, that should
- * work on all platforms supported by J2SE.
- *
- * Attention: At this time this interface is not to be considered
- * complete.
+ * @since 1023
*/
public interface PlatformHook {
+
/**
* The preStartupHook will be called extremly early. It is
* guaranteed to be called before the GUI setup has started.
*
* Reason: On OSX we need to inform the Swing libraries
- * that we want to be integrated with the OS before we setup
- * our GUI.
+ * that we want to be integrated with the OS before we setup our GUI.
*/
public void preStartupHook();
@@ -48,7 +31,9 @@ public interface PlatformHook {
/**
* The openURL hook will be used to open an URL in the
- * default webbrowser.
+ * default web browser.
+ * @param url The URL to open
+ * @throws IOException if any I/O error occurs
*/
public void openUrl(String url) throws IOException;
@@ -79,17 +64,41 @@ public interface PlatformHook {
* a menu or button is created.
*
* Tooltips are usually not system dependent, unless the
- * JVM is to dumb to provide correct names for all the keys.
+ * JVM is too dumb to provide correct names for all the keys.
*
* Another reason not to use the implementation in the *nix
- * hook are LAFs that don't understand HTML, such as the OSX
- * LAFs.
+ * hook are LAFs that don't understand HTML, such as the OSX LAFs.
+ *
+ * @param name Tooltip text to display
+ * @param sc Shortcut associated (to display accelerator between parenthesis)
+ * @return Full tooltip text (name + accelerator)
*/
public String makeTooltip(String name, Shortcut sc);
+ /**
+ * Returns the default LAF to be used on this platform to look almost as a native application.
+ * @return The default native LAF for this platform
+ */
public String getDefaultStyle();
+ /**
+ * Determines if the platform allows full-screen.
+ * @return {@code true} if full screen is allowed, {@code false} otherwise
+ */
public boolean canFullscreen();
+ /**
+ * Renames a file.
+ * @param from Source file
+ * @param to Target file
+ * @return {@code true} if the file has been renamed, {@code false} otherwise
+ */
public boolean rename(File from, File to);
+
+ /**
+ * Returns a detailed OS description (at least family + version).
+ * @return A detailed OS description.
+ * @since 5850
+ */
+ public String getOSDescription();
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
index 90cd1b1..b88a3f5 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -14,18 +14,22 @@ import javax.swing.UIManager;
import org.openstreetmap.josm.Main;
/**
- * @see PlatformHook
+ * {@code PlatformHook} implementation for Apple Mac OS X systems.
+ * @since 1023
*/
public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook, InvocationHandler {
+
private static PlatformHookOsx ivhandler = new PlatformHookOsx();
+
@Override
- public void preStartupHook(){
+ public void preStartupHook() {
// This will merge our MenuBar into the system menu.
// MUST be set before Swing is initialized!
- // And will not work when one of the system independet LAFs is used.
+ // And will not work when one of the system independent LAFs is used.
// They just insist on painting themselves...
System.setProperty("apple.laf.useScreenMenuBar", "true");
}
+
@Override
public void startupHook() {
// Here we register callbacks for the menu entries in the system menu
@@ -39,17 +43,16 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook
Method MsetEnabledPreferencesMenu = Ccom_apple_eawt_Application.getDeclaredMethod("setEnabledPreferencesMenu", new Class[] { boolean.class });
MsetEnabledPreferencesMenu.invoke(Ocom_apple_eawt_Application, new Object[] { Boolean.TRUE });
} catch (Exception ex) {
- // Oops, what now?
- // We'll just ignore this for now. The user will still be able to close JOSM
- // by closing all its windows.
- System.out.println("Failed to register with OSX: " + ex);
+ // We'll just ignore this for now. The user will still be able to close JOSM by closing all its windows.
+ Main.warn("Failed to register with OSX: " + ex);
}
}
+
+ @Override
public Object invoke (Object proxy, Method method, Object[] args) throws Throwable {
Boolean handled = Boolean.TRUE;
- //System.out.println("Going to handle method "+method+" (short: "+method.getName()+") with event "+args[0]);
if (method.getName().equals("handleQuit")) {
- handled = Main.exitJosm(false);
+ handled = Main.exitJosm(false, 0);
} else if (method.getName().equals("handleAbout")) {
Main.main.menu.about.actionPerformed(null);
} else if (method.getName().equals("handlePreferences")) {
@@ -60,20 +63,19 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook
try {
args[0].getClass().getDeclaredMethod("setHandled", new Class[] { boolean.class }).invoke(args[0], new Object[] { handled });
} catch (Exception ex) {
- System.out.println("Failed to report handled event: " + ex);
+ Main.warn("Failed to report handled event: " + ex);
}
}
return null;
}
+
@Override
public void openUrl(String url) throws IOException {
- // Ain't that KISS?
Runtime.getRuntime().exec("open " + url);
}
@Override
public void initSystemShortcuts() {
- // Yeah, it's a long, long list. And people always complain that OSX has no shortcuts.
Shortcut.registerSystemShortcut("apple-reserved-01", tr("reserved"), KeyEvent.VK_SPACE, KeyEvent.META_DOWN_MASK).setAutomatic(); // Show or hide the Spotlight search field (when multiple languages are installed, may rotate through enabled script systems).
Shortcut.registerSystemShortcut("apple-reserved-02", tr("reserved"), KeyEvent.VK_SPACE, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Apple reserved.
Shortcut.registerSystemShortcut("apple-reserved-03", tr("reserved"), KeyEvent.VK_SPACE, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Show the Spotlight search results window (when multiple languages are installed, may rotate through keyboard layouts and input methods within a script).
@@ -209,6 +211,7 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook
Shortcut.registerSystemShortcut("view:zoomin", tr("reserved"), KeyEvent.VK_ADD, KeyEvent.META_DOWN_MASK); // Zoom in
Shortcut.registerSystemShortcut("view:zoomout", tr("reserved"), KeyEvent.VK_SUBTRACT, KeyEvent.META_DOWN_MASK); // Zoom out
}
+
@Override
public String makeTooltip(String name, Shortcut sc) {
String lafid = UIManager.getLookAndFeel().getID();
@@ -239,14 +242,17 @@ public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook
}
@Override
- public String getDefaultStyle()
- {
+ public String getDefaultStyle() {
return "javax.swing.plaf.metal.MetalLookAndFeel";
}
@Override
- public boolean canFullscreen()
- {
+ public boolean canFullscreen() {
return false;
}
+
+ @Override
+ public String getOSDescription() {
+ return System.getProperty("os.name") + " " + System.getProperty("os.version");
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
index 9a377a3..021839e 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
@@ -1,15 +1,22 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.Dimension;
import java.awt.GraphicsEnvironment;
import java.awt.event.KeyEvent;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileReader;
import java.io.IOException;
-import java.util.HashMap;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+
+import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.ExtendedDialog;
/**
* see PlatformHook.java
@@ -20,8 +27,11 @@ import org.openstreetmap.josm.Main;
* hooks are subclasses of this class.
*/
public class PlatformHookUnixoid implements PlatformHook {
+
+ private String osDescription;
+
@Override
- public void preStartupHook(){
+ public void preStartupHook() {
}
@Override
@@ -36,6 +46,7 @@ public class PlatformHookUnixoid implements PlatformHook {
Runtime.getRuntime().exec(program+" "+url);
return;
} catch (IOException e) {
+ Main.warn(e);
}
}
}
@@ -48,6 +59,7 @@ public class PlatformHookUnixoid implements PlatformHook {
Shortcut.registerSystemShortcut("system:reset", tr("reserved"), KeyEvent.VK_DELETE, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
Shortcut.registerSystemShortcut("system:resetX", tr("reserved"), KeyEvent.VK_BACK_SPACE, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
}
+
/**
* This should work for all platforms. Yeah, should.
* See PlatformHook.java for a list of reasons why
@@ -74,15 +86,208 @@ public class PlatformHookUnixoid implements PlatformHook {
}
@Override
- public boolean canFullscreen()
- {
+ public boolean canFullscreen() {
return GraphicsEnvironment.getLocalGraphicsEnvironment()
.getDefaultScreenDevice().isFullScreenSupported();
}
@Override
- public boolean rename(File from, File to)
- {
+ public boolean rename(File from, File to) {
return from.renameTo(to);
}
+
+ /**
+ * Get the Java package name including detailed version.
+ *
+ * Some Java bugs are specific to a certain security update, so in addition
+ * to the Java version, we also need the exact package version.
+ *
+ * This was originally written for #8921, so only Debian based distributions
+ * are covered at the moment. This can be extended to other distributions
+ * if needed.
+ *
+ * @return The package name and package version if it can be identified, null
+ * otherwise
+ */
+ public String getJavaPackageDetails() {
+ try {
+ String dist = Utils.execOutput(Arrays.asList("lsb_release", "-i", "-s"));
+ if ("Debian".equalsIgnoreCase(dist) || "Ubuntu".equalsIgnoreCase(dist)) {
+ String javaHome = System.getProperty("java.home");
+ if ("/usr/lib/jvm/java-6-openjdk-amd64/jre".equals(javaHome) ||
+ "/usr/lib/jvm/java-6-openjdk-i386/jre".equals(javaHome) ||
+ "/usr/lib/jvm/java-6-openjdk/jre".equals(javaHome)) {
+ String version = Utils.execOutput(Arrays.asList("dpkg-query", "--show", "--showformat", "${Architecture}-${Version}", "openjdk-6-jre"));
+ return "openjdk-6-jre:" + version;
+ }
+ if ("/usr/lib/jvm/java-7-openjdk-amd64/jre".equals(javaHome) ||
+ "/usr/lib/jvm/java-7-openjdk-i386/jre".equals(javaHome)) {
+ String version = Utils.execOutput(Arrays.asList("dpkg-query", "--show", "--showformat", "${Architecture}-${Version}", "openjdk-7-jre"));
+ return "openjdk-7-jre:" + version;
+ }
+ }
+ } catch (IOException e) {
+ Main.warn(e);
+ }
+ return null;
+ }
+
+ protected String buildOSDescription() {
+ String osName = System.getProperty("os.name");
+ if ("Linux".equalsIgnoreCase(osName)) {
+ try {
+ // Try lsb_release (only available on LSB-compliant Linux systems, see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
+ Process p = Runtime.getRuntime().exec("lsb_release -ds");
+ BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String line = Utils.strip(input.readLine());
+ Utils.close(input);
+ if (line != null && !line.isEmpty()) {
+ line = line.replaceAll("\"+","");
+ line = line.replaceAll("NAME=",""); // strange code for some Gentoo's
+ if(line.startsWith("Linux ")) // e.g. Linux Mint
+ return line;
+ else if(!line.isEmpty())
+ return "Linux " + line;
+ }
+ } catch (IOException e) {
+ // Non LSB-compliant Linux system. List of common fallback release files: http://linuxmafia.com/faq/Admin/release-files.html
+ for (LinuxReleaseInfo info : new LinuxReleaseInfo[]{
+ new LinuxReleaseInfo("/etc/lsb-release", "DISTRIB_DESCRIPTION", "DISTRIB_ID", "DISTRIB_RELEASE"),
+ new LinuxReleaseInfo("/etc/os-release", "PRETTY_NAME", "NAME", "VERSION"),
+ new LinuxReleaseInfo("/etc/arch-release"),
+ new LinuxReleaseInfo("/etc/debian_version", "Debian GNU/Linux "),
+ new LinuxReleaseInfo("/etc/fedora-release"),
+ new LinuxReleaseInfo("/etc/gentoo-release"),
+ new LinuxReleaseInfo("/etc/redhat-release")
+ }) {
+ String description = info.extractDescription();
+ if (description != null && !description.isEmpty()) {
+ return "Linux " + description;
+ }
+ }
+ }
+ }
+ return osName;
+ }
+
+ @Override
+ public String getOSDescription() {
+ if (osDescription == null) {
+ osDescription = buildOSDescription();
+ }
+ return osDescription;
+ }
+
+ protected static class LinuxReleaseInfo {
+ private final String path;
+ private final String descriptionField;
+ private final String idField;
+ private final String releaseField;
+ private final boolean plainText;
+ private final String prefix;
+
+ public LinuxReleaseInfo(String path, String descriptionField, String idField, String releaseField) {
+ this(path, descriptionField, idField, releaseField, false, null);
+ }
+
+ public LinuxReleaseInfo(String path) {
+ this(path, null, null, null, true, null);
+ }
+
+ public LinuxReleaseInfo(String path, String prefix) {
+ this(path, null, null, null, true, prefix);
+ }
+
+ private LinuxReleaseInfo(String path, String descriptionField, String idField, String releaseField, boolean plainText, String prefix) {
+ this.path = path;
+ this.descriptionField = descriptionField;
+ this.idField = idField;
+ this.releaseField = releaseField;
+ this.plainText = plainText;
+ this.prefix = prefix;
+ }
+
+ @Override public String toString() {
+ return "ReleaseInfo [path=" + path + ", descriptionField=" + descriptionField +
+ ", idField=" + idField + ", releaseField=" + releaseField + "]";
+ }
+
+ /**
+ * Extracts OS detailed information from a Linux release file (/etc/xxx-release)
+ * @return The OS detailed information, or {@code null}
+ */
+ public String extractDescription() {
+ String result = null;
+ if (path != null) {
+ File file = new File(path);
+ if (file.exists()) {
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new FileReader(file));
+ String id = null;
+ String release = null;
+ String line;
+ while (result == null && (line = reader.readLine()) != null) {
+ if (line.contains("=")) {
+ String[] tokens = line.split("=");
+ if (tokens.length >= 2) {
+ // Description, if available, contains exactly what we need
+ if (descriptionField != null && descriptionField.equalsIgnoreCase(tokens[0])) {
+ result = Utils.strip(tokens[1]);
+ } else if (idField != null && idField.equalsIgnoreCase(tokens[0])) {
+ id = Utils.strip(tokens[1]);
+ } else if (releaseField != null && releaseField.equalsIgnoreCase(tokens[0])) {
+ release = Utils.strip(tokens[1]);
+ }
+ }
+ } else if (plainText && !line.isEmpty()) {
+ // Files composed of a single line
+ result = Utils.strip(line);
+ }
+ }
+ // If no description has been found, try to rebuild it with "id" + "release" (i.e. "name" + "version")
+ if (result == null && id != null && release != null) {
+ result = id + " " + release;
+ }
+ } catch (IOException e) {
+ // Ignore
+ } finally {
+ Utils.close(reader);
+ }
+ }
+ }
+ // Append prefix if any
+ if (result != null && !result.isEmpty() && prefix != null && !prefix.isEmpty()) {
+ result = prefix + result;
+ }
+ if(result != null)
+ result = result.replaceAll("\"+","");
+ return result;
+ }
+ }
+
+ protected void askUpdateJava(String version) {
+ try {
+ ExtendedDialog ed = new ExtendedDialog(
+ Main.parent,
+ tr("Outdated Java version"),
+ new String[]{tr("Update Java"), tr("Cancel")});
+ // Check if the dialog has not already been permanently hidden by user
+ if (!ed.toggleEnable("askUpdateJava7").toggleCheckState()) {
+ ed.setButtonIcons(new String[]{"java.png", "cancel.png"}).setCancelButton(2);
+ ed.setMinimumSize(new Dimension(460, 260));
+ ed.setIcon(JOptionPane.WARNING_MESSAGE);
+ ed.setContent(tr("You are running version {0} of Java.", "<b>"+version+"</b>")+"<br><br>"+
+ "<b>"+tr("This version is no longer supported by {0} since {1} and is not recommended for use.", "Oracle", tr("February 2013"))+"</b><br><br>"+
+ "<b>"+tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", "7")+"</b><br><br>"+
+ tr("Would you like to update now ?"));
+
+ if (ed.showDialog().getValue() == 1) {
+ openUrl("http://www.java.com/download");
+ }
+ }
+ } catch (IOException e) {
+ Main.warn(e);
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
index 11eef83..cbd2ac6 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static java.awt.event.InputEvent.ALT_DOWN_MASK;
@@ -11,7 +11,6 @@ import static java.awt.event.KeyEvent.VK_DELETE;
import static java.awt.event.KeyEvent.VK_DOWN;
import static java.awt.event.KeyEvent.VK_ENTER;
import static java.awt.event.KeyEvent.VK_ESCAPE;
-import static java.awt.event.KeyEvent.VK_F1;
import static java.awt.event.KeyEvent.VK_F10;
import static java.awt.event.KeyEvent.VK_F4;
import static java.awt.event.KeyEvent.VK_LEFT;
@@ -32,9 +31,22 @@ import java.io.File;
import java.io.IOException;
/**
- * see PlatformHook.java
+ * {@code PlatformHook} implementation for Microsoft Windows systems.
+ * @since 1023
*/
public class PlatformHookWindows extends PlatformHookUnixoid implements PlatformHook {
+
+ @Override
+ public void startupHook() {
+ super.startupHook();
+ // Invite users to install Oracle Java 7 if they are still with Sun/Oracle Java 6
+ String vendor = System.getProperty("java.vendor");
+ String version = System.getProperty("java.version");
+ if ("Sun Microsystems Inc.".equals(vendor) && version != null && version.startsWith("1.6")) {
+ askUpdateJava(version);
+ }
+ }
+
@Override
public void openUrl(String url) throws IOException {
Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
@@ -44,7 +56,7 @@ public class PlatformHookWindows extends PlatformHookUnixoid implements Platform
public void initSystemShortcuts() {
//Shortcut.registerSystemCut("system:menuexit", tr("reserved"), VK_Q, CTRL_DOWN_MASK);
Shortcut.registerSystemShortcut("system:duplicate", tr("reserved"), VK_D, CTRL_DOWN_MASK); // not really system, but to avoid odd results
-
+
// Windows 7 shortcuts: http://windows.microsoft.com/en-US/windows7/Keyboard-shortcuts
// Shortcuts with setAutomatic(): items with automatic shortcuts will not be added to the menu bar at all
@@ -56,7 +68,7 @@ public class PlatformHookWindows extends PlatformHookUnixoid implements Platform
Shortcut.registerSystemShortcut("microsoft-reserved-01", tr("reserved"), VK_PRINTSCREEN, ALT_DOWN_MASK | SHIFT_DOWN_MASK).setAutomatic(); // Turn High Contrast on or off
Shortcut.registerSystemShortcut("microsoft-reserved-02", tr("reserved"), VK_NUM_LOCK, ALT_DOWN_MASK | SHIFT_DOWN_MASK).setAutomatic(); // Turn Mouse Keys on or off
//Shortcut.registerSystemCut("microsoft-reserved-03", tr("reserved"), VK_U, );// Open the Ease of Access Center (TODO: Windows-U, how to handle it in Java ?)
-
+
// General keyboard shortcuts
//Shortcut.registerSystemShortcut("system:help", tr("reserved"), VK_F1, 0); // Display Help
Shortcut.registerSystemShortcut("system:copy", tr("reserved"), VK_C, CTRL_DOWN_MASK); // Copy the selected item
@@ -111,16 +123,20 @@ public class PlatformHookWindows extends PlatformHookUnixoid implements Platform
}
@Override
- public String getDefaultStyle()
- {
+ public String getDefaultStyle() {
return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
}
@Override
- public boolean rename(File from, File to)
- {
- if(to.exists())
+ public boolean rename(File from, File to) {
+ if (to.exists())
to.delete();
return from.renameTo(to);
}
+
+ @Override
+ public String getOSDescription() {
+ return Utils.strip(System.getProperty("os.name")) + " " +
+ ((System.getenv("ProgramFiles(x86)") == null) ? "32" : "64") + "-Bit";
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/Predicate.java b/src/org/openstreetmap/josm/tools/Predicate.java
index 5b6305d..c0cacb7 100644
--- a/src/org/openstreetmap/josm/tools/Predicate.java
+++ b/src/org/openstreetmap/josm/tools/Predicate.java
@@ -1,8 +1,18 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
-// Used to identify objects that fulfill a certain condition, e.g. when filtering a collection
+/**
+ * Used to identify objects that fulfill a certain condition, e.g. when filtering a collection.
+ *
+ * @param <T> The objects type
+ * @since 3177
+ */
public interface Predicate<T> {
- // @return whether the object passes the test or not
+
+ /**
+ * Determines whether the object passes the test or not
+ * @param object The object to evaluate
+ * @return {@code true} if the object passes the test, {@code false} otherwise
+ */
public boolean evaluate(T object);
}
diff --git a/src/org/openstreetmap/josm/tools/PresetTextComparator.java b/src/org/openstreetmap/josm/tools/PresetTextComparator.java
index 67cd81d..4b4c784 100644
--- a/src/org/openstreetmap/josm/tools/PresetTextComparator.java
+++ b/src/org/openstreetmap/josm/tools/PresetTextComparator.java
@@ -9,6 +9,7 @@ import javax.swing.JMenuItem;
import org.openstreetmap.josm.Main;
public class PresetTextComparator implements Comparator<JMenuItem>, Serializable {
+ @Override
public int compare(JMenuItem arg0, JMenuItem arg1) {
if (Main.main.menu.presetSearchAction.equals(arg0.getAction()))
return -1;
diff --git a/src/org/openstreetmap/josm/tools/Property.java b/src/org/openstreetmap/josm/tools/Property.java
index 0978684..f85e235 100644
--- a/src/org/openstreetmap/josm/tools/Property.java
+++ b/src/org/openstreetmap/josm/tools/Property.java
@@ -3,18 +3,22 @@ package org.openstreetmap.josm.tools;
/**
* Small interface to define a property with both read and write access.
+ * @param <O> Object type
+ * @param <P> Property type
*/
-public interface Property<ObjectType, PropertyType> {
+public interface Property<O, P> {
+
/**
* Get the value of the property.
* @param obj the object, from that the property is derived
* @return the value of the property for the object obj
*/
- public PropertyType get(ObjectType obj);
+ public P get(O obj);
+
/**
* Set the value of the property for the object.
* @param obj the object for that the property should be set
* @param value the value the property is set to
*/
- public void set(ObjectType obj, PropertyType value);
+ public void set(O obj, P value);
}
diff --git a/src/org/openstreetmap/josm/tools/Shortcut.java b/src/org/openstreetmap/josm/tools/Shortcut.java
index 32ba194..d66eba0 100644
--- a/src/org/openstreetmap/josm/tools/Shortcut.java
+++ b/src/org/openstreetmap/josm/tools/Shortcut.java
@@ -1,4 +1,4 @@
-//License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -6,7 +6,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -16,7 +15,6 @@ import java.util.Map;
import javax.swing.AbstractAction;
import javax.swing.AbstractButton;
import javax.swing.JMenu;
-import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import org.openstreetmap.josm.Main;
@@ -35,11 +33,11 @@ import org.openstreetmap.josm.Main;
* public so the shortcut preferences can use them.
*
*/
-public class Shortcut {
+public final class Shortcut {
private String shortText; // the unique ID of the shortcut
private String longText; // a human readable description that will be shown in the preferences
- private int requestedKey; // the key, the caller requested
- private int requestedGroup; // the group, the caller requested
+ private final int requestedKey; // the key, the caller requested
+ private final int requestedGroup;// the group, the caller requested
private int assignedKey; // the key that actually is used
private int assignedModifier; // the modifiers that are used
private boolean assignedDefault; // true if it got assigned what was requested. (Note: modifiers will be ignored in favour of group when loading it from the preferences then.)
@@ -75,14 +73,6 @@ public class Shortcut {
this.longText = longText;
}
- private int getRequestedKey() {
- return requestedKey;
- }
-
- public int getRequestedGroup() {
- return requestedGroup;
- }
-
public int getAssignedKey() {
return assignedKey;
}
@@ -157,7 +147,7 @@ public class Shortcut {
// create a shortcut object from an string as saved in the preferences
private Shortcut(String prefString) {
- ArrayList<String> s = (new ArrayList<String>(Main.pref.getCollection(prefString)));
+ List<String> s = (new ArrayList<String>(Main.pref.getCollection(prefString)));
this.shortText = prefString.substring(15);
this.longText = s.get(0);
this.requestedKey = Integer.parseInt(s.get(1));
@@ -247,7 +237,7 @@ public class Shortcut {
private static Map<Integer, Integer> groups= new HashMap<Integer, Integer>();
// check if something collides with an existing shortcut
- private static Shortcut findShortcut(int requestedKey, int modifier) {
+ public static Shortcut findShortcut(int requestedKey, int modifier) {
if (modifier == getGroupModifier(NONE))
return null;
for (Shortcut sc : shortcuts.values()) {
@@ -372,7 +362,7 @@ public class Shortcut {
Shortcut potentialShortcut = findShortcut(key, modifier);
if (potentialShortcut != null) {
// this always is a logic error in the hook
- System.err.println("CONFLICT WITH SYSTEM KEY "+shortText);
+ Main.error("CONFLICT WITH SYSTEM KEY "+shortText);
return null;
}
potentialShortcut = new Shortcut(shortText, longText, key, RESERVED, key, modifier, true, false);
@@ -416,7 +406,7 @@ public class Shortcut {
int newmodifier = getGroupModifier(m);
if ( findShortcut(k, newmodifier) == null ) {
Shortcut newsc = new Shortcut(shortText, longText, requestedKey, m, k, newmodifier, false, false);
- System.out.println(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
+ Main.info(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.",
shortText, conflict.getShortText(), newsc.getKeyText()));
newsc.saveDefault();
shortcuts.put(shortText, newsc);
diff --git a/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java b/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java
index c2a602e..db4c838 100644
--- a/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java
+++ b/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java
@@ -40,11 +40,13 @@ public class SubclassFilteredCollection<S, T extends S> extends AbstractCollecti
}
}
+ @Override
public boolean hasNext() {
findNext();
return current != null;
}
+ @Override
public T next() {
findNext();
S old = current;
@@ -54,6 +56,7 @@ public class SubclassFilteredCollection<S, T extends S> extends AbstractCollecti
return res;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java b/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java
index 85fd563..5ba65a8 100644
--- a/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java
+++ b/src/org/openstreetmap/josm/tools/TaggingPresetNameTemplateList.java
@@ -9,12 +9,12 @@ import java.util.List;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
+import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
/**
* List of tagging presets with name templates, allows to find appropriate template based on existing primitive
*/
-public class TaggingPresetNameTemplateList {
+public final class TaggingPresetNameTemplateList {
private static TaggingPresetNameTemplateList instance;
@@ -39,7 +39,7 @@ public class TaggingPresetNameTemplateList {
public TaggingPreset findPresetTemplate(OsmPrimitive primitive) {
for (TaggingPreset t : presetsWithPattern) {
- Collection<PresetType> type = Collections.singleton(PresetType.forPrimitive(primitive));
+ Collection<TaggingPresetType> type = Collections.singleton(TaggingPresetType.forPrimitive(primitive));
if (t.typeMatches(type)) {
if (t.nameTemplateFilter != null) {
if (t.nameTemplateFilter.match(primitive))
diff --git a/src/org/openstreetmap/josm/tools/TextTagParser.java b/src/org/openstreetmap/josm/tools/TextTagParser.java
index d5a582a..8f16a2e 100644
--- a/src/org/openstreetmap/josm/tools/TextTagParser.java
+++ b/src/org/openstreetmap/josm/tools/TextTagParser.java
@@ -1,22 +1,32 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
+
+import java.awt.GridBagLayout;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
+import javax.swing.JLabel;
import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.io.XmlWriter;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
+import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
/**
* Class that helps to parse tags from arbitrary text
*/
-public class TextTagParser {
+public final class TextTagParser {
// properties need JOSM restart to apply, modified rarely enough
protected static final int MAX_KEY_LENGTH = Main.pref.getInteger("tags.paste.max-key-length", 50);
@@ -24,16 +34,17 @@ public class TextTagParser {
protected static final String KEY_PATTERN = Main.pref.get("tags.paste.tag-pattern", "[0-9a-zA-Z:_]*");
protected static final int MAX_VALUE_LENGTH = 255;
+ private TextTagParser() {
+ // Hide default constructor for utils classes
+ }
+
public static class TextAnalyzer {
- int start = 0;
- boolean keyFound = false;
boolean quotesStarted = false;
boolean esc = false;
StringBuilder s = new StringBuilder(200);
int pos;
String data;
int n;
- boolean notFound;
public TextAnalyzer(String text) {
pos = 0;
@@ -62,7 +73,7 @@ public class TextTagParser {
}
private String parseString(String stopChars) {
- char stop[] = stopChars.toCharArray();
+ char[] stop = stopChars.toCharArray();
Arrays.sort(stop);
char c;
while (pos < n) {
@@ -101,7 +112,7 @@ public class TextTagParser {
private void skipSign() {
char c;
- boolean signFound = false;;
+ boolean signFound = false;
while (pos < n) {
c = data.charAt(pos);
if (c == '\t' || c == '\n' || c == ' ') {
@@ -150,7 +161,7 @@ public class TextTagParser {
* @param unescapeTextInQuotes - if true, matched tag and value will be analyzed more thoroughly
*/
public static Map<String, String> readTagsByRegexp(String text, String splitRegex, String tagRegex, boolean unescapeTextInQuotes) {
- String lines[] = text.split(splitRegex);
+ String[] lines = text.split(splitRegex);
Pattern p = Pattern.compile(tagRegex);
Map<String, String> tags = new HashMap<String,String>();
String k=null, v=null;
@@ -223,32 +234,32 @@ public class TextTagParser {
/**
* Check tags for correctness and display warnings if needed
* @param tags - map key->value to check
- * @return true if user decision was "OK"
+ * @return true if the tags should be pasted
*/
public static boolean validateTags(Map<String, String> tags) {
- String value;
int r;
int s = tags.size();
if (s > MAX_KEY_COUNT) {
// Use trn() even if for english it makes no sense, as s > 30
r=warning(trn("There was {0} tag found in the buffer, it is suspicious!",
"There were {0} tags found in the buffer, it is suspicious!", s,
- s), "", "toomanytags");
- if (r==2) return false; if (r==3) return true;
+ s), "", "tags.paste.toomanytags");
+ if (r==2 || r==3) return false; if (r==4) return true;
}
- for (String key: tags.keySet()) {
- value = tags.get(key);
+ for (Entry<String, String> entry : tags.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
if (key.length() > MAX_KEY_LENGTH) {
- r = warning(tr("Key is too long (max {0} characters):", MAX_KEY_LENGTH), key+"="+value, "keytoolong");
- if (r==2) return false; if (r==3) return true;
+ r = warning(tr("Key is too long (max {0} characters):", MAX_KEY_LENGTH), key+"="+value, "tags.paste.keytoolong");
+ if (r==2 || r==3) return false; if (r==4) return true;
}
if (!key.matches(KEY_PATTERN)) {
- r = warning(tr("Suspicious characters in key:"), key, "keydoesnotmatch");
- if (r==2) return false; if (r==3) return true;
+ r = warning(tr("Suspicious characters in key:"), key, "tags.paste.keydoesnotmatch");
+ if (r==2 || r==3) return false; if (r==4) return true;
}
if (value.length() > MAX_VALUE_LENGTH) {
- r = warning(tr("Value is too long (max {0} characters):", MAX_VALUE_LENGTH), value, "valuetoolong");
- if (r==2) return false; if (r==3) return true;
+ r = warning(tr("Value is too long (max {0} characters):", MAX_VALUE_LENGTH), value, "tags.paste.valuetoolong");
+ if (r==2 || r==3) return false; if (r==4) return true;
}
}
return true;
@@ -258,18 +269,52 @@ public class TextTagParser {
ExtendedDialog ed = new ExtendedDialog(
Main.parent,
tr("Do you want to paste these tags?"),
- new String[]{tr("Ok"), tr("Cancel"), tr("Ignore warnings")});
- ed.setButtonIcons(new String[]{"ok.png", "cancel.png", "pastetags.png"});
+ new String[]{tr("Ok"), tr("Cancel"), tr("Clear buffer"), tr("Ignore warnings")});
+ ed.setButtonIcons(new String[]{"ok.png", "cancel.png", "dialogs/delete.png", "pastetags.png"});
ed.setContent("<html><b>"+text + "</b><br/><br/><div width=\"300px\">"+XmlWriter.encode(data,true)+"</html>");
ed.setDefaultButton(2);
ed.setCancelButton(2);
ed.setIcon(JOptionPane.WARNING_MESSAGE);
ed.toggleEnable(code);
ed.showDialog();
- Object o = ed.getValue();
- if (o instanceof Integer)
- return ((Integer)o).intValue();
- else
- return 2;
+ int r = ed.getValue();
+ if (r==0) r = 2;
+ // clean clipboard if user asked
+ if (r==3) Utils.copyToClipboard("");
+ return r;
+ }
+
+ /**
+ * Shows message that the buffer can not be pasted, allowing user to clean the buffer
+ * @param helpTopic the help topic of the parent action
+ * TODO: Replace by proper HelpAwareOptionPane instead of self-made help link
+ */
+ public static void showBadBufferMessage(String helpTopic) {
+ String msg = tr("<html><p> Sorry, it is impossible to paste tags from buffer. It does not contain any JOSM object"
+ + " or suitable text. </p></html>");
+ JPanel p = new JPanel(new GridBagLayout());
+ p.add(new JLabel(msg),GBC.eop());
+ String helpUrl = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(helpTopic, LocaleType.DEFAULT));
+ if (helpUrl != null) {
+ p.add(new UrlLabel(helpUrl), GBC.eop());
+ }
+
+ ExtendedDialog ed = new ExtendedDialog(
+ Main.parent,
+ tr("Warning"),
+ new String[]{tr("Ok"), tr("Clear buffer")});
+
+ ed.setButtonIcons(new String[]{"ok.png", "dialogs/delete.png"});
+
+ ed.setContent(p);
+ ed.setDefaultButton(1);
+ ed.setCancelButton(1);
+ ed.setIcon(JOptionPane.WARNING_MESSAGE);
+ ed.toggleEnable("tags.paste.cleanbadbuffer");
+ ed.showDialog();
+
+ int r = ed.getValue();
+ // clean clipboard if user asked
+ if (r==2) Utils.copyToClipboard("");
}
}
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index a0ce874..48149d6 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
+
import java.awt.Color;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
@@ -9,30 +12,47 @@ import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.Closeable;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.net.URLConnection;
+import java.nio.channels.FileChannel;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.MessageFormat;
import java.util.AbstractCollection;
import java.util.AbstractList;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.ZipFile;
+import org.apache.tools.bzip2.CBZip2InputStream;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.io.FileImporter;
/**
* Basic utils, that can be useful in different parts of the program.
*/
-public class Utils {
+public final class Utils {
+
+ private Utils() {
+ // Hide default constructor for utils classes
+ }
public static <T> boolean exists(Iterable<? extends T> collection, Predicate<? super T> predicate) {
for (T item : collection) {
@@ -232,6 +252,58 @@ public class Utils {
return new Color(255 - clr.getRed(), 255 - clr.getGreen(), 255 - clr.getBlue(), clr.getAlpha());
}
+ /**
+ * Copies the given array. Unlike {@link Arrays#copyOf}, this method is null-safe.
+ * @param array The array to copy
+ * @return A copy of the original array, or {@code null} if {@code array} is null
+ * @since 6221
+ */
+ public static <T> T[] copyArray(T[] array) {
+ if (array != null) {
+ return Arrays.copyOf(array, array.length);
+ }
+ return null;
+ }
+
+ /**
+ * Copies the given array. Unlike {@link Arrays#copyOf}, this method is null-safe.
+ * @param array The array to copy
+ * @return A copy of the original array, or {@code null} if {@code array} is null
+ * @since 6222
+ */
+ public static char[] copyArray(char[] array) {
+ if (array != null) {
+ return Arrays.copyOf(array, array.length);
+ }
+ return null;
+ }
+
+ /**
+ * Simple file copy function that will overwrite the target file.<br/>
+ * Taken from <a href="http://www.rgagnon.com/javadetails/java-0064.html">this article</a> (CC-NC-BY-SA)
+ * @param in The source file
+ * @param out The destination file
+ * @throws IOException If any I/O error occurs
+ */
+ public static void copyFile(File in, File out) throws IOException {
+ // TODO: remove this function when we move to Java 7 (use Files.copy instead)
+ FileInputStream inStream = null;
+ FileOutputStream outStream = null;
+ try {
+ inStream = new FileInputStream(in);
+ outStream = new FileOutputStream(out);
+ FileChannel inChannel = inStream.getChannel();
+ inChannel.transferTo(0, inChannel.size(), outStream.getChannel());
+ }
+ catch (IOException e) {
+ throw e;
+ }
+ finally {
+ close(outStream);
+ close(inStream);
+ }
+ }
+
public static int copyStream(InputStream source, OutputStream destination) throws IOException {
int count = 0;
byte[] b = new byte[512];
@@ -246,12 +318,11 @@ public class Utils {
public static boolean deleteDirectory(File path) {
if( path.exists() ) {
File[] files = path.listFiles();
- for(int i=0; i<files.length; i++) {
- if(files[i].isDirectory()) {
- deleteDirectory(files[i]);
- }
- else {
- files[i].delete();
+ for (File file : files) {
+ if (file.isDirectory()) {
+ deleteDirectory(file);
+ } else {
+ file.delete();
}
}
}
@@ -259,51 +330,43 @@ public class Utils {
}
/**
- * <p>Utility method for closing an input stream.</p>
+ * <p>Utility method for closing a {@link Closeable} object.</p>
*
- * @param is the input stream. May be null.
+ * @param c the closeable object. May be null.
*/
- public static void close(InputStream is){
- if (is == null) return;
+ public static void close(Closeable c) {
+ if (c == null) return;
try {
- is.close();
- } catch(IOException e){
- // ignore
+ c.close();
+ } catch (IOException e) {
+ Main.warn(e);
}
}
/**
- * <p>Utility method for closing an output stream.</p>
+ * <p>Utility method for closing a {@link ZipFile}.</p>
*
- * @param os the output stream. May be null.
+ * @param zip the zip file. May be null.
*/
- public static void close(OutputStream os){
- if (os == null) return;
+ public static void close(ZipFile zip) {
+ if (zip == null) return;
try {
- os.close();
- } catch(IOException e){
- // ignore
+ zip.close();
+ } catch (IOException e) {
+ Main.warn(e);
}
}
+ private final static double EPSILON = 1e-11;
+
/**
- * <p>Utility method for closing a reader.</p>
- *
- * @param reader the reader. May be null.
+ * Determines if the two given double values are equal (their delta being smaller than a fixed epsilon)
+ * @param a The first double value to compare
+ * @param b The second double value to compare
+ * @return {@code true} if {@code abs(a - b) <= 1e-11}, {@code false} otherwise
*/
- public static void close(Reader reader){
- if (reader == null) return;
- try {
- reader.close();
- } catch(IOException e){
- // ignore
- }
- }
-
- private final static double EPSILION = 1e-11;
-
public static boolean equalsEpsilon(double a, double b) {
- return Math.abs(a - b) <= EPSILION;
+ return Math.abs(a - b) <= EPSILON;
}
/**
@@ -336,11 +399,12 @@ public class Utils {
for (int tries = 0; t == null && tries < 10; tries++) {
try {
t = clipboard.getContents(null);
- } catch (IllegalStateException e) {
+ } catch (IllegalStateException e) {
// Clipboard currently unavailable. On some platforms, the system clipboard is unavailable while it is accessed by another application.
try {
Thread.sleep(1);
} catch (InterruptedException ex) {
+ Main.warn("InterruptedException in "+Utils.class.getSimpleName()+" while getting clipboard content");
}
}
}
@@ -381,6 +445,8 @@ public class Utils {
return toHexString(byteDigest);
}
+ private static final char[] HEX_ARRAY = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
+
/**
* Converts a byte array to a string of hexadecimal characters.
* Preserves leading zeros, so the size of the output string is always twice
@@ -389,12 +455,21 @@ public class Utils {
* @return hexadecimal representation
*/
public static String toHexString(byte[] bytes) {
- char[] hexArray = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
- char[] hexChars = new char[bytes.length * 2];
- for (int j=0; j<bytes.length; j++) {
- int v = bytes[j] & 0xFF;
- hexChars[j*2] = hexArray[v/16];
- hexChars[j*2 + 1] = hexArray[v%16];
+
+ if (bytes == null) {
+ return "";
+ }
+
+ final int len = bytes.length;
+ if (len == 0) {
+ return "";
+ }
+
+ char[] hexChars = new char[len * 2];
+ for (int i = 0, j = 0; i < len; i++) {
+ final int v = bytes[i];
+ hexChars[j++] = HEX_ARRAY[(v & 0xf0) >> 4];
+ hexChars[j++] = HEX_ARRAY[v & 0xf];
}
return new String(hexChars);
}
@@ -422,7 +497,7 @@ public class Utils {
for (int i=0; i<size; ++i) {
T parentless = null;
for (T key : deps.keySet()) {
- if (deps.get(key).size() == 0) {
+ if (deps.get(key).isEmpty()) {
parentless = key;
break;
}
@@ -540,7 +615,7 @@ public class Utils {
throw new IllegalArgumentException();
return new Color(Integer.parseInt(clr, 16));
}
-
+
/**
* Opens a HTTP connection to the given URL and sets the User-Agent property to JOSM's one.
* @param httpURL The HTTP url to open (must use http:// or https://)
@@ -553,14 +628,85 @@ public class Utils {
throw new IllegalArgumentException("Invalid HTTP url");
}
HttpURLConnection connection = (HttpURLConnection) httpURL.openConnection();
- connection.setRequestProperty("User-Agent", Version.getInstance().getAgentString());
+ connection.setRequestProperty("User-Agent", Version.getInstance().getFullAgentString());
+ connection.setUseCaches(false);
return connection;
}
-
+
+ /**
+ * Opens a connection to the given URL and sets the User-Agent property to JOSM's one.
+ * @param url The url to open
+ * @return An stream for the given URL
+ * @throws IOException if an I/O exception occurs.
+ * @since 5867
+ */
+ public static InputStream openURL(URL url) throws IOException {
+ return openURLAndDecompress(url, false);
+ }
+
+ /**
+ * Opens a connection to the given URL, sets the User-Agent property to JOSM's one, and decompresses stream if necessary.
+ * @param url The url to open
+ * @param decompress whether to wrap steam in a {@link GZIPInputStream} or {@link CBZip2InputStream}
+ * if the {@code Content-Type} header is set accordingly.
+ * @return An stream for the given URL
+ * @throws IOException if an I/O exception occurs.
+ * @since 6421
+ */
+ public static InputStream openURLAndDecompress(final URL url, final boolean decompress) throws IOException {
+ final URLConnection connection = setupURLConnection(url.openConnection());
+ if (decompress && "application/x-gzip".equals(connection.getHeaderField("Content-Type"))) {
+ return new GZIPInputStream(connection.getInputStream());
+ } else if (decompress && "application/x-bzip2".equals(connection.getHeaderField("Content-Type"))) {
+ return FileImporter.getBZip2InputStream(new BufferedInputStream(connection.getInputStream()));
+ } else {
+ return connection.getInputStream();
+ }
+ }
+
+ /***
+ * Setups the given URL connection to match JOSM needs by setting its User-Agent and timeout properties.
+ * @param connection The connection to setup
+ * @return {@code connection}, with updated properties
+ * @since 5887
+ */
+ public static URLConnection setupURLConnection(URLConnection connection) {
+ if (connection != null) {
+ connection.setRequestProperty("User-Agent", Version.getInstance().getFullAgentString());
+ connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+ connection.setReadTimeout(Main.pref.getInteger("socket.timeout.read",30)*1000);
+ }
+ return connection;
+ }
+
+ /**
+ * Opens a connection to the given URL and sets the User-Agent property to JOSM's one.
+ * @param url The url to open
+ * @return An buffered stream reader for the given URL (using UTF-8)
+ * @throws IOException if an I/O exception occurs.
+ * @since 5868
+ */
+ public static BufferedReader openURLReader(URL url) throws IOException {
+ return openURLReaderAndDecompress(url, false);
+ }
+
+ /**
+ * Opens a connection to the given URL and sets the User-Agent property to JOSM's one.
+ * @param url The url to open
+ * @param decompress whether to wrap steam in a {@link GZIPInputStream} or {@link CBZip2InputStream}
+ * if the {@code Content-Type} header is set accordingly.
+ * @return An buffered stream reader for the given URL (using UTF-8)
+ * @throws IOException if an I/O exception occurs.
+ * @since 6421
+ */
+ public static BufferedReader openURLReaderAndDecompress(final URL url, final boolean decompress) throws IOException {
+ return new BufferedReader(new InputStreamReader(openURLAndDecompress(url, decompress), "utf-8"));
+ }
+
/**
* Opens a HTTP connection to the given URL, sets the User-Agent property to JOSM's one and optionnaly disables Keep-Alive.
* @param httpURL The HTTP url to open (must use http:// or https://)
- * @param keepAlive
+ * @param keepAlive whether not to set header {@code Connection=close}
* @return An open HTTP connection to the given URL
* @throws IOException if an I/O exception occurs.
* @since 5587
@@ -572,4 +718,115 @@ public class Utils {
}
return connection;
}
+
+ /**
+ * An alternative to {@link String#trim()} to effectively remove all leading and trailing white characters, including Unicode ones.
+ * @see <a href="http://closingbraces.net/2008/11/11/javastringtrim/">Java’s String.trim has a strange idea of whitespace</a>
+ * @see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4080617">JDK bug 4080617</a>
+ * @param str The string to strip
+ * @return <code>str</code>, without leading and trailing characters, according to
+ * {@link Character#isWhitespace(char)} and {@link Character#isSpaceChar(char)}.
+ * @since 5772
+ */
+ public static String strip(String str) {
+ if (str == null || str.isEmpty()) {
+ return str;
+ }
+ int start = 0, end = str.length();
+ boolean leadingWhite = true;
+ while (leadingWhite && start < end) {
+ char c = str.charAt(start);
+ // '\u200B' (ZERO WIDTH SPACE character) needs to be handled manually because of change in Unicode 6.0 (Java 7, see #8918)
+ // same for '\uFEFF' (ZERO WIDTH NO-BREAK SPACE)
+ leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
+ if (leadingWhite) {
+ start++;
+ }
+ }
+ boolean trailingWhite = true;
+ while (trailingWhite && end > start+1) {
+ char c = str.charAt(end-1);
+ trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
+ if (trailingWhite) {
+ end--;
+ }
+ }
+ return str.substring(start, end);
+ }
+
+ /**
+ * Runs an external command and returns the standard output.
+ *
+ * The program is expected to execute fast.
+ *
+ * @param command the command with arguments
+ * @return the output
+ * @throws IOException when there was an error, e.g. command does not exist
+ */
+ public static String execOutput(List<String> command) throws IOException {
+ Process p = new ProcessBuilder(command).start();
+ BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ StringBuilder all = null;
+ String line;
+ while ((line = input.readLine()) != null) {
+ if (all == null) {
+ all = new StringBuilder(line);
+ } else {
+ all.append("\n");
+ all.append(line);
+ }
+ }
+ Utils.close(input);
+ return all.toString();
+ }
+
+ /**
+ * Returns the JOSM temp directory.
+ * @return The JOSM temp directory ({@code <java.io.tmpdir>/JOSM}), or {@code null} if {@code java.io.tmpdir} is not defined
+ * @since 6245
+ */
+ public static File getJosmTempDir() {
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ if (tmpDir == null) {
+ return null;
+ }
+ File josmTmpDir = new File(tmpDir, "JOSM");
+ if (!josmTmpDir.exists()) {
+ if (!josmTmpDir.mkdirs()) {
+ Main.warn("Unable to create temp directory "+josmTmpDir);
+ }
+ }
+ return josmTmpDir;
+ }
+
+ /**
+ * Returns a simple human readable (hours, minutes, seconds) string for a given duration in milliseconds.
+ * @param elapsedTime The duration in milliseconds
+ * @return A human redable string for the given duration
+ * @throws IllegalArgumentException if elapsedTime is < 0
+ * @since 6354
+ */
+ public static String getDurationString(long elapsedTime) throws IllegalArgumentException {
+ if (elapsedTime < 0) {
+ throw new IllegalArgumentException("elapsedTime must be > 0");
+ }
+ // Is it less than 1 second ?
+ if (elapsedTime < 1000) {
+ return String.format("%d %s", elapsedTime, tr("ms"));
+ }
+ // Is it less than 1 minute ?
+ if (elapsedTime < 60*1000) {
+ return String.format("%.1f %s", elapsedTime/1000f, tr("s"));
+ }
+ // Is it less than 1 hour ?
+ if (elapsedTime < 60*60*1000) {
+ return String.format("%d %s %d %s", elapsedTime/60000, tr("min"), elapsedTime/1000, tr("s"));
+ }
+ // Is it less than 1 day ?
+ if (elapsedTime < 24*60*60*1000) {
+ return String.format("%d %s %d %s", elapsedTime/3600000, tr("h"), elapsedTime/60000, tr("min"));
+ }
+ long days = elapsedTime/86400000;
+ return String.format("%d %s %d %s", days, trn("day", "days", days), elapsedTime/3600000, tr("h"));
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/WikiReader.java b/src/org/openstreetmap/josm/tools/WikiReader.java
index 672b329..0dff73b 100644
--- a/src/org/openstreetmap/josm/tools/WikiReader.java
+++ b/src/org/openstreetmap/josm/tools/WikiReader.java
@@ -1,13 +1,12 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.net.URL;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
/**
* Read a trac-wiki page.
@@ -22,8 +21,11 @@ public class WikiReader {
this.baseurl = baseurl;
}
+ /**
+ * Constructs a new {@code WikiReader}.
+ */
public WikiReader() {
- this.baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
+ this.baseurl = Main.pref.get("help.baseurl", Main.JOSM_WEBSITE);
}
/**
@@ -35,19 +37,41 @@ public class WikiReader {
* @throws IOException Throws, if the page could not be loaded.
*/
public String read(String url) throws IOException {
- BufferedReader in = new BufferedReader(new InputStreamReader(new URL(url).openStream(), "utf-8"));
- if (url.startsWith(baseurl) && !url.endsWith("?format=txt"))
- return readFromTrac(in);
- return readNormal(in);
+ URL u = new URL(url);
+ BufferedReader in = Utils.openURLReader(u);
+ try {
+ if (url.startsWith(baseurl) && !url.endsWith("?format=txt"))
+ return readFromTrac(in, u);
+ return readNormal(in);
+ } finally {
+ Utils.close(in);
+ }
}
public String readLang(String text) throws IOException {
- String languageCode = LanguageInfo.getWikiLanguagePrefix();
- String res = readLang(new URL(baseurl + "/wiki/" + languageCode + text));
- if (res.isEmpty() && !languageCode.isEmpty()) {
- res = readLang(new URL(baseurl + "/wiki/" + text));
+ String languageCode;
+ String res = "";
+
+ languageCode = LanguageInfo.getWikiLanguagePrefix(LocaleType.DEFAULTNOTENGLISH);
+ if(languageCode != null) {
+ res = readLang(new URL(baseurl + "/wiki/" + languageCode + text));
+ }
+
+ if(res.isEmpty()) {
+ languageCode = LanguageInfo.getWikiLanguagePrefix(LocaleType.BASELANGUAGE);
+ if(languageCode != null) {
+ res = readLang(new URL(baseurl + "/wiki/" + languageCode + text));
+ }
}
- if (res.isEmpty()) {
+
+ if(res.isEmpty()) {
+ languageCode = LanguageInfo.getWikiLanguagePrefix(LocaleType.ENGLISH);
+ if(languageCode != null) {
+ res = readLang(new URL(baseurl + "/wiki/" + languageCode + text));
+ }
+ }
+
+ if(res.isEmpty()) {
throw new IOException(text + " does not exist");
} else {
return res;
@@ -55,26 +79,32 @@ public class WikiReader {
}
private String readLang(URL url) throws IOException {
- InputStream in = url.openStream();
- return readFromTrac(new BufferedReader(new InputStreamReader(in, "utf-8")));
+ BufferedReader in = Utils.openURLReader(url);
+ try {
+ return readFromTrac(in, url);
+ } finally {
+ Utils.close(in);
+ }
}
private String readNormal(BufferedReader in) throws IOException {
- String b = "";
+ StringBuilder b = new StringBuilder();
for (String line = in.readLine(); line != null; line = in.readLine()) {
if (!line.contains("[[TranslatedPages]]")) {
- b += line.replaceAll(" />", ">") + "\n";
+ b.append(line.replaceAll(" />", ">")).append("\n");
}
}
return "<html>" + b + "</html>";
}
- private String readFromTrac(BufferedReader in) throws IOException {
+ protected String readFromTrac(BufferedReader in, URL url) throws IOException {
boolean inside = false;
boolean transl = false;
boolean skip = false;
String b = "";
+ String full = "";
for (String line = in.readLine(); line != null; line = in.readLine()) {
+ full += line;
if (line.contains("<div id=\"searchable\">")) {
inside = true;
} else if (line.contains("<div class=\"wiki-toc trac-nav\"")) {
@@ -94,9 +124,11 @@ public class WikiReader {
// add a border="0" attribute to images, otherwise the internal help browser
// will render a thick border around images inside an <a> element
//
- b += line.replaceAll("<img src=\"/", "<img border=\"0\" src=\"" + baseurl + "/").replaceAll("href=\"/",
- "href=\"" + baseurl + "/").replaceAll(" />", ">")
- + "\n";
+ b += line.replaceAll("<img ", "<img border=\"0\" ")
+ .replaceAll("<span class=\"icon\">.</span>", "")
+ .replaceAll("href=\"/", "href=\"" + baseurl + "/")
+ .replaceAll(" />", ">")
+ + "\n";
} else if (transl && line.contains("</div>")) {
transl = false;
}
@@ -107,6 +139,8 @@ public class WikiReader {
if (b.indexOf(" Describe ") >= 0
|| b.indexOf(" does not exist. You can create it here.</p>") >= 0)
return "";
- return "<html>" + b + "</html>";
+ if(b.isEmpty())
+ b = full;
+ return "<html><base href=\""+url.toExternalForm() +"\"> " + b + "</html>";
}
}
diff --git a/src/org/openstreetmap/josm/tools/WindowGeometry.java b/src/org/openstreetmap/josm/tools/WindowGeometry.java
index d7636db..cbe7060 100644
--- a/src/org/openstreetmap/josm/tools/WindowGeometry.java
+++ b/src/org/openstreetmap/josm/tools/WindowGeometry.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Point;
@@ -110,7 +109,7 @@ public class WindowGeometry {
/**
* Creates a window geometry from a rectangle
- *
+ *
* @param rect the position
*/
public WindowGeometry(Rectangle rect) {
@@ -163,7 +162,7 @@ public class WindowGeometry {
protected void initFromPreferences(String preferenceKey) throws WindowGeometryException {
String value = Main.pref.get(preferenceKey);
- if (value == null || value.equals(""))
+ if (value == null || value.isEmpty())
throw new WindowGeometryException(tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey));
topLeft = new Point();
extent = new Dimension();
@@ -286,7 +285,7 @@ public class WindowGeometry {
/**
* Applies this geometry to a window. Makes sure that the window is not
* placed outside of the coordinate range of all available screens.
- *
+ *
* @param window the window
*/
public void applySafe(Window window) {
@@ -296,8 +295,7 @@ public class WindowGeometry {
GraphicsEnvironment ge = GraphicsEnvironment
.getLocalGraphicsEnvironment();
GraphicsDevice[] gs = ge.getScreenDevices();
- for (int j = 0; j < gs.length; j++) {
- GraphicsDevice gd = gs[j];
+ for (GraphicsDevice gd : gs) {
if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) {
virtualBounds = virtualBounds.union(gd.getDefaultConfiguration().getBounds());
}
@@ -322,7 +320,7 @@ public class WindowGeometry {
/**
* Find the size and position of the screen for given coordinates. Use first screen,
* when no coordinates are stored or null is passed.
- *
+ *
* @param preferenceKey the key to get size and position from
* @return bounds of the screen
*/
@@ -336,7 +334,7 @@ public class WindowGeometry {
/**
* Find the size and position of the screen for given coordinates. Use first screen,
* when no coordinates are stored or null is passed.
- *
+ *
* @param g coordinates to check
* @return bounds of the screen
*/
@@ -346,33 +344,29 @@ public class WindowGeometry {
GraphicsDevice[] gs = ge.getScreenDevices();
int intersect = 0;
Rectangle bounds = null;
- for (int j = 0; j < gs.length; j++) {
- GraphicsDevice gd = gs[j];
+ for (GraphicsDevice gd : gs) {
if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) {
Rectangle b = gd.getDefaultConfiguration().getBounds();
- if (b.height > 0 && b.width/b.height >= 3) /* multiscreen with wrong definition */
- {
+ if (b.height > 0 && b.width / b.height >= 3) /* multiscreen with wrong definition */ {
b.width /= 2;
Rectangle is = b.intersection(g);
- int s = is.width*is.height;
- if(bounds == null || intersect < s) {
+ int s = is.width * is.height;
+ if (bounds == null || intersect < s) {
intersect = s;
bounds = b;
}
b = new Rectangle(b);
b.x += b.width;
is = b.intersection(g);
- s = is.width*is.height;
- if(bounds == null || intersect < s) {
+ s = is.width * is.height;
+ if (bounds == null || intersect < s) {
intersect = s;
bounds = b;
}
- }
- else
- {
+ } else {
Rectangle is = b.intersection(g);
- int s = is.width*is.height;
- if(bounds == null || intersect < s) {
+ int s = is.width * is.height;
+ if (bounds == null || intersect < s) {
intersect = s;
bounds = b;
}
diff --git a/src/org/openstreetmap/josm/tools/XmlObjectParser.java b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
index 411cc6c..160bc1b 100644
--- a/src/org/openstreetmap/josm/tools/XmlObjectParser.java
+++ b/src/org/openstreetmap/josm/tools/XmlObjectParser.java
@@ -1,4 +1,4 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Stack;
@@ -23,14 +24,13 @@ import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.ValidatorHandler;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.MirroredInputStream;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
@@ -46,6 +46,9 @@ public class XmlObjectParser implements Iterable<Object> {
private int columnNumber;
private int lineNumber;
+ /**
+ * Constructs a new {@code PresetParsingException}.
+ */
public PresetParsingException() {
super();
}
@@ -174,9 +177,7 @@ public class XmlObjectParser implements Iterable<Object> {
}
private void setValue(Entry entry, String fieldName, String value) throws SAXException {
- if (entry == null) {
- throw new NullPointerException("entry cannot be null");
- }
+ CheckParameterUtil.ensureParameterNotNull(entry, "entry");
if (fieldName.equals("class") || fieldName.equals("default") || fieldName.equals("throw") || fieldName.equals("new") || fieldName.equals("null")) {
fieldName += "_";
}
@@ -186,7 +187,8 @@ public class XmlObjectParser implements Iterable<Object> {
if (f == null && fieldName.startsWith(lang)) {
f = entry.getField("locale_" + fieldName.substring(lang.length()));
}
- if (f != null && Modifier.isPublic(f.getModifiers()) && String.class.equals(f.getType())) {
+ if (f != null && Modifier.isPublic(f.getModifiers()) && (
+ String.class.equals(f.getType()) || boolean.class.equals(f.getType()))) {
f.set(c, getValueForClass(f.getType(), value));
} else {
if (fieldName.startsWith(lang)) {
@@ -275,7 +277,7 @@ public class XmlObjectParser implements Iterable<Object> {
/**
* The queue of already parsed items from the parsing thread.
*/
- private LinkedList<Object> queue = new LinkedList<Object>();
+ private List<Object> queue = new LinkedList<Object>();
private Iterator<Object> queueIterator = null;
public XmlObjectParser() {
@@ -298,7 +300,7 @@ public class XmlObjectParser implements Iterable<Object> {
reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
} catch (SAXException e) {
// Exception very unlikely to happen, so no need to translate this
- System.err.println("Cannot disable 'load-external-dtd' feature: "+e.getMessage());
+ Main.error("Cannot disable 'load-external-dtd' feature: "+e.getMessage());
}
reader.parse(new InputSource(in));
queueIterator = queue.iterator();
diff --git a/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java b/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
index 52d80b0..45d5d66 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
@@ -2,7 +2,7 @@
package org.openstreetmap.josm.tools.template_engine;
-public class CompoundTemplateEntry implements TemplateEntry {
+public final class CompoundTemplateEntry implements TemplateEntry {
public static TemplateEntry fromArray(TemplateEntry... entry) {
if (entry.length == 0)
diff --git a/styles/standard/elemstyles.xml b/styles/standard/elemstyles.xml
index ded8741..07abfe8 100644
--- a/styles/standard/elemstyles.xml
+++ b/styles/standard/elemstyles.xml
@@ -282,12 +282,12 @@ For external files the <rules> should have following elements:
<rule>
<condition k="maxstay"/>
- <icon src="misc/no_icon.png"/>
+ <icon src="misc/no_icon.png" priority="-100"/>
</rule>
<rule>
<condition k="toll"/>
- <icon src="misc/no_icon.png"/>
+ <icon src="misc/no_icon.png" priority="-100"/>
</rule>
<rule>
@@ -532,7 +532,7 @@ For external files the <rules> should have following elements:
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
- <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+ <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
<rule>
<condition k="highway" v="path"/>
<condition k="bicycle" v="designated"/>
@@ -613,10 +613,10 @@ For external files the <rules> should have following elements:
<icon annotate="true" src="vehicle/restriction/stop.png"/>
</rule>
- <rule>
- <condition k="highway" v="give_way"/>
- <icon annotate="true" src="vehicle/restriction/right_of_way.png"/>
- </rule>
+ <rule>
+ <condition k="highway" v="give_way"/>
+ <icon annotate="true" src="vehicle/restriction/right_of_way.png"/>
+ </rule>
<rule>
<condition k="highway" v="traffic_signals"/>
@@ -693,7 +693,7 @@ For external files the <rules> should have following elements:
<line width="2" colour="highway_platform#c0c0c0"/>
<area colour="highway_platform#c0c0c0" closed="true"/>
</rule>
-
+
<rule>
<condition k="highway" v="turning_circle"/>
<icon annotate="true" src="vehicle/turning_circle.png"/>
@@ -780,30 +780,35 @@ For external files the <rules> should have following elements:
<!-- tracktype tags -->
<rule>
+ <condition k="highway" v="track"/>
<condition k="tracktype" v="grade1"/>
<line width="1" realwidth="3" dashed="2" colour="highway_track#006600"/>
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
<rule>
+ <condition k="highway" v="track"/>
<condition k="tracktype" v="grade2"/>
<line width="1" realwidth="3" dashed="4" colour="highway_track#006600"/>
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
<rule>
+ <condition k="highway" v="track"/>
<condition k="tracktype" v="grade3"/>
<line width="1" realwidth="3" dashed="6" colour="highway_track#006600"/>
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
<rule>
+ <condition k="highway" v="track"/>
<condition k="tracktype" v="grade4"/>
<line width="1" realwidth="3" dashed="8" colour="highway_track#006600"/>
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
<rule>
+ <condition k="highway" v="track"/>
<condition k="tracktype" v="grade5"/>
<line width="1" realwidth="3" dashed="10" colour="highway_track#006600"/>
<icon annotate="true" src="misc/deprecated.png"/>
@@ -830,6 +835,12 @@ For external files the <rules> should have following elements:
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
+ <rule>
+ <condition k="waterway" v="wadi"/>
+ <line width="2" realwidth="2" colour="water#0000ff" dashed="true"/>
+ <icon annotate="true" src="misc/deprecated.png"/>
+ </rule>
+
<rule>
<condition k="waterway" v="stream"/>
<line width="1" realwidth="1" colour="stream#6600cc"/>
@@ -1005,8 +1016,8 @@ For external files the <rules> should have following elements:
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
- <!-- disused often appears together with highway=xy -->
- <!-- -> normal display with line, linemod for combinations -->
+ <!-- disused often appears together with highway=xy -->
+ <!-- -> normal display with line, linemod for combinations -->
<rule>
<condition k="railway" v="disused"/>
<line width="1" colour="oldrail#404040" dashed="true" priority="-10000"/>
@@ -1014,8 +1025,8 @@ For external files the <rules> should have following elements:
<icon annotate="true" src="misc/deprecated.png"/>
</rule>
- <!-- abandoned often appears together with highway=xy -->
- <!-- -> normal display with line, linemod for combinations -->
+ <!-- abandoned often appears together with highway=xy -->
+ <!-- -> normal display with line, linemod for combinations -->
<rule>
<condition k="railway" v="abandoned"/>
<line width="1" colour="oldrail#404040" dashed="true" priority="-10000"/>
@@ -1257,7 +1268,7 @@ For external files the <rules> should have following elements:
</rule>
<rule>
- <condition k="power" v="station"/>
+ <condition k="power" v="plant"/>
<icon annotate="true" src="misc/landmark/power.png"/>
<area colour="power#eeeeee"/>
</rule>
@@ -1273,13 +1284,13 @@ For external files the <rules> should have following elements:
<icon annotate="true" src="misc/landmark/power.png"/>
</rule>
- <rule>
+ <rule>
<condition k="power" v="transformer"/>
<icon annotate="true" src="misc/landmark/power/transformer.png"/>
<area colour="power#eeeeee"/>
</rule>
- <!-- power_source is depricated by the wiki, but still in use -->
+ <!-- power_source is deprecated by the wiki, but still in use -->
<rule>
<condition k="power_source" v="wind"/>
<icon annotate="true" src="misc/landmark/power/wind.png"/>
@@ -1322,7 +1333,7 @@ For external files the <rules> should have following elements:
<area colour="power#eeeeee"/>
</rule>
- <!-- generator:source replaces power_source -->
+ <!-- generator:source replaces power_source -->
<rule>
<condition k="generator:source" v="wind"/>
<icon annotate="true" src="misc/landmark/power/wind.png"/>
@@ -1404,7 +1415,7 @@ For external files the <rules> should have following elements:
</rule>
<rule>
- <condition k="man_made" v="measurement_station"/>
+ <condition k="man_made" v="monitoring_station"/>
<icon annotate="true" src="misc/landmark/measurement_station.png"/>
<area colour="manmade#d8d8d8"/>
</rule>
@@ -1733,6 +1744,19 @@ For external files the <rules> should have following elements:
</rule>
<rule>
+ <condition k="amenity" v="parking_space"/>
+ <icon annotate="true" src="vehicle/parking.png" priority="-500" />
+ <area colour="amenity_traffic#f7efb7"/>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="parking_space"/>
+ <condition k="wheelchair" b="yes"/>
+ <icon annotate="true" src="vehicle/parking/handicapped.png"/>
+ <area colour="amenity_traffic#f7efb7"/>
+ </rule>
+
+ <rule>
<condition k="amenity" v="bicycle_rental"/>
<icon annotate="true" src="vehicle/rental/bicycle.png"/>
<area colour="amenity_traffic#f7efb7"/>
@@ -1789,19 +1813,25 @@ For external files the <rules> should have following elements:
<icon annotate="true" src="service/clock.png"/>
</rule>
- <!-- Rule to delete by end of 2013 if this deprecated tag has finally been replaced by emergency=phone below-->
- <rule>
- <condition k="amenity" v="emergency_phone"/>
- <icon annotate="true" src="vehicle/emergency_phone.png"/>
- <area colour="amenity_light#f7efb7"/>
- </rule>
-
+ <!-- Rule to delete by end of 2013 if this deprecated tag has finally been replaced by emergency=phone below-->
+ <rule>
+ <condition k="amenity" v="emergency_phone"/>
+ <icon annotate="true" src="vehicle/emergency_phone.png"/>
+ <area colour="amenity_light#f7efb7"/>
+ </rule>
+
<rule>
<condition k="emergency" v="phone"/>
<icon annotate="true" src="vehicle/emergency_phone.png"/>
<area colour="amenity_light#f7efb7"/>
</rule>
+ <rule>
+ <condition k="emergency" v="aed"/>
+ <icon annotate="true" src="presets/aed.svg"/>
+ <area colour="amenity_light#f7efb7"/>
+ </rule>
+
<rule>
<condition k="amenity" v="toilets"/>
<icon annotate="true" src="service/toilets.png"/>
@@ -2004,6 +2034,12 @@ For external files the <rules> should have following elements:
</rule>
<rule>
+ <condition k="amenity" v="clinic"/>
+ <area colour="health#eeeeee"/>
+ <icon annotate="true" src="health/hospital.png"/>
+ </rule>
+
+ <rule>
<condition k="amenity" v="nursery"/>
<area colour="health#eeeeee"/>
<icon annotate="true" src="misc/no_icon.png"/>
@@ -2163,6 +2199,20 @@ For external files the <rules> should have following elements:
<area colour="amenity_light#f7efb7"/>
</rule>
+<!--office tags -->
+
+ <rule>
+ <condition k="office" v="company"/>
+ <icon annotate="true" src="icons/office_blue.png"/>
+ <area colour="office#de5696"/>
+ </rule>
+
+ <rule>
+ <condition k="office" v="government"/>
+ <icon annotate="true" src="icons/office_pink.png"/>
+ <area colour="office#de5696"/>
+ </rule>
+
<!--shop tags -->
<rule>
@@ -2370,7 +2420,7 @@ For external files the <rules> should have following elements:
</rule>
<rule>
- <!-- superseeded by greengrocer -->
+ <!-- superseeded by greengrocer -->
<condition k="shop" v="groceries"/>
<icon annotate="true" src="misc/deprecated.png"/>
<area colour="deprecated#ff0000"/>
@@ -2461,6 +2511,12 @@ For external files the <rules> should have following elements:
</rule>
<rule>
+ <condition k="shop" v="pawnbroker"/>
+ <icon annotate="true" src="presets/pawnbroker.svg"/>
+ <area colour="shop#00005f"/>
+ </rule>
+
+ <rule>
<condition k="shop" v="seafood"/>
<icon annotate="true" src="shop/groceries/seafood.png"/>
<area colour="shop#00005f"/>
@@ -2810,13 +2866,13 @@ For external files the <rules> should have following elements:
<rule>
<condition k="landuse" v="retail"/>
- <area colour="retail#dbdbdb"/>
+ <area colour="retail#ffc4ee"/>
<icon src="shop/mall.png"/>
</rule>
<rule>
<condition k="landuse" v="commercial"/>
- <area colour="retail#dbdbdb"/>
+ <area colour="retail#ffc4ee"/>
<icon src="misc/landuse/commercial.png"/>
</rule>
@@ -2916,9 +2972,14 @@ For external files the <rules> should have following elements:
</rule>
<rule>
+ <condition k="natural" v="saddle"/>
+ <icon annotate="true" src="presets/saddle.svg"/>
+ </rule>
+
+ <rule>
<condition k="natural" v="peak"/>
<area colour="peak#663300"/>
- <icon annotate="true" src="misc/landmark/peak_small.png"/>
+ <icon annotate="true" src="presets/peak.svg"/>
</rule>
<rule>
@@ -2965,16 +3026,22 @@ For external files the <rules> should have following elements:
</rule>
<rule>
+ <condition k="natural" v="tree_row"/>
+ <icon src="misc/no_icon.png"/>
+ <line width="2" colour="woodarea#008000"/>
+ </rule>
+
+ <rule>
<condition k="natural" v="wood"/>
<icon src="misc/landmark/trees.png"/>
<area colour="woodarea#008000"/>
</rule>
-
- <rule>
- <condition k="natural" v="grassland"/>
- <icon src="misc/no_icon.png"/>
- <area colour="green#b1e0c2"/>
- </rule>
+
+ <rule>
+ <condition k="natural" v="grassland"/>
+ <icon src="misc/no_icon.png"/>
+ <area colour="green#b1e0c2"/>
+ </rule>
<rule>
<condition k="natural" v="wetland"/>
@@ -3035,6 +3102,24 @@ For external files the <rules> should have following elements:
<icon src="misc/landmark/trees.png"/>
</rule>
+ <rule>
+ <condition k="natural" v="tree"/>
+ <condition k="type" v="conifer"/>
+ <icon src="misc/landmark/trees_conifer.png" priority="10"/>
+ </rule>
+
+ <rule>
+ <condition k="natural" v="tree"/>
+ <condition k="type" v="broad_leaved"/>
+ <icon src="misc/landmark/trees_broad_leaved.png" priority="10"/>
+ </rule>
+
+ <rule>
+ <condition k="natural" v="tree"/>
+ <condition k="type" v="palm"/>
+ <icon src="misc/landmark/trees_palm.png" priority="10"/>
+ </rule>
+
<!--route tags -->
<rule>
@@ -3670,39 +3755,49 @@ For external files the <rules> should have following elements:
<area colour="building#cb9999" priority="-10000"/>
</rule>
- <rule>
- <condition k="building" v="entrance" />
- <icon annotate="true" src="misc/entrance-yes.png" priority="100"/>
- </rule>
+ <rule>
+ <condition k="building" v="garage"/>
+ <icon annotate="true" src="misc/landuse/garages.png"/>
+ </rule>
- <rule>
- <condition k="entrance" v="yes" />
- <icon annotate="true" src="misc/entrance-yes.png"/>
- </rule>
+ <rule>
+ <condition k="building" v="garages"/>
+ <icon annotate="true" src="misc/landuse/garages.png"/>
+ </rule>
- <rule>
- <condition k="entrance" v="main" />
- <icon annotate="true" src="misc/entrance-main.png"/>
- </rule>
+ <rule>
+ <condition k="building" v="entrance" />
+ <icon annotate="true" src="misc/entrance-yes.png" priority="100"/>
+ </rule>
- <rule>
- <condition k="entrance" v="service" />
- <icon annotate="true" src="misc/entrance-service.png"/>
- </rule>
+ <rule>
+ <condition k="entrance" v="yes" />
+ <icon annotate="true" src="misc/entrance-yes.png"/>
+ </rule>
- <rule>
- <condition k="entrance" v="exit" />
- <icon annotate="true" src="misc/entrance-exit.png"/>
- </rule>
+ <rule>
+ <condition k="entrance" v="main" />
+ <icon annotate="true" src="misc/entrance-main.png"/>
+ </rule>
- <rule>
- <condition k="entrance" v="emergency" />
- <icon annotate="true" src="misc/entrance-emergency.png"/>
- </rule>
+ <rule>
+ <condition k="entrance" v="service" />
+ <icon annotate="true" src="misc/entrance-service.png"/>
+ </rule>
- <rule>
- <condition k="area" b="yes"/>
- <area colour="area#ffffff" priority="-10000"/>
+ <rule>
+ <condition k="entrance" v="exit" />
+ <icon annotate="true" src="misc/entrance-exit.png"/>
+ </rule>
+
+ <rule>
+ <condition k="entrance" v="emergency" />
+ <icon annotate="true" src="misc/entrance-emergency.png"/>
+ </rule>
+
+ <rule>
+ <condition k="area" b="yes"/>
+ <area colour="area#ffffff" priority="-10000"/>
</rule>
<rule>
@@ -3733,13 +3828,13 @@ For external files the <rules> should have following elements:
<rule>
<condition k="addr:interpolation" v="alphabetic"/>
<line width="1" realwidth="1" dashed="1,1" colour="address#1C86EE"/>
- </rule>
+ </rule>
<!--"work in progress" tags -->
- <rule>
- <condition k="fixme"/>
- <icon annotate="true" src="misc/fixme.png" priority="10000"/>
+ <rule>
+ <condition k="fixme"/>
+ <icon annotate="true" src="misc/fixme.png" priority="10000"/>
</rule>
<rule>
@@ -3753,81 +3848,87 @@ For external files the <rules> should have following elements:
</rule>
<!--public_transport tags -->
- <rule>
- <condition k="public_transport" v="stop_position"/>
- <condition k="train" v="yes"/>
- <icon annotate="true" src="transport/railway_small.png" priority="10" />
- </rule>
+ <rule>
+ <condition k="public_transport" v="stop_position"/>
+ <condition k="train" v="yes"/>
+ <icon annotate="true" src="transport/railway_small.png" priority="10" />
+ </rule>
- <rule>
- <condition k="public_transport" v="stop_position"/>
- <condition k="tram" v="yes"/>
- <icon annotate="true" src="transport/tram.png" priority="8" />
- </rule>
+ <rule>
+ <condition k="public_transport" v="stop_position"/>
+ <condition k="tram" v="yes"/>
+ <icon annotate="true" src="transport/tram.png" priority="8" />
+ </rule>
- <rule>
- <condition k="public_transport" v="stop_position"/>
- <condition k="ferry" v="yes"/>
- <icon annotate="true" src="transport/ferry.png" priority="7" />
- </rule>
+ <rule>
+ <condition k="public_transport" v="stop_position"/>
+ <condition k="ferry" v="yes"/>
+ <icon annotate="true" src="transport/ferry.png" priority="7" />
+ </rule>
- <rule>
- <condition k="public_transport" v="stop_position"/>
- <condition k="aerial" v="yes"/>
- <icon annotate="true" src="transport/aerialway.png" priority="6" />
- </rule>
+ <rule>
+ <condition k="public_transport" v="stop_position"/>
+ <condition k="aerial" v="yes"/>
+ <icon annotate="true" src="transport/aerialway.png" priority="6" />
+ </rule>
- <rule>
- <condition k="public_transport" v="stop_position"/>
- <condition k="bus" v="yes"/>
- <icon annotate="true" src="transport/bus_small.png" priority="4" />
- </rule>
+ <rule>
+ <condition k="public_transport" v="stop_position"/>
+ <condition k="bus" v="yes"/>
+ <icon annotate="true" src="transport/bus_small.png" priority="4" />
+ </rule>
- <rule>
- <condition k="public_transport" v="stop_position"/>
- <icon annotate="true" src="transport/railway_small.png" priority="-10"/>
- </rule>
+ <rule>
+ <condition k="public_transport" v="stop_position"/>
+ <icon annotate="true" src="transport/railway_small.png" priority="-10"/>
+ </rule>
- <rule>
- <condition k="public_transport" v="platform"/>
- <condition k="train" v="yes"/>
- <icon annotate="true" src="transport/railway_station.png" priority="10" />
- <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
- </rule>
-
- <rule>
- <condition k="public_transport" v="platform"/>
- <condition k="tram" v="yes"/>
- <icon annotate="true" src="transport/railway_station.png" priority="8" />
- <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
- </rule>
-
- <rule>
- <condition k="public_transport" v="platform"/>
- <condition k="ferry" v="yes"/>
- <icon annotate="true" src="transport/ferry.png" priority="7" />
- <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
- </rule>
-
- <rule>
- <condition k="public_transport" v="platform"/>
- <condition k="aerial" v="yes"/>
- <icon annotate="true" src="transport/aerialway/station.png" priority="6" />
- <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
- </rule>
-
- <rule>
- <condition k="public_transport" v="platform"/>
- <condition k="bus" v="yes"/>
- <icon annotate="true" src="transport/bus_small.png" priority="4" />
- <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
- </rule>
+ <rule>
+ <condition k="public_transport" v="platform"/>
+ <condition k="train" v="yes"/>
+ <icon annotate="true" src="transport/railway_station.png" priority="10" />
+ <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+ <area colour="service#809bc0" closed="true" />
+ </rule>
- <rule>
- <condition k="public_transport" v="platform"/>
- <icon annotate="true" src="transport/bus_small.png" priority="-10"/>
- <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
- </rule>
+ <rule>
+ <condition k="public_transport" v="platform"/>
+ <condition k="tram" v="yes"/>
+ <icon annotate="true" src="transport/railway_station.png" priority="8" />
+ <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+ <area colour="service#809bc0" closed="true" />
+ </rule>
+
+ <rule>
+ <condition k="public_transport" v="platform"/>
+ <condition k="ferry" v="yes"/>
+ <icon annotate="true" src="transport/ferry.png" priority="7" />
+ <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+ <area colour="service#809bc0" closed="true" />
+ </rule>
+
+ <rule>
+ <condition k="public_transport" v="platform"/>
+ <condition k="aerial" v="yes"/>
+ <icon annotate="true" src="transport/aerialway/station.png" priority="6" />
+ <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+ <area colour="service#809bc0" closed="true" />
+ </rule>
+
+ <rule>
+ <condition k="public_transport" v="platform"/>
+ <condition k="bus" v="yes"/>
+ <icon annotate="true" src="transport/bus_small.png" priority="4" />
+ <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+ <area colour="service#809bc0" closed="true" />
+ </rule>
+
+ <rule>
+ <condition k="public_transport" v="platform"/>
+ <icon annotate="true" src="transport/bus_small.png" priority="-10"/>
+ <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00"/>
+ <area colour="service#809bc0" closed="true" />
+ </rule>
<!--"deprecated" tags -->
@@ -3849,5 +3950,6 @@ For external files the <rules> should have following elements:
<!-- waterway=aqueduct -> bridge=aqueduct -->
<!-- natural=marsh -> natural=wetland -->
<!-- leisure=zoo -> tourism=zoo -->
+ <!-- power=station -> power=plant or power=sub_station -->
</rules>
diff --git a/styles/standard/potlatch2.mapcss b/styles/standard/potlatch2.mapcss
index 39bfe6c..0cd6a31 100644
--- a/styles/standard/potlatch2.mapcss
+++ b/styles/standard/potlatch2.mapcss
@@ -109,8 +109,8 @@ way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8;
way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;}
-way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
-way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
+way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
+way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
@@ -121,39 +121,28 @@ way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes:
way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
-/* Waterways */
+/* Waterways */
way[waterway=river],
way[waterway=canal],
way[waterway=stream] { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;}
-way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
+way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
way[waterway][tunnel=yes] {z-index: 5; dashes: 8,4;}
/* Aeroways */
way[aeroway=aerodrome]:closed
{ z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; }
-way|z-15[aeroway=aerodrome]:closed
- { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;}
way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
-area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
+area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
-way|z17-[aeroway=runway]!:closed { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
-way|z17-[aeroway=runway]!:closed::aa { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]!:closed::bb { z-index: 11; color: black; width: 7; }
-way|z17-[aeroway=runway]!:closed::cc { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]!:closed::dd { z-index: 13; color: black; width: 3; }
-way|z17-[aeroway=runway]!:closed::ee { z-index: 14; color: white; width: 1; dashes: 4, 16; }
+way[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; }
+way[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
+way[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
+way[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; }
-way|z15-16[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; }
-way|z15-16[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
-way|z15-16[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
-way|z15-16[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; }
-
-way|z-14[aeroway=runway]!:closed { z-index: 9; color: #444444; width: 3; }
-
-area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
-area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
+area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
+area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
/* Barriers */
@@ -217,10 +206,11 @@ node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-
node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
-aera[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
+area[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
+node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; }
node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; }
node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
@@ -234,6 +224,7 @@ node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-
node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
+node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=place_of_worship] { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
@@ -243,6 +234,8 @@ node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20;
node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; }
node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
+node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
+node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
/* Shops */
node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
@@ -254,6 +247,7 @@ node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; }
node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; }
@@ -315,6 +309,7 @@ node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; }
/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */
node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
+/* P2 previously had these icons instead of "icon-image: cross" which is not standard MapCSS but a P2 keyword we won't implement, so keep the old icons */
node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
@@ -326,7 +321,7 @@ node[addr:housename] { symbol-shape: circle; symbol-size: 8; symbol-fill-color:
node[addr:housenumber]::hn_casing,
node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; }
-way[addr:interpolation] { z-index: 5; color: #B0E0E6; width: 3; dashes: 3,3;}
+way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
/****************
* core_landuse.css
****************/
@@ -350,7 +345,8 @@ area[military]:closed { color: #D6D6D6; width: 1; fill-c
area[building]:closed { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
area[natural=water]:closed,
area[waterway][waterway!=dam]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;}
-way[waterway=dam] { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
+way[waterway=dam]!:closed { z-index: 5; color: black; width: 3; }
+area[waterway=dam]:closed { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
area[man_made]:closed { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
area[man_made=reservoir_covered]:closed { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
area[landuse=reservoir]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;}
@@ -374,20 +370,20 @@ way[boundary=administrative] { z-index: 5; color: purple; width:
way[boundary=administrative][waterway] { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
area[landuse=cemetery]:closed { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;}
/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
-/* Route relations */
-
-relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
-relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
-relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
-relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
-relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; }
-relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
+/* Route relations */
+
+relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; }
+relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; }
+relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; }
+relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; }
+relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; }
+relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; }
/*@import("stylesheets/core_ways.css");*/
/*@import("stylesheets/core_pois.css");*/
/*@import("stylesheets/core_landuse.css");*/
/*@import("stylesheets/core_relations.css");*/
-way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: auto; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
/*@import("stylesheets/core_interactive.css");*/
/* Rendering for licence status */
diff --git a/styles_nodist/potlatch2/README b/styles_nodist/potlatch2/README
index 0569d2c..cad170e 100644
--- a/styles_nodist/potlatch2/README
+++ b/styles_nodist/potlatch2/README
@@ -16,4 +16,4 @@ Potlatch 2's repository is git://git.openstreetmap.org/potlatch2.git
When updating from upstream, keep all 4 locations in sync.
-At time of writing, the last update used f4019f791c0ee268443c942ad06f127d9911758a but better check the commit dates as well.
+At time of writing, the last update used 570240ab6a42a3efa007a7dd6110fe96d079b277 (2013-02-10) but better check the commit dates as well.
diff --git a/styles_nodist/potlatch2/patched/core_landuse.css b/styles_nodist/potlatch2/patched/core_landuse.css
index 4085404..6290573 100644
--- a/styles_nodist/potlatch2/patched/core_landuse.css
+++ b/styles_nodist/potlatch2/patched/core_landuse.css
@@ -21,7 +21,8 @@ area[military]:closed { color: #D6D6D6; width: 1; fill-c
area[building]:closed { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
area[natural=water]:closed,
area[waterway][waterway!=dam]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;}
-way[waterway=dam] { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
+way[waterway=dam]!:closed { z-index: 5; color: black; width: 3; }
+area[waterway=dam]:closed { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;}
area[man_made]:closed { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
area[man_made=reservoir_covered]:closed { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; }
area[landuse=reservoir]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;}
diff --git a/styles_nodist/potlatch2/patched/core_pois.css b/styles_nodist/potlatch2/patched/core_pois.css
index e1c1b9c..5974f53 100644
--- a/styles_nodist/potlatch2/patched/core_pois.css
+++ b/styles_nodist/potlatch2/patched/core_pois.css
@@ -31,10 +31,11 @@ node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-
node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
-aera[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
+area[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; }
node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
+node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; }
node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; }
node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
@@ -48,6 +49,7 @@ node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-
node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
+node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=place_of_worship] { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; }
node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
@@ -57,6 +59,8 @@ node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20;
node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; }
node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
+node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
+node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
/* Shops */
node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
@@ -68,6 +72,7 @@ node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; }
node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; }
@@ -129,6 +134,7 @@ node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; }
/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */
node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; }
+/* P2 previously had these icons instead of "icon-image: cross" which is not standard MapCSS but a P2 keyword we won't implement, so keep the old icons */
node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
@@ -140,4 +146,4 @@ node[addr:housename] { symbol-shape: circle; symbol-size: 8; symbol-fill-color:
node[addr:housenumber]::hn_casing,
node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; }
-way[addr:interpolation] { z-index: 5; color: #B0E0E6; width: 3; dashes: 3,3;}
+way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
diff --git a/styles_nodist/potlatch2/patched/core_ways.css b/styles_nodist/potlatch2/patched/core_ways.css
index 9e0adfa..c8ae191 100644
--- a/styles_nodist/potlatch2/patched/core_ways.css
+++ b/styles_nodist/potlatch2/patched/core_ways.css
@@ -60,8 +60,8 @@ way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8;
way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;}
-way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
-way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
+way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
+way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
@@ -72,39 +72,28 @@ way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes:
way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
-/* Waterways */
+/* Waterways */
way[waterway=river],
way[waterway=canal],
way[waterway=stream] { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;}
-way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
+way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;}
way[waterway][tunnel=yes] {z-index: 5; dashes: 8,4;}
/* Aeroways */
way[aeroway=aerodrome]:closed
{ z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; }
-way|z-15[aeroway=aerodrome]:closed
- { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;}
way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
-area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
+area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
-way|z17-[aeroway=runway]!:closed { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
-way|z17-[aeroway=runway]!:closed::aa { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]!:closed::bb { z-index: 11; color: black; width: 7; }
-way|z17-[aeroway=runway]!:closed::cc { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]!:closed::dd { z-index: 13; color: black; width: 3; }
-way|z17-[aeroway=runway]!:closed::ee { z-index: 14; color: white; width: 1; dashes: 4, 16; }
+way[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; }
+way[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
+way[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
+way[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; }
-way|z15-16[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; }
-way|z15-16[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
-way|z15-16[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; }
-way|z15-16[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; }
-
-way|z-14[aeroway=runway]!:closed { z-index: 9; color: #444444; width: 3; }
-
-area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
-area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
+area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; }
+area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
/* Barriers */
diff --git a/styles_nodist/potlatch2/patched/potlatch.css b/styles_nodist/potlatch2/patched/potlatch.css
index 276959a..f58d9fa 100644
--- a/styles_nodist/potlatch2/patched/potlatch.css
+++ b/styles_nodist/potlatch2/patched/potlatch.css
@@ -3,7 +3,7 @@
/*@import("stylesheets/core_pois.css");*/
/*@import("stylesheets/core_landuse.css");*/
/*@import("stylesheets/core_relations.css");*/
-way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: auto; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
/*@import("stylesheets/core_interactive.css");*/
/* Rendering for licence status */
diff --git a/styles_nodist/potlatch2/source/core_pois.css b/styles_nodist/potlatch2/source/core_pois.css
index a2aa316..1c0452f 100644
--- a/styles_nodist/potlatch2/source/core_pois.css
+++ b/styles_nodist/potlatch2/source/core_pois.css
@@ -28,6 +28,7 @@ way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1
node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
+node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; }
node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; }
node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
@@ -41,6 +42,7 @@ node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-
node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; }
node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; }
node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
+node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
node[amenity=place_of_worship] { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; }
node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; }
@@ -50,6 +52,8 @@ node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20;
node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; }
node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
+node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
+node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
/* Shops */
node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
@@ -61,6 +65,7 @@ node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; }
node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; }
@@ -122,12 +127,12 @@ node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; }
/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */
node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; }
node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; }
-node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; }
-node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; }
+node[power=tower] { icon-image: cross; icon-width: 7; width: 3; color: #F44; z-index: 20; }
+node[power=pole] { icon-image: cross; icon-width: 7; width: 3; color: #444; z-index: 20; }
node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; }
/* Addressing */
node[addr:housenumber] !:drawn,
node[addr:housename] !:drawn { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; z-index: 20; }
-way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
+way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
\ No newline at end of file
diff --git a/styles_nodist/potlatch2/source/core_ways.css b/styles_nodist/potlatch2/source/core_ways.css
index 4824fac..cee40bc 100644
--- a/styles_nodist/potlatch2/source/core_ways.css
+++ b/styles_nodist/potlatch2/source/core_ways.css
@@ -57,8 +57,8 @@ way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8;
way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; }
way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;}
-way[railway=disused],way[railway=abandoned] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
-way[railway=disused]::dashes,way[railway=abandoned]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
+way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; }
+way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; }
way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; }
@@ -69,36 +69,25 @@ way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes:
way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; }
way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; }
-/* Waterways */
+/* Waterways */
way[waterway=river],
way[waterway=canal],
way[waterway=stream] { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;}
-way[waterway=drain] {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}
+way[waterway=drain] {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}
way[waterway][tunnel=yes] {dashes: 8,4;}
/* Aeroways */
way[aeroway=aerodrome] :area
{ z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; }
-way|z-15[aeroway=aerodrome] :area
- { z-index: 3; fill-color: #bb99bb; fill-opacity: 0.5;}
way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; }
way[aeroway=taxiway] :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; }
-way|z17-[aeroway=runway] !:area { z-index: 9; color: black; width: 11; casing-color: #aa66aa; casing-width: 1; }
-way|z17-[aeroway=runway]::aa !:area { z-index: 10; color: white; width: 9; dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]::bb !:area { z-index: 11; color: black; width: 7; }
-way|z17-[aeroway=runway]::cc !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
-way|z17-[aeroway=runway]::dd !:area { z-index: 13; color: black; width: 3; }
-way|z17-[aeroway=runway]::ee !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; }
-
-way|z15-16[aeroway=runway] !:area { z-index: 9; color: black; width: 5; }
-way|z15-16[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
-way|z15-16[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; }
-way|z15-16[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; }
-
-way|z-14[aeroway=runway] !:area { z-index: 9; color: #444444; width: 3; }
+way[aeroway=runway] !:area { z-index: 9; color: black; width: 5; }
+way[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; }
+way[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; }
+way[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; }
way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; }
way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;}
@@ -131,4 +120,4 @@ way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_wi
/* Attribute decoration */
way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; }
-way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }
+way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }
\ No newline at end of file
diff --git a/test/data/regress/8954/preset.xml b/test/data/regress/8954/preset.xml
new file mode 100644
index 0000000..1160c60
--- /dev/null
+++ b/test/data/regress/8954/preset.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
+ <item name="ItemName" type="node">
+ <check key="foo" text="Foo" default="off" />
+ </item>
+</presets>
diff --git a/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java b/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java
index 20aa67c..848f403 100644
--- a/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java
+++ b/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java
@@ -57,7 +57,7 @@ public class JOSMFixture {
}
}
System.setProperty("josm.home", josmHome);
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
I18n.init();
// initialize the plaform hook, and
Main.determinePlatformHook();
diff --git a/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java b/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
index da9bdf6..58d89f8 100644
--- a/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
@@ -22,11 +22,11 @@ public class NodeListMergerTest extends JFrame {
for (int i=0; i < 20; i++) {
n1.put("key" + i, "value" + i);
}
- String note = "";
+ StringBuilder note = new StringBuilder();
for (int i=0; i < 50; i++) {
- note += " A very long text ";
+ note.append(" A very long text ");
}
- n1.put("note", note);
+ n1.put("note", note.toString());
w1.addNode(new Node(2));
w1.addNode(new Node(3));
diff --git a/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java b/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
index 270d020..49aa200 100644
--- a/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
+++ b/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.fail;
import java.awt.BorderLayout;
import java.io.File;
+import java.io.InputStream;
import java.text.MessageFormat;
import java.util.Properties;
import java.util.logging.Level;
@@ -36,7 +37,12 @@ public class HistoryBrowserTest extends JFrame {
// load properties
//
try {
- testProperties.load(HistoryBrowserTest.class.getResourceAsStream("/test-functional-env.properties"));
+ InputStream is = HistoryBrowserTest.class.getResourceAsStream("/test-functional-env.properties");
+ try {
+ testProperties.load(is);
+ } finally {
+ is.close();
+ }
} catch(Exception e){
logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
@@ -82,6 +88,9 @@ public class HistoryBrowserTest extends JFrame {
browser.populate(h);
}
+ /**
+ * Constructs a new {@code HistoryBrowserTest}.
+ */
public HistoryBrowserTest(){
build();
//populate(OsmPrimitiveType.NODE,354117);
diff --git a/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java b/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
index b755ee2..a574129 100644
--- a/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
+++ b/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
@@ -11,6 +11,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -137,7 +138,12 @@ public class MultiFetchServerObjectReaderTest {
// load properties
//
try {
- testProperties.load(MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties"));
+ InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties");
+ try {
+ testProperties.load(is);
+ } finally {
+ is.close();
+ }
} catch(Exception e){
logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
diff --git a/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java b/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
index 4fb09ab..f597b20 100644
--- a/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
+++ b/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
@@ -9,6 +9,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -144,7 +145,12 @@ public class OsmServerBackreferenceReaderTest {
// load properties
//
try {
- testProperties.load(MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties"));
+ InputStream is = MultiFetchServerObjectReaderTest.class.getResourceAsStream("/test-functional-env.properties");
+ try {
+ testProperties.load(is);
+ } finally {
+ is.close();
+ }
} catch(Exception e){
logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
diff --git a/test/lib/junit/README.txt b/test/lib/junit/README.txt
deleted file mode 100644
index d948197..0000000
--- a/test/lib/junit/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-JUnit is a simple framework for writing and running automated tests.
-
-JUnit is released under the Common Public License - v 1.0, see cpl-v10.html.
-
-See http://www.junit.org/home.
\ No newline at end of file
diff --git a/test/lib/junit/cpl-v10.html b/test/lib/junit/cpl-v10.html
deleted file mode 100644
index 36aa208..0000000
--- a/test/lib/junit/cpl-v10.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<TITLE>Common Public License - v 1.0</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" VLINK="#800000">
-
-
-<P ALIGN="CENTER"><B>Common Public License - v 1.0</B>
-<P><B></B><FONT SIZE="3"></FONT>
-<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>1. DEFINITIONS</B></FONT>
-<P><FONT SIZE="2">"Contribution" means:</FONT>
-
-<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT">
-b) in the case of each subsequent Contributor:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i) changes to the Program, and</FONT></UL>
-
-
-<UL><FONT SIZE="2">ii) additions to the Program;</FONT></UL>
-
-
-<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. </FONT><FONT SIZE="2">Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. </FONT></UL>
-
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. </FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT>
-<P><FONT SIZE="2"><B></B></FONT>
-<P><FONT SIZE="2"><B>2. GRANT OF RIGHTS</B></FONT>
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a) </FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2"><B>3. REQUIREMENTS</B></FONT>
-<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
-
-<UL><FONT SIZE="2">a) it complies with the terms and conditions of this Agreement; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">b) its license agreement:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i) effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
-
-
-<UL><FONT SIZE="2">ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
-
-
-<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2"> states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
-
-
-<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
-
-<UL><FONT SIZE="2">a) it must be made available under this Agreement; and </FONT></UL>
-
-
-<UL><FONT SIZE="2">b) a copy of this Agreement must be included with each copy of the Program. </FONT></UL>
-
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program. </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>4. COMMERCIAL DISTRIBUTION</B></FONT>
-<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5. NO WARRANTY</B></FONT>
-<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">. </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6. DISCLAIMER OF LIABILITY</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>7. GENERAL</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. </FONT><FONT SIZE="2">Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new </FONT><FONT SIZE="2">version. </FONT><FONT SIZE="2">Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2"> All rights in the Program not expressly granted under this Agreement are reserved.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
diff --git a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
new file mode 100644
index 0000000..fb664e7
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
@@ -0,0 +1,63 @@
+package org.openstreetmap.josm.actions.search;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+public class SearchCompilerTest {
+
+ @Before
+ public void setUp() throws Exception {
+ Main.initApplicationPreferences();
+ }
+
+ protected OsmPrimitive newPrimitive(String key, String value) {
+ final Node p = new Node();
+ p.put(key, value);
+ return p;
+ }
+
+ @Test
+ public void testAny() throws Exception {
+ final SearchCompiler.Match c = SearchCompiler.compile("foo", false, false);
+ Assert.assertTrue(c.match(newPrimitive("foobar", "true")));
+ Assert.assertTrue(c.match(newPrimitive("name", "hello-foo-xy")));
+ Assert.assertFalse(c.match(newPrimitive("name", "X")));
+ }
+
+ @Test
+ public void testEquals() throws Exception {
+ final SearchCompiler.Match c = SearchCompiler.compile("foo=bar", false, false);
+ Assert.assertFalse(c.match(newPrimitive("foobar", "true")));
+ Assert.assertTrue(c.match(newPrimitive("foo", "bar")));
+ Assert.assertFalse(c.match(newPrimitive("fooX", "bar")));
+ Assert.assertFalse(c.match(newPrimitive("foo", "barX")));
+ }
+
+ @Test
+ public void testCompare() throws Exception {
+ final SearchCompiler.Match c1 = SearchCompiler.compile("start_date>1950", false, false);
+ Assert.assertTrue(c1.match(newPrimitive("start_date", "1950-01-01")));
+ Assert.assertTrue(c1.match(newPrimitive("start_date", "1960")));
+ Assert.assertFalse(c1.match(newPrimitive("start_date", "1950")));
+ Assert.assertFalse(c1.match(newPrimitive("start_date", "1000")));
+ Assert.assertTrue(c1.match(newPrimitive("start_date", "101010")));
+ final SearchCompiler.Match c2 = SearchCompiler.compile("start_date<1960", false, false);
+ Assert.assertTrue(c2.match(newPrimitive("start_date", "1950-01-01")));
+ Assert.assertFalse(c2.match(newPrimitive("start_date", "1960")));
+ Assert.assertTrue(c2.match(newPrimitive("start_date", "1950")));
+ Assert.assertTrue(c2.match(newPrimitive("start_date", "1000")));
+ Assert.assertTrue(c2.match(newPrimitive("start_date", "200")));
+ final SearchCompiler.Match c3 = SearchCompiler.compile("name<I", false, false);
+ Assert.assertTrue(c3.match(newPrimitive("name", "Alpha")));
+ Assert.assertFalse(c3.match(newPrimitive("name", "Sigma")));
+ final SearchCompiler.Match c4 = SearchCompiler.compile("\"start_date\"<1960", false, false);
+ Assert.assertTrue(c4.match(newPrimitive("start_date", "1950-01-01")));
+ Assert.assertFalse(c4.match(newPrimitive("start_date", "2000")));
+
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
new file mode 100644
index 0000000..9385853
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
@@ -0,0 +1,99 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.corrector;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.osm.Tag;
+
+/**
+ * Unit tests of {@link ReverseWayTagCorrector} class.
+ */
+public class ReverseWayTagCorrectorTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ Main.initApplicationPreferences();
+ }
+
+ /**
+ * Test of {@link ReverseWayTagCorrector.TagSwitcher#apply} method.
+ */
+ @Test
+ public void testTagSwitch() {
+ // oneway
+ assertSwitch(new Tag("oneway", "yes"), new Tag("oneway", "-1"));
+ assertSwitch(new Tag("oneway", "true"), new Tag("oneway", "-1"));
+ assertSwitch(new Tag("oneway", "-1"), new Tag("oneway", "yes"));
+ assertSwitch(new Tag("oneway", "no"), new Tag("oneway", "no"));
+ assertSwitch(new Tag("oneway", "something"), new Tag("oneway", "something"));
+ // incline/direction
+ for (String k : new String[]{"incline", "direction"}) {
+ assertSwitch(new Tag(k, "up"), new Tag(k, "down"));
+ assertSwitch(new Tag(k, "down"), new Tag(k, "up"));
+ assertSwitch(new Tag(k, "something"), new Tag(k, "something"));
+ }
+ // :forward/:backward (see #8518)
+ assertSwitch(new Tag("turn:forward", "right"), new Tag("turn:backward", "right"));
+ assertSwitch(new Tag("change:forward", "not_right"), new Tag("change:backward", "not_right"));
+ assertSwitch(new Tag("placement:forward", "right_of:1"), new Tag("placement:backward", "right_of:1"));
+ assertSwitch(new Tag("turn:lanes:forward", "left|right"), new Tag("turn:lanes:backward", "left|right"));
+ assertSwitch(new Tag("change:lanes:forward", "not_right|only_left"), new Tag("change:lanes:backward", "not_right|only_left"));
+ // keys
+ assertSwitch(new Tag("forward", "something"), new Tag("backward", "something"));
+ assertSwitch(new Tag("backward", "something"), new Tag("forward", "something"));
+ assertSwitch(new Tag("up", "something"), new Tag("down", "something"));
+ assertSwitch(new Tag("down", "something"), new Tag("up", "something"));
+ assertSwitch(new Tag("east", "something"), new Tag("west", "something"));
+ assertSwitch(new Tag("west", "something"), new Tag("east", "something"));
+ assertSwitch(new Tag("south", "something"), new Tag("north", "something"));
+ assertSwitch(new Tag("north", "something"), new Tag("south", "something"));
+ // values
+ assertSwitch(new Tag("something", "forward"), new Tag("something", "backward"));
+ assertSwitch(new Tag("something", "backward"), new Tag("something", "forward"));
+ assertSwitch(new Tag("something", "up"), new Tag("something", "down"));
+ assertSwitch(new Tag("something", "down"), new Tag("something", "up"));
+ assertSwitch(new Tag("something", "east"), new Tag("something", "west"));
+ assertSwitch(new Tag("something", "west"), new Tag("something", "east"));
+ assertSwitch(new Tag("something", "south"), new Tag("something", "north"));
+ assertSwitch(new Tag("something", "north"), new Tag("something", "south"));
+ // value[:_]suffix
+ assertSwitch(new Tag("something", "forward:suffix"), new Tag("something", "backward:suffix"));
+ assertSwitch(new Tag("something", "backward_suffix"), new Tag("something", "forward_suffix"));
+ assertSwitch(new Tag("something", "up:suffix"), new Tag("something", "down:suffix"));
+ assertSwitch(new Tag("something", "down_suffix"), new Tag("something", "up_suffix"));
+ assertSwitch(new Tag("something", "east:suffix"), new Tag("something", "west:suffix"));
+ assertSwitch(new Tag("something", "west_suffix"), new Tag("something", "east_suffix"));
+ assertSwitch(new Tag("something", "south:suffix"), new Tag("something", "north:suffix"));
+ assertSwitch(new Tag("something", "north_suffix"), new Tag("something", "south_suffix"));
+ // prefix[:_]value
+ assertSwitch(new Tag("something", "prefix:forward"), new Tag("something", "prefix:backward"));
+ assertSwitch(new Tag("something", "prefix_backward"), new Tag("something", "prefix_forward"));
+ assertSwitch(new Tag("something", "prefix:up"), new Tag("something", "prefix:down"));
+ assertSwitch(new Tag("something", "prefix_down"), new Tag("something", "prefix_up"));
+ assertSwitch(new Tag("something", "prefix:east"), new Tag("something", "prefix:west"));
+ assertSwitch(new Tag("something", "prefix_west"), new Tag("something", "prefix_east"));
+ assertSwitch(new Tag("something", "prefix:south"), new Tag("something", "prefix:north"));
+ assertSwitch(new Tag("something", "prefix_north"), new Tag("something", "prefix_south"));
+ // prefix[:_]value[:_]suffix
+ assertSwitch(new Tag("something", "prefix:forward:suffix"), new Tag("something", "prefix:backward:suffix"));
+ assertSwitch(new Tag("something", "prefix_backward:suffix"), new Tag("something", "prefix_forward:suffix"));
+ assertSwitch(new Tag("something", "prefix:up_suffix"), new Tag("something", "prefix:down_suffix"));
+ assertSwitch(new Tag("something", "prefix_down_suffix"), new Tag("something", "prefix_up_suffix"));
+ assertSwitch(new Tag("something", "prefix:east:suffix"), new Tag("something", "prefix:west:suffix"));
+ assertSwitch(new Tag("something", "prefix_west:suffix"), new Tag("something", "prefix_east:suffix"));
+ assertSwitch(new Tag("something", "prefix:south_suffix"), new Tag("something", "prefix:north_suffix"));
+ assertSwitch(new Tag("something", "prefix_north_suffix"), new Tag("something", "prefix_south_suffix"));
+ // #8499
+ assertSwitch(new Tag("type", "drawdown"), new Tag("type", "drawdown"));
+ }
+
+ private void assertSwitch(Tag oldTag, Tag newTag) {
+ Assert.assertEquals(ReverseWayTagCorrector.TagSwitcher.apply(oldTag), newTag);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java b/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
index 89c50f5..67cb799 100644
--- a/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
+++ b/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java
@@ -20,8 +20,11 @@ public class LatLonTest {
100.12, 100.123, 100.1234, 100.12345, 100.123456, 100.1234567
};
+ /**
+ * Test of {@link LatLon#roundToOsmPrecisionStrict}
+ */
@Test
- public void roundingTests() {
+ public void testRoundToOsmPrecisionStrict() {
for (double value : sampleValues) {
assertEquals(LatLon.roundToOsmPrecisionStrict(value), value, 0);
@@ -73,8 +76,11 @@ public class LatLonTest {
assertEquals(LatLon.roundToOsmPrecisionStrict(99.9999999), 99.9999999, 0);
}
+ /**
+ * Test of {@link LatLon#toIntervalLon}
+ */
@Test
- public void toIntervalLonTests() {
+ public void testToIntervalLon() {
assertEquals(-180.0, LatLon.toIntervalLon(-180.0), 0);
assertEquals(0.0, LatLon.toIntervalLon(0.0), 0);
assertEquals(180.0, LatLon.toIntervalLon(180.0), 0);
@@ -94,4 +100,28 @@ public class LatLonTest {
assertEquals(-179.0, LatLon.toIntervalLon(541.0), 0);
assertEquals(179.0, LatLon.toIntervalLon(-541.0), 0);
}
+
+ /**
+ * Test of {@link LatLon#equals}
+ */
+ @Test
+ public void testEquals() {
+ for (int i = 1; i < sampleValues.length; i++) {
+ LatLon a = new LatLon(sampleValues[i-1], sampleValues[i]);
+ LatLon b = new LatLon(sampleValues[i-1], sampleValues[i]);
+ assertEquals(a, b);
+ }
+ }
+
+ /**
+ * Test of {@link LatLon#hashCode}
+ */
+ @Test
+ public void testHashCode() {
+ for (int i = 1; i < sampleValues.length; i++) {
+ LatLon a = new LatLon(sampleValues[i-1], sampleValues[i]);
+ LatLon b = new LatLon(sampleValues[i-1], sampleValues[i]);
+ assertEquals(a.hashCode(), b.hashCode());
+ }
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
index 4d71b99..7f4820d 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
@@ -18,7 +18,7 @@ public class APIDataSetTest {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java b/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
index d1a8805..8e4ae4d 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
@@ -62,7 +62,7 @@ public class DataSetMergerTest {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
private DataSet my;
diff --git a/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java b/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
index 71abcf5..d1bb328 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
@@ -29,7 +29,7 @@ public class FilterTest {
@BeforeClass
public static void setUp() {
Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
@@ -168,13 +168,13 @@ public class FilterTest {
if (osm.hasKey(key)) {
foundAtLeastOne = true;
if (!osm.get(key).equals(filterCode(osm))) {
- failedPrimitives.append(String.format("Object %s. Expected [%s] but was [%s]\n", osm.toString(), osm.get(key), filterCode(osm)));
+ failedPrimitives.append(String.format("Object %s. Expected [%s] but was [%s]%n", osm.toString(), osm.get(key), filterCode(osm)));
}
}
}
assertTrue(foundAtLeastOne);
if (failedPrimitives.length() != 0)
- throw new AssertionError(String.format("Run #%d\n%s", i, failedPrimitives.toString()));
+ throw new AssertionError(String.format("Run #%d%n%s", i, failedPrimitives.toString()));
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java
index 9cc803b..5623106 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java
@@ -18,7 +18,7 @@ public class OsmPrimitiveKeyHandling {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
/**
diff --git a/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
index 17a9c92..404b748 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
@@ -16,7 +16,7 @@ public class OsmPrimitiveTest {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
private void compareReferrers(OsmPrimitive actual, OsmPrimitive... expected) {
diff --git a/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java b/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
index b018786..61e866a 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
@@ -23,7 +23,7 @@ public class QuadBucketsTest {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
private void removeAllTest(DataSet ds) {
diff --git a/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java b/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
index 16a7876..b6b536e 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java
@@ -16,7 +16,7 @@ public class RelationTest {
@BeforeClass
public static void setUp() {
Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test(expected=NullPointerException.class)
diff --git a/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java b/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
index 5410a06..d8da85d 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
@@ -37,7 +37,7 @@ public class MergeSourceBuildingVisitorTest {
@BeforeClass
public static void setUp() {
Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java b/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
index 5f4f366..1c882f9 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java
@@ -5,12 +5,11 @@ import java.util.Random;
import org.junit.Assert;
import org.junit.Test;
-
import org.openstreetmap.josm.data.coor.LatLon;
public class EllipsoidTest {
- final double EPSILON = 1e-8;
+ private static final double EPSILON = 1e-8;
/**
* convert latlon to cartesian coordinates back and forth
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
index c280810..f26dba2 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
@@ -1,16 +1,12 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.projection;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -67,9 +63,9 @@ public class ProjectionRefTest {
Projection p = Projections.getProjectionByCode(code);
{
EastNorth en = p.latlon2eastNorth(new LatLon(lat, lon));
- String error = String.format("%s (%s): Projecting latlon(%s,%s):\n" +
- " expected: eastnorth(%s,%s),\n" +
- " but got: eastnorth(%s,%s)!\n",
+ String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
+ " expected: eastnorth(%s,%s),%n" +
+ " but got: eastnorth(%s,%s)!%n",
p.toString(), code, lat, lon, east, north, en.east(), en.north());
double EPSILON = 1e-3; // 1 mm accuracy
if (Math.abs(east - en.east()) > EPSILON || Math.abs(north - en.north()) > EPSILON) {
@@ -78,9 +74,9 @@ public class ProjectionRefTest {
}
{
LatLon ll = p.eastNorth2latlon(new EastNorth(east, north));
- String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):\n" +
- " expected: latlon(%s,%s),\n" +
- " but got: latlon(%s,%s)!\n",
+ String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
+ " expected: latlon(%s,%s),%n" +
+ " but got: latlon(%s,%s)!%n",
p.toString(), code, east, north, lat, lon, ll.lat(), ll.lon());
double EPSILON = Math.toDegrees(1e-3 / 6378137); // 1 mm accuracy (or better)
if (Math.abs(lat - ll.lat()) > EPSILON || Math.abs(lon - ll.lon()) > EPSILON) {
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
index 7c054dd..105a49e 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
@@ -107,7 +107,7 @@ public class ProjectionRegressionTest {
}
EastNorth en = proj.latlon2eastNorth(new LatLon(lat, lon));
LatLon ll2 = proj.eastNorth2latlon(en);
- out.write(String.format("%s\n ll %s %s\n en %s %s\n ll2 %s %s\n", proj.toCode(), lat, lon, en.east(), en.north(), ll2.lat(), ll2.lon()));
+ out.write(String.format("%s%n ll %s %s%n en %s %s%n ll2 %s %s%n", proj.toCode(), lat, lon, en.east(), en.north(), ll2.lat(), ll2.lon()));
}
out.close();
}
@@ -148,7 +148,7 @@ public class ProjectionRegressionTest {
@BeforeClass
public static void setUp() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
@@ -177,17 +177,17 @@ public class ProjectionRegressionTest {
}
EastNorth en = proj.latlon2eastNorth(data.ll);
if (!en.equals(data.en)) {
- String error = String.format("%s (%s): Projecting latlon(%s,%s):\n" +
- " expected: eastnorth(%s,%s),\n" +
- " but got: eastnorth(%s,%s)!\n",
+ String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
+ " expected: eastnorth(%s,%s),%n" +
+ " but got: eastnorth(%s,%s)!%n",
proj.toString(), data.code, data.ll.lat(), data.ll.lon(), data.en.east(), data.en.north(), en.east(), en.north());
fail.append(error);
}
LatLon ll2 = proj.eastNorth2latlon(data.en);
if (!ll2.equals(data.ll2)) {
- String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):\n" +
- " expected: latlon(%s,%s),\n" +
- " but got: latlon(%s,%s)!\n",
+ String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
+ " expected: latlon(%s,%s),%n" +
+ " but got: latlon(%s,%s)!%n",
proj.toString(), data.code, data.en.east(), data.en.north(), data.ll2.lat(), data.ll2.lon(), ll2.lat(), ll2.lon());
fail.append(error);
}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
index 4e0c4fd..65c9144 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java
@@ -64,7 +64,7 @@ public class ProjectionTest {
double maxErrLat = 0, maxErrLon = 0;
Bounds b = p.getWorldBoundsLatLon();
- text += String.format("*** %s %s\n", p.toString(), p.toCode());
+ text += String.format("*** %s %s%n", p.toString(), p.toCode());
for (int num=0; num < 1000; ++num) {
double lat = rand.nextDouble() * (b.getMax().lat() - b.getMin().lat()) + b.getMin().lat();
@@ -85,7 +85,7 @@ public class ProjectionTest {
mark = "--FAILED-- ";
error = true;
}
- text += String.format("%s errorLat: %s errorLon: %s\n", mark, maxErrLat, maxErrLon);
+ text += String.format("%s errorLat: %s errorLon: %s%n", mark, maxErrLat, maxErrLon);
}
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java b/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java
index b63e312..cbf2a92 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java
@@ -47,14 +47,14 @@ public class SwissGridTest {
@Test
public void projReferenceTest() {
Projection swiss = Projections.getProjectionByCode("EPSG:21781"); // Swiss grid
- String errs = "";
+ StringBuilder errs = new StringBuilder();
for (ProjData pd : data) {
EastNorth en2 = swiss.latlon2eastNorth(pd.ll);
if (Math.abs(pd.en.east() - en2.east()) > EPSILON || Math.abs(pd.en.north() - en2.north()) > EPSILON) {
- errs += String.format("%s should be: %s but is: %s\n", pd.name, pd.en, en2);
+ errs.append(String.format("%s should be: %s but is: %s%n", pd.name, pd.en, en2));
}
}
- assertTrue(errs, errs.length() == 0);
+ assertTrue(errs.toString(), errs.length() == 0);
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
new file mode 100644
index 0000000..d879790
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
@@ -0,0 +1,49 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+
+/**
+ * JUnit Test of "Duplicate node" validation test.
+ */
+public class DuplicateNodeTest {
+
+ /**
+ * Setup test by initializing JOSM preferences and projection.
+ */
+ @BeforeClass
+ public static void setUp() {
+ Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+ Main.initApplicationPreferences();
+ }
+
+ /**
+ * Test of "Duplicate node" validation test.
+ */
+ @Test
+ public void test() {
+ DataSet ds = new DataSet();
+
+ Node a = new Node(new LatLon(10.0, 5.0));
+ Node b = new Node(new LatLon(10.0, 5.0));
+ ds.addPrimitive(a);
+ ds.addPrimitive(b);
+
+ DuplicateNode test = new DuplicateNode();
+ test.startTest(NullProgressMonitor.INSTANCE);
+ test.visit(ds.allPrimitives());
+ test.endTest();
+
+ assertEquals(1, test.getErrors().size());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
new file mode 100644
index 0000000..5ba8313
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
@@ -0,0 +1,111 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.validation.Severity;
+
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * JUnit Test of "Opening hours" validation test.
+ */
+public class OpeningHourTestTest {
+
+ private static final OpeningHourTest OPENING_HOUR_TEST = new OpeningHourTest();
+
+ @Before
+ public void setUp() throws Exception {
+ Main.initApplicationPreferences();
+ OPENING_HOUR_TEST.initialize();
+ }
+
+ @Test
+ public void testCheckOpeningHourSyntax1() throws Exception {
+ final String key = "opening_hours";
+ // frequently used tags according to http://taginfo.openstreetmap.org/keys/opening_hours#values
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "24/7").isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 08:30-20:00").isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "09:00-21:00").isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Su-Th sunset-24:00, 04:00-sunrise; Fr-Sa sunset-sunrise").isEmpty(), is(true));
+ }
+
+ @Test
+ public void testCheckOpeningHourSyntax2() throws Exception {
+ final String key = "opening_hours";
+ final List<OpeningHourTest.OpeningHoursTestError> errors = OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Tue");
+ assertThat(errors.size(), is(1));
+ assertThat(errors.get(0).getMessage(), is("Mo-Tue <--- (Please use the abbreviation \"Tu\" for \"tue\".)"));
+ assertThat(errors.get(0).getSeverity(), is(Severity.WARNING));
+ }
+
+ @Test
+ public void testCheckOpeningHourSyntax3() throws Exception {
+ final String key = "opening_hours";
+ final List<OpeningHourTest.OpeningHoursTestError> errors = OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Sa-Su 10.00-20.00");
+ assertThat(errors.size(), is(2));
+ assertThat(errors.get(0).getMessage(), is("Sa-Su 10. <--- (Please use \":\" as hour/minute-separator)"));
+ assertThat(errors.get(0).getSeverity(), is(Severity.WARNING));
+ assertThat(errors.get(0).getPrettifiedValue(), is("Sa-Su 10:00-20:00"));
+ assertThat(errors.get(1).getMessage(), is("Sa-Su 10.00-20. <--- (Please use \":\" as hour/minute-separator)"));
+ assertThat(errors.get(1).getSeverity(), is(Severity.WARNING));
+ }
+
+ @Test
+ public void testCheckOpeningHourSyntax4() throws Exception {
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(null, null).isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(null, "").isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(null, " ").isEmpty(), is(true));
+ }
+
+ @Test
+ public void testCheckOpeningHourSyntax5() throws Exception {
+ final String key = "opening_hours";
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "badtext").size(), is(1));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "badtext").get(0).getMessage(),
+ is("opening_hours - ba <--- (Unexpected token: \"b\" This means that the syntax is not valid at that point or it is currently not supported.)"));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").size(), is(1));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").get(0).getMessage(),
+ is("opening_hours - 5.00 p <--- (hyphen (-) or open end (+) in time range expected. For working with points in time, the mode for opening_hours.js has to be altered. Maybe wrong tag?)"));
+ }
+
+ @Test
+ public void testCheckOpeningHourSyntax6() throws Exception {
+ final String key = "opening_hours";
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "PH open \"always open on public holidays\"").isEmpty(), is(true));
+ }
+
+ @Test
+ public void testCheckOpeningHourSyntaxTicket9367() throws Exception {
+ final String key = "opening_hours";
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getSeverity(), is(Severity.WARNING));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getMessage(), is("Mo,Tu 04-17 <--- (Time range without minutes specified. Not very explicit! Please use this syntax instead e.g. \"12:00-14:00\".)"));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getPrettifiedValue(), is("Mo,Tu 04:00-17:00"));
+ }
+
+ @Test
+ public void testCheckServiceTimeSyntax1() throws Exception {
+ final String key = "service_times";
+ // frequently used tags according to http://taginfo.openstreetmap.org/keys/service_times#values
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Su 10:00", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "automatic", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(false));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Sa 09:00-18:00", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Su 09:30; We 19:30", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(true));
+ }
+
+ @Test
+ public void testCheckCollectionTimeSyntax1() throws Exception {
+ final String key = "collection_times";
+ // frequently used tags according to http://taginfo.openstreetmap.org/keys/collection_times#values
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Sa 09:00", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(true));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "fixme", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(false));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "daily", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(false));
+ assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Fr 13:30, 17:45, 19:00; Sa 15:00; Su 11:00", OpeningHourTest.CheckMode.BOTH).isEmpty(), is(true));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java b/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java
new file mode 100644
index 0000000..7fe7b83
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/SystemOfMeasurementTest.java
@@ -0,0 +1,126 @@
+package org.openstreetmap.josm.gui;
+
+import static org.junit.Assert.*;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.NavigatableComponent.SystemOfMeasurement;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+/**
+ * Unit tests of {@link SystemOfMeasurement} class.
+ */
+public class SystemOfMeasurementTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ Main.initApplicationPreferences();
+ }
+
+ /**
+ * Test of {@link SystemOfMeasurement#getDistText} method.
+ */
+ @Test
+ public void testGetDistText() {
+
+ assertEquals("< 0.01 m", NavigatableComponent.METRIC_SOM.getDistText(-1));
+ assertEquals("< 0.01 m", NavigatableComponent.METRIC_SOM.getDistText(-0.99));
+ assertEquals("< 0.01 m", NavigatableComponent.METRIC_SOM.getDistText(-0));
+ assertEquals("< 0.01 m", NavigatableComponent.METRIC_SOM.getDistText(0));
+
+ assertEquals("0.01 m", NavigatableComponent.METRIC_SOM.getDistText(0.01));
+
+ assertEquals("0.99 m", NavigatableComponent.METRIC_SOM.getDistText(0.99));
+ assertEquals("1.00 m", NavigatableComponent.METRIC_SOM.getDistText(1.0));
+ assertEquals("1.01 m", NavigatableComponent.METRIC_SOM.getDistText(1.01));
+
+ assertEquals("9.99 m", NavigatableComponent.METRIC_SOM.getDistText(9.99));
+ assertEquals("10.0 m", NavigatableComponent.METRIC_SOM.getDistText(10.0));
+ assertEquals("10.0 m", NavigatableComponent.METRIC_SOM.getDistText(10.01));
+ assertEquals("10.0 m", NavigatableComponent.METRIC_SOM.getDistText(10.049));
+ assertEquals("10.1 m", NavigatableComponent.METRIC_SOM.getDistText(10.050));
+ assertEquals("10.1 m", NavigatableComponent.METRIC_SOM.getDistText(10.051));
+
+ assertEquals("100.0 m", NavigatableComponent.METRIC_SOM.getDistText(99.99));
+ assertEquals("100.0 m", NavigatableComponent.METRIC_SOM.getDistText(100.0));
+ assertEquals("100.0 m", NavigatableComponent.METRIC_SOM.getDistText(100.01));
+
+ assertEquals("1000.0 m", NavigatableComponent.METRIC_SOM.getDistText(999.99)); // TODO ? 1.00 km should be better
+ assertEquals("1000.0 m", NavigatableComponent.METRIC_SOM.getDistText(1000.0)); // TODO ? 1.00 km should be better
+ assertEquals("1.00 km", NavigatableComponent.METRIC_SOM.getDistText(1000.01));
+
+ assertEquals("10.00 km", NavigatableComponent.METRIC_SOM.getDistText(9999.99)); // TODO ? 10.0 km should be better
+ assertEquals("10.0 km", NavigatableComponent.METRIC_SOM.getDistText(10000.0));
+ assertEquals("10.0 km", NavigatableComponent.METRIC_SOM.getDistText(10000.01));
+
+ assertEquals("100.0 km", NavigatableComponent.METRIC_SOM.getDistText(99999.99));
+ assertEquals("100.0 km", NavigatableComponent.METRIC_SOM.getDistText(100000.0));
+ assertEquals("100.0 km", NavigatableComponent.METRIC_SOM.getDistText(100000.01));
+ }
+
+ @Test
+ public void testGetDistTextLocalized() {
+ final DecimalFormat format = new DecimalFormat("0.000", DecimalFormatSymbols.getInstance(Locale.GERMAN));
+ assertEquals("0,001 m", NavigatableComponent.METRIC_SOM.getDistText(0.001, format, 1e-6));
+ assertEquals("< 0,010 m", NavigatableComponent.METRIC_SOM.getDistText(0.001, format, 0.01));
+ assertEquals("10,051 m", NavigatableComponent.METRIC_SOM.getDistText(10.0514, format, 0.01));
+ assertEquals("10,052 m", NavigatableComponent.METRIC_SOM.getDistText(10.0515, format, 0.01));
+ assertEquals("100,000 km", NavigatableComponent.METRIC_SOM.getDistText(100000.0, format, 0.01));
+ }
+
+ /**
+ * Test of {@link SystemOfMeasurement#getAreaText} method.
+ */
+ @Test
+ public void testGetAreaText() {
+ assertEquals("< 0.01 m²", NavigatableComponent.METRIC_SOM.getAreaText(-1));
+ assertEquals("< 0.01 m²", NavigatableComponent.METRIC_SOM.getAreaText(-0.99));
+ assertEquals("< 0.01 m²", NavigatableComponent.METRIC_SOM.getAreaText(-0));
+ assertEquals("< 0.01 m²", NavigatableComponent.METRIC_SOM.getAreaText(0));
+
+ assertEquals("0.01 m²", NavigatableComponent.METRIC_SOM.getAreaText(0.01));
+
+ assertEquals("0.99 m²", NavigatableComponent.METRIC_SOM.getAreaText(0.99));
+ assertEquals("1.00 m²", NavigatableComponent.METRIC_SOM.getAreaText(1.0));
+ assertEquals("1.01 m²", NavigatableComponent.METRIC_SOM.getAreaText(1.01));
+
+ assertEquals("9.99 m²", NavigatableComponent.METRIC_SOM.getAreaText(9.99));
+ assertEquals("10.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(10.0));
+ assertEquals("10.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(10.01));
+ assertEquals("10.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(10.049));
+ assertEquals("10.1 m²", NavigatableComponent.METRIC_SOM.getAreaText(10.050));
+ assertEquals("10.1 m²", NavigatableComponent.METRIC_SOM.getAreaText(10.051));
+
+ assertEquals("100.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(99.99));
+ assertEquals("100.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(100.0));
+ assertEquals("100.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(100.01));
+
+ assertEquals("1000.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(999.99));
+ assertEquals("1000.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(1000.0));
+ assertEquals("1000.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(1000.01));
+
+ assertEquals("10000.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(9999.99)); // TODO ? 1.00 ha should be better
+ assertEquals("10000.0 m²", NavigatableComponent.METRIC_SOM.getAreaText(10000.0)); // TODO ? 1.00 ha should be better
+ assertEquals("1.00 ha", NavigatableComponent.METRIC_SOM.getAreaText(10000.01));
+
+ assertEquals("10.0 ha", NavigatableComponent.METRIC_SOM.getAreaText(99999.99));
+ assertEquals("10.0 ha", NavigatableComponent.METRIC_SOM.getAreaText(100000.0));
+ assertEquals("10.0 ha", NavigatableComponent.METRIC_SOM.getAreaText(100000.01));
+
+ assertEquals("100.0 ha", NavigatableComponent.METRIC_SOM.getAreaText(999999.99)); // TODO ? 1.00 km² should be better
+ assertEquals("1.00 km²", NavigatableComponent.METRIC_SOM.getAreaText(1000000.0));
+ assertEquals("1.00 km²", NavigatableComponent.METRIC_SOM.getAreaText(1000000.01));
+
+ assertEquals("10.0 km²", NavigatableComponent.METRIC_SOM.getAreaText(9999999.99));
+ assertEquals("10.0 km²", NavigatableComponent.METRIC_SOM.getAreaText(10000000.0));
+ assertEquals("10.0 km²", NavigatableComponent.METRIC_SOM.getAreaText(10000000.01));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java b/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
index d9097b9..42b7247 100644
--- a/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
@@ -31,7 +31,7 @@ public class NodeListMergeModelTest {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@SuppressWarnings("unchecked")
diff --git a/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java b/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
index 442845f..5cafa88 100644
--- a/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
@@ -47,7 +47,7 @@ public class PropertiesMergeModelTest {
@BeforeClass
public static void init() {
Main.setProjection(Projections.getProjectionByCode("EPSG:4326"));
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Before
diff --git a/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java b/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java
index e028fab..84e23aa 100644
--- a/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java
@@ -17,7 +17,7 @@ public class TagMergeItemTest {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java b/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
index f22f4a1..80dc65f 100644
--- a/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
@@ -23,7 +23,7 @@ public class TagMergeModelTest {
@BeforeClass
public static void init() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java
new file mode 100644
index 0000000..b0a9936
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/LatLonDialogTest.java
@@ -0,0 +1,99 @@
+package org.openstreetmap.josm.gui.dialogs;
+
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class LatLonDialogTest {
+ @Test
+ public void test1() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49.29918° 19.24788°"), is(new LatLon(49.29918, 19.24788)));
+ }
+
+ @Test
+ public void test2() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("N 49.29918 E 19.24788°"), is(new LatLon(49.29918, 19.24788)));
+ }
+
+ @Test
+ public void test3() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49.29918° 19.24788°"), is(new LatLon(49.29918, 19.24788)));
+ }
+
+ @Test
+ public void test4() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("N 49.29918 E 19.24788"), is(new LatLon(49.29918, 19.24788)));
+ }
+
+ @Test
+ public void test5() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("W 49°29.918' S 19°24.788'"), is(new LatLon(-19 - 24.788 / 60, -49 - 29.918 / 60)));
+ }
+
+ @Test
+ public void test6() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("N 49°29'04\" E 19°24'43\""), is(new LatLon(49 + 29. / 60 + 04. / 3600, 19 + 24. / 60 + 43. / 3600)));
+ }
+
+ @Test
+ public void test7() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49.29918 N, 19.24788 E"), is(new LatLon(49.29918, 19.24788)));
+ }
+
+ @Test
+ public void test8() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49°29'21\" N 19°24'38\" E"), is(new LatLon(49 + 29. / 60 + 21. / 3600, 19 + 24. / 60 + 38. / 3600)));
+ }
+
+ @Test
+ public void test9() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49 29 51, 19 24 18"), is(new LatLon(49 + 29. / 60 + 51. / 3600, 19 + 24. / 60 + 18. / 3600)));
+ }
+
+ @Test
+ public void test10() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49 29, 19 24"), is(new LatLon(49 + 29. / 60, 19 + 24. / 60)));
+ }
+
+ @Test
+ public void test11() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("E 49 29, N 19 24"), is(new LatLon(19 + 24. / 60, 49 + 29. / 60)));
+ }
+
+ @Test
+ public void test12() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49° 29; 19° 24"), is(new LatLon(49 + 29. / 60, 19 + 24. / 60)));
+ }
+
+ @Test
+ public void test13() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49° 29; 19° 24"), is(new LatLon(49 + 29. / 60, 19 + 24. / 60)));
+ }
+
+ @Test
+ public void test14() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("N 49° 29, W 19° 24"), is(new LatLon(49 + 29. / 60, -19 - 24. / 60)));
+ }
+
+ @Test
+ public void test15() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49° 29.5 S, 19° 24.6 E"), is(new LatLon(-49 - 29.5 / 60, 19 + 24.6 / 60)));
+ }
+
+ @Test
+ public void test16() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("N 49 29.918 E 19 15.88"), is(new LatLon(49 + 29.918 / 60, 19 + 15.88 / 60)));
+ }
+
+ @Test
+ public void test17() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("49 29.4 19 24.5"), is(new LatLon(49 + 29.4 / 60, 19 + 24.5 / 60)));
+ }
+
+ @Test
+ public void test18() throws Exception {
+ assertThat(LatLonDialog.parseLatLon("-49 29.4 N -19 24.5 W"), is(new LatLon(-49 - 29.4 / 60, 19 + 24.5 / 60)));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
index 90ca7ff..990e427 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
@@ -25,7 +25,7 @@ public class RelationSorterTest {
@BeforeClass
public static void loadData() throws FileNotFoundException, IllegalDataException {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
testDataset = OsmReader.parseDataSet(new FileInputStream("data_nodist/relation_sort.osm"), NullProgressMonitor.INSTANCE);
}
@@ -49,13 +49,22 @@ public class RelationSorterTest {
@Test
public void testGeneric() {
String[] actual = getNames(sorter.sortMembers(getRelation("generic").getMembers()));
- Assert.assertArrayEquals(new String[] {"t1w4", "t1w3", "t1w2", "t1w1", "t1w7", "t1w6", "t1w5", "t1n1", "t1n2"}, actual);
+ final String[] expected = {"t1w4", "t1w3", "t1w2", "t1w1", "t1w7", "t1w6", "t1w5", "t1n1", "t1n2"};
+ // expect nodes to be sorted correctly
+ Assert.assertEquals(expected[7], actual[7]);
+ Assert.assertEquals(expected[8], actual[8]);
}
@Test
public void testAssociatedStreet() {
String[] actual = getNames(sorter.sortMembers(getRelation("associatedStreet").getMembers()));
- Assert.assertArrayEquals(new String[] {"t2n1", "t2n2", "t2n3", "t2n4", "t2w1", "t2w2"}, actual);
+ Assert.assertArrayEquals(new String[] {"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4"}, actual);
+ }
+
+ @Test
+ public void testStreet() {
+ String[] actual = getNames(sorter.sortMembers(getRelation("street").getMembers()));
+ Assert.assertArrayEquals(new String[]{"t2w1", "t2w2", "t2n1", "t2n2", "t2n3", "t2n4", "playground", "tree"}, actual);
}
}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
index 4be981d..4954e34 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
@@ -26,7 +26,7 @@ public class WayConnectionTypeCalculatorTest {
@BeforeClass
public static void loadData() throws FileNotFoundException, IllegalDataException {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
testDataset = OsmReader.parseDataSet(new FileInputStream("data_nodist/relation_sort.osm"), NullProgressMonitor.INSTANCE);
}
@@ -82,16 +82,16 @@ public class WayConnectionTypeCalculatorTest {
String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers()));
Assert.assertEquals("[NONE, NONE, FORWARD, FORWARD, NONE, NONE, NONE, I, I]", actual);
actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
- Assert.assertEquals("[BACKWARD, BACKWARD, BACKWARD, BACKWARD, BACKWARD, BACKWARD, NONE, I, I]", actual);
+ Assert.assertEquals("[FORWARD, FORWARD, FORWARD, FORWARD, BACKWARD, BACKWARD, NONE, I, I]", actual);
}
@Test
public void testAssociatedStreet() {
Relation relation = getRelation("associatedStreet");
String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers()));
- Assert.assertEquals("[FORWARD, FORWARD, I, I, I, I]" , actual);
+ Assert.assertEquals("[NONE, I, I, I, NONE, I]" , actual);
actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
- Assert.assertEquals("[I, I, I, I, FORWARD, FORWARD]", actual);
+ Assert.assertEquals("[FORWARD, FORWARD, I, I, I, I]", actual);
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.groovy b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.groovy
index b6d35b3..bb12ced 100644
--- a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.groovy
+++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/AllMapCSSTests.groovy
@@ -11,6 +11,7 @@ import org.junit.runners.Suite
KeyValueConditionTest.class,
ParsingLinkSelectorTest.class,
KeyConditionTest.class,
+ MapCSSParserTest.class,
ChildOrParentSelectorTest
])
public class AllMapCSSTests extends TestCase{}
diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
new file mode 100644
index 0000000..5b1af3c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
@@ -0,0 +1,60 @@
+package org.openstreetmap.josm.gui.mappaint.mapcss
+
+import org.junit.Test
+import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.data.Preferences
+import org.openstreetmap.josm.data.osm.OsmPrimitive
+import org.openstreetmap.josm.data.osm.Way
+import org.openstreetmap.josm.gui.mappaint.Environment
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
+
+class MapCSSParserTest {
+
+ protected static OsmPrimitive getPrimitive(String key, String value) {
+ def w = new Way()
+ w.put(key, value)
+ return w
+ }
+
+ @Test
+ public void testEqualCondition() throws Exception {
+ def condition = (Condition.KeyValueCondition) new MapCSSParser(new StringReader("[surface=paved]")).condition(Condition.Context.PRIMITIVE)
+ assert condition instanceof Condition.KeyValueCondition
+ assert Condition.Op.EQ.equals(condition.op)
+ assert "surface".equals(condition.k)
+ assert "paved".equals(condition.v)
+ Main.pref = new Preferences()
+ assert condition.applies(new Environment().withPrimitive(getPrimitive("surface", "paved")))
+ assert !condition.applies(new Environment().withPrimitive(getPrimitive("surface", "unpaved")))
+ }
+
+ @Test
+ public void testNotEqualCondition() throws Exception {
+ def condition = (Condition.KeyValueCondition) new MapCSSParser(new StringReader("[surface!=paved]")).condition(Condition.Context.PRIMITIVE)
+ assert condition instanceof Condition.KeyValueCondition
+ assert Condition.Op.NEQ.equals(condition.op)
+ Main.pref = new Preferences()
+ assert !condition.applies(new Environment().withPrimitive(getPrimitive("surface", "paved")))
+ assert condition.applies(new Environment().withPrimitive(getPrimitive("surface", "unpaved")))
+ }
+
+ @Test
+ public void testRegexCondition() throws Exception {
+ def condition = (Condition.KeyValueCondition) new MapCSSParser(new StringReader("[surface=~/paved|unpaved/]")).condition(Condition.Context.PRIMITIVE)
+ assert condition instanceof Condition.KeyValueCondition
+ assert Condition.Op.REGEX.equals(condition.op)
+ Main.pref = new Preferences()
+ assert condition.applies(new Environment().withPrimitive(getPrimitive("surface", "unpaved")))
+ assert !condition.applies(new Environment().withPrimitive(getPrimitive("surface", "grass")))
+ }
+
+ @Test
+ public void testNegatedRegexCondition() throws Exception {
+ def condition = (Condition.KeyValueCondition) new MapCSSParser(new StringReader("[surface!~/paved|unpaved/]")).condition(Condition.Context.PRIMITIVE)
+ assert condition instanceof Condition.KeyValueCondition
+ assert Condition.Op.NREGEX.equals(condition.op)
+ Main.pref = new Preferences()
+ assert !condition.applies(new Environment().withPrimitive(getPrimitive("surface", "unpaved")))
+ assert condition.applies(new Environment().withPrimitive(getPrimitive("surface", "grass")))
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java
new file mode 100644
index 0000000..93561fc
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetReaderTest.java
@@ -0,0 +1,77 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+import org.xml.sax.SAXException;
+
+/**
+ * Unit tests of {@link TaggingPresetReader} class.
+ */
+public class TaggingPresetReaderTest {
+ /**
+ * path to test data root directory
+ */
+ private static String testdataroot;
+
+ @BeforeClass
+ public static void setUpClass() {
+ Main.initApplicationPreferences();
+ testdataroot = System.getProperty("josm.test.data");
+ if (testdataroot == null || testdataroot.isEmpty()) {
+ testdataroot = "test/data";
+ System.out.println("System property josm.test.data is not set, using '" + testdataroot + "'");
+ }
+ }
+
+ /**
+ * Gets path to test data directory for given ticketid.
+ * @param ticketid
+ * @return
+ */
+ protected static String getRegressionDataDir(int ticketid) {
+ return testdataroot + "/regress/" + ticketid;
+ }
+
+ /**
+ * Gets path to given file in test data directory for given ticketid.
+ * @param ticketid
+ * @param filename
+ * @return
+ */
+ protected static String getRegressionDataFile(int ticketid, String filename) {
+ return getRegressionDataDir(ticketid) + '/' + filename;
+ }
+
+ /**
+ * #8954 - last checkbox in the preset is not added
+ */
+ @Test
+ public void test8954() throws SAXException, IOException {
+ String presetfile = getRegressionDataFile(8954, "preset.xml");
+ final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, false);
+ Assert.assertEquals("Number of preset items", 1, presets.size());
+ final TaggingPreset preset = presets.iterator().next();
+ Assert.assertEquals("Number of entries", 1, preset.data.size());
+ final TaggingPresetItem item = preset.data.get(0);
+ Assert.assertTrue("Entry is not checkbox", item instanceof TaggingPresetItems.Check);
+ }
+
+ /**
+ * Validate internal presets
+ * See #9027
+ */
+ @Test
+ public void readDefaulPresets() throws SAXException, IOException {
+ String presetfile = "resource://data/defaultpresets.xml";
+ final Collection<TaggingPreset> presets = TaggingPresetReader.readAll(presetfile, true);
+ Assert.assertTrue("Default presets are empty", presets.size()>0);
+ }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy b/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
index 9458ed6..9a93221 100644
--- a/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
+++ b/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
@@ -188,4 +188,32 @@ class ChangesetQueryUrlParserTest {
q = parser.parse("bbox=-1,-1,1")
}
}
+
+ @Test
+ public void test_changeset_ids() {
+ ChangesetQueryUrlParser parser = new ChangesetQueryUrlParser();
+ def ChangesetQuery q
+
+ // OK
+ q = parser.parse("changesets=1,2,3")
+ assert q != null
+ assert q. at changesetIds.containsAll(Arrays.asList(1L, 2L, 3L))
+ assert q. at changesetIds.size() == 3
+
+ // OK
+ q = parser.parse("changesets=1,2,3,4,1")
+ assert q != null
+ assert q. at changesetIds.containsAll(Arrays.asList(1L, 2L, 3L, 4L))
+ assert q. at changesetIds.size() == 4
+
+ // OK
+ q = parser.parse("changesets=")
+ assert q != null
+ assert q. at changesetIds.size() == 0
+
+ // should fail
+ shouldFail(ChangesetQueryUrlException) {
+ q = parser.parse("changesets=foo")
+ }
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
new file mode 100644
index 0000000..0a742b4
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
@@ -0,0 +1,74 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+/**
+ * EXIF metadata extraction test
+ * @since 6209
+ */
+public class ExifReaderTest {
+
+ private File sampleFile;
+
+ /**
+ * Setup test
+ * @throws Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ sampleFile = new File("data_nodist/exif-direction-example.jpg");
+ }
+
+ /**
+ * Test time extraction
+ * @throws ParseException
+ */
+ @Test
+ public void testReadTime() throws ParseException {
+ Date date = ExifReader.readTime(sampleFile);
+ assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 17, 12, 05).getTime(), date);
+ }
+
+ /**
+ * Test orientation extraction
+ */
+ @Test
+ public void testReadOrientation() {
+ Integer orientation = ExifReader.readOrientation(sampleFile);
+ assertEquals(Integer.valueOf(1), orientation);
+ }
+
+ /**
+ * Test coordinates extraction
+ */
+ @Test
+ public void testReadLatLon() {
+ LatLon latlon = ExifReader.readLatLon(sampleFile);
+ assertNotNull(latlon);
+ DecimalFormat f = new DecimalFormat("00.0");
+ assertEquals("51°46'"+f.format(43.0)+"\"", LatLon.dms(latlon.lat()));
+ assertEquals("8°21'"+f.format(56.3)+"\"", LatLon.dms(latlon.lon()));
+ }
+
+ /**
+ * Test coordinates extraction
+ */
+ @Test
+ public void testReadDirection() {
+ Double direction = ExifReader.readDirection(sampleFile);
+ assertEquals(new Double(46.5), direction);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java b/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
new file mode 100644
index 0000000..f5eedbc
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java
@@ -0,0 +1,63 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openstreetmap.josm.data.Bounds;
+
+/**
+ * Unit tests of {@link OsmUrlToBounds} class.
+*/
+public class OsmUrlToBoundsTest {
+ /**
+ * data for {@link #testParse}
+ */
+ private static final ParseTestItem[] parseTestData = {
+ new ParseTestItem("http://www.openstreetmap.org", null),
+ new ParseTestItem("http://www.openstreetmap.org/?bbox=-0.489,51.28,0.236,51.686", new Bounds(51.28, -0.489, 51.686, 0.236)),
+ new ParseTestItem("http://www.openstreetmap.org/?minlon=-0.489&minlat=51.28&maxlon=0.236&maxlat=51.686", new Bounds(51.28, -0.489, 51.686, 0.236)),
+ new ParseTestItem("http://www.openstreetmap.org/?maxlat=51.686&maxlon=0.236&minlat=51.28&minlon=-0.489", new Bounds(51.28, -0.489, 51.686, 0.236)),
+ new ParseTestItem("http://www.openstreetmap.org/?zoom=17&lat=51.71873&lon=8.76164", OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 17)),
+ new ParseTestItem("http://www.openstreetmap.org/?lon=8.76164&lat=51.71873&zoom=17&foo", OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 17)),
+ new ParseTestItem("http://www.openstreetmap.org/?mlon=8.76164&mlat=51.71873", OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 18)),
+ new ParseTestItem("http://osm.org/go/euulwp", OsmUrlToBounds.positionToBounds(51.48262023925781, -0.29937744140625, 8)),
+ new ParseTestItem("http://www.openstreetmap.org/#map=17/51.71873/8.76164", OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 17)),
+ new ParseTestItem("http://www.openstreetmap.org/#map=17/51.71873/8.76164&layers=CN", OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 17)),
+ new ParseTestItem("http%3A%2F%2Fwww.openstreetmap.org%2F%23map%3D16%2F51.71873%2F8.76164", OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 16)),
+ new ParseTestItem("http%3A%2F%2Fwww.openstreetmap.org%2F%23map%3D16%2F51.71873%2F8.76164%26layers%3DCN", OsmUrlToBounds.positionToBounds(51.71873, 8.76164, 16)),
+ new ParseTestItem("http://www.openstreetmap.org/?note=26325#map=18/40.86215/-75.75020", OsmUrlToBounds.positionToBounds(40.86215, -75.75020, 18)),
+ new ParseTestItem("http://www.openstreetmap.org/?note=26325#map=18/40.86215/-75.75020&layers=N", OsmUrlToBounds.positionToBounds(40.86215, -75.75020, 18)),
+ new ParseTestItem("http://www.openstreetmap.org/?mlat=51.5&mlon=-0.01#map=10/51.4831/-0.1270", OsmUrlToBounds.positionToBounds(51.4831, -0.1270, 10)),
+ new ParseTestItem("http://www.openstreetmap.org/?mlat=51.5&mlon=-0.01#map=10/51.4831/-0.3509&layers=T", OsmUrlToBounds.positionToBounds(51.4831, -0.3509, 10)),
+ new ParseTestItem("http://www.openstreetmap.org/#map", null),
+ new ParseTestItem("http://www.openstreetmap.org/#map=foo", null),
+ new ParseTestItem("http://www.openstreetmap.org/#map=fooz/foolat/foolon", null)
+ };
+
+ private static class ParseTestItem {
+ public String url;
+ public Bounds bounds;
+
+ public ParseTestItem(String url, Bounds bounds) {
+ this.url = url;
+ this.bounds = bounds;
+ }
+ }
+
+ /**
+ * Test URL parsing
+ */
+ @Test
+ public void testParse() {
+ for (ParseTestItem item : parseTestData) {
+ Bounds bounds = null;
+ try {
+ bounds = OsmUrlToBounds.parse(item.url);
+ } catch (IllegalArgumentException e) {
+ // Ignore. check if bounds is null after
+ }
+ Assert.assertEquals(item.url, item.bounds, bounds);
+ }
+ }
+
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java b/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java
index 6451048..45c794d 100644
--- a/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/TextTagParserTest.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.data.Preferences;
public class TextTagParserTest {
@BeforeClass
public static void before() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
diff --git a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
new file mode 100644
index 0000000..5e9d36c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
@@ -0,0 +1,89 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
+
+import java.io.BufferedReader;
+import java.net.URL;
+
+/**
+ * Unit tests of {@link Utils} class.
+ */
+public class UtilsTest {
+
+ /**
+ * Test of {@link Utils#strip} method.
+ */
+ @Test
+ public void testStrip() {
+ final String someWhite =
+ "\u00A0"+ // SPACE_SEPARATOR
+ "\u2007"+ // LINE_SEPARATOR
+ "\u202F"+ // PARAGRAPH_SEPARATOR
+ "\u0009"+ // HORIZONTAL TABULATION
+ "\n" + // LINE FEED (U+000A, cannot be put as it in Java)
+ "\u000B"+ // VERTICAL TABULATION
+ "\u000C"+ // FORM FEED
+ "\r" + // CARRIAGE RETURN (U+000D, cannot be put as it in Java)
+ "\u001C"+ // FILE SEPARATOR
+ "\u001D"+ // GROUP SEPARATOR
+ "\u001E"+ // RECORD SEPARATOR
+ "\u001F"+ // UNIT SEPARATOR
+ "\u2003"+ // EM SPACE
+ "\u2007"+ // FIGURE SPACE
+ "\u200B"+ // ZERO WIDTH SPACE
+ "\uFEFF"+ // ZERO WIDTH NO-BREAK SPACE
+ "\u3000"; // IDEOGRAPHIC SPACE
+ Assert.assertNull(Utils.strip(null));
+ Assert.assertEquals("", Utils.strip(""));
+ Assert.assertEquals("", Utils.strip(" "));
+ Assert.assertEquals("", Utils.strip(" "));
+ Assert.assertEquals("", Utils.strip(" "));
+ Assert.assertEquals("", Utils.strip(someWhite));
+ Assert.assertEquals("a", Utils.strip("a"));
+ Assert.assertEquals("ab", Utils.strip("ab"));
+ Assert.assertEquals("abc", Utils.strip("abc"));
+ Assert.assertEquals("a", Utils.strip(" a"));
+ Assert.assertEquals("ab", Utils.strip(" ab"));
+ Assert.assertEquals("abc", Utils.strip(" abc"));
+ Assert.assertEquals("a", Utils.strip("a "));
+ Assert.assertEquals("ab", Utils.strip("ab "));
+ Assert.assertEquals("abc", Utils.strip("abc "));
+ Assert.assertEquals("a", Utils.strip(someWhite+"a"+someWhite));
+ Assert.assertEquals("ab", Utils.strip(someWhite+"ab"+someWhite));
+ Assert.assertEquals("abc", Utils.strip(someWhite+"abc"+someWhite));
+ }
+
+ /**
+ * Test of {@link Utils#toHexString} method.
+ */
+ @Test
+ public void testToHexString(){
+ Assert.assertEquals("", Utils.toHexString(null));
+ Assert.assertEquals("", Utils.toHexString(new byte[0]));
+ Assert.assertEquals("01", Utils.toHexString(new byte[]{0x1}));
+ Assert.assertEquals("0102", Utils.toHexString(new byte[]{0x1,0x2}));
+ Assert.assertEquals("12", Utils.toHexString(new byte[]{0x12}));
+ Assert.assertEquals("127f", Utils.toHexString(new byte[]{0x12, 0x7f}));
+ Assert.assertEquals("fedc", Utils.toHexString(new byte[]{(byte) 0xfe, (byte) 0xdc}));
+ }
+
+ @Test
+ public void testOpenUrlGzip() throws Exception {
+ Main.initApplicationPreferences();
+ final BufferedReader x = Utils.openURLReaderAndDecompress(new URL("http://www.openstreetmap.org/trace/1613906/data"), true);
+ Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+ x.close();
+ }
+
+ @Test
+ public void testOpenUrlBzip() throws Exception {
+ Main.initApplicationPreferences();
+ final BufferedReader x = Utils.openURLReaderAndDecompress(new URL("http://www.openstreetmap.org/trace/785544/data"), true);
+ Assert.assertTrue(x.readLine().startsWith("<?xml version="));
+ x.close();
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java
index 76bae95..8c0d2bc 100644
--- a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateEngineTest.java
@@ -1,7 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.tools.template_engine;
-
import java.util.Arrays;
import java.util.List;
@@ -11,7 +10,6 @@ import org.junit.Test;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.search.SearchCompiler;
import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
-import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.osm.DatasetFactory;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.Relation;
@@ -22,7 +20,7 @@ public class TemplateEngineTest {
@BeforeClass
public static void before() {
- Main.pref = new Preferences();
+ Main.initApplicationPreferences();
}
@Test
@@ -156,7 +154,7 @@ public class TemplateEngineTest {
@Test
public void testSearchExpression() throws Exception {
- Match match = compile("(parent type=type1 type=parent1) | (parent type=type2 type=parent2)");
+ compile("(parent type=type1 type=parent1) | (parent type=type2 type=parent2)");
//"parent(type=type1,type=parent1) | (parent(type=type2,type=parent2)"
//TODO
}
--
Editor for OpenStreetMap
More information about the Pkg-osm-commits
mailing list